1999-06-19 17:25:25 +00:00
|
|
|
|
/* Copyright (C) 1995,1996,1997,1998, 1999 Free Software Foundation, Inc.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
|
* any later version.
|
|
|
|
|
|
*
|
|
|
|
|
|
* This program 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 General Public License for more details.
|
|
|
|
|
|
*
|
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
|
* along with this software; see the file COPYING. If not, write to
|
1997-05-26 22:34:48 +00:00
|
|
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
|
|
|
|
* Boston, MA 02111-1307 USA
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
|
|
|
|
|
* As a special exception, the Free Software Foundation gives permission
|
|
|
|
|
|
* for additional uses of the text contained in its release of GUILE.
|
|
|
|
|
|
*
|
|
|
|
|
|
* The exception is that, if you link the GUILE library with other files
|
|
|
|
|
|
* to produce an executable, this does not by itself cause the
|
|
|
|
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
|
|
|
|
* Your use of that executable is in no way restricted on account of
|
|
|
|
|
|
* linking the GUILE library code into it.
|
|
|
|
|
|
*
|
|
|
|
|
|
* This exception does not however invalidate any other reasons why
|
|
|
|
|
|
* the executable file might be covered by the GNU General Public License.
|
|
|
|
|
|
*
|
|
|
|
|
|
* This exception applies only to the code released by the
|
|
|
|
|
|
* Free Software Foundation under the name GUILE. If you copy
|
|
|
|
|
|
* code from other Free Software Foundation releases into a copy of
|
|
|
|
|
|
* GUILE, as the General Public License permits, the exception does
|
|
|
|
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
|
|
|
|
* anyone as to the status of such modified files, you must delete
|
|
|
|
|
|
* this exception notice from them.
|
|
|
|
|
|
*
|
|
|
|
|
|
* If you write modifications of your own for GUILE, it is your choice
|
|
|
|
|
|
* whether to permit this exception to apply to your modifications.
|
1997-05-26 22:34:48 +00:00
|
|
|
|
* If you do not wish that, delete this exception notice. */
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
|
|
|
|
|
|
gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
|
|
|
|
|
|
|
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
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef DEVAL
|
|
|
|
|
|
|
1997-05-29 02:20:19 +00:00
|
|
|
|
/* We need this to get the definitions for HAVE_ALLOCA_H, etc. */
|
|
|
|
|
|
#include "scmconfig.h"
|
|
|
|
|
|
|
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
|
|
|
|
|
|
#pragma alloca
|
|
|
|
|
|
# else
|
|
|
|
|
|
# ifndef alloca /* predefined by HP cc +Olibcalls */
|
|
|
|
|
|
char *alloca ();
|
|
|
|
|
|
# endif
|
|
|
|
|
|
# endif
|
|
|
|
|
|
# endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
#include "_scm.h"
|
C files should #include only the header files they need, not
libguile.h (which #includes all the header files); the pointless
recompilation was wasting my time.
* Makefile.in (all .o dependency lists): Regenerated.
* libguile.h: Don't try to get a definition for size_t here...
* __scm.h: Do it here.
* _scm.h: Since this is the internal libguile header, put things
here that all (or a majority) of the libguile files will want.
Don't #include <libguile.h> here; that generates dependencies on
way too much. Instead, get "__scm.h", "error.h", "pairs.h",
"list.h", "gc.h", "gsubr.h", "procs.h", "numbers.h", "symbols.h",
"boolean.h", "strings.h", "vectors.h", "root.h", "ports.h", and
"async.h".
* alist.c: Get "eq.h", "list.h", "alist.h".
* append.c: Get "append.h", "list.h".
* arbiters.c: Get "arbiters.h", "smob.h".
* async.c: Get "async.h", "smob.h", "throw.h", "eval.h".
* boolean.c: Get "boolean.h".
* chars.c: Get "chars.h".
* continuations.c: Get "continuations.h", "dynwind.h", "debug.h",
"stackchk.h".
* debug.c: Get "debug.h", "feature.h", "read.h", "strports.h",
"continuations.h", "alist.h", "srcprop.h", "procprop.h", "smob.h",
"genio.h", "throw.h", "eval.h".
* dynwind.c: Get "dynwind.h", "alist.h", "eval.h".
* eq.c: Get "eq.h", "unif.h", "smob.h", "strorder.h",
"stackchk.h".
* error.c: Get "error.h", "throw.h", "genio.h", "pairs.h".
* eval.c: Get "eval.h", "stackchk.h", "srcprop.h", "debug.h",
"hashtab.h", "procprop.h", "markers.h", "smob.h", "throw.h",
"continuations.h", "eq.h", "sequences.h", "alist.h", "append.h",
"debug.h".
* fdsocket.c: Get "fdsocket.h", "unif.h", "filesys.h".
* feature.c: Get "feature.h".
* files.c: Get "files.h".
* filesys.c: Get "filesys.h", "smob.h", "genio.h".
* fports.c: Get "fports.h", "markers.h".
* gc.c: Get "async.h", "unif.h", "smob.h", "weaks.h",
"genio.h", "struct.h", "stackchk.h", "stime.h".
* gdbint.c: Get "gdbint.h", "chars.h", "eval.h", "print.h",
"read.h", "strports.h", "tag.h".
* genio.c: Get "genio.h", "chars.h".
* gsubr.c: Get "gsubr.h", "genio.h".
* hash.c: Get "hash.h", "chars.h".
* hashtab.c: Get "hashtab.h", "eval.h", "hash.h", "alist.h".
* init.c: Get everyone who has an scm_init_mumble function:
"weaks.h", "vports.h", "version.h", "vectors.h", "variable.h",
"unif.h", "throw.h", "tag.h", "symbols.h", "struct.h",
"strports.h", "strorder.h", "strop.h", "strings.h", "stime.h",
"stackchk.h", "srcprop.h", "socket.h", "simpos.h", "sequences.h",
"scmsigs.h", "read.h", "ramap.h", "procs.h", "procprop.h",
"print.h", "posix.h", "ports.h", "pairs.h", "options.h",
"objprop.h", "numbers.h", "mbstrings.h", "mallocs.h", "load.h",
"list.h", "kw.h", "ioext.h", "hashtab.h", "hash.h", "gsubr.h",
"gdbint.h", "gc.h", "fports.h", "filesys.h", "files.h",
"feature.h", "fdsocket.h", "eval.h", "error.h", "eq.h",
"dynwind.h", "debug.h", "continuations.h", "chars.h", "boolean.h",
"async.h", "arbiters.h", "append.h", "alist.h".
* ioext.c: Get "ioext.h", "fports.h".
* kw.c: Get "kw.h", "smob.h", "mbstrings.h", "genio.h".
* list.c: Get "list.h", "eq.h".
* load.c: Get "load.h", "eval.h", "read.h", "fports.h".
* mallocs.c: Get "smob.h", "genio.h".
* markers.c: Get "markers.h".
* mbstrings.c: Get "mbstrings.h", "read.h", "genio.h", "unif.h",
"chars.h".
* numbers.c: Get "unif.h", "genio.h".
* objprop.c: Get "objprop.h", "weaks.h", "alist.h", "hashtab.h".
* options.c: Get "options.h".
* ports.c: Get "ports.h", "vports.h", "strports.h", "fports.h",
"markers.h", "chars.h", "genio.h".
* posix.c: Get "posix.h", "sequences.h", "feature.h", "unif.h",
"read.h", "scmsigs.h", "genio.h", "fports.h".
* print.c: Get "print.h", "unif.h", "weaks.h", "read.h",
"procprop.h", "eval.h", "smob.h", "mbstrings.h", "genio.h",
"chars.h".
* procprop.c: Get "procprop.h", "eval.h", "alist.h".
* procs.c: Get "procs.h".
* ramap.c: Get "ramap.h", "feature.h", "eval.h", "eq.h",
"chars.h", "smob.h", "unif.h".
* read.c: Get "alist.h", "kw.h", "mbstrings.h", "unif.h",
"eval.h", "genio.h", "chars.h".
* root.c: Get "root.h", "stackchk.h".
* scmsigs.c: Get "scmsigs.h".
* sequences.c: Get "sequences.h".
* simpos.c: Get "simpos.h", "scmsigs.h".
* smob.c: Get "smob.h".
* socket.c: Get "socket.h", "feature.h".
* srcprop.c: Get "srcprop.h", "weaks.h", "hashtab.h", "debug.h",
"alist.h", "smob.h".
* stackchk.c: Get "stackchk.h", "genio.h".
* stime.c: Get "stime.h"."libguile/continuations.h".
* strings.c: Get "strings.h", "chars.h".
* strop.c: Get "strop.h", "chars.h".
* strorder.c: Get "strorder.h", "chars.h".
* strports.c: Get "strports.h", "print.h", "eval.h", "unif.h".
* struct.c: Get "struct.h", "chars.h".
* symbols.c: Get "symbols.h", "mbstrings.h", "alist.h",
"variable.h", "eval.h", "chars.h".
* tag.c: Get "tag.h", "struct.h", "chars.h".
* throw.c: Get "throw.h", "continuations.h", "debug.h",
"dynwind.h", "eval.h", "alist.h", "smob.h", "genio.h".
* unif.c: Get "unif.h", "feature.h", "strop.h", "sequences.h",
"smob.h", "genio.h", "eval.h", "chars.h".
* variable.c: Get "variable.h", "smob.h", "genio.h".
* vectors.c: Get "vectors.h", "eq.h".
* version.c: Get "version.h".
* vports.c: Get "vports.h", "fports.h", "chars.h", "eval.h".
* weaks.c: Get "weaks.h".
1996-09-10 02:26:07 +00:00
|
|
|
|
#include "debug.h"
|
|
|
|
|
|
#include "alist.h"
|
|
|
|
|
|
#include "eq.h"
|
|
|
|
|
|
#include "continuations.h"
|
|
|
|
|
|
#include "throw.h"
|
|
|
|
|
|
#include "smob.h"
|
* 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
|
|
|
|
#include "macros.h"
|
C files should #include only the header files they need, not
libguile.h (which #includes all the header files); the pointless
recompilation was wasting my time.
* Makefile.in (all .o dependency lists): Regenerated.
* libguile.h: Don't try to get a definition for size_t here...
* __scm.h: Do it here.
* _scm.h: Since this is the internal libguile header, put things
here that all (or a majority) of the libguile files will want.
Don't #include <libguile.h> here; that generates dependencies on
way too much. Instead, get "__scm.h", "error.h", "pairs.h",
"list.h", "gc.h", "gsubr.h", "procs.h", "numbers.h", "symbols.h",
"boolean.h", "strings.h", "vectors.h", "root.h", "ports.h", and
"async.h".
* alist.c: Get "eq.h", "list.h", "alist.h".
* append.c: Get "append.h", "list.h".
* arbiters.c: Get "arbiters.h", "smob.h".
* async.c: Get "async.h", "smob.h", "throw.h", "eval.h".
* boolean.c: Get "boolean.h".
* chars.c: Get "chars.h".
* continuations.c: Get "continuations.h", "dynwind.h", "debug.h",
"stackchk.h".
* debug.c: Get "debug.h", "feature.h", "read.h", "strports.h",
"continuations.h", "alist.h", "srcprop.h", "procprop.h", "smob.h",
"genio.h", "throw.h", "eval.h".
* dynwind.c: Get "dynwind.h", "alist.h", "eval.h".
* eq.c: Get "eq.h", "unif.h", "smob.h", "strorder.h",
"stackchk.h".
* error.c: Get "error.h", "throw.h", "genio.h", "pairs.h".
* eval.c: Get "eval.h", "stackchk.h", "srcprop.h", "debug.h",
"hashtab.h", "procprop.h", "markers.h", "smob.h", "throw.h",
"continuations.h", "eq.h", "sequences.h", "alist.h", "append.h",
"debug.h".
* fdsocket.c: Get "fdsocket.h", "unif.h", "filesys.h".
* feature.c: Get "feature.h".
* files.c: Get "files.h".
* filesys.c: Get "filesys.h", "smob.h", "genio.h".
* fports.c: Get "fports.h", "markers.h".
* gc.c: Get "async.h", "unif.h", "smob.h", "weaks.h",
"genio.h", "struct.h", "stackchk.h", "stime.h".
* gdbint.c: Get "gdbint.h", "chars.h", "eval.h", "print.h",
"read.h", "strports.h", "tag.h".
* genio.c: Get "genio.h", "chars.h".
* gsubr.c: Get "gsubr.h", "genio.h".
* hash.c: Get "hash.h", "chars.h".
* hashtab.c: Get "hashtab.h", "eval.h", "hash.h", "alist.h".
* init.c: Get everyone who has an scm_init_mumble function:
"weaks.h", "vports.h", "version.h", "vectors.h", "variable.h",
"unif.h", "throw.h", "tag.h", "symbols.h", "struct.h",
"strports.h", "strorder.h", "strop.h", "strings.h", "stime.h",
"stackchk.h", "srcprop.h", "socket.h", "simpos.h", "sequences.h",
"scmsigs.h", "read.h", "ramap.h", "procs.h", "procprop.h",
"print.h", "posix.h", "ports.h", "pairs.h", "options.h",
"objprop.h", "numbers.h", "mbstrings.h", "mallocs.h", "load.h",
"list.h", "kw.h", "ioext.h", "hashtab.h", "hash.h", "gsubr.h",
"gdbint.h", "gc.h", "fports.h", "filesys.h", "files.h",
"feature.h", "fdsocket.h", "eval.h", "error.h", "eq.h",
"dynwind.h", "debug.h", "continuations.h", "chars.h", "boolean.h",
"async.h", "arbiters.h", "append.h", "alist.h".
* ioext.c: Get "ioext.h", "fports.h".
* kw.c: Get "kw.h", "smob.h", "mbstrings.h", "genio.h".
* list.c: Get "list.h", "eq.h".
* load.c: Get "load.h", "eval.h", "read.h", "fports.h".
* mallocs.c: Get "smob.h", "genio.h".
* markers.c: Get "markers.h".
* mbstrings.c: Get "mbstrings.h", "read.h", "genio.h", "unif.h",
"chars.h".
* numbers.c: Get "unif.h", "genio.h".
* objprop.c: Get "objprop.h", "weaks.h", "alist.h", "hashtab.h".
* options.c: Get "options.h".
* ports.c: Get "ports.h", "vports.h", "strports.h", "fports.h",
"markers.h", "chars.h", "genio.h".
* posix.c: Get "posix.h", "sequences.h", "feature.h", "unif.h",
"read.h", "scmsigs.h", "genio.h", "fports.h".
* print.c: Get "print.h", "unif.h", "weaks.h", "read.h",
"procprop.h", "eval.h", "smob.h", "mbstrings.h", "genio.h",
"chars.h".
* procprop.c: Get "procprop.h", "eval.h", "alist.h".
* procs.c: Get "procs.h".
* ramap.c: Get "ramap.h", "feature.h", "eval.h", "eq.h",
"chars.h", "smob.h", "unif.h".
* read.c: Get "alist.h", "kw.h", "mbstrings.h", "unif.h",
"eval.h", "genio.h", "chars.h".
* root.c: Get "root.h", "stackchk.h".
* scmsigs.c: Get "scmsigs.h".
* sequences.c: Get "sequences.h".
* simpos.c: Get "simpos.h", "scmsigs.h".
* smob.c: Get "smob.h".
* socket.c: Get "socket.h", "feature.h".
* srcprop.c: Get "srcprop.h", "weaks.h", "hashtab.h", "debug.h",
"alist.h", "smob.h".
* stackchk.c: Get "stackchk.h", "genio.h".
* stime.c: Get "stime.h"."libguile/continuations.h".
* strings.c: Get "strings.h", "chars.h".
* strop.c: Get "strop.h", "chars.h".
* strorder.c: Get "strorder.h", "chars.h".
* strports.c: Get "strports.h", "print.h", "eval.h", "unif.h".
* struct.c: Get "struct.h", "chars.h".
* symbols.c: Get "symbols.h", "mbstrings.h", "alist.h",
"variable.h", "eval.h", "chars.h".
* tag.c: Get "tag.h", "struct.h", "chars.h".
* throw.c: Get "throw.h", "continuations.h", "debug.h",
"dynwind.h", "eval.h", "alist.h", "smob.h", "genio.h".
* unif.c: Get "unif.h", "feature.h", "strop.h", "sequences.h",
"smob.h", "genio.h", "eval.h", "chars.h".
* variable.c: Get "variable.h", "smob.h", "genio.h".
* vectors.c: Get "vectors.h", "eq.h".
* version.c: Get "version.h".
* vports.c: Get "vports.h", "fports.h", "chars.h", "eval.h".
* weaks.c: Get "weaks.h".
1996-09-10 02:26:07 +00:00
|
|
|
|
#include "procprop.h"
|
|
|
|
|
|
#include "hashtab.h"
|
1996-09-18 19:33:22 +00:00
|
|
|
|
#include "hash.h"
|
C files should #include only the header files they need, not
libguile.h (which #includes all the header files); the pointless
recompilation was wasting my time.
* Makefile.in (all .o dependency lists): Regenerated.
* libguile.h: Don't try to get a definition for size_t here...
* __scm.h: Do it here.
* _scm.h: Since this is the internal libguile header, put things
here that all (or a majority) of the libguile files will want.
Don't #include <libguile.h> here; that generates dependencies on
way too much. Instead, get "__scm.h", "error.h", "pairs.h",
"list.h", "gc.h", "gsubr.h", "procs.h", "numbers.h", "symbols.h",
"boolean.h", "strings.h", "vectors.h", "root.h", "ports.h", and
"async.h".
* alist.c: Get "eq.h", "list.h", "alist.h".
* append.c: Get "append.h", "list.h".
* arbiters.c: Get "arbiters.h", "smob.h".
* async.c: Get "async.h", "smob.h", "throw.h", "eval.h".
* boolean.c: Get "boolean.h".
* chars.c: Get "chars.h".
* continuations.c: Get "continuations.h", "dynwind.h", "debug.h",
"stackchk.h".
* debug.c: Get "debug.h", "feature.h", "read.h", "strports.h",
"continuations.h", "alist.h", "srcprop.h", "procprop.h", "smob.h",
"genio.h", "throw.h", "eval.h".
* dynwind.c: Get "dynwind.h", "alist.h", "eval.h".
* eq.c: Get "eq.h", "unif.h", "smob.h", "strorder.h",
"stackchk.h".
* error.c: Get "error.h", "throw.h", "genio.h", "pairs.h".
* eval.c: Get "eval.h", "stackchk.h", "srcprop.h", "debug.h",
"hashtab.h", "procprop.h", "markers.h", "smob.h", "throw.h",
"continuations.h", "eq.h", "sequences.h", "alist.h", "append.h",
"debug.h".
* fdsocket.c: Get "fdsocket.h", "unif.h", "filesys.h".
* feature.c: Get "feature.h".
* files.c: Get "files.h".
* filesys.c: Get "filesys.h", "smob.h", "genio.h".
* fports.c: Get "fports.h", "markers.h".
* gc.c: Get "async.h", "unif.h", "smob.h", "weaks.h",
"genio.h", "struct.h", "stackchk.h", "stime.h".
* gdbint.c: Get "gdbint.h", "chars.h", "eval.h", "print.h",
"read.h", "strports.h", "tag.h".
* genio.c: Get "genio.h", "chars.h".
* gsubr.c: Get "gsubr.h", "genio.h".
* hash.c: Get "hash.h", "chars.h".
* hashtab.c: Get "hashtab.h", "eval.h", "hash.h", "alist.h".
* init.c: Get everyone who has an scm_init_mumble function:
"weaks.h", "vports.h", "version.h", "vectors.h", "variable.h",
"unif.h", "throw.h", "tag.h", "symbols.h", "struct.h",
"strports.h", "strorder.h", "strop.h", "strings.h", "stime.h",
"stackchk.h", "srcprop.h", "socket.h", "simpos.h", "sequences.h",
"scmsigs.h", "read.h", "ramap.h", "procs.h", "procprop.h",
"print.h", "posix.h", "ports.h", "pairs.h", "options.h",
"objprop.h", "numbers.h", "mbstrings.h", "mallocs.h", "load.h",
"list.h", "kw.h", "ioext.h", "hashtab.h", "hash.h", "gsubr.h",
"gdbint.h", "gc.h", "fports.h", "filesys.h", "files.h",
"feature.h", "fdsocket.h", "eval.h", "error.h", "eq.h",
"dynwind.h", "debug.h", "continuations.h", "chars.h", "boolean.h",
"async.h", "arbiters.h", "append.h", "alist.h".
* ioext.c: Get "ioext.h", "fports.h".
* kw.c: Get "kw.h", "smob.h", "mbstrings.h", "genio.h".
* list.c: Get "list.h", "eq.h".
* load.c: Get "load.h", "eval.h", "read.h", "fports.h".
* mallocs.c: Get "smob.h", "genio.h".
* markers.c: Get "markers.h".
* mbstrings.c: Get "mbstrings.h", "read.h", "genio.h", "unif.h",
"chars.h".
* numbers.c: Get "unif.h", "genio.h".
* objprop.c: Get "objprop.h", "weaks.h", "alist.h", "hashtab.h".
* options.c: Get "options.h".
* ports.c: Get "ports.h", "vports.h", "strports.h", "fports.h",
"markers.h", "chars.h", "genio.h".
* posix.c: Get "posix.h", "sequences.h", "feature.h", "unif.h",
"read.h", "scmsigs.h", "genio.h", "fports.h".
* print.c: Get "print.h", "unif.h", "weaks.h", "read.h",
"procprop.h", "eval.h", "smob.h", "mbstrings.h", "genio.h",
"chars.h".
* procprop.c: Get "procprop.h", "eval.h", "alist.h".
* procs.c: Get "procs.h".
* ramap.c: Get "ramap.h", "feature.h", "eval.h", "eq.h",
"chars.h", "smob.h", "unif.h".
* read.c: Get "alist.h", "kw.h", "mbstrings.h", "unif.h",
"eval.h", "genio.h", "chars.h".
* root.c: Get "root.h", "stackchk.h".
* scmsigs.c: Get "scmsigs.h".
* sequences.c: Get "sequences.h".
* simpos.c: Get "simpos.h", "scmsigs.h".
* smob.c: Get "smob.h".
* socket.c: Get "socket.h", "feature.h".
* srcprop.c: Get "srcprop.h", "weaks.h", "hashtab.h", "debug.h",
"alist.h", "smob.h".
* stackchk.c: Get "stackchk.h", "genio.h".
* stime.c: Get "stime.h"."libguile/continuations.h".
* strings.c: Get "strings.h", "chars.h".
* strop.c: Get "strop.h", "chars.h".
* strorder.c: Get "strorder.h", "chars.h".
* strports.c: Get "strports.h", "print.h", "eval.h", "unif.h".
* struct.c: Get "struct.h", "chars.h".
* symbols.c: Get "symbols.h", "mbstrings.h", "alist.h",
"variable.h", "eval.h", "chars.h".
* tag.c: Get "tag.h", "struct.h", "chars.h".
* throw.c: Get "throw.h", "continuations.h", "debug.h",
"dynwind.h", "eval.h", "alist.h", "smob.h", "genio.h".
* unif.c: Get "unif.h", "feature.h", "strop.h", "sequences.h",
"smob.h", "genio.h", "eval.h", "chars.h".
* variable.c: Get "variable.h", "smob.h", "genio.h".
* vectors.c: Get "vectors.h", "eq.h".
* version.c: Get "version.h".
* vports.c: Get "vports.h", "fports.h", "chars.h", "eval.h".
* weaks.c: Get "weaks.h".
1996-09-10 02:26:07 +00:00
|
|
|
|
#include "srcprop.h"
|
|
|
|
|
|
#include "stackchk.h"
|
1997-09-22 00:43:52 +00:00
|
|
|
|
#include "objects.h"
|
|
|
|
|
|
#include "feature.h"
|
1999-03-19 02:27:12 +00:00
|
|
|
|
#include "modules.h"
|
C files should #include only the header files they need, not
libguile.h (which #includes all the header files); the pointless
recompilation was wasting my time.
* Makefile.in (all .o dependency lists): Regenerated.
* libguile.h: Don't try to get a definition for size_t here...
* __scm.h: Do it here.
* _scm.h: Since this is the internal libguile header, put things
here that all (or a majority) of the libguile files will want.
Don't #include <libguile.h> here; that generates dependencies on
way too much. Instead, get "__scm.h", "error.h", "pairs.h",
"list.h", "gc.h", "gsubr.h", "procs.h", "numbers.h", "symbols.h",
"boolean.h", "strings.h", "vectors.h", "root.h", "ports.h", and
"async.h".
* alist.c: Get "eq.h", "list.h", "alist.h".
* append.c: Get "append.h", "list.h".
* arbiters.c: Get "arbiters.h", "smob.h".
* async.c: Get "async.h", "smob.h", "throw.h", "eval.h".
* boolean.c: Get "boolean.h".
* chars.c: Get "chars.h".
* continuations.c: Get "continuations.h", "dynwind.h", "debug.h",
"stackchk.h".
* debug.c: Get "debug.h", "feature.h", "read.h", "strports.h",
"continuations.h", "alist.h", "srcprop.h", "procprop.h", "smob.h",
"genio.h", "throw.h", "eval.h".
* dynwind.c: Get "dynwind.h", "alist.h", "eval.h".
* eq.c: Get "eq.h", "unif.h", "smob.h", "strorder.h",
"stackchk.h".
* error.c: Get "error.h", "throw.h", "genio.h", "pairs.h".
* eval.c: Get "eval.h", "stackchk.h", "srcprop.h", "debug.h",
"hashtab.h", "procprop.h", "markers.h", "smob.h", "throw.h",
"continuations.h", "eq.h", "sequences.h", "alist.h", "append.h",
"debug.h".
* fdsocket.c: Get "fdsocket.h", "unif.h", "filesys.h".
* feature.c: Get "feature.h".
* files.c: Get "files.h".
* filesys.c: Get "filesys.h", "smob.h", "genio.h".
* fports.c: Get "fports.h", "markers.h".
* gc.c: Get "async.h", "unif.h", "smob.h", "weaks.h",
"genio.h", "struct.h", "stackchk.h", "stime.h".
* gdbint.c: Get "gdbint.h", "chars.h", "eval.h", "print.h",
"read.h", "strports.h", "tag.h".
* genio.c: Get "genio.h", "chars.h".
* gsubr.c: Get "gsubr.h", "genio.h".
* hash.c: Get "hash.h", "chars.h".
* hashtab.c: Get "hashtab.h", "eval.h", "hash.h", "alist.h".
* init.c: Get everyone who has an scm_init_mumble function:
"weaks.h", "vports.h", "version.h", "vectors.h", "variable.h",
"unif.h", "throw.h", "tag.h", "symbols.h", "struct.h",
"strports.h", "strorder.h", "strop.h", "strings.h", "stime.h",
"stackchk.h", "srcprop.h", "socket.h", "simpos.h", "sequences.h",
"scmsigs.h", "read.h", "ramap.h", "procs.h", "procprop.h",
"print.h", "posix.h", "ports.h", "pairs.h", "options.h",
"objprop.h", "numbers.h", "mbstrings.h", "mallocs.h", "load.h",
"list.h", "kw.h", "ioext.h", "hashtab.h", "hash.h", "gsubr.h",
"gdbint.h", "gc.h", "fports.h", "filesys.h", "files.h",
"feature.h", "fdsocket.h", "eval.h", "error.h", "eq.h",
"dynwind.h", "debug.h", "continuations.h", "chars.h", "boolean.h",
"async.h", "arbiters.h", "append.h", "alist.h".
* ioext.c: Get "ioext.h", "fports.h".
* kw.c: Get "kw.h", "smob.h", "mbstrings.h", "genio.h".
* list.c: Get "list.h", "eq.h".
* load.c: Get "load.h", "eval.h", "read.h", "fports.h".
* mallocs.c: Get "smob.h", "genio.h".
* markers.c: Get "markers.h".
* mbstrings.c: Get "mbstrings.h", "read.h", "genio.h", "unif.h",
"chars.h".
* numbers.c: Get "unif.h", "genio.h".
* objprop.c: Get "objprop.h", "weaks.h", "alist.h", "hashtab.h".
* options.c: Get "options.h".
* ports.c: Get "ports.h", "vports.h", "strports.h", "fports.h",
"markers.h", "chars.h", "genio.h".
* posix.c: Get "posix.h", "sequences.h", "feature.h", "unif.h",
"read.h", "scmsigs.h", "genio.h", "fports.h".
* print.c: Get "print.h", "unif.h", "weaks.h", "read.h",
"procprop.h", "eval.h", "smob.h", "mbstrings.h", "genio.h",
"chars.h".
* procprop.c: Get "procprop.h", "eval.h", "alist.h".
* procs.c: Get "procs.h".
* ramap.c: Get "ramap.h", "feature.h", "eval.h", "eq.h",
"chars.h", "smob.h", "unif.h".
* read.c: Get "alist.h", "kw.h", "mbstrings.h", "unif.h",
"eval.h", "genio.h", "chars.h".
* root.c: Get "root.h", "stackchk.h".
* scmsigs.c: Get "scmsigs.h".
* sequences.c: Get "sequences.h".
* simpos.c: Get "simpos.h", "scmsigs.h".
* smob.c: Get "smob.h".
* socket.c: Get "socket.h", "feature.h".
* srcprop.c: Get "srcprop.h", "weaks.h", "hashtab.h", "debug.h",
"alist.h", "smob.h".
* stackchk.c: Get "stackchk.h", "genio.h".
* stime.c: Get "stime.h"."libguile/continuations.h".
* strings.c: Get "strings.h", "chars.h".
* strop.c: Get "strop.h", "chars.h".
* strorder.c: Get "strorder.h", "chars.h".
* strports.c: Get "strports.h", "print.h", "eval.h", "unif.h".
* struct.c: Get "struct.h", "chars.h".
* symbols.c: Get "symbols.h", "mbstrings.h", "alist.h",
"variable.h", "eval.h", "chars.h".
* tag.c: Get "tag.h", "struct.h", "chars.h".
* throw.c: Get "throw.h", "continuations.h", "debug.h",
"dynwind.h", "eval.h", "alist.h", "smob.h", "genio.h".
* unif.c: Get "unif.h", "feature.h", "strop.h", "sequences.h",
"smob.h", "genio.h", "eval.h", "chars.h".
* variable.c: Get "variable.h", "smob.h", "genio.h".
* vectors.c: Get "vectors.h", "eq.h".
* version.c: Get "version.h".
* vports.c: Get "vports.h", "fports.h", "chars.h", "eval.h".
* weaks.c: Get "weaks.h".
1996-09-10 02:26:07 +00:00
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#include "scm_validate.h"
|
C files should #include only the header files they need, not
libguile.h (which #includes all the header files); the pointless
recompilation was wasting my time.
* Makefile.in (all .o dependency lists): Regenerated.
* libguile.h: Don't try to get a definition for size_t here...
* __scm.h: Do it here.
* _scm.h: Since this is the internal libguile header, put things
here that all (or a majority) of the libguile files will want.
Don't #include <libguile.h> here; that generates dependencies on
way too much. Instead, get "__scm.h", "error.h", "pairs.h",
"list.h", "gc.h", "gsubr.h", "procs.h", "numbers.h", "symbols.h",
"boolean.h", "strings.h", "vectors.h", "root.h", "ports.h", and
"async.h".
* alist.c: Get "eq.h", "list.h", "alist.h".
* append.c: Get "append.h", "list.h".
* arbiters.c: Get "arbiters.h", "smob.h".
* async.c: Get "async.h", "smob.h", "throw.h", "eval.h".
* boolean.c: Get "boolean.h".
* chars.c: Get "chars.h".
* continuations.c: Get "continuations.h", "dynwind.h", "debug.h",
"stackchk.h".
* debug.c: Get "debug.h", "feature.h", "read.h", "strports.h",
"continuations.h", "alist.h", "srcprop.h", "procprop.h", "smob.h",
"genio.h", "throw.h", "eval.h".
* dynwind.c: Get "dynwind.h", "alist.h", "eval.h".
* eq.c: Get "eq.h", "unif.h", "smob.h", "strorder.h",
"stackchk.h".
* error.c: Get "error.h", "throw.h", "genio.h", "pairs.h".
* eval.c: Get "eval.h", "stackchk.h", "srcprop.h", "debug.h",
"hashtab.h", "procprop.h", "markers.h", "smob.h", "throw.h",
"continuations.h", "eq.h", "sequences.h", "alist.h", "append.h",
"debug.h".
* fdsocket.c: Get "fdsocket.h", "unif.h", "filesys.h".
* feature.c: Get "feature.h".
* files.c: Get "files.h".
* filesys.c: Get "filesys.h", "smob.h", "genio.h".
* fports.c: Get "fports.h", "markers.h".
* gc.c: Get "async.h", "unif.h", "smob.h", "weaks.h",
"genio.h", "struct.h", "stackchk.h", "stime.h".
* gdbint.c: Get "gdbint.h", "chars.h", "eval.h", "print.h",
"read.h", "strports.h", "tag.h".
* genio.c: Get "genio.h", "chars.h".
* gsubr.c: Get "gsubr.h", "genio.h".
* hash.c: Get "hash.h", "chars.h".
* hashtab.c: Get "hashtab.h", "eval.h", "hash.h", "alist.h".
* init.c: Get everyone who has an scm_init_mumble function:
"weaks.h", "vports.h", "version.h", "vectors.h", "variable.h",
"unif.h", "throw.h", "tag.h", "symbols.h", "struct.h",
"strports.h", "strorder.h", "strop.h", "strings.h", "stime.h",
"stackchk.h", "srcprop.h", "socket.h", "simpos.h", "sequences.h",
"scmsigs.h", "read.h", "ramap.h", "procs.h", "procprop.h",
"print.h", "posix.h", "ports.h", "pairs.h", "options.h",
"objprop.h", "numbers.h", "mbstrings.h", "mallocs.h", "load.h",
"list.h", "kw.h", "ioext.h", "hashtab.h", "hash.h", "gsubr.h",
"gdbint.h", "gc.h", "fports.h", "filesys.h", "files.h",
"feature.h", "fdsocket.h", "eval.h", "error.h", "eq.h",
"dynwind.h", "debug.h", "continuations.h", "chars.h", "boolean.h",
"async.h", "arbiters.h", "append.h", "alist.h".
* ioext.c: Get "ioext.h", "fports.h".
* kw.c: Get "kw.h", "smob.h", "mbstrings.h", "genio.h".
* list.c: Get "list.h", "eq.h".
* load.c: Get "load.h", "eval.h", "read.h", "fports.h".
* mallocs.c: Get "smob.h", "genio.h".
* markers.c: Get "markers.h".
* mbstrings.c: Get "mbstrings.h", "read.h", "genio.h", "unif.h",
"chars.h".
* numbers.c: Get "unif.h", "genio.h".
* objprop.c: Get "objprop.h", "weaks.h", "alist.h", "hashtab.h".
* options.c: Get "options.h".
* ports.c: Get "ports.h", "vports.h", "strports.h", "fports.h",
"markers.h", "chars.h", "genio.h".
* posix.c: Get "posix.h", "sequences.h", "feature.h", "unif.h",
"read.h", "scmsigs.h", "genio.h", "fports.h".
* print.c: Get "print.h", "unif.h", "weaks.h", "read.h",
"procprop.h", "eval.h", "smob.h", "mbstrings.h", "genio.h",
"chars.h".
* procprop.c: Get "procprop.h", "eval.h", "alist.h".
* procs.c: Get "procs.h".
* ramap.c: Get "ramap.h", "feature.h", "eval.h", "eq.h",
"chars.h", "smob.h", "unif.h".
* read.c: Get "alist.h", "kw.h", "mbstrings.h", "unif.h",
"eval.h", "genio.h", "chars.h".
* root.c: Get "root.h", "stackchk.h".
* scmsigs.c: Get "scmsigs.h".
* sequences.c: Get "sequences.h".
* simpos.c: Get "simpos.h", "scmsigs.h".
* smob.c: Get "smob.h".
* socket.c: Get "socket.h", "feature.h".
* srcprop.c: Get "srcprop.h", "weaks.h", "hashtab.h", "debug.h",
"alist.h", "smob.h".
* stackchk.c: Get "stackchk.h", "genio.h".
* stime.c: Get "stime.h"."libguile/continuations.h".
* strings.c: Get "strings.h", "chars.h".
* strop.c: Get "strop.h", "chars.h".
* strorder.c: Get "strorder.h", "chars.h".
* strports.c: Get "strports.h", "print.h", "eval.h", "unif.h".
* struct.c: Get "struct.h", "chars.h".
* symbols.c: Get "symbols.h", "mbstrings.h", "alist.h",
"variable.h", "eval.h", "chars.h".
* tag.c: Get "tag.h", "struct.h", "chars.h".
* throw.c: Get "throw.h", "continuations.h", "debug.h",
"dynwind.h", "eval.h", "alist.h", "smob.h", "genio.h".
* unif.c: Get "unif.h", "feature.h", "strop.h", "sequences.h",
"smob.h", "genio.h", "eval.h", "chars.h".
* variable.c: Get "variable.h", "smob.h", "genio.h".
* vectors.c: Get "vectors.h", "eq.h".
* version.c: Get "version.h".
* vports.c: Get "vports.h", "fports.h", "chars.h", "eval.h".
* weaks.c: Get "weaks.h".
1996-09-10 02:26:07 +00:00
|
|
|
|
#include "eval.h"
|
1999-03-11 11:45:06 +00:00
|
|
|
|
|
1999-08-30 02:18:00 +00:00
|
|
|
|
SCM (*scm_memoize_method) (SCM, SCM);
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
*
|
|
|
|
|
|
* SIDEVAL corresponds to SCM_CEVAL, but is used in situations where
|
|
|
|
|
|
* only side effects of expressions matter. All immediates are
|
|
|
|
|
|
* ignored.
|
|
|
|
|
|
*
|
* 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.
|
|
|
|
|
|
*
|
|
|
|
|
|
* EVALCELLCAR is like EVALCAR, but is used when it is known that the
|
|
|
|
|
|
* car is a lisp cell.
|
|
|
|
|
|
*
|
|
|
|
|
|
* 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
|
1999-06-19 20:21:07 +00:00
|
|
|
|
#define SIDEVAL(x, env) if (SCM_NIMP(x)) SCM_CEVAL((x), (env))
|
* 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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#define EVALCELLCAR(x, env) (SCM_SYMBOLP (SCM_CAR(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
|
|
|
|
? *scm_lookupcar(x, env, 1) \
|
1996-07-25 22:56:11 +00:00
|
|
|
|
: SCM_CEVAL(SCM_CAR(x), env))
|
|
|
|
|
|
|
|
|
|
|
|
#define EVALCAR(x, env) (SCM_NCELLP(SCM_CAR(x))\
|
|
|
|
|
|
? (SCM_IMP(SCM_CAR(x)) \
|
* 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(SCM_CAR(x), env) \
|
1996-07-25 22:56:11 +00:00
|
|
|
|
: SCM_GLOC_VAL(SCM_CAR(x))) \
|
|
|
|
|
|
: EVALCELLCAR(x, env))
|
|
|
|
|
|
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
#define EXTEND_ENV SCM_EXTEND_ENV
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
#ifdef MEMOIZE_LOCALS
|
* __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 *
|
|
|
|
|
|
scm_ilookup (iloc, env)
|
|
|
|
|
|
SCM iloc;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
register int ir = SCM_IFRAME (iloc);
|
|
|
|
|
|
register SCM er = env;
|
|
|
|
|
|
for (; 0 != ir; --ir)
|
|
|
|
|
|
er = SCM_CDR (er);
|
|
|
|
|
|
er = SCM_CAR (er);
|
|
|
|
|
|
for (ir = SCM_IDIST (iloc); 0 != ir; --ir)
|
|
|
|
|
|
er = SCM_CDR (er);
|
|
|
|
|
|
if (SCM_ICDRP (iloc))
|
* 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 (er);
|
|
|
|
|
|
return SCM_CARLOC (SCM_CDR (er));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
1997-06-08 15:46:19 +00:00
|
|
|
|
#ifdef USE_THREADS
|
|
|
|
|
|
|
|
|
|
|
|
/* The Lookup Car Race
|
|
|
|
|
|
- by Eva Luator
|
|
|
|
|
|
|
|
|
|
|
|
Memoization of variables and special forms is done while executing
|
|
|
|
|
|
the code for the first time. As long as there is only one thread
|
|
|
|
|
|
everything is fine, but as soon as two threads execute the same
|
|
|
|
|
|
code concurrently `for the first time' they can come into conflict.
|
|
|
|
|
|
|
|
|
|
|
|
This memoization includes rewriting variable references into more
|
|
|
|
|
|
efficient forms and expanding macros. Furthermore, macro expansion
|
|
|
|
|
|
includes `compiling' special forms like `let', `cond', etc. into
|
|
|
|
|
|
tree-code instructions.
|
|
|
|
|
|
|
|
|
|
|
|
There shouldn't normally be a problem with memoizing local and
|
|
|
|
|
|
global variable references (into ilocs and glocs), because all
|
|
|
|
|
|
threads will mutate the code in *exactly* the same way and (if I
|
|
|
|
|
|
read the C code correctly) it is not possible to observe a half-way
|
|
|
|
|
|
mutated cons cell. The lookup procedure can handle this
|
|
|
|
|
|
transparently without any critical sections.
|
|
|
|
|
|
|
|
|
|
|
|
It is different with macro expansion, because macro expansion
|
|
|
|
|
|
happens outside of the lookup procedure and can't be
|
|
|
|
|
|
undone. Therefore it can't cope with it. It has to indicate
|
|
|
|
|
|
failure when it detects a lost race and hope that the caller can
|
|
|
|
|
|
handle it. Luckily, it turns out that this is the case.
|
|
|
|
|
|
|
|
|
|
|
|
An example to illustrate this: Suppose that the follwing form will
|
|
|
|
|
|
be memoized concurrently by two threads
|
|
|
|
|
|
|
|
|
|
|
|
(let ((x 12)) x)
|
|
|
|
|
|
|
|
|
|
|
|
Let's first examine the lookup of X in the body. The first thread
|
|
|
|
|
|
decides that it has to find the symbol "x" in the environment and
|
|
|
|
|
|
starts to scan it. Then the other thread takes over and actually
|
|
|
|
|
|
overtakes the first. It looks up "x" and substitutes an
|
|
|
|
|
|
appropriate iloc for it. Now the first thread continues and
|
|
|
|
|
|
completes its lookup. It comes to exactly the same conclusions as
|
|
|
|
|
|
the second one and could - without much ado - just overwrite the
|
|
|
|
|
|
iloc with the same iloc.
|
|
|
|
|
|
|
|
|
|
|
|
But let's see what will happen when the race occurs while looking
|
|
|
|
|
|
up the symbol "let" at the start of the form. It could happen that
|
|
|
|
|
|
the second thread interrupts the lookup of the first thread and not
|
|
|
|
|
|
only substitutes a gloc 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
|
|
|
|
|
|
gloc pointing to the "let" binding, effectively reverting the form
|
|
|
|
|
|
to (let (x 12) x). This is wrong. It has to detect that it has
|
|
|
|
|
|
lost the race and the evaluator has to reconsider the changed form
|
|
|
|
|
|
completely.
|
|
|
|
|
|
|
|
|
|
|
|
This race condition could be resolved with some kind of traffic
|
|
|
|
|
|
light (like mutexes) around scm_lookupcar, but I think that it is
|
|
|
|
|
|
best to avoid them in this case. They would serialize memoization
|
|
|
|
|
|
completely and because lookup involves calling arbitrary Scheme
|
|
|
|
|
|
code (via the lookup-thunk), threads could be blocked for an
|
|
|
|
|
|
arbitrary amount of time or even deadlock. But with the current
|
|
|
|
|
|
solution a lot of unnecessary work is potentially done. */
|
|
|
|
|
|
|
|
|
|
|
|
/* SCM_LOOKUPCAR1 is was SCM_LOOKUPCAR used to be but is allowed to
|
|
|
|
|
|
return NULL to indicate a failed lookup due to some race conditions
|
|
|
|
|
|
between threads. This only happens when VLOC is the first cell of
|
|
|
|
|
|
a special form that will eventually be memoized (like `let', etc.)
|
|
|
|
|
|
In that case the whole lookup is bogus and the caller has to
|
|
|
|
|
|
reconsider the complete special form.
|
|
|
|
|
|
|
|
|
|
|
|
SCM_LOOKUPCAR is still there, of course. It just calls
|
|
|
|
|
|
SCM_LOOKUPCAR1 and aborts on recieving NULL. So SCM_LOOKUPCAR
|
|
|
|
|
|
should only be called when it is known that VLOC is not the first
|
|
|
|
|
|
pair of a special form. Otherwise, use SCM_LOOKUPCAR1 and check
|
* 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
|
|
|
|
|
|
|
|
|
|
#endif /* USE_THREADS */
|
* __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, 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_lookupcar returns a pointer to this when a variable could not
|
|
|
|
|
|
be found and it should not throw an error. Never assign to this.
|
|
|
|
|
|
*/
|
|
|
|
|
|
static scm_cell undef_cell = { SCM_UNDEFINED, SCM_UNDEFINED };
|
|
|
|
|
|
|
1998-11-01 04:40:33 +00:00
|
|
|
|
#ifdef USE_THREADS
|
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)
|
1998-11-01 04:40:33 +00:00
|
|
|
|
#else
|
|
|
|
|
|
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_lookupcar (SCM vloc, SCM genv, int check)
|
1998-11-01 04:40:33 +00:00
|
|
|
|
#endif
|
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);
|
|
|
|
|
|
#ifdef USE_THREADS
|
|
|
|
|
|
register SCM var2 = var;
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef MEMOIZE_LOCALS
|
|
|
|
|
|
register SCM iloc = SCM_ILOC00;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
for (; SCM_NIMP (env); env = SCM_CDR (env))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_BOOL_T == scm_procedure_p (SCM_CAR (env)))
|
|
|
|
|
|
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))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_NCONSP (fl))
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (fl == var)
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef MEMOIZE_LOCALS
|
1997-06-08 15:46:19 +00:00
|
|
|
|
#ifdef USE_THREADS
|
|
|
|
|
|
if (SCM_CAR (vloc) != var)
|
|
|
|
|
|
goto race;
|
|
|
|
|
|
#endif
|
* 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 + SCM_ICDR);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
* 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);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_CAR (fl) == var)
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef MEMOIZE_LOCALS
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS /* letrec inits to SCM_UNDEFINED */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_UNBNDP (SCM_CAR (*al)))
|
|
|
|
|
|
{
|
|
|
|
|
|
env = SCM_EOL;
|
|
|
|
|
|
goto errout;
|
|
|
|
|
|
}
|
1997-06-08 15:46:19 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef USE_THREADS
|
|
|
|
|
|
if (SCM_CAR (vloc) != var)
|
|
|
|
|
|
goto race;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
* 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);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
* 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_CARLOC (*al);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#ifdef MEMOIZE_LOCALS
|
|
|
|
|
|
iloc += SCM_IDINC;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifdef MEMOIZE_LOCALS
|
|
|
|
|
|
iloc = (~SCM_IDSTMSK) & (iloc + SCM_IFRINC);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM top_thunk, vcell;
|
|
|
|
|
|
if (SCM_NIMP(env))
|
|
|
|
|
|
{
|
|
|
|
|
|
top_thunk = SCM_CAR(env); /* env now refers to a top level env thunk */
|
|
|
|
|
|
env = SCM_CDR (env);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
top_thunk = SCM_BOOL_F;
|
|
|
|
|
|
vcell = scm_sym2vcell (var, top_thunk, SCM_BOOL_F);
|
|
|
|
|
|
if (vcell == SCM_BOOL_F)
|
|
|
|
|
|
goto errout;
|
|
|
|
|
|
else
|
|
|
|
|
|
var = vcell;
|
|
|
|
|
|
}
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_NNULLP (env) || SCM_UNBNDP (SCM_CDR (var)))
|
|
|
|
|
|
{
|
|
|
|
|
|
var = SCM_CAR (var);
|
|
|
|
|
|
errout:
|
* 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_everr (vloc, genv,...) */
|
* 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 (check)
|
|
|
|
|
|
scm_misc_error (NULL,
|
|
|
|
|
|
SCM_NULLP (env)
|
|
|
|
|
|
? "Unbound variable: %S"
|
|
|
|
|
|
: "Damaged environment: %S",
|
|
|
|
|
|
scm_listify (var, SCM_UNDEFINED));
|
|
|
|
|
|
else
|
|
|
|
|
|
return SCM_CDRLOC (&undef_cell);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
1997-06-08 15:46:19 +00:00
|
|
|
|
#ifdef USE_THREADS
|
|
|
|
|
|
if (SCM_CAR (vloc) != var2)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Some other thread has changed the very cell we are working
|
|
|
|
|
|
on. In effect, it must have done our job or messed it up
|
|
|
|
|
|
completely. */
|
|
|
|
|
|
race:
|
|
|
|
|
|
var = SCM_CAR (vloc);
|
|
|
|
|
|
if ((var & 7) == 1)
|
|
|
|
|
|
return SCM_GLOC_VAL_LOC (var);
|
|
|
|
|
|
#ifdef MEMOIZE_LOCALS
|
|
|
|
|
|
if ((var & 127) == (127 & SCM_ILOC00))
|
|
|
|
|
|
return scm_ilookup (var, genv);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
/* We can't cope with anything else than glocs and ilocs. When
|
|
|
|
|
|
a special form has been memoized (i.e. `let' into `#@let') we
|
|
|
|
|
|
return NULL and expect the calling function to do the right
|
|
|
|
|
|
thing. For the evaluator, this means going back and redoing
|
|
|
|
|
|
the dispatch on the car of the form. */
|
|
|
|
|
|
return NULL;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif /* USE_THREADS */
|
|
|
|
|
|
|
* 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, var + 1);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* Except wait...what if the var is not a vcell,
|
1997-06-08 15:46:19 +00:00
|
|
|
|
* but syntax or something.... */
|
* 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 (var);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1997-06-08 15:46:19 +00:00
|
|
|
|
#ifdef USE_THREADS
|
|
|
|
|
|
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_lookupcar (vloc, genv, check)
|
1997-06-08 15:46:19 +00:00
|
|
|
|
SCM vloc;
|
|
|
|
|
|
SCM genv;
|
* 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
|
|
|
|
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;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_unmemocar (form, env)
|
|
|
|
|
|
SCM form;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
register int ir;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM c;
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_IMP (form))
|
|
|
|
|
|
return form;
|
|
|
|
|
|
c = SCM_CAR (form);
|
|
|
|
|
|
if (1 == (c & 7))
|
* 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 (form, SCM_CAR (c - 1));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef MEMOIZE_LOCALS
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else if (SCM_ILOCP (c))
|
|
|
|
|
|
{
|
|
|
|
|
|
for (ir = SCM_IFRAME (c); ir != 0; --ir)
|
|
|
|
|
|
env = SCM_CDR (env);
|
|
|
|
|
|
env = SCM_CAR (SCM_CAR (env));
|
|
|
|
|
|
for (ir = SCM_IDIST (c); ir != 0; --ir)
|
|
|
|
|
|
env = SCM_CDR (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_SETCAR (form, SCM_ICDRP (c) ? env : SCM_CAR (env));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
return form;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* __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
|
|
|
|
|
|
scm_eval_car (pair, env)
|
|
|
|
|
|
SCM pair;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
* 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
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
* chars.c (scm_lowers, scm_uppers, scm_charnames, scm_charnums),
eval.c (s_expression, s_test, s_body, s_bindings, s_variable,
s_clauses, s_formals): Variables now const.
* eval.c (promsmob): Now const.
* macros.c (macrosmob): Now const.
* smob.c (scm_newsmob): Smobfuns argument now points to const.
(freecell, flob, bigob): Now const.
* dynl.c (scm_make_argv_from_stringlist, scm_coerce_rostring),
error.c (scm_error, scm_syserror, scm_syserror_msg,
scm_num_overflow, scm_out_of_range, scm_wrong_type_arg,
scm_memory_error, scm_misc_error, scm_wta), macros.c
(scm_make_synt), feature.c (scm_add_feature), filesys.c
(scm_input_waiting_p), gc.c (scm_gc_start, scm_igc,
scm_must_malloc, scm_must_realloc), gsubr.c (scm_make_gsubr),
numbers.c (scm_num2dbl, scm_two_doubles, scm_num2long,
scm_num2long_long, scm_num2ulong),
options.c (scm_options), posix.c (scm_convert_exec_args,
environ_list_to_c), procs.c (scm_make_subr_opt, scm_make_subr),
ramap.c (scm_ramapc), read.c (scm_flush_ws), socket.c
(scm_sock_fd_to_port, scm_fill_sockaddr, scm_addr_vector), stime.c
(setzone, restorezone, bdtime2c), strop.c (scm_i_index),
strports.c (scm_mkstrport), symbols.c (scm_intern_obarray_soft,
scm_intern_obarray, scm_intern, scm_intern0,
scm_sysintern0_no_module_lookup, scm_sysintern, scm_sysintern0,
scm_symbol_value0), unif.c (scm_aind, scm_shap2ra): Argument
indicating calling subr, error message text, reason for error,
symbol name or feature name are now pointer to const.
* snarf.h (SCM_PROC, SCM_PROC1): String variables are now const.
* procs.c (scm_init_iprocs): iproc argument now points to const.
* pairs.c (cxrs): Now const.
* chars.h, error.h, feature.h, filesys.h, gc.h, gsubr.h, macros.h,
numbers.h, options.h, procs.h, ramap.h, read.h, smob.h,
strports.h, symbols.h, unif.h: Update variable declarations and
function prototypes for above changes.
* dynl.c, dynl-dld.c, dynl-dl.c, dynl-shl.c (sysdep_dynl_link,
sysdep_dynl_unlink, sysdep_dynl_func): Arguments FNAME, SUBR, and
SYMB now point to const.
1999-02-06 12:31:04 +00:00
|
|
|
|
const char scm_s_expression[] = "missing or extra expression";
|
|
|
|
|
|
const char scm_s_test[] = "bad test";
|
|
|
|
|
|
const char scm_s_body[] = "bad body";
|
|
|
|
|
|
const char scm_s_bindings[] = "bad bindings";
|
|
|
|
|
|
const char scm_s_variable[] = "bad variable";
|
|
|
|
|
|
const char scm_s_clauses[] = "bad or missing clauses";
|
|
|
|
|
|
const char scm_s_formals[] = "bad formals";
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1999-08-29 14:22:16 +00:00
|
|
|
|
SCM scm_sym_dot, scm_sym_arrow, scm_sym_else;
|
|
|
|
|
|
SCM scm_sym_unquote, scm_sym_uq_splicing, scm_sym_apply;
|
|
|
|
|
|
|
|
|
|
|
|
SCM scm_f_apply;
|
1998-12-14 15:19:59 +00:00
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
* 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 scm_sym_enter_frame, scm_sym_apply_frame, scm_sym_exit_frame;
|
|
|
|
|
|
SCM scm_sym_trace;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
#define ASRTSYNTAX(cond_, msg_) if(!(cond_))scm_wta(xorig, (msg_), what);
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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-04-17 16:03:32 +00:00
|
|
|
|
static void bodycheck SCM_P ((SCM xorig, SCM *bodyloc, const char *what));
|
* __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 void
|
|
|
|
|
|
bodycheck (xorig, bodyloc, what)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM *bodyloc;
|
1999-04-17 16:03:32 +00:00
|
|
|
|
const char *what;
|
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
|
|
|
|
ASRTSYNTAX (scm_ilength (*bodyloc) >= 1, scm_s_expression);
|
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
|
|
|
|
|
|
scm_m_body (op, xorig, what)
|
|
|
|
|
|
SCM op;
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
char *what;
|
|
|
|
|
|
{
|
|
|
|
|
|
ASRTSYNTAX (scm_ilength (xorig) >= 1, scm_s_expression);
|
|
|
|
|
|
|
|
|
|
|
|
/* Don't add another ISYM if one is present already. */
|
|
|
|
|
|
if (SCM_ISYMP (SCM_CAR (xorig)))
|
|
|
|
|
|
return xorig;
|
|
|
|
|
|
|
|
|
|
|
|
/* Retain possible doc string. */
|
|
|
|
|
|
if (SCM_IMP (SCM_CAR(xorig)) || SCM_NCONSP (SCM_CAR (xorig)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_NNULLP (SCM_CDR(xorig)))
|
|
|
|
|
|
return scm_cons (SCM_CAR (xorig),
|
|
|
|
|
|
scm_m_body (op, SCM_CDR(xorig), what));
|
|
|
|
|
|
return xorig;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return scm_cons2 (op, SCM_CAR (xorig), SCM_CDR(xorig));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_quote,"quote", scm_makmmacro, scm_m_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
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_quote, s_quote);
|
* __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
|
|
|
|
|
|
scm_m_quote (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM 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
|
|
|
|
SCM x = scm_copy_tree (SCM_CDR (xorig));
|
|
|
|
|
|
|
* 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_ASSYNT (scm_ilength (SCM_CDR (xorig)) == 1,
|
1998-12-14 15:19:59 +00:00
|
|
|
|
xorig, scm_s_expression, s_quote);
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons (SCM_IM_QUOTE, x);
|
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
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_begin, "begin", scm_makmmacro, scm_m_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
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_begin, s_begin);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_begin (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
* 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_ASSYNT (scm_ilength (SCM_CDR (xorig)) >= 1,
|
1998-12-14 15:19:59 +00:00
|
|
|
|
xorig, scm_s_expression, s_begin);
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons (SCM_IM_BEGIN, SCM_CDR (xorig));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_if, "if", scm_makmmacro, scm_m_if);
|
* 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_if, s_if);
|
* __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
|
|
|
|
|
|
scm_m_if (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
int len = scm_ilength (SCM_CDR (xorig));
|
* 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_ASSYNT (len >= 2 && len <= 3, xorig, scm_s_expression, "if");
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons (SCM_IM_IF, SCM_CDR (xorig));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-03-11 11:45:06 +00:00
|
|
|
|
/* Will go into the RnRS module when Guile is factorized.
|
|
|
|
|
|
SCM_SYNTAX(scm_s_set_x,"set!", scm_makmmacro, scm_m_set_x); */
|
|
|
|
|
|
const char scm_s_set_x[] = "set!";
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_set_x, scm_s_set_x);
|
* __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-03-11 11:45:06 +00:00
|
|
|
|
scm_m_set_x (xorig, env)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
1996-08-20 17:09:07 +00:00
|
|
|
|
SCM x = SCM_CDR (xorig);
|
1999-03-11 11:45:06 +00:00
|
|
|
|
SCM_ASSYNT (2 == scm_ilength (x), xorig, scm_s_expression, scm_s_set_x);
|
* 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_ASSYNT (SCM_NIMP (SCM_CAR (x)) && SCM_SYMBOLP (SCM_CAR (x)),
|
1999-03-11 11:45:06 +00:00
|
|
|
|
xorig, scm_s_variable, scm_s_set_x);
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons (SCM_IM_SET_X, x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if 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
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_vref (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM x = SCM_CDR (xorig);
|
* 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_ASSYNT (1 == scm_ilength (x), xorig, scm_s_expression, s_vref);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_NIMP(x) && UDSCM_VARIABLEP (SCM_CAR (x)))
|
|
|
|
|
|
{
|
* 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_everr (SCM_UNDEFINED, env,..., "global variable reference") */
|
1996-10-27 02:38:39 +00:00
|
|
|
|
scm_misc_error (NULL,
|
|
|
|
|
|
"Bad variable: %S",
|
|
|
|
|
|
scm_listify (SCM_CAR (SCM_CDR (x)), SCM_UNDEFINED));
|
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
|
|
|
|
SCM_ASSYNT (SCM_NIMP(x) && DEFSCM_VARIABLEP (SCM_CAR (x)),
|
|
|
|
|
|
xorig, scm_s_variable, s_vref);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return scm_cons (IM_VREF, x);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
|
scm_m_vset (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM x = SCM_CDR (xorig);
|
* 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_ASSYNT (3 == scm_ilength (x), xorig, scm_s_expression, s_vset);
|
|
|
|
|
|
SCM_ASSYNT ((DEFSCM_VARIABLEP (SCM_CAR (x))
|
|
|
|
|
|
|| UDSCM_VARIABLEP (SCM_CAR (x))),
|
|
|
|
|
|
xorig, scm_s_variable, s_vset);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return scm_cons (IM_VSET, x);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_and, "and", scm_makmmacro, scm_m_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
|
|
|
|
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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_and (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
int len = scm_ilength (SCM_CDR (xorig));
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (len >= 0, xorig, scm_s_test, s_and);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (len >= 1)
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons (SCM_IM_AND, SCM_CDR (xorig));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_or,"or", scm_makmmacro, scm_m_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
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_or,s_or);
|
* __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
|
|
|
|
|
|
scm_m_or (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
int len = scm_ilength (SCM_CDR (xorig));
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (len >= 0, xorig, scm_s_test, s_or);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (len >= 1)
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons (SCM_IM_OR, SCM_CDR (xorig));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_case, "case", scm_makmmacro, scm_m_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
|
|
|
|
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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_case (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM 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
|
|
|
|
SCM proc, cdrx = scm_list_copy (SCM_CDR (xorig)), x = cdrx;
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (scm_ilength (x) >= 2, xorig, scm_s_clauses, s_case);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
while (SCM_NIMP (x = SCM_CDR (x)))
|
|
|
|
|
|
{
|
|
|
|
|
|
proc = SCM_CAR (x);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (scm_ilength (proc) >= 2, xorig, scm_s_clauses, s_case);
|
* 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_ASSYNT (scm_ilength (SCM_CAR (proc)) >= 0
|
* 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_sym_else == SCM_CAR (proc),
|
1998-12-14 15:19:59 +00:00
|
|
|
|
xorig, scm_s_clauses, s_case);
|
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
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_cond, "cond", scm_makmmacro, scm_m_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
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_cond, s_cond);
|
1998-12-14 15:19:59 +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
|
|
|
|
|
|
scm_m_cond (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM 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
|
|
|
|
SCM arg1, cdrx = scm_list_copy (SCM_CDR (xorig)), x = cdrx;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
int len = scm_ilength (x);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (len >= 1, xorig, scm_s_clauses, s_cond);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
while (SCM_NIMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
arg1 = SCM_CAR (x);
|
|
|
|
|
|
len = scm_ilength (arg1);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (len >= 1, xorig, scm_s_clauses, s_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
|
|
|
|
if (scm_sym_else == SCM_CAR (arg1))
|
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
|
|
|
|
SCM_ASSYNT (SCM_NULLP (SCM_CDR (x)) && len >= 2,
|
1998-12-14 15:19:59 +00:00
|
|
|
|
xorig, "bad ELSE clause", s_cond);
|
* 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 (arg1, SCM_BOOL_T);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
* 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
|
|
|
|
if (len >= 2 && scm_sym_arrow == SCM_CAR (SCM_CDR (arg1)))
|
* 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_ASSYNT (3 == len && SCM_NIMP (SCM_CAR (SCM_CDR (SCM_CDR (arg1)))),
|
1998-12-14 15:19:59 +00:00
|
|
|
|
xorig, "bad recipient", s_cond);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
}
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons (SCM_IM_COND, cdrx);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_lambda, "lambda", scm_makmmacro, scm_m_lambda);
|
* 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_lambda, 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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_lambda (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM proc, x = 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
|
|
|
|
if (scm_ilength (x) < 2)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto badforms;
|
|
|
|
|
|
proc = SCM_CAR (x);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
if (SCM_NULLP (proc))
|
|
|
|
|
|
goto memlambda;
|
* 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_IM_LET == proc) /* named let */
|
|
|
|
|
|
goto memlambda;
|
1998-03-30 21:02:59 +00:00
|
|
|
|
if (SCM_IMP (proc))
|
|
|
|
|
|
goto badforms;
|
|
|
|
|
|
if (SCM_SYMBOLP (proc))
|
|
|
|
|
|
goto memlambda;
|
|
|
|
|
|
if (SCM_NCONSP (proc))
|
|
|
|
|
|
goto badforms;
|
|
|
|
|
|
while (SCM_NIMP (proc))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1998-03-30 21:02:59 +00:00
|
|
|
|
if (SCM_NCONSP (proc))
|
|
|
|
|
|
{
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (!SCM_SYMBOLP (proc))
|
1998-03-30 21:02:59 +00:00
|
|
|
|
goto badforms;
|
|
|
|
|
|
else
|
|
|
|
|
|
goto memlambda;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (!(SCM_NIMP (SCM_CAR (proc)) && SCM_SYMBOLP (SCM_CAR (proc))))
|
|
|
|
|
|
goto badforms;
|
|
|
|
|
|
proc = SCM_CDR (proc);
|
|
|
|
|
|
}
|
1999-06-19 20:21:07 +00:00
|
|
|
|
if (SCM_NNULLP (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
|
|
|
|
{
|
|
|
|
|
|
badforms:
|
|
|
|
|
|
scm_wta (xorig, scm_s_formals, s_lambda);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
memlambda:
|
1999-07-29 23:01:01 +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
|
|
|
|
}
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_letstar,"let*", scm_makmmacro, scm_m_letstar);
|
* 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_letstar,s_letstar);
|
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
|
|
|
|
|
|
scm_m_letstar (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM x = SCM_CDR (xorig), arg1, proc, vars = SCM_EOL, *varloc = &vars;
|
|
|
|
|
|
int len = scm_ilength (x);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (len >= 2, xorig, scm_s_body, s_letstar);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
proc = SCM_CAR (x);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (scm_ilength (proc) >= 0, xorig, scm_s_bindings, s_letstar);
|
1999-06-19 20:21:07 +00:00
|
|
|
|
while (SCM_NIMP (proc))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
arg1 = SCM_CAR (proc);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (2 == scm_ilength (arg1), xorig, scm_s_bindings, s_letstar);
|
* 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_ASSYNT (SCM_NIMP (SCM_CAR (arg1)) && SCM_SYMBOLP (SCM_CAR (arg1)),
|
1998-12-14 15:19:59 +00:00
|
|
|
|
xorig, scm_s_variable, s_letstar);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*varloc = scm_cons2 (SCM_CAR (arg1), SCM_CAR (SCM_CDR (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
|
|
|
|
varloc = SCM_CDRLOC (SCM_CDR (*varloc));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
proc = SCM_CDR (proc);
|
|
|
|
|
|
}
|
|
|
|
|
|
x = scm_cons (vars, 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
|
|
|
|
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons2 (SCM_IM_LETSTAR, SCM_CAR (x),
|
|
|
|
|
|
scm_m_body (SCM_IM_LETSTAR, SCM_CDR (x), s_letstar));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* DO gets the most radically altered syntax
|
|
|
|
|
|
(do ((<var1> <init1> <step1>)
|
|
|
|
|
|
(<var2> <init2>)
|
|
|
|
|
|
... )
|
|
|
|
|
|
(<test> <return>)
|
|
|
|
|
|
<body>)
|
|
|
|
|
|
;; becomes
|
|
|
|
|
|
(do_mem (varn ... var2 var1)
|
|
|
|
|
|
(<init1> <init2> ... <initn>)
|
|
|
|
|
|
(<test> <return>)
|
|
|
|
|
|
(<body>)
|
|
|
|
|
|
<step1> <step2> ... <stepn>) ;; missing steps replaced by var
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_do, "do", scm_makmmacro, 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
|
|
|
|
|
|
scm_m_do (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM x = SCM_CDR (xorig), arg1, proc;
|
|
|
|
|
|
SCM vars = SCM_EOL, inits = SCM_EOL, steps = SCM_EOL;
|
|
|
|
|
|
SCM *initloc = &inits, *steploc = &steps;
|
|
|
|
|
|
int len = scm_ilength (x);
|
* 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_ASSYNT (len >= 2, xorig, scm_s_test, "do");
|
1996-07-25 22:56:11 +00:00
|
|
|
|
proc = SCM_CAR (x);
|
* 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_ASSYNT (scm_ilength (proc) >= 0, xorig, scm_s_bindings, "do");
|
1999-06-19 20:21:07 +00:00
|
|
|
|
while (SCM_NIMP(proc))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
arg1 = SCM_CAR (proc);
|
|
|
|
|
|
len = scm_ilength (arg1);
|
* 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_ASSYNT (2 == len || 3 == len, xorig, scm_s_bindings, "do");
|
|
|
|
|
|
SCM_ASSYNT (SCM_NIMP (SCM_CAR (arg1)) && SCM_SYMBOLP (SCM_CAR (arg1)),
|
|
|
|
|
|
xorig, scm_s_variable, "do");
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* vars reversed here, inits and steps reversed at evaluation */
|
|
|
|
|
|
vars = scm_cons (SCM_CAR (arg1), vars); /* variable */
|
|
|
|
|
|
arg1 = SCM_CDR (arg1);
|
|
|
|
|
|
*initloc = scm_cons (SCM_CAR (arg1), SCM_EOL); /* init */
|
* 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);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
arg1 = SCM_CDR (arg1);
|
|
|
|
|
|
*steploc = scm_cons (SCM_IMP (arg1) ? SCM_CAR (vars) : SCM_CAR (arg1), SCM_EOL); /* step */
|
* 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
|
|
|
|
steploc = SCM_CDRLOC (*steploc);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
proc = SCM_CDR (proc);
|
|
|
|
|
|
}
|
|
|
|
|
|
x = SCM_CDR (x);
|
* 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_ASSYNT (scm_ilength (SCM_CAR (x)) >= 1, xorig, scm_s_test, "do");
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = scm_cons2 (SCM_CAR (x), SCM_CDR (x), steps);
|
|
|
|
|
|
x = scm_cons2 (vars, inits, 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
|
|
|
|
bodycheck (xorig, SCM_CARLOC (SCM_CDR (SCM_CDR (x))), "do");
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons (SCM_IM_DO, x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
/* evalcar is small version of inline EVALCAR when we don't care about
|
|
|
|
|
|
* speed
|
|
|
|
|
|
*/
|
|
|
|
|
|
#define evalcar scm_eval_car
|
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
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
static SCM iqq (SCM form, SCM env, int depth);
|
* __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-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_quasiquote, "quasiquote", scm_makacro, scm_m_quasiquote);
|
* 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_quasiquote, s_quasiquote);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_quasiquote (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM x = SCM_CDR (xorig);
|
|
|
|
|
|
SCM_ASSYNT (scm_ilength (x) == 1, xorig, scm_s_expression, s_quasiquote);
|
|
|
|
|
|
return iqq (SCM_CAR (x), env, 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
static SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
iqq (SCM form,SCM env,int depth)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM tmp;
|
|
|
|
|
|
int edepth = depth;
|
1999-06-19 20:21:07 +00:00
|
|
|
|
if (SCM_IMP(form))
|
|
|
|
|
|
return form;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_VECTORP (form))
|
|
|
|
|
|
{
|
|
|
|
|
|
long i = SCM_LENGTH (form);
|
|
|
|
|
|
SCM *data = SCM_VELTS (form);
|
|
|
|
|
|
tmp = SCM_EOL;
|
|
|
|
|
|
for (; --i >= 0;)
|
|
|
|
|
|
tmp = scm_cons (data[i], tmp);
|
|
|
|
|
|
return scm_vector (iqq (tmp, env, depth));
|
|
|
|
|
|
}
|
1999-06-19 20:21:07 +00:00
|
|
|
|
if (SCM_NCONSP(form))
|
|
|
|
|
|
return form;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
tmp = SCM_CAR (form);
|
* 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
|
|
|
|
if (scm_sym_quasiquote == tmp)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
depth++;
|
|
|
|
|
|
goto label;
|
|
|
|
|
|
}
|
* 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
|
|
|
|
if (scm_sym_unquote == tmp)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
--depth;
|
|
|
|
|
|
label:
|
|
|
|
|
|
form = SCM_CDR (form);
|
|
|
|
|
|
SCM_ASSERT (SCM_NIMP (form) && SCM_ECONSP (form) && SCM_NULLP (SCM_CDR (form)),
|
|
|
|
|
|
form, SCM_ARG1, s_quasiquote);
|
|
|
|
|
|
if (0 == depth)
|
|
|
|
|
|
return evalcar (form, env);
|
|
|
|
|
|
return scm_cons2 (tmp, iqq (SCM_CAR (form), env, depth), SCM_EOL);
|
|
|
|
|
|
}
|
* 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
|
|
|
|
if (SCM_NIMP (tmp) && (scm_sym_uq_splicing == SCM_CAR (tmp)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
tmp = SCM_CDR (tmp);
|
|
|
|
|
|
if (0 == --edepth)
|
|
|
|
|
|
return scm_append (scm_cons2 (evalcar (tmp, env), iqq (SCM_CDR (form), env, depth), SCM_EOL));
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_cons (iqq (SCM_CAR (form), env, edepth), iqq (SCM_CDR (form), env, depth));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Here are acros which return values rather than code. */
|
|
|
|
|
|
|
1999-10-11 17:39:24 +00:00
|
|
|
|
SCM_SYNTAX (s_delay, "delay", scm_makmmacro, scm_m_delay);
|
|
|
|
|
|
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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_delay (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
* 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_ASSYNT (scm_ilength (xorig) == 2, xorig, scm_s_expression, s_delay);
|
1999-10-11 17:39:24 +00:00
|
|
|
|
return scm_cons2 (SCM_IM_DELAY, SCM_EOL, SCM_CDR (xorig));
|
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
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_define, "define", scm_makmmacro, scm_m_define);
|
* 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_define, s_define);
|
* __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
|
|
|
|
|
|
scm_m_define (x, env)
|
|
|
|
|
|
SCM x;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM proc, arg1 = x;
|
|
|
|
|
|
x = SCM_CDR (x);
|
* 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_ASSYNT(SCM_NULLP(env), x, "bad placement", s_define);*/
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (scm_ilength (x) >= 2, arg1, scm_s_expression, s_define);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
proc = SCM_CAR (x);
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
while (SCM_NIMP (proc) && SCM_CONSP (proc))
|
|
|
|
|
|
{ /* nested define syntax */
|
* 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
|
|
|
|
x = scm_cons (scm_cons2 (scm_sym_lambda, SCM_CDR (proc), x), SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
proc = SCM_CAR (proc);
|
|
|
|
|
|
}
|
* 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_ASSYNT (SCM_NIMP (proc) && SCM_SYMBOLP (proc),
|
1998-12-14 15:19:59 +00:00
|
|
|
|
arg1, scm_s_variable, s_define);
|
|
|
|
|
|
SCM_ASSYNT (1 == scm_ilength (x), arg1, scm_s_expression, s_define);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_TOP_LEVEL (env))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = evalcar (x, env);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
1997-09-11 00:09:57 +00:00
|
|
|
|
if (SCM_REC_PROCNAMES_P && SCM_NIMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
arg1 = x;
|
|
|
|
|
|
proc:
|
|
|
|
|
|
if (SCM_CLOSUREP (arg1)
|
|
|
|
|
|
/* Only the first definition determines the name. */
|
* 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_procedure_property (arg1, scm_sym_name) == SCM_BOOL_F)
|
|
|
|
|
|
scm_set_procedure_property_x (arg1, scm_sym_name, proc);
|
1997-09-11 00:09:57 +00:00
|
|
|
|
else if (SCM_TYP16 (arg1) == scm_tc16_macro
|
|
|
|
|
|
&& SCM_CDR (arg1) != arg1)
|
|
|
|
|
|
{
|
|
|
|
|
|
arg1 = SCM_CDR (arg1);
|
|
|
|
|
|
goto proc;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#endif
|
* 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
|
|
|
|
arg1 = scm_sym2vcell (proc, scm_env_top_level (env), SCM_BOOL_T);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#if 0
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_NIMP (SCM_CDR (arg1)) && ((SCM) SCM_SNAME (SCM_CDR (arg1)) == proc)
|
|
|
|
|
|
&& (SCM_CDR (arg1) != x))
|
|
|
|
|
|
scm_warn ("redefining built-in ", SCM_CHARS (proc));
|
|
|
|
|
|
else
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (5 <= scm_verbose && SCM_UNDEFINED != SCM_CDR (arg1))
|
|
|
|
|
|
scm_warn ("redefining ", SCM_CHARS (proc));
|
|
|
|
|
|
#endif
|
* 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 (arg1, x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SICP
|
* 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
|
|
|
|
return scm_cons2 (scm_sym_quote, SCM_CAR (arg1), SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_cons2 (SCM_IM_DEFINE, proc, x);
|
|
|
|
|
|
}
|
1996-08-20 17:09:07 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* end of acros */
|
|
|
|
|
|
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
scm_m_letrec1 (op, imm, xorig, env)
|
|
|
|
|
|
SCM op;
|
|
|
|
|
|
SCM imm;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM cdrx = SCM_CDR (xorig); /* locally mutable version of form */
|
|
|
|
|
|
char *what = SCM_CHARS (SCM_CAR (xorig));
|
|
|
|
|
|
SCM x = cdrx, proc, arg1; /* structure traversers */
|
|
|
|
|
|
SCM vars = SCM_EOL, inits = SCM_EOL, *initloc = &inits;
|
|
|
|
|
|
|
|
|
|
|
|
proc = SCM_CAR (x);
|
* 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
|
|
|
|
ASRTSYNTAX (scm_ilength (proc) >= 1, scm_s_bindings);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
/* vars scm_list reversed here, inits reversed at evaluation */
|
|
|
|
|
|
arg1 = SCM_CAR (proc);
|
* 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
|
|
|
|
ASRTSYNTAX (2 == scm_ilength (arg1), scm_s_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
|
|
|
|
ASRTSYNTAX (SCM_NIMP (SCM_CAR (arg1)) && SCM_SYMBOLP (SCM_CAR (arg1)),
|
|
|
|
|
|
scm_s_variable);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
vars = scm_cons (SCM_CAR (arg1), vars);
|
|
|
|
|
|
*initloc = scm_cons (SCM_CAR (SCM_CDR (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
|
|
|
|
initloc = SCM_CDRLOC (*initloc);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-06-19 20:21:07 +00:00
|
|
|
|
while (SCM_NIMP (proc = SCM_CDR (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
|
|
|
|
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons2 (op, vars,
|
|
|
|
|
|
scm_cons (inits, scm_m_body (imm, SCM_CDR (x), what)));
|
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
|
|
|
|
SCM_SYNTAX(s_letrec, "letrec", scm_makmmacro, scm_m_letrec);
|
* 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_letrec, s_letrec);
|
* 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_letrec (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM x = SCM_CDR (xorig);
|
|
|
|
|
|
SCM_ASSYNT (scm_ilength (x) >= 2, xorig, scm_s_body, s_letrec);
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_NULLP (SCM_CAR (x))) /* null binding, let* faster */
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_m_letstar (scm_cons2 (SCM_CAR (xorig), SCM_EOL,
|
|
|
|
|
|
scm_m_body (SCM_IM_LETREC,
|
|
|
|
|
|
SCM_CDR (x),
|
|
|
|
|
|
s_letrec)),
|
* 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
|
|
|
|
env);
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_m_letrec1 (SCM_IM_LETREC, SCM_IM_LETREC, xorig, 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
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_let, "let", scm_makmmacro, 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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_let (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM cdrx = SCM_CDR (xorig); /* locally mutable version of form */
|
|
|
|
|
|
SCM x = cdrx, proc, arg1, name; /* structure traversers */
|
|
|
|
|
|
SCM vars = SCM_EOL, inits = SCM_EOL, *varloc = &vars, *initloc = &inits;
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (scm_ilength (x) >= 2, xorig, scm_s_body, s_let);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
proc = SCM_CAR (x);
|
|
|
|
|
|
if (SCM_NULLP (proc)
|
|
|
|
|
|
|| (SCM_NIMP (proc) && SCM_CONSP (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
|
|
|
|
&& SCM_NIMP (SCM_CAR (proc))
|
|
|
|
|
|
&& SCM_CONSP (SCM_CAR (proc)) && SCM_NULLP (SCM_CDR (proc))))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* null or single binding, let* is faster */
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_m_letstar (scm_cons2 (SCM_CAR (xorig), proc,
|
|
|
|
|
|
scm_m_body (SCM_IM_LET,
|
|
|
|
|
|
SCM_CDR (x),
|
|
|
|
|
|
s_let)),
|
* 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
|
|
|
|
env);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (SCM_NIMP (proc), xorig, scm_s_bindings, s_let);
|
* 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_CONSP (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* plain let, proc is <bindings> */
|
|
|
|
|
|
return scm_m_letrec1 (SCM_IM_LET, SCM_IM_LET, xorig, env);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (!SCM_SYMBOLP (proc))
|
1998-12-14 15:19:59 +00:00
|
|
|
|
scm_wta (xorig, scm_s_bindings, s_let); /* bad let */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
name = proc; /* named let, build equiv letrec */
|
|
|
|
|
|
x = SCM_CDR (x);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (scm_ilength (x) >= 2, xorig, scm_s_body, s_let);
|
* 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
|
|
|
|
proc = SCM_CAR (x); /* bindings list */
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (scm_ilength (proc) >= 0, xorig, scm_s_bindings, s_let);
|
1999-06-19 20:21:07 +00:00
|
|
|
|
while (SCM_NIMP (proc))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{ /* vars and inits both in order */
|
|
|
|
|
|
arg1 = SCM_CAR (proc);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_ASSYNT (2 == scm_ilength (arg1), xorig, scm_s_bindings, s_let);
|
* 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_ASSYNT (SCM_NIMP (SCM_CAR (arg1)) && SCM_SYMBOLP (SCM_CAR (arg1)),
|
1998-12-14 15:19:59 +00:00
|
|
|
|
xorig, scm_s_variable, s_let);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*varloc = scm_cons (SCM_CAR (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
|
|
|
|
varloc = SCM_CDRLOC (*varloc);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*initloc = scm_cons (SCM_CAR (SCM_CDR (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
|
|
|
|
initloc = SCM_CDRLOC (*initloc);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
proc = SCM_CDR (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
|
|
|
|
|
* 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
|
|
|
|
proc = scm_cons2 (scm_sym_lambda, vars,
|
* 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_m_body (SCM_IM_LET, SCM_CDR (x), "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
|
|
|
|
proc = scm_cons2 (scm_sym_let, scm_cons (scm_cons2 (name, proc, 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
|
|
|
|
SCM_EOL),
|
|
|
|
|
|
scm_acons (name, inits, SCM_EOL));
|
|
|
|
|
|
return scm_m_letrec1 (SCM_IM_LETREC, SCM_IM_LET, proc, env);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-08-29 14:22:16 +00:00
|
|
|
|
SCM_SYNTAX (s_atapply,"@apply", scm_makmmacro, scm_m_apply);
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_atapply, s_atapply);
|
|
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_apply, s_atapply + 1);
|
* __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
|
|
|
|
|
|
scm_m_apply (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
* 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_ASSYNT (scm_ilength (SCM_CDR (xorig)) == 2,
|
1998-12-14 15:19:59 +00:00
|
|
|
|
xorig, scm_s_expression, s_atapply);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return scm_cons (SCM_IM_APPLY, SCM_CDR (xorig));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX(s_atcall_cc,"@call-with-current-continuation", scm_makmmacro, scm_m_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
|
|
|
|
SCM_GLOBAL_SYMBOL(scm_sym_atcall_cc,s_atcall_cc);
|
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
|
|
|
|
|
|
scm_m_cont (xorig, env)
|
|
|
|
|
|
SCM xorig;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
* 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_ASSYNT (scm_ilength (SCM_CDR (xorig)) == 1,
|
1998-12-14 15:19:59 +00:00
|
|
|
|
xorig, scm_s_expression, s_atcall_cc);
|
1999-07-29 23:01:01 +00:00
|
|
|
|
return scm_cons (SCM_IM_CONT, SCM_CDR (xorig));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1999-07-27 19:09:06 +00:00
|
|
|
|
/* Multi-language support */
|
|
|
|
|
|
|
|
|
|
|
|
SCM scm_nil;
|
|
|
|
|
|
SCM scm_t;
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX (s_nil_cond, "nil-cond", scm_makmmacro, scm_m_nil_cond);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_nil_cond (SCM xorig, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
int len = scm_ilength (SCM_CDR (xorig));
|
|
|
|
|
|
SCM_ASSYNT (len >= 1 && (len & 1) == 1, xorig,
|
|
|
|
|
|
scm_s_expression, "nil-cond");
|
|
|
|
|
|
return scm_cons (SCM_IM_NIL_COND, SCM_CDR (xorig));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX (s_nil_ify, "nil-ify", scm_makmmacro, scm_m_nil_ify);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_nil_ify (SCM xorig, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_ASSYNT (scm_ilength (SCM_CDR (xorig)) == 1,
|
|
|
|
|
|
xorig, scm_s_expression, "nil-ify");
|
|
|
|
|
|
return scm_cons (SCM_IM_NIL_IFY, SCM_CDR (xorig));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX (s_t_ify, "t-ify", scm_makmmacro, scm_m_t_ify);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_t_ify (SCM xorig, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_ASSYNT (scm_ilength (SCM_CDR (xorig)) == 1,
|
|
|
|
|
|
xorig, scm_s_expression, "t-ify");
|
|
|
|
|
|
return scm_cons (SCM_IM_T_IFY, SCM_CDR (xorig));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX (s_0_cond, "0-cond", scm_makmmacro, scm_m_0_cond);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_0_cond (SCM xorig, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
int len = scm_ilength (SCM_CDR (xorig));
|
|
|
|
|
|
SCM_ASSYNT (len >= 1 && (len & 1) == 1, xorig,
|
|
|
|
|
|
scm_s_expression, "0-cond");
|
|
|
|
|
|
return scm_cons (SCM_IM_0_COND, SCM_CDR (xorig));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX (s_0_ify, "0-ify", scm_makmmacro, scm_m_0_ify);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_0_ify (SCM xorig, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_ASSYNT (scm_ilength (SCM_CDR (xorig)) == 1,
|
|
|
|
|
|
xorig, scm_s_expression, "0-ify");
|
|
|
|
|
|
return scm_cons (SCM_IM_0_IFY, SCM_CDR (xorig));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX (s_1_ify, "1-ify", scm_makmmacro, scm_m_1_ify);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_1_ify (SCM xorig, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_ASSYNT (scm_ilength (SCM_CDR (xorig)) == 1,
|
|
|
|
|
|
xorig, scm_s_expression, "1-ify");
|
|
|
|
|
|
return scm_cons (SCM_IM_1_IFY, SCM_CDR (xorig));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX (s_atfop, "@fop", scm_makmmacro, scm_m_atfop);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_atfop (SCM xorig, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM x = SCM_CDR (xorig), vcell;
|
|
|
|
|
|
SCM_ASSYNT (scm_ilength (x) >= 1, xorig, scm_s_expression, "@fop");
|
|
|
|
|
|
vcell = scm_symbol_fref (SCM_CAR (x));
|
|
|
|
|
|
SCM_ASSYNT (SCM_NIMP (vcell) && SCM_CONSP (vcell), x,
|
|
|
|
|
|
"Symbol's function definition is void", NULL);
|
|
|
|
|
|
SCM_SETCAR (x, vcell + 1);
|
|
|
|
|
|
return x;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYNTAX (s_atbind, "@bind", scm_makmmacro, scm_m_atbind);
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_atbind (SCM xorig, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM x = SCM_CDR (xorig);
|
|
|
|
|
|
SCM_ASSYNT (scm_ilength (x) > 1, xorig, scm_s_expression, "@bind");
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_IMP (env))
|
|
|
|
|
|
env = SCM_BOOL_F;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
while (SCM_NIMP (SCM_CDR (env)))
|
|
|
|
|
|
env = SCM_CDR (env);
|
|
|
|
|
|
env = SCM_CAR (env);
|
|
|
|
|
|
if (SCM_CONSP (env))
|
|
|
|
|
|
env = SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
x = SCM_CAR (x);
|
|
|
|
|
|
while (SCM_NIMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCAR (x, scm_sym2vcell (SCM_CAR (x), env, SCM_BOOL_T) + 1);
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_cons (SCM_IM_BIND, 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
|
|
|
|
SCM
|
|
|
|
|
|
scm_m_expand_body (SCM xorig, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM form, x = SCM_CDR (xorig), defs = SCM_EOL;
|
|
|
|
|
|
char *what = SCM_ISYMCHARS (SCM_CAR (xorig)) + 2;
|
|
|
|
|
|
|
|
|
|
|
|
while (SCM_NIMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
form = SCM_CAR (x);
|
|
|
|
|
|
if (SCM_IMP (form) || SCM_NCONSP (form))
|
|
|
|
|
|
break;
|
|
|
|
|
|
if (SCM_IMP (SCM_CAR (form)))
|
|
|
|
|
|
break;
|
|
|
|
|
|
if (!SCM_SYMBOLP (SCM_CAR (form)))
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
if (SCM_IM_DEFINE == SCM_CAR (form))
|
|
|
|
|
|
{
|
|
|
|
|
|
defs = scm_cons (SCM_CDR (form), defs);
|
|
|
|
|
|
x = SCM_CDR(x);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_NIMP(defs))
|
|
|
|
|
|
{
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_IM_BEGIN == SCM_CAR (form))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = scm_append (scm_cons2 (SCM_CDR (form), SCM_CDR (x), SCM_EOL));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
x = scm_cons (form, SCM_CDR(x));
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_ASSYNT (SCM_NIMP (x), SCM_CDR (xorig), scm_s_body, what);
|
|
|
|
|
|
if (SCM_NIMP (defs))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = scm_cons (scm_m_letrec1 (SCM_IM_LETREC,
|
|
|
|
|
|
SCM_IM_DEFINE,
|
* 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_cons2 (scm_sym_define, defs, 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
|
|
|
|
env),
|
|
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFER_INTS;
|
|
|
|
|
|
SCM_SETCAR (xorig, SCM_CAR (x));
|
|
|
|
|
|
SCM_SETCDR (xorig, SCM_CDR (x));
|
|
|
|
|
|
SCM_ALLOW_INTS;
|
|
|
|
|
|
|
|
|
|
|
|
return xorig;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_macroexp (SCM x, SCM env)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM res, proc;
|
|
|
|
|
|
|
|
|
|
|
|
/* Don't bother to produce error messages here. We get them when we
|
|
|
|
|
|
eventually execute the code for real. */
|
|
|
|
|
|
|
|
|
|
|
|
macro_tail:
|
|
|
|
|
|
if (SCM_IMP (SCM_CAR (x)) || !SCM_SYMBOLP (SCM_CAR (x)))
|
|
|
|
|
|
return x;
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef USE_THREADS
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM *proc_ptr = scm_lookupcar1 (x, env, 0);
|
|
|
|
|
|
if (proc_ptr == NULL)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We have lost the race. */
|
|
|
|
|
|
goto macro_tail;
|
|
|
|
|
|
}
|
|
|
|
|
|
proc = *proc_ptr;
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
proc = *scm_lookupcar (x, env, 0);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* Only handle memoizing macros. `Acros' and `macros' are really
|
|
|
|
|
|
special forms and should not be evaluated here. */
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_IMP (proc)
|
|
|
|
|
|
|| scm_tc16_macro != SCM_TYP16 (proc)
|
|
|
|
|
|
|| (int) (SCM_CAR (proc) >> 16) != 2)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
|
|
|
|
|
|
unmemocar (x, env);
|
|
|
|
|
|
res = scm_apply (SCM_CDR (proc), x, scm_cons (env, scm_listofnull));
|
|
|
|
|
|
|
|
|
|
|
|
if (scm_ilength (res) <= 0)
|
|
|
|
|
|
res = scm_cons2 (SCM_IM_BEGIN, res, SCM_EOL);
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
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.
|
1996-08-20 17:09:07 +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
|
|
|
|
/* We should introduce an anti-macro interface so that it is possible
|
|
|
|
|
|
* to plug in transformers in both directions from other compilation
|
|
|
|
|
|
* units. unmemocopy could then dispatch to anti-macro transformers.
|
|
|
|
|
|
* (Those transformers could perhaps be written in slightly more
|
|
|
|
|
|
* readable style... :)
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
|
|
|
|
|
SCM p;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_NCELLP (x) || SCM_NECONSP (x))
|
|
|
|
|
|
return x;
|
|
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
|
|
|
|
|
p = scm_whash_lookup (scm_source_whash, x);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
switch (SCM_TYP7 (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
case (127 & 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;
|
|
|
|
|
|
case (127 & 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;
|
|
|
|
|
|
case (127 & 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;
|
|
|
|
|
|
case (127 & 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;
|
|
|
|
|
|
case (127 & SCM_IM_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
|
|
|
|
ls = scm_cons (scm_sym_do, SCM_UNSPECIFIED);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
goto transform;
|
|
|
|
|
|
case (127 & SCM_IM_IF):
|
* 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_if, SCM_UNSPECIFIED);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
break;
|
|
|
|
|
|
case (127 & SCM_IM_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
|
|
|
|
ls = scm_cons (scm_sym_let, SCM_UNSPECIFIED);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
goto transform;
|
|
|
|
|
|
case (127 & SCM_IM_LETREC):
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM f, v, e, s;
|
* 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 = scm_cons (scm_sym_letrec, SCM_UNSPECIFIED);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
transform:
|
|
|
|
|
|
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
|
|
|
|
/* binding names */
|
1996-08-20 17:09:07 +00:00
|
|
|
|
f = v = SCM_CAR (x);
|
|
|
|
|
|
x = SCM_CDR (x);
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
z = EXTEND_ENV (f, SCM_EOL, 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
|
|
|
|
/* inits */
|
1996-08-20 17:09:07 +00:00
|
|
|
|
e = scm_reverse (unmemocopy (SCM_CAR (x),
|
* 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_CAR (ls) == scm_sym_letrec ? z : env));
|
1996-08-20 17:09:07 +00:00
|
|
|
|
env = z;
|
* 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
|
|
|
|
/* increments */
|
* 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
|
|
|
|
s = SCM_CAR (ls) == scm_sym_do
|
1996-08-20 17:09:07 +00:00
|
|
|
|
? scm_reverse (unmemocopy (SCM_CDR (SCM_CDR (SCM_CDR (x))), env))
|
|
|
|
|
|
: f;
|
* 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 */
|
1996-08-20 17:09:07 +00:00
|
|
|
|
z = SCM_EOL;
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
z = scm_acons (SCM_CAR (v),
|
|
|
|
|
|
scm_cons (SCM_CAR (e),
|
|
|
|
|
|
SCM_CAR (s) == SCM_CAR (v)
|
|
|
|
|
|
? SCM_EOL
|
|
|
|
|
|
: scm_cons (SCM_CAR (s), SCM_EOL)),
|
|
|
|
|
|
z);
|
|
|
|
|
|
v = SCM_CDR (v);
|
|
|
|
|
|
e = SCM_CDR (e);
|
|
|
|
|
|
s = SCM_CDR (s);
|
|
|
|
|
|
}
|
1999-06-19 20:21:07 +00:00
|
|
|
|
while (SCM_NIMP (v));
|
* 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
|
|
|
|
z = scm_cons (z, SCM_UNSPECIFIED);
|
|
|
|
|
|
SCM_SETCDR (ls, z);
|
* 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
|
|
|
|
if (SCM_CAR (ls) == scm_sym_do)
|
1996-08-20 17:09:07 +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
|
|
|
|
/* test clause */
|
* 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_cons (unmemocopy (SCM_CAR (x), env),
|
1996-08-20 17:09:07 +00:00
|
|
|
|
SCM_UNSPECIFIED));
|
* 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
|
|
|
|
z = SCM_CDR (z);
|
|
|
|
|
|
x = (SCM) (SCM_CARLOC (SCM_CDR (x)) - 1);
|
* eval.c, tags.h, print.c (SCM_IM_SLOT_REF, SCM_IM_SLOT_SET_X):
New isym operations.
* eval.c (SCM_IM_DISPATCH, SCM_IM_HASH_DISPATCH): Don't use
improper lists in the low-level representation, since that will
cause a begin to be prepended at macro expansion.
* eval.c (scm_cons_source): Version of cons which copies source
properties from an existing cell.
(scm_m_quote, scm_m_begin, scm_m_if, scm_m_set_x, scm_m_and,
scm_m_or, scm_m_case, scm_m_cond, scm_m_lambda, scm_m_letstar,
scm_m_do, scm_m_letrec, scm_m_let, scm_copy_tree): Use
scm_cons_source.
1999-07-29 18:12:51 +00:00
|
|
|
|
/* body forms are now to be found in SCM_CDR (x)
|
|
|
|
|
|
(this is how *real* code look like! :) */
|
1996-08-20 17:09:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
case (127 & SCM_IM_LETSTAR):
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM b, y;
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
b = SCM_CAR (x);
|
|
|
|
|
|
y = SCM_EOL;
|
|
|
|
|
|
if SCM_IMP (b)
|
|
|
|
|
|
{
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = 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 (
|
|
|
|
|
|
scm_cons (unmemocopy (SCM_CAR (SCM_CDR (b)), env), SCM_EOL), env),
|
|
|
|
|
|
SCM_UNSPECIFIED);
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (b), SCM_BOOL_F, env);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
b = SCM_CDR (SCM_CDR (b));
|
|
|
|
|
|
if (SCM_IMP (b))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCDR (y, SCM_EOL);
|
* 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 = scm_cons (scm_sym_let, z = scm_cons (y, SCM_UNSPECIFIED));
|
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 (
|
1996-08-20 17:09:07 +00:00
|
|
|
|
scm_cons (unmemocopy (SCM_CAR (SCM_CDR (b)), env), SCM_EOL), 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);
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (b), SCM_BOOL_F, env);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
b = SCM_CDR (SCM_CDR (b));
|
|
|
|
|
|
}
|
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:
|
* 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 = scm_cons (scm_sym_letstar, z = scm_cons (y, SCM_UNSPECIFIED));
|
1996-08-20 17:09:07 +00:00
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
case (127 & 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;
|
|
|
|
|
|
case (127 & SCM_IM_LAMBDA):
|
|
|
|
|
|
x = SCM_CDR (x);
|
* 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 = scm_cons (scm_sym_lambda,
|
1996-08-20 17:09:07 +00:00
|
|
|
|
z = scm_cons (SCM_CAR (x), SCM_UNSPECIFIED));
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (x), SCM_EOL, env);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
break;
|
|
|
|
|
|
case (127 & 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;
|
1999-03-11 11:45:06 +00:00
|
|
|
|
case (127 & SCM_IM_SET_X):
|
|
|
|
|
|
ls = z = scm_cons (scm_sym_set_x, SCM_UNSPECIFIED);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
break;
|
|
|
|
|
|
case (127 & SCM_IM_DEFINE):
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM n;
|
|
|
|
|
|
x = SCM_CDR (x);
|
* 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 = scm_cons (scm_sym_define,
|
1996-08-20 17:09:07 +00:00
|
|
|
|
z = scm_cons (n = SCM_CAR (x), SCM_UNSPECIFIED));
|
|
|
|
|
|
if (SCM_NNULLP (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_SETCAR (SCM_CAR (env), scm_cons (n, SCM_CAR (SCM_CAR (env))));
|
1996-08-20 17:09:07 +00:00
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
case (127 & SCM_MAKISYM (0)):
|
|
|
|
|
|
z = SCM_CAR (x);
|
|
|
|
|
|
if (!SCM_ISYMP (z))
|
|
|
|
|
|
goto unmemo;
|
1999-06-19 20:21:07 +00:00
|
|
|
|
switch (SCM_ISYMNUM (z))
|
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;
|
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
|
|
|
|
}
|
|
|
|
|
|
unmemo:
|
|
|
|
|
|
default:
|
|
|
|
|
|
ls = z = unmemocar (scm_cons (unmemocopy (SCM_CAR (x), env),
|
|
|
|
|
|
SCM_UNSPECIFIED),
|
|
|
|
|
|
env);
|
|
|
|
|
|
}
|
|
|
|
|
|
loop:
|
|
|
|
|
|
while (SCM_CELLP (x = SCM_CDR (x)) && SCM_ECONSP (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
|
|
|
|
{
|
* 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 (SCM_CAR (x)) && SCM_ISYMP (SCM_CAR (x)))
|
|
|
|
|
|
/* skip body markers */
|
|
|
|
|
|
continue;
|
* 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, unmemocar (scm_cons (unmemocopy (SCM_CAR (x), env),
|
|
|
|
|
|
SCM_UNSPECIFIED),
|
|
|
|
|
|
env));
|
|
|
|
|
|
z = SCM_CDR (z);
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_SETCDR (z, x);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
|
|
|
|
|
if (SCM_NFALSEP (p))
|
|
|
|
|
|
scm_whash_insert (scm_source_whash, ls, p);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
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
|
|
|
|
|
|
scm_unmemocopy (x, env)
|
|
|
|
|
|
SCM x;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_NNULLP (env))
|
|
|
|
|
|
/* 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, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
* __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
|
|
|
|
|
|
scm_badargsp (formals, args)
|
|
|
|
|
|
SCM formals;
|
|
|
|
|
|
SCM args;
|
|
|
|
|
|
{
|
1999-06-19 20:21:07 +00:00
|
|
|
|
while (SCM_NIMP (formals))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-06-19 20:21:07 +00:00
|
|
|
|
if (SCM_NCONSP (formals))
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
if (SCM_IMP(args))
|
|
|
|
|
|
return 1;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
formals = SCM_CDR (formals);
|
|
|
|
|
|
args = SCM_CDR (args);
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_NNULLP (args) ? 1 : 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
SCM
|
1998-05-02 16:26:21 +00:00
|
|
|
|
scm_eval_args (l, env, proc)
|
1996-08-20 17:09:07 +00:00
|
|
|
|
SCM l;
|
|
|
|
|
|
SCM env;
|
1998-05-02 16:26:21 +00:00
|
|
|
|
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;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
while (SCM_NIMP (l))
|
|
|
|
|
|
{
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifdef SCM_CAUTIOUS
|
1998-05-02 16:26:21 +00:00
|
|
|
|
if (SCM_IMP (l))
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
else if (SCM_CONSP (l))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_IMP (SCM_CAR (l)))
|
* 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
|
|
|
|
res = SCM_EVALIM (SCM_CAR (l), env);
|
1998-05-02 16:26:21 +00:00
|
|
|
|
else
|
|
|
|
|
|
res = EVALCELLCAR (l, env);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_TYP3 (l) == 1)
|
|
|
|
|
|
{
|
|
|
|
|
|
if ((res = SCM_GLOC_VAL (SCM_CAR (l))) == 0)
|
|
|
|
|
|
res = SCM_CAR (l); /* struct planted in code */
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
#else
|
|
|
|
|
|
res = EVALCAR (l, env);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
*lloc = scm_cons (res, 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
|
|
|
|
lloc = SCM_CDRLOC (*lloc);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
l = SCM_CDR (l);
|
|
|
|
|
|
}
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifdef SCM_CAUTIOUS
|
1998-05-02 16:26:21 +00:00
|
|
|
|
if (SCM_NNULLP (l))
|
|
|
|
|
|
{
|
|
|
|
|
|
wrongnumargs:
|
|
|
|
|
|
scm_wrong_num_args (proc);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return results;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
}
|
1997-02-04 23:30:07 +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:
|
|
|
|
|
|
next = code;
|
|
|
|
|
|
while (SCM_NNULLP (next = SCM_CDR (next)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_IMP (SCM_CAR (code)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_ISYMP (SCM_CAR (code)))
|
|
|
|
|
|
{
|
|
|
|
|
|
code = scm_m_expand_body (code, env);
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_XEVAL (SCM_CAR (code), env);
|
|
|
|
|
|
code = next;
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_XEVALCAR (code, env);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1997-02-04 23:30:07 +00:00
|
|
|
|
|
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
|
|
|
|
|
|
#define RETURN(x) return x;
|
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 \
|
|
|
|
|
|
{\
|
1996-08-23 01:20:34 +00:00
|
|
|
|
SCM_SET_ARGSREADY (debug);\
|
1998-08-21 08:13:55 +00:00
|
|
|
|
if (CHECK_APPLY && 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); \
|
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);\
|
* 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_ithrow (scm_sym_apply_frame, scm_cons2 (tmp, tail, SCM_EOL), 0);\
|
1998-08-21 08:13:55 +00:00
|
|
|
|
}\
|
1996-08-20 17:09:07 +00:00
|
|
|
|
else\
|
|
|
|
|
|
{\
|
|
|
|
|
|
scm_make_cont (&tmp);\
|
1998-10-07 10:02:34 +00:00
|
|
|
|
if (!setjmp (SCM_JMPBUF (tmp)))\
|
* 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_ithrow (scm_sym_apply_frame, scm_cons2 (tmp, tail, SCM_EOL), 0);\
|
1996-08-20 17:09:07 +00:00
|
|
|
|
}\
|
|
|
|
|
|
}\
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#undef RETURN
|
|
|
|
|
|
#define RETURN(e) {proc = (e); goto exit;}
|
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.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
1996-10-05 16:49:31 +00:00
|
|
|
|
#ifndef USE_THREADS
|
|
|
|
|
|
scm_debug_frame *scm_last_debug_frame;
|
|
|
|
|
|
#endif
|
1996-08-20 17:09:07 +00:00
|
|
|
|
|
|
|
|
|
|
/* scm_debug_eframe_size is the number of slots available for pseudo
|
|
|
|
|
|
* stack frames at each real stack frame.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
int scm_debug_eframe_size;
|
|
|
|
|
|
|
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
|
|
|
|
|
1998-04-12 23:34:43 +00:00
|
|
|
|
int scm_eval_stack;
|
|
|
|
|
|
|
1998-03-30 21:02:59 +00:00
|
|
|
|
scm_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
|
|
|
|
};
|
|
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
scm_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." },
|
1998-04-12 23:34:43 +00:00
|
|
|
|
{ SCM_OPTION_INTEGER, "stack", 20000, "Stack size limit (measured in words; 0 = no check)." }
|
1996-08-20 17:09:07 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
scm_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." },
|
|
|
|
|
|
{ SCM_OPTION_BOOLEAN, "exit-frame", 0, "Trap when exiting eval or apply." }
|
1996-08-20 17:09:07 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
GUILE_PROC (scm_eval_options_interface, "eval-options-interface", 0, 1, 0,
|
|
|
|
|
|
(SCM setting),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#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
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
GUILE_PROC (scm_evaluator_traps, "evaluator-traps-interface", 0, 1, 0,
|
|
|
|
|
|
(SCM setting),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#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
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
SCM
|
1998-05-02 16:26:21 +00:00
|
|
|
|
scm_deval_args (l, env, proc, lloc)
|
|
|
|
|
|
SCM l, env, proc, *lloc;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1998-05-02 16:26:21 +00:00
|
|
|
|
SCM *results = lloc, res;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
while (SCM_NIMP (l))
|
|
|
|
|
|
{
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifdef SCM_CAUTIOUS
|
1998-05-02 16:26:21 +00:00
|
|
|
|
if (SCM_IMP (l))
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
else if (SCM_CONSP (l))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_IMP (SCM_CAR (l)))
|
* 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
|
|
|
|
res = SCM_EVALIM (SCM_CAR (l), env);
|
1998-05-02 16:26:21 +00:00
|
|
|
|
else
|
|
|
|
|
|
res = EVALCELLCAR (l, env);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_TYP3 (l) == 1)
|
|
|
|
|
|
{
|
|
|
|
|
|
if ((res = SCM_GLOC_VAL (SCM_CAR (l))) == 0)
|
|
|
|
|
|
res = SCM_CAR (l); /* struct planted in code */
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
#else
|
|
|
|
|
|
res = EVALCAR (l, env);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
*lloc = scm_cons (res, 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
|
|
|
|
lloc = SCM_CDRLOC (*lloc);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
l = SCM_CDR (l);
|
|
|
|
|
|
}
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifdef SCM_CAUTIOUS
|
1998-05-02 16:26:21 +00:00
|
|
|
|
if (SCM_NNULLP (l))
|
|
|
|
|
|
{
|
|
|
|
|
|
wrongnumargs:
|
|
|
|
|
|
scm_wrong_num_args (proc);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return *results;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#endif /* !DEVAL */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* SECTION: Some local definitions for the evaluator.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef DEVAL
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
#define CHECK_EQVISH(A,B) (((A) == (B)) || (SCM_NFALSEP (scm_eqv_p ((A), (B)))))
|
|
|
|
|
|
#else
|
|
|
|
|
|
#define CHECK_EQVISH(A,B) ((A) == (B))
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#endif /* DEVAL */
|
|
|
|
|
|
|
1997-03-07 21:43:03 +00:00
|
|
|
|
#define BUILTIN_RPASUBR /* Handle rpsubrs and asubrs without calling apply */
|
1996-08-20 17:09:07 +00:00
|
|
|
|
|
|
|
|
|
|
/* SECTION: This is the evaluator. Like any real monster, it has
|
|
|
|
|
|
* three heads. This code is compiled twice.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#if 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
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_ceval (SCM x, SCM env)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#if 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
|
|
|
|
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
|
|
|
|
{
|
|
|
|
|
|
union
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM *lloc;
|
|
|
|
|
|
SCM arg1;
|
1997-06-08 15:46:19 +00:00
|
|
|
|
} t;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
SCM proc, arg2;
|
|
|
|
|
|
#ifdef DEVAL
|
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
|
|
|
|
scm_debug_frame debug;
|
|
|
|
|
|
scm_debug_info *debug_info_end;
|
1996-10-05 16:49:31 +00:00
|
|
|
|
debug.prev = scm_last_debug_frame;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
debug.status = scm_debug_eframe_size;
|
1999-08-04 22:55:08 +00:00
|
|
|
|
/*
|
|
|
|
|
|
* The debug.vect contains twice as much scm_debug_info frames as the
|
|
|
|
|
|
* user has specified with (debug-set! frames <n>).
|
|
|
|
|
|
*
|
|
|
|
|
|
* Even frames are eval frames, odd frames are apply frames.
|
|
|
|
|
|
*/
|
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 = (scm_debug_info *) alloca (scm_debug_eframe_size
|
|
|
|
|
|
* sizeof (debug.vect[0]));
|
|
|
|
|
|
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
|
|
|
|
|
|
if (SCM_STACK_OVERFLOW_P ((SCM_STACKITEM *) &proc)
|
|
|
|
|
|
&& scm_stack_checking_enabled_p)
|
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
|
|
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
goto start;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
loopnoap:
|
|
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
|
|
|
|
|
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
|
|
|
|
|
|
* label call PREP_APPLY. A convenient way to do this is to jump to
|
|
|
|
|
|
* `loopnoap' or `cdrxnoap'.
|
|
|
|
|
|
*/
|
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;
|
|
|
|
|
|
}
|
|
|
|
|
|
start:
|
|
|
|
|
|
debug.info->e.exp = x;
|
|
|
|
|
|
debug.info->e.env = env;
|
1998-08-21 08:13:55 +00:00
|
|
|
|
if (CHECK_ENTRY && SCM_TRAPS_P)
|
1996-08-23 01:20:34 +00:00
|
|
|
|
if (SCM_ENTER_FRAME_P || (SCM_BREAKPOINTS_P && SRCBRKP (x)))
|
1996-08-20 17:09:07 +00:00
|
|
|
|
{
|
1999-12-12 19:24:29 +00:00
|
|
|
|
SCM tail = SCM_BOOL(SCM_TAILRECP (debug));
|
1996-08-23 01:20:34 +00:00
|
|
|
|
SCM_SET_TAILREC (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
|
|
|
|
t.arg1 = scm_make_debugobj (&debug);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_make_cont (&t.arg1);
|
1998-10-07 10:02:34 +00:00
|
|
|
|
if (setjmp (SCM_JMPBUF (t.arg1)))
|
1996-08-20 17:09:07 +00:00
|
|
|
|
{
|
|
|
|
|
|
x = SCM_THROW_VALUE (t.arg1);
|
|
|
|
|
|
if (SCM_IMP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
RETURN (x);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
/* This gives the possibility for the debugger to
|
|
|
|
|
|
modify the source expression before evaluation. */
|
|
|
|
|
|
goto dispatch;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
* 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_ithrow (scm_sym_enter_frame,
|
1996-08-20 17:09:07 +00:00
|
|
|
|
scm_cons2 (t.arg1, tail,
|
|
|
|
|
|
scm_cons (scm_unmemocopy (x, env), SCM_EOL)),
|
|
|
|
|
|
0);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
1997-06-21 05:53:04 +00:00
|
|
|
|
#if defined (USE_THREADS) || defined (DEVAL)
|
1997-06-08 15:46:19 +00:00
|
|
|
|
dispatch:
|
1997-06-21 05:53:04 +00:00
|
|
|
|
#endif
|
1998-01-30 21:07:51 +00:00
|
|
|
|
SCM_TICK;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
switch (SCM_TYP7 (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
case scm_tcs_symbols:
|
|
|
|
|
|
/* Only happens when called at top level.
|
|
|
|
|
|
*/
|
|
|
|
|
|
x = scm_cons (x, SCM_UNDEFINED);
|
|
|
|
|
|
goto retval;
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_AND):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
t.arg1 = x;
|
|
|
|
|
|
while (SCM_NNULLP (t.arg1 = SCM_CDR (t.arg1)))
|
|
|
|
|
|
if (SCM_FALSEP (EVALCAR (x, env)))
|
|
|
|
|
|
{
|
|
|
|
|
|
RETURN (SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
x = t.arg1;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto carloop;
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_BEGIN):
|
1996-08-20 17:09:07 +00:00
|
|
|
|
cdrxnoap:
|
|
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
cdrxbegin:
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
|
|
|
|
|
|
begin:
|
|
|
|
|
|
t.arg1 = x;
|
|
|
|
|
|
while (SCM_NNULLP (t.arg1 = SCM_CDR (t.arg1)))
|
|
|
|
|
|
{
|
* 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 (SCM_CAR (x)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_ISYMP (SCM_CAR (x)))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = scm_m_expand_body (x, env);
|
|
|
|
|
|
goto begin;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_CEVAL (SCM_CAR (x), env);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = t.arg1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
carloop: /* scm_eval car of last form in list */
|
|
|
|
|
|
if (SCM_NCELLP (SCM_CAR (x)))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = SCM_CAR (x);
|
* 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_IMP (x) ? SCM_EVALIM (x, env) : SCM_GLOC_VAL (x))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_SYMBOLP (SCM_CAR (x)))
|
|
|
|
|
|
{
|
|
|
|
|
|
retval:
|
* 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_lookupcar (x, env, 1))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
x = SCM_CAR (x);
|
|
|
|
|
|
goto loop; /* tail recurse */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_CASE):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
t.arg1 = EVALCAR (x, env);
|
|
|
|
|
|
while (SCM_NIMP (x = SCM_CDR (x)))
|
|
|
|
|
|
{
|
|
|
|
|
|
proc = SCM_CAR (x);
|
* 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
|
|
|
|
if (scm_sym_else == SCM_CAR (proc))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
x = SCM_CDR (proc);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto begin;
|
|
|
|
|
|
}
|
|
|
|
|
|
proc = SCM_CAR (proc);
|
|
|
|
|
|
while (SCM_NIMP (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (CHECK_EQVISH (SCM_CAR (proc), t.arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = SCM_CDR (SCM_CAR (x));
|
1996-08-20 17:09:07 +00:00
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto begin;
|
|
|
|
|
|
}
|
|
|
|
|
|
proc = SCM_CDR (proc);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1996-08-20 17:09:07 +00:00
|
|
|
|
RETURN (SCM_UNSPECIFIED)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_COND):
|
|
|
|
|
|
while (SCM_NIMP (x = SCM_CDR (x)))
|
|
|
|
|
|
{
|
|
|
|
|
|
proc = SCM_CAR (x);
|
|
|
|
|
|
t.arg1 = EVALCAR (proc, env);
|
|
|
|
|
|
if (SCM_NFALSEP (t.arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = SCM_CDR (proc);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
if SCM_NULLP (x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1996-08-20 17:09:07 +00:00
|
|
|
|
RETURN (t.arg1)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
* 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
|
|
|
|
if (scm_sym_arrow != SCM_CAR (x))
|
1996-08-20 17:09:07 +00:00
|
|
|
|
{
|
|
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
|
|
|
|
|
goto begin;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
proc = SCM_CDR (x);
|
|
|
|
|
|
proc = EVALCAR (proc, env);
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (proc), badfun);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
PREP_APPLY (proc, scm_cons (t.arg1, SCM_EOL));
|
|
|
|
|
|
ENTER_APPLY;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto evap1;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1996-08-20 17:09:07 +00:00
|
|
|
|
RETURN (SCM_UNSPECIFIED)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_DO):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
proc = SCM_CAR (SCM_CDR (x)); /* inits */
|
|
|
|
|
|
t.arg1 = SCM_EOL; /* values */
|
|
|
|
|
|
while (SCM_NIMP (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
t.arg1 = scm_cons (EVALCAR (proc, env), t.arg1);
|
|
|
|
|
|
proc = SCM_CDR (proc);
|
|
|
|
|
|
}
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (x), t.arg1, env);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = SCM_CDR (SCM_CDR (x));
|
|
|
|
|
|
while (proc = SCM_CAR (x), SCM_FALSEP (EVALCAR (proc, env)))
|
|
|
|
|
|
{
|
1999-08-06 19:37:44 +00:00
|
|
|
|
for (proc = SCM_CADR (x); SCM_NIMP (proc); proc = SCM_CDR (proc))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
t.arg1 = SCM_CAR (proc); /* body */
|
|
|
|
|
|
SIDEVAL (t.arg1, env);
|
|
|
|
|
|
}
|
1999-08-06 19:37:44 +00:00
|
|
|
|
for (t.arg1 = SCM_EOL, proc = SCM_CDDR (x);
|
|
|
|
|
|
SCM_NIMP (proc);
|
|
|
|
|
|
proc = SCM_CDR (proc))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
t.arg1 = scm_cons (EVALCAR (proc, env), t.arg1); /* steps */
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (SCM_CAR (env)), t.arg1, SCM_CDR (env));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
x = SCM_CDR (proc);
|
|
|
|
|
|
if (SCM_NULLP (x))
|
1996-08-20 17:09:07 +00:00
|
|
|
|
RETURN (SCM_UNSPECIFIED);
|
|
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto begin;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_IF):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
if (SCM_NFALSEP (EVALCAR (x, env)))
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
else if (SCM_IMP (x = SCM_CDR (SCM_CDR (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;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_LET):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
proc = SCM_CAR (SCM_CDR (x));
|
|
|
|
|
|
t.arg1 = SCM_EOL;
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
t.arg1 = scm_cons (EVALCAR (proc, env), t.arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (SCM_NIMP (proc = SCM_CDR (proc)));
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (x), t.arg1, env);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = SCM_CDR (x);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
goto cdrxnoap;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_LETREC):
|
|
|
|
|
|
x = SCM_CDR (x);
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (x), scm_undefineds, env);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
proc = SCM_CAR (x);
|
|
|
|
|
|
t.arg1 = SCM_EOL;
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
t.arg1 = scm_cons (EVALCAR (proc, env), t.arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (SCM_NIMP (proc = SCM_CDR (proc)));
|
* 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 (SCM_CAR (env), t.arg1);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
goto cdrxnoap;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_LETSTAR):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
proc = SCM_CAR (x);
|
|
|
|
|
|
if (SCM_IMP (proc))
|
|
|
|
|
|
{
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_EOL, SCM_EOL, env);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
goto cdrxnoap;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
t.arg1 = SCM_CAR (proc);
|
|
|
|
|
|
proc = SCM_CDR (proc);
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (t.arg1, EVALCAR (proc, env), env);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
while (SCM_NIMP (proc = SCM_CDR (proc)));
|
1996-08-20 17:09:07 +00:00
|
|
|
|
goto cdrxnoap;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_OR):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
t.arg1 = x;
|
|
|
|
|
|
while (SCM_NNULLP (t.arg1 = SCM_CDR (t.arg1)))
|
|
|
|
|
|
{
|
|
|
|
|
|
x = EVALCAR (x, env);
|
|
|
|
|
|
if (SCM_NFALSEP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
RETURN (x);
|
|
|
|
|
|
}
|
|
|
|
|
|
x = t.arg1;
|
|
|
|
|
|
}
|
1996-08-20 17:09:07 +00:00
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto carloop;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_LAMBDA):
|
|
|
|
|
|
RETURN (scm_closure (SCM_CDR (x), env));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_QUOTE):
|
|
|
|
|
|
RETURN (SCM_CAR (SCM_CDR (x)));
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-03-11 11:45:06 +00:00
|
|
|
|
case (127 & SCM_IM_SET_X):
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
proc = SCM_CAR (x);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
switch (7 & (int) proc)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
case 0:
|
* 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
|
|
|
|
t.lloc = scm_lookupcar (x, env, 1);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
break;
|
|
|
|
|
|
case 1:
|
* 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
|
|
|
|
t.lloc = SCM_GLOC_VAL_LOC (proc);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
break;
|
|
|
|
|
|
#ifdef MEMOIZE_LOCALS
|
|
|
|
|
|
case 4:
|
|
|
|
|
|
t.lloc = scm_ilookup (proc, env);
|
|
|
|
|
|
break;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
*t.lloc = EVALCAR (x, env);
|
|
|
|
|
|
#ifdef SICP
|
|
|
|
|
|
RETURN (*t.lloc);
|
|
|
|
|
|
#else
|
|
|
|
|
|
RETURN (SCM_UNSPECIFIED);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case (127 & SCM_IM_DEFINE): /* only for internal defines */
|
* 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_misc_error (NULL, "Bad define placement", SCM_EOL);
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* new syntactic forms go here. */
|
|
|
|
|
|
case (127 & SCM_MAKISYM (0)):
|
|
|
|
|
|
proc = SCM_CAR (x);
|
|
|
|
|
|
SCM_ASRTGO (SCM_ISYMP (proc), badfun);
|
|
|
|
|
|
switch SCM_ISYMNUM (proc)
|
|
|
|
|
|
{
|
|
|
|
|
|
#if 0
|
|
|
|
|
|
case (SCM_ISYMNUM (IM_VREF)):
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM var;
|
|
|
|
|
|
var = SCM_CAR (SCM_CDR (x));
|
|
|
|
|
|
RETURN (SCM_CDR(var));
|
|
|
|
|
|
}
|
|
|
|
|
|
case (SCM_ISYMNUM (IM_VSET)):
|
|
|
|
|
|
SCM_CDR (SCM_CAR ( SCM_CDR (x))) = EVALCAR( SCM_CDR ( SCM_CDR (x)), env);
|
|
|
|
|
|
SCM_CAR (SCM_CAR ( SCM_CDR (x))) = scm_tc16_variable;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
RETURN (SCM_UNSPECIFIED)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_APPLY)):
|
|
|
|
|
|
proc = SCM_CDR (x);
|
|
|
|
|
|
proc = EVALCAR (proc, env);
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (proc), badfun);
|
|
|
|
|
|
if (SCM_CLOSUREP (proc))
|
|
|
|
|
|
{
|
1998-04-12 10:10:29 +00:00
|
|
|
|
SCM argl, tl;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
PREP_APPLY (proc, SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
t.arg1 = SCM_CDR (SCM_CDR (x));
|
|
|
|
|
|
t.arg1 = EVALCAR (t.arg1, env);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
debug.info->a.args = t.arg1;
|
|
|
|
|
|
#endif
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (scm_badargsp (SCM_CAR (SCM_CODE (proc)), t.arg1))
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
#endif
|
1999-01-22 06:40:39 +00:00
|
|
|
|
ENTER_APPLY;
|
1998-04-12 10:10:29 +00:00
|
|
|
|
/* Copy argument list */
|
|
|
|
|
|
if (SCM_IMP (t.arg1))
|
|
|
|
|
|
argl = t.arg1;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
argl = tl = scm_cons (SCM_CAR (t.arg1), SCM_UNSPECIFIED);
|
|
|
|
|
|
while (SCM_NIMP (t.arg1 = SCM_CDR (t.arg1))
|
|
|
|
|
|
&& SCM_CONSP (t.arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCDR (tl, scm_cons (SCM_CAR (t.arg1),
|
|
|
|
|
|
SCM_UNSPECIFIED));
|
|
|
|
|
|
tl = SCM_CDR (tl);
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_SETCDR (tl, t.arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
env = EXTEND_ENV (SCM_CAR (SCM_CODE (proc)), argl, SCM_ENV (proc));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = SCM_CODE (proc);
|
|
|
|
|
|
goto cdrxbegin;
|
|
|
|
|
|
}
|
1999-08-29 14:22:16 +00:00
|
|
|
|
proc = scm_f_apply;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto evapply;
|
|
|
|
|
|
|
|
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_CONT)):
|
|
|
|
|
|
scm_make_cont (&t.arg1);
|
1998-10-07 10:02:34 +00:00
|
|
|
|
if (setjmp (SCM_JMPBUF (t.arg1)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM val;
|
|
|
|
|
|
val = SCM_THROW_VALUE (t.arg1);
|
1999-10-11 17:39:24 +00:00
|
|
|
|
RETURN (val)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
proc = SCM_CDR (x);
|
|
|
|
|
|
proc = evalcar (proc, env);
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (proc), badfun);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
PREP_APPLY (proc, scm_cons (t.arg1, SCM_EOL));
|
|
|
|
|
|
ENTER_APPLY;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto evap1;
|
|
|
|
|
|
|
1999-10-11 17:39:24 +00:00
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_DELAY)):
|
|
|
|
|
|
RETURN (scm_makprom (scm_closure (SCM_CDR (x), env)))
|
|
|
|
|
|
|
1999-03-11 11:45:06 +00:00
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_DISPATCH)):
|
1999-08-29 03:26:05 +00:00
|
|
|
|
proc = SCM_CADR (x); /* unevaluated operands */
|
|
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
|
|
|
|
|
if (SCM_IMP (proc))
|
|
|
|
|
|
arg2 = *scm_ilookup (proc, env);
|
|
|
|
|
|
else if (SCM_NCONSP (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_NCELLP (proc))
|
|
|
|
|
|
arg2 = SCM_GLOC_VAL (proc);
|
|
|
|
|
|
else
|
|
|
|
|
|
arg2 = *scm_lookupcar (SCM_CDR (x), env, 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
arg2 = scm_cons (EVALCAR (proc, env), SCM_EOL);
|
|
|
|
|
|
t.lloc = SCM_CDRLOC (arg2);
|
|
|
|
|
|
while (SCM_NIMP (proc = SCM_CDR (proc)))
|
|
|
|
|
|
{
|
|
|
|
|
|
*t.lloc = scm_cons (EVALCAR (proc, env), SCM_EOL);
|
|
|
|
|
|
t.lloc = SCM_CDRLOC (*t.lloc);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
type_dispatch:
|
1999-08-30 02:18:00 +00:00
|
|
|
|
/* The type dispatch code is duplicated here
|
|
|
|
|
|
* (c.f. objects.c:scm_mcache_compute_cmethod) since that
|
|
|
|
|
|
* cuts down execution time for type dispatch to 50%.
|
|
|
|
|
|
*/
|
|
|
|
|
|
{
|
|
|
|
|
|
int i, n, end, mask;
|
|
|
|
|
|
SCM z = SCM_CDDR (x);
|
|
|
|
|
|
n = SCM_INUM (SCM_CAR (z)); /* maximum number of specializers */
|
|
|
|
|
|
proc = SCM_CADR (z);
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_NIMP (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Prepare for linear search */
|
|
|
|
|
|
mask = -1;
|
|
|
|
|
|
i = 0;
|
|
|
|
|
|
end = SCM_LENGTH (proc);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Compute a hash value */
|
|
|
|
|
|
int hashset = SCM_INUM (proc);
|
|
|
|
|
|
int j = n;
|
|
|
|
|
|
mask = SCM_INUM (SCM_CAR (z = SCM_CDDR (z)));
|
|
|
|
|
|
proc = SCM_CADR (z);
|
|
|
|
|
|
i = 0;
|
|
|
|
|
|
t.arg1 = arg2;
|
|
|
|
|
|
if (SCM_NIMP (t.arg1))
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
i += (SCM_STRUCT_DATA (scm_class_of (SCM_CAR (t.arg1)))
|
|
|
|
|
|
[scm_si_hashsets + hashset]);
|
|
|
|
|
|
t.arg1 = SCM_CDR (t.arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (--j && SCM_NIMP (t.arg1));
|
|
|
|
|
|
i &= mask;
|
|
|
|
|
|
end = i;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Search for match */
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
int j = n;
|
|
|
|
|
|
z = SCM_VELTS (proc)[i];
|
|
|
|
|
|
t.arg1 = arg2; /* list of arguments */
|
|
|
|
|
|
if (SCM_NIMP (t.arg1))
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
/* More arguments than specifiers => CLASS != ENV */
|
|
|
|
|
|
if (scm_class_of (SCM_CAR (t.arg1)) != SCM_CAR (z))
|
|
|
|
|
|
goto next_method;
|
|
|
|
|
|
t.arg1 = SCM_CDR (t.arg1);
|
|
|
|
|
|
z = SCM_CDR (z);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (--j && SCM_NIMP (t.arg1));
|
|
|
|
|
|
/* Fewer arguments than specifiers => CAR != ENV */
|
|
|
|
|
|
if (!(SCM_IMP (SCM_CAR (z)) || SCM_CONSP (SCM_CAR (z))))
|
|
|
|
|
|
goto next_method;
|
|
|
|
|
|
apply_cmethod:
|
|
|
|
|
|
env = EXTEND_ENV (SCM_CAR (SCM_CMETHOD_CODE (z)),
|
|
|
|
|
|
arg2,
|
|
|
|
|
|
SCM_CMETHOD_ENV (z));
|
|
|
|
|
|
x = SCM_CMETHOD_CODE (z);
|
|
|
|
|
|
goto cdrxbegin;
|
|
|
|
|
|
next_method:
|
|
|
|
|
|
i = (i + 1) & mask;
|
|
|
|
|
|
} while (i != end);
|
|
|
|
|
|
|
|
|
|
|
|
z = scm_memoize_method (x, arg2);
|
|
|
|
|
|
goto apply_cmethod;
|
|
|
|
|
|
}
|
1999-07-27 19:09:06 +00:00
|
|
|
|
|
1999-07-29 09:54:10 +00:00
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_SLOT_REF)):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
t.arg1 = EVALCAR (x, env);
|
|
|
|
|
|
RETURN (SCM_STRUCT_DATA (t.arg1)[SCM_INUM (SCM_CADR (x))]);
|
|
|
|
|
|
|
|
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_SLOT_SET_X)):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
t.arg1 = EVALCAR (x, env);
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
proc = SCM_CDR (x);
|
1999-08-23 21:25:49 +00:00
|
|
|
|
SCM_STRUCT_DATA (t.arg1)[SCM_INUM (SCM_CAR (x))]
|
|
|
|
|
|
= EVALCAR (proc, env);
|
|
|
|
|
|
RETURN (SCM_UNSPECIFIED);
|
1999-07-29 09:54:10 +00:00
|
|
|
|
|
1999-07-27 19:09:06 +00:00
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_NIL_COND)):
|
|
|
|
|
|
proc = SCM_CDR (x);
|
|
|
|
|
|
while (SCM_NIMP (x = SCM_CDR (proc)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!(SCM_FALSEP (t.arg1 = EVALCAR (proc, env))
|
|
|
|
|
|
|| t.arg1 == scm_nil))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_CAR (x) == SCM_UNSPECIFIED)
|
|
|
|
|
|
RETURN (t.arg1);
|
|
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
|
|
|
|
|
goto carloop;
|
|
|
|
|
|
}
|
|
|
|
|
|
proc = SCM_CDR (x);
|
|
|
|
|
|
}
|
|
|
|
|
|
x = proc;
|
|
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
|
|
|
|
|
goto carloop;
|
|
|
|
|
|
|
|
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_NIL_IFY)):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
RETURN ((SCM_FALSEP (proc = EVALCAR (x, env)) || SCM_NULLP (proc))
|
|
|
|
|
|
? scm_nil
|
|
|
|
|
|
: proc)
|
|
|
|
|
|
|
|
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_T_IFY)):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
RETURN (SCM_NFALSEP (EVALCAR (x, env)) ? scm_t : scm_nil)
|
|
|
|
|
|
|
|
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_0_COND)):
|
|
|
|
|
|
proc = SCM_CDR (x);
|
|
|
|
|
|
while (SCM_NIMP (x = SCM_CDR (proc)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!(SCM_FALSEP (t.arg1 = EVALCAR (proc, env))
|
|
|
|
|
|
|| t.arg1 == SCM_INUM0))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_CAR (x) == SCM_UNSPECIFIED)
|
|
|
|
|
|
RETURN (t.arg1);
|
|
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
|
|
|
|
|
goto carloop;
|
|
|
|
|
|
}
|
|
|
|
|
|
proc = SCM_CDR (x);
|
|
|
|
|
|
}
|
|
|
|
|
|
x = proc;
|
|
|
|
|
|
PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
|
|
|
|
|
|
goto carloop;
|
|
|
|
|
|
|
|
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_0_IFY)):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
RETURN (SCM_FALSEP (proc = EVALCAR (x, env))
|
|
|
|
|
|
? SCM_INUM0
|
|
|
|
|
|
: proc)
|
|
|
|
|
|
|
|
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_1_IFY)):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
RETURN (SCM_NFALSEP (EVALCAR (x, env))
|
|
|
|
|
|
? SCM_MAKINUM (1)
|
|
|
|
|
|
: SCM_INUM0)
|
|
|
|
|
|
|
|
|
|
|
|
case (SCM_ISYMNUM (SCM_IM_BIND)):
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
|
|
|
|
|
|
t.arg1 = SCM_CAR (x);
|
|
|
|
|
|
arg2 = SCM_CDAR (env);
|
|
|
|
|
|
while (SCM_NIMP (arg2))
|
|
|
|
|
|
{
|
|
|
|
|
|
proc = SCM_GLOC_VAL (SCM_CAR (t.arg1));
|
|
|
|
|
|
SCM_SETCDR (SCM_CAR (t.arg1) - 1L, SCM_CAR (arg2));
|
|
|
|
|
|
SCM_SETCAR (arg2, proc);
|
|
|
|
|
|
t.arg1 = SCM_CDR (t.arg1);
|
|
|
|
|
|
arg2 = SCM_CDR (arg2);
|
|
|
|
|
|
}
|
|
|
|
|
|
t.arg1 = SCM_CAR (x);
|
|
|
|
|
|
scm_dynwinds = scm_acons (t.arg1, SCM_CDAR (env), scm_dynwinds);
|
1999-03-11 11:45:06 +00:00
|
|
|
|
|
1999-07-27 19:09:06 +00:00
|
|
|
|
arg2 = x = SCM_CDR (x);
|
|
|
|
|
|
while (SCM_NNULLP (arg2 = SCM_CDR (arg2)))
|
|
|
|
|
|
{
|
|
|
|
|
|
SIDEVAL (SCM_CAR (x), env);
|
|
|
|
|
|
x = arg2;
|
|
|
|
|
|
}
|
|
|
|
|
|
proc = EVALCAR (x, env);
|
|
|
|
|
|
|
|
|
|
|
|
scm_dynwinds = SCM_CDR (scm_dynwinds);
|
|
|
|
|
|
arg2 = SCM_CDAR (env);
|
|
|
|
|
|
while (SCM_NIMP (arg2))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCDR (SCM_CAR (t.arg1) - 1L, SCM_CAR (arg2));
|
|
|
|
|
|
t.arg1 = SCM_CDR (t.arg1);
|
|
|
|
|
|
arg2 = SCM_CDR (arg2);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
RETURN (proc)
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
default:
|
|
|
|
|
|
goto badfun;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
proc = x;
|
|
|
|
|
|
badfun:
|
* 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_everr (x, env,...) */
|
1996-10-27 02:38:39 +00:00
|
|
|
|
scm_misc_error (NULL,
|
|
|
|
|
|
"Wrong type to apply: %S",
|
|
|
|
|
|
scm_listify (proc, SCM_UNDEFINED));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case scm_tc7_vector:
|
|
|
|
|
|
case scm_tc7_wvect:
|
* 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
|
|
|
|
#ifdef 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:
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
#ifdef HAVE_LONG_LONGS
|
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
|
|
|
|
|
|
case scm_tc7_string:
|
|
|
|
|
|
case scm_tc7_substring:
|
|
|
|
|
|
case scm_tc7_smob:
|
|
|
|
|
|
case scm_tcs_closures:
|
1998-11-17 08:03:18 +00:00
|
|
|
|
#ifdef CCLO
|
|
|
|
|
|
case scm_tc7_cclo:
|
|
|
|
|
|
#endif
|
1999-03-11 11:45:06 +00:00
|
|
|
|
case scm_tc7_pws:
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case scm_tcs_subrs:
|
|
|
|
|
|
RETURN (x);
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef MEMOIZE_LOCALS
|
|
|
|
|
|
case (127 & SCM_ILOC00):
|
|
|
|
|
|
proc = *scm_ilookup (SCM_CAR (x), env);
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (proc), badfun);
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
|
|
|
|
|
#ifdef SCM_CAUTIOUS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto checkargs;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
#endif /* ifdef MEMOIZE_LOCALS */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case scm_tcs_cons_gloc:
|
|
|
|
|
|
proc = SCM_GLOC_VAL (SCM_CAR (x));
|
1998-11-20 17:14:07 +00:00
|
|
|
|
if (proc == 0)
|
|
|
|
|
|
/* This is a struct implanted in the code, not a gloc. */
|
|
|
|
|
|
RETURN (x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_ASRTGO (SCM_NIMP (proc), badfun);
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
|
|
|
|
|
#ifdef SCM_CAUTIOUS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto checkargs;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case scm_tcs_cons_nimcar:
|
|
|
|
|
|
if (SCM_SYMBOLP (SCM_CAR (x)))
|
|
|
|
|
|
{
|
1997-06-08 15:46:19 +00:00
|
|
|
|
#ifdef USE_THREADS
|
* 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
|
|
|
|
t.lloc = scm_lookupcar1 (x, env, 1);
|
1997-06-08 15:46:19 +00:00
|
|
|
|
if (t.lloc == NULL)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* we have lost the race, start again. */
|
|
|
|
|
|
goto dispatch;
|
|
|
|
|
|
}
|
|
|
|
|
|
proc = *t.lloc;
|
|
|
|
|
|
#else
|
* 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
|
|
|
|
proc = *scm_lookupcar (x, env, 1);
|
1997-06-08 15:46:19 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_IMP (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
unmemocar (x, env);
|
|
|
|
|
|
goto badfun;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (scm_tc16_macro == SCM_TYP16 (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
unmemocar (x, env);
|
|
|
|
|
|
|
|
|
|
|
|
handle_a_macro:
|
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
|
1997-06-08 15:46:19 +00:00
|
|
|
|
t.arg1 = SCM_APPLY (SCM_CDR (proc), x,
|
|
|
|
|
|
scm_cons (env, scm_listofnull));
|
|
|
|
|
|
|
1998-11-10 06:10:11 +00:00
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
SCM_CLEAR_MACROEXP (debug);
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
switch ((int) (SCM_CAR (proc) >> 16))
|
|
|
|
|
|
{
|
|
|
|
|
|
case 2:
|
|
|
|
|
|
if (scm_ilength (t.arg1) <= 0)
|
|
|
|
|
|
t.arg1 = scm_cons2 (SCM_IM_BEGIN, t.arg1, SCM_EOL);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
if (!SCM_CLOSUREP (SCM_CDR (proc)))
|
|
|
|
|
|
{
|
1997-06-08 15:46:19 +00:00
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#if 0 /* Top-level defines doesn't very often occur in backtraces */
|
|
|
|
|
|
if (scm_m_define == SCM_SUBRF (SCM_CDR (proc)) && SCM_TOP_LEVEL (env))
|
|
|
|
|
|
/* Prevent memoizing result of define macro */
|
|
|
|
|
|
{
|
|
|
|
|
|
debug.info->e.exp = scm_cons (SCM_CAR (x), SCM_CDR (x));
|
|
|
|
|
|
scm_set_source_properties_x (debug.info->e.exp,
|
|
|
|
|
|
scm_source_properties (x));
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
SCM_DEFER_INTS;
|
* 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 (x, SCM_CAR (t.arg1));
|
|
|
|
|
|
SCM_SETCDR (x, SCM_CDR (t.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;
|
* 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 (x, SCM_CAR (t.arg1));
|
|
|
|
|
|
SCM_SETCDR (x, SCM_CDR (t.arg1));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_ALLOW_INTS;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
goto loopnoap;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case 1:
|
|
|
|
|
|
if (SCM_NIMP (x = t.arg1))
|
1996-08-20 17:09:07 +00:00
|
|
|
|
goto loopnoap;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case 0:
|
|
|
|
|
|
RETURN (t.arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
proc = SCM_CEVAL (SCM_CAR (x), env);
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (proc), badfun);
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
|
|
|
|
|
#ifdef SCM_CAUTIOUS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
checkargs:
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (SCM_CLOSUREP (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
arg2 = SCM_CAR (SCM_CODE (proc));
|
|
|
|
|
|
t.arg1 = SCM_CDR (x);
|
|
|
|
|
|
while (SCM_NIMP (arg2))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_NCONSP (arg2))
|
|
|
|
|
|
goto evapply;
|
|
|
|
|
|
if (SCM_IMP (t.arg1))
|
|
|
|
|
|
goto umwrongnumargs;
|
|
|
|
|
|
arg2 = SCM_CDR (arg2);
|
|
|
|
|
|
t.arg1 = SCM_CDR (t.arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_NNULLP (t.arg1))
|
|
|
|
|
|
goto umwrongnumargs;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (scm_tc16_macro == SCM_TYP16 (proc))
|
|
|
|
|
|
goto handle_a_macro;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
evapply:
|
|
|
|
|
|
PREP_APPLY (proc, SCM_EOL);
|
|
|
|
|
|
if (SCM_NULLP (SCM_CDR (x))) {
|
|
|
|
|
|
ENTER_APPLY;
|
1999-03-11 11:45:06 +00:00
|
|
|
|
evap0:
|
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));
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef CCLO
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case scm_tc7_cclo:
|
|
|
|
|
|
t.arg1 = proc;
|
|
|
|
|
|
proc = SCM_CCLO_SUBR (proc);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
debug.info->a.proc = proc;
|
|
|
|
|
|
debug.info->a.args = scm_cons (t.arg1, SCM_EOL);
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto evap1;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#endif
|
1999-03-11 11:45:06 +00:00
|
|
|
|
case scm_tc7_pws:
|
|
|
|
|
|
proc = SCM_PROCEDURE (proc);
|
|
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
debug.info->a.proc = proc;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
goto evap0;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case scm_tcs_closures:
|
|
|
|
|
|
x = SCM_CODE (proc);
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (x), SCM_EOL, SCM_ENV (proc));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto cdrxbegin;
|
1997-10-12 12:54:54 +00:00
|
|
|
|
case scm_tcs_cons_gloc:
|
1999-08-29 03:26:05 +00:00
|
|
|
|
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
|
|
|
|
|
|
{
|
|
|
|
|
|
x = SCM_ENTITY_PROCEDURE (proc);
|
|
|
|
|
|
arg2 = SCM_EOL;
|
|
|
|
|
|
goto type_dispatch;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (!SCM_I_OPERATORP (proc))
|
1998-11-21 17:00:44 +00:00
|
|
|
|
goto badfun;
|
|
|
|
|
|
else
|
1997-10-12 12:54:54 +00:00
|
|
|
|
{
|
1999-08-29 03:26:05 +00:00
|
|
|
|
t.arg1 = proc;
|
|
|
|
|
|
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;
|
|
|
|
|
|
debug.info->a.args = scm_cons (t.arg1, SCM_EOL);
|
1997-10-12 12:54:54 +00:00
|
|
|
|
#endif
|
1999-08-29 03:26:05 +00:00
|
|
|
|
if (SCM_NIMP (proc))
|
|
|
|
|
|
goto evap1;
|
|
|
|
|
|
else
|
|
|
|
|
|
goto badfun;
|
1997-10-12 12:54:54 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case scm_tc7_contin:
|
|
|
|
|
|
case scm_tc7_subr_1:
|
|
|
|
|
|
case scm_tc7_subr_2:
|
|
|
|
|
|
case scm_tc7_subr_2o:
|
|
|
|
|
|
case scm_tc7_cxr:
|
|
|
|
|
|
case scm_tc7_subr_3:
|
|
|
|
|
|
case scm_tc7_lsubr_2:
|
|
|
|
|
|
umwrongnumargs:
|
|
|
|
|
|
unmemocar (x, env);
|
|
|
|
|
|
wrongnumargs:
|
* 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_everr (x, env,...) */
|
|
|
|
|
|
scm_wrong_num_args (proc);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
default:
|
|
|
|
|
|
/* handle macros here */
|
|
|
|
|
|
goto badfun;
|
|
|
|
|
|
}
|
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);
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifdef SCM_CAUTIOUS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_IMP (x))
|
|
|
|
|
|
goto wrongnumargs;
|
1998-05-02 16:26:21 +00:00
|
|
|
|
else if (SCM_CONSP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_IMP (SCM_CAR (x)))
|
* 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
|
|
|
|
t.arg1 = SCM_EVALIM (SCM_CAR (x), env);
|
1998-05-02 16:26:21 +00:00
|
|
|
|
else
|
|
|
|
|
|
t.arg1 = EVALCELLCAR (x, env);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_TYP3 (x) == 1)
|
|
|
|
|
|
{
|
|
|
|
|
|
if ((t.arg1 = SCM_GLOC_VAL (SCM_CAR (x))) == 0)
|
|
|
|
|
|
t.arg1 = SCM_CAR (x); /* struct planted in code */
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
#else
|
1996-07-25 22:56:11 +00:00
|
|
|
|
t.arg1 = EVALCAR (x, env);
|
1998-05-02 16:26:21 +00:00
|
|
|
|
#endif
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
debug.info->a.args = scm_cons (t.arg1, SCM_EOL);
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
if (SCM_NULLP (x))
|
|
|
|
|
|
{
|
1996-08-20 17:09:07 +00:00
|
|
|
|
ENTER_APPLY;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
evap1:
|
|
|
|
|
|
switch (SCM_TYP7 (proc))
|
1996-08-20 17:09:07 +00:00
|
|
|
|
{ /* have one argument in t.arg1 */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case scm_tc7_subr_2o:
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (t.arg1, SCM_UNDEFINED));
|
|
|
|
|
|
case scm_tc7_subr_1:
|
|
|
|
|
|
case scm_tc7_subr_1o:
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (t.arg1));
|
|
|
|
|
|
case scm_tc7_cxr:
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
if (SCM_SUBRF (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_INUMP (t.arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
RETURN (scm_makdbl (SCM_DSUBRF (proc) ((double) SCM_INUM (t.arg1)),
|
|
|
|
|
|
0.0));
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (t.arg1), floerr);
|
|
|
|
|
|
if (SCM_REALP (t.arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
RETURN (scm_makdbl (SCM_DSUBRF (proc) (SCM_REALPART (t.arg1)), 0.0));
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifdef SCM_BIGDIG
|
|
|
|
|
|
if (SCM_BIGP (t.arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
RETURN (scm_makdbl (SCM_DSUBRF (proc) (scm_big2dbl (t.arg1)), 0.0));
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
floerr:
|
* 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_WTA_DISPATCH_1 (*SCM_SUBR_GENERIC (proc), t.arg1,
|
|
|
|
|
|
SCM_ARG1, SCM_CHARS (SCM_SNAME (proc)));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
proc = (SCM) SCM_SNAME (proc);
|
|
|
|
|
|
{
|
|
|
|
|
|
char *chrs = SCM_CHARS (proc) + SCM_LENGTH (proc) - 1;
|
|
|
|
|
|
while ('c' != *--chrs)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_ASSERT (SCM_NIMP (t.arg1) && SCM_CONSP (t.arg1),
|
|
|
|
|
|
t.arg1, SCM_ARG1, SCM_CHARS (proc));
|
|
|
|
|
|
t.arg1 = ('a' == *chrs) ? SCM_CAR (t.arg1) : SCM_CDR (t.arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
RETURN (t.arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
case scm_tc7_rpsubr:
|
|
|
|
|
|
RETURN (SCM_BOOL_T);
|
|
|
|
|
|
case scm_tc7_asubr:
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (t.arg1, SCM_UNDEFINED));
|
|
|
|
|
|
case scm_tc7_lsubr:
|
|
|
|
|
|
#ifdef DEVAL
|
1996-08-20 17:09:07 +00:00
|
|
|
|
RETURN (SCM_SUBRF (proc) (debug.info->a.args))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (scm_cons (t.arg1, SCM_EOL)));
|
|
|
|
|
|
#endif
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef CCLO
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case scm_tc7_cclo:
|
|
|
|
|
|
arg2 = t.arg1;
|
|
|
|
|
|
t.arg1 = proc;
|
|
|
|
|
|
proc = SCM_CCLO_SUBR (proc);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
debug.info->a.args = scm_cons (t.arg1, debug.info->a.args);
|
|
|
|
|
|
debug.info->a.proc = proc;
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
goto evap2;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#endif
|
1999-03-11 11:45:06 +00:00
|
|
|
|
case scm_tc7_pws:
|
|
|
|
|
|
proc = SCM_PROCEDURE (proc);
|
|
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
debug.info->a.proc = proc;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
goto evap1;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case scm_tcs_closures:
|
1999-08-29 03:26:05 +00:00
|
|
|
|
/* clos1: */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = SCM_CODE (proc);
|
|
|
|
|
|
#ifdef DEVAL
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (x), debug.info->a.args, SCM_ENV (proc));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (x), scm_cons (t.arg1, SCM_EOL), SCM_ENV (proc));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
goto cdrxbegin;
|
1998-05-04 11:31:45 +00:00
|
|
|
|
case scm_tc7_contin:
|
|
|
|
|
|
scm_call_continuation (proc, t.arg1);
|
1997-09-22 00:43:52 +00:00
|
|
|
|
case scm_tcs_cons_gloc:
|
1999-08-06 19:37:44 +00:00
|
|
|
|
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
|
|
|
|
|
|
{
|
1999-08-29 03:26:05 +00:00
|
|
|
|
x = SCM_ENTITY_PROCEDURE (proc);
|
1999-08-06 19:37:44 +00:00
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
arg2 = debug.info->a.args;
|
|
|
|
|
|
#else
|
|
|
|
|
|
arg2 = scm_cons (t.arg1, SCM_EOL);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
goto type_dispatch;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (!SCM_I_OPERATORP (proc))
|
1998-11-21 17:00:44 +00:00
|
|
|
|
goto badfun;
|
|
|
|
|
|
else
|
1997-09-22 00:43:52 +00:00
|
|
|
|
{
|
1999-08-29 03:26:05 +00:00
|
|
|
|
arg2 = t.arg1;
|
|
|
|
|
|
t.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
|
1999-08-29 03:26:05 +00:00
|
|
|
|
debug.info->a.args = scm_cons (t.arg1, debug.info->a.args);
|
|
|
|
|
|
debug.info->a.proc = proc;
|
1997-09-22 00:43:52 +00:00
|
|
|
|
#endif
|
1999-08-29 03:26:05 +00:00
|
|
|
|
if (SCM_NIMP (proc))
|
|
|
|
|
|
goto evap2;
|
|
|
|
|
|
else
|
|
|
|
|
|
goto badfun;
|
1997-09-22 00:43:52 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case scm_tc7_subr_2:
|
|
|
|
|
|
case scm_tc7_subr_0:
|
|
|
|
|
|
case scm_tc7_subr_3:
|
|
|
|
|
|
case scm_tc7_lsubr_2:
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
default:
|
|
|
|
|
|
goto badfun;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifdef SCM_CAUTIOUS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_IMP (x))
|
|
|
|
|
|
goto wrongnumargs;
|
1998-05-02 16:26:21 +00:00
|
|
|
|
else if (SCM_CONSP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_IMP (SCM_CAR (x)))
|
* 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
|
|
|
|
arg2 = SCM_EVALIM (SCM_CAR (x), env);
|
1998-05-02 16:26:21 +00:00
|
|
|
|
else
|
|
|
|
|
|
arg2 = EVALCELLCAR (x, env);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_TYP3 (x) == 1)
|
|
|
|
|
|
{
|
|
|
|
|
|
if ((arg2 = SCM_GLOC_VAL (SCM_CAR (x))) == 0)
|
|
|
|
|
|
arg2 = SCM_CAR (x); /* struct planted in code */
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
#else
|
|
|
|
|
|
arg2 = EVALCAR (x, env);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
{ /* have two or more arguments */
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
debug.info->a.args = scm_cons2 (t.arg1, arg2, SCM_EOL);
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
if (SCM_NULLP (x)) {
|
1996-08-20 17:09:07 +00:00
|
|
|
|
ENTER_APPLY;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef CCLO
|
|
|
|
|
|
evap2:
|
|
|
|
|
|
#endif
|
1996-08-20 17:09:07 +00:00
|
|
|
|
switch (SCM_TYP7 (proc))
|
|
|
|
|
|
{ /* have two arguments */
|
|
|
|
|
|
case scm_tc7_subr_2:
|
|
|
|
|
|
case scm_tc7_subr_2o:
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (t.arg1, arg2));
|
|
|
|
|
|
case scm_tc7_lsubr:
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef DEVAL
|
1996-08-20 17:09:07 +00:00
|
|
|
|
RETURN (SCM_SUBRF (proc) (debug.info->a.args))
|
|
|
|
|
|
#else
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (scm_cons2 (t.arg1, arg2, SCM_EOL)));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_lsubr_2:
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (t.arg1, arg2, SCM_EOL));
|
|
|
|
|
|
case scm_tc7_rpsubr:
|
|
|
|
|
|
case scm_tc7_asubr:
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (t.arg1, arg2));
|
|
|
|
|
|
#ifdef CCLO
|
|
|
|
|
|
cclon:
|
|
|
|
|
|
case scm_tc7_cclo:
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef DEVAL
|
1999-08-29 03:26:05 +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
|
1999-08-29 03:26:05 +00:00
|
|
|
|
RETURN (SCM_APPLY (SCM_CCLO_SUBR (proc),
|
|
|
|
|
|
scm_cons2 (proc, t.arg1,
|
|
|
|
|
|
scm_cons (arg2,
|
|
|
|
|
|
scm_eval_args (x,
|
|
|
|
|
|
env,
|
|
|
|
|
|
proc))),
|
|
|
|
|
|
SCM_EOL));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1996-08-20 17:09:07 +00:00
|
|
|
|
/* case scm_tc7_cclo:
|
|
|
|
|
|
x = scm_cons(arg2, scm_eval_args(x, env));
|
|
|
|
|
|
arg2 = t.arg1;
|
|
|
|
|
|
t.arg1 = proc;
|
|
|
|
|
|
proc = SCM_CCLO_SUBR(proc);
|
|
|
|
|
|
goto evap3; */
|
|
|
|
|
|
#endif
|
1999-03-11 11:45:06 +00:00
|
|
|
|
case scm_tc7_pws:
|
|
|
|
|
|
proc = SCM_PROCEDURE (proc);
|
|
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
debug.info->a.proc = proc;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
goto evap2;
|
1997-09-22 00:43:52 +00:00
|
|
|
|
case scm_tcs_cons_gloc:
|
1999-08-06 19:37:44 +00:00
|
|
|
|
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
|
|
|
|
|
|
{
|
1999-08-29 03:26:05 +00:00
|
|
|
|
x = SCM_ENTITY_PROCEDURE (proc);
|
1999-08-06 19:37:44 +00:00
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
arg2 = debug.info->a.args;
|
|
|
|
|
|
#else
|
|
|
|
|
|
arg2 = scm_cons2 (t.arg1, arg2, SCM_EOL);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
goto type_dispatch;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (!SCM_I_OPERATORP (proc))
|
1998-11-21 17:00:44 +00:00
|
|
|
|
goto badfun;
|
|
|
|
|
|
else
|
1997-09-22 00:43:52 +00:00
|
|
|
|
{
|
1999-08-29 03:26:05 +00:00
|
|
|
|
operatorn:
|
1997-09-22 00:43:52 +00:00
|
|
|
|
#ifdef DEVAL
|
1999-08-29 03:26:05 +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));
|
|
|
|
|
|
#else
|
|
|
|
|
|
RETURN (SCM_APPLY (SCM_I_ENTITYP (proc)
|
|
|
|
|
|
? SCM_ENTITY_PROCEDURE (proc)
|
|
|
|
|
|
: SCM_OPERATOR_PROCEDURE (proc),
|
|
|
|
|
|
scm_cons2 (proc, t.arg1,
|
|
|
|
|
|
scm_cons (arg2,
|
|
|
|
|
|
scm_eval_args (x,
|
|
|
|
|
|
env,
|
|
|
|
|
|
proc))),
|
|
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
#endif
|
1997-09-22 00:43:52 +00:00
|
|
|
|
}
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_subr_0:
|
|
|
|
|
|
case scm_tc7_cxr:
|
|
|
|
|
|
case scm_tc7_subr_1o:
|
|
|
|
|
|
case scm_tc7_subr_1:
|
|
|
|
|
|
case scm_tc7_subr_3:
|
|
|
|
|
|
case scm_tc7_contin:
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
default:
|
|
|
|
|
|
goto badfun;
|
|
|
|
|
|
case scm_tcs_closures:
|
1999-08-29 03:26:05 +00:00
|
|
|
|
/* clos2: */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef DEVAL
|
1997-10-12 12:54:54 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (SCM_CODE (proc)),
|
|
|
|
|
|
debug.info->a.args,
|
|
|
|
|
|
SCM_ENV (proc));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#else
|
1997-10-12 12:54:54 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (SCM_CODE (proc)),
|
|
|
|
|
|
scm_cons2 (t.arg1, arg2, SCM_EOL), SCM_ENV (proc));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1996-08-20 17:09:07 +00:00
|
|
|
|
x = SCM_CODE (proc);
|
|
|
|
|
|
goto cdrxbegin;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifdef SCM_CAUTIOUS
|
1998-05-02 16:26:21 +00:00
|
|
|
|
if (SCM_IMP (x) || SCM_NECONSP (x))
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef DEVAL
|
1996-08-20 17:09:07 +00:00
|
|
|
|
debug.info->a.args = scm_cons2 (t.arg1, arg2,
|
1998-05-02 16:26:21 +00:00
|
|
|
|
scm_deval_args (x, env, proc,
|
|
|
|
|
|
SCM_CDRLOC (SCM_CDR (debug.info->a.args))));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1996-08-20 17:09:07 +00:00
|
|
|
|
ENTER_APPLY;
|
1999-03-11 11:45:06 +00:00
|
|
|
|
evap3:
|
1996-08-20 17:09:07 +00:00
|
|
|
|
switch (SCM_TYP7 (proc))
|
|
|
|
|
|
{ /* have 3 or more arguments */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef DEVAL
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_subr_3:
|
|
|
|
|
|
SCM_ASRTGO (SCM_NULLP (SCM_CDR (x)), wrongnumargs);
|
1997-10-12 12:54:54 +00:00
|
|
|
|
RETURN (SCM_SUBRF (proc) (t.arg1, arg2,
|
|
|
|
|
|
SCM_CADDR (debug.info->a.args)));
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_asubr:
|
1997-03-07 21:43:03 +00:00
|
|
|
|
#ifdef BUILTIN_RPASUBR
|
|
|
|
|
|
t.arg1 = SCM_SUBRF(proc)(t.arg1, arg2);
|
|
|
|
|
|
arg2 = SCM_CDR (SCM_CDR (debug.info->a.args));
|
1997-10-12 12:54:54 +00:00
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
t.arg1 = SCM_SUBRF(proc)(t.arg1, SCM_CAR (arg2));
|
|
|
|
|
|
arg2 = SCM_CDR (arg2);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (SCM_NIMP (arg2));
|
1997-03-07 21:43:03 +00:00
|
|
|
|
RETURN (t.arg1)
|
|
|
|
|
|
#endif /* BUILTIN_RPASUBR */
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_rpsubr:
|
1997-03-08 03:03:16 +00:00
|
|
|
|
#ifdef BUILTIN_RPASUBR
|
|
|
|
|
|
if (SCM_FALSEP (SCM_SUBRF (proc) (t.arg1, arg2)))
|
|
|
|
|
|
RETURN (SCM_BOOL_F)
|
|
|
|
|
|
t.arg1 = SCM_CDR (SCM_CDR (debug.info->a.args));
|
1997-10-12 12:54:54 +00:00
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_FALSEP (SCM_SUBRF (proc) (arg2, SCM_CAR (t.arg1))))
|
|
|
|
|
|
RETURN (SCM_BOOL_F)
|
|
|
|
|
|
arg2 = SCM_CAR (t.arg1);
|
|
|
|
|
|
t.arg1 = SCM_CDR (t.arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (SCM_NIMP (t.arg1));
|
1997-03-08 03:03:16 +00:00
|
|
|
|
RETURN (SCM_BOOL_T)
|
|
|
|
|
|
#else /* BUILTIN_RPASUBR */
|
1997-10-12 12:54:54 +00:00
|
|
|
|
RETURN (SCM_APPLY (proc, t.arg1,
|
|
|
|
|
|
scm_acons (arg2,
|
|
|
|
|
|
SCM_CDR (SCM_CDR (debug.info->a.args)),
|
|
|
|
|
|
SCM_EOL)))
|
1997-03-08 03:03:16 +00:00
|
|
|
|
#endif /* BUILTIN_RPASUBR */
|
1997-03-07 21:43:03 +00:00
|
|
|
|
case scm_tc7_lsubr_2:
|
1997-10-12 12:54:54 +00:00
|
|
|
|
RETURN (SCM_SUBRF (proc) (t.arg1, arg2,
|
|
|
|
|
|
SCM_CDR (SCM_CDR (debug.info->a.args))))
|
1997-03-07 21:43:03 +00:00
|
|
|
|
case scm_tc7_lsubr:
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (debug.info->a.args))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef CCLO
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_cclo:
|
|
|
|
|
|
goto cclon;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-03-11 11:45:06 +00:00
|
|
|
|
case scm_tc7_pws:
|
|
|
|
|
|
proc = SCM_PROCEDURE (proc);
|
|
|
|
|
|
debug.info->a.proc = proc;
|
|
|
|
|
|
goto evap3;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tcs_closures:
|
1996-08-23 01:20:34 +00:00
|
|
|
|
SCM_SET_ARGSREADY (debug);
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (SCM_CODE (proc)),
|
1996-08-20 17:09:07 +00:00
|
|
|
|
debug.info->a.args,
|
|
|
|
|
|
SCM_ENV (proc));
|
|
|
|
|
|
x = SCM_CODE (proc);
|
|
|
|
|
|
goto cdrxbegin;
|
|
|
|
|
|
#else /* DEVAL */
|
|
|
|
|
|
case scm_tc7_subr_3:
|
|
|
|
|
|
SCM_ASRTGO (SCM_NULLP (SCM_CDR (x)), wrongnumargs);
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (t.arg1, arg2, EVALCAR (x, env)));
|
|
|
|
|
|
case scm_tc7_asubr:
|
1997-03-07 21:43:03 +00:00
|
|
|
|
#ifdef BUILTIN_RPASUBR
|
1997-10-12 12:54:54 +00:00
|
|
|
|
t.arg1 = SCM_SUBRF (proc) (t.arg1, arg2);
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
t.arg1 = SCM_SUBRF(proc)(t.arg1, EVALCAR(x, env));
|
|
|
|
|
|
x = SCM_CDR(x);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (SCM_NIMP (x));
|
1997-03-07 21:43:03 +00:00
|
|
|
|
RETURN (t.arg1)
|
|
|
|
|
|
#endif /* BUILTIN_RPASUBR */
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_rpsubr:
|
1997-03-08 03:03:16 +00:00
|
|
|
|
#ifdef BUILTIN_RPASUBR
|
|
|
|
|
|
if (SCM_FALSEP (SCM_SUBRF (proc) (t.arg1, arg2)))
|
|
|
|
|
|
RETURN (SCM_BOOL_F)
|
1997-10-12 12:54:54 +00:00
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
t.arg1 = EVALCAR (x, env);
|
|
|
|
|
|
if (SCM_FALSEP (SCM_SUBRF (proc) (arg2, t.arg1)))
|
|
|
|
|
|
RETURN (SCM_BOOL_F)
|
|
|
|
|
|
arg2 = t.arg1;
|
|
|
|
|
|
x = SCM_CDR (x);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (SCM_NIMP (x));
|
1997-03-08 03:03:16 +00:00
|
|
|
|
RETURN (SCM_BOOL_T)
|
|
|
|
|
|
#else /* BUILTIN_RPASUBR */
|
1997-10-12 12:54:54 +00:00
|
|
|
|
RETURN (SCM_APPLY (proc, t.arg1,
|
1998-05-02 16:26:21 +00:00
|
|
|
|
scm_acons (arg2,
|
|
|
|
|
|
scm_eval_args (x, env, proc),
|
|
|
|
|
|
SCM_EOL)));
|
1997-03-08 03:03:16 +00:00
|
|
|
|
#endif /* BUILTIN_RPASUBR */
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_lsubr_2:
|
1998-05-02 16:26:21 +00:00
|
|
|
|
RETURN (SCM_SUBRF (proc) (t.arg1, arg2, scm_eval_args (x, env, proc)));
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_lsubr:
|
1998-05-02 16:26:21 +00:00
|
|
|
|
RETURN (SCM_SUBRF (proc) (scm_cons2 (t.arg1,
|
|
|
|
|
|
arg2,
|
|
|
|
|
|
scm_eval_args (x, env, proc))));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef CCLO
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_cclo:
|
|
|
|
|
|
goto cclon;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
1999-03-11 11:45:06 +00:00
|
|
|
|
case scm_tc7_pws:
|
|
|
|
|
|
proc = SCM_PROCEDURE (proc);
|
|
|
|
|
|
goto evap3;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tcs_closures:
|
|
|
|
|
|
#ifdef DEVAL
|
1996-08-23 01:20:34 +00:00
|
|
|
|
SCM_SET_ARGSREADY (debug);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#endif
|
* __scm.h, chars.c, debug.c, eval.c, eval.h, extchrs.c, extchrs.h,
fdsocket.c, feature.c, mbstrings.c, mbstrings.h, numbers.c,
numbers.h, print.c, scmhob.h, simpos.h, symbols.c, symbols.h,
tags.h, throw.c, variable.h: Name cleanup. Lots of xxxSCM_yyy
removed. (These were introduced by unsupervised name
substitution.)
1996-09-13 11:07:24 +00:00
|
|
|
|
env = EXTEND_ENV (SCM_CAR (SCM_CODE (proc)),
|
1998-05-02 16:26:21 +00:00
|
|
|
|
scm_cons2 (t.arg1,
|
|
|
|
|
|
arg2,
|
|
|
|
|
|
scm_eval_args (x, env, proc)),
|
1996-08-20 17:09:07 +00:00
|
|
|
|
SCM_ENV (proc));
|
|
|
|
|
|
x = SCM_CODE (proc);
|
|
|
|
|
|
goto cdrxbegin;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif /* DEVAL */
|
1997-09-22 00:43:52 +00:00
|
|
|
|
case scm_tcs_cons_gloc:
|
1999-08-06 19:37:44 +00:00
|
|
|
|
if (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC)
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef DEVAL
|
|
|
|
|
|
arg2 = debug.info->a.args;
|
|
|
|
|
|
#else
|
|
|
|
|
|
arg2 = scm_cons2 (t.arg1, arg2, scm_eval_args (x, env, proc));
|
|
|
|
|
|
#endif
|
1999-08-29 03:26:05 +00:00
|
|
|
|
x = SCM_ENTITY_PROCEDURE (proc);
|
1999-08-06 19:37:44 +00:00
|
|
|
|
goto type_dispatch;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (!SCM_I_OPERATORP (proc))
|
1998-11-21 17:00:44 +00:00
|
|
|
|
goto badfun;
|
|
|
|
|
|
else
|
1999-08-29 03:26:05 +00:00
|
|
|
|
goto operatorn;
|
1996-08-20 17:09:07 +00:00
|
|
|
|
case scm_tc7_subr_2:
|
|
|
|
|
|
case scm_tc7_subr_1o:
|
|
|
|
|
|
case scm_tc7_subr_2o:
|
|
|
|
|
|
case scm_tc7_subr_0:
|
|
|
|
|
|
case scm_tc7_cxr:
|
|
|
|
|
|
case scm_tc7_subr_1:
|
|
|
|
|
|
case scm_tc7_contin:
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
default:
|
|
|
|
|
|
goto badfun;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#ifdef DEVAL
|
1996-08-20 17:09:07 +00:00
|
|
|
|
exit:
|
1998-08-21 08:13:55 +00:00
|
|
|
|
if (CHECK_EXIT && 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
|
|
|
|
t.arg1 = scm_make_debugobj (&debug);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_make_cont (&t.arg1);
|
1998-10-07 10:02:34 +00:00
|
|
|
|
if (setjmp (SCM_JMPBUF (t.arg1)))
|
1996-08-20 17:09:07 +00:00
|
|
|
|
{
|
|
|
|
|
|
proc = SCM_THROW_VALUE (t.arg1);
|
|
|
|
|
|
goto ret;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
* 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_ithrow (scm_sym_exit_frame, scm_cons2 (t.arg1, proc, SCM_EOL), 0);
|
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
|
|
|
|
|
|
|
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
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
GUILE_PROC(scm_nconc2last, "apply:nconc2last", 1, 0, 0,
|
|
|
|
|
|
(SCM lst),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_nconc2last
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM *lloc;
|
1999-12-12 02:36:16 +00:00
|
|
|
|
SCM_VALIDATE_LIST(1,lst);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
lloc = &lst;
|
|
|
|
|
|
while (SCM_NNULLP (SCM_CDR (*lloc)))
|
* 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.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
|
|
|
|
|
|
scm_apply (proc, arg1, args)
|
|
|
|
|
|
SCM proc;
|
|
|
|
|
|
SCM arg1;
|
|
|
|
|
|
SCM args;
|
|
|
|
|
|
{}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#if 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
|
|
|
|
SCM
|
|
|
|
|
|
scm_dapply (proc, arg1, args)
|
|
|
|
|
|
SCM proc;
|
|
|
|
|
|
SCM arg1;
|
|
|
|
|
|
SCM args;
|
|
|
|
|
|
{}
|
|
|
|
|
|
#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 DEBUG_EXTENSIONS
|
|
|
|
|
|
#ifdef DEVAL
|
1996-08-20 17:09:07 +00:00
|
|
|
|
scm_debug_frame debug;
|
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
|
|
|
|
scm_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
|
|
|
|
|
|
#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
|
|
|
|
|
|
{
|
1997-04-11 03:54:28 +00:00
|
|
|
|
/* SCM_ASRTGO(SCM_NIMP(args) && SCM_CONSP(args), wrongnumargs); */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
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
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_make_cont (&tmp);
|
1998-10-07 10:02:34 +00:00
|
|
|
|
if (setjmp (SCM_JMPBUF (tmp)))
|
1996-08-20 17:09:07 +00:00
|
|
|
|
goto entap;
|
|
|
|
|
|
}
|
* 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_ithrow (scm_sym_enter_frame, scm_cons (tmp, SCM_EOL), 0);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
entap:
|
|
|
|
|
|
ENTER_APPLY;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef CCLO
|
|
|
|
|
|
tail:
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
switch (SCM_TYP7 (proc))
|
|
|
|
|
|
{
|
|
|
|
|
|
case scm_tc7_subr_2o:
|
|
|
|
|
|
args = SCM_NULLP (args) ? SCM_UNDEFINED : SCM_CAR (args);
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (arg1, args))
|
|
|
|
|
|
case scm_tc7_subr_2:
|
1997-07-25 15:04:50 +00:00
|
|
|
|
SCM_ASRTGO (SCM_NNULLP (args) && SCM_NULLP (SCM_CDR (args)),
|
|
|
|
|
|
wrongnumargs);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
args = SCM_CAR (args);
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (arg1, args))
|
|
|
|
|
|
case scm_tc7_subr_0:
|
|
|
|
|
|
SCM_ASRTGO (SCM_UNBNDP (arg1), wrongnumargs);
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) ())
|
|
|
|
|
|
case scm_tc7_subr_1:
|
|
|
|
|
|
case scm_tc7_subr_1o:
|
|
|
|
|
|
SCM_ASRTGO (SCM_NULLP (args), wrongnumargs);
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (arg1))
|
|
|
|
|
|
case scm_tc7_cxr:
|
|
|
|
|
|
SCM_ASRTGO (SCM_NULLP (args), wrongnumargs);
|
|
|
|
|
|
#ifdef SCM_FLOATS
|
|
|
|
|
|
if (SCM_SUBRF (proc))
|
|
|
|
|
|
{
|
1996-08-20 17:09:07 +00:00
|
|
|
|
if (SCM_INUMP (arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
RETURN (scm_makdbl (SCM_DSUBRF (proc) ((double) SCM_INUM (arg1)), 0.0));
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_ASRTGO (SCM_NIMP (arg1), floerr);
|
1996-08-20 17:09:07 +00:00
|
|
|
|
if (SCM_REALP (arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
RETURN (scm_makdbl (SCM_DSUBRF (proc) (SCM_REALPART (arg1)), 0.0));
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef SCM_BIGDIG
|
* 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_BIGP (arg1))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
RETURN (scm_makdbl (SCM_DSUBRF (proc) (scm_big2dbl (arg1)), 0.0))
|
|
|
|
|
|
#endif
|
|
|
|
|
|
floerr:
|
* 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_WTA_DISPATCH_1 (*SCM_SUBR_GENERIC (proc), arg1,
|
|
|
|
|
|
SCM_ARG1, SCM_CHARS (SCM_SNAME (proc)));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
proc = (SCM) SCM_SNAME (proc);
|
|
|
|
|
|
{
|
|
|
|
|
|
char *chrs = SCM_CHARS (proc) + SCM_LENGTH (proc) - 1;
|
|
|
|
|
|
while ('c' != *--chrs)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_ASSERT (SCM_NIMP (arg1) && SCM_CONSP (arg1),
|
|
|
|
|
|
arg1, SCM_ARG1, SCM_CHARS (proc));
|
|
|
|
|
|
arg1 = ('a' == *chrs) ? SCM_CAR (arg1) : SCM_CDR (arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
RETURN (arg1)
|
|
|
|
|
|
}
|
|
|
|
|
|
case scm_tc7_subr_3:
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (arg1, SCM_CAR (args), SCM_CAR (SCM_CDR (args))))
|
|
|
|
|
|
case scm_tc7_lsubr:
|
|
|
|
|
|
#ifdef DEVAL
|
1996-08-20 17:09:07 +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
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (SCM_UNBNDP (arg1) ? SCM_EOL : scm_cons (arg1, args)))
|
|
|
|
|
|
#endif
|
|
|
|
|
|
case scm_tc7_lsubr_2:
|
|
|
|
|
|
SCM_ASRTGO (SCM_NIMP (args) && SCM_CONSP (args), wrongnumargs);
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (arg1, SCM_CAR (args), SCM_CDR (args)))
|
|
|
|
|
|
case scm_tc7_asubr:
|
|
|
|
|
|
if (SCM_NULLP (args))
|
|
|
|
|
|
RETURN (SCM_SUBRF (proc) (arg1, SCM_UNDEFINED))
|
|
|
|
|
|
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
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (scm_badargsp (SCM_CAR (SCM_CODE (proc)), arg1))
|
|
|
|
|
|
goto wrongnumargs;
|
|
|
|
|
|
#endif
|
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);
|
|
|
|
|
|
while (SCM_NIMP (arg1 = SCM_CDR (arg1))
|
|
|
|
|
|
&& SCM_CONSP (arg1))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCDR (tl, scm_cons (SCM_CAR (arg1),
|
|
|
|
|
|
SCM_UNSPECIFIED));
|
|
|
|
|
|
tl = SCM_CDR (tl);
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_SETCDR (tl, arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
args = EXTEND_ENV (SCM_CAR (SCM_CODE (proc)), args, SCM_ENV (proc));
|
1999-08-19 19:01:19 +00:00
|
|
|
|
proc = SCM_CDR (SCM_CODE (proc));
|
1999-08-29 01:28:49 +00:00
|
|
|
|
again:
|
|
|
|
|
|
arg1 = proc;
|
|
|
|
|
|
while (SCM_NNULLP (arg1 = SCM_CDR (arg1)))
|
1999-08-19 19:01:19 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_IMP (SCM_CAR (proc)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_ISYMP (SCM_CAR (proc)))
|
|
|
|
|
|
{
|
|
|
|
|
|
proc = scm_m_expand_body (proc, args);
|
1999-08-29 01:28:49 +00:00
|
|
|
|
goto again;
|
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;
|
1999-08-19 19:01:19 +00:00
|
|
|
|
}
|
1999-08-29 01:28:49 +00:00
|
|
|
|
RETURN (EVALCAR (proc, args));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case scm_tc7_contin:
|
|
|
|
|
|
SCM_ASRTGO (SCM_NULLP (args), wrongnumargs);
|
|
|
|
|
|
scm_call_continuation (proc, arg1);
|
|
|
|
|
|
#ifdef CCLO
|
|
|
|
|
|
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;
|
|
|
|
|
|
#endif
|
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;
|
1997-09-22 00:43:52 +00:00
|
|
|
|
case scm_tcs_cons_gloc:
|
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
|
|
|
|
}
|
|
|
|
|
|
else if (!SCM_I_OPERATORP (proc))
|
1998-11-21 17:00:44 +00:00
|
|
|
|
goto badproc;
|
|
|
|
|
|
else
|
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
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
wrongnumargs:
|
* 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:
|
|
|
|
|
|
badproc:
|
|
|
|
|
|
scm_wta (proc, (char *) SCM_ARG1, "apply");
|
|
|
|
|
|
RETURN (arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
#ifdef DEVAL
|
1996-08-20 17:09:07 +00:00
|
|
|
|
exit:
|
1998-08-21 08:13:55 +00:00
|
|
|
|
if (CHECK_EXIT && 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
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_make_cont (&arg1);
|
1998-10-07 10:02:34 +00:00
|
|
|
|
if (setjmp (SCM_JMPBUF (arg1)))
|
1996-08-20 17:09:07 +00:00
|
|
|
|
{
|
|
|
|
|
|
proc = SCM_THROW_VALUE (arg1);
|
|
|
|
|
|
goto ret;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
* 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_ithrow (scm_sym_exit_frame, scm_cons2 (arg1, proc, SCM_EOL), 0);
|
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
|
|
|
|
|
|
|
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,
|
|
|
|
|
|
long len,
|
|
|
|
|
|
SCM gf,
|
|
|
|
|
|
SCM proc,
|
|
|
|
|
|
SCM args,
|
|
|
|
|
|
const char *who)
|
1999-06-19 17:25:25 +00:00
|
|
|
|
{
|
1999-09-07 09:40:50 +00:00
|
|
|
|
SCM *ve = SCM_VELTS (argv);
|
1999-06-19 17:25:25 +00:00
|
|
|
|
int i;
|
|
|
|
|
|
|
1999-09-07 09:40:50 +00:00
|
|
|
|
for (i = SCM_LENGTH (argv) - 1; i >= 1; i--)
|
1999-06-19 17:25:25 +00:00
|
|
|
|
{
|
|
|
|
|
|
int elt_len = scm_ilength (ve[i]);
|
|
|
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
|
|
scm_out_of_range (who, ve[i]);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1999-09-07 09:40:50 +00:00
|
|
|
|
scm_remember (&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
|
|
|
|
|
|
evalext.c where the Scheme procedure `serial-map', which guarantees
|
|
|
|
|
|
sequential behaviour, is implemented using scm_map. If the
|
|
|
|
|
|
behaviour changes, we need to update `serial-map'.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
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)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-06-19 17:25:25 +00:00
|
|
|
|
long i, len;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM res = SCM_EOL;
|
|
|
|
|
|
SCM *pres = &res;
|
|
|
|
|
|
SCM *ve = &args; /* Keep args from being optimized away. */
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_NULLP (arg1))
|
|
|
|
|
|
return res;
|
1999-06-19 17:25:25 +00:00
|
|
|
|
len = scm_ilength (arg1);
|
1999-09-07 09:40:50 +00:00
|
|
|
|
SCM_GASSERTn (len >= 0,
|
|
|
|
|
|
g_map, scm_cons2 (proc, arg1, args), SCM_ARG2, s_map);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (SCM_NULLP (args))
|
|
|
|
|
|
{
|
|
|
|
|
|
while (SCM_NIMP (arg1))
|
|
|
|
|
|
{
|
1999-09-07 09:40:50 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_CONSP (arg1), g_map, proc, arg1, SCM_ARG2, s_map);
|
|
|
|
|
|
*pres = scm_cons (scm_apply (proc, SCM_CAR (arg1), scm_listofnull),
|
|
|
|
|
|
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
|
|
|
|
arg1 = SCM_CDR (arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
1999-09-07 09:40:50 +00:00
|
|
|
|
args = scm_vector (arg1 = scm_cons (arg1, args));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
ve = SCM_VELTS (args);
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
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
|
|
|
|
#endif
|
|
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
|
|
|
|
|
arg1 = SCM_EOL;
|
|
|
|
|
|
for (i = SCM_LENGTH (args) - 1; i >= 0; i--)
|
|
|
|
|
|
{
|
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);
|
|
|
|
|
|
ve[i] = SCM_CDR (ve[i]);
|
|
|
|
|
|
}
|
|
|
|
|
|
*pres = scm_cons (scm_apply (proc, arg1, SCM_EOL), 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
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
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)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM *ve = &args; /* Keep args from being optimized away. */
|
1999-06-19 17:25:25 +00:00
|
|
|
|
long i, len;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if SCM_NULLP (arg1)
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
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);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if SCM_NULLP (args)
|
|
|
|
|
|
{
|
|
|
|
|
|
while SCM_NIMP (arg1)
|
|
|
|
|
|
{
|
1999-09-07 09:40:50 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_CONSP (arg1),
|
|
|
|
|
|
g_for_each, proc, arg1, SCM_ARG2, s_for_each);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
scm_apply (proc, SCM_CAR (arg1), scm_listofnull);
|
|
|
|
|
|
arg1 = SCM_CDR (arg1);
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-09-07 09:40:50 +00:00
|
|
|
|
args = scm_vector (arg1 = scm_cons (arg1, args));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
ve = SCM_VELTS (args);
|
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
1998-10-14 07:32:13 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
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
|
|
|
|
#endif
|
|
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
|
|
|
|
|
arg1 = SCM_EOL;
|
|
|
|
|
|
for (i = SCM_LENGTH (args) - 1; i >= 0; i--)
|
|
|
|
|
|
{
|
|
|
|
|
|
if SCM_IMP
|
|
|
|
|
|
(ve[i]) return SCM_UNSPECIFIED;
|
|
|
|
|
|
arg1 = scm_cons (SCM_CAR (ve[i]), arg1);
|
|
|
|
|
|
ve[i] = SCM_CDR (ve[i]);
|
|
|
|
|
|
}
|
|
|
|
|
|
scm_apply (proc, arg1, SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* __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
|
|
|
|
|
|
scm_closure (code, env)
|
|
|
|
|
|
SCM code;
|
|
|
|
|
|
SCM env;
|
|
|
|
|
|
{
|
|
|
|
|
|
register SCM z;
|
|
|
|
|
|
SCM_NEWCELL (z);
|
|
|
|
|
|
SCM_SETCODE (z, code);
|
* 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_SETENV (z, env);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
long 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
|
|
|
|
|
|
scm_makprom (code)
|
|
|
|
|
|
SCM code;
|
|
|
|
|
|
{
|
1999-07-07 09:44:01 +00:00
|
|
|
|
SCM_RETURN_NEWSMOB (scm_tc16_promise, code);
|
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
|
|
|
|
static int
|
1999-12-12 02:36:16 +00:00
|
|
|
|
prinprom (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_iprin1 (SCM_CDR (exp), port, pstate);
|
|
|
|
|
|
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;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
GUILE_PROC(scm_force, "force", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_force
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
SCM_VALIDATE_SMOB(1,x,promise);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (!((1L << 16) & SCM_CAR (x)))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM ans = scm_apply (SCM_CDR (x), SCM_EOL, SCM_EOL);
|
|
|
|
|
|
if (!((1L << 16) & SCM_CAR (x)))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_DEFER_INTS;
|
* 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 (x, ans);
|
|
|
|
|
|
SCM_SETOR_CAR (x, (1L << 16));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM_ALLOW_INTS;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_CDR (x);
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
GUILE_PROC (scm_promise_p, "promise?", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_promise_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_BOOL(SCM_NIMP (x) && (SCM_TYP16 (x) == scm_tc16_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
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
GUILE_PROC (scm_cons_source, "cons-source", 3, 0, 0,
|
|
|
|
|
|
(SCM xorig, SCM x, SCM y),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#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;
|
|
|
|
|
|
SCM_NEWCELL (z);
|
|
|
|
|
|
SCM_SETCAR (z, x);
|
|
|
|
|
|
SCM_SETCDR (z, y);
|
|
|
|
|
|
/* Copy source properties possibly associated with xorig. */
|
|
|
|
|
|
p = scm_whash_lookup (scm_source_whash, xorig);
|
|
|
|
|
|
if (SCM_NIMP (p))
|
|
|
|
|
|
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
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
GUILE_PROC (scm_copy_tree, "copy-tree", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#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))
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_sizet i = SCM_LENGTH (obj);
|
|
|
|
|
|
ans = scm_make_vector (SCM_MAKINUM (i), SCM_UNSPECIFIED);
|
|
|
|
|
|
while (i--)
|
|
|
|
|
|
SCM_VELTS (ans)[i] = scm_copy_tree (SCM_VELTS (obj)[i]);
|
|
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
1999-06-19 20:21:07 +00:00
|
|
|
|
if (SCM_NCONSP (obj))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return obj;
|
|
|
|
|
|
/* return scm_cons(scm_copy_tree(SCM_CAR(obj)), scm_copy_tree(SCM_CDR(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);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
while (SCM_NIMP (obj = SCM_CDR (obj)) && SCM_CONSP (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
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_eval_3 (SCM obj, int copyp, SCM env)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_NIMP (SCM_CDR (scm_system_transformer)))
|
|
|
|
|
|
obj = scm_apply (SCM_CDR (scm_system_transformer), obj, scm_listofnull);
|
|
|
|
|
|
else if (copyp)
|
|
|
|
|
|
obj = scm_copy_tree (obj);
|
* 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_XEVAL (obj, env);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
GUILE_PROC(scm_eval2, "eval2", 2, 0, 0,
|
|
|
|
|
|
(SCM obj, SCM env_thunk),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_eval2
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-03-12 08:16:26 +00:00
|
|
|
|
return scm_eval_3 (obj, 1, scm_top_level_env (env_thunk));
|
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
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
GUILE_PROC(scm_eval, "eval", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_eval
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-03-12 08:16:26 +00:00
|
|
|
|
return scm_eval_3 (obj,
|
|
|
|
|
|
1,
|
|
|
|
|
|
scm_top_level_env
|
|
|
|
|
|
(SCM_CDR (scm_top_level_lookup_closure_var)));
|
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
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
/*
|
|
|
|
|
|
SCM_REGISTER_PROC(s_eval_x, "eval!", 1, 0, 0, scm_eval_x);
|
|
|
|
|
|
*/
|
* __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_eval_x (SCM obj)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-03-12 08:16:26 +00:00
|
|
|
|
return scm_eval_3 (obj,
|
|
|
|
|
|
0,
|
|
|
|
|
|
scm_top_level_env
|
|
|
|
|
|
(SCM_CDR (scm_top_level_lookup_closure_var)));
|
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.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
1996-08-20 17:09:07 +00:00
|
|
|
|
# define DEVAL
|
|
|
|
|
|
# include "eval.c"
|
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
|
|
|
|
|
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_set_smob_print (scm_tc16_promise, prinprom);
|
1998-12-14 15:19:59 +00:00
|
|
|
|
|
1999-08-29 14:22:16 +00:00
|
|
|
|
scm_f_apply = scm_make_subr ("apply", scm_tc7_lsubr_2, scm_apply);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
scm_system_transformer = scm_sysintern ("scm:eval-transformer", SCM_UNDEFINED);
|
* 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_sym_dot = SCM_CAR (scm_sysintern (".", SCM_UNDEFINED));
|
|
|
|
|
|
scm_sym_arrow = SCM_CAR (scm_sysintern ("=>", SCM_UNDEFINED));
|
|
|
|
|
|
scm_sym_else = SCM_CAR (scm_sysintern ("else", SCM_UNDEFINED));
|
|
|
|
|
|
scm_sym_unquote = SCM_CAR (scm_sysintern ("unquote", SCM_UNDEFINED));
|
|
|
|
|
|
scm_sym_uq_splicing = SCM_CAR (scm_sysintern ("unquote-splicing", SCM_UNDEFINED));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1999-07-27 19:09:06 +00:00
|
|
|
|
scm_nil = scm_sysintern ("nil", SCM_UNDEFINED);
|
|
|
|
|
|
SCM_SETCDR (scm_nil, SCM_CAR (scm_nil));
|
|
|
|
|
|
scm_nil = SCM_CAR (scm_nil);
|
|
|
|
|
|
scm_t = scm_sysintern ("t", SCM_UNDEFINED);
|
|
|
|
|
|
SCM_SETCDR (scm_t, SCM_CAR (scm_t));
|
|
|
|
|
|
scm_t = SCM_CAR (scm_t);
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* acros */
|
|
|
|
|
|
/* end of acros */
|
|
|
|
|
|
|
1996-11-21 16:28:39 +00:00
|
|
|
|
scm_top_level_lookup_closure_var =
|
|
|
|
|
|
scm_sysintern("*top-level-lookup-closure*", SCM_BOOL_F);
|
1997-01-18 11:49:35 +00:00
|
|
|
|
scm_can_use_top_level_lookup_closure_var = 1;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
* 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_sym_enter_frame = SCM_CAR (scm_sysintern ("enter-frame", SCM_UNDEFINED));
|
|
|
|
|
|
scm_sym_apply_frame = SCM_CAR (scm_sysintern ("apply-frame", SCM_UNDEFINED));
|
|
|
|
|
|
scm_sym_exit_frame = SCM_CAR (scm_sysintern ("exit-frame", SCM_UNDEFINED));
|
|
|
|
|
|
scm_sym_trace = SCM_CAR (scm_sysintern ("trace", SCM_UNDEFINED));
|
1996-08-20 17:09:07 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#include "eval.x"
|
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 */
|