rbzip2 0.2.0 → 0.3.0

data/lib/rbzip2/{constants.rb → ruby/constants.rb}

@@ -1,9 +1,9 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011, Sebastian Staudt
+# Copyright (c) 2011-2013, Sebastian Staudt
 
-module RBzip2::Constants
+module RBzip2::Ruby::Constants
 
   BASEBLOCKSIZE = 100000
   MAX_ALPHA_SIZE = 258

data/lib/rbzip2/ruby/crc.rb

@@ -0,0 +1,70 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2011-2017, Sebastian Staudt
+
+class RBzip2::Ruby::CRC
+
+  CRC32_TABLE = [
+    0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
+    0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+    0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
+    0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+    0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
+    0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+    0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
+    0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+    0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
+    0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+    0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
+    0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+    0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4,
+    0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+    0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
+    0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+    0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
+    0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+    0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
+    0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+    0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
+    0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+    0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
+    0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+    0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
+    0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+    0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
+    0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+    0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
+    0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+    0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
+    0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+    0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
+    0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+    0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
+    0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+    0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
+    0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+    0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
+    0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+    0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
+    0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+    0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
+  ]
+
+  def initialize
+    initialize_crc
+  end
+
+  def initialize_crc
+    @global_crc = 0xffffffff
+  end
+
+  def final_crc
+    @global_crc ^ 0xffffffff
+  end
+
+  def update_crc(in_ch)
+    @global_crc = ((@global_crc << 8) & 0xffffffff) ^ CRC32_TABLE[(@global_crc >> 24) ^ in_ch]
+  end
+
+end

data/lib/rbzip2/{decompressor.rb → ruby/decompressor.rb}

@@ -1,19 +1,19 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011, Sebastian Staudt
+# Copyright (c) 2011-2017, Sebastian Staudt
 
-require 'stringio'
+require 'core_ext/io'
 
-class RBzip2::Decompressor
+class RBzip2::Ruby::Decompressor
 
-  include RBzip2::Constants
+  include RBzip2::Ruby::Constants
 
   def initialize(io)
     @buff = 0
     @bytes_read = 0
     @computed_combined_crc = 0
-    @crc = RBzip2::CRC.new
+    @crc = RBzip2::Ruby::CRC.new
     @current_char = -1
     @io = io
     @live = 0
@@ -26,57 +26,62 @@ class RBzip2::Decompressor
     @bytes_read += read if read != -1
   end
 
+  def getc
+    read 1
+  end
+
+  def gets
+    line = ''
+    loop do
+      char = getc
+      line += char
+      break if char == "\n"
+    end
+    line
+  end
+
   def read(length = nil)
     raise 'stream closed' if @io.nil?
 
     if length == 1
       r = read0
       count (r < 0 ? -1 : 1)
-      r
+      r.chr
     else
-      r = StringIO.new
+      r = ''
       if length == nil
-        loop do
+        while true do
           b = read0
           break if b < 0
-          r.write b.chr
+          r << b.chr
         end
       elsif length > 0
         length.times do
           b = read0
           break if b < 0
-          r.write b.chr
+          r << b.chr
         end
         count r.size
       end
-      r.string
+      r
     end
   end
 
   def read0
     ret_char = @current_char
 
-    case @current_state
-      when EOF
-        return -1
-
-      when RAND_PART_B_STATE
-        setup_rand_part_b
-
-      when RAND_PART_C_STATE
-        setup_rand_part_c
-
-      when NO_RAND_PART_B_STATE
-        setup_no_rand_part_b
-
-      when NO_RAND_PART_C_STATE
-        setup_no_rand_part_c
-
-      when START_BLOCK_STATE
-      when RAND_PART_A_STATE
-      when NO_RAND_PART_A_STATE
-      else
-        raise 'illegal state'
+    if @current_state == RAND_PART_B_STATE
+      setup_rand_part_b
+    elsif @current_state == NO_RAND_PART_B_STATE
+      setup_no_rand_part_b
+    elsif @current_state == RAND_PART_C_STATE
+      setup_rand_part_c
+    elsif @current_state == NO_RAND_PART_C_STATE
+      setup_no_rand_part_c
+    elsif @current_state == EOF
+      return -1
+    else
+      raise 'illegal state'
     end
 
     ret_char
@@ -84,9 +89,9 @@ class RBzip2::Decompressor
 
   def make_maps
     in_use = @data.in_use
-    seq_to_unseq = @data.seq_to_unseq;
+    seq_to_unseq = @data.seq_to_unseq
 
-    n_in_use_shadow = 0;
+    n_in_use_shadow = 0
 
     256.times do |i|
       if in_use[i]
@@ -95,7 +100,7 @@ class RBzip2::Decompressor
       end
     end
 
-    @n_in_use = n_in_use_shadow;
+    @n_in_use = n_in_use_shadow
   end
 
   def init
@@ -126,7 +131,7 @@ class RBzip2::Decompressor
       @stored_block_crc = int
       @block_randomised = bit
 
-      @data = RBzip2::InputData.new @block_size if @data.nil?
+      @data = RBzip2::Ruby::InputData.new @block_size if @data.nil?
 
       get_and_move_to_front_decode
 
@@ -138,14 +143,9 @@ class RBzip2::Decompressor
   def end_block
     @computed_block_crc = @crc.final_crc
 
-    if @stored_block_crc != @computed_block_crc
-      @computed_combined_crc = (@stored_combined_crc << 1) | (@stored_combined_crc >> 31)
-      @computed_combined_crc ^= @stored_block_crc
-
-      raise 'BZip2 CRC error'
-    end
+    raise 'BZip2 CRC error' if @stored_block_crc != @computed_block_crc
 
-    @computed_combined_crc = (@computed_combined_crc << 1) | (@computed_combined_crc >> 31)
+    @computed_combined_crc = ((@computed_combined_crc << 1) & 0xffffffff) | (@computed_combined_crc >> 31)
     @computed_combined_crc ^= @computed_block_crc
   end
 
@@ -170,7 +170,7 @@ class RBzip2::Decompressor
 
     if live_shadow < n
       begin
-        thech = @io.read(1)[0].ord
+        thech = @io.readbyte
 
         raise 'unexpected end of stream' if thech < 0
 
@@ -195,7 +195,7 @@ class RBzip2::Decompressor
   end
 
   def int
-    (((((r(8) << 8) | r(8)) << 8) | r(8)) << 8) | r(8)
+    r 32
   end
 
   def create_decode_tables(limit, base, perm, length, min_len, max_len, alpha_size)
@@ -209,10 +209,8 @@ class RBzip2::Decompressor
       end
     end
 
-    MAX_CODE_LEN.downto 1 do |i|
-      base[i] = 0
-      limit[i] = 0
-    end
+    base[1..MAX_CODE_LEN] = 0
+    limit[1..MAX_CODE_LEN] = 0
 
     alpha_size.times do |i|
       base[length[i] + 1] += 1
@@ -229,8 +227,7 @@ class RBzip2::Decompressor
       b = base[i]
       nb = base[i + 1]
       vec += nb - b
-      b = nb
-      limit[i] = vec -1
+      limit[i] = vec - 1
       vec = vec << 1
     end
 
@@ -251,9 +248,7 @@ class RBzip2::Decompressor
       in_use16 |= 1 << i if bit
     end
 
-    255.downto(0) do |i|
-      in_use[i] = false
-    end
+    in_use.fill false
 
     16.times do |i|
        if (in_use16 & (1 << i)) != 0
@@ -275,19 +270,18 @@ class RBzip2::Decompressor
       while bit
         j += 1
       end
-      selector_mtf[i] = j
+      selector_mtf[i] = j & 0xff
     end
 
-    groups.downto(0) do |v|
-      pos[v] = v
-    end
+    pos.fill(0..groups) { |v| v & 0xff }
 
     selectors.times do |i|
-      v = selector_mtf[i] & 0xff
+      v = selector_mtf[i]
       tmp = pos[v]
 
       while v > 0 do
-        pos[v] = pos[v -= 1]
+        v -= 1
+        pos[v + 1] = pos[v]
       end
 
       pos[0] = tmp
@@ -349,30 +343,26 @@ class RBzip2::Decompressor
     perm = @data.perm
     limit_last = @block_size * BASEBLOCKSIZE
 
-    256.downto(0) do |i|
-      yy[i] = i
-      unzftab[i] = 0
-    end
+    yy.fill(0..256) { |i| i }
+    unzftab.fill 0
 
     group_no = 0
     group_pos = G_SIZE - 1
     eob = @n_in_use + 1
     next_sym = get_and_move_to_front_decode0 0
-    buff_shadow = @buff
-    live_shadow = @live
-    last_shadow = -1
-    zt = selector[group_no] & 0xff
+    @last = -1
+    zt = selector[group_no]
     base_zt = base[zt]
     limit_zt = limit[zt]
     perm_zt = perm[zt]
     min_lens_zt = min_lens[zt]
 
     while next_sym != eob
-      if (next_sym == RUNA) || (next_sym == RUNB)
+      if next_sym == RUNA || next_sym == RUNB
         s = -1
 
         n = 1
-        loop do
+        while true do
           if next_sym == RUNA
             s += n
           elsif next_sym == RUNB
@@ -384,7 +374,7 @@ class RBzip2::Decompressor
           if group_pos == 0
             group_pos = G_SIZE - 1
             group_no += 1
-            zt = selector[group_no] & 0xff
+            zt = selector[group_no]
             base_zt = base[zt]
             limit_zt = limit[zt]
             perm_zt = perm[zt]
@@ -395,32 +385,32 @@ class RBzip2::Decompressor
 
           zn = min_lens_zt
 
-          while live_shadow < zn
-            thech = @io.read(1)[0].ord
+          while @live < zn
+            thech = @io.readbyte
 
             raise 'unexpected end of stream' if thech < 0
 
-            buff_shadow = (buff_shadow << 8) | thech
-            live_shadow += 8
+            @buff = ((@buff << 8) & 0xffffffff) | thech
+            @live += 8
           end
 
-          zvec = (buff_shadow >> (live_shadow - zn)) & ((1 << zn) - 1)
-          live_shadow -= zn
+          zvec = ((@buff >> (@live - zn)) & 0xffffffff) & ((1 << zn) - 1)
+          @live -= zn
 
           while zvec > limit_zt[zn]
             zn += 1
 
-            while live_shadow < 1
-              thech = @io.read(1)[0].ord
+            while @live < 1
+              thech = @io.readbyte
 
               raise 'unexpected end of stream' if thech < 0
 
-              buff_shadow = (buff_shadow << 8) | thech
-              live_shadow += 8
+              @buff = ((@buff << 8) & 0xffffffff) | thech
+              @live += 8
             end
 
-            live_shadow -= 1
-            zvec = (zvec << 1) | ((buff_shadow >> live_shadow) & 1)
+            @live -= 1
+            zvec = (zvec << 1) | ((@buff >> @live) & 1)
           end
 
           next_sym = perm_zt[zvec - base_zt[zn]]
@@ -432,19 +422,19 @@ class RBzip2::Decompressor
         unzftab[ch & 0xff] += s + 1
 
         while s >= 0
-          last_shadow += 1
-          ll8[last_shadow] = ch
+          @last += 1
+          ll8[@last] = ch
           s -= 1
         end
 
-        raise 'block overrun' if last_shadow >= limit_last
+        raise 'block overrun' if @last >= limit_last
       else
-        last_shadow += 1
-        raise 'block overrun' if last_shadow >= limit_last
+        @last += 1
+        raise 'block overrun' if @last >= limit_last
 
         tmp = yy[next_sym - 1]
-        unzftab[seq_to_unseq[tmp] & 0xff] += 1
-        ll8[last_shadow] = seq_to_unseq[tmp]
+        unzftab[seq_to_unseq[tmp]] += 1
+        ll8[@last] = seq_to_unseq[tmp]
 
         yy[1, next_sym - 1] = yy[0, next_sym - 1]
         yy[0] = tmp
@@ -452,7 +442,7 @@ class RBzip2::Decompressor
         if group_pos == 0
           group_pos = G_SIZE - 1
           group_no += 1
-          zt = selector[group_no] & 0xff
+          zt = selector[group_no]
           base_zt = base[zt]
           limit_zt = limit[zt]
           perm_zt = perm[zt]
@@ -463,67 +453,58 @@ class RBzip2::Decompressor
 
         zn = min_lens_zt
 
-        while live_shadow < zn
-          thech = @io.read(1)[0].ord
+        while @live < zn
+          thech = @io.readbyte
 
           raise 'unexpected end of stream' if thech < 0
 
-          buff_shadow = (buff_shadow << 8) | thech
-          live_shadow += 8
+          @buff = ((@buff << 8) & 0xffffffff) | thech
+          @live += 8
         end
-        zvec = (buff_shadow >> (live_shadow - zn)) & ((1 << zn) - 1)
-        live_shadow -= zn
+        zvec = (@buff >> (@live - zn)) & ((1 << zn) - 1)
+        @live -= zn
 
         while zvec > limit_zt[zn]
           zn += 1
-          while live_shadow < 1
-            thech = @io.read(1)[0].ord
+          while @live < 1
+            thech = @io.readbyte
 
             raise 'unexpected end of stream' if thech < 0
 
-            buff_shadow = (buff_shadow << 8) | thech
-            live_shadow += 8
+            @buff = ((@buff << 8) & 0xffffffff) | thech
+            @live += 8
           end
-          live_shadow -= 1
-          zvec = (zvec << 1) | ((buff_shadow >> live_shadow) & 1)
+          @live -= 1
+          zvec = (zvec << 1) | ((@buff >> @live) & 1)
         end
 
         next_sym = perm_zt[zvec - base_zt[zn]]
       end
     end
-
-    @last = last_shadow
-    @live = live_shadow
-    @buff = buff_shadow
   end
 
   def get_and_move_to_front_decode0(group_no)
-    zt = @data.selector[group_no] & 0xff
+    zt = @data.selector[group_no]
     limit_zt = @data.limit[zt]
     zn = @data.min_lens[zt]
     zvec = r zn
-    live_shadow = @live
-    buff_shadow = @buff
 
     while zvec > limit_zt[zn]
       zn += 1
 
-      while live_shadow < 1
-        thech = @io.read(1)[0].ord
+      while @live < 1
+        thech = @io.readbyte
 
         raise 'unexpected end of stream' if thech < 0
 
-        buff_shadow = (buff_shadow << 8) | thech
-        live_shadow += 8
+        @buff = ((@buff << 8) & 0xffffffff) | thech
+        @live += 8
       end
 
-      live_shadow -=1
-      zvec = (zvec << 1) | ((buff_shadow >> live_shadow) & 1)
+      @live -=1
+      zvec = (zvec << 1) | ((@buff >> @live) & 1)
     end
 
-    @live = live_shadow
-    @buff = buff_shadow
-
     @data.perm[zt][zvec - @data.base[zt][zn]]
   end
 
@@ -536,15 +517,14 @@ class RBzip2::Decompressor
     cftab[0] = 0
     cftab[1, 256] = @data.unzftab[0, 256]
 
-    c = cftab[0]
+    c = 0
     1.upto(256) do |i|
       c += cftab[i]
       cftab[i] = c
     end
 
-    last_shadow = @last
-    (last_shadow + 1).times do |i|
-      cftab_i = ll8[i] & 0xff
+    (@last + 1).times do |i|
+      cftab_i = ll8[i]
       tt[cftab[cftab_i]] = i
       cftab[cftab_i] += 1
     end
@@ -569,7 +549,7 @@ class RBzip2::Decompressor
   def setup_rand_part_a
     if @su_i2 <= @last
       @su_ch_prev = @su_ch2
-      su_ch2_shadow = @data.ll8[@su_t_pos] & 0xff
+      su_ch2_shadow = @data.ll8[@su_t_pos]
       @su_t_pos = @data.tt[@su_t_pos]
 
       if @su_r_n_to_go == 0
@@ -595,7 +575,7 @@ class RBzip2::Decompressor
   def setup_no_rand_part_a
     if @su_i2 <= @last
       @su_ch_prev = @su_ch2
-      su_ch2_shadow = @data.ll8[@su_t_pos] & 0xff
+      su_ch2_shadow = @data.ll8[@su_t_pos]
       @su_ch2 = su_ch2_shadow
       @su_t_pos = @data.tt[@su_t_pos]
       @su_i2 += 1
@@ -618,7 +598,7 @@ class RBzip2::Decompressor
     else
       @su_count += 1
       if @su_count >= 4
-        @su_z = @data.ll8[@su_t_pos] & 0xff
+        @su_z = @data.ll8[@su_t_pos]
         @su_t_pos = @data.tt[@su_t_pos]
 
         if @su_r_n_to_go == 0
@@ -660,7 +640,7 @@ class RBzip2::Decompressor
     else
       @su_count += 1
       if @su_count >= 4
-        @su_z = @data.ll8[@su_t_pos] & 0xff
+        @su_z = @data.ll8[@su_t_pos]
         @su_t_pos = @data.tt[@su_t_pos]
         @su_j2 = 0
         setup_no_rand_part_c