Skip to content

Commit 852d574

Browse files
alanzerikd
authored andcommitted
Updated version ranges for GHC 7.6.1, courtesy of @mietek
Note: requires alex 3.0.1 for development (not install)
1 parent c7b85fd commit 852d574

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

README

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ dependency in the cabal file.
3535

3636
Changes
3737

38+
0.5.5 Updated version ranges for GHC 7.6.1, courtesy of @mietek
39+
Note: requires alex 3.0.1 for development (not install)
40+
3841
0.5.4 Fixed bug where lexer switches to regexp mode after a ']'
3942
char, reported by @aszlig
4043

language-javascript.cabal

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: language-javascript
2-
Version: 0.6.0
2+
Version: 0.5.5
33
Synopsis: Parser for JavaScript
44
Description: Parses Javascript into an Abstract Syntax Tree (AST). Initially intended as frontend to hjsmin.
55
.
@@ -39,6 +39,7 @@ Library
3939
, bytestring >= 0.9.1 && < 1
4040
, utf8-string >= 0.3.7 && < 1
4141
build-tools: happy >= 1.18.5
42+
, alex == 3.0.1
4243
hs-source-dirs: src
4344
Exposed-modules: Language.JavaScript.Parser
4445
Language.JavaScript.Parser.Parser
@@ -70,6 +71,8 @@ Test-Suite test-language-javascript
7071
, utf8-string >= 0.3.7 && < 1
7172
, bytestring >= 0.9.1 && < 1
7273
, blaze-builder >= 0.2 && < 1
74+
-- need our own library for tests
75+
, language-javascript >= 0.5.5
7376
hs-source-dirs: . src ./dist/build
7477

7578

src/Language/JavaScript/Parser/Lexer.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import GlaExts
4242
#endif
4343
{-# LINE 1 "templates/wrappers.hs" #-}
4444
{-# LINE 1 "templates/wrappers.hs" #-}
45-
{-# LINE 1 "<built-in>" #-}
4645
{-# LINE 1 "<command-line>" #-}
4746
{-# LINE 1 "templates/wrappers.hs" #-}
4847
-- -----------------------------------------------------------------------------
@@ -590,7 +589,6 @@ alex_action_58 = adapt (symbolToken RightParenToken)
590589
alex_action_59 = adapt (symbolToken CondcommentEndToken)
591590
{-# LINE 1 "templates/GenericTemplate.hs" #-}
592591
{-# LINE 1 "templates/GenericTemplate.hs" #-}
593-
{-# LINE 1 "<built-in>" #-}
594592
{-# LINE 1 "<command-line>" #-}
595593
{-# LINE 1 "templates/GenericTemplate.hs" #-}
596594
-- -----------------------------------------------------------------------------

0 commit comments

Comments
 (0)