From bb0229b51d53c10164f58cebbeeed85cd9dfe0b8 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 18 Feb 2010 17:10:29 +0100 Subject: add with-fluids objects and primitive syntax * libguile/tags.h (scm_tc7_with_fluids): Allocate a tc7 for "with-fluids" objects, which will only live on the dynamic stack (wind list), not in normal scheme-land. * libguile/fluids.h (SCM_WITH_FLUIDS_P, SCM_WITH_FLUIDS_LEN) (SCM_WITH_FLUIDS_NTH_FLUID, SCM_WITH_FLUIDS_NTH_VAL) (SCM_WITH_FLUIDS_SET_NTH_VAL): Add some accessors. * libguile/fluids.c (scm_i_make_with_fluids, scm_i_swap_with_fluids): New internal functions. (scm_c_with_fluids, scm_c_with_fluid): Push with-fluids objects on the dynwind list, not winders. * libguile/dynwind.c (scm_i_dowinds): Add cases for winding and unwinding with-fluids objects. * libguile/memoize.h (scm_sym_with_fluids, SCM_M_BEGIN): New public data. * libguile/memoize.c (scm_m_with_fluids): Define with-fluids as a primitive syntax. (unmemoize): Add with-fluids case. * libguile/eval.c (eval): * module/ice-9/eval.scm (primitive-eval): Add with-fluids cases. * test-suite/tests/fluids.test ("fluids not modified if nonfluid passed to with-fluids"): Enable a now-passing test. --- libguile/dynwind.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libguile/dynwind.c') diff --git a/libguile/dynwind.c b/libguile/dynwind.c index 5eccb176f..18e38b995 100644 --- a/libguile/dynwind.c +++ b/libguile/dynwind.c @@ -257,6 +257,11 @@ scm_i_dowinds (SCM to, long delta, void (*turn_func) (void *), void *data) if (WINDER_REWIND_P (wind_elt)) WINDER_PROC (wind_elt) (WINDER_DATA (wind_elt)); } + else if (SCM_WITH_FLUIDS_P (wind_elt)) + { + scm_i_swap_with_fluids (wind_elt, + SCM_I_CURRENT_THREAD->dynamic_state); + } else { wind_key = SCM_CAR (wind_elt); @@ -294,6 +299,11 @@ scm_i_dowinds (SCM to, long delta, void (*turn_func) (void *), void *data) if (!WINDER_REWIND_P (wind_elt)) WINDER_PROC (wind_elt) (WINDER_DATA (wind_elt)); } + else if (SCM_WITH_FLUIDS_P (wind_elt)) + { + scm_i_swap_with_fluids (wind_elt, + SCM_I_CURRENT_THREAD->dynamic_state); + } else { wind_key = SCM_CAR (wind_elt); -- cgit v1.2.3