ffi 1.16.3 → 1.17.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5920bab18c2bfca946febdf9d31aae894569dd1a293d816631a077696f7db8fa
-  data.tar.gz: 7aa17dd90399d15bd149573ab4b9857907028beae4f84409f76f50e9508aaba2
+  metadata.gz: 339482a2db268d08ac79e7205fb1dd77b83f06c6a69f698cd35eed5e4063e899
+  data.tar.gz: 022aa0d53823dc33bf77698efac9f057c9ad5987819fd1c2ad3b2f90ad3f7be6
 SHA512:
-  metadata.gz: dd42730736988cac47f45485f4a8b200c26759066fe156a89ef7736cd6ac80f404e8aaced28a8f10f9b22b43436ed3e248cb191f1c457ccabc19299b91b49174
-  data.tar.gz: '0252969e7a324d530c1d704e2d408f1bd7283f320de90b4c98f20bb49f9d32733ac45609d78a40f821cd5335e102e80576fd446cd5de863babea041d0eb3c780'
+  metadata.gz: 68f15f9afd458da3fb4aa52debe5418a6732184f27d40ca3c85ada225f0192b7b6a7db3b631896d57933c8d9ac2d272254798a9c72db1c958076d444a36cb726
+  data.tar.gz: 7a9181876be8f2c46317f0c00f801fe1748d8e4716df99adf9d8d864146c6d49d6b40ae6b64bb2a33709956df6128d4254eaadaeff61547416f11e6a83b4c34c

data/CHANGELOG.md

@@ -1,3 +1,45 @@
+1.17.0 / 2024-06-02
+-------------------
+
+Fixed:
+* Add FFI::AbstractMemory#read_array_of_string . It was defined but not exposed to Ruby nor tested. #1070
+
+
+1.17.0.rc2 / 2024-04-22
+-------------------
+
+Fixed:
+* Add missing write barriers to StructLayout#initialize causing a segfault with GC.stress. #1079
+
+
+1.17.0.rc1 / 2024-04-08
+-------------------
+
+Fixed:
+* Fix type definitions on `aarch64-linux`. #1067, #1066
+* Use RB_TEST for `Pointer.autorelease=` . #1065
+  So that `false` and `nil` are treated as falsey and anything else as truthy.
+* Replace Fixnum by Integer. #1064
+  Fixnum is no longer present in the ruby language.
+* Update `FFI::NativeType` doc. #1061
+* Store FFI::Type::Mapped of FFI::StrPtrConverter in global instead of custom type map
+* Various documentation fixes. #1042
+* Update `FFI::Pointer#==` to return `false` if a pointer is compared to a non-pointer object, which is the expected behavior. #1083
+* Avoid warning about undefined wariable `@ffi_functions` #1085
+* Fix a very unlikely GC bug when using a callback block. # 1089
+
+Added:
+* Provide binary gems for many platforms. #990
+* Add Windows fat binary gem for Ruby-3.3
+* Add RBS type definitions for many user facing parts of the FFI API. #1042
+* Improve fallback search path logic. #1088
+  Respect LD_LIBRARY_PATH and DYLD_LIBRARY_PATH on Macos.
+* Update libffi to current git master branch.
+
+Removed:
+* Remove `enum CHAR_ARRAY` which is no longer used. #1063
+
+
 1.16.3 / 2023-10-04
 -------------------
 

data/Gemfile

@@ -1,14 +1,21 @@
 source 'https://rubygems.org'
 
 group :development do
+  gem 'bigdecimal' # necessary on ruby-3.3+
+  gem 'bundler', '>= 1.16', '< 3'
   gem 'rake', '~> 13.0'
   gem 'rake-compiler', '~> 1.1'
-  gem 'rake-compiler-dock', '~> 1.0'
+  gem 'rake-compiler-dock', '~> 1.0.pre'
   gem 'rspec', '~> 3.0'
-  gem 'bundler', '>= 1.16', '< 3'
 end
 
 group :doc do
   gem 'kramdown'
   gem 'yard', '~> 0.9'
 end
+
+group :type_check do
+  if RUBY_VERSION >= "2.6" && %w[ ruby truffleruby ].include?(RUBY_ENGINE)
+    gem 'rbs', '~> 3.0'
+  end
+end

data/README.md

@@ -114,7 +114,7 @@ The following people have submitted code, bug reports, or otherwise contributed
 * Jurij Smakov <jurij@wooyd.org>
 * KISHIMOTO, Makoto <ksmakoto@dd.iij4u.or.jp>
 * Kim Burgestrand <kim@burgestrand.se>
-* Lars Kanis <kanis@comcard.de>
+* Lars Kanis <lars@greiz-reinsdorf.de>
 * Luc Heinrich <luc@honk-honk.com>
 * Luis Lavena <luislavena@gmail.com>
 * Matijs van Zuijlen <matijs@matijs.net>

data/Rakefile

@@ -13,7 +13,7 @@ BUILD_EXT_DIR = File.join(BUILD_DIR, "#{RbConfig::CONFIG['arch']}", 'ffi_c', RUB
 
 gem_spec = Bundler.load_gemspec('ffi.gemspec')
 
-RSpec::Core::RakeTask.new(:spec => :compile) do |config|
+RSpec::Core::RakeTask.new(:spec) do |config|
   config.rspec_opts = YAML.load_file 'spec/spec.opts'
 end
 
@@ -84,10 +84,22 @@ end
 task 'gem:java' => 'java:gem'
 
 FfiGemHelper.install_tasks
-# Register windows gems to be pushed to rubygems.org
-Bundler::GemHelper.instance.cross_platforms = %w[x86-mingw32 x64-mingw-ucrt x64-mingw32]
-# These platforms are not yet enabled, since there are issues on musl-based distors (alpine-linux):
-# + %w[x86-linux x86_64-linux arm-linux aarch64-linux x86_64-darwin arm64-darwin]
+# Register binary gems to be pushed to rubygems.org
+Bundler::GemHelper.instance.cross_platforms = %w[
+  x86-mingw32
+  x64-mingw-ucrt
+  x64-mingw32
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-linux-gnu
+  x86_64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  x86_64-darwin
+  arm64-darwin
+]
 
 if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   require 'rake/extensiontask'

data/lib/ffi/autopointer.rb

@@ -45,14 +45,6 @@ module FFI
     #   @note WARNING: passing a proc _may_ cause your pointer to never be
     #     GC'd, unless you're careful to avoid trapping a reference to the
     #     pointer in the proc. See the test specs for examples.
-    # @overload initialize(pointer) { |p| ... }
-    #   @param pointer [Pointer]
-    #   @yieldparam [Pointer] p +pointer+ passed to the block
-    #   @return [self]
-    #   The passed block will be invoked at GC time.
-    #   @note
-    #     WARNING: passing a block will cause your pointer to never be GC'd.
-    #     This is bad.
     # @overload initialize(pointer)
     #   @param pointer [Pointer]
     #   @return [self]
@@ -75,7 +67,7 @@ module FFI
     #  The last calling idiom (only one parameter) is generally only
     #  going to be useful if you subclass {AutoPointer}, and override
     #  #release, which by default does nothing.
-    def initialize(ptr, proc=nil, &block)
+    def initialize(ptr, proc=nil)
       raise TypeError, "Invalid pointer" if ptr.nil? || !ptr.kind_of?(Pointer) ||
           ptr.kind_of?(MemoryPointer) || ptr.kind_of?(AutoPointer)
       super(ptr.type_size, ptr)

data/lib/ffi/dynamic_library.rb

@@ -30,12 +30,41 @@
 
 module FFI
   class DynamicLibrary
-    SEARCH_PATH = %w[/usr/lib /usr/local/lib /opt/local/lib]
-    if FFI::Platform::ARCH == 'aarch64' && FFI::Platform.mac?
-      SEARCH_PATH << '/opt/homebrew/lib'
+    SEARCH_PATH = []
+
+    # The following search paths are tried, if the library could not be loaded in the first attempt.
+    # They are only executed on Macos in the following order:
+    if FFI::Platform.mac?
+
+      # 1. Try library paths possibly defined in LD_LIBRARY_PATH DYLD_LIBRARY_PATH first.
+      # This is because dlopen doesn't respect LD_LIBRARY_PATH and DYLD_LIBRARY_PATH is deleted by SIP-protected binaries.
+      # See here for details: https://github.com/ffi/ffi/issues/923#issuecomment-1872565313
+      %w[LD_LIBRARY_PATH DYLD_LIBRARY_PATH].each do |custom_path|
+        SEARCH_PATH.concat ENV.fetch(custom_path,"").split(File::PATH_SEPARATOR)
+      end
+
+      # 2. Then on macos/arm64 try /opt/homebrew/lib, since this is a typical standard directory.
+      # FFI is often used together with homebrew, so that we hardcode the path for arm64 here.
+      if FFI::Platform::ARCH == 'aarch64'
+        SEARCH_PATH << '/opt/homebrew/lib'
+      end
+
+      # 3. Then try typical system directories starting with the /local/ directory first.
+      #
+      # /usr/local/lib is used by homebrow on x86_64.
+      # /opt/local/lib is used by MacPorts and Fink.
+      # /usr/lib is there, because it was always there.
+      SEARCH_PATH.concat %w[/opt/local/lib /usr/local/lib /usr/lib]
     end
 
-    SEARCH_PATH_MESSAGE = "Searched in <system library path>, #{SEARCH_PATH.join(', ')}".freeze
+    # On Linux the library lookup paths are usually defined through /etc/ld.so.conf, which can be changed at will with root permissions.
+    # Also LD_LIBRARY_PATH is respected by the dynamic loader, so that there's usually no need and no advantage to do a fallback handling.
+    #
+    # Windows has it's own library lookup logic, very different to what we do here.
+    # See: https://github.com/oneclick/rubyinstaller2/wiki/For-gem-developers#user-content-dll-loading
+
+    FFI.make_shareable(SEARCH_PATH)
+    SEARCH_PATH_MESSAGE = "Searched in <system library path>#{ SEARCH_PATH.map{|a| ', ' + a}.join }".freeze
 
     def self.load_library(name, flags)
       if name == FFI::CURRENT_PROCESS
@@ -51,7 +80,7 @@ module FFI
           lib = try_load(libname, flags, errors)
           return lib if lib
 
-          unless libname.start_with?("/") || FFI::Platform.windows?
+          unless libname.start_with?("/")
             SEARCH_PATH.each do |prefix|
               path = "#{prefix}/#{libname}"
               if File.exist?(path)

data/lib/ffi/enum.rb

@@ -35,7 +35,6 @@ module FFI
   # An instance of this class permits to manage {Enum}s. In fact, Enums is a collection of {Enum}s.
   class Enums
 
-    # @return [nil]
     def initialize
       @all_enums = Array.new
       @tagged_enums = Hash.new

data/lib/ffi/function.rb

@@ -55,7 +55,7 @@ module FFI
     # On CRuby it also ensures that it does not get garbage collected.
     module RegisterAttach
       def attach(mod, name)
-        funcs = mod.instance_variable_get("@ffi_functions")
+        funcs = mod.instance_variable_defined?("@ffi_functions") && mod.instance_variable_get("@ffi_functions")
         unless funcs
           funcs = {}
           mod.instance_variable_set("@ffi_functions", funcs)

data/lib/ffi/io.rb

@@ -42,9 +42,9 @@ module FFI
 
     # @param [#read] io io to read from
     # @param [AbstractMemory] buf destination for data read from +io+
-    # @param [nil, Numeric] len maximul number of bytes to read from +io+. If +nil+,
+    # @param [nil, Integer] len maximul number of bytes to read from +io+. If +nil+,
     #  read until end of file.
-    # @return [Numeric] length really read, in bytes
+    # @return [Integer] length really read, in bytes
     #
     # A version of IO#read that reads data from an IO and put then into a native buffer.
     #

data/lib/ffi/library.rb

@@ -135,7 +135,7 @@ module FFI
     #   ffi_lib_flags(:lazy, :local) # => 5
     #
     # @param [Symbol, …] flags (see {FlagsMap})
-    # @return [Fixnum] the new value
+    # @return [Integer] the new value
     def ffi_lib_flags(*flags)
       @ffi_lib_flags = flags.inject(0) { |result, f| result | FlagsMap[f] }
     end
@@ -395,6 +395,26 @@ module FFI
       end
     end
 
+    # @param [DataConverter, Type, Struct, Symbol] t type to find
+    # @return [Type]
+    # Find a type definition.
+    def find_type(t)
+      if t.kind_of?(Type)
+        t
+
+      elsif defined?(@ffi_typedefs) && @ffi_typedefs.has_key?(t)
+        @ffi_typedefs[t]
+
+      elsif t.is_a?(Class) && t < Struct
+        Type::POINTER
+
+      elsif t.is_a?(DataConverter)
+        # Add a typedef so next time the converter is used, it hits the cache
+        typedef Type::Mapped.new(t), t
+
+      end || FFI.find_type(t)
+    end
+
     private
     # Generic enum builder
     #  @param [Class] klass can be one of FFI::Enum or FFI::Bitmask
@@ -515,26 +535,6 @@ module FFI
       @ffi_enums.__map_symbol(symbol)
     end
 
-    # @param [DataConverter, Type, Struct, Symbol] t type to find
-    # @return [Type]
-    # Find a type definition.
-    def find_type(t)
-      if t.kind_of?(Type)
-        t
-
-      elsif defined?(@ffi_typedefs) && @ffi_typedefs.has_key?(t)
-        @ffi_typedefs[t]
-
-      elsif t.is_a?(Class) && t < Struct
-        Type::POINTER
-
-      elsif t.is_a?(DataConverter)
-        # Add a typedef so next time the converter is used, it hits the cache
-        typedef Type::Mapped.new(t), t
-
-      end || FFI.find_type(t)
-    end
-
     # Retrieve all attached functions and their function signature
     #
     # This method returns a Hash of method names of attached functions connected by #attach_function and the corresponding function type.
@@ -552,10 +552,10 @@ module FFI
     # @return [Hash< Symbol => ffi_type >]
     def attached_variables
       (
-        (@ffi_gsvars || {}).map do |name, gvar|
+        (defined?(@ffi_gsvars) ? @ffi_gsvars : {}).map do |name, gvar|
           [name, gvar.class]
         end +
-        (@ffi_gvars || {}).map do |name, gvar|
+        (defined?(@ffi_gvars) ? @ffi_gvars : {}).map do |name, gvar|
           [name, gvar.layout[:gvar].type]
         end
       ).to_h

data/lib/ffi/platform/aarch64-linux/types.conf

@@ -1,5 +1,4 @@
 rbx.platform.typedef.*__caddr_t = char
-rbx.platform.typedef.*__qaddr_t = long
 rbx.platform.typedef.__blkcnt64_t = long
 rbx.platform.typedef.__blkcnt_t = long
 rbx.platform.typedef.__blksize_t = int
@@ -21,7 +20,43 @@ rbx.platform.typedef.__int16_t = short
 rbx.platform.typedef.__int32_t = int
 rbx.platform.typedef.__int64_t = long
 rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__int_least16_t = short
+rbx.platform.typedef.__int_least32_t = int
+rbx.platform.typedef.__int_least64_t = long
+rbx.platform.typedef.__int_least8_t = char
+rbx.platform.typedef.__intmax_t = long
 rbx.platform.typedef.__intptr_t = long
+rbx.platform.typedef.__kernel_caddr_t = string
+rbx.platform.typedef.__kernel_clock_t = long
+rbx.platform.typedef.__kernel_clockid_t = int
+rbx.platform.typedef.__kernel_daddr_t = int
+rbx.platform.typedef.__kernel_gid16_t = ushort
+rbx.platform.typedef.__kernel_gid32_t = uint
+rbx.platform.typedef.__kernel_gid_t = uint
+rbx.platform.typedef.__kernel_ino_t = ulong
+rbx.platform.typedef.__kernel_ipc_pid_t = int
+rbx.platform.typedef.__kernel_key_t = int
+rbx.platform.typedef.__kernel_loff_t = long_long
+rbx.platform.typedef.__kernel_long_t = long
+rbx.platform.typedef.__kernel_mode_t = uint
+rbx.platform.typedef.__kernel_mqd_t = int
+rbx.platform.typedef.__kernel_off_t = long
+rbx.platform.typedef.__kernel_old_dev_t = uint
+rbx.platform.typedef.__kernel_old_gid_t = ushort
+rbx.platform.typedef.__kernel_old_time_t = long
+rbx.platform.typedef.__kernel_old_uid_t = ushort
+rbx.platform.typedef.__kernel_pid_t = int
+rbx.platform.typedef.__kernel_ptrdiff_t = long
+rbx.platform.typedef.__kernel_size_t = ulong
+rbx.platform.typedef.__kernel_ssize_t = long
+rbx.platform.typedef.__kernel_suseconds_t = long
+rbx.platform.typedef.__kernel_time64_t = long_long
+rbx.platform.typedef.__kernel_time_t = long
+rbx.platform.typedef.__kernel_timer_t = int
+rbx.platform.typedef.__kernel_uid16_t = ushort
+rbx.platform.typedef.__kernel_uid32_t = uint
+rbx.platform.typedef.__kernel_uid_t = uint
+rbx.platform.typedef.__kernel_ulong_t = ulong
 rbx.platform.typedef.__key_t = int
 rbx.platform.typedef.__loff_t = long
 rbx.platform.typedef.__mode_t = uint
@@ -38,11 +73,14 @@ rbx.platform.typedef.__rusage_who_t = int
 rbx.platform.typedef.__sig_atomic_t = int
 rbx.platform.typedef.__socklen_t = uint
 rbx.platform.typedef.__ssize_t = long
+rbx.platform.typedef.__suseconds64_t = long
 rbx.platform.typedef.__suseconds_t = long
 rbx.platform.typedef.__syscall_slong_t = long
 rbx.platform.typedef.__syscall_ulong_t = ulong
+rbx.platform.typedef.__thrd_t = ulong
 rbx.platform.typedef.__time_t = long
 rbx.platform.typedef.__timer_t = pointer
+rbx.platform.typedef.__tss_t = uint
 rbx.platform.typedef.__u_char = uchar
 rbx.platform.typedef.__u_int = uint
 rbx.platform.typedef.__u_long = ulong
@@ -53,6 +91,11 @@ rbx.platform.typedef.__uint16_t = ushort
 rbx.platform.typedef.__uint32_t = uint
 rbx.platform.typedef.__uint64_t = ulong
 rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__uint_least16_t = ushort
+rbx.platform.typedef.__uint_least32_t = uint
+rbx.platform.typedef.__uint_least64_t = ulong
+rbx.platform.typedef.__uint_least8_t = uchar
+rbx.platform.typedef.__uintmax_t = ulong
 rbx.platform.typedef.__useconds_t = uint
 rbx.platform.typedef.blkcnt_t = long
 rbx.platform.typedef.blksize_t = int
@@ -65,11 +108,23 @@ rbx.platform.typedef.fsblkcnt_t = ulong
 rbx.platform.typedef.fsfilcnt_t = ulong
 rbx.platform.typedef.gid_t = uint
 rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.in_addr_t = uint
+rbx.platform.typedef.in_port_t = ushort
 rbx.platform.typedef.ino_t = ulong
 rbx.platform.typedef.int16_t = short
 rbx.platform.typedef.int32_t = int
-rbx.platform.typedef.int64_t = long_long
+rbx.platform.typedef.int64_t = long
 rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int_fast16_t = long
+rbx.platform.typedef.int_fast32_t = long
+rbx.platform.typedef.int_fast64_t = long
+rbx.platform.typedef.int_fast8_t = char
+rbx.platform.typedef.int_least16_t = short
+rbx.platform.typedef.int_least32_t = int
+rbx.platform.typedef.int_least64_t = long
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.intmax_t = long
+rbx.platform.typedef.intptr_t = long
 rbx.platform.typedef.key_t = int
 rbx.platform.typedef.loff_t = long
 rbx.platform.typedef.mode_t = uint
@@ -79,6 +134,7 @@ rbx.platform.typedef.pid_t = int
 rbx.platform.typedef.pthread_key_t = uint
 rbx.platform.typedef.pthread_once_t = int
 rbx.platform.typedef.pthread_t = ulong
+rbx.platform.typedef.ptrdiff_t = long
 rbx.platform.typedef.quad_t = long
 rbx.platform.typedef.register_t = long
 rbx.platform.typedef.rlim_t = ulong
@@ -93,12 +149,27 @@ rbx.platform.typedef.u_char = uchar
 rbx.platform.typedef.u_int = uint
 rbx.platform.typedef.u_int16_t = ushort
 rbx.platform.typedef.u_int32_t = uint
-rbx.platform.typedef.u_int64_t = ulong_long
+rbx.platform.typedef.u_int64_t = ulong
 rbx.platform.typedef.u_int8_t = uchar
 rbx.platform.typedef.u_long = ulong
 rbx.platform.typedef.u_quad_t = ulong
 rbx.platform.typedef.u_short = ushort
 rbx.platform.typedef.uid_t = uint
 rbx.platform.typedef.uint = uint
+rbx.platform.typedef.uint16_t = ushort
+rbx.platform.typedef.uint32_t = uint
+rbx.platform.typedef.uint64_t = ulong
+rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.uint_fast16_t = ulong
+rbx.platform.typedef.uint_fast32_t = ulong
+rbx.platform.typedef.uint_fast64_t = ulong
+rbx.platform.typedef.uint_fast8_t = uchar
+rbx.platform.typedef.uint_least16_t = ushort
+rbx.platform.typedef.uint_least32_t = uint
+rbx.platform.typedef.uint_least64_t = ulong
+rbx.platform.typedef.uint_least8_t = uchar
+rbx.platform.typedef.uintmax_t = ulong
+rbx.platform.typedef.uintptr_t = ulong
 rbx.platform.typedef.ulong = ulong
 rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.wchar_t = uint

data/lib/ffi/pointer.rb

@@ -45,12 +45,12 @@ module FFI
     SIZE = Platform::ADDRESS_SIZE / 8 unless const_defined?(:SIZE)
 
     # Return the size of a pointer on the current platform, in bytes
-    # @return [Numeric]
+    # @return [Integer]
     def self.size
       SIZE
     end unless respond_to?(:size)
 
-    # @param [nil,Numeric] len length of string to return
+    # @param [nil,Integer] len length of string to return
     # @return [String]
     # Read pointer's contents as a string, or the first +len+ bytes of the
     # equivalent string if +len+ is not +nil+.
@@ -63,7 +63,7 @@ module FFI
       end
     end unless method_defined?(:read_string)
 
-    # @param [Numeric] len length of string to return
+    # @param [Integer] len length of string to return
     # @return [String]
     # Read the first +len+ bytes of pointer's contents as a string.
     #
@@ -83,7 +83,7 @@ module FFI
     end unless method_defined?(:read_string_to_null)
 
     # @param [String] str string to write
-    # @param [Numeric] len length of string to return
+    # @param [Integer] len length of string to return
     # @return [self]
     # Write +len+ first bytes of +str+ in pointer's contents.
     #
@@ -94,7 +94,7 @@ module FFI
     end unless method_defined?(:write_string_length)
 
     # @param [String] str string to write
-    # @param [Numeric] len length of string to return
+    # @param [Integer] len length of string to return
     # @return [self]
     # Write +str+ in pointer's contents, or first +len+ bytes if
     # +len+ is not +nil+.
@@ -106,7 +106,7 @@ module FFI
 
     # @param [Type] type type of data to read from pointer's contents
     # @param [Symbol] reader method to send to +self+ to read +type+
-    # @param [Numeric] length
+    # @param [Integer] length
     # @return [Array]
     # Read an array of +type+ of length +length+.
     # @example

data/lib/ffi/struct.rb

@@ -41,12 +41,12 @@ module FFI
   class Struct
 
     # Get struct size
-    # @return [Numeric]
+    # @return [Integer]
     def size
       self.class.size
     end
 
-    # @return [Fixnum] Struct alignment
+    # @return [Integer] Struct alignment
     def alignment
       self.class.alignment
     end
@@ -87,13 +87,13 @@ module FFI
     end
 
     # Get struct size
-    # @return [Numeric]
+    # @return [Integer]
     def self.size
       defined?(@layout) ? @layout.size : defined?(@size) ? @size : 0
     end
 
     # set struct size
-    # @param [Numeric] size
+    # @param [Integer] size
     # @return [size]
     def self.size=(size)
       raise ArgumentError, "Size already set" if defined?(@size) || defined?(@layout)

data/lib/ffi/struct_layout.rb

@@ -35,13 +35,13 @@ module FFI
 
   class StructLayout
 
-    # @return [Array<Array(Symbol, Numeric)>
+    # @return [Array<Array(Symbol, Integer)>
     # Get an array of tuples (field name, offset of the field).
     def offsets
       members.map { |m| [ m, self[m].offset ] }
     end
 
-    # @return [Numeric]
+    # @return [Integer]
     # Get the offset of a field.
     def offset_of(field_name)
       self[field_name].offset

data/lib/ffi/struct_layout_builder.rb

@@ -46,13 +46,13 @@ module FFI
     end
 
     # Set size attribute with +size+ only if +size+ is greater than attribute value.
-    # @param [Numeric] size
+    # @param [Integer] size
     def size=(size)
       @size = size if size > @size
     end
 
     # Set alignment attribute with +align+ only if it is greater than attribute value.
-    # @param [Numeric] align
+    # @param [Integer] align
     def alignment=(align)
       @alignment = align if align > @alignment
       @min_alignment = align
@@ -78,7 +78,7 @@ module FFI
     # @overload packed=(packed) Set alignment and packed attributes to
     #   +packed+.
     #
-    #   @param [Fixnum] packed
+    #   @param [Integer] packed
     #
     #   @return [packed]
     # @overload packed=(packed) Set packed attribute.
@@ -116,7 +116,7 @@ module FFI
 
     # @param [String, Symbol] name name of the field
     # @param [Array, DataConverter, Struct, StructLayout::Field, Symbol, Type] type type of the field
-    # @param [Numeric, nil] offset
+    # @param [Integer, nil] offset
     # @return [self]
     # Add a field to the builder.
     # @note Setting +offset+ to +nil+ or +-1+ is equivalent to +0+.
@@ -154,7 +154,7 @@ module FFI
 
     # @param name (see #add)
     # @param type (see #add)
-    # @param [Numeric] count array length
+    # @param [Integer] count array length
     # @param offset (see #add)
     # @return (see #add)
     # Add an array as a field to the builder.
@@ -175,9 +175,9 @@ module FFI
 
     private
 
-    # @param [Numeric] offset
-    # @param [Numeric] align
-    # @return [Numeric]
+    # @param [Integer] offset
+    # @param [Integer] align
+    # @return [Integer]
     def align(offset, align)
       align + ((offset - 1) & ~(align - 1));
     end