update bindingssterkte

[cc1516.git] / src / grammar.txt

diff --git a/src/grammar.txt b/src/grammar.txt
index ca25bb0..697cca2 100644 (file)
--- a/src/grammar.txt
+++ b/src/grammar.txt
@@ -1,14 +1,25 @@
-<Expr>    ::= <id> ['hd'|'tl'|'fst'|'snd] <Expr`>
-                 | <Op1> <Expr> <Expr`>
-                 | <int> <Expr`>
-                 | <char> <Expr`>
-                 | 'False' <Expr`>
-                 | 'True' <Expr`>
-                 | '(' <Expr> ')' <Expr`>
-                 | <id> '(' [<ActArgs>] ')' <Expr`>
-                 | '[]' <Expr> <Expr`>
-                 | '(' <Expr> ',' <Expr> ')' <Expr`>
-<Expr`>   ::= <Op2> <Expr> <Expr`> | e
+<Expr>    ::= <ExprWithoutOp> <ExprMaybeOp>
+
+
+<ExprMaybeOp> ::= '+' <Expr>
+
+<ModExpr>      ::= <PlusMinExpr> ['%' <ModExpr>]
+
+<PlusMinExpr>  ::= <TimesDivExpr> [('+' | '-') <PlusMinExpr>]
+
+<TimesDivExpr> ::= <BasicExpr> ['*' | '/' | '%'] <TimesDivExpr>]
+
+<BasicExpr>    ::= <id> ['hd'|'tl'|'fst'|'snd]
+                      | <Op1> <Expr>
+                      | <int>
+                      | <char>
+                      | 'False'
+                      | 'True'
+                      | '(' <Expr> ')'
+                      | <id> '(' [<ActArgs>] ')'
+                      | '[]' <Expr>
+                      | '(' <Expr> ',' <Expr> ')'
+
 <Op2>     ::= '+' | '-' | '*' | '/' | '%' | '==' | '<' | '>' | '<=' | '>='
           |    '!=' | '&&' | '||' | ':'