1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow calling a private accessor with self.

Browse Source 
[Feature #11297] [Feature #16123]
This commit is contained in:
Nobuyoshi Nakada 2019-09-20 02:17:58 +09:00
parent d583df5259
commit e6378cdcd8
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
Notes: git 2019-09-20 03:25:06 +09:00 
Merged: https://github.com/ruby/ruby/pull/2474
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compile.c
View File

@ -7104,8 +7104,8 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
CHECK(!NIL_P(argc)); CHECK(!NIL_P(argc));
} }
ADD_INSN1(ret, line, dupn, FIXNUM_INC(argc, 1 + boff)); ADD_INSN1(ret, line, dupn, FIXNUM_INC(argc, 1 + boff));
flag |= asgnflag;
ADD_SEND_WITH_FLAG(ret, line, idAREF, argc, INT2FIX(flag)); ADD_SEND_WITH_FLAG(ret, line, idAREF, argc, INT2FIX(flag));
flag |= asgnflag;
if (id == idOROP || id == idANDOP) { if (id == idOROP || id == idANDOP) {
/* a[x] ||= y or a[x] &&= y /* a[x] ||= y or a[x] &&= y
@ -7249,7 +7249,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
ADD_INSNL(ret, line, branchnil, lskip); ADD_INSNL(ret, line, branchnil, lskip);
} }
ADD_INSN(ret, line, dup); ADD_INSN(ret, line, dup);
ADD_SEND(ret, line, vid, INT2FIX(0)); ADD_SEND_WITH_FLAG(ret, line, vid, INT2FIX(0), INT2FIX(asgnflag));
if (atype == idOROP || atype == idANDOP) { if (atype == idOROP || atype == idANDOP) {
ADD_INSN(ret, line, dup); ADD_INSN(ret, line, dup);
@ -8257,7 +8257,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
ADD_INSN1(ret, line, topn, INT2FIX(1)); ADD_INSN1(ret, line, topn, INT2FIX(1));
if (flag & VM_CALL_ARGS_SPLAT) { if (flag & VM_CALL_ARGS_SPLAT) {
ADD_INSN1(ret, line, putobject, INT2FIX(-1)); ADD_INSN1(ret, line, putobject, INT2FIX(-1));
ADD_SEND(ret, line, idAREF, INT2FIX(1)); ADD_SEND_WITH_FLAG(ret, line, idAREF, INT2FIX(1), INT2FIX(asgnflag));
} }
ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 3)); ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 3));
ADD_INSN (ret, line, pop); ADD_INSN (ret, line, pop);
@ -8265,7 +8265,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
else if (flag & VM_CALL_ARGS_SPLAT) { else if (flag & VM_CALL_ARGS_SPLAT) {
ADD_INSN(ret, line, dup); ADD_INSN(ret, line, dup);
ADD_INSN1(ret, line, putobject, INT2FIX(-1)); ADD_INSN1(ret, line, putobject, INT2FIX(-1));
ADD_SEND(ret, line, idAREF, INT2FIX(1)); ADD_SEND_WITH_FLAG(ret, line, idAREF, INT2FIX(1), INT2FIX(asgnflag));
ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2)); ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2));
ADD_INSN (ret, line, pop); ADD_INSN (ret, line, pop);
} }

3
spec/ruby/language/fixtures/send.rb
View File

@ -53,8 +53,9 @@ module LangSendSpecs
end end
class PrivateGetter class PrivateGetter
attr_reader :foo attr_accessor :foo
private :foo private :foo
private :foo=
def call_self_foo def call_self_foo
self.foo self.foo

1
spec/ruby/language/send_spec.rb
View File

@ -269,6 +269,7 @@ describe "Invoking a private getter method" do
it "permits self as a receiver" do it "permits self as a receiver" do
receiver = LangSendSpecs::PrivateGetter.new receiver = LangSendSpecs::PrivateGetter.new
-> { receiver.call_self_foo }.should_not raise_error(NoMethodError) -> { receiver.call_self_foo }.should_not raise_error(NoMethodError)
-> { receiver.call_self_foo_or_equals(6) }.should_not raise_error(NoMethodError)
end end
end end
end end

8
test/ruby/test_assignment.rb
View File

@ -133,17 +133,17 @@ class TestAssignment < Test::Unit::TestCase
assert_equal(1, o.instance_eval {self[0] = 1}) assert_equal(1, o.instance_eval {self[0] = 1})
} }
assert_raise(NoMethodError, bug11096) { assert_nothing_raised(NoMethodError) {
o.instance_eval {self.foo += 1} o.instance_eval {self.foo += 1}
} }
assert_raise(NoMethodError, bug11096) { assert_nothing_raised(NoMethodError) {
o.instance_eval {self.foo &&= 1} o.instance_eval {self.foo &&= 1}
} }
assert_raise(NoMethodError, bug11096) { assert_nothing_raised(NoMethodError) {
o.instance_eval {self[0] += 1} o.instance_eval {self[0] += 1}
} }
assert_raise(NoMethodError, bug11096) { assert_nothing_raised(NoMethodError) {
o.instance_eval {self[0] &&= 1} o.instance_eval {self[0] &&= 1}
} }
end end