X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=parse.icl;h=bea680b7db4015e8868a20377aed652e49bbebe4;hb=9dcc80e7a580836c10157cd742eb1c805ef7311b;hp=120935f13bbd515161f690b2031d553ce0eeb6ba;hpb=6703509b4b132cee0f4c91dc23795d3d4ab131e8;p=cc1516.git

diff --git a/parse.icl b/parse.icl
index 120935f..bea680b 100644
--- a/parse.icl
+++ b/parse.icl
@@ -6,35 +6,43 @@ import StdList
 from StdFunc import const, o
 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 yard
 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 <$> 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))
+	(parseSColon parseFunCall 
+		>>= \(ident, args, fs)->pure $ FunStmt ident args fs)
 	where
 		parseSColon :: (Parser Token a) -> Parser Token a
 		parseSColon p = p <* satTok SColonToken
@@ -45,7 +53,7 @@ parseStmt = parseIfStmt <|> parseWhileStmt <|>
 
 		parseAssStmt :: Parser Token Stmt
 		parseAssStmt =
-			liftM2 AssStmt (parseVarDef <* satTok AssignmentToken) parseExpr
+			AssStmt <$> (parseVarDef <* satTok AssignmentToken) <*> parseExpr
 
 		parseIfStmt :: Parser Token Stmt
 		parseIfStmt = liftM3 IfStmt
@@ -55,31 +63,28 @@ parseStmt = parseIfStmt <|> parseWhileStmt <|>
                 (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 = (liftM2 (->>) (parseSF <* satTok ArrowToken) (parseFT)) <|>
+			parseSF
+		parseSF :: Parser Token Type
+		parseSF = parseBBraces parseFT <|> parseType
 
 parseVarDecl :: Parser Token VarDecl
-parseVarDecl = liftM3 VarDecl
-	(parseType <|> trans1 VarToken VarType )
+parseVarDecl = liftM4 VarDecl
+    peekPos
+	((parseType >>= \t->pure $ Just t)<|> trans1 VarToken Nothing)
 	(parseIdent <* satTok AssignmentToken)
 	(parseExpr <* satTok SColonToken)
 
@@ -88,9 +93,10 @@ parseType =
 	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
@@ -110,40 +116,46 @@ 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)) <|>
 			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)
-
-parseFunCall :: Parser Token FunCall
-parseFunCall = liftM2 FunCall
-	parseIdent (parseBBraces $ parseSepList CommaToken parseExpr)
+			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) <|>
+			(parseFunCall >>= \(ident, args, fs)->
+				pure $ FunExpr pos ident args fs) <|>
+			(VarExpr pos <$> parseVarDef)
+
+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
-	(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->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
@@ -159,20 +171,26 @@ 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)
+	(liftM2 tuple (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
-satTok t = top >>= \tok=:{line,column,token} -> if (eq t token)
-	(pure tok) (fail <?> PositionalError line column
+satTok t = top >>= \tok=:({line,col},token) -> if (eq t token)
+	(pure tok) (fail <?> PositionalError line col
 		("ParseError: Unexpected token: " +++ printToString token))
 	where
 		eq (IdentToken _)  (IdentToken _) = True
@@ -188,95 +206,5 @@ parseSepList sep p =
 parseIdent :: Parser Token String
 parseIdent = trans2 (IdentToken "") (\(IdentToken e).toString e)
 
-instance toString AST where
-	toString (AST v f) = concat (
-		["\n":printersperse "\n" v] ++
-		["\n":printersperse "\n" f])
-
-class print a :: a -> [String]
-
-printersperse :: String [a] -> [String] | print a
-printersperse i j = intercalate [i] (map print j)
-
-instance print FunDecl where
-	print (FunDecl i as t vs ss) =
-		["\n", i, " (":printersperse "," as] ++
-		[")"] ++ maybe [] (\tt->[" :: ":print tt]) t ++
-		["{\n\t":printersperse "\n\t" vs] ++
-		["\n":printStatements ss 1] ++ ["}\n"]
-
-printStatements :: [Stmt] Int -> [String]
-printStatements [] i = []
-printStatements [s:ss] i = (case s of
-	(IfStmt b thens elses) = indent i ["if (":print b] ++ [")"] ++
-		printCodeBlock thens i ++
-		indent i ["else ":printCodeBlock elses i] ++ ["\n"]
-	(WhileStmt b dos) = indent i ["while (":print b] ++
-		[")":printCodeBlock dos i]
-	(AssStmt vardef val) =
-		indent i $ print vardef ++ ["=":print val] ++ [";\n"]
-	(FunStmt fc) = indent i $ print fc ++ [";\n"]
-	(ReturnStmt me) = indent i ["return ":maybe [""] print me] ++ [";\n"]
-	) ++ printStatements ss i
-	where
-		printCodeBlock :: [Stmt] Int -> [String]
-		printCodeBlock [] _ = ["{}\n"]
-		printCodeBlock [x] i = ["\n":printStatements [x] (i+1)]
-		printCodeBlock x i =
-			["{\n":printStatements x (i+1)] ++ indent i ["}\n"]
-
-		indent :: Int [String] -> [String]
-		indent i rest = replicate i "\t" ++ rest
-
-instance print FunType where
-	print (FunType at rt) = printersperse " " at ++
-		[if (isEmpty at) "" "->":maybe ["Void"] print rt]
-
-instance print VarDecl where
-	print (VarDecl t i e) = print t ++ [" ":i:"=":print e] ++ [";"]
-
-instance print Type where
-	print (TupleType (t1, t2)) = ["(":print t1] ++ [",":print t2] ++ [")"]
-	print (ListType t) = ["[":print t] ++ ["]"]
-	print (IdType s) = print s
-	print IntType = print "Int"
-	print BoolType = print "Bool"
-	print CharType = print "Char"
-	print VarType = print "var"
-
-instance print String where
-	print s = [s]
-
-instance print FieldSelector where
-	print FieldHd = print "hd"
-	print FieldTl = print "tl"
-	print FieldSnd = print "snd"
-	print FieldFst = print "fst"
-
-instance print VarDef where
-	print (VarDef i fs) = printersperse "." [i:flatten $ map print fs]
-
-instance print FunCall where
-	print (FunCall i args) = [i,"(":printersperse "," args] ++ [")"]
-
-instance print Expr where
-	print (VarExpr vd) = print vd
-	print (Op2Expr e1 o e2) = ["(":print e1] ++ [" ",case o of
-		BiPlus = "+"; BiMinus = "-"; BiTimes = "*"; BiDivide = "/"
-		BiMod = "%"; BiEquals = "="; BiLesser = "<"; BiGreater = ">"
-		BiLesserEq = "<="; BiGreaterEq = ">="; BiUnEqual = "!=";
-		BiAnd = "&&"; BiOr = "||"; BiCons = ":"
-		," ":print e2] ++ [")"]
-	print (Op1Expr o e) = ["(",case o of
-		UnNegation = "!"; UnMinus = "-"
-		:print e] ++ [")"]
-	print (IntExpr i) = [toString i]
-	print (CharExpr c) = ["\'", case c of
-		'\b' = "\\b"; '\f' = "\\f"; '\n' = "\\n"
-		'\r' = "\\r"; '\t' = "\\t"; '\v' = "\\v"
-		c = if (c == toChar 7) "\\a" (toString c)
-		,"\'"]
-	print (BoolExpr b) = [toString b]
-	print (FunExpr fc) = print fc
-	print EmptyListExpr = ["[]"]
-	print (TupleExpr (e1, e2)) = ["(":print e1] ++ [",":print e2] ++ [")"]
+//liftM only goes to liftM5
+liftM6 f m1 m2 m3 m4 m5 m6 = f <$> m1 <*> m2 <*> m3 <*> m4 <*> m5 <*> m6