Severely reduce what can go in lhs, and move the is_a_sub check farth…

…er up the chain so that it doesn't interfere with assignment.
cardinal · Jul 21, 2009 · da35935 · da35935
1 parent 3b2e0db
commit da35935
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -240,7 +240,11 @@ method indexed($/) {
 method variable($/, $key) {
     my $past;
     if $key eq 'varname' {
-        $past := $/<varname>.ast();
+        my $varname := $/<varname>;
+        $past := $varname.ast();
+        if is_a_sub(~$varname) { # unary sub
+            $past := PAST::Op.new(:pasttype('call'), :node($varname), $past);
+        }
     }
     elsif $key eq 'self' {
         $past := PAST::Op.new(:inline('%r = self'));
@@ -252,11 +256,7 @@ method variable($/, $key) {
 }
 
 method varname($/, $key) {
-    my $past := $/{$key}.ast();
-    if is_a_sub(~$/) { # unary sub
-        $past := PAST::Op.new( :pasttype('call'), :node($/), $past );
-    }
-    make $past;
+    make $/{$key}.ast();
 }
 
 method global($/) {

diff --git a/src/parser/grammar.pg b/src/parser/grammar.pg
@@ -106,7 +106,7 @@ rule mlhs {
 }
 
 token lhs {
-    | <basic_primary> {*}            #= basic_primary
+    | <varname> {*} #= varname
 }
 
 token indexed {