gir_ffi 0.9.5 → 0.10.0.pre1

data/test/gir_ffi/builders/callback_argument_builder_test.rb

@@ -16,11 +16,11 @@ describe GirFFI::Builders::CallbackArgumentBuilder do
       before { skip unless vfunc_info }
 
       it 'has the correct value for #pre_conversion' do
-        builder.pre_conversion.must_equal ['_v1 = GirFFI::InOutPointer.new([:pointer, :zero_terminated], a)']
+        builder.pre_conversion.must_equal ['_v1 = a']
       end
 
       it 'has the correct value for #post_conversion' do
-        builder.post_conversion.must_equal ['_v1.set_value GirFFI::ZeroTerminated.from(:gfloat, _v2)']
+        builder.post_conversion.must_equal ['_v1.put_pointer 0, GirFFI::ZeroTerminated.from(:gfloat, _v2)']
       end
     end
   end
@@ -30,7 +30,7 @@ describe GirFFI::Builders::CallbackArgumentBuilder do
 
     it 'sets up a rescueing block in #pre_conversion' do
       builder.pre_conversion.must_equal [
-        '_v1 = GirFFI::InOutPointer.new([:pointer, :error], _error)',
+        '_v1 = _error',
         'begin'
       ]
     end
@@ -38,7 +38,7 @@ describe GirFFI::Builders::CallbackArgumentBuilder do
     it 'converts any exceptions to GLib::Error in #post_conversion' do
       builder.post_conversion.must_equal [
         'rescue => _v1',
-        '_v2.set_value GLib::Error.from(_v1)',
+        '_v2.put_pointer 0, GLib::Error.from(_v1)',
         'end'
       ]
     end
@@ -75,14 +75,14 @@ describe GirFFI::Builders::CallbackArgumentBuilder do
 
       it 'has the correct value for #pre_conversion' do
         array_arg_builder.pre_conversion.
-          must_equal ['_v1 = GirFFI::InOutPointer.new([:pointer, :c], ints)',
-                      '_v2 = GirFFI::SizedArray.wrap(:gint32, _v3, _v1.to_value)']
+          must_equal ['_v1 = ints',
+                      '_v2 = GirFFI::SizedArray.wrap(:gint32, _v3, _v1.get_pointer(0))']
       end
 
       it 'has the correct value for #post_conversion' do
         array_arg_builder.pre_conversion
         array_arg_builder.post_conversion.
-          must_equal ['_v1.set_value GirFFI::SizedArray.from(:gint32, -1, _v4)']
+          must_equal ['_v1.put_pointer 0, GirFFI::SizedArray.from(:gint32, -1, _v4)']
       end
     end
 
@@ -97,14 +97,14 @@ describe GirFFI::Builders::CallbackArgumentBuilder do
 
       it 'has the correct value for #pre_conversion' do
         length_arg_builder.pre_conversion.
-          must_equal ['_v1 = GirFFI::InOutPointer.new(:gint32, length)',
-                      '_v2 = _v1.to_value']
+          must_equal ['_v1 = length',
+                      '_v2 = _v1.get_int32(0)']
       end
 
       it 'has the correct value for #post_conversion' do
         length_arg_builder.pre_conversion
         length_arg_builder.post_conversion.
-          must_equal ['_v1.set_value _v3.length']
+          must_equal ['_v1.put_int32 0, _v3.length']
       end
     end
   end

data/test/gir_ffi/builders/callback_builder_test.rb

@@ -58,9 +58,9 @@ describe GirFFI::Builders::CallbackBuilder do
       it 'returns a valid mapping method' do
         expected = <<-CODE.reset_indentation
         def self.call_with_argument_mapping(_proc, a)
-          _v1 = GirFFI::InOutPointer.new(:gfloat, a)
+          _v1 = a
           _v2 = _proc.call()
-          _v1.set_value _v2
+          _v1.put_float 0, _v2
         end
         CODE
 
@@ -77,13 +77,36 @@ describe GirFFI::Builders::CallbackBuilder do
         skip unless callback_info
         expected = <<-CODE.reset_indentation
         def self.call_with_argument_mapping(_proc, ints, length)
-          _v1 = GirFFI::InOutPointer.new(:gint32, length)
-          _v2 = _v1.to_value
-          _v3 = GirFFI::InOutPointer.new([:pointer, :c], ints)
-          _v4 = GirFFI::SizedArray.wrap(:gint32, _v2, _v3.to_value)
+          _v1 = length
+          _v2 = _v1.get_int32(0)
+          _v3 = ints
+          _v4 = GirFFI::SizedArray.wrap(:gint32, _v2, _v3.get_pointer(0))
           _v5 = _proc.call(_v4)
-          _v1.set_value _v5.length
-          _v3.set_value GirFFI::SizedArray.from(:gint32, -1, _v5)
+          _v1.put_int32 0, _v5.length
+          _v3.put_pointer 0, GirFFI::SizedArray.from(:gint32, -1, _v5)
+        end
+        CODE
+
+        builder.mapping_method_definition.must_equal expected
+      end
+    end
+
+    describe 'for a callback with a value in argument' do
+      let(:field_info) do
+        get_field_introspection_data('GObject',
+                                     'ObjectClass', 'get_property')
+      end
+      let(:callback_info) do
+        field_info.field_type.interface
+      end
+      it 'returns a valid mapping method' do
+        expected = <<-CODE.reset_indentation
+        def self.call_with_argument_mapping(_proc, object, property_id, value, pspec)
+          _v1 = GObject::Object.wrap(object)
+          _v2 = property_id
+          _v3 = GObject::Value.wrap(value)
+          _v4 = GObject::ParamSpec.wrap(pspec)
+          _proc.call(_v1, _v2, _v3, _v4)
         end
         CODE
 

data/test/gir_ffi/builders/field_builder_test.rb

@@ -10,9 +10,8 @@ describe GirFFI::Builders::FieldBuilder do
       expected = <<-CODE.reset_indentation
         def some_int8
           _v1 = @struct.to_ptr + #{field_info.offset}
-          _v2 = GirFFI::InOutPointer.new(:gint8, _v1)
-          _v3 = _v2.to_value
-          _v3
+          _v2 = _v1.get_int8(0)
+          _v2
         end
       CODE
       instance.getter_def.must_equal expected
@@ -22,9 +21,8 @@ describe GirFFI::Builders::FieldBuilder do
       expected = <<-CODE.reset_indentation
         def some_int8= value
           _v1 = @struct.to_ptr + #{field_info.offset}
-          _v2 = GirFFI::InOutPointer.new(:gint8, _v1)
-          _v3 = value
-          _v2.set_value _v3
+          _v2 = value
+          _v1.put_int8 0, _v2
         end
       CODE
       instance.setter_def.must_equal expected
@@ -37,14 +35,24 @@ describe GirFFI::Builders::FieldBuilder do
       expected = <<-CODE.reset_indentation
         def nested_a
           _v1 = @struct.to_ptr + #{field_info.offset}
-          _v2 = GirFFI::InOutPointer.new(Regress::TestSimpleBoxedA, _v1)
-          _v3 = _v2.to_value
-          _v4 = Regress::TestSimpleBoxedA.wrap(_v3)
-          _v4
+          _v2 = Regress::TestSimpleBoxedA.get_value_from_pointer(_v1, 0)
+          _v3 = Regress::TestSimpleBoxedA.wrap(_v2)
+          _v3
         end
       CODE
       instance.getter_def.must_equal expected
     end
+
+    it 'creates the right setter method' do
+      expected = <<-CODE.reset_indentation
+        def nested_a= value
+          _v1 = @struct.to_ptr + #{field_info.offset}
+          _v2 = Regress::TestSimpleBoxedA.copy_from(value)
+          Regress::TestSimpleBoxedA.copy_value_to_pointer(_v2, _v1)
+        end
+      CODE
+      instance.setter_def.must_equal expected
+    end
   end
 
   describe 'for a field of type :enum' do
@@ -53,9 +61,8 @@ describe GirFFI::Builders::FieldBuilder do
       expected = <<-CODE.reset_indentation
         def some_enum
           _v1 = @struct.to_ptr + #{field_info.offset}
-          _v2 = GirFFI::InOutPointer.new(Regress::TestEnum, _v1)
-          _v3 = _v2.to_value
-          _v3
+          _v2 = Regress::TestEnum.get_value_from_pointer(_v1, 0)
+          _v2
         end
       CODE
       instance.getter_def.must_equal expected
@@ -68,10 +75,9 @@ describe GirFFI::Builders::FieldBuilder do
       expected = <<-CODE.reset_indentation
         def some_union
           _v1 = @struct.to_ptr + #{field_info.offset}
-          _v2 = GirFFI::InOutPointer.new(:c, _v1)
-          _v3 = _v2.to_value
-          _v4 = GirFFI::SizedArray.wrap(Regress::TestStructE__some_union__union, 2, _v3)
-          _v4
+          _v2 = GirFFI::SizedArray.get_value_from_pointer(_v1, 0)
+          _v3 = GirFFI::SizedArray.wrap(Regress::TestStructE__some_union__union, 2, _v2)
+          _v3
         end
       CODE
       instance.getter_def.must_equal expected
@@ -81,10 +87,9 @@ describe GirFFI::Builders::FieldBuilder do
       expected = <<-CODE.reset_indentation
         def some_union= value
           _v1 = @struct.to_ptr + #{field_info.offset}
-          _v2 = GirFFI::InOutPointer.new(:c, _v1)
           GirFFI::ArgHelper.check_fixed_array_size 2, value, \"value\"
-          _v3 = GirFFI::SizedArray.from(Regress::TestStructE__some_union__union, 2, value)
-          _v2.set_value _v3
+          _v2 = GirFFI::SizedArray.copy_from(Regress::TestStructE__some_union__union, 2, value)
+          GirFFI::SizedArray.copy_value_to_pointer(_v2, _v1)
         end
       CODE
       instance.setter_def.must_equal expected
@@ -97,9 +102,8 @@ describe GirFFI::Builders::FieldBuilder do
       expected = <<-CODE.reset_indentation
         def class_init= value
           _v1 = @struct.to_ptr + #{field_info.offset}
-          _v2 = GirFFI::InOutPointer.new(GObject::ClassInitFunc, _v1)
-          _v3 = GObject::ClassInitFunc.from(value)
-          _v2.set_value _v3
+          _v2 = GObject::ClassInitFunc.from(value)
+          GObject::ClassInitFunc.copy_value_to_pointer(_v2, _v1)
         end
       CODE
       instance.setter_def.must_equal expected
@@ -115,13 +119,11 @@ describe GirFFI::Builders::FieldBuilder do
       expected = <<-CODE.reset_indentation
         def param_types
           _v1 = @struct.to_ptr + #{n_params_field_info.offset}
-          _v2 = GirFFI::InOutPointer.new(:guint32, _v1)
-          _v3 = _v2.to_value
-          _v4 = @struct.to_ptr + #{field_info.offset}
-          _v5 = GirFFI::InOutPointer.new([:pointer, :c], _v4)
-          _v6 = _v5.to_value
-          _v7 = GirFFI::SizedArray.wrap(:GType, _v3, _v6)
-          _v7
+          _v2 = _v1.get_uint32(0)
+          _v3 = @struct.to_ptr + #{field_info.offset}
+          _v4 = _v3.get_pointer(0)
+          _v5 = GirFFI::SizedArray.wrap(:GType, _v2, _v4)
+          _v5
         end
       CODE
       instance.getter_def.must_equal expected

data/test/gir_ffi/builders/function_builder_test.rb

@@ -12,9 +12,9 @@ describe GirFFI::Builders::FunctionBuilder do
         skip unless function_info
         code.must_equal <<-CODE.reset_indentation
           def self.test_array_fixed_out_objects
-            _v1 = GirFFI::InOutPointer.for [:pointer, :c]
+            _v1 = FFI::MemoryPointer.new :pointer
             Regress::Lib.regress_test_array_fixed_out_objects _v1
-            _v2 = GirFFI::SizedArray.wrap([:pointer, Regress::TestObj], 2, _v1.to_value)
+            _v2 = GirFFI::SizedArray.wrap([:pointer, Regress::TestObj], 2, _v1.get_pointer(0))
             return _v2
           end
         CODE
@@ -43,12 +43,12 @@ describe GirFFI::Builders::FunctionBuilder do
         code.must_equal <<-CODE.reset_indentation
           def parse_args(argv)
             argc = argv.nil? ? 0 : argv.length
-            _v1 = GirFFI::InOutPointer.for :gint32
-            _v1.set_value argc
-            _v2 = GirFFI::InOutPointer.for [:pointer, :strv]
-            _v2.set_value GLib::Strv.from(argv)
+            _v1 = FFI::MemoryPointer.new :int32
+            _v1.put_int32 0, argc
+            _v2 = FFI::MemoryPointer.new :pointer
+            _v2.put_pointer 0, GLib::Strv.from(argv)
             Regress::Lib.regress_annotation_object_parse_args self, _v1, _v2
-            _v3 = GLib::Strv.wrap(_v2.to_value)
+            _v3 = GLib::Strv.wrap(_v2.get_pointer(0))
             return _v3
           end
         CODE
@@ -61,7 +61,7 @@ describe GirFFI::Builders::FunctionBuilder do
         code.must_equal <<-CODE.reset_indentation
           def self.test_callback_destroy_notify(&callback)
             _v1 = Regress::TestCallbackUserData.from(callback)
-            _v2 = GirFFI::InPointer.from_closure_data(_v1)
+            _v2 = GirFFI::ArgHelper.store(_v1)
             _v3 = GLib::DestroyNotify.default
             _v4 = Regress::Lib.regress_test_callback_destroy_notify _v1, _v2, _v3
             return _v4
@@ -100,9 +100,9 @@ describe GirFFI::Builders::FunctionBuilder do
       it 'creates a call to #get_value' do
         code.must_equal <<-CODE.reset_indentation
           def self.gvalue_out
-            _v1 = GirFFI::InOutPointer.for [:pointer, GObject::Value]
+            _v1 = FFI::MemoryPointer.new :pointer
             GIMarshallingTests::Lib.gi_marshalling_tests_gvalue_out _v1
-            _v2 = GObject::Value.wrap(_v1.to_value).get_value
+            _v2 = GObject::Value.wrap(_v1.get_pointer(0)).get_value
             return _v2
           end
         CODE
@@ -144,11 +144,11 @@ describe GirFFI::Builders::FunctionBuilder do
       it 'builds correct definition' do
         code.must_equal <<-CODE.reset_indentation
           def self.test_array_int_null_out
-            _v1 = GirFFI::InOutPointer.for :gint32
-            _v2 = GirFFI::InOutPointer.for [:pointer, :c]
+            _v1 = FFI::MemoryPointer.new :int32
+            _v2 = FFI::MemoryPointer.new :pointer
             Regress::Lib.regress_test_array_int_null_out _v2, _v1
-            _v3 = _v1.to_value
-            _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v2.to_value)
+            _v3 = _v1.get_int32(0)
+            _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v2.get_pointer(0))
             return _v4
           end
         CODE
@@ -161,13 +161,13 @@ describe GirFFI::Builders::FunctionBuilder do
         code.must_equal <<-CODE.reset_indentation
           def method_array_inout(ints)
             length = ints.nil? ? 0 : ints.length
-            _v1 = GirFFI::InOutPointer.for :gint32
-            _v1.set_value length
-            _v2 = GirFFI::InOutPointer.for [:pointer, :c]
-            _v2.set_value GirFFI::SizedArray.from(:gint32, -1, ints)
+            _v1 = FFI::MemoryPointer.new :int32
+            _v1.put_int32 0, length
+            _v2 = FFI::MemoryPointer.new :pointer
+            _v2.put_pointer 0, GirFFI::SizedArray.from(:gint32, -1, ints)
             GIMarshallingTests::Lib.gi_marshalling_tests_object_method_array_inout self, _v2, _v1
-            _v3 = _v1.to_value
-            _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v2.to_value)
+            _v3 = _v1.get_int32(0)
+            _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v2.get_pointer(0))
             return _v4
           end
         CODE
@@ -190,10 +190,10 @@ describe GirFFI::Builders::FunctionBuilder do
     describe 'for GLib::Variant.get_strv' do
       let(:function_info) { get_method_introspection_data 'GLib', 'Variant', 'get_strv' }
       it 'builds a correct definition' do
-        size_type = ":guint#{FFI.type_size(:size_t) * 8}"
+        size_type = ":uint#{FFI.type_size(:size_t) * 8}"
         code.must_equal <<-CODE.reset_indentation
           def get_strv
-            _v1 = GirFFI::InOutPointer.for #{size_type}
+            _v1 = FFI::MemoryPointer.new #{size_type}
             _v2 = GLib::Lib.g_variant_get_strv self, _v1
             _v3 = GLib::Strv.wrap(_v2)
             return _v3
@@ -229,47 +229,222 @@ describe GirFFI::Builders::FunctionBuilder do
         code.must_equal <<-CODE.reset_indentation
           def method_int8_arg_and_out_callee(arg)
             _v1 = arg
-            _v2 = GirFFI::InOutPointer.for [:pointer, :gint8]
+            _v2 = FFI::MemoryPointer.new :pointer
             GIMarshallingTests::Lib.gi_marshalling_tests_object_method_int8_arg_and_out_callee self, _v1, _v2
-            _v3 = GirFFI::InOutPointer.new(:gint8, _v2.to_value).to_value
+            _v3 = _v2.get_pointer(0).get_int8(0)
             return _v3
           end
         CODE
       end
     end
 
-    describe 'for GIMarshallingTests::Object.full_inout' do
-      let(:function_info) do
-        get_method_introspection_data('GIMarshallingTests', 'Object',
-                                      'full_inout')
+    describe 'object ownership transfer' do
+      describe 'for GIMarshallingTests::Object#full_in' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'Object',
+                                        'full_in')
+        end
+
+        # NOTE: This method is transfer-ownership: none, despite the name.
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def full_in
+            GIMarshallingTests::Lib.gi_marshalling_tests_object_full_in self
+          end
+          CODE
+        end
       end
 
-      it 'builds a correct definition' do
-        code.must_equal <<-CODE.reset_indentation
+      describe 'for GIMarshallingTests::Object.full_inout' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'Object',
+                                        'full_inout')
+        end
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
           def self.full_inout(object)
-            _v1 = GirFFI::InOutPointer.for [:pointer, GIMarshallingTests::Object]
-            _v1.set_value GIMarshallingTests::Object.from(object.ref)
+            _v1 = FFI::MemoryPointer.new :pointer
+            _v1.put_pointer 0, GIMarshallingTests::Object.from(object.ref)
             GIMarshallingTests::Lib.gi_marshalling_tests_object_full_inout _v1
-            _v2 = GIMarshallingTests::Object.wrap(_v1.to_value)
+            _v2 = GIMarshallingTests::Object.wrap(_v1.get_pointer(0))
             return _v2
           end
-        CODE
+          CODE
+        end
       end
-    end
 
-    describe 'for Regress::TestObj#instance_method_full' do
-      let(:function_info) do
-        get_method_introspection_data('Regress', 'TestObj',
-                                      'instance_method_full')
+      describe 'for GIMarshallingTests::Object.full_out' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'Object',
+                                        'full_out')
+        end
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def self.full_out
+            _v1 = FFI::MemoryPointer.new :pointer
+            GIMarshallingTests::Lib.gi_marshalling_tests_object_full_out _v1
+            _v2 = GIMarshallingTests::Object.wrap(_v1.get_pointer(0))
+            return _v2
+          end
+          CODE
+        end
       end
 
-      it 'builds a correct definition including self.ref' do
-        skip unless function_info
-        code.must_equal <<-CODE.reset_indentation
+      describe 'for GIMarshallingTests::Object.full_return' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'Object',
+                                        'full_return')
+        end
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def self.full_return
+            _v1 = GIMarshallingTests::Lib.gi_marshalling_tests_object_full_return
+            _v2 = GIMarshallingTests::Object.wrap(_v1)
+            return _v2
+          end
+          CODE
+        end
+      end
+
+      describe 'for GIMarshallingTests::Object#none_in' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'Object',
+                                        'none_in')
+        end
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def none_in
+            GIMarshallingTests::Lib.gi_marshalling_tests_object_none_in self
+          end
+          CODE
+        end
+      end
+
+      describe 'for GIMarshallingTests::Object.none_inout' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'Object',
+                                        'none_inout')
+        end
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def self.none_inout(object)
+            _v1 = FFI::MemoryPointer.new :pointer
+            _v1.put_pointer 0, GIMarshallingTests::Object.from(object)
+            GIMarshallingTests::Lib.gi_marshalling_tests_object_none_inout _v1
+            _v2 = GIMarshallingTests::Object.wrap(_v1.get_pointer(0)).tap { |it| it && it.ref }
+            return _v2
+          end
+          CODE
+        end
+      end
+
+      describe 'for GIMarshallingTests::Object.none_out' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'Object',
+                                        'none_out')
+        end
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def self.none_out
+            _v1 = FFI::MemoryPointer.new :pointer
+            GIMarshallingTests::Lib.gi_marshalling_tests_object_none_out _v1
+            _v2 = GIMarshallingTests::Object.wrap(_v1.get_pointer(0)).tap { |it| it && it.ref }
+            return _v2
+          end
+          CODE
+        end
+      end
+
+      describe 'for GIMarshallingTests::Object.none_return' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'Object',
+                                        'none_return')
+        end
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def self.none_return
+            _v1 = GIMarshallingTests::Lib.gi_marshalling_tests_object_none_return
+            _v2 = GIMarshallingTests::Object.wrap(_v1).tap { |it| it && it.ref }
+            return _v2
+          end
+          CODE
+        end
+      end
+
+      describe 'for Regress::TestObj#instance_method_full' do
+        let(:function_info) do
+          get_method_introspection_data('Regress', 'TestObj',
+                                        'instance_method_full')
+        end
+
+        it 'builds a correct definition including self.ref' do
+          skip unless function_info
+          code.must_equal <<-CODE.reset_indentation
           def instance_method_full
             Regress::Lib.regress_test_obj_instance_method_full self.ref
           end
-        CODE
+          CODE
+        end
+      end
+    end
+
+    describe 'struct ownership transfer' do
+      describe 'for GIMarshallingTests::BoxedStruct.inout' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'BoxedStruct', 'inout')
+        end
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def self.inout(struct_)
+            _v1 = FFI::MemoryPointer.new :pointer
+            _v1.put_pointer 0, GIMarshallingTests::BoxedStruct.copy_from(struct_)
+            GIMarshallingTests::Lib.gi_marshalling_tests_boxed_struct_inout _v1
+            _v2 = GIMarshallingTests::BoxedStruct.wrap_own(_v1.get_pointer(0))
+            return _v2
+          end
+          CODE
+        end
+      end
+
+      describe 'for GIMarshallingTests::BoxedStruct.out' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'BoxedStruct', 'out')
+        end
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def self.out
+            _v1 = FFI::MemoryPointer.new :pointer
+            GIMarshallingTests::Lib.gi_marshalling_tests_boxed_struct_out _v1
+            _v2 = GIMarshallingTests::BoxedStruct.wrap_copy(_v1.get_pointer(0))
+            return _v2
+          end
+          CODE
+        end
+      end
+
+      describe 'for GIMarshallingTests::BoxedStruct.returnv' do
+        let(:function_info) do
+          get_method_introspection_data('GIMarshallingTests', 'BoxedStruct', 'returnv')
+        end
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def self.returnv
+            _v1 = GIMarshallingTests::Lib.gi_marshalling_tests_boxed_struct_returnv
+            _v2 = GIMarshallingTests::BoxedStruct.wrap_copy(_v1)
+            return _v2
+          end
+          CODE
+        end
       end
     end
 
@@ -278,7 +453,7 @@ describe GirFFI::Builders::FunctionBuilder do
       it 'builds correct definition with default parameter value' do
         code.must_equal <<-CODE.reset_indentation
           def self.test_utf8_null_in(in_ = nil)
-            _v1 = GirFFI::InPointer.from(:utf8, in_)
+            _v1 = GirFFI::InPointer.from_utf8(in_)
             Regress::Lib.regress_test_utf8_null_in _v1
           end
         CODE
@@ -293,12 +468,43 @@ describe GirFFI::Builders::FunctionBuilder do
             _v1 = GObject::Value.from(return_value)
             n_param_values = param_values.nil? ? 0 : param_values.length
             _v2 = n_param_values
-            _v3 = GirFFI::InPointer.from(:void, invocation_hint)
+            _v3 = invocation_hint
             _v4 = GirFFI::SizedArray.from(GObject::Value, -1, param_values)
             GObject::Lib.g_closure_invoke self, _v1, _v2, _v4, _v3
           end
         CODE
       end
     end
+
+    describe 'ownership transfer for an ingoing array of structs' do
+      describe 'with no ownership transfer of the elements' do
+        let(:function_info) { get_introspection_data 'GIMarshallingTests', 'array_struct_in' }
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+            def self.array_struct_in(structs)
+              length = structs.nil? ? 0 : structs.length
+              _v1 = length
+              _v2 = GirFFI::SizedArray.from([:pointer, GIMarshallingTests::BoxedStruct], -1, structs)
+              GIMarshallingTests::Lib.gi_marshalling_tests_array_struct_in _v2, _v1
+            end
+          CODE
+        end
+      end
+      describe 'with ownership transfer of the elements' do
+        let(:function_info) { get_introspection_data 'GIMarshallingTests', 'array_struct_take_in' }
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+            def self.array_struct_take_in(structs)
+              length = structs.nil? ? 0 : structs.length
+              _v1 = length
+              _v2 = GirFFI::SizedArray.copy_from([:pointer, GIMarshallingTests::BoxedStruct], -1, structs)
+              GIMarshallingTests::Lib.gi_marshalling_tests_array_struct_take_in _v2, _v1
+            end
+          CODE
+        end
+      end
+    end
   end
 end