[project @ 1997-05-18 23:17:25 by sof]

2.0x bootable

diff --git a/ghc/compiler/simplStg/UpdAnal.lhs b/ghc/compiler/simplStg/UpdAnal.lhs
index ecd8ed1..59768a2 100644 (file)
--- a/ghc/compiler/simplStg/UpdAnal.lhs
+++ b/ghc/compiler/simplStg/UpdAnal.lhs
@@ -14,6 +14,8 @@
 >
 > IMP_Ubiq(){-uitous-}
 >
+> import Prelude hiding ( lookup )
+>
 > import StgSyn
 > import Id            ( SYN_IE(IdEnv), growIdEnv, addOneToIdEnv, combineIdEnvs, nullIdEnv, 
 >                        unitIdEnv, mkIdEnv, rngIdEnv, lookupIdEnv, 

diff --git a/ghc/compiler/specialise/SpecEnv.lhs b/ghc/compiler/specialise/SpecEnv.lhs
index f9a0949..0c40e24 100644 (file)
--- a/ghc/compiler/specialise/SpecEnv.lhs
+++ b/ghc/compiler/specialise/SpecEnv.lhs
@@ -15,7 +15,7 @@ module SpecEnv (
 IMP_Ubiq()
 
 import MatchEnv
-import Type            ( matchTys, isTyVarTy )
+import Type            --( matchTys, isTyVarTy )
 import Usage           ( SYN_IE(UVar) )
 import OccurAnal       ( occurAnalyseGlobalExpr )
 import CoreSyn         ( SYN_IE(CoreExpr), SYN_IE(SimplifiableCoreExpr) )
@@ -27,7 +27,7 @@ import Maybes         ( MaybeErr(..) )
 --import Pretty--ToDo:rm
 --import PprCore--ToDo:rm
 --import Id--ToDo:rm
---import TyVar--ToDo:rm
+import TyVar --ToDo:rm
 --import Unique--ToDo:rm
 --import IdInfo--ToDo:rm
 --import PprEnv--ToDo:rm
@@ -79,7 +79,7 @@ isNullSpecEnv (SpecEnv env) = null (mEnvToList env)
 
 addOneToSpecEnv :: SpecEnv -> [Type] -> CoreExpr -> MaybeErr SpecEnv ([Type], SimplifiableCoreExpr)
 addOneToSpecEnv (SpecEnv env) tys rhs 
-  = --pprTrace "addOneToSpecEnv" (ppAbove (ppr PprDebug tys) (ppr PprDebug rhs)) $
+  = --pprTrace "addOneToSpecEnv" (($$) (ppr PprDebug tys) (ppr PprDebug rhs)) $
     case (insertMEnv matchTys env tys (occurAnalyseGlobalExpr rhs)) of
        Succeeded menv -> Succeeded (SpecEnv menv)
        Failed err     -> Failed err