klisp

commit 1d7655e7bd27a2d79687656faa47a161c3d51b70
parent 66f18437abc098b23c29f93c1a49687e0471b851
Author: Oto Havle <havleoto@gmail.com>
Date:   Wed, 23 Nov 2011 22:07:11 +0100

Tempfix: dynamic environment in ffi_callback_entry

Diffstat:
M
src/kgffi.c
 | 
14
+++++++++++++-

1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/kgffi.c b/src/kgffi.c
@@ -868,15 +868,27 @@ static void ffi_callback_entry(ffi_cif *cif, void *ret, void **args, void *user_
     TValue exit_guard = ffi_callback_guard(cb, do_ffi_callback_exit_guard);
     krooted_tvs_push(K, exit_guard);
 
+    /* TEMP: Construct dummy dynamic environment
+     * for guard_dynamic_extent. Currently, guard_dynamic_extent()
+     * stores the environment in the interceptor list. The reason
+     * is not clear, because guard_dynamic_extent() and all
+     * interceptors() are applicatives.
+     *
+     * TODO: investigate and fix */
+    TValue denv = kmake_empty_environment(K);
+    krooted_tvs_push(K, denv);
+
     TValue ptree = kimm_list(K, 3, entry_guard, app, exit_guard);
     krooted_tvs_pop(K);
     krooted_tvs_pop(K);
     krooted_tvs_pop(K);
     krooted_tvs_pop(K);
+    krooted_tvs_pop(K);
 
     K->next_xparams = NULL;
     K->next_value = ptree;
-    /* K->next_env already has the correct value */
+    K->next_env = denv;
+
     guard_dynamic_extent(K);
 
     /* Enter new "inner" trampoline loop. */