X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fgrammar.txt;h=ab2e4dbe4c8962f4e3608ae0449913d039e93d44;hb=bcbe06dff81439abede5659925d0474c36a6e887;hp=ca25bb06f261464a51401135f1ea31eb6e292859;hpb=4b1fa735020db50a74432026107834b2df1fc719;p=cc1516.git

diff --git a/src/grammar.txt b/src/grammar.txt
index ca25bb0..ab2e4db 100644
--- a/src/grammar.txt
+++ b/src/grammar.txt
@@ -1,24 +1,27 @@
-<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
-<Op2>     ::= '+' | '-' | '*' | '/' | '%' | '==' | '<' | '>' | '<=' | '>='
-          |	'!=' | '&&' | '||' | ':'
+<Expr>         ::= <BinOrExpr> [':' <Expr>]
+<BinOrExpr>    ::= <BinAndExpr> ['||' <BinOrExpr>]
+<BinAndExpr>   ::= <CompareExpr> ['&&' <BinAndExpr>]
+<CompareExpr>  ::= <PlusMinExpr> [('==' | '<' | '>' | '<=' | '>=' | '!=') <CompareExpr>]
+<PlusMinExpr>  ::= <TimesDivExpr> (('+' | '-') <TimesDivExpr>)*
+<TimesDivExpr> ::= <BasicExpr> ('*' | '/' | '%'] <BasicExpr>)*
+<BasicExpr>    ::= <id> ['hd'|'tl'|'fst'|'snd]
+                 | <Op1> <Expr>
+                 | <int>
+                 | <char>
+                 | 'False'
+                 | 'True'
+                 | '(' <Expr> ')'
+                 | <id> '(' [<ActArgs>] ')'
+                 | '[]' <Expr>
+                 | '(' <Expr> ',' <Expr> ')'
 
-<ActArgs> ::= <Expr> [',' ActArgs]
+<ActArgs>      ::= <Expr> [',' ActArgs]
 
-<VarDecl> ::= (<Type> | 'var') <id> '=' <Expr> ';'
+<VarDecl>      ::= (<Type> | 'var') <id> '=' <Expr> ';'
 
-<Type> ::= 'Int'
-       | 'Bool'
-       | 'Char'
-       | '(' Type ',' Type ')'
-       | '[' Type ']'
-       | <id>
+<Type>         ::= 'Int'
+                 | 'Bool'
+                 | 'Char'
+                 | '(' Type ',' Type ')'
+                 | '[' Type ']'
+                 | <id>