2001-03-17 12:20:36 +00:00
|
|
|
|
/* Debugging extensions for Guile
|
Remove "compiled closures" ("cclos") in favor of a simpler mechanism.
The idea is to introduce `gsubrs' whose arity is encoded in their type
(more precisely in the sizeof (void *) - 8 MSBs). This removes the
indirection introduced by cclos and simplifies the code.
* libguile/__scm.h (CCLO): Remove.
* libguile/debug.c (scm_procedure_source, scm_procedure_environment):
Remove references to `scm_tc7_cclo'.
* libguile/eval.c (scm_trampoline_0, scm_trampoline_1,
scm_trampoline_2): Replace `scm_tc7_cclo' with `scm_tc7_gsubr'.
* libguile/eval.i.c (CEVAL): Likewise. No longer make PROC the first
argument. Directly invoke `scm_gsubr_apply ()' instead of jump to the
`evap(N+1)' label or call to `SCM_APPLY ()'.
* libguile/evalext.c (scm_self_evaluating_p): Remove reference to
`scm_tc7_cclo'.
* libguile/gc-card.c (scm_i_sweep_card, scm_i_tag_name): Likewise.
* libguile/gc-mark.c (scm_gc_mark_dependencies): Likewise.
* libguile/goops.c (scm_class_of): Likewise.
* libguile/print.c (iprin1): Likewise.
* libguile/gsubr.c (create_gsubr): Use `unsigned int's for REQ, OPT and
RST. Use `scm_tc7_gsubr' instead of `scm_makcclo ()' in the default
case.
(scm_gsubr_apply): Remove calls to `SCM_GSUBR_PROC ()'.
(scm_f_gsubr_apply): Remove.
* libguile/gsubr.h (SCM_GSUBR_TYPE): New definition.
(SCM_GSUBR_MAX): Changed to 33.
(SCM_SET_GSUBR_TYPE, SCM_GSUBR_PROC, SCM_SET_GSUBR_PROC,
scm_f_gsubr_apply): Remove.
* libguile/procprop.c (scm_i_procedure_arity): Remove reference to
`scm_tc7_cclo'; add proper handling of `scm_tc7_gsubr'.
* libguile/procs.c (scm_makcclo, scm_make_cclo): Remove.
(scm_procedure_p): Remove reference to `scm_tc7_cclo'.
(scm_thunk_p): Likewise, plus add proper `scm_tc7_gsubr' handling.
* libguile/procs.h (SCM_CCLO_LENGTH, SCM_MAKE_CCLO_TAG,
SCM_SET_CCLO_LENGTH, SCM_CCLO_BASE, SCM_SET_CCLO_BASE, SCM_CCLO_REF,
SCM_CCLO_SET, SCM_CCLO_SUBR, SCM_SET_CCLO_SUBR, scm_makcclo,
scm_make_cclo): Remove.
* libguile/stacks.c (read_frames): Remove reference to `scm_f_gsubr_apply'.
* libguile/tags.h (scm_tc7_cclo): Remove.
(scm_tc7_gsubr): New.
(scm_tcs_subrs): Add `scm_tc7_gsubr'.
2009-02-16 00:24:00 +01:00
|
|
|
|
* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2006, 2008, 2009 Free Software Foundation
|
1996-09-12 23:39:37 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
|
|
|
|
* as published by the Free Software Foundation; either version 3 of
|
|
|
|
|
|
* the License, or (at your option) any later version.
|
1996-09-12 23:39:37 +00:00
|
|
|
|
*
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* This library is distributed in the hope that it will be useful, but
|
|
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
|
* Lesser General Public License for more details.
|
1996-09-12 23:39:37 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
|
* License along with this library; if not, write to the Free Software
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
|
|
* 02110-1301 USA
|
2003-04-05 19:15:35 +00:00
|
|
|
|
*/
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
2008-09-13 15:35:27 +02:00
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
|
# include <config.h>
|
|
|
|
|
|
#endif
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
2009-03-27 15:44:17 -07:00
|
|
|
|
#ifdef HAVE_GETRLIMIT
|
|
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
|
#include <sys/resource.h>
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/_scm.h"
|
2005-03-07 21:33:18 +00:00
|
|
|
|
#include "libguile/async.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/eval.h"
|
2001-10-11 22:26:25 +00:00
|
|
|
|
#include "libguile/list.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/stackchk.h"
|
|
|
|
|
|
#include "libguile/throw.h"
|
|
|
|
|
|
#include "libguile/macros.h"
|
|
|
|
|
|
#include "libguile/smob.h"
|
|
|
|
|
|
#include "libguile/procprop.h"
|
|
|
|
|
|
#include "libguile/srcprop.h"
|
|
|
|
|
|
#include "libguile/alist.h"
|
|
|
|
|
|
#include "libguile/continuations.h"
|
|
|
|
|
|
#include "libguile/strports.h"
|
|
|
|
|
|
#include "libguile/read.h"
|
|
|
|
|
|
#include "libguile/feature.h"
|
|
|
|
|
|
#include "libguile/dynwind.h"
|
|
|
|
|
|
#include "libguile/modules.h"
|
|
|
|
|
|
#include "libguile/ports.h"
|
|
|
|
|
|
#include "libguile/root.h"
|
2000-06-30 16:14:56 +00:00
|
|
|
|
#include "libguile/fluids.h"
|
2003-02-05 19:04:40 +00:00
|
|
|
|
#include "libguile/objects.h"
|
2009-02-02 23:00:36 +01:00
|
|
|
|
#include "libguile/programs.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
|
|
|
|
|
|
#include "libguile/validate.h"
|
|
|
|
|
|
#include "libguile/debug.h"
|
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
* private-options.h: new file: contain hardcoded option
definitions.
2007-01-22 15:14:40 +00:00
|
|
|
|
|
|
|
|
|
|
#include "libguile/private-options.h"
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
|
|
|
|
|
|
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
* private-options.h: new file: contain hardcoded option
definitions.
2007-01-22 15:14:40 +00:00
|
|
|
|
|
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),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Option interface for the debug options. Instead of using\n"
|
|
|
|
|
|
"this procedure directly, use the procedures @code{debug-enable},\n"
|
2002-03-15 09:40:57 +00:00
|
|
|
|
"@code{debug-disable}, @code{debug-set!} and @code{debug-options}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_debug_options
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM ans;
|
2005-03-07 21:33:18 +00:00
|
|
|
|
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_begin (0);
|
|
|
|
|
|
scm_dynwind_critical_section (SCM_BOOL_F);
|
2005-03-07 21:33:18 +00:00
|
|
|
|
|
2007-01-19 19:26:36 +00:00
|
|
|
|
ans = scm_options (setting, scm_debug_opts, FUNC_NAME);
|
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
|
|
|
|
{
|
2007-01-19 19:26:36 +00:00
|
|
|
|
scm_options (ans, scm_debug_opts, FUNC_NAME);
|
2000-01-07 23:53:20 +00:00
|
|
|
|
SCM_OUT_OF_RANGE (1, setting);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
1996-08-23 01:19:03 +00:00
|
|
|
|
SCM_RESET_DEBUG_MODE;
|
2008-09-01 23:54:15 -07:00
|
|
|
|
#ifdef STACK_CHECKING
|
1998-11-13 15:58:00 +00:00
|
|
|
|
scm_stack_checking_enabled_p = SCM_STACK_CHECKING_P;
|
2008-09-01 23:54:15 -07:00
|
|
|
|
#endif
|
1996-08-23 01:19:03 +00:00
|
|
|
|
scm_debug_eframe_size = 2 * SCM_N_FRAMES;
|
2005-03-07 21:33:18 +00:00
|
|
|
|
|
2006-01-29 00:23:28 +00:00
|
|
|
|
scm_dynwind_end ();
|
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
|
|
|
|
|
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
* private-options.h: new file: contain hardcoded option
definitions.
2007-01-22 15:14:40 +00:00
|
|
|
|
|
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)
|
|
|
|
|
|
{
|
2004-03-28 13:55:03 +00:00
|
|
|
|
SCM thunk = SCM_PACK ((scm_t_bits) data);
|
2001-06-26 15:46:40 +00:00
|
|
|
|
return scm_call_0 (thunk);
|
1998-08-21 08:13:36 +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
|
|
|
|
|
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),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Call @var{thunk} with traps enabled.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#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;
|
2002-07-20 14:08:34 +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,
|
2000-04-07 10:41:39 +00:00
|
|
|
|
(void *) SCM_UNPACK (thunk),
|
1998-08-21 08:13:36 +00:00
|
|
|
|
&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
|
|
|
|
|
|
|
|
|
|
|
2000-12-11 14:48:23 +00:00
|
|
|
|
SCM_SYMBOL (scm_sym_procname, "procname");
|
|
|
|
|
|
SCM_SYMBOL (scm_sym_dots, "...");
|
|
|
|
|
|
SCM_SYMBOL (scm_sym_source, "source");
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
|
|
|
|
|
/* {Memoized Source}
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2001-06-14 19:50:43 +00:00
|
|
|
|
scm_t_bits 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
|
2000-12-08 17:32:56 +00:00
|
|
|
|
memoized_print (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
|
|
|
|
scm_iprin1 (SCM_MEMOIZED_EXP (obj), port, pstate);
|
* 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),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Return @code{#t} if @var{obj} is memoized.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_memoized_p
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
2004-07-06 10:59:25 +00:00
|
|
|
|
return scm_from_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. */
|
2005-03-24 07:30:19 +00:00
|
|
|
|
SCM_RETURN_NEWSMOB (scm_tc16_memoized, SCM_UNPACK (scm_cons (exp, env)));
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
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-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
|
|
|
|
*/
|
|
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/variable.h"
|
|
|
|
|
|
#include "libguile/procs.h"
|
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),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Return a new memoized cons cell with @var{car} and @var{cdr}\n"
|
|
|
|
|
|
"as members and @var{env} as the environment.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#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",
|
2001-10-11 22:26:25 +00:00
|
|
|
|
scm_list_2 (car, env));
|
1998-03-30 21:02:59 +00:00
|
|
|
|
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",
|
2001-10-11 22:26:25 +00:00
|
|
|
|
scm_list_2 (cdr, env));
|
1998-03-30 21:02:59 +00:00
|
|
|
|
else
|
|
|
|
|
|
env = SCM_MEMOIZED_ENV (cdr);
|
|
|
|
|
|
cdr = SCM_MEMOIZED_EXP (cdr);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (SCM_UNBNDP (env))
|
2000-06-21 02:46:01 +00:00
|
|
|
|
env = scm_top_level_env (SCM_TOP_LEVEL_LOOKUP_CLOSURE);
|
1998-03-30 21:02:59 +00:00
|
|
|
|
else
|
2002-07-20 14:08:34 +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),
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
"Convert a memoized object (which must represent a body)\n"
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"to a procedure.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_mem_to_proc
|
1998-03-30 21:02:59 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM env;
|
2002-07-20 14:08:34 +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);
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
return scm_closure (obj, env);
|
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_proc_to_mem, "proc->mem", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM obj),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Convert a procedure to a memoized object.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#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);
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
return scm_make_memoized (SCM_CODE (obj), SCM_ENV (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
|
|
|
|
|
|
|
|
|
|
#endif /* GUILE_DEBUG */
|
|
|
|
|
|
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
SCM_DEFINE (scm_i_unmemoize_expr, "unmemoize-expr", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM m),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Unmemoize the memoized expression @var{m},")
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
#define FUNC_NAME s_scm_i_unmemoize_expr
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VALIDATE_MEMOIZED (1, m);
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
return scm_i_unmemocopy_expr (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),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Return the environment of the memoized expression @var{m}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_memoized_environment
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
2002-07-20 14:08:34 +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),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Return the name of the procedure @var{proc}")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_procedure_name
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
2002-07-20 14:08:34 +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:
|
2009-06-19 11:20:34 +02:00
|
|
|
|
return SCM_SUBR_NAME (proc);
|
1999-03-12 08:06:49 +00:00
|
|
|
|
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... */
|
2002-01-10 20:52:45 +00:00
|
|
|
|
SCM name = scm_source_property (SCM_CAR (SCM_CLOSURE_BODY (proc)), scm_sym_procname);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (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
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (name) && SCM_CLOSUREP (proc))
|
1999-07-29 21:11:37 +00:00
|
|
|
|
name = scm_reverse_lookup (SCM_ENV (proc), proc);
|
2009-02-02 23:00:36 +01:00
|
|
|
|
if (scm_is_false (name) && SCM_PROGRAM_P (proc))
|
|
|
|
|
|
name = scm_program_name (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),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Return the source of the procedure @var{proc}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_procedure_source
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VALIDATE_NIM (1, proc);
|
2003-02-05 19:04:40 +00:00
|
|
|
|
again:
|
1996-08-20 17:08:46 +00:00
|
|
|
|
switch (SCM_TYP7 (proc)) {
|
|
|
|
|
|
case scm_tcs_closures:
|
|
|
|
|
|
{
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
const SCM formals = SCM_CLOSURE_FORMALS (proc);
|
|
|
|
|
|
const SCM body = SCM_CLOSURE_BODY (proc);
|
|
|
|
|
|
const SCM src = scm_source_property (body, scm_sym_copy);
|
|
|
|
|
|
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (src))
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
{
|
|
|
|
|
|
return scm_cons2 (scm_sym_lambda, formals, src);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
const SCM env = SCM_EXTEND_ENV (formals, SCM_EOL, SCM_ENV (proc));
|
|
|
|
|
|
return scm_cons2 (scm_sym_lambda,
|
|
|
|
|
|
scm_i_finite_list_copy (formals),
|
* backtrace.c (display_expression, display_frame): Call
scm_i_unmemoize_expr for unmemoizing a memoized object holding a
single memoized expression.
* debug.c (memoized_print): Don't try to unmemoize the memoized
object, since we can't know whether it holds a single expression
or a body.
(scm_mem_to_proc): Removed check for lambda expression, since it
was moot anyway. Whoever uses these functions for debugging
purposes should know what they do: Creating invalid memoized code
will cause crashes, independent of whether this check is present
or not.
(scm_proc_to_mem): Take the closure's code as it is and don't
append a SCM_IM_LAMBDA isym. To allow easier debugging, the
memoized code should not be modified.
* debug.[ch] (scm_unmemoize, scm_i_unmemoize_expr): Removed
scm_unmemoize from public use, but made scm_i_unmemoize_expr
available as a guile internal function instead. However,
scm_i_unmemoize_expr will only work on memoized objects that hold
a single memoized expression. It won't work with bodies.
* debug.c (scm_procedure_source), macros.c (macro_print), print.c
(scm_iprin1): Call scm_i_unmemocopy_body for unmemoizing a body,
i. e. a list of expressions.
* eval.c (unmemoize_exprs): Drop internal body markers from the
output during unmemoization.
* eval.[ch] (scm_unmemocopy, scm_i_unmemocopy_expr,
scm_i_unmemocopy_body): Removed scm_unmemocopy from public use,
but made scm_i_unmemocopy_expr and scm_i_unmemocopy_body available
as guile internal functions instead. scm_i_unmemoize_expr will
only work on a single memoized expression, while
scm_i_unmemocopy_body will only work on bodies.
2004-06-27 12:34:54 +00:00
|
|
|
|
scm_i_unmemocopy_body (body, env));
|
* list.[ch] (scm_i_finite_list_copy): New internal function to
copy lists that are known to be finite (though not necessarily
proper).
* debug.c (scm_procedure_source): Don't have scm_unmemocopy treat
a closure's argument list like an expression of a body.
* eval.c (unmemoize_expression, unmemoize_exprs, unmemoize_and,
unmemoize_begin, unmemoize_case, unmemoize_cond, unmemoize_delay,
unmemoize_do, unmemoize_if, unmemoize_lambda, unmemoize_let,
unmemoize_letrec, unmemoize_letstar, unmemoize_or,
unmemoize_set_x, unmemoize_apply, unmemoize_atcall_cc,
unmemoize_at_call_with_values, unmemoize_future, sym_atslot_ref,
unmemoize_atslot_ref, sym_atslot_set_x, unmemoize_atslot_set_x,
unmemoize_builtin_macro): New static functions and symbols.
(scm_unmemocopy): Rewritten in terms of the above. scm_unmemocopy
now has a slightly different meaning: The memoized form that is
receives as its argument is now interpreted as a sequence of
expressions from a body.
(unmemocar, scm_unmemocar): Since the whole functionality of
unmemocar and scm_unmemocar is not needed any more, scm_unmemocar
has its old content back and is deprecated, while unmemocar has
been removed.
(SCM_BIT7): Removed.
(CEVAL): For unmemoizing a single expression, call
unmemoize_expression instead of scm_unmemocopy, which now expects
a sequence of body expressions. Eliminated unnecessary empty
environment frame when executing let* forms. Eliminated
unmemoization step from evaluator.
2004-06-06 07:46:18 +00:00
|
|
|
|
}
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
2003-02-05 19:04:40 +00:00
|
|
|
|
case scm_tcs_struct:
|
|
|
|
|
|
if (!SCM_I_OPERATORP (proc))
|
|
|
|
|
|
break;
|
|
|
|
|
|
goto procprop;
|
|
|
|
|
|
case scm_tc7_smob:
|
|
|
|
|
|
if (!SCM_SMOB_DESCRIPTOR (proc).apply)
|
|
|
|
|
|
break;
|
1996-08-20 17:08:46 +00:00
|
|
|
|
case scm_tcs_subrs:
|
programs have their own tc7 now
* libguile/tags.h (scm_tc7_program):
* libguile/programs.h: Programs now have their own tc7 code. Fix up the
macros appropriately.
* libguile/programs.c: Remove smobby bits, leaving marking, printing,
and application for other parts of Guile.
* libguile/debug.c (scm_procedure_source):
* libguile/eval.c (scm_trampoline_0, scm_trampoline_1)
(scm_trampoline_2): Add cases for tc7_program.
* libguile/eval.i.c (CEVAL, SCM_APPLY):
* libguile/evalext.c (scm_self_evaluating_p):
* libguile/gc-card.c (scm_i_sweep_card, scm_i_tag_name):
* libguile/gc-mark.c (1):
* libguile/print.c (iprin1):
* libguile/procs.c (scm_procedure_p, scm_thunk_p)
* libguile/vm-i-system.c (make-closure): Adapt to new procedure
representation.
* libguile/procprop.c (scm_i_procedure_arity): Do the right thing for
programs.
* test-suite/tests/procprop.test ("procedure-arity"): Arity test now
succeeds.
* libguile/goops.c (scm_class_of): Programs now belong to the class
<procedure>, not a smob class.
* libguile/vm.h (struct vm, struct vm_cont):
* libguile/vm-engine.c (vm_engine):
* libguile/frames.h (SCM_FRAME_BYTE_CAST, struct vm_frame):
* libguile/frames.c (scm_c_make_vm_frame): Fix usages of scm_byte_t,
changing them to scm_t_uint8.
2009-08-20 14:27:38 +02:00
|
|
|
|
case scm_tc7_program:
|
2003-02-05 19:04:40 +00:00
|
|
|
|
procprop:
|
1996-08-20 17:08:46 +00:00
|
|
|
|
/* 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);
|
2003-02-05 19:04:40 +00:00
|
|
|
|
case scm_tc7_pws:
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM src = scm_procedure_property (proc, scm_sym_source);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (src))
|
2003-02-05 19:04:40 +00:00
|
|
|
|
return src;
|
|
|
|
|
|
proc = SCM_PROCEDURE (proc);
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
1996-08-20 17:08:46 +00:00
|
|
|
|
default:
|
2003-02-05 19:04:40 +00:00
|
|
|
|
;
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
2003-02-05 19:04:40 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (1, proc);
|
|
|
|
|
|
return SCM_BOOL_F; /* not reached */
|
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_environment, "procedure-environment", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM proc),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Return the environment of the procedure @var{proc}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_procedure_environment
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
2002-07-20 14:08:34 +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_tcs_subrs:
|
|
|
|
|
|
return SCM_EOL;
|
|
|
|
|
|
default:
|
2001-03-04 22:48:13 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (1, proc);
|
|
|
|
|
|
/* not reached */
|
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
|
|
|
|
|
2009-03-29 17:15:25 -07:00
|
|
|
|
SCM_DEFINE (scm_procedure_module, "procedure-module", 1, 0, 0,
|
|
|
|
|
|
(SCM proc),
|
2009-04-15 17:02:33 +02:00
|
|
|
|
"Return the module that was current when @var{proc} was defined.")
|
2009-03-29 17:15:25 -07:00
|
|
|
|
#define FUNC_NAME s_scm_procedure_module
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_VALIDATE_PROC (SCM_ARG1, proc);
|
|
|
|
|
|
|
|
|
|
|
|
if (scm_is_true (scm_program_p (proc)))
|
|
|
|
|
|
return scm_program_module (proc);
|
|
|
|
|
|
else
|
2009-04-15 17:02:33 +02:00
|
|
|
|
return scm_env_module (scm_procedure_environment (proc));
|
2009-03-29 17:15:25 -07:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
|
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-08-11 08:42:42 +00:00
|
|
|
|
SCM_VALIDATE_MEMOIZED (1, exp);
|
|
|
|
|
|
return scm_i_eval_x (SCM_MEMOIZED_EXP (exp), SCM_MEMOIZED_ENV (exp));
|
1996-10-17 23:32:40 +00:00
|
|
|
|
}
|
2000-08-11 08:42:42 +00:00
|
|
|
|
return scm_i_eval (exp, env);
|
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
|
|
|
|
|
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)
|
|
|
|
|
|
{
|
2004-09-22 17:41:37 +00:00
|
|
|
|
while (scm_is_pair (env) && scm_is_pair (SCM_CAR (env)))
|
1999-07-29 21:11:37 +00:00
|
|
|
|
{
|
2001-03-30 15:03:23 +00:00
|
|
|
|
SCM names = SCM_CAAR (env);
|
|
|
|
|
|
SCM values = SCM_CDAR (env);
|
2004-09-22 17:41:37 +00:00
|
|
|
|
while (scm_is_pair (names))
|
1999-07-29 21:11:37 +00:00
|
|
|
|
{
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (SCM_CAR (values), data))
|
1999-07-29 21:11:37 +00:00
|
|
|
|
return SCM_CAR (names);
|
|
|
|
|
|
names = SCM_CDR (names);
|
|
|
|
|
|
values = SCM_CDR (values);
|
|
|
|
|
|
}
|
2004-09-22 17:41:37 +00:00
|
|
|
|
if (!scm_is_null (names) && scm_is_eq (values, data))
|
1999-07-29 21:11:37 +00:00
|
|
|
|
return names;
|
|
|
|
|
|
env = SCM_CDR (env);
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2008-09-26 12:03:36 +02:00
|
|
|
|
SCM_DEFINE (scm_sys_start_stack, "%start-stack", 2, 0, 0,
|
|
|
|
|
|
(SCM id, SCM thunk),
|
|
|
|
|
|
"Call @var{thunk} on an evaluator stack tagged with @var{id}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_start_stack
|
1996-10-14 03:25:21 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM answer;
|
2001-06-14 19:50:43 +00:00
|
|
|
|
scm_t_debug_frame vframe;
|
|
|
|
|
|
scm_t_debug_info vframe_vect_body;
|
2005-03-02 20:42:01 +00:00
|
|
|
|
vframe.prev = scm_i_last_debug_frame ();
|
1998-06-07 02:11:28 +00:00
|
|
|
|
vframe.status = SCM_VOIDFRAME;
|
|
|
|
|
|
vframe.vect = &vframe_vect_body;
|
|
|
|
|
|
vframe.vect[0].id = id;
|
2005-03-02 20:42:01 +00:00
|
|
|
|
scm_i_set_last_debug_frame (&vframe);
|
2008-09-26 12:03:36 +02:00
|
|
|
|
answer = scm_call_0 (thunk);
|
2005-03-02 20:42:01 +00:00
|
|
|
|
scm_i_set_last_debug_frame (vframe.prev);
|
1998-06-07 02:11:28 +00:00
|
|
|
|
return answer;
|
|
|
|
|
|
}
|
2001-03-17 12:20:36 +00:00
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
1996-08-20 17:08:46 +00:00
|
|
|
|
/* {Debug Objects}
|
|
|
|
|
|
*
|
|
|
|
|
|
* The debugging evaluator throws these on frame traps.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2001-06-14 19:50:43 +00:00
|
|
|
|
scm_t_bits scm_tc16_debugobj;
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
|
|
|
|
|
static int
|
2001-06-07 21:12:19 +00:00
|
|
|
|
debugobj_print (SCM obj, SCM port, scm_print_state *pstate SCM_UNUSED)
|
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);
|
2001-10-11 22:26:25 +00:00
|
|
|
|
scm_intprint ((long) 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),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Return @code{#t} if @var{obj} is a debug object.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_debug_object_p
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
2004-07-06 10:59:25 +00:00
|
|
|
|
return scm_from_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
|
2001-06-14 19:50:43 +00:00
|
|
|
|
scm_make_debugobj (scm_t_debug_frame *frame)
|
1996-08-20 17:08:46 +00:00
|
|
|
|
{
|
Changes in doc/ref:
* api.txt, data-rep.texi: Renamed the struct scm_cell to
scm_t_cell.
* data-rep.texi: Renamed scm_alloc_cell to scm_cell and
scm_alloc_double_cell to scm_double_cell.
Changes in libguile:
* gc.c (SCM_HEAP_SEG_SIZE, CELL_UP, CELL_DN, NEXT_DATA_CELL,
init_heap_seg, alloc_some_heap), gc.h (struct scm_cell, struct
scm_t_cell, SCM_CELLPTR, SCM_GC_CARD_SIZE,
SCM_GC_IN_CARD_HEADERP), tags.h (SCM_CELLP): Renamed the struct
scm_cell and all its uses to scm_t_cell in accordance to Guile's
naming scheme for types.
* alist.c (scm_acons), convert.i.c (CTYPES2UVECT,
CTYPES2UVECT_OPTIONAL), coop-threads.c (scm_call_with_new_thread,
scm_spawn_thread), debug.c (scm_make_debugobj), environments.c
(scm_make_environment), eval.c (scm_closure), fports.c
(scm_fdes_to_port), gc.c (scm_deprecated_newcell,
scm_deprecated_newcell2), inline.h (scm_alloc_cell, scm_cell),
list.c (SCM_I_CONS), numbers.c (scm_i_mkbig), pairs.c (scm_cons),
ports.c (scm_void_port), procs.c (scm_c_make_subr, scm_makcclo),
smob.c (scm_make_smob), smob.h (SCM_NEWSMOB), strings.c
(scm_take_str, scm_allocate_string), strports.c (scm_mkstrport),
unif.c (scm_make_uve), variable.c (make_variable), vectors.c
(scm_c_make_vector), vports.c (scm_make_soft_port): Renamed
scm_alloc_cell to scm_cell.
* environments.c (core_environments_observe), gc.c
(scm_deprecated_newcell2), goops.c (wrap_init, scm_wrap_object),
inline.h (scm_alloc_double_cell, scm_double_cell), num2float.i.c
(FLOAT2NUM), numbers.c (scm_make_real), procs.c
(scm_make_procedure_with_setter), smob.h (SCM_NEWSMOB2,
SCM_NEWSMOB3), struct.c (scm_make_struct, scm_make_vtable_vtable),
symbols.c (scm_mem2symbol, scm_mem2uninterned_symbol), weaks.c
(allocate_weak_vector): Renamed scm_alloc_double_cell to
scm_double_cell.
2002-03-01 00:19:20 +00:00
|
|
|
|
return scm_cell (scm_tc16_debugobj, (scm_t_bits) frame);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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),
|
(scm_with_traps, scm_memoized_p, scm_make_gloc, scm_gloc_p,
scm_make_iloc, scm_iloc_p, scm_memcons, scm_mem_to_proc,
scm_proc_to_mem, scm_unmemoize, scm_memoized_environment,
scm_procedure_name, scm_procedure_source, scm_procedure_environment,
scm_debug_hang): Added docstrings.
2001-02-16 15:00:41 +00:00
|
|
|
|
"Go into an endless loop, which can be only terminated with\n"
|
|
|
|
|
|
"a debugger.")
|
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
|
|
|
|
|
2009-03-27 15:44:17 -07:00
|
|
|
|
static void
|
|
|
|
|
|
init_stack_limit (void)
|
|
|
|
|
|
{
|
|
|
|
|
|
#ifdef HAVE_GETRLIMIT
|
|
|
|
|
|
struct rlimit lim;
|
|
|
|
|
|
if (getrlimit (RLIMIT_STACK, &lim) == 0)
|
|
|
|
|
|
{
|
2009-04-03 10:38:30 -07:00
|
|
|
|
rlim_t bytes = lim.rlim_cur;
|
2009-03-27 15:44:17 -07:00
|
|
|
|
|
2009-04-03 10:38:30 -07:00
|
|
|
|
/* set our internal stack limit to 80% of the rlimit. */
|
2009-03-27 15:44:17 -07:00
|
|
|
|
if (bytes == RLIM_INFINITY)
|
|
|
|
|
|
bytes = lim.rlim_max;
|
|
|
|
|
|
|
2009-04-03 10:38:30 -07:00
|
|
|
|
if (bytes != RLIM_INFINITY)
|
|
|
|
|
|
SCM_STACK_LIMIT = bytes * 8 / 10 / sizeof (scm_t_bits);
|
2009-03-27 15:44:17 -07:00
|
|
|
|
}
|
|
|
|
|
|
errno = 0;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-11-02 20:53:18 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-08-20 17:08:46 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_init_debug ()
|
|
|
|
|
|
{
|
2009-03-27 15:44:17 -07:00
|
|
|
|
init_stack_limit ();
|
2007-01-19 19:26:36 +00:00
|
|
|
|
scm_init_opts (scm_debug_options, scm_debug_opts);
|
1996-09-12 23:39:37 +00:00
|
|
|
|
|
2000-12-08 17:32:56 +00:00
|
|
|
|
scm_tc16_memoized = scm_make_smob_type ("memoized", 0);
|
|
|
|
|
|
scm_set_smob_print (scm_tc16_memoized, memoized_print);
|
1999-07-07 09:44:01 +00:00
|
|
|
|
|
2000-12-08 17:32:56 +00:00
|
|
|
|
scm_tc16_debugobj = scm_make_smob_type ("debug-object", 0);
|
|
|
|
|
|
scm_set_smob_print (scm_tc16_debugobj, debugobj_print);
|
1996-08-20 17:08:46 +00:00
|
|
|
|
|
1998-03-30 21:02:59 +00:00
|
|
|
|
#ifdef GUILE_DEBUG
|
* 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_c_define ("SCM_IM_AND", SCM_IM_AND);
|
|
|
|
|
|
scm_c_define ("SCM_IM_BEGIN", SCM_IM_BEGIN);
|
|
|
|
|
|
scm_c_define ("SCM_IM_CASE", SCM_IM_CASE);
|
|
|
|
|
|
scm_c_define ("SCM_IM_COND", SCM_IM_COND);
|
|
|
|
|
|
scm_c_define ("SCM_IM_DO", SCM_IM_DO);
|
|
|
|
|
|
scm_c_define ("SCM_IM_IF", SCM_IM_IF);
|
|
|
|
|
|
scm_c_define ("SCM_IM_LAMBDA", SCM_IM_LAMBDA);
|
|
|
|
|
|
scm_c_define ("SCM_IM_LET", SCM_IM_LET);
|
|
|
|
|
|
scm_c_define ("SCM_IM_LETSTAR", SCM_IM_LETSTAR);
|
|
|
|
|
|
scm_c_define ("SCM_IM_LETREC", SCM_IM_LETREC);
|
|
|
|
|
|
scm_c_define ("SCM_IM_OR", SCM_IM_OR);
|
|
|
|
|
|
scm_c_define ("SCM_IM_QUOTE", SCM_IM_QUOTE);
|
|
|
|
|
|
scm_c_define ("SCM_IM_SET_X", SCM_IM_SET_X);
|
|
|
|
|
|
scm_c_define ("SCM_IM_DEFINE", SCM_IM_DEFINE);
|
|
|
|
|
|
scm_c_define ("SCM_IM_APPLY", SCM_IM_APPLY);
|
|
|
|
|
|
scm_c_define ("SCM_IM_CONT", SCM_IM_CONT);
|
|
|
|
|
|
scm_c_define ("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");
|
|
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/debug.x"
|
1996-08-20 17:08:46 +00:00
|
|
|
|
}
|
2000-03-19 19:01:16 +00:00
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
Local Variables:
|
|
|
|
|
|
c-file-style: "gnu"
|
|
|
|
|
|
End:
|
|
|
|
|
|
*/
|