kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

* vm_insnhelper.c (vm_get_ev_const): should ignore crefs with 

the NODE_FL_CREF_PUSHED_BY_EVAL flag.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31222 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2011-03-31 09:07:42 +00:00
parent 4273aa8e72
commit 7487298584
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Mar 31 18:06:12 2011 Shugo Maeda <shugo@ruby-lang.org>
* vm_insnhelper.c (vm_get_ev_const): should ignore crefs with
the NODE_FL_CREF_PUSHED_BY_EVAL flag.
Thu Mar 31 16:49:56 2011 Shugo Maeda <shugo@ruby-lang.org>
* vm_insnhelper.c (vm_get_ev_const): search root cref properly.

19
test/ruby/test_module.rb
View File

@ -1049,4 +1049,23 @@ class TestModule < Test::Unit::TestCase
INPUT
assert_in_out_err([], src, ["uninitialized constant A"], [])
end
def test_constant_lookup_in_module_in_class_eval
src = <<-INPUT
class A
B = 42
end
A.class_eval do
module C
begin
B
rescue NameError
puts "NameError"
end
end
end
INPUT
assert_in_out_err([], src, ["NameError"], [])
end
end

7
vm_insnhelper.c
View File

@ -1164,7 +1164,12 @@ vm_get_ev_const(rb_thread_t *th, const rb_iseq_t *iseq,
}
cref = root_cref;
while (cref && cref->nd_next) {
klass = cref->nd_clss;
if (cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL) {
klass = Qnil;
}
else {
klass = cref->nd_clss;
}
cref = cref->nd_next;
if (!NIL_P(klass)) {