X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FInterpreter.hs;h=d90ca29b19382d863bf8515d22bc410b69c94e30;hb=e0a941b95506cef196e7a8ad1e002920d181f302;hp=2945115ebb6d60f8530590267dab423517f7da37;hpb=acef71564746becef2c85c310ed57dc8fdd54581;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/Interpreter.hs b/ghc/compiler/main/Interpreter.hs
index 2945115..d90ca29 100644
--- 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