[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (9429d79)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/9429d79454cb89e49908bb21bca783c2ad8e02e8 >--------------------------------------------------------------- commit 9429d79454cb89e49908bb21bca783c2ad8e02e8 Merge: be5cc2e... 3394d49... Author: Simon Peyton Jones <[email protected]> Date: Wed Dec 19 23:50:38 2012 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/BasicTypes.lhs | 27 +- compiler/basicTypes/DataCon.lhs | 277 +++++++------- compiler/basicTypes/DataCon.lhs-boot | 3 +- compiler/basicTypes/MkId.lhs | 653 +++++++++++++++++++--------------- compiler/basicTypes/MkId.lhs-boot | 10 +- compiler/deSugar/DsMeta.hs | 6 +- compiler/deSugar/DsUtils.lhs | 12 +- compiler/hsSyn/Convert.lhs | 4 +- compiler/iface/BinIface.hs | 19 +- compiler/iface/BuildTyCl.lhs | 8 +- compiler/iface/MkIface.lhs | 2 +- compiler/main/DynFlags.hs | 4 +- compiler/main/PprTyThing.hs | 24 +- compiler/parser/Parser.y.pp | 6 +- compiler/prelude/PrelNames.lhs | 8 +- compiler/prelude/TysPrim.lhs | 7 - compiler/prelude/TysWiredIn.lhs | 37 ++- compiler/prelude/TysWiredIn.lhs-boot | 1 + compiler/stranal/WwLib.lhs | 65 ++++- compiler/typecheck/TcForeign.lhs | 12 +- compiler/typecheck/TcHsType.lhs | 15 +- compiler/typecheck/TcInstDcls.lhs | 11 +- compiler/typecheck/TcTyClsDecls.lhs | 243 +++---------- compiler/types/FamInstEnv.lhs | 4 +- compiler/types/Kind.lhs | 1 - compiler/types/TyCon.lhs | 37 +-- compiler/types/Type.lhs | 8 +- docs/users_guide/flags.xml | 11 +- docs/users_guide/ghci.xml | 5 +- docs/users_guide/glasgow_exts.xml | 104 +++--- docs/users_guide/using.xml | 10 +- includes/rts/storage/ClosureMacros.h | 4 +- rts/STM.c | 84 +++-- 33 files changed, 858 insertions(+), 864 deletions(-)