diff options
| -rw-r--r-- | pack.c | 12 | ||||
| -rw-r--r-- | test/ruby/test_pack.rb | 8 |
2 files changed, 16 insertions, 4 deletions
@@ -1194,13 +1194,14 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) if (p[-1] == '*' || len > (send - s) * 8) len = (send - s) * 8; bits = 0; - UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len)); + bitstr = rb_usascii_str_new(0, len); t = RSTRING_PTR(bitstr); for (i=0; i<len; i++) { if (i & 7) bits >>= 1; else bits = (unsigned char)*s++; *t++ = (bits & 1) ? '1' : '0'; } + UNPACK_PUSH(bitstr); } break; @@ -1214,13 +1215,14 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) if (p[-1] == '*' || len > (send - s) * 8) len = (send - s) * 8; bits = 0; - UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len)); + bitstr = rb_usascii_str_new(0, len); t = RSTRING_PTR(bitstr); for (i=0; i<len; i++) { if (i & 7) bits <<= 1; else bits = (unsigned char)*s++; *t++ = (bits & 128) ? '1' : '0'; } + UNPACK_PUSH(bitstr); } break; @@ -1234,7 +1236,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) if (p[-1] == '*' || len > (send - s) * 2) len = (send - s) * 2; bits = 0; - UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len)); + bitstr = rb_usascii_str_new(0, len); t = RSTRING_PTR(bitstr); for (i=0; i<len; i++) { if (i & 1) @@ -1243,6 +1245,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) bits = (unsigned char)*s++; *t++ = hexdigits[bits & 15]; } + UNPACK_PUSH(bitstr); } break; @@ -1256,7 +1259,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) if (p[-1] == '*' || len > (send - s) * 2) len = (send - s) * 2; bits = 0; - UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len)); + bitstr = rb_usascii_str_new(0, len); t = RSTRING_PTR(bitstr); for (i=0; i<len; i++) { if (i & 1) @@ -1265,6 +1268,7 @@ pack_unpack_internal(VALUE str, VALUE fmt, int mode) bits = (unsigned char)*s++; *t++ = hexdigits[(bits >> 4) & 15]; } + UNPACK_PUSH(bitstr); } break; diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index e9267fab1c..81b1a92383 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -838,10 +838,18 @@ EXPECTED assert_equal addr, [buf].pack('p') end + def test_unpack_with_block + ret = []; "ABCD".unpack("CCCC") {|v| ret << v } + assert_equal [65, 66, 67, 68], ret + ret = []; "A".unpack("B*") {|v| ret << v } + assert_equal ["01000001"], ret + end + def test_unpack1 assert_equal 65, "A".unpack1("C") assert_equal 68, "ABCD".unpack1("x3C") assert_equal 0x3042, "\u{3042 3044 3046}".unpack1("U*") assert_equal "hogefuga", "aG9nZWZ1Z2E=".unpack1("m") + assert_equal "01000001", "A".unpack1("B*") end end |