diff options
author | Andy Wingo <wingo@pobox.com> | 2011-05-13 12:42:01 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-05-13 13:49:32 +0200 |
commit | d223c3fcdde81280ea8fb9a4b05897786014bbce (patch) | |
tree | c115c349078a1cbdf225cd9cd1e3c0bba14422a7 /libguile/modules.c | |
parent | b2feee6bc0d440a20c2c8cbb7b3d03c957c2c417 (diff) | |
download | guile-d223c3fcdde81280ea8fb9a4b05897786014bbce.tar.gz |
scm_is_eq for SCM vals, not == or !=
* libguile/bytevectors.c (scm_make_bytevector, STRING_TO_UTF)
(UTF_TO_STRING):
* libguile/continuations.c (scm_i_check_continuation):
* libguile/expand.h (SCM_EXPANDED_P):
* libguile/fluids.c (scm_i_make_with_fluids):
* libguile/generalized-vectors.c (scm_make_generalized_vector):
* libguile/goops.c (SCM_GOOPS_UNBOUNDP, slot_definition_using_name):
(scm_c_extend_primitive_generic, more_specificp, scm_make)
* libguile/i18n.c (SCM_VALIDATE_OPTIONAL_LOCALE_COPY):
(scm_locale_string_to_integer)
* libguile/modules.c (resolve_duplicate_binding):
(scm_module_reverse_lookup)
* libguile/posix.c (scm_to_resource):
* libguile/r6rs-ports.c (scm_put_bytevector):
* libguile/socket.c (scm_connect, scm_bind, scm_sendto
* libguile/stacks.c (find_prompt):
* libguile/variable.c (scm_variable_ref, scm_variable_bound_p):
* libguile/vm-engine.h (ASSERT_BOUND_VARIABLE, ASSERT_BOUND)
* libguile/vm-i-system.c (VARIABLE_BOUNDP, local_bound)
(long_local_bound, fluid_ref): Use scm_is_eq to compare, not == / !=.
Diffstat (limited to 'libguile/modules.c')
-rw-r--r-- | libguile/modules.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/modules.c b/libguile/modules.c index e06082186..a9fe3b3d9 100644 --- a/libguile/modules.c +++ b/libguile/modules.c @@ -304,8 +304,8 @@ resolve_duplicate_binding (SCM module, SCM sym, val1 = SCM_VARIABLE_REF (var1); val2 = SCM_VARIABLE_REF (var2); - val1 = (val1 == SCM_UNSPECIFIED) ? SCM_BOOL_F : val1; - val2 = (val2 == SCM_UNSPECIFIED) ? SCM_BOOL_F : val2; + val1 = scm_is_eq (val1, SCM_UNSPECIFIED) ? SCM_BOOL_F : val1; + val2 = scm_is_eq (val2, SCM_UNSPECIFIED) ? SCM_BOOL_F : val2; handlers = SCM_MODULE_DUPLICATE_HANDLERS (module); if (scm_is_false (handlers)) @@ -954,7 +954,7 @@ SCM_DEFINE (scm_module_reverse_lookup, "module-reverse-lookup", 2, 0, 0, } else { - if (SCM_CDR (handle) == variable) + if (scm_is_eq (SCM_CDR (handle), variable)) return SCM_CAR (handle); } |