X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.dcl;h=4f65b0eed3f0868fe52326df8ad8ee2c23b594d8;hb=1f01e39fb2383aa2c63234d0750c0459fe3de752;hp=3a61b546b744a0f093eecfc903627ae7d91249f3;hpb=302891ef956bd735780714742850947bf7588ce5;p=cc1516.git

diff --git a/AST.dcl b/AST.dcl
index 3a61b54..4f65b0e 100644
--- a/AST.dcl
+++ b/AST.dcl
@@ -1,19 +1,19 @@
 definition module AST
 
 from Data.Maybe import :: Maybe
-from StdOverloaded import class toString, class ==
+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
     | (->>) infixl 7 Type Type
 :: Expr 
@@ -23,7 +23,7 @@ from StdOverloaded import class toString, class ==
 	| 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]
@@ -32,17 +32,20 @@ from StdOverloaded import class toString, class ==
 :: 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]
 	| ReturnStmt (Maybe Expr)
 
-instance toString AST
-instance toString Type
 instance toString Pos
-instance toString Op2
+instance toString Type
+instance toString AST
+
+instance zero Pos
+instance == Op1
 instance == Op2
-instance toString FieldSelector
+instance < Op1
+instance < Op2
+instance == Type