ruby-changes:9135
From: yugui <ko1@a...>
Date: Fri, 12 Dec 2008 23:54:11 +0900 (JST)
Subject: [ruby-changes:9135] Ruby:r20672 (ruby_1_9_1): merges r20580 from trunk into ruby_1_9_1.
yugui 2008-12-12 23:53:49 +0900 (Fri, 12 Dec 2008) New Revision: 20672 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20672 Log: merges r20580 from trunk into ruby_1_9_1. * pack.c (pack_pack): fixed length for odd length string. [ruby-dev:37283] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/pack.c branches/ruby_1_9_1/test/ruby/test_pack.rb Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 20671) +++ ruby_1_9_1/ChangeLog (revision 20672) @@ -1,3 +1,8 @@ +Mon Dec 8 18:31:41 2008 Nobuyoshi Nakada <nobu@r...> + + * pack.c (pack_pack): fixed length for odd length string. + [ruby-dev:37283] + Mon Dec 8 10:32:33 2008 Nobuyoshi Nakada <nobu@r...> * ruby.c (set_option_encoding_once): dry. Index: ruby_1_9_1/pack.c =================================================================== --- ruby_1_9_1/pack.c (revision 20671) +++ ruby_1_9_1/pack.c (revision 20672) @@ -620,7 +620,7 @@ long i, j = 0; if (len > plen) { - j = (len - plen + 1)/2; + j = (len + 1) / 2 - (plen + 1) / 2; len = plen; } for (i=0; i++ < len; ptr++) { @@ -651,7 +651,7 @@ long i, j = 0; if (len > plen) { - j = (len - plen + 1)/2; + j = (len + 1) / 2 - (plen + 1) / 2; len = plen; } for (i=0; i++ < len; ptr++) { Index: ruby_1_9_1/test/ruby/test_pack.rb =================================================================== --- ruby_1_9_1/test/ruby/test_pack.rb (revision 20671) +++ ruby_1_9_1/test/ruby/test_pack.rb (revision 20672) @@ -179,11 +179,23 @@ assert_equal("", ["10ef"].pack("h0")) assert_equal("\x01\x0e", ["10ef"].pack("h3")) assert_equal("\x01\xfe\x0", ["10ef"].pack("h5")) + assert_equal("\xff\x0f", ["fff"].pack("h3")) + assert_equal("\xff\x0f", ["fff"].pack("h4")) + assert_equal("\xff\x0f\0", ["fff"].pack("h5")) + assert_equal("\xff\x0f\0", ["fff"].pack("h6")) + assert_equal("\xff\x0f\0\0", ["fff"].pack("h7")) + assert_equal("\xff\x0f\0\0", ["fff"].pack("h8")) assert_equal("\x10\xef", ["10ef"].pack("H*")) assert_equal("", ["10ef"].pack("H0")) assert_equal("\x10\xe0", ["10ef"].pack("H3")) assert_equal("\x10\xef\x0", ["10ef"].pack("H5")) + assert_equal("\xff\xf0", ["fff"].pack("H3")) + assert_equal("\xff\xf0", ["fff"].pack("H4")) + assert_equal("\xff\xf0\0", ["fff"].pack("H5")) + assert_equal("\xff\xf0\0", ["fff"].pack("H6")) + assert_equal("\xff\xf0\0\0", ["fff"].pack("H7")) + assert_equal("\xff\xf0\0\0", ["fff"].pack("H8")) assert_equal(["10ef"], "\x01\xfe".unpack("h*")) assert_equal([""], "\x01\xfe".unpack("h0")) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/