X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fparse.icl;h=9f43314540375c01bdcd952e3dab9564dcf805d7;hb=4c779c9791b03d96a76956e314cbc95f056448ce;hp=f57c5e536c22934cf438c374ed1907b436c7d63d;hpb=3944a17b55128c2b75bf1948bbf0561a4b6ca783;p=cc1516.git

diff --git a/src/parse.icl b/src/parse.icl
index f57c5e5..9f43314 100644
--- a/src/parse.icl
+++ b/src/parse.icl
@@ -68,15 +68,6 @@ parseStmt = parseIfStmt <|> parseWhileStmt <|>
 		//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
-
-parseBSqBraces :: (Parser Token a) -> Parser Token a
-parseBSqBraces p = satTok SquareOpenToken *> p <* satTok SquareCloseToken
-
 parseFunType :: Parser Token FunType
 parseFunType = satTok DoubleColonToken *>
 	(parseInOutType <|> (liftM (FunType []) parseVoidOrType))
@@ -101,12 +92,9 @@ parseType =
 	trans1 CharTypeToken CharType <|>
 	trans1 BoolTypeToken BoolType <|>
 	(liftM ListType (parseBSqBraces parseType)) <|>
-	(liftM2 TupleType 
-		(satTok BraceOpenToken *> parseType <* satTok CommaToken)
-		(parseType <* satTok BraceCloseToken)) <|>
+	(liftM TupleType (parseTuple parseType)) <|>
 	(liftM IdType parseIdent)
 
-//TODO hieronder omzetten naar liftm notatie
 parseExpr :: Parser Token Expr
 parseExpr = //Operators in order of binding strength
 	parseOpR (trans1 ColonToken BiCons) $
@@ -136,37 +124,48 @@ 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
 
+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)
 
@@ -185,8 +184,8 @@ satTok t = top >>= \tok=:(pos, tv) -> if (eq t tok) (return tok) (fail <?> (prin
 
 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)
@@ -205,8 +204,8 @@ 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] ++ ["}"]
+		["{\n\t":printersperse "\n\t" vs] ++
+		["\n":printStatements ss 1] ++ ["}\n"]
 
 printStatements :: [Stmt] Int -> [String]
 printStatements [] i = []
@@ -239,7 +238,7 @@ 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 (TupleType (t1, t2)) = ["(":print t1] ++ [",":print t2] ++ [")"]
 	print (ListType t) = ["[":print t] ++ ["]"]
 	print (IdType s) = print s
 	print IntType = print "Int"
@@ -282,4 +281,4 @@ instance print Expr where
 	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] ++ [")"]