(root_mark): Mark active_asyncs slot.

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

diff --git a/libguile/fluids.c b/libguile/fluids.c
index 9aba42b..c975be4 100644 (file)
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -39,8 +39,6 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
 
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
-   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
 
 
 #include "libguile/_scm.h"
@@ -52,6 +50,7 @@
 #include "libguile/eval.h"
 #include "libguile/ports.h"
 #include "libguile/deprecation.h"
+#include "libguile/lang.h"
 
 #define INITIAL_FLUIDS 10
 #include "libguile/validate.h"
@@ -77,12 +76,12 @@ grow_fluids (scm_root_state *root_state, int new_length)
   i = 0;
   while (i < old_length)
     {
-      SCM_VELTS(new_fluids)[i] = SCM_VELTS(old_fluids)[i];
+      SCM_VECTOR_SET (new_fluids, i, SCM_VELTS(old_fluids)[i]);
       i++;
     }
   while (i < new_length)
     {
-      SCM_VELTS(new_fluids)[i] = SCM_BOOL_F;
+      SCM_VECTOR_SET (new_fluids, i, SCM_BOOL_F);
       i++;
     }
 
@@ -172,7 +171,7 @@ SCM_DEFINE (scm_fluid_set_x, "fluid-set!", 2, 0, 0,
 
   if (SCM_VECTOR_LENGTH (scm_root->fluids) <= n)
     grow_fluids (scm_root, n+1);
-  SCM_VELTS (scm_root->fluids)[n] = value;
+  SCM_VECTOR_SET (scm_root->fluids, n, value);
   return SCM_UNSPECIFIED;
 }
 #undef FUNC_NAME
@@ -180,7 +179,7 @@ SCM_DEFINE (scm_fluid_set_x, "fluid-set!", 2, 0, 0,
 void
 scm_swap_fluids (SCM fluids, SCM vals)
 {
-  while (!SCM_NULLP (fluids))
+  while (!SCM_NULL_OR_NIL_P (fluids))
     {
       SCM fl = SCM_CAR (fluids);
       SCM old_val = scm_fluid_ref (fl);
@@ -197,7 +196,7 @@ same fluid appears multiple times in the fluids list. */
 void
 scm_swap_fluids_reverse (SCM fluids, SCM vals)
 {
-  if (!SCM_NULLP (fluids))
+  if (!SCM_NULL_OR_NIL_P (fluids))
     {
       SCM fl, old_val;
 
@@ -213,7 +212,7 @@ scm_swap_fluids_reverse (SCM fluids, SCM vals)
 static SCM
 apply_thunk (void *thunk)
 {
-  return scm_apply (SCM_PACK (thunk), SCM_EOL, SCM_EOL);
+  return scm_call_0 (SCM_PACK (thunk));
 }
 
 SCM_DEFINE (scm_with_fluids, "with-fluids*", 3, 0, 0, 
@@ -253,7 +252,7 @@ SCM
 scm_c_with_fluid (SCM fluid, SCM value, SCM (*cproc) (), void *cdata)
 #define FUNC_NAME "scm_c_with_fluid"
 {
-  return scm_c_with_fluids (SCM_LIST1 (fluid), SCM_LIST1 (value),
+  return scm_c_with_fluids (scm_list_1 (fluid), scm_list_1 (value),
                            cproc, cdata);
 }
 #undef FUNC_NAME
@@ -263,24 +262,9 @@ scm_init_fluids ()
 {
   scm_tc16_fluid = scm_make_smob_type ("fluid", 0);
   scm_set_smob_print (scm_tc16_fluid, fluid_print);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/fluids.x"
-#endif
 }
 
-#if SCM_DEBUG_DEPRECATED == 0
-
-SCM
-scm_internal_with_fluids (SCM fluids, SCM values, SCM (*cproc) (), void *cdata)
-{
-  scm_c_issue_deprecation_warning ("`scm_internal_with_fluids' is deprecated. "
-                                  "Use `scm_c_with_fluids' instead.");
-
-  return scm_c_with_fluids (fluids, values, cproc, cdata);
-}
-
-#endif
-
 /*
   Local Variables:
   c-file-style: "gnu"