kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix Enumerable#uniq with non single yield arguments

Browse source 
* enum.c (uniq_func, uniq_iter): need packed value as the unique
  key.  [ruby-core:81734] [Bug #13669] [Fix GH-1658]

Author:    Kenichi Kamiya <kachick1@gmail.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-06-21 02:25:27 +00:00
parent 5eec76bc7b
commit 9cacc53d4a
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
enum.c
View file

@ -3855,6 +3855,7 @@ enum_sum(int argc, VALUE* argv, VALUE obj)
static VALUE static VALUE
uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
{ {
ENUM_WANT_SVALUE();
rb_hash_add_new_element(hash, i, i); rb_hash_add_new_element(hash, i, i);
return Qnil; return Qnil;
} }
@ -3862,6 +3863,7 @@ uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
static VALUE static VALUE
uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
{ {
ENUM_WANT_SVALUE();
rb_hash_add_new_element(hash, rb_yield_values2(argc, argv), i); rb_hash_add_new_element(hash, rb_yield_values2(argc, argv), i);
return Qnil; return Qnil;
} }

1
test/ruby/test_enum.rb
View file

@ -977,5 +977,6 @@ class TestEnumerable < Test::Unit::TestCase
assert_equal([[1896, "Athens"], [1900, "Paris"], [1904, "Chicago"], [1908, "Rome"]], assert_equal([[1896, "Athens"], [1900, "Paris"], [1904, "Chicago"], [1908, "Rome"]],
olympics.uniq{|k,v| v}) 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, 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
end end