[commit: ghc] new-typeable: Merge (0e5b68e)
José Pedro Magalhães
jpm at cs.uu.nl
Tue Jan 15 18:20:39 CET 2013
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : new-typeable
http://hackage.haskell.org/trac/ghc/changeset/0e5b68e534e04f2b7c21c5d41b6ab8408bc10839
>---------------------------------------------------------------
commit 0e5b68e534e04f2b7c21c5d41b6ab8408bc10839
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date: Tue Jan 15 16:20:27 2013 +0000
Merge
compiler/basicTypes/BasicTypes.lhs | 58 --
compiler/basicTypes/DataCon.lhs | 342 ++++---
compiler/basicTypes/DataCon.lhs-boot | 3 +-
compiler/basicTypes/Id.lhs | 2 +-
compiler/basicTypes/Literal.lhs | 7 +-
compiler/basicTypes/MkId.lhs | 728 ++++++++------
compiler/basicTypes/MkId.lhs-boot | 10 +-
compiler/cmm/CmmMachOp.hs | 2 +
compiler/cmm/CmmPipeline.hs | 37 +-
compiler/cmm/CmmProcPoint.hs | 2 +-
compiler/cmm/PprC.hs | 1 +
compiler/codeGen/StgCmmPrim.hs | 6 +
compiler/codeGen/StgCmmUtils.hs | 3 +-
compiler/coreSyn/CoreLint.lhs | 63 +-
compiler/coreSyn/CoreSubst.lhs | 7 +-
compiler/coreSyn/CoreUnfold.lhs | 7 +-
compiler/coreSyn/CoreUtils.lhs | 111 ++-
compiler/coreSyn/ExternalCore.lhs | 1 +
compiler/coreSyn/MkCore.lhs | 4 +-
compiler/coreSyn/MkExternalCore.lhs | 8 +-
compiler/coreSyn/PprExternalCore.lhs | 53 +-
compiler/coreSyn/TrieMap.lhs | 60 +-
compiler/deSugar/Check.lhs | 2 +-
compiler/deSugar/Coverage.lhs | 12 +-
compiler/deSugar/DsArrows.lhs | 89 +-
compiler/deSugar/DsBinds.lhs | 8 +-
compiler/deSugar/DsExpr.lhs | 21 +-
compiler/deSugar/DsGRHSs.lhs | 14 +-
compiler/deSugar/DsListComp.lhs | 5 +-
compiler/deSugar/DsMeta.hs | 177 +++--
compiler/deSugar/DsUtils.lhs | 14 +-
compiler/deSugar/Match.lhs | 55 +-
compiler/deSugar/MatchCon.lhs | 3 +-
compiler/deSugar/MatchLit.lhs | 8 +-
compiler/ghc.cabal.in | 5 +-
compiler/ghci/ByteCodeAsm.lhs | 8 +-
compiler/ghci/ByteCodeGen.lhs | 10 +-
compiler/hsSyn/Convert.lhs | 460 +++++-----
compiler/hsSyn/HsDecls.lhs | 498 ++++++----
compiler/hsSyn/HsExpr.lhs | 28 +-
compiler/hsSyn/HsLit.lhs | 3 +-
compiler/hsSyn/HsTypes.lhs | 1 +
compiler/hsSyn/HsUtils.lhs | 33 +-
compiler/iface/BinIface.hs | 48 +-
compiler/iface/BuildTyCl.lhs | 18 +-
compiler/iface/IfaceSyn.lhs | 67 +-
compiler/iface/IfaceType.lhs | 12 +-
compiler/iface/MkIface.lhs | 56 +-
compiler/iface/TcIface.lhs | 78 +-
compiler/iface/TcIface.lhs-boot | 4 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 16 +
compiler/main/DriverPhases.hs | 61 +-
compiler/main/DriverPipeline.hs | 153 ++-
compiler/main/DynFlags.hs | 150 +++-
compiler/main/GHC.hs | 4 +-
compiler/main/GhcMake.hs | 4 +-
compiler/main/HscMain.hs | 11 +-
compiler/main/HscStats.hs | 19 +-
compiler/main/HscStats.lhs | 6 +-
compiler/main/HscTypes.lhs | 25 +-
compiler/main/InteractiveEval.hs | 43 +-
compiler/main/PprTyThing.hs | 23 +-
compiler/main/TidyPgm.lhs | 14 +-
compiler/nativeGen/AsmCodeGen.lhs | 163 ++--
compiler/nativeGen/CPrim.hs | 12 +-
compiler/nativeGen/PPC/CodeGen.hs | 2 +
compiler/nativeGen/PPC/Instr.hs | 576 ++++++-----
compiler/nativeGen/SPARC/Base.hs | 51 +-
compiler/nativeGen/SPARC/CodeGen.hs | 2 +
compiler/nativeGen/X86/CodeGen.hs | 25 +-
compiler/nativeGen/X86/Instr.hs | 126 ++-
compiler/parser/Lexer.x | 7 +-
compiler/parser/Parser.y.pp | 101 ++-
compiler/parser/ParserCore.y | 22 +-
compiler/parser/RdrHsSyn.lhs | 124 ++-
compiler/prelude/PrelNames.lhs | 21 +-
compiler/prelude/PrelRules.lhs | 27 +-
compiler/prelude/TysPrim.lhs | 7 -
compiler/prelude/TysWiredIn.lhs | 39 +-
compiler/prelude/TysWiredIn.lhs-boot | 1 +
compiler/prelude/primops.txt.pp | 3 +
compiler/rename/RnBinds.lhs | 22 +-
compiler/rename/RnExpr.lhs | 4 +-
compiler/rename/RnNames.lhs | 63 +-
compiler/rename/RnSource.lhs | 254 +++--
compiler/rename/RnTypes.lhs | 12 +-
compiler/simplCore/CoreMonad.lhs | 3 +
compiler/simplCore/OccurAnal.lhs | 255 +----
compiler/simplCore/SimplMonad.lhs | 10 +-
compiler/simplCore/SimplUtils.lhs | 127 ++--
compiler/simplCore/Simplify.lhs | 142 ++--
compiler/stranal/DmdAnal.lhs | 4 +-
compiler/stranal/WwLib.lhs | 65 ++-
compiler/typecheck/FamInst.lhs | 137 ++-
compiler/typecheck/Inst.lhs | 114 +--
compiler/typecheck/TcArrows.lhs | 9 +-
compiler/typecheck/TcBinds.lhs | 34 +-
compiler/typecheck/TcCanonical.lhs | 10 +-
compiler/typecheck/TcClassDcl.lhs | 11 +-
compiler/typecheck/TcDeriv.lhs | 210 ++++-
compiler/typecheck/TcEnv.lhs | 20 +-
compiler/typecheck/TcErrors.lhs | 143 +--
compiler/typecheck/TcEvidence.lhs | 67 +-
compiler/typecheck/TcExpr.lhs | 12 +-
compiler/typecheck/TcForeign.lhs | 32 +-
compiler/typecheck/TcGenDeriv.lhs | 246 +++--
compiler/typecheck/TcGenGenerics.lhs | 35 +-
compiler/typecheck/TcHsSyn.lhs | 10 +-
compiler/typecheck/TcHsType.lhs | 16 +-
compiler/typecheck/TcInstDcls.lhs | 274 ++++--
compiler/typecheck/TcInteract.lhs | 47 +-
compiler/typecheck/TcMType.lhs | 1083 +-------------------
compiler/typecheck/TcMatches.lhs | 14 +-
compiler/typecheck/TcPat.lhs | 6 +-
compiler/typecheck/TcRnDriver.lhs | 23 +-
compiler/typecheck/TcRnTypes.lhs | 10 +-
compiler/typecheck/TcSMonad.lhs | 15 +-
compiler/typecheck/TcSimplify.lhs | 177 +---
compiler/typecheck/TcSplice.lhs | 66 +-
compiler/typecheck/TcTyClsDecls.lhs | 634 ++++++-------
compiler/typecheck/TcTyDecls.lhs | 2 +-
compiler/typecheck/TcType.lhs | 49 +-
compiler/typecheck/TcUnify.lhs | 79 +-
compiler/typecheck/TcValidity.lhs | 1093 +++++++++++++++++++++
compiler/types/Class.lhs | 2 +-
compiler/types/CoAxiom.lhs | 336 +++++++
compiler/types/Coercion.lhs | 141 ++--
compiler/types/FamInstEnv.lhs | 834 +++++++++++-----
compiler/types/FunDeps.lhs | 79 ++-
compiler/types/InstEnv.lhs | 136 ++--
compiler/types/Kind.lhs | 1 -
compiler/types/OptCoercion.lhs | 52 +-
compiler/types/TyCon.lhs | 149 +---
compiler/types/Type.lhs | 17 +-
compiler/types/TypeRep.lhs | 3 +-
compiler/types/Unify.lhs | 168 +++-
compiler/utils/Binary.hs | 36 +-
compiler/utils/BufWrite.hs | 31 +-
compiler/utils/FastString.lhs | 240 ++---
compiler/utils/ListSetOps.lhs | 18 +
compiler/utils/MonadUtils.hs | 32 +-
compiler/utils/Outputable.lhs | 6 +-
compiler/vectorise/Vectorise.hs | 3 +-
compiler/vectorise/Vectorise/Env.hs | 2 +-
compiler/vectorise/Vectorise/Generic/PADict.hs | 4 +-
compiler/vectorise/Vectorise/Generic/PAMethods.hs | 22 +-
compiler/vectorise/Vectorise/Generic/PData.hs | 23 +-
compiler/vectorise/Vectorise/Monad/InstEnv.hs | 4 +-
compiler/vectorise/Vectorise/Type/Env.hs | 15 +-
compiler/vectorise/Vectorise/Type/TyConDecl.hs | 4 +-
compiler/vectorise/Vectorise/Utils/Base.hs | 16 +-
compiler/vectorise/Vectorise/Utils/PADict.hs | 11 +-
docs/core-spec/CoreLint.ott | 36 +-
docs/core-spec/CoreSyn.ott | 37 +-
docs/core-spec/core-spec.mng | 21 +-
docs/core-spec/core-spec.pdf | Bin 303537 -> 308357 bytes
docs/users_guide/flags.xml | 25 +-
docs/users_guide/ghci.xml | 22 +-
docs/users_guide/glasgow_exts.xml | 431 ++++-----
docs/users_guide/packages.xml | 4 +-
docs/users_guide/sooner.xml | 11 +-
docs/users_guide/using.xml | 29 +-
ghc.mk | 26 +-
ghc/GhciMonad.hs | 22 +-
ghc/InteractiveUI.hs | 2 +-
ghc/Main.hs | 10 +-
includes/Stg.h | 7 +-
includes/rts/Threads.h | 3 +
includes/rts/storage/ClosureMacros.h | 4 +-
includes/stg/TailCalls.h | 185 ----
libraries/containers | 2 +-
libraries/time | 2 +-
libraries/vector | 2 +-
mk/config.mk.in | 4 +
mk/validate-settings.mk | 3 +
rts/Capability.h | 3 +-
rts/Disassembler.c | 4 +-
rts/Interpreter.c | 4 +-
rts/STM.c | 84 +-
rts/ghc.mk | 4 +
rules/build-package-way.mk | 2 -
rules/build-package.mk | 2 -
rules/build-prog.mk | 2 -
rules/hi-rule.mk | 46 +-
rules/hs-suffix-rules-srcdir.mk | 2 +
rules/hs-suffix-rules.mk | 6 +
sync-all | 20 +-
validate | 9 +-
188 files changed, 7986 insertions(+), 6204 deletions(-)
Diff suppressed because of size. To see it, use:
git show 0e5b68e534e04f2b7c21c5d41b6ab8408bc10839
More information about the ghc-commits
mailing list