Fix parsing of whatever.

rakudo · Apr 9, 2009 · f9a2236 · f9a2236
1 parent 4a95115
commit f9a2236
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -1399,25 +1399,7 @@ method param_var($/) {
 
 
 method expect_term($/, $key) {
-    my $past;
-    if $key eq '*' {
-        # Whatever.
-        $past := PAST::Op.new(
-            :pasttype('callmethod'),
-            :name('new'),
-            :node($/),
-            :lvalue(1),
-            PAST::Var.new(
-                :name('Whatever'),
-                :namespace(list()),
-                :scope('package'),
-                :node($/)
-            )
-        );
-    }
-    else {
-        $past := $( $/{$key} );
-    }
+    my $past := $( $/{$key} );
 
     if $<post> {
         for $<post> {
@@ -2515,7 +2497,22 @@ method term($/, $key) {
         $short_name := @ns.pop();
     }
 
-    if $key eq 'noarg' {
+    if $key eq '*' {
+        # Whatever.
+        $past := PAST::Op.new(
+            :pasttype('callmethod'),
+            :name('new'),
+            :node($/),
+            :lvalue(1),
+            PAST::Var.new(
+                :name('Whatever'),
+                :namespace(list()),
+                :scope('package'),
+                :node($/)
+            )
+        );
+    }
+    elsif $key eq 'noarg' {
         if @ns {
             $past := PAST::Op.new(
                 PAST::Var.new(

diff --git a/src/parser/grammar.pg b/src/parser/grammar.pg
@@ -562,7 +562,6 @@ rule default_value {
 
 token expect_term {
     | <noun> <post>* {*}                         #= noun
-    | '*' {*}                                    #= *
 }
 
 
@@ -656,6 +655,7 @@ token term {
         ]
     | <sigil> \s <arglist> {*}                   #= sigil
     | '...' {*}                                  #= ...
+    | '*' {*}                                    #= *
     ]
 }