From 505e6017306e09487a4a7f1b0fb1c9976f4f5ec5 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 20 Sep 2018 13:53:55 +0900 Subject: Revert "Add MRB_IMPROVE_META_PROGRAMMING configuration" This reverts commit 1997fcf98f596f6af2bf1d20ccde1b1abfe7324d. It became the default behavior. --- src/variable.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.c') diff --git a/src/variable.c b/src/variable.c index 01077a34e..cc7936a46 100644 --- a/src/variable.c +++ b/src/variable.c @@ -344,9 +344,7 @@ 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) @@ -356,9 +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)); } -#ifdef MRB_IMPROVE_META_PROGRAMMING assign_class_name(mrb, obj, sym, v); -#endif if (!obj->iv) { obj->iv = iv_new(mrb); } @@ -367,7 +363,6 @@ 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) { @@ -399,7 +394,6 @@ 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) @@ -1110,14 +1104,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); -#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