Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8212e0d3e8c3edc90da3f349643cbcdb0a539d3c >--------------------------------------------------------------- commit 8212e0d3e8c3edc90da3f349643cbcdb0a539d3c Merge: 034b5e9... bcfa64a... Author: Simon Peyton Jones <[email protected]> Date: Tue Aug 2 18:04:22 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/RdrName.lhs | 34 ++++-- compiler/cmm/PprC.hs | 7 + compiler/ghci/ByteCodeAsm.lhs | 7 + compiler/hsSyn/HsImpExp.lhs | 12 ++- compiler/iface/MkIface.lhs | 2 +- compiler/main/GHC.hs | 2 +- compiler/main/HeaderInfo.hs | 22 ++-- compiler/main/HscMain.lhs | 4 +- compiler/main/HscStats.lhs | 3 +- compiler/main/HscTypes.lhs | 29 +++-- compiler/main/InteractiveEval.hs | 53 +++++---- compiler/nativeGen/PprBase.hs | 7 + compiler/parser/Parser.y.pp | 6 +- compiler/rename/RnNames.lhs | 65 +++++------- compiler/typecheck/TcInteract.lhs | 2 + compiler/typecheck/TcRnDriver.lhs | 22 +++- compiler/utils/ListSetOps.lhs | 21 ++++- ghc/InteractiveUI.hs | 222 ++++++++++++++++++++----------------- 18 files changed, 311 insertions(+), 209 deletions(-) diff --cc compiler/rename/RnNames.lhs index ab4c1d0,0d7e52f..9e09751 --- a/compiler/rename/RnNames.lhs +++ b/compiler/rename/RnNames.lhs @@@ -18,10 -18,9 +18,8 @@@ import HsSy import TcEnv ( isBrackStage ) import RnEnv import RnHsDoc ( rnHsDoc ) -import IfaceEnv ( ifaceExportNames ) import LoadIface ( loadSrcInterface ) import TcRnMonad - - import HeaderInfo ( mkPrelImports ) import PrelNames import Module import Name _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
