* * backtrace.c (scm_display_application): New procedure:

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

diff --git a/libguile/alist.c b/libguile/alist.c
index 85c4395..06ede61 100644 (file)
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -41,54 +41,47 @@
 \f
 #include <stdio.h>
 #include "_scm.h"
+#include "eq.h"
+#include "list.h"
+
+#include "alist.h"
 
 \f
 
 SCM_PROC(s_acons, "acons", 3, 0, 0, scm_acons);
-#ifdef __STDC__
-SCM 
-scm_acons (SCM w, SCM x, SCM y)
-#else
+
 SCM 
 scm_acons (w, x, y)
      SCM w;
      SCM x;
      SCM y;
-#endif
 {
   register SCM z;
   SCM_NEWCELL (z);
-  SCM_CAR (z) = w;
-  SCM_CDR (z) = x;
+  SCM_SETCAR (z, w);
+  SCM_SETCDR (z, x);
   x = z;
   SCM_NEWCELL (z);
-  SCM_CAR (z) = x;
-  SCM_CDR (z) = y;
+  SCM_SETCAR (z, x);
+  SCM_SETCDR (z, y);
   return z;
 }
 
 \f
 
 SCM_PROC (s_sloppy_assq, "sloppy-assq", 2, 0, 0, scm_sloppy_assq);
-#ifdef __STDC__
-SCM
-scm_sloppy_assq(SCM x, SCM alist)
-#else
+
 SCM
 scm_sloppy_assq(x, alist)
      SCM x;
      SCM alist;
-#endif
 {
-  SCM tmp;
-  for(;SCM_NIMP(alist);alist = SCM_CDR(alist))
+
+  for (; SCM_NIMP (alist) && SCM_CONSP (alist); alist = SCM_CDR (alist))
     {
-      if (SCM_CONSP(alist))
-       {
-         tmp = SCM_CAR(alist);
-         if (SCM_NIMP (tmp) && SCM_CONSP (tmp) && (SCM_CAR (tmp)==x))
-           return tmp;
-       }
+      SCM tmp = SCM_CAR(alist);
+      if (SCM_NIMP (tmp) && SCM_CONSP (tmp) && (SCM_CAR (tmp)==x))
+       return tmp;
     }
   return SCM_BOOL_F;
 }
@@ -96,54 +89,38 @@ scm_sloppy_assq(x, alist)
 
 
 SCM_PROC (s_sloppy_assv, "sloppy-assv", 2, 0, 0, scm_sloppy_assv);
-#ifdef __STDC__
-SCM
-scm_sloppy_assv(SCM x, SCM alist)
-#else
+
 SCM
 scm_sloppy_assv(x, alist)
      SCM x;
      SCM alist;
-#endif
 {
-  SCM tmp;
-  for(;SCM_NIMP(alist);alist = SCM_CDR(alist))
+  for (; SCM_NIMP (alist) && SCM_CONSP (alist); alist = SCM_CDR (alist))
     {
-      if (SCM_CONSP(alist))
-       {
-         tmp = SCM_CAR(alist);
-         if (   SCM_NIMP (tmp)
-             && SCM_CONSP (tmp)
-             && SCM_NFALSEP (scm_eqv_p (SCM_CAR (tmp), x)))
-           return tmp;
-       }
+      SCM tmp = SCM_CAR(alist);
+      if (SCM_NIMP (tmp)
+         && SCM_CONSP (tmp)
+         && SCM_NFALSEP (scm_eqv_p (SCM_CAR (tmp), x)))
+       return tmp;
     }
   return SCM_BOOL_F;
 }
 
 
 SCM_PROC (s_sloppy_assoc, "sloppy-assoc", 2, 0, 0, scm_sloppy_assoc);
-#ifdef __STDC__
-SCM
-scm_sloppy_assoc(SCM x, SCM alist)
-#else
+
 SCM
 scm_sloppy_assoc(x, alist)
      SCM x;
      SCM alist;
-#endif
 {
-  SCM tmp;
-  for(;SCM_NIMP(alist);alist = SCM_CDR(alist))
+  for (; SCM_NIMP (alist) && SCM_CONSP (alist); alist = SCM_CDR (alist))
     {
-      if (SCM_CONSP(alist))
-       {
-         tmp = SCM_CAR(alist);
-         if (   SCM_NIMP (tmp)
-             && SCM_CONSP (tmp)
-             && SCM_NFALSEP (scm_equal_p (SCM_CAR (tmp), x)))
-           return tmp;
-       }
+      SCM tmp = SCM_CAR(alist);
+      if (SCM_NIMP (tmp)
+         && SCM_CONSP (tmp)
+         && SCM_NFALSEP (scm_equal_p (SCM_CAR (tmp), x)))
+       return tmp;
     }
   return SCM_BOOL_F;
 }
@@ -152,15 +129,11 @@ scm_sloppy_assoc(x, alist)
 \f
 
 SCM_PROC(s_assq, "assq", 2, 0, 0, scm_assq);
-#ifdef __STDC__
-SCM
-scm_assq(SCM x, SCM alist)
-#else
+
 SCM
 scm_assq(x, alist)
      SCM x;
      SCM alist;
-#endif
 {
        SCM tmp;
        for(;SCM_NIMP(alist);alist = SCM_CDR(alist)) {
@@ -175,15 +148,11 @@ scm_assq(x, alist)
 
 
 SCM_PROC(s_assv, "assv", 2, 0, 0, scm_assv);
-#ifdef __STDC__
-SCM
-scm_assv(SCM x, SCM alist)
-#else
+
 SCM
 scm_assv(x, alist)
      SCM x;
      SCM alist;
-#endif
 {
   SCM tmp;
   for(;SCM_NIMP(alist);alist = SCM_CDR(alist)) {
@@ -201,15 +170,11 @@ scm_assv(x, alist)
 
 
 SCM_PROC(s_assoc, "assoc", 2, 0, 0, scm_assoc);
-#ifdef __STDC__
-SCM
-scm_assoc(SCM x, SCM alist)
-#else
+
 SCM
 scm_assoc(x, alist)
      SCM x;
      SCM alist;
-#endif
 {
        SCM tmp;
        for(;SCM_NIMP(alist);alist = SCM_CDR(alist)) {
@@ -226,15 +191,11 @@ scm_assoc(x, alist)
 \f
 
 SCM_PROC (s_assq_ref, "assq-ref", 2, 0, 0, scm_assq_ref);
-#ifdef __STDC__
-SCM
-scm_assq_ref (SCM alist, SCM key)
-#else
+
 SCM
 scm_assq_ref (alist, key)
      SCM alist;
      SCM key;
-#endif
 {
   SCM handle;
 
@@ -248,15 +209,11 @@ scm_assq_ref (alist, key)
 
 
 SCM_PROC (s_assv_ref, "assv-ref", 2, 0, 0, scm_assv_ref);
-#ifdef __STDC__
-SCM
-scm_assv_ref (SCM alist, SCM key)
-#else
+
 SCM
 scm_assv_ref (alist, key)
      SCM alist;
      SCM key;
-#endif
 {
   SCM handle;
 
@@ -270,15 +227,11 @@ scm_assv_ref (alist, key)
 
 
 SCM_PROC (s_assoc_ref, "assoc-ref", 2, 0, 0, scm_assoc_ref);
-#ifdef __STDC__
-SCM
-scm_assoc_ref (SCM alist, SCM key)
-#else
+
 SCM
 scm_assoc_ref (alist, key)
      SCM alist;
      SCM key;
-#endif
 {
   SCM handle;
 
@@ -296,16 +249,12 @@ scm_assoc_ref (alist, key)
 
 
 SCM_PROC (s_assq_set_x, "assq-set!", 3, 0, 0, scm_assq_set_x);
-#ifdef __STDC__
-SCM
-scm_assq_set_x (SCM alist, SCM key, SCM val)
-#else
+
 SCM
 scm_assq_set_x (alist, key, val)
      SCM alist;
      SCM key;
      SCM val;
-#endif
 {
   SCM handle;
 
@@ -320,16 +269,12 @@ scm_assq_set_x (alist, key, val)
 }
 
 SCM_PROC (s_assv_set_x, "assv-set!", 3, 0, 0, scm_assv_set_x);
-#ifdef __STDC__
-SCM
-scm_assv_set_x (SCM alist, SCM key, SCM val)
-#else
+
 SCM
 scm_assv_set_x (alist, key, val)
      SCM alist;
      SCM key;
      SCM val;
-#endif
 {
   SCM handle;
 
@@ -344,16 +289,12 @@ scm_assv_set_x (alist, key, val)
 }
 
 SCM_PROC (s_assoc_set_x, "assoc-set!", 3, 0, 0, scm_assoc_set_x);
-#ifdef __STDC__
-SCM
-scm_assoc_set_x (SCM alist, SCM key, SCM val)
-#else
+
 SCM
 scm_assoc_set_x (alist, key, val)
      SCM alist;
      SCM key;
      SCM val;
-#endif
 {
   SCM handle;
 
@@ -371,15 +312,11 @@ scm_assoc_set_x (alist, key, val)
 \f
 
 SCM_PROC (s_assq_remove_x, "assq-remove!", 2, 0, 0, scm_assq_remove_x);
-#ifdef __STDC__
-SCM
-scm_assq_remove_x (SCM alist, SCM key)
-#else
+
 SCM
 scm_assq_remove_x (alist, key)
      SCM alist;
      SCM key;
-#endif
 {
   SCM handle;
 
@@ -394,15 +331,11 @@ scm_assq_remove_x (alist, key)
 
 
 SCM_PROC (s_assv_remove_x, "assv-remove!", 2, 0, 0, scm_assv_remove_x);
-#ifdef __STDC__
-SCM
-scm_assv_remove_x (SCM alist, SCM key)
-#else
+
 SCM
 scm_assv_remove_x (alist, key)
      SCM alist;
      SCM key;
-#endif
 {
   SCM handle;
 
@@ -417,15 +350,11 @@ scm_assv_remove_x (alist, key)
 
 
 SCM_PROC (s_assoc_remove_x, "assoc-remove!", 2, 0, 0, scm_assoc_remove_x);
-#ifdef __STDC__
-SCM
-scm_assoc_remove_x (SCM alist, SCM key)
-#else
+
 SCM
 scm_assoc_remove_x (alist, key)
      SCM alist;
      SCM key;
-#endif
 {
   SCM handle;
 
@@ -442,13 +371,9 @@ scm_assoc_remove_x (alist, key)
 \f
 
 
-#ifdef __STDC__
-void
-scm_init_alist (void)
-#else
+
 void
 scm_init_alist ()
-#endif
 {
 #include "alist.x"
 }