X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=AST.dcl;h=cb2e5b790e5efbbde642495ce13800db8203cf56;hb=e641250705517611f422540d8ba3fe021e6068b3;hp=91320675bcae60c1f042f88847f5662246af6e2e;hpb=3ca56ec76529508b1e6a3c10c145b15312f571f7;p=cc1516.git

diff --git a/AST.dcl b/AST.dcl
index 9132067..cb2e5b7 100644
--- a/AST.dcl
+++ b/AST.dcl
@@ -1,28 +1,21 @@
 definition module AST
 
 from Data.Maybe import :: Maybe
-from StdOverloaded import class toString
-
-/*
- * Type errors can happen in either 
- * - variable declarations (x :: Int = True)
- * - function declarations (f :: (Char -> Int) = (+)1)
- * - Expressions (1 + 'a')
- * So these are the items that will get position metadata
- */
+from StdOverloaded import class toString, class ==
 
 :: Pos = {line :: Int, col :: Int}
-
 :: AST = AST [VarDecl] [FunDecl]
 :: 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 Pos VarDef
 	| Op2Expr Pos Expr Op2 Expr
@@ -38,9 +31,7 @@ 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)
+:: FunDecl = FunDecl Pos String [String] (Maybe Type) [VarDecl] [Stmt]
 :: FunCall = FunCall String [Expr]
 :: Stmt 
 	= IfStmt Expr [Stmt] [Stmt]
@@ -50,3 +41,9 @@ from StdOverloaded import class toString
 	| ReturnStmt (Maybe Expr)
 
 instance toString AST
+instance toString Type
+instance toString Pos
+instance toString Op2
+instance == Op2
+instance == Type
+instance toString FieldSelector