1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

object.c: CLASS_OR_MODULE_P

* object.c (rb_mod_to_s, rb_class_inherited_p, rb_mod_ge, rb_mod_cmp):
  use BUILTIN_TYPE() instead of TYPE() for optimization.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-01-15 14:07:24 +00:00
parent e4ebf6d946
commit d2a176028f

View file

@ -39,6 +39,10 @@ static ID id_eq, id_eql, id_match, id_inspect;
static ID id_init_copy, id_init_clone, id_init_dup; static ID id_init_copy, id_init_clone, id_init_dup;
static ID id_const_missing; static ID id_const_missing;
#define CLASS_OR_MODULE_P(obj) \
(!SPECIAL_CONST_P(obj) && \
(BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE))
/* /*
* call-seq: * call-seq:
* obj === other -> true or false * obj === other -> true or false
@ -1352,13 +1356,11 @@ rb_mod_to_s(VALUE klass)
VALUE s = rb_usascii_str_new2("#<Class:"); VALUE s = rb_usascii_str_new2("#<Class:");
VALUE v = rb_iv_get(klass, "__attached__"); VALUE v = rb_iv_get(klass, "__attached__");
switch (TYPE(v)) { if (CLASS_OR_MODULE_P(v)) {
case T_CLASS: case T_MODULE:
rb_str_append(s, rb_inspect(v)); rb_str_append(s, rb_inspect(v));
break; }
default: else {
rb_str_append(s, rb_any_to_s(v)); rb_str_append(s, rb_any_to_s(v));
break;
} }
rb_str_cat2(s, ">"); rb_str_cat2(s, ">");
@ -1429,11 +1431,7 @@ rb_class_inherited_p(VALUE mod, VALUE arg)
VALUE start = mod; VALUE start = mod;
if (mod == arg) return Qtrue; if (mod == arg) return Qtrue;
switch (TYPE(arg)) { if (!CLASS_OR_MODULE_P(arg)) {
case T_MODULE:
case T_CLASS:
break;
default:
rb_raise(rb_eTypeError, "compared with non class/module"); rb_raise(rb_eTypeError, "compared with non class/module");
} }
while (mod) { while (mod) {
@ -1484,11 +1482,7 @@ rb_mod_lt(VALUE mod, VALUE arg)
static VALUE static VALUE
rb_mod_ge(VALUE mod, VALUE arg) rb_mod_ge(VALUE mod, VALUE arg)
{ {
switch (TYPE(arg)) { if (!CLASS_OR_MODULE_P(arg)) {
case T_MODULE:
case T_CLASS:
break;
default:
rb_raise(rb_eTypeError, "compared with non class/module"); rb_raise(rb_eTypeError, "compared with non class/module");
} }
@ -1530,11 +1524,7 @@ rb_mod_cmp(VALUE mod, VALUE arg)
VALUE cmp; VALUE cmp;
if (mod == arg) return INT2FIX(0); if (mod == arg) return INT2FIX(0);
switch (TYPE(arg)) { if (!CLASS_OR_MODULE_P(arg)) {
case T_MODULE:
case T_CLASS:
break;
default:
return Qnil; return Qnil;
} }