ffi-module 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26ebad3ab2aa8d49e96497e1cc62cfeffb418f7c503f86ae9052e959f7bb3fac
-  data.tar.gz: 7f0a0a60df7d7e46f1bb92d937d7d2299f20d9c7232e4ca516736f5e87143430
+  metadata.gz: ca3d8712f429164d44b3b16b650bfa3f9184e4fb266c2da5ffe47588d4670679
+  data.tar.gz: 27ef2aa8e1fe00c763fd3e01e82ddce0d879705c19bb35a29bfca56214d07ac6
 SHA512:
-  metadata.gz: 134c1f391e7de50471c40f99cca103154375673a1c2f8ac4f345d6e2a23a68e1aaf84320dbb5e75467a2c7735023560aa4a599bc1db716511c0bc4b469506839
-  data.tar.gz: 25408e747cee8c74b36fde7a4ec21533b057e683cad95ea9fdf2329a5b981d5d6ad4565ca20ffc6aa19faddf062937a9eab86d348297c08a454c108c044ca11d
+  metadata.gz: 28f5d178cd0d7278cb7de726c12a948c94f7e83e86aaf8672e8f0d60d00da4fc5435a6e709e169bc8db2469b3377c68e2607da8e04a14a5273435c0220ba4aa3
+  data.tar.gz: 6c272955bfabb1d1f929a09908e5a33a67688d97a83f9364c3bf590313d84ffc7269d5ce0d3ee489069517d76f6ef9a5370ca6e7c925ec7478eacc3701a70602

data/lib/ffi/module/library.rb

@@ -41,6 +41,7 @@ module FFI
 				
 				return true
 			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

data/lib/ffi/module/version.rb

@@ -31,6 +31,6 @@ end
 
 module FFI
 	module Module
-		VERSION = "0.1.3"
+		VERSION = "0.2.0"
 	end
 end

metadata

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