diff --git a/Data/Generics.hs b/Data/Generics.hs --- a/Data/Generics.hs +++ b/Data/Generics.hs @@ -2,7 +2,7 @@ -- | -- Module : Data.Generics -- Copyright : (c) The University of Glasgow, CWI 2001--2004 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the LICENSE file) -- -- Maintainer : generics@haskell.org -- Stability : experimental @@ -36,8 +36,6 @@ ) where ------------------------------------------------------------------------------ - -import Prelude -- So that 'make depend' works #ifdef __GLASGOW_HASKELL__ #ifndef __HADDOCK__ diff --git a/Data/Generics/Aliases.hs b/Data/Generics/Aliases.hs --- a/Data/Generics/Aliases.hs +++ b/Data/Generics/Aliases.hs @@ -2,7 +2,7 @@ -- | -- Module : Data.Generics.Aliases -- Copyright : (c) The University of Glasgow, CWI 2001--2004 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the LICENSE file) -- -- Maintainer : generics@haskell.org -- Stability : experimental diff --git a/Data/Generics/Basics.hs b/Data/Generics/Basics.hs --- a/Data/Generics/Basics.hs +++ b/Data/Generics/Basics.hs @@ -2,7 +2,7 @@ -- | -- Module : Data.Generics.Basics -- Copyright : (c) The University of Glasgow, CWI 2001--2004 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the LICENSE file) -- -- Maintainer : generics@haskell.org -- Stability : experimental diff --git a/Data/Generics/Instances.hs b/Data/Generics/Instances.hs --- a/Data/Generics/Instances.hs +++ b/Data/Generics/Instances.hs @@ -2,7 +2,7 @@ -- | -- Module : Data.Generics.Instances -- Copyright : (c) The University of Glasgow, CWI 2001--2004 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the LICENSE file) -- -- Maintainer : generics@haskell.org -- Stability : experimental @@ -27,18 +27,19 @@ ------------------------------------------------------------------------------ -#ifdef __HADDOCK__ -import Prelude -#endif - import Data.Data -import Data.Typeable #ifdef __GLASGOW_HASKELL__ +#if __GLASGOW_HASKELL__ >= 611 +import GHC.IO.Handle -- So we can give Data instance for Handle +#else import GHC.IOBase -- So we can give Data instance for IO, Handle +#endif import GHC.Stable -- So we can give Data instance for StablePtr import GHC.ST -- So we can give Data instance for ST -import GHC.Conc -- So we can give Data instance for MVar & Co. +import GHC.MVar -- So we can give Data instance for MVar +import GHC.Conc -- So we can give Data instance for TVar +import GHC.IORef #else # ifdef __HUGS__ import Hugs.Prelude( Ratio(..) ) @@ -70,7 +71,7 @@ instance Data TypeRep where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "Data.Typeable.TypeRep" + dataTypeOf _ = mkNoRepType "Data.Typeable.TypeRep" ------------------------------------------------------------------------------ @@ -78,7 +79,7 @@ instance Data TyCon where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "Data.Typeable.TyCon" + dataTypeOf _ = mkNoRepType "Data.Typeable.TyCon" ------------------------------------------------------------------------------ @@ -88,7 +89,7 @@ instance Data DataType where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "Data.Generics.Basics.DataType" + dataTypeOf _ = mkNoRepType "Data.Generics.Basics.DataType" ------------------------------------------------------------------------------ @@ -96,7 +97,7 @@ instance Data Handle where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "GHC.IOBase.Handle" + dataTypeOf _ = mkNoRepType "GHC.IOBase.Handle" ------------------------------------------------------------------------------ @@ -104,7 +105,7 @@ instance Typeable a => Data (StablePtr a) where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "GHC.Stable.StablePtr" + dataTypeOf _ = mkNoRepType "GHC.Stable.StablePtr" ------------------------------------------------------------------------------ @@ -113,7 +114,7 @@ instance Data ThreadId where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "GHC.Conc.ThreadId" + dataTypeOf _ = mkNoRepType "GHC.Conc.ThreadId" #endif @@ -125,7 +126,7 @@ instance Typeable a => Data (TVar a) where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "GHC.Conc.TVar" + dataTypeOf _ = mkNoRepType "GHC.Conc.TVar" #endif @@ -134,7 +135,7 @@ instance Typeable a => Data (MVar a) where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "GHC.Conc.MVar" + dataTypeOf _ = mkNoRepType "GHC.Conc.MVar" ------------------------------------------------------------------------------ @@ -143,7 +144,7 @@ instance Typeable a => Data (STM a) where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "GHC.Conc.STM" + dataTypeOf _ = mkNoRepType "GHC.Conc.STM" #endif @@ -152,7 +153,7 @@ instance (Typeable s, Typeable a) => Data (ST s a) where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "GHC.ST.ST" + dataTypeOf _ = mkNoRepType "GHC.ST.ST" ------------------------------------------------------------------------------ @@ -160,7 +161,7 @@ instance Typeable a => Data (IORef a) where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "GHC.IOBase.IORef" + dataTypeOf _ = mkNoRepType "GHC.IOBase.IORef" ------------------------------------------------------------------------------ @@ -168,7 +169,7 @@ instance Typeable a => Data (IO a) where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "GHC.IOBase.IO" + dataTypeOf _ = mkNoRepType "GHC.IOBase.IO" ------------------------------------------------------------------------------ @@ -179,6 +180,6 @@ instance (Data a, Data b) => Data (a -> b) where toConstr _ = error "toConstr" gunfold _ _ = error "gunfold" - dataTypeOf _ = mkNorepType "Prelude.(->)" + dataTypeOf _ = mkNoRepType "Prelude.(->)" dataCast2 f = gcast2 f diff --git a/Data/Generics/Schemes.hs b/Data/Generics/Schemes.hs --- a/Data/Generics/Schemes.hs +++ b/Data/Generics/Schemes.hs @@ -2,7 +2,7 @@ -- | -- Module : Data.Generics.Schemes -- Copyright : (c) The University of Glasgow, CWI 2001--2003 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the LICENSE file) -- -- Maintainer : generics@haskell.org -- Stability : experimental diff --git a/Data/Generics/Text.hs b/Data/Generics/Text.hs --- a/Data/Generics/Text.hs +++ b/Data/Generics/Text.hs @@ -2,7 +2,7 @@ -- | -- Module : Data.Generics.Text -- Copyright : (c) The University of Glasgow, CWI 2001--2003 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the LICENSE file) -- -- Maintainer : generics@haskell.org -- Stability : experimental @@ -27,7 +27,6 @@ import Prelude #endif import Control.Monad -import Data.Maybe import Data.Data import Data.Generics.Aliases import Text.ParserCombinators.ReadP @@ -88,7 +87,7 @@ do -- Drop " ( " skipSpaces -- Discard leading space - char '(' -- Parse '(' + _ <- char '(' -- Parse '(' skipSpaces -- Discard following space -- Do the real work @@ -98,7 +97,7 @@ -- Drop " ) " skipSpaces -- Discard leading space - char ')' -- Parse ')' + _ <- char ')' -- Parse ')' skipSpaces -- Discard following space return x diff --git a/Data/Generics/Twins.hs b/Data/Generics/Twins.hs --- a/Data/Generics/Twins.hs +++ b/Data/Generics/Twins.hs @@ -2,7 +2,7 @@ -- | -- Module : Data.Generics.Twins -- Copyright : (c) The University of Glasgow, CWI 2001--2004 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the LICENSE file) -- -- Maintainer : generics@haskell.org -- Stability : experimental diff --git a/syb.cabal b/syb.cabal --- a/syb.cabal +++ b/syb.cabal @@ -1,5 +1,5 @@ name: syb -version: 0.1.0.1 +version: 0.1.0.2 license: BSD3 license-file: LICENSE maintainer: libraries@haskell.org @@ -10,11 +10,11 @@ It defines the @Data@ class of types permitting folding and unfolding of constructor applications, instances of this class for primitive types, and a variety of traversals. -cabal-version: >=1.2 +cabal-version: >=1.2.3 build-type: Simple Library { - build-depends: base + build-depends: base >= 4.1 && < 4.3 Extensions: CPP, Rank2Types, ScopedTypeVariables exposed-modules: Data.Generics @@ -24,9 +24,6 @@ Data.Generics.Schemes Data.Generics.Text Data.Generics.Twins - -- We need to set the package name to syb (without a version number) - -- as it's magic. - ghc-options: -package-name syb if impl(ghc < 6.10) -- PatternSignatures was deprecated in 6.10