remove (ice-9 expand-support)

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

diff --git a/libguile/properties.c b/libguile/properties.c
index 6b2d4f5..321dc9e 100644 (file)
--- a/libguile/properties.c
+++ b/libguile/properties.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,2000,2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,2000,2001, 2003, 2006, 2008 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,11 +12,14 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 
 \f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include "libguile/_scm.h"
 #include "libguile/hashtab.h"
@@ -49,13 +52,14 @@ SCM_DEFINE (scm_primitive_make_property, "primitive-make-property", 1, 0, 0,
 
 SCM_DEFINE (scm_primitive_property_ref, "primitive-property-ref", 2, 0, 0,
            (SCM prop, SCM obj),
-           "Return the property @var{prop} of @var{obj}.  When no value\n"
-            "has yet been associated with @var{prop} and @var{obj}, call\n"
-           "@var{not-found-proc} instead (see @code{primitive-make-property})\n"
-           "and use its return value.  That value is also associated with\n"
-           "@var{obj} via @code{primitive-property-set!}.  When\n"
-            "@var{not-found-proc} is @code{#f}, use @code{#f} as the\n"
-           "default value of @var{prop}.")
+           "Return the property @var{prop} of @var{obj}.\n"
+           "\n"
+           "When no value has yet been associated with @var{prop} and\n"
+           "@var{obj}, the @var{not-found-proc} from @var{prop} is used.  A\n"
+           "call @code{(@var{not-found-proc} @var{prop} @var{obj})} is made\n"
+           "and the result set as the property value.  If\n"
+           "@var{not-found-proc} is @code{#f} then @code{#f} is the\n"
+           "property value.")
 #define FUNC_NAME s_scm_primitive_property_ref
 {
   SCM h;
@@ -63,19 +67,19 @@ SCM_DEFINE (scm_primitive_property_ref, "primitive-property-ref", 2, 0, 0,
   SCM_VALIDATE_CONS (SCM_ARG1, prop);
 
   h = scm_hashq_get_handle (scm_properties_whash, obj);
-  if (!SCM_FALSEP (h))
+  if (scm_is_true (h))
     {
       SCM assoc = scm_assq (prop, SCM_CDR (h));
-      if (!SCM_FALSEP (assoc))
+      if (scm_is_true (assoc))
        return SCM_CDR (assoc);
     }
 
-  if (SCM_FALSEP (SCM_CAR (prop)))
+  if (scm_is_false (SCM_CAR (prop)))
     return SCM_BOOL_F;
   else
     {
       SCM val = scm_call_2 (SCM_CAR (prop), prop, obj);
-      if (SCM_FALSEP (h))
+      if (scm_is_false (h))
        h = scm_hashq_create_handle_x (scm_properties_whash, obj, SCM_EOL);
       SCM_SETCDR (h, scm_acons (prop, val, SCM_CDR (h)));
       return val;
@@ -86,7 +90,7 @@ SCM_DEFINE (scm_primitive_property_ref, "primitive-property-ref", 2, 0, 0,
 
 SCM_DEFINE (scm_primitive_property_set_x, "primitive-property-set!", 3, 0, 0,
            (SCM prop, SCM obj, SCM val),
-           "Associate @var{code} with @var{prop} and @var{obj}.")
+           "Set the property @var{prop} of @var{obj} to @var{val}.")
 #define FUNC_NAME s_scm_primitive_property_set_x
 {
   SCM h, assoc;
@@ -113,7 +117,7 @@ SCM_DEFINE (scm_primitive_property_del_x, "primitive-property-del!", 2, 0, 0,
   SCM h;
   SCM_VALIDATE_CONS (SCM_ARG1, prop);
   h = scm_hashq_get_handle (scm_properties_whash, obj);
-  if (!SCM_FALSEP (h))
+  if (scm_is_true (h))
     SCM_SETCDR (h, scm_assq_remove_x (SCM_CDR (h), prop));
   return SCM_UNSPECIFIED;
 }