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

NODE_LIT is not used anymore

Browse Source
This commit is contained in:
yui-knk 2024-04-04 07:46:28 +09:00 committed by Yuichiro Kaneko
parent bdfbeb90c9
commit f057741c5d
7 changed files with 7 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ast.c
View File

@ -551,6 +551,8 @@ node_children(rb_ast_t *ast, const NODE *node)
name[1] = (char)RNODE_BACK_REF(node)->nd_nth; name[1] = (char)RNODE_BACK_REF(node)->nd_nth;
name[2] = '\0'; name[2] = '\0';
return rb_ary_new_from_args(1, ID2SYM(rb_intern(name))); return rb_ary_new_from_args(1, ID2SYM(rb_intern(name)));
case NODE_MATCH:
return rb_ary_new_from_args(1, rb_node_regx_string_val(node));
case NODE_MATCH2: case NODE_MATCH2:
if (RNODE_MATCH2(node)->nd_args) { if (RNODE_MATCH2(node)->nd_args) {
return rb_ary_new_from_node_args(ast, 3, RNODE_MATCH2(node)->nd_recv, RNODE_MATCH2(node)->nd_value, RNODE_MATCH2(node)->nd_args); return rb_ary_new_from_node_args(ast, 3, RNODE_MATCH2(node)->nd_recv, RNODE_MATCH2(node)->nd_value, RNODE_MATCH2(node)->nd_args);
@ -558,9 +560,6 @@ node_children(rb_ast_t *ast, const NODE *node)
return rb_ary_new_from_node_args(ast, 2, RNODE_MATCH2(node)->nd_recv, RNODE_MATCH2(node)->nd_value); return rb_ary_new_from_node_args(ast, 2, RNODE_MATCH2(node)->nd_recv, RNODE_MATCH2(node)->nd_value);
case NODE_MATCH3: case NODE_MATCH3:
return rb_ary_new_from_node_args(ast, 2, RNODE_MATCH3(node)->nd_recv, RNODE_MATCH3(node)->nd_value); return rb_ary_new_from_node_args(ast, 2, RNODE_MATCH3(node)->nd_recv, RNODE_MATCH3(node)->nd_value);
case NODE_MATCH:
case NODE_LIT:
return rb_ary_new_from_args(1, RNODE_LIT(node)->nd_lit);
case NODE_STR: case NODE_STR:
case NODE_XSTR: case NODE_XSTR:
return rb_ary_new_from_args(1, rb_node_str_string_val(node)); return rb_ary_new_from_args(1, rb_node_str_string_val(node));

64
compile.c
View File

@ -1927,9 +1927,6 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
} }
else { else {
switch (nd_type(val_node)) { switch (nd_type(val_node)) {
case NODE_LIT:
dv = RNODE_LIT(val_node)->nd_lit;
break;
case NODE_SYM: case NODE_SYM:
dv = rb_node_sym_string_val(val_node); dv = rb_node_sym_string_val(val_node);
break; break;
@ -4510,7 +4507,6 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE *cond,
else_label = NEW_LABEL(nd_line(cond)); else_label = NEW_LABEL(nd_line(cond));
} }
goto again; goto again;
case NODE_LIT: /* NODE_LIT is always true */
case NODE_SYM: case NODE_SYM:
case NODE_LINE: case NODE_LINE:
case NODE_FILE: case NODE_FILE:
@ -4591,8 +4587,6 @@ static VALUE
get_symbol_value(rb_iseq_t *iseq, const NODE *node) get_symbol_value(rb_iseq_t *iseq, const NODE *node)
{ {
switch (nd_type(node)) { switch (nd_type(node)) {
case NODE_LIT:
return RNODE_LIT(node)->nd_lit;
case NODE_SYM: case NODE_SYM:
return rb_node_sym_string_val(node); return rb_node_sym_string_val(node);
default: default:
@ -4641,10 +4635,7 @@ compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
seen_nodes++; seen_nodes++;
RUBY_ASSERT(nd_type_p(node, NODE_LIST)); RUBY_ASSERT(nd_type_p(node, NODE_LIST));
if (key_node && nd_type_p(key_node, NODE_LIT) && SYMBOL_P(RNODE_LIT(key_node)->nd_lit)) { if (key_node && nd_type_p(key_node, NODE_SYM)) {
/* can be keywords */
}
else if (key_node && nd_type_p(key_node, NODE_SYM)) {
/* can be keywords */ /* can be keywords */
} }
else { else {
@ -4729,7 +4720,6 @@ static inline bool
static_literal_node_p(const NODE *node, const rb_iseq_t *iseq, bool hash_key) static_literal_node_p(const NODE *node, const rb_iseq_t *iseq, bool hash_key)
{ {
switch (nd_type(node)) { switch (nd_type(node)) {
case NODE_LIT:
case NODE_SYM: case NODE_SYM:
case NODE_REGX: case NODE_REGX:
case NODE_LINE: case NODE_LINE:
@ -4788,8 +4778,6 @@ static_literal_value(const NODE *node, rb_iseq_t *iseq)
else { else {
return rb_fstring(get_string_value(node)); return rb_fstring(get_string_value(node));
} }
case NODE_LIT:
return RNODE_LIT(node)->nd_lit;
default: default:
rb_bug("unexpected node: %s", ruby_node_name(nd_type(node))); rb_bug("unexpected node: %s", ruby_node_name(nd_type(node)));
} }
@ -5068,7 +5056,7 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth
FLUSH_CHUNK(); FLUSH_CHUNK();
const NODE *kw = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_head; const NODE *kw = RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_head;
int empty_kw = nd_type_p(kw, NODE_LIT) && RB_TYPE_P(RNODE_LIT(kw)->nd_lit, T_HASH); /* foo( ..., **{}, ...) */ int empty_kw = nd_type_p(kw, NODE_HASH) && (!RNODE_HASH(kw)->nd_head); /* foo( ..., **{}, ...) */
int first_kw = first_chunk && stack_len == 0; /* foo(1,2,3, **kw, ...) */ int first_kw = first_chunk && stack_len == 0; /* foo(1,2,3, **kw, ...) */
int last_kw = !RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next; /* foo( ..., **kw) */ int last_kw = !RNODE_LIST(RNODE_LIST(node)->nd_next)->nd_next; /* foo( ..., **kw) */
int only_kw = last_kw && first_kw; /* foo(1,2,3, **kw) */ int only_kw = last_kw && first_kw; /* foo(1,2,3, **kw) */
@ -5133,13 +5121,6 @@ VALUE
rb_node_case_when_optimizable_literal(const NODE *const node) rb_node_case_when_optimizable_literal(const NODE *const node)
{ {
switch (nd_type(node)) { switch (nd_type(node)) {
case NODE_LIT: {
VALUE v = RNODE_LIT(node)->nd_lit;
if (SYMBOL_P(v)) {
return v;
}
break;
}
case NODE_INTEGER: case NODE_INTEGER:
return rb_node_integer_literal_val(node); return rb_node_integer_literal_val(node);
case NODE_FLOAT: { case NODE_FLOAT: {
@ -5815,7 +5796,6 @@ defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
} }
/* fall through */ /* fall through */
case NODE_STR: case NODE_STR:
case NODE_LIT:
case NODE_SYM: case NODE_SYM:
case NODE_REGX: case NODE_REGX:
case NODE_LINE: case NODE_LINE:
@ -6399,8 +6379,6 @@ optimizable_range_item_p(const NODE *n)
{ {
if (!n) return FALSE; if (!n) return FALSE;
switch (nd_type(n)) { switch (nd_type(n)) {
case NODE_LIT:
return RB_INTEGER_TYPE_P(RNODE_LIT(n)->nd_lit);
case NODE_LINE: case NODE_LINE:
return TRUE; return TRUE;
case NODE_INTEGER: case NODE_INTEGER:
@ -6416,8 +6394,6 @@ static VALUE
optimized_range_item(const NODE *n) optimized_range_item(const NODE *n)
{ {
switch (nd_type(n)) { switch (nd_type(n)) {
case NODE_LIT:
return RNODE_LIT(n)->nd_lit;
case NODE_LINE: case NODE_LINE:
return rb_node_line_lineno_val(n); return rb_node_line_lineno_val(n);
case NODE_INTEGER: case NODE_INTEGER:
@ -7243,7 +7219,6 @@ iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *c
ADD_INSNL(ret, line_node, jump, unmatched); ADD_INSNL(ret, line_node, jump, unmatched);
break; break;
} }
case NODE_LIT:
case NODE_SYM: case NODE_SYM:
case NODE_REGX: case NODE_REGX:
case NODE_LINE: case NODE_LINE:
@ -8645,9 +8620,6 @@ compile_builtin_attr(rb_iseq_t *iseq, const NODE *node)
case NODE_SYM: case NODE_SYM:
symbol = rb_node_sym_string_val(node); symbol = rb_node_sym_string_val(node);
break; break;
case NODE_LIT:
symbol = RNODE_LIT(node)->nd_lit;
break;
default: default:
goto bad_arg; goto bad_arg;
} }
@ -8694,9 +8666,6 @@ compile_builtin_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, c
case NODE_SYM: case NODE_SYM:
name = rb_node_sym_string_val(node); name = rb_node_sym_string_val(node);
break; break;
case NODE_LIT:
name = RNODE_LIT(node)->nd_lit;
break;
default: default:
goto bad_arg; goto bad_arg;
} }
@ -8935,20 +8904,7 @@ compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, co
labels_table = st_init_numtable(); labels_table = st_init_numtable();
ISEQ_COMPILE_DATA(iseq)->labels_table = labels_table; ISEQ_COMPILE_DATA(iseq)->labels_table = labels_table;
} }
if (nd_type_p(node->nd_args->nd_head, NODE_LIT) && {
SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
label_name = node->nd_args->nd_head->nd_lit;
if (!st_lookup(labels_table, (st_data_t)label_name, &data)) {
label = NEW_LABEL(nd_line(line_node));
label->position = nd_line(line_node);
st_insert(labels_table, (st_data_t)label_name, (st_data_t)label);
}
else {
label = (LABEL *)data;
}
}
else {
COMPILE_ERROR(ERROR_ARGS "invalid goto/label format"); COMPILE_ERROR(ERROR_ARGS "invalid goto/label format");
return COMPILE_NG; return COMPILE_NG;
} }
@ -9834,8 +9790,7 @@ compile_kw_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node,
COMPILE_ERROR(ERROR_ARGS "unreachable"); COMPILE_ERROR(ERROR_ARGS "unreachable");
return COMPILE_NG; return COMPILE_NG;
} }
else if (nd_type_p(default_value, NODE_LIT) || else if (nd_type_p(default_value, NODE_SYM) ||
nd_type_p(default_value, NODE_SYM) ||
nd_type_p(default_value, NODE_REGX) || nd_type_p(default_value, NODE_REGX) ||
nd_type_p(default_value, NODE_LINE) || nd_type_p(default_value, NODE_LINE) ||
nd_type_p(default_value, NODE_INTEGER) || nd_type_p(default_value, NODE_INTEGER) ||
@ -10075,9 +10030,6 @@ compile_shareable_literal_constant(rb_iseq_t *iseq, LINK_ANCHOR *ret, enum rb_pa
case NODE_NIL: case NODE_NIL:
*value_p = Qnil; *value_p = Qnil;
goto compile; goto compile;
case NODE_LIT:
*value_p = RNODE_LIT(node)->nd_lit;
goto compile;
case NODE_SYM: case NODE_SYM:
*value_p = rb_node_sym_string_val(node); *value_p = rb_node_sym_string_val(node);
goto compile; goto compile;
@ -10664,14 +10616,6 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
case NODE_MATCH3: case NODE_MATCH3:
CHECK(compile_match(iseq, ret, node, popped, type)); CHECK(compile_match(iseq, ret, node, popped, type));
break; break;
case NODE_LIT:{
debugp_param("lit", RNODE_LIT(node)->nd_lit);
if (!popped) {
ADD_INSN1(ret, node, putobject, RNODE_LIT(node)->nd_lit);
RB_OBJ_WRITTEN(iseq, Qundef, RNODE_LIT(node)->nd_lit);
}
break;
}
case NODE_SYM:{ case NODE_SYM:{
if (!popped) { if (!popped) {
ADD_INSN1(ret, node, putobject, rb_node_sym_string_val(node)); ADD_INSN1(ret, node, putobject, rb_node_sym_string_val(node));

2
misc/lldb_rb/utils.py
View File

@ -371,8 +371,6 @@ class RbInspector(LLDBInterface):
self._append_expression("*(struct RNode_MATCH2 *) %0#x" % val.GetValueAsUnsigned()) self._append_expression("*(struct RNode_MATCH2 *) %0#x" % val.GetValueAsUnsigned())
elif nd_type == self.ruby_globals["NODE_MATCH3"]: elif nd_type == self.ruby_globals["NODE_MATCH3"]:
self._append_expression("*(struct RNode_MATCH3 *) %0#x" % val.GetValueAsUnsigned()) self._append_expression("*(struct RNode_MATCH3 *) %0#x" % val.GetValueAsUnsigned())
elif nd_type == self.ruby_globals["NODE_LIT"]:
self._append_expression("*(struct RNode_LIT *) %0#x" % val.GetValueAsUnsigned())
elif nd_type == self.ruby_globals["NODE_STR"]: elif nd_type == self.ruby_globals["NODE_STR"]:
self._append_expression("*(struct RNode_STR *) %0#x" % val.GetValueAsUnsigned()) self._append_expression("*(struct RNode_STR *) %0#x" % val.GetValueAsUnsigned())
elif nd_type == self.ruby_globals["NODE_DSTR"]: elif nd_type == self.ruby_globals["NODE_DSTR"]:

26
node.c
View File

@ -292,12 +292,7 @@ RBIMPL_ATTR_PURE()
static bool static bool
nodetype_markable_p(enum node_type type) nodetype_markable_p(enum node_type type)
{ {
switch (type) { return false;
case NODE_LIT:
return true;
default:
return false;
}
} }
NODE * NODE *
@ -389,29 +384,10 @@ iterate_node_values(rb_ast_t *ast, node_buffer_list_t *nb, node_itr_t * func, vo
} }
} }
static void
mark_and_move_ast_value(rb_ast_t *ast, void *ctx, NODE *node)
{
#ifdef UNIVERSAL_PARSER
bug_report_func rb_bug = ast->node_buffer->config->bug;
#endif
switch (nd_type(node)) {
case NODE_LIT:
rb_gc_mark_and_move(&RNODE_LIT(node)->nd_lit);
break;
default:
rb_bug("unreachable node %s", ruby_node_name(nd_type(node)));
}
}
void void
rb_ast_mark_and_move(rb_ast_t *ast, bool reference_updating) rb_ast_mark_and_move(rb_ast_t *ast, bool reference_updating)
{ {
if (ast->node_buffer) { if (ast->node_buffer) {
node_buffer_t *nb = ast->node_buffer;
iterate_node_values(ast, &nb->markable, mark_and_move_ast_value, NULL);
if (ast->body.script_lines) rb_gc_mark_and_move(&ast->body.script_lines); if (ast->body.script_lines) rb_gc_mark_and_move(&ast->body.script_lines);
} }
} }

6
node_dump.c
View File

@ -724,12 +724,6 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
F_NODE(nd_value, RNODE_MATCH3, "regexp (argument)"); F_NODE(nd_value, RNODE_MATCH3, "regexp (argument)");
return; return;
case NODE_LIT:
ANN("literal");
ANN("format: [nd_lit]");
ANN("example: :sym, /foo/");
F_LIT(nd_lit, RNODE_LIT, "literal");
return;
case NODE_STR: case NODE_STR:
ANN("string literal"); ANN("string literal");
ANN("format: [nd_lit]"); ANN("format: [nd_lit]");

20
parse.y
View File

@ -2642,9 +2642,6 @@ rb_parser_tokens_free(rb_parser_t *p, rb_parser_ary_t *tokens)
case NODE_IMAGINARY: case NODE_IMAGINARY:
rb_parser_printf(p, "%+"PRIsVALUE, rb_node_imaginary_literal_val($$)); rb_parser_printf(p, "%+"PRIsVALUE, rb_node_imaginary_literal_val($$));
break; break;
case NODE_LIT:
rb_parser_printf(p, "%+"PRIsVALUE, RNODE_LIT($$)->nd_lit);
break;
default: default:
break; break;
} }
@ -6848,7 +6845,6 @@ singleton : var_ref
case NODE_DXSTR: case NODE_DXSTR:
case NODE_REGX: case NODE_REGX:
case NODE_DREGX: case NODE_DREGX:
case NODE_LIT:
case NODE_SYM: case NODE_SYM:
case NODE_LINE: case NODE_LINE:
case NODE_FILE: case NODE_FILE:
@ -14222,7 +14218,6 @@ void_expr(struct parser_params *p, NODE *node)
case NODE_CONST: case NODE_CONST:
useless = "a constant"; useless = "a constant";
break; break;
case NODE_LIT:
case NODE_SYM: case NODE_SYM:
case NODE_LINE: case NODE_LINE:
case NODE_FILE: case NODE_FILE:
@ -14368,7 +14363,6 @@ is_static_content(NODE *node)
do { do {
if (!is_static_content(RNODE_LIST(node)->nd_head)) return 0; if (!is_static_content(RNODE_LIST(node)->nd_head)) return 0;
} while ((node = RNODE_LIST(node)->nd_next) != 0); } while ((node = RNODE_LIST(node)->nd_next) != 0);
case NODE_LIT:
case NODE_SYM: case NODE_SYM:
case NODE_REGX: case NODE_REGX:
case NODE_LINE: case NODE_LINE:
@ -14503,23 +14497,9 @@ cond0(struct parser_params *p, NODE *node, enum cond_type type, const YYLTYPE *l
case NODE_SYM: case NODE_SYM:
case NODE_DSYM: case NODE_DSYM:
warn_symbol:
SWITCH_BY_COND_TYPE(type, warning, "symbol "); SWITCH_BY_COND_TYPE(type, warning, "symbol ");
break; break;
case NODE_LIT:
if (RNODE_LIT(node)->nd_lit == Qtrue ||
RNODE_LIT(node)->nd_lit == Qfalse) {
/* booleans are OK, e.g., while true */
}
else if (SYMBOL_P(RNODE_LIT(node)->nd_lit)) {
goto warn_symbol;
}
else {
SWITCH_BY_COND_TYPE(type, warning, "");
}
break;
case NODE_LINE: case NODE_LINE:
SWITCH_BY_COND_TYPE(type, warning, ""); SWITCH_BY_COND_TYPE(type, warning, "");
break; break;

8
rubyparser.h
View File

@ -136,7 +136,6 @@ enum node_type {
NODE_MATCH, NODE_MATCH,
NODE_MATCH2, NODE_MATCH2,
NODE_MATCH3, NODE_MATCH3,
NODE_LIT,
NODE_INTEGER, NODE_INTEGER,
NODE_FLOAT, NODE_FLOAT,
NODE_RATIONAL, NODE_RATIONAL,
@ -675,12 +674,6 @@ typedef struct RNode_MATCH3 {
struct RNode *nd_value; struct RNode *nd_value;
} rb_node_match3_t; } rb_node_match3_t;
typedef struct RNode_LIT {
NODE node;
VALUE nd_lit;
} rb_node_lit_t;
typedef struct RNode_INTEGER { typedef struct RNode_INTEGER {
NODE node; NODE node;
@ -1131,7 +1124,6 @@ typedef struct RNode_ERROR {
#define RNODE_MATCH(node) ((struct RNode_MATCH *)(node)) #define RNODE_MATCH(node) ((struct RNode_MATCH *)(node))
#define RNODE_MATCH2(node) ((struct RNode_MATCH2 *)(node)) #define RNODE_MATCH2(node) ((struct RNode_MATCH2 *)(node))
#define RNODE_MATCH3(node) ((struct RNode_MATCH3 *)(node)) #define RNODE_MATCH3(node) ((struct RNode_MATCH3 *)(node))
#define RNODE_LIT(node) ((struct RNode_LIT *)(node))
#define RNODE_INTEGER(node) ((struct RNode_INTEGER *)(node)) #define RNODE_INTEGER(node) ((struct RNode_INTEGER *)(node))
#define RNODE_FLOAT(node) ((struct RNode_FLOAT *)(node)) #define RNODE_FLOAT(node) ((struct RNode_FLOAT *)(node))
#define RNODE_RATIONAL(node) ((struct RNode_RATIONAL *)(node)) #define RNODE_RATIONAL(node) ((struct RNode_RATIONAL *)(node))