diff options
Diffstat (limited to 'pit/src/runtime/dump.c')
| -rw-r--r-- | pit/src/runtime/dump.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pit/src/runtime/dump.c b/pit/src/runtime/dump.c index 734c379..52441a8 100644 --- a/pit/src/runtime/dump.c +++ b/pit/src/runtime/dump.c @@ -111,8 +111,8 @@ pit_dump_condition pit_dump_with_callback( if (readable) { buf[i++] = '"'; } i64 maxlen = len - i; for (i64 j = 0; i < maxlen && j < h->in.bytes.len;) { - bool needs_backslash = - (i == 0 || buf[i - 1] != '\\') + bool needs_backslash = readable + && (i == 0 || buf[i - 1] != '\\') && (h->in.bytes.data[j] == '\\' || h->in.bytes.data[j] == '"'); if (needs_backslash) { buf[i++] = '\\'; @@ -192,11 +192,17 @@ i64 pit_dump_printf_callback(va_list ap, char *buf, size_t len, void *data) { pit_value arg = va_arg(ap, pit_value); return pit_dump(rt, buf, (i64) len, arg, false); } +i64 pit_dump_readable_printf_callback(va_list ap, char *buf, size_t len, void *data) { + pit_runtime *rt = (pit_runtime *) data; + pit_value arg = va_arg(ap, pit_value); + return pit_dump(rt, buf, (i64) len, arg, true); +} i64 pit_vsnprintf(pit_runtime *rt, char *buf, i64 len, char *format, va_list ap) { if (len == 0) return 0; - pit_printf_handler h[1]; + pit_printf_handler h[2]; h[0].specifier = 'v'; h[0].callback = pit_dump_printf_callback; - i64 ret = pit_vsnprintf_helper(buf, (size_t) (len - 1), format, ap, h, 1, rt); + h[1].specifier = 'V'; h[1].callback = pit_dump_readable_printf_callback; + i64 ret = pit_vsnprintf_helper(buf, (size_t) (len - 1), format, ap, h, 2, rt); buf[ret] = 0; return ret; } |