Initial steps for operator precedence parsing via

the magic <O(...)> subrule. :-)
perl6 · Oct 19, 2009 · a27d5d1 · a27d5d1
1 parent c2b8fd7
commit a27d5d1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -38,6 +38,8 @@ NQP_LANG_DIR     = $(PARROT_LIB_DIR)/languages/nqp
 
 P6REGEX_SOURCES = \
   src/Regex/P6Regex.pir \
+  src/Regex/P6Regex/Grammar.pm \
+  src/Regex/P6Regex/Actions.pm \
   src/cheats/p6regex-grammar.pir \
   src/cheats/hll-compiler.pir \
   src/cheats/regex-cursor-protoregex.pir \
@@ -58,6 +60,7 @@ NQP_SOURCES = \
   src/NQP/Grammar.pm \
   src/NQP/Actions.pm \
   src/NQP/Compiler.pir \
+  src/cheats/nqp-grammar.pir \
 
 STAGE0 = src/stage0
 STAGE1 = src/stage1

diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -1,6 +1,9 @@
 class NQP::Actions;
 
-method TOP($/) {
+NQP::Grammar.O(':prec<u=>, :assoc<left>', '%multiplicative');
+NQP::Grammar.O(':prec<t=>, :assoc<left>', '%additive');
+
+method TOPx($/) {
     make $<value>.ast;
 }
 

diff --git a/src/NQP/Compiler.pir b/src/NQP/Compiler.pir
@@ -38,6 +38,8 @@ NQP::Compiler - NQP compiler
 .end
 
 
+.include 'src/cheats/nqp-grammar.pir'
+
 =cut
 
 # Local Variables:

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -3,7 +3,7 @@ grammar NQP::Grammar;
 token starter { \" }
 token stopper { \" }
 
-token TOP { <value> }
+token TOP { <infix>* }
 
 token value {
     | <integer>
@@ -64,3 +64,10 @@ token charspec {
     | <.panic: 'Unrecognized \\c character'>
     ]
 }
+
+proto token infix { <...> }
+token infix:sym<+> { '+' <O('%additive       , :pirop<add>')> }
+token infix:sym<-> { '-' <O('%additive       , :pirop<sub>')> }
+token infix:sym<*> { '*' <O('%multiplicative , :pirop<mul>')> }
+token infix:sym</> { '/' <O('%multiplicative , :pirop<div>')> }
+