Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/dd96a196e4719d04ba78675069e93d01a50b7b33 >--------------------------------------------------------------- commit dd96a196e4719d04ba78675069e93d01a50b7b33 Merge: e3e5cce... 353c15e... Author: David Terei <[email protected]> Date: Mon Aug 1 13:37:13 2011 -0700 Merge branch 'master' of ssh://darcs.haskell.org/home/darcs/ghc compiler/HsVersions.h | 14 +- compiler/basicTypes/NameEnv.lhs | 4 +- compiler/basicTypes/Unique.lhs | 3 + compiler/basicTypes/Var.lhs | 3 +- compiler/basicTypes/VarEnv.lhs | 16 +- compiler/basicTypes/VarSet.lhs | 5 +- compiler/cmm/CLabel.hs | 80 ++-- compiler/cmm/CmmDecl.hs | 7 +- compiler/cmm/CmmInfo.hs | 13 +- compiler/cmm/CmmParse.y | 14 +- compiler/cmm/CmmProcPoint.hs | 53 +- compiler/codeGen/CgHeapery.lhs | 7 +- compiler/codeGen/CgInfoTbls.hs | 15 +- compiler/codeGen/CgUtils.hs | 8 +- compiler/codeGen/ClosureInfo.lhs | 71 ++- compiler/codeGen/StgCmmClosure.hs | 52 +- compiler/codeGen/StgCmmLayout.hs | 6 +- compiler/coreSyn/CoreLint.lhs | 2 +- compiler/coreSyn/CorePrep.lhs | 5 +- compiler/coreSyn/CoreSubst.lhs | 16 +- compiler/coreSyn/CoreSyn.lhs | 210 ++++--- compiler/coreSyn/CoreUnfold.lhs | 170 +++--- compiler/coreSyn/TrieMap.lhs | 602 ++++++++++++++++++ compiler/ghc.cabal.in | 1 + compiler/ghci/Linker.lhs | 56 ++- compiler/ghci/keepCAFsForGHCi.c | 4 +- compiler/hsSyn/Convert.lhs | 163 ++++- compiler/hsSyn/HsExpr.lhs | 85 ++- compiler/hsSyn/HsPat.lhs | 39 +- compiler/hsSyn/HsTypes.lhs | 6 +- compiler/hsSyn/HsUtils.lhs | 60 ++- compiler/iface/IfaceType.lhs | 11 +- compiler/main/DriverPipeline.hs | 11 + compiler/main/GhcMake.hs | 67 +-- compiler/main/HeaderInfo.hs | 14 +- compiler/main/HscMain.lhs | 9 +- compiler/main/StaticFlags.hs | 24 +- compiler/parser/Parser.y.pp | 2 +- compiler/prelude/PrelNames.lhs | 1233 +++++++++++++++++++------------------ compiler/prelude/PrelRules.lhs | 137 ++++- compiler/prelude/TysWiredIn.lhs | 19 + compiler/rename/RnNames.lhs | 16 +- compiler/simplCore/CSE.lhs | 120 +++- compiler/simplCore/CoreMonad.lhs | 75 ++- compiler/simplCore/FloatOut.lhs | 49 ++- compiler/simplCore/OccurAnal.lhs | 98 ++-- compiler/simplCore/SimplCore.lhs | 44 -- compiler/simplCore/SimplEnv.lhs | 6 +- compiler/stgSyn/StgLint.lhs | 191 ++++--- compiler/typecheck/TcDeriv.lhs | 22 +- compiler/typecheck/TcErrors.lhs | 95 ++-- compiler/typecheck/TcGenDeriv.lhs | 9 +- compiler/typecheck/TcInteract.lhs | 65 +- compiler/typecheck/TcMType.lhs | 38 +- compiler/typecheck/TcRnDriver.lhs | 21 +- compiler/typecheck/TcRnMonad.lhs | 4 - compiler/typecheck/TcSimplify.lhs | 5 +- compiler/typecheck/TcType.lhs | 22 +- compiler/types/Coercion.lhs | 117 ++-- compiler/types/OptCoercion.lhs | 10 +- compiler/types/Type.lhs | 55 ++- compiler/types/TypeRep.lhs | 6 +- compiler/utils/Digraph.lhs | 85 +++- compiler/utils/Fingerprint.hsc | 18 +- compiler/utils/FiniteMap.lhs | 1 + compiler/utils/Outputable.lhs | 3 + compiler/utils/UniqFM.lhs | 11 +- compiler/utils/Util.lhs | 16 +- configure.ac | 46 +- distrib/configure.ac.in | 31 +- docs/users_guide/glasgow_exts.xml | 98 ++- ghc.mk | 8 +- includes/rts/storage/GC.h | 44 ++ mk/validate-settings.mk | 5 + rts/Linker.c | 1 + rts/ProfHeap.c | 4 +- rts/ProfHeap.h | 4 +- rts/RtsFlags.c | 5 + rts/Stats.c | 97 +++- rts/Stats.h | 2 +- rts/Trace.h | 2 +- rts/hooks/OnExit.c | 2 +- rts/posix/OSThreads.c | 6 +- rts/sm/GC.c | 2 +- utils/ghc-cabal/ghc.mk | 3 +- utils/hp2ps/AreaBelow.c | 2 +- utils/hp2ps/AuxFile.c | 12 +- utils/hp2ps/Axes.c | 18 +- utils/hp2ps/Curves.c | 25 +- utils/hp2ps/Deviation.c | 5 +- utils/hp2ps/Dimensions.c | 7 +- utils/hp2ps/Error.c | 3 +- utils/hp2ps/HpFile.c | 40 +- utils/hp2ps/Key.c | 5 +- utils/hp2ps/Main.c | 13 +- utils/hp2ps/Marks.c | 5 +- utils/hp2ps/PsFile.c | 35 +- utils/hp2ps/Reorder.c | 9 +- utils/hp2ps/Scale.c | 4 +- utils/hp2ps/Shade.c | 16 +- utils/hp2ps/TopTwenty.c | 2 +- utils/hp2ps/TraceElement.c | 2 +- utils/hp2ps/Utilities.c | 26 +- utils/runghc/runghc.hs | 1 - utils/unlit/unlit.c | 6 +- validate | 1 + 106 files changed, 3277 insertions(+), 1839 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
