From c660d846edcf2f7dda9c2edf7f2c9f6ab6aa97d7 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 4 Oct 2015 14:41:55 +0000 Subject: * enum.c (nmin_filter): Fix limit value. patch by Helder Pereira. [Bug #11471] [ruby-core:70477] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ enum.c | 6 +++--- test/ruby/test_enum.rb | 5 +++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ca04313b4..b6bb4db562 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Oct 4 23:39:09 2015 Tanaka Akira + + * enum.c (nmin_filter): Fix limit value. + patch by Helder Pereira. + [Bug #11471] [ruby-core:70477] + Sun Oct 4 15:11:48 2015 NARUSE, Yui * enc/euc_jp.c (mbc_case_fold): check given string is valid or not, diff --git a/enum.c b/enum.c index ea101ba481..df62afab5e 100644 --- a/enum.c +++ b/enum.c @@ -1192,6 +1192,7 @@ nmin_filter(struct nmin_data *data) long numelts; long left, right; + long store_index; long i, j; @@ -1217,7 +1218,6 @@ nmin_filter(struct nmin_data *data) while (1) { long pivot_index = left + (right-left)/2; - long store_index; long num_pivots = 1; SWAP(pivot_index, right); @@ -1261,9 +1261,9 @@ nmin_filter(struct nmin_data *data) #undef GETPTR #undef SWAP + data->limit = RARRAY_PTR(data->buf)[store_index*eltsize]; data->curlen = data->n; rb_ary_resize(data->buf, data->n * eltsize); - data->limit = RARRAY_PTR(data->buf)[(data->n-1)*eltsize]; } static VALUE @@ -1283,7 +1283,7 @@ nmin_i(VALUE i, VALUE *_data, int argc, VALUE *argv) int c = data->cmpfunc(&cmpv, &data->limit, data); if (data->rev) c = -c; - if (c > 0) + if (c >= 0) return Qnil; } diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb index 10692e687d..4a6aa5e36e 100644 --- a/test/ruby/test_enum.rb +++ b/test/ruby/test_enum.rb @@ -289,6 +289,8 @@ class TestEnumerable < Test::Unit::TestCase assert_equal(%w[albatross dog], ary.min(2)) assert_equal(%w[dog horse], ary.min(2) {|a,b| a.length <=> b.length }) + assert_equal([13, 14], [20, 32, 32, 21, 30, 25, 29, 13, 14].min(2)) + assert_equal([2, 4, 6, 7], [2, 4, 8, 6, 7].min(4)) end def test_max @@ -303,6 +305,7 @@ class TestEnumerable < Test::Unit::TestCase assert_equal(%w[horse dog], ary.max(2)) assert_equal(%w[albatross horse], ary.max(2) {|a,b| a.length <=> b.length }) + assert_equal([3, 2], [0, 0, 0, 0, 0, 0, 1, 3, 2].max(2)) end def test_minmax @@ -325,6 +328,7 @@ class TestEnumerable < Test::Unit::TestCase assert_equal("dog", a.min_by {|x| x.length }) assert_equal(3, [2,3,1].min_by {|x| -x }) assert_equal(%w[dog horse], a.min_by(2) {|x| x.length }) + assert_equal([13, 14], [20, 32, 32, 21, 30, 25, 29, 13, 14].min_by(2) {|x| x}) end def test_max_by @@ -335,6 +339,7 @@ class TestEnumerable < Test::Unit::TestCase assert_equal("albatross", a.max_by {|x| x.length }) assert_equal(1, [2,3,1].max_by {|x| -x }) assert_equal(%w[albatross horse], a.max_by(2) {|x| x.length }) + assert_equal([3, 2], [0, 0, 0, 0, 0, 0, 1, 3, 2].max_by(2) {|x| x}) end def test_minmax_by -- cgit v1.2.3