mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
b7742c6b71
* libguile/eval.c: So, ladies & gents, a new evaluator. It's similar to
the old one, in that we memoize and then evaluate, but in this
incarnation, memoization of an expression happens before evaluation,
not lazily as the expression is evaluated. This makes the evaluation
itself much cleaner, in addition to being threadsafe. In addition,
since this C evaluator will in the future just serve to bootstrap the
Scheme evaluator, we don't have to pay much concern for debugging
conveniences. So the environment is just a list of values, and the
memoizer pre-computes where it's going to find each individual value
in the environment.
Interface changes are commented below, with eval.h.
(scm_evaluator_traps): No need to reset the debug mode after rnning te
traps thing. But really, the whole traps system needs some love.
* libguile/memoize.h:
* libguile/memoize.c: New memoizer, which runs before evaluation,
checking all syntax before evaluation begins. Significantly, no
debugging information is left for lexical variables, which is not so
great for interactive debugging; perhaps we should change this to have
a var list in the future as per the classic interpreters. But it's
quite fast, and the resulting code is quite good. Also note that it
doesn't produce ilocs, memoized code is a smob whose type is in the
first word of the smob itself.
* libguile/eval.h (scm_sym_and, scm_sym_begin, scm_sym_case)
(scm_sym_cond, scm_sym_define, scm_sym_do, scm_sym_if, scm_sym_lambda)
(scm_sym_let, scm_sym_letstar, scm_sym_letrec, scm_sym_quote)
(scm_sym_quasiquote, scm_sym_unquote, scm_sym_uq_splicing, scm_sym_at)
(scm_sym_atat, scm_sym_atapply, scm_sym_atcall_cc)
(scm_sym_at_call_with_values, scm_sym_delay, scm_sym_eval_when)
(scm_sym_arrow, scm_sym_else, scm_sym_apply, scm_sym_set_x)
(scm_sym_args): Remove public declaration of these symbols.
(scm_ilookup, scm_lookupcar, scm_eval_car, scm_eval_body)
(scm_eval_args, scm_i_eval_x, scm_i_eval): Remove public declaration
of these functions.
(scm_ceval, scm_deval, scm_ceval_ptr): Remove declarations of these
deprecated functions.
(scm_i_print_iloc, scm_i_print_isym, scm_i_unmemocopy_expr)
(scm_i_unmemocopy_body): Remove declarations of these internal
functions.
(scm_primitive_eval_x, scm_eval_x): Redefine as macros for their less
destructive siblings.
* libguile/Makefile.am: Add memoize.[ch] to the build.
* libguile/debug.h (scm_debug_mode_p, scm_check_entry_p)
(scm_check_apply_p, scm_check_exit_p, scm_check_memoize_p)
(scm_debug_eframe_size): Remove these vars that were tied to the old
evaluator's execution model.
(SCM_RESET_DEBUG_MODE): Remove, no more need for this.
(SCM_MEMOIZEDP, SCM_MEMOIZED_EXP, SCM_MEMOIZED_ENV): Remove macros
referring to old memoized code representation.
(scm_local_eval, scm_procedure_environment, scm_memoized_environment)
(scm_make_memoized, scm_memoized_p): Remove functions operating on old
memoized code representation.
(scm_memcons, scm_mem_to_proc, scm_proc_to_mem): Remove debug-only
code for old evaluator.
* libguile/debug.c: Remove code to correspond with debug.h removals.
(scm_debug_options): No need to set the debug mode or frame limit
here, as we don't have C stack limits any more. Perhaps this is a bug,
but as long as we can compile eval.scm, we should be fine.
* libguile/init.c (scm_i_init_guile): Init memoize.c.
* libguile/modules.c (scm_top_level_env, scm_env_top_level)
(scm_env_module, scm_system_module_env_p): Remove these functions.
* libguile/print.c (iprin1): No more need to handle isyms. Adapt to new
form of interpreted procedures.
* libguile/procprop.c (scm_i_procedure_arity): Adapt to new form of
interpreted procedures.
* libguile/procs.c (scm_thunk_p): Adapt to new form of interpreted
procedures.
* libguile/procs.h (SCM_CLOSURE_FORMALS): Removed, this exists no more.
(SCM_CLOSURE_NUM_REQUIRED_ARGS, SCM_CLOSURE_HAS_REST_ARGS): New
accessors.
* libguile/srcprop.c (scm_source_properties, scm_source_property)
(scm_set_source_property_x): Remove special cases for memoized code.
* libguile/stacks.c (read_frame): Remove a source-property case for
interpreted code.
(NEXT_FRAME): Remove a case that I don't fully understand, that seems
to be designed to skip over apply frames. Will be obsolete in the
futures.
(read_frames): Default source value for interpreted frames to #f.
(narrow_stack): Don't pay attention to the system_module thing.
* libguile/tags.h: Remove isyms and ilocs. Whee!
* libguile/validate.h (SCM_VALIDATE_MEMOIZED): Fix to use the new
MEMOIZED_P formulation.
* module/ice-9/psyntax-pp.scm (do, quasiquote, case): Adapt for these no
longer being primitive macros.
* module/ice-9/boot-9.scm: Whitespace change, but just a poke to force a
rebuild due to and/or/cond/... not being primitives any more.
* module/ice-9/deprecated.scm (unmemoize-expr): Deprecate, it's
unmemoize-expression now.
* test-suite/tests/eval.test ("define set procedure-name"): XFAIL a
couple of tests here; I don't know what to do about them. I reckon the
expander should ensure that defined values are named.
* test-suite/tests/chars.test ("basic char handling"): Fix expected
exception when trying to apply a char.
174 lines
6.4 KiB
C
174 lines
6.4 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_DSUBRF(x) ((double (*)()) 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) \
|
||
((rest) == 0 \
|
||
? ((opt) == 0 \
|
||
? ((req) == 0 \
|
||
? scm_tc7_subr_0 \
|
||
: ((req) == 1 \
|
||
? scm_tc7_subr_1 \
|
||
: ((req) == 2 \
|
||
? scm_tc7_subr_2 \
|
||
: ((req) == 3 \
|
||
? scm_tc7_subr_3 \
|
||
: scm_tc7_gsubr \
|
||
| (SCM_GSUBR_MAKTYPE (req, opt, rest) << 8U))))) \
|
||
: ((opt) == 1 \
|
||
? ((req) == 0 \
|
||
? scm_tc7_subr_1o \
|
||
: ((req) == 1 \
|
||
? scm_tc7_subr_2o \
|
||
: scm_tc7_gsubr | \
|
||
(SCM_GSUBR_MAKTYPE (req, opt, rest) << 8U))) \
|
||
: scm_tc7_gsubr | \
|
||
(SCM_GSUBR_MAKTYPE (req, opt, rest) << 8U))) \
|
||
: ((rest) == 1 \
|
||
? ((opt) == 0 \
|
||
? ((req) == 0 \
|
||
? scm_tc7_lsubr \
|
||
: ((req) == 2 \
|
||
? scm_tc7_lsubr_2 \
|
||
: scm_tc7_gsubr \
|
||
| (SCM_GSUBR_MAKTYPE (req, opt, rest) << 8U))) \
|
||
: scm_tc7_gsubr \
|
||
| (SCM_GSUBR_MAKTYPE (req, opt, rest) << 8U)) \
|
||
: scm_tc7_gsubr \
|
||
| (SCM_GSUBR_MAKTYPE (req, opt, rest) << 8U)))
|
||
|
||
|
||
|
||
/* Closures
|
||
*/
|
||
|
||
#define SCM_CLOSUREP(x) (!SCM_IMP(x) && (SCM_TYP3 (x) == scm_tc3_closure))
|
||
#define SCM_CLOSCAR(x) SCM_PACK (SCM_CELL_WORD_0 (x) - scm_tc3_closure)
|
||
#define SCM_CODE(x) SCM_CAR (SCM_CLOSCAR (x))
|
||
#define SCM_CLOSURE_NUM_REQUIRED_ARGS(x) SCM_I_INUM (SCM_CAR (SCM_CODE (x)))
|
||
#define SCM_CLOSURE_HAS_REST_ARGS(x) scm_is_true (SCM_CADR (SCM_CODE (x)))
|
||
#define SCM_CLOSURE_BODY(x) SCM_CDDR (SCM_CODE (x))
|
||
#define SCM_PROCPROPS(x) SCM_CDR (SCM_CLOSCAR (x))
|
||
#define SCM_SETPROCPROPS(x, p) SCM_SETCDR (SCM_CLOSCAR (x), p)
|
||
#define SCM_ENV(x) SCM_CELL_OBJECT_1 (x)
|
||
#define SCM_TOP_LEVEL(ENV) (scm_is_null (ENV) || (scm_is_true (scm_procedure_p (SCM_CAR (ENV)))))
|
||
|
||
/* 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_closure_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:
|
||
*/
|