summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 10:41:00 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 10:41:00 +0000
commit3e6a624a8346ca0c26a292676adb4d0595090f09 (patch)
treeb1b4221c2b9a0cc2415fc3c967965d64ba93d9b0 /ext
parent16af9a107e8307567e2e1154328e9d24d9886803 (diff)
* 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
Diffstat (limited to 'ext')
-rw-r--r--ext/fiddle/function.c17
-rw-r--r--ext/fiddle/lib/fiddle/import.rb9
2 files changed, 18 insertions, 8 deletions
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
index 4585bcc..c184c78 100644
--- a/ext/fiddle/function.c
+++ b/ext/fiddle/function.c
@@ -50,16 +50,27 @@ rb_fiddle_new_function(VALUE address, VALUE arg_types, VALUE ret_type)
return rb_class_new_instance(3, argv, cFiddleFunction);
}
+static int
+parse_keyword_arg_i(VALUE key, VALUE value, VALUE self)
+{
+ if (key == ID2SYM(rb_intern("name"))) {
+ rb_iv_set(self, "@name", value);
+ } else {
+ rb_raise(rb_eArgError, "unknown keyword: %"PRIsVALUE, key);
+ }
+ return ST_CONTINUE;
+}
+
static VALUE
initialize(int argc, VALUE argv[], VALUE self)
{
ffi_cif * cif;
ffi_type **arg_types;
ffi_status result;
- VALUE ptr, args, ret_type, abi;
+ VALUE ptr, args, ret_type, abi, kwds;
int i;
- rb_scan_args(argc, argv, "31", &ptr, &args, &ret_type, &abi);
+ rb_scan_args(argc, argv, "31:", &ptr, &args, &ret_type, &abi, &kwds);
if(NIL_P(abi)) abi = INT2NUM(FFI_DEFAULT_ABI);
Check_Type(args, T_ARRAY);
@@ -69,6 +80,8 @@ initialize(int argc, VALUE argv[], VALUE self)
rb_iv_set(self, "@return_type", ret_type);
rb_iv_set(self, "@abi", abi);
+ if (!NIL_P(kwds)) rb_hash_foreach(kwds, parse_keyword_arg_i, self);
+
TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
arg_types = xcalloc(RARRAY_LEN(args) + 1, sizeof(ffi_type *));
diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb
index faf7cb3..75853d6 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