X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fparse.icl;h=5fc8f8c241654ecb6d5fee12f17806ae9de2d256;hb=a0cf809b53126a797667fb43f8496a7cc2b7252e;hp=800d3ed7b62540c92d7b76362768dc5606112c56;hpb=d1e64de8a0cc6c01fba1a3dc17686f9539bf5744;p=cc1516.git

diff --git a/src/parse.icl b/src/parse.icl
index 800d3ed..5fc8f8c 100644
--- a/src/parse.icl
+++ b/src/parse.icl
@@ -3,13 +3,14 @@ implementation module parse
 import StdString
 import StdTuple
 import StdList
-from StdFunc import const
+from StdFunc import const, o
 import Data.Either
 import Data.Functor
 import Data.Maybe
 import Control.Monad
 import Control.Applicative
 import Data.Func
+from Data.List import intercalate, replicate, instance Functor []
 from Text import class Text(concat), instance Text String
 
 import yard
@@ -22,11 +23,68 @@ parser (Right r) = case runParser parseProgram r of
 	(Left e, _) = Left $ toString e
 
 parseProgram :: Parser Token AST
-parseProgram = some parseVarDecl 
-	>>= \vd->pure $ AST vd []
+parseProgram = liftM2 AST (many parseVarDecl) (some parseFunDecl)
 
 parseFunDecl :: Parser Token FunDecl
-parseFunDecl = empty
+parseFunDecl = liftM5 FunDecl
+	(parseIdent <* satTok BraceOpenToken)
+	(parseSepList CommaToken parseIdent <* satTok BraceCloseToken)
+	(parseFunType <* satTok CBraceOpenToken)
+	(many parseVarDecl)
+	(many parseStmt <* satTok CBraceCloseToken)
+
+parseStmt :: Parser Token Stmt
+parseStmt = parseIfStmt <|> parseWhileStmt <|>
+	parseSColon parseAssStmt <|> parseSColon parseReturnStmt <|>
+	(liftM FunStmt (parseSColon parseFunCall))
+	where
+		parseSColon :: (Parser Token a) -> Parser Token a
+		parseSColon p = p <* satTok SColonToken
+
+		parseReturnStmt :: Parser Token Stmt
+		parseReturnStmt =
+			satTok ReturnToken *> liftM ReturnStmt (optional parseExpr)
+
+		parseAssStmt :: Parser Token Stmt
+		parseAssStmt = 
+			liftM2 AssStmt (parseVarDef <* satTok AssignmentToken) parseExpr
+
+		parseIfStmt :: Parser Token Stmt
+		parseIfStmt = liftM3 IfStmt
+			(satTok IfToken *> parseBBraces parseExpr)
+			(parseBlock <|> parseOneLine)
+			(optional (satTok ElseToken *> (parseBlock <|> parseOneLine)
+				) >>= pure o fromMaybe [])
+
+		parseWhileStmt :: Parser Token Stmt
+		parseWhileStmt = satTok WhileToken *> 
+			liftM2 WhileStmt (parseBBraces parseExpr) parseBlock
+
+		parseBlock :: Parser Token [Stmt]
+		parseBlock = parseBCBraces (many parseStmt)
+
+		parseOneLine :: Parser Token [Stmt]
+		//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))
+	where
+		parseInOutType :: Parser Token FunType
+		parseInOutType = some parseType <* satTok ArrowToken
+			>>= \intypes-> parseVoidOrType
+			>>= \outtypes->pure $ FunType intypes outtypes
+
+		parseVoidOrType :: Parser Token (Maybe Type)
+		parseVoidOrType = (satTok VoidToken *> pure Nothing) <|> 
+			(parseType >>= \type->pure $ Just type)
 
 parseVarDecl :: Parser Token VarDecl
 parseVarDecl = 
@@ -49,68 +107,65 @@ parseType =
 	empty
 
 parseExpr :: Parser Token Expr
-parseExpr = 
-	parseOpRight (trans1 ColonToken BiCons) $
-	parseOpRight (trans1 PipesToken BiOr) $
-	parseOpRight (trans1 AmpersandsToken BiAnd) $
-	parseOpRight (trans1 EqualsToken BiEquals <|>
+parseExpr = //Operators in order of binding strength
+	parseOpR (trans1 ColonToken BiCons) $
+	parseOpR (trans1 PipesToken BiOr) $
+	parseOpR (trans1 AmpersandsToken BiAnd) $
+	parseOpR (trans1 EqualsToken BiEquals <|>
 			trans1 LesserToken BiLesser <|>
 			trans1 BiggerToken BiGreater <|>
 			trans1 LesserEqToken BiLesserEq <|>
 			trans1 GreaterEqToken BiGreaterEq <|>
 			trans1 NotEqualToken BiUnEqual) $
-	parseOpLeft (trans1 PlusToken BiPlus <|>
+	parseOpL (trans1 PlusToken BiPlus <|>
 			trans1 DashToken BiMinus) $
-	parseOpLeft (trans1 StarToken BiTimes <|>
+	parseOpL (trans1 StarToken BiTimes <|>
 			trans1 SlashToken BiDivide <|>
-			trans1 PercentToken BiMod) $
-		parseBasicExpr
+			trans1 PercentToken BiMod) $ parseBasicExpr
 	where
-		parseOpRight :: (Parser Token Op2) (Parser Token Expr) -> Parser Token Expr
-		parseOpRight ops prev = prev >>= \e1->optional (
-				ops >>= \op->parseOpRight ops prev >>= \e->pure (op, e)
+		parseOpR :: (Parser Token Op2) (Parser Token Expr) -> Parser Token Expr
+		parseOpR ops prev = prev >>= \e1->optional (
+				ops >>= \op->parseOpR ops prev >>= \e->pure (op, e)
 			) >>= \moe->pure $ maybe e1 (\(op,e2)->Op2Expr e1 op e2) moe
 
-		parseOpLeft :: (Parser Token Op2) (Parser Token Expr) -> Parser Token Expr
-		parseOpLeft ops prev = prev >>= \e1->many (
+		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
 
 		parseBasicExpr :: Parser Token Expr
 		parseBasicExpr = 
-			(satTok BraceOpenToken *> parseExpr <* satTok BraceCloseToken) <|>
 			(satTok BraceOpenToken *> parseExpr <* satTok CommaToken 
 				>>= \e1->parseExpr <* satTok BraceCloseToken 
 				>>= \e2->pure $ TupleExpr e1 e2) <|>
+			(parseFunCall >>= \fc->pure $ FunExpr fc) <|>
+			parseBBraces parseExpr <|>
 			trans1 EmptyListToken EmptyListExpr <|>
 			trans2 TrueToken (const $ BoolExpr True) <|>
 			trans2 FalseToken (const $ BoolExpr False) <|>
 			trans2 (NumberToken zero) (\(NumberToken i)->IntExpr i) <|>
 			trans2 (CharToken zero) (\(CharToken c)->CharExpr c) <|>
 			(parseOp1 >>= \o->parseExpr >>= \e.pure $ Op1Expr o e) <|>
-			(parseIdent <* satTok BraceOpenToken 
-				>>= \i->parseActArgs <* satTok BraceCloseToken
-				>>= \es->pure $ FunExpr i es) <|>
-			(parseIdent >>= \i. parseFieldSelector >>= \f.pure $ VarExpr i f)
-
-parseActArgs :: Parser Token [Expr]
-parseActArgs = 
-	(some (parseExpr <* satTok CommaToken) >>= \es->parseExpr 
-		>>= \e.pure [e:es]) <|>
-	(parseExpr >>= \e->pure [e]) <|>
-	empty
+			(parseVarDef >>= \ve->pure $ VarExpr ve)
+
+parseFunCall :: Parser Token FunCall
+parseFunCall = parseIdent <* satTok BraceOpenToken 
+	>>= \i->parseSepList CommaToken parseExpr 
+	<* satTok BraceCloseToken >>= \es->pure $ FunCall i es
+
+parseVarDef :: Parser Token VarDef
+parseVarDef = parseIdent 
+	>>= \i-> 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
 
 parseOp1 :: Parser Token Op1
 parseOp1 = trans1 DashToken UnMinus <|> 
 	trans1 ExclamationToken UnNegation
 
-parseFieldSelector :: Parser Token (Maybe FieldSelector)
-parseFieldSelector = optional (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)))
-
 trans2 :: TokenValue (TokenValue -> a) -> Parser Token a
 trans2 t f = satTok t >>= \(_, r).pure (f r)
 
@@ -118,48 +173,98 @@ trans1 :: TokenValue a -> Parser Token a
 trans1 t r = trans2 t $ const r
 
 satTok :: TokenValue -> Parser Token Token
-satTok t = satisfy ((===) t)
+satTok t = top >>= \tok=:(pos, tv) -> if (t === tok) (return tok) (fail <?> ("Token", pos))
+
+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 []
 
 parseIdent :: Parser Token String
 parseIdent = trans2 (IdentToken []) (\(IdentToken e).toString e)
 
 instance toString AST where
-	toString (AST v f) = concat (print v ++ ["\n":print f])
+	toString (AST v f) = concat (
+		["\n":printersperse "\n" v] ++
+		["\n":printersperse "\n" f])
 
 class print a :: a -> [String]
 
-instance print [a] | print a where
-	print [] = ["\n"]
-	print [v:vs] = print v ++ ["\n":print vs]
+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] ++
+		[") :: ":print t] ++
+		["{":printersperse "\n\t" vs] ++
+		["\n":printStatements ss 1] ++ ["}"]
+
+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 [] _ = ["{}"]
+		printCodeBlock [x] i = ["\n":printStatements [x] (i+1)]
+		printCodeBlock x i =
+			["{\n":printStatements x (i+1)] ++ indent i ["}"]
+
+		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 i t e) = print t ++ [" ":i:"=":print e] ++ [";"]
-instance print FunDecl where
-	print _ = ["Function printing not yet implemented"]
 
 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) = [s]
-	print IntType = ["Int"]
-	print BoolType = ["Bool"]
-	print CharType = ["Char"]
-	print VarType = ["var"]
+	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 i Nothing) = [i]
-	print (VarExpr i (Just mf)) = [i, case mf of
-		FieldHd = ".hd"; FieldTl = ".tl"
-		FieldSnd = ".snd"; FieldFst = ".fst"]
-	print (Op2Expr e1 o e2) = print e1 ++ [case o of
+	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
+		," ":print e2] ++ [")"]
+	print (Op1Expr o e) = ["(",case o of
 		UnNegation = "!"; UnMinus = "-"
-		:print e]
+		:print e] ++ [")"]
 	print (IntExpr i) = [toString i]
 	print (CharExpr c) = ["\'", case c of
 		'\b' = "\\b"; '\f' = "\\f"; '\n' = "\\n"
@@ -167,7 +272,6 @@ instance print Expr where
 		c = if (c == toChar 7) "\\a" (toString c)
 		,"\'"]
 	print (BoolExpr b) = [toString b]
-	print (FunExpr i es) = pe ++ flatten [[",":x]\\x<-tl pes]
-		where [pe:pes] = map print es
+	print (FunExpr fc) = print fc
 	print EmptyListExpr = ["[]"]
 	print (TupleExpr e1 e2) = ["(":print e1] ++ [",":print e2] ++ [")"]