rbzip2 0.2.0 → 0.3.0

data/lib/rbzip2/ffi/errors.rb

@@ -0,0 +1,14 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2013, Brian Lopez
+# Copyright (c) 2013, Sebastian Staudt
+
+module RBzip2::FFI
+
+  class Error < StandardError; end
+  class BufferError < Error; end
+  class ConfigError < Error; end
+  class CorruptError < Error; end
+
+end

data/lib/rbzip2/io.rb

@@ -1,16 +1,14 @@
 # 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
-
-require 'rbzip2/decompressor'
+# Copyright (c) 2011-2017, Sebastian Staudt
 
 class RBzip2::IO
 
   def initialize(io)
     @io           = io
-    @compressor   = Compressor.new io
-    @decompressor = Decompressor.new io
+    @compressor   = RBzip2.default_adapter::Compressor.new io
+    @decompressor = RBzip2.default_adapter::Decompressor.new io
   end
 
   def close
@@ -18,6 +16,22 @@ class RBzip2::IO
     @decompressor.close
   end
 
+  def getc
+    @decompressor.getc
+  end
+
+  def gets
+    @decompressor.gets
+  end
+
+  def putc(int)
+    @compressor.putc int
+  end
+
+  def puts(line)
+    @compressor.puts line
+  end
+
   def read
     @decompressor.read
   end

data/lib/rbzip2/java.rb

@@ -0,0 +1,23 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2013, Sebastian Staudt
+
+module RBzip2::Java
+
+  def self.init
+    begin
+      require 'java'
+      include_package 'org.apache.commons.compress.compressors.bzip2'
+      BZip2CompressorOutputStream
+    rescue LoadError, NameError
+      @@available = false
+    end
+  end
+
+  extend RBzip2::Adapter
+
+  autoload :Compressor,   'rbzip2/java/compressor'
+  autoload :Decompressor, 'rbzip2/java/decompressor'
+
+end

data/lib/rbzip2/java/compressor.rb

@@ -0,0 +1,38 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2013-2017, Sebastian Staudt
+
+class RBzip2::Java::Compressor
+
+  def initialize(io)
+    @io = RBzip2::Java::BZip2CompressorOutputStream.new io.to_outputstream
+  end
+
+  def flush
+    @io.flush
+  end
+
+  def close
+    @io.close
+  end
+
+  def putc(int)
+    if int.is_a? Numeric
+      write int & 0xff
+    else
+      write int.to_s[0]
+    end
+  end
+
+  def puts(line)
+    write line + $/
+  end
+
+  def write(bytes)
+    raise 'stream closed' if @io.nil?
+
+    @io.write bytes.to_java_bytes
+  end
+
+end

data/lib/rbzip2/java/decompressor.rb

@@ -0,0 +1,65 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2013-2017, Sebastian Staudt
+
+class RBzip2::Java::Decompressor
+
+  def initialize(io)
+    @io = io
+    @is = RBzip2::Java::BZip2CompressorInputStream.new io.to_inputstream
+  end
+
+  def close
+    @is.close
+  end
+
+  def getc
+    read(1)[0].chr
+  end
+
+  def gets
+    line = ''
+    loop do
+      char = getc
+      line += char
+      break if char == "\n"
+    end
+    line
+  end
+
+  def read(length = nil)
+    if length.nil?
+      bytes = Java::byte[0].new
+      chunk = Java::byte[1024].new
+      begin
+        bytes_read = @is.read chunk
+        chunk = chunk[0..(bytes_read - 1)] if bytes_read < 1024
+        bytes += chunk
+      end while bytes_read == 1024
+    else
+      bytes = Java::byte[length].new
+      @is.read bytes
+    end
+
+    String.from_java_bytes bytes
+  end
+
+  def size
+    if @io.is_a? StringIO
+      @io.size
+    elsif @io.is_a? File
+      @io.stat.size
+    end
+  end
+
+  def uncompressed
+    @data = read
+    @data.size
+  end
+
+  def inspect
+    "#<#{self.class}: @io=#{@io.inspect} size=#{size} uncompressed=#{uncompressed}>"
+  end
+
+end

data/lib/rbzip2/ruby.rb

@@ -0,0 +1,18 @@
+# This code is free software; you can redistribute it and/or modify it under
+# the terms of the new BSD License.
+#
+# Copyright (c) 2013, Sebastian Staudt
+
+module RBzip2::Ruby
+
+  extend RBzip2::Adapter
+
+  autoload :CRC,          'rbzip2/ruby/crc'
+  autoload :Compressor,   'rbzip2/ruby/compressor'
+  autoload :Constants,    'rbzip2/ruby/constants'
+  autoload :Decompressor, 'rbzip2/ruby/decompressor'
+  autoload :IO,           'rbzip2/ruby/io'
+  autoload :InputData,    'rbzip2/ruby/input_data'
+  autoload :OutputData,   'rbzip2/ruby/output_data'
+
+end

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

@@ -1,11 +1,11 @@
-# This code is free software you can redistribute it and/or modify it under
+# 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
 
-class RBzip2::Compressor
+class RBzip2::Ruby::Compressor
 
-  include RBzip2::Constants
+  include RBzip2::Ruby::Constants
 
   def self.assign_codes(code, length, min_len, max_len, alpha_size)
     vec = 0
@@ -63,11 +63,10 @@ class RBzip2::Compressor
         heap[1] = heap[n_heap]
         n_heap -= 1
 
-        yy  = 0
         zz  = 1
         tmp = heap[1]
 
-        loop do
+        while true do
           yy = zz << 1
 
           break if yy > n_heap
@@ -86,11 +85,10 @@ class RBzip2::Compressor
         heap[1] = heap[n_heap]
         n_heap -= 1
 
-        yy = 0
         zz = 1
         tmp = heap[1]
 
-        loop do
+        while true do
           yy = zz << 1
 
           break if yy > n_heap
@@ -119,7 +117,6 @@ class RBzip2::Compressor
         n_heap += 1
         heap[n_heap] = n_nodes
 
-        tmp = 0
         zz = n_heap
         tmp = heap[zz]
         weight_tmp = weight[tmp]
@@ -160,9 +157,7 @@ class RBzip2::Compressor
   def self.vswap(fmap, p1, p2, n)
     n += p1
     while p1 < n
-      t = fmap[p1]
-      fmap[p1] = fmap[p2]
-      fmap[p2] = t
+      fmap[p1], fmap[p2] = fmap[p2], fmap[p1]
       p1 += 1
       p2 += 1
     end
@@ -175,7 +170,7 @@ class RBzip2::Compressor
     @block_size           = block_size
     @buff                 = 0
     @combined_crc         = 0
-    @crc                  = RBzip2::CRC.new
+    @crc                  = RBzip2::Ruby::CRC.new
     @current_char         = -1
     @io                   = io
     @last                 = 0
@@ -309,15 +304,13 @@ class RBzip2::Compressor
     z_pend = 0
 
     0.upto(last_shadow) do |i|
-      ll_i = unseq_to_seq[block[fmap[i]] & 0xff]
+      ll_i = unseq_to_seq[block[fmap[i]]]
       tmp = yy[0]
       j = 0
 
       while ll_i != tmp
         j += 1
-        tmp2 = tmp
-        tmp = yy[j]
-        yy[j] = tmp2
+        tmp, yy[j] = yy[j], tmp
       end
       yy[0] = tmp
 
@@ -326,7 +319,7 @@ class RBzip2::Compressor
       else
         if z_pend > 0
           z_pend -= 1
-          loop do
+          while true do
             if (z_pend & 1) == 0
               sfmap[wr] = RUNA
               mtf_freq[RUNA] += 1
@@ -350,7 +343,7 @@ class RBzip2::Compressor
 
     if z_pend > 0
       z_pend -= 1
-      loop do
+      while true do
         if (z_pend & 1) == 0
           sfmap[wr] = RUNA
           mtf_freq[RUNA] += 1
@@ -375,7 +368,7 @@ class RBzip2::Compressor
     put_byte 0x42
     put_byte 0x5a
 
-    @data = RBzip2::OutputData.new @block_size
+    @data = RBzip2::Ruby::OutputData.new @block_size
 
     put_byte 0x68
     put_byte 0x30 + @block_size
@@ -403,42 +396,37 @@ class RBzip2::Compressor
     block = data_shadow.block
     fmap = data_shadow.fmap
     quadrant = data_shadow.quadrant
-    last_shadow = @last
-    work_limit_shadow = @work_limit
-    first_attempt_shadow = @first_attempt
 
     65537.times { |i| ftab[i] = 0 }
 
     NUM_OVERSHOOT_BYTES.times do |i|
-      block[last_shadow + i + 2] = block[(i % (last_shadow + 1)) + 1]
+      block[@last + i + 2] = block[(i % (@last + 1)) + 1]
     end
-    (last_shadow + NUM_OVERSHOOT_BYTES).times do |i|
+    (@last + NUM_OVERSHOOT_BYTES).times do |i|
       quadrant[i] = 0
     end
-    block[0] = block[last_shadow + 1]
+    block[0] = block[@last + 1]
 
-    c1 = block[0] & 0xff
-    (last_shadow + 1).times do |i|
-      c2 = block[i + 1] & 0xff
+    c1 = block[0]
+    (@last + 1).times do |i|
+      c2 = block[i + 1]
       ftab[(c1 << 8) + c2] += 1
       c1 = c2
     end
 
     1.upto(65536) { |i| ftab[i] += ftab[i - 1] }
 
-    c1 = block[1] & 0xff
-    last_shadow.times do |i|
-      c2 = block[i + 2] & 0xff
+    c1 = block[1]
+    @last.times do |i|
+      c2 = block[i + 2]
       fmap[ftab[(c1 << 8) + c2] -= 1] = i
       c1 = c2
     end
 
-    fmap[ftab[((block[last_shadow + 1] & 0xff) << 8) + (block[1] & 0xff)] -= 1] = last_shadow
+    fmap[ftab[((block[@last + 1]) << 8) + block[1]] -= 1] = @last
 
-    256.times do |i|
-      big_done[i] = false
-      running_order[i] = i
-    end
+    big_done.replace Array.new(256, false)
+    256.times { |i| running_order[i] = i }
 
     h = 364
     while h != 1
@@ -472,7 +460,7 @@ class RBzip2::Compressor
           hi = (ftab[sb + 1] & CLEARMASK) - 1
           if hi > lo
             main_qsort3 data_shadow, lo, hi, 2
-            return if first_attempt_shadow && (@work_done > work_limit_shadow)
+            return if @first_attempt && (@work_done > @work_limit)
           end
           ftab[sb] = ftab_sb | SETMASK
         end
@@ -483,9 +471,9 @@ class RBzip2::Compressor
       hj = ftab[(ss + 1) << 8] & CLEARMASK
       (ftab[ss << 8] & CLEARMASK).upto(hj - 1) do |j|
         fmap_j = fmap[j]
-        c1 = block[fmap_j] & 0xff
-        if !big_done[c1]
-          fmap[copy[c1]] = (fmap_j == 0) ? last_shadow : (fmap_j - 1)
+        c1 = block[fmap_j]
+        unless big_done[c1]
+          fmap[copy[c1]] = (fmap_j == 0) ? @last : (fmap_j - 1)
           copy[c1] += 1
         end
       end
@@ -508,7 +496,7 @@ class RBzip2::Compressor
           q_val = j >> shifts
           quadrant[a2update] = q_val
           if a2update < NUM_OVERSHOOT_BYTES
-            quadrant[a2update + last_shadow + 1] = q_val
+            quadrant[a2update + @last + 1] = q_val
           end
         end
       end
@@ -536,7 +524,7 @@ class RBzip2::Compressor
         return if main_simple_sort data_shadow, lo, hi, d
       else
         d1 = d + 1
-        med = self.class.med3(block[fmap[lo] + d1], block[fmap[hi] + d1], block[fmap[(lo + hi) >> 1] + d1]) & 0xff
+        med = self.class.med3 block[fmap[lo] + d1], block[fmap[hi] + d1], block[fmap[(lo + hi) >> 1] + d1]
 
         un_lo = lo
         un_hi = hi
@@ -545,11 +533,9 @@ class RBzip2::Compressor
 
         while true
           while un_lo <= un_hi
-            n = (block[fmap[un_lo] + d1] & 0xff) - med
+            n = block[fmap[un_lo] + d1] - med
             if n == 0
-              temp = fmap[un_lo]
-              fmap[un_lo] = fmap[lt_lo]
-              fmap[lt_lo] = temp
+              fmap[un_lo], fmap[lt_lo] = fmap[lt_lo], fmap[un_lo]
               un_lo += 1
               lt_lo += 1
             elsif n < 0
@@ -560,11 +546,9 @@ class RBzip2::Compressor
           end
 
           while un_lo <= un_hi
-            n = (block[fmap[un_hi] + d1] & 0xff) - med
+            n = block[fmap[un_hi] + d1] - med
             if n == 0
-              temp = fmap[un_hi]
-              fmap[un_hi] = fmap[gt_hi]
-              fmap[gt_hi] = temp
+              fmap[un_hi], fmap[gt_hi] = fmap[gt_hi], fmap[un_hi]
               un_hi -= 1
               gt_hi -= 1
             elsif n > 0
@@ -575,9 +559,7 @@ class RBzip2::Compressor
           end
 
           if un_lo <= un_hi
-            temp = fmap[un_lo]
-            fmap[un_lo] = fmap[un_hi]
-            fmap[un_hi] = temp
+            fmap[un_lo], fmap[un_hi] = fmap[un_hi], fmap[un_lo]
             un_lo += 1
             un_hi -= 1
           else
@@ -599,20 +581,10 @@ class RBzip2::Compressor
           n = lo + un_lo - lt_lo - 1
           m = hi - (gt_hi - un_hi) + 1
 
-          stack_ll[sp] = lo
-          stack_hh[sp] = n
-          stack_dd[sp] = d
-          sp += 1
-
-          stack_ll[sp] = n + 1
-          stack_hh[sp] = m - 1
-          stack_dd[sp] = d1
-          sp += 1
-
-          stack_ll[sp] = m
-          stack_hh[sp] = hi
-          stack_dd[sp] = d
-          sp += 1
+          stack_ll[sp, 3] = lo, n + 1, m
+          stack_hh[sp, 3] = n, m - 1, hi
+          stack_dd[sp, 3] = d, d1, d
+          sp += 3
         end
       end
     end
@@ -630,13 +602,8 @@ class RBzip2::Compressor
     fmap = data_shadow.fmap
     quadrant = data_shadow.quadrant
     block = data_shadow.block
-    last_shadow = @last
-    last_plus_1 = last_shadow + 1
-    first_attempt_shadow = @first_attempt
-    work_limit_shadow = @work_limit
-    work_done_shadow = @work_done
+    last_plus_1 = @last + 1
 
-    a = nil
     h = nil
     i1 = nil
     i2 = nil
@@ -660,14 +627,14 @@ class RBzip2::Compressor
                       if quadrant[i1 + 3] == quadrant[i2 + 3]
                         i1 -= last_plus_1 if (i1 += 4) >= last_plus_1
                         i2 -= last_plus_1 if (i2 += 4) >= last_plus_1
-                        work_done_shadow += 1
+                        @work_done += 1
                         next
                       elsif quadrant[i1 + 3] > quadrant[i2 + 3]
                         return true
                       else
                         return false
                       end
-                    elsif (block[i1 + 4] & 0xff) > (block[i2 + 4] & 0xff)
+                    elsif block[i1 + 4] > block[i2 + 4]
                       return true
                     else
                       return false
@@ -677,7 +644,7 @@ class RBzip2::Compressor
                   else
                     return false
                   end
-                elsif (block[i1 + 3] & 0xff) > (block[i2 + 3] & 0xff)
+                elsif block[i1 + 3] > block[i2 + 3]
                   return true
                 else
                   return false
@@ -687,17 +654,17 @@ class RBzip2::Compressor
               else
                 return false
               end
-            elsif (block[i1 + 2] & 0xff) > (block[i2 + 2] & 0xff)
+            elsif block[i1 + 2] > block[i2 + 2]
               return true
             else
               return false
             end
-          elsif (quadrant[i1] > quadrant[i2])
+          elsif quadrant[i1] > quadrant[i2]
             return true
           else
             return false
           end
-        elsif (block[i1 + 1] & 0xff) > (block[i2 + 1] & 0xff)
+        elsif block[i1 + 1] > block[i2 + 1]
           return true
         else
           return false
@@ -728,37 +695,37 @@ class RBzip2::Compressor
               if block[i1 + 4] == block[i2 + 4]
                 if block[i1 + 5] == block[i2 + 5]
                   if block[i1 += 6] == block[i2 += 6]
-                    x = last_shadow
+                    x = @last
 
                     break unless x_loop.call
                   else
-                    if (block[i1] & 0xff) > (block[i2] & 0xff)
+                    if block[i1] > block[i2]
                       next
                     else
                       break
                     end
                   end
-                elsif (block[i1 + 5] & 0xff) > (block[i2 + 5] & 0xff)
+                elsif block[i1 + 5] > block[i2 + 5]
                   next
                 else
                   break
                 end
-              elsif (block[i1 + 4] & 0xff) > (block[i2 + 4] & 0xff)
+              elsif block[i1 + 4] > block[i2 + 4]
                 next
               else
                 break
               end
-            elsif (block[i1 + 3] & 0xff) > (block[i2 + 3] & 0xff)
+            elsif block[i1 + 3] > block[i2 + 3]
               next
             else
               break
             end
-          elsif (block[i1 + 2] & 0xff) > (block[i2 + 2] & 0xff)
+          elsif block[i1 + 2]  > block[i2 + 2]
             next
           else
             break
           end
-        elsif (block[i1 + 1] & 0xff) > (block[i2 + 1] & 0xff)
+        elsif block[i1 + 1] > block[i2 + 1]
           next
         else
           break
@@ -788,12 +755,10 @@ class RBzip2::Compressor
         end
       end
 
-      break if first_attempt_shadow && i <= hi && work_done_shadow > work_limit_shadow
+      break if @first_attempt && i <= hi && @work_done > @work_limit
     end
 
-    @work_done = work_done_shadow
-
-    first_attempt_shadow && (work_done_shadow > work_limit_shadow)
+    @first_attempt && @work_done > @work_limit
   end
 
   def move_to_front_code_and_send
@@ -802,6 +767,18 @@ class RBzip2::Compressor
     send_mtf_values
   end
 
+  def putc(int)
+    if int.is_a? Numeric
+      put_byte int & 0xff
+    else
+      write int.to_s[0].chr
+    end
+  end
+
+  def puts(line)
+    write line + $/
+  end
+
   def put_byte(c)
     c = c[0].to_i if c.is_a? String
     w 8, c
@@ -815,9 +792,8 @@ class RBzip2::Compressor
   end
 
   def randomize_block
-    in_use      = @data.in_use
-    block       = @data.block
-    last_shadow = @last
+    in_use = @data.in_use
+    block  = @data.block
 
     256.times { |i| in_use[i] = false }
 
@@ -825,7 +801,7 @@ class RBzip2::Compressor
     r_t_pos = 0
     j = 1
     i = 0
-    while i <= last_shadow
+    while i <= @last
       i = j
 
       if r_n_to_go == 0
@@ -836,7 +812,7 @@ class RBzip2::Compressor
       r_n_to_go -= 1
       block[j] ^= r_n_to_go == 1 ? 1 : 0
 
-      in_use[block[j] & 0xff] = true
+      in_use[block[j]] = true
 
       j += 1
     end
@@ -899,7 +875,7 @@ class RBzip2::Compressor
         end
       end
 
-      gs = ge +1
+      gs = ge + 1
       rem_f -= a_freq
     end
   end
@@ -918,7 +894,6 @@ class RBzip2::Compressor
     len_3 = len[3]
     len_4 = len[4]
     len_5 = len[5]
-    n_mtf_shadow = @n_mtf
     n_selectors = 0
 
     N_ITERS.times do
@@ -932,7 +907,7 @@ class RBzip2::Compressor
 
       gs = 0
       while gs < @n_mtf
-        ge = [gs + G_SIZE - 1, n_mtf_shadow - 1].min
+        ge = [gs + G_SIZE - 1, @n_mtf - 1].min
 
         if n_groups == N_GROUPS
           cost0 = 0
@@ -1008,9 +983,7 @@ class RBzip2::Compressor
 
       while ll_i != tmp
         j += 1
-        tmp2 = tmp
-        tmp = pos[j]
-        pos[j] = tmp2
+        tmp, pos[j] = pos[j], tmp
       end
 
       pos[0] = tmp
@@ -1048,7 +1021,7 @@ class RBzip2::Compressor
       end
     end
 
-    16.times { |i| w 1, (in_use_16[i] ? 1 : 0) }
+    16.times { |i| w 1, in_use_16[i] ? 1 : 0 }
 
     io_shadow   = @io
     live_shadow = @live
@@ -1112,83 +1085,71 @@ class RBzip2::Compressor
 
   def send_mtf_values6(n_groups, alpha_size)
     len = @data.send_mtf_values_len
-    io_shadow = @io
-
-    live_shadow = @live
-    buff_shadow = @buff
 
     n_groups.times do |t|
       len_t = len[t]
       curr = len_t[0] & 0xff
 
-      while live_shadow >= 8
-        io_shadow.write(((buff_shadow >> 24) & 0xffffffff).chr)
-        buff_shadow <<= 8
-        buff_shadow &= 0xffffffff
-        live_shadow -= 8
+      while @live >= 8
+        @io.write(((@buff >> 24) & 0xffffffff).chr)
+        @buff <<= 8
+        @buff &= 0xffffffff
+        @live -= 8
       end
-      buff_shadow |= curr << (32 - live_shadow - 5)
-      live_shadow += 5
+      @buff |= curr << (32 - @live - 5)
+      @live += 5
 
       alpha_size.times do |i|
         lti = len_t[i] & 0xff
         while curr < lti
-          while live_shadow >= 8
-            io_shadow.write(((buff_shadow >> 24) & 0xffffffff).chr)
-            buff_shadow <<= 8
-            buff_shadow &= 0xffffffff
-            live_shadow -= 8
+          while @live >= 8
+            @io.write(((@buff >> 24) & 0xffffffff).chr)
+            @buff <<= 8
+            @buff &= 0xffffffff
+            @live -= 8
           end
-          buff_shadow |= 2 << (32 - live_shadow - 2)
-          live_shadow += 2
+          @buff |= 2 << (32 - @live - 2)
+          @live += 2
 
           curr += 1
         end
 
         while curr > lti
-          while live_shadow >= 8
-            io_shadow.write(((buff_shadow >> 24) & 0xffffffff).chr)
-            buff_shadow <<= 8
-            buff_shadow &= 0xffffffff
-            live_shadow -= 8
+          while @live >= 8
+            @io.write(((@buff >> 24) & 0xffffffff).chr)
+            @buff <<= 8
+            @buff &= 0xffffffff
+            @live -= 8
           end
-          buff_shadow |= 3 << (32 - live_shadow - 2)
-          live_shadow += 2
+          @buff |= 3 << (32 - @live - 2)
+          @live += 2
 
           curr -= 1
         end
 
-        while live_shadow >= 8
-          io_shadow.write(((buff_shadow >> 24) & 0xffffffff).chr)
-          buff_shadow <<= 8
-          buff_shadow &= 0xffffffff
-          live_shadow -= 8
+        while @live >= 8
+          @io.write(((@buff >> 24) & 0xffffffff).chr)
+          @buff <<= 8
+          @buff &= 0xffffffff
+          @live -= 8
         end
-        live_shadow += 1
+        @live += 1
       end
     end
-
-    @buff = buff_shadow
-    @live = live_shadow
   end
 
   def send_mtf_values7
     data_shadow = @data
     len = data_shadow.send_mtf_values_len
     code = data_shadow.send_mtf_values_code
-    io_shadow = @io
     selector = data_shadow.selector
     sfmap = data_shadow.sfmap
-    n_mtf_shadow = @n_mtf
 
     sel_ctr = 0
 
-    live_shadow = @live
-    buff_shadow = @buff
-
     gs = 0
-    while gs < n_mtf_shadow
-      ge = [gs + G_SIZE - 1, n_mtf_shadow - 1].min
+    while gs < @n_mtf
+      ge = [gs + G_SIZE - 1, @n_mtf - 1].min
       selector_sel_ctr = selector[sel_ctr] & 0xff
       code_sel_ctr = code[selector_sel_ctr]
       len_sel_ctr = len[selector_sel_ctr]
@@ -1196,15 +1157,15 @@ class RBzip2::Compressor
       while gs <= ge
         sfmap_i = sfmap[gs]
 
-        while live_shadow >= 8
-          io_shadow.write(((buff_shadow >> 24) & 0xffffffff).chr)
-          buff_shadow <<= 8
-          buff_shadow &= 0xffffffff
-          live_shadow -= 8
+        while @live >= 8
+          @io.write(((@buff >> 24) & 0xffffffff).chr)
+          @buff <<= 8
+          @buff &= 0xffffffff
+          @live -= 8
         end
         n = len_sel_ctr[sfmap_i] & 0xff
-        buff_shadow |= code_sel_ctr[sfmap_i] << (32 - live_shadow - n)
-        live_shadow += n
+        @buff |= code_sel_ctr[sfmap_i] << (32 - @live - n)
+        @live += n
 
         gs += 1
       end
@@ -1212,25 +1173,18 @@ class RBzip2::Compressor
       gs = ge + 1
       sel_ctr += 1
     end
-
-    @buff = buff_shadow
-    @live = live_shadow
   end
 
   def w(n, v)
-    io_shadow = @io
-    live_shadow = @live
-    buff_shadow = @buff
-
-    while live_shadow >= 8
-      io_shadow.write(((buff_shadow >> 24) & 0xffffffff).chr)
-      buff_shadow <<= 8
-      buff_shadow &= 0xffffffff
-      live_shadow -= 8
+    while @live >= 8
+      @io.write(((@buff >> 24) & 0xffffffff).chr)
+      @buff <<= 8
+      @buff &= 0xffffffff
+      @live -= 8
     end
 
-    @buff = buff_shadow | (v << (32 - live_shadow - n))
-    @live = live_shadow + n
+    @buff = @buff | (v << (32 - @live - n))
+    @live += n
   end
 
   def write(bytes)
@@ -1240,8 +1194,8 @@ class RBzip2::Compressor
   end
 
   def write0(b)
+    b &= 0xff
     if @current_char != -1
-      b &= 0xff
       if @current_char == b
         @run_length += 1
         if @run_length > 254
@@ -1255,50 +1209,46 @@ class RBzip2::Compressor
         @current_char = b
       end
     else
-      @current_char = b & 0xff
+      @current_char = b
       @run_length += 1
     end
   end
 
   def write_run
-    last_shadow = @last
-
-    if last_shadow < @allowable_block_size
-      current_char_shadow = @current_char
+    if @last < @allowable_block_size
+      ch = @current_char
       data_shadow = @data
-      data_shadow.in_use[current_char_shadow] = true
-      ch = current_char_shadow
+      data_shadow.in_use[ch] = true
+      block = data_shadow.block
 
       run_length_shadow = @run_length
-      @crc.update_crc current_char_shadow, run_length_shadow
+      run_length_shadow.times { @crc.update_crc ch }
 
       case run_length_shadow
         when 1
-          data_shadow.block[last_shadow + 2] = ch
-          @last = last_shadow + 1
+          block[@last + 2] = ch
+          @last += 1
 
         when 2
-          data_shadow.block[last_shadow + 2] = ch
-          data_shadow.block[last_shadow + 3] = ch
-          @last = last_shadow + 2
+          block[@last + 2] = ch
+          block[@last + 3] = ch
+          @last += 2
 
         when 3
-          block = data_shadow.block
-          block[last_shadow + 2] = ch
-          block[last_shadow + 3] = ch
-          block[last_shadow + 4] = ch
-          @last = last_shadow + 3
+          block[@last + 2] = ch
+          block[@last + 3] = ch
+          block[@last + 4] = ch
+          @last += 3
 
         else
           run_length_shadow -= 4
           data_shadow.in_use[run_length_shadow] = true
-          block = data_shadow.block
-          block[last_shadow + 2] = ch
-          block[last_shadow + 3] = ch
-          block[last_shadow + 4] = ch
-          block[last_shadow + 5] = ch
-          block[last_shadow + 6] = run_length_shadow
-          @last = last_shadow + 5
+          block[@last + 2] = ch
+          block[@last + 3] = ch
+          block[@last + 4] = ch
+          block[@last + 5] = ch
+          block[@last + 6] = run_length_shadow
+          @last += 5
       end
     else
       end_block