[project @ 1999-03-02 18:31:51 by sof]

import list adjustments

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}

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.

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}

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}

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 )

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}
 

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,	

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(..) )