Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote-tracking branch 'upstream/master'

Conflicts:
	runtests.hs
  • Loading branch information...
commit b2bb4d5d3ffe8575d03e26ae2b87dd005c4ce5d5 2 parents aa44c66 + f78090e
Erik de Castro Lopo authored May 06, 2012
3  README
@@ -35,6 +35,9 @@ dependency in the cabal file.
35 35
 
36 36
 Changes
37 37
 
  38
+0.5.4 Fixed bug where lexer switches to regexp mode after a ']'
  39
+      char, reported by @aszlig
  40
+
38 41
 0.5.3 Merge pull requests from @aszlig to add octal support, and to
39 42
       allow leading zeros in exponents
40 43
 
4  language-javascript.cabal
... ...
@@ -1,5 +1,5 @@
1 1
 Name:                language-javascript
2  
-Version:             0.5.3
  2
+Version:             0.5.4
3 3
 Synopsis:            Parser for JavaScript
4 4
 Description:         Parses Javascript into an Abstract Syntax Tree (AST).  Initially intended as frontend to hjsmin.
5 5
                      .
@@ -46,10 +46,10 @@ Library
46 46
                        Language.JavaScript.Parser.Grammar5
47 47
                        Language.JavaScript.Parser.AST
48 48
                        Language.JavaScript.Pretty.Printer
  49
+                       Language.JavaScript.Parser.SrcLocation
49 50
   Other-modules:       Language.JavaScript.Parser.LexerUtils
50 51
                        Language.JavaScript.Parser.ParseError
51 52
                        Language.JavaScript.Parser.ParserMonad
52  
-                       Language.JavaScript.Parser.SrcLocation
53 53
                        Language.JavaScript.Parser.StringEscape
54 54
                        Language.JavaScript.Parser.Token
55 55
   Build-tools:         happy
5  runtests.hs
@@ -735,8 +735,9 @@ commentPrintSuite = testGroup "Comments"
735 735
    , testCase "issue14" (testRoundTrip "var z = x[i] / y;")
736 736
 
737 737
    -- https://github.com/alanz/language-javascript/issues/15
738  
-   , testCase "issue15" (testRoundTrip "var\tz\t=\t0;")
739  
-    ]
  738
+   , testCase "issue15" (testRoundTrip "x\t=1;")
  739
+
  740
+   ]
740 741
 
741 742
 -- ---------------------------------------------------------------------
742 743
 -- Test utilities

0 notes on commit b2bb4d5

Please sign in to comment.
Something went wrong with that request. Please try again.