More defactoring in preparation for <abc=def>.

perl6 · Nov 13, 2009 · 4199a71 · 4199a71
1 parent 83c119b
commit 4199a71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/HLL/Grammar.pm b/src/HLL/Grammar.pm
@@ -19,11 +19,11 @@ grammar HLL::Grammar;
 
     token term:sym<circumfix> { <circumfix> }
 
-    token infixish { <OPER=infix=infix> }
-    token prefixish { <OPER=prefix=prefix> <.ws> }
+    token infixish { $<OPER>=$<infix>=<infix> }
+    token prefixish { $<OPER>=$<prefix>=<prefix> <.ws> }
     token postfixish {
-        | <OPER=postfix=postfix>
-        | <OPER=postcircumfix=postcircumfix>
+        | $<OPER>=$<postfix>=<postfix>
+        | $<OPER>=$<postcircumfix>=<postcircumfix>
     }
 
     # token quote_EXPR is in src/cheats/hll-grammar.pir

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -384,11 +384,11 @@ INIT {
 
 
 token nulltermish {
-    | <OPER=term=termish>
+    | $<OPER>=$<term>=<termish>
     | <?>
 }
 
-token infixish { <!infixstopper> <OPER=infix=infix> }
+token infixish { <!infixstopper> $<OPER>=$<infix>=<infix> }
 token infixstopper { <?lambda> }
 
 token postcircumfix:sym<[ ]> {