th-data-compat 0.1.3.0 → 0.1.3.1
raw patch · 4 files changed
+120/−40 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- src/Language/Haskell/TH/Compat/Data.hs +3/−1
- src/Language/Haskell/TH/Compat/Data/Current.hs +5/−5
- src/Language/Haskell/TH/Compat/Data/V220.hs +72/−0
- th-data-compat.cabal +40/−34
src/Language/Haskell/TH/Compat/Data.hs view
@@ -19,8 +19,10 @@ unDataD, unNewtypeD, unDataInstD, unNewtypeInstD, unInstanceD, unTyVarBndr, ) where -#if MIN_VERSION_template_haskell(2,17,0)+#if MIN_VERSION_template_haskell(2,21,0) import Language.Haskell.TH.Compat.Data.Current+#elif MIN_VERSION_template_haskell(2,17,0)+import Language.Haskell.TH.Compat.Data.V220 #elif MIN_VERSION_template_haskell(2,15,0) import Language.Haskell.TH.Compat.Data.V216 #elif MIN_VERSION_template_haskell(2,12,0)
src/Language/Haskell/TH/Compat/Data/Current.hs view
@@ -8,7 +8,7 @@ import Language.Haskell.TH (CxtQ, ConQ, TypeQ, DecQ,- Cxt, Con, Type, Name, TyVarBndr, Kind,+ Cxt, Con, Type, Name, TyVarBndr, BndrVis, Kind, Dec (DataD, NewtypeD, DataInstD, NewtypeInstD, InstanceD), DerivClauseQ, DerivClause (..), Pred, dataD, newtypeD, dataInstD, newtypeInstD, derivClause, conT)@@ -22,23 +22,23 @@ -- | Definition against 'dataD', -- compatible with before temaplate-haskell-2.11-dataD' :: CxtQ -> Name -> [TyVarBndr ()] -> [ConQ] -> [Name]+dataD' :: CxtQ -> Name -> [TyVarBndr BndrVis] -> [ConQ] -> [Name] -> DecQ dataD' cxt n bs cs ds = dataD cxt n bs Nothing cs $ derivesFromNames ds -- | Compatible interface to destruct 'DataD'-unDataD :: Dec -> Maybe (Cxt, Name, [TyVarBndr ()], Maybe Kind, [Con], [Type])+unDataD :: Dec -> Maybe (Cxt, Name, [TyVarBndr BndrVis], Maybe Kind, [Con], [Type]) unDataD (DataD cxt n bs mk cs ds) = Just (cxt, n, bs, mk, cs, ds >>= unDerivClause) unDataD _ = Nothing -- | Definition against 'newtypeD', -- compatible with before temaplate-haskell-2.11-newtypeD' :: CxtQ -> Name -> [TyVarBndr ()] -> ConQ -> [Name]+newtypeD' :: CxtQ -> Name -> [TyVarBndr BndrVis] -> ConQ -> [Name] -> DecQ newtypeD' cxt n bs c ds = newtypeD cxt n bs Nothing c $ derivesFromNames ds -- | Compatible interface to destruct 'NewtypeD'-unNewtypeD :: Dec -> Maybe (Cxt, Name, [TyVarBndr ()], Maybe Kind, Con, [Type])+unNewtypeD :: Dec -> Maybe (Cxt, Name, [TyVarBndr BndrVis], Maybe Kind, Con, [Type]) unNewtypeD (NewtypeD cxt n bs mk c ds) = Just (cxt, n, bs, mk, c, ds >>= unDerivClause) unNewtypeD _ = Nothing
+ src/Language/Haskell/TH/Compat/Data/V220.hs view
@@ -0,0 +1,72 @@+-- The latest version of applying this module impl is template-haskell-2.20+module Language.Haskell.TH.Compat.Data.V220 (+ dataD', unDataD,+ newtypeD', unNewtypeD,+ dataInstD', unDataInstD,+ newtypeInstD', unNewtypeInstD,+ unInstanceD,+ ) where++import Language.Haskell.TH+ (CxtQ, ConQ, TypeQ, DecQ,+ Cxt, Con, Type, Name, TyVarBndr, Kind,+ Dec (DataD, NewtypeD, DataInstD, NewtypeInstD, InstanceD),+ DerivClauseQ, DerivClause (..), Pred,+ dataD, newtypeD, dataInstD, newtypeInstD, derivClause, conT)+++derivesFromNames :: [Name] -> [DerivClauseQ]+derivesFromNames ns = [derivClause Nothing $ map conT ns]++unDerivClause :: DerivClause -> [Pred]+unDerivClause (DerivClause _ ps) = ps++-- | Definition against 'dataD',+-- compatible with before temaplate-haskell-2.11+dataD' :: CxtQ -> Name -> [TyVarBndr ()] -> [ConQ] -> [Name]+ -> DecQ+dataD' cxt n bs cs ds = dataD cxt n bs Nothing cs $ derivesFromNames ds++-- | Compatible interface to destruct 'DataD'+unDataD :: Dec -> Maybe (Cxt, Name, [TyVarBndr ()], Maybe Kind, [Con], [Type])+unDataD (DataD cxt n bs mk cs ds) = Just (cxt, n, bs, mk, cs, ds >>= unDerivClause)+unDataD _ = Nothing++-- | Definition against 'newtypeD',+-- compatible with before temaplate-haskell-2.11+newtypeD' :: CxtQ -> Name -> [TyVarBndr ()] -> ConQ -> [Name]+ -> DecQ+newtypeD' cxt n bs c ds = newtypeD cxt n bs Nothing c $ derivesFromNames ds++-- | Compatible interface to destruct 'NewtypeD'+unNewtypeD :: Dec -> Maybe (Cxt, Name, [TyVarBndr ()], Maybe Kind, Con, [Type])+unNewtypeD (NewtypeD cxt n bs mk c ds) = Just (cxt, n, bs, mk, c, ds >>= unDerivClause)+unNewtypeD _ = Nothing++-- | Definition against 'dataInstD',+-- compatible with before temaplate-haskell-2.11+dataInstD' :: CxtQ -> Name -> [TypeQ] -> [ConQ] -> [Name]+ -> DecQ+dataInstD' cxt n as cs ds = dataInstD cxt n as Nothing cs $ derivesFromNames ds++-- | Compatible interface to destruct 'DataInstD'+unDataInstD :: Dec -> Maybe (Cxt, Maybe [TyVarBndr ()], Type, Maybe Kind, [Con], [Type])+unDataInstD (DataInstD cxt b ty mk cs ds) = Just (cxt, b, ty, mk, cs, ds >>= unDerivClause)+unDataInstD _ = Nothing++-- | Definition against 'newtypeInstD',+-- compatible with before temaplate-haskell-2.11+newtypeInstD' :: CxtQ -> Name -> [TypeQ] -> ConQ -> [Name]+ -> DecQ+newtypeInstD' cxt n as c ds = newtypeInstD cxt n as Nothing c $ derivesFromNames ds++-- | Compatible interface to destruct 'NewtypeInstD'+unNewtypeInstD :: Dec -> Maybe (Cxt, Maybe [TyVarBndr ()], Type, Maybe Kind, Con, [Type])+unNewtypeInstD (NewtypeInstD cxt b ty mk c ds) = Just (cxt, b, ty, mk, c, ds >>= unDerivClause)+unNewtypeInstD _ = Nothing++-- | Compatible interface to destruct 'InstanceD'+-- No Overlap type is defined before template-haskell-2.11.+unInstanceD :: Dec -> Maybe (Cxt, Type, [Dec])+unInstanceD (InstanceD _ cxt ty decs) = Just (cxt, ty, decs)+unInstanceD _ = Nothing
th-data-compat.cabal view
@@ -1,6 +1,6 @@-+cabal-version: >=1.10 name: th-data-compat-version: 0.1.3.0+version: 0.1.3.1 synopsis: Compatibility for data definition template of TH description: This package contains wrapped name definitions of data definition template@@ -11,8 +11,8 @@ copyright: Copyright (c) 2016-2023 Kei Hibino category: Language build-type: Simple-cabal-version: >=1.10-tested-with: GHC == 9.6.2+tested-with: GHC == 9.8.1+ , GHC == 9.6.2, GHC == 9.6.3 , GHC == 9.4.4, GHC == 9.4.6 , GHC == 9.2.1, GHC == 9.2.2, GHC == 9.2.5, GHC == 9.2.8 , GHC == 9.0.1, GHC == 9.0.2@@ -28,42 +28,48 @@ , GHC == 7.4.1, GHC == 7.4.2 library- exposed-modules: Language.Haskell.TH.Compat.Data+ exposed-modules: Language.Haskell.TH.Compat.Data - other-modules: Language.Haskell.TH.Compat.Data.Util+ other-modules: Language.Haskell.TH.Compat.Data.Util - if impl(ghc >= 9.0)- other-modules:- Language.Haskell.TH.Compat.Data.Current- build-depends: template-haskell- else- if impl(ghc >= 8.8)- other-modules:- Language.Haskell.TH.Compat.Data.V216- build-depends: template-haskell <2.17- else- if impl(ghc >= 8.2)- other-modules:- Language.Haskell.TH.Compat.Data.V214- build-depends: template-haskell <2.15- else- if impl(ghc >= 8.0)- other-modules:- Language.Haskell.TH.Compat.Data.V211- build-depends: template-haskell ==2.11.*- else- other-modules:- Language.Haskell.TH.Compat.Data.V210- build-depends: template-haskell >=2.4 && <2.11+ if impl(ghc >= 9.8) {+ other-modules:+ Language.Haskell.TH.Compat.Data.Current+ build-depends: template-haskell+ } else {+ if impl(ghc >= 9.0) {+ other-modules:+ Language.Haskell.TH.Compat.Data.V220+ build-depends: template-haskell+ } else {+ if impl(ghc >= 8.8) {+ other-modules:+ Language.Haskell.TH.Compat.Data.V216+ build-depends: template-haskell <2.17+ } else {+ if impl(ghc >= 8.2) {+ other-modules:+ Language.Haskell.TH.Compat.Data.V214+ build-depends: template-haskell <2.15+ } else {+ if impl(ghc >= 8.0) {+ other-modules:+ Language.Haskell.TH.Compat.Data.V211+ build-depends: template-haskell ==2.11.*+ } else {+ other-modules:+ Language.Haskell.TH.Compat.Data.V210+ build-depends: template-haskell >=2.4 && <2.11+ }}}}} if impl(ghc >= 9.0)- other-modules:- Language.Haskell.TH.Compat.TyVarBndr.Current+ other-modules:+ Language.Haskell.TH.Compat.TyVarBndr.Current else- other-modules:- Language.Haskell.TH.Compat.TyVarBndr.V216+ other-modules:+ Language.Haskell.TH.Compat.TyVarBndr.V216 - build-depends: base <5+ build-depends: base <5 other-extensions: CPP hs-source-dirs: src