Update setting with fix for failing subst expression.

pmichaud · pmichaud · commit 0e0dbcb29a2a · 2010-05-24T19:44:43.000-05:00
diff --git a/src/setting/Regex.pm b/src/setting/Regex.pm
@@ -41,10 +41,12 @@ our sub subst ($text, $regex, $repl, :$global?) {
     my $result  := pir::new__Ps('StringBuilder');
 
     for @matches -> $match {
-        pir::push($result, pir::substr($text, $offset, $match.from - $offset))
-            if $match.from > $offset;
-        pir::push($result, $is_code ?? $repl($match) !! $repl);
-        $offset := $match.to;
+        if $match {
+            pir::push($result, pir::substr($text, $offset, $match.from - $offset))
+                if $match.from > $offset;
+            pir::push($result, $is_code ?? $repl($match) !! $repl);
+            $offset := $match.to;
+        }
     }
 
     my $chars := pir::length($text);

Original file line number	Original file line	Diff line number	Diff line change
`@@ -41,10 +41,12 @@ our sub subst ($text, $regex, $repl, :$global?) {`
`41`	`my $result := pir::new__Ps('StringBuilder');`	`41`	`my $result := pir::new__Ps('StringBuilder');`
`42`		`42`
`43`	`for @matches -> $match {`	`43`	`for @matches -> $match {`
`44`	`- pir::push($result, pir::substr($text, $offset, $match.from - $offset))`	`44`	`+ if $match {`
`45`	`- if $match.from > $offset;`	`45`	`+ pir::push($result, pir::substr($text, $offset, $match.from - $offset))`
`46`	`- pir::push($result, $is_code ?? $repl($match) !! $repl);`	`46`	`+ if $match.from > $offset;`
`47`	`- $offset := $match.to;`	`47`	`+ pir::push($result, $is_code ?? $repl($match) !! $repl);`
		`48`	`+ $offset := $match.to;`
		`49`	`+ }`
`48`	`}`	`50`	`}`
`49`		`51`
`50`	`my $chars := pir::length($text);`	`52`	`my $chars := pir::length($text);`