diff options
Diffstat (limited to 'libguile/dynwind.c')
-rw-r--r-- | libguile/dynwind.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libguile/dynwind.c b/libguile/dynwind.c index f39d59d73..bd6a82452 100644 --- a/libguile/dynwind.c +++ b/libguile/dynwind.c @@ -120,11 +120,11 @@ scm_internal_dynamic_wind (scm_t_guard before, { SCM ans; - scm_frame_begin (SCM_F_FRAME_REWINDABLE); - scm_frame_rewind_handler (before, guard_data, SCM_F_WIND_EXPLICITLY); - scm_frame_unwind_handler (after, guard_data, SCM_F_WIND_EXPLICITLY); + scm_dynwind_begin (SCM_F_DYNWIND_REWINDABLE); + scm_dynwind_rewind_handler (before, guard_data, SCM_F_WIND_EXPLICITLY); + scm_dynwind_unwind_handler (after, guard_data, SCM_F_WIND_EXPLICITLY); ans = inner (inner_data); - scm_frame_end (); + scm_dynwind_end (); return ans; } @@ -149,17 +149,17 @@ static scm_t_bits tc16_winder; #define WINDER_MARK_P(w) (SCM_SMOB_FLAGS(w) & WINDER_F_MARK) void -scm_frame_begin (scm_t_frame_flags flags) +scm_dynwind_begin (scm_t_dynwind_flags flags) { SCM f; SCM_NEWSMOB (f, tc16_frame, 0); - if (flags & SCM_F_FRAME_REWINDABLE) + if (flags & SCM_F_DYNWIND_REWINDABLE) SCM_SET_SMOB_FLAGS (f, FRAME_F_REWINDABLE); scm_i_set_dynwinds (scm_cons (f, scm_i_dynwinds ())); } void -scm_frame_end (void) +scm_dynwind_end (void) { SCM winds; @@ -195,8 +195,8 @@ winder_mark (SCM w) } void -scm_frame_unwind_handler (void (*proc) (void *), void *data, - scm_t_wind_flags flags) +scm_dynwind_unwind_handler (void (*proc) (void *), void *data, + scm_t_wind_flags flags) { SCM w; SCM_NEWSMOB2 (w, tc16_winder, (scm_t_bits) proc, (scm_t_bits) data); @@ -206,8 +206,8 @@ scm_frame_unwind_handler (void (*proc) (void *), void *data, } void -scm_frame_rewind_handler (void (*proc) (void *), void *data, - scm_t_wind_flags flags) +scm_dynwind_rewind_handler (void (*proc) (void *), void *data, + scm_t_wind_flags flags) { SCM w; SCM_NEWSMOB2 (w, tc16_winder, (scm_t_bits) proc, (scm_t_bits) data); @@ -218,8 +218,8 @@ scm_frame_rewind_handler (void (*proc) (void *), void *data, } void -scm_frame_unwind_handler_with_scm (void (*proc) (SCM), SCM data, - scm_t_wind_flags flags) +scm_dynwind_unwind_handler_with_scm (void (*proc) (SCM), SCM data, + scm_t_wind_flags flags) { SCM w; scm_t_bits fl = ((flags&SCM_F_WIND_EXPLICITLY)? WINDER_F_EXPLICIT : 0); @@ -229,8 +229,8 @@ scm_frame_unwind_handler_with_scm (void (*proc) (SCM), SCM data, } void -scm_frame_rewind_handler_with_scm (void (*proc) (SCM), SCM data, - scm_t_wind_flags flags) +scm_dynwind_rewind_handler_with_scm (void (*proc) (SCM), SCM data, + scm_t_wind_flags flags) { SCM w; SCM_NEWSMOB2 (w, tc16_winder, (scm_t_bits) proc, SCM_UNPACK (data)); @@ -241,9 +241,9 @@ scm_frame_rewind_handler_with_scm (void (*proc) (SCM), SCM data, } void -scm_frame_free (void *mem) +scm_dynwind_free (void *mem) { - scm_frame_unwind_handler (free, mem, SCM_F_WIND_EXPLICITLY); + scm_dynwind_unwind_handler (free, mem, SCM_F_WIND_EXPLICITLY); } #ifdef GUILE_DEBUG |