fix dynwind + nonlocal entrance/exit + programs bug

* libguile/dynwind.c (scm_i_dowinds): Invoke guard procedures when
  entering and exiting nonlocally. Previously this procedure was
  program-racist.

diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index d856aff..999ba23 100644 (file)
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -323,7 +323,7 @@ scm_i_dowinds (SCM to, long delta, void (*turn_func) (void *), void *data)
                  if (SCM_VARIABLEP (SCM_CAR (wind_key)))
                    scm_swap_bindings (wind_key, SCM_CDR (wind_elt));
                }
-             else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
+             else if (scm_is_true (scm_thunk_p (wind_key)))
                scm_call_0 (wind_key);
            }
        }
@@ -359,7 +359,7 @@ scm_i_dowinds (SCM to, long delta, void (*turn_func) (void *), void *data)
                  if (SCM_VARIABLEP (SCM_CAR (wind_key)))
                    scm_swap_bindings (wind_key, SCM_CDR (wind_elt));
                }
-             else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
+             else if (scm_is_true (scm_thunk_p (wind_key)))
                scm_call_0 (SCM_CDR (wind_elt));
            }
        }