ffi-module 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0966d9341e590e8623b6e5f8b46672e1258e64d76c4b5a623fed1153d982ca97'
-  data.tar.gz: 7c0d82c153c368cce300aa8e2e4cf45f1f2135707974d4a3da0c1f0ff6bb7aea
+  metadata.gz: 1b8ee4221b08ecf01f4453a41392cb0582382f5b8d377ec5a8125605ab4760e8
+  data.tar.gz: 4fee30465f129049c8fdd53d231d4a2baff1acacf31d2946eaa302b0551b024f
 SHA512:
-  metadata.gz: cfc6f8d0f8d137fed89851a1b94a456b11641dc60289c80fe2122ae8b4dff21ac8144cdd1b92da35a4de9a5e8cd5990ab75c1856f70a0af34257b06f0eff322c
-  data.tar.gz: d4306604e74a7f8211d4acfa6c2eef9e7e53ae45c9807d8a0b1e2313959a82546664708633bf108f1fc98a52eece56bf6a253d67de6e1fb46335f05066a86b4d
+  metadata.gz: fbca3d3dc2cb769015c260a205da7dd3e4fbd2ef8decc7cf79ff23ed6f86ac81a34411dc95a67a1578d87318a9a639a940e2fd94701be4f7a2458faa6f2b905d
+  data.tar.gz: 9b2871ac1451939a2b332af2f60cc1885b56b0daa688e882508b16007e88a1069aa5e95b67758ac55c07ba6e0ee2c0cc76788b777998c4405a8a32d9430c22cf

data/lib/ffi/module/config_tool.rb

@@ -51,10 +51,16 @@ module FFI
 					end
 				end
 				
+				result = false
+				
 				# Load all specified libraries:
 				names.each do |name|
-					ffi_load(name, search_paths: search_paths, **options)
+					result = ffi_load(name, search_paths: search_paths, **options) || result
 				end
+				
+				return result
+			rescue Errno::ENOENT
+				return nil
 			end
 		end
 	end

data/lib/ffi/module/library.rb

@@ -40,7 +40,8 @@ module FFI
 				@ffi_libraries << DynamicLibrary.open(name, flags)
 				
 				return true
-			rescue LoadError
+			rescue LoadError, RuntimeError
+				# TruffleRuby raises a RuntimeError if the library can't be found.
 				return nil
 			end
 			
@@ -52,7 +53,7 @@ module FFI
 				return @ffi_calling_convention
 			end
 			
-			def ffi_attach_function(name, cname, argument_types, return_type = :void, **options)
+			def ffi_attach_function(name, argument_types, return_type = :void, as: name, **options)
 				argument_types = argument_types.map{|type| self.ffi_find_type(type)}
 				return_type = self.ffi_find_type(return_type)
 				
@@ -65,7 +66,7 @@ module FFI
 				@ffi_libraries.each do |library|
 					function = nil
 					
-					ffi_function_names(cname, argument_types).each do |function_name|
+					ffi_function_names(name, argument_types).each do |function_name|
 						break if function = library.find_function(function_name.to_s)
 					end
 					
@@ -81,29 +82,29 @@ module FFI
 				end
 				
 				if invoker
-					invoker.attach(self, name.to_s)
+					invoker.attach(self, as.to_s)
 					return true
 				else
-					raise FFI::NotFoundError.new(cname, @ffi_libraries)
+					raise FFI::NotFoundError.new(name, @ffi_libraries)
 				end
 			end
 			
-			def ffi_attach_variable(name, cname, type)
+			def ffi_attach_variable(name, type, as: name)
 				address = @ffi_libraries.find do |library|
 					begin
-						library.find_variable(cname)
+						library.find_variable(name)
 					rescue LoadError
 					end
 				end
 				
 				if address.nil? || address.null?
-					raise FFI::NotFoundError.new(cname, @ffi_libraries)
+					raise FFI::NotFoundError.new(name, @ffi_libraries)
 				end
 				
 				if type.is_a?(Class) && type < FFI::Struct
 					variable = type.new(address)
 					
-					self.define_singleton_method(name) do
+					self.define_singleton_method(as) do
 						variable
 					end
 				else
@@ -111,11 +112,11 @@ module FFI
 					container_type.layout :value, self.ffi_find_type(type)
 					container = container_type.new(address)
 					
-					self.define_singleton_method(name) do
+					self.define_singleton_method(as) do
 						container[:value]
 					end
 					
-					self.define_singleton_method(:"#{name}=") do |value|
+					self.define_singleton_method(:"#{as}=") do |value|
 						container[:value] = value
 					end
 				end
@@ -172,6 +173,29 @@ module FFI
 				ffi_define_generic_enumeration(name, FFI::Bitmask, native_type, *arguments)
 			end
 			
+			def ffi_find_type(argument)
+				if argument.kind_of?(Type)
+					return argument
+				end
+				
+				if type = @ffi_type_map[argument]
+					return type
+				end
+				
+				if argument.is_a?(Class) && argument < Struct
+					return Type::POINTER
+				end
+				
+				if argument.is_a?(DataConverter)
+					# Cache the mapped type:
+					return ffi_define_type(argument, Type::Mapped.new(argument))
+				end
+				
+				if argument
+					return FFI.find_type(argument)
+				end
+			end
+			
 		private
 			
 			def ffi_define_generic_enumeration(name, klass, native_type, values)
@@ -213,29 +237,6 @@ module FFI
 				
 				return result
 			end
-			
-			def ffi_find_type(argument)
-				if argument.kind_of?(Type)
-					return argument
-				end
-				
-				if type = @ffi_type_map[argument]
-					return type
-				end
-				
-				if argument.is_a?(Class) && argument < Struct
-					return Type::POINTER
-				end
-				
-				if argument.is_a?(DataConverter)
-					# Cache the mapped type:
-					return ffi_define_type(argument, Type::Mapped.new(argument))
-				end
-				
-				if argument
-					return FFI.find_type(argument)
-				end
-			end
 		end
 	end
 end

data/lib/ffi/module/loader.rb

@@ -51,6 +51,10 @@ module FFI
 				
 				return nil
 			end
+			
+			def ffi_load_failure(message)
+				raise LoadError, message
+			end
 		end
 	end
 end

data/lib/ffi/module/version.rb

@@ -31,6 +31,6 @@ end
 
 module FFI
 	module Module
-		VERSION = "0.1.1"
+		VERSION = "0.3.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-module
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams