json_ryu_parse_float -> json_decode_float

Author: byroot

ext/json/ext/parser/parser.c

@@ -819,32 +819,24 @@ static VALUE json_decode_large_float(const char *start, long len)
 /* Ruby JSON optimized float decoder using vendored Ryu algorithm
  * Accepts pre-extracted mantissa and exponent from first-pass validation
  */
-static inline VALUE json_ryu_parse_float(uint64_t m10, int m10digits, int32_t e10, bool signedM,
+static inline VALUE json_decode_float(JSON_ParserConfig *config, uint64_t m10, int m10digits, int32_t e10, bool signedM,
                                           const char *start, const char *end)
 {
+    if (RB_UNLIKELY(config->decimal_class)) {
+        VALUE text = rb_str_new(start, end - start);
+        return rb_funcallv(config->decimal_class, config->decimal_method_id, 1, &text);
+    }
+
     // Fall back to rb_cstr_to_dbl for potential subnormals (rare edge case)
     // Ryu has rounding issues with subnormals around 1e-310 (< 2.225e-308)
-    if (m10digits + e10 < -307) {
-        // Use original string directly via shared helper
+    if (RB_UNLIKELY(m10digits > 17 || m10digits + e10 < -307)) {
         return json_decode_large_float(start, end - start);
     }
 
     double result = ryu_s2d_from_parts(m10, m10digits, e10, signedM);
     return DBL2NUM(result);
 }
 
-static VALUE json_decode_float(JSON_ParserConfig *config, const char *start, const char *end)
-{
-    long len = end - start;
-
-    if (RB_UNLIKELY(config->decimal_class)) {
-        VALUE text = rb_str_new(start, len);
-        return rb_funcallv(config->decimal_class, config->decimal_method_id, 1, &text);
-    } else {
-        return json_decode_large_float(start, len);
-    }
-}
-
 static inline VALUE json_decode_array(JSON_ParserState *state, JSON_ParserConfig *config, long count)
 {
     VALUE array = rb_ary_new_from_values(count, rvalue_stack_peek(state->stack, count));
@@ -1123,9 +1115,7 @@ static VALUE json_parse_any(JSON_ParserState *state, JSON_ParserConfig *config)
 
             // Parse integer part and extract mantissa digits
             while ((state->cursor < state->end) && rb_isdigit(*state->cursor)) {
-                if (m10digits < 17) {  // Only keep first 17 significant digits
-                    m10 = m10 * 10 + (*state->cursor - '0');
-                }
+                m10 = m10 * 10 + (*state->cursor - '0');
                 m10digits++;
                 state->cursor++;
             }
@@ -1150,9 +1140,7 @@ static VALUE json_parse_any(JSON_ParserState *state, JSON_ParserConfig *config)
                 }
 
                 while ((state->cursor < state->end) && rb_isdigit(*state->cursor)) {
-                    if (m10digits < 17) {  // Only keep first 17 significant digits
-                        m10 = m10 * 10 + (*state->cursor - '0');
-                    }
+                    m10 = m10 * 10 + (*state->cursor - '0');
                     m10digits++;
                     state->cursor++;
                 }
@@ -1191,13 +1179,7 @@ static VALUE json_parse_any(JSON_ParserState *state, JSON_ParserConfig *config)
                 e10 -= (m10digits - decimal_point_pos);
             }
 
-            // Use optimized Ryu path if we have a valid mantissa
-            if (m10digits > 0 && m10digits <= 17 && !config->decimal_class) {
-                return json_push_value(state, config, json_ryu_parse_float(m10, m10digits, e10, signedM, start, state->cursor));
-            }
-
-            // Fallback to standard path for edge cases
-            return json_push_value(state, config, json_decode_float(config, start, state->cursor));
+            return json_push_value(state, config, json_decode_float(config, m10, m10digits, e10, signedM, start, state->cursor));
         }
         case '"': {
             // %r{\A"[^"\\\t\n\x00]*(?:\\[bfnrtu\\/"][^"\\]*)*"}