Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : overlapping-tyfams
http://hackage.haskell.org/trac/ghc/changeset/52f2ba1861e693776787cfee9de807f52db918db >--------------------------------------------------------------- commit 52f2ba1861e693776787cfee9de807f52db918db Merge: 467d575... b0626b6... Author: Richard Eisenberg <e...@cis.upenn.edu> Date: Wed Dec 5 12:33:46 2012 -0500 Merge branch 'master' into overlapping-tyfams compiler/basicTypes/DataCon.lhs | 8 ++- compiler/iface/LoadIface.lhs | 92 +++++++++++++++++----------- compiler/main/DynamicLoading.hs | 7 +- compiler/rename/RnNames.lhs | 40 +++++++++---- compiler/typecheck/TcRnTypes.lhs | 3 + compiler/typecheck/TcType.lhs | 4 +- compiler/types/TyCon.lhs | 6 +- compiler/types/Type.lhs | 10 +--- compiler/utils/Outputable.lhs | 3 +- configure.ac | 118 ++++++++++++++++++------------------ docs/users_guide/glasgow_exts.xml | 47 ++++++++++++++- 11 files changed, 207 insertions(+), 131 deletions(-) diff --cc compiler/types/Type.lhs index 44d605f,f741078..bc3ae07 --- a/compiler/types/Type.lhs +++ b/compiler/types/Type.lhs @@@ -154,10 -152,9 +154,10 @@@ import VarSe import Class import TyCon import TysPrim - import {-# SOURCE #-} TysWiredIn ( eqTyCon, mkBoxedTupleTy ) + import {-# SOURCE #-} TysWiredIn ( eqTyCon ) import PrelNames ( eqTyConKey, ipClassNameKey, constraintKindTyConKey, liftedTypeKindTyConKey ) +import CoAxiom -- others import Unique ( Unique, hasKey ) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
