Merge branch 'mrb_without_float' of https://github.com/pandax381/mruby into pandax381-mrb_without_float

1 files changed, 31 insertions, 22 deletions

diff --git a/test/t/integer.rb b/test/t/integer.rb
index d4ef8b519..cea97a1e6 100644
--- a/test/t/integer.rb
+++ b/test/t/integer.rb
@@ -7,56 +7,65 @@ end
 
 assert('Integer#+', '15.2.8.3.1') do
   a = 1+1
-  b = 1+1.0
+  b = 1+1.0 if class_defined?("Float")
 
   assert_equal 2, a
-  assert_equal 2.0, b
+  assert_equal 2.0, b if class_defined?("Float")
 
   assert_raise(TypeError){ 0+nil }
   assert_raise(TypeError){ 1+nil }
 
   c = Mrbtest::FIXNUM_MAX + 1
   d = Mrbtest::FIXNUM_MAX.__send__(:+, 1)
-  e = Mrbtest::FIXNUM_MAX + 1.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
+
+  if class_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
 end
 
 assert('Integer#-', '15.2.8.3.2') do
   a = 2-1
-  b = 2-1.0
+  b = 2-1.0 if class_defined?("Float")
 
   assert_equal 1, a
-  assert_equal 1.0, b
+  assert_equal 1.0, b if class_defined?("Float")
 
   c = Mrbtest::FIXNUM_MIN - 1
   d = Mrbtest::FIXNUM_MIN.__send__(:-, 1)
-  e = Mrbtest::FIXNUM_MIN - 1.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
+
+  if class_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
 end
 
 assert('Integer#*', '15.2.8.3.3') do
   a = 1*1
-  b = 1*1.0
+  b = 1*1.0 if class_defined?("Float")
 
   assert_equal 1, a
-  assert_equal 1.0, b
+  assert_equal 1.0, b if class_defined?("Float")
 
   assert_raise(TypeError){ 0*nil }
   assert_raise(TypeError){ 1*nil }
 
   c = Mrbtest::FIXNUM_MAX * 2
   d = Mrbtest::FIXNUM_MAX.__send__(:*, 2)
-  e = Mrbtest::FIXNUM_MAX * 2.0
-  assert_equal Float, c.class
-  assert_equal Float, d.class
-  assert_float e, c
-  assert_float e, d
+
+  if class_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
 end
 
 assert('Integer#/', '15.2.8.3.4') do
@@ -218,7 +227,7 @@ end
 
 assert('Integer#to_f', '15.2.8.3.23') do
   assert_equal 1.0, 1.to_f
-end
+end if class_defined?("Float")
 
 assert('Integer#to_i', '15.2.8.3.24') do
   assert_equal 1, 1.to_i