[project @ 2000-11-17 16:53:27 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 c6619a6..44f9a89 100644 (file)
--- a/ghc/compiler/compMan/CmLink.lhs
+++ b/ghc/compiler/compMan/CmLink.lhs
@@ -12,7 +12,7 @@ module CmLink ( Linkable(..),  Unlinked(..),
                 link, 
                unload,
                 PersistentLinkerState{-abstractly!-}, emptyPLS,
-               lookupClosure
+               linkExpr
   ) where
 
 
@@ -193,7 +193,7 @@ linkFinish pls mods ul_trees = do
        stuff        = [ (trees,itbls) | Trees trees itbls <- ul_trees ]
 
    (ibinds, new_itbl_env, new_closure_env) <-
-       linkIModules closure_env' itbl_env'  stuff
+       linkIModules itbl_env' closure_env' stuff
 
    let new_pls = PersistentLinkerState {
                                  closure_env = new_closure_env,
@@ -206,10 +206,8 @@ linkFinish pls mods ul_trees = do
 unload :: PersistentLinkerState -> IO PersistentLinkerState
 unload pls = return pls{ closure_env = emptyFM, itbl_env = emptyFM }
 
-lookupClosure :: RdrName -> PersistentLinkerState -> Maybe HValue
-lookupClosure nm PersistentLinkerState{ closure_env = cenv } =
-   case lookupFM cenv nm of
-       Nothing -> Nothing
-       Just hv -> Just hv
+linkExpr :: PersistentLinkerState -> UnlinkedIExpr -> IO HValue
+linkExpr PersistentLinkerState{ itbl_env = ie, closure_env = ce } expr
+  = iExprToHValue ie ce expr
 #endif
 \end{code}