aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2023-10-05 10:52:18 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2023-10-05 14:23:42 +0900
commit70e1635950fcf77ba43cffc110eac910332ea2a6 (patch)
treee7922e8be8dc2f2e376e223ea0bfbd99b5467b97
parenta472fd55dafcd1e3846615f0029431305b0f9c74 (diff)
downloadruby-70e1635950fcf77ba43cffc110eac910332ea2a6.tar.gz
Move internal NODE_DEF_TEMP to parse.y
-rw-r--r--ast.c1
-rw-r--r--ext/objspace/objspace.c1
-rw-r--r--node_dump.c1
-rw-r--r--parse.y8
-rw-r--r--rubyparser.h1
5 files changed, 7 insertions, 5 deletions
diff --git a/ast.c b/ast.c
index f424bd4c89..7090a889ec 100644
--- a/ast.c
+++ b/ast.c
@@ -678,7 +678,6 @@ node_children(rb_ast_t *ast, const NODE *node)
case NODE_ERROR:
return rb_ary_new_from_node_args(ast, 0);
case NODE_ARGS_AUX:
- case NODE_DEF_TEMP:
case NODE_RIPPER:
case NODE_RIPPER_VALUES:
case NODE_LAST:
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 393bf1daaa..0c8045acea 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -493,7 +493,6 @@ count_nodes(int argc, VALUE *argv, VALUE os)
COUNT_NODE(NODE_ARYPTN);
COUNT_NODE(NODE_FNDPTN);
COUNT_NODE(NODE_HSHPTN);
- COUNT_NODE(NODE_DEF_TEMP);
COUNT_NODE(NODE_RIPPER);
COUNT_NODE(NODE_RIPPER_VALUES);
COUNT_NODE(NODE_ERROR);
diff --git a/node_dump.c b/node_dump.c
index b56a70d3da..d6ccfa84ac 100644
--- a/node_dump.c
+++ b/node_dump.c
@@ -1104,7 +1104,6 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
return;
case NODE_ARGS_AUX:
- case NODE_DEF_TEMP:
case NODE_RIPPER:
case NODE_RIPPER_VALUES:
case NODE_LAST:
diff --git a/parse.y b/parse.y
index 6a224e2a14..ce016b5083 100644
--- a/parse.y
+++ b/parse.y
@@ -1080,6 +1080,12 @@ static rb_node_error_t *rb_node_error_new(struct parser_params *p, const YYLTYPE
#endif
+enum internal_node_type {
+ NODE_INTERNAL_ONLY = NODE_LAST,
+ NODE_DEF_TEMP,
+ NODE_INTERNAL_LAST
+};
+
/* This node is parse.y internal */
typedef struct RNode_DEF_TEMP {
NODE node;
@@ -12157,7 +12163,7 @@ rb_node_redo_new(struct parser_params *p, const YYLTYPE *loc)
static rb_node_def_temp_t *
rb_node_def_temp_new(struct parser_params *p, ID nd_vid, ID nd_mid, NODE *nd_head, long nd_nth, struct lex_context ctxt, const YYLTYPE *loc)
{
- rb_node_def_temp_t *n = NODE_NEWNODE(NODE_DEF_TEMP, rb_node_def_temp_t, loc);
+ rb_node_def_temp_t *n = NODE_NEWNODE((enum node_type)NODE_DEF_TEMP, rb_node_def_temp_t, loc);
n->nd_vid = nd_vid;
n->nd_mid = nd_mid;
n->nd_head = nd_head;
diff --git a/rubyparser.h b/rubyparser.h
index 377d6d5be0..1fd7a3f083 100644
--- a/rubyparser.h
+++ b/rubyparser.h
@@ -131,7 +131,6 @@ enum node_type {
NODE_HSHPTN,
NODE_FNDPTN,
NODE_ERROR,
- NODE_DEF_TEMP,
NODE_RIPPER,
NODE_RIPPER_VALUES,
NODE_LAST