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

diff --git a/src/parse.icl b/src/parse.icl
index bc93239..f57c5e5 100644
--- a/src/parse.icl
+++ b/src/parse.icl
@@ -12,6 +12,7 @@ import Control.Applicative
 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
@@ -53,8 +54,8 @@ parseStmt = parseIfStmt <|> parseWhileStmt <|>
 		parseIfStmt = liftM3 IfStmt
 			(satTok IfToken *> parseBBraces parseExpr)
 			(parseBlock <|> parseOneLine)
-			(optional (satTok ElseToken *> (parseBlock <|> parseOneLine)
-				) >>= pure o fromMaybe [])
+			(liftM (fromMaybe []) 
+				(optional (satTok ElseToken *> (parseBlock<|> parseOneLine))))
 
 		parseWhileStmt :: Parser Token Stmt
 		parseWhileStmt = satTok WhileToken *> 
@@ -73,39 +74,39 @@ 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 <|> (parseVoidOrType >>= \t->pure $ FunType [] t))
+parseFunType = satTok DoubleColonToken *>
+	(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)
 
 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)) <|>
+	(liftM2 TupleType 
+		(satTok BraceOpenToken *> parseType <* satTok CommaToken)
+		(parseType <* satTok BraceCloseToken)) <|>
+	(liftM IdType parseIdent)
 
+//TODO hieronder omzetten naar liftm notatie
 parseExpr :: Parser Token Expr
 parseExpr = //Operators in order of binding strength
 	parseOpR (trans1 ColonToken BiCons) $
@@ -172,8 +173,15 @@ trans2 t f = satTok t >>= \(_, r).pure (f r)
 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 ((===) t)
+satTok t = top >>= \tok=:(pos, tv) -> if (eq t tok) (return tok) (fail <?> (printToString tv, pos))
+	where
+		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 = 
@@ -218,7 +226,7 @@ printStatements [s:ss] i = (case s of
 		printCodeBlock [] _ = ["{}"]
 		printCodeBlock [x] i = ["\n":printStatements [x] (i+1)]
 		printCodeBlock x i =
-			["{\n":printStatements x (i+1)] ++ indent i ["}"]
+			["{\n":printStatements x (i+1)] ++ indent i ["}\n"]
 
 		indent :: Int [String] -> [String]
 		indent i rest = replicate i "\t" ++ rest
@@ -228,7 +236,7 @@ instance print FunType where
 		[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] ++ [")"]