infer voor statements

[cc1516.git] / AST.dcl

diff --git a/AST.dcl b/AST.dcl
index bf6f54f..4f65b0e 100644 (file)
--- a/AST.dcl
+++ b/AST.dcl
@@ -1,15 +1,16 @@
 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 [FunDecl]
 :: VarDecl = VarDecl Pos (Maybe Type) String Expr
+:: TVar :== String
 :: Type 
        = TupleType (Type, Type)
        | ListType Type
-       | IdType String 
+       | IdType TVar 
        | IntType 
        | BoolType
        | CharType
@@ -38,9 +39,13 @@ from StdOverloaded import class toString, class ==
        | 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