oj 3.13.2 → 3.13.6

data/ext/oj/intern.h

@@ -21,7 +21,6 @@ extern VALUE oj_class_intern(const char *       key,
                              int                auto_define,
                              VALUE              error_class);
 
-extern void  oj_hash_print();
 extern char *oj_strndup(const char *s, size_t len);
 
 #endif /* OJ_INTERN_H */

data/ext/oj/mimic_json.c

@@ -682,7 +682,7 @@ static VALUE mimic_set_create_id(VALUE self, VALUE id) {
  */
 static VALUE mimic_create_id(VALUE self) {
     if (NULL != oj_default_options.create_id) {
-        return oj_encode(rb_str_new_cstr(oj_default_options.create_id));
+        return  rb_utf8_str_new(oj_default_options.create_id, oj_default_options.create_id_len);
     }
     return rb_str_new_cstr(oj_json_class);
 }
@@ -714,7 +714,7 @@ static struct _options mimic_object_to_json_options = {0,              // indent
                                                        false,          // sec_prec_set
                                                        No,             // ignore_under
                                                        Yes,            // cache_keys
-                                                       3,              // cache_str
+                                                       0,              // cache_str
                                                        0,              // int_range_min
                                                        0,              // int_range_max
                                                        oj_json_class,  // create_id

data/ext/oj/object.c

@@ -30,46 +30,19 @@ inline static long read_long(const char *str, size_t len) {
 
 static VALUE calc_hash_key(ParseInfo pi, Val kval, char k1) {
     volatile VALUE rkey;
-#if 0
-    VALUE *slot;
 
     if (':' == k1) {
-        if (Qnil == (rkey = oj_sym_hash_get(kval->key + 1, kval->klen - 1, &slot))) {
-            rkey  = rb_str_new(kval->key + 1, kval->klen - 1);
-            rkey  = oj_encode(rkey);
-            rkey  = rb_str_intern(rkey);
-            *slot = rkey;
-            rb_gc_register_address(slot);
-        }
-    } else if (Yes == pi->options.sym_key) {
-        if (Qnil == (rkey = oj_sym_hash_get(kval->key, kval->klen, &slot))) {
-            rkey  = rb_str_new(kval->key, kval->klen);
-            rkey  = oj_encode(rkey);
-            rkey  = rb_str_intern(rkey);
-            *slot = rkey;
-            rb_gc_register_address(slot);
-        }
-    } else {
-        if (Qnil == (rkey = oj_str_hash_get(kval->key, kval->klen, &slot))) {
-            rkey  = rb_str_new(kval->key, kval->klen);
-            rkey  = oj_encode(rkey);
-            *slot = rkey;
-            rb_gc_register_address(slot);
-        }
+        return ID2SYM(rb_intern3(kval->key + 1, kval->klen - 1, oj_utf8_encoding));
     }
-#else
-    if (':' == k1) {
-        rkey = ID2SYM(rb_intern3(kval->key + 1, kval->klen - 1, oj_utf8_encoding));
-    } else {
-        if (Yes == pi->options.sym_key) {
-            rkey = ID2SYM(rb_intern3(kval->key, kval->klen, oj_utf8_encoding));
-        } else {
-            rkey = rb_str_new(kval->key, kval->klen);
-            rkey = oj_encode(rkey);
-        }
+    if (Yes == pi->options.sym_key) {
+	return ID2SYM(rb_intern3(kval->key, kval->klen, oj_utf8_encoding));
     }
-#endif
+#if HAVE_RB_ENC_INTERNED_STR
+    rkey = rb_enc_interned_str(kval->key, kval->klen, oj_utf8_encoding);
+#else
+    rkey = rb_utf8_str_new(kval->key, kval->klen);
     OBJ_FREEZE(rkey);
+#endif
     return rkey;
 }
 
@@ -87,8 +60,7 @@ static VALUE str_to_value(ParseInfo pi, const char *str, size_t len, const char
         }
         rstr = oj_circ_array_get(pi->circ_array, i);
     } else {
-        rstr = rb_str_new(str, len);
-        rstr = oj_encode(rstr);
+	rstr = rb_utf8_str_new(str, len);
     }
     return rstr;
 }
@@ -259,8 +231,7 @@ static int hat_cstr(ParseInfo pi, Val parent, Val kval, const char *str, size_t
             parent->val = ID2SYM(rb_intern3(str + 1, len - 1, oj_utf8_encoding));
             break;
         case 's':
-            parent->val = rb_str_new(str, len);
-            parent->val = oj_encode(parent->val);
+	    parent->val = rb_utf8_str_new(str, len);
             break;
         case 'c':  // class
         {

data/ext/oj/oj.c

@@ -107,6 +107,7 @@ static VALUE bigdecimal_load_sym;
 static VALUE bigdecimal_sym;
 static VALUE cache_keys_sym;
 static VALUE cache_str_sym;
+static VALUE cache_string_sym;
 static VALUE circular_sym;
 static VALUE class_cache_sym;
 static VALUE compat_bigdecimal_sym;
@@ -190,7 +191,7 @@ struct _options oj_default_options = {
     false,          // sec_prec_set
     No,             // ignore_under
     Yes,            // cache_keys
-    3,              // cache_str
+    0,              // cache_str
     0,              // int_range_min
     0,              // int_range_max
     oj_json_class,  // create_id
@@ -287,8 +288,8 @@ struct _options oj_default_options = {
  * - *:ignore* [_nil_|_Array_] either nil or an Array of classes to ignore when dumping
  * - *:ignore_under* [_Boolean_] if true then attributes that start with _ are ignored when dumping in
  *object or custom mode.
- * - *:cache_keys* [_Boolean_] if true then hash keys are cached
- * - *:cache_str* [_Fixnum_] maximum string value length to cache
+ * - *:cache_keys* [_Boolean_] if true then hash keys are cached if less than 35 bytes.
+ * - *:cache_str* [_Fixnum_] maximum string value length to cache (strings less than this are cached)
  * - *:integer_range* [_Range_] Dump integers outside range as strings.
  * - *:trace* [_true,_|_false_] Trace all load and dump calls, default is false (trace is off)
  * - *:safe* [_true,_|_false_] Safe mimic breaks JSON mimic to be safer, default is false (safe is
@@ -571,7 +572,7 @@ static VALUE get_def_opts(VALUE self) {
  *   - *:ignore_under* [_Boolean_] if true then attributes that start with _ are ignored when
  *dumping in object or custom mode.
  *   - *:cache_keys* [_Boolean_] if true then hash keys are cached
- *   - *:cache_str* [_Fixnum_] maximum string vsalue length to cache
+ *   - *:cache_str* [_Fixnum_] maximum string value length to cache (strings less than this are cached)
  *   - *:integer_range* [_Range_] Dump integers outside range as strings.
  *   - *:trace* [_Boolean_] turn trace on or off.
  *   - *:safe* [_Boolean_] turn safe mimic on or off.
@@ -692,7 +693,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
             sprintf(copts->float_fmt, "%%0.%dg", n);
             copts->float_prec = n;
         }
-    } else if (cache_str_sym == k) {
+    } else if (cache_str_sym == k || cache_string_sym == k) {
         int n;
 
 #ifdef RUBY_INTEGER_UNIFICATION
@@ -1920,6 +1921,8 @@ void Init_oj() {
     rb_gc_register_address(&cache_keys_sym);
     cache_str_sym = ID2SYM(rb_intern("cache_str"));
     rb_gc_register_address(&cache_str_sym);
+    cache_string_sym = ID2SYM(rb_intern("cache_string"));
+    rb_gc_register_address(&cache_string_sym);
     circular_sym = ID2SYM(rb_intern("circular"));
     rb_gc_register_address(&circular_sym);
     class_cache_sym = ID2SYM(rb_intern("class_cache"));

data/ext/oj/parser.c

@@ -1,8 +1,9 @@
 // Copyright (c) 2020, 2021, Peter Ohler, All rights reserved.
 
+#include "parser.h"
+
 #include <fcntl.h>
 
-#include "parser.h"
 #include "oj.h"
 
 #define DEBUG 0
@@ -384,87 +385,44 @@ static const byte hex_map[256] = "\
 ................................\
 ................................";
 
-static long double pow_map[401] = {1.0L,     1.0e1L,   1.0e2L,   1.0e3L,   1.0e4L,
-                                   1.0e5L,   1.0e6L,   1.0e7L,   1.0e8L,   1.0e9L,  //  00
-                                   1.0e10L,  1.0e11L,  1.0e12L,  1.0e13L,  1.0e14L,
-                                   1.0e15L,  1.0e16L,  1.0e17L,  1.0e18L,  1.0e19L,  //  10
-                                   1.0e20L,  1.0e21L,  1.0e22L,  1.0e23L,  1.0e24L,
-                                   1.0e25L,  1.0e26L,  1.0e27L,  1.0e28L,  1.0e29L,  //  20
-                                   1.0e30L,  1.0e31L,  1.0e32L,  1.0e33L,  1.0e34L,
-                                   1.0e35L,  1.0e36L,  1.0e37L,  1.0e38L,  1.0e39L,  //  30
-                                   1.0e40L,  1.0e41L,  1.0e42L,  1.0e43L,  1.0e44L,
-                                   1.0e45L,  1.0e46L,  1.0e47L,  1.0e48L,  1.0e49L,  //  40
-                                   1.0e50L,  1.0e51L,  1.0e52L,  1.0e53L,  1.0e54L,
-                                   1.0e55L,  1.0e56L,  1.0e57L,  1.0e58L,  1.0e59L,  //  50
-                                   1.0e60L,  1.0e61L,  1.0e62L,  1.0e63L,  1.0e64L,
-                                   1.0e65L,  1.0e66L,  1.0e67L,  1.0e68L,  1.0e69L,  //  60
-                                   1.0e70L,  1.0e71L,  1.0e72L,  1.0e73L,  1.0e74L,
-                                   1.0e75L,  1.0e76L,  1.0e77L,  1.0e78L,  1.0e79L,  //  70
-                                   1.0e80L,  1.0e81L,  1.0e82L,  1.0e83L,  1.0e84L,
-                                   1.0e85L,  1.0e86L,  1.0e87L,  1.0e88L,  1.0e89L,  //  80
-                                   1.0e90L,  1.0e91L,  1.0e92L,  1.0e93L,  1.0e94L,
-                                   1.0e95L,  1.0e96L,  1.0e97L,  1.0e98L,  1.0e99L,  //  90
-                                   1.0e100L, 1.0e101L, 1.0e102L, 1.0e103L, 1.0e104L,
-                                   1.0e105L, 1.0e106L, 1.0e107L, 1.0e108L, 1.0e109L,  // 100
-                                   1.0e110L, 1.0e111L, 1.0e112L, 1.0e113L, 1.0e114L,
-                                   1.0e115L, 1.0e116L, 1.0e117L, 1.0e118L, 1.0e119L,  // 110
-                                   1.0e120L, 1.0e121L, 1.0e122L, 1.0e123L, 1.0e124L,
-                                   1.0e125L, 1.0e126L, 1.0e127L, 1.0e128L, 1.0e129L,  // 120
-                                   1.0e130L, 1.0e131L, 1.0e132L, 1.0e133L, 1.0e134L,
-                                   1.0e135L, 1.0e136L, 1.0e137L, 1.0e138L, 1.0e139L,  // 130
-                                   1.0e140L, 1.0e141L, 1.0e142L, 1.0e143L, 1.0e144L,
-                                   1.0e145L, 1.0e146L, 1.0e147L, 1.0e148L, 1.0e149L,  // 140
-                                   1.0e150L, 1.0e151L, 1.0e152L, 1.0e153L, 1.0e154L,
-                                   1.0e155L, 1.0e156L, 1.0e157L, 1.0e158L, 1.0e159L,  // 150
-                                   1.0e160L, 1.0e161L, 1.0e162L, 1.0e163L, 1.0e164L,
-                                   1.0e165L, 1.0e166L, 1.0e167L, 1.0e168L, 1.0e169L,  // 160
-                                   1.0e170L, 1.0e171L, 1.0e172L, 1.0e173L, 1.0e174L,
-                                   1.0e175L, 1.0e176L, 1.0e177L, 1.0e178L, 1.0e179L,  // 170
-                                   1.0e180L, 1.0e181L, 1.0e182L, 1.0e183L, 1.0e184L,
-                                   1.0e185L, 1.0e186L, 1.0e187L, 1.0e188L, 1.0e189L,  // 180
-                                   1.0e190L, 1.0e191L, 1.0e192L, 1.0e193L, 1.0e194L,
-                                   1.0e195L, 1.0e196L, 1.0e197L, 1.0e198L, 1.0e199L,  // 190
-                                   1.0e200L, 1.0e201L, 1.0e202L, 1.0e203L, 1.0e204L,
-                                   1.0e205L, 1.0e206L, 1.0e207L, 1.0e208L, 1.0e209L,  // 200
-                                   1.0e210L, 1.0e211L, 1.0e212L, 1.0e213L, 1.0e214L,
-                                   1.0e215L, 1.0e216L, 1.0e217L, 1.0e218L, 1.0e219L,  // 210
-                                   1.0e220L, 1.0e221L, 1.0e222L, 1.0e223L, 1.0e224L,
-                                   1.0e225L, 1.0e226L, 1.0e227L, 1.0e228L, 1.0e229L,  // 220
-                                   1.0e230L, 1.0e231L, 1.0e232L, 1.0e233L, 1.0e234L,
-                                   1.0e235L, 1.0e236L, 1.0e237L, 1.0e238L, 1.0e239L,  // 230
-                                   1.0e240L, 1.0e241L, 1.0e242L, 1.0e243L, 1.0e244L,
-                                   1.0e245L, 1.0e246L, 1.0e247L, 1.0e248L, 1.0e249L,  // 240
-                                   1.0e250L, 1.0e251L, 1.0e252L, 1.0e253L, 1.0e254L,
-                                   1.0e255L, 1.0e256L, 1.0e257L, 1.0e258L, 1.0e259L,  // 250
-                                   1.0e260L, 1.0e261L, 1.0e262L, 1.0e263L, 1.0e264L,
-                                   1.0e265L, 1.0e266L, 1.0e267L, 1.0e268L, 1.0e269L,  // 260
-                                   1.0e270L, 1.0e271L, 1.0e272L, 1.0e273L, 1.0e274L,
-                                   1.0e275L, 1.0e276L, 1.0e277L, 1.0e278L, 1.0e279L,  // 270
-                                   1.0e280L, 1.0e281L, 1.0e282L, 1.0e283L, 1.0e284L,
-                                   1.0e285L, 1.0e286L, 1.0e287L, 1.0e288L, 1.0e289L,  // 280
-                                   1.0e290L, 1.0e291L, 1.0e292L, 1.0e293L, 1.0e294L,
-                                   1.0e295L, 1.0e296L, 1.0e297L, 1.0e298L, 1.0e299L,  // 290
-                                   1.0e300L, 1.0e301L, 1.0e302L, 1.0e303L, 1.0e304L,
-                                   1.0e305L, 1.0e306L, 1.0e307L, 1.0e308L, 1.0e309L,  // 300
-                                   1.0e310L, 1.0e311L, 1.0e312L, 1.0e313L, 1.0e314L,
-                                   1.0e315L, 1.0e316L, 1.0e317L, 1.0e318L, 1.0e319L,  // 310
-                                   1.0e320L, 1.0e321L, 1.0e322L, 1.0e323L, 1.0e324L,
-                                   1.0e325L, 1.0e326L, 1.0e327L, 1.0e328L, 1.0e329L,  // 320
-                                   1.0e330L, 1.0e331L, 1.0e332L, 1.0e333L, 1.0e334L,
-                                   1.0e335L, 1.0e336L, 1.0e337L, 1.0e338L, 1.0e339L,  // 330
-                                   1.0e340L, 1.0e341L, 1.0e342L, 1.0e343L, 1.0e344L,
-                                   1.0e345L, 1.0e346L, 1.0e347L, 1.0e348L, 1.0e349L,  // 340
-                                   1.0e350L, 1.0e351L, 1.0e352L, 1.0e353L, 1.0e354L,
-                                   1.0e355L, 1.0e356L, 1.0e357L, 1.0e358L, 1.0e359L,  // 350
-                                   1.0e360L, 1.0e361L, 1.0e362L, 1.0e363L, 1.0e364L,
-                                   1.0e365L, 1.0e366L, 1.0e367L, 1.0e368L, 1.0e369L,  // 360
-                                   1.0e370L, 1.0e371L, 1.0e372L, 1.0e373L, 1.0e374L,
-                                   1.0e375L, 1.0e376L, 1.0e377L, 1.0e378L, 1.0e379L,  // 370
-                                   1.0e380L, 1.0e381L, 1.0e382L, 1.0e383L, 1.0e384L,
-                                   1.0e385L, 1.0e386L, 1.0e387L, 1.0e388L, 1.0e389L,  // 380
-                                   1.0e390L, 1.0e391L, 1.0e392L, 1.0e393L, 1.0e394L,
-                                   1.0e395L, 1.0e396L, 1.0e397L, 1.0e398L, 1.0e399L,  // 390
-                                   1.0e400L};
+static long double pow_map[401] = {
+    1.0L,     1.0e1L,   1.0e2L,   1.0e3L,   1.0e4L,   1.0e5L,   1.0e6L,   1.0e7L,   1.0e8L,   1.0e9L,   1.0e10L,
+    1.0e11L,  1.0e12L,  1.0e13L,  1.0e14L,  1.0e15L,  1.0e16L,  1.0e17L,  1.0e18L,  1.0e19L,  1.0e20L,  1.0e21L,
+    1.0e22L,  1.0e23L,  1.0e24L,  1.0e25L,  1.0e26L,  1.0e27L,  1.0e28L,  1.0e29L,  1.0e30L,  1.0e31L,  1.0e32L,
+    1.0e33L,  1.0e34L,  1.0e35L,  1.0e36L,  1.0e37L,  1.0e38L,  1.0e39L,  1.0e40L,  1.0e41L,  1.0e42L,  1.0e43L,
+    1.0e44L,  1.0e45L,  1.0e46L,  1.0e47L,  1.0e48L,  1.0e49L,  1.0e50L,  1.0e51L,  1.0e52L,  1.0e53L,  1.0e54L,
+    1.0e55L,  1.0e56L,  1.0e57L,  1.0e58L,  1.0e59L,  1.0e60L,  1.0e61L,  1.0e62L,  1.0e63L,  1.0e64L,  1.0e65L,
+    1.0e66L,  1.0e67L,  1.0e68L,  1.0e69L,  1.0e70L,  1.0e71L,  1.0e72L,  1.0e73L,  1.0e74L,  1.0e75L,  1.0e76L,
+    1.0e77L,  1.0e78L,  1.0e79L,  1.0e80L,  1.0e81L,  1.0e82L,  1.0e83L,  1.0e84L,  1.0e85L,  1.0e86L,  1.0e87L,
+    1.0e88L,  1.0e89L,  1.0e90L,  1.0e91L,  1.0e92L,  1.0e93L,  1.0e94L,  1.0e95L,  1.0e96L,  1.0e97L,  1.0e98L,
+    1.0e99L,  1.0e100L, 1.0e101L, 1.0e102L, 1.0e103L, 1.0e104L, 1.0e105L, 1.0e106L, 1.0e107L, 1.0e108L, 1.0e109L,
+    1.0e110L, 1.0e111L, 1.0e112L, 1.0e113L, 1.0e114L, 1.0e115L, 1.0e116L, 1.0e117L, 1.0e118L, 1.0e119L, 1.0e120L,
+    1.0e121L, 1.0e122L, 1.0e123L, 1.0e124L, 1.0e125L, 1.0e126L, 1.0e127L, 1.0e128L, 1.0e129L, 1.0e130L, 1.0e131L,
+    1.0e132L, 1.0e133L, 1.0e134L, 1.0e135L, 1.0e136L, 1.0e137L, 1.0e138L, 1.0e139L, 1.0e140L, 1.0e141L, 1.0e142L,
+    1.0e143L, 1.0e144L, 1.0e145L, 1.0e146L, 1.0e147L, 1.0e148L, 1.0e149L, 1.0e150L, 1.0e151L, 1.0e152L, 1.0e153L,
+    1.0e154L, 1.0e155L, 1.0e156L, 1.0e157L, 1.0e158L, 1.0e159L, 1.0e160L, 1.0e161L, 1.0e162L, 1.0e163L, 1.0e164L,
+    1.0e165L, 1.0e166L, 1.0e167L, 1.0e168L, 1.0e169L, 1.0e170L, 1.0e171L, 1.0e172L, 1.0e173L, 1.0e174L, 1.0e175L,
+    1.0e176L, 1.0e177L, 1.0e178L, 1.0e179L, 1.0e180L, 1.0e181L, 1.0e182L, 1.0e183L, 1.0e184L, 1.0e185L, 1.0e186L,
+    1.0e187L, 1.0e188L, 1.0e189L, 1.0e190L, 1.0e191L, 1.0e192L, 1.0e193L, 1.0e194L, 1.0e195L, 1.0e196L, 1.0e197L,
+    1.0e198L, 1.0e199L, 1.0e200L, 1.0e201L, 1.0e202L, 1.0e203L, 1.0e204L, 1.0e205L, 1.0e206L, 1.0e207L, 1.0e208L,
+    1.0e209L, 1.0e210L, 1.0e211L, 1.0e212L, 1.0e213L, 1.0e214L, 1.0e215L, 1.0e216L, 1.0e217L, 1.0e218L, 1.0e219L,
+    1.0e220L, 1.0e221L, 1.0e222L, 1.0e223L, 1.0e224L, 1.0e225L, 1.0e226L, 1.0e227L, 1.0e228L, 1.0e229L, 1.0e230L,
+    1.0e231L, 1.0e232L, 1.0e233L, 1.0e234L, 1.0e235L, 1.0e236L, 1.0e237L, 1.0e238L, 1.0e239L, 1.0e240L, 1.0e241L,
+    1.0e242L, 1.0e243L, 1.0e244L, 1.0e245L, 1.0e246L, 1.0e247L, 1.0e248L, 1.0e249L, 1.0e250L, 1.0e251L, 1.0e252L,
+    1.0e253L, 1.0e254L, 1.0e255L, 1.0e256L, 1.0e257L, 1.0e258L, 1.0e259L, 1.0e260L, 1.0e261L, 1.0e262L, 1.0e263L,
+    1.0e264L, 1.0e265L, 1.0e266L, 1.0e267L, 1.0e268L, 1.0e269L, 1.0e270L, 1.0e271L, 1.0e272L, 1.0e273L, 1.0e274L,
+    1.0e275L, 1.0e276L, 1.0e277L, 1.0e278L, 1.0e279L, 1.0e280L, 1.0e281L, 1.0e282L, 1.0e283L, 1.0e284L, 1.0e285L,
+    1.0e286L, 1.0e287L, 1.0e288L, 1.0e289L, 1.0e290L, 1.0e291L, 1.0e292L, 1.0e293L, 1.0e294L, 1.0e295L, 1.0e296L,
+    1.0e297L, 1.0e298L, 1.0e299L, 1.0e300L, 1.0e301L, 1.0e302L, 1.0e303L, 1.0e304L, 1.0e305L, 1.0e306L, 1.0e307L,
+    1.0e308L, 1.0e309L, 1.0e310L, 1.0e311L, 1.0e312L, 1.0e313L, 1.0e314L, 1.0e315L, 1.0e316L, 1.0e317L, 1.0e318L,
+    1.0e319L, 1.0e320L, 1.0e321L, 1.0e322L, 1.0e323L, 1.0e324L, 1.0e325L, 1.0e326L, 1.0e327L, 1.0e328L, 1.0e329L,
+    1.0e330L, 1.0e331L, 1.0e332L, 1.0e333L, 1.0e334L, 1.0e335L, 1.0e336L, 1.0e337L, 1.0e338L, 1.0e339L, 1.0e340L,
+    1.0e341L, 1.0e342L, 1.0e343L, 1.0e344L, 1.0e345L, 1.0e346L, 1.0e347L, 1.0e348L, 1.0e349L, 1.0e350L, 1.0e351L,
+    1.0e352L, 1.0e353L, 1.0e354L, 1.0e355L, 1.0e356L, 1.0e357L, 1.0e358L, 1.0e359L, 1.0e360L, 1.0e361L, 1.0e362L,
+    1.0e363L, 1.0e364L, 1.0e365L, 1.0e366L, 1.0e367L, 1.0e368L, 1.0e369L, 1.0e370L, 1.0e371L, 1.0e372L, 1.0e373L,
+    1.0e374L, 1.0e375L, 1.0e376L, 1.0e377L, 1.0e378L, 1.0e379L, 1.0e380L, 1.0e381L, 1.0e382L, 1.0e383L, 1.0e384L,
+    1.0e385L, 1.0e386L, 1.0e387L, 1.0e388L, 1.0e389L, 1.0e390L, 1.0e391L, 1.0e392L, 1.0e393L, 1.0e394L, 1.0e395L,
+    1.0e396L, 1.0e397L, 1.0e398L, 1.0e399L, 1.0e400L};
 
 static VALUE parser_class;
 
@@ -591,7 +549,7 @@ static void big_change(ojParser p) {
     int     len = 0;
 
     buf[sizeof(buf) - 1] = '\0';
-    p->buf.tail = p->buf.head;
+    p->buf.tail          = p->buf.head;
     switch (p->type) {
     case OJ_INT:
         // If an int then it will fit in the num.raw so no need to check length;
@@ -646,12 +604,15 @@ static void big_change(ojParser p) {
 static void parse(ojParser p, const byte *json) {
     const byte *start;
     const byte *b = json;
-    int i;
+    int         i;
 
 #if DEBUG
     printf("*** parse - mode: %c %s\n", p->map[256], (const char *)json);
 #endif
     for (; '\0' != *b; b++) {
+#if DEBUG
+        printf("*** parse - mode: %c %02x %s => %c\n", p->map[256], *b, b, p->map[*b]);
+#endif
         switch (p->map[*b]) {
         case SKIP_NEWLINE:
             p->line++;
@@ -890,7 +851,7 @@ static void parse(ojParser p, const byte *json) {
             }
             buf_append_string(&p->buf, (const char *)start, b - start);
             b--;
-	    break;
+            break;
         case BIG_E:
             buf_append(&p->buf, *b);
             p->map = big_exp_sign_map;
@@ -929,13 +890,17 @@ static void parse(ojParser p, const byte *json) {
                 buf_append_string(&p->buf, (const char *)start, b - start);
             }
             if ('"' == *b) {
+                p->funcs[p->stack[p->depth]].add_str(p);
                 p->map = p->next_map;
                 break;
             }
             b--;
             break;
         case STR_SLASH: p->map = esc_map; break;
-        case STR_QUOTE: p->map = p->next_map; break;
+        case STR_QUOTE:
+            p->funcs[p->stack[p->depth]].add_str(p);
+            p->map = p->next_map;
+            break;
         case ESC_U:
             p->map   = u_map;
             p->ri    = 0;
@@ -1177,13 +1142,42 @@ extern void oj_set_parser_saj(ojParser p);
 extern void oj_set_parser_usual(ojParser p);
 extern void oj_set_parser_debug(ojParser p);
 
+static int opt_cb(VALUE rkey, VALUE value, VALUE ptr) {
+    ojParser    p   = (ojParser)ptr;
+    const char *key = NULL;
+    char        set_key[64];
+    long        klen;
+
+    switch (rb_type(rkey)) {
+    case RUBY_T_SYMBOL:
+        rkey = rb_sym2str(rkey);
+        // fall through
+    case RUBY_T_STRING:
+        key  = rb_string_value_ptr(&rkey);
+        klen = RSTRING_LEN(rkey);
+        break;
+    default: rb_raise(rb_eArgError, "option keys must be a symbol or string");
+    }
+    if ((long)sizeof(set_key) - 1 <= klen) {
+        return ST_CONTINUE;
+    }
+    memcpy(set_key, key, klen);
+    set_key[klen]     = '=';
+    set_key[klen + 1] = '\0';
+    p->option(p, set_key, value);
+
+    return ST_CONTINUE;
+}
+
 /* Document-method: new
  * call-seq: new(mode=nil)
  *
  * Creates a new Parser with the specified mode. If no mode is provided
- * validation is assumed.
+ * validation is assumed. Optional arguments can be provided that match the
+ * mode. For example with the :usual mode the call might look like
+ * Oj::Parser.new(:usual, cache_keys: true).
  */
-static VALUE parser_new(VALUE self, VALUE mode) {
+static VALUE parser_new(int argc, VALUE *argv, VALUE self) {
     ojParser p = ALLOC(struct _ojParser);
 
 #if HAVE_RB_EXT_RACTOR_SAFE
@@ -1193,34 +1187,45 @@ static VALUE parser_new(VALUE self, VALUE mode) {
     memset(p, 0, sizeof(struct _ojParser));
     buf_init(&p->key);
     buf_init(&p->buf);
-
     p->map = value_map;
-    if (Qnil == mode) {
-        oj_set_parser_validator(p);
+
+    if (argc < 1) {
+	oj_set_parser_validator(p);
     } else {
-        const char *ms = NULL;
-
-        switch (rb_type(mode)) {
-        case RUBY_T_SYMBOL:
-            mode = rb_sym2str(mode);
-            // fall through
-        case RUBY_T_STRING: ms = RSTRING_PTR(mode); break;
-        default:
-            rb_raise(rb_eArgError, "mode must be :validate, :usual, :saj, or :object");
-        }
-        if (0 == strcmp("usual", ms) || 0 == strcmp("standard", ms) || 0 == strcmp("strict", ms) ||
-            0 == strcmp("compat", ms)) {
-            oj_set_parser_usual(p);
-        } else if (0 == strcmp("object", ms)) {
-            // TBD
-        } else if (0 == strcmp("saj", ms)) {
-            oj_set_parser_saj(p);
-        } else if (0 == strcmp("validate", ms)) {
+        VALUE mode = argv[0];
+
+        if (Qnil == mode) {
             oj_set_parser_validator(p);
-        } else if (0 == strcmp("debug", ms)) {
-            oj_set_parser_debug(p);
         } else {
-            rb_raise(rb_eArgError, "mode must be :validate, :usual, :saj, or :object");
+            const char *ms = NULL;
+
+            switch (rb_type(mode)) {
+            case RUBY_T_SYMBOL:
+                mode = rb_sym2str(mode);
+                // fall through
+            case RUBY_T_STRING: ms = RSTRING_PTR(mode); break;
+            default: rb_raise(rb_eArgError, "mode must be :validate, :usual, :saj, or :object");
+            }
+            if (0 == strcmp("usual", ms) || 0 == strcmp("standard", ms) || 0 == strcmp("strict", ms) ||
+                0 == strcmp("compat", ms)) {
+                oj_set_parser_usual(p);
+            } else if (0 == strcmp("object", ms)) {
+                // TBD
+            } else if (0 == strcmp("saj", ms)) {
+                oj_set_parser_saj(p);
+            } else if (0 == strcmp("validate", ms)) {
+                oj_set_parser_validator(p);
+            } else if (0 == strcmp("debug", ms)) {
+                oj_set_parser_debug(p);
+            } else {
+                rb_raise(rb_eArgError, "mode must be :validate, :usual, :saj, or :object");
+            }
+        }
+        if (1 < argc) {
+            VALUE ropts = argv[1];
+
+            Check_Type(ropts, T_HASH);
+            rb_hash_foreach(ropts, opt_cb, (VALUE)p);
         }
     }
     return Data_Wrap_Struct(parser_class, parser_mark, parser_free, p);
@@ -1238,7 +1243,8 @@ static VALUE parser_new(VALUE self, VALUE mode) {
  * - *:saj*
  *   - _cache_keys=_ sets the value of the _cache_keys_ flag.
  *   - _cache_keys_ returns the value of the _cache_keys_ flag.
- *   - _cache_strings=_ sets the value of the _cache_strings_ to an positive integer less than 35. Strings shorter than that length are cached.
+ *   - _cache_strings=_ sets the value of the _cache_strings_ to an positive integer less than 35. Strings shorter than
+ * that length are cached.
  *   - _cache_strings_ returns the value of the _cache_strings_ integer value.
  *   - _handler=_ sets the SAJ handler
  *   - _handler_ returns the SAJ handler
@@ -1246,19 +1252,32 @@ static VALUE parser_new(VALUE self, VALUE mode) {
  * - *:usual*
  *   - _cache_keys=_ sets the value of the _cache_keys_ flag.
  *   - _cache_keys_ returns the value of the _cache_keys_ flag.
- *   - _cache_strings=_ sets the value of the _cache_strings_ to an positive integer less than 35. Strings shorter than that length are cached.
+ *   - _cache_strings=_ sets the value of the _cache_strings_ to a positive integer less than 35. Strings shorter than
+ * that length are cached.
  *   - _cache_strings_ returns the value of the _cache_strings_ integer value.
- *   - _capacity=_ sets the capacity of the parser. The parser grows automatically but can be updated directly with this call.
+ *   - _cache_expunge=_ sets the value of the _cache_expunge_ where 0 never expunges, 1 expunges slowly, 2 expunges
+ * faster, and 3 or higher expunges agressively.
+ *   - _cache_expunge_ returns the value of the _cache_expunge_ integer value.
+ *   - _capacity=_ sets the capacity of the parser. The parser grows automatically but can be updated directly with this
+ * call.
  *   - _capacity_ returns the current capacity of the parser's internal stack.
  *   - _create_id_ returns the value _create_id_ or _nil_ if there is no _create_id_.
- *   - _create_id=_ sets the value _create_id_ or if _nil_ unsets it. Parsed JSON objects that include the specified element use the element value as the name of the class to create an object from instead of a Hash.
- *   - _decimal=_ sets the approach to how decimals are parser. If _:auto_ then the decimals with significant digits are 16 or less are Floats and long ones are BigDecimal. _:ruby_ uses a call to Ruby to convert a string to a Float. _:float_ always generates a Float. _:bigdecimal_ always results in a BigDecimal.
- *   - _decimal_ returns the value of the decimal conversion option which can be :auto (default), :ruby, :float, or :bigdecimal.
+ *   - _create_id=_ sets the value _create_id_ or if _nil_ unsets it. Parsed JSON objects that include the specified
+ * element use the element value as the name of the class to create an object from instead of a Hash.
+ *   - _decimal=_ sets the approach to how decimals are parser. If _:auto_ then the decimals with significant digits are
+ * 16 or less are Floats and long ones are BigDecimal. _:ruby_ uses a call to Ruby to convert a string to a Float.
+ * _:float_ always generates a Float. _:bigdecimal_ always results in a BigDecimal.
+ *   - _decimal_ returns the value of the decimal conversion option which can be :auto (default), :ruby, :float, or
+ * :bigdecimal.
  *   - _ignore_json_create_ returns the value of the _ignore_json_create_ flag.
- *   - _ignore_json_create=_ sets the value of the _ignore_json_create_ flag. When set the class json_create method is ignored on parsing in favor of creating an instance and populating directly.
+ *   - _ignore_json_create=_ sets the value of the _ignore_json_create_ flag. When set the class json_create method is
+ * ignored on parsing in favor of creating an instance and populating directly.
  *   - _missing_class_ return the value of the _missing_class_ indicator.
- *   - _missing_class=_ sets the value of the _missing_class_ flag. Valid values are _:auto_ which creates any missing classes on parse, :ignore which ignores and continues as a Hash (default), and :raise which raises an exception if the class is not found.
- *   - _omit_null=_ sets the _omit_null_ flag. If true then null values in a map or object are omitted from the resulting Hash or Object.
+ *   - _missing_class=_ sets the value of the _missing_class_ flag. Valid values are _:auto_ which creates any missing
+ * classes on parse, :ignore which ignores and continues as a Hash (default), and :raise which raises an exception if
+ * the class is not found.
+ *   - _omit_null=_ sets the _omit_null_ flag. If true then null values in a map or object are omitted from the
+ * resulting Hash or Object.
  *   - _omit_null_ returns the value of the _omit_null_ flag.
  *   - _symbol_keys=_ sets the flag that indicates Hash keys should be parsed to Symbols versus Strings.
  *   - _symbol_keys_ returns the value of the _symbol_keys_ flag.
@@ -1427,15 +1446,15 @@ static VALUE usual_parser = Qundef;
  */
 static VALUE parser_usual(VALUE self) {
     if (Qundef == usual_parser) {
-	ojParser p = ALLOC(struct _ojParser);
-
-	memset(p, 0, sizeof(struct _ojParser));
-	buf_init(&p->key);
-	buf_init(&p->buf);
-	p->map = value_map;
-	oj_set_parser_usual(p);
-	usual_parser = Data_Wrap_Struct(parser_class, parser_mark, parser_free, p);
-	rb_gc_register_address(&usual_parser);
+        ojParser p = ALLOC(struct _ojParser);
+
+        memset(p, 0, sizeof(struct _ojParser));
+        buf_init(&p->key);
+        buf_init(&p->buf);
+        p->map = value_map;
+        oj_set_parser_usual(p);
+        usual_parser = Data_Wrap_Struct(parser_class, parser_mark, parser_free, p);
+        rb_gc_register_address(&usual_parser);
     }
     return usual_parser;
 }
@@ -1450,15 +1469,15 @@ static VALUE saj_parser = Qundef;
  */
 static VALUE parser_saj(VALUE self) {
     if (Qundef == saj_parser) {
-	ojParser p = ALLOC(struct _ojParser);
-
-	memset(p, 0, sizeof(struct _ojParser));
-	buf_init(&p->key);
-	buf_init(&p->buf);
-	p->map = value_map;
-	oj_set_parser_saj(p);
-	saj_parser = Data_Wrap_Struct(parser_class, parser_mark, parser_free, p);
-	rb_gc_register_address(&saj_parser);
+        ojParser p = ALLOC(struct _ojParser);
+
+        memset(p, 0, sizeof(struct _ojParser));
+        buf_init(&p->key);
+        buf_init(&p->buf);
+        p->map = value_map;
+        oj_set_parser_saj(p);
+        saj_parser = Data_Wrap_Struct(parser_class, parser_mark, parser_free, p);
+        rb_gc_register_address(&saj_parser);
     }
     return saj_parser;
 }
@@ -1472,15 +1491,15 @@ static VALUE validate_parser = Qundef;
  */
 static VALUE parser_validate(VALUE self) {
     if (Qundef == validate_parser) {
-	ojParser p = ALLOC(struct _ojParser);
+        ojParser p = ALLOC(struct _ojParser);
 
-	memset(p, 0, sizeof(struct _ojParser));
-	buf_init(&p->key);
-	buf_init(&p->buf);
-	p->map = value_map;
-	oj_set_parser_validator(p);
-	validate_parser = Data_Wrap_Struct(parser_class, parser_mark, parser_free, p);
-	rb_gc_register_address(&validate_parser);
+        memset(p, 0, sizeof(struct _ojParser));
+        buf_init(&p->key);
+        buf_init(&p->buf);
+        p->map = value_map;
+        oj_set_parser_validator(p);
+        validate_parser = Data_Wrap_Struct(parser_class, parser_mark, parser_free, p);
+        rb_gc_register_address(&validate_parser);
     }
     return validate_parser;
 }
@@ -1498,7 +1517,7 @@ static VALUE parser_validate(VALUE self) {
  */
 void oj_parser_init() {
     parser_class = rb_define_class_under(Oj, "Parser", rb_cObject);
-    rb_define_module_function(parser_class, "new", parser_new, 1);
+    rb_define_module_function(parser_class, "new", parser_new, -1);
     rb_define_method(parser_class, "parse", parser_parse, 1);
     rb_define_method(parser_class, "load", parser_load, 1);
     rb_define_method(parser_class, "file", parser_file, 1);