[project @ 2000-01-13 14:33:57 by hwloidl]

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

diff --git a/ghc/interpreter/type.c b/ghc/interpreter/type.c
index bd653fd..2446ce0 100644 (file)
--- a/ghc/interpreter/type.c
+++ b/ghc/interpreter/type.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: type.c,v $
- * $Revision: 1.20 $
- * $Date: 1999/12/16 16:34:46 $
+ * $Revision: 1.22 $
+ * $Date: 2000/01/12 14:52:54 $
  * ------------------------------------------------------------------------*/
 
 #include "prelude.h"
@@ -2795,7 +2795,20 @@ Int what; {
                       mark(typeProgIO);
                        break;
 
-        case POSTPREL: break;
+        case POSTPREL:
+
+           if (combined) {
+               setCurrModule(modulePrelude);
+               dummyVar     = inventVar();
+               typeUnit     = mkTuple(0);
+               arrow        = fn(aVar,bVar);
+               listof       = ap(typeList,aVar);
+               boundPair    = ap(ap(mkTuple(2),aVar),aVar);
+               nameUnit     = findQualNameWithoutConsultingExportList
+                                 (mkQVar(findText("PrelBase"),
+                                         findText("()")));
+           }
+           break;
 
         case PREPREL : 
            typeChecker(RESET);
@@ -2834,8 +2847,9 @@ Int what; {
 
                starToStar   = simpleKind(1);
 
-               typeUnit     = addPrimTycon(findText("()"),
-                                           STAR,0,DATATYPE,NIL);
+               typeUnit     = findTycon(findText("()"));
+                              assert(nonNull(typeUnit));
+
                typeArrow    = addPrimTycon(findText("(->)"),
                                            simpleKind(2),2,
                                            DATATYPE,NIL);