Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Ghc 8.0.2 (#267)
* Added a few show instance for debug.

* Released aeson requirements to enable version 1.1

* Fixed some problems with the tests, removed stack tests because they took too long. (Loading the snapshot is probably the cause.)
  • Loading branch information
nboldi committed Jan 31, 2017
1 parent cf3f584 commit 08c2c0c
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 17 deletions.
4 changes: 2 additions & 2 deletions demo/haskell-tools-demo.cabal
Expand Up @@ -22,7 +22,7 @@ library
, transformers >= 0.5 && < 0.6
, directory >= 1.2 && < 1.4
, containers >= 0.5 && < 0.6
, aeson >= 1.0 && < 1.1
, aeson >= 1.0 && < 1.2
, bytestring >= 0.10 && < 0.11
, http-types >= 0.9 && < 0.10
, warp >= 3.2 && < 3.3
Expand Down Expand Up @@ -61,6 +61,6 @@ test-suite haskell-tools-demo-tests
, bytestring >= 0.10 && < 0.11
, network >= 2.6 && < 2.7
, websockets >= 0.10 && < 0.11
, aeson >= 1.0 && < 1.1
, aeson >= 1.0 && < 1.2
, haskell-tools-demo >= 0.4 && < 0.5
default-language: Haskell2010
2 changes: 1 addition & 1 deletion src/cli/haskell-tools-cli.cabal
Expand Up @@ -103,7 +103,7 @@ benchmark cli-benchmark
, haskell-tools-cli >= 0.4 && < 0.5
, criterion >= 1.1 && < 1.2
, time >= 1.6 && < 1.7
, aeson >= 1.0 && < 1.1
, aeson >= 1.0 && < 1.2
, directory >= 1.2 && < 1.4
, filepath >= 1.4 && < 2.0
, knob >= 0.1 && < 0.2
Expand Down
4 changes: 2 additions & 2 deletions src/cli/test/Main.hs
Expand Up @@ -112,15 +112,15 @@ cppIfDefReloads = [ "Language.Preprocessor.Cpphs.CppIfdef"
, "Language.Preprocessor.Cpphs" ]
macroPassReloads = "Language.Preprocessor.Cpphs.MacroPass" : cppIfDefReloads

cppHsMods = [ "Language.Preprocessor.Cpphs.Options"
cppHsMods = [ "Language.Preprocessor.Unlit"
, "Language.Preprocessor.Cpphs.SymTab"
, "Language.Preprocessor.Cpphs.Position"
, "Language.Preprocessor.Cpphs.ReadFirst"
, "Language.Preprocessor.Cpphs.Options"
, "Language.Preprocessor.Cpphs.HashDefine"
, "Language.Preprocessor.Cpphs.Tokenise"
, "Language.Preprocessor.Cpphs.MacroPass"
, "Language.Preprocessor.Cpphs.CppIfdef"
, "Language.Preprocessor.Unlit"
, "Language.Preprocessor.Cpphs.RunCpphs"
, "Language.Preprocessor.Cpphs" ]

Expand Down
4 changes: 2 additions & 2 deletions src/daemon/haskell-tools-daemon.cabal
Expand Up @@ -54,7 +54,7 @@ extra-source-files: examples/Project/has-cabal/*.hs
library
ghc-options: -O2
build-depends: base >= 4.9 && < 5.0
, aeson >= 1.0 && < 1.1
, aeson >= 1.0 && < 1.2
, bytestring >= 0.10 && < 1.0
, filepath >= 1.4 && < 2.0
, containers >= 0.5 && < 0.6
Expand Down Expand Up @@ -98,6 +98,6 @@ test-suite haskell-tools-daemon-tests
, filepath >= 1.4 && < 2.0
, bytestring >= 0.10 && < 0.11
, network >= 2.6 && < 2.7
, aeson >= 1.0 && < 1.1
, aeson >= 1.0 && < 1.2
, haskell-tools-daemon >= 0.4 && < 0.5
default-language: Haskell2010
12 changes: 6 additions & 6 deletions src/daemon/test/Main.hs
Expand Up @@ -240,22 +240,22 @@ reloadingTests =

pkgDbTests :: [(String, IO (), [ClientMessage], [ResponseMsg])]
pkgDbTests
= [ ( "stack"
= [ {- ( "stack"
, withCurrentDirectory (testRoot </> "stack") initStack
, [SetPackageDB StackDB, AddPackages [testRoot </> "stack"]]
, [LoadedModules [testRoot </> "stack" </> "UseGroups.hs"]] )
, ( "cabal-sandbox"
, -} ( "cabal-sandbox"
, withCurrentDirectory (testRoot </> "cabal-sandbox") initCabalSandbox
, [SetPackageDB CabalSandboxDB, AddPackages [testRoot </> "cabal-sandbox"]]
, [LoadedModules [testRoot </> "cabal-sandbox" </> "UseGroups.hs"]] )
, ( "cabal-sandbox-auto"
, withCurrentDirectory (testRoot </> "cabal-sandbox") initCabalSandbox
, [SetPackageDB AutoDB, AddPackages [testRoot </> "cabal-sandbox"]]
, [LoadedModules [testRoot </> "cabal-sandbox" </> "UseGroups.hs"]] )
, ( "stack-auto"
, withCurrentDirectory (testRoot </> "stack") initStack
, [SetPackageDB AutoDB, AddPackages [testRoot </> "stack"]]
, [LoadedModules [testRoot </> "stack" </> "UseGroups.hs"]] )
-- , ( "stack-auto"
-- , withCurrentDirectory (testRoot </> "stack") initStack
-- , [SetPackageDB AutoDB, AddPackages [testRoot </> "stack"]]
-- , [LoadedModules [testRoot </> "stack" </> "UseGroups.hs"]] )
, ( "pkg-db-reload"
, withCurrentDirectory (testRoot </> "cabal-sandbox") initCabalSandbox
, [ SetPackageDB AutoDB
Expand Down
5 changes: 5 additions & 0 deletions src/debug/Language/Haskell/Tools/DebugGhcAST.hs
Expand Up @@ -70,6 +70,7 @@ deriving instance Show (HsPatSynDir RdrName)
deriving instance Show (HsRecFields RdrName (LPat RdrName))
deriving instance Show (HsRecordBinds RdrName)
deriving instance Show (HsSplice RdrName)
deriving instance Show (HsSplicedThing RdrName)
deriving instance Show (HsStmtContext RdrName)
deriving instance Show (HsTupArg RdrName)
deriving instance Show (HsTyVarBndr RdrName)
Expand Down Expand Up @@ -147,6 +148,7 @@ deriving instance Show (HsPatSynDir Name)
deriving instance Show (HsRecFields Name (LPat Name))
deriving instance Show (HsRecordBinds Name)
deriving instance Show (HsSplice Name)
deriving instance Show (HsSplicedThing Name)
deriving instance Show (HsStmtContext Name)
deriving instance Show (HsTupArg Name)
deriving instance Show (HsTyVarBndr Name)
Expand Down Expand Up @@ -224,6 +226,7 @@ deriving instance Show (HsPatSynDir Id)
deriving instance Show (HsRecFields Id (LPat Id))
deriving instance Show (HsRecordBinds Id)
deriving instance Show (HsSplice Id)
deriving instance Show (HsSplicedThing Id)
deriving instance Show (HsStmtContext Id)
deriving instance Show (HsTupArg Id)
deriving instance Show (HsTyVarBndr Id)
Expand Down Expand Up @@ -358,3 +361,5 @@ instance OutputableBndr a => Show (HsIPBinds a) where
instance Show a => Show (Bag a) where
show = show . bagToList

instance Show ThModFinalizers where
show _ = ""
@@ -1,4 +1,4 @@
module Refactor.GenerateTypeSignature.HigherOrder where

app :: (t -> t1) -> t -> t1
app :: (t1 -> t) -> t1 -> t
app f x = f x
Expand Up @@ -2,5 +2,5 @@ module Refactor.GenerateTypeSignature.PolymorphSubMulti where

f :: (Num a, Ord a) => a -> a
f a = g a where
g :: (Ord t, Num t) => t -> t
g :: (Num t, Ord t) => t -> t
g a = if a > 0 then a + 1 else a
@@ -1,4 +1,4 @@
module Refactor.GenerateTypeSignature.Tuple where

tuple :: t -> t1 -> (t, t1)
tuple :: t1 -> t -> (t1, t)
tuple x y = (x,y)
3 changes: 3 additions & 0 deletions src/refactor/haskell-tools-refactor.cabal
Expand Up @@ -118,4 +118,7 @@ test-suite haskell-tools-test
, haskell-tools-rewrite >= 0.4 && < 0.5
, haskell-tools-prettyprint >= 0.4 && < 0.5
, haskell-tools-refactor >= 0.4 && < 0.5
-- libraries used by the examples
, old-time >= 1.1 && < 1.2
, polyparse >= 1.12 && < 1.13
default-language: Haskell2010
2 changes: 1 addition & 1 deletion stack.yaml
@@ -1,4 +1,4 @@
resolver: nightly-2016-12-31
resolver: nightly-2017-01-31

packages:
- src/ast
Expand Down

0 comments on commit 08c2c0c

Please sign in to comment.