Meer falende monads

[cc1516.git] / AST.dcl

diff --git a/AST.dcl b/AST.dcl
index e0687c3..ac1cf4e 100644 (file)
--- a/AST.dcl
+++ b/AST.dcl
@@ -4,9 +4,8 @@ from Data.Maybe import :: Maybe
 from StdOverloaded import class toString
 
 :: Pos = {line :: Int, col :: Int}
-
 :: AST = AST [VarDecl] [FunDecl]
-:: VarDecl = VarDecl Type String Expr
+:: VarDecl = VarDecl Pos Type String Expr
 :: Type 
        = TupleType (Type, Type)
        | ListType Type
@@ -15,24 +14,24 @@ from StdOverloaded import class toString
        | BoolType
        | CharType
        | VarType
+    | VoidType
+    | (->>) infixl 7 Type Type
 :: Expr 
-       = VarExpr VarDef
-       | Op2Expr Expr Op2 Expr
-       | Op1Expr Op1 Expr
-       | IntExpr Int
-       | CharExpr Char
-       | BoolExpr Bool
-       | FunExpr FunCall
-       | EmptyListExpr
-       | TupleExpr (Expr, Expr)
+       = VarExpr Pos VarDef
+       | Op2Expr Pos Expr Op2 Expr
+       | Op1Expr Pos Op1 Expr
+       | IntExpr Pos Int
+       | CharExpr Pos Char
+       | BoolExpr Pos Bool
+       | FunExpr Pos FunCall
+       | EmptyListExpr Pos 
+       | TupleExpr Pos (Expr, Expr)
 :: VarDef = VarDef String [FieldSelector]
 :: FieldSelector = FieldHd | FieldTl | FieldFst | FieldSnd
 :: Op1 = UnNegation | UnMinus
 :: Op2 = BiPlus | BiMinus | BiTimes | BiDivide | BiMod | BiEquals | BiLesser |
        BiGreater | BiLesserEq | BiGreaterEq | BiUnEqual | BiAnd | BiOr | BiCons
-
-:: FunDecl = FunDecl 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]
@@ -42,3 +41,5 @@ from StdOverloaded import class toString
        | ReturnStmt (Maybe Expr)
 
 instance toString AST
+instance toString Type
+instance toString Pos