Refactor handling of $¢ in subs, make sure that match objects can

be created in closures.

Author: pmichaud

src/NQPQ/Actions.pm

@@ -1040,8 +1040,12 @@ class NQP::Actions is HLL::Actions {
                 }
         }
         else {
-            my $regex := 
-                QRegex::P6Regex::Actions::buildsub($<p6regex>.ast, @BLOCK.shift);
+            my $block := @BLOCK.shift;
+            $block[0].push(PAST::Var.new(:name<$¢>, :scope<lexical>, :isdecl(1)));
+            $block[0].push(PAST::Var.new(:name<$/>, :scope<lexical>, :isdecl(1)));
+            $block.symbol('$¢', :scope<lexical>);
+            $block.symbol('$/', :scope<lexical>);
+            my $regex := QRegex::P6Regex::Actions::buildsub($<p6regex>.ast, $block);
             $regex.name($name);
             my $prefix_meth;
 

src/QAST/Compiler.nqp

@@ -36,6 +36,7 @@ class QAST::Compiler is HLL::Compiler {
 
         # common prologue
         my $startreg := '(' ~ nqp::join(', ', [%*REG<cur>, %*REG<tgt>, %*REG<pos>, %*REG<curclass>, %*REG<bstack>]) ~ ')';
+        $ops.push_pirop('store_lex', 'unicode:"$\x{a2}"', %*REG<cur>);
         $ops.push_pirop('callmethod', '"!cursor_start"', 'self', :result($startreg));
         $ops.push_pirop('length', %*REG<eos>, %*REG<tgt>);
         $ops.push(self.regex_post($node));

src/QRegex/Cursor.nqp

@@ -52,6 +52,10 @@ role NQPCursorRole {
         my $new := self.CREATE();
         nqp::bindattr($new, $?CLASS, '$!orig', $!orig);
         nqp::bindattr_i($new, $?CLASS, '$!pos', -3);
+        nqp::bindattr($new, $?CLASS, '$!regexsub', Q:PIR {
+            $P0 = getinterp
+            %r = $P0['sub';1]
+        });
         pir::return__vPsiPP(
             $new, 
             nqp::bindattr_s($new, $?CLASS, '$!target', $!target),

src/QRegex/P6Regex/Actions.nqp

@@ -392,7 +392,7 @@ class QRegex::P6Regex::Actions is HLL::Actions {
         $ast;
     }
 
-    our sub buildsub($qast, $block = PAST::Block.new()) {
+    our sub buildsub($qast, $block = PAST::Block.new(:blocktype<method>)) {
         my $hashpast := PAST::Op.new( :pasttype<hash> );
         for capnames($qast, 0) {
             if $_.key gt '' { 
@@ -404,12 +404,16 @@ class QRegex::P6Regex::Actions is HLL::Actions {
         my $capblock := PAST::Block.new( :hll<nqp>, :namespace(['Sub']), :lexical(0),
                                          :name($block.subid ~ '_caps'),  $hashpast );
         $block.push($capblock);
+
+        unless $block.symbol('$¢') {
+            $block.push(PAST::Var.new(:name<$¢>, :scope<lexical>, :isdecl(1)));
+            $block.symbol('$¢', :scope<lexical>);
+        }
         $qast := QAST::Regex.new( :rxtype<concat>,
                      QAST::Regex.new( :rxtype<scan> ),
                      $qast,
                      QAST::Regex.new( :rxtype<pass> ));
         $block.push(PAST::QAST.new($qast));
-        $block.blocktype('method');
         $block;
     }