diff options
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 18 |
1 files changed, 13 insertions, 5 deletions
@@ -897,11 +897,19 @@ val interp_fun(val env, val fun, val args) | |||
897 | val def = cdr(fun); | 897 | val def = cdr(fun); |
898 | val params = car(def); | 898 | val params = car(def); |
899 | val body = cdr(def); | 899 | val body = cdr(def); |
900 | val saved_de = set_dyn_env(make_env(nil, nil, dyn_env)); | 900 | val firstparam = if2(consp(params), car(params)); |
901 | val fun_env = bind_args(env, params, args, fun); | 901 | |
902 | val ret = eval_progn(body, fun_env, body); | 902 | if (!consp(firstparam) || car(firstparam) != special_s) |
903 | set_dyn_env(saved_de); | 903 | { |
904 | return ret; | 904 | val fun_env = bind_args(env, params, args, fun); |
905 | return eval_progn(body, fun_env, body); | ||
906 | } else { | ||
907 | val saved_de = set_dyn_env(make_env(nil, nil, dyn_env)); | ||
908 | val fun_env = bind_args(env, params, args, fun); | ||
909 | val ret = eval_progn(body, fun_env, body); | ||
910 | set_dyn_env(saved_de); | ||
911 | return ret; | ||
912 | } | ||
905 | } | 913 | } |
906 | 914 | ||
907 | val eval_intrinsic(val form, val env) | 915 | val eval_intrinsic(val form, val env) |