[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (8bbdab1)
Simon Peyton Jones
simonpj at microsoft.com
Tue Jul 10 17:21:33 CEST 2012
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8bbdab1852beda96213ab18d228eb7a1002cedb6
>---------------------------------------------------------------
commit 8bbdab1852beda96213ab18d228eb7a1002cedb6
Merge: 3fe3ef5... 713cf47...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Tue Jul 10 16:04:30 2012 +0100
Merge branch 'master' of http://darcs.haskell.org/ghc
Conflicts:
compiler/typecheck/TcRnDriver.lhs
compiler/basicTypes/Id.lhs | 9 +-
compiler/basicTypes/IdInfo.lhs | 14 +-
compiler/basicTypes/MkId.lhs | 20 +-
compiler/basicTypes/MkId.lhs-boot | 3 +
compiler/basicTypes/SrcLoc.lhs | 6 +-
compiler/basicTypes/UniqSupply.lhs | 35 +-
compiler/cmm/BlockId.hs | 10 +-
compiler/cmm/Cmm.hs | 18 +-
compiler/cmm/CmmBuildInfoTables.hs | 278 +-----
compiler/cmm/CmmCallConv.hs | 27 +-
compiler/cmm/CmmCommonBlockElim.hs | 143 ++--
compiler/cmm/CmmContFlowOpt.hs | 295 +++---
compiler/cmm/CmmCvt.hs | 24 +-
compiler/cmm/CmmExpr.hs | 126 +--
compiler/cmm/CmmInfo.hs | 17 +-
compiler/cmm/CmmLayoutStack.hs | 1049 +++++++++++++++++++++
compiler/cmm/CmmLint.hs | 212 +++--
compiler/cmm/CmmLive.hs | 57 +-
compiler/cmm/CmmNode.hs | 107 +--
compiler/cmm/CmmOpt.hs | 119 ++--
compiler/cmm/CmmParse.y | 42 +-
compiler/cmm/CmmPipeline.hs | 189 ++--
compiler/cmm/CmmProcPoint.hs | 345 ++-----
compiler/cmm/CmmRewriteAssignments.hs | 33 +-
compiler/cmm/CmmSpillReload.hs | 166 ----
compiler/cmm/CmmStackLayout.hs | 591 ------------
compiler/cmm/CmmUtils.hs | 126 +--
compiler/cmm/Hoopl.hs | 125 +++
compiler/cmm/Hoopl/Dataflow.hs | 887 +++++++++++++++++
compiler/cmm/MkGraph.hs | 548 +++++------
compiler/cmm/OldCmm.hs | 33 +-
compiler/cmm/{CmmLint.hs => OldCmmLint.hs} | 4 +-
compiler/cmm/OldPprCmm.hs | 31 -
compiler/cmm/OptimizationFuel.hs | 142 ---
compiler/cmm/PprCmm.hs | 6 +-
compiler/cmm/PprCmmExpr.hs | 8 +-
compiler/cmm/SMRep.lhs | 6 +
compiler/cmm/cmm-notes | 369 --------
compiler/codeGen/CgInfoTbls.hs | 30 +-
compiler/codeGen/CgMonad.lhs | 17 +-
compiler/codeGen/CgStackery.lhs | 3 +-
compiler/codeGen/CgUtils.hs | 10 +-
compiler/codeGen/CodeGen.lhs | 58 +-
compiler/codeGen/StgCmm.hs | 135 ++--
compiler/codeGen/StgCmmBind.hs | 57 +-
compiler/codeGen/StgCmmClosure.hs | 29 +-
compiler/codeGen/StgCmmCon.hs | 1 +
compiler/codeGen/StgCmmEnv.hs | 3 +-
compiler/codeGen/StgCmmExpr.hs | 273 ++++--
compiler/codeGen/StgCmmForeign.hs | 134 +++-
compiler/codeGen/StgCmmHeap.hs | 94 ++-
compiler/codeGen/StgCmmLayout.hs | 247 ++++--
compiler/codeGen/StgCmmMonad.hs | 115 ++-
compiler/codeGen/StgCmmPrim.hs | 57 +-
compiler/codeGen/StgCmmProf.hs | 8 +-
compiler/codeGen/StgCmmTicky.hs | 4 +-
compiler/codeGen/StgCmmUtils.hs | 251 +++---
compiler/coreSyn/CoreFVs.lhs | 2 +-
compiler/coreSyn/CoreSubst.lhs | 5 +-
compiler/coreSyn/CoreSyn.lhs | 18 +-
compiler/coreSyn/CoreTidy.lhs | 4 +-
compiler/coreSyn/CoreUnfold.lhs | 2 +-
compiler/coreSyn/CoreUtils.lhs | 2 +-
compiler/coreSyn/MkCore.lhs | 23 +-
compiler/coreSyn/PprCore.lhs | 4 +
compiler/deSugar/Coverage.lhs | 1 -
compiler/ghc.cabal.in | 8 +-
compiler/ghc.mk | 14 +-
compiler/ghci/ByteCodeGen.lhs | 26 +-
compiler/ghci/Linker.lhs | 28 +-
compiler/hsSyn/HsBinds.lhs | 6 +-
compiler/iface/BinIface.hs | 13 +-
compiler/iface/IfaceSyn.lhs | 10 +-
compiler/iface/MkIface.lhs | 25 +-
compiler/iface/TcIface.lhs | 8 +-
compiler/llvmGen/LlvmCodeGen.hs | 21 +-
compiler/llvmGen/LlvmCodeGen/Base.hs | 11 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 18 +-
compiler/main/CodeOutput.lhs | 57 +-
compiler/main/DynFlags.hs | 91 ++-
compiler/main/ErrUtils.lhs | 11 +-
compiler/main/HscMain.hs | 75 ++-
compiler/main/HscTypes.lhs | 20 +-
compiler/main/Packages.lhs | 4 +-
compiler/main/StaticFlagParser.hs | 25 +-
compiler/main/StaticFlags.hs | 1 +
compiler/main/SysTools.lhs | 6 +-
compiler/main/TidyPgm.lhs | 3 +-
compiler/nativeGen/AsmCodeGen.lhs | 56 +-
compiler/nativeGen/RegAlloc/Linear/Main.hs | 29 +-
compiler/nativeGen/X86/CodeGen.hs | 26 +-
compiler/nativeGen/X86/Instr.hs | 14 +-
compiler/nativeGen/X86/Ppr.hs | 6 +-
compiler/nativeGen/X86/Regs.hs | 95 +-
compiler/parser/Lexer.x | 2 +-
compiler/prelude/PrelRules.lhs | 39 +-
compiler/prelude/PrimOp.lhs-boot | 7 +
compiler/rename/RnEnv.lhs | 3 +-
compiler/simplCore/CoreMonad.lhs | 10 +-
compiler/simplCore/Simplify.lhs | 2 +-
compiler/simplStg/SRT.lhs | 4 +-
compiler/simplStg/SimplStg.lhs | 5 +-
compiler/specialise/Rules.lhs | 5 +-
compiler/stgSyn/StgLint.lhs | 1 +
compiler/typecheck/TcDeriv.lhs | 3 +-
compiler/typecheck/TcErrors.lhs | 3 +
compiler/typecheck/TcInstDcls.lhs | 147 ++-
compiler/typecheck/TcRnDriver.lhs | 10 +-
compiler/typecheck/TcRnMonad.lhs | 3 +
compiler/typecheck/TcSplice.lhs | 3 +-
compiler/types/InstEnv.lhs | 11 +-
compiler/utils/Digraph.lhs | 8 +-
compiler/utils/ListSetOps.lhs | 73 +--
compiler/utils/MonadUtils.hs | 18 -
compiler/utils/OrdList.lhs | 47 +-
compiler/utils/Stream.hs | 97 ++
compiler/utils/Util.lhs | 183 ++---
compiler/vectorise/Vectorise/Generic/PADict.hs | 39 +-
compiler/vectorise/Vectorise/Generic/PAMethods.hs | 11 +-
compiler/vectorise/Vectorise/Monad/InstEnv.hs | 9 +-
compiler/vectorise/Vectorise/Utils/Base.hs | 19 +-
compiler/vectorise/Vectorise/Utils/PADict.hs | 51 +-
configure.ac | 12 +
docs/users_guide/flags.xml | 7 +
docs/users_guide/ghci.xml | 55 ++
docs/users_guide/glasgow_exts.xml | 39 +-
ghc.mk | 12 +
ghc/GhciTags.hs | 13 +-
ghc/InteractiveUI.hs | 50 +-
mk/config.mk.in | 1 +
rts/RtsFlags.c | 12 +-
rts/Schedule.c | 2 +-
rts/sm/GC.c | 14 +-
rts/sm/GCThread.h | 1 +
rts/sm/Storage.c | 23 +-
rts/sm/Storage.h | 2 +-
rules/build-package-data.mk | 4 +-
rules/build-package-way.mk | 3 +
rules/build-package.mk | 2 +-
utils/ghc-pkg/Main.hs | 10 +-
140 files changed, 5408 insertions(+), 4181 deletions(-)
diff --cc compiler/typecheck/TcRnDriver.lhs
index 778a4b2,fa87eb1..e3ec10a
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@@ -1887,12 -1888,9 +1888,11 @@@ ppr_sigs id
ppr_tydecls :: [TyCon] -> SDoc
ppr_tydecls tycons
-- Print type constructor info; sort by OccName
- = vcat (map ppr_tycon (sortLe le_sig tycons))
+ = vcat (map ppr_tycon (sortBy (comparing getOccName) tycons))
where
- le_sig tycon1 tycon2 = getOccName tycon1 <= getOccName tycon2
- ppr_tycon tycon = ppr (tyThingToIfaceDecl (ATyCon tycon))
+ ppr_tycon tycon = vcat [ ppr (tyConName tycon) <+> dcolon <+> ppr (tyConKind tycon)
+ -- Temporarily print the kind signature too
+ , ppr (tyThingToIfaceDecl (ATyCon tycon)) ]
ppr_rules :: [CoreRule] -> SDoc
ppr_rules [] = empty
More information about the Cvs-ghc
mailing list