* 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.
* debug.c (scm_i_proc, scm_i_args, scm_i_eval_args): Removed.
1999-08-17 08:46:04 +00:00
|
|
|
|
/* Debugging extensions for Guile
|
* __scm.h, backtrace.c, backtrace.h, debug.c, debug.h, dynl-dld.c,
dynwind.c, dynwind.h, eval.h, evalext.c, evalext.h, feature.c,
feature.h, hashtab.c, hashtab.h, objects.c, objects.h, print.c,
procs.c, procs.h, smob.c, smob.h, srcprop.c, strorder.c, struct.c,
struct.h: Updated copyrigth notices.
1999-09-12 11:16:13 +00:00
|
|
|
|
* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation
|
1996-09-12 23:39:37 +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-09-12 23:39:37 +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.
|
|
|
|
|
|
* If you do not wish that, delete this exception notice.
|
|
|
|
|
|
*
|
|
|
|
|
|
* The author can be reached at djurfeldt@nada.kth.se
|
1997-05-26 22:34:48 +00:00
|
|
|
|
* Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
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-08-20 17:08:46 +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 "eval.h"
|
1998-11-13 15:58:00 +00:00
|
|
|
|
#include "stackchk.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 "throw.h"
|
|
|
|
|
|
#include "genio.h"
|
1998-10-31 13:04:12 +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 "smob.h"
|
|
|
|
|
|
#include "procprop.h"
|
|
|
|
|
|
#include "srcprop.h"
|
|
|
|
|
|
#include "alist.h"
|
|
|
|
|
|
#include "continuations.h"
|
|
|
|
|
|
#include "strports.h"
|
|
|
|
|
|
#include "read.h"
|
|
|
|
|
|
#include "feature.h"
|
1998-08-21 08:13:36 +00:00
|
|
|
|
#include "dynwind.h"
|
1999-03-19 02:28:41 +00:00
|
|
|
|
#include "modules.h"
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
2000-03-03 00:09:54 +00:00
|
|
|
|
#include "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 "debug.h"
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* {Run time control of the debugging evaluator}
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_debug_options, "debug-options-interface", 0, 1, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM setting),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_debug_options
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM ans;
|
|
|
|
|
|
SCM_DEFER_INTS;
|
1996-08-23 01:19:03 +00:00
|
|
|
|
ans = scm_options (setting,
|
|
|
|
|
|
scm_debug_opts,
|
|
|
|
|
|
SCM_N_DEBUG_OPTIONS,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
FUNC_NAME);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
#ifndef SCM_RECKLESS
|
1996-08-23 01:19:03 +00:00
|
|
|
|
if (!(1 <= SCM_N_FRAMES && SCM_N_FRAMES <= SCM_MAX_FRAME_SIZE))
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_options (ans, scm_debug_opts, SCM_N_DEBUG_OPTIONS, FUNC_NAME);
|
2000-01-07 23:53:20 +00:00
|
|
|
|
SCM_OUT_OF_RANGE (1, setting);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
1996-08-23 01:19:03 +00:00
|
|
|
|
SCM_RESET_DEBUG_MODE;
|
1998-11-13 15:58:00 +00:00
|
|
|
|
scm_stack_checking_enabled_p = SCM_STACK_CHECKING_P;
|
1996-08-23 01:19:03 +00:00
|
|
|
|
scm_debug_eframe_size = 2 * SCM_N_FRAMES;
|
1999-09-28 00:18:16 +00:00
|
|
|
|
SCM_ALLOW_INTS;
|
1996-08-20 17:08:46 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-08-21 08:13:36 +00:00
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
with_traps_before (void *data)
|
|
|
|
|
|
{
|
|
|
|
|
|
int *trap_flag = data;
|
|
|
|
|
|
*trap_flag = SCM_TRAPS_P;
|
|
|
|
|
|
SCM_TRAPS_P = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
with_traps_after (void *data)
|
|
|
|
|
|
{
|
|
|
|
|
|
int *trap_flag = data;
|
|
|
|
|
|
SCM_TRAPS_P = *trap_flag;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
with_traps_inner (void *data)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM thunk = (SCM) data;
|
|
|
|
|
|
return scm_apply (thunk, SCM_EOL, 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
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_with_traps, "with-traps", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM thunk),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_with_traps
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
1998-08-21 08:13:36 +00:00
|
|
|
|
int trap_flag;
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_THUNK (1,thunk);
|
1998-08-21 08:13:36 +00:00
|
|
|
|
return scm_internal_dynamic_wind (with_traps_before,
|
|
|
|
|
|
with_traps_inner,
|
|
|
|
|
|
with_traps_after,
|
|
|
|
|
|
(void *) thunk,
|
|
|
|
|
|
&trap_flag);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-08-20 17:08:46 +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.
* debug.c (scm_i_proc, scm_i_args, scm_i_eval_args): Removed.
1999-08-17 08:46:04 +00:00
|
|
|
|
static SCM scm_sym_source, scm_sym_dots;
|
|
|
|
|
|
static SCM scm_sym_procname;
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
|
|
|
|
|
/* {Memoized Source}
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
long scm_tc16_memoized;
|
|
|
|
|
|
|
* __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:08:46 +00:00
|
|
|
|
static int
|
1999-12-12 02:36:16 +00:00
|
|
|
|
prinmemoized (SCM obj,SCM port,scm_print_state *pstate)
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
* 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:40 +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 ("#<memoized ", port);
|
* 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:40 +00:00
|
|
|
|
SCM_SET_WRITINGP (pstate, 1);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
#ifdef GUILE_DEBUG
|
|
|
|
|
|
scm_iprin1 (SCM_MEMOIZED_EXP (obj), port, pstate);
|
|
|
|
|
|
#else
|
* 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:40 +00:00
|
|
|
|
scm_iprin1 (scm_unmemoize (obj), port, pstate);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
#endif
|
* 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:40 +00:00
|
|
|
|
SCM_SET_WRITINGP (pstate, writingp);
|
* Makefile.in: Rebuilt.
* Makefile.am (libguile_la_SOURCES): Removed extchrs.c,
mbstrings.c.
(modinclude_HEADERS): Removed extchrs.h, mbstrings.h.
* unif.c (scm_vector_set_length_x): Don't handle multibyte
strings.
* tag.c (scm_utag_mb_string, scm_utag_mb_substring): Removed.
(scm_tag): Don't handle multibyte strings.
* read.c: Don't include mbstrings.h.
(scm_lreadr): Don't handle multibyte ports.
* kw.c: Don't include mbstrings.h.
* init.c: Don't include mbstrings.h.
(scm_boot_guile_1): Don't init mbstrings module.
* hash.c (scm_hasher): Don't handle mbstrings.
* gscm.c (gscm_run_scm): Don't init mbstrings module.
* gc.c (scm_gc_mark): Don't handle mbstrings.
(scm_gc_sweep): Likewise.
* eval.c (SCM_CEVAL): Don't handle mbstrings.
* eq.c (scm_equal_p): Use SCM_TYP7S, not SCM_TYP7SD.
* tags.h (SCM_TYP7SD): Removed.
(SCM_TYP7D): Removed.
(scm_tc7_mb_string): Removed.
(scm_tc7_mb_substring): Removed.
* print.c (scm_iprin1): Handle char printing directly. Don't
handle mbstrings.
Don't include "mbstrings.h".
* symbols.c (scm_intern_obarray_soft, scm_string_to_symbol,
scm_string_to_obarray_symbol, msymbolize): Don't set symbol's
multi-byte flag.
Don't include "mbstrings.h".
* symbols.h (SCM_SYMBOL_MULTI_BYTE_STRINGP): Removed.
(SCM_SYMBOL_SLOTS): Define as 4.
(SCM_ROSTRINGP): Use SCM_TYP7S, not SCM_TYP7SD.
* arbiters.c, backtrace.c, debug.c, dynl.c, eval.c, fluids.c,
gc.c, gsubr.c, ioext.c, kw.c, mallocs.c, numbers.c, ports.c,
print.c, read.c, regex-posix.c, root.c, srcprop.c, stackchk.c,
struct.c, threads.c, throw.c, unif.c, variable.c: Use new
("gen"-less) I/O function names.
* ports.c (scm_add_to_port_table): Don't set port's
representation.
* ports.h (scm_port_representation_type): Removed.
(scm_string_representation_type): Removed.
(struct scm_port_table ): Removed representation field.
(SCM_PORT_REPRESENTATION): Removed.
(SCM_SET_PORT_REPRESENTATION): Removed.
* genio.h: Use new function names.
* genio.c: Don't include "extchrs.h".
(scm_gen_putc, scm_gen_puts, scm_gen_write, scm_get_getc):
Removed.
(scm_putc, scm_puts, scm_lfwrite): No longer static.
(scm_getc): No longer static; handle line and column changes.
(scm_ungetc): Renamed from scm_gen_ungetc.
(scm_do_read_line): Renamed from scm_gen_read_line.
* libguile.h: Don't include "extchrs.h" or "mbstrings.h"
* extchrs.h, extchrs.c, mbstrings.h, mbstrings.c: Removed.
1997-10-15 17:18:32 +00:00
|
|
|
|
scm_putc ('>', port);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_memoized_p, "memoized?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM obj),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_memoized_p
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
return SCM_BOOL(SCM_MEMOIZEDP (obj));
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
|
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_make_memoized (SCM exp, SCM env)
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
1996-10-17 23:32:40 +00:00
|
|
|
|
/* *fixme* Check that env is a valid environment. */
|
1996-08-20 17:08:46 +00:00
|
|
|
|
register SCM z, ans;
|
1998-04-19 20:16:36 +00:00
|
|
|
|
SCM_ENTER_A_SECTION;
|
1999-07-07 09:44:01 +00:00
|
|
|
|
SCM_NEWSMOB (z, exp, env);
|
|
|
|
|
|
SCM_NEWSMOB (ans, scm_tc16_memoized, z);
|
1998-04-19 20:16:36 +00:00
|
|
|
|
SCM_EXIT_A_SECTION;
|
1996-08-20 17:08:46 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1998-03-30 21:02:59 +00:00
|
|
|
|
#ifdef GUILE_DEBUG
|
|
|
|
|
|
/*
|
|
|
|
|
|
* Some primitives for construction of memoized code
|
|
|
|
|
|
*
|
|
|
|
|
|
* - procedure: memcons CAR CDR [ENV]
|
|
|
|
|
|
*
|
|
|
|
|
|
* Construct a pair, encapsulated in a memoized object.
|
|
|
|
|
|
*
|
|
|
|
|
|
* The CAR and CDR can be either normal or memoized. If ENV isn't
|
|
|
|
|
|
* specified, the top-level environment of the current module will
|
|
|
|
|
|
* be assumed. All environments must match.
|
|
|
|
|
|
*
|
|
|
|
|
|
* - procedure: make-gloc VARIABLE [ENV]
|
|
|
|
|
|
*
|
|
|
|
|
|
* Return a gloc, encapsulated in a memoized object.
|
|
|
|
|
|
*
|
|
|
|
|
|
* (Glocs can't exist in normal list structures, since they will
|
|
|
|
|
|
* be mistaken for structs.)
|
|
|
|
|
|
*
|
|
|
|
|
|
* - procedure: gloc? OBJECT
|
|
|
|
|
|
*
|
|
|
|
|
|
* Return #t if OBJECT is a memoized gloc.
|
|
|
|
|
|
*
|
|
|
|
|
|
* - procedure: make-iloc FRAME BINDING CDRP
|
|
|
|
|
|
*
|
|
|
|
|
|
* Return an iloc referring to frame no. FRAME, binding
|
|
|
|
|
|
* no. BINDING. If CDRP is non-#f, the iloc is referring to a
|
|
|
|
|
|
* frame consisting of a single pair, with the value stored in the
|
|
|
|
|
|
* CDR.
|
|
|
|
|
|
*
|
|
|
|
|
|
* - procedure: iloc? OBJECT
|
|
|
|
|
|
*
|
|
|
|
|
|
* Return #t if OBJECT is an iloc.
|
|
|
|
|
|
*
|
|
|
|
|
|
* - procedure: mem->proc MEMOIZED
|
|
|
|
|
|
*
|
|
|
|
|
|
* Construct a closure from the memoized lambda expression MEMOIZED
|
|
|
|
|
|
*
|
|
|
|
|
|
* WARNING! The code is not copied!
|
|
|
|
|
|
*
|
|
|
|
|
|
* - procedure: proc->mem CLOSURE
|
|
|
|
|
|
*
|
|
|
|
|
|
* Turn the closure CLOSURE into a memoized object.
|
|
|
|
|
|
*
|
|
|
|
|
|
* WARNING! The code is not copied!
|
|
|
|
|
|
*
|
|
|
|
|
|
* - constant: SCM_IM_AND
|
|
|
|
|
|
* - constant: SCM_IM_BEGIN
|
|
|
|
|
|
* - constant: SCM_IM_CASE
|
|
|
|
|
|
* - constant: SCM_IM_COND
|
|
|
|
|
|
* - constant: SCM_IM_DO
|
|
|
|
|
|
* - constant: SCM_IM_IF
|
|
|
|
|
|
* - constant: SCM_IM_LAMBDA
|
|
|
|
|
|
* - constant: SCM_IM_LET
|
|
|
|
|
|
* - constant: SCM_IM_LETSTAR
|
|
|
|
|
|
* - constant: SCM_IM_LETREC
|
|
|
|
|
|
* - constant: SCM_IM_OR
|
|
|
|
|
|
* - constant: SCM_IM_QUOTE
|
|
|
|
|
|
* - constant: SCM_IM_SET
|
|
|
|
|
|
* - constant: SCM_IM_DEFINE
|
|
|
|
|
|
* - constant: SCM_IM_APPLY
|
|
|
|
|
|
* - constant: SCM_IM_CONT
|
1999-03-11 11:44:41 +00:00
|
|
|
|
* - constant: SCM_IM_DISPATCH
|
1998-03-30 21:02:59 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include "variable.h"
|
|
|
|
|
|
#include "procs.h"
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_make_gloc, "make-gloc", 1, 1, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM var, SCM env),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_make_gloc
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
|
|
|
|
|
#if 1 /* Unsafe */
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (SCM_CONSP (var))
|
1998-03-30 21:02:59 +00:00
|
|
|
|
var = scm_cons (SCM_BOOL_F, var);
|
|
|
|
|
|
else
|
|
|
|
|
|
#endif
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_VARIABLE (1,var);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
if (SCM_UNBNDP (env))
|
|
|
|
|
|
env = scm_top_level_env (SCM_CDR (scm_top_level_lookup_closure_var));
|
|
|
|
|
|
else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_NULLORCONS (2,env);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
return scm_make_memoized (SCM_VARVCELL (var) + 1, env);
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-03-30 21:02:59 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_gloc_p, "gloc?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM obj),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_gloc_p
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
2000-01-03 16:26:28 +00:00
|
|
|
|
return SCM_BOOL((SCM_MEMOIZEDP (obj)
|
* async.c, boolean.h, debug.c, dynl.c, dynwind.c, eval.c, eval.h,
feature.h, filesys.h, fluids.h, fports.c, fports.h, gc.c, gc.h,
hash.c, keywords.h, macros.c, numbers.c, numbers.h, objects.c,
objects.h, options.c, pairs.h, ports.c, ports.h, print.c,
procs.h, ramap.c, read.c, smob.c, smob.h, srcprop.h, stacks.c,
stacks.h, strports.c, struct.c, struct.h, tag.c, tags.h,
throw.c, unif.c, unif.h, variable.h, vectors.h, weaks.c,
weaks.h (SCM_SCM, SCM_BITS, SCM_CARBITS): Renamed from
SCM_ASSCM, SCM_ASWORD, SCM_CARW).
2000-03-12 17:00:58 +00:00
|
|
|
|
&& (SCM_BITS(SCM_MEMOIZED_EXP (obj)) & 7) == 1));
|
1998-03-30 21:02:59 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-03-30 21:02:59 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_make_iloc, "make-iloc", 3, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM frame, SCM binding, SCM cdrp),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_make_iloc
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (1,frame);
|
|
|
|
|
|
SCM_VALIDATE_INUM (2,binding);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
return (SCM_ILOC00
|
|
|
|
|
|
+ SCM_IFRINC * SCM_INUM (frame)
|
|
|
|
|
|
+ (SCM_NFALSEP (cdrp) ? SCM_ICDR : 0)
|
|
|
|
|
|
+ SCM_IDINC * SCM_INUM (binding));
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-03-30 21:02:59 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_iloc_p, "iloc?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM obj),
|
|
|
|
|
|
"")
|
2000-01-11 21:47:57 +00:00
|
|
|
|
#define FUNC_NAME s_scm_iloc_p
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
return SCM_BOOL(SCM_ILOCP (obj));
|
1998-03-30 21:02:59 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-03-30 21:02:59 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_memcons, "memcons", 2, 1, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM car, SCM cdr, SCM env),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_memcons
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (SCM_MEMOIZEDP (car))
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
|
|
|
|
|
/*fixme* environments may be two different but equal top-level envs */
|
|
|
|
|
|
if (!SCM_UNBNDP (env) && SCM_MEMOIZED_ENV (car) != env)
|
1999-12-14 17:41:59 +00:00
|
|
|
|
SCM_MISC_ERROR ("environment mismatch arg1 <-> arg3",
|
1998-03-30 21:02:59 +00:00
|
|
|
|
scm_cons2 (car, env, SCM_EOL));
|
|
|
|
|
|
else
|
|
|
|
|
|
env = SCM_MEMOIZED_ENV (car);
|
|
|
|
|
|
car = SCM_MEMOIZED_EXP (car);
|
|
|
|
|
|
}
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (SCM_MEMOIZEDP (cdr))
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (!SCM_UNBNDP (env) && SCM_MEMOIZED_ENV (cdr) != env)
|
1999-12-14 17:41:59 +00:00
|
|
|
|
SCM_MISC_ERROR ("environment mismatch arg2 <-> arg3",
|
1998-03-30 21:02:59 +00:00
|
|
|
|
scm_cons2 (cdr, env, SCM_EOL));
|
|
|
|
|
|
else
|
|
|
|
|
|
env = SCM_MEMOIZED_ENV (cdr);
|
|
|
|
|
|
cdr = SCM_MEMOIZED_EXP (cdr);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_UNBNDP (env))
|
|
|
|
|
|
env = scm_top_level_env (SCM_CDR (scm_top_level_lookup_closure_var));
|
|
|
|
|
|
else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_NULLORCONS (3,env);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
return scm_make_memoized (scm_cons (car, cdr), env);
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-03-30 21:02:59 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_mem_to_proc, "mem->proc", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM obj),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_mem_to_proc
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM env;
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_MEMOIZED (1,obj);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
env = SCM_MEMOIZED_ENV (obj);
|
|
|
|
|
|
obj = SCM_MEMOIZED_EXP (obj);
|
|
|
|
|
|
if (!(SCM_NIMP (obj) && SCM_CAR (obj) == SCM_IM_LAMBDA))
|
1999-12-14 17:41:59 +00:00
|
|
|
|
SCM_MISC_ERROR ("expected lambda expression",
|
1998-03-30 21:02:59 +00:00
|
|
|
|
scm_cons (obj, SCM_EOL));
|
|
|
|
|
|
return scm_closure (SCM_CDR (obj), env);
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-03-30 21:02:59 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_proc_to_mem, "proc->mem", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM obj),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_proc_to_mem
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
1999-12-14 17:08:25 +00:00
|
|
|
|
SCM_VALIDATE_CLOSURE (1, obj);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
return scm_make_memoized (scm_cons (SCM_IM_LAMBDA, SCM_CODE (obj)),
|
|
|
|
|
|
SCM_ENV (obj));
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-03-30 21:02:59 +00:00
|
|
|
|
|
|
|
|
|
|
#endif /* GUILE_DEBUG */
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_unmemoize, "unmemoize", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM m),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_unmemoize
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_MEMOIZED (1,m);
|
1996-10-14 03:25:21 +00:00
|
|
|
|
return scm_unmemocopy (SCM_MEMOIZED_EXP (m), SCM_MEMOIZED_ENV (m));
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_memoized_environment, "memoized-environment", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM m),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_memoized_environment
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_MEMOIZED (1,m);
|
1996-10-14 03:25:21 +00:00
|
|
|
|
return SCM_MEMOIZED_ENV (m);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_procedure_name, "procedure-name", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM proc),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_procedure_name
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_PROC (1,proc);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
switch (SCM_TYP7 (proc)) {
|
1999-03-12 08:06:49 +00:00
|
|
|
|
case scm_tcs_subrs:
|
|
|
|
|
|
return SCM_SNAME (proc);
|
|
|
|
|
|
default:
|
1996-08-20 17:08:46 +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.
* debug.c (scm_i_proc, scm_i_args, scm_i_eval_args): Removed.
1999-08-17 08:46:04 +00:00
|
|
|
|
SCM name = scm_procedure_property (proc, scm_sym_name);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
#if 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.
* debug.c (scm_i_proc, scm_i_args, scm_i_eval_args): Removed.
1999-08-17 08:46:04 +00:00
|
|
|
|
/* Source property scm_sym_procname not implemented yet... */
|
|
|
|
|
|
SCM name = scm_source_property (SCM_CAR (SCM_CDR (SCM_CODE (proc))), scm_sym_procname);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
if (SCM_FALSEP (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.
* debug.c (scm_i_proc, scm_i_args, scm_i_eval_args): Removed.
1999-08-17 08:46:04 +00:00
|
|
|
|
name = scm_procedure_property (proc, scm_sym_name);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
#endif
|
1999-07-29 21:11:37 +00:00
|
|
|
|
if (SCM_FALSEP (name) && SCM_CLOSUREP (proc))
|
|
|
|
|
|
name = scm_reverse_lookup (SCM_ENV (proc), proc);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
return name;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_procedure_source, "procedure-source", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM proc),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_procedure_source
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
1999-12-12 18:30:09 +00:00
|
|
|
|
SCM_VALIDATE_NIM (1,proc);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
switch (SCM_TYP7 (proc)) {
|
|
|
|
|
|
case scm_tcs_closures:
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM src;
|
* 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.
* debug.c (scm_i_proc, scm_i_args, scm_i_eval_args): Removed.
1999-08-17 08:46:04 +00:00
|
|
|
|
src = scm_source_property (SCM_CDR (SCM_CODE (proc)), scm_sym_copy);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
if (src != SCM_BOOL_F)
|
* 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.
* debug.c (scm_i_proc, scm_i_args, scm_i_eval_args): Removed.
1999-08-17 08:46:04 +00:00
|
|
|
|
return scm_cons2 (scm_sym_lambda, SCM_CAR (SCM_CODE (proc)), src);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
src = SCM_CODE (proc);
|
* 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.
* debug.c (scm_i_proc, scm_i_args, scm_i_eval_args): Removed.
1999-08-17 08:46:04 +00:00
|
|
|
|
return scm_cons (scm_sym_lambda,
|
1996-08-20 17:08:46 +00:00
|
|
|
|
scm_unmemocopy (src,
|
* __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
|
|
|
|
SCM_EXTEND_ENV (SCM_CAR (src),
|
1996-08-20 17:08:46 +00:00
|
|
|
|
SCM_EOL,
|
|
|
|
|
|
SCM_ENV (proc))));
|
|
|
|
|
|
}
|
|
|
|
|
|
case scm_tc7_contin:
|
|
|
|
|
|
case scm_tcs_subrs:
|
|
|
|
|
|
#ifdef CCLO
|
|
|
|
|
|
case scm_tc7_cclo:
|
|
|
|
|
|
#endif
|
|
|
|
|
|
/* It would indeed be a nice thing if we supplied source even for
|
|
|
|
|
|
built in procedures! */
|
* 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.
* debug.c (scm_i_proc, scm_i_args, scm_i_eval_args): Removed.
1999-08-17 08:46:04 +00:00
|
|
|
|
return scm_procedure_property (proc, scm_sym_source);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
default:
|
1999-12-12 02:36:16 +00:00
|
|
|
|
SCM_WTA(1,proc);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_procedure_environment, "procedure-environment", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM proc),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_procedure_environment
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
1999-12-12 18:30:09 +00:00
|
|
|
|
SCM_VALIDATE_NIM (1,proc);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
switch (SCM_TYP7 (proc)) {
|
|
|
|
|
|
case scm_tcs_closures:
|
|
|
|
|
|
return SCM_ENV (proc);
|
|
|
|
|
|
case scm_tc7_contin:
|
|
|
|
|
|
case scm_tcs_subrs:
|
|
|
|
|
|
#ifdef CCLO
|
|
|
|
|
|
case scm_tc7_cclo:
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return SCM_EOL;
|
|
|
|
|
|
default:
|
1999-12-12 02:36:16 +00:00
|
|
|
|
SCM_WTA(1,proc);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
1996-10-14 03:25:21 +00:00
|
|
|
|
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
|
|
|
|
|
/* Eval in a local environment. We would like to have the ability to
|
1996-11-02 20:53:18 +00:00
|
|
|
|
* evaluate in a specified local environment, but due to the
|
|
|
|
|
|
* memoization this isn't normally possible. We solve it by copying
|
|
|
|
|
|
* the code before evaluating. One solution would be to have eval.c
|
|
|
|
|
|
* generate yet another evaluator. They are not very big actually.
|
1996-08-20 17:08:46 +00:00
|
|
|
|
*/
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_local_eval, "local-eval", 1, 1, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM exp, SCM env),
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"Evaluate @var{exp} in its environment. If @var{env} is supplied,\n"
|
|
|
|
|
|
"it is the environment in which to evaluate @var{exp}. Otherwise,\n"
|
|
|
|
|
|
"@var{exp} must be a memoized code object (in which case, its environment\n"
|
|
|
|
|
|
"is implicit).")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_local_eval
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
1996-10-17 23:32:40 +00:00
|
|
|
|
if (SCM_UNBNDP (env))
|
|
|
|
|
|
{
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_MEMOIZED (1,exp);
|
1996-10-17 23:32:40 +00:00
|
|
|
|
return scm_eval_3 (SCM_MEMOIZED_EXP (exp), 0, SCM_MEMOIZED_ENV (exp));
|
|
|
|
|
|
}
|
1996-08-20 17:08:46 +00:00
|
|
|
|
return scm_eval_3 (exp, 1, env);
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
1999-07-29 21:11:37 +00:00
|
|
|
|
#if 0
|
1999-12-12 02:36:16 +00:00
|
|
|
|
SCM_REGISTER_PROC (s_reverse_lookup, "reverse-lookup", 2, 0, 0, scm_reverse_lookup);
|
1999-07-29 21:11:37 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_reverse_lookup (SCM env, SCM data)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM names, values;
|
1999-12-18 13:42:46 +00:00
|
|
|
|
while (SCM_NIMP (env) && SCM_SLOPPY_CONSP (SCM_CAR (env)))
|
1999-07-29 21:11:37 +00:00
|
|
|
|
{
|
|
|
|
|
|
names = SCM_CAAR (env);
|
|
|
|
|
|
values = SCM_CDAR (env);
|
1999-12-16 20:48:05 +00:00
|
|
|
|
while (SCM_CONSP (names))
|
1999-07-29 21:11:37 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_CAR (values) == data)
|
|
|
|
|
|
return SCM_CAR (names);
|
|
|
|
|
|
names = SCM_CDR (names);
|
|
|
|
|
|
values = SCM_CDR (values);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (names != SCM_EOL && values == data)
|
|
|
|
|
|
return names;
|
|
|
|
|
|
env = SCM_CDR (env);
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-10-14 03:25:21 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_start_stack (SCM id, SCM exp, SCM env)
|
1996-10-14 03:25:21 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM answer;
|
1996-10-14 20:28:18 +00:00
|
|
|
|
scm_debug_frame vframe;
|
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 vframe_vect_body;
|
1998-06-07 02:11:28 +00:00
|
|
|
|
vframe.prev = scm_last_debug_frame;
|
|
|
|
|
|
vframe.status = SCM_VOIDFRAME;
|
|
|
|
|
|
vframe.vect = &vframe_vect_body;
|
|
|
|
|
|
vframe.vect[0].id = id;
|
|
|
|
|
|
scm_last_debug_frame = &vframe;
|
1998-11-10 14:16:55 +00:00
|
|
|
|
answer = scm_eval_3 (exp, 1, env);
|
1998-06-07 02:11:28 +00:00
|
|
|
|
scm_last_debug_frame = vframe.prev;
|
|
|
|
|
|
return answer;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1998-12-14 15:19:59 +00:00
|
|
|
|
SCM_SYNTAX(s_start_stack, "start-stack", scm_makacro, scm_m_start_stack);
|
|
|
|
|
|
|
1998-09-30 10:14:59 +00:00
|
|
|
|
static SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_m_start_stack (SCM exp, SCM env)
|
1998-06-07 02:11:28 +00:00
|
|
|
|
{
|
1996-10-14 03:25:21 +00:00
|
|
|
|
exp = SCM_CDR (exp);
|
2000-01-03 16:26:28 +00:00
|
|
|
|
SCM_ASSERT (SCM_ECONSP (exp)
|
|
|
|
|
|
&& SCM_ECONSP (SCM_CDR (exp))
|
1996-10-14 20:28:18 +00:00
|
|
|
|
&& SCM_NULLP (SCM_CDDR (exp)),
|
1996-10-14 03:25:21 +00:00
|
|
|
|
exp,
|
|
|
|
|
|
SCM_WNA,
|
|
|
|
|
|
s_start_stack);
|
1998-06-07 02:11:28 +00:00
|
|
|
|
return scm_start_stack (scm_eval_car (exp, env), SCM_CADR (exp), env);
|
1996-10-14 03:25:21 +00:00
|
|
|
|
}
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
|
|
|
|
|
/* {Debug Objects}
|
|
|
|
|
|
*
|
|
|
|
|
|
* The debugging evaluator throws these on frame traps.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
long scm_tc16_debugobj;
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
1999-12-12 02:36:16 +00:00
|
|
|
|
prindebugobj (SCM obj,SCM port,scm_print_state *pstate)
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
* 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 ("#<debug-object ", port);
|
2000-03-09 18:58:58 +00:00
|
|
|
|
scm_intprint ((int) SCM_DEBUGOBJ_FRAME (obj), 16, port);
|
* 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-08-20 17:08:46 +00:00
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_debug_object_p, "debug-object?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM obj),
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_debug_object_p
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
1999-12-16 20:48:05 +00:00
|
|
|
|
return SCM_BOOL(SCM_DEBUGOBJP (obj));
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-08-20 17:08:46 +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-08-20 17:08:46 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_make_debugobj (scm_debug_frame *frame)
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
|
|
|
|
|
register SCM z;
|
|
|
|
|
|
SCM_NEWCELL (z);
|
1998-04-19 20:16:36 +00:00
|
|
|
|
SCM_ENTER_A_SECTION;
|
* 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:31:08 +00:00
|
|
|
|
SCM_SET_DEBUGOBJ_FRAME (z, (SCM) frame);
|
1998-04-19 20:16:36 +00:00
|
|
|
|
SCM_SETCAR (z, scm_tc16_debugobj);
|
|
|
|
|
|
SCM_EXIT_A_SECTION;
|
1996-08-20 17:08:46 +00:00
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1997-03-08 14:43:29 +00:00
|
|
|
|
/* Undocumented debugging procedure */
|
|
|
|
|
|
#ifdef GUILE_DEBUG
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_debug_hang, "debug-hang", 0, 1, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM obj),
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_debug_hang
|
1996-11-02 20:53:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
int go = 0;
|
|
|
|
|
|
while (!go) ;
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1997-03-08 14:43:29 +00:00
|
|
|
|
#endif
|
1996-11-02 20:53:18 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-08-20 17:08:46 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_init_debug ()
|
|
|
|
|
|
{
|
1996-08-23 01:19:03 +00:00
|
|
|
|
scm_init_opts (scm_debug_options, scm_debug_opts, SCM_N_DEBUG_OPTIONS);
|
1996-09-12 23:39:37 +00:00
|
|
|
|
|
1999-07-07 09:44:01 +00:00
|
|
|
|
scm_tc16_memoized = scm_make_smob_type_mfpe ("memoized", 0,
|
|
|
|
|
|
scm_markcdr, NULL, prinmemoized, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
scm_tc16_debugobj = scm_make_smob_type_mfpe ("debug-object", 0,
|
|
|
|
|
|
NULL, NULL, prindebugobj, NULL);
|
1996-08-20 17:08:46 +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.
* debug.c (scm_i_proc, scm_i_args, scm_i_eval_args): Removed.
1999-08-17 08:46:04 +00:00
|
|
|
|
scm_sym_procname = SCM_CAR (scm_sysintern ("procname", SCM_UNDEFINED));
|
|
|
|
|
|
scm_sym_dots = SCM_CAR (scm_sysintern ("...", SCM_UNDEFINED));
|
|
|
|
|
|
scm_sym_source = SCM_CAR (scm_sysintern ("source", SCM_UNDEFINED));
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
1998-03-30 21:02:59 +00:00
|
|
|
|
#ifdef GUILE_DEBUG
|
|
|
|
|
|
scm_sysintern ("SCM_IM_AND", SCM_IM_AND);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_BEGIN", SCM_IM_BEGIN);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_CASE", SCM_IM_CASE);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_COND", SCM_IM_COND);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_DO", SCM_IM_DO);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_IF", SCM_IM_IF);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_LAMBDA", SCM_IM_LAMBDA);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_LET", SCM_IM_LET);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_LETSTAR", SCM_IM_LETSTAR);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_LETREC", SCM_IM_LETREC);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_OR", SCM_IM_OR);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_QUOTE", SCM_IM_QUOTE);
|
1999-03-11 11:44:41 +00:00
|
|
|
|
scm_sysintern ("SCM_IM_SET_X", SCM_IM_SET_X);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
scm_sysintern ("SCM_IM_DEFINE", SCM_IM_DEFINE);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_APPLY", SCM_IM_APPLY);
|
|
|
|
|
|
scm_sysintern ("SCM_IM_CONT", SCM_IM_CONT);
|
1999-03-11 11:44:41 +00:00
|
|
|
|
scm_sysintern ("SCM_IM_DISPATCH", SCM_IM_DISPATCH);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
#endif
|
1996-08-20 17:08:46 +00:00
|
|
|
|
scm_add_feature ("debug-extensions");
|
|
|
|
|
|
|
|
|
|
|
|
#include "debug.x"
|
|
|
|
|
|
}
|