ghazel-ffi_gen 1.3.9.1 → 1.3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a0d67dc3a56cc1b5a4d73a74f89316005b61f70
-  data.tar.gz: c5b89dbc227b3bc2c6bb597368419e301aee368d
+  metadata.gz: e74a49ab6949c362c786be977bee1502716b0a41
+  data.tar.gz: c17d96a9b1c0b418dd1daece53e5ca39d0626a9c
 SHA512:
-  metadata.gz: ac7353f0a2543473fb4e299c2291614cd0e8b62e01961295ea3a9c7e4281e75a8712b51430231115dddb8ee270e952d25b391d2940f596aa6e504a561aa6bbc2
-  data.tar.gz: 8745ddb1d5b14852e96d91b361098ed4ab1321104121df97d0770c19875a9d04a9fb1a80f8a4ddea300ab655f56912888f535a13d8463e302ab9717581c7b77c
+  metadata.gz: 0a221f2f05ffb6c4b47286805d7d874e7b67129ffaeecc98402c089ca531b4ed4fb0e2ac3eb50442f16334199d25259de148090ec529ae9d70b46b9b2fa7fb74
+  data.tar.gz: eda187d248897255b28b2769258b9bf3f00d0e2a5805662c2163578d87ea3bcede5b792fe8ac6a7dc31b482764ccc71f0b34512e3dd3e05bf3bd603b84dbd085

data/lib/ffi_gen.rb

@@ -204,8 +204,9 @@ class FFIGen
   end
 
   class PrimitiveType < Type
-    def initialize(clang_type)
+    def initialize(clang_type, full_type)
       @clang_type = clang_type
+      @full_type = full_type
     end
 
     def name
@@ -219,7 +220,21 @@ class FFIGen
     end
   end
 
+  class ByReferenceType < Type
+    attr_accessor :inner_type
+
+    def initialize(inner_type)
+      @inner_type = inner_type
+    end
+
+    def name
+      @inner_type.name
+    end
+  end
+
   class ByValueType < Type
+    attr_accessor :inner_type
+
     def initialize(inner_type)
       @inner_type = inner_type
     end
@@ -415,7 +430,8 @@ class FFIGen
       Enum.new self, name, constants, enum_description
 
     when :struct_decl, :union_decl
-      struct = @declarations_by_type[Clang.get_cursor_type(declaration_cursor)] || StructOrUnion.new(self, name, (declaration_cursor[:kind] == :union_decl))
+      @declarations_by_type[Clang.get_cursor_type(declaration_cursor)] ||= StructOrUnion.new(self, name, (declaration_cursor[:kind] == :union_decl))
+      struct = @declarations_by_type[Clang.get_cursor_type(declaration_cursor)]
       raise if not struct.fields.empty?
       struct.description.concat comment
 
@@ -514,16 +530,58 @@ class FFIGen
       typedef_children = Clang.get_children declaration_cursor
       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
+      if function_proto[:kind] == :function_proto || function_proto[:kind] == :function_no_proto
+
+        function_description = []
+        return_value_description = []
+        parameter_descriptions = {}
+        current_description = function_description
+        comment.each do |line|
+          if line.gsub!(/\\param (.*?) /, '')
+            current_description = []
+            parameter_descriptions[$1] = current_description
+          end
+          current_description = return_value_description if line.gsub! '\\returns ', ''
+          current_description << line
+        end
+
         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: [] }
+        Clang.get_children(declaration_cursor).each do |function_child|
+          next if function_child[:kind] != :parm_decl
+          param_name = read_name function_child
+          tokens = Clang.get_tokens translation_unit, Clang.get_cursor_extent(function_child)
+          is_array = tokens.any? { |t| Clang.get_token_spelling(translation_unit, t).to_s_and_dispose == "[" }
+          param_type = resolve_type Clang.get_cursor_type(function_child), is_array
+          param_name ||= param_type.name
+          param_name ||= Name.new []
+          first_parameter_type ||= Clang.get_cursor_type function_child
+          parameters << { name: param_name, type: param_type }
         end
-        FunctionOrCallback.new self, name, parameters, return_type, true, false, comment, []
+
+        parameters.each_with_index do |parameter, index|
+          parameter[:description] = parameter[:name] && parameter_descriptions[parameter[:name].raw]
+          parameter[:description] ||= parameter_descriptions.values[index] if parameter_descriptions.size == parameters.size # workaround for wrong names
+          parameter[:description] ||= []
+        end
+
+        function = FunctionOrCallback.new self, name, parameters, return_type, true, false, function_description, return_value_description
+
+        pointee_declaration = first_parameter_type && get_pointee_declaration(first_parameter_type)
+        if pointee_declaration
+          type_prefix = pointee_declaration.name.parts.join.downcase
+          function_name_parts = name.parts.dup
+          while type_prefix.start_with? function_name_parts.first.downcase
+            type_prefix = type_prefix[function_name_parts.first.size..-1]
+            function_name_parts.shift
+            break if function_name_parts.empty?
+          end
+          if type_prefix.empty?
+            pointee_declaration.oo_functions << [Name.new(function_name_parts), function]
+          end
+        end
+
+        function
       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?
@@ -653,7 +711,7 @@ class FFIGen
     canonical_type = Clang.get_canonical_type full_type
     data_array = case canonical_type[:kind]
     when :void, :bool, :u_char, :u_short, :u_int, :u_long, :u_long_long, :char_s, :s_char, :short, :int, :long, :long_long, :float, :double
-      PrimitiveType.new canonical_type[:kind]
+      PrimitiveType.new canonical_type[:kind], Clang.get_type_spelling(full_type).to_s_and_dispose
     when :pointer
       if is_array
         ArrayType.new resolve_type(Clang.get_pointee_type(canonical_type)), nil
@@ -663,8 +721,9 @@ class FFIGen
         when :char_s
           StringType.new
         when :record
-          @declarations_by_type[Clang.get_cursor_type(Clang.get_type_declaration(pointee_type))]
-        when :function_proto
+          type = @declarations_by_type[Clang.get_cursor_type(Clang.get_type_declaration(pointee_type))]
+          type &&= ByReferenceType.new(type)
+        when :function_proto, :function_no_proto
           @declarations_by_type[full_type]
         else
           nil

data/lib/ffi_gen/clang.rb

@@ -4,7 +4,7 @@ require 'ffi'
 
 module FFIGen::Clang
   extend FFI::Library
-  ffi_lib ["libclang-3.5.so.1", "libclang.so.1", "clang"]
+  ffi_lib ["libclang-3.5.so.1", "libclang.so.1", "clang", '/usr/local/lib/libclang.dylib']
   
   def self.attach_function(name, *_)
     begin; super; rescue FFI::NotFoundError => e

data/lib/ffi_gen/java_output.rb

@@ -15,7 +15,7 @@ class FFIGen
       end
       writer.puts ""
 
-      writer.puts "private interface #{@module_name}Interface extends Library {"
+      writer.puts "interface #{@module_name}Interface extends Library {"
       writer.indent do
         writer.puts "", *IO.readlines(File.join(File.dirname(__FILE__), "java_interface.java")).map(&:rstrip), ""
         writer.puts "static class JnaInstanceCreator {"
@@ -120,22 +120,34 @@ class FFIGen
       writer.puts "public static class #{java_name} extends #{@is_union ? 'Union' : (@fields.empty? ? 'PointerType' : 'Structure')} {"
       writer.indent do
         @fields.each do |field|
-          writer.puts "public #{field[:type].java_jna_type} #{field[:name].raw};"
+          if field[:type].is_a? ByReferenceType and not field[:type].inner_type.fields.empty?
+            writer.puts "public volatile #{field[:type].java_jna_type}.ByReference #{field[:name].to_java_downcase};"
+          else
+            writer.puts "public volatile #{field[:type].java_jna_type} #{field[:name].to_java_downcase};"
+          end
         end
         writer.puts "// hidden structure" if @fields.empty?
-      end
-      writer.indent do
-        writer.puts "public static class ByValue extends #{java_name} implements Structure.ByValue {}"
+
         writer.puts "protected List<String> getFieldOrder() {"
         writer.indent do
-          fs = @fields.map{|f| '"' + f[:name].raw + '"'}.join(", ")
+          fs = @fields.map{|f| '"' + f[:name].to_java_downcase + '"'}.join(", ")
           writer.puts "return Arrays.asList(new String[] { #{fs} } );"
         end
         writer.puts "}"
+
+        if not @fields.empty?
+          writer.puts "public static class ByValue extends #{java_name} implements Structure.ByValue {}"
+          writer.puts "public static class ByReference extends #{java_name} implements Structure.ByReference {"
+          writer.indent do
+            writer.puts "public ByReference() { }"
+            writer.puts "public ByReference(Pointer p) { super(p); read(); }"
+          end
+          writer.puts "}"
+          writer.puts "public #{java_name}() { }"
+          writer.puts "public #{java_name}(Pointer p) { super(p); read(); }"
+        end
       end
       writer.puts "}", ""
-      
-      @written = true
     end
     
     def java_name
@@ -143,11 +155,11 @@ class FFIGen
     end
     
     def java_jna_type
-      @written ? java_name : "Pointer"
+      java_name
     end
     
     def java_description
-      @written ? java_name : "FFI::Pointer(*#{java_name})"
+      java_name
     end
   end
   
@@ -157,14 +169,14 @@ class FFIGen
         writer.puts "public static interface #{java_name.split('.').last} extends Callback {"
         writer.indent do
           jna_signature = "#{@parameters.map{ |parameter| "#{parameter[:type].java_jna_type} #{parameter[:name].to_java_downcase}" }.join(', ')}"
-          writer.puts "#{@return_type.java_jna_type} invoke(#{jna_signature});"
+          writer.puts "#{java_jna_return_type} invoke(#{jna_signature});"
         end
         writer.puts "}", ""
         return
       end
 
       jna_signature = "#{@parameters.map{ |parameter| "#{parameter[:type].java_jna_type} #{parameter[:name].to_java_downcase}" }.join(', ')}"
-      writer.puts "@NativeName(\"#{@name.raw}\")", "#{@return_type.java_jna_type} #{java_name}(#{jna_signature});", ""
+      writer.puts "@NativeName(\"#{@name.raw}\")", "#{java_jna_return_type} #{java_name}(#{jna_signature});", ""
     end
     
     def write_static_java(writer)
@@ -174,10 +186,10 @@ class FFIGen
       parameters = []
       lp = nil
       @parameters.each do |p|
-        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
+        if lp and lp[:type].is_a?(PointerType) and lp[:type].pointee_type.respond_to?(:clang_type) and lp[:type].pointee_type.clang_type == :u_char and [:u_long, :u_long_long].include?(p[:type].clang_type)
           n = lp[:name].to_java_downcase
           replace[n] = "bytesToPointer(#{n})"
-          replace[p[:name].to_java_downcase] = "new NativeLong(#{n}.length)";
+          replace[p[:name].to_java_downcase] = "#{n}.length";
           d = lp.dup
           d[:type] = ArrayType.new(lp[:type].pointee_type, nil)
           parameters << d
@@ -209,7 +221,7 @@ class FFIGen
         replace[n] || n
       }.join(', ')
       jna_signature = "#{parameters.map{ |parameter| "#{parameter[:type].java_jna_type} #{parameter[:name].to_java_downcase}" }.join(', ')}"
-      writer.puts "public static #{@return_type.java_jna_type} #{java_name}(#{jna_signature}) {"
+      writer.puts "public static #{java_jna_return_type} #{java_name}(#{jna_signature}) {"
       writer.indent do
         call = "INSTANCE.#{java_name}(#{args});"
         if @return_type.respond_to? :clang_type and @return_type.clang_type == :void
@@ -230,6 +242,13 @@ class FFIGen
       java_name
     end
     
+    def java_jna_return_type
+      if @return_type.is_a? ByReferenceType and not @return_type.inner_type.fields.empty?
+        return "#{@return_type.java_jna_type}.ByReference"
+      end
+      @return_type.java_jna_type
+    end
+    
     def java_description
       "Proc(_callback_#{java_name}_)"
     end
@@ -260,6 +279,9 @@ class FFIGen
     attr_accessor :clang_type
 
     def java_name
+      if @full_type == 'boolean'
+        return 'Boolean'
+      end
       case @clang_type
       when :void
         "nil"
@@ -273,6 +295,9 @@ class FFIGen
     end
     
     def java_jna_type
+      if @full_type == 'boolean'
+        return 'boolean'
+      end
       case @clang_type
       when :void            then "void"
       when :bool            then "boolean"
@@ -302,13 +327,23 @@ class FFIGen
     end
   end
   
+  class ByReferenceType
+    def java_name
+      @inner_type.java_name
+    end
+
+    def java_jna_type
+      @inner_type.java_jna_type
+    end
+  end
+
   class ByValueType
     def java_name
       @inner_type.java_name
     end
     
     def java_jna_type
-      @inner_type.java_jna_type
+      "#{@inner_type.java_jna_type}.ByValue"
     end
   end
   

data/lib/ffi_gen/java_static.java

@@ -3,7 +3,14 @@ interface NativeEnum {
 }
 
 static Pointer bytesToPointer(byte[] b) {
+    if (b.length == 0) {
+        return null;
+    }
     Pointer p = new Memory(b.length);
     p.write(0, b, 0, b.length);
     return p;
 }
+
+static byte[] pointerToBytes(Pointer p, long length) {
+    return p.getByteArray(0, (int)length);
+}

data/lib/ffi_gen/ruby_output.rb

@@ -109,7 +109,7 @@ class FFIGen
             end
             writer.puts "def #{name.to_ruby_downcase}(#{parameter_names.join(', ')})"
             writer.indent do
-              cast = function.return_type.is_a?(StructOrUnion) ? "#{function.return_type.ruby_name}.new " : ""
+              cast = function.ruby_ffi_return_type.is_a?(StructOrUnion) ? "#{function.return_type.ruby_name}.new " : ""
               writer.puts "#{cast}#{@generator.module_name}.#{function.ruby_name}(#{(["self"] + parameter_names).join(', ')})"
             end
             writer.puts "end"
@@ -169,6 +169,13 @@ class FFIGen
       @ruby_name ||= @name.to_ruby_downcase
     end
 
+    def ruby_ffi_return_type
+      if @return_type.is_a? ByReferenceType and not @return_type.inner_type.fields.empty?
+        return @return_type.inner_type
+      end
+      @return_type
+    end
+
     def ruby_ffi_type
       ":#{ruby_name}"
     end
@@ -247,6 +254,16 @@ class FFIGen
     end
   end
 
+  class ByReferenceType
+    def ruby_name
+      @inner_type.ruby_name
+    end
+
+    def ruby_ffi_type
+      @inner_type.ruby_ffi_type
+    end
+  end
+
   class ByValueType
     def ruby_name
       @inner_type.ruby_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghazel-ffi_gen
 version: !ruby/object:Gem::Version
-  version: 1.3.9.1
+  version: 1.3.9.2
 platform: ruby
 authors:
 - Richard Musiol