fiddley 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40c44de1a787ff01ff58cbd885e28e4aebffb063
-  data.tar.gz: b2bba367d2214502e68bbb86f4f9ebea98dc52d6
+  metadata.gz: bf2d272d2170487e17fb8f3c96e70076228361f6
+  data.tar.gz: c1a3515ec44871af8a51f0e482f1bcc0352903f0
 SHA512:
-  metadata.gz: b160ea03d9468ac5481b0cf9a19112ceda1bc3f991ffe01b925cc6fae96fdad428b083f6bd32b7452a5e09f2668feaae6bca93c0fb96412cd37248538fea8ac8
-  data.tar.gz: 334b5e0d787047ab6bc0b43390b375769424d663cef00d11d1eaab7822db13dd4c845a65b1e27e3764a6fa2c4e00f0f25778daf3e6302b6dcb2dbcc1e4623116
+  metadata.gz: 8679a00557727ed2d2590f82f7d85f9977c415f5001338d4463653f28d407b0270dbd24b6e51a20a42ee4139e2cfa7c8de197a4b371b519cabd49a1e1e88b270
+  data.tar.gz: 538b0728b44e29d737fbfb6a3f0d8ff0f572049853ed45a2a4cdd554eaec1ddc95528659b648dde7a8d65b5e6a4cee1d4e321631801b879cff6159b978067fb5

data/README.md

@@ -9,6 +9,8 @@ Status
 
 Under development.
 
+For example, now can run [optcarrot](https://github.com/mame/optcarrot).
+
 
 
 License

data/lib/fiddley.rb

@@ -1,5 +1,5 @@
 module Fiddley
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
 
 require "fiddley/function"

data/lib/fiddley/function.rb

@@ -1,14 +1,12 @@
-require "fiddle/import"
+require "fiddle"
 require "fiddley/utils"
 
 module Fiddley
-  class Function
+  class Function < Fiddle::Closure::BlockCaller
+    include Fiddley::Utils
+
     def initialize(ret, params, blk)
-      Module.new do
-        extend Fiddle::Importer
-        dlload Fiddley::Library::LIBC
-        @@func = bind("#{Fiddley::Utils.type2str(ret)} callback(#{params.map{|e| Fiddley::Utils.type2str(e)}.join(', ')})", &blk)
-      end
+      super(type2type(ret), params.map{|e| type2type(e)}, &blk)
     end
   end
 end

data/lib/fiddley/library.rb

@@ -6,15 +6,27 @@ module Fiddley
     include Fiddley::Utils
     include Fiddle::Importer
 
-    def ffi_lib(so)
-      begin
-        dlload so
-      rescue Fiddle::DLError
-        begin
-          dlload LIBPREFIX + so
-        rescue Fiddle::DLError
-          dlload LIBPREFIX + so + "." + LIBSUFFIX
+    def ffi_lib(*args)
+      args.each do |soes|
+        soes = [soes] unless soes.is_a?(Array)
+        loaded = false
+        soes.each do |so|
+          begin
+            begin
+              dlload so
+            rescue Fiddle::DLError
+              begin
+                dlload LIBPREFIX + so
+              rescue Fiddle::DLError
+                dlload LIBPREFIX + so + "." + LIBSUFFIX
+              end
+            end
+            loaded = true
+            break
+          rescue Fiddle::DLError
+          end
         end
+        raise Fiddle::DLError, "can't load #{soes.join(' or ')}" unless loaded
       end
     end
 

data/lib/fiddley/struct.rb

@@ -11,7 +11,7 @@ module Fiddley
       @size = 0
       args.each_slice(2) do |name, type|
         @members[name] = [type, @size]
-        @size += type2size(type)
+        @size += type2offset_size(type)
       end
     end
 

data/lib/fiddley/utils.rb

@@ -1,3 +1,5 @@
+require "fiddle"
+
 module Fiddley
   unless "".respond_to?(:unpack1)
     module RefineStringUnpack1
@@ -13,27 +15,56 @@ module Fiddley
 
   module Utils
     # assumes short = 16bit, int = 32bit, long long = 64bit
-    LONG_SIZE = [0].pack('l!').bytesize
-    POINTER_SIZE = [nil].pack('p').bytesize
-    SIZET_FORMAT = POINTER_SIZE == LONG_SIZE ? 'l!' : 'q'
-    SIZET_TYPE = POINTER_SIZE == LONG_SIZE ? 'unsigned long' : 'unsigned long long'
+    SIZET_FORMAT = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG ? 'l!' : 'q'
+    SIZET_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG ? 'unsigned long' : 'unsigned long long'
 
     module_function def type2size(type)
       case type
       when :char, :uchar, :int8, :uint8
-        1
+        Fiddle::SIZEOF_CHAR
+      when :short, :ushort, :int16, :uint16
+        Fiddle::SIZEOF_SHORT
+      when :int, :uint, :int32, :uint32, :bool
+        Fiddle::SIZEOF_INT
+      when :long, :ulong
+        Fiddle::SIZEOF_LONG
+      when :int64, :uint64, :long_long, :ulong_long
+        Fiddle::SIZEOF_LONG_LONG
+      when :float
+        Fiddle::SIZEOF_FLOAT
+      when :double
+        Fiddle::SIZEOF_DOUBLE
+      when :size_t
+        Fiddle::SIZEOF_SIZE_T
+      when :string, :pointer
+        Fiddle::SIZEOF_VOIDP
+      else
+        raise RuntimeError, "unknown type #{type}"
+      end
+    end
+
+    module_function def type2offset_size(type)
+      case type
+      when :char, :uchar, :int8, :uint8
+        Fiddle::ALIGN_CHAR
       when :short, :ushort, :int16, :uint16
-        2
+        Fiddle::ALIGN_SHORT
       when :int, :uint, :int32, :uint32, :bool
-        4
+        Fiddle::ALIGN_INT
       when :long, :ulong
-        LONG_SIZE
+        Fiddle::ALIGN_LONG
       when :int64, :uint64, :long_long, :ulong_long
-        8
-      when :string, :pointer, :size_t
-        POINTER_SIZE
+        Fiddle::ALIGN_LONG_LONG
+      when :float
+        Fiddle::ALIGN_FLOAT
+      when :double
+        Fiddle::ALIGN_DOUBLE
+      when :size_t
+        Fiddle::ALIGN_SIZE_T
+      when :string, :pointer
+        Fiddle::ALIGN_VOIDP
       else
-        raise ArgumentError, "unknown type #{type}"
+        raise RuntimeError, "unknown type #{type}"
       end
     end
 
@@ -65,12 +96,16 @@ module Fiddley
         str.unpack1('q')
       when :ulong_long, :uint64
         str.unpack1('Q')
-      when :string, :pointer
-        str.unpack1('p')
       when :size_t
         str.unpack1(SIZET_FORMAT)
+      when :float
+        str.unpack1('f')
+      when :double
+        str.unpack1('d')
+      when :string, :pointer
+        str.unpack1('p')
       else
-        raise ArgumentError, "unknown type #{type}"
+        raise RuntimeError, "unknown type #{type}"
       end
     end
 
@@ -102,12 +137,16 @@ module Fiddley
         [value].pack('q')
       when :ulong_long, :uint64
         [value].pack('Q')
-      when :string, :pointer
-        [value].pack('p')
       when :size_t
         [value].pack(SIZET_FORMAT)
+      when :float
+        [value].pack('f')
+      when :double
+        [value].pack('d')
+      when :string, :pointer
+        [value].pack('p')
       else
-        raise ArgumentError, "unknown type #{type}"
+        raise RuntimeError, "unknown type #{type}"
       end
     end
 
@@ -133,13 +172,54 @@ module Fiddley
         "long long"
       when :ulong_long, :uint64
         "unsigned long long"
-      when :string, :pointer
-        "void *"
       when :size_t
         SIZET_TYPE
+      when :float
+        "float"
+      when :double
+        "double"
+      when :string, :pointer
+        "void *"
       else
         type.to_s
       end
     end
+
+    module_function def type2type(type)
+      case type
+      when :char, :int8
+        Fiddle::TYPE_CHAR
+      when :uchar, :uint8
+        -Fiddle::TYPE_CHAR
+      when :short, :int16
+        Fiddle::TYPE_SHORT
+      when :ushort, :uint16
+        -Fiddle::TYPE_SHORT
+      when :int, :int32
+        Fiddle::TYPE_INT
+      when :uint, :uint32
+        -Fiddle::TYPE_INT
+      when :long
+        Fiddle::TYPE_LONG
+      when :ulong
+        -Fiddle::TYPE_LONG
+      when :long_long, :int64
+        Fiddle::TYPE_LONG_LONG
+      when :ulong_long, :uint64
+        -Fiddle::TYPE_LONG_LONG
+      when :float
+        Fiddle::TYPE_FLOAT
+      when :double
+        Fiddle::TYPE_DOUBLE
+      when :size_t
+        Fiddle::TYPE_SIZE_T
+      when :string, :pointer
+        Fiddle::TYPE_VOIDP
+      when :void
+        Fiddle::TYPE_VOID
+      else
+        raise RuntimeError, "unknown type #{type}"
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiddley
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - U.Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies: []
 description: Use Fiddle instead of Ruby-FFI !!!
 email: