From e096eeed1a4c708544496e64fd672c644b91637b Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Sat, 21 Jun 2025 07:05:54 +0900
Subject: [PATCH] mruby-set: reimplement #initialize in Ruby again

And we have eliminated mrb_funcall* from set.c.
---
 mrbgems/mruby-set/mrblib/set.rb | 18 ++++++++++++------
 mrbgems/mruby-set/src/set.c     | 33 +--------------------------------
 2 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/mrbgems/mruby-set/mrblib/set.rb b/mrbgems/mruby-set/mrblib/set.rb
index 56ed9733c..be45b1387 100644
--- a/mrbgems/mruby-set/mrblib/set.rb
+++ b/mrbgems/mruby-set/mrblib/set.rb
@@ -1,4 +1,16 @@
 class Set
+  def initialize(enum = nil, &block)
+    __set_init
+    return self if enum.nil?
+
+    if block
+      __do_with_enum(enum) { |o| add(block.call(o)) }
+      self
+    else
+      merge(enum)
+    end
+  end
+
   # internal method
   def __do_with_enum(enum, &block)
     if enum.respond_to?(:each)
@@ -8,12 +20,6 @@ class Set
     end
   end
 
-  # Helper method for initialize with block
-  def __init_with_block(enum, &block)
-    __do_with_enum(enum) { |o| add(block.call(o)) }
-    self
-  end
-
   # Merges the elements of the given enumerable object to the set and returns
   # self.
   #
diff --git a/mrbgems/mruby-set/src/set.c b/mrbgems/mruby-set/src/set.c
index ead05803d..b7d1f1183 100644
--- a/mrbgems/mruby-set/src/set.c
+++ b/mrbgems/mruby-set/src/set.c
@@ -119,42 +119,11 @@ set_get_khash(mrb_state *mrb, mrb_value self)
   return (khash_t(set)*)mrb_data_get_ptr(mrb, self, &set_data_type);
 }
 
-/*
- * call-seq:
- *   Set.new(enum = nil)
- *   Set.new(enum = nil) { |o| block }
- *
- * Creates a new set containing the members of the given enumerable object.
- */
 static mrb_value
 set_init(mrb_state *mrb, mrb_value self)
 {
-  mrb_value enum_obj = mrb_nil_value();
-  mrb_value block = mrb_nil_value();
-
-  mrb_get_args(mrb, "|o&", &enum_obj, &block);
-
-  /* Initialize the khash and associate it with the Ruby object */
   khash_t(set) *kh = kh_init(set, mrb);
-
-  /* Associate the khash with the Ruby object so it will be freed when the object is GC'd */
   set_set_khash(mrb, self, kh);
-
-  if (mrb_nil_p(enum_obj)) {
-    return self;
-  }
-
-  if (!mrb_nil_p(block)) {
-    /* Block given - validate with the temporary set first */
-    mrb_value args[1] = { enum_obj };
-    /* If we get here, no exception was raised, so we can safely proceed with our main set */
-    mrb_funcall_with_block(mrb, self, MRB_SYM(__init_with_block), 1, args, block);
-  }
-  else {
-    /* If we get here, no exception was raised, so we can safely proceed with our main set */
-    mrb_funcall_id(mrb, self, MRB_SYM(merge), 1, enum_obj);
-  }
-
   return self;
 }
 
@@ -878,7 +847,6 @@ mrb_mruby_set_gem_init(mrb_state *mrb)
 
   mrb_define_class_method(mrb, set, "[]", set_s_create, MRB_ARGS_ANY());
 
-  mrb_define_method(mrb, set, "initialize", set_init, MRB_ARGS_OPT(1) | MRB_ARGS_BLOCK());
   mrb_define_private_method(mrb, set, "initialize_copy", set_init_copy, MRB_ARGS_REQ(1));
 
   mrb_define_method(mrb, set, "size", set_size, MRB_ARGS_NONE());
@@ -898,6 +866,7 @@ mrb_mruby_set_gem_init(mrb_state *mrb)
   mrb_define_method(mrb, set, "delete", set_delete, MRB_ARGS_REQ(1));
   mrb_define_method(mrb, set, "delete?", set_delete_p, MRB_ARGS_REQ(1));
 
+  mrb_define_method(mrb, set, "__set_init", set_init, MRB_ARGS_NONE());
   mrb_define_method(mrb, set, "__set_merge", set_core_merge, MRB_ARGS_REQ(1));
   mrb_define_method(mrb, set, "__set_subtract", set_core_subtract, MRB_ARGS_REQ(1));