Permalink
Browse files

* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent d98d0ad commit 031b581efc011cc5f4bb7bb20fa4f11286463aae matz committed May 11, 2005
Showing with 18 additions and 7 deletions.
  1. +2 −0 .cvsignore
  2. +8 −0 ChangeLog
  3. +4 −3 eval.c
  4. +1 −1 misc/ruby-mode.el
  5. +1 −1 object.c
  6. +2 −2 struct.c
View
@@ -5,6 +5,8 @@
*~
.ccmalloc
.ppack
+.ext
+.rbconfig.time
COPYING.LIB
ChangeLog.pre-alpha
ChangeLog.pre1_1
View
@@ -6016,6 +6016,14 @@ Thu Mar 18 21:44:38 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: backport drb.rb 1.16.
+Fri Mar 18 17:49:51 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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.
+
Thu Mar 18 16:22:38 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (proc_eq): avoid false positive by using scope and
View
7 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);
}
}
View
@@ -398,7 +398,7 @@ The variable ruby-indent-level controls the amount of indentation.
((and (not (eobp))
(ruby-expr-beg 'expr-qstr)
(not (looking-at "%="))
- (looking-at "%[QqrxWw]?\\(.\\)"))
+ (looking-at "%[QqrxWw]?\\([^a-zA-Z0-9 \t\n]\\)"))
(goto-char (match-beginning 1))
(setq expand (not (memq (char-before) '(?q ?w))))
(setq w (match-string 1))
View
@@ -2471,7 +2471,7 @@ VALUE ruby_top_self;
* Creating a new Name
*
* Classes, modules, and objects are interrelated. In the diagram
- * that follows, the arrows represent inheritance, and the
+ * that follows, the vertical arrows represent inheritance, and the
* parentheses meta-classes. All metaclasses are instances
* of the class `Class'.
*
View
@@ -212,7 +212,7 @@ make_struct(name, members, klass)
rb_define_singleton_method(nstr, "members", rb_struct_s_members_m, 0);
for (i=0; i< RARRAY(members)->len; i++) {
ID id = SYM2ID(RARRAY(members)->ptr[i]);
- if (rb_is_local_id(id)) {
+ if (rb_is_local_id(id) || rb_is_const_id(id)) {
if (i<10) {
rb_define_method_id(nstr, id, ref_func[i], 0);
}
@@ -488,7 +488,7 @@ inspect_struct(s)
}
slot = RARRAY(members)->ptr[i];
id = SYM2ID(slot);
- if (rb_is_local_id(id)) {
+ if (rb_is_local_id(id) || rb_is_const_id(id)) {
p = rb_id2name(id);
rb_str_cat2(str, p);
}

0 comments on commit 031b581

Please sign in to comment.