[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (e5ccb4e)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/e5ccb4ee127c55a6a834cc65f28f202af773d93e >--------------------------------------------------------------- commit e5ccb4ee127c55a6a834cc65f28f202af773d93e Merge: 1ee1cd4... d2a5a9c... Author: Simon Peyton Jones <[email protected]> Date: Sun Dec 23 15:49:29 2012 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc Conflicts: compiler/basicTypes/MkId.lhs compiler/iface/IfaceSyn.lhs compiler/basicTypes/MkId.lhs | 32 +- compiler/coreSyn/CoreLint.lhs | 59 ++- compiler/coreSyn/ExternalCore.lhs | 1 + compiler/coreSyn/MkExternalCore.lhs | 5 +- compiler/coreSyn/TrieMap.lhs | 60 +- compiler/deSugar/DsArrows.lhs | 76 +- compiler/deSugar/DsBinds.lhs | 3 +- compiler/deSugar/DsMeta.hs | 161 +++-- compiler/ghc.cabal.in | 1 + compiler/hsSyn/Convert.lhs | 114 ++-- compiler/hsSyn/HsDecls.lhs | 466 +++++++----- compiler/hsSyn/HsUtils.lhs | 31 +- compiler/iface/BinIface.hs | 27 +- compiler/iface/IfaceSyn.lhs | 58 +- compiler/iface/IfaceType.lhs | 12 +- compiler/iface/MkIface.lhs | 41 +- compiler/iface/TcIface.lhs | 60 +- compiler/iface/TcIface.lhs-boot | 4 +- compiler/main/GHC.hs | 4 +- compiler/main/HscStats.hs | 19 +- compiler/main/HscStats.lhs | 6 +- compiler/main/HscTypes.lhs | 25 +- compiler/main/TidyPgm.lhs | 2 +- compiler/parser/Parser.y.pp | 72 ++- compiler/parser/ParserCore.y | 20 +- compiler/parser/RdrHsSyn.lhs | 116 ++-- compiler/rename/RnNames.lhs | 21 +- compiler/rename/RnSource.lhs | 254 +++++--- compiler/rename/RnTypes.lhs | 10 +- compiler/typecheck/FamInst.lhs | 135 +++- compiler/typecheck/TcBinds.lhs | 2 +- compiler/typecheck/TcClassDcl.lhs | 11 +- compiler/typecheck/TcDeriv.lhs | 41 +- compiler/typecheck/TcEnv.lhs | 18 +- compiler/typecheck/TcEvidence.lhs | 34 +- compiler/typecheck/TcExpr.lhs | 12 +- compiler/typecheck/TcForeign.lhs | 2 +- compiler/typecheck/TcGenDeriv.lhs | 7 +- compiler/typecheck/TcGenGenerics.lhs | 11 +- compiler/typecheck/TcHsSyn.lhs | 3 +- compiler/typecheck/TcInstDcls.lhs | 177 ++++-- compiler/typecheck/TcInteract.lhs | 8 +- compiler/typecheck/TcPat.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 21 +- compiler/typecheck/TcRnTypes.lhs | 2 +- compiler/typecheck/TcSMonad.lhs | 2 +- compiler/typecheck/TcSplice.lhs | 50 +- compiler/typecheck/TcTyClsDecls.lhs | 360 ++++++---- compiler/typecheck/TcTyDecls.lhs | 2 +- compiler/typecheck/TcType.lhs | 28 +- compiler/types/Class.lhs | 2 +- compiler/types/CoAxiom.lhs | 292 ++++++++ compiler/types/Coercion.lhs | 128 ++-- compiler/types/FamInstEnv.lhs | 792 +++++++++++++++------ compiler/types/OptCoercion.lhs | 52 +- compiler/types/TyCon.lhs | 112 +--- compiler/types/Type.lhs | 9 + compiler/types/TypeRep.lhs | 3 +- compiler/types/Unify.lhs | 168 +++-- compiler/vectorise/Vectorise.hs | 3 +- compiler/vectorise/Vectorise/Env.hs | 2 +- compiler/vectorise/Vectorise/Generic/PADict.hs | 4 +- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 20 +- compiler/vectorise/Vectorise/Generic/PData.hs | 6 +- compiler/vectorise/Vectorise/Monad/InstEnv.hs | 4 +- compiler/vectorise/Vectorise/Type/Env.hs | 15 +- compiler/vectorise/Vectorise/Utils/Base.hs | 16 +- compiler/vectorise/Vectorise/Utils/PADict.hs | 11 +- docs/core-spec/CoreLint.ott | 36 +- docs/core-spec/CoreSyn.ott | 37 +- docs/core-spec/core-spec.mng | 21 +- docs/core-spec/core-spec.pdf | Bin 303537 -> 308357 bytes docs/users_guide/glasgow_exts.xml | 96 ++- ghc/InteractiveUI.hs | 2 +- 74 files changed, 2980 insertions(+), 1539 deletions(-) diff --cc compiler/basicTypes/MkId.lhs index 1037332,6811b11..ef0efc9 --- a/compiler/basicTypes/MkId.lhs +++ b/compiler/basicTypes/MkId.lhs @@@ -55,8 -56,8 +56,9 @@@ import CoreUtils ( exprType, mkCast import CoreUnfold import Literal import TyCon + import CoAxiom import Class +import NameSet import VarSet import Name import PrimOp diff --cc compiler/iface/IfaceSyn.lhs index b1eb388,617f0f3..e72f95c --- a/compiler/iface/IfaceSyn.lhs +++ b/compiler/iface/IfaceSyn.lhs @@@ -20,7 -20,7 +20,8 @@@ module IfaceSyn IfaceBinding(..), IfaceConAlt(..), IfaceIdInfo(..), IfaceIdDetails(..), IfaceUnfolding(..), IfaceInfoItem(..), IfaceRule(..), IfaceAnnotation(..), IfaceAnnTarget, - IfaceClsInst(..), IfaceFamInst(..), IfaceTickish(..), IfaceBang(..), - IfaceClsInst(..), IfaceFamInst(..), IfaceTickish(..), IfaceAxBranch(..), ++ IfaceClsInst(..), IfaceFamInst(..), IfaceTickish(..), ++ IfaceBang(..), IfaceAxBranch(..), -- Misc ifaceDeclImplicitBndrs, visibleIfConDecls,