X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fparse.dcl;h=8a368ba349e883be4f7e6a99ff41b468334ae7cd;hb=bcbe06dff81439abede5659925d0474c36a6e887;hp=3f42eda5effdfebccc321bdfb277253888c3a852;hpb=b4636110ab65f233ed40d4390b62c7799df3c949;p=cc1516.git

diff --git a/src/parse.dcl b/src/parse.dcl
index 3f42eda..8a368ba 100644
--- a/src/parse.dcl
+++ b/src/parse.dcl
@@ -20,11 +20,12 @@ import lex
 
 :: Expr 
 	= VarExpr String (Maybe FieldSelector)
-	| Op2Expr Expr Op2 Expr //TODO, iets met associativiteit wat niet weet hoe
+	| Op2Expr Expr Op2 Expr
 	| Op1Expr Op1 Expr
 	| IntExpr Int
 	| CharExpr Char
 	| BoolExpr Bool
+	| FunExpr String [Expr]
 	| EmptyListExpr
 	| TupleExpr Expr Expr
 
@@ -35,6 +36,10 @@ import lex
 
 //TODO
 
-:: FunDecl = Stub
+:: FunDecl = FunDecl String [String] FunType [VarDecl] [Stmt]
+:: FunType = Stub
+:: Stmt = Stubbel
 
-parse :: LexerOutput -> ParserOutput
+instance toString AST
+
+parser :: LexerOutput -> ParserOutput