diff options
author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-11 10:41:00 +0000 |
---|---|---|
committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-11 10:41:00 +0000 |
commit | 3e6a624a8346ca0c26a292676adb4d0595090f09 (patch) | |
tree | b1b4221c2b9a0cc2415fc3c967965d64ba93d9b0 /ext/fiddle/function.c | |
parent | 16af9a107e8307567e2e1154328e9d24d9886803 (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/fiddle/function.c')
-rw-r--r-- | ext/fiddle/function.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c index 4585bcca84..c184c78663 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 *)); |