Backport #5702 » bug5702.patch
| ChangeLog (revision 34538) | ||
|---|---|---|
|
Sat Feb 11 02:39:09 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
|
||
|
* variable.c (set_const_visibility): clear inine-cache when constant's
|
||
|
visibility is modified. [ruby-dev:44929]
|
||
|
* test/ruby/test_module.rb (test_private_constants_clear_inlinecache):
|
||
|
add test for it.
|
||
|
Sat Feb 11 02:39:09 2012 Yusuke Endoh <mame@tsg.ne.jp>
|
||
|
* variable.c (set_const_visibility): print a warning when no argument
|
||
|
is passwd to Module#private_constant. [ruby-list:48558]
|
||
|
* vm_method.c (set_method_visibility): ditto for
|
||
|
Module#private_class_method.
|
||
|
Sat Feb 11 02:39:09 2012 Yusuke Endoh <mame@tsg.ne.jp>
|
||
|
* variable.c (set_const_visibility): Module#private_constant has
|
||
|
changed the visibility of only the first argument. Now it changes
|
||
|
all of them. [ruby-list:48558]
|
||
|
* test/ruby/test_module.rb: add a test for above.
|
||
|
Sat Feb 11 02:26:51 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
|
||
|
* lib/openssl/buffering.rb: Force multi-byte strings to be treated as
|
||
| variable.c (revision 34538) | ||
|---|---|---|
|
"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++) {
|
||
|
id = rb_to_id(argv[i]);
|
||
|
if (RCLASS_CONST_TBL(mod) && st_lookup(RCLASS_CONST_TBL(mod), (st_data_t)id, &v)) {
|
||
|
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)) {
|
||
|
((rb_const_entry_t*)v)->flag = flag;
|
||
|
return;
|
||
|
}
|
||
|
rb_name_error(id, "constant %s::%s not defined", rb_class2name(mod), rb_id2name(id));
|
||
|
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_clear_cache_by_class(mod);
|
||
|
}
|
||
| vm_method.c (revision 34538) | ||
|---|---|---|
|
{
|
||
|
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);
|
||
|
}
|
||
| version.h (revision 34538) | ||
|---|---|---|
|
#define RUBY_VERSION "1.9.3"
|
||
|
#define RUBY_PATCHLEVEL 83
|
||
|
#define RUBY_PATCHLEVEL 84
|
||
|
#define RUBY_RELEASE_DATE "2012-02-11"
|
||
|
#define RUBY_RELEASE_YEAR 2012
|
||
| test/ruby/test_module.rb (revision 34538) | ||
|---|---|---|
|
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
|
||
| ... | ... | |
|
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
|
||
- « Previous
- 1
- 2
- Next »