From 3587284ecc887d5d911f158972ca10b816771396 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 12 Dec 2008 14:53:16 +0000 Subject: merges r20564 from trunk into ruby_1_9_1. * pack.c (pack_pack): 'u0' is not special differently from 'm0'. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ pack.c | 2 +- test/ruby/test_pack.rb | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2bfe34b85..c713d3a78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Dec 6 17:51:35 2008 Yuki Sonoda (Yugui) + + * pack.c (pack_pack): 'u0' is not special differently from 'm0'. + Tue Dec 9 11:50:46 2008 Yuki Sonoda (Yugui) * pack.c (pack_pck): fixed [ruby-dev:37295]. diff --git a/pack.c b/pack.c index 119a83b1a..ae0218afc 100644 --- a/pack.c +++ b/pack.c @@ -903,7 +903,7 @@ pack_pack(VALUE ary, VALUE fmt) ptr = RSTRING_PTR(from); plen = RSTRING_LEN(from); - if (len == 0) { + if (len == 0 && type == 'm') { encodes(res, ptr, plen, type, 0); ptr += plen; break; diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index 2666bb0e9..33694b9f3 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -349,6 +349,10 @@ class TestPack < Test::Unit::TestCase assert_equal("M86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A\n!80``\n", ["a"*46].pack("u")) assert_equal("&86)C9&5F\n#9VAI\n", ["abcdefghi"].pack("u6")) + assert_equal("M86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A\n!80``\n", ["a"*46].pack("u0")) + assert_equal("M86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A\n!80``\n", ["a"*46].pack("u1")) + assert_equal("M86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A\n!80``\n", ["a"*46].pack("u2")) + assert_equal([""], "".unpack("u")) assert_equal(["a"], "!80``\n".unpack("u")) assert_equal(["abc"], "#86)C\n".unpack("u")) -- cgit