X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=parse.icl;h=a79ad2fcfe52aeb7391e7701a1040504e9c4dde3;hb=74b900cf6db033a51e177f7f85d835dae44217e5;hp=34ec15b2f9109e6bc0ead07efffac329cee5bee9;hpb=9e30ea275d06506244e92f26c121715cbfd9c315;p=cc1516.git

diff --git a/parse.icl b/parse.icl
index 34ec15b..a79ad2f 100644
--- a/parse.icl
+++ b/parse.icl
@@ -1,5 +1,6 @@
 implementation module parse
 
+import GenPrint
 import StdString
 import StdTuple
 import StdList
@@ -7,37 +8,53 @@ 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 = AST <$> (many parseVarDecl) <*> (some parseFunDecl)
+parseProgram = many parseLetDecl >>= \fds1->
+                some parseFunDecl >>= \fds2->
+                pure $ AST (fds1++fds2)
+
+parseLetDecl :: Parser Token FunDecl
+parseLetDecl = peekPos >>= \p->
+                satTok LetToken >>|
+                parseFunType >>= \mt->
+                parseIdent >>= \f->
+                satTok AssignmentToken >>|
+                parseExpr >>= \e->
+                satTok SColonToken >>|
+                pure (FunDecl p f [] (Just mt) [] [ReturnStmt $ Just e])
 
 parseFunDecl :: Parser Token FunDecl
 parseFunDecl = liftM6 FunDecl
     (peekPos)
     (parseIdent)
 	(parseBBraces $ parseSepList CommaToken parseIdent)
-	(optional parseFunType)
+	(optional (satTok DoubleColonToken *> parseFunType))
 	(satTok CBraceOpenToken *> many parseVarDecl)
 	(many parseStmt <* satTok CBraceCloseToken)
 
 parseStmt :: Parser Token Stmt
 parseStmt = parseIfStmt <|> parseWhileStmt <|>
 	parseSColon parseAssStmt <|> parseSColon parseReturnStmt <|>
-	(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
@@ -65,24 +82,23 @@ parseStmt = parseIfStmt <|> parseWhileStmt <|>
 		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 = parseFT >>= \t -> case t of
+        t1 ->> t2   = pure t
+        simpleT     = pure $ FuncType simpleT
 	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 (->>) (parseSF <* satTok ArrowToken) (parseFT)) <|>
+			parseSF
+		parseSF :: Parser Token Type
+		parseSF = parseBBraces 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)
 
@@ -91,12 +107,15 @@ parseType =
 	trans1 IntTypeToken IntType <|>
 	trans1 CharTypeToken CharType <|>
 	trans1 BoolTypeToken BoolType <|>
+    trans1 VoidToken VoidType <|>
 	(ListType <$> (parseBSqBraces parseType)) <|>
 	(TupleType <$> (parseTuple parseType)) <|>
 	(IdType <$> parseIdent)
 
 parseExpr :: Parser Token Expr
-parseExpr = //Operators in order of binding strength
+parseExpr = parseValueExpr <|> parseLambda
+parseValueExpr :: Parser Token Expr
+parseValueExpr = //Operators in order of binding strength
 	parseOpR (trans1 ColonToken BiCons) $
 	parseOpR (trans1 PipesToken BiOr) $
 	parseOpR (trans1 AmpersandsToken BiAnd) $
@@ -119,13 +138,13 @@ parseExpr = //Operators in order of binding strength
 
 		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 ->
+			(trans2 (StringToken []) (\(StringToken cs)->makeStrExpr pos cs)) <|>
 			(TupleExpr pos <$> (parseTuple parseExpr)) <|>
-			(FunExpr pos <$> parseFunCall) <|>
 			parseBBraces parseExpr <|>
 			trans1 EmptyListToken (EmptyListExpr pos) <|>
 			trans1 TrueToken (BoolExpr pos True) <|>
@@ -133,19 +152,36 @@ parseExpr = //Operators in order of binding strength
 			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 FunCall
-parseFunCall = FunCall <$> parseIdent <*> (parseBBraces $ parseSepList CommaToken parseExpr)
+parseLambda :: Parser Token Expr
+parseLambda = LambdaExpr <$> peekPos 
+                        <*> (satTok BackslashToken *> some parseIdent)
+                        <*> (satTok ArrowToken *> parseExpr)
+
+makeStrExpr :: Pos [Char] -> Expr
+makeStrExpr p [] = EmptyListExpr p
+makeStrExpr p [x:xs] = Op2Expr p (CharExpr zero x) BiCons (makeStrExpr p xs)
+
+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
@@ -161,7 +197,7 @@ 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)
@@ -179,14 +215,16 @@ peekPos = fst <$> peek
 derive gPrint TokenValue
 derive gEq TokenValue
 satTok :: TokenValue -> Parser Token Token
-satTok t = top >>= \tok=:({line,col},token) -> if (eq t token)
+satTok t = top >>= \tok=:({line,col},token) -> if (tokEq t token)
 	(pure tok) (fail <?> PositionalError line col
-		("ParseError: Unexpected token: " +++ printToString token))
-	where
-		eq (IdentToken _)  (IdentToken _) = True
-		eq (NumberToken _) (NumberToken _) = True
-		eq (CharToken _)   (CharToken _) = True
-		eq x y = gEq {|*|} x y
+		("ParseError: Unexpected token: " +++ printToString token 
+            +++ "\nExpected: " +++ printToString t))
+
+tokEq (IdentToken _) (IdentToken _) = True
+tokEq (NumberToken _) (NumberToken _) = True
+tokEq (CharToken _) (CharToken _) = True
+tokEq (StringToken _) (StringToken _) = True
+tokEq x y = gEq {|*|} x y
 
 parseSepList :: TokenValue (Parser Token a) -> Parser Token [a]
 parseSepList sep p =
@@ -194,7 +232,7 @@ parseSepList 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)
 
 //liftM only goes to liftM5
 liftM6 f m1 m2 m3 m4 m5 m6 = f <$> m1 <*> m2 <*> m3 <*> m4 <*> m5 <*> m6