From 9cacc53d4a45d5af962d5c6fb9a5406b518641da Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 21 Jun 2017 02:25:27 +0000 Subject: Fix Enumerable#uniq with non single yield arguments * enum.c (uniq_func, uniq_iter): need packed value as the unique key. [ruby-core:81734] [Bug #13669] [Fix GH-1658] Author: Kenichi Kamiya git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enum.c | 2 ++ test/ruby/test_enum.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/enum.c b/enum.c index cd77d9ca7a..c744665949 100644 --- a/enum.c +++ b/enum.c @@ -3855,6 +3855,7 @@ enum_sum(int argc, VALUE* argv, VALUE obj) static VALUE uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) { + ENUM_WANT_SVALUE(); rb_hash_add_new_element(hash, i, i); return Qnil; } @@ -3862,6 +3863,7 @@ uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) static VALUE uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) { + ENUM_WANT_SVALUE(); rb_hash_add_new_element(hash, rb_yield_values2(argc, argv), i); return Qnil; } diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb index 991bda9b3f..c36cb43537 100644 --- a/test/ruby/test_enum.rb +++ b/test/ruby/test_enum.rb @@ -977,5 +977,6 @@ class TestEnumerable < Test::Unit::TestCase assert_equal([[1896, "Athens"], [1900, "Paris"], [1904, "Chicago"], [1908, "Rome"]], olympics.uniq{|k,v| v}) assert_equal([1, 2, 3, 4, 5, 10], (1..100).uniq{|x| (x**2) % 10 }.first(6)) + assert_equal([1, [1, 2]], Foo.new.to_enum.uniq) end end -- cgit v1.2.3