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

variable.c: hoisted out rb_namespace_p

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-03-09 00:12:52 +00:00
parent 5cfa518406
commit 5aecf03ec3
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
variable.c
View file

@ -63,6 +63,16 @@ Init_var_tables(void)
classid = rb_intern_const("__classid__"); classid = rb_intern_const("__classid__");
} }
static inline bool
rb_namespace_p(VALUE obj)
{
if (RB_SPECIAL_CONST_P(obj)) return false;
switch (RB_BUILTIN_TYPE(obj)) {
case T_MODULE: case T_CLASS: return true;
}
return false;
}
struct fc_result { struct fc_result {
ID name, preferred; ID name, preferred;
VALUE klass; VALUE klass;
@ -110,7 +120,7 @@ fc_i(ID key, VALUE v, void *a)
res->path = fc_path(res, key); res->path = fc_path(res, key);
return ID_TABLE_STOP; return ID_TABLE_STOP;
} }
if (RB_TYPE_P(value, T_MODULE) || RB_TYPE_P(value, T_CLASS)) { if (rb_namespace_p(value)) {
if (!RCLASS_CONST_TBL(value)) return ID_TABLE_CONTINUE; if (!RCLASS_CONST_TBL(value)) return ID_TABLE_CONTINUE;
else { else {
struct fc_result arg; struct fc_result arg;
@ -423,7 +433,7 @@ rb_path_to_class(VALUE pathname)
} }
c = rb_const_search(c, id, TRUE, FALSE, FALSE); c = rb_const_search(c, id, TRUE, FALSE, FALSE);
if (c == Qundef) goto undefined_class; if (c == Qundef) goto undefined_class;
if (!RB_TYPE_P(c, T_MODULE) && !RB_TYPE_P(c, T_CLASS)) { if (!rb_namespace_p(c)) {
rb_raise(rb_eTypeError, "%"PRIsVALUE" does not refer to class/module", rb_raise(rb_eTypeError, "%"PRIsVALUE" does not refer to class/module",
pathname); pathname);
} }
@ -2854,7 +2864,7 @@ rb_const_set(VALUE klass, ID id, VALUE val)
* Resolve and cache class name immediately to resolve ambiguity * Resolve and cache class name immediately to resolve ambiguity
* and avoid order-dependency on const_tbl * and avoid order-dependency on const_tbl
*/ */
if (rb_cObject && (RB_TYPE_P(val, T_MODULE) || RB_TYPE_P(val, T_CLASS))) { if (rb_cObject && rb_namespace_p(val)) {
if (NIL_P(rb_class_path_cached(val))) { if (NIL_P(rb_class_path_cached(val))) {
if (klass == rb_cObject) { if (klass == rb_cObject) {
rb_ivar_set(val, classpath, rb_id2str(id)); rb_ivar_set(val, classpath, rb_id2str(id));
@ -3098,7 +3108,7 @@ cvar_front_klass(VALUE klass)
{ {
if (FL_TEST(klass, FL_SINGLETON)) { if (FL_TEST(klass, FL_SINGLETON)) {
VALUE obj = rb_ivar_get(klass, id__attached__); VALUE obj = rb_ivar_get(klass, id__attached__);
if (RB_TYPE_P(obj, T_MODULE) || RB_TYPE_P(obj, T_CLASS)) { if (rb_namespace_p(obj)) {
return obj; return obj;
} }
} }