diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-07 17:47:56 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-07 17:47:56 +0000 |
commit | 531eab2cdc11ee90f681cfa7d014fa156f41dace (patch) | |
tree | 6bfa7110d882afe90da74313e5380a0d85d23431 | |
parent | eda22a34116e7c889cc0f7f4a5aaa1f59dc5495b (diff) | |
download | ruby-531eab2cdc11ee90f681cfa7d014fa156f41dace.tar.gz |
* struct.c (rb_struct_s_members): should raise TypeError instead
of call rb_bug(). [ruby-dev:31709]
* marshal.c (r_object0): no nil check require any more.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | marshal.c | 3 | ||||
-rw-r--r-- | struct.c | 2 |
3 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Sat Sep 8 02:45:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * struct.c (rb_struct_s_members): should raise TypeError instead + of call rb_bug(). [ruby-dev:31709] + + * marshal.c (r_object0): no nil check require any more. + Sat Sep 8 01:46:36 2007 NAKAMURA Usaku <usa@ruby-lang.org> * regenc.c, regenc.h (onigenc_single_byte_mbc_enc_len): should take @@ -1148,9 +1148,6 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) klass = path2class(r_unique(arg)); mem = rb_struct_s_members(klass); - if (mem == Qnil) { - rb_raise(rb_eTypeError, "uninitialized struct"); - } len = r_long(arg); values = rb_ary_new2(len); @@ -37,7 +37,7 @@ rb_struct_s_members(VALUE klass) VALUE members = rb_struct_iv_get(klass, "__members__"); if (NIL_P(members)) { - rb_bug("non-initialized struct"); + rb_raise(rb_eTypeError, "uninitialized struct"); } return members; } |