Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/db9c062a4a7c39563a3a9a83718cc0ce6d4babae >--------------------------------------------------------------- commit db9c062a4a7c39563a3a9a83718cc0ce6d4babae Merge: 90fac75... 4527991... Author: Ian Lynagh <i...@well-typed.com> Date: Tue Jan 1 13:24:58 2013 +0000 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/basicTypes/BasicTypes.lhs | 58 -- compiler/basicTypes/DataCon.lhs | 332 +++++---- compiler/basicTypes/DataCon.lhs-boot | 3 +- compiler/basicTypes/MkId.lhs | 713 +++++++++++-------- compiler/basicTypes/MkId.lhs-boot | 10 +- compiler/cmm/CmmPipeline.hs | 37 +- compiler/cmm/CmmProcPoint.hs | 2 +- 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 | 167 +++-- compiler/deSugar/DsUtils.lhs | 12 +- compiler/ghc.cabal.in | 1 + compiler/hsSyn/Convert.lhs | 118 ++-- compiler/hsSyn/HsDecls.lhs | 466 +++++++----- compiler/hsSyn/HsTypes.lhs | 1 + compiler/hsSyn/HsUtils.lhs | 31 +- compiler/iface/BinIface.hs | 48 +- compiler/iface/BuildTyCl.lhs | 18 +- compiler/iface/IfaceSyn.lhs | 67 ++- compiler/iface/IfaceType.lhs | 12 +- compiler/iface/MkIface.lhs | 49 +- compiler/iface/TcIface.lhs | 73 ++- compiler/iface/TcIface.lhs-boot | 4 +- compiler/main/DynFlags.hs | 52 +- compiler/main/GHC.hs | 4 +- compiler/main/HscMain.hs | 8 +- compiler/main/HscStats.hs | 19 +- compiler/main/HscStats.lhs | 6 +- compiler/main/HscTypes.lhs | 25 +- compiler/main/InteractiveEval.hs | 43 +- compiler/main/PprTyThing.hs | 23 +- compiler/main/TidyPgm.lhs | 2 +- compiler/parser/Parser.y.pp | 95 ++- compiler/parser/ParserCore.y | 20 +- compiler/parser/RdrHsSyn.lhs | 116 ++-- compiler/prelude/PrelNames.lhs | 11 +- compiler/prelude/TysPrim.lhs | 7 - compiler/prelude/TysWiredIn.lhs | 39 +- compiler/prelude/TysWiredIn.lhs-boot | 1 + compiler/rename/RnNames.lhs | 21 +- compiler/rename/RnSource.lhs | 254 +++++--- compiler/rename/RnTypes.lhs | 10 +- compiler/simplCore/CoreMonad.lhs | 3 + compiler/simplCore/Simplify.lhs | 4 +- compiler/stranal/DmdAnal.lhs | 4 +- compiler/stranal/WwLib.lhs | 65 ++- compiler/typecheck/FamInst.lhs | 135 +++- compiler/typecheck/TcBinds.lhs | 2 +- compiler/typecheck/TcCanonical.lhs | 10 +- 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 | 14 +- compiler/typecheck/TcGenDeriv.lhs | 50 +- compiler/typecheck/TcGenGenerics.lhs | 11 +- compiler/typecheck/TcHsSyn.lhs | 3 +- compiler/typecheck/TcHsType.lhs | 15 +- compiler/typecheck/TcInstDcls.lhs | 188 ++++-- compiler/typecheck/TcInteract.lhs | 46 +- compiler/typecheck/TcPat.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 23 +- compiler/typecheck/TcRnTypes.lhs | 2 +- compiler/typecheck/TcSMonad.lhs | 6 +- compiler/typecheck/TcSimplify.lhs | 24 +- compiler/typecheck/TcSplice.lhs | 60 +- compiler/typecheck/TcTyClsDecls.lhs | 607 ++++++++--------- compiler/typecheck/TcTyDecls.lhs | 2 +- compiler/typecheck/TcType.lhs | 28 +- compiler/typecheck/TcUnify.lhs | 79 +- compiler/types/Class.lhs | 2 +- compiler/types/CoAxiom.lhs | 292 ++++++++ compiler/types/Coercion.lhs | 128 ++-- compiler/types/FamInstEnv.lhs | 790 +++++++++++++++------ compiler/types/Kind.lhs | 1 - compiler/types/OptCoercion.lhs | 52 +- compiler/types/TyCon.lhs | 149 +---- compiler/types/Type.lhs | 17 +- 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 | 15 +- compiler/vectorise/Vectorise/Monad/InstEnv.hs | 4 +- compiler/vectorise/Vectorise/Type/Env.hs | 15 +- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 4 +- 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/flags.xml | 11 +- docs/users_guide/ghci.xml | 5 +- docs/users_guide/glasgow_exts.xml | 213 ++++--- docs/users_guide/using.xml | 10 +- ghc/InteractiveUI.hs | 2 +- includes/rts/storage/ClosureMacros.h | 4 +- sync-all | 10 +- 106 files changed, 4152 insertions(+), 2574 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
