From f9583814381b4f5321cc886aa8d8c3bd040b7821 Mon Sep 17 00:00:00 2001 From: Carl Masak Date: Sun, 18 Apr 2010 13:40:57 +0200 Subject: [PATCH] oops; fixed botched implementation from last commit '\x' is two characters, not one. --- t/perl6regex/01-regex.t | 6 +++--- test-regex | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/t/perl6regex/01-regex.t b/t/perl6regex/01-regex.t index 2d1f3a2..37ad4a7 100644 --- a/t/perl6regex/01-regex.t +++ b/t/perl6regex/01-regex.t @@ -76,11 +76,11 @@ sub match_perl6regex($pattern, $target) { sub replace_x($s is copy) { while defined (my $start = $s.index("\\x")) { - my $end = $start + 1; + my $end = $start + 2; ++$end while $s.substr($end, 1) ~~ /<[0..9a..fA..F]>/; - my $n = $s.substr($start + 1, $end - $start - 1); + my $n = $s.substr($start + 2, $end - $start - 2); $s = $s.substr(0, $start) ~ chr(:16($n)) ~ $s.substr($end); - }; + } $s } diff --git a/test-regex b/test-regex index d672c19..aa89444 100755 --- a/test-regex +++ b/test-regex @@ -14,9 +14,9 @@ say $match ?? $match.dump_str('mob', ' ', '') !! "No match\n"; sub replace_x($s is copy) { while defined (my $start = $s.index("\\x")) { - my $end = $start + 1; + my $end = $start + 2; ++$end while $s.substr($end, 1) ~~ /<[0..9a..fA..F]>/; - my $n = $s.substr($start + 1, $end - $start - 1); + my $n = $s.substr($start + 2, $end - $start - 2); $s = $s.substr(0, $start) ~ chr(:16($n)) ~ $s.substr($end); } $s