From 2a24b40d300b1e0072a4a0f7de43b126479bc390 Mon Sep 17 00:00:00 2001 From: dearblue Date: Wed, 5 Sep 2018 22:13:46 +0900 Subject: Not set a class/module name into anonymous class/module --- src/variable.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/variable.c') diff --git a/src/variable.c b/src/variable.c index 00bdb4b8d..4bb3e4bef 100644 --- a/src/variable.c +++ b/src/variable.c @@ -1069,8 +1069,10 @@ mrb_class_find_path(mrb_state *mrb, struct RClass *c) str = mrb_sym2name_len(mrb, name, &len); mrb_str_cat(mrb, path, str, len); - 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); + if (RSTRING_PTR(path)[0] != '#') { + 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); + } return path; } -- cgit v1.2.3 From 9b0ef58a48aced26538f3f9ed2490ce34e2e5840 Mon Sep 17 00:00:00 2001 From: dearblue Date: Thu, 6 Sep 2018 00:09:49 +0900 Subject: A class/module name is now defined for meta programing --- src/variable.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'src/variable.c') diff --git a/src/variable.c b/src/variable.c index 4bb3e4bef..a2d002892 100644 --- a/src/variable.c +++ b/src/variable.c @@ -344,6 +344,8 @@ mrb_iv_get(mrb_state *mrb, mrb_value obj, mrb_sym sym) return mrb_nil_value(); } +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) { @@ -352,6 +354,7 @@ mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v) if (MRB_FROZEN_P(obj)) { mrb_raisef(mrb, E_FROZEN_ERROR, "can't modify frozen %S", mrb_obj_value(obj)); } + assign_class_name(mrb, obj, sym, v); if (!obj->iv) { obj->iv = iv_new(mrb); } @@ -360,6 +363,36 @@ mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v) mrb_write_barrier(mrb, (struct RBasic*)obj); } +static inline mrb_bool +is_namespace(enum mrb_vtype tt) +{ + return tt == MRB_TT_CLASS || tt == MRB_TT_MODULE ? TRUE : FALSE; +} + +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])) { + 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 (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_API void mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v) { -- cgit v1.2.3 From 1997fcf98f596f6af2bf1d20ccde1b1abfe7324d Mon Sep 17 00:00:00 2001 From: dearblue Date: Fri, 7 Sep 2018 22:00:18 +0900 Subject: Add MRB_IMPROVE_META_PROGRAMMING configuration --- include/mrbconf.h | 3 +++ src/variable.c | 10 ++++++++++ 2 files changed, 13 insertions(+) (limited to 'src/variable.c') diff --git a/include/mrbconf.h b/include/mrbconf.h index cc28acfaa..379386896 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -110,6 +110,9 @@ /* fixed size state atexit stack */ //#define MRB_FIXED_STATE_ATEXIT_STACK +/* improve meta programming support */ +//#define MRB_IMPROVE_META_PROGRAMMING + /* -DMRB_DISABLE_XXXX to drop following features */ //#define MRB_DISABLE_STDIO /* use of stdio */ diff --git a/src/variable.c b/src/variable.c index a2d002892..047c96e8a 100644 --- a/src/variable.c +++ b/src/variable.c @@ -344,7 +344,9 @@ mrb_iv_get(mrb_state *mrb, mrb_value obj, mrb_sym sym) return mrb_nil_value(); } +#ifdef MRB_IMPROVE_META_PROGRAMMING static inline void assign_class_name(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v); +#endif MRB_API void mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v) @@ -354,7 +356,9 @@ mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v) if (MRB_FROZEN_P(obj)) { mrb_raisef(mrb, E_FROZEN_ERROR, "can't modify frozen %S", mrb_obj_value(obj)); } +#ifdef MRB_IMPROVE_META_PROGRAMMING assign_class_name(mrb, obj, sym, v); +#endif if (!obj->iv) { obj->iv = iv_new(mrb); } @@ -363,6 +367,7 @@ mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v) mrb_write_barrier(mrb, (struct RBasic*)obj); } +#ifdef MRB_IMPROVE_META_PROGRAMMING static inline mrb_bool is_namespace(enum mrb_vtype tt) { @@ -392,6 +397,7 @@ assign_class_name(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v) } } } +#endif MRB_API void mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v) @@ -1102,10 +1108,14 @@ mrb_class_find_path(mrb_state *mrb, struct RClass *c) str = mrb_sym2name_len(mrb, name, &len); mrb_str_cat(mrb, path, str, len); +#ifdef MRB_IMPROVE_META_PROGRAMMING if (RSTRING_PTR(path)[0] != '#') { +#endif 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); +#ifdef MRB_IMPROVE_META_PROGRAMMING } +#endif return path; } -- cgit v1.2.3 From 5e6cd86f6eedea213fbeb5f1e7a5aa0ab303036a Mon Sep 17 00:00:00 2001 From: dearblue Date: Fri, 7 Sep 2018 23:56:06 +0900 Subject: Fix to not define outer when outer is itself. example: a = Class.new a::A = a --- src/class.c | 2 +- src/variable.c | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) (limited to 'src/variable.c') diff --git a/src/class.c b/src/class.c index 22fe36fb3..96d32b4c5 100644 --- a/src/class.c +++ b/src/class.c @@ -65,7 +65,7 @@ mrb_class_name_class(mrb_state *mrb, struct RClass *outer, struct RClass *c, mrb else { name = mrb_class_path(mrb, outer); if (mrb_nil_p(name)) { /* unnamed outer class */ - if (outer != mrb->object_class) { + if (outer != mrb->object_class && outer != c) { mrb_obj_iv_set(mrb, (struct RObject*)c, mrb_intern_lit(mrb, "__outer__"), mrb_obj_value(outer)); } 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)); + } } } } -- cgit v1.2.3