2000-06-12 12:28:24 +00:00
|
|
|
|
/* Copyright (C) 1995,1996,1997,1998, 1999, 2000 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
|
|
|
|
|
|
|
|
|
|
|
2001-03-09 23:33:41 +00:00
|
|
|
|
#include <string.h>
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/_scm.h"
|
|
|
|
|
|
#include "libguile/stackchk.h"
|
|
|
|
|
|
#include "libguile/dynwind.h"
|
|
|
|
|
|
#include "libguile/eval.h"
|
|
|
|
|
|
#include "libguile/smob.h"
|
|
|
|
|
|
#include "libguile/pairs.h"
|
|
|
|
|
|
#include "libguile/throw.h"
|
|
|
|
|
|
#include "libguile/fluids.h"
|
|
|
|
|
|
#include "libguile/ports.h"
|
|
|
|
|
|
|
|
|
|
|
|
#include "libguile/root.h"
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM scm_sys_protects[SCM_NUM_PROTECTS];
|
1996-10-01 03:19:14 +00:00
|
|
|
|
|
2000-12-08 17:32:56 +00:00
|
|
|
|
scm_bits_t scm_tc16_root;
|
1996-10-01 03:19:14 +00:00
|
|
|
|
|
|
|
|
|
|
#ifndef USE_THREADS
|
|
|
|
|
|
struct scm_root_state *scm_root;
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-10-01 03:19:14 +00:00
|
|
|
|
static SCM
|
2000-12-08 17:32:56 +00:00
|
|
|
|
root_mark (SCM root)
|
1996-10-01 03:19:14 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_root_state *s = SCM_ROOT_STATE (root);
|
1998-07-23 04:47:56 +00:00
|
|
|
|
|
1996-10-01 03:19:14 +00:00
|
|
|
|
scm_gc_mark (s->rootcont);
|
|
|
|
|
|
scm_gc_mark (s->dynwinds);
|
|
|
|
|
|
scm_gc_mark (s->continuation_stack);
|
|
|
|
|
|
scm_gc_mark (s->continuation_stack_ptr);
|
|
|
|
|
|
scm_gc_mark (s->progargs);
|
|
|
|
|
|
scm_gc_mark (s->exitval);
|
|
|
|
|
|
scm_gc_mark (s->cur_inp);
|
|
|
|
|
|
scm_gc_mark (s->cur_outp);
|
|
|
|
|
|
scm_gc_mark (s->cur_errp);
|
|
|
|
|
|
scm_gc_mark (s->def_inp);
|
|
|
|
|
|
scm_gc_mark (s->def_outp);
|
|
|
|
|
|
scm_gc_mark (s->def_errp);
|
1998-06-18 21:54:14 +00:00
|
|
|
|
/* No need to gc mark def_loadp */
|
1997-07-18 14:35:58 +00:00
|
|
|
|
scm_gc_mark (s->fluids);
|
1996-10-01 03:19:14 +00:00
|
|
|
|
return SCM_ROOT_STATE (root) -> parent;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1996-10-01 03:19:14 +00:00
|
|
|
|
|
|
|
|
|
|
static int
|
2000-12-08 17:32:56 +00:00
|
|
|
|
root_print (SCM exp, SCM port, scm_print_state *pstate)
|
1996-10-01 03:19:14 +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 ("#<root ", port);
|
1996-10-01 03:19:14 +00:00
|
|
|
|
scm_intprint(SCM_SEQ (SCM_ROOT_STATE (exp) -> rootcont), 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-10-01 03:19:14 +00:00
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_make_root (SCM parent)
|
1996-10-01 03:19:14 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM root;
|
|
|
|
|
|
scm_root_state *root_state;
|
|
|
|
|
|
|
|
|
|
|
|
root_state = (scm_root_state *) scm_must_malloc (sizeof (scm_root_state),
|
|
|
|
|
|
"scm_make_root");
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (SCM_ROOTP (parent))
|
1996-10-01 03:19:14 +00:00
|
|
|
|
{
|
|
|
|
|
|
memcpy (root_state, SCM_ROOT_STATE (parent), sizeof (scm_root_state));
|
1997-07-18 14:35:58 +00:00
|
|
|
|
scm_copy_fluids (root_state);
|
1996-10-01 03:19:14 +00:00
|
|
|
|
root_state->parent = parent;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
root_state->parent = SCM_BOOL_F;
|
1999-09-25 23:41:09 +00:00
|
|
|
|
|
|
|
|
|
|
/* Initialize everything right now, in case a GC happens early. */
|
|
|
|
|
|
root_state->rootcont
|
|
|
|
|
|
= root_state->dynwinds
|
|
|
|
|
|
= root_state->continuation_stack
|
|
|
|
|
|
= root_state->continuation_stack_ptr
|
|
|
|
|
|
= root_state->progargs
|
|
|
|
|
|
= root_state->exitval
|
|
|
|
|
|
= root_state->cur_inp
|
|
|
|
|
|
= root_state->cur_outp
|
|
|
|
|
|
= root_state->cur_errp
|
|
|
|
|
|
= root_state->def_inp
|
|
|
|
|
|
= root_state->def_outp
|
|
|
|
|
|
= root_state->def_errp
|
|
|
|
|
|
= root_state->cur_loadp
|
|
|
|
|
|
= root_state->fluids
|
|
|
|
|
|
= root_state->handle
|
|
|
|
|
|
= root_state->parent
|
|
|
|
|
|
= SCM_BOOL_F;
|
1996-10-01 03:19:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
SCM_REDEFER_INTS;
|
1999-07-07 09:44:01 +00:00
|
|
|
|
SCM_NEWSMOB (root, scm_tc16_root, root_state);
|
1996-10-01 03:19:14 +00:00
|
|
|
|
root_state->handle = root;
|
|
|
|
|
|
SCM_REALLOW_INTS;
|
|
|
|
|
|
return root;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* __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
|
|
|
|
/* {call-with-dynamic-root}
|
1996-10-01 03:19:14 +00:00
|
|
|
|
*
|
|
|
|
|
|
* Suspending the current thread to evaluate a thunk on the
|
|
|
|
|
|
* same C stack but under a new root.
|
|
|
|
|
|
*
|
* __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
|
|
|
|
* Calls to call-with-dynamic-root return exactly once (unless
|
1997-10-02 15:00:03 +00:00
|
|
|
|
* the process is somehow exitted). */
|
1996-10-01 03:19:14 +00:00
|
|
|
|
|
1996-12-09 02:15:17 +00:00
|
|
|
|
/* Some questions about cwdr:
|
|
|
|
|
|
|
|
|
|
|
|
Couldn't the body just be a closure? Do we really need to pass
|
|
|
|
|
|
args through to it?
|
|
|
|
|
|
|
|
|
|
|
|
The semantics are a lot like catch's; in fact, we call
|
|
|
|
|
|
scm_internal_catch to take care of that part of things. Wouldn't
|
|
|
|
|
|
it be cleaner to say that uncaught throws just disappear into the
|
|
|
|
|
|
ether (or print a message to stderr), and let the caller use catch
|
|
|
|
|
|
themselves if they want to?
|
|
|
|
|
|
|
|
|
|
|
|
-JimB */
|
|
|
|
|
|
|
1996-10-01 03:19:14 +00:00
|
|
|
|
#if 0
|
|
|
|
|
|
SCM scm_exitval; /* INUM with return value */
|
|
|
|
|
|
#endif
|
* validate.h
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]):
new macros.
* unif.h: type renaming:
scm_array -> scm_array_t
scm_array_dim -> scm_array_dim_t
the old names are deprecated, all in-Guile uses changed.
* tags.h (scm_ubits_t): new typedef, representing unsigned
scm_bits_t.
* stacks.h: type renaming:
scm_info_frame -> scm_info_frame_t
scm_stack -> scm_stack_t
the old names are deprecated, all in-Guile uses changed.
* srcprop.h: type renaming:
scm_srcprops -> scm_srcprops_t
scm_srcprops_chunk -> scm_srcprops_chunk_t
the old names are deprecated, all in-Guile uses changed.
* gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c,
rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c,
vectors.c, vports.c, weaks.c:
various int/size_t -> size_t/scm_bits_t changes.
* random.h: type renaming:
scm_rstate -> scm_rstate_t
scm_rng -> scm_rng_t
scm_i_rstate -> scm_i_rstate_t
the old names are deprecated, all in-Guile uses changed.
* procs.h: type renaming:
scm_subr_entry -> scm_subr_entry_t
the old name is deprecated, all in-Guile uses changed.
* options.h (scm_option_t.val): unsigned long -> scm_bits_t.
type renaming:
scm_option -> scm_option_t
the old name is deprecated, all in-Guile uses changed.
* objects.c: various long -> scm_bits_t changes.
(scm_i_make_class_object): flags: unsigned long -> scm_ubits_t
* numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to
SCM_I_FIXNUM_BIT.
* num2integral.i.c: new file, multiply included by numbers.c, used
to "templatize" the various integral <-> num conversion routines.
* numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig,
scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl):
deprecated.
(scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig,
scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big,
scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big,
scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big,
scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big,
scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num,
scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num,
scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int,
scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff,
scm_num2size): new functions.
* modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x
* load.c: change int -> size_t in various places (where the
variable is used to store a string length).
(search-path): call scm_done_free, not scm_done_malloc.
* list.c (scm_ilength): return a scm_bits_t, not long.
some other {int,long} -> scm_bits_t changes.
* hashtab.c: various [u]int -> scm_bits_t changes.
scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef).
(scm_ihashx): n: uint -> scm_bits_t
use scm_bits2num instead of scm_ulong2num.
* gsubr.c: various int -> scm_bits_t changes.
* gh_data.c (gh_scm2double): no loss of precision any more.
* gh.h (gh_str2scm): len: int -> size_t
(gh_{get,set}_substr): start: int -> scm_bits_t,
len: int -> size_t
(gh_<num>2scm): n: int -> scm_bits_t
(gh_*vector_length): return scm_[u]size_t, not unsigned long.
(gh_length): return scm_bits_t, not unsigned long.
* fports.h: type renaming:
scm_fport -> scm_fport_t
the old name is deprecated, all in-Guile uses changed.
* fports.c (fport_fill_input): count: int -> scm_bits_t
(fport_flush): init_size, remaining, count: int -> scm_bits_t
* debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed
those prototypes, as the functions they prototype don't exist.
* fports.c (default_buffer_size): int -> size_t
(scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t
default_size: int -> size_t
(scm_setvbuf): csize: int -> scm_bits_t
* fluids.c (n_fluids): int -> scm_bits_t
(grow_fluids): old_length, i: int -> scm_bits_t
(next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int ->
scm_bits_t
(scm_c_with_fluids): flen, vlen: int -> scm_bits_t
* filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to
the new and shiny SCM_NUM2INT.
* extensions.c: extension -> extension_t (and made a typedef).
* eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so
there are no nasty surprises if/when the various deeply magic tag
bits move somewhere else.
* eval.c: changed the locals used to store results of SCM_IFRAME,
scm_ilength and such to be of type scm_bits_t (and not int/long).
(iqq): depth, edepth: int -> scm_bits_t
(scm_eval_stack): int -> scm_bits_t
(SCM_CEVAL): various vars are not scm_bits_t instead of int.
(check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t
i: int -> scm_bits_t
* environments.c: changed the many calls to scm_ulong2num to
scm_ubits2num.
(import_environment_fold): proc_as_ul: ulong -> scm_ubits_t
* dynwind.c (scm_dowinds): delta: long -> scm_bits_t
* debug.h: type renaming:
scm_debug_info -> scm_debug_info_t
scm_debug_frame -> scm_debug_frame_t
the old names are deprecated, all in-Guile uses changed.
(scm_debug_eframe_size): int -> scm_bits_t
* debug.c (scm_init_debug): use scm_c_define instead of the
deprecated scm_define.
* continuations.h: type renaming:
scm_contregs -> scm_contregs_t
the old name is deprecated, all in-Guile uses changed.
(scm_contregs_t.num_stack_items): size_t -> scm_bits_t
(scm_contregs_t.num_stack_items): ulong -> scm_ubits_t
* continuations.c (scm_make_continuation): change the type of
stack_size form long to scm_bits_t.
* ports.h: type renaming:
scm_port_rw_active -> scm_port_rw_active_t (and made a typedef)
scm_port -> scm_port_t
scm_ptob_descriptor -> scm_ptob_descriptor_t
the old names are deprecated, all in-Guile uses changed.
(scm_port_t.entry): int -> scm_bits_t.
(scm_port_t.line_number): int -> long.
(scm_port_t.putback_buf_size): int -> size_t.
* __scm.h (long_long, ulong_long): deprecated (they pollute the
global namespace and have little value besides that).
(SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an
SCM handle).
(ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they
exist (for size_t & ptrdiff_t)
(scm_sizet): deprecated.
* Makefile.am (noinst_HEADERS): add num2integral.i.c
2001-05-24 00:50:51 +00:00
|
|
|
|
static scm_bits_t n_dynamic_roots = 0;
|
1996-10-01 03:19:14 +00:00
|
|
|
|
|
1996-12-09 02:15:17 +00:00
|
|
|
|
|
1997-10-02 15:00:03 +00:00
|
|
|
|
/* cwdr fills out both of these structures, and then passes a pointer
|
|
|
|
|
|
to them through scm_internal_catch to the cwdr_body and
|
|
|
|
|
|
cwdr_handler functions, to tell them how to behave and to get
|
|
|
|
|
|
information back from them.
|
1996-12-09 02:15:17 +00:00
|
|
|
|
|
|
|
|
|
|
A cwdr is a lot like a catch, except there is no tag (all
|
|
|
|
|
|
exceptions are caught), and the body procedure takes the arguments
|
1997-10-02 15:00:03 +00:00
|
|
|
|
passed to cwdr as A1 and ARGS. The handler is also special since
|
|
|
|
|
|
it is not directly run from scm_internal_catch. It is executed
|
|
|
|
|
|
outside the new dynamic root. */
|
1996-12-09 02:15:17 +00:00
|
|
|
|
|
|
|
|
|
|
struct cwdr_body_data {
|
|
|
|
|
|
/* Arguments to pass to the cwdr body function. */
|
|
|
|
|
|
SCM a1, args;
|
|
|
|
|
|
|
|
|
|
|
|
/* Scheme procedure to use as body of cwdr. */
|
|
|
|
|
|
SCM body_proc;
|
1997-10-02 15:00:03 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
struct cwdr_handler_data {
|
|
|
|
|
|
/* Do we need to run the handler? */
|
|
|
|
|
|
int run_handler;
|
1997-06-23 04:34:34 +00:00
|
|
|
|
|
1997-10-02 15:00:03 +00:00
|
|
|
|
/* The tag and args to pass it. */
|
|
|
|
|
|
SCM tag, args;
|
1996-12-09 02:15:17 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Invoke the body of a cwdr, assuming that the throw handler has
|
|
|
|
|
|
already been set up. DATA points to a struct set up by cwdr that
|
* throw.c (scm_internal_catch): Make body funcs and handler funcs
use separate data pointers, to allow them to be designed
independently and reused.
(scm_body_thunk, scm_handle_by_proc, scm_handle_by_message):
Renamed from catch_body, catch_handler, and uncaught_throw; made
generically useful.
(struct scm_catch_body_data): Renamed from catch_body_data; moved
to throw.h.
(scm_catch): Use the above.
(scm_throw): Don't bother printing a message for an uncaught
throw; we establish a default handler in init.
* throw.h (scm_internal_catch): Prototype updated.
(scm_body_thunk, scm_handle_by_proc, scm_handle_by_message): New
decls.
(struct scm_body_thunk_data): New structure, used as data
argument to scm_body_thunk.
* init.c (struct main_func_closure): New structure, packaging up
the data to pass to the user's main function.
(scm_boot_guile): Create one. Pass it to scm_boot_guile_1.
(scm_boot_guile_1): Pass it through to invoke_main_func. Use
scm_internal_catch to establish a catch-all handler, using
scm_handle_by_message. This replaces the special-case code in
scm_throw.
(invoke_main_func): Body function for scm_internal_catch; invoke
the user's main function, using the main_func_closure pointer to
decide what to pass it.
* root.c (struct cwdr_body_data): Remove handler_proc member.
(cwdr): Use scm_handle_by_proc instead of cwdr_handler.
(cwdr_handler): Removed.
1996-12-21 04:48:21 +00:00
|
|
|
|
says what proc to call, and what args to apply it to.
|
|
|
|
|
|
|
|
|
|
|
|
With a little thought, we could replace this with scm_body_thunk,
|
|
|
|
|
|
but I don't want to mess with that at the moment. */
|
1996-12-09 02:15:17 +00:00
|
|
|
|
static SCM
|
* backtrace.c (display_error_body, display_backtrace_body),
coop-threads.c (scheme_body_bootstrip, c_body_bootstrip),
gh_eval.c (eval_str_wrapper, eval_file_wrapper), init.c
(invoke_main_func), root.c (cwdr_body), throw.c (cwss_body,
scm_body_thunk, hbpca_body): Removed the second jmpbuf arg on body
functions.
1998-02-02 15:00:14 +00:00
|
|
|
|
cwdr_body (void *data)
|
1996-12-09 02:15:17 +00:00
|
|
|
|
{
|
|
|
|
|
|
struct cwdr_body_data *c = (struct cwdr_body_data *) data;
|
|
|
|
|
|
|
|
|
|
|
|
return scm_apply (c->body_proc, c->a1, c->args);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1997-10-02 15:00:03 +00:00
|
|
|
|
/* Record the fact that the body of the cwdr has thrown. Record
|
|
|
|
|
|
enough information to invoke the handler later when the dynamic
|
|
|
|
|
|
root has been deestablished. */
|
1996-12-09 02:15:17 +00:00
|
|
|
|
|
1997-06-23 04:34:34 +00:00
|
|
|
|
static SCM
|
1997-10-02 15:00:03 +00:00
|
|
|
|
cwdr_handler (void *data, SCM tag, SCM args)
|
1997-06-23 04:34:34 +00:00
|
|
|
|
{
|
1997-10-02 15:00:03 +00:00
|
|
|
|
struct cwdr_handler_data *c = (struct cwdr_handler_data *) data;
|
1997-06-23 04:34:34 +00:00
|
|
|
|
|
1997-10-02 15:00:03 +00:00
|
|
|
|
c->run_handler = 1;
|
|
|
|
|
|
c->tag = tag;
|
|
|
|
|
|
c->args = args;
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
1997-06-23 04:34:34 +00:00
|
|
|
|
}
|
1996-10-01 03:19:14 +00:00
|
|
|
|
|
|
|
|
|
|
/* This is the basic code for new root creation.
|
|
|
|
|
|
*
|
|
|
|
|
|
* WARNING! The order of actions in this routine is in many ways
|
|
|
|
|
|
* critical. E. g., it is essential that an error doesn't leave Guile
|
1996-12-09 02:15:17 +00:00
|
|
|
|
* in a messed up state. */
|
1996-10-01 03:19:14 +00:00
|
|
|
|
|
1997-10-02 15:00:03 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_internal_cwdr (scm_catch_body_t body, void *body_data,
|
|
|
|
|
|
scm_catch_handler_t handler, void *handler_data,
|
|
|
|
|
|
SCM_STACKITEM *stack_start)
|
1996-10-01 03:19:14 +00:00
|
|
|
|
{
|
|
|
|
|
|
int old_ints_disabled = scm_ints_disabled;
|
1996-10-05 16:50:27 +00:00
|
|
|
|
SCM old_rootcont, old_winds;
|
1997-10-02 15:00:03 +00:00
|
|
|
|
struct cwdr_handler_data my_handler_data;
|
1996-10-01 03:19:14 +00:00
|
|
|
|
SCM answer;
|
|
|
|
|
|
|
1997-10-02 15:00:03 +00:00
|
|
|
|
/* Create a fresh root continuation. */
|
1996-10-01 03:19:14 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM new_rootcont;
|
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
|
|
|
|
|
1996-10-01 03:19:14 +00:00
|
|
|
|
SCM_REDEFER_INTS;
|
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
|
|
|
|
{
|
* validate.h
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]):
new macros.
* unif.h: type renaming:
scm_array -> scm_array_t
scm_array_dim -> scm_array_dim_t
the old names are deprecated, all in-Guile uses changed.
* tags.h (scm_ubits_t): new typedef, representing unsigned
scm_bits_t.
* stacks.h: type renaming:
scm_info_frame -> scm_info_frame_t
scm_stack -> scm_stack_t
the old names are deprecated, all in-Guile uses changed.
* srcprop.h: type renaming:
scm_srcprops -> scm_srcprops_t
scm_srcprops_chunk -> scm_srcprops_chunk_t
the old names are deprecated, all in-Guile uses changed.
* gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c,
rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c,
vectors.c, vports.c, weaks.c:
various int/size_t -> size_t/scm_bits_t changes.
* random.h: type renaming:
scm_rstate -> scm_rstate_t
scm_rng -> scm_rng_t
scm_i_rstate -> scm_i_rstate_t
the old names are deprecated, all in-Guile uses changed.
* procs.h: type renaming:
scm_subr_entry -> scm_subr_entry_t
the old name is deprecated, all in-Guile uses changed.
* options.h (scm_option_t.val): unsigned long -> scm_bits_t.
type renaming:
scm_option -> scm_option_t
the old name is deprecated, all in-Guile uses changed.
* objects.c: various long -> scm_bits_t changes.
(scm_i_make_class_object): flags: unsigned long -> scm_ubits_t
* numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to
SCM_I_FIXNUM_BIT.
* num2integral.i.c: new file, multiply included by numbers.c, used
to "templatize" the various integral <-> num conversion routines.
* numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig,
scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl):
deprecated.
(scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig,
scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big,
scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big,
scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big,
scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big,
scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num,
scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num,
scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int,
scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff,
scm_num2size): new functions.
* modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x
* load.c: change int -> size_t in various places (where the
variable is used to store a string length).
(search-path): call scm_done_free, not scm_done_malloc.
* list.c (scm_ilength): return a scm_bits_t, not long.
some other {int,long} -> scm_bits_t changes.
* hashtab.c: various [u]int -> scm_bits_t changes.
scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef).
(scm_ihashx): n: uint -> scm_bits_t
use scm_bits2num instead of scm_ulong2num.
* gsubr.c: various int -> scm_bits_t changes.
* gh_data.c (gh_scm2double): no loss of precision any more.
* gh.h (gh_str2scm): len: int -> size_t
(gh_{get,set}_substr): start: int -> scm_bits_t,
len: int -> size_t
(gh_<num>2scm): n: int -> scm_bits_t
(gh_*vector_length): return scm_[u]size_t, not unsigned long.
(gh_length): return scm_bits_t, not unsigned long.
* fports.h: type renaming:
scm_fport -> scm_fport_t
the old name is deprecated, all in-Guile uses changed.
* fports.c (fport_fill_input): count: int -> scm_bits_t
(fport_flush): init_size, remaining, count: int -> scm_bits_t
* debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed
those prototypes, as the functions they prototype don't exist.
* fports.c (default_buffer_size): int -> size_t
(scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t
default_size: int -> size_t
(scm_setvbuf): csize: int -> scm_bits_t
* fluids.c (n_fluids): int -> scm_bits_t
(grow_fluids): old_length, i: int -> scm_bits_t
(next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int ->
scm_bits_t
(scm_c_with_fluids): flen, vlen: int -> scm_bits_t
* filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to
the new and shiny SCM_NUM2INT.
* extensions.c: extension -> extension_t (and made a typedef).
* eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so
there are no nasty surprises if/when the various deeply magic tag
bits move somewhere else.
* eval.c: changed the locals used to store results of SCM_IFRAME,
scm_ilength and such to be of type scm_bits_t (and not int/long).
(iqq): depth, edepth: int -> scm_bits_t
(scm_eval_stack): int -> scm_bits_t
(SCM_CEVAL): various vars are not scm_bits_t instead of int.
(check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t
i: int -> scm_bits_t
* environments.c: changed the many calls to scm_ulong2num to
scm_ubits2num.
(import_environment_fold): proc_as_ul: ulong -> scm_ubits_t
* dynwind.c (scm_dowinds): delta: long -> scm_bits_t
* debug.h: type renaming:
scm_debug_info -> scm_debug_info_t
scm_debug_frame -> scm_debug_frame_t
the old names are deprecated, all in-Guile uses changed.
(scm_debug_eframe_size): int -> scm_bits_t
* debug.c (scm_init_debug): use scm_c_define instead of the
deprecated scm_define.
* continuations.h: type renaming:
scm_contregs -> scm_contregs_t
the old name is deprecated, all in-Guile uses changed.
(scm_contregs_t.num_stack_items): size_t -> scm_bits_t
(scm_contregs_t.num_stack_items): ulong -> scm_ubits_t
* continuations.c (scm_make_continuation): change the type of
stack_size form long to scm_bits_t.
* ports.h: type renaming:
scm_port_rw_active -> scm_port_rw_active_t (and made a typedef)
scm_port -> scm_port_t
scm_ptob_descriptor -> scm_ptob_descriptor_t
the old names are deprecated, all in-Guile uses changed.
(scm_port_t.entry): int -> scm_bits_t.
(scm_port_t.line_number): int -> long.
(scm_port_t.putback_buf_size): int -> size_t.
* __scm.h (long_long, ulong_long): deprecated (they pollute the
global namespace and have little value besides that).
(SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an
SCM handle).
(ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they
exist (for size_t & ptrdiff_t)
(scm_sizet): deprecated.
* Makefile.am (noinst_HEADERS): add num2integral.i.c
2001-05-24 00:50:51 +00:00
|
|
|
|
scm_contregs_t *contregs = scm_must_malloc (sizeof (scm_contregs_t),
|
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
|
|
|
|
"inferior root continuation");
|
|
|
|
|
|
|
|
|
|
|
|
contregs->num_stack_items = 0;
|
|
|
|
|
|
contregs->dynenv = SCM_EOL;
|
|
|
|
|
|
contregs->base = stack_start;
|
|
|
|
|
|
contregs->seq = ++n_dynamic_roots;
|
|
|
|
|
|
contregs->throw_value = SCM_BOOL_F;
|
1996-10-01 03:19:14 +00:00
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
|
|
|
|
contregs->dframe = 0;
|
1996-10-01 03:19:14 +00:00
|
|
|
|
#endif
|
* use an applicable SMOB to represent continuations, instead of a
custom tc7 type. This will make it easier to support R5RS
multiple value continuations, without the use of a Scheme-level
wrapper.
* continuations.c (scm_tc16_continuation, continuation_mark,
continuation_free, continuation_print, continuation_apply):
new SMOB support.
(scm_make_continuation): new procedure, replaces scm_make_cont
with a different interface.
(copy_stack_and_call, scm_dynthrow, scm_init_continuations): rewritten.
(CHEAP_CONTINUATIONS): removed non-working code completely.
(scm_call_continuation): removed.
* continuations.h (struct scm_contregs): add num_stack_items and
stack fields. previously stack was stored following this struct:
use a tail array instead.
(SCM_CONTINUATIONP): new macro.
(SCM_CONTINUATION_LENGTH, SCM_SET_CONTINUATION_LENGTH):
rewritten.
(SCM_SET_CONTREGS): removed.
* tags.h: removed scm_tc7_contin (was tag 61).
* debug.c, gc.c, hash.c, print.c, procprop.c, procs.c:
removed scm_tc7_contin support.
* eval.c: use scm_make_continuation instead of scm_make_cont.
don't set jump buffers here. remove scm_tc7_contin support.
* init.c, root.c: create SMOB continuation for rootcont instead
of scm_tc7_contin. call scm_init_continuations before
scm_init_root.
* root.c: remove support for static jmpbuf. It's not used by
default and I broke it. create SMOB continuation for rootcont.
* stacks.c: use SCM_CONTINUATIONP.
2000-11-25 16:58:25 +00:00
|
|
|
|
SCM_NEWSMOB (new_rootcont, scm_tc16_continuation, contregs);
|
|
|
|
|
|
}
|
1996-10-05 16:50:27 +00:00
|
|
|
|
old_rootcont = scm_rootcont;
|
|
|
|
|
|
scm_rootcont = new_rootcont;
|
1996-10-01 03:19:14 +00:00
|
|
|
|
SCM_REALLOW_INTS;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-10-05 16:50:27 +00:00
|
|
|
|
/* Exit caller's dynamic state.
|
|
|
|
|
|
*/
|
|
|
|
|
|
old_winds = scm_dynwinds;
|
|
|
|
|
|
scm_dowinds (SCM_EOL, scm_ilength (scm_dynwinds));
|
1996-10-01 03:19:14 +00:00
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
1996-11-02 20:54:08 +00:00
|
|
|
|
SCM_DFRAME (old_rootcont) = scm_last_debug_frame;
|
1996-10-05 16:50:27 +00:00
|
|
|
|
scm_last_debug_frame = 0;
|
1996-10-01 03:19:14 +00:00
|
|
|
|
#endif
|
1996-12-09 02:15:17 +00:00
|
|
|
|
|
1997-10-02 15:00:03 +00:00
|
|
|
|
{
|
|
|
|
|
|
my_handler_data.run_handler = 0;
|
* throw.c (scm_internal_catch): Make body funcs and handler funcs
use separate data pointers, to allow them to be designed
independently and reused.
(scm_body_thunk, scm_handle_by_proc, scm_handle_by_message):
Renamed from catch_body, catch_handler, and uncaught_throw; made
generically useful.
(struct scm_catch_body_data): Renamed from catch_body_data; moved
to throw.h.
(scm_catch): Use the above.
(scm_throw): Don't bother printing a message for an uncaught
throw; we establish a default handler in init.
* throw.h (scm_internal_catch): Prototype updated.
(scm_body_thunk, scm_handle_by_proc, scm_handle_by_message): New
decls.
(struct scm_body_thunk_data): New structure, used as data
argument to scm_body_thunk.
* init.c (struct main_func_closure): New structure, packaging up
the data to pass to the user's main function.
(scm_boot_guile): Create one. Pass it to scm_boot_guile_1.
(scm_boot_guile_1): Pass it through to invoke_main_func. Use
scm_internal_catch to establish a catch-all handler, using
scm_handle_by_message. This replaces the special-case code in
scm_throw.
(invoke_main_func): Body function for scm_internal_catch; invoke
the user's main function, using the main_func_closure pointer to
decide what to pass it.
* root.c (struct cwdr_body_data): Remove handler_proc member.
(cwdr): Use scm_handle_by_proc instead of cwdr_handler.
(cwdr_handler): Removed.
1996-12-21 04:48:21 +00:00
|
|
|
|
answer = scm_internal_catch (SCM_BOOL_T,
|
1997-10-02 15:00:03 +00:00
|
|
|
|
body, body_data,
|
|
|
|
|
|
cwdr_handler, &my_handler_data);
|
1996-12-09 02:15:17 +00:00
|
|
|
|
}
|
1997-10-02 15:00:03 +00:00
|
|
|
|
|
1996-10-01 03:19:14 +00:00
|
|
|
|
scm_dowinds (old_winds, - scm_ilength (old_winds));
|
|
|
|
|
|
SCM_REDEFER_INTS;
|
|
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
1996-11-02 20:54:08 +00:00
|
|
|
|
scm_last_debug_frame = SCM_DFRAME (old_rootcont);
|
1996-10-01 03:19:14 +00:00
|
|
|
|
#endif
|
1996-11-02 20:54:08 +00:00
|
|
|
|
scm_rootcont = old_rootcont;
|
1996-10-01 03:19:14 +00:00
|
|
|
|
SCM_REALLOW_INTS;
|
|
|
|
|
|
scm_ints_disabled = old_ints_disabled;
|
1997-10-02 15:00:03 +00:00
|
|
|
|
|
|
|
|
|
|
/* Now run the real handler iff the body did a throw. */
|
|
|
|
|
|
if (my_handler_data.run_handler)
|
|
|
|
|
|
return handler (handler_data, my_handler_data.tag, my_handler_data.args);
|
|
|
|
|
|
else
|
|
|
|
|
|
return answer;
|
1996-10-01 03:19:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1997-10-02 15:00:03 +00:00
|
|
|
|
/* The original CWDR for invoking Scheme code with a Scheme handler. */
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
cwdr (SCM proc, SCM a1, SCM args, SCM handler, SCM_STACKITEM *stack_start)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct cwdr_body_data c;
|
|
|
|
|
|
|
|
|
|
|
|
c.a1 = a1;
|
|
|
|
|
|
c.args = args;
|
|
|
|
|
|
c.body_proc = proc;
|
|
|
|
|
|
|
|
|
|
|
|
return scm_internal_cwdr (cwdr_body, &c,
|
|
|
|
|
|
scm_handle_by_proc, &handler,
|
|
|
|
|
|
stack_start);
|
|
|
|
|
|
}
|
1996-10-01 03:19:14 +00:00
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_call_with_dynamic_root, "call-with-dynamic-root", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM thunk, SCM handler),
|
2000-09-22 13:40:12 +00:00
|
|
|
|
"Evaluate @code{(thunk)} in a new dynamic context, returning its value.\n\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"If an error occurs during evaluation, apply @var{handler} to the\n"
|
|
|
|
|
|
"arguments to the throw, just as @code{throw} would. If this happens,\n"
|
|
|
|
|
|
"@var{handler} is called outside the scope of the new root -- it is\n"
|
|
|
|
|
|
"called in the same dynamic context in which\n"
|
|
|
|
|
|
"@code{call-with-dynamic-root} was evaluated.\n\n"
|
|
|
|
|
|
"If @var{thunk} captures a continuation, the continuation is rooted at\n"
|
|
|
|
|
|
"the call to @var{thunk}. In particular, the call to\n"
|
|
|
|
|
|
"@code{call-with-dynamic-root} is not captured. Therefore,\n"
|
|
|
|
|
|
"@code{call-with-dynamic-root} always returns at most one time.\n\n"
|
|
|
|
|
|
"Before calling @var{thunk}, the dynamic-wind chain is un-wound back to\n"
|
|
|
|
|
|
"the root and a new chain started for @var{thunk}. Therefore, this call\n"
|
|
|
|
|
|
"may not do what you expect:\n\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"@lisp\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
";; Almost certainly a bug:\n"
|
|
|
|
|
|
"(with-output-to-port\n"
|
|
|
|
|
|
" some-port\n\n"
|
|
|
|
|
|
" (lambda ()\n"
|
|
|
|
|
|
" (call-with-dynamic-root\n"
|
|
|
|
|
|
" (lambda ()\n"
|
|
|
|
|
|
" (display 'fnord)\n"
|
|
|
|
|
|
" (newline))\n"
|
|
|
|
|
|
" (lambda (errcode) errcode))))\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"@end lisp\n\n"
|
2000-08-12 23:15:48 +00:00
|
|
|
|
"The problem is, on what port will @samp{fnord} be displayed? You\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"might expect that because of the @code{with-output-to-port} that\n"
|
|
|
|
|
|
"it will be displayed on the port bound to @code{some-port}. But it\n"
|
|
|
|
|
|
"probably won't -- before evaluating the thunk, dynamic winds are\n"
|
|
|
|
|
|
"unwound, including those created by @code{with-output-to-port}.\n"
|
|
|
|
|
|
"So, the standard output port will have been re-set to its default value\n"
|
|
|
|
|
|
"before @code{display} is evaluated.\n\n"
|
|
|
|
|
|
"(This function was added to Guile mostly to help calls to functions in C\n"
|
|
|
|
|
|
"libraries that can not tolerate non-local exits or calls that return\n"
|
|
|
|
|
|
"multiple times. If such functions call back to the interpreter, it should\n"
|
|
|
|
|
|
"be under a new dynamic root.)")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_call_with_dynamic_root
|
1996-10-01 03:19:14 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_STACKITEM stack_place;
|
1996-10-05 16:50:27 +00:00
|
|
|
|
return cwdr (thunk, SCM_EOL, SCM_EOL, handler, &stack_place);
|
1996-10-01 03:19:14 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-10-01 03:19:14 +00:00
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_dynamic_root, "dynamic-root", 0, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(),
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"Return an object representing the current dynamic root.\n\n"
|
|
|
|
|
|
"These objects are only useful for comparison using @code{eq?}.\n"
|
|
|
|
|
|
"They are currently represented as numbers, but your code should\n"
|
|
|
|
|
|
"in no way depend on this.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_dynamic_root
|
1996-10-01 03:19:14 +00:00
|
|
|
|
{
|
|
|
|
|
|
return scm_ulong2num (SCM_SEQ (scm_root->rootcont));
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-10-01 03:19:14 +00:00
|
|
|
|
|
|
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_apply_with_dynamic_root (SCM proc, SCM a1, SCM args, SCM handler)
|
1996-10-01 03:19:14 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_STACKITEM stack_place;
|
1996-10-05 16:50:27 +00:00
|
|
|
|
return cwdr (proc, a1, args, handler, &stack_place);
|
1996-10-01 03:19:14 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-07-18 07:02:57 +00:00
|
|
|
|
#if (SCM_DEBUG_DEPRECATED == 0)
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/* Call thunk(closure) underneath a top-level error handler.
|
|
|
|
|
|
* If an error occurs, pass the exitval through err_filter and return it.
|
|
|
|
|
|
* If no error occurs, return the value of thunk.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef _UNICOS
|
|
|
|
|
|
typedef int setjmp_type;
|
|
|
|
|
|
#else
|
|
|
|
|
|
typedef long setjmp_type;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_call_catching_errors (SCM (*thunk)(), SCM (*err_filter)(), void *closure)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM answer;
|
|
|
|
|
|
setjmp_type i;
|
1996-08-23 01:21:07 +00:00
|
|
|
|
#ifdef DEBUG_EXTENSIONS
|
1996-10-05 16:50:27 +00:00
|
|
|
|
SCM_DFRAME (scm_rootcont) = scm_last_debug_frame;
|
1996-08-23 01:21:07 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
i = setjmp (SCM_JMPBUF (scm_rootcont));
|
1996-08-23 01:21:07 +00:00
|
|
|
|
scm_stack_checking_enabled_p = SCM_STACK_CHECKING_P;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (!i)
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_gc_heap_lock = 0;
|
|
|
|
|
|
answer = thunk (closure);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_gc_heap_lock = 1;
|
|
|
|
|
|
answer = err_filter (scm_exitval, closure);
|
|
|
|
|
|
}
|
|
|
|
|
|
return answer;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-07-18 07:02:57 +00:00
|
|
|
|
#endif /* SCM_DEBUG_DEPRECATED == 0 */
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-10-01 03:19:14 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_init_root ()
|
|
|
|
|
|
{
|
2000-07-18 07:02:57 +00:00
|
|
|
|
scm_tc16_root = scm_make_smob_type ("root", sizeof (struct scm_root_state));
|
2000-12-08 17:32:56 +00:00
|
|
|
|
scm_set_smob_mark (scm_tc16_root, root_mark);
|
|
|
|
|
|
scm_set_smob_print (scm_tc16_root, root_print);
|
2000-07-18 07:02:57 +00:00
|
|
|
|
|
* alist.c, arbiters.c, async.c, backtrace.c, boolean.c, chars.c,
continuations.c, debug-malloc.c, debug.c, dynl.c, dynwind.c,
environments.c, eq.c, error.c, eval.c, evalext.c, feature.c,
filesys.c, fluids.c, fports.c, gc.c, goops.c, guardians.c, hash.c,
hashtab.c, hooks.c, ioext.c, iselect.c, keywords.c, lang.c,
list.c, load.c, macros.c, modules.c, net_db.c, numbers.c,
objects.c, objprop.c, options.c, pairs.c, ports.c, posix.c,
print.c, procprop.c, procs.c, properties.c, ramap.c, random.c,
read.c, regex-posix.c, root.c, scmsigs.c, script.c, simpos.c,
socket.c, sort.c, srcprop.c, stackchk.c, stacks.c, stime.c,
strings.c, strop.c, strorder.c, strports.c, struct.c, symbols.c,
tag.c, threads.c, throw.c, unif.c, variable.c, vectors.c,
version.c, vports.c, weaks.c: Makes sure the snarfer output
inclusion is disabled when the snarfer is run on the file. Thanks
to Lars J. Aas!
* Makefile.am: Install guile-procedures.txt in version-specific
directory to enable multiple installed guile versions. Suggested
by Karl M. Hegbloom <karlheg@debian.org, patch by Matthias Koeppe.
2000-11-17 16:25:05 +00:00
|
|
|
|
#ifndef SCM_MAGIC_SNARFER
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/root.x"
|
* alist.c, arbiters.c, async.c, backtrace.c, boolean.c, chars.c,
continuations.c, debug-malloc.c, debug.c, dynl.c, dynwind.c,
environments.c, eq.c, error.c, eval.c, evalext.c, feature.c,
filesys.c, fluids.c, fports.c, gc.c, goops.c, guardians.c, hash.c,
hashtab.c, hooks.c, ioext.c, iselect.c, keywords.c, lang.c,
list.c, load.c, macros.c, modules.c, net_db.c, numbers.c,
objects.c, objprop.c, options.c, pairs.c, ports.c, posix.c,
print.c, procprop.c, procs.c, properties.c, ramap.c, random.c,
read.c, regex-posix.c, root.c, scmsigs.c, script.c, simpos.c,
socket.c, sort.c, srcprop.c, stackchk.c, stacks.c, stime.c,
strings.c, strop.c, strorder.c, strports.c, struct.c, symbols.c,
tag.c, threads.c, throw.c, unif.c, variable.c, vectors.c,
version.c, vports.c, weaks.c: Makes sure the snarfer output
inclusion is disabled when the snarfer is run on the file. Thanks
to Lars J. Aas!
* Makefile.am: Install guile-procedures.txt in version-specific
directory to enable multiple installed guile versions. Suggested
by Karl M. Hegbloom <karlheg@debian.org, patch by Matthias Koeppe.
2000-11-17 16:25:05 +00:00
|
|
|
|
#endif
|
1996-10-01 03:19:14 +00:00
|
|
|
|
}
|
2000-03-19 19:01:16 +00:00
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
Local Variables:
|
|
|
|
|
|
c-file-style: "gnu"
|
|
|
|
|
|
End:
|
|
|
|
|
|
*/
|