admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert part of #4225

Browse Source 
Since in mruby, Integer and Float interchange frequently (mostly on
overflow), so adding explicit `.0` can cause problems sometimes.

For example:
https://github.com/mattn/mruby-json/pull/40
https://github.com/pepabo/mruby-msd/pull/13
https://github.com/mattn/mruby-json/pull/42
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-09-07 22:25:08 +09:00
parent 8f04d6561f
commit 9d08025b8b
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numeric.c
-3
View File
@@ -246,9 +246,6 @@ flo_to_s(mrb_state *mrb, mrb_value flt)
str = mrb_float_to_str(mrb, flt, fmt);
goto insert_dot_zero;
}
else {
mrb_str_cat(mrb, str, ".0", 2);
}
return str;
}
test/t/float.rb
+7 -7
View File
@@ -212,10 +212,10 @@ assert('Float#to_s') do
assert_equal("Infinity", Float::INFINITY.to_s)
assert_equal("-Infinity", (-Float::INFINITY).to_s)
assert_equal("NaN", Float::NAN.to_s)
assert_equal("0.0", 0.0.to_s)
assert_equal("-0.0", -0.0.to_s)
assert_equal("0", 0.0.to_s)
assert_equal("-0", -0.0.to_s)
assert_equal("-3.25", -3.25.to_s)
assert_equal("50.0", 50.0.to_s)
assert_equal("50", 50.0.to_s)
assert_equal("0.0125", 0.0125.to_s)
assert_equal("-0.0125", -0.0125.to_s)
assert_equal("1.0e-10", 0.0000000001.to_s)
@@ -224,8 +224,8 @@ assert('Float#to_s') do
assert_equal("-1.0e+20", -1e20.to_s)
assert_equal("1.0e+16", 10000000000000000.0.to_s)
assert_equal("-1.0e+16", -10000000000000000.0.to_s)
assert_equal("100000.0", 100000.0.to_s)
assert_equal("-100000.0", -100000.0.to_s)
assert_equal("100000", 100000.0.to_s)
assert_equal("-100000", -100000.0.to_s)
if uses_float
assert_equal("1.0e+08", 100000000.0.to_s)
assert_equal("-1.0e+08", -100000000.0.to_s)
@@ -234,8 +234,8 @@ assert('Float#to_s') do
else
assert_equal("1.0e+15", 1000000000000000.0.to_s)
assert_equal("-1.0e+15", -1000000000000000.0.to_s)
assert_equal("100000000000000.0", 100000000000000.0.to_s)
assert_equal("-100000000000000.0", -100000000000000.0.to_s)
assert_equal("100000000000000", 100000000000000.0.to_s)
assert_equal("-100000000000000", -100000000000000.0.to_s)
end
end