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

extracted declare_under

Browse source
This commit is contained in:
Nobuyoshi Nakada 2019-10-10 01:08:42 +09:00
parent 8dc5fe6e89
commit 42edb05626
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
vm_insnhelper.c
View file

@ -3548,15 +3548,20 @@ vm_check_if_module(ID id, VALUE mod)
}
}
static VALUE
declare_under(ID id, VALUE cbase, VALUE c)
{
rb_set_class_path_string(c, cbase, rb_id2str(id));
rb_const_set(cbase, id, c);
return c;
}
static VALUE
vm_declare_class(ID id, rb_num_t flags, VALUE cbase, VALUE super)
{
/* new class declaration */
VALUE s = VM_DEFINECLASS_HAS_SUPERCLASS_P(flags) ? super : rb_cObject;
VALUE c = rb_define_class_id(id, s);
rb_set_class_path_string(c, cbase, rb_id2str(id));
rb_const_set(cbase, id, c);
VALUE c = declare_under(id, cbase, rb_define_class_id(id, s));
rb_class_inherited(s, c);
return c;
}
@ -3565,10 +3570,7 @@ static VALUE
vm_declare_module(ID id, VALUE cbase)
{
/* new module declaration */
VALUE mod = rb_define_module_id(id);
rb_set_class_path_string(mod, cbase, rb_id2str(id));
rb_const_set(cbase, id, mod);
return mod;
return declare_under(id, cbase, rb_define_module_id(id));
}
NORETURN(static void unmatched_redefinition(const char *type, VALUE cbase, ID id, VALUE old));