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

node.[ch], parse.y, compile.c: rename nd_column to nd_first_column

Browse Source 
nd_set_column -> nd_first_set_column
nd_lineno -> nd_first_lineno
nd_set_lineno -> nd_first_set_lineno

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2017-12-14 06:02:26 +00:00
parent bf9c947dd8
commit ad12b5c285
4 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
compile.c
View File

@ -4512,8 +4512,8 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int
const NODE *const node_else = type == NODE_IF ? node->nd_else : node->nd_body; const NODE *const node_else = type == NODE_IF ? node->nd_else : node->nd_body;
const int line = nd_line(node); const int line = nd_line(node);
const int lineno = nd_lineno(node); const int lineno = nd_first_lineno(node);
const int column = nd_column(node); const int column = nd_first_column(node);
const int last_lineno = nd_last_lineno(node); const int last_lineno = nd_last_lineno(node);
const int last_column = nd_last_column(node); const int last_column = nd_last_column(node);
DECL_ANCHOR(cond_seq); DECL_ANCHOR(cond_seq);
@ -4545,8 +4545,8 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int
if (else_label->refcnt) { if (else_label->refcnt) {
ADD_TRACE_BRANCH_COVERAGE( ADD_TRACE_BRANCH_COVERAGE(
ret, ret,
node_body ? nd_lineno(node_body) : lineno, node_body ? nd_first_lineno(node_body) : lineno,
node_body ? nd_column(node_body) : column, node_body ? nd_first_column(node_body) : column,
node_body ? nd_last_lineno(node_body) : last_lineno, node_body ? nd_last_lineno(node_body) : last_lineno,
node_body ? nd_last_column(node_body) : last_column, node_body ? nd_last_column(node_body) : last_column,
type == NODE_IF ? "then" : "else", type == NODE_IF ? "then" : "else",
@ -4562,8 +4562,8 @@ compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int
if (then_label->refcnt) { if (then_label->refcnt) {
ADD_TRACE_BRANCH_COVERAGE( ADD_TRACE_BRANCH_COVERAGE(
ret, ret,
node_else ? nd_lineno(node_else) : lineno, node_else ? nd_first_lineno(node_else) : lineno,
node_else ? nd_column(node_else) : column, node_else ? nd_first_column(node_else) : column,
node_else ? nd_last_lineno(node_else) : last_lineno, node_else ? nd_last_lineno(node_else) : last_lineno,
node_else ? nd_last_column(node_else) : last_column, node_else ? nd_last_column(node_else) : last_column,
type == NODE_IF ? "else" : "then", type == NODE_IF ? "else" : "then",
@ -4602,13 +4602,13 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
CHECK(COMPILE(head, "case base", node->nd_head)); CHECK(COMPILE(head, "case base", node->nd_head));
DECL_BRANCH_BASE(branches, nd_lineno(node), nd_column(node), nd_last_lineno(node), nd_last_column(node), "case"); DECL_BRANCH_BASE(branches, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "case");
node = node->nd_body; node = node->nd_body;
type = nd_type(node); type = nd_type(node);
line = nd_line(node); line = nd_line(node);
lineno = nd_lineno(node); lineno = nd_first_lineno(node);
column = nd_column(node); column = nd_first_column(node);
last_lineno = nd_last_lineno(node); last_lineno = nd_last_lineno(node);
last_column = nd_last_column(node); last_column = nd_last_column(node);
@ -4630,8 +4630,8 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
ADD_INSN(body_seq, line, pop); ADD_INSN(body_seq, line, pop);
ADD_TRACE_BRANCH_COVERAGE( ADD_TRACE_BRANCH_COVERAGE(
body_seq, body_seq,
node->nd_body ? nd_lineno(node->nd_body) : lineno, node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
node->nd_body ? nd_column(node->nd_body) : column, node->nd_body ? nd_first_column(node->nd_body) : column,
node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno, node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno,
node->nd_body ? nd_last_column(node->nd_body) : last_column, node->nd_body ? nd_last_column(node->nd_body) : last_column,
"when", "when",
@ -4668,8 +4668,8 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
} }
type = nd_type(node); type = nd_type(node);
line = nd_line(node); line = nd_line(node);
lineno = nd_lineno(node); lineno = nd_first_lineno(node);
column = nd_column(node); column = nd_first_column(node);
last_lineno = nd_last_lineno(node); last_lineno = nd_last_lineno(node);
last_column = nd_last_column(node); last_column = nd_last_column(node);
} }
@ -4677,7 +4677,7 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
if (node) { if (node) {
ADD_LABEL(cond_seq, elselabel); ADD_LABEL(cond_seq, elselabel);
ADD_INSN(cond_seq, line, pop); ADD_INSN(cond_seq, line, pop);
ADD_TRACE_BRANCH_COVERAGE(cond_seq, nd_lineno(node), nd_column(node), nd_last_lineno(node), nd_last_column(node), "else", branches); ADD_TRACE_BRANCH_COVERAGE(cond_seq, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "else", branches);
CHECK(COMPILE_(cond_seq, "else", node, popped)); CHECK(COMPILE_(cond_seq, "else", node, popped));
ADD_INSNL(cond_seq, line, jump, endlabel); ADD_INSNL(cond_seq, line, jump, endlabel);
} }
@ -4685,7 +4685,7 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
debugs("== else (implicit)\n"); debugs("== else (implicit)\n");
ADD_LABEL(cond_seq, elselabel); ADD_LABEL(cond_seq, elselabel);
ADD_INSN(cond_seq, nd_line(orig_node), pop); ADD_INSN(cond_seq, nd_line(orig_node), pop);
ADD_TRACE_BRANCH_COVERAGE(cond_seq, nd_lineno(orig_node), nd_column(orig_node), nd_last_lineno(orig_node), nd_last_column(orig_node), "else", branches); ADD_TRACE_BRANCH_COVERAGE(cond_seq, nd_first_lineno(orig_node), nd_first_column(orig_node), nd_last_lineno(orig_node), nd_last_column(orig_node), "else", branches);
if (!popped) { if (!popped) {
ADD_INSN(cond_seq, nd_line(orig_node), putnil); ADD_INSN(cond_seq, nd_line(orig_node), putnil);
} }
@ -4716,23 +4716,23 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
DECL_ANCHOR(body_seq); DECL_ANCHOR(body_seq);
VALUE branches = 0; VALUE branches = 0;
DECL_BRANCH_BASE(branches, nd_lineno(orig_node), nd_column(orig_node), nd_last_lineno(orig_node), nd_last_column(orig_node), "case"); DECL_BRANCH_BASE(branches, nd_first_lineno(orig_node), nd_first_column(orig_node), nd_last_lineno(orig_node), nd_last_column(orig_node), "case");
INIT_ANCHOR(body_seq); INIT_ANCHOR(body_seq);
endlabel = NEW_LABEL(nd_line(node)); endlabel = NEW_LABEL(nd_line(node));
while (node && nd_type(node) == NODE_WHEN) { while (node && nd_type(node) == NODE_WHEN) {
const int line = nd_line(node); const int line = nd_line(node);
const int lineno = nd_lineno(node); const int lineno = nd_first_lineno(node);
const int column = nd_column(node); const int column = nd_first_column(node);
const int last_lineno = nd_last_lineno(node); const int last_lineno = nd_last_lineno(node);
const int last_column = nd_last_column(node); const int last_column = nd_last_column(node);
LABEL *l1 = NEW_LABEL(line); LABEL *l1 = NEW_LABEL(line);
ADD_LABEL(body_seq, l1); ADD_LABEL(body_seq, l1);
ADD_TRACE_BRANCH_COVERAGE( ADD_TRACE_BRANCH_COVERAGE(
body_seq, body_seq,
node->nd_body ? nd_lineno(node->nd_body) : lineno, node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
node->nd_body ? nd_column(node->nd_body) : column, node->nd_body ? nd_first_column(node->nd_body) : column,
node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno, node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno,
node->nd_body ? nd_last_column(node->nd_body) : last_column, node->nd_body ? nd_last_column(node->nd_body) : last_column,
"when", "when",
@ -4770,8 +4770,8 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
/* else */ /* else */
ADD_TRACE_BRANCH_COVERAGE( ADD_TRACE_BRANCH_COVERAGE(
ret, ret,
node ? nd_lineno(node) : nd_lineno(orig_node), node ? nd_first_lineno(node) : nd_first_lineno(orig_node),
node ? nd_column(node) : nd_column(orig_node), node ? nd_first_column(node) : nd_first_column(orig_node),
node ? nd_last_lineno(node) : nd_last_lineno(orig_node), node ? nd_last_lineno(node) : nd_last_lineno(orig_node),
node ? nd_last_column(node) : nd_last_column(orig_node), node ? nd_last_column(node) : nd_last_column(orig_node),
"else", "else",
@ -4788,8 +4788,8 @@ static int
compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const enum node_type type) compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const enum node_type type)
{ {
const int line = (int)nd_line(node); const int line = (int)nd_line(node);
const int lineno = nd_lineno(node); const int lineno = nd_first_lineno(node);
const int column = nd_column(node); const int column = nd_first_column(node);
const int last_lineno = nd_last_lineno(node); const int last_lineno = nd_last_lineno(node);
const int last_column = nd_last_column(node); const int last_column = nd_last_column(node);
LABEL *prev_start_label = ISEQ_COMPILE_DATA(iseq)->start_label; LABEL *prev_start_label = ISEQ_COMPILE_DATA(iseq)->start_label;
@ -4830,8 +4830,8 @@ compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
DECL_BRANCH_BASE(branches, lineno, column, last_lineno, last_column, type == NODE_WHILE ? "while" : "until"); DECL_BRANCH_BASE(branches, lineno, column, last_lineno, last_column, type == NODE_WHILE ? "while" : "until");
ADD_TRACE_BRANCH_COVERAGE( ADD_TRACE_BRANCH_COVERAGE(
ret, ret,
node->nd_body ? nd_lineno(node->nd_body) : lineno, node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
node->nd_body ? nd_column(node->nd_body) : column, node->nd_body ? nd_first_column(node->nd_body) : column,
node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno, node->nd_body ? nd_last_lineno(node->nd_body) : last_lineno,
node->nd_body ? nd_last_column(node->nd_body) : last_column, node->nd_body ? nd_last_column(node->nd_body) : last_column,
"body", "body",
@ -6080,10 +6080,10 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
else_label = NEW_LABEL(line); else_label = NEW_LABEL(line);
end_label = NEW_LABEL(line); end_label = NEW_LABEL(line);
DECL_BRANCH_BASE(branches, nd_lineno(node), nd_column(node), nd_last_lineno(node), nd_last_column(node), "&."); DECL_BRANCH_BASE(branches, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "&.");
ADD_INSN(recv, line, dup); ADD_INSN(recv, line, dup);
ADD_INSNL(recv, line, branchnil, else_label); ADD_INSNL(recv, line, branchnil, else_label);
ADD_TRACE_BRANCH_COVERAGE(recv, nd_lineno(node), nd_column(node), nd_last_lineno(node), nd_last_column(node), "then", branches); ADD_TRACE_BRANCH_COVERAGE(recv, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "then", branches);
} }
} }
else if (type == NODE_FCALL || type == NODE_VCALL) { else if (type == NODE_FCALL || type == NODE_VCALL) {
@ -6118,7 +6118,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
if (else_label && end_label) { if (else_label && end_label) {
ADD_INSNL(ret, line, jump, end_label); ADD_INSNL(ret, line, jump, end_label);
ADD_LABEL(ret, else_label); ADD_LABEL(ret, else_label);
ADD_TRACE_BRANCH_COVERAGE(ret, nd_lineno(node), nd_column(node), nd_last_lineno(node), nd_last_column(node), "else", branches); ADD_TRACE_BRANCH_COVERAGE(ret, nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node), "else", branches);
ADD_LABEL(ret, end_label); ADD_LABEL(ret, end_label);
} }
if (popped) { if (popped) {

2
node.c
View File

@ -24,7 +24,7 @@
#define A_LIT(lit) AR(rb_inspect(lit)) #define A_LIT(lit) AR(rb_inspect(lit))
#define A_NODE_HEADER(node, term) \ #define A_NODE_HEADER(node, term) \
rb_str_catf(buf, "@ %s (line: %d, code_range: (%d,%d)-(%d,%d))"term, \ rb_str_catf(buf, "@ %s (line: %d, code_range: (%d,%d)-(%d,%d))"term, \
ruby_node_name(nd_type(node)), nd_line(node), nd_lineno(node), nd_column(node), nd_last_lineno(node), nd_last_column(node)) ruby_node_name(nd_type(node)), nd_line(node), nd_first_lineno(node), nd_first_column(node), nd_last_lineno(node), nd_last_column(node))
#define A_FIELD_HEADER(len, name, term) \ #define A_FIELD_HEADER(len, name, term) \
rb_str_catf(buf, "+- %.*s:"term, (len), (name)) rb_str_catf(buf, "+- %.*s:"term, (len), (name))
#define D_FIELD_HEADER(len, name, term) (A_INDENT, A_FIELD_HEADER(len, name, term)) #define D_FIELD_HEADER(len, name, term) (A_INDENT, A_FIELD_HEADER(len, name, term))

8
node.h
View File

@ -281,10 +281,10 @@ typedef struct RNode {
#define nd_set_line(n,l) \ #define nd_set_line(n,l) \
(n)->flags=(((n)->flags&~((VALUE)(-1)<<NODE_LSHIFT))|((VALUE)((l)&NODE_LMASK)<<NODE_LSHIFT)) (n)->flags=(((n)->flags&~((VALUE)(-1)<<NODE_LSHIFT))|((VALUE)((l)&NODE_LMASK)<<NODE_LSHIFT))
#define nd_column(n) ((int)((n)->nd_loc.first_loc.column)) #define nd_first_column(n) ((int)((n)->nd_loc.first_loc.column))
#define nd_set_column(n, v) ((n)->nd_loc.first_loc.column = (v)) #define nd_set_first_column(n, v) ((n)->nd_loc.first_loc.column = (v))
#define nd_lineno(n) ((int)((n)->nd_loc.first_loc.lineno)) #define nd_first_lineno(n) ((int)((n)->nd_loc.first_loc.lineno))
#define nd_set_lineno(n, v) ((n)->nd_loc.first_loc.lineno = (v)) #define nd_set_first_lineno(n, v) ((n)->nd_loc.first_loc.lineno = (v))
#define nd_last_column(n) ((int)((n)->nd_loc.last_loc.column)) #define nd_last_column(n) ((int)((n)->nd_loc.last_loc.column))
#define nd_set_last_column(n, v) ((n)->nd_loc.last_loc.column = (v)) #define nd_set_last_column(n, v) ((n)->nd_loc.last_loc.column = (v))

8
parse.y
View File

@ -8955,8 +8955,8 @@ node_newnode(struct parser_params *parser, enum node_type type, VALUE a0, VALUE
nd_set_line(n, ruby_sourceline); nd_set_line(n, ruby_sourceline);
/* mark not cared lineno to 0 and column to -1 */ /* mark not cared lineno to 0 and column to -1 */
nd_set_lineno(n, 0); nd_set_first_lineno(n, 0);
nd_set_column(n, -1); nd_set_first_column(n, -1);
nd_set_last_lineno(n, 0); nd_set_last_lineno(n, 0);
nd_set_last_column(n, -1); nd_set_last_column(n, -1);
return n; return n;
@ -10798,8 +10798,8 @@ arg_blk_pass(NODE *node1, NODE *node2)
{ {
if (node2) { if (node2) {
node2->nd_head = node1; node2->nd_head = node1;
nd_set_lineno(node2, nd_lineno(node1)); nd_set_first_lineno(node2, nd_first_lineno(node1));
nd_set_column(node2, nd_column(node1)); nd_set_first_column(node2, nd_first_column(node1));
return node2; return node2;
} }
return node1; return node1;