op2

[cc1516.git] / parse.icl

diff --git a/parse.icl b/parse.icl
index 3679124..a507ab3 100644 (file)
--- 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)