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

* insns.def (splatarray): make new array if flag is set.

Browse source 
* compile.c (iseq_compile_each): make new array with
  splat. [ruby-core:21901][Feature #1125]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-02-15 20:41:38 +00:00
parent e315f8471d
commit fde3c421be
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Feb 16 05:41:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* insns.def (splatarray): make new array if flag is set.
* compile.c (iseq_compile_each): make new array with
splat. [ruby-core:21901][Feature #1125]
Thu Feb 16 00:14:04 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> Thu Feb 16 00:14:04 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* lib/abbrev.rb (Array#abbrev): add missing '"' in documentation. * lib/abbrev.rb (Array#abbrev): add missing '"' in documentation.

2
compile.c
View file

@ -4643,7 +4643,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
} }
case NODE_SPLAT:{ case NODE_SPLAT:{
COMPILE(ret, "splat", node->nd_head); COMPILE(ret, "splat", node->nd_head);
ADD_INSN1(ret, nd_line(node), splatarray, Qfalse); ADD_INSN1(ret, nd_line(node), splatarray, Qtrue);
if (poped) { if (poped) {
ADD_INSN(ret, nd_line(node), pop); ADD_INSN(ret, nd_line(node), pop);

3
insns.def
View file

@ -533,6 +533,9 @@ splatarray
if (NIL_P(tmp)) { if (NIL_P(tmp)) {
tmp = rb_ary_new3(1, ary); tmp = rb_ary_new3(1, ary);
} }
else if (RTEST(flag)) {
tmp = rb_ary_dup(tmp);
}
obj = tmp; obj = tmp;
} }

7
test/ruby/test_basicinstructions.rb
View file

@ -632,7 +632,7 @@ class TestBasicInstructions < Test::Unit::TestCase
assert_equal 'i', $~[9] assert_equal 'i', $~[9]
assert_equal 'x', $` assert_equal 'x', $`
assert_equal 'abcdefghi', $& assert_equal 'abcdefghi', $&
assert_equal 'y', $' assert_equal "y", $'
assert_equal 'i', $+ assert_equal 'i', $+
assert_equal 'a', $1 assert_equal 'a', $1
assert_equal 'b', $2 assert_equal 'b', $2
@ -662,15 +662,20 @@ class TestBasicInstructions < Test::Unit::TestCase
end end
def test_array_splat def test_array_splat
feature1125 = '[ruby-core:21901]'
a = [] a = []
assert_equal [], [*a] assert_equal [], [*a]
assert_equal [1], [1, *a] assert_equal [1], [1, *a]
assert_not_same(a, [*a], feature1125)
a = [2] a = [2]
assert_equal [2], [*a] assert_equal [2], [*a]
assert_equal [1, 2], [1, *a] assert_equal [1, 2], [1, *a]
assert_not_same(a, [*a], feature1125)
a = [2, 3] a = [2, 3]
assert_equal [2, 3], [*a] assert_equal [2, 3], [*a]
assert_equal [1, 2, 3], [1, *a] assert_equal [1, 2, 3], [1, *a]
assert_not_same(a, [*a], feature1125)
a = nil a = nil
assert_equal [], [*a] assert_equal [], [*a]