mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* variable.c (rb_mod_name): search module path if classname is not
set yet. (ruby-bugs-ja PR#424) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ae6b9ced18
commit
dc08e8a60f
3 changed files with 10 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
|||
Thu Apr 10 03:22:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* variable.c (rb_mod_name): search module path if classname is not
|
||||
set yet. (ruby-bugs-ja PR#424)
|
||||
|
||||
Thu Apr 10 01:52:24 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||
|
||||
* eval.c (rb_obj_is_method): indefinite return value.
|
||||
|
|
4
object.c
4
object.c
|
@ -945,7 +945,7 @@ rb_obj_ivar_get(obj, iv)
|
|||
ID id = rb_to_id(iv);
|
||||
|
||||
if (!rb_is_instance_id(id)) {
|
||||
rb_name_error(id, "`%s' is not an instance variable name", rb_id2name(id));
|
||||
rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
|
||||
}
|
||||
return rb_ivar_get(obj, id);
|
||||
}
|
||||
|
@ -957,7 +957,7 @@ rb_obj_ivar_set(obj, iv, val)
|
|||
ID id = rb_to_id(iv);
|
||||
|
||||
if (!rb_is_instance_id(id)) {
|
||||
rb_name_error(id, "`%s' is not an instance variable name", rb_id2name(id));
|
||||
rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
|
||||
}
|
||||
return rb_ivar_set(obj, id, val);
|
||||
}
|
||||
|
|
|
@ -182,7 +182,7 @@ rb_mod_name(mod)
|
|||
VALUE path = classname(mod);
|
||||
|
||||
if (path) return rb_str_dup(path);
|
||||
return rb_str_new(0,0);
|
||||
return rb_str_dup(rb_class_path(mod));
|
||||
}
|
||||
|
||||
VALUE
|
||||
|
@ -1112,7 +1112,7 @@ rb_obj_remove_instance_variable(obj, name)
|
|||
rb_raise(rb_eSecurityError, "Insecure: can't modify instance variable");
|
||||
if (OBJ_FROZEN(obj)) rb_error_frozen("object");
|
||||
if (!rb_is_instance_id(id)) {
|
||||
rb_name_error(id, "`%s' is not an instance variable", rb_id2name(id));
|
||||
rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
|
||||
}
|
||||
|
||||
switch (TYPE(obj)) {
|
||||
|
@ -1232,7 +1232,7 @@ rb_mod_remove_const(mod, name)
|
|||
VALUE val;
|
||||
|
||||
if (!rb_is_const_id(id)) {
|
||||
rb_name_error(id, "`%s' is not constant", rb_id2name(id));
|
||||
rb_name_error(id, "`%s' is not allowed as a constant name", rb_id2name(id));
|
||||
}
|
||||
if (!OBJ_TAINTED(mod) && rb_safe_level() >= 4)
|
||||
rb_raise(rb_eSecurityError, "Insecure: can't remove constant");
|
||||
|
|
Loading…
Reference in a new issue