From 706439ffaa1b33a183def5401d5b6f6e35b0d505 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 7 Sep 2007 17:47:56 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@13405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ marshal.c | 3 --- struct.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cc1dfb4b..530de64c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Sep 8 02:45:33 2007 Yukihiro Matsumoto + + * 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 * regenc.c, regenc.h (onigenc_single_byte_mbc_enc_len): should take diff --git a/marshal.c b/marshal.c index f634e3f26..5df52ae27 100644 --- a/marshal.c +++ b/marshal.c @@ -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); diff --git a/struct.c b/struct.c index f1d94945f..f87b33b05 100644 --- a/struct.c +++ b/struct.c @@ -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; } -- cgit