Deprecate rb_eval_cmd_kw

Author: nobu

include/ruby/internal/intern/vm.h

@@ -95,6 +95,7 @@ VALUE rb_check_funcall(VALUE recv, ID mid, int argc, const VALUE *argv);
  */
 VALUE rb_check_funcall_kw(VALUE recv, ID mid, int argc, const VALUE *argv, int kw_splat);
 
+#ifdef RBIMPL_ATTR_DEPRECATED_INTERNAL
 /**
  * This API  is practically a  variant of rb_proc_call_kw()  now.  Historically
  * when there  still was a  concept called `$SAFE`, this  was an API  for that.
@@ -109,7 +110,9 @@ VALUE rb_check_funcall_kw(VALUE recv, ID mid, int argc, const VALUE *argv, int k
  *   - RB_PASS_CALLED_KEYWORDS  it depends if there is a passed block.
  * @return     What the command evaluates to.
  */
+RBIMPL_ATTR_DEPRECATED_INTERNAL(4.0)
 VALUE rb_eval_cmd_kw(VALUE cmd, VALUE arg, int kw_splat);
+#endif
 
 /**
  * Identical to rb_funcallv(), except it takes Ruby's array instead of C's.

spec/ruby/optional/capi/ext/kernel_spec.c

@@ -117,9 +117,11 @@ VALUE kernel_spec_rb_eval_string(VALUE self, VALUE str) {
   return rb_eval_string(RSTRING_PTR(str));
 }
 
+#ifndef RUBY_VERSION_IS_4_0
 VALUE kernel_spec_rb_eval_cmd_kw(VALUE self, VALUE cmd, VALUE args, VALUE kw_splat) {
   return rb_eval_cmd_kw(cmd, args, NUM2INT(kw_splat));
 }
+#endif
 
 VALUE kernel_spec_rb_raise(VALUE self, VALUE hash) {
   rb_hash_aset(hash, ID2SYM(rb_intern("stage")), ID2SYM(rb_intern("before")));
@@ -403,7 +405,9 @@ void Init_kernel_spec(void) {
   rb_define_method(cls, "rb_category_warn_deprecated_with_integer_extra_value", kernel_spec_rb_category_warn_deprecated_with_integer_extra_value, 1);
   rb_define_method(cls, "rb_ensure", kernel_spec_rb_ensure, 4);
   rb_define_method(cls, "rb_eval_string", kernel_spec_rb_eval_string, 1);
+#ifndef RUBY_VERSION_IS_4_0
   rb_define_method(cls, "rb_eval_cmd_kw", kernel_spec_rb_eval_cmd_kw, 3);
+#endif
   rb_define_method(cls, "rb_raise", kernel_spec_rb_raise, 1);
   rb_define_method(cls, "rb_throw", kernel_spec_rb_throw, 1);
   rb_define_method(cls, "rb_throw_obj", kernel_spec_rb_throw_obj, 2);

spec/ruby/optional/capi/kernel_spec.rb

@@ -635,22 +635,24 @@ def proc_caller
     end
   end
 
-  describe "rb_eval_cmd_kw" do
-    it "evaluates a string of ruby code" do
-      @s.rb_eval_cmd_kw("1+1", [], 0).should == 2
-    end
+  ruby_version_is ""..."4.0" do
+    describe "rb_eval_cmd_kw" do
+      it "evaluates a string of ruby code" do
+        @s.rb_eval_cmd_kw("1+1", [], 0).should == 2
+      end
 
-    it "calls a proc with the supplied arguments" do
-      @s.rb_eval_cmd_kw(-> *x { x.map { |i| i + 1 } }, [1, 3, 7], 0).should == [2, 4, 8]
-    end
+      it "calls a proc with the supplied arguments" do
+        @s.rb_eval_cmd_kw(-> *x { x.map { |i| i + 1 } }, [1, 3, 7], 0).should == [2, 4, 8]
+      end
 
-    it "calls a proc with keyword arguments if kw_splat is non zero" do
-      a_proc = -> *x, **y {
-        res = x.map { |i| i + 1 }
-        y.each { |k, v| res << k; res << v }
-        res
-      }
-      @s.rb_eval_cmd_kw(a_proc, [1, 3, 7, {a: 1, b: 2, c: 3}], 1).should == [2, 4, 8, :a, 1, :b, 2, :c, 3]
+      it "calls a proc with keyword arguments if kw_splat is non zero" do
+        a_proc = -> *x, **y {
+          res = x.map { |i| i + 1 }
+          y.each { |k, v| res << k; res << v }
+          res
+        }
+        @s.rb_eval_cmd_kw(a_proc, [1, 3, 7, {a: 1, b: 2, c: 3}], 1).should == [2, 4, 8, :a, 1, :b, 2, :c, 3]
+      end
     end
   end