mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 21:10:27 +02:00
Code Activity

(handler_message): The rest argument is the fourth

Browse source 
argument, not everything after the third.  Call
scm_display_backtrace_with_highlights, passing the rest argument
when appropriate.
This commit is contained in:
Marius Vollmer 2004-09-23 17:53:54 +00:00
parent 2b55be7547
commit aa79839aac
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libguile/throw.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003 Free Software Foundation, Inc.
/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2003, 2004 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -387,18 +387,28 @@ handler_message (void *handler_data, SCM tag, SCM args)
char *prog_name = (char *) handler_data;
SCM p = scm_cur_errp;
if (scm_ilength (args) >= 3)
if (scm_ilength (args) == 4)
{
SCM stack = scm_make_stack (SCM_BOOL_T, SCM_EOL);
SCM subr = SCM_CAR (args);
SCM message = SCM_CADR (args);
SCM parts = SCM_CADDR (args);
SCM rest = SCM_CDDDR (args);
SCM rest = SCM_CADDDR (args);
if (SCM_BACKTRACE_P && scm_is_true (stack))
{
SCM highlights;
if (scm_is_eq (tag, scm_arg_type_key)
|| scm_is_eq (tag, scm_out_of_range_key))
highlights = rest;
else
highlights = SCM_EOL;
scm_puts ("Backtrace:\n", p);
scm_display_backtrace (stack, p, SCM_UNDEFINED, SCM_UNDEFINED);
scm_display_backtrace_with_highlights (stack, p,
SCM_BOOL_F, SCM_BOOL_F,
highlights);
scm_newline (p);
}
scm_i_display_error (stack, p, subr, message, parts, rest);