import Data.Func
from Data.List import intercalate, replicate, instance Functor []
from Text import class Text(concat), instance Text String
+import GenPrint
import yard
import lex
(Left e, _) = Left $ toString e
parseProgram :: Parser Token AST
-parseProgram = liftM2 AST (many parseVarDecl) (some parseFunDecl)
+parseProgram = liftM2 AST (many parseVarDecl) (some parseFunDecl)
+ <* satTok EndOfFileToken
parseFunDecl :: Parser Token FunDecl
parseFunDecl = liftM5 FunDecl
(parseIdent <* satTok BraceOpenToken)
(parseSepList CommaToken parseIdent <* satTok BraceCloseToken)
- (parseFunType <* satTok CBraceOpenToken)
+ (optional parseFunType <* satTok CBraceOpenToken)
(many parseVarDecl)
(many parseStmt <* satTok CBraceCloseToken)
parseIfStmt :: Parser Token Stmt
parseIfStmt = liftM3 IfStmt
- (satTok IfToken *> parseBBraces parseExpr)
- (parseBlock <|> parseOneLine)
- (optional (satTok ElseToken *> (parseBlock <|> parseOneLine)
- ) >>= pure o fromMaybe [])
+ (satTok IfToken *> parseBBraces parseExpr)
+ (parseBlock <|> parseOneLine)
+ (liftM (fromMaybe [])
+ (optional (satTok ElseToken *> (parseBlock<|> parseOneLine))))
+
parseWhileStmt :: Parser Token Stmt
parseWhileStmt = satTok WhileToken *>
//first pure makes singleton list from the statement
parseOneLine = liftM pure parseStmt
-parseBBraces :: (Parser Token a) -> Parser Token a
-parseBBraces p = satTok BraceOpenToken *> p <* satTok BraceCloseToken
-
-parseBCBraces :: (Parser Token a) -> Parser Token a
-parseBCBraces p = satTok CBraceOpenToken *> p <* satTok CBraceCloseToken
-
parseFunType :: Parser Token FunType
parseFunType = satTok DoubleColonToken *>
- (parseInOutType <|> (parseVoidOrType >>= \t->pure $ FunType [] t))
+ (parseInOutType <|> (liftM (FunType []) parseVoidOrType))
where
parseInOutType :: Parser Token FunType
- parseInOutType = some parseType <* satTok ArrowToken
- >>= \intypes-> parseVoidOrType
- >>= \outtypes->pure $ FunType intypes outtypes
+ parseInOutType = liftM2 FunType
+ (some parseType <* satTok ArrowToken) parseVoidOrType
parseVoidOrType :: Parser Token (Maybe Type)
parseVoidOrType = (satTok VoidToken *> pure Nothing) <|>
- (parseType >>= \type->pure $ Just type)
+ (liftM Just parseType) <|> pure Nothing
parseVarDecl :: Parser Token VarDecl
-parseVarDecl =
+parseVarDecl = liftM3 VarDecl
(parseType <|> trans1 VarToken VarType )
- >>= \t->parseIdent <* satTok AssignmentToken
- >>= \i->parseExpr <* satTok SColonToken
- >>= \e->pure $ VarDecl i t e
+ (parseIdent <* satTok AssignmentToken)
+ (parseExpr <* satTok SColonToken)
parseType :: Parser Token Type
parseType =
trans1 IntTypeToken IntType <|>
trans1 CharTypeToken CharType <|>
trans1 BoolTypeToken BoolType <|>
- (satTok SquareOpenToken *> parseType <* satTok SquareCloseToken
- >>= \t.pure $ ListType t) <|>
- (satTok BraceOpenToken *> parseType <* satTok CommaToken
- >>= \t1->parseType <* satTok BraceCloseToken
- >>= \t2->pure $ TupleType t1 t2) <|>
- (parseIdent >>= \e.pure $ IdType e) <|>
- empty
+ (liftM ListType (parseBSqBraces parseType)) <|>
+ (liftM TupleType (parseTuple parseType)) <|>
+ (liftM IdType parseIdent)
parseExpr :: Parser Token Expr
parseExpr = //Operators in order of binding strength
parseBasicExpr :: Parser Token Expr
parseBasicExpr =
- (satTok BraceOpenToken *> parseExpr <* satTok CommaToken
- >>= \e1->parseExpr <* satTok BraceCloseToken
- >>= \e2->pure $ TupleExpr e1 e2) <|>
- (parseFunCall >>= \fc->pure $ FunExpr fc) <|>
+ (liftM TupleExpr (parseTuple parseExpr)) <|>
+ (liftM FunExpr parseFunCall) <|>
parseBBraces parseExpr <|>
trans1 EmptyListToken EmptyListExpr <|>
- trans2 TrueToken (const $ BoolExpr True) <|>
- trans2 FalseToken (const $ BoolExpr False) <|>
+ trans1 TrueToken (BoolExpr True) <|>
+ trans1 FalseToken (BoolExpr False) <|>
trans2 (NumberToken zero) (\(NumberToken i)->IntExpr i) <|>
trans2 (CharToken zero) (\(CharToken c)->CharExpr c) <|>
- (parseOp1 >>= \o->parseExpr >>= \e.pure $ Op1Expr o e) <|>
- (parseVarDef >>= \ve->pure $ VarExpr ve)
+ (liftM2 Op1Expr parseOp1 parseExpr) <|>
+ (liftM VarExpr parseVarDef)
parseFunCall :: Parser Token FunCall
-parseFunCall = parseIdent <* satTok BraceOpenToken
- >>= \i->parseSepList CommaToken parseExpr
- <* satTok BraceCloseToken >>= \es->pure $ FunCall i es
+parseFunCall = liftM2 FunCall
+ parseIdent (parseBBraces $ parseSepList CommaToken parseExpr)
parseVarDef :: Parser Token VarDef
-parseVarDef = parseIdent
- >>= \i-> many (satTok DotToken *> (
+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))
- ) >>= \f->pure $ VarDef i f
+ (parseIdent >>= \i.if (i == "snd") (pure FieldSnd) empty))))
parseOp1 :: Parser Token Op1
-parseOp1 = trans1 DashToken UnMinus <|>
- trans1 ExclamationToken UnNegation
+parseOp1 = trans1 DashToken UnMinus <|> trans1 ExclamationToken UnNegation
+
+parseBBraces :: (Parser Token a) -> Parser Token a
+parseBBraces p = satTok BraceOpenToken *> p <* satTok BraceCloseToken
+
+parseBCBraces :: (Parser Token a) -> Parser Token a
+parseBCBraces p = satTok CBraceOpenToken *> p <* satTok CBraceCloseToken
+
+parseBSqBraces :: (Parser Token a) -> Parser Token a
+parseBSqBraces p = satTok SquareOpenToken *> p <* satTok SquareCloseToken
+
+parseTuple :: (Parser Token a) -> Parser Token (a, a)
+parseTuple p = satTok BraceOpenToken *>
+ (liftM2 (\a->(\b->(a,b))) (p <* satTok CommaToken) p)
+ <* satTok BraceCloseToken
trans2 :: TokenValue (TokenValue -> a) -> Parser Token a
-trans2 t f = satTok t >>= \(_, r).pure (f r)
+trans2 t f = liftM (f o thd3) $ satTok t
trans1 :: TokenValue a -> Parser Token a
trans1 t r = trans2 t $ const r
+derive gPrint TokenValue
derive gEq TokenValue
satTok :: TokenValue -> Parser Token Token
-satTok t = satisfy $ eq t
+satTok t = top >>= \tok=:(pos1, pos2, tv) -> if (eq t tok)
+ (return tok)
+ (fail <?> (printToString tv+++printToString t, pos1))
where
- eq (IdentToken _) (_, IdentToken _) = True
- eq (NumberToken _) (_, NumberToken _) = True
- eq (CharToken _) (_, CharToken _) = True
- eq x (_, y) = gEq {|*|} x y
+ eq (IdentToken _) (_, _, IdentToken _) = True
+ eq (NumberToken _) (_, _, NumberToken _) = True
+ eq (CharToken _) (_, _, CharToken _) = True
+ eq x (_, _, y) = gEq {|*|} x y
parseSepList :: TokenValue (Parser Token a) -> Parser Token [a]
parseSepList sep p =
- (some (p <* satTok sep) >>= \es->p >>= \e.pure $ reverse [e:es]) <|>
- (p >>= \e->pure [e]) <|> pure []
+ (liftM2 (\es->(\e->reverse [e:es])) (some (p <* satTok sep)) p) <|>
+ (liftM pure p) <|> pure empty
parseIdent :: Parser Token String
-parseIdent = trans2 (IdentToken []) (\(IdentToken e).toString e)
+parseIdent = trans2 (IdentToken "") (\(IdentToken e).toString e)
instance toString AST where
toString (AST v f) = concat (
instance print FunDecl where
print (FunDecl i as t vs ss) =
["\n", i, " (":printersperse "," as] ++
- [") :: ":print t] ++
- ["{":printersperse "\n\t" vs] ++
- ["\n":printStatements ss 1] ++ ["}"]
+ [")"] ++ maybe [] (\tt->[" :: ":print tt]) t ++
+ ["{\n\t":printersperse "\n\t" vs] ++
+ ["\n":printStatements ss 1] ++ ["}\n"]
printStatements :: [Stmt] Int -> [String]
printStatements [] i = []
) ++ printStatements ss i
where
printCodeBlock :: [Stmt] Int -> [String]
- printCodeBlock [] _ = ["{}"]
+ printCodeBlock [] _ = ["{}\n"]
printCodeBlock [x] i = ["\n":printStatements [x] (i+1)]
printCodeBlock x i =
["{\n":printStatements x (i+1)] ++ indent i ["}\n"]
[if (isEmpty at) "" "->":maybe ["Void"] print rt]
instance print VarDecl where
- print (VarDecl i t e) = print t ++ [" ":i:"=":print e] ++ [";"]
+ print (VarDecl t i e) = print t ++ [" ":i:"=":print e] ++ [";"]
instance print Type where
- print (TupleType t1 t2) = ["(":print t1] ++ [",":print t2] ++ [")"]
+ print (TupleType (t1, t2)) = ["(":print t1] ++ [",":print t2] ++ [")"]
print (ListType t) = ["[":print t] ++ ["]"]
print (IdType s) = print s
print IntType = print "Int"
print (BoolExpr b) = [toString b]
print (FunExpr fc) = print fc
print EmptyListExpr = ["[]"]
- print (TupleExpr e1 e2) = ["(":print e1] ++ [",":print e2] ++ [")"]
+ print (TupleExpr (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
repositories / cc1516.git / blobdiff