mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

(iprin1): When writing a string, collect all characters that can be

Browse source 
printed directly into one call to scm_lfwrite.  Previously, every
character was output with its own call to write(2) on unbuffered
ports.
This commit is contained in:
Marius Vollmer 2005-06-06 19:54:20 +00:00
parent 589f22f665
commit 6d92f14f14
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libguile/print.c
View file

@ -506,30 +506,38 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate)
case scm_tc7_string: case scm_tc7_string:
if (SCM_WRITINGP (pstate)) if (SCM_WRITINGP (pstate))
{ {
size_t i, len; size_t i, j, len;
const char *data; const char *data;
scm_putc ('"', port); scm_putc ('"', port);
len = scm_i_string_length (exp); len = scm_i_string_length (exp);
data = scm_i_string_chars (exp); data = scm_i_string_chars (exp);
for (i = 0; i < len; ++i) for (i = 0, j = 0; i < len; ++i)
{ {
unsigned char ch = data[i]; unsigned char ch = data[i];
if ((ch < 32 && ch != '\n') || (127 <= ch && ch < 148)) if ((ch < 32 && ch != '\n') || (127 <= ch && ch < 148))
{ {
static char const hex[]="0123456789abcdef"; static char const hex[]="0123456789abcdef";
scm_putc ('\\', port); char buf[4];
scm_putc ('x', port);
scm_putc (hex [ch / 16], port); scm_lfwrite (data+j, i-j, port);
scm_putc (hex [ch % 16], port); buf[0] = '\\';
buf[1] = 'x';
buf[2] = hex [ch / 16];
buf[3] = hex [ch % 16];
scm_lfwrite (buf, 4, port);
data = scm_i_string_chars (exp);
j = i+1;
} }
else else if (ch == '"' || ch == '\\')
{ {
if (ch == '"' || ch == '\\') scm_lfwrite (data+j, i-j, port);
scm_putc ('\\', port); scm_putc ('\\', port);
scm_putc (ch, port); data = scm_i_string_chars (exp);
j = i;
} }
} }
scm_lfwrite (data+j, i-j, port);
scm_putc ('"', port); scm_putc ('"', port);
scm_remember_upto_here_1 (exp); scm_remember_upto_here_1 (exp);
} }