mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-17 03:00:21 +02:00
The idea is to introduce `gsubrs' whose arity is encoded in their type (more precisely in the sizeof (void *) - 8 MSBs). This removes the indirection introduced by cclos and simplifies the code. * libguile/__scm.h (CCLO): Remove. * libguile/debug.c (scm_procedure_source, scm_procedure_environment): Remove references to `scm_tc7_cclo'. * libguile/eval.c (scm_trampoline_0, scm_trampoline_1, scm_trampoline_2): Replace `scm_tc7_cclo' with `scm_tc7_gsubr'. * libguile/eval.i.c (CEVAL): Likewise. No longer make PROC the first argument. Directly invoke `scm_gsubr_apply ()' instead of jump to the `evap(N+1)' label or call to `SCM_APPLY ()'. * libguile/evalext.c (scm_self_evaluating_p): Remove reference to `scm_tc7_cclo'. * libguile/gc-card.c (scm_i_sweep_card, scm_i_tag_name): Likewise. * libguile/gc-mark.c (scm_gc_mark_dependencies): Likewise. * libguile/goops.c (scm_class_of): Likewise. * libguile/print.c (iprin1): Likewise. * libguile/gsubr.c (create_gsubr): Use `unsigned int's for REQ, OPT and RST. Use `scm_tc7_gsubr' instead of `scm_makcclo ()' in the default case. (scm_gsubr_apply): Remove calls to `SCM_GSUBR_PROC ()'. (scm_f_gsubr_apply): Remove. * libguile/gsubr.h (SCM_GSUBR_TYPE): New definition. (SCM_GSUBR_MAX): Changed to 33. (SCM_SET_GSUBR_TYPE, SCM_GSUBR_PROC, SCM_SET_GSUBR_PROC, scm_f_gsubr_apply): Remove. * libguile/procprop.c (scm_i_procedure_arity): Remove reference to `scm_tc7_cclo'; add proper handling of `scm_tc7_gsubr'. * libguile/procs.c (scm_makcclo, scm_make_cclo): Remove. (scm_procedure_p): Remove reference to `scm_tc7_cclo'. (scm_thunk_p): Likewise, plus add proper `scm_tc7_gsubr' handling. * libguile/procs.h (SCM_CCLO_LENGTH, SCM_MAKE_CCLO_TAG, SCM_SET_CCLO_LENGTH, SCM_CCLO_BASE, SCM_SET_CCLO_BASE, SCM_CCLO_REF, SCM_CCLO_SET, SCM_CCLO_SUBR, SCM_SET_CCLO_SUBR, scm_makcclo, scm_make_cclo): Remove. * libguile/stacks.c (read_frames): Remove reference to `scm_f_gsubr_apply'. * libguile/tags.h (scm_tc7_cclo): Remove. (scm_tc7_gsubr): New. (scm_tcs_subrs): Add `scm_tc7_gsubr'.
282 lines
6.9 KiB
C
282 lines
6.9 KiB
C
/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2006, 2008, 2009 Free Software Foundation, Inc.
|
||
*
|
||
* This library is free software; you can redistribute it and/or
|
||
* modify it under the terms of the GNU Lesser General Public
|
||
* License as published by the Free Software Foundation; either
|
||
* version 2.1 of the License, or (at your option) any later version.
|
||
*
|
||
* This library is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
* Lesser General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU Lesser General Public
|
||
* License along with this library; if not, write to the Free Software
|
||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||
*/
|
||
|
||
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
# include <config.h>
|
||
#endif
|
||
|
||
#include "libguile/_scm.h"
|
||
|
||
#include "libguile/objects.h"
|
||
#include "libguile/strings.h"
|
||
#include "libguile/vectors.h"
|
||
#include "libguile/smob.h"
|
||
#include "libguile/deprecation.h"
|
||
|
||
#include "libguile/validate.h"
|
||
#include "libguile/procs.h"
|
||
|
||
|
||
|
||
/* {Procedures}
|
||
*/
|
||
|
||
|
||
SCM
|
||
scm_c_make_subr (const char *name, long type, SCM (*fcn) ())
|
||
{
|
||
register SCM z;
|
||
SCM *meta_info;
|
||
|
||
meta_info = scm_gc_malloc (2 * sizeof (*meta_info), "subr meta-info");
|
||
meta_info[0] = scm_from_locale_symbol (name);
|
||
meta_info[1] = SCM_EOL; /* properties */
|
||
|
||
z = scm_double_cell ((scm_t_bits) type, (scm_t_bits) fcn,
|
||
0 /* generic */, (scm_t_bits) meta_info);
|
||
|
||
return z;
|
||
}
|
||
|
||
SCM
|
||
scm_c_define_subr (const char *name, long type, SCM (*fcn) ())
|
||
{
|
||
SCM subr = scm_c_make_subr (name, type, fcn);
|
||
scm_define (SCM_SNAME (subr), subr);
|
||
return subr;
|
||
}
|
||
|
||
/* This function isn't currently used since subrs are never freed. */
|
||
/* *fixme* Need mutex here. */
|
||
void
|
||
scm_free_subr_entry (SCM subr)
|
||
{
|
||
scm_gc_free (SCM_SUBR_META_INFO (subr), 2 * sizeof (SCM),
|
||
"subr meta-info");
|
||
}
|
||
|
||
SCM
|
||
scm_c_make_subr_with_generic (const char *name,
|
||
long type, SCM (*fcn) (), SCM *gf)
|
||
{
|
||
SCM subr = scm_c_make_subr (name, type, fcn);
|
||
SCM_SET_SUBR_GENERIC_LOC (subr, gf);
|
||
return subr;
|
||
}
|
||
|
||
SCM
|
||
scm_c_define_subr_with_generic (const char *name,
|
||
long type, SCM (*fcn) (), SCM *gf)
|
||
{
|
||
SCM subr = scm_c_make_subr_with_generic (name, type, fcn, gf);
|
||
scm_define (SCM_SNAME (subr), subr);
|
||
return subr;
|
||
}
|
||
|
||
|
||
SCM_DEFINE (scm_procedure_p, "procedure?", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return @code{#t} if @var{obj} is a procedure.")
|
||
#define FUNC_NAME s_scm_procedure_p
|
||
{
|
||
if (SCM_NIMP (obj))
|
||
switch (SCM_TYP7 (obj))
|
||
{
|
||
case scm_tcs_struct:
|
||
if (!SCM_I_OPERATORP (obj))
|
||
break;
|
||
case scm_tcs_closures:
|
||
case scm_tcs_subrs:
|
||
case scm_tc7_pws:
|
||
return SCM_BOOL_T;
|
||
case scm_tc7_smob:
|
||
return scm_from_bool (SCM_SMOB_DESCRIPTOR (obj).apply);
|
||
default:
|
||
return SCM_BOOL_F;
|
||
}
|
||
return SCM_BOOL_F;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_closure_p, "closure?", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return @code{#t} if @var{obj} is a closure.")
|
||
#define FUNC_NAME s_scm_closure_p
|
||
{
|
||
return scm_from_bool (SCM_CLOSUREP (obj));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_thunk_p, "thunk?", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return @code{#t} if @var{obj} is a thunk.")
|
||
#define FUNC_NAME s_scm_thunk_p
|
||
{
|
||
if (SCM_NIMP (obj))
|
||
{
|
||
again:
|
||
switch (SCM_TYP7 (obj))
|
||
{
|
||
case scm_tcs_closures:
|
||
return scm_from_bool (!scm_is_pair (SCM_CLOSURE_FORMALS (obj)));
|
||
case scm_tc7_subr_0:
|
||
case scm_tc7_subr_1o:
|
||
case scm_tc7_lsubr:
|
||
case scm_tc7_rpsubr:
|
||
case scm_tc7_asubr:
|
||
return SCM_BOOL_T;
|
||
case scm_tc7_gsubr:
|
||
return scm_from_bool (SCM_GSUBR_REQ (SCM_GSUBR_TYPE (obj)) == 0);
|
||
case scm_tc7_pws:
|
||
obj = SCM_PROCEDURE (obj);
|
||
goto again;
|
||
default:
|
||
;
|
||
}
|
||
}
|
||
return SCM_BOOL_F;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
/* Only used internally. */
|
||
int
|
||
scm_subr_p (SCM obj)
|
||
{
|
||
if (SCM_NIMP (obj))
|
||
switch (SCM_TYP7 (obj))
|
||
{
|
||
case scm_tcs_subrs:
|
||
return 1;
|
||
default:
|
||
;
|
||
}
|
||
return 0;
|
||
}
|
||
|
||
SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0,
|
||
(SCM proc),
|
||
"Return the documentation string associated with @code{proc}. By\n"
|
||
"convention, if a procedure contains more than one expression and the\n"
|
||
"first expression is a string constant, that string is assumed to contain\n"
|
||
"documentation for that procedure.")
|
||
#define FUNC_NAME s_scm_procedure_documentation
|
||
{
|
||
SCM code;
|
||
SCM_ASSERT (scm_is_true (scm_procedure_p (proc)),
|
||
proc, SCM_ARG1, FUNC_NAME);
|
||
switch (SCM_TYP7 (proc))
|
||
{
|
||
case scm_tcs_closures:
|
||
code = SCM_CLOSURE_BODY (proc);
|
||
if (scm_is_null (SCM_CDR (code)))
|
||
return SCM_BOOL_F;
|
||
code = SCM_CAR (code);
|
||
if (scm_is_string (code))
|
||
return code;
|
||
else
|
||
return SCM_BOOL_F;
|
||
default:
|
||
return SCM_BOOL_F;
|
||
}
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
/* Procedure-with-setter
|
||
*/
|
||
|
||
SCM_DEFINE (scm_procedure_with_setter_p, "procedure-with-setter?", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return @code{#t} if @var{obj} is a procedure with an\n"
|
||
"associated setter procedure.")
|
||
#define FUNC_NAME s_scm_procedure_with_setter_p
|
||
{
|
||
return scm_from_bool(SCM_PROCEDURE_WITH_SETTER_P (obj));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_make_procedure_with_setter, "make-procedure-with-setter", 2, 0, 0,
|
||
(SCM procedure, SCM setter),
|
||
"Create a new procedure which behaves like @var{procedure}, but\n"
|
||
"with the associated setter @var{setter}.")
|
||
#define FUNC_NAME s_scm_make_procedure_with_setter
|
||
{
|
||
SCM_VALIDATE_PROC (1, procedure);
|
||
SCM_VALIDATE_PROC (2, setter);
|
||
return scm_double_cell (scm_tc7_pws,
|
||
SCM_UNPACK (procedure),
|
||
SCM_UNPACK (setter), 0);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_procedure, "procedure", 1, 0, 0,
|
||
(SCM proc),
|
||
"Return the procedure of @var{proc}, which must be either a\n"
|
||
"procedure with setter, or an operator struct.")
|
||
#define FUNC_NAME s_scm_procedure
|
||
{
|
||
SCM_VALIDATE_NIM (1, proc);
|
||
if (SCM_PROCEDURE_WITH_SETTER_P (proc))
|
||
return SCM_PROCEDURE (proc);
|
||
else if (SCM_STRUCTP (proc))
|
||
{
|
||
SCM_ASSERT (SCM_I_OPERATORP (proc), proc, SCM_ARG1, FUNC_NAME);
|
||
return proc;
|
||
}
|
||
SCM_WRONG_TYPE_ARG (1, proc);
|
||
return SCM_BOOL_F; /* not reached */
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_GPROC (s_setter, "setter", 1, 0, 0, scm_setter, g_setter);
|
||
|
||
SCM
|
||
scm_setter (SCM proc)
|
||
{
|
||
SCM_GASSERT1 (SCM_NIMP (proc), g_setter, proc, SCM_ARG1, s_setter);
|
||
if (SCM_PROCEDURE_WITH_SETTER_P (proc))
|
||
return SCM_SETTER (proc);
|
||
else if (SCM_STRUCTP (proc))
|
||
{
|
||
SCM setter;
|
||
SCM_GASSERT1 (SCM_I_OPERATORP (proc),
|
||
g_setter, proc, SCM_ARG1, s_setter);
|
||
setter = (SCM_I_ENTITYP (proc)
|
||
? SCM_ENTITY_SETTER (proc)
|
||
: SCM_OPERATOR_SETTER (proc));
|
||
if (SCM_NIMP (setter))
|
||
return setter;
|
||
/* fall through */
|
||
}
|
||
SCM_WTA_DISPATCH_1 (g_setter, proc, SCM_ARG1, s_setter);
|
||
return SCM_BOOL_F; /* not reached */
|
||
}
|
||
|
||
|
||
void
|
||
scm_init_procs ()
|
||
{
|
||
#include "libguile/procs.x"
|
||
}
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|