[project @ 2001-05-31 11:32:25 by simonmar]

[ghc-hetmet.git] / ghc / compiler / main / Interpreter.hs

diff --git a/ghc/compiler/main/Interpreter.hs b/ghc/compiler/main/Interpreter.hs
index 2945115..d90ca29 100644 (file)
--- a/ghc/compiler/main/Interpreter.hs
+++ b/ghc/compiler/main/Interpreter.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: Interpreter.hs,v 1.8 2000/11/20 16:28:29 simonmar Exp $
+-- $Id: Interpreter.hs,v 1.11 2000/12/19 12:36:12 sewardj Exp $
 --
 -- Interpreter subsystem wrapper
 --
@@ -9,38 +9,34 @@
 
 module Interpreter (
 #ifdef GHCI
-       module StgInterp,
-       module InterpSyn,
+       module ByteCodeGen,
        module Linker
 #else
     ClosureEnv, emptyClosureEnv, 
     ItblEnv, emptyItblEnv,
-    linkIModules,
-    stgExprToInterpSyn, stgBindsToInterpSyn,
+    byteCodeGen,
     HValue,
-    UnlinkedIBind, UnlinkedIExpr,
+    UnlinkedBCO, UnlinkedBCOExpr,
     loadObjs, resolveObjs,
 #endif
   ) where
 
 #ifdef GHCI
 
----------------------------------------------
---     YES!  We have an interpreter
----------------------------------------------
+-- ------------------------------------------------------------
+-- YES!  We have an interpreter
+-- ------------------------------------------------------------
 
-import StgInterp
-import InterpSyn
+import ByteCodeGen
 import Linker
 
 #else
 
 import Outputable
 
----------------------------------------------
---     NO!  No interpreter; generate stubs for all the bits
-
----------------------------------------------
+-- ------------------------------------------------------------
+-- NO!  No interpreter; generate stubs for all the bits
+-- ------------------------------------------------------------
 
 type ClosureEnv = ()
 emptyClosureEnv = ()
@@ -48,17 +44,15 @@ emptyClosureEnv = ()
 type ItblEnv = ()
 emptyItblEnv = ()
 
-type HValue        = ()
-data UnlinkedIBind = UnlinkedIBind
-data UnlinkedIExpr = UnlinkedIExpr
+type HValue          = ()
+data UnlinkedBCO     = UnlinkedBCO
+data UnlinkedBCOExpr = UnlinkedBCOExpr
 
-instance Outputable UnlinkedIBind where
-  ppr x = text "Can't output UnlinkedIBind"
+instance Outputable UnlinkedBCO where
+  ppr x = text "Can't output UnlinkedBCO"
 
-linkIModules       = error "linkIModules"
-stgExprToInterpSyn  = error "stgToInterpSyn"
-stgBindsToInterpSyn = error "stgBindsToInterpSyn"
-loadObjs           = error "loadObjs"
-resolveObjs        = error "loadObjs"
-interactiveUI       = error "interactiveUI"
+byteCodeGen    = error "byteCodeGen"
+loadObjs       = error "loadObjs"
+resolveObjs    = error "resolveObjs"
+interactiveUI  = error "interactiveUI"
 #endif