X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=parse.icl;h=a507ab3ae662f53dc51067f7e97caabcfc74b480;hb=b6c2892b454651c4f3b2412d5b36f273ef6a3128;hp=36791241438c6a3c37c0de62d7520ddb34cc6d8c;hpb=5d40ca411bed8014f9bf081436208d831ac5c972;p=cc1516.git

diff --git a/parse.icl b/parse.icl
index 3679124..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
@@ -70,16 +69,11 @@ parseStmt = parseIfStmt <|> parseWhileStmt <|>
 		parseOneLine :: Parser Token [Stmt]
 		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
@@ -93,6 +87,7 @@ parseType =
 	trans1 IntTypeToken IntType <|>
 	trans1 CharTypeToken CharType <|>
 	trans1 BoolTypeToken BoolType <|>
+    trans1 VoidToken VoidType <|>
 	(ListType <$> (parseBSqBraces parseType)) <|>
 	(TupleType <$> (parseTuple parseType)) <|>
 	(IdType <$> parseIdent)