[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
guile/guile-core/libguile ChangeLog goops.c goo...
From: |
Dirk Herrmann |
Subject: |
guile/guile-core/libguile ChangeLog goops.c goo... |
Date: |
Fri, 24 Nov 2000 06:43:41 -0800 |
CVSROOT: /cvs
Module name: guile
Changes by: Dirk Herrmann <address@hidden> 00/11/24 06:43:41
Modified files:
guile-core/libguile: ChangeLog goops.c goops.h
Log message:
* Fix previous change (thanks to Matthias Koeppe).
CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1176&r2=1.1177
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/goops.c.diff?r1=1.5&r2=1.6
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/goops.h.diff?r1=1.3&r2=1.4
Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1176
guile/guile-core/libguile/ChangeLog:1.1177
--- guile/guile-core/libguile/ChangeLog:1.1176 Fri Nov 24 02:55:22 2000
+++ guile/guile-core/libguile/ChangeLog Fri Nov 24 06:43:41 2000
@@ -1,3 +1,10 @@
+2000-11-24 Matthias Koeppe <address@hidden>
+
+ * goops.c (filter_cpl, remove_duplicate_slots), goops.h
+ (SCM_SUBCLASSP): Fix previous change: In contrast to
+ scm_sloppy_memq the function scm_memq returns #f if the
+ object was not contained in the list.
+
2000-11-24 Dirk Herrmann <address@hidden>
* goops.c: Include validate.h.
Index: guile/guile-core/libguile/goops.c
diff -u guile/guile-core/libguile/goops.c:1.5
guile/guile-core/libguile/goops.c:1.6
--- guile/guile-core/libguile/goops.c:1.5 Fri Nov 24 02:55:23 2000
+++ guile/guile-core/libguile/goops.c Fri Nov 24 06:43:41 2000
@@ -218,7 +218,7 @@
while (SCM_NIMP (ls))
{
SCM el = SCM_CAR (ls);
- if (SCM_IMP (scm_memq (el, res)))
+ if (SCM_FALSEP (scm_memq (el, res)))
res = scm_cons (el, res);
ls = SCM_CDR (ls);
}
@@ -259,7 +259,7 @@
"bad slot name ~S",
SCM_LIST1 (tmp));
- if (SCM_NULLP (scm_memq (tmp, slots_already_seen))) {
+ if (SCM_FALSEP (scm_memq (tmp, slots_already_seen))) {
res = scm_cons (SCM_CAR (l), res);
slots_already_seen = scm_cons (tmp, slots_already_seen);
}
Index: guile/guile-core/libguile/goops.h
diff -u guile/guile-core/libguile/goops.h:1.3
guile/guile-core/libguile/goops.h:1.4
--- guile/guile-core/libguile/goops.h:1.3 Fri Nov 24 02:55:23 2000
+++ guile/guile-core/libguile/goops.h Fri Nov 24 06:43:41 2000
@@ -134,7 +134,7 @@
| SCM_CLASSF_SIMPLE_METHOD))
#define SCM_SLOT(x, i) (SCM_INST(x)[i])
-#define SCM_SUBCLASSP(c1, c2) SCM_NNULLP (scm_memq (c2, SCM_SLOT (c1,
scm_si_cpl)))
+#define SCM_SUBCLASSP(c1, c2) (!SCM_FALSEP (scm_memq (c2, SCM_SLOT (c1,
scm_si_cpl))))
#define SCM_IS_A_P(x, c) (SCM_NIMP (x) \
&& SCM_INSTANCEP (x) \
&& SCM_SUBCLASSP (SCM_CLASS_OF (x), c))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- guile/guile-core/libguile ChangeLog goops.c goo...,
Dirk Herrmann <=