cvs commit: fptools/ghc/compiler HsVersions.h fptools/ghc/compiler/basicTypes Id.lhs IdInfo.lhs MkId.lhs OccName.lhs Var.hi-boot Var.hi-boot-5 Var.lhs VarSet.lhs fptools/ghc/compiler/codeGen CgCase.lhs fptools/ghc/compiler/coreSyn CoreSyn.lhs CoreUtils.lhs PprCore.lhs ...

Simon Marlow simonmar@glass.cse.ogi.edu
Tue, 7 Nov 2000 07:21:43 -0800


simonmar    2000/11/07 07:21:43 PST

  Modified files:
    ghc/compiler         HsVersions.h 
    ghc/compiler/basicTypes Id.lhs IdInfo.lhs MkId.lhs OccName.lhs 
                            Var.hi-boot Var.hi-boot-5 Var.lhs 
                            VarSet.lhs 
    ghc/compiler/codeGen CgCase.lhs 
    ghc/compiler/coreSyn CoreSyn.lhs CoreUtils.lhs PprCore.lhs 
                         Subst.lhs 
    ghc/compiler/deSugar Check.lhs DsExpr.lhs DsForeign.lhs 
                         DsListComp.lhs DsUtils.lhs 
    ghc/compiler/ghci    StgInterp.lhs 
    ghc/compiler/hsSyn   HsCore.lhs HsDecls.lhs HsExpr.lhs 
                         HsSyn.lhs HsTypes.lhs 
    ghc/compiler/main    CmdLineOpts.lhs CodeOutput.lhs 
    ghc/compiler/parser  Parser.y RdrHsSyn.lhs 
    ghc/compiler/prelude PrelNames.lhs PrimOp.lhs TysPrim.lhs 
                         primops.txt 
    ghc/compiler/rename  ParseIface.y RnEnv.lhs RnExpr.lhs 
                         RnHsSyn.lhs RnIfaces.lhs RnSource.lhs 
    ghc/compiler/simplCore FloatIn.lhs SimplUtils.lhs Simplify.lhs 
    ghc/compiler/specialise Rules.lhs 
    ghc/compiler/stgSyn  CoreToStg.lhs 
    ghc/compiler/typecheck TcClassDcl.lhs TcExpr.lhs TcHsSyn.lhs 
                           TcIfaceSig.lhs TcInstDcls.lhs 
                           TcMatches.lhs TcModule.lhs 
                           TcMonoType.lhs TcTyClsDecls.lhs 
                           TcTyDecls.lhs TcType.lhs TcUnify.lhs 
    ghc/compiler/types   Generics.lhs PprType.lhs TyCon.lhs 
                         Type.lhs TypeRep.lhs Unify.lhs 
                         Variance.lhs 
    ghc/compiler/usageSP UConSet.lhs UsageSPInf.lhs 
                         UsageSPLint.lhs UsageSPUtils.lhs 
  Log:
  	This commit completes the merge of compiler part
  	of the HEAD with the before-ghci-branch to
          before-ghci-branch-merged.
  
  Revision  Changes    Path
  1.22      +9 -0      fptools/ghc/compiler/HsVersions.h
  1.72      +33 -19    fptools/ghc/compiler/basicTypes/Id.lhs
  1.58      +102 -6    fptools/ghc/compiler/basicTypes/IdInfo.lhs
  1.45      +21 -12    fptools/ghc/compiler/basicTypes/MkId.lhs
  1.33      +4 -10     fptools/ghc/compiler/basicTypes/OccName.lhs
  1.7       +0 -1      fptools/ghc/compiler/basicTypes/Var.hi-boot
  1.6       +0 -1      fptools/ghc/compiler/basicTypes/Var.hi-boot-5
  1.17      +0 -43     fptools/ghc/compiler/basicTypes/Var.lhs
  1.11      +2 -3      fptools/ghc/compiler/basicTypes/VarSet.lhs
  1.48      +2 -2      fptools/ghc/compiler/codeGen/CgCase.lhs
  1.36      +1 -4      fptools/ghc/compiler/coreSyn/CoreSyn.lhs
  1.56      +5 -10     fptools/ghc/compiler/coreSyn/CoreUtils.lhs
  1.54      +5 -8      fptools/ghc/compiler/coreSyn/PprCore.lhs
  1.19      +20 -12    fptools/ghc/compiler/coreSyn/Subst.lhs
  1.23      +5 -1      fptools/ghc/compiler/deSugar/Check.lhs
  1.63      +3 -9      fptools/ghc/compiler/deSugar/DsExpr.lhs
  1.42      +8 -8      fptools/ghc/compiler/deSugar/DsForeign.lhs
  1.26      +78 -3     fptools/ghc/compiler/deSugar/DsListComp.lhs
  1.51      +6 -8      fptools/ghc/compiler/deSugar/DsUtils.lhs
  1.2       +23 -35    fptools/ghc/compiler/ghci/StgInterp.lhs
  1.31      +61 -17    fptools/ghc/compiler/hsSyn/HsCore.lhs
  1.57      +14 -15    fptools/ghc/compiler/hsSyn/HsDecls.lhs
  1.44      +7 -1      fptools/ghc/compiler/hsSyn/HsExpr.lhs
  1.32      +2 -1      fptools/ghc/compiler/hsSyn/HsSyn.lhs
  1.42      +82 -72    fptools/ghc/compiler/hsSyn/HsTypes.lhs
  1.116     +2 -0      fptools/ghc/compiler/main/CmdLineOpts.lhs
  1.20      +2 -1      fptools/ghc/compiler/main/CodeOutput.lhs
  1.47      +13 -3     fptools/ghc/compiler/parser/Parser.y
  1.24      +0 -2      fptools/ghc/compiler/parser/RdrHsSyn.lhs
  1.15      +53 -13    fptools/ghc/compiler/prelude/PrelNames.lhs
  1.87      +6 -6      fptools/ghc/compiler/prelude/PrimOp.lhs
  1.34      +27 -39    fptools/ghc/compiler/prelude/TysPrim.lhs
  1.6       +17 -1     fptools/ghc/compiler/prelude/primops.txt
  1.96      +46 -39    fptools/ghc/compiler/rename/ParseIface.y
  1.95      +6 -4      fptools/ghc/compiler/rename/RnEnv.lhs
  1.63      +36 -17    fptools/ghc/compiler/rename/RnExpr.lhs
  1.43      +0 -2      fptools/ghc/compiler/rename/RnHsSyn.lhs
  1.125     +1 -1      fptools/ghc/compiler/rename/RnIfaces.lhs
  1.104     +3 -20     fptools/ghc/compiler/rename/RnSource.lhs
  1.25      +0 -5      fptools/ghc/compiler/simplCore/FloatIn.lhs
  1.51      +17 -12    fptools/ghc/compiler/simplCore/SimplUtils.lhs
  1.90      +1 -1      fptools/ghc/compiler/simplCore/Simplify.lhs
  1.21      +1 -1      fptools/ghc/compiler/specialise/Rules.lhs
  1.56      +27 -11    fptools/ghc/compiler/stgSyn/CoreToStg.lhs
  1.85      +24 -18    fptools/ghc/compiler/typecheck/TcClassDcl.lhs
  1.89      +3 -11     fptools/ghc/compiler/typecheck/TcExpr.lhs
  1.46      +9 -0      fptools/ghc/compiler/typecheck/TcHsSyn.lhs
  1.58      +4 -4      fptools/ghc/compiler/typecheck/TcIfaceSig.lhs
  1.97      +6 -4      fptools/ghc/compiler/typecheck/TcInstDcls.lhs
  1.36      +57 -27    fptools/ghc/compiler/typecheck/TcMatches.lhs
  1.84      +0 -8      fptools/ghc/compiler/typecheck/TcModule.lhs
  1.67      +219 -162  fptools/ghc/compiler/typecheck/TcMonoType.lhs
  1.65      +31 -15    fptools/ghc/compiler/typecheck/TcTyClsDecls.lhs
  1.70      +26 -34    fptools/ghc/compiler/typecheck/TcTyDecls.lhs
  1.41      +10 -11    fptools/ghc/compiler/typecheck/TcType.lhs
  1.20      +8 -5      fptools/ghc/compiler/typecheck/TcUnify.lhs
  1.9       +104 -33   fptools/ghc/compiler/types/Generics.lhs
  1.49      +32 -39    fptools/ghc/compiler/types/PprType.lhs
  1.44      +0 -2      fptools/ghc/compiler/types/TyCon.lhs
  1.75      +223 -185  fptools/ghc/compiler/types/Type.lhs
  1.12      +40 -23    fptools/ghc/compiler/types/TypeRep.lhs
  1.10      +55 -24    fptools/ghc/compiler/types/Unify.lhs
  1.7       +22 -14    fptools/ghc/compiler/types/Variance.lhs
  1.3       +12 -4     fptools/ghc/compiler/usageSP/UConSet.lhs
  1.16      +13 -6     fptools/ghc/compiler/usageSP/UsageSPInf.lhs
  1.7       +13 -3     fptools/ghc/compiler/usageSP/UsageSPLint.lhs
  1.14      +15 -3     fptools/ghc/compiler/usageSP/UsageSPUtils.lhs