diff options
author | Andy Wingo <wingo@pobox.com> | 2010-02-18 17:10:29 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-02-18 22:15:43 +0100 |
commit | bb0229b51d53c10164f58cebbeeed85cd9dfe0b8 (patch) | |
tree | 4c63470d420dd669612828357481bfc518ddab47 /libguile/fluids.h | |
parent | 27bd1deced05d096915d47c6ea46d3b22d692e19 (diff) | |
download | guile-bb0229b51d53c10164f58cebbeeed85cd9dfe0b8.tar.gz |
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.
Diffstat (limited to 'libguile/fluids.h')
-rw-r--r-- | libguile/fluids.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/libguile/fluids.h b/libguile/fluids.h index 3a651fbf8..7aefd478f 100644 --- a/libguile/fluids.h +++ b/libguile/fluids.h @@ -3,7 +3,7 @@ #ifndef SCM_FLUIDS_H #define SCM_FLUIDS_H -/* Copyright (C) 1996,2000,2001, 2006, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1996,2000,2001, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -27,6 +27,18 @@ #include "libguile/root.h" #include "libguile/vectors.h" +/* These "with-fluids" objects live on the dynamic stack, and record previous + values of fluids. Guile uses shallow binding, so the current fluid values are + always in the same place for a given thread, in the dynamic-state vector. + */ + +#define SCM_WITH_FLUIDS_P(x) (!SCM_IMP (x) && SCM_TYP7(x) == scm_tc7_with_fluids) +#define SCM_WITH_FLUIDS_LEN(x) (SCM_CELL_WORD ((x), 0) >> 8) +#define SCM_WITH_FLUIDS_NTH_FLUID(x,n) (SCM_CELL_OBJECT ((x), 1 + (n)*2)) +#define SCM_WITH_FLUIDS_NTH_VAL(x,n) (SCM_CELL_OBJECT ((x), 2 + (n)*2)) +#define SCM_WITH_FLUIDS_SET_NTH_VAL(x,n,v) (SCM_SET_CELL_OBJECT ((x), 2 + (n)*2, (v))) + + /* Fluids. Fluids are objects of a certain type that can hold one SCM value per @@ -56,6 +68,9 @@ SCM_API SCM scm_fluid_p (SCM fl); SCM_API SCM scm_fluid_ref (SCM fluid); SCM_API SCM scm_fluid_set_x (SCM fluid, SCM value); +SCM_INTERNAL SCM scm_i_make_with_fluids (size_t n, SCM *fluids, SCM *vals); +SCM_INTERNAL void scm_i_swap_with_fluids (SCM with_fluids, SCM dynamic_state); + SCM_API SCM scm_c_with_fluids (SCM fluids, SCM vals, SCM (*cproc)(void *), void *cdata); SCM_API SCM scm_c_with_fluid (SCM fluid, SCM val, |