2003-04-23 18:27:37 +00:00
/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 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
* Foundation , Inc . , 59 Temple Place , Suite 330 , Boston , MA 02111 - 1307 USA
*/
1999-12-12 02:36:16 +00:00
1996-07-25 22:56:11 +00:00
1996-08-20 17:09:07 +00:00
/* This file is read twice in order to produce debugging versions of
* scm_ceval and scm_apply . These functions , scm_deval and
* scm_dapply , are produced when we define the preprocessor macro
* DEVAL . The file is divided into sections which are treated
* differently with respect to DEVAL . The heads of these sections are
* marked with the string " SECTION: " .
*/
/* SECTION: This code is compiled once.
1996-07-25 22:56:11 +00:00
*/
2003-03-25 23:54:28 +00:00
# if HAVE_CONFIG_H
# include <config.h>
# endif
1996-07-25 22:56:11 +00:00
2003-03-25 23:54:28 +00:00
# include "libguile/__scm.h"
# ifndef DEVAL
1997-05-29 02:20:19 +00:00
1997-02-04 21:59:23 +00:00
/* AIX requires this to be the first thing in the file. The #pragma
directive is indented so pre - ANSI compilers will ignore it , rather
than choke on it . */
1997-02-05 18:19:57 +00:00
# ifndef __GNUC__
1997-02-04 21:59:23 +00:00
# if HAVE_ALLOCA_H
# include <alloca.h>
# else
# ifdef _AIX
2001-06-25 03:30:02 +00:00
# pragma alloca
1997-02-04 21:59:23 +00:00
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
char * alloca ( ) ;
# endif
# endif
# endif
# endif
2000-04-21 14:16:44 +00:00
# include "libguile/_scm.h"
# include "libguile/debug.h"
2000-12-15 14:00:18 +00:00
# include "libguile/dynwind.h"
2000-04-21 14:16:44 +00:00
# include "libguile/alist.h"
# include "libguile/eq.h"
# include "libguile/continuations.h"
2003-01-23 16:04:37 +00:00
# include "libguile/futures.h"
2003-10-10 21:49:27 +00:00
# include "libguile/strings.h"
2000-04-21 14:16:44 +00:00
# include "libguile/throw.h"
# include "libguile/smob.h"
# include "libguile/macros.h"
# include "libguile/procprop.h"
# include "libguile/hashtab.h"
# include "libguile/hash.h"
# include "libguile/srcprop.h"
# include "libguile/stackchk.h"
# include "libguile/objects.h"
# include "libguile/async.h"
# include "libguile/feature.h"
# include "libguile/modules.h"
# include "libguile/ports.h"
# include "libguile/root.h"
# include "libguile/vectors.h"
2000-06-21 02:42:03 +00:00
# include "libguile/fluids.h"
2002-03-09 20:15:16 +00:00
# include "libguile/goops.h"
2001-03-26 22:39:35 +00:00
# include "libguile/values.h"
2000-04-21 14:16:44 +00:00
# include "libguile/validate.h"
# include "libguile/eval.h"
2002-01-22 23:31:39 +00:00
# include "libguile/lang.h"
1999-03-11 11:45:06 +00:00
1996-07-25 22:56:11 +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 " ;
/* 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 )
{
const SCM msg_string = scm_makfrom0str ( msg ) ;
SCM filename = SCM_BOOL_F ;
SCM linenr = SCM_BOOL_F ;
const char * format ;
SCM args ;
if ( SCM_CONSP ( form ) )
{
filename = scm_source_property ( form , scm_sym_filename ) ;
linenr = scm_source_property ( form , scm_sym_line ) ;
}
if ( SCM_FALSEP ( filename ) & & SCM_FALSEP ( linenr ) & & SCM_CONSP ( expr ) )
{
filename = scm_source_property ( expr , scm_sym_filename ) ;
linenr = scm_source_property ( expr , scm_sym_line ) ;
}
if ( ! SCM_UNBNDP ( expr ) )
{
if ( ! SCM_FALSEP ( filename ) )
{
format = " In file ~S, line ~S: ~A ~S in expression ~S. " ;
args = scm_list_5 ( filename , linenr , msg_string , form , expr ) ;
}
else if ( ! SCM_FALSEP ( linenr ) )
{
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
{
if ( ! SCM_FALSEP ( filename ) )
{
format = " In file ~S, line ~S: ~A ~S. " ;
args = scm_list_4 ( filename , linenr , msg_string , form ) ;
}
else if ( ! SCM_FALSEP ( linenr ) )
{
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. */
# define ASSERT_SYNTAX(cond, message, form) \
{ if ( ! ( cond ) ) syntax_error ( message , form , SCM_UNDEFINED ) ; }
# define ASSERT_SYNTAX_2(cond, message, form, expr) \
{ if ( ! ( cond ) ) syntax_error ( message , form , expr ) ; }
* __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 .
*/
# define SCM_ILOC00 SCM_MAKE_ITAG8(0L, scm_tc8_iloc)
# define SCM_IDINC (0x00100000L)
# define SCM_IDSTMSK (-SCM_IDINC)
# 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 )
# if (SCM_DEBUG_DEBUGGING_SUPPORT == 1)
SCM scm_dbg_make_iloc ( SCM frame , SCM binding , SCM cdrp ) ;
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
{
SCM_VALIDATE_INUM ( 1 , frame ) ;
SCM_VALIDATE_INUM ( 2 , binding ) ;
return SCM_MAKE_ILOC ( SCM_INUM ( frame ) ,
SCM_INUM ( binding ) ,
! SCM_FALSEP ( cdrp ) ) ;
}
# undef FUNC_NAME
SCM scm_dbg_iloc_p ( SCM obj ) ;
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
{
return SCM_BOOL ( SCM_ILOCP ( obj ) ) ;
}
# undef FUNC_NAME
# endif
2001-06-05 20:48:28 +00:00
# define SCM_VALIDATE_NON_EMPTY_COMBINATION(x) \
do { \
if ( SCM_EQ_P ( ( x ) , SCM_EOL ) ) \
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
scm_misc_error ( NULL , s_expression , SCM_EOL ) ; \
2001-06-05 20:48:28 +00:00
} while ( 0 )
1996-08-20 17:09:07 +00:00
/* The evaluator contains a plethora of EVAL symbols.
* This is an attempt at explanation .
*
* The following macros should be used in code which is read twice
* ( where the choice of evaluator is hard soldered ) :
*
* SCM_CEVAL is the symbol used within one evaluator to call itself .
* Originally , it is defined to scm_ceval , but is redefined to
* scm_deval during the second pass .
*
* eval.c (scm_s_expression, scm_s_test, scm_s_body,
scm_s_bindings, scm_s_variable, scm_s_clauses, scm_s_formals):
Renamed and made global.
* eval.c, eval.h (SCM_EVALIM): Renamed from EVALIM.
(SCM_XEVAL, SCM_XEVALCAR): Renamed from XEVAL, XEVALCAR.
* evalext.c (serial-map): New procedure: Version of `map' which
guarantees that the procedure is applied to the lists in serial
order.
(sequence->list): New syntax: Version of `begin' which returns a
list of the results of the body forms instead of the result of the
last body form.
(scm_definedp, scm_m_undefine): Moved from eval.c
* macros.c, macros.h: New files.
(procedure->syntax, procedure->macro, procedure->memoizing-macro,
macro?, macro-type, macro-name, macro-transformer): Moved from
eval.c
(scm_make_synt): Moved from eval.c
* procs.c, procs.h (procedure-documentation): Moved from eval.c.
1998-10-31 13:05:07 +00:00
* SCM_EVALIM is used when it is known that the expression is an
1996-08-20 17:09:07 +00:00
* immediate . ( This macro never calls an evaluator . )
*
* EVALCAR evaluates the car of an expression .
*
* The following macros should be used in code which is read once
* ( where the choice of evaluator is dynamic ) :
*
* eval.c (scm_s_expression, scm_s_test, scm_s_body,
scm_s_bindings, scm_s_variable, scm_s_clauses, scm_s_formals):
Renamed and made global.
* eval.c, eval.h (SCM_EVALIM): Renamed from EVALIM.
(SCM_XEVAL, SCM_XEVALCAR): Renamed from XEVAL, XEVALCAR.
* evalext.c (serial-map): New procedure: Version of `map' which
guarantees that the procedure is applied to the lists in serial
order.
(sequence->list): New syntax: Version of `begin' which returns a
list of the results of the body forms instead of the result of the
last body form.
(scm_definedp, scm_m_undefine): Moved from eval.c
* macros.c, macros.h: New files.
(procedure->syntax, procedure->macro, procedure->memoizing-macro,
macro?, macro-type, macro-name, macro-transformer): Moved from
eval.c
(scm_make_synt): Moved from eval.c
* procs.c, procs.h (procedure-documentation): Moved from eval.c.
1998-10-31 13:05:07 +00:00
* SCM_XEVAL takes care of immediates without calling an evaluator . It
1996-08-20 17:09:07 +00:00
* then calls scm_ceval * or * scm_deval , depending on the debugging
* mode .
*
* eval.c (scm_s_expression, scm_s_test, scm_s_body,
scm_s_bindings, scm_s_variable, scm_s_clauses, scm_s_formals):
Renamed and made global.
* eval.c, eval.h (SCM_EVALIM): Renamed from EVALIM.
(SCM_XEVAL, SCM_XEVALCAR): Renamed from XEVAL, XEVALCAR.
* evalext.c (serial-map): New procedure: Version of `map' which
guarantees that the procedure is applied to the lists in serial
order.
(sequence->list): New syntax: Version of `begin' which returns a
list of the results of the body forms instead of the result of the
last body form.
(scm_definedp, scm_m_undefine): Moved from eval.c
* macros.c, macros.h: New files.
(procedure->syntax, procedure->macro, procedure->memoizing-macro,
macro?, macro-type, macro-name, macro-transformer): Moved from
eval.c
(scm_make_synt): Moved from eval.c
* procs.c, procs.h (procedure-documentation): Moved from eval.c.
1998-10-31 13:05:07 +00:00
* SCM_XEVALCAR corresponds to EVALCAR , but uses scm_ceval * or * scm_deval
1996-08-20 17:09:07 +00:00
* depending on the debugging mode .
*
* The main motivation for keeping this plethora is efficiency
* together with maintainability ( = > locality of code ) .
*/
* eval.c (scm_s_expression, scm_s_test, scm_s_body,
scm_s_bindings, scm_s_variable, scm_s_clauses, scm_s_formals):
Renamed and made global.
* eval.c, eval.h (SCM_EVALIM): Renamed from EVALIM.
(SCM_XEVAL, SCM_XEVALCAR): Renamed from XEVAL, XEVALCAR.
* evalext.c (serial-map): New procedure: Version of `map' which
guarantees that the procedure is applied to the lists in serial
order.
(sequence->list): New syntax: Version of `begin' which returns a
list of the results of the body forms instead of the result of the
last body form.
(scm_definedp, scm_m_undefine): Moved from eval.c
* macros.c, macros.h: New files.
(procedure->syntax, procedure->macro, procedure->memoizing-macro,
macro?, macro-type, macro-name, macro-transformer): Moved from
eval.c
(scm_make_synt): Moved from eval.c
* procs.c, procs.h (procedure-documentation): Moved from eval.c.
1998-10-31 13:05:07 +00:00
# define SCM_CEVAL scm_ceval
1996-07-25 22:56:11 +00:00
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
# define SCM_EVALIM2(x) \
( ( SCM_EQ_P ( ( x ) , SCM_EOL ) \
? scm_misc_error ( NULL , s_expression , SCM_EOL ) , 0 \
: 0 ) , \
( x ) )
# define SCM_EVALIM(x, env) (SCM_ILOCP (x) \
? * scm_ilookup ( ( x ) , env ) \
: SCM_EVALIM2 ( x ) )
# define SCM_XEVAL(x, env) (SCM_IMP (x) \
? SCM_EVALIM2 ( x ) \
: ( * scm_ceval_ptr ) ( ( x ) , ( env ) ) )
# define SCM_XEVALCAR(x, env) (SCM_IMP (SCM_CAR (x)) \
? SCM_EVALIM ( SCM_CAR ( x ) , env ) \
: ( SCM_SYMBOLP ( SCM_CAR ( x ) ) \
? * scm_lookupcar ( x , env , 1 ) \
: ( * scm_ceval_ptr ) ( SCM_CAR ( x ) , env ) ) )
2001-08-31 14:42:31 +00:00
# define EVALCAR(x, env) (SCM_IMP (SCM_CAR (x)) \
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
? SCM_EVALIM ( SCM_CAR ( x ) , env ) \
2002-03-24 22:19:46 +00:00
: ( SCM_SYMBOLP ( SCM_CAR ( x ) ) \
? * scm_lookupcar ( x , env , 1 ) \
: SCM_CEVAL ( SCM_CAR ( x ) , env ) ) )
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_REC_MUTEX ( 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
2003-04-27 11:06:14 +00:00
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
static const char s_expression [ ] = " missing or extra expression " ;
static const char s_test [ ] = " bad test " ;
static const char s_body [ ] = " bad body " ;
static const char s_bindings [ ] = " bad bindings " ;
static const char s_duplicate_bindings [ ] = " duplicate bindings " ;
static const char s_variable [ ] = " bad variable " ;
static const char s_clauses [ ] = " bad or missing clauses " ;
static const char s_formals [ ] = " bad formals " ;
static const char s_duplicate_formals [ ] = " duplicate formals " ;
static const char s_splicing [ ] = " bad (non-list) result for unquote-splicing " ;
2003-04-27 11:06:14 +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 . */
1996-07-25 22:56:11 +00:00
SCM *
1999-12-12 20:35:02 +00:00
scm_ilookup ( SCM iloc , SCM env )
1996-07-25 22:56:11 +00:00
{
2003-04-27 11:06:14 +00:00
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 ) ;
1996-07-25 22:56:11 +00:00
if ( SCM_ICDRP ( iloc ) )
2003-04-27 11:06:14 +00:00
return SCM_CDRLOC ( bindings ) ;
return SCM_CARLOC ( SCM_CDR ( bindings ) ) ;
1996-07-25 22:56:11 +00:00
}
2003-04-27 11:06:14 +00:00
1997-06-08 15:46:19 +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
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
global variable references ( into ilocs and variables ) , because all
1997-06-08 15:46:19 +00:00
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
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
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 .
1997-06-08 15:46:19 +00:00
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
An example to illustrate this : Suppose that the following form will
1997-06-08 15:46:19 +00:00
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
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
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 .
1997-06-08 15:46:19 +00:00
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 . */
2003-04-04 21:48:08 +00:00
/* SCM_LOOKUPCAR1 is what SCM_LOOKUPCAR used to be but is allowed to
1997-06-08 15:46:19 +00:00
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
2001-12-07 17:03:15 +00:00
SCM_LOOKUPCAR1 and aborts on receiving NULL . So SCM_LOOKUPCAR
1997-06-08 15:46:19 +00:00
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
* 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
for NULL . I think I ' ve found the only places where this
applies . */
1997-06-08 15:46:19 +00:00
* eval.c: define scm_unbound_variable_key ('unbound-variable).
scm_lookupcar1: throw an error with key 'unbound-variable instead
of 'misc-error when an unbound variable is encountered.
* filesys.c (scm_mkdir, scm_rmdir, scm_getcwd, scm_select,
scm_symlink, scm_readlink, scm_lstat),
posix.c (scm_setpgid, scm_setsid, scm_ctermid, scm_tcgetpgrp,
scm_tcsetpgrp, scm_uname, scm_setlocale, scm_mknod, scm_nice,
scm_sync),
simpos.c (scm_system),
stime.c (scm_times, scm_strptime):
move the HAVE_XXX feature tests out of the procedure bodies.
don't use SCM_SYSMISSING.
scm_validate.h (SCM_SYSMISSING): removed.
error.h, error.c (scm_sysmissing): comment that this is deprecated.
see ChangeLog entry for 1999-12-28.
2000-01-09 13:41:53 +00:00
SCM_SYMBOL ( scm_unbound_variable_key , " unbound-variable " ) ;
1998-07-30 14:44:01 +00:00
static SCM *
* 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_lookupcar1 ( SCM vloc , SCM genv , int check )
1996-07-25 22:56:11 +00:00
{
SCM env = genv ;
1997-06-21 05:53:04 +00:00
register SCM * al , fl , var = SCM_CAR ( vloc ) ;
1996-07-25 22:56:11 +00:00
register SCM iloc = SCM_ILOC00 ;
for ( ; SCM_NIMP ( env ) ; env = SCM_CDR ( env ) )
{
2000-06-04 01:29:54 +00:00
if ( ! SCM_CONSP ( SCM_CAR ( env ) ) )
1996-07-25 22:56:11 +00:00
break ;
* 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
al = SCM_CARLOC ( env ) ;
1996-07-25 22:56:11 +00:00
for ( fl = SCM_CAR ( * al ) ; SCM_NIMP ( fl ) ; fl = SCM_CDR ( fl ) )
{
2001-07-30 18:55:50 +00:00
if ( ! SCM_CONSP ( fl ) )
1998-03-30 21:02:59 +00:00
{
2000-04-01 21:23:09 +00:00
if ( SCM_EQ_P ( fl , var ) )
1996-07-25 22:56:11 +00:00
{
2000-04-01 21:23:09 +00:00
if ( ! SCM_EQ_P ( SCM_CAR ( vloc ) , var ) )
1997-06-08 15:46:19 +00:00
goto race ;
2000-04-19 09:37:48 +00:00
SCM_SET_CELL_WORD_0 ( vloc , SCM_UNPACK ( iloc ) + SCM_ICDR ) ;
* 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
return SCM_CDRLOC ( * al ) ;
1996-07-25 22:56:11 +00:00
}
1998-03-30 21:02:59 +00:00
else
break ;
}
* 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
al = SCM_CDRLOC ( * al ) ;
2000-04-01 21:23:09 +00:00
if ( SCM_EQ_P ( SCM_CAR ( fl ) , var ) )
1996-07-25 22:56:11 +00:00
{
if ( SCM_UNBNDP ( SCM_CAR ( * al ) ) )
{
env = SCM_EOL ;
goto errout ;
}
2001-05-20 23:39:55 +00:00
if ( ! SCM_EQ_P ( SCM_CAR ( vloc ) , var ) )
1997-06-08 15:46:19 +00:00
goto race ;
* 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
SCM_SETCAR ( vloc , iloc ) ;
return SCM_CARLOC ( * al ) ;
1996-07-25 22:56:11 +00:00
}
2000-04-19 09:37:48 +00:00
iloc = SCM_PACK ( SCM_UNPACK ( iloc ) + SCM_IDINC ) ;
1996-07-25 22:56:11 +00:00
}
2000-04-19 09:37:48 +00:00
iloc = SCM_PACK ( ( ~ SCM_IDSTMSK ) & ( SCM_UNPACK ( iloc ) + SCM_IFRINC ) ) ;
1996-07-25 22:56:11 +00:00
}
{
2001-05-15 14:57:22 +00:00
SCM top_thunk , real_var ;
2000-06-04 01:29:54 +00:00
if ( SCM_NIMP ( env ) )
1996-07-25 22:56:11 +00:00
{
2001-05-15 14:57:22 +00:00
top_thunk = SCM_CAR ( env ) ; /* env now refers to a
top level env thunk */
1996-07-25 22:56:11 +00:00
env = SCM_CDR ( env ) ;
}
else
top_thunk = SCM_BOOL_F ;
2001-05-15 14:57:22 +00:00
real_var = scm_sym2var ( var , top_thunk , SCM_BOOL_F ) ;
if ( SCM_FALSEP ( real_var ) )
1996-07-25 22:56:11 +00:00
goto errout ;
2001-05-15 14:57:22 +00:00
2001-07-30 18:55:50 +00:00
if ( ! SCM_NULLP ( env ) | | SCM_UNBNDP ( SCM_VARIABLE_REF ( real_var ) ) )
2001-05-15 14:57:22 +00:00
{
errout :
if ( check )
{
if ( SCM_NULLP ( env ) )
scm_error ( scm_unbound_variable_key , NULL ,
" Unbound variable: ~S " ,
* 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_list_1 ( var ) , SCM_BOOL_F ) ;
2001-05-15 14:57:22 +00:00
else
scm_misc_error ( NULL , " Damaged environment: ~S " ,
* 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_list_1 ( var ) ) ;
2001-05-15 14:57:22 +00:00
}
else
{
/* A variable could not be found, but we shall
not throw an error . */
static SCM undef_object = SCM_UNDEFINED ;
return & undef_object ;
}
2000-04-25 12:06:51 +00:00
}
2001-05-15 14:57:22 +00:00
2001-05-20 23:39:55 +00:00
if ( ! SCM_EQ_P ( SCM_CAR ( vloc ) , var ) )
2001-05-15 14:57:22 +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 ) ;
2001-07-25 21:03:28 +00:00
if ( SCM_VARIABLEP ( var ) )
return SCM_VARIABLE_LOC ( var ) ;
2001-05-15 14:57:22 +00:00
if ( SCM_ITAG7 ( var ) = = SCM_ITAG7 ( SCM_ILOC00 ) )
return scm_ilookup ( var , genv ) ;
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
/* We can't cope with anything else than variables and ilocs. When
2001-05-15 14:57:22 +00:00
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 ;
}
1997-06-08 15:46:19 +00:00
2001-07-25 21:03:28 +00:00
SCM_SETCAR ( vloc , real_var ) ;
2001-05-15 14:57:22 +00:00
return SCM_VARIABLE_LOC ( real_var ) ;
}
1996-07-25 22:56:11 +00:00
}
1997-06-08 15:46:19 +00:00
SCM *
1999-12-12 20:35:02 +00:00
scm_lookupcar ( SCM vloc , SCM genv , int check )
1997-06-08 15:46:19 +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
SCM * loc = scm_lookupcar1 ( vloc , genv , check ) ;
1997-06-08 15:46:19 +00:00
if ( loc = = NULL )
abort ( ) ;
return loc ;
}
1996-07-25 22:56:11 +00:00
# define unmemocar scm_unmemocar
* __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-05-15 14:57:22 +00:00
SCM_SYMBOL ( sym_three_question_marks , " ??? " ) ;
1996-07-25 22:56:11 +00:00
SCM
1999-12-12 20:35:02 +00:00
scm_unmemocar ( SCM form , SCM env )
1996-07-25 22:56:11 +00:00
{
2001-11-17 11:43:28 +00:00
if ( ! SCM_CONSP ( form ) )
1996-07-25 22:56:11 +00:00
return form ;
2001-11-17 11:43:28 +00:00
else
2001-07-25 21:03:28 +00:00
{
2001-11-17 11:43:28 +00:00
SCM c = SCM_CAR ( form ) ;
if ( SCM_VARIABLEP ( c ) )
{
SCM sym = scm_module_reverse_lookup ( scm_env_module ( env ) , c ) ;
if ( SCM_FALSEP ( sym ) )
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 ) ;
SCM_SETCAR ( form , SCM_ICDRP ( c ) ? env : SCM_CAR ( env ) ) ;
}
return form ;
}
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_eval_car ( SCM pair , SCM env )
1996-07-25 22:56:11 +00:00
{
* eval.c (scm_s_expression, scm_s_test, scm_s_body,
scm_s_bindings, scm_s_variable, scm_s_clauses, scm_s_formals):
Renamed and made global.
* eval.c, eval.h (SCM_EVALIM): Renamed from EVALIM.
(SCM_XEVAL, SCM_XEVALCAR): Renamed from XEVAL, XEVALCAR.
* evalext.c (serial-map): New procedure: Version of `map' which
guarantees that the procedure is applied to the lists in serial
order.
(sequence->list): New syntax: Version of `begin' which returns a
list of the results of the body forms instead of the result of the
last body form.
(scm_definedp, scm_m_undefine): Moved from eval.c
* macros.c, macros.h: New files.
(procedure->syntax, procedure->macro, procedure->memoizing-macro,
macro?, macro-type, macro-name, macro-transformer): Moved from
eval.c
(scm_make_synt): Moved from eval.c
* procs.c, procs.h (procedure-documentation): Moved from eval.c.
1998-10-31 13:05:07 +00:00
return SCM_XEVALCAR ( pair , env ) ;
1996-07-25 22:56:11 +00:00
}
/*
* The following rewrite expressions and
* some memoized forms have different syntax
*/
2000-12-11 14:48:23 +00:00
SCM_GLOBAL_SYMBOL ( scm_sym_arrow , " => " ) ;
SCM_GLOBAL_SYMBOL ( scm_sym_else , " else " ) ;
SCM_GLOBAL_SYMBOL ( scm_sym_unquote , " unquote " ) ;
SCM_GLOBAL_SYMBOL ( scm_sym_uq_splicing , " unquote-splicing " ) ;
1999-08-29 14:22:16 +00:00
2000-12-11 14:48:23 +00:00
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 " ) ;
SCM_GLOBAL_SYMBOL ( scm_sym_trace , " trace " ) ;
1996-07-25 22:56:11 +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
/* Check that the body denoted by XORIG is valid and rewrite it into
its internal form . The internal form of a body is just the body
itself , but prefixed with an ISYM that denotes to what kind of
outer construct this body belongs . A lambda body starts with
SCM_IM_LAMBDA , for example , a body of a let starts with SCM_IM_LET ,
etc . The one exception is a body that belongs to a letrec that has
been formed by rewriting internal defines : it starts with
SCM_IM_DEFINE . */
/* XXX - Besides controlling the rewriting of internal defines, the
additional ISYM could be used for improved error messages .
This is not done yet . */
static SCM
1999-12-12 20:35:02 +00:00
scm_m_body ( SCM op , SCM xorig , const char * what )
* 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
{
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( xorig ) > = 1 , s_body , what ) ;
* 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. */
if ( SCM_ISYMP ( SCM_CAR ( xorig ) ) )
return xorig ;
/* Retain possible doc string. */
2000-05-05 11:10:57 +00:00
if ( ! SCM_CONSP ( SCM_CAR ( xorig ) ) )
* 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
{
* 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
if ( ! SCM_NULLP ( SCM_CDR ( xorig ) ) )
* 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
return scm_cons ( SCM_CAR ( xorig ) ,
* 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_m_body ( op , SCM_CDR ( xorig ) , what ) ) ;
* 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
return xorig ;
}
2000-05-08 09:57:29 +00:00
return scm_cons ( op , xorig ) ;
* 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
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
}
* __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
2003-04-27 12:06:48 +00:00
scm_m_begin ( SCM xorig , SCM env SCM_UNUSED )
1996-07-25 22:56:11 +00:00
{
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( SCM_CDR ( xorig ) ) > = 0 , s_expression , s_begin ) ;
2003-04-27 12:06:48 +00:00
return scm_cons ( SCM_IM_BEGIN , SCM_CDR ( xorig ) ) ;
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 ) ;
* __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
2001-06-07 21:12:19 +00:00
scm_m_case ( SCM xorig , SCM env SCM_UNUSED )
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 ;
SCM cdrx = SCM_CDR ( xorig ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( cdrx ) > = 2 , s_clauses , s_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
clauses = SCM_CDR ( cdrx ) ;
while ( ! SCM_NULLP ( clauses ) )
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 clause = SCM_CAR ( clauses ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( clause ) > = 2 , s_clauses , s_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_ASSYNT ( scm_ilength ( SCM_CAR ( clause ) ) > = 0
| | ( SCM_EQ_P ( scm_sym_else , SCM_CAR ( clause ) )
& & SCM_NULLP ( SCM_CDR ( clauses ) ) ) ,
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
s_clauses , s_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
clauses = SCM_CDR ( clauses ) ;
1996-07-25 22:56:11 +00:00
}
1999-07-29 23:01:01 +00:00
return scm_cons ( SCM_IM_CASE , cdrx ) ;
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 ) ;
* __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
2001-06-07 21:12:19 +00:00
scm_m_cond ( SCM xorig , SCM env SCM_UNUSED )
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 cdrx = SCM_CDR ( xorig ) ;
SCM clauses = cdrx ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( clauses ) > = 1 , s_clauses , s_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
while ( ! SCM_NULLP ( clauses ) )
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 clause = SCM_CAR ( clauses ) ;
long len = scm_ilength ( clause ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( len > = 1 , s_clauses , s_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
if ( SCM_EQ_P ( scm_sym_else , SCM_CAR ( clause ) ) )
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
int last_clause_p = SCM_NULLP ( SCM_CDR ( clauses ) ) ;
SCM_ASSYNT ( len > = 2 & & last_clause_p , " bad ELSE clause " , s_cond ) ;
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
else if ( len > = 2 & & SCM_EQ_P ( scm_sym_arrow , SCM_CADR ( clause ) ) )
{
SCM_ASSYNT ( len > 2 , " missing recipient " , s_cond ) ;
SCM_ASSYNT ( len = = 3 , " bad recipient " , s_cond ) ;
}
clauses = SCM_CDR ( clauses ) ;
1996-07-25 22:56:11 +00:00
}
1999-07-29 23:01:01 +00:00
return scm_cons ( SCM_IM_COND , cdrx ) ;
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
2003-05-04 08:36:56 +00:00
SCM_SYNTAX ( s_define , " define " , scm_i_makbimacro , scm_m_define ) ;
2003-04-27 12:06:48 +00:00
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 . */
SCM
scm_m_define ( SCM x , SCM env )
2001-03-03 15:10:37 +00:00
{
2003-04-27 12:06:48 +00:00
SCM name ;
x = SCM_CDR ( x ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( x ) > = 2 , s_expression , s_define ) ;
2003-04-27 12:06:48 +00:00
name = SCM_CAR ( x ) ;
x = SCM_CDR ( x ) ;
while ( SCM_CONSP ( name ) )
2001-03-03 15:10:37 +00:00
{
2003-04-27 12:06:48 +00:00
/* This while loop realizes function currying by variable nesting. */
SCM formals = SCM_CDR ( name ) ;
x = scm_list_1 ( scm_cons2 ( scm_sym_lambda , formals , x ) ) ;
name = SCM_CAR ( name ) ;
2001-03-03 15:10:37 +00:00
}
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_SYMBOLP ( name ) , s_variable , s_define ) ;
SCM_ASSYNT ( scm_ilength ( x ) = = 1 , s_expression , s_define ) ;
2003-04-27 12:06:48 +00:00
if ( SCM_TOP_LEVEL ( env ) )
1996-07-25 22:56:11 +00:00
{
2003-04-27 12:06:48 +00:00
SCM var ;
x = scm_eval_car ( x , env ) ;
if ( SCM_REC_PROCNAMES_P )
{
SCM tmp = x ;
while ( SCM_MACROP ( tmp ) )
tmp = SCM_MACRO_CODE ( tmp ) ;
if ( SCM_CLOSUREP ( tmp )
/* Only the first definition determines the name. */
& & SCM_FALSEP ( scm_procedure_property ( tmp , scm_sym_name ) ) )
scm_set_procedure_property_x ( tmp , scm_sym_name , name ) ;
}
var = scm_sym2var ( name , scm_env_top_level ( env ) , SCM_BOOL_T ) ;
SCM_VARIABLE_SET ( var , x ) ;
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
}
2003-04-27 12:06:48 +00:00
else
return scm_cons2 ( SCM_IM_DEFINE , name , x ) ;
1996-07-25 22:56:11 +00:00
}
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-04-27 12:06:48 +00:00
scm_m_delay ( SCM xorig , SCM env SCM_UNUSED )
1996-07-25 22:56:11 +00:00
{
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( xorig ) = = 2 , s_expression , s_delay ) ;
2003-04-27 12:06:48 +00:00
return scm_cons2 ( SCM_IM_DELAY , SCM_EOL , SCM_CDR ( xorig ) ) ;
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
2001-11-17 11:43:28 +00:00
/* DO gets the most radically altered syntax. The order of the vars is
* reversed here . In contrast , the order of the inits and steps is reversed
* during the evaluation :
1996-07-25 22:56:11 +00:00
( do ( ( < var1 > < init1 > < step1 > )
( < 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 > )
( varn . . . var2 var1 )
1996-07-25 22:56:11 +00:00
( < 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
2003-05-04 08:36:56 +00:00
SCM_SYNTAX ( s_do , " do " , scm_i_makbimacro , scm_m_do ) ;
* 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_do , s_do ) ;
* __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
2001-06-07 21:12:19 +00:00
scm_m_do ( SCM xorig , SCM env SCM_UNUSED )
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 bindings ;
SCM x = SCM_CDR ( xorig ) ;
SCM vars = SCM_EOL ;
SCM inits = SCM_EOL ;
SCM * initloc = & inits ;
SCM steps = SCM_EOL ;
SCM * steploc = & steps ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( x ) > = 2 , s_test , " do " ) ;
* 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
bindings = SCM_CAR ( x ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( bindings ) > = 0 , s_bindings , " do " ) ;
* 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
while ( ! SCM_NULLP ( bindings ) )
1996-07-25 22:56:11 +00:00
{
2001-11-17 11:43:28 +00:00
SCM binding = SCM_CAR ( bindings ) ;
long len = scm_ilength ( binding ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( len = = 2 | | len = = 3 , s_bindings , " do " ) ;
2001-11-17 11:43:28 +00:00
{
SCM name = SCM_CAR ( binding ) ;
SCM init = SCM_CADR ( binding ) ;
SCM step = ( len = = 2 ) ? name : SCM_CADDR ( binding ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_SYMBOLP ( name ) , s_variable , " do " ) ;
2001-11-17 11:43:28 +00:00
vars = scm_cons ( name , vars ) ;
* initloc = scm_list_1 ( init ) ;
initloc = SCM_CDRLOC ( * initloc ) ;
* steploc = scm_list_1 ( step ) ;
steploc = SCM_CDRLOC ( * steploc ) ;
bindings = SCM_CDR ( bindings ) ;
}
1996-07-25 22:56:11 +00:00
}
x = SCM_CDR ( x ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( SCM_CAR ( x ) ) > = 1 , s_test , " do " ) ;
1996-07-25 22:56:11 +00:00
x = scm_cons2 ( SCM_CAR ( x ) , SCM_CDR ( x ) , steps ) ;
2003-05-19 20:15:08 +00:00
x = scm_cons2 ( inits , vars , x ) ;
1999-07-29 23:01:01 +00:00
return scm_cons ( SCM_IM_DO , x ) ;
1996-07-25 22:56:11 +00:00
}
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
scm_m_if ( SCM xorig , SCM env SCM_UNUSED )
1996-07-25 22:56:11 +00:00
{
2003-04-27 12:06:48 +00:00
long len = scm_ilength ( SCM_CDR ( xorig ) ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( len > = 2 & & len < = 3 , s_expression , s_if ) ;
2003-04-27 12:06:48 +00:00
return scm_cons ( SCM_IM_IF , SCM_CDR ( xorig ) ) ;
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_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-04-27 12:06:48 +00:00
/* Return true if OBJ is `eq?' to one of the elements of LIST or to the
* cdr of the last cons . ( Thus , LIST is not required to be a proper
* list and OBJ can also be found in the improper ending . ) */
static int
scm_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
{
2003-04-27 12:06:48 +00:00
for ( ; SCM_CONSP ( list ) ; list = SCM_CDR ( list ) )
{
if ( SCM_EQ_P ( SCM_CAR ( list ) , obj ) )
return 1 ;
}
return SCM_EQ_P ( 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-04-27 12:06:48 +00:00
scm_m_lambda ( SCM xorig , 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 ;
SCM x = SCM_CDR ( xorig ) ;
* __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
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_CONSP ( x ) , s_formals , s_lambda ) ;
* __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
formals = SCM_CAR ( x ) ;
while ( SCM_CONSP ( formals ) )
1996-07-25 22:56:11 +00:00
{
2003-04-27 12:06:48 +00:00
SCM formal = SCM_CAR ( formals ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_SYMBOLP ( formal ) , s_formals , s_lambda ) ;
2003-04-27 12:06:48 +00:00
if ( scm_c_improper_memq ( formal , SCM_CDR ( formals ) ) )
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
scm_misc_error ( s_lambda , s_duplicate_formals , SCM_EOL ) ;
2003-04-27 12:06:48 +00:00
formals = SCM_CDR ( formals ) ;
1996-07-25 22:56:11 +00:00
}
2003-04-27 12:06:48 +00:00
if ( ! SCM_NULLP ( formals ) & & ! SCM_SYMBOLP ( formals ) )
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
scm_misc_error ( s_lambda , s_formals , SCM_EOL ) ;
2003-04-27 12:06:48 +00:00
return scm_cons2 ( SCM_IM_LAMBDA , SCM_CAR ( x ) ,
scm_m_body ( SCM_IM_LAMBDA , SCM_CDR ( x ) , s_lambda ) ) ;
1996-07-25 22:56:11 +00:00
}
1996-08-20 17:09:07 +00:00
1996-07-25 22:56:11 +00:00
2001-11-17 11:43:28 +00:00
/* The bindings ((v1 i1) (v2 i2) ... (vn in)) are transformed to the lists
* ( vn . . . v2 v1 ) and ( i1 i2 . . . in ) . That is , the list of variables is
* reversed here , the list of inits gets reversed during evaluation . */
static void
transform_bindings ( SCM bindings , SCM * rvarloc , SCM * initloc , const char * what )
1996-07-25 22:56:11 +00:00
{
2001-11-17 11:43:28 +00:00
SCM rvars = SCM_EOL ;
* rvarloc = SCM_EOL ;
* initloc = SCM_EOL ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( bindings ) > = 1 , s_bindings , what ) ;
1996-07-25 22:56:11 +00:00
do
{
2001-11-17 11:43:28 +00:00
SCM binding = SCM_CAR ( bindings ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( binding ) = = 2 , s_bindings , what ) ;
SCM_ASSYNT ( SCM_SYMBOLP ( SCM_CAR ( binding ) ) , s_variable , what ) ;
2001-11-17 11:43:28 +00:00
if ( scm_c_improper_memq ( SCM_CAR ( binding ) , rvars ) )
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
scm_misc_error ( what , s_duplicate_bindings , SCM_EOL ) ;
2001-11-17 11:43:28 +00:00
rvars = scm_cons ( SCM_CAR ( binding ) , rvars ) ;
* initloc = scm_list_1 ( SCM_CADR ( binding ) ) ;
* 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
initloc = SCM_CDRLOC ( * initloc ) ;
2001-11-17 11:43:28 +00:00
bindings = SCM_CDR ( bindings ) ;
1996-07-25 22:56:11 +00:00
}
2001-11-17 11:43:28 +00:00
while ( ! SCM_NULLP ( 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
2001-11-17 11:43:28 +00:00
* rvarloc = rvars ;
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
2001-11-17 11:43:28 +00:00
SCM
1999-12-12 20:35:02 +00:00
scm_m_let ( SCM xorig , SCM env )
1996-07-25 22:56:11 +00:00
{
2001-11-17 11:43:28 +00:00
SCM x = SCM_CDR ( xorig ) ;
SCM temp ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_CONSP ( x ) , s_bindings , s_let ) ;
2001-11-17 11:43:28 +00:00
temp = SCM_CAR ( x ) ;
if ( SCM_NULLP ( temp )
| | ( scm_ilength ( temp ) = = 1 & & SCM_CONSP ( SCM_CAR ( temp ) ) ) )
* 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
{
/* null or single binding, let* is faster */
2001-11-17 12:16:05 +00:00
SCM bindings = temp ;
2001-11-17 11:43:28 +00:00
SCM body = scm_m_body ( SCM_IM_LET , SCM_CDR ( x ) , s_let ) ;
2001-11-17 12:16:05 +00:00
return scm_m_letstar ( scm_cons2 ( SCM_CAR ( xorig ) , 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 if ( SCM_CONSP ( temp ) )
* 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 12:16:05 +00:00
/* plain let */
SCM bindings = temp ;
2001-11-17 11:43:28 +00:00
SCM rvars , inits , body ;
2001-11-17 12:16:05 +00:00
transform_bindings ( bindings , & rvars , & inits , " let " ) ;
2001-11-17 11:43:28 +00:00
body = scm_m_body ( SCM_IM_LET , SCM_CDR ( x ) , " let " ) ;
return scm_cons2 ( SCM_IM_LET , rvars , scm_cons ( inits , body ) ) ;
* 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
{
/* named let: Transform (let name ((var init) ...) body ...) into
* ( ( letrec ( ( name ( lambda ( var . . . ) body . . . ) ) ) name ) init . . . ) */
* 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
SCM name = temp ;
SCM vars = SCM_EOL ;
SCM * varloc = & vars ;
SCM inits = SCM_EOL ;
SCM * initloc = & inits ;
SCM bindings ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_SYMBOLP ( name ) , s_bindings , s_let ) ;
2001-11-17 11:43:28 +00:00
x = SCM_CDR ( x ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_CONSP ( x ) , s_bindings , s_let ) ;
2001-11-17 11:43:28 +00:00
bindings = SCM_CAR ( x ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( bindings ) > = 0 , s_bindings , s_let ) ;
2001-11-17 11:43:28 +00:00
while ( ! SCM_NULLP ( bindings ) )
{ /* vars and inits both in order */
SCM binding = SCM_CAR ( bindings ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( binding ) = = 2 , s_bindings , s_let ) ;
SCM_ASSYNT ( SCM_SYMBOLP ( SCM_CAR ( binding ) ) , s_variable , s_let ) ;
2001-11-17 11:43:28 +00:00
* varloc = scm_list_1 ( SCM_CAR ( binding ) ) ;
varloc = SCM_CDRLOC ( * varloc ) ;
* initloc = scm_list_1 ( SCM_CADR ( binding ) ) ;
initloc = SCM_CDRLOC ( * initloc ) ;
bindings = 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
2001-11-17 11:43:28 +00:00
{
SCM lambda_body = scm_m_body ( SCM_IM_LET , SCM_CDR ( x ) , " let " ) ;
SCM lambda_form = scm_cons2 ( scm_sym_lambda , vars , lambda_body ) ;
SCM rvar = scm_list_1 ( name ) ;
SCM init = scm_list_1 ( lambda_form ) ;
SCM body = scm_m_body ( SCM_IM_LET , scm_list_1 ( name ) , " let " ) ;
SCM letrec = scm_cons2 ( SCM_IM_LETREC , rvar , scm_cons ( init , body ) ) ;
return scm_cons ( letrec , inits ) ;
}
}
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
2003-04-27 12:06:48 +00:00
/* (let* ((v1 i1) (v2 i2) ...) body) with variables v1 .. vk and initializers
* i1 . . ik is transformed into the form ( # @ let * ( v1 i1 v2 i2 . . . ) body * ) . */
SCM
scm_m_letstar ( SCM xorig , SCM env SCM_UNUSED )
1996-07-25 22:56:11 +00:00
{
2003-04-27 12:06:48 +00:00
SCM bindings ;
SCM x = SCM_CDR ( xorig ) ;
SCM vars = SCM_EOL ;
SCM * varloc = & vars ;
1996-07-25 22:56:11 +00:00
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_CONSP ( x ) , s_bindings , s_letstar ) ;
2003-04-27 12:06:48 +00:00
bindings = SCM_CAR ( x ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( bindings ) > = 0 , s_bindings , s_letstar ) ;
2003-04-27 12:06:48 +00:00
while ( ! SCM_NULLP ( bindings ) )
{
SCM binding = SCM_CAR ( bindings ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( binding ) = = 2 , s_bindings , s_letstar ) ;
SCM_ASSYNT ( SCM_SYMBOLP ( SCM_CAR ( binding ) ) , s_variable , s_letstar ) ;
2003-04-27 12:06:48 +00:00
* varloc = scm_list_2 ( SCM_CAR ( binding ) , SCM_CADR ( binding ) ) ;
varloc = SCM_CDRLOC ( SCM_CDR ( * varloc ) ) ;
bindings = SCM_CDR ( bindings ) ;
}
return scm_cons2 ( SCM_IM_LETSTAR , vars ,
scm_m_body ( SCM_IM_LETSTAR , SCM_CDR ( x ) , s_letstar ) ) ;
}
1998-12-14 15:19:59 +00:00
1996-07-25 22:56:11 +00:00
2003-05-04 08:36:56 +00:00
SCM_SYNTAX ( s_letrec , " letrec " , scm_i_makbimacro , scm_m_letrec ) ;
2003-04-27 12:06:48 +00:00
SCM_GLOBAL_SYMBOL ( scm_sym_letrec , s_letrec ) ;
* __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
2003-04-27 12:06:48 +00:00
scm_m_letrec ( SCM xorig , SCM env )
1996-07-25 22:56:11 +00:00
{
2003-04-27 12:06:48 +00:00
SCM x = SCM_CDR ( xorig ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_CONSP ( x ) , s_bindings , s_letrec ) ;
2003-04-27 12:06:48 +00:00
if ( SCM_NULLP ( SCM_CAR ( x ) ) )
{
/* null binding, let* faster */
SCM body = scm_m_body ( SCM_IM_LETREC , SCM_CDR ( x ) , s_letrec ) ;
return scm_m_letstar ( scm_cons2 ( SCM_CAR ( xorig ) , SCM_EOL , body ) , env ) ;
}
else
{
SCM rvars , inits , body ;
transform_bindings ( SCM_CAR ( x ) , & rvars , & inits , " letrec " ) ;
body = scm_m_body ( SCM_IM_LETREC , SCM_CDR ( x ) , " letrec " ) ;
return scm_cons2 ( SCM_IM_LETREC , rvars , scm_cons ( inits , 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-04-27 12:06:48 +00:00
scm_m_or ( SCM xorig , SCM env SCM_UNUSED )
1999-07-27 19:09:06 +00:00
{
2001-05-26 20:51:22 +00:00
long len = scm_ilength ( SCM_CDR ( xorig ) ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( len > = 0 , s_test , s_or ) ;
2003-04-27 12:06:48 +00:00
if ( len > = 1 )
return scm_cons ( SCM_IM_OR , SCM_CDR ( xorig ) ) ;
else
return SCM_BOOL_F ;
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 ) ;
/* 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
{
2003-04-27 12:06:48 +00:00
if ( SCM_CONSP ( form ) )
2002-01-22 23:31:39 +00:00
{
2003-04-27 12:06:48 +00:00
SCM tmp = SCM_CAR ( form ) ;
if ( SCM_EQ_P ( tmp , scm_sym_quasiquote ) )
{
SCM args = SCM_CDR ( form ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( args ) = = 1 , s_expression , s_quasiquote ) ;
2003-04-27 12:06:48 +00:00
return scm_list_2 ( tmp , iqq ( SCM_CAR ( args ) , env , depth + 1 ) ) ;
}
else if ( SCM_EQ_P ( tmp , scm_sym_unquote ) )
{
SCM args = SCM_CDR ( form ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( args ) = = 1 , s_expression , s_quasiquote ) ;
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 ) ) ;
}
else if ( SCM_CONSP ( tmp )
& & SCM_EQ_P ( SCM_CAR ( tmp ) , scm_sym_uq_splicing ) )
{
SCM args = SCM_CDR ( tmp ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( args ) = = 1 , s_expression , s_quasiquote ) ;
2003-04-27 12:06:48 +00:00
if ( depth - 1 = = 0 )
{
SCM list = scm_eval_car ( args , env ) ;
SCM rest = SCM_CDR ( form ) ;
SCM_ASSYNT ( scm_ilength ( list ) > = 0 , s_splicing , s_quasiquote ) ;
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 ) ) ;
}
else if ( SCM_VECTORP ( form ) )
2002-01-22 23:31:39 +00:00
{
2003-04-27 12:06:48 +00:00
size_t i = SCM_VECTOR_LENGTH ( form ) ;
SCM const * const data = SCM_VELTS ( form ) ;
SCM tmp = SCM_EOL ;
while ( i ! = 0 )
tmp = scm_cons ( data [ - - i ] , tmp ) ;
scm_remember_upto_here_1 ( form ) ;
return scm_vector ( iqq ( tmp , env , depth ) ) ;
2002-01-22 23:31:39 +00:00
}
2003-04-27 12:06:48 +00:00
else
return form ;
}
SCM
scm_m_quasiquote ( SCM xorig , SCM env )
{
SCM x = SCM_CDR ( xorig ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( x ) = = 1 , s_expression , s_quasiquote ) ;
2003-04-27 12:06:48 +00:00
return iqq ( SCM_CAR ( x ) , env , 1 ) ;
}
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
scm_m_quote ( SCM xorig , SCM env SCM_UNUSED )
{
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( SCM_CDR ( xorig ) ) = = 1 , s_expression , s_quote ) ;
2003-04-27 12:06:48 +00:00
return scm_cons ( SCM_IM_QUOTE , SCM_CDR ( xorig ) ) ;
}
/* 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
scm_m_set_x ( SCM xorig , SCM env SCM_UNUSED )
{
SCM x = SCM_CDR ( xorig ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( x ) = = 2 , s_expression , s_set_x ) ;
SCM_ASSYNT ( SCM_SYMBOLP ( SCM_CAR ( x ) ) , s_variable , s_set_x ) ;
2003-04-27 12:06:48 +00:00
return scm_cons ( SCM_IM_SET_X , x ) ;
}
/* 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
scm_m_apply ( SCM xorig , SCM env SCM_UNUSED )
{
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( SCM_CDR ( xorig ) ) = = 2 , s_expression , s_atapply ) ;
2003-04-27 12:06:48 +00:00
return scm_cons ( SCM_IM_APPLY , SCM_CDR ( xorig ) ) ;
1999-07-27 19:09:06 +00:00
}
2002-01-22 23:31:39 +00:00
2001-08-25 16:08:13 +00:00
/* (@bind ((var exp) ...) body ...)
This will assign the values of the ` exp ' 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 ` exp ' s are evaluated before any ` var ' is set .
2002-01-22 23:31:39 +00:00
Think of this as ` let ' for dynamic scope .
2001-08-25 16:08:13 +00:00
It is memoized into ( # @ bind ( ( var . . . ) . ( reversed - val . . . ) ) body . . . ) .
XXX - also implement ` @ bind * ' .
*/
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
SCM
scm_m_atbind ( SCM xorig , SCM env )
{
SCM x = SCM_CDR ( xorig ) ;
2001-08-25 16:08:13 +00:00
SCM top_level = scm_env_top_level ( env ) ;
2001-10-13 15:41:12 +00:00
SCM vars = SCM_EOL , var ;
2001-08-25 16:08:13 +00:00
SCM exps = SCM_EOL ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( x ) > 1 , s_expression , s_atbind ) ;
1999-07-27 19:09:06 +00:00
x = SCM_CAR ( x ) ;
while ( SCM_NIMP ( x ) )
{
2001-08-25 16:08:13 +00:00
SCM rest ;
SCM sym_exp = SCM_CAR ( x ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( sym_exp ) = = 2 , s_bindings , s_atbind ) ;
SCM_ASSYNT ( SCM_SYMBOLP ( SCM_CAR ( sym_exp ) ) , s_bindings , s_atbind ) ;
1999-07-27 19:09:06 +00:00
x = SCM_CDR ( x ) ;
2001-08-25 16:08:13 +00:00
for ( rest = x ; SCM_NIMP ( rest ) ; rest = SCM_CDR ( rest ) )
* 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
if ( SCM_EQ_P ( SCM_CAR ( sym_exp ) , SCM_CAAR ( rest ) ) )
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
scm_misc_error ( s_atbind , s_duplicate_bindings , SCM_EOL ) ;
2001-10-13 15:41:12 +00:00
/* The first call to scm_sym2var will look beyond the current
module , while the second call wont . */
var = scm_sym2var ( SCM_CAR ( sym_exp ) , top_level , SCM_BOOL_F ) ;
if ( SCM_FALSEP ( var ) )
var = scm_sym2var ( SCM_CAR ( sym_exp ) , top_level , SCM_BOOL_T ) ;
vars = scm_cons ( var , vars ) ;
2001-08-25 16:08:13 +00:00
exps = scm_cons ( SCM_CADR ( sym_exp ) , exps ) ;
1999-07-27 19:09:06 +00:00
}
2001-08-25 16:08:13 +00:00
return scm_cons ( SCM_IM_BIND ,
scm_cons ( scm_cons ( scm_reverse_x ( vars , SCM_EOL ) , exps ) ,
SCM_CDDR ( xorig ) ) ) ;
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
scm_m_cont ( SCM xorig , SCM env SCM_UNUSED )
2003-04-25 16:22:47 +00:00
{
2003-04-27 12:06:48 +00:00
SCM_ASSYNT ( scm_ilength ( SCM_CDR ( xorig ) ) = = 1 ,
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
s_expression , s_atcall_cc ) ;
2003-04-27 12:06:48 +00:00
return scm_cons ( SCM_IM_CONT , SCM_CDR ( xorig ) ) ;
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-04-27 12:06:48 +00:00
scm_m_at_call_with_values ( SCM xorig , SCM env SCM_UNUSED )
2003-04-25 16:22:47 +00:00
{
2003-04-27 12:06:48 +00:00
SCM_ASSYNT ( scm_ilength ( SCM_CDR ( xorig ) ) = = 2 ,
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
s_expression , s_at_call_with_values ) ;
2003-04-27 12:06:48 +00:00
return scm_cons ( SCM_IM_CALL_WITH_VALUES , SCM_CDR ( xorig ) ) ;
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-04-27 12:06:48 +00:00
scm_m_future ( SCM xorig , SCM env SCM_UNUSED )
2001-03-26 22:39:35 +00:00
{
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( xorig ) = = 2 , s_expression , s_future ) ;
2003-04-27 12:06:48 +00:00
return scm_cons2 ( SCM_IM_FUTURE , SCM_EOL , SCM_CDR ( xorig ) ) ;
2001-03-26 22:39:35 +00:00
}
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
scm_m_generalized_set_x ( SCM xorig , SCM env SCM_UNUSED )
{
SCM x = SCM_CDR ( xorig ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( 2 = = scm_ilength ( x ) , s_expression , s_set_x ) ;
2003-04-27 12:06:48 +00:00
if ( SCM_SYMBOLP ( SCM_CAR ( x ) ) )
return scm_cons ( SCM_IM_SET_X , x ) ;
else if ( SCM_CONSP ( SCM_CAR ( x ) ) )
return scm_cons ( scm_list_2 ( scm_sym_setter , SCM_CAAR ( x ) ) ,
scm_append ( scm_list_2 ( SCM_CDAR ( x ) , SCM_CDR ( x ) ) ) ) ;
else
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
scm_misc_error ( s_set_x , s_variable , SCM_EOL ) ;
2003-04-27 12:06:48 +00:00
}
2003-04-28 06:05:10 +00:00
static const char * s_atslot_ref = " @slot-ref " ;
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 . */
2003-04-27 12:06:48 +00:00
SCM
scm_m_atslot_ref ( SCM xorig , SCM env SCM_UNUSED )
# define FUNC_NAME s_atslot_ref
{
SCM x = SCM_CDR ( xorig ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( x ) = = 2 , s_expression , FUNC_NAME ) ;
2003-04-27 12:06:48 +00:00
SCM_VALIDATE_INUM ( SCM_ARG2 , SCM_CADR ( x ) ) ;
return scm_cons ( SCM_IM_SLOT_REF , x ) ;
}
# undef FUNC_NAME
2003-04-28 06:05:10 +00:00
static const char * s_atslot_set_x = " @slot-set! " ;
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 . */
2003-04-27 12:06:48 +00:00
SCM
scm_m_atslot_set_x ( SCM xorig , SCM env SCM_UNUSED )
# define FUNC_NAME s_atslot_set_x
{
SCM x = SCM_CDR ( xorig ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( x ) = = 3 , s_expression , FUNC_NAME ) ;
2003-04-27 12:06:48 +00:00
SCM_VALIDATE_INUM ( SCM_ARG2 , SCM_CADR ( x ) ) ;
return scm_cons ( SCM_IM_SLOT_SET_X , x ) ;
}
# undef FUNC_NAME
# if SCM_ENABLE_ELISP
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
SCM
scm_m_nil_cond ( SCM xorig , SCM env SCM_UNUSED )
{
long len = scm_ilength ( SCM_CDR ( xorig ) ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( len > = 1 & & ( len & 1 ) = = 1 , s_expression , " nil-cond " ) ;
2003-04-27 12:06:48 +00:00
return scm_cons ( SCM_IM_NIL_COND , SCM_CDR ( xorig ) ) ;
}
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
SCM
scm_m_atfop ( SCM xorig , SCM env SCM_UNUSED )
{
SCM x = SCM_CDR ( xorig ) , var ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( scm_ilength ( x ) > = 1 , s_expression , " @fop " ) ;
2003-04-27 12:06:48 +00:00
var = scm_symbol_fref ( SCM_CAR ( x ) ) ;
/* Passing the symbol name as the `subr' arg here isn't really
right , but without it it can be very difficult to work out from
the error message which function definition was missing . In any
case , we shouldn ' t really use SCM_ASSYNT here at all , but instead
something equivalent to ( signal void - function ( list SYM ) ) in
Elisp . */
SCM_ASSYNT ( SCM_VARIABLEP ( var ) ,
" Symbol's function definition is void " ,
SCM_SYMBOL_CHARS ( SCM_CAR ( x ) ) ) ;
/* Support `defalias'. */
while ( SCM_SYMBOLP ( SCM_VARIABLE_REF ( var ) ) )
{
var = scm_symbol_fref ( SCM_VARIABLE_REF ( var ) ) ;
SCM_ASSYNT ( SCM_VARIABLEP ( var ) ,
" Symbol's function definition is void " ,
SCM_SYMBOL_CHARS ( SCM_CAR ( x ) ) ) ;
}
/* Use `var' here rather than `SCM_VARIABLE_REF (var)' because the
former allows for automatically picking up redefinitions of the
corresponding symbol . */
SCM_SETCAR ( x , var ) ;
/* If the variable contains a procedure, leave the
` transformer - macro ' in place so that the procedure ' s arguments
get properly transformed , and change the initial @ fop to
SCM_IM_APPLY . */
if ( ! SCM_MACROP ( SCM_VARIABLE_REF ( var ) ) )
{
SCM_SETCAR ( xorig , SCM_IM_APPLY ) ;
return xorig ;
}
/* Otherwise (the variable contains a macro), the arguments should
not be transformed , so cut the ` transformer - macro ' out and return
the resulting expression starting with the variable . */
SCM_SETCDR ( x , SCM_CDADR ( x ) ) ;
return x ;
}
# endif /* SCM_ENABLE_ELISP */
2003-05-06 20:05:04 +00:00
/* Start of the memoizers for deprecated macros. */
# if (SCM_ENABLE_DEPRECATED == 1)
SCM_SYNTAX ( s_undefine , " undefine " , scm_makacro , scm_m_undefine ) ;
SCM
scm_m_undefine ( SCM x , SCM env )
{
SCM arg1 = x ;
x = SCM_CDR ( x ) ;
SCM_ASSYNT ( SCM_TOP_LEVEL ( env ) , " bad placement " , s_undefine ) ;
SCM_ASSYNT ( SCM_CONSP ( x ) & & SCM_NULLP ( SCM_CDR ( x ) ) ,
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
s_expression , s_undefine ) ;
2003-05-06 20:05:04 +00:00
x = SCM_CAR ( x ) ;
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_SYMBOLP ( x ) , s_variable , s_undefine ) ;
2003-05-06 20:05:04 +00:00
arg1 = scm_sym2var ( x , scm_env_top_level ( env ) , SCM_BOOL_F ) ;
SCM_ASSYNT ( ! SCM_FALSEP ( arg1 ) & & ! SCM_UNBNDP ( SCM_VARIABLE_REF ( arg1 ) ) ,
" variable already unbound " , s_undefine ) ;
SCM_VARIABLE_SET ( arg1 , SCM_UNDEFINED ) ;
# ifdef SICP
return x ;
# else
return SCM_UNSPECIFIED ;
# endif
}
# endif
* 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_m_expand_body ( SCM xorig , SCM env )
{
2001-03-30 15:03:23 +00:00
SCM x = SCM_CDR ( xorig ) , defs = SCM_EOL ;
* 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
char * what = SCM_ISYMCHARS ( SCM_CAR ( xorig ) ) + 2 ;
while ( SCM_NIMP ( x ) )
{
2001-03-30 15:03:23 +00:00
SCM form = SCM_CAR ( x ) ;
if ( ! SCM_CONSP ( form ) )
* 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
break ;
if ( ! SCM_SYMBOLP ( SCM_CAR ( form ) ) )
break ;
2001-03-30 15:03:23 +00:00
1999-07-29 23:01:01 +00:00
form = scm_macroexp ( scm_cons_source ( form ,
SCM_CAR ( form ) ,
SCM_CDR ( form ) ) ,
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
2000-04-01 21:23:09 +00:00
if ( SCM_EQ_P ( SCM_IM_DEFINE , SCM_CAR ( form ) ) )
* 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
{
defs = scm_cons ( SCM_CDR ( form ) , defs ) ;
2001-03-30 15:03:23 +00:00
x = SCM_CDR ( x ) ;
* 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-03-30 15:03:23 +00:00
else if ( ! SCM_IMP ( defs ) )
* 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
{
break ;
}
2000-04-01 21:23:09 +00:00
else if ( SCM_EQ_P ( SCM_IM_BEGIN , SCM_CAR ( form ) ) )
* 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
{
* 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
x = scm_append ( scm_list_2 ( SCM_CDR ( form ) , SCM_CDR ( x ) ) ) ;
* 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
}
else
{
2001-03-30 15:03:23 +00:00
x = scm_cons ( form , SCM_CDR ( x ) ) ;
* 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
break ;
}
}
2001-11-17 11:43:28 +00:00
if ( ! SCM_NULLP ( defs ) )
* 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
SCM rvars , inits , body , letrec ;
transform_bindings ( defs , & rvars , & inits , what ) ;
body = scm_m_body ( SCM_IM_DEFINE , x , what ) ;
letrec = scm_cons2 ( SCM_IM_LETREC , rvars , scm_cons ( inits , body ) ) ;
SCM_SETCAR ( xorig , letrec ) ;
SCM_SETCDR ( xorig , SCM_EOL ) ;
}
else
{
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
2003-06-02 20:54:21 +00:00
SCM_ASSYNT ( SCM_CONSP ( x ) , s_body , what ) ;
2001-11-17 11:43:28 +00:00
SCM_SETCAR ( xorig , SCM_CAR ( x ) ) ;
SCM_SETCDR ( xorig , SCM_CDR ( x ) ) ;
* 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
}
return xorig ;
}
SCM
scm_macroexp ( SCM x , SCM env )
{
2001-05-15 14:57:22 +00:00
SCM res , proc , orig_sym ;
* 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 bother to produce error messages here. We get them when we
eventually execute the code for real . */
macro_tail :
2001-05-15 14:57:22 +00:00
orig_sym = SCM_CAR ( x ) ;
if ( ! SCM_SYMBOLP ( orig_sym ) )
* 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
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 . */
2003-05-04 08:36:56 +00:00
if ( ! SCM_MACROP ( proc )
| | ( SCM_MACRO_TYPE ( proc ) ! = 2 & & ! SCM_BUILTIN_MACRO_P ( proc ) ) )
* 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
return x ;
2001-05-15 14:57:22 +00:00
SCM_SETCAR ( x , orig_sym ) ; /* Undo memoizing effect of lookupcar */
2001-06-26 15:46:40 +00:00
res = scm_call_2 ( SCM_MACRO_CODE ( proc ) , 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
if ( scm_ilength ( res ) < = 0 )
* 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
res = scm_list_2 ( SCM_IM_BEGIN , res ) ;
* 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_DEFER_INTS ;
SCM_SETCAR ( x , SCM_CAR ( res ) ) ;
SCM_SETCDR ( x , SCM_CDR ( res ) ) ;
SCM_ALLOW_INTS ;
goto macro_tail ;
}
1999-07-27 19:09:06 +00:00
2003-04-20 18:08:07 +00:00
# define SCM_BIT7(x) (127 & SCM_UNPACK (x))
/* A function object to implement "apply" for non-closure functions. */
static SCM f_apply ;
/* An endless list consisting of #<undefined> objects: */
static SCM undefineds ;
1996-08-20 17:09:07 +00:00
/* scm_unmemocopy takes a memoized expression together with its
* environment and rewrites it to its original form . Thus , it is the
* inversion of the rewrite rules above . The procedure is not
* optimized for speed . It ' s used in scm_iprin1 when printing the
1997-03-10 14:18:47 +00:00
* code of a closure , in scm_procedure_source , in display_frame when
* generating the source for a stackframe in a backtrace , and in
* display_expression .
2001-05-15 14:57:22 +00:00
*
2002-01-22 23:31:39 +00:00
* Unmemoizing is not a reliable process . You cannot in general
2001-05-15 14:57:22 +00:00
* expect to get the original source back .
*
* However , GOOPS currently relies on this for method compilation .
* This ought to change .
* 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
*/
* 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
static SCM
build_binding_list ( SCM names , SCM inits )
{
SCM bindings = SCM_EOL ;
while ( ! SCM_NULLP ( names ) )
{
SCM binding = scm_list_2 ( SCM_CAR ( names ) , SCM_CAR ( inits ) ) ;
bindings = scm_cons ( binding , bindings ) ;
names = SCM_CDR ( names ) ;
inits = SCM_CDR ( inits ) ;
}
return bindings ;
}
1996-08-20 17:09:07 +00:00
static SCM
1999-12-12 02:36:16 +00:00
unmemocopy ( SCM x , SCM env )
1996-08-20 17:09:07 +00:00
{
SCM ls , z ;
SCM p ;
2001-08-31 14:42:31 +00:00
if ( ! SCM_CONSP ( x ) )
1996-08-20 17:09:07 +00:00
return x ;
p = scm_whash_lookup ( scm_source_whash , x ) ;
* 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
switch ( SCM_ITAG7 ( SCM_CAR ( x ) ) )
1996-08-20 17:09:07 +00:00
{
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_AND ) :
* 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
ls = z = scm_cons ( scm_sym_and , SCM_UNSPECIFIED ) ;
1996-08-20 17:09:07 +00:00
break ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_BEGIN ) :
* 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
ls = z = scm_cons ( scm_sym_begin , SCM_UNSPECIFIED ) ;
1996-08-20 17:09:07 +00:00
break ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_CASE ) :
* 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
ls = z = scm_cons ( scm_sym_case , SCM_UNSPECIFIED ) ;
1996-08-20 17:09:07 +00:00
break ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_COND ) :
* 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
ls = z = scm_cons ( scm_sym_cond , SCM_UNSPECIFIED ) ;
1996-08-20 17:09:07 +00:00
break ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_DO ) :
1996-08-20 17:09:07 +00:00
{
2003-05-19 20:15:08 +00:00
/* format: (#@do (i1 ... ik) (nk nk-1 ...) (test) (body) s1 ... sk),
* where ix is an initializer for a local variable , nx is the name of
* 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
* the local variable , test is the test clause of the do loop , body is
* the body of the do loop and sx are the step clauses for the local
* variables . */
SCM names , inits , test , memoized_body , steps , bindings ;
1996-08-20 17:09:07 +00:00
x = SCM_CDR ( x ) ;
* 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
inits = scm_reverse ( unmemocopy ( SCM_CAR ( x ) , env ) ) ;
2003-05-19 20:15:08 +00:00
x = SCM_CDR ( x ) ;
names = SCM_CAR ( x ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( names , SCM_EOL , env ) ;
1996-08-20 17:09:07 +00:00
x = SCM_CDR ( x ) ;
* 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
test = unmemocopy ( SCM_CAR ( x ) , env ) ;
x = SCM_CDR ( x ) ;
memoized_body = SCM_CAR ( x ) ;
x = SCM_CDR ( x ) ;
steps = scm_reverse ( unmemocopy ( 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
/* build transformed binding list */
* 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
bindings = SCM_EOL ;
while ( ! SCM_NULLP ( names ) )
1996-08-20 17:09:07 +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 name = SCM_CAR ( names ) ;
SCM init = SCM_CAR ( inits ) ;
SCM step = SCM_CAR ( steps ) ;
step = SCM_EQ_P ( step , name ) ? SCM_EOL : scm_list_1 ( step ) ;
bindings = scm_cons ( scm_cons2 ( name , init , step ) , bindings ) ;
names = SCM_CDR ( names ) ;
inits = SCM_CDR ( inits ) ;
steps = SCM_CDR ( steps ) ;
1996-08-20 17:09:07 +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
z = scm_cons ( test , SCM_UNSPECIFIED ) ;
ls = scm_cons2 ( scm_sym_do , bindings , z ) ;
x = scm_cons ( SCM_BOOL_F , memoized_body ) ;
break ;
}
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_IF ) :
* 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
ls = z = scm_cons ( scm_sym_if , SCM_UNSPECIFIED ) ;
break ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_LET ) :
* 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
{
/* format: (#@let (nk nk-1 ...) (i1 ... ik) b1 ...),
* where nx is the name of a local variable , ix is an initializer for
* the local variable and by are the body clauses . */
SCM names , inits , bindings ;
x = SCM_CDR ( x ) ;
names = SCM_CAR ( x ) ;
x = SCM_CDR ( x ) ;
inits = scm_reverse ( unmemocopy ( SCM_CAR ( x ) , env ) ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( names , SCM_EOL , 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
bindings = build_binding_list ( names , inits ) ;
z = scm_cons ( bindings , SCM_UNSPECIFIED ) ;
ls = scm_cons ( scm_sym_let , z ) ;
break ;
}
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_LETREC ) :
* 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
{
/* format: (#@letrec (nk nk-1 ...) (i1 ... ik) b1 ...),
* where nx is the name of a local variable , ix is an initializer for
* the local variable and by are the body clauses . */
SCM names , inits , bindings ;
x = SCM_CDR ( x ) ;
names = SCM_CAR ( x ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( names , SCM_EOL , 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
x = SCM_CDR ( x ) ;
inits = scm_reverse ( unmemocopy ( SCM_CAR ( x ) , env ) ) ;
bindings = build_binding_list ( names , inits ) ;
z = scm_cons ( bindings , SCM_UNSPECIFIED ) ;
ls = scm_cons ( scm_sym_letrec , z ) ;
1996-08-20 17:09:07 +00:00
break ;
}
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_LETSTAR ) :
1996-08-20 17:09:07 +00:00
{
SCM b , y ;
x = SCM_CDR ( x ) ;
b = SCM_CAR ( x ) ;
y = SCM_EOL ;
if SCM_IMP ( b )
{
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( SCM_EOL , SCM_EOL , env ) ;
1996-08-20 17:09:07 +00:00
goto letstar ;
}
y = z = scm_acons ( SCM_CAR ( b ) ,
unmemocar (
* 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_cons ( unmemocopy ( SCM_CADR ( b ) , env ) , SCM_EOL ) , env ) ,
1996-08-20 17:09:07 +00:00
SCM_UNSPECIFIED ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( SCM_CAR ( b ) , SCM_BOOL_F , 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
b = SCM_CDDR ( b ) ;
1996-08-20 17:09:07 +00:00
if ( SCM_IMP ( b ) )
{
SCM_SETCDR ( y , SCM_EOL ) ;
2003-04-21 01:07:09 +00:00
z = scm_cons ( y , SCM_UNSPECIFIED ) ;
ls = scm_cons ( scm_sym_let , z ) ;
1996-08-20 17:09:07 +00:00
break ;
}
do
{
* 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
SCM_SETCDR ( z , scm_acons ( SCM_CAR ( b ) ,
unmemocar (
* 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_list_1 ( unmemocopy ( SCM_CADR ( b ) , env ) ) , env ) ,
* 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
SCM_UNSPECIFIED ) ) ;
z = SCM_CDR ( z ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( SCM_CAR ( b ) , SCM_BOOL_F , 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
b = SCM_CDDR ( b ) ;
1996-08-20 17:09:07 +00:00
}
1999-06-19 20:21:07 +00:00
while ( SCM_NIMP ( b ) ) ;
* 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
SCM_SETCDR ( z , SCM_EOL ) ;
1996-08-20 17:09:07 +00:00
letstar :
2003-04-21 01:07:09 +00:00
z = scm_cons ( y , SCM_UNSPECIFIED ) ;
ls = scm_cons ( scm_sym_letstar , z ) ;
1996-08-20 17:09:07 +00:00
break ;
}
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_OR ) :
* 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
ls = z = scm_cons ( scm_sym_or , SCM_UNSPECIFIED ) ;
1996-08-20 17:09:07 +00:00
break ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_LAMBDA ) :
1996-08-20 17:09:07 +00:00
x = SCM_CDR ( x ) ;
* 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
z = scm_cons ( SCM_CAR ( x ) , SCM_UNSPECIFIED ) ;
ls = scm_cons ( scm_sym_lambda , z ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( SCM_CAR ( x ) , SCM_EOL , env ) ;
1996-08-20 17:09:07 +00:00
break ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_QUOTE ) :
* 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
ls = z = scm_cons ( scm_sym_quote , SCM_UNSPECIFIED ) ;
1996-08-20 17:09:07 +00:00
break ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_SET_X ) :
1999-03-11 11:45:06 +00:00
ls = z = scm_cons ( scm_sym_set_x , SCM_UNSPECIFIED ) ;
1996-08-20 17:09:07 +00:00
break ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_MAKISYM ( 0 ) ) :
1996-08-20 17:09:07 +00:00
z = SCM_CAR ( x ) ;
1999-06-19 20:21:07 +00:00
switch ( SCM_ISYMNUM ( z ) )
1996-08-20 17:09:07 +00:00
{
2003-09-14 08:07:10 +00:00
case ( SCM_ISYMNUM ( SCM_IM_DEFINE ) ) :
{
SCM n ;
x = SCM_CDR ( x ) ;
n = SCM_CAR ( x ) ;
z = scm_cons ( n , SCM_UNSPECIFIED ) ;
ls = scm_cons ( scm_sym_define , z ) ;
if ( ! SCM_NULLP ( env ) )
env = scm_cons ( scm_cons ( scm_cons ( n , SCM_CAAR ( env ) ) ,
SCM_CDAR ( env ) ) ,
SCM_CDR ( env ) ) ;
break ;
}
1996-08-20 17:09:07 +00:00
case ( SCM_ISYMNUM ( SCM_IM_APPLY ) ) :
* 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
ls = z = scm_cons ( scm_sym_atapply , SCM_UNSPECIFIED ) ;
1996-08-20 17:09:07 +00:00
goto loop ;
case ( SCM_ISYMNUM ( SCM_IM_CONT ) ) :
* 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
ls = z = scm_cons ( scm_sym_atcall_cc , SCM_UNSPECIFIED ) ;
1996-08-20 17:09:07 +00:00
goto loop ;
1999-10-11 17:39:24 +00:00
case ( SCM_ISYMNUM ( SCM_IM_DELAY ) ) :
ls = z = scm_cons ( scm_sym_delay , SCM_UNSPECIFIED ) ;
x = SCM_CDR ( x ) ;
goto loop ;
* __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
case ( SCM_ISYMNUM ( SCM_IM_FUTURE ) ) :
2002-12-29 09:54:26 +00:00
ls = z = scm_cons ( scm_sym_future , SCM_UNSPECIFIED ) ;
* __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
x = SCM_CDR ( x ) ;
goto loop ;
2001-03-26 22:39:35 +00:00
case ( SCM_ISYMNUM ( SCM_IM_CALL_WITH_VALUES ) ) :
ls = z = scm_cons ( scm_sym_at_call_with_values , SCM_UNSPECIFIED ) ;
goto loop ;
1996-08-20 17:09:07 +00:00
default :
1997-01-07 23:41:45 +00:00
/* appease the Sun compiler god: */ ;
1996-08-20 17:09:07 +00:00
}
default :
ls = z = unmemocar ( scm_cons ( unmemocopy ( SCM_CAR ( x ) , env ) ,
SCM_UNSPECIFIED ) ,
env ) ;
}
loop :
2001-08-31 14:42:31 +00:00
x = SCM_CDR ( x ) ;
while ( SCM_CONSP ( x ) )
* 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
{
2001-08-31 14:42:31 +00:00
SCM form = SCM_CAR ( x ) ;
if ( ! SCM_ISYMP ( form ) )
{
SCM copy = scm_cons ( unmemocopy ( form , env ) , SCM_UNSPECIFIED ) ;
SCM_SETCDR ( z , unmemocar ( copy , env ) ) ;
z = SCM_CDR ( z ) ;
}
x = SCM_CDR ( x ) ;
* 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
}
SCM_SETCDR ( z , x ) ;
2001-07-30 18:55:50 +00:00
if ( ! SCM_FALSEP ( p ) )
1996-08-20 17:09:07 +00:00
scm_whash_insert ( scm_source_whash , ls , p ) ;
return ls ;
}
* __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-08-20 17:09:07 +00:00
SCM
1999-12-12 20:35:02 +00:00
scm_unmemocopy ( SCM x , SCM env )
1996-08-20 17:09:07 +00:00
{
2001-07-30 18:55:50 +00:00
if ( ! SCM_NULLP ( env ) )
1996-08-20 17:09:07 +00:00
/* Make a copy of the lowest frame to protect it from
modifications by SCM_IM_DEFINE */
return unmemocopy ( x , scm_cons ( SCM_CAR ( env ) , SCM_CDR ( env ) ) ) ;
else
return unmemocopy ( x , 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
1996-07-25 22:56:11 +00:00
int
1999-12-12 20:35:02 +00:00
scm_badargsp ( SCM formals , SCM args )
1996-07-25 22:56:11 +00:00
{
2002-03-02 09:53:51 +00:00
while ( ! SCM_NULLP ( formals ) )
1996-07-25 22:56:11 +00:00
{
2001-07-30 18:55:50 +00:00
if ( ! SCM_CONSP ( formals ) )
1999-06-19 20:21:07 +00:00
return 0 ;
2002-03-02 09:53:51 +00:00
if ( SCM_NULLP ( 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 ) ;
}
2001-07-30 18:55:50 +00:00
return ! SCM_NULLP ( 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
1996-08-20 17:09:07 +00:00
SCM
1999-12-12 20:35:02 +00:00
scm_eval_args ( SCM l , SCM env , SCM proc )
1996-08-20 17:09:07 +00:00
{
1998-05-02 16:26:21 +00:00
SCM results = SCM_EOL , * lloc = & results , res ;
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
while ( SCM_CONSP ( l ) )
1996-08-20 17:09:07 +00:00
{
1998-05-02 16:26:21 +00:00
res = EVALCAR ( l , env ) ;
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40: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
* lloc = scm_list_1 ( res ) ;
* 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 ) ;
1996-08-20 17:09:07 +00:00
l = SCM_CDR ( l ) ;
}
2001-03-30 15:03:23 +00:00
if ( ! SCM_NULLP ( l ) )
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
scm_wrong_num_args ( proc ) ;
1998-05-02 16:26:21 +00:00
return results ;
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 ;
again :
2001-07-30 18:55:50 +00:00
next = SCM_CDR ( code ) ;
while ( ! SCM_NULLP ( 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 ) ) )
{
* __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_rec_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 ) ) )
code = scm_m_expand_body ( code , env ) ;
* __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_rec_mutex_unlock ( & source_mutex ) ;
* 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
SCM_XEVAL ( SCM_CAR ( code ) , env ) ;
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
}
return SCM_XEVALCAR ( code , env ) ;
}
1996-07-25 22:56:11 +00:00
# endif /* !DEVAL */
1996-08-20 17:09:07 +00:00
/* SECTION: This code is specific for the debugging support. One
* branch is read when DEVAL isn ' t defined , the other when DEVAL is
* defined .
*/
# ifndef DEVAL
# define SCM_APPLY scm_apply
# define PREP_APPLY(proc, args)
# define ENTER_APPLY
2001-11-15 17:19:53 +00:00
# define RETURN(x) do { return x; } while (0)
1996-08-23 01:20:34 +00:00
# ifdef STACK_CHECKING
# ifndef NO_CEVAL_STACK_CHECKING
# define EVAL_STACK_CHECKING
# endif
1996-08-20 17:09:07 +00:00
# endif
# else /* !DEVAL */
1996-07-25 22:56:11 +00:00
# undef SCM_CEVAL
# define SCM_CEVAL scm_deval /* Substitute all uses of scm_ceval */
# undef SCM_APPLY
# define SCM_APPLY scm_dapply
1996-08-20 17:09:07 +00:00
# undef PREP_APPLY
# define PREP_APPLY(p, l) \
{ + + debug . info ; debug . info - > a . proc = p ; debug . info - > a . args = l ; }
# undef ENTER_APPLY
# define ENTER_APPLY \
1999-12-16 03:46:42 +00:00
do { \
1996-08-23 01:20:34 +00:00
SCM_SET_ARGSREADY ( debug ) ; \
2002-03-25 23:45:02 +00:00
if ( scm_check_apply_p & & SCM_TRAPS_P ) \
1996-08-23 01:20:34 +00:00
if ( SCM_APPLY_FRAME_P | | ( SCM_TRACE_P & & PROCTRACEP ( proc ) ) ) \
1996-08-20 17:09:07 +00:00
{ \
1999-12-12 19:24:29 +00:00
SCM tmp , tail = SCM_BOOL ( SCM_TRACED_FRAME_P ( debug ) ) ; \
1997-03-01 14:23:27 +00:00
SCM_SET_TRACED_FRAME ( debug ) ; \
2001-06-26 21:55:45 +00:00
SCM_TRAPS_P = 0 ; \
1996-08-23 01:20:34 +00:00
if ( SCM_CHEAPTRAPS_P ) \
1996-08-20 17:09:07 +00:00
{ \
Don't use GCC extensions to allocate space for debugging frames.
(Here he goes again! Why do we put up with this?!)
* debug.h (scm_debug_frame): Make the 'vect' member a pointer to
an scm_debug_info structure, not an in-line array of them. Add
'info' member, to say how many vect elements we've used, for eval
frames.
* eval.c (SCM_CEVAL): Use alloca to allocate space for vect. Use
a new variable debug_info_end to mark the end of vect, instead of
the address of the 'info' pointer itself.
[DEVAL] (ENTER_APPLY, SCM_CEVAL, SCM_APPLY): Remove casts of
&debug to scm_debug_frame *; debug is a real scm_debug_frame now.
(SCM_APPLY): Explicitly allocate space for debug.vect.
* debug.c (scm_m_start_stack): Same, for vframe.vect.
* stacks.c: Adjusted for new debug frame structure.
(RELOC_INFO, RELOC_FRAME): New macros.
(stack_depth, read_frames): Use them, and new scm_debug_frame
element 'info', instead of magically knowing that eval frames have
an info pointer sitting after vect.
(scm_make_stack, scm_stack_id, scm_last_stack_frame): Use
RELOC_FRAME.
(scm_init_stacks): Formatting tweaks.
1996-12-19 07:55:42 +00:00
tmp = scm_make_debugobj ( & debug ) ; \
2001-06-26 21:55:45 +00:00
scm_call_3 ( SCM_APPLY_FRAME_HDLR , scm_sym_apply_frame , tmp , tail ) ; \
1998-08-21 08:13:55 +00:00
} \
1996-08-20 17:09:07 +00:00
else \
{ \
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
int first ; \
tmp = scm_make_continuation ( & first ) ; \
if ( first ) \
2001-06-26 21:55:45 +00:00
scm_call_3 ( SCM_APPLY_FRAME_HDLR , scm_sym_apply_frame , tmp , tail ) ; \
1996-08-20 17:09:07 +00:00
} \
2001-06-26 21:55:45 +00:00
SCM_TRAPS_P = 1 ; \
1996-08-20 17:09:07 +00:00
} \
1999-12-16 03:46:42 +00:00
} while ( 0 )
1996-07-25 22:56:11 +00:00
# undef RETURN
2001-11-15 17:19:53 +00:00
# define RETURN(e) do { proc = (e); goto exit; } while (0)
1996-08-23 01:20:34 +00:00
# ifdef STACK_CHECKING
# ifndef EVAL_STACK_CHECKING
# define EVAL_STACK_CHECKING
# endif
1996-08-20 17:09:07 +00:00
# endif
/* scm_ceval_ptr points to the currently selected evaluator.
* * fixme * : Although efficiency is important here , this state variable
* should probably not be a global . It should be related to the
* current repl .
*/
* __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
1999-12-12 02:36:16 +00:00
SCM ( * scm_ceval_ptr ) ( SCM x , SCM env ) ;
1996-07-25 22:56:11 +00:00
1996-10-05 16:49:31 +00:00
/* scm_last_debug_frame contains a pointer to the last debugging
1996-08-20 17:09:07 +00:00
* 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 .
*/
/* 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
1996-08-23 01:20:34 +00:00
int scm_debug_mode , scm_check_entry_p , scm_check_apply_p , scm_check_exit_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 [ ] = {
1998-04-12 23:34:43 +00:00
{ SCM_OPTION_INTEGER , " stack " , 22000 , " Size of thread stacks (in machine words). " }
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 ,
" *Flyweight representation of the stack at traps. " } ,
{ 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. " } ,
2001-05-25 00:17:32 +00:00
{ SCM_OPTION_INTEGER , " stack " , 20000 , " Stack size limit (measured in words; 0 = no check). " } ,
2001-06-26 21:55:45 +00:00
{ 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. " }
1996-08-20 17:09:07 +00:00
} ;
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. " } ,
{ SCM_OPTION_BOOLEAN , " apply-frame " , 0 , " Trap when entering apply. " } ,
2001-06-26 21:55:45 +00:00
{ SCM_OPTION_BOOLEAN , " exit-frame " , 0 , " Trap when exiting eval or apply. " } ,
{ 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. " } ,
{ SCM_OPTION_SCM , " exit-frame-handler " , ( unsigned long ) SCM_BOOL_F , " Handler for exit-frame traps. " }
1996-08-20 17:09:07 +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 ;
SCM_DEFER_INTS ;
ans = scm_options ( setting ,
scm_eval_opts ,
SCM_N_EVAL_OPTIONS ,
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 * ) ;
1998-03-30 21:02:59 +00:00
SCM_ALLOW_INTS ;
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 ;
SCM_DEFER_INTS ;
ans = scm_options ( setting ,
scm_evaluator_trap_table ,
SCM_N_EVALUATOR_TRAPS ,
1999-12-12 02:36:16 +00:00
FUNC_NAME ) ;
1998-03-30 21:02:59 +00:00
SCM_RESET_DEBUG_MODE ;
1999-09-28 00:18:16 +00:00
SCM_ALLOW_INTS ;
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
2002-01-10 21:11:22 +00:00
static SCM
2002-01-10 21:57:03 +00:00
deval_args ( SCM l , SCM env , SCM proc , SCM * lloc )
1996-07-25 22:56:11 +00:00
{
1998-05-02 16:26:21 +00:00
SCM * results = lloc , res ;
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
while ( SCM_CONSP ( l ) )
1996-07-25 22:56:11 +00:00
{
1998-05-02 16:26:21 +00:00
res = EVALCAR ( l , env ) ;
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40: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
* lloc = scm_list_1 ( res ) ;
* 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 ) ;
1996-07-25 22:56:11 +00:00
l = SCM_CDR ( l ) ;
}
2001-03-30 15:03:23 +00:00
if ( ! SCM_NULLP ( l ) )
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
scm_wrong_num_args ( proc ) ;
1998-05-02 16:26:21 +00:00
return * results ;
1996-07-25 22:56:11 +00:00
}
1996-08-20 17:09:07 +00:00
# endif /* !DEVAL */
2002-01-10 21:57:03 +00:00
/* SECTION: This code is compiled twice.
1996-08-20 17:09:07 +00:00
*/
2002-01-10 21:57:03 +00:00
2001-03-03 17:24:51 +00:00
/* Update the toplevel environment frame ENV so that it refers to the
2002-01-10 21:57:03 +00:00
* current module . */
2001-03-03 17:24:51 +00:00
# define UPDATE_TOPLEVEL_ENV(env) \
do { \
SCM p = scm_current_module_lookup_closure ( ) ; \
2003-04-23 18:27:37 +00:00
if ( p ! = SCM_CAR ( env ) ) \
2001-03-03 17:24:51 +00:00
env = scm_top_level_env ( p ) ; \
} while ( 0 )
1996-08-20 17:09:07 +00:00
2002-01-10 21:57:03 +00:00
/* This is the evaluator. Like any real monster, it has three heads:
*
* scm_ceval is the non - debugging evaluator , scm_deval is the debugging
* version . Both are implemented using a common code base , using the
* following mechanism : SCM_CEVAL is a macro , which is either defined to
* scm_ceval or scm_deval . Thus , there is no function SCM_CEVAL , but the code
* for SCM_CEVAL actually compiles to either scm_ceval or scm_deval . When
* SCM_CEVAL is defined to scm_ceval , it is known that the macro DEVAL is not
* defined . When SCM_CEVAL is defined to scm_deval , then the macro DEVAL is
* known to be defined . Thus , in SCM_CEVAL parts for the debugging evaluator
* are enclosed within # ifdef DEVAL . . . # endif .
*
* All three ( scm_ceval , scm_deval and their common implementation SCM_CEVAL )
* take two input parameters , x and env : x is a single expression to be
* evalutated . env is the environment in which bindings are searched .
*
* x is known to be a cell ( i . e . a pair or any other non - immediate ) . Since x
* is a single expression , it is necessarily in a tail position . If x is just
* a call to another function like in the expression ( foo exp1 exp2 . . . ) , the
* realization of that call therefore _must_not_ increase stack usage ( the
* evaluation of exp1 , exp2 etc . , however , may do so ) . This is realized by
* making extensive use of ' goto ' statements within the evaluator : The gotos
* replace recursive calls to SCM_CEVAL , thus re - using the same stack frame
* that SCM_CEVAL was already using . If , however , x represents some form that
* requires to evaluate a sequence of expressions like ( begin exp1 exp2 . . . ) ,
* then recursive calls to SCM_CEVAL are performed for all but the last
* expression of that sequence . */
1996-08-20 17:09:07 +00:00
1996-07-25 22:56:11 +00:00
#if 0
SCM
1999-12-12 02:36:16 +00:00
scm_ceval ( SCM x , SCM env )
1996-07-25 22:56:11 +00:00
{ }
# endif
* __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
2002-01-10 21:57:03 +00:00
#if 0
1996-07-25 22:56:11 +00:00
SCM
1999-12-12 02:36:16 +00:00
scm_deval ( SCM x , SCM env )
1996-07-25 22:56:11 +00:00
{ }
# endif
1996-08-20 17:09:07 +00:00
SCM
1999-12-12 02:36:16 +00:00
SCM_CEVAL ( SCM x , SCM env )
1996-07-25 22:56:11 +00:00
{
2002-03-21 00:36:03 +00:00
SCM proc , arg1 ;
1996-08-20 17:09:07 +00:00
# ifdef DEVAL
2001-06-14 19:50:43 +00:00
scm_t_debug_frame debug ;
scm_t_debug_info * debug_info_end ;
1996-10-05 16:49:31 +00:00
debug . prev = scm_last_debug_frame ;
2002-03-08 13:07:50 +00:00
debug . status = 0 ;
1999-08-04 22:55:08 +00:00
/*
2001-06-14 19:50:43 +00:00
* The debug . vect contains twice as much scm_t_debug_info frames as the
1999-08-04 22:55:08 +00:00
* user has specified with ( debug - set ! frames < n > ) .
*
* Even frames are eval frames , odd frames are apply frames .
*/
2001-06-14 19:50:43 +00:00
debug . vect = ( scm_t_debug_info * ) alloca ( scm_debug_eframe_size
2002-01-10 21:57:03 +00:00
* sizeof ( scm_t_debug_info ) ) ;
Don't use GCC extensions to allocate space for debugging frames.
(Here he goes again! Why do we put up with this?!)
* debug.h (scm_debug_frame): Make the 'vect' member a pointer to
an scm_debug_info structure, not an in-line array of them. Add
'info' member, to say how many vect elements we've used, for eval
frames.
* eval.c (SCM_CEVAL): Use alloca to allocate space for vect. Use
a new variable debug_info_end to mark the end of vect, instead of
the address of the 'info' pointer itself.
[DEVAL] (ENTER_APPLY, SCM_CEVAL, SCM_APPLY): Remove casts of
&debug to scm_debug_frame *; debug is a real scm_debug_frame now.
(SCM_APPLY): Explicitly allocate space for debug.vect.
* debug.c (scm_m_start_stack): Same, for vframe.vect.
* stacks.c: Adjusted for new debug frame structure.
(RELOC_INFO, RELOC_FRAME): New macros.
(stack_depth, read_frames): Use them, and new scm_debug_frame
element 'info', instead of magically knowing that eval frames have
an info pointer sitting after vect.
(scm_make_stack, scm_stack_id, scm_last_stack_frame): Use
RELOC_FRAME.
(scm_init_stacks): Formatting tweaks.
1996-12-19 07:55:42 +00:00
debug . info = debug . vect ;
debug_info_end = debug . vect + scm_debug_eframe_size ;
scm_last_debug_frame = & debug ;
1996-08-20 17:09:07 +00:00
# endif
1996-08-23 01:20:34 +00:00
# ifdef EVAL_STACK_CHECKING
2003-05-22 09:16:33 +00:00
if ( scm_stack_checking_enabled_p & & SCM_STACK_OVERFLOW_P ( & proc ) )
1996-08-20 17:09:07 +00:00
{
1996-08-23 01:20:34 +00:00
# ifdef DEVAL
1996-08-20 17:09:07 +00:00
debug . info - > e . exp = x ;
debug . info - > e . env = env ;
1996-08-23 01:20:34 +00:00
# endif
1996-08-20 17:09:07 +00:00
scm_report_stack_overflow ( ) ;
}
# endif
2002-03-02 09:53:51 +00:00
1996-08-20 17:09:07 +00:00
# ifdef DEVAL
goto start ;
# endif
2002-03-02 09:53:51 +00:00
1996-08-20 17:09:07 +00:00
loop :
# ifdef DEVAL
1996-08-23 01:20:34 +00:00
SCM_CLEAR_ARGSREADY ( debug ) ;
if ( SCM_OVERFLOWP ( debug ) )
1996-08-20 17:09:07 +00:00
- - debug . info ;
1999-08-04 22:55:08 +00:00
/*
* In theory , this should be the only place where it is necessary to
* check for space in debug . vect since both eval frames and
* available space are even .
*
* For this to be the case , however , it is necessary that primitive
* special forms which jump back to ` loop ' , ` begin ' or some similar
2002-03-24 22:19:46 +00:00
* label call PREP_APPLY .
1999-08-04 22:55:08 +00:00
*/
Don't use GCC extensions to allocate space for debugging frames.
(Here he goes again! Why do we put up with this?!)
* debug.h (scm_debug_frame): Make the 'vect' member a pointer to
an scm_debug_info structure, not an in-line array of them. Add
'info' member, to say how many vect elements we've used, for eval
frames.
* eval.c (SCM_CEVAL): Use alloca to allocate space for vect. Use
a new variable debug_info_end to mark the end of vect, instead of
the address of the 'info' pointer itself.
[DEVAL] (ENTER_APPLY, SCM_CEVAL, SCM_APPLY): Remove casts of
&debug to scm_debug_frame *; debug is a real scm_debug_frame now.
(SCM_APPLY): Explicitly allocate space for debug.vect.
* debug.c (scm_m_start_stack): Same, for vframe.vect.
* stacks.c: Adjusted for new debug frame structure.
(RELOC_INFO, RELOC_FRAME): New macros.
(stack_depth, read_frames): Use them, and new scm_debug_frame
element 'info', instead of magically knowing that eval frames have
an info pointer sitting after vect.
(scm_make_stack, scm_stack_id, scm_last_stack_frame): Use
RELOC_FRAME.
(scm_init_stacks): Formatting tweaks.
1996-12-19 07:55:42 +00:00
else if ( + + debug . info > = debug_info_end )
1996-08-20 17:09:07 +00:00
{
1996-08-23 01:20:34 +00:00
SCM_SET_OVERFLOW ( debug ) ;
1996-08-20 17:09:07 +00:00
debug . info - = 2 ;
}
2002-03-02 09:53:51 +00:00
1996-08-20 17:09:07 +00:00
start :
debug . info - > e . exp = x ;
debug . info - > e . env = env ;
2002-03-25 23:45:02 +00:00
if ( scm_check_entry_p & & SCM_TRAPS_P )
{
2002-03-26 00:19:04 +00:00
if ( SCM_ENTER_FRAME_P
| | ( SCM_BREAKPOINTS_P & & scm_c_source_property_breakpoint_p ( x ) ) )
2002-03-25 23:45:02 +00:00
{
2002-03-26 00:19:04 +00:00
SCM stackrep ;
SCM tail = SCM_BOOL ( SCM_TAILRECP ( debug ) ) ;
2002-03-25 23:45:02 +00:00
SCM_SET_TAILREC ( debug ) ;
if ( SCM_CHEAPTRAPS_P )
2002-03-26 00:19:04 +00:00
stackrep = scm_make_debugobj ( & debug ) ;
2002-03-25 23:45:02 +00:00
else
{
int first ;
SCM val = scm_make_continuation ( & first ) ;
if ( first )
2002-03-26 00:19:04 +00:00
stackrep = val ;
2002-03-25 23:45:02 +00:00
else
{
x = val ;
if ( SCM_IMP ( x ) )
RETURN ( x ) ;
else
/* This gives the possibility for the debugger to
modify the source expression before evaluation . */
goto dispatch ;
}
}
SCM_TRAPS_P = 0 ;
scm_call_4 ( SCM_ENTER_FRAME_HDLR ,
scm_sym_enter_frame ,
2002-03-26 00:19:04 +00:00
stackrep ,
2002-03-25 23:45:02 +00:00
tail ,
scm_unmemocopy ( x , env ) ) ;
SCM_TRAPS_P = 1 ;
}
}
1996-08-20 17:09:07 +00:00
# endif
1997-06-08 15:46:19 +00:00
dispatch :
1998-01-30 21:07:51 +00:00
SCM_TICK ;
1996-07-25 22:56:11 +00:00
switch ( SCM_TYP7 ( x ) )
{
2000-09-12 12:30:36 +00:00
case scm_tc7_symbol :
2002-01-10 21:57:03 +00:00
/* Only happens when called at top level. */
1996-07-25 22:56:11 +00:00
x = scm_cons ( x , SCM_UNDEFINED ) ;
2001-11-15 17:19:53 +00:00
RETURN ( * scm_lookupcar ( x , env , 1 ) ) ;
1996-07-25 22:56:11 +00:00
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_AND ) :
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2001-11-17 11:43:28 +00:00
while ( ! SCM_NULLP ( SCM_CDR ( x ) ) )
{
2002-03-02 12:47:45 +00:00
SCM test_result = EVALCAR ( x , env ) ;
if ( SCM_FALSEP ( test_result ) | | SCM_NILP ( test_result ) )
1996-07-25 22:56:11 +00:00
RETURN ( SCM_BOOL_F ) ;
2001-11-17 11:43:28 +00:00
else
x = SCM_CDR ( x ) ;
}
1996-08-20 17:09:07 +00:00
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
1996-07-25 22:56:11 +00:00
goto carloop ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_BEGIN ) :
2002-03-20 23:53:13 +00:00
x = SCM_CDR ( x ) ;
if ( SCM_NULLP ( x ) )
2001-11-03 18:45:33 +00:00
RETURN ( SCM_UNSPECIFIED ) ;
1996-08-20 17:09:07 +00:00
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
1996-07-25 22:56:11 +00:00
begin :
2001-02-11 18:13:07 +00:00
/* If we are on toplevel with a lookup closure, we need to sync
with the current module . */
2001-03-30 15:03:23 +00:00
if ( SCM_CONSP ( env ) & & ! SCM_CONSP ( SCM_CAR ( env ) ) )
2001-02-11 18:13:07 +00:00
{
2001-03-03 17:24:51 +00:00
UPDATE_TOPLEVEL_ENV ( env ) ;
2001-11-17 11:43:28 +00:00
while ( ! SCM_NULLP ( SCM_CDR ( x ) ) )
2001-02-11 18:13:07 +00:00
{
2001-03-03 15:10:37 +00:00
EVALCAR ( x , env ) ;
2001-03-03 17:24:51 +00:00
UPDATE_TOPLEVEL_ENV ( env ) ;
2001-11-17 11:43:28 +00:00
x = SCM_CDR ( x ) ;
2001-02-11 18:13:07 +00:00
}
2001-03-03 15:10:37 +00:00
goto carloop ;
2001-02-11 18:13:07 +00:00
}
else
2001-03-03 15:10:37 +00:00
goto nontoplevel_begin ;
nontoplevel_begin :
2001-11-17 11:43:28 +00:00
while ( ! SCM_NULLP ( SCM_CDR ( x ) ) )
1996-07-25 22:56:11 +00:00
{
2002-03-02 09:53:51 +00:00
SCM form = SCM_CAR ( x ) ;
if ( SCM_IMP ( form ) )
* 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
{
2002-03-02 09:53:51 +00:00
if ( SCM_ISYMP ( form ) )
* 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 (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_rec_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 ( x ) ) )
x = scm_m_expand_body ( x , env ) ;
* __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_rec_mutex_unlock ( & source_mutex ) ;
2001-03-03 15:10:37 +00:00
goto nontoplevel_begin ;
* 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-02-11 18:13:07 +00:00
else
2002-03-02 09:53:51 +00:00
SCM_VALIDATE_NON_EMPTY_COMBINATION ( form ) ;
* 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-03-03 15:10:37 +00:00
else
2002-03-02 09:53:51 +00:00
SCM_CEVAL ( form , env ) ;
2001-11-17 11:43:28 +00:00
x = SCM_CDR ( x ) ;
1996-07-25 22:56:11 +00:00
}
2001-03-03 15:10:37 +00:00
2002-03-02 09:53:51 +00:00
carloop :
{
/* scm_eval last form in list */
SCM last_form = SCM_CAR ( x ) ;
1996-07-25 22:56:11 +00:00
2002-03-02 09:53:51 +00:00
if ( SCM_CONSP ( last_form ) )
{
/* This is by far the most frequent case. */
x = last_form ;
goto loop ; /* tail recurse */
}
else if ( SCM_IMP ( last_form ) )
RETURN ( SCM_EVALIM ( last_form , env ) ) ;
else if ( SCM_VARIABLEP ( last_form ) )
RETURN ( SCM_VARIABLE_REF ( last_form ) ) ;
else if ( SCM_SYMBOLP ( last_form ) )
RETURN ( * scm_lookupcar ( x , env , 1 ) ) ;
else
RETURN ( last_form ) ;
}
1996-07-25 22:56:11 +00:00
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_CASE ) :
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2002-03-02 09:53:51 +00:00
{
SCM key = EVALCAR ( x , env ) ;
x = SCM_CDR ( x ) ;
while ( ! SCM_NULLP ( x ) )
{
SCM clause = SCM_CAR ( x ) ;
SCM labels = SCM_CAR ( clause ) ;
if ( SCM_EQ_P ( labels , scm_sym_else ) )
{
x = SCM_CDR ( clause ) ;
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto begin ;
}
while ( ! SCM_NULLP ( labels ) )
{
SCM label = SCM_CAR ( labels ) ;
if ( SCM_EQ_P ( label , key ) | | ! SCM_FALSEP ( scm_eqv_p ( label , key ) ) )
{
x = SCM_CDR ( clause ) ;
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto begin ;
}
labels = SCM_CDR ( labels ) ;
}
x = SCM_CDR ( x ) ;
}
}
2001-11-15 17:19:53 +00:00
RETURN ( SCM_UNSPECIFIED ) ;
1996-07-25 22:56:11 +00:00
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_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
x = SCM_CDR ( x ) ;
while ( ! SCM_NULLP ( x ) )
1996-07-25 22:56:11 +00:00
{
2002-03-02 11:50:01 +00:00
SCM clause = SCM_CAR ( x ) ;
if ( SCM_EQ_P ( SCM_CAR ( clause ) , scm_sym_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
{
2002-03-02 11:50:01 +00:00
x = SCM_CDR ( clause ) ;
* 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
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto begin ;
}
2002-03-02 11:50:01 +00:00
else
1996-07-25 22:56:11 +00:00
{
2002-03-14 06:45:56 +00:00
arg1 = EVALCAR ( clause , env ) ;
if ( ! SCM_FALSEP ( arg1 ) & & ! SCM_NILP ( arg1 ) )
1996-08-20 17:09:07 +00:00
{
2002-03-02 11:50:01 +00:00
x = SCM_CDR ( clause ) ;
if ( SCM_NULLP ( x ) )
2002-03-14 06:45:56 +00:00
RETURN ( arg1 ) ;
2002-03-02 11:50:01 +00:00
else if ( ! SCM_EQ_P ( SCM_CAR ( x ) , scm_sym_arrow ) )
{
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto begin ;
}
else
{
proc = SCM_CDR ( x ) ;
proc = EVALCAR ( proc , env ) ;
2002-03-14 06:45:56 +00:00
PREP_APPLY ( proc , scm_list_1 ( arg1 ) ) ;
2002-03-02 11:50:01 +00:00
ENTER_APPLY ;
2003-05-25 07:50:23 +00:00
goto evap1 ;
2002-03-02 11:50:01 +00:00
}
1996-08-20 17:09:07 +00:00
}
2002-03-02 11:50:01 +00:00
x = SCM_CDR ( x ) ;
1996-07-25 22:56:11 +00:00
}
}
2001-11-15 17:19:53 +00:00
RETURN ( SCM_UNSPECIFIED ) ;
1996-07-25 22:56:11 +00:00
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_DO ) :
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2002-03-02 11:50:01 +00:00
{
/* Compute the initialization values and the initial environment. */
2003-05-19 20:15:08 +00:00
SCM init_forms = SCM_CAR ( x ) ;
2002-03-02 11:50:01 +00:00
SCM init_values = SCM_EOL ;
while ( ! SCM_NULLP ( init_forms ) )
{
init_values = scm_cons ( EVALCAR ( init_forms , env ) , init_values ) ;
init_forms = SCM_CDR ( init_forms ) ;
}
2003-05-19 20:15:08 +00:00
x = SCM_CDR ( x ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( SCM_CAR ( x ) , init_values , env ) ;
2002-03-02 11:50:01 +00:00
}
2003-05-19 20:15:08 +00:00
x = SCM_CDR ( x ) ;
2002-03-02 11:50:01 +00:00
{
SCM test_form = SCM_CAR ( x ) ;
SCM body_forms = SCM_CADR ( x ) ;
SCM step_forms = SCM_CDDR ( x ) ;
SCM test_result = EVALCAR ( test_form , env ) ;
while ( SCM_FALSEP ( test_result ) | | SCM_NILP ( test_result ) )
{
1996-07-25 22:56:11 +00:00
{
2002-03-02 11:50:01 +00:00
/* Evaluate body forms. */
SCM temp_forms ;
for ( temp_forms = body_forms ;
! SCM_NULLP ( temp_forms ) ;
temp_forms = SCM_CDR ( temp_forms ) )
{
SCM form = SCM_CAR ( temp_forms ) ;
/* Dirk:FIXME: We only need to eval forms, that may have a
* side effect here . This is only true for forms that start
* with a pair . All others are just constants . However ,
* since in the common case there is no constant expression
* in a body of a do form , we just check for immediates here
* and have SCM_CEVAL take care of other cases . In the long
* run it would make sense to get rid of this test and have
* the macro transformer of ' do ' eliminate all forms that
* have no sideeffect . */
if ( ! SCM_IMP ( form ) )
SCM_CEVAL ( form , env ) ;
}
1996-07-25 22:56:11 +00:00
}
2002-03-02 11:50:01 +00:00
{
/* Evaluate the step expressions. */
SCM temp_forms ;
SCM step_values = SCM_EOL ;
for ( temp_forms = step_forms ;
! SCM_NULLP ( temp_forms ) ;
temp_forms = SCM_CDR ( temp_forms ) )
{
SCM value = EVALCAR ( temp_forms , env ) ;
step_values = scm_cons ( value , step_values ) ;
}
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( SCM_CAAR ( env ) ,
step_values ,
SCM_CDR ( env ) ) ;
2002-03-02 11:50:01 +00:00
}
test_result = EVALCAR ( test_form , env ) ;
}
}
x = SCM_CDAR ( x ) ;
1996-07-25 22:56:11 +00:00
if ( SCM_NULLP ( x ) )
1996-08-20 17:09:07 +00:00
RETURN ( SCM_UNSPECIFIED ) ;
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
2001-03-03 15:10:37 +00:00
goto nontoplevel_begin ;
1996-07-25 22:56:11 +00:00
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_IF ) :
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2002-03-02 12:47:45 +00:00
{
SCM test_result = EVALCAR ( x , env ) ;
if ( ! SCM_FALSEP ( test_result ) & & ! SCM_NILP ( test_result ) )
x = SCM_CDR ( x ) ;
else
{
x = SCM_CDDR ( x ) ;
if ( SCM_NULLP ( x ) )
RETURN ( SCM_UNSPECIFIED ) ;
}
}
1996-08-20 17:09:07 +00:00
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
1996-07-25 22:56:11 +00:00
goto carloop ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_LET ) :
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2002-03-02 12:47:45 +00:00
{
SCM init_forms = SCM_CADR ( x ) ;
SCM init_values = SCM_EOL ;
do
{
init_values = scm_cons ( EVALCAR ( init_forms , env ) , init_values ) ;
init_forms = SCM_CDR ( init_forms ) ;
}
while ( ! SCM_NULLP ( init_forms ) ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( SCM_CAR ( x ) , init_values , env ) ;
2002-03-02 12:47:45 +00:00
}
2002-03-20 23:53:13 +00:00
x = SCM_CDDR ( x ) ;
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto nontoplevel_begin ;
1996-07-25 22:56:11 +00:00
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_LETREC ) :
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( SCM_CAR ( x ) , undefineds , env ) ;
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2002-03-02 12:47:45 +00:00
{
SCM init_forms = SCM_CAR ( x ) ;
SCM init_values = SCM_EOL ;
do
{
init_values = scm_cons ( EVALCAR ( init_forms , env ) , init_values ) ;
init_forms = SCM_CDR ( init_forms ) ;
}
while ( ! SCM_NULLP ( init_forms ) ) ;
SCM_SETCDR ( SCM_CAR ( env ) , init_values ) ;
}
2002-03-20 23:53:13 +00:00
x = SCM_CDR ( x ) ;
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto nontoplevel_begin ;
1996-07-25 22:56:11 +00:00
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_LETSTAR ) :
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2001-11-17 11:43:28 +00:00
{
SCM bindings = SCM_CAR ( x ) ;
if ( SCM_NULLP ( bindings ) )
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( SCM_EOL , SCM_EOL , env ) ;
2001-11-17 11:43:28 +00:00
else
{
do
{
SCM name = SCM_CAR ( bindings ) ;
SCM init = SCM_CDR ( bindings ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( name , EVALCAR ( init , env ) , env ) ;
2001-11-17 11:43:28 +00:00
bindings = SCM_CDR ( init ) ;
}
while ( ! SCM_NULLP ( bindings ) ) ;
}
}
2002-03-20 23:53:13 +00:00
x = SCM_CDR ( x ) ;
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto nontoplevel_begin ;
1996-07-25 22:56:11 +00:00
2001-11-17 11:43:28 +00:00
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_OR ) :
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2001-11-17 11:43:28 +00:00
while ( ! SCM_NULLP ( SCM_CDR ( x ) ) )
1996-07-25 22:56:11 +00:00
{
2001-11-17 11:43:28 +00:00
SCM val = EVALCAR ( x , env ) ;
2002-01-22 23:31:39 +00:00
if ( ! SCM_FALSEP ( val ) & & ! SCM_NILP ( val ) )
2001-11-17 11:43:28 +00:00
RETURN ( val ) ;
else
x = SCM_CDR ( x ) ;
1996-07-25 22:56:11 +00:00
}
1996-08-20 17:09:07 +00:00
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
1996-07-25 22:56:11 +00:00
goto carloop ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_LAMBDA ) :
1996-07-25 22:56:11 +00:00
RETURN ( scm_closure ( SCM_CDR ( x ) , env ) ) ;
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_QUOTE ) :
* 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
RETURN ( SCM_CADR ( x ) ) ;
1996-07-25 22:56:11 +00:00
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_IM_SET_X ) :
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2002-03-02 12:47:45 +00:00
{
SCM * location ;
SCM variable = SCM_CAR ( x ) ;
2002-03-20 23:53:13 +00:00
if ( SCM_ILOCP ( variable ) )
2002-03-02 12:47:45 +00:00
location = scm_ilookup ( variable , env ) ;
2002-07-15 20:39:53 +00:00
else if ( SCM_VARIABLEP ( variable ) )
2002-03-20 23:53:13 +00:00
location = SCM_VARIABLE_LOC ( variable ) ;
2002-03-02 12:47:45 +00:00
else /* (SCM_SYMBOLP (variable)) is known to be true */
location = scm_lookupcar ( x , env , 1 ) ;
x = SCM_CDR ( x ) ;
* location = EVALCAR ( x , env ) ;
}
1996-07-25 22:56:11 +00:00
RETURN ( SCM_UNSPECIFIED ) ;
/* new syntactic forms go here. */
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_MAKISYM ( 0 ) ) :
1996-07-25 22:56:11 +00:00
proc = SCM_CAR ( x ) ;
2002-01-10 21:57:03 +00:00
switch ( SCM_ISYMNUM ( proc ) )
1996-07-25 22:56:11 +00:00
{
2002-03-05 21:10:15 +00:00
2003-09-14 08:07:10 +00:00
case ( SCM_ISYMNUM ( SCM_IM_DEFINE ) ) :
/* Top level defines are handled directly by the memoizer and thus
* will never generate memoized code with SCM_IM_DEFINE . Internal
* defines which occur at valid positions will be transformed into
* letrec expressions . Thus , whenever the executor detects
* SCM_IM_DEFINE , this must come from an internal definition at an
* illegal position . */
scm_misc_error ( NULL , " Bad define placement " , SCM_EOL ) ;
1996-07-25 22:56:11 +00:00
case ( SCM_ISYMNUM ( SCM_IM_APPLY ) ) :
2003-05-30 11:04:57 +00:00
x = SCM_CDR ( x ) ;
proc = EVALCAR ( x , env ) ;
PREP_APPLY ( proc , SCM_EOL ) ;
x = SCM_CDR ( x ) ;
arg1 = EVALCAR ( x , env ) ;
2003-05-30 14:36:56 +00:00
apply_proc :
/* Go here to tail-apply a procedure. PROC is the procedure and
* ARG1 is the list of arguments . PREP_APPLY must have been called
* before jumping to apply_proc . */
1996-07-25 22:56:11 +00:00
if ( SCM_CLOSUREP ( proc ) )
{
2003-05-30 14:36:56 +00:00
SCM formals = SCM_CLOSURE_FORMALS ( proc ) ;
1996-08-20 17:09:07 +00:00
# ifdef DEVAL
2003-05-30 14:36:56 +00:00
debug . info - > a . args = arg1 ;
1996-08-20 17:09:07 +00:00
# endif
2003-05-30 14:36:56 +00:00
if ( scm_badargsp ( formals , arg1 ) )
scm_wrong_num_args ( proc ) ;
ENTER_APPLY ;
/* Copy argument list */
if ( SCM_NULL_OR_NIL_P ( arg1 ) )
env = SCM_EXTEND_ENV ( formals , SCM_EOL , SCM_ENV ( proc ) ) ;
else
{
SCM args = scm_list_1 ( SCM_CAR ( arg1 ) ) ;
SCM tail = args ;
arg1 = SCM_CDR ( arg1 ) ;
while ( ! SCM_NULL_OR_NIL_P ( arg1 ) )
{
SCM new_tail = scm_list_1 ( SCM_CAR ( arg1 ) ) ;
SCM_SETCDR ( tail , new_tail ) ;
tail = new_tail ;
arg1 = SCM_CDR ( arg1 ) ;
}
env = SCM_EXTEND_ENV ( formals , args , SCM_ENV ( proc ) ) ;
}
x = SCM_CLOSURE_BODY ( proc ) ;
goto nontoplevel_begin ;
1996-07-25 22:56:11 +00:00
}
2002-03-05 21:10:15 +00:00
else
{
2003-05-30 11:04:57 +00:00
ENTER_APPLY ;
RETURN ( SCM_APPLY ( proc , arg1 , SCM_EOL ) ) ;
2002-03-05 21:10:15 +00:00
}
1996-07-25 22:56:11 +00:00
case ( SCM_ISYMNUM ( SCM_IM_CONT ) ) :
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
{
int first ;
SCM val = scm_make_continuation ( & first ) ;
2002-03-20 23:53:13 +00:00
if ( ! first )
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
RETURN ( val ) ;
2002-03-20 23:53:13 +00:00
else
{
arg1 = val ;
proc = SCM_CDR ( x ) ;
proc = scm_eval_car ( proc , env ) ;
PREP_APPLY ( proc , scm_list_1 ( arg1 ) ) ;
ENTER_APPLY ;
goto evap1 ;
}
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
}
2002-03-20 23:53:13 +00:00
1996-07-25 22:56:11 +00:00
1999-10-11 17:39:24 +00:00
case ( SCM_ISYMNUM ( SCM_IM_DELAY ) ) :
2001-11-15 17:19:53 +00:00
RETURN ( scm_makprom ( scm_closure ( SCM_CDR ( x ) , env ) ) ) ;
1999-10-11 17:39:24 +00:00
2002-03-20 23:53:13 +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
case ( SCM_ISYMNUM ( SCM_IM_FUTURE ) ) :
RETURN ( scm_i_make_future ( scm_closure ( SCM_CDR ( x ) , env ) ) ) ;
2003-04-28 12:43:45 +00:00
/* PLACEHOLDER for case (SCM_ISYMNUM (SCM_IM_DISPATCH)): The
following code ( type_dispatch ) is intended to be the tail
of the case clause for the internal macro
SCM_IM_DISPATCH . Please don ' t remove it from this
location without discussing it with Mikael
< djurfeldt @ nada . kth . se > */
2002-03-09 20:15:16 +00:00
/* The type dispatch code is duplicated below
* ( c . f . objects . c : scm_mcache_compute_cmethod ) since that
* cuts down execution time for type dispatch to 50 % . */
2002-03-14 06:45:56 +00:00
type_dispatch : /* inputs: x, arg1 */
2002-03-09 20:15:16 +00:00
/* Type dispatch means to determine from the types of the function
* arguments ( i . e . the ' signature ' of the call ) , which method from
* a generic function is to be called . This process of selecting
* the right method takes some time . To speed it up , guile uses
* caching : Together with the macro call to dispatch the signatures
* of some previous calls to that generic function from the same
* place are stored ( in the code ! ) in a cache that we call the
* ' method cache ' . This is done since it is likely , that
* consecutive calls to dispatch from that position in the code will
* have the same signature . Thus , the type dispatch works as
* follows : First , determine a hash value from the signature of the
* actual arguments . Second , use this hash value as an index to
* find that same signature in the method cache stored at this
* position in the code . If found , you have also found the
* corresponding method that belongs to that signature . If the
* signature is not found in the method cache , you have to perform a
* full search over all signatures stored with the generic
* function . */
{
unsigned long int specializers ;
unsigned long int hash_value ;
unsigned long int cache_end_pos ;
unsigned long int mask ;
SCM method_cache ;
{
SCM z = SCM_CDDR ( x ) ;
SCM tmp = SCM_CADR ( z ) ;
specializers = SCM_INUM ( SCM_CAR ( z ) ) ;
/* Compute a hash value for searching the method cache. There
* are two variants for computing the hash value , a ( rather )
* complicated one , and a simple one . For the complicated one
* explained below , tmp holds a number that is used in the
* computation . */
if ( SCM_INUMP ( tmp ) )
{
/* Use the signature of the actual arguments to determine
* the hash value . This is done as follows : Each class has
* an array of random numbers , that are determined when the
* class is created . The integer ' hashset ' is an index into
* that array of random numbers . Now , from all classes that
* are part of the signature of the actual arguments , the
* random numbers at index ' hashset ' are taken and summed
* up , giving the hash value . The value of ' hashset ' is
* stored at the call to dispatch . This allows to have
* different ' formulas ' for calculating the hash value at
* different places where dispatch is called . This allows
* to optimize the hash formula at every individual place
* where dispatch is called , such that hopefully the hash
* value that is computed will directly point to the right
* method in the method cache . */
unsigned long int hashset = SCM_INUM ( tmp ) ;
unsigned long int counter = specializers + 1 ;
2002-03-14 06:45:56 +00:00
SCM tmp_arg = arg1 ;
2002-03-09 20:15:16 +00:00
hash_value = 0 ;
while ( ! SCM_NULLP ( tmp_arg ) & & counter ! = 0 )
1999-08-30 02:18:00 +00:00
{
2002-03-09 20:15:16 +00:00
SCM class = scm_class_of ( SCM_CAR ( tmp_arg ) ) ;
hash_value + = SCM_INSTANCE_HASH ( class , hashset ) ;
tmp_arg = SCM_CDR ( tmp_arg ) ;
counter - - ;
1999-08-30 02:18:00 +00:00
}
2002-03-09 20:15:16 +00:00
z = SCM_CDDR ( z ) ;
method_cache = SCM_CADR ( z ) ;
mask = SCM_INUM ( SCM_CAR ( z ) ) ;
hash_value & = mask ;
cache_end_pos = hash_value ;
}
else
{
/* This method of determining the hash value is much
* simpler : Set the hash value to zero and just perform a
* linear search through the method cache . */
method_cache = tmp ;
mask = ( unsigned long int ) ( ( long ) - 1 ) ;
hash_value = 0 ;
cache_end_pos = SCM_VECTOR_LENGTH ( method_cache ) ;
}
}
1999-08-30 02:18:00 +00:00
2002-03-09 20:15:16 +00:00
{
/* Search the method cache for a method with a matching
* signature . Start the search at position ' hash_value ' . The
* hashing implementation uses linear probing for conflict
* resolution , that is , if the signature in question is not
* found at the starting index in the hash table , the next table
* entry is tried , and so on , until in the worst case the whole
* cache has been searched , but still the signature has not been
* found . */
SCM z ;
do
{
2002-03-14 06:45:56 +00:00
SCM args = arg1 ; /* list of arguments */
2002-03-09 20:15:16 +00:00
z = SCM_VELTS ( method_cache ) [ hash_value ] ;
while ( ! SCM_NULLP ( args ) )
1999-08-30 02:18:00 +00:00
{
/* More arguments than specifiers => CLASS != ENV */
2002-03-09 20:15:16 +00:00
SCM class_of_arg = scm_class_of ( SCM_CAR ( args ) ) ;
if ( ! SCM_EQ_P ( class_of_arg , SCM_CAR ( z ) ) )
1999-08-30 02:18:00 +00:00
goto next_method ;
2002-03-09 20:15:16 +00:00
args = SCM_CDR ( args ) ;
1999-08-30 02:18:00 +00:00
z = SCM_CDR ( z ) ;
}
2002-03-09 20:15:16 +00:00
/* Fewer arguments than specifiers => CAR != ENV */
if ( SCM_NULLP ( SCM_CAR ( z ) ) | | SCM_CONSP ( SCM_CAR ( z ) ) )
goto apply_cmethod ;
next_method :
hash_value = ( hash_value + 1 ) & mask ;
} while ( hash_value ! = cache_end_pos ) ;
/* No appropriate method was found in the cache. */
2002-03-14 06:45:56 +00:00
z = scm_memoize_method ( x , arg1 ) ;
2002-03-09 20:15:16 +00:00
2002-03-14 06:45:56 +00:00
apply_cmethod : /* inputs: z, arg1 */
2002-03-09 20:15:16 +00:00
{
SCM formals = SCM_CMETHOD_FORMALS ( z ) ;
2003-04-21 19:20:13 +00:00
env = SCM_EXTEND_ENV ( formals , arg1 , SCM_CMETHOD_ENV ( z ) ) ;
2002-03-09 20:15:16 +00:00
x = SCM_CMETHOD_BODY ( z ) ;
goto nontoplevel_begin ;
}
}
1999-08-30 02:18:00 +00:00
}
1999-07-27 19:09:06 +00:00
2002-03-10 07:53:27 +00:00
1999-07-29 09:54:10 +00:00
case ( SCM_ISYMNUM ( SCM_IM_SLOT_REF ) ) :
x = SCM_CDR ( x ) ;
2002-03-10 07:53:27 +00:00
{
SCM instance = EVALCAR ( x , env ) ;
unsigned long int slot = SCM_INUM ( SCM_CADR ( x ) ) ;
RETURN ( SCM_PACK ( SCM_STRUCT_DATA ( instance ) [ slot ] ) ) ;
}
1999-07-29 09:54:10 +00:00
case ( SCM_ISYMNUM ( SCM_IM_SLOT_SET_X ) ) :
x = SCM_CDR ( x ) ;
2002-03-10 07:53:27 +00:00
{
SCM instance = EVALCAR ( x , env ) ;
unsigned long int slot = SCM_INUM ( SCM_CADR ( x ) ) ;
SCM value = EVALCAR ( SCM_CDDR ( x ) , env ) ;
SCM_STRUCT_DATA ( instance ) [ slot ] = SCM_UNPACK ( value ) ;
RETURN ( SCM_UNSPECIFIED ) ;
}
2002-01-22 23:31:39 +00:00
2003-03-27 20:06:59 +00:00
# if SCM_ENABLE_ELISP
1999-07-29 09:54:10 +00:00
1999-07-27 19:09:06 +00:00
case ( SCM_ISYMNUM ( SCM_IM_NIL_COND ) ) :
2002-03-10 07:53:27 +00:00
{
SCM test_form = SCM_CDR ( x ) ;
x = SCM_CDR ( test_form ) ;
while ( ! SCM_NULL_OR_NIL_P ( x ) )
{
SCM test_result = EVALCAR ( test_form , env ) ;
if ( ! ( SCM_FALSEP ( test_result )
| | SCM_NULL_OR_NIL_P ( test_result ) ) )
{
if ( SCM_EQ_P ( SCM_CAR ( x ) , SCM_UNSPECIFIED ) )
RETURN ( test_result ) ;
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto carloop ;
}
else
{
test_form = SCM_CDR ( x ) ;
x = SCM_CDR ( test_form ) ;
}
}
x = test_form ;
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto carloop ;
}
1999-07-27 19:09:06 +00:00
2002-01-22 23:31:39 +00:00
# endif /* SCM_ENABLE_ELISP */
1999-07-27 19:09:06 +00:00
case ( SCM_ISYMNUM ( SCM_IM_BIND ) ) :
2001-08-25 16:08:13 +00:00
{
SCM vars , exps , vals ;
1999-07-27 19:09:06 +00:00
2001-08-25 16:08:13 +00:00
x = SCM_CDR ( x ) ;
vars = SCM_CAAR ( x ) ;
exps = SCM_CDAR ( x ) ;
vals = SCM_EOL ;
while ( SCM_NIMP ( exps ) )
{
vals = scm_cons ( EVALCAR ( exps , env ) , vals ) ;
exps = SCM_CDR ( exps ) ;
}
scm_swap_bindings ( vars , vals ) ;
scm_dynwinds = scm_acons ( vars , vals , scm_dynwinds ) ;
2002-03-10 07:53:27 +00:00
/* Ignore all but the last evaluation result. */
for ( x = SCM_CDR ( x ) ; ! SCM_NULLP ( SCM_CDR ( x ) ) ; x = SCM_CDR ( x ) )
2001-08-25 16:08:13 +00:00
{
2002-03-10 07:53:27 +00:00
if ( SCM_CONSP ( SCM_CAR ( x ) ) )
SCM_CEVAL ( SCM_CAR ( x ) , env ) ;
2001-08-25 16:08:13 +00:00
}
proc = EVALCAR ( x , env ) ;
1999-07-27 19:09:06 +00:00
2001-08-25 16:08:13 +00:00
scm_dynwinds = SCM_CDR ( scm_dynwinds ) ;
scm_swap_bindings ( vars , vals ) ;
1999-07-27 19:09:06 +00:00
2001-11-15 17:19:53 +00:00
RETURN ( proc ) ;
2001-08-25 16:08:13 +00:00
}
2002-01-22 23:31:39 +00:00
2002-03-10 07:53:27 +00:00
2001-03-26 22:39:35 +00:00
case ( SCM_ISYMNUM ( SCM_IM_CALL_WITH_VALUES ) ) :
{
2003-05-30 14:36:56 +00:00
SCM producer ;
x = SCM_CDR ( x ) ;
producer = EVALCAR ( x , env ) ;
x = SCM_CDR ( x ) ;
proc = EVALCAR ( x , env ) ; /* proc is the consumer. */
arg1 = SCM_APPLY ( producer , SCM_EOL , SCM_EOL ) ;
2002-03-14 06:45:56 +00:00
if ( SCM_VALUESP ( arg1 ) )
arg1 = scm_struct_ref ( arg1 , SCM_INUM0 ) ;
2001-03-26 22:39:35 +00:00
else
2002-03-14 06:45:56 +00:00
arg1 = scm_list_1 ( arg1 ) ;
2003-05-30 14:36:56 +00:00
PREP_APPLY ( proc , arg1 ) ;
goto apply_proc ;
2001-03-26 22:39:35 +00:00
}
2002-03-13 21:53:46 +00:00
1996-07-25 22:56:11 +00:00
default :
2003-05-25 07:50:23 +00:00
goto evapply ;
1996-07-25 22:56:11 +00:00
}
default :
proc = x ;
2003-05-25 07:50:23 +00:00
goto evapply ;
1996-07-25 22:56:11 +00:00
case scm_tc7_vector :
case scm_tc7_wvect :
2003-03-27 20:06:59 +00:00
# if SCM_HAVE_ARRAYS
1996-07-25 22:56:11 +00:00
case scm_tc7_bvect :
case scm_tc7_byvect :
case scm_tc7_svect :
case scm_tc7_ivect :
case scm_tc7_uvect :
case scm_tc7_fvect :
case scm_tc7_dvect :
case scm_tc7_cvect :
2003-03-25 23:54:28 +00:00
# if SCM_SIZEOF_LONG_LONG != 0
1996-07-25 22:56:11 +00:00
case scm_tc7_llvect :
* acconfig.h: add HAVE_ARRAYS.
* configure.in: add --disable-arrays option, probably temporary.
* the following changes allow guile to be built with the array
"module" omitted. some of this stuff is just tc7 type support,
which wouldn't be needed if uniform array types were converted
to smobs.
* tag.c (scm_utag_bvect ... scm_utag_cvect): don't define unless
HAVE_ARRAYS.
(scm_tag): don't check array types unless HAVE_ARRAYS.
* sort.c (scm_restricted_vector_sort_x, scm_sorted_p):
remove the unused array types.
* (scm_stable_sort, scm_sort): don't support vectors if not
HAVE_ARRAYS. a bit excessive.
* random.c (vector_scale, vector_sum_squares,
scm_random_solid_sphere_x, scm_random_hollow_sphere_x,
scm_random_normal_vector_x): don't define unless HAVE_ARRAYS.
* gh_data.c (makvect, gh_chars2byvect, gh_shorts2svect,
gh_longs2ivect, gh_ulongs2uvect, gh_floats2fvect, gh_doubles2dvect,
gh_uniform_vector_length, gh_uniform_vector_ref):
don't define unless HAVE_ARRAYS.
(gh_scm2chars, gh_scm2shorts, gh_scm2longs, gh_scm2floats,
gh_scm2doubles):
don't check vector types if not HAVE_ARRAYS.
* eq.c (scm_equal_p), eval.c (SCM_CEVAL), print.c (scm_iprin1),
gc.c (scm_gc_mark, scm_gc_sweep), objects.c (scm_class_of):
don't support the array types unless HAVE_ARRAYS is defined.
* tags.h: make nine tc7 types conditional on HAVE_ARRAYS.
* read.c (scm_lreadr): don't check for #* unless HAVE_ARRAYS is
defined (this should use read-hash-extend).
* ramap.c, unif.c: don't check whether ARRAYS is defined.
* vectors.c (scm_vector_set_length_x): moved here from unif.c. call
scm_uniform_element_size if HAVE_ARRAYS.
vectors.h: prototype too.
* unif.c (scm_uniform_element_size): new procedure.
* init.c (scm_boot_guile_1): don't call scm_init_ramap or
scm_init_unif unless HAVE_ARRAYS is defined.
* __scm.h: don't define ARRAYS.
* Makefile.am (EXTRA_libguile_la_SOURCES): unif.c and ramap.c
moved here from libguile_la_SOURCES.
* Makefile.am (ice9_sources): add arrays.scm.
* boot-9.scm: load arrays.scm if 'array is provided.
* arrays.scm: new file with stuff from boot-9.scm.
1999-11-19 18:16:19 +00:00
# endif
1996-07-25 22:56:11 +00:00
# endif
This set of patches introduces a new tc7 code scm_tc7_number for
numbers. Bignums, reals and complex numbers are turned from smobs
into subtypes of scm_tc7_number.
* tags.h (scm_tc7_number): New.
* eq.c (scm_equal_p), eval.c (SCM_CEVAL), evalext.c
(scm_self_evaluating_p), gc-card.c (scm_i_sweep_card), gc-mark.c
(scm_gc_mark_dependencies), goops.c (create_smob_classes), hash.c
(scm_hasher), numbers.c, numbers.h (SCM_NUMP), objects.c
(scm_class_of), print.c (scm_iprin1), smob.c
(scm_smob_prehistory): Don't handle bignums, reals and complex
numbers as subtypes of scm_tc7_smob any more.
* numbers.h, tags.h (scm_tc16_big, scm_tc16_real,
scm_tc16_complex): Moved definitions from tags.h to numbers.h.
2003-09-18 20:55:40 +00:00
case scm_tc7_number :
1996-07-25 22:56:11 +00:00
case scm_tc7_string :
case scm_tc7_smob :
case scm_tcs_closures :
1998-11-17 08:03:18 +00:00
case scm_tc7_cclo :
1999-03-11 11:45:06 +00:00
case scm_tc7_pws :
1996-07-25 22:56:11 +00:00
case scm_tcs_subrs :
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
case scm_tcs_struct :
1996-07-25 22:56:11 +00:00
RETURN ( x ) ;
2001-07-25 21:03:28 +00:00
case scm_tc7_variable :
2001-07-25 22:01:27 +00:00
RETURN ( SCM_VARIABLE_REF ( x ) ) ;
2001-07-25 21:03:28 +00:00
2003-04-20 11:01:33 +00:00
case SCM_BIT7 ( SCM_ILOC00 ) :
1996-07-25 22:56:11 +00:00
proc = * scm_ilookup ( SCM_CAR ( x ) , env ) ;
2003-05-25 07:50:23 +00:00
goto checkmacro ;
2002-03-13 21:53:46 +00:00
1996-07-25 22:56:11 +00:00
case scm_tcs_cons_nimcar :
2002-03-20 23:53:13 +00:00
if ( SCM_SYMBOLP ( SCM_CAR ( x ) ) )
1996-07-25 22:56:11 +00:00
{
2002-03-20 23:53:13 +00:00
SCM orig_sym = SCM_CAR ( x ) ;
2002-03-13 21:53:46 +00:00
{
SCM * location = scm_lookupcar1 ( x , env , 1 ) ;
if ( location = = NULL )
{
/* we have lost the race, start again. */
goto dispatch ;
}
proc = * location ;
}
1997-06-08 15:46:19 +00:00
2001-03-30 15:03:23 +00:00
if ( SCM_MACROP ( proc ) )
1996-07-25 22:56:11 +00:00
{
2001-05-15 14:57:22 +00:00
SCM_SETCAR ( x , orig_sym ) ; /* Undo memoizing effect of
lookupcar */
2002-03-20 23:53:13 +00:00
handle_a_macro : /* inputs: x, env, proc */
1998-11-09 14:13:31 +00:00
# ifdef DEVAL
1998-11-10 06:10:11 +00:00
/* Set a flag during macro expansion so that macro
application frames can be deleted from the backtrace . */
SCM_SET_MACROEXP ( debug ) ;
1998-11-09 14:13:31 +00:00
# endif
2002-03-14 06:45:56 +00:00
arg1 = SCM_APPLY ( SCM_MACRO_CODE ( proc ) , x ,
1997-06-08 15:46:19 +00:00
scm_cons ( env , scm_listofnull ) ) ;
1998-11-10 06:10:11 +00:00
# ifdef DEVAL
SCM_CLEAR_MACROEXP ( debug ) ;
# endif
2001-03-30 15:03:23 +00:00
switch ( SCM_MACRO_TYPE ( proc ) )
1996-07-25 22:56:11 +00:00
{
2003-05-04 08:36:56 +00:00
case 3 :
1996-07-25 22:56:11 +00:00
case 2 :
2002-03-14 06:45:56 +00:00
if ( scm_ilength ( arg1 ) < = 0 )
arg1 = scm_list_2 ( SCM_IM_BEGIN , arg1 ) ;
1996-08-20 17:09:07 +00:00
# ifdef DEVAL
2001-03-30 15:03:23 +00:00
if ( ! SCM_CLOSUREP ( SCM_MACRO_CODE ( proc ) ) )
1996-08-20 17:09:07 +00:00
{
SCM_DEFER_INTS ;
2002-03-14 06:45:56 +00:00
SCM_SETCAR ( x , SCM_CAR ( arg1 ) ) ;
SCM_SETCDR ( x , SCM_CDR ( arg1 ) ) ;
1996-08-20 17:09:07 +00:00
SCM_ALLOW_INTS ;
goto dispatch ;
}
/* Prevent memoizing of debug info expression. */
1999-07-29 19:15:08 +00:00
debug . info - > e . exp = scm_cons_source ( debug . info - > e . exp ,
SCM_CAR ( x ) ,
SCM_CDR ( x ) ) ;
1996-08-20 17:09:07 +00:00
# endif
1996-07-25 22:56:11 +00:00
SCM_DEFER_INTS ;
2002-03-14 06:45:56 +00:00
SCM_SETCAR ( x , SCM_CAR ( arg1 ) ) ;
SCM_SETCDR ( x , SCM_CDR ( arg1 ) ) ;
1996-07-25 22:56:11 +00:00
SCM_ALLOW_INTS ;
2002-03-24 22:19:46 +00:00
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto loop ;
2002-07-15 20:39:53 +00:00
# if SCM_ENABLE_DEPRECATED == 1
1996-07-25 22:56:11 +00:00
case 1 :
2002-03-24 22:19:46 +00:00
x = arg1 ;
if ( SCM_NIMP ( x ) )
{
PREP_APPLY ( SCM_UNDEFINED , SCM_EOL ) ;
goto loop ;
}
else
RETURN ( arg1 ) ;
2002-07-15 20:39:53 +00:00
# endif
1996-07-25 22:56:11 +00:00
case 0 :
2002-03-14 06:45:56 +00:00
RETURN ( arg1 ) ;
1996-07-25 22:56:11 +00:00
}
}
}
else
proc = SCM_CEVAL ( SCM_CAR ( x ) , env ) ;
2002-06-30 22:40:01 +00:00
2003-05-25 07:50:23 +00:00
checkmacro :
if ( SCM_MACROP ( proc ) )
1996-07-25 22:56:11 +00:00
goto handle_a_macro ;
}
2002-03-20 23:53:13 +00:00
evapply : /* inputs: x, proc */
1996-08-20 17:09:07 +00:00
PREP_APPLY ( proc , SCM_EOL ) ;
if ( SCM_NULLP ( SCM_CDR ( x ) ) ) {
ENTER_APPLY ;
1999-03-11 11:45:06 +00:00
evap0 :
2003-05-25 07:50:23 +00:00
SCM_ASRTGO ( ! SCM_IMP ( proc ) , badfun ) ;
1996-07-25 22:56:11 +00:00
switch ( SCM_TYP7 ( proc ) )
{ /* no arguments given */
case scm_tc7_subr_0 :
RETURN ( SCM_SUBRF ( proc ) ( ) ) ;
case scm_tc7_subr_1o :
RETURN ( SCM_SUBRF ( proc ) ( SCM_UNDEFINED ) ) ;
case scm_tc7_lsubr :
RETURN ( SCM_SUBRF ( proc ) ( SCM_EOL ) ) ;
case scm_tc7_rpsubr :
RETURN ( SCM_BOOL_T ) ;
case scm_tc7_asubr :
RETURN ( SCM_SUBRF ( proc ) ( SCM_UNDEFINED , SCM_UNDEFINED ) ) ;
2000-08-25 02:26:22 +00:00
case scm_tc7_smob :
2000-12-07 07:10:26 +00:00
if ( ! SCM_SMOB_APPLICABLE_P ( proc ) )
2000-08-25 02:26:22 +00:00
goto badfun ;
2000-12-07 07:10:26 +00:00
RETURN ( SCM_SMOB_APPLY_0 ( proc ) ) ;
1996-07-25 22:56:11 +00:00
case scm_tc7_cclo :
2002-03-14 06:45:56 +00:00
arg1 = proc ;
1996-07-25 22:56:11 +00:00
proc = SCM_CCLO_SUBR ( proc ) ;
1996-08-20 17:09:07 +00:00
# ifdef DEVAL
debug . info - > a . proc = proc ;
2002-03-14 06:45:56 +00:00
debug . info - > a . args = scm_list_1 ( arg1 ) ;
1996-08-20 17:09:07 +00:00
# endif
1996-07-25 22:56:11 +00:00
goto evap1 ;
1999-03-11 11:45:06 +00:00
case scm_tc7_pws :
proc = SCM_PROCEDURE ( proc ) ;
# ifdef DEVAL
debug . info - > a . proc = proc ;
# endif
2000-06-04 17:27:27 +00:00
if ( ! SCM_CLOSUREP ( proc ) )
goto evap0 ;
2003-05-25 07:50:23 +00:00
/* fallthrough */
1996-07-25 22:56:11 +00:00
case scm_tcs_closures :
2003-05-25 07:50:23 +00:00
{
const SCM formals = SCM_CLOSURE_FORMALS ( proc ) ;
if ( SCM_CONSP ( formals ) )
goto umwrongnumargs ;
x = SCM_CLOSURE_BODY ( proc ) ;
env = SCM_EXTEND_ENV ( formals , SCM_EOL , SCM_ENV ( proc ) ) ;
goto nontoplevel_begin ;
}
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
case scm_tcs_struct :
1999-08-29 03:26:05 +00:00
if ( SCM_OBJ_CLASS_FLAGS ( proc ) & SCM_CLASSF_PURE_GENERIC )
{
x = SCM_ENTITY_PROCEDURE ( proc ) ;
2002-03-14 06:45:56 +00:00
arg1 = SCM_EOL ;
1999-08-29 03:26:05 +00:00
goto type_dispatch ;
}
2003-05-31 07:38:04 +00:00
else if ( SCM_I_OPERATORP ( proc ) )
1997-10-12 12:54:54 +00:00
{
2002-03-14 06:45:56 +00:00
arg1 = proc ;
1999-08-29 03:26:05 +00:00
proc = ( SCM_I_ENTITYP ( proc )
? SCM_ENTITY_PROCEDURE ( proc )
: SCM_OPERATOR_PROCEDURE ( proc ) ) ;
1997-10-12 12:54:54 +00:00
# ifdef DEVAL
1999-08-29 03:26:05 +00:00
debug . info - > a . proc = proc ;
2002-03-14 06:45:56 +00:00
debug . info - > a . args = scm_list_1 ( arg1 ) ;
1997-10-12 12:54:54 +00:00
# endif
2003-05-25 07:50:23 +00:00
goto evap1 ;
1997-10-12 12:54:54 +00:00
}
2003-05-31 07:38:04 +00:00
else
goto badfun ;
1996-07-25 22:56:11 +00:00
case scm_tc7_subr_1 :
case scm_tc7_subr_2 :
case scm_tc7_subr_2o :
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 :
1996-07-25 22:56:11 +00:00
case scm_tc7_cxr :
case scm_tc7_subr_3 :
case scm_tc7_lsubr_2 :
umwrongnumargs :
unmemocar ( x , env ) ;
* filesys.c (scsm_sys_stat): don't SIGSEGV if argument is an
integer (assuming for now accepting an integer is a good thing).
* error.c, fports.c: replace use of %S in lgh_error args with %s.
%S will be used instead for write'ing arguments.
* unif.c (scm_transpose_array): change arguments in the SCM_WNA
asserts. fix a few other asserts.
(scm_aind, scm_enclose_array, scm_array_in_bounds_p,
scm_uniform_vector_ref, scm_array_set_x,
scm_dimensions_to_unform_array): change args in
SCM_WNA SCM_ASSERTS and change scm_wta's to scm_wrong_num_args.
strop.c (scm_substring_move_left_x, scm_substring_move_right_x,
scm_substring_fill_x): likewise.
gsubr.c (scm_gsubr_apply): likewise.
eval.c (SCM_APPLY): likewise.
* eval.c (4 places): replace scm_everr with lgh_error or
scm_wrong_num_args.
* error.c, error.h (scm_wrong_num_args, scm_wrong_type_arg,
scm_memory_error): new procedures.
* scm_everr: deleted. can use scm_wta, dropping first two args.
scm_error: convert NULL subr to SCM_BOOL_F.
* __scm.h: don't define SCM_STACK_OVFLOW, SCM_EXIT, SCM_ARG6, SCM_ARG7,
SCM_ARGERR.
* stackchk.c (scm_report_stack_overflow): use lgh_error instead
of scm_wta.
* error.c, error.h: new error keys: scm_arg_type_key,
scm_args_number_key, scm_memory_alloc_key, scm_stack_overflow_key,
scm_misc_error_key.
scm_wta: reimplement using lgh_error instead of scm_everr.
1996-09-19 09:08:07 +00:00
scm_wrong_num_args ( proc ) ;
1996-07-25 22:56:11 +00:00
default :
2003-05-25 07:50:23 +00:00
badfun :
scm_misc_error ( NULL , " Wrong type to apply: ~S " , scm_list_1 ( proc ) ) ;
1996-07-25 22:56:11 +00:00
}
1996-08-20 17:09:07 +00:00
}
1996-07-25 22:56:11 +00:00
/* must handle macros by here */
x = SCM_CDR ( x ) ;
2002-03-14 06:45:56 +00:00
if ( SCM_CONSP ( x ) )
arg1 = EVALCAR ( x , env ) ;
1998-05-02 16:26:21 +00:00
else
2002-03-23 00:39:25 +00:00
scm_wrong_num_args ( proc ) ;
1996-08-20 17:09:07 +00:00
# ifdef DEVAL
2002-03-14 06:45:56 +00:00
debug . info - > a . args = scm_list_1 ( arg1 ) ;
1996-08-20 17:09:07 +00:00
# endif
1996-07-25 22:56:11 +00:00
x = SCM_CDR ( x ) ;
2002-03-21 00:36:03 +00:00
{
SCM arg2 ;
if ( SCM_NULLP ( x ) )
{
ENTER_APPLY ;
evap1 : /* inputs: proc, arg1 */
2003-05-25 07:50:23 +00:00
SCM_ASRTGO ( ! SCM_IMP ( proc ) , badfun ) ;
2002-03-21 00:36:03 +00:00
switch ( SCM_TYP7 ( proc ) )
{ /* have one argument in arg1 */
case scm_tc7_subr_2o :
RETURN ( SCM_SUBRF ( proc ) ( arg1 , SCM_UNDEFINED ) ) ;
case scm_tc7_subr_1 :
case scm_tc7_subr_1o :
RETURN ( SCM_SUBRF ( proc ) ( arg1 ) ) ;
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 :
if ( SCM_INUMP ( arg1 ) )
{
RETURN ( scm_make_real ( SCM_DSUBRF ( proc ) ( ( double ) SCM_INUM ( arg1 ) ) ) ) ;
}
else if ( SCM_REALP ( arg1 ) )
{
RETURN ( scm_make_real ( SCM_DSUBRF ( proc ) ( SCM_REAL_VALUE ( arg1 ) ) ) ) ;
}
else if ( SCM_BIGP ( arg1 ) )
{
RETURN ( scm_make_real ( SCM_DSUBRF ( proc ) ( scm_i_big2dbl ( arg1 ) ) ) ) ;
}
SCM_WTA_DISPATCH_1 ( * SCM_SUBR_GENERIC ( proc ) , arg1 ,
SCM_ARG1 , SCM_SYMBOL_CHARS ( SCM_SNAME ( proc ) ) ) ;
2002-03-21 00:36:03 +00:00
case scm_tc7_cxr :
{
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
unsigned char pattern = ( scm_t_bits ) SCM_SUBRF ( proc ) ;
do
{
SCM_ASSERT ( SCM_CONSP ( arg1 ) , arg1 , SCM_ARG1 ,
SCM_SYMBOL_CHARS ( SCM_SNAME ( proc ) ) ) ;
arg1 = ( pattern & 1 ) ? SCM_CAR ( arg1 ) : SCM_CDR ( arg1 ) ;
pattern > > = 2 ;
} while ( pattern ) ;
2002-03-21 00:36:03 +00:00
RETURN ( arg1 ) ;
1996-07-25 22:56:11 +00:00
}
2002-03-21 00:36:03 +00:00
case scm_tc7_rpsubr :
RETURN ( SCM_BOOL_T ) ;
case scm_tc7_asubr :
RETURN ( SCM_SUBRF ( proc ) ( arg1 , SCM_UNDEFINED ) ) ;
case scm_tc7_lsubr :
1996-07-25 22:56:11 +00:00
# ifdef DEVAL
2002-03-21 00:36:03 +00:00
RETURN ( SCM_SUBRF ( proc ) ( debug . info - > a . args ) ) ;
1996-07-25 22:56:11 +00:00
# else
2002-03-21 00:36:03 +00:00
RETURN ( SCM_SUBRF ( proc ) ( scm_list_1 ( arg1 ) ) ) ;
1996-07-25 22:56:11 +00:00
# endif
2002-03-21 00:36:03 +00:00
case scm_tc7_smob :
if ( ! SCM_SMOB_APPLICABLE_P ( proc ) )
goto badfun ;
RETURN ( SCM_SMOB_APPLY_1 ( proc , arg1 ) ) ;
case scm_tc7_cclo :
arg2 = arg1 ;
arg1 = proc ;
proc = SCM_CCLO_SUBR ( proc ) ;
1996-08-20 17:09:07 +00:00
# ifdef DEVAL
2002-03-21 00:36:03 +00:00
debug . info - > a . args = scm_cons ( arg1 , debug . info - > a . args ) ;
debug . info - > a . proc = proc ;
1996-08-20 17:09:07 +00:00
# endif
2002-03-21 00:36:03 +00:00
goto evap2 ;
case scm_tc7_pws :
proc = SCM_PROCEDURE ( proc ) ;
1999-03-11 11:45:06 +00:00
# ifdef DEVAL
2002-03-21 00:36:03 +00:00
debug . info - > a . proc = proc ;
1999-03-11 11:45:06 +00:00
# endif
2002-03-21 00:36:03 +00:00
if ( ! SCM_CLOSUREP ( proc ) )
goto evap1 ;
2003-05-25 07:50:23 +00:00
/* fallthrough */
2002-03-21 00:36:03 +00:00
case scm_tcs_closures :
2003-05-25 07:50:23 +00:00
{
/* clos1: */
const SCM formals = SCM_CLOSURE_FORMALS ( proc ) ;
if ( SCM_NULLP ( formals )
| | ( SCM_CONSP ( formals ) & & SCM_CONSP ( SCM_CDR ( formals ) ) ) )
goto umwrongnumargs ;
x = SCM_CLOSURE_BODY ( proc ) ;
1996-07-25 22:56:11 +00:00
# ifdef DEVAL
2003-05-25 07:50:23 +00:00
env = SCM_EXTEND_ENV ( formals ,
debug . info - > a . args ,
SCM_ENV ( proc ) ) ;
1996-07-25 22:56:11 +00:00
# else
2003-05-25 07:50:23 +00:00
env = SCM_EXTEND_ENV ( formals ,
scm_list_1 ( arg1 ) ,
SCM_ENV ( proc ) ) ;
1996-07-25 22:56:11 +00:00
# endif
2003-05-25 07:50:23 +00:00
goto nontoplevel_begin ;
}
2002-03-21 00:36:03 +00:00
case scm_tcs_struct :
if ( SCM_OBJ_CLASS_FLAGS ( proc ) & SCM_CLASSF_PURE_GENERIC )
{
x = SCM_ENTITY_PROCEDURE ( proc ) ;
1999-08-06 19:37:44 +00:00
# ifdef DEVAL
2002-03-21 00:36:03 +00:00
arg1 = debug . info - > a . args ;
1999-08-06 19:37:44 +00:00
# else
2002-03-21 00:36:03 +00:00
arg1 = scm_list_1 ( arg1 ) ;
1999-08-06 19:37:44 +00:00
# endif
2002-03-21 00:36:03 +00:00
goto type_dispatch ;
}
2003-05-31 07:38:04 +00:00
else if ( SCM_I_OPERATORP ( proc ) )
2002-03-21 00:36:03 +00:00
{
arg2 = arg1 ;
arg1 = proc ;
proc = ( SCM_I_ENTITYP ( proc )
? SCM_ENTITY_PROCEDURE ( proc )
: SCM_OPERATOR_PROCEDURE ( proc ) ) ;
1997-09-22 00:43:52 +00:00
# ifdef DEVAL
2002-03-21 00:36:03 +00:00
debug . info - > a . args = scm_cons ( arg1 , debug . info - > a . args ) ;
debug . info - > a . proc = proc ;
1997-09-22 00:43:52 +00:00
# endif
2003-05-25 07:50:23 +00:00
goto evap2 ;
2002-03-21 00:36:03 +00:00
}
2003-05-31 07:38:04 +00:00
else
goto badfun ;
2002-03-21 00:36:03 +00:00
case scm_tc7_subr_2 :
case scm_tc7_subr_0 :
case scm_tc7_subr_3 :
case scm_tc7_lsubr_2 :
2002-03-23 00:39:25 +00:00
scm_wrong_num_args ( proc ) ;
2002-03-21 00:36:03 +00:00
default :
goto badfun ;
}
}
if ( SCM_CONSP ( x ) )
arg2 = EVALCAR ( x , env ) ;
else
2002-03-23 00:39:25 +00:00
scm_wrong_num_args ( proc ) ;
2002-06-30 22:40:01 +00:00
2002-03-21 00:36:03 +00:00
{ /* have two or more arguments */
1996-08-20 17:09:07 +00:00
# ifdef DEVAL
2002-03-21 00:36:03 +00:00
debug . info - > a . args = scm_list_2 ( arg1 , arg2 ) ;
1996-08-20 17:09:07 +00:00
# endif
2002-03-21 00:36:03 +00:00
x = SCM_CDR ( x ) ;
if ( SCM_NULLP ( x ) ) {
ENTER_APPLY ;
evap2 :
2003-05-25 07:50:23 +00:00
SCM_ASRTGO ( ! SCM_IMP ( proc ) , badfun ) ;
2002-03-21 00:36:03 +00:00
switch ( SCM_TYP7 ( proc ) )
{ /* have two arguments */
case scm_tc7_subr_2 :
case scm_tc7_subr_2o :
RETURN ( SCM_SUBRF ( proc ) ( arg1 , arg2 ) ) ;
case scm_tc7_lsubr :
1996-07-25 22:56:11 +00:00
# ifdef DEVAL
2002-03-21 00:36:03 +00:00
RETURN ( SCM_SUBRF ( proc ) ( debug . info - > a . args ) ) ;
1996-08-20 17:09:07 +00:00
# else
2002-03-21 00:36:03 +00:00
RETURN ( SCM_SUBRF ( proc ) ( scm_list_2 ( arg1 , arg2 ) ) ) ;
# endif
case scm_tc7_lsubr_2 :
RETURN ( SCM_SUBRF ( proc ) ( arg1 , arg2 , SCM_EOL ) ) ;
case scm_tc7_rpsubr :
case scm_tc7_asubr :
RETURN ( SCM_SUBRF ( proc ) ( arg1 , arg2 ) ) ;
case scm_tc7_smob :
if ( ! SCM_SMOB_APPLICABLE_P ( proc ) )
goto badfun ;
RETURN ( SCM_SMOB_APPLY_2 ( proc , arg1 , arg2 ) ) ;
cclon :
case scm_tc7_cclo :
1996-07-25 22:56:11 +00:00
# ifdef DEVAL
2002-03-21 00:36:03 +00:00
RETURN ( SCM_APPLY ( SCM_CCLO_SUBR ( proc ) ,
scm_cons ( proc , debug . info - > a . args ) ,
SCM_EOL ) ) ;
1996-07-25 22:56:11 +00:00
# else
2002-03-21 00:36:03 +00:00
RETURN ( SCM_APPLY ( SCM_CCLO_SUBR ( proc ) ,
scm_cons2 ( proc , arg1 ,
scm_cons ( arg2 ,
scm_eval_args ( x ,
env ,
proc ) ) ) ,
SCM_EOL ) ) ;
# endif
case scm_tcs_struct :
if ( SCM_OBJ_CLASS_FLAGS ( proc ) & SCM_CLASSF_PURE_GENERIC )
{
x = SCM_ENTITY_PROCEDURE ( proc ) ;
# ifdef DEVAL
arg1 = debug . info - > a . args ;
# else
arg1 = scm_list_2 ( arg1 , arg2 ) ;
1996-08-20 17:09:07 +00:00
# endif
2002-03-21 00:36:03 +00:00
goto type_dispatch ;
}
2003-05-31 07:38:04 +00:00
else if ( SCM_I_OPERATORP ( proc ) )
2002-03-21 00:36:03 +00:00
{
operatorn :
1999-08-06 19:37:44 +00:00
# ifdef DEVAL
2002-03-21 00:36:03 +00:00
RETURN ( SCM_APPLY ( SCM_I_ENTITYP ( proc )
? SCM_ENTITY_PROCEDURE ( proc )
: SCM_OPERATOR_PROCEDURE ( proc ) ,
scm_cons ( proc , debug . info - > a . args ) ,
SCM_EOL ) ) ;
1999-08-06 19:37:44 +00:00
# else
2002-03-21 00:36:03 +00:00
RETURN ( SCM_APPLY ( SCM_I_ENTITYP ( proc )
? SCM_ENTITY_PROCEDURE ( proc )
: SCM_OPERATOR_PROCEDURE ( proc ) ,
scm_cons2 ( proc , arg1 ,
scm_cons ( arg2 ,
scm_eval_args ( x ,
env ,
proc ) ) ) ,
SCM_EOL ) ) ;
1999-08-06 19:37:44 +00:00
# endif
2002-03-21 00:36:03 +00:00
}
2003-05-31 07:38:04 +00:00
else
goto badfun ;
2002-03-21 00:36:03 +00:00
case scm_tc7_subr_0 :
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 :
2002-03-21 00:36:03 +00:00
case scm_tc7_cxr :
case scm_tc7_subr_1o :
case scm_tc7_subr_1 :
case scm_tc7_subr_3 :
2002-03-23 00:39:25 +00:00
scm_wrong_num_args ( proc ) ;
2002-03-21 00:36:03 +00:00
default :
1998-11-21 17:00:44 +00:00
goto badfun ;
2002-03-21 00:36:03 +00:00
case scm_tc7_pws :
proc = SCM_PROCEDURE ( proc ) ;
# ifdef DEVAL
debug . info - > a . proc = proc ;
# endif
if ( ! SCM_CLOSUREP ( proc ) )
goto evap2 ;
2003-05-25 07:50:23 +00:00
/* fallthrough */
2002-03-21 00:36:03 +00:00
case scm_tcs_closures :
2003-05-25 07:50:23 +00:00
{
/* clos2: */
const SCM formals = SCM_CLOSURE_FORMALS ( proc ) ;
if ( SCM_NULLP ( formals )
| | ( SCM_CONSP ( formals )
& & ( SCM_NULLP ( SCM_CDR ( formals ) )
| | ( SCM_CONSP ( SCM_CDR ( formals ) )
& & SCM_CONSP ( SCM_CDDR ( formals ) ) ) ) ) )
goto umwrongnumargs ;
1997-09-22 00:43:52 +00:00
# ifdef DEVAL
2003-05-25 07:50:23 +00:00
env = SCM_EXTEND_ENV ( formals ,
debug . info - > a . args ,
SCM_ENV ( proc ) ) ;
1999-08-29 03:26:05 +00:00
# else
2003-05-25 07:50:23 +00:00
env = SCM_EXTEND_ENV ( formals ,
scm_list_2 ( arg1 , arg2 ) ,
SCM_ENV ( proc ) ) ;
1999-08-29 03:26:05 +00:00
# endif
2003-05-25 07:50:23 +00:00
x = SCM_CLOSURE_BODY ( proc ) ;
goto nontoplevel_begin ;
}
2002-03-21 00:36:03 +00:00
}
}
if ( ! SCM_CONSP ( x ) )
2002-03-23 00:39:25 +00:00
scm_wrong_num_args ( proc ) ;
2002-03-21 00:36:03 +00:00
# ifdef DEVAL
debug . info - > a . args = scm_cons2 ( arg1 , arg2 ,
deval_args ( x , env , proc ,
SCM_CDRLOC ( SCM_CDR ( debug . info - > a . args ) ) ) ) ;
# endif
ENTER_APPLY ;
evap3 :
2003-05-25 07:50:23 +00:00
SCM_ASRTGO ( ! SCM_IMP ( proc ) , badfun ) ;
2002-03-21 00:36:03 +00:00
switch ( SCM_TYP7 ( proc ) )
{ /* have 3 or more arguments */
# ifdef DEVAL
1996-08-20 17:09:07 +00:00
case scm_tc7_subr_3 :
2002-03-23 00:39:25 +00:00
if ( ! SCM_NULLP ( SCM_CDR ( x ) ) )
scm_wrong_num_args ( proc ) ;
else
RETURN ( SCM_SUBRF ( proc ) ( arg1 , arg2 ,
SCM_CADDR ( debug . info - > a . args ) ) ) ;
2002-03-21 00:36:03 +00:00
case scm_tc7_asubr :
arg1 = SCM_SUBRF ( proc ) ( arg1 , arg2 ) ;
arg2 = SCM_CDDR ( debug . info - > a . args ) ;
do
{
arg1 = SCM_SUBRF ( proc ) ( arg1 , SCM_CAR ( arg2 ) ) ;
arg2 = SCM_CDR ( arg2 ) ;
}
while ( SCM_NIMP ( arg2 ) ) ;
RETURN ( arg1 ) ;
case scm_tc7_rpsubr :
if ( SCM_FALSEP ( SCM_SUBRF ( proc ) ( arg1 , arg2 ) ) )
RETURN ( SCM_BOOL_F ) ;
arg1 = SCM_CDDR ( debug . info - > a . args ) ;
do
{
if ( SCM_FALSEP ( SCM_SUBRF ( proc ) ( arg2 , SCM_CAR ( arg1 ) ) ) )
RETURN ( SCM_BOOL_F ) ;
arg2 = SCM_CAR ( arg1 ) ;
arg1 = SCM_CDR ( arg1 ) ;
}
while ( SCM_NIMP ( arg1 ) ) ;
RETURN ( SCM_BOOL_T ) ;
case scm_tc7_lsubr_2 :
RETURN ( SCM_SUBRF ( proc ) ( arg1 , arg2 ,
SCM_CDDR ( debug . info - > a . args ) ) ) ;
case scm_tc7_lsubr :
RETURN ( SCM_SUBRF ( proc ) ( debug . info - > a . args ) ) ;
case scm_tc7_smob :
if ( ! SCM_SMOB_APPLICABLE_P ( proc ) )
goto badfun ;
RETURN ( SCM_SMOB_APPLY_3 ( proc , arg1 , arg2 ,
SCM_CDDR ( debug . info - > a . args ) ) ) ;
case scm_tc7_cclo :
goto cclon ;
2000-06-04 17:27:27 +00:00
case scm_tc7_pws :
proc = SCM_PROCEDURE ( proc ) ;
debug . info - > a . proc = proc ;
if ( ! SCM_CLOSUREP ( proc ) )
2002-03-21 00:36:03 +00:00
goto evap3 ;
2003-05-25 07:50:23 +00:00
/* fallthrough */
1996-08-20 17:09:07 +00:00
case scm_tcs_closures :
2003-05-25 07:50:23 +00:00
{
const SCM formals = SCM_CLOSURE_FORMALS ( proc ) ;
if ( SCM_NULLP ( formals )
| | ( SCM_CONSP ( formals )
& & ( SCM_NULLP ( SCM_CDR ( formals ) )
| | ( SCM_CONSP ( SCM_CDR ( formals ) )
& & scm_badargsp ( SCM_CDDR ( formals ) , x ) ) ) ) )
goto umwrongnumargs ;
SCM_SET_ARGSREADY ( debug ) ;
env = SCM_EXTEND_ENV ( formals ,
debug . info - > a . args ,
SCM_ENV ( proc ) ) ;
x = SCM_CLOSURE_BODY ( proc ) ;
goto nontoplevel_begin ;
}
1996-08-20 17:09:07 +00:00
# else /* DEVAL */
2002-03-21 00:36:03 +00:00
case scm_tc7_subr_3 :
2002-03-23 00:39:25 +00:00
if ( ! SCM_NULLP ( SCM_CDR ( x ) ) )
scm_wrong_num_args ( proc ) ;
else
RETURN ( SCM_SUBRF ( proc ) ( arg1 , arg2 , EVALCAR ( x , env ) ) ) ;
2002-03-21 00:36:03 +00:00
case scm_tc7_asubr :
arg1 = SCM_SUBRF ( proc ) ( arg1 , arg2 ) ;
do
{
arg1 = SCM_SUBRF ( proc ) ( arg1 , EVALCAR ( x , env ) ) ;
x = SCM_CDR ( x ) ;
}
while ( SCM_NIMP ( x ) ) ;
RETURN ( arg1 ) ;
case scm_tc7_rpsubr :
if ( SCM_FALSEP ( SCM_SUBRF ( proc ) ( arg1 , arg2 ) ) )
RETURN ( SCM_BOOL_F ) ;
do
{
arg1 = EVALCAR ( x , env ) ;
if ( SCM_FALSEP ( SCM_SUBRF ( proc ) ( arg2 , arg1 ) ) )
RETURN ( SCM_BOOL_F ) ;
arg2 = arg1 ;
x = SCM_CDR ( x ) ;
}
while ( SCM_NIMP ( x ) ) ;
RETURN ( SCM_BOOL_T ) ;
case scm_tc7_lsubr_2 :
RETURN ( SCM_SUBRF ( proc ) ( arg1 , arg2 , scm_eval_args ( x , env , proc ) ) ) ;
case scm_tc7_lsubr :
RETURN ( SCM_SUBRF ( proc ) ( scm_cons2 ( arg1 ,
arg2 ,
scm_eval_args ( x , env , proc ) ) ) ) ;
case scm_tc7_smob :
if ( ! SCM_SMOB_APPLICABLE_P ( proc ) )
goto badfun ;
RETURN ( SCM_SMOB_APPLY_3 ( proc , arg1 , arg2 ,
scm_eval_args ( x , env , proc ) ) ) ;
case scm_tc7_cclo :
goto cclon ;
case scm_tc7_pws :
proc = SCM_PROCEDURE ( proc ) ;
if ( ! SCM_CLOSUREP ( proc ) )
goto evap3 ;
2003-05-25 07:50:23 +00:00
/* fallthrough */
case scm_tcs_closures :
1997-10-12 12:54:54 +00:00
{
2003-05-25 07:50:23 +00:00
const SCM formals = SCM_CLOSURE_FORMALS ( proc ) ;
2002-03-21 00:36:03 +00:00
if ( SCM_NULLP ( formals )
| | ( SCM_CONSP ( formals )
& & ( SCM_NULLP ( SCM_CDR ( formals ) )
| | ( SCM_CONSP ( SCM_CDR ( formals ) )
& & scm_badargsp ( SCM_CDDR ( formals ) , x ) ) ) ) )
goto umwrongnumargs ;
2003-05-25 07:50:23 +00:00
env = SCM_EXTEND_ENV ( formals ,
scm_cons2 ( arg1 ,
arg2 ,
scm_eval_args ( x , env , proc ) ) ,
SCM_ENV ( proc ) ) ;
x = SCM_CLOSURE_BODY ( proc ) ;
goto nontoplevel_begin ;
1997-10-12 12:54:54 +00:00
}
1996-07-25 22:56:11 +00:00
# endif /* DEVAL */
2002-03-21 00:36:03 +00:00
case scm_tcs_struct :
if ( SCM_OBJ_CLASS_FLAGS ( proc ) & SCM_CLASSF_PURE_GENERIC )
{
1999-08-06 19:37:44 +00:00
# ifdef DEVAL
2002-03-21 00:36:03 +00:00
arg1 = debug . info - > a . args ;
1999-08-06 19:37:44 +00:00
# else
2002-03-21 00:36:03 +00:00
arg1 = scm_cons2 ( arg1 , arg2 , scm_eval_args ( x , env , proc ) ) ;
1999-08-06 19:37:44 +00:00
# endif
2002-03-21 00:36:03 +00:00
x = SCM_ENTITY_PROCEDURE ( proc ) ;
goto type_dispatch ;
}
2003-05-31 07:38:04 +00:00
else if ( SCM_I_OPERATORP ( proc ) )
2002-03-21 00:36:03 +00:00
goto operatorn ;
2003-05-31 07:38:04 +00:00
else
goto badfun ;
2002-03-21 00:36:03 +00:00
case scm_tc7_subr_2 :
case scm_tc7_subr_1o :
case scm_tc7_subr_2o :
case scm_tc7_subr_0 :
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 :
2002-03-21 00:36:03 +00:00
case scm_tc7_cxr :
case scm_tc7_subr_1 :
2002-03-23 00:39:25 +00:00
scm_wrong_num_args ( proc ) ;
2002-03-21 00:36:03 +00:00
default :
1998-11-21 17:00:44 +00:00
goto badfun ;
2002-03-21 00:36:03 +00:00
}
}
1996-07-25 22:56:11 +00:00
}
# ifdef DEVAL
1996-08-20 17:09:07 +00:00
exit :
2002-03-25 23:45:02 +00:00
if ( scm_check_exit_p & & SCM_TRAPS_P )
1996-08-23 01:20:34 +00:00
if ( SCM_EXIT_FRAME_P | | ( SCM_TRACE_P & & SCM_TRACED_FRAME_P ( debug ) ) )
1996-08-20 17:09:07 +00:00
{
1996-08-23 01:20:34 +00:00
SCM_CLEAR_TRACED_FRAME ( debug ) ;
if ( SCM_CHEAPTRAPS_P )
2002-03-14 06:45:56 +00:00
arg1 = scm_make_debugobj ( & debug ) ;
1996-08-20 17:09:07 +00:00
else
{
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
int first ;
SCM val = scm_make_continuation ( & first ) ;
2002-03-20 23:53:13 +00:00
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
if ( first )
2002-03-14 06:45:56 +00:00
arg1 = val ;
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
else
1996-08-20 17:09:07 +00:00
{
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
proc = val ;
1996-08-20 17:09:07 +00:00
goto ret ;
}
}
2001-06-26 21:55:45 +00:00
SCM_TRAPS_P = 0 ;
2002-03-14 06:45:56 +00:00
scm_call_3 ( SCM_EXIT_FRAME_HDLR , scm_sym_exit_frame , arg1 , proc ) ;
2001-06-26 21:55:45 +00:00
SCM_TRAPS_P = 1 ;
1996-08-20 17:09:07 +00:00
}
ret :
1996-10-05 16:49:31 +00:00
scm_last_debug_frame = debug . prev ;
1996-07-25 22:56:11 +00:00
return proc ;
# endif
}
1996-08-20 17:09:07 +00:00
/* SECTION: This code is compiled once.
*/
1996-07-25 22:56:11 +00:00
# ifndef DEVAL
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 ;
2002-01-22 23:31:39 +00:00
while ( ! SCM_NULLP ( SCM_CDR ( * lloc ) ) ) /* Perhaps should be
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
# endif /* !DEVAL */
1996-08-20 17:09:07 +00:00
/* SECTION: When DEVAL is defined this code yields scm_dapply.
* It is compiled twice .
*/
1996-07-25 22:56:11 +00:00
#if 0
SCM
1999-12-12 20:35:02 +00:00
scm_apply ( SCM proc , SCM arg1 , SCM args )
1996-07-25 22:56:11 +00:00
{ }
# endif
#if 0
SCM
1999-12-12 20:35:02 +00:00
scm_dapply ( SCM proc , SCM arg1 , SCM args )
2003-04-23 18:27:37 +00:00
{ }
1996-07-25 22:56:11 +00:00
# endif
* __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
1997-04-11 03:54:28 +00:00
/* Apply a function to a list of arguments.
This function is exported to the Scheme level as taking two
required arguments and a tail argument , as if it were :
( lambda ( proc arg1 . args ) . . . )
Thus , if you just have a list of arguments to pass to a procedure ,
pass the list as ARG1 , and ' ( ) for ARGS . If you have some fixed
args , pass the first as ARG1 , then cons any remaining fixed args
onto the front of your argument list , and pass that as ARGS . */
1996-07-25 22:56:11 +00:00
SCM
1999-12-12 02:36:16 +00:00
SCM_APPLY ( SCM proc , SCM arg1 , SCM args )
1996-07-25 22:56:11 +00:00
{
# ifdef DEVAL
2001-06-14 19:50:43 +00:00
scm_t_debug_frame debug ;
scm_t_debug_info debug_vect_body ;
1996-10-05 16:49:31 +00:00
debug . prev = scm_last_debug_frame ;
1996-08-23 01:20:34 +00:00
debug . status = SCM_APPLYFRAME ;
Don't use GCC extensions to allocate space for debugging frames.
(Here he goes again! Why do we put up with this?!)
* debug.h (scm_debug_frame): Make the 'vect' member a pointer to
an scm_debug_info structure, not an in-line array of them. Add
'info' member, to say how many vect elements we've used, for eval
frames.
* eval.c (SCM_CEVAL): Use alloca to allocate space for vect. Use
a new variable debug_info_end to mark the end of vect, instead of
the address of the 'info' pointer itself.
[DEVAL] (ENTER_APPLY, SCM_CEVAL, SCM_APPLY): Remove casts of
&debug to scm_debug_frame *; debug is a real scm_debug_frame now.
(SCM_APPLY): Explicitly allocate space for debug.vect.
* debug.c (scm_m_start_stack): Same, for vframe.vect.
* stacks.c: Adjusted for new debug frame structure.
(RELOC_INFO, RELOC_FRAME): New macros.
(stack_depth, read_frames): Use them, and new scm_debug_frame
element 'info', instead of magically knowing that eval frames have
an info pointer sitting after vect.
(scm_make_stack, scm_stack_id, scm_last_stack_frame): Use
RELOC_FRAME.
(scm_init_stacks): Formatting tweaks.
1996-12-19 07:55:42 +00:00
debug . vect = & debug_vect_body ;
1996-08-20 17:09:07 +00:00
debug . vect [ 0 ] . a . proc = proc ;
debug . vect [ 0 ] . a . args = SCM_EOL ;
1996-10-05 16:49:31 +00:00
scm_last_debug_frame = & debug ;
1996-07-25 22:56:11 +00:00
# else
1996-08-23 01:20:34 +00:00
if ( SCM_DEBUGGINGP )
1996-07-25 22:56:11 +00:00
return scm_dapply ( proc , arg1 , args ) ;
# endif
SCM_ASRTGO ( SCM_NIMP ( proc ) , badproc ) ;
1997-04-11 03:54:28 +00:00
/* If ARGS is the empty list, then we're calling apply with only two
arguments - - - ARG1 is the list of arguments for PROC . Whatever
the case , futz with things so that ARG1 is the first argument to
give to PROC ( or SCM_UNDEFINED if no args ) , and ARGS contains the
1997-04-12 01:16:49 +00:00
rest .
Setting the debug apply frame args this way is pretty messy .
Perhaps we should store arg1 and args directly in the frame as
received , and let scm_frame_arguments unpack them , because that ' s
a relatively rare operation . This works for now ; if the Guile
developer archives are still around , see Mikael ' s post of
11 - Apr - 97. */
1996-07-25 22:56:11 +00:00
if ( SCM_NULLP ( args ) )
{
if ( SCM_NULLP ( arg1 ) )
1997-04-12 01:16:49 +00:00
{
arg1 = SCM_UNDEFINED ;
# ifdef DEVAL
debug . vect [ 0 ] . a . args = SCM_EOL ;
# endif
}
1996-07-25 22:56:11 +00:00
else
{
1997-04-12 01:16:49 +00:00
# ifdef DEVAL
debug . vect [ 0 ] . a . args = arg1 ;
# endif
1996-07-25 22:56:11 +00:00
args = SCM_CDR ( arg1 ) ;
arg1 = SCM_CAR ( arg1 ) ;
}
}
else
{
args = scm_nconc2last ( args ) ;
1997-04-12 01:16:49 +00:00
# ifdef DEVAL
debug . vect [ 0 ] . a . args = scm_cons ( arg1 , args ) ;
# endif
1996-07-25 22:56:11 +00:00
}
# ifdef DEVAL
1998-08-21 08:13:55 +00:00
if ( SCM_ENTER_FRAME_P & & SCM_TRAPS_P )
1996-08-20 17:09:07 +00:00
{
SCM tmp ;
1996-08-23 01:20:34 +00:00
if ( SCM_CHEAPTRAPS_P )
Don't use GCC extensions to allocate space for debugging frames.
(Here he goes again! Why do we put up with this?!)
* debug.h (scm_debug_frame): Make the 'vect' member a pointer to
an scm_debug_info structure, not an in-line array of them. Add
'info' member, to say how many vect elements we've used, for eval
frames.
* eval.c (SCM_CEVAL): Use alloca to allocate space for vect. Use
a new variable debug_info_end to mark the end of vect, instead of
the address of the 'info' pointer itself.
[DEVAL] (ENTER_APPLY, SCM_CEVAL, SCM_APPLY): Remove casts of
&debug to scm_debug_frame *; debug is a real scm_debug_frame now.
(SCM_APPLY): Explicitly allocate space for debug.vect.
* debug.c (scm_m_start_stack): Same, for vframe.vect.
* stacks.c: Adjusted for new debug frame structure.
(RELOC_INFO, RELOC_FRAME): New macros.
(stack_depth, read_frames): Use them, and new scm_debug_frame
element 'info', instead of magically knowing that eval frames have
an info pointer sitting after vect.
(scm_make_stack, scm_stack_id, scm_last_stack_frame): Use
RELOC_FRAME.
(scm_init_stacks): Formatting tweaks.
1996-12-19 07:55:42 +00:00
tmp = scm_make_debugobj ( & debug ) ;
1996-08-20 17:09:07 +00:00
else
{
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
int first ;
tmp = scm_make_continuation ( & first ) ;
if ( ! first )
1996-08-20 17:09:07 +00:00
goto entap ;
}
2001-06-26 21:55:45 +00:00
SCM_TRAPS_P = 0 ;
scm_call_2 ( SCM_ENTER_FRAME_HDLR , scm_sym_enter_frame , tmp ) ;
SCM_TRAPS_P = 1 ;
1996-08-20 17:09:07 +00:00
}
entap :
ENTER_APPLY ;
# endif
tail :
1996-07-25 22:56:11 +00:00
switch ( SCM_TYP7 ( proc ) )
{
case scm_tc7_subr_2o :
args = SCM_NULLP ( args ) ? SCM_UNDEFINED : SCM_CAR ( args ) ;
2001-11-15 17:19:53 +00:00
RETURN ( SCM_SUBRF ( proc ) ( arg1 , args ) ) ;
1996-07-25 22:56:11 +00:00
case scm_tc7_subr_2 :
2002-03-23 00:39:25 +00:00
if ( SCM_NULLP ( args ) | | ! SCM_NULLP ( SCM_CDR ( args ) ) )
scm_wrong_num_args ( proc ) ;
1996-07-25 22:56:11 +00:00
args = SCM_CAR ( args ) ;
2001-11-15 17:19:53 +00:00
RETURN ( SCM_SUBRF ( proc ) ( arg1 , args ) ) ;
1996-07-25 22:56:11 +00:00
case scm_tc7_subr_0 :
2002-03-23 00:39:25 +00:00
if ( ! SCM_UNBNDP ( arg1 ) )
scm_wrong_num_args ( proc ) ;
else
RETURN ( SCM_SUBRF ( proc ) ( ) ) ;
1996-07-25 22:56:11 +00:00
case scm_tc7_subr_1 :
2002-03-23 00:39:25 +00:00
if ( SCM_UNBNDP ( arg1 ) )
scm_wrong_num_args ( proc ) ;
1996-07-25 22:56:11 +00:00
case scm_tc7_subr_1o :
2002-03-23 00:39:25 +00:00
if ( ! SCM_NULLP ( args ) )
scm_wrong_num_args ( proc ) ;
else
RETURN ( SCM_SUBRF ( proc ) ( arg1 ) ) ;
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 :
if ( SCM_UNBNDP ( arg1 ) | | ! SCM_NULLP ( args ) )
scm_wrong_num_args ( proc ) ;
if ( SCM_INUMP ( arg1 ) )
{
RETURN ( scm_make_real ( SCM_DSUBRF ( proc ) ( ( double ) SCM_INUM ( arg1 ) ) ) ) ;
}
else if ( SCM_REALP ( arg1 ) )
{
RETURN ( scm_make_real ( SCM_DSUBRF ( proc ) ( SCM_REAL_VALUE ( arg1 ) ) ) ) ;
}
else if ( SCM_BIGP ( arg1 ) )
RETURN ( scm_make_real ( SCM_DSUBRF ( proc ) ( scm_i_big2dbl ( arg1 ) ) ) ) ;
SCM_WTA_DISPATCH_1 ( * SCM_SUBR_GENERIC ( proc ) , arg1 ,
SCM_ARG1 , SCM_SYMBOL_CHARS ( SCM_SNAME ( proc ) ) ) ;
1996-07-25 22:56:11 +00:00
case scm_tc7_cxr :
2002-03-23 00:39:25 +00:00
if ( SCM_UNBNDP ( arg1 ) | | ! SCM_NULLP ( args ) )
scm_wrong_num_args ( proc ) ;
1996-07-25 22:56:11 +00:00
{
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
unsigned char pattern = ( scm_t_bits ) SCM_SUBRF ( proc ) ;
do
{
SCM_ASSERT ( SCM_CONSP ( arg1 ) , arg1 , SCM_ARG1 ,
SCM_SYMBOL_CHARS ( SCM_SNAME ( proc ) ) ) ;
arg1 = ( pattern & 1 ) ? SCM_CAR ( arg1 ) : SCM_CDR ( arg1 ) ;
pattern > > = 2 ;
} while ( pattern ) ;
RETURN ( arg1 ) ;
1996-07-25 22:56:11 +00:00
}
case scm_tc7_subr_3 :
2002-03-23 00:39:25 +00:00
if ( SCM_NULLP ( args )
| | SCM_NULLP ( SCM_CDR ( args ) )
| | ! SCM_NULLP ( SCM_CDDR ( args ) ) )
scm_wrong_num_args ( proc ) ;
else
RETURN ( SCM_SUBRF ( proc ) ( arg1 , SCM_CAR ( args ) , SCM_CADR ( args ) ) ) ;
1996-07-25 22:56:11 +00:00
case scm_tc7_lsubr :
# ifdef DEVAL
2001-11-15 17:19:53 +00:00
RETURN ( SCM_SUBRF ( proc ) ( SCM_UNBNDP ( arg1 ) ? SCM_EOL : debug . vect [ 0 ] . a . args ) ) ;
1996-07-25 22:56:11 +00:00
# else
2001-11-15 17:19:53 +00:00
RETURN ( SCM_SUBRF ( proc ) ( SCM_UNBNDP ( arg1 ) ? SCM_EOL : scm_cons ( arg1 , args ) ) ) ;
1996-07-25 22:56:11 +00:00
# endif
case scm_tc7_lsubr_2 :
2002-03-23 00:39:25 +00:00
if ( ! SCM_CONSP ( args ) )
scm_wrong_num_args ( proc ) ;
else
RETURN ( SCM_SUBRF ( proc ) ( arg1 , SCM_CAR ( args ) , SCM_CDR ( args ) ) ) ;
1996-07-25 22:56:11 +00:00
case scm_tc7_asubr :
if ( SCM_NULLP ( args ) )
2001-11-15 17:19:53 +00:00
RETURN ( SCM_SUBRF ( proc ) ( arg1 , SCM_UNDEFINED ) ) ;
1996-07-25 22:56:11 +00:00
while ( SCM_NIMP ( args ) )
{
SCM_ASSERT ( SCM_CONSP ( args ) , args , SCM_ARG2 , " apply " ) ;
arg1 = SCM_SUBRF ( proc ) ( arg1 , SCM_CAR ( args ) ) ;
args = SCM_CDR ( args ) ;
}
RETURN ( arg1 ) ;
case scm_tc7_rpsubr :
if ( SCM_NULLP ( args ) )
RETURN ( SCM_BOOL_T ) ;
while ( SCM_NIMP ( args ) )
{
SCM_ASSERT ( SCM_CONSP ( args ) , args , SCM_ARG2 , " apply " ) ;
if ( SCM_FALSEP ( SCM_SUBRF ( proc ) ( arg1 , SCM_CAR ( args ) ) ) )
RETURN ( SCM_BOOL_F ) ;
arg1 = SCM_CAR ( args ) ;
args = SCM_CDR ( args ) ;
}
RETURN ( SCM_BOOL_T ) ;
case scm_tcs_closures :
# ifdef DEVAL
1996-08-20 17:09:07 +00:00
arg1 = ( SCM_UNBNDP ( arg1 ) ? SCM_EOL : debug . vect [ 0 ] . a . args ) ;
1996-07-25 22:56:11 +00:00
# else
arg1 = ( SCM_UNBNDP ( arg1 ) ? SCM_EOL : scm_cons ( arg1 , args ) ) ;
# endif
2001-04-19 14:46:01 +00:00
if ( scm_badargsp ( SCM_CLOSURE_FORMALS ( proc ) , arg1 ) )
2002-03-23 00:39:25 +00:00
scm_wrong_num_args ( proc ) ;
1998-04-12 10:10:29 +00:00
/* Copy argument list */
if ( SCM_IMP ( arg1 ) )
args = arg1 ;
else
{
SCM tl = args = scm_cons ( SCM_CAR ( arg1 ) , SCM_UNSPECIFIED ) ;
2003-04-21 01:07:09 +00:00
for ( arg1 = SCM_CDR ( arg1 ) ; SCM_CONSP ( arg1 ) ; arg1 = SCM_CDR ( arg1 ) )
1998-04-12 10:10:29 +00:00
{
2003-04-21 01:07:09 +00:00
SCM_SETCDR ( tl , scm_cons ( SCM_CAR ( arg1 ) , SCM_UNSPECIFIED ) ) ;
1998-04-12 10:10:29 +00:00
tl = SCM_CDR ( tl ) ;
}
SCM_SETCDR ( tl , arg1 ) ;
}
2003-04-21 19:20:13 +00:00
args = SCM_EXTEND_ENV ( SCM_CLOSURE_FORMALS ( proc ) ,
args ,
SCM_ENV ( proc ) ) ;
2002-01-10 20:52:45 +00:00
proc = SCM_CLOSURE_BODY ( proc ) ;
1999-08-29 01:28:49 +00:00
again :
2003-04-21 01:07:09 +00:00
arg1 = SCM_CDR ( proc ) ;
while ( ! SCM_NULLP ( arg1 ) )
1999-08-19 19:01:19 +00:00
{
if ( SCM_IMP ( SCM_CAR ( proc ) ) )
{
if ( SCM_ISYMP ( SCM_CAR ( proc ) ) )
{
* __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_rec_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 ( proc ) ) )
proc = scm_m_expand_body ( proc , args ) ;
* __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_rec_mutex_unlock ( & source_mutex ) ;
1999-08-29 01:28:49 +00:00
goto again ;
1999-08-19 19:01:19 +00:00
}
2001-03-03 15:10:37 +00:00
else
2001-06-05 20:48:28 +00:00
SCM_VALIDATE_NON_EMPTY_COMBINATION ( SCM_CAR ( proc ) ) ;
1999-08-19 19:01:19 +00:00
}
else
1999-08-29 01:28:49 +00:00
SCM_CEVAL ( SCM_CAR ( proc ) , args ) ;
proc = arg1 ;
2003-04-21 01:07:09 +00:00
arg1 = SCM_CDR ( proc ) ;
1999-08-19 19:01:19 +00:00
}
1999-08-29 01:28:49 +00:00
RETURN ( EVALCAR ( proc , args ) ) ;
2000-08-25 02:26:22 +00:00
case scm_tc7_smob :
2000-12-07 07:10:26 +00:00
if ( ! SCM_SMOB_APPLICABLE_P ( proc ) )
2000-08-25 02:26:22 +00:00
goto badproc ;
2000-09-10 13:41:18 +00:00
if ( SCM_UNBNDP ( arg1 ) )
2001-11-15 17:19:53 +00:00
RETURN ( SCM_SMOB_APPLY_0 ( proc ) ) ;
2000-09-10 13:41:18 +00:00
else if ( SCM_NULLP ( args ) )
2001-11-15 17:19:53 +00:00
RETURN ( SCM_SMOB_APPLY_1 ( proc , arg1 ) ) ;
2000-08-25 02:26:22 +00:00
else if ( SCM_NULLP ( SCM_CDR ( args ) ) )
2001-11-15 17:19:53 +00:00
RETURN ( SCM_SMOB_APPLY_2 ( proc , arg1 , SCM_CAR ( args ) ) ) ;
2000-08-25 02:26:22 +00:00
else
2000-12-07 07:10:26 +00:00
RETURN ( SCM_SMOB_APPLY_3 ( proc , arg1 , SCM_CAR ( args ) , SCM_CDR ( args ) ) ) ;
1996-07-25 22:56:11 +00:00
case scm_tc7_cclo :
# ifdef DEVAL
1996-08-20 17:09:07 +00:00
args = ( SCM_UNBNDP ( arg1 ) ? SCM_EOL : debug . vect [ 0 ] . a . args ) ;
arg1 = proc ;
proc = SCM_CCLO_SUBR ( proc ) ;
debug . vect [ 0 ] . a . proc = proc ;
debug . vect [ 0 ] . a . args = scm_cons ( arg1 , args ) ;
1996-07-25 22:56:11 +00:00
# else
args = ( SCM_UNBNDP ( arg1 ) ? SCM_EOL : scm_cons ( arg1 , args ) ) ;
arg1 = proc ;
proc = SCM_CCLO_SUBR ( proc ) ;
1996-08-20 17:09:07 +00:00
# endif
1996-07-25 22:56:11 +00:00
goto tail ;
1999-03-11 11:45:06 +00:00
case scm_tc7_pws :
proc = SCM_PROCEDURE ( proc ) ;
# ifdef DEVAL
debug . vect [ 0 ] . a . proc = proc ;
# endif
goto tail ;
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
2001-07-26 21:40:18 +00:00
case scm_tcs_struct :
1999-08-06 19:37:44 +00:00
if ( SCM_OBJ_CLASS_FLAGS ( proc ) & SCM_CLASSF_PURE_GENERIC )
{
# ifdef DEVAL
args = ( SCM_UNBNDP ( arg1 ) ? SCM_EOL : debug . vect [ 0 ] . a . args ) ;
# else
args = ( SCM_UNBNDP ( arg1 ) ? SCM_EOL : scm_cons ( arg1 , args ) ) ;
# endif
1999-08-29 03:26:05 +00:00
RETURN ( scm_apply_generic ( proc , args ) ) ;
1999-08-06 19:37:44 +00:00
}
2003-05-31 07:38:04 +00:00
else if ( SCM_I_OPERATORP ( proc ) )
1997-10-12 12:54:54 +00:00
{
2002-12-01 13:09:26 +00:00
/* operator */
1997-10-12 12:54:54 +00:00
# ifdef DEVAL
args = ( SCM_UNBNDP ( arg1 ) ? SCM_EOL : debug . vect [ 0 ] . a . args ) ;
# else
args = ( SCM_UNBNDP ( arg1 ) ? SCM_EOL : scm_cons ( arg1 , args ) ) ;
# endif
arg1 = proc ;
1999-08-29 03:26:05 +00:00
proc = ( SCM_I_ENTITYP ( proc )
? SCM_ENTITY_PROCEDURE ( proc )
: SCM_OPERATOR_PROCEDURE ( proc ) ) ;
1997-10-12 12:54:54 +00:00
# ifdef DEVAL
debug . vect [ 0 ] . a . proc = proc ;
debug . vect [ 0 ] . a . args = scm_cons ( arg1 , args ) ;
# endif
1999-08-29 03:26:05 +00:00
if ( SCM_NIMP ( proc ) )
goto tail ;
else
goto badproc ;
1997-10-12 12:54:54 +00:00
}
2003-05-31 07:38:04 +00:00
else
goto badproc ;
1996-07-25 22:56:11 +00:00
default :
badproc :
2001-03-04 17:09:34 +00:00
scm_wrong_type_arg ( " apply " , SCM_ARG1 , proc ) ;
1996-07-25 22:56:11 +00:00
}
# ifdef DEVAL
1996-08-20 17:09:07 +00:00
exit :
2002-03-25 23:45:02 +00:00
if ( scm_check_exit_p & & SCM_TRAPS_P )
1996-08-23 01:20:34 +00:00
if ( SCM_EXIT_FRAME_P | | ( SCM_TRACE_P & & SCM_TRACED_FRAME_P ( debug ) ) )
1996-08-20 17:09:07 +00:00
{
1996-08-23 01:20:34 +00:00
SCM_CLEAR_TRACED_FRAME ( debug ) ;
if ( SCM_CHEAPTRAPS_P )
Don't use GCC extensions to allocate space for debugging frames.
(Here he goes again! Why do we put up with this?!)
* debug.h (scm_debug_frame): Make the 'vect' member a pointer to
an scm_debug_info structure, not an in-line array of them. Add
'info' member, to say how many vect elements we've used, for eval
frames.
* eval.c (SCM_CEVAL): Use alloca to allocate space for vect. Use
a new variable debug_info_end to mark the end of vect, instead of
the address of the 'info' pointer itself.
[DEVAL] (ENTER_APPLY, SCM_CEVAL, SCM_APPLY): Remove casts of
&debug to scm_debug_frame *; debug is a real scm_debug_frame now.
(SCM_APPLY): Explicitly allocate space for debug.vect.
* debug.c (scm_m_start_stack): Same, for vframe.vect.
* stacks.c: Adjusted for new debug frame structure.
(RELOC_INFO, RELOC_FRAME): New macros.
(stack_depth, read_frames): Use them, and new scm_debug_frame
element 'info', instead of magically knowing that eval frames have
an info pointer sitting after vect.
(scm_make_stack, scm_stack_id, scm_last_stack_frame): Use
RELOC_FRAME.
(scm_init_stacks): Formatting tweaks.
1996-12-19 07:55:42 +00:00
arg1 = scm_make_debugobj ( & debug ) ;
1996-08-20 17:09:07 +00:00
else
{
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
int first ;
SCM val = scm_make_continuation ( & first ) ;
if ( first )
arg1 = val ;
else
1996-08-20 17:09:07 +00:00
{
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
proc = val ;
1996-08-20 17:09:07 +00:00
goto ret ;
}
}
2001-06-26 21:55:45 +00:00
SCM_TRAPS_P = 0 ;
scm_call_3 ( SCM_EXIT_FRAME_HDLR , scm_sym_exit_frame , arg1 , proc ) ;
SCM_TRAPS_P = 1 ;
1996-08-20 17:09:07 +00:00
}
ret :
1996-10-05 16:49:31 +00:00
scm_last_debug_frame = debug . prev ;
1996-07-25 22:56:11 +00:00
return proc ;
# endif
}
1996-08-20 17:09:07 +00:00
/* SECTION: The rest of this file is only read once.
*/
1996-07-25 22:56:11 +00:00
# ifndef DEVAL
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 )
{
if ( SCM_IMP ( proc ) )
2003-04-23 18:27:37 +00:00
return NULL ;
2003-01-23 16:04:37 +00:00
if ( SCM_DEBUGGINGP )
return scm_call_0 ;
switch ( SCM_TYP7 ( proc ) )
{
case scm_tc7_subr_0 :
return call_subr0_0 ;
case scm_tc7_subr_1o :
return call_subr1o_0 ;
case scm_tc7_lsubr :
return call_lsubr_0 ;
case scm_tcs_closures :
{
SCM formals = SCM_CLOSURE_FORMALS ( proc ) ;
2003-02-10 12:39:11 +00:00
if ( SCM_NULLP ( formals ) | | ! SCM_CONSP ( formals ) )
2003-01-23 16:04:37 +00:00
return scm_i_call_closure_0 ;
else
2003-04-23 18:27:37 +00:00
return NULL ;
2003-01-23 16:04:37 +00:00
}
case scm_tcs_struct :
if ( SCM_OBJ_CLASS_FLAGS ( proc ) & SCM_CLASSF_PURE_GENERIC )
return scm_call_generic_0 ;
2003-05-31 07:38:04 +00:00
else if ( SCM_I_OPERATORP ( proc ) )
return scm_call_0 ;
return NULL ;
2003-01-23 16:04:37 +00:00
case scm_tc7_smob :
if ( SCM_SMOB_APPLICABLE_P ( proc ) )
return SCM_SMOB_DESCRIPTOR ( proc ) . apply_0 ;
else
2003-04-23 18:27:37 +00:00
return NULL ;
2003-01-23 16:04:37 +00:00
case scm_tc7_asubr :
case scm_tc7_rpsubr :
case scm_tc7_cclo :
case scm_tc7_pws :
return scm_call_0 ;
default :
2003-04-23 18:27:37 +00:00
return NULL ; /* not applicable on one arg */
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 )
{
if ( SCM_INUMP ( arg1 ) )
{
RETURN ( scm_make_real ( SCM_DSUBRF ( proc ) ( ( double ) SCM_INUM ( arg1 ) ) ) ) ;
}
else if ( SCM_REALP ( arg1 ) )
{
RETURN ( scm_make_real ( SCM_DSUBRF ( proc ) ( SCM_REAL_VALUE ( arg1 ) ) ) ) ;
}
else if ( SCM_BIGP ( arg1 ) )
RETURN ( scm_make_real ( SCM_DSUBRF ( proc ) ( scm_i_big2dbl ( arg1 ) ) ) ) ;
SCM_WTA_DISPATCH_1 ( * SCM_SUBR_GENERIC ( proc ) , arg1 ,
SCM_ARG1 , SCM_SYMBOL_CHARS ( SCM_SNAME ( proc ) ) ) ;
}
static SCM
call_cxr_1 ( SCM proc , SCM arg1 )
{
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
unsigned char pattern = ( scm_t_bits ) SCM_SUBRF ( proc ) ;
do
{
SCM_ASSERT ( SCM_CONSP ( arg1 ) , arg1 , SCM_ARG1 ,
SCM_SYMBOL_CHARS ( SCM_SNAME ( proc ) ) ) ;
arg1 = ( pattern & 1 ) ? SCM_CAR ( arg1 ) : SCM_CDR ( arg1 ) ;
pattern > > = 2 ;
} while ( pattern ) ;
return arg1 ;
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 )
{
if ( SCM_IMP ( proc ) )
2003-04-23 18:27:37 +00:00
return NULL ;
2002-12-01 13:09:26 +00:00
if ( SCM_DEBUGGINGP )
return scm_call_1 ;
switch ( SCM_TYP7 ( proc ) )
{
case scm_tc7_subr_1 :
case scm_tc7_subr_1o :
return call_subr1_1 ;
2002-12-19 07:49:15 +00:00
case scm_tc7_subr_2o :
return call_subr2o_1 ;
2002-12-01 13:09:26 +00:00
case scm_tc7_lsubr :
return call_lsubr_1 ;
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 :
return call_dsubr_1 ;
2002-12-01 13:09:26 +00:00
case scm_tc7_cxr :
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
return call_cxr_1 ;
2002-12-01 13:09:26 +00:00
case scm_tcs_closures :
{
SCM formals = SCM_CLOSURE_FORMALS ( proc ) ;
2003-02-10 12:39:11 +00:00
if ( ! SCM_NULLP ( formals )
& & ( ! SCM_CONSP ( formals ) | | ! SCM_CONSP ( SCM_CDR ( formals ) ) ) )
2002-12-01 13:09:26 +00:00
return call_closure_1 ;
else
2003-04-23 18:27:37 +00:00
return NULL ;
2002-12-01 13:09:26 +00:00
}
case scm_tcs_struct :
if ( SCM_OBJ_CLASS_FLAGS ( proc ) & SCM_CLASSF_PURE_GENERIC )
return scm_call_generic_1 ;
2003-05-31 07:38:04 +00:00
else if ( SCM_I_OPERATORP ( proc ) )
return scm_call_1 ;
return NULL ;
2002-12-01 13:09:26 +00:00
case scm_tc7_smob :
if ( SCM_SMOB_APPLICABLE_P ( proc ) )
return SCM_SMOB_DESCRIPTOR ( proc ) . apply_1 ;
else
2003-04-23 18:27:37 +00:00
return NULL ;
2002-12-01 13:09:26 +00:00
case scm_tc7_asubr :
case scm_tc7_rpsubr :
case scm_tc7_cclo :
case scm_tc7_pws :
return scm_call_1 ;
default :
2003-04-23 18:27:37 +00:00
return NULL ; /* not applicable on one arg */
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 )
{
if ( SCM_IMP ( proc ) )
2003-04-23 18:27:37 +00:00
return NULL ;
2002-12-01 13:09:26 +00:00
if ( SCM_DEBUGGINGP )
return scm_call_2 ;
switch ( SCM_TYP7 ( proc ) )
{
case scm_tc7_subr_2 :
case scm_tc7_subr_2o :
case scm_tc7_rpsubr :
case scm_tc7_asubr :
return call_subr2_2 ;
2002-12-19 07:49:15 +00:00
case scm_tc7_lsubr_2 :
return call_lsubr2_2 ;
2002-12-01 13:09:26 +00:00
case scm_tc7_lsubr :
return call_lsubr_2 ;
case scm_tcs_closures :
{
SCM formals = SCM_CLOSURE_FORMALS ( proc ) ;
2003-02-10 12:39:11 +00:00
if ( ! SCM_NULLP ( formals )
& & ( ! SCM_CONSP ( formals )
| | ( ! SCM_NULLP ( SCM_CDR ( formals ) )
& & ( ! SCM_CONSP ( SCM_CDR ( formals ) )
| | ! SCM_CONSP ( SCM_CDDR ( formals ) ) ) ) ) )
2002-12-01 13:09:26 +00:00
return call_closure_2 ;
else
2003-04-23 18:27:37 +00:00
return NULL ;
2002-12-01 13:09:26 +00:00
}
case scm_tcs_struct :
if ( SCM_OBJ_CLASS_FLAGS ( proc ) & SCM_CLASSF_PURE_GENERIC )
return scm_call_generic_2 ;
2003-05-31 07:38:04 +00:00
else if ( SCM_I_OPERATORP ( proc ) )
return scm_call_2 ;
return NULL ;
2002-12-01 13:09:26 +00:00
case scm_tc7_smob :
if ( SCM_SMOB_APPLICABLE_P ( proc ) )
return SCM_SMOB_DESCRIPTOR ( proc ) . apply_2 ;
else
2003-04-23 18:27:37 +00:00
return NULL ;
2002-12-01 13:09:26 +00:00
case scm_tc7_cclo :
case scm_tc7_pws :
return scm_call_2 ;
default :
2003-04-23 18:27:37 +00:00
return NULL ; /* not applicable on two args */
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
{
2002-07-20 14:08:34 +00:00
SCM const * ve = SCM_VELTS ( argv ) ;
2001-05-26 20:51:22 +00:00
long i ;
1999-06-19 17:25:25 +00:00
2000-10-10 09:22:31 +00:00
for ( i = SCM_VECTOR_LENGTH ( argv ) - 1 ; i > = 1 ; i - - )
1999-06-19 17:25:25 +00:00
{
2001-05-26 20:51:22 +00:00
long elt_len = scm_ilength ( ve [ i ] ) ;
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
scm_wrong_type_arg ( who , i + 2 , ve [ i ] ) ;
}
1999-06-19 17:25:25 +00:00
if ( elt_len ! = len )
2002-12-01 13:09:26 +00:00
scm_out_of_range_pos ( who , ve [ i ] , SCM_MAKINUM ( i + 2 ) ) ;
1999-06-19 17:25:25 +00:00
}
2000-12-28 16:49:09 +00:00
scm_remember_upto_here_1 ( argv ) ;
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 ;
2002-07-20 14:08:34 +00:00
SCM const * ve = & args ; /* Keep args from being optimized away. */
1996-07-25 22:56:11 +00:00
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 ) ;
1996-07-25 22:56:11 +00:00
if ( SCM_NULLP ( args ) )
{
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 ;
}
if ( SCM_NULLP ( SCM_CDR ( args ) ) )
{
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 ) ;
1996-07-25 22:56:11 +00:00
ve = SCM_VELTS ( args ) ;
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 ;
2000-10-10 09:22:31 +00:00
for ( i = SCM_VECTOR_LENGTH ( args ) - 1 ; i > = 0 ; i - - )
1996-07-25 22:56:11 +00:00
{
1999-06-19 17:25:25 +00:00
if ( SCM_IMP ( ve [ i ] ) )
return res ;
1996-07-25 22:56:11 +00:00
arg1 = scm_cons ( SCM_CAR ( ve [ i ] ) , arg1 ) ;
2002-07-20 14:08:34 +00:00
SCM_VECTOR_SET ( args , i , SCM_CDR ( ve [ i ] ) ) ;
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
{
2002-07-20 14:08:34 +00:00
SCM const * ve = & args ; /* Keep args from being optimized away. */
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 ) ;
2002-01-22 23:31:39 +00:00
if ( SCM_NULLP ( 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 ;
}
if ( SCM_NULLP ( SCM_CDR ( args ) ) )
{
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 ) ;
1996-07-25 22:56:11 +00:00
ve = SCM_VELTS ( args ) ;
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 ;
2000-10-10 09:22:31 +00:00
for ( i = SCM_VECTOR_LENGTH ( args ) - 1 ; i > = 0 ; i - - )
1996-07-25 22:56:11 +00:00
{
2002-01-22 23:31:39 +00:00
if ( SCM_IMP ( ve [ i ] ) )
return SCM_UNSPECIFIED ;
1996-07-25 22:56:11 +00:00
arg1 = scm_cons ( SCM_CAR ( ve [ i ] ) , arg1 ) ;
2002-07-20 14:08:34 +00:00
SCM_VECTOR_SET ( args , i , SCM_CDR ( ve [ i ] ) ) ;
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 ) ,
scm_make_rec_mutex ( ) ) ;
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 )
{
scm_rec_mutex_free ( SCM_PROMISE_MUTEX ( 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 ) ;
scm_rec_mutex_lock ( SCM_PROMISE_MUTEX ( 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 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
}
}
* __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_rec_mutex_unlock ( SCM_PROMISE_MUTEX ( promise ) ) ;
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
{
2001-03-12 07:08:46 +00:00
return SCM_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 ) ;
2000-05-23 17:18:37 +00:00
if ( ! SCM_IMP ( 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
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 "
" pointer to the new data structure. @code{copy-tree} recurses down the \n "
" 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
{
SCM ans , tl ;
* 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
if ( SCM_IMP ( obj ) )
1999-06-19 20:21:07 +00:00
return obj ;
1998-07-16 23:15:57 +00:00
if ( SCM_VECTORP ( obj ) )
{
2001-05-26 20:51:22 +00:00
unsigned long i = SCM_VECTOR_LENGTH ( obj ) ;
2001-02-02 04:56:25 +00:00
ans = scm_c_make_vector ( i , SCM_UNSPECIFIED ) ;
1998-07-16 23:15:57 +00:00
while ( i - - )
2002-07-20 14:08:34 +00:00
SCM_VECTOR_SET ( ans , i , scm_copy_tree ( SCM_VELTS ( obj ) [ i ] ) ) ;
1998-07-16 23:15:57 +00:00
return ans ;
}
2001-07-30 18:55:50 +00:00
if ( ! SCM_CONSP ( obj ) )
1996-07-25 22:56:11 +00:00
return obj ;
* 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
ans = tl = scm_cons_source ( obj ,
scm_copy_tree ( SCM_CAR ( obj ) ) ,
SCM_UNSPECIFIED ) ;
2003-04-21 01:07:09 +00:00
for ( obj = SCM_CDR ( obj ) ; SCM_CONSP ( obj ) ; obj = SCM_CDR ( obj ) )
* 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
{
SCM_SETCDR ( tl , scm_cons ( scm_copy_tree ( SCM_CAR ( obj ) ) ,
SCM_UNSPECIFIED ) ) ;
tl = SCM_CDR ( tl ) ;
}
SCM_SETCDR ( tl , obj ) ;
1996-07-25 22:56:11 +00:00
return ans ;
}
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 .
- scm_eval ( exp , mod )
2001-03-26 22:39:35 +00:00
evaluates EXP while MOD is the current module . This is done by
2001-02-11 18:13:07 +00:00
setting the current module to MOD , invoking scm_primitive_eval on
EXP , and then restoring the current module to the value it had
previously . That is , while EXP is evaluated , changes to the
current module are tracked , but these changes do not persist when
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
{
2000-08-11 08:42:50 +00:00
return SCM_XEVAL ( exp , env ) ;
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 ) ;
2001-02-21 20:14:47 +00:00
return SCM_XEVAL ( exp , env ) ;
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 ( ) ;
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 ( exp , env ) ;
}
# undef FUNC_NAME
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
2000-12-15 14:00:18 +00:00
static void
change_environment ( void * data )
{
SCM pair = SCM_PACK ( data ) ;
SCM new_module = SCM_CAR ( pair ) ;
2001-02-08 18:49:52 +00:00
SCM old_module = scm_current_module ( ) ;
2000-12-15 14:00:18 +00:00
SCM_SETCDR ( pair , old_module ) ;
2001-02-08 18:49:52 +00:00
scm_set_current_module ( new_module ) ;
2000-12-15 14:00:18 +00:00
}
static void
restore_environment ( void * data )
{
SCM pair = SCM_PACK ( data ) ;
SCM old_module = SCM_CDR ( pair ) ;
2001-02-08 18:49:52 +00:00
SCM new_module = scm_current_module ( ) ;
2000-12-21 17:51:55 +00:00
SCM_SETCAR ( pair , new_module ) ;
2001-02-08 18:49:52 +00:00
scm_set_current_module ( old_module ) ;
2000-12-15 14:00:18 +00:00
}
2001-02-11 18:13:07 +00:00
static SCM
inner_eval_x ( void * data )
{
return scm_primitive_eval_x ( SCM_PACK ( data ) ) ;
}
SCM
scm_eval_x ( SCM exp , SCM module )
# define FUNC_NAME "eval!"
{
SCM_VALIDATE_MODULE ( 2 , module ) ;
return scm_internal_dynamic_wind
( change_environment , inner_eval_x , restore_environment ,
( void * ) SCM_UNPACK ( exp ) ,
( void * ) SCM_UNPACK ( scm_cons ( module , SCM_BOOL_F ) ) ) ;
}
# undef FUNC_NAME
static SCM
inner_eval ( void * data )
{
return scm_primitive_eval ( SCM_PACK ( data ) ) ;
}
2000-12-15 14:00:18 +00:00
2000-08-11 08:42:50 +00:00
SCM_DEFINE ( scm_eval , " eval " , 2 , 0 , 0 ,
2001-02-11 18:13:07 +00:00
( SCM exp , SCM module ) ,
" Evaluate @var{exp}, a list representing a Scheme expression, \n "
" in the top-level environment specified by @var{module}. \n "
2001-11-16 15:04:17 +00:00
" While @var{exp} is evaluated (using @code{primitive-eval}), \n "
2001-02-11 18:13:07 +00:00
" @var{module} is made the current module. The current module \n "
" is reset to its previous value when @var{eval} returns. " )
1999-12-12 02:36:16 +00:00
# define FUNC_NAME s_scm_eval
1996-07-25 22:56:11 +00:00
{
2001-02-11 18:13:07 +00:00
SCM_VALIDATE_MODULE ( 2 , module ) ;
2000-12-15 14:00:18 +00:00
return scm_internal_dynamic_wind
( change_environment , inner_eval , restore_environment ,
2001-02-11 18:13:07 +00:00
( void * ) SCM_UNPACK ( exp ) ,
( void * ) SCM_UNPACK ( scm_cons ( module , SCM_BOOL_F ) ) ) ;
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
/* At this point, scm_deval and scm_dapply are generated.
*/
2003-04-20 18:08:07 +00:00
# define DEVAL
# include "eval.c"
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
void
scm_init_eval ( )
{
1998-03-30 21:02:59 +00:00
scm_init_opts ( scm_evaluator_traps ,
scm_evaluator_trap_table ,
SCM_N_EVALUATOR_TRAPS ) ;
scm_init_opts ( scm_eval_options_interface ,
scm_eval_opts ,
SCM_N_EVAL_OPTIONS ) ;
1999-08-24 02:10:19 +00:00
scm_tc16_promise = scm_make_smob_type ( " promise " , 0 ) ;
scm_set_smob_mark ( scm_tc16_promise , scm_markcdr ) ;
* __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"
2001-05-15 14:57:22 +00:00
1997-09-20 13:58:58 +00:00
scm_add_feature ( " delay " ) ;
1996-07-25 22:56:11 +00:00
}
1996-08-20 17:09:07 +00:00
# endif /* !DEVAL */
2000-03-19 19:01:16 +00:00
/*
Local Variables :
c - file - style : " gnu "
End :
*/