Remove "compiled closures" ("cclos") in favor of a simpler mechanism.
The idea is to introduce `gsubrs' whose arity is encoded in their type
(more precisely in the sizeof (void *) - 8 MSBs). This removes the
indirection introduced by cclos and simplifies the code.
* libguile/__scm.h (CCLO): Remove.
* libguile/debug.c (scm_procedure_source, scm_procedure_environment):
Remove references to `scm_tc7_cclo'.
* libguile/eval.c (scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Replace `scm_tc7_cclo' with `scm_tc7_gsubr'.
* libguile/eval.i.c (CEVAL): Likewise. No longer make PROC the first
argument. Directly invoke `scm_gsubr_apply ()' instead of jump to the
`evap(N+1)' label or call to `SCM_APPLY ()'.
* libguile/evalext.c (scm_self_evaluating_p): Remove reference to
`scm_tc7_cclo'.
* libguile/gc-card.c (scm_i_sweep_card, scm_i_tag_name): Likewise.
* libguile/gc-mark.c (scm_gc_mark_dependencies): Likewise.
* libguile/goops.c (scm_class_of): Likewise.
* libguile/print.c (iprin1): Likewise.
* libguile/gsubr.c (create_gsubr): Use `unsigned int's for REQ, OPT and
RST. Use `scm_tc7_gsubr' instead of `scm_makcclo ()' in the default
case.
(scm_gsubr_apply): Remove calls to `SCM_GSUBR_PROC ()'.
(scm_f_gsubr_apply): Remove.
* libguile/gsubr.h (SCM_GSUBR_TYPE): New definition.
(SCM_GSUBR_MAX): Changed to 33.
(SCM_SET_GSUBR_TYPE, SCM_GSUBR_PROC, SCM_SET_GSUBR_PROC,
scm_f_gsubr_apply): Remove.
* libguile/procprop.c (scm_i_procedure_arity): Remove reference to
`scm_tc7_cclo'; add proper handling of `scm_tc7_gsubr'.
* libguile/procs.c (scm_makcclo, scm_make_cclo): Remove.
(scm_procedure_p): Remove reference to `scm_tc7_cclo'.
(scm_thunk_p): Likewise, plus add proper `scm_tc7_gsubr' handling.
* libguile/procs.h (SCM_CCLO_LENGTH, SCM_MAKE_CCLO_TAG,
SCM_SET_CCLO_LENGTH, SCM_CCLO_BASE, SCM_SET_CCLO_BASE, SCM_CCLO_REF,
SCM_CCLO_SET, SCM_CCLO_SUBR, SCM_SET_CCLO_SUBR, scm_makcclo,
scm_make_cclo): Remove.
* libguile/stacks.c (read_frames): Remove reference to `scm_f_gsubr_apply'.
* libguile/tags.h (scm_tc7_cclo): Remove.
(scm_tc7_gsubr): New.
(scm_tcs_subrs): Add `scm_tc7_gsubr'.
2009-02-16 00:24:00 +01:00
|
|
|
|
/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
* Free Software Foundation, Inc.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* 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 2.1 of the License, or (at your option) any later version.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* 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.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
|
* License along with this library; if not, write to the Free Software
|
2005-05-23 19:57:22 +00:00
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2003-04-05 19:15:35 +00:00
|
|
|
|
*/
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
/* SECTION: This code is compiled once.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
2008-09-13 15:35:27 +02:00
|
|
|
|
#ifdef HAVE_CONFIG_H
|
2003-03-25 23:54:28 +00:00
|
|
|
|
# include <config.h>
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-29 15:16:46 +00:00
|
|
|
|
#include <alloca.h>
|
2003-03-25 23:54:28 +00:00
|
|
|
|
|
2007-07-29 15:16:46 +00:00
|
|
|
|
#include "libguile/__scm.h"
|
1997-02-04 21:59:23 +00:00
|
|
|
|
|
2004-05-16 06:38:51 +00:00
|
|
|
|
#include <assert.h>
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/_scm.h"
|
2003-10-18 14:49:55 +00:00
|
|
|
|
#include "libguile/alist.h"
|
|
|
|
|
|
#include "libguile/async.h"
|
|
|
|
|
|
#include "libguile/continuations.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/debug.h"
|
2003-11-09 08:10:58 +00:00
|
|
|
|
#include "libguile/deprecation.h"
|
2000-12-15 14:00:18 +00:00
|
|
|
|
#include "libguile/dynwind.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/eq.h"
|
2003-10-18 14:49:55 +00:00
|
|
|
|
#include "libguile/feature.h"
|
|
|
|
|
|
#include "libguile/fluids.h"
|
2003-01-23 16:04:37 +00:00
|
|
|
|
#include "libguile/futures.h"
|
2003-10-18 14:49:55 +00:00
|
|
|
|
#include "libguile/goops.h"
|
|
|
|
|
|
#include "libguile/hash.h"
|
|
|
|
|
|
#include "libguile/hashtab.h"
|
|
|
|
|
|
#include "libguile/lang.h"
|
2003-10-12 12:58:51 +00:00
|
|
|
|
#include "libguile/list.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/macros.h"
|
|
|
|
|
|
#include "libguile/modules.h"
|
2003-10-18 14:49:55 +00:00
|
|
|
|
#include "libguile/objects.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/ports.h"
|
Hide the implementation of ilocs and isyms in eval.c.
* deprecated.h (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.c (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.h (SCM_ICDR, SCM_IFRINC, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP): Deprecated and added to deprecated.h. Moved from
eval.h to eval.c.
* deprecated.c (scm_isymnames), deprecated.h (scm_isymnames,
SCM_ISYMNUM, SCM_ISYMCHARS), eval.c (SCM_ISYMNUM, isymnames,
scm_unmemocopy, CEVAL), print.c (scm_isymnames), tags.h
(SCM_ISYMNUM, scm_isymnames, SCM_ISYMCHARS): Deprecated
scm_isymnames, SCM_ISYMNUM and SCM_ISYMCHARS and added to
deprecated.[hc]. Moved scm_isymnames from print.c to eval.c and
renamed to isymnames. Moved SCM_ISYMNUM from tags.h to eval.c and
renamed to ISYMNUM.
* eval.c (scm_i_print_iloc, scm_i_print_isym), eval.h
(scm_i_print_iloc, scm_i_print_isym), print.c (scm_iprin1):
Extracted printing of ilocs and isyms to guile internal functions
scm_i_print_iloc, scm_i_print_isym of eval.c.
2004-04-22 19:19:17 +00:00
|
|
|
|
#include "libguile/print.h"
|
2003-10-18 14:49:55 +00:00
|
|
|
|
#include "libguile/procprop.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/root.h"
|
2003-10-18 14:49:55 +00:00
|
|
|
|
#include "libguile/smob.h"
|
|
|
|
|
|
#include "libguile/srcprop.h"
|
|
|
|
|
|
#include "libguile/stackchk.h"
|
|
|
|
|
|
#include "libguile/strings.h"
|
2005-03-02 20:42:01 +00:00
|
|
|
|
#include "libguile/threads.h"
|
2003-10-18 14:49:55 +00:00
|
|
|
|
#include "libguile/throw.h"
|
|
|
|
|
|
#include "libguile/validate.h"
|
2001-03-26 22:39:35 +00:00
|
|
|
|
#include "libguile/values.h"
|
2003-10-18 14:49:55 +00:00
|
|
|
|
#include "libguile/vectors.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
|
|
|
|
|
|
#include "libguile/eval.h"
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
#include "libguile/private-options.h"
|
1999-03-11 11:45:06 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM unmemoize_exprs (SCM expr, SCM env);
|
2003-11-02 11:39:35 +00:00
|
|
|
|
static SCM canonicalize_define (SCM expr);
|
2004-05-15 16:45:27 +00:00
|
|
|
|
static SCM *scm_lookupcar1 (SCM vloc, SCM genv, int check);
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM unmemoize_builtin_macro (SCM expr, SCM env);
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
static void ceval_letrec_inits (SCM env, SCM init_forms, SCM **init_values_eol);
|
|
|
|
|
|
static SCM ceval (SCM x, SCM env);
|
|
|
|
|
|
static SCM deval (SCM x, SCM env);
|
2007-01-19 20:05:05 +00:00
|
|
|
|
|
2003-11-02 11:39:35 +00:00
|
|
|
|
|
|
|
|
|
|
|
2003-10-10 21:49:27 +00:00
|
|
|
|
/* {Syntax Errors}
|
|
|
|
|
|
*
|
|
|
|
|
|
* This section defines the message strings for the syntax errors that can be
|
|
|
|
|
|
* detected during memoization and the functions and macros that shall be
|
|
|
|
|
|
* called by the memoizer code to signal syntax errors. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Syntax errors that can be detected during memoization: */
|
|
|
|
|
|
|
|
|
|
|
|
/* Circular or improper lists do not form valid scheme expressions. If a
|
|
|
|
|
|
* circular list or an improper list is detected in a place where a scheme
|
|
|
|
|
|
* expression is expected, a 'Bad expression' error is signalled. */
|
|
|
|
|
|
static const char s_bad_expression[] = "Bad expression";
|
|
|
|
|
|
|
2003-11-01 07:26:44 +00:00
|
|
|
|
/* If a form is detected that holds a different number of expressions than are
|
|
|
|
|
|
* required in that context, a 'Missing or extra expression' error is
|
|
|
|
|
|
* signalled. */
|
|
|
|
|
|
static const char s_expression[] = "Missing or extra expression in";
|
|
|
|
|
|
|
2003-10-11 16:03:29 +00:00
|
|
|
|
/* If a form is detected that holds less expressions than are required in that
|
2003-10-12 07:13:46 +00:00
|
|
|
|
* context, a 'Missing expression' error is signalled. */
|
2003-10-11 16:03:29 +00:00
|
|
|
|
static const char s_missing_expression[] = "Missing expression in";
|
|
|
|
|
|
|
2003-10-11 10:40:19 +00:00
|
|
|
|
/* If a form is detected that holds more expressions than are allowed in that
|
2003-10-12 07:13:46 +00:00
|
|
|
|
* context, an 'Extra expression' error is signalled. */
|
2003-10-11 10:40:19 +00:00
|
|
|
|
static const char s_extra_expression[] = "Extra expression in";
|
|
|
|
|
|
|
2003-11-01 07:26:44 +00:00
|
|
|
|
/* The empty combination '()' is not allowed as an expression in scheme. If
|
|
|
|
|
|
* it is detected in a place where an expression is expected, an 'Illegal
|
|
|
|
|
|
* empty combination' error is signalled. Note: If you encounter this error
|
|
|
|
|
|
* message, it is very likely that you intended to denote the empty list. To
|
|
|
|
|
|
* do so, you need to quote the empty list like (quote ()) or '(). */
|
|
|
|
|
|
static const char s_empty_combination[] = "Illegal empty combination";
|
|
|
|
|
|
|
2003-11-15 12:27:54 +00:00
|
|
|
|
/* A body may hold an arbitrary number of internal defines, followed by a
|
|
|
|
|
|
* non-empty sequence of expressions. If a body with an empty sequence of
|
|
|
|
|
|
* expressions is detected, a 'Missing body expression' error is signalled.
|
|
|
|
|
|
*/
|
|
|
|
|
|
static const char s_missing_body_expression[] = "Missing body expression in";
|
|
|
|
|
|
|
|
|
|
|
|
/* A body may hold an arbitrary number of internal defines, followed by a
|
|
|
|
|
|
* non-empty sequence of expressions. Each the definitions and the
|
|
|
|
|
|
* expressions may be grouped arbitraryly with begin, but it is not allowed to
|
|
|
|
|
|
* mix definitions and expressions. If a define form in a body mixes
|
|
|
|
|
|
* definitions and expressions, a 'Mixed definitions and expressions' error is
|
2003-11-21 23:21:34 +00:00
|
|
|
|
* signalled. */
|
2003-11-15 12:27:54 +00:00
|
|
|
|
static const char s_mixed_body_forms[] = "Mixed definitions and expressions in";
|
2003-11-21 23:21:34 +00:00
|
|
|
|
/* Definitions are only allowed on the top level and at the start of a body.
|
|
|
|
|
|
* If a definition is detected anywhere else, a 'Bad define placement' error
|
|
|
|
|
|
* is signalled. */
|
|
|
|
|
|
static const char s_bad_define[] = "Bad define placement";
|
2003-11-15 12:27:54 +00:00
|
|
|
|
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
/* Case or cond expressions must have at least one clause. If a case or cond
|
|
|
|
|
|
* expression without any clauses is detected, a 'Missing clauses' error is
|
|
|
|
|
|
* signalled. */
|
|
|
|
|
|
static const char s_missing_clauses[] = "Missing clauses";
|
|
|
|
|
|
|
2003-10-11 10:40:19 +00:00
|
|
|
|
/* If there is an 'else' clause in a case or a cond statement, it must be the
|
|
|
|
|
|
* last clause. If after the 'else' case clause further clauses are detected,
|
|
|
|
|
|
* a 'Misplaced else clause' error is signalled. */
|
|
|
|
|
|
static const char s_misplaced_else_clause[] = "Misplaced else clause";
|
|
|
|
|
|
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
/* If a case clause is detected that is not in the format
|
|
|
|
|
|
* (<label(s)> <expression1> <expression2> ...)
|
|
|
|
|
|
* a 'Bad case clause' error is signalled. */
|
|
|
|
|
|
static const char s_bad_case_clause[] = "Bad case clause";
|
|
|
|
|
|
|
|
|
|
|
|
/* If a case clause is detected where the <label(s)> element is neither a
|
|
|
|
|
|
* proper list nor (in case of the last clause) the syntactic keyword 'else',
|
|
|
|
|
|
* a 'Bad case labels' error is signalled. Note: If you encounter this error
|
|
|
|
|
|
* for an else-clause which seems to be syntactically correct, check if 'else'
|
|
|
|
|
|
* is really a syntactic keyword in that context. If 'else' is bound in the
|
|
|
|
|
|
* local or global environment, it is not considered a syntactic keyword, but
|
|
|
|
|
|
* will be treated as any other variable. */
|
|
|
|
|
|
static const char s_bad_case_labels[] = "Bad case labels";
|
|
|
|
|
|
|
|
|
|
|
|
/* In a case statement all labels have to be distinct. If in a case statement
|
|
|
|
|
|
* a label occurs more than once, a 'Duplicate case label' error is
|
|
|
|
|
|
* signalled. */
|
|
|
|
|
|
static const char s_duplicate_case_label[] = "Duplicate case label";
|
|
|
|
|
|
|
2003-10-11 10:40:19 +00:00
|
|
|
|
/* If a cond clause is detected that is not in one of the formats
|
|
|
|
|
|
* (<test> <expression1> ...) or (else <expression1> <expression2> ...)
|
|
|
|
|
|
* a 'Bad cond clause' error is signalled. */
|
|
|
|
|
|
static const char s_bad_cond_clause[] = "Bad cond clause";
|
|
|
|
|
|
|
|
|
|
|
|
/* If a cond clause is detected that uses the alternate '=>' form, but does
|
|
|
|
|
|
* not hold a recipient element for the test result, a 'Missing recipient'
|
|
|
|
|
|
* error is signalled. */
|
|
|
|
|
|
static const char s_missing_recipient[] = "Missing recipient in";
|
|
|
|
|
|
|
2003-10-11 16:03:29 +00:00
|
|
|
|
/* If in a position where a variable name is required some other object is
|
|
|
|
|
|
* detected, a 'Bad variable' error is signalled. */
|
|
|
|
|
|
static const char s_bad_variable[] = "Bad variable";
|
|
|
|
|
|
|
2003-10-12 09:22:52 +00:00
|
|
|
|
/* Bindings for forms like 'let' and 'do' have to be given in a proper,
|
|
|
|
|
|
* possibly empty list. If any other object is detected in a place where a
|
|
|
|
|
|
* list of bindings was required, a 'Bad bindings' error is signalled. */
|
|
|
|
|
|
static const char s_bad_bindings[] = "Bad bindings";
|
|
|
|
|
|
|
|
|
|
|
|
/* Depending on the syntactic context, a binding has to be in the format
|
|
|
|
|
|
* (<variable> <expression>) or (<variable> <expression1> <expression2>).
|
|
|
|
|
|
* If anything else is detected in a place where a binding was expected, a
|
|
|
|
|
|
* 'Bad binding' error is signalled. */
|
|
|
|
|
|
static const char s_bad_binding[] = "Bad binding";
|
|
|
|
|
|
|
2003-10-12 12:58:51 +00:00
|
|
|
|
/* Some syntactic forms don't allow variable names to appear more than once in
|
|
|
|
|
|
* a list of bindings. If such a situation is nevertheless detected, a
|
|
|
|
|
|
* 'Duplicate binding' error is signalled. */
|
|
|
|
|
|
static const char s_duplicate_binding[] = "Duplicate binding";
|
|
|
|
|
|
|
2003-10-12 09:22:52 +00:00
|
|
|
|
/* If the exit form of a 'do' expression is not in the format
|
|
|
|
|
|
* (<test> <expression> ...)
|
|
|
|
|
|
* a 'Bad exit clause' error is signalled. */
|
|
|
|
|
|
static const char s_bad_exit_clause[] = "Bad exit clause";
|
|
|
|
|
|
|
2003-10-12 20:47:32 +00:00
|
|
|
|
/* The formal function arguments of a lambda expression have to be either a
|
|
|
|
|
|
* single symbol or a non-cyclic list. For anything else a 'Bad formals'
|
|
|
|
|
|
* error is signalled. */
|
|
|
|
|
|
static const char s_bad_formals[] = "Bad formals";
|
|
|
|
|
|
|
|
|
|
|
|
/* If in a lambda expression something else than a symbol is detected at a
|
|
|
|
|
|
* place where a formal function argument is required, a 'Bad formal' error is
|
|
|
|
|
|
* signalled. */
|
|
|
|
|
|
static const char s_bad_formal[] = "Bad formal";
|
|
|
|
|
|
|
|
|
|
|
|
/* If in the arguments list of a lambda expression an argument name occurs
|
|
|
|
|
|
* more than once, a 'Duplicate formal' error is signalled. */
|
|
|
|
|
|
static const char s_duplicate_formal[] = "Duplicate formal";
|
|
|
|
|
|
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
/* If the evaluation of an unquote-splicing expression gives something else
|
|
|
|
|
|
* than a proper list, a 'Non-list result for unquote-splicing' error is
|
|
|
|
|
|
* signalled. */
|
|
|
|
|
|
static const char s_splicing[] = "Non-list result for unquote-splicing";
|
|
|
|
|
|
|
2003-10-18 19:03:24 +00:00
|
|
|
|
/* If something else than an exact integer is detected as the argument for
|
|
|
|
|
|
* @slot-ref and @slot-set!, a 'Bad slot number' error is signalled. */
|
|
|
|
|
|
static const char s_bad_slot_number[] = "Bad slot number";
|
|
|
|
|
|
|
2003-10-10 21:49:27 +00:00
|
|
|
|
|
|
|
|
|
|
/* Signal a syntax error. We distinguish between the form that caused the
|
|
|
|
|
|
* error and the enclosing expression. The error message will print out as
|
|
|
|
|
|
* shown in the following pattern. The file name and line number are only
|
|
|
|
|
|
* given when they can be determined from the erroneous form or from the
|
|
|
|
|
|
* enclosing expression.
|
|
|
|
|
|
*
|
|
|
|
|
|
* <filename>: In procedure memoization:
|
|
|
|
|
|
* <filename>: In file <name>, line <nr>: <error-message> in <expression>. */
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYMBOL (syntax_error_key, "syntax-error");
|
|
|
|
|
|
|
|
|
|
|
|
/* The prototype is needed to indicate that the function does not return. */
|
|
|
|
|
|
static void
|
|
|
|
|
|
syntax_error (const char* const, const SCM, const SCM) SCM_NORETURN;
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
syntax_error (const char* const msg, const SCM form, const SCM expr)
|
|
|
|
|
|
{
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
SCM msg_string = scm_from_locale_string (msg);
|
2003-10-10 21:49:27 +00:00
|
|
|
|
SCM filename = SCM_BOOL_F;
|
|
|
|
|
|
SCM linenr = SCM_BOOL_F;
|
|
|
|
|
|
const char *format;
|
|
|
|
|
|
SCM args;
|
|
|
|
|
|
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_pair (form))
|
2003-10-10 21:49:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
filename = scm_source_property (form, scm_sym_filename);
|
|
|
|
|
|
linenr = scm_source_property (form, scm_sym_line);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_false (filename) && scm_is_false (linenr) && scm_is_pair (expr))
|
2003-10-10 21:49:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
filename = scm_source_property (expr, scm_sym_filename);
|
|
|
|
|
|
linenr = scm_source_property (expr, scm_sym_line);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!SCM_UNBNDP (expr))
|
|
|
|
|
|
{
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (filename))
|
2003-10-10 21:49:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
format = "In file ~S, line ~S: ~A ~S in expression ~S.";
|
|
|
|
|
|
args = scm_list_5 (filename, linenr, msg_string, form, expr);
|
|
|
|
|
|
}
|
2004-07-06 10:59:25 +00:00
|
|
|
|
else if (scm_is_true (linenr))
|
2003-10-10 21:49:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
format = "In line ~S: ~A ~S in expression ~S.";
|
|
|
|
|
|
args = scm_list_4 (linenr, msg_string, form, expr);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
format = "~A ~S in expression ~S.";
|
|
|
|
|
|
args = scm_list_3 (msg_string, form, expr);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (filename))
|
2003-10-10 21:49:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
format = "In file ~S, line ~S: ~A ~S.";
|
|
|
|
|
|
args = scm_list_4 (filename, linenr, msg_string, form);
|
|
|
|
|
|
}
|
2004-07-06 10:59:25 +00:00
|
|
|
|
else if (scm_is_true (linenr))
|
2003-10-10 21:49:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
format = "In line ~S: ~A ~S.";
|
|
|
|
|
|
args = scm_list_3 (linenr, msg_string, form);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
format = "~A ~S.";
|
|
|
|
|
|
args = scm_list_2 (msg_string, form);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
scm_error (syntax_error_key, "memoization", format, args, SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Shortcut macros to simplify syntax error handling. */
|
2007-12-08 16:00:56 +00:00
|
|
|
|
#define ASSERT_SYNTAX(cond, message, form) \
|
|
|
|
|
|
{ if (SCM_UNLIKELY (!(cond))) \
|
|
|
|
|
|
syntax_error (message, form, SCM_UNDEFINED); }
|
|
|
|
|
|
#define ASSERT_SYNTAX_2(cond, message, form, expr) \
|
|
|
|
|
|
{ if (SCM_UNLIKELY (!(cond))) \
|
|
|
|
|
|
syntax_error (message, form, expr); }
|
2003-10-10 21:49:27 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
/* {Ilocs}
|
|
|
|
|
|
*
|
|
|
|
|
|
* Ilocs are memoized references to variables in local environment frames.
|
|
|
|
|
|
* They are represented as three values: The relative offset of the
|
|
|
|
|
|
* environment frame, the number of the binding within that frame, and a
|
|
|
|
|
|
* boolean value indicating whether the binding is the last binding in the
|
|
|
|
|
|
* frame.
|
* validate.h, deprecated.h (SCM_VALIDATE_INUM, SCM_VALIDATE_INUM_COPY,
SCM_VALIDATE_BIGINT, SCM_VALIDATE_INUM_MIN,
SCM_VALIDATE_INUM_MIN_COPY,
SCM_VALIDATE_INUM_MIN_DEF_COPY,SCM_VALIDATE_INUM_DEF,
SCM_VALIDATE_INUM_DEF_COPY, SCM_VALIDATE_INUM_RANGE,
SCM_VALIDATE_INUM_RANGE_COPY): Deprecated because they make the
fixnum/bignum distinction visible. Changed all uses to scm_to_size_t
or similar.
2004-07-10 14:35:36 +00:00
|
|
|
|
*
|
|
|
|
|
|
* Frame numbers have 11 bits, relative offsets have 12 bits.
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
*/
|
Hide the implementation of ilocs and isyms in eval.c.
* deprecated.h (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.c (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.h (SCM_ICDR, SCM_IFRINC, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP): Deprecated and added to deprecated.h. Moved from
eval.h to eval.c.
* deprecated.c (scm_isymnames), deprecated.h (scm_isymnames,
SCM_ISYMNUM, SCM_ISYMCHARS), eval.c (SCM_ISYMNUM, isymnames,
scm_unmemocopy, CEVAL), print.c (scm_isymnames), tags.h
(SCM_ISYMNUM, scm_isymnames, SCM_ISYMCHARS): Deprecated
scm_isymnames, SCM_ISYMNUM and SCM_ISYMCHARS and added to
deprecated.[hc]. Moved scm_isymnames from print.c to eval.c and
renamed to isymnames. Moved SCM_ISYMNUM from tags.h to eval.c and
renamed to ISYMNUM.
* eval.c (scm_i_print_iloc, scm_i_print_isym), eval.h
(scm_i_print_iloc, scm_i_print_isym), print.c (scm_iprin1):
Extracted printing of ilocs and isyms to guile internal functions
scm_i_print_iloc, scm_i_print_isym of eval.c.
2004-04-22 19:19:17 +00:00
|
|
|
|
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
#define SCM_ILOC00 SCM_MAKE_ITAG8(0L, scm_tc8_iloc)
|
Hide the implementation of ilocs and isyms in eval.c.
* deprecated.h (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.c (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.h (SCM_ICDR, SCM_IFRINC, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP): Deprecated and added to deprecated.h. Moved from
eval.h to eval.c.
* deprecated.c (scm_isymnames), deprecated.h (scm_isymnames,
SCM_ISYMNUM, SCM_ISYMCHARS), eval.c (SCM_ISYMNUM, isymnames,
scm_unmemocopy, CEVAL), print.c (scm_isymnames), tags.h
(SCM_ISYMNUM, scm_isymnames, SCM_ISYMCHARS): Deprecated
scm_isymnames, SCM_ISYMNUM and SCM_ISYMCHARS and added to
deprecated.[hc]. Moved scm_isymnames from print.c to eval.c and
renamed to isymnames. Moved SCM_ISYMNUM from tags.h to eval.c and
renamed to ISYMNUM.
* eval.c (scm_i_print_iloc, scm_i_print_isym), eval.h
(scm_i_print_iloc, scm_i_print_isym), print.c (scm_iprin1):
Extracted printing of ilocs and isyms to guile internal functions
scm_i_print_iloc, scm_i_print_isym of eval.c.
2004-04-22 19:19:17 +00:00
|
|
|
|
#define SCM_IFRINC (0x00000100L)
|
|
|
|
|
|
#define SCM_ICDR (0x00080000L)
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
#define SCM_IDINC (0x00100000L)
|
Hide the implementation of ilocs and isyms in eval.c.
* deprecated.h (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.c (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.h (SCM_ICDR, SCM_IFRINC, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP): Deprecated and added to deprecated.h. Moved from
eval.h to eval.c.
* deprecated.c (scm_isymnames), deprecated.h (scm_isymnames,
SCM_ISYMNUM, SCM_ISYMCHARS), eval.c (SCM_ISYMNUM, isymnames,
scm_unmemocopy, CEVAL), print.c (scm_isymnames), tags.h
(SCM_ISYMNUM, scm_isymnames, SCM_ISYMCHARS): Deprecated
scm_isymnames, SCM_ISYMNUM and SCM_ISYMCHARS and added to
deprecated.[hc]. Moved scm_isymnames from print.c to eval.c and
renamed to isymnames. Moved SCM_ISYMNUM from tags.h to eval.c and
renamed to ISYMNUM.
* eval.c (scm_i_print_iloc, scm_i_print_isym), eval.h
(scm_i_print_iloc, scm_i_print_isym), print.c (scm_iprin1):
Extracted printing of ilocs and isyms to guile internal functions
scm_i_print_iloc, scm_i_print_isym of eval.c.
2004-04-22 19:19:17 +00:00
|
|
|
|
#define SCM_IFRAME(n) ((long)((SCM_ICDR-SCM_IFRINC)>>8) \
|
|
|
|
|
|
& (SCM_UNPACK (n) >> 8))
|
|
|
|
|
|
#define SCM_IDIST(n) (SCM_UNPACK (n) >> 20)
|
|
|
|
|
|
#define SCM_ICDRP(n) (SCM_ICDR & SCM_UNPACK (n))
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
#define SCM_IDSTMSK (-SCM_IDINC)
|
* validate.h, deprecated.h (SCM_VALIDATE_INUM, SCM_VALIDATE_INUM_COPY,
SCM_VALIDATE_BIGINT, SCM_VALIDATE_INUM_MIN,
SCM_VALIDATE_INUM_MIN_COPY,
SCM_VALIDATE_INUM_MIN_DEF_COPY,SCM_VALIDATE_INUM_DEF,
SCM_VALIDATE_INUM_DEF_COPY, SCM_VALIDATE_INUM_RANGE,
SCM_VALIDATE_INUM_RANGE_COPY): Deprecated because they make the
fixnum/bignum distinction visible. Changed all uses to scm_to_size_t
or similar.
2004-07-10 14:35:36 +00:00
|
|
|
|
#define SCM_IFRAMEMAX ((1<<11)-1)
|
|
|
|
|
|
#define SCM_IDISTMAX ((1<<12)-1)
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
#define SCM_MAKE_ILOC(frame_nr, binding_nr, last_p) \
|
|
|
|
|
|
SCM_PACK ( \
|
|
|
|
|
|
((frame_nr) << 8) \
|
|
|
|
|
|
+ ((binding_nr) << 20) \
|
|
|
|
|
|
+ ((last_p) ? SCM_ICDR : 0) \
|
|
|
|
|
|
+ scm_tc8_iloc )
|
|
|
|
|
|
|
Hide the implementation of ilocs and isyms in eval.c.
* deprecated.h (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.c (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.h (SCM_ICDR, SCM_IFRINC, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP): Deprecated and added to deprecated.h. Moved from
eval.h to eval.c.
* deprecated.c (scm_isymnames), deprecated.h (scm_isymnames,
SCM_ISYMNUM, SCM_ISYMCHARS), eval.c (SCM_ISYMNUM, isymnames,
scm_unmemocopy, CEVAL), print.c (scm_isymnames), tags.h
(SCM_ISYMNUM, scm_isymnames, SCM_ISYMCHARS): Deprecated
scm_isymnames, SCM_ISYMNUM and SCM_ISYMCHARS and added to
deprecated.[hc]. Moved scm_isymnames from print.c to eval.c and
renamed to isymnames. Moved SCM_ISYMNUM from tags.h to eval.c and
renamed to ISYMNUM.
* eval.c (scm_i_print_iloc, scm_i_print_isym), eval.h
(scm_i_print_iloc, scm_i_print_isym), print.c (scm_iprin1):
Extracted printing of ilocs and isyms to guile internal functions
scm_i_print_iloc, scm_i_print_isym of eval.c.
2004-04-22 19:19:17 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_i_print_iloc (SCM iloc, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_puts ("#@", port);
|
|
|
|
|
|
scm_intprint ((long) SCM_IFRAME (iloc), 10, port);
|
|
|
|
|
|
scm_putc (SCM_ICDRP (iloc) ? '-' : '+', port);
|
|
|
|
|
|
scm_intprint ((long) SCM_IDIST (iloc), 10, port);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
#if (SCM_DEBUG_DEBUGGING_SUPPORT == 1)
|
|
|
|
|
|
|
|
|
|
|
|
SCM scm_dbg_make_iloc (SCM frame, SCM binding, SCM cdrp);
|
2004-06-21 20:40:36 +00:00
|
|
|
|
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
SCM_DEFINE (scm_dbg_make_iloc, "dbg-make-iloc", 3, 0, 0,
|
|
|
|
|
|
(SCM frame, SCM binding, SCM cdrp),
|
|
|
|
|
|
"Return a new iloc with frame offset @var{frame}, binding\n"
|
|
|
|
|
|
"offset @var{binding} and the cdr flag @var{cdrp}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_dbg_make_iloc
|
|
|
|
|
|
{
|
2005-07-12 00:28:09 +00:00
|
|
|
|
return SCM_MAKE_ILOC ((scm_t_bits) scm_to_unsigned_integer (frame, 0, SCM_IFRAMEMAX),
|
|
|
|
|
|
(scm_t_bits) scm_to_unsigned_integer (binding, 0, SCM_IDISTMAX),
|
2004-07-06 10:59:25 +00:00
|
|
|
|
scm_is_true (cdrp));
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM scm_dbg_iloc_p (SCM obj);
|
2004-06-21 20:40:36 +00:00
|
|
|
|
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
SCM_DEFINE (scm_dbg_iloc_p, "dbg-iloc?", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
|
|
|
|
|
"Return @code{#t} if @var{obj} is an iloc.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_dbg_iloc_p
|
|
|
|
|
|
{
|
2004-07-06 10:59:25 +00:00
|
|
|
|
return scm_from_bool (SCM_ILOCP (obj));
|
* __scm.h, gc-card.c (SCM_DEBUG_DEBUGGER_SUPPORT,
SCM_DEBUG_DEBUGGING_SUPPORT): Renamed macro
SCM_DEBUG_DEBUGGER_SUPPORT to SCM_DEBUG_DEBUGGING_SUPPORT and
generalized it to apply not only to C level functions but also to
scheme level functions.
* debug.c, debug.h, eval.c (make-iloc, scm_make_iloc, iloc?,
scm_iloc_p, dbg-make-iloc, scm_dbg_make_iloc, dbg-iloc?,
scm_dbg_iloc_p): Moved functions scm_make_iloc, scm_iloc_p to
eval.c, made them available under SCM_DEBUG_DEBUGGING_SUPPORT == 1
only and renamed them to scm_dbg_make_iloc, scm_dbg_iloc_p,
respectively.
* deprecated.h, eval.c, eval.h (SCM_ILOC00, SCM_IDINC,
SCM_IDSTMSK): Deprecated. The macro definitions are moved from
eval.h into eval.c and a copy is placed into deprecated.h.
* eval.c, eval.h (SCM_MAKE_ILOC): Removed from eval.h and placed
into eval.c. This definition was not part of the API in any
officially released version of guile and thus does not need to go
through a phase of deprecation.
2003-06-04 05:28:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Hide the implementation of ilocs and isyms in eval.c.
* deprecated.h (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.c (SCM_IFRINC, SCM_ICDR, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP), eval.h (SCM_ICDR, SCM_IFRINC, SCM_IFRAME, SCM_IDIST,
SCM_ICDRP): Deprecated and added to deprecated.h. Moved from
eval.h to eval.c.
* deprecated.c (scm_isymnames), deprecated.h (scm_isymnames,
SCM_ISYMNUM, SCM_ISYMCHARS), eval.c (SCM_ISYMNUM, isymnames,
scm_unmemocopy, CEVAL), print.c (scm_isymnames), tags.h
(SCM_ISYMNUM, scm_isymnames, SCM_ISYMCHARS): Deprecated
scm_isymnames, SCM_ISYMNUM and SCM_ISYMCHARS and added to
deprecated.[hc]. Moved scm_isymnames from print.c to eval.c and
renamed to isymnames. Moved SCM_ISYMNUM from tags.h to eval.c and
renamed to ISYMNUM.
* eval.c (scm_i_print_iloc, scm_i_print_isym), eval.h
(scm_i_print_iloc, scm_i_print_isym), print.c (scm_iprin1):
Extracted printing of ilocs and isyms to guile internal functions
scm_i_print_iloc, scm_i_print_isym of eval.c.
2004-04-22 19:19:17 +00:00
|
|
|
|
/* {Evaluator byte codes (isyms)}
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#define ISYMNUM(n) (SCM_ITAG8_DATA (n))
|
|
|
|
|
|
|
|
|
|
|
|
/* This table must agree with the list of SCM_IM_ constants in tags.h */
|
|
|
|
|
|
static const char *const isymnames[] =
|
|
|
|
|
|
{
|
|
|
|
|
|
"#@and",
|
|
|
|
|
|
"#@begin",
|
|
|
|
|
|
"#@case",
|
|
|
|
|
|
"#@cond",
|
|
|
|
|
|
"#@do",
|
|
|
|
|
|
"#@if",
|
|
|
|
|
|
"#@lambda",
|
|
|
|
|
|
"#@let",
|
|
|
|
|
|
"#@let*",
|
|
|
|
|
|
"#@letrec",
|
|
|
|
|
|
"#@or",
|
|
|
|
|
|
"#@quote",
|
|
|
|
|
|
"#@set!",
|
|
|
|
|
|
"#@define",
|
|
|
|
|
|
"#@apply",
|
|
|
|
|
|
"#@call-with-current-continuation",
|
|
|
|
|
|
"#@dispatch",
|
|
|
|
|
|
"#@slot-ref",
|
|
|
|
|
|
"#@slot-set!",
|
|
|
|
|
|
"#@delay",
|
|
|
|
|
|
"#@future",
|
|
|
|
|
|
"#@call-with-values",
|
|
|
|
|
|
"#@else",
|
|
|
|
|
|
"#@arrow",
|
|
|
|
|
|
"#@nil-cond",
|
|
|
|
|
|
"#@bind"
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
scm_i_print_isym (SCM isym, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
const size_t isymnum = ISYMNUM (isym);
|
|
|
|
|
|
if (isymnum < (sizeof isymnames / sizeof (char *)))
|
|
|
|
|
|
scm_puts (isymnames[isymnum], port);
|
|
|
|
|
|
else
|
|
|
|
|
|
scm_ipruk ("isym", isym, port);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-05-15 16:45:27 +00:00
|
|
|
|
/* The function lookup_symbol is used during memoization: Lookup the symbol in
|
|
|
|
|
|
* the environment. If there is no binding for the symbol, SCM_UNDEFINED is
|
2004-05-30 07:01:27 +00:00
|
|
|
|
* returned. If the symbol is a global variable, the variable object to which
|
|
|
|
|
|
* the symbol is bound is returned. Finally, if the symbol is a local
|
|
|
|
|
|
* variable the corresponding iloc object is returned. */
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
|
|
|
|
|
|
/* A helper function for lookup_symbol: Try to find the symbol in the top
|
|
|
|
|
|
* level environment frame. The function returns SCM_UNDEFINED if the symbol
|
2004-05-30 07:01:27 +00:00
|
|
|
|
* is unbound and it returns a variable object if the symbol is a global
|
|
|
|
|
|
* variable. */
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
lookup_global_symbol (const SCM symbol, const SCM top_level)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM variable = scm_sym2var (symbol, top_level, SCM_BOOL_F);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (variable))
|
2004-05-30 07:01:27 +00:00
|
|
|
|
return SCM_UNDEFINED;
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
else
|
2004-05-30 07:01:27 +00:00
|
|
|
|
return variable;
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
lookup_symbol (const SCM symbol, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM frame_idx;
|
|
|
|
|
|
unsigned int frame_nr;
|
|
|
|
|
|
|
|
|
|
|
|
for (frame_idx = env, frame_nr = 0;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
!scm_is_null (frame_idx);
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
frame_idx = SCM_CDR (frame_idx), ++frame_nr)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM frame = SCM_CAR (frame_idx);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_pair (frame))
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* frame holds a local environment frame */
|
|
|
|
|
|
SCM symbol_idx;
|
|
|
|
|
|
unsigned int symbol_nr;
|
|
|
|
|
|
|
|
|
|
|
|
for (symbol_idx = SCM_CAR (frame), symbol_nr = 0;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
scm_is_pair (symbol_idx);
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
symbol_idx = SCM_CDR (symbol_idx), ++symbol_nr)
|
|
|
|
|
|
{
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (SCM_CAR (symbol_idx), symbol))
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
/* found the symbol, therefore return the iloc */
|
|
|
|
|
|
return SCM_MAKE_ILOC (frame_nr, symbol_nr, 0);
|
|
|
|
|
|
}
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (symbol_idx, symbol))
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
/* found the symbol as the last element of the current frame */
|
|
|
|
|
|
return SCM_MAKE_ILOC (frame_nr, symbol_nr, 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* no more local environment frames */
|
|
|
|
|
|
return lookup_global_symbol (symbol, frame);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return lookup_global_symbol (symbol, SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Return true if the symbol is - from the point of view of a macro
|
|
|
|
|
|
* transformer - a literal in the sense specified in chapter "pattern
|
|
|
|
|
|
* language" of R5RS. In the code below, however, we don't match the
|
|
|
|
|
|
* definition of R5RS exactly: It returns true if the identifier has no
|
|
|
|
|
|
* binding or if it is a syntactic keyword. */
|
|
|
|
|
|
static int
|
|
|
|
|
|
literal_p (const SCM symbol, const SCM env)
|
|
|
|
|
|
{
|
2004-05-30 07:01:27 +00:00
|
|
|
|
const SCM variable = lookup_symbol (symbol, env);
|
|
|
|
|
|
if (SCM_UNBNDP (variable))
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
if (SCM_VARIABLEP (variable) && SCM_MACROP (SCM_VARIABLE_REF (variable)))
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
return 1;
|
|
|
|
|
|
else
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
2001-06-05 20:48:28 +00:00
|
|
|
|
|
2004-03-29 08:24:57 +00:00
|
|
|
|
|
|
|
|
|
|
/* Return true if the expression is self-quoting in the memoized code. Thus,
|
|
|
|
|
|
* some other objects (like e. g. vectors) are reported as self-quoting, which
|
|
|
|
|
|
* according to R5RS would need to be quoted. */
|
|
|
|
|
|
static int
|
|
|
|
|
|
is_self_quoting_p (const SCM expr)
|
|
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_pair (expr))
|
2004-03-29 08:24:57 +00:00
|
|
|
|
return 0;
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
else if (scm_is_symbol (expr))
|
2004-03-29 08:24:57 +00:00
|
|
|
|
return 0;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
else if (scm_is_null (expr))
|
2004-03-29 08:24:57 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
else return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
SCM_SYMBOL (sym_three_question_marks, "???");
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_expression (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_ILOCP (expr))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM frame_idx;
|
|
|
|
|
|
unsigned long int frame_nr;
|
|
|
|
|
|
SCM symbol_idx;
|
|
|
|
|
|
unsigned long int symbol_nr;
|
|
|
|
|
|
|
|
|
|
|
|
for (frame_idx = env, frame_nr = SCM_IFRAME (expr);
|
|
|
|
|
|
frame_nr != 0;
|
|
|
|
|
|
frame_idx = SCM_CDR (frame_idx), --frame_nr)
|
|
|
|
|
|
;
|
|
|
|
|
|
for (symbol_idx = SCM_CAAR (frame_idx), symbol_nr = SCM_IDIST (expr);
|
|
|
|
|
|
symbol_nr != 0;
|
|
|
|
|
|
symbol_idx = SCM_CDR (symbol_idx), --symbol_nr)
|
|
|
|
|
|
;
|
|
|
|
|
|
return SCM_ICDRP (expr) ? symbol_idx : SCM_CAR (symbol_idx);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_VARIABLEP (expr))
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM sym = scm_module_reverse_lookup (scm_env_module (env), expr);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
return scm_is_true (sym) ? sym : sym_three_question_marks;
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
}
|
2005-01-02 20:49:04 +00:00
|
|
|
|
else if (scm_is_simple_vector (expr))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
return scm_list_2 (scm_sym_quote, expr);
|
|
|
|
|
|
}
|
2004-09-22 17:38:44 +00:00
|
|
|
|
else if (!scm_is_pair (expr))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_ISYMP (SCM_CAR (expr)))
|
|
|
|
|
|
{
|
|
|
|
|
|
return unmemoize_builtin_macro (expr, env);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
return unmemoize_exprs (expr, env);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_exprs (const SCM exprs, const SCM env)
|
|
|
|
|
|
{
|
2004-06-21 20:40:36 +00:00
|
|
|
|
SCM r_result = SCM_EOL;
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
SCM expr_idx = exprs;
|
2004-06-21 20:40:36 +00:00
|
|
|
|
SCM um_expr;
|
|
|
|
|
|
|
|
|
|
|
|
/* Note that due to the current lazy memoizer we may find partially memoized
|
2004-08-21 07:28:16 +00:00
|
|
|
|
* code during execution. In such code we have to expect improper lists of
|
2004-06-21 20:40:36 +00:00
|
|
|
|
* expressions: On the one hand, for such code syntax checks have not yet
|
|
|
|
|
|
* fully been performed, on the other hand, there may be even legal code
|
|
|
|
|
|
* like '(a . b) appear as an improper list of expressions as long as the
|
|
|
|
|
|
* quote expression is still in its unmemoized form. For this reason, the
|
|
|
|
|
|
* following code handles improper lists of expressions until memoization
|
|
|
|
|
|
* and execution have been completely separated. */
|
2004-09-22 17:38:44 +00:00
|
|
|
|
for (; scm_is_pair (expr_idx); expr_idx = SCM_CDR (expr_idx))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM expr = SCM_CAR (expr_idx);
|
2004-08-21 07:28:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* In partially memoized code, lists of expressions that stem from a
|
|
|
|
|
|
* body form may start with an ISYM if the body itself has not yet been
|
|
|
|
|
|
* memoized. This isym is just an internal marker to indicate that the
|
|
|
|
|
|
* body still needs to be memoized. An isym may occur at the very
|
|
|
|
|
|
* beginning of the body or after one or more comment strings. It is
|
|
|
|
|
|
* dropped during unmemoization. */
|
|
|
|
|
|
if (!SCM_ISYMP (expr))
|
|
|
|
|
|
{
|
|
|
|
|
|
um_expr = unmemoize_expression (expr, env);
|
|
|
|
|
|
r_result = scm_cons (um_expr, r_result);
|
|
|
|
|
|
}
|
2004-06-21 20:40:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
um_expr = unmemoize_expression (expr_idx, env);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_null (r_result))
|
2004-06-21 20:40:36 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM result = scm_reverse_x (r_result, SCM_UNDEFINED);
|
|
|
|
|
|
SCM_SETCDR (r_result, um_expr);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
return um_expr;
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-11-01 10:21:15 +00:00
|
|
|
|
/* Rewrite the body (which is given as the list of expressions forming the
|
|
|
|
|
|
* body) into its internal form. The internal form of a body (<expr> ...) is
|
|
|
|
|
|
* just the body itself, but prefixed with an ISYM that denotes to what kind
|
|
|
|
|
|
* of outer construct this body belongs: (<ISYM> <expr> ...). A lambda body
|
|
|
|
|
|
* starts with SCM_IM_LAMBDA, for example, a body of a let starts with
|
2003-11-21 23:21:34 +00:00
|
|
|
|
* SCM_IM_LET, etc.
|
2003-11-01 10:21:15 +00:00
|
|
|
|
*
|
|
|
|
|
|
* It is assumed that the calling expression has already made sure that the
|
|
|
|
|
|
* body is a proper list. */
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
static SCM
|
2003-11-09 08:47:19 +00:00
|
|
|
|
m_body (SCM op, SCM exprs)
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* Don't add another ISYM if one is present already. */
|
2003-11-01 10:21:15 +00:00
|
|
|
|
if (SCM_ISYMP (SCM_CAR (exprs)))
|
|
|
|
|
|
return exprs;
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_cons (op, exprs);
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2004-05-30 07:01:27 +00:00
|
|
|
|
/* The function m_expand_body memoizes a proper list of expressions forming a
|
|
|
|
|
|
* body. This function takes care of dealing with internal defines and
|
|
|
|
|
|
* transforming them into an equivalent letrec expression. The list of
|
|
|
|
|
|
* expressions is rewritten in place. */
|
2003-11-15 12:43:00 +00:00
|
|
|
|
|
2004-05-30 07:01:27 +00:00
|
|
|
|
/* This is a helper function for m_expand_body. If the argument expression is
|
|
|
|
|
|
* a symbol that denotes a syntactic keyword, the corresponding macro object
|
|
|
|
|
|
* is returned, in all other cases the function returns SCM_UNDEFINED. */
|
2003-11-15 12:43:00 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
try_macro_lookup (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
if (scm_is_symbol (expr))
|
2003-11-15 12:43:00 +00:00
|
|
|
|
{
|
2004-05-30 07:01:27 +00:00
|
|
|
|
const SCM variable = lookup_symbol (expr, env);
|
|
|
|
|
|
if (SCM_VARIABLEP (variable))
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM value = SCM_VARIABLE_REF (variable);
|
|
|
|
|
|
if (SCM_MACROP (value))
|
|
|
|
|
|
return value;
|
|
|
|
|
|
}
|
2003-11-15 12:43:00 +00:00
|
|
|
|
}
|
2004-05-30 07:01:27 +00:00
|
|
|
|
|
|
|
|
|
|
return SCM_UNDEFINED;
|
2003-11-15 12:43:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* This is a helper function for m_expand_body. It expands user macros,
|
|
|
|
|
|
* because for the correct translation of a body we need to know whether they
|
|
|
|
|
|
* expand to a definition. */
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
expand_user_macros (SCM expr, const SCM env)
|
|
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (scm_is_pair (expr))
|
2003-11-15 12:43:00 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM car_expr = SCM_CAR (expr);
|
|
|
|
|
|
const SCM new_car = expand_user_macros (car_expr, env);
|
|
|
|
|
|
const SCM value = try_macro_lookup (new_car, env);
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_MACROP (value) && SCM_MACRO_TYPE (value) == 2)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* User macros transform code into code. */
|
|
|
|
|
|
expr = scm_call_2 (SCM_MACRO_CODE (value), expr, env);
|
|
|
|
|
|
/* We need to reiterate on the transformed code. */
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* No user macro: return. */
|
|
|
|
|
|
SCM_SETCAR (expr, new_car);
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* This is a helper function for m_expand_body. It determines if a given form
|
|
|
|
|
|
* represents an application of a given built-in macro. The built-in macro to
|
|
|
|
|
|
* check for is identified by its syntactic keyword. The form is an
|
|
|
|
|
|
* application of the given macro if looking up the car of the form in the
|
|
|
|
|
|
* given environment actually returns the built-in macro. */
|
|
|
|
|
|
static int
|
|
|
|
|
|
is_system_macro_p (const SCM syntactic_keyword, const SCM form, const SCM env)
|
|
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_pair (form))
|
2003-11-15 12:43:00 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM car_form = SCM_CAR (form);
|
|
|
|
|
|
const SCM value = try_macro_lookup (car_form, env);
|
|
|
|
|
|
if (SCM_BUILTIN_MACRO_P (value))
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM macro_name = scm_macro_name (value);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
return scm_is_eq (macro_name, syntactic_keyword);
|
2003-11-15 12:43:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-01-22 22:42:29 +00:00
|
|
|
|
static void
|
2003-11-15 12:43:00 +00:00
|
|
|
|
m_expand_body (const SCM forms, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* The first body form can be skipped since it is known to be the ISYM that
|
|
|
|
|
|
* was prepended to the body by m_body. */
|
|
|
|
|
|
SCM cdr_forms = SCM_CDR (forms);
|
|
|
|
|
|
SCM form_idx = cdr_forms;
|
|
|
|
|
|
SCM definitions = SCM_EOL;
|
|
|
|
|
|
SCM sequence = SCM_EOL;
|
|
|
|
|
|
|
|
|
|
|
|
/* According to R5RS, the list of body forms consists of two parts: a number
|
|
|
|
|
|
* (maybe zero) of definitions, followed by a non-empty sequence of
|
|
|
|
|
|
* expressions. Each the definitions and the expressions may be grouped
|
|
|
|
|
|
* arbitrarily with begin, but it is not allowed to mix definitions and
|
|
|
|
|
|
* expressions. The task of the following loop therefore is to split the
|
|
|
|
|
|
* list of body forms into the list of definitions and the sequence of
|
|
|
|
|
|
* expressions. */
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (!scm_is_null (form_idx))
|
2003-11-15 12:43:00 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM form = SCM_CAR (form_idx);
|
|
|
|
|
|
const SCM new_form = expand_user_macros (form, env);
|
|
|
|
|
|
if (is_system_macro_p (scm_sym_define, new_form, env))
|
|
|
|
|
|
{
|
|
|
|
|
|
definitions = scm_cons (new_form, definitions);
|
|
|
|
|
|
form_idx = SCM_CDR (form_idx);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (is_system_macro_p (scm_sym_begin, new_form, env))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We have encountered a group of forms. This has to be either a
|
|
|
|
|
|
* (possibly empty) group of (possibly further grouped) definitions,
|
|
|
|
|
|
* or a non-empty group of (possibly further grouped)
|
|
|
|
|
|
* expressions. */
|
|
|
|
|
|
const SCM grouped_forms = SCM_CDR (new_form);
|
|
|
|
|
|
unsigned int found_definition = 0;
|
|
|
|
|
|
unsigned int found_expression = 0;
|
|
|
|
|
|
SCM grouped_form_idx = grouped_forms;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (!found_expression && !scm_is_null (grouped_form_idx))
|
2003-11-15 12:43:00 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM inner_form = SCM_CAR (grouped_form_idx);
|
|
|
|
|
|
const SCM new_inner_form = expand_user_macros (inner_form, env);
|
|
|
|
|
|
if (is_system_macro_p (scm_sym_define, new_inner_form, env))
|
|
|
|
|
|
{
|
|
|
|
|
|
found_definition = 1;
|
|
|
|
|
|
definitions = scm_cons (new_inner_form, definitions);
|
|
|
|
|
|
grouped_form_idx = SCM_CDR (grouped_form_idx);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (is_system_macro_p (scm_sym_begin, new_inner_form, env))
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM inner_group = SCM_CDR (new_inner_form);
|
|
|
|
|
|
grouped_form_idx
|
|
|
|
|
|
= scm_append (scm_list_2 (inner_group,
|
|
|
|
|
|
SCM_CDR (grouped_form_idx)));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* The group marks the start of the expressions of the body.
|
|
|
|
|
|
* We have to make sure that within the same group we have
|
|
|
|
|
|
* not encountered a definition before. */
|
|
|
|
|
|
ASSERT_SYNTAX (!found_definition, s_mixed_body_forms, form);
|
|
|
|
|
|
found_expression = 1;
|
|
|
|
|
|
grouped_form_idx = SCM_EOL;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* We have finished processing the group. If we have not yet
|
|
|
|
|
|
* encountered an expression we continue processing the forms of the
|
|
|
|
|
|
* body to collect further definition forms. Otherwise, the group
|
|
|
|
|
|
* marks the start of the sequence of expressions of the body. */
|
|
|
|
|
|
if (!found_expression)
|
|
|
|
|
|
{
|
|
|
|
|
|
form_idx = SCM_CDR (form_idx);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
sequence = form_idx;
|
|
|
|
|
|
form_idx = SCM_EOL;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We have detected a form which is no definition. This marks the
|
|
|
|
|
|
* start of the sequence of expressions of the body. */
|
|
|
|
|
|
sequence = form_idx;
|
|
|
|
|
|
form_idx = SCM_EOL;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* FIXME: forms does not hold information about the file location. */
|
2004-09-22 17:38:44 +00:00
|
|
|
|
ASSERT_SYNTAX (scm_is_pair (sequence), s_missing_body_expression, cdr_forms);
|
2003-11-15 12:43:00 +00:00
|
|
|
|
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_null (definitions))
|
2003-11-15 12:43:00 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM definition_idx;
|
|
|
|
|
|
SCM letrec_tail;
|
|
|
|
|
|
SCM letrec_expression;
|
|
|
|
|
|
SCM new_letrec_expression;
|
|
|
|
|
|
|
|
|
|
|
|
SCM bindings = SCM_EOL;
|
|
|
|
|
|
for (definition_idx = definitions;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
!scm_is_null (definition_idx);
|
2003-11-15 12:43:00 +00:00
|
|
|
|
definition_idx = SCM_CDR (definition_idx))
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM definition = SCM_CAR (definition_idx);
|
|
|
|
|
|
const SCM canonical_definition = canonicalize_define (definition);
|
|
|
|
|
|
const SCM binding = SCM_CDR (canonical_definition);
|
|
|
|
|
|
bindings = scm_cons (binding, bindings);
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
letrec_tail = scm_cons (bindings, sequence);
|
|
|
|
|
|
/* FIXME: forms does not hold information about the file location. */
|
|
|
|
|
|
letrec_expression = scm_cons_source (forms, scm_sym_letrec, letrec_tail);
|
|
|
|
|
|
new_letrec_expression = scm_m_letrec (letrec_expression, env);
|
2004-01-22 22:42:29 +00:00
|
|
|
|
SCM_SETCAR (forms, new_letrec_expression);
|
|
|
|
|
|
SCM_SETCDR (forms, SCM_EOL);
|
2003-11-15 12:43:00 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCAR (forms, SCM_CAR (sequence));
|
|
|
|
|
|
SCM_SETCDR (forms, SCM_CDR (sequence));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-06-02 09:37:48 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
macroexp (SCM x, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM res, proc, orig_sym;
|
|
|
|
|
|
|
|
|
|
|
|
/* Don't bother to produce error messages here. We get them when we
|
|
|
|
|
|
eventually execute the code for real. */
|
|
|
|
|
|
|
|
|
|
|
|
macro_tail:
|
|
|
|
|
|
orig_sym = SCM_CAR (x);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
if (!scm_is_symbol (orig_sym))
|
2004-06-02 09:37:48 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM *proc_ptr = scm_lookupcar1 (x, env, 0);
|
|
|
|
|
|
if (proc_ptr == NULL)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We have lost the race. */
|
|
|
|
|
|
goto macro_tail;
|
|
|
|
|
|
}
|
|
|
|
|
|
proc = *proc_ptr;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Only handle memoizing macros. `Acros' and `macros' are really
|
|
|
|
|
|
special forms and should not be evaluated here. */
|
|
|
|
|
|
|
|
|
|
|
|
if (!SCM_MACROP (proc)
|
|
|
|
|
|
|| (SCM_MACRO_TYPE (proc) != 2 && !SCM_BUILTIN_MACRO_P (proc)))
|
|
|
|
|
|
return x;
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (x, orig_sym); /* Undo memoizing effect of lookupcar */
|
|
|
|
|
|
res = scm_call_2 (SCM_MACRO_CODE (proc), x, env);
|
2007-07-24 23:17:54 +00:00
|
|
|
|
|
2004-06-02 09:37:48 +00:00
|
|
|
|
if (scm_ilength (res) <= 0)
|
2007-07-24 23:17:54 +00:00
|
|
|
|
/* Result of expansion is not a list. */
|
|
|
|
|
|
return (scm_list_2 (SCM_IM_BEGIN, res));
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* njrev: Several queries here: (1) I don't see how it can be
|
|
|
|
|
|
correct that the SCM_SETCAR 2 lines below this comment needs
|
|
|
|
|
|
protection, but the SCM_SETCAR 6 lines above does not, so
|
|
|
|
|
|
something here is probably wrong. (2) macroexp() is now only
|
|
|
|
|
|
used in one place - scm_m_generalized_set_x - whereas all other
|
|
|
|
|
|
macro expansion happens through expand_user_macros. Therefore
|
|
|
|
|
|
(2.1) perhaps macroexp() could be eliminated completely now?
|
|
|
|
|
|
(2.2) Does expand_user_macros need any critical section
|
|
|
|
|
|
protection? */
|
|
|
|
|
|
|
|
|
|
|
|
SCM_CRITICAL_SECTION_START;
|
|
|
|
|
|
SCM_SETCAR (x, SCM_CAR (res));
|
|
|
|
|
|
SCM_SETCDR (x, SCM_CDR (res));
|
|
|
|
|
|
SCM_CRITICAL_SECTION_END;
|
|
|
|
|
|
|
|
|
|
|
|
goto macro_tail;
|
|
|
|
|
|
}
|
2004-06-02 09:37:48 +00:00
|
|
|
|
}
|
2003-11-15 12:43:00 +00:00
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
/* Start of the memoizers for the standard R5RS builtin macros. */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_and, "and", scm_i_makbimacro, scm_m_and);
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_and, s_and);
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
SCM
|
2003-10-10 21:49:27 +00:00
|
|
|
|
scm_m_and (SCM expr, SCM env SCM_UNUSED)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-10-10 21:49:27 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const long length = scm_ilength (cdr_expr);
|
|
|
|
|
|
|
|
|
|
|
|
ASSERT_SYNTAX (length >= 0, s_bad_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
if (length == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Special case: (and) is replaced by #t. */
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else
|
2003-10-10 21:49:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_AND);
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_and (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_cons (scm_sym_and, unmemoize_exprs (SCM_CDR (expr), env));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_begin, "begin", scm_i_makbimacro, scm_m_begin);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_begin, s_begin);
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
|
|
|
|
|
|
SCM
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
scm_m_begin (SCM expr, SCM env SCM_UNUSED)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
2003-10-18 14:49:55 +00:00
|
|
|
|
/* Dirk:FIXME:: An empty begin clause is not generally allowed by R5RS.
|
|
|
|
|
|
* That means, there should be a distinction between uses of begin where an
|
|
|
|
|
|
* empty clause is OK and where it is not. */
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_BEGIN);
|
|
|
|
|
|
return expr;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_begin (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_cons (scm_sym_begin, unmemoize_exprs (SCM_CDR (expr), env));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_case, "case", scm_i_makbimacro, scm_m_case);
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_case, s_case);
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_else, "else");
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
SCM
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
scm_m_case (SCM expr, SCM env)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
SCM clauses;
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
SCM all_labels = SCM_EOL;
|
|
|
|
|
|
|
|
|
|
|
|
/* Check, whether 'else is a literal, i. e. not bound to a value. */
|
|
|
|
|
|
const int else_literal_p = literal_p (scm_sym_else, env);
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 2, s_missing_clauses, expr);
|
|
|
|
|
|
|
|
|
|
|
|
clauses = SCM_CDR (cdr_expr);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (!scm_is_null (clauses))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
SCM labels;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM clause = SCM_CAR (clauses);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (scm_ilength (clause) >= 2,
|
|
|
|
|
|
s_bad_case_clause, clause, expr);
|
|
|
|
|
|
|
|
|
|
|
|
labels = SCM_CAR (clause);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_pair (labels))
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
{
|
|
|
|
|
|
ASSERT_SYNTAX_2 (scm_ilength (labels) >= 0,
|
|
|
|
|
|
s_bad_case_labels, labels, expr);
|
2004-05-22 06:51:36 +00:00
|
|
|
|
all_labels = scm_append (scm_list_2 (labels, all_labels));
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
}
|
2004-09-22 17:38:44 +00:00
|
|
|
|
else if (scm_is_null (labels))
|
2003-10-11 01:52:25 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* The list of labels is empty. According to R5RS this is allowed.
|
|
|
|
|
|
* It means that the sequence of expressions will never be executed.
|
|
|
|
|
|
* Therefore, as an optimization, we could remove the whole
|
|
|
|
|
|
* clause. */
|
|
|
|
|
|
}
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-07-27 15:41:49 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_eq (labels, scm_sym_else) && else_literal_p,
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
s_bad_case_labels, labels, expr);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_null (SCM_CDR (clauses)),
|
2003-10-11 10:40:19 +00:00
|
|
|
|
s_misplaced_else_clause, clause, expr);
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* build the new clause */
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (labels, scm_sym_else))
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
SCM_SETCAR (clause, SCM_IM_ELSE);
|
|
|
|
|
|
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
clauses = SCM_CDR (clauses);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
|
|
|
|
|
|
/* Check whether all case labels are distinct. */
|
2004-09-22 17:38:44 +00:00
|
|
|
|
for (; !scm_is_null (all_labels); all_labels = SCM_CDR (all_labels))
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM label = SCM_CAR (all_labels);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_false (scm_c_memq (label, SCM_CDR (all_labels))),
|
2003-10-12 12:58:51 +00:00
|
|
|
|
s_duplicate_case_label, label, expr);
|
* libguile/tags.h (SCM_IM_ELSE, SCM_IM_ARROW): New memoizer codes.
* libguile/print.c (scm_isymnames): Add names for the new memoizer
codes.
* libguile/eval.c (s_missing_clauses, s_bad_case_clause,
s_extra_case_clause, s_bad_case_labels, s_duplicate_case_label,
literal_p): New static identifiers.
(scm_m_case): Use ASSERT_SYNTAX to signal syntax errors. Be more
specific about the kind of error that was detected. Check for
duplicate case labels. Handle bound 'else. Avoid unnecessary
consing when creating the memoized code.
(scm_m_case, unmemocopy, SCM_CEVAL): Use SCM_IM_ELSE to memoize
the syntactic keyword 'else.
* test-suite/tests/syntax.test (exception:bad-expression,
exception:missing-clauses, exception:bad-case-clause,
exception:extra-case-clause, exception:bad-case-labels): New.
Added some tests and adapted tests for 'case' to the new way of
error reporting.
2003-10-11 00:57:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_CASE);
|
|
|
|
|
|
return expr;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_case (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM um_key_expr = unmemoize_expression (SCM_CADR (expr), env);
|
|
|
|
|
|
SCM um_clauses = SCM_EOL;
|
|
|
|
|
|
SCM clause_idx;
|
|
|
|
|
|
|
|
|
|
|
|
for (clause_idx = SCM_CDDR (expr);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
!scm_is_null (clause_idx);
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
clause_idx = SCM_CDR (clause_idx))
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM clause = SCM_CAR (clause_idx);
|
|
|
|
|
|
const SCM labels = SCM_CAR (clause);
|
|
|
|
|
|
const SCM exprs = SCM_CDR (clause);
|
|
|
|
|
|
|
|
|
|
|
|
const SCM um_exprs = unmemoize_exprs (exprs, env);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
const SCM um_labels = (scm_is_eq (labels, SCM_IM_ELSE))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
? scm_sym_else
|
|
|
|
|
|
: scm_i_finite_list_copy (labels);
|
|
|
|
|
|
const SCM um_clause = scm_cons (um_labels, um_exprs);
|
|
|
|
|
|
|
|
|
|
|
|
um_clauses = scm_cons (um_clause, um_clauses);
|
|
|
|
|
|
}
|
|
|
|
|
|
um_clauses = scm_reverse_x (um_clauses, SCM_UNDEFINED);
|
|
|
|
|
|
|
|
|
|
|
|
return scm_cons2 (scm_sym_case, um_key_expr, um_clauses);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_cond, "cond", scm_i_makbimacro, scm_m_cond);
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_cond, s_cond);
|
2003-10-11 10:40:19 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_arrow, "=>");
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
SCM
|
2003-10-11 10:40:19 +00:00
|
|
|
|
scm_m_cond (SCM expr, SCM env)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-10-11 10:40:19 +00:00
|
|
|
|
/* Check, whether 'else or '=> is a literal, i. e. not bound to a value. */
|
|
|
|
|
|
const int else_literal_p = literal_p (scm_sym_else, env);
|
|
|
|
|
|
const int arrow_literal_p = literal_p (scm_sym_arrow, env);
|
|
|
|
|
|
|
|
|
|
|
|
const SCM clauses = SCM_CDR (expr);
|
|
|
|
|
|
SCM clause_idx;
|
|
|
|
|
|
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (clauses) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (clauses) >= 1, s_missing_clauses, expr);
|
|
|
|
|
|
|
|
|
|
|
|
for (clause_idx = clauses;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
!scm_is_null (clause_idx);
|
2003-10-11 10:40:19 +00:00
|
|
|
|
clause_idx = SCM_CDR (clause_idx))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-10-11 10:40:19 +00:00
|
|
|
|
SCM test;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM clause = SCM_CAR (clause_idx);
|
|
|
|
|
|
const long length = scm_ilength (clause);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (length >= 1, s_bad_cond_clause, clause, expr);
|
|
|
|
|
|
|
|
|
|
|
|
test = SCM_CAR (clause);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (test, scm_sym_else) && else_literal_p)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
const int last_clause_p = scm_is_null (SCM_CDR (clause_idx));
|
2003-10-11 10:40:19 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (length >= 2,
|
|
|
|
|
|
s_bad_cond_clause, clause, expr);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (last_clause_p,
|
|
|
|
|
|
s_misplaced_else_clause, clause, expr);
|
|
|
|
|
|
SCM_SETCAR (clause, SCM_IM_ELSE);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2003-10-11 10:40:19 +00:00
|
|
|
|
else if (length >= 2
|
2004-07-27 15:41:49 +00:00
|
|
|
|
&& scm_is_eq (SCM_CADR (clause), scm_sym_arrow)
|
2003-10-11 10:40:19 +00:00
|
|
|
|
&& arrow_literal_p)
|
|
|
|
|
|
{
|
|
|
|
|
|
ASSERT_SYNTAX_2 (length > 2, s_missing_recipient, clause, expr);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (length == 3, s_extra_expression, clause, expr);
|
|
|
|
|
|
SCM_SETCAR (SCM_CDR (clause), SCM_IM_ARROW);
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
}
|
2005-12-06 21:31:26 +00:00
|
|
|
|
/* SRFI 61 extended cond */
|
|
|
|
|
|
else if (length >= 3
|
|
|
|
|
|
&& scm_is_eq (SCM_CADDR (clause), scm_sym_arrow)
|
|
|
|
|
|
&& arrow_literal_p)
|
|
|
|
|
|
{
|
|
|
|
|
|
ASSERT_SYNTAX_2 (length > 3, s_missing_recipient, clause, expr);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (length == 4, s_extra_expression, clause, expr);
|
|
|
|
|
|
SCM_SETCAR (SCM_CDDR (clause), SCM_IM_ARROW);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2003-10-11 10:40:19 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_COND);
|
|
|
|
|
|
return expr;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_cond (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM um_clauses = SCM_EOL;
|
|
|
|
|
|
SCM clause_idx;
|
|
|
|
|
|
|
|
|
|
|
|
for (clause_idx = SCM_CDR (expr);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
!scm_is_null (clause_idx);
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
clause_idx = SCM_CDR (clause_idx))
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM clause = SCM_CAR (clause_idx);
|
|
|
|
|
|
const SCM sequence = SCM_CDR (clause);
|
|
|
|
|
|
const SCM test = SCM_CAR (clause);
|
|
|
|
|
|
SCM um_test;
|
|
|
|
|
|
SCM um_sequence;
|
|
|
|
|
|
SCM um_clause;
|
|
|
|
|
|
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (test, SCM_IM_ELSE))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
um_test = scm_sym_else;
|
|
|
|
|
|
else
|
|
|
|
|
|
um_test = unmemoize_expression (test, env);
|
|
|
|
|
|
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_null (sequence) && scm_is_eq (SCM_CAR (sequence),
|
2004-07-27 15:41:49 +00:00
|
|
|
|
SCM_IM_ARROW))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM target = SCM_CADR (sequence);
|
|
|
|
|
|
const SCM um_target = unmemoize_expression (target, env);
|
|
|
|
|
|
um_sequence = scm_list_2 (scm_sym_arrow, um_target);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
um_sequence = unmemoize_exprs (sequence, env);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
um_clause = scm_cons (um_test, um_sequence);
|
|
|
|
|
|
um_clauses = scm_cons (um_clause, um_clauses);
|
|
|
|
|
|
}
|
|
|
|
|
|
um_clauses = scm_reverse_x (um_clauses, SCM_UNDEFINED);
|
|
|
|
|
|
|
|
|
|
|
|
return scm_cons (scm_sym_cond, um_clauses);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2003-11-02 11:39:35 +00:00
|
|
|
|
SCM_SYNTAX (s_define, "define", scm_i_makbimacro, scm_m_define);
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_define, s_define);
|
2001-03-03 15:10:37 +00:00
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
/* Guile provides an extension to R5RS' define syntax to represent function
|
|
|
|
|
|
* currying in a compact way. With this extension, it is allowed to write
|
|
|
|
|
|
* (define <nested-variable> <body>), where <nested-variable> has of one of
|
|
|
|
|
|
* the forms (<nested-variable> <formals>), (<nested-variable> . <formal>),
|
|
|
|
|
|
* (<variable> <formals>) or (<variable> . <formal>). As in R5RS, <formals>
|
|
|
|
|
|
* should be either a sequence of zero or more variables, or a sequence of one
|
|
|
|
|
|
* or more variables followed by a space-delimited period and another
|
|
|
|
|
|
* variable. Each level of argument nesting wraps the <body> within another
|
|
|
|
|
|
* lambda expression. For example, the following forms are allowed, each one
|
|
|
|
|
|
* followed by an equivalent, more explicit implementation.
|
|
|
|
|
|
* Example 1:
|
|
|
|
|
|
* (define ((a b . c) . d) <body>) is equivalent to
|
|
|
|
|
|
* (define a (lambda (b . c) (lambda d <body>)))
|
|
|
|
|
|
* Example 2:
|
|
|
|
|
|
* (define (((a) b) c . d) <body>) is equivalent to
|
|
|
|
|
|
* (define a (lambda () (lambda (b) (lambda (c . d) <body>))))
|
|
|
|
|
|
*/
|
|
|
|
|
|
/* Dirk:FIXME:: We should provide an implementation for 'define' in the R5RS
|
|
|
|
|
|
* module that does not implement this extension. */
|
2003-11-02 11:39:35 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
canonicalize_define (const SCM expr)
|
2001-03-03 15:10:37 +00:00
|
|
|
|
{
|
2003-10-11 16:03:29 +00:00
|
|
|
|
SCM body;
|
|
|
|
|
|
SCM variable;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
2003-11-15 12:27:54 +00:00
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
2003-10-11 16:03:29 +00:00
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 2, s_missing_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
body = SCM_CDR (cdr_expr);
|
|
|
|
|
|
variable = SCM_CAR (cdr_expr);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (scm_is_pair (variable))
|
2001-03-03 15:10:37 +00:00
|
|
|
|
{
|
2003-10-11 16:03:29 +00:00
|
|
|
|
/* This while loop realizes function currying by variable nesting.
|
|
|
|
|
|
* Variable is known to be a nested-variable. In every iteration of the
|
|
|
|
|
|
* loop another level of lambda expression is created, starting with the
|
2003-10-12 12:58:51 +00:00
|
|
|
|
* innermost one. Note that we don't check for duplicate formals here:
|
|
|
|
|
|
* This will be done by the memoizer of the lambda expression. */
|
2003-10-11 16:03:29 +00:00
|
|
|
|
const SCM formals = SCM_CDR (variable);
|
|
|
|
|
|
const SCM tail = scm_cons (formals, body);
|
|
|
|
|
|
|
|
|
|
|
|
/* Add source properties to each new lambda expression: */
|
|
|
|
|
|
const SCM lambda = scm_cons_source (variable, scm_sym_lambda, tail);
|
|
|
|
|
|
|
|
|
|
|
|
body = scm_list_1 (lambda);
|
|
|
|
|
|
variable = SCM_CAR (variable);
|
2001-03-03 15:10:37 +00:00
|
|
|
|
}
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_symbol (variable), s_bad_variable, variable, expr);
|
2003-10-11 16:03:29 +00:00
|
|
|
|
ASSERT_SYNTAX (scm_ilength (body) == 1, s_expression, expr);
|
|
|
|
|
|
|
2003-11-02 11:39:35 +00:00
|
|
|
|
SCM_SETCAR (cdr_expr, variable);
|
|
|
|
|
|
SCM_SETCDR (cdr_expr, body);
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2007-05-26 14:30:50 +00:00
|
|
|
|
/* According to Section 5.2.1 of R5RS we first have to make sure that the
|
|
|
|
|
|
variable is bound, and then perform the `(set! variable expression)'
|
|
|
|
|
|
operation. However, EXPRESSION _can_ be evaluated before VARIABLE is
|
|
|
|
|
|
bound. This means that EXPRESSION won't necessarily be able to assign
|
|
|
|
|
|
values to VARIABLE as in `(define foo (begin (set! foo 1) (+ foo 1)))'. */
|
2003-11-02 11:39:35 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_define (SCM expr, SCM env)
|
|
|
|
|
|
{
|
2003-11-21 23:21:34 +00:00
|
|
|
|
ASSERT_SYNTAX (SCM_TOP_LEVEL (env), s_bad_define, expr);
|
2003-11-02 11:39:35 +00:00
|
|
|
|
|
2003-11-21 23:21:34 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM canonical_definition = canonicalize_define (expr);
|
|
|
|
|
|
const SCM cdr_canonical_definition = SCM_CDR (canonical_definition);
|
|
|
|
|
|
const SCM variable = SCM_CAR (cdr_canonical_definition);
|
2007-05-26 14:30:50 +00:00
|
|
|
|
const SCM value = scm_eval_car (SCM_CDR (cdr_canonical_definition), env);
|
2004-04-26 19:59:03 +00:00
|
|
|
|
const SCM location
|
|
|
|
|
|
= scm_sym2var (variable, scm_env_top_level (env), SCM_BOOL_T);
|
2003-11-21 23:21:34 +00:00
|
|
|
|
|
|
|
|
|
|
if (SCM_REC_PROCNAMES_P)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM tmp = value;
|
|
|
|
|
|
while (SCM_MACROP (tmp))
|
|
|
|
|
|
tmp = SCM_MACRO_CODE (tmp);
|
2007-01-15 23:42:45 +00:00
|
|
|
|
if (scm_is_true (scm_procedure_p (tmp))
|
2003-11-21 23:21:34 +00:00
|
|
|
|
/* Only the first definition determines the name. */
|
2004-07-06 10:59:25 +00:00
|
|
|
|
&& scm_is_false (scm_procedure_property (tmp, scm_sym_name)))
|
2003-11-21 23:21:34 +00:00
|
|
|
|
scm_set_procedure_property_x (tmp, scm_sym_name, variable);
|
|
|
|
|
|
}
|
2003-11-02 11:39:35 +00:00
|
|
|
|
|
2004-04-26 19:59:03 +00:00
|
|
|
|
SCM_VARIABLE_SET (location, value);
|
2003-11-21 23:21:34 +00:00
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-10-12 07:13:46 +00:00
|
|
|
|
/* This is a helper function for forms (<keyword> <expression>) that are
|
|
|
|
|
|
* transformed into (#@<keyword> '() <memoized_expression>) in order to allow
|
|
|
|
|
|
* for easy creation of a thunk (i. e. a closure without arguments) using the
|
|
|
|
|
|
* ('() <memoized_expression>) tail of the memoized form. */
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
memoize_as_thunk_prototype (const SCM expr, const SCM env SCM_UNUSED)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 1, s_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SETCDR (expr, scm_cons (SCM_EOL, cdr_expr));
|
|
|
|
|
|
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_delay, "delay", scm_i_makbimacro, scm_m_delay);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_delay, s_delay);
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
/* Promises are implemented as closures with an empty parameter list. Thus,
|
|
|
|
|
|
* (delay <expression>) is transformed into (#@delay '() <expression>), where
|
|
|
|
|
|
* the empty list represents the empty parameter list. This representation
|
|
|
|
|
|
* allows for easy creation of the closure during evaluation. */
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
SCM
|
2003-10-12 07:13:46 +00:00
|
|
|
|
scm_m_delay (SCM expr, SCM env)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-10-12 07:13:46 +00:00
|
|
|
|
const SCM new_expr = memoize_as_thunk_prototype (expr, env);
|
|
|
|
|
|
SCM_SETCAR (new_expr, SCM_IM_DELAY);
|
|
|
|
|
|
return new_expr;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_delay (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM thunk_expr = SCM_CADDR (expr);
|
2007-10-21 20:43:14 +00:00
|
|
|
|
/* A promise is implemented as a closure, and when applying a
|
|
|
|
|
|
closure the evaluator adds a new frame to the environment - even
|
|
|
|
|
|
though, in the case of a promise, the added frame is always
|
|
|
|
|
|
empty. We need to extend the environment here in the same way,
|
|
|
|
|
|
so that any ILOCs in thunk_expr can be unmemoized correctly. */
|
|
|
|
|
|
const SCM new_env = SCM_EXTEND_ENV (SCM_EOL, SCM_EOL, env);
|
|
|
|
|
|
return scm_list_2 (scm_sym_delay, unmemoize_expression (thunk_expr, new_env));
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
|
2003-10-12 09:22:52 +00:00
|
|
|
|
SCM_SYNTAX(s_do, "do", scm_i_makbimacro, scm_m_do);
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_do, s_do);
|
|
|
|
|
|
|
2001-11-17 11:43:28 +00:00
|
|
|
|
/* DO gets the most radically altered syntax. The order of the vars is
|
2003-10-12 12:58:51 +00:00
|
|
|
|
* reversed here. During the evaluation this allows for simple consing of the
|
|
|
|
|
|
* results of the inits and steps:
|
2001-11-17 11:43:28 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
(do ((<var1> <init1> <step1>)
|
2003-10-12 09:22:52 +00:00
|
|
|
|
(<var2> <init2>)
|
|
|
|
|
|
... )
|
|
|
|
|
|
(<test> <return>)
|
|
|
|
|
|
<body>)
|
2001-11-17 11:43:28 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
;; becomes
|
2001-11-17 11:43:28 +00:00
|
|
|
|
|
2003-05-19 20:15:08 +00:00
|
|
|
|
(#@do (<init1> <init2> ... <initn>)
|
2003-10-12 09:22:52 +00:00
|
|
|
|
(varn ... var2 var1)
|
|
|
|
|
|
(<test> <return>)
|
|
|
|
|
|
(<body>)
|
|
|
|
|
|
<step1> <step2> ... <stepn>) ;; missing steps replaced by var
|
2001-11-17 11:43:28 +00:00
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
2003-10-12 09:22:52 +00:00
|
|
|
|
scm_m_do (SCM expr, SCM env SCM_UNUSED)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-10-12 09:22:52 +00:00
|
|
|
|
SCM variables = SCM_EOL;
|
|
|
|
|
|
SCM init_forms = SCM_EOL;
|
|
|
|
|
|
SCM step_forms = SCM_EOL;
|
|
|
|
|
|
SCM binding_idx;
|
|
|
|
|
|
SCM cddr_expr;
|
|
|
|
|
|
SCM exit_clause;
|
|
|
|
|
|
SCM commands;
|
|
|
|
|
|
SCM tail;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 2, s_missing_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
/* Collect variables, init and step forms. */
|
|
|
|
|
|
binding_idx = SCM_CAR (cdr_expr);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (scm_ilength (binding_idx) >= 0,
|
|
|
|
|
|
s_bad_bindings, binding_idx, expr);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
for (; !scm_is_null (binding_idx); binding_idx = SCM_CDR (binding_idx))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-10-12 09:22:52 +00:00
|
|
|
|
const SCM binding = SCM_CAR (binding_idx);
|
|
|
|
|
|
const long length = scm_ilength (binding);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (length == 2 || length == 3,
|
|
|
|
|
|
s_bad_binding, binding, expr);
|
|
|
|
|
|
|
2001-11-17 11:43:28 +00:00
|
|
|
|
{
|
2003-10-12 09:22:52 +00:00
|
|
|
|
const SCM name = SCM_CAR (binding);
|
|
|
|
|
|
const SCM init = SCM_CADR (binding);
|
|
|
|
|
|
const SCM step = (length == 2) ? name : SCM_CADDR (binding);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_symbol (name), s_bad_variable, name, expr);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_false (scm_c_memq (name, variables)),
|
2003-10-12 12:58:51 +00:00
|
|
|
|
s_duplicate_binding, name, expr);
|
|
|
|
|
|
|
2003-10-12 09:22:52 +00:00
|
|
|
|
variables = scm_cons (name, variables);
|
|
|
|
|
|
init_forms = scm_cons (init, init_forms);
|
|
|
|
|
|
step_forms = scm_cons (step, step_forms);
|
2001-11-17 11:43:28 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2003-10-12 09:22:52 +00:00
|
|
|
|
init_forms = scm_reverse_x (init_forms, SCM_UNDEFINED);
|
|
|
|
|
|
step_forms = scm_reverse_x (step_forms, SCM_UNDEFINED);
|
|
|
|
|
|
|
|
|
|
|
|
/* Memoize the test form and the exit sequence. */
|
|
|
|
|
|
cddr_expr = SCM_CDR (cdr_expr);
|
|
|
|
|
|
exit_clause = SCM_CAR (cddr_expr);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (scm_ilength (exit_clause) >= 1,
|
|
|
|
|
|
s_bad_exit_clause, exit_clause, expr);
|
|
|
|
|
|
|
|
|
|
|
|
commands = SCM_CDR (cddr_expr);
|
|
|
|
|
|
tail = scm_cons2 (exit_clause, commands, step_forms);
|
|
|
|
|
|
tail = scm_cons2 (init_forms, variables, tail);
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_DO);
|
|
|
|
|
|
SCM_SETCDR (expr, tail);
|
|
|
|
|
|
return expr;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_do (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const SCM cddr_expr = SCM_CDR (cdr_expr);
|
|
|
|
|
|
const SCM rnames = SCM_CAR (cddr_expr);
|
|
|
|
|
|
const SCM extended_env = SCM_EXTEND_ENV (rnames, SCM_EOL, env);
|
|
|
|
|
|
const SCM cdddr_expr = SCM_CDR (cddr_expr);
|
|
|
|
|
|
const SCM exit_sequence = SCM_CAR (cdddr_expr);
|
|
|
|
|
|
const SCM um_exit_sequence = unmemoize_exprs (exit_sequence, extended_env);
|
|
|
|
|
|
const SCM cddddr_expr = SCM_CDR (cdddr_expr);
|
|
|
|
|
|
const SCM um_body = unmemoize_exprs (SCM_CAR (cddddr_expr), extended_env);
|
|
|
|
|
|
|
|
|
|
|
|
/* build transformed binding list */
|
|
|
|
|
|
SCM um_names = scm_reverse (rnames);
|
|
|
|
|
|
SCM um_inits = unmemoize_exprs (SCM_CAR (cdr_expr), env);
|
|
|
|
|
|
SCM um_steps = unmemoize_exprs (SCM_CDR (cddddr_expr), extended_env);
|
|
|
|
|
|
SCM um_bindings = SCM_EOL;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (!scm_is_null (um_names))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM name = SCM_CAR (um_names);
|
|
|
|
|
|
const SCM init = SCM_CAR (um_inits);
|
|
|
|
|
|
SCM step = SCM_CAR (um_steps);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
step = scm_is_eq (step, name) ? SCM_EOL : scm_list_1 (step);
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
|
|
|
|
|
|
um_bindings = scm_cons (scm_cons2 (name, init, step), um_bindings);
|
|
|
|
|
|
|
|
|
|
|
|
um_names = SCM_CDR (um_names);
|
|
|
|
|
|
um_inits = SCM_CDR (um_inits);
|
|
|
|
|
|
um_steps = SCM_CDR (um_steps);
|
|
|
|
|
|
}
|
|
|
|
|
|
um_bindings = scm_reverse_x (um_bindings, SCM_UNDEFINED);
|
|
|
|
|
|
|
|
|
|
|
|
return scm_cons (scm_sym_do,
|
|
|
|
|
|
scm_cons2 (um_bindings, um_exit_sequence, um_body));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_if, "if", scm_i_makbimacro, scm_m_if);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_if, s_if);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM
|
2003-10-12 12:58:51 +00:00
|
|
|
|
scm_m_if (SCM expr, SCM env SCM_UNUSED)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-10-12 12:58:51 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const long length = scm_ilength (cdr_expr);
|
|
|
|
|
|
ASSERT_SYNTAX (length == 2 || length == 3, s_expression, expr);
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_IF);
|
|
|
|
|
|
return expr;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_if (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const SCM um_condition = unmemoize_expression (SCM_CAR (cdr_expr), env);
|
|
|
|
|
|
const SCM cddr_expr = SCM_CDR (cdr_expr);
|
|
|
|
|
|
const SCM um_then = unmemoize_expression (SCM_CAR (cddr_expr), env);
|
|
|
|
|
|
const SCM cdddr_expr = SCM_CDR (cddr_expr);
|
|
|
|
|
|
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_null (cdddr_expr))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
return scm_list_3 (scm_sym_if, um_condition, um_then);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM um_else = unmemoize_expression (SCM_CAR (cdddr_expr), env);
|
|
|
|
|
|
return scm_list_4 (scm_sym_if, um_condition, um_then, um_else);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2001-11-17 11:43:28 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_lambda, "lambda", scm_i_makbimacro, scm_m_lambda);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_lambda, s_lambda);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-10-12 12:58:51 +00:00
|
|
|
|
/* A helper function for memoize_lambda to support checking for duplicate
|
|
|
|
|
|
* formal arguments: Return true if OBJ is `eq?' to one of the elements of
|
|
|
|
|
|
* LIST or to the cdr of the last cons. Therefore, LIST may have any of the
|
|
|
|
|
|
* forms that a formal argument can have:
|
|
|
|
|
|
* <rest>, (<arg1> ...), (<arg1> ... . <rest>) */
|
2003-04-27 12:06:48 +00:00
|
|
|
|
static int
|
2003-10-12 12:58:51 +00:00
|
|
|
|
c_improper_memq (SCM obj, SCM list)
|
* eval.c, eval.h, evalext.c, evalext.h (scm_sym_setter,
scm_m_generalized_set_x, scm_init_evalext): Move the declaration
and definition of the memoizer for the generalized set! macro from
evalext.[ch] to eval.[ch]. Use the SCM_SYNTAX snarfer macro to
define the macro object.
* eval.c, eval.h (s_set_x, scm_s_set_x, scm_m_set_x,
scm_m_generalized_set_x): Since now scm_s_set_x is only used in
eval.c, it is made static and renamed to s_set_x.
* evalext.c (scm_defined_p, scm_m_undefine): Prefer !SCM_<foo>
over SCM_N<foo>.
2003-04-20 19:18:43 +00:00
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
for (; scm_is_pair (list); list = SCM_CDR (list))
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (SCM_CAR (list), obj))
|
2003-10-12 12:58:51 +00:00
|
|
|
|
return 1;
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
2004-07-27 15:41:49 +00:00
|
|
|
|
return scm_is_eq (list, obj);
|
* eval.c, eval.h, evalext.c, evalext.h (scm_sym_setter,
scm_m_generalized_set_x, scm_init_evalext): Move the declaration
and definition of the memoizer for the generalized set! macro from
evalext.[ch] to eval.[ch]. Use the SCM_SYNTAX snarfer macro to
define the macro object.
* eval.c, eval.h (s_set_x, scm_s_set_x, scm_m_set_x,
scm_m_generalized_set_x): Since now scm_s_set_x is only used in
eval.c, it is made static and renamed to s_set_x.
* evalext.c (scm_defined_p, scm_m_undefine): Prefer !SCM_<foo>
over SCM_N<foo>.
2003-04-20 19:18:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
SCM
|
2003-10-12 20:47:32 +00:00
|
|
|
|
scm_m_lambda (SCM expr, SCM env SCM_UNUSED)
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
{
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM formals;
|
2003-10-12 20:47:32 +00:00
|
|
|
|
SCM formals_idx;
|
2003-11-01 10:21:15 +00:00
|
|
|
|
SCM cddr_expr;
|
|
|
|
|
|
int documentation;
|
|
|
|
|
|
SCM body;
|
|
|
|
|
|
SCM new_body;
|
2003-10-12 20:47:32 +00:00
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const long length = scm_ilength (cdr_expr);
|
|
|
|
|
|
ASSERT_SYNTAX (length >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (length >= 2, s_missing_expression, expr);
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
|
2003-10-12 20:47:32 +00:00
|
|
|
|
/* Before iterating the list of formal arguments, make sure the formals
|
|
|
|
|
|
* actually are given as either a symbol or a non-cyclic list. */
|
|
|
|
|
|
formals = SCM_CAR (cdr_expr);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_pair (formals))
|
2003-10-12 20:47:32 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* Dirk:FIXME:: We should check for a cyclic list of formals, and if
|
|
|
|
|
|
* detected, report a 'Bad formals' error. */
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_symbol (formals) || scm_is_null (formals),
|
2003-10-12 20:47:32 +00:00
|
|
|
|
s_bad_formals, formals, expr);
|
|
|
|
|
|
}
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2003-10-12 20:47:32 +00:00
|
|
|
|
/* Now iterate the list of formal arguments to check if all formals are
|
|
|
|
|
|
* symbols, and that there are no duplicates. */
|
|
|
|
|
|
formals_idx = formals;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (scm_is_pair (formals_idx))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-10-12 20:47:32 +00:00
|
|
|
|
const SCM formal = SCM_CAR (formals_idx);
|
|
|
|
|
|
const SCM next_idx = SCM_CDR (formals_idx);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_symbol (formal), s_bad_formal, formal, expr);
|
2003-10-12 20:47:32 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (!c_improper_memq (formal, next_idx),
|
|
|
|
|
|
s_duplicate_formal, formal, expr);
|
|
|
|
|
|
formals_idx = next_idx;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2004-09-22 17:38:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_null (formals_idx) || scm_is_symbol (formals_idx),
|
2003-10-12 20:47:32 +00:00
|
|
|
|
s_bad_formal, formals_idx, expr);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
2003-11-01 10:21:15 +00:00
|
|
|
|
/* Memoize the body. Keep a potential documentation string. */
|
|
|
|
|
|
/* Dirk:FIXME:: We should probably extract the documentation string to
|
|
|
|
|
|
* some external database. Otherwise it will slow down execution, since
|
|
|
|
|
|
* the documentation string will have to be skipped with every execution
|
|
|
|
|
|
* of the closure. */
|
|
|
|
|
|
cddr_expr = SCM_CDR (cdr_expr);
|
* stime.c, socket.c, simpos.c, procs.c, posix.c, ports.c,
net_db.c, fports.c, filesys.c, eval.c, deprecation.c, dynl.c:
Replaced uses of SCM_STRING_CHARS with proper uses of
scm_to_locale_string. Replaced SCM_STRINGP with scm_is_string.
Replaced scm_mem2string with scm_from_locale_string.
* simpos.c, posix.c (allocate_string_pointers, environ_list_to_c):
Removed, replaced all uses with scm_i_allocate_string_pointers.
2004-08-10 14:08:02 +00:00
|
|
|
|
documentation = (length >= 3 && scm_is_string (SCM_CAR (cddr_expr)));
|
2003-11-01 10:21:15 +00:00
|
|
|
|
body = documentation ? SCM_CDR (cddr_expr) : cddr_expr;
|
2003-11-09 08:47:19 +00:00
|
|
|
|
new_body = m_body (SCM_IM_LAMBDA, body);
|
2003-11-01 10:21:15 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_LAMBDA);
|
|
|
|
|
|
if (documentation)
|
|
|
|
|
|
SCM_SETCDR (cddr_expr, new_body);
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_SETCDR (cdr_expr, new_body);
|
|
|
|
|
|
return expr;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1996-08-20 17:09:07 +00:00
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_lambda (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM formals = SCM_CADR (expr);
|
|
|
|
|
|
const SCM body = SCM_CDDR (expr);
|
|
|
|
|
|
|
|
|
|
|
|
const SCM new_env = SCM_EXTEND_ENV (formals, SCM_EOL, env);
|
|
|
|
|
|
const SCM um_formals = scm_i_finite_list_copy (formals);
|
|
|
|
|
|
const SCM um_body = unmemoize_exprs (body, new_env);
|
|
|
|
|
|
|
|
|
|
|
|
return scm_cons2 (scm_sym_lambda, um_formals, um_body);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
/* Check if the format of the bindings is ((<symbol> <init-form>) ...). */
|
2001-11-17 11:43:28 +00:00
|
|
|
|
static void
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
check_bindings (const SCM bindings, const SCM expr)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
SCM binding_idx;
|
2001-11-17 11:43:28 +00:00
|
|
|
|
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_ilength (bindings) >= 0,
|
|
|
|
|
|
s_bad_bindings, bindings, expr);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
binding_idx = bindings;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
for (; !scm_is_null (binding_idx); binding_idx = SCM_CDR (binding_idx))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
SCM name; /* const */
|
|
|
|
|
|
|
|
|
|
|
|
const SCM binding = SCM_CAR (binding_idx);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (scm_ilength (binding) == 2,
|
|
|
|
|
|
s_bad_binding, binding, expr);
|
|
|
|
|
|
|
|
|
|
|
|
name = SCM_CAR (binding);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_symbol (name), s_bad_variable, name, expr);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
}
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
|
|
|
|
|
|
/* The bindings, which must have the format ((v1 i1) (v2 i2) ... (vn in)), are
|
|
|
|
|
|
* transformed to the lists (vn ... v2 v1) and (i1 i2 ... in). That is, the
|
|
|
|
|
|
* variables are returned in a list with their order reversed, and the init
|
|
|
|
|
|
* forms are returned in a list in the same order as they are given in the
|
|
|
|
|
|
* bindings. If a duplicate variable name is detected, an error is
|
|
|
|
|
|
* signalled. */
|
|
|
|
|
|
static void
|
|
|
|
|
|
transform_bindings (
|
|
|
|
|
|
const SCM bindings, const SCM expr,
|
|
|
|
|
|
SCM *const rvarptr, SCM *const initptr )
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM rvariables = SCM_EOL;
|
|
|
|
|
|
SCM rinits = SCM_EOL;
|
|
|
|
|
|
SCM binding_idx = bindings;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
for (; !scm_is_null (binding_idx); binding_idx = SCM_CDR (binding_idx))
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM binding = SCM_CAR (binding_idx);
|
|
|
|
|
|
const SCM cdr_binding = SCM_CDR (binding);
|
|
|
|
|
|
const SCM name = SCM_CAR (binding);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_false (scm_c_memq (name, rvariables)),
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
s_duplicate_binding, name, expr);
|
|
|
|
|
|
rvariables = scm_cons (name, rvariables);
|
|
|
|
|
|
rinits = scm_cons (SCM_CAR (cdr_binding), rinits);
|
|
|
|
|
|
}
|
|
|
|
|
|
*rvarptr = rvariables;
|
|
|
|
|
|
*initptr = scm_reverse_x (rinits, SCM_UNDEFINED);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2001-11-17 11:43:28 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX(s_let, "let", scm_i_makbimacro, scm_m_let);
|
* backtrace.c, debug.c, eval.c, eval.h, gsubr.c, read.c,
srcprop.c, srcprop.h (scm_i_filename, scm_i_line, scm_i_column,
scm_i_copy, scm_i_name, scm_i_lambda, scm_i_source, scm_i_more,
scm_i_procname, scm_i_dot, scm_i_arrow, scm_i_else, scm_i_unquote,
scm_i_uq_splicing, scm_i_apply, scm_i_enter_frame,
scm_i_apply_frame, scm_i_exit_frame, scm_i_trace, scm_i_quote,
scm_i_begin, scm_i_if, scm_i_and, scm_i_or, scm_i_case,
scm_i_cond, scm_i_letstar, scm_i_do, scm_i_quasiquote,
scm_i_define, scm_i_letrec, scm_i_let, scm_i_atapply,
scm_i_atcall_cc, scm_i_breakpoint): Renamed: Consequently use
scm_sym_ as prefix for symbols.
* eval.c, eval.h (scm_sym_begin, scm_sym_if, scm_sym_and,
scm_sym_case, scm_sym_cond, scm_sym_letstar, scm_sym_do,
scm_sym_define, scm_sym_letrec, scm_sym_atapply,
scm_sym_atcall_cc): Made global.
1999-08-17 08:46:37 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_let, s_let);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
/* This function is a helper function for memoize_let. It transforms
|
|
|
|
|
|
* (let name ((var init) ...) body ...) into
|
|
|
|
|
|
* ((letrec ((name (lambda (var ...) body ...))) name) init ...)
|
|
|
|
|
|
* and memoizes the expression. It is assumed that the caller has checked
|
|
|
|
|
|
* that name is a symbol and that there are bindings and a body. */
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
memoize_named_let (const SCM expr, const SCM env SCM_UNUSED)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM rvariables;
|
|
|
|
|
|
SCM variables;
|
|
|
|
|
|
SCM inits;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const SCM name = SCM_CAR (cdr_expr);
|
|
|
|
|
|
const SCM cddr_expr = SCM_CDR (cdr_expr);
|
|
|
|
|
|
const SCM bindings = SCM_CAR (cddr_expr);
|
|
|
|
|
|
check_bindings (bindings, expr);
|
|
|
|
|
|
|
|
|
|
|
|
transform_bindings (bindings, expr, &rvariables, &inits);
|
|
|
|
|
|
variables = scm_reverse_x (rvariables, SCM_UNDEFINED);
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM let_body = SCM_CDR (cddr_expr);
|
2003-11-09 08:47:19 +00:00
|
|
|
|
const SCM lambda_body = m_body (SCM_IM_LET, let_body);
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
const SCM lambda_tail = scm_cons (variables, lambda_body);
|
|
|
|
|
|
const SCM lambda_form = scm_cons_source (expr, scm_sym_lambda, lambda_tail);
|
|
|
|
|
|
|
|
|
|
|
|
const SCM rvar = scm_list_1 (name);
|
|
|
|
|
|
const SCM init = scm_list_1 (lambda_form);
|
2003-11-09 08:47:19 +00:00
|
|
|
|
const SCM body = m_body (SCM_IM_LET, scm_list_1 (name));
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
const SCM letrec_tail = scm_cons (rvar, scm_cons (init, body));
|
|
|
|
|
|
const SCM letrec_form = scm_cons_source (expr, SCM_IM_LETREC, letrec_tail);
|
|
|
|
|
|
return scm_cons_source (expr, letrec_form, inits);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* (let ((v1 i1) (v2 i2) ...) body) with variables v1 .. vn and initializers
|
|
|
|
|
|
* i1 .. in is transformed to (#@let (vn ... v2 v1) (i1 i2 ...) body). */
|
2001-11-17 11:43:28 +00:00
|
|
|
|
SCM
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
scm_m_let (SCM expr, SCM env)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
SCM bindings;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const long length = scm_ilength (cdr_expr);
|
|
|
|
|
|
ASSERT_SYNTAX (length >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (length >= 2, s_missing_expression, expr);
|
2001-11-17 11:43:28 +00:00
|
|
|
|
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
bindings = SCM_CAR (cdr_expr);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
if (scm_is_symbol (bindings))
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
{
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
ASSERT_SYNTAX (length >= 3, s_missing_expression, expr);
|
|
|
|
|
|
return memoize_named_let (expr, env);
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
}
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
|
|
|
|
|
|
check_bindings (bindings, expr);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_null (bindings) || scm_is_null (SCM_CDR (bindings)))
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
{
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
/* Special case: no bindings or single binding => let* is faster. */
|
2003-11-09 08:47:19 +00:00
|
|
|
|
const SCM body = m_body (SCM_IM_LET, SCM_CDR (cdr_expr));
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
return scm_m_letstar (scm_cons2 (SCM_CAR (expr), bindings, body), env);
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
}
|
2001-11-17 11:43:28 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
/* plain let */
|
|
|
|
|
|
SCM rvariables;
|
|
|
|
|
|
SCM inits;
|
|
|
|
|
|
transform_bindings (bindings, expr, &rvariables, &inits);
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
|
2001-11-17 11:43:28 +00:00
|
|
|
|
{
|
2003-11-09 08:47:19 +00:00
|
|
|
|
const SCM new_body = m_body (SCM_IM_LET, SCM_CDR (cdr_expr));
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
const SCM new_tail = scm_cons2 (rvariables, inits, new_body);
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_LET);
|
|
|
|
|
|
SCM_SETCDR (expr, new_tail);
|
|
|
|
|
|
return expr;
|
2001-11-17 11:43:28 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
build_binding_list (SCM rnames, SCM rinits)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM bindings = SCM_EOL;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (!scm_is_null (rnames))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM binding = scm_list_2 (SCM_CAR (rnames), SCM_CAR (rinits));
|
|
|
|
|
|
bindings = scm_cons (binding, bindings);
|
|
|
|
|
|
rnames = SCM_CDR (rnames);
|
|
|
|
|
|
rinits = SCM_CDR (rinits);
|
|
|
|
|
|
}
|
|
|
|
|
|
return bindings;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_let (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const SCM um_rnames = SCM_CAR (cdr_expr);
|
|
|
|
|
|
const SCM extended_env = SCM_EXTEND_ENV (um_rnames, SCM_EOL, env);
|
|
|
|
|
|
const SCM cddr_expr = SCM_CDR (cdr_expr);
|
|
|
|
|
|
const SCM um_inits = unmemoize_exprs (SCM_CAR (cddr_expr), env);
|
|
|
|
|
|
const SCM um_rinits = scm_reverse_x (um_inits, SCM_UNDEFINED);
|
|
|
|
|
|
const SCM um_bindings = build_binding_list (um_rnames, um_rinits);
|
|
|
|
|
|
const SCM um_body = unmemoize_exprs (SCM_CDR (cddr_expr), extended_env);
|
|
|
|
|
|
|
|
|
|
|
|
return scm_cons2 (scm_sym_let, um_bindings, um_body);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX(s_letrec, "letrec", scm_i_makbimacro, scm_m_letrec);
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_letrec, s_letrec);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_letrec (SCM expr, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM bindings;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 2, s_missing_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
bindings = SCM_CAR (cdr_expr);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_null (bindings))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* no bindings, let* is executed faster */
|
|
|
|
|
|
SCM body = m_body (SCM_IM_LETREC, SCM_CDR (cdr_expr));
|
|
|
|
|
|
return scm_m_letstar (scm_cons2 (SCM_CAR (expr), SCM_EOL, body), env);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM rvariables;
|
|
|
|
|
|
SCM inits;
|
|
|
|
|
|
SCM new_body;
|
|
|
|
|
|
|
|
|
|
|
|
check_bindings (bindings, expr);
|
|
|
|
|
|
transform_bindings (bindings, expr, &rvariables, &inits);
|
|
|
|
|
|
new_body = m_body (SCM_IM_LETREC, SCM_CDR (cdr_expr));
|
|
|
|
|
|
return scm_cons2 (SCM_IM_LETREC, rvariables, scm_cons (inits, new_body));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_letrec (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const SCM um_rnames = SCM_CAR (cdr_expr);
|
|
|
|
|
|
const SCM extended_env = SCM_EXTEND_ENV (um_rnames, SCM_EOL, env);
|
|
|
|
|
|
const SCM cddr_expr = SCM_CDR (cdr_expr);
|
|
|
|
|
|
const SCM um_inits = unmemoize_exprs (SCM_CAR (cddr_expr), extended_env);
|
|
|
|
|
|
const SCM um_rinits = scm_reverse_x (um_inits, SCM_UNDEFINED);
|
|
|
|
|
|
const SCM um_bindings = build_binding_list (um_rnames, um_rinits);
|
|
|
|
|
|
const SCM um_body = unmemoize_exprs (SCM_CDR (cddr_expr), extended_env);
|
|
|
|
|
|
|
|
|
|
|
|
return scm_cons2 (scm_sym_letrec, um_bindings, um_body);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_letstar, "let*", scm_i_makbimacro, scm_m_letstar);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_letstar, s_letstar);
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
/* (let* ((v1 i1) (v2 i2) ...) body) with variables v1 .. vn and initializers
|
|
|
|
|
|
* i1 .. in is transformed into the form (#@let* (v1 i1 v2 i2 ...) body). */
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
scm_m_letstar (SCM expr, SCM env SCM_UNUSED)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
SCM binding_idx;
|
|
|
|
|
|
SCM new_body;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 2, s_missing_expression, expr);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
binding_idx = SCM_CAR (cdr_expr);
|
|
|
|
|
|
check_bindings (binding_idx, expr);
|
|
|
|
|
|
|
2003-11-16 13:32:02 +00:00
|
|
|
|
/* Transform ((v1 i1) (v2 i2) ...) into (v1 i1 v2 i2 ...). The
|
|
|
|
|
|
* transformation is done in place. At the beginning of one iteration of
|
|
|
|
|
|
* the loop the variable binding_idx holds the form
|
|
|
|
|
|
* P1:( (vn . P2:(in . ())) . P3:( (vn+1 in+1) ... ) ),
|
|
|
|
|
|
* where P1, P2 and P3 indicate the pairs, that are relevant for the
|
|
|
|
|
|
* transformation. P1 and P2 are modified in the loop, P3 remains
|
|
|
|
|
|
* untouched. After the execution of the loop, P1 will hold
|
|
|
|
|
|
* P1:( vn . P2:(in . P3:( (vn+1 in+1) ... )) )
|
|
|
|
|
|
* and binding_idx will hold P3. */
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (!scm_is_null (binding_idx))
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-11-16 13:32:02 +00:00
|
|
|
|
const SCM cdr_binding_idx = SCM_CDR (binding_idx); /* remember P3 */
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
const SCM binding = SCM_CAR (binding_idx);
|
|
|
|
|
|
const SCM name = SCM_CAR (binding);
|
2003-11-16 13:32:02 +00:00
|
|
|
|
const SCM cdr_binding = SCM_CDR (binding);
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SETCDR (cdr_binding, cdr_binding_idx); /* update P2 */
|
|
|
|
|
|
SCM_SETCAR (binding_idx, name); /* update P1 */
|
|
|
|
|
|
SCM_SETCDR (binding_idx, cdr_binding); /* update P1 */
|
|
|
|
|
|
|
|
|
|
|
|
binding_idx = cdr_binding_idx; /* continue with P3 */
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-11-09 08:47:19 +00:00
|
|
|
|
new_body = m_body (SCM_IM_LETSTAR, SCM_CDR (cdr_expr));
|
2003-11-16 13:32:02 +00:00
|
|
|
|
SCM_SETCAR (expr, SCM_IM_LETSTAR);
|
|
|
|
|
|
/* the bindings have been changed in place */
|
|
|
|
|
|
SCM_SETCDR (cdr_expr, new_body);
|
|
|
|
|
|
return expr;
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
1998-12-14 15:19:59 +00:00
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_letstar (const SCM expr, const SCM env)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
const SCM body = SCM_CDR (cdr_expr);
|
|
|
|
|
|
SCM bindings = SCM_CAR (cdr_expr);
|
|
|
|
|
|
SCM um_bindings = SCM_EOL;
|
|
|
|
|
|
SCM extended_env = env;
|
|
|
|
|
|
SCM um_body;
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (!scm_is_null (bindings))
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
const SCM variable = SCM_CAR (bindings);
|
|
|
|
|
|
const SCM init = SCM_CADR (bindings);
|
|
|
|
|
|
const SCM um_init = unmemoize_expression (init, extended_env);
|
|
|
|
|
|
um_bindings = scm_cons (scm_list_2 (variable, um_init), um_bindings);
|
|
|
|
|
|
extended_env = SCM_EXTEND_ENV (variable, SCM_BOOL_F, extended_env);
|
|
|
|
|
|
bindings = SCM_CDDR (bindings);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
um_bindings = scm_reverse_x (um_bindings, SCM_UNDEFINED);
|
* libguile/eval.c (scm_m_let, scm_m_letstar, scm_m_letrec,
scm_m_expand_body, check_bindings): Extracted syntax checking of
bindings to new static function check_bindings.
(scm_m_let, memoize_named_let): Extracted handling of named let to
new static function memoize_named_let.
(transform_bindings, scm_m_let, scm_m_letstar, scm_m_letrec): Use
ASSERT_SYNTAX to signal syntax errors. Be more specific about the
kind of error that was detected. Avoid use of SCM_CDRLOC. Avoid
unnecessary consing when creating the memoized code.
* test-suite/lib.scm (exception:bad-variable): New.
* test-suite/tests/syntax.test (exception:bad-binding,
exception:duplicate-binding): New.
(exception:duplicate-bindings): Removed.
Adapted tests for 'let', 'let*' and 'letrec' to the new way of
error reporting.
2003-10-18 12:07:39 +00:00
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
um_body = unmemoize_exprs (body, extended_env);
|
|
|
|
|
|
|
|
|
|
|
|
return scm_cons2 (scm_sym_letstar, um_bindings, um_body);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1999-07-27 19:09:06 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_or, "or", scm_i_makbimacro, scm_m_or);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_or, s_or);
|
1999-07-27 19:09:06 +00:00
|
|
|
|
|
|
|
|
|
|
SCM
|
2003-10-18 14:49:55 +00:00
|
|
|
|
scm_m_or (SCM expr, SCM env SCM_UNUSED)
|
1999-07-27 19:09:06 +00:00
|
|
|
|
{
|
2003-10-18 14:49:55 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const long length = scm_ilength (cdr_expr);
|
|
|
|
|
|
|
|
|
|
|
|
ASSERT_SYNTAX (length >= 0, s_bad_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
if (length == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Special case: (or) is replaced by #f. */
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
2003-04-27 12:06:48 +00:00
|
|
|
|
else
|
2003-10-18 14:49:55 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_OR);
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
1999-07-27 19:09:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_or (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_cons (scm_sym_or, unmemoize_exprs (SCM_CDR (expr), env));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1999-07-27 19:09:06 +00:00
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_SYNTAX (s_quasiquote, "quasiquote", scm_makacro, scm_m_quasiquote);
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_quasiquote, s_quasiquote);
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_unquote, "unquote");
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_uq_splicing, "unquote-splicing");
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
|
|
|
|
|
/* Internal function to handle a quasiquotation: 'form' is the parameter in
|
|
|
|
|
|
* the call (quasiquotation form), 'env' is the environment where unquoted
|
|
|
|
|
|
* expressions will be evaluated, and 'depth' is the current quasiquotation
|
|
|
|
|
|
* nesting level and is known to be greater than zero. */
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
iqq (SCM form, SCM env, unsigned long int depth)
|
1999-07-27 19:09:06 +00:00
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_pair (form))
|
2002-01-22 23:31:39 +00:00
|
|
|
|
{
|
2003-10-18 14:49:55 +00:00
|
|
|
|
const SCM tmp = SCM_CAR (form);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (tmp, scm_sym_quasiquote))
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-18 14:49:55 +00:00
|
|
|
|
const SCM args = SCM_CDR (form);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (args) == 1, s_expression, form);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
return scm_list_2 (tmp, iqq (SCM_CAR (args), env, depth + 1));
|
|
|
|
|
|
}
|
2004-07-27 15:41:49 +00:00
|
|
|
|
else if (scm_is_eq (tmp, scm_sym_unquote))
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-18 14:49:55 +00:00
|
|
|
|
const SCM args = SCM_CDR (form);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (args) == 1, s_expression, form);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
if (depth - 1 == 0)
|
|
|
|
|
|
return scm_eval_car (args, env);
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_list_2 (tmp, iqq (SCM_CAR (args), env, depth - 1));
|
|
|
|
|
|
}
|
2004-09-22 17:38:44 +00:00
|
|
|
|
else if (scm_is_pair (tmp)
|
2004-07-27 15:41:49 +00:00
|
|
|
|
&& scm_is_eq (SCM_CAR (tmp), scm_sym_uq_splicing))
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-18 14:49:55 +00:00
|
|
|
|
const SCM args = SCM_CDR (tmp);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (args) == 1, s_expression, form);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
if (depth - 1 == 0)
|
|
|
|
|
|
{
|
2003-10-18 14:49:55 +00:00
|
|
|
|
const SCM list = scm_eval_car (args, env);
|
|
|
|
|
|
const SCM rest = SCM_CDR (form);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (scm_ilength (list) >= 0,
|
|
|
|
|
|
s_splicing, list, form);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
return scm_append (scm_list_2 (list, iqq (rest, env, depth)));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_cons (iqq (SCM_CAR (form), env, depth - 1),
|
|
|
|
|
|
iqq (SCM_CDR (form), env, depth));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_cons (iqq (SCM_CAR (form), env, depth),
|
|
|
|
|
|
iqq (SCM_CDR (form), env, depth));
|
|
|
|
|
|
}
|
2005-01-02 20:49:04 +00:00
|
|
|
|
else if (scm_is_vector (form))
|
|
|
|
|
|
return scm_vector (iqq (scm_vector_to_list (form), env, depth));
|
2003-04-27 12:06:48 +00:00
|
|
|
|
else
|
|
|
|
|
|
return form;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
2003-10-18 14:49:55 +00:00
|
|
|
|
scm_m_quasiquote (SCM expr, SCM env)
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-18 14:49:55 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 1, s_expression, expr);
|
|
|
|
|
|
return iqq (SCM_CAR (cdr_expr), env, 1);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_quote, "quote", scm_i_makbimacro, scm_m_quote);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_quote, s_quote);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
2003-10-18 14:49:55 +00:00
|
|
|
|
scm_m_quote (SCM expr, SCM env SCM_UNUSED)
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-18 14:49:55 +00:00
|
|
|
|
SCM quotee;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 1, s_expression, expr);
|
|
|
|
|
|
quotee = SCM_CAR (cdr_expr);
|
2004-03-29 08:24:57 +00:00
|
|
|
|
if (is_self_quoting_p (quotee))
|
2003-10-18 14:49:55 +00:00
|
|
|
|
return quotee;
|
2004-05-16 06:38:51 +00:00
|
|
|
|
|
2003-10-18 14:49:55 +00:00
|
|
|
|
SCM_SETCAR (expr, SCM_IM_QUOTE);
|
2004-05-16 06:38:51 +00:00
|
|
|
|
SCM_SETCDR (expr, quotee);
|
2003-10-18 14:49:55 +00:00
|
|
|
|
return expr;
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2004-05-16 06:38:51 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_quote (const SCM expr, const SCM env SCM_UNUSED)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_list_2 (scm_sym_quote, SCM_CDR (expr));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
|
|
|
|
|
/* Will go into the RnRS module when Guile is factorized.
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_set_x, "set!", scm_i_makbimacro, scm_m_set_x); */
|
2003-04-27 12:06:48 +00:00
|
|
|
|
static const char s_set_x[] = "set!";
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_set_x, s_set_x);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
2003-10-18 17:24:09 +00:00
|
|
|
|
scm_m_set_x (SCM expr, SCM env SCM_UNUSED)
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-18 17:24:09 +00:00
|
|
|
|
SCM variable;
|
2004-04-26 19:59:03 +00:00
|
|
|
|
SCM new_variable;
|
2003-10-18 17:24:09 +00:00
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 2, s_expression, expr);
|
|
|
|
|
|
variable = SCM_CAR (cdr_expr);
|
2004-04-26 19:59:03 +00:00
|
|
|
|
|
|
|
|
|
|
/* Memoize the variable form. */
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_symbol (variable), s_bad_variable, variable, expr);
|
2004-04-26 19:59:03 +00:00
|
|
|
|
new_variable = lookup_symbol (variable, env);
|
|
|
|
|
|
/* Leave the memoization of unbound symbols to lazy memoization: */
|
|
|
|
|
|
if (SCM_UNBNDP (new_variable))
|
|
|
|
|
|
new_variable = variable;
|
2003-10-18 17:24:09 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_SET_X);
|
2004-04-26 19:59:03 +00:00
|
|
|
|
SCM_SETCAR (cdr_expr, new_variable);
|
2003-10-18 17:24:09 +00:00
|
|
|
|
return expr;
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_set_x (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_cons (scm_sym_set_x, unmemoize_exprs (SCM_CDR (expr), env));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
|
|
|
|
|
/* Start of the memoizers for non-R5RS builtin macros. */
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_atapply, "@apply", scm_i_makbimacro, scm_m_apply);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_atapply, s_atapply);
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_apply, s_atapply + 1);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
2003-10-18 17:24:09 +00:00
|
|
|
|
scm_m_apply (SCM expr, SCM env SCM_UNUSED)
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-18 17:24:09 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 2, s_missing_expression, expr);
|
2001-08-25 16:08:13 +00:00
|
|
|
|
|
2003-10-18 17:24:09 +00:00
|
|
|
|
SCM_SETCAR (expr, SCM_IM_APPLY);
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
2001-08-25 16:08:13 +00:00
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_apply (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_list_2 (scm_sym_atapply, unmemoize_exprs (SCM_CDR (expr), env));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2001-08-25 16:08:13 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_atbind, "@bind", scm_i_makbimacro, scm_m_atbind);
|
1999-07-27 19:09:06 +00:00
|
|
|
|
|
2003-10-18 17:24:09 +00:00
|
|
|
|
/* FIXME: The following explanation should go into the documentation: */
|
|
|
|
|
|
/* (@bind ((var init) ...) body ...) will assign the values of the `init's to
|
|
|
|
|
|
* the global variables named by `var's (symbols, not evaluated), creating
|
|
|
|
|
|
* them if they don't exist, executes body, and then restores the previous
|
|
|
|
|
|
* values of the `var's. Additionally, whenever control leaves body, the
|
|
|
|
|
|
* values of the `var's are saved and restored when control returns. It is an
|
|
|
|
|
|
* error when a symbol appears more than once among the `var's. All `init's
|
|
|
|
|
|
* are evaluated before any `var' is set.
|
|
|
|
|
|
*
|
|
|
|
|
|
* Think of this as `let' for dynamic scope.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/* (@bind ((var1 exp1) ... (varn expn)) body ...) is memoized into
|
|
|
|
|
|
* (#@bind ((varn ... var1) . (exp1 ... expn)) body ...).
|
|
|
|
|
|
*
|
|
|
|
|
|
* FIXME - also implement `@bind*'.
|
|
|
|
|
|
*/
|
1999-07-27 19:09:06 +00:00
|
|
|
|
SCM
|
2003-10-18 17:24:09 +00:00
|
|
|
|
scm_m_atbind (SCM expr, SCM env)
|
1999-07-27 19:09:06 +00:00
|
|
|
|
{
|
2003-10-18 17:24:09 +00:00
|
|
|
|
SCM bindings;
|
|
|
|
|
|
SCM rvariables;
|
|
|
|
|
|
SCM inits;
|
|
|
|
|
|
SCM variable_idx;
|
2001-08-25 16:08:13 +00:00
|
|
|
|
|
2003-10-18 17:24:09 +00:00
|
|
|
|
const SCM top_level = scm_env_top_level (env);
|
1999-07-27 19:09:06 +00:00
|
|
|
|
|
2003-10-18 17:24:09 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 2, s_missing_expression, expr);
|
|
|
|
|
|
bindings = SCM_CAR (cdr_expr);
|
|
|
|
|
|
check_bindings (bindings, expr);
|
|
|
|
|
|
transform_bindings (bindings, expr, &rvariables, &inits);
|
|
|
|
|
|
|
|
|
|
|
|
for (variable_idx = rvariables;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
!scm_is_null (variable_idx);
|
2003-10-18 17:24:09 +00:00
|
|
|
|
variable_idx = SCM_CDR (variable_idx))
|
1999-07-27 19:09:06 +00:00
|
|
|
|
{
|
2003-10-18 17:24:09 +00:00
|
|
|
|
/* The first call to scm_sym2var will look beyond the current module,
|
|
|
|
|
|
* while the second call wont. */
|
|
|
|
|
|
const SCM variable = SCM_CAR (variable_idx);
|
|
|
|
|
|
SCM new_variable = scm_sym2var (variable, top_level, SCM_BOOL_F);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (new_variable))
|
2003-10-18 17:24:09 +00:00
|
|
|
|
new_variable = scm_sym2var (variable, top_level, SCM_BOOL_T);
|
|
|
|
|
|
SCM_SETCAR (variable_idx, new_variable);
|
1999-07-27 19:09:06 +00:00
|
|
|
|
}
|
2003-10-18 17:24:09 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_BIND);
|
|
|
|
|
|
SCM_SETCAR (cdr_expr, scm_cons (rvariables, inits));
|
|
|
|
|
|
return expr;
|
1999-07-27 19:09:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-04-25 16:22:47 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX(s_atcall_cc, "@call-with-current-continuation", scm_i_makbimacro, scm_m_cont);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_atcall_cc, s_atcall_cc);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
2003-10-18 18:26:43 +00:00
|
|
|
|
scm_m_cont (SCM expr, SCM env SCM_UNUSED)
|
2003-04-25 16:22:47 +00:00
|
|
|
|
{
|
2003-10-18 18:26:43 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 1, s_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_CONT);
|
|
|
|
|
|
return expr;
|
2003-04-25 16:22:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_atcall_cc (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_list_2 (scm_sym_atcall_cc, unmemoize_exprs (SCM_CDR (expr), env));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-04-25 16:22:47 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_at_call_with_values, "@call-with-values", scm_i_makbimacro, scm_m_at_call_with_values);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_at_call_with_values, s_at_call_with_values);
|
2003-04-25 16:22:47 +00:00
|
|
|
|
|
|
|
|
|
|
SCM
|
2003-10-18 18:26:43 +00:00
|
|
|
|
scm_m_at_call_with_values (SCM expr, SCM env SCM_UNUSED)
|
2003-04-25 16:22:47 +00:00
|
|
|
|
{
|
2003-10-18 18:26:43 +00:00
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 2, s_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_CALL_WITH_VALUES);
|
|
|
|
|
|
return expr;
|
2003-04-25 16:22:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_at_call_with_values (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_list_2 (scm_sym_at_call_with_values,
|
|
|
|
|
|
unmemoize_exprs (SCM_CDR (expr), env));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2006-01-29 19:09:52 +00:00
|
|
|
|
#if 0
|
|
|
|
|
|
|
|
|
|
|
|
/* See futures.h for a comment why futures are not enabled.
|
|
|
|
|
|
*/
|
2003-04-25 16:22:47 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_future, "future", scm_i_makbimacro, scm_m_future);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_future, s_future);
|
2001-03-26 22:39:35 +00:00
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
/* Like promises, futures are implemented as closures with an empty
|
|
|
|
|
|
* parameter list. Thus, (future <expression>) is transformed into
|
|
|
|
|
|
* (#@future '() <expression>), where the empty list represents the
|
|
|
|
|
|
* empty parameter list. This representation allows for easy creation
|
|
|
|
|
|
* of the closure during evaluation. */
|
2001-03-26 22:39:35 +00:00
|
|
|
|
SCM
|
2003-10-12 07:13:46 +00:00
|
|
|
|
scm_m_future (SCM expr, SCM env)
|
2001-03-26 22:39:35 +00:00
|
|
|
|
{
|
2003-10-12 07:13:46 +00:00
|
|
|
|
const SCM new_expr = memoize_as_thunk_prototype (expr, env);
|
|
|
|
|
|
SCM_SETCAR (new_expr, SCM_IM_FUTURE);
|
|
|
|
|
|
return new_expr;
|
2001-03-26 22:39:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_future (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM thunk_expr = SCM_CADDR (expr);
|
|
|
|
|
|
return scm_list_2 (scm_sym_future, unmemoize_expression (thunk_expr, env));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2008-09-03 01:50:30 -03:00
|
|
|
|
#endif /* futures disabled. */
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_gset_x, "set!", scm_i_makbimacro, scm_m_generalized_set_x);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM_SYMBOL (scm_sym_setter, "setter");
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
2003-11-17 00:24:48 +00:00
|
|
|
|
scm_m_generalized_set_x (SCM expr, SCM env)
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-11-17 00:24:48 +00:00
|
|
|
|
SCM target, exp_target;
|
2003-10-18 18:26:43 +00:00
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 2, s_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
target = SCM_CAR (cdr_expr);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_pair (target))
|
2003-10-18 18:26:43 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* R5RS usage */
|
|
|
|
|
|
return scm_m_set_x (expr, env);
|
|
|
|
|
|
}
|
2003-04-27 12:06:48 +00:00
|
|
|
|
else
|
2003-10-18 18:26:43 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* (set! (foo bar ...) baz) becomes ((setter foo) bar ... baz) */
|
2003-11-17 00:24:48 +00:00
|
|
|
|
/* Macroexpanding the target might return things of the form
|
|
|
|
|
|
(begin <atom>). In that case, <atom> must be a symbol or a
|
|
|
|
|
|
variable and we memoize to (set! <atom> ...).
|
|
|
|
|
|
*/
|
2004-06-02 09:37:48 +00:00
|
|
|
|
exp_target = macroexp (target, env);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (SCM_CAR (exp_target), SCM_IM_BEGIN)
|
2004-09-22 17:38:44 +00:00
|
|
|
|
&& !scm_is_null (SCM_CDR (exp_target))
|
|
|
|
|
|
&& scm_is_null (SCM_CDDR (exp_target)))
|
2003-11-17 00:24:48 +00:00
|
|
|
|
{
|
|
|
|
|
|
exp_target= SCM_CADR (exp_target);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_symbol (exp_target)
|
2003-11-17 16:52:05 +00:00
|
|
|
|
|| SCM_VARIABLEP (exp_target),
|
|
|
|
|
|
s_bad_variable, exp_target, expr);
|
2003-11-17 00:24:48 +00:00
|
|
|
|
return scm_cons (SCM_IM_SET_X, scm_cons (exp_target,
|
|
|
|
|
|
SCM_CDR (cdr_expr)));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM setter_proc_tail = scm_list_1 (SCM_CAR (target));
|
|
|
|
|
|
const SCM setter_proc = scm_cons_source (expr, scm_sym_setter,
|
|
|
|
|
|
setter_proc_tail);
|
2003-10-18 18:26:43 +00:00
|
|
|
|
|
2003-11-17 00:24:48 +00:00
|
|
|
|
const SCM cddr_expr = SCM_CDR (cdr_expr);
|
|
|
|
|
|
const SCM setter_args = scm_append_x (scm_list_2 (SCM_CDR (target),
|
|
|
|
|
|
cddr_expr));
|
2003-10-18 18:26:43 +00:00
|
|
|
|
|
2003-11-17 00:24:48 +00:00
|
|
|
|
SCM_SETCAR (expr, setter_proc);
|
|
|
|
|
|
SCM_SETCDR (expr, setter_args);
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
2003-10-18 18:26:43 +00:00
|
|
|
|
}
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-04-28 06:05:10 +00:00
|
|
|
|
/* @slot-ref is bound privately in the (oop goops) module from goops.c. As
|
|
|
|
|
|
* soon as the module system allows us to more freely create bindings in
|
|
|
|
|
|
* arbitrary modules during the startup phase, the code from goops.c should be
|
|
|
|
|
|
* moved here. */
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_SYMBOL (sym_atslot_ref, "@slot-ref");
|
|
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM
|
2003-10-18 19:03:24 +00:00
|
|
|
|
scm_m_atslot_ref (SCM expr, SCM env SCM_UNUSED)
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-18 19:03:24 +00:00
|
|
|
|
SCM slot_nr;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 2, s_expression, expr);
|
|
|
|
|
|
slot_nr = SCM_CADR (cdr_expr);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (SCM_I_INUMP (slot_nr), s_bad_slot_number, slot_nr, expr);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
2003-10-18 19:03:24 +00:00
|
|
|
|
SCM_SETCAR (expr, SCM_IM_SLOT_REF);
|
2004-05-16 06:38:51 +00:00
|
|
|
|
SCM_SETCDR (cdr_expr, slot_nr);
|
2003-10-18 19:03:24 +00:00
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_atslot_ref (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM instance = SCM_CADR (expr);
|
|
|
|
|
|
const SCM um_instance = unmemoize_expression (instance, env);
|
|
|
|
|
|
const SCM slot_nr = SCM_CDDR (expr);
|
|
|
|
|
|
return scm_list_3 (sym_atslot_ref, um_instance, slot_nr);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
2003-04-28 06:05:10 +00:00
|
|
|
|
/* @slot-set! is bound privately in the (oop goops) module from goops.c. As
|
|
|
|
|
|
* soon as the module system allows us to more freely create bindings in
|
|
|
|
|
|
* arbitrary modules during the startup phase, the code from goops.c should be
|
|
|
|
|
|
* moved here. */
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_SYMBOL (sym_atslot_set_x, "@slot-set!");
|
|
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM
|
2003-10-18 19:03:24 +00:00
|
|
|
|
scm_m_atslot_set_x (SCM expr, SCM env SCM_UNUSED)
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-18 19:03:24 +00:00
|
|
|
|
SCM slot_nr;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 3, s_expression, expr);
|
|
|
|
|
|
slot_nr = SCM_CADR (cdr_expr);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (SCM_I_INUMP (slot_nr), s_bad_slot_number, slot_nr, expr);
|
2003-10-18 19:03:24 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_SLOT_SET_X);
|
|
|
|
|
|
return expr;
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_atslot_set_x (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
const SCM instance = SCM_CAR (cdr_expr);
|
|
|
|
|
|
const SCM um_instance = unmemoize_expression (instance, env);
|
|
|
|
|
|
const SCM cddr_expr = SCM_CDR (cdr_expr);
|
|
|
|
|
|
const SCM slot_nr = SCM_CAR (cddr_expr);
|
|
|
|
|
|
const SCM cdddr_expr = SCM_CDR (cddr_expr);
|
|
|
|
|
|
const SCM value = SCM_CAR (cdddr_expr);
|
|
|
|
|
|
const SCM um_value = unmemoize_expression (value, env);
|
|
|
|
|
|
return scm_list_4 (sym_atslot_set_x, um_instance, slot_nr, um_value);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
|
|
|
|
|
#if SCM_ENABLE_ELISP
|
|
|
|
|
|
|
2003-10-22 20:16:41 +00:00
|
|
|
|
static const char s_defun[] = "Symbol's function definition is void";
|
|
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_nil_cond, "nil-cond", scm_i_makbimacro, scm_m_nil_cond);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
2003-10-22 20:16:41 +00:00
|
|
|
|
/* nil-cond expressions have the form
|
|
|
|
|
|
* (nil-cond COND VAL COND VAL ... ELSEVAL) */
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM
|
2003-10-22 20:16:41 +00:00
|
|
|
|
scm_m_nil_cond (SCM expr, SCM env SCM_UNUSED)
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-22 20:16:41 +00:00
|
|
|
|
const long length = scm_ilength (SCM_CDR (expr));
|
|
|
|
|
|
ASSERT_SYNTAX (length >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (length >= 1 && (length % 2) == 1, s_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_NIL_COND);
|
|
|
|
|
|
return expr;
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_atfop, "@fop", scm_i_makbimacro, scm_m_atfop);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
|
2003-10-22 20:16:41 +00:00
|
|
|
|
/* The @fop-macro handles procedure and macro applications for elisp. The
|
|
|
|
|
|
* input expression must have the form
|
|
|
|
|
|
* (@fop <var> (transformer-macro <expr> ...))
|
|
|
|
|
|
* where <var> must be a symbol. The expression is transformed into the
|
|
|
|
|
|
* memoized form of either
|
|
|
|
|
|
* (apply <un-aliased var> (transformer-macro <expr> ...))
|
|
|
|
|
|
* if the value of var (across all aliasing) is not a macro, or
|
|
|
|
|
|
* (<un-aliased var> <expr> ...)
|
|
|
|
|
|
* if var is a macro. */
|
2003-04-27 12:06:48 +00:00
|
|
|
|
SCM
|
2003-10-22 20:16:41 +00:00
|
|
|
|
scm_m_atfop (SCM expr, SCM env SCM_UNUSED)
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-22 20:16:41 +00:00
|
|
|
|
SCM location;
|
|
|
|
|
|
SCM symbol;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 1, s_missing_expression, expr);
|
|
|
|
|
|
|
|
|
|
|
|
symbol = SCM_CAR (cdr_expr);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_symbol (symbol), s_bad_variable, symbol, expr);
|
2003-10-22 20:16:41 +00:00
|
|
|
|
|
|
|
|
|
|
location = scm_symbol_fref (symbol);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (SCM_VARIABLEP (location), s_defun, symbol, expr);
|
|
|
|
|
|
|
|
|
|
|
|
/* The elisp function `defalias' allows to define aliases for symbols. To
|
|
|
|
|
|
* look up such definitions, the chain of symbol definitions has to be
|
|
|
|
|
|
* followed up to the terminal symbol. */
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
while (scm_is_symbol (SCM_VARIABLE_REF (location)))
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-22 20:16:41 +00:00
|
|
|
|
const SCM alias = SCM_VARIABLE_REF (location);
|
|
|
|
|
|
location = scm_symbol_fref (alias);
|
|
|
|
|
|
ASSERT_SYNTAX_2 (SCM_VARIABLEP (location), s_defun, symbol, expr);
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
2003-10-22 20:16:41 +00:00
|
|
|
|
|
|
|
|
|
|
/* Memoize the value location belonging to the terminal symbol. */
|
|
|
|
|
|
SCM_SETCAR (cdr_expr, location);
|
|
|
|
|
|
|
|
|
|
|
|
if (!SCM_MACROP (SCM_VARIABLE_REF (location)))
|
2003-04-27 12:06:48 +00:00
|
|
|
|
{
|
2003-10-22 20:16:41 +00:00
|
|
|
|
/* Since the location does not contain a macro, the form is a procedure
|
|
|
|
|
|
* application. Replace `@fop' by `@apply' and transform the expression
|
|
|
|
|
|
* including the `transformer-macro'. */
|
|
|
|
|
|
SCM_SETCAR (expr, SCM_IM_APPLY);
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Since the location contains a macro, the arguments should not be
|
|
|
|
|
|
* transformed, so the `transformer-macro' is cut out. The resulting
|
|
|
|
|
|
* expression starts with the memoized variable, that is at the cdr of
|
|
|
|
|
|
* the input expression. */
|
|
|
|
|
|
SCM_SETCDR (cdr_expr, SCM_CDADR (cdr_expr));
|
|
|
|
|
|
return cdr_expr;
|
2003-04-27 12:06:48 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#endif /* SCM_ENABLE_ELISP */
|
|
|
|
|
|
|
|
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
unmemoize_builtin_macro (const SCM expr, const SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
switch (ISYMNUM (SCM_CAR (expr)))
|
|
|
|
|
|
{
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_AND)):
|
|
|
|
|
|
return unmemoize_and (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_BEGIN)):
|
|
|
|
|
|
return unmemoize_begin (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_CASE)):
|
|
|
|
|
|
return unmemoize_case (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_COND)):
|
|
|
|
|
|
return unmemoize_cond (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_DELAY)):
|
|
|
|
|
|
return unmemoize_delay (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_DO)):
|
|
|
|
|
|
return unmemoize_do (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_IF)):
|
|
|
|
|
|
return unmemoize_if (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_LAMBDA)):
|
|
|
|
|
|
return unmemoize_lambda (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_LET)):
|
|
|
|
|
|
return unmemoize_let (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_LETREC)):
|
|
|
|
|
|
return unmemoize_letrec (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_LETSTAR)):
|
|
|
|
|
|
return unmemoize_letstar (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_OR)):
|
|
|
|
|
|
return unmemoize_or (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_QUOTE)):
|
|
|
|
|
|
return unmemoize_quote (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_SET_X)):
|
|
|
|
|
|
return unmemoize_set_x (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_APPLY)):
|
|
|
|
|
|
return unmemoize_apply (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_BIND)):
|
|
|
|
|
|
return unmemoize_exprs (expr, env); /* FIXME */
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_CONT)):
|
|
|
|
|
|
return unmemoize_atcall_cc (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_CALL_WITH_VALUES)):
|
|
|
|
|
|
return unmemoize_at_call_with_values (expr, env);
|
|
|
|
|
|
|
2006-01-29 19:09:52 +00:00
|
|
|
|
#if 0
|
|
|
|
|
|
/* See futures.h for a comment why futures are not enabled.
|
|
|
|
|
|
*/
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
case (ISYMNUM (SCM_IM_FUTURE)):
|
|
|
|
|
|
return unmemoize_future (expr, env);
|
2006-01-29 19:09:52 +00:00
|
|
|
|
#endif
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_SLOT_REF)):
|
|
|
|
|
|
return unmemoize_atslot_ref (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_SLOT_SET_X)):
|
|
|
|
|
|
return unmemoize_atslot_set_x (expr, env);
|
|
|
|
|
|
|
|
|
|
|
|
case (ISYMNUM (SCM_IM_NIL_COND)):
|
|
|
|
|
|
return unmemoize_exprs (expr, env); /* FIXME */
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
return unmemoize_exprs (expr, env); /* FIXME */
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
/* scm_i_unmemocopy_expr and scm_i_unmemocopy_body take a memoized expression
|
|
|
|
|
|
* respectively a memoized body together with its environment and rewrite it
|
|
|
|
|
|
* to its original form. Thus, these functions are the inversion of the
|
|
|
|
|
|
* rewrite rules above. The procedure is not optimized for speed. It's used
|
|
|
|
|
|
* in scm_i_unmemoize_expr, scm_procedure_source, macro_print and scm_iprin1.
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
*
|
|
|
|
|
|
* Unmemoizing is not a reliable process. You cannot in general expect to get
|
|
|
|
|
|
* the original source back.
|
|
|
|
|
|
*
|
|
|
|
|
|
* However, GOOPS currently relies on this for method compilation. This ought
|
|
|
|
|
|
* to change. */
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
scm_i_unmemocopy_expr (SCM expr, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM source_properties = scm_whash_lookup (scm_source_whash, expr);
|
|
|
|
|
|
const SCM um_expr = unmemoize_expression (expr, env);
|
|
|
|
|
|
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (source_properties))
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
scm_whash_insert (scm_source_whash, um_expr, source_properties);
|
|
|
|
|
|
|
|
|
|
|
|
return um_expr;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_i_unmemocopy_body (SCM forms, SCM env)
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
const SCM source_properties = scm_whash_lookup (scm_source_whash, forms);
|
|
|
|
|
|
const SCM um_forms = unmemoize_exprs (forms, env);
|
|
|
|
|
|
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (source_properties))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
scm_whash_insert (scm_source_whash, um_forms, source_properties);
|
|
|
|
|
|
|
|
|
|
|
|
return um_forms;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
#if (SCM_ENABLE_DEPRECATED == 1)
|
2003-05-06 20:05:04 +00:00
|
|
|
|
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
/* Deprecated in guile 1.7.0 on 2003-11-09. */
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_expand_body (SCM exprs, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_c_issue_deprecation_warning
|
|
|
|
|
|
("`scm_m_expand_body' is deprecated.");
|
|
|
|
|
|
m_expand_body (exprs, env);
|
|
|
|
|
|
return exprs;
|
|
|
|
|
|
}
|
2003-05-06 20:05:04 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX (s_undefine, "undefine", scm_makacro, scm_m_undefine);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
2003-10-22 20:16:41 +00:00
|
|
|
|
scm_m_undefine (SCM expr, SCM env)
|
2003-05-06 20:05:04 +00:00
|
|
|
|
{
|
2003-10-22 20:16:41 +00:00
|
|
|
|
SCM variable;
|
|
|
|
|
|
SCM location;
|
|
|
|
|
|
|
|
|
|
|
|
const SCM cdr_expr = SCM_CDR (expr);
|
|
|
|
|
|
ASSERT_SYNTAX (SCM_TOP_LEVEL (env), "Bad undefine placement in", expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) >= 0, s_bad_expression, expr);
|
|
|
|
|
|
ASSERT_SYNTAX (scm_ilength (cdr_expr) == 1, s_expression, expr);
|
|
|
|
|
|
|
2004-06-02 09:37:48 +00:00
|
|
|
|
scm_c_issue_deprecation_warning
|
|
|
|
|
|
("`undefine' is deprecated.\n");
|
|
|
|
|
|
|
2003-10-22 20:16:41 +00:00
|
|
|
|
variable = SCM_CAR (cdr_expr);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_symbol (variable), s_bad_variable, variable, expr);
|
2003-10-22 20:16:41 +00:00
|
|
|
|
location = scm_sym2var (variable, scm_env_top_level (env), SCM_BOOL_F);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
ASSERT_SYNTAX_2 (scm_is_true (location)
|
2003-10-22 20:16:41 +00:00
|
|
|
|
&& !SCM_UNBNDP (SCM_VARIABLE_REF (location)),
|
|
|
|
|
|
"variable already unbound ", variable, expr);
|
|
|
|
|
|
SCM_VARIABLE_SET (location, SCM_UNDEFINED);
|
2003-05-06 20:05:04 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_macroexp (SCM x, SCM env)
|
|
|
|
|
|
{
|
2004-06-02 09:37:48 +00:00
|
|
|
|
scm_c_issue_deprecation_warning
|
|
|
|
|
|
("`scm_macroexp' is deprecated.");
|
|
|
|
|
|
return macroexp (x, env);
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
}
|
1999-07-27 19:09:06 +00:00
|
|
|
|
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2003-10-25 07:00:50 +00:00
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
#if (SCM_ENABLE_DEPRECATED == 1)
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_unmemocar (SCM form, SCM env)
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
{
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
scm_c_issue_deprecation_warning
|
|
|
|
|
|
("`scm_unmemocar' is deprecated.");
|
2003-10-25 07:00:50 +00:00
|
|
|
|
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_pair (form))
|
2003-10-25 07:00:50 +00:00
|
|
|
|
return form;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM c = SCM_CAR (form);
|
|
|
|
|
|
if (SCM_VARIABLEP (c))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM sym = scm_module_reverse_lookup (scm_env_module (env), c);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (sym))
|
2003-10-25 07:00:50 +00:00
|
|
|
|
sym = sym_three_question_marks;
|
|
|
|
|
|
SCM_SETCAR (form, sym);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_ILOCP (c))
|
|
|
|
|
|
{
|
|
|
|
|
|
unsigned long int ir;
|
|
|
|
|
|
|
|
|
|
|
|
for (ir = SCM_IFRAME (c); ir != 0; --ir)
|
|
|
|
|
|
env = SCM_CDR (env);
|
|
|
|
|
|
env = SCM_CAAR (env);
|
|
|
|
|
|
for (ir = SCM_IDIST (c); ir != 0; --ir)
|
|
|
|
|
|
env = SCM_CDR (env);
|
2004-01-22 23:14:09 +00:00
|
|
|
|
|
2003-10-25 07:00:50 +00:00
|
|
|
|
SCM_SETCAR (form, SCM_ICDRP (c) ? env : SCM_CAR (env));
|
|
|
|
|
|
}
|
|
|
|
|
|
return form;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
/* The definitions for execution start here. */
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_enter_frame, "enter-frame");
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_apply_frame, "apply-frame");
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_exit_frame, "exit-frame");
|
2007-01-19 20:05:05 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_memoize_symbol, "memoize-symbol");
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_trace, "trace");
|
2005-11-04 21:20:24 +00:00
|
|
|
|
SCM_SYMBOL (sym_instead, "instead");
|
* eval.c (s_splicing): Commented and reformulated.
(lookup_global_symbol, lookup_symbol): New static functions.
(s_test, s_bindings, s_duplicate_bindings, s_variable): Removed.
(try_macro_lookup, literal_p): Use lookup_symbol instead of
creating a temporary pair for scm_lookupcar.
(scm_unmemocar, unmemocar): Renamed scm_unmemocar to unmemocar,
created deprecated wrapper function scm_unmemocar.
(SCM_VALIDATE_NON_EMPTY_COMBINATION, scm_sym_else,
scm_sym_unquote, scm_sym_uq_splicing, scm_sym_enter_frame,
scm_sym_apply_frame, scm_sym_exit_frame, scm_sym_trace, f_apply,
undefineds, sym_three_question_marks): Moved around without
modifications.
* eval.c, eval.h (scm_macroexp, scm_unmemocar): Deprecated.
2003-11-16 10:47:45 +00:00
|
|
|
|
|
|
|
|
|
|
/* A function object to implement "apply" for non-closure functions. */
|
|
|
|
|
|
static SCM f_apply;
|
|
|
|
|
|
/* An endless list consisting of #<undefined> objects: */
|
|
|
|
|
|
static SCM undefineds;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_badargsp (SCM formals, SCM args)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (!scm_is_null (formals))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_pair (formals))
|
1999-06-19 20:21:07 +00:00
|
|
|
|
return 0;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_null (args))
|
1999-06-19 20:21:07 +00:00
|
|
|
|
return 1;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
formals = SCM_CDR (formals);
|
|
|
|
|
|
args = SCM_CDR (args);
|
|
|
|
|
|
}
|
2004-09-22 17:38:44 +00:00
|
|
|
|
return !scm_is_null (args) ? 1 : 0;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2002-01-10 21:57:03 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-03-24 01:21:50 +00:00
|
|
|
|
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
/* The evaluator contains a plethora of EVAL symbols.
|
2004-03-24 01:21:50 +00:00
|
|
|
|
*
|
|
|
|
|
|
*
|
2004-08-02 15:48:58 +00:00
|
|
|
|
* SCM_I_EVALIM is used when it is known that the expression is an
|
2004-03-24 01:21:50 +00:00
|
|
|
|
* immediate. (This macro never calls an evaluator.)
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
*
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
* SCM_I_XEVAL evaluates an expression that is expected to have its symbols already
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
* memoized. Expressions that are not of the form '(<form> <form> ...)' are
|
|
|
|
|
|
* evaluated inline without calling an evaluator.
|
|
|
|
|
|
*
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
* This macro uses ceval or deval depending on its 3rd argument.
|
|
|
|
|
|
*
|
|
|
|
|
|
* SCM_I_XEVALCAR evaluates the car of an expression 'X:(Y:<form> <form> ...)',
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
* potentially replacing a symbol at the position Y:<form> by its memoized
|
|
|
|
|
|
* variable. If Y:<form> is not of the form '(<form> <form> ...)', the
|
|
|
|
|
|
* evaluation is performed inline without calling an evaluator.
|
2004-03-24 01:21:50 +00:00
|
|
|
|
*
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
* This macro uses ceval or deval depending on its 3rd argument.
|
2004-03-24 01:21:50 +00:00
|
|
|
|
*
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2004-08-02 15:48:58 +00:00
|
|
|
|
#define SCM_I_EVALIM2(x) \
|
2004-07-27 15:41:49 +00:00
|
|
|
|
((scm_is_eq ((x), SCM_EOL) \
|
2004-03-24 01:21:50 +00:00
|
|
|
|
? syntax_error (s_empty_combination, (x), SCM_UNDEFINED), 0 \
|
|
|
|
|
|
: 0), \
|
|
|
|
|
|
(x))
|
|
|
|
|
|
|
2004-08-02 15:48:58 +00:00
|
|
|
|
#define SCM_I_EVALIM(x, env) (SCM_ILOCP (x) \
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
? *scm_ilookup ((x), (env)) \
|
2004-08-02 15:48:58 +00:00
|
|
|
|
: SCM_I_EVALIM2(x))
|
2004-03-24 01:21:50 +00:00
|
|
|
|
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
#define SCM_I_XEVAL(x, env, debug_p) \
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
(SCM_IMP (x) \
|
2004-08-02 15:48:58 +00:00
|
|
|
|
? SCM_I_EVALIM2 (x) \
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
: (SCM_VARIABLEP (x) \
|
|
|
|
|
|
? SCM_VARIABLE_REF (x) \
|
2004-09-22 17:38:44 +00:00
|
|
|
|
: (scm_is_pair (x) \
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
? (debug_p \
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
? deval ((x), (env)) \
|
|
|
|
|
|
: ceval ((x), (env))) \
|
|
|
|
|
|
: (x))))
|
|
|
|
|
|
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
#define SCM_I_XEVALCAR(x, env, debug_p) \
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
(SCM_IMP (SCM_CAR (x)) \
|
2004-08-02 15:48:58 +00:00
|
|
|
|
? SCM_I_EVALIM (SCM_CAR (x), (env)) \
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
: (SCM_VARIABLEP (SCM_CAR (x)) \
|
|
|
|
|
|
? SCM_VARIABLE_REF (SCM_CAR (x)) \
|
2004-09-22 17:38:44 +00:00
|
|
|
|
: (scm_is_pair (SCM_CAR (x)) \
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
? (debug_p \
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
? deval (SCM_CAR (x), (env)) \
|
|
|
|
|
|
: ceval (SCM_CAR (x), (env))) \
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
: (!scm_is_symbol (SCM_CAR (x)) \
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
? SCM_CAR (x) \
|
|
|
|
|
|
: *scm_lookupcar ((x), (env), 1)))))
|
|
|
|
|
|
|
2005-10-23 20:47:49 +00:00
|
|
|
|
scm_i_pthread_mutex_t source_mutex;
|
2004-03-24 01:21:50 +00:00
|
|
|
|
|
|
|
|
|
|
|
2004-05-15 16:45:27 +00:00
|
|
|
|
/* Lookup a given local variable in an environment. The local variable is
|
|
|
|
|
|
* given as an iloc, that is a triple <frame, binding, last?>, where frame
|
|
|
|
|
|
* indicates the relative number of the environment frame (counting upwards
|
|
|
|
|
|
* from the innermost environment frame), binding indicates the number of the
|
|
|
|
|
|
* binding within the frame, and last? (which is extracted from the iloc using
|
|
|
|
|
|
* the macro SCM_ICDRP) indicates whether the binding forms the binding at the
|
|
|
|
|
|
* very end of the improper list of bindings. */
|
|
|
|
|
|
SCM *
|
|
|
|
|
|
scm_ilookup (SCM iloc, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
unsigned int frame_nr = SCM_IFRAME (iloc);
|
|
|
|
|
|
unsigned int binding_nr = SCM_IDIST (iloc);
|
|
|
|
|
|
SCM frames = env;
|
|
|
|
|
|
SCM bindings;
|
|
|
|
|
|
|
|
|
|
|
|
for (; 0 != frame_nr; --frame_nr)
|
|
|
|
|
|
frames = SCM_CDR (frames);
|
|
|
|
|
|
|
|
|
|
|
|
bindings = SCM_CAR (frames);
|
|
|
|
|
|
for (; 0 != binding_nr; --binding_nr)
|
|
|
|
|
|
bindings = SCM_CDR (bindings);
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_ICDRP (iloc))
|
|
|
|
|
|
return SCM_CDRLOC (bindings);
|
|
|
|
|
|
return SCM_CARLOC (SCM_CDR (bindings));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYMBOL (scm_unbound_variable_key, "unbound-variable");
|
|
|
|
|
|
|
|
|
|
|
|
static void error_unbound_variable (SCM symbol) SCM_NORETURN;
|
2004-08-20 12:26:46 +00:00
|
|
|
|
static void error_defined_variable (SCM symbol) SCM_NORETURN;
|
|
|
|
|
|
|
|
|
|
|
|
/* Call this for variables that are unfound.
|
|
|
|
|
|
*/
|
2004-05-15 16:45:27 +00:00
|
|
|
|
static void
|
|
|
|
|
|
error_unbound_variable (SCM symbol)
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_error (scm_unbound_variable_key, NULL,
|
|
|
|
|
|
"Unbound variable: ~S",
|
|
|
|
|
|
scm_list_1 (symbol), SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-08-20 12:26:46 +00:00
|
|
|
|
/* Call this for variables that are found but contain SCM_UNDEFINED.
|
|
|
|
|
|
*/
|
|
|
|
|
|
static void
|
|
|
|
|
|
error_defined_variable (SCM symbol)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We use the 'unbound-variable' key here as well, since it
|
|
|
|
|
|
basically is the same kind of error, with a slight variation in
|
|
|
|
|
|
the displayed message.
|
|
|
|
|
|
*/
|
|
|
|
|
|
scm_error (scm_unbound_variable_key, NULL,
|
2004-08-20 13:33:28 +00:00
|
|
|
|
"Variable used before given a value: ~S",
|
2004-08-20 12:26:46 +00:00
|
|
|
|
scm_list_1 (symbol), SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-05-15 16:45:27 +00:00
|
|
|
|
|
|
|
|
|
|
/* The Lookup Car Race
|
|
|
|
|
|
- by Eva Luator
|
|
|
|
|
|
|
|
|
|
|
|
Memoization of variables and special forms is done while executing
|
|
|
|
|
|
the code for the first time. As long as there is only one thread
|
|
|
|
|
|
everything is fine, but as soon as two threads execute the same
|
|
|
|
|
|
code concurrently `for the first time' they can come into conflict.
|
|
|
|
|
|
|
|
|
|
|
|
This memoization includes rewriting variable references into more
|
|
|
|
|
|
efficient forms and expanding macros. Furthermore, macro expansion
|
|
|
|
|
|
includes `compiling' special forms like `let', `cond', etc. into
|
|
|
|
|
|
tree-code instructions.
|
|
|
|
|
|
|
|
|
|
|
|
There shouldn't normally be a problem with memoizing local and
|
|
|
|
|
|
global variable references (into ilocs and variables), because all
|
|
|
|
|
|
threads will mutate the code in *exactly* the same way and (if I
|
|
|
|
|
|
read the C code correctly) it is not possible to observe a half-way
|
|
|
|
|
|
mutated cons cell. The lookup procedure can handle this
|
|
|
|
|
|
transparently without any critical sections.
|
|
|
|
|
|
|
|
|
|
|
|
It is different with macro expansion, because macro expansion
|
|
|
|
|
|
happens outside of the lookup procedure and can't be
|
|
|
|
|
|
undone. Therefore the lookup procedure can't cope with it. It has
|
|
|
|
|
|
to indicate failure when it detects a lost race and hope that the
|
|
|
|
|
|
caller can handle it. Luckily, it turns out that this is the case.
|
|
|
|
|
|
|
|
|
|
|
|
An example to illustrate this: Suppose that the following form will
|
|
|
|
|
|
be memoized concurrently by two threads
|
|
|
|
|
|
|
|
|
|
|
|
(let ((x 12)) x)
|
|
|
|
|
|
|
|
|
|
|
|
Let's first examine the lookup of X in the body. The first thread
|
|
|
|
|
|
decides that it has to find the symbol "x" in the environment and
|
|
|
|
|
|
starts to scan it. Then the other thread takes over and actually
|
|
|
|
|
|
overtakes the first. It looks up "x" and substitutes an
|
|
|
|
|
|
appropriate iloc for it. Now the first thread continues and
|
|
|
|
|
|
completes its lookup. It comes to exactly the same conclusions as
|
|
|
|
|
|
the second one and could - without much ado - just overwrite the
|
|
|
|
|
|
iloc with the same iloc.
|
|
|
|
|
|
|
|
|
|
|
|
But let's see what will happen when the race occurs while looking
|
|
|
|
|
|
up the symbol "let" at the start of the form. It could happen that
|
|
|
|
|
|
the second thread interrupts the lookup of the first thread and not
|
|
|
|
|
|
only substitutes a variable for it but goes right ahead and
|
|
|
|
|
|
replaces it with the compiled form (#@let* (x 12) x). Now, when
|
|
|
|
|
|
the first thread completes its lookup, it would replace the #@let*
|
|
|
|
|
|
with a variable containing the "let" binding, effectively reverting
|
|
|
|
|
|
the form to (let (x 12) x). This is wrong. It has to detect that
|
|
|
|
|
|
it has lost the race and the evaluator has to reconsider the
|
|
|
|
|
|
changed form completely.
|
|
|
|
|
|
|
|
|
|
|
|
This race condition could be resolved with some kind of traffic
|
|
|
|
|
|
light (like mutexes) around scm_lookupcar, but I think that it is
|
|
|
|
|
|
best to avoid them in this case. They would serialize memoization
|
|
|
|
|
|
completely and because lookup involves calling arbitrary Scheme
|
|
|
|
|
|
code (via the lookup-thunk), threads could be blocked for an
|
|
|
|
|
|
arbitrary amount of time or even deadlock. But with the current
|
|
|
|
|
|
solution a lot of unnecessary work is potentially done. */
|
|
|
|
|
|
|
|
|
|
|
|
/* SCM_LOOKUPCAR1 is what SCM_LOOKUPCAR used to be but is allowed to
|
|
|
|
|
|
return NULL to indicate a failed lookup due to some race conditions
|
|
|
|
|
|
between threads. This only happens when VLOC is the first cell of
|
|
|
|
|
|
a special form that will eventually be memoized (like `let', etc.)
|
|
|
|
|
|
In that case the whole lookup is bogus and the caller has to
|
|
|
|
|
|
reconsider the complete special form.
|
|
|
|
|
|
|
|
|
|
|
|
SCM_LOOKUPCAR is still there, of course. It just calls
|
|
|
|
|
|
SCM_LOOKUPCAR1 and aborts on receiving NULL. So SCM_LOOKUPCAR
|
|
|
|
|
|
should only be called when it is known that VLOC is not the first
|
|
|
|
|
|
pair of a special form. Otherwise, use SCM_LOOKUPCAR1 and check
|
|
|
|
|
|
for NULL. I think I've found the only places where this
|
|
|
|
|
|
applies. */
|
|
|
|
|
|
|
|
|
|
|
|
static SCM *
|
|
|
|
|
|
scm_lookupcar1 (SCM vloc, SCM genv, int check)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM env = genv;
|
|
|
|
|
|
register SCM *al, fl, var = SCM_CAR (vloc);
|
|
|
|
|
|
register SCM iloc = SCM_ILOC00;
|
|
|
|
|
|
for (; SCM_NIMP (env); env = SCM_CDR (env))
|
|
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_pair (SCM_CAR (env)))
|
2004-05-15 16:45:27 +00:00
|
|
|
|
break;
|
|
|
|
|
|
al = SCM_CARLOC (env);
|
|
|
|
|
|
for (fl = SCM_CAR (*al); SCM_NIMP (fl); fl = SCM_CDR (fl))
|
|
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_pair (fl))
|
2004-05-15 16:45:27 +00:00
|
|
|
|
{
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (fl, var))
|
2004-05-15 16:45:27 +00:00
|
|
|
|
{
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (!scm_is_eq (SCM_CAR (vloc), var))
|
2004-05-15 16:45:27 +00:00
|
|
|
|
goto race;
|
|
|
|
|
|
SCM_SET_CELL_WORD_0 (vloc, SCM_UNPACK (iloc) + SCM_ICDR);
|
|
|
|
|
|
return SCM_CDRLOC (*al);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
al = SCM_CDRLOC (*al);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (SCM_CAR (fl), var))
|
2004-05-15 16:45:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (SCM_CAR (*al)))
|
2004-08-20 12:26:46 +00:00
|
|
|
|
error_defined_variable (var);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (!scm_is_eq (SCM_CAR (vloc), var))
|
2004-05-15 16:45:27 +00:00
|
|
|
|
goto race;
|
|
|
|
|
|
SCM_SETCAR (vloc, iloc);
|
|
|
|
|
|
return SCM_CARLOC (*al);
|
|
|
|
|
|
}
|
|
|
|
|
|
iloc = SCM_PACK (SCM_UNPACK (iloc) + SCM_IDINC);
|
|
|
|
|
|
}
|
|
|
|
|
|
iloc = SCM_PACK ((~SCM_IDSTMSK) & (SCM_UNPACK(iloc) + SCM_IFRINC));
|
|
|
|
|
|
}
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM top_thunk, real_var;
|
|
|
|
|
|
if (SCM_NIMP (env))
|
|
|
|
|
|
{
|
|
|
|
|
|
top_thunk = SCM_CAR (env); /* env now refers to a
|
|
|
|
|
|
top level env thunk */
|
|
|
|
|
|
env = SCM_CDR (env);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
top_thunk = SCM_BOOL_F;
|
|
|
|
|
|
real_var = scm_sym2var (var, top_thunk, SCM_BOOL_F);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (real_var))
|
2004-05-15 16:45:27 +00:00
|
|
|
|
goto errout;
|
|
|
|
|
|
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_null (env) || SCM_UNBNDP (SCM_VARIABLE_REF (real_var)))
|
2004-05-15 16:45:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
errout:
|
|
|
|
|
|
if (check)
|
|
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_null (env))
|
2004-05-15 16:45:27 +00:00
|
|
|
|
error_unbound_variable (var);
|
|
|
|
|
|
else
|
|
|
|
|
|
scm_misc_error (NULL, "Damaged environment: ~S",
|
|
|
|
|
|
scm_list_1 (var));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* A variable could not be found, but we shall
|
|
|
|
|
|
not throw an error. */
|
|
|
|
|
|
static SCM undef_object = SCM_UNDEFINED;
|
|
|
|
|
|
return &undef_object;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (!scm_is_eq (SCM_CAR (vloc), var))
|
2004-05-15 16:45:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* Some other thread has changed the very cell we are working
|
|
|
|
|
|
on. In effect, it must have done our job or messed it up
|
|
|
|
|
|
completely. */
|
|
|
|
|
|
race:
|
|
|
|
|
|
var = SCM_CAR (vloc);
|
|
|
|
|
|
if (SCM_VARIABLEP (var))
|
|
|
|
|
|
return SCM_VARIABLE_LOC (var);
|
|
|
|
|
|
if (SCM_ILOCP (var))
|
|
|
|
|
|
return scm_ilookup (var, genv);
|
|
|
|
|
|
/* We can't cope with anything else than variables and ilocs. When
|
|
|
|
|
|
a special form has been memoized (i.e. `let' into `#@let') we
|
|
|
|
|
|
return NULL and expect the calling function to do the right
|
|
|
|
|
|
thing. For the evaluator, this means going back and redoing
|
|
|
|
|
|
the dispatch on the car of the form. */
|
|
|
|
|
|
return NULL;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SETCAR (vloc, real_var);
|
|
|
|
|
|
return SCM_VARIABLE_LOC (real_var);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM *
|
|
|
|
|
|
scm_lookupcar (SCM vloc, SCM genv, int check)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM *loc = scm_lookupcar1 (vloc, genv, check);
|
|
|
|
|
|
if (loc == NULL)
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
return loc;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-04-26 19:59:03 +00:00
|
|
|
|
/* During execution, look up a symbol in the top level of the given local
|
|
|
|
|
|
* environment and return the corresponding variable object. If no binding
|
|
|
|
|
|
* for the symbol can be found, an 'Unbound variable' error is signalled. */
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
lazy_memoize_variable (const SCM symbol, const SCM environment)
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM top_level = scm_env_top_level (environment);
|
|
|
|
|
|
const SCM variable = scm_sym2var (symbol, top_level, SCM_BOOL_F);
|
|
|
|
|
|
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (variable))
|
2004-04-26 19:59:03 +00:00
|
|
|
|
error_unbound_variable (symbol);
|
|
|
|
|
|
else
|
|
|
|
|
|
return variable;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-03-24 01:21:50 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_eval_car (SCM pair, SCM env)
|
|
|
|
|
|
{
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
return SCM_I_XEVALCAR (pair, env, scm_debug_mode_p);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
}
|
1997-02-04 23:30:07 +00:00
|
|
|
|
|
2003-04-23 18:27:37 +00:00
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_eval_body (SCM code, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM next;
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
again:
|
2001-07-30 18:55:50 +00:00
|
|
|
|
next = SCM_CDR (code);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (!scm_is_null (next))
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_IMP (SCM_CAR (code)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_ISYMP (SCM_CAR (code)))
|
|
|
|
|
|
{
|
2006-01-29 23:12:01 +00:00
|
|
|
|
scm_dynwind_begin (0);
|
2006-04-17 00:05:42 +00:00
|
|
|
|
scm_i_dynwind_pthread_mutex_lock (&source_mutex);
|
* __scm.h (SCM_ALLOW_INTS_ONLY): Removed.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): New macros.
(SCM_CRITICAL_SECTION_START/END): Defined here.
* eval.c: Insert SOURCE_SECTION_START / SOURCE_SECTION_END around
the three calls to scm_m_expand_body.
* gc.h: #include "libguile/pthread-threads.h";
(SCM_FREELIST_CREATE, SCM_FREELIST_LOC): New macros.
* gc.c (scm_i_freelist, scm_i_freelist2): Defined to be of type
scm_t_key;
* gc.c, gc-freelist.c, inline.h: Use SCM_FREELIST_LOC for freelist
access.
* gc-freelist.c (scm_gc_init_freelist): Create freelist keys.
* gc-freelist.c, threads.c (really_launch): Use
SCM_FREELIST_CREATE.
* gc-malloc.c (scm_realloc, scm_gc_register_collectable_memory):
* gc.c (scm_i_expensive_validation_check, scm_gc,
scm_gc_for_newcell): Put threads to sleep before doing GC-related
heap administration so that those pieces of code are executed
single-threaded. We might consider rewriting these code sections
in terms of a "call_gc_code_singly_threaded" construct instead of
calling the pair of scm_i_thread_put_to_sleep () and
scm_i_thread_wake_up (). Also, we would want to have as many of
these sections eleminated.
* init.c (scm_init_guile_1): Call scm_threads_prehistory.
* inline.h: #include "libguile/threads.h"
* pthread-threads.h: Macros now conform more closely to the
pthreads interface. Some of them now take a second argument.
* threads.c, threads.h: Many changes.
* configure.in: Temporarily replaced "copt" threads option with new
option "pthreads".
(USE_PTHREAD_THREADS): Define if pthreads configured.
2002-12-09 13:42:58 +00:00
|
|
|
|
/* check for race condition */
|
|
|
|
|
|
if (SCM_ISYMP (SCM_CAR (code)))
|
2004-01-22 22:42:29 +00:00
|
|
|
|
m_expand_body (code, env);
|
2006-01-29 23:12:01 +00:00
|
|
|
|
scm_dynwind_end ();
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
SCM_I_XEVAL (SCM_CAR (code), env, scm_debug_mode_p);
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
code = next;
|
2001-07-30 18:55:50 +00:00
|
|
|
|
next = SCM_CDR (code);
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
}
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
return SCM_I_XEVALCAR (code, env, scm_debug_mode_p);
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
/* scm_last_debug_frame contains a pointer to the last debugging information
|
|
|
|
|
|
* stack frame. It is accessed very often from the debugging evaluator, so it
|
|
|
|
|
|
* should probably not be indirectly addressed. Better to save and restore it
|
|
|
|
|
|
* from the current root at any stack swaps.
|
1996-08-20 17:09:07 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/* scm_debug_eframe_size is the number of slots available for pseudo
|
|
|
|
|
|
* stack frames at each real stack frame.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long scm_debug_eframe_size;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
int scm_debug_mode_p;
|
|
|
|
|
|
int scm_check_entry_p;
|
|
|
|
|
|
int scm_check_apply_p;
|
|
|
|
|
|
int scm_check_exit_p;
|
2007-01-19 20:05:05 +00:00
|
|
|
|
int scm_check_memoize_p;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long scm_eval_stack;
|
1998-04-12 23:34:43 +00:00
|
|
|
|
|
2001-06-14 19:50:43 +00:00
|
|
|
|
scm_t_option scm_eval_opts[] = {
|
2007-01-19 19:26:36 +00:00
|
|
|
|
{ SCM_OPTION_INTEGER, "stack", 22000, "Size of thread stacks (in machine words)." },
|
|
|
|
|
|
{ 0 }
|
1998-03-30 21:02:59 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
2001-06-14 19:50:43 +00:00
|
|
|
|
scm_t_option scm_debug_opts[] = {
|
1996-08-23 01:20:34 +00:00
|
|
|
|
{ SCM_OPTION_BOOLEAN, "cheap", 1,
|
2005-11-04 21:20:24 +00:00
|
|
|
|
"*This option is now obsolete. Setting it has no effect." },
|
1996-08-23 01:20:34 +00:00
|
|
|
|
{ SCM_OPTION_BOOLEAN, "breakpoints", 0, "*Check for breakpoints." },
|
|
|
|
|
|
{ SCM_OPTION_BOOLEAN, "trace", 0, "*Trace mode." },
|
|
|
|
|
|
{ SCM_OPTION_BOOLEAN, "procnames", 1,
|
|
|
|
|
|
"Record procedure names at definition." },
|
|
|
|
|
|
{ SCM_OPTION_BOOLEAN, "backwards", 0,
|
|
|
|
|
|
"Display backtrace in anti-chronological order." },
|
1999-09-12 02:24:10 +00:00
|
|
|
|
{ SCM_OPTION_INTEGER, "width", 79, "Maximal width of backtrace." },
|
1996-10-14 03:25:40 +00:00
|
|
|
|
{ SCM_OPTION_INTEGER, "indent", 10, "Maximal indentation in backtrace." },
|
|
|
|
|
|
{ SCM_OPTION_INTEGER, "frames", 3,
|
1996-08-23 01:20:34 +00:00
|
|
|
|
"Maximum number of tail-recursive frames in backtrace." },
|
1996-10-14 03:25:40 +00:00
|
|
|
|
{ SCM_OPTION_INTEGER, "maxdepth", 1000,
|
|
|
|
|
|
"Maximal number of stored backtrace frames." },
|
|
|
|
|
|
{ SCM_OPTION_INTEGER, "depth", 20, "Maximal length of printed backtrace." },
|
1996-11-02 20:53:32 +00:00
|
|
|
|
{ SCM_OPTION_BOOLEAN, "backtrace", 0, "Show backtrace on error." },
|
|
|
|
|
|
{ SCM_OPTION_BOOLEAN, "debug", 0, "Use the debugging evaluator." },
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
|
* private-options.h: idem.
* eval.i.c: copyright nitpicking.
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
* private-options.h: new file: contain hardcoded option
definitions.
2007-01-22 15:20:35 +00:00
|
|
|
|
{ SCM_OPTION_INTEGER, "stack", 20000, "Stack size limit (measured in words; 0 = no check)." },
|
|
|
|
|
|
{ SCM_OPTION_SCM, "show-file-name", (unsigned long)SCM_BOOL_T,
|
|
|
|
|
|
"Show file names and line numbers "
|
|
|
|
|
|
"in backtraces when not `#f'. A value of `base' "
|
|
|
|
|
|
"displays only base names, while `#t' displays full names."},
|
|
|
|
|
|
{ SCM_OPTION_BOOLEAN, "warn-deprecated", 0,
|
|
|
|
|
|
"Warn when deprecated features are used." },
|
2007-01-19 19:26:36 +00:00
|
|
|
|
{ 0 },
|
1996-08-20 17:09:07 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
2007-01-19 19:26:36 +00:00
|
|
|
|
|
2007-01-19 20:05:05 +00:00
|
|
|
|
/*
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
* this ordering is awkward and illogical, but we maintain it for
|
|
|
|
|
|
* compatibility. --hwn
|
|
|
|
|
|
*/
|
2001-06-14 19:50:43 +00:00
|
|
|
|
scm_t_option scm_evaluator_trap_table[] = {
|
1998-08-21 08:13:55 +00:00
|
|
|
|
{ SCM_OPTION_BOOLEAN, "traps", 0, "Enable evaluator traps." },
|
1996-08-23 01:20:34 +00:00
|
|
|
|
{ SCM_OPTION_BOOLEAN, "enter-frame", 0, "Trap when eval enters new frame." },
|
2007-01-19 19:26:36 +00:00
|
|
|
|
{ SCM_OPTION_BOOLEAN, "apply-frame", 0, "Trap when entering apply." },
|
|
|
|
|
|
{ SCM_OPTION_BOOLEAN, "exit-frame", 0, "Trap when exiting eval or apply." },
|
2007-01-19 20:05:05 +00:00
|
|
|
|
{ SCM_OPTION_SCM, "enter-frame-handler", (unsigned long)SCM_BOOL_F, "Handler for enter-frame traps." },
|
|
|
|
|
|
{ SCM_OPTION_SCM, "apply-frame-handler", (unsigned long)SCM_BOOL_F, "Handler for apply-frame traps." },
|
2007-01-19 19:26:36 +00:00
|
|
|
|
{ SCM_OPTION_SCM, "exit-frame-handler", (unsigned long)SCM_BOOL_F, "Handler for exit-frame traps." },
|
2007-01-19 20:05:05 +00:00
|
|
|
|
{ SCM_OPTION_BOOLEAN, "memoize-symbol", 0, "Trap when memoizing a symbol." },
|
|
|
|
|
|
{ SCM_OPTION_SCM, "memoize-symbol-handler", (unsigned long)SCM_BOOL_F, "The handler for memoization." },
|
2007-01-19 19:26:36 +00:00
|
|
|
|
{ 0 }
|
1996-08-20 17:09:07 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
2007-01-19 20:05:05 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_eval_options_interface, "eval-options-interface", 0, 1, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM setting),
|
2001-02-16 15:20:00 +00:00
|
|
|
|
"Option interface for the evaluation options. Instead of using\n"
|
|
|
|
|
|
"this procedure directly, use the procedures @code{eval-enable},\n"
|
2002-03-15 09:40:57 +00:00
|
|
|
|
"@code{eval-disable}, @code{eval-set!} and @code{eval-options}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_eval_options_interface
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM ans;
|
2005-06-06 18:49:55 +00:00
|
|
|
|
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_begin (0);
|
|
|
|
|
|
scm_dynwind_critical_section (SCM_BOOL_F);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
ans = scm_options (setting,
|
|
|
|
|
|
scm_eval_opts,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
FUNC_NAME);
|
1998-04-12 23:34:43 +00:00
|
|
|
|
scm_eval_stack = SCM_EVAL_STACK * sizeof (void *);
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_end ();
|
2005-06-06 18:49:55 +00:00
|
|
|
|
|
1998-03-30 21:02:59 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-03-30 21:02:59 +00:00
|
|
|
|
|
2003-04-23 18:27:37 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_evaluator_traps, "evaluator-traps-interface", 0, 1, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM setting),
|
2001-02-16 15:20:00 +00:00
|
|
|
|
"Option interface for the evaluator trap options.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_evaluator_traps
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM ans;
|
2007-01-19 20:05:05 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
scm_options_try (setting,
|
|
|
|
|
|
scm_evaluator_trap_table,
|
|
|
|
|
|
FUNC_NAME, 1);
|
2005-03-02 20:42:01 +00:00
|
|
|
|
SCM_CRITICAL_SECTION_START;
|
1998-03-30 21:02:59 +00:00
|
|
|
|
ans = scm_options (setting,
|
|
|
|
|
|
scm_evaluator_trap_table,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
FUNC_NAME);
|
2007-01-19 20:05:05 +00:00
|
|
|
|
|
2005-03-30 18:43:49 +00:00
|
|
|
|
/* njrev: same again. */
|
1998-03-30 21:02:59 +00:00
|
|
|
|
SCM_RESET_DEBUG_MODE;
|
2005-03-02 20:42:01 +00:00
|
|
|
|
SCM_CRITICAL_SECTION_END;
|
1998-03-30 21:02:59 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-03-30 21:02:59 +00:00
|
|
|
|
|
2003-04-23 18:27:37 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-06-26 15:46:40 +00:00
|
|
|
|
|
2003-04-23 18:27:37 +00:00
|
|
|
|
|
2001-06-26 15:46:40 +00:00
|
|
|
|
/* Simple procedure calls
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_call_0 (SCM proc)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_apply (proc, SCM_EOL, SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_call_1 (SCM proc, SCM arg1)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_apply (proc, arg1, scm_listofnull);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_call_2 (SCM proc, SCM arg1, SCM arg2)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_apply (proc, arg1, scm_cons (arg2, scm_listofnull));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_call_3 (SCM proc, SCM arg1, SCM arg2, SCM arg3)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_apply (proc, arg1, scm_cons2 (arg2, arg3, scm_listofnull));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2001-06-26 21:55:45 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_call_4 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_apply (proc, arg1, scm_cons2 (arg2, arg3,
|
|
|
|
|
|
scm_cons (arg4, scm_listofnull)));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2001-06-26 15:46:40 +00:00
|
|
|
|
/* Simple procedure applies
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_apply_0 (SCM proc, SCM args)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_apply (proc, args, SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_apply_1 (SCM proc, SCM arg1, SCM args)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_apply (proc, scm_cons (arg1, args), SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_apply_2 (SCM proc, SCM arg1, SCM arg2, SCM args)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_apply (proc, scm_cons2 (arg1, arg2, args), SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_apply_3 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM args)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_apply (proc, scm_cons (arg1, scm_cons2 (arg2, arg3, args)),
|
|
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1997-04-11 03:54:28 +00:00
|
|
|
|
/* This code processes the arguments to apply:
|
1996-10-14 00:58:30 +00:00
|
|
|
|
|
|
|
|
|
|
(apply PROC ARG1 ... ARGS)
|
|
|
|
|
|
|
1997-04-11 03:54:28 +00:00
|
|
|
|
Given a list (ARG1 ... ARGS), this function conses the ARG1
|
|
|
|
|
|
... arguments onto the front of ARGS, and returns the resulting
|
|
|
|
|
|
list. Note that ARGS is a list; thus, the argument to this
|
|
|
|
|
|
function is a list whose last element is a list.
|
|
|
|
|
|
|
|
|
|
|
|
Apply calls this function, and applies PROC to the elements of the
|
1996-10-14 00:58:30 +00:00
|
|
|
|
result. apply:nconc2last takes care of building the list of
|
|
|
|
|
|
arguments, given (ARG1 ... ARGS).
|
|
|
|
|
|
|
1997-04-11 03:54:28 +00:00
|
|
|
|
Rather than do new consing, apply:nconc2last destroys its argument.
|
|
|
|
|
|
On that topic, this code came into my care with the following
|
|
|
|
|
|
beautifully cryptic comment on that topic: "This will only screw
|
|
|
|
|
|
you if you do (scm_apply scm_apply '( ... ))" If you know what
|
|
|
|
|
|
they're referring to, send me a patch to this comment. */
|
1996-10-14 00:58:30 +00:00
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_nconc2last, "apply:nconc2last", 1, 0, 0,
|
2001-02-16 15:20:00 +00:00
|
|
|
|
(SCM lst),
|
|
|
|
|
|
"Given a list (@var{arg1} @dots{} @var{args}), this function\n"
|
|
|
|
|
|
"conses the @var{arg1} @dots{} arguments onto the front of\n"
|
|
|
|
|
|
"@var{args}, and returns the resulting list. Note that\n"
|
|
|
|
|
|
"@var{args} is a list; thus, the argument to this function is\n"
|
|
|
|
|
|
"a list whose last element is a list.\n"
|
|
|
|
|
|
"Note: Rather than do new consing, @code{apply:nconc2last}\n"
|
|
|
|
|
|
"destroys its argument, so use with care.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_nconc2last
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM *lloc;
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VALIDATE_NONEMPTYLIST (1, lst);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
lloc = &lst;
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (!scm_is_null (SCM_CDR (*lloc))) /* Perhaps should be
|
2002-01-22 23:31:39 +00:00
|
|
|
|
SCM_NULL_OR_NIL_P, but not
|
|
|
|
|
|
needed in 99.99% of cases,
|
|
|
|
|
|
and it could seriously hurt
|
|
|
|
|
|
performance. - Neil */
|
* pairs.h, eval.c, eval.h, feature.c, gc.c, list.c, load.c,
ramap.c, symbols.c: Added new selectors SCM_CARLOC and SCM_CDRLOC
for obtaining the address of a car or cdr field. Motivation:
&SCM_CXR make assumptions about the internal structure of the
SCM_CXR selectors.
* eval.h, eval.c: Added new selector SCM_GLOC_VAL_LOC.
Motivation: see SCM_CXRLOC.
* pairs.h, eval.c, gc.c, init.c, ioext.c, ports.c, ports.h,
srcprop.h, tags.h, throw.c, unif.c: Added new selectors
SCM_SETAND_CAR, SCM_SETAND_CDR, SCM_SETOR_CAR and SCM_SETOR_CDR.
Motivation: Safer use. Some other macros are defined in terms of
these operations. If these are defined using the SCM_SETCXR
(<e1>, SCM_CXR (<e1>) <op> <e2>) pattern a complex <e1> will lead
to inefficiency and an <e1> with side-effects could potentially
break. Also, these particular operations are heavily utilized in
the garbage collector. In unoptimized code there will be a
measurable speedup.
* alist.c, arbiters.c, continuations.c, debug.c, debug.h, eval.c,
eval.h, feature.c, filesys.c, fports.c, gc.c, gsubr.c, init.c,
ioext.c, kw.c, list.c, load.c, mallocs.c, numbers.c, numbers.h,
pairs.c, pairs.h, ports.c, ports.h, posix.c, procprop.c, procs.c,
procs.h, ramap.c, read.c, root.c, srcprop.c, srcprop.h,
strports.c, symbols.c, tags.h, throw.c, unif.c, variable.c,
vports.c: Cleaned up use of pairs: Don't make any special
assumptions about the internal structure of selectors and
mutators: SCM_CXR (<e1>) = <e2> --> SCM_SETCXR (<e1>, <e2>),
SCM_CXR (<e1>) &= <e2> --> SCM_SETAND_CXR (<e1>, <e2>) etc.
(Among other things, this change makes it easier to build Guile
with certain compilers which have problems with casted lvalues.)
1996-10-20 03:30:16 +00:00
|
|
|
|
lloc = SCM_CDRLOC (*lloc);
|
1999-12-12 02:36:16 +00:00
|
|
|
|
SCM_ASSERT (scm_ilength (SCM_CAR (*lloc)) >= 0, lst, SCM_ARG1, FUNC_NAME);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*lloc = SCM_CAR (*lloc);
|
|
|
|
|
|
return lst;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
|
|
|
|
|
|
/* SECTION: The rest of this file is only read once.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2002-12-01 13:09:26 +00:00
|
|
|
|
/* Trampolines
|
|
|
|
|
|
*
|
|
|
|
|
|
* Trampolines make it possible to move procedure application dispatch
|
|
|
|
|
|
* outside inner loops. The motivation was clean implementation of
|
|
|
|
|
|
* efficient replacements of R5RS primitives in SRFI-1.
|
|
|
|
|
|
*
|
|
|
|
|
|
* The semantics is clear: scm_trampoline_N returns an optimized
|
|
|
|
|
|
* version of scm_call_N (or NULL if the procedure isn't applicable
|
|
|
|
|
|
* on N args).
|
|
|
|
|
|
*
|
|
|
|
|
|
* Applying the optimization to map and for-each increased efficiency
|
|
|
|
|
|
* noticeably. For example, (map abs ls) is now 8 times faster than
|
|
|
|
|
|
* before.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2003-01-23 16:04:37 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
call_subr0_0 (SCM proc)
|
|
|
|
|
|
{
|
|
|
|
|
|
return SCM_SUBRF (proc) ();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
call_subr1o_0 (SCM proc)
|
|
|
|
|
|
{
|
|
|
|
|
|
return SCM_SUBRF (proc) (SCM_UNDEFINED);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
call_lsubr_0 (SCM proc)
|
|
|
|
|
|
{
|
|
|
|
|
|
return SCM_SUBRF (proc) (SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_i_call_closure_0 (SCM proc)
|
|
|
|
|
|
{
|
2003-04-27 10:44:08 +00:00
|
|
|
|
const SCM env = SCM_EXTEND_ENV (SCM_CLOSURE_FORMALS (proc),
|
|
|
|
|
|
SCM_EOL,
|
|
|
|
|
|
SCM_ENV (proc));
|
|
|
|
|
|
const SCM result = scm_eval_body (SCM_CLOSURE_BODY (proc), env);
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return result;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
scm_t_trampoline_0
|
|
|
|
|
|
scm_trampoline_0 (SCM proc)
|
|
|
|
|
|
{
|
2003-11-02 10:48:10 +00:00
|
|
|
|
scm_t_trampoline_0 trampoline;
|
|
|
|
|
|
|
2003-01-23 16:04:37 +00:00
|
|
|
|
if (SCM_IMP (proc))
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL;
|
2003-11-02 10:48:10 +00:00
|
|
|
|
|
2003-01-23 16:04:37 +00:00
|
|
|
|
switch (SCM_TYP7 (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
case scm_tc7_subr_0:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_subr0_0;
|
|
|
|
|
|
break;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
case scm_tc7_subr_1o:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_subr1o_0;
|
|
|
|
|
|
break;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
case scm_tc7_lsubr:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_lsubr_0;
|
|
|
|
|
|
break;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
case scm_tcs_closures:
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM formals = SCM_CLOSURE_FORMALS (proc);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_null (formals) || !scm_is_pair (formals))
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = scm_i_call_closure_0;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
else
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL;
|
2003-11-02 10:48:10 +00:00
|
|
|
|
break;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
case scm_tcs_struct:
|
|
|
|
|
|
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = scm_call_generic_0;
|
2003-05-31 07:38:04 +00:00
|
|
|
|
else if (SCM_I_OPERATORP (proc))
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = scm_call_0;
|
|
|
|
|
|
else
|
|
|
|
|
|
return NULL;
|
|
|
|
|
|
break;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
case scm_tc7_smob:
|
|
|
|
|
|
if (SCM_SMOB_APPLICABLE_P (proc))
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = SCM_SMOB_DESCRIPTOR (proc).apply_0;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
else
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL;
|
2003-11-02 10:48:10 +00:00
|
|
|
|
break;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
case scm_tc7_asubr:
|
|
|
|
|
|
case scm_tc7_rpsubr:
|
Remove "compiled closures" ("cclos") in favor of a simpler mechanism.
The idea is to introduce `gsubrs' whose arity is encoded in their type
(more precisely in the sizeof (void *) - 8 MSBs). This removes the
indirection introduced by cclos and simplifies the code.
* libguile/__scm.h (CCLO): Remove.
* libguile/debug.c (scm_procedure_source, scm_procedure_environment):
Remove references to `scm_tc7_cclo'.
* libguile/eval.c (scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Replace `scm_tc7_cclo' with `scm_tc7_gsubr'.
* libguile/eval.i.c (CEVAL): Likewise. No longer make PROC the first
argument. Directly invoke `scm_gsubr_apply ()' instead of jump to the
`evap(N+1)' label or call to `SCM_APPLY ()'.
* libguile/evalext.c (scm_self_evaluating_p): Remove reference to
`scm_tc7_cclo'.
* libguile/gc-card.c (scm_i_sweep_card, scm_i_tag_name): Likewise.
* libguile/gc-mark.c (scm_gc_mark_dependencies): Likewise.
* libguile/goops.c (scm_class_of): Likewise.
* libguile/print.c (iprin1): Likewise.
* libguile/gsubr.c (create_gsubr): Use `unsigned int's for REQ, OPT and
RST. Use `scm_tc7_gsubr' instead of `scm_makcclo ()' in the default
case.
(scm_gsubr_apply): Remove calls to `SCM_GSUBR_PROC ()'.
(scm_f_gsubr_apply): Remove.
* libguile/gsubr.h (SCM_GSUBR_TYPE): New definition.
(SCM_GSUBR_MAX): Changed to 33.
(SCM_SET_GSUBR_TYPE, SCM_GSUBR_PROC, SCM_SET_GSUBR_PROC,
scm_f_gsubr_apply): Remove.
* libguile/procprop.c (scm_i_procedure_arity): Remove reference to
`scm_tc7_cclo'; add proper handling of `scm_tc7_gsubr'.
* libguile/procs.c (scm_makcclo, scm_make_cclo): Remove.
(scm_procedure_p): Remove reference to `scm_tc7_cclo'.
(scm_thunk_p): Likewise, plus add proper `scm_tc7_gsubr' handling.
* libguile/procs.h (SCM_CCLO_LENGTH, SCM_MAKE_CCLO_TAG,
SCM_SET_CCLO_LENGTH, SCM_CCLO_BASE, SCM_SET_CCLO_BASE, SCM_CCLO_REF,
SCM_CCLO_SET, SCM_CCLO_SUBR, SCM_SET_CCLO_SUBR, scm_makcclo,
scm_make_cclo): Remove.
* libguile/stacks.c (read_frames): Remove reference to `scm_f_gsubr_apply'.
* libguile/tags.h (scm_tc7_cclo): Remove.
(scm_tc7_gsubr): New.
(scm_tcs_subrs): Add `scm_tc7_gsubr'.
2009-02-16 00:24:00 +01:00
|
|
|
|
case scm_tc7_gsubr:
|
2003-01-23 16:04:37 +00:00
|
|
|
|
case scm_tc7_pws:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = scm_call_0;
|
|
|
|
|
|
break;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
default:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
return NULL; /* not applicable on zero arguments */
|
2003-01-23 16:04:37 +00:00
|
|
|
|
}
|
2003-11-02 10:48:10 +00:00
|
|
|
|
/* We only reach this point if a valid trampoline was determined. */
|
|
|
|
|
|
|
|
|
|
|
|
/* If debugging is enabled, we want to see all calls to proc on the stack.
|
|
|
|
|
|
* Thus, we replace the trampoline shortcut with scm_call_0. */
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
if (scm_debug_mode_p)
|
2003-11-02 10:48:10 +00:00
|
|
|
|
return scm_call_0;
|
|
|
|
|
|
else
|
|
|
|
|
|
return trampoline;
|
2003-01-23 16:04:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2002-12-01 13:09:26 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
call_subr1_1 (SCM proc, SCM arg1)
|
|
|
|
|
|
{
|
|
|
|
|
|
return SCM_SUBRF (proc) (arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2002-12-19 07:49:15 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
call_subr2o_1 (SCM proc, SCM arg1)
|
|
|
|
|
|
{
|
|
|
|
|
|
return SCM_SUBRF (proc) (arg1, SCM_UNDEFINED);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2002-12-01 13:09:26 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
call_lsubr_1 (SCM proc, SCM arg1)
|
|
|
|
|
|
{
|
|
|
|
|
|
return SCM_SUBRF (proc) (scm_list_1 (arg1));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
call_dsubr_1 (SCM proc, SCM arg1)
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (arg1))
|
2002-12-01 13:09:26 +00:00
|
|
|
|
{
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
return (scm_from_double (SCM_DSUBRF (proc) ((double) SCM_I_INUM (arg1))));
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (arg1))
|
|
|
|
|
|
{
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
return (scm_from_double (SCM_DSUBRF (proc) (SCM_REAL_VALUE (arg1))));
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (arg1))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
return (scm_from_double (SCM_DSUBRF (proc) (scm_i_big2dbl (arg1))));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (arg1))
|
|
|
|
|
|
{
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
return (scm_from_double (SCM_DSUBRF (proc) (scm_i_fraction2double (arg1))));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2002-12-01 13:09:26 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (*SCM_SUBR_GENERIC (proc), arg1,
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
SCM_ARG1, scm_i_symbol_chars (SCM_SNAME (proc)));
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
call_cxr_1 (SCM proc, SCM arg1)
|
|
|
|
|
|
{
|
2004-09-22 17:38:44 +00:00
|
|
|
|
return scm_i_chase_pairs (arg1, (scm_t_bits) SCM_SUBRF (proc));
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
call_closure_1 (SCM proc, SCM arg1)
|
|
|
|
|
|
{
|
2003-04-27 10:44:08 +00:00
|
|
|
|
const SCM env = SCM_EXTEND_ENV (SCM_CLOSURE_FORMALS (proc),
|
|
|
|
|
|
scm_list_1 (arg1),
|
|
|
|
|
|
SCM_ENV (proc));
|
|
|
|
|
|
const SCM result = scm_eval_body (SCM_CLOSURE_BODY (proc), env);
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return result;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
scm_t_trampoline_1
|
|
|
|
|
|
scm_trampoline_1 (SCM proc)
|
|
|
|
|
|
{
|
2003-11-02 10:48:10 +00:00
|
|
|
|
scm_t_trampoline_1 trampoline;
|
|
|
|
|
|
|
2002-12-01 13:09:26 +00:00
|
|
|
|
if (SCM_IMP (proc))
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL;
|
2003-11-02 10:48:10 +00:00
|
|
|
|
|
2002-12-01 13:09:26 +00:00
|
|
|
|
switch (SCM_TYP7 (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
case scm_tc7_subr_1:
|
|
|
|
|
|
case scm_tc7_subr_1o:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_subr1_1;
|
|
|
|
|
|
break;
|
2002-12-19 07:49:15 +00:00
|
|
|
|
case scm_tc7_subr_2o:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_subr2o_1;
|
|
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
case scm_tc7_lsubr:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_lsubr_1;
|
|
|
|
|
|
break;
|
This set of patches separates the representation of the cxr family
of functions (car, cdr etc.) from the dsubr family of functions
(i. e. functions that take a double precision floating point
argument). Further, the algorithm for handling the cxr function
is improved.
* eval.c (SCM_CEVAL, SCM_APPLY, scm_trampoline_1), numbers.c
(scm_asinh, scm_acosh, scm_atanh, scm_truncate, scm_round, floor,
ceil, sqrt, fabs, exp, log, sin, cos, tan, asin, acos, atan, sinh,
cosh, tanh), objects.c (scm_class_of), procprop.c
(scm_i_procedure_arity), ramap.c (scm_array_map_x), tags.h
(scm_tc7_dsubr, scm_tcs_subrs): Introduce scm_tc7_dsubr as new
typecode for the dsubr family of functions.
* ramap.c (ramap_cxr, ramap_dsubr): Renamed ramap_cxr to
ramap_dsubr.
* eval.c (SCM_CEVAL, SCM_APPLY, call_cxr_1), pairs.c
(scm_init_pairs): Make use of the (now usable) second cell element
of a scm_tc7_cxr function to implement the cxr family of functions
more efficiently.
2003-06-01 13:58:42 +00:00
|
|
|
|
case scm_tc7_dsubr:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_dsubr_1;
|
|
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
case scm_tc7_cxr:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_cxr_1;
|
|
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
case scm_tcs_closures:
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM formals = SCM_CLOSURE_FORMALS (proc);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_null (formals)
|
|
|
|
|
|
&& (!scm_is_pair (formals) || !scm_is_pair (SCM_CDR (formals))))
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_closure_1;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
else
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL;
|
2003-11-02 10:48:10 +00:00
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
case scm_tcs_struct:
|
|
|
|
|
|
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = scm_call_generic_1;
|
2003-05-31 07:38:04 +00:00
|
|
|
|
else if (SCM_I_OPERATORP (proc))
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = scm_call_1;
|
|
|
|
|
|
else
|
|
|
|
|
|
return NULL;
|
|
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
case scm_tc7_smob:
|
|
|
|
|
|
if (SCM_SMOB_APPLICABLE_P (proc))
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = SCM_SMOB_DESCRIPTOR (proc).apply_1;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
else
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL;
|
2003-11-02 10:48:10 +00:00
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
case scm_tc7_asubr:
|
|
|
|
|
|
case scm_tc7_rpsubr:
|
Remove "compiled closures" ("cclos") in favor of a simpler mechanism.
The idea is to introduce `gsubrs' whose arity is encoded in their type
(more precisely in the sizeof (void *) - 8 MSBs). This removes the
indirection introduced by cclos and simplifies the code.
* libguile/__scm.h (CCLO): Remove.
* libguile/debug.c (scm_procedure_source, scm_procedure_environment):
Remove references to `scm_tc7_cclo'.
* libguile/eval.c (scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Replace `scm_tc7_cclo' with `scm_tc7_gsubr'.
* libguile/eval.i.c (CEVAL): Likewise. No longer make PROC the first
argument. Directly invoke `scm_gsubr_apply ()' instead of jump to the
`evap(N+1)' label or call to `SCM_APPLY ()'.
* libguile/evalext.c (scm_self_evaluating_p): Remove reference to
`scm_tc7_cclo'.
* libguile/gc-card.c (scm_i_sweep_card, scm_i_tag_name): Likewise.
* libguile/gc-mark.c (scm_gc_mark_dependencies): Likewise.
* libguile/goops.c (scm_class_of): Likewise.
* libguile/print.c (iprin1): Likewise.
* libguile/gsubr.c (create_gsubr): Use `unsigned int's for REQ, OPT and
RST. Use `scm_tc7_gsubr' instead of `scm_makcclo ()' in the default
case.
(scm_gsubr_apply): Remove calls to `SCM_GSUBR_PROC ()'.
(scm_f_gsubr_apply): Remove.
* libguile/gsubr.h (SCM_GSUBR_TYPE): New definition.
(SCM_GSUBR_MAX): Changed to 33.
(SCM_SET_GSUBR_TYPE, SCM_GSUBR_PROC, SCM_SET_GSUBR_PROC,
scm_f_gsubr_apply): Remove.
* libguile/procprop.c (scm_i_procedure_arity): Remove reference to
`scm_tc7_cclo'; add proper handling of `scm_tc7_gsubr'.
* libguile/procs.c (scm_makcclo, scm_make_cclo): Remove.
(scm_procedure_p): Remove reference to `scm_tc7_cclo'.
(scm_thunk_p): Likewise, plus add proper `scm_tc7_gsubr' handling.
* libguile/procs.h (SCM_CCLO_LENGTH, SCM_MAKE_CCLO_TAG,
SCM_SET_CCLO_LENGTH, SCM_CCLO_BASE, SCM_SET_CCLO_BASE, SCM_CCLO_REF,
SCM_CCLO_SET, SCM_CCLO_SUBR, SCM_SET_CCLO_SUBR, scm_makcclo,
scm_make_cclo): Remove.
* libguile/stacks.c (read_frames): Remove reference to `scm_f_gsubr_apply'.
* libguile/tags.h (scm_tc7_cclo): Remove.
(scm_tc7_gsubr): New.
(scm_tcs_subrs): Add `scm_tc7_gsubr'.
2009-02-16 00:24:00 +01:00
|
|
|
|
case scm_tc7_gsubr:
|
2002-12-01 13:09:26 +00:00
|
|
|
|
case scm_tc7_pws:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = scm_call_1;
|
|
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
default:
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL; /* not applicable on one arg */
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
2003-11-02 10:48:10 +00:00
|
|
|
|
/* We only reach this point if a valid trampoline was determined. */
|
|
|
|
|
|
|
|
|
|
|
|
/* If debugging is enabled, we want to see all calls to proc on the stack.
|
|
|
|
|
|
* Thus, we replace the trampoline shortcut with scm_call_1. */
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
if (scm_debug_mode_p)
|
2003-11-02 10:48:10 +00:00
|
|
|
|
return scm_call_1;
|
|
|
|
|
|
else
|
|
|
|
|
|
return trampoline;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
call_subr2_2 (SCM proc, SCM arg1, SCM arg2)
|
|
|
|
|
|
{
|
|
|
|
|
|
return SCM_SUBRF (proc) (arg1, arg2);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2002-12-19 07:49:15 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
call_lsubr2_2 (SCM proc, SCM arg1, SCM arg2)
|
|
|
|
|
|
{
|
|
|
|
|
|
return SCM_SUBRF (proc) (arg1, arg2, SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2002-12-01 13:09:26 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
call_lsubr_2 (SCM proc, SCM arg1, SCM arg2)
|
|
|
|
|
|
{
|
|
|
|
|
|
return SCM_SUBRF (proc) (scm_list_2 (arg1, arg2));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
call_closure_2 (SCM proc, SCM arg1, SCM arg2)
|
|
|
|
|
|
{
|
2003-04-27 10:44:08 +00:00
|
|
|
|
const SCM env = SCM_EXTEND_ENV (SCM_CLOSURE_FORMALS (proc),
|
|
|
|
|
|
scm_list_2 (arg1, arg2),
|
|
|
|
|
|
SCM_ENV (proc));
|
|
|
|
|
|
const SCM result = scm_eval_body (SCM_CLOSURE_BODY (proc), env);
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return result;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
scm_t_trampoline_2
|
|
|
|
|
|
scm_trampoline_2 (SCM proc)
|
|
|
|
|
|
{
|
2003-11-02 10:48:10 +00:00
|
|
|
|
scm_t_trampoline_2 trampoline;
|
|
|
|
|
|
|
2002-12-01 13:09:26 +00:00
|
|
|
|
if (SCM_IMP (proc))
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL;
|
2003-11-02 10:48:10 +00:00
|
|
|
|
|
2002-12-01 13:09:26 +00:00
|
|
|
|
switch (SCM_TYP7 (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
case scm_tc7_subr_2:
|
|
|
|
|
|
case scm_tc7_subr_2o:
|
|
|
|
|
|
case scm_tc7_rpsubr:
|
|
|
|
|
|
case scm_tc7_asubr:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_subr2_2;
|
|
|
|
|
|
break;
|
2002-12-19 07:49:15 +00:00
|
|
|
|
case scm_tc7_lsubr_2:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_lsubr2_2;
|
|
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
case scm_tc7_lsubr:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_lsubr_2;
|
|
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
case scm_tcs_closures:
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM formals = SCM_CLOSURE_FORMALS (proc);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (!scm_is_null (formals)
|
|
|
|
|
|
&& (!scm_is_pair (formals)
|
|
|
|
|
|
|| (!scm_is_null (SCM_CDR (formals))
|
|
|
|
|
|
&& (!scm_is_pair (SCM_CDR (formals))
|
|
|
|
|
|
|| !scm_is_pair (SCM_CDDR (formals))))))
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = call_closure_2;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
else
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL;
|
2003-11-02 10:48:10 +00:00
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
case scm_tcs_struct:
|
|
|
|
|
|
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = scm_call_generic_2;
|
2003-05-31 07:38:04 +00:00
|
|
|
|
else if (SCM_I_OPERATORP (proc))
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = scm_call_2;
|
|
|
|
|
|
else
|
|
|
|
|
|
return NULL;
|
|
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
case scm_tc7_smob:
|
|
|
|
|
|
if (SCM_SMOB_APPLICABLE_P (proc))
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = SCM_SMOB_DESCRIPTOR (proc).apply_2;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
else
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL;
|
2003-11-02 10:48:10 +00:00
|
|
|
|
break;
|
Remove "compiled closures" ("cclos") in favor of a simpler mechanism.
The idea is to introduce `gsubrs' whose arity is encoded in their type
(more precisely in the sizeof (void *) - 8 MSBs). This removes the
indirection introduced by cclos and simplifies the code.
* libguile/__scm.h (CCLO): Remove.
* libguile/debug.c (scm_procedure_source, scm_procedure_environment):
Remove references to `scm_tc7_cclo'.
* libguile/eval.c (scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Replace `scm_tc7_cclo' with `scm_tc7_gsubr'.
* libguile/eval.i.c (CEVAL): Likewise. No longer make PROC the first
argument. Directly invoke `scm_gsubr_apply ()' instead of jump to the
`evap(N+1)' label or call to `SCM_APPLY ()'.
* libguile/evalext.c (scm_self_evaluating_p): Remove reference to
`scm_tc7_cclo'.
* libguile/gc-card.c (scm_i_sweep_card, scm_i_tag_name): Likewise.
* libguile/gc-mark.c (scm_gc_mark_dependencies): Likewise.
* libguile/goops.c (scm_class_of): Likewise.
* libguile/print.c (iprin1): Likewise.
* libguile/gsubr.c (create_gsubr): Use `unsigned int's for REQ, OPT and
RST. Use `scm_tc7_gsubr' instead of `scm_makcclo ()' in the default
case.
(scm_gsubr_apply): Remove calls to `SCM_GSUBR_PROC ()'.
(scm_f_gsubr_apply): Remove.
* libguile/gsubr.h (SCM_GSUBR_TYPE): New definition.
(SCM_GSUBR_MAX): Changed to 33.
(SCM_SET_GSUBR_TYPE, SCM_GSUBR_PROC, SCM_SET_GSUBR_PROC,
scm_f_gsubr_apply): Remove.
* libguile/procprop.c (scm_i_procedure_arity): Remove reference to
`scm_tc7_cclo'; add proper handling of `scm_tc7_gsubr'.
* libguile/procs.c (scm_makcclo, scm_make_cclo): Remove.
(scm_procedure_p): Remove reference to `scm_tc7_cclo'.
(scm_thunk_p): Likewise, plus add proper `scm_tc7_gsubr' handling.
* libguile/procs.h (SCM_CCLO_LENGTH, SCM_MAKE_CCLO_TAG,
SCM_SET_CCLO_LENGTH, SCM_CCLO_BASE, SCM_SET_CCLO_BASE, SCM_CCLO_REF,
SCM_CCLO_SET, SCM_CCLO_SUBR, SCM_SET_CCLO_SUBR, scm_makcclo,
scm_make_cclo): Remove.
* libguile/stacks.c (read_frames): Remove reference to `scm_f_gsubr_apply'.
* libguile/tags.h (scm_tc7_cclo): Remove.
(scm_tc7_gsubr): New.
(scm_tcs_subrs): Add `scm_tc7_gsubr'.
2009-02-16 00:24:00 +01:00
|
|
|
|
case scm_tc7_gsubr:
|
2002-12-01 13:09:26 +00:00
|
|
|
|
case scm_tc7_pws:
|
2003-11-02 10:48:10 +00:00
|
|
|
|
trampoline = scm_call_2;
|
|
|
|
|
|
break;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
default:
|
2003-04-23 18:27:37 +00:00
|
|
|
|
return NULL; /* not applicable on two args */
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
2003-11-02 10:48:10 +00:00
|
|
|
|
/* We only reach this point if a valid trampoline was determined. */
|
|
|
|
|
|
|
|
|
|
|
|
/* If debugging is enabled, we want to see all calls to proc on the stack.
|
|
|
|
|
|
* Thus, we replace the trampoline shortcut with scm_call_2. */
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
if (scm_debug_mode_p)
|
2003-11-02 10:48:10 +00:00
|
|
|
|
return scm_call_2;
|
|
|
|
|
|
else
|
|
|
|
|
|
return trampoline;
|
2002-12-01 13:09:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1999-06-19 17:25:25 +00:00
|
|
|
|
/* Typechecking for multi-argument MAP and FOR-EACH.
|
|
|
|
|
|
|
1999-09-07 09:40:50 +00:00
|
|
|
|
Verify that each element of the vector ARGV, except for the first,
|
1999-06-19 17:25:25 +00:00
|
|
|
|
is a proper list whose length is LEN. Attribute errors to WHO,
|
1999-09-07 09:40:50 +00:00
|
|
|
|
and claim that the i'th element of ARGV is WHO's i+2'th argument. */
|
1999-06-19 17:25:25 +00:00
|
|
|
|
static inline void
|
1999-09-07 09:40:50 +00:00
|
|
|
|
check_map_args (SCM argv,
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long len,
|
1999-09-07 09:40:50 +00:00
|
|
|
|
SCM gf,
|
|
|
|
|
|
SCM proc,
|
|
|
|
|
|
SCM args,
|
|
|
|
|
|
const char *who)
|
1999-06-19 17:25:25 +00:00
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i;
|
1999-06-19 17:25:25 +00:00
|
|
|
|
|
2005-01-02 20:49:04 +00:00
|
|
|
|
for (i = SCM_SIMPLE_VECTOR_LENGTH (argv) - 1; i >= 1; i--)
|
1999-06-19 17:25:25 +00:00
|
|
|
|
{
|
2005-01-02 20:49:04 +00:00
|
|
|
|
SCM elt = SCM_SIMPLE_VECTOR_REF (argv, i);
|
|
|
|
|
|
long elt_len = scm_ilength (elt);
|
1999-06-19 17:25:25 +00:00
|
|
|
|
|
|
|
|
|
|
if (elt_len < 0)
|
1999-09-07 09:40:50 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (gf)
|
|
|
|
|
|
scm_apply_generic (gf, scm_cons (proc, args));
|
|
|
|
|
|
else
|
2005-01-02 20:49:04 +00:00
|
|
|
|
scm_wrong_type_arg (who, i + 2, elt);
|
1999-09-07 09:40:50 +00:00
|
|
|
|
}
|
1999-06-19 17:25:25 +00:00
|
|
|
|
|
|
|
|
|
|
if (elt_len != len)
|
2005-01-02 20:49:04 +00:00
|
|
|
|
scm_out_of_range_pos (who, elt, scm_from_long (i + 2));
|
1999-06-19 17:25:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-07 09:40:50 +00:00
|
|
|
|
SCM_GPROC (s_map, "map", 2, 0, 1, scm_map, g_map);
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
1998-11-09 14:13:31 +00:00
|
|
|
|
/* Note: Currently, scm_map applies PROC to the argument list(s)
|
|
|
|
|
|
sequentially, starting with the first element(s). This is used in
|
2000-06-14 22:02:13 +00:00
|
|
|
|
evalext.c where the Scheme procedure `map-in-order', which guarantees
|
1998-11-09 14:13:31 +00:00
|
|
|
|
sequential behaviour, is implemented using scm_map. If the
|
2000-06-14 22:02:13 +00:00
|
|
|
|
behaviour changes, we need to update `map-in-order'.
|
1998-11-09 14:13:31 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_map (SCM proc, SCM arg1, SCM args)
|
2000-05-18 08:47:52 +00:00
|
|
|
|
#define FUNC_NAME s_map
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i, len;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM res = SCM_EOL;
|
|
|
|
|
|
SCM *pres = &res;
|
|
|
|
|
|
|
1999-06-19 17:25:25 +00:00
|
|
|
|
len = scm_ilength (arg1);
|
1999-09-07 09:40:50 +00:00
|
|
|
|
SCM_GASSERTn (len >= 0,
|
|
|
|
|
|
g_map, scm_cons2 (proc, arg1, args), SCM_ARG2, s_map);
|
2000-05-18 08:47:52 +00:00
|
|
|
|
SCM_VALIDATE_REST_ARGUMENT (args);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_null (args))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2002-12-01 13:09:26 +00:00
|
|
|
|
scm_t_trampoline_1 call = scm_trampoline_1 (proc);
|
|
|
|
|
|
SCM_GASSERT2 (call, g_map, proc, arg1, SCM_ARG1, s_map);
|
|
|
|
|
|
while (SCM_NIMP (arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
*pres = scm_list_1 (call (proc, SCM_CAR (arg1)));
|
|
|
|
|
|
pres = SCM_CDRLOC (*pres);
|
|
|
|
|
|
arg1 = SCM_CDR (arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_null (SCM_CDR (args)))
|
2002-12-01 13:09:26 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM arg2 = SCM_CAR (args);
|
|
|
|
|
|
int len2 = scm_ilength (arg2);
|
|
|
|
|
|
scm_t_trampoline_2 call = scm_trampoline_2 (proc);
|
|
|
|
|
|
SCM_GASSERTn (call,
|
|
|
|
|
|
g_map, scm_cons2 (proc, arg1, args), SCM_ARG1, s_map);
|
|
|
|
|
|
SCM_GASSERTn (len2 >= 0,
|
|
|
|
|
|
g_map, scm_cons2 (proc, arg1, args), SCM_ARG3, s_map);
|
|
|
|
|
|
if (len2 != len)
|
|
|
|
|
|
SCM_OUT_OF_RANGE (3, arg2);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
while (SCM_NIMP (arg1))
|
|
|
|
|
|
{
|
2002-12-01 13:09:26 +00:00
|
|
|
|
*pres = scm_list_1 (call (proc, SCM_CAR (arg1), SCM_CAR (arg2)));
|
* pairs.h, eval.c, eval.h, feature.c, gc.c, list.c, load.c,
ramap.c, symbols.c: Added new selectors SCM_CARLOC and SCM_CDRLOC
for obtaining the address of a car or cdr field. Motivation:
&SCM_CXR make assumptions about the internal structure of the
SCM_CXR selectors.
* eval.h, eval.c: Added new selector SCM_GLOC_VAL_LOC.
Motivation: see SCM_CXRLOC.
* pairs.h, eval.c, gc.c, init.c, ioext.c, ports.c, ports.h,
srcprop.h, tags.h, throw.c, unif.c: Added new selectors
SCM_SETAND_CAR, SCM_SETAND_CDR, SCM_SETOR_CAR and SCM_SETOR_CDR.
Motivation: Safer use. Some other macros are defined in terms of
these operations. If these are defined using the SCM_SETCXR
(<e1>, SCM_CXR (<e1>) <op> <e2>) pattern a complex <e1> will lead
to inefficiency and an <e1> with side-effects could potentially
break. Also, these particular operations are heavily utilized in
the garbage collector. In unoptimized code there will be a
measurable speedup.
* alist.c, arbiters.c, continuations.c, debug.c, debug.h, eval.c,
eval.h, feature.c, filesys.c, fports.c, gc.c, gsubr.c, init.c,
ioext.c, kw.c, list.c, load.c, mallocs.c, numbers.c, numbers.h,
pairs.c, pairs.h, ports.c, ports.h, posix.c, procprop.c, procs.c,
procs.h, ramap.c, read.c, root.c, srcprop.c, srcprop.h,
strports.c, symbols.c, tags.h, throw.c, unif.c, variable.c,
vports.c: Cleaned up use of pairs: Don't make any special
assumptions about the internal structure of selectors and
mutators: SCM_CXR (<e1>) = <e2> --> SCM_SETCXR (<e1>, <e2>),
SCM_CXR (<e1>) &= <e2> --> SCM_SETAND_CXR (<e1>, <e2>) etc.
(Among other things, this change makes it easier to build Guile
with certain compilers which have problems with casted lvalues.)
1996-10-20 03:30:16 +00:00
|
|
|
|
pres = SCM_CDRLOC (*pres);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
arg1 = SCM_CDR (arg1);
|
2002-12-01 13:09:26 +00:00
|
|
|
|
arg2 = SCM_CDR (arg2);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
2003-04-21 01:07:09 +00:00
|
|
|
|
arg1 = scm_cons (arg1, args);
|
|
|
|
|
|
args = scm_vector (arg1);
|
1999-09-07 09:40:50 +00:00
|
|
|
|
check_map_args (args, len, g_map, proc, arg1, s_map);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
|
|
|
|
|
arg1 = SCM_EOL;
|
2005-01-02 20:49:04 +00:00
|
|
|
|
for (i = SCM_SIMPLE_VECTOR_LENGTH (args) - 1; i >= 0; i--)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2005-01-02 20:49:04 +00:00
|
|
|
|
SCM elt = SCM_SIMPLE_VECTOR_REF (args, i);
|
|
|
|
|
|
if (SCM_IMP (elt))
|
1999-06-19 17:25:25 +00:00
|
|
|
|
return res;
|
2005-01-02 20:49:04 +00:00
|
|
|
|
arg1 = scm_cons (SCM_CAR (elt), arg1);
|
|
|
|
|
|
SCM_SIMPLE_VECTOR_SET (args, i, SCM_CDR (elt));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
* eval.c (scm_lookupcar, scm_m_letstar, scm_m_do, iqq,
scm_m_define, scm_m_letrec1, scm_m_let, scm_m_expand_body,
scm_macroexp, unmemocopy, scm_eval_args, scm_deval_args,
SCM_CEVAL, scm_map, scm_init_eval): When building lists, prefer
scm_list_<n> over scm_cons[2]?.
(scm_unmemocar, scm_m_cond, scm_m_letstar, scm_m_letrec1,
scm_m_let, scm_m_atbind, unmemocopy, SCM_CEVAL, SCM_APPLY): Use
SCM_C[AD][AD]R instead of explicit form.
(scm_m_set_x, scm_m_cond, scm_m_letstar, scm_m_do): Reordered
comparison parameters.
(scm_m_case, scm_m_cond, scm_m_letstar, scm_m_do, SCM_CEVAL): Use
!SCM_NULLP instead of SCM_NIMP.
(scm_m_case): Don't copy the form. Renamed proc to clause and
minimized its scope. Renamed x to clauses. Removed side
effecting operation from macro call.
(scm_m_cond): Don't copy the form. Renamed arg1 to clause and
minimized its scope. Renamed x to clauses. Minimized the scope
of variable 'len'. Make sure the else clause is treated specially
even in case of '=>' occurences. Don't change the else to #t in
order to be able to distinguish this case in the evaluator. Leave
type checking of the recipient to the evaluator.
(scm_c_improper_memq): Made the comment somewhat clearer.
(scm_m_lambda): Renamed proc to formals. Removed unnecessary
test for SCM_IM_LET at the place of the formal parameters.
Simplified the formal parameter checking.
(scm_m_letstar): Added Comment. Renamed proc to bindings.
Renamed arg1 to binding and minimized its scope. Eliminated
unnecessary consing.
(scm_m_do): Renamed proc to bindings. Minimized the scope of
variable 'len'.
(build_binding_list): New static function.
(unmemocopy): Don't use SCM_TYP7 on pairs (it's unclean).
Further, split up the 'letrec' unmemoizing code to the
corresponding parts for 'do', 'let' and 'letrec', adding comments
to each form. Cleanup the handling of the do form (This removes
some *real* code :-).
(SCM_CEVAL): Removed side effecting operation from macro call.
Handle the 'else clause of the 'cond form specially - the symbol
'else is not replaced with #t any more.
2001-10-18 21:38:04 +00:00
|
|
|
|
*pres = scm_list_1 (scm_apply (proc, arg1, SCM_EOL));
|
* pairs.h, eval.c, eval.h, feature.c, gc.c, list.c, load.c,
ramap.c, symbols.c: Added new selectors SCM_CARLOC and SCM_CDRLOC
for obtaining the address of a car or cdr field. Motivation:
&SCM_CXR make assumptions about the internal structure of the
SCM_CXR selectors.
* eval.h, eval.c: Added new selector SCM_GLOC_VAL_LOC.
Motivation: see SCM_CXRLOC.
* pairs.h, eval.c, gc.c, init.c, ioext.c, ports.c, ports.h,
srcprop.h, tags.h, throw.c, unif.c: Added new selectors
SCM_SETAND_CAR, SCM_SETAND_CDR, SCM_SETOR_CAR and SCM_SETOR_CDR.
Motivation: Safer use. Some other macros are defined in terms of
these operations. If these are defined using the SCM_SETCXR
(<e1>, SCM_CXR (<e1>) <op> <e2>) pattern a complex <e1> will lead
to inefficiency and an <e1> with side-effects could potentially
break. Also, these particular operations are heavily utilized in
the garbage collector. In unoptimized code there will be a
measurable speedup.
* alist.c, arbiters.c, continuations.c, debug.c, debug.h, eval.c,
eval.h, feature.c, filesys.c, fports.c, gc.c, gsubr.c, init.c,
ioext.c, kw.c, list.c, load.c, mallocs.c, numbers.c, numbers.h,
pairs.c, pairs.h, ports.c, ports.h, posix.c, procprop.c, procs.c,
procs.h, ramap.c, read.c, root.c, srcprop.c, srcprop.h,
strports.c, symbols.c, tags.h, throw.c, unif.c, variable.c,
vports.c: Cleaned up use of pairs: Don't make any special
assumptions about the internal structure of selectors and
mutators: SCM_CXR (<e1>) = <e2> --> SCM_SETCXR (<e1>, <e2>),
SCM_CXR (<e1>) &= <e2> --> SCM_SETAND_CXR (<e1>, <e2>) etc.
(Among other things, this change makes it easier to build Guile
with certain compilers which have problems with casted lvalues.)
1996-10-20 03:30:16 +00:00
|
|
|
|
pres = SCM_CDRLOC (*pres);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2000-05-18 08:47:52 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
1999-09-07 09:40:50 +00:00
|
|
|
|
SCM_GPROC (s_for_each, "for-each", 2, 0, 1, scm_for_each, g_for_each);
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_for_each (SCM proc, SCM arg1, SCM args)
|
2000-05-18 08:47:52 +00:00
|
|
|
|
#define FUNC_NAME s_for_each
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i, len;
|
1999-06-19 17:25:25 +00:00
|
|
|
|
len = scm_ilength (arg1);
|
1999-09-07 09:40:50 +00:00
|
|
|
|
SCM_GASSERTn (len >= 0, g_for_each, scm_cons2 (proc, arg1, args),
|
|
|
|
|
|
SCM_ARG2, s_for_each);
|
2000-05-18 08:47:52 +00:00
|
|
|
|
SCM_VALIDATE_REST_ARGUMENT (args);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_null (args))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2002-12-01 13:09:26 +00:00
|
|
|
|
scm_t_trampoline_1 call = scm_trampoline_1 (proc);
|
|
|
|
|
|
SCM_GASSERT2 (call, g_for_each, proc, arg1, SCM_ARG1, s_for_each);
|
|
|
|
|
|
while (SCM_NIMP (arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
call (proc, SCM_CAR (arg1));
|
|
|
|
|
|
arg1 = SCM_CDR (arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_null (SCM_CDR (args)))
|
2002-12-01 13:09:26 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM arg2 = SCM_CAR (args);
|
|
|
|
|
|
int len2 = scm_ilength (arg2);
|
|
|
|
|
|
scm_t_trampoline_2 call = scm_trampoline_2 (proc);
|
|
|
|
|
|
SCM_GASSERTn (call, g_for_each,
|
|
|
|
|
|
scm_cons2 (proc, arg1, args), SCM_ARG1, s_for_each);
|
|
|
|
|
|
SCM_GASSERTn (len2 >= 0, g_for_each,
|
|
|
|
|
|
scm_cons2 (proc, arg1, args), SCM_ARG3, s_for_each);
|
|
|
|
|
|
if (len2 != len)
|
|
|
|
|
|
SCM_OUT_OF_RANGE (3, arg2);
|
2002-01-22 23:31:39 +00:00
|
|
|
|
while (SCM_NIMP (arg1))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2002-12-01 13:09:26 +00:00
|
|
|
|
call (proc, SCM_CAR (arg1), SCM_CAR (arg2));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
arg1 = SCM_CDR (arg1);
|
2002-12-01 13:09:26 +00:00
|
|
|
|
arg2 = SCM_CDR (arg2);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2003-04-21 01:07:09 +00:00
|
|
|
|
arg1 = scm_cons (arg1, args);
|
|
|
|
|
|
args = scm_vector (arg1);
|
1999-09-07 09:40:50 +00:00
|
|
|
|
check_map_args (args, len, g_for_each, proc, arg1, s_for_each);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
|
|
|
|
|
arg1 = SCM_EOL;
|
2005-01-02 20:49:04 +00:00
|
|
|
|
for (i = SCM_SIMPLE_VECTOR_LENGTH (args) - 1; i >= 0; i--)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2005-01-02 20:49:04 +00:00
|
|
|
|
SCM elt = SCM_SIMPLE_VECTOR_REF (args, i);
|
|
|
|
|
|
if (SCM_IMP (elt))
|
2002-01-22 23:31:39 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
2005-01-02 20:49:04 +00:00
|
|
|
|
arg1 = scm_cons (SCM_CAR (elt), arg1);
|
|
|
|
|
|
SCM_SIMPLE_VECTOR_SET (args, i, SCM_CDR (elt));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
scm_apply (proc, arg1, SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2000-05-18 08:47:52 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_closure (SCM code, SCM env)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-11-25 15:21:07 +00:00
|
|
|
|
SCM z;
|
|
|
|
|
|
SCM closcar = scm_cons (code, SCM_EOL);
|
Changes in doc/ref:
* api.txt, data-rep.texi: Renamed the struct scm_cell to
scm_t_cell.
* data-rep.texi: Renamed scm_alloc_cell to scm_cell and
scm_alloc_double_cell to scm_double_cell.
Changes in libguile:
* gc.c (SCM_HEAP_SEG_SIZE, CELL_UP, CELL_DN, NEXT_DATA_CELL,
init_heap_seg, alloc_some_heap), gc.h (struct scm_cell, struct
scm_t_cell, SCM_CELLPTR, SCM_GC_CARD_SIZE,
SCM_GC_IN_CARD_HEADERP), tags.h (SCM_CELLP): Renamed the struct
scm_cell and all its uses to scm_t_cell in accordance to Guile's
naming scheme for types.
* alist.c (scm_acons), convert.i.c (CTYPES2UVECT,
CTYPES2UVECT_OPTIONAL), coop-threads.c (scm_call_with_new_thread,
scm_spawn_thread), debug.c (scm_make_debugobj), environments.c
(scm_make_environment), eval.c (scm_closure), fports.c
(scm_fdes_to_port), gc.c (scm_deprecated_newcell,
scm_deprecated_newcell2), inline.h (scm_alloc_cell, scm_cell),
list.c (SCM_I_CONS), numbers.c (scm_i_mkbig), pairs.c (scm_cons),
ports.c (scm_void_port), procs.c (scm_c_make_subr, scm_makcclo),
smob.c (scm_make_smob), smob.h (SCM_NEWSMOB), strings.c
(scm_take_str, scm_allocate_string), strports.c (scm_mkstrport),
unif.c (scm_make_uve), variable.c (make_variable), vectors.c
(scm_c_make_vector), vports.c (scm_make_soft_port): Renamed
scm_alloc_cell to scm_cell.
* environments.c (core_environments_observe), gc.c
(scm_deprecated_newcell2), goops.c (wrap_init, scm_wrap_object),
inline.h (scm_alloc_double_cell, scm_double_cell), num2float.i.c
(FLOAT2NUM), numbers.c (scm_make_real), procs.c
(scm_make_procedure_with_setter), smob.h (SCM_NEWSMOB2,
SCM_NEWSMOB3), struct.c (scm_make_struct, scm_make_vtable_vtable),
symbols.c (scm_mem2symbol, scm_mem2uninterned_symbol), weaks.c
(allocate_weak_vector): Renamed scm_alloc_double_cell to
scm_double_cell.
2002-03-01 00:19:20 +00:00
|
|
|
|
z = scm_cell (SCM_UNPACK (closcar) + scm_tc3_closure, (scm_t_bits) env);
|
2001-11-25 15:21:07 +00:00
|
|
|
|
scm_remember_upto_here (closcar);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2001-06-14 19:50:43 +00:00
|
|
|
|
scm_t_bits scm_tc16_promise;
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_makprom (SCM code)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
SCM_RETURN_NEWSMOB2 (scm_tc16_promise,
|
|
|
|
|
|
SCM_UNPACK (code),
|
2005-03-02 20:42:01 +00:00
|
|
|
|
scm_make_recursive_mutex ());
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
promise_mark (SCM promise)
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_gc_mark (SCM_PROMISE_MUTEX (promise));
|
|
|
|
|
|
return SCM_PROMISE_DATA (promise);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
static size_t
|
|
|
|
|
|
promise_free (SCM promise)
|
|
|
|
|
|
{
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
static int
|
2000-12-08 17:32:56 +00:00
|
|
|
|
promise_print (SCM exp, SCM port, scm_print_state *pstate)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* eval.c, numbers.h, unif.h, smob.h, srcprop.c: Added #include
"print.h"
* arbiters.c (prinarb),
async.c (print_async),
debug.c (prindebugobj, prinmemoized),
eval.c (prinprom, prinmacro),
filesys.c (scm_fd_print, scm_dir_print),
kw.c (print_kw),
mallocs.c (prinmalloc),
numbers.c, numbers.h (scm_floprint, scm_bigprint),
smob.h (scm_smobfuns),
srcprop.c (prinsrcprops),
throw.c (prinjb),
unif.c, unif.h (scm_raprin1, rapr1),
variable.c (prin_var): Changed argument `int writing' to
`scm_print_state *pstate'.
1996-09-22 22:41:10 +00:00
|
|
|
|
int writingp = SCM_WRITINGP (pstate);
|
* Makefile.in: Rebuilt.
* Makefile.am (libguile_la_SOURCES): Removed extchrs.c,
mbstrings.c.
(modinclude_HEADERS): Removed extchrs.h, mbstrings.h.
* unif.c (scm_vector_set_length_x): Don't handle multibyte
strings.
* tag.c (scm_utag_mb_string, scm_utag_mb_substring): Removed.
(scm_tag): Don't handle multibyte strings.
* read.c: Don't include mbstrings.h.
(scm_lreadr): Don't handle multibyte ports.
* kw.c: Don't include mbstrings.h.
* init.c: Don't include mbstrings.h.
(scm_boot_guile_1): Don't init mbstrings module.
* hash.c (scm_hasher): Don't handle mbstrings.
* gscm.c (gscm_run_scm): Don't init mbstrings module.
* gc.c (scm_gc_mark): Don't handle mbstrings.
(scm_gc_sweep): Likewise.
* eval.c (SCM_CEVAL): Don't handle mbstrings.
* eq.c (scm_equal_p): Use SCM_TYP7S, not SCM_TYP7SD.
* tags.h (SCM_TYP7SD): Removed.
(SCM_TYP7D): Removed.
(scm_tc7_mb_string): Removed.
(scm_tc7_mb_substring): Removed.
* print.c (scm_iprin1): Handle char printing directly. Don't
handle mbstrings.
Don't include "mbstrings.h".
* symbols.c (scm_intern_obarray_soft, scm_string_to_symbol,
scm_string_to_obarray_symbol, msymbolize): Don't set symbol's
multi-byte flag.
Don't include "mbstrings.h".
* symbols.h (SCM_SYMBOL_MULTI_BYTE_STRINGP): Removed.
(SCM_SYMBOL_SLOTS): Define as 4.
(SCM_ROSTRINGP): Use SCM_TYP7S, not SCM_TYP7SD.
* arbiters.c, backtrace.c, debug.c, dynl.c, eval.c, fluids.c,
gc.c, gsubr.c, ioext.c, kw.c, mallocs.c, numbers.c, ports.c,
print.c, read.c, regex-posix.c, root.c, srcprop.c, stackchk.c,
struct.c, threads.c, throw.c, unif.c, variable.c: Use new
("gen"-less) I/O function names.
* ports.c (scm_add_to_port_table): Don't set port's
representation.
* ports.h (scm_port_representation_type): Removed.
(scm_string_representation_type): Removed.
(struct scm_port_table ): Removed representation field.
(SCM_PORT_REPRESENTATION): Removed.
(SCM_SET_PORT_REPRESENTATION): Removed.
* genio.h: Use new function names.
* genio.c: Don't include "extchrs.h".
(scm_gen_putc, scm_gen_puts, scm_gen_write, scm_get_getc):
Removed.
(scm_putc, scm_puts, scm_lfwrite): No longer static.
(scm_getc): No longer static; handle line and column changes.
(scm_ungetc): Renamed from scm_gen_ungetc.
(scm_do_read_line): Renamed from scm_gen_read_line.
* libguile.h: Don't include "extchrs.h" or "mbstrings.h"
* extchrs.h, extchrs.c, mbstrings.h, mbstrings.c: Removed.
1997-10-15 17:18:32 +00:00
|
|
|
|
scm_puts ("#<promise ", port);
|
* eval.c, numbers.h, unif.h, smob.h, srcprop.c: Added #include
"print.h"
* arbiters.c (prinarb),
async.c (print_async),
debug.c (prindebugobj, prinmemoized),
eval.c (prinprom, prinmacro),
filesys.c (scm_fd_print, scm_dir_print),
kw.c (print_kw),
mallocs.c (prinmalloc),
numbers.c, numbers.h (scm_floprint, scm_bigprint),
smob.h (scm_smobfuns),
srcprop.c (prinsrcprops),
throw.c (prinjb),
unif.c, unif.h (scm_raprin1, rapr1),
variable.c (prin_var): Changed argument `int writing' to
`scm_print_state *pstate'.
1996-09-22 22:41:10 +00:00
|
|
|
|
SCM_SET_WRITINGP (pstate, 1);
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
scm_iprin1 (SCM_PROMISE_DATA (exp), port, pstate);
|
* eval.c, numbers.h, unif.h, smob.h, srcprop.c: Added #include
"print.h"
* arbiters.c (prinarb),
async.c (print_async),
debug.c (prindebugobj, prinmemoized),
eval.c (prinprom, prinmacro),
filesys.c (scm_fd_print, scm_dir_print),
kw.c (print_kw),
mallocs.c (prinmalloc),
numbers.c, numbers.h (scm_floprint, scm_bigprint),
smob.h (scm_smobfuns),
srcprop.c (prinsrcprops),
throw.c (prinjb),
unif.c, unif.h (scm_raprin1, rapr1),
variable.c (prin_var): Changed argument `int writing' to
`scm_print_state *pstate'.
1996-09-22 22:41:10 +00:00
|
|
|
|
SCM_SET_WRITINGP (pstate, writingp);
|
* Makefile.in: Rebuilt.
* Makefile.am (libguile_la_SOURCES): Removed extchrs.c,
mbstrings.c.
(modinclude_HEADERS): Removed extchrs.h, mbstrings.h.
* unif.c (scm_vector_set_length_x): Don't handle multibyte
strings.
* tag.c (scm_utag_mb_string, scm_utag_mb_substring): Removed.
(scm_tag): Don't handle multibyte strings.
* read.c: Don't include mbstrings.h.
(scm_lreadr): Don't handle multibyte ports.
* kw.c: Don't include mbstrings.h.
* init.c: Don't include mbstrings.h.
(scm_boot_guile_1): Don't init mbstrings module.
* hash.c (scm_hasher): Don't handle mbstrings.
* gscm.c (gscm_run_scm): Don't init mbstrings module.
* gc.c (scm_gc_mark): Don't handle mbstrings.
(scm_gc_sweep): Likewise.
* eval.c (SCM_CEVAL): Don't handle mbstrings.
* eq.c (scm_equal_p): Use SCM_TYP7S, not SCM_TYP7SD.
* tags.h (SCM_TYP7SD): Removed.
(SCM_TYP7D): Removed.
(scm_tc7_mb_string): Removed.
(scm_tc7_mb_substring): Removed.
* print.c (scm_iprin1): Handle char printing directly. Don't
handle mbstrings.
Don't include "mbstrings.h".
* symbols.c (scm_intern_obarray_soft, scm_string_to_symbol,
scm_string_to_obarray_symbol, msymbolize): Don't set symbol's
multi-byte flag.
Don't include "mbstrings.h".
* symbols.h (SCM_SYMBOL_MULTI_BYTE_STRINGP): Removed.
(SCM_SYMBOL_SLOTS): Define as 4.
(SCM_ROSTRINGP): Use SCM_TYP7S, not SCM_TYP7SD.
* arbiters.c, backtrace.c, debug.c, dynl.c, eval.c, fluids.c,
gc.c, gsubr.c, ioext.c, kw.c, mallocs.c, numbers.c, ports.c,
print.c, read.c, regex-posix.c, root.c, srcprop.c, stackchk.c,
struct.c, threads.c, throw.c, unif.c, variable.c: Use new
("gen"-less) I/O function names.
* ports.c (scm_add_to_port_table): Don't set port's
representation.
* ports.h (scm_port_representation_type): Removed.
(scm_string_representation_type): Removed.
(struct scm_port_table ): Removed representation field.
(SCM_PORT_REPRESENTATION): Removed.
(SCM_SET_PORT_REPRESENTATION): Removed.
* genio.h: Use new function names.
* genio.c: Don't include "extchrs.h".
(scm_gen_putc, scm_gen_puts, scm_gen_write, scm_get_getc):
Removed.
(scm_putc, scm_puts, scm_lfwrite): No longer static.
(scm_getc): No longer static; handle line and column changes.
(scm_ungetc): Renamed from scm_gen_ungetc.
(scm_do_read_line): Renamed from scm_gen_read_line.
* libguile.h: Don't include "extchrs.h" or "mbstrings.h"
* extchrs.h, extchrs.c, mbstrings.h, mbstrings.c: Removed.
1997-10-15 17:18:32 +00:00
|
|
|
|
scm_putc ('>', port);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return !0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_force, "force", 1, 0, 0,
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
(SCM promise),
|
2001-03-12 07:08:46 +00:00
|
|
|
|
"If the promise @var{x} has not been computed yet, compute and\n"
|
|
|
|
|
|
"return @var{x}, otherwise just return the previously computed\n"
|
|
|
|
|
|
"value.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_force
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
SCM_VALIDATE_SMOB (1, promise, promise);
|
2005-03-02 20:42:01 +00:00
|
|
|
|
scm_lock_mutex (SCM_PROMISE_MUTEX (promise));
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
if (!SCM_PROMISE_COMPUTED_P (promise))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
SCM ans = scm_call_0 (SCM_PROMISE_DATA (promise));
|
|
|
|
|
|
if (!SCM_PROMISE_COMPUTED_P (promise))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
SCM_SET_PROMISE_DATA (promise, ans);
|
|
|
|
|
|
SCM_SET_PROMISE_COMPUTED (promise);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2005-03-02 20:42:01 +00:00
|
|
|
|
scm_unlock_mutex (SCM_PROMISE_MUTEX (promise));
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
return SCM_PROMISE_DATA (promise);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-05-23 17:18:37 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_promise_p, "promise?", 1, 0, 0,
|
2001-03-12 07:08:46 +00:00
|
|
|
|
(SCM obj),
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"Return true if @var{obj} is a promise, i.e. a delayed computation\n"
|
* eval.c (scm_promise_p), list.c (scm_append_x, scm_reverse_x),
symbols.c (scm_symbol_to_string), vports.c (scm_make_soft_port):
Change R4RS references to R5RS.
* guile-snarf.awk.in: Fixes so that (i) blank lines in the
docstring source are correctly reproduced in the output (ii)
we don't anymore get occasional trailing quotes. Also reorganized
and commented the code a little.
* scmsigs.c (scm_raise), throw.c (scm_throw): Docstring format
fixes.
* new-docstrings.texi, posix.texi, scheme-control.texi,
scheme-data.texi, scheme-debug.texi, scheme-evaluation.texi,
scheme-io.texi, scheme-memory.texi, scheme-procedures.texi:
Automatic docstring updates (mostly argument name updates and
blank lines).
* scheme-modules.texi: Change double hyphens to single.
* scheme-control.texi (Lazy Catch): Completed.
* posix.texi (Network Databases and Address Conversion): New
subsubsection `IPv6 Address Conversion'.
2001-05-04 21:54:00 +00:00
|
|
|
|
"(@pxref{Delayed evaluation,,,r5rs.info,The Revised^5 Report on Scheme}).")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_promise_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-06 10:59:25 +00:00
|
|
|
|
return scm_from_bool (SCM_TYP16_PREDICATE (scm_tc16_promise, obj));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-05-23 17:18:37 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_cons_source, "cons-source", 3, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM xorig, SCM x, SCM y),
|
2000-09-02 23:23:16 +00:00
|
|
|
|
"Create and return a new pair whose car and cdr are @var{x} and @var{y}.\n"
|
|
|
|
|
|
"Any source properties associated with @var{xorig} are also associated\n"
|
|
|
|
|
|
"with the new pair.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_cons_source
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM p, z;
|
2001-11-25 15:21:07 +00:00
|
|
|
|
z = scm_cons (x, y);
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
/* Copy source properties possibly associated with xorig. */
|
|
|
|
|
|
p = scm_whash_lookup (scm_source_whash, xorig);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (p))
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
scm_whash_insert (scm_source_whash, z, p);
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
|
2000-05-23 17:18:37 +00:00
|
|
|
|
|
2004-03-24 01:21:50 +00:00
|
|
|
|
/* The function scm_copy_tree is used to copy an expression tree to allow the
|
|
|
|
|
|
* memoizer to modify the expression during memoization. scm_copy_tree
|
|
|
|
|
|
* creates deep copies of pairs and vectors, but not of any other data types,
|
|
|
|
|
|
* since only pairs and vectors will be parsed by the memoizer.
|
|
|
|
|
|
*
|
|
|
|
|
|
* To avoid infinite recursion due to cyclic structures, the hare-and-tortoise
|
|
|
|
|
|
* pattern is used to detect cycles. In fact, the pattern is used in two
|
|
|
|
|
|
* dimensions, vertical (indicated in the code by the variable names 'hare'
|
|
|
|
|
|
* and 'tortoise') and horizontal ('rabbit' and 'turtle'). In both
|
|
|
|
|
|
* dimensions, the hare/rabbit will take two steps when the tortoise/turtle
|
|
|
|
|
|
* takes one.
|
|
|
|
|
|
*
|
|
|
|
|
|
* The vertical dimension corresponds to recursive calls to function
|
|
|
|
|
|
* copy_tree: This happens when descending into vector elements, into cars of
|
|
|
|
|
|
* lists and into the cdr of an improper list. In this dimension, the
|
|
|
|
|
|
* tortoise follows the hare by using the processor stack: Every stack frame
|
|
|
|
|
|
* will hold an instance of struct t_trace. These instances are connected in
|
|
|
|
|
|
* a way that represents the trace of the hare, which thus can be followed by
|
|
|
|
|
|
* the tortoise. The tortoise will always point to struct t_trace instances
|
|
|
|
|
|
* relating to SCM objects that have already been copied. Thus, a cycle is
|
|
|
|
|
|
* detected if the tortoise and the hare point to the same object,
|
|
|
|
|
|
*
|
|
|
|
|
|
* The horizontal dimension is within one execution of copy_tree, when the
|
|
|
|
|
|
* function cdr's along the pairs of a list. This is the standard
|
|
|
|
|
|
* hare-and-tortoise implementation, found several times in guile. */
|
|
|
|
|
|
|
|
|
|
|
|
struct t_trace {
|
2006-04-17 00:05:42 +00:00
|
|
|
|
struct t_trace *trace; /* These pointers form a trace along the stack. */
|
|
|
|
|
|
SCM obj; /* The object handled at the respective stack frame.*/
|
2004-03-24 01:21:50 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
copy_tree (
|
|
|
|
|
|
struct t_trace *const hare,
|
|
|
|
|
|
struct t_trace *tortoise,
|
|
|
|
|
|
unsigned int tortoise_delay )
|
|
|
|
|
|
{
|
2005-01-02 20:49:04 +00:00
|
|
|
|
if (!scm_is_pair (hare->obj) && !scm_is_simple_vector (hare->obj))
|
2004-03-24 01:21:50 +00:00
|
|
|
|
{
|
|
|
|
|
|
return hare->obj;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Prepare the trace along the stack. */
|
|
|
|
|
|
struct t_trace new_hare;
|
|
|
|
|
|
hare->trace = &new_hare;
|
|
|
|
|
|
|
|
|
|
|
|
/* The tortoise will make its step after the delay has elapsed. Note
|
|
|
|
|
|
* that in contrast to the typical hare-and-tortoise pattern, the step
|
|
|
|
|
|
* of the tortoise happens before the hare takes its steps. This is, in
|
|
|
|
|
|
* principle, no problem, except for the start of the algorithm: Then,
|
2004-03-29 08:24:57 +00:00
|
|
|
|
* it has to be made sure that the hare actually gets its advantage of
|
2004-03-24 01:21:50 +00:00
|
|
|
|
* two steps. */
|
|
|
|
|
|
if (tortoise_delay == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
tortoise_delay = 1;
|
|
|
|
|
|
tortoise = tortoise->trace;
|
2004-07-27 15:41:49 +00:00
|
|
|
|
ASSERT_SYNTAX (!scm_is_eq (hare->obj, tortoise->obj),
|
2004-03-24 01:21:50 +00:00
|
|
|
|
s_bad_expression, hare->obj);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
--tortoise_delay;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2005-01-02 20:49:04 +00:00
|
|
|
|
if (scm_is_simple_vector (hare->obj))
|
2004-03-24 01:21:50 +00:00
|
|
|
|
{
|
2005-01-02 20:49:04 +00:00
|
|
|
|
size_t length = SCM_SIMPLE_VECTOR_LENGTH (hare->obj);
|
|
|
|
|
|
SCM new_vector = scm_c_make_vector (length, SCM_UNSPECIFIED);
|
2004-03-24 01:21:50 +00:00
|
|
|
|
|
|
|
|
|
|
/* Each vector element is copied by recursing into copy_tree, having
|
|
|
|
|
|
* the tortoise follow the hare into the depths of the stack. */
|
|
|
|
|
|
unsigned long int i;
|
|
|
|
|
|
for (i = 0; i < length; ++i)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM new_element;
|
2005-01-02 20:49:04 +00:00
|
|
|
|
new_hare.obj = SCM_SIMPLE_VECTOR_REF (hare->obj, i);
|
2004-03-24 01:21:50 +00:00
|
|
|
|
new_element = copy_tree (&new_hare, tortoise, tortoise_delay);
|
2005-01-02 20:49:04 +00:00
|
|
|
|
SCM_SIMPLE_VECTOR_SET (new_vector, i, new_element);
|
2004-03-24 01:21:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return new_vector;
|
|
|
|
|
|
}
|
2006-04-17 00:05:42 +00:00
|
|
|
|
else /* scm_is_pair (hare->obj) */
|
2004-03-24 01:21:50 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM result;
|
|
|
|
|
|
SCM tail;
|
|
|
|
|
|
|
|
|
|
|
|
SCM rabbit = hare->obj;
|
|
|
|
|
|
SCM turtle = hare->obj;
|
|
|
|
|
|
|
|
|
|
|
|
SCM copy;
|
|
|
|
|
|
|
|
|
|
|
|
/* The first pair of the list is treated specially, in order to
|
|
|
|
|
|
* preserve a potential source code position. */
|
|
|
|
|
|
result = tail = scm_cons_source (rabbit, SCM_EOL, SCM_EOL);
|
|
|
|
|
|
new_hare.obj = SCM_CAR (rabbit);
|
|
|
|
|
|
copy = copy_tree (&new_hare, tortoise, tortoise_delay);
|
|
|
|
|
|
SCM_SETCAR (tail, copy);
|
|
|
|
|
|
|
|
|
|
|
|
/* The remaining pairs of the list are copied by, horizontally,
|
|
|
|
|
|
* having the turtle follow the rabbit, and, vertically, having the
|
|
|
|
|
|
* tortoise follow the hare into the depths of the stack. */
|
|
|
|
|
|
rabbit = SCM_CDR (rabbit);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
while (scm_is_pair (rabbit))
|
2004-03-24 01:21:50 +00:00
|
|
|
|
{
|
|
|
|
|
|
new_hare.obj = SCM_CAR (rabbit);
|
|
|
|
|
|
copy = copy_tree (&new_hare, tortoise, tortoise_delay);
|
|
|
|
|
|
SCM_SETCDR (tail, scm_cons (copy, SCM_UNDEFINED));
|
|
|
|
|
|
tail = SCM_CDR (tail);
|
|
|
|
|
|
|
|
|
|
|
|
rabbit = SCM_CDR (rabbit);
|
2004-09-22 17:38:44 +00:00
|
|
|
|
if (scm_is_pair (rabbit))
|
2004-03-24 01:21:50 +00:00
|
|
|
|
{
|
|
|
|
|
|
new_hare.obj = SCM_CAR (rabbit);
|
|
|
|
|
|
copy = copy_tree (&new_hare, tortoise, tortoise_delay);
|
|
|
|
|
|
SCM_SETCDR (tail, scm_cons (copy, SCM_UNDEFINED));
|
|
|
|
|
|
tail = SCM_CDR (tail);
|
|
|
|
|
|
rabbit = SCM_CDR (rabbit);
|
|
|
|
|
|
|
|
|
|
|
|
turtle = SCM_CDR (turtle);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
ASSERT_SYNTAX (!scm_is_eq (rabbit, turtle),
|
2004-03-24 01:21:50 +00:00
|
|
|
|
s_bad_expression, rabbit);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* We have to recurse into copy_tree again for the last cdr, in
|
|
|
|
|
|
* order to handle the situation that it holds a vector. */
|
|
|
|
|
|
new_hare.obj = rabbit;
|
|
|
|
|
|
copy = copy_tree (&new_hare, tortoise, tortoise_delay);
|
|
|
|
|
|
SCM_SETCDR (tail, copy);
|
|
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_copy_tree, "copy-tree", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM obj),
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"Recursively copy the data tree that is bound to @var{obj}, and return a\n"
|
2004-03-28 13:57:19 +00:00
|
|
|
|
"the new data structure. @code{copy-tree} recurses down the\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"contents of both pairs and vectors (since both cons cells and vector\n"
|
|
|
|
|
|
"cells may point to arbitrary objects), and stops recursing when it hits\n"
|
|
|
|
|
|
"any other object.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_copy_tree
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-03-24 01:21:50 +00:00
|
|
|
|
/* Prepare the trace along the stack. */
|
|
|
|
|
|
struct t_trace trace;
|
|
|
|
|
|
trace.obj = obj;
|
|
|
|
|
|
|
|
|
|
|
|
/* In function copy_tree, if the tortoise makes its step, it will do this
|
|
|
|
|
|
* before the hare has the chance to move. Thus, we have to make sure that
|
|
|
|
|
|
* the very first step of the tortoise will not happen after the hare has
|
|
|
|
|
|
* really made two steps. This is achieved by passing '2' as the initial
|
|
|
|
|
|
* delay for the tortoise. NOTE: Since cycles are unlikely, giving the hare
|
|
|
|
|
|
* a bigger advantage may improve performance slightly. */
|
|
|
|
|
|
return copy_tree (&trace, &trace, 2);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2001-02-11 18:13:07 +00:00
|
|
|
|
/* We have three levels of EVAL here:
|
|
|
|
|
|
|
|
|
|
|
|
- scm_i_eval (exp, env)
|
|
|
|
|
|
|
|
|
|
|
|
evaluates EXP in environment ENV. ENV is a lexical environment
|
|
|
|
|
|
structure as used by the actual tree code evaluator. When ENV is
|
|
|
|
|
|
a top-level environment, then changes to the current module are
|
2001-03-26 22:39:35 +00:00
|
|
|
|
tracked by updating ENV so that it continues to be in sync with
|
2001-02-11 18:13:07 +00:00
|
|
|
|
the current module.
|
|
|
|
|
|
|
|
|
|
|
|
- scm_primitive_eval (exp)
|
|
|
|
|
|
|
|
|
|
|
|
evaluates EXP in the top-level environment as determined by the
|
|
|
|
|
|
current module. This is done by constructing a suitable
|
|
|
|
|
|
environment and calling scm_i_eval. Thus, changes to the
|
|
|
|
|
|
top-level module are tracked normally.
|
|
|
|
|
|
|
2005-03-02 20:42:01 +00:00
|
|
|
|
- scm_eval (exp, mod_or_state)
|
2001-02-11 18:13:07 +00:00
|
|
|
|
|
2005-03-02 20:42:01 +00:00
|
|
|
|
evaluates EXP while MOD_OR_STATE is the current module or current
|
|
|
|
|
|
dynamic state (as appropriate). This is done by setting the
|
|
|
|
|
|
current module (or dynamic state) to MOD_OR_STATE, invoking
|
|
|
|
|
|
scm_primitive_eval on EXP, and then restoring the current module
|
|
|
|
|
|
(or dynamic state) to the value it had previously. That is,
|
|
|
|
|
|
while EXP is evaluated, changes to the current module (or dynamic
|
|
|
|
|
|
state) are tracked, but these changes do not persist when
|
2001-02-11 18:13:07 +00:00
|
|
|
|
scm_eval returns.
|
|
|
|
|
|
|
|
|
|
|
|
For each level of evals, there are two variants, distinguished by a
|
|
|
|
|
|
_x suffix: the ordinary variant does not modify EXP while the _x
|
|
|
|
|
|
variant can destructively modify EXP into something completely
|
|
|
|
|
|
unintelligible. A Scheme data structure passed as EXP to one of the
|
|
|
|
|
|
_x variants should not ever be used again for anything. So when in
|
|
|
|
|
|
doubt, use the ordinary variant.
|
|
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
2000-08-11 08:42:50 +00:00
|
|
|
|
scm_i_eval_x (SCM exp, SCM env)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
if (scm_is_symbol (exp))
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
return *scm_lookupcar (scm_cons (exp, SCM_UNDEFINED), env, 1);
|
|
|
|
|
|
else
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
return SCM_I_XEVAL (exp, env, scm_debug_mode_p);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-08-11 08:42:50 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_i_eval (SCM exp, SCM env)
|
|
|
|
|
|
{
|
2001-05-09 20:25:44 +00:00
|
|
|
|
exp = scm_copy_tree (exp);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
if (scm_is_symbol (exp))
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
return *scm_lookupcar (scm_cons (exp, SCM_UNDEFINED), env, 1);
|
|
|
|
|
|
else
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
return SCM_I_XEVAL (exp, env, scm_debug_mode_p);
|
2000-08-11 08:42:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
2001-02-11 18:13:07 +00:00
|
|
|
|
scm_primitive_eval_x (SCM exp)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-03-26 22:39:35 +00:00
|
|
|
|
SCM env;
|
2001-04-24 23:27:13 +00:00
|
|
|
|
SCM transformer = scm_current_module_transformer ();
|
2001-03-26 22:39:35 +00:00
|
|
|
|
if (SCM_NIMP (transformer))
|
2001-06-26 15:46:40 +00:00
|
|
|
|
exp = scm_call_1 (transformer, exp);
|
2001-03-26 22:39:35 +00:00
|
|
|
|
env = scm_top_level_env (scm_current_module_lookup_closure ());
|
2001-02-11 18:13:07 +00:00
|
|
|
|
return scm_i_eval_x (exp, env);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2001-02-11 18:13:07 +00:00
|
|
|
|
SCM_DEFINE (scm_primitive_eval, "primitive-eval", 1, 0, 0,
|
|
|
|
|
|
(SCM exp),
|
2001-02-23 20:24:15 +00:00
|
|
|
|
"Evaluate @var{exp} in the top-level environment specified by\n"
|
2001-02-11 18:13:07 +00:00
|
|
|
|
"the current module.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_primitive_eval
|
|
|
|
|
|
{
|
2001-03-26 22:39:35 +00:00
|
|
|
|
SCM env;
|
2001-04-24 23:27:13 +00:00
|
|
|
|
SCM transformer = scm_current_module_transformer ();
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (transformer))
|
2001-06-26 15:46:40 +00:00
|
|
|
|
exp = scm_call_1 (transformer, exp);
|
2001-03-26 22:39:35 +00:00
|
|
|
|
env = scm_top_level_env (scm_current_module_lookup_closure ());
|
2001-02-11 18:13:07 +00:00
|
|
|
|
return scm_i_eval (exp, env);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
2003-11-21 23:21:34 +00:00
|
|
|
|
|
2000-08-11 08:42:50 +00:00
|
|
|
|
/* Eval does not take the second arg optionally. This is intentional
|
|
|
|
|
|
* in order to be R5RS compatible, and to prepare for the new module
|
|
|
|
|
|
* system, where we would like to make the choice of evaluation
|
2001-02-11 18:13:07 +00:00
|
|
|
|
* environment explicit. */
|
2000-06-21 02:42:03 +00:00
|
|
|
|
|
2001-02-11 18:13:07 +00:00
|
|
|
|
SCM
|
2005-03-02 20:42:01 +00:00
|
|
|
|
scm_eval_x (SCM exp, SCM module_or_state)
|
2001-02-11 18:13:07 +00:00
|
|
|
|
{
|
2005-03-02 20:42:01 +00:00
|
|
|
|
SCM res;
|
2001-02-11 18:13:07 +00:00
|
|
|
|
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_begin (SCM_F_DYNWIND_REWINDABLE);
|
2005-03-02 20:42:01 +00:00
|
|
|
|
if (scm_is_dynamic_state (module_or_state))
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_current_dynamic_state (module_or_state);
|
2005-03-02 20:42:01 +00:00
|
|
|
|
else
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_current_module (module_or_state);
|
2001-02-11 18:13:07 +00:00
|
|
|
|
|
2005-03-02 20:42:01 +00:00
|
|
|
|
res = scm_primitive_eval_x (exp);
|
|
|
|
|
|
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_end ();
|
2005-03-02 20:42:01 +00:00
|
|
|
|
return res;
|
2001-02-11 18:13:07 +00:00
|
|
|
|
}
|
2000-12-15 14:00:18 +00:00
|
|
|
|
|
2000-08-11 08:42:50 +00:00
|
|
|
|
SCM_DEFINE (scm_eval, "eval", 2, 0, 0,
|
2005-03-02 20:42:01 +00:00
|
|
|
|
(SCM exp, SCM module_or_state),
|
2001-02-11 18:13:07 +00:00
|
|
|
|
"Evaluate @var{exp}, a list representing a Scheme expression,\n"
|
2005-03-02 20:42:01 +00:00
|
|
|
|
"in the top-level environment specified by\n"
|
|
|
|
|
|
"@var{module_or_state}.\n"
|
2001-11-16 15:04:17 +00:00
|
|
|
|
"While @var{exp} is evaluated (using @code{primitive-eval}),\n"
|
2005-03-02 20:42:01 +00:00
|
|
|
|
"@var{module_or_state} is made the current module when\n"
|
|
|
|
|
|
"it is a module, or the current dynamic state when it is\n"
|
|
|
|
|
|
"a dynamic state."
|
2005-01-10 20:20:58 +00:00
|
|
|
|
"Example: (eval '(+ 1 2) (interaction-environment))")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_eval
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2005-03-02 20:42:01 +00:00
|
|
|
|
SCM res;
|
|
|
|
|
|
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_begin (SCM_F_DYNWIND_REWINDABLE);
|
2005-03-02 20:42:01 +00:00
|
|
|
|
if (scm_is_dynamic_state (module_or_state))
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_current_dynamic_state (module_or_state);
|
2005-03-02 20:42:01 +00:00
|
|
|
|
else
|
2008-03-06 09:51:44 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_VALIDATE_MODULE (2, module_or_state);
|
|
|
|
|
|
scm_dynwind_current_module (module_or_state);
|
|
|
|
|
|
}
|
2005-03-02 20:42:01 +00:00
|
|
|
|
|
|
|
|
|
|
res = scm_primitive_eval (exp);
|
2000-12-15 14:00:18 +00:00
|
|
|
|
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_end ();
|
2005-03-02 20:42:01 +00:00
|
|
|
|
return res;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
/* At this point, deval and scm_dapply are generated.
|
1996-08-20 17:09:07 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
2003-04-20 18:08:07 +00:00
|
|
|
|
#define DEVAL
|
* eval.c: distangle. move duplicate code to eval.i.c and include
twice.
* eval.i.c: new file.
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
2007-01-22 15:16:44 +00:00
|
|
|
|
#include "eval.i.c"
|
|
|
|
|
|
#undef DEVAL
|
|
|
|
|
|
#include "eval.i.c"
|
Introduce scm_debug_mode_p as a replacement for scm_debug_mode and
SCM_DEBUGGINGP:
* debug.h (scm_debug_mode_p, scm_debug_mode, SCM_DEBUGGINGP),
eval.c (scm_debug_mode_p): Deprecated scm_debug_mode and
SCM_DEBUGGINGP. Provided scm_debug_mode_p instead, to have one
single interface that also matches the naming conventions.
Probably scm_debug_mode_p should be part of the private interface
anyway.
* debug.h (scm_debug_mode_p), backtrace.c (display_error_body),
eval.c (SCM_APPLY, scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Change uses of scm_debug_mode or SCM_DEBUGGINGP
to scm_debug_mode_p.
Deprecate direct access to scm_ceval, scm_deval and scm_ceval_ptr:
* eval.h (scm_ceval, scm_deval, scm_ceval_ptr), debug.h
(scm_ceval_ptr): Deprecated. Moved declaration of scm_ceval_ptr
from debug.h to eval.h.
* debug.h (SCM_RESET_DEBUG_MODE): Don't access scm_ceval_ptr any
more, just leave it with setting scm_debug_mode_p, which is
equivalent for practical purposes.
* deprecated.h (SCM_XEVAL, SCM_XEVALCAR): Call scm_i_eval_x
instead of *scm_ceval_ptr. Leave all evaluating to scm_i_eval_x.
* gdbint.c (gdb_eval): Call scm_i_eval_x instead of scm_ceval.
* eval.c (ceval, deval, scm_ceval, scm_deval): Made scm_ceval
static and renamed it to ceval throughout. Provide a new exported
but deprecated function scm_ceval as a wrapper for backwards
compatibility. The same is done for the deval/scm_deval pair of
functions.
* eval.c (CEVAL, SCM_CEVAL): Renamed SCM_CEVAL to CEVAL
throughout. Defined CEVAL to ceval or deval, based on compilation
phase.
* eval.c (SCM_XEVAL, SCM_XEVALCAR): Dispatch on scm_debug_mode_p
to ceval and deval instead of calling *scm_ceval_ptr.
* eval.c (dispatching_eval): New deprecated static function.
* eval.c (scm_ceval_ptr): Initialized to dispatching_eval in order
to emulate its old behaviour as closely as possible.
Change the evaluator such that only expressions for which pair? is
true are passed to CEVAL, and such that all other expressions are
evaluated outside of CEVAL:
* eval.c (EVAL): New, provided in analogy to EVALCAR. Evaluate an
expression that is assumed to be memoized already. All but
expressions of the form '(<form> <form> ...)' are evaluated inline
without calling an evaluator.
* eval.c (SCM_XEVAL, SCM_XEVALCAR, EVALCAR): Evaluate all but
expressions of the form '(<form> <form> ...)' inline without
calling an evaluator.
* eval.c (scm_i_eval_x, scm_i_eval, scm_ceval, scm_deval): Handle
the special case of unmemoized symbols passed on the top level.
* eval.c (CEVAL): Change calls to CEVAL to EVAL, except where it
is known that the expression passed to CEVAL is of the form
'(<form> <form> ...)'. Remove handling of the tc7-objects, since
now it is known that the input expression of CEVAL is a pair.
2004-03-29 19:59:43 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_init_eval ()
|
|
|
|
|
|
{
|
2005-10-23 20:47:49 +00:00
|
|
|
|
scm_i_pthread_mutex_init (&source_mutex,
|
|
|
|
|
|
scm_i_pthread_mutexattr_recursive);
|
|
|
|
|
|
|
1998-03-30 21:02:59 +00:00
|
|
|
|
scm_init_opts (scm_evaluator_traps,
|
2007-01-19 19:26:36 +00:00
|
|
|
|
scm_evaluator_trap_table);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
scm_init_opts (scm_eval_options_interface,
|
2007-01-19 19:26:36 +00:00
|
|
|
|
scm_eval_opts);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
|
1999-08-24 02:10:19 +00:00
|
|
|
|
scm_tc16_promise = scm_make_smob_type ("promise", 0);
|
2005-03-02 20:42:01 +00:00
|
|
|
|
scm_set_smob_mark (scm_tc16_promise, promise_mark);
|
* __scm.h (SCM_DEFER_INTS, SCM_ALLOW_INTS): New definitions.
Simply lock a thread C API recursive mutex.
(SCM_NONREC_CRITICAL_SECTION_START,
SCM_NONREC_CRITICAL_SECTION_END, SCM_REC_CRITICAL_SECTION_START,
SCM_REC_CRITICAL_SECTION_END): Removed.
* eval.c: Replaced SOURCE_SECTION_START / SOURCE_SECTION_END with
direct calls to scm_rec_mutex_lock / unlock around the three calls
to scm_m_expand_body.
* eval.c, eval.h (promise_free): New function.
(scm_force): Rewritten; Now thread-safe; Removed
SCM_DEFER/ALLOW_INTS.
* pthread-threads.h: Added partially implemented plugin interface
for recursive mutexes. These are, for now, only intended to be
used internally within the Guile implementation.
* pthread-threads.c: New file.
* threads.c: Conditionally #include "pthread-threads.c".
* eval.c, eval.h (scm_makprom, scm_force): Rewritten to be
thread-safe;
* snarf.h (SCM_MUTEX, SCM_GLOBAL_MUTEX, SCM_REC_MUTEX,
SCM_GLOBAL_REC_MUTEX): New macros.
* eval.c, threads.c, threads.h, snarf.h: Rewrote critical section
macros---use mutexes instead.
* tags.h (SCM_IM_FUTURE): New tag.
* eval.c (scm_m_future): New primitive macro.
(SCM_CEVAL): Support futures.
(unmemocopy): Support unmemoization of futures.
* print.c (scm_isymnames): Name of future isym.
2002-12-15 14:24:34 +00:00
|
|
|
|
scm_set_smob_free (scm_tc16_promise, promise_free);
|
2000-12-08 17:32:56 +00:00
|
|
|
|
scm_set_smob_print (scm_tc16_promise, promise_print);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
|
2003-04-20 18:08:07 +00:00
|
|
|
|
undefineds = scm_list_1 (SCM_UNDEFINED);
|
|
|
|
|
|
SCM_SETCDR (undefineds, undefineds);
|
|
|
|
|
|
scm_permanent_object (undefineds);
|
2001-05-15 09:45:10 +00:00
|
|
|
|
|
2003-04-20 18:08:07 +00:00
|
|
|
|
scm_listofnull = scm_list_1 (SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-04-20 18:08:07 +00:00
|
|
|
|
f_apply = scm_c_define_subr ("apply", scm_tc7_lsubr_2, scm_apply);
|
|
|
|
|
|
scm_permanent_object (f_apply);
|
2001-05-15 14:57:22 +00:00
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/eval.x"
|
2003-10-25 07:00:50 +00:00
|
|
|
|
|
1997-09-20 13:58:58 +00:00
|
|
|
|
scm_add_feature ("delay");
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-03-19 19:01:16 +00:00
|
|
|
|
/*
|
|
|
|
|
|
Local Variables:
|
|
|
|
|
|
c-file-style: "gnu"
|
|
|
|
|
|
End:
|
|
|
|
|
|
*/
|
2007-01-19 19:26:36 +00:00
|
|
|
|
|