Permalink
Browse files

0.4.10 Moved Lexer.x into a separate directory, and made a script to

       call alex to generate Lexer.hs. This means alex is not required
       at install time
closes #8
closes #7
  • Loading branch information...
1 parent bff786a commit 3a4d672df8c6fb78952bfec6fb771de02ea9fa21 @alanz alanz committed Mar 8, 2012
View
@@ -1,39 +1,17 @@
+*~
/dist/*
-/language-javascript.cabal~
-/src/Language/JavaScript/Parser/Lexer.x~
-/src/Language/JavaScript/Parser/Parser.y~
-/src/Language/JavaScript/Parser/ParserMonad.hs~
-
-/src/Language/JavaScript/Parser/LexerUtils.hs~
-/src/Language/JavaScript/Parser/ParseError.hs~
-/src/Language/JavaScript/Parser/ParserUtils.hs~
-/src/Language/JavaScript/Parser/StringEscape.hs~
-/src/Language/JavaScript/Parser/Token.hs~
-/src/Language/JavaScript/Parser/AST.hs~
-/build.sh~
-/src/Language/JavaScript/Parser/Parser.hs~
-/src/Language/JavaScript/Parser/Parser/Lexer.x~
-/src/Language/JavaScript/Parser/Parser/Parser.y~
-/.ghci~
-/runtests.hs~
-/src/Language/JavaScript/Parser.hs~
/parse.txt
-/TODO.txt~
-/test/Unicode.js~
-/unicode/doit.sh~
/unicode/uc-ll.htm
/unicode/uc-lm.htm
/unicode/uc-lo.htm
/unicode/uc-lt.htm
/unicode/uc-lu.htm
/unicode/uc-nl.htm
-/unicode/list.hs~
/unicode/combiningmark.sh~
/unicode/connector-punctuation.sh~
-/unicode/digit.sh~
/unicode/uc-mc.htm
/unicode/uc-mn.htm
/unicode/uc-nd.htm
/unicode/uc-pc.htm
-/ecmascript3.txt~
-/src/Language/JavaScript/Parser/Grammar5.y~
+
+/src/Language/JavaScript/Parser/Lexer.info
View
4 README
@@ -35,6 +35,10 @@ dependency in the cabal file.
Changes
+0.4.10 Moved Lexer.x into a separate directory, and made a script to
+ call alex to generate Lexer.hs. This means alex is not required
+ at install time
+
0.4.9 Make alex and happy versions more explicit. Expose the AlexSpan
data type, so parse error positions can be reported.
View
@@ -1,5 +1,8 @@
#!/bin/sh
+# First run alex on Lexer.x to generate Lexer.hs
+./runalex.sh
+
# do a clean build of all, including the tests
cabal clean && cabal configure -fbuildtests && cabal build && cabal haddock
View
@@ -1,13 +1,13 @@
Name: language-javascript
-Version: 0.4.9
+Version: 0.4.10
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
License: BSD3
License-file: LICENSE
Author: Alan Zimmerman
Maintainer: alan.zimm@gmail.com
-Copyright: (c) 2010,2011 Alan Zimmerman
+Copyright: (c) 2010,2011,2012 Alan Zimmerman
Category: Language
Build-type: Simple
homepage: http://github.com/alanz/language-javascript
@@ -29,13 +29,13 @@ Library
, mtl >= 1.1 && < 2.9
, containers >= 0.2 && < 0.5
, utf8-light >= 0.4 && < 1.0
- build-tools: alex >= 3.0
- , happy >= 1.18.5
+ build-tools: happy >= 1.18.5
+ -- , alex >= 3.0
+
hs-source-dirs: src
Exposed-modules: Language.JavaScript.Parser
Language.JavaScript.Parser.Parser
Language.JavaScript.Parser.Lexer
- -- Language.JavaScript.Parser.Grammar
Language.JavaScript.Parser.Grammar5
Language.JavaScript.Parser.AST
Other-modules: Language.JavaScript.Parser.LexerUtils
@@ -44,7 +44,8 @@ Library
Language.JavaScript.Parser.SrcLocation
Language.JavaScript.Parser.StringEscape
Language.JavaScript.Parser.Token
- Build-tools: happy, alex
+ Build-tools: happy
+ -- , alex
ghc-options: -Wall
executable runtests
View
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# This contortion exists so that Lexer.hs can be included in the
+# package, which can then be built for installation without requiring
+# to have alex > 3.0 installed
+
+alex -g -o src/Language/JavaScript/Parser/Lexer.hs src-dev/Language/JavaScript/Parser/Lexer.x
+
+

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit 3a4d672

Please sign in to comment.