Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-lwc
http://hackage.haskell.org/trac/ghc/changeset/2527b641e6e5cd5885af4dacd1717077f527d605 >--------------------------------------------------------------- commit 2527b641e6e5cd5885af4dacd1717077f527d605 Merge: 646ec91... 05289c2... Author: KC Sivaramakrishnan <[email protected]> Date: Sat May 26 02:08:51 2012 -0400 Merging with master branch aclocal.m4 | 73 ++--- bindisttest/Makefile | 4 +- bindisttest/ghc.mk | 4 +- compiler/coreSyn/CoreUtils.lhs | 9 +- compiler/coreSyn/TrieMap.lhs | 60 +++-- compiler/deSugar/DsForeign.lhs | 25 +- compiler/deSugar/DsMeta.hs | 344 ++++++++++++++------ compiler/hsSyn/Convert.lhs | 61 +++- compiler/hsSyn/HsTypes.lhs | 29 +- compiler/main/DynFlags.hs | 48 +++- compiler/main/GhcMake.hs | 27 +- compiler/main/HscMain.hs | 8 +- compiler/main/HscTypes.lhs | 4 + compiler/main/InteractiveEval.hs | 17 +- compiler/main/Packages.lhs | 75 ++--- compiler/main/SysTools.lhs | 12 +- compiler/parser/Lexer.x | 21 +- compiler/prelude/PrelNames.lhs | 6 +- compiler/prelude/TysWiredIn.lhs | 2 +- compiler/rename/RnBinds.lhs | 16 +- compiler/rename/RnEnv.lhs | 87 ++++-- compiler/rename/RnSource.lhs | 68 +++-- compiler/typecheck/TcCanonical.lhs | 112 ++++--- compiler/typecheck/TcErrors.lhs | 41 +-- compiler/typecheck/TcHsType.lhs | 11 +- compiler/typecheck/TcInteract.lhs | 11 +- compiler/typecheck/TcMType.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 43 ++- compiler/typecheck/TcSMonad.lhs | 8 +- compiler/typecheck/TcSplice.lhs | 46 +++- compiler/typecheck/TcType.lhs | 4 +- compiler/types/FunDeps.lhs | 91 ++++-- compiler/types/TyCon.lhs | 11 + compiler/types/Unify.lhs | 50 +-- compiler/utils/Panic.lhs | 36 ++- configure.ac | 6 +- docs/users_guide/flags.xml | 92 ++++++ docs/users_guide/packages.xml | 108 +++++-- docs/users_guide/runghc.xml | 2 +- ghc.mk | 5 +- ghc/GhciMonad.hs | 3 +- ghc/InteractiveUI.hs | 5 +- ghc/ghc-bin.cabal.in | 2 +- includes/rts/Threads.h | 4 + libraries/base/Data/Bits.hs | 32 ++ libraries/base/Foreign/Ptr.hs | 3 - libraries/base/GHC/Arr.lhs | 6 + libraries/base/GHC/Base.lhs | 21 +- libraries/base/GHC/Char.hs | 2 +- libraries/base/GHC/Conc/Windows.hs | 12 +- libraries/base/GHC/Enum.lhs | 58 +++-- libraries/base/GHC/Environment.hs | 14 +- libraries/base/GHC/Event/IntMap.hs | 4 +- libraries/base/GHC/IO/Encoding/CodePage.hs | 14 +- libraries/base/GHC/IO/FD.hs | 16 +- libraries/base/GHC/Int.hs | 10 +- libraries/base/GHC/Num.lhs | 30 ++- libraries/base/GHC/Read.lhs | 3 + libraries/base/GHC/Real.lhs | 67 ++++- libraries/base/GHC/Show.lhs | 19 +- libraries/base/GHC/TypeLits.hs | 2 +- libraries/base/GHC/Unicode.hs | 46 +--- libraries/base/GHC/Word.hs | 148 +-------- libraries/base/System/CPUTime.hsc | 15 +- libraries/base/System/Environment.hs | 18 +- libraries/base/System/Posix/Internals.hs | 24 ++- libraries/base/tests/all.T | 34 +- .../Distribution/InstalledPackageInfo/Binary.hs | 4 +- libraries/time/include/HsTimeConfig.h.in | 5 +- mk/config.mk.in | 2 + packages | 1 - rts/Adjustor.c | 112 ++++--- rts/Linker.c | 3 +- rts/Prelude.h | 8 +- rts/PrimOps.cmm | 5 + rts/package.conf.in | 4 +- rts/win32/libHSbase.def | 1 - 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 | 32 ++- utils/ghc-pkg/ghc-pkg.wrapper | 2 +- utils/ghc-pkg/ghc.mk | 6 +- utils/hp2ps/Key.c | 1 + utils/runghc/runghc.hs | 12 +- validate | 7 +- 87 files changed, 1581 insertions(+), 929 deletions(-) Diff suppressed because of size. To see it, use: git show 2527b641e6e5cd5885af4dacd1717077f527d605 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
