diff options
author | Andy Wingo <wingo@pobox.com> | 2009-11-28 01:19:50 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-12-01 21:00:26 +0100 |
commit | b7742c6b7132544b9d6cd9cb32c09e2084ad9e52 (patch) | |
tree | 1e39ea9eda8cfd3a4aca661e341d9245ae0fa91a /libguile/eval.h | |
parent | 83c76550024c4a96c06cb75d40ab0ba122a0a57c (diff) | |
download | guile-b7742c6b7132544b9d6cd9cb32c09e2084ad9e52.tar.gz |
new evaluator, y'all
* 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.
Diffstat (limited to 'libguile/eval.h')
-rw-r--r-- | libguile/eval.h | 62 |
1 files changed, 4 insertions, 58 deletions
diff --git a/libguile/eval.h b/libguile/eval.h index 0e990cf26..fbb5bf512 100644 --- a/libguile/eval.h +++ b/libguile/eval.h @@ -27,6 +27,7 @@ #include "libguile/__scm.h" #include "libguile/struct.h" +#include "libguile/memoize.h" @@ -79,42 +80,6 @@ typedef SCM (*scm_t_trampoline_2) (SCM proc, SCM arg1, SCM arg2); -SCM_API SCM scm_sym_and; -SCM_API SCM scm_sym_begin; -SCM_API SCM scm_sym_case; -SCM_API SCM scm_sym_cond; -SCM_API SCM scm_sym_define; -SCM_API SCM scm_sym_do; -SCM_API SCM scm_sym_if; -SCM_API SCM scm_sym_lambda; -SCM_API SCM scm_sym_let; -SCM_API SCM scm_sym_letstar; -SCM_API SCM scm_sym_letrec; -SCM_API SCM scm_sym_quote; -SCM_API SCM scm_sym_quasiquote; -SCM_API SCM scm_sym_unquote; -SCM_API SCM scm_sym_uq_splicing; - -SCM_API SCM scm_sym_at; -SCM_API SCM scm_sym_atat; -SCM_API SCM scm_sym_atapply; -SCM_API SCM scm_sym_atcall_cc; -SCM_API SCM scm_sym_at_call_with_values; -SCM_API SCM scm_sym_delay; -SCM_API SCM scm_sym_eval_when; -SCM_API SCM scm_sym_arrow; -SCM_API SCM scm_sym_else; -SCM_API SCM scm_sym_apply; -SCM_API SCM scm_sym_set_x; -SCM_API SCM scm_sym_args; - - - -SCM_API SCM * scm_ilookup (SCM iloc, SCM env); -SCM_API SCM * scm_lookupcar (SCM vloc, SCM genv, int check); -SCM_API SCM scm_eval_car (SCM pair, SCM env); -SCM_API SCM scm_eval_body (SCM code, SCM env); -SCM_API SCM scm_eval_args (SCM i, SCM env, SCM proc); SCM_API int scm_badargsp (SCM formals, SCM args); SCM_API SCM scm_call_0 (SCM proc); SCM_API SCM scm_call_1 (SCM proc, SCM arg1); @@ -126,42 +91,23 @@ SCM_API SCM scm_apply_1 (SCM proc, SCM arg1, SCM args); SCM_API SCM scm_apply_2 (SCM proc, SCM arg1, SCM arg2, SCM args); SCM_API SCM scm_apply_3 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM args); SCM_INTERNAL SCM scm_i_call_closure_0 (SCM proc); -SCM_API scm_t_trampoline_0 scm_trampoline_0 (SCM proc); -SCM_API scm_t_trampoline_1 scm_trampoline_1 (SCM proc); -SCM_API scm_t_trampoline_2 scm_trampoline_2 (SCM proc); SCM_API SCM scm_nconc2last (SCM lst); SCM_API SCM scm_apply (SCM proc, SCM arg1, SCM args); -SCM_API SCM scm_dapply (SCM proc, SCM arg1, SCM args); +#define scm_dapply(proc,arg1,args) scm_apply (proc, arg1, args) SCM_API SCM scm_map (SCM proc, SCM arg1, SCM args); SCM_API SCM scm_for_each (SCM proc, SCM arg1, SCM args); SCM_API SCM scm_closure (SCM code, SCM env); SCM_API SCM scm_make_promise (SCM thunk); SCM_API SCM scm_force (SCM x); SCM_API SCM scm_promise_p (SCM x); -SCM_API SCM scm_i_eval_x (SCM exp, SCM env) /* not internal */; -SCM_INTERNAL SCM scm_i_eval (SCM exp, SCM env); SCM_API SCM scm_primitive_eval (SCM exp); -SCM_API SCM scm_primitive_eval_x (SCM exp); +#define scm_primitive_eval_x(exp) scm_primitive_eval (exp) SCM_API SCM scm_eval (SCM exp, SCM module); -SCM_API SCM scm_eval_x (SCM exp, SCM module); +#define scm_eval_x(exp, module) scm_eval (exp, module) -SCM_INTERNAL void scm_i_print_iloc (SCM /*iloc*/, SCM /*port*/); -SCM_INTERNAL void scm_i_print_isym (SCM /*isym*/, SCM /*port*/); -SCM_INTERNAL SCM scm_i_unmemocopy_expr (SCM expr, SCM env); -SCM_INTERNAL SCM scm_i_unmemocopy_body (SCM forms, SCM env); SCM_INTERNAL void scm_init_eval (void); -#if (SCM_ENABLE_DEPRECATED == 1) - -/* Deprecated in guile 1.7.0 on 2004-03-29. */ -SCM_DEPRECATED SCM scm_ceval (SCM x, SCM env); -SCM_DEPRECATED SCM scm_deval (SCM x, SCM env); -SCM_DEPRECATED SCM (*scm_ceval_ptr) (SCM x, SCM env); - -#endif - - #endif /* SCM_EVAL_H */ /* |