[commit: ghc] overlapping-tyfams: Checkpoint on compilation. This change includes the rollback to FamInstEnv. (85ccb96)

[Richard Eisenberg]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : overlapping-tyfams

https://github.com/ghc/ghc/commit/85ccb9640f5f782caacb32d3bb44be9c30c9e357

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

commit 85ccb9640f5f782caacb32d3bb44be9c30c9e357
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Mon Jun 17 17:23:46 2013 +0100

    Checkpoint on compilation. This change includes the rollback
    to FamInstEnv.

 compiler/iface/BinIface.hs                        |  21 +-
 compiler/iface/BuildTyCl.lhs                      |   2 +-
 compiler/iface/IfaceSyn.lhs                       |  33 +-
 compiler/iface/IfaceType.lhs                      |   2 +-
 compiler/iface/MkIface.lhs                        |  15 +-
 compiler/iface/TcIface.lhs                        |  21 +-
 compiler/iface/TcIface.lhs-boot                   |   4 +-
 compiler/main/GHC.hs                              |   4 +-
 compiler/main/HscMain.hs                          |   2 +-
 compiler/main/HscTypes.lhs                        |  12 +-
 compiler/main/InteractiveEval.hs                  |   4 +-
 compiler/main/PprTyThing.hs                       |  12 +-
 compiler/main/TidyPgm.lhs                         |   2 +-
 compiler/parser/Parser.y.pp                       |  20 +-
 compiler/parser/RdrHsSyn.lhs                      |  10 +-
 compiler/rename/RnSource.lhs                      |   7 +-
 compiler/typecheck/FamInst.lhs                    |  82 +--
 compiler/typecheck/TcDeriv.lhs                    |   9 +-
 compiler/typecheck/TcGenDeriv.lhs                 |   4 +-
 compiler/typecheck/TcGenGenerics.lhs              |   6 +-
 compiler/typecheck/TcInstDcls.lhs                 |  20 +-
 compiler/typecheck/TcRnDriver.lhs                 |  13 +-
 compiler/typecheck/TcRnTypes.lhs                  |   2 +-
 compiler/typecheck/TcSplice.lhs                   |  16 +-
 compiler/typecheck/TcTyClsDecls.lhs               |  44 +-
 compiler/types/CoAxiom.lhs                        |   8 +-
 compiler/types/FamInstEnv.lhs                     | 773 ++++++++--------------
 compiler/types/FamInstEnv.lhs-boot                |   9 -
 compiler/types/TyCon.lhs                          |  27 +-
 compiler/vectorise/Vectorise/Env.hs               |   2 +-
 compiler/vectorise/Vectorise/Generic/PAMethods.hs |   4 +-
 compiler/vectorise/Vectorise/Generic/PData.hs     |   8 +-
 compiler/vectorise/Vectorise/Type/Env.hs          |   2 +-
 33 files changed, 465 insertions(+), 735 deletions(-)


Diff suppressed because of size. To see it, use:

    git show 85ccb9640f5f782caacb32d3bb44be9c30c9e357