From 1cc44cfd78e00879e983ffa320e16a2d99558067 Mon Sep 17 00:00:00 2001 From: skandhas Date: Fri, 9 Nov 2012 23:00:24 +0800 Subject: add Module#class_variables --- src/class.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/class.c') diff --git a/src/class.c b/src/class.c index cf2f6df50..4df422e26 100644 --- a/src/class.c +++ b/src/class.c @@ -1440,6 +1440,7 @@ mrb_init_class(mrb_state *mrb) mrb_define_method(mrb, mod, "const_get", mrb_mod_const_get, ARGS_REQ(1)); /* 15.2.2.4.21 */ mrb_define_method(mrb, mod, "const_set", mrb_mod_const_set, ARGS_REQ(2)); /* 15.2.2.4.23 */ mrb_define_method(mrb, mod, "define_method", mod_define_method, ARGS_REQ(1)); + mrb_define_method(mrb, mod, "class_variables", mrb_mod_class_variables, ARGS_ANY()); /* 15.2.2.4.19 */ mrb_define_method(mrb, mod, "===", mrb_mod_eqq, ARGS_REQ(1)); mrb_undef_method(mrb, cls, "append_features"); -- cgit v1.2.3 From 611cfee3c2ff1a06760cbe4d0d1415f65087b505 Mon Sep 17 00:00:00 2001 From: skandhas Date: Mon, 12 Nov 2012 20:43:10 +0800 Subject: modify aspec --- src/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/class.c') diff --git a/src/class.c b/src/class.c index 4df422e26..e737a1201 100644 --- a/src/class.c +++ b/src/class.c @@ -1440,7 +1440,7 @@ mrb_init_class(mrb_state *mrb) mrb_define_method(mrb, mod, "const_get", mrb_mod_const_get, ARGS_REQ(1)); /* 15.2.2.4.21 */ mrb_define_method(mrb, mod, "const_set", mrb_mod_const_set, ARGS_REQ(2)); /* 15.2.2.4.23 */ mrb_define_method(mrb, mod, "define_method", mod_define_method, ARGS_REQ(1)); - mrb_define_method(mrb, mod, "class_variables", mrb_mod_class_variables, ARGS_ANY()); /* 15.2.2.4.19 */ + mrb_define_method(mrb, mod, "class_variables", mrb_mod_class_variables, ARGS_NONE()); /* 15.2.2.4.19 */ mrb_define_method(mrb, mod, "===", mrb_mod_eqq, ARGS_REQ(1)); mrb_undef_method(mrb, cls, "append_features"); -- cgit v1.2.3 From 0f6c1a034bef4ec2661930f2f8db550463edf665 Mon Sep 17 00:00:00 2001 From: Yukihiro Matz Matsumoto Date: Wed, 14 Nov 2012 23:55:06 +0900 Subject: zero initialize singleton_class iv --- src/class.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/class.c') diff --git a/src/class.c b/src/class.c index e737a1201..79daa6f86 100644 --- a/src/class.c +++ b/src/class.c @@ -74,6 +74,7 @@ make_metaclass(mrb_state *mrb, struct RClass *c) } sc = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class); sc->mt = 0; + sc->iv = 0; if (!c->super) { sc->super = mrb->class_class; } @@ -763,9 +764,7 @@ mrb_singleton_class_ptr(mrb_state *mrb, struct RClass *c) { struct RClass *sc; - if (c->tt == MRB_TT_SCLASS) { - return c; - } + if (o->c->tt == MRB_TT_SCLASS) return; sc = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class); sc->mt = 0; sc->super = c; -- cgit v1.2.3 From 8856c8924651d0ad9779c9256a1b0d35fb4d748a Mon Sep 17 00:00:00 2001 From: Yukihiro Matz Matsumoto Date: Wed, 14 Nov 2012 23:56:29 +0900 Subject: should print SCLASS as modules and classes --- src/class.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/class.c') diff --git a/src/class.c b/src/class.c index 79daa6f86..a3150fa5f 100644 --- a/src/class.c +++ b/src/class.c @@ -1223,6 +1223,7 @@ mrb_mod_to_s(mrb_state *mrb, mrb_value klass) switch (mrb_type(v)) { case MRB_TT_CLASS: case MRB_TT_MODULE: + case MRB_TT_SCLASS: mrb_str_append(mrb, s, mrb_inspect(mrb, v)); break; default: -- cgit v1.2.3 From a5d7ebbad04ce2f09aa1b603e471b3f161b5cc63 Mon Sep 17 00:00:00 2001 From: Yukihiro Matz Matsumoto Date: Fri, 16 Nov 2012 11:34:16 +0900 Subject: prepare metaclass of metaclass when retrieving by singleton_class(); close #540 --- src/class.c | 66 ++++++++++++++++++++++++++++-------------------------------- src/kernel.c | 3 ++- 2 files changed, 33 insertions(+), 36 deletions(-) (limited to 'src/class.c') diff --git a/src/class.c b/src/class.c index a3150fa5f..d95a05789 100644 --- a/src/class.c +++ b/src/class.c @@ -64,26 +64,38 @@ mrb_name_class(mrb_state *mrb, struct RClass *c, mrb_sym name) mrb_intern(mrb, "__classid__"), mrb_symbol_value(name)); } +#define make_metaclass(mrb, c) prepare_singleton_class((mrb), (struct RBasic*)(c)) + static void -make_metaclass(mrb_state *mrb, struct RClass *c) +prepare_singleton_class(mrb_state *mrb, struct RBasic *o) { - struct RClass *sc; + struct RClass *sc, *c; - if (c->c->tt == MRB_TT_SCLASS) { - return; - } + if (o->c->tt == MRB_TT_SCLASS) return; sc = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class); sc->mt = 0; sc->iv = 0; - if (!c->super) { - sc->super = mrb->class_class; + if (o->tt == MRB_TT_CLASS) { + c = (struct RClass*)o; + if (!c->super) { + sc->super = mrb->class_class; + } + else { + sc->super = c->super->c; + } } - else { + else if (o->tt == MRB_TT_SCLASS) { + c = (struct RClass*)o; + make_metaclass(mrb, c->super); sc->super = c->super->c; } - c->c = sc; - mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)sc); - mrb_field_write_barrier(mrb, (struct RBasic*)sc, (struct RBasic*)sc->super); + else { + sc->super = o->c; + } + o->c = sc; + mrb_field_write_barrier(mrb, (struct RBasic*)o, (struct RBasic*)sc); + mrb_field_write_barrier(mrb, (struct RBasic*)sc, (struct RBasic*)o); + mrb_obj_iv_set(mrb, (struct RObject*)sc, mrb_intern(mrb, "__attached__"), mrb_obj_value(o)); } struct RClass* @@ -179,7 +191,6 @@ mrb_vm_define_class(mrb_state *mrb, mrb_value outer, mrb_value super, mrb_sym id mrb_raisef(mrb, E_TYPE_ERROR, "superclass mismatch for class %s", mrb_sym2name(mrb, id)); } } - return c; } @@ -759,20 +770,6 @@ mrb_mod_included_modules(mrb_state *mrb, mrb_value self) return result; } -static struct RClass * -mrb_singleton_class_ptr(mrb_state *mrb, struct RClass *c) -{ - struct RClass *sc; - - if (o->c->tt == MRB_TT_SCLASS) return; - sc = (struct RClass*)mrb_obj_alloc(mrb, MRB_TT_SCLASS, mrb->class_class); - sc->mt = 0; - sc->super = c; - mrb_field_write_barrier(mrb, (struct RBasic*)sc, (struct RBasic*)c); - - return sc; -} - mrb_value mrb_singleton_class(mrb_state *mrb, mrb_value v) { @@ -796,14 +793,14 @@ mrb_singleton_class(mrb_state *mrb, mrb_value v) break; } obj = mrb_object(v); - obj->c = mrb_singleton_class_ptr(mrb, obj->c); + prepare_singleton_class(mrb, obj); return mrb_obj_value(obj->c); } void mrb_define_singleton_method(mrb_state *mrb, struct RObject *o, const char *name, mrb_func_t func, int aspec) { - o->c = mrb_singleton_class_ptr(mrb, o->c); + prepare_singleton_class(mrb, (struct RBasic*)o); mrb_define_method_id(mrb, o->c, mrb_intern(mrb, name), func, aspec); } @@ -944,15 +941,14 @@ mrb_value mrb_class_superclass(mrb_state *mrb, mrb_value klass) { struct RClass *c; - mrb_value superclass; c = mrb_class_ptr(klass); - if (c->super) - superclass = mrb_obj_value(mrb_class_real(c->super)); - else - superclass = mrb_nil_value(); - - return superclass; + c = c->super; + while (c && c->tt == MRB_TT_ICLASS) { + c = c->super; + } + if (!c) return mrb_nil_value(); + return mrb_obj_value(c); } static mrb_value diff --git a/src/kernel.c b/src/kernel.c index d467a34da..adb616466 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -287,7 +287,8 @@ mrb_singleton_class_clone(mrb_state *mrb, mrb_value obj) clone->super = klass->super; if (klass->iv) { - clone->iv = klass->iv; + mrb_iv_copy(mrb, mrb_obj_value(clone), mrb_obj_value(klass)); + mrb_obj_iv_set(mrb, (struct RObject*)clone, mrb_intern(mrb, "__attached__"), obj); } if (klass->mt) { clone->mt = kh_copy(mt, mrb, klass->mt); -- cgit v1.2.3