From: simonpj Date: Fri, 25 Oct 2002 21:58:24 +0000 (+0000) Subject: [project @ 2002-10-25 21:58:24 by simonpj] X-Git-Tag: Approx_11550_changesets_converted~1508 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=264cc860d6fb91d15548f93f4516d7c8c583d6d9;p=ghc-hetmet.git [project @ 2002-10-25 21:58:24 by simonpj] Import wibbles --- diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 2c4666a..49f4a2f 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -28,6 +28,7 @@ import RdrHsSyn ( RdrNameStmt ) import Type ( Type ) import PrelNames ( iNTERACTIVE ) import StringBuffer ( stringToStringBuffer ) +import Name ( Name ) #endif import HsSyn @@ -72,7 +73,7 @@ import MkExternalCore ( emitExternalCore ) import ParserCore import ParserCoreUtils import FiniteMap ( emptyFM ) -import Name ( Name, nameModule, getName ) +import Name ( nameModule, getName ) import NameEnv ( emptyNameEnv, mkNameEnv ) import NameSet ( emptyNameSet ) import Module ( Module, ModLocation(..), showModMsg ) diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/ghc/compiler/typecheck/TcRnDriver.lhs index 3755249..e557edf 100644 --- a/ghc/compiler/typecheck/TcRnDriver.lhs +++ b/ghc/compiler/typecheck/TcRnDriver.lhs @@ -100,7 +100,7 @@ import HscTypes ( PersistentCompilerState(..), InteractiveContext(..), ModIface, ModDetails(..), ModGuts(..), HscEnv(..), ModIface(..), ModDetails(..), IfaceDecls(..), - GhciMode(..), Dependencies(..), noDependencies, + GhciMode(..), noDependencies, Deprecations(..), plusDeprecs, emptyGlobalRdrEnv, GenAvailInfo(Avail), availsToNameSet,