*** empty log message ***

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

diff --git a/libguile/fluids.c b/libguile/fluids.c
index ea6c160..826883e 100644 (file)
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -1,46 +1,20 @@
 /* Copyright (C) 1996,1997,2000,2001 Free Software Foundation, Inc.
  * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  */
+ * 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
+ */
 
-/* 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 +26,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 +52,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 +147,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 +155,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 +172,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;
 
@@ -263,24 +238,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"