1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Respect visibility in non-array Enumerable#inject [Bug #13592]

This commit is contained in:
Nobuyoshi Nakada 2020-07-24 21:08:50 +09:00
parent 2735da2039
commit 3ead2770a1
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
2 changed files with 57 additions and 1 deletions

2
enum.c
View file

@ -734,7 +734,7 @@ inject_op_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
}
else if (SYMBOL_P(name = memo->u3.value)) {
const ID mid = SYM2ID(name);
MEMO_V1_SET(memo, rb_funcallv(memo->v1, mid, 1, &i));
MEMO_V1_SET(memo, rb_funcallv_public(memo->v1, mid, 1, &i));
}
else {
VALUE args[2];

View file

@ -239,6 +239,62 @@ class TestEnumerable < Test::Unit::TestCase
assert_equal(2.0+3.0i, [2.0, 3.0i].inject(:+))
end
def test_inject_op_redefined
assert_separately([], "#{<<~"end;"}\n""end")
k = Class.new do
include Enumerable
def each
yield 1
yield 2
yield 3
end
end
all_assertions_foreach("", *%i[+ * / - %]) do |op|
bug = '[ruby-dev:49510] [Bug#12178] should respect redefinition'
begin
Integer.class_eval do
alias_method :orig, op
define_method(op) do |x|
0
end
end
assert_equal(0, k.new.inject(op), bug)
ensure
Integer.class_eval do
undef_method op
alias_method op, :orig
end
end
end;
end
def test_inject_op_private
assert_separately([], "#{<<~"end;"}\n""end")
k = Class.new do
include Enumerable
def each
yield 1
yield 2
yield 3
end
end
all_assertions_foreach("", *%i[+ * / - %]) do |op|
bug = '[ruby-core:81349] [Bug #13592] should respect visibility'
assert_raise_with_message(NoMethodError, /private method/, bug) do
begin
Integer.class_eval do
private op
end
k.new.inject(op)
ensure
Integer.class_eval do
public op
end
end
end
end;
end
def test_inject_array_op_redefined
assert_separately([], "#{<<~"end;"}\n""end")
all_assertions_foreach("", *%i[+ * / - %]) do |op|