X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.dcl;h=4a5a6cb49b9a6531773237ec2b72e07d33209188;hb=14e9a339d121ce18c420e4cb99f6bad86d1a5b45;hp=0d8644f494e31ff4071d4d91f852e25f09030e23;hpb=cbaff96b96d2def874b8a1fa9454414c6602a829;p=cc1516.git

diff --git a/AST.dcl b/AST.dcl
index 0d8644f..4a5a6cb 100644
--- a/AST.dcl
+++ b/AST.dcl
@@ -1,19 +1,22 @@
 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
 	| Op2Expr Pos Expr Op2 Expr
@@ -21,7 +24,7 @@ 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)
 :: VarDef = VarDef String [FieldSelector]
@@ -29,14 +32,25 @@ from StdOverloaded import class toString
 :: Op1 = UnNegation | UnMinus
 :: Op2 = BiPlus | BiMinus | BiTimes | BiDivide | BiMod | BiEquals | BiLesser |
 	BiGreater | BiLesserEq | BiGreaterEq | BiUnEqual | BiAnd | BiOr | BiCons
-:: FunDecl = FunDecl Pos String [String] (Maybe FunType) [VarDecl] [Stmt]
-:: FunType = FunType [Type] (Maybe Type)
-:: FunCall = FunCall String [Expr]
+:: FunDecl = FunDecl Pos String [String] (Maybe Type) [VarDecl] [Stmt]
 :: Stmt 
 	= IfStmt Expr [Stmt] [Stmt]
 	| WhileStmt Expr [Stmt]
 	| AssStmt VarDef Expr
-	| FunStmt FunCall
+	| 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
+instance == Op2
+instance < Op1
+instance < Op2
+instance == Type