[commit: base] new-typeable: Merge remote-tracking branch 'origin' into new-typeable (780c579)
José Pedro Magalhães
jpm at cs.uu.nl
Fri Nov 23 11:37:59 CET 2012
Repository : ssh://darcs.haskell.org//srv/darcs/packages/base
On branch : new-typeable
http://hackage.haskell.org/trac/ghc/changeset/780c57985ebda551b5c542ba8c6455a071a7c640
>---------------------------------------------------------------
commit 780c57985ebda551b5c542ba8c6455a071a7c640
Merge: 767f73e... 62c6793...
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date: Mon Nov 19 11:20:30 2012 +0000
Merge remote-tracking branch 'origin' into new-typeable
Conflicts:
Data/Typeable.hs
Control/Concurrent.hs | 8 +-
Control/Concurrent/Chan.hs | 16 ++--
Control/Concurrent/MVar.hs | 2 +-
Control/Exception.hs | 7 ++
Control/Exception/Base.hs | 21 ----
Control/Monad.hs | 66 ++++++------
Control/Monad/Fix.hs | 6 +-
Control/Monad/ST.hs | 6 +-
Control/Monad/ST/Imp.hs | 12 +-
Control/Monad/ST/Lazy/Imp.hs | 2 +-
Control/Monad/ST/Safe.hs | 8 +-
Data/Bits.hs | 40 ++++----
Data/Bool.hs | 8 +-
Data/Char.hs | 16 ++--
Data/Complex.hs | 25 ++---
Data/Data.hs | 78 +++++++-------
Data/Dynamic.hs | 6 +-
Data/Either.hs | 8 +-
Data/Foldable.hs | 6 +-
Data/IORef.hs | 16 ++--
Data/Ix.hs | 8 +-
Data/List.hs | 202 ++++++++++++++++++------------------
Data/Maybe.hs | 25 ++---
Data/Ratio.hs | 19 +---
Data/STRef.hs | 12 +-
Data/STRef/Lazy.hs | 10 +-
Data/Traversable.hs | 74 +++++++++++++-
Data/Tuple.hs | 10 +-
Data/Typeable.hs | 12 +-
Data/Unique.hs | 6 +-
Debug/Trace.hs | 89 +++++++++++++---
Foreign/C/Error.hs | 40 +++-----
Foreign/C/String.hs | 58 +++++-----
Foreign/C/Types.hs | 8 +-
Foreign/Marshal/Alloc.hs | 18 ++--
Foreign/Marshal/Array.hs | 40 ++++----
Foreign/Marshal/Error.hs | 14 +--
Foreign/Marshal/Pool.hs | 30 +++---
Foreign/Marshal/Utils.hs | 23 ++---
Foreign/Ptr.hs | 24 ++--
Foreign/StablePtr.hs | 10 +-
Foreign/Storable.hs | 16 ++--
GHC/Arr.lhs | 4 +-
GHC/Base.lhs | 15 +--
GHC/Conc.lhs | 84 ++++++++--------
GHC/Conc/IO.hs | 20 ++--
GHC/Conc/Sync.lhs | 76 +++++++-------
GHC/Conc/Windows.hs | 10 +-
GHC/Desugar.hs | 2 +-
GHC/Err.lhs | 12 +-
GHC/Event/KQueue.hsc | 17 +++-
GHC/Exception.lhs | 4 +-
GHC/Exts.hs | 1 -
GHC/Float.lhs | 54 ++++++----
GHC/Foreign.hs | 14 ++--
GHC/Generics.hs | 9 ++-
GHC/IO/Exception.hs | 6 +-
GHC/IO/FD.hs | 2 +-
GHC/IO/Handle/Internals.hs | 2 +-
GHC/Int.hs | 24 +++--
GHC/List.lhs | 6 +-
GHC/MVar.hs | 16 ++--
GHC/Pack.lhs | 6 +-
GHC/Read.lhs | 48 ++++-----
GHC/ST.lhs | 2 +-
GHC/Stable.lhs | 10 +-
GHC/TypeLits.hs | 60 +++++++----
GHC/Unicode.hs | 1 -
GHC/Windows.hs | 168 +++++++++++++++++++++++++++--
Numeric.hs | 37 +++----
Prelude.hs | 6 +-
System/Environment.hs | 12 +-
System/Exit.hs | 6 +-
System/IO.hs | 108 ++++++++++----------
System/IO/Error.hs | 46 ++++-----
System/IO/Unsafe.hs | 6 +-
System/Info.hs | 8 +-
System/Mem.hs | 2 +-
System/Mem/Weak.hs | 14 ++--
Text/ParserCombinators/ReadP.hs | 74 +++++++-------
Text/ParserCombinators/ReadPrec.hs | 34 +++---
Text/Printf.hs | 4 +-
Text/Read.hs | 28 +++---
Text/Read/Lex.hs | 16 ++--
Text/Show.hs | 18 ++--
cbits/Win32Utils.c | 69 ++++++++-----
configure.ac | 6 +
include/EventConfig.h.in | 6 +
include/HsBase.h | 1 +
89 files changed, 1277 insertions(+), 1002 deletions(-)
diff --cc Data/Typeable.hs
index e0bd6f3,d43ad50..e1a0e3c
--- a/Data/Typeable.hs
+++ b/Data/Typeable.hs
@@@ -38,45 -37,62 +38,45 @@@
module Data.Typeable
(
+ -- * A proxy type
+ Proxy (..),
-- * The Typeable class
- Typeable( typeRep ), -- :: Proxy a -> TypeRep
- Typeable( typeOf ),
++ Typeable( typeRep ),
+
+ -- * For backwards compatibility
+ typeOf, typeOf1, typeOf2, typeOf3, typeOf4, typeOf5, typeOf6, typeOf7,
-- * Type-safe cast
- cast, -- :: (Typeable a, Typeable b) => a -> Maybe b
+ cast,
gcast, -- a generalisation of cast
+ -- * Generalized casts for higher-order kinds
+ gcast1, -- :: ... => c (t a) -> Maybe (c (t' a))
+ gcast2, -- :: ... => c (t a b) -> Maybe (c (t' a b))
+
-- * Type representations
TypeRep, -- abstract, instance of: Eq, Show, Typeable
showsTypeRep,
TyCon, -- abstract, instance of: Eq, Show, Typeable
- tyConString, -- :: TyCon -> String
- tyConPackage, -- :: TyCon -> String
- tyConModule, -- :: TyCon -> String
- tyConName, -- :: TyCon -> String
+ tyConString,
+ tyConPackage,
+ tyConModule,
+ tyConName,
-- * Construction of type representations
- mkTyCon,
- mkTyCon3,
- mkTyConApp,
- mkAppTy,
- mkFunTy,
+ -- mkTyCon, -- :: String -> TyCon
+ mkTyCon3, -- :: String -> String -> String -> TyCon
+ mkTyConApp, -- :: TyCon -> [TypeRep] -> TypeRep
+ mkAppTy, -- :: TypeRep -> TypeRep -> TypeRep
+ mkFunTy, -- :: TypeRep -> TypeRep -> TypeRep
-- * Observation of type representations
- splitTyConApp,
- funResultTy,
- typeRepTyCon,
- typeRepArgs,
- typeRepKey,
- TypeRepKey, -- abstract, instance of Eq, Ord
-
- -- * The other Typeable classes
- -- | /Note:/ The general instances are provided for GHC only.
- Typeable1( typeOf1 ),
- Typeable2( typeOf2 ),
- Typeable3( typeOf3 ),
- Typeable4( typeOf4 ),
- Typeable5( typeOf5 ),
- Typeable6( typeOf6 ),
- Typeable7( typeOf7 ),
- gcast1,
- gcast2,
-
- -- * Default instances
- -- | /Note:/ These are not needed by GHC, for which these instances
- -- are generated by general instance declarations.
- typeOfDefault,
- typeOf1Default,
- typeOf2Default,
- typeOf3Default,
- typeOf4Default,
- typeOf5Default,
- typeOf6Default
-
+ splitTyConApp, -- :: TypeRep -> (TyCon, [TypeRep])
+ funResultTy, -- :: TypeRep -> TypeRep -> Maybe TypeRep
+ typeRepTyCon, -- :: TypeRep -> TyCon
+ typeRepArgs, -- :: TypeRep -> [TypeRep]
) where
import Data.Typeable.Internal hiding (mkTyCon)
More information about the Cvs-libraries
mailing list