oj 3.7.5 → 3.7.6

data/ext/oj/rxclass.c

@@ -14,8 +14,8 @@
 
 #include "rxclass.h"
 
-typedef struct _RxC {
-    struct _RxC	*next;
+typedef struct _rxC {
+    struct _rxC	*next;
     VALUE	rrx;
 #if !IS_WINDOWS
     regex_t	rx;
@@ -48,9 +48,9 @@ oj_rxclass_cleanup(RxClass rc) {
 
 void
 oj_rxclass_rappend(RxClass rc, VALUE rx, VALUE clas) {
-    RxC	rxc = ALLOC_N(struct _RxC, 1);
+    RxC	rxc = ALLOC_N(struct _rxC, 1);
 
-    memset(rxc, 0, sizeof(struct _RxC));
+    memset(rxc, 0, sizeof(struct _rxC));
     rxc->rrx = rx;
     rxc->clas = clas;
     if (NULL == rc->tail) {
@@ -73,7 +73,7 @@ oj_rxclass_append(RxClass rc, const char *expr, VALUE clas) {
 	snprintf(rc->err, sizeof(rc->err), "expressions must be less than %lu characters", (unsigned long)sizeof(rxc->src));
 	return EINVAL;
     }
-    rxc = ALLOC_N(struct _RxC, 1);
+    rxc = ALLOC_N(struct _rxC, 1);
     rxc->next = 0;
     rxc->clas = clas;
 

data/ext/oj/rxclass.h

@@ -3,17 +3,17 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_RXCLASS_H__
-#define __OJ_RXCLASS_H__
+#ifndef OJ_RXCLASS_H
+#define OJ_RXCLASS_H
 
 #include <stdbool.h>
 #include "ruby.h"
 
-struct _RxC;
+struct _rxC;
 
-typedef struct _RxClass {
-    struct _RxC	*head;
-    struct _RxC	*tail;
+typedef struct _rxClass {
+    struct _rxC	*head;
+    struct _rxC	*tail;
     char	err[128];
 } *RxClass;
 
@@ -24,4 +24,4 @@ extern VALUE	oj_rxclass_match(RxClass rc, const char *str, int len);
 extern void	oj_rxclass_copy(RxClass src, RxClass dest);
 extern void	oj_rxclass_rappend(RxClass rc, VALUE rx, VALUE clas);
 
-#endif /* __OJ_RXCLASS_H__ */
+#endif /* OJ_RXCLASS_H */

data/ext/oj/saj.c

@@ -19,7 +19,7 @@
 #include "oj.h"
 #include "encode.h"
 
-typedef struct _ParseInfo {
+typedef struct _parseInfo {
     char	*str;		/* buffer being read from */
     char	*s;		/* current position in buffer */
     void	*stack_min;
@@ -605,7 +605,7 @@ read_quoted_value(ParseInfo pi) {
 static void
 saj_parse(VALUE handler, char *json) {
     volatile VALUE	obj = Qnil;
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     if (0 == json) {
 	if (pi.has_error) {

data/ext/oj/scp.c

@@ -36,7 +36,7 @@ noop_add_num(ParseInfo pi, NumInfo ni) {
 }
 
 static VALUE
-noop_hash_key(struct _ParseInfo *pi, const char *key, size_t klen) {
+noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
     return Qundef;
 }
 
@@ -117,7 +117,7 @@ calc_hash_key(ParseInfo pi, Val kval) {
 }
 
 static VALUE
-hash_key(struct _ParseInfo *pi, const char *key, size_t klen) {
+hash_key(ParseInfo pi, const char *key, size_t klen) {
     return rb_funcall(pi->handler, oj_hash_key_id, 1, rb_str_new(key, klen));
 }
 
@@ -159,7 +159,7 @@ array_append_value(ParseInfo pi, VALUE value) {
 
 VALUE
 oj_sc_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
     VALUE		input = argv[1];
 
     parse_info_init(&pi);

data/ext/oj/sparse.c

@@ -203,7 +203,7 @@ unicode_to_chars(ParseInfo pi, Buf buf, uint32_t code) {
 // entered at backslash
 static void
 read_escaped_str(ParseInfo pi) {
-    struct _Buf	buf;
+    struct _buf	buf;
     char	c;
     uint32_t	code;
     Val		parent = stack_peek(&pi->stack);
@@ -393,7 +393,7 @@ read_str(ParseInfo pi) {
 
 static void
 read_num(ParseInfo pi) {
-    struct _NumInfo	ni;
+    struct _numInfo	ni;
     char		c;
 
     reader_protect(&pi->rd);
@@ -525,7 +525,7 @@ read_num(ParseInfo pi) {
 
 static void
 read_nan(ParseInfo pi) {
-    struct _NumInfo	ni;
+    struct _numInfo	ni;
     char		c;
 
     ni.str = pi->rd.str;
@@ -718,7 +718,7 @@ oj_sparse2(ParseInfo pi) {
 		    return;
 		}
 	    } else if ('a' == c) {
-		struct _NumInfo	ni;
+		struct _numInfo	ni;
 
 		c = reader_get(&pi->rd);
 		if ('N' != c && 'n' != c) {

data/ext/oj/stream_writer.c

@@ -94,7 +94,7 @@ stream_writer_new(int argc, VALUE *argv, VALUE self) {
     } else {
 	rb_raise(rb_eArgError, "expected an IO Object.");
     }
-    sw = ALLOC(struct _StreamWriter);
+    sw = ALLOC(struct _streamWriter);
     if (2 == argc && T_HASH == rb_type(argv[1])) {
 	volatile VALUE	v;
 	int		buf_size = 0;

data/ext/oj/strict.c

@@ -15,21 +15,21 @@
 #include "trace.h"
 
 static void
-hash_end(struct _ParseInfo *pi) {
+hash_end(ParseInfo pi) {
     if (Yes == pi->options.trace) {
 	oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
     }
 }
 
 static void
-array_end(struct _ParseInfo *pi) {
+array_end(ParseInfo pi) {
     if (Yes == pi->options.trace) {
 	oj_trace_parse_array_end(pi, __FILE__, __LINE__);
     }
 }
 
 static VALUE
-noop_hash_key(struct _ParseInfo *pi, const char *key, size_t klen) {
+noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
     return Qundef;
 }
 
@@ -100,7 +100,7 @@ hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char
 }
 
 static void
-hash_set_num(struct _ParseInfo *pi, Val parent, NumInfo ni) {
+hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
     volatile VALUE	v;
     
     if (ni->infinity || ni->nan) {
@@ -183,7 +183,7 @@ oj_set_strict_callbacks(ParseInfo pi) {
 
 VALUE
 oj_strict_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -200,7 +200,7 @@ oj_strict_parse(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_strict_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/string_writer.c

@@ -272,7 +272,7 @@ str_writer_free(void *ptr) {
  */
 static VALUE
 str_writer_new(int argc, VALUE *argv, VALUE self) {
-    StrWriter	sw = ALLOC(struct _StrWriter);
+    StrWriter	sw = ALLOC(struct _strWriter);
     
     oj_str_writer_init(sw, 0);
     if (1 == argc) {

data/ext/oj/trace.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  */
 
-#ifndef __OJ_TRACE_H__
-#define __OJ_TRACE_H__
+#ifndef OJ_TRACE_H
+#define OJ_TRACE_H
 
 #include <stdbool.h>
 #include <ruby.h>
@@ -17,12 +17,12 @@ typedef enum {
     TraceRubyOut	= '<',
 } TraceWhere;
 
-struct _ParseInfo;
+struct _parseInfo;
 
 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_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);
+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_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);
 
-#endif /* __OJ_TRACE_H__ */
+#endif /* OJ_TRACE_H */

data/ext/oj/val_stack.c

@@ -28,6 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <string.h>
+
 #include "oj.h"
 #include "val_stack.h"
 
@@ -63,12 +65,16 @@ mark(void *ptr) {
 VALUE
 oj_stack_init(ValStack stack) {
 #if HAVE_LIBPTHREAD
-    pthread_mutex_init(&stack->mutex, 0);
+    int	err;
+    
+    if (0 != (err = pthread_mutex_init(&stack->mutex, 0))) {
+	rb_raise(rb_eException, "failed to initialize a mutex. %s", strerror(err));
+    }
 #else
     stack->mutex = rb_mutex_new();
 #endif
     stack->head = stack->base;
-    stack->end = stack->base + sizeof(stack->base) / sizeof(struct _Val);
+    stack->end = stack->base + sizeof(stack->base) / sizeof(struct _val);
     stack->tail = stack->head;
     stack->head->val = Qundef;
     stack->head->key = 0;

data/ext/oj/val_stack.h

@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __OJ_VAL_STACK_H__
-#define __OJ_VAL_STACK_H__
+#ifndef OJ_VAL_STACK_H
+#define OJ_VAL_STACK_H
 
 #include "ruby.h"
 #include "odd.h"
@@ -52,7 +52,7 @@ typedef enum {
     NEXT_HASH_COMMA	= 'n',
 } ValNext;
 
-typedef struct _Val {
+typedef struct _val {
     volatile VALUE	val;
     const char		*key;
     char		karray[32];
@@ -71,8 +71,8 @@ typedef struct _Val {
     char		kalloc;
 } *Val;
 
-typedef struct _ValStack {
-    struct _Val		base[STACK_INC];
+typedef struct _valStack {
+    struct _val		base[STACK_INC];
     Val			head;	// current stack
     Val			end;	// stack end
     Val			tail;	// pointer to one past last element name on stack
@@ -109,10 +109,10 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
 	// A realloc can trigger a GC so make sure it happens outside the lock
 	// but lock before changing pointers.
 	if (stack->base == stack->head) {
-	    head = ALLOC_N(struct _Val, len + STACK_INC);
-	    memcpy(head, stack->base, sizeof(struct _Val) * len);
+	    head = ALLOC_N(struct _val, len + STACK_INC);
+	    memcpy(head, stack->base, sizeof(struct _val) * len);
 	} else {
-	    REALLOC_N(head, struct _Val, len + STACK_INC);
+	    REALLOC_N(head, struct _val, len + STACK_INC);
 	}
 #if HAVE_LIBPTHREAD
 	pthread_mutex_lock(&stack->mutex);
@@ -185,4 +185,4 @@ stack_pop(ValStack stack) {
 
 extern const char*	oj_stack_next_string(ValNext n);
 
-#endif /* __OJ_VAL_STACK_H__ */
+#endif /* OJ_VAL_STACK_H */

data/ext/oj/wab.c

@@ -200,10 +200,14 @@ dump_time(VALUE obj, 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;
 	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));
@@ -291,21 +295,21 @@ oj_dump_wab_val(VALUE obj, int depth, Out out) {
 ///// load functions /////
 
 static void
-hash_end(struct _ParseInfo *pi) {
+hash_end(ParseInfo pi) {
     if (Yes == pi->options.trace) {
 	oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
     }
 }
 
 static void
-array_end(struct _ParseInfo *pi) {
+array_end(ParseInfo pi) {
     if (Yes == pi->options.trace) {
 	oj_trace_parse_array_end(pi, __FILE__, __LINE__);
     }
 }
 
 static VALUE
-noop_hash_key(struct _ParseInfo *pi, const char *key, size_t klen) {
+noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
     return Qundef;
 }
 
@@ -516,7 +520,7 @@ hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char
 }
 
 static void
-hash_set_num(struct _ParseInfo *pi, Val parent, NumInfo ni) {
+hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
     volatile VALUE	rval = Qnil;
     
     if (ni->infinity || ni->nan) {
@@ -598,7 +602,7 @@ oj_set_wab_callbacks(ParseInfo pi) {
 
 VALUE
 oj_wab_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -615,7 +619,7 @@ oj_wab_parse(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_wab_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/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '3.7.5'
+  VERSION = '3.7.6'
 end

data/test/bug.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+class Handler
+  def initialize
+    @state = []
+  end
+
+  def hash_start
+    @state << {}
+    @state.last
+  end
+
+  def hash_end
+    @state.pop
+  end
+
+  def hash_set(h,k,v)
+    h.store(k,v)
+  end
+
+  def array_start
+    @state << []
+    @state.last
+  end
+
+
+  def array_end
+    @state.pop
+  end
+
+  def array_append(a,v)
+    a << v
+  end
+
+  def add_value(v)
+    p v
+  end
+
+  def error(message, line, column); p "ERROR: #{message}" end
+end
+
+$handler = Handler.new
+
+IO.popen("cat tst") { |p| puts Oj.sc_parse($handler, p) }
+
+#File.open('tst', 'r') { |file|  Oj.sc_parse($handler, file) }

data/test/bug2.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+