From 4d355aed3b4b9cebddbcc4ea495ae27d991cb287 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Sun, 18 May 1997 23:18:36 +0000
Subject: [PATCH] [project @ 1997-05-18 23:17:25 by sof] 2.0x bootable
---
ghc/compiler/simplStg/UpdAnal.lhs | 2 ++
ghc/compiler/specialise/SpecEnv.lhs | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ghc/compiler/simplStg/UpdAnal.lhs b/ghc/compiler/simplStg/UpdAnal.lhs
index ecd8ed170797..59768a2d9f14 100644
--- 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 f9a0949faa23..0c40e2411628 100644
--- 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
--
GitLab