mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
* 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.
243 lines
6.3 KiB
C
243 lines
6.3 KiB
C
/* Copyright (C) 1995,1996,1998,2000,2001,2003,2004, 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/alist.h"
|
||
#include "libguile/eval.h"
|
||
#include "libguile/procs.h"
|
||
#include "libguile/gsubr.h"
|
||
#include "libguile/smob.h"
|
||
#include "libguile/root.h"
|
||
#include "libguile/vectors.h"
|
||
#include "libguile/hashtab.h"
|
||
#include "libguile/programs.h"
|
||
|
||
#include "libguile/validate.h"
|
||
#include "libguile/procprop.h"
|
||
|
||
|
||
SCM_GLOBAL_SYMBOL (scm_sym_system_procedure, "system-procedure");
|
||
SCM_GLOBAL_SYMBOL (scm_sym_arity, "arity");
|
||
|
||
static SCM non_closure_props;
|
||
static scm_i_pthread_mutex_t non_closure_props_lock = SCM_I_PTHREAD_MUTEX_INITIALIZER;
|
||
|
||
SCM
|
||
scm_i_procedure_arity (SCM proc)
|
||
{
|
||
int a = 0, o = 0, r = 0;
|
||
if (SCM_IMP (proc))
|
||
return SCM_BOOL_F;
|
||
loop:
|
||
switch (SCM_TYP7 (proc))
|
||
{
|
||
case scm_tc7_subr_1o:
|
||
o = 1;
|
||
case scm_tc7_subr_0:
|
||
break;
|
||
case scm_tc7_subr_2o:
|
||
o = 1;
|
||
case scm_tc7_subr_1:
|
||
case scm_tc7_dsubr:
|
||
case scm_tc7_cxr:
|
||
a += 1;
|
||
break;
|
||
case scm_tc7_subr_2:
|
||
a += 2;
|
||
break;
|
||
case scm_tc7_subr_3:
|
||
a += 3;
|
||
break;
|
||
case scm_tc7_asubr:
|
||
case scm_tc7_rpsubr:
|
||
case scm_tc7_lsubr:
|
||
r = 1;
|
||
break;
|
||
case scm_tc7_program:
|
||
if (scm_i_program_arity (proc, &a, &o, &r))
|
||
break;
|
||
else
|
||
return SCM_BOOL_F;
|
||
case scm_tc7_lsubr_2:
|
||
a += 2;
|
||
r = 1;
|
||
break;
|
||
case scm_tc7_smob:
|
||
if (SCM_SMOB_APPLICABLE_P (proc))
|
||
{
|
||
int type = SCM_SMOB_DESCRIPTOR (proc).gsubr_type;
|
||
a += SCM_GSUBR_REQ (type);
|
||
o = SCM_GSUBR_OPT (type);
|
||
r = SCM_GSUBR_REST (type);
|
||
break;
|
||
}
|
||
else
|
||
{
|
||
return SCM_BOOL_F;
|
||
}
|
||
case scm_tc7_gsubr:
|
||
{
|
||
unsigned int type = SCM_GSUBR_TYPE (proc);
|
||
a = SCM_GSUBR_REQ (type);
|
||
o = SCM_GSUBR_OPT (type);
|
||
r = SCM_GSUBR_REST (type);
|
||
break;
|
||
}
|
||
case scm_tc7_pws:
|
||
proc = SCM_PROCEDURE (proc);
|
||
goto loop;
|
||
case scm_tcs_closures:
|
||
a = SCM_CLOSURE_NUM_REQUIRED_ARGS (proc);
|
||
r = SCM_CLOSURE_HAS_REST_ARGS (proc) ? 1 : 0;
|
||
break;
|
||
case scm_tcs_struct:
|
||
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
|
||
{
|
||
r = 1;
|
||
break;
|
||
}
|
||
else if (!SCM_STRUCT_APPLICABLE_P (proc))
|
||
return SCM_BOOL_F;
|
||
proc = SCM_STRUCT_PROCEDURE (proc);
|
||
goto loop;
|
||
default:
|
||
return SCM_BOOL_F;
|
||
}
|
||
return scm_list_3 (scm_from_int (a), scm_from_int (o), scm_from_bool(r));
|
||
}
|
||
|
||
/* FIXME: instead of the weak hash, perhaps for some kinds of procedures, use
|
||
other means; for example subrs have their own property slot, which is unused
|
||
at present. */
|
||
|
||
SCM_DEFINE (scm_procedure_properties, "procedure-properties", 1, 0, 0,
|
||
(SCM proc),
|
||
"Return @var{obj}'s property list.")
|
||
#define FUNC_NAME s_scm_procedure_properties
|
||
{
|
||
SCM props;
|
||
|
||
SCM_VALIDATE_PROC (1, proc);
|
||
if (SCM_CLOSUREP (proc))
|
||
props = SCM_PROCPROPS (proc);
|
||
else
|
||
{
|
||
scm_i_pthread_mutex_lock (&non_closure_props_lock);
|
||
props = scm_hashq_ref (non_closure_props, proc, SCM_EOL);
|
||
scm_i_pthread_mutex_unlock (&non_closure_props_lock);
|
||
}
|
||
return scm_acons (scm_sym_arity, scm_i_procedure_arity (proc), props);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_set_procedure_properties_x, "set-procedure-properties!", 2, 0, 0,
|
||
(SCM proc, SCM alist),
|
||
"Set @var{proc}'s property list to @var{alist}.")
|
||
#define FUNC_NAME s_scm_set_procedure_properties_x
|
||
{
|
||
SCM_VALIDATE_PROC (1, proc);
|
||
|
||
if (SCM_CLOSUREP (proc))
|
||
SCM_SETPROCPROPS (proc, alist);
|
||
else
|
||
{
|
||
scm_i_pthread_mutex_lock (&non_closure_props_lock);
|
||
scm_hashq_set_x (non_closure_props, proc, alist);
|
||
scm_i_pthread_mutex_unlock (&non_closure_props_lock);
|
||
}
|
||
return SCM_UNSPECIFIED;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_procedure_property, "procedure-property", 2, 0, 0,
|
||
(SCM proc, SCM key),
|
||
"Return the property of @var{proc} with name @var{key}.")
|
||
#define FUNC_NAME s_scm_procedure_property
|
||
{
|
||
SCM_VALIDATE_PROC (1, proc);
|
||
|
||
if (scm_is_eq (key, scm_sym_arity))
|
||
/* avoid a cons in this case */
|
||
return scm_i_procedure_arity (proc);
|
||
else
|
||
{
|
||
SCM props;
|
||
if (SCM_CLOSUREP (proc))
|
||
props = SCM_PROCPROPS (proc);
|
||
else
|
||
{
|
||
scm_i_pthread_mutex_lock (&non_closure_props_lock);
|
||
props = scm_hashq_ref (non_closure_props, proc, SCM_EOL);
|
||
scm_i_pthread_mutex_unlock (&non_closure_props_lock);
|
||
}
|
||
return scm_assq_ref (props, key);
|
||
}
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_set_procedure_property_x, "set-procedure-property!", 3, 0, 0,
|
||
(SCM proc, SCM key, SCM val),
|
||
"In @var{proc}'s property list, set the property named @var{key} to\n"
|
||
"@var{val}.")
|
||
#define FUNC_NAME s_scm_set_procedure_property_x
|
||
{
|
||
SCM_VALIDATE_PROC (1, proc);
|
||
|
||
if (scm_is_eq (key, scm_sym_arity))
|
||
SCM_MISC_ERROR ("arity is a read-only property", SCM_EOL);
|
||
|
||
if (SCM_CLOSUREP (proc))
|
||
SCM_SETPROCPROPS (proc,
|
||
scm_assq_set_x (SCM_PROCPROPS (proc), key, val));
|
||
else
|
||
{
|
||
scm_i_pthread_mutex_lock (&non_closure_props_lock);
|
||
scm_hashq_set_x (non_closure_props, proc,
|
||
scm_assq_set_x (scm_hashq_ref (non_closure_props, proc,
|
||
SCM_EOL),
|
||
key, val));
|
||
scm_i_pthread_mutex_unlock (&non_closure_props_lock);
|
||
}
|
||
|
||
return SCM_UNSPECIFIED;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
|
||
|
||
void
|
||
scm_init_procprop ()
|
||
{
|
||
non_closure_props = scm_make_weak_key_hash_table (SCM_UNDEFINED);
|
||
#include "libguile/procprop.x"
|
||
}
|
||
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|