HEADS UP: another iface file change (Re: [commit: ghc] master: Merge branch 'no-pred-ty' (b3bc5f4))
Max Bolingbroke
batterseapower at hotmail.com
Fri Sep 9 17:45:36 CEST 2011
This merge also changes the interface file format!
By the way, I may be about to commit another change to the format - so
you might want to hold off updating for a while.
Max
On 9 September 2011 14:40, Max Bolingbroke <batterseapower at hotmail.com> wrote:
> Repository : ssh://darcs.haskell.org//srv/darcs/ghc
>
> On branch : master
>
> http://hackage.haskell.org/trac/ghc/changeset/b3bc5f4f49a01be12aff0e4369db62331c147179
>
>>---------------------------------------------------------------
>
> commit b3bc5f4f49a01be12aff0e4369db62331c147179
> Merge: c2bd94c... 99a52b0...
> Author: Max Bolingbroke <batterseapower at hotmail.com>
> Date: Fri Sep 9 13:45:41 2011 +0100
>
> Merge branch 'no-pred-ty'
>
> Conflicts:
> compiler/iface/BuildTyCl.lhs
> compiler/iface/MkIface.lhs
> compiler/iface/TcIface.lhs
> compiler/typecheck/TcTyClsDecls.lhs
> compiler/types/Class.lhs
> compiler/utils/Util.lhs
>
> compiler/basicTypes/BasicTypes.lhs | 36 ++-
> compiler/basicTypes/DataCon.lhs | 35 ++-
> compiler/basicTypes/Id.lhs | 6 +-
> compiler/basicTypes/MkId.lhs | 15 +-
> compiler/basicTypes/Name.lhs | 10 +-
> compiler/basicTypes/OccName.lhs | 58 ++-
> compiler/basicTypes/SrcLoc.lhs | 4 +
> compiler/basicTypes/Unique.lhs | 27 +-
> compiler/basicTypes/Var.lhs | 32 ++-
> compiler/codeGen/ClosureInfo.lhs | 6 -
> compiler/codeGen/StgCmmClosure.hs | 6 -
> compiler/coreSyn/CoreLint.lhs | 78 +++--
> compiler/coreSyn/CoreSubst.lhs | 290 ++++++++++++++-
> compiler/coreSyn/CoreUnfold.lhs | 177 +---------
> compiler/coreSyn/CoreUtils.lhs | 4 +-
> compiler/coreSyn/ExternalCore.lhs | 1 -
> compiler/coreSyn/MkCore.lhs | 45 ++-
> compiler/coreSyn/MkExternalCore.lhs | 4 -
> compiler/coreSyn/PprCore.lhs | 4 +-
> compiler/coreSyn/PprExternalCore.lhs | 2 -
> compiler/coreSyn/TrieMap.lhs | 2 -
> compiler/deSugar/Check.lhs | 2 +-
> compiler/deSugar/Desugar.lhs | 8 +-
> compiler/deSugar/DsArrows.lhs | 2 +-
> compiler/deSugar/DsBinds.lhs | 123 ++++---
> compiler/deSugar/DsCCall.lhs | 6 +-
> compiler/deSugar/DsExpr.lhs | 22 +-
> compiler/deSugar/DsMeta.hs | 41 +-
> compiler/deSugar/DsMonad.lhs | 15 +-
> compiler/deSugar/DsUtils.lhs | 2 +-
> compiler/deSugar/Match.lhs | 13 +-
> compiler/deSugar/MatchCon.lhs | 3 +-
> compiler/ghc.cabal.in | 1 +
> compiler/ghci/RtClosureInspect.hs | 9 -
> compiler/hsSyn/Convert.lhs | 48 +--
> compiler/hsSyn/HsBinds.lhs | 28 +-
> compiler/hsSyn/HsExpr.lhs | 2 +-
> compiler/hsSyn/HsPat.lhs | 2 +-
> compiler/hsSyn/HsTypes.lhs | 126 ++++---
> compiler/hsSyn/HsUtils.lhs | 8 +-
> compiler/iface/BinIface.hs | 86 ++---
> compiler/iface/BuildTyCl.lhs | 25 +-
> compiler/iface/IfaceEnv.lhs | 45 ++--
> compiler/iface/IfaceSyn.lhs | 41 +--
> compiler/iface/IfaceType.lhs | 114 ++++---
> compiler/iface/MkIface.lhs | 109 +++---
> compiler/iface/TcIface.lhs | 57 ++--
> compiler/main/DynFlags.hs | 2 +
> compiler/main/GHC.hs | 6 +-
> compiler/main/HscTypes.lhs | 45 +--
> compiler/main/InteractiveEval.hs | 2 +-
> compiler/main/PprTyThing.hs | 9 +-
> compiler/main/TidyPgm.lhs | 4 +-
> compiler/parser/Lexer.x | 2 +
> compiler/parser/Parser.y.pp | 29 +-
> compiler/parser/ParserCore.y | 3 -
> compiler/parser/RdrHsSyn.lhs | 78 ++---
> compiler/prelude/PrelNames.lhs | 27 +-
> compiler/prelude/PrelRules.lhs | 2 +-
> compiler/prelude/PrimOp.lhs | 2 +-
> compiler/prelude/TysPrim.lhs | 50 ++--
> compiler/prelude/TysWiredIn.lhs | 197 ++++++++---
> compiler/prelude/TysWiredIn.lhs-boot | 10 +
> compiler/rename/RnBinds.lhs | 6 +-
> compiler/rename/RnEnv.lhs | 21 +-
> compiler/rename/RnExpr.lhs | 6 +-
> compiler/rename/RnHsSyn.lhs | 23 +-
> compiler/rename/RnNames.lhs | 2 +-
> compiler/rename/RnPat.lhs | 14 +-
> compiler/rename/RnSource.lhs | 6 +-
> compiler/rename/RnTypes.lhs | 44 +--
> compiler/simplCore/SetLevels.lhs | 61 ++--
> compiler/simplCore/Simplify.lhs | 25 +-
> compiler/specialise/SpecConstr.lhs | 2 +-
> compiler/specialise/Specialise.lhs | 2 +-
> compiler/stranal/WwLib.lhs | 4 +-
> compiler/typecheck/Inst.lhs | 26 +-
> compiler/typecheck/TcArrows.lhs | 10 +-
> compiler/typecheck/TcBinds.lhs | 6 +-
> compiler/typecheck/TcCanonical.lhs | 386 ++++++++++----------
> compiler/typecheck/TcClassDcl.lhs | 1 +
> compiler/typecheck/TcDeriv.lhs | 36 +-
> compiler/typecheck/TcEnv.lhs | 4 +-
> compiler/typecheck/TcErrors.lhs | 131 ++++---
> compiler/typecheck/TcExpr.lhs | 22 +-
> compiler/typecheck/TcGenDeriv.lhs | 14 +-
> compiler/typecheck/TcHsSyn.lhs | 16 +-
> compiler/typecheck/TcHsType.lhs | 227 ++++++------
> compiler/typecheck/TcInstDcls.lhs | 17 +-
> compiler/typecheck/TcInteract.lhs | 358 +++++++++++--------
> compiler/typecheck/TcMType.lhs | 194 ++++++----
> compiler/typecheck/TcMatches.lhs | 16 +-
> compiler/typecheck/TcPat.lhs | 54 ++--
> compiler/typecheck/TcRnDriver.lhs | 44 ++-
> compiler/typecheck/TcRnMonad.lhs | 24 +-
> compiler/typecheck/TcRnTypes.lhs | 2 +-
> compiler/typecheck/TcSMonad.lhs | 69 +++--
> compiler/typecheck/TcSimplify.lhs | 22 +-
> compiler/typecheck/TcSplice.lhs | 36 +-
> compiler/typecheck/TcTyClsDecls.lhs | 57 ++--
> compiler/typecheck/TcTyDecls.lhs | 42 +-
> compiler/typecheck/TcType.lhs | 141 +++----
> compiler/typecheck/TcUnify.lhs | 192 +++++------
> compiler/typecheck/TcUnify.lhs-boot | 6 +-
> compiler/types/Class.lhs | 30 +-
> compiler/types/Coercion.lhs | 80 ++--
> compiler/types/FamInstEnv.lhs | 15 -
> compiler/types/FunDeps.lhs | 29 +-
> compiler/types/IParam.lhs | 41 ++
> compiler/types/IParam.lhs-boot | 10 +
> compiler/types/Kind.lhs | 60 +---
> compiler/types/TyCon.lhs | 81 +++--
> compiler/types/TyCon.lhs-boot | 5 +
> compiler/types/Type.lhs | 306 +++++++++-------
> compiler/types/Type.lhs-boot | 9 +
> compiler/types/TypeRep.lhs | 149 +++------
> compiler/types/TypeRep.lhs-boot | 7 +-
> compiler/types/Unify.lhs | 24 +--
> compiler/utils/Util.lhs | 11 +-
> compiler/vectorise/Vectorise/Builtins/Base.hs | 2 +-
> .../vectorise/Vectorise/Builtins/Initialise.hs | 4 +-
> compiler/vectorise/Vectorise/Type/Classify.hs | 2 -
> compiler/vectorise/Vectorise/Type/PADict.hs | 3 +-
> compiler/vectorise/Vectorise/Type/PRepr.hs | 1 -
> compiler/vectorise/Vectorise/Type/TyConDecl.hs | 12 +-
> compiler/vectorise/Vectorise/Type/Type.hs | 2 -
> compiler/vectorise/Vectorise/Utils/Closure.hs | 4 +-
> compiler/vectorise/Vectorise/Utils/PADict.hs | 2 +-
> docs/users_guide/flags.xml | 6 +
> docs/users_guide/glasgow_exts.xml | 92 +++++
> ghc/GhciTags.hs | 1 -
> utils/genprimopcode/Main.hs | 2 +-
> 132 files changed, 3017 insertions(+), 2590 deletions(-)
>
>
> Diff suppressed because of size. To see it, use:
>
> git show b3bc5f4f49a01be12aff0e4369db62331c147179
>
> _______________________________________________
> Cvs-ghc mailing list
> Cvs-ghc at haskell.org
> http://www.haskell.org/mailman/listinfo/cvs-ghc
>
More information about the Cvs-ghc
mailing list