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

* vm_eval.c (eval_string_with_cref): copy cref to limit the scope of

Browse source 
refienements in the eval string. [ruby-core:56329] [Bug #8722]

* test/ruby/test_refinement.rb: related test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2013-08-06 07:15:18 +00:00
parent c837fe4056
commit d622818377
3 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Tue Aug 6 16:14:32 2013 Shugo Maeda <shugo@ruby-lang.org>
* vm_eval.c (eval_string_with_cref): copy cref to limit the scope of
refienements in the eval string. [ruby-core:56329] [Bug #8722]
* test/ruby/test_refinement.rb: related test.
Tue Aug 6 12:23:12 2013 Tanaka Akira <akr@fsij.org> Tue Aug 6 12:23:12 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (rb_big_realloc): Use VALGRIND_MAKE_MEM_UNDEFINED to * bignum.c (rb_big_realloc): Use VALGRIND_MAKE_MEM_UNDEFINED to

32
test/ruby/test_refinement.rb
View file

@ -929,6 +929,38 @@ class TestRefinement < Test::Unit::TestCase
assert_equal("FooExt2#y Foo#y", FooFoo2ExtClient.invoke_y_on(foo)) assert_equal("FooExt2#y Foo#y", FooFoo2ExtClient.invoke_y_on(foo))
end end
def test_eval_scoping
assert_in_out_err([], <<-INPUT, ["HELLO WORLD", "dlrow olleh", "HELLO WORLD"], [])
module M
refine String do
def upcase
reverse
end
end
end
puts "hello world".upcase
puts eval(%{using M; "hello world".upcase})
puts "hello world".upcase
INPUT
end
def test_eval_with_binding_scoping
assert_in_out_err([], <<-INPUT, ["HELLO WORLD", "dlrow olleh", "HELLO WORLD"], [])
module M
refine String do
def upcase
reverse
end
end
end
puts "hello world".upcase
puts eval(%{using M; "hello world".upcase}, TOPLEVEL_BINDING)
puts eval(%{"hello world".upcase}, TOPLEVEL_BINDING)
INPUT
end
private private
def eval_using(mod, s) def eval_using(mod, s)

9
vm_eval.c
View file

@ -1186,6 +1186,8 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, volatile V
rb_block_t block, *base_block; rb_block_t block, *base_block;
volatile int parse_in_eval; volatile int parse_in_eval;
volatile int mild_compile_error; volatile int mild_compile_error;
NODE *orig_cref;
VALUE crefval;
if (file == 0) { if (file == 0) {
file = rb_sourcefilename(); file = rb_sourcefilename();
@ -1243,7 +1245,14 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, volatile V
th->mild_compile_error--; th->mild_compile_error--;
th->parse_in_eval--; th->parse_in_eval--;
if (!cref && base_block->iseq) {
orig_cref = rb_vm_get_cref(base_block->iseq, base_block->ep);
cref = NEW_CREF(Qnil);
crefval = (VALUE) cref;
COPY_CREF(cref, orig_cref);
}
vm_set_eval_stack(th, iseqval, cref, base_block); vm_set_eval_stack(th, iseqval, cref, base_block);
RB_GC_GUARD(crefval);
if (0) { /* for debug */ if (0) { /* for debug */
VALUE disasm = rb_iseq_disasm(iseqval); VALUE disasm = rb_iseq_disasm(iseqval);