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

Prefer rb_module_new() over rb_define_module_id()

Browse Source 
rb_define_module_id() doesn't do anything with its parameter so
it's a bit confusing.
This commit is contained in:
Alan Wu 2020-11-25 17:05:06 -05:00
parent 526d0f46f3
commit e0944bde91
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
class.c
View File

@ -859,6 +859,7 @@ rb_module_new(void)
return (VALUE)mdl; return (VALUE)mdl;
} }
// Kept for compatibility. Use rb_module_new() instead.
VALUE VALUE
rb_define_module_id(ID id) rb_define_module_id(ID id)
{ {
@ -882,7 +883,7 @@ rb_define_module(const char *name)
rb_vm_add_root_module(module); rb_vm_add_root_module(module);
return module; return module;
} }
module = rb_define_module_id(id); module = rb_module_new();
rb_vm_add_root_module(module); rb_vm_add_root_module(module);
rb_const_set(rb_cObject, id, module); rb_const_set(rb_cObject, id, module);
@ -909,7 +910,7 @@ rb_define_module_id_under(VALUE outer, ID id)
} }
return module; return module;
} }
module = rb_define_module_id(id); module = rb_module_new();
rb_const_set(outer, id, module); rb_const_set(outer, id, module);
rb_set_class_path_string(module, outer, rb_id2str(id)); rb_set_class_path_string(module, outer, rb_id2str(id));
rb_gc_register_mark_object(module); rb_gc_register_mark_object(module);

2
vm_insnhelper.c
View File

@ -4043,7 +4043,7 @@ static VALUE
vm_declare_module(ID id, VALUE cbase) vm_declare_module(ID id, VALUE cbase)
{ {
/* new module declaration */ /* new module declaration */
return declare_under(id, cbase, rb_define_module_id(id)); return declare_under(id, cbase, rb_module_new());
} }
NORETURN(static void unmatched_redefinition(const char *type, VALUE cbase, ID id, VALUE old)); NORETURN(static void unmatched_redefinition(const char *type, VALUE cbase, ID id, VALUE old));