oj 3.13.15 → 3.13.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd6fd9c107efe5095ca235c398e2fb7cc4fb9cdd9feffb4f27fef1ed1e3faa3
-  data.tar.gz: 072e3744f4cbb880f1e5296ad1abba448341d9934173fa101ba1d65efe20de64
+  metadata.gz: d07b4081b5dda88146594adba591542d11106f1c1eadcf7c56e38358d0ee0af3
+  data.tar.gz: 6bdc82c3812f45a8ae9d72ec0b2f43ee223d95ac250399fc8dae8daf34cd3b49
 SHA512:
-  metadata.gz: 76fbaa3e575553ffbf37e45447429b58da392d58e59afa82491363a17ee3ab7cacf5283986db7242f1cf8b0340449d8a1d97a6f54c288076110a2fdc5ccebf30
-  data.tar.gz: 116f07d7db9124f62007eff33a2583f4de5a1338009fec59eca267a483be229285a7ec66c6fbb1feb92f05284afe76ae39629aca2e8f2a7ff20caa27adddc0c4
+  metadata.gz: 4358aa15b7956a5b577163e43fbdc0512212a218124878ceedc2932483f27acabed2d2b92eb888c8e54601f4f4aaf3dce3b959a36effbea989e7e7ea8956d1c1
+  data.tar.gz: 1e1710bce62aadfbcc1196357d2e692892b75cc18c982fb6f53c2e35782d9bd2256cb3b6ab98951691430f23e8c2d8db26987a95dcba29f87b472729613b8d2d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.13.16 - 2022-07-06
+
+- Added line and column as optional arguments to the Oj::Parser.saj parser.
+
 ## 3.13.15 - 2022-07-03
 
 - Fixed issue dumping NaN  value in object mode.

data/ext/oj/compat.c

@@ -54,7 +54,7 @@ static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, c
         } else {
             rb_hash_aset(parent->val, rkey, rstr);
         }
-        if (Yes == pi->options.trace) {
+        if (RB_UNLIKELY(Yes == pi->options.trace)) {
             oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rstr);
         }
     }
@@ -68,7 +68,7 @@ static VALUE start_hash(ParseInfo pi) {
     } else {
         h = rb_hash_new();
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_in("start_hash", pi, __FILE__, __LINE__);
     }
     return h;
@@ -93,7 +93,7 @@ static void end_hash(struct _parseInfo *pi) {
             parent->classname = 0;
         }
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
     }
 }
@@ -110,14 +110,14 @@ static void add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig
         }
     }
     pi->stack.head->val = rstr;
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_string", pi, __FILE__, __LINE__, rstr);
     }
 }
 
 static void add_num(ParseInfo pi, NumInfo ni) {
     pi->stack.head->val = oj_num_as_value(ni);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_number", pi, __FILE__, __LINE__, pi->stack.head->val);
     }
 }
@@ -138,7 +138,7 @@ static void hash_set_num(struct _parseInfo *pi, Val parent, NumInfo ni) {
     } else {
         rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), rval);
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_number", pi, __FILE__, __LINE__, rval);
     }
 }
@@ -157,7 +157,7 @@ static void hash_set_value(ParseInfo pi, Val parent, VALUE value) {
     } else {
         rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), value);
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
     }
 }
@@ -166,7 +166,7 @@ static VALUE start_array(ParseInfo pi) {
     if (Qnil != pi->options.array_class) {
         return rb_class_new_instance(0, NULL, pi->options.array_class);
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_in("start_array", pi, __FILE__, __LINE__);
     }
     return rb_ary_new();
@@ -184,7 +184,7 @@ static void array_append_num(ParseInfo pi, NumInfo ni) {
     } else {
         rb_ary_push(parent->val, rval);
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);
     }
 }
@@ -201,7 +201,7 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
         }
     }
     rb_ary_push(stack_peek(&pi->stack)->val, rstr);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_string", pi, __FILE__, __LINE__, rstr);
     }
 }

data/ext/oj/custom.c

@@ -959,7 +959,7 @@ static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, c
             break;
         default: break;
         }
-        if (Yes == pi->options.trace) {
+        if (RB_UNLIKELY(Yes == pi->options.trace)) {
             oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rstr);
         }
     }
@@ -978,7 +978,7 @@ static void end_hash(struct _parseInfo *pi) {
         }
         parent->clas = Qundef;
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
     }
 }
@@ -1032,7 +1032,7 @@ static void hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
         break;
     default: break;
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rval);
     }
 }
@@ -1045,7 +1045,7 @@ static void hash_set_value(ParseInfo pi, Val kval, VALUE value) {
     case T_HASH: rb_hash_aset(parent->val, oj_calc_hash_key(pi, kval), value); break;
     default: break;
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
     }
 }
@@ -1055,7 +1055,7 @@ static void array_append_num(ParseInfo pi, NumInfo ni) {
     volatile VALUE rval   = oj_num_as_value(ni);
 
     rb_ary_push(parent->val, rval);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);
     }
 }
@@ -1072,7 +1072,7 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
         }
     }
     rb_ary_push(stack_peek(&pi->stack)->val, rstr);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_string", pi, __FILE__, __LINE__, rstr);
     }
 }

data/ext/oj/object.c

@@ -445,7 +445,7 @@ WHICH_TYPE:
                         rb_class2name(rb_obj_class(parent->val)));
         return;
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rval);
     }
 }
@@ -516,7 +516,7 @@ WHICH_TYPE:
                         rb_class2name(rb_obj_class(parent->val)));
         return;
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_number", pi, __FILE__, __LINE__, rval);
     }
 }
@@ -602,13 +602,13 @@ WHICH_TYPE:
                         rb_class2name(rb_obj_class(parent->val)));
         return;
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_value", pi, __FILE__, __LINE__, value);
     }
 }
 
 static VALUE start_hash(ParseInfo pi) {
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_in("start_hash", pi, __FILE__, __LINE__);
     }
     return Qnil;
@@ -626,7 +626,7 @@ static void end_hash(ParseInfo pi) {
         oj_odd_free(oa);
         parent->odd_args = NULL;
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
     }
 }
@@ -654,7 +654,7 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
     }
     rval = str_to_value(pi, str, len, orig);
     rb_ary_push(stack_peek(&pi->stack)->val, rval);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_string", pi, __FILE__, __LINE__, rval);
     }
 }
@@ -663,21 +663,21 @@ static void array_append_num(ParseInfo pi, NumInfo ni) {
     volatile VALUE rval = oj_num_as_value(ni);
 
     rb_ary_push(stack_peek(&pi->stack)->val, rval);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);
     }
 }
 
 static void add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     pi->stack.head->val = str_to_value(pi, str, len, orig);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_string", pi, __FILE__, __LINE__, pi->stack.head->val);
     }
 }
 
 static void add_num(ParseInfo pi, NumInfo ni) {
     pi->stack.head->val = oj_num_as_value(ni);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_num", pi, __FILE__, __LINE__, pi->stack.head->val);
     }
 }

data/ext/oj/parser.c

@@ -533,6 +533,7 @@ static void calc_num(ojParser p) {
         // nothing to do
         break;
     }
+    p->type = OJ_NONE;
 }
 
 static void big_change(ojParser p) {
@@ -598,6 +599,8 @@ static void parse(ojParser p, const byte *json) {
     const byte *b = json;
     int         i;
 
+    p->line = 1;
+    p->col = -1;
 #if DEBUG
     printf("*** parse - mode: %c %s\n", p->map[256], (const char *)json);
 #endif
@@ -652,6 +655,7 @@ static void parse(ojParser p, const byte *json) {
             }
             buf_append_string(&p->buf, (const char *)start, b - start);
             if ('"' == *b) {
+		p->cur = b - json;
                 p->funcs[p->stack[p->depth]].add_str(p);
                 p->map = (0 == p->depth) ? value_map : after_map;
                 break;
@@ -661,12 +665,14 @@ static void parse(ojParser p, const byte *json) {
             p->next_map = (0 == p->depth) ? value_map : after_map;
             break;
         case OPEN_OBJECT:
+	    p->cur = b - json;
             p->funcs[p->stack[p->depth]].open_object(p);
             p->depth++;
             p->stack[p->depth] = OBJECT_FUN;
             p->map             = key1_map;
             break;
         case NUM_CLOSE_OBJECT:
+	    p->cur = b - json;
             calc_num(p);
             // flow through
         case CLOSE_OBJECT:
@@ -677,15 +683,18 @@ static void parse(ojParser p, const byte *json) {
                 return;
             }
             p->depth--;
+	    p->cur = b - json;
             p->funcs[p->stack[p->depth]].close_object(p);
             break;
         case OPEN_ARRAY:
+	    p->cur = b - json;
             p->funcs[p->stack[p->depth]].open_array(p);
             p->depth++;
             p->stack[p->depth] = ARRAY_FUN;
             p->map             = value_map;
             break;
         case NUM_CLOSE_ARRAY:
+	    p->cur = b - json;
             calc_num(p);
             // flow through
         case CLOSE_ARRAY:
@@ -696,9 +705,11 @@ static void parse(ojParser p, const byte *json) {
                 return;
             }
             p->depth--;
+	    p->cur = b - json;
             p->funcs[p->stack[p->depth]].close_array(p);
             break;
         case NUM_COMMA:
+	    p->cur = b - json;
             calc_num(p);
             if (0 < p->depth && OBJECT_FUN == p->stack[p->depth]) {
                 p->map = key_map;
@@ -860,8 +871,14 @@ static void parse(ojParser p, const byte *json) {
             b--;
             p->map = big_exp_map;
             break;
-        case NUM_SPC: calc_num(p); break;
-        case NUM_NEWLINE: calc_num(p); b++;
+        case NUM_SPC:
+	    p->cur = b - json;
+	    calc_num(p);
+	    break;
+        case NUM_NEWLINE:
+	    p->cur = b - json;
+	    calc_num(p);
+	    b++;
 #ifdef SPACE_JUMP
             // for (uint32_t *sj = (uint32_t*)b; 0x20202020 == *sj; sj++) { b += 4; }
             for (uint16_t *sj = (uint16_t *)b; 0x2020 == *sj; sj++) {
@@ -882,6 +899,7 @@ static void parse(ojParser p, const byte *json) {
                 buf_append_string(&p->buf, (const char *)start, b - start);
             }
             if ('"' == *b) {
+		p->cur = b - json;
                 p->funcs[p->stack[p->depth]].add_str(p);
                 p->map = p->next_map;
                 break;
@@ -890,6 +908,7 @@ static void parse(ojParser p, const byte *json) {
             break;
         case STR_SLASH: p->map = esc_map; break;
         case STR_QUOTE:
+	    p->cur = b - json;
             p->funcs[p->stack[p->depth]].add_str(p);
             p->map = p->next_map;
             break;
@@ -967,6 +986,7 @@ static void parse(ojParser p, const byte *json) {
         case VAL_NULL:
             if ('u' == b[1] && 'l' == b[2] && 'l' == b[3]) {
                 b += 3;
+		p->cur = b - json;
                 p->funcs[p->stack[p->depth]].add_null(p);
                 p->map = (0 == p->depth) ? value_map : after_map;
                 break;
@@ -992,6 +1012,7 @@ static void parse(ojParser p, const byte *json) {
         case VAL_TRUE:
             if ('r' == b[1] && 'u' == b[2] && 'e' == b[3]) {
                 b += 3;
+		p->cur = b - json;
                 p->funcs[p->stack[p->depth]].add_true(p);
                 p->map = (0 == p->depth) ? value_map : after_map;
                 break;
@@ -1017,6 +1038,7 @@ static void parse(ojParser p, const byte *json) {
         case VAL_FALSE:
             if ('a' == b[1] && 'l' == b[2] && 's' == b[3] && 'e' == b[4]) {
                 b += 4;
+		p->cur = b - json;
                 p->funcs[p->stack[p->depth]].add_false(p);
                 p->map = (0 == p->depth) ? value_map : after_map;
                 break;
@@ -1050,6 +1072,7 @@ static void parse(ojParser p, const byte *json) {
                         parse_error(p, "expected null");
                         return;
                     }
+		    p->cur = b - json;
                     p->funcs[p->stack[p->depth]].add_null(p);
                     p->map = (0 == p->depth) ? value_map : after_map;
                 }
@@ -1061,6 +1084,7 @@ static void parse(ojParser p, const byte *json) {
                         parse_error(p, "expected false");
                         return;
                     }
+		    p->cur = b - json;
                     p->funcs[p->stack[p->depth]].add_false(p);
                     p->map = (0 == p->depth) ? value_map : after_map;
                 }
@@ -1072,6 +1096,7 @@ static void parse(ojParser p, const byte *json) {
                         parse_error(p, "expected true");
                         return;
                     }
+		    p->cur = b - json;
                     p->funcs[p->stack[p->depth]].add_true(p);
                     p->map = (0 == p->depth) ? value_map : after_map;
                 }
@@ -1099,7 +1124,10 @@ static void parse(ojParser p, const byte *json) {
         case 'D':
         case 'g':
         case 'B':
-        case 'Y': calc_num(p); break;
+        case 'Y':
+	    p->cur = b - json;
+	    calc_num(p);
+	    break;
         }
     }
     return;
@@ -1456,7 +1484,7 @@ static VALUE saj_parser = Qundef;
 /* Document-method: saj
  * call-seq: saj
  *
- * Returns the default saj parser. Note the default SAJ parser can not be used
+ * Returns the default SAJ parser. Note the default SAJ parser can not be used
  * concurrently in more than one thread.
  */
 static VALUE parser_saj(VALUE self) {

data/ext/oj/parser.h

@@ -80,6 +80,7 @@ typedef struct _ojParser {
 
     char     token[8];
     long     line;
+    long     cur;  // only set before call to a function
     long     col;
     int      ri;
     uint32_t ucode;

data/ext/oj/saj2.c

@@ -6,8 +6,8 @@
 
 typedef struct _delegate {
     VALUE          handler;
-    VALUE *        keys;
-    VALUE *        tail;
+    VALUE         *keys;
+    VALUE         *tail;
     size_t         klen;
     struct _cache *str_cache;
     uint8_t        cache_str;
@@ -17,7 +17,7 @@ typedef struct _delegate {
 
 static VALUE get_key(ojParser p) {
     Delegate       d   = (Delegate)p->ctx;
-    const char *   key = buf_str(&p->key);
+    const char    *key = buf_str(&p->key);
     size_t         len = buf_len(&p->key);
     volatile VALUE rkey;
 
@@ -48,6 +48,10 @@ static void open_object(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_hash_start_id, 1, Qnil);
 }
 
+static void open_object_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler, oj_hash_start_id, 3, Qnil, LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
+}
+
 static void open_object_key(ojParser p) {
     Delegate       d   = (Delegate)p->ctx;
     volatile VALUE key = get_key(p);
@@ -56,10 +60,22 @@ static void open_object_key(ojParser p) {
     rb_funcall(d->handler, oj_hash_start_id, 1, key);
 }
 
+static void open_object_loc_key(ojParser p) {
+    Delegate       d   = (Delegate)p->ctx;
+    volatile VALUE key = get_key(p);
+
+    push_key(d, key);
+    rb_funcall(d->handler, oj_hash_start_id, 3, key, LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
+}
+
 static void open_array(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_array_start_id, 1, Qnil);
 }
 
+static void open_array_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler, oj_array_start_id, 3, Qnil, LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
+}
+
 static void open_array_key(ojParser p) {
     Delegate       d   = (Delegate)p->ctx;
     volatile VALUE key = get_key(p);
@@ -68,6 +84,14 @@ static void open_array_key(ojParser p) {
     rb_funcall(d->handler, oj_array_start_id, 1, key);
 }
 
+static void open_array_loc_key(ojParser p) {
+    Delegate       d   = (Delegate)p->ctx;
+    volatile VALUE key = get_key(p);
+
+    push_key(d, key);
+    rb_funcall(d->handler, oj_array_start_id, 3, key, LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
+}
+
 static void close_object(ojParser p) {
     Delegate d   = (Delegate)p->ctx;
     VALUE    key = Qnil;
@@ -82,6 +106,20 @@ static void close_object(ojParser p) {
     rb_funcall(d->handler, oj_hash_end_id, 1, key);
 }
 
+static void close_object_loc(ojParser p) {
+    Delegate d   = (Delegate)p->ctx;
+    VALUE    key = Qnil;
+
+    if (OBJECT_FUN == p->stack[p->depth]) {
+        d->tail--;
+        if (d->tail < d->keys) {
+            rb_raise(rb_eIndexError, "accessing key stack");
+        }
+        key = *d->tail;
+    }
+    rb_funcall(d->handler, oj_hash_end_id, 3, key, LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
+}
+
 static void close_array(ojParser p) {
     Delegate d   = (Delegate)p->ctx;
     VALUE    key = Qnil;
@@ -96,46 +134,160 @@ static void close_array(ojParser p) {
     rb_funcall(d->handler, oj_array_end_id, 1, key);
 }
 
+static void close_array_loc(ojParser p) {
+    Delegate d   = (Delegate)p->ctx;
+    VALUE    key = Qnil;
+
+    if (OBJECT_FUN == p->stack[p->depth]) {
+        d->tail--;
+        if (d->tail < d->keys) {
+            rb_raise(rb_eIndexError, "accessing key stack");
+        }
+        key = *d->tail;
+    }
+    rb_funcall(d->handler, oj_array_end_id, 3, key, LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
+}
+
 static void add_null(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_add_value_id, 2, Qnil, Qnil);
 }
 
+static void add_null_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler,
+               oj_add_value_id,
+               4,
+               Qnil,
+               Qnil,
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_null_key(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_add_value_id, 2, Qnil, get_key(p));
 }
 
+static void add_null_key_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler,
+               oj_add_value_id,
+               4,
+               Qnil,
+               get_key(p),
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_true(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_add_value_id, 2, Qtrue, Qnil);
 }
 
+static void add_true_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler,
+               oj_add_value_id,
+               4,
+               Qtrue,
+               Qnil,
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_true_key(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_add_value_id, 2, Qtrue, get_key(p));
 }
 
+static void add_true_key_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler,
+               oj_add_value_id,
+               4,
+               Qtrue,
+               get_key(p),
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_false(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_add_value_id, 2, Qfalse, Qnil);
 }
 
+static void add_false_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler,
+               oj_add_value_id,
+               4,
+               Qfalse,
+               Qnil,
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_false_key(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_add_value_id, 2, Qfalse, get_key(p));
 }
 
+static void add_false_key_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler,
+               oj_add_value_id,
+               4,
+               Qfalse,
+               get_key(p),
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_int(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_add_value_id, 2, LONG2NUM(p->num.fixnum), Qnil);
 }
 
+static void add_int_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler,
+               oj_add_value_id,
+               4,
+               LONG2NUM(p->num.fixnum),
+               Qnil,
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_int_key(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_add_value_id, 2, LONG2NUM(p->num.fixnum), get_key(p));
 }
 
+static void add_int_key_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler,
+               oj_add_value_id,
+               4,
+               LONG2NUM(p->num.fixnum),
+               get_key(p),
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_float(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_add_value_id, 2, rb_float_new(p->num.dub), Qnil);
 }
 
+static void add_float_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler,
+               oj_add_value_id,
+               4,
+               rb_float_new(p->num.dub),
+               Qnil,
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_float_key(ojParser p) {
     rb_funcall(((Delegate)p->ctx)->handler, oj_add_value_id, 2, rb_float_new(p->num.dub), get_key(p));
 }
 
+static void add_float_key_loc(ojParser p) {
+    rb_funcall(((Delegate)p->ctx)->handler,
+               oj_add_value_id,
+               4,
+               rb_float_new(p->num.dub),
+               get_key(p),
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_big(ojParser p) {
     rb_funcall((VALUE)p->ctx,
                oj_add_value_id,
@@ -144,6 +296,16 @@ static void add_big(ojParser p) {
                Qnil);
 }
 
+static void add_big_loc(ojParser p) {
+    rb_funcall((VALUE)p->ctx,
+               oj_add_value_id,
+               4,
+               rb_funcall(rb_cObject, oj_bigdecimal_id, 1, rb_str_new(buf_str(&p->buf), buf_len(&p->buf))),
+               Qnil,
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_big_key(ojParser p) {
     rb_funcall((VALUE)p->ctx,
                oj_add_value_id,
@@ -152,10 +314,20 @@ static void add_big_key(ojParser p) {
                get_key(p));
 }
 
+static void add_big_key_loc(ojParser p) {
+    rb_funcall((VALUE)p->ctx,
+               oj_add_value_id,
+               4,
+               rb_funcall(rb_cObject, oj_bigdecimal_id, 1, rb_str_new(buf_str(&p->buf), buf_len(&p->buf))),
+               get_key(p),
+               LONG2FIX(p->line),
+               LONG2FIX(p->cur - p->col));
+}
+
 static void add_str(ojParser p) {
     Delegate       d = (Delegate)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 (d->cache_str < len) {
@@ -166,10 +338,24 @@ static void add_str(ojParser p) {
     rb_funcall(d->handler, oj_add_value_id, 2, rstr, Qnil);
 }
 
+static void add_str_loc(ojParser p) {
+    Delegate       d = (Delegate)p->ctx;
+    volatile VALUE rstr;
+    const char    *str = buf_str(&p->buf);
+    size_t         len = buf_len(&p->buf);
+
+    if (d->cache_str < len) {
+        rstr = cache_intern(d->str_cache, str, len);
+    } else {
+        rstr = rb_utf8_str_new(str, len);
+    }
+    rb_funcall(d->handler, oj_add_value_id, 4, rstr, Qnil, LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
+}
+
 static void add_str_key(ojParser p) {
     Delegate       d = (Delegate)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 (d->cache_str < len) {
@@ -180,6 +366,20 @@ static void add_str_key(ojParser p) {
     rb_funcall(d->handler, oj_add_value_id, 2, rstr, get_key(p));
 }
 
+static void add_str_key_loc(ojParser p) {
+    Delegate       d = (Delegate)p->ctx;
+    volatile VALUE rstr;
+    const char    *str = buf_str(&p->buf);
+    size_t         len = buf_len(&p->buf);
+
+    if (d->cache_str < len) {
+        rstr = cache_intern(d->str_cache, str, len);
+    } else {
+        rstr = rb_utf8_str_new(str, len);
+    }
+    rb_funcall(d->handler, oj_add_value_id, 4, rstr, get_key(p), LONG2FIX(p->line), LONG2FIX(p->cur - p->col));
+}
+
 static void reset(ojParser p) {
     Funcs end = p->funcs + 3;
     Funcs f;
@@ -210,53 +410,107 @@ static VALUE option(ojParser p, const char *key, VALUE value) {
         d->handler = value;
         reset(p);
         if (rb_respond_to(value, oj_hash_start_id)) {
-            p->funcs[TOP_FUN].open_object    = open_object;
-            p->funcs[ARRAY_FUN].open_object  = open_object;
-            p->funcs[OBJECT_FUN].open_object = open_object_key;
+            if (1 == rb_obj_method_arity(value, oj_hash_start_id)) {
+                p->funcs[TOP_FUN].open_object    = open_object;
+                p->funcs[ARRAY_FUN].open_object  = open_object;
+                p->funcs[OBJECT_FUN].open_object = open_object_key;
+            } else {
+                p->funcs[TOP_FUN].open_object    = open_object_loc;
+                p->funcs[ARRAY_FUN].open_object  = open_object_loc;
+                p->funcs[OBJECT_FUN].open_object = open_object_loc_key;
+            }
         }
         if (rb_respond_to(value, oj_array_start_id)) {
-            p->funcs[TOP_FUN].open_array    = open_array;
-            p->funcs[ARRAY_FUN].open_array  = open_array;
-            p->funcs[OBJECT_FUN].open_array = open_array_key;
+            if (1 == rb_obj_method_arity(value, oj_array_start_id)) {
+                p->funcs[TOP_FUN].open_array    = open_array;
+                p->funcs[ARRAY_FUN].open_array  = open_array;
+                p->funcs[OBJECT_FUN].open_array = open_array_key;
+            } else {
+                p->funcs[TOP_FUN].open_array    = open_array_loc;
+                p->funcs[ARRAY_FUN].open_array  = open_array_loc;
+                p->funcs[OBJECT_FUN].open_array = open_array_loc_key;
+            }
         }
         if (rb_respond_to(value, oj_hash_end_id)) {
-            p->funcs[TOP_FUN].close_object    = close_object;
-            p->funcs[ARRAY_FUN].close_object  = close_object;
-            p->funcs[OBJECT_FUN].close_object = close_object;
+            if (1 == rb_obj_method_arity(value, oj_hash_end_id)) {
+                p->funcs[TOP_FUN].close_object    = close_object;
+                p->funcs[ARRAY_FUN].close_object  = close_object;
+                p->funcs[OBJECT_FUN].close_object = close_object;
+            } else {
+                p->funcs[TOP_FUN].close_object    = close_object_loc;
+                p->funcs[ARRAY_FUN].close_object  = close_object_loc;
+                p->funcs[OBJECT_FUN].close_object = close_object_loc;
+            }
         }
         if (rb_respond_to(value, oj_array_end_id)) {
-            p->funcs[TOP_FUN].close_array    = close_array;
-            p->funcs[ARRAY_FUN].close_array  = close_array;
-            p->funcs[OBJECT_FUN].close_array = close_array;
+            if (1 == rb_obj_method_arity(value, oj_array_end_id)) {
+                p->funcs[TOP_FUN].close_array    = close_array;
+                p->funcs[ARRAY_FUN].close_array  = close_array;
+                p->funcs[OBJECT_FUN].close_array = close_array;
+            } else {
+                p->funcs[TOP_FUN].close_array    = close_array_loc;
+                p->funcs[ARRAY_FUN].close_array  = close_array_loc;
+                p->funcs[OBJECT_FUN].close_array = close_array_loc;
+            }
         }
         if (rb_respond_to(value, oj_add_value_id)) {
-            p->funcs[TOP_FUN].add_null    = add_null;
-            p->funcs[ARRAY_FUN].add_null  = add_null;
-            p->funcs[OBJECT_FUN].add_null = add_null_key;
-
-            p->funcs[TOP_FUN].add_true    = add_true;
-            p->funcs[ARRAY_FUN].add_true  = add_true;
-            p->funcs[OBJECT_FUN].add_true = add_true_key;
-
-            p->funcs[TOP_FUN].add_false    = add_false;
-            p->funcs[ARRAY_FUN].add_false  = add_false;
-            p->funcs[OBJECT_FUN].add_false = add_false_key;
-
-            p->funcs[TOP_FUN].add_int    = add_int;
-            p->funcs[ARRAY_FUN].add_int  = add_int;
-            p->funcs[OBJECT_FUN].add_int = add_int_key;
-
-            p->funcs[TOP_FUN].add_float    = add_float;
-            p->funcs[ARRAY_FUN].add_float  = add_float;
-            p->funcs[OBJECT_FUN].add_float = add_float_key;
-
-            p->funcs[TOP_FUN].add_big    = add_big;
-            p->funcs[ARRAY_FUN].add_big  = add_big;
-            p->funcs[OBJECT_FUN].add_big = add_big_key;
-
-            p->funcs[TOP_FUN].add_str    = add_str;
-            p->funcs[ARRAY_FUN].add_str  = add_str;
-            p->funcs[OBJECT_FUN].add_str = add_str_key;
+            if (2 == rb_obj_method_arity(value, oj_add_value_id)) {
+                p->funcs[TOP_FUN].add_null    = add_null;
+                p->funcs[ARRAY_FUN].add_null  = add_null;
+                p->funcs[OBJECT_FUN].add_null = add_null_key;
+
+                p->funcs[TOP_FUN].add_true    = add_true;
+                p->funcs[ARRAY_FUN].add_true  = add_true;
+                p->funcs[OBJECT_FUN].add_true = add_true_key;
+
+                p->funcs[TOP_FUN].add_false    = add_false;
+                p->funcs[ARRAY_FUN].add_false  = add_false;
+                p->funcs[OBJECT_FUN].add_false = add_false_key;
+
+                p->funcs[TOP_FUN].add_int    = add_int;
+                p->funcs[ARRAY_FUN].add_int  = add_int;
+                p->funcs[OBJECT_FUN].add_int = add_int_key;
+
+                p->funcs[TOP_FUN].add_float    = add_float;
+                p->funcs[ARRAY_FUN].add_float  = add_float;
+                p->funcs[OBJECT_FUN].add_float = add_float_key;
+
+                p->funcs[TOP_FUN].add_big    = add_big;
+                p->funcs[ARRAY_FUN].add_big  = add_big;
+                p->funcs[OBJECT_FUN].add_big = add_big_key;
+
+                p->funcs[TOP_FUN].add_str    = add_str;
+                p->funcs[ARRAY_FUN].add_str  = add_str;
+                p->funcs[OBJECT_FUN].add_str = add_str_key;
+            } else {
+                p->funcs[TOP_FUN].add_null    = add_null_loc;
+                p->funcs[ARRAY_FUN].add_null  = add_null_loc;
+                p->funcs[OBJECT_FUN].add_null = add_null_key_loc;
+
+                p->funcs[TOP_FUN].add_true    = add_true_loc;
+                p->funcs[ARRAY_FUN].add_true  = add_true_loc;
+                p->funcs[OBJECT_FUN].add_true = add_true_key_loc;
+
+                p->funcs[TOP_FUN].add_false    = add_false_loc;
+                p->funcs[ARRAY_FUN].add_false  = add_false_loc;
+                p->funcs[OBJECT_FUN].add_false = add_false_key_loc;
+
+                p->funcs[TOP_FUN].add_int    = add_int_loc;
+                p->funcs[ARRAY_FUN].add_int  = add_int_loc;
+                p->funcs[OBJECT_FUN].add_int = add_int_key_loc;
+
+                p->funcs[TOP_FUN].add_float    = add_float_loc;
+                p->funcs[ARRAY_FUN].add_float  = add_float_loc;
+                p->funcs[OBJECT_FUN].add_float = add_float_key_loc;
+
+                p->funcs[TOP_FUN].add_big    = add_big_loc;
+                p->funcs[ARRAY_FUN].add_big  = add_big_loc;
+                p->funcs[OBJECT_FUN].add_big = add_big_key_loc;
+
+                p->funcs[TOP_FUN].add_str    = add_str_loc;
+                p->funcs[ARRAY_FUN].add_str  = add_str_loc;
+                p->funcs[OBJECT_FUN].add_str = add_str_key_loc;
+            }
         }
         return Qnil;
     }
@@ -313,7 +567,7 @@ static void mark(ojParser p) {
         return;
     }
     Delegate d = (Delegate)p->ctx;
-    VALUE *kp;
+    VALUE   *kp;
 
     cache_mark(d->str_cache);
     if (Qnil != d->handler) {

data/ext/oj/strict.c

@@ -50,13 +50,13 @@ VALUE oj_calc_hash_key(ParseInfo pi, Val parent) {
 }
 
 static void hash_end(ParseInfo pi) {
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
     }
 }
 
 static void array_end(ParseInfo pi) {
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_array_end(pi, __FILE__, __LINE__);
     }
 }
@@ -66,7 +66,7 @@ static VALUE noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
 }
 
 static void add_value(ParseInfo pi, VALUE val) {
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_value", pi, __FILE__, __LINE__, val);
     }
     pi->stack.head->val = val;
@@ -76,7 +76,7 @@ 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);
 
     pi->stack.head->val = rstr;
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_string", pi, __FILE__, __LINE__, rstr);
     }
 }
@@ -86,7 +86,7 @@ static void add_num(ParseInfo pi, NumInfo ni) {
         oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
     pi->stack.head->val = oj_num_as_value(ni);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_number", pi, __FILE__, __LINE__, pi->stack.head->val);
     }
 }
@@ -95,7 +95,7 @@ static VALUE start_hash(ParseInfo pi) {
     if (Qnil != pi->options.hash_class) {
         return rb_class_new_instance(0, NULL, pi->options.hash_class);
     }
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_in("start_hash", pi, __FILE__, __LINE__);
     }
     return rb_hash_new();
@@ -107,7 +107,7 @@ static void hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len,
     rb_hash_aset(stack_peek(&pi->stack)->val,
                  oj_calc_hash_key(pi, parent),
                  rstr);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rstr);
     }
 }
@@ -122,7 +122,7 @@ static void hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
     rb_hash_aset(stack_peek(&pi->stack)->val,
                  oj_calc_hash_key(pi, parent),
                  v);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_number", pi, __FILE__, __LINE__, v);
     }
 }
@@ -131,13 +131,13 @@ 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);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
     }
 }
 
 static VALUE start_array(ParseInfo pi) {
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_in("start_array", pi, __FILE__, __LINE__);
     }
     return rb_ary_new();
@@ -147,7 +147,7 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
     volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
 
     rb_ary_push(stack_peek(&pi->stack)->val, rstr);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_string", pi, __FILE__, __LINE__, rstr);
     }
 }
@@ -160,14 +160,14 @@ static void array_append_num(ParseInfo pi, NumInfo ni) {
     }
     v = oj_num_as_value(ni);
     rb_ary_push(stack_peek(&pi->stack)->val, v);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, v);
     }
 }
 
 static void array_append_value(ParseInfo pi, VALUE value) {
     rb_ary_push(stack_peek(&pi->stack)->val, value);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_value", pi, __FILE__, __LINE__, value);
     }
 }

data/ext/oj/wab.c

@@ -312,13 +312,13 @@ static VALUE calc_hash_key(ParseInfo pi, Val parent) {
 }
 
 static void hash_end(ParseInfo pi) {
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
     }
 }
 
 static void array_end(ParseInfo pi) {
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_array_end(pi, __FILE__, __LINE__);
     }
 }
@@ -328,7 +328,7 @@ static VALUE noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
 }
 
 static void add_value(ParseInfo pi, VALUE val) {
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_value", pi, __FILE__, __LINE__, val);
     }
     pi->stack.head->val = val;
@@ -478,7 +478,7 @@ static VALUE cstr_to_rstr(ParseInfo pi, const char *str, size_t len) {
 
 static void add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     pi->stack.head->val = cstr_to_rstr(pi, str, len);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_string", pi, __FILE__, __LINE__, pi->stack.head->val);
     }
 }
@@ -488,13 +488,13 @@ static void add_num(ParseInfo pi, NumInfo ni) {
         oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
     pi->stack.head->val = oj_num_as_value(ni);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("add_number", pi, __FILE__, __LINE__, pi->stack.head->val);
     }
 }
 
 static VALUE start_hash(ParseInfo pi) {
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_in("start_hash", pi, __FILE__, __LINE__);
     }
     if (Qnil != pi->options.hash_class) {
@@ -507,7 +507,7 @@ static void hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len,
     volatile VALUE rval = cstr_to_rstr(pi, str, len);
 
     rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), rval);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rval);
     }
 }
@@ -520,20 +520,20 @@ static void hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
     }
     rval = oj_num_as_value(ni);
     rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), rval);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_number", pi, __FILE__, __LINE__, rval);
     }
 }
 
 static void hash_set_value(ParseInfo pi, Val parent, VALUE value) {
     rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), value);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
     }
 }
 
 static VALUE start_array(ParseInfo pi) {
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_in("start_array", pi, __FILE__, __LINE__);
     }
     return rb_ary_new();
@@ -543,7 +543,7 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
     volatile VALUE rval = cstr_to_rstr(pi, str, len);
 
     rb_ary_push(stack_peek(&pi->stack)->val, rval);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, rval);
     }
 }
@@ -556,14 +556,14 @@ static void array_append_num(ParseInfo pi, NumInfo ni) {
     }
     rval = oj_num_as_value(ni);
     rb_ary_push(stack_peek(&pi->stack)->val, rval);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);
     }
 }
 
 static void array_append_value(ParseInfo pi, VALUE value) {
     rb_ary_push(stack_peek(&pi->stack)->val, value);
-    if (Yes == pi->options.trace) {
+    if (RB_UNLIKELY(Yes == pi->options.trace)) {
         oj_trace_parse_call("append_value", pi, __FILE__, __LINE__, value);
     }
 }

data/lib/oj/saj.rb

@@ -1,11 +1,17 @@
 module Oj
-  # A SAX style parse handler for JSON hence the acronym SAJ for Simple API for
-  # JSON. The Oj::Saj handler class should be subclassed and then used with the
-  # Oj::Saj key_parse() method. The Saj methods will then be called as the file
-  # is parsed.
+  # A SAX style parse handler for JSON hence the acronym SAJ for Simple API
+  # for JSON. The Oj::Saj handler class can be subclassed and then used with
+  # the Oj::Saj key_parse() method or with the more resent
+  # Oj::Parser.new(:saj). The Saj methods will then be called as the file is
+  # parsed.
+  #
+  # With Oj::Parser.new(:saj) each method can also include a line and column
+  # argument so hash_start(key) could also be hash_start(key, line,
+  # column). The error() method is no used with Oj::Parser.new(:saj) so it
+  # will never be called.
   #
   # @example
-  # 
+  #
   #  require 'oj'
   #
   #  class MySaj < ::Oj::Saj
@@ -23,6 +29,14 @@ module Oj
   #    Oj.saj_parse(cnt, f)
   #  end
   #
+  # or
+  #
+  #  p = Oj::Parser.new(:saj)
+  #  p.handler = MySaj.new()
+  #  File.open('any.json', 'r') do |f|
+  #    p.parse(f.read)
+  #  end
+  #
   # To make the desired methods active while parsing the desired method should
   # be made public in the subclasses. If the methods remain private they will
   # not be called during parsing.
@@ -61,6 +75,6 @@ module Oj
 
     def error(message, line, column)
     end
-    
+
   end # Saj
 end # Oj

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module.
-  VERSION = '3.13.15'
+  VERSION = '3.13.16'
 end

data/test/test_parser_saj.rb

@@ -5,7 +5,7 @@ $: << File.dirname(__FILE__)
 
 require 'helper'
 
-$json = %{{
+$json = %|{
   "array": [
     {
       "num"   : 3,
@@ -18,7 +18,7 @@ $json = %{{
     }
   ],
   "boolean" : true
-}}
+}|
 
 class AllSaj < Oj::Saj
   attr_accessor :calls
@@ -53,6 +53,35 @@ class AllSaj < Oj::Saj
 
 end # AllSaj
 
+class LocSaj
+  attr_accessor :calls
+
+  def initialize()
+    @calls = []
+  end
+
+  def hash_start(key, line, column)
+    @calls << [:hash_start, key, line, column]
+  end
+
+  def hash_end(key, line, column)
+    @calls << [:hash_end, key, line, column]
+  end
+
+  def array_start(key, line, column)
+    @calls << [:array_start, key, line, column]
+  end
+
+  def array_end(key, line, column)
+    @calls << [:array_end, key, line, column]
+  end
+
+  def add_value(value, key, line, column)
+    @calls << [:add_value, value, key, line, column]
+  end
+
+end # LocSaj
+
 class SajTest < Minitest::Test
 
   def test_nil
@@ -242,4 +271,28 @@ class SajTest < Minitest::Test
 		 ], handler.calls)
   end
 
+  def test_loc
+    handler = LocSaj.new()
+    Oj::Parser.saj.handler = handler
+    Oj::Parser.saj.parse($json)
+    assert_equal([[:hash_start, nil, 1, 1],
+                  [:array_start, 'array', 2, 12],
+                  [:hash_start, nil, 3, 5],
+                  [:add_value, 3, 'num', 4, 18],
+                  [:add_value, 'message', 'string', 5, 25],
+                  [:hash_start, 'hash', 6, 17],
+                  [:hash_start, 'h2', 7, 17],
+                  [:array_start, 'a', 8, 17],
+                  [:add_value, 1, nil, 8, 20],
+                  [:add_value, 2, nil, 8, 23],
+                  [:add_value, 3, nil, 8, 26],
+                  [:array_end, 'a', 8, 27],
+                  [:hash_end, 'h2', 9, 9],
+                  [:hash_end, 'hash', 10, 7],
+                  [:hash_end, nil, 11, 5],
+                  [:array_end, 'array', 12, 3],
+                  [:add_value, true, 'boolean', 13, 18],
+                  [:hash_end, nil, 14, 1]], handler.calls)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.13.15
+  version: 3.13.16
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-03 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler