mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 20:00:19 +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.
127 lines
4.6 KiB
C
127 lines
4.6 KiB
C
/* classes: h_files */
|
||
|
||
#ifndef SCM_MODULES_H
|
||
#define SCM_MODULES_H
|
||
|
||
/* Copyright (C) 1998, 2000, 2001, 2002, 2003, 2006, 2007, 2008 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"
|
||
|
||
#include "libguile/validate.h"
|
||
|
||
|
||
|
||
SCM_API int scm_module_system_booted_p;
|
||
SCM_API scm_t_bits scm_module_tag;
|
||
|
||
#define SCM_MODULEP(OBJ) \
|
||
(!SCM_IMP (OBJ) && SCM_CELL_TYPE (OBJ) == scm_module_tag)
|
||
|
||
#define SCM_VALIDATE_MODULE(pos, scm) SCM_MAKE_VALIDATE_MSG (pos, scm, MODULEP, "module")
|
||
|
||
/* NOTE: Indexes of module fields are dependent upon the definition of
|
||
* module-type in boot-9.scm.
|
||
*/
|
||
|
||
#define scm_module_index_obarray 0
|
||
#define scm_module_index_uses 1
|
||
#define scm_module_index_binder 2
|
||
#define scm_module_index_eval_closure 3
|
||
#define scm_module_index_transformer 4
|
||
#define scm_module_index_duplicate_handlers 7
|
||
#define scm_module_index_import_obarray 8
|
||
|
||
#define SCM_MODULE_OBARRAY(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module) [scm_module_index_obarray])
|
||
#define SCM_MODULE_USES(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module) [scm_module_index_uses])
|
||
#define SCM_MODULE_BINDER(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module) [scm_module_index_binder])
|
||
#define SCM_MODULE_EVAL_CLOSURE(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module)[scm_module_index_eval_closure])
|
||
#define SCM_MODULE_TRANSFORMER(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module)[scm_module_index_transformer])
|
||
#define SCM_MODULE_DUPLICATE_HANDLERS(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module)[scm_module_index_duplicate_handlers])
|
||
#define SCM_MODULE_IMPORT_OBARRAY(module) \
|
||
SCM_PACK (SCM_STRUCT_DATA (module)[scm_module_index_import_obarray])
|
||
|
||
SCM_API scm_t_bits scm_tc16_eval_closure;
|
||
|
||
#define SCM_EVAL_CLOSURE_P(x) SCM_TYP16_PREDICATE (scm_tc16_eval_closure, x)
|
||
|
||
|
||
|
||
SCM_API SCM scm_current_module (void);
|
||
SCM_API SCM scm_the_root_module (void);
|
||
SCM_API SCM scm_module_variable (SCM module, SCM sym);
|
||
SCM_API SCM scm_module_local_variable (SCM module, SCM sym);
|
||
SCM_API SCM scm_interaction_environment (void);
|
||
SCM_API SCM scm_set_current_module (SCM module);
|
||
|
||
SCM_API SCM scm_c_call_with_current_module (SCM module,
|
||
SCM (*func)(void *), void *data);
|
||
SCM_API void scm_dynwind_current_module (SCM module);
|
||
|
||
SCM_API SCM scm_c_lookup (const char *name);
|
||
SCM_API SCM scm_c_define (const char *name, SCM val);
|
||
SCM_API SCM scm_lookup (SCM symbol);
|
||
SCM_API SCM scm_define (SCM symbol, SCM val);
|
||
|
||
SCM_API SCM scm_c_module_lookup (SCM module, const char *name);
|
||
SCM_API SCM scm_c_module_define (SCM module, const char *name, SCM val);
|
||
SCM_API SCM scm_module_lookup (SCM module, SCM symbol);
|
||
SCM_API SCM scm_module_define (SCM module, SCM symbol, SCM val);
|
||
SCM_API SCM scm_module_export (SCM module, SCM symbol_list);
|
||
SCM_API SCM scm_module_reverse_lookup (SCM module, SCM variable);
|
||
|
||
SCM_API SCM scm_c_resolve_module (const char *name);
|
||
SCM_API SCM scm_resolve_module (SCM name);
|
||
SCM_API SCM scm_c_define_module (const char *name,
|
||
void (*init)(void *), void *data);
|
||
SCM_API void scm_c_use_module (const char *name);
|
||
SCM_API void scm_c_export (const char *name, ...);
|
||
|
||
SCM_API SCM scm_sym2var (SCM sym, SCM thunk, SCM definep);
|
||
|
||
SCM_API SCM scm_module_public_interface (SCM module);
|
||
SCM_API SCM scm_module_import_interface (SCM module, SCM sym);
|
||
SCM_API SCM scm_module_lookup_closure (SCM module);
|
||
SCM_API SCM scm_module_transformer (SCM module);
|
||
SCM_API SCM scm_current_module_lookup_closure (void);
|
||
SCM_API SCM scm_current_module_transformer (void);
|
||
SCM_API SCM scm_eval_closure_lookup (SCM eclo, SCM sym, SCM definep);
|
||
SCM_API SCM scm_standard_eval_closure (SCM module);
|
||
SCM_API SCM scm_standard_interface_eval_closure (SCM module);
|
||
SCM_API SCM scm_eval_closure_module (SCM eval_closure); /* deprecated already */
|
||
SCM_API SCM scm_get_pre_modules_obarray (void);
|
||
SCM_API SCM scm_lookup_closure_module (SCM proc);
|
||
|
||
SCM_INTERNAL void scm_modules_prehistory (void);
|
||
SCM_INTERNAL void scm_init_modules (void);
|
||
|
||
#endif /* SCM_MODULES_H */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|