diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-18 08:40:33 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-18 08:40:33 +0000 |
commit | 74097260aeac51cb2839d90f5cf7eb4c84c9124f (patch) | |
tree | 4b2f781b6af183d2eb4bab2fce876d6addc021d3 /class.c | |
parent | b49f3b26e5d96c22f3ccb578a5bef3dbff8f7dba (diff) |
* eval.c (rb_thread_schedule): should not select a thread which is
not yet initialized.
* variable.c (find_class_path): should initialize iv_tbl if it's
NULL.
* class.c (rb_define_class): should return the existing class if
the class is already defined and its superclass is ideintical to
the specified superclass.
* class.c (rb_define_class_under): ditto.
* class.c (rb_define_module): should return the existing module if
the module is already defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'class.c')
-rw-r--r-- | class.c | 33 |
1 files changed, 33 insertions, 0 deletions
@@ -147,6 +147,16 @@ rb_define_class(name, super) ID id; id = rb_intern(name); + if (rb_const_defined(rb_cObject, id)) { + klass = rb_const_get(rb_cObject, id); + if (TYPE(klass) != T_CLASS) { + rb_raise(rb_eTypeError, "%s is not a class", name); + } + if (rb_class_real(RCLASS(klass)->super) != super) { + rb_raise(rb_eNameError, "%s is already defined", name); + } + return klass; + } klass = rb_define_class_id(id, super); st_add_direct(rb_class_tbl, id, klass); @@ -164,6 +174,16 @@ rb_define_class_under(outer, name, super) ID id; id = rb_intern(name); + if (rb_const_defined_at(outer, id)) { + klass = rb_const_get(outer, id); + if (TYPE(klass) != T_CLASS) { + rb_raise(rb_eTypeError, "%s is not a class", name); + } + if (rb_class_real(RCLASS(klass)->super) != super) { + rb_raise(rb_eNameError, "%s is already defined", name); + } + return klass; + } klass = rb_define_class_id(id, super); rb_const_set(outer, id, klass); rb_set_class_path(klass, outer, name); @@ -205,6 +225,12 @@ rb_define_module(name) ID id; id = rb_intern(name); + if (rb_const_defined(rb_cObject, id)) { + module = rb_const_get(rb_cObject, id); + if (TYPE(module) == T_MODULE) + return module; + rb_raise(rb_eTypeError, "%s is not a module", name); + } module = rb_define_module_id(id); st_add_direct(rb_class_tbl, id, module); @@ -220,6 +246,13 @@ rb_define_module_under(outer, name) ID id; id = rb_intern(name); + if (rb_const_defined(outer, id)) { + module = rb_const_get(rb_cObject, id); + if (TYPE(module) == T_MODULE) + return module; + rb_raise(rb_eTypeError, "%s::%s is not a module", + rb_class2name(outer), rb_class2name(CLASS_OF(module))); + } module = rb_define_module_id(id); rb_const_set(outer, id, module); rb_set_class_path(module, outer, name); |