Support for GHC 9 and singleton-3.0 (#17)

* GHC 9 * Removes fake Changelog * GhcPs * Drops support for GHC <8.6 * CI config
konn · Mar 13, 2021 · c019d9f · c019d9f
1 parent 09789b2
commit c019d9f
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 40 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.4.3', '8.6.5', '8.8.4', '8.10.3', '9.0.1']
+        ghc: ['8.6.5', '8.8.4', '8.10.4', '9.0.1']
         HEAD: [false]
 
     runs-on: ubuntu-latest

diff --git a/.mergify.yml b/.mergify.yml
@@ -3,10 +3,9 @@ pull_request_rules:
     conditions:
       - "base=master"
       - "label=merge me"
-      - status-success=Haskell GHC 8.4.3 Test
       - status-success=Haskell GHC 8.6.5 Test
       - status-success=Haskell GHC 8.8.4 Test
-      - status-success=Haskell GHC 8.10.3 Test
+      - status-success=Haskell GHC 8.10.4 Test
       - status-success=Haskell GHC 9.0.1 Test
     actions:
       merge:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,4 +11,6 @@
     ".github/workflows/haskell.yml"
   ],
   "github-actions.workflows.pinned.refresh.enabled": true,
+  "editor.defaultFormatter": "haskell.haskell",
+  "haskell.formattingProvider": "fourmolu",
 }
diff --git a/ghc-typelits-presburger/Changelog.md b/ghc-typelits-presburger/Changelog.md
@@ -1,5 +1,6 @@
 Changelog
 ==========
+
 ## 0.4.0.0
 * Fixes constraint solving (fixes #9); this may change the previous (unsound) behaviour, and hence it is breaking change.
 

diff --git a/ghc-typelits-presburger/hie.yaml b/ghc-typelits-presburger/hie.yaml
@@ -1,6 +1,5 @@
 cradle:
   stack:
-    components:
     - path: "src"
       component: "ghc-typelits-presburger:lib"
     - path: "examples/simple-arith-core.hs"

diff --git a/ghc-typelits-presburger/package.yaml b/ghc-typelits-presburger/package.yaml
@@ -20,7 +20,7 @@ maintainer: konn.jinro _at_ gmail.com
 copyright: 2015 (c) Hiromi ISHII
 license: BSD3
 github: konn/ghc-typelits-presburger
-tested-with: GHC==8.4.3 GHC==8.6.3 GHC==8.8.3 GHC==8.10.3 GHC==9.0.1
+tested-with: GHC==8.6.5 GHC==8.8.4 GHC==8.10.4 GHC==9.0.1
 ghc-options:
   - -Wall
   - -Wno-dodgy-imports

diff --git a/ghc-typelits-presburger/src/GHC/TypeLits/Presburger/Compat.hs b/ghc-typelits-presburger/src/GHC/TypeLits/Presburger/Compat.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP, FlexibleInstances, PatternGuards, PatternSynonyms #-}
 {-# LANGUAGE TypeSynonymInstances, ViewPatterns                     #-}
+{-# LANGUAGE PatternSynonyms #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 module GHC.TypeLits.Presburger.Compat (module GHC.TypeLits.Presburger.Compat) where
 import Data.Function       (on)
@@ -10,6 +11,9 @@ import Data.Generics.Twins
 #if MIN_VERSION_ghc(9,0,0)
 import GHC.Builtin.Names as GHC.TypeLits.Presburger.Compat (gHC_TYPENATS, dATA_TYPE_EQUALITY)
 import qualified GHC.Builtin.Names as Old
+import GHC.Hs as GHC.TypeLits.Presburger.Compat (HsModule(..), NoExtField(..))
+import GHC.Hs.ImpExp as GHC.TypeLits.Presburger.Compat (ImportDecl(..), ImportDeclQualifiedStyle(..))
+import GHC.Hs.Extension as GHC.TypeLits.Presburger.Compat (GhcPs)
 import GHC.Builtin.Types as GHC.TypeLits.Presburger.Compat
   ( boolTyCon,
     eqTyConName,
@@ -34,7 +38,9 @@ import GHC.Driver.Types as GHC.TypeLits.Presburger.Compat (HscEnv (hsc_dflags))
 import GHC.Driver.Session (unitState)
 import GHC.Plugins (InScopeSet, Outputable, emptyUFM, moduleUnit, Unit)
 import GHC.Plugins as GHC.TypeLits.Presburger.Compat
-  ( PackageName (..),
+  ( PackageName (..),isStrLitTy, isNumLitTy,
+    nilDataCon, consDataCon,
+    Hsc, HsParsedModule(..),
     Plugin (..),
     TCvSubst (..),
     TvSubstEnv,
@@ -59,8 +65,12 @@ import GHC.Plugins as GHC.TypeLits.Presburger.Compat
     unionTCvSubst,
   )
 import GHC.Tc.Plugin (lookupOrig)
+import GHC.Core.InstEnv as GHC.TypeLits.Presburger.Compat (classInstances)
+import GHC.Driver.Types as GHC.TypeLits.Presburger.Compat (IsBootInterface(..))
 import GHC.Tc.Plugin as GHC.TypeLits.Presburger.Compat
   ( TcPluginM,
+    getInstEnvs,
+    newFlexiTyVar,
     getTopEnv,
     lookupOrig,
     newFlexiTyVar,
@@ -159,12 +169,13 @@ import PrelNames as GHC.TypeLits.Presburger.Compat (eqTyConName)
 #if MIN_VERSION_ghc(8,10,1)
 import Predicate as GHC.TypeLits.Presburger.Compat (EqRel (..), Pred(..))
 import Predicate as GHC.TypeLits.Presburger.Compat (isEqPred)
-
+import GHC (NoExtField(..))
 import qualified Predicate as Old (classifyPredType)
 import Predicate as GHC.TypeLits.Presburger.Compat  (mkPrimEqPredRole)
 import Constraint as GHC.TypeLits.Presburger.Compat 
     (Ct, ctEvidence, ctEvPred, isWanted)
 #else
+import GHC (NoExt(..))
 import GhcPlugins as GHC.TypeLits.Presburger.Compat (EqRel (..), PredTree (..))
 import GhcPlugins as GHC.TypeLits.Presburger.Compat (isEqPred)
 import qualified GhcPlugins as Old (classifyPredType)
@@ -359,3 +370,32 @@ type ModuleUnit = UnitId
 moduleUnit' :: Module -> ModuleUnit
 moduleUnit' = GHC.moduleUnitId
 #endif
+
+#if !MIN_VERSION_ghc(8,10,1)
+type NoExtField = NoExt
+#endif
+
+noExtField :: NoExtField
+#if MIN_VERSION_ghc(8,10,1)
+noExtField = NoExtField
+#else
+noExtField = NoExt
+#endif
+
+#if MIN_VERSION_ghc(9,0,1)
+type HsModule' = HsModule
+#else
+type HsModule' = GHC.HsModule GHC.GhcPs
+#endif
+
+#if !MIN_VERSION_ghc(9,0,1)
+type IsBootInterface = Bool
+pattern NotBoot :: IsBootInterface
+pattern NotBoot = False
+
+pattern IsBoot :: IsBootInterface
+pattern IsBoot = True
+
+{-# COMPLETE NotBoot, IsBoot #-}
+#endif
+
diff --git a/singletons-presburger/package.yaml b/singletons-presburger/package.yaml
@@ -1,5 +1,5 @@
 name: singletons-presburger
-version: "0.5.1.0"
+version: "0.6.0.0"
 synopsis: Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package.
 description: |
   The @singletons-presburger@ plugin augments GHC type-system with Presburger
@@ -15,7 +15,7 @@ maintainer: konn.jinro _at_ gmail.com
 copyright: 2015 (c) Hiromi ISHII
 license: BSD3
 github: konn/ghc-typelits-presburger
-tested-with: GHC==8.4.3 GHC==8.6.3 GHC==8.8.3 GHC==8.10.1
+tested-with: GHC==8.6.5 GHC==8.8.4 GHC==8.10.4 GHC==9.0.1
 ghc-options:
   - -Wall
   - -Wno-dodgy-imports

diff --git a/singletons-presburger/singletons-presburger.cabal b/singletons-presburger/singletons-presburger.cabal
@@ -4,10 +4,10 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: c78fc73861dc22536c4a5d4040b2f5ab8962bbf61f89477aa3af5160d720b11c
+-- hash: bcd8a76493634b5daf7fd755d964a4c6c5d5547295f5ffc045534fa5d312162e
 
 name:           singletons-presburger
-version:        0.5.1.0
+version:        0.6.0.0
 synopsis:       Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package.
 description:    The @singletons-presburger@ plugin augments GHC type-system with Presburger
                 Arithmetic Solver for Type-level natural numbers, with integration with <https://hackage.haskell.org/package/singletons singletons> package.

diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml
@@ -0,0 +1,7 @@
+resolver: lts-17.3
+compiler: ghc-8.10.4
+
+flags: {}
+packages:
+  - "ghc-typelits-presburger"
+  - "singletons-presburger"
diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml
diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2021-02-04
+resolver: nightly-2021-03-12
 compiler: ghc-9.0.1
 compiler-check: match-exact
 
@@ -11,19 +11,12 @@ packages:
 
 extra-deps:
 - syb-0.7.2.1
-- equational-reasoning-0.7.0.0
+- equational-reasoning-0.7.0.0@rev:1
 - indexed-traversable-instances-0.1
-- github: mgsloan/th-expand-syns
-  commit: 6a64927ebd6b85cc3c67c00c88c3c7c019d31573
-- github: goldfirere/th-desugar
-  commit: e22709ebfc43c12fb690622eb0da09d2b3c4ba73
-- github: ekmett/profunctors
-  commit: e74a169799c899075f7cef2afb70a93ac38f9557
-- github: goldfirere/singletons
-  commit: 30f3abe93b77d477796d179e008aa1146b1d6f14
-  subdirs:
-  - singletons
-  - singletons-th
-  - singletons-base
-- github: ekmett/lens
-  commit: 6815396accd3d6ba14bd5bfe4dec2fe516fc33c4
+- th-expand-syns-0.4.8.0
+- th-desugar-1.12
+- profunctors-5.6.2
+- singletons-3.0
+- singletons-base-3.0
+- singletons-th-3.0
+- lens-5.0.1
diff --git a/stack.yaml b/stack.yaml
@@ -1 +1 @@
-./stack-8.6.5.yaml
+./stack-8.10.4.yaml