X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fparse.dcl;h=55d8a95c35005ac3126ee472c9489bfb18d789ba;hb=f63b1c16836bebf6eef2baa5f20d4d6ebc73e4dd;hp=8a368ba349e883be4f7e6a99ff41b468334ae7cd;hpb=bcbe06dff81439abede5659925d0474c36a6e887;p=cc1516.git diff --git a/src/parse.dcl b/src/parse.dcl index 8a368ba..55d8a95 100644 --- a/src/parse.dcl +++ b/src/parse.dcl @@ -8,37 +8,39 @@ 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 | BoolType | CharType | VarType - :: Expr - = VarExpr String (Maybe FieldSelector) + = VarExpr VarDef | Op2Expr Expr Op2 Expr | Op1Expr Op1 Expr | IntExpr Int | CharExpr Char | BoolExpr Bool - | FunExpr String [Expr] + | FunExpr FunCall | EmptyListExpr - | TupleExpr Expr Expr - + | TupleExpr (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 - -//TODO - -:: FunDecl = FunDecl String [String] FunType [VarDecl] [Stmt] -:: FunType = Stub -:: Stmt = Stubbel +:: FunDecl = FunDecl String [String] (Maybe FunType) [VarDecl] [Stmt] +:: FunType = FunType [Type] (Maybe Type) +:: FunCall = FunCall String [Expr] +:: Stmt + = IfStmt Expr [Stmt] [Stmt] + | WhileStmt Expr [Stmt] + | AssStmt VarDef Expr + | FunStmt FunCall + | ReturnStmt (Maybe Expr) instance toString AST