summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authoryui-knk <spiketeika@gmail.com>2024-01-08 12:20:03 +0900
committerYuichiro Kaneko <spiketeika@gmail.com>2024-01-08 14:02:48 +0900
commit7ffff3e043b081a8c72b8f8c537f17388fd127a9 (patch)
tree635b6035cd6080d709588beade92e1f3c6364be2 /parse.y
parentd9bad91c342d65332588672081597af5ab30fe97 (diff)
Change numeric node value functions argument to `NODE *`
Change the argument to align with other node value functions like `rb_node_line_lineno_val`.
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y42
1 files changed, 21 insertions, 21 deletions
diff --git a/parse.y b/parse.y
index fc50dbd491..43e6097d3c 100644
--- a/parse.y
+++ b/parse.y
@@ -144,11 +144,11 @@ node_imaginary_cmp(rb_node_imaginary_t *n1, rb_node_imaginary_t *n2)
}
static int
-node_integer_line_cmp(rb_node_integer_t *i, rb_node_line_t *line)
+node_integer_line_cmp(const NODE *node_i, const NODE *line)
{
- VALUE num = rb_node_integer_literal_val(i);
+ VALUE num = rb_node_integer_literal_val(node_i);
- return !(FIXNUM_P(num) && RNODE(line)->nd_loc.beg_pos.lineno == FIX2INT(num));
+ return !(FIXNUM_P(num) && line->nd_loc.beg_pos.lineno == FIX2INT(num));
}
static int
@@ -174,10 +174,10 @@ node_cdhash_cmp(VALUE val, VALUE lit)
/* Special case for Integer and __LINE__ */
if (type_val == NODE_INTEGER && type_lit == NODE_LINE) {
- return node_integer_line_cmp(RNODE_INTEGER(node_val), RNODE_LINE(node_lit));
+ return node_integer_line_cmp(node_val, node_lit);
}
if (type_lit == NODE_INTEGER && type_val == NODE_LINE) {
- return node_integer_line_cmp(RNODE_INTEGER(node_lit), RNODE_LINE(node_val));
+ return node_integer_line_cmp(node_lit, node_val);
}
if (type_val != type_lit) {
@@ -223,16 +223,16 @@ node_cdhash_hash(VALUE a)
enum node_type type = nd_type(node);
switch (type) {
case NODE_INTEGER:
- val = rb_node_integer_literal_val(RNODE_INTEGER(node));
+ val = rb_node_integer_literal_val(node);
return (FIXNUM_P(val) ? val : FIX2LONG(rb_big_hash(val)));
case NODE_FLOAT:
- val = rb_node_float_literal_val(RNODE_FLOAT(node));
+ val = rb_node_float_literal_val(node);
return rb_dbl_long_hash(RFLOAT_VALUE(val));
case NODE_RATIONAL:
- val = rb_node_rational_literal_val(RNODE_RATIONAL(node));
+ val = rb_node_rational_literal_val(node);
return rb_rational_hash(val);
case NODE_IMAGINARY:
- val = rb_node_imaginary_literal_val(RNODE_IMAGINARY(node));
+ val = rb_node_imaginary_literal_val(node);
return rb_complex_hash(val);
case NODE_LINE:
/* Same with NODE_INTEGER FIXNUM case */
@@ -2141,16 +2141,16 @@ rb_str_to_parser_encoding_string(rb_parser_t *p, VALUE str)
#ifndef RIPPER
switch (nd_type(RNODE($$))) {
case NODE_INTEGER:
- rb_parser_printf(p, "%+"PRIsVALUE, rb_node_integer_literal_val(RNODE_INTEGER($$)));
+ rb_parser_printf(p, "%+"PRIsVALUE, rb_node_integer_literal_val($$));
break;
case NODE_FLOAT:
- rb_parser_printf(p, "%+"PRIsVALUE, rb_node_float_literal_val(RNODE_FLOAT($$)));
+ rb_parser_printf(p, "%+"PRIsVALUE, rb_node_float_literal_val($$));
break;
case NODE_RATIONAL:
- rb_parser_printf(p, "%+"PRIsVALUE, rb_node_rational_literal_val(RNODE_RATIONAL($$)));
+ rb_parser_printf(p, "%+"PRIsVALUE, rb_node_rational_literal_val($$));
break;
case NODE_IMAGINARY:
- rb_parser_printf(p, "%+"PRIsVALUE, rb_node_imaginary_literal_val(RNODE_IMAGINARY($$)));
+ rb_parser_printf(p, "%+"PRIsVALUE, rb_node_imaginary_literal_val($$));
break;
case NODE_LIT:
rb_parser_printf(p, "%+"PRIsVALUE, RNODE_LIT($$)->nd_lit);
@@ -13929,13 +13929,13 @@ shareable_literal_value(struct parser_params *p, NODE *node)
case NODE_LINE:
return rb_node_line_lineno_val(node);
case NODE_INTEGER:
- return rb_node_integer_literal_val(RNODE_INTEGER(node));
+ return rb_node_integer_literal_val(node);
case NODE_FLOAT:
- return rb_node_float_literal_val(RNODE_FLOAT(node));
+ return rb_node_float_literal_val(node);
case NODE_RATIONAL:
- return rb_node_rational_literal_val(RNODE_RATIONAL(node));
+ return rb_node_rational_literal_val(node);
case NODE_IMAGINARY:
- return rb_node_imaginary_literal_val(RNODE_IMAGINARY(node));
+ return rb_node_imaginary_literal_val(node);
case NODE_LIT:
return RNODE_LIT(node)->nd_lit;
default:
@@ -14975,13 +14975,13 @@ nd_st_key_val(struct parser_params *p, NODE *node)
case NODE_LIT:
return RNODE_LIT(node)->nd_lit;
case NODE_INTEGER:
- return rb_node_integer_literal_val(RNODE_INTEGER(node));
+ return rb_node_integer_literal_val(node);
case NODE_FLOAT:
- return rb_node_float_literal_val(RNODE_FLOAT(node));
+ return rb_node_float_literal_val(node);
case NODE_RATIONAL:
- return rb_node_rational_literal_val(RNODE_RATIONAL(node));
+ return rb_node_rational_literal_val(node);
case NODE_IMAGINARY:
- return rb_node_imaginary_literal_val(RNODE_IMAGINARY(node));
+ return rb_node_imaginary_literal_val(node);
case NODE_LINE:
return rb_node_line_lineno_val(node);
case NODE_FILE: