summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyChudnov <>2013-12-07 19:25:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2013-12-07 19:25:00 (GMT)
commitf249531e555cb9fd0ed4a68f787727315c0c8f13 (patch)
treef4b47db3e7c93d0a968cad15f0efa5932e896a16
parent317415e5e554d01bbe59c0c0fa85910adab2da53 (diff)
version 0.15.40.15.4
-rw-r--r--CHANGELOG3
-rw-r--r--language-ecmascript.cabal4
-rw-r--r--src/Language/ECMAScript3/Parser.hs4
3 files changed, 7 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c17db7f..a829e8b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
Version change log.
+=0.15.4=
+Fixed haddock build failure.
+
=0.15.3=
Ported the pretty printer to use 'wl-pprint' instead of
'pretty'. Pretty-printed code is now more compact and resembles common
diff --git a/language-ecmascript.cabal b/language-ecmascript.cabal
index af856d1..0c0f15b 100644
--- a/language-ecmascript.cabal
+++ b/language-ecmascript.cabal
@@ -1,5 +1,5 @@
Name: language-ecmascript
-Version: 0.15.3
+Version: 0.15.4
Cabal-Version: >= 1.10
Copyright: (c) 2007-2012 Brown University, (c) 2008-2010 Claudiu Saftoiu,
(c) 2012-2013 Stevens Institute of Technology
@@ -29,7 +29,7 @@ Source-repository head
Source-repository this
type: git
location: git://github.com/jswebtools/language-ecmascript.git
- tag: 0.15.3
+ tag: 0.15.4
Library
Hs-Source-Dirs:
diff --git a/src/Language/ECMAScript3/Parser.hs b/src/Language/ECMAScript3/Parser.hs
index 73cfb0b..f582e16 100644
--- a/src/Language/ECMAScript3/Parser.hs
+++ b/src/Language/ECMAScript3/Parser.hs
@@ -493,9 +493,9 @@ parseObjectLit =
return (name,val)
toInt eid = case eid of
Left i -> return $ fromIntegral i
+ -- Note, the spec actually allows floats in property names.
+ -- This is left for legacy reasons and will be fixed in 1.0
Right d-> unexpected "Floating point number in property name"
- -- ^ Note, the spec actually allows floats in property names.
- -- This is left for legacy reasons and will be fixed in 1.0
in do pos <- getPosition
props <- braces (parseProp `sepEndBy` comma) <?> "object literal"
return $ ObjectLit pos props