From d497898c231f124ba187e2650be8af20b47b1a97 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 8 Mar 2002 07:03:09 +0000 Subject: * eval.c (cvar_cbase): utility function to find innermost non singleton cbase. * eval.c (is_defined): adopt new cvar behavior. * eval.c (rb_eval): ditto. * eval.c (assign): ditto. * class.c (rb_mod_clone): should not call rb_obj_clone(), since Module does not provide "allocate". * class.c (rb_singleton_class): should crate new singleton class if obj is a class or module and attached object is different, which means metaclass of singleton class is sought. * time.c (time_s_alloc): now follows allocation framework. * eval.c (rb_eval): should initialize outer class variables from methods in singleton class definitions. * eval.c (assign): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index bf22075369..a954d8ad88 100644 --- a/object.c +++ b/object.c @@ -97,7 +97,7 @@ rb_obj_clone(obj) if (rb_special_const_p(obj)) { rb_raise(rb_eTypeError, "can't clone %s", rb_class2name(CLASS_OF(obj))); } - clone = rb_obj_alloc(RBASIC(obj)->klass); + clone = rb_obj_alloc(rb_class_real(RBASIC(obj)->klass)); CLONESETUP(clone,obj); if (TYPE(clone) == T_OBJECT && ROBJECT(obj)->iv_tbl) { ROBJECT(clone)->iv_tbl = st_copy(ROBJECT(obj)->iv_tbl); @@ -658,7 +658,12 @@ VALUE rb_obj_alloc(klass) VALUE klass; { - VALUE obj = rb_funcall(klass, alloc, 0, 0); + VALUE obj; + + if (FL_TEST(klass, FL_SINGLETON)) { + rb_raise(rb_eTypeError, "can't create instance of virtual class"); + } + obj = rb_funcall(klass, alloc, 0, 0); if (rb_obj_class(obj) != rb_class_real(klass)) { rb_raise(rb_eTypeError, "wrong instance allocation"); @@ -684,9 +689,6 @@ rb_class_new_instance(argc, argv, klass) { VALUE obj; - if (FL_TEST(klass, FL_SINGLETON)) { - rb_raise(rb_eTypeError, "can't create instance of virtual class"); - } obj = rb_obj_alloc(klass); rb_obj_call_init(obj, argc, argv); -- cgit v1.2.3