gir_ffi 0.13.0 → 0.13.1

data/lib/ffi-gobject_introspection/i_struct_info.rb

@@ -5,11 +5,11 @@ module GObjectIntrospection
   # Represents a struct.
   class IStructInfo < IRegisteredTypeInfo
     def n_fields
-      Lib.g_struct_info_get_n_fields @gobj
+      Lib.g_struct_info_get_n_fields self
     end
 
     def field(index)
-      IFieldInfo.wrap Lib.g_struct_info_get_field(@gobj, index)
+      IFieldInfo.wrap Lib.g_struct_info_get_field(self, index)
     end
 
     ##
@@ -17,11 +17,11 @@ module GObjectIntrospection
     build_finder_method :find_field
 
     def get_n_methods
-      Lib.g_struct_info_get_n_methods @gobj
+      Lib.g_struct_info_get_n_methods self
     end
 
     def get_method(index)
-      IFunctionInfo.wrap Lib.g_struct_info_get_method(@gobj, index)
+      IFunctionInfo.wrap Lib.g_struct_info_get_method(self, index)
     end
 
     ##
@@ -30,15 +30,19 @@ module GObjectIntrospection
     build_finder_method :find_method, :get_n_methods, :get_method
 
     def size
-      Lib.g_struct_info_get_size @gobj
+      Lib.g_struct_info_get_size self
+    end
+
+    def empty?
+      size == 0
     end
 
     def alignment
-      Lib.g_struct_info_get_alignment @gobj
+      Lib.g_struct_info_get_alignment self
     end
 
     def gtype_struct?
-      Lib.g_struct_info_is_gtype_struct @gobj
+      Lib.g_struct_info_is_gtype_struct self
     end
   end
 end

data/lib/ffi-gobject_introspection/i_type_info.rb

@@ -5,36 +5,36 @@ module GObjectIntrospection
   # Represents type information, direction, transfer etc.
   class ITypeInfo < IBaseInfo
     def pointer?
-      Lib.g_type_info_is_pointer @gobj
+      Lib.g_type_info_is_pointer self
     end
 
     def tag
-      Lib.g_type_info_get_tag @gobj
+      Lib.g_type_info_get_tag self
     end
 
     def param_type(index)
-      ITypeInfo.wrap Lib.g_type_info_get_param_type(@gobj, index)
+      ITypeInfo.wrap Lib.g_type_info_get_param_type(self, index)
     end
 
     def interface
-      ptr = Lib.g_type_info_get_interface @gobj
+      ptr = Lib.g_type_info_get_interface self
       IRepository.wrap_ibaseinfo_pointer ptr
     end
 
     def array_length
-      Lib.g_type_info_get_array_length @gobj
+      Lib.g_type_info_get_array_length self
     end
 
     def array_fixed_size
-      Lib.g_type_info_get_array_fixed_size @gobj
+      Lib.g_type_info_get_array_fixed_size self
     end
 
     def array_type
-      Lib.g_type_info_get_array_type @gobj
+      Lib.g_type_info_get_array_type self
     end
 
     def zero_terminated?
-      Lib.g_type_info_is_zero_terminated @gobj
+      Lib.g_type_info_is_zero_terminated self
     end
 
     def name

data/lib/ffi-gobject_introspection/i_union_info.rb

@@ -5,37 +5,37 @@ module GObjectIntrospection
   # Represents a union.
   class IUnionInfo < IRegisteredTypeInfo
     def n_fields
-      Lib.g_union_info_get_n_fields @gobj
+      Lib.g_union_info_get_n_fields self
     end
 
     def field(index)
-      IFieldInfo.wrap Lib.g_union_info_get_field(@gobj, index)
+      IFieldInfo.wrap Lib.g_union_info_get_field(self, index)
     end
 
     ##
     build_array_method :fields
 
     def get_n_methods
-      Lib.g_union_info_get_n_methods @gobj
+      Lib.g_union_info_get_n_methods self
     end
 
     def get_method(index)
-      IFunctionInfo.wrap Lib.g_union_info_get_method(@gobj, index)
+      IFunctionInfo.wrap Lib.g_union_info_get_method(self, index)
     end
 
     ##
     build_array_method :get_methods
 
     def find_method(name)
-      IFunctionInfo.wrap Lib.g_union_info_find_method(@gobj, name.to_s)
+      IFunctionInfo.wrap Lib.g_union_info_find_method(self, name.to_s)
     end
 
     def size
-      Lib.g_union_info_get_size @gobj
+      Lib.g_union_info_get_size self
     end
 
     def alignment
-      Lib.g_union_info_get_alignment @gobj
+      Lib.g_union_info_get_alignment self
     end
   end
 end

data/lib/ffi-gobject_introspection/i_value_info.rb

@@ -5,7 +5,7 @@ module GObjectIntrospection
   # Represents one of the enum values of an IEnumInfo.
   class IValueInfo < IBaseInfo
     def value
-      Lib.g_value_info_get_value @gobj
+      Lib.g_value_info_get_value self
     end
   end
 end

data/lib/ffi-gobject_introspection/strv.rb

@@ -35,6 +35,7 @@ module GObjectIntrospection
 
     def fetch_ptr(offset)
       return if @ptr.null?
+
       ptr = @ptr.get_pointer offset
       ptr unless ptr.null?
     end

data/lib/gir_ffi-base/gobject.rb

@@ -40,4 +40,9 @@ module GObject
   TYPE_OBJECT = type_from_name('GObject')
   TYPE_GTYPE = type_from_name('GType')
   TYPE_VARIANT = type_from_name('GVariant')
+
+  TYPE_ARRAY = Lib.g_array_get_type
+  TYPE_BYTE_ARRAY = Lib.g_byte_array_get_type
+  TYPE_HASH_TABLE = Lib.g_hash_table_get_type
+  TYPE_STRV = Lib.g_strv_get_type
 end

data/lib/gir_ffi-base/gobject/lib.rb

@@ -10,5 +10,9 @@ module GObject
     ffi_lib 'gobject-2.0'
     attach_function :g_type_from_name, [:string], :size_t
     attach_function :g_type_fundamental, [:size_t], :size_t
+    attach_function :g_array_get_type, [], :size_t
+    attach_function :g_byte_array_get_type, [], :size_t
+    attach_function :g_hash_table_get_type, [], :size_t
+    attach_function :g_strv_get_type, [], :size_t
   end
 end

data/lib/gir_ffi/boolean.rb

@@ -23,8 +23,8 @@ module GirFFI
       FFI.type_size FFI::Type::INT
     end
 
-    def self.copy_value_to_pointer(value, pointer)
-      pointer.put_int 0, to_native(value, nil)
+    def self.copy_value_to_pointer(value, pointer, offset = 0)
+      pointer.put_int offset, to_native(value, nil)
     end
 
     def self.get_value_from_pointer(pointer, offset)

data/lib/gir_ffi/builders/argument_builder.rb

@@ -40,23 +40,16 @@ module GirFFI
       end
 
       def pre_conversion
-        pr = []
-        if has_ingoing_component?
-          pr << fixed_array_size_check if needs_size_check?
-          pr << array_length_assignment if array_length_parameter?
-        end
         case direction
         when :in
-          pr << "#{call_argument_name} = #{ingoing_convertor.conversion}"
+          pre_conversion_in
         when :inout
-          pr << out_parameter_preparation
-          pr << ingoing_value_storage
+          pre_conversion_inout
         when :out
-          pr << out_parameter_preparation
+          pre_conversion_out
         when :error
-          pr << "#{call_argument_name} = FFI::MemoryPointer.new(:pointer).write_pointer nil"
+          pre_conversion_error
         end
-        pr
       end
 
       def post_conversion
@@ -72,6 +65,31 @@ module GirFFI
 
       private
 
+      def pre_conversion_in
+        pr = []
+        pr << fixed_array_size_check if needs_size_check?
+        pr << array_length_assignment if array_length_parameter?
+        pr << "#{call_argument_name} = #{ingoing_convertor.conversion}"
+        pr
+      end
+
+      def pre_conversion_inout
+        pr = []
+        pr << fixed_array_size_check if needs_size_check?
+        pr << array_length_assignment if array_length_parameter?
+        pr << out_parameter_preparation
+        pr << ingoing_value_storage
+        pr
+      end
+
+      def pre_conversion_out
+        [out_parameter_preparation]
+      end
+
+      def pre_conversion_error
+        ["#{call_argument_name} = FFI::MemoryPointer.new(:pointer).write_pointer nil"]
+      end
+
       def ingoing_value_storage
         PointerValueConvertor.new(type_spec).
           value_to_pointer(call_argument_name, ingoing_convertor.conversion)
@@ -83,6 +101,7 @@ module GirFFI
 
       def output_value
         return "#{call_argument_name}.get_value" if caller_allocated_object? && gvalue?
+
         base = pointer_to_value_method_call call_argument_name, type_spec
         if needs_out_conversion?
           outgoing_convertor(base).conversion
@@ -191,9 +210,9 @@ module GirFFI
           NullConvertor.new('0')
         elsif destroy_notifier?
           NullConvertor.new(DESTROY_NOTIFIER)
-        elsif closure?
-          ClosureToPointerConvertor.new(pre_convertor_argument, @is_closure)
-        elsif type_info.needs_ruby_to_c_conversion_for_functions?
+        elsif user_data?
+          ClosureToPointerConvertor.new(callback_argument_name)
+        elsif needs_ruby_to_c_conversion?
           RubyToCConvertor.new(type_info, pre_convertor_argument,
                                ownership_transfer: ownership_transfer)
         else
@@ -208,6 +227,14 @@ module GirFFI
           name
         end
       end
+
+      def needs_ruby_to_c_conversion?
+        type_info.needs_ruby_to_c_conversion_for_functions?
+      end
+
+      def callback_argument_name
+        @related_callback_builder.call_argument_name
+      end
     end
   end
 end

data/lib/gir_ffi/builders/argument_builder_collection.rb

@@ -67,20 +67,33 @@ module GirFFI
       end
 
       def set_up_argument_relations
+        set_up_user_data_relations
+        set_up_destroy_notifier_relations
+        set_up_length_argument_relations
+      end
+
+      def set_up_user_data_relations
         @base_argument_builders.each do |bldr|
           if (idx = bldr.closure_idx) >= 0
-            @base_argument_builders[idx].closure = bldr
+            @base_argument_builders[idx].mark_as_user_data bldr
           end
+        end
+      end
+
+      def set_up_destroy_notifier_relations
+        @base_argument_builders.each do |bldr|
           if (idx = bldr.destroy_idx) >= 0
             @base_argument_builders[idx].mark_as_destroy_notifier bldr
           end
         end
+      end
+
+      def set_up_length_argument_relations
         all_builders.each do |bldr|
           idx = bldr.array_length_idx
-          next unless idx >= 0
-          other = @base_argument_builders[idx]
-          next unless other
+          next if idx < 0
 
+          other = @base_argument_builders[idx]
           bldr.length_arg = other
           other.array_arg = bldr
         end

data/lib/gir_ffi/builders/base_argument_builder.rb

@@ -22,8 +22,8 @@ module GirFFI
         @arginfo = arginfo
         @length_arg = nil
         @array_arg = nil
-        @is_closure = false
-        @destroy_notifier = false
+        @is_user_data = false
+        @is_destroy_notifier = false
       end
 
       def name
@@ -59,34 +59,30 @@ module GirFFI
         arginfo.destroy
       end
 
-      # TODO: closure unfortunately means two things in GLib: a closure
-      # argument (user_data), and the Closure class (a callable object). Make
-      # the distinction more explicit in GirFFI.
-      def closure=(arg)
-        @is_closure = arg
+      def mark_as_user_data(callback_builder)
+        @is_user_data = true
+        @related_callback_builder = callback_builder
       end
 
-      # TODO: Unify relationship set-up methods and improve naming. We
-      # currently have length_arg=, array_arg=, closure= and
-      # mark_as_destroy_notifier.
-      def mark_as_destroy_notifier(callback)
-        @destroy_notifier = callback
+      def mark_as_destroy_notifier(callback_builder)
+        @is_destroy_notifier = true
+        @related_callback_builder = callback_builder
       end
 
       def array_length_parameter?
         @array_arg
       end
 
-      def closure?
-        @is_closure
+      def user_data?
+        @is_user_data
       end
 
       def destroy_notifier?
-        @destroy_notifier
+        @is_destroy_notifier
       end
 
       def helper_argument?
-        array_length_parameter? || closure? || destroy_notifier?
+        array_length_parameter? || user_data? || destroy_notifier?
       end
 
       def ownership_transfer

data/lib/gir_ffi/builders/callback_argument_builder.rb

@@ -104,7 +104,7 @@ module GirFFI
       end
 
       def pre_convertor
-        @pre_convertor ||= if closure?
+        @pre_convertor ||= if user_data?
                              ClosureConvertor.new(pre_convertor_argument)
                            elsif needs_c_to_ruby_conversion?
                              CToRubyConvertor.new(type_info,

data/lib/gir_ffi/builders/callback_builder.rb

@@ -13,7 +13,7 @@ module GirFFI
       def setup_class
         setup_callback
         setup_constants
-        klass.class_eval mapping_method_definition
+        klass.class_eval mapping_method_definition, __FILE__, __LINE__
       end
 
       def setup_callback

data/lib/gir_ffi/builders/closure_to_pointer_convertor.rb

@@ -5,19 +5,12 @@ module GirFFI
     # Builder that generates code to convert closure arguments ('user data')
     # from Ruby to C. Used by argument builders.
     class ClosureToPointerConvertor
-      def initialize(argument_name, callback_argument)
+      def initialize(argument_name)
         @argument_name = argument_name
-        @callback_argument = callback_argument
       end
 
       def conversion
-        "GirFFI::ArgHelper.store(#{callback_argument_name})"
-      end
-
-      private
-
-      def callback_argument_name
-        @callback_argument.call_argument_name
+        "GirFFI::ArgHelper.store(#{@argument_name})"
       end
     end
   end

data/lib/gir_ffi/builders/field_builder.rb

@@ -26,7 +26,7 @@ module GirFFI
 
         def pre_conversion
           [
-            "#{field_ptr} = @struct.to_ptr + #{field_offset}",
+            "#{field_ptr} = @struct.to_ptr",
             "#{bare_value} = #{pointer_to_value_conversion}"
           ]
         end
@@ -58,7 +58,7 @@ module GirFFI
         private
 
         def pointer_to_value_conversion
-          PointerValueConvertor.new(field_type_tag).pointer_to_value(field_ptr)
+          PointerValueConvertor.new(field_type_tag).pointer_to_value(field_ptr, field_offset)
         end
 
         def field_offset
@@ -78,7 +78,7 @@ module GirFFI
         end
 
         def field_type_tag
-          @field_type_tag ||= @field_info.field_type.tag_or_class
+          @field_type_tag ||= field_type.tag_or_class
         end
 
         def field_type
@@ -97,7 +97,7 @@ module GirFFI
       end
 
       # Class to represent argument info for the argument of a getter method.
-      # Implements the necessary parts of IArgumentInfo's interface.
+      # Implements the necessary parts of IArgInfo's interface.
       class GetterArgumentInfo
         attr_reader :name, :argument_type
 
@@ -216,7 +216,7 @@ module GirFFI
         end
 
         def field_type_tag
-          @field_type_tag ||= @info.field_type.tag_or_class.inspect
+          @field_type_tag ||= field_type.tag_or_class.inspect
         end
 
         def field_type
@@ -243,7 +243,8 @@ module GirFFI
       def setup_getter
         return if container_defines_getter_method?
         return if hidden_struct_type?
-        container_class.class_eval getter_def
+
+        container_class.class_eval getter_def, __FILE__, __LINE__
       end
 
       def container_defines_getter_method?
@@ -253,7 +254,8 @@ module GirFFI
       def setup_setter
         return unless info.writable?
         return if hidden_struct_type?
-        container_class.class_eval setter_def
+
+        container_class.class_eval setter_def, __FILE__, __LINE__
       end
 
       def getter_def
@@ -269,7 +271,7 @@ module GirFFI
 
         <<-CODE.reset_indentation
         def #{info.name}= #{builder.method_argument_name}
-          #{field_ptr} = @struct.to_ptr + #{info.offset}
+          #{field_ptr} = @struct.to_ptr
           #{builder.pre_conversion.join("\n          ")}
           #{value_storage(field_ptr, builder)}
         end
@@ -280,7 +282,7 @@ module GirFFI
 
       def value_storage(typed_ptr, builder)
         PointerValueConvertor.new(field_type_tag).
-          value_to_pointer(typed_ptr, builder.call_argument_name)
+          value_to_pointer(typed_ptr, builder.call_argument_name, info.offset)
       end
 
       def field_type_tag