From f9727c12cc8fbc5f752f5983be1f14bb976e5a13 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 17 May 2016 06:53:48 +0000 Subject: [Feature #12005] Unify Fixnum and Bignum into Integer * [Feature #12005] Unify Fixnum and Bignum into Integer * include/ruby/ruby.h (rb_class_of): Return rb_cInteger for fixnums. * insns.def (INTEGER_REDEFINED_OP_FLAG): Unified from FIXNUM_REDEFINED_OP_FLAG and BIGNUM_REDEFINED_OP_FLAG. * vm_core.h: Ditto. * vm_insnhelper.c (opt_eq_func): Use INTEGER_REDEFINED_OP_FLAG instead of FIXNUM_REDEFINED_OP_FLAG. * vm.c (vm_redefinition_check_flag): Use rb_cInteger instead of rb_cFixnum and rb_cBignum. (C): Use Integer instead of Fixnum and Bignum. * numeric.c (fix_succ): Removed. (Init_Numeric): Define Fixnum as Integer. * bignum.c (bignew): Use rb_cInteger instead of Rb_cBignum. (rb_int_coerce): replaced from rb_big_coerce and return fixnums as-is. (Init_Bignum): Define Bignum as Integer. Don't define ===. * error.c (builtin_class_name): Return "Integer" for fixnums. * sprintf.c (ruby__sfvextra): Use rb_cInteger instead of rb_cFixnum. * ext/-test-/testutil: New directory to test. Currently it provides utilities for fixnum and bignum. * ext/json/generator/generator.c: Define mInteger_to_json. * lib/mathn.rb (Fixnum#/): Redefinition removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/lib/test/unit.rb | 1 + test/lib/test/unit/assertions.rb | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'test/lib') diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb index d34e11afa7..df7070e3fc 100644 --- a/test/lib/test/unit.rb +++ b/test/lib/test/unit.rb @@ -8,6 +8,7 @@ require 'test/unit/assertions' require_relative '../envutil' require 'test/unit/testcase' require 'optparse' +require '-test-/testutil' # See Test::Unit module Test diff --git a/test/lib/test/unit/assertions.rb b/test/lib/test/unit/assertions.rb index 1df3453bc6..4e30de1be0 100644 --- a/test/lib/test/unit/assertions.rb +++ b/test/lib/test/unit/assertions.rb @@ -772,11 +772,13 @@ eom end def assert_fixnum(v, msg=nil) - assert_instance_of(Fixnum, v, msg) + assert_instance_of(Integer, v, msg) + assert_predicate(v, :fixnum?, msg) end def assert_bignum(v, msg=nil) - assert_instance_of(Bignum, v, msg) + assert_instance_of(Integer, v, msg) + assert_predicate(v, :bignum?, msg) end class << (AssertFile = Struct.new(:failure_message).new) -- cgit v1.2.3