oj 3.9.2 → 3.10.18

data/ext/oj/oj.c

@@ -1,7 +1,4 @@
-/* oj.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <errno.h>
@@ -91,6 +88,7 @@ VALUE	oj_slash_string;
 VALUE	oj_allow_nan_sym;
 VALUE	oj_array_class_sym;
 VALUE	oj_create_additions_sym;
+VALUE	oj_decimal_class_sym;
 VALUE	oj_hash_class_sym;
 VALUE	oj_indent_sym;
 VALUE	oj_object_class_sym;
@@ -115,10 +113,12 @@ static VALUE	custom_sym;
 static VALUE	empty_string_sym;
 static VALUE	escape_mode_sym;
 static VALUE	integer_range_sym;
+static VALUE	fast_sym;
 static VALUE	float_prec_sym;
 static VALUE	float_sym;
 static VALUE	huge_sym;
 static VALUE	ignore_sym;
+static VALUE	ignore_under_sym;
 static VALUE	json_sym;
 static VALUE	match_string_sym;
 static VALUE	mode_sym;
@@ -181,8 +181,10 @@ struct _options	oj_default_options = {
     Yes,	// allow_nan
     No,		// trace
     No,		// safe
-    0,		// integer_range_min
-    0,		// integer_range_max
+    false,	// sec_prec_set
+    No,		// ignore_under
+    0,		// int_range_min
+    0,		// int_range_max
     oj_json_class,	// create_id
     10,		// create_id_len
     9,		// sec_prec
@@ -227,7 +229,7 @@ struct _options	oj_default_options = {
  * - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load and dump modes to use for JSON
  * - *:time_format* [_:unix_|_:unix_zone_|_:xmlschema_|_:ruby_] time format when dumping
  * - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or as a String
- * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_] load decimals as BigDecimal instead of as a Float. :auto pick the most precise for the number of digits.
+ * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_] load decimals as BigDecimal instead of as a Float. :auto pick the most precise for the number of digits. :float should be the same as ruby. :fast may require rounding but is must faster.
  * - *:create_id* [_String_|_nil_] create id for json compatible object encoding, default is 'json_class'
  * - *:create_additions* [_Boolean_|_nil_] if true allow creation of instances using create_id on load.
  * - *:second_precision* [_Fixnum_|_nil_] number of digits after the decimal when dumping the seconds portion of time
@@ -251,6 +253,7 @@ struct _options	oj_default_options = {
  * - *:array_class* [_Class_|_nil_] Class to use instead of Array on load
  * - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted
  * - *: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.
  * - *: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 off)
@@ -286,6 +289,7 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, oj_trace_sym, (Yes == oj_default_options.trace) ? Qtrue : ((No == oj_default_options.trace) ? Qfalse : Qnil));
     rb_hash_aset(opts, oj_safe_sym, (Yes == oj_default_options.safe) ? Qtrue : ((No == oj_default_options.safe) ? Qfalse : Qnil));
     rb_hash_aset(opts, float_prec_sym, INT2FIX(oj_default_options.float_prec));
+    rb_hash_aset(opts, ignore_under_sym, (Yes == oj_default_options.ignore_under) ? Qtrue : ((No == oj_default_options.ignore_under) ? Qfalse : Qnil));
     switch (oj_default_options.mode) {
     case StrictMode:	rb_hash_aset(opts, mode_sym, strict_sym);	break;
     case CompatMode:	rb_hash_aset(opts, mode_sym, compat_sym);	break;
@@ -297,16 +301,16 @@ get_def_opts(VALUE self) {
     default:		rb_hash_aset(opts, mode_sym, object_sym);	break;
     }
 
-    if (oj_default_options.integer_range_max != 0 || oj_default_options.integer_range_min != 0) {
-    VALUE range = rb_obj_alloc(rb_cRange);
-    VALUE min = LONG2FIX(oj_default_options.integer_range_min);
-    VALUE max = LONG2FIX(oj_default_options.integer_range_max);
-    rb_ivar_set(range, oj_begin_id, min);
-    rb_ivar_set(range, oj_end_id, max);
-    rb_hash_aset(opts, integer_range_sym, range);
-    }
-    else {
-    rb_hash_aset(opts, integer_range_sym, Qnil);
+    if (oj_default_options.int_range_max != 0 || oj_default_options.int_range_min != 0) {
+	VALUE	range = rb_obj_alloc(rb_cRange);
+	VALUE	min = LONG2FIX(oj_default_options.int_range_min);
+	VALUE	max = LONG2FIX(oj_default_options.int_range_max);
+
+	rb_ivar_set(range, oj_begin_id, min);
+	rb_ivar_set(range, oj_end_id, max);
+	rb_hash_aset(opts, integer_range_sym, range);
+    } else {
+	rb_hash_aset(opts, integer_range_sym, Qnil);
     }
     switch (oj_default_options.escape_mode) {
     case NLEsc:		rb_hash_aset(opts, escape_mode_sym, newline_sym);	break;
@@ -326,6 +330,7 @@ get_def_opts(VALUE self) {
     switch (oj_default_options.bigdec_load) {
     case BigDec:	rb_hash_aset(opts, bigdecimal_load_sym, bigdecimal_sym);break;
     case FloatDec:	rb_hash_aset(opts, bigdecimal_load_sym, float_sym);	break;
+    case FastDec:	rb_hash_aset(opts, bigdecimal_load_sym, fast_sym);	break;
     case AutoDec:
     default:		rb_hash_aset(opts, bigdecimal_load_sym, auto_sym);	break;
     }
@@ -398,6 +403,7 @@ get_def_opts(VALUE self) {
  *   - *:array_class* [_Class_|_nil_] Class to use instead of Array on load.
  *   - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted.
  *   - *: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.
  *   - *:integer_range* [_Range_] Dump integers outside range as strings.
  *   - *:trace* [_Boolean_] turn trace on or off.
  *   - *:safe* [_Boolean_] turn safe mimic on or off.
@@ -431,6 +437,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	{ oj_allow_nan_sym, &copts->allow_nan },
 	{ oj_trace_sym, &copts->trace },
 	{ oj_safe_sym, &copts->safe },
+	{ ignore_under_sym, &copts->ignore_under },
 	{ oj_create_additions_sym, &copts->create_ok },
 	{ Qnil, 0 }
     };
@@ -506,8 +513,12 @@ oj_parse_options(VALUE ropts, Options copts) {
 	n = NUM2INT(v);
 	if (0 > n) {
 	    n = 0;
+	    copts->sec_prec_set = false;
 	} else if (9 < n) {
 	    n = 9;
+	    copts->sec_prec_set = true;
+	} else {
+	    copts->sec_prec_set = true;
 	}
 	copts->sec_prec = n;
     }
@@ -563,12 +574,27 @@ oj_parse_options(VALUE ropts, Options copts) {
 	    copts->bigdec_load = BigDec;
 	} else if (float_sym == v) {
 	    copts->bigdec_load = FloatDec;
+	} else if (fast_sym == v) {
+	    copts->bigdec_load = FastDec;
 	} else if (auto_sym == v || Qfalse == v) {
 	    copts->bigdec_load = AutoDec;
 	} else {
 	    rb_raise(rb_eArgError, ":bigdecimal_load must be :bigdecimal, :float, or :auto.");
 	}
     }
+    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_decimal_class_sym)) {
+	v = rb_hash_lookup(ropts, oj_decimal_class_sym);
+	if (rb_cFloat == v) {
+	    copts->bigdec_load = FloatDec;
+	} else if (oj_bigdecimal_class == v) {
+ 	    copts->bigdec_load = BigDec;
+	} else if (Qnil == v) {
+	    copts->bigdec_load = AutoDec;
+	} else {
+	    rb_raise(rb_eArgError, ":decimal_class must be BigDecimal, Float, or nil.");
+	}
+   }
+
     if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, create_id_sym)) {
 	v = rb_hash_lookup(ropts, create_id_sym);
 	if (Qnil == v) {
@@ -738,24 +764,26 @@ oj_parse_options(VALUE ropts, Options copts) {
 	}
     }
     if (Qnil != (v = rb_hash_lookup(ropts, integer_range_sym))) {
-    if (TYPE(v) == T_STRUCT && rb_obj_class(v) == rb_cRange) {
-        VALUE min = rb_funcall(v, oj_begin_id, 0);
-        VALUE max = rb_funcall(v, oj_end_id, 0);
-
-        if (TYPE(min) != T_FIXNUM || TYPE(max) != T_FIXNUM) {
-            rb_raise(rb_eArgError, ":integer_range range bounds is not Fixnum.");
-        }
-
-        copts->integer_range_min = FIX2LONG(min);
-        copts->integer_range_max = FIX2LONG(max);
-    } else if (Qfalse != v) {
-        rb_raise(rb_eArgError, ":integer_range must be a range of Fixnum.");
-    }
+	if (TYPE(v) == T_STRUCT && rb_obj_class(v) == rb_cRange) {
+	    VALUE min = rb_funcall(v, oj_begin_id, 0);
+	    VALUE max = rb_funcall(v, oj_end_id, 0);
+
+	    if (TYPE(min) != T_FIXNUM || TYPE(max) != T_FIXNUM) {
+		rb_raise(rb_eArgError, ":integer_range range bounds is not Fixnum.");
+	    }
+
+	    copts->int_range_min = FIX2LONG(min);
+	    copts->int_range_max = FIX2LONG(max);
+	} else if (Qfalse != v) {
+	    rb_raise(rb_eArgError, ":integer_range must be a range of Fixnum.");
+	}
     }
 }
 
 static int
-match_string_cb(VALUE key, VALUE value, RxClass rc) {
+match_string_cb(VALUE key, VALUE value, VALUE rx) {
+    RxClass	rc = (RxClass)rx;
+
     if (T_CLASS != rb_type(value)) {
 	rb_raise(rb_eArgError, "for :match_string, the hash values must be a Class.");
     }
@@ -790,7 +818,7 @@ oj_parse_opt_match_string(RxClass rc, VALUE ropts) {
 }
 
 /* Document-method: load
- * call-seq: load(json, options) { _|_obj, start, len_|_ }
+ * call-seq: load(json, options={}) { _|_obj, start, len_|_ }
  *
  * Parses a JSON document String into a Object, Hash, Array, String, Fixnum,
  * Float, true, false, or nil according to the default mode or the mode
@@ -874,7 +902,7 @@ load(int argc, VALUE *argv, VALUE self) {
 }
 
 /* Document-method: load_file
- * call-seq: load_file(path, options) { _|_obj, start, len_|_ }
+ * call-seq: load_file(path, options={}) { _|_obj, start, len_|_ }
  *
  * Parses a JSON document String into a Object, Hash, Array, String, Fixnum,
  * Float, true, false, or nil according to the default mode or the mode
@@ -954,11 +982,13 @@ load_file(int argc, VALUE *argv, VALUE self) {
     }
     switch (mode) {
     case StrictMode:
+    case NullMode:
 	oj_set_strict_callbacks(&pi);
 	return oj_pi_sparse(argc, argv, &pi, fd);
-    case NullMode:
-    case CompatMode:
     case CustomMode:
+	oj_set_custom_callbacks(&pi);
+	return oj_pi_sparse(argc, argv, &pi, fd);
+    case CompatMode:
     case RailsMode:
 	oj_set_compat_callbacks(&pi);
 	return oj_pi_sparse(argc, argv, &pi, fd);
@@ -1030,7 +1060,7 @@ safe_load(VALUE self, VALUE doc) {
  */
 
 /* Document-method: dump
- * call-seq: dump(obj, options)
+ * call-seq: dump(obj, options={})
  *
  * Dumps an Object (obj) to a string.
  * - *obj* [_Object_] Object to serialize as an JSON document String
@@ -1052,6 +1082,9 @@ dump(int argc, VALUE *argv, VALUE self) {
     if (2 == argc) {
 	oj_parse_options(argv[1], &copts);
     }
+    if (CompatMode == copts.mode && copts.escape_mode != ASCIIEsc) {
+	copts.escape_mode = JSONEsc;
+    }
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = false;
@@ -1125,7 +1158,7 @@ to_json(int argc, VALUE *argv, VALUE self) {
 }
 
 /* Document-method: to_file
- * call-seq: to_file(file_path, obj, options)
+ * call-seq: to_file(file_path, obj, options={})
  *
  * Dumps an Object to the specified file.
  * - *file* [_String_] _path file path to write the JSON document to
@@ -1148,7 +1181,7 @@ to_file(int argc, VALUE *argv, VALUE self) {
 }
 
 /* Document-method: to_stream
- * call-seq: to_stream(io, obj, options)
+ * call-seq: to_stream(io, obj, options={})
  *
  * Dumps an Object to the specified IO stream.
  * - *io* [_IO_] IO stream to write the JSON document to
@@ -1636,10 +1669,12 @@ Init_oj() {
     empty_string_sym = ID2SYM(rb_intern("empty_string"));	rb_gc_register_address(&empty_string_sym);
     escape_mode_sym = ID2SYM(rb_intern("escape_mode"));		rb_gc_register_address(&escape_mode_sym);
     integer_range_sym = ID2SYM(rb_intern("integer_range"));	rb_gc_register_address(&integer_range_sym);
+    fast_sym = ID2SYM(rb_intern("fast"));			rb_gc_register_address(&fast_sym);
     float_prec_sym = ID2SYM(rb_intern("float_precision"));	rb_gc_register_address(&float_prec_sym);
     float_sym = ID2SYM(rb_intern("float"));			rb_gc_register_address(&float_sym);
     huge_sym = ID2SYM(rb_intern("huge"));			rb_gc_register_address(&huge_sym);
     ignore_sym = ID2SYM(rb_intern("ignore"));			rb_gc_register_address(&ignore_sym);
+    ignore_under_sym = ID2SYM(rb_intern("ignore_under"));	rb_gc_register_address(&ignore_under_sym);
     json_sym = ID2SYM(rb_intern("json"));			rb_gc_register_address(&json_sym);
     match_string_sym = ID2SYM(rb_intern("match_string"));	rb_gc_register_address(&match_string_sym);
     mode_sym = ID2SYM(rb_intern("mode"));			rb_gc_register_address(&mode_sym);
@@ -1653,6 +1688,7 @@ Init_oj() {
     oj_array_nl_sym = ID2SYM(rb_intern("array_nl"));		rb_gc_register_address(&oj_array_nl_sym);
     oj_ascii_only_sym = ID2SYM(rb_intern("ascii_only"));	rb_gc_register_address(&oj_ascii_only_sym);
     oj_create_additions_sym = ID2SYM(rb_intern("create_additions"));rb_gc_register_address(&oj_create_additions_sym);
+    oj_decimal_class_sym = ID2SYM(rb_intern("decimal_class"));	rb_gc_register_address(&oj_decimal_class_sym);
     oj_hash_class_sym = ID2SYM(rb_intern("hash_class"));	rb_gc_register_address(&oj_hash_class_sym);
     oj_indent_sym = ID2SYM(rb_intern("indent"));		rb_gc_register_address(&oj_indent_sym);
     oj_max_nesting_sym = ID2SYM(rb_intern("max_nesting"));	rb_gc_register_address(&oj_max_nesting_sym);

data/ext/oj/oj.h

@@ -1,7 +1,4 @@
-/* oj.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #ifndef OJ_H
 #define OJ_H
@@ -77,7 +74,9 @@ typedef enum {
 typedef enum {
     BigDec	= 'b',
     FloatDec	= 'f',
-    AutoDec	= 'a'
+    AutoDec	= 'a',
+    FastDec	= 'F',
+    RubyDec	= 'r',
 } BigLoad;
 
 typedef enum {
@@ -149,8 +148,10 @@ typedef struct _options {
     char		allow_nan;	// YEsyNo for parsing only
     char		trace;		// YesNo
     char		safe;		// YesNo
-    int64_t		integer_range_min; // dump numbers outside range as string
-    int64_t		integer_range_max;
+    char		sec_prec_set;	// boolean (0 or 1)
+    char		ignore_under;	// YesNo - ignore attrs starting with _ if true in object and custom modes
+    int64_t		int_range_min;	// dump numbers below as string
+    int64_t		int_range_max;	// dump numbers above as string
     const char		*create_id;	// 0 or string
     size_t		create_id_len;	// length of create_id
     int			sec_prec;	// second precision when dumping time
@@ -309,6 +310,7 @@ extern VALUE	oj_array_class_sym;
 extern VALUE	oj_array_nl_sym;
 extern VALUE	oj_ascii_only_sym;
 extern VALUE	oj_create_additions_sym;
+extern VALUE	oj_decimal_class_sym;
 extern VALUE	oj_hash_class_sym;
 extern VALUE	oj_indent_sym;
 extern VALUE	oj_max_nesting_sym;

data/ext/oj/parse.c

@@ -1,7 +1,4 @@
-/* parse.c
- * Copyright (c) 2013, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2013 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -215,18 +212,6 @@ read_escaped_str(ParseInfo pi, const char *start) {
 	    case '"':	buf_append(&buf, '"');	break;
 	    case '/':	buf_append(&buf, '/');	break;
 	    case '\\':	buf_append(&buf, '\\');	break;
-	    case '\'':
-		// The json gem claims this is not an error despite the
-		// ECMA-404 indicating it is not valid.
-		if (CompatMode == pi->options.mode) {
-		    buf_append(&buf, '\'');
-		} else {
-		    pi->cur = s;
-		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
-		    buf_cleanup(&buf);
-		    return;
-		}
-		break;
 	    case 'u':
 		s++;
 		if (0 == (code = read_hex(pi, s)) && err_has(&pi->err)) {
@@ -266,6 +251,12 @@ read_escaped_str(ParseInfo pi, const char *start) {
 		}
 		break;
 	    default:
+		// The json gem claims this is not an error despite the
+		// ECMA-404 indicating it is not valid.
+		if (CompatMode == pi->options.mode) {
+		    buf_append(&buf, *s);
+		    break;
+		}
 		pi->cur = s;
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
 		buf_cleanup(&buf);
@@ -393,13 +384,18 @@ read_num(ParseInfo pi) {
     ni.infinity = 0;
     ni.nan = 0;
     ni.neg = 0;
-    ni.hasExp = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load);
+    ni.has_exp = 0;
+    ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
+    ni.bigdec_load = pi->options.bigdec_load;
 
     if ('-' == *pi->cur) {
 	pi->cur++;
 	ni.neg = 1;
     } else if ('+' == *pi->cur) {
+	if (StrictMode == pi->options.mode) {
+	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
+	    return;
+	}
 	pi->cur++;
     }
     if ('I' == *pi->cur) {
@@ -446,8 +442,14 @@ read_num(ParseInfo pi) {
 	if ('.' == *pi->cur) {
 	    pi->cur++;
 	    // A trailing . is not a valid decimal but if encountered allow it
-	    // except when mimicing the JSON gem.
-	    if (CompatMode == pi->options.mode) {
+	    // except when mimicing the JSON gem or in strict mode.
+	    if (StrictMode == pi->options.mode || CompatMode == pi->options.mode) {
+		int	pos = (int)(pi->cur - ni.str);
+
+		if (1 == pos || (2 == pos && ni.neg)) {
+		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
+		    return;
+		}
 		if (*pi->cur < '0' || '9' < *pi->cur) {
 		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
 		    return;
@@ -459,18 +461,26 @@ read_num(ParseInfo pi) {
 		if (0 < ni.num || 0 < ni.i) {
 		    dec_cnt++;
 		}
-		ni.num = ni.num * 10 + d;
-		ni.div *= 10;
-		ni.di++;
-		if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
-		    ni.big = 1;
+		if (INT64_MAX <= ni.div) {
+		    if (!ni.no_big) {
+			ni.big = true;
+		    }
+		} else {
+		    ni.num = ni.num * 10 + d;
+		    ni.div *= 10;
+		    ni.di++;
+		    if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
+			if (!ni.no_big) {
+			    ni.big = true;
+			}
+		    }
 		}
 	    }
 	}
 	if ('e' == *pi->cur || 'E' == *pi->cur) {
 	    int	eneg = 0;
 
-	    ni.hasExp = 1;
+	    ni.has_exp = 1;
 	    pi->cur++;
 	    if ('-' == *pi->cur) {
 		pi->cur++;
@@ -481,7 +491,7 @@ read_num(ParseInfo pi) {
 	    for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
 		ni.exp = ni.exp * 10 + (*pi->cur - '0');
 		if (EXP_MAX <= ni.exp) {
-		    ni.big = 1;
+		    ni.big = true;
 		}
 	    }
 	    if (eneg) {
@@ -731,7 +741,7 @@ oj_parse2(ParseInfo pi) {
 }
 
 static VALUE
-rescue_big_decimal(VALUE str) {
+rescue_big_decimal(VALUE str, VALUE ignore) {
     rb_raise(oj_parse_error_class, "Invalid value for BigDecimal()");
     return Qnil;
 }
@@ -741,6 +751,59 @@ parse_big_decimal(VALUE str) {
     return rb_funcall(rb_cObject, oj_bigdecimal_id, 1, str);
 }
 
+static long double	exp_plus[] = {
+    1.0,
+    1.0e1,
+    1.0e2,
+    1.0e3,
+    1.0e4,
+    1.0e5,
+    1.0e6,
+    1.0e7,
+    1.0e8,
+    1.0e9,
+    1.0e10,
+    1.0e11,
+    1.0e12,
+    1.0e13,
+    1.0e14,
+    1.0e15,
+    1.0e16,
+    1.0e17,
+    1.0e18,
+    1.0e19,
+    1.0e20,
+    1.0e21,
+    1.0e22,
+    1.0e23,
+    1.0e24,
+    1.0e25,
+    1.0e26,
+    1.0e27,
+    1.0e28,
+    1.0e29,
+    1.0e30,
+    1.0e31,
+    1.0e32,
+    1.0e33,
+    1.0e34,
+    1.0e35,
+    1.0e36,
+    1.0e37,
+    1.0e38,
+    1.0e39,
+    1.0e40,
+    1.0e41,
+    1.0e42,
+    1.0e43,
+    1.0e44,
+    1.0e45,
+    1.0e46,
+    1.0e47,
+    1.0e48,
+    1.0e49,
+};
+
 VALUE
 oj_num_as_value(NumInfo ni) {
     volatile VALUE	rnum = Qnil;
@@ -753,7 +816,7 @@ oj_num_as_value(NumInfo ni) {
 	}
     } else if (ni->nan) {
 	rnum = rb_float_new(0.0/0.0);
-    } else if (1 == ni->div && 0 == ni->exp) { // fixnum
+    } else if (1 == ni->div && 0 == ni->exp && !ni->has_exp) { // fixnum
 	if (ni->big) {
 	    if (256 > ni->len) {
 		char	buf[256];
@@ -784,33 +847,39 @@ oj_num_as_value(NumInfo ni) {
 	    if (ni->no_big) {
 		rnum = rb_funcall(rnum, rb_intern("to_f"), 0);
 	    }
-	} else {
-	    // All these machinations are to get rounding to work better.
-	    long double	d = (long double)ni->i * (long double)ni->div + (long double)ni->num;
+	} else if (FastDec == ni->bigdec_load) {
+	    long double	ld = (long double)ni->i * (long double)ni->div + (long double)ni->num;
 	    int		x = (int)((int64_t)ni->exp - ni->di);
 
-	    // Rounding sometimes cuts off the last digit even if there are only
-	    // 15 digits. This attempts to fix those few cases where this
-	    // occurs.
-	    if ((long double)INT64_MAX > d && (int64_t)d != (ni->i * ni->div + ni->num)) {
-		volatile VALUE	bd = rb_str_new(ni->str, ni->len);
-
-		rnum = rb_rescue2(parse_big_decimal, bd, rescue_big_decimal, bd, rb_eException, 0);
-		if (ni->no_big) {
-		    rnum = rb_funcall(rnum, rb_intern("to_f"), 0);
-		}
-	    } else {
-		d = roundl(d);
-		if (0 < x) {
-		    d *= powl(10.0L, x);
-		} else if (0 > x) {
-		    d /= powl(10.0L, -x);
+	    if (0 < x) {
+		if (x < (int)(sizeof(exp_plus) / sizeof(*exp_plus))) {
+		    ld *= exp_plus[x];
+		} else {
+		    ld *= powl(10.0, x);
 		}
-		if (ni->neg) {
-		    d = -d;
+	    } else if (x < 0) {
+		if (-x < (int)(sizeof(exp_plus) / sizeof(*exp_plus))) {
+		    ld /= exp_plus[-x];
+		} else {
+		    ld /= powl(10.0, -x);
 		}
-		rnum = rb_float_new((double)d);
 	    }
+	    if (ni->neg) {
+		ld = -ld;
+	    }
+	    rnum = rb_float_new((double)ld);
+	} else if (RubyDec == ni->bigdec_load) {
+	    volatile VALUE	sv = rb_str_new(ni->str, ni->len);
+
+	    rnum = rb_funcall(sv, rb_intern("to_f"), 0);
+	} else {
+	    char	*end;
+	    double	d = strtod(ni->str, &end);
+
+	    if ((long)ni->len != (long)(end - ni->str)) {
+		rb_raise(oj_parse_error_class, "Invalid float");
+	    }
+	    rnum = rb_float_new(d);
 	}
     }
     return rnum;
@@ -832,6 +901,12 @@ oj_set_error_at(ParseInfo pi, VALUE err_clas, const char* file, int line, const
     if (p + 3 < end) {
 	*p++ = ' ';
 	*p++ = '(';
+	*p++ = 'a';
+	*p++ = 'f';
+	*p++ = 't';
+	*p++ = 'e';
+	*p++ = 'r';
+	*p++ = ' ';
 	start = p;
 	for (vp = pi->stack.head; vp < pi->stack.tail; vp++) {
 	    if (end <= p + 1 + vp->klen) {
@@ -1050,7 +1125,7 @@ CLEANUP:
 	    }
 	    args[0] = msg;
 	    if (pi->err.clas == oj_parse_error_class) {
-		// The error was an Oj::ParseError so change to a JSON::ParseError.
+		// The error was an Oj::ParseError so change to a JSON::ParserError.
 		pi->err.clas = oj_json_parser_error_class;
 	    }
 	    rb_exc_raise(rb_class_new_instance(1, args, pi->err.clas));

data/ext/oj/parse.h

@@ -1,7 +1,4 @@
-/* parse.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #ifndef OJ_PARSE_H
 #define OJ_PARSE_H
@@ -31,8 +28,9 @@ typedef struct _numInfo {
     int		infinity;
     int		nan;
     int		neg;
-    int		hasExp;
+    int		has_exp;
     int		no_big;
+    int		bigdec_load;
 } *NumInfo;
 
 typedef struct _parseInfo {
@@ -80,6 +78,7 @@ extern VALUE	oj_num_as_value(NumInfo ni);
 extern void	oj_set_strict_callbacks(ParseInfo pi);
 extern void	oj_set_object_callbacks(ParseInfo pi);
 extern void	oj_set_compat_callbacks(ParseInfo pi);
+extern void	oj_set_custom_callbacks(ParseInfo pi);
 extern void	oj_set_wab_callbacks(ParseInfo pi);
 
 extern void	oj_sparse2(ParseInfo pi);