Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-constraint-solver
http://hackage.haskell.org/trac/ghc/changeset/6145e69a604c942ae5513ff5edd0a2fc44978a1b >--------------------------------------------------------------- commit 6145e69a604c942ae5513ff5edd0a2fc44978a1b Merge: 1d0ad7b... 1d47564... Author: Dimitrios Vytiniotis <[email protected]> Date: Tue Nov 15 15:44:56 2011 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-constraint-solver Conflicts: compiler/coreSyn/CoreLint.lhs compiler/iface/BinIface.hs compiler/prelude/TysPrim.lhs compiler/simplCore/Simplify.lhs compiler/typecheck/TcCanonical.lhs compiler/typecheck/TcInteract.lhs compiler/typecheck/TcMType.lhs compiler/typecheck/TcSMonad.lhs compiler/basicTypes/BasicTypes.lhs | 2 + compiler/basicTypes/DataCon.lhs | 1 + compiler/basicTypes/Literal.lhs | 4 +- compiler/basicTypes/MkId.lhs | 2 +- compiler/basicTypes/OccName.lhs | 35 + compiler/basicTypes/RdrName.lhs | 10 +- compiler/basicTypes/Var.lhs | 49 +- compiler/codeGen/CgPrimOp.hs | 2 +- compiler/codeGen/StgCmmPrim.hs | 2 +- compiler/coreSyn/CoreArity.lhs | 27 +- compiler/coreSyn/CoreLint.lhs | 216 ++- compiler/coreSyn/CoreUtils.lhs | 39 +- compiler/coreSyn/MkCore.lhs | 4 +- compiler/coreSyn/MkExternalCore.lhs | 1 + compiler/coreSyn/PprCore.lhs | 1 + compiler/deSugar/Coverage.lhs | 3 - compiler/deSugar/Desugar.lhs | 2 - compiler/deSugar/DsExpr.lhs | 6 +- compiler/deSugar/DsListComp.lhs | 16 +- compiler/deSugar/DsMeta.hs | 16 +- compiler/deSugar/DsMonad.lhs | 207 ++- compiler/deSugar/DsUtils.lhs | 4 +- compiler/ghc.cabal.in | 1 + compiler/ghci/RtClosureInspect.hs | 3 +- compiler/hsSyn/Convert.lhs | 22 +- compiler/hsSyn/HsBinds.lhs | 7 +- compiler/hsSyn/HsDecls.lhs | 33 +- compiler/hsSyn/HsExpr.lhs | 10 +- compiler/hsSyn/HsExpr.lhs-boot | 10 +- compiler/hsSyn/HsLit.lhs | 23 +- compiler/hsSyn/HsPat.lhs-boot | 5 +- compiler/hsSyn/HsTypes.lhs | 171 ++- compiler/iface/BinIface.hs | 1741 ++++++++++---------- compiler/iface/BuildTyCl.lhs | 26 +- compiler/iface/FlagChecker.hs | 47 + compiler/iface/IfaceSyn.lhs | 12 +- compiler/iface/IfaceType.lhs | 97 +- compiler/iface/LoadIface.lhs | 3 +- compiler/iface/MkIface.lhs | 781 +++++----- compiler/iface/TcIface.lhs | 95 +- compiler/iface/TcIface.lhs-boot | 4 +- compiler/main/DriverPipeline.hs | 8 +- compiler/main/DynFlags.hs | 44 +- compiler/main/GHC.hs | 4 +- compiler/main/HscMain.hs | 6 +- compiler/main/HscTypes.lhs | 451 +++--- compiler/main/Packages.lhs | 8 +- compiler/main/TidyPgm.lhs | 12 +- compiler/parser/Lexer.x | 17 +- compiler/parser/Parser.y.pp | 107 +- compiler/parser/ParserCore.y | 16 +- compiler/parser/RdrHsSyn.lhs | 32 +- compiler/prelude/PrelNames.lhs | 90 +- compiler/prelude/TysPrim.lhs | 128 +- compiler/prelude/TysWiredIn.lhs | 15 +- compiler/prelude/primops.txt.pp | 9 +- compiler/rename/RnBinds.lhs | 2 +- compiler/rename/RnEnv.lhs | 152 ++- compiler/rename/RnExpr.lhs | 25 +- compiler/rename/RnHsSyn.lhs | 31 +- compiler/rename/RnPat.lhs | 5 +- compiler/rename/RnSource.lhs | 103 +- compiler/rename/RnTypes.lhs | 187 ++- compiler/simplCore/FloatOut.lhs | 14 +- compiler/simplCore/SetLevels.lhs | 22 +- compiler/simplCore/SimplEnv.lhs | 11 +- compiler/simplCore/SimplUtils.lhs | 32 +- compiler/simplCore/Simplify.lhs | 64 +- compiler/typecheck/FamInst.lhs | 1 + compiler/typecheck/TcArrows.lhs | 9 +- compiler/typecheck/TcBinds.lhs | 1 + compiler/typecheck/TcCanonical.lhs | 47 +- compiler/typecheck/TcClassDcl.lhs | 4 +- compiler/typecheck/TcDeriv.lhs | 9 +- compiler/typecheck/TcEnv.lhs | 60 +- compiler/typecheck/TcExpr.lhs | 33 +- compiler/typecheck/TcHsSyn.lhs | 252 ++- compiler/typecheck/TcHsType.lhs | 559 ++++++-- compiler/typecheck/TcInstDcls.lhs | 82 +- compiler/typecheck/TcInteract.lhs | 36 +- compiler/typecheck/TcMType.lhs | 472 ++++--- compiler/typecheck/TcPat.lhs | 5 +- compiler/typecheck/TcRnDriver.lhs | 22 +- compiler/typecheck/TcRnMonad.lhs | 1 - compiler/typecheck/TcRnTypes.lhs | 35 +- compiler/typecheck/TcRules.lhs | 13 +- compiler/typecheck/TcSMonad.lhs | 20 +- compiler/typecheck/TcSimplify.lhs | 32 +- compiler/typecheck/TcSplice.lhs | 17 +- compiler/typecheck/TcTyClsDecls.lhs | 880 ++++++---- compiler/typecheck/TcType.lhs | 59 +- compiler/typecheck/TcUnify.lhs | 383 +++-- compiler/typecheck/TcUnify.lhs-boot | 12 +- compiler/types/Class.lhs | 28 +- compiler/types/Coercion.lhs | 81 +- compiler/types/FamInstEnv.lhs | 88 +- compiler/types/Kind.lhs | 239 +++- compiler/types/TyCon.lhs | 125 +- compiler/types/Type.lhs | 147 ++- compiler/types/Type.lhs-boot | 3 + compiler/types/TypeRep.lhs | 63 +- compiler/types/TypeRep.lhs-boot | 1 + compiler/types/Unify.lhs | 57 +- compiler/utils/Binary.hs | 32 +- compiler/utils/Outputable.lhs | 5 +- compiler/utils/Pretty.lhs | 9 +- .../vectorise/Vectorise/Builtins/Initialise.hs | 14 +- compiler/vectorise/Vectorise/Env.hs | 34 +- compiler/vectorise/Vectorise/Exp.hs | 10 - compiler/vectorise/Vectorise/Monad.hs | 5 +- compiler/vectorise/Vectorise/Monad/Naming.hs | 4 +- compiler/vectorise/Vectorise/Type/Classify.hs | 22 +- compiler/vectorise/Vectorise/Type/Env.hs | 14 +- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 33 +- docs/users_guide/glasgow_exts.xml | 20 + docs/users_guide/using.xml | 7 +- ghc.mk | 11 +- libffi/package.conf.in | 35 - mk/validate-settings.mk | 5 +- rts/Exception.cmm | 4 +- rts/Profiling.c | 24 +- rts/Profiling.h | 2 +- rts/RaiseAsync.c | 2 +- rts/package.conf.in | 2 + rts/win32/Ticker.c | 3 +- 125 files changed, 5729 insertions(+), 3779 deletions(-) Diff suppressed because of size. To see it, use: git show 6145e69a604c942ae5513ff5edd0a2fc44978a1b _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
