Starting cleanup to prepare for initial release.

.gitignore

@@ -16,3 +16,4 @@
 /src/Language/JavaScript/Parser/Parser/Parser.y~
 /.ghci~
 /runtests.hs~
+/src/Language/JavaScript/Parser.hs~

language-javascript.cabal

@@ -27,7 +27,8 @@ Library
                    , mtl              >= 1.1     && < 2
                    , containers       >= 0.2     && < 0.5
   hs-source-dirs: src
-  Exposed-modules:     Language.JavaScript.Parser.Parser
+  Exposed-modules:     Language.JavaScript.Parser
+                       Language.JavaScript.Parser.Parser
                        Language.JavaScript.Parser.Lexer
                        Language.JavaScript.Parser.Grammar
                        Language.JavaScript.Parser.AST

runtests.hs

@@ -196,7 +196,7 @@ testSuite = testGroup "Parser"
 srcHelloWorld = "Hello"
 caseHelloWorld =  
   "Right (JSSourceElements [JSExpression [JSIdentifier \"Hello\"]])"
-  @=? (show $ parseStmt srcHelloWorld "src")
+  @=? (show $ parse srcHelloWorld "src")
 
 
 -- ---------------------------------------------------------------------
@@ -208,7 +208,7 @@ testPE str expected = expected @=? (show $ parseUsing parsePrimaryExpression str
 
 testStmt str expected = expected @=? (show $ parseUsing parseStatement str "src")
 
-testProg str expected = expected @=? (show $ parseUsing parse str "src")
+testProg str expected = expected @=? (show $ parseUsing parseProgram str "src")
 
 
 -- EOF

src/Language/JavaScript/Parser.hs

@@ -0,0 +1,10 @@
+module Language.JavaScript.Parser 
+       (
+         parse
+       ) where
+
+
+import Language.JavaScript.Parser.Parser
+
+
+

src/Language/JavaScript/Parser/Grammar.y

@@ -1,5 +1,5 @@
 {
-module Language.JavaScript.Parser.Grammar (parse, parseLiteral, parsePrimaryExpression,parseStatement) where
+module Language.JavaScript.Parser.Grammar (parseProgram, parseLiteral, parsePrimaryExpression,parseStatement) where
 
 import Control.Monad.Error.Class (throwError)
 import Data.Char
@@ -11,7 +11,7 @@ import qualified Language.JavaScript.Parser.AST as AST
 }
 
 -- The name of the generated function to be exported from the module
-%name parse                  Program
+%name parseProgram           Program
 %name parseLiteral           Literal
 %name parsePrimaryExpression PrimaryExpression
 %name parseStatement         Statement

src/Language/JavaScript/Parser/Lexer.x

@@ -10,7 +10,10 @@ import qualified Data.Map as Map
 
 }
 
+-- Not using a wrapper, rolling own below.
 --%wrapper "basic"
+-- %wrapper "monad" 
+-- %wrapper "monad-bytestring" 
 
 -- character sets
 $lf = \n  -- line feed

src/Language/JavaScript/Parser/Parser.hs

@@ -1,10 +1,8 @@
 module Language.JavaScript.Parser.Parser (
-   -- * Parsing modules
-   -- parseModule,
-   -- * Parsing statements
-   parseStmt
+   -- * Parsing 
+   parse
    -- * Parsing expressions
-   -- parseExpr) 
+   -- parseExpr
    , parseUsing
    ) where
 
@@ -19,12 +17,12 @@ import qualified Language.JavaScript.Parser.AST as AST
 -- | Parse one compound statement, or a sequence of simple statements. 
 -- Generally used for interactive input, such as from the command line of an interpreter. 
 -- Return comments in addition to the parsed statements.
-parseStmtKeepComments :: String -- ^ The input stream (python statement source code). 
-      -> String -- ^ The name of the python source (filename or input device). 
+parseStmtKeepComments :: String -- ^ The input stream (Javascript source code). 
+      -> String -- ^ The name of the Javascript source (filename or input device). 
       -> Either ParseError (AST.JSNode, [Token]) 
          -- ^ An error or maybe the abstract syntax tree (AST) of zero or more Javascript statements, plus comments.
 parseStmtKeepComments input srcName = 
-   execParserKeepComments parse state 
+   execParserKeepComments parseProgram state 
    where
      initLoc = initialSrcLocation srcName
      state = initialState initLoc input initStartCodeStack
@@ -33,12 +31,12 @@ parseStmtKeepComments input srcName =
 -- | Parse one compound statement, or a sequence of simple statements. 
 -- Generally used for interactive input, such as from the command line of an interpreter. 
 -- Return comments in addition to the parsed statements.
-parseStmt :: String -- ^ The input stream (python statement source code). 
-      -> String -- ^ The name of the python source (filename or input device). 
+parse :: String -- ^ The input stream (Javascript source code). 
+      -> String -- ^ The name of the Javascript source (filename or input device). 
       -> Either ParseError AST.JSNode 
          -- ^ An error or maybe the abstract syntax tree (AST) of zero or more Javascript statements, plus comments.
-parseStmt input srcName = 
-   execParser parse state 
+parse input srcName = 
+   execParser parseProgram state 
    where
      initLoc = initialSrcLocation srcName
      state = initialState initLoc input initStartCodeStack
@@ -47,11 +45,11 @@ parseStmt input srcName =
 -- | Parse one compound statement, or a sequence of simple statements. 
 -- Generally used for interactive input, such as from the command line of an interpreter. 
 -- Return comments in addition to the parsed statements.
--- parseUsing :: 
---       P Token
---       ->  String -- ^ The input stream (python statement source code). 
---       -> String -- ^ The name of the python source (filename or input device). 
---       -> Either ParseError AST.JSNode 
+parseUsing :: 
+      P AST.JSNode
+      -> String -- ^ The input stream (python statement source code). 
+      -> String -- ^ The name of the python source (filename or input device). 
+      -> Either ParseError AST.JSNode 
          -- ^ An error or maybe the abstract syntax tree (AST) of zero or more Javascript statements, plus comments.
 parseUsing p input srcName = 
    execParser p state