* ext/fiddle/function.c (Fiddle::Function.new): new keyword argument :name to set the name attribute.

* ext/fiddle/lib/fiddle/import.rb (import_function, bind_function): set function name by using the :name keyword argument.
  Re-fixes r38243. [ruby-core:50566]
* test/fiddle/test_function.rb (test_name): test for the :name keyword argument and Fiddle::Function#name.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 6 deletions

diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb
index faf7cb3d23..75853d6def 100644
--- a/ext/fiddle/lib/fiddle/import.rb
+++ b/ext/fiddle/lib/fiddle/import.rb
@@ -290,9 +290,8 @@ module Fiddle
       if( !addr )
         raise(DLError, "cannot find the function: #{name}()")
       end
-      f = Function.new(addr, argtype, ctype, CALL_TYPE_TO_ABI[call_type])
-      f.instance_eval { @name = name }
-      f
+      Function.new(addr, argtype, ctype, CALL_TYPE_TO_ABI[call_type],
+                   name: name)
     end
 
     # Returns a new closure wrapper for the +name+ function.
@@ -309,9 +308,7 @@ module Fiddle
         define_method(:call, block)
       }.new(ctype, argtype, abi)
 
-      f = Function.new(closure, argtype, ctype, abi)
-      f.instance_eval { @name = name }
-      f
+      Function.new(closure, argtype, ctype, abi, name: name)
     end
   end
 end