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

* iseq_compile_each (NODE_DEFINED): put nil first to fix stack

Browse source 
consistency.  [ruby-core:30293]
  Now, lfinish[0] of defined_expr seems not to be used.  Refactoring
  may be needed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2010-05-19 10:48:17 +00:00
parent 7eb7f063a4
commit 59af57e257
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed May 19 19:45:10 2010 Yusuke Endoh <mame@tsg.ne.jp>
* iseq_compile_each (NODE_DEFINED): put nil first to fix stack
consistency. [ruby-core:30293]
Now, lfinish[0] of defined_expr seems not to be used. Refactoring
may be needed.
Wed May 19 16:55:09 2010 NARUSE, Yui <naruse@ruby-lang.org> Wed May 19 16:55:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
* numeric.c (rb_num2ulong): use rb_big2ulong for data from * numeric.c (rb_num2ulong): use rb_big2ulong for data from

10
bootstraptest/test_syntax.rb
View file

@ -890,3 +890,13 @@ assert_valid_syntax('x y { "#{}".z { } }', bug1240)
assert_valid_syntax('x y { "#{}".z do end }', bug1240) assert_valid_syntax('x y { "#{}".z do end }', bug1240)
assert_valid_syntax('y "#{a 1}" do end', '[ruby-core:29579]') assert_valid_syntax('y "#{a 1}" do end', '[ruby-core:29579]')
assert_normal_exit %q{
def foo(&block)
yield
end
foo do
s = defined?(raise + 1)
Class
end
}, '[ruby-core:30293]'

9
compile.c
View file

@ -4815,11 +4815,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
LABEL *lfinish[2]; LABEL *lfinish[2];
lfinish[0] = NEW_LABEL(nd_line(node)); lfinish[0] = NEW_LABEL(nd_line(node));
lfinish[1] = 0; lfinish[1] = 0;
defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue);
if (lfinish[1]) {
ADD_INSNL(ret, nd_line(node), jump, lfinish[0]);
ADD_LABEL(ret, lfinish[1]);
ADD_INSN(ret, nd_line(node), putnil); ADD_INSN(ret, nd_line(node), putnil);
defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue);
ADD_INSN(ret, nd_line(node), swap);
ADD_INSN(ret, nd_line(node), pop);
if (lfinish[1]) {
ADD_LABEL(ret, lfinish[1]);
} }
ADD_LABEL(ret, lfinish[0]); ADD_LABEL(ret, lfinish[0]);
} }