Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : overlapping-tyfams
http://hackage.haskell.org/trac/ghc/changeset/0cd7e7b8ccf0c88f3d5793b8aebef21320edae46 >--------------------------------------------------------------- commit 0cd7e7b8ccf0c88f3d5793b8aebef21320edae46 Merge: 29193cd... d3e2912... Author: Richard Eisenberg <e...@cis.upenn.edu> Date: Fri Dec 21 19:10:00 2012 -0500 Merge branch 'master' into overlapping-tyfams Conflicts: compiler/basicTypes/MkId.lhs compiler/hsSyn/Convert.lhs compiler/types/FamInstEnv.lhs compiler/basicTypes/BasicTypes.lhs | 27 +- compiler/basicTypes/DataCon.lhs | 282 +++++++------- compiler/basicTypes/DataCon.lhs-boot | 1 + compiler/basicTypes/Literal.lhs | 7 +- compiler/basicTypes/MkId.lhs | 653 +++++++++++++++++-------------- compiler/basicTypes/MkId.lhs-boot | 10 +- compiler/cmm/CmmMachOp.hs | 2 + compiler/cmm/CmmPipeline.hs | 37 +- compiler/cmm/CmmProcPoint.hs | 2 +- compiler/cmm/PprC.hs | 4 + compiler/codeGen/StgCmmPrim.hs | 6 + compiler/codeGen/StgCmmUtils.hs | 3 +- compiler/coreSyn/CoreUnfold.lhs | 3 +- compiler/coreSyn/MkCore.lhs | 4 +- compiler/coreSyn/MkExternalCore.lhs | 3 +- compiler/deSugar/Check.lhs | 2 +- compiler/deSugar/DsBinds.lhs | 2 +- compiler/deSugar/DsMeta.hs | 6 +- compiler/deSugar/DsUtils.lhs | 12 +- compiler/deSugar/MatchLit.lhs | 6 +- compiler/ghci/ByteCodeGen.lhs | 10 +- compiler/hsSyn/Convert.lhs | 364 +++++++++--------- compiler/hsSyn/HsLit.lhs | 3 +- compiler/iface/BinIface.hs | 19 +- compiler/iface/BuildTyCl.lhs | 8 +- compiler/iface/LoadIface.lhs | 24 +- compiler/iface/MkIface.lhs | 7 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 12 + compiler/main/CodeOutput.lhs | 14 +- compiler/main/DriverPipeline.hs | 43 ++- compiler/main/DynFlags.hs | 174 ++++++--- compiler/main/GHC.hs | 27 ++ compiler/main/HscMain.hs | 17 +- compiler/main/HscTypes.lhs | 4 + compiler/main/InteractiveEval.hs | 43 ++- compiler/main/PprTyThing.hs | 24 +- compiler/nativeGen/AsmCodeGen.lhs | 311 ++++++++------- compiler/nativeGen/CPrim.hs | 12 +- compiler/nativeGen/PPC/CodeGen.hs | 2 + compiler/nativeGen/PPC/Instr.hs | 575 +++++++++++++++------------- compiler/nativeGen/SPARC/CodeGen.hs | 2 + compiler/nativeGen/X86/CodeGen.hs | 13 + compiler/nativeGen/X86/Instr.hs | 2 +- compiler/parser/Lexer.x | 7 +- compiler/parser/Parser.y.pp | 23 +- compiler/parser/ParserCore.y | 2 +- compiler/prelude/PrelNames.lhs | 8 +- compiler/prelude/PrelRules.lhs | 3 +- compiler/prelude/TysPrim.lhs | 7 - compiler/prelude/TysWiredIn.lhs | 37 ++- compiler/prelude/TysWiredIn.lhs-boot | 1 + compiler/prelude/primops.txt.pp | 3 + compiler/rename/RnExpr.lhs | 2 +- compiler/simplCore/CoreMonad.lhs | 3 + compiler/stranal/WwLib.lhs | 65 +++- compiler/typecheck/TcForeign.lhs | 12 +- compiler/typecheck/TcGenGenerics.lhs | 14 +- compiler/typecheck/TcHsType.lhs | 15 +- compiler/typecheck/TcInstDcls.lhs | 13 +- compiler/typecheck/TcRnMonad.lhs | 9 + compiler/typecheck/TcRnTypes.lhs | 2 + compiler/typecheck/TcTyClsDecls.lhs | 195 +++------- compiler/typecheck/TcUnify.lhs | 79 ++-- compiler/types/Kind.lhs | 1 - compiler/types/Type.lhs | 8 +- compiler/utils/Binary.hs | 36 +- compiler/utils/BufWrite.hs | 31 +- compiler/utils/FastString.lhs | 240 ++++------- compiler/utils/Outputable.lhs | 6 +- docs/users_guide/bugs.xml | 22 +- docs/users_guide/ffi-chap.xml | 28 +- docs/users_guide/flags.xml | 15 +- docs/users_guide/ghci.xml | 5 +- docs/users_guide/glasgow_exts.xml | 120 +++--- docs/users_guide/using.xml | 47 +++ includes/Stg.h | 7 +- includes/rts/Threads.h | 3 + includes/rts/storage/ClosureMacros.h | 4 +- includes/stg/TailCalls.h | 185 --------- rts/Capability.h | 3 +- rts/Linker.c | 1 + rts/STM.c | 60 ++- sync-all | 37 +- 83 files changed, 2179 insertions(+), 1962 deletions(-) Diff suppressed because of size. To see it, use: git show 0cd7e7b8ccf0c88f3d5793b8aebef21320edae46 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
