Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/5ccb43f3306bb0907948d97ea6bffe9f70c69554 >--------------------------------------------------------------- commit 5ccb43f3306bb0907948d97ea6bffe9f70c69554 Merge: 59e1f06... 921530b... Author: Ian Lynagh <[email protected]> Date: Tue May 15 18:18:19 2012 +0100 Merge branch 'master' of http://darcs.haskell.org//ghc aclocal.m4 | 2 +- bindisttest/Makefile | 4 +- bindisttest/ghc.mk | 4 +- compiler/coreSyn/CoreSyn.lhs | 12 +- compiler/coreSyn/CoreUnfold.lhs | 178 ++---- compiler/coreSyn/CoreUtils.lhs | 74 ++- compiler/coreSyn/PprCore.lhs | 4 +- compiler/deSugar/DsBinds.lhs | 108 ++-- compiler/deSugar/DsMeta.hs | 43 +- compiler/ghci/ByteCodeGen.lhs | 3 + compiler/hsSyn/Convert.lhs | 22 +- compiler/hsSyn/HsDecls.lhs | 32 +- compiler/hsSyn/HsPat.lhs | 4 +- compiler/hsSyn/HsTypes.lhs | 124 ++-- compiler/hsSyn/HsUtils.lhs | 5 +- compiler/main/DynFlags.hs | 44 +- compiler/main/HscMain.hs | 8 +- compiler/main/HscTypes.lhs | 4 + compiler/main/InteractiveEval.hs | 17 +- compiler/main/Packages.lhs | 75 +-- compiler/parser/Lexer.x | 21 +- compiler/parser/Parser.y.pp | 8 +- compiler/parser/ParserCore.y | 10 +- compiler/parser/RdrHsSyn.lhs | 25 +- compiler/rename/RnBinds.lhs | 2 +- compiler/rename/RnEnv.lhs | 17 +- compiler/rename/RnPat.lhs | 4 +- compiler/rename/RnSource.lhs | 81 +-- compiler/rename/RnTypes.lhs | 264 +++++--- compiler/simplCore/SimplUtils.lhs | 130 ++-- compiler/simplCore/Simplify.lhs | 83 ++-- compiler/typecheck/Inst.lhs | 72 +-- compiler/typecheck/TcBinds.lhs | 59 ++- compiler/typecheck/TcCanonical.lhs | 252 ++++---- compiler/typecheck/TcErrors.lhs | 48 +- compiler/typecheck/TcEvidence.lhs | 99 ++- compiler/typecheck/TcHsSyn.lhs | 29 +- compiler/typecheck/TcHsType.lhs | 41 +- compiler/typecheck/TcInstDcls.lhs | 4 +- compiler/typecheck/TcInteract.lhs | 367 +++++------ compiler/typecheck/TcMType.lhs | 29 +- compiler/typecheck/TcRnDriver.lhs | 38 +- compiler/typecheck/TcRnTypes.lhs | 173 +++--- compiler/typecheck/TcSMonad.lhs | 670 +++++++++++-------- compiler/typecheck/TcSimplify.lhs | 50 +- compiler/typecheck/TcTyClsDecls.lhs | 31 +- compiler/typecheck/TcUnify.lhs | 4 +- compiler/types/Coercion.lhs | 14 +- compiler/types/FunDeps.lhs | 4 + compiler/types/TyCon.lhs | 6 - compiler/types/Type.lhs | 17 +- compiler/types/Unify.lhs | 50 +- configure.ac | 4 + docs/users_guide/flags.xml | 32 +- docs/users_guide/packages.xml | 108 +++- docs/users_guide/runghc.xml | 2 +- ghc.mk | 2 +- ghc/InteractiveUI.hs | 2 +- .../Distribution/InstalledPackageInfo/Binary.hs | 4 +- mk/config.mk.in | 2 + rules/distdir-way-opts.mk | 2 +- rules/package-config.mk | 8 +- utils/ghc-cabal/Main.hs | 2 +- utils/ghc-cabal/ghc.mk | 2 +- utils/ghc-pkg/Main.hs | 20 +- utils/ghc-pkg/ghc-pkg.wrapper | 2 +- utils/ghc-pkg/ghc.mk | 6 +- 67 files changed, 2014 insertions(+), 1653 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
