Merge branch 'master' of https://github.com/dopefishh/cc1516

[cc1516.git] / AST.dcl

diff --git a/AST.dcl b/AST.dcl
index 5b2bfad..4a5a6cb 100644 (file)
--- a/AST.dcl
+++ b/AST.dcl
@@ -15,6 +15,7 @@ from StdOverloaded import class toString, class ==, class zero, class <
        | BoolType
        | CharType
     | VoidType
+       | FuncType Type
     | (->>) infixl 7 Type Type
 :: Expr 
        = VarExpr Pos VarDef
@@ -36,15 +37,20 @@ 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 zero Pos
 instance == Op1
 instance == Op2
 instance < Op1
 instance < Op2
+instance == Type