[前][次][番号順一覧][スレッド一覧]

ruby-changes:1914

From: ko1@a...
Date: 8 Sep 2007 02:48:06 +0900
Subject: [ruby-changes:1914] matz - Ruby:r13405 (trunk): * struct.c (rb_struct_s_members): should raise TypeError instead

matz	2007-09-08 02:47:56 +0900 (Sat, 08 Sep 2007)

  New Revision: 13405

  Modified files:
    trunk/ChangeLog
    trunk/marshal.c
    trunk/struct.c

  Log:
    * 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.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13405&r2=13404
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/struct.c?r1=13405&r2=13404
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/marshal.c?r1=13405&r2=13404

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13404)
+++ ChangeLog	(revision 13405)
@@ -1,3 +1,10 @@
+Sat Sep  8 02:45:33 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* regenc.c, regenc.h (onigenc_single_byte_mbc_enc_len): should take
Index: struct.c
===================================================================
--- struct.c	(revision 13404)
+++ struct.c	(revision 13405)
@@ -37,7 +37,7 @@
     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;
 }
Index: marshal.c
===================================================================
--- marshal.c	(revision 13404)
+++ marshal.c	(revision 13405)
@@ -1148,9 +1148,6 @@
 
 	    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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml

[前][次][番号順一覧][スレッド一覧]