X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=AST.dcl;h=e9afa4fb042a94cfccb4cc40d172b4d807eb6bd0;hb=74b900cf6db033a51e177f7f85d835dae44217e5;hp=4f65b0eed3f0868fe52326df8ad8ee2c23b594d8;hpb=920ef953a2db44169bd34805233fecbbe334d10e;p=cc1516.git

diff --git a/AST.dcl b/AST.dcl
index 4f65b0e..e9afa4f 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,12 +38,16 @@ 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
 instance toString Type
 instance toString AST
+instance toString FieldSelector
+instance toString Op2
+instance toString Expr
+instance toString VarDecl
 
 instance zero Pos
 instance == Op1