[前][次][番号順一覧][スレッド一覧]

ruby-changes:69906

From: NAKAMURA <ko1@a...>
Date: Wed, 24 Nov 2021 19:54:13 +0900 (JST)
Subject: [ruby-changes:69906] b198562956 (ruby_2_7): merge revision(s) e83c02a768af61cd0890a75e90bcae1119d8bd93: [Backport #18289]

https://git.ruby-lang.org/ruby.git/commit/?id=b198562956

From b1985629565c3c54b1a64d6faf213e8144857515 Mon Sep 17 00:00:00 2001
From: NAKAMURA Usaku <usa@r...>
Date: Wed, 24 Nov 2021 19:38:18 +0900
Subject: merge revision(s) e83c02a768af61cd0890a75e90bcae1119d8bd93: [Backport
 #18289]

	Delegate keywords from Enumerable#to_a to #each

	Fixes [Bug #18289]
	---
	 enum.c                 | 2 +-
	 test/ruby/test_enum.rb | 5 +++++
	 2 files changed, 6 insertions(+), 1 deletion(-)
---
 enum.c                 | 2 +-
 test/ruby/test_enum.rb | 5 +++++
 version.h              | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/enum.c b/enum.c
index fb0ced57a18..de4d22d92e7 100644
--- a/enum.c
+++ b/enum.c
@@ -648,7 +648,7 @@ enum_to_a(int argc, VALUE *argv, VALUE obj) https://github.com/ruby/ruby/blob/trunk/enum.c#L648
 {
     VALUE ary = rb_ary_new();
 
-    rb_block_call(obj, id_each, argc, argv, collect_all, ary);
+    rb_block_call_kw(obj, id_each, argc, argv, collect_all, ary, RB_PASS_CALLED_KEYWORDS);
 
     return ary;
 }
diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb
index ebb7e78381a..9f6f19b6692 100644
--- a/test/ruby/test_enum.rb
+++ b/test/ruby/test_enum.rb
@@ -114,6 +114,11 @@ class TestEnumerable < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_enum.rb#L114
     assert_equal([1, 2, 3, 1, 2], @obj.to_a)
   end
 
+  def test_to_a_keywords
+    def @obj.each(foo:) yield foo end
+    assert_equal([1], @obj.to_a(foo: 1))
+  end
+
   def test_to_a_size_symbol
     sym = Object.new
     class << sym
diff --git a/version.h b/version.h
index 315eda1376e..99b78460427 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L2
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 201
+#define RUBY_PATCHLEVEL 202
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 11
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]