Changes in doc/ref:

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

diff --git a/libguile/alist.c b/libguile/alist.c
index 2dd6057..07bd643 100644 (file)
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -44,6 +44,7 @@
 #include "libguile/_scm.h"
 #include "libguile/eq.h"
 #include "libguile/list.h"
+#include "libguile/lang.h"
 
 #include "libguile/validate.h"
 #include "libguile/alist.h"
@@ -58,9 +59,9 @@ SCM_DEFINE (scm_acons, "acons", 3, 0, 0,
            "function is @emph{not} destructive; @var{alist} is not modified.")
 #define FUNC_NAME s_scm_acons
 {
-  return scm_alloc_cell (SCM_UNPACK (scm_alloc_cell (SCM_UNPACK (key),
-                                                    SCM_UNPACK (value))),
-                        SCM_UNPACK (alist));
+  return scm_cell (SCM_UNPACK (scm_cell (SCM_UNPACK (key),
+                                        SCM_UNPACK (value))),
+                  SCM_UNPACK (alist));
 }
 #undef FUNC_NAME
 
@@ -144,7 +145,7 @@ SCM_DEFINE (scm_assq, "assq", 2, 0, 0,
       if (SCM_EQ_P (SCM_CAR (tmp), key))
        return tmp;
     }
-  SCM_ASSERT_TYPE (SCM_NULLP (ls), alist, SCM_ARG2, FUNC_NAME,
+  SCM_ASSERT_TYPE (SCM_NULL_OR_NIL_P (ls), alist, SCM_ARG2, FUNC_NAME,
                   "association list");
   return SCM_BOOL_F;
 }
@@ -165,7 +166,7 @@ SCM_DEFINE (scm_assv, "assv", 2, 0, 0,
       if (SCM_NFALSEP (scm_eqv_p (SCM_CAR (tmp), key)))
        return tmp;
     }
-  SCM_ASSERT_TYPE (SCM_NULLP (ls), alist, SCM_ARG2, FUNC_NAME,
+  SCM_ASSERT_TYPE (SCM_NULL_OR_NIL_P (ls), alist, SCM_ARG2, FUNC_NAME,
                   "association list");
   return SCM_BOOL_F;
 }
@@ -186,7 +187,7 @@ SCM_DEFINE (scm_assoc, "assoc", 2, 0, 0,
       if (SCM_NFALSEP (scm_equal_p (SCM_CAR (tmp), key)))
        return tmp;
     }
-  SCM_ASSERT_TYPE (SCM_NULLP (ls), alist, SCM_ARG2, FUNC_NAME,
+  SCM_ASSERT_TYPE (SCM_NULL_OR_NIL_P (ls), alist, SCM_ARG2, FUNC_NAME,
                   "association list");
   return SCM_BOOL_F;
 }