libbin 0.9.0 → 1.0.4

data/ext/libbin/pghalf.h

@@ -0,0 +1,9 @@
+#ifndef PGHALF_H
+#define PGHALF_H
+
+#include <stdint.h>
+
+uint32_t pghalf_to_float( uint16_t h );
+uint16_t pghalf_from_float( uint32_t f );
+
+#endif /* PGHALF_H */

data/lib/libbin.rb

@@ -1,10 +1,6 @@
-warn_level = $VERBOSE
-$VERBOSE = nil
-require 'float-formats'
-$VERBOSE = warn_level
-
-Flt::IEEE.binary :IEEE_binary16_pg, significand: 9, exponent: 6, bias: 47
-Flt::IEEE.binary :IEEE_binary16_pg_BE, significand: 9, exponent: 6, bias: 47, endianness: :big_endian
+module LibBin
+end
+require "libbin_c.so"
 
 require_relative 'libbin/alignment'
 require_relative 'libbin/data_types'
@@ -121,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
@@ -145,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
 
@@ -181,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
 
@@ -246,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
       }
@@ -264,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
       }
@@ -279,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
       }
@@ -294,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
       }
@@ -350,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|
@@ -218,18 +246,18 @@ module LibBin
       :E => l["E"],
       :G => l["G"],
       :"a*" => l["a*"],
-      :half => [ lambda { |str| Flt::IEEE_binary16_BE::from_bytes(str).to(Float) },
-                 lambda { |v| Flt::IEEE_binary16_BE::new(v).to_bytes } ],
-      :half_le => [ lambda { |str| Flt::IEEE_binary16_LE::from_bytes(str).to(Float) },
-                    lambda { |v| Flt::IEEE_binary16_LE::new(v).to_bytes } ],
-      :half_be => [ lambda { |str| Flt::IEEE_binary16_BE::from_bytes(str).to(Float) },
-                    lambda { |v| Flt::IEEE_binary16_BE::new(v).to_bytes } ],
-      :pghalf => [ lambda { |str| Flt::IEEE_binary16_pg_BE::from_bytes(str).to(Float) },
-                   lambda { |v| Flt::IEEE_binary16_pg_BE::new(v).to_bytes } ],
-      :pghalf_le => [ lambda { |str| Flt::IEEE_binary16_pg_LE::from_bytes(str).to(Float) },
-                      lambda { |v| Flt::IEEE_binary16_pg_LE::new(v).to_bytes } ],
-      :pghalf_be => [ lambda { |str| Flt::IEEE_binary16_pg_BE::from_bytes(str).to(Float) },
-                      lambda { |v| Flt::IEEE_binary16_pg_BE::new(v).to_bytes } ]
+      :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>") } ]
     } )
     DATA_ENDIAN[false].merge!( {
       :c => l["c"],
@@ -263,18 +291,18 @@ module LibBin
       :E => l["E"],
       :G => l["G"],
       :"a*" => l["a*"],
-      :half => [ lambda { |str| Flt::IEEE_binary16::from_bytes(str).to(Float) },
-                 lambda { |v| Flt::IEEE_binary16::new(v).to_bytes } ],
-      :half_le => [ lambda { |str| Flt::IEEE_binary16_LE::from_bytes(str).to(Float) },
-                    lambda { |v| Flt::IEEE_binary16_LE::new(v).to_bytes } ],
-      :half_be => [ lambda { |str| Flt::IEEE_binary16_BE::from_bytes(str).to(Float) },
-                    lambda { |v| Flt::IEEE_binary16_BE::new(v).to_bytes } ],
-      :pghalf => [ lambda { |str| Flt::IEEE_binary16_pg::from_bytes(str).to(Float) },
-                   lambda { |v| Flt::IEEE_binary16_pg::new(v).to_bytes } ],
-      :pghalf_le => [ lambda { |str| Flt::IEEE_binary16_pg_LE::from_bytes(str).to(Float) },
-                      lambda { |v| Flt::IEEE_binary16_pg_LE::new(v).to_bytes } ],
-      :pghalf_be => [ lambda { |str| Flt::IEEE_binary16_pg_BE::from_bytes(str).to(Float) },
-                      lambda { |v| Flt::IEEE_binary16_pg_BE::new(v).to_bytes } ]
+      :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>") } ]
     } )
 
 
@@ -292,7 +320,7 @@ module LibBin
         @symbol = symbol
         @size = DATA_SIZES[symbol]
         @rl_be, @sl_be = DATA_ENDIAN[true][symbol]
-        @rl_le, @sl_be = DATA_ENDIAN[false][symbol]
+        @rl_le, @sl_le = DATA_ENDIAN[false][symbol]
       end
 
       def self.load(input, input_big = LibBin::default_big?, _ = nil, _ = nil)
@@ -305,7 +333,7 @@ module LibBin
         output.write(str)
       end
 
-      def self.convert(input, output, input_big = LibBin::default_big?, output_big = !LibBin::default_big, _ = nil, _ = nil)
+      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])
@@ -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,12 +1,13 @@
 Gem::Specification.new do |s|
   s.name = 'libbin'
-  s.version = "0.9.0"
+  s.version = "1.0.4"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://github.com/kerilk/libbin"
   s.summary = "Library for loading and converting binary files"
   s.description = "Read, write and convert Binary data in Ruby."
-  s.files =  Dir[ 'libbin.gemspec', 'LICENSE', 'lib/**/*.rb' ]
+  s.files =  Dir[ 'libbin.gemspec', 'LICENSE', 'lib/**/*.rb', 'ext/libbin/extconf.rb', 'ext/libbin/*.c', 'ext/libbin/*.h' ]
+  s.extensions << 'ext/libbin/extconf.rb'
   s.has_rdoc = false
   s.license = 'BSD-2-Clause'
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libbin
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Brice Videau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: float-formats
@@ -33,10 +33,17 @@ dependencies:
 description: Read, write and convert Binary data in Ruby.
 email: brice.videau@imag.fr
 executables: []
-extensions: []
+extensions:
+- ext/libbin/extconf.rb
 extra_rdoc_files: []
 files:
 - LICENSE
+- ext/libbin/extconf.rb
+- ext/libbin/half.c
+- ext/libbin/half.h
+- ext/libbin/libbin_c.c
+- ext/libbin/pghalf.c
+- ext/libbin/pghalf.h
 - lib/libbin.rb
 - lib/libbin/alignment.rb
 - lib/libbin/data_types.rb