summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2019-10-07 20:57:04 +0900
committerKOBAYASHI Shuji <[email protected]>2019-10-08 17:34:13 +0900
commitfb103c1319321118c0157772a7ffdbfddfc6f6af (patch)
treef87dfe9139cb4003e26e8b1a7fa7fa9d84541d4a /src
parentb7a8d538c1f079c51ede221d60179877bed18642 (diff)
downloadmruby-fb103c1319321118c0157772a7ffdbfddfc6f6af.tar.gz
mruby-fb103c1319321118c0157772a7ffdbfddfc6f6af.zip
Implement Ruby2.7's frozen strings from `Module#name`
Diffstat (limited to 'src')
-rw-r--r--src/class.c3
-rw-r--r--src/variable.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/class.c b/src/class.c
index 74ff5e11a..d03b99750 100644
--- a/src/class.c
+++ b/src/class.c
@@ -76,6 +76,7 @@ mrb_class_name_class(mrb_state *mrb, struct RClass *outer, struct RClass *c, mrb
name = mrb_str_dup(mrb, name);
mrb_str_cat_cstr(mrb, name, "::");
mrb_str_cat_cstr(mrb, name, mrb_sym_name(mrb, id));
+ MRB_SET_FROZEN_FLAG(mrb_obj_ptr(name));
}
mrb_obj_iv_set_force(mrb, (struct RObject*)c, nsym, name);
}
@@ -1712,7 +1713,7 @@ mrb_class_path(mrb_state *mrb, struct RClass *c)
/* toplevel class/module */
return mrb_sym_str(mrb, mrb_symbol(path));
}
- return mrb_str_dup(mrb, path);
+ return path;
}
MRB_API struct RClass*
diff --git a/src/variable.c b/src/variable.c
index 7d4470186..0d8b76863 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -1123,7 +1123,7 @@ mrb_class_find_path(mrb_state *mrb, struct RClass *c)
iv_del(mrb, c->iv, mrb_intern_lit(mrb, "__outer__"), NULL);
iv_put(mrb, c->iv, mrb_intern_lit(mrb, "__classname__"), path);
mrb_field_write_barrier_value(mrb, (struct RBasic*)c, path);
- path = mrb_str_dup(mrb, path);
+ MRB_SET_FROZEN_FLAG(mrb_obj_ptr(path));
}
return path;
}