language-javascript 0.4.2 → 0.4.3

raw patch · 5 files changed

+11/−4 lines, 5 files

Files

README +5/−1
dist/build/Language/JavaScript/Parser/Lexer.hs too large to diff
language-javascript.cabal +1/−1
runtests.hs +3/−0
src/Language/JavaScript/Parser/Lexer.x +2/−2

README view

@@ -21,7 +21,9 @@  To debug the grammar -happy -iparse.txt -g -a  -d src/Language/JavaScript/Parser/Grammar.y +happy -iparse.txt -g -a  -d src/Language/JavaScript/Parser/Grammar.y+OR +happy -iparse.txt -g -a  -d src/Language/JavaScript/Parser/Grammar5.y   This generates src/Language/JavaScript/Parser/Grammar.hs, delete this when done with the debug version@@ -44,6 +46,8 @@ $ cabal install --reinstall alex  Changes++0.4.3 correct lexer for decimalToken, only leading digit needs to be non-zero.  0.4.2 Expose SrcSpan

dist/build/Language/JavaScript/Parser/Lexer.hs view

file too large to diff

language-javascript.cabal view

@@ -1,5 +1,5 @@ Name:                language-javascript-Version:             0.4.2+Version:             0.4.3 Synopsis:            Parser for JavaScript Description:         Parses Javascript into an Abstract Syntax Tree (AST).  Initially intended as frontend to hjsmin. Homepage:            https://github.com/alanz/language-javascript

runtests.hs view

@@ -272,6 +272,9 @@     , testCase "bug2.b" (testProg "function() {\nz = function z(o) {\nreturn r;\n};}" "Right (JSSourceElementsTop [JSExpression [JSFunctionExpression [] [] (JSFunctionBody [JSSourceElements [JSExpression [JSIdentifier \"z\",JSOperator \"=\",JSFunctionExpression [JSIdentifier \"z\"] [JSIdentifier \"o\"] (JSFunctionBody [JSSourceElements [JSReturn [JSExpression [JSIdentifier \"r\"],JSLiteral \";\"]]])],JSLiteral \";\"]])]])") +   -- https://github.com/alanz/hjsmin/issues/#issue/3  +   , testCase "bug3" (testProg "var myLatlng = new google.maps.LatLng(56.8379100, 60.5806664);" "Right (JSSourceElementsTop [JSVariables \"var\" [JSVarDecl (JSIdentifier \"myLatlng\") [JSLiteral \"new \",JSMemberDot [JSMemberDot [JSIdentifier \"google\"] (JSIdentifier \"maps\")] (JSIdentifier \"LatLng\"),JSArguments [[JSDecimal \"56.8379100\"],[JSDecimal \"60.5806664\"]]]]])")+         , testCase "02_sm.js"   (testProg "{zero}\none1;two\n{three\nfour;five;\n{\nsix;{seven;}\n}\n}" "Right (JSSourceElementsTop [JSStatementBlock (JSStatementList [JSExpression [JSIdentifier \"zero\"]]),JSExpression [JSIdentifier \"one1\"],JSLiteral \";\",JSExpression [JSIdentifier \"two\"],JSStatementBlock (JSStatementList [JSExpression [JSIdentifier \"three\"],JSExpression [JSIdentifier \"four\"],JSLiteral \";\",JSExpression [JSIdentifier \"five\"],JSLiteral \";\",JSStatementBlock (JSStatementList [JSExpression [JSIdentifier \"six\"],JSLiteral \";\",JSStatementBlock (JSStatementList [JSExpression [JSIdentifier \"seven\"],JSLiteral \";\"])])])])")          , testCase "02_sm.js.2" (testProg "{zero}\nget;two\n{three\nfour;set;\n{\nsix;{seven;}\n}\n}" "Right (JSSourceElementsTop [JSStatementBlock (JSStatementList [JSExpression [JSIdentifier \"zero\"]]),JSExpression [JSIdentifier \"get\"],JSLiteral \";\",JSExpression [JSIdentifier \"two\"],JSStatementBlock (JSStatementList [JSExpression [JSIdentifier \"three\"],JSExpression [JSIdentifier \"four\"],JSLiteral \";\",JSExpression [JSIdentifier \"set\"],JSLiteral \";\",JSStatementBlock (JSStatementList [JSExpression [JSIdentifier \"six\"],JSLiteral \";\",JSStatementBlock (JSStatementList [JSExpression [JSIdentifier \"seven\"],JSLiteral \";\"])])])])")

src/Language/JavaScript/Parser/Lexer.x view

@@ -214,8 +214,8 @@ --              | {Non Zero Digits}+ {Digit}*  --              | '0'  --              | '0' '.' {Digit}+-<reg,divide> $non_zero_digit+ "." $digit* ("e"|"E") ("+"|"-")? $non_zero_digit+ $digit* -    | $non_zero_digit+ "." $digit*       +<reg,divide> $non_zero_digit $digit* "." $digit* ("e"|"E") ("+"|"-")? $non_zero_digit+ $digit* +    | $non_zero_digit $digit* "." $digit*            | "0." $digit+  ("e"|"E") ("+"|"-")? $non_zero_digit+ $digit*      | $non_zero_digit+ $digit*     | "0"