[nqp]: Add $<foo> and $[0] variables.

perl6 · Oct 28, 2009 · 1316068 · 1316068
1 parent dd2ec36
commit 1316068
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -141,12 +141,19 @@ method colonpair($/) {
 }
 
 method variable($/) {
-    my $past := PAST::Var.new( :name(~$/) );
-    if $<twigil> && $<twigil>[0] eq '*' { 
-        $past.scope('contextual'); 
-        $past.viviself(
-            PAST::Op.new( 'Contextual ' ~ ~$/ ~ ' not found', :pirop('die') )
-        );
+    my $past;
+    if $<postcircumfix> {
+        $past := $<postcircumfix>.ast;
+        $past.unshift( PAST::Var.new( :name('$/') ) );
+    }
+    else {
+        $past := PAST::Var.new( :name(~$/) );
+        if $<twigil> && $<twigil>[0] eq '*' { 
+            $past.scope('contextual'); 
+            $past.viviself( PAST::Op.new( 'Contextual ' ~ ~$/ ~ ' not found', 
+                                          :pirop('die') )
+            );
+        }
     }
     make $past;
 }

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -127,6 +127,7 @@ token colonpair {
 
 token variable {
     | <sigil> <twigil>? <desigilname=ident>
+    | <sigil> <?[<[]> <postcircumfix>
     | $<sigil>=['$'] $<desigilname>=[<[/_!]>]
 }