[project @ 2000-01-06 16:33:10 by sewardj]

Update Hugs' knowledge of the GHC Prelude to track recent Prelude changes.

diff --git a/ghc/interpreter/interface.c b/ghc/interpreter/interface.c
index 1ba7fc4..7f442e3 100644 (file)
--- a/ghc/interpreter/interface.c
+++ b/ghc/interpreter/interface.c
@@ -7,8 +7,8 @@
  * Hugs version 1.4, December 1997
  *
  * $RCSfile: interface.c,v $
- * $Revision: 1.19 $
- * $Date: 2000/01/06 14:17:16 $
+ * $Revision: 1.20 $
+ * $Date: 2000/01/06 16:33:10 $
  * ------------------------------------------------------------------------*/
 
 #include "prelude.h"
@@ -2226,6 +2226,7 @@ Type type; {
       Sym(stg_gc_noregs)             \
       Sym(stg_gc_seq_1)              \
       Sym(stg_gc_d1)                 \
+      Sym(stg_gc_f1)                 \
       Sym(stg_chk_0)                 \
       Sym(stg_chk_1)                 \
       Sym(stg_gen_chk)               \
@@ -2269,6 +2270,7 @@ Type type; {
       Sym(waitReadzh_fast)           \
       Sym(waitWritezh_fast)          \
       Sym(CHARLIKE_closure)          \
+      Sym(INTLIKE_closure)           \
       Sym(suspendThread)             \
       Sym(resumeThread)              \
       Sym(stackOverflow)             \
@@ -2292,6 +2294,7 @@ Type type; {
       Sym(__int_encodeDouble)        \
       Sym(mpz_cmp_si)                \
       Sym(mpz_cmp)                   \
+      Sym(__mpn_gcd_1)               \
       Sym(newArrayzh_fast)           \
       Sym(unsafeThawArrayzh_fast)    \
       Sym(newDoubleArrayzh_fast)     \
@@ -2302,6 +2305,9 @@ Type type; {
       Sym(newCharArrayzh_fast)       \
       Sym(newMutVarzh_fast)          \
       Sym(quotRemIntegerzh_fast)     \
+      Sym(quotIntegerzh_fast)        \
+      Sym(remIntegerzh_fast)         \
+      Sym(divExactIntegerzh_fast)    \
       Sym(divModIntegerzh_fast)      \
       Sym(timesIntegerzh_fast)       \
       Sym(minusIntegerzh_fast)       \
@@ -2361,8 +2367,10 @@ Type type; {
 
 
 /* AJG Hack */
+#if 0
 #undef EXTERN_SYMS
 #define EXTERN_SYMS
+#endif
 
 /* entirely bogus claims about types of these symbols */
 #define Sym(vvv)  extern int vvv;

diff --git a/ghc/interpreter/link.c b/ghc/interpreter/link.c
index 9ea2919..2c4e52a 100644 (file)
--- a/ghc/interpreter/link.c
+++ b/ghc/interpreter/link.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: link.c,v $
- * $Revision: 1.25 $
- * $Date: 2000/01/05 19:10:21 $
+ * $Revision: 1.26 $
+ * $Date: 2000/01/06 16:33:10 $
  * ------------------------------------------------------------------------*/
 
 #include "prelude.h"
@@ -508,10 +508,10 @@ break;
                nameMkI = addWiredInBoxingTycon("PrelBase","Int",   "I#",1,0,INT_REP   );
                nameMkW = addWiredInBoxingTycon("PrelAddr","Word",  "W#",1,0,WORD_REP  );
                nameMkA = addWiredInBoxingTycon("PrelAddr","Addr",  "A#",1,0,ADDR_REP  );
-               nameMkF = addWiredInBoxingTycon("PrelBase","Float", "F#",1,0,FLOAT_REP );
-               nameMkD = addWiredInBoxingTycon("PrelBase","Double","D#",1,0,DOUBLE_REP);
+               nameMkF = addWiredInBoxingTycon("PrelFloat","Float", "F#",1,0,FLOAT_REP );
+               nameMkD = addWiredInBoxingTycon("PrelFloat","Double","D#",1,0,DOUBLE_REP);
                nameMkInteger            
-                       = addWiredInBoxingTycon("PrelBase","Integer","Integer#",1,0,0);
+                       = addWiredInBoxingTycon("PrelNum","Integer","Integer#",1,0,0);
                nameMkPrimByteArray      
                        = addWiredInBoxingTycon("PrelGHC","ByteArray","PrimByteArray#",1,0,0);
 

diff --git a/ghc/interpreter/storage.c b/ghc/interpreter/storage.c
index bc7c877..b26e386 100644 (file)
--- a/ghc/interpreter/storage.c
+++ b/ghc/interpreter/storage.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: storage.c,v $
- * $Revision: 1.30 $
- * $Date: 2000/01/05 15:57:41 $
+ * $Revision: 1.31 $
+ * $Date: 2000/01/06 16:33:10 $
  * ------------------------------------------------------------------------*/
 
 #include "prelude.h"
@@ -812,7 +812,7 @@ Tycon addTupleTycon ( Int n )
       if (tycon(i).tuple == n) return i;
 
    if (combined)
-      m = findFakeModule(findText(n==0 ? "PrelBase" : "PrelTup")); else
+      m = findFakeModule(findText(n<=1 ? "PrelBase" : "PrelTup")); else
       m = findModule(findText("Prelude"));
 
    setCurrModule(m);