mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 12:20:26 +02:00
Code Activity

excise scm_internal_dynamic_wind from goops.c

Browse source 
* libguile/goops.c (go_to_hell, go_to_heaven, purgatory):
  (scm_change_object_class): Rewrite to use scm_dynwind_begin instead of
  scm_dynamic_wind.
This commit is contained in:
Andy Wingo 2011-05-13 12:24:04 +02:00
parent c98ce8f599
commit b5df9cda41
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libguile/goops.c
View file

@ -1599,7 +1599,7 @@ burnin (SCM o)
static void static void
go_to_hell (void *o) go_to_hell (void *o)
{ {
SCM obj = SCM_PACK ((scm_t_bits) o); SCM obj = *(SCM*)o;
scm_lock_mutex (hell_mutex); scm_lock_mutex (hell_mutex);
if (n_hell >= hell_size) if (n_hell >= hell_size)
{ {
@ -1613,8 +1613,9 @@ go_to_hell (void *o)
static void static void
go_to_heaven (void *o) go_to_heaven (void *o)
{ {
SCM obj = *(SCM*)o;
scm_lock_mutex (hell_mutex); scm_lock_mutex (hell_mutex);
hell[burnin (SCM_PACK ((scm_t_bits) o))] = hell[--n_hell]; hell[burnin (obj)] = hell[--n_hell];
scm_unlock_mutex (hell_mutex); scm_unlock_mutex (hell_mutex);
} }
@ -1622,10 +1623,9 @@ go_to_heaven (void *o)
SCM_SYMBOL (scm_sym_change_class, "change-class"); SCM_SYMBOL (scm_sym_change_class, "change-class");
static SCM static SCM
purgatory (void *args) purgatory (SCM obj, SCM new_class)
{ {
return scm_apply_0 (SCM_VARIABLE_REF (var_change_class), return scm_call_2 (SCM_VARIABLE_REF (var_change_class), obj, new_class);
SCM_PACK ((scm_t_bits) args));
} }
/* This function calls the generic function change-class for all /* This function calls the generic function change-class for all
@ -1636,9 +1636,13 @@ void
scm_change_object_class (SCM obj, SCM old_class SCM_UNUSED, SCM new_class) scm_change_object_class (SCM obj, SCM old_class SCM_UNUSED, SCM new_class)
{ {
if (!burnin (obj)) if (!burnin (obj))
scm_internal_dynamic_wind (go_to_hell, purgatory, go_to_heaven, {
(void *) SCM_UNPACK (scm_list_2 (obj, new_class)), scm_dynwind_begin (SCM_F_DYNWIND_REWINDABLE);
(void *) SCM_UNPACK (obj)); scm_dynwind_rewind_handler (go_to_hell, &obj, SCM_F_WIND_EXPLICITLY);
scm_dynwind_unwind_handler (go_to_heaven, &obj, SCM_F_WIND_EXPLICITLY);
purgatory (obj, new_class);
scm_dynwind_end ();
}
} }
/****************************************************************************** /******************************************************************************