libbin 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 230be2238c11ec4505d14cea8a43181b6b006cd3db0eccc4d40d1fb117912681
-  data.tar.gz: c21f1a9ab288be527d14eeea80f248f9332d98d3dc8351dd811536aaa24850f0
+  metadata.gz: e87d96cfea4bd0ff2ca321e9e318eb2afcdddee0764811db35e2a92835396db8
+  data.tar.gz: e75d3aa6a8374e04db4e84db9eb88bc768a99e3ceff932d0ce26d4f6501ae5e6
 SHA512:
-  metadata.gz: a8fbca741eb24035f80751e3eaf49a3b1b89ac1dbb8f4ae9cec3b58c77ddaf2e8b93c74af781cde5756e07d4a4fd115d07e703a8b5f8ba537da104c82f4a845d
-  data.tar.gz: 307b2a33d3d6d3357bc8c59079dfa0bbdb62a9e189894abde7d9b32bcf180c42b5614dcdb4ccdcebdc593c40e32afe59c3ad018db50a3ecff8568c833034778e
+  metadata.gz: f9d940fd59641087b72fb734ba2db6833aa0c7b4620205e8e568580ccc64d4e1f49a433ca206ebe474b8e3946417d1a96491bc79ff977435ef442ad35d9590f7
+  data.tar.gz: 3b04707ce8a3d434596e641dabf1a4a58d95403207d492089029c37f68e4bdf49e568420f7736f426cd95377e7adf1a95ff306d3bcd3c9b0d71544fc541ef156

data/ext/libbin/libbin_c.c

@@ -11,7 +11,7 @@ static VALUE pghalf_from_string_p(VALUE self, VALUE str, VALUE pack_str) {
 	Check_Type(str, T_STRING);
 	Check_Type(pack_str, T_STRING);
 	VALUE arr = rb_funcall(str, rb_intern("unpack"), 1, pack_str);
-        uint16_t val = NUM2USHORT(rb_funcall(arr, rb_intern("first"), 0));
+	uint16_t val = NUM2USHORT(rb_funcall(arr, rb_intern("first"), 0));
 	union float_u res;
 
 	res.i = pghalf_to_float(val);
@@ -22,7 +22,7 @@ static VALUE half_from_string_p(VALUE self, VALUE str, VALUE pack_str) {
 	Check_Type(str, T_STRING);
 	Check_Type(pack_str, T_STRING);
 	VALUE arr = rb_funcall(str, rb_intern("unpack"), 1, pack_str);
-        uint16_t val = NUM2USHORT(rb_funcall(arr, rb_intern("first"), 0));
+	uint16_t val = NUM2USHORT(rb_funcall(arr, rb_intern("first"), 0));
 	union float_u res;
 
 	res.i = half_to_float(val);
@@ -32,25 +32,25 @@ static VALUE half_from_string_p(VALUE self, VALUE str, VALUE pack_str) {
 static VALUE pghalf_to_string_p(VALUE self, VALUE number, VALUE pack_str) {
 	Check_Type(number, T_FLOAT);
 	union float_u val;
-        uint16_t res;
+	uint16_t res;
 
 	val.f = NUM2DBL(number);
 	res = pghalf_from_float(val.i);
-        VALUE arr = rb_ary_new3(1, UINT2NUM(res) );
+	VALUE arr = rb_ary_new3(1, UINT2NUM(res) );
 
-        return rb_funcall(arr, rb_intern("pack"), 1, pack_str);
+	return rb_funcall(arr, rb_intern("pack"), 1, pack_str);
 }
 
 static VALUE half_to_string_p(VALUE self, VALUE number, VALUE pack_str) {
 	Check_Type(number, T_FLOAT);
 	union float_u val;
-        uint16_t res;
+	uint16_t res;
 
 	val.f = NUM2DBL(number);
 	res = half_from_float(val.i);
-        VALUE arr = rb_ary_new3(1, UINT2NUM(res) );
+	VALUE arr = rb_ary_new3(1, UINT2NUM(res) );
 
-        return rb_funcall(arr, rb_intern("pack"), 1, pack_str);
+	return rb_funcall(arr, rb_intern("pack"), 1, pack_str);
 }
 
 void Init_libbin_c() {

data/lib/libbin.rb

@@ -142,10 +142,15 @@ module LibBin
       return __decode_expression(type)
     end
 
+    def __decode_length(length)
+      __decode_expression(length)
+    end
+
     def __decode_static_conditions(field)
       @__offset = nil
       @__condition = nil
       @__type = nil
+      @__length = nil
       @__count = nil
       unless field.sequence?
         @__offset = __decode_seek_offset(field.offset, field.relative_offset?)
@@ -153,6 +158,7 @@ module LibBin
         @__condition = __decode_condition(field.condition)
         throw :ignored, nil unless @__condition
         @__type = __decode_type(field.type)
+        @__length = __decode_length(field.length)
       end
       @__count = __decode_count(field.count)
     end
@@ -162,17 +168,20 @@ module LibBin
       @__offset = nil
       @__condition = nil
       @__type = nil
+      @__length = nil
       @__offset = __decode_seek_offset(field.offset, field.relative_offset?)
       return false if @__offset == false
       @__condition = __decode_condition(field.condition)
       return false unless @__condition
       @__type = __decode_type(field.type)
+      @__length = __decode_length(field.length)
       return true
     end
 
     def __restore_context
       @__iterator = nil
       @__type = nil
+      @__length = nil
       @__count = nil
       @__offset = nil
       @__condition = nil
@@ -183,7 +192,7 @@ module LibBin
       vs = @__count.times.collect do |it|
         @__iterator = it
         if __decode_dynamic_conditions(field)
-          @__type::convert(@__input, @__output, @__input_big, @__output_big, self, it)
+          @__type::convert(@__input, @__output, @__input_big, @__output_big, self, it, @__length)
         else
           nil
         end
@@ -198,7 +207,7 @@ module LibBin
       vs = @__count.times.collect do |it|
         @__iterator = it
         if __decode_dynamic_conditions(field)
-          @__type::load(@__input, @__input_big, self, it)
+          @__type::load(@__input, @__input_big, self, it, @__length)
         else
           nil
         end
@@ -214,7 +223,7 @@ module LibBin
       vs.each_with_index do |v, it|
         @__iterator = it
         if __decode_dynamic_conditions(field)
-          @__type::dump(v, @__output, @__output_big, self, it)
+          @__type::dump(v, @__output, @__output_big, self, it, @__length)
         end
       end
       __restore_context
@@ -226,7 +235,7 @@ module LibBin
       vs = vs.each_with_index.collect do |v, it|
         @__iterator = it
         if __decode_dynamic_conditions(field)
-          sh = @__type::shape(v, @__cur_position, self, it, kind)
+          sh = @__type::shape(v, @__cur_position, self, it, kind, @__length)
           @__cur_position = sh.last + 1 if sh.last && sh.last >= 0
           sh
         end
@@ -326,28 +335,57 @@ module LibBin
       self
     end
       
-    def self.convert(input, output, input_big = LibBin::default_big?, output_big = !LibBin::default_big?, parent = nil, index = nil)
-      h = self::new
-      h.__convert(input, output, input_big, output_big, parent, index)
-      h
+    def self.convert(input, output, input_big = LibBin::default_big?, output_big = !LibBin::default_big?, parent = nil, index = nil, length = nil)
+      if length
+        length.times.collect {
+          h = self::new
+          h.__load(input, input_big, parent, index)
+        }
+      else
+        h = self::new
+        h.__convert(input, output, input_big, output_big, parent, index)
+      end
     end
 
-    def self.load(input, input_big = LibBin::default_big?, parent = nil, index = nil)
-      h = self::new
-      h.__load(input, input_big, parent, index)
-      h
+    def self.load(input, input_big = LibBin::default_big?, parent = nil, index = nil, length = nil)
+      if length
+        length.times.collect {
+          h = self::new
+          h.__load(input, input_big, parent, index)
+        }
+      else
+        h = self::new
+        h.__load(input, input_big, parent, index)
+      end
     end
 
-    def self.dump(value, output, output_big = LibBin::default_big?, parent = nil, index = nil)
-      value.__dump(output, output_big, parent, index)
+    def self.dump(value, output, output_big = LibBin::default_big?, parent = nil, index = nil, length = nil)
+      if length
+        length.times.collect { |i|
+          value[i].__dump(output, output_big, parent, index)
+        }
+        value
+      else
+        value.__dump(output, output_big, parent, index)
+      end
     end
 
-    def self.size(value, previous_offset = 0, parent = nil, index = nil)
-      value.__shape(previous_offset, parent, index).size
+    def self.size(value, previous_offset = 0, parent = nil, index = nil, length = nil)
+      if length
+        shape(value, previous_offset, parent, index, length).size
+      else
+        value.__shape(previous_offset, parent, index).size
+      end
     end
 
-    def self.shape(value, previous_offset = 0, parent = nil, index = nil, kind = DataShape)
-      value.__shape(previous_offset, parent, index, kind)
+    def self.shape(value, previous_offset = 0, parent = nil, index = nil, kind = DataShape, length = nil)
+      if length
+        kind::new(length.times.collect { |i|
+          value[i].__shape(previous_offset, parent, index, kind)
+        })
+      else
+        value.__shape(previous_offset, parent, index, kind)
+      end
     end
 
   end

data/lib/libbin/data_types.rb

@@ -73,6 +73,7 @@ module LibBin
   class Field
     attr_reader :name,
                 :type,
+                :length,
                 :count,
                 :offset,
                 :sequence,
@@ -86,9 +87,10 @@ module LibBin
       @relative_offset
     end
 
-    def initialize(name, type, count, offset, sequence, condition, relative_offset)
+    def initialize(name, type, length, count, offset, sequence, condition, relative_offset)
       @name = name
       @type = type
+      @length = length
       @count = count
       @offset = offset
       @sequence = sequence
@@ -100,12 +102,20 @@ module LibBin
 
   class DataConverter
 
-    rl = lambda { |type, str|
-      str.unpack(type.to_s).first
+    rl = lambda { |type, str, number = nil|
+      if number
+        str.unpack(type.to_s+number.to_s)
+      else
+        str.unpack(type.to_s).first
+      end
     }
 
-    sl = lambda { |type, value|
-      [value].pack(type.to_s)
+    sl = lambda { |type, value, number = nil|
+      if number
+        value.pack(type.to_s+number.to_s)
+      else
+        [value].pack(type.to_s)
+      end
     }
 
     l = lambda { |type|
@@ -189,6 +199,7 @@ module LibBin
       :D => 8,
       :E => 8,
       :G => 8,
+      :a => 1,
       :"a*" => -1,
       :half => 2,
       :half_le => 2,
@@ -214,6 +225,50 @@ module LibBin
       }
     }
 
+    rhl = lambda { |type, str, number = nil|
+      if number
+        number.times.collect { |i| LibBin::half_from_string(str[i*2,2], type) }
+      else
+        LibBin::half_from_string(str, type)
+      end
+    }
+
+    shl = lambda { |type, value, number = nil|
+      if number
+        str = ""
+        number.times { |i| str << LibBin::half_to_string(value[i], type) }
+        str
+      else
+        LibBin::half_to_string(value, type)
+      end
+    }
+
+    hl = lambda { |type|
+      [rhl.curry[type], shl.curry[type]]
+    }
+
+    rpghl = lambda { |type, str, number = nil|
+      if number
+        number.times.collect { |i| LibBin::pghalf_from_string(str[i*2,2], type) }
+      else
+        LibBin::pghalf_from_string(str, type)
+      end
+    }
+
+    spghl = lambda { |type, value, number = nil|
+      if number
+        str = ""
+        number.times { |i| str << LibBin::pghalf_to_string(value[i], type) }
+        str
+      else
+        LibBin::pghalf_to_string(value, type)
+      end
+    }
+
+    pghl = lambda { |type|
+      [rpghl.curry[type], spghl.curry[type]]
+    }
+
     DATA_ENDIAN[true].merge!( {
       :c => l["c"],
       :C => l["C"],
@@ -245,19 +300,12 @@ module LibBin
       :D => l["G"],
       :E => l["E"],
       :G => l["G"],
-      :"a*" => l["a*"],
-      :half => [ lambda { |str| LibBin::half_from_string(str, "S>") },
-                 lambda { |v| LibBin::half_to_string(v, "S>") } ],
-      :half_le => [ lambda { |str| LibBin::half_from_string(str, "S<") },
-                    lambda { |v| LibBin::half_to_string(v, "S<") } ],
-      :half_be => [ lambda { |str| LibBin::half_from_string(str, "S>") },
-                    lambda { |v| LibBin::half_to_string(v, "S>") } ],
-      :pghalf => [ lambda { |str| LibBin::pghalf_from_string(str, "S>") },
-                   lambda { |v| LibBin::pghalf_to_string(v, "S>") } ],
-      :pghalf_le => [ lambda { |str| LibBin::pghalf_from_string(str, "S<") },
-                      lambda { |v| LibBin::pghalf_to_string(v, "S<") } ],
-      :pghalf_be => [ lambda { |str| LibBin::pghalf_from_string(str, "S>") },
-                      lambda { |v| LibBin::pghalf_to_string(v, "S>") } ]
+      :half => hl["S>"],
+      :half_le => hl["S<"],
+      :half_be => hl["S>"],
+      :pghalf => pghl["S>"],
+      :pghalf_le => pghl["S<"],
+      :pghalf_be => pghl["S>"]
     } )
     DATA_ENDIAN[false].merge!( {
       :c => l["c"],
@@ -290,19 +338,12 @@ module LibBin
       :D => l["E"],
       :E => l["E"],
       :G => l["G"],
-      :"a*" => l["a*"],
-      :half => [ lambda { |str| LibBin::half_from_string(str, "S<") },
-                 lambda { |v| LibBin::half_to_string(v, "S<") } ],
-      :half_le => [ lambda { |str| LibBin::half_from_string(str, "S<") },
-                    lambda { |v| LibBin::half_to_string(v, "S<") } ],
-      :half_be => [ lambda { |str| LibBin::half_from_string(str, "S>") },
-                    lambda { |v| LibBin::half_to_string(v, "S>") } ],
-      :pghalf => [ lambda { |str| LibBin::pghalf_from_string(str, "S<") },
-                   lambda { |v| LibBin::pghalf_to_string(v, "S<") } ],
-      :pghalf_le => [ lambda { |str| LibBin::pghalf_from_string(str, "S<") },
-                      lambda { |v| LibBin::pghalf_to_string(v, "S<") } ],
-      :pghalf_be => [ lambda { |str| LibBin::pghalf_from_string(str, "S>") },
-                      lambda { |v| LibBin::pghalf_to_string(v, "S>") } ]
+      :half => hl["S<"],
+      :half_le => hl["S<"],
+      :half_be => hl["S>"],
+      :pghalf => pghl["S<"],
+      :pghalf_le => pghl["S<"],
+      :pghalf_be => pghl["S>"]
     } )
 
 
@@ -312,8 +353,9 @@ module LibBin
         @size
       end
 
-      def self.shape(value, previous_offset = 0, _ = nil, _ = nil, kind = DataShape)
-        kind::new(previous_offset, previous_offset + @size - 1)
+      def self.shape(value, previous_offset = 0, _ = nil, _ = nil, kind = DataShape, length = nil)
+        length = 1 unless length
+        kind::new(previous_offset, previous_offset - 1 + length * @size)
       end
 
       def self.init(symbol)
@@ -323,20 +365,22 @@ module LibBin
         @rl_le, @sl_le = DATA_ENDIAN[false][symbol]
       end
 
-      def self.load(input, input_big = LibBin::default_big?, _ = nil, _ = nil)
-        str = input.read(@size)
-        input_big ? @rl_be[str] : @rl_le[str]
+      def self.load(input, input_big = LibBin::default_big?, _ = nil, _ = nil, length = nil)
+        l = (length ? length : 1)
+        str = input.read(@size*l)
+        input_big ? @rl_be[str, length] : @rl_le[str, length]
       end
 
-      def self.dump(value, output, output_big = LibBin::default_big?, _ = nil, _ = nil)
-        str = (output_big ? @sl_be[value] : @sl_le[value])
+      def self.dump(value, output, output_big = LibBin::default_big?, _ = nil, _ = nil, length = nil)
+        str = (output_big ? @sl_be[value, length] : @sl_le[value, length])
         output.write(str)
       end
 
-      def self.convert(input, output, input_big = LibBin::default_big?, output_big = !input_big, _ = nil, _ = nil)
-        str = input.read(@size)
-        value = (input_big ? @rl_be[str] : @rl_le[str])
-        str = (output_big ? @sl_be[value] : @sl_le[value])
+      def self.convert(input, output, input_big = LibBin::default_big?, output_big = !input_big, _ = nil, _ = nil, length = nil)
+        l = (length ? length : 1)
+        str = input.read(@size*l)
+        value = (input_big ? @rl_be[str, length] : @rl_le[str, length])
+        str = (output_big ? @sl_be[value, length] : @sl_le[value, length])
         output.write(str)
         value
       end
@@ -345,30 +389,34 @@ module LibBin
 
     class Str < Scalar
 
-      def self.load(input,  input_big = LibBin::default_big?, _ = nil, _ = nil)
-        str = (@size < 0 ? input.readline("\x00") : input.read(@size))
-        input_big ? @rl_be[str] : @rl_le[str]
+      def self.size(value, previous_offset = 0, parent = nil, index = nil, length = nil)
+        length ? length : value.size
       end
 
-      def self.convert(input, output, input_big = LibBin::default_big?, output_big = !LibBin::default_big, _ = nil, _ = nil)
-        str = (@size < 0 ? input.readline("\x00") : input.read(@size))
-        value = (input_big ? @rl_be[str] : @rl_le[str])
-        str = (output_big ? @sl_be[value] : @sl_le[value])
+      def self.load(input,  input_big = LibBin::default_big?, _ = nil, _ = nil, length = nil)
+        str = (length ? input.read(length) : input.readline("\x00"))
+      end
+
+      def self.convert(input, output, input_big = LibBin::default_big?, output_big = !LibBin::default_big, _ = nil, _ = nil, length = nil)
+        str = (length ? input.read(length) : input.readline("\x00"))
         output.write(str)
-        value
+        str
       end
 
-      def self.shape(value, previous_offset = 0, _ = nil, _ = nil, kind = DataShape)
-        if @size < 0
-          kind::new(previous_offset, previous_offset + value.size - 1)
+      def self.shape(value, previous_offset = 0, _ = nil, _ = nil, kind = DataShape, length = nil)
+        if length
+          kind::new(previous_offset, previous_offset + length - 1)
         else
-          kind::new(previous_offset, previous_offset + @size - 1)
+          kind::new(previous_offset, previous_offset + value.size - 1)
         end
       end
 
+      def self.dump(value, output, output_big = LibBin::default_big?, _ = nil, _ = nil, length = nil)
+        output.write(value)
+      end
     end
 
-    def self.register_field(field, type, count: nil, offset: nil, sequence: false, condition: nil, relative_offset: false)
+    def self.register_field(field, type, length: nil, count: nil, offset: nil, sequence: false, condition: nil, relative_offset: false)
       if type.kind_of?(Symbol)
         if type[0] == 'a'
           real_type = Class::new(Str) do init(sym) end
@@ -378,7 +426,7 @@ module LibBin
       else
         real_type = type
       end
-      @fields.push(Field::new(field, real_type, count, offset, sequence, condition, relative_offset))
+      @fields.push(Field::new(field, real_type, length, count, offset, sequence, condition, relative_offset))
       attr_accessor field
     end
 
@@ -389,8 +437,8 @@ module LibBin
       init(#{symbol.inspect})
     end
 
-    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))
+    def self.#{name}(field, length: nil, count: nil, offset: nil, sequence: false, condition: nil, relative_offset: false)
+      @fields.push(Field::new(field, #{klassname}, length, count, offset, sequence, condition, relative_offset))
       attr_accessor field
     end
 EOF
@@ -430,15 +478,14 @@ EOF
     create_scalar_type(:pghalf_be)
 
     def self.string( field, length = nil, count: nil, offset: nil, sequence: false, condition: nil, relative_offset: false)
-      sym = (length ? :"a#{length}" : :"a*")
+      sym = (length ? :"a" : :"a*")
       c = Class::new(Str) do
         init(sym)
       end
-      @fields.push(Field::new(field, c, count, offset, sequence, condition, relative_offset))
+      @fields.push(Field::new(field, c, length, count, offset, sequence, condition, relative_offset))
       attr_accessor field
     end
 
-
   end
 
 end

data/libbin.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'libbin'
-  s.version = "1.0.4"
+  s.version = "1.0.5"
   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.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: float-formats