diff options
Diffstat (limited to 'object.c')
-rw-r--r-- | object.c | 30 |
1 files changed, 12 insertions, 18 deletions
@@ -2043,13 +2043,11 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod) static VALUE rb_mod_const_set(VALUE mod, VALUE name, VALUE value) { - ID id = rb_to_id(name); - - if (!rb_is_const_id(id)) { - rb_name_error(id, "wrong constant name %"PRIsVALUE, - QUOTE_ID(id)); + if (!SYMBOL_P(name) && !rb_is_const_name(name)) { + rb_name_error_str(name, "wrong constant name %"PRIsVALUE, + QUOTE(name)); } - rb_const_set(mod, id, value); + rb_const_set(mod, rb_to_id(name), value); return value; } @@ -2166,13 +2164,11 @@ rb_obj_ivar_get(VALUE obj, VALUE iv) static VALUE rb_obj_ivar_set(VALUE obj, VALUE iv, VALUE val) { - ID id = rb_to_id(iv); - - if (!rb_is_instance_id(id)) { - rb_name_error(id, "`%"PRIsVALUE"' is not allowed as an instance variable name", - QUOTE_ID(id)); + if (!SYMBOL_P(iv) && !rb_is_instance_name(iv)) { + rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as an instance variable name", + QUOTE(iv)); } - return rb_ivar_set(obj, id, val); + return rb_ivar_set(obj, rb_to_id(iv), val); } /* @@ -2277,13 +2273,11 @@ rb_mod_cvar_get(VALUE obj, VALUE iv) static VALUE rb_mod_cvar_set(VALUE obj, VALUE iv, VALUE val) { - ID id = rb_to_id(iv); - - if (!rb_is_class_id(id)) { - rb_name_error(id, "`%"PRIsVALUE"' is not allowed as a class variable name", - QUOTE_ID(id)); + if (!SYMBOL_P(iv) && !rb_is_class_id(iv)) { + rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as a class variable name", + QUOTE(iv)); } - rb_cvar_set(obj, id, val); + rb_cvar_set(obj, rb_to_id(iv), val); return val; } |