summaryrefslogtreecommitdiff
path: root/libguile/eval.i.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-10-31 12:04:53 +0100
committerAndy Wingo <wingo@pobox.com>2009-11-15 20:28:11 +0100
commit521ac49bdea053227c973a92e37fcc0879fa20d0 (patch)
treeb29383cc2291ed2a2d485a2644d96e3f73164d98 /libguile/eval.i.c
parent48c7c44e70e6ba80fe16bfb179320cffb6a03996 (diff)
downloadguile-521ac49bdea053227c973a92e37fcc0879fa20d0.tar.gz
SCM_GENERIC_METHOD_CACHE macro splits from SCM_ENTITY_PROCEDURE
* libguile/goops.h (SCM_GENERIC_METHOD_CACHE) (SCM_SET_GENERIC_METHOD_CACHE): Two new macros; the same as SCM_[SET_]ENTITY_PROCEDURE, but more reflecting the reality of the generic hack. * libguile/eval.i.c: * libguile/goops.c: * libguile/objects.c: * libguile/vm-i-system.c: Use the new macros when it is appropriate to do so.
Diffstat (limited to 'libguile/eval.i.c')
-rw-r--r--libguile/eval.i.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/eval.i.c b/libguile/eval.i.c
index 2eba83e86..15107c51d 100644
--- a/libguile/eval.i.c
+++ b/libguile/eval.i.c
@@ -1027,7 +1027,7 @@ dispatch:
case scm_tcs_struct:
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
{
- x = SCM_ENTITY_PROCEDURE (proc);
+ x = SCM_GENERIC_METHOD_CACHE (proc);
arg1 = SCM_EOL;
goto type_dispatch;
}
@@ -1154,7 +1154,7 @@ dispatch:
case scm_tcs_struct:
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
{
- x = SCM_ENTITY_PROCEDURE (proc);
+ x = SCM_GENERIC_METHOD_CACHE (proc);
#ifdef DEVAL
arg1 = debug.info->a.args;
#else
@@ -1233,7 +1233,7 @@ dispatch:
case scm_tcs_struct:
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
{
- x = SCM_ENTITY_PROCEDURE (proc);
+ x = SCM_GENERIC_METHOD_CACHE (proc);
#ifdef DEVAL
arg1 = debug.info->a.args;
#else
@@ -1464,7 +1464,7 @@ dispatch:
#else
arg1 = scm_cons2 (arg1, arg2, scm_ceval_args (x, env, proc));
#endif
- x = SCM_ENTITY_PROCEDURE (proc);
+ x = SCM_GENERIC_METHOD_CACHE (proc);
goto type_dispatch;
}
else if (SCM_I_ENTITYP (proc))