oj 3.7.5 → 3.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b79a00294bf924b3e584d91bf719d1b0e74fd567d8b677b394930a7825bda34
-  data.tar.gz: 402f51a51d76e0f3ac1e6527b0b00a67885bc1c25d246388ab96e0ccf1354e22
+  metadata.gz: 7289437b014edb9bb095abd9827815e3bea0efb62b4e5486d0034158c4811c1c
+  data.tar.gz: 5d341b6a90bb002d7324f55277010a78236b6338710b58f490e416001167e5fa
 SHA512:
-  metadata.gz: aab6be5b3ec6fd7f98323d38c7efe439f309d70b59ab12acfd02fb0290b99b8ba39b7d8ee9a2cd34d9a8a6f2fb69391bcaedb5c680f059df0da840e42f6484bc
-  data.tar.gz: 9b36cb9b71beaed79b0b5d3ff8f277366b105d7c51a78e93a465824d6a86afffac16c9f719b46dcbc00337130b55bf6ccf4912eea7180c07d86ef48a9fc2419e
+  metadata.gz: 8f68b2fb4f0762ce86cdc9a1a56ecd42d377f485fc32d0f36cf1c0ef689eee14f73b76a3b77dd7ecd7c0d6cc3837064cb62ea201e705145af40a18aaa93cdfe8
+  data.tar.gz: 6406b48f3439c1340d23e1aea04fc6d781bbd0195012cdff94fbf81e409fd43978606d5fe0b61eca1c7ea635a8af16b1de876df92c3729d4ac96fb4d9951b239

data/ext/oj/buf.h

@@ -28,12 +28,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __OJ_BUF_H__
-#define __OJ_BUF_H__
+#ifndef OJ_BUF_H
+#define OJ_BUF_H
 
 #include "ruby.h"
 
-typedef struct _Buf {
+typedef struct _buf {
     char	*head;
     char	*end;
     char	*tail;
@@ -100,4 +100,4 @@ buf_append(Buf buf, char c) {
     //*buf->tail = '\0'; // for debugging
 }
 
-#endif /* __OJ_BUF_H__ */
+#endif /* OJ_BUF_H */

data/ext/oj/cache8.c

@@ -14,11 +14,11 @@
 #define DEPTH		16
 
 typedef union {
-    struct _Cache8	*child;
+    struct _cache8	*child;
     slot_t		value;
 } Bucket;
 
-struct _Cache8 {
+struct _cache8 {
     Bucket	buckets[SLOT_CNT];
 };
 
@@ -30,7 +30,7 @@ oj_cache8_new(Cache8 *cache) {
     Bucket	*b;
     int		i;
     
-    *cache = ALLOC(struct _Cache8);
+    *cache = ALLOC(struct _cache8);
     for (i = SLOT_CNT, b = (*cache)->buckets; 0 < i; i--, b++) {
 	b->value = 0;
     }

data/ext/oj/cache8.h

@@ -28,13 +28,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __OJ_CACHE8_H__
-#define __OJ_CACHE8_H__
+#ifndef OJ_CACHE8_H
+#define OJ_CACHE8_H
 
 #include "ruby.h"
 #include "stdint.h"
 
-typedef struct _Cache8	*Cache8;
+typedef struct _cache8	*Cache8;
 typedef uint64_t	slot_t;
 typedef uint64_t	sid_t;
 
@@ -45,4 +45,4 @@ extern slot_t	oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
 
 extern void	oj_cache8_print(Cache8 cache);
 
-#endif /* __OJ_CACHE8_H__ */
+#endif /* OJ_CACHE8_H */

data/ext/oj/circarray.c

@@ -9,7 +9,7 @@ CircArray
 oj_circ_array_new() {
     CircArray	ca;
     
-    if (0 == (ca = ALLOC(struct _CircArray))) {
+    if (0 == (ca = ALLOC(struct _circArray))) {
 	rb_raise(rb_eNoMemError, "not enough memory\n");
     }
     ca->objs = ca->obj_array;

data/ext/oj/circarray.h

@@ -3,12 +3,12 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_CIRCARRAY_H__
-#define __OJ_CIRCARRAY_H__
+#ifndef OJ_CIRCARRAY_H
+#define OJ_CIRCARRAY_H
 
 #include "ruby.h"
 
-typedef struct _CircArray {
+typedef struct _circArray {
     VALUE		obj_array[1024];
     VALUE		*objs;
     unsigned long	size; // allocated size or initial array size
@@ -20,4 +20,4 @@ extern void		oj_circ_array_free(CircArray ca);
 extern void		oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id);
 extern VALUE		oj_circ_array_get(CircArray ca, unsigned long id);
 
-#endif /* __OJ_CIRCARRAY_H__ */
+#endif /* OJ_CIRCARRAY_H */

data/ext/oj/code.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_CODE_H__
-#define __OJ_CODE_H__
+#ifndef OJ_CODE_H
+#define OJ_CODE_H
 
 #include <ruby.h>
 
@@ -13,7 +13,7 @@
 typedef void	(*EncodeFunc)(VALUE obj, int depth, Out out);
 typedef VALUE	(*DecodeFunc)(VALUE clas, VALUE args);
 
-typedef struct _Code {
+typedef struct _code {
     const char	*name;
     VALUE	clas;
     EncodeFunc	encode;
@@ -22,7 +22,7 @@ typedef struct _Code {
 } *Code;
 
 // Used by encode functions.
-typedef struct _Attr {
+typedef struct _attr {
     const char	*name;
     int		len;
     VALUE	value;
@@ -37,6 +37,6 @@ extern bool	oj_code_has(Code codes, VALUE clas, bool encode);
 
 extern void	oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class);
 
-extern struct _Code	oj_compat_codes[];
+extern struct _code	oj_compat_codes[];
 
-#endif /* __OJ_CODE_H__ */
+#endif /* OJ_CODE_H */

data/ext/oj/compat.c

@@ -78,7 +78,7 @@ start_hash(ParseInfo pi) {
 }
 
 static void
-end_hash(struct _ParseInfo *pi) {
+end_hash(struct _parseInfo *pi) {
     Val	parent = stack_peek(&pi->stack);
 
     if (0 != parent->classname) {
@@ -144,7 +144,7 @@ add_num(ParseInfo pi, NumInfo ni) {
 }
 
 static void
-hash_set_num(struct _ParseInfo *pi, Val parent, NumInfo ni) {
+hash_set_num(struct _parseInfo *pi, Val parent, NumInfo ni) {
     volatile VALUE	rval = oj_num_as_value(ni);
     
     if (!oj_use_hash_alt && rb_cHash != rb_obj_class(parent->val)) {
@@ -242,7 +242,7 @@ oj_set_compat_callbacks(ParseInfo pi) {
 
 VALUE
 oj_compat_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -263,7 +263,7 @@ oj_compat_parse(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_compat_load(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -284,7 +284,7 @@ oj_compat_load(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_compat_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;

data/ext/oj/custom.c

@@ -21,7 +21,7 @@ extern VALUE	oj_parse_xml_time(const char *str, int len); // from object.c
 
 static void
 dump_obj_str(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "s", 1, Qnil },
 	{ NULL, 0, Qnil },
     };
@@ -55,7 +55,7 @@ static ID	imag_id = 0;
 
 static void
 complex_dump(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "real", 4, Qnil },
 	{ "imag", 4, Qnil },
 	{ NULL, 0, Qnil },
@@ -82,7 +82,7 @@ complex_load(VALUE clas, VALUE args) {
 static void
 time_dump(VALUE obj, int depth, Out out) {
     if (Yes == out->opts->create_ok) {
-	struct _Attr	attrs[] = {
+	struct _attr	attrs[] = {
 	    { "time", 4, Qundef, 0, Qundef },
 	    { NULL, 0, Qnil },
 	};
@@ -103,7 +103,7 @@ time_dump(VALUE obj, int depth, Out out) {
 static void
 date_dump(VALUE obj, int depth, Out out) {
     if (Yes == out->opts->create_ok) {
-	struct _Attr	attrs[] = {
+	struct _attr	attrs[] = {
 	    { "s", 1, Qnil },
 	    { NULL, 0, Qnil },
 	};
@@ -169,7 +169,7 @@ static ID	table_id = 0;
 
 static void
 openstruct_dump(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "table", 5, Qnil },
 	{ NULL, 0, Qnil },
     };
@@ -191,7 +191,7 @@ openstruct_load(VALUE clas, VALUE args) {
 
 static void
 range_dump(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "begin", 5, Qnil },
 	{ "end", 3, Qnil },
 	{ "exclude", 7, Qnil },
@@ -220,7 +220,7 @@ static ID	denominator_id = 0;
 
 static void
 rational_dump(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "numerator", 9, Qnil },
 	{ "denominator", 11, Qnil },
 	{ NULL, 0, Qnil },
@@ -262,7 +262,7 @@ time_load(VALUE clas, VALUE args) {
     return args;
 }
 
-static struct _Code	codes[] = {
+static struct _code	codes[] = {
     { "BigDecimal", Qnil, bigdecimal_dump, NULL, true },
     { "Complex", Qnil, complex_dump, complex_load, true },
     { "Date", Qnil, date_dump, date_load, true },
@@ -459,7 +459,9 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 		ID	i;
 	    
 		if (sizeof(nbuf) <= nlen) {
-		    n2 = strdup(name);
+		    if (NULL == (n2 = strdup(name))) {
+			rb_raise(rb_eNoMemError, "for attribute name.");
+		    }
 		} else {
 		    strcpy(n2, name);
 		}
@@ -997,7 +999,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
 }
 
 static void
-end_hash(struct _ParseInfo *pi) {
+end_hash(struct _parseInfo *pi) {
     Val	parent = stack_peek(&pi->stack);
 
     if (Qundef != parent->clas && parent->clas != rb_obj_class(parent->val)) {
@@ -1030,7 +1032,7 @@ calc_hash_key(ParseInfo pi, Val parent) {
 }
 
 static void
-hash_set_num(struct _ParseInfo *pi, Val kval, NumInfo ni) {
+hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
     Val			parent = stack_peek(&pi->stack);
     volatile VALUE	rval = oj_num_as_value(ni);
 
@@ -1146,7 +1148,7 @@ oj_set_custom_callbacks(ParseInfo pi) {
 
 VALUE
 oj_custom_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -1166,7 +1168,7 @@ oj_custom_parse(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_custom_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;

data/ext/oj/dump.c

@@ -398,17 +398,23 @@ oj_dump_time(VALUE obj, Out out, int withZone) {
     long long	nsec;
 
 #ifdef HAVE_RB_TIME_TIMESPEC
-    {
+    // rb_time_timespec as well as rb_time_timeeval have a bug that causes an
+    // exception to be raised if a time is before 1970 on 32 bit systems so
+    // check the timespec size and use the ruby calls if a 32 bit system.
+    if (16 <= sizeof(struct timespec)) {
 	struct timespec	ts = rb_time_timespec(obj);
 
 	sec = (long long)ts.tv_sec;
 	nsec = ts.tv_nsec;
+    } else {
+	sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+	nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
     nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
 #endif
-
+    
     *b-- = '\0';
     if (withZone) {
 	long	tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
@@ -497,10 +503,14 @@ oj_dump_xml_time(VALUE obj, Out out) {
     char	tzsign = '+';
 
 #ifdef HAVE_RB_TIME_TIMESPEC
-    {
+    if (16 <= sizeof(struct timespec)) {
 	struct timespec	ts = rb_time_timespec(obj);
+
 	sec = ts.tv_sec;
 	nsec = ts.tv_nsec;
+    } else {
+	sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+	nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
@@ -644,7 +654,7 @@ oj_dump_obj_to_json_using_params(VALUE obj, Options copts, Out out, int argc, VA
 void
 oj_write_obj_to_file(VALUE obj, const char *path, Options copts) {
     char	buf[4096];
-    struct _Out out;
+    struct _out out;
     size_t	size;
     FILE	*f;
     int		ok;
@@ -676,7 +686,7 @@ oj_write_obj_to_file(VALUE obj, const char *path, Options copts) {
 void
 oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
     char	buf[4096];
-    struct _Out out;
+    struct _out out;
     ssize_t	size;
     VALUE	clas = rb_obj_class(stream);
 #if !IS_WINDOWS

data/ext/oj/dump.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_DUMP_H__
-#define __OJ_DUMP_H__
+#ifndef OJ_DUMP_H
+#define OJ_DUMP_H
 
 #include <ruby.h>
 
@@ -91,4 +91,4 @@ dump_ulong(unsigned long num, Out out) {
     *out->cur = '\0';
 }
 
-#endif /* __OJ_DUMP_H__ */
+#endif /* OJ_DUMP_H */

data/ext/oj/dump_compat.c

@@ -217,7 +217,7 @@ static ID	_dump_id = 0;
 
 static void
 bigdecimal_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "b", 1, Qnil },
 	{ NULL, 0, Qnil },
     };
@@ -235,7 +235,7 @@ static ID	imag_id = 0;
 
 static void
 complex_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "r", 1, Qnil },
 	{ "i", 1, Qnil },
 	{ NULL, 0, Qnil },
@@ -258,7 +258,7 @@ static ID	start_id = 0;
 
 static void
 date_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "y", 1, Qnil },
 	{ "m", 1, Qnil },
 	{ "d", 1, Qnil },
@@ -286,7 +286,7 @@ static ID	offset_id = 0;
 
 static void
 datetime_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "y", 1, Qnil },
 	{ "m", 1, Qnil },
 	{ "d", 1, Qnil },
@@ -375,7 +375,7 @@ static ID	table_id = 0;
 
 static void
 openstruct_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "t", 1, Qnil },
 	{ NULL, 0, Qnil },
     };
@@ -425,7 +425,7 @@ static ID	denominator_id = 0;
 
 static void
 rational_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "n", 1, Qnil },
 	{ "d", 1, Qnil },
 	{ NULL, 0, Qnil },
@@ -445,7 +445,7 @@ static ID	source_id = 0;
 
 static void
 regexp_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "o", 1, Qnil },
 	{ "s", 1, Qnil },
 	{ NULL, 0, Qnil },
@@ -462,7 +462,7 @@ regexp_alt(VALUE obj, int depth, Out out) {
 
 static void
 time_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "s", 1, Qundef, 0, Qundef },
 	{ "n", 1, Qundef, 0, Qundef },
 	{ NULL, 0, Qnil },
@@ -471,10 +471,14 @@ time_alt(VALUE obj, int depth, Out out) {
     long long	nsec;
 
 #ifdef HAVE_RB_TIME_TIMESPEC
-    {
+    if (16 <= sizeof(struct timespec)) {
 	struct timespec	ts = rb_time_timespec(obj);
-	sec = ts.tv_sec;
+
+	sec = (long long)ts.tv_sec;
 	nsec = ts.tv_nsec;
+    } else {
+	sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+	nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
@@ -487,7 +491,7 @@ time_alt(VALUE obj, int depth, Out out) {
     oj_code_attrs(obj, attrs, depth, out, true);
 }
 
-struct _Code	oj_compat_codes[] = {
+struct _code	oj_compat_codes[] = {
     { "BigDecimal", Qnil, bigdecimal_alt, NULL, false },
     { "Complex", Qnil, complex_alt, NULL, false },
     { "Date", Qnil, date_alt, false },