* Makefile.am (DEFS): Added. automake adds -I options to DEFS,

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

diff --git a/libguile/list.c b/libguile/list.c
index eabd18c..35e6bdc 100644 (file)
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -44,11 +44,11 @@
 
 \f
 #include <stdio.h>
-#include "_scm.h"
-#include "eq.h"
+#include "libguile/_scm.h"
+#include "libguile/eq.h"
 
-#include "scm_validate.h"
-#include "list.h"
+#include "libguile/validate.h"
+#include "libguile/list.h"
 
 #ifdef __STDC__
 #include <stdarg.h>
@@ -69,7 +69,7 @@ scm_listify (SCM elt, ...)
   SCM *pos = &answer;
 
   var_start (foo, elt);
-  while (elt != SCM_UNDEFINED)
+  while (! SCM_UNBNDP (elt))
     {
       *pos = scm_cons (elt, SCM_EOL);
       pos = SCM_CDRLOC (*pos);
@@ -155,7 +155,7 @@ scm_ilength(SCM sx)
     /* For every two steps the hare takes, the tortoise takes one.  */
     tortoise = SCM_CDR(tortoise);
   }
-  while (hare != tortoise);
+  while (! SCM_EQ_P (hare, tortoise));
 
   /* If the tortoise ever catches the hare, then the list must contain
      a cycle.  */
@@ -266,7 +266,7 @@ SCM_DEFINE (scm_last_pair, "last-pair", 1, 0, 0,
     hare = ahead;
     tortoise = SCM_CDR(tortoise);
   }
-  while (hare != tortoise);
+  while (! SCM_EQ_P (hare, tortoise));
   SCM_MISC_ERROR ("Circular structure in position 1: ~S", SCM_LIST1 (lst));
 }
 #undef FUNC_NAME
@@ -294,7 +294,7 @@ SCM_DEFINE (scm_reverse, "reverse", 1, 0, 0,
       hare = SCM_CDR (hare);
       tortoise = SCM_CDR (tortoise);
     }
-  while (hare != tortoise);
+  while (! SCM_EQ_P (hare, tortoise));
   SCM_MISC_ERROR ("Circular structure in position 1: ~S", SCM_LIST1 (lst));
 }
 #undef FUNC_NAME
@@ -479,7 +479,7 @@ SCM_DEFINE (scm_sloppy_memq, "sloppy-memq", 2, 0, 0,
 {
   for(;  SCM_CONSP (lst);  lst = SCM_CDR(lst))
     {
-      if (SCM_CAR(lst)==x)
+      if (SCM_EQ_P (SCM_CAR (lst), x))
        return lst;
     }
   return lst;
@@ -496,7 +496,7 @@ SCM_DEFINE (scm_sloppy_memv, "sloppy-memv", 2, 0, 0,
 {
   for(;  SCM_CONSP (lst);  lst = SCM_CDR(lst))
     {
-      if (SCM_BOOL_F != scm_eqv_p (SCM_CAR(lst), x))
+      if (! SCM_FALSEP (scm_eqv_p (SCM_CAR (lst), x)))
        return lst;
     }
   return lst;
@@ -513,7 +513,7 @@ SCM_DEFINE (scm_sloppy_member, "sloppy-member", 2, 0, 0,
 {
   for(;  SCM_CONSP (lst);  lst = SCM_CDR(lst))
     {
-      if (SCM_BOOL_F != scm_equal_p (SCM_CAR(lst), x))
+      if (! SCM_FALSEP (scm_equal_p (SCM_CAR (lst), x)))
        return lst;
     }
   return lst;
@@ -534,7 +534,7 @@ SCM_DEFINE (scm_memq, "memq", 2, 0, 0,
   SCM answer;
   SCM_VALIDATE_LIST (2,lst);
   answer = scm_sloppy_memq (x, lst);
-  return (answer == SCM_EOL) ? SCM_BOOL_F : answer;
+  return (SCM_NULLP (answer)) ? SCM_BOOL_F : answer;
 }
 #undef FUNC_NAME
 
@@ -552,7 +552,7 @@ SCM_DEFINE (scm_memv, "memv", 2, 0, 0,
   SCM answer;
   SCM_VALIDATE_LIST (2,lst);
   answer = scm_sloppy_memv (x, lst);
-  return (answer == SCM_EOL) ? SCM_BOOL_F : answer;
+  return (SCM_NULLP (answer)) ? SCM_BOOL_F : answer;
 }
 #undef FUNC_NAME
 
@@ -569,7 +569,7 @@ SCM_DEFINE (scm_member, "member", 2, 0, 0,
   SCM answer;
   SCM_VALIDATE_LIST (2,lst);
   answer = scm_sloppy_member (x, lst);
-  return (answer == SCM_EOL) ? SCM_BOOL_F : answer;
+  return (SCM_NULLP (answer)) ? SCM_BOOL_F : answer;
 }
 #undef FUNC_NAME
 
@@ -596,7 +596,7 @@ SCM_DEFINE (scm_delq_x, "delq!", 2, 0, 0,
        SCM_CONSP (walk);
        walk = SCM_CDR (walk))
     {
-      if (SCM_CAR (walk) == item)
+      if (SCM_EQ_P (SCM_CAR (walk), item))
        *prev = SCM_CDR (walk);
       else
        prev = SCM_CDRLOC (walk);
@@ -619,7 +619,7 @@ SCM_DEFINE (scm_delv_x, "delv!", 2, 0, 0,
        SCM_CONSP (walk);
        walk = SCM_CDR (walk))
     {
-      if (SCM_BOOL_F != scm_eqv_p (SCM_CAR (walk), item))
+      if (! SCM_FALSEP (scm_eqv_p (SCM_CAR (walk), item)))
        *prev = SCM_CDR (walk);
       else
        prev = SCM_CDRLOC (walk);
@@ -643,7 +643,7 @@ SCM_DEFINE (scm_delete_x, "delete!", 2, 0, 0,
        SCM_CONSP (walk);
        walk = SCM_CDR (walk))
     {
-      if (SCM_BOOL_F != scm_equal_p (SCM_CAR (walk), item))
+      if (! SCM_FALSEP (scm_equal_p (SCM_CAR (walk), item)))
        *prev = SCM_CDR (walk);
       else
        prev = SCM_CDRLOC (walk);
@@ -699,7 +699,8 @@ SCM_DEFINE (scm_delete, "delete", 2, 0, 0,
 
 SCM_DEFINE (scm_delq1_x, "delq1!", 2, 0, 0,
            (SCM item, SCM lst),
-           "")
+           "Like `delq!', but only deletes the first occurrence of ITEM from LST.\n"
+            "Tests for equality using `eq?'.  See also `delv1!' and `delete1!'.")
 #define FUNC_NAME s_scm_delq1_x
 {
   SCM walk;
@@ -709,7 +710,7 @@ SCM_DEFINE (scm_delq1_x, "delq1!", 2, 0, 0,
        SCM_CONSP (walk);
        walk = SCM_CDR (walk))
     {
-      if (SCM_CAR (walk) == item)
+      if (SCM_EQ_P (SCM_CAR (walk), item))
        {
          *prev = SCM_CDR (walk);
          break;
@@ -724,8 +725,9 @@ SCM_DEFINE (scm_delq1_x, "delq1!", 2, 0, 0,
 
 
 SCM_DEFINE (scm_delv1_x, "delv1!", 2, 0, 0,
-           (SCM item, SCM lst),
-           "")
+            (SCM item, SCM lst),
+           "Like `delv!', but only deletes the first occurrence of ITEM from LST.\n"
+            "Tests for equality using `eqv?'.  See also `delq1!' and `delete1!'.")
 #define FUNC_NAME s_scm_delv1_x
 {
   SCM walk;
@@ -735,7 +737,7 @@ SCM_DEFINE (scm_delv1_x, "delv1!", 2, 0, 0,
        SCM_CONSP (walk);
        walk = SCM_CDR (walk))
     {
-      if (SCM_BOOL_F != scm_eqv_p (SCM_CAR (walk), item))
+      if (! SCM_FALSEP (scm_eqv_p (SCM_CAR (walk), item)))
        {
          *prev = SCM_CDR (walk);
          break;
@@ -750,8 +752,9 @@ SCM_DEFINE (scm_delv1_x, "delv1!", 2, 0, 0,
 
 
 SCM_DEFINE (scm_delete1_x, "delete1!", 2, 0, 0,
-           (SCM item, SCM lst),
-           "")
+            (SCM item, SCM lst),
+           "Like `delete!', but only deletes the first occurrence of ITEM from LST.\n"
+            "Tests for equality using `equal?'.  See also `delq1!' and `delv1!'.")
 #define FUNC_NAME s_scm_delete1_x
 {
   SCM walk;
@@ -761,7 +764,7 @@ SCM_DEFINE (scm_delete1_x, "delete1!", 2, 0, 0,
        SCM_CONSP (walk);
        walk = SCM_CDR (walk))
     {
-      if (SCM_BOOL_F != scm_equal_p (SCM_CAR (walk), item))
+      if (! SCM_FALSEP (scm_equal_p (SCM_CAR (walk), item)))
        {
          *prev = SCM_CDR (walk);
          break;
@@ -779,5 +782,11 @@ SCM_DEFINE (scm_delete1_x, "delete1!", 2, 0, 0,
 void
 scm_init_list ()
 {
-#include "list.x"
+#include "libguile/list.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/