Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : overlapping-tyfams
http://hackage.haskell.org/trac/ghc/changeset/1ccd6d0be92c092a7fca704c8e8c865e82e9e8c4 >--------------------------------------------------------------- commit 1ccd6d0be92c092a7fca704c8e8c865e82e9e8c4 Author: Richard Eisenberg <e...@cis.upenn.edu> Date: Tue Oct 2 21:51:00 2012 -0400 Continuing to revert old bad implementation of overlapping type families compiler/deSugar/Desugar.lhs | 4 +- compiler/iface/BinIface.hs | 23 +- compiler/iface/IfaceSyn.lhs | 38 +- compiler/iface/LoadIface.lhs | 32 +- compiler/iface/MkIface.lhs | 33 +- compiler/iface/TcIface.lhs | 16 +- compiler/iface/TcIface.lhs-boot | 16 +- compiler/main/GHC.hs | 6 +- compiler/main/HscMain.hs | 8 +- compiler/main/HscTypes.lhs | 36 +- compiler/main/TidyPgm.lhs | 18 +- compiler/typecheck/FamInst.lhs | 132 ++--- compiler/typecheck/TcDeriv.lhs | 23 +- compiler/typecheck/TcExpr.lhs | 13 +- compiler/typecheck/TcGenDeriv.lhs | 16 +- compiler/typecheck/TcGenGenerics.lhs | 22 +- compiler/typecheck/TcInstDcls.lhs | 74 ++-- compiler/typecheck/TcInteract.lhs | 6 +- compiler/typecheck/TcRnDriver.lhs | 44 +- compiler/typecheck/TcRnMonad.lhs | 2 +- compiler/typecheck/TcRnTypes.lhs | 2 +- compiler/typecheck/TcSMonad.lhs | 2 +- compiler/typecheck/TcSplice.lhs | 40 +- compiler/types/FamInstEnv.lhs | 636 +++++---------------- compiler/vectorise/Vectorise.hs | 11 +- compiler/vectorise/Vectorise/Env.hs | 2 +- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 4 +- compiler/vectorise/Vectorise/Generic/PData.hs | 16 +- compiler/vectorise/Vectorise/Monad.hs | 2 +- compiler/vectorise/Vectorise/Monad/InstEnv.hs | 6 +- compiler/vectorise/Vectorise/Type/Env.hs | 22 +- compiler/vectorise/Vectorise/Utils/Base.hs | 10 +- compiler/vectorise/Vectorise/Utils/PADict.hs | 2 +- ghc/InteractiveUI.hs | 2 +- 34 files changed, 445 insertions(+), 874 deletions(-) Diff suppressed because of size. To see it, use: git show 1ccd6d0be92c092a7fca704c8e8c865e82e9e8c4 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
