repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Working Monad transformer except for Clean not finding an existing instance
[cc1516.git]
/
AST.dcl
diff --git
a/AST.dcl
b/AST.dcl
index
9132067
..
ac1cf4e
100644
(file)
--- a/
AST.dcl
+++ b/
AST.dcl
@@
-3,16
+3,7
@@
definition module AST
from Data.Maybe import :: Maybe
from StdOverloaded import class toString
from Data.Maybe import :: Maybe
from StdOverloaded import class toString
-/*
- * Type errors can happen in either
- * - variable declarations (x :: Int = True)
- * - function declarations (f :: (Char -> Int) = (+)1)
- * - Expressions (1 + 'a')
- * So these are the items that will get position metadata
- */
-
:: Pos = {line :: Int, col :: Int}
:: Pos = {line :: Int, col :: Int}
-
:: AST = AST [VarDecl] [FunDecl]
:: VarDecl = VarDecl Pos Type String Expr
:: Type
:: AST = AST [VarDecl] [FunDecl]
:: VarDecl = VarDecl Pos Type String Expr
:: Type
@@
-23,6
+14,8
@@
from StdOverloaded import class toString
| BoolType
| CharType
| VarType
| BoolType
| CharType
| VarType
+ | VoidType
+ | (->>) infixl 7 Type Type
:: Expr
= VarExpr Pos VarDef
| Op2Expr Pos Expr Op2 Expr
:: Expr
= VarExpr Pos VarDef
| Op2Expr Pos Expr Op2 Expr
@@
-38,9
+31,7
@@
from StdOverloaded import class toString
:: Op1 = UnNegation | UnMinus
:: Op2 = BiPlus | BiMinus | BiTimes | BiDivide | BiMod | BiEquals | BiLesser |
BiGreater | BiLesserEq | BiGreaterEq | BiUnEqual | BiAnd | BiOr | BiCons
:: Op1 = UnNegation | UnMinus
:: Op2 = BiPlus | BiMinus | BiTimes | BiDivide | BiMod | BiEquals | BiLesser |
BiGreater | BiLesserEq | BiGreaterEq | BiUnEqual | BiAnd | BiOr | BiCons
-
-:: FunDecl = FunDecl Pos String [String] (Maybe FunType) [VarDecl] [Stmt]
-:: FunType = FunType [Type] (Maybe Type)
+:: FunDecl = FunDecl Pos String [String] (Maybe Type) [VarDecl] [Stmt]
:: FunCall = FunCall String [Expr]
:: Stmt
= IfStmt Expr [Stmt] [Stmt]
:: FunCall = FunCall String [Expr]
:: Stmt
= IfStmt Expr [Stmt] [Stmt]
@@
-50,3
+41,5
@@
from StdOverloaded import class toString
| ReturnStmt (Maybe Expr)
instance toString AST
| ReturnStmt (Maybe Expr)
instance toString AST
+instance toString Type
+instance toString Pos