From b3a8d5b84734c0eef460af1de526e6dcd10be800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Barri=C3=A9?= Date: Wed, 5 Feb 2025 12:35:30 +0100 Subject: [PATCH] Optimize Symbol generation in strict mode --- ext/json/ext/generator/generator.c | 38 +++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c index b2fcd2b2..e3141ddb 100644 --- a/ext/json/ext/generator/generator.c +++ b/ext/json/ext/generator/generator.c @@ -991,6 +991,29 @@ static void generate_json_string(FBuffer *buffer, struct generate_json_data *dat fbuffer_append_char(buffer, '"'); } +static void generate_json_fallback(FBuffer *buffer, struct generate_json_data *data, JSON_Generator_State *state, VALUE obj) +{ + VALUE tmp; + if (rb_respond_to(obj, i_to_json)) { + tmp = rb_funcall(obj, i_to_json, 1, vstate_get(data)); + Check_Type(tmp, T_STRING); + fbuffer_append_str(buffer, tmp); + } else { + tmp = rb_funcall(obj, i_to_s, 0); + Check_Type(tmp, T_STRING); + generate_json_string(buffer, data, state, tmp); + } +} + +static inline void generate_json_symbol(FBuffer *buffer, struct generate_json_data *data, JSON_Generator_State *state, VALUE obj) +{ + if (state->strict) { + generate_json_string(buffer, data, state, rb_sym2str(obj)); + } else { + generate_json_fallback(buffer, data, state, obj); + } +} + static void generate_json_null(FBuffer *buffer, struct generate_json_data *data, JSON_Generator_State *state, VALUE obj) { fbuffer_append(buffer, "null", 4); @@ -1049,7 +1072,6 @@ static void generate_json_fragment(FBuffer *buffer, struct generate_json_data *d static void generate_json(FBuffer *buffer, struct generate_json_data *data, JSON_Generator_State *state, VALUE obj) { - VALUE tmp; bool as_json_called = false; start: if (obj == Qnil) { @@ -1063,6 +1085,8 @@ static void generate_json(FBuffer *buffer, struct generate_json_data *data, JSON generate_json_fixnum(buffer, data, state, obj); } else if (RB_FLONUM_P(obj)) { generate_json_float(buffer, data, state, obj); + } else if (RB_STATIC_SYM_P(obj)) { + generate_json_symbol(buffer, data, state, obj); } else { goto general; } @@ -1084,6 +1108,10 @@ static void generate_json(FBuffer *buffer, struct generate_json_data *data, JSON if (klass != rb_cString) goto general; generate_json_string(buffer, data, state, obj); break; + case T_SYMBOL: + if (klass != rb_cSymbol) goto general; + generate_json_string(buffer, data, state, rb_sym2str(obj)); + break; case T_FLOAT: if (klass != rb_cFloat) goto general; generate_json_float(buffer, data, state, obj); @@ -1102,14 +1130,8 @@ static void generate_json(FBuffer *buffer, struct generate_json_data *data, JSON } else { raise_generator_error(obj, "%"PRIsVALUE" not allowed in JSON", CLASS_OF(obj)); } - } else if (rb_respond_to(obj, i_to_json)) { - tmp = rb_funcall(obj, i_to_json, 1, vstate_get(data)); - Check_Type(tmp, T_STRING); - fbuffer_append_str(buffer, tmp); } else { - tmp = rb_funcall(obj, i_to_s, 0); - Check_Type(tmp, T_STRING); - generate_json_string(buffer, data, state, tmp); + generate_json_fallback(buffer, data, state, obj); } } }