summaryrefslogtreecommitdiff
path: root/libguile/procs.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-10-31 00:28:43 +0100
committerAndy Wingo <wingo@pobox.com>2009-11-15 20:28:11 +0100
commit730d8ad9e64c3d4b31871a50a4c790b7548bc478 (patch)
treeafe5f18c5900b5736b155b50427163ac920261e3 /libguile/procs.c
parent352c87d7e4c8845b935f8439432d28d80bf06879 (diff)
downloadguile-730d8ad9e64c3d4b31871a50a4c790b7548bc478.tar.gz
remove operators
Diffstat (limited to 'libguile/procs.c')
-rw-r--r--libguile/procs.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libguile/procs.c b/libguile/procs.c
index 5de2f33f1..d0e7fbd26 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -98,7 +98,7 @@ SCM_DEFINE (scm_procedure_p, "procedure?", 1, 0, 0,
switch (SCM_TYP7 (obj))
{
case scm_tcs_struct:
- if (!SCM_I_OPERATORP (obj))
+ if (!SCM_I_ENTITYP (obj))
break;
case scm_tcs_closures:
case scm_tcs_subrs:
@@ -262,7 +262,7 @@ SCM_DEFINE (scm_procedure, "procedure", 1, 0, 0,
return SCM_PROCEDURE (proc);
else if (SCM_STRUCTP (proc))
{
- SCM_ASSERT (SCM_I_OPERATORP (proc), proc, SCM_ARG1, FUNC_NAME);
+ SCM_ASSERT (SCM_I_ENTITYP (proc), proc, SCM_ARG1, FUNC_NAME);
return proc;
}
SCM_WRONG_TYPE_ARG (1, proc);
@@ -281,11 +281,9 @@ scm_setter (SCM proc)
else if (SCM_STRUCTP (proc))
{
SCM setter;
- SCM_GASSERT1 (SCM_I_OPERATORP (proc),
+ SCM_GASSERT1 (SCM_I_ENTITYP (proc),
g_setter, proc, SCM_ARG1, s_setter);
- setter = (SCM_I_ENTITYP (proc)
- ? SCM_ENTITY_SETTER (proc)
- : SCM_OPERATOR_SETTER (proc));
+ setter = SCM_ENTITY_SETTER (proc);
if (SCM_NIMP (setter))
return setter;
/* fall through */