Inline macro_param

parrot · Feb 23, 2011 · e1c1ef3 · e1c1ef3
1 parent 285318a
commit e1c1ef3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/compilers/opsc/src/Ops/Compiler/Actions.pm b/compilers/opsc/src/Ops/Compiler/Actions.pm
@@ -259,13 +259,6 @@ method op_body($/) {
     make $past;
 }
 
-method macro_param($/) {
-    make PAST::Var.new(
-        :name(~$/),
-        :node($/),
-    );
-}
-
 
 method op_macro($/) {
     #say('# op_macro');
@@ -422,7 +415,14 @@ method term:sym<call> ($/) {
 }
 
 method term:sym<reg> ($/) {
-    make $<macro_param>.ast;
+    make PAST::Var.new(
+        :name(~$/),
+        :node($/),
+    );
+}
+
+method term:sym<macro> ($/) {
+    make $<op_macro>.ast;
 }
 
 method term:sym<int> ($/) {

diff --git a/compilers/opsc/src/Ops/Compiler/Grammar.pm b/compilers/opsc/src/Ops/Compiler/Grammar.pm
@@ -194,7 +194,10 @@ token term:sym<float_constant_long> { # longer to work-around lack of LTM
     ]
 }
 
-token term:sym<reg>   { <macro_param> }
+token term:sym<reg>   {
+    '$' $<num>=<integer> # Up to nine params.
+}
+
 token term:sym<macro> { <op_macro>    }
 
 # Used for macro-casting. E.g. PTR2INTVAL. Or variable name.