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

class_or_module_required

Browse Source 
* object.c (class_or_module_required): extract check for class or
  module.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-06-01 00:31:00 +00:00
parent 53b61ccb78
commit 5b95238aa7
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jun 1 09:30:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (class_or_module_required): extract check for class or
module.
Fri Jun 1 08:50:47 2012 Eric Hodel <drbrain@segment7.net> Fri Jun 1 08:50:47 2012 Eric Hodel <drbrain@segment7.net>
* array.c: Updated Array documentation formatting. Patch by Zachary * array.c: Updated Array documentation formatting. Patch by Zachary

37
object.c
View File

@ -509,6 +509,22 @@ rb_obj_inspect(VALUE obj)
return rb_funcall(obj, rb_intern("to_s"), 0, 0); return rb_funcall(obj, rb_intern("to_s"), 0, 0);
} }
static VALUE
class_or_module_required(VALUE c)
{
if (SPECIAL_CONST_P(c)) goto not_class;
switch (BUILTIN_TYPE(c)) {
case T_MODULE:
case T_CLASS:
case T_ICLASS:
break;
default:
not_class:
rb_raise(rb_eTypeError, "class or module required");
}
return c;
}
/* /*
* call-seq: * call-seq:
@ -530,15 +546,7 @@ rb_obj_inspect(VALUE obj)
VALUE VALUE
rb_obj_is_instance_of(VALUE obj, VALUE c) rb_obj_is_instance_of(VALUE obj, VALUE c)
{ {
switch (TYPE(c)) { c = class_or_module_required(c);
case T_MODULE:
case T_CLASS:
case T_ICLASS:
break;
default:
rb_raise(rb_eTypeError, "class or module required");
}
if (rb_obj_class(obj) == c) return Qtrue; if (rb_obj_class(obj) == c) return Qtrue;
return Qfalse; return Qfalse;
} }
@ -577,16 +585,7 @@ rb_obj_is_kind_of(VALUE obj, VALUE c)
{ {
VALUE cl = CLASS_OF(obj); VALUE cl = CLASS_OF(obj);
switch (TYPE(c)) { c = class_or_module_required(c);
case T_MODULE:
case T_CLASS:
case T_ICLASS:
break;
default:
rb_raise(rb_eTypeError, "class or module required");
}
while (cl) { while (cl) {
if (cl == c || RCLASS_M_TBL(cl) == RCLASS_M_TBL(c)) if (cl == c || RCLASS_M_TBL(cl) == RCLASS_M_TBL(c))
return Qtrue; return Qtrue;