X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fgrammar.txt;h=697cca2099bea5c9c05d08eab52d1faeb9961056;hb=83c1b3ef201e51264439958e1121e8b24d6b3fea;hp=ca25bb06f261464a51401135f1ea31eb6e292859;hpb=ecb884c3135dd60d57288b51359f458a6d127c77;p=cc1516.git

diff --git a/src/grammar.txt b/src/grammar.txt
index ca25bb0..697cca2 100644
--- 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>     ::= '+' | '-' | '*' | '/' | '%' | '==' | '<' | '>' | '<=' | '>='
           |	'!=' | '&&' | '||' | ':'