import Data.Either
import Data.Maybe
import Data.Functor
+import Data.Tuple
import Control.Monad
import Control.Applicative
import Data.Func
+import StdMisc
from Data.List import intercalate, replicate, instance Functor []
from Text import class Text(concat), instance Text String
import GenPrint
import lex
import AST
-parser :: LexerOutput -> ParserOutput
-parser (Left e) = Left e
-parser (Right r) = case runParser parseProgram r of
+parser :: [Token] -> ParserOutput
+parser ts = case runParser parseProgram ts of
(Right ast, [(p, t):xs]) = Left $ PositionalError p.line p.col (
"Unable to parse from: " +++ printToString t)
x = fst x
parseProgram :: Parser Token AST
-parseProgram = AST <$> (many parseVarDecl) <*> (some parseFunDecl)
+parseProgram = AST <$> some parseFunDecl
parseFunDecl :: Parser Token FunDecl
parseFunDecl = liftM6 FunDecl
parseStmt :: Parser Token Stmt
parseStmt = parseIfStmt <|> parseWhileStmt <|>
parseSColon parseAssStmt <|> parseSColon parseReturnStmt <|>
- (FunStmt <$> parseSColon parseFunCall)
+ (parseSColon parseFunCall >>= \(ident, args)->pure $ FunStmt ident args)
where
parseSColon :: (Parser Token a) -> Parser Token a
parseSColon p = p <* satTok SColonToken
parseBlock = parseBCBraces (many parseStmt)
parseOneLine :: Parser Token [Stmt]
- //first pure makes singleton list from the statement
parseOneLine = pure <$> parseStmt
-parseFunType :: Parser Token FunType
-parseFunType = satTok DoubleColonToken *>
- (parseInOutType <|> ((FunType []) <$> parseVoidOrType))
+parseFunType :: Parser Token Type
+parseFunType = satTok DoubleColonToken *> parseFT
where
- parseInOutType :: Parser Token FunType
- parseInOutType = FunType <$> (some parseType <* satTok ArrowToken) <*> parseVoidOrType
-
- parseVoidOrType :: Parser Token (Maybe Type)
- parseVoidOrType = (satTok VoidToken *> pure Nothing) <|>
- (Just <$> parseType) <|> pure Nothing
+ parseFT :: Parser Token Type
+ parseFT = (liftM2 (->>)
+ ((parseBBraces parseFT <|> parseType) <* satTok ArrowToken)
+ parseFT) <|> parseType
parseVarDecl :: Parser Token VarDecl
parseVarDecl = liftM4 VarDecl
peekPos
- (parseType <|> trans1 VarToken VarType )
+ ((parseType >>= \t->pure $ Just t)<|> trans1 VarToken Nothing)
(parseIdent <* satTok AssignmentToken)
(parseExpr <* satTok SColonToken)
trans1 IntTypeToken IntType <|>
trans1 CharTypeToken CharType <|>
trans1 BoolTypeToken BoolType <|>
+ trans1 VoidToken VoidType <|>
(ListType <$> (parseBSqBraces parseType)) <|>
(TupleType <$> (parseTuple parseType)) <|>
(IdType <$> parseIdent)
parseOpL :: (Parser Token Op2) (Parser Token Expr) -> Parser Token Expr
parseOpL ops prev = peekPos >>= \pos-> prev >>= \e1->many (
- ops >>= \op->prev >>= \e->pure (op, e)
- ) >>= \moe->foldM (\e->(\(op,e2)->pure $ Op2Expr pos e op e2)) e1 moe
+ ops >>= \op->prev >>= \e->pure (op, e))
+ >>= \moe->foldM (\e->(\(op,e2)->pure $ Op2Expr pos e op e2)) e1 moe
parseBasicExpr :: Parser Token Expr
parseBasicExpr = peekPos >>= \pos ->
(TupleExpr pos <$> (parseTuple parseExpr)) <|>
- (FunExpr pos <$> parseFunCall) <|>
+ (parseFunCall >>= \(ident, args)->parseFieldSelectors >>= \fs->
+ pure $ FunExpr pos ident args fs) <|>
parseBBraces parseExpr <|>
trans1 EmptyListToken (EmptyListExpr pos) <|>
trans1 TrueToken (BoolExpr pos True) <|>
(Op1Expr pos <$> parseOp1 <*> parseExpr) <|>
(VarExpr pos <$> parseVarDef)
-parseFunCall :: Parser Token FunCall
-parseFunCall = FunCall <$> parseIdent <*> (parseBBraces $ parseSepList CommaToken parseExpr)
+parseFunCall :: Parser Token (String, [Expr])
+parseFunCall = tuple <$> parseIdent <*> (
+ (parseBBraces $ parseSepList CommaToken parseExpr) <|> pure [])
parseVarDef :: Parser Token VarDef
-parseVarDef = liftM2 VarDef
- parseIdent
- (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))))
+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)))
parseOp1 :: Parser Token Op1
parseOp1 = trans1 DashToken UnMinus <|> trans1 ExclamationToken UnNegation
parseTuple :: (Parser Token a) -> Parser Token (a, a)
parseTuple p = satTok BraceOpenToken *>
- (liftM2 (\a->(\b->(a,b))) (p <* satTok CommaToken) p)
+ (liftM2 tuple (p <* satTok CommaToken) p)
<* satTok BraceCloseToken
trans :: TokenValue (TokenValue -> a) -> Parser Token (Pos, a)