X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fghci%2FCompManager.lhs;h=dc033397cbc1733952ef47948ea23466b0b4257c;hb=d893f3809b61eca1b7a45f3eb63d39b25f757c40;hp=90ef10cad4a8277fcf23a218a9874e419ce16a0f;hpb=e21b5f3296615c0daf6c2d602ac91b76a84ad3c1;p=ghc-hetmet.git diff --git a/ghc/compiler/ghci/CompManager.lhs b/ghc/compiler/ghci/CompManager.lhs index 90ef10c..dc03339 100644 --- a/ghc/compiler/ghci/CompManager.lhs +++ b/ghc/compiler/ghci/CompManager.lhs @@ -26,7 +26,7 @@ import Finder ( Finder, newFinder, import CmSummarise ( summarise, ModSummary(..), mi_name, ms_get_imports, name_of_summary, deps_of_summary ) -import CmCompile ( PCS, emptyPCS, HST, HIT, CompResult(..), cmCompile ) +--import CmCompile ( PCS, emptyPCS, HST, HIT, CompResult(..), cmCompile ) import CmLink ( PLS, emptyPLS, Linkable(..), link, LinkResult(..), filterModuleLinkables, modname_of_linkable, @@ -58,7 +58,7 @@ type ModHandle = String -- ToDo: do better? data PersistentCMState = PersistentCMState { hst :: HomeSymbolTable, -- home symbol table - hit :: HomeInterfaceTable, -- home interface table + hit :: HomeIfaceTable, -- home interface table ui :: UnlinkedImages, -- the unlinked images mg :: ModuleGraph -- the module graph } @@ -69,7 +69,7 @@ emptyPCMS = PersistentCMState hst = emptyHST, hit = emptyHIT, ui = emptyUI, mg = emptyMG } -emptyHIT :: HomeInterfaceTable +emptyHIT :: HomeIfaceTable emptyHIT = emptyFM emptyHST :: HomeSymbolTable emptyHST = emptyFM @@ -137,6 +137,8 @@ cmLoadModule cmstate1 modname -- then generate version 2's by removing from HIT,HST,UI any -- modules in the old MG which are not in the new one. + -- TODO: call newFinder to reestablish home module cache?! + putStr "cmLoadModule: downsweep begins\n" mg2unsorted <- downsweep modname finderr putStrLn (showSDoc (vcat (map ppr mg2unsorted)))