Added more functionality to Parser

Author: vijayphoenix

src/Parser.hs

@@ -5,6 +5,7 @@ import Text.Parsec.String (Parser)
 import Text.Parsec.Combinator
 import Text.Parsec.Char
 import Text.Parsec
+import qualified Text.Parsec.Token as Tok
 import AST 
 
 -- literalParser :: Type -> Parser Literal 
@@ -28,11 +29,13 @@ import AST
 --     spaces
 --     return $ Command exp
 
+
+
 exprParser :: Parser Expr
 exprParser = literalStmtParser
-        -- <|> funcCallParser
-        -- <|> literalParser 
-        -- <|> parens exprParser
+           <|> declarationStmtParser
+           <|> funcCallStmtParser
+           <|> (Tok.parens lexer exprParser)
 
 -- declStmtParser :: Parser Expr 
 -- declStmtParser = do
@@ -93,8 +96,8 @@ vListParser = nameParser `sepBy1` (spaces >> (char ',') >> spaces)
 
 -- ArgList : Type Name[, ArgList] ----------
 -- NSS
-argListParer :: Parser ArgList
-argListParer = unit `sepBy1` (spaces >> (char ',') >> spaces)
+argListParser :: Parser ArgList
+argListParser = unit `sepBy1` (spaces >> (char ',') >> spaces)
     where unit = do
                 tp    <- typeParser
                 name  <- nameParser
@@ -110,6 +113,8 @@ argsParser = exprParser `sepBy1` (spaces >> (char ',') >> spaces)
 -- delim :: Parser ()
 -- delim p = (spaces >> (char p) >> spaces)
 
+
+
 ---------------------------------------------------
 -- | LiteralStmt : StrLiteral  | IntLiteral 
 -- NSS
@@ -132,15 +137,69 @@ intLiteralP = do
     return (IntLiteral res)
 -----------------------------------------------------
 
+
+-- | Function Call Statement
+funcCallStmtParser :: Parser Expr 
+funcCallStmtParser = do 
+    res <- funcCallParser 
+    return $ FuncCallStmt res
+
+funcCallParser :: Parser FuncCall 
+funcCallParser = callParser {-<|> binOpCall-}
+
+callParser :: Parser FuncCall
+callParser = do 
+    callee <- nameParser
+    (spaces >> (char '(') >> spaces)
+    args <- argsParser
+    (spaces >> (char ')') >> spaces)
+    return $ Call callee args
+
+
+
+-------------------------------------------------------
+-- | Declaration Stuff
+
+declarationStmtParser :: Parser Expr
+declarationStmtParser = do 
+    res <- declarationParser 
+    return $ DeclarationStmt res
+
+
+declarationParser :: Parser Declaration 
+declarationParser = externDeclParser <|> varDeclParser
+
+externDeclParser :: Parser Declaration 
+externDeclParser = do 
+    reserved "extern"
+    spaces
+    fname <- nameParser
+    (spaces >> (char '(') >> spaces)
+    argList <- argListParser
+    (spaces >> (char ')') >> spaces >> (char ':') >> spaces)
+    retT <- typeParser
+    return $ ExternDecl fname argList retT 
+
+
+varDeclParser :: Parser Declaration
+varDeclParser = do
+    t <- typeParser
+    spaces
+    names <- vListParser
+    return $ VarDecl t names
+
+---------------------------------------------------------
+
 -- funcCallParser :: Parser 
 
+
 mainTest = do
     str <- getLine
     if str == "quit"
     then 
         return ()
     else do
-        print (parse argListParer "sdf" str)
+        print (parse exprParser "sdf" str)
         mainTest