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

compile.c: try to convert in massign for

Browse source 
* compile.c (compile_for_masgn): try to convert to an Array if an
  element of massign `for` is not an Array.
  [ruby-core:84931] [Bug #14374]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-01-27 10:41:43 +00:00
parent d0fa578cdc
commit 7ea65f9be2
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
compile.c
View file

@ -5040,7 +5040,7 @@ static int
compile_for_masgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped) compile_for_masgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
{ {
/* massign to var in "for" /* massign to var in "for"
* args.length == 1 && Array === (tmp = args[0]) ? tmp : args * (args.length == 1 && Array.try_convert(args[0])) || args
*/ */
const int line = nd_line(node); const int line = nd_line(node);
const NODE *var = node->nd_var; const NODE *var = node->nd_var;
@ -5056,8 +5056,9 @@ compile_for_masgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const nod
ADD_INSN1(ret, line, putobject, INT2FIX(0)); ADD_INSN1(ret, line, putobject, INT2FIX(0));
ADD_CALL(ret, line, idAREF, INT2FIX(1)); ADD_CALL(ret, line, idAREF, INT2FIX(1));
ADD_INSN1(ret, line, putobject, rb_cArray); ADD_INSN1(ret, line, putobject, rb_cArray);
ADD_INSN1(ret, line, topn, INT2FIX(1)); ADD_INSN(ret, line, swap);
ADD_CALL(ret, line, idEqq, INT2FIX(1)); ADD_CALL(ret, line, rb_intern("try_convert"), INT2FIX(1));
ADD_INSN(ret, line, dup);
ADD_INSNL(ret, line, branchunless, not_ary); ADD_INSNL(ret, line, branchunless, not_ary);
ADD_INSN(ret, line, swap); ADD_INSN(ret, line, swap);
ADD_LABEL(ret, not_ary); ADD_LABEL(ret, not_ary);

10
test/ruby/test_iterator.rb
View file

@ -107,6 +107,16 @@ class TestIterator < Test::Unit::TestCase
assert_equal([1, 2, 3, 4, 5, 6, 7], x) assert_equal([1, 2, 3, 4, 5, 6, 7], x)
end end
def test_array_for_masgn
a = [Struct.new(:to_ary).new([1,2])]
x = []
a.each {|i,j|x << [i,j]}
assert_equal([[1,2]], x)
x = []
for i,j in a; x << [i,j]; end
assert_equal([[1,2]], x)
end
def test_append_method_to_built_in_class def test_append_method_to_built_in_class
x = [[1,2],[3,4],[5,6]] x = [[1,2],[3,4],[5,6]]
assert_equal(x.iter_test1{|e|e}, x.iter_test2{|e|e}) assert_equal(x.iter_test1{|e|e}, x.iter_test2{|e|e})