oj 3.13.11 → 3.13.23

data/ext/oj/odd.c

@@ -5,28 +5,27 @@
 
 #include <string.h>
 
-static struct _odd  _odds[4];  // bump up if new initial Odd classes are added
-static struct _odd *odds    = _odds;
-static long         odd_cnt = 0;
-static ID           sec_id;
-static ID           sec_fraction_id;
-static ID           to_f_id;
-static ID           numerator_id;
-static ID           denominator_id;
-static ID           rational_id;
-static VALUE        rational_class;
+static Odd odds = NULL;
+static ID  sec_id;
+static ID  sec_fraction_id;
+static ID  to_f_id;
+static ID  numerator_id;
+static ID  denominator_id;
+static ID  rational_id;
 
 static void set_class(Odd odd, const char *classname) {
     const char **np;
-    ID *         idp;
+    ID          *idp;
 
-    odd->classname  = classname;
-    odd->clen       = strlen(classname);
-    odd->clas       = rb_const_get(rb_cObject, rb_intern(classname));
+    odd->classname = classname;
+    odd->clen      = strlen(classname);
+    odd->clas      = rb_const_get(rb_cObject, rb_intern(classname));
+    rb_gc_register_mark_object(odd->clas);
     odd->create_obj = odd->clas;
-    odd->create_op  = rb_intern("new");
-    odd->is_module  = (T_MODULE == rb_type(odd->clas));
-    odd->raw        = 0;
+    rb_gc_register_mark_object(odd->create_obj);
+    odd->create_op = rb_intern("new");
+    odd->is_module = (T_MODULE == rb_type(odd->clas));
+    odd->raw       = 0;
     for (np = odd->attr_names, idp = odd->attrs; 0 != *np; np++, idp++) {
         *idp = rb_intern(*np);
     }
@@ -37,15 +36,48 @@ static VALUE get_datetime_secs(VALUE obj) {
     volatile VALUE rsecs = rb_funcall(obj, sec_id, 0);
     volatile VALUE rfrac = rb_funcall(obj, sec_fraction_id, 0);
     long           sec   = NUM2LONG(rsecs);
-    long long      num   = rb_num2ll(rb_funcall(rfrac, numerator_id, 0));
-    long long      den   = rb_num2ll(rb_funcall(rfrac, denominator_id, 0));
+    long long      num   = NUM2LL(rb_funcall(rfrac, numerator_id, 0));
+    long long      den   = NUM2LL(rb_funcall(rfrac, denominator_id, 0));
 
     num += sec * den;
 
     return rb_funcall(rb_cObject, rational_id, 2, rb_ll2inum(num), rb_ll2inum(den));
 }
 
-void oj_odd_init() {
+static void print_odd(Odd odd) {
+    const char **np;
+    int          i;
+
+    printf("  %s {\n", odd->classname);
+    printf("    attr_cnt: %d %p\n", odd->attr_cnt, (void *)odd->attr_names);
+    printf("    attr_names: %p\n", (void *)*odd->attr_names);
+    printf("    attr_names: %c\n", **odd->attr_names);
+    for (i = odd->attr_cnt, np = odd->attr_names; 0 < i; i--, np++) {
+        printf("    %d %s\n", i, *np);
+    }
+    printf("  }\n");
+}
+
+void print_all_odds(const char *label) {
+    Odd odd;
+    printf("@ %s {\n", label);
+    for (odd = odds; NULL != odd; odd = odd->next) {
+        print_odd(odd);
+    }
+    printf("}\n");
+}
+
+static Odd odd_create(void) {
+    Odd odd = ALLOC(struct _odd);
+
+    memset(odd, 0, sizeof(struct _odd));
+    odd->next = odds;
+    odds      = odd;
+
+    return odd;
+}
+
+void oj_odd_init(void) {
     Odd          odd;
     const char **np;
 
@@ -55,11 +87,9 @@ void oj_odd_init() {
     numerator_id    = rb_intern("numerator");
     denominator_id  = rb_intern("denominator");
     rational_id     = rb_intern("Rational");
-    rational_class  = rb_const_get(rb_cObject, rational_id);
 
-    memset(_odds, 0, sizeof(_odds));
-    odd = odds;
     // Rational
+    odd   = odd_create();
     np    = odd->attr_names;
     *np++ = "numerator";
     *np++ = "denominator";
@@ -68,8 +98,9 @@ void oj_odd_init() {
     odd->create_obj = rb_cObject;
     odd->create_op  = rational_id;
     odd->attr_cnt   = 2;
+
     // Date
-    odd++;
+    odd   = odd_create();
     np    = odd->attr_names;
     *np++ = "year";
     *np++ = "month";
@@ -78,8 +109,9 @@ void oj_odd_init() {
     *np++ = 0;
     set_class(odd, "Date");
     odd->attr_cnt = 4;
+
     // DateTime
-    odd++;
+    odd   = odd_create();
     np    = odd->attr_names;
     *np++ = "year";
     *np++ = "month";
@@ -93,8 +125,9 @@ void oj_odd_init() {
     set_class(odd, "DateTime");
     odd->attr_cnt     = 8;
     odd->attrFuncs[5] = get_datetime_secs;
+
     // Range
-    odd++;
+    odd   = odd_create();
     np    = odd->attr_names;
     *np++ = "begin";
     *np++ = "end";
@@ -102,15 +135,13 @@ void oj_odd_init() {
     *np++ = 0;
     set_class(odd, "Range");
     odd->attr_cnt = 3;
-
-    odd_cnt = odd - odds + 1;
 }
 
 Odd oj_get_odd(VALUE clas) {
     Odd         odd;
     const char *classname = NULL;
 
-    for (odd = odds + odd_cnt - 1; odds <= odd; odd--) {
+    for (odd = odds; NULL != odd; odd = odd->next) {
         if (clas == odd->clas) {
             return odd;
         }
@@ -129,21 +160,20 @@ Odd oj_get_odd(VALUE clas) {
 Odd oj_get_oddc(const char *classname, size_t len) {
     Odd odd;
 
-    for (odd = odds + odd_cnt - 1; odds <= odd; odd--) {
+    for (odd = odds; NULL != odd; odd = odd->next) {
         if (len == odd->clen && 0 == strncmp(classname, odd->classname, len)) {
             return odd;
         }
-        if (odd->is_module && 0 == strncmp(odd->classname, classname, odd->clen) &&
-            ':' == classname[odd->clen]) {
+        if (odd->is_module && 0 == strncmp(odd->classname, classname, odd->clen) && ':' == classname[odd->clen]) {
             return odd;
         }
     }
-    return 0;
+    return NULL;
 }
 
 OddArgs oj_odd_alloc_args(Odd odd) {
     OddArgs oa = ALLOC_N(struct _oddArgs, 1);
-    VALUE * a;
+    VALUE  *a;
     int     i;
 
     oa->odd = odd;
@@ -159,11 +189,10 @@ void oj_odd_free(OddArgs args) {
 
 int oj_odd_set_arg(OddArgs args, const char *key, size_t klen, VALUE value) {
     const char **np;
-    VALUE *      vp;
+    VALUE       *vp;
     int          i;
 
-    for (i = args->odd->attr_cnt, np = args->odd->attr_names, vp = args->args; 0 < i;
-         i--, np++, vp++) {
+    for (i = args->odd->attr_cnt, np = args->odd->attr_names, vp = args->args; 0 < i; i--, np++, vp++) {
         if (0 == strncmp(key, *np, klen) && '\0' == *((*np) + klen)) {
             *vp = value;
             return 0;
@@ -172,37 +201,26 @@ int oj_odd_set_arg(OddArgs args, const char *key, size_t klen, VALUE value) {
     return -1;
 }
 
-void oj_reg_odd(VALUE  clas,
-                VALUE  create_object,
-                VALUE  create_method,
-                int    mcnt,
-                VALUE *members,
-                bool   raw) {
+void oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE *members, bool raw) {
     Odd          odd;
     const char **np;
-    ID *         ap;
+    ID          *ap;
     AttrGetFunc *fp;
 
-    if (_odds == odds) {
-        odds = ALLOC_N(struct _odd, odd_cnt + 1);
-
-        memcpy(odds, _odds, sizeof(struct _odd) * odd_cnt);
-    } else {
-        REALLOC_N(odds, struct _odd, odd_cnt + 1);
-    }
-    odd       = odds + odd_cnt;
+    odd       = odd_create();
     odd->clas = clas;
+    rb_gc_register_mark_object(odd->clas);
     if (NULL == (odd->classname = strdup(rb_class2name(clas)))) {
-        rb_raise(rb_eNoMemError, "for attribute name.");
+        rb_raise(rb_eNoMemError, "for class name.");
     }
     odd->clen       = strlen(odd->classname);
     odd->create_obj = create_object;
-    odd->create_op  = SYM2ID(create_method);
-    odd->attr_cnt   = mcnt;
-    odd->is_module  = (T_MODULE == rb_type(clas));
-    odd->raw        = raw;
-    for (ap = odd->attrs, np = odd->attr_names, fp = odd->attrFuncs; 0 < mcnt;
-         mcnt--, ap++, np++, members++, fp++) {
+    rb_gc_register_mark_object(odd->create_obj);
+    odd->create_op = SYM2ID(create_method);
+    odd->attr_cnt  = mcnt;
+    odd->is_module = (T_MODULE == rb_type(clas));
+    odd->raw       = raw;
+    for (ap = odd->attrs, np = odd->attr_names, fp = odd->attrFuncs; 0 < mcnt; mcnt--, ap++, np++, members++, fp++) {
         *fp = 0;
         switch (rb_type(*members)) {
         case T_STRING:
@@ -210,14 +228,16 @@ void oj_reg_odd(VALUE  clas,
                 rb_raise(rb_eNoMemError, "for attribute name.");
             }
             break;
-        case T_SYMBOL: *np = rb_id2name(SYM2ID(*members)); break;
-        default:
-            rb_raise(rb_eArgError, "registered member identifiers must be Strings or Symbols.");
+        case T_SYMBOL:
+            // The symbol can move and invalidate the name so make a copy.
+            if (NULL == (*np = strdup(rb_id2name(SYM2ID(*members))))) {
+                rb_raise(rb_eNoMemError, "for attribute name.");
+            }
             break;
+        default: rb_raise(rb_eArgError, "registered member identifiers must be Strings or Symbols."); break;
         }
         *ap = rb_intern(*np);
     }
     *np = 0;
     *ap = 0;
-    odd_cnt++;
 }

data/ext/oj/odd.h

@@ -13,17 +13,18 @@
 typedef VALUE (*AttrGetFunc)(VALUE obj);
 
 typedef struct _odd {
-    const char *classname;
-    size_t      clen;
-    VALUE       clas;  // Ruby class or module
-    VALUE       create_obj;
-    ID          create_op;
-    int         attr_cnt;
-    bool        is_module;
-    bool        raw;
-    const char *attr_names[MAX_ODD_ARGS];  // NULL terminated attr names
-    ID          attrs[MAX_ODD_ARGS];       // 0 terminated attr IDs
-    AttrGetFunc attrFuncs[MAX_ODD_ARGS];
+    struct _odd *next;
+    const char * classname;
+    size_t       clen;
+    VALUE        clas;  // Ruby class or module
+    VALUE        create_obj;
+    ID           create_op;
+    int          attr_cnt;
+    bool         is_module;
+    bool         raw;
+    const char * attr_names[MAX_ODD_ARGS];  // NULL terminated attr names
+    ID           attrs[MAX_ODD_ARGS];       // 0 terminated attr IDs
+    AttrGetFunc  attrFuncs[MAX_ODD_ARGS];
 } * Odd;
 
 typedef struct _oddArgs {
@@ -37,7 +38,6 @@ extern Odd     oj_get_oddc(const char *classname, size_t len);
 extern OddArgs oj_odd_alloc_args(Odd odd);
 extern void    oj_odd_free(OddArgs args);
 extern int     oj_odd_set_arg(OddArgs args, const char *key, size_t klen, VALUE value);
-extern void
-oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE *members, bool raw);
+extern void    oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE *members, bool raw);
 
 #endif /* OJ_ODD_H */

data/ext/oj/oj.c

@@ -32,6 +32,7 @@ ID oj_array_append_id;
 ID oj_array_end_id;
 ID oj_array_start_id;
 ID oj_as_json_id;
+ID oj_at_id;
 ID oj_begin_id;
 ID oj_bigdecimal_id;
 ID oj_end_id;
@@ -45,7 +46,6 @@ ID oj_hash_key_id;
 ID oj_hash_set_id;
 ID oj_hash_start_id;
 ID oj_iconv_id;
-ID oj_instance_variables_id;
 ID oj_json_create_id;
 ID oj_length_id;
 ID oj_new_id;
@@ -90,7 +90,9 @@ VALUE oj_array_class_sym;
 VALUE oj_create_additions_sym;
 VALUE oj_decimal_class_sym;
 VALUE oj_hash_class_sym;
+VALUE oj_in_sym;
 VALUE oj_indent_sym;
+VALUE oj_nanosecond_sym;
 VALUE oj_object_class_sym;
 VALUE oj_quirks_mode_sym;
 VALUE oj_safe_sym;
@@ -137,6 +139,7 @@ static VALUE rails_sym;
 static VALUE raise_sym;
 static VALUE ruby_sym;
 static VALUE sec_prec_sym;
+static VALUE slash_sym;
 static VALUE strict_sym;
 static VALUE symbol_keys_sym;
 static VALUE time_format_sym;
@@ -153,6 +156,7 @@ static VALUE xmlschema_sym;
 static VALUE xss_safe_sym;
 
 rb_encoding *oj_utf8_encoding = 0;
+int oj_utf8_encoding_index = 0;
 
 #ifdef HAVE_PTHREAD_MUTEX_INIT
 pthread_mutex_t oj_cache_mutex;
@@ -239,7 +243,7 @@ struct _options oj_default_options = {
  *references
  * - *:auto_define* [_Boolean_|_nil_] automatically define classes if they do not exist
  * - *:symbol_keys* [_Boolean_|_nil_] use symbols instead of strings for hash keys
- * - *:escape_mode* [_:newline_|_:json_|_:xss_safe_|_:ascii_|_unicode_xss_|_nil_] determines the
+ * - *:escape_mode* [_:newline_|_:json_|_:slash_|_: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)
@@ -247,7 +251,7 @@ struct _options oj_default_options = {
  *to use for JSON
  * - *: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_|_:fast_] load decimals as BigDecimal instead
+ * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_|_:ruby_] load decimals as BigDecimal instead
  *of as a Float. :auto pick the most precise for the number of digits. :float should be the same as
  *ruby. :fast may require rounding but is must faster.
  * - *:compat_bigdecimal* [_true_|_false_] load decimals as BigDecimal instead of as a Float when in
@@ -404,6 +408,7 @@ static VALUE get_def_opts(VALUE self) {
     switch (oj_default_options.escape_mode) {
     case NLEsc: rb_hash_aset(opts, escape_mode_sym, newline_sym); break;
     case JSONEsc: rb_hash_aset(opts, escape_mode_sym, json_sym); break;
+    case SlashEsc: rb_hash_aset(opts, escape_mode_sym, slash_sym); break;
     case XSSEsc: rb_hash_aset(opts, escape_mode_sym, xss_safe_sym); break;
     case ASCIIEsc: rb_hash_aset(opts, escape_mode_sym, ascii_sym); break;
     case JXEsc: rb_hash_aset(opts, escape_mode_sym, unicode_xss_sym); break;
@@ -733,6 +738,8 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
             copts->escape_mode = NLEsc;
         } else if (json_sym == v) {
             copts->escape_mode = JSONEsc;
+        } else if (slash_sym == v) {
+            copts->escape_mode = SlashEsc;
         } else if (xss_safe_sym == v) {
             copts->escape_mode = XSSEsc;
         } else if (ascii_sym == v) {
@@ -925,7 +932,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
         if (Qnil == v) {
             return ST_CONTINUE;
         }
-        if (TYPE(v) == T_STRUCT && rb_obj_class(v) == rb_cRange) {
+        if (rb_obj_class(v) == rb_cRange) {
             VALUE min = rb_funcall(v, oj_begin_id, 0);
             VALUE max = rb_funcall(v, oj_end_id, 0);
 
@@ -1147,7 +1154,17 @@ static VALUE load_file(int argc, VALUE *argv, VALUE self) {
         }
     }
     path = StringValuePtr(*argv);
-    if (0 == (fd = open(path, O_RDONLY))) {
+#ifdef _WIN32
+    {
+        WCHAR *wide_path;
+        wide_path = rb_w32_mbstr_to_wstr(CP_UTF8, path, -1, NULL);
+        fd = rb_w32_wopen(wide_path, O_RDONLY);
+        free(wide_path);
+    }
+#else
+    fd = open(path, O_RDONLY);
+#endif
+    if (0 == fd) {
         rb_raise(rb_eIOError, "%s", strerror(errno));
     }
     switch (mode) {
@@ -1243,9 +1260,8 @@ static VALUE dump_body(VALUE a) {
 static VALUE dump_ensure(VALUE a) {
     volatile struct dump_arg *arg = (void *)a;
 
-    if (arg->out->allocated) {
-        xfree(arg->out->buf);
-    }
+    oj_out_free(arg->out);
+
     return Qnil;
 }
 
@@ -1257,7 +1273,6 @@ static VALUE dump_ensure(VALUE a) {
  * - *options* [_Hash_] same as default_options
  */
 static VALUE dump(int argc, VALUE *argv, VALUE self) {
-    char            buf[4096];
     struct dump_arg arg;
     struct _out     out;
     struct _options copts = oj_default_options;
@@ -1279,9 +1294,8 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
     arg.argc  = argc;
     arg.argv  = argv;
 
-    arg.out->buf       = buf;
-    arg.out->end       = buf + sizeof(buf) - 10;
-    arg.out->allocated = false;
+    oj_out_init(arg.out);
+
     arg.out->omit_nil  = copts.dump_opts.omit_nil;
     arg.out->caller    = CALLER_DUMP;
 
@@ -1313,7 +1327,6 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
  * Returns [_String_] the encoded JSON.
  */
 static VALUE to_json(int argc, VALUE *argv, VALUE self) {
-    char            buf[4096];
     struct _out     out;
     struct _options copts = oj_default_options;
     VALUE           rstr;
@@ -1328,9 +1341,9 @@ static VALUE to_json(int argc, VALUE *argv, VALUE self) {
     }
     copts.mode    = CompatMode;
     copts.to_json = Yes;
-    out.buf       = buf;
-    out.end       = buf + sizeof(buf) - 10;
-    out.allocated = false;
+
+    oj_out_init(&out);
+
     out.omit_nil  = copts.dump_opts.omit_nil;
     // For obj.to_json or generate nan is not allowed but if called from dump
     // it is.
@@ -1341,9 +1354,9 @@ static VALUE to_json(int argc, VALUE *argv, VALUE self) {
     }
     rstr = rb_str_new2(out.buf);
     rstr = oj_encode(rstr);
-    if (out.allocated) {
-        xfree(out.buf);
-    }
+
+    oj_out_free(&out);
+
     return rstr;
 }
 
@@ -1703,6 +1716,15 @@ static VALUE protect_require(VALUE x) {
     return Qnil;
 }
 
+extern void print_all_odds(const char *label);
+
+static VALUE
+debug_odd(VALUE self, VALUE label) {
+    print_all_odds(RSTRING_PTR(label));
+    return Qnil;
+}
+
+
 /* Document-module: Oj
  *
  * Optimized JSON (Oj), as the name implies was written to provide speed
@@ -1731,15 +1753,19 @@ static VALUE protect_require(VALUE x) {
  *
  * - *:wab* specifically for WAB data exchange.
  */
-void Init_oj() {
+void Init_oj(void) {
     int err = 0;
 
 #if HAVE_RB_EXT_RACTOR_SAFE
     rb_ext_ractor_safe(true);
 #endif
     Oj = rb_define_module("Oj");
+    rb_gc_register_address(&Oj);
 
     oj_cstack_class = rb_define_class_under(Oj, "CStack", rb_cObject);
+    rb_gc_register_address(&oj_cstack_class);
+
+    rb_undef_alloc_func(oj_cstack_class);
 
     oj_string_writer_init();
     oj_stream_writer_init();
@@ -1748,9 +1774,11 @@ void Init_oj() {
     // On Rubinius the require fails but can be done from a ruby file.
     rb_protect(protect_require, Qnil, &err);
     rb_require("stringio");
-    oj_utf8_encoding = rb_enc_find("UTF-8");
+    oj_utf8_encoding_index = rb_enc_find_index("UTF-8");
+    oj_utf8_encoding = rb_enc_from_index(oj_utf8_encoding_index);
 
     // rb_define_module_function(Oj, "hash_test", hash_test, 0);
+    rb_define_module_function(Oj, "debug_odd", debug_odd, 1);
 
     rb_define_module_function(Oj, "default_options", get_def_opts, 0);
     rb_define_module_function(Oj, "default_options=", set_def_opts, 1);
@@ -1789,6 +1817,7 @@ void Init_oj() {
     oj_array_end_id          = rb_intern("array_end");
     oj_array_start_id        = rb_intern("array_start");
     oj_as_json_id            = rb_intern("as_json");
+    oj_at_id                 = rb_intern("at");
     oj_begin_id              = rb_intern("begin");
     oj_bigdecimal_id         = rb_intern("BigDecimal");
     oj_end_id                = rb_intern("end");
@@ -1802,7 +1831,6 @@ void Init_oj() {
     oj_hash_set_id           = rb_intern("hash_set");
     oj_hash_start_id         = rb_intern("hash_start");
     oj_iconv_id              = rb_intern("iconv");
-    oj_instance_variables_id = rb_intern("instance_variables");
     oj_json_create_id        = rb_intern("json_create");
     oj_length_id             = rb_intern("length");
     oj_new_id                = rb_intern("new");
@@ -1937,10 +1965,14 @@ void Init_oj() {
     rb_gc_register_address(&oj_decimal_class_sym);
     oj_hash_class_sym = ID2SYM(rb_intern("hash_class"));
     rb_gc_register_address(&oj_hash_class_sym);
+    oj_in_sym = ID2SYM(rb_intern("in"));
+    rb_gc_register_address(&oj_in_sym);
     oj_indent_sym = ID2SYM(rb_intern("indent"));
     rb_gc_register_address(&oj_indent_sym);
     oj_max_nesting_sym = ID2SYM(rb_intern("max_nesting"));
     rb_gc_register_address(&oj_max_nesting_sym);
+    oj_nanosecond_sym = ID2SYM(rb_intern("nanosecond"));
+    rb_gc_register_address(&oj_nanosecond_sym);
     oj_object_class_sym = ID2SYM(rb_intern("object_class"));
     rb_gc_register_address(&oj_object_class_sym);
     oj_object_nl_sym = ID2SYM(rb_intern("object_nl"));
@@ -1965,6 +1997,8 @@ void Init_oj() {
     rb_gc_register_address(&ruby_sym);
     sec_prec_sym = ID2SYM(rb_intern("second_precision"));
     rb_gc_register_address(&sec_prec_sym);
+    slash_sym = ID2SYM(rb_intern("slash"));
+    rb_gc_register_address(&slash_sym);
     strict_sym = ID2SYM(rb_intern("strict"));
     rb_gc_register_address(&strict_sym);
     symbol_keys_sym = ID2SYM(rb_intern("symbol_keys"));
@@ -2017,4 +2051,5 @@ void Init_oj() {
     oj_init_doc();
 
     oj_parser_init();
+    oj_scanner_init();
 }

data/ext/oj/oj.h

@@ -39,6 +39,16 @@ enum st_retval { ST_CONTINUE = 0, ST_STOP = 1, ST_DELETE = 2, ST_CHECK };
 #define NINF_VAL "-3.0e14159265358979323846"
 #define NAN_VAL "3.3e14159265358979323846"
 
+#if __STDC_VERSION__ >= 199901L
+    // To avoid using ruby_snprintf with C99.
+    #undef snprintf
+    #include <stdio.h>
+#endif
+
+// To avoid using ruby_nonempty_memcpy().
+#undef memcpy
+#include <string.h>
+
 typedef enum { Yes = 'y', No = 'n', NotSet = 0 } YesNo;
 
 typedef enum {
@@ -56,6 +66,7 @@ typedef enum { UnixTime = 'u', UnixZTime = 'z', XmlTime = 'x', RubyTime = 'r' }
 typedef enum {
     NLEsc     = 'n',
     JSONEsc   = 'j',
+    SlashEsc  = 's',
     XSSEsc    = 'x',
     ASCIIEsc  = 'a',
     JXEsc     = 'g',  // json gem
@@ -176,6 +187,7 @@ typedef struct _rOptTable {
 } * ROptTable;
 
 typedef struct _out {
+    char       stack_buffer[4096];
     char *     buf;
     char *     end;
     char *     cur;
@@ -265,8 +277,8 @@ extern void oj_str_writer_pop(StrWriter sw);
 extern void oj_str_writer_pop_all(StrWriter sw);
 
 extern void  oj_init_doc(void);
-extern void  oj_string_writer_init();
-extern void  oj_stream_writer_init();
+extern void  oj_string_writer_init(void);
+extern void  oj_stream_writer_init(void);
 extern void  oj_str_writer_init(StrWriter sw, int buf_size);
 extern VALUE oj_define_mimic_json(int argc, VALUE *argv, VALUE self);
 extern VALUE oj_mimic_generate(int argc, VALUE *argv, VALUE self);
@@ -282,6 +294,7 @@ extern VALUE oj_rails_encode(int argc, VALUE *argv, VALUE self);
 extern VALUE           Oj;
 extern struct _options oj_default_options;
 extern rb_encoding *   oj_utf8_encoding;
+extern int             oj_utf8_encoding_index;
 
 extern VALUE oj_bag_class;
 extern VALUE oj_bigdecimal_class;
@@ -304,7 +317,9 @@ extern VALUE oj_ascii_only_sym;
 extern VALUE oj_create_additions_sym;
 extern VALUE oj_decimal_class_sym;
 extern VALUE oj_hash_class_sym;
+extern VALUE oj_in_sym;
 extern VALUE oj_indent_sym;
+extern VALUE oj_nanosecond_sym;
 extern VALUE oj_max_nesting_sym;
 extern VALUE oj_object_class_sym;
 extern VALUE oj_object_nl_sym;
@@ -321,6 +336,7 @@ extern ID oj_array_append_id;
 extern ID oj_array_end_id;
 extern ID oj_array_start_id;
 extern ID oj_as_json_id;
+extern ID oj_at_id;
 extern ID oj_begin_id;
 extern ID oj_bigdecimal_id;
 extern ID oj_end_id;
@@ -334,7 +350,6 @@ extern ID oj_hash_key_id;
 extern ID oj_hash_set_id;
 extern ID oj_hash_start_id;
 extern ID oj_iconv_id;
-extern ID oj_instance_variables_id;
 extern ID oj_json_create_id;
 extern ID oj_length_id;
 extern ID oj_new_id;
@@ -364,6 +379,12 @@ extern bool oj_use_hash_alt;
 extern bool oj_use_array_alt;
 extern bool string_writer_optimized;
 
+#define APPEND_CHARS(buffer, chars, size) \
+    { \
+        memcpy(buffer, chars, size); \
+        buffer += size; \
+    }
+
 #ifdef HAVE_PTHREAD_MUTEX_INIT
 extern pthread_mutex_t oj_cache_mutex;
 #else