[project @ 1999-12-20 10:12:50 by simonpj]

[ghc-hetmet.git] / ghc / interpreter / compiler.c

diff --git a/ghc/interpreter/compiler.c b/ghc/interpreter/compiler.c
index 30483d0..eda58cb 100644 (file)
--- a/ghc/interpreter/compiler.c
+++ b/ghc/interpreter/compiler.c
@@ -11,8 +11,8 @@
  * included in the distribution.
  *
  * $RCSfile: compiler.c,v $
- * $Revision: 1.14 $
- * $Date: 1999/11/22 14:39:43 $
+ * $Revision: 1.16 $
+ * $Date: 1999/12/10 15:59:42 $
  * ------------------------------------------------------------------------*/
 
 #include "prelude.h"
@@ -1509,7 +1509,7 @@ Void evalExp() {                    /* compile and run input expression    */
         switch (status) {
         case Deadlock:
         case AllBlocked: /* I don't understand the distinction - ADR */
-                printf("{Deadlock -- might be circular data dependencies}");
+                printf("{Deadlock or Blackhole}");
                 if (doRevertCAFs) RevertCAFs();
                 break;
         case Interrupted:
@@ -1557,14 +1557,6 @@ Void compileDefns() {                  /* compile script definitions       */
     Target i = 0;
     List binds = NIL;
 
-    /* a nasty hack.  But I don't know an easier way to make */
-    /* these things appear.                                  */
-    if (lastModule() == modulePrelude) {
-       implementCfun ( nameCons, NIL );
-       implementCfun ( nameNil, NIL );
-       implementCfun ( nameUnit, NIL );
-    }
-
     {
         List vss;
         List vs;
@@ -1653,20 +1645,17 @@ Pair p; {                               /* Should be merged with genDefns, */
 Void compiler(what)
 Int what; {
     switch (what) {
-        case INSTALL :
+        case PREPREL :
         case RESET   : freeVars      = NIL;
                        freeFuns      = NIL;
                        freeBegin     = mkOffset(0);
-                       //extraVars     = NIL;
-                       //numExtraVars  = 0;
-                       //localOffset   = 0;
-                       //localArity    = 0;
                        break;
 
         case MARK    : mark(freeVars);
                        mark(freeFuns);
-                       //mark(extraVars);
                        break;
+
+        case POSTPREL: break;
     }
 }