Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-21 06:39:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

type checking env arg to eval (issue #44)

Browse source
This commit is contained in:
Alex Shinn 2010-03-13 18:31:30 +09:00
parent 4b2ed4cf48
commit 2e9a09fc1e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
eval.c
View file

@ -2745,14 +2745,15 @@ sexp sexp_eval (sexp ctx, sexp obj, sexp env) {
sexp_sint_t top; sexp_sint_t top;
sexp ctx2; sexp ctx2;
sexp_gc_var2(res, err_handler); sexp_gc_var2(res, err_handler);
if (! env)
env = sexp_context_env(ctx);
else if (! sexp_envp(env))
return sexp_type_exception(ctx, "eval: not an env", env);
sexp_gc_preserve2(ctx, res, err_handler); sexp_gc_preserve2(ctx, res, err_handler);
top = sexp_context_top(ctx); top = sexp_context_top(ctx);
err_handler = sexp_cdr(sexp_global(ctx, SEXP_G_ERR_HANDLER)); err_handler = sexp_cdr(sexp_global(ctx, SEXP_G_ERR_HANDLER));
sexp_cdr(sexp_global(ctx, SEXP_G_ERR_HANDLER)) = SEXP_FALSE; sexp_cdr(sexp_global(ctx, SEXP_G_ERR_HANDLER)) = SEXP_FALSE;
ctx2 = sexp_make_eval_context(ctx, ctx2 = sexp_make_eval_context(ctx, sexp_context_stack(ctx), env, 0);
sexp_context_stack(ctx),
(env ? env : sexp_context_env(ctx)),
0);
res = sexp_compile(ctx2, obj); res = sexp_compile(ctx2, obj);
if (! sexp_exceptionp(res)) if (! sexp_exceptionp(res))
res = sexp_apply(ctx2, res, SEXP_NULL); res = sexp_apply(ctx2, res, SEXP_NULL);