X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=parse.icl;h=a507ab3ae662f53dc51067f7e97caabcfc74b480;hb=bf8de26a347182ab0de1aa45a5cc3fdf6c320c21;hp=9aabea3cabccde5a3e722f7724c5473971fec6bb;hpb=cbaff96b96d2def874b8a1fa9454414c6602a829;p=cc1516.git

diff --git a/parse.icl b/parse.icl
index 9aabea3..a507ab3 100644
--- a/parse.icl
+++ b/parse.icl
@@ -18,9 +18,8 @@ import yard
 import lex
 import AST
 
-parser :: LexerOutput -> ParserOutput
-parser (Left e) = Left e
-parser (Right r) = case runParser parseProgram r of
+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
@@ -68,19 +67,13 @@ 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 = satTok DoubleColonToken *> parseFT
 	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 = ((->>) <$> parseType <* satTok ArrowToken <*> parseFT) <|> parseType
 
 parseVarDecl :: Parser Token VarDecl
 parseVarDecl = liftM4 VarDecl
@@ -94,6 +87,7 @@ parseType =
 	trans1 IntTypeToken IntType <|>
 	trans1 CharTypeToken CharType <|>
 	trans1 BoolTypeToken BoolType <|>
+    trans1 VoidToken VoidType <|>
 	(ListType <$> (parseBSqBraces parseType)) <|>
 	(TupleType <$> (parseTuple parseType)) <|>
 	(IdType <$> parseIdent)
@@ -122,8 +116,8 @@ 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 ->
@@ -139,7 +133,8 @@ parseExpr = //Operators in order of binding strength
 			(VarExpr pos <$> parseVarDef)
 
 parseFunCall :: Parser Token FunCall
-parseFunCall = FunCall <$> parseIdent <*> (parseBBraces $ parseSepList CommaToken parseExpr)
+parseFunCall = FunCall <$> parseIdent <*> 
+	(parseBBraces $ parseSepList CommaToken parseExpr)
 
 parseVarDef :: Parser Token VarDef
 parseVarDef = liftM2 VarDef