From 975ecd2f3feec5623d296cfff38a779ad4393add Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 14 Sep 2008 04:48:56 +0000 Subject: [PATCH] * object.c (Init_Object): added metameta-class initialization for BasicObject, Object, and Module. The metameta-classes of them are now the metaclass of Class, as the metameta-calss of Class is. * object.c (boot_defmetametaclass): added. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ object.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index c06fbcd546..1add9d7df3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sun Sep 14 13:48:03 2008 Yuki Sonoda (Yugui) + + * object.c (Init_Object): added metameta-class initialization for + BasicObject, Object, and Module. + The metameta-classes of them are now the metaclass of Class, as the + metameta-calss of Class is. + + * object.c (boot_defmetametaclass): added. + Sun Sep 14 10:10:43 2008 Tadayoshi Funaba * complex.c (f_{add,mul,sub}): omitted some shortcuts for preserve diff --git a/object.c b/object.c index 58b6235a82..560092d07b 100644 --- a/object.c +++ b/object.c @@ -2369,6 +2369,12 @@ boot_defclass(const char *name, VALUE super) return obj; } +static void +boot_defmetametaclass(VALUE klass, VALUE metametaclass) +{ + RBASIC(RBASIC(klass)->klass)->klass = metametaclass; +} + /* * Document-class: Class * @@ -2467,6 +2473,9 @@ Init_Object(void) metaclass = rb_make_metaclass(rb_cObject, metaclass); metaclass = rb_make_metaclass(rb_cModule, metaclass); metaclass = rb_make_metaclass(rb_cClass, metaclass); + boot_defmetametaclass(rb_cModule, metaclass); + boot_defmetametaclass(rb_cObject, metaclass); + boot_defmetametaclass(rb_cBasicObject, metaclass); rb_define_private_method(rb_cBasicObject, "initialize", rb_obj_dummy, 0); rb_define_alloc_func(rb_cBasicObject, rb_class_allocate_instance);