mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 06:41:13 +02:00
Code Activity

(scm_display_backtrace_with_highlights,

Browse source 
scm_backtrace_with_highlights): New.  Set highlight_objects of
printstate.
This commit is contained in:
Marius Vollmer 2004-09-23 17:51:53 +00:00
parent cdd8c09128
commit 2b55be7547
2 changed files with 38 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

45
libguile/backtrace.c
View file

@ -636,6 +636,7 @@ struct display_backtrace_args {
SCM port; SCM port;
SCM first; SCM first;
SCM depth; SCM depth;
SCM highlight_objects;
}; };
static SCM static SCM
@ -695,6 +696,7 @@ display_backtrace_body (struct display_backtrace_args *a)
pstate = SCM_PRINT_STATE (print_state); pstate = SCM_PRINT_STATE (print_state);
pstate->writingp = 1; pstate->writingp = 1;
pstate->fancyp = 1; pstate->fancyp = 1;
pstate->highlight_objects = a->highlight_objects;
/* First find out if it's reasonable to do indentation. */ /* First find out if it's reasonable to do indentation. */
if (SCM_BACKWARDS_P) if (SCM_BACKWARDS_P)
@ -747,14 +749,15 @@ display_backtrace_body (struct display_backtrace_args *a)
} }
#undef FUNC_NAME #undef FUNC_NAME
SCM_DEFINE (scm_display_backtrace, "display-backtrace", 2, 2, 0, SCM_DEFINE (scm_display_backtrace_with_highlights, "display-backtrace",
(SCM stack, SCM port, SCM first, SCM depth), 2, 3, 0,
(SCM stack, SCM port, SCM first, SCM depth, SCM highlights),
"Display a backtrace to the output port @var{port}. @var{stack}\n" "Display a backtrace to the output port @var{port}. @var{stack}\n"
"is the stack to take the backtrace from, @var{first} specifies\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" "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" "to display. Both @var{first} and @var{depth} can be @code{#f},\n"
"which means that default values will be used.") "which means that default values will be used.")
#define FUNC_NAME s_scm_display_backtrace #define FUNC_NAME s_scm_display_backtrace_with_highlights
{ {
struct display_backtrace_args a; struct display_backtrace_args a;
struct display_error_handler_data data; struct display_error_handler_data data;
@ -762,6 +765,10 @@ SCM_DEFINE (scm_display_backtrace, "display-backtrace", 2, 2, 0,
a.port = port; a.port = port;
a.first = first; a.first = first;
a.depth = depth; a.depth = depth;
if (SCM_UNBNDP (highlights))
a.highlight_objects = SCM_EOL;
else
a.highlight_objects = highlights;
data.mode = "backtrace"; data.mode = "backtrace";
data.port = port; data.port = port;
scm_internal_catch (SCM_BOOL_T, scm_internal_catch (SCM_BOOL_T,
@ -771,24 +778,36 @@ SCM_DEFINE (scm_display_backtrace, "display-backtrace", 2, 2, 0,
} }
#undef FUNC_NAME #undef FUNC_NAME
SCM
scm_display_backtrace (SCM stack, SCM port, SCM first, SCM depth)
{
return scm_display_backtrace_with_highlights (stack, port, first, depth,
SCM_EOL);
}
SCM_VARIABLE (scm_has_shown_backtrace_hint_p_var, "has-shown-backtrace-hint?"); SCM_VARIABLE (scm_has_shown_backtrace_hint_p_var, "has-shown-backtrace-hint?");
SCM_DEFINE (scm_backtrace, "backtrace", 0, 0, 0, SCM_DEFINE (scm_backtrace_with_highlights, "backtrace", 0, 1, 0,
(), (SCM highlights),
"Display a backtrace of the stack saved by the last error\n" "Display a backtrace of the stack saved by the last error\n"
"to the current output port.") "to the current output port.")
#define FUNC_NAME s_scm_backtrace #define FUNC_NAME s_scm_backtrace_with_highlights
{ {
SCM the_last_stack = SCM the_last_stack =
scm_fluid_ref (SCM_VARIABLE_REF (scm_the_last_stack_fluid_var)); scm_fluid_ref (SCM_VARIABLE_REF (scm_the_last_stack_fluid_var));
if (SCM_UNBNDP (highlights))
highlights = SCM_EOL;
if (scm_is_true (the_last_stack)) if (scm_is_true (the_last_stack))
{ {
scm_newline (scm_cur_outp); scm_newline (scm_cur_outp);
scm_puts ("Backtrace:\n", scm_cur_outp); scm_puts ("Backtrace:\n", scm_cur_outp);
scm_display_backtrace (the_last_stack, scm_display_backtrace_with_highlights (the_last_stack,
scm_cur_outp, scm_cur_outp,
SCM_UNDEFINED, SCM_BOOL_F,
SCM_UNDEFINED); SCM_BOOL_F,
highlights);
scm_newline (scm_cur_outp); scm_newline (scm_cur_outp);
if (scm_is_false (SCM_VARIABLE_REF (scm_has_shown_backtrace_hint_p_var)) if (scm_is_false (SCM_VARIABLE_REF (scm_has_shown_backtrace_hint_p_var))
&& !SCM_BACKTRACE_P) && !SCM_BACKTRACE_P)
@ -808,6 +827,12 @@ SCM_DEFINE (scm_backtrace, "backtrace", 0, 0, 0,
} }
#undef FUNC_NAME #undef FUNC_NAME
SCM
scm_backtrace (void)
{
return scm_backtrace_with_highlights (SCM_EOL);
}
void void

4
libguile/backtrace.h
View file

@ -3,7 +3,7 @@
#ifndef SCM_BACKTRACE_H #ifndef SCM_BACKTRACE_H
#define SCM_BACKTRACE_H #define SCM_BACKTRACE_H
/* Copyright (C) 1996,1998,1999,2000,2001 Free Software Foundation, Inc. /* Copyright (C) 1996,1998,1999,2000,2001, 2004 Free Software Foundation, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -31,7 +31,9 @@ SCM_API void scm_i_display_error (SCM stack, SCM port, SCM subr, SCM message, SC
SCM_API SCM scm_display_error (SCM stack, SCM port, SCM subr, SCM message, SCM args, SCM rest); SCM_API SCM scm_display_error (SCM stack, SCM port, SCM subr, SCM message, SCM args, SCM rest);
SCM_API SCM scm_display_application (SCM frame, SCM port, SCM indent); SCM_API SCM scm_display_application (SCM frame, SCM port, SCM indent);
SCM_API SCM scm_display_backtrace (SCM stack, SCM port, SCM first, SCM depth); SCM_API SCM scm_display_backtrace (SCM stack, SCM port, SCM first, SCM depth);
SCM_API SCM scm_display_backtrace_with_highlights (SCM stack, SCM port, SCM first, SCM depth, SCM highlights);
SCM_API SCM scm_backtrace (void); SCM_API SCM scm_backtrace (void);
SCM_API SCM scm_backtrace_with_highlights (SCM highlights);
#ifdef GUILE_DEBUG #ifdef GUILE_DEBUG
SCM_API SCM scm_set_print_params_x (SCM params); SCM_API SCM scm_set_print_params_x (SCM params);
#endif #endif