oj 3.13.17 → 3.16.3

data/ext/oj/usual.c

@@ -1,6 +1,9 @@
 // Copyright (c) 2021, Peter Ohler, All rights reserved.
 
+#include "usual.h"
+
 #include "cache.h"
+#include "mem.h"
 #include "oj.h"
 #include "parser.h"
 
@@ -28,67 +31,12 @@
 
 #define DEBUG 0
 
-// Used to mark the start of each Hash, Array, or Object. The members point at
-// positions of the start in the value stack and if not an Array into the key
-// stack.
-typedef struct _col {
-    long vi;  // value stack index
-    long ki;  // key stack index if an hash else -1 for an array
-} * Col;
-
-typedef union _key {
-    struct {
-        int16_t len;
-        char    buf[30];
-    };
-    struct {
-        int16_t xlen;  // should be the same as len
-        char *  key;
-    };
-} * Key;
-
-#define MISS_AUTO 'A'
-#define MISS_RAISE 'R'
-#define MISS_IGNORE 'I'
-
-typedef struct _delegate {
-    VALUE *vhead;
-    VALUE *vtail;
-    VALUE *vend;
-
-    Col chead;
-    Col ctail;
-    Col cend;
-
-    Key khead;
-    Key ktail;
-    Key kend;
-
-    VALUE (*get_key)(ojParser p, Key kp);
-    struct _cache *key_cache;  // same as str_cache or sym_cache
-    struct _cache *str_cache;
-    struct _cache *sym_cache;
-    struct _cache *class_cache;
-    struct _cache *attr_cache;
-
-    VALUE array_class;
-    VALUE hash_class;
-
-    char *  create_id;
-    uint8_t create_id_len;
-    uint8_t cache_str;
-    uint8_t cache_xrate;
-    uint8_t miss_class;
-    bool    cache_keys;
-    bool    ignore_json_create;
-} * Delegate;
-
 static ID to_f_id = 0;
 static ID ltlt_id = 0;
 static ID hset_id = 0;
 
 static char *str_dup(const char *s, size_t len) {
-    char *d = ALLOC_N(char, len + 1);
+    char *d = OJ_R_ALLOC_N(char, len + 1);
 
     memcpy(d, s, len);
     d[len] = '\0';
@@ -108,7 +56,7 @@ static VALUE form_attr(const char *str, size_t len) {
     char buf[256];
 
     if (sizeof(buf) - 2 <= len) {
-        char *b = ALLOC_N(char, len + 2);
+        char *b = OJ_R_ALLOC_N(char, len + 2);
         ID    id;
 
         *b = '@';
@@ -116,7 +64,7 @@ static VALUE form_attr(const char *str, size_t len) {
         b[len + 1] = '\0';
 
         id = rb_intern3(buf, len + 1, oj_utf8_encoding);
-        xfree(b);
+        OJ_R_FREE(b);
         return id;
     }
     *buf = '@';
@@ -143,8 +91,8 @@ static VALUE resolve_classname(VALUE mod, const char *classname, bool auto_defin
 static VALUE resolve_classpath(const char *name, size_t len, bool auto_define) {
     char        class_name[1024];
     VALUE       clas;
-    char *      end = class_name + sizeof(class_name) - 1;
-    char *      s;
+    char       *end = class_name + sizeof(class_name) - 1;
+    char       *s;
     const char *n = name;
 
     clas = rb_cObject;
@@ -178,27 +126,27 @@ static VALUE form_class_auto(const char *str, size_t len) {
     return resolve_classpath(str, len, true);
 }
 
-static void assure_cstack(Delegate d) {
+static void assure_cstack(Usual d) {
     if (d->cend <= d->ctail + 1) {
         size_t cap = d->cend - d->chead;
         long   pos = d->ctail - d->chead;
 
         cap *= 2;
-        REALLOC_N(d->chead, struct _col, cap);
+        OJ_R_REALLOC_N(d->chead, struct _col, cap);
         d->ctail = d->chead + pos;
         d->cend  = d->chead + cap;
     }
 }
 
 static void push(ojParser p, VALUE v) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if (d->vend <= d->vtail) {
         size_t cap = d->vend - d->vhead;
         long   pos = d->vtail - d->vhead;
 
         cap *= 2;
-        REALLOC_N(d->vhead, VALUE, cap);
+        OJ_R_REALLOC_N(d->vhead, VALUE, cap);
         d->vtail = d->vhead + pos;
         d->vend  = d->vhead + cap;
     }
@@ -207,7 +155,7 @@ static void push(ojParser p, VALUE v) {
 }
 
 static VALUE cache_key(ojParser p, Key kp) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if ((size_t)kp->len < sizeof(kp->buf)) {
         return cache_intern(d->key_cache, kp->buf, kp->len);
@@ -230,7 +178,7 @@ static VALUE sym_key(ojParser p, Key kp) {
 }
 
 static ID get_attr_id(ojParser p, Key kp) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if ((size_t)kp->len < sizeof(kp->buf)) {
         return (ID)cache_intern(d->attr_cache, kp->buf, kp->len);
@@ -239,7 +187,7 @@ static ID get_attr_id(ojParser p, Key kp) {
 }
 
 static void push_key(ojParser p) {
-    Delegate    d    = (Delegate)p->ctx;
+    Usual       d    = (Usual)p->ctx;
     size_t      klen = buf_len(&p->key);
     const char *key  = buf_str(&p->key);
 
@@ -248,7 +196,7 @@ static void push_key(ojParser p) {
         long   pos = d->ktail - d->khead;
 
         cap *= 2;
-        REALLOC_N(d->khead, union _key, cap);
+        OJ_R_REALLOC_N(d->khead, union _key, cap);
         d->ktail = d->khead + pos;
         d->kend  = d->khead + cap;
     }
@@ -263,14 +211,14 @@ static void push_key(ojParser p) {
 }
 
 static void push2(ojParser p, VALUE v) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if (d->vend <= d->vtail + 1) {
         size_t cap = d->vend - d->vhead;
         long   pos = d->vtail - d->vhead;
 
         cap *= 2;
-        REALLOC_N(d->vhead, VALUE, cap);
+        OJ_R_REALLOC_N(d->vhead, VALUE, cap);
         d->vtail = d->vhead + pos;
         d->vend  = d->vhead + cap;
     }
@@ -281,7 +229,7 @@ static void push2(ojParser p, VALUE v) {
 }
 
 static void open_object(ojParser p) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     assure_cstack(d);
     d->ctail->vi = d->vtail - d->vhead;
@@ -291,7 +239,7 @@ static void open_object(ojParser p) {
 }
 
 static void open_object_key(ojParser p) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     push_key(p);
     assure_cstack(d);
@@ -302,7 +250,7 @@ static void open_object_key(ojParser p) {
 }
 
 static void open_array(ojParser p) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     assure_cstack(d);
     d->ctail->vi = d->vtail - d->vhead;
@@ -312,7 +260,7 @@ static void open_array(ojParser p) {
 }
 
 static void open_array_key(ojParser p) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     push_key(p);
     assure_cstack(d);
@@ -323,21 +271,21 @@ static void open_array_key(ojParser p) {
 }
 
 static void close_object(ojParser p) {
-    VALUE *  vp;
-    Delegate d = (Delegate)p->ctx;
+    VALUE *vp;
+    Usual  d = (Usual)p->ctx;
 
     d->ctail--;
 
     Col            c    = d->ctail;
     Key            kp   = d->khead + c->ki;
-    VALUE *        head = d->vhead + c->vi + 1;
+    VALUE         *head = d->vhead + c->vi + 1;
     volatile VALUE obj  = rb_hash_new();
 
 #if HAVE_RB_HASH_BULK_INSERT
     for (vp = head; kp < d->ktail; kp++, vp += 2) {
         *vp = d->get_key(p, kp);
         if (sizeof(kp->buf) <= (size_t)kp->len) {
-            xfree(kp->key);
+            OJ_R_FREE(kp->key);
         }
     }
     rb_hash_bulk_insert(d->vtail - head, head, obj);
@@ -345,7 +293,7 @@ static void close_object(ojParser p) {
     for (vp = head; kp < d->ktail; kp++, vp += 2) {
         rb_hash_aset(obj, d->get_key(p, kp), *(vp + 1));
         if (sizeof(kp->buf) <= (size_t)kp->len) {
-            xfree(kp->key);
+            OJ_R_FREE(kp->key);
         }
     }
 #endif
@@ -356,20 +304,20 @@ static void close_object(ojParser p) {
 }
 
 static void close_object_class(ojParser p) {
-    VALUE *  vp;
-    Delegate d = (Delegate)p->ctx;
+    VALUE *vp;
+    Usual  d = (Usual)p->ctx;
 
     d->ctail--;
 
     Col            c    = d->ctail;
     Key            kp   = d->khead + c->ki;
-    VALUE *        head = d->vhead + c->vi + 1;
+    VALUE         *head = d->vhead + c->vi + 1;
     volatile VALUE obj  = rb_class_new_instance(0, NULL, d->hash_class);
 
     for (vp = head; kp < d->ktail; kp++, vp += 2) {
         rb_funcall(obj, hset_id, 2, d->get_key(p, kp), *(vp + 1));
         if (sizeof(kp->buf) <= (size_t)kp->len) {
-            xfree(kp->key);
+            OJ_R_FREE(kp->key);
         }
     }
     d->ktail = d->khead + c->ki;
@@ -379,14 +327,14 @@ static void close_object_class(ojParser p) {
 }
 
 static void close_object_create(ojParser p) {
-    VALUE *  vp;
-    Delegate d = (Delegate)p->ctx;
+    VALUE *vp;
+    Usual  d = (Usual)p->ctx;
 
     d->ctail--;
 
     Col            c    = d->ctail;
     Key            kp   = d->khead + c->ki;
-    VALUE *        head = d->vhead + c->vi;
+    VALUE         *head = d->vhead + c->vi;
     volatile VALUE obj;
 
     if (Qundef == *head) {
@@ -397,7 +345,7 @@ static void close_object_create(ojParser p) {
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 *vp = d->get_key(p, kp);
                 if (sizeof(kp->buf) <= (size_t)kp->len) {
-                    xfree(kp->key);
+                    OJ_R_FREE(kp->key);
                 }
             }
             rb_hash_bulk_insert(d->vtail - head, head, obj);
@@ -405,7 +353,7 @@ static void close_object_create(ojParser p) {
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_hash_aset(obj, d->get_key(p, kp), *(vp + 1));
                 if (sizeof(kp->buf) <= (size_t)kp->len) {
-                    xfree(kp->key);
+                    OJ_R_FREE(kp->key);
                 }
             }
 #endif
@@ -414,7 +362,7 @@ static void close_object_create(ojParser p) {
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_funcall(obj, hset_id, 2, d->get_key(p, kp), *(vp + 1));
                 if (sizeof(kp->buf) <= (size_t)kp->len) {
-                    xfree(kp->key);
+                    OJ_R_FREE(kp->key);
                 }
             }
         }
@@ -429,7 +377,7 @@ static void close_object_create(ojParser p) {
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 *vp = d->get_key(p, kp);
                 if (sizeof(kp->buf) <= (size_t)kp->len) {
-                    xfree(kp->key);
+                    OJ_R_FREE(kp->key);
                 }
             }
             rb_hash_bulk_insert(d->vtail - head, head, arg);
@@ -437,7 +385,7 @@ static void close_object_create(ojParser p) {
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_hash_aset(arg, d->get_key(p, kp), *(vp + 1));
                 if (sizeof(kp->buf) <= (size_t)kp->len) {
-                    xfree(kp->key);
+                    OJ_R_FREE(kp->key);
                 }
             }
 #endif
@@ -447,7 +395,7 @@ static void close_object_create(ojParser p) {
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_ivar_set(obj, get_attr_id(p, kp), *(vp + 1));
                 if (sizeof(kp->buf) <= (size_t)kp->len) {
-                    xfree(kp->key);
+                    OJ_R_FREE(kp->key);
                 }
             }
         }
@@ -459,10 +407,10 @@ static void close_object_create(ojParser p) {
 }
 
 static void close_array(ojParser p) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     d->ctail--;
-    VALUE *        head = d->vhead + d->ctail->vi + 1;
+    VALUE         *head = d->vhead + d->ctail->vi + 1;
     volatile VALUE a    = rb_ary_new_from_values(d->vtail - head, head);
 
     d->vtail = head;
@@ -471,11 +419,11 @@ static void close_array(ojParser p) {
 }
 
 static void close_array_class(ojParser p) {
-    VALUE *  vp;
-    Delegate d = (Delegate)p->ctx;
+    VALUE *vp;
+    Usual  d = (Usual)p->ctx;
 
     d->ctail--;
-    VALUE *        head = d->vhead + d->ctail->vi + 1;
+    VALUE         *head = d->vhead + d->ctail->vi + 1;
     volatile VALUE a    = rb_class_new_instance(0, NULL, d->array_class);
 
     for (vp = head; vp < d->vtail; vp++) {
@@ -585,9 +533,9 @@ static void add_big_as_ruby_key(ojParser p) {
 }
 
 static void add_str(ojParser p) {
-    Delegate       d = (Delegate)p->ctx;
+    Usual          d = (Usual)p->ctx;
     volatile VALUE rstr;
-    const char *   str = buf_str(&p->buf);
+    const char    *str = buf_str(&p->buf);
     size_t         len = buf_len(&p->buf);
 
     if (len < d->cache_str) {
@@ -599,9 +547,9 @@ static void add_str(ojParser p) {
 }
 
 static void add_str_key(ojParser p) {
-    Delegate       d = (Delegate)p->ctx;
+    Usual          d = (Usual)p->ctx;
     volatile VALUE rstr;
-    const char *   str = buf_str(&p->buf);
+    const char    *str = buf_str(&p->buf);
     size_t         len = buf_len(&p->buf);
 
     if (len < d->cache_str) {
@@ -614,11 +562,11 @@ static void add_str_key(ojParser p) {
 }
 
 static void add_str_key_create(ojParser p) {
-    Delegate       d = (Delegate)p->ctx;
+    Usual          d = (Usual)p->ctx;
     volatile VALUE rstr;
-    const char *   str  = buf_str(&p->buf);
+    const char    *str  = buf_str(&p->buf);
     size_t         len  = buf_len(&p->buf);
-    const char *   key  = buf_str(&p->key);
+    const char    *key  = buf_str(&p->key);
     size_t         klen = buf_len(&p->key);
 
     if (klen == (size_t)d->create_id_len && 0 == strncmp(d->create_id, key, klen)) {
@@ -648,16 +596,19 @@ static void add_str_key_create(ojParser p) {
 }
 
 static VALUE result(ojParser p) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if (d->vhead < d->vtail) {
         return *d->vhead;
     }
+    if (d->raise_on_empty) {
+        rb_raise(oj_parse_error_class, "empty string");
+    }
     return Qnil;
 }
 
 static void start(ojParser p) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     d->vtail = d->vhead;
     d->ctail = d->chead;
@@ -665,7 +616,7 @@ static void start(ojParser p) {
 }
 
 static void dfree(ojParser p) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     cache_free(d->str_cache);
     cache_free(d->attr_cache);
@@ -675,20 +626,20 @@ static void dfree(ojParser p) {
     if (NULL != d->class_cache) {
         cache_free(d->class_cache);
     }
-    xfree(d->vhead);
-    xfree(d->chead);
-    xfree(d->khead);
-    xfree(d->create_id);
-    xfree(p->ctx);
+    OJ_R_FREE(d->vhead);
+    OJ_R_FREE(d->chead);
+    OJ_R_FREE(d->khead);
+    OJ_R_FREE(d->create_id);
+    OJ_R_FREE(p->ctx);
     p->ctx = NULL;
 }
 
 static void mark(ojParser p) {
-    if (NULL == p->ctx) {
+    if (NULL == p || NULL == p->ctx) {
         return;
     }
-    Delegate d = (Delegate)p->ctx;
-    VALUE *  vp;
+    Usual  d = (Usual)p->ctx;
+    VALUE *vp;
 
     if (NULL == d) {
         return;
@@ -720,13 +671,13 @@ struct opt {
 };
 
 static VALUE opt_array_class(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     return d->array_class;
 }
 
 static VALUE opt_array_class_set(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if (Qnil == value) {
         p->funcs[TOP_FUN].close_array    = close_array;
@@ -747,13 +698,13 @@ static VALUE opt_array_class_set(ojParser p, VALUE value) {
 }
 
 static VALUE opt_cache_keys(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     return d->cache_keys ? Qtrue : Qfalse;
 }
 
 static VALUE opt_cache_keys_set(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if (Qtrue == value) {
         d->cache_keys = true;
@@ -775,14 +726,14 @@ static VALUE opt_cache_keys_set(ojParser p, VALUE value) {
 }
 
 static VALUE opt_cache_strings(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     return INT2NUM((int)d->cache_str);
 }
 
 static VALUE opt_cache_strings_set(ojParser p, VALUE value) {
-    Delegate d     = (Delegate)p->ctx;
-    int      limit = NUM2INT(value);
+    Usual d     = (Usual)p->ctx;
+    int   limit = NUM2INT(value);
 
     if (CACHE_MAX_KEY < limit) {
         limit = CACHE_MAX_KEY;
@@ -795,14 +746,14 @@ static VALUE opt_cache_strings_set(ojParser p, VALUE value) {
 }
 
 static VALUE opt_cache_expunge(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     return INT2NUM((int)d->cache_xrate);
 }
 
 static VALUE opt_cache_expunge_set(ojParser p, VALUE value) {
-    Delegate d    = (Delegate)p->ctx;
-    int      rate = NUM2INT(value);
+    Usual d    = (Usual)p->ctx;
+    int   rate = NUM2INT(value);
 
     if (rate < 0) {
         rate = 0;
@@ -819,26 +770,26 @@ static VALUE opt_cache_expunge_set(ojParser p, VALUE value) {
 }
 
 static VALUE opt_capacity(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     return ULONG2NUM(d->vend - d->vhead);
 }
 
 static VALUE opt_capacity_set(ojParser p, VALUE value) {
-    Delegate d   = (Delegate)p->ctx;
-    long     cap = NUM2LONG(value);
+    Usual d   = (Usual)p->ctx;
+    long  cap = NUM2LONG(value);
 
     if (d->vend - d->vhead < cap) {
         long pos = d->vtail - d->vhead;
 
-        REALLOC_N(d->vhead, VALUE, cap);
+        OJ_R_REALLOC_N(d->vhead, VALUE, cap);
         d->vtail = d->vhead + pos;
         d->vend  = d->vhead + cap;
     }
     if (d->kend - d->khead < cap) {
         long pos = d->ktail - d->khead;
 
-        REALLOC_N(d->khead, union _key, cap);
+        OJ_R_REALLOC_N(d->khead, union _key, cap);
         d->ktail = d->khead + pos;
         d->kend  = d->khead + cap;
     }
@@ -846,13 +797,13 @@ static VALUE opt_capacity_set(ojParser p, VALUE value) {
 }
 
 static VALUE opt_class_cache(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     return (NULL != d->class_cache) ? Qtrue : Qfalse;
 }
 
 static VALUE opt_class_cache_set(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if (Qtrue == value) {
         if (NULL == d->class_cache) {
@@ -866,7 +817,7 @@ static VALUE opt_class_cache_set(ojParser p, VALUE value) {
 }
 
 static VALUE opt_create_id(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if (NULL == d->create_id) {
         return Qnil;
@@ -875,7 +826,7 @@ static VALUE opt_create_id(ojParser p, VALUE value) {
 }
 
 static VALUE opt_create_id_set(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if (Qnil == value) {
         d->create_id                 = NULL;
@@ -924,7 +875,7 @@ static VALUE opt_decimal(ojParser p, VALUE value) {
 }
 
 static VALUE opt_decimal_set(ojParser p, VALUE value) {
-    const char *   mode;
+    const char    *mode;
     volatile VALUE s;
 
     switch (rb_type(value)) {
@@ -985,13 +936,13 @@ static VALUE opt_decimal_set(ojParser p, VALUE value) {
 }
 
 static VALUE opt_hash_class(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     return d->hash_class;
 }
 
 static VALUE opt_hash_class_set(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if (Qnil != value) {
         rb_check_type(value, T_CLASS);
@@ -1015,13 +966,13 @@ static VALUE opt_hash_class_set(ojParser p, VALUE value) {
 }
 
 static VALUE opt_ignore_json_create(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     return d->ignore_json_create ? Qtrue : Qfalse;
 }
 
 static VALUE opt_ignore_json_create_set(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     d->ignore_json_create = (Qtrue == value);
 
@@ -1029,7 +980,7 @@ static VALUE opt_ignore_json_create_set(ojParser p, VALUE value) {
 }
 
 static VALUE opt_missing_class(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     switch (d->miss_class) {
     case MISS_AUTO: return ID2SYM(rb_intern("auto"));
@@ -1040,8 +991,8 @@ static VALUE opt_missing_class(ojParser p, VALUE value) {
 }
 
 static VALUE opt_missing_class_set(ojParser p, VALUE value) {
-    Delegate       d = (Delegate)p->ctx;
-    const char *   mode;
+    Usual          d = (Usual)p->ctx;
+    const char    *mode;
     volatile VALUE s;
 
     switch (rb_type(value)) {
@@ -1091,13 +1042,13 @@ static VALUE opt_omit_null_set(ojParser p, VALUE value) {
 }
 
 static VALUE opt_symbol_keys(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     return (NULL != d->sym_cache) ? Qtrue : Qfalse;
 }
 
 static VALUE opt_symbol_keys_set(ojParser p, VALUE value) {
-    Delegate d = (Delegate)p->ctx;
+    Usual d = (Usual)p->ctx;
 
     if (Qtrue == value) {
         d->sym_cache = cache_create(0, form_sym, true, false);
@@ -1118,6 +1069,20 @@ static VALUE opt_symbol_keys_set(ojParser p, VALUE value) {
     return (NULL != d->sym_cache) ? Qtrue : Qfalse;
 }
 
+static VALUE opt_raise_on_empty(ojParser p, VALUE value) {
+    Usual d = (Usual)p->ctx;
+
+    return d->raise_on_empty ? Qtrue : Qfalse;
+}
+
+static VALUE opt_raise_on_empty_set(ojParser p, VALUE value) {
+    Usual d = (Usual)p->ctx;
+
+    d->raise_on_empty = (Qtrue == value);
+
+    return d->raise_on_empty ? Qtrue : Qfalse;
+}
+
 static VALUE option(ojParser p, const char *key, VALUE value) {
     struct opt *op;
     struct opt  opts[] = {
@@ -1147,6 +1112,8 @@ static VALUE option(ojParser p, const char *key, VALUE value) {
         {.name = "omit_null=", .func = opt_omit_null_set},
         {.name = "symbol_keys", .func = opt_symbol_keys},
         {.name = "symbol_keys=", .func = opt_symbol_keys_set},
+        {.name = "raise_on_empty", .func = opt_raise_on_empty},
+        {.name = "raise_on_empty=", .func = opt_raise_on_empty_set},
         {.name = NULL},
     };
 
@@ -1162,26 +1129,26 @@ static VALUE option(ojParser p, const char *key, VALUE value) {
 
 ///// the set up //////////////////////////////////////////////////////////////
 
-void oj_set_parser_usual(ojParser p) {
-    Delegate d   = ALLOC(struct _delegate);
-    int      cap = 4096;
+void oj_init_usual(ojParser p, Usual d) {
+    int cap = 4096;
 
-    d->vhead = ALLOC_N(VALUE, cap);
+    d->vhead = OJ_R_ALLOC_N(VALUE, cap);
     d->vend  = d->vhead + cap;
     d->vtail = d->vhead;
 
-    d->khead = ALLOC_N(union _key, cap);
+    d->khead = OJ_R_ALLOC_N(union _key, cap);
     d->kend  = d->khead + cap;
     d->ktail = d->khead;
 
     cap      = 256;
-    d->chead = ALLOC_N(struct _col, cap);
+    d->chead = OJ_R_ALLOC_N(struct _col, cap);
     d->cend  = d->chead + cap;
     d->ctail = d->chead;
 
     d->get_key            = cache_key;
     d->cache_keys         = true;
     d->ignore_json_create = false;
+    d->raise_on_empty     = false;
     d->cache_str          = 6;
     d->array_class        = Qnil;
     d->hash_class         = Qnil;
@@ -1235,6 +1202,8 @@ void oj_set_parser_usual(ojParser p) {
     d->class_cache = NULL;
     d->key_cache   = d->str_cache;
 
+    // The parser fields are set but the functions can be replaced by a
+    // delegate that wraps the usual delegate.
     p->ctx    = (void *)d;
     p->option = option;
     p->result = result;
@@ -1252,3 +1221,9 @@ void oj_set_parser_usual(ojParser p) {
         hset_id = rb_intern("[]=");
     }
 }
+
+void oj_set_parser_usual(ojParser p) {
+    Usual d = OJ_R_ALLOC(struct _usual);
+
+    oj_init_usual(p, d);
+}