From a20c26e871de939c9708892839787404420554ca Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Tue, 2 Mar 1999 18:31:58 +0000
Subject: [PATCH] [project @ 1999-03-02 18:31:51 by sof] import list
 adjustments

---
 ghc/compiler/hsSyn/HsImpExp.lhs       |    2 +-
 ghc/compiler/hsSyn/HsSyn.lhs          |    2 +-
 ghc/compiler/parser/UgenUtil.lhs      |    2 +-
 ghc/compiler/profiling/CostCentre.lhs |    3 ++-
 ghc/compiler/profiling/SCCfinal.lhs   |    2 +-
 ghc/compiler/reader/Lex.lhs           |    3 +--
 ghc/compiler/reader/ReadPrefix.lhs    |    7 ++++---
 ghc/compiler/simplCore/SimplCore.lhs  |    3 ++-
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ghc/compiler/hsSyn/HsImpExp.lhs b/ghc/compiler/hsSyn/HsImpExp.lhs
index ff1a095..650ec08 100644
--- a/ghc/compiler/hsSyn/HsImpExp.lhs
+++ b/ghc/compiler/hsSyn/HsImpExp.lhs
@@ -8,7 +8,7 @@ module HsImpExp where
 
 #include "HsVersions.h"
 
-import OccName		( Module, pprModule, moduleIfaceFlavour, bootFlavour )
+import Module		( Module, pprModule, moduleIfaceFlavour, bootFlavour )
 import Outputable
 import SrcLoc		( SrcLoc )
 \end{code}
diff --git a/ghc/compiler/hsSyn/HsSyn.lhs b/ghc/compiler/hsSyn/HsSyn.lhs
index 623184c..4bfce78 100644
--- a/ghc/compiler/hsSyn/HsSyn.lhs
+++ b/ghc/compiler/hsSyn/HsSyn.lhs
@@ -45,7 +45,7 @@ import BasicTypes	( Fixity, Version, NewOrData )
 import Outputable
 import SrcLoc		( SrcLoc )
 import Bag
-import OccName		( Module, pprModule )
+import Module		( Module, pprModule )
 \end{code}
 
 All we actually declare here is the top-level structure for a module.
diff --git a/ghc/compiler/parser/UgenUtil.lhs b/ghc/compiler/parser/UgenUtil.lhs
index 5530035..67c3385 100644
--- a/ghc/compiler/parser/UgenUtil.lhs
+++ b/ghc/compiler/parser/UgenUtil.lhs
@@ -11,7 +11,7 @@ module UgenUtil (
 #include "HsVersions.h"
 
 import GlaExts
-import Name
+import Module		( Module, mkSrcModule )
 import SrcLoc		( mkSrcLoc, noSrcLoc, SrcLoc )
 import FastString	( FastString, mkFastCharString, mkFastCharString2 )
 \end{code}
diff --git a/ghc/compiler/profiling/CostCentre.lhs b/ghc/compiler/profiling/CostCentre.lhs
index 3309640..5c78dcc 100644
--- a/ghc/compiler/profiling/CostCentre.lhs
+++ b/ghc/compiler/profiling/CostCentre.lhs
@@ -29,8 +29,9 @@ module CostCentre (
 
 import Var		( Id )
 import Name		( UserFS, EncodedFS, encodeFS, decode,
-			  Module, getOccName, occNameFS, pprModule, moduleUserString
+			  getOccName, occNameFS
 			)
+import Module		( Module, pprModule, moduleUserString )
 import Outputable	
 import Util	        ( thenCmp )
 \end{code}
diff --git a/ghc/compiler/profiling/SCCfinal.lhs b/ghc/compiler/profiling/SCCfinal.lhs
index 42f0a32..a10f816 100644
--- a/ghc/compiler/profiling/SCCfinal.lhs
+++ b/ghc/compiler/profiling/SCCfinal.lhs
@@ -33,7 +33,7 @@ import CmdLineOpts	( opt_AutoSccsOnIndividualCafs )
 import CostCentre	-- lots of things
 import Const		( Con(..) )
 import Id		( Id, mkSysLocal )
-import OccName		( Module )
+import Module		( Module )
 import UniqSupply	( uniqFromSupply, splitUniqSupply, UniqSupply )
 import Unique           ( Unique )
 import Util		( removeDups )
diff --git a/ghc/compiler/reader/Lex.lhs b/ghc/compiler/reader/Lex.lhs
index c362f3b..6bed0a8 100644
--- a/ghc/compiler/reader/Lex.lhs
+++ b/ghc/compiler/reader/Lex.lhs
@@ -37,7 +37,7 @@ import List             ( isSuffixOf )
 
 import IdInfo		( InlinePragInfo(..) )
 import Name		( isLowerISO, isUpperISO )
-import OccName		( IfaceFlavour, hiFile, hiBootFile )
+import Module		( IfaceFlavour, hiFile, hiBootFile )
 import PrelMods		( mkTupNameStr, mkUbxTupNameStr )
 import CmdLineOpts	( opt_IgnoreIfacePragmas, opt_HiVersion, opt_NoHiCheck )
 import Demand		( Demand(..) {- instance Read -} )
@@ -60,7 +60,6 @@ import Word
 #endif
 
 import Addr
-
 import PrelRead 		( readRational__ ) -- Glasgow non-std
 \end{code}
 
diff --git a/ghc/compiler/reader/ReadPrefix.lhs b/ghc/compiler/reader/ReadPrefix.lhs
index 7ed1140..9c68e07 100644
--- a/ghc/compiler/reader/ReadPrefix.lhs
+++ b/ghc/compiler/reader/ReadPrefix.lhs
@@ -20,9 +20,10 @@ import PrefixToHs
 import CallConv
 
 import CmdLineOpts      ( opt_NoImplicitPrelude, opt_GlasgowExts )
-import OccName		( Module, mkSrcModuleFS, mkImportModuleFS,
-			  hiFile, hiBootFile,
-			  NameSpace, tcName, clsName, tcClsName, varName, dataName, tvName,
+import Module		( Module, mkSrcModuleFS, mkImportModuleFS,
+			  hiFile, hiBootFile
+			)
+import OccName		( NameSpace, tcName, clsName, tcClsName, varName, dataName, tvName,
 			  isLexCon
 			)
 import RdrName		( RdrName, isRdrDataCon, mkSrcQual, mkSrcUnqual, mkPreludeQual,	
diff --git a/ghc/compiler/simplCore/SimplCore.lhs b/ghc/compiler/simplCore/SimplCore.lhs
index 420fc79..e3447f0 100644
--- a/ghc/compiler/simplCore/SimplCore.lhs
+++ b/ghc/compiler/simplCore/SimplCore.lhs
@@ -39,8 +39,9 @@ import IdInfo		( InlinePragInfo(..), specInfo, setSpecInfo,
 			)
 import VarEnv
 import VarSet
+import Module		( Module )
 import Name		( mkLocalName, tidyOccName, tidyTopName, initTidyOccEnv, isExported,
-			  Module, NamedThing(..), OccName
+			  NamedThing(..), OccName
 			)
 import TyCon		( TyCon, isDataTyCon )
 import PrimOp		( PrimOp(..) )
-- 
1.7.10.4