From a469664fda324f5a934c995f27facce7804600d4 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 20 Aug 2001 04:29:58 +0000 Subject: * range.c (range_step): 'iter' here should be an array. * marshal.c (w_object): should retrieve __member__ data from non-singleton class. * variable.c (rb_cvar_get): class variable override check added. * variable.c (rb_cvar_set): ditto * variable.c (rb_cvar_declare): ditto. * parse.y (parse_regx): handle backslash escaping of delimiter here. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index f60234411..6f4a29354 100644 --- a/object.c +++ b/object.c @@ -81,7 +81,7 @@ rb_class_real(cl) } VALUE -rb_obj_type(obj) +rb_obj_class(obj) VALUE obj; { return rb_class_real(CLASS_OF(obj)); @@ -116,7 +116,7 @@ rb_obj_dup(obj) rb_raise(rb_eTypeError, "dupulicated object must be same type"); } if (!SPECIAL_CONST_P(dup)) { - OBJSETUP(dup, rb_obj_type(obj), BUILTIN_TYPE(obj)); + OBJSETUP(dup, rb_obj_class(obj), BUILTIN_TYPE(obj)); OBJ_INFECT(dup, obj); if (FL_TEST(obj, FL_EXIVAR)) { FL_SET(dup, FL_EXIVAR); @@ -233,7 +233,7 @@ rb_obj_is_instance_of(obj, c) rb_raise(rb_eTypeError, "class or module required"); } - if (rb_obj_type(obj) == c) return Qtrue; + if (rb_obj_class(obj) == c) return Qtrue; return Qfalse; } @@ -1155,8 +1155,8 @@ Init_Object() rb_define_method(rb_mKernel, "hash", rb_obj_id, 0); rb_define_method(rb_mKernel, "id", rb_obj_id, 0); rb_define_method(rb_mKernel, "__id__", rb_obj_id, 0); - rb_define_method(rb_mKernel, "type", rb_obj_type, 0); - rb_define_method(rb_mKernel, "class", rb_obj_type, 0); + rb_define_method(rb_mKernel, "type", rb_obj_class, 0); + rb_define_method(rb_mKernel, "class", rb_obj_class, 0); rb_define_method(rb_mKernel, "clone", rb_obj_clone, 0); rb_define_method(rb_mKernel, "dup", rb_obj_dup, 0); -- cgit