ruby-changes:10871
From: shyouhei <ko1@a...>
Date: Thu, 19 Feb 2009 17:25:57 +0900 (JST)
Subject: [ruby-changes:10871] Ruby:r22444 (ruby_1_8_6): merge revision(s) 20580:
shyouhei 2009-02-19 17:25:45 +0900 (Thu, 19 Feb 2009) New Revision: 22444 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22444 Log: merge revision(s) 20580: * pack.c (pack_pack): fixed length for odd length string. [ruby-dev:37283] Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/pack.c branches/ruby_1_8_6/test/ruby/test_pack.rb branches/ruby_1_8_6/version.h Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 22443) +++ ruby_1_8_6/ChangeLog (revision 22444) @@ -1,3 +1,8 @@ +Thu Feb 19 17:24:30 2009 Nobuyoshi Nakada <nobu@r...> + + * pack.c (pack_pack): fixed length for odd length string. + [ruby-dev:37283] + Wed Feb 18 22:27:11 2009 NAKAMURA Usaku <usa@r...> * win32/win32.c (rb_w32_isatty): check whether fd is valid. Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 22443) +++ ruby_1_8_6/version.h (revision 22444) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-02-18" +#define RUBY_RELEASE_DATE "2009-02-19" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090218 -#define RUBY_PATCHLEVEL 341 +#define RUBY_RELEASE_CODE 20090219 +#define RUBY_PATCHLEVEL 342 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_DAY 19 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_8_6/pack.c =================================================================== --- ruby_1_8_6/pack.c (revision 22443) +++ ruby_1_8_6/pack.c (revision 22444) @@ -610,7 +610,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++) { @@ -641,7 +641,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_8_6/test/ruby/test_pack.rb =================================================================== --- ruby_1_8_6/test/ruby/test_pack.rb (revision 22443) +++ ruby_1_8_6/test/ruby/test_pack.rb (revision 22444) @@ -57,4 +57,44 @@ assert_raises(RangeError) { [0x80000000].pack("U") } assert_raises(RangeError) { [0x100000000].pack("U") } end + + def test_pack_unpack_hH + assert_equal("\x01\xfe", ["10ef"].pack("h*")) + 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")) + assert_equal(["1"], "\x01\xfe".unpack("h1")) + assert_equal(["10"], "\x01\xfe".unpack("h2")) + assert_equal(["10e"], "\x01\xfe".unpack("h3")) + assert_equal(["10ef"], "\x01\xfe".unpack("h4")) + assert_equal(["10ef"], "\x01\xfe".unpack("h5")) + + assert_equal(["10ef"], "\x10\xef".unpack("H*")) + assert_equal([""], "\x10\xef".unpack("H0")) + assert_equal(["1"], "\x10\xef".unpack("H1")) + assert_equal(["10"], "\x10\xef".unpack("H2")) + assert_equal(["10e"], "\x10\xef".unpack("H3")) + assert_equal(["10ef"], "\x10\xef".unpack("H4")) + assert_equal(["10ef"], "\x10\xef".unpack("H5")) + end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/