gir_ffi 0.7.3 → 0.7.4

data/lib/gir_ffi/builders/callback_return_value_builder.rb

@@ -30,7 +30,11 @@ module GirFFI
 
       def post_conversion
         if has_post_conversion?
-          [ "#{post_converted_name} = #{post_convertor.conversion}" ]
+          if type_info.flattened_tag == :object
+            [ "#{post_converted_name} = #{post_convertor.conversion}.to_ptr" ]
+          else
+            [ "#{post_converted_name} = #{post_convertor.conversion}" ]
+          end
         else
           []
         end
@@ -39,7 +43,7 @@ module GirFFI
       private
 
       def has_post_conversion?
-        type_info.needs_conversion_for_callbacks?
+        type_info.needs_c_to_ruby_conversion_for_callbacks?
       end
 
       def post_convertor

data/lib/gir_ffi/builders/closure_convertor.rb

@@ -4,6 +4,6 @@ class GirFFI::Builders::ClosureConvertor
   end
 
   def conversion
-    "GirFFI::ArgHelper::OBJECT_STORE[#{@argument_name}.address]"
+    "GirFFI::ArgHelper::OBJECT_STORE.fetch(#{@argument_name})"
   end
 end

data/lib/gir_ffi/builders/null_convertor.rb

@@ -1,3 +1,4 @@
+# Argument convertor that does nothing
 class GirFFI::Builders::NullConvertor
   def initialize argument_name
     @argument_name = argument_name

data/lib/gir_ffi/builders/property_builder.rb

@@ -16,7 +16,7 @@ module GirFFI
       end
 
       def container_defines_getter_method?
-        container_info.find_instance_method @info.name
+        container_info.find_instance_method getter_name
       end
 
       def setup_setter

data/lib/gir_ffi/builders/return_value_builder.rb

@@ -46,7 +46,7 @@ module GirFFI
 
       def has_post_conversion?
         is_closure || needs_constructor_wrap? ||
-          type_info.needs_conversion_for_functions?
+          type_info.needs_c_to_ruby_conversion_for_functions?
       end
 
       def post_convertor

data/lib/gir_ffi/builders/type_builder.rb

@@ -17,15 +17,15 @@ module GirFFI
       CACHE = {}
 
       TYPE_MAP = {
-        :callback => CallbackBuilder,
-        :constant => ConstantBuilder,
-        :enum => EnumBuilder,
-        :flags => EnumBuilder,
-        :interface => InterfaceBuilder,
-        :object => ObjectBuilder,
-        :struct => StructBuilder,
-        :union => UnionBuilder,
-        :unintrospectable => UnintrospectableBuilder
+        callback:         CallbackBuilder,
+        constant:         ConstantBuilder,
+        enum:             EnumBuilder,
+        flags:            EnumBuilder,
+        interface:        InterfaceBuilder,
+        object:           ObjectBuilder,
+        struct:           StructBuilder,
+        union:            UnionBuilder,
+        unintrospectable: UnintrospectableBuilder
       }
 
       def self.build info

data/lib/gir_ffi/builders/vfunc_builder.rb

@@ -25,6 +25,7 @@ module GirFFI
 
       def mapping_method_definition
         arg_infos = info.args
+        arg_infos << ErrorArgumentInfo.new if info.throws?
 
         receiver_info = ReceiverArgumentInfo.new(receiver_type_info)
 
@@ -46,7 +47,8 @@ module GirFFI
       end
 
       def argument_ffi_types
-        @argument_ffi_types ||= info.argument_ffi_types.unshift(receiver_type_info.to_ffitype)
+        @argument_ffi_types ||= info.argument_ffi_types.
+          unshift(receiver_type_info.to_callback_ffitype)
       end
 
       def return_ffi_type

data/lib/gir_ffi/callback_base.rb

@@ -2,6 +2,8 @@ require 'gir_ffi/type_base'
 
 module GirFFI
   # Base module for callbacks.
+  # NOTE: Another option would be to derive this class from FFI::Function,
+  # allowing a more natural implementation of from_native, to_native and wrap.
   class CallbackBase < Proc
     extend TypeBase
     extend FFI::DataConverter
@@ -22,6 +24,10 @@ module GirFFI
       value.to_native
     end
 
+    def self.wrap ptr
+      from_native ptr, nil
+    end
+
     CALLBACKS = []
 
     def self.store_callback prc

data/lib/gir_ffi/error_argument_info.rb

@@ -1,3 +1,5 @@
+require 'gir_ffi/error_type_info'
+
 module GirFFI
   # Represents an error argument with the same interface as IArgumentInfo
   class ErrorArgumentInfo
@@ -10,12 +12,19 @@ module GirFFI
     end
 
     def argument_type
-      nil
+      @argument_type ||= ErrorTypeInfo.new
     end
 
     def name
-      nil
+      "_error"
+    end
+
+    def closure
+      -1
+    end
+
+    def caller_allocates?
+      true
     end
   end
 end
-

data/lib/gir_ffi/error_type_info.rb

@@ -0,0 +1,21 @@
+require 'gir_ffi/info_ext/i_type_info'
+
+module GirFFI
+  # Represents the type of an error argument for callbacks and functions,
+  # conforming, as needed, to the interface of GObjectIntrospection::ITypeInfo
+  class ErrorTypeInfo
+    include GirFFI::InfoExt::ITypeInfo
+
+    def array_length
+      -1
+    end
+
+    def tag
+      :error
+    end
+
+    def pointer?
+      true
+    end
+  end
+end

data/lib/gir_ffi/ffi_ext/pointer.rb

@@ -9,15 +9,14 @@ module GirFFI
         self
       end
 
-      def to_object
-        gtype = GObject.type_from_instance_pointer self
-        wrap_by_gtype gtype
+      def zero?
+        null?
       end
 
-      def wrap_by_gtype gtype
+      def to_object
         return nil if self.null?
-        klass = Builder.build_by_gtype gtype
-        klass.direct_wrap self
+        gtype = GObject.type_from_instance_pointer self
+        Builder.build_by_gtype(gtype).direct_wrap self
       end
 
       def to_utf8

data/lib/gir_ffi/glib_error.rb

@@ -0,0 +1,18 @@
+module GirFFI
+  # Exception class to be raised whenever an error is signaled through
+  # GLib::Error.
+  class GLibError < RuntimeError
+    attr_reader :domain_quark
+    attr_reader :code
+
+    def initialize g_error
+      @domain_quark = g_error.domain
+      @code = g_error.code
+      super g_error.message
+    end
+
+    def domain
+      @domain ||= GLib.quark_to_string @domain_quark
+    end
+  end
+end

data/lib/gir_ffi/in_pointer.rb

@@ -48,7 +48,7 @@ module GirFFI
     class << self
       def from_closure_data obj
         FFI::Pointer.new(obj.object_id).tap {|ptr|
-          ArgHelper::OBJECT_STORE[ptr.address] = obj }
+          ArgHelper::OBJECT_STORE.store(ptr, obj) }
       end
 
       private

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -7,16 +7,16 @@ module GirFFI
 
       def self.flattened_tag_to_gtype_map
         @flattened_tag_to_gtype_map ||= {
-          :array => GObject::TYPE_ARRAY,
-          :c => GObject::TYPE_POINTER,
-          :gboolean => GObject::TYPE_BOOLEAN,
-          :ghash => GObject::TYPE_HASH_TABLE,
-          :gint32 => GObject::TYPE_INT,
-          :gint64 => GObject::TYPE_INT64,
-          :guint64 => GObject::TYPE_UINT64,
-          :strv => GObject::TYPE_STRV,
-          :utf8 => GObject::TYPE_STRING,
-          :void => GObject::TYPE_NONE
+          array:    GObject::TYPE_ARRAY,
+          c:        GObject::TYPE_POINTER,
+          gboolean: GObject::TYPE_BOOLEAN,
+          ghash:    GObject::TYPE_HASH_TABLE,
+          gint32:   GObject::TYPE_INT,
+          gint64:   GObject::TYPE_INT64,
+          guint64:  GObject::TYPE_UINT64,
+          strv:     GObject::TYPE_STRV,
+          utf8:     GObject::TYPE_STRING,
+          void:     GObject::TYPE_NONE
         }
       end
 
@@ -76,18 +76,18 @@ module GirFFI
       end
 
       TAG_TO_WRAPPER_CLASS_MAP = {
-        :array => 'GLib::Array',
-        :byte_array => 'GLib::ByteArray',
-        :c => 'GirFFI::SizedArray',
-        :error => 'GLib::Error',
-        :ghash => 'GLib::HashTable',
-        :glist => 'GLib::List',
-        :gslist => 'GLib::SList',
-        :ptr_array => 'GLib::PtrArray',
-        :strv => 'GLib::Strv',
-        :utf8 => 'GirFFI::InPointer',
-        :void => 'GirFFI::InPointer',
-        :zero_terminated => 'GirFFI::ZeroTerminated'
+        array:           'GLib::Array',
+        byte_array:      'GLib::ByteArray',
+        c:               'GirFFI::SizedArray',
+        error:           'GLib::Error',
+        ghash:           'GLib::HashTable',
+        glist:           'GLib::List',
+        gslist:          'GLib::SList',
+        ptr_array:       'GLib::PtrArray',
+        strv:            'GLib::Strv',
+        utf8:            'GirFFI::InPointer',
+        void:            'GirFFI::InPointer',
+        zero_terminated: 'GirFFI::ZeroTerminated'
       }
 
       # TODO: Use class rather than class name
@@ -127,19 +127,33 @@ module GirFFI
         end
       end
 
+      TAGS_NEEDING_RUBY_TO_C_CONVERSION = [
+        :array, :c, :callback, :error, :ghash, :glist, :gslist, :object,
+        :ptr_array, :struct, :strv, :utf8, :void, :zero_terminated
+      ]
+
+      TAGS_NEEDING_C_TO_RUBY_CONVERSION = [
+        :array, :byte_array, :c, :error, :filename, :ghash, :glist, :gslist,
+        :interface, :object, :ptr_array, :struct, :strv, :union, :utf8,
+        :zero_terminated
+      ]
+
       def needs_ruby_to_c_conversion_for_functions?
-        [ :array, :c, :callback, :ghash, :glist, :gslist, :object, :ptr_array,
-          :struct, :strv, :utf8, :void, :zero_terminated ].include?(flattened_tag)
+        TAGS_NEEDING_RUBY_TO_C_CONVERSION.include?(flattened_tag)
+      end
+
+      def needs_c_to_ruby_conversion_for_functions?
+        TAGS_NEEDING_C_TO_RUBY_CONVERSION.include?(flattened_tag)
       end
 
-      def needs_conversion_for_functions?
-        [ :array, :byte_array, :c, :error, :filename, :ghash, :glist,
-          :gslist, :interface, :object, :ptr_array, :struct, :strv, :union,
-          :utf8, :zero_terminated ].include?(flattened_tag)
+      def needs_ruby_to_c_conversion_for_callbacks?
+        [:enum].include?(flattened_tag) ||
+          needs_ruby_to_c_conversion_for_functions?
       end
 
-      def needs_conversion_for_callbacks?
-        flattened_tag == :enum || needs_conversion_for_functions?
+      def needs_c_to_ruby_conversion_for_callbacks?
+        [:callback, :enum].include?(flattened_tag) ||
+          needs_c_to_ruby_conversion_for_functions?
       end
 
       def extra_conversion_arguments

data/lib/gir_ffi/info_ext/i_vfunc_info.rb

@@ -1,9 +1,21 @@
 module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::IVFuncInfo needed by GirFFI
+    # TODO: Merge implementation with ICallbackInfo and ISignalInfo extensions.
     module IVFuncInfo
+      def argument_ffi_types
+        args.map { |arg| arg.to_callback_ffitype }.tap do |types|
+          types << :pointer if throws?
+        end
+      end
+
       def return_ffi_type
-        return_type.to_callback_ffitype
+        result = return_type.to_callback_ffitype
+        if result == GLib::Boolean
+          :bool
+        else
+          result
+        end
       end
     end
   end

data/lib/gir_ffi/type_map.rb

@@ -3,37 +3,38 @@ require 'gir_ffi/sized_array'
 module GirFFI
   module TypeMap
     sz = FFI.type_size(:size_t) * 8
-    gtype_type = "uint#{sz}".to_sym
+    gsize_type = "uint#{sz}".to_sym
 
     TAG_TYPE_MAP = {
-      :enum => :int32,
-      :flags => :int32,
-      :ghash => :pointer,
-      :glist => :pointer,
-      :gslist => :pointer,
-      :strv => :pointer,
-      :object => :pointer,
-      :struct => :pointer,
-      :error => :pointer,
-      :ptr_array => :pointer,
-      :array => :pointer,
-      :c => GirFFI::SizedArray,
-      :utf8 => :pointer,
-      :GType => gtype_type,
-      :gboolean => GLib::Boolean,
-      :gunichar => :uint32,
-      :gint8 => :int8,
-      :guint8 => :uint8,
-      :gint16 => :int16,
-      :guint16 => :uint16,
-      :gint => :int,
-      :gint32 => :int32,
-      :guint32 => :uint32,
-      :gint64 => :int64,
-      :guint64 => :uint64,
-      :gfloat => :float,
-      :gdouble => :double,
-      :void => :void
+      enum:      :int32,
+      flags:     :int32,
+      ghash:     :pointer,
+      glist:     :pointer,
+      gslist:    :pointer,
+      strv:      :pointer,
+      object:    :pointer,
+      struct:    :pointer,
+      error:     :pointer,
+      ptr_array: :pointer,
+      array:     :pointer,
+      c:         GirFFI::SizedArray,
+      utf8:      :pointer,
+      GType:     gsize_type,
+      gboolean:  GLib::Boolean,
+      gunichar:  :uint32,
+      gint8:     :int8,
+      guint8:    :uint8,
+      gint16:    :int16,
+      guint16:   :uint16,
+      gint:      :int,
+      gint32:    :int32,
+      guint32:   :uint32,
+      gint64:    :int64,
+      guint64:   :uint64,
+      gsize:     gsize_type,
+      gfloat:    :float,
+      gdouble:   :double,
+      void:      :void
     }
 
     def self.map_basic_type type

data/lib/gir_ffi/user_defined_type_info.rb

@@ -4,6 +4,7 @@ require 'gir_ffi/vfunc_implementation'
 module GirFFI
   # Represents a user defined type, conforming, as needed, to the interface of
   # GObjectIntrospection::IObjectInfo.
+  # TODO: Rename to UserDefinedObjectInfo
   class UserDefinedTypeInfo
     attr_reader :properties, :vfunc_implementations
 

data/lib/gir_ffi/version.rb

@@ -1,3 +1,3 @@
 module GirFFI
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/lib/gir_ffi/vfunc_base.rb

@@ -2,6 +2,7 @@ require 'gir_ffi/callback_base'
 
 module GirFFI
   # Base class for virtual methods (vfuncs).
+  # FIXME: Inheritence direction is arbitrary.
   class VFuncBase < CallbackBase
   end
 end

data/lib/gir_ffi/zero_terminated.rb

@@ -39,7 +39,7 @@ module GirFFI
 
     def read_value offset
       val = @ptr.send(getter_method, offset)
-      return val unless is_null_value?(val)
+      val unless val.zero?
     end
 
     def getter_method
@@ -61,13 +61,8 @@ module GirFFI
       @ffi_type ||= TypeMap.type_specification_to_ffitype element_type
     end
 
-    def is_null_value? value
-      if ffi_type == :pointer
-        value.null?
-      else
-        value == 0
-      end
+    def ffi_type_size
+      @ffi_type_size ||= FFI.type_size(ffi_type)
     end
   end
 end
-