Fix interaction of action methods and ::(...).

This gets custom circumfixes working again in categorically-better.
Raku · Oct 21, 2012 · f90a081 · f90a081
1 parent d3b8c89
commit f90a081
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -562,7 +562,7 @@ grammar NQP::Grammar is HLL::Grammar {
           {   
               %*RX<s>    := $<sym> eq 'rule'; 
               %*RX<r>    := $<sym> eq 'token' || $<sym> eq 'rule'; 
-              %*RX<name> := $<deflongname>.ast if $<deflongname>;
+              %*RX<name> := $<deflongname> ?? $<deflongname>.ast !! "!!LATENAME!!" ~ ~$<latename>;
           }
           '{'<p6regex=.LANG('Regex','nibbler')>'}'<?ENDSTMT>
         ]

diff --git a/src/QAST/Compiler.nqp b/src/QAST/Compiler.nqp
@@ -1322,6 +1322,11 @@ class QAST::Compiler is HLL::Compiler {
             my $name := self.escape($node.name());
             $ops.push_pirop('callmethod', '"!cursor_pass"', %*REG<cur>, %*REG<pos>, $name, |@backtrack);
         }
+        elsif +@($node) == 1 {
+            my $dynname := self.coerce(self.as_post($node[0]), 'S');
+            $ops.push($dynname);
+            $ops.push_pirop('callmethod', '"!cursor_pass"', %*REG<cur>, %*REG<pos>, $dynname, |@backtrack);
+        }
         else {
             $ops.push_pirop('callmethod', '"!cursor_pass"', %*REG<cur>, %*REG<pos>, |@backtrack);
         }

diff --git a/src/QRegex/P6Regex/Actions.nqp b/src/QRegex/P6Regex/Actions.nqp
@@ -565,9 +565,17 @@ class QRegex::P6Regex::Actions is HLL::Actions {
         $qast := QAST::Regex.new( :rxtype<concat>,
                      QAST::Regex.new( :rxtype<scan> ),
                      $qast,
-                     ($anon ??
-                          QAST::Regex.new( :rxtype<pass> ) !!
-                          QAST::Regex.new( :rxtype<pass>, :name(%*RX<name>) )));
+                     ($anon
+                          ?? QAST::Regex.new( :rxtype<pass> )
+                          !! (nqp::substr(%*RX<name>, 0, 12) ne '!!LATENAME!!'
+                                ?? QAST::Regex.new( :rxtype<pass>, :name(%*RX<name>) )
+                                !! QAST::Regex.new( :rxtype<pass>,
+                                       QAST::Var.new(
+                                           :name(nqp::substr(%*RX<name>, 12)),
+                                           :scope('lexical')
+                                       ) 
+                                   )
+                              )));
         $block.push($qast);
 
         $block;