[commit: ghc] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (8514632)
Iavor Diatchki
diatchki at galois.com
Mon Apr 15 01:29:08 CEST 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : type-nats
https://github.com/ghc/ghc/commit/851463215cf6d0b8aeae8ec6b93130030f3e5f10
>---------------------------------------------------------------
commit 851463215cf6d0b8aeae8ec6b93130030f3e5f10
Merge: 1e27e8b 47556a8
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date: Sun Apr 14 16:29:00 2013 -0700
Merge remote-tracking branch 'origin/master' into type-nats
Conflicts:
compiler/prelude/TysWiredIn.lhs
compiler/types/Type.lhs
README.md | 7 +-
aclocal.m4 | 34 +-
compiler/HsVersions.h | 10 -
compiler/cmm/Bitmap.hs | 15 +-
compiler/cmm/CLabel.hs | 51 +-
compiler/cmm/CmmBuildInfoTables.hs | 8 +-
compiler/cmm/CmmCallConv.hs | 8 +-
compiler/cmm/CmmNode.hs | 46 +-
compiler/cmm/CmmPipeline.hs | 16 +-
compiler/cmm/CmmType.hs | 6 +
compiler/codeGen/StgCmmArgRep.hs | 135 ++++
compiler/codeGen/StgCmmBind.hs | 43 +-
compiler/codeGen/StgCmmClosure.hs | 5 +-
compiler/codeGen/StgCmmEnv.hs | 6 +-
compiler/codeGen/StgCmmExpr.hs | 10 +-
compiler/codeGen/StgCmmHeap.hs | 8 +-
compiler/codeGen/StgCmmLayout.hs | 84 +--
compiler/codeGen/StgCmmTicky.hs | 664 ++++++++++++------
compiler/codeGen/StgCmmUtils.hs | 5 +-
compiler/coreSyn/CorePrep.lhs | 74 +-
compiler/coreSyn/CoreUnfold.lhs | 53 +-
compiler/coreSyn/ExternalCore.lhs | 7 -
compiler/ghc.cabal.in | 4 +-
compiler/ghc.mk | 18 +-
compiler/ghci/ByteCodeAsm.lhs | 18 +-
compiler/ghci/ByteCodeItbls.lhs | 384 +++++------
compiler/ghci/RtClosureInspect.hs | 4 +-
compiler/hsSyn/HsBinds.lhs | 7 -
compiler/main/DriverPipeline.hs | 6 +
compiler/main/DynFlags.hs | 43 +-
compiler/main/HscTypes.lhs | 2 +-
compiler/main/InteractiveEval.hs | 40 +-
compiler/main/InteractiveEval.hs-boot | 3 -
compiler/main/InteractiveEvalTypes.hs | 65 ++
compiler/main/Packages.lhs | 12 +-
compiler/main/SysTools.lhs | 2 +
compiler/nativeGen/PIC.hs | 45 +-
compiler/nativeGen/PprBase.hs | 15 +-
compiler/nativeGen/RegAlloc/Linear/Base.hs | 2 +-
.../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 2 +-
compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 2 +-
.../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 2 +-
compiler/nativeGen/RegAlloc/Liveness.hs | 6 +-
compiler/nativeGen/SPARC/AddrMode.hs | 17 +-
compiler/nativeGen/SPARC/CodeGen.hs | 4 +-
compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 158 +++--
compiler/prelude/TysWiredIn.lhs | 268 ++++----
compiler/rename/RnPat.lhs | 13 +-
compiler/simplCore/OccurAnal.lhs | 73 +-
compiler/simplCore/SimplCore.lhs | 15 +-
compiler/specialise/SpecConstr.lhs | 66 +-
compiler/stgSyn/CoreToStg.lhs | 11 +-
compiler/stranal/WwLib.lhs | 24 +-
compiler/typecheck/TcCanonical.lhs | 111 +--
compiler/typecheck/TcInstDcls.lhs | 2 +-
compiler/typecheck/TcSimplify.lhs | 69 +-
compiler/typecheck/TcTyDecls.lhs | 23 +-
compiler/types/Type.lhs | 428 ++++++------
compiler/utils/FastMutInt.lhs | 16 +-
compiler/utils/FastString.lhs | 2 -
compiler/utils/Maybes.lhs | 11 +-
compiler/utils/OrdList.lhs | 9 +-
compiler/utils/Platform.hs | 4 +
compiler/utils/Stream.hs | 4 +-
compiler/utils/UniqSet.lhs | 11 +-
configure.ac | 6 +-
distrib/configure.ac.in | 1 +
docs/comm/rts-libs/prelude.html | 4 +-
docs/users_guide/flags.xml | 11 +
docs/users_guide/glasgow_exts.xml | 40 +-
docs/users_guide/profiling.xml | 164 +----
ghc.mk | 8 +-
includes/Cmm.h | 43 +-
includes/rts/Ticky.h | 2 +-
includes/stg/Ticky.h | 51 +-
libraries/Cabal | 2 +-
.../Distribution/InstalledPackageInfo/Binary.hs | 6 -
libraries/bin-package-db/bin-package-db.cabal | 9 +-
mk/build.mk.sample | 2 +-
mk/config.mk.in | 24 +-
mk/ways.mk | 4 +-
rts/Adjustor.c | 2 +-
rts/AutoApply.h | 6 +-
rts/Exception.cmm | 10 +-
rts/Linker.c | 36 +-
rts/ProfHeap.c | 3 +
rts/RaiseAsync.c | 6 +-
rts/Ticky.c | 128 ++--
rts/VisCallbacks.c | 75 ---
rts/VisCallbacks.h | 30 -
rts/VisSupport.c | 144 ----
rts/VisSupport.h | 44 --
rts/VisWindow.c | 747 ---------------------
rts/VisWindow.h | 5 -
rts/ghc.mk | 62 +-
rts/package.conf.in | 2 +-
rts/sm/Storage.c | 4 +-
rules/build-dependencies.mk | 2 +-
rules/build-package-way.mk | 12 +
rules/build-prog.mk | 11 -
rules/distdir-opts.mk | 4 +-
rules/distdir-way-opts.mk | 13 +-
rules/library-path.mk | 6 +-
settings.in | 1 +
utils/deriveConstants/DeriveConstants.hs | 1 +
utils/dll-split/Main.hs | 85 +++
.../ghctags.cabal => dll-split/dll-split.cabal} | 7 +-
{driver/split => utils/dll-split}/ghc.mk | 14 +-
108 files changed, 2190 insertions(+), 2963 deletions(-)
diff --cc compiler/types/Type.lhs
index 1d747bf,f6e4827..6698824
--- a/compiler/types/Type.lhs
+++ b/compiler/types/Type.lhs
@@@ -45,21 -39,20 +39,21 @@@ module Type
mkNumLitTy, isNumLitTy,
mkStrLitTy, isStrLitTy,
+ isTyLit,
coAxNthLHS,
-
- -- (Newtypes)
- newTyConInstRhs,
-
- -- Pred types
+
+ -- (Newtypes)
+ newTyConInstRhs,
+
+ -- Pred types
mkFamilyTyConApp,
- isDictLikeTy,
+ isDictLikeTy,
mkEqPred, mkPrimEqPred,
mkClassPred,
- noParenPred, isClassPred, isEqPred,
+ noParenPred, isClassPred, isEqPred,
isIPPred, isIPPred_maybe, isIPTyCon, isIPClass,
-
+
-- Deconstructing predicate types
PredTree(..), classifyPredType,
getClassPredTys, getClassPredTys_maybe,
@@@ -132,18 -125,12 +126,18 @@@
cloneTyVarBndr, deShadowTy, lookupTyVar,
substKiWith, substKisWith,
- -- * Pretty-printing
- pprType, pprParendType, pprTypeApp, pprTyThingCategory, pprTyThing,
+ -- * Pretty-printing
+ pprType, pprParendType, pprTypeApp, pprTyThingCategory, pprTyThing,
pprTvBndr, pprTvBndrs, pprForAll, pprSigmaType,
- pprEqPred, pprTheta, pprThetaArrowTy, pprClassPred,
+ pprEqPred, pprTheta, pprThetaArrowTy, pprClassPred,
pprKind, pprParendKind, pprSourceTyCon,
+ -- * Constructing coercion axioms.
+ CoAxiomRule, Eqn,
+ co_axr_rule, co_axr_tylit_rule, co_axr_tynum2_rule,
+ co_axr_inst, co_axr_asmps, co_axr_is_rule,
+ isImplicitCoAxiomRule,
+
-- * Tidying type related things up for printing
tidyType, tidyTypes,
tidyOpenType, tidyOpenTypes,
@@@ -177,9 -164,8 +171,9 @@@ import PrelNames ( eqTyConKey, ipClassN
import CoAxiom
-- others
+import Name ( Name )
- import Unique ( Unique, hasKey )
- import BasicTypes ( Arity, RepArity )
+ import Unique ( Unique, hasKey )
+ import BasicTypes ( Arity, RepArity )
import NameSet
import StaticFlags
import Util
More information about the ghc-commits
mailing list