improving type checking

[cc1516.git] / AST.dcl

diff --git a/AST.dcl b/AST.dcl
index f415045..b005f62 100644 (file)
--- a/AST.dcl
+++ b/AST.dcl
@@ -6,14 +6,16 @@ from StdOverloaded import class toString, class ==, class zero, class <
 :: Pos = {line :: Int, col :: Int}
 :: 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
     | VoidType
+       | FuncType Type
     | (->>) infixl 7 Type Type
 :: Expr 
        = VarExpr Pos VarDef
@@ -25,6 +27,7 @@ from StdOverloaded import class toString, class ==, class zero, class <
        | FunExpr Pos String [Expr] [FieldSelector]
        | EmptyListExpr Pos 
        | TupleExpr Pos (Expr, Expr)
+    | LambdaExpr Pos [String] Expr
 :: VarDef = VarDef String [FieldSelector]
 :: FieldSelector = FieldHd | FieldTl | FieldFst | FieldSnd
 :: Op1 = UnNegation | UnMinus
@@ -35,15 +38,21 @@ from StdOverloaded import class toString, class ==, class zero, class <
        = IfStmt Expr [Stmt] [Stmt]
        | WhileStmt Expr [Stmt]
        | AssStmt VarDef Expr
-       | FunStmt String [Expr]
+       | 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 toString FunDecl
 
 instance zero Pos
 instance == Op1
 instance == Op2
 instance < Op1
 instance < Op2
+instance == Type