Support for GHC 9.10

AccelerateHS · Nov 30, 2024 · cce3400 · cce3400
1 parent 030e0ff
commit cce3400
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/accelerate.cabal b/accelerate.cabal
@@ -334,7 +334,7 @@ flag nofib
 
 library
   build-depends:
-          base                          >= 4.12 && < 4.20
+          base                          >= 4.12 && < 4.21
         , ansi-terminal                 >= 0.6.2
         , base-orphans                  >= 0.3
         , bytestring                    >= 0.10.2

diff --git a/src/Data/Array/Accelerate/Pattern/TH.hs b/src/Data/Array/Accelerate/Pattern/TH.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP              #-}
 {-# LANGUAGE TemplateHaskell  #-}
 {-# LANGUAGE TypeApplications #-}
 -- |
@@ -181,7 +182,13 @@ mkConP tn' tvs' con' = do
                      ]
       r' <- case mf of
               Nothing -> return r
+-- Since template-haskell 2.22, NamespaceSpecifier has been added
+-- https://hackage.haskell.org/package/template-haskell-2.22.0.0/changelog
+#if MIN_VERSION_template_haskell(2,22,0)
+              Just f  -> return (InfixD f NoNamespaceSpecifier pat : r)
+#else
               Just f  -> return (InfixD f pat : r)
+#endif
       return (pat, r')
       where
         pat = mkName (':' : nameBase cn)
@@ -273,7 +280,13 @@ mkConS tn' tvs' prev' next' tag' con' = do
                      ]
       r' <- case mf of
               Nothing -> return r
+-- Since template-haskell 2.22, NamespaceSpecifier has been added
+-- https://hackage.haskell.org/package/template-haskell-2.22.0.0/changelog
+#if MIN_VERSION_template_haskell(2,22,0)
+              Just f  -> return (InfixD f NoNamespaceSpecifier pat : r)
+#else
               Just f  -> return (InfixD f pat : r)
+#endif
       return r'
       where
         sig = forallT

diff --git a/src/Data/BitSet.hs b/src/Data/BitSet.hs
@@ -14,7 +14,7 @@
 module Data.BitSet where
 
 import Data.Bits
-import Prelude                                            hiding ( foldl, foldr )
+import Prelude                                            hiding ( foldl, foldr, foldl' )
 import qualified Data.List                                as List
 
 import GHC.Exts                                           ( IsList, build )