1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

numeric.c: refine error message

Browse Source 
* numeric.c (rb_num_get_rounding_option): refine error message at
  invalid rounding mode.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-11-21 02:17:29 +00:00
parent 2a546caae6
commit b2270a36e7
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
numeric.c
View File

@ -189,28 +189,34 @@ rb_num_get_rounding_option(VALUE opts)
{ {
static ID round_kwds[1]; static ID round_kwds[1];
VALUE rounding; VALUE rounding;
VALUE str;
const char *s; const char *s;
long l;
if (!NIL_P(opts)) { if (!NIL_P(opts)) {
if (!round_kwds[0]) { if (!round_kwds[0]) {
round_kwds[0] = rb_intern_const("half"); round_kwds[0] = rb_intern_const("half");
} }
if (!rb_get_kwargs(opts, round_kwds, 0, 1, &rounding)) goto noopt; if (!rb_get_kwargs(opts, round_kwds, 0, 1, &rounding)) goto noopt;
if (SYMBOL_P(rounding)) rounding = rb_sym2str(rounding); if (SYMBOL_P(rounding)) {
s = StringValueCStr(rounding); str = rb_sym2str(rounding);
l = RSTRING_LEN(rounding); }
switch (l) { else if (!RB_TYPE_P(str = rounding, T_STRING)) {
str = rb_check_string_type(rounding);
if (NIL_P(str)) goto invalid;
}
s = RSTRING_PTR(str);
switch (RSTRING_LEN(str)) {
case 2: case 2:
if (strncasecmp(s, "up", 2) == 0) if (rb_memcicmp(s, "up", 2) == 0)
return RUBY_NUM_ROUND_HALF_UP; return RUBY_NUM_ROUND_HALF_UP;
break; break;
case 4: case 4:
if (strncasecmp(s, "even", 4) == 0) if (rb_memcicmp(s, "even", 4) == 0)
return RUBY_NUM_ROUND_HALF_EVEN; return RUBY_NUM_ROUND_HALF_EVEN;
break; break;
} }
rb_raise(rb_eArgError, "unknown rounding mode: %"PRIsVALUE, rounding); invalid:
rb_raise(rb_eArgError, "invalid rounding mode: % "PRIsVALUE, rounding);
} }
noopt: noopt:
return RUBY_NUM_ROUND_DEFAULT; return RUBY_NUM_ROUND_DEFAULT;

6
test/ruby/test_float.rb
View File

@ -701,6 +701,12 @@ class TestFloat < Test::Unit::TestCase
assert_equal(-7.1364, -7.1364499.round(4, half: :up)) assert_equal(-7.1364, -7.1364499.round(4, half: :up))
end end
def test_round_half_invalid
assert_raise_with_message(ArgumentError, /xxx/) {
1.0.round(half: "\0xxx")
}
end
def test_Float def test_Float
assert_in_delta(0.125, Float("0.1_2_5"), 0.00001) assert_in_delta(0.125, Float("0.1_2_5"), 0.00001)
assert_in_delta(0.125, "0.1_2_5__".to_f, 0.00001) assert_in_delta(0.125, "0.1_2_5__".to_f, 0.00001)