X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.dcl;h=b005f62577c8be8bbd628dc1250fc316779d0505;hb=1f77588b4d69fdb9f8880864240458efd5b51561;hp=97741e54d47e3e67b925909ff78e0b2621d27ec0;hpb=2473a12c050ab50a6fded6d4ea6df9b81ab8abf1;p=cc1516.git

diff --git a/AST.dcl b/AST.dcl
index 97741e5..b005f62 100644
--- a/AST.dcl
+++ b/AST.dcl
@@ -1,20 +1,21 @@
 definition module AST
 
 from Data.Maybe import :: Maybe
-from StdOverloaded import class toString
+from StdOverloaded import class toString, class ==, class zero, class <
 
 :: Pos = {line :: Int, col :: Int}
-:: AST = AST [VarDecl] [FunDecl]
-:: VarDecl = VarDecl Pos Type String Expr
+:: AST = AST [FunDecl]
+:: VarDecl = VarDecl Pos (Maybe Type) String Expr
+:: TVar :== String
 :: Type 
 	= TupleType (Type, Type)
 	| ListType Type
-	| IdType String 
+	| IdType TVar 
 	| IntType 
 	| BoolType
 	| CharType
-	| VarType
     | VoidType
+	| FuncType Type
     | (->>) infixl 7 Type Type
 :: Expr 
 	= VarExpr Pos VarDef
@@ -23,24 +24,35 @@ from StdOverloaded import class toString
 	| IntExpr Pos Int
 	| CharExpr Pos Char
 	| BoolExpr Pos Bool
-	| FunExpr Pos FunCall
+	| 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
 :: Op2 = BiPlus | BiMinus | BiTimes | BiDivide | BiMod | BiEquals | BiLesser |
 	BiGreater | BiLesserEq | BiGreaterEq | BiUnEqual | BiAnd | BiOr | BiCons
 :: FunDecl = FunDecl Pos String [String] (Maybe Type) [VarDecl] [Stmt]
-:: FunCall = FunCall String [Expr]
 :: Stmt 
 	= IfStmt Expr [Stmt] [Stmt]
 	| WhileStmt Expr [Stmt]
 	| AssStmt VarDef Expr
-	| FunStmt FunCall
+	| FunStmt String [Expr] [FieldSelector]
 	| ReturnStmt (Maybe Expr)
 
-instance toString AST
-instance toString Type
 instance toString Pos
+instance toString Type
+instance toString AST
 instance toString FieldSelector
+instance toString Op2
+instance toString Expr
+instance toString VarDecl
+instance toString FunDecl
+
+instance zero Pos
+instance == Op1
+instance == Op2
+instance < Op1
+instance < Op2
+instance == Type