oj 3.13.23 → 3.16.9

data/ext/oj/saj2.c

@@ -1,12 +1,14 @@
 // Copyright (c) 2021, Peter Ohler, All rights reserved.
 
+#include "saj2.h"
+
 #include "cache.h"
+#include "mem.h"
 #include "oj.h"
 #include "parser.h"
-#include "saj2.h"
 
 static VALUE get_key(ojParser p) {
-    Saj       d   = (Saj)p->ctx;
+    Saj            d   = (Saj)p->ctx;
     const char    *key = buf_str(&p->key);
     size_t         len = buf_len(&p->key);
     volatile VALUE rkey;
@@ -24,7 +26,7 @@ static void push_key(Saj d, VALUE key) {
         size_t off = d->tail - d->keys;
 
         d->klen += d->klen / 2;
-        REALLOC_N(d->keys, VALUE, d->klen);
+        OJ_R_REALLOC_N(d->keys, VALUE, d->klen);
         d->tail = d->keys + off;
     }
     *d->tail = key;
@@ -43,7 +45,7 @@ static void open_object_loc(ojParser p) {
 }
 
 static void open_object_key(ojParser p) {
-    Saj       d   = (Saj)p->ctx;
+    Saj            d   = (Saj)p->ctx;
     volatile VALUE key = get_key(p);
 
     push_key(d, key);
@@ -51,7 +53,7 @@ static void open_object_key(ojParser p) {
 }
 
 static void open_object_loc_key(ojParser p) {
-    Saj       d   = (Saj)p->ctx;
+    Saj            d   = (Saj)p->ctx;
     volatile VALUE key = get_key(p);
 
     push_key(d, key);
@@ -67,7 +69,7 @@ static void open_array_loc(ojParser p) {
 }
 
 static void open_array_key(ojParser p) {
-    Saj       d   = (Saj)p->ctx;
+    Saj            d   = (Saj)p->ctx;
     volatile VALUE key = get_key(p);
 
     push_key(d, key);
@@ -75,7 +77,7 @@ static void open_array_key(ojParser p) {
 }
 
 static void open_array_loc_key(ojParser p) {
-    Saj       d   = (Saj)p->ctx;
+    Saj            d   = (Saj)p->ctx;
     volatile VALUE key = get_key(p);
 
     push_key(d, key);
@@ -83,8 +85,8 @@ static void open_array_loc_key(ojParser p) {
 }
 
 static void close_object(ojParser p) {
-    Saj d   = (Saj)p->ctx;
-    VALUE    key = Qnil;
+    Saj   d   = (Saj)p->ctx;
+    VALUE key = Qnil;
 
     if (OBJECT_FUN == p->stack[p->depth]) {
         d->tail--;
@@ -97,8 +99,8 @@ static void close_object(ojParser p) {
 }
 
 static void close_object_loc(ojParser p) {
-    Saj d   = (Saj)p->ctx;
-    VALUE    key = Qnil;
+    Saj   d   = (Saj)p->ctx;
+    VALUE key = Qnil;
 
     if (OBJECT_FUN == p->stack[p->depth]) {
         d->tail--;
@@ -111,8 +113,8 @@ static void close_object_loc(ojParser p) {
 }
 
 static void close_array(ojParser p) {
-    Saj d   = (Saj)p->ctx;
-    VALUE    key = Qnil;
+    Saj   d   = (Saj)p->ctx;
+    VALUE key = Qnil;
 
     if (OBJECT_FUN == p->stack[p->depth]) {
         d->tail--;
@@ -125,8 +127,8 @@ static void close_array(ojParser p) {
 }
 
 static void close_array_loc(ojParser p) {
-    Saj d   = (Saj)p->ctx;
-    VALUE    key = Qnil;
+    Saj   d   = (Saj)p->ctx;
+    VALUE key = Qnil;
 
     if (OBJECT_FUN == p->stack[p->depth]) {
         d->tail--;
@@ -143,13 +145,7 @@ static void add_null(ojParser p) {
 }
 
 static void add_null_loc(ojParser p) {
-    rb_funcall(((Saj)p->ctx)->handler,
-               oj_add_value_id,
-               4,
-               Qnil,
-               Qnil,
-               LONG2FIX(p->line),
-               LONG2FIX(p->cur - p->col));
+    rb_funcall(((Saj)p->ctx)->handler, oj_add_value_id, 4, Qnil, Qnil, LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
 }
 
 static void add_null_key(ojParser p) {
@@ -171,13 +167,7 @@ static void add_true(ojParser p) {
 }
 
 static void add_true_loc(ojParser p) {
-    rb_funcall(((Saj)p->ctx)->handler,
-               oj_add_value_id,
-               4,
-               Qtrue,
-               Qnil,
-               LONG2FIX(p->line),
-               LONG2FIX(p->cur - p->col));
+    rb_funcall(((Saj)p->ctx)->handler, oj_add_value_id, 4, Qtrue, Qnil, LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
 }
 
 static void add_true_key(ojParser p) {
@@ -199,13 +189,7 @@ static void add_false(ojParser p) {
 }
 
 static void add_false_loc(ojParser p) {
-    rb_funcall(((Saj)p->ctx)->handler,
-               oj_add_value_id,
-               4,
-               Qfalse,
-               Qnil,
-               LONG2FIX(p->line),
-               LONG2FIX(p->cur - p->col));
+    rb_funcall(((Saj)p->ctx)->handler, oj_add_value_id, 4, Qfalse, Qnil, LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
 }
 
 static void add_false_key(ojParser p) {
@@ -315,7 +299,7 @@ static void add_big_key_loc(ojParser p) {
 }
 
 static void add_str(ojParser p) {
-    Saj       d = (Saj)p->ctx;
+    Saj            d = (Saj)p->ctx;
     volatile VALUE rstr;
     const char    *str = buf_str(&p->buf);
     size_t         len = buf_len(&p->buf);
@@ -329,7 +313,7 @@ static void add_str(ojParser p) {
 }
 
 static void add_str_loc(ojParser p) {
-    Saj       d = (Saj)p->ctx;
+    Saj            d = (Saj)p->ctx;
     volatile VALUE rstr;
     const char    *str = buf_str(&p->buf);
     size_t         len = buf_len(&p->buf);
@@ -343,7 +327,7 @@ static void add_str_loc(ojParser p) {
 }
 
 static void add_str_key(ojParser p) {
-    Saj       d = (Saj)p->ctx;
+    Saj            d = (Saj)p->ctx;
     volatile VALUE rstr;
     const char    *str = buf_str(&p->buf);
     size_t         len = buf_len(&p->buf);
@@ -357,7 +341,7 @@ static void add_str_key(ojParser p) {
 }
 
 static void add_str_key_loc(ojParser p) {
-    Saj       d = (Saj)p->ctx;
+    Saj            d = (Saj)p->ctx;
     volatile VALUE rstr;
     const char    *str = buf_str(&p->buf);
     size_t         len = buf_len(&p->buf);
@@ -546,18 +530,18 @@ static void dfree(ojParser p) {
     Saj d = (Saj)p->ctx;
 
     if (NULL != d->keys) {
-        xfree(d->keys);
+        OJ_R_FREE(d->keys);
     }
     cache_free(d->str_cache);
-    xfree(p->ctx);
+    OJ_R_FREE(p->ctx);
 }
 
 static void mark(ojParser p) {
     if (NULL == p || NULL == p->ctx) {
         return;
     }
-    Saj d = (Saj)p->ctx;
-    VALUE   *kp;
+    Saj    d = (Saj)p->ctx;
+    VALUE *kp;
 
     cache_mark(d->str_cache);
     if (Qnil != d->handler) {
@@ -575,10 +559,14 @@ static VALUE form_str(const char *str, size_t len) {
 }
 
 void oj_init_saj(ojParser p, Saj d) {
-    d->klen      = 256;
-    d->keys      = ALLOC_N(VALUE, d->klen);
-    d->tail      = d->keys;
-    d->str_cache = cache_create(0, form_str, true, false);
+    d->klen        = 256;
+    d->keys        = OJ_R_ALLOC_N(VALUE, d->klen);
+    d->tail        = d->keys;
+    d->handler     = Qnil;
+    d->str_cache   = cache_create(0, form_str, true, false);
+    d->cache_str   = 16;
+    d->cache_keys  = true;
+    d->thread_safe = false;
 
     p->ctx = (void *)d;
     reset(p);
@@ -590,7 +578,7 @@ void oj_init_saj(ojParser p, Saj d) {
 }
 
 void oj_set_parser_saj(ojParser p) {
-    Saj d = ALLOC(struct _saj);
+    Saj d = OJ_R_ALLOC(struct _saj);
 
     oj_init_saj(p, d);
 }

data/ext/oj/saj2.h

@@ -15,7 +15,7 @@ typedef struct _saj {
     uint8_t        cache_str;
     bool           cache_keys;
     bool           thread_safe;
-} * Saj;
+} *Saj;
 
 // Initialize the parser with the SAJ delegate. If the SAJ delegate is wrapped
 // then this function is called first and then the parser functions can be

data/ext/oj/scp.c

@@ -33,8 +33,7 @@ static VALUE noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
     return Qundef;
 }
 
-static void
-noop_hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *orig) {
+static void noop_hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *orig) {
 }
 
 static void noop_hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
@@ -91,12 +90,7 @@ static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, c
     volatile VALUE rstr = rb_str_new(str, len);
 
     rstr = oj_encode(rstr);
-    rb_funcall(pi->handler,
-               oj_hash_set_id,
-               3,
-               stack_peek(&pi->stack)->val,
-               oj_calc_hash_key(pi, kval),
-               rstr);
+    rb_funcall(pi->handler, oj_hash_set_id, 3, stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, kval), rstr);
 }
 
 static void hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
@@ -109,12 +103,7 @@ static void hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
 }
 
 static void hash_set_value(ParseInfo pi, Val kval, VALUE value) {
-    rb_funcall(pi->handler,
-               oj_hash_set_id,
-               3,
-               stack_peek(&pi->stack)->val,
-               oj_calc_hash_key(pi, kval),
-               value);
+    rb_funcall(pi->handler, oj_hash_set_id, 3, stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, kval), value);
 }
 
 static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {

data/ext/oj/sparse.c

@@ -10,6 +10,7 @@
 #include "buf.h"
 #include "encode.h"
 #include "intern.h"  // for oj_strndup()
+#include "mem.h"
 #include "oj.h"
 #include "parse.h"
 #include "val_stack.h"
@@ -71,7 +72,7 @@ static void add_value(ParseInfo pi, VALUE rval) {
         case NEXT_HASH_VALUE:
             pi->hash_set_value(pi, parent, rval);
             if (parent->kalloc) {
-                xfree((char *)parent->key);
+                OJ_R_FREE((char *)parent->key);
             }
             parent->key    = 0;
             parent->kalloc = 0;
@@ -110,7 +111,7 @@ static void add_num_value(ParseInfo pi, NumInfo ni) {
         case NEXT_HASH_VALUE:
             pi->hash_set_num(pi, parent, ni);
             if (parent->kalloc) {
-                xfree((char *)parent->key);
+                OJ_R_FREE((char *)parent->key);
             }
             parent->key    = 0;
             parent->kalloc = 0;
@@ -212,11 +213,7 @@ static void read_escaped_str(ParseInfo pi) {
     }
     while ('\"' != (c = reader_get(&pi->rd))) {
         if ('\0' == c) {
-            oj_set_error_at(pi,
-                            oj_parse_error_class,
-                            __FILE__,
-                            __LINE__,
-                            "quoted string not terminated");
+            oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "quoted string not terminated");
             buf_cleanup(&buf);
             return;
         } else if ('\\' == c) {
@@ -249,11 +246,7 @@ static void read_escaped_str(ParseInfo pi) {
                             reader_backup(&pi->rd);
                             break;
                         }
-                        oj_set_error_at(pi,
-                                        oj_parse_error_class,
-                                        __FILE__,
-                                        __LINE__,
-                                        "invalid escaped character");
+                        oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
                         buf_cleanup(&buf);
                         return;
                     }
@@ -277,11 +270,7 @@ static void read_escaped_str(ParseInfo pi) {
                     buf_append(&buf, c);
                     break;
                 }
-                oj_set_error_at(pi,
-                                oj_parse_error_class,
-                                __FILE__,
-                                __LINE__,
-                                "invalid escaped character");
+                oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
                 buf_cleanup(&buf);
                 return;
             }
@@ -315,7 +304,7 @@ static void read_escaped_str(ParseInfo pi) {
         case NEXT_HASH_VALUE:
             pi->hash_set_cstr(pi, parent, buf.head, buf_len(&buf), pi->rd.str);
             if (parent->kalloc) {
-                xfree((char *)parent->key);
+                OJ_R_FREE((char *)parent->key);
             }
             parent->key    = 0;
             parent->kalloc = 0;
@@ -345,11 +334,7 @@ static void read_str(ParseInfo pi) {
     reader_protect(&pi->rd);
     while ('\"' != (c = reader_get(&pi->rd))) {
         if ('\0' == c) {
-            oj_set_error_at(pi,
-                            oj_parse_error_class,
-                            __FILE__,
-                            __LINE__,
-                            "quoted string not terminated");
+            oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "quoted string not terminated");
             return;
         } else if ('\\' == c) {
             reader_backup(&pi->rd);
@@ -386,7 +371,7 @@ static void read_str(ParseInfo pi) {
         case NEXT_HASH_VALUE:
             pi->hash_set_cstr(pi, parent, pi->rd.str, pi->rd.tail - pi->rd.str - 1, pi->rd.str);
             if (parent->kalloc) {
-                xfree((char *)parent->key);
+                OJ_R_FREE((char *)parent->key);
             }
             parent->key    = 0;
             parent->kalloc = 0;
@@ -429,7 +414,7 @@ static void read_num(ParseInfo pi) {
         ni.no_big      = !pi->options.compat_bigdec;
         ni.bigdec_load = pi->options.compat_bigdec;
     } else {
-        ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load ||
+        ni.no_big      = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load ||
                      RubyDec == pi->options.bigdec_load);
         ni.bigdec_load = pi->options.bigdec_load;
     }
@@ -443,18 +428,10 @@ static void read_num(ParseInfo pi) {
     }
     if ('I' == c) {
         if (No == pi->options.allow_nan) {
-            oj_set_error_at(pi,
-                            oj_parse_error_class,
-                            __FILE__,
-                            __LINE__,
-                            "not a number or other value");
+            oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
             return;
         } else if (0 != reader_expect(&pi->rd, "nfinity")) {
-            oj_set_error_at(pi,
-                            oj_parse_error_class,
-                            __FILE__,
-                            __LINE__,
-                            "not a number or other value");
+            oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
             return;
         }
         ni.infinity = 1;
@@ -476,11 +453,7 @@ static void read_num(ParseInfo pi) {
 
                 if (0 < d) {
                     if (zero1 && CompatMode == pi->options.mode) {
-                        oj_set_error_at(pi,
-                                        oj_parse_error_class,
-                                        __FILE__,
-                                        __LINE__,
-                                        "not a number");
+                        oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
                         return;
                     }
                     zero1 = false;
@@ -591,7 +564,7 @@ static void read_nan(ParseInfo pi) {
         ni.no_big      = !pi->options.compat_bigdec;
         ni.bigdec_load = pi->options.compat_bigdec;
     } else {
-        ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load ||
+        ni.no_big      = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load ||
                      RubyDec == pi->options.bigdec_load);
         ni.bigdec_load = pi->options.bigdec_load;
     }
@@ -716,11 +689,7 @@ void oj_sparse2(ParseInfo pi) {
         case '"': read_str(pi); break;
         case '+':
             if (CompatMode == pi->options.mode) {
-                oj_set_error_at(pi,
-                                oj_parse_error_class,
-                                __FILE__,
-                                __LINE__,
-                                "unexpected character");
+                oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "unexpected character");
                 return;
             }
             pi->cur--;
@@ -745,11 +714,7 @@ void oj_sparse2(ParseInfo pi) {
                 reader_backup(&pi->rd);
                 read_num(pi);
             } else {
-                oj_set_error_at(pi,
-                                oj_parse_error_class,
-                                __FILE__,
-                                __LINE__,
-                                "unexpected character");
+                oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "unexpected character");
                 return;
             }
             break;
@@ -757,11 +722,7 @@ void oj_sparse2(ParseInfo pi) {
             if (Yes == pi->options.allow_nan) {
                 read_nan(pi);
             } else {
-                oj_set_error_at(pi,
-                                oj_parse_error_class,
-                                __FILE__,
-                                __LINE__,
-                                "unexpected character");
+                oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "unexpected character");
                 return;
             }
             break;
@@ -799,8 +760,7 @@ void oj_sparse2(ParseInfo pi) {
                     ni.no_big      = !pi->options.compat_bigdec;
                     ni.bigdec_load = pi->options.compat_bigdec;
                 } else {
-                    ni.no_big      = (FloatDec == pi->options.bigdec_load ||
-                                 FastDec == pi->options.bigdec_load ||
+                    ni.no_big      = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load ||
                                  RubyDec == pi->options.bigdec_load);
                     ni.bigdec_load = pi->options.bigdec_load;
                 }
@@ -813,13 +773,7 @@ void oj_sparse2(ParseInfo pi) {
         case '/': skip_comment(pi); break;
         case '\0': return;
         default:
-            oj_set_error_at(pi,
-                            oj_parse_error_class,
-                            __FILE__,
-                            __LINE__,
-                            "unexpected character '%c' [0x%02x]",
-                            c,
-                            c);
+            oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "unexpected character '%c' [0x%02x]", c, c);
             return;
         }
         if (err_has(&pi->err)) {
@@ -878,8 +832,8 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
         } else {
             rb_raise(rb_eTypeError, "Nil is not a valid JSON source.");
         }
-    } else if (CompatMode == pi->options.mode && T_STRING == rb_type(input) &&
-               No == pi->options.nilnil && 0 == RSTRING_LEN(input)) {
+    } else if (CompatMode == pi->options.mode && T_STRING == rb_type(input) && No == pi->options.nilnil &&
+               0 == RSTRING_LEN(input)) {
         rb_raise(oj_json_parser_error_class, "An empty string is not a valid JSON string.");
     }
     if (rb_block_given_p()) {
@@ -932,9 +886,7 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
             switch (v->next) {
             case NEXT_ARRAY_NEW:
             case NEXT_ARRAY_ELEMENT:
-            case NEXT_ARRAY_COMMA:
-                oj_set_error_at(pi, err_class, __FILE__, __LINE__, "Array not terminated");
-                break;
+            case NEXT_ARRAY_COMMA: oj_set_error_at(pi, err_class, __FILE__, __LINE__, "Array not terminated"); break;
             case NEXT_HASH_NEW:
             case NEXT_HASH_KEY:
             case NEXT_HASH_COLON: