More updates for ghc 9.10

ucsd-progsys · Aug 21, 2024 · 6723e1b · 6723e1b
1 parent 14aa91c
commit 6723e1b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 0 deletions.
diff --git a/src/Language/Fixpoint/Parse.hs b/src/Language/Fixpoint/Parse.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                       #-}
 {-# LANGUAGE FlexibleContexts          #-}
 {-# LANGUAGE FlexibleInstances         #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}
@@ -118,7 +119,9 @@ import           Control.Monad.Combinators.Expr
 import qualified Data.IntMap.Strict          as IM
 import qualified Data.HashMap.Strict         as M
 import qualified Data.HashSet                as S
+#if !MIN_VERSION_base(4,20,0)
 import           Data.List                   (foldl')
+#endif
 import           Data.List.NonEmpty          (NonEmpty(..))
 import qualified Data.Text                   as T
 import qualified Data.Text.IO                as T

diff --git a/src/Language/Fixpoint/Solver/EnvironmentReduction.hs b/src/Language/Fixpoint/Solver/EnvironmentReduction.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE PatternGuards #-}
 {-# LANGUAGE PatternSynonyms #-}
@@ -29,7 +30,11 @@ import qualified Data.HashMap.Lazy as HashMap
 import qualified Data.HashMap.Strict as HashMap.Strict
 import           Data.HashSet (HashSet)
 import qualified Data.HashSet as HashSet
+#if MIN_VERSION_base(4,20,0)
+import           Data.List (nub, partition)
+#else
 import           Data.List (foldl', nub, partition)
+#endif
 import           Data.Maybe (fromMaybe)
 import           Data.ShareMap (ShareMap)
 import qualified Data.ShareMap as ShareMap

diff --git a/src/Language/Fixpoint/Solver/TrivialSort.hs b/src/Language/Fixpoint/Solver/TrivialSort.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP           #-}
 {-# LANGUAGE DeriveGeneric #-}
 
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
@@ -14,7 +15,9 @@ import           Language.Fixpoint.Misc
 import qualified Data.HashSet            as S
 import           Data.Hashable
 import qualified Data.HashMap.Strict     as M
+#if !MIN_VERSION_base(4,20,0)
 import           Data.List (foldl')
+#endif
 import qualified Data.Graph              as G
 import           Data.Maybe
 import           Text.Printf

diff --git a/src/Language/Fixpoint/Solver/UniqifyBinds.hs b/src/Language/Fixpoint/Solver/UniqifyBinds.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP           #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE PatternGuards #-}
 
@@ -14,7 +15,9 @@ import           Language.Fixpoint.Misc          (fst3, mlookup, snd3)
 import qualified Data.HashMap.Strict as M
 import qualified Data.HashSet        as S
 import qualified Data.List           as L
+#if !MIN_VERSION_base(4,20,0)
 import           Data.Foldable       (foldl')
+#endif
 import           Data.Maybe          (catMaybes, mapMaybe, fromJust, isJust)
 import           Data.Hashable       (Hashable)
 import           GHC.Generics        (Generic)

diff --git a/src/Language/Fixpoint/Solver/UniqifyKVars.hs b/src/Language/Fixpoint/Solver/UniqifyKVars.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                    #-}
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
 
 {- | This module creates new bindings for each argument of each kvar.
@@ -38,7 +39,9 @@ module Language.Fixpoint.Solver.UniqifyKVars (wfcUniqify) where
 import           Language.Fixpoint.Types
 import           Language.Fixpoint.Types.Visitor (mapKVarSubsts)
 import qualified Data.HashMap.Strict as M
+#if !MIN_VERSION_base(4,20,0)
 import           Data.Foldable       (foldl')
+#endif
 
 --------------------------------------------------------------------------------
 wfcUniqify    :: SInfo a -> SInfo a

diff --git a/src/Language/Fixpoint/Types/Refinements.hs b/src/Language/Fixpoint/Types/Refinements.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE DeriveGeneric              #-}
 {-# LANGUAGE FlexibleContexts           #-}
@@ -116,7 +117,11 @@ import qualified Data.HashMap.Strict       as HashMap
 import           Data.HashSet              (HashSet)
 import qualified Data.HashSet              as HashSet
 import           GHC.Generics              (Generic)
+#if MIN_VERSION_base(4,20,0)
+import           Data.List                 (partition)
+#else
 import           Data.List                 (foldl', partition)
+#endif
 import qualified Data.Set                  as Set
 import           Data.String
 import           Data.Text                 (Text)