[commit: ghc] new-typeable: Merge branch 'master', remote-tracking branch 'origin' into new-typeable (959fb56)
José Pedro Magalhães <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : new-typeable http://hackage.haskell.org/trac/ghc/changeset/959fb56c668fd87229f8edf492d16f6180a5f63b >--------------------------------------------------------------- commit 959fb56c668fd87229f8edf492d16f6180a5f63b Merge: 334b686... 31d771b... Author: Jose Pedro Magalhaes <[email protected]> Date: Mon Dec 3 09:34:32 2012 +0000 Merge branch 'master', remote-tracking branch 'origin' into new-typeable .gitignore | 1 - .gitmodules | 3 + boot | 43 ---- compiler/cmm/CmmPipeline.hs | 19 ++- compiler/coreSyn/CoreLint.lhs | 55 ++++- compiler/coreSyn/CoreSyn.lhs | 20 ++ compiler/ghc.cabal.in | 2 +- compiler/ghc.mk | 3 + compiler/ghci/ByteCodeGen.lhs | 2 +- compiler/ghci/ByteCodeLink.lhs | 2 +- compiler/ghci/LibFFI.hsc | 34 +-- compiler/ghci/Linker.lhs | 26 +- compiler/iface/BinIface.hs | 2 +- compiler/iface/IfaceSyn.lhs | 2 +- compiler/iface/LoadIface.lhs | 2 +- compiler/iface/MkIface.lhs | 2 +- compiler/main/DriverMkDepend.hs | 4 +- compiler/main/DriverPipeline.hs | 6 +- compiler/main/DynFlags.hs | 8 +- compiler/main/GHC.hs | 2 +- compiler/main/GhcMake.hs | 19 +- compiler/main/InteractiveEval.hs | 20 +- compiler/main/Packages.lhs | 12 +- compiler/main/StaticFlagParser.hs | 6 +- compiler/main/StaticFlags.hs | 2 +- compiler/main/SysTools.lhs | 8 +- compiler/parser/Parser.y.pp | 1 + compiler/prelude/TysPrim.lhs | 2 + compiler/types/Coercion.lhs | 4 + compiler/types/Kind.lhs | 5 + compiler/types/TyCon.lhs | 6 + compiler/types/Type.lhs | 2 + compiler/types/TypeRep.lhs | 3 + compiler/utils/Panic.lhs | 6 +- configure.ac | 59 +++++- docs/core-spec/.gitignore | 5 + docs/core-spec/CoreLint.ott | 400 ++++++++++++++++++++++++++++++++ docs/core-spec/CoreSyn.ott | 283 ++++++++++++++++++++++ docs/core-spec/Makefile | 17 ++ docs/core-spec/README | 83 +++++++ docs/core-spec/core-spec.mng | 306 ++++++++++++++++++++++++ docs/core-spec/core-spec.pdf | Bin 0 -> 303537 bytes ghc.mk | 3 +- ghc/GhciTags.hs | 8 +- ghc/InteractiveUI.hs | 68 +++--- ghc/Main.hs | 18 +- ghc/ghc-bin.cabal.in | 2 +- libraries/Cabal | 2 +- libraries/haskeline | 2 +- libraries/tarballs/time-1.4.0.1.tar.gz | Bin 87466 -> 0 bytes libraries/time | 1 + mk/config.mk.in | 8 +- packages | 24 +- rts/ghc.mk | 53 ++++- rts/package.conf.in | 3 + rts/posix/OSThreads.c | 3 +- sync-all | 36 +++- utils/ghc-pkg/Main.hs | 11 +- utils/ghc-pkg/ghc-pkg.cabal | 2 +- utils/runghc/runghc.cabal.in | 2 +- 60 files changed, 1515 insertions(+), 218 deletions(-)