-/* Copyright (C) 1995,1996,1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,2000,2001 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
* 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 "scm_validate.h"
-#include "procprop.h"
+#include "libguile/validate.h"
+#include "libguile/procprop.h"
\f
SCM_GLOBAL_SYMBOL (scm_sym_system_procedure, "system-procedure");
o = 1;
case scm_tc7_subr_1:
case scm_tc7_cxr:
- case scm_tc7_contin:
a += 1;
break;
case scm_tc7_subr_2:
a += 2;
r = 1;
break;
-#ifdef CCLO
+ case scm_tc7_smob:
+ if (SCM_SMOB_APPLICABLE_P (proc))
+ {
+ int type = SCM_SMOB_DESCRIPTOR (proc).gsubr_type;
+ a += SCM_GSUBR_REQ (type);
+ o = SCM_GSUBR_OPT (type);
+ r = SCM_GSUBR_REST (type);
+ break;
+ }
+ else
+ {
+ return SCM_BOOL_F;
+ }
case scm_tc7_cclo:
- if (SCM_CCLO_SUBR (proc) == scm_f_gsubr_apply)
+ if (SCM_EQ_P (SCM_CCLO_SUBR (proc), scm_f_gsubr_apply))
{
int type = SCM_INUM (SCM_GSUBR_TYPE (proc));
a += SCM_GSUBR_REQ (type);
r = SCM_GSUBR_REST (type);
break;
}
- proc = SCM_CCLO_SUBR (proc);
- a -= 1;
- goto loop;
-#endif
+ else
+ {
+ proc = SCM_CCLO_SUBR (proc);
+ a -= 1;
+ goto loop;
+ }
case scm_tc7_pws:
proc = SCM_PROCEDURE (proc);
goto loop;
case scm_tcs_closures:
- proc = SCM_CAR (SCM_CODE (proc));
- if (SCM_IMP (proc))
+ proc = SCM_CLOSURE_FORMALS (proc);
+ if (SCM_NULLP (proc))
break;
while (SCM_CONSP (proc))
{
++a;
proc = SCM_CDR (proc);
}
- if (SCM_NIMP (proc))
+ if (!SCM_NULLP (proc))
r = 1;
break;
- case scm_tcs_cons_gloc:
+ case scm_tcs_struct:
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
{
r = 1;
default:
return SCM_BOOL_F;
}
- return SCM_LIST3 (SCM_MAKINUM (a),
- SCM_MAKINUM (o),
- SCM_BOOL(r));
+ return scm_list_3 (SCM_MAKINUM (a), SCM_MAKINUM (o), SCM_BOOL(r));
}
static SCM
{
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);
- scm_stand_in_procs = scm_cons (scm_cons (proc, answer),
- scm_stand_in_procs);
+ answer = scm_closure (scm_list_2 (SCM_EOL, SCM_BOOL_F), SCM_EOL);
+ scm_stand_in_procs = scm_acons (proc, answer, scm_stand_in_procs);
}
else
answer = SCM_CDR (answer);
return answer;
}
-GUILE_PROC(scm_procedure_properties, "procedure-properties", 1, 0, 0,
+SCM_DEFINE (scm_procedure_properties, "procedure-properties", 1, 0, 0,
(SCM proc),
-"Return @var{obj}'s property list.")
+ "Return @var{obj}'s property list.")
#define FUNC_NAME s_scm_procedure_properties
{
- SCM_VALIDATE_PROC(1,proc);
+ SCM_VALIDATE_PROC (1,proc);
return scm_acons (scm_sym_arity, scm_i_procedure_arity (proc),
SCM_PROCPROPS (SCM_CLOSUREP (proc)
? proc
}
#undef FUNC_NAME
-GUILE_PROC(scm_set_procedure_properties_x, "set-procedure-properties!", 2, 0, 0,
+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}.")
+ "Set @var{obj}'s property list to @var{alist}.")
#define FUNC_NAME s_scm_set_procedure_properties_x
{
if (!SCM_CLOSUREP (proc))
proc = scm_stand_in_scm_proc(proc);
- SCM_VALIDATE_CLOSURE(1,proc);
+ SCM_VALIDATE_CLOSURE (1,proc);
SCM_SETPROCPROPS (proc, new_val);
return SCM_UNSPECIFIED;
}
#undef FUNC_NAME
-GUILE_PROC(scm_procedure_property, "procedure-property", 2, 0, 0,
+SCM_DEFINE (scm_procedure_property, "procedure-property", 2, 0, 0,
(SCM p, SCM k),
-"Return the property of @var{obj} with name @var{key}.")
+ "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, FUNC_NAME);
return arity;
}
- SCM_VALIDATE_PROC(1,p);
+ SCM_VALIDATE_PROC (1,p);
assoc = scm_sloppy_assq (k,
SCM_PROCPROPS (SCM_CLOSUREP (p)
? p
}
#undef FUNC_NAME
-GUILE_PROC(scm_set_procedure_property_x, "set-procedure-property!", 3, 0, 0,
+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
-@var{value}.")
+ "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_CLOSUREP (p))
p = scm_stand_in_scm_proc(p);
- SCM_VALIDATE_CLOSURE(1,p);
- if (k == scm_sym_arity)
+ 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))
void
scm_init_procprop ()
{
-#include "procprop.x"
+#ifndef SCM_MAGIC_SNARFER
+#include "libguile/procprop.x"
+#endif
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff