Grammar.parse sets $/ in the caller's scope

Also remove a failed attempt to set $/ in the closure passed to Str.subst
rakudo · May 6, 2010 · 7563a50 · 7563a50
1 parent 9709f85
commit 7563a50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/core/Cool-str.pm b/src/core/Cool-str.pm
@@ -31,7 +31,6 @@ augment class Cool {
             return self;
         }
         loop (my $i = 1; $i < @chunks; $i += 2) {
-            pir::store_dynamic_lex__vSP('$/', @chunks[$i]);
             @chunks[$i] = $replacement ~~ Callable ?? $replacement(@chunks[$i]) !! $replacement;
         }
         @chunks.join('');

diff --git a/src/core/Grammar.pm b/src/core/Grammar.pm
@@ -9,7 +9,9 @@ class Grammar is Regex::Cursor {
         if $action {
             die(":action has been renamed to :actions in the Grammar.parse method")
         }
-        nextwith($str, :$actions, |%options);
+        my $match = callwith($str, :$actions, |%options);
+        pir::store_dynamic_lex__vSP('$/', $match);
+        $match;
     }
 }