aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-17 13:15:57 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-17 13:15:57 +0000
commiteafe3982896faa093156ba5b4b9cfee5de1584c9 (patch)
tree02c5b26a781f6c14cd0c8434c2edf07f5cfe222e /lib
parent4e187c1c0dc2aa0762250aaaf0a37ab7092cd5b0 (diff)
downloadruby-eafe3982896faa093156ba5b4b9cfee5de1584c9.tar.gz
Use Integer instead of Fixnum and Bignum.
* object.c, numeric.c, enum.c, ext/-test-/bignum/mul.c, lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rexml/xpath_parser.rb, lib/rubygems/specification.rb, lib/uri/generic.rb, bootstraptest/test_eval.rb, basictest/test.rb, test/-ext-/bignum/test_big2str.rb, test/-ext-/bignum/test_div.rb, test/-ext-/bignum/test_mul.rb, test/-ext-/bignum/test_str2big.rb, test/csv/test_data_converters.rb, test/date/test_date.rb, test/json/test_json_generate.rb, test/minitest/test_minitest_mock.rb, test/openssl/test_cipher.rb, test/rexml/test_jaxen.rb, test/ruby/test_array.rb, test/ruby/test_basicinstructions.rb, test/ruby/test_bignum.rb, test/ruby/test_case.rb, test/ruby/test_class.rb, test/ruby/test_complex.rb, test/ruby/test_enum.rb, test/ruby/test_eval.rb, test/ruby/test_iseq.rb, test/ruby/test_literal.rb, test/ruby/test_math.rb, test/ruby/test_module.rb, test/ruby/test_numeric.rb, test/ruby/test_range.rb, test/ruby/test_rational.rb, test/ruby/test_refinement.rb, test/ruby/test_rubyvm.rb, test/ruby/test_struct.rb, test/ruby/test_variable.rb, test/rubygems/test_gem_specification.rb, test/thread/test_queue.rb: Use Integer instead of Fixnum and Bignum. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rexml/quickpath.rb4
-rw-r--r--lib/rexml/text.rb2
-rw-r--r--lib/rexml/xpath_parser.rb2
-rw-r--r--lib/rubygems/specification.rb4
-rw-r--r--lib/uri/generic.rb4
5 files changed, 8 insertions, 8 deletions
diff --git a/lib/rexml/quickpath.rb b/lib/rexml/quickpath.rb
index f3ad29a93a..5d6c77ca38 100644
--- a/lib/rexml/quickpath.rb
+++ b/lib/rexml/quickpath.rb
@@ -194,7 +194,7 @@ module REXML
case res
when true
results << element
- when Fixnum
+ when Integer
results << element if Functions.pair[0] == res
when String
results << element
@@ -230,7 +230,7 @@ module REXML
case res
when true
results << element
- when Fixnum
+ when Integer
results << element if Functions.pair[0] == res
end
end
diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb
index b132bab8f4..9ea8ba9df3 100644
--- a/lib/rexml/text.rb
+++ b/lib/rexml/text.rb
@@ -33,7 +33,7 @@ module REXML
VALID_XML_CHARS = Regexp.new('^['+
VALID_CHAR.map { |item|
case item
- when Fixnum
+ when Integer
[item].pack('U').force_encoding('utf-8')
when Range
[item.first, '-'.ord, item.last].pack('UUU').force_encoding('utf-8')
diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb
index edd1127735..181b2b6e85 100644
--- a/lib/rexml/xpath_parser.rb
+++ b/lib/rexml/xpath_parser.rb
@@ -17,7 +17,7 @@ class Symbol
# to use across multiple Object types
def dclone ; self ; end
end
-class Fixnum
+class Integer
# provides a unified +clone+ operation, for REXML::XPathParser
# to use across multiple Object types
def dclone ; self ; end
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index b3066f2003..c50ff31fdb 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -2696,9 +2696,9 @@ class Gem::Specification < Gem::BasicSpecification
"#{full_name} contains itself (#{file_name}), check your files list"
end
- unless specification_version.is_a?(Fixnum)
+ unless specification_version.is_a?(Integer)
raise Gem::InvalidSpecificationException,
- 'specification_version must be a Fixnum (did you mean version?)'
+ 'specification_version must be a Integer (did you mean version?)'
end
case platform
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index 3c4cb6e530..5e980d699e 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -683,7 +683,7 @@ module URI
if @opaque
raise InvalidURIError,
"can not set port with registry or opaque"
- elsif !v.kind_of?(Fixnum) && parser.regexp[:PORT] !~ v
+ elsif !v.kind_of?(Integer) && parser.regexp[:PORT] !~ v
raise InvalidComponentError,
"bad component(expected port component): #{v.inspect}"
end
@@ -697,7 +697,7 @@ module URI
# see also URI::Generic.port=
#
def set_port(v)
- v = v.empty? ? nil : v.to_i unless !v || v.kind_of?(Fixnum)
+ v = v.empty? ? nil : v.to_i unless !v || v.kind_of?(Integer)
@port = v
end
protected :set_port