mergo

[cc1516.git] / parse.icl

diff --git a/parse.icl b/parse.icl
index 9aabea3..bdb6a77 100644 (file)
--- a/parse.icl
+++ b/parse.icl
@@ -68,19 +68,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 +88,7 @@ parseType =
        trans1 IntTypeToken IntType <|>
        trans1 CharTypeToken CharType <|>
        trans1 BoolTypeToken BoolType <|>
+    trans1 VoidToken VoidType <|>
        (ListType <$> (parseBSqBraces parseType)) <|>
        (TupleType <$> (parseTuple parseType)) <|>
        (IdType <$> parseIdent)
@@ -122,8 +117,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 +134,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