alles liftm behalve parseseplist

[cc1516.git] / src / parse.dcl

diff --git a/src/parse.dcl b/src/parse.dcl
index baef545..62a0461 100644 (file)
--- a/src/parse.dcl
+++ b/src/parse.dcl
@@ -8,9 +8,9 @@ import lex
 :: ParserOutput :== Either String AST
 
 :: AST = AST [VarDecl] [FunDecl]
-:: VarDecl = VarDecl String Type Expr
+:: VarDecl = VarDecl Type String Expr
 :: Type 
-       = TupleType Type Type
+       = TupleType (Type, Type)
        | ListType Type
        | IdType String
        | IntType 
@@ -26,7 +26,7 @@ import lex
        | BoolExpr Bool
        | FunExpr FunCall
        | EmptyListExpr
-       | TupleExpr Expr Expr
+       | TupleExpr (Expr, Expr)
 :: VarDef = VarDef String [FieldSelector]
 :: FieldSelector = FieldHd | FieldTl | FieldFst | FieldSnd
 :: Op1 = UnNegation | UnMinus