Lots of fixes to make guile (at some time) compile with strict typing.

[bpt/guile.git] / libguile / objects.c

diff --git a/libguile/objects.c b/libguile/objects.c
index 6421e10..d1473d3 100644 (file)
--- a/libguile/objects.c
+++ b/libguile/objects.c
@@ -179,7 +179,7 @@ scm_class_of (SCM x)
          else if (SCM_OBJ_CLASS_FLAGS (x) & SCM_CLASSF_GOOPS)
            {
              /* Goops object */
-             if (SCM_OBJ_CLASS_REDEF (x) != SCM_BOOL_F)
+             if (! SCM_FALSEP (SCM_OBJ_CLASS_REDEF (x)))
                scm_change_object_class (x,
                                         SCM_CLASS_OF (x),         /* old */
                                         SCM_OBJ_CLASS_REDEF (x)); /* new */
@@ -295,7 +295,7 @@ scm_mcache_lookup_cmethod (SCM cache, SCM args)
        do
          {
            /* More arguments than specifiers => CLASS != ENV */
-           if (scm_class_of (SCM_CAR (ls)) != SCM_CAR (z))
+           if (! SCM_EQ_P (scm_class_of (SCM_CAR (ls)), SCM_CAR (z)))
              goto next_method;
            ls = SCM_CDR (ls);
            z = SCM_CDR (z);
@@ -441,7 +441,7 @@ SCM_DEFINE (scm_make_class_object, "make-class-object", 2, 0, 0,
   unsigned long flags = 0;
   SCM_VALIDATE_STRUCT (1,metaclass);
   SCM_VALIDATE_STRING (2,layout);
-  if (metaclass == scm_metaclass_operator)
+  if (SCM_EQ_P (metaclass, scm_metaclass_operator))
     flags = SCM_CLASSF_OPERATOR;
   return scm_i_make_class_object (metaclass, layout, flags);
 }