From: sewardj <unknown>
Date: Mon, 16 Oct 2000 13:57:43 +0000 (+0000)
Subject: [project @ 2000-10-16 13:57:43 by sewardj]
X-Git-Tag: Approximately_9120_patches~3572
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=1343291ca4aa89e703b4f99f727d5c110cb2f9ed;p=ghc-hetmet.git

[project @ 2000-10-16 13:57:43 by sewardj]
Track Simon's Module changes.
---

diff --git a/ghc/compiler/absCSyn/CLabel.lhs b/ghc/compiler/absCSyn/CLabel.lhs
index 01fb023..8f2a547 100644
--- a/ghc/compiler/absCSyn/CLabel.lhs
+++ b/ghc/compiler/absCSyn/CLabel.lhs
@@ -1,7 +1,7 @@
 %
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-% $Id: CLabel.lhs,v 1.39 2000/10/12 15:17:07 sewardj Exp $
+% $Id: CLabel.lhs,v 1.40 2000/10/16 13:57:43 sewardj Exp $
 %
 \section[CLabel]{@CLabel@: Information to make C Labels}
 
@@ -85,7 +85,7 @@ import CmdLineOpts      ( opt_Static, opt_DoTickyProfiling )
 import CStrings		( pp_cSEP )
 import DataCon		( ConTag, DataCon )
 import Module		( ModuleName, moduleName, moduleNameFS, 
-			  Module, isLocalModule )
+			  Module, isModuleInThisPackage )
 import Name		( Name, getName, isDllName, isExternallyVisibleName )
 import TyCon		( TyCon )
 import Unique		( pprUnique, Unique )
@@ -388,7 +388,7 @@ labelDynamic lbl =
    DataConLabel n k  -> isDllName n
    TyConLabel tc     -> isDllName (getName tc)
    ForeignLabel _ d  -> d
-   ModuleInitLabel m -> (not opt_Static) && (not (isLocalModule m))
+   ModuleInitLabel m -> (not opt_Static) && (not (isModuleInThisPackage m))
    _ 		     -> False
 \end{code}
 
diff --git a/ghc/compiler/basicTypes/Name.lhs b/ghc/compiler/basicTypes/Name.lhs
index 4a8f45f..18d1918 100644
--- a/ghc/compiler/basicTypes/Name.lhs
+++ b/ghc/compiler/basicTypes/Name.lhs
@@ -446,7 +446,7 @@ pprName (Name {n_sort = sort, n_uniq = uniq, n_occ = occ})
 
         global m | codeStyle sty
                  = ppr (moduleName m) <> char '_' <> pprOccName occ
-                 | debugStyle sty || not (isLocalModule m)
+                 | debugStyle sty || not (isModuleInThisPackage m)
                  = ppr (moduleName m) <> dot <> pprOccName occ
                  | otherwise
                  = pprOccName occ