Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/e75c36d630c3efed53976197f0488f38a8987481 >--------------------------------------------------------------- commit e75c36d630c3efed53976197f0488f38a8987481 Merge: a52bd1d... b3bc5f4... Author: Julien Cretin <g...@ia0.eu> Date: Mon Sep 12 11:43:52 2011 +0200 Merge branch 'master' into step2 Conflicts: compiler/basicTypes/Var.lhs compiler/hsSyn/HsTypes.lhs compiler/iface/BuildTyCl.lhs compiler/iface/IfaceSyn.lhs compiler/parser/Parser.y.pp compiler/parser/RdrHsSyn.lhs compiler/rename/RnBinds.lhs compiler/rename/RnHsSyn.lhs compiler/rename/RnSource.lhs compiler/rename/RnTypes.lhs compiler/typecheck/TcDeriv.lhs compiler/typecheck/TcHsType.lhs compiler/typecheck/TcTyClsDecls.lhs compiler/typecheck/TcUnify.lhs compiler/types/Kind.lhs compiler/types/TyCon.lhs compiler/types/Type.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 | 124 ++++--- 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 | 31 +- compiler/parser/ParserCore.y | 3 - compiler/parser/RdrHsSyn.lhs | 62 +--- 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 | 34 +- 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 | 245 ++++++------- 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 | 181 +++++----- 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 | 59 +--- compiler/types/TyCon.lhs | 81 +++-- compiler/types/TyCon.lhs-boot | 5 + compiler/types/Type.lhs | 306 +++++++++------- compiler/types/Type.lhs-boot | 12 + 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, 3019 insertions(+), 2594 deletions(-) Diff suppressed because of size. To see it, use: git show e75c36d630c3efed53976197f0488f38a8987481 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
