mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Change eval.c to use scm_c_vm_run instead of scm_call_with_vm.

Browse source 
* libguile/eval.c (scm_apply_0, scm_apply_1, scm_apply_2, scm_apply_3)
  (scm_map, scm_for_each, scm_apply): Change to prefer scm_apply_0, and
  to have it call vm_run instead of call_with_vm.
  (eval): Use scm_apply_0 and scm_call_0.

* libguile/srfi-1.c (scm_srfi1_count): Use scm_apply_0.
This commit is contained in:
Andy Wingo 2013-11-21 15:41:27 +01:00
parent 3583665aa0
commit 6b4ba76d05
2 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

56
libguile/eval.c
View file

@ -312,7 +312,7 @@ eval (SCM x, SCM env)
goto loop;
}
else
return scm_call_with_vm (scm_the_vm (), proc, args);
return scm_apply_0 (proc, args);
case SCM_M_CALL:
/* Evaluate the procedure to be applied. */
@ -348,7 +348,7 @@ eval (SCM x, SCM env)
producer = EVAL1 (CAR (mx), env);
/* `proc' is the consumer. */
proc = EVAL1 (CDR (mx), env);
v = scm_call_with_vm (scm_the_vm (), producer, SCM_EOL);
v = scm_call_0 (producer);
if (SCM_VALUESP (v))
args = scm_struct_ref (v, SCM_INUM0);
else
@ -586,26 +586,40 @@ scm_call (SCM proc, ...)
SCM
scm_apply_0 (SCM proc, SCM args)
{
return scm_apply (proc, args, SCM_EOL);
SCM *argv;
int i, nargs;
nargs = scm_ilength (args);
if (SCM_UNLIKELY (nargs < 0))
scm_wrong_type_arg_msg ("apply", 2, args, "list");
/* FIXME: Use vm_builtin_apply instead of alloca. */
argv = alloca (nargs * sizeof(SCM));
for (i = 0; i < nargs; i++)
{
argv[i] = SCM_CAR (args);
args = SCM_CDR (args);
}
return scm_c_vm_run (scm_the_vm (), proc, argv, nargs);
}
SCM
scm_apply_1 (SCM proc, SCM arg1, SCM args)
{
return scm_apply (proc, scm_cons (arg1, args), SCM_EOL);
return scm_apply_0 (proc, scm_cons (arg1, args));
}
SCM
scm_apply_2 (SCM proc, SCM arg1, SCM arg2, SCM args)
{
return scm_apply (proc, scm_cons2 (arg1, arg2, args), SCM_EOL);
return scm_apply_0 (proc, scm_cons2 (arg1, arg2, args));
}
SCM
scm_apply_3 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM args)
{
return scm_apply (proc, scm_cons (arg1, scm_cons2 (arg2, arg3, args)),
SCM_EOL);
return scm_apply_0 (proc, scm_cons (arg1, scm_cons2 (arg2, arg3, args)));
}
@ -618,8 +632,8 @@ scm_map (SCM proc, SCM arg1, SCM args)
var = scm_private_variable (scm_the_root_module (),
scm_from_latin1_symbol ("map"));
return scm_apply (scm_variable_ref (var),
scm_cons (proc, scm_cons (arg1, args)), SCM_EOL);
return scm_apply_0 (scm_variable_ref (var),
scm_cons (proc, scm_cons (arg1, args)));
}
SCM
@ -631,8 +645,8 @@ scm_for_each (SCM proc, SCM arg1, SCM args)
var = scm_private_variable (scm_the_root_module (),
scm_from_latin1_symbol ("for-each"));
return scm_apply (scm_variable_ref (var),
scm_cons (proc, scm_cons (arg1, args)), SCM_EOL);
return scm_apply_0 (scm_variable_ref (var),
scm_cons (proc, scm_cons (arg1, args)));
}
@ -694,24 +708,18 @@ static SCM f_apply;
/* Apply a function to a list of arguments.
This function is exported to the Scheme level as taking two
required arguments and a tail argument, as if it were:
This function's interface is a bit wonly. It takes two required
arguments and a tail argument, as if it were:
(lambda (proc arg1 . args) ...)
Thus, if you just have a list of arguments to pass to a procedure,
pass the list as ARG1, and '() for ARGS. If you have some fixed
args, pass the first as ARG1, then cons any remaining fixed args
onto the front of your argument list, and pass that as ARGS. */
Usually you want to use scm_apply_0 or one of its cousins. */
SCM
scm_apply (SCM proc, SCM arg1, SCM args)
{
/* Fix things up so that args contains all args. */
if (scm_is_null (args))
args = arg1;
else
args = scm_cons_star (arg1, args);
return scm_call_with_vm (scm_the_vm (), proc, args);
return scm_apply_0 (proc,
scm_is_null (args) ? arg1 : scm_cons_star (arg1, args));
}
static void