зеркало из https://github.com/github/ruby.git
* expand tabs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
1bdd422b93
Коммит
4a6f763330
58
compile.c
58
compile.c
|
@ -4516,9 +4516,9 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
|
|||
defined_expr0(iseq, ret, vals->nd_head, lfinish, Qfalse);
|
||||
|
||||
if (!lfinish[1]) {
|
||||
lfinish[1] = NEW_LABEL(line);
|
||||
lfinish[1] = NEW_LABEL(line);
|
||||
}
|
||||
ADD_INSNL(ret, line, branchunless, lfinish[1]);
|
||||
ADD_INSNL(ret, line, branchunless, lfinish[1]);
|
||||
} while ((vals = vals->nd_next) != NULL);
|
||||
}
|
||||
case NODE_STR:
|
||||
|
@ -4537,44 +4537,44 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
|
|||
break;
|
||||
|
||||
case NODE_IVAR:
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_IVAR),
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_IVAR),
|
||||
ID2SYM(node->nd_vid), needstr);
|
||||
return 1;
|
||||
|
||||
case NODE_GVAR:
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_GVAR),
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_GVAR),
|
||||
ID2SYM(node->nd_entry->id), needstr);
|
||||
return 1;
|
||||
|
||||
case NODE_CVAR:
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CVAR),
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CVAR),
|
||||
ID2SYM(node->nd_vid), needstr);
|
||||
return 1;
|
||||
|
||||
case NODE_CONST:
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CONST),
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CONST),
|
||||
ID2SYM(node->nd_vid), needstr);
|
||||
return 1;
|
||||
case NODE_COLON2:
|
||||
if (!lfinish[1]) {
|
||||
lfinish[1] = NEW_LABEL(line);
|
||||
lfinish[1] = NEW_LABEL(line);
|
||||
}
|
||||
defined_expr0(iseq, ret, node->nd_head, lfinish, Qfalse);
|
||||
ADD_INSNL(ret, line, branchunless, lfinish[1]);
|
||||
ADD_INSNL(ret, line, branchunless, lfinish[1]);
|
||||
COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
|
||||
|
||||
ADD_INSN3(ret, line, defined,
|
||||
ADD_INSN3(ret, line, defined,
|
||||
(rb_is_const_id(node->nd_mid) ?
|
||||
INT2FIX(DEFINED_CONST) : INT2FIX(DEFINED_METHOD)),
|
||||
ID2SYM(node->nd_mid), needstr);
|
||||
return 1;
|
||||
case NODE_COLON3:
|
||||
ADD_INSN1(ret, line, putobject, rb_cObject);
|
||||
ADD_INSN3(ret, line, defined,
|
||||
ADD_INSN1(ret, line, putobject, rb_cObject);
|
||||
ADD_INSN3(ret, line, defined,
|
||||
INT2FIX(DEFINED_CONST), ID2SYM(node->nd_mid), needstr);
|
||||
return 1;
|
||||
|
||||
|
@ -4589,45 +4589,45 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
|
|||
(type == NODE_ATTRASGN && !private_recv_p(node)));
|
||||
|
||||
if (!lfinish[1] && (node->nd_args || explicit_receiver)) {
|
||||
lfinish[1] = NEW_LABEL(line);
|
||||
lfinish[1] = NEW_LABEL(line);
|
||||
}
|
||||
if (node->nd_args) {
|
||||
defined_expr0(iseq, ret, node->nd_args, lfinish, Qfalse);
|
||||
ADD_INSNL(ret, line, branchunless, lfinish[1]);
|
||||
ADD_INSNL(ret, line, branchunless, lfinish[1]);
|
||||
}
|
||||
if (explicit_receiver) {
|
||||
defined_expr0(iseq, ret, node->nd_recv, lfinish, Qfalse);
|
||||
ADD_INSNL(ret, line, branchunless, lfinish[1]);
|
||||
ADD_INSNL(ret, line, branchunless, lfinish[1]);
|
||||
COMPILE(ret, "defined/recv", node->nd_recv);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_METHOD),
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_METHOD),
|
||||
ID2SYM(node->nd_mid), needstr);
|
||||
}
|
||||
else {
|
||||
ADD_INSN(ret, line, putself);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_FUNC),
|
||||
ADD_INSN(ret, line, putself);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_FUNC),
|
||||
ID2SYM(node->nd_mid), needstr);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
case NODE_YIELD:
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_YIELD), 0,
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_YIELD), 0,
|
||||
needstr);
|
||||
return 1;
|
||||
|
||||
case NODE_BACK_REF:
|
||||
case NODE_NTH_REF:
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_REF),
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_REF),
|
||||
INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)),
|
||||
needstr);
|
||||
return 1;
|
||||
|
||||
case NODE_SUPER:
|
||||
case NODE_ZSUPER:
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_ZSUPER), 0,
|
||||
ADD_INSN(ret, line, putnil);
|
||||
ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_ZSUPER), 0,
|
||||
needstr);
|
||||
return 1;
|
||||
|
||||
|
@ -4650,10 +4650,10 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
|
|||
if (expr_type) {
|
||||
if (needstr != Qfalse) {
|
||||
VALUE str = rb_iseq_defined_string(expr_type);
|
||||
ADD_INSN1(ret, line, putobject, str);
|
||||
ADD_INSN1(ret, line, putobject, str);
|
||||
}
|
||||
else {
|
||||
ADD_INSN1(ret, line, putobject, Qtrue);
|
||||
ADD_INSN1(ret, line, putobject, Qtrue);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче