BitStructEx 0.0.86 → 0.0.91

data/src/bit_struct/bit_slicer.rb

@@ -72,36 +72,32 @@ module BitStruct
 
     #private
 
-    def get_data( idx )
-      @data[ idx ]
-    end
-
     def set_data( idx, val )
       @data[ idx ] = val
     end
 
     def first_byte
-      data.length - ( ( @bit_offset + @bit_length ) / 8.0 ).ceil
+      @first_byte ||= ( data.length - ( ( @bit_offset + @bit_length ) / 8.0 ).ceil )
     end
 
     def last_byte
-      data.length - 1 - @bit_offset / 8
+      @last_byte ||= ( data.length - 1 - @bit_offset / 8 )
     end
 
     def length_in_bytes
-      ( @bit_length / 8.0 ).ceil
+      @length_in_bytes ||= ( @bit_length / 8.0 ).ceil
     end
 
     def insert_length_in_bytes
-      ( ( ( @bit_offset & 7 ) + @bit_length ) / 8.0 ).ceil
+      @insert_length_in_bytes ||= ( ( ( @bit_offset & 7 ) + @bit_length ) / 8.0 ).ceil
     end
 
     def masked_first_byte
-      get_data( first_byte ) & merge_first_byte_mask
+      @data[ first_byte ] & merge_first_byte_mask
     end
 
     def masked_last_byte
-      get_data( last_byte ) & merge_last_byte_mask
+      @data[ last_byte ] & merge_last_byte_mask
     end
 
     def required_shift
@@ -111,7 +107,7 @@ module BitStruct
     def get_raw_bytes
       raw_bytes = []
       first_byte.upto( last_byte ) do |idx|
-        raw_bytes << get_data( idx )
+        raw_bytes << @data[ idx ]
       end
       raw_bytes
     end
@@ -123,20 +119,22 @@ module BitStruct
     end
 
     def highest_byte_mask
+      return @highest_byte_mask if @highest_byte_mask
       mask_bits = ( ( @bit_length ) & 7 )
       mask_bits = 8 if mask_bits == 0
-      ( 2 ** mask_bits ) - 1
+      @highest_byte_mask = ( 2 ** mask_bits ) - 1
     end
 
     def insert_first_byte_mask
+      return @insert_first_byte_mask if @insert_first_byte_mask
       mask_bits = ( ( @bit_offset + @bit_length ) & 7 )
       mask_bits = 8 if mask_bits == 0
-      ( 2 ** mask_bits ) - 1
+      @insert_first_byte_mask = ( 2 ** mask_bits ) - 1
     end
 
     def insert_last_byte_mask
-      mask_bits = 0xFF
-      ( mask_bits << ( @bit_offset & 7 ) ) & 0xFF
+      return @insert_last_byte_mask if @insert_last_byte_mask
+      @insert_last_byte_mask = ( ( mask_bits = 0xFF ) << ( @bit_offset & 7 ) ) & 0xFF
     end
 
     def merge_first_byte_mask

data/src/bit_struct/byte_data.rb

@@ -7,64 +7,17 @@ module BitStruct
 
     include Endianess
 
-    def initialize( data, endianess = nil )
+    def self.endianize( data, endianess = nil )
       raise "Bad input" unless data.respond_to? "[]".to_sym
       raise "Unknown endianess" unless valid endianess
-      @data = data
-      @endianess = endianess || BIG_ENDIAN
+      data = data.reverse if ( endianess || BIG_ENDIAN ) == LITTLE_ENDIAN
+      data
     end
 
-    def size
-      @data.size
-    end
-
-    def length
-      @data.length
-    end
-
-    def each
-      0.upto( size - 1 ) { |idx| yield self[ idx ] }
-    end
-
-    def to_s
-      str = ''
-      each { |b| str << b }
-      str
-    end
-
-    def []( idx )
-      @data[ endianized( idx ) ]
-    end
-
-    def []=( idx, val )
-      @data[ endianized( idx ) ] = val
-    end
-
-    def reverse
-      ReversedByteData.new self, BIG_ENDIAN
-    end
-
-    private
-
-    def valid( endianess )
+    def self.valid( endianess )
       endianess == nil || endianess == LITTLE_ENDIAN || endianess == BIG_ENDIAN
     end
 
-    def endianized( idx )
-      return idx if @endianess == BIG_ENDIAN
-      return @data.length - idx - 1 if @endianess == LITTLE_ENDIAN
-    end
-
-  end
-
-  class ReversedByteData < ByteData
-
-    alias super_endianized endianized
-
-    def endianized( idx )
-      res = super_endianized( idx )
-      @data.length - res - 1
-    end
   end
 
 end

data/src/bit_struct/struct_base.rb

@@ -59,12 +59,7 @@ module BitStruct
 
     def set_data( new_data, endianess = nil )
       raise "No data?" unless new_data
-      if new_data.is_a? ByteData
-        raise "Cannot change endianess of ByteData object" if endianess
-        @data = new_data
-      else new_data
-        @data = ByteData.new new_data, endianess
-      end
+      @data = ByteData.endianize new_data, endianess
     end
 
     def to_s( delimiter = "\n" )

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: BitStructEx
 version: !ruby/object:Gem::Version 
-  version: 0.0.86
-date: 2006-05-18 00:00:00 +02:00
+  version: 0.0.91
+date: 2006-06-04 00:00:00 +02:00
 summary: Simple DSL for defining bit-based structures on byte data.
 require_paths: 
 - src