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

Merged common statements [Bug #16242]

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-11-28 21:31:53 +09:00
parent f0a5a07fa5
commit 2fa3b4565a
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
class.c
View File

@ -825,20 +825,14 @@ VALUE
rb_include_class_new(VALUE module, VALUE super) rb_include_class_new(VALUE module, VALUE super)
{ {
VALUE klass = class_alloc(T_ICLASS, rb_cClass); VALUE klass = class_alloc(T_ICLASS, rb_cClass);
RCLASS_SET_ORIGIN(klass, klass);
RCLASS_M_TBL(OBJ_WB_UNPROTECT(klass)) = RCLASS_M_TBL(OBJ_WB_UNPROTECT(klass)) =
RCLASS_M_TBL(OBJ_WB_UNPROTECT(module)); /* TODO: unprotected? */ RCLASS_M_TBL(OBJ_WB_UNPROTECT(module)); /* TODO: unprotected? */
RCLASS_SET_ORIGIN(klass, module == RCLASS_ORIGIN(module) ? klass : RCLASS_ORIGIN(module));
if (BUILTIN_TYPE(module) == T_ICLASS) { if (BUILTIN_TYPE(module) == T_ICLASS) {
if (module != RCLASS_ORIGIN(module)) {
RCLASS_SET_ORIGIN(klass, RCLASS_ORIGIN(module));
}
module = RBASIC(module)->klass; module = RBASIC(module)->klass;
} }
else if (module != RCLASS_ORIGIN(module)) {
RCLASS_SET_ORIGIN(klass, RCLASS_ORIGIN(module));
}
if (!RCLASS_IV_TBL(module)) { if (!RCLASS_IV_TBL(module)) {
RCLASS_IV_TBL(module) = st_init_numtable(); RCLASS_IV_TBL(module) = st_init_numtable();
} }