oj 3.4.0 → 3.5.0

data/ext/oj/oj.c

@@ -98,6 +98,7 @@ VALUE	oj_hash_class_sym;
 VALUE	oj_indent_sym;
 VALUE	oj_object_class_sym;
 VALUE	oj_quirks_mode_sym;
+VALUE	oj_trace_sym;
 
 static VALUE	allow_blank_sym;
 static VALUE	allow_gc_sym;
@@ -181,6 +182,7 @@ struct _Options	oj_default_options = {
     No,		// allow_invalid
     No,		// create_ok
     Yes,	// allow_nan
+    No,		// trace
     oj_json_class,	// create_id
     10,		// create_id_len
     9,		// sec_prec
@@ -223,7 +225,7 @@ struct _Options	oj_default_options = {
  * - *:escape_mode* [_:newline_|_:json_|_:xss_safe_|_:ascii_|_unicode_xss_|_nil_] determines the characters to escape
  * - *:class_cache* [_Boolean_|_nil_] cache classes for faster parsing (if dynamically modifying classes or reloading classes then don't use this)
  * - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load and dump modes to use for JSON
- * - *:time_format* [_:unix_|_:unix_zone_|_:xmlschema_|_:ruby_] time format when dumping in :compat and :object mode
+ * - *:time_format* [_:unix_|_:unix_zone_|_:xmlschema_|_:ruby_] time format when dumping
  * - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or as a String
  * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_] load decimals as BigDecimal instead of as a Float. :auto pick the most precise for the number of digits.
  * - *:create_id* [_String_|_nil_] create id for json compatible object encoding, default is 'json_class'
@@ -242,11 +244,12 @@ struct _Options	oj_default_options = {
  * - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object fields
  * - *:object_nl* [_String_|_nil_] String to use after a JSON object field value
  * - *:array_nl* [_String_|_nil_] String to use after a JSON array value
- * - *:nan* [_:null_|_:huge_|_:word_|_:raise_|_:auto_] how to dump Infinity and NaN in null, strict, and compat mode. :null places a null, :huge places a huge number, :word places Infinity or NaN, :raise raises and exception, :auto uses default for each mode.
+ * - *:nan* [_:null_|_:huge_|_:word_|_:raise_|_:auto_] how to dump Infinity and NaN. :null places a null, :huge places a huge number, :word places Infinity or NaN, :raise raises and exception, :auto uses default for each mode.
  * - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load, :object_class can also be used
  * - *:array_class* [_Class_|_nil_] Class to use instead of Array on load
  * - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted
  * - *:ignore* [_nil_|Array] either nil or an Array of classes to ignore when dumping
+ * - *:trace* [_true,_|_false_] Trace all load and dump calls, default is false (trace is off)
  *
  * Return [_Hash_] all current option settings.
  */
@@ -274,6 +277,7 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, oj_quirks_mode_sym, (Yes == oj_default_options.quirks_mode) ? Qtrue : ((No == oj_default_options.quirks_mode) ? Qfalse : Qnil));
     rb_hash_aset(opts, allow_invalid_unicode_sym, (Yes == oj_default_options.allow_invalid) ? Qtrue : ((No == oj_default_options.allow_invalid) ? Qfalse : Qnil));
     rb_hash_aset(opts, oj_allow_nan_sym, (Yes == oj_default_options.allow_nan) ? Qtrue : ((No == oj_default_options.allow_nan) ? Qfalse : Qnil));
+    rb_hash_aset(opts, oj_trace_sym, (Yes == oj_default_options.trace) ? Qtrue : ((No == oj_default_options.trace) ? Qfalse : Qnil));
     rb_hash_aset(opts, float_prec_sym, INT2FIX(oj_default_options.float_prec));
     switch (oj_default_options.mode) {
     case StrictMode:	rb_hash_aset(opts, mode_sym, strict_sym);	break;
@@ -373,6 +377,7 @@ get_def_opts(VALUE self) {
  *   - *:array_class* [_Class_|_nil_] Class to use instead of Array on load.
  *   - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted.
  *   - *:ignore* [_nil_|Array] either nil or an Array of classes to ignore when dumping
+ *   - *:trace* [_Boolean_] turn trace on or off.
  */
 static VALUE
 set_def_opts(VALUE self, VALUE opts) {
@@ -400,6 +405,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	{ oj_quirks_mode_sym, &copts->quirks_mode },
 	{ allow_invalid_unicode_sym, &copts->allow_invalid },
 	{ oj_allow_nan_sym, &copts->allow_nan },
+	{ oj_trace_sym, &copts->trace },
 	{ oj_create_additions_sym, &copts->create_ok },
 	{ Qnil, 0 }
     };
@@ -1040,6 +1046,7 @@ dump(int argc, VALUE *argv, VALUE self) {
  *   - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object fields.
  *   - *:object_nl* [_String_|_nil_] String to use after a JSON object field value.
  *   - *:array_nl* [_String_|_nil_] String to use after a JSON array value.
+ *   - *:trace* [_Boolean_] If true trace is turned on.
  *
  * Returns [_String_] the encoded JSON.
  */
@@ -1660,6 +1667,7 @@ Init_oj() {
     oj_quirks_mode_sym = ID2SYM(rb_intern("quirks_mode"));	rb_gc_register_address(&oj_quirks_mode_sym);
     oj_space_before_sym = ID2SYM(rb_intern("space_before"));	rb_gc_register_address(&oj_space_before_sym);
     oj_space_sym = ID2SYM(rb_intern("space"));			rb_gc_register_address(&oj_space_sym);
+    oj_trace_sym = ID2SYM(rb_intern("trace"));			rb_gc_register_address(&oj_trace_sym);
     omit_nil_sym = ID2SYM(rb_intern("omit_nil"));		rb_gc_register_address(&omit_nil_sym);
     rails_sym = ID2SYM(rb_intern("rails"));			rb_gc_register_address(&rails_sym);
     raise_sym = ID2SYM(rb_intern("raise"));			rb_gc_register_address(&raise_sym);

data/ext/oj/oj.h

@@ -152,6 +152,7 @@ typedef struct _Options {
     char		allow_invalid;	// YesNo - allow invalid unicode
     char		create_ok;	// YesNo allow create_id
     char		allow_nan;	// YEsyNo for parsing only
+    char		trace;		// YesNo
     const char		*create_id;	// 0 or string
     size_t		create_id_len;	// length of create_id
     int			sec_prec;	// second precision when dumping time
@@ -322,6 +323,7 @@ extern VALUE	oj_object_nl_sym;
 extern VALUE	oj_quirks_mode_sym;
 extern VALUE	oj_space_before_sym;
 extern VALUE	oj_space_sym;
+extern VALUE	oj_trace_sym;
 
 extern VALUE	oj_slash_string;
 

data/ext/oj/rails.c

@@ -7,6 +7,7 @@
 #include "encode.h"
 #include "code.h"
 #include "encode.h"
+#include "trace.h"
 
 #define OJ_INFINITY (1.0/0.0)
 
@@ -610,7 +611,6 @@ rails_mimic_json(VALUE self) {
 	json = rb_define_module("JSON");
     }
     oj_mimic_json_methods(json);
-    // TBD
 
     return Qnil;
 }
@@ -1272,7 +1272,7 @@ static DumpFunc	rails_funcs[] = {
     dump_obj,		// RUBY_T_DATA     = 0x0c,
     NULL, 		// RUBY_T_MATCH    = 0x0d,
     // Rails raises a stack error on Complex and Rational. It also corrupts
-    // something whic causes a segfault on the next call. Oj will not mimic
+    // something which causes a segfault on the next call. Oj will not mimic
     // that behavior.
     dump_as_string, 	// RUBY_T_COMPLEX  = 0x0e,
     dump_as_string, 	// RUBY_T_RATIONAL = 0x0f,
@@ -1288,6 +1288,9 @@ static void
 dump_rails_val(VALUE obj, int depth, Out out, bool as_ok) {
     int	type = rb_type(obj);
 
+    if (Yes == out->opts->trace) {
+	oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
+    }
     if (MAX_DEPTH < depth) {
 	rb_raise(rb_eNoMemError, "Too deeply nested.\n");
     }
@@ -1296,10 +1299,16 @@ dump_rails_val(VALUE obj, int depth, Out out, bool as_ok) {
 
 	if (NULL != f) {
 	    f(obj, depth, out, as_ok);
+	    if (Yes == out->opts->trace) {
+		oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceOut);
+	    }
 	    return;
 	}
     }
     oj_dump_nil(Qnil, depth, out, false);
+    if (Yes == out->opts->trace) {
+	oj_trace("dump", Qnil, __FILE__, __LINE__, depth, TraceOut);
+    }
 }
 
 void

data/ext/oj/saj.c

@@ -52,7 +52,7 @@ static void	skip_comment(ParseInfo pi);
  * a SAX parser because it uses callback when document elements are
  * encountered.
  *
- * Parsing is very tolerant. Lack of headers and even mispelled element
+ * Parsing is very tolerant. Lack of headers and even misspelled element
  * endings are passed over without raising an error. A best attempt is made in
  * all cases to parse the string.
  */

data/ext/oj/sparse.c

@@ -1,31 +1,6 @@
-/* parse.c
+/* sparse.c
  * Copyright (c) 2013, 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.
  */
 
 #include <stdlib.h>

data/ext/oj/strict.c

@@ -12,9 +12,20 @@
 #include "err.h"
 #include "parse.h"
 #include "encode.h"
+#include "trace.h"
 
 static void
-noop_end(struct _ParseInfo *pi) {
+hash_end(struct _ParseInfo *pi) {
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
+    }
+}
+
+static void
+array_end(struct _ParseInfo *pi) {
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_array_end(pi, __FILE__, __LINE__);
+    }
 }
 
 static VALUE
@@ -24,6 +35,9 @@ noop_hash_key(struct _ParseInfo *pi, const char *key, size_t klen) {
 
 static void
 add_value(ParseInfo pi, VALUE val) {
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("add_value", pi, __FILE__, __LINE__, val);
+    }
     pi->stack.head->val = val;
 }
 
@@ -33,6 +47,9 @@ add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
 
     rstr = oj_encode(rstr);
     pi->stack.head->val = rstr;
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("add_string", pi, __FILE__, __LINE__, rstr);
+    }
 }
 
 static void
@@ -41,6 +58,9 @@ add_num(ParseInfo pi, NumInfo ni) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
     pi->stack.head->val = oj_num_as_value(ni);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("add_number", pi, __FILE__, __LINE__, pi->stack.head->val);
+    }
 }
 
 static VALUE
@@ -48,6 +68,9 @@ start_hash(ParseInfo pi) {
     if (Qnil != pi->options.hash_class) {
 	return rb_class_new_instance(0, NULL, pi->options.hash_class);
     }
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_in("start_hash", pi, __FILE__, __LINE__);
+    }
     return rb_hash_new();
 }
 
@@ -71,23 +94,38 @@ hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char
 
     rstr = oj_encode(rstr);
     rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), rstr);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rstr);
+    }
 }
 
 static void
 hash_set_num(struct _ParseInfo *pi, Val parent, NumInfo ni) {
+    volatile VALUE	v;
+    
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
-    rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), oj_num_as_value(ni));
+    v = oj_num_as_value(ni);
+    rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), v);
+    if (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, calc_hash_key(pi, parent), value);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
+    }
 }
 
 static VALUE
 start_array(ParseInfo pi) {
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_in("start_array", pi, __FILE__, __LINE__);
+    }
     return rb_ary_new();
 }
 
@@ -97,31 +135,43 @@ array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
 
     rstr = oj_encode(rstr);
     rb_ary_push(stack_peek(&pi->stack)->val, rstr);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("append_string", pi, __FILE__, __LINE__, rstr);
+    }
 }
 
 static void
 array_append_num(ParseInfo pi, NumInfo ni) {
+    volatile VALUE	v;
+    
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
-    rb_ary_push(stack_peek(&pi->stack)->val, oj_num_as_value(ni));
+    v = oj_num_as_value(ni);
+    rb_ary_push(stack_peek(&pi->stack)->val, v);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, v);
+    }
 }
 
 static void
 array_append_value(ParseInfo pi, VALUE value) {
     rb_ary_push(stack_peek(&pi->stack)->val, value);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("append_value", pi, __FILE__, __LINE__, value);
+    }
 }
 
 void
 oj_set_strict_callbacks(ParseInfo pi) {
     pi->start_hash = start_hash;
-    pi->end_hash = noop_end;
+    pi->end_hash = hash_end;
     pi->hash_key = noop_hash_key;
     pi->hash_set_cstr = hash_set_cstr;
     pi->hash_set_num = hash_set_num;
     pi->hash_set_value = hash_set_value;
     pi->start_array = start_array;
-    pi->end_array = noop_end;
+    pi->end_array = array_end;
     pi->array_append_cstr = array_append_cstr;
     pi->array_append_num = array_append_num;
     pi->array_append_value = array_append_value;

data/ext/oj/trace.c

@@ -0,0 +1,77 @@
+/* trace.h
+ * Copyright (c) 2018, Peter Ohler
+ * All rights reserved.
+ */
+
+#include "parse.h"
+#include "trace.h"
+
+#define MAX_INDENT	256
+
+static void
+fill_indent(char *indent, int depth) {
+    if (MAX_INDENT <= depth) {
+	depth = MAX_INDENT - 1;
+    } else if (depth < 0) {
+	depth = 0;
+    }
+    memset(indent, ' ', depth);
+    indent[depth] = '\0';
+}
+
+void
+oj_trace(const char *func, VALUE obj, const char *file, int line, int depth, TraceWhere where) {
+    char	fmt[64];
+    char	indent[MAX_INDENT];
+
+    depth *= 2;
+    fill_indent(indent, depth);
+    sprintf(fmt, "#0:%%13s:%%3d:Oj:%c:%%%ds %%s %%s\n", where, depth);
+    printf(fmt, file, line, indent, func, rb_obj_classname(obj));
+}
+
+void
+oj_trace_parse_call(const char *func, ParseInfo pi, const char *file, int line, VALUE obj) {
+    char	fmt[64];
+    char	indent[MAX_INDENT];
+    int		depth = stack_size(&pi->stack) * 2;
+    
+    fill_indent(indent, depth);
+    sprintf(fmt, "#0:%%13s:%%3d:Oj:-:%%%ds %%s %%s\n", depth);
+    printf(fmt, file, line, indent, func, rb_obj_classname(obj));
+}
+
+void
+oj_trace_parse_in(const char *func, ParseInfo pi, const char *file, int line) {
+    char	fmt[64];
+    char	indent[MAX_INDENT];
+    int		depth = stack_size(&pi->stack) * 2;
+    
+    fill_indent(indent, depth);
+    sprintf(fmt, "#0:%%13s:%%3d:Oj:}:%%%ds %%s\n", depth);
+    printf(fmt, file, line, indent, func);
+}
+
+void
+oj_trace_parse_hash_end(ParseInfo pi, const char *file, int line) {
+    char	fmt[64];
+    char	indent[MAX_INDENT];
+    int		depth = stack_size(&pi->stack) * 2 - 2;
+    Val		v = stack_peek(&pi->stack);
+    VALUE	obj = v->val;
+    
+    fill_indent(indent, depth);
+    sprintf(fmt, "#0:%%13s:%%3d:Oj:{:%%%ds hash_end %%s\n", depth);
+    printf(fmt, file, line, indent, rb_obj_classname(obj));
+}
+
+void
+oj_trace_parse_array_end(ParseInfo pi, const char *file, int line) {
+    char	fmt[64];
+    char	indent[MAX_INDENT];
+    int		depth = stack_size(&pi->stack) * 2;
+    
+    fill_indent(indent, depth);
+    sprintf(fmt, "#0:%%13s:%%3d:Oj:{:%%%ds array_ned\n", depth);
+    printf(fmt, file, line, indent);
+}

data/ext/oj/trace.h

@@ -0,0 +1,26 @@
+/* trace.h
+ * Copyright (c) 2018, Peter Ohler
+ * All rights reserved.
+ */
+
+#ifndef __OJ_TRACE_H__
+#define __OJ_TRACE_H__
+
+#include <stdbool.h>
+#include <ruby.h>
+
+typedef enum {
+    TraceIn	= '{',
+    TraceOut	= '}',
+    TraceCall	= '-',
+} TraceWhere;
+
+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);
+
+#endif /* __OJ_TRACE_H__ */

data/ext/oj/wab.c

@@ -14,6 +14,7 @@
 #include "parse.h"
 #include "encode.h"
 #include "dump.h"
+#include "trace.h"
 
 // Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
 #define OJ_INFINITY (1.0/0.0)
@@ -266,6 +267,9 @@ void
 oj_dump_wab_val(VALUE obj, int depth, Out out) {
     int	type = rb_type(obj);
     
+    if (Yes == out->opts->trace) {
+	oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
+    }
     if (MAX_DEPTH < depth) {
 	rb_raise(rb_eNoMemError, "Too deeply nested.\n");
     }
@@ -274,6 +278,9 @@ oj_dump_wab_val(VALUE obj, int depth, Out out) {
 
 	if (NULL != f) {
 	    f(obj, depth, out, false);
+	    if (Yes == out->opts->trace) {
+		oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceOut);
+	    }
 	    return;
 	}
     }
@@ -283,7 +290,17 @@ oj_dump_wab_val(VALUE obj, int depth, Out out) {
 ///// load functions /////
 
 static void
-noop_end(struct _ParseInfo *pi) {
+hash_end(struct _ParseInfo *pi) {
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
+    }
+}
+
+static void
+array_end(struct _ParseInfo *pi) {
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_array_end(pi, __FILE__, __LINE__);
+    }
 }
 
 static VALUE
@@ -293,6 +310,9 @@ noop_hash_key(struct _ParseInfo *pi, const char *key, size_t klen) {
 
 static void
 add_value(ParseInfo pi, VALUE val) {
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("add_value", pi, __FILE__, __LINE__, val);
+    }
     pi->stack.head->val = val;
 }
 
@@ -444,6 +464,9 @@ cstr_to_rstr(const char *str, size_t len) {
 static void
 add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     pi->stack.head->val = cstr_to_rstr(str, len);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("add_string", pi, __FILE__, __LINE__, pi->stack.head->val);
+    }
 }
 
 static void
@@ -452,10 +475,16 @@ add_num(ParseInfo pi, NumInfo ni) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
     pi->stack.head->val = oj_num_as_value(ni);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("add_number", pi, __FILE__, __LINE__, pi->stack.head->val);
+    }
 }
 
 static VALUE
 start_hash(ParseInfo pi) {
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_in("start_hash", pi, __FILE__, __LINE__);
+    }
     if (Qnil != pi->options.hash_class) {
 	return rb_class_new_instance(0, NULL, pi->options.hash_class);
     }
@@ -477,55 +506,86 @@ calc_hash_key(ParseInfo pi, Val parent) {
 
 static void
 hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char *orig) {
-    rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), cstr_to_rstr(str, len));
+    volatile VALUE	rval = cstr_to_rstr(str, len);
+
+    rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), rval);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rval);
+    }
 }
 
 static void
 hash_set_num(struct _ParseInfo *pi, Val parent, NumInfo ni) {
+    volatile VALUE	rval = Qnil;
+    
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
-    rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), oj_num_as_value(ni));
+    rval = oj_num_as_value(ni);
+    rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), rval);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("set_number", pi, __FILE__, __LINE__, rval);
+    }
 }
 
 static void
 hash_set_value(ParseInfo pi, Val parent, VALUE value) {
     rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), value);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
+    }
 }
 
 static VALUE
 start_array(ParseInfo pi) {
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_in("start_array", pi, __FILE__, __LINE__);
+    }
     return rb_ary_new();
 }
 
 static void
 array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
-    rb_ary_push(stack_peek(&pi->stack)->val, cstr_to_rstr(str, len));
+    volatile VALUE	rval = cstr_to_rstr(str, len);
+    
+    rb_ary_push(stack_peek(&pi->stack)->val, rval);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, rval);
+    }
 }
 
 static void
 array_append_num(ParseInfo pi, NumInfo ni) {
+    volatile VALUE	rval = Qnil;
+
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
-    rb_ary_push(stack_peek(&pi->stack)->val, oj_num_as_value(ni));
+    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);
+    }
 }
 
 static void
 array_append_value(ParseInfo pi, VALUE value) {
     rb_ary_push(stack_peek(&pi->stack)->val, value);
+    if (Yes == pi->options.trace) {
+	oj_trace_parse_call("append_value", pi, __FILE__, __LINE__, value);
+    }
 }
 
 void
 oj_set_wab_callbacks(ParseInfo pi) {
     pi->start_hash = start_hash;
-    pi->end_hash = noop_end;
+    pi->end_hash = hash_end;
     pi->hash_key = noop_hash_key;
     pi->hash_set_cstr = hash_set_cstr;
     pi->hash_set_num = hash_set_num;
     pi->hash_set_value = hash_set_value;
     pi->start_array = start_array;
-    pi->end_array = noop_end;
+    pi->end_array = array_end;
     pi->array_append_cstr = array_append_cstr;
     pi->array_append_num = array_append_num;
     pi->array_append_value = array_append_value;