From: sewardj <unknown>
Date: Mon, 10 Jan 2000 16:27:04 +0000 (+0000)
Subject: [project @ 2000-01-10 16:27:03 by sewardj]
X-Git-Tag: Approximately_9120_patches~5324
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=1d4102fe665c0e9d6594d9195ac540466b2e7683;p=ghc-hetmet.git

[project @ 2000-01-10 16:27:03 by sewardj]
nameRunIO --> nameRunIO_toplevel
---

diff --git a/ghc/interpreter/hugs.c b/ghc/interpreter/hugs.c
index 1d7b094..4292db8 100644
--- a/ghc/interpreter/hugs.c
+++ b/ghc/interpreter/hugs.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: hugs.c,v $
- * $Revision: 1.33 $
- * $Date: 2000/01/07 16:56:47 $
+ * $Revision: 1.34 $
+ * $Date: 2000/01/10 16:27:03 $
  * ------------------------------------------------------------------------*/
 
 #include <setjmp.h>
@@ -1406,7 +1406,7 @@ static Void local evaluator() {        /* evaluate expr and print value    */
 
 #if 1
     if (isProgType(ks,bd)) {
-        inputExpr = ap(nameRunIO,inputExpr);
+        inputExpr = ap(nameRunIO_toplevel,inputExpr);
         evalExp();
         Putchar('\n');
     } else {
@@ -1420,7 +1420,7 @@ static Void local evaluator() {        /* evaluate expr and print value    */
         }
         inputExpr = ap2(findName(findText("show")),d,inputExpr);
         inputExpr = ap(findName(findText("putStr")), inputExpr);
-        inputExpr = ap(nameRunIO, inputExpr);
+        inputExpr = ap(nameRunIO_toplevel, inputExpr);
 
         evalExp(); printf("\n");
         if (addType) {
diff --git a/ghc/interpreter/link.c b/ghc/interpreter/link.c
index 8db6b70..7b83a99 100644
--- a/ghc/interpreter/link.c
+++ b/ghc/interpreter/link.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: link.c,v $
- * $Revision: 1.28 $
- * $Date: 2000/01/10 16:23:32 $
+ * $Revision: 1.29 $
+ * $Date: 2000/01/10 16:27:04 $
  * ------------------------------------------------------------------------*/
 
 #include "prelude.h"
@@ -89,7 +89,7 @@ Name nameBind;             /* for translating monad comps     */
 Name nameZero;                          /* for monads with a zero          */
 
 Name nameId;
-Name nameRunIO;
+Name nameRunIO_toplevel;
 Name namePrint;
 
 Name nameOtherwise;
@@ -459,7 +459,7 @@ Void linkPreludeNames(void) {           /* Hook to names defined in Prelude */
         /* static(tidyInfix)                        */
         nameNegate         = linkName("negate");
         /* user interface                           */
-        nameRunIO          = linkName("hugsprimRunIO_toplevel");
+        nameRunIO_toplevel = linkName("hugsprimRunIO_toplevel");
         namePrint          = linkName("print");
         /* desugar                                  */
         nameOtherwise      = linkName("otherwise");
diff --git a/ghc/interpreter/link.h b/ghc/interpreter/link.h
index 9c9509a..ccd70ba 100644
--- a/ghc/interpreter/link.h
+++ b/ghc/interpreter/link.h
@@ -1,7 +1,7 @@
 
 extern Cell conCons;
 
-extern Name nameRunIO;
+extern Name nameRunIO_toplevel;
 
 /* The following data constructors are used to box unboxed
  * arguments and are treated differently by the code generator.