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

* enum.c (nmin_filter): Fix limit value.

Browse source 
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
This commit is contained in:
akr 2015-10-04 14:41:55 +00:00
parent b0f62ba6d1
commit ddb3fbc63d
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Oct 4 23:39:09 2015 Tanaka Akira <akr@fsij.org>
* 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 <naruse@ruby-lang.org> Sun Oct 4 15:11:48 2015 NARUSE, Yui <naruse@ruby-lang.org>
* enc/euc_jp.c (mbc_case_fold): check given string is valid or not, * enc/euc_jp.c (mbc_case_fold): check given string is valid or not,

6
enum.c
View file

@ -1192,6 +1192,7 @@ nmin_filter(struct nmin_data *data)
long numelts; long numelts;
long left, right; long left, right;
long store_index;
long i, j; long i, j;
@ -1217,7 +1218,6 @@ nmin_filter(struct nmin_data *data)
while (1) { while (1) {
long pivot_index = left + (right-left)/2; long pivot_index = left + (right-left)/2;
long store_index;
long num_pivots = 1; long num_pivots = 1;
SWAP(pivot_index, right); SWAP(pivot_index, right);
@ -1261,9 +1261,9 @@ nmin_filter(struct nmin_data *data)
#undef GETPTR #undef GETPTR
#undef SWAP #undef SWAP
data->limit = RARRAY_PTR(data->buf)[store_index*eltsize];
data->curlen = data->n; data->curlen = data->n;
rb_ary_resize(data->buf, data->n * eltsize); rb_ary_resize(data->buf, data->n * eltsize);
data->limit = RARRAY_PTR(data->buf)[(data->n-1)*eltsize];
} }
static VALUE static VALUE
@ -1283,7 +1283,7 @@ nmin_i(VALUE i, VALUE *_data, int argc, VALUE *argv)
int c = data->cmpfunc(&cmpv, &data->limit, data); int c = data->cmpfunc(&cmpv, &data->limit, data);
if (data->rev) if (data->rev)
c = -c; c = -c;
if (c > 0) if (c >= 0)
return Qnil; return Qnil;
} }

5
test/ruby/test_enum.rb
View file

@ -289,6 +289,8 @@ class TestEnumerable < Test::Unit::TestCase
assert_equal(%w[albatross dog], ary.min(2)) assert_equal(%w[albatross dog], ary.min(2))
assert_equal(%w[dog horse], assert_equal(%w[dog horse],
ary.min(2) {|a,b| a.length <=> b.length }) 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 end
def test_max def test_max
@ -303,6 +305,7 @@ class TestEnumerable < Test::Unit::TestCase
assert_equal(%w[horse dog], ary.max(2)) assert_equal(%w[horse dog], ary.max(2))
assert_equal(%w[albatross horse], assert_equal(%w[albatross horse],
ary.max(2) {|a,b| a.length <=> b.length }) 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 end
def test_minmax def test_minmax
@ -325,6 +328,7 @@ class TestEnumerable < Test::Unit::TestCase
assert_equal("dog", a.min_by {|x| x.length }) assert_equal("dog", a.min_by {|x| x.length })
assert_equal(3, [2,3,1].min_by {|x| -x }) assert_equal(3, [2,3,1].min_by {|x| -x })
assert_equal(%w[dog horse], a.min_by(2) {|x| x.length }) 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 end
def test_max_by def test_max_by
@ -335,6 +339,7 @@ class TestEnumerable < Test::Unit::TestCase
assert_equal("albatross", a.max_by {|x| x.length }) assert_equal("albatross", a.max_by {|x| x.length })
assert_equal(1, [2,3,1].max_by {|x| -x }) assert_equal(1, [2,3,1].max_by {|x| -x })
assert_equal(%w[albatross horse], a.max_by(2) {|x| x.length }) 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 end
def test_minmax_by def test_minmax_by