repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/dopefishh/cc1516
[cc1516.git]
/
AST.dcl
diff --git
a/AST.dcl
b/AST.dcl
index
4f65b0e
..
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
| BoolType
| CharType
| VoidType
+ | FuncType Type
| (->>) infixl 7 Type Type
:: Expr
= VarExpr Pos VarDef
| (->>) infixl 7 Type Type
:: Expr
= VarExpr Pos VarDef
@@
-36,12
+37,16
@@
from StdOverloaded import class toString, class ==, class zero, class <
= IfStmt Expr [Stmt] [Stmt]
| WhileStmt Expr [Stmt]
| AssStmt VarDef Expr
= 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
| 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 zero Pos
instance == Op1