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

compile.c: make the receiver condition cleaner

Browse source 
* compile.c (defined_expr): make the condition if the receiver
  is explicit or implicit cleaner.  [fix GH-681]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-07-25 03:21:12 +00:00
parent e7ce17cfe8
commit 97e37d6805
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jul 25 12:21:11 2014 Santiago Pastorino <santiago@wyeworks.com>
* compile.c (defined_expr): make the condition if the receiver
is explicit or implicit cleaner. [fix GH-681]
Fri Jul 25 03:53:52 2014 Eric Hodel <drbrain@segment7.net>
* doc/keywords.rdoc: [DOC] Describe each keyword.

15
compile.c
View file

@ -2899,17 +2899,10 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
case NODE_VCALL:
case NODE_FCALL:
case NODE_ATTRASGN:{
int self = TRUE;
const int explicit_receiver =
(type == NODE_CALL ||
(type == NODE_ATTRASGN && !private_recv_p(node)));
switch (type) {
case NODE_ATTRASGN:
if (private_recv_p(node)) break;
case NODE_CALL:
self = FALSE;
break;
default:
/* through */;
}
if (!lfinish[1]) {
lfinish[1] = NEW_LABEL(nd_line(node));
}
@ -2917,7 +2910,7 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
defined_expr(iseq, ret, node->nd_args, lfinish, Qfalse);
ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
}
if (!self) {
if (explicit_receiver) {
defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse);
ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
COMPILE(ret, "defined/recv", node->nd_recv);