projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-04-12 17:12:23 by simonmar]
[ghc-hetmet.git]
/
ghc
/
interpreter
/
type.c
diff --git
a/ghc/interpreter/type.c
b/ghc/interpreter/type.c
index
9b60662
..
eb2d2d9
100644
(file)
--- a/
ghc/interpreter/type.c
+++ b/
ghc/interpreter/type.c
@@
-9,11
+9,11
@@
* included in the distribution.
*
* $RCSfile: type.c,v $
* included in the distribution.
*
* $RCSfile: type.c,v $
- * $Revision: 1.30 $
- * $Date: 2000/03/13 11:37:17 $
+ * $Revision: 1.34 $
+ * $Date: 2000/04/06 14:23:55 $
* ------------------------------------------------------------------------*/
* ------------------------------------------------------------------------*/
-#include "prelude.h"
+#include "hugsbasictypes.h"
#include "storage.h"
#include "connect.h"
#include "errors.h"
#include "storage.h"
#include "connect.h"
#include "errors.h"
@@
-800,7
+800,7
@@
Cell e; { /* requires polymorphism, qualified*/
for (; nonNull(predsAre); predsAre=tl(predsAre)) {
evs = cons(assumeEvid(hd(predsAre),typeOff),evs);
}
for (; nonNull(predsAre); predsAre=tl(predsAre)) {
evs = cons(assumeEvid(hd(predsAre),typeOff),evs);
}
- if (!isName(h) || !isCfun(h)) {
+ /* we now _always_ do this: if (!isName(h) || !isCfun(h)) */ {
h = applyToArgs(h,rev(evs));
}
}
h = applyToArgs(h,rev(evs));
}
}
@@
-2853,7
+2853,7
@@
Int what; {
} else {
dummyVar = inventVar();
} else {
dummyVar = inventVar();
- setCurrModule(modulePrelude);
+ setCurrModule(modulePrelPrim);
starToStar = simpleKind(1);
starToStar = simpleKind(1);