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

Fix mrb_str_len_to_dbl to support Hexadecimal like 0x10.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-01-06 15:47:19 +09:00
parent 2532e625ed
commit ccf28775b8
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-kernel-ext/test/kernel.rb
+1
View File
@@ -80,6 +80,7 @@ assert('Kernel#Float') do
assert_operator(12.34, :eql?, Float('1_2.3_4'))
assert_operator(0.9, :eql?, Float('.9'))
assert_operator(0.9, :eql?, Float(" \t\r\n\f\v.9 \t\r\n\f\v"))
assert_operator(16.0, :eql?, Float("0x10"))
assert_raise(TypeError) { Float(nil) }
assert_raise(ArgumentError) { Float("1. 5") }
assert_raise(ArgumentError) { Float("1.5a") }
src/string.c
+9 -2
View File
@@ -2503,8 +2503,15 @@ mrb_str_len_to_dbl(mrb_state *mrb, const char *s, size_t len, mrb_bool badcheck)
while (ISSPACE(*s)) s++;
p = s;
if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
return 0.0;
if (p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
mrb_value x;
x = mrb_str_len_to_inum(mrb, p, pend-p, 0, badcheck);
if (mrb_fixnum_p(x))
d = (double)mrb_fixnum(x);
else /* if (mrb_float_p(x)) */
d = mrb_float(x);
return d;
}
while (p < pend) {
if (!*p) {