Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/b03bc4a894ca41f955ac553de785543bcd2d9091 >--------------------------------------------------------------- commit b03bc4a894ca41f955ac553de785543bcd2d9091 Merge: 0ff5f40... 8366792... Author: Iavor S. Diatchki <iavor.diatc...@gmail.com> Date: Sat Dec 22 17:39:07 2012 -0800 Merge remote-tracking branch 'origin/master' into type-nats Conflicts: compiler/coreSyn/TrieMap.lhs compiler/iface/IfaceSyn.lhs compiler/iface/IfaceType.lhs compiler/iface/TcIface.lhs compiler/prelude/PrelNames.lhs compiler/prelude/TysPrim.lhs compiler/prelude/TysWiredIn.lhs compiler/typecheck/TcEvidence.lhs compiler/types/Type.lhs compiler/types/TypeRep.lhs .gitignore | 1 - .gitmodules | 3 + aclocal.m4 | 2 +- boot | 43 -- compiler/basicTypes/BasicTypes.lhs | 27 +- compiler/basicTypes/DataCon.lhs | 290 ++++---- compiler/basicTypes/DataCon.lhs-boot | 1 + compiler/basicTypes/Literal.lhs | 7 +- compiler/basicTypes/MkId.lhs | 686 ++++++++++-------- compiler/basicTypes/MkId.lhs-boot | 10 +- compiler/cmm/CmmMachOp.hs | 2 + compiler/cmm/CmmPipeline.hs | 56 +- compiler/cmm/CmmProcPoint.hs | 2 +- compiler/cmm/PprC.hs | 4 + compiler/codeGen/StgCmmPrim.hs | 6 + compiler/codeGen/StgCmmUtils.hs | 3 +- compiler/coreSyn/CoreLint.lhs | 59 ++- compiler/coreSyn/CoreUnfold.lhs | 3 +- compiler/coreSyn/ExternalCore.lhs | 1 + compiler/coreSyn/MkCore.lhs | 4 +- compiler/coreSyn/MkExternalCore.lhs | 8 +- compiler/coreSyn/TrieMap.lhs | 63 +- compiler/deSugar/Check.lhs | 2 +- compiler/deSugar/DsBinds.lhs | 5 +- compiler/deSugar/DsMeta.hs | 167 +++-- compiler/deSugar/DsUtils.lhs | 12 +- compiler/deSugar/MatchLit.lhs | 6 +- compiler/ghc.cabal.in | 11 +- compiler/ghc.mk | 20 +- compiler/ghci/ByteCodeGen.lhs | 10 +- compiler/ghci/keepCAFsForGHCi.c | 5 +- compiler/hsSyn/Convert.lhs | 460 ++++++------ compiler/hsSyn/HsDecls.lhs | 466 +++++++----- compiler/hsSyn/HsLit.lhs | 3 +- compiler/hsSyn/HsUtils.lhs | 31 +- compiler/iface/BinIface.hs | 46 +- compiler/iface/BuildTyCl.lhs | 8 +- compiler/iface/IfaceSyn.lhs | 58 +- compiler/iface/IfaceType.lhs | 83 +-- compiler/iface/LoadIface.lhs | 210 ++++--- compiler/iface/MkIface.lhs | 50 +- compiler/iface/TcIface.lhs | 60 +- compiler/iface/TcIface.lhs-boot | 4 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 12 + compiler/main/CodeOutput.lhs | 17 +- compiler/main/DriverPipeline.hs | 169 +++-- compiler/main/DynFlags.hs | 201 ++++-- compiler/main/DynamicLoading.hs | 7 +- compiler/main/GHC.hs | 31 +- compiler/main/HscMain.hs | 17 +- compiler/main/HscStats.hs | 19 +- compiler/main/HscStats.lhs | 6 +- compiler/main/HscTypes.lhs | 29 +- compiler/main/InteractiveEval.hs | 43 +- compiler/main/PprTyThing.hs | 24 +- compiler/main/TidyPgm.lhs | 209 +++--- 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 | 95 ++- compiler/parser/ParserCore.y | 22 +- compiler/parser/RdrHsSyn.lhs | 116 ++-- compiler/prelude/PrelNames.lhs | 8 +- compiler/prelude/PrelRules.lhs | 3 +- compiler/prelude/TysPrim.lhs | 17 +- compiler/prelude/TysWiredIn.lhs | 37 +- compiler/prelude/TysWiredIn.lhs-boot | 1 + compiler/prelude/primops.txt.pp | 3 + compiler/rename/RnExpr.lhs | 2 +- compiler/rename/RnNames.lhs | 61 +- compiler/rename/RnSource.lhs | 254 +++++--- compiler/rename/RnTypes.lhs | 10 +- compiler/simplCore/CoreMonad.lhs | 3 + compiler/stranal/WwLib.lhs | 65 ++- compiler/typecheck/FamInst.lhs | 135 +++- compiler/typecheck/TcBinds.lhs | 2 +- compiler/typecheck/TcClassDcl.lhs | 11 +- compiler/typecheck/TcDeriv.lhs | 41 +- compiler/typecheck/TcEnv.lhs | 18 +- compiler/typecheck/TcEvidence.lhs | 37 +- compiler/typecheck/TcExpr.lhs | 12 +- compiler/typecheck/TcForeign.lhs | 14 +- compiler/typecheck/TcGenDeriv.lhs | 7 +- compiler/typecheck/TcGenGenerics.lhs | 25 +- compiler/typecheck/TcHsSyn.lhs | 3 +- compiler/typecheck/TcHsType.lhs | 15 +- compiler/typecheck/TcInstDcls.lhs | 190 ++++-- compiler/typecheck/TcInteract.lhs | 8 +- compiler/typecheck/TcPat.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 21 +- compiler/typecheck/TcRnMonad.lhs | 9 + compiler/typecheck/TcRnTypes.lhs | 7 +- compiler/typecheck/TcSMonad.lhs | 2 +- compiler/typecheck/TcSplice.lhs | 50 +- compiler/typecheck/TcTyClsDecls.lhs | 555 ++++++++------- compiler/typecheck/TcTyDecls.lhs | 2 +- compiler/typecheck/TcType.lhs | 32 +- compiler/typecheck/TcTypeNatsRules.hs | 5 +- compiler/typecheck/TcUnify.lhs | 79 +- compiler/types/Class.lhs | 2 +- compiler/types/CoAxiom.lhs | 292 ++++++++ compiler/types/Coercion.lhs | 128 ++-- compiler/types/FamInstEnv.lhs | 790 +++++++++++++++------ compiler/types/Kind.lhs | 1 - compiler/types/OptCoercion.lhs | 52 +- compiler/types/TyCon.lhs | 118 +--- compiler/types/Type.lhs | 25 +- compiler/types/TypeRep.lhs | 3 +- compiler/types/Unify.lhs | 168 +++-- compiler/utils/Binary.hs | 36 +- compiler/utils/BufWrite.hs | 31 +- compiler/utils/FastString.lhs | 240 +++---- compiler/utils/Outputable.lhs | 6 +- compiler/vectorise/Vectorise.hs | 3 +- compiler/vectorise/Vectorise/Env.hs | 2 +- compiler/vectorise/Vectorise/Generic/PADict.hs | 4 +- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 20 +- compiler/vectorise/Vectorise/Generic/PData.hs | 6 +- compiler/vectorise/Vectorise/Monad/InstEnv.hs | 4 +- compiler/vectorise/Vectorise/Type/Env.hs | 15 +- compiler/vectorise/Vectorise/Utils/Base.hs | 16 +- compiler/vectorise/Vectorise/Utils/PADict.hs | 11 +- configure.ac | 118 ++-- docs/core-spec/CoreLint.ott | 36 +- docs/core-spec/CoreSyn.ott | 37 +- docs/core-spec/core-spec.mng | 21 +- docs/core-spec/core-spec.pdf | Bin 303537 -> 308357 bytes 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 | 263 +++++--- docs/users_guide/using.xml | 47 ++ ghc/InteractiveUI.hs | 2 +- includes/Stg.h | 7 +- includes/rts/Threads.h | 3 + includes/rts/storage/ClosureMacros.h | 4 +- includes/stg/TailCalls.h | 185 ----- libraries/haskeline | 2 +- libraries/tarballs/time-1.4.0.1.tar.gz | Bin 87466 -> 0 bytes libraries/time | 1 + packages | 24 +- rts/Capability.h | 3 +- rts/Linker.c | 1 + rts/STM.c | 60 ++- rts/posix/OSThreads.c | 3 +- sync-all | 73 ++- 152 files changed, 5702 insertions(+), 3916 deletions(-) Diff suppressed because of size. To see it, use: git show b03bc4a894ca41f955ac553de785543bcd2d9091 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
