2 files changed, 18 insertions, 8 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 *));
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