archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Bug #21094] Update nested module names when setting temporary name

Browse source
This commit is contained in:
Nobuyoshi Nakada 2025-01-29 16:55:44 +09:00
parent 6670926a91
commit f69ad0e810
No known key found for this signature in database
GPG key ID: 3582D74E1FEE4465
Notes: git 2025-03-18 15:21:41 +00:00
3 changed files with 100 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

82
variable.c
View file

@ -166,6 +166,80 @@ is_constant_path(VALUE name)
return true;
}
struct sub_temporary_name_args {
VALUE names;
ID last;
};
static VALUE build_const_path(VALUE head, ID tail);
static void set_sub_temporary_name_foreach(VALUE mod, struct sub_temporary_name_args *args, VALUE name);
static VALUE
set_sub_temporary_name_recursive(VALUE mod, VALUE data, int recursive)
{
if (recursive) return Qfalse;
struct sub_temporary_name_args *args = (void *)data;
VALUE name = 0;
if (args->names) {
name = build_const_path(rb_ary_last(0, 0, args->names), args->last);
}
set_sub_temporary_name_foreach(mod, args, name);
return Qtrue;
}
static VALUE
set_sub_temporary_name_topmost(VALUE mod, VALUE data, int recursive)
{
if (recursive) return Qfalse;
struct sub_temporary_name_args *args = (void *)data;
VALUE name = args->names;
if (name) {
args->names = rb_ary_hidden_new(0);
}
set_sub_temporary_name_foreach(mod, args, name);
return Qtrue;
}
static enum rb_id_table_iterator_result
set_sub_temporary_name_i(ID id, VALUE val, void *data)
{
val = ((rb_const_entry_t *)val)->value;
if (rb_namespace_p(val) && !RCLASS_EXT(val)->permanent_classpath) {
VALUE arg = (VALUE)data;
struct sub_temporary_name_args *args = data;
args->last = id;
rb_exec_recursive_paired(set_sub_temporary_name_recursive, val, arg, arg);
}
return ID_TABLE_CONTINUE;
}
static void
set_sub_temporary_name_foreach(VALUE mod, struct sub_temporary_name_args *args, VALUE name)
{
RCLASS_SET_CLASSPATH(mod, name, FALSE);
struct rb_id_table *tbl = RCLASS_CONST_TBL(mod);
if (!tbl) return;
if (!name) {
rb_id_table_foreach(tbl, set_sub_temporary_name_i, args);
}
else {
long names_len = RARRAY_LEN(args->names); // paranoiac check?
rb_ary_push(args->names, name);
rb_id_table_foreach(tbl, set_sub_temporary_name_i, args);
rb_ary_set_len(args->names, names_len);
}
}
static void
set_sub_temporary_name(VALUE mod, VALUE name)
{
struct sub_temporary_name_args args = {name};
VALUE arg = (VALUE)&args;
rb_exec_recursive_paired(set_sub_temporary_name_topmost, mod, arg, arg);
}
/*
* call-seq:
* mod.set_temporary_name(string) -> self
@ -224,7 +298,9 @@ rb_mod_set_temporary_name(VALUE mod, VALUE name)
if (NIL_P(name)) {
// Set the temporary classpath to NULL (anonymous):
RCLASS_SET_CLASSPATH(mod, 0, FALSE);
RB_VM_LOCK_ENTER();
set_sub_temporary_name(mod, 0);
RB_VM_LOCK_LEAVE();
}
else {
// Ensure the name is a string:
@ -241,7 +317,9 @@ rb_mod_set_temporary_name(VALUE mod, VALUE name)
name = rb_str_new_frozen(name);
// Set the temporary classpath to the given name:
RCLASS_SET_CLASSPATH(mod, name, FALSE);
RB_VM_LOCK_ENTER();
set_sub_temporary_name(mod, name);
RB_VM_LOCK_LEAVE();
}
return mod;