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
bf6f54f
..
4a5a6cb
100644
(file)
--- a/
AST.dcl
+++ b/
AST.dcl
@@
-1,19
+1,21
@@
definition module AST
from Data.Maybe import :: Maybe
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
:: Pos = {line :: Int, col :: Int}
:: AST = AST [FunDecl]
:: VarDecl = VarDecl Pos (Maybe Type) String Expr
+:: TVar :== String
:: Type
= TupleType (Type, Type)
| ListType Type
:: Type
= TupleType (Type, Type)
| ListType Type
- | IdType
String
+ | IdType
TVar
| IntType
| BoolType
| CharType
| VoidType
| IntType
| BoolType
| CharType
| VoidType
+ | FuncType Type
| (->>) infixl 7 Type Type
:: Expr
= VarExpr Pos VarDef
| (->>) infixl 7 Type Type
:: Expr
= VarExpr Pos VarDef
@@
-35,12
+37,20
@@
from StdOverloaded import class toString, 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)
| ReturnStmt (Maybe Expr)
-instance toString AST
-instance toString Type
instance toString Pos
instance toString Pos
+instance toString Type
+instance toString AST
+instance toString FieldSelector
instance toString Op2
instance toString Op2
+instance toString Expr
+instance toString VarDecl
+
+instance zero Pos
+instance == Op1
instance == Op2
instance == Op2
-instance toString FieldSelector
+instance < Op1
+instance < Op2
+instance == Type