* struct.c (make_struct): allow const_id for accessor names.

  [ruby-core:04585]

* eval.c (rb_attr): check if attribute name is local_id or
  const_id.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 3 deletions

diff --git a/eval.c b/eval.c
index e6a927b21f..990aa5da47 100644
--- a/eval.c
+++ b/eval.c
@@ -622,6 +622,9 @@ rb_attr(klass, id, read, write, ex)
 	}
     }
 
+    if (!rb_is_local_id(id) && !rb_is_const_id(id)) {
+	rb_name_error(id, "invalid attribute name `%s'", rb_id2name(id));
+    }
     name = rb_id2name(id);
     if (!name) {
 	rb_raise(rb_eArgError, "argument needs to be symbol or string");
@@ -633,9 +636,7 @@ rb_attr(klass, id, read, write, ex)
 	rb_add_method(klass, id, NEW_IVAR(attriv), noex);
     }
     if (write) {
-	sprintf(buf, "%s=", name);
-	id = rb_intern(buf);
-	rb_add_method(klass, id, NEW_ATTRSET(attriv), noex);
+	rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex);
     }
 }