oj 3.14.2 → 3.14.3

data/ext/oj/sparse.c

@@ -7,10 +7,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "mem.h"
 #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"
@@ -213,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) {
@@ -250,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;
                     }
@@ -278,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;
             }
@@ -346,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);
@@ -430,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;
     }
@@ -444,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;
@@ -477,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;
@@ -592,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;
     }
@@ -717,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--;
@@ -746,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;
@@ -758,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;
@@ -800,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;
                 }
@@ -814,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)) {
@@ -879,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()) {
@@ -933,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:

data/ext/oj/stream_writer.c

@@ -4,8 +4,8 @@
 #include <errno.h>
 #include <ruby.h>
 
-#include "mem.h"
 #include "encode.h"
+#include "mem.h"
 
 extern VALUE Oj;
 
@@ -83,8 +83,8 @@ static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
     if (oj_stringio_class == clas) {
         type = STRING_IO;
 #if !IS_WINDOWS
-    } else if (rb_respond_to(stream, oj_fileno_id) &&
-               Qnil != (s = rb_funcall(stream, oj_fileno_id, 0)) && 0 != (fd = FIX2INT(s))) {
+    } else if (rb_respond_to(stream, oj_fileno_id) && Qnil != (s = rb_funcall(stream, oj_fileno_id, 0)) &&
+               0 != (fd = FIX2INT(s))) {
         type = FILE_IO;
 #endif
     } else if (rb_respond_to(stream, oj_write_id)) {
@@ -102,15 +102,10 @@ static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
             rb_gc_register_address(&buffer_size_sym);
         }
         if (Qnil != (v = rb_hash_lookup(argv[1], buffer_size_sym))) {
-#ifdef RUBY_INTEGER_UNIFICATION
             if (rb_cInteger != rb_obj_class(v)) {
+                OJ_R_FREE(sw);
                 rb_raise(rb_eArgError, ":buffer size must be a Integer.");
             }
-#else
-            if (T_FIXNUM != rb_type(v)) {
-                rb_raise(rb_eArgError, ":buffer size must be a Integer.");
-            }
-#endif
             buf_size = FIX2INT(v);
         }
         oj_str_writer_init(&sw->sw, buf_size);
@@ -140,7 +135,6 @@ static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
 static VALUE stream_writer_push_key(VALUE self, VALUE key) {
     StreamWriter sw = (StreamWriter)DATA_PTR(self);
 
-    rb_check_type(key, T_STRING);
     oj_str_writer_push_key(&sw->sw, StringValuePtr(key));
     if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
         stream_writer_write(sw);
@@ -165,7 +159,6 @@ static VALUE stream_writer_push_object(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[0]) {
             oj_str_writer_push_object(&sw->sw, 0);
         } else {
-            rb_check_type(argv[0], T_STRING);
             oj_str_writer_push_object(&sw->sw, StringValuePtr(argv[0]));
         }
         break;
@@ -194,7 +187,6 @@ static VALUE stream_writer_push_array(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[0]) {
             oj_str_writer_push_array(&sw->sw, 0);
         } else {
-            rb_check_type(argv[0], T_STRING);
             oj_str_writer_push_array(&sw->sw, StringValuePtr(argv[0]));
         }
         break;
@@ -222,7 +214,6 @@ static VALUE stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[1]) {
             oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
         } else {
-            rb_check_type(argv[1], T_STRING);
             oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, StringValuePtr(argv[1]));
         }
         break;
@@ -246,17 +237,13 @@ static VALUE stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
 static VALUE stream_writer_push_json(int argc, VALUE *argv, VALUE self) {
     StreamWriter sw = (StreamWriter)DATA_PTR(self);
 
-    rb_check_type(argv[0], T_STRING);
     switch (argc) {
     case 1: oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0); break;
     case 2:
         if (Qnil == argv[1]) {
             oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
         } else {
-            rb_check_type(argv[1], T_STRING);
-            oj_str_writer_push_json((StrWriter)DATA_PTR(self),
-                                    StringValuePtr(*argv),
-                                    StringValuePtr(argv[1]));
+            oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), StringValuePtr(argv[1]));
         }
         break;
     default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_json'."); break;

data/ext/oj/strict.c

@@ -17,7 +17,7 @@ VALUE oj_cstr_to_value(const char *str, size_t len, size_t cache_str) {
     volatile VALUE rstr = Qnil;
 
     if (len < cache_str) {
-	rstr = oj_str_intern(str, len);
+        rstr = oj_str_intern(str, len);
     } else {
         rstr = rb_str_new(str, len);
         rstr = oj_encode(rstr);
@@ -37,14 +37,14 @@ VALUE oj_calc_hash_key(ParseInfo pi, Val parent) {
         } else {
             rkey = rb_str_new(parent->key, parent->klen);
             rkey = oj_encode(rkey);
-	    OBJ_FREEZE(rkey); // frozen when used as a Hash key anyway
+            OBJ_FREEZE(rkey);  // frozen when used as a Hash key anyway
         }
         return rkey;
     }
     if (Yes == pi->options.sym_key) {
-	rkey = oj_sym_intern(parent->key, parent->klen);
+        rkey = oj_sym_intern(parent->key, parent->klen);
     } else {
-	rkey = oj_str_intern(parent->key, parent->klen);
+        rkey = oj_str_intern(parent->key, parent->klen);
     }
     return rkey;
 }
@@ -98,9 +98,7 @@ static VALUE start_hash(ParseInfo pi) {
 static void hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char *orig) {
     volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
 
-    rb_hash_aset(stack_peek(&pi->stack)->val,
-                 oj_calc_hash_key(pi, parent),
-                 rstr);
+    rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), rstr);
     if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rstr);
     }
@@ -113,18 +111,14 @@ static void hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
         oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
     v = oj_num_as_value(ni);
-    rb_hash_aset(stack_peek(&pi->stack)->val,
-                 oj_calc_hash_key(pi, parent),
-                 v);
+    rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), v);
     if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_number", pi, __FILE__, __LINE__, v);
     }
 }
 
 static void hash_set_value(ParseInfo pi, Val parent, VALUE value) {
-    rb_hash_aset(stack_peek(&pi->stack)->val,
-                 oj_calc_hash_key(pi, parent),
-                 value);
+    rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), value);
     if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
     }

data/ext/oj/string_writer.c

@@ -1,9 +1,9 @@
 // Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for license details.
 
-#include "mem.h"
 #include "dump.h"
 #include "encode.h"
+#include "mem.h"
 
 extern VALUE Oj;
 
@@ -56,10 +56,10 @@ void oj_str_writer_init(StrWriter sw, int buf_size) {
     }
     // Must be allocated. Using the out.stack_buffer results in double frees
     // and I haven't figured out why yet.
-    sw->out.buf        = OJ_R_ALLOC_N(char, buf_size);
-    sw->out.cur        = sw->out.buf;
-    sw->out.end        = sw->out.buf + buf_size - BUFFER_EXTRA;
-    sw->out.allocated  = true;
+    sw->out.buf       = OJ_R_ALLOC_N(char, buf_size);
+    sw->out.cur       = sw->out.buf;
+    sw->out.end       = sw->out.buf + buf_size - BUFFER_EXTRA;
+    sw->out.allocated = true;
 
     *sw->out.cur       = '\0';
     sw->out.circ_cache = NULL;
@@ -281,7 +281,6 @@ static VALUE str_writer_new(int argc, VALUE *argv, VALUE self) {
 static VALUE str_writer_push_key(VALUE self, VALUE key) {
     StrWriter sw = (StrWriter)DATA_PTR(self);
 
-    rb_check_type(key, T_STRING);
     oj_str_writer_push_key(sw, StringValuePtr(key));
 
     return Qnil;
@@ -303,7 +302,6 @@ static VALUE str_writer_push_object(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[0]) {
             oj_str_writer_push_object(sw, 0);
         } else {
-            rb_check_type(argv[0], T_STRING);
             oj_str_writer_push_object(sw, StringValuePtr(argv[0]));
         }
         break;
@@ -332,7 +330,6 @@ static VALUE str_writer_push_array(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[0]) {
             oj_str_writer_push_array(sw, 0);
         } else {
-            rb_check_type(argv[0], T_STRING);
             oj_str_writer_push_array(sw, StringValuePtr(argv[0]));
         }
         break;
@@ -359,7 +356,6 @@ static VALUE str_writer_push_value(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[1]) {
             oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
         } else {
-            rb_check_type(argv[1], T_STRING);
             oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, StringValuePtr(argv[1]));
         }
         break;
@@ -378,17 +374,13 @@ static VALUE str_writer_push_value(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE str_writer_push_json(int argc, VALUE *argv, VALUE self) {
-    rb_check_type(argv[0], T_STRING);
     switch (argc) {
     case 1: oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0); break;
     case 2:
         if (Qnil == argv[1]) {
             oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
         } else {
-            rb_check_type(argv[1], T_STRING);
-            oj_str_writer_push_json((StrWriter)DATA_PTR(self),
-                                    StringValuePtr(*argv),
-                                    StringValuePtr(argv[1]));
+            oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), StringValuePtr(argv[1]));
         }
         break;
     default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_json'."); break;

data/ext/oj/trace.h

@@ -17,28 +17,39 @@ typedef enum {
 
 struct _parseInfo;
 
-extern void
-            oj_trace(const char *func, VALUE obj, const char *file, int line, int depth, TraceWhere where);
+extern void oj_trace(const char *func, VALUE obj, const char *file, int line, int depth, TraceWhere where);
 extern void oj_trace_parse_in(const char *func, struct _parseInfo *pi, const char *file, int line);
-extern void
-            oj_trace_parse_call(const char *func, struct _parseInfo *pi, const char *file, int line, VALUE obj);
+extern void oj_trace_parse_call(const char *func, struct _parseInfo *pi, const char *file, int line, VALUE obj);
 extern void oj_trace_parse_hash_end(struct _parseInfo *pi, const char *file, int line);
 extern void oj_trace_parse_array_end(struct _parseInfo *pi, const char *file, int line);
 
-
 #ifdef OJ_ENABLE_TRACE_LOG
-    #define TRACE(option, func, obj, depth, where)   if (RB_UNLIKELY(Yes == option)) { oj_trace(func, obj, __FILE__, __LINE__, depth, where); }
-    #define TRACE_PARSE_IN(option, func, pi)         if (RB_UNLIKELY(Yes == option)) { oj_trace_parse_in(func, pi, __FILE__, __LINE__); }
-    #define TRACE_PARSE_CALL(option, func, pi, obj)  if (RB_UNLIKELY(Yes == option)) { oj_trace_parse_call(func, pi, __FILE__, __LINE__, obj); }
-    #define TRACE_PARSE_HASH_END(option, pi)         if (RB_UNLIKELY(Yes == option)) { oj_trace_parse_hash_end(pi, __FILE__, __LINE__); }
-    #define TRACE_PARSE_ARRAY_END(option, pi)        if (RB_UNLIKELY(Yes == option)) { oj_trace_parse_array_end(pi, __FILE__, __LINE__); }
+#define TRACE(option, func, obj, depth, where)                 \
+    if (RB_UNLIKELY(Yes == option)) {                          \
+        oj_trace(func, obj, __FILE__, __LINE__, depth, where); \
+    }
+#define TRACE_PARSE_IN(option, func, pi)                 \
+    if (RB_UNLIKELY(Yes == option)) {                    \
+        oj_trace_parse_in(func, pi, __FILE__, __LINE__); \
+    }
+#define TRACE_PARSE_CALL(option, func, pi, obj)                 \
+    if (RB_UNLIKELY(Yes == option)) {                           \
+        oj_trace_parse_call(func, pi, __FILE__, __LINE__, obj); \
+    }
+#define TRACE_PARSE_HASH_END(option, pi)                 \
+    if (RB_UNLIKELY(Yes == option)) {                    \
+        oj_trace_parse_hash_end(pi, __FILE__, __LINE__); \
+    }
+#define TRACE_PARSE_ARRAY_END(option, pi)                 \
+    if (RB_UNLIKELY(Yes == option)) {                     \
+        oj_trace_parse_array_end(pi, __FILE__, __LINE__); \
+    }
 #else
-    #define TRACE(option, func, obj, depth, where)
-    #define TRACE_PARSE_IN(option, func, pi)
-    #define TRACE_PARSE_CALL(option, func, pi, obj)
-    #define TRACE_PARSE_HASH_END(option, pi)
-    #define TRACE_PARSE_ARRAY_END(option, pi)
+#define TRACE(option, func, obj, depth, where)
+#define TRACE_PARSE_IN(option, func, pi)
+#define TRACE_PARSE_CALL(option, func, pi, obj)
+#define TRACE_PARSE_HASH_END(option, pi)
+#define TRACE_PARSE_ARRAY_END(option, pi)
 #endif
 
-
 #endif /* OJ_TRACE_H */