guile/guile-core/libguile fluids.h fluids.c

[Marius Vollmer]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Marius Vollmer <address@hidden> 01/05/18 17:36:22

Modified files:
        guile-core/libguile: fluids.h fluids.c 

Log message:
        (scm_internal_with_fluids): Deprecated.
        (scm_c_with_fluids): Renamed from scm_internal_with_fluids.
        (scm_c_with_fluid): New.
        (scm_with_fluids): Use scm_c_with_fluids instead of
        scm_internal_with_fluids.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/fluids.h.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/fluids.c.diff?cvsroot=OldCVS&tr1=1.33&tr2=1.34&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/fluids.c
diff -u guile/guile-core/libguile/fluids.c:1.33 
guile/guile-core/libguile/fluids.c:1.34
--- guile/guile-core/libguile/fluids.c:1.33     Tue Apr 17 02:15:39 2001
+++ guile/guile-core/libguile/fluids.c  Fri May 18 17:36:22 2001
@@ -51,6 +51,7 @@
 #include "libguile/alist.h"
 #include "libguile/eval.h"
 #include "libguile/ports.h"
+#include "libguile/deprecation.h"
 
 #define INITIAL_FLUIDS 10
 #include "libguile/validate.h"
@@ -224,13 +225,13 @@
            "one after another.  @var{thunk} must be a procedure with no 
argument.")
 #define FUNC_NAME s_scm_with_fluids
 {
-  return scm_internal_with_fluids (fluids, values, apply_thunk, (void *) 
SCM_UNPACK (thunk));
+  return scm_c_with_fluids (fluids, values, apply_thunk, (void *) SCM_UNPACK 
(thunk));
 }
 #undef FUNC_NAME
 
 SCM
-scm_internal_with_fluids (SCM fluids, SCM values, SCM (*cproc) (), void *cdata)
-#define FUNC_NAME "scm_internal_with_fluids"
+scm_c_with_fluids (SCM fluids, SCM values, SCM (*cproc) (), void *cdata)
+#define FUNC_NAME "scm_c_with_fluids"
 {
   SCM ans;
   int flen, vlen;
@@ -248,8 +249,15 @@
   return ans;
 }
 #undef FUNC_NAME
-
 
+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),
+                           cproc, cdata);
+}
+#undef FUNC_NAME
 
 void
 scm_init_fluids ()
@@ -260,6 +268,19 @@
 #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:
Index: guile/guile-core/libguile/fluids.h
diff -u guile/guile-core/libguile/fluids.h:1.12 
guile/guile-core/libguile/fluids.h:1.13
--- guile/guile-core/libguile/fluids.h:1.12     Fri Dec  8 09:32:56 2000
+++ guile/guile-core/libguile/fluids.h  Fri May 18 17:36:22 2001
@@ -95,8 +95,10 @@
 SCM scm_fluid_ref (SCM fluid);
 SCM scm_fluid_set_x (SCM fluid, SCM value);
 
-SCM scm_internal_with_fluids (SCM fluids, SCM vals,
-                              SCM (*cproc)(void *), void *cdata);
+SCM scm_c_with_fluids (SCM fluids, SCM vals,
+                      SCM (*cproc)(void *), void *cdata);
+SCM scm_c_with_fluid (SCM fluid, SCM val,
+                     SCM (*cproc)(void *), void *cdata);
 SCM scm_with_fluids (SCM fluids, SCM vals, SCM thunk);
 
 SCM scm_make_initial_fluids (void);
@@ -105,6 +107,14 @@
 void scm_swap_fluids_reverse (SCM fluids, SCM vals);
 
 void scm_init_fluids (void);
+
+#if SCM_DEBUG_DEPRECATED == 0
+
+/* Use scm_c_with_fluids instead. */
+SCM scm_internal_with_fluids (SCM fluids, SCM vals,
+                              SCM (*cproc)(void *), void *cdata);
+
+#endif
 
 #endif /* !FLUIDSH */