Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'upstream/master'
Conflicts:
	runtests.hs
  • Loading branch information
erikd committed May 6, 2012
2 parents aa44c66 + f78090e commit b2bb4d5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 3 additions & 0 deletions README
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions 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.
.
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions runtests.hs
Expand Up @@ -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
Expand Down

0 comments on commit b2bb4d5

Please sign in to comment.