add type of vardecl expr to gamma

[cc1516.git] / parse.icl

diff --git a/parse.icl b/parse.icl
index 8c4a25e..a507ab3 100644 (file)
--- a/parse.icl
+++ b/parse.icl
@@ -18,9 +18,11 @@ import yard
 import lex
 import AST
 
-parser :: LexerOutput -> ParserOutput
-parser (Left e) = Left e
-parser (Right r) = fst $ runParser parseProgram r
+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
 
 parseProgram :: Parser Token AST
 parseProgram = AST <$> (many parseVarDecl) <*> (some parseFunDecl)
@@ -29,15 +31,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,26 +60,20 @@ 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)
 
                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
@@ -91,6 +87,7 @@ parseType =
        trans1 IntTypeToken IntType <|>
        trans1 CharTypeToken CharType <|>
        trans1 BoolTypeToken BoolType <|>
+    trans1 VoidToken VoidType <|>
        (ListType <$> (parseBSqBraces parseType)) <|>
        (TupleType <$> (parseTuple parseType)) <|>
        (IdType <$> parseIdent)
@@ -119,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 ->
@@ -136,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
@@ -197,4 +195,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