ruby-changes:18235
From: yugui <ko1@a...>
Date: Mon, 20 Dec 2010 22:30:05 +0900 (JST)
Subject: [ruby-changes:18235] Ruby:r30257 (ruby_1_9_2): merges r29804 from trunk into ruby_1_9_2.
yugui 2010-12-20 22:22:32 +0900 (Mon, 20 Dec 2010) New Revision: 30257 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30257 Log: merges r29804 from trunk into ruby_1_9_2. -- * pack.c (PACK_ITEM_ADJUST): return nil not result array and yield values if block is given. [ruby-core:33193] Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/pack.c branches/ruby_1_9_2/test/ruby/test_pack.rb branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 30256) +++ ruby_1_9_2/ChangeLog (revision 30257) @@ -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: ruby_1_9_2/pack.c =================================================================== --- ruby_1_9_2/pack.c (revision 30256) +++ ruby_1_9_2/pack.c (revision 30257) @@ -1189,7 +1189,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: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 30256) +++ ruby_1_9_2/version.h (revision 30257) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 97 +#define RUBY_PATCHLEVEL 98 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 Index: ruby_1_9_2/test/ruby/test_pack.rb =================================================================== --- ruby_1_9_2/test/ruby/test_pack.rb (revision 30256) +++ ruby_1_9_2/test/ruby/test_pack.rb (revision 30257) @@ -615,4 +615,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/