oj 2.18.5 → 3.16.11

data/ext/oj/stream_writer.c

@@ -0,0 +1,329 @@
+// 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 <errno.h>
+#include <ruby.h>
+
+#include "encode.h"
+#include "mem.h"
+
+extern VALUE Oj;
+
+static void stream_writer_free(void *ptr) {
+    StreamWriter sw;
+
+    if (0 == ptr) {
+        return;
+    }
+    sw = (StreamWriter)ptr;
+    OJ_R_FREE(sw->sw.out.buf);
+    OJ_R_FREE(sw->sw.types);
+    OJ_R_FREE(ptr);
+}
+
+static const rb_data_type_t oj_stream_writer_type = {
+    "Oj/stream_writer",
+    {
+        NULL,
+        stream_writer_free,
+        NULL,
+    },
+    0,
+    0,
+};
+
+static void stream_writer_reset_buf(StreamWriter sw) {
+    sw->sw.out.cur  = sw->sw.out.buf;
+    *sw->sw.out.cur = '\0';
+}
+
+static void stream_writer_write(StreamWriter sw) {
+    ssize_t size = sw->sw.out.cur - sw->sw.out.buf;
+
+    switch (sw->type) {
+    case STRING_IO:
+    case STREAM_IO:
+    case FILE_IO: {
+        volatile VALUE rs = rb_utf8_str_new(sw->sw.out.buf, size);
+        rb_funcall(sw->stream, oj_write_id, 1, rs);
+        break;
+    }
+    default: rb_raise(rb_eArgError, "expected an IO Object.");
+    }
+    stream_writer_reset_buf(sw);
+}
+
+static VALUE buffer_size_sym = Qundef;
+
+/* Document-method: new
+ * call-seq: new(io, options)
+ *
+ * Creates a new StreamWriter. Options are supported according the specified
+ * mode or the mode in the default options. Note that if mimic_JSON or
+ * Oj.optimize_rails has not been called then the behavior of the modes may
+ * not be the same as if they were.
+ *
+ * In addition to the regular dump options for the various modes a
+ * _:buffer_size_ option is available. It should be set to a positive
+ * integer. It is considered a hint of how large the initial internal buffer
+ * should be and also a hint on when to flush.
+ *
+ * - *io* [_IO_] stream to write to
+ * - *options* [_Hash_] formatting options
+ */
+static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
+    StreamWriterType type   = STREAM_IO;
+    int              fd     = 0;
+    VALUE            stream = argv[0];
+    VALUE            clas   = rb_obj_class(stream);
+    StreamWriter     sw;
+#if !IS_WINDOWS
+    VALUE s;
+#endif
+
+    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))) {
+        type = FILE_IO;
+#endif
+    } else if (rb_respond_to(stream, oj_write_id)) {
+        type = STREAM_IO;
+    } else {
+        rb_raise(rb_eArgError, "expected an IO Object.");
+    }
+    sw = OJ_R_ALLOC(struct _streamWriter);
+    if (2 == argc && T_HASH == rb_type(argv[1])) {
+        volatile VALUE v;
+        int            buf_size = 0;
+
+        if (Qundef == buffer_size_sym) {
+            buffer_size_sym = ID2SYM(rb_intern("buffer_size"));
+            rb_gc_register_address(&buffer_size_sym);
+        }
+        if (Qnil != (v = rb_hash_lookup(argv[1], buffer_size_sym))) {
+            if (rb_cInteger != rb_obj_class(v)) {
+                OJ_R_FREE(sw);
+                rb_raise(rb_eArgError, ":buffer size must be a Integer.");
+            }
+            buf_size = FIX2INT(v);
+        }
+        oj_str_writer_init(&sw->sw, buf_size);
+        oj_parse_options(argv[1], &sw->sw.opts);
+        sw->flush_limit = buf_size;
+    } else {
+        oj_str_writer_init(&sw->sw, 4096);
+        sw->flush_limit = 0;
+    }
+    sw->sw.out.indent = sw->sw.opts.indent;
+    sw->stream        = stream;
+    sw->type          = type;
+    sw->fd            = fd;
+
+    return TypedData_Wrap_Struct(oj_stream_writer_class, &oj_stream_writer_type, sw);
+}
+
+/* Document-method: push_key
+ * call-seq: push_key(key)
+ *
+ * Pushes a key onto the JSON document. The key will be used for the next push
+ * if currently in a JSON object and ignored otherwise. If a key is provided on
+ * the next push then that new key will be ignored.
+ *
+ * - *key* [_String_] the key pending for the next push
+ */
+static VALUE stream_writer_push_key(VALUE self, VALUE key) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
+
+    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);
+    }
+    return Qnil;
+}
+
+/* Document-method: push_object
+ * call-seq: push_object(key=nil)
+ *
+ * Pushes an object onto the JSON document. Future pushes will be to this object
+ * until a pop() is called.
+ *
+ * - *key* [_String_] the key if adding to an object in the JSON document
+ */
+static VALUE stream_writer_push_object(int argc, VALUE *argv, VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
+
+    switch (argc) {
+    case 0: oj_str_writer_push_object(&sw->sw, 0); break;
+    case 1:
+        if (Qnil == argv[0]) {
+            oj_str_writer_push_object(&sw->sw, 0);
+        } else {
+            oj_str_writer_push_object(&sw->sw, StringValuePtr(argv[0]));
+        }
+        break;
+    default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'."); break;
+    }
+    if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
+        stream_writer_write(sw);
+    }
+    return Qnil;
+}
+
+/* Document-method: push_array
+ * call-seq: push_array(key=nil)
+ *
+ * Pushes an array onto the JSON document. Future pushes will be to this object
+ * until a pop() is called.
+ *
+ * - *key* [_String_] the key if adding to an object in the JSON document
+ */
+static VALUE stream_writer_push_array(int argc, VALUE *argv, VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
+
+    switch (argc) {
+    case 0: oj_str_writer_push_array(&sw->sw, 0); break;
+    case 1:
+        if (Qnil == argv[0]) {
+            oj_str_writer_push_array(&sw->sw, 0);
+        } else {
+            oj_str_writer_push_array(&sw->sw, StringValuePtr(argv[0]));
+        }
+        break;
+    default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'."); break;
+    }
+    if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
+        stream_writer_write(sw);
+    }
+    return Qnil;
+}
+
+/* Document-method: push_value
+ * call-seq: push_value(value, key=nil)
+ *
+ * Pushes a value onto the JSON document.
+ * - *value* [_Object_] value to add to the JSON document
+ * - *key* [_String_] the key if adding to an object in the JSON document
+ */
+static VALUE stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
+
+    switch (argc) {
+    case 1: oj_str_writer_push_value((StrWriter)sw, *argv, 0); break;
+    case 2:
+        if (Qnil == argv[1]) {
+            oj_str_writer_push_value((StrWriter)sw, *argv, 0);
+        } else {
+            oj_str_writer_push_value((StrWriter)sw, *argv, StringValuePtr(argv[1]));
+        }
+        break;
+    default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_value'."); break;
+    }
+    if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
+        stream_writer_write(sw);
+    }
+    return Qnil;
+}
+
+/* Document-method: push_json
+ * call-seq: push_json(value, key=nil)
+ *
+ * Pushes a string onto the JSON document. The String must be a valid JSON
+ * encoded string. No additional checking is done to verify the validity of the
+ * string.
+ * - *value* [_Object_] value to add to the JSON document
+ * - *key* [_String_] the key if adding to an object in the JSON document
+ */
+static VALUE stream_writer_push_json(int argc, VALUE *argv, VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
+
+    switch (argc) {
+    case 1: oj_str_writer_push_json((StrWriter)sw, StringValuePtr(*argv), 0); break;
+    case 2:
+        if (Qnil == argv[1]) {
+            oj_str_writer_push_json((StrWriter)sw, StringValuePtr(*argv), 0);
+        } else {
+            oj_str_writer_push_json((StrWriter)sw, StringValuePtr(*argv), StringValuePtr(argv[1]));
+        }
+        break;
+    default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_json'."); break;
+    }
+    if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
+        stream_writer_write(sw);
+    }
+    return Qnil;
+}
+
+/* Document-method: pop
+ * call-seq: pop()
+ *
+ * Pops up a level in the JSON document closing the array or object that is
+ * currently open.
+ */
+static VALUE stream_writer_pop(VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
+
+    oj_str_writer_pop(&sw->sw);
+    if (sw->flush_limit < sw->sw.out.cur - sw->sw.out.buf) {
+        stream_writer_write(sw);
+    }
+    return Qnil;
+}
+
+/* Document-method: pop_all
+ * call-seq: pop_all()
+ *
+ * Pops all level in the JSON document closing all the array or object that is
+ * currently open.
+ */
+static VALUE stream_writer_pop_all(VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
+
+    oj_str_writer_pop_all(&sw->sw);
+    stream_writer_write(sw);
+
+    return Qnil;
+}
+
+/* Document-method: flush
+ * call-seq: flush()
+ *
+ * Flush any remaining characters in the buffer.
+ */
+static VALUE stream_writer_flush(VALUE self) {
+    StreamWriter sw;
+    TypedData_Get_Struct(self, struct _streamWriter, &oj_stream_writer_type, sw);
+    stream_writer_write(sw);
+
+    return Qnil;
+}
+
+/* Document-class: Oj::StreamWriter
+ *
+ * Supports building a JSON document one element at a time. Build the IO stream
+ * document by pushing values into the document. Pushing an array or an object
+ * will create that element in the JSON document and subsequent pushes will add
+ * the elements to that array or object until a pop() is called.
+ */
+void oj_stream_writer_init(void) {
+    oj_stream_writer_class = rb_define_class_under(Oj, "StreamWriter", rb_cObject);
+    rb_gc_register_address(&oj_stream_writer_class);
+    rb_undef_alloc_func(oj_stream_writer_class);
+    rb_define_module_function(oj_stream_writer_class, "new", stream_writer_new, -1);
+    rb_define_method(oj_stream_writer_class, "push_key", stream_writer_push_key, 1);
+    rb_define_method(oj_stream_writer_class, "push_object", stream_writer_push_object, -1);
+    rb_define_method(oj_stream_writer_class, "push_array", stream_writer_push_array, -1);
+    rb_define_method(oj_stream_writer_class, "push_value", stream_writer_push_value, -1);
+    rb_define_method(oj_stream_writer_class, "push_json", stream_writer_push_json, -1);
+    rb_define_method(oj_stream_writer_class, "pop", stream_writer_pop, 0);
+    rb_define_method(oj_stream_writer_class, "pop_all", stream_writer_pop_all, 0);
+    rb_define_method(oj_stream_writer_class, "flush", stream_writer_flush, 0);
+}

data/ext/oj/strict.c

@@ -1,185 +1,187 @@
-/* strict.c
- * Copyright (c) 2012, 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) 2012 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "oj.h"
+#include "encode.h"
 #include "err.h"
+#include "intern.h"
+#include "oj.h"
 #include "parse.h"
-#include "encode.h"
+#include "trace.h"
 
-static void
-noop_end(struct _ParseInfo *pi) {
+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);
+    } else {
+        rstr = rb_utf8_str_new(str, len);
+    }
+    return rstr;
 }
 
-static VALUE
-noop_hash_key(struct _ParseInfo *pi, const char *key, size_t klen) {
+VALUE oj_calc_hash_key(ParseInfo pi, Val parent) {
+    volatile VALUE rkey = parent->key_val;
+
+    if (Qundef != rkey) {
+        return rkey;
+    }
+    if (Yes != pi->options.cache_keys) {
+        if (Yes == pi->options.sym_key) {
+            rkey = ID2SYM(rb_intern3(parent->key, parent->klen, oj_utf8_encoding));
+        } else {
+            rkey = rb_utf8_str_new(parent->key, parent->klen);
+            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);
+    } else {
+        rkey = oj_str_intern(parent->key, parent->klen);
+    }
+    return rkey;
+}
+
+static void hash_end(ParseInfo pi) {
+    TRACE_PARSE_HASH_END(pi->options.trace, pi);
+}
+
+static void array_end(ParseInfo pi) {
+    TRACE_PARSE_ARRAY_END(pi->options.trace, pi);
+}
+
+static VALUE noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
     return Qundef;
 }
 
-static void
-add_value(ParseInfo pi, VALUE val) {
+static void add_value(ParseInfo pi, VALUE val) {
+    TRACE_PARSE_CALL(pi->options.trace, "add_value", pi, val);
     pi->stack.head->val = val;
 }
 
-static void
-add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
-    volatile VALUE	rstr = rb_str_new(str, len);
+static void add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
+    volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
 
-    rstr = oj_encode(rstr);
     pi->stack.head->val = rstr;
+    TRACE_PARSE_CALL(pi->options.trace, "add_string", pi, rstr);
 }
 
-static void
-add_num(ParseInfo pi, NumInfo ni) {
+static void add_num(ParseInfo pi, NumInfo ni) {
     if (ni->infinity || ni->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");
     }
     pi->stack.head->val = oj_num_as_value(ni);
+    TRACE_PARSE_CALL(pi->options.trace, "add_number", pi, pi->stack.head->val);
 }
 
-static VALUE
-start_hash(ParseInfo pi) {
+static VALUE start_hash(ParseInfo pi) {
     if (Qnil != pi->options.hash_class) {
-	return rb_class_new_instance(0, NULL, pi->options.hash_class);
+        return rb_class_new_instance(0, NULL, pi->options.hash_class);
     }
+    TRACE_PARSE_IN(pi->options.trace, "start_hash", pi);
     return rb_hash_new();
 }
 
-static VALUE
-calc_hash_key(ParseInfo pi, Val parent) {
-    volatile VALUE	rkey = parent->key_val;
+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);
 
-    if (Qundef == rkey) {
-	rkey = rb_str_new(parent->key, parent->klen);
-    }
-    rkey = oj_encode(rkey);
-    if (Yes == pi->options.sym_key) {
-	rkey = rb_str_intern(rkey);
-    }
-    return rkey;
+    rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), rstr);
+    TRACE_PARSE_CALL(pi->options.trace, "set_string", pi, rstr);
 }
 
-static void
-hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char *orig) {
-    volatile VALUE	rstr = rb_str_new(str, len);
-
-    rstr = oj_encode(rstr);
-    rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), rstr);
-}
+static void hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
+    volatile VALUE v;
 
-static void
-hash_set_num(struct _ParseInfo *pi, Val parent, NumInfo ni) {
     if (ni->infinity || ni->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");
     }
-    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, oj_calc_hash_key(pi, parent), v);
+    TRACE_PARSE_CALL(pi->options.trace, "set_number", pi, 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);
+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);
+    TRACE_PARSE_CALL(pi->options.trace, "set_value", pi, value);
 }
 
-static VALUE
-start_array(ParseInfo pi) {
+static VALUE start_array(ParseInfo pi) {
+    TRACE_PARSE_IN(pi->options.trace, "start_array", pi);
     return rb_ary_new();
 }
 
-static void
-array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
-    volatile VALUE	rstr = rb_str_new(str, len);
+static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
+    volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
 
-    rstr = oj_encode(rstr);
     rb_ary_push(stack_peek(&pi->stack)->val, rstr);
+    TRACE_PARSE_CALL(pi->options.trace, "append_string", pi, rstr);
 }
 
-static void
-array_append_num(ParseInfo pi, NumInfo ni) {
+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");
+        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);
+    TRACE_PARSE_CALL(pi->options.trace, "append_number", pi, v);
 }
 
-static void
-array_append_value(ParseInfo pi, VALUE value) {
+static void array_append_value(ParseInfo pi, VALUE value) {
     rb_ary_push(stack_peek(&pi->stack)->val, value);
-}
-
-void
-oj_set_strict_callbacks(ParseInfo pi) {
-    pi->start_hash = start_hash;
-    pi->end_hash = noop_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->array_append_cstr = array_append_cstr;
-    pi->array_append_num = array_append_num;
+    TRACE_PARSE_CALL(pi->options.trace, "append_value", pi, value);
+}
+
+void oj_set_strict_callbacks(ParseInfo pi) {
+    pi->start_hash         = start_hash;
+    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          = array_end;
+    pi->array_append_cstr  = array_append_cstr;
+    pi->array_append_num   = array_append_num;
     pi->array_append_value = array_append_value;
-    pi->add_cstr = add_cstr;
-    pi->add_num = add_num;
-    pi->add_value = add_value;
-    pi->expect_value = 1;
+    pi->add_cstr           = add_cstr;
+    pi->add_num            = add_num;
+    pi->add_value          = add_value;
+    pi->expect_value       = 1;
 }
 
 VALUE
 oj_strict_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo pi;
 
-    pi.options = oj_default_options;
-    pi.handler = Qnil;
+    parse_info_init(&pi);
+    pi.options   = oj_default_options;
+    pi.handler   = Qnil;
     pi.err_class = Qnil;
     oj_set_strict_callbacks(&pi);
 
     if (T_STRING == rb_type(*argv)) {
-	return oj_pi_parse(argc, argv, &pi, 0, 0, 1);
+        return oj_pi_parse(argc, argv, &pi, 0, 0, true);
     } else {
-	return oj_pi_sparse(argc, argv, &pi, 0);
+        return oj_pi_sparse(argc, argv, &pi, 0);
     }
 }
 
 VALUE
 oj_strict_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
-    struct _ParseInfo	pi;
+    struct _parseInfo pi;
 
-    pi.options = oj_default_options;
-    pi.handler = Qnil;
+    parse_info_init(&pi);
+    pi.options   = oj_default_options;
+    pi.handler   = Qnil;
     pi.err_class = Qnil;
     oj_set_strict_callbacks(&pi);
 
-    return oj_pi_parse(argc, argv, &pi, json, len, 1);
+    return oj_pi_parse(argc, argv, &pi, json, len, true);
 }