X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.dcl;h=3a61b546b744a0f093eecfc903627ae7d91249f3;hb=6d70a636ed3b4573c4c81ba068ae2b46523c9465;hp=e0687c3c134e3a588683e92ca4151abf7223a9a2;hpb=80bcdf651a056b8993e042b57b4295550e8566bb;p=cc1516.git

diff --git a/AST.dcl b/AST.dcl
index e0687c3..3a61b54 100644
--- a/AST.dcl
+++ b/AST.dcl
@@ -1,38 +1,37 @@
 definition module AST
 
 from Data.Maybe import :: Maybe
-from StdOverloaded import class toString
+from StdOverloaded import class toString, class ==
 
 :: Pos = {line :: Int, col :: Int}
-
 :: AST = AST [VarDecl] [FunDecl]
-:: VarDecl = VarDecl Type String Expr
+:: VarDecl = VarDecl Pos Type String Expr
 :: Type 
 	= TupleType (Type, Type)
 	| ListType Type
-	| IdType String
+	| IdType String 
 	| IntType 
 	| BoolType
 	| CharType
 	| VarType
+    | VoidType
+    | (->>) infixl 7 Type Type
 :: Expr 
-	= VarExpr VarDef
-	| Op2Expr Expr Op2 Expr
-	| Op1Expr Op1 Expr
-	| IntExpr Int
-	| CharExpr Char
-	| BoolExpr Bool
-	| FunExpr FunCall
-	| EmptyListExpr
-	| TupleExpr (Expr, Expr)
+	= VarExpr Pos VarDef
+	| Op2Expr Pos Expr Op2 Expr
+	| Op1Expr Pos Op1 Expr
+	| IntExpr Pos Int
+	| CharExpr Pos Char
+	| BoolExpr Pos Bool
+	| FunExpr Pos FunCall
+	| EmptyListExpr Pos 
+	| TupleExpr Pos (Expr, 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 String [String] (Maybe FunType) [VarDecl] [Stmt]
-:: FunType = FunType [Type] (Maybe Type)
+:: FunDecl = FunDecl Pos String [String] (Maybe Type) [VarDecl] [Stmt]
 :: FunCall = FunCall String [Expr]
 :: Stmt 
 	= IfStmt Expr [Stmt] [Stmt]
@@ -42,3 +41,8 @@ from StdOverloaded import class toString
 	| ReturnStmt (Maybe Expr)
 
 instance toString AST
+instance toString Type
+instance toString Pos
+instance toString Op2
+instance == Op2
+instance toString FieldSelector