1996-10-14 03:24:16 +00:00
|
|
|
|
/* Printing of backtraces and error messages
|
2000-06-12 12:28:24 +00:00
|
|
|
|
* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation
|
1996-10-14 03:24:16 +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-10-14 03:24:16 +00:00
|
|
|
|
*
|
|
|
|
|
|
* As a special exception, the Free Software Foundation gives permission
|
|
|
|
|
|
* for additional uses of the text contained in its release of GUILE.
|
|
|
|
|
|
*
|
|
|
|
|
|
* The exception is that, if you link the GUILE library with other files
|
|
|
|
|
|
* to produce an executable, this does not by itself cause the
|
|
|
|
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
|
|
|
|
* Your use of that executable is in no way restricted on account of
|
|
|
|
|
|
* linking the GUILE library code into it.
|
|
|
|
|
|
*
|
|
|
|
|
|
* This exception does not however invalidate any other reasons why
|
|
|
|
|
|
* the executable file might be covered by the GNU General Public License.
|
|
|
|
|
|
*
|
|
|
|
|
|
* This exception applies only to the code released by the
|
|
|
|
|
|
* Free Software Foundation under the name GUILE. If you copy
|
|
|
|
|
|
* code from other Free Software Foundation releases into a copy of
|
|
|
|
|
|
* GUILE, as the General Public License permits, the exception does
|
|
|
|
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
|
|
|
|
* anyone as to the status of such modified files, you must delete
|
|
|
|
|
|
* this exception notice from them.
|
|
|
|
|
|
*
|
|
|
|
|
|
* If you write modifications of your own for GUILE, it is your choice
|
|
|
|
|
|
* whether to permit this exception to apply to your modifications.
|
|
|
|
|
|
* If you do not wish that, delete this exception notice.
|
|
|
|
|
|
*
|
|
|
|
|
|
* The author can be reached at djurfeldt@nada.kth.se
|
1997-05-26 22:34:48 +00:00
|
|
|
|
* Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
1999-12-12 02:36:16 +00:00
|
|
|
|
/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
|
|
|
|
|
|
gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-12 02:23:39 +00:00
|
|
|
|
#include <ctype.h>
|
|
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/_scm.h"
|
1999-09-22 04:36:56 +00:00
|
|
|
|
|
1999-09-15 15:22:07 +00:00
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/stacks.h"
|
|
|
|
|
|
#include "libguile/srcprop.h"
|
|
|
|
|
|
#include "libguile/struct.h"
|
|
|
|
|
|
#include "libguile/strports.h"
|
|
|
|
|
|
#include "libguile/throw.h"
|
|
|
|
|
|
#include "libguile/fluids.h"
|
|
|
|
|
|
#include "libguile/ports.h"
|
|
|
|
|
|
#include "libguile/strings.h"
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/validate.h"
|
|
|
|
|
|
#include "libguile/backtrace.h"
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* {Error reporting and backtraces}
|
|
|
|
|
|
* (A first approximation.)
|
|
|
|
|
|
*
|
|
|
|
|
|
* Note that these functions shouldn't generate errors themselves.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef SCM_RECKLESS
|
|
|
|
|
|
#undef SCM_ASSERT
|
|
|
|
|
|
#define SCM_ASSERT(_cond, _arg, _pos, _subr) \
|
|
|
|
|
|
if (!(_cond)) \
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2001-05-15 14:57:22 +00:00
|
|
|
|
SCM scm_the_last_stack_fluid_var;
|
1997-11-29 10:49:18 +00:00
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
static void
|
1999-12-12 02:36:16 +00:00
|
|
|
|
display_header (SCM source, SCM port)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
2001-01-25 23:34:31 +00:00
|
|
|
|
if (SCM_MEMOIZEDP (source))
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
2001-01-25 23:34:31 +00:00
|
|
|
|
SCM fname = scm_source_property (source, scm_sym_filename);
|
|
|
|
|
|
SCM line = scm_source_property (source, scm_sym_line);
|
|
|
|
|
|
SCM col = scm_source_property (source, scm_sym_column);
|
|
|
|
|
|
|
|
|
|
|
|
/* Dirk:FIXME:: Maybe we should store the _port_ rather than the
|
|
|
|
|
|
* filename with the source properties? Then we could in case of
|
|
|
|
|
|
* non-file ports give at least some more details than just
|
|
|
|
|
|
* "<unnamed port>". */
|
|
|
|
|
|
if (SCM_STRINGP (fname))
|
|
|
|
|
|
scm_prin1 (fname, port, 0);
|
|
|
|
|
|
else
|
|
|
|
|
|
scm_puts ("<unnamed port>", port);
|
|
|
|
|
|
|
|
|
|
|
|
if (!SCM_FALSEP (line) && !SCM_FALSEP (col))
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_putc (':', port);
|
|
|
|
|
|
scm_intprint (SCM_INUM (line) + 1, 10, port);
|
|
|
|
|
|
scm_putc (':', port);
|
|
|
|
|
|
scm_intprint (SCM_INUM (col) + 1, 10, port);
|
|
|
|
|
|
}
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
* 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 ("ERROR", port);
|
|
|
|
|
|
scm_puts (": ", port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1996-12-10 01:41:37 +00:00
|
|
|
|
|
|
|
|
|
|
void
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_display_error_message (SCM message, SCM args, SCM port)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
2000-11-02 10:36:31 +00:00
|
|
|
|
if (SCM_STRINGP (message) && !SCM_FALSEP (scm_list_p (args)))
|
2000-01-18 18:24:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_simple_format (port, message, args);
|
|
|
|
|
|
scm_newline (port);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
2000-11-02 10:36:31 +00:00
|
|
|
|
scm_display (message, port);
|
|
|
|
|
|
scm_newline (port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
1999-12-12 02:36:16 +00:00
|
|
|
|
display_expression (SCM frame,SCM pname,SCM source,SCM port)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM print_state = scm_make_print_state ();
|
|
|
|
|
|
scm_print_state *pstate = SCM_PRINT_STATE (print_state);
|
|
|
|
|
|
pstate->writingp = 0;
|
|
|
|
|
|
pstate->fancyp = 1;
|
|
|
|
|
|
pstate->level = 2;
|
|
|
|
|
|
pstate->length = 3;
|
2000-11-02 10:36:31 +00:00
|
|
|
|
if (SCM_SYMBOLP (pname) || SCM_STRINGP (pname))
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
2000-01-03 16:26:28 +00:00
|
|
|
|
if (SCM_FRAMEP (frame)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
&& SCM_FRAME_EVAL_ARGS_P (frame))
|
* 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 ("While evaluating arguments to ", port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
else
|
* 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 ("In procedure ", port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
scm_iprin1 (pname, port, pstate);
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (SCM_MEMOIZEDP (source))
|
1996-10-14 03:24:16 +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 (" in expression ", port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
pstate->writingp = 1;
|
|
|
|
|
|
scm_iprin1 (scm_unmemoize (source), port, pstate);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_NIMP (source))
|
|
|
|
|
|
{
|
* 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 ("In expression ", port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
pstate->writingp = 1;
|
|
|
|
|
|
scm_iprin1 (scm_unmemoize (source), port, 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 (":\n", port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
scm_free_print_state (print_state);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1997-09-24 20:18:54 +00:00
|
|
|
|
struct display_error_args {
|
|
|
|
|
|
SCM stack;
|
|
|
|
|
|
SCM port;
|
|
|
|
|
|
SCM subr;
|
|
|
|
|
|
SCM message;
|
|
|
|
|
|
SCM args;
|
|
|
|
|
|
SCM rest;
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
display_error_body (struct display_error_args *a)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM current_frame = SCM_BOOL_F;
|
|
|
|
|
|
SCM source = SCM_BOOL_F;
|
1998-10-04 16:44:34 +00:00
|
|
|
|
SCM prev_frame = SCM_BOOL_F;
|
2000-11-02 10:36:31 +00:00
|
|
|
|
SCM pname = a->subr;
|
1998-10-04 16:44:34 +00:00
|
|
|
|
|
1996-10-17 23:32:47 +00:00
|
|
|
|
if (SCM_DEBUGGINGP
|
1997-09-24 20:18:54 +00:00
|
|
|
|
&& SCM_STACKP (a->stack)
|
|
|
|
|
|
&& SCM_STACK_LENGTH (a->stack) > 0)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
1997-09-24 20:18:54 +00:00
|
|
|
|
current_frame = scm_stack_ref (a->stack, SCM_INUM0);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
source = SCM_FRAME_SOURCE (current_frame);
|
1998-10-04 16:44:34 +00:00
|
|
|
|
prev_frame = SCM_FRAME_PREV (current_frame);
|
2000-03-31 15:59:57 +00:00
|
|
|
|
if (!SCM_MEMOIZEDP (source) && !SCM_FALSEP (prev_frame))
|
1998-10-04 16:44:34 +00:00
|
|
|
|
source = SCM_FRAME_SOURCE (prev_frame);
|
2000-11-02 10:36:31 +00:00
|
|
|
|
if (!SCM_SYMBOLP (pname) && !SCM_STRINGP (pname) && SCM_FRAME_PROC_P (current_frame)
|
2000-06-05 11:39:46 +00:00
|
|
|
|
&& SCM_EQ_P (scm_procedure_p (SCM_FRAME_PROC (current_frame)), SCM_BOOL_T))
|
1996-10-14 03:24:16 +00:00
|
|
|
|
pname = scm_procedure_name (SCM_FRAME_PROC (current_frame));
|
|
|
|
|
|
}
|
2000-11-02 10:36:31 +00:00
|
|
|
|
if (SCM_SYMBOLP (pname) || SCM_STRINGP (pname) || SCM_MEMOIZEDP (source))
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
1997-09-24 20:18:54 +00:00
|
|
|
|
display_header (source, a->port);
|
|
|
|
|
|
display_expression (current_frame, pname, source, a->port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
1997-09-24 20:18:54 +00:00
|
|
|
|
display_header (source, a->port);
|
|
|
|
|
|
scm_display_error_message (a->message, a->args, a->port);
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
struct display_error_handler_data {
|
|
|
|
|
|
char *mode;
|
|
|
|
|
|
SCM port;
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* This is the exception handler for error reporting routines.
|
|
|
|
|
|
Note that it is very important that this handler *doesn't* try to
|
|
|
|
|
|
print more than the error tag, since the error very probably is
|
|
|
|
|
|
caused by an erroneous print call-back routine. If we would
|
2000-01-09 01:07:17 +00:00
|
|
|
|
try to print all objects, we would enter an infinite loop. */
|
1997-09-24 20:18:54 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
display_error_handler (struct display_error_handler_data *data,
|
|
|
|
|
|
SCM tag, SCM args)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM print_state = scm_make_print_state ();
|
* 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 ("\nException during displaying of ", data->port);
|
|
|
|
|
|
scm_puts (data->mode, data->port);
|
|
|
|
|
|
scm_puts (": ", data->port);
|
1997-09-24 20:18:54 +00:00
|
|
|
|
scm_iprin1 (tag, data->port, SCM_PRINT_STATE (print_state));
|
* 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 ('\n', data->port);
|
1997-09-24 20:18:54 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2001-01-24 15:58:46 +00:00
|
|
|
|
|
|
|
|
|
|
/* The function scm_i_display_error prints out a detailed error message. This
|
|
|
|
|
|
* function will be called directly within libguile to signal error messages.
|
|
|
|
|
|
* No parameter checks will be performed by scm_i_display_error. Thus, User
|
|
|
|
|
|
* code should rather use the function scm_display_error.
|
|
|
|
|
|
*/
|
|
|
|
|
|
void
|
|
|
|
|
|
scm_i_display_error (SCM stack, SCM port, SCM subr, SCM message, SCM args, SCM rest)
|
1997-09-24 20:18:54 +00:00
|
|
|
|
{
|
1998-07-12 13:22:51 +00:00
|
|
|
|
struct display_error_args a;
|
|
|
|
|
|
struct display_error_handler_data data;
|
|
|
|
|
|
a.stack = stack;
|
|
|
|
|
|
a.port = port;
|
|
|
|
|
|
a.subr = subr;
|
|
|
|
|
|
a.message = message;
|
|
|
|
|
|
a.args = args;
|
|
|
|
|
|
a.rest = rest;
|
|
|
|
|
|
data.mode = "error";
|
|
|
|
|
|
data.port = port;
|
1997-09-24 20:18:54 +00:00
|
|
|
|
scm_internal_catch (SCM_BOOL_T,
|
|
|
|
|
|
(scm_catch_body_t) display_error_body, &a,
|
|
|
|
|
|
(scm_catch_handler_t) display_error_handler, &data);
|
2001-01-24 15:58:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_display_error, "display-error", 6, 0, 0,
|
|
|
|
|
|
(SCM stack, SCM port, SCM subr, SCM message, SCM args, SCM rest),
|
2001-02-16 15:21:21 +00:00
|
|
|
|
"Display an error message to the output port @var{port}.\n"
|
|
|
|
|
|
"@var{stack} is the saved stack for the error, @var{subr} is\n"
|
|
|
|
|
|
"the name of the procedure in which the error occured and\n"
|
|
|
|
|
|
"@var{message} is the actual error message, which may contain\n"
|
|
|
|
|
|
"formatting instructions. These will format the arguments in\n"
|
|
|
|
|
|
"the list @var{args} accordingly. @var{rest} is currently\n"
|
|
|
|
|
|
"ignored.")
|
2001-01-24 15:58:46 +00:00
|
|
|
|
#define FUNC_NAME s_scm_display_error
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_VALIDATE_OUTPUT_PORT (2, port);
|
|
|
|
|
|
|
|
|
|
|
|
scm_i_display_error (stack, port, subr, message, args, rest);
|
|
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
2001-01-24 15:58:46 +00:00
|
|
|
|
|
1999-09-12 02:23:39 +00:00
|
|
|
|
typedef struct {
|
|
|
|
|
|
int level;
|
|
|
|
|
|
int length;
|
|
|
|
|
|
} print_params_t;
|
|
|
|
|
|
|
|
|
|
|
|
static int n_print_params = 9;
|
|
|
|
|
|
static print_params_t default_print_params[] = {
|
|
|
|
|
|
{ 4, 9 }, { 4, 3 },
|
|
|
|
|
|
{ 3, 4 }, { 3, 3 },
|
|
|
|
|
|
{ 2, 4 }, { 2, 3 },
|
|
|
|
|
|
{ 1, 4 }, { 1, 3 }, { 1, 2 }
|
|
|
|
|
|
};
|
|
|
|
|
|
static print_params_t *print_params = default_print_params;
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef GUILE_DEBUG
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_set_print_params_x, "set-print-params!", 1, 0, 0,
|
1999-12-14 17:08:25 +00:00
|
|
|
|
(SCM params),
|
2001-02-16 15:21:21 +00:00
|
|
|
|
"Set the print parameters to the values from @var{params}.\n"
|
|
|
|
|
|
"@var{params} must be a list of two-element lists which must\n"
|
|
|
|
|
|
"hold two integer values.")
|
1999-12-14 17:41:59 +00:00
|
|
|
|
#define FUNC_NAME s_scm_set_print_params_x
|
1999-09-12 02:23:39 +00:00
|
|
|
|
{
|
2000-01-18 18:24:57 +00:00
|
|
|
|
int i;
|
|
|
|
|
|
int n;
|
1999-09-12 02:23:39 +00:00
|
|
|
|
SCM ls;
|
|
|
|
|
|
print_params_t *new_params;
|
2000-01-18 18:24:57 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_VALIDATE_NONEMPTYLIST_COPYLEN (2, params, n);
|
|
|
|
|
|
for (ls = params; SCM_NNULLP (ls); ls = SCM_CDR (ls))
|
1999-09-12 02:23:39 +00:00
|
|
|
|
SCM_ASSERT (scm_ilength (SCM_CAR (params)) == 2
|
|
|
|
|
|
&& SCM_INUMP (SCM_CAAR (ls))
|
|
|
|
|
|
&& SCM_INUM (SCM_CAAR (ls)) >= 0
|
|
|
|
|
|
&& SCM_INUMP (SCM_CADAR (ls))
|
|
|
|
|
|
&& SCM_INUM (SCM_CADAR (ls)) >= 0,
|
|
|
|
|
|
params,
|
|
|
|
|
|
SCM_ARG2,
|
1999-12-14 17:41:59 +00:00
|
|
|
|
s_scm_set_print_params_x);
|
1999-09-12 02:23:39 +00:00
|
|
|
|
new_params = scm_must_malloc (n * sizeof (print_params_t),
|
1999-12-12 02:36:16 +00:00
|
|
|
|
FUNC_NAME);
|
1999-09-12 02:23:39 +00:00
|
|
|
|
if (print_params != default_print_params)
|
|
|
|
|
|
scm_must_free (print_params);
|
|
|
|
|
|
print_params = new_params;
|
|
|
|
|
|
for (i = 0; i < n; ++i)
|
|
|
|
|
|
{
|
|
|
|
|
|
print_params[i].level = SCM_INUM (SCM_CAAR (params));
|
|
|
|
|
|
print_params[i].length = SCM_INUM (SCM_CADAR (params));
|
|
|
|
|
|
params = SCM_CDR (params);
|
|
|
|
|
|
}
|
|
|
|
|
|
n_print_params = n;
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1999-09-12 02:23:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
static void
|
1999-12-12 02:36:16 +00:00
|
|
|
|
indent (int n, SCM port)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
|
|
|
|
|
int i;
|
|
|
|
|
|
for (i = 0; i < n; ++i)
|
* 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-14 03:24:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
1999-12-12 02:36:16 +00:00
|
|
|
|
display_frame_expr (char *hdr,SCM exp,char *tlr,int indentation,SCM sport,SCM port,scm_print_state *pstate)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
1999-09-12 02:23:39 +00:00
|
|
|
|
SCM string;
|
|
|
|
|
|
int i = 0, n;
|
* 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_ptob_descriptor_t *ptob = scm_ptobs + SCM_PTOBNUM (sport);
|
1999-09-12 02:23:39 +00:00
|
|
|
|
do
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
1999-09-12 02:23:39 +00:00
|
|
|
|
pstate->length = print_params[i].length;
|
|
|
|
|
|
ptob->seek (sport, 0, SEEK_SET);
|
1999-12-16 20:48:05 +00:00
|
|
|
|
if (SCM_CONSP (exp))
|
1999-09-12 02:23:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
pstate->level = print_params[i].level - 1;
|
|
|
|
|
|
scm_iprlist (hdr, exp, tlr[0], sport, pstate);
|
|
|
|
|
|
scm_puts (&tlr[1], sport);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
pstate->level = print_params[i].level;
|
|
|
|
|
|
scm_iprin1 (exp, sport, pstate);
|
|
|
|
|
|
}
|
|
|
|
|
|
ptob->flush (sport);
|
|
|
|
|
|
n = ptob->seek (sport, 0, SEEK_CUR);
|
|
|
|
|
|
++i;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
1999-09-12 02:23:39 +00:00
|
|
|
|
while (indentation + n > SCM_BACKTRACE_WIDTH && i < n_print_params);
|
|
|
|
|
|
ptob->truncate (sport, n);
|
|
|
|
|
|
string = scm_strport_to_string (sport);
|
|
|
|
|
|
/* Remove control characters */
|
|
|
|
|
|
for (i = 0; i < n; ++i)
|
2000-09-22 17:17:55 +00:00
|
|
|
|
if (iscntrl (SCM_STRING_CHARS (string)[i]))
|
|
|
|
|
|
SCM_STRING_CHARS (string)[i] = ' ';
|
1999-09-12 02:23:39 +00:00
|
|
|
|
/* Truncate */
|
|
|
|
|
|
if (indentation + n > SCM_BACKTRACE_WIDTH)
|
|
|
|
|
|
{
|
|
|
|
|
|
n = SCM_BACKTRACE_WIDTH - indentation;
|
2000-09-22 17:17:55 +00:00
|
|
|
|
SCM_STRING_CHARS (string)[n - 1] = '$';
|
1999-09-12 02:23:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-09-22 17:17:55 +00:00
|
|
|
|
scm_lfwrite (SCM_STRING_CHARS (string), n, port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1997-03-07 21:42:32 +00:00
|
|
|
|
static void
|
1999-12-12 02:36:16 +00:00
|
|
|
|
display_application (SCM frame,int indentation,SCM sport,SCM port,scm_print_state *pstate)
|
1997-03-07 21:42:32 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM proc = SCM_FRAME_PROC (frame);
|
|
|
|
|
|
SCM name = (SCM_NFALSEP (scm_procedure_p (proc))
|
|
|
|
|
|
? scm_procedure_name (proc)
|
|
|
|
|
|
: SCM_BOOL_F);
|
|
|
|
|
|
display_frame_expr ("[",
|
|
|
|
|
|
scm_cons (SCM_NFALSEP (name) ? name : proc,
|
|
|
|
|
|
SCM_FRAME_ARGS (frame)),
|
|
|
|
|
|
SCM_FRAME_EVAL_ARGS_P (frame) ? " ..." : "]",
|
|
|
|
|
|
indentation,
|
|
|
|
|
|
sport,
|
|
|
|
|
|
port,
|
|
|
|
|
|
pstate);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_display_application, "display-application", 1, 2, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM frame, SCM port, SCM indent),
|
2001-02-16 15:21:21 +00:00
|
|
|
|
"Display a procedure application @var{frame} to the output port\n"
|
|
|
|
|
|
"@var{port}. @var{indent} specifies the indentation of the\n"
|
|
|
|
|
|
"output.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_display_application
|
1997-03-07 21:42:32 +00:00
|
|
|
|
{
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_FRAME (1,frame);
|
1997-03-07 21:42:32 +00:00
|
|
|
|
if (SCM_UNBNDP (port))
|
|
|
|
|
|
port = scm_cur_outp;
|
1999-09-12 02:23:39 +00:00
|
|
|
|
else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_OPOUTPORT (2,port);
|
1999-09-12 02:23:39 +00:00
|
|
|
|
if (SCM_UNBNDP (indent))
|
|
|
|
|
|
indent = SCM_INUM0;
|
|
|
|
|
|
else
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_VALIDATE_INUM (3,indent);
|
1999-09-12 02:23:39 +00:00
|
|
|
|
|
1997-03-07 21:42:32 +00:00
|
|
|
|
if (SCM_FRAME_PROC_P (frame))
|
|
|
|
|
|
/* Display an application. */
|
|
|
|
|
|
{
|
1999-09-12 02:23:39 +00:00
|
|
|
|
SCM sport, print_state;
|
1997-03-07 21:42:32 +00:00
|
|
|
|
scm_print_state *pstate;
|
|
|
|
|
|
|
1999-09-12 02:23:39 +00:00
|
|
|
|
/* Create a string port used for adaptation of printing parameters. */
|
|
|
|
|
|
sport = scm_mkstrport (SCM_INUM0,
|
|
|
|
|
|
scm_make_string (SCM_MAKINUM (240),
|
|
|
|
|
|
SCM_UNDEFINED),
|
|
|
|
|
|
SCM_OPN | SCM_WRTNG,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
FUNC_NAME);
|
1999-09-12 02:23:39 +00:00
|
|
|
|
|
1997-03-07 21:42:32 +00:00
|
|
|
|
/* Create a print state for printing of frames. */
|
|
|
|
|
|
print_state = scm_make_print_state ();
|
|
|
|
|
|
pstate = SCM_PRINT_STATE (print_state);
|
|
|
|
|
|
pstate->writingp = 1;
|
|
|
|
|
|
pstate->fancyp = 1;
|
|
|
|
|
|
|
1999-09-12 02:23:39 +00:00
|
|
|
|
display_application (frame, SCM_INUM (indent), sport, port, pstate);
|
1997-03-07 21:42:32 +00:00
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1997-03-07 21:42:32 +00:00
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
static void
|
1999-12-12 02:36:16 +00:00
|
|
|
|
display_frame (SCM frame,int nfield,int indentation,SCM sport,SCM port,scm_print_state *pstate)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
|
|
|
|
|
int n, i, j;
|
|
|
|
|
|
|
|
|
|
|
|
/* Announce missing frames? */
|
|
|
|
|
|
if (!SCM_BACKWARDS_P && SCM_FRAME_OVERFLOW_P (frame))
|
|
|
|
|
|
{
|
|
|
|
|
|
indent (nfield + 1 + indentation, 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_puts ("...\n", port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Check size of frame number. */
|
|
|
|
|
|
n = SCM_FRAME_NUMBER (frame);
|
|
|
|
|
|
for (i = 0, j = n; j > 0; ++i) j /= 10;
|
|
|
|
|
|
|
|
|
|
|
|
/* Number indentation. */
|
|
|
|
|
|
indent (nfield - (i ? i : 1), port);
|
|
|
|
|
|
|
|
|
|
|
|
/* Frame number. */
|
|
|
|
|
|
scm_iprin1 (SCM_MAKINUM (n), port, pstate);
|
|
|
|
|
|
|
|
|
|
|
|
/* Real frame marker */
|
* 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 (SCM_FRAME_REAL_P (frame) ? '*' : ' ', port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* Indentation. */
|
|
|
|
|
|
indent (indentation, port);
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_FRAME_PROC_P (frame))
|
|
|
|
|
|
/* Display an application. */
|
1997-03-07 21:42:32 +00:00
|
|
|
|
display_application (frame, nfield + 1 + indentation, sport, port, pstate);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
else
|
|
|
|
|
|
/* Display a special form. */
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM source = SCM_FRAME_SOURCE (frame);
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM copy = (SCM_CONSP (source)
|
* backtrace.c, backtrace.h, debug.c, debug.h, eval.c, eval.h,
gsubr.c, gsubr.h, read.c, read.h, 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.
1999-08-17 08:44:38 +00:00
|
|
|
|
? scm_source_property (source, scm_sym_copy)
|
1998-12-04 11:41:03 +00:00
|
|
|
|
: SCM_BOOL_F);
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM umcopy = (SCM_MEMOIZEDP (source)
|
1998-12-04 11:41:03 +00:00
|
|
|
|
? scm_unmemoize (source)
|
|
|
|
|
|
: SCM_BOOL_F);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
display_frame_expr ("(",
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_CONSP (copy) ? copy : umcopy,
|
1996-10-14 03:24:16 +00:00
|
|
|
|
")",
|
|
|
|
|
|
nfield + 1 + indentation,
|
|
|
|
|
|
sport,
|
|
|
|
|
|
port,
|
|
|
|
|
|
pstate);
|
|
|
|
|
|
}
|
1999-09-11 13:53:24 +00:00
|
|
|
|
scm_putc ('\n', port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* Announce missing frames? */
|
|
|
|
|
|
if (SCM_BACKWARDS_P && SCM_FRAME_OVERFLOW_P (frame))
|
|
|
|
|
|
{
|
|
|
|
|
|
indent (nfield + 1 + indentation, 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_puts ("...\n", port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1997-09-24 20:18:54 +00:00
|
|
|
|
struct display_backtrace_args {
|
|
|
|
|
|
SCM stack;
|
|
|
|
|
|
SCM port;
|
|
|
|
|
|
SCM first;
|
|
|
|
|
|
SCM depth;
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
display_backtrace_body(struct display_backtrace_args *a)
|
|
|
|
|
|
#define FUNC_NAME "display_backtrace_body"
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
|
|
|
|
|
int n_frames, beg, end, n, i, j;
|
|
|
|
|
|
int nfield, indent_p, indentation;
|
|
|
|
|
|
SCM frame, sport, print_state;
|
|
|
|
|
|
scm_print_state *pstate;
|
|
|
|
|
|
|
* filesys.c (scm_close, set_element, get_element, scm_chown,
scm_chmod, scm_stat, scm_truncate_file, scm_fcntl, scm_fsync): Use
SCM_COERCE_OUTPORT to cope with the printstate/port magic.
* ports.c (scm_port_revealed, scm_set_port_revealed_x,
scm_close_port, scm_port_line, scm_set_port_line_x,
scm_port_column, scm_set_port_column_x, scm_port_filename,
scm_set_port_filename_x, scm_port_mode,
scm_close_all_ports_except, scm_set_current_output_port,
scm_set_current_error_port): Likewise
* ioext.c (scm_redirect_port, scm_dup_to_fdes, scm_freopen,
scm_ftell, scm_fileno, scm_isatty_p, scm_primitive_move_to_fdes):
Likewise
* posix.c (scm_ttyname, scm_tcgetpgrp, scm_tcsetpgrp): Likewise
* backtrace.c (display_backtrace_body): Likewise
* fports (scm_setvbuf): Likewise
* socket.c (scm_getsockopt, scm_setsockopt, scm_shutdown,
scm_connect, scm_bind, scm_listen, scm_accept, scm_getsockname,
scm_getpeername, scm_send, scm_sendto): Likewise
* unif.c (scm_uniform_array_write): Likewise
1997-10-25 21:54:12 +00:00
|
|
|
|
a->port = SCM_COERCE_OUTPORT (a->port);
|
|
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
/* Argument checking and extraction. */
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASSERT (SCM_STACKP (a->stack),
|
1997-09-24 20:18:54 +00:00
|
|
|
|
a->stack,
|
1996-10-14 03:24:16 +00:00
|
|
|
|
SCM_ARG1,
|
|
|
|
|
|
s_display_backtrace);
|
1999-12-16 20:48:05 +00:00
|
|
|
|
SCM_ASSERT (SCM_OPOUTPORTP (a->port),
|
1997-09-24 20:18:54 +00:00
|
|
|
|
a->port,
|
1996-10-14 03:24:16 +00:00
|
|
|
|
SCM_ARG2,
|
|
|
|
|
|
s_display_backtrace);
|
1997-09-24 20:18:54 +00:00
|
|
|
|
n_frames = SCM_INUM (scm_stack_length (a->stack));
|
|
|
|
|
|
n = SCM_INUMP (a->depth) ? SCM_INUM (a->depth) : SCM_BACKTRACE_DEPTH;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
if (SCM_BACKWARDS_P)
|
|
|
|
|
|
{
|
1997-09-24 20:18:54 +00:00
|
|
|
|
beg = SCM_INUMP (a->first) ? SCM_INUM (a->first) : 0;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
end = beg + n - 1;
|
|
|
|
|
|
if (end >= n_frames)
|
|
|
|
|
|
end = n_frames - 1;
|
|
|
|
|
|
n = end - beg + 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
1997-09-24 20:18:54 +00:00
|
|
|
|
if (SCM_INUMP (a->first))
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
1997-09-24 20:18:54 +00:00
|
|
|
|
beg = SCM_INUM (a->first);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
end = beg - n + 1;
|
|
|
|
|
|
if (end < 0)
|
|
|
|
|
|
end = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
beg = n - 1;
|
|
|
|
|
|
end = 0;
|
|
|
|
|
|
if (beg >= n_frames)
|
|
|
|
|
|
beg = n_frames - 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
n = beg - end + 1;
|
|
|
|
|
|
}
|
1997-09-24 20:18:54 +00:00
|
|
|
|
SCM_ASSERT (beg >= 0 && beg < n_frames, a->first, SCM_ARG3, s_display_backtrace);
|
|
|
|
|
|
SCM_ASSERT (n > 0, a->depth, SCM_ARG4, s_display_backtrace);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* Create a string port used for adaptation of printing parameters. */
|
|
|
|
|
|
sport = scm_mkstrport (SCM_INUM0,
|
|
|
|
|
|
scm_make_string (SCM_MAKINUM (240), SCM_UNDEFINED),
|
|
|
|
|
|
SCM_OPN | SCM_WRTNG,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
FUNC_NAME);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* Create a print state for printing of frames. */
|
|
|
|
|
|
print_state = scm_make_print_state ();
|
|
|
|
|
|
pstate = SCM_PRINT_STATE (print_state);
|
|
|
|
|
|
pstate->writingp = 1;
|
|
|
|
|
|
pstate->fancyp = 1;
|
|
|
|
|
|
|
|
|
|
|
|
/* First find out if it's reasonable to do indentation. */
|
|
|
|
|
|
if (SCM_BACKWARDS_P)
|
|
|
|
|
|
indent_p = 0;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
indent_p = 1;
|
1997-09-24 20:18:54 +00:00
|
|
|
|
frame = scm_stack_ref (a->stack, SCM_MAKINUM (beg));
|
1996-10-14 03:24:16 +00:00
|
|
|
|
for (i = 0, j = 0; i < n; ++i)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_FRAME_REAL_P (frame))
|
|
|
|
|
|
++j;
|
|
|
|
|
|
if (j > SCM_BACKTRACE_INDENT)
|
|
|
|
|
|
{
|
|
|
|
|
|
indent_p = 0;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
frame = (SCM_BACKWARDS_P
|
|
|
|
|
|
? SCM_FRAME_PREV (frame)
|
|
|
|
|
|
: SCM_FRAME_NEXT (frame));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Determine size of frame number field. */
|
1997-09-24 20:18:54 +00:00
|
|
|
|
j = SCM_FRAME_NUMBER (scm_stack_ref (a->stack, SCM_MAKINUM (end)));
|
1996-10-14 03:24:16 +00:00
|
|
|
|
for (i = 0; j > 0; ++i) j /= 10;
|
|
|
|
|
|
nfield = i ? i : 1;
|
|
|
|
|
|
|
|
|
|
|
|
/* Print frames. */
|
1997-09-24 20:18:54 +00:00
|
|
|
|
frame = scm_stack_ref (a->stack, SCM_MAKINUM (beg));
|
1996-10-14 03:24:16 +00:00
|
|
|
|
indentation = 1;
|
1997-09-24 20:18:54 +00:00
|
|
|
|
display_frame (frame, nfield, indentation, sport, a->port, pstate);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
for (i = 1; i < n; ++i)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (indent_p && SCM_FRAME_EVAL_ARGS_P (frame))
|
|
|
|
|
|
++indentation;
|
|
|
|
|
|
frame = SCM_BACKWARDS_P ? SCM_FRAME_PREV (frame) : SCM_FRAME_NEXT (frame);
|
1997-09-24 20:18:54 +00:00
|
|
|
|
display_frame (frame, nfield, indentation, sport, a->port, pstate);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
1997-09-24 20:18:54 +00:00
|
|
|
|
|
2001-03-31 21:19:50 +00:00
|
|
|
|
scm_remember_upto_here_1 (print_state);
|
|
|
|
|
|
|
1997-09-24 20:18:54 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1997-09-24 20:18:54 +00:00
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_display_backtrace, "display-backtrace", 2, 2, 0,
|
2001-02-16 15:21:21 +00:00
|
|
|
|
(SCM stack, SCM port, SCM first, SCM depth),
|
|
|
|
|
|
"Display a backtrace to the output port @var{port}. @var{stack}\n"
|
|
|
|
|
|
"is the stack to take the backtrace from, @var{first} specifies\n"
|
|
|
|
|
|
"where in the stack to start and @var{depth} how much frames\n"
|
|
|
|
|
|
"to display. Both @var{first} and @var{depth} can be @code{#f},\n"
|
|
|
|
|
|
"which means that default values will be used.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_display_backtrace
|
1997-09-24 20:18:54 +00:00
|
|
|
|
{
|
1998-07-12 13:22:51 +00:00
|
|
|
|
struct display_backtrace_args a;
|
|
|
|
|
|
struct display_error_handler_data data;
|
|
|
|
|
|
a.stack = stack;
|
|
|
|
|
|
a.port = port;
|
|
|
|
|
|
a.first = first;
|
|
|
|
|
|
a.depth = depth;
|
|
|
|
|
|
data.mode = "backtrace";
|
|
|
|
|
|
data.port = port;
|
1997-09-24 20:18:54 +00:00
|
|
|
|
scm_internal_catch (SCM_BOOL_T,
|
|
|
|
|
|
(scm_catch_body_t) display_backtrace_body, &a,
|
|
|
|
|
|
(scm_catch_handler_t) display_error_handler, &data);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
2001-05-15 14:57:22 +00:00
|
|
|
|
SCM_VARIABLE (scm_has_shown_backtrace_hint_p_var, "has-shown-backtrace-hint?");
|
1997-02-10 01:01:54 +00:00
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_backtrace, "backtrace", 0, 0, 0,
|
2001-02-16 15:21:21 +00:00
|
|
|
|
(),
|
|
|
|
|
|
"Display a backtrace of the stack saved by the last error\n"
|
|
|
|
|
|
"to the current output port.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_backtrace
|
1997-02-10 01:01:54 +00:00
|
|
|
|
{
|
2001-05-15 14:57:22 +00:00
|
|
|
|
SCM the_last_stack =
|
|
|
|
|
|
scm_fluid_ref (SCM_VARIABLE_REF (scm_the_last_stack_fluid_var));
|
1997-11-29 01:10:21 +00:00
|
|
|
|
if (SCM_NFALSEP (the_last_stack))
|
1997-02-10 01:01:54 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_newline (scm_cur_outp);
|
1999-09-11 18:31:52 +00:00
|
|
|
|
scm_puts ("Backtrace:\n", scm_cur_outp);
|
1997-11-29 01:10:21 +00:00
|
|
|
|
scm_display_backtrace (the_last_stack,
|
1997-02-10 01:01:54 +00:00
|
|
|
|
scm_cur_outp,
|
|
|
|
|
|
SCM_UNDEFINED,
|
|
|
|
|
|
SCM_UNDEFINED);
|
|
|
|
|
|
scm_newline (scm_cur_outp);
|
2001-05-15 14:57:22 +00:00
|
|
|
|
if (SCM_FALSEP (SCM_VARIABLE_REF (scm_has_shown_backtrace_hint_p_var))
|
1997-02-10 01:01:54 +00:00
|
|
|
|
&& !SCM_BACKTRACE_P)
|
|
|
|
|
|
{
|
* 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 ("Type \"(debug-enable 'backtrace)\" if you would like "
|
|
|
|
|
|
"a backtrace\n"
|
|
|
|
|
|
"automatically if an error occurs in the future.\n",
|
|
|
|
|
|
scm_cur_outp);
|
2001-05-15 14:57:22 +00:00
|
|
|
|
SCM_VARIABLE_SET (scm_has_shown_backtrace_hint_p_var, SCM_BOOL_T);
|
1997-02-10 01:01:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
* 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 ("No backtrace available.\n", scm_cur_outp);
|
1997-02-10 01:01:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1997-02-10 01:01:54 +00:00
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
scm_init_backtrace ()
|
|
|
|
|
|
{
|
1997-11-29 01:10:21 +00:00
|
|
|
|
SCM f = scm_make_fluid ();
|
2001-05-15 14:57:22 +00:00
|
|
|
|
scm_the_last_stack_fluid_var = scm_c_define ("the-last-stack", f);
|
1997-02-10 01:01:54 +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/backtrace.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-14 03:24:16 +00:00
|
|
|
|
}
|
2000-03-19 19:01:16 +00:00
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
Local Variables:
|
|
|
|
|
|
c-file-style: "gnu"
|
|
|
|
|
|
End:
|
|
|
|
|
|
*/
|