X-Git-Url: http://nitlanguage.org

diff --git a/contrib/nitcc/examples/minilang.sablecc b/contrib/nitcc/examples/minilang.sablecc
index 7c951c0..954fdb0 100644
--- a/contrib/nitcc/examples/minilang.sablecc
+++ b/contrib/nitcc/examples/minilang.sablecc
@@ -6,7 +6,7 @@ l = 'a'..'z'|'A'..'Z'|'_';
 d = '0'..'9';
 id = l (l|d)*;
 int = d+;
-str = '"' (' '..'~' - '"')* '"';
+str = '"' (Any - '"')* '"';
 blank = ' ' | '\n' | '\t';
 
 Parser
@@ -27,31 +27,29 @@ stmts = '{' s* '}' ;
 else = 'else' stmts;
 
 e = 
-	{add:} [left:]e '+' [right:]e2 |
-	{sub:} [left:]e '-' [right:]e2 |
-	e2 {->e2};
-e2 {->e} =
-	{mul:} [left:]e2 '*' [right:]e3 |
-	{div:} [left:]e2 '/' [right:]e3 |
-	e3 {->e3};
-e3 {->e} =
-	{neg:} '-' e3 |
 	{lit:} int |
 	{par:} '(' e ')' |
 	{var:} id |
-	{read:} 'read' '(' ')' ;
+	{read:} 'read' '(' ')'
+Unary
+	{neg:} '-' e
+Left
+	{mul:} [left:]e '*' [right:]e |
+	{div:} [left:]e '/' [right:]e
+Right
+	{add:} [left:]e '+' [right:]e |
+	{sub:} [left:]e '-' [right:]e ;
 
 c =
-	{or:} [left:]c '||' [right:]c2 |
-	c2 {->c2};
-c2 {->c} =
-	{and:} [left:]c2 '&&' [right:]c3 |
-	c3 {->c3};
-c3 {->c} =
-	{not:} 'not' [c:]c3 |
 	{eq:} [left:]e '=' [right:]e |
 	{ne:} [left:]e '!=' [right:]e |
 	{lt:} [left:]e '<' [right:]e |
 	{le:} [left:]e '<=' [right:]e |
 	{gt:} [left:]e '>' [right:]e |
-	{ge:} [left:]e '>=' [right:]e ;
+	{ge:} [left:]e '>=' [right:]e
+Unary
+	{not:} 'not' c
+Left
+	{and:} [left:]c '&&' [right:]c
+Left
+	{or:} [left:]c '||' [right:]c ;