summaryrefslogtreecommitdiff
path: root/struct.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-15 07:18:22 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-15 07:18:22 +0000
commit31e0a51652967bf6c260176101a372faabe489a7 (patch)
tree52ff80901166ffc2d0388d502bdbdf576c586320 /struct.c
parentab530f056c7e45aa711a736790fb448bbdce19e7 (diff)
merge revision(s) r40101:
* struct.c (make_struct): avoid inadvertent symbol creation. (rb_struct_aref): ditto. (rb_struct_aset): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'struct.c')
-rw-r--r--struct.c31
1 files changed, 24 insertions, 7 deletions
diff --git a/struct.c b/struct.c
index 5e9f9a15a1..a3c1fb94f7 100644
--- a/struct.c
+++ b/struct.c
@@ -187,10 +187,11 @@ make_struct(VALUE name, VALUE members, VALUE klass)
else {
/* old style: should we warn? */
name = rb_str_to_str(name);
- id = rb_to_id(name);
- if (!rb_is_const_id(id)) {
- rb_name_error(id, "identifier %s needs to be constant", StringValuePtr(name));
+ if (!rb_is_const_name(name)) {
+ rb_name_error_str(name, "identifier %"PRIsVALUE" needs to be constant",
+ QUOTE(name));
}
+ id = rb_to_id(name);
if (rb_const_defined_at(klass, id)) {
rb_warn("redefining constant Struct::%s", StringValuePtr(name));
rb_mod_remove_const(klass, ID2SYM(id));
@@ -672,8 +673,16 @@ rb_struct_aref(VALUE s, VALUE idx)
{
long i;
- if (RB_TYPE_P(idx, T_STRING) || RB_TYPE_P(idx, T_SYMBOL)) {
- return rb_struct_aref_id(s, rb_to_id(idx));
+ if (RB_TYPE_P(idx, T_SYMBOL)) {
+ return rb_struct_aref_id(s, SYM2ID(idx));
+ }
+ else if (RB_TYPE_P(idx, T_STRING)) {
+ ID id = rb_check_id(&idx);
+ if (!id) {
+ rb_name_error_str(idx, "no member '%"PRIsVALUE"' in struct",
+ QUOTE(idx));
+ }
+ return rb_struct_aref_id(s, id);
}
i = NUM2LONG(idx);
@@ -739,8 +748,16 @@ rb_struct_aset(VALUE s, VALUE idx, VALUE val)
{
long i;
- if (RB_TYPE_P(idx, T_STRING) || RB_TYPE_P(idx, T_SYMBOL)) {
- return rb_struct_aset_id(s, rb_to_id(idx), val);
+ if (RB_TYPE_P(idx, T_SYMBOL)) {
+ return rb_struct_aset_id(s, SYM2ID(idx), val);
+ }
+ if (RB_TYPE_P(idx, T_STRING)) {
+ ID id = rb_check_id(&idx);
+ if (!id) {
+ rb_name_error_str(idx, "no member '%"PRIsVALUE"' in struct",
+ QUOTE(idx));
+ }
+ return rb_struct_aset_id(s, id, val);
}
i = NUM2LONG(idx);