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

object.c: conversions with ID

Browse Source 
* object.c (rb_to_integer, rb_check_to_int): convert to Integer
  with method ID.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62683 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-03-07 07:43:07 +00:00
parent 75d2bec7a9
commit a13b044109
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
object.c
View File

@ -3035,15 +3035,16 @@ rb_check_convert_type_with_id(VALUE val, int type, const char *tname, ID method)
return v; return v;
} }
#define try_to_int(val, mid, raise) \
convert_type_with_id(val, "Integer", mid, raise, -1)
static VALUE static VALUE
rb_to_integer(VALUE val, const char *method) rb_to_integer(VALUE val, const char *method, ID mid)
{ {
VALUE v; VALUE v;
if (FIXNUM_P(val)) return val; if (RB_INTEGER_TYPE_P(val)) return val;
if (RB_TYPE_P(val, T_BIGNUM)) return val; v = try_to_int(val, mid, TRUE);
v = convert_type(val, "Integer", method, TRUE);
if (!RB_INTEGER_TYPE_P(v)) { if (!RB_INTEGER_TYPE_P(v)) {
conversion_mismatch(val, "Integer", method, v); conversion_mismatch(val, "Integer", method, v);
} }
@ -3085,7 +3086,7 @@ rb_check_to_integer(VALUE val, const char *method)
VALUE VALUE
rb_to_int(VALUE val) rb_to_int(VALUE val)
{ {
return rb_to_integer(val, "to_int"); return rb_to_integer(val, "to_int", idTo_int);
} }
/** /**
@ -3100,7 +3101,10 @@ rb_to_int(VALUE val)
VALUE VALUE
rb_check_to_int(VALUE val) rb_check_to_int(VALUE val)
{ {
return rb_check_to_integer(val, "to_int"); if (RB_INTEGER_TYPE_P(val)) return val;
val = try_to_int(val, idTo_int, FALSE);
if (RB_INTEGER_TYPE_P(val)) return val;
return Qnil;
} }
static VALUE static VALUE
@ -3134,7 +3138,7 @@ rb_convert_to_integer(VALUE val, int base)
} }
tmp = convert_type_with_id(val, "Integer", idTo_int, FALSE, -1); tmp = convert_type_with_id(val, "Integer", idTo_int, FALSE, -1);
if (!RB_INTEGER_TYPE_P(tmp)) { if (!RB_INTEGER_TYPE_P(tmp)) {
return rb_to_integer(val, "to_i"); return rb_to_integer(val, "to_i", idTo_i);
} }
return tmp; return tmp;