diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-08-28 19:01:19 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-08-28 19:16:46 +0200 |
commit | 7af531508c5931261ff8957708642cac67bf86a5 (patch) | |
tree | bd36d27d9f7a11d954093d4121ccb9e645f5c59f /libguile/eval.c | |
parent | f86f3b5b113b4cb383c531150b13bef9b2789221 (diff) | |
parent | ce3ed0125fcfb9ad09da815f133a2320102d164c (diff) | |
download | guile-7af531508c5931261ff8957708642cac67bf86a5.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
libguile/Makefile.am
libguile/bytevectors.c
libguile/gc-card.c
libguile/gc-mark.c
libguile/programs.c
libguile/srcprop.c
libguile/srfi-14.c
libguile/symbols.c
libguile/threads.c
libguile/unif.c
libguile/vm.c
Diffstat (limited to 'libguile/eval.c')
-rw-r--r-- | libguile/eval.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libguile/eval.c b/libguile/eval.c index 445c61f00..59db42976 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -3328,6 +3328,7 @@ scm_trampoline_0 (SCM proc) case scm_tc7_rpsubr: case scm_tc7_gsubr: case scm_tc7_pws: + case scm_tc7_program: trampoline = scm_call_0; break; default: @@ -3380,8 +3381,7 @@ call_dsubr_1 (SCM proc, SCM arg1) { return (scm_from_double (SCM_DSUBRF (proc) (scm_i_fraction2double (arg1)))); } - SCM_WTA_DISPATCH_1 (*SCM_SUBR_GENERIC (proc), arg1, - SCM_ARG1, scm_i_symbol_chars (SCM_SUBR_NAME (proc))); + SCM_WTA_DISPATCH_1_SUBR (proc, arg1, SCM_ARG1); } static SCM @@ -3454,6 +3454,7 @@ scm_trampoline_1 (SCM proc) case scm_tc7_rpsubr: case scm_tc7_gsubr: case scm_tc7_pws: + case scm_tc7_program: trampoline = scm_call_1; break; default: @@ -3548,6 +3549,7 @@ scm_trampoline_2 (SCM proc) break; case scm_tc7_gsubr: case scm_tc7_pws: + case scm_tc7_program: trampoline = scm_call_2; break; default: |