summaryrefslogtreecommitdiffhomepage
path: root/src/variable.c
diff options
context:
space:
mode:
authordearblue <[email protected]>2018-09-07 23:56:06 +0900
committerdearblue <[email protected]>2018-09-07 23:56:06 +0900
commit5e6cd86f6eedea213fbeb5f1e7a5aa0ab303036a (patch)
tree1400552522a5711917f7fd100a895c7de79c2163 /src/variable.c
parent1997fcf98f596f6af2bf1d20ccde1b1abfe7324d (diff)
downloadmruby-5e6cd86f6eedea213fbeb5f1e7a5aa0ab303036a.tar.gz
mruby-5e6cd86f6eedea213fbeb5f1e7a5aa0ab303036a.zip
Fix to not define outer when outer is itself.
example: a = Class.new a::A = a
Diffstat (limited to 'src/variable.c')
-rw-r--r--src/variable.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/variable.c b/src/variable.c
index 047c96e8a..20edd56e4 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -377,21 +377,23 @@ is_namespace(enum mrb_vtype tt)
static inline void
assign_class_name(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v)
{
- if (is_namespace(obj->tt) && is_namespace(mrb_type(v)) && ISUPPER(mrb_sym2name(mrb, sym)[0])) {
+ if (is_namespace(obj->tt) && is_namespace(mrb_type(v))) {
struct RObject *c = mrb_obj_ptr(v);
- mrb_sym id_classname = mrb_intern_lit(mrb, "__classname__");
- mrb_value o = mrb_obj_iv_get(mrb, c, id_classname);
-
- if (mrb_nil_p(o)) {
- mrb_sym id_outer = mrb_intern_lit(mrb, "__outer__");
- o = mrb_obj_iv_get(mrb, c, id_outer);
+ if (obj != c && ISUPPER(mrb_sym2name(mrb, sym)[0])) {
+ mrb_sym id_classname = mrb_intern_lit(mrb, "__classname__");
+ mrb_value o = mrb_obj_iv_get(mrb, c, id_classname);
if (mrb_nil_p(o)) {
- if ((struct RClass *)obj == mrb->object_class) {
- mrb_obj_iv_set(mrb, c, id_classname, mrb_symbol_value(sym));
- }
- else {
- mrb_obj_iv_set(mrb, c, id_outer, mrb_obj_value(obj));
+ mrb_sym id_outer = mrb_intern_lit(mrb, "__outer__");
+ o = mrb_obj_iv_get(mrb, c, id_outer);
+
+ if (mrb_nil_p(o)) {
+ if ((struct RClass *)obj == mrb->object_class) {
+ mrb_obj_iv_set(mrb, c, id_classname, mrb_symbol_value(sym));
+ }
+ else {
+ mrb_obj_iv_set(mrb, c, id_outer, mrb_obj_value(obj));
+ }
}
}
}