[commit: ghc] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (c92efe0)
Iavor Diatchki
diatchki at galois.com
Mon Jul 2 06:25:24 CEST 2012
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/c92efe0a8712c96a84e3d8616a3869e833c1c21e
>---------------------------------------------------------------
commit c92efe0a8712c96a84e3d8616a3869e833c1c21e
Merge: 830d6ba... 96f2126...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date: Mon Jun 25 18:30:42 2012 -0700
Merge remote-tracking branch 'origin/master' into type-nats
Conflicts:
compiler/coreSyn/MkExternalCore.lhs
compiler/iface/BinIface.hs
compiler/typecheck/TcInteract.lhs
compiler/typecheck/TcSMonad.lhs
aclocal.m4 | 86 +--
compiler/HsVersions.h | 13 +-
compiler/basicTypes/BasicTypes.lhs | 44 +-
compiler/basicTypes/DataCon.lhs | 16 +-
compiler/basicTypes/Demand.lhs | 3 -
compiler/basicTypes/Id.lhs | 12 +-
compiler/basicTypes/IdInfo.lhs | 3 -
compiler/basicTypes/Literal.lhs | 56 +-
compiler/basicTypes/MkId.lhs | 17 +-
compiler/basicTypes/OccName.lhs | 5 +-
compiler/basicTypes/RdrName.lhs | 6 -
compiler/basicTypes/SrcLoc.lhs | 252 +++---
compiler/basicTypes/UniqSupply.lhs | 9 +-
compiler/basicTypes/Unique.lhs | 37 +-
compiler/basicTypes/Var.lhs | 3 -
compiler/cmm/Bitmap.hs | 2 +-
compiler/cmm/CLabel.hs | 117 ++--
compiler/cmm/CmmBuildInfoTables.hs | 34 +-
compiler/cmm/CmmInfo.hs | 4 +-
compiler/cmm/CmmLint.hs | 58 +-
compiler/cmm/CmmOpt.hs | 32 +-
compiler/cmm/CmmParse.y | 4 +-
compiler/cmm/CmmPipeline.hs | 31 +-
compiler/cmm/CmmProcPoint.hs | 2 +-
compiler/cmm/CmmUtils.hs | 7 +-
compiler/cmm/MkGraph.hs | 7 +-
compiler/cmm/OldPprCmm.hs | 109 ++--
compiler/cmm/OptimizationFuel.hs | 1 +
compiler/cmm/PprC.hs | 2 +-
compiler/cmm/PprCmm.hs | 109 ++--
compiler/cmm/PprCmmDecl.hs | 95 +--
compiler/cmm/PprCmmExpr.hs | 107 ++--
compiler/codeGen/CgBindery.lhs | 27 +-
compiler/codeGen/CgCase.lhs | 1 -
compiler/codeGen/CgClosure.lhs | 27 +-
compiler/codeGen/CgCon.lhs | 11 +-
compiler/codeGen/CgExpr.lhs | 2 +-
compiler/codeGen/CgForeignCall.hs | 4 +-
compiler/codeGen/CgInfoTbls.hs | 5 +-
compiler/codeGen/CgMonad.lhs | 1 +
compiler/codeGen/CgParallel.hs | 59 +-
compiler/codeGen/CgPrimOp.hs | 16 +-
compiler/codeGen/CgProf.hs | 3 +-
compiler/codeGen/CgStackery.lhs | 3 +-
compiler/codeGen/CgTailCall.lhs | 1 +
compiler/codeGen/CgTicky.hs | 13 +-
compiler/codeGen/CgUtils.hs | 10 +-
compiler/codeGen/ClosureInfo.lhs | 42 +-
compiler/codeGen/CodeGen.lhs | 3 +-
compiler/codeGen/StgCmm.hs | 5 +-
compiler/codeGen/StgCmmBind.hs | 43 +-
compiler/codeGen/StgCmmClosure.hs | 59 +-
compiler/codeGen/StgCmmCon.hs | 4 +-
compiler/codeGen/StgCmmEnv.hs | 1 -
compiler/codeGen/StgCmmExpr.hs | 2 +-
compiler/codeGen/StgCmmForeign.hs | 3 +-
compiler/codeGen/StgCmmGran.hs | 41 +-
compiler/codeGen/StgCmmHeap.hs | 10 +-
compiler/codeGen/StgCmmLayout.hs | 27 +-
compiler/codeGen/StgCmmMonad.hs | 12 +-
compiler/codeGen/StgCmmPrim.hs | 17 +-
compiler/codeGen/StgCmmProf.hs | 3 +-
compiler/codeGen/StgCmmTicky.hs | 19 +-
compiler/codeGen/StgCmmUtils.hs | 13 +-
compiler/coreSyn/CoreLint.lhs | 18 +-
compiler/coreSyn/CorePrep.lhs | 385 +++++-----
compiler/coreSyn/CoreSyn.lhs | 5 +-
compiler/coreSyn/CoreUnfold.lhs | 75 +-
compiler/coreSyn/MkCore.lhs | 52 +-
compiler/coreSyn/MkExternalCore.lhs | 198 +++--
compiler/coreSyn/PprCore.lhs | 201 +++---
compiler/deSugar/Coverage.lhs | 391 +++++-----
compiler/deSugar/DsBinds.lhs | 4 +-
compiler/deSugar/DsCCall.lhs | 11 +-
compiler/deSugar/DsExpr.lhs | 55 +-
compiler/deSugar/DsForeign.lhs | 55 +-
compiler/deSugar/DsListComp.lhs | 11 +-
compiler/deSugar/DsMeta.hs | 346 ++++++---
compiler/deSugar/DsMonad.lhs | 14 +-
compiler/deSugar/DsUtils.lhs | 4 +-
compiler/deSugar/MatchCon.lhs | 2 +-
compiler/ghc.cabal.in | 2 +-
compiler/ghci/ByteCodeAsm.lhs | 1 +
compiler/ghci/ByteCodeGen.lhs | 163 +++--
compiler/ghci/ByteCodeItbls.lhs | 3 +-
compiler/ghci/ByteCodeLink.lhs | 1 +
compiler/ghci/Debugger.hs | 11 +-
compiler/ghci/DebuggerUtils.hs | 4 +-
compiler/ghci/Linker.lhs | 38 +-
compiler/ghci/RtClosureInspect.hs | 174 +++--
compiler/hsSyn/Convert.lhs | 64 ++-
compiler/hsSyn/HsBinds.lhs | 36 +-
compiler/hsSyn/HsDecls.lhs | 6 +-
compiler/hsSyn/HsExpr.lhs | 4 +-
compiler/hsSyn/HsTypes.lhs | 57 +-
compiler/iface/BinIface.hs | 28 +-
compiler/iface/BuildTyCl.lhs | 2 +-
compiler/iface/IfaceEnv.lhs | 25 +-
compiler/iface/IfaceType.lhs | 19 +-
compiler/iface/LoadIface.lhs | 11 +-
compiler/iface/MkIface.lhs | 44 +-
compiler/iface/TcIface.lhs | 20 +-
compiler/llvmGen/Llvm.hs | 1 -
compiler/llvmGen/Llvm/PpLlvm.hs | 106 ++--
compiler/llvmGen/LlvmCodeGen.hs | 20 +-
compiler/llvmGen/LlvmCodeGen/Base.hs | 5 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 9 +-
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 13 +-
compiler/main/CmdLineParser.hs | 4 +-
compiler/main/CodeOutput.lhs | 10 +-
compiler/main/Constants.lhs | 4 +
compiler/main/DriverMkDepend.hs | 10 +-
compiler/main/DriverPipeline.hs | 18 +-
compiler/main/DynFlags.hs | 166 +++-
compiler/main/DynFlags.hs-boot | 13 +
compiler/main/DynamicLoading.hs | 21 +-
compiler/main/ErrUtils.lhs | 108 ++-
compiler/main/ErrUtils.lhs-boot | 1 +
compiler/main/GHC.hs | 52 +-
compiler/main/GhcMake.hs | 79 +-
compiler/main/HeaderInfo.hs | 52 +-
compiler/main/HscMain.hs | 77 +-
compiler/main/HscTypes.lhs | 52 +-
compiler/main/InteractiveEval.hs | 52 +-
compiler/main/Packages.lhs | 57 +-
compiler/main/StaticFlagParser.hs | 13 +-
compiler/main/StaticFlags.hs | 57 +--
compiler/main/SysTools.lhs | 4 +-
compiler/main/TidyPgm.lhs | 531 ++++++------
compiler/nativeGen/AsmCodeGen.lhs | 81 +-
compiler/nativeGen/PIC.hs | 93 +--
compiler/nativeGen/PPC/CodeGen.hs | 11 +-
compiler/nativeGen/PPC/Ppr.hs | 100 ++--
compiler/nativeGen/PPC/Regs.hs | 14 +-
compiler/nativeGen/PprBase.hs | 17 -
compiler/nativeGen/RegAlloc/Graph/Main.hs | 579 +++++++-------
compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 10 +-
compiler/nativeGen/RegAlloc/Graph/Stats.hs | 30 +-
compiler/nativeGen/RegAlloc/Linear/Main.hs | 30 +-
compiler/nativeGen/RegAlloc/Liveness.hs | 68 +-
compiler/nativeGen/SPARC/CodeGen.hs | 12 +-
compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 7 +-
compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 3 +-
compiler/nativeGen/SPARC/CodeGen/Sanity.hs | 10 +-
compiler/nativeGen/SPARC/Imm.hs | 5 +-
compiler/nativeGen/SPARC/Ppr.hs | 94 +--
compiler/nativeGen/X86/CodeGen.hs | 43 +-
compiler/nativeGen/X86/Ppr.hs | 154 ++--
compiler/nativeGen/X86/Regs.hs | 5 +-
compiler/parser/Lexer.x | 9 +-
compiler/parser/Parser.y.pp | 6 +-
compiler/parser/ParserCore.y | 2 +-
compiler/parser/RdrHsSyn.lhs | 2 +
compiler/prelude/PrelNames.lhs | 58 +-
compiler/prelude/PrelRules.lhs | 175 +++-
compiler/prelude/PrimOp.lhs | 3 -
compiler/prelude/TysPrim.lhs | 31 +-
compiler/prelude/TysWiredIn.lhs | 48 +-
compiler/prelude/primops.txt.pp | 8 +
compiler/profiling/CostCentre.lhs | 6 +-
compiler/profiling/ProfInit.hs | 9 +-
compiler/profiling/SCCfinal.lhs | 1 +
compiler/rename/RnBinds.lhs | 23 +-
compiler/rename/RnEnv.lhs | 126 +++-
compiler/rename/RnExpr.lhs | 42 +-
compiler/rename/RnNames.lhs | 3 +-
compiler/rename/RnPat.lhs | 12 +-
compiler/rename/RnSource.lhs | 68 +-
compiler/rename/RnTypes.lhs | 13 +-
compiler/simplCore/CSE.lhs | 30 +-
compiler/simplCore/CoreMonad.lhs | 45 +-
compiler/simplCore/FloatIn.lhs | 2 +-
compiler/simplCore/OccurAnal.lhs | 2 +-
compiler/simplCore/SimplCore.lhs | 80 +-
compiler/simplCore/SimplEnv.lhs | 1 +
compiler/simplCore/Simplify.lhs | 9 +-
compiler/simplStg/SRT.lhs | 4 +-
compiler/simplStg/SimplStg.lhs | 11 +-
compiler/simplStg/UnariseStg.lhs | 167 ++++
compiler/specialise/Rules.lhs | 470 ++++++------
compiler/specialise/SpecConstr.lhs | 9 +-
compiler/specialise/Specialise.lhs | 905 +++++++++++----------
compiler/stgSyn/CoreToStg.lhs | 27 +-
compiler/stgSyn/StgLint.lhs | 38 +-
compiler/stgSyn/StgSyn.lhs | 48 +-
compiler/stranal/DmdAnal.lhs | 2 +-
compiler/stranal/WorkWrap.lhs | 88 +-
compiler/stranal/WwLib.lhs | 33 +-
compiler/typecheck/FamInst.lhs | 2 +-
compiler/typecheck/Inst.lhs | 4 +-
compiler/typecheck/TcBinds.lhs | 40 +-
compiler/typecheck/TcCanonical.lhs | 185 ++---
compiler/typecheck/TcClassDcl.lhs | 50 +--
compiler/typecheck/TcDeriv.lhs | 170 +++--
compiler/typecheck/TcEnv.lhs | 5 +-
compiler/typecheck/TcErrors.lhs | 50 +-
compiler/typecheck/TcExpr.lhs | 29 +-
compiler/typecheck/TcForeign.lhs | 1 +
compiler/typecheck/TcGenDeriv.lhs | 8 +-
compiler/typecheck/TcGenGenerics.lhs | 503 +++++++++---
compiler/typecheck/TcHsSyn.lhs | 12 +-
compiler/typecheck/TcHsType.lhs | 87 ++-
compiler/typecheck/TcInstDcls.lhs | 115 +--
compiler/typecheck/TcInteract.lhs | 284 ++++----
compiler/typecheck/TcMType.lhs | 363 ++++-----
compiler/typecheck/TcPat.lhs | 37 +-
compiler/typecheck/TcRnDriver.lhs | 78 ++-
compiler/typecheck/TcRnMonad.lhs | 38 +-
compiler/typecheck/TcRnTypes.lhs | 69 +-
compiler/typecheck/TcSMonad.lhs | 155 ++---
compiler/typecheck/TcSimplify.lhs | 837 ++++++++++++-------
compiler/typecheck/TcSplice.lhs | 84 ++-
compiler/typecheck/TcTyClsDecls.lhs | 241 ++++---
compiler/typecheck/TcType.lhs | 13 +-
compiler/typecheck/TcTypeNatsRules.hs | 2 +-
compiler/typecheck/TcUnify.lhs | 2 +-
compiler/types/Class.lhs | 3 -
compiler/types/IParam.lhs | 41 -
compiler/types/IParam.lhs-boot | 10 -
compiler/types/InstEnv.lhs | 1 +
compiler/types/Kind.lhs | 46 +-
compiler/types/OptCoercion.lhs | 1 +
compiler/types/TyCon.lhs | 30 +-
compiler/types/Type.lhs | 132 ++--
compiler/types/TypeRep.lhs | 17 +-
compiler/utils/Binary.hs | 3 -
compiler/utils/Digraph.lhs | 11 +-
compiler/utils/Exception.hs | 6 +-
compiler/utils/FastString.lhs | 5 -
compiler/utils/ListSetOps.lhs | 73 +--
compiler/utils/MonadUtils.hs | 18 -
compiler/utils/Outputable.lhs | 210 ++---
compiler/utils/Outputable.lhs-boot | 7 +
compiler/utils/Panic.lhs | 136 ++--
compiler/utils/Pretty.lhs | 9 +-
compiler/utils/Util.lhs | 122 +---
compiler/vectorise/Vectorise.hs | 15 +-
compiler/vectorise/Vectorise/Exp.hs | 12 +-
compiler/vectorise/Vectorise/Generic/PAMethods.hs | 16 +-
compiler/vectorise/Vectorise/Monad.hs | 20 +-
compiler/vectorise/Vectorise/Monad/Base.hs | 41 +-
compiler/vectorise/Vectorise/Monad/Global.hs | 9 +-
compiler/vectorise/Vectorise/Monad/InstEnv.hs | 9 +-
compiler/vectorise/Vectorise/Type/TyConDecl.hs | 28 +-
compiler/vectorise/Vectorise/Utils/PADict.hs | 23 +-
configure.ac | 9 +-
distrib/compare/compare.hs | 23 +-
docs/comm/genesis/modules.html | 2 +-
docs/users_guide/flags.xml | 27 +-
docs/users_guide/ghci.xml | 11 -
docs/users_guide/glasgow_exts.xml | 585 +++++++++-----
ghc.mk | 8 +-
ghc/GhciMonad.hs | 39 +-
ghc/GhciTags.hs | 25 +-
ghc/InteractiveUI.hs | 88 ++-
ghc/Main.hs | 12 +-
ghc/ghc-bin.cabal.in | 2 +-
includes/Cmm.h | 6 +
includes/rts/storage/GC.h | 1 +
libffi/ghc.mk | 8 +-
libraries/gen_contents_index | 37 +-
mk/config.mk.in | 6 +-
packages | 1 -
rts/Adjustor.c | 112 ++-
rts/Capability.c | 14 +-
rts/Capability.h | 2 +-
rts/Linker.c | 8 +-
rts/PosixSource.h | 4 +
rts/Prelude.h | 8 +-
rts/PrimOps.cmm | 2 +-
rts/RaiseAsync.c | 10 +-
rts/Schedule.c | 29 +-
rts/Stats.c | 5 +
rts/ghc.mk | 5 -
rts/package.conf.in | 4 +-
rts/posix/GetTime.c | 8 +-
rts/win32/libHSbase.def | 1 -
rts/win32/libHSghc-prim.def | 1 +
rules/build-package-data.mk | 2 +-
rules/build-package-way.mk | 8 +-
rules/build-prog.mk | 4 +-
rules/c-suffix-rules.mk | 22 +-
rules/cmm-suffix-rules.mk | 12 +-
rules/hs-suffix-rules-srcdir.mk | 30 +-
rules/hs-suffix-rules.mk | 8 +-
rules/package-config.mk | 7 +
rules/pretty_commands.mk | 13 +
utils/compare_sizes/Main.hs | 1 -
utils/ghc-pkg/Main.hs | 2 +-
utils/ghctags/Main.hs | 4 +-
utils/hp2ps/Key.c | 1 +
utils/runghc/ghc.mk | 3 +
utils/runghc/runghc.hs | 14 +-
validate | 7 +-
294 files changed, 8305 insertions(+), 7281 deletions(-)
Diff suppressed because of size. To see it, use:
git show c92efe0a8712c96a84e3d8616a3869e833c1c21e
More information about the Cvs-ghc
mailing list