[project @ 2001-06-15 15:15:33 by simonmar]

[ghc-hetmet.git] / ghc / compiler / compMan / CmLink.lhs

diff --git a/ghc/compiler/compMan/CmLink.lhs b/ghc/compiler/compMan/CmLink.lhs
index 297b0a6..4b592f5 100644 (file)
--- a/ghc/compiler/compMan/CmLink.lhs
+++ b/ghc/compiler/compMan/CmLink.lhs
@@ -26,7 +26,7 @@ import ByteCodeLink   ( linkIModules, linkIExpr )
 import Interpreter
 import DriverPipeline
 import CmTypes
-import CmStaticInfo    ( GhciMode(..) )
+import HscTypes                ( GhciMode(..) )
 import Outputable      ( SDoc )
 import Digraph         ( SCC(..), flattenSCC )
 import Name            ( Name )
@@ -35,9 +35,8 @@ import FiniteMap
 import Outputable
 import ErrUtils                ( showPass )
 import CmdLineOpts     ( DynFlags(..) )
-import Panic           ( panic, GhcException(..) )
+import Panic           ( panic )
 
-import Exception
 import List
 import Monad
 import IO
@@ -219,9 +218,6 @@ link' Interactive dflags batch_attempt_linking linkables pls
         linkObjs (objs ++ bcos) pls
           -- get the objects first
 
-ppLinkableSCC :: SCC Linkable -> SDoc
-ppLinkableSCC = ppr . flattenSCC
-
 filterModuleLinkables :: (ModuleName -> Bool) -> [Linkable] -> [Linkable]
 filterModuleLinkables p [] = []
 filterModuleLinkables p (li:lis)
@@ -260,7 +256,7 @@ linkInterpretedCode (l@(LM _ m uls) : ls) ul_trees pls
        linkInterpretedCode ls (uls++ul_trees) 
                pls{objects_loaded = l : objects_loaded pls}
    | any isObject uls
-        = panic "linkInterpretedCode: trying to link object code to interpreted code")
+        = panic "linkInterpretedCode: trying to link object code to interpreted code"
    | otherwise = invalidLinkable
 
 invalidLinkable = panic "CmLink: linkable doesn't contain entirely objects or interpreted code"