summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyChudnov <>2015-04-17 22:54:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2015-04-17 22:54:00 (GMT)
commit1c36ca038ec78d7f285680e3efe3d9ce7b628828 (patch)
treef52e470491d2dd6a51fc411c40df71ae2dd7b11a
parent1cf62f6c241cfdaba2ce77fb1443bc7abd8e18a3 (diff)
version 0.17.0.10.17.0.1
-rw-r--r--language-ecmascript.cabal14
-rw-r--r--src/Language/ECMAScript3/PrettyPrint.hs5
2 files changed, 12 insertions, 7 deletions
diff --git a/language-ecmascript.cabal b/language-ecmascript.cabal
index 21f28d0..ea0b4b9 100644
--- a/language-ecmascript.cabal
+++ b/language-ecmascript.cabal
@@ -1,5 +1,5 @@
Name: language-ecmascript
-Version: 0.17
+Version: 0.17.0.1
Cabal-Version: >= 1.10
Copyright: (c) 2007-2012 Brown University, (c) 2008-2010 Claudiu Saftoiu,
(c) 2012-2015 Stevens Institute of Technology
@@ -11,7 +11,7 @@ Maintainer: Andrey Chudnov <oss@chudnov.com>
Homepage: http://github.com/jswebtools/language-ecmascript
Bug-reports: http://github.com/jswebtools/language-ecmascript/issues
Stability: experimental
-Tested-with: GHC==7.6.3, GHC==7.4.2, GHC==7.8.2
+Tested-with: GHC==7.8.4, GHC==7.6.3, GHC==7.4.2, GHC==7.10.1
Extra-Source-Files: test/parse-pretty/*.js, test/diff/left/*.js, test/diff/right/*.js, test/diff/expects/*.diff, CHANGELOG
Category: Language
Build-Type: Simple
@@ -20,7 +20,7 @@ Description:
Tools for working with ECMAScript 3 (popularly known as JavaScript).
Includes a parser, pretty-printer, tools for working with source tree
annotations and an arbitrary instance. See CHANGELOG for a summary of
- changes.
+ changes. The package follows the Haskell Package Versioning Policy since version 0.17.0.1.
Source-repository head
type: git
@@ -29,7 +29,7 @@ Source-repository head
Source-repository this
type: git
location: git://github.com/jswebtools/language-ecmascript.git
- tag: 0.17
+ tag: 0.17.0.1
Library
Hs-Source-Dirs:
@@ -38,7 +38,7 @@ Library
base >= 4 && < 5,
mtl >= 1 && < 3,
parsec > 3 && < 3.2.0,
- wl-pprint == 1.*,
+ wl-pprint >= 1.2 && < 2,
containers == 0.*,
uniplate >= 1.6 && <1.7,
data-default-class >= 0.0.1 && < 0.1,
@@ -81,10 +81,10 @@ Test-Suite test
base >= 4 && < 5,
mtl >= 1 && < 3,
parsec >= 3 && < 3.2.0,
- wl-pprint == 1.*,
+ wl-pprint >= 1.2 && < 2,
containers == 0.*,
directory >= 1.2 && < 1.3,
- filepath >= 1.3 && < 1.4,
+ filepath >= 1.3 && < 1.5,
HUnit >= 1.2 && < 1.3,
QuickCheck >= 2.5 && < 3,
data-default-class >= 0.0.1 && < 0.1,
diff --git a/src/Language/ECMAScript3/PrettyPrint.hs b/src/Language/ECMAScript3/PrettyPrint.hs
index 8f17857..52e918e 100644
--- a/src/Language/ECMAScript3/PrettyPrint.hs
+++ b/src/Language/ECMAScript3/PrettyPrint.hs
@@ -1,4 +1,5 @@
{-# LANGUAGE FlexibleInstances, UndecidableInstances #-}
+{-# LANGUAGE CPP #-}
-- | Pretty-printing JavaScript.
module Language.ECMAScript3.PrettyPrint (Pretty (..)
@@ -11,7 +12,11 @@ module Language.ECMAScript3.PrettyPrint (Pretty (..)
import Text.PrettyPrint.Leijen hiding (Pretty)
import Language.ECMAScript3.Syntax
+#if __GLASGOW_HASKELL__ > 708
+import Prelude hiding (maybe, id, (<$>))
+#else
import Prelude hiding (maybe, id)
+#endif
import Data.Char
import Numeric