gobject-introspection 3.0.9-x86-mingw32 → 3.1.0-x86-mingw32

data/lib/gobject-introspection/loader.rb

@@ -78,44 +78,33 @@ module GObjectIntrospection
     end
 
     def define_module_function(target_module, name, function_info)
-      unlock_gvl = should_unlock_gvl?(function_info, target_module)
-      prepare = lambda do |arguments, &block|
-        arguments, block = build_arguments(function_info, arguments, &block)
-        method_name = "#{target_module}\#.#{name}"
-        validate_arguments(function_info, method_name, arguments)
-        [arguments, block]
-      end
+      function_info.unlock_gvl = should_unlock_gvl?(function_info, target_module)
+      method_name = "#{target_module}\#.#{name}"
+      arguments_builder = ArgumentsBuilder.new(function_info, method_name)
       target_module.module_eval do
         define_method(name) do |*arguments, &block|
-          arguments, block = prepare.call(arguments, &block)
-          function_info.invoke({
-                                 :arguments => arguments,
-                                 :unlock_gvl => unlock_gvl,
-                               },
-                               &block)
+          arguments_builder.build(arguments, block)
+          arguments = arguments_builder.arguments
+          block = arguments_builder.block
+          function_info.invoke(arguments, &block)
         end
         module_function(name)
       end
     end
 
     def define_singleton_method(klass, name, info)
-      unlock_gvl = should_unlock_gvl?(info, klass)
-      prepare = lambda do |arguments, &block|
-        arguments, block = build_arguments(info, arguments, &block)
-        validate_arguments(info, "#{klass}.#{name}", arguments)
-        [arguments, block]
-      end
+      info.unlock_gvl = should_unlock_gvl?(info, klass)
+      arguments_builder = ArgumentsBuilder.new(info, "#{klass}.#{name}")
+      require_callback_p = info.require_callback?
       singleton_class = (class << klass; self; end)
       singleton_class.__send__(:define_method, name) do |*arguments, &block|
-        arguments, block = prepare.call(arguments, &block)
-        if block.nil? and info.require_callback?
+        arguments_builder.build(arguments, block)
+        arguments = arguments_builder.arguments
+        block = arguments_builder.block
+        if block.nil? and require_callback_p
           to_enum(name, *arguments)
         else
-          info.invoke({
-                        :arguments => arguments,
-                        :unlock_gvl => unlock_gvl,
-                      },
-                      &block)
+          info.invoke(arguments, &block)
         end
       end
     end
@@ -286,25 +275,18 @@ module GObjectIntrospection
     def load_constructor_infos(infos, klass)
       return if infos.empty?
 
-      prepare = lambda do |info, method_name, arguments, &block|
-        arguments, block = build_arguments(info, arguments, &block)
-        validate_arguments(info, "#{klass}\##{method_name}", arguments)
-        [arguments, block]
-      end
       call_initialize_post = lambda do |object|
         initialize_post(object)
       end
       infos.each do |info|
         name = "initialize_#{info.name}"
-        unlock_gvl = should_unlock_gvl?(info, klass)
+        info.unlock_gvl = should_unlock_gvl?(info, klass)
+        arguments_builder = ArgumentsBuilder.new(info, "#{klass}\##{name}")
         klass.__send__(:define_method, name) do |*arguments, &block|
-          arguments, block = prepare.call(info, name, arguments, &block)
-          info.invoke({
-                        :receiver  => self,
-                        :arguments => arguments,
-                        :unlock_gvl => unlock_gvl,
-                      },
-                      &block)
+          arguments_builder.build(arguments, block)
+          arguments = arguments_builder.arguments
+          block = arguments_builder.block
+          info.invoke(self, arguments, &block)
           call_initialize_post.call(self)
         end
         klass.__send__(:private, name)
@@ -320,30 +302,8 @@ module GObjectIntrospection
     end
 
     def initialize_post(object)
-    end
-
-    def build_arguments(info, arguments, &block)
-      last_in_arg = info.in_args.last
-      if block and last_in_arg and last_in_arg.gclosure?
-        [arguments + [block], nil]
-      else
-        [arguments, block]
-      end
-    end
-
-    def validate_arguments(info, method_name, arguments)
-      n_in_args = info.n_in_args
-      n_required_in_args = info.n_required_in_args
-      return if (n_required_in_args..n_in_args).cover?(arguments.size)
-
-      detail = "#{arguments.size} for "
-      if n_in_args == n_required_in_args
-        detail << "#{n_in_args}"
-      else
-        detail << "#{n_required_in_args}..#{n_in_args}"
-      end
-      message = "#{method_name}: wrong number of arguments (#{detail})"
-      raise ArgumentError, message
+      return unless object.is_a?(GLib::Object)
+      self.class.reference_gobject(object, :sink => true)
     end
 
     def find_suitable_callable_info(infos, arguments)
@@ -453,7 +413,7 @@ module GObjectIntrospection
       case return_type_tag
       when TypeTag::BOOLEAN
         case name
-        when /\A(?:is|get_is)_/
+        when /\A(?:is|get_is|can_be)_/
           "#{$POSTMATCH}?"
         when /\Aget_/
           if function_info.n_in_args.zero?
@@ -539,33 +499,29 @@ module GObjectIntrospection
     end
 
     def define_method(info, klass, method_name)
-      unlock_gvl = should_unlock_gvl?(info, klass)
+      info.unlock_gvl = should_unlock_gvl?(info, klass)
       remove_existing_method(klass, method_name)
       function_info_p = (info.class == FunctionInfo)
-      no_return_value_p =
-        (info.return_type.tag == TypeTag::VOID and info.n_out_args.zero?)
-      prepare = lambda do |arguments, &block|
-        arguments, block = build_arguments(info, arguments, &block)
-        validate_arguments(info, "#{klass}\##{method_name}", arguments)
-        [arguments, block]
-      end
+      have_return_value_p = info.have_return_value?
+      arguments_builder = ArgumentsBuilder.new(info, "#{klass}\##{method_name}")
       require_callback_p = info.require_callback?
       klass.__send__(:define_method, method_name) do |*arguments, &block|
-        arguments = [self] + arguments if function_info_p
-        arguments, block = prepare.call(arguments, &block)
+        arguments.unshift(self) if function_info_p
+        arguments_builder.build(arguments, block)
+        arguments = arguments_builder.arguments
+        block = arguments_builder.block
         if block.nil? and require_callback_p
           to_enum(method_name, *arguments)
         else
-          options = {
-            :arguments => arguments,
-            :unlock_gvl => unlock_gvl,
-          }
-          options[:receiver] = self unless function_info_p
-          return_value = info.invoke(options, &block)
-          if no_return_value_p
-            self
+          if function_info_p
+            return_value = info.invoke(arguments, &block)
           else
+            return_value = info.invoke(self, arguments, &block)
+          end
+          if have_return_value_p
             return_value
+          else
+            self
           end
         end
       end
@@ -609,5 +565,80 @@ module GObjectIntrospection
       load_fields(info, klass)
       load_methods(info, klass)
     end
+
+    class ArgumentsBuilder
+      attr_reader :arguments
+      attr_reader :block
+      def initialize(info, method_name)
+        @info = info
+        @method_name = method_name
+
+        @prepared = false
+
+        @arguments = nil
+        @block = nil
+      end
+
+      def build(arguments, block)
+        prepare
+
+        @arguments = arguments
+        @block = block
+
+        build_arguments
+        validate_arguments
+      end
+
+      private
+      def prepare
+        return if @prepared
+
+        @in_args = @info.in_args
+        @n_in_args = @in_args.size
+        @n_required_in_args = @info.n_required_in_args
+        @last_in_arg = @in_args.last
+        if @last_in_arg
+          @last_in_arg_is_gclosure = @last_in_arg.gclosure?
+        else
+          @last_in_arg_is_gclosure = false
+        end
+        @valid_n_args_range = (@n_required_in_args..@n_in_args)
+
+        @prepared = true
+      end
+
+      def build_arguments
+        if @block and @last_in_arg_is_gclosure
+          @arguments << @block
+          @block = nil
+        end
+
+        n_missing_arguments = @n_in_args - @arguments.size
+        if n_missing_arguments > 0
+          nil_indexes = []
+          @in_args.each_with_index do |arg, i|
+            nil_indexes << i if arg.may_be_null?
+          end
+          return if nil_indexes.size < n_missing_arguments
+          nil_indexes.each_with_index do |nil_index, i|
+            next if i <= n_missing_arguments
+            @arguments.insert(nil_index, nil)
+          end
+        end
+      end
+
+      def validate_arguments
+        return if @valid_n_args_range.cover?(@arguments.size)
+
+        detail = "#{@arguments.size} for "
+        if @n_in_args == @n_required_in_args
+          detail << "#{@n_in_args}"
+        else
+          detail << "#{@n_required_in_args}..#{@n_in_args}"
+        end
+        message = "#{@method_name}: wrong number of arguments (#{detail})"
+        raise ArgumentError, message
+      end
+    end
   end
 end

data/vendor/local/lib/gobject-introspection/giscanner/ast.py

@@ -569,7 +569,8 @@ class Node(Annotated):
 (namespace, name) pair.  When combined with a ., this is called a
 GIName.  It's possible for nodes to contain or point to other nodes."""
 
-    c_name = property(lambda self: self.namespace.name + self.name)
+    c_name = property(lambda self: self.namespace.name + self.name if self.namespace else
+                      self.name)
     gi_name = property(lambda self: '%s.%s' % (self.namespace.name, self.name))
 
     def __init__(self, name=None):

data/vendor/local/lib/libgirepository-1.0.la

@@ -1,5 +1,5 @@
 # libgirepository-1.0.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-0.1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -13,7 +13,7 @@ library_names='libgirepository-1.0.dll.a'
 # The name of the static archive.
 old_library='libgirepository-1.0.a'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.