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 (iseq_compile_each): &&= and ||= should return rhs.

Browse source 
[ruby-dev:39163] (#1996), [ruby-core:25143]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-09-05 01:38:47 +00:00
parent 78a54607b6
commit 96c50e47c5
3 changed files with 64 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Sep 5 10:38:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (iseq_compile_each): &&= and ||= should return rhs.
[ruby-dev:39163] (#1996), [ruby-core:25143]
Sat Sep 5 08:51:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Sep 5 08:51:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (update_char_offset): position should be long. * re.c (update_char_offset): position should be long.

32
compile.c
View file

@ -3842,22 +3842,26 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
if lcfin # r o if lcfin # r o
pop # r pop # r
eval v # r v eval v # r v
send a= # v swap # v r
jump lfin # v topn 1 # v r v
send a= # v ?
jump lfin # v ?
lcfin: # r o lcfin: # r o
swap # o r swap # o r
pop # o
lfin: # v lfin: # o ?
pop # o
# and # and
dup # r o o dup # r o o
unless lcfin unless lcfin
pop # r pop # r
eval v # r v eval v # r v
send a= # v swap # v r
jump lfin # v topn 1 # v r v
send a= # v ?
jump lfin # v ?
# others # others
eval v # r o v eval v # r o v
@ -3881,26 +3885,32 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
} }
ADD_INSN(ret, nd_line(node), pop); ADD_INSN(ret, nd_line(node), pop);
COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value); COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
ADD_INSN(ret, nd_line(node), swap);
ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid), ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
INT2FIX(1)); INT2FIX(1));
ADD_INSNL(ret, nd_line(node), jump, lfin); ADD_INSNL(ret, nd_line(node), jump, lfin);
ADD_LABEL(ret, lcfin); ADD_LABEL(ret, lcfin);
ADD_INSN(ret, nd_line(node), swap); ADD_INSN(ret, nd_line(node), swap);
ADD_INSN(ret, nd_line(node), pop);
ADD_LABEL(ret, lfin); ADD_LABEL(ret, lfin);
ADD_INSN(ret, nd_line(node), pop);
if (poped) {
/* we can apply more optimize */
ADD_INSN(ret, nd_line(node), pop);
}
} }
else { else {
COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value); COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_mid), ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_mid),
INT2FIX(1)); INT2FIX(1));
if (!poped) {
ADD_INSN(ret, nd_line(node), swap);
ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
}
ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid), ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
INT2FIX(1)); INT2FIX(1));
}
if (poped) {
/* we can apply more optimize */
ADD_INSN(ret, nd_line(node), pop); ADD_INSN(ret, nd_line(node), pop);
} }
break; break;

55
test/ruby/test_basicinstructions.rb
View file

@ -499,52 +499,73 @@ class TestBasicInstructions < Test::Unit::TestCase
end end
class OP class OP
attr_accessor :x attr_reader :x
def x=(x)
@x = x
:Bug1996
end
Bug1996 = '[ruby-dev:39163], [ruby-core:25143]'
end end
def test_opassign def test_opassign
x = nil x = nil
x ||= 1 assert_equal 1, x ||= 1
assert_equal 1, x assert_equal 1, x
x &&= 2 assert_equal 2, x &&= 2
assert_equal 2, x assert_equal 2, x
x ||= 3 assert_equal 2, x ||= 3
assert_equal 2, x assert_equal 2, x
x &&= 4 assert_equal 4, x &&= 4
assert_equal 4, x
assert_equal 5, x += 1
assert_equal 5, x
assert_equal 4, x -= 1
assert_equal 4, x assert_equal 4, x
y = OP.new y = OP.new
y.x = nil y.x = nil
y.x ||= 1 assert_equal 1, y.x ||= 1, OP::Bug1996
assert_equal 1, y.x assert_equal 1, y.x
y.x &&= 2 assert_equal 2, y.x &&= 2, OP::Bug1996
assert_equal 2, y.x assert_equal 2, y.x
y.x ||= 3 assert_equal 2, y.x ||= 3
assert_equal 2, y.x assert_equal 2, y.x
y.x &&= 4 assert_equal 4, y.x &&= 4, OP::Bug1996
assert_equal 4, y.x
assert_equal 5, y.x += 1, OP::Bug1996
assert_equal 5, y.x
assert_equal 4, y.x -= 1, OP::Bug1996
assert_equal 4, y.x assert_equal 4, y.x
z = OP.new z = OP.new
z.x = y z.x = y
z.x.x = nil z.x.x = nil
z.x.x ||= 1 assert_equal 1, z.x.x ||= 1, OP::Bug1996
assert_equal 1, z.x.x assert_equal 1, z.x.x
z.x.x &&= 2 assert_equal 2, z.x.x &&= 2, OP::Bug1996
assert_equal 2, z.x.x assert_equal 2, z.x.x
z.x.x ||= 3 assert_equal 2, z.x.x ||= 3
assert_equal 2, z.x.x assert_equal 2, z.x.x
z.x.x &&= 4 assert_equal 4, z.x.x &&= 4, OP::Bug1996
assert_equal 4, z.x.x
assert_equal 5, z.x.x += 1, OP::Bug1996
assert_equal 5, z.x.x
assert_equal 4, z.x.x -= 1, OP::Bug1996
assert_equal 4, z.x.x assert_equal 4, z.x.x
a = [] a = []
a[0] = nil a[0] = nil
a[0] ||= 1 assert_equal 1, a[0] ||= 1
assert_equal 1, a[0] assert_equal 1, a[0]
a[0] &&= 2 assert_equal 2, a[0] &&= 2
assert_equal 2, a[0] assert_equal 2, a[0]
a[0] ||= 3 assert_equal 2, a[0] ||= 3
assert_equal 2, a[0] assert_equal 2, a[0]
a[0] &&= 4 assert_equal 4, a[0] &&= 4
assert_equal 4, a[0]
assert_equal 5, a[0] += 1
assert_equal 5, a[0]
assert_equal 4, a[0] -= 1
assert_equal 4, a[0] assert_equal 4, a[0]
end end