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

merge revision(s) 62731,62735: [Backport #14495]

Browse source 
Bug Fix Enumerator::Lazy#uniq state for multiple call

	* enumerator.c (lazy_uniq_i): create new hash for each calls.
	  [Fix GH-1820]

	Currently

		2.5.0-preview1 :001 > arr = (0..100).lazy.uniq{|i| i % 10}
		 => #<Enumerator::Lazy: #<Enumerator::Lazy: 0..100>:uniq>
		2.5.0-preview1 :002 > arr.to_a
		 => [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
		2.5.0-preview1 :003 > arr.to_a
		 => []

	Expected

	arr.to_a to always return same output

	From: Anmol Chopra <anmolchopra@rocketbox.in>

	test_enumerator.rb: duplicate assertions

	* test/ruby/test_enumerator.rb (test_uniq): remove assertions
	  which ared duplicate of lazy enumerator tests in
	  test_lazy_enumerator.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@64558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-08-27 13:47:40 +00:00
parent 8b310ae75d
commit 7d9572819b
4 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
enumerator.c
View file

@ -2233,27 +2233,35 @@ lazy_drop_while(VALUE obj)
}
static VALUE
lazy_uniq_i(VALUE i, VALUE hash, int argc, const VALUE *argv, VALUE yielder)
lazy_uniq_i(VALUE i, int argc, const VALUE *argv, VALUE yielder)
{
VALUE hash;
hash = rb_attr_get(yielder, id_memo);
if (NIL_P(hash)) {
hash = rb_obj_hide(rb_hash_new());
rb_ivar_set(yielder, id_memo, hash);
}
if (rb_hash_add_new_element(hash, i, Qfalse))
return Qnil;
return rb_funcallv(yielder, id_yield, argc, argv);
}
static VALUE
lazy_uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
lazy_uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, m))
{
VALUE yielder = (--argc, *argv++);
i = rb_enum_values_pack(argc, argv);
return lazy_uniq_i(i, hash, argc, argv, yielder);
return lazy_uniq_i(i, argc, argv, yielder);
}
static VALUE
lazy_uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
lazy_uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, m))
{
VALUE yielder = (--argc, *argv++);
i = rb_yield_values2(argc, argv);
return lazy_uniq_i(i, hash, argc, argv, yielder);
return lazy_uniq_i(i, argc, argv, yielder);
}
static VALUE
@ -2261,9 +2269,8 @@ lazy_uniq(VALUE obj)
{
rb_block_call_func *const func =
rb_block_given_p() ? lazy_uniq_iter : lazy_uniq_func;
VALUE hash = rb_obj_hide(rb_hash_new());
return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
func, hash),
func, 0),
0, 0);
}

5
test/ruby/test_enumerator.rb
View file

@ -657,8 +657,9 @@ class TestEnumerator < Test::Unit::TestCase
end
def test_uniq
assert_equal([1, 2, 3, 4, 5, 10],
(1..Float::INFINITY).lazy.uniq{|x| (x**2) % 10 }.first(6))
u = [0, 1, 0, 1].to_enum.lazy.uniq
assert_equal([0, 1], u.force)
assert_equal([0, 1], u.force)
end
end

9
test/ruby/test_lazy_enumerator.rb
View file

@ -569,4 +569,13 @@ EOS
[1, 2, 3].lazy.map(&:undefined).map(&:to_s).force
end
end
def test_uniq
u = (1..Float::INFINITY).lazy.uniq do |x|
raise "too big" if x > 10000
(x**2) % 10
end
assert_equal([1, 2, 3, 4, 5, 10], u.first(6))
assert_equal([1, 2, 3, 4, 5, 10], u.first(6))
end
end

8
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.4.5"
#define RUBY_RELEASE_DATE "2018-07-31"
#define RUBY_PATCHLEVEL 315
#define RUBY_RELEASE_DATE "2018-08-27"
#define RUBY_PATCHLEVEL 316
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 31
#define RUBY_RELEASE_MONTH 8
#define RUBY_RELEASE_DAY 27
#include "ruby/version.h"