projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
43a4952
)
[project @ 2000-02-14 11:13:11 by sewardj]
author
sewardj
<unknown>
Mon, 14 Feb 2000 11:13:11 +0000
(11:13 +0000)
committer
sewardj
<unknown>
Mon, 14 Feb 2000 11:13:11 +0000
(11:13 +0000)
cosmetic wibbles
ghc/interpreter/interface.c
patch
|
blob
|
history
ghc/interpreter/link.c
patch
|
blob
|
history
diff --git
a/ghc/interpreter/interface.c
b/ghc/interpreter/interface.c
index
31e68dc
..
6750bf3
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 $
* Hugs version 1.4, December 1997
*
* $RCSfile: interface.c,v $
- * $Revision: 1.30 $
- * $Date: 2000/02/09 14:50:20 $
+ * $Revision: 1.31 $
+ * $Date: 2000/02/14 11:13:11 $
* ------------------------------------------------------------------------*/
#include "prelude.h"
* ------------------------------------------------------------------------*/
#include "prelude.h"
@@
-21,7
+21,7
@@
#include "object.h"
#include "object.h"
-#define DEBUG_IFACE
+/*#define DEBUG_IFACE*/
#define VERBOSE FALSE
extern void print ( Cell, Int );
#define VERBOSE FALSE
extern void print ( Cell, Int );
@@
-1093,7
+1093,7
@@
static ObjectCode* startGHCModule_partial_load ( String objNm, Int objSz )
ERRMSG(0) "Validation of object file \"%s\" failed", objNm
EEND;
}
ERRMSG(0) "Validation of object file \"%s\" failed", objNm
EEND;
}
- if (!ocGetNames(oc,0||VERBOSE)) {
+ if (!ocGetNames(oc,VERBOSE)) {
ERRMSG(0) "Reading of symbol names in object file \"%s\" failed", objNm
EEND;
}
ERRMSG(0) "Reading of symbol names in object file \"%s\" failed", objNm
EEND;
}
@@
-1319,11
+1319,11
@@
static Void finishGHCModule ( Cell root )
#endif
/* Last, but by no means least ... */
#endif
/* Last, but by no means least ... */
- if (!ocResolve(module(mod).object,0||VERBOSE))
+ if (!ocResolve(module(mod).object,VERBOSE))
internal("finishGHCModule: object resolution failed");
for (oc=module(mod).objectExtras; oc; oc=oc->next) {
internal("finishGHCModule: object resolution failed");
for (oc=module(mod).objectExtras; oc; oc=oc->next) {
- if (!ocResolve(oc, 0||VERBOSE))
+ if (!ocResolve(oc, VERBOSE))
internal("finishGHCModule: extra object resolution failed");
}
}
internal("finishGHCModule: extra object resolution failed");
}
}
diff --git
a/ghc/interpreter/link.c
b/ghc/interpreter/link.c
index
0bdf68e
..
d15a756
100644
(file)
--- a/
ghc/interpreter/link.c
+++ b/
ghc/interpreter/link.c
@@
-9,8
+9,8
@@
* included in the distribution.
*
* $RCSfile: link.c,v $
* included in the distribution.
*
* $RCSfile: link.c,v $
- * $Revision: 1.42 $
- * $Date: 2000/02/09 14:50:20 $
+ * $Revision: 1.43 $
+ * $Date: 2000/02/14 11:13:11 $
* ------------------------------------------------------------------------*/
#include "prelude.h"
* ------------------------------------------------------------------------*/
#include "prelude.h"
@@
-409,7
+409,6
@@
Void linkPreludeCM(void) { /* Hook to cfuns and mfuns in */
nameEq = linkName("==");
nameFromInt = linkName("fromInt");
nameFromInteger = linkName("fromInteger");
nameEq = linkName("==");
nameFromInt = linkName("fromInt");
nameFromInteger = linkName("fromInteger");
- nameFromDouble = linkName("fromDouble");
nameReturn = linkName("return");
nameBind = linkName(">>=");
nameLe = linkName("<=");
nameReturn = linkName("return");
nameBind = linkName(">>=");
nameLe = linkName("<=");
@@
-484,8
+483,10
@@
Void linkPreludeNames(void) { /* Hook to names defined in Prelude */
namePmInt = linkName("hugsprimPmInt");
namePmInteger = linkName("hugsprimPmInteger");
namePmDouble = linkName("hugsprimPmDouble");
namePmInt = linkName("hugsprimPmInt");
namePmInteger = linkName("hugsprimPmInteger");
namePmDouble = linkName("hugsprimPmDouble");
-
+
+ nameFromDouble = linkName("fromDouble");
namePmFromInteger = linkName("hugsprimPmFromInteger");
namePmFromInteger = linkName("hugsprimPmFromInteger");
+
namePmSubtract = linkName("hugsprimPmSubtract");
namePmLe = linkName("hugsprimPmLe");
namePmSubtract = linkName("hugsprimPmSubtract");
namePmLe = linkName("hugsprimPmLe");