from StdFunc import const, o
import Data.Either
import Data.Maybe
+import Data.Functor
import Control.Monad
import Control.Applicative
import Data.Func
import lex
import AST
-parser :: LexerOutput -> ParserOutput
-parser (Left e) = Left e
-parser (Right r) = fst $ runParser parseProgram r
+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 = liftM2 AST (many parseVarDecl) (some parseFunDecl)
+parseProgram = AST <$> (many parseVarDecl) <*> (some parseFunDecl)
parseFunDecl :: Parser Token FunDecl
-parseFunDecl = liftM5 FunDecl
- (parseIdent <* satTok BraceOpenToken)
- (parseSepList CommaToken parseIdent <* satTok BraceCloseToken)
- (optional parseFunType <* satTok CBraceOpenToken)
- (many parseVarDecl)
+parseFunDecl = liftM6 FunDecl
+ (peekPos)
+ (parseIdent)
+ (parseBBraces $ parseSepList CommaToken parseIdent)
+ (optional parseFunType)
+ (satTok CBraceOpenToken *> many parseVarDecl)
(many parseStmt <* satTok CBraceCloseToken)
parseStmt :: Parser Token Stmt
parseStmt = parseIfStmt <|> parseWhileStmt <|>
parseSColon parseAssStmt <|> parseSColon parseReturnStmt <|>
- (liftM FunStmt (parseSColon parseFunCall))
+ (FunStmt <$> parseSColon parseFunCall)
where
parseSColon :: (Parser Token a) -> Parser Token a
parseSColon p = p <* satTok SColonToken
parseAssStmt :: Parser Token Stmt
parseAssStmt =
- liftM2 AssStmt (parseVarDef <* satTok AssignmentToken) parseExpr
+ AssStmt <$> (parseVarDef <* satTok AssignmentToken) <*> parseExpr
parseIfStmt :: Parser Token Stmt
parseIfStmt = liftM3 IfStmt
(optional (satTok ElseToken *> (parseBlock<|> parseOneLine))))
parseWhileStmt :: Parser Token Stmt
- parseWhileStmt = satTok WhileToken *>
- liftM2 WhileStmt (parseBBraces parseExpr) parseBlock
+ parseWhileStmt = satTok WhileToken *> (WhileStmt <$>
+ (parseBBraces parseExpr) <*> (parseBlock <|> parseOneLine))
parseBlock :: Parser Token [Stmt]
parseBlock = parseBCBraces (many parseStmt)
parseOneLine :: Parser Token [Stmt]
- //first pure makes singleton list from the statement
- parseOneLine = liftM pure parseStmt
+ parseOneLine = pure <$> parseStmt
-parseFunType :: Parser Token FunType
-parseFunType = satTok DoubleColonToken *>
- (parseInOutType <|> (liftM (FunType []) parseVoidOrType))
+parseFunType :: Parser Token Type
+parseFunType = satTok DoubleColonToken *> parseFT
where
- parseInOutType :: Parser Token FunType
- parseInOutType = liftM2 FunType
- (some parseType <* satTok ArrowToken) parseVoidOrType
-
- parseVoidOrType :: Parser Token (Maybe Type)
- parseVoidOrType = (satTok VoidToken *> pure Nothing) <|>
- (liftM Just parseType) <|> pure Nothing
+ parseFT :: Parser Token Type
+ parseFT = ((->>) <$> parseType <* satTok ArrowToken <*> parseFT) <|> parseType
parseVarDecl :: Parser Token VarDecl
-parseVarDecl = liftM3 VarDecl
+parseVarDecl = liftM4 VarDecl
+ peekPos
(parseType <|> trans1 VarToken VarType )
(parseIdent <* satTok AssignmentToken)
(parseExpr <* satTok SColonToken)
trans1 IntTypeToken IntType <|>
trans1 CharTypeToken CharType <|>
trans1 BoolTypeToken BoolType <|>
- (liftM ListType (parseBSqBraces parseType)) <|>
- (liftM TupleType (parseTuple parseType)) <|>
- (liftM IdType parseIdent)
+ trans1 VoidToken VoidType <|>
+ (ListType <$> (parseBSqBraces parseType)) <|>
+ (TupleType <$> (parseTuple parseType)) <|>
+ (IdType <$> parseIdent)
parseExpr :: Parser Token Expr
parseExpr = //Operators in order of binding strength
trans1 PercentToken BiMod) $ parseBasicExpr
where
parseOpR :: (Parser Token Op2) (Parser Token Expr) -> Parser Token Expr
- parseOpR ops prev = prev >>= \e1->optional (
+ parseOpR ops prev = peekPos >>= \pos-> prev >>= \e1->optional (
ops >>= \op->parseOpR ops prev >>= \e->pure (op, e)
- ) >>= \moe->pure $ maybe e1 (\(op,e2)->Op2Expr e1 op e2) moe
+ ) >>= \moe->pure $ maybe e1 (\(op,e2)->Op2Expr pos e1 op e2) moe
parseOpL :: (Parser Token Op2) (Parser Token Expr) -> Parser Token Expr
- parseOpL ops prev = prev >>= \e1->many (
- ops >>= \op->prev >>= \e->pure (op, e)
- ) >>= \moe->foldM (\e->(\(op,e2)->pure $ Op2Expr e op e2)) e1 moe
+ 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
parseBasicExpr :: Parser Token Expr
- parseBasicExpr =
- (liftM TupleExpr (parseTuple parseExpr)) <|>
- (liftM FunExpr parseFunCall) <|>
+ parseBasicExpr = peekPos >>= \pos ->
+ (TupleExpr pos <$> (parseTuple parseExpr)) <|>
+ (FunExpr pos <$> parseFunCall) <|>
parseBBraces parseExpr <|>
- trans1 EmptyListToken EmptyListExpr <|>
- trans1 TrueToken (BoolExpr True) <|>
- trans1 FalseToken (BoolExpr False) <|>
- trans2 (NumberToken zero) (\(NumberToken i)->IntExpr i) <|>
- trans2 (CharToken zero) (\(CharToken c)->CharExpr c) <|>
- (liftM2 Op1Expr parseOp1 parseExpr) <|>
- (liftM VarExpr parseVarDef)
+ trans1 EmptyListToken (EmptyListExpr pos) <|>
+ trans1 TrueToken (BoolExpr pos True) <|>
+ trans1 FalseToken (BoolExpr pos False) <|>
+ trans2 (NumberToken zero) (\(NumberToken i)->IntExpr pos i) <|>
+ trans2 (CharToken zero) (\(CharToken c)->CharExpr pos c) <|>
+ (Op1Expr pos <$> parseOp1 <*> parseExpr) <|>
+ (VarExpr pos <$> parseVarDef)
parseFunCall :: Parser Token FunCall
-parseFunCall = liftM2 FunCall
- parseIdent (parseBBraces $ parseSepList CommaToken parseExpr)
+parseFunCall = FunCall <$> parseIdent <*>
+ (parseBBraces $ parseSepList CommaToken parseExpr)
parseVarDef :: Parser Token VarDef
parseVarDef = liftM2 VarDef
(liftM2 (\a->(\b->(a,b))) (p <* satTok CommaToken) p)
<* satTok BraceCloseToken
+trans :: TokenValue (TokenValue -> a) -> Parser Token (Pos, a)
+trans t f = (\(pos,token)->(pos, f token)) <$> satTok t
+
trans2 :: TokenValue (TokenValue -> a) -> Parser Token a
-trans2 t f = liftM (\(_,token)->f token) $ satTok t
+trans2 t f = snd <$> trans t f
trans1 :: TokenValue a -> Parser Token a
trans1 t r = trans2 t $ const r
+peekPos :: Parser Token Pos
+peekPos = fst <$> peek
+
derive gPrint TokenValue
derive gEq TokenValue
satTok :: TokenValue -> Parser Token Token
parseIdent :: Parser Token String
parseIdent = trans2 (IdentToken "") (\(IdentToken e).toString e)
+
+//liftM only goes to liftM5
+liftM6 f m1 m2 m3 m4 m5 m6 = f <$> m1 <*> m2 <*> m3 <*> m4 <*> m5 <*> m6
repositories / cc1516.git / blobdiff