Change funcall_interp API.

* eval.c (funcall_interp): Drop the env argument.
The fun argument is now the whole function object, not the
encapsulated code to be interpreted. We pull the
environment and code out of the object locally
and interpret as before.

* eval.h (funcall_interp): Declaration updated.

* lib.c (generic_funcall, funcall, funcall1, funcall2,
* funcall3, funcall4): Calls to funcall_interp simplified,
just passing fun.

1 files changed, 3 insertions, 1 deletions

diff --git a/eval.c b/eval.c
index 3accea39..a8f61cff 100644
--- a/eval.c
+++ b/eval.c
@@ -1023,8 +1023,10 @@ val set_dyn_env(val de)
   return old;
 }
 
-val funcall_interp(val env, val fun, struct args *args)
+val funcall_interp(val interp_fun, struct args *args)
 {
+  val env = interp_fun->f.env;
+  val fun = interp_fun->f.f.interp_fun;
   val def = cdr(fun);
   val params = car(def);
   val body = cdr(def);