[commit: ghc] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (463a77c)
Ian Lynagh
igloo at earth.li
Thu Feb 28 15:20:12 CET 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/463a77c0b803853d89eff6e0e69604404efc5485
>---------------------------------------------------------------
commit 463a77c0b803853d89eff6e0e69604404efc5485
Merge: fa73267 20b98f3
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date: Mon Feb 25 23:41:07 2013 -0800
Merge remote-tracking branch 'origin/master' into type-nats
This merge brings the branch up to date in the sense that things build.
However, either during this merge or one of the previous ones something
went wrong so, currently, a number of programs that ought to work are
being rejected.
Conflicts:
compiler/prelude/PrelNames.lhs
compiler/prelude/TysWiredIn.lhs
compiler/typecheck/TcType.lhs
compiler/types/Type.lhs
.gitignore | 1 -
.gitmodules | 3 +
README | 104 --
README.md | 100 ++
aclocal.m4 | 276 +++--
compiler/basicTypes/BasicTypes.lhs | 17 +
compiler/basicTypes/DataCon.lhs | 157 +--
compiler/basicTypes/Demand.lhs | 1189 +++++++++++++++----
compiler/basicTypes/Id.lhs | 55 +-
compiler/basicTypes/IdInfo.lhs | 56 +-
compiler/basicTypes/MkId.lhs | 100 +-
compiler/basicTypes/Name.lhs | 24 +-
compiler/basicTypes/RdrName.lhs | 6 +-
compiler/basicTypes/SrcLoc.lhs | 4 +-
compiler/basicTypes/Var.lhs | 2 +-
compiler/cmm/CLabel.hs | 1 -
compiler/cmm/CmmCallConv.hs | 9 +-
compiler/cmm/CmmCommonBlockElim.hs | 1 +
compiler/cmm/CmmExpr.hs | 17 +
compiler/cmm/CmmInfo.hs | 155 ++-
compiler/cmm/CmmLayoutStack.hs | 2 +-
compiler/cmm/CmmLex.x | 3 +
compiler/cmm/CmmMachOp.hs | 69 ++
compiler/cmm/CmmParse.y | 3 +
compiler/cmm/CmmType.hs | 86 +-
compiler/cmm/CmmUtils.hs | 65 +-
compiler/cmm/PprC.hs | 75 +-
compiler/cmm/PprCmmExpr.hs | 2 +
compiler/codeGen/CgUtils.hs | 7 +
compiler/codeGen/StgCmmBind.hs | 1 +
compiler/codeGen/StgCmmCon.hs | 2 +-
compiler/codeGen/StgCmmExpr.hs | 1 +
compiler/codeGen/StgCmmLayout.hs | 186 +--
compiler/codeGen/StgCmmPrim.hs | 642 +++++++---
compiler/codeGen/StgCmmTicky.hs | 2 +-
compiler/coreSyn/CoreArity.lhs | 10 +-
compiler/coreSyn/CoreFVs.lhs | 11 +-
compiler/coreSyn/CoreLint.lhs | 62 +-
compiler/coreSyn/CorePrep.lhs | 24 +-
compiler/coreSyn/CoreSubst.lhs | 17 +-
compiler/coreSyn/CoreSyn.lhs | 16 +-
compiler/coreSyn/CoreTidy.lhs | 7 +-
compiler/coreSyn/CoreUtils.lhs | 32 +-
compiler/coreSyn/MkCore.lhs | 9 +-
compiler/coreSyn/PprCore.lhs | 46 +-
compiler/coreSyn/PprExternalCore.lhs | 5 -
compiler/coreSyn/TrieMap.lhs | 38 +-
compiler/deSugar/Check.lhs | 20 +-
compiler/deSugar/Coverage.lhs | 18 +-
compiler/deSugar/Desugar.lhs | 4 +-
compiler/deSugar/DsArrows.lhs | 2 +-
compiler/deSugar/DsBinds.lhs | 4 +-
compiler/deSugar/DsCCall.lhs | 45 +-
compiler/deSugar/DsExpr.lhs | 46 +-
compiler/deSugar/DsForeign.lhs | 2 +-
compiler/deSugar/DsListComp.lhs | 2 +-
compiler/deSugar/DsMeta.hs | 23 +-
compiler/deSugar/DsUtils.lhs | 2 +-
compiler/deSugar/Match.lhs | 73 +-
compiler/deSugar/MatchLit.lhs | 2 +-
compiler/ghc.cabal.in | 2 +-
compiler/ghc.mk | 118 +-
compiler/ghci/ByteCodeAsm.lhs | 26 +-
compiler/ghci/ByteCodeItbls.lhs | 2 +-
compiler/ghci/ByteCodeLink.lhs | 2 +-
compiler/ghci/Debugger.hs | 5 +-
compiler/ghci/DebuggerUtils.hs | 2 +-
compiler/ghci/LibFFI.hsc | 4 +-
compiler/ghci/Linker.lhs | 26 +-
compiler/hsSyn/Convert.lhs | 18 +-
compiler/hsSyn/HsDecls.lhs | 30 +-
compiler/hsSyn/HsExpr.lhs | 23 +-
compiler/hsSyn/HsExpr.lhs-boot | 19 +-
compiler/hsSyn/HsPat.lhs | 12 +-
compiler/hsSyn/HsPat.lhs-boot | 8 +-
compiler/hsSyn/HsTypes.lhs | 9 +-
compiler/hsSyn/HsUtils.lhs | 6 +-
compiler/iface/BinIface.hs | 115 +-
compiler/iface/BuildTyCl.lhs | 16 -
compiler/iface/IfaceSyn.lhs | 67 +-
compiler/iface/LoadIface.lhs | 16 +-
compiler/iface/MkIface.lhs | 51 +-
compiler/iface/TcIface.lhs | 98 +-
compiler/llvmGen/Llvm.hs | 2 +-
compiler/llvmGen/Llvm/AbsSyn.hs | 15 +
compiler/llvmGen/Llvm/PpLlvm.hs | 39 +-
compiler/llvmGen/Llvm/Types.hs | 105 +-
compiler/llvmGen/LlvmCodeGen.hs | 7 +-
compiler/llvmGen/LlvmCodeGen/Base.hs | 16 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 324 ++++-
compiler/llvmGen/LlvmCodeGen/Data.hs | 8 +
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 3 +
compiler/llvmGen/LlvmCodeGen/Regs.hs | 7 +
compiler/main/CmdLineParser.hs | 10 +
compiler/main/CodeOutput.lhs | 14 +-
compiler/main/DriverMkDepend.hs | 6 +-
compiler/main/DriverPipeline.hs | 82 +-
compiler/main/DynFlags.hs | 122 +-
compiler/main/DynFlags.hs-boot | 9 +-
compiler/main/DynamicLoading.hs | 4 +-
compiler/main/ErrUtils.lhs | 3 +-
compiler/main/GHC.hs | 22 +-
compiler/main/GhcMake.hs | 2 +-
compiler/main/GhcMonad.hs | 10 +-
compiler/main/HscMain.hs | 2 +
compiler/main/HscStats.lhs | 187 ---
compiler/main/HscTypes.lhs | 56 +-
compiler/main/InteractiveEval.hs | 31 +-
compiler/main/Packages.lhs | 13 +-
compiler/main/PlatformConstants.hs | 12 +
compiler/main/PprTyThing.hs | 12 +-
compiler/main/StaticFlagParser.hs | 151 ---
compiler/main/StaticFlags.hs | 241 ++--
compiler/main/StaticFlags.hs-boot | 4 +
compiler/main/SysTools.lhs | 26 +-
compiler/main/TidyPgm.lhs | 86 +-
compiler/nativeGen/AsmCodeGen.lhs | 47 +-
compiler/nativeGen/PPC/CodeGen.hs | 1 +
compiler/nativeGen/PPC/Instr.hs | 164 ++-
compiler/nativeGen/SPARC/CodeGen.hs | 1 +
compiler/nativeGen/X86/CodeGen.hs | 85 +-
compiler/nativeGen/X86/Instr.hs | 6 +-
compiler/parser/Lexer.x | 2 +-
compiler/parser/Parser.y.pp | 55 +-
compiler/parser/RdrHsSyn.lhs | 117 +-
compiler/prelude/PrelNames.lhs | 110 +-
compiler/prelude/PrelNames.lhs-boot | 3 +-
compiler/prelude/PrelRules.lhs | 11 +-
compiler/prelude/TysPrim.lhs | 51 +-
compiler/prelude/TysWiredIn.lhs | 52 +-
compiler/prelude/TysWiredIn.lhs-boot | 2 +-
compiler/prelude/primops.txt.pp | 515 +++++++-
compiler/rename/RnEnv.lhs | 22 +-
compiler/rename/RnExpr.lhs | 51 +-
compiler/rename/RnNames.lhs | 4 +-
compiler/rename/RnPat.lhs | 21 +-
compiler/rename/RnSource.lhs | 26 +-
compiler/rename/RnTypes.lhs | 3 +-
compiler/simplCore/CSE.lhs | 15 +-
compiler/simplCore/FloatOut.lhs | 8 +-
compiler/simplCore/LiberateCase.lhs | 2 +-
compiler/simplCore/OccurAnal.lhs | 16 +-
compiler/simplCore/SetLevels.lhs | 30 +-
compiler/simplCore/SimplCore.lhs | 57 +-
compiler/simplCore/SimplEnv.lhs | 16 +-
compiler/simplCore/SimplUtils.lhs | 6 +-
compiler/simplCore/Simplify.lhs | 48 +-
compiler/specialise/SpecConstr.lhs | 166 +--
compiler/specialise/Specialise.lhs | 398 ++++---
compiler/stgSyn/StgLint.lhs | 2 +-
compiler/stgSyn/StgSyn.lhs | 4 +-
compiler/stranal/DmdAnal.lhs | 1108 ++++++-----------
compiler/stranal/WorkWrap.lhs | 58 +-
compiler/stranal/WwLib.lhs | 332 +++---
compiler/typecheck/FamInst.lhs | 101 +-
compiler/typecheck/TcBinds.lhs | 11 +-
compiler/typecheck/TcCanonical.lhs | 11 +-
compiler/typecheck/TcDeriv.lhs | 94 +-
compiler/typecheck/TcErrors.lhs | 16 +-
compiler/typecheck/TcExpr.lhs | 135 ++-
compiler/typecheck/TcForeign.lhs | 5 +-
compiler/typecheck/TcGenDeriv.lhs | 183 +--
compiler/typecheck/TcGenGenerics.lhs | 22 +-
compiler/typecheck/TcHsSyn.lhs | 40 +-
compiler/typecheck/TcHsType.lhs | 27 +-
compiler/typecheck/TcInstDcls.lhs | 296 ++---
compiler/typecheck/TcInteract.lhs | 2 +-
compiler/typecheck/TcMType.lhs | 68 +-
compiler/typecheck/TcPat.lhs | 20 +-
compiler/typecheck/TcRnDriver.lhs | 56 +-
compiler/typecheck/TcRnTypes.lhs | 11 +-
compiler/typecheck/TcSimplify.lhs | 39 +-
compiler/typecheck/TcSplice.lhs | 15 +-
compiler/typecheck/TcTyClsDecls.lhs | 245 ++--
compiler/typecheck/TcTyDecls.lhs | 111 +-
compiler/typecheck/TcType.lhs | 160 ---
compiler/typecheck/TcTypeNats.hs | 12 +-
compiler/typecheck/TcUnify.lhs | 4 +-
compiler/typecheck/TcValidity.lhs | 164 ++-
compiler/types/Class.lhs | 20 +-
compiler/types/CoAxiom.lhs | 31 +-
compiler/types/Coercion.lhs | 211 +++-
compiler/types/FamInstEnv.lhs | 156 +--
compiler/types/FunDeps.lhs | 145 ++-
compiler/types/InstEnv.lhs | 2 +-
compiler/types/OptCoercion.lhs | 92 +-
compiler/types/TyCon.lhs | 127 +-
compiler/types/Type.lhs | 47 +-
compiler/types/TypeRep.lhs | 167 ++-
compiler/utils/Exception.hs | 29 +-
compiler/utils/Outputable.lhs | 16 +-
compiler/utils/Panic.lhs | 7 +-
compiler/utils/Platform.hs | 4 +
compiler/vectorise/Vectorise.hs | 397 +++----
compiler/vectorise/Vectorise/Builtins/Base.hs | 3 +-
.../vectorise/Vectorise/Builtins/Initialise.hs | 8 +-
compiler/vectorise/Vectorise/Convert.hs | 22 +-
compiler/vectorise/Vectorise/Env.hs | 121 +-
compiler/vectorise/Vectorise/Exp.hs | 1241 +++++++++++---------
compiler/vectorise/Vectorise/Generic/PAMethods.hs | 4 +-
compiler/vectorise/Vectorise/Generic/PData.hs | 12 +-
compiler/vectorise/Vectorise/Monad.hs | 29 +-
compiler/vectorise/Vectorise/Monad/Global.hs | 73 +-
compiler/vectorise/Vectorise/Monad/InstEnv.hs | 13 +-
compiler/vectorise/Vectorise/Monad/Local.hs | 117 +-
compiler/vectorise/Vectorise/Type/Classify.hs | 51 +-
compiler/vectorise/Vectorise/Type/Env.hs | 220 ++--
compiler/vectorise/Vectorise/Type/TyConDecl.hs | 1 +
compiler/vectorise/Vectorise/Type/Type.hs | 13 +-
compiler/vectorise/Vectorise/Utils.hs | 25 +-
configure.ac | 170 +--
distrib/compare/FilenameDescr.hs | 17 +-
distrib/compare/Utils.hs | 2 +-
distrib/compare/compare.hs | 65 +-
distrib/configure.ac.in | 10 +-
distrib/mkDocs/mkDocs | 27 +-
docs/storage-mgt/rp.tex | 2 +-
docs/users_guide/7.6.1-notes.xml | 427 -------
docs/users_guide/7.8.1-notes.xml | 33 +
docs/users_guide/extending_ghc.xml | 11 +-
docs/users_guide/flags.xml | 21 +
docs/users_guide/glasgow_exts.xml | 304 ++++-
docs/users_guide/intro.xml | 57 +-
docs/users_guide/parallel.xml | 2 +-
docs/users_guide/phases.xml | 15 +
docs/users_guide/safe_haskell.xml | 4 +-
docs/users_guide/ug-book.xml.in | 2 +-
docs/users_guide/ug-ent.xml.in | 2 +-
docs/users_guide/using.xml | 46 +-
driver/ghci/ghc.mk | 2 +-
ghc.mk | 74 +-
ghc/GhciMonad.hs | 5 -
ghc/InteractiveUI.hs | 11 +-
ghc/Main.hs | 1 -
ghc/ghc.mk | 14 +-
includes/Cmm.h | 8 +-
includes/CodeGen.Platform.hs | 27 +
includes/HsFFI.h | 4 +
includes/Rts.h | 3 +-
includes/rts/{Timer.h => GetTime.h} | 12 +-
includes/rts/Globals.h | 2 +
includes/rts/Stable.h | 15 +-
includes/rts/Ticky.h | 2 +-
includes/rts/Utils.h | 3 +
includes/rts/storage/FunTypes.h | 35 +-
includes/rts/storage/GC.h | 2 +-
includes/rts/storage/TSO.h | 3 +-
includes/stg/HaskellMachRegs.h | 2 +-
includes/stg/MachRegs.h | 39 +-
includes/stg/MiscClosures.h | 5 +
includes/stg/Regs.h | 42 +
includes/stg/RtsMachRegs.h | 2 +-
includes/stg/Types.h | 2 +
libraries/Cabal | 2 +-
libraries/Win32 | 2 +-
.../Distribution/InstalledPackageInfo/Binary.hs | 2 +-
libraries/binary | 2 +-
libraries/bytestring | 2 +-
libraries/containers | 2 +-
libraries/gen_contents_index | 24 +-
libraries/haskeline | 2 +-
libraries/pretty | 2 +-
libraries/random | 1 +
libraries/time | 2 +-
libraries/vector | 2 +-
mk/build.mk.sample | 19 +
mk/config.mk.in | 60 +-
mk/custom-settings.mk | 2 +-
mk/ways.mk | 2 +-
packages | 6 +-
rts/Capability.c | 4 +-
rts/GetTime.h | 1 -
rts/Globals.c | 14 +
rts/Hash.c | 5 +
rts/Hash.h | 3 +-
rts/HsFFI.c | 18 +
rts/Linker.c | 22 +-
rts/Messages.c | 6 +-
rts/Prelude.h | 2 +
rts/PrimOps.cmm | 20 +-
rts/RetainerProfile.c | 2 +-
rts/RtsStartup.c | 5 +-
rts/RtsUtils.c | 2 +-
rts/RtsUtils.h | 3 -
rts/STM.c | 17 +-
rts/Schedule.c | 59 +-
rts/Schedule.h | 27 +-
rts/Stable.c | 624 +++++-----
rts/Stable.h | 29 +-
rts/Stats.c | 71 +-
rts/Stats.h | 12 +-
rts/StgMiscClosures.cmm | 12 +
rts/Task.c | 9 -
rts/Task.h | 6 -
rts/ghc.mk | 21 +-
rts/package.conf.in | 2 +
rts/posix/Itimer.c | 18 +
rts/posix/OSMem.c | 2 +-
rts/sm/Compact.c | 2 +-
rts/sm/Evac.c | 17 +-
rts/sm/GC.c | 70 +-
rts/sm/GCAux.c | 8 +
rts/sm/GCTDecl.h | 2 +-
rts/sm/GCThread.h | 5 +-
rts/sm/Scav.c | 2 +-
rts/sm/Storage.c | 37 +-
rts/sm/Storage.h | 4 +-
rts/win32/AsyncIO.c | 6 +-
rts/win32/AsyncIO.h | 2 +-
rts/win32/IOManager.c | 42 +-
rts/win32/IOManager.h | 4 +-
rts/win32/ThrIOManager.c | 10 +-
rts/win32/libHSbase.def | 1 +
ghc/Makefile => rules/add-dependency.mk | 9 +-
rules/build-dependencies.mk | 13 +-
rules/build-package-data.mk | 20 +-
rules/build-package-way.mk | 6 +-
rules/build-package.mk | 21 +-
rules/build-prog.mk | 24 +-
rules/c-suffix-rules.mk | 3 +-
rules/cmm-suffix-rules.mk | 4 -
rules/distdir-opts.mk | 111 ++
rules/distdir-way-opts.mk | 98 +-
rules/haddock.mk | 2 +-
rules/hi-rule.mk | 34 +-
rules/hs-suffix-rules-srcdir.mk | 77 +-
...les-srcdir.mk => hs-suffix-way-rules-srcdir.mk} | 48 +-
.../{hs-suffix-rules.mk => hs-suffix-way-rules.mk} | 33 +-
rules/manual-package-config.mk | 2 +-
settings.in | 2 +
sync-all | 81 +-
utils/Makefile | 119 --
utils/deriveConstants/DeriveConstants.hs | 9 +
utils/genapply/GenApply.hs | 68 +-
utils/genprimopcode/Main.hs | 35 +-
utils/ghc-cabal/ghc.mk | 3 +-
utils/ghc-pkg/Main.hs | 3 +-
utils/ghc-pkg/ghc-pkg.cabal | 2 +-
utils/ghc-pkg/ghc.mk | 119 +-
utils/ghctags/Main.hs | 2 +-
utils/hp2ps/ghc.mk | 2 +-
utils/lndir/Makefile | 17 -
utils/runghc/runghc.hs | 2 +-
343 files changed, 10965 insertions(+), 8014 deletions(-)
Diff suppressed because of size. To see it, use:
git show 463a77c0b803853d89eff6e0e69604404efc5485
More information about the ghc-commits
mailing list