summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-03-08 12:19:42 +0100
committerLudovic Courtès <ludo@gnu.org>2009-03-08 16:40:49 +0100
commitd18f4d805ed12cc477fa00b3608130785151f3d6 (patch)
treefb1717e20e790c552bc9ad6645f59f5c85c71b5a
parent3e414c302f5a6ee8618aa7f9b2bbd174ef7e9d31 (diff)
downloadguile-d18f4d805ed12cc477fa00b3608130785151f3d6.tar.gz
Slightly simplify gsubr invocation in the evaluator.
* libguile/eval.i.c (CEVAL): Remove the `cclon' label; replace jumps to `cclon' with `RETURN (scm_i_gsubr_apply (...))'.
-rw-r--r--libguile/eval.i.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/libguile/eval.i.c b/libguile/eval.i.c
index 79e77da1b..de4851d4b 100644
--- a/libguile/eval.i.c
+++ b/libguile/eval.i.c
@@ -1345,15 +1345,11 @@ dispatch:
if (!SCM_SMOB_APPLICABLE_P (proc))
goto badfun;
RETURN (SCM_SMOB_APPLY_2 (proc, arg1, arg2));
- cclon:
case scm_tc7_gsubr:
#ifdef DEVAL
RETURN (scm_i_gsubr_apply (proc, debug.info->a.args));
#else
- RETURN (scm_i_gsubr_apply (proc,
- scm_cons2 (arg1, arg2,
- scm_ceval_args (x, env,
- proc))));
+ RETURN (scm_i_gsubr_apply (proc, scm_list_2 (arg1, arg2)));
#endif
case scm_tcs_struct:
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
@@ -1483,7 +1479,7 @@ dispatch:
RETURN (SCM_SMOB_APPLY_3 (proc, arg1, arg2,
SCM_CDDR (debug.info->a.args)));
case scm_tc7_gsubr:
- goto cclon;
+ RETURN (scm_i_gsubr_apply (proc, debug.info->a.args));
case scm_tc7_pws:
proc = SCM_PROCEDURE (proc);
debug.info->a.proc = proc;
@@ -1546,7 +1542,10 @@ dispatch:
RETURN (SCM_SMOB_APPLY_3 (proc, arg1, arg2,
scm_ceval_args (x, env, proc)));
case scm_tc7_gsubr:
- goto cclon;
+ RETURN (scm_i_gsubr_apply (proc,
+ scm_cons2 (arg1, arg2,
+ scm_ceval_args (x, env,
+ proc))));
case scm_tc7_pws:
proc = SCM_PROCEDURE (proc);
if (!SCM_CLOSUREP (proc))