X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fgrammar.txt;h=ce6732b87b223a68a8ea0614cb32936730b15341;hb=3d1c57710eb0b86f13df392f03131157aec22c21;hp=ab2e4dbe4c8962f4e3608ae0449913d039e93d44;hpb=d1e64de8a0cc6c01fba1a3dc17686f9539bf5744;p=cc1516.git

diff --git a/src/grammar.txt b/src/grammar.txt
index ab2e4db..ce6732b 100644
--- a/src/grammar.txt
+++ b/src/grammar.txt
@@ -1,27 +1,38 @@
+<FunDecl>      ::= <id> '(' <Type>* ')' ['::' <FunType] '{' <VarDecl>* <Stmt>+ '}'
+<FunType>      ::= <Type>+ '->' <VoidType>
+                 | <VoidType> 
+<Stmt>         ::= 'if' '(' <Expr> ')' '{' <Stmt>* '}' ['else' '{' <Stmt>* '}']
+                 | 'while' '(' <Expr> ')' '{' <Stmt>* '}'
+                 | <id> <FieldSels> '=' <Expr> ';'
+                 | <FunCall> ';'
+                 | 'return' [<Expr>] ';'
+
+<VarDecl>      ::= (<Type> | 'var') <id> '=' <Expr> ';'
 <Expr>         ::= <BinOrExpr> [':' <Expr>]
 <BinOrExpr>    ::= <BinAndExpr> ['||' <BinOrExpr>]
 <BinAndExpr>   ::= <CompareExpr> ['&&' <BinAndExpr>]
 <CompareExpr>  ::= <PlusMinExpr> [('==' | '<' | '>' | '<=' | '>=' | '!=') <CompareExpr>]
 <PlusMinExpr>  ::= <TimesDivExpr> (('+' | '-') <TimesDivExpr>)*
-<TimesDivExpr> ::= <BasicExpr> ('*' | '/' | '%'] <BasicExpr>)*
-<BasicExpr>    ::= <id> ['hd'|'tl'|'fst'|'snd]
+<TimesDivExpr> ::= <BasicExpr> (['*' | '/' | '%'] <BasicExpr>)*
+<BasicExpr>    ::= <id> <FieldSels>
                  | <Op1> <Expr>
                  | <int>
                  | <char>
                  | 'False'
                  | 'True'
                  | '(' <Expr> ')'
-                 | <id> '(' [<ActArgs>] ')'
+                 | <FunCall>
                  | '[]' <Expr>
                  | '(' <Expr> ',' <Expr> ')'
 
+<FieldSels>    ::= ('.' ('hd'|'tl'|'fst'|'snd))*
+<FunCall>      ::= <id> '(' [<ActArgs>] ')'
 <ActArgs>      ::= <Expr> [',' ActArgs]
 
-<VarDecl>      ::= (<Type> | 'var') <id> '=' <Expr> ';'
-
 <Type>         ::= 'Int'
                  | 'Bool'
                  | 'Char'
                  | '(' Type ',' Type ')'
                  | '[' Type ']'
                  | <id>
+<VoidType>     ::= 'Void' | Type