mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 20:00:19 +02:00
I tried to split this one, and I know it's a bit disruptive, but this stuff really is one big cobweb. So instead we'll pretend like these are separate commits, by separating the changelog. Applicable struct runtime support. * libguile/debug.c (scm_procedure_source): * libguile/eval.c (scm_trampoline_0, scm_trampoline_1) (scm_trampoline_2): * libguile/eval.i.c (CEVAL): * libguile/goops.c (scm_class_of): * libguile/procprop.c (scm_i_procedure_arity): * libguile/procs.c (scm_procedure_p, scm_procedure, scm_setter): Allow for applicable structs. Whee! * libguile/deprecated.h (scm_vtable_index_vtable): Define as a synonym for scm_vtable_index_self. (scm_vtable_index_printer): Alias scm_vtable_index_instance_printer. (scm_struct_i_free): Alias scm_vtable_index_instance_finalize. (scm_struct_i_flags): Alias scm_vtable_index_flags. (SCM_STRUCTF_FLAGS): Be a -1 mask, we have a whole word now. (SCM_SET_VTABLE_DESTRUCTOR): Implement by hand. Hidden slots. * libguile/struct.c (scm_make_struct_layout): Add support for "hidden" fields, writable fields that are not visible to make-struct. This allows us to add fields to vtables and not break existing make-struct invocations. (scm_struct_ref, scm_struct_set_x): Always get struct length from the vtable. Support hidden fields. * libguile/goops.c (scm_class_hidden, scm_class_protected_hidden): New slot classes, to correspond to the new vtable slots. (scm_sys_prep_layout_x): Turn hidden slots into 'h'. (build_class_class_slots): Reorder the class slots to account for vtable fields coming out of negative-land, for name as a vtable slot, and for hidden fields. (create_standard_classes): Define <hidden-slot> and <protected-hidden-slot>. Clean up struct.h. * libguile/struct.h: Lay things out cleaner. There are no more hidden (negative) words. Names are nicer. The exposition is nicer. But the basics are the same. The incompatibilities are that <vtable> has more slots now, and that scm_alloc_struct's signature has changed. The former is ameliorated by the "hidden" slots mentioned before, and the latter, well, it was always a very internal thing... (scm_t_struct_finalize): New type, a finalizer function to be run when instances of a vtable are collected. (scm_t_struct_free): Removed, structs' data is managed by the GC now, and not freed by vtable functions. * libguile/struct.c: (scm_vtable_p): Now we keep flags on vtable-vtables, so this check is cheaper. (scm_alloc_struct): No hidden words. Yippee. (struct_finalizer_trampoline): Entersify. (scm_make_struct): No need to babysit extra words, though now we have to babysit flags. Propagate the vtable, applicable, and setter flags appropriately. (scm_make_vtable_vtable): Update for new simplicity. (scm_print_struct): A better printer. (scm_init_struct): Define <applicable-struct-vtable>, a magical vtable like CL's funcallable-standard-class. Also define <applicable-struct-with-setter-vtable>. Remove foreign object implementation. * libguile/goops.h: * libguile/goops.c (scm_make_foreign_object, scm_make_class) (scm_add_slot, scm_wrap_object, scm_wrap_component): Remove, these were undocumented and unworking. Clean up goops.h, a little. * libguile/goops.h: * libguile/goops.c: Also clean up. * module/oop/goops/dispatch.scm (hashset-index): Adapt for new hashset index.
308 lines
7.7 KiB
C
308 lines
7.7 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 3 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/strings.h"
|
||
#include "libguile/vectors.h"
|
||
#include "libguile/smob.h"
|
||
#include "libguile/deprecation.h"
|
||
|
||
#include "libguile/validate.h"
|
||
#include "libguile/procs.h"
|
||
#include "libguile/procprop.h"
|
||
#include "libguile/objcodes.h"
|
||
#include "libguile/programs.h"
|
||
|
||
|
||
|
||
/* {Procedures}
|
||
*/
|
||
|
||
|
||
SCM
|
||
scm_c_make_subr (const char *name, long type, SCM (*fcn) ())
|
||
{
|
||
register SCM z;
|
||
SCM sname;
|
||
SCM *meta_info;
|
||
|
||
meta_info = scm_gc_malloc (2 * sizeof (*meta_info), "subr meta-info");
|
||
sname = scm_from_locale_symbol (name);
|
||
meta_info[0] = sname;
|
||
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);
|
||
|
||
scm_remember_upto_here_1 (sname);
|
||
|
||
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_SUBR_NAME (subr), subr);
|
||
return subr;
|
||
}
|
||
|
||
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_SUBR_NAME (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_OBJ_CLASS_FLAGS (obj) & SCM_CLASSF_PURE_GENERIC)
|
||
|| SCM_STRUCT_APPLICABLE_P (obj)))
|
||
break;
|
||
case scm_tcs_closures:
|
||
case scm_tcs_subrs:
|
||
case scm_tc7_pws:
|
||
case scm_tc7_program:
|
||
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_program:
|
||
{
|
||
int a, o, r;
|
||
if (scm_i_program_arity (obj, &a, &o, &r))
|
||
return scm_from_bool (a == 0);
|
||
else
|
||
return SCM_BOOL_F;
|
||
}
|
||
case scm_tc7_pws:
|
||
obj = SCM_PROCEDURE (obj);
|
||
goto again;
|
||
default:
|
||
return SCM_BOOL_F;
|
||
}
|
||
}
|
||
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_SYMBOL (sym_documentation, "documentation");
|
||
|
||
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);
|
||
if (SCM_PROGRAM_P (proc))
|
||
return scm_assq_ref (scm_program_properties (proc), sym_documentation);
|
||
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 name, ret;
|
||
SCM_VALIDATE_PROC (1, procedure);
|
||
SCM_VALIDATE_PROC (2, setter);
|
||
ret = scm_double_cell (scm_tc7_pws,
|
||
SCM_UNPACK (procedure),
|
||
SCM_UNPACK (setter), 0);
|
||
/* don't use procedure_name, because don't care enough to do a reverse
|
||
lookup */
|
||
switch (SCM_TYP7 (procedure)) {
|
||
case scm_tcs_subrs:
|
||
name = SCM_SUBR_NAME (procedure);
|
||
break;
|
||
default:
|
||
name = scm_procedure_property (procedure, scm_sym_name);
|
||
break;
|
||
}
|
||
if (scm_is_true (name))
|
||
scm_set_procedure_property_x (ret, scm_sym_name, name);
|
||
return ret;
|
||
}
|
||
#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 applicable 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_PUREGENERICP (proc) || SCM_STRUCT_APPLICABLE_P (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_BOOL_F;
|
||
if (SCM_PUREGENERICP (proc))
|
||
setter = SCM_GENERIC_SETTER (proc);
|
||
else if (SCM_STRUCT_SETTER_P (proc))
|
||
setter = SCM_STRUCT_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:
|
||
*/
|