archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 44609,44610,44612,44613,44617:

Browse source 
test_numeric.rb: coercion failures

	* test/ruby/test_numeric.rb (test_coerce): new assertions for
  failure of coercion.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-01-19 17:14:02 +00:00
parent 8302aa5f95
commit 24365fb24b
3 changed files with 52 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
numeric.c
View file

@ -223,17 +223,19 @@ coerce_body(VALUE *x)
return rb_funcall(x[1], id_coerce, 1, x[0]);
}
NORETURN(static void coerce_failed(VALUE x, VALUE y));
static void
coerce_failed(VALUE x, VALUE y)
{
rb_raise(rb_eTypeError, "%"PRIsVALUE" can't be coerced into %"PRIsVALUE,
(rb_special_const_p(y)? rb_inspect(y) : rb_obj_class(y)),
rb_obj_class(x));
}
static VALUE
coerce_rescue(VALUE *x)
{
volatile VALUE v = rb_inspect(x[1]);
rb_raise(rb_eTypeError, "%s can't be coerced into %s",
rb_special_const_p(x[1])?
RSTRING_PTR(v):
rb_obj_classname(x[1]),
rb_obj_classname(x[0]));
coerce_failed(x[0], x[1]);
return Qnil; /* dummy */
}
@ -306,9 +308,9 @@ num_sadded(VALUE x, VALUE name)
/* Numerics should be values; singleton_methods should not be added to them */
rb_remove_method_id(rb_singleton_class(x), mid);
rb_raise(rb_eTypeError,
"can't define singleton method \"%s\" for %s",
rb_id2name(mid),
rb_obj_classname(x));
"can't define singleton method \"%"PRIsVALUE"\" for %"PRIsVALUE,
rb_id2str(mid),
rb_obj_class(x));
UNREACHABLE;
}
@ -318,7 +320,7 @@ static VALUE
num_init_copy(VALUE x, VALUE y)
{
/* Numerics are immutable values, which should not be copied */
rb_raise(rb_eTypeError, "can't copy %s", rb_obj_classname(x));
rb_raise(rb_eTypeError, "can't copy %"PRIsVALUE, rb_obj_class(x));
UNREACHABLE;
}
@ -3196,11 +3198,7 @@ bit_coerce(VALUE *x, VALUE *y, int err)
if (!FIXNUM_P(*x) && !RB_TYPE_P(*x, T_BIGNUM)
&& !FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) {
if (!err) return FALSE;
rb_raise(rb_eTypeError,
"%s can't be coerced into %s for bitwise arithmetic",
rb_special_const_p(*y) ?
RSTRING_PTR(rb_inspect(*y)) : rb_obj_classname(*y),
rb_obj_classname(*x));
coerce_failed(*x, *y);
}
}
return TRUE;