Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/0ff5f40bb12d5b9a30008e942ede8f2aac792936 >--------------------------------------------------------------- commit 0ff5f40bb12d5b9a30008e942ede8f2aac792936 Merge: 87d2a63... fe1fce8... Author: Iavor S. Diatchki <iavor.diatc...@gmail.com> Date: Sat Dec 1 13:20:24 2012 -0800 Merge remote-tracking branch 'origin/master' into type-nats Conflicts: compiler/types/Type.lhs .gitignore | 12 - .gitmodules | 36 + aclocal.m4 | 174 +---- compiler/basicTypes/MkId.lhs | 2 +- compiler/cmm/Cmm.hs | 39 +- compiler/cmm/CmmCallConv.hs | 6 +- compiler/cmm/CmmContFlowOpt.hs | 45 +- compiler/cmm/CmmCvt.hs | 117 --- compiler/cmm/CmmInfo.hs | 35 +- compiler/cmm/CmmNode.hs | 14 +- compiler/cmm/CmmOpt.hs | 8 +- compiler/cmm/CmmParse.y | 2 +- compiler/cmm/CmmPipeline.hs | 12 + compiler/cmm/CmmProcPoint.hs | 5 +- compiler/cmm/CmmUtils.hs | 14 +- compiler/cmm/MkGraph.hs | 32 +- compiler/cmm/OldCmm.hs | 279 ------- compiler/cmm/OldCmmLint.hs | 212 ----- compiler/cmm/OldCmmUtils.hs | 100 --- compiler/cmm/OldPprCmm.hs | 224 ----- compiler/cmm/PprC.hs | 137 ++-- compiler/cmm/PprCmmExpr.hs | 1 - compiler/cmm/SMRep.lhs | 11 +- compiler/codeGen/CgUtils.hs | 87 +-- compiler/codeGen/StgCmm.hs | 13 +- compiler/codeGen/StgCmmBind.hs | 61 +- compiler/codeGen/StgCmmClosure.hs | 8 + compiler/codeGen/StgCmmExpr.hs | 4 +- compiler/codeGen/StgCmmHeap.hs | 18 +- compiler/codeGen/StgCmmLayout.hs | 2 +- compiler/coreSyn/CoreLint.lhs | 55 ++- compiler/coreSyn/CoreSyn.lhs | 22 +- compiler/ghc.cabal.in | 7 +- compiler/ghc.mk | 16 + compiler/ghci/ByteCodeGen.lhs | 2 +- compiler/ghci/ByteCodeLink.lhs | 2 +- compiler/ghci/LibFFI.hsc | 34 +- compiler/ghci/Linker.lhs | 26 +- compiler/iface/BinIface.hs | 2 +- compiler/iface/IfaceSyn.lhs | 2 +- compiler/iface/IfaceType.lhs | 2 +- compiler/iface/LoadIface.lhs | 8 +- compiler/iface/MkIface.lhs | 15 +- compiler/llvmGen/LlvmCodeGen.hs | 17 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 2 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 201 +++--- compiler/llvmGen/LlvmCodeGen/Data.hs | 2 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 2 +- compiler/main/CodeOutput.lhs | 4 +- compiler/main/DriverMkDepend.hs | 4 +- compiler/main/DriverPipeline.hs | 10 +- compiler/main/DynFlags.hs | 12 +- compiler/main/ErrUtils.lhs | 5 +- compiler/main/GHC.hs | 6 +- compiler/main/GhcMake.hs | 19 +- compiler/main/HscMain.hs | 16 +- compiler/main/InteractiveEval.hs | 20 +- compiler/main/Packages.lhs | 12 +- compiler/main/StaticFlagParser.hs | 6 +- compiler/main/StaticFlags.hs | 2 +- compiler/main/SysTools.lhs | 8 +- compiler/nativeGen/AsmCodeGen.lhs | 73 +- compiler/nativeGen/Instruction.hs | 13 +- compiler/nativeGen/PIC.hs | 2 +- compiler/nativeGen/PPC/CodeGen.hs | 72 +- compiler/nativeGen/PPC/Instr.hs | 2 +- compiler/nativeGen/PPC/Ppr.hs | 2 +- compiler/nativeGen/PPC/RegInfo.hs | 2 +- compiler/nativeGen/PPC/Regs.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/ArchBase.hs | 196 ++--- compiler/nativeGen/RegAlloc/Graph/ArchX86.hs | 188 ++--- compiler/nativeGen/RegAlloc/Graph/Coalesce.hs | 110 ++-- compiler/nativeGen/RegAlloc/Graph/Main.hs | 236 +++--- compiler/nativeGen/RegAlloc/Graph/Spill.hs | 191 +++-- compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 802 +++++++++--------- compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 363 ++++---- compiler/nativeGen/RegAlloc/Graph/Stats.hs | 128 ++- compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 12 + compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 22 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 1 - compiler/nativeGen/RegAlloc/Linear/Main.hs | 18 +- compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 15 +- .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 233 +++--- compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 37 +- compiler/nativeGen/RegAlloc/Linear/Stats.hs | 111 ++-- compiler/nativeGen/RegAlloc/Liveness.hs | 13 +- compiler/nativeGen/SPARC/CodeGen.hs | 73 +- compiler/nativeGen/SPARC/CodeGen/Amode.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Base.hs | 3 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Expand.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Sanity.hs | 4 +- compiler/nativeGen/SPARC/Imm.hs | 2 +- compiler/nativeGen/SPARC/Instr.hs | 2 +- compiler/nativeGen/SPARC/Ppr.hs | 4 +- compiler/nativeGen/SPARC/ShortcutJump.hs | 2 +- compiler/nativeGen/Size.hs | 2 +- compiler/nativeGen/TargetReg.hs | 15 + compiler/nativeGen/X86/CodeGen.hs | 220 +++--- compiler/nativeGen/X86/Instr.hs | 2 +- compiler/nativeGen/X86/Ppr.hs | 2 +- compiler/nativeGen/X86/Regs.hs | 2 +- compiler/parser/Parser.y.pp | 1 + compiler/prelude/PrimOp.lhs | 15 +- compiler/prelude/TysPrim.lhs | 2 + compiler/prelude/primops.txt.pp | 64 +- compiler/rename/RnNames.lhs | 6 +- compiler/rename/RnTypes.lhs | 15 + compiler/typecheck/TcForeign.lhs | 164 ++-- compiler/typecheck/TcHsType.lhs | 35 +- compiler/typecheck/TcInstDcls.lhs | 8 +- compiler/typecheck/TcRnDriver.lhs | 29 +- compiler/typecheck/TcRnTypes.lhs | 45 +- compiler/types/Coercion.lhs | 4 + compiler/types/Kind.lhs | 66 +- compiler/types/TyCon.lhs | 70 ++- compiler/types/Type.lhs | 27 +- compiler/types/TypeRep.lhs | 3 + compiler/utils/Outputable.lhs | 8 +- compiler/utils/Panic.lhs | 6 +- compiler/utils/Platform.hs | 3 + configure.ac | 91 ++- distrib/configure.ac.in | 1 - docs/core-spec/.gitignore | 5 + docs/core-spec/CoreLint.ott | 400 +++++++++ docs/core-spec/CoreSyn.ott | 283 +++++++ docs/core-spec/Makefile | 17 + docs/core-spec/README | 83 ++ docs/core-spec/core-spec.mng | 306 +++++++ docs/core-spec/core-spec.pdf | Bin 0 -> 303537 bytes docs/users_guide/flags.xml | 6 + docs/users_guide/glasgow_exts.xml | 174 ++++- docs/users_guide/profiling.xml | 18 +- ghc.mk | 7 +- ghc/GhciTags.hs | 8 +- ghc/InteractiveUI.hs | 68 +- ghc/Main.hs | 18 +- ghc/ghc-bin.cabal.in | 2 +- includes/ghc.mk | 83 +-- includes/mkDerivedConstants.c | 829 ------------------- includes/mkDerivedConstants.cross.awk | 350 -------- includes/mkSizeMacros.cross.awk | 82 -- includes/rts/storage/Block.h | 2 +- includes/rts/storage/ClosureTypes.h | 37 +- includes/stg/MiscClosures.h | 3 +- libraries/Cabal | 1 + libraries/Win32 | 1 + libraries/binary | 1 + libraries/bytestring | 1 + libraries/containers | 1 + libraries/haskeline | 1 + libraries/pretty | 1 + libraries/primitive | 1 + libraries/terminfo | 1 + libraries/transformers | 1 + libraries/vector | 1 + libraries/xhtml | 1 + mk/config.mk.in | 37 +- mk/validate-settings.mk | 15 +- rts/ClosureFlags.c | 5 +- rts/Exception.cmm | 2 +- rts/LdvProfile.c | 1 + rts/Linker.c | 7 +- rts/PrimOps.cmm | 8 +- rts/Printer.c | 14 + rts/ProfHeap.c | 3 +- rts/RetainerProfile.c | 5 +- rts/STM.c | 63 +- rts/STM.h | 2 +- rts/Schedule.c | 2 +- rts/StgMiscClosures.cmm | 7 +- rts/StgStartup.cmm | 9 +- rts/Updates.cmm | 18 +- rts/ghc.mk | 53 ++- rts/package.conf.in | 3 + rts/sm/Compact.c | 1 + rts/sm/Evac.c | 12 +- rts/sm/GC.c | 22 +- rts/sm/GC.h | 8 +- rts/sm/Sanity.c | 14 +- rts/sm/Scav.c | 73 ++- rts/sm/Storage.c | 9 + rts/sm/Storage.h | 3 +- rules/build-package-way.mk | 11 - sync-all | 84 ++- utils/deriveConstants/DeriveConstants.hs | 866 ++++++++++++++++++++ {driver/split => utils/deriveConstants}/Makefile | 4 +- {driver/split => utils/deriveConstants}/ghc.mk | 12 +- utils/genprimopcode/Lexer.x | 5 + utils/genprimopcode/Main.hs | 29 +- utils/genprimopcode/Parser.y | 13 + utils/genprimopcode/ParserM.hs | 5 + utils/genprimopcode/Syntax.hs | 9 + utils/ghc-pkg/Main.hs | 11 +- utils/ghc-pkg/ghc-pkg.cabal | 2 +- utils/hpc/HpcCombine.hs | 116 ++-- utils/hpc/HpcDraft.hs | 31 +- utils/hpc/HpcFlags.hs | 140 ++-- utils/hpc/HpcLexer.hs | 6 +- utils/hpc/HpcMarkup.hs | 1 + utils/hpc/HpcOverlay.hs | 41 +- utils/hpc/HpcReport.hs | 41 +- utils/hpc/HpcShowTix.hs | 23 +- utils/hpc/Main.hs | 114 ++-- utils/hpc/hpc-bin.cabal | 1 + utils/runghc/runghc.cabal.in | 2 +- 209 files changed, 5745 insertions(+), 5114 deletions(-) diff --cc compiler/types/Type.lhs index bf5167a,cb2fce3..d1538d5 --- a/compiler/types/Type.lhs +++ b/compiler/types/Type.lhs @@@ -160,17 -153,10 +160,11 @@@ import Clas import TyCon import TysPrim import {-# SOURCE #-} TysWiredIn ( eqTyCon, mkBoxedTupleTy ) - import PrelNames( eqTyConKey, ipClassNameKey - , typeNatAddTyFamName - , typeNatMulTyFamName - , typeNatExpTyFamName - , typeNatLeqTyFamName - ) - - + import PrelNames ( eqTyConKey, ipClassNameKey, + constraintKindTyConKey, liftedTypeKindTyConKey ) -- others +import Name ( Name ) import Unique ( Unique, hasKey ) import BasicTypes ( Arity, RepArity ) import NameSet _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
