diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | struct.c | 12 |
2 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Mon May 5 19:49:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * struct.c (rb_struct_s_def): Struct.new(0) should not SEGV. + based on the patch from wanabe <s.wanabe at gmail.com> in + [ruby-dev:34594]. + + * struct.c (make_struct): call to_str on name object. + Mon May 5 17:17:40 2008 Tanaka Akira <akr@fsij.org> * eval.c (ruby_cleanup): wrap ruby_finalize_0 by SAVE_ROOT_JMPBUF to @@ -181,7 +181,9 @@ make_struct(VALUE name, VALUE members, VALUE klass) rb_class_inherited(klass, nstr); } else { - id = SYM2ID(rb_str_intern(name)); + /* 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)); } @@ -322,14 +324,14 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass) ID id; rb_scan_args(argc, argv, "1*", &name, &rest); - for (i=0; i<RARRAY_LEN(rest); i++) { - id = rb_to_id(RARRAY_PTR(rest)[i]); - RARRAY_PTR(rest)[i] = ID2SYM(id); - } if (!NIL_P(name) && SYMBOL_P(name)) { rb_ary_unshift(rest, name); name = Qnil; } + for (i=0; i<RARRAY_LEN(rest); i++) { + id = rb_to_id(RARRAY_PTR(rest)[i]); + RARRAY_PTR(rest)[i] = ID2SYM(id); + } st = make_struct(name, rest, klass); if (rb_block_given_p()) { rb_mod_module_eval(0, 0, st); |