Added function type inference

[cc1516.git] / AST.dcl

diff --git a/AST.dcl b/AST.dcl
index 0d8644f..cb2e5b7 100644 (file)
--- a/AST.dcl
+++ b/AST.dcl
@@ -1,7 +1,7 @@
 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]
@@ -9,11 +9,13 @@ from StdOverloaded import class toString
 :: 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
@@ -29,8 +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]
@@ -40,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