parseStmt :: Parser Token Stmt
parseStmt = parseIfStmt <|> parseWhileStmt <|>
parseSColon parseAssStmt <|> parseSColon parseReturnStmt <|>
- (parseSColon parseFunCall >>= \(ident, args)->pure $ FunStmt ident args)
+ (parseSColon parseFunCall
+ >>= \(ident, args, fs)->pure $ FunStmt ident args fs)
where
parseSColon :: (Parser Token a) -> Parser Token a
parseSColon p = p <* satTok SColonToken
parseFunType = satTok DoubleColonToken *> parseFT
where
parseFT :: Parser Token Type
- parseFT = (liftM2 (->>)
- ((parseBBraces parseFT <|> parseType) <* satTok ArrowToken)
- parseFT) <|> parseType
+ parseFT = (liftM2 (->>) (parseSF <* satTok ArrowToken) (parseFT)) <|>
+ parseSF
+ parseSF :: Parser Token Type
+ parseSF = parseBBraces parseFT <|> parseType
parseVarDecl :: Parser Token VarDecl
parseVarDecl = liftM4 VarDecl
parseBasicExpr :: Parser Token Expr
parseBasicExpr = peekPos >>= \pos ->
(TupleExpr pos <$> (parseTuple parseExpr)) <|>
- (parseFunCall >>= \(ident, args)->parseFieldSelectors >>= \fs->
- pure $ FunExpr pos ident args fs) <|>
parseBBraces parseExpr <|>
trans1 EmptyListToken (EmptyListExpr pos) <|>
trans1 TrueToken (BoolExpr pos True) <|>
trans2 (NumberToken zero) (\(NumberToken i)->IntExpr pos i) <|>
trans2 (CharToken zero) (\(CharToken c)->CharExpr pos c) <|>
(Op1Expr pos <$> parseOp1 <*> parseExpr) <|>
+ (parseFunCall >>= \(ident, args, fs)->
+ pure $ FunExpr pos ident args fs) <|>
(VarExpr pos <$> parseVarDef)
-parseFunCall :: Parser Token (String, [Expr])
-parseFunCall = tuple <$> parseIdent <*> (
- (parseBBraces $ parseSepList CommaToken parseExpr) <|> pure [])
+parseFunCall :: Parser Token (String, [Expr], [FieldSelector])
+parseFunCall = liftM3 (\x y z->(x, y, z))
+ parseIdent
+ (parseBBraces $ parseSepList CommaToken parseExpr)
+ parseFieldSelectors
parseVarDef :: Parser Token VarDef
parseVarDef = liftM2 VarDef parseIdent parseFieldSelectors
parseFieldSelectors :: Parser Token [FieldSelector]
-parseFieldSelectors = many (satTok DotToken *> (
- (parseIdent >>= \i.if (i == "hd") (pure FieldHd) empty) <|>
- (parseIdent >>= \i.if (i == "tl") (pure FieldTl) empty) <|>
- (parseIdent >>= \i.if (i == "fst") (pure FieldFst) empty) <|>
- (parseIdent >>= \i.if (i == "snd") (pure FieldSnd) empty)))
+parseFieldSelectors = many (satTok DotToken *>
+ parseIdent >>= \i->case i of
+ "hd" = pure FieldHd
+ "tl" = pure FieldTl
+ "fst" = pure FieldFst
+ "snd" = pure FieldSnd
+ _ = empty)
parseOp1 :: Parser Token Op1
parseOp1 = trans1 DashToken UnMinus <|> trans1 ExclamationToken UnNegation