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

ruby-changes:17793

From: nobu <ko1@a...>
Date: Tue, 16 Nov 2010 06:40:12 +0900 (JST)
Subject: [ruby-changes:17793] Ruby:r29804 (trunk): * pack.c (PACK_ITEM_ADJUST): return nil not result array and yield

nobu	2010-11-16 06:39:39 +0900 (Tue, 16 Nov 2010)

  New Revision: 29804

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29804

  Log:
    * pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
      values if block is given.  [ruby-core:33193]

  Modified files:
    trunk/ChangeLog
    trunk/pack.c
    trunk/test/ruby/test_pack.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29803)
+++ ChangeLog	(revision 29804)
@@ -1,3 +1,8 @@
+Tue Nov 16 06:39:31 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
+	  values if block is given.  [ruby-core:33193]
+
 Tue Nov 16 00:21:20 2010  Yusuke Endoh  <mame@t...>
 
 	* regparse.c (and_cclass, or_cclass): fix memory leak.  Coverity Scan
Index: pack.c
===================================================================
--- pack.c	(revision 29803)
+++ pack.c	(revision 29804)
@@ -1221,7 +1221,7 @@
 } while (0)
 
 #define PACK_ITEM_ADJUST() do { \
-    if (tmp_len > 0) \
+    if (tmp_len > 0 && !block_p) \
 	rb_ary_store(ary, RARRAY_LEN(ary)+tmp_len-1, Qnil); \
 } while (0)
 
Index: test/ruby/test_pack.rb
===================================================================
--- test/ruby/test_pack.rb	(revision 29803)
+++ test/ruby/test_pack.rb	(revision 29804)
@@ -630,4 +630,11 @@
       assert_equal([1,nil], str.unpack("#{fmt}2"))
     }
   end
+
+  def test_short_with_block
+    bug4059 = '[ruby-core:33193]'
+    result = :ok
+    assert_nil("".unpack("i") {|x| result = x}, bug4059)
+    assert_equal(:ok, result)
+  end
 end

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

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