Skip to content

Commit aad931e

Browse files
committed
Version bumps and build fix for GHC 8.8 (Issue #85).
1 parent 7cbf067 commit aad931e

4 files changed

Lines changed: 18 additions & 12 deletions

File tree

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Version change log.
22

3+
=0.19.0.1=
4+
Version bumps and a build fix for GHC 8.8 (GitHub issue #85).
5+
36
=0.19=
47
Pull request #84: Moved the Arbitrary instance and the testing-feat dependency to the test-suite. Removed tabs from the lexer.
58

language-ecmascript.cabal

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Name: language-ecmascript
2-
Version: 0.19
2+
Version: 0.19.0.1
33
Cabal-Version: >= 1.12
44
Copyright: (c) 2007-2012 Brown University, (c) 2008-2010 Claudiu Saftoiu,
5-
(c) 2012-2015 Stevens Institute of Technology, (c) 2016 Eyal Lotem, (c) 2016-2018 Andrey Chudnov
5+
(c) 2012-2015 Stevens Institute of Technology, (c) 2016 Eyal Lotem, (c) 2016-2020 Andrey Chudnov
66
License: BSD3
77
License-file: LICENSE
88
Author: Andrey Chudnov, Arjun Guha, Spiridon Aristides Eliopoulos,
@@ -11,7 +11,7 @@ Maintainer: Andrey Chudnov <oss@chudnov.com>
1111
Homepage: http://github.com/jswebtools/language-ecmascript
1212
Bug-reports: http://github.com/jswebtools/language-ecmascript/issues
1313
Stability: experimental
14-
Tested-with: GHC==8.2.2
14+
Tested-with: GHC==8.8.1
1515
Extra-Source-Files: test/parse-pretty/*.js, test/diff/left/*.js, test/diff/right/*.js, test/diff/expects/*.diff, CHANGELOG
1616
Category: Language
1717
Build-Type: Simple
@@ -29,13 +29,13 @@ Source-repository head
2929
Source-repository this
3030
type: git
3131
location: git://github.com/jswebtools/language-ecmascript.git
32-
tag: 0.19
32+
tag: 0.19.0.1
3333

3434
Library
3535
Hs-Source-Dirs:
3636
src
3737
Build-Depends:
38-
base >= 4 && < 5,
38+
base >= 4 && < 4.14,
3939
mtl >= 1 && < 3,
4040
parsec > 3 && < 3.2.0,
4141
ansi-wl-pprint >= 0.6 && < 1,
@@ -44,7 +44,7 @@ Library
4444
data-default-class >= 0.0.1 && < 0.2,
4545
QuickCheck >= 2.5 && < 3,
4646
template-haskell >= 2.7 && < 3,
47-
Diff == 0.3.*,
47+
Diff == 0.4.*,
4848
charset >= 0.3
4949
ghc-options:
5050
-fwarn-incomplete-patterns
@@ -86,7 +86,7 @@ Test-Suite test
8686
Test.Pretty
8787
Test.Arbitrary
8888
Build-Depends:
89-
base >= 4 && < 5,
89+
base >= 4 && < 4.14,
9090
mtl >= 1 && < 3,
9191
parsec >= 3 && < 3.2.0,
9292
ansi-wl-pprint >= 0.6 && < 1,
@@ -97,12 +97,12 @@ Test-Suite test
9797
HUnit >= 1.2 && < 1.7,
9898
QuickCheck >= 2.5 && < 3,
9999
data-default-class >= 0.0.1 && < 0.2,
100-
testing-feat >= 0.4.0.2 && < 1.1,
100+
testing-feat >= 0.4.0.2 && < 1.2,
101101
test-framework >= 0.8 && < 0.9,
102102
test-framework-hunit >= 0.3.0 && < 0.4,
103103
test-framework-quickcheck2 >= 0.3.0.1 && < 0.4,
104104
uniplate >= 1.6 && <1.7,
105-
Diff == 0.3.*,
105+
Diff == 0.4.*,
106106
language-ecmascript
107107
Default-Extensions: DeriveDataTypeable, ScopedTypeVariables, DeriveFunctor, DeriveFoldable, DeriveTraversable, FlexibleContexts
108108
Default-Language: Haskell2010

src/Language/ECMAScript3/Parser.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import Control.Monad.Identity
4242
import Data.Maybe (isJust, isNothing, fromMaybe)
4343
import Control.Monad.Error.Class
4444
import Control.Applicative ((<$>), (<*>))
45+
import Control.Exception (throwIO)
4546

4647
{-# DEPRECATED ParsedStatement, ParsedExpression, StatementParser,
4748
ExpressionParser
@@ -794,7 +795,7 @@ parseJavaScriptFromFile :: MonadIO m => String -- ^ file name
794795
parseJavaScriptFromFile filename = do
795796
chars <- liftIO $ readFile filename
796797
case parse parseScript filename chars of
797-
Left err -> fail (show err)
798+
Left err -> liftIO $ throwIO $ userError $ show err
798799
Right (Script _ stmts) -> return stmts
799800

800801
-- | Parse a JavaScript program from a string

stack.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
44
# resolver: lts-8.22
5-
resolver: lts-11.4
5+
#resolver: lts-11.4
6+
resolver: nightly-2020-01-21
67

78
# Local packages, usually specified by relative directory name
89
packages:
910
- '.'
1011

1112
# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
12-
extra-deps: []
13+
extra-deps: [testing-feat-1.1.0.0
14+
,size-based-0.1.2.0]
1315

1416
# Override default flag values for local packages and extra-deps
1517
flags: {}

0 commit comments

Comments
 (0)