From 8adac13b7b173dd03501fbb03b2c5b9de1d96b49 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 12 Oct 2006 15:35:50 +0000 Subject: * object.c (rb_mod_cvar_defined): wrong id check. [ruby-core:09158] * object.c (rb_mod_cvar_get): typo fixed. [ruby-core:09168] * object.c (rb_mod_cvar_set): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index cbadb9c29..5f97357e7 100644 --- a/object.c +++ b/object.c @@ -2052,7 +2052,7 @@ rb_mod_cvar_get(obj, iv) ID id = rb_to_id(iv); if (!rb_is_class_id(id)) { - rb_name_error(id, "`%s' is not allowed as an class variable name", rb_id2name(id)); + rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id)); } return rb_cvar_get(obj, id); } @@ -2085,7 +2085,7 @@ rb_mod_cvar_set(obj, iv, val) ID id = rb_to_id(iv); if (!rb_is_class_id(id)) { - rb_name_error(id, "`%s' is not allowed as an class variable name", rb_id2name(id)); + rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id)); } rb_cvar_set(obj, id, val, Qfalse); return val; @@ -2111,8 +2111,8 @@ rb_mod_cvar_defined(obj, iv) { ID id = rb_to_id(iv); - if (!rb_is_instance_id(id)) { - rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id)); + if (!rb_is_class_id(id)) { + rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id)); } return rb_cvar_defined(obj, id); } -- cgit