ASSOCIATIVITY, DO WE EVER PARSE IT??????!!!!111!one!111eleven

[cc1516.git] / src / grammar.txt

diff --git a/src/grammar.txt b/src/grammar.txt
index ca25bb0..ab2e4db 100644 (file)
--- 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>