fixed nasty pretty print bug, added selftest to readme

[cc1516.git] / parse.icl

diff --git a/parse.icl b/parse.icl
index 8c4a25e..34ec15b 100644 (file)
--- a/parse.icl
+++ b/parse.icl
@@ -29,15 +29,15 @@ parseFunDecl :: Parser Token FunDecl
 parseFunDecl = liftM6 FunDecl
     (peekPos)
     (parseIdent)
-       (satTok BraceOpenToken *> parseSepList CommaToken parseIdent <* satTok BraceCloseToken)
-       (optional parseFunType <* satTok CBraceOpenToken)
-       (many parseVarDecl)
+       (parseBBraces $ parseSepList CommaToken parseIdent)
+       (optional parseFunType)
+       (satTok CBraceOpenToken *> many parseVarDecl)
        (many parseStmt <* satTok CBraceCloseToken)
 
 parseStmt :: Parser Token Stmt
 parseStmt = parseIfStmt <|> parseWhileStmt <|>
        parseSColon parseAssStmt <|> parseSColon parseReturnStmt <|>
-       (liftM FunStmt (parseSColon parseFunCall))
+       (FunStmt <$> parseSColon parseFunCall)
        where
                parseSColon :: (Parser Token a) -> Parser Token a
                parseSColon p = p <* satTok SColonToken
@@ -58,8 +58,8 @@ parseStmt = parseIfStmt <|> parseWhileStmt <|>
                 (optional (satTok ElseToken *> (parseBlock<|> parseOneLine))))
 
                parseWhileStmt :: Parser Token Stmt
-               parseWhileStmt = satTok WhileToken *>
-                       (WhileStmt <$> (parseBBraces parseExpr) <*> parseBlock)
+               parseWhileStmt = satTok WhileToken *> (WhileStmt <$> 
+                       (parseBBraces parseExpr) <*> (parseBlock <|> parseOneLine))
 
                parseBlock :: Parser Token [Stmt]
                parseBlock = parseBCBraces (many parseStmt)
@@ -197,4 +197,4 @@ parseIdent :: Parser Token String
 parseIdent = trans2 (IdentToken "") (\(IdentToken e).toString e)
 
 //liftM only goes to liftM5
-liftM6 f m1 m2 m3 m4 m5 m6 = f <$> m1 <*> m2 <*> m3 <*> m4 <*> m5 <*> m6
\ No newline at end of file
+liftM6 f m1 m2 m3 m4 m5 m6 = f <$> m1 <*> m2 <*> m3 <*> m4 <*> m5 <*> m6