archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 63030: [Backport #14639]

Browse source 
array.c: yield blockarg in collect

	* array.c (rb_ary_collect): yield in block argument semantics
	  always to splat array elements to lambda, for the backward
	  compatibility.  [ruby-core:86362] [Bug #14639]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-10-11 13:51:19 +00:00
parent 49d542f6d3
commit ea15ceddbe
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
array.c
View file

@ -2754,7 +2754,7 @@ rb_ary_collect(VALUE ary)
RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
collect = rb_ary_new2(RARRAY_LEN(ary)); collect = rb_ary_new2(RARRAY_LEN(ary));
for (i = 0; i < RARRAY_LEN(ary); i++) { for (i = 0; i < RARRAY_LEN(ary); i++) {
rb_ary_push(collect, rb_yield(RARRAY_AREF(ary, i))); rb_ary_push(collect, rb_yield_force_blockarg(RARRAY_AREF(ary, i)));
} }
return collect; return collect;
} }

2
test/ruby/test_array.rb
View file

@ -534,6 +534,8 @@ class TestArray < Test::Unit::TestCase
# Enumerable#collect without block returns an Enumerator. # Enumerable#collect without block returns an Enumerator.
#assert_equal([1, 2, 3], @cls[1, 2, 3].collect) #assert_equal([1, 2, 3], @cls[1, 2, 3].collect)
assert_kind_of Enumerator, @cls[1, 2, 3].collect assert_kind_of Enumerator, @cls[1, 2, 3].collect
assert_equal([[1, 2, 3]], [[1, 2, 3]].collect(&->(a, b, c) {[a, b, c]}))
end end
# also update map! # also update map!

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.5.2" #define RUBY_VERSION "2.5.2"
#define RUBY_RELEASE_DATE "2018-10-09" #define RUBY_RELEASE_DATE "2018-10-11"
#define RUBY_PATCHLEVEL 96 #define RUBY_PATCHLEVEL 97
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10
#define RUBY_RELEASE_DAY 9 #define RUBY_RELEASE_DAY 11
#include "ruby/version.h" #include "ruby/version.h"