[commit: packages/base] master: Constant-fold `__GLASGOW_HASKELL__` CPP conditionals (9415541)

git at git.haskell.org git at git.haskell.org
Tue Sep 17 10:42:14 CEST 2013


Repository : ssh://git@git.haskell.org/base

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9415541109719d60d7456fce32a51a564701b0ad/base

>---------------------------------------------------------------

commit 9415541109719d60d7456fce32a51a564701b0ad
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Sep 15 23:05:05 2013 +0200

    Constant-fold `__GLASGOW_HASKELL__` CPP conditionals
    
    Now that HUGS and NHC specific code has been removed, this commit "folds"
    the now redundant `#if((n)def)`s containing `__GLASGOW_HASKELL__`.  This
    renders `base` officially GHC only.
    
    This commit also removes redundant `{-# LANGUAGE CPP #-}`.
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>


>---------------------------------------------------------------

9415541109719d60d7456fce32a51a564701b0ad
 Control/Applicative.hs             |    5 --
 Control/Category.hs                |    5 --
 Control/Concurrent.hs              |   15 ----
 Control/Concurrent/Chan.hs         |    2 -
 Control/Concurrent/MVar.hs         |    9 +-
 Control/Concurrent/QSem.hs         |    3 -
 Control/Concurrent/QSemN.hs        |    3 -
 Control/Exception.hs               |   11 +--
 Control/Exception/Base.hs          |   25 ------
 Control/Monad.hs                   |    7 +-
 Control/Monad/Fix.hs               |    6 --
 Control/Monad/ST/Imp.hs            |   13 ---
 Control/Monad/ST/Lazy/Imp.hs       |   10 +--
 Data/Bits.hs                       |   74 -----------------
 Data/Bool.hs                       |    4 +-
 Data/Char.hs                       |   12 +--
 Data/Complex.hs                    |    8 --
 Data/Data.hs                       |    7 --
 Data/Dynamic.hs                    |   10 ---
 Data/Either.hs                     |    8 +-
 Data/Eq.hs                         |    5 +-
 Data/Fixed.hs                      |    2 +-
 Data/Foldable.hs                   |    7 --
 Data/Functor.hs                    |   10 ---
 Data/IORef.hs                      |    8 +-
 Data/Int.hs                        |    4 +-
 Data/Ix.hs                         |    3 -
 Data/List.hs                       |   33 +-------
 Data/Maybe.hs                      |    4 +-
 Data/Monoid.hs                     |    6 +-
 Data/OldTypeable.hs                |    3 -
 Data/OldTypeable/Internal.hs       |   96 ++--------------------
 Data/Ord.hs                        |    4 +-
 Data/Proxy.hs                      |    8 --
 Data/Ratio.hs                      |    3 -
 Data/STRef.hs                      |    3 -
 Data/String.hs                     |    5 +-
 Data/Traversable.hs                |    3 -
 Data/Tuple.hs                      |    6 +-
 Data/Typeable.hs                   |    3 +-
 Data/Typeable/Internal.hs          |   20 +----
 Data/Unique.hs                     |   16 +---
 Data/Version.hs                    |   23 +-----
 Data/Word.hs                       |    4 +-
 Debug/Trace.hs                     |   21 +----
 Foreign/C/Error.hs                 |   11 ---
 Foreign/C/String.hs                |   84 -------------------
 Foreign/C/Types.hs                 |   20 +----
 Foreign/Concurrent.hs              |    5 +-
 Foreign/ForeignPtr.hs              |   10 +--
 Foreign/ForeignPtr/Imp.hs          |   40 +--------
 Foreign/ForeignPtr/Safe.hs         |   10 +--
 Foreign/ForeignPtr/Unsafe.hs       |    2 +-
 Foreign/Marshal.hs                 |    2 +-
 Foreign/Marshal/Alloc.hs           |   24 +-----
 Foreign/Marshal/Array.hs           |   17 +---
 Foreign/Marshal/Error.hs           |    2 -
 Foreign/Marshal/Pool.hs            |   11 +--
 Foreign/Marshal/Safe.hs            |    2 +-
 Foreign/Marshal/Unsafe.hs          |    6 +-
 Foreign/Marshal/Utils.hs           |    4 +-
 Foreign/Ptr.hs                     |   32 --------
 Foreign/StablePtr.hs               |    4 +-
 Foreign/Storable.hs                |   22 -----
 GHC/Constants.hs                   |    1 -
 GHC/Desugar.hs                     |    3 +-
 GHC/Err.lhs                        |    2 +-
 GHC/Foreign.hs                     |    2 +-
 GHC/IO/Device.hs                   |    4 +-
 GHC/IO/Encoding/UTF16.hs           |    3 +-
 GHC/Read.lhs                       |    2 +-
 Numeric.hs                         |    8 +-
 Prelude.hs                         |    6 --
 System/CPUTime.hsc                 |    8 +-
 System/Environment.hs              |    7 --
 System/Exit.hs                     |    5 --
 System/IO.hs                       |   23 +-----
 System/IO/Error.hs                 |    6 +-
 System/IO/Unsafe.hs                |    4 +-
 System/Info.hs                     |   16 ++--
 System/Mem.hs                      |    6 --
 System/Mem/StableName.hs           |    5 --
 System/Mem/Weak.hs                 |    3 -
 System/Posix/Internals.hs          |   15 ----
 System/Posix/Types.hs              |    6 --
 System/Timeout.hs                  |   12 ---
 Text/ParserCombinators/ReadP.hs    |   25 +-----
 Text/ParserCombinators/ReadPrec.hs |    4 +-
 Text/Printf.hs                     |    1 -
 Text/Read.hs                       |   13 +--
 Text/Read/Lex.hs                   |    8 +-
 Text/Show.hs                       |   14 +---
 Text/Show/Functions.hs             |    1 -
 Unsafe/Coerce.hs                   |    5 +-
 include/CTypes.h                   |  160 ------------------------------------
 include/HsBase.h                   |    4 -
 include/OldTypeable.h              |   94 ---------------------
 include/Typeable.h                 |   94 ---------------------
 tests/IO/hSeek001.hs               |    1 -
 tests/qsem001.hs                   |    1 -
 tests/qsemn001.hs                  |    1 -
 101 files changed, 77 insertions(+), 1341 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9415541109719d60d7456fce32a51a564701b0ad



More information about the ghc-commits mailing list