Reduce higher predecence operators immediately.

Test nqp with multiple levels of precedence.
perl6 · Oct 19, 2009 · 5b872f0 · 5b872f0
1 parent ecc6416
commit 5b872f0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -1,6 +1,8 @@
 class NQP::Actions is HLL::Actions;
 
 # These will eventually go in NQP::Grammar.
+NQP::Grammar.O(':prec<w=>, :assoc<left>', '%exponentiation');
+NQP::Grammar.O(':prec<u=>, :assoc<left>', '%multiplicative');
 NQP::Grammar.O(':prec<t=>, :assoc<left>', '%additive');
 
 method TOP($/) { make $<EXPR>.ast; }

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -6,8 +6,12 @@ proto token term { <...> }
 token term:sym<value> { <value> }
 
 proto token infix { <...> }
-token infix:sym<+> { $<sym>=['+'] <O('%additive, :pirop<add>')> }
-token infix:sym<-> { $<sym>=['-'] <O('%additive, :pirop<sub>')> }
+token infix:sym<**> { $<sym>=['**'] <O('%exponentiation, :pirop<pow>')> }
+token infix:sym<*>  { $<sym>=['*']  <O('%multiplicative, :pirop<mul>')> }
+token infix:sym</>  { $<sym>=['/']  <O('%multiplicative, :pirop<div>')> }
+token infix:sym<%>  { $<sym>=['%']  <O('%multiplicative, :pirop<mod>')> }
+token infix:sym<+>  { $<sym>=['+']  <O('%additive      , :pirop<add>')> }
+token infix:sym<->  { $<sym>=['-']  <O('%additive      , :pirop<sub>')> }
 
 token value {
     | <integer>

diff --git a/src/cheats/hll-grammar.pir b/src/cheats/hll-grammar.pir
@@ -393,9 +393,17 @@ An operator precedence parser.
     inprec = $P0['prec']
     inassoc = $P0['assoc']
     unless inprec goto err_inprec
+
+  reduce_loop:
     $P0 = opstack[-1]
     $P0 = $P0['O']
     opprec = $P0['prec']
+    unless opprec > inprec goto reduce_gt_done
+    capture_lex reduce
+    self.reduce()
+    goto reduce_loop
+  reduce_gt_done:
+
     unless opprec == inprec goto reduce_done
     # equal precedence, use associativity to decide
     unless inassoc == 'left' goto reduce_done