mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-11 14:21:10 +02:00
Code Activity

* eval.c (SCM_CEVAL): Jump to badfun if trying to apply a struct

Browse source 
which isn't an operator.
(SCM_APPLY): Ditto, but jump to badproc.
This commit is contained in:
Mikael Djurfeldt 1998-11-21 17:00:44 +00:00
parent b325a6c8ac
commit 9b07e212d5
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libguile/eval.c
View file

@ -2145,7 +2145,9 @@ evapply:
env = EXTEND_ENV (SCM_CAR (x), SCM_EOL, SCM_ENV (proc)); env = EXTEND_ENV (SCM_CAR (x), SCM_EOL, SCM_ENV (proc));
goto cdrxbegin; goto cdrxbegin;
case scm_tcs_cons_gloc: case scm_tcs_cons_gloc:
if (SCM_I_OPERATORP (proc)) if (!SCM_I_OPERATORP (proc))
goto badfun;
else
{ {
x = (SCM_I_ENTITYP (proc) x = (SCM_I_ENTITYP (proc)
? SCM_ENTITY_PROC_0 (proc) ? SCM_ENTITY_PROC_0 (proc)
@ -2290,7 +2292,9 @@ evapply:
case scm_tc7_contin: case scm_tc7_contin:
scm_call_continuation (proc, t.arg1); scm_call_continuation (proc, t.arg1);
case scm_tcs_cons_gloc: case scm_tcs_cons_gloc:
if (SCM_I_OPERATORP (proc)) if (!SCM_I_OPERATORP (proc))
goto badfun;
else
{ {
x = (SCM_I_ENTITYP (proc) x = (SCM_I_ENTITYP (proc)
? SCM_ENTITY_PROC_1 (proc) ? SCM_ENTITY_PROC_1 (proc)
@ -2389,7 +2393,9 @@ evapply:
goto evap3; */ goto evap3; */
#endif #endif
case scm_tcs_cons_gloc: case scm_tcs_cons_gloc:
if (SCM_I_OPERATORP (proc)) if (!SCM_I_OPERATORP (proc))
goto badfun;
else
{ {
x = (SCM_I_ENTITYP (proc) x = (SCM_I_ENTITYP (proc)
? SCM_ENTITY_PROC_2 (proc) ? SCM_ENTITY_PROC_2 (proc)
@ -2562,7 +2568,9 @@ evapply:
goto cdrxbegin; goto cdrxbegin;
#endif /* DEVAL */ #endif /* DEVAL */
case scm_tcs_cons_gloc: case scm_tcs_cons_gloc:
if (SCM_I_OPERATORP (proc)) if (!SCM_I_OPERATORP (proc))
goto badfun;
else
{ {
SCM p = (SCM_I_ENTITYP (proc) SCM p = (SCM_I_ENTITYP (proc)
? SCM_ENTITY_PROC_3 (proc) ? SCM_ENTITY_PROC_3 (proc)
@ -2935,7 +2943,9 @@ tail:
goto tail; goto tail;
#endif #endif
case scm_tcs_cons_gloc: case scm_tcs_cons_gloc:
if (SCM_I_OPERATORP (proc)) if (!SCM_I_OPERATORP (proc))
goto badproc;
else
{ {
#ifdef DEVAL #ifdef DEVAL
args = (SCM_UNBNDP(arg1) ? SCM_EOL : debug.vect[0].a.args); args = (SCM_UNBNDP(arg1) ? SCM_EOL : debug.vect[0].a.args);