ghazel-ffi_gen 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59badeb70519b6d81f70233f3b9b5f458b3cd837
-  data.tar.gz: e226b09ad9744c9e601f47596f9090ee9bfda943
+  metadata.gz: 814f926f32ab7a8092edafb03d11e41677c4fd30
+  data.tar.gz: 7c9df589bfc4da60582ffab234441e187445cbae
 SHA512:
-  metadata.gz: d91da378622756f0f51f5aad6eceb0a06d8af6a3653f452466fc4800a4e6abdfa99094d34a2e7f53962c8395cf4aeff64fd211df885c3e08bb02f3c68745eae0
-  data.tar.gz: c263479f3ce193f5f4f420050231300dad6c92f2a41b31143f236c031334f0c7619893353c6154e299867e5e284cae1acd328564f7b98020fbf342c27f04005b
+  metadata.gz: 58190d289a912053875897844067f69e4b4f6c5b9f106ebdf291784caa688c7730fdc830fd69e7c8d7f1c1846e59c77a02aacec087b5bc4bcbf1e19ba018e193
+  data.tar.gz: 1ec94347d53eeb823c57a1bf112b23e67edf0632cc6272a0a73bdc6e6f21ec9be1f9e109e7114e932bc8ae8bcb4f757cda3ff482ec27cae0bd9b5a9e3736c2c7

data/lib/ffi_gen/java_output.rb

@@ -152,11 +152,13 @@ class FFIGen
   
   class FunctionOrCallback
     def write_java(writer)
-      return if @is_callback # not yet supported
-      
       jna_signature = "#{@parameters.map{ |parameter| "#{parameter[:type].java_jna_type} #{parameter[:name].to_java_downcase}" }.join(', ')}"
       if @is_callback
-        writer.puts "callback :#{java_name}, #{jna_signature}", ""
+        writer.puts "public static interface #{java_name} extends Callback {"
+        writer.indent do
+          writer.puts "#{@return_type.java_jna_type} invoke(#{jna_signature});"
+        end
+        writer.puts "}"
       else
         writer.puts "@NativeName(\"#{@name.raw}\")", "#{@return_type.java_jna_type} #{java_name}(#{jna_signature});", ""
       end
@@ -169,7 +171,7 @@ class FFIGen
       parameters = []
       lp = nil
       @parameters.each do |p|
-        if lp && lp[:type].is_a?(PointerType) && lp[:type].pointee_type.clang_type == :u_char && p[:type].clang_type == :u_long
+        if lp && lp[:type].is_a?(PointerType) && lp[:type].pointee_type.respond_to?(:clang_type) && lp[:type].pointee_type.clang_type == :u_char && p[:type].clang_type == :u_long
           n = lp[:name].to_java_downcase
           replace[n] = "bytesToPointer(#{n})"
           replace[p[:name].to_java_downcase] = "new NativeLong(#{n}.length)";

data/lib/ffi_gen.rb

@@ -512,7 +512,19 @@ class FFIGen
 
     when :typedef_decl
       typedef_children = Clang.get_children declaration_cursor
-      if typedef_children.size == 1
+      underlying = Clang.get_typedef_decl_underlying_type(declaration_cursor)
+      function_proto = Clang.get_canonical_type(Clang.get_pointee_type(underlying))
+      if function_proto[:kind] == :function_proto
+        return_type = resolve_type Clang.get_result_type(function_proto)
+        parameters = []
+        Clang.get_num_arg_types(function_proto).times do |i|
+          param_type = resolve_type Clang.get_arg_type(function_proto, i)
+          # XXX: TODO: get arg name, somehow
+          param_name = Name.new ['arg', i.to_s]
+          parameters << { name:param_name, type: param_type, description: [] }
+        end
+        FunctionOrCallback.new self, name, parameters, return_type, true, false, comment, []
+      elsif typedef_children.size == 1
         child_declaration = @declarations_by_type[Clang.get_cursor_type(typedef_children.first)]
         child_declaration.name = name if child_declaration and child_declaration.name.nil?
         nil
@@ -678,7 +690,7 @@ class FFIGen
               break
             end
           end
-          pointee_type = resolve_type current_type
+          pointee_type = resolve_type pointee_type
           type = PointerType.new pointee_type, pointee_name, pointer_depth
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghazel-ffi_gen
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Richard Musiol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi