oj 3.7.4 → 3.11.2

data/ext/oj/hash.h

@@ -1,39 +1,11 @@
-/* hash.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_HASH_H__
-#define __OJ_HASH_H__
+#ifndef OJ_HASH_H
+#define OJ_HASH_H
 
 #include "ruby.h"
 
-typedef struct _Hash	*Hash;
+typedef struct _hash	*Hash;
 
 extern void	oj_hash_init();
 
@@ -43,4 +15,4 @@ extern ID	oj_attr_hash_get(const char *key, size_t len, ID **slotp);
 extern void	oj_hash_print();
 extern char*	oj_strndup(const char *s, size_t len);
 
-#endif /* __OJ_HASH_H__ */
+#endif /* OJ_HASH_H */

data/ext/oj/hash_test.c

@@ -1,32 +1,4 @@
-/* hash_test.c
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 // if windows, comment out the whole file. It's only a performance test.
 #ifndef _WIN32
@@ -39,12 +11,12 @@
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
-typedef struct _StrLen {
+typedef struct _strLen {
     const char	*str;
     size_t	len;
 } *StrLen;
 
-static struct _StrLen data[] = {
+static struct _strLen data[] = {
     { "Gem::Version", 12 },
     { "TracePoint", 10 },
     { "Complex::compatible", 19 },

data/ext/oj/mimic_json.c

@@ -1,14 +1,11 @@
-/* mimic_json.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
 #include "oj.h"
 #include "encode.h"
 #include "dump.h"
 #include "parse.h"
 
-static VALUE	symbolize_names_sym;
+static VALUE	symbolize_names_sym = Qundef;
 
 extern const char	oj_json_class[];
 
@@ -26,30 +23,30 @@ static VALUE	state_class;
 // mimic JSON documentation
 
 /* Document-module: JSON::Ext
- * 
+ *
  * The Ext module is a placeholder in the mimic JSON module used for
  * compatibility only.
  */
 /* Document-class: JSON::Ext::Parser
- * 
+ *
  * The JSON::Ext::Parser is a placeholder in the mimic JSON module used for
  * compatibility only.
  */
 /* Document-class: JSON::Ext::Generator
- * 
+ *
  * The JSON::Ext::Generator is a placeholder in the mimic JSON module used for
  * compatibility only.
  */
 
 /* Document-method: parser=
  * call-seq: parser=(parser)
- * 
+ *
  * Does nothing other than provide compatibility.
  * - *parser* [_Object_] ignored
  */
 /* Document-method: generator=
  * call-seq: generator=(generator)
- * 
+ *
  * Does nothing other than provide compatibility.
  * - *generator* [_Object_] ignored
  */
@@ -167,7 +164,7 @@ oj_parse_mimic_dump_options(VALUE ropts, Options copts) {
     if (Qnil != (v = rb_hash_lookup(ropts, oj_ascii_only_sym))) {
 	// generate seems to assume anything except nil and false are true.
 	if (Qfalse == v) {
-	    copts->escape_mode = JXEsc; // JSONEsc;
+	    copts->escape_mode = JXEsc;
 	} else {
 	    copts->escape_mode = ASCIIEsc;
 	}
@@ -184,9 +181,9 @@ mimic_limit_arg(VALUE a) {
 
 /* Document-method: dump
  * call-seq: dump(obj, anIO=nil, limit=nil)
- * 
+ *
  * Encodes an object as a JSON String.
- * 
+ *
  * - *obj* [_Object_] object to convert to encode as JSON
  * - *anIO* [_IO_] an IO that allows writing
  * - *limit* [_Fixnum_] ignored
@@ -196,9 +193,10 @@ mimic_limit_arg(VALUE a) {
 static VALUE
 mimic_dump(int argc, VALUE *argv, VALUE self) {
     char		buf[4096];
-    struct _Out		out;
-    struct _Options	copts = oj_default_options;
+    struct _out		out;
+    struct _options	copts = oj_default_options;
     VALUE		rstr;
+    VALUE		active_hack[1];
 
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
@@ -216,9 +214,10 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     */
     copts.dump_opts.max_depth = MAX_DEPTH; // when using dump there is no limit
     out.omit_nil = copts.dump_opts.omit_nil;
+
     if (2 <= argc) {
 	int	limit;
-	
+
 	// The json gem take a more liberal approach to optional
 	// arguments. Expected are (obj, anIO=nil, limit=nil) yet the io
 	// argument can be left off completely and the 2nd argument is then
@@ -230,7 +229,15 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
 	    copts.dump_opts.max_depth = limit;
 	}
     }
-    oj_dump_obj_to_json(*argv, &copts, &out);
+    // ActiveSupport in active_support/core_ext/object/json.rb check the
+    // optional argument type to to_json and it the argument is a
+    // ::JSON::State it calls the JSON gem code otherwise it calls the active
+    // support encoder code. To make sure the desired branch is called a
+    // default ::JSON::State argument is passed in. Basically a hack to get
+    // around the active support hack so two wrongs make a right this time.
+    active_hack[0] = rb_funcall(state_class, oj_new_id, 0);
+    oj_dump_obj_to_json_using_params(*argv, &copts, &out, 1, active_hack);
+
     if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }
@@ -285,11 +292,11 @@ mimic_walk(VALUE key, VALUE obj, VALUE proc) {
 
 /* Document-method: restore
  * call-seq: restore(source, proc=nil)
- * 
+ *
  * Loads a Ruby Object from a JSON source that can be either a String or an
- * IO. If Proc is given or a block is providedit is called with each nested
+ * IO. If Proc is given or a block is provided it is called with each nested
  * element of the loaded Object.
- * 
+ *
  * - *source* [_String_|IO] JSON source
  * - *proc* [_Proc_] to yield to on each element or nil
  *
@@ -298,11 +305,11 @@ mimic_walk(VALUE key, VALUE obj, VALUE proc) {
 
 /* Document-method: load
  * call-seq: load(source, proc=nil)
- * 
+ *
  * Loads a Ruby Object from a JSON source that can be either a String or an
- * IO. If Proc is given or a block is providedit is called with each nested
+ * IO. If Proc is given or a block is provided it is called with each nested
  * element of the loaded Object.
- * 
+ *
  * - *source* [_String_|IO] JSON source
  * - *proc* [_Proc_] to yield to on each element or nil
  *
@@ -330,10 +337,10 @@ mimic_load(int argc, VALUE *argv, VALUE self) {
 
 /* Document-method: []
  * call-seq: [](obj, opts={})
- * 
+ *
  * If the obj argument is a String then it is assumed to be a JSON String and
  * parsed otherwise the obj is encoded as a JSON String.
- * 
+ *
  * - *obj* [_String_|Hash|Array] object to convert
  * - *opts* [_Hash_] same options as either generate or parse
  *
@@ -354,9 +361,11 @@ mimic_dump_load(int argc, VALUE *argv, VALUE self) {
 static VALUE
 mimic_generate_core(int argc, VALUE *argv, Options copts) {
     char	buf[4096];
-    struct _Out	out;
+    struct _out	out;
     VALUE	rstr;
 
+    memset(buf, 0, sizeof(buf));
+
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = false;
@@ -396,11 +405,11 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
 
 /* Document-method: generate
  * call-seq: generate(obj, opts=nil)
- * 
+ *
  * Encode obj as a JSON String. The obj argument must be a Hash, Array, or
  * respond to to_h or to_json. Options other than those listed such as
  * +:allow_nan+ or +:max_nesting+ are ignored.
- * 
+ *
  * - *obj* [_Object_|Hash|Array] object to convert to a JSON String
  * - *opts* [_Hash_] options
  * - - *:indent* [_String_] String to use for indentation.
@@ -414,7 +423,7 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
  */
 VALUE
 oj_mimic_generate(int argc, VALUE *argv, VALUE self) {
-    struct _Options	copts = oj_default_options;
+    struct _options	copts = oj_default_options;
 
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
@@ -432,7 +441,7 @@ oj_mimic_generate(int argc, VALUE *argv, VALUE self) {
  */
 VALUE
 oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
-    struct _Options	copts = oj_default_options;
+    struct _options	copts = oj_default_options;
     VALUE		rargs[2];
     volatile VALUE	h;
 
@@ -461,7 +470,7 @@ oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
 	rb_hash_aset(h, oj_array_nl_sym, rb_str_new2("\n"));
     }
     rargs[1] = rb_funcall(state_class, oj_new_id, 1, h);
-    
+
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
     strcpy(copts.dump_opts.indent_str, "  ");
@@ -481,7 +490,7 @@ oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
 
 static VALUE
 mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
     VALUE		ropts;
     VALUE		args[1];
 
@@ -500,7 +509,7 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
     pi.options.create_ok = No;
     pi.options.allow_nan = (bang ? Yes : No);
     pi.options.nilnil = No;
-    pi.options.bigdec_load = FloatDec;
+    pi.options.bigdec_load = RubyDec;
     pi.options.mode = CompatMode;
     pi.max_depth = 100;
 
@@ -510,6 +519,9 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
 	if (T_HASH != rb_type(ropts)) {
 	    rb_raise(rb_eArgError, "options must be a hash.");
 	}
+	if (Qundef == symbolize_names_sym) {
+	    symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));	rb_gc_register_address(&symbolize_names_sym);
+	}
 	if (Qnil != (v = rb_hash_lookup(ropts, symbolize_names_sym))) {
 	    pi.options.sym_key = (Qtrue == v) ? Yes : No;
 	}
@@ -547,6 +559,9 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
 		pi.options.array_class = v;
 	    }
 	}
+	if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_decimal_class_sym)) {
+	    pi.options.compat_bigdec = (oj_bigdecimal_class == rb_hash_lookup(ropts, oj_decimal_class_sym));
+	}
 	v = rb_hash_lookup(ropts, oj_max_nesting_sym);
 	if (Qtrue == v) {
 	    pi.max_depth = 100;
@@ -602,9 +617,9 @@ mimic_parse_bang(int argc, VALUE *argv, VALUE self) {
 
 /* Document-method: recurse_proc
  * call-seq: recurse_proc(obj, &proc)
- * 
+ *
  * Yields to the proc for every element in the obj recursively.
- * 
+ *
  * - *obj* [_Hash_|Array] object to walk
  * - *proc* [_Proc_] to yield to on each element
  */
@@ -631,7 +646,7 @@ mimic_set_create_id(VALUE self, VALUE id) {
     Check_Type(id, T_STRING);
 
     if (NULL != oj_default_options.create_id) {
-	if (oj_json_class != oj_default_options.create_id && NULL != oj_default_options.create_id) {
+	if (oj_json_class != oj_default_options.create_id) {
 	    xfree((char*)oj_default_options.create_id);
 	}
 	oj_default_options.create_id = NULL;
@@ -660,7 +675,7 @@ mimic_create_id(VALUE self) {
     return rb_str_new_cstr(oj_json_class);
 }
 
-static struct _Options	mimic_object_to_json_options = {
+static struct _options	mimic_object_to_json_options = {
     0,		// indent
     No,		// circular
     No,		// auto_define
@@ -670,10 +685,12 @@ static struct _Options	mimic_object_to_json_options = {
     No,		// class_cache
     RubyTime,	// time_format
     No,		// bigdec_as_num
-    FloatDec,	// bigdec_load
+    RubyDec,	// bigdec_load
+    false,	// compat_bigdec
     No,		// to_hash
     No,		// to_json
     No,		// as_json
+    No,		// raw_json
     No,		// nilnil
     No,		// empty_string
     Yes,	// allow_gc
@@ -682,12 +699,15 @@ static struct _Options	mimic_object_to_json_options = {
     No,		// create_ok
     No,		// allow_nan
     No,		// trace
-    0,		// integer_range_min
-    0,		// integer_range_max
+    No,		// safe
+    false,	// sec_prec_set
+    No,		// ignore_under
+    0,		// int_range_min
+    0,		// int_range_max
     oj_json_class,// create_id
     10,		// create_id_len
     3,		// sec_prec
-    16,		// float_prec
+    0,		// float_prec
     "%0.16g",	// float_fmt
     Qnil,	// hash_class
     Qnil,	// array_class
@@ -717,9 +737,9 @@ static struct _Options	mimic_object_to_json_options = {
 static VALUE
 mimic_object_to_json(int argc, VALUE *argv, VALUE self) {
     char		buf[4096];
-    struct _Out		out;
+    struct _out		out;
     VALUE		rstr;
-    struct _Options	copts = oj_default_options;
+    struct _options	copts = oj_default_options;
 
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
@@ -821,6 +841,7 @@ oj_mimic_json_methods(VALUE json) {
     }
     // Pull in the JSON::State mimic file.
     state_class = rb_const_get_at(generator, rb_intern("State"));
+    rb_gc_register_mark_object(state_class);
 
     symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));	rb_gc_register_address(&symbolize_names_sym);
 }
@@ -834,7 +855,7 @@ oj_define_mimic_json(int argc, VALUE *argv, VALUE self) {
     VALUE	dummy;
     VALUE	verbose;
     VALUE	json;
-    
+
     // Either set the paths to indicate JSON has been loaded or replaces the
     // methods if it has been loaded.
     if (rb_const_defined_at(rb_cObject, rb_intern("JSON"))) {

data/ext/oj/object.c

@@ -1,8 +1,6 @@
-/* object.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
+#include <stdint.h>
 #include <stdio.h>
 #include <time.h>
 
@@ -14,6 +12,7 @@
 #include "odd.h"
 #include "encode.h"
 #include "trace.h"
+#include "util.h"
 
 inline static long
 read_long(const char *str, size_t len) {
@@ -274,7 +273,10 @@ hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
     if (2 == kval->klen) {
 	switch (kval->key[1]) {
 	case 't': // time as a float
-	    {
+	    if (0 == ni->div || 9 < ni->di) {
+		rb_raise(rb_eArgError, "Invalid time decimal representation.");
+		//parent->val = rb_time_nano_new(0, 0);
+	    } else {
 		int64_t	nsec = ni->num * 1000000000LL / ni->div;
 
 		if (ni->neg) {
@@ -290,25 +292,20 @@ hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
 		    // offset and then a conversion to UTC keeps makes the time
 		    // match the expected value.
 		    parent->val = rb_funcall2(parent->val, oj_utc_id, 0, 0);
-		} else if (ni->hasExp) {
-		    time_t	t = (time_t)(ni->i + ni->exp);
-		    struct tm	*st = gmtime(&t);
-		    VALUE	args[8];
-
-		    // Windows does not support dates before 1970 so ignore
-		    // the zone and do the best we can.
-		    if (NULL == st) {
-			parent->val = rb_time_nano_new(ni->i, (long)nsec);
-		    } else {
-			args[0] = LONG2NUM((long)(1900 + st->tm_year));
-			args[1] = LONG2NUM(1 + st->tm_mon);
-			args[2] = LONG2NUM(st->tm_mday);
-			args[3] = LONG2NUM(st->tm_hour);
-			args[4] = LONG2NUM(st->tm_min);
-			args[5] = rb_float_new((double)st->tm_sec + ((double)nsec + 0.5) / 1000000000.0);
-			args[6] = LONG2NUM(ni->exp);
-			parent->val = rb_funcall2(rb_cTime, oj_new_id, 7, args);
-		    }
+		} else if (ni->has_exp) {
+		    int64_t		t = (int64_t)(ni->i + ni->exp);
+		    struct _timeInfo	ti;
+		    VALUE		args[8];
+
+		    sec_as_time(t, &ti);
+		    args[0] = LONG2NUM((long)(ti.year));
+		    args[1] = LONG2NUM(ti.mon);
+		    args[2] = LONG2NUM(ti.day);
+		    args[3] = LONG2NUM(ti.hour);
+		    args[4] = LONG2NUM(ti.min);
+		    args[5] = rb_float_new((double)ti.sec + ((double)nsec + 0.5) / 1000000000.0);
+		    args[6] = LONG2NUM(ni->exp);
+		    parent->val = rb_funcall2(rb_cTime, oj_new_id, 7, args);
 		} else {
 		    parent->val = rb_time_nano_new(ni->i, (long)nsec);
 		}
@@ -403,23 +400,6 @@ hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, volatile VALUE
     return 0;
 }
 
-static void
-copy_ivars(VALUE target, VALUE src) {
-    volatile VALUE	vars = rb_funcall(src, oj_instance_variables_id, 0);
-    volatile VALUE	*np = RARRAY_PTR(vars);
-    ID			vid;
-    int			i, cnt = (int)RARRAY_LEN(vars);
-    const char		*attr;
-
-    for (i = cnt; 0 < i; i--, np++) {
-	vid = rb_to_id(*np);
-	attr = rb_id2name(vid);
-	if ('@' == *attr) {
-	    rb_ivar_set(target, vid, rb_ivar_get(src, vid));
-	}
-    }
-}
-
 void
 oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
     const char	*key = kval->key;
@@ -427,19 +407,7 @@ oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
     ID		var_id;
     ID		*slot;
 
-    if ('~' == *key && Qtrue == rb_obj_is_kind_of(parent->val, rb_eException)) {
-	if (5 == klen && 0 == strncmp("~mesg", key, klen)) {
-	    VALUE		args[1];
-	    volatile VALUE	prev = parent->val;
-
-	    args[0] = value;
-	    parent->val = rb_class_new_instance(1, args, rb_class_of(parent->val));
-	    copy_ivars(parent->val, prev);
-	} else if (3 == klen && 0 == strncmp("~bt", key, klen)) {
-	    rb_funcall(parent->val, rb_intern("set_backtrace"), 1, value);
-	}
-    }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_lock(&oj_cache_mutex);
 #else
     rb_mutex_lock(oj_cache_mutex);
@@ -473,7 +441,7 @@ oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
 	}
 	*slot = var_id;
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_unlock(&oj_cache_mutex);
 #else
     rb_mutex_unlock(oj_cache_mutex);
@@ -491,7 +459,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
  WHICH_TYPE:
     switch (rb_type(parent->val)) {
     case T_NIL:
-	parent->odd_args = 0; // make sure it is 0 in case not odd
+	parent->odd_args = NULL; // make sure it is NULL in case not odd
 	if ('^' != *key || !hat_cstr(pi, parent, kval, str, len)) {
 	    parent->val = rb_hash_new();
 	    goto WHICH_TYPE;
@@ -513,7 +481,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
 	oj_set_obj_ivar(parent, kval, rval);
 	break;
     case T_CLASS:
-	if (0 == parent->odd_args) {
+	if (NULL == parent->odd_args) {
 	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "%s is not an odd class", rb_class2name(rb_obj_class(parent->val)));
 	    return;
 	} else {
@@ -549,7 +517,7 @@ hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
  WHICH_TYPE:
     switch (rb_type(parent->val)) {
     case T_NIL:
-	parent->odd_args = 0; // make sure it is 0 in case not odd
+	parent->odd_args = NULL; // make sure it is NULL in case not odd
 	if ('^' != *key || !hat_num(pi, parent, kval, ni)) {
 	    parent->val = rb_hash_new();
 	    goto WHICH_TYPE;
@@ -569,7 +537,7 @@ hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
 	}
 	break;
     case T_CLASS:
-	if (0 == parent->odd_args) {
+	if (NULL == parent->odd_args) {
 	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "%s is not an odd class", rb_class2name(rb_obj_class(parent->val)));
 	    return;
 	} else {
@@ -604,7 +572,7 @@ hash_set_value(ParseInfo pi, Val kval, VALUE value) {
  WHICH_TYPE:
     switch (rb_type(parent->val)) {
     case T_NIL:
-	parent->odd_args = 0; // make sure it is 0 in case not odd
+	parent->odd_args = NULL; // make sure it is NULL in case not odd
 	if ('^' != *key || !hat_value(pi, parent, key, klen, value)) {
 	    parent->val = rb_hash_new();
 	    goto WHICH_TYPE;
@@ -645,7 +613,7 @@ hash_set_value(ParseInfo pi, Val kval, VALUE value) {
 	break;
     case T_MODULE:
     case T_CLASS:
-	if (0 == parent->odd_args) {
+	if (NULL == parent->odd_args) {
 	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "%s is not an odd class", rb_class2name(rb_obj_class(parent->val)));
 	    return;
 	} else if (0 !=	oj_odd_set_arg(parent->odd_args, key, klen, value)) {
@@ -677,17 +645,17 @@ start_hash(ParseInfo pi) {
 }
 
 static void
-end_hash(struct _ParseInfo *pi) {
+end_hash(ParseInfo pi) {
     Val	parent = stack_peek(&pi->stack);
 
     if (Qnil == parent->val) {
 	parent->val = rb_hash_new();
-    } else if (0 != parent->odd_args) {
+    } else if (NULL != parent->odd_args) {
 	OddArgs	oa = parent->odd_args;
 
 	parent->val = rb_funcall2(oa->odd->create_obj, oa->odd->create_op, oa->odd->attr_cnt, oa->args);
 	oj_odd_free(oa);
-	parent->odd_args = 0;
+	parent->odd_args = NULL;
     }
     if (Yes == pi->options.trace) {
 	oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
@@ -697,8 +665,9 @@ end_hash(struct _ParseInfo *pi) {
 static void
 array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     volatile VALUE	rval = Qnil;
-    
-    if (3 <= len && 0 != pi->circ_array) {
+
+    // orig lets us know whether the string was ^r1 or \u005er1
+    if (3 <= len && 0 != pi->circ_array && '^' == orig[0] && 0 == rb_array_len(stack_peek(&pi->stack)->val)) {
 	if ('i' == str[1]) {
 	    long	i = read_long(str + 2, len - 2);
 
@@ -726,7 +695,7 @@ array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
 static void
 array_append_num(ParseInfo pi, NumInfo ni) {
     volatile VALUE	rval = oj_num_as_value(ni);
-    
+
     rb_ary_push(stack_peek(&pi->stack)->val, rval);
     if (Yes == pi->options.trace) {
 	oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);
@@ -765,7 +734,7 @@ oj_set_object_callbacks(ParseInfo pi) {
 
 VALUE
 oj_object_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -782,7 +751,7 @@ oj_object_parse(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_object_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;