diff options
author | Andy Wingo <wingo@pobox.com> | 2013-06-28 20:01:35 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-06-28 20:01:35 +0200 |
commit | 98eaef1b50db626c672646da58645c62407d0c1a (patch) | |
tree | 814a737a115dff5f6c5230b3b27d51c140d6b7ac /libguile/dynstack.h | |
parent | c32b7c4cef1c63a677a1c447a0386e90ab2ecd42 (diff) | |
download | guile-98eaef1b50db626c672646da58645c62407d0c1a.tar.gz |
Simplify dynstack API to only wind one fluid at a time
* libguile/dynstack.h (SCM_DYNSTACK_TYPE_WITH_FLUID): Rename from
with-fluids.
* libguile/dynstack.c (scm_dynstack_push_fluid):
(scm_dynstack_unwind_fluid): Change API to only wind/unwind one
fluid binding.
(WITH_FLUID_WORDS): New define, always 2 words (fluid and value box).
(WITH_FLUID_FLUID, WITH_FLUID_VALUE_BOX): New macros to get offsets of
fluid and value box.
(scm_dynstack_push_rewinder, scm_dynstack_push_unwinder): Use
WINDER_WORDS.
(scm_dynstack_push_dynwind): Use DYNWIND_WORDS.
(scm_dynstack_wind_1): Update for scm_swap_fluid API change.
* libguile/fluids.h:
* libguile/fluids.c (scm_prepare_fluids): Remove; no longer needed.
(scm_swap_fluid): Update to just swap one fluid binding.
(scm_c_with_fluids, scm_c_with_fluid): Update to use
scm_dynstack_push_fluid.
* libguile/memoize.c (do_push_fluid, do_pop_fluid): Adapt to API
change.
* libguile/vm-engine.c (rtl_vm_engine): Change wind-fluids / unwind-fluids
to push-fluid / pop-fluid, and actually enable. Woo!
* libguile/vm-i-system.c (push-fluid, pop-fluid): Update to new API.
Diffstat (limited to 'libguile/dynstack.h')
-rw-r--r-- | libguile/dynstack.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libguile/dynstack.h b/libguile/dynstack.h index 207638ec7..c27c675dd 100644 --- a/libguile/dynstack.h +++ b/libguile/dynstack.h @@ -3,7 +3,7 @@ #ifndef SCM_DYNSTACK_H #define SCM_DYNSTACK_H -/* Copyright (C) 2012 Free Software Foundation, Inc. +/* Copyright (C) 2012, 2013 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 @@ -79,7 +79,7 @@ typedef enum { SCM_DYNSTACK_TYPE_FRAME, SCM_DYNSTACK_TYPE_UNWINDER, SCM_DYNSTACK_TYPE_REWINDER, - SCM_DYNSTACK_TYPE_WITH_FLUIDS, + SCM_DYNSTACK_TYPE_WITH_FLUID, SCM_DYNSTACK_TYPE_PROMPT, SCM_DYNSTACK_TYPE_DYNWIND, } scm_t_dynstack_item_type; @@ -148,11 +148,9 @@ SCM_INTERNAL void scm_dynstack_push_rewinder (scm_t_dynstack *, SCM_INTERNAL void scm_dynstack_push_unwinder (scm_t_dynstack *, scm_t_dynstack_winder_flags, scm_t_guard, void *); -SCM_INTERNAL void scm_dynstack_push_fluids (scm_t_dynstack *, - size_t, - SCM *fluids, - SCM *values, - SCM dynamic_state); +SCM_INTERNAL void scm_dynstack_push_fluid (scm_t_dynstack *, + SCM fluid, SCM value, + SCM dynamic_state); SCM_INTERNAL void scm_dynstack_push_prompt (scm_t_dynstack *, scm_t_dynstack_prompt_flags, SCM key, @@ -187,8 +185,8 @@ SCM_INTERNAL scm_t_bits* scm_dynstack_unwind_fork (scm_t_dynstack *, scm_t_dynstack *); SCM_INTERNAL void scm_dynstack_unwind_frame (scm_t_dynstack *); -SCM_INTERNAL void scm_dynstack_unwind_fluids (scm_t_dynstack *dynstack, - SCM dynamic_state); +SCM_INTERNAL void scm_dynstack_unwind_fluid (scm_t_dynstack *dynstack, + SCM dynamic_state); SCM_INTERNAL scm_t_bits* scm_dynstack_find_prompt (scm_t_dynstack *, SCM, scm_t_dynstack_prompt_flags *, |