Merge pull request #5084 from mruby/mruby3

Mruby3

10 files changed, 38 insertions, 55 deletions

diff --git a/test/t/array.rb b/test/t/array.rb
index eec31d751..2982cab01 100644
--- a/test/t/array.rb
+++ b/test/t/array.rb
@@ -372,8 +372,7 @@ end
 assert('Array#hash', '15.2.12.5.35') do
   a = [ 1, 2, 3 ]
 
-  #assert_true(a.hash.is_a? Integer)
-  assert_true(a.hash.is_a? Integral)  # mruby special
+  assert_true(a.hash.is_a? Integer)
   assert_equal([1,2].hash, [1,2].hash)
 end
 
diff --git a/test/t/bs_literal.rb b/test/t/bs_literal.rb
index c6c38140b..d60957f0b 100644
--- a/test/t/bs_literal.rb
+++ b/test/t/bs_literal.rb
@@ -34,5 +34,5 @@ assert('BS Literal 8') do
 end
 
 assert('BS Literal 9') do
-  assert_equal Fixnum, 1234.class
+  assert_equal Integer, 1234.class
 end
diff --git a/test/t/float.rb b/test/t/float.rb
index dc989636f..e2a8a5088 100644
--- a/test/t/float.rb
+++ b/test/t/float.rb
@@ -207,7 +207,7 @@ assert('Float#>>') do
 end
 
 assert('Float#to_s') do
-  uses_float = 4e38.infinite?  # enable MRB_USE_FLOAT?
+  uses_float = 4e38.infinite?  # enable MRB_USE_FLOAT32?
 
   assert_equal("Infinity", Float::INFINITY.to_s)
   assert_equal("-Infinity", (-Float::INFINITY).to_s)
@@ -239,6 +239,11 @@ assert('Float#to_s') do
   end
 end
 
+assert('Float#inspect') do
+  assert_equal("-3.25", -3.25.inspect)
+  assert_equal("50.0", 50.0.inspect)
+end
+
 assert('Float#eql?') do
   assert_operator(5.0, :eql?, 5.0)
   assert_not_operator(5.0, :eql?, 5)
diff --git a/test/t/integer.rb b/test/t/integer.rb
index f9c44a64f..5204eb91b 100644
--- a/test/t/integer.rb
+++ b/test/t/integer.rb
@@ -14,16 +14,6 @@ assert('Integer#+', '15.2.8.3.1') do
 
   assert_raise(TypeError){ 0+nil }
   assert_raise(TypeError){ 1+nil }
-
-  c = Mrbtest::FIXNUM_MAX + 1
-  d = Mrbtest::FIXNUM_MAX.__send__(:+, 1)
-
-  skip unless Object.const_defined?(:Float)
-  e = Mrbtest::FIXNUM_MAX + 1.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
 end
 
 assert('Integer#-', '15.2.8.3.2') do
@@ -32,37 +22,17 @@ assert('Integer#-', '15.2.8.3.2') do
 
   assert_equal 1, a
   assert_equal 1.0, b if Object.const_defined?(:Float)
-
-  c = Mrbtest::FIXNUM_MIN - 1
-  d = Mrbtest::FIXNUM_MIN.__send__(:-, 1)
-
-  skip unless Object.const_defined?(:Float)
-  e = Mrbtest::FIXNUM_MIN - 1.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
 end
 
 assert('Integer#*', '15.2.8.3.3') do
   a = 1*1
-  b = 1*1.0 if Object.const_defined?(:Float)
-
   assert_equal 1, a
-  assert_equal 1.0, b if Object.const_defined?(:Float)
-
+  if Object.const_defined?(:Float)
+    b = 1*1.0 
+    assert_equal 1.0, b
+  end
   assert_raise(TypeError){ 0*nil }
   assert_raise(TypeError){ 1*nil }
-
-  c = Mrbtest::FIXNUM_MAX * 2
-  d = Mrbtest::FIXNUM_MAX.__send__(:*, 2)
-
-  skip unless Object.const_defined?(:Float)
-  e = Mrbtest::FIXNUM_MAX * 2.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
 end
 
 assert('Integer#/', '15.2.8.3.4') do
@@ -156,7 +126,7 @@ assert('Integer#<<', '15.2.8.3.12') do
 
   skip unless Object.const_defined?(:Float)
 
-  # Overflow to Fixnum
+  # Overflow to Integer
   assert_float 9223372036854775808.0, 1 << 63
   assert_float(-13835058055282163712.0, -3 << 62)
 end
diff --git a/test/t/kernel.rb b/test/t/kernel.rb
index 606150147..cab1ddd3d 100644
--- a/test/t/kernel.rb
+++ b/test/t/kernel.rb
@@ -76,7 +76,7 @@ assert('Kernel.raise', '15.3.1.2.12') do
 end
 
 assert('Kernel#__id__', '15.3.1.3.3') do
-  assert_equal Fixnum, __id__.class
+  assert_equal Integer, __id__.class
 end
 
 assert('Kernel#__send__', '15.3.1.3.4') do
diff --git a/test/t/module.rb b/test/t/module.rb
index 12b7f1344..2957dec52 100644
--- a/test/t/module.rb
+++ b/test/t/module.rb
@@ -593,7 +593,7 @@ end
   #        to_f / other
   #      end
   #    end
-  #    Fixnum.send(:prepend, M)
+  #    Integer.send(:prepend, M)
   #    assert_equal(0.5, 1 / 2, "#{bug7983}")
   #  }
   #  assert_equal(0, 1 / 2)
diff --git a/test/t/numeric.rb b/test/t/numeric.rb
index af44a2e1a..8baf6c883 100644
--- a/test/t/numeric.rb
+++ b/test/t/numeric.rb
@@ -36,7 +36,7 @@ assert('Numeric#/', '15.2.8.3.4') do
   n = Class.new(Numeric){ def /(x); 15.1;end }.new
 
   assert_equal(2, 10/5)
-  assert_equal(0.0625, 1/16)
+  assert_equal(0, 1/16)
   assert_equal(15.1, n/10)
   assert_raise(TypeError){ 1/n }
   assert_raise(TypeError){ 1/nil }
diff --git a/test/t/superclass.rb b/test/t/superclass.rb
index 10b6438d3..f213b1247 100644
--- a/test/t/superclass.rb
+++ b/test/t/superclass.rb
@@ -25,20 +25,20 @@
   [:ArgumentError, :StandardError, '15.2.24.2'],
   # [:LocalJumpError, :StandardError, '15.2.25.2'],
   [:LocalJumpError, :ScriptError, '15.2.25.2'], # mruby specific
-  [:RangeError, :StandardError, '12.2.26.2'],
-  [:RegexpError, :StandardError, '12.2.27.2'],
-  [:RuntimeError, :StandardError, '12.2.28.2'],
-  [:TypeError, :StandardError, '12.2.29.2'],
-#  [:ZeroDivisionError, :StandardError, '12.2.30.2'],  # No ZeroDivisionError in mruby
+  [:RangeError, :StandardError, '15.2.26.2'],
+  [:RegexpError, :StandardError, '15.2.27.2'],
+  [:RuntimeError, :StandardError, '15.2.28.2'],
+  [:TypeError, :StandardError, '15.2.29.2'],
+  [:ZeroDivisionError, :StandardError, '15.2.30.2'],
   [:NameError, :StandardError, '15.2.31.2'],
   [:NoMethodError, :NameError, '15.2.32.2'],
   [:IndexError, :StandardError, '15.2.33.2'],
-#  [:IOError, :StandardError, '12.2.34.2'],
-#  [:EOFError, :IOError, '12.2.35.2'],
+#  [:IOError, :StandardError, '15.2.34.2'],
+#  [:EOFError, :IOError, '15.2.35.2'],
 #  [:SystemCallError, :StandardError, '15.2.36.2'],
-  [:ScriptError, :Exception, '12.2.37.2'],
-  [:SyntaxError, :ScriptError, '12.2.38.2'],
-#  [:LoadError, :ScriptError, '12.2.39,2'],
+  [:ScriptError, :Exception, '15.2.37.2'],
+  [:SyntaxError, :ScriptError, '15.2.38.2'],
+#  [:LoadError, :ScriptError, '15.2.39,2'],
 ].each do |cls, super_cls, iso|
   assert "Direct superclass of #{cls}", iso do
     skip "#{cls} isn't defined" unless Object.const_defined? cls
diff --git a/test/t/syntax.rb b/test/t/syntax.rb
index 436c06601..a52e0dcea 100644
--- a/test/t/syntax.rb
+++ b/test/t/syntax.rb
@@ -345,6 +345,15 @@ assert('splat object in assignment') do
   assert_equal [2], (a = *o)
 end
 
+assert('right-ward assignment') do
+  1 => a
+  assert_equal(1, a)
+  13.divmod(5) => a,b
+  assert_equal([2,3], [a, b])
+  13.divmod(5) => a,b => c, d
+  assert_equal([2,3,2,3], [a, b, c, d])
+end
+
 assert('splat object in case statement') do
   o = Object.new
   def o.to_a
diff --git a/test/t/vformat.rb b/test/t/vformat.rb
index df6950ee6..f645351ee 100644
--- a/test/t/vformat.rb
+++ b/test/t/vformat.rb
@@ -17,7 +17,7 @@ assert('mrb_vformat') do
   assert_equal '`t`: NilClass', vf.v('`t`: %t', nil)
   assert_equal '`t`: FalseClass', vf.v('`t`: %t', false)
   assert_equal '`t`: TrueClass', vf.v('`t`: %t', true)
-  assert_equal '`t`: Fixnum', vf.v('`t`: %t', 0)
+  assert_equal '`t`: Integer', vf.v('`t`: %t', 0)
   assert_equal '`t`: Hash', vf.v('`t`: %t', {k: "value"})
   assert_match '#<Class:#<Class:#<Hash:0x*>>>', vf.v('%t', sclass({}))
   assert_equal 'string and length', vf.l('string %l length', 'andante', 3)
@@ -29,13 +29,13 @@ assert('mrb_vformat') do
   assert_equal '`T`: NilClass', vf.v('`T`: %T', nil)
   assert_equal '`T`: FalseClass', vf.v('`T`: %T', false)
   assert_equal '`T`: TrueClass', vf.v('`T`: %T', true)
-  assert_equal '`T`: Fixnum', vf.v('`T`: %T', 0)
+  assert_equal '`T`: Integer', vf.v('`T`: %T', 0)
   assert_equal '`T`: Hash', vf.v('`T`: %T', {k: "value"})
   assert_match 'Class', vf.v('%T', sclass({}))
   assert_equal '`Y`: nil', vf.v('`Y`: %Y', nil)
   assert_equal '`Y`: false', vf.v('`Y`: %Y', false)
   assert_equal '`Y`: true', vf.v('`Y`: %Y', true)
-  assert_equal '`Y`: Fixnum', vf.v('`Y`: %Y', 0)
+  assert_equal '`Y`: Integer', vf.v('`Y`: %Y', 0)
   assert_equal '`Y`: Hash', vf.v('`Y`: %Y', {k: "value"})
   assert_equal 'Class', vf.v('%Y', sclass({}))
   assert_match '#<Class:#<String:0x*>>', vf.v('%v', sclass(""))