Change 18603 by jhi@kosh on 2003/01/30 08:05:22
Fix for half of the "UTF-8 failures (surprise!)"
from Enache Adrian, with an expanded test.
Affected files ...
... //depot/perl/lib/utf8.t#11 edit
... //depot/perl/sv.c#619 edit
Differences ...
==== //depot/perl/lib/utf8.t#11 (text) ====
Index: perl/lib/utf8.t
--- perl/lib/utf8.t#10~18106~ Mon Nov 4 17:43:27 2002
+++ perl/lib/utf8.t Thu Jan 30 00:05:22 2003
@@ -37,7 +37,7 @@
#
#
-plan tests => 95;
+plan tests => 98;
{
# bug id 20001009.001
@@ -272,7 +272,7 @@
# before the patch, the eval died with an error like:
# "my" variable $strict::VERSION can't be in a package
#
-ok('' eq runperl(prog => <<'CODE'));
+ok('' eq runperl(prog => <<'CODE'), "change #17928");
my $code = qq{ my \$\xe3\x83\x95\xe3\x83\xbc = 5; };
{
use utf8;
@@ -280,3 +280,46 @@
print $@ if $@;
}
CODE
+
+{
+ use utf8;
+ $a = <<'END';
+0 ....... 1 ....... 2 ....... 3 ....... 4 ....... 5 ....... 6 ....... 7 .......
+END
+ my (@i, $s);
+
+ @i = ();
+ push @i, $s = index($a, '6'); # 60
+ push @i, $s = index($a, '.', $s); # next . after 60 is 62
+ push @i, $s = index($a, '5'); # 50
+ push @i, $s = index($a, '.', $s); # next . after 52 is 52
+ push @i, $s = index($a, '7'); # 70
+ push @i, $s = index($a, '.', $s); # next . after 70 is 72
+ push @i, $s = index($a, '4'); # 40
+ push @i, $s = index($a, '.', $s); # next . after 40 is 42
+ is("@i", "60 62 50 52 70 72 40 42", "utf8 heredoc index");
+
+ @i = ();
+ push @i, $s = rindex($a, '6'); # 60
+ push @i, $s = rindex($a, '.', $s); # previous . before 60 is 58
+ push @i, $s = rindex($a, '5'); # 50
+ push @i, $s = rindex($a, '.', $s); # previous . before 52 is 48
+ push @i, $s = rindex($a, '7'); # 70
+ push @i, $s = rindex($a, '.', $s); # previous . before 70 is 68
+ push @i, $s = rindex($a, '4'); # 40
+ push @i, $s = rindex($a, '.', $s); # previous . before 40 is 38
+ is("@i", "60 58 50 48 70 68 40 38", "utf8 heredoc rindex");
+
+ @i = ();
+ push @i, $s = index($a, '6'); # 60
+ push @i, index($a, '.', $s); # next . after 60 is 62
+ push @i, rindex($a, '.', $s); # previous . before 60 is 58
+ push @i, $s = rindex($a, '5'); # 60
+ push @i, index($a, '.', $s); # next . after 50 is 52
+ push @i, rindex($a, '.', $s); # previous . before 50 is 48
+ push @i, $s = index($a, '7', $s); # 70
+ push @i, index($a, '.', $s); # next . after 70 is 72
+ push @i, rindex($a, '.', $s); # previous . before 70 is 68
+ is("@i", "60 62 58 50 52 48 70 72 68", "utf8 heredoc index and rindex");
+}
+
==== //depot/perl/sv.c#619 (text) ====
Index: perl/sv.c
--- perl/sv.c#618~18592~ Sun Jan 26 13:54:36 2003
+++ perl/sv.c Thu Jan 30 00:05:22 2003
@@ -5787,6 +5787,8 @@
U8 *p = s + cache[1];
STRLEN ubackw = 0;
+ cache[1] -= backw;
+
while (backw--) {
p--;
while (UTF8_IS_CONTINUATION(*p))
@@ -5795,7 +5797,6 @@
}
cache[0] -= ubackw;
- cache[1] -= backw;
return;
}
End of Patch.
