libui 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbb5362886495f17bf74055bf1ad4cbc96bb7f0e4518e8db0b18f9572559adf2
-  data.tar.gz: 19040d301c6cb135a3e5ef1270f211f48f007f02ec3e5fe7edcbc3be03f275da
+  metadata.gz: f5856ad97384408635e170c1ea252dc3dbdfa1ba3955bfc8b8c1ac2c29585ac1
+  data.tar.gz: 67a9b78e39b61805afca932fc80365b59e068493f2da937c57b03e1500a2adf5
 SHA512:
-  metadata.gz: 27a0c320d8592b2e6a6531b66ed0de3a83a3f606058d16469af530d0633a02d2d13e848e5ca4dd8d6c184015449a2ba56b4eb6c7e63ede1ccb7bfa6d447b5f1b
-  data.tar.gz: '033190ef229e3f567db9c7a7d338da4107072a6120e79c928a5e03dffcca922ffe75ac76f631fda810133cd6316d6af55ea234eb3fce214540fe1e92fd7d6eaf'
+  metadata.gz: 5204e35c1c0f4b0c5f8acd69a4a1d76b6482a1fb298376c99ce29632a202c1340a39e017b68c563b4539a74e721b1611cd3a732b4a9983ef2a0fb3eef7a80b3c
+  data.tar.gz: 8fb83fe3d145646bacb598dc88413364d534493f275c2e0ef637e9718908fe895796a1cb95cdb56f6c6d24b216f23ed68a7812a0c0978a5c700a014ecd0d1573

data/README.md

@@ -69,6 +69,7 @@ Compared to original libui written in C,
 
 * At the moment, it is not object-oriented.
   * Instead of providing a half-baked object-oriented approach, leave it as is.
+* [A list of DSLs for LibUI.](https://github.com/kojix2/LibUI/wiki/DSL-for-LibUI)
 
 ### How to use fiddle pointers?
 

data/lib/libui/ffi.rb

@@ -1,78 +1,12 @@
 # frozen_string_literal: true
 
 require 'fiddle/import'
-
-module Fiddle
-  # Change the Function to hold a little more information.
-  class Function
-    # Note:
-    # Ruby 2.7 Fiddle::Function dose not have @argument_types
-    # Ruby 3.0 Fiddle::Function has @argument_types
-    attr_accessor :callback_argument_types, :argument_types
-  end
-
-  module Importer
-    def parse_signature(signature, tymap = nil)
-      tymap ||= {}
-      ctype, func, args = case compact(signature)
-                          when /^(?:[\w\*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
-                            [TYPE_VOIDP, Regexp.last_match(1), Regexp.last_match(2)]
-                          when /^([\w\*\s]+[*\s])(\w+)\((.*?)\);?$/
-                            [parse_ctype(Regexp.last_match(1).strip, tymap), Regexp.last_match(2), Regexp.last_match(3)]
-                          else
-                            raise("can't parserake the function prototype: #{signature}")
-                          end
-      symname = func
-      callback_argument_types = {}                                              # Added
-      argtype = split_arguments(args).collect.with_index do |arg, idx|          # Added with_index
-        # Check if it is a function pointer or not
-        if arg =~ /\(\*.*\)\(.*\)/                                              # Added
-          # From the arguments, create a notation that looks like a function declaration
-          # int(*f)(int *, void *) -> int f(int *, void *)
-          func_arg = arg.sub('(*', ' ').sub(')', '')                            # Added
-          # Use Fiddle's parse_signature method again.
-          callback_argument_types[idx] = parse_signature(func_arg)              # Added
-        end
-        parse_ctype(arg, tymap)
-      end
-      # Added callback_argument_types. Original method return only 3 values.
-      [symname, ctype, argtype, callback_argument_types]
-    end
-
-    def extern(signature, *opts)
-      symname, ctype, argtype, callback_argument_types = parse_signature(signature, type_alias)
-      opt = parse_bind_options(opts)
-      func = import_function(symname, ctype, argtype, opt[:call_type])
-
-      func.callback_argument_types = callback_argument_types                    # Added
-      # Ruby 2.7 Fiddle::Function dose not have @argument_types
-      # Ruby 3.0 Fiddle::Function has @argument_types
-      func.argument_types = argtype
-
-      name = symname.gsub(/@.+/, '')
-      @func_map[name] = func
-      # define_method(name){|*args,&block| f.call(*args,&block)}
-      begin
-        /^(.+?):(\d+)/ =~ caller.first
-        file = Regexp.last_match(1)
-        line = Regexp.last_match(2).to_i
-      rescue StandardError
-        file, line = __FILE__, __LINE__ + 3
-      end
-      module_eval(<<-EOS, file, line)
-        def #{name}(*args, &block)
-          @func_map['#{name}'].call(*args,&block)
-        end
-      EOS
-      module_function(name)
-      func
-    end
-  end
-end
+require_relative 'fiddle_patch'
 
 module LibUI
   module FFI
     extend Fiddle::Importer
+    extend FiddlePatch
 
     begin
       dlload LibUI.ffi_lib

data/lib/libui/fiddle_patch.rb

@@ -0,0 +1,79 @@
+module LibUI
+  module FiddlePatch
+    def parse_signature(signature, tymap = nil)
+      tymap ||= {}
+      ctype, func, args = case compact(signature)
+                          when /^(?:[\w\*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
+                            [TYPE_VOIDP, Regexp.last_match(1), Regexp.last_match(2)]
+                          when /^([\w\*\s]+[*\s])(\w+)\((.*?)\);?$/
+                            [parse_ctype(Regexp.last_match(1).strip, tymap), Regexp.last_match(2), Regexp.last_match(3)]
+                          else
+                            raise("can't parserake the function prototype: #{signature}")
+                          end
+      symname = func
+      callback_argument_types = {}                                              # Added
+      argtype = split_arguments(args).collect.with_index do |arg, idx|          # Added with_index
+        # Check if it is a function pointer or not
+        if arg =~ /\(\*.*\)\(.*\)/                                              # Added
+          # From the arguments, create a notation that looks like a function declaration
+          # int(*f)(int *, void *) -> int f(int *, void *)
+          func_arg = arg.sub('(*', ' ').sub(')', '')                            # Added
+          # Use Fiddle's parse_signature method again.
+          callback_argument_types[idx] = parse_signature(func_arg)              # Added
+        end
+        parse_ctype(arg, tymap)
+      end
+      # Added callback_argument_types. Original method return only 3 values.
+      [symname, ctype, argtype, callback_argument_types]
+    end
+
+    def extern(signature, *opts)
+      symname, ctype, argtype, callback_argument_types = parse_signature(signature, type_alias)
+      opt = parse_bind_options(opts)
+      func = import_function(symname, ctype, argtype, opt[:call_type])
+
+      # callback_argument_types
+      func.instance_variable_set(:@callback_argument_types, 
+                                   callback_argument_types) # Added
+      # attr_reader
+      def func.callback_argument_types
+        @callback_argument_types
+      end
+
+      # argument_types
+      # Ruby 2.7 Fiddle::Function dose not have @argument_types
+      # Ruby 3.0 Fiddle::Function has @argument_types
+      if func.instance_variable_defined?(:@argument_types)
+        # check if @argument_types are the same
+        if func.instance_variable_get(:@argument_types) != argtype
+          warn "#{symname} func.argument_types:#{func.argument_types} != argtype #{argtype}"
+        end
+      else
+        func.instance_variable_set(:@argument_types, argtype)
+      end
+      # attr_reader
+      def func.argument_types
+        @argument_types
+      end
+
+      name = symname.gsub(/@.+/, '')
+      @func_map[name] = func
+      # define_method(name){|*args,&block| f.call(*args,&block)}
+      begin
+        /^(.+?):(\d+)/ =~ caller.first
+        file = Regexp.last_match(1)
+        line = Regexp.last_match(2).to_i
+      rescue StandardError
+        file, line = __FILE__, __LINE__ + 3
+      end
+      module_eval(<<-EOS, file, line)
+        def #{name}(*args, &block)
+          @func_map['#{name}'].call(*args,&block)
+        end
+      EOS
+      module_function(name)
+      func
+    end
+  end
+  private_constant :FiddlePatch
+end

data/lib/libui/libui_base.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module LibUI
+  module LibUIBase
+    FFI.func_map.each_key do |original_method_name|
+      name = Utils.convert_to_ruby_method(original_method_name)
+      func = FFI.func_map[original_method_name]
+
+      define_method(name) do |*args, &blk|
+        # Assume that block is the last argument.
+        args << blk if blk
+
+        # The proc object is converted to a Closure::BlockCaller object.
+        args.map!.with_index do |arg, idx|
+          if arg.is_a?(Proc)
+            # The types of the function arguments are recorded beforehand.
+            # See the monkey patch in ffi.rb.
+            callback = Fiddle::Closure::BlockCaller.new(
+              *func.callback_argument_types[idx][1..2], &arg
+            )
+            # Protect from GC
+            # See https://github.com/kojix2/LibUI/issues/8
+            receiver = args[0]
+            if receiver.instance_variable_defined?(:@callbacks)
+              receiver.instance_variable_get(:@callbacks) << callback
+            else
+              receiver.instance_variable_set(:@callbacks, [callback])
+            end
+            callback
+          else
+            arg
+          end
+        end
+
+        # Make it possible to omit the last nil. This may be an over-optimization.
+        siz = func.argument_types.size - 1
+        args[siz] = nil if args.size == siz
+
+        FFI.public_send(original_method_name, *args)
+      end
+    end
+  end
+
+  private_constant :LibUIBase
+end

data/lib/libui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LibUI
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/libui.rb

@@ -10,7 +10,7 @@ module LibUI
     attr_accessor :ffi_lib
   end
 
-  lib_name = "libui.#{RbConfig::CONFIG["SOEXT"]}"
+  lib_name = "libui.#{RbConfig::CONFIG['SOEXT']}"
 
   self.ffi_lib = if ENV['LIBUIDIR'] && !ENV['LIBUIDIR'].empty?
                    File.expand_path(lib_name, ENV['LIBUIDIR'])
@@ -19,56 +19,17 @@ module LibUI
                  end
 
   require_relative 'libui/ffi'
+  require_relative 'libui/libui_base'
 
-  class << self
-    FFI.func_map.each_key do |original_method_name|
-      name = Utils.convert_to_ruby_method(original_method_name)
-      func = FFI.func_map[original_method_name]
-
-      define_method(name) do |*args, &blk|
-        # Assume that block is the last argument.
-        args << blk if blk
-
-        # The proc object is converted to a Closure::BlockCaller object.
-        args.map!.with_index do |arg, idx|
-          if arg.is_a?(Proc)
-            # The types of the function arguments are recorded beforehand.
-            # See the monkey patch in ffi.rb.
-            callback = Fiddle::Closure::BlockCaller.new(
-              *func.callback_argument_types[idx][1..2], &arg
-            )
-            # Protect from GC
-            # See https://github.com/kojix2/LibUI/issues/8
-            receiver = args[0]
-            if receiver.instance_variable_defined?(:@callbacks)
-              receiver.instance_variable_get(:@callbacks) << callback
-            else
-              receiver.instance_variable_set(:@callbacks, [callback])
-            end
-            callback
-          else
-            arg
-          end
-        end
-
-        # Make it possible to omit the last nil. This may be an over-optimization.
-        siz = func.argument_types.size - 1
-        args[siz] = nil if args.size == siz
+  extend LibUIBase
 
-        FFI.public_send(original_method_name, *args)
-      end
-    end
-
-    module CustomMethods
-      def init(opt = FFI::InitOptions.malloc)
-        i = super(opt)
-        return if i.size.zero?
+  class << self
+    def init(opt = FFI::InitOptions.malloc)
+      i = super(opt)
+      return if i.size.zero?
 
-        warn 'error'
-        warn UI.free_init_error(init)
-      end
+      warn 'error'
+      warn UI.free_init_error(init)
     end
-
-    prepend CustomMethods
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libui
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,8 @@ files:
 - README.md
 - lib/libui.rb
 - lib/libui/ffi.rb
+- lib/libui/fiddle_patch.rb
+- lib/libui/libui_base.rb
 - lib/libui/utils.rb
 - lib/libui/version.rb
 - vendor/LICENSE