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

Add PARENT_MODULE_SUBCLASSES Macro

Browse Source
This commit is contained in:
Matt Valentine-House 2021-01-26 16:12:29 +00:00 committed by Aaron Patterson
parent 49950266be
commit 6edd425674
Notes: git 2021-02-02 01:43:31 +09:00 
Merged: https://github.com/ruby/ruby/pull/4124
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
class.c
View File

@ -76,11 +76,11 @@ rb_module_add_to_subclasses_list(VALUE module, VALUE iclass)
head = RCLASS_EXT(module)->subclasses;
if (head) {
entry->next = head;
RCLASS_EXT(head->klass)->module_subclasses = &entry->next;
RCLASS_MODULE_SUBCLASSES(head->klass) = &entry->next;
}
RCLASS_EXT(module)->subclasses = entry;
RCLASS_EXT(iclass)->module_subclasses = &RCLASS_EXT(module)->subclasses;
RCLASS_MODULE_SUBCLASSES(iclass) = &RCLASS_EXT(module)->subclasses;
}
void
@ -106,18 +106,18 @@ rb_class_remove_from_module_subclasses(VALUE klass)
{
rb_subclass_entry_t *entry;
if (RCLASS_EXT(klass)->module_subclasses) {
entry = *RCLASS_EXT(klass)->module_subclasses;
*RCLASS_EXT(klass)->module_subclasses = entry->next;
if (RCLASS_MODULE_SUBCLASSES(klass)) {
entry = *RCLASS_MODULE_SUBCLASSES(klass);
*RCLASS_MODULE_SUBCLASSES(klass) = entry->next;
if (entry->next) {
RCLASS_EXT(entry->next->klass)->module_subclasses = RCLASS_EXT(klass)->module_subclasses;
RCLASS_MODULE_SUBCLASSES(entry->next->klass) = RCLASS_MODULE_SUBCLASSES(klass);
}
xfree(entry);
}
RCLASS_EXT(klass)->module_subclasses = NULL;
RCLASS_MODULE_SUBCLASSES(klass) = NULL;
}
void
@ -183,7 +183,7 @@ class_alloc(VALUE flags, VALUE klass)
RCLASS_SET_SUPER((VALUE)obj, 0);
RCLASS_EXT(obj)->subclasses = NULL;
RCLASS_PARENT_SUBCLASSES(obj) = NULL;
RCLASS_EXT(obj)->module_subclasses = NULL;
RCLASS_MODULE_SUBCLASSES(obj) = NULL;
*/
RCLASS_SET_ORIGIN((VALUE)obj, (VALUE)obj);
RCLASS_SERIAL(obj) = rb_next_class_serial();

1
internal/class.h
View File

@ -93,6 +93,7 @@ typedef struct rb_classext_struct rb_classext_t;
#endif
#define RCLASS_INCLUDER(c) (RCLASS_EXT(c)->includer)
#define RCLASS_PARENT_SUBCLASSES(c) (RCLASS_EXT(c)->parent_subclasses)
#define RCLASS_MODULE_SUBCLASSES(c) (RCLASS_EXT(c)->module_subclasses)
#define RICLASS_IS_ORIGIN FL_USER5
#define RCLASS_CLONED FL_USER6