Permalink
Browse files

Merge remote-tracking branch 'origin/round-trip'

Conflicts:
	.gitignore
	README
	language-javascript.cabal
	src/Language/JavaScript/Parser/Lexer.hs
  • Loading branch information...
alanz committed Apr 10, 2012
2 parents 3a4d672 + 7966005 commit 93f9aec6035182d4d4f8bd97befeadff633ace3f
View
@@ -1,17 +1,15 @@
*~
/dist/*
/parse.txt
+/src/Language/JavaScript/Parser/Lexer.info
/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/combiningmark.sh~
-/unicode/connector-punctuation.sh~
/unicode/uc-mc.htm
/unicode/uc-mn.htm
/unicode/uc-nd.htm
+/unicode/uc-nl.htm
+/unicode/uc-nl.htm
/unicode/uc-pc.htm
-
-/src/Language/JavaScript/Parser/Lexer.info
View
3 README
@@ -35,6 +35,9 @@ dependency in the cabal file.
Changes
+0.5.0 Rework AST to allow full round-trip parsing and output of
+ JavaScript. Breaks AST compatibility with prior versions
+
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
View
@@ -31,5 +31,9 @@ manipulation.
13. Numeric literals Infinity, NaN
+14. Look at http://jsshaper.org/
+
+15. Store number of rows/cols in a comment, to speed output
+
EOF
View
@@ -1,7 +1,10 @@
Name: language-javascript
-Version: 0.4.10
+Version: 0.5.0
Synopsis: Parser for JavaScript
Description: Parses Javascript into an Abstract Syntax Tree (AST). Initially intended as frontend to hjsmin.
+ .
+ Note: Version 0.5.0 breaks compatibility with prior versions, the AST has been reworked to allow
+ round trip processing of JavaScript.
Homepage: https://github.com/alanz/language-javascript
License: BSD3
License-file: LICENSE
@@ -29,9 +32,11 @@ Library
, mtl >= 1.1 && < 2.9
, containers >= 0.2 && < 0.5
, utf8-light >= 0.4 && < 1.0
+ -- For the round trip output
+ , blaze-builder >= 0.2 && < 1
+ , bytestring >= 0.9.1 && < 1
+ , utf8-string >= 0.3.7 && < 1
build-tools: happy >= 1.18.5
- -- , alex >= 3.0
-
hs-source-dirs: src
Exposed-modules: Language.JavaScript.Parser
Language.JavaScript.Parser.Parser
@@ -45,7 +50,6 @@ Library
Language.JavaScript.Parser.StringEscape
Language.JavaScript.Parser.Token
Build-tools: happy
- -- , alex
ghc-options: -Wall
executable runtests
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 93f9aec

Please sign in to comment.