oj 2.9.8 → 2.9.9

data/README.md

@@ -26,7 +26,26 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-### Current Release 2.9.8
+### Current Release 2.9.9
+
+ - Missed a character map entry. / in ascii mode is now output as / and not \/
+
+ - Fixed SC parser to not treat all IO that respond to fileno as a file. It not
+   checks stat and asks if it is a file.
+
+ - Tightened object parsing of non-string hash keys so that just "^#x" is parsed
+   as a hash pair and not "~#x".
+
+ - Using echo to STDIN as an IO input works around the exception raised when
+   asking the IO for it's position (IO.pos).
+
+ - Simple Callback Parser now uses the new stream parser for handling files and
+   IO so that larger files are handled more efficiently and streams are read as
+   data arrives instead of on close.
+
+ - Handles file FIFO pipes correctly now.
+ 
+### Release 2.9.8
 
  - Changed escaping back to previous release and added a new escape mode.
 

data/ext/oj/compat.c

@@ -90,6 +90,7 @@ oj_compat_parse(int argc, VALUE *argv, VALUE self) {
     struct _ParseInfo	pi;
 
     pi.options = oj_default_options;
+    pi.handler = Qnil;
     oj_set_compat_callbacks(&pi);
 
     if (T_STRING == rb_type(*argv)) {
@@ -104,6 +105,7 @@ oj_compat_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
     struct _ParseInfo	pi;
 
     pi.options = oj_default_options;
+    pi.handler = Qnil;
     oj_set_strict_callbacks(&pi);
     pi.end_hash = end_hash;
     pi.hash_set_cstr = hash_set_cstr;

data/ext/oj/dump.c

@@ -137,7 +137,7 @@ static char	hibit_friendly_chars[256] = "\
 // bytes per character in the output. That makes this conservative.
 static char	ascii_friendly_chars[256] = "\
 66666666222622666666666666666666\
-11211111111111121111111111111111\
+11211111111111111111111111111111\
 11111111111111111111111111112111\
 11111111111111111111111111111116\
 33333333333333333333333333333333\

data/ext/oj/object.c

@@ -420,7 +420,6 @@ hash_set_value(ParseInfo pi, const char *key, size_t klen, VALUE value) {
 	}
 	break;
     case T_HASH:
-
 	if (rb_cHash != rb_obj_class(parent->val)) {
 	    if (4 == klen && 's' == *key && 'e' == key[1] && 'l' == key[2] && 'f' == key[3]) {
 		rb_funcall(parent->val, oj_replace_id, 1, value);
@@ -428,7 +427,7 @@ hash_set_value(ParseInfo pi, const char *key, size_t klen, VALUE value) {
 		set_obj_ivar(parent, key, klen, value);
 	    }
 	} else {
-	    if (3 <= klen && '#' == key[1] && T_ARRAY == rb_type(value)) {
+	    if (3 <= klen && '^' == *key && '#' == key[1] && T_ARRAY == rb_type(value)) {
 		long	len = RARRAY_LEN(value);
 		VALUE	*a = RARRAY_PTR(value);
 	
@@ -551,6 +550,7 @@ oj_object_parse(int argc, VALUE *argv, VALUE self) {
     struct _ParseInfo	pi;
 
     pi.options = oj_default_options;
+    pi.handler = Qnil;
     oj_set_object_callbacks(&pi);
 
     if (T_STRING == rb_type(*argv)) {
@@ -565,6 +565,7 @@ oj_object_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
     struct _ParseInfo	pi;
 
     pi.options = oj_default_options;
+    pi.handler = Qnil;
     oj_set_strict_callbacks(&pi);
     pi.end_hash = end_hash;
     pi.start_hash = start_hash;

data/ext/oj/oj.c

@@ -58,7 +58,9 @@ ID	oj_array_end_id;
 ID	oj_array_start_id;
 ID	oj_as_json_id;
 ID	oj_error_id;
+ID	oj_file_id;
 ID	oj_fileno_id;
+ID	oj_ftype_id;
 ID	oj_hash_end_id;
 ID	oj_hash_set_id;
 ID	oj_hash_start_id;
@@ -71,6 +73,7 @@ ID	oj_pos_id;
 ID	oj_read_id;
 ID	oj_readpartial_id;
 ID	oj_replace_id;
+ID	oj_stat_id;
 ID	oj_string_id;
 ID	oj_to_hash_id;
 ID	oj_to_json_id;
@@ -353,7 +356,7 @@ set_def_opts(VALUE self, VALUE opts) {
     } else if (ascii_sym == v) {
 	oj_default_options.escape_mode = ASCIIEsc;
     } else {
-	rb_raise(rb_eArgError, ":encoding must be :json, :rails, or :ascii.");
+	rb_raise(rb_eArgError, ":encoding must be :json, :xss_safe, or :ascii.");
     }
 
     v = rb_hash_lookup(opts, bigdecimal_load_sym);
@@ -715,6 +718,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
     }
     Check_Type(*argv, T_STRING);
     pi.options = oj_default_options;
+    pi.handler = Qnil;
     if (2 <= argc) {
 	VALUE	ropts = argv[1];
 	VALUE	v;
@@ -1951,7 +1955,9 @@ void Init_oj() {
     oj_array_start_id = rb_intern("array_start");
     oj_as_json_id = rb_intern("as_json");
     oj_error_id = rb_intern("error");
+    oj_file_id = rb_intern("file?");
     oj_fileno_id = rb_intern("fileno");
+    oj_ftype_id = rb_intern("ftype");
     oj_hash_end_id = rb_intern("hash_end");
     oj_hash_set_id = rb_intern("hash_set");
     oj_hash_start_id = rb_intern("hash_start");
@@ -1964,6 +1970,7 @@ void Init_oj() {
     oj_read_id = rb_intern("read");
     oj_readpartial_id = rb_intern("readpartial");
     oj_replace_id = rb_intern("replace");
+    oj_stat_id = rb_intern("stat");
     oj_string_id = rb_intern("string");
     oj_to_hash_id = rb_intern("to_hash");
     oj_to_json_id = rb_intern("to_json");

data/ext/oj/oj.h

@@ -255,7 +255,9 @@ extern ID	oj_array_end_id;
 extern ID	oj_array_start_id;
 extern ID	oj_as_json_id;
 extern ID	oj_error_id;
+extern ID	oj_file_id;
 extern ID	oj_fileno_id;
+extern ID	oj_ftype_id;
 extern ID	oj_hash_end_id;
 extern ID	oj_hash_set_id;
 extern ID	oj_hash_start_id;
@@ -268,6 +270,7 @@ extern ID	oj_pos_id;
 extern ID	oj_read_id;
 extern ID	oj_readpartial_id;
 extern ID	oj_replace_id;
+extern ID	oj_stat_id;
 extern ID	oj_string_id;
 extern ID	oj_to_hash_id;
 extern ID	oj_to_json_id;

data/ext/oj/parse.c

@@ -766,7 +766,6 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
     } else {
 	pi->proc = Qundef;
     }
-    pi->cbc = (void*)0;
     if (0 != json) {
 	pi->json = json;
 	pi->end = json + len;
@@ -778,17 +777,13 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;
-#if !IS_WINDOWS
-	int		fd;
-#endif
 
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
 	    oj_pi_set_input_str(pi, s);
 #if !IS_WINDOWS
-	} else if (rb_respond_to(input, oj_fileno_id) &&
-		   Qnil != (s = rb_funcall(input, oj_fileno_id, 0)) &&
-		   0 != (fd = FIX2INT(s))) {
+	} else if (rb_cFile == clas && 0 == FIX2INT(rb_funcall(input, oj_pos_id, 0))) {
+	    int		fd = FIX2INT(rb_funcall(input, oj_fileno_id, 0));
 	    ssize_t	cnt;
 	    size_t	len = lseek(fd, 0, SEEK_END);
 

data/ext/oj/parse.h

@@ -65,7 +65,7 @@ typedef struct _ParseInfo {
 
     struct _Err		err;
     struct _Options	options;
-    void		*cbc;
+    VALUE		handler;
     struct _ValStack	stack;
     CircArray		circ_array;
     int			expect_value;

data/ext/oj/reader.c

@@ -55,6 +55,10 @@ static int		read_from_str(Reader reader);
 
 void
 oj_reader_init(Reader reader, VALUE io, int fd) {
+    VALUE	io_class = rb_obj_class(io);
+    VALUE	stat;
+    VALUE	ftype;
+
     reader->head = reader->base;
     *((char*)reader->head) = '\0';
     reader->end = reader->head + sizeof(reader->base) - BUF_PAD;
@@ -69,13 +73,13 @@ oj_reader_init(Reader reader, VALUE io, int fd) {
     if (0 != fd) {
 	reader->read_func = read_from_fd;
 	reader->fd = fd;
-    } else if (rb_cString == rb_obj_class(io)) {
+    } else if (rb_cString == io_class) {
 	reader->read_func = read_from_str;
 	reader->in_str = StringValuePtr(io);
 	reader->head = (char*)reader->in_str;
 	reader->tail = reader->head;
 	reader->read_end = reader->head + RSTRING_LEN(io);
-    } else if (oj_stringio_class == rb_obj_class(io)) {
+    } else if (oj_stringio_class == io_class) {
 	VALUE	s = rb_funcall2(io, oj_string_id, 0, 0);
 
 	reader->read_func = read_from_str;
@@ -83,30 +87,19 @@ oj_reader_init(Reader reader, VALUE io, int fd) {
 	reader->head = (char*)reader->in_str;
 	reader->tail = reader->head;
 	reader->read_end = reader->head + RSTRING_LEN(s);
+    } else if (rb_cFile == io_class &&
+	       Qnil != (stat = rb_funcall(io, oj_stat_id, 0)) &&
+	       Qnil != (ftype = rb_funcall(stat, oj_ftype_id, 0)) &&
+	       0 == strcmp("file", StringValuePtr(ftype)) &&
+	       0 == FIX2INT(rb_funcall(io, oj_pos_id, 0))) {
+	reader->read_func = read_from_fd;
+	reader->fd = FIX2INT(rb_funcall(io, oj_fileno_id, 0));
     } else if (rb_respond_to(io, oj_readpartial_id)) {
-	VALUE	rfd;
-
-	if (rb_respond_to(io, oj_fileno_id) && Qnil != (rfd = rb_funcall(io, oj_fileno_id, 0)) &&
-	    rb_respond_to(io, oj_pos_id) && 0 == FIX2INT(rb_funcall(io, oj_pos_id, 0))) {
-
-	    reader->read_func = read_from_fd;
-	    reader->fd = FIX2INT(rfd);
-	} else {
-	    reader->read_func = read_from_io_partial;
-	    reader->io = io;
-	}
+	reader->read_func = read_from_io_partial;
+	reader->io = io;
     } else if (rb_respond_to(io, oj_read_id)) {
-	VALUE	rfd;
-
-	if (rb_respond_to(io, oj_fileno_id) && Qnil != (rfd = rb_funcall(io, oj_fileno_id, 0)) &&
-	    rb_respond_to(io, oj_pos_id) && 0 == FIX2INT(rb_funcall(io, oj_pos_id, 0))) {
-
-	    reader->read_func = read_from_fd;
-	    reader->fd = FIX2INT(rfd);
-	} else {
-	    reader->read_func = read_from_io;
-	    reader->io = io;
-	}
+	reader->read_func = read_from_io;
+	reader->io = io;
     } else {
 	rb_raise(rb_eException, "parser io argument must respond to readpartial() or read().\n");
     }

data/ext/oj/saj.c

@@ -627,22 +627,6 @@ read_quoted_value(ParseInfo pi) {
     return value;
 }
 
-inline static int
-respond_to(VALUE obj, ID method) {
-#ifdef JRUBY_RUBY
-    /* There is a bug in JRuby where rb_respond_to() returns true (1) even if
-     * a method is private. */
-    {
-	VALUE	args[1];
-
-	*args = ID2SYM(method);
-	return (Qtrue == rb_funcall2(obj, rb_intern("respond_to?"), 1, args));
-    }
-#else
-    return rb_respond_to(obj, method);
-#endif
-}
-
 static void
 saj_parse(VALUE handler, char *json) {
     volatile VALUE	obj = Qnil;
@@ -675,12 +659,12 @@ saj_parse(VALUE handler, char *json) {
     }
 #endif
     pi.handler = handler;
-    pi.has_hash_start = respond_to(handler, oj_hash_start_id);
-    pi.has_hash_end = respond_to(handler, oj_hash_end_id);
-    pi.has_array_start = respond_to(handler, oj_array_start_id);
-    pi.has_array_end = respond_to(handler, oj_array_end_id);
-    pi.has_add_value = respond_to(handler, oj_add_value_id);
-    pi.has_error = respond_to(handler, oj_error_id);
+    pi.has_hash_start = rb_respond_to(handler, oj_hash_start_id);
+    pi.has_hash_end = rb_respond_to(handler, oj_hash_end_id);
+    pi.has_array_start = rb_respond_to(handler, oj_array_start_id);
+    pi.has_array_end = rb_respond_to(handler, oj_array_end_id);
+    pi.has_add_value = rb_respond_to(handler, oj_add_value_id);
+    pi.has_error = rb_respond_to(handler, oj_error_id);
     read_next(&pi, 0);
     next_non_white(&pi);
     if ('\0' != *pi.s) {
@@ -716,9 +700,6 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;
-#if !IS_WINDOWS
-	int		fd;
-#endif
 	
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
@@ -726,9 +707,8 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
 	    json = ALLOC_N(char, len);
 	    strcpy(json, rb_string_value_cstr((VALUE*)&s));
 #if !IS_WINDOWS
-	} else if (rb_respond_to(input, oj_fileno_id) &&
-		   Qnil != (s = rb_funcall(input, oj_fileno_id, 0)) &&
-		   0 != (fd = FIX2INT(s))) {
+	} else if (rb_cFile == clas && 0 == FIX2INT(rb_funcall(input, oj_pos_id, 0))) {
+	    int		fd = FIX2INT(rb_funcall(input, oj_fileno_id, 0));
 	    ssize_t	cnt;
 
 	    len = lseek(fd, 0, SEEK_END);

data/ext/oj/scp.c

@@ -39,22 +39,6 @@
 #include "parse.h"
 #include "encode.h"
 
-inline static int
-respond_to(VALUE obj, ID method) {
-#ifdef JRUBY_RUBY
-    /* There is a bug in JRuby where rb_respond_to() returns true (1) even if
-     * a method is private. */
-    {
-	VALUE	args[1];
-
-	*args = ID2SYM(method);
-	return (Qtrue == rb_funcall2(obj, rb_intern("respond_to?"), 1, args));
-    }
-#else
-    return rb_respond_to(obj, method);
-#endif
-}
-
 static VALUE
 noop_start(ParseInfo pi) {
     return Qnil;
@@ -102,7 +86,7 @@ noop_array_append_value(ParseInfo pi, VALUE value) {
 
 static void
 add_value(ParseInfo pi, VALUE val) {
-    rb_funcall((VALUE)pi->cbc, oj_add_value_id, 1, val);
+    rb_funcall(pi->handler, oj_add_value_id, 1, val);
 }
 
 static void
@@ -110,32 +94,32 @@ add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     volatile VALUE	rstr = rb_str_new(str, len);
 
     rstr = oj_encode(rstr);
-    rb_funcall((VALUE)pi->cbc, oj_add_value_id, 1, rstr);
+    rb_funcall(pi->handler, oj_add_value_id, 1, rstr);
 }
 
 static void
 add_num(ParseInfo pi, NumInfo ni) {
-    rb_funcall((VALUE)pi->cbc, oj_add_value_id, 1, oj_num_as_value(ni));
+    rb_funcall(pi->handler, oj_add_value_id, 1, oj_num_as_value(ni));
 }
 
 static VALUE
 start_hash(ParseInfo pi) {
-    return rb_funcall((VALUE)pi->cbc, oj_hash_start_id, 0);
+    return rb_funcall(pi->handler, oj_hash_start_id, 0);
 }
 
 static void
 end_hash(ParseInfo pi) {
-    rb_funcall((VALUE)pi->cbc, oj_hash_end_id, 0);
+    rb_funcall(pi->handler, oj_hash_end_id, 0);
 }
 
 static VALUE
 start_array(ParseInfo pi) {
-    return rb_funcall((VALUE)pi->cbc, oj_array_start_id, 0);
+    return rb_funcall(pi->handler, oj_array_start_id, 0);
 }
 
 static void
 end_array(ParseInfo pi) {
-    rb_funcall((VALUE)pi->cbc, oj_array_end_id, 0);
+    rb_funcall(pi->handler, oj_array_end_id, 0);
 }
 
 static VALUE
@@ -154,17 +138,17 @@ hash_set_cstr(ParseInfo pi, const char *key, size_t klen, const char *str, size_
     volatile VALUE	rstr = rb_str_new(str, len);
 
     rstr = oj_encode(rstr);
-    rb_funcall((VALUE)pi->cbc, oj_hash_set_id, 3, stack_peek(&pi->stack)->val, hash_key(pi, key, klen), rstr);
+    rb_funcall(pi->handler, oj_hash_set_id, 3, stack_peek(&pi->stack)->val, hash_key(pi, key, klen), rstr);
 }
 
 static void
 hash_set_num(ParseInfo pi, const char *key, size_t klen, NumInfo ni) {
-    rb_funcall((VALUE)pi->cbc, oj_hash_set_id, 3, stack_peek(&pi->stack)->val, hash_key(pi, key, klen), oj_num_as_value(ni));
+    rb_funcall(pi->handler, oj_hash_set_id, 3, stack_peek(&pi->stack)->val, hash_key(pi, key, klen), oj_num_as_value(ni));
 }
 
 static void
 hash_set_value(ParseInfo pi, const char *key, size_t klen, VALUE value) {
-    rb_funcall((VALUE)pi->cbc, oj_hash_set_id, 3, stack_peek(&pi->stack)->val, hash_key(pi, key, klen), value);
+    rb_funcall(pi->handler, oj_hash_set_id, 3, stack_peek(&pi->stack)->val, hash_key(pi, key, klen), value);
 }
 
 static void
@@ -172,41 +156,24 @@ array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     volatile VALUE	rstr = rb_str_new(str, len);
 
     rstr = oj_encode(rstr);
-    rb_funcall((VALUE)pi->cbc, oj_array_append_id, 2, stack_peek(&pi->stack)->val, rstr);
+    rb_funcall(pi->handler, oj_array_append_id, 2, stack_peek(&pi->stack)->val, rstr);
 }
 
 static void
 array_append_num(ParseInfo pi, NumInfo ni) {
-    rb_funcall((VALUE)pi->cbc, oj_array_append_id, 2, stack_peek(&pi->stack)->val, oj_num_as_value(ni));
+    rb_funcall(pi->handler, oj_array_append_id, 2, stack_peek(&pi->stack)->val, oj_num_as_value(ni));
 }
 
 static void
 array_append_value(ParseInfo pi, VALUE value) {
-    rb_funcall((VALUE)pi->cbc, oj_array_append_id, 2, stack_peek(&pi->stack)->val, value);
-}
-
-static VALUE
-protect_parse(VALUE pip) {
-    oj_parse2((ParseInfo)pip);
-
-    return Qnil;
+    rb_funcall(pi->handler, oj_array_append_id, 2, stack_peek(&pi->stack)->val, value);
 }
 
 VALUE
 oj_sc_parse(int argc, VALUE *argv, VALUE self) {
     struct _ParseInfo	pi;
-    char		*buf = 0;
-    VALUE		input;
-    VALUE		handler;
-    volatile VALUE	wrapped_stack;
-    int			line = 0;
-
-    if (argc < 2) {
-	rb_raise(rb_eArgError, "Wrong number of arguments to saj_parse.");
-    }
-    handler = *argv;;
-    input = argv[1];
-    pi.json = 0;
+    VALUE		input = argv[1];
+
     pi.options = oj_default_options;
     if (3 == argc) {
 	oj_parse_options(argv[2], &pi.options);
@@ -216,13 +183,13 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
     } else {
 	pi.proc = Qundef;
     }
-    pi.cbc = (void*)handler;
+    pi.handler = *argv;
 
-    pi.start_hash = respond_to(handler, oj_hash_start_id) ? start_hash : noop_start;
-    pi.end_hash = respond_to(handler, oj_hash_end_id) ? end_hash : noop_end;
-    pi.start_array = respond_to(handler, oj_array_start_id) ? start_array : noop_start;
-    pi.end_array = respond_to(handler, oj_array_end_id) ? end_array : noop_end;
-    if (respond_to(handler, oj_hash_set_id)) {
+    pi.start_hash = rb_respond_to(pi.handler, oj_hash_start_id) ? start_hash : noop_start;
+    pi.end_hash = rb_respond_to(pi.handler, oj_hash_end_id) ? end_hash : noop_end;
+    pi.start_array = rb_respond_to(pi.handler, oj_array_start_id) ? start_array : noop_start;
+    pi.end_array = rb_respond_to(pi.handler, oj_array_end_id) ? end_array : noop_end;
+    if (rb_respond_to(pi.handler, oj_hash_set_id)) {
 	pi.hash_set_value = hash_set_value;
 	pi.hash_set_cstr = hash_set_cstr;
 	pi.hash_set_num = hash_set_num;
@@ -233,7 +200,7 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
 	pi.hash_set_num = noop_hash_set_num;
 	pi.expect_value = 0;
     }
-    if (respond_to(handler, oj_array_append_id)) {
+    if (rb_respond_to(pi.handler, oj_array_append_id)) {
 	pi.array_append_value = array_append_value;
 	pi.array_append_cstr = array_append_cstr;
 	pi.array_append_num = array_append_num;
@@ -244,7 +211,7 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
 	pi.array_append_num = noop_array_append_num;
 	pi.expect_value = 0;
     }
-    if (respond_to(handler, oj_add_value_id)) {
+    if (rb_respond_to(pi.handler, oj_add_value_id)) {
 	pi.add_cstr = add_cstr;
 	pi.add_num = add_num;
 	pi.add_value = add_value;
@@ -255,56 +222,10 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
 	pi.add_value = noop_add_value;
 	pi.expect_value = 0;
     }
-    if (rb_type(input) == T_STRING) {
-	oj_pi_set_input_str(&pi, input);
+
+    if (T_STRING == rb_type(input)) {
+	return oj_pi_parse(argc - 1, argv + 1, &pi, 0, 0, 1);
     } else {
-	VALUE		clas = rb_obj_class(input);
-	volatile VALUE	s;
-#if !IS_WINDOWS
-	int		fd;
-#endif
-	if (oj_stringio_class == clas) {
-	    s = rb_funcall2(input, oj_string_id, 0, 0);
-	    oj_pi_set_input_str(&pi, s);
-#if !IS_WINDOWS
-	    // JRuby gets confused with what is the real fileno.
-	} else if (rb_respond_to(input, oj_fileno_id) &&
-		   Qnil != (s = rb_funcall(input, oj_fileno_id, 0)) &&
-		   0 != (fd = FIX2INT(s))) {
-	    ssize_t	cnt;
-	    size_t	len = lseek(fd, 0, SEEK_END);
-
-	    lseek(fd, 0, SEEK_SET);
-	    buf = ALLOC_N(char, len + 1);
-	    buf[len] = '\0';
-	    pi.json = buf;
-	    pi.end = buf + len;
-	    if (0 >= (cnt = read(fd, (char*)pi.json, len)) || cnt != (ssize_t)len) {
-		if (0 != buf) {
-		    xfree(buf);
-		}
-		rb_raise(rb_eIOError, "failed to read from IO Object.");
-	    }
-#endif
-	} else if (rb_respond_to(input, oj_read_id)) {
-	    s = rb_funcall2(input, oj_read_id, 0, 0);
-	    oj_pi_set_input_str(&pi, s);
-	} else {
-	    rb_raise(rb_eArgError, "saj_parse() expected a String or IO Object.");
-	}
-    }
-    wrapped_stack = oj_stack_init(&pi.stack);
-    rb_protect(protect_parse, (VALUE)&pi, &line);
-    DATA_PTR(wrapped_stack) = NULL;
-    if (0 != buf) {
-	xfree(buf);
+	return oj_pi_sparse(argc - 1, argv + 1, &pi, 0);
     }
-    stack_cleanup(&pi.stack);
-    if (0 != line) {
-	rb_jump_tag(line);
-    }
-    if (err_has(&pi.err)) {
-	oj_err_raise(&pi.err);
-    }
-    return Qnil;
 }