[commit: ghc] master: Change how macros like ASSERT are defined (243439e)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/243439e6e77eca548a6583722792d6b96e3f6bcd

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

commit 243439e6e77eca548a6583722792d6b96e3f6bcd
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue Jun 5 00:52:01 2012 +0100

    Change how macros like ASSERT are defined
    
    By using Haskell's debugIsOn rather than CPP's "#ifdef DEBUG", we
    don't need to kludge things to keep the warning checker happy etc.

 compiler/HsVersions.h                         |   13 ++-----------
 compiler/basicTypes/Id.lhs                    |    2 +-
 compiler/basicTypes/Literal.lhs               |    2 ++
 compiler/basicTypes/Unique.lhs                |    1 +
 compiler/cmm/CmmBuildInfoTables.hs            |    2 +-
 compiler/cmm/CmmInfo.hs                       |    2 ++
 compiler/cmm/CmmUtils.hs                      |    1 +
 compiler/cmm/MkGraph.hs                       |    1 +
 compiler/cmm/OptimizationFuel.hs              |    1 +
 compiler/codeGen/CgMonad.lhs                  |    1 +
 compiler/codeGen/CgTailCall.lhs               |    1 +
 compiler/codeGen/ClosureInfo.lhs              |    1 +
 compiler/codeGen/CodeGen.lhs                  |    1 +
 compiler/codeGen/StgCmm.hs                    |    1 +
 compiler/codeGen/StgCmmClosure.hs             |    1 +
 compiler/codeGen/StgCmmCon.hs                 |    2 +-
 compiler/codeGen/StgCmmHeap.hs                |    1 +
 compiler/codeGen/StgCmmPrim.hs                |    1 +
 compiler/coreSyn/MkCore.lhs                   |    2 +-
 compiler/deSugar/DsCCall.lhs                  |    1 +
 compiler/deSugar/DsForeign.lhs                |    2 ++
 compiler/deSugar/DsListComp.lhs               |    1 +
 compiler/deSugar/DsMeta.hs                    |    2 +-
 compiler/deSugar/MatchCon.lhs                 |    2 +-
 compiler/ghci/ByteCodeAsm.lhs                 |    1 +
 compiler/ghci/ByteCodeLink.lhs                |    1 +
 compiler/hsSyn/HsExpr.lhs                     |    2 +-
 compiler/iface/BinIface.hs                    |    1 +
 compiler/iface/BuildTyCl.lhs                  |    2 +-
 compiler/iface/IfaceEnv.lhs                   |    1 +
 compiler/main/HscMain.hs                      |    1 +
 compiler/nativeGen/PPC/CodeGen.hs             |    1 +
 compiler/nativeGen/X86/CodeGen.hs             |    1 +
 compiler/parser/RdrHsSyn.lhs                  |    2 ++
 compiler/prelude/PrelRules.lhs                |    1 +
 compiler/prelude/TysWiredIn.lhs               |    1 +
 compiler/profiling/SCCfinal.lhs               |    1 +
 compiler/rename/RnExpr.lhs                    |    2 +-
 compiler/rename/RnPat.lhs                     |    2 +-
 compiler/rename/RnTypes.lhs                   |    2 +-
 compiler/simplCore/FloatIn.lhs                |    2 +-
 compiler/simplCore/OccurAnal.lhs              |    2 +-
 compiler/simplCore/SimplEnv.lhs               |    1 +
 compiler/simplCore/Simplify.lhs               |    1 +
 compiler/stgSyn/StgSyn.lhs                    |    1 +
 compiler/stranal/DmdAnal.lhs                  |    2 +-
 compiler/stranal/WorkWrap.lhs                 |    2 +-
 compiler/typecheck/FamInst.lhs                |    2 +-
 compiler/typecheck/TcCanonical.lhs            |    2 +-
 compiler/typecheck/TcClassDcl.lhs             |    1 +
 compiler/typecheck/TcEnv.lhs                  |    1 +
 compiler/typecheck/TcForeign.lhs              |    1 +
 compiler/typecheck/TcGenGenerics.lhs          |    1 +
 compiler/typecheck/TcHsSyn.lhs                |    1 +
 compiler/typecheck/TcHsType.lhs               |    2 ++
 compiler/typecheck/TcInteract.lhs             |    1 +
 compiler/typecheck/TcRnTypes.lhs              |    1 +
 compiler/typecheck/TcSplice.lhs               |    2 +-
 compiler/types/InstEnv.lhs                    |    1 +
 compiler/types/Kind.lhs                       |    1 +
 compiler/types/OptCoercion.lhs                |    1 +
 compiler/types/TypeRep.lhs                    |    1 +
 compiler/utils/Outputable.lhs                 |    3 ++-
 compiler/vectorise/Vectorise/Exp.hs           |    1 +
 compiler/vectorise/Vectorise/Monad/InstEnv.hs |    1 +
 ghc/InteractiveUI.hs                          |    3 +--
 66 files changed, 73 insertions(+), 32 deletions(-)


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

    git show 243439e6e77eca548a6583722792d6b96e3f6bcd