libbin 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fdf975677061cebffe202e1d86030fd8c84d32f28c90c6907abd964d854e0cf
-  data.tar.gz: e54ea09722e208c8eb1368a73dbb9aa452e324e2b18dc59b007a826cb23c680a
+  metadata.gz: 230be2238c11ec4505d14cea8a43181b6b006cd3db0eccc4d40d1fb117912681
+  data.tar.gz: c21f1a9ab288be527d14eeea80f248f9332d98d3dc8351dd811536aaa24850f0
 SHA512:
-  metadata.gz: 8490ee9cdec4a7268aeb19d2cd6bd37fa5af61930f1a3b3c1134e10768c211c2c67030054eb00bbd4c85ff6beff7c8b290ff4927ba86b45312168e49894695a3
-  data.tar.gz: 95a9b0b79b0bca2f9c7f8eef6154788ce2838ac436b23f958b67af3485bee706dfee7f3720a6bb29e88746a4ba04967479347f9fde9250160ad9a0f57a0b0a61
+  metadata.gz: a8fbca741eb24035f80751e3eaf49a3b1b89ac1dbb8f4ae9cec3b58c77ddaf2e8b93c74af781cde5756e07d4a4fd115d07e703a8b5f8ba537da104c82f4a845d
+  data.tar.gz: 307b2a33d3d6d3357bc8c59079dfa0bbdb62a9e189894abde7d9b32bcf180c42b5614dcdb4ccdcebdc593c40e32afe59c3ad018db50a3ecff8568c833034778e

data/lib/libbin.rb

@@ -117,10 +117,11 @@ module LibBin
       end
     end
 
-    def __decode_seek_offset(offset)
+    def __decode_seek_offset(offset, relative_offset)
       return nil unless offset
       offset = __decode_expression(offset)
       return false if offset == 0x0
+      offset += @__position if relative_offset
       @__cur_position = offset
       @__input.seek(offset) if @__input
       @__output.seek(offset) if @__output
@@ -141,31 +142,31 @@ module LibBin
       return __decode_expression(type)
     end
 
-    def __decode_static_conditions(type, count, offset, sequence, condition)
+    def __decode_static_conditions(field)
       @__offset = nil
       @__condition = nil
       @__type = nil
       @__count = nil
-      unless sequence
-        @__offset = __decode_seek_offset(offset)
+      unless field.sequence?
+        @__offset = __decode_seek_offset(field.offset, field.relative_offset?)
         throw :ignored, nil if @__offset == false
-        @__condition = __decode_condition(condition)
+        @__condition = __decode_condition(field.condition)
         throw :ignored, nil unless @__condition
-        @__type = __decode_type(type)
+        @__type = __decode_type(field.type)
       end
-      @__count = __decode_count(count)
+      @__count = __decode_count(field.count)
     end
 
-    def __decode_dynamic_conditions(type, offset, sequence, condition)
-      return true unless sequence
+    def __decode_dynamic_conditions(field)
+      return true unless field.sequence?
       @__offset = nil
       @__condition = nil
       @__type = nil
-      @__offset = __decode_seek_offset(offset)
+      @__offset = __decode_seek_offset(field.offset, field.relative_offset?)
       return false if @__offset == false
-      @__condition = __decode_condition(condition)
+      @__condition = __decode_condition(field.condition)
       return false unless @__condition
-      @__type = __decode_type(type)
+      @__type = __decode_type(field.type)
       return true
     end
 
@@ -177,61 +178,61 @@ module LibBin
       @__condition = nil
     end
 
-    def __convert_field(field, type, count, offset, sequence, condition)
-      __decode_static_conditions(type, count, offset, sequence, condition)
+    def __convert_field(field)
+      __decode_static_conditions(field)
       vs = @__count.times.collect do |it|
         @__iterator = it
-        if __decode_dynamic_conditions(type, offset, sequence, condition)
+        if __decode_dynamic_conditions(field)
           @__type::convert(@__input, @__output, @__input_big, @__output_big, self, it)
         else
           nil
         end
       end
       __restore_context
-      vs = vs.first unless count
+      vs = vs.first unless field.count
       vs
     end
 
-    def __load_field(field, type, count, offset, sequence, condition)
-      __decode_static_conditions(type, count, offset, sequence, condition)
+    def __load_field(field)
+      __decode_static_conditions(field)
       vs = @__count.times.collect do |it|
         @__iterator = it
-        if __decode_dynamic_conditions(type, offset, sequence, condition)
+        if __decode_dynamic_conditions(field)
           @__type::load(@__input, @__input_big, self, it)
         else
           nil
         end
       end
       __restore_context
-      vs = vs.first unless count
+      vs = vs.first unless field.count
       vs
     end
 
-    def __dump_field(vs, field, type, count, offset, sequence, condition)
-      __decode_static_conditions(type, count, offset, sequence, condition)
-      vs = [vs] unless count
+    def __dump_field(vs, field)
+      __decode_static_conditions(field)
+      vs = [vs] unless field.count
       vs.each_with_index do |v, it|
         @__iterator = it
-        if __decode_dynamic_conditions(type, offset, sequence, condition)
+        if __decode_dynamic_conditions(field)
           @__type::dump(v, @__output, @__output_big, self, it)
         end
       end
       __restore_context
     end
 
-    def __shape_field(vs, previous_offset, kind, field, type, count, offset, sequence, condition)
-      __decode_static_conditions(type, count, offset, sequence, condition)
-      vs = [vs] unless count
+    def __shape_field(vs, previous_offset, kind, field)
+      __decode_static_conditions(field)
+      vs = [vs] unless field.count
       vs = vs.each_with_index.collect do |v, it|
         @__iterator = it
-        if __decode_dynamic_conditions(type, offset, sequence, condition)
+        if __decode_dynamic_conditions(field)
           sh = @__type::shape(v, @__cur_position, self, it, kind)
           @__cur_position = sh.last + 1 if sh.last && sh.last >= 0
           sh
         end
       end
       __restore_context
-      vs = vs.first unless count
+      vs = vs.first unless field.count
       vs
     end
 
@@ -242,15 +243,15 @@ module LibBin
     def __shape(previous_offset = 0, parent = nil, index = nil, kind = DataShape)
       __set_size_type(previous_offset, parent, index)
       members = {}
-      self.class.instance_variable_get(:@fields).each { |name, type, *args|
+      self.class.instance_variable_get(:@fields).each { |field|
         begin
-          vs = send(name)
+          vs = send(field.name)
           member = catch(:ignored) do
-            __shape_field(vs, previous_offset, kind, name, type, *args)
+            __shape_field(vs, previous_offset, kind, field)
           end
-          members[name] = member
+          members[field.name] = member
         rescue
-          STDERR.puts "#{self.class}: #{name}(#{type})"
+          STDERR.puts "#{self.class}: #{field.name}(#{field.type})"
           raise
         end
       }
@@ -260,14 +261,14 @@ module LibBin
     end
 
     def __convert_fields
-      self.class.instance_variable_get(:@fields).each { |name, type, *args|
+      self.class.instance_variable_get(:@fields).each { |field|
         begin
           vs = catch(:ignored) do
-            __convert_field(name, type, *args)
+            __convert_field(field)
           end
-          send("#{name}=", vs)
+          send("#{field.name}=", vs)
         rescue
-          STDERR.puts "#{self.class}: #{name}(#{type})"
+          STDERR.puts "#{self.class}: #{field.name}(#{field.type})"
           raise
         end
       }
@@ -275,14 +276,14 @@ module LibBin
     end
 
     def __load_fields
-      self.class.instance_variable_get(:@fields).each { |name, type, *args|
+      self.class.instance_variable_get(:@fields).each { |field|
         begin
           vs = catch(:ignored) do
-            __load_field(name, type, *args)
+            __load_field(field)
           end
-          send("#{name}=", vs)
+          send("#{field.name}=", vs)
         rescue
-          STDERR.puts "#{self.class}: #{name}(#{type})"
+          STDERR.puts "#{self.class}: #{field.name}(#{field.type})"
           raise
         end
       }
@@ -290,14 +291,14 @@ module LibBin
     end
 
     def __dump_fields
-      self.class.instance_variable_get(:@fields).each { |name, type, *args|
+      self.class.instance_variable_get(:@fields).each { |field|
         begin
-          vs = send(name)
+          vs = send(field.name)
           catch(:ignored) do
-            __dump_field(vs, name, type, *args)
+            __dump_field(vs, field)
           end
         rescue
-          STDERR.puts "#{self.class}: #{name}(#{type})"
+          STDERR.puts "#{self.class}: #{field.name}(#{field.type})"
           raise
         end
       }
@@ -346,7 +347,7 @@ module LibBin
     end
 
     def self.shape(value, previous_offset = 0, parent = nil, index = nil, kind = DataShape)
-      value.__shape(previous_offset, parent, index, kind = DataShape)
+      value.__shape(previous_offset, parent, index, kind)
     end
 
   end

data/lib/libbin/data_types.rb

@@ -70,6 +70,34 @@ module LibBin
 
   end
 
+  class Field
+    attr_reader :name,
+                :type,
+                :count,
+                :offset,
+                :sequence,
+                :condition
+
+    def sequence?
+      @sequence
+    end
+
+    def relative_offset?
+      @relative_offset
+    end
+
+    def initialize(name, type, count, offset, sequence, condition, relative_offset)
+      @name = name
+      @type = type
+      @count = count
+      @offset = offset
+      @sequence = sequence
+      @condition = condition
+      @relative_offset = relative_offset
+    end
+
+  end
+
   class DataConverter
 
     rl = lambda { |type, str|
@@ -340,17 +368,17 @@ module LibBin
 
     end
 
-    def self.register_field(field, type, count: nil, offset: nil, sequence: false, condition: nil)
+    def self.register_field(field, type, count: nil, offset: nil, sequence: false, condition: nil, relative_offset: false)
       if type.kind_of?(Symbol)
         if type[0] == 'a'
-          c = Class::new(Str) do init(sym) end
-          @fields.push([field, c, count, offset, sequence, condition])
+          real_type = Class::new(Str) do init(sym) end
         else
-          @fields.push([field, const_get(SCALAR_TYPES[type][0]), count, offset, sequence, condition])
+          real_type = const_get(SCALAR_TYPES[type][0])
         end
       else
-        @fields.push([field, type, count, offset, sequence, condition])
+        real_type = type
       end
+      @fields.push(Field::new(field, real_type, count, offset, sequence, condition, relative_offset))
       attr_accessor field
     end
 
@@ -361,8 +389,8 @@ module LibBin
       init(#{symbol.inspect})
     end
 
-    def self.#{name}(field, count: nil, offset: nil, sequence: false, condition: nil)
-      @fields.push([field, #{klassname}, count, offset, sequence, condition])
+    def self.#{name}(field, count: nil, offset: nil, sequence: false, condition: nil, relative_offset: false)
+      @fields.push(Field::new(field, #{klassname}, count, offset, sequence, condition, relative_offset))
       attr_accessor field
     end
 EOF
@@ -401,12 +429,12 @@ EOF
     create_scalar_type(:pghalf_le)
     create_scalar_type(:pghalf_be)
 
-    def self.string( field, length = nil, count: nil, offset: nil, sequence: false, condition: nil)
+    def self.string( field, length = nil, count: nil, offset: nil, sequence: false, condition: nil, relative_offset: false)
       sym = (length ? :"a#{length}" : :"a*")
       c = Class::new(Str) do
         init(sym)
       end
-      @fields.push([field, c, count, offset, sequence, condition])
+      @fields.push(Field::new(field, c, count, offset, sequence, condition, relative_offset))
       attr_accessor field
     end
 

data/libbin.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'libbin'
-  s.version = "1.0.3"
+  s.version = "1.0.4"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/kerilk/libbin"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libbin
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: float-formats