suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mismanagement of temporary print buffer

Browse Source 
Closes PR 13199

Merge to v5.3.1
(cherry picked from commit 70fee17ef9)
This commit is contained in:
Matthew Flatt 2012-10-20 09:34:37 -06:00 committed by Ryan Culpepper
parent 47ca55e68a
commit 76cad3cedd
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/racket/src/print.c
View File

@ -124,7 +124,7 @@ static void print_vector(Scheme_Object *vec, int notdisplay, int compact,
static void print_char(Scheme_Object *chobj, int notdisplay, PrintParams *pp); static void print_char(Scheme_Object *chobj, int notdisplay, PrintParams *pp);
static char *print_to_string(Scheme_Object *obj, intptr_t * volatile len, int write, static char *print_to_string(Scheme_Object *obj, intptr_t * volatile len, int write,
Scheme_Object *port, intptr_t maxl, Scheme_Object *port, intptr_t maxl,
Scheme_Object *qq_depth); Scheme_Object *qq_depth, int *_release_to_quick);
static void custom_write_struct(Scheme_Object *s, Scheme_Hash_Table *ht, static void custom_write_struct(Scheme_Object *s, Scheme_Hash_Table *ht,
Scheme_Marshal_Tables *mt, Scheme_Marshal_Tables *mt,
@ -384,7 +384,7 @@ static void *print_to_string_k(void)
p->ku.k.p2 = NULL; p->ku.k.p2 = NULL;
p->ku.k.p3 = NULL; p->ku.k.p3 = NULL;
return (void *)print_to_string(obj, len, iswrite, NULL, maxl, qq_depth); return (void *)print_to_string(obj, len, iswrite, NULL, maxl, qq_depth, NULL);
} }
char *scheme_write_to_string_w_max(Scheme_Object *obj, intptr_t *len, intptr_t maxl) char *scheme_write_to_string_w_max(Scheme_Object *obj, intptr_t *len, intptr_t maxl)
@ -956,7 +956,7 @@ static char *
print_to_string(Scheme_Object *obj, print_to_string(Scheme_Object *obj,
intptr_t * volatile len, int write, intptr_t * volatile len, int write,
Scheme_Object *port, intptr_t maxl, Scheme_Object *port, intptr_t maxl,
Scheme_Object *qq_depth) Scheme_Object *qq_depth, int *_release_to_quick)
{ {
Scheme_Hash_Table *ht; Scheme_Hash_Table *ht;
Scheme_Hash_Table *uq_ht; Scheme_Hash_Table *uq_ht;
@ -1111,8 +1111,14 @@ print_to_string(Scheme_Object *obj,
params.inspector = NULL; params.inspector = NULL;
if (port && !quick_print_buffer) if (_release_to_quick) {
*_release_to_quick = 0;
if (params.print_buffer != ca) {
if (!quick_print_buffer)
quick_print_buffer = ca; quick_print_buffer = ca;
} else
*_release_to_quick = 1;
}
return params.print_buffer; return params.print_buffer;
} }
@ -1124,6 +1130,7 @@ print_to_port(char *name, Scheme_Object *obj, Scheme_Object *port, int notdispla
Scheme_Output_Port *op; Scheme_Output_Port *op;
char *str; char *str;
intptr_t len; intptr_t len;
int rel;
op = scheme_output_port_record(port); op = scheme_output_port_record(port);
if (op->closed) if (op->closed)
@ -1131,9 +1138,12 @@ print_to_port(char *name, Scheme_Object *obj, Scheme_Object *port, int notdispla
" port: %V", " port: %V",
name, port); name, port);
str = print_to_string(obj, &len, notdisplay, port, maxl, qq_depth); str = print_to_string(obj, &len, notdisplay, port, maxl, qq_depth, &rel);
scheme_write_byte_string(str, len, port); scheme_write_byte_string(str, len, port);
if (rel && !quick_print_buffer)
quick_print_buffer = str;
} }
static void print_this_string(PrintParams *pp, const char *str, int offset, int autolen) static void print_this_string(PrintParams *pp, const char *str, int offset, int autolen)
@ -2850,10 +2860,13 @@ print(Scheme_Object *obj, int notdisplay, int compact, Scheme_Hash_Table *ht,
if (pp->print_syntax) { if (pp->print_syntax) {
intptr_t slen; intptr_t slen;
char *str; char *str;
int rel;
print_utf8_string(pp, " ", 0, 1); print_utf8_string(pp, " ", 0, 1);
str = print_to_string(scheme_syntax_to_datum((Scheme_Object *)stx, 0, NULL), str = print_to_string(scheme_syntax_to_datum((Scheme_Object *)stx, 0, NULL),
&slen, 1, NULL, pp->print_syntax, NULL); &slen, 1, NULL, pp->print_syntax, NULL, &rel);
print_utf8_string(pp, str, 0, slen); print_utf8_string(pp, str, 0, slen);
if (rel && !quick_print_buffer)
quick_print_buffer = str;
} }
print_utf8_string(pp, ">", 0, 1); print_utf8_string(pp, ">", 0, 1);
} else { } else {