mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-01 04:10:18 +02:00
314b87163e
* libguile/debug.c (scm_procedure_name): Remove a SCM_CLOSUREP case and some dead code. (scm_procedure_module): Remove. This was introduced a few months ago for the hygienic expander, but now it is no longer needed, as the expander keeps track of this information itself. * libguile/debug.h: Remove scm_procedure_module. * libguile/eval.c: Instead of using tc3 closures, define a "boot closure" applicable smob type, and represent closures with that. The advantage is that after eval.scm is compiled, boot closures take up no address space (besides a smob number) in the runtime, and require no special cases in procedure dispatch. * libguile/eval.h: Remove the internal functions scm_i_call_closure_0 and scm_closure_apply, and the public function scm_closure. * libguile/gc.c (scm_storage_prehistory): No tc3_closure displacement registration. (scm_i_tag_name): Remove closure case, and a dead cclo case. * libguile/vm.c (apply_foreign): * libguile/print.c (iprin1): * libguile/procs.c (scm_procedure_p, scm_procedure_documentation); * libguile/evalext.c (scm_self_evaluating_p): * libguile/goops.c (scm_class_of): Remove tc3_closure/tcs_closure cases. * libguile/hash.c (scm_hasher): * libguile/hooks.c (scm_add_hook_x): Use new scm_i_procedure_arity. * libguile/macros.c (macro_print): Print all macros using the same code. (scm_macro_transformer): Return any procedure, not just programs. * libguile/procprop.h: * libguile/procprop.c (scm_i_procedure_arity): Instead of returning a list that the caller has to parse, have the same prototype as scm_i_program_arity. An incompatible change, but it's an internal function anyway. (scm_procedure_properties, scm_set_procedure_properties) (scm_procedure_property, scm_set_procedure_property): Remove closure cases, and use scm_i_program_arity for arity. * libguile/procs.h (SCM_CLOSUREP, SCM_CLOSCAR, SCM_CODE) (SCM_CLOSURE_NUM_REQUIRED_ARGS, SCM_CLOSURE_HAS_REST_ARGS) (SCM_CLOSURE_BODY, SCM_PROCPROPS, SCM_SETPROCPROPS, SCM_ENV) (SCM_TOP_LEVEL): Remove these macros that pertain to boot closures only. Only eval.c should know abut boot closures. * libguile/procs.c (scm_closure_p): Remove this function. There is a simple stub in deprecated.scm now. (scm_thunk_p): Use scm_i_program_arity. * libguile/tags.h (scm_tc3_closure): Remove. Yay, another tc3 to play with! (scm_tcs_closures): Remove. * libguile/validate.h (SCM_VALIDATE_CLOSURE): Remove. * module/ice-9/deprecated.scm (closure?): Add stub. * module/ice-9/documentation.scm (object-documentation) * module/ice-9/session.scm (help-doc, arity) * module/oop/goops.scm (compute-getters-n-setters) * module/oop/goops/describe.scm (describe) * module/system/repl/describe.scm (display-object, display-type): Remove calls to closure?.
126 lines
4.6 KiB
C
126 lines
4.6 KiB
C
/* classes: h_files */
|
||
|
||
#ifndef SCM_PROCS_H
|
||
#define SCM_PROCS_H
|
||
|
||
/* Copyright (C) 1995,1996,1998,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
|
||
*/
|
||
|
||
|
||
|
||
#include "libguile/__scm.h"
|
||
|
||
|
||
|
||
|
||
/* Subrs
|
||
*/
|
||
|
||
#define SCM_SUBR_META_INFO(x) ((SCM *) SCM_CELL_WORD_3 (x))
|
||
#define SCM_SUBR_NAME(x) (SCM_SUBR_META_INFO (x) [0])
|
||
#define SCM_SUBRF(x) ((SCM (*)()) SCM_CELL_WORD_1 (x))
|
||
#define SCM_SUBR_PROPS(x) (SCM_SUBR_META_INFO (x) [1])
|
||
#define SCM_SUBR_GENERIC(x) ((SCM *) SCM_CELL_WORD_2 (x))
|
||
#define SCM_SET_SUBR_GENERIC(x, g) (*((SCM *) SCM_CELL_WORD_2 (x)) = (g))
|
||
#define SCM_SET_SUBR_GENERIC_LOC(x, g) (SCM_SET_CELL_WORD_2 (x, (scm_t_bits) g))
|
||
|
||
/* Return the most suitable subr type for a subr with REQ required arguments,
|
||
OPT optional arguments, and REST (0 or 1) arguments. This has to be in
|
||
sync with `create_gsubr ()'. */
|
||
#define SCM_SUBR_ARITY_TO_TYPE(req, opt, rest) \
|
||
(scm_tc7_gsubr | (SCM_GSUBR_MAKTYPE (req, opt, rest) << 8U))
|
||
|
||
|
||
|
||
/* Procedure-with-setter
|
||
|
||
Four representations for procedure-with-setters were
|
||
considered before selecting this one:
|
||
|
||
1. A closure where the CODE and ENV slots are used to represent
|
||
the getter and a new SETTER slot is used for the setter. The
|
||
original getter is stored as a `getter' procedure property. For
|
||
closure getters, the CODE and ENV slots contains a copy of the
|
||
getter's CODE and ENV slots. For subr getters, the CODE contains
|
||
a call to the subr.
|
||
|
||
2. A compiled closure with a call to the getter in the cclo
|
||
procedure. The getter and setter are stored in slots 1 and 2.
|
||
|
||
3. An entity (i.e. a struct with an associated procedure) with a
|
||
call to the getter in the entity procedure and the setter stored
|
||
in slot 0. The original getter is stored in slot 1.
|
||
|
||
4. A new primitive procedure type supported in the evaluator. The
|
||
getter and setter are stored in a GETTER and SETTER slot. A call
|
||
to this procedure type results in a retrieval of the getter and a
|
||
jump back to the correct eval dispatcher.
|
||
|
||
Representation 4 was selected because of efficiency and
|
||
simplicity.
|
||
|
||
Rep 1 has the advantage that there is zero penalty for closure
|
||
getters, but primitive getters will get considerable overhead
|
||
because the procedure-with-getter will be a closure which calls
|
||
the getter.
|
||
|
||
Rep 3 has the advantage that a GOOPS accessor can be a subclass of
|
||
<procedure-with-setter>, but together with rep 2 it suffers from a
|
||
three level dispatch for non-GOOPS getters:
|
||
|
||
cclo/struct --> dispatch proc --> getter
|
||
|
||
This is because the dispatch procedure must take an extra initial
|
||
argument (cclo for rep 2, struct for rep 3).
|
||
|
||
Rep 4 has the single disadvantage that it uses up one tc7 type
|
||
code, but the plan for uniform vectors will very likely free tc7
|
||
codes, so this is probably no big problem. Also note that the
|
||
GETTER and SETTER slots can live directly on the heap, using the
|
||
new four-word cells. */
|
||
|
||
#define SCM_PROCEDURE_WITH_SETTER_P(obj) (!SCM_IMP(obj) && (SCM_TYP7 (obj) == scm_tc7_pws))
|
||
#define SCM_PROCEDURE(obj) SCM_CELL_OBJECT_1 (obj)
|
||
#define SCM_SETTER(obj) SCM_CELL_OBJECT_2 (obj)
|
||
|
||
|
||
|
||
|
||
SCM_API SCM scm_c_make_subr (const char *name, long type, SCM (*fcn)());
|
||
SCM_API SCM scm_c_make_subr_with_generic (const char *name, long type,
|
||
SCM (*fcn)(), SCM *gf);
|
||
SCM_API SCM scm_c_define_subr (const char *name, long type, SCM (*fcn)());
|
||
SCM_API SCM scm_c_define_subr_with_generic (const char *name, long type,
|
||
SCM (*fcn)(), SCM *gf);
|
||
SCM_API SCM scm_procedure_p (SCM obj);
|
||
SCM_API SCM scm_thunk_p (SCM obj);
|
||
SCM_API int scm_subr_p (SCM obj);
|
||
SCM_API SCM scm_procedure_documentation (SCM proc);
|
||
SCM_API SCM scm_procedure_with_setter_p (SCM obj);
|
||
SCM_API SCM scm_make_procedure_with_setter (SCM procedure, SCM setter);
|
||
SCM_API SCM scm_procedure (SCM proc);
|
||
SCM_API SCM scm_setter (SCM proc);
|
||
SCM_INTERNAL void scm_init_procs (void);
|
||
|
||
#endif /* SCM_PROCS_H */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|