Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/f784eb7585901e2297d504dcf777ebc58d60aaa5 >--------------------------------------------------------------- commit f784eb7585901e2297d504dcf777ebc58d60aaa5 Merge: 7655c71... a5b365a... Author: Iavor S. Diatchki <[email protected]> Date: Sat Jan 7 13:56:17 2012 -0800 Merge remote-tracking branch 'origin/master' into type-nats aclocal.m4 | 14 +- compiler/basicTypes/MkId.lhs | 13 +- compiler/basicTypes/OccName.lhs | 22 +- compiler/basicTypes/Var.lhs | 10 +- compiler/cmm/CmmCvt.hs | 2 +- compiler/cmm/CmmLint.hs | 6 +- compiler/cmm/CmmOpt.hs | 8 +- compiler/cmm/CmmParse.y | 11 +- compiler/cmm/OldCmm.hs | 163 +++--- compiler/cmm/OldPprCmm.hs | 19 +- compiler/cmm/PprC.hs | 9 +- compiler/codeGen/CgBindery.lhs | 383 ++++++------ compiler/codeGen/CgCallConv.hs | 223 +++---- compiler/codeGen/CgCase.lhs | 526 ++++++++-------- compiler/codeGen/CgClosure.lhs | 4 +- compiler/codeGen/CgCon.lhs | 4 +- compiler/codeGen/CgForeignCall.hs | 20 +- compiler/codeGen/CgHeapery.lhs | 2 +- compiler/codeGen/CgInfoTbls.hs | 2 +- compiler/codeGen/CgMonad.lhs | 726 ++++++++++----------- compiler/codeGen/CgPrimOp.hs | 175 +++--- compiler/codeGen/CgTailCall.lhs | 10 +- compiler/codeGen/CgUtils.hs | 2 +- compiler/codeGen/ClosureInfo.lhs | 12 +- compiler/codeGen/StgCmmForeign.hs | 2 +- compiler/coreSyn/CoreSyn.lhs | 4 +- compiler/deSugar/DsForeign.lhs | 2 +- compiler/ghci/RtClosureInspect.hs | 2 +- compiler/hsSyn/HsDecls.lhs | 2 +- compiler/iface/BinIface.hs | 45 +- compiler/iface/BuildTyCl.lhs | 71 +-- compiler/iface/FlagChecker.hs | 4 +- compiler/iface/IfaceSyn.lhs | 147 ++--- compiler/iface/LoadIface.lhs | 6 +- compiler/iface/MkIface.lhs | 135 +++-- compiler/iface/TcIface.lhs | 74 ++- compiler/iface/TcIface.lhs-boot | 6 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 4 +- compiler/main/GHC.hs | 8 +- compiler/main/HscMain.hs | 2 +- compiler/main/HscTypes.lhs | 63 ++- compiler/main/InteractiveEval.hs | 2 +- compiler/main/SysTools.lhs | 2 + compiler/main/TidyPgm.lhs | 2 +- compiler/nativeGen/AsmCodeGen.lhs | 4 +- compiler/nativeGen/PPC/CodeGen.hs | 11 +- compiler/nativeGen/SPARC/CodeGen.hs | 4 +- compiler/nativeGen/X86/CodeGen.hs | 13 +- compiler/rename/RnEnv.lhs | 74 ++- compiler/stgSyn/StgSyn.lhs | 591 ++++++++--------- compiler/typecheck/FamInst.lhs | 14 +- compiler/typecheck/Inst.lhs | 14 +- compiler/typecheck/TcDeriv.lhs | 19 +- compiler/typecheck/TcEnv.lhs | 25 +- compiler/typecheck/TcExpr.lhs | 9 +- compiler/typecheck/TcGenDeriv.lhs | 7 +- compiler/typecheck/TcGenGenerics.lhs | 33 +- compiler/typecheck/TcInstDcls.lhs | 166 +++--- compiler/typecheck/TcInteract.lhs | 16 +- compiler/typecheck/TcMType.lhs | 3 +- compiler/typecheck/TcPat.lhs | 3 + compiler/typecheck/TcRnDriver.lhs | 16 +- compiler/typecheck/TcRnTypes.lhs | 2 +- compiler/typecheck/TcSMonad.lhs | 5 +- compiler/typecheck/TcSplice.lhs | 31 +- compiler/typecheck/TcTyClsDecls.lhs | 15 +- compiler/types/Coercion.lhs | 70 ++- compiler/types/FamInstEnv.lhs | 250 +++++--- compiler/types/FunDeps.lhs | 12 +- compiler/types/InstEnv.lhs | 74 +- compiler/types/Kind.lhs | 2 +- compiler/types/TyCon.lhs | 147 ++--- compiler/utils/Platform.hs | 22 +- compiler/vectorise/Vectorise/Generic/PADict.hs | 7 +- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 49 +- compiler/vectorise/Vectorise/Generic/PData.hs | 59 +- compiler/vectorise/Vectorise/Monad/InstEnv.hs | 3 +- compiler/vectorise/Vectorise/Monad/Naming.hs | 30 +- compiler/vectorise/Vectorise/Type/Env.hs | 24 +- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 3 +- compiler/vectorise/Vectorise/Utils/Base.hs | 1 - compiler/vectorise/Vectorise/Utils/PADict.hs | 11 +- configure.ac | 24 +- distrib/configure.ac.in | 5 + docs/users_guide/using.xml | 12 +- ghc.mk | 2 +- ghc/InteractiveUI.hs | 6 +- includes/mkDerivedConstants.c | 26 +- includes/rts/Threads.h | 4 - includes/rts/prof/CCS.h | 16 +- includes/rts/storage/TSO.h | 2 +- includes/stg/Regs.h | 8 +- mk/config.mk.in | 11 +- rts/PrimOps.cmm | 2 +- rts/RaiseAsync.c | 4 +- rts/Schedule.c | 12 +- rts/Stats.c | 22 +- rts/StgCRun.c | 2 +- rts/Threads.c | 2 +- rts/posix/Signals.c | 28 +- settings.in | 1 + 101 files changed, 2528 insertions(+), 2449 deletions(-) diff --cc compiler/typecheck/TcInteract.lhs index e55816e,08086e4..b491e7d --- a/compiler/typecheck/TcInteract.lhs +++ b/compiler/typecheck/TcInteract.lhs @@@ -23,10 -25,8 +25,9 @@@ import Coercion( mkAxInstRHS import Id import Var - import VarEnv ( ) -- unitVarEnv, mkInScopeSet import TcType +import PrelNames (typeNatClassName) import Class import TyCon _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
