summaryrefslogtreecommitdiff
path: root/libguile/struct.c
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2007-01-19 08:53:33 +0000
committerLudovic Courtès <ludo@gnu.org>2007-01-19 08:53:33 +0000
commit42ddb3cb8b30a2bba45c4ef9bf29d3ab04c6cc45 (patch)
tree4d79ba88b709060e510cf679826b5fa46583fc2d /libguile/struct.c
parente5467c4d74348e81060ec81cff8f4d7a342adff0 (diff)
downloadguile-42ddb3cb8b30a2bba45c4ef9bf29d3ab04c6cc45.tar.gz
Changes from arch/CVS synchronization
Diffstat (limited to 'libguile/struct.c')
-rw-r--r--libguile/struct.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libguile/struct.c b/libguile/struct.c
index de8667d45..69ec7e634 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -564,10 +564,15 @@ scm_i_struct_equalp (SCM s1, SCM s2)
field1 = scm_struct_ref (s1, s_field_num);
field2 = scm_struct_ref (s2, s_field_num);
- if (scm_is_false (scm_equal_p (field1, field2)))
- return SCM_BOOL_F;
+ /* Self-referencing fields (type `s') must be skipped to avoid infinite
+ recursion. */
+ if (!(scm_is_eq (field1, s1) && (scm_is_eq (field2, s2))))
+ if (scm_is_false (scm_equal_p (field1, field2)))
+ return SCM_BOOL_F;
}
+ /* FIXME: Tail elements should be tested for equality. */
+
return SCM_BOOL_T;
}
#undef FUNC_NAME