summaryrefslogtreecommitdiff
path: root/libguile/eval.i.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@oblong.net>2009-03-17 16:40:52 +0100
committerAndy Wingo <wingo@oblong.net>2009-03-17 16:40:52 +0100
commit3b91e017e32e1fb6b911f456c61aea6386075095 (patch)
tree23ec6a0c667756eb48148ada7704086eb489964d /libguile/eval.i.c
parent325226dad9ab6f0488500e7381a5d1c07dc9ae91 (diff)
parente20d7001c3f7150400169fecb0bf0eefdf122fe2 (diff)
downloadguile-3b91e017e32e1fb6b911f456c61aea6386075095.tar.gz
Merge commit 'e20d7001c3f7150400169fecb0bf0eefdf122fe2' into vm-check
Conflicts: libguile/stacks.c
Diffstat (limited to 'libguile/eval.i.c')
-rw-r--r--libguile/eval.i.c46
1 files changed, 16 insertions, 30 deletions
diff --git a/libguile/eval.i.c b/libguile/eval.i.c
index b208f01b0..ff3b45e18 100644
--- a/libguile/eval.i.c
+++ b/libguile/eval.i.c
@@ -1,7 +1,7 @@
/*
* eval.i.c - actual evaluator code for GUILE
*
- * Copyright (C) 2002, 03, 04, 05, 06, 07 Free Software Foundation, Inc.
+ * Copyright (C) 2002, 03, 04, 05, 06, 07, 09 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -1135,14 +1135,12 @@ dispatch:
if (!SCM_SMOB_APPLICABLE_P (proc))
goto badfun;
RETURN (SCM_SMOB_APPLY_0 (proc));
- case scm_tc7_cclo:
- arg1 = proc;
- proc = SCM_CCLO_SUBR (proc);
+ case scm_tc7_gsubr:
#ifdef DEVAL
debug.info->a.proc = proc;
- debug.info->a.args = scm_list_1 (arg1);
+ debug.info->a.args = SCM_EOL;
#endif
- goto evap1;
+ RETURN (scm_gsubr_apply (scm_list_1 (proc)));
case scm_tc7_pws:
proc = SCM_PROCEDURE (proc);
#ifdef DEVAL
@@ -1256,15 +1254,12 @@ dispatch:
if (!SCM_SMOB_APPLICABLE_P (proc))
goto badfun;
RETURN (SCM_SMOB_APPLY_1 (proc, arg1));
- case scm_tc7_cclo:
- arg2 = arg1;
- arg1 = proc;
- proc = SCM_CCLO_SUBR (proc);
+ case scm_tc7_gsubr:
#ifdef DEVAL
debug.info->a.args = scm_cons (arg1, debug.info->a.args);
debug.info->a.proc = proc;
#endif
- goto evap2;
+ RETURN (scm_gsubr_apply (scm_list_2 (proc, arg1)));
case scm_tc7_pws:
proc = SCM_PROCEDURE (proc);
#ifdef DEVAL
@@ -1362,19 +1357,14 @@ dispatch:
goto badfun;
RETURN (SCM_SMOB_APPLY_2 (proc, arg1, arg2));
cclon:
- case scm_tc7_cclo:
+ case scm_tc7_gsubr:
#ifdef DEVAL
- RETURN (SCM_APPLY (SCM_CCLO_SUBR (proc),
- scm_cons (proc, debug.info->a.args),
- SCM_EOL));
+ RETURN (scm_gsubr_apply (scm_cons (proc, debug.info->a.args)));
#else
- RETURN (SCM_APPLY (SCM_CCLO_SUBR (proc),
- scm_cons2 (proc, arg1,
- scm_cons (arg2,
- scm_ceval_args (x,
- env,
- proc))),
- SCM_EOL));
+ RETURN (scm_gsubr_apply
+ (scm_cons (proc,
+ scm_cons2 (arg1, arg2,
+ scm_ceval_args (x, env, proc)))));
#endif
case scm_tcs_struct:
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
@@ -1503,7 +1493,7 @@ dispatch:
goto badfun;
RETURN (SCM_SMOB_APPLY_3 (proc, arg1, arg2,
SCM_CDDR (debug.info->a.args)));
- case scm_tc7_cclo:
+ case scm_tc7_gsubr:
goto cclon;
case scm_tc7_pws:
proc = SCM_PROCEDURE (proc);
@@ -1566,7 +1556,7 @@ dispatch:
goto badfun;
RETURN (SCM_SMOB_APPLY_3 (proc, arg1, arg2,
scm_ceval_args (x, env, proc)));
- case scm_tc7_cclo:
+ case scm_tc7_gsubr:
goto cclon;
case scm_tc7_pws:
proc = SCM_PROCEDURE (proc);
@@ -1878,19 +1868,15 @@ tail:
RETURN (SCM_SMOB_APPLY_2 (proc, arg1, SCM_CAR (args)));
else
RETURN (SCM_SMOB_APPLY_3 (proc, arg1, SCM_CAR (args), SCM_CDR (args)));
- case scm_tc7_cclo:
+ case scm_tc7_gsubr:
#ifdef DEVAL
args = (SCM_UNBNDP(arg1) ? SCM_EOL : debug.vect[0].a.args);
- arg1 = proc;
- proc = SCM_CCLO_SUBR (proc);
debug.vect[0].a.proc = proc;
debug.vect[0].a.args = scm_cons (arg1, args);
#else
args = (SCM_UNBNDP(arg1) ? SCM_EOL : scm_cons (arg1, args));
- arg1 = proc;
- proc = SCM_CCLO_SUBR (proc);
#endif
- goto tail;
+ RETURN (scm_gsubr_apply (scm_cons (proc, args)));
case scm_tc7_pws:
proc = SCM_PROCEDURE (proc);
#ifdef DEVAL