Merge pull request #304 from hsbt/support-to-ruby-2.4

Support to Integer unification for Ruby 2.4.
ohler55 · Jun 20, 2016 · af1d4ea · af1d4ea
2 parents 97bc050 + cc2b7f1
commit af1d4ea
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/ext/oj/fast.c b/ext/oj/fast.c
@@ -1281,7 +1281,11 @@ doc_type(int argc, VALUE *argv, VALUE self) {
 	case T_TRUE:	type = rb_cTrueClass;	break;
 	case T_FALSE:	type = rb_cFalseClass;	break;
 	case T_STRING:	type = rb_cString;	break;
+#ifdef RUBY_INTEGER_UNIFICATION
+	case T_FIXNUM:	type = rb_cInteger;	break;
+#else
 	case T_FIXNUM:	type = rb_cFixnum;	break;
+#endif
 	case T_FLOAT:	type = rb_cFloat;	break;
 	case T_ARRAY:	type = rb_cArray;	break;
 	case T_HASH:	type = rb_cHash;	break;

diff --git a/ext/oj/oj.c b/ext/oj/oj.c
@@ -402,9 +402,15 @@ oj_parse_options(VALUE ropts, Options copts) {
     if (Qnil != (v = rb_hash_lookup(ropts, float_prec_sym))) {
 	int	n;
 
+#ifdef RUBY_INTEGER_UNIFICATION
+	if (rb_cInteger != rb_obj_class(v)) {
+	    rb_raise(rb_eArgError, ":float_precision must be a Integer.");
+	}
+#else
 	if (rb_cFixnum != rb_obj_class(v)) {
 	    rb_raise(rb_eArgError, ":float_precision must be a Fixnum.");
 	}
+#endif
 	Check_Type(v, T_FIXNUM);
 	n = FIX2INT(v);
 	if (0 >= n) {
@@ -421,9 +427,15 @@ oj_parse_options(VALUE ropts, Options copts) {
     if (Qnil != (v = rb_hash_lookup(ropts, sec_prec_sym))) {
 	int	n;
 
+#ifdef RUBY_INTEGER_UNIFICATION
+	if (rb_cInteger != rb_obj_class(v)) {
+	    rb_raise(rb_eArgError, ":second_precision must be a Integer.");
+	}
+#else
 	if (rb_cFixnum != rb_obj_class(v)) {
 	    rb_raise(rb_eArgError, ":second_precision must be a Fixnum.");
 	}
+#endif
 	n = NUM2INT(v);
 	if (0 > n) {
 	    n = 0;