diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-23 15:05:03 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-23 15:05:03 +0000 |
commit | 4dc1a2180946ab793adee5eb235fc4ee8fa4cefe (patch) | |
tree | 7c078ba1c20373d9c36610c6c98de775e9f44a51 /object.c | |
parent | a7c15b2617620b79ea734faf31dacc8e72ed5ad1 (diff) |
* error.c (rb_name_error_str): new function to raise NameError
with the name string but not ID.
* object.c, proc.c, variable.c: more removal of inadvertent symbol
creation. [Feature #5079]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
-rw-r--r-- | object.c | 49 |
1 files changed, 43 insertions, 6 deletions
@@ -1833,8 +1833,14 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod) else { rb_scan_args(argc, argv, "11", &name, &recur); } - if (!(id = rb_check_id(name)) && rb_is_const_name(name)) - return Qfalse; + if (!(id = rb_check_id(name))) { + if (rb_is_const_name(name)) { + return Qfalse; + } + else { + rb_name_error_str(name, "wrong constant name %s", RSTRING_PTR(name)); + } + } if (!rb_is_const_id(id)) { rb_name_error(id, "wrong constant name %s", rb_id2name(id)); } @@ -1864,8 +1870,16 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod) static VALUE rb_obj_ivar_get(VALUE obj, VALUE iv) { - ID id = rb_to_id(iv); + ID id = rb_check_id(iv); + if (!id) { + if (rb_is_instance_name(iv)) { + return Qnil; + } + else { + rb_name_error_str(iv, "`%s' is not allowed as an instance variable name", RSTRING_PTR(iv)); + } + } if (!rb_is_instance_id(id)) { rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id)); } @@ -1926,7 +1940,14 @@ rb_obj_ivar_defined(VALUE obj, VALUE iv) { ID id = rb_check_id(iv); - if (!id && rb_is_instance_name(iv)) return Qfalse; + if (!id) { + if (rb_is_instance_name(iv)) { + return Qfalse; + } + else { + rb_name_error_str(iv, "`%s' is not allowed as an instance variable name", RSTRING_PTR(iv)); + } + } if (!rb_is_instance_id(id)) { rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id)); } @@ -1950,8 +1971,17 @@ rb_obj_ivar_defined(VALUE obj, VALUE iv) static VALUE rb_mod_cvar_get(VALUE obj, VALUE iv) { - ID id = rb_to_id(iv); + ID id = rb_check_id(iv); + if (!id) { + if (rb_is_class_name(iv)) { + rb_name_error_str(iv, "uninitialized class variable %s in %s", + RSTRING_PTR(iv), rb_class2name(obj)); + } + else { + rb_name_error_str(iv, "`%s' is not allowed as a class variable name", RSTRING_PTR(iv)); + } + } if (!rb_is_class_id(id)) { rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id)); } @@ -2006,7 +2036,14 @@ rb_mod_cvar_defined(VALUE obj, VALUE iv) { ID id = rb_check_id(iv); - if (!id && rb_is_class_name(iv)) return Qfalse; + if (!id) { + if (rb_is_class_name(iv)) { + return Qfalse; + } + else { + rb_name_error_str(iv, "`%s' is not allowed as a class variable name", RSTRING_PTR(iv)); + } + } if (!rb_is_class_id(id)) { rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id)); } |