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

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

4 files changed, 38 insertions, 38 deletions

diff --git a/compile.c b/compile.c
index 1b7158979a..2677c8a286 100644
--- a/compile.c
+++ b/compile.c
@@ -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 int line = nd_line(node);
-    const int lineno = nd_lineno(node);
-    const int column = nd_column(node);
+    const int lineno = nd_first_lineno(node);
+    const int column = nd_first_column(node);
     const int last_lineno = nd_last_lineno(node);
     const int last_column = nd_last_column(node);
     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) {
 	    ADD_TRACE_BRANCH_COVERAGE(
 		ret,
-		node_body ? nd_lineno(node_body) : lineno,
-		node_body ? nd_column(node_body) : column,
+		node_body ? nd_first_lineno(node_body) : lineno,
+		node_body ? nd_first_column(node_body) : column,
 		node_body ? nd_last_lineno(node_body) : last_lineno,
 		node_body ? nd_last_column(node_body) : last_column,
 		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) {
 	    ADD_TRACE_BRANCH_COVERAGE(
 		ret,
-		node_else ? nd_lineno(node_else) : lineno,
-		node_else ? nd_column(node_else) : column,
+		node_else ? nd_first_lineno(node_else) : lineno,
+		node_else ? nd_first_column(node_else) : column,
 		node_else ? nd_last_lineno(node_else) : last_lineno,
 		node_else ? nd_last_column(node_else) : last_column,
 		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));
 
-    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;
     type = nd_type(node);
     line = nd_line(node);
-    lineno = nd_lineno(node);
-    column = nd_column(node);
+    lineno = nd_first_lineno(node);
+    column = nd_first_column(node);
     last_lineno = nd_last_lineno(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_TRACE_BRANCH_COVERAGE(
 		body_seq,
-		node->nd_body ? nd_lineno(node->nd_body) : lineno,
-		node->nd_body ? nd_column(node->nd_body) : column,
+		node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
+		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_column(node->nd_body) : last_column,
 		"when",
@@ -4668,8 +4668,8 @@ compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_nod
 	}
 	type = nd_type(node);
 	line = nd_line(node);
-	lineno = nd_lineno(node);
-	column = nd_column(node);
+	lineno = nd_first_lineno(node);
+	column = nd_first_column(node);
 	last_lineno = nd_last_lineno(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) {
 	ADD_LABEL(cond_seq, elselabel);
 	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));
 	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");
 	ADD_LABEL(cond_seq, elselabel);
 	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) {
 	    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);
     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);
     endlabel = NEW_LABEL(nd_line(node));
 
     while (node && nd_type(node) == NODE_WHEN) {
 	const int line = nd_line(node);
-	const int lineno = nd_lineno(node);
-	const int column = nd_column(node);
+	const int lineno = nd_first_lineno(node);
+	const int column = nd_first_column(node);
 	const int last_lineno = nd_last_lineno(node);
 	const int last_column = nd_last_column(node);
 	LABEL *l1 = NEW_LABEL(line);
 	ADD_LABEL(body_seq, l1);
 	ADD_TRACE_BRANCH_COVERAGE(
 		body_seq,
-		node->nd_body ? nd_lineno(node->nd_body) : lineno,
-		node->nd_body ? nd_column(node->nd_body) : column,
+		node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
+		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_column(node->nd_body) : last_column,
 		"when",
@@ -4770,8 +4770,8 @@ compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_no
     /* else */
     ADD_TRACE_BRANCH_COVERAGE(
 	ret,
-	node ? nd_lineno(node) : nd_lineno(orig_node),
-	node ? nd_column(node) : nd_column(orig_node),
+	node ? nd_first_lineno(node) : nd_first_lineno(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_column(node) : nd_last_column(orig_node),
 	"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)
 {
     const int line = (int)nd_line(node);
-    const int lineno = nd_lineno(node);
-    const int column = nd_column(node);
+    const int lineno = nd_first_lineno(node);
+    const int column = nd_first_column(node);
     const int last_lineno = nd_last_lineno(node);
     const int last_column = nd_last_column(node);
     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");
     ADD_TRACE_BRANCH_COVERAGE(
 	ret,
-	node->nd_body ? nd_lineno(node->nd_body) : lineno,
-	node->nd_body ? nd_column(node->nd_body) : column,
+	node->nd_body ? nd_first_lineno(node->nd_body) : lineno,
+	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_column(node->nd_body) : last_column,
 	"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);
 		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_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) {
@@ -6118,7 +6118,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 	if (else_label && end_label) {
 	    ADD_INSNL(ret, line, jump, end_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);
 	}
 	if (popped) {
diff --git a/node.c b/node.c
index 5fa5e1fa50..95817643af 100644
--- a/node.c
+++ b/node.c
@@ -24,7 +24,7 @@
 #define A_LIT(lit) AR(rb_inspect(lit))
 #define A_NODE_HEADER(node, 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) \
     rb_str_catf(buf, "+- %.*s:"term, (len), (name))
 #define D_FIELD_HEADER(len, name, term) (A_INDENT, A_FIELD_HEADER(len, name, term))
diff --git a/node.h b/node.h
index 6ff68e1800..5d23a5cd70 100644
--- a/node.h
+++ b/node.h
@@ -281,10 +281,10 @@ typedef struct RNode {
 #define nd_set_line(n,l) \
     (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_set_column(n, v) ((n)->nd_loc.first_loc.column = (v))
-#define nd_lineno(n) ((int)((n)->nd_loc.first_loc.lineno))
-#define nd_set_lineno(n, v) ((n)->nd_loc.first_loc.lineno = (v))
+#define nd_first_column(n) ((int)((n)->nd_loc.first_loc.column))
+#define nd_set_first_column(n, v) ((n)->nd_loc.first_loc.column = (v))
+#define nd_first_lineno(n) ((int)((n)->nd_loc.first_loc.lineno))
+#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_set_last_column(n, v) ((n)->nd_loc.last_loc.column = (v))
diff --git a/parse.y b/parse.y
index 62ba19c35c..2b4f869220 100644
--- a/parse.y
+++ b/parse.y
@@ -8955,8 +8955,8 @@ node_newnode(struct parser_params *parser, enum node_type type, VALUE a0, VALUE
 
     nd_set_line(n, ruby_sourceline);
     /* mark not cared lineno to 0 and column to -1 */
-    nd_set_lineno(n,  0);
-    nd_set_column(n, -1);
+    nd_set_first_lineno(n,  0);
+    nd_set_first_column(n, -1);
     nd_set_last_lineno(n,  0);
     nd_set_last_column(n, -1);
     return n;
@@ -10798,8 +10798,8 @@ arg_blk_pass(NODE *node1, NODE *node2)
 {
     if (node2) {
 	node2->nd_head = node1;
-	nd_set_lineno(node2, nd_lineno(node1));
-	nd_set_column(node2, nd_column(node1));
+	nd_set_first_lineno(node2, nd_first_lineno(node1));
+	nd_set_first_column(node2, nd_first_column(node1));
 	return node2;
     }
     return node1;