Implement <&foo: $arg> and <&foo($arg)>.

We don't parse quite so liberally as STD does here, mostly because it seems like a great way to have to do a bunch of more fragile analysis without obviously implementing anything else from the design.
rakudo · Apr 28, 2015 · 8782513 · 8782513
1 parent a5f38ae
commit 8782513
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -7754,13 +7754,25 @@ class Perl6::RegexActions is QRegex::P6Regex::Actions does STDActions {
     }
 
     method assertion:sym<var>($/) {
-        make QAST::Regex.new( QAST::NodeList.new(
-                                    QAST::SVal.new( :value('INTERPOLATE') ),
-                                    $<var>.ast,
-                                    QAST::IVal.new( :value(%*RX<i> ?? 1 !! 0) ),
-                                    QAST::IVal.new( :value($*SEQ ?? 1 !! 0) ),
-                                    QAST::IVal.new( :value(1) ) ),
-                              :rxtype<subrule>, :subtype<method>, :node($/));
+        if $<arglist> {
+            my $ast := make QAST::Regex.new(
+                QAST::NodeList.new(
+                    QAST::SVal.new( :value('CALL_SUBRULE') ),
+                    $<var>.ast ),
+                :rxtype<subrule>, :subtype<method>, :node($/));
+            for @($<arglist>.ast) {
+                $ast[0].push($_);
+            }
+        } else {
+            make QAST::Regex.new(
+                QAST::NodeList.new(
+                    QAST::SVal.new( :value('INTERPOLATE') ),
+                    $<var>.ast,
+                    QAST::IVal.new( :value(%*RX<i> ?? 1 !! 0) ),
+                    QAST::IVal.new( :value($*SEQ ?? 1 !! 0) ),
+                    QAST::IVal.new( :value(1) ) ),
+                :rxtype<subrule>, :subtype<method>, :node($/));
+        }
     }
 
     method assertion:sym<name>($/) {

diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -5012,7 +5012,12 @@ grammar Perl6::RegexGrammar is QRegex::P6Regex::Grammar does STD does CursorPack
     }
 
     token assertion:sym<var> {
-        <?sigil> <var=.LANG('MAIN', 'term:sym<variable>')>
+        | <?[&]> <var=.LANG('MAIN', 'term:sym<variable>')>
+            [
+            | ':' <arglist>
+            | '(' <arglist> ')'
+            ]?
+        | <?sigil> <var=.LANG('MAIN', 'term:sym<variable>')>
     }
 
     token assertion:sym<~~> {

diff --git a/src/core/Cursor.pm b/src/core/Cursor.pm
@@ -259,6 +259,10 @@ my class Cursor does NQPCursorRole {
         }
     }
 
+    method CALL_SUBRULE($rule, |c) {
+        $rule(self, |c)
+    }
+
     method DYNQUANT_LIMITS($mm) {
         if nqp::istype($mm,Range) {
             die 'Range minimum in quantifier (**) cannot be +Inf' if $mm.min ==  Inf;