X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fparse.dcl;h=55d8a95c35005ac3126ee472c9489bfb18d789ba;hb=3d1c57710eb0b86f13df392f03131157aec22c21;hp=e7d2a25e042ee50cff777cbcd57dc0be28eb490b;hpb=9b257f4008624c0bdbb9821291f46e553e2f0f91;p=cc1516.git

diff --git a/src/parse.dcl b/src/parse.dcl
index e7d2a25..55d8a95 100644
--- a/src/parse.dcl
+++ b/src/parse.dcl
@@ -8,35 +8,39 @@ import lex
 :: ParserOutput :== Either String AST
 
 :: AST = AST [VarDecl] [FunDecl]
-:: VarDecl = VarDecl String Type Expr
+:: VarDecl = VarDecl Type String Expr
 :: Type 
-	= TupleType Type Type
+	= TupleType (Type, Type)
 	| ListType Type
 	| IdType String
 	| IntType 
 	| BoolType
 	| CharType
 	| VarType
-
 :: Expr 
-	= VarExpr String (Maybe FieldSelector)
-	| Op2Expr Expr Op2 Expr //TODO, iets met associativiteit wat niet weet hoe
+	= VarExpr VarDef
+	| Op2Expr Expr Op2 Expr
 	| Op1Expr Op1 Expr
 	| IntExpr Int
 	| CharExpr Char
 	| BoolExpr Bool
-	| FunExpr String [Expr]
+	| FunExpr FunCall
 	| EmptyListExpr
-	| TupleExpr Expr Expr
-
+	| TupleExpr (Expr, Expr)
+:: VarDef = VarDef String [FieldSelector]
 :: FieldSelector = FieldHd | FieldTl | FieldFst | FieldSnd
 :: Op1 = UnNegation | UnMinus
 :: Op2 = BiPlus | BiMinus | BiTimes | BiDivide | BiMod | BiEquals | BiLesser |
 	BiGreater | BiLesserEq | BiGreaterEq | BiUnEqual | BiAnd | BiOr | BiCons
-
-//TODO
-
-:: FunDecl = Stub
+:: FunDecl = FunDecl String [String] (Maybe FunType) [VarDecl] [Stmt]
+:: FunType = FunType [Type] (Maybe Type)
+:: FunCall = FunCall String [Expr]
+:: Stmt 
+	= IfStmt Expr [Stmt] [Stmt]
+	| WhileStmt Expr [Stmt]
+	| AssStmt VarDef Expr
+	| FunStmt FunCall
+	| ReturnStmt (Maybe Expr)
 
 instance toString AST