oj 3.13.17 → 3.16.3

data/ext/oj/dump_leaf.c

@@ -17,9 +17,7 @@ inline static void dump_chars(const char *s, size_t size, Out out) {
 static void dump_leaf_str(Leaf leaf, Out out) {
     switch (leaf->value_type) {
     case STR_VAL: oj_dump_cstr(leaf->str, strlen(leaf->str), 0, 0, out); break;
-    case RUBY_VAL:
-        oj_dump_cstr(rb_string_value_cstr(&leaf->value), (int)RSTRING_LEN(leaf->value), 0, 0, out);
-        break;
+    case RUBY_VAL: oj_dump_cstr(StringValueCStr(leaf->value), (int)RSTRING_LEN(leaf->value), 0, 0, out); break;
     case COL_VAL:
     default: rb_raise(rb_eTypeError, "Unexpected value type %02x.\n", leaf->value_type); break;
     }
@@ -142,11 +140,11 @@ void oj_dump_leaf_to_json(Leaf leaf, Options copts, Out out) {
 void oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts) {
     struct _out out;
     size_t      size;
-    FILE *      f;
+    FILE       *f;
 
     oj_out_init(&out);
 
-    out.omit_nil  = copts->dump_opts.omit_nil;
+    out.omit_nil = copts->dump_opts.omit_nil;
     oj_dump_leaf_to_json(leaf, copts, &out);
     size = out.cur - out.buf;
     if (0 == (f = fopen(path, "w"))) {

data/ext/oj/dump_object.c

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #include "dump.h"
+#include "mem.h"
 #include "odd.h"
 #include "trace.h"
 
@@ -30,8 +31,8 @@ static void dump_data(VALUE obj, int depth, Out out, bool as_ok) {
         *out->cur   = '\0';
     } else {
         if (oj_bigdecimal_class == clas) {
-            volatile VALUE rstr = rb_funcall(obj, oj_to_s_id, 0);
-            const char *   str  = RSTRING_PTR(rstr);
+            volatile VALUE rstr = oj_safe_string_convert(obj);
+            const char    *str  = RSTRING_PTR(rstr);
             int            len  = (int)RSTRING_LEN(rstr);
 
             if (No != out->opts->bigdec_as_num) {
@@ -59,8 +60,8 @@ static void dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
     VALUE clas = rb_obj_class(obj);
 
     if (oj_bigdecimal_class == clas) {
-        volatile VALUE rstr = rb_funcall(obj, oj_to_s_id, 0);
-        const char *   str  = RSTRING_PTR(rstr);
+        volatile VALUE rstr = oj_safe_string_convert(obj);
+        const char    *str  = RSTRING_PTR(rstr);
         int            len  = (int)RSTRING_LEN(rstr);
 
         if (0 == strcasecmp("Infinity", str)) {
@@ -223,37 +224,36 @@ static int hash_cb(VALUE key, VALUE value, VALUE ov) {
         oj_dump_obj_val(value, depth, out);
         break;
 
-    default:
-        {
-            int     d2 = depth + 1;
-            long    s2 = size + out->indent + 1;
-            int     i;
-            int     started = 0;
-            uint8_t b;
-
-            assure_size(out, s2 + 15);
-            APPEND_CHARS(out->cur, "\"^#", 3);
-            out->hash_cnt++;
-            for (i = 28; 0 <= i; i -= 4) {
-                b = (uint8_t)((out->hash_cnt >> i) & 0x0000000F);
-                if ('\0' != b) {
-                    started = 1;
-                }
-                if (started) {
-                    *out->cur++ = hex_chars[b];
-                }
+    default: {
+        int     d2 = depth + 1;
+        long    s2 = size + out->indent + 1;
+        int     i;
+        int     started = 0;
+        uint8_t b;
+
+        assure_size(out, s2 + 15);
+        APPEND_CHARS(out->cur, "\"^#", 3);
+        out->hash_cnt++;
+        for (i = 28; 0 <= i; i -= 4) {
+            b = (uint8_t)((out->hash_cnt >> i) & 0x0000000F);
+            if ('\0' != b) {
+                started = 1;
+            }
+            if (started) {
+                *out->cur++ = hex_chars[b];
             }
-            APPEND_CHARS(out->cur, "\":[", 3);
-            fill_indent(out, d2);
-            oj_dump_obj_val(key, d2, out);
-            assure_size(out, s2);
-            *out->cur++ = ',';
-            fill_indent(out, d2);
-            oj_dump_obj_val(value, d2, out);
-            assure_size(out, size);
-            fill_indent(out, depth);
-            *out->cur++ = ']';
         }
+        APPEND_CHARS(out->cur, "\":[", 3);
+        fill_indent(out, d2);
+        oj_dump_obj_val(key, d2, out);
+        assure_size(out, s2);
+        *out->cur++ = ',';
+        fill_indent(out, d2);
+        oj_dump_obj_val(value, d2, out);
+        assure_size(out, size);
+        fill_indent(out, depth);
+        *out->cur++ = ']';
+    }
     }
     out->depth  = depth;
     *out->cur++ = ',';
@@ -363,10 +363,10 @@ static void dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 }
 
 static void dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
-    ID *           idp;
-    AttrGetFunc *  fp;
+    ID            *idp;
+    AttrGetFunc   *fp;
     volatile VALUE v;
-    const char *   name;
+    const char    *name;
     size_t         size;
     int            d2 = depth + 1;
 
@@ -422,7 +422,7 @@ static void dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
                 ID    i;
 
                 if (sizeof(nbuf) <= nlen) {
-                    if (NULL == (n2 = strdup(name))) {
+                    if (NULL == (n2 = OJ_STRDUP(name))) {
                         rb_raise(rb_eNoMemError, "for attribute name.");
                     }
                 } else {
@@ -439,7 +439,7 @@ static void dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
                 i = rb_intern(n);
                 v = rb_funcall(v, i, 0);
                 if (nbuf != n2) {
-                    free(n2);
+                    OJ_FREE(n2);
                 }
             }
             fill_indent(out, d2);
@@ -643,7 +643,7 @@ static void dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 #endif
     out->cur--;
     APPEND_CHARS(out->cur, "]}", 2);
-    *out->cur   = '\0';
+    *out->cur = '\0';
 }
 
 static void dump_complex(VALUE obj, int depth, Out out, bool as_ok) {
@@ -682,9 +682,7 @@ static DumpFunc obj_funcs[] = {
 void oj_dump_obj_val(VALUE obj, int depth, Out out) {
     int type = rb_type(obj);
 
-    if (Yes == out->opts->trace) {
-        oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
-    }
+    TRACE(out->opts->trace, "dump", obj, depth, TraceIn);
     if (MAX_DEPTH < depth) {
         rb_raise(rb_eNoMemError, "Too deeply nested.\n");
     }
@@ -693,14 +691,10 @@ void oj_dump_obj_val(VALUE obj, int depth, Out out) {
 
         if (NULL != f) {
             f(obj, depth, out, false);
-            if (Yes == out->opts->trace) {
-                oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceOut);
-            }
+            TRACE(out->opts->trace, "dump", obj, depth, TraceOut);
             return;
         }
     }
     oj_dump_nil(Qnil, depth, out, false);
-    if (Yes == out->opts->trace) {
-        oj_trace("dump", Qnil, __FILE__, __LINE__, depth, TraceOut);
-    }
+    TRACE(out->opts->trace, "dump", Qnil, depth, TraceOut);
 }

data/ext/oj/dump_strict.c

@@ -22,15 +22,13 @@ static const char ninf_val[] = NINF_VAL;
 static const char nan_val[]  = NAN_VAL;
 
 static void raise_strict(VALUE obj) {
-    rb_raise(rb_eTypeError,
-             "Failed to dump %s Object to JSON in strict mode.\n",
-             rb_class2name(rb_obj_class(obj)));
+    rb_raise(rb_eTypeError, "Failed to dump %s Object to JSON in strict mode.\n", rb_class2name(rb_obj_class(obj)));
 }
 
 // Removed dependencies on math due to problems with CentOS 5.4.
 static void dump_float(VALUE obj, int depth, Out out, bool as_ok) {
     char   buf[64];
-    char * b;
+    char*  b;
     double d   = rb_num2dbl(obj);
     int    cnt = 0;
 
@@ -92,7 +90,7 @@ static void dump_float(VALUE obj, int depth, Out out, bool as_ok) {
         } else if (d == (double)(long long int)d) {
             cnt = snprintf(buf, sizeof(buf), "%.1f", d);
         } else if (0 == out->opts->float_prec) {
-            volatile VALUE rstr = rb_funcall(obj, oj_to_s_id, 0);
+            volatile VALUE rstr = oj_safe_string_convert(obj);
 
             cnt = (int)RSTRING_LEN(rstr);
             if ((int)sizeof(buf) <= cnt) {
@@ -290,7 +288,7 @@ static void dump_data_strict(VALUE obj, int depth, Out out, bool as_ok) {
     VALUE clas = rb_obj_class(obj);
 
     if (oj_bigdecimal_class == clas) {
-        volatile VALUE rstr = rb_funcall(obj, oj_to_s_id, 0);
+        volatile VALUE rstr = oj_safe_string_convert(obj);
 
         oj_dump_raw(RSTRING_PTR(rstr), (int)RSTRING_LEN(rstr), out);
     } else {
@@ -302,7 +300,7 @@ static void dump_data_null(VALUE obj, int depth, Out out, bool as_ok) {
     VALUE clas = rb_obj_class(obj);
 
     if (oj_bigdecimal_class == clas) {
-        volatile VALUE rstr = rb_funcall(obj, oj_to_s_id, 0);
+        volatile VALUE rstr = oj_safe_string_convert(obj);
 
         oj_dump_raw(RSTRING_PTR(rstr), (int)RSTRING_LEN(rstr), out);
     } else {
@@ -338,9 +336,7 @@ static DumpFunc strict_funcs[] = {
 void oj_dump_strict_val(VALUE obj, int depth, Out out) {
     int type = rb_type(obj);
 
-    if (Yes == out->opts->trace) {
-        oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
-    }
+    TRACE(out->opts->trace, "dump", obj, depth, TraceIn);
     if (MAX_DEPTH < depth) {
         rb_raise(rb_eNoMemError, "Too deeply nested.\n");
     }
@@ -349,9 +345,7 @@ void oj_dump_strict_val(VALUE obj, int depth, Out out) {
 
         if (NULL != f) {
             f(obj, depth, out, false);
-            if (Yes == out->opts->trace) {
-                oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceOut);
-            }
+            TRACE(out->opts->trace, "dump", obj, depth, TraceOut);
             return;
         }
     }
@@ -386,9 +380,7 @@ static DumpFunc null_funcs[] = {
 void oj_dump_null_val(VALUE obj, int depth, Out out) {
     int type = rb_type(obj);
 
-    if (Yes == out->opts->trace) {
-        oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceOut);
-    }
+    TRACE(out->opts->trace, "dump", obj, depth, TraceOut);
     if (MAX_DEPTH < depth) {
         rb_raise(rb_eNoMemError, "Too deeply nested.\n");
     }
@@ -397,14 +389,10 @@ void oj_dump_null_val(VALUE obj, int depth, Out out) {
 
         if (NULL != f) {
             f(obj, depth, out, false);
-            if (Yes == out->opts->trace) {
-                oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceOut);
-            }
+            TRACE(out->opts->trace, "dump", obj, depth, TraceOut);
             return;
         }
     }
     oj_dump_nil(Qnil, depth, out, false);
-    if (Yes == out->opts->trace) {
-        oj_trace("dump", Qnil, __FILE__, __LINE__, depth, TraceOut);
-    }
+    TRACE(out->opts->trace, "dump", Qnil, depth, TraceOut);
 }

data/ext/oj/encoder.c

@@ -27,7 +27,7 @@ typedef struct _encoder {
     struct _dumpOpts dump_opts;
     struct _rxClass  str_rx;
     VALUE*           ignore;  // Qnil terminated array of classes or NULL
-} * Encoder;
+}* Encoder;
 
 /*
     rb_define_module_function(Oj, "encode", encode, -1);

data/ext/oj/err.c

@@ -39,11 +39,7 @@ void _oj_err_set_with_location(Err         err,
     oj_err_set(err, eclas, "%s at line %d, column %d [%s:%d]", msg, n, col, file, line);
 }
 
-void _oj_raise_error(const char *msg,
-                     const char *json,
-                     const char *current,
-                     const char *file,
-                     int         line) {
+void _oj_raise_error(const char *msg, const char *json, const char *current, const char *file, int line) {
     struct _err err;
     int         n   = 1;
     int         col = 1;
@@ -56,13 +52,6 @@ void _oj_raise_error(const char *msg,
             n++;
         }
     }
-    oj_err_set(&err,
-               oj_parse_error_class,
-               "%s at line %d, column %d [%s:%d]",
-               msg,
-               n,
-               col,
-               file,
-               line);
+    oj_err_set(&err, oj_parse_error_class, "%s at line %d, column %d [%s:%d]", msg, n, col, file, line);
     rb_raise(err.clas, "%s", err.msg);
 }

data/ext/oj/err.h

@@ -5,6 +5,7 @@
 #define OJ_ERR_H
 
 #include <errno.h>
+
 #include "ruby.h"
 
 // Needed to silence 2.4.0 warnings.
@@ -12,12 +13,12 @@
 #define NORETURN(x) x
 #endif
 
-#define OJ_ERR_START		300
+#define OJ_ERR_START 300
 
 typedef enum {
-    OJ_OK		= 0,
-    OJ_ERR_MEMORY	= ENOMEM,
-    OJ_ERR_PARSE	= OJ_ERR_START,
+    OJ_OK         = 0,
+    OJ_ERR_MEMORY = ENOMEM,
+    OJ_ERR_PARSE  = OJ_ERR_START,
     OJ_ERR_READ,
     OJ_ERR_WRITE,
     OJ_ERR_OVERFLOW,
@@ -29,13 +30,12 @@ typedef enum {
     OJ_ERR_LAST,
 } ojStatus;
 
-#define set_error(err, eclas, msg, json, current) \
-    _oj_err_set_with_location(err, eclas, msg, json, current, FILE, LINE)
+#define set_error(err, eclas, msg, json, current) _oj_err_set_with_location(err, eclas, msg, json, current, FILE, LINE)
 
 typedef struct _err {
     VALUE clas;
     char  msg[128];
-} * Err;
+} *Err;
 
 extern VALUE oj_parse_error_class;
 
@@ -52,11 +52,8 @@ NORETURN(extern void oj_err_raise(Err e));
 
 #define raise_error(msg, json, current) _oj_raise_error(msg, json, current, __FILE__, __LINE__)
 
-NORETURN(extern void _oj_raise_error(const char *msg,
-                                     const char *json,
-                                     const char *current,
-                                     const char *file,
-                                     int         line));
+NORETURN(
+    extern void _oj_raise_error(const char *msg, const char *json, const char *current, const char *file, int line));
 
 inline static void err_init(Err e) {
     e->clas = Qnil;

data/ext/oj/extconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mkmf'
 require 'rbconfig'
 
@@ -6,7 +8,7 @@ dir_config(extension_name)
 
 parts = RUBY_DESCRIPTION.split(' ')
 type = parts[0]
-type = type[4..-1] if type.start_with?('tcs-')
+type = type[4..] if type.start_with?('tcs-')
 is_windows = RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
 platform = RUBY_PLATFORM
 version = RUBY_VERSION.split('.')
@@ -34,12 +36,20 @@ have_func('rb_hash_bulk_insert', 'ruby.h') unless '2' == version[0] && '6' == ve
 
 dflags['OJ_DEBUG'] = true unless ENV['OJ_DEBUG'].nil?
 
-if try_cflags('-msse4.2')
-  $CPPFLAGS += ' -msse4.2'
-  dflags['OJ_USE_SSE4_2'] = 1
+if with_config('--with-sse42')
+  if try_cflags('-msse4.2')
+    $CPPFLAGS += ' -msse4.2'
+    dflags['OJ_USE_SSE4_2'] = 1
+  else
+    warn 'SSE 4.2 is not supported on this platform.'
+  end
+end
+
+if enable_config('trace-log', false)
+  dflags['OJ_ENABLE_TRACE_LOG'] = 1
 end
 
-dflags.each do |k,v|
+dflags.each do |k, v|
   if v.nil?
     $CPPFLAGS += " -D#{k}"
   else
@@ -48,7 +58,7 @@ dflags.each do |k,v|
 end
 
 $CPPFLAGS += ' -Wall'
-#puts "*** $CPPFLAGS: #{$CPPFLAGS}"
+# puts "*** $CPPFLAGS: #{$CPPFLAGS}"
 # Adding the __attribute__ flag only works with gcc compilers and even then it
 # does not work to check args with varargs so just remove the check.
 CONFIG['warnflags'].slice!(/ -Wsuggest-attribute=format/)