Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master'

Conflicts:
	runtests.hs
  • Loading branch information...
commit b2bb4d5d3ffe8575d03e26ae2b87dd005c4ce5d5 2 parents aa44c66 + f78090e
@erikd authored
Showing with 8 additions and 4 deletions.
  1. +3 −0  README
  2. +2 −2 language-javascript.cabal
  3. +3 −2 runtests.hs
View
3  README
@@ -35,6 +35,9 @@ dependency in the cabal file.
Changes
+0.5.4 Fixed bug where lexer switches to regexp mode after a ']'
+ char, reported by @aszlig
+
0.5.3 Merge pull requests from @aszlig to add octal support, and to
allow leading zeros in exponents
View
4 language-javascript.cabal
@@ -1,5 +1,5 @@
Name: language-javascript
-Version: 0.5.3
+Version: 0.5.4
Synopsis: Parser for JavaScript
Description: Parses Javascript into an Abstract Syntax Tree (AST). Initially intended as frontend to hjsmin.
.
@@ -46,10 +46,10 @@ Library
Language.JavaScript.Parser.Grammar5
Language.JavaScript.Parser.AST
Language.JavaScript.Pretty.Printer
+ Language.JavaScript.Parser.SrcLocation
Other-modules: Language.JavaScript.Parser.LexerUtils
Language.JavaScript.Parser.ParseError
Language.JavaScript.Parser.ParserMonad
- Language.JavaScript.Parser.SrcLocation
Language.JavaScript.Parser.StringEscape
Language.JavaScript.Parser.Token
Build-tools: happy
View
5 runtests.hs
@@ -735,8 +735,9 @@ commentPrintSuite = testGroup "Comments"
, testCase "issue14" (testRoundTrip "var z = x[i] / y;")
-- https://github.com/alanz/language-javascript/issues/15
- , testCase "issue15" (testRoundTrip "var\tz\t=\t0;")
- ]
+ , testCase "issue15" (testRoundTrip "x\t=1;")
+
+ ]
-- ---------------------------------------------------------------------
-- Test utilities
Please sign in to comment.
Something went wrong with that request. Please try again.