Handle postcircumfix: ast requirements.

perl6 · Oct 20, 2009 · 9bf6977 · 9bf6977
1 parent 4e5addc
commit 9bf6977
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/HLL/Actions.pm b/src/HLL/Actions.pm
@@ -2,16 +2,19 @@ class HLL::Actions;
 
 method EXPR($/, $key?) {
     unless $key { return 0; }
-    my $past := PAST::Op.new( :node($/) );
-    for $/.list { $past.push($_.ast); }
-    if $key eq 'INFIX' {
-       $past.name( 'infix:<' ~ $<OPER><sym> ~ '>' );
-    }
-    elsif $key eq 'PREFIX' {
-       $past.name( 'prefix:<' ~ $<OPER><sym> ~ '>' );
+    my $past := $<OPER>.peek_ast;
+    unless $past { 
+        my $name := Q:PIR {
+            $P0 = find_lex '$key'
+            $S0 = $P0
+            $S0 = downcase $S0
+            %r = box $S0
+        } ~ ':<' ~ $key ~ '>';
+        $past := PAST::OP.new( :name($name), :node($/) ); 
     }
-    elsif $key eq 'POSTFIX' {
-       $past.name( 'postfix:<' ~ $<OPER><sym> ~ '>' );
+    $past[0] := $/[0].ast;
+    if $key eq 'INFIX' {
+       $past[1] := $/[1].ast;
     }
     make $past;
 }

diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -16,7 +16,7 @@ method term:sym<value>($/) { make $<value>.ast; }
 method circumfix:sym<( )>($/) { make $<EXPR>.ast; }
 
 method postcircumfix:sym<[ ]>($/) {
-    make PAST::Op.new( $<EXPR>.ast , :name('postcircumfix:<[ ]>') );
+    make PAST::Var.new( 0, $<EXPR>.ast , :scope('keyed_int') );
 }
 
 method value($/) {

diff --git a/src/Regex/Match.pir b/src/Regex/Match.pir
@@ -107,6 +107,14 @@ has been set then returns C<Str> above.
     .tailcall self.'Str'()
 .end
 
+.sub 'peek_ast' :method
+    .local pmc ast
+    ast = getattribute self, '$!ast'
+    unless null ast goto have_ast
+    ast = new ['Undef']
+  have_ast:
+    .return (ast)
+.end
 
 =back