ffi-compiler 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87b97ccecbaf39ef45a53f9337e6ecade626e876
-  data.tar.gz: a24d4e75bc369faf590da123fe91b281f85cda09
+  metadata.gz: 0d72c341f9ccb50429bfd8a3542d3c9481f7e4d2
+  data.tar.gz: 780d11e250a8e1637d287d8482c7eb319d170db8
 SHA512:
-  metadata.gz: f8359cadf2f988f7099fd167a657af27ce8b1ebfb57bf459a84ef48ce6dda08c66b38ccd138e8e04fff954daeedd7bf8fe8cbe96958f41c114e8615ce7e11331
-  data.tar.gz: de1f3dbd908f0144c19ba89d290e6a6d39e35c35686eba25784c045536b0b5ecc71ecd865411c5b4564b74f0c956bb4660d663b3672092a9e9fb786bc8929a54
+  metadata.gz: a4d9af481db298d53bba6d89b85f4f288043748ca736f84f751f1cb16ad829be4719fbf5faab58a14ebdbaa91a01d0cafbaa31104c1dbfaae6cd9093f371c1e5
+  data.tar.gz: f7d499575077854ec5913209f0ec8fb83e01028a90b93ba86c8b221bc9b31f8c135a3df6370b47cc0a5f7a611167c1ae4f0971c6cec7032e40d435ff2123395e

data/ffi-compiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'ffi-compiler'
-  s.version = '0.1.3'
+  s.version = '1.0.0'
   s.author = 'Wayne Meissner'
   s.email = 'wmeissner@gmail.com'
   s.homepage = 'http://wiki.github.com/ffi/ffi'

data/lib/ffi-compiler/compile_task.rb

@@ -13,10 +13,13 @@ module FFI
 
     class CompileTask < Rake::TaskLib
       attr_reader :cflags, :cxxflags, :ldflags, :libs, :platform
+      attr_accessor :name, :ext_dir, :source_dirs, :exclude
 
       def initialize(name)
         @name = File.basename(name)
         @ext_dir = File.dirname(name)
+        @source_dirs = [@ext_dir]
+        @exclude = []
         @defines = []
         @include_paths = []
         @library_paths = []
@@ -34,6 +37,14 @@ module FFI
         define_task!
       end
 
+      def add_include_path(path)
+        @include_paths << path
+      end
+
+      def add_define(name, value=1)
+        @defines << "-D#{name}=#{value}"
+      end
+
       def have_func?(func)
         main = <<-C_FILE
         extern void #{func}();
@@ -95,20 +106,28 @@ module FFI
         lib_name = File.join(out_dir, Platform.system.map_library_name(@name))
 
         iflags = @include_paths.uniq.map { |p| "-I#{p}" }
-        defines = @functions.uniq.map { |f| "-DHAVE_#{f.upcase}=1" }
-        defines << @headers.uniq.map { |h| "-DHAVE_#{h.upcase.sub(/\./, '_')}=1" }
+        @defines << @functions.uniq.map { |f| "-DHAVE_#{f.upcase}=1" }
+        @defines << @headers.uniq.map { |h| "-DHAVE_#{h.upcase.sub(/\./, '_')}=1" }
 
-        cflags = (@cflags + pic_flags + iflags + defines).join(' ')
-        cxxflags = (@cxxflags + @cflags + pic_flags + iflags + defines).join(' ')
+        cflags = (@cflags + pic_flags + iflags + @defines).join(' ')
+        cxxflags = (@cxxflags + @cflags + pic_flags + iflags + @defines).join(' ')
         ld_flags = (@library_paths.map { |path| "-L#{path}" } + @ldflags).join(' ')
         libs = (@libraries.map { |l| "-l#{l}" } + @libs).join(' ')
 
-        src_files = FileList["#{@ext_dir}/**/*.{c,cpp}"]
-        obj_files = src_files.ext('.o').map { |f| File.join(out_dir, f.sub(/^#{@ext_dir}\//, '')) }
-        ld = src_files.detect { |f| f =~ /\.cpp$/ } ? cxx : cc
-
+        src_files = []
+        obj_files = []
+        @source_dirs.each do |dir|
+          files = FileList["#{dir}/**/*.{c,cpp}"]
+	  unless @exclude.empty?
+	    files.delete_if { |f| f =~ Regexp.union(*@exclude) }
+	  end
+          src_files += files
+          obj_files += files.ext('.o').map { |f| File.join(out_dir, f.sub(/^#{dir}\//, '')) }
+	end
+
+        index = 0
         src_files.each do |src|
-          obj_file = File.join(out_dir, src.sub(/\.(c|cpp)$/, '.o').sub(/^#{@ext_dir}\//, ''))
+          obj_file = obj_files[index]
           if src =~ /\.c$/
             file obj_file => [ src, File.dirname(obj_file) ] do |t|
               sh "#{cc} #{cflags} -o #{t.name} -c #{t.prerequisites[0]}"
@@ -121,8 +140,11 @@ module FFI
           end
 
           CLEAN.include(obj_file)
+          index += 1
         end
 
+        ld = src_files.detect { |f| f =~ /\.cpp$/ } ? cxx : cc
+
         # create all the directories for the output files
         obj_files.map { |f| File.dirname(f) }.sort.uniq.map { |d| directory d }
 
@@ -135,7 +157,7 @@ module FFI
         @exports.each do |e|
           desc "Export #{e[:rb_file]}"
           file e[:header] => [ e[:rb_file] ] do |t|
-            ruby "-I#{File.join(File.dirname(__FILE__), 'fake_ffi')} #{File.join(File.dirname(__FILE__), 'exporter.rb')} #{t.prerequisites[0]} #{t.name}"
+            ruby "-I#{File.join(File.dirname(__FILE__), 'fake_ffi')} -I#{File.dirname(t.prerequisites[0])} #{File.join(File.dirname(__FILE__), 'exporter.rb')} #{t.prerequisites[0]} #{t.name}"
           end
 
           obj_files.each { |o| file o  => [ e[:header] ] }
@@ -199,8 +221,10 @@ module FFI
           File.open(path, 'w') do |f|
             f << src
           end
+          cflags = opts.join(' ')
+          output = File.join(dir, 'ffi-test')
           begin
-            return system "#{cc} #{opts.join(' ')} -o #{File.join(dir, 'ffi-test')} #{path} > /dev/null 2>&1"
+            return system "#{cc} #{cflags} -o #{output} -c #{path} > #{path}.log 2>&1"
           rescue
             return false
           end

data/lib/ffi-compiler/fake_ffi/ffi.rb

@@ -3,11 +3,11 @@ module FFI
   def self.exporter=(exporter)
     @@exporter = exporter
   end
-  
+
   def self.exporter
-    @@exporter
+    @@exporter ||= Exporter.new(nil)
   end
-  
+
   class Type
     attr_reader :name
     def initialize(name)
@@ -26,8 +26,28 @@ module FFI
       super("struct #{struct_class.to_s.gsub('::', '_')}")
     end
   end
-  
+
+  class CallbackInfo
+    attr_reader :return_type
+    attr_reader :arg_types
+    attr_reader :options
+
+    def initialize(return_type, arg_types = [], *other)
+      @return_type = return_type
+      @arg_types = arg_types
+      @options = options
+    end
+
+    def name(name)
+      params = @arg_types.empty? ? 'void' : @arg_types.map(&:name).join(', ')
+      "#{@return_type.name} (*#{name})(#{params})"
+    end
+  end
+
   PrimitiveTypes = {
+      :void => 'void',
+      :bool => 'bool',
+      :string => 'const char *',
       :char => 'char',
       :uchar => 'unsigned char',
       :short => 'short',
@@ -36,15 +56,29 @@ module FFI
       :uint => 'unsigned int',
       :long => 'long',
       :ulong => 'unsigned long',
+      :long_long => 'long long',
+      :ulong_long => 'unsigned long long',
       :float => 'float',
       :double => 'double',
+      :long_double => 'long double',
       :pointer => 'void *',
-      :string => 'const char *',
+      :int8 => 'int8_t',
+      :uint8 => 'uint8_t',
+      :int16 => 'int16_t',
+      :uint16 => 'uint16_t',
+      :int32 => 'int32_t',
+      :uint32 => 'uint32_t',
+      :int64 => 'int64_t',
+      :uint64 => 'uint64_t',
+      :buffer_in => 'const in void *',
+      :buffer_out => 'out void *',
+      :buffer_inout => 'inout void *',
+      :varargs => '...'
   }
-  
+
   TypeMap = {}
   def self.find_type(type)
-    return type if type.is_a?(Type)
+    return type if type.is_a?(Type) or type.is_a?(CallbackInfo)
 
     t = TypeMap[type]
     return t unless t.nil?
@@ -55,12 +89,19 @@ module FFI
     raise TypeError.new("cannot resolve type #{type}")
   end
 
+  class Function
+    def initialize(*args)
+    end
+  end
+
   class Exporter
-    attr_reader :mod, :functions
+    attr_accessor :mod
+    attr_reader :functions, :callbacks, :structs
 
     def initialize(mod)
       @mod = mod
       @functions = []
+      @callbacks = {}
       @structs = []
     end
 
@@ -71,7 +112,11 @@ module FFI
     def struct(name, fields)
       @structs << { name: name, fields: fields.dup }
     end
-    
+
+    def callback(name, cb)
+      @callbacks[name] = cb
+    end
+
     def dump(out_file)
       File.open(out_file, 'w') do |f|
         guard = File.basename(out_file).upcase.gsub('.', '_').gsub('/', '_')
@@ -88,11 +133,19 @@ module FFI
 #endif
 
         HEADER
-        
+
+        @callbacks.each do |name, cb|
+          f.puts "typedef #{cb.name(name)};"
+        end
         @structs.each do |s|
           f.puts "struct #{s[:name].gsub('::', '_')} {"
           s[:fields].each do |field|
-            f.puts "#{' ' * 4}#{field[:type].name} #{field[:name].to_s};"
+            if field[:type].is_a?(CallbackInfo)
+              type = field[:type].name(field[:name].to_s)
+            else
+              type = "#{field[:type].name} #{field[:name].to_s}"
+            end
+            f.puts "#{' ' * 4}#{type};"
           end
           f.puts '};'
           f.puts
@@ -112,17 +165,31 @@ module FFI
 
   module Library
     def self.extended(mod)
-      FFI.exporter = Exporter.new(mod)
+      FFI.exporter.mod = mod
     end
 
-    def attach_function(*args)
-      FFI.exporter.attach(args[0], args[0], find_type(args[2]), args[1].map { |t| find_type(t) })
+    def attach_function(name, func, args, returns = nil, options = nil)
+      mname, a2, a3, a4, a5 = name, func, args, returns, options
+      cname, arg_types, ret_type, opts = (a4 && (a2.is_a?(String) || a2.is_a?(Symbol))) ? [ a2, a3, a4, a5 ] : [ mname.to_s, a2, a3, a4 ]
+      arg_types = arg_types.map { |e| find_type(e) }
+      FFI.exporter.attach(mname, cname, find_type(ret_type), arg_types)
     end
 
     def ffi_lib(*args)
 
     end
 
+    def callback(*args)
+      name, params, ret = if args.length == 3
+        args
+      else
+        [ nil, args[0], args[1] ]
+      end
+      native_params = params.map { |e| find_type(e) }
+      cb = FFI::CallbackInfo.new(find_type(ret), native_params)
+      FFI.exporter.callback(name, cb) if name
+    end
+
     TypeMap = {}
     def find_type(type)
       t = TypeMap[type]
@@ -138,15 +205,43 @@ module FFI
 
   class Struct
     def self.layout(*args)
+      return if args.size.zero?
       fields = []
-      i = 0
-      while i < args.length
-        fields << { name: args[i], type: find_type(args[i+1]) }
-        i += 2
+      if args.first.kind_of?(Hash)
+        args.first.each do |name, type|
+          fields << { :name => name, :type => find_type(type), :offset => nil }
+        end
+      else
+        i = 0
+        while i < args.size
+          name, type, offset = args[i], args[i+1], nil
+          i += 2
+          if args[i].kind_of?(Integer)
+            offset = args[i]
+            i += 1
+          end
+          fields << { :name => name, :type => find_type(type), :offset => offset }
+        end
       end
       FFI.exporter.struct(self.to_s, fields)
     end
 
+    def initialize
+      @data = {}
+    end
+
+    def [](name)
+      @data[name]
+    end
+
+    def []=(name, value)
+      @data[name] = value
+    end
+
+    def self.callback(params, ret)
+      FFI::CallbackInfo.new(find_type(ret), params.map { |e| find_type(e) })
+    end
+
     TypeMap = {}
     def self.find_type(type)
       t = TypeMap[type]
@@ -158,13 +253,30 @@ module FFI
 
       TypeMap[type] = FFI.find_type(type)
     end
-    
-    def self.by_value
-      StructByValue.new(self)
+
+    def self.in
+      ptr(:in)
     end
-    
-    def self.by_ref
+
+    def self.out
+      ptr(:out)
+    end
+
+    def self.ptr(flags = :inout)
       StructByReference.new(self)
     end
+
+    def self.val
+      StructByValue.new(self)
+    end
+
+    def self.by_value
+      self.val
+    end
+
+    def self.by_ref(flags = :inout)
+      self.ptr(flags)
+    end
+
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ffi-compiler
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby FFI library
@@ -72,16 +72,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ffi-compiler.gemspec
+- LICENSE
 - README.md
 - Rakefile
-- LICENSE
+- ffi-compiler.gemspec
 - lib/ffi-compiler/compile_task.rb
 - lib/ffi-compiler/export_task.rb
 - lib/ffi-compiler/exporter.rb
 - lib/ffi-compiler/fake_ffi/ffi-compiler/loader.rb
 - lib/ffi-compiler/fake_ffi/ffi.rb
-- lib/ffi-compiler/ffi-compiler.iml
 - lib/ffi-compiler/loader.rb
 - lib/ffi-compiler/platform.rb
 - lib/ffi-compiler/task.rb
@@ -95,18 +94,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby FFI Rakefile generator
 test_files: []
+has_rdoc: false

data/lib/ffi-compiler/ffi-compiler.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p392" jdkType="RUBY_SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.4.0, RVM: ruby-1.9.3-p392) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.3, RVM: ruby-1.9.3-p392) [gem]" level="application" />
-  </component>
-</module>
-