gir_ffi 0.14.1 → 0.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Changelog.md +21 -0
- data/Gemfile +6 -4
- data/README.md +4 -4
- data/Rakefile +5 -5
- data/lib/ffi-glib/array.rb +14 -4
- data/lib/ffi-glib/byte_array.rb +7 -2
- data/lib/ffi-glib/container_class_methods.rb +1 -1
- data/lib/ffi-glib/error.rb +1 -1
- data/lib/ffi-glib/hash_table.rb +3 -3
- data/lib/ffi-glib/list.rb +1 -1
- data/lib/ffi-glib/list_methods.rb +1 -1
- data/lib/ffi-glib/main_loop.rb +3 -3
- data/lib/ffi-glib/ptr_array.rb +30 -8
- data/lib/ffi-glib/s_list.rb +1 -1
- data/lib/ffi-glib/variant.rb +1 -1
- data/lib/ffi-glib.rb +16 -16
- data/lib/ffi-gobject/object.rb +23 -32
- data/lib/ffi-gobject/param_spec.rb +1 -1
- data/lib/ffi-gobject/ruby_closure.rb +2 -2
- data/lib/ffi-gobject/value.rb +37 -28
- data/lib/ffi-gobject.rb +13 -13
- data/lib/ffi-gobject_introspection/gobject_type_init.rb +2 -2
- data/lib/ffi-gobject_introspection/i_arg_info.rb +2 -2
- data/lib/ffi-gobject_introspection/i_base_info.rb +27 -17
- data/lib/ffi-gobject_introspection/i_callable_info.rb +4 -4
- data/lib/ffi-gobject_introspection/i_constant_info.rb +2 -2
- data/lib/ffi-gobject_introspection/i_enum_info.rb +1 -0
- data/lib/ffi-gobject_introspection/i_field_info.rb +1 -1
- data/lib/ffi-gobject_introspection/i_function_info.rb +1 -1
- data/lib/ffi-gobject_introspection/i_interface_info.rb +1 -1
- data/lib/ffi-gobject_introspection/i_object_info.rb +2 -2
- data/lib/ffi-gobject_introspection/i_property_info.rb +2 -2
- data/lib/ffi-gobject_introspection/i_repository.rb +9 -6
- data/lib/ffi-gobject_introspection/i_struct_info.rb +2 -1
- data/lib/ffi-gobject_introspection/i_type_info.rb +13 -7
- data/lib/ffi-gobject_introspection/i_unresolved_info.rb +1 -1
- data/lib/ffi-gobject_introspection/i_vfunc_info.rb +1 -1
- data/lib/ffi-gobject_introspection/lib.rb +30 -19
- data/lib/ffi-gobject_introspection/strv.rb +1 -1
- data/lib/ffi-gobject_introspection.rb +20 -20
- data/lib/gir_ffi/allocation_helper.rb +1 -1
- data/lib/gir_ffi/arg_helper.rb +4 -4
- data/lib/gir_ffi/{in_out_pointer.rb → array_element_convertor.rb} +16 -23
- data/lib/gir_ffi/boolean.rb +1 -1
- data/lib/gir_ffi/boxed_base.rb +1 -1
- data/lib/gir_ffi/builder.rb +18 -10
- data/lib/gir_ffi/builders/argument_builder.rb +17 -17
- data/lib/gir_ffi/builders/base_argument_builder.rb +1 -0
- data/lib/gir_ffi/builders/base_method_builder.rb +7 -7
- data/lib/gir_ffi/builders/base_return_value_builder.rb +1 -1
- data/lib/gir_ffi/builders/base_type_builder.rb +1 -1
- data/lib/gir_ffi/builders/c_to_ruby_convertor.rb +5 -5
- data/lib/gir_ffi/builders/callback_argument_builder.rb +8 -8
- data/lib/gir_ffi/builders/callback_builder.rb +3 -3
- data/lib/gir_ffi/builders/callback_return_value_builder.rb +2 -2
- data/lib/gir_ffi/builders/closure_argument_builder.rb +1 -1
- data/lib/gir_ffi/builders/closure_return_value_builder.rb +1 -1
- data/lib/gir_ffi/builders/constant_builder.rb +1 -1
- data/lib/gir_ffi/builders/constructor_builder.rb +9 -9
- data/lib/gir_ffi/builders/enum_builder.rb +2 -2
- data/lib/gir_ffi/builders/field_builder.rb +16 -15
- data/lib/gir_ffi/builders/flags_builder.rb +2 -2
- data/lib/gir_ffi/builders/full_c_to_ruby_convertor.rb +1 -1
- data/lib/gir_ffi/builders/function_builder.rb +11 -5
- data/lib/gir_ffi/builders/initializer_builder.rb +3 -3
- data/lib/gir_ffi/builders/initializer_return_value_builder.rb +2 -2
- data/lib/gir_ffi/builders/interface_builder.rb +2 -2
- data/lib/gir_ffi/builders/mapping_method_builder.rb +9 -9
- data/lib/gir_ffi/builders/marshalling_method_builder.rb +7 -7
- data/lib/gir_ffi/builders/method_template.rb +1 -1
- data/lib/gir_ffi/builders/module_builder.rb +4 -6
- data/lib/gir_ffi/builders/object_builder.rb +6 -6
- data/lib/gir_ffi/builders/property_argument_builder.rb +1 -1
- data/lib/gir_ffi/builders/property_builder.rb +13 -12
- data/lib/gir_ffi/builders/property_return_value_builder.rb +1 -1
- data/lib/gir_ffi/builders/registered_type_builder.rb +14 -5
- data/lib/gir_ffi/builders/return_value_builder.rb +4 -4
- data/lib/gir_ffi/builders/ruby_to_c_convertor.rb +6 -6
- data/lib/gir_ffi/builders/signal_closure_builder.rb +2 -2
- data/lib/gir_ffi/builders/struct_builder.rb +4 -4
- data/lib/gir_ffi/builders/struct_like.rb +1 -1
- data/lib/gir_ffi/builders/type_builder.rb +12 -12
- data/lib/gir_ffi/builders/unintrospectable_boxed_builder.rb +2 -2
- data/lib/gir_ffi/builders/unintrospectable_builder.rb +2 -2
- data/lib/gir_ffi/builders/union_builder.rb +4 -4
- data/lib/gir_ffi/builders/user_defined_builder.rb +2 -2
- data/lib/gir_ffi/builders/vfunc_argument_builder.rb +1 -1
- data/lib/gir_ffi/builders/vfunc_builder.rb +6 -6
- data/lib/gir_ffi/builders/with_layout.rb +2 -2
- data/lib/gir_ffi/callback_base.rb +1 -1
- data/lib/gir_ffi/class_base.rb +5 -5
- data/lib/gir_ffi/core.rb +19 -20
- data/lib/gir_ffi/enum_base.rb +1 -1
- data/lib/gir_ffi/enum_like_base.rb +2 -2
- data/lib/gir_ffi/error_argument_info.rb +2 -2
- data/lib/gir_ffi/error_type_info.rb +1 -1
- data/lib/gir_ffi/ffi_ext/pointer.rb +1 -1
- data/lib/gir_ffi/ffi_ext.rb +1 -1
- data/lib/gir_ffi/flags_base.rb +1 -1
- data/lib/gir_ffi/in_pointer.rb +10 -0
- data/lib/gir_ffi/info_ext/full_type_name.rb +3 -3
- data/lib/gir_ffi/info_ext/i_arg_info.rb +1 -1
- data/lib/gir_ffi/info_ext/i_callable_info.rb +1 -1
- data/lib/gir_ffi/info_ext/i_callback_info.rb +1 -1
- data/lib/gir_ffi/info_ext/i_field_info.rb +1 -1
- data/lib/gir_ffi/info_ext/i_function_info.rb +1 -1
- data/lib/gir_ffi/info_ext/i_property_info.rb +2 -2
- data/lib/gir_ffi/info_ext/i_registered_type_info.rb +4 -5
- data/lib/gir_ffi/info_ext/i_signal_info.rb +7 -3
- data/lib/gir_ffi/info_ext/i_type_info.rb +48 -26
- data/lib/gir_ffi/info_ext/i_unresolved_info.rb +1 -1
- data/lib/gir_ffi/info_ext/i_value_info.rb +2 -2
- data/lib/gir_ffi/info_ext/i_vfunc_info.rb +2 -2
- data/lib/gir_ffi/info_ext/safe_constant_name.rb +8 -8
- data/lib/gir_ffi/info_ext/safe_function_name.rb +2 -2
- data/lib/gir_ffi/info_ext.rb +15 -15
- data/lib/gir_ffi/interface_base.rb +3 -3
- data/lib/gir_ffi/lib_c.rb +1 -1
- data/lib/gir_ffi/method_stubber.rb +1 -1
- data/lib/gir_ffi/module_base.rb +1 -1
- data/lib/gir_ffi/object_base.rb +3 -4
- data/lib/gir_ffi/receiver_argument_info.rb +1 -1
- data/lib/gir_ffi/receiver_type_info.rb +2 -2
- data/lib/gir_ffi/registered_type_base.rb +1 -1
- data/lib/gir_ffi/sized_array.rb +4 -2
- data/lib/gir_ffi/struct.rb +1 -1
- data/lib/gir_ffi/struct_base.rb +1 -1
- data/lib/gir_ffi/type_map.rb +2 -23
- data/lib/gir_ffi/unintrospectable_boxed_info.rb +2 -2
- data/lib/gir_ffi/unintrospectable_type_info.rb +1 -1
- data/lib/gir_ffi/union.rb +1 -1
- data/lib/gir_ffi/union_base.rb +1 -1
- data/lib/gir_ffi/user_defined_object_info.rb +6 -2
- data/lib/gir_ffi/user_defined_property_info.rb +33 -33
- data/lib/gir_ffi/version.rb +1 -1
- data/lib/gir_ffi-base/gobject/lib.rb +3 -2
- data/lib/gir_ffi-base/gobject.rb +26 -25
- data/lib/gir_ffi-base.rb +1 -1
- data/lib/gir_ffi.rb +3 -3
- data/tasks/test.rake +3 -2
- data/test/base_test_helper.rb +16 -9
- data/test/ffi-glib/array_test.rb +71 -56
- data/test/ffi-glib/byte_array_test.rb +13 -7
- data/test/ffi-glib/bytes_test.rb +24 -19
- data/test/ffi-glib/closure_test.rb +11 -11
- data/test/ffi-glib/destroy_notify_test.rb +6 -6
- data/test/ffi-glib/hash_table_test.rb +27 -27
- data/test/ffi-glib/list_test.rb +22 -22
- data/test/ffi-glib/main_loop_test.rb +12 -12
- data/test/ffi-glib/ptr_array_test.rb +39 -39
- data/test/ffi-glib/ruby_closure_test.rb +10 -10
- data/test/ffi-glib/s_list_test.rb +20 -20
- data/test/ffi-glib/strv_test.rb +19 -19
- data/test/ffi-glib/variant_test.rb +5 -5
- data/test/ffi-gobject/gobject_test.rb +48 -44
- data/test/ffi-gobject/object_class_test.rb +8 -8
- data/test/ffi-gobject/object_test.rb +49 -67
- data/test/ffi-gobject/param_spec_test.rb +12 -12
- data/test/ffi-gobject/value_test.rb +145 -125
- data/test/ffi-gobject_introspection/gobject_type_init_test.rb +8 -8
- data/test/ffi-gobject_introspection/i_base_info_test.rb +15 -16
- data/test/ffi-gobject_introspection/i_constant_info_test.rb +9 -13
- data/test/ffi-gobject_introspection/i_enum_info_test.rb +7 -7
- data/test/ffi-gobject_introspection/i_function_info_test.rb +1 -1
- data/test/ffi-gobject_introspection/i_interface_info_test.rb +10 -10
- data/test/ffi-gobject_introspection/i_object_info_test.rb +23 -23
- data/test/ffi-gobject_introspection/i_property_info_test.rb +19 -19
- data/test/ffi-gobject_introspection/i_registered_type_info_test.rb +10 -10
- data/test/ffi-gobject_introspection/i_repository_test.rb +31 -31
- data/test/ffi-gobject_introspection/i_struct_info_test.rb +10 -10
- data/test/ffi-gobject_introspection/i_type_info_test.rb +12 -15
- data/test/ffi-gobject_introspection/i_union_info_test.rb +7 -7
- data/test/ffi-gobject_introspection/i_vfunc_info_test.rb +16 -16
- data/test/ffi-gobject_introspection/lib_test.rb +3 -3
- data/test/ffi-gobject_introspection/strv_test.rb +9 -9
- data/test/ffi-gobject_test.rb +44 -44
- data/test/gir_ffi/allocation_helper_test.rb +13 -13
- data/test/gir_ffi/arg_helper_test.rb +63 -64
- data/test/gir_ffi/boolean_test.rb +20 -20
- data/test/gir_ffi/boxed_base_test.rb +18 -18
- data/test/gir_ffi/builder_test.rb +115 -93
- data/test/gir_ffi/builders/argument_builder_test.rb +280 -286
- data/test/gir_ffi/builders/base_argument_builder_test.rb +1 -1
- data/test/gir_ffi/builders/callback_argument_builder_test.rb +53 -56
- data/test/gir_ffi/builders/callback_builder_test.rb +71 -72
- data/test/gir_ffi/builders/callback_return_value_builder_test.rb +36 -40
- data/test/gir_ffi/builders/constant_builder_test.rb +1 -1
- data/test/gir_ffi/builders/constructor_builder_test.rb +10 -10
- data/test/gir_ffi/builders/enum_builder_test.rb +10 -10
- data/test/gir_ffi/builders/field_builder_test.rb +42 -42
- data/test/gir_ffi/builders/function_builder_test.rb +236 -224
- data/test/gir_ffi/builders/initializer_builder_test.rb +14 -14
- data/test/gir_ffi/builders/interface_builder_test.rb +9 -9
- data/test/gir_ffi/builders/module_builder_test.rb +18 -18
- data/test/gir_ffi/builders/object_builder_test.rb +38 -38
- data/test/gir_ffi/builders/property_builder_test.rb +91 -94
- data/test/gir_ffi/builders/registered_type_builder_test.rb +35 -11
- data/test/gir_ffi/builders/return_value_builder_test.rb +215 -222
- data/test/gir_ffi/builders/signal_closure_builder_test.rb +122 -113
- data/test/gir_ffi/builders/struct_builder_test.rb +32 -32
- data/test/gir_ffi/builders/unintrospectable_boxed_builder_test.rb +8 -14
- data/test/gir_ffi/builders/unintrospectable_builder_test.rb +23 -23
- data/test/gir_ffi/builders/union_builder_test.rb +12 -15
- data/test/gir_ffi/builders/user_defined_builder_test.rb +147 -147
- data/test/gir_ffi/builders/vfunc_argument_builder_test.rb +40 -40
- data/test/gir_ffi/builders/vfunc_builder_test.rb +145 -157
- data/test/gir_ffi/callback_base_test.rb +9 -9
- data/test/gir_ffi/class_base_test.rb +49 -51
- data/test/gir_ffi/core_test.rb +32 -32
- data/test/gir_ffi/enum_base_test.rb +19 -19
- data/test/gir_ffi/error_type_info_test.rb +23 -23
- data/test/gir_ffi/ffi_ext/pointer_test.rb +5 -5
- data/test/gir_ffi/g_type_test.rb +11 -11
- data/test/gir_ffi/in_pointer_test.rb +70 -50
- data/test/gir_ffi/info_ext/i_callable_info_test.rb +5 -5
- data/test/gir_ffi/info_ext/i_callback_info_test.rb +4 -4
- data/test/gir_ffi/info_ext/i_field_info_test.rb +6 -6
- data/test/gir_ffi/info_ext/i_function_info_test.rb +17 -17
- data/test/gir_ffi/info_ext/i_signal_info_test.rb +8 -8
- data/test/gir_ffi/info_ext/i_type_info_test.rb +229 -215
- data/test/gir_ffi/info_ext/i_unresolved_info_test.rb +4 -4
- data/test/gir_ffi/info_ext/safe_constant_name_test.rb +8 -8
- data/test/gir_ffi/info_ext/safe_function_name_test.rb +8 -8
- data/test/gir_ffi/interface_base_test.rb +8 -8
- data/test/gir_ffi/method_stubber_test.rb +19 -19
- data/test/gir_ffi/object_base_test.rb +19 -19
- data/test/gir_ffi/object_store_test.rb +13 -13
- data/test/gir_ffi/receiver_argument_info_test.rb +15 -15
- data/test/gir_ffi/sized_array_test.rb +68 -68
- data/test/gir_ffi/struct_base_test.rb +8 -8
- data/test/gir_ffi/struct_like_base_test.rb +64 -64
- data/test/gir_ffi/type_map_test.rb +6 -6
- data/test/gir_ffi/unintrospectable_type_info_test.rb +33 -33
- data/test/gir_ffi/union_base_test.rb +8 -8
- data/test/gir_ffi/user_defined_object_info_test.rb +34 -34
- data/test/gir_ffi/user_defined_property_info_test.rb +16 -16
- data/test/gir_ffi/variable_name_generator_test.rb +8 -8
- data/test/gir_ffi/version_test.rb +4 -4
- data/test/gir_ffi/zero_terminated_test.rb +34 -34
- data/test/gir_ffi_test_helper.rb +3 -3
- data/test/integration/callback_exceptions_test.rb +17 -21
- data/test/integration/derived_classes_test.rb +13 -13
- data/test/integration/generated_everything_test.rb +224 -224
- data/test/integration/generated_gimarshallingtests_test.rb +1118 -1017
- data/test/integration/generated_gio_test.rb +36 -36
- data/test/integration/generated_glib_test.rb +4 -6
- data/test/integration/generated_gobject_test.rb +43 -35
- data/test/integration/generated_gst_test.rb +16 -16
- data/test/integration/generated_gtk_source_test.rb +22 -17
- data/test/integration/generated_gtop_test.rb +8 -15
- data/test/integration/generated_pango_ft2_test.rb +2 -2
- data/test/integration/generated_pango_test.rb +4 -4
- data/test/integration/generated_regress_test.rb +1809 -1621
- data/test/integration/generated_secret_test.rb +8 -11
- data/test/integration/generated_utility_test.rb +81 -81
- data/test/integration/generated_warnlib_test.rb +13 -19
- data/test/integration/method_lookup_test.rb +6 -6
- data/test/introspection_test_helper.rb +48 -7
- data/test/minitest/stats_plugin.rb +1 -1
- metadata +11 -28
- data/lib/ffi-glib/array_methods.rb +0 -16
- data/test/gir_ffi/in_out_pointer_test.rb +0 -56
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
4
|
-
require
|
|
5
|
-
require
|
|
6
|
-
require
|
|
7
|
-
require
|
|
8
|
-
require
|
|
9
|
-
require
|
|
3
|
+
require "gir_ffi/builders/argument_builder"
|
|
4
|
+
require "gir_ffi/builders/argument_builder_collection"
|
|
5
|
+
require "gir_ffi/builders/method_template"
|
|
6
|
+
require "gir_ffi/builders/null_argument_builder"
|
|
7
|
+
require "gir_ffi/error_argument_info"
|
|
8
|
+
require "gir_ffi/return_value_info"
|
|
9
|
+
require "gir_ffi/variable_name_generator"
|
|
10
10
|
|
|
11
11
|
module GirFFI
|
|
12
12
|
module Builders
|
|
@@ -35,19 +35,19 @@ module GirFFI
|
|
|
35
35
|
when :struct, :union
|
|
36
36
|
case @ownership_transfer
|
|
37
37
|
when :everything
|
|
38
|
-
|
|
38
|
+
"wrap_own"
|
|
39
39
|
when :nothing
|
|
40
|
-
|
|
40
|
+
"wrap_copy"
|
|
41
41
|
else
|
|
42
|
-
|
|
42
|
+
"wrap"
|
|
43
43
|
end
|
|
44
44
|
else
|
|
45
|
-
|
|
45
|
+
"wrap"
|
|
46
46
|
end
|
|
47
47
|
end
|
|
48
48
|
|
|
49
49
|
def conversion_argument_list
|
|
50
|
-
conversion_arguments.join(
|
|
50
|
+
conversion_arguments.join(", ")
|
|
51
51
|
end
|
|
52
52
|
|
|
53
53
|
def conversion_arguments
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
4
|
-
require
|
|
5
|
-
require
|
|
6
|
-
require
|
|
7
|
-
require
|
|
3
|
+
require "gir_ffi/builders/base_argument_builder"
|
|
4
|
+
require "gir_ffi/builders/c_to_ruby_convertor"
|
|
5
|
+
require "gir_ffi/builders/closure_convertor"
|
|
6
|
+
require "gir_ffi/builders/null_convertor"
|
|
7
|
+
require "gir_ffi/builders/pointer_value_convertor"
|
|
8
8
|
|
|
9
9
|
module GirFFI
|
|
10
10
|
module Builders
|
|
@@ -53,7 +53,7 @@ module GirFFI
|
|
|
53
53
|
when :inout
|
|
54
54
|
[out_parameter_preparation, ingoing_pre_conversion]
|
|
55
55
|
when :error
|
|
56
|
-
[out_parameter_preparation,
|
|
56
|
+
[out_parameter_preparation, "begin"]
|
|
57
57
|
end
|
|
58
58
|
end
|
|
59
59
|
|
|
@@ -65,7 +65,7 @@ module GirFFI
|
|
|
65
65
|
[
|
|
66
66
|
"rescue => #{result_name}",
|
|
67
67
|
value_to_pointer_conversion,
|
|
68
|
-
|
|
68
|
+
"end"
|
|
69
69
|
]
|
|
70
70
|
else
|
|
71
71
|
[]
|
|
@@ -166,7 +166,7 @@ module GirFFI
|
|
|
166
166
|
end
|
|
167
167
|
|
|
168
168
|
def length_argument_name
|
|
169
|
-
length_arg
|
|
169
|
+
length_arg&.pre_converted_name
|
|
170
170
|
end
|
|
171
171
|
end
|
|
172
172
|
end
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
4
|
-
require
|
|
5
|
-
require
|
|
3
|
+
require "gir_ffi/builders/base_type_builder"
|
|
4
|
+
require "gir_ffi/builders/mapping_method_builder"
|
|
5
|
+
require "gir_ffi/callback_base"
|
|
6
6
|
|
|
7
7
|
module GirFFI
|
|
8
8
|
module Builders
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
4
|
-
require
|
|
3
|
+
require "gir_ffi/builders/base_return_value_builder"
|
|
4
|
+
require "gir_ffi/builders/ruby_to_c_convertor"
|
|
5
5
|
|
|
6
6
|
module GirFFI
|
|
7
7
|
module Builders
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
4
|
-
require
|
|
5
|
-
require
|
|
3
|
+
require "gir_ffi/builders/argument_builder_collection"
|
|
4
|
+
require "gir_ffi/builders/method_template"
|
|
5
|
+
require "gir_ffi/builders/null_return_value_builder"
|
|
6
6
|
|
|
7
7
|
module GirFFI
|
|
8
8
|
module Builders
|
|
@@ -30,16 +30,16 @@ module GirFFI
|
|
|
30
30
|
end
|
|
31
31
|
|
|
32
32
|
def method_arguments
|
|
33
|
-
[
|
|
33
|
+
["*args", "&block"]
|
|
34
34
|
end
|
|
35
35
|
|
|
36
36
|
def preparation
|
|
37
|
-
if @info.safe_name ==
|
|
38
|
-
[
|
|
37
|
+
if @info.safe_name == "new"
|
|
38
|
+
["obj = allocate"]
|
|
39
39
|
else
|
|
40
40
|
[
|
|
41
41
|
"raise NoMethodError unless self == #{@info.container.full_type_name}",
|
|
42
|
-
|
|
42
|
+
"obj = allocate"
|
|
43
43
|
]
|
|
44
44
|
end
|
|
45
45
|
end
|
|
@@ -49,13 +49,13 @@ module GirFFI
|
|
|
49
49
|
end
|
|
50
50
|
|
|
51
51
|
def result
|
|
52
|
-
[
|
|
52
|
+
["obj"]
|
|
53
53
|
end
|
|
54
54
|
|
|
55
55
|
private
|
|
56
56
|
|
|
57
57
|
def initializer_name
|
|
58
|
-
@info.safe_name.sub(/^new/,
|
|
58
|
+
@info.safe_name.sub(/^new/, "initialize")
|
|
59
59
|
end
|
|
60
60
|
end
|
|
61
61
|
end
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
4
|
-
require
|
|
5
|
-
require
|
|
6
|
-
require
|
|
7
|
-
require
|
|
8
|
-
require
|
|
3
|
+
require "gir_ffi/builders/argument_builder"
|
|
4
|
+
require "gir_ffi/builders/base_argument_builder"
|
|
5
|
+
require "gir_ffi/builders/null_argument_builder"
|
|
6
|
+
require "gir_ffi/builders/pointer_value_convertor"
|
|
7
|
+
require "gir_ffi/variable_name_generator"
|
|
8
|
+
require "gir_ffi/field_argument_info"
|
|
9
9
|
|
|
10
10
|
module GirFFI
|
|
11
11
|
module Builders
|
|
@@ -208,7 +208,7 @@ module GirFFI
|
|
|
208
208
|
|
|
209
209
|
def length_argument_info
|
|
210
210
|
@length_argument_info ||=
|
|
211
|
-
GetterArgumentInfo.new
|
|
211
|
+
GetterArgumentInfo.new "length", array_length_field.field_type
|
|
212
212
|
end
|
|
213
213
|
|
|
214
214
|
def field_offset
|
|
@@ -224,7 +224,7 @@ module GirFFI
|
|
|
224
224
|
end
|
|
225
225
|
|
|
226
226
|
def field_argument_info
|
|
227
|
-
@field_argument_info ||= GetterArgumentInfo.new
|
|
227
|
+
@field_argument_info ||= GetterArgumentInfo.new "value", field_type
|
|
228
228
|
end
|
|
229
229
|
end
|
|
230
230
|
|
|
@@ -269,12 +269,12 @@ module GirFFI
|
|
|
269
269
|
|
|
270
270
|
field_ptr = builder.new_variable
|
|
271
271
|
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
272
|
+
<<~CODE
|
|
273
|
+
def #{info.name}= #{builder.method_argument_name}
|
|
274
|
+
#{field_ptr} = @struct.to_ptr
|
|
275
|
+
#{builder.pre_conversion.join("\n ")}
|
|
276
|
+
#{value_storage(field_ptr, builder)}
|
|
277
|
+
end
|
|
278
278
|
CODE
|
|
279
279
|
end
|
|
280
280
|
|
|
@@ -291,6 +291,7 @@ module GirFFI
|
|
|
291
291
|
|
|
292
292
|
attr_reader :container_class
|
|
293
293
|
|
|
294
|
+
# TODO: Inject container_info on initialization
|
|
294
295
|
def container_info
|
|
295
296
|
@container_info ||= info.container
|
|
296
297
|
end
|
|
@@ -300,7 +301,7 @@ module GirFFI
|
|
|
300
301
|
end
|
|
301
302
|
|
|
302
303
|
def field_argument_info
|
|
303
|
-
@field_argument_info ||= FieldArgumentInfo.new
|
|
304
|
+
@field_argument_info ||= FieldArgumentInfo.new "value", field_type
|
|
304
305
|
end
|
|
305
306
|
|
|
306
307
|
def setter_builder
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
4
|
-
require
|
|
3
|
+
require "gir_ffi/builders/return_value_builder"
|
|
4
|
+
require "gir_ffi/builders/base_method_builder"
|
|
5
5
|
|
|
6
6
|
module GirFFI
|
|
7
7
|
module Builders
|
|
@@ -37,12 +37,18 @@ module GirFFI
|
|
|
37
37
|
private
|
|
38
38
|
|
|
39
39
|
def receiver_call_argument
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
container_type_info = ReceiverTypeInfo.new(container_info)
|
|
41
|
+
if @info.instance_ownership_transfer == :everything &&
|
|
42
|
+
container_type_info.flattened_tag == :object
|
|
43
|
+
"self.ref"
|
|
42
44
|
else
|
|
43
|
-
|
|
45
|
+
"self"
|
|
44
46
|
end
|
|
45
47
|
end
|
|
48
|
+
|
|
49
|
+
def container_info
|
|
50
|
+
@container_info ||= @info.container
|
|
51
|
+
end
|
|
46
52
|
end
|
|
47
53
|
end
|
|
48
54
|
end
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
4
|
-
require
|
|
3
|
+
require "gir_ffi/builders/initializer_return_value_builder"
|
|
4
|
+
require "gir_ffi/builders/base_method_builder"
|
|
5
5
|
|
|
6
6
|
module GirFFI
|
|
7
7
|
module Builders
|
|
@@ -17,7 +17,7 @@ module GirFFI
|
|
|
17
17
|
end
|
|
18
18
|
|
|
19
19
|
def method_name
|
|
20
|
-
@info.safe_name.sub(/^new/,
|
|
20
|
+
@info.safe_name.sub(/^new/, "initialize")
|
|
21
21
|
end
|
|
22
22
|
|
|
23
23
|
def result
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
3
|
+
require "gir_ffi/builders/base_return_value_builder"
|
|
4
4
|
|
|
5
5
|
module GirFFI
|
|
6
6
|
module Builders
|
|
@@ -9,7 +9,7 @@ module GirFFI
|
|
|
9
9
|
def post_conversion
|
|
10
10
|
result = []
|
|
11
11
|
result << "store_pointer(#{capture_variable_name})"
|
|
12
|
-
result <<
|
|
12
|
+
result << "@struct.owned = true" if specialized_type_tag == :struct
|
|
13
13
|
result
|
|
14
14
|
end
|
|
15
15
|
end
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
4
|
-
require
|
|
5
|
-
require
|
|
6
|
-
require
|
|
7
|
-
require
|
|
8
|
-
require
|
|
3
|
+
require "gir_ffi/variable_name_generator"
|
|
4
|
+
require "gir_ffi/builders/callback_argument_builder"
|
|
5
|
+
require "gir_ffi/builders/vfunc_argument_builder"
|
|
6
|
+
require "gir_ffi/builders/callback_return_value_builder"
|
|
7
|
+
require "gir_ffi/builders/argument_builder_collection"
|
|
8
|
+
require "gir_ffi/builders/base_method_builder"
|
|
9
9
|
|
|
10
10
|
module GirFFI
|
|
11
11
|
module Builders
|
|
@@ -30,12 +30,12 @@ module GirFFI
|
|
|
30
30
|
## Methods used by MethodTemplate
|
|
31
31
|
|
|
32
32
|
def method_name
|
|
33
|
-
|
|
33
|
+
"call_with_argument_mapping"
|
|
34
34
|
end
|
|
35
35
|
|
|
36
36
|
def method_arguments
|
|
37
37
|
@method_arguments ||=
|
|
38
|
-
argument_builder_collection.method_argument_names.dup.unshift(
|
|
38
|
+
argument_builder_collection.method_argument_names.dup.unshift("_proc")
|
|
39
39
|
end
|
|
40
40
|
|
|
41
41
|
def invocation
|
|
@@ -57,7 +57,7 @@ module GirFFI
|
|
|
57
57
|
private
|
|
58
58
|
|
|
59
59
|
def call_argument_list
|
|
60
|
-
argument_builder_collection.call_argument_names.join(
|
|
60
|
+
argument_builder_collection.call_argument_names.join(", ")
|
|
61
61
|
end
|
|
62
62
|
end
|
|
63
63
|
end
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require
|
|
4
|
-
require
|
|
5
|
-
require
|
|
6
|
-
require
|
|
7
|
-
require
|
|
3
|
+
require "gir_ffi/variable_name_generator"
|
|
4
|
+
require "gir_ffi/builders/closure_argument_builder"
|
|
5
|
+
require "gir_ffi/builders/closure_return_value_builder"
|
|
6
|
+
require "gir_ffi/builders/argument_builder_collection"
|
|
7
|
+
require "gir_ffi/builders/method_template"
|
|
8
8
|
|
|
9
9
|
module GirFFI
|
|
10
10
|
module Builders
|
|
@@ -25,7 +25,7 @@ module GirFFI
|
|
|
25
25
|
## Methods used by MethodTemplate
|
|
26
26
|
|
|
27
27
|
def method_name
|
|
28
|
-
|
|
28
|
+
"marshaller"
|
|
29
29
|
end
|
|
30
30
|
|
|
31
31
|
def method_arguments
|
|
@@ -59,7 +59,7 @@ module GirFFI
|
|
|
59
59
|
private
|
|
60
60
|
|
|
61
61
|
def call_argument_list
|
|
62
|
-
@argument_builder_collection.call_argument_names.join(
|
|
62
|
+
@argument_builder_collection.call_argument_names.join(", ")
|
|
63
63
|
end
|
|
64
64
|
|
|
65
65
|
def param_names
|