Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : new-typeable

http://hackage.haskell.org/trac/ghc/changeset/bbdc65acb9200ff92968dda5abcece7b9ee0834d

>---------------------------------------------------------------

commit bbdc65acb9200ff92968dda5abcece7b9ee0834d
Merge: ecbae6e... 05a9786...
Author: Jose Pedro Magalhaes <j...@cs.ox.ac.uk>
Date:   Wed Oct 3 09:02:11 2012 +0100

    Merge branch 'master' into new-typeable

 compiler/basicTypes/BasicTypes.lhs   |   26 +
 compiler/basicTypes/DataCon.lhs      |    6 +-
 compiler/basicTypes/DataCon.lhs-boot |    2 +
 compiler/basicTypes/IdInfo.lhs       |    2 +-
 compiler/basicTypes/MkId.lhs         |    9 +-
 compiler/basicTypes/Name.lhs         |    7 +-
 compiler/basicTypes/VarEnv.lhs       |    3 +
 compiler/codeGen/StgCmmExpr.hs       |    4 +-
 compiler/codeGen/StgCmmHeap.hs       |   57 +-
 compiler/coreSyn/CoreLint.lhs        |   13 +
 compiler/coreSyn/ExternalCore.lhs    |    3 +
 compiler/coreSyn/MkExternalCore.lhs  |    5 +
 compiler/coreSyn/PprExternalCore.lhs |    4 +
 compiler/coreSyn/TrieMap.lhs         |   22 +-
 compiler/deSugar/Check.lhs           |    2 +-
 compiler/deSugar/Coverage.lhs        |    1 +
 compiler/deSugar/DsBinds.lhs         |   10 +-
 compiler/deSugar/DsExpr.lhs          |    2 +
 compiler/hsSyn/HsExpr.lhs            |    3 +
 compiler/iface/BinIface.hs           |   26 +-
 compiler/iface/BuildTyCl.lhs         |    2 +-
 compiler/iface/IfaceSyn.lhs          |   15 +-
 compiler/iface/IfaceType.lhs         |    5 +-
 compiler/iface/MkIface.lhs           |   18 +-
 compiler/iface/TcIface.lhs           |    7 +-
 compiler/main/DynFlags.hs            |    8 +-
 compiler/main/GHC.hs                 |    2 +-
 compiler/main/PprTyThing.hs          |   14 +-
 compiler/main/StaticFlagParser.hs    |    4 +-
 compiler/main/StaticFlags.hs         |    4 +
 compiler/parser/Lexer.x              |    5 -
 compiler/prelude/TysPrim.lhs         |   19 +-
 compiler/rename/RnExpr.lhs           |   14 +-
 compiler/stgSyn/CoreToStg.lhs        |    2 +-
 compiler/typecheck/FamInst.lhs       |    5 +-
 compiler/typecheck/Inst.lhs          |  169 ++----
 compiler/typecheck/TcArrows.lhs      |   40 +-
 compiler/typecheck/TcBinds.lhs       |   95 ++--
 compiler/typecheck/TcCanonical.lhs   |  869 +++++++++++-------------
 compiler/typecheck/TcClassDcl.lhs    |   27 +-
 compiler/typecheck/TcEnv.lhs         |   21 +-
 compiler/typecheck/TcErrors.lhs      |  915 +++++++++++++------------
 compiler/typecheck/TcEvidence.lhs    |   47 +-
 compiler/typecheck/TcExpr.lhs        |   33 +-
 compiler/typecheck/TcHsSyn.lhs       |   75 +--
 compiler/typecheck/TcHsType.lhs      |  138 +++--
 compiler/typecheck/TcInstDcls.lhs    |   74 ++-
 compiler/typecheck/TcInteract.lhs    |  829 +++++++++++------------
 compiler/typecheck/TcMType.lhs       |  226 +++++--
 compiler/typecheck/TcRnDriver.lhs    |   82 +--
 compiler/typecheck/TcRnMonad.lhs     |   83 ++-
 compiler/typecheck/TcRnTypes.lhs     |  392 ++++++------
 compiler/typecheck/TcRules.lhs       |   42 +-
 compiler/typecheck/TcSMonad.lhs      | 1237 +++++++++++++++++-----------------
 compiler/typecheck/TcSimplify.lhs    | 1058 +++++++++++-------------------
 compiler/typecheck/TcSplice.lhs      |   27 +-
 compiler/typecheck/TcTyClsDecls.lhs  |   16 +-
 compiler/typecheck/TcTyDecls.lhs     |   16 +-
 compiler/typecheck/TcType.lhs        |  194 ++++--
 compiler/typecheck/TcUnify.lhs       |  336 ++++------
 compiler/typecheck/TcUnify.lhs-boot  |    3 +-
 compiler/types/Coercion.lhs          |   46 +-
 compiler/types/InstEnv.lhs           |    5 +
 compiler/types/OptCoercion.lhs       |   79 ++-
 compiler/types/TyCon.lhs             |   94 ++--
 compiler/types/Type.lhs              |   36 +-
 compiler/types/TypeRep.lhs           |   15 +-
 compiler/utils/UniqFM.lhs            |    5 +-
 docs/users_guide/ffi-chap.xml        |    2 +-
 docs/users_guide/glasgow_exts.xml    |    5 +-
 docs/users_guide/using.xml           |   18 +
 ghc.mk                               |    3 +-
 ghc/ghc.mk                           |    2 +-
 rules/build-prog.mk                  |   10 +-
 rules/shell-wrapper.mk               |   19 +-
 utils/ghc-pkg/ghc.mk                 |    2 +-
 utils/runghc/ghc.mk                  |    2 +-
 77 files changed, 3908 insertions(+), 3810 deletions(-)



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to