BitStructEx 0.0.85 → 0.0.86

data/src/bit_struct/field.rb

@@ -14,6 +14,7 @@ module BitStruct
     end
 
     def to_s( slicer, delimiter = nil )
+      return "nil" unless slicer.data
       read( slicer ).to_s
     end
 

data/src/bit_struct/nested.rb

@@ -30,7 +30,7 @@ module BitStruct
     end
 
     def to_s( slicer, delimiter )
-      "{ #{read( slicer ).to_s delimiter} }"
+      "{#{read( slicer ).to_s delimiter}}"
     end
 
   end

data/src/bit_struct/struct_base.rb

@@ -61,7 +61,7 @@ module BitStruct
       raise "No data?" unless new_data
       if new_data.is_a? ByteData
         raise "Cannot change endianess of ByteData object" if endianess
-        @data = new_Data
+        @data = new_data
       else new_data
         @data = ByteData.new new_data, endianess
       end
@@ -69,14 +69,26 @@ module BitStruct
 
     def to_s( delimiter = "\n" )
       res = ''
-      self.class.fields.each do |field|
-        slicer = self.class.get_slicer_for field
+      singleton.fields.each do |field|
+        slicer = get_slicer_for field
         res += delimiter if res.length > 0 && delimiter
-        res += "#{field.name} = #{field.to_s slicer, delimiter}"
+        res += "#{field.name}=#{field.to_s slicer, delimiter}"
       end
       res
     end
 
+    private
+
+    def get_slicer_for( field )
+      slicers[ field ] ||= self.class.create_slicer_for field
+      slicers[ field ].data = @data
+      slicers[ field ]
+    end
+
+    def slicers
+      @slicers ||= {}
+    end
+
     class << self
 
       def fields
@@ -92,19 +104,17 @@ module BitStruct
       def add_field( field )
         context = self
 
-        define_method "gsf" do |field|
-          context.send :get_slicer_for, field
+        define_method "singleton" do
+          context
         end
 
         define_method "#{field.name}" do
-          slicer = context.send :get_slicer_for, field
-          slicer.data = @data
+          slicer = get_slicer_for field
           field.send :read, slicer
         end
 
         define_method "#{field.name}=" do |val|
-          slicer = context.send :get_slicer_for, field
-          slicer.data = @data
+          slicer = get_slicer_for field
           field.send :write, slicer, val
         end
 
@@ -113,12 +123,9 @@ module BitStruct
 
       public
 
-      def get_slicer_for( field )
-        unless slicers[ field ]
-          bit_offset, bit_length = get_field_spec field
-          slicers[ field ] = BitSlicer.new bit_offset, bit_length
-        end
-        slicers[ field ]
+      def create_slicer_for( field )
+        bit_offset, bit_length = get_field_spec field
+        BitSlicer.new bit_offset, bit_length
       end
 
       private
@@ -148,10 +155,6 @@ module BitStruct
         words.join + 'Field'
       end
 
-      def slicers
-        @slicers ||= {}
-      end
-
     end
 
   end

metadata

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