Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/d66143f5079b1eabb76b2f62ed126b168c9a89c5 >--------------------------------------------------------------- commit d66143f5079b1eabb76b2f62ed126b168c9a89c5 Merge: 5d8c0fb... f5fe3d3... Author: Jose Pedro Magalhaes <[email protected]> Date: Wed Nov 2 09:37:57 2011 +0000 Merge branch 'ghc-kinds' of http://darcs.haskell.org/ghc into ghc-kinds README | 6 + aclocal.m4 | 265 ++++ compiler/HsVersions.h | 8 - compiler/basicTypes/BasicTypes.lhs | 2 +- compiler/basicTypes/Literal.lhs | 48 +- compiler/basicTypes/Name.lhs | 8 +- compiler/basicTypes/SrcLoc.lhs | 13 +- compiler/basicTypes/Unique.lhs | 3 +- compiler/cmm/CLabel.hs | 913 ++++++------ compiler/cmm/CmmBuildInfoTables.hs | 30 +- compiler/cmm/CmmInfo.hs | 27 +- compiler/cmm/CmmLex.x | 2 - compiler/cmm/CmmLint.hs | 113 +- compiler/cmm/CmmPipeline.hs | 9 +- compiler/cmm/CmmProcPoint.hs | 11 - compiler/cmm/CmmUtils.hs | 7 +- compiler/cmm/OldCmm.hs | 11 - compiler/cmm/OldPprCmm.hs | 100 +- compiler/cmm/PprC.hs | 280 ++-- compiler/cmm/PprCmm.hs | 83 +- compiler/cmm/PprCmmDecl.hs | 64 +- compiler/cmm/PprCmmExpr.hs | 87 +- compiler/codeGen/CgBindery.lhs | 19 +- compiler/codeGen/CgClosure.lhs | 26 +- compiler/codeGen/CgCon.lhs | 437 +++--- compiler/codeGen/CgInfoTbls.hs | 5 +- compiler/codeGen/CgPrimOp.hs | 2 +- compiler/codeGen/CgUtils.hs | 12 +- compiler/codeGen/StgCmmBind.hs | 51 +- compiler/codeGen/StgCmmClosure.hs | 21 +- compiler/codeGen/StgCmmCon.hs | 162 +- compiler/codeGen/StgCmmEnv.hs | 6 +- compiler/codeGen/StgCmmHeap.hs | 58 +- compiler/codeGen/StgCmmLayout.hs | 21 +- compiler/codeGen/StgCmmMonad.hs | 12 +- compiler/codeGen/StgCmmPrim.hs | 2 +- compiler/codeGen/StgCmmTicky.hs | 11 +- compiler/codeGen/StgCmmUtils.hs | 17 +- compiler/coreSyn/CoreArity.lhs | 34 +- compiler/coreSyn/CoreFVs.lhs | 2 +- compiler/coreSyn/CorePrep.lhs | 97 +- compiler/coreSyn/CoreSubst.lhs | 32 +- compiler/coreSyn/CoreSyn.lhs | 8 +- compiler/coreSyn/CoreUnfold.lhs | 16 +- compiler/coreSyn/CoreUtils.lhs | 538 ++++---- compiler/coreSyn/PprCore.lhs | 33 +- compiler/deSugar/Coverage.lhs | 9 +- compiler/deSugar/Desugar.lhs | 21 +- compiler/deSugar/DsCCall.lhs | 4 +- compiler/deSugar/DsForeign.lhs | 268 ++-- compiler/deSugar/DsMeta.hs | 2 +- compiler/deSugar/DsMonad.lhs | 313 +++-- compiler/deSugar/MatchCon.lhs | 11 +- compiler/ghc.cabal.in | 5 +- compiler/ghc.mk | 15 + compiler/ghci/ByteCodeLink.lhs | 136 +- compiler/ghci/Linker.lhs | 49 +- compiler/hsSyn/Convert.lhs | 10 +- compiler/hsSyn/HsBinds.lhs | 361 ++--- compiler/hsSyn/HsDecls.lhs | 551 ++++--- compiler/hsSyn/HsUtils.lhs | 2 +- compiler/iface/BinIface.hs | 223 ++- compiler/iface/IfaceEnv.lhs | 35 +- compiler/iface/IfaceSyn.lhs | 9 +- compiler/iface/IfaceType.lhs | 27 +- compiler/iface/LoadIface.lhs | 584 ++++---- compiler/iface/MkIface.lhs | 28 +- compiler/iface/TcIface.lhs | 880 +++++------ compiler/llvmGen/LlvmCodeGen.hs | 8 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 46 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 38 +- compiler/llvmGen/LlvmCodeGen/Data.hs | 10 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 6 +- compiler/main/BreakArray.hs | 107 +- compiler/main/CmdLineParser.hs | 260 ++-- compiler/main/DriverPipeline.hs | 131 +- compiler/main/DynFlags.hs | 1156 +++++++------- compiler/main/GhcMake.hs | 3 + compiler/main/GhcMonad.hs | 3 + compiler/main/HscMain.hs | 1599 +++++++++++++++++++ compiler/main/HscMain.lhs | 1603 ------------------- compiler/main/HscTypes.lhs | 918 ++++++------ compiler/main/InteractiveEval.hs | 28 +- compiler/main/Packages.lhs | 2 +- compiler/main/StaticFlagParser.hs | 78 +- compiler/main/StaticFlags.hs | 1 + compiler/main/SysTools.lhs | 17 + compiler/main/TidyPgm.lhs | 9 - compiler/nativeGen/AsmCodeGen.lhs | 61 +- compiler/nativeGen/NCG.h | 20 - compiler/nativeGen/PIC.hs | 108 +- compiler/nativeGen/PPC/CodeGen.hs | 5 +- compiler/nativeGen/PPC/Ppr.hs | 561 ++++---- compiler/nativeGen/PprBase.hs | 7 +- compiler/nativeGen/RegAlloc/Graph/Main.hs | 26 +- compiler/nativeGen/RegAlloc/Graph/Stats.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 12 + compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 7 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 3 + compiler/nativeGen/RegAlloc/Liveness.hs | 22 +- compiler/nativeGen/SPARC/Base.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 7 +- compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 3 +- compiler/nativeGen/SPARC/Ppr.hs | 276 ++-- compiler/nativeGen/TargetReg.hs | 15 + compiler/nativeGen/X86/CodeGen.hs | 98 +- compiler/nativeGen/X86/Instr.hs | 53 +- compiler/nativeGen/X86/Ppr.hs | 150 +- compiler/nativeGen/X86/RegInfo.hs | 38 +- compiler/parser/Lexer.x | 32 +- compiler/parser/Parser.y.pp | 1642 ++++++++++---------- compiler/parser/ParserCore.y | 22 +- compiler/parser/RdrHsSyn.lhs | 478 +++--- compiler/prelude/ForeignCall.lhs | 177 ++-- compiler/prelude/PrelInfo.lhs | 2 +- compiler/prelude/PrelNames.lhs | 122 ++- compiler/prelude/PrelRules.lhs | 143 ++- compiler/prelude/PrimOp.lhs | 183 ++-- compiler/prelude/TysPrim.lhs | 17 +- compiler/prelude/TysWiredIn.lhs | 11 +- compiler/prelude/primops.txt.pp | 4 +- compiler/profiling/ProfInit.hs | 9 +- compiler/profiling/SCCfinal.lhs | 5 +- compiler/rename/RnBinds.lhs | 99 +- compiler/rename/RnEnv.lhs | 99 +- compiler/rename/RnExpr.lhs | 2 +- compiler/rename/RnNames.lhs | 12 +- compiler/rename/RnSource.lhs | 83 +- compiler/rename/RnTypes.lhs | 17 +- compiler/simplCore/SetLevels.lhs | 16 +- compiler/simplCore/SimplCore.lhs | 417 +++--- compiler/simplCore/SimplMonad.lhs | 15 +- compiler/simplStg/SimplStg.lhs | 3 +- compiler/stgSyn/CoreToStg.lhs | 42 +- compiler/stgSyn/StgSyn.lhs | 25 +- compiler/typecheck/TcArrows.lhs | 29 +- compiler/typecheck/TcBinds.lhs | 143 +- compiler/typecheck/TcDeriv.lhs | 395 ++---- compiler/typecheck/TcEnv.lhs | 361 +++-- compiler/typecheck/TcExpr.lhs | 12 +- compiler/typecheck/TcForeign.lhs | 203 ++- compiler/typecheck/TcGenDeriv.lhs | 209 ++- .../Generics.lhs => typecheck/TcGenGenerics.lhs} | 171 ++- compiler/typecheck/TcHsSyn.lhs | 18 +- compiler/typecheck/TcHsType.lhs | 55 +- compiler/typecheck/TcInstDcls.lhs | 26 +- compiler/typecheck/TcMType.lhs | 72 +- compiler/typecheck/TcMatches.lhs | 1 - compiler/typecheck/TcRnDriver.lhs | 34 +- compiler/typecheck/TcRnMonad.lhs | 671 ++++---- compiler/typecheck/TcRnTypes.lhs | 48 +- compiler/typecheck/TcSMonad.lhs | 33 +- compiler/typecheck/TcTyClsDecls.lhs | 64 +- compiler/typecheck/TcTyDecls.lhs | 144 ++- compiler/typecheck/TcType.lhs | 88 +- compiler/types/FamInstEnv.lhs | 2 +- compiler/types/InstEnv.lhs | 233 ++-- compiler/types/TyCon.lhs | 6 +- compiler/utils/Binary.hs | 44 +- compiler/utils/IOEnv.hs | 4 + compiler/utils/Outputable.lhs | 19 +- compiler/utils/Platform.hs | 96 +- compiler/utils/Util.lhs | 7 +- compiler/vectorise/Vectorise.hs | 16 +- compiler/vectorise/Vectorise/Builtins.hs | 60 +- compiler/vectorise/Vectorise/Builtins/Base.hs | 274 ++-- .../vectorise/Vectorise/Builtins/Initialise.hs | 411 ++--- compiler/vectorise/Vectorise/Builtins/Modules.hs | 60 - compiler/vectorise/Vectorise/Env.hs | 55 +- compiler/vectorise/Vectorise/Monad.hs | 79 +- compiler/vectorise/Vectorise/Monad/Global.hs | 2 - compiler/vectorise/Vectorise/Monad/InstEnv.hs | 29 +- compiler/vectorise/Vectorise/Type/Env.hs | 101 +- compiler/vectorise/Vectorise/Type/PData.hs | 6 +- compiler/vectorise/Vectorise/Utils.hs | 44 +- compiler/vectorise/Vectorise/Utils/Base.hs | 68 +- compiler/vectorise/Vectorise/Utils/Closure.hs | 48 +- compiler/vectorise/Vectorise/Utils/PADict.hs | 32 +- configure.ac | 152 +-- distrib/configure.ac.in | 5 + docs/users_guide/bugs.xml | 84 +- docs/users_guide/flags.xml | 178 ++- docs/users_guide/ghci.xml | 195 ++- docs/users_guide/glasgow_exts.xml | 62 +- docs/users_guide/runghc.xml | 4 +- docs/users_guide/runtime_control.xml | 38 +- docs/users_guide/using.xml | 92 +- driver/ordering-passes | 257 --- driver/test_mangler | 29 - ghc.mk | 27 +- ghc/GhciMonad.hs | 2 +- ghc/InteractiveUI.hs | 39 +- ghc/Main.hs | 44 +- includes/Stg.h | 2 - includes/rts/EventLogFormat.h | 5 +- includes/rts/Flags.h | 1 + includes/rts/storage/GC.h | 4 +- includes/stg/ArchSpecific.h | 30 - libffi/ghc.mk | 215 +-- libffi/libffi.selinux-detection-3.0.8.patch | 15 - libraries/gen_contents_index | 32 +- libraries/tarballs/time-1.2.0.5.tar.gz | Bin 86557 -> 0 bytes libraries/tarballs/time-1.4.tar.gz | Bin 0 -> 87054 bytes mk/config.mk.in | 27 +- mk/validate-settings.mk | 4 +- rts/Capability.c | 35 +- rts/GetTime.h | 5 + rts/RtsFlags.c | 159 ++- rts/RtsStartup.c | 1 + rts/Trace.c | 46 +- rts/Trace.h | 27 +- rts/eventlog/EventLog.c | 66 +- rts/eventlog/EventLog.h | 10 +- rts/ghc.mk | 62 +- rts/hooks/RtsOptsEnabled.c | 13 - rts/package.conf.in | 1 - rts/posix/GetTime.c | 16 + rts/sm/Storage.c | 141 ++- rts/win32/GetTime.c | 64 +- rules/distdir-way-opts.mk | 83 +- rules/haddock.mk | 4 +- settings.in | 7 +- utils/genprimopcode/Main.hs | 1 + utils/ghc-cabal/ghc.mk | 10 +- utils/ghc-pkg/ghc.mk | 2 +- utils/ghctags/Main.hs | 2 +- utils/hpc/HpcMarkup.hs | 2 +- 227 files changed, 13135 insertions(+), 12069 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
