[project @ 1999-05-18 16:38:23 by simonpj]

More small changes to make Simon's big commit work

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 21bd8a1..3dbe776 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.58 1999/05/18 15:03:34 simonpj Exp $
+# $Id: Makefile,v 1.59 1999/05/18 16:38:23 simonpj Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -215,6 +215,13 @@ typecheck/TcGenDeriv_HC_OPTS       = -H10m
 # tmp, -- SDM
 specialise/Specialise_HC_OPTS  += -fno-prune-tydecls
 hsSyn/HsBasic_HC_OPTS          += -fno-prune-tydecls
+simplCore/SimplMonad_HC_OPTS   += -fno-prune-tydecls
+absCSyn/AbsCSyn_HC_OPTS                += -fno-prune-tydecls
+absCSyn/AbsCUtils_HC_OPTS      += -fno-prune-tydecls
+codeGen/CgBindery_HC_OPTS      += -fno-prune-tydecls
+codeGen/CgLetNoEscape_HC_OPTS  += -fno-prune-tydecls
+codeGen/CgExpr_HC_OPTS         += -fno-prune-tydecls
+nativeGen/AbsCStixGen_HC_OPTS  += -fno-prune-tydecls
 
 # Was 10m for 2.10
 typecheck/TcHsSyn_HC_OPTS      = -H15m 

diff --git a/ghc/compiler/coreSyn/CoreSyn.hi-boot-5 b/ghc/compiler/coreSyn/CoreSyn.hi-boot-5
index e72be21..58df923 100644 (file)
--- a/ghc/compiler/coreSyn/CoreSyn.hi-boot-5
+++ b/ghc/compiler/coreSyn/CoreSyn.hi-boot-5
@@ -1,5 +1,5 @@
 __interface CoreSyn 1 0 where
-__export CoreSyn CoreExpr CoreRules CoreRule emptyCoreRules ;
+__export CoreSyn CoreExpr CoreRules CoreRule emptyCoreRules isEmptyCoreRules ;
 
 -- Needed by IdInfo
 1 type CoreExpr = Expr Var.IdOrTyVar;
@@ -8,3 +8,4 @@ __export CoreSyn CoreExpr CoreRules CoreRule emptyCoreRules ;
 1 data CoreRule ;
 1 type CoreRules = [CoreRule] ;
 1 emptyCoreRules :: CoreRules ;
+1 isEmptyCoreRules :: CoreRules -> PrelBase.Bool ;

diff --git a/ghc/compiler/coreSyn/Subst.lhs b/ghc/compiler/coreSyn/Subst.lhs
index 976ebd1..e2c2584 100644 (file)
--- a/ghc/compiler/coreSyn/Subst.lhs
+++ b/ghc/compiler/coreSyn/Subst.lhs
@@ -216,7 +216,7 @@ subst_ty subst ty
     go (NoteTy (SynNote ty1) ty2) = NoteTy (SynNote $! (go ty1)) $! (go ty2)
     go (NoteTy (FTVNote _) ty2)   = go ty2             -- Discard the free tyvar note
     go (FunTy arg res)           = (FunTy $! (go arg)) $! (go res)
-    go (NoteTy (UsgNote usg) ty2) = NoteTy $! UsgNote usg $! go ty2    -- Keep usage annot
+    go (NoteTy (UsgNote usg) ty2) = (NoteTy $! UsgNote usg) $! go ty2          -- Keep usage annot
     go (AppTy fun arg)           = mkAppTy (go fun) $! (go arg)
     go ty@(TyVarTy tv)           = case (lookupSubst subst tv) of
                                        Nothing            -> ty