-/* Copyright (C) 1995,1996,1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998, 2000 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice. */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
+
\f
#include <stdio.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
-#include "alist.h"
-#include "eval.h"
-#include "procs.h"
-#include "gsubr.h"
-#include "objects.h"
+#include "libguile/alist.h"
+#include "libguile/eval.h"
+#include "libguile/procs.h"
+#include "libguile/gsubr.h"
+#include "libguile/objects.h"
+#include "libguile/smob.h"
+#include "libguile/root.h"
+#include "libguile/vectors.h"
-#include "procprop.h"
+#include "libguile/validate.h"
+#include "libguile/procprop.h"
\f
+SCM_GLOBAL_SYMBOL (scm_sym_system_procedure, "system-procedure");
SCM_GLOBAL_SYMBOL (scm_sym_arity, "arity");
SCM
a += 2;
r = 1;
break;
-#ifdef CCLO
- case scm_tc7_cclo:
- if (SCM_CCLO_SUBR (proc) == scm_f_gsubr_apply)
+ case scm_tc7_smob:
+ {
+ int type;
+ if (!SCM_SMOB_DESCRIPTOR (proc).apply)
+ return SCM_BOOL_F;
+ type = SCM_SMOB_DESCRIPTOR (proc).gsubr_type;
+ goto gsubr_type;
+ case scm_tc7_cclo:
+ if (SCM_EQ_P (SCM_CCLO_SUBR (proc), scm_f_gsubr_apply))
{
- int type = SCM_INUM (SCM_GSUBR_TYPE (proc));
+ type = SCM_INUM (SCM_GSUBR_TYPE (proc));
+ gsubr_type:
a += SCM_GSUBR_REQ (type);
o = SCM_GSUBR_OPT (type);
r = SCM_GSUBR_REST (type);
break;
}
- proc = SCM_CCLO_SUBR (proc);
- a -= 1;
+ proc = SCM_CCLO_SUBR (proc);
+ a -= 1;
+ goto loop;
+ }
+ case scm_tc7_pws:
+ proc = SCM_PROCEDURE (proc);
goto loop;
-#endif
case scm_tcs_closures:
proc = SCM_CAR (SCM_CODE (proc));
if (SCM_IMP (proc))
break;
- while (SCM_NIMP (proc) && SCM_CONSP (proc))
+ while (SCM_CONSP (proc))
{
++a;
proc = SCM_CDR (proc);
r = 1;
break;
case scm_tcs_cons_gloc:
- if (!SCM_I_OPERATORP (proc))
+ if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
+ {
+ r = 1;
+ break;
+ }
+ else if (!SCM_I_OPERATORP (proc))
return SCM_BOOL_F;
- {
- SCM *p = (SCM_I_ENTITYP (proc)
- ? &SCM_ENTITY_PROC_0 (proc)
- : &SCM_OPERATOR_PROC_0 (proc));
- SCM arity;
- int i, amin = -1, amax = 0;
- for (i = 0; i < 4; ++i)
- if (SCM_NFALSEP (arity = scm_i_procedure_arity (p[i])))
- {
- if (amin < 0)
- amin = i;
- amax = i;
- }
- if (amin < 0)
- /* no procedures in the struct! */
- return SCM_BOOL_F;
- a += amin;
- o = amax - amin;
- r = SCM_NFALSEP (arity) && SCM_NFALSEP (SCM_CADDR (arity));
- break;
- }
+ proc = (SCM_I_ENTITYP (proc)
+ ? SCM_ENTITY_PROCEDURE (proc)
+ : SCM_OPERATOR_PROCEDURE (proc));
+ a -= 1;
+ goto loop;
default:
return SCM_BOOL_F;
}
return SCM_LIST3 (SCM_MAKINUM (a),
SCM_MAKINUM (o),
- r ? SCM_BOOL_T : SCM_BOOL_F);
+ SCM_BOOL(r));
}
static SCM
-scm_stand_in_scm_proc(proc)
- SCM proc;
+scm_stand_in_scm_proc(SCM proc)
{
SCM answer;
answer = scm_assoc (proc, scm_stand_in_procs);
- if (answer == SCM_BOOL_F)
+ if (SCM_FALSEP (answer))
{
answer = scm_closure (scm_listify (SCM_EOL, SCM_BOOL_F, SCM_UNDEFINED),
SCM_EOL);
return answer;
}
-SCM_PROC(s_procedure_properties, "procedure-properties", 1, 0, 0, scm_procedure_properties);
-
-SCM
-scm_procedure_properties (proc)
- SCM proc;
+SCM_DEFINE (scm_procedure_properties, "procedure-properties", 1, 0, 0,
+ (SCM proc),
+ "Return @var{obj}'s property list.")
+#define FUNC_NAME s_scm_procedure_properties
{
- SCM_ASSERT (SCM_NFALSEP (scm_procedure_p (proc)),
- proc, SCM_ARG1, s_procedure_properties);
+ SCM_VALIDATE_PROC (1,proc);
return scm_acons (scm_sym_arity, scm_i_procedure_arity (proc),
- SCM_PROCPROPS (SCM_NIMP (proc) && SCM_CLOSUREP (proc)
+ SCM_PROCPROPS (SCM_CLOSUREP (proc)
? proc
: scm_stand_in_scm_proc (proc)));
}
+#undef FUNC_NAME
-SCM_PROC(s_set_procedure_properties_x, "set-procedure-properties!", 2, 0, 0, scm_set_procedure_properties_x);
-
-SCM
-scm_set_procedure_properties_x (proc, new_val)
- SCM proc;
- SCM new_val;
+SCM_DEFINE (scm_set_procedure_properties_x, "set-procedure-properties!", 2, 0, 0,
+ (SCM proc, SCM new_val),
+ "Set @var{obj}'s property list to @var{alist}.")
+#define FUNC_NAME s_scm_set_procedure_properties_x
{
- if (!(SCM_NIMP (proc) && SCM_CLOSUREP (proc)))
+ if (!SCM_CLOSUREP (proc))
proc = scm_stand_in_scm_proc(proc);
- SCM_ASSERT (SCM_NIMP (proc) && SCM_CLOSUREP (proc), proc, SCM_ARG1, s_set_procedure_properties_x);
+ SCM_VALIDATE_CLOSURE (1,proc);
SCM_SETPROCPROPS (proc, new_val);
return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
-SCM_PROC(s_procedure_property, "procedure-property", 2, 0, 0, scm_procedure_property);
-
-SCM
-scm_procedure_property (p, k)
- SCM p;
- SCM k;
+SCM_DEFINE (scm_procedure_property, "procedure-property", 2, 0, 0,
+ (SCM p, SCM k),
+ "Return the property of @var{obj} with name @var{key}.")
+#define FUNC_NAME s_scm_procedure_property
{
SCM assoc;
- if (k == scm_sym_arity)
+ if (SCM_EQ_P (k, scm_sym_arity))
{
SCM arity;
SCM_ASSERT (SCM_NFALSEP (arity = scm_i_procedure_arity (p)),
- p, SCM_ARG1, s_procedure_property);
+ p, SCM_ARG1, FUNC_NAME);
return arity;
}
- SCM_ASSERT (SCM_NFALSEP (scm_procedure_p (p)),
- p, SCM_ARG1, s_procedure_property);
+ SCM_VALIDATE_PROC (1,p);
assoc = scm_sloppy_assq (k,
- SCM_PROCPROPS (SCM_NIMP (p) && SCM_CLOSUREP (p)
+ SCM_PROCPROPS (SCM_CLOSUREP (p)
? p
: scm_stand_in_scm_proc (p)));
return (SCM_NIMP (assoc) ? SCM_CDR (assoc) : SCM_BOOL_F);
}
+#undef FUNC_NAME
-SCM_PROC(s_set_procedure_property_x, "set-procedure-property!", 3, 0, 0, scm_set_procedure_property_x);
-
-SCM
-scm_set_procedure_property_x (p, k, v)
- SCM p;
- SCM k;
- SCM v;
+SCM_DEFINE (scm_set_procedure_property_x, "set-procedure-property!", 3, 0, 0,
+ (SCM p, SCM k, SCM v),
+ "In @var{obj}'s property list, set the property named @var{key} to\n"
+ "@var{value}.")
+#define FUNC_NAME s_scm_set_procedure_property_x
{
SCM assoc;
- if (!(SCM_NIMP (p) && SCM_CLOSUREP (p)))
+ if (!SCM_CLOSUREP (p))
p = scm_stand_in_scm_proc(p);
- SCM_ASSERT (SCM_NIMP (p) && SCM_CLOSUREP (p), p, SCM_ARG1, s_set_procedure_property_x);
- if (k == scm_sym_arity)
- scm_misc_error (s_set_procedure_property_x,
- "arity is a read-only property",
- SCM_EOL);
+ SCM_VALIDATE_CLOSURE (1,p);
+ if (SCM_EQ_P (k, scm_sym_arity))
+ SCM_MISC_ERROR ("arity is a read-only property", SCM_EOL);
assoc = scm_sloppy_assq (k, SCM_PROCPROPS (p));
if (SCM_NIMP (assoc))
SCM_SETCDR (assoc, v);
SCM_SETPROCPROPS (p, scm_acons (k, v, SCM_PROCPROPS (p)));
return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
\f
void
scm_init_procprop ()
{
-#include "procprop.x"
+#include "libguile/procprop.x"
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff