Add Lift instances for other containers

Add `Lift` instances for `Data.Map.Map`, `Data.Set.Set`,
`Data.IntSet.IntSet`, `Data.IntMap.IntMap`, `Data.Tree.Tree`,
and `Data.Graph.SCC`.

Author: treeowl

containers/changelog.md

@@ -9,8 +9,9 @@
 
 ### New instances
 
-* `Data.Sequence` now offers `Lift` instances for `Seq`, `ViewL`, and `ViewR`
-  for use with Template Haskell.
+* Add `Lift` instances for use with Template Haskell. Specifically:
+  `Seq`, `ViewL`, and `ViewR` (in `Data.Sequence`), `Map`, `Set`,
+  `IntMap`, `IntSet`, `Tree`, and `SCC` (in `Data.Graph`).
 
 ## 0.6.5.1
 

containers/src/Data/Graph.hs

@@ -3,8 +3,13 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveLift #-}
 {-# LANGUAGE StandaloneDeriving #-}
+#  if __GLASGOW_HASKELL__ >= 802
 {-# LANGUAGE Safe #-}
+#  else
+{-# LANGUAGE Trustworthy #-}
+#  endif
 #endif
 
 #include "containers.h"
@@ -121,6 +126,7 @@ import Data.Semigroup (Semigroup (..))
 #ifdef __GLASGOW_HASKELL__
 import GHC.Generics (Generic, Generic1)
 import Data.Data (Data)
+import Language.Haskell.TH.Syntax (Lift)
 #endif
 
 -- Make sure we don't use Integer by mistake.
@@ -155,6 +161,9 @@ deriving instance Generic1 SCC
 
 -- | @since 0.5.9
 deriving instance Generic (SCC vertex)
+
+-- | @since FIXME
+deriving instance Lift vertex => Lift (SCC vertex)
 #endif
 
 -- | @since 0.5.9

containers/src/Data/IntMap/Internal.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE PatternGuards #-}
 #ifdef __GLASGOW_HASKELL__
+{-# LANGUAGE DeriveLift #-}
 {-# LANGUAGE MagicHash #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
@@ -319,6 +320,7 @@ import Data.Data (Data(..), Constr, mkConstr, constrIndex, Fixity(Prefix),
 import GHC.Exts (build)
 import qualified GHC.Exts as GHCExts
 import Text.Read
+import Language.Haskell.TH.Syntax (Lift)
 #endif
 import qualified Control.Category as Category
 
@@ -369,6 +371,9 @@ type Mask   = Int
 type IntSetPrefix = Int
 type IntSetBitMap = Word
 
+-- | @since FIXME
+deriving instance Lift a => Lift (IntMap a)
+
 bitmapOf :: Int -> IntSetBitMap
 bitmapOf x = shiftLL 1 (x .&. IntSet.suffixBitMask)
 {-# INLINE bitmapOf #-}

containers/src/Data/IntSet/Internal.hs

@@ -2,7 +2,9 @@
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE PatternGuards #-}
 #ifdef __GLASGOW_HASKELL__
+{-# LANGUAGE DeriveLift #-}
 {-# LANGUAGE MagicHash #-}
+{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeFamilies #-}
 #endif
 #if !defined(TESTING) && defined(__GLASGOW_HASKELL__)
@@ -209,9 +211,10 @@ import Text.Read
 
 #if __GLASGOW_HASKELL__
 import qualified GHC.Exts
-#if !(WORD_SIZE_IN_BITS==64)
+#  if !(WORD_SIZE_IN_BITS==64)
 import qualified GHC.Int
-#endif
+#  endif
+import Language.Haskell.TH.Syntax (Lift)
 #endif
 
 import qualified Data.Foldable as Foldable
@@ -268,6 +271,11 @@ type Mask   = Int
 type BitMap = Word
 type Key    = Int
 
+#ifdef __GLASGOW_HASKELL__
+-- | @since FIXME
+deriving instance Lift IntSet
+#endif
+
 instance Monoid IntSet where
     mempty  = empty
     mconcat = unions

containers/src/Data/Map/Internal.hs

@@ -2,7 +2,9 @@
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE PatternGuards #-}
 #if defined(__GLASGOW_HASKELL__)
+{-# LANGUAGE DeriveLift #-}
 {-# LANGUAGE RoleAnnotations #-}
+{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE TypeFamilies #-}
 #endif
@@ -393,6 +395,7 @@ import Utils.Containers.Internal.BitUtil (wordSize)
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts (build, lazy)
+import Language.Haskell.TH.Syntax (Lift)
 #  ifdef USE_MAGIC_PROXY
 import GHC.Exts (Proxy#, proxy# )
 #  endif
@@ -462,6 +465,11 @@ type Size     = Int
 type role Map nominal representational
 #endif
 
+#ifdef __GLASGOW_HASKELL__
+-- | @since FIXME
+deriving instance (Lift k, Lift a) => Lift (Map k a)
+#endif
+
 instance (Ord k) => Monoid (Map k v) where
     mempty  = empty
     mconcat = unions

containers/src/Data/Sequence/Internal.hs

@@ -341,7 +341,7 @@ instance Sized (ForceBox a) where
 newtype Seq a = Seq (FingerTree (Elem a))
 
 #ifdef __GLASGOW_HASKELL__
--- | @since 0.7
+-- | @since FIXME
 instance TH.Lift a => TH.Lift (Seq a) where
 #  if MIN_VERSION_template_haskell(2,16,0)
   liftTyped t = [|| coerceFT z ||]
@@ -2174,7 +2174,7 @@ deriving instance Generic1 ViewL
 -- | @since 0.5.8
 deriving instance Generic (ViewL a)
 
--- | @since 0.7
+-- | @since FIXME
 deriving instance TH.Lift a => TH.Lift (ViewL a)
 #endif
 
@@ -2241,7 +2241,7 @@ deriving instance Generic1 ViewR
 -- | @since 0.5.8
 deriving instance Generic (ViewR a)
 
--- | @since 0.7
+-- | @since FIXME
 deriving instance TH.Lift a => TH.Lift (ViewR a)
 #endif
 

containers/src/Data/Set/Internal.hs

@@ -5,7 +5,9 @@
 {-# LANGUAGE Trustworthy #-}
 #endif
 #ifdef __GLASGOW_HASKELL__
+{-# LANGUAGE DeriveLift #-}
 {-# LANGUAGE RoleAnnotations #-}
+{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeFamilies #-}
 #endif
 
@@ -250,6 +252,7 @@ import qualified GHC.Exts as GHCExts
 import Text.Read ( readPrec, Read (..), Lexeme (..), parens, prec
                  , lexP, readListPrecDefault )
 import Data.Data
+import Language.Haskell.TH.Syntax (Lift)
 #endif
 
 
@@ -280,6 +283,9 @@ type Size     = Int
 type role Set nominal
 #endif
 
+-- | @since FIXME
+deriving instance Lift a => Lift (Set a)
+
 instance Ord a => Monoid (Set a) where
     mempty  = empty
     mconcat = unions

containers/src/Data/Tree.hs

@@ -3,6 +3,7 @@
 #if __GLASGOW_HASKELL__
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveLift #-}
 {-# LANGUAGE Trustworthy #-}
 #endif
 
@@ -62,6 +63,7 @@ import Control.DeepSeq (NFData(rnf))
 #ifdef __GLASGOW_HASKELL__
 import Data.Data (Data)
 import GHC.Generics (Generic, Generic1)
+import Language.Haskell.TH.Syntax (Lift)
 #endif
 
 import Control.Monad.Zip (MonadZip (..))
@@ -88,6 +90,7 @@ data Tree a = Node {
            , Data
            , Generic  -- ^ @since 0.5.8
            , Generic1 -- ^ @since 0.5.8
+           , Lift -- ^ @since FIXME
            )
 #else
   deriving (Eq, Ord, Read, Show)