github_mirrors/quickjs
3
0
Fork 1
mirror of https://github.com/bellard/quickjs.git synced 2025-09-27 05:38:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

more efficient handling of strings in JSON.stringify()

Browse Source
This commit is contained in:
Fabrice Bellard 2025-09-10 18:40:10 +02:00
parent 8a0a6e92d2
commit 9f6c190731
1 changed files with 68 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
quickjs.c
View File

@ -13002,73 +13002,6 @@ static JSValue JS_ToStringCheckObject(JSContext *ctx, JSValueConst val)
return JS_ToString(ctx, val); return JS_ToString(ctx, val);
} }
static JSValue JS_ToQuotedString(JSContext *ctx, JSValueConst val1)
{
JSValue val;
JSString *p;
int i;
uint32_t c;
StringBuffer b_s, *b = &b_s;
char buf[16];
val = JS_ToStringCheckObject(ctx, val1);
if (JS_IsException(val))
return val;
p = JS_VALUE_GET_STRING(val);
if (string_buffer_init(ctx, b, p->len + 2))
goto fail;
if (string_buffer_putc8(b, '\"'))
goto fail;
for(i = 0; i < p->len; ) {
c = string_getc(p, &i);
switch(c) {
case '\t':
c = 't';
goto quote;
case '\r':
c = 'r';
goto quote;
case '\n':
c = 'n';
goto quote;
case '\b':
c = 'b';
goto quote;
case '\f':
c = 'f';
goto quote;
case '\"':
case '\\':
quote:
if (string_buffer_putc8(b, '\\'))
goto fail;
if (string_buffer_putc8(b, c))
goto fail;
break;
default:
if (c < 32 || is_surrogate(c)) {
snprintf(buf, sizeof(buf), "\\u%04x", c);
if (string_buffer_puts8(b, buf))
goto fail;
} else {
if (string_buffer_putc(b, c))
goto fail;
}
break;
}
}
if (string_buffer_putc8(b, '\"'))
goto fail;
JS_FreeValue(ctx, val);
return string_buffer_end(b);
fail:
JS_FreeValue(ctx, val);
string_buffer_free(b);
return JS_EXCEPTION;
}
#define JS_PRINT_MAX_DEPTH 8 #define JS_PRINT_MAX_DEPTH 8
typedef struct { typedef struct {
@ -46699,10 +46632,72 @@ typedef struct JSONStringifyContext {
StringBuffer *b; StringBuffer *b;
} JSONStringifyContext; } JSONStringifyContext;
static JSValue JS_ToQuotedStringFree(JSContext *ctx, JSValue val) { static int JS_ToQuotedString(JSContext *ctx, StringBuffer *b, JSValueConst val1)
JSValue r = JS_ToQuotedString(ctx, val); {
JSValue val;
JSString *p;
int i;
uint32_t c;
char buf[16];
val = JS_ToStringCheckObject(ctx, val1);
if (JS_IsException(val))
return -1;
p = JS_VALUE_GET_STRING(val);
if (string_buffer_putc8(b, '\"'))
goto fail;
for(i = 0; i < p->len; ) {
c = string_getc(p, &i);
switch(c) {
case '\t':
c = 't';
goto quote;
case '\r':
c = 'r';
goto quote;
case '\n':
c = 'n';
goto quote;
case '\b':
c = 'b';
goto quote;
case '\f':
c = 'f';
goto quote;
case '\"':
case '\\':
quote:
if (string_buffer_putc8(b, '\\'))
goto fail;
if (string_buffer_putc8(b, c))
goto fail;
break;
default:
if (c < 32 || is_surrogate(c)) {
snprintf(buf, sizeof(buf), "\\u%04x", c);
if (string_buffer_puts8(b, buf))
goto fail;
} else {
if (string_buffer_putc(b, c))
goto fail;
}
break;
}
}
if (string_buffer_putc8(b, '\"'))
goto fail;
JS_FreeValue(ctx, val); JS_FreeValue(ctx, val);
return r; return 0;
fail:
JS_FreeValue(ctx, val);
return -1;
}
static int JS_ToQuotedStringFree(JSContext *ctx, StringBuffer *b, JSValue val) {
int ret = JS_ToQuotedString(ctx, b, val);
JS_FreeValue(ctx, val);
return ret;
} }
static JSValue js_json_check(JSContext *ctx, JSONStringifyContext *jsc, static JSValue js_json_check(JSContext *ctx, JSONStringifyContext *jsc,
@ -46885,13 +46880,11 @@ static int js_json_to_str(JSContext *ctx, JSONStringifyContext *jsc,
if (!JS_IsUndefined(v)) { if (!JS_IsUndefined(v)) {
if (has_content) if (has_content)
string_buffer_putc8(jsc->b, ','); string_buffer_putc8(jsc->b, ',');
prop = JS_ToQuotedStringFree(ctx, prop); string_buffer_concat_value(jsc->b, sep);
if (JS_IsException(prop)) { if (JS_ToQuotedString(ctx, jsc->b, prop)) {
JS_FreeValue(ctx, v); JS_FreeValue(ctx, v);
goto exception; goto exception;
} }
string_buffer_concat_value(jsc->b, sep);
string_buffer_concat_value(jsc->b, prop);
string_buffer_putc8(jsc->b, ':'); string_buffer_putc8(jsc->b, ':');
string_buffer_concat_value(jsc->b, sep1); string_buffer_concat_value(jsc->b, sep1);
if (js_json_to_str(ctx, jsc, val, v, indent1)) if (js_json_to_str(ctx, jsc, val, v, indent1))
@ -46919,10 +46912,7 @@ static int js_json_to_str(JSContext *ctx, JSONStringifyContext *jsc,
switch (JS_VALUE_GET_NORM_TAG(val)) { switch (JS_VALUE_GET_NORM_TAG(val)) {
case JS_TAG_STRING: case JS_TAG_STRING:
case JS_TAG_STRING_ROPE: case JS_TAG_STRING_ROPE:
val = JS_ToQuotedStringFree(ctx, val); return JS_ToQuotedStringFree(ctx, jsc->b, val);
if (JS_IsException(val))
goto exception;
goto concat_value;
case JS_TAG_FLOAT64: case JS_TAG_FLOAT64:
if (!isfinite(JS_VALUE_GET_FLOAT64(val))) { if (!isfinite(JS_VALUE_GET_FLOAT64(val))) {
val = JS_NULL; val = JS_NULL;