archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert r34538.

Browse source 
* backport 33935,33936,33987 (fix private constant)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-02-10 21:32:02 +00:00
parent d14b60fff0
commit c0cdff2c0f
3 changed files with 4 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

34
test/ruby/test_module.rb
View file

@ -1019,19 +1019,6 @@ class TestModule < Test::Unit::TestCase
assert_raise(NameError) { c::FOO }
end
def test_private_constant2
c = Class.new
c.const_set(:FOO, "foo")
c.const_set(:BAR, "bar")
assert_equal("foo", c::FOO)
assert_equal("bar", c::BAR)
c.private_constant(:FOO, :BAR)
assert_raise(NameError) { c::FOO }
assert_raise(NameError) { c::BAR }
assert_equal("foo", c.class_eval("FOO"))
assert_equal("bar", c.class_eval("BAR"))
end
class PrivateClass
end
private_constant :PrivateClass
@ -1079,27 +1066,6 @@ class TestModule < Test::Unit::TestCase
assert_in_out_err([], src, %w(Object :ok), [])
end
def test_private_constants_clear_inlinecache
bug5702 = '[ruby-dev:44929]'
src = <<-INPUT
class A
C = :Const
def self.get_C
A::C
end
# fill cache
A.get_C
private_constant :C, :D rescue nil
begin
A.get_C
rescue NameError
puts "A.get_C"
end
end
INPUT
assert_in_out_err([], src, %w(A.get_C), [], bug5702)
end
def test_constant_lookup_in_method_defined_by_class_eval
src = <<-INPUT
class A

17
variable.c
View file

@ -1952,22 +1952,13 @@ set_const_visibility(VALUE mod, int argc, VALUE *argv, rb_const_flag_t flag)
"Insecure: can't change constant visibility");
}
if (argc == 0) {
rb_warning("%s with no argument is just ignored", rb_id2name(rb_frame_callee()));
}
for (i = 0; i < argc; i++) {
VALUE val = argv[i];
id = rb_to_id(&val);
if (RCLASS_CONST_TBL(mod) &&
st_lookup(RCLASS_CONST_TBL(mod), (st_data_t)id, &v)) {
id = rb_to_id(argv[i]);
if (RCLASS_CONST_TBL(mod) && st_lookup(RCLASS_CONST_TBL(mod), (st_data_t)id, &v)) {
((rb_const_entry_t*)v)->flag = flag;
return;
}
else {
if ( i > 0 )
rb_clear_cache_by_class(mod);
rb_name_error(id, "constant %s::%s not defined", rb_class2name(mod), rb_id2name(id));
}
rb_name_error(id, "constant %s::%s not defined", rb_class2name(mod), rb_id2name(id));
}
rb_clear_cache_by_class(mod);
}

5
vm_method.c
View file

@ -961,11 +961,6 @@ set_method_visibility(VALUE self, int argc, VALUE *argv, rb_method_flag_t ex)
{
int i;
secure_visibility(self);
if (argc == 0) {
rb_warning("%s with no argument is just ignored", rb_id2name(rb_frame_callee()));
}
for (i = 0; i < argc; i++) {
rb_export_method(self, rb_to_id(argv[i]), ex);
}