admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix name assignment to frozen anonymous class/module

Browse Source 
Fix the following issues:

  A = Class.new.freeze              #=> FrozenError
  Module.new::B = Class.new.freeze  #=> FrozenError
  String::B = Module.new.freeze     #=> FrozenError
This commit is contained in:
KOBAYASHI Shuji
2019-04-23 20:45:38 +09:00
parent 7cf1bc39a7
commit cc7f9190ba
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/variable.c
+12 -9
View File
@@ -341,21 +341,24 @@ mrb_iv_get(mrb_state *mrb, mrb_value obj, mrb_sym sym)
static inline void assign_class_name(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v);
MRB_API void
mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v)
void
mrb_obj_iv_set_force(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v)
{
iv_tbl *t;
mrb_check_frozen(mrb, obj);
assign_class_name(mrb, obj, sym, v);
if (!obj->iv) {
obj->iv = iv_new(mrb);
}
t = obj->iv;
iv_put(mrb, t, sym, v);
iv_put(mrb, obj->iv, sym, v);
mrb_write_barrier(mrb, (struct RBasic*)obj);
}
MRB_API void
mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v)
{
mrb_check_frozen(mrb, obj);
mrb_obj_iv_set_force(mrb, obj, sym, v);
}
/* Iterates over the instance variable table. */
MRB_API void
mrb_iv_foreach(mrb_state *mrb, mrb_value obj, mrb_iv_foreach_func *func, void *p)
@@ -385,10 +388,10 @@ assign_class_name(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v)
if (mrb_nil_p(o)) {
if ((struct RClass *)obj == mrb->object_class) {
mrb_obj_iv_set(mrb, c, id_classname, mrb_symbol_value(sym));
mrb_obj_iv_set_force(mrb, c, id_classname, mrb_symbol_value(sym));
}
else {
mrb_obj_iv_set(mrb, c, id_outer, mrb_obj_value(obj));
mrb_obj_iv_set_force(mrb, c, id_outer, mrb_obj_value(obj));
}
}
}