mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-01 12:20:26 +02:00
(display_frame_expr): Do not remove control characters from the final
string. Print it directly using scm_display.
This commit is contained in:
parent
818deb1158
commit
22e47f69ae
1 changed files with 1 additions and 22 deletions
|
@ -374,7 +374,6 @@ indent (int n, SCM port)
|
||||||
static void
|
static void
|
||||||
display_frame_expr (char *hdr, SCM exp, char *tlr, int indentation, SCM sport, SCM port, scm_print_state *pstate)
|
display_frame_expr (char *hdr, SCM exp, char *tlr, int indentation, SCM sport, SCM port, scm_print_state *pstate)
|
||||||
{
|
{
|
||||||
SCM string;
|
|
||||||
int i = 0, n;
|
int i = 0, n;
|
||||||
scm_t_ptob_descriptor *ptob = scm_ptobs + SCM_PTOBNUM (sport);
|
scm_t_ptob_descriptor *ptob = scm_ptobs + SCM_PTOBNUM (sport);
|
||||||
do
|
do
|
||||||
|
@ -398,28 +397,8 @@ display_frame_expr (char *hdr, SCM exp, char *tlr, int indentation, SCM sport, S
|
||||||
}
|
}
|
||||||
while (indentation + n > SCM_BACKTRACE_WIDTH && i < n_print_params);
|
while (indentation + n > SCM_BACKTRACE_WIDTH && i < n_print_params);
|
||||||
ptob->truncate (sport, n);
|
ptob->truncate (sport, n);
|
||||||
string = scm_strport_to_string (sport);
|
|
||||||
assert (scm_is_string (string));
|
|
||||||
|
|
||||||
{
|
scm_display (scm_strport_to_string (sport), port);
|
||||||
char *data = scm_i_string_writable_chars (string);
|
|
||||||
|
|
||||||
/* Remove control characters */
|
|
||||||
for (i = 0; i < n; ++i)
|
|
||||||
if (iscntrl (data[i]))
|
|
||||||
data[i] = ' ';
|
|
||||||
/* Truncate */
|
|
||||||
if (indentation + n > SCM_BACKTRACE_WIDTH)
|
|
||||||
{
|
|
||||||
n = SCM_BACKTRACE_WIDTH - indentation;
|
|
||||||
data[n-1] = '$';
|
|
||||||
}
|
|
||||||
|
|
||||||
scm_i_string_stop_writing ();
|
|
||||||
}
|
|
||||||
|
|
||||||
scm_lfwrite (scm_i_string_chars (string), n, port);
|
|
||||||
scm_remember_upto_here_1 (string);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue