Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/7b5b3b0cab463e108a0132435a28ef19d17cb32b >--------------------------------------------------------------- commit 7b5b3b0cab463e108a0132435a28ef19d17cb32b Merge: 9992bfb... 0b43244... Author: Simon Peyton Jones <[email protected]> Date: Fri Jun 10 19:54:49 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/Name.lhs | 14 ++- compiler/basicTypes/RdrName.lhs | 10 +- compiler/basicTypes/SrcLoc.lhs | 229 +++++++++++++++++++++++--------------- compiler/cmm/CmmLex.x | 20 ++-- compiler/cmm/CmmParse.y | 2 +- compiler/coreSyn/CoreFVs.lhs | 55 ++++++---- compiler/coreSyn/CoreSubst.lhs | 34 ++++-- compiler/deSugar/Coverage.lhs | 26 ++--- compiler/deSugar/Desugar.lhs | 33 +++--- compiler/hsSyn/HsImpExp.lhs | 2 +- compiler/hsSyn/HsSyn.lhs | 2 +- compiler/main/GHC.hs | 70 +++++++------ compiler/main/HeaderInfo.hs | 10 +- compiler/main/HscMain.lhs | 4 +- compiler/main/HscTypes.lhs | 2 +- compiler/main/Packages.lhs | 38 ++++--- compiler/parser/Lexer.x | 143 ++++++++++++------------ compiler/parser/Parser.y.pp | 6 +- compiler/rename/RnEnv.lhs | 6 +- compiler/rename/RnHsDoc.hs | 2 +- compiler/rename/RnHsSyn.lhs | 2 +- compiler/rename/RnNames.lhs | 4 +- compiler/simplCore/OccurAnal.lhs | 9 +- compiler/simplCore/SimplCore.lhs | 2 +- compiler/typecheck/TcBinds.lhs | 10 +- compiler/typecheck/TcRnMonad.lhs | 30 +++-- compiler/typecheck/TcSplice.lhs | 16 ++- ghc/GhciTags.hs | 6 +- ghc/InteractiveUI.hs | 78 ++++++++----- utils/ghc-pkg/Main.hs | 41 ++++--- utils/ghctags/Main.hs | 9 +- 31 files changed, 517 insertions(+), 398 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
