Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-holes-branch
http://hackage.haskell.org/trac/ghc/changeset/19ea563a039d384cd02b262c7437d0a27e8dda3c >--------------------------------------------------------------- commit 19ea563a039d384cd02b262c7437d0a27e8dda3c Merge: d340cd4... 1eee274... Author: Thijs Alkemade <[email protected]> Date: Wed Feb 29 11:35:25 2012 +0100 Merge https://github.com/ghc/ghc README | 11 +- aclocal.m4 | 41 +- compiler/basicTypes/DataCon.lhs | 102 ++- compiler/basicTypes/MkId.lhs | 37 +- compiler/basicTypes/Var.lhs | 37 +- compiler/cmm/CmmBuildInfoTables.hs | 6 +- compiler/cmm/CmmCvt.hs | 2 +- compiler/cmm/CmmExpr.hs | 4 + compiler/cmm/CmmLint.hs | 12 +- compiler/cmm/CmmMachOp.hs | 6 + compiler/cmm/CmmOpt.hs | 5 +- compiler/cmm/CmmParse.y | 6 +- compiler/cmm/CmmPipeline.hs | 4 +- compiler/cmm/CmmStackLayout.hs | 6 +- compiler/cmm/CmmType.hs | 6 + compiler/cmm/OldCmm.hs | 9 +- compiler/cmm/OldCmmUtils.hs | 1 + compiler/cmm/OldPprCmm.hs | 2 +- compiler/cmm/PprC.hs | 23 +- compiler/codeGen/CgClosure.lhs | 2 +- compiler/codeGen/CgForeignCall.hs | 4 +- compiler/codeGen/CgPrimOp.hs | 117 ++- compiler/codeGen/CgUtils.hs | 3 +- compiler/codeGen/StgCmmForeign.hs | 4 +- compiler/coreSyn/CoreFVs.lhs | 16 +- compiler/coreSyn/CoreLint.lhs | 529 +++---- compiler/coreSyn/MkCore.lhs | 20 +- compiler/coreSyn/MkExternalCore.lhs | 4 +- compiler/deSugar/Desugar.lhs | 4 +- compiler/deSugar/DsBinds.lhs | 2 +- compiler/deSugar/DsCCall.lhs | 2 +- compiler/deSugar/DsExpr.lhs-boot | 15 +- compiler/deSugar/DsForeign.lhs | 81 +- compiler/deSugar/DsMeta.hs | 30 +- compiler/deSugar/Match.lhs-boot | 51 +- compiler/ghc.cabal.in | 11 +- compiler/ghc.mk | 19 +- compiler/ghci/ByteCodeGen.lhs | 4 +- compiler/ghci/ByteCodeItbls.lhs | 7 + compiler/hsSyn/Convert.lhs | 28 +- compiler/hsSyn/HsDecls.lhs | 77 +- compiler/hsSyn/HsExpr.lhs | 11 +- compiler/hsSyn/HsExpr.lhs-boot | 19 +- compiler/hsSyn/HsPat.lhs | 7 +- compiler/hsSyn/HsTypes.lhs | 6 +- compiler/hsSyn/HsUtils.lhs | 24 +- compiler/iface/BinIface.hs | 99 +-- compiler/iface/BuildTyCl.lhs | 14 +- compiler/iface/FlagChecker.hs | 8 +- compiler/iface/IfaceSyn.lhs | 14 +- compiler/iface/IfaceType.lhs | 117 +-- compiler/iface/MkIface.lhs | 25 +- compiler/iface/TcIface.lhs | 43 +- compiler/llvmGen/Llvm.hs | 3 + compiler/llvmGen/Llvm/AbsSyn.hs | 25 +- compiler/llvmGen/Llvm/PpLlvm.hs | 14 + compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 60 +- compiler/main/CodeOutput.lhs | 3 +- compiler/main/DriverPipeline.hs | 63 +- compiler/main/DynFlags.hs | 36 +- compiler/main/ErrUtils.lhs | 8 +- compiler/main/GHC.hs | 9 +- compiler/main/HscMain.hs | 72 +- compiler/main/HscStats.lhs | 13 +- compiler/main/HscTypes.lhs | 10 +- compiler/main/InteractiveEval.hs | 27 +- compiler/main/Packages.lhs | 2 +- compiler/main/SysTools.lhs | 3 +- compiler/nativeGen/AsmCodeGen.lhs | 565 ++++---- compiler/nativeGen/PPC/CodeGen.hs | 23 +- compiler/nativeGen/SPARC/CodeGen.hs | 478 ++++++- compiler/nativeGen/SPARC/CodeGen/CCall.hs | 343 ----- compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot | 11 +- compiler/nativeGen/X86/CodeGen.hs | 326 +++-- compiler/nativeGen/X86/Instr.hs | 3 + compiler/nativeGen/X86/Ppr.hs | 1 + compiler/parser/Lexer.x | 4 +- compiler/parser/Parser.y.pp | 69 +- compiler/parser/ParserCore.y | 2 +- compiler/parser/RdrHsSyn.lhs | 44 +- compiler/prelude/ForeignCall.lhs | 56 +- compiler/prelude/PrelNames.lhs | 23 +- compiler/prelude/TysPrim.lhs | 64 +- compiler/prelude/TysWiredIn.lhs | 54 +- compiler/prelude/primops.txt.pp | 17 + compiler/rename/RnEnv.lhs | 17 +- compiler/rename/RnExpr.lhs-boot | 19 +- compiler/rename/RnNames.lhs | 34 +- compiler/rename/RnSource.lhs | 39 +- compiler/rename/RnTypes.lhs | 4 +- compiler/simplCore/SetLevels.lhs | 38 +- compiler/simplCore/SimplUtils.lhs | 1 + compiler/simplCore/Simplify.lhs | 17 + compiler/specialise/Specialise.lhs | 21 +- compiler/stgSyn/CoreToStg.lhs | 2 +- compiler/typecheck/FamInst.lhs | 59 +- compiler/typecheck/TcBinds.lhs | 6 +- compiler/typecheck/TcCanonical.lhs | 438 ++++--- compiler/typecheck/TcDeriv.lhs | 2 +- compiler/typecheck/TcEnv.lhs | 41 +- compiler/typecheck/TcErrors.lhs | 13 +- compiler/typecheck/TcEvidence.lhs | 5 +- compiler/typecheck/TcExpr.lhs | 59 +- compiler/typecheck/TcExpr.lhs-boot | 25 +- compiler/typecheck/TcForeign.lhs | 26 +- compiler/typecheck/TcGenDeriv.lhs | 4 +- compiler/typecheck/TcGenGenerics.lhs | 2 +- compiler/typecheck/TcHsSyn.lhs | 10 +- compiler/typecheck/TcHsType.lhs | 121 +- compiler/typecheck/TcInstDcls.lhs | 40 +- compiler/typecheck/TcInteract.lhs | 3 +- compiler/typecheck/TcMType.lhs | 76 +- compiler/typecheck/TcMatches.lhs-boot | 23 +- compiler/typecheck/TcPat.lhs | 14 +- compiler/typecheck/TcRnDriver.lhs | 1280 +++++++++--------- compiler/typecheck/TcRnMonad.lhs | 22 +- compiler/typecheck/TcRnTypes.lhs | 9 +- compiler/typecheck/TcSMonad.lhs | 15 +- compiler/typecheck/TcSimplify.lhs | 6 +- compiler/typecheck/TcSplice.lhs | 8 +- compiler/typecheck/TcSplice.lhs-boot | 27 +- compiler/typecheck/TcTyClsDecls.lhs | 41 +- compiler/typecheck/TcType.lhs | 10 +- compiler/typecheck/TcUnify.lhs | 130 +-- compiler/typecheck/TcUnify.lhs-boot | 7 - compiler/types/FamInstEnv.lhs | 56 +- compiler/types/Kind.lhs | 277 ++--- compiler/types/TyCon.lhs | 676 +++++----- compiler/types/TyCon.lhs-boot | 15 +- compiler/types/Type.lhs | 31 +- compiler/types/TypeRep.lhs | 62 +- compiler/utils/GraphColor.hs | 575 ++++---- compiler/utils/GraphOps.hs | 839 ++++++------ compiler/utils/Outputable.lhs | 29 +- compiler/utils/Platform.hs | 20 +- compiler/utils/UniqFM.lhs | 4 +- compiler/utils/Util.lhs | 16 +- compiler/vectorise/Vectorise/Generic/PData.hs | 1 + compiler/vectorise/Vectorise/Type/TyConDecl.hs | 1 + configure.ac | 98 ++- distrib/configure.ac.in | 16 +- distrib/mkDocs/mkDocs | 2 +- distrib/remilestoning.pl | 118 ++ docs/comm/rts-libs/threaded-rts.html | 2 +- docs/ext-core/Makefile | 3 - docs/ext-core/a4wide.sty | 39 - docs/ext-core/code.sty | 83 -- docs/ext-core/core.bib | 124 -- docs/ext-core/core.tex | 779 ---------- docs/ext-core/ghc.mk | 15 - docs/users_guide/7.6.1-notes.xml | 427 ++++++ docs/users_guide/external_core.xml | 1807 ++++++++++++++++++++++++ docs/users_guide/ffi-chap.xml | 52 + docs/users_guide/flags.xml | 13 +- docs/users_guide/intro.xml | 2 +- docs/users_guide/phases.xml | 25 +- docs/users_guide/safe_haskell.xml | 2 +- docs/users_guide/ug-book.xml.in | 1 + docs/users_guide/ug-ent.xml.in | 4 +- docs/users_guide/using.xml | 46 +- ghc.mk | 54 +- ghc/GhciMonad.hs | 20 +- ghc/InteractiveUI.hs | 230 ++-- ghc/Main.hs | 13 +- ghc/ghc-bin.cabal.in | 6 +- ghc/ghc.mk | 10 +- includes/ghc.mk | 22 +- includes/rts/Flags.h | 12 +- includes/rts/storage/InfoTables.h | 20 +- includes/stg/MiscClosures.h | 1 + libffi/ghc.mk | 2 +- mk/compiler-ghc.mk | 1 - mk/config.mk.in | 49 +- mk/tree.mk | 2 +- mk/validate-settings.mk | 3 - packages | 1 - rts/Capability.c | 11 +- rts/Capability.h | 11 +- rts/HeapStackCheck.cmm | 2 +- rts/PosixSource.h | 2 +- rts/PrimOps.cmm | 10 + rts/RaiseAsync.c | 63 +- rts/RtsFlags.c | 4 +- rts/RtsStartup.c | 2 +- rts/RtsUtils.c | 2 +- rts/Schedule.c | 2 +- rts/StgCRun.c | 16 +- rts/StgStartup.cmm | 12 +- rts/posix/Itimer.c | 2 +- rts/sm/GC.c | 42 + rts/sm/Sanity.c | 1 + rts/sm/Storage.c | 177 ++- rules/build-package-data.mk | 4 +- rules/build-package-way.mk | 2 +- rules/build-package.mk | 2 +- rules/cmm-suffix-rules.mk | 8 +- rules/haddock.mk | 2 +- rules/shell-wrapper.mk | 2 +- sync-all | 31 + utils/ghc-cabal/ghc-cabal.cabal | 2 +- utils/ghc-pkg/ghc.mk | 34 +- utils/ghctags/Main.hs | 6 +- validate | 20 +- 203 files changed, 8095 insertions(+), 5965 deletions(-) Diff suppressed because of size. To see it, use: git show 19ea563a039d384cd02b262c7437d0a27e8dda3c _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
