6 files changed, 35 insertions, 32 deletions
diff --git a/common.mk b/common.mk
index 4310042736..fbe99d9510 100644
--- a/common.mk
+++ b/common.mk
@@ -16081,6 +16081,7 @@ ruby_parser.$(OBJEXT): {$(VPATH)}internal/variable.h
 ruby_parser.$(OBJEXT): {$(VPATH)}internal/warning_push.h
 ruby_parser.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 ruby_parser.$(OBJEXT): {$(VPATH)}missing.h
+ruby_parser.$(OBJEXT): {$(VPATH)}node.h
 ruby_parser.$(OBJEXT): {$(VPATH)}onigmo.h
 ruby_parser.$(OBJEXT): {$(VPATH)}oniguruma.h
 ruby_parser.$(OBJEXT): {$(VPATH)}ruby_assert.h
diff --git a/internal/ruby_parser.h b/internal/ruby_parser.h
index 71e8fdd849..ed0165f891 100644
--- a/internal/ruby_parser.h
+++ b/internal/ruby_parser.h
@@ -80,6 +80,7 @@ VALUE rb_node_sym_string_val(const NODE *);
 VALUE rb_node_line_lineno_val(const NODE *);
 VALUE rb_node_file_path_val(const NODE *);
 VALUE rb_node_encoding_val(const NODE *);
+VALUE rb_node_const_decl_val(const NODE *node);
 
 VALUE rb_node_integer_literal_val(const NODE *);
 VALUE rb_node_float_literal_val(const NODE *);
diff --git a/parse.y b/parse.y
index e87c98d4ff..613b86f551 100644
--- a/parse.y
+++ b/parse.y
@@ -13991,31 +13991,7 @@ const_decl_path(struct parser_params *p, NODE **dest)
     NODE *n = *dest;
     if (!nd_type_p(n, NODE_CALL)) {
         const YYLTYPE *loc = &n->nd_loc;
-        VALUE path;
-        if (RNODE_CDECL(n)->nd_vid) {
-             path = rb_id2str(RNODE_CDECL(n)->nd_vid);
-        }
-        else {
-            n = RNODE_CDECL(n)->nd_else;
-            path = rb_ary_new();
-            for (; n && nd_type_p(n, NODE_COLON2); n = RNODE_COLON2(n)->nd_head) {
-                rb_ary_push(path, rb_id2str(RNODE_COLON2(n)->nd_mid));
-            }
-            if (n && nd_type_p(n, NODE_CONST)) {
-                // Const::Name
-                rb_ary_push(path, rb_id2str(RNODE_CONST(n)->nd_vid));
-            }
-            else if (n && nd_type_p(n, NODE_COLON3)) {
-                // ::Const::Name
-                rb_ary_push(path, rb_str_new(0, 0));
-            }
-            else {
-                // expression::Name
-                rb_ary_push(path, rb_str_new_cstr("..."));
-            }
-            path = rb_ary_join(rb_ary_reverse(path), rb_str_new_cstr("::"));
-            path = rb_fstring(path);
-        }
+        VALUE path = rb_node_const_decl_val(n);
         *dest = n = NEW_LIT(path, loc);
         RB_OBJ_WRITTEN(p->ast, Qnil, RNODE_LIT(n)->nd_lit);
     }
diff --git a/ruby_parser.c b/ruby_parser.c
index 3a6f9ed082..89b2a19d48 100644
--- a/ruby_parser.c
+++ b/ruby_parser.c
@@ -2,6 +2,7 @@
 
 #include "internal/ruby_parser.h"
 
+#include "node.h"
 #include "rubyparser.h"
 #include "internal/error.h"
 
@@ -26,7 +27,6 @@
 #include "ruby/ractor.h"
 #include "ruby/ruby.h"
 #include "ruby/util.h"
-#include "node.h"
 #include "internal.h"
 #include "vm_core.h"
 #include "symbol.h"
@@ -522,8 +522,6 @@ static const rb_parser_config_t rb_global_parser_config = {
     .ary_unshift = rb_ary_unshift,
     .ary_new2 = rb_ary_new2,
     .ary_entry = rb_ary_entry,
-    .ary_join = rb_ary_join,
-    .ary_reverse = rb_ary_reverse,
     .ary_clear = rb_ary_clear,
     .ary_modify = rb_ary_modify,
     .array_len = rb_array_len,
@@ -1014,3 +1012,34 @@ rb_node_encoding_val(const NODE *node)
 {
     return rb_enc_from_encoding(RNODE_ENCODING(node)->enc);
 }
+
+VALUE
+rb_node_const_decl_val(const NODE *node)
+{
+    VALUE path;
+    if (RNODE_CDECL(node)->nd_vid) {
+        path = rb_id2str(RNODE_CDECL(node)->nd_vid);
+    }
+    else {
+        NODE *n = RNODE_CDECL(node)->nd_else;
+        path = rb_ary_new();
+        for (; n && nd_type_p(n, NODE_COLON2); n = RNODE_COLON2(n)->nd_head) {
+            rb_ary_push(path, rb_id2str(RNODE_COLON2(n)->nd_mid));
+        }
+        if (n && nd_type_p(n, NODE_CONST)) {
+            // Const::Name
+            rb_ary_push(path, rb_id2str(RNODE_CONST(n)->nd_vid));
+        }
+        else if (n && nd_type_p(n, NODE_COLON3)) {
+            // ::Const::Name
+            rb_ary_push(path, rb_str_new(0, 0));
+        }
+        else {
+            // expression::Name
+            rb_ary_push(path, rb_str_new_cstr("..."));
+        }
+        path = rb_ary_join(rb_ary_reverse(path), rb_str_new_cstr("::"));
+        path = rb_fstring(path);
+    }
+    return path;
+}
diff --git a/rubyparser.h b/rubyparser.h
index dff6a42d0b..3ba89ae2df 100644
--- a/rubyparser.h
+++ b/rubyparser.h
@@ -1243,8 +1243,6 @@ typedef struct rb_parser_config_struct {
     VALUE (*ary_unshift)(VALUE ary, VALUE item);
     VALUE (*ary_new2)(long capa); // ary_new_capa
     VALUE (*ary_entry)(VALUE ary, long offset);
-    VALUE (*ary_join)(VALUE ary, VALUE sep);
-    VALUE (*ary_reverse)(VALUE ary);
     VALUE (*ary_clear)(VALUE ary);
     void (*ary_modify)(VALUE ary);
     long (*array_len)(VALUE a);
diff --git a/universal_parser.c b/universal_parser.c
index 6107b09995..6ea3f418b0 100644
--- a/universal_parser.c
+++ b/universal_parser.c
@@ -144,8 +144,6 @@ struct rb_imemo_tmpbuf_struct {
 #undef rb_ary_new2
 #define rb_ary_new2          p->config->ary_new2
 #define rb_ary_entry         p->config->ary_entry
-#define rb_ary_join          p->config->ary_join
-#define rb_ary_reverse       p->config->ary_reverse
 #define rb_ary_clear         p->config->ary_clear
 #define rb_ary_modify        p->config->ary_modify
 #undef RARRAY_LEN