Added default functions, isEmpty does not typecheck...

[cc1516.git] / AST.dcl

diff --git a/AST.dcl b/AST.dcl
index e9c6944..1592143 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 ==, 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
@@ -41,7 +42,14 @@ from StdOverloaded import class toString, class ==, class <
 instance toString Pos
 instance toString Type
 instance toString AST
+instance toString FieldSelector
+instance toString Op2
+instance toString Expr
+instance toString VarDecl
+
+instance zero Pos
 instance == Op1
 instance == Op2
 instance < Op1
 instance < Op2
+instance == Type