summaryrefslogtreecommitdiffstats
path: root/error.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-01-31 04:00:17 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-01-31 04:00:17 +0000
commita0cf2fde9c6b21c4249f0dbbe928a2dd79cf67b6 (patch)
tree7098f68924d61777d091df010681e173627091a5 /error.c
parent35d0b982ea66f5f6a4681334ee7e7a9b4eb9fe53 (diff)
downloadruby-a0cf2fde9c6b21c4249f0dbbe928a2dd79cf67b6.tar.gz
ruby-a0cf2fde9c6b21c4249f0dbbe928a2dd79cf67b6.tar.xz
ruby-a0cf2fde9c6b21c4249f0dbbe928a2dd79cf67b6.zip
* variable.c (rb_obj_classname): new function.
* string.c (rb_str_dup): should preserve original's class (but not hidden singleton class). * string.c (rb_str_substr): ditto. * parse.y: backout EXPR_CMDARG removal. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r--error.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/error.c b/error.c
index 1121c8fdf..468fbb6d1 100644
--- a/error.c
+++ b/error.c
@@ -230,7 +230,7 @@ rb_check_type(x, t)
etype = RSTRING(rb_obj_as_string(x))->ptr;
}
else {
- etype = rb_class2name(CLASS_OF(x));
+ etype = rb_obj_classname(x);
}
rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
etype, type->name);
@@ -724,7 +724,7 @@ void
rb_check_frozen(obj)
VALUE obj;
{
- if (OBJ_FROZEN(obj)) rb_error_frozen(rb_class2name(CLASS_OF(obj)));
+ if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj));
}
static void