X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=AST.dcl;h=b005f62577c8be8bbd628dc1250fc316779d0505;hb=c5fb28639ae923d9b55f5832e45186911e610991;hp=0bfe1baa49ad6a527d93aa4836351ed09927e871;hpb=51921a9587d60b6411610845f56d62ebd73f80cb;p=cc1516.git

diff --git a/AST.dcl b/AST.dcl
index 0bfe1ba..b005f62 100644
--- a/AST.dcl
+++ b/AST.dcl
@@ -15,6 +15,7 @@ from StdOverloaded import class toString, class ==, class zero, class <
 	| BoolType
 	| CharType
     | VoidType
+	| FuncType Type
     | (->>) infixl 7 Type Type
 :: Expr 
 	= VarExpr Pos VarDef
@@ -26,6 +27,7 @@ from StdOverloaded import class toString, class ==, class zero, class <
 	| FunExpr Pos String [Expr] [FieldSelector]
 	| EmptyListExpr Pos 
 	| TupleExpr Pos (Expr, Expr)
+    | LambdaExpr Pos [String] Expr
 :: VarDef = VarDef String [FieldSelector]
 :: FieldSelector = FieldHd | FieldTl | FieldFst | FieldSnd
 :: Op1 = UnNegation | UnMinus
@@ -36,7 +38,7 @@ from StdOverloaded import class toString, class ==, class zero, class <
 	= IfStmt Expr [Stmt] [Stmt]
 	| WhileStmt Expr [Stmt]
 	| AssStmt VarDef Expr
-	| FunStmt String [Expr]
+	| FunStmt String [Expr] [FieldSelector]
 	| ReturnStmt (Maybe Expr)
 
 instance toString Pos
@@ -45,6 +47,8 @@ instance toString AST
 instance toString FieldSelector
 instance toString Op2
 instance toString Expr
+instance toString VarDecl
+instance toString FunDecl
 
 instance zero Pos
 instance == Op1