gir_ffi 0.13.0 → 0.13.1

data/lib/gir_ffi/builders/module_builder.rb

@@ -28,7 +28,7 @@ module GirFFI
         return false unless go
 
         Builder.attach_ffi_function lib, go
-        modul.class_eval FunctionBuilder.new(go).method_definition
+        modul.class_eval FunctionBuilder.new(go).method_definition, __FILE__, __LINE__
 
         true
       end
@@ -108,6 +108,7 @@ module GirFFI
       def function_introspection_data(function)
         info = gir.find_by_name @namespace, function.to_s
         return unless info
+
         info.info_type == :function ? info : nil
       end
 

data/lib/gir_ffi/builders/object_builder.rb

@@ -71,7 +71,7 @@ module GirFFI
         setup_property_accessors
         setup_vfunc_invokers
         setup_interfaces
-        provide_initializer
+        setup_initializer
       end
 
       # FIXME: Private method only used in subclass
@@ -121,6 +121,7 @@ module GirFFI
 
       def define_vfunc_invoker(vfunc_name, invoker_name)
         return if vfunc_name == invoker_name
+
         klass.class_eval <<-DEF, __FILE__, __LINE__ + 1
           def #{vfunc_name} *args, &block
             #{invoker_name}(*args, &block)
@@ -128,24 +129,32 @@ module GirFFI
         DEF
       end
 
-      def provide_initializer
+      def setup_initializer
         return if info.find_method 'new'
 
         if info.abstract?
-          klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def initialize(*)
-              raise NoMethodError
-            end
-          RUBY
+          define_abstract_initializer
         else
-          klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def initialize(properties = {})
-              base_initialize(properties)
-            end
-          RUBY
+          define_default_initializer
         end
       end
 
+      def define_abstract_initializer
+        klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def initialize(*)
+            raise NoMethodError
+          end
+        RUBY
+      end
+
+      def define_default_initializer
+        klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def initialize(properties = {})
+            base_initialize(properties)
+          end
+        RUBY
+      end
+
       def setup_interfaces
         interfaces.each do |iface|
           klass.send :include, iface

data/lib/gir_ffi/builders/pointer_value_convertor.rb

@@ -9,21 +9,23 @@ module GirFFI
         @type_spec = type_spec
       end
 
-      def pointer_to_value(ptr_exp)
+      def pointer_to_value(ptr_exp, offset = 0)
         case ffi_type_spec
         when Module
-          "#{ffi_type_spec}.get_value_from_pointer(#{ptr_exp}, 0)"
+          "#{ffi_type_spec}.get_value_from_pointer(#{ptr_exp}, #{offset})"
         when Symbol
-          "#{ptr_exp}.get_#{ffi_type_spec}(0)"
+          "#{ptr_exp}.get_#{ffi_type_spec}(#{offset})"
         end
       end
 
-      def value_to_pointer(ptr_exp, value_exp)
+      def value_to_pointer(ptr_exp, value_exp, offset = 0)
         case ffi_type_spec
         when Module
-          "#{ffi_type_spec}.copy_value_to_pointer(#{value_exp}, #{ptr_exp})"
+          args = [value_exp, ptr_exp]
+          args << offset unless offset == 0
+          "#{ffi_type_spec}.copy_value_to_pointer(#{args.join(', ')})"
         when Symbol
-          "#{ptr_exp}.put_#{ffi_type_spec} 0, #{value_exp}"
+          "#{ptr_exp}.put_#{ffi_type_spec} #{offset}, #{value_exp}"
         end
       end
 

data/lib/gir_ffi/builders/property_builder.rb

@@ -71,7 +71,9 @@ module GirFFI
       end
 
       def setup_getter
-        container_class.class_eval getter_def unless container_defines_getter_method?
+        return if container_defines_getter_method?
+
+        container_class.class_eval getter_def, __FILE__, __LINE__
       end
 
       def container_defines_getter_method?
@@ -79,7 +81,7 @@ module GirFFI
       end
 
       def setup_setter
-        container_class.class_eval setter_def
+        container_class.class_eval setter_def, __FILE__, __LINE__
       end
 
       def getter_def

data/lib/gir_ffi/builders/registered_type_builder.rb

@@ -15,13 +15,17 @@ module GirFFI
       def setup_method(method)
         method_info = info.find_method method
         return unless method_info
-        attach_and_define_method method_info, meta_class
+
+        remove_old_method method_info, meta_class
+        attach_and_define_method method_info
       end
 
       def setup_instance_method(method)
         method_info = info.find_instance_method method
         return unless method_info
-        attach_and_define_method method_info, build_class
+
+        remove_old_method method_info, build_class
+        attach_and_define_method method_info
       end
 
       def target_gtype
@@ -34,29 +38,36 @@ module GirFFI
         (class << build_class; self; end)
       end
 
-      def attach_and_define_method(method_info, modul)
-        method = method_info.safe_name
+      def attach_and_define_method(method_info)
         attach_method method_info
-        remove_old_method method, modul
-        define_method method_info
-        method
+        if method_info.constructor?
+          define_construction_methods method_info
+        else
+          define_method method_info
+        end
+        method_info.safe_name
       end
 
       def define_method(method_info)
-        if method_info.constructor?
-          initializer_builder = InitializerBuilder.new(method_info)
-          initializer_name = initializer_builder.method_name.to_sym
-          unless build_class.private_instance_methods(false).include? initializer_name
-            build_class.class_eval initializer_builder.method_definition
-          end
-          build_class.class_eval ConstructorBuilder.new(method_info).method_definition
-        else
-          build_class.class_eval FunctionBuilder.new(method_info).method_definition
+        method_definition = FunctionBuilder.new(method_info).method_definition
+        build_class.class_eval(method_definition, __FILE__, __LINE__)
+      end
+
+      def define_construction_methods(method_info)
+        initializer_builder = InitializerBuilder.new(method_info)
+        initializer_name = initializer_builder.method_name.to_sym
+        unless build_class.private_instance_methods(false).include? initializer_name
+          build_class.class_eval initializer_builder.method_definition, __FILE__, __LINE__
         end
+        constructor_definition = ConstructorBuilder.new(method_info).method_definition
+        build_class.class_eval(constructor_definition, __FILE__, __LINE__)
       end
 
-      def remove_old_method(method, modul)
-        modul.class_eval { remove_method method if method_defined? method }
+      def remove_old_method(method_info, modul)
+        method = method_info.safe_name
+        modul.class_eval do
+          remove_method method if method_defined? method
+        end
       end
 
       def attach_method(method_info)
@@ -65,7 +76,7 @@ module GirFFI
 
       def stub_methods
         info.get_methods.each do |minfo|
-          klass.class_eval MethodStubber.new(minfo).method_stub
+          klass.class_eval MethodStubber.new(minfo).method_stub, __FILE__, __LINE__
         end
       end
 

data/lib/gir_ffi/builders/return_value_builder.rb

@@ -17,7 +17,7 @@ module GirFFI
       end
 
       def has_post_conversion?
-        closure? || needs_c_to_ruby_conversion?
+        user_data? || needs_c_to_ruby_conversion?
       end
 
       def needs_c_to_ruby_conversion?
@@ -28,7 +28,7 @@ module GirFFI
 
       def post_convertor
         @post_convertor ||=
-          if closure?
+          if user_data?
             ClosureConvertor.new(capture_variable_name)
           else
             FullCToRubyConvertor.new(type_info,

data/lib/gir_ffi/builders/ruby_to_c_convertor.rb

@@ -33,6 +33,8 @@ module GirFFI
           else
             'from'
           end
+        when :enum
+          'to_int'
         else
           'from'
         end

data/lib/gir_ffi/builders/signal_closure_builder.rb

@@ -10,7 +10,7 @@ module GirFFI
     class SignalClosureBuilder < BaseTypeBuilder
       def setup_class
         setup_constants
-        klass.class_eval marshaller_definition
+        klass.class_eval marshaller_definition, __FILE__, __LINE__
       end
 
       def setup_method(_method)

data/lib/gir_ffi/builders/struct_builder.rb

@@ -15,18 +15,17 @@ module GirFFI
       end
 
       def superclass
-        if info.gtype_struct?
-          # HACK: Inheritance chain is not expressed in GObject's code correctly.
-          type_name = info.full_type_name
-          return GObject::ObjectClass if type_name == 'GObject::InitiallyUnownedClass'
-          type = fields.first.field_type
-          return type.tag_or_class if type.tag == :interface
-        end
-
+        # HACK: Inheritance chain is not expressed in GObject's code correctly.
+        return GObject::ObjectClass if info.full_type_name == 'GObject::InitiallyUnownedClass'
+        return parent_field_type.tag_or_class if info.gtype_struct?
         return BoxedBase if GObject.type_fundamental(info.gtype) == GObject::TYPE_BOXED
 
         StructBase
       end
+
+      def parent_field_type
+        fields.first.field_type
+      end
     end
   end
 end

data/lib/gir_ffi/builders/unintrospectable_builder.rb

@@ -26,8 +26,11 @@ module GirFFI
       def find_signal(signal_name)
         info = super
         return info if info
+
         signal_id = GObject.signal_lookup signal_name, target_gtype
-        return UnintrospectableSignalInfo.new(signal_id) unless signal_id.zero?
+        return if signal_id == 0
+
+        UnintrospectableSignalInfo.new(signal_id)
       end
     end
   end

data/lib/gir_ffi/builders/user_defined_builder.rb

@@ -16,7 +16,7 @@ module GirFFI
         register_type
         setup_constants
         setup_property_accessors
-        setup_constructor
+        setup_initializer
         TypeBuilder::CACHE[@gtype] = klass
       end
 
@@ -49,7 +49,7 @@ module GirFFI
       end
 
       def included_interfaces
-        klass.included_modules - Object.included_modules
+        klass.included_interfaces
       end
 
       def klass
@@ -86,11 +86,13 @@ module GirFFI
       end
 
       def instance_size
-        size = parent_gtype.instance_size
-        alignment = struct_class.alignment
-        properties.each do |prop|
-          type_size = FFI.type_size(prop.ffi_type)
-          size += [type_size, alignment].max
+        if property_fields.any?
+          last_property = property_fields.last
+          size = last_property.offset
+          type_size = FFI.type_size(last_property.ffi_type)
+          size += [type_size, field_alignment].max
+        else
+          size = parent_gtype.instance_size
         end
         size
       end
@@ -105,7 +107,7 @@ module GirFFI
         object_class.get_property = property_getter
         object_class.set_property = property_setter
 
-        properties.each_with_index do |property, index|
+        property_fields.each_with_index do |property, index|
           object_class.install_property index + 1, property.param_spec
         end
       end
@@ -156,110 +158,44 @@ module GirFFI
       end
 
       def properties
-        info.properties
+        @properties ||= info.properties
       end
 
       def layout_specification
         parent_spec = [:parent, superclass::Struct]
-        offset = parent_gtype.instance_size
-
-        alignment = superclass::Struct.alignment
-        fields_spec = properties.flat_map do |param_info|
-          field_name = param_info.accessor_name.to_sym
-          ffi_type = param_info.ffi_type
-          type_size = FFI.type_size(ffi_type)
-          spec = [field_name, ffi_type, offset]
-          offset += [type_size, alignment].max
-          spec
-        end
-        parent_spec + fields_spec
-      end
-
-      # TODO: Move this to its own file.
-      # TODO: See if this or FieldTypeInfo can be merged with with
-      # UserDefinedPropertyInfo.
-      class UserDefinedPropertyFieldInfo
-        # Field info for user-defined property
-        class FieldTypeInfo
-          include InfoExt::ITypeInfo
-
-          def initialize(property_info)
-            @property_info = property_info
-          end
-
-          def tag
-            @property_info.type_tag
-          end
-
-          def pointer?
-            @property_info.pointer_type?
-          end
-
-          def interface_type
-            @property_info.interface_type_tag if tag == :interface
-          end
-
-          def hidden_struct_type?
-            false
-          end
-
-          def interface_class
-            Builder.build_by_gtype @property_info.value_type if tag == :interface
-          end
-
-          def interface_class_name
-            interface_class.name if tag == :interface
-          end
-        end
-
-        def initialize(property_info, container, offset)
-          @property_info = property_info
-          @container = container
-          @offset = offset
-        end
-
-        attr_reader :container, :offset
 
-        def name
-          @property_info.accessor_name
+        fields_spec = property_fields.flat_map do |property_info|
+          [property_info.field_symbol, property_info.ffi_type, property_info.offset]
         end
 
-        def field_type
-          @field_type ||= FieldTypeInfo.new @property_info
-        end
-
-        def related_array_length_field
-          nil
-        end
+        parent_spec + fields_spec
+      end
 
-        def writable?
-          @property_info.writable?
-        end
+      def field_alignment
+        @field_alignment ||= superclass::Struct.alignment
       end
 
       def setup_property_accessors
-        offset = parent_gtype.instance_size
-        alignment = struct_class.alignment
-        properties.each do |param_info|
-          field_info = UserDefinedPropertyFieldInfo.new(param_info, info, offset)
-          type_size = FFI.type_size(param_info.ffi_type)
-          offset += [type_size, alignment].max
+        property_fields.each do |field_info|
           FieldBuilder.new(field_info, klass).build
         end
       end
 
-      def method_introspection_data(_method)
-        nil
+      def property_fields
+        @property_fields ||=
+          begin
+            offset = parent_gtype.instance_size
+            properties.map do |param_spec|
+              field_info = UserDefinedPropertyInfo.new(param_spec, info, offset)
+              type_size = FFI.type_size(field_info.ffi_type)
+              offset += [type_size, field_alignment].max
+              field_info
+            end
+          end
       end
 
-      def setup_constructor
-        code = <<-CODE
-        def initialize
-          ptr = GObject::Lib.g_object_new #{@gtype}, nil
-          store_pointer(ptr)
-        end
-        CODE
-        klass.class_eval code
+      def method_introspection_data(_method)
+        nil
       end
     end
   end