Change 13861 by jhi@alpha on 2001/12/23 01:38:54
Even more \X fixing.
Affected files ...
.... //depot/perl/regexec.c#220 edit
.... //depot/perl/t/op/pat.t#137 edit
Differences ...
==== //depot/perl/regexec.c#220 (text) ====
Index: perl/regexec.c
--- perl/regexec.c.~1~ Sat Dec 22 18:45:06 2001
+++ perl/regexec.c Sat Dec 22 18:45:06 2001
@@ -2603,7 +2603,9 @@
locinput += UTF8SKIP(locinput);
if (locinput > PL_regeol)
sayNO;
- }
+ }
+ else
+ locinput++;
nextchr = UCHARAT(locinput);
break;
case REFFL:
==== //depot/perl/t/op/pat.t#137 (xtext) ====
Index: perl/t/op/pat.t
--- perl/t/op/pat.t.~1~ Sat Dec 22 18:45:06 2001
+++ perl/t/op/pat.t Sat Dec 22 18:45:06 2001
@@ -2395,12 +2395,19 @@
use charnames ':full';
- print "a!" =~ /\X!/ ? "ok 787\n" : "not ok 787\n";
- print "\xDF!" =~ /\X!/ ? "ok 788\n" : "not ok 788\n";
- print "\x{100}!" =~ /\X!/ ? "ok 789\n" : "not ok 789\n";
- print "\x{100}\x{300}!" =~ /\X!/ ? "ok 790\n" : "not ok 790\n";
- print "\N{LATIN CAPITAL LETTER E}!" =~ /\X!/ ?
- "ok 791\n" : "not ok 791\n";
- print "\N{LATIN CAPITAL LETTER E}\N{COMBINING GRAVE ACCENT}!" =~ /\X!/ ?
- "ok 792\n" : "not ok 792\n";
+ print "a!" =~ /^(\X)!/ && $1 eq "a" ?
+ "ok 787\n" : "not ok 787 # $1\n";
+ print "\xDF!" =~ /^(\X)!/ && $1 eq "\xDF" ?
+ "ok 788\n" : "not ok 788 # $1\n";
+ print "\x{100}!" =~ /^(\X)!/ && $1 eq "\x{100}" ?
+ "ok 789\n" : "not ok 789 # $1\n";
+ print "\x{100}\x{300}!" =~ /^(\X)!/ && $1 eq "\x{100}\x{300}" ?
+ "ok 790\n" : "not ok 790 # $1\n";
+ print "\N{LATIN CAPITAL LETTER E}!" =~ /^(\X)!/ &&
+ $1 eq "\N{LATIN CAPITAL LETTER E}" ?
+ "ok 791\n" : "not ok 791 # $1\n";
+ print "\N{LATIN CAPITAL LETTER E}\N{COMBINING GRAVE ACCENT}!" =~
+ /^(\X)!/ &&
+ $1 eq "\N{LATIN CAPITAL LETTER E}\N{COMBINING GRAVE ACCENT}" ?
+ "ok 792\n" : "not ok 792 # $1\n";
}
End of Patch.