From fb1172bcf67d98886518f78342fb71f524d28f81 Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 16 Jan 2018 01:32:58 +0000
Subject: [PATCH] parse.y (symbol_append): Added to factor out `%i[]` and
 `%I[]`

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/parse.y b/parse.y
index 0eb1d4fb46..dd34b4a9c4 100644
--- a/parse.y
+++ b/parse.y
@@ -430,6 +430,8 @@ static NODE *new_regexp(struct parser_params *, NODE *, int, const YYLTYPE *);
 static NODE *new_xstring(struct parser_params *, NODE *, const YYLTYPE *loc);
 #define new_string1(str) (str)
 
+static NODE *symbol_append(struct parser_params *p, NODE *symbols, NODE *symbol);
+
 #define new_brace_body(param, stmt, loc) NEW_ITER(param, stmt, loc)
 #define new_do_body(param, stmt, loc) NEW_ITER(param, stmt, loc)
 
@@ -3593,15 +3595,7 @@ symbol_list	: /* none */
 		| symbol_list word ' '
 		    {
 		    /*%%%*/
-			$2 = evstr2dstr(p, $2);
-			if (nd_type($2) == NODE_DSTR) {
-			    nd_set_type($2, NODE_DSYM);
-			}
-			else {
-			    nd_set_type($2, NODE_LIT);
-			    add_mark_object(p, $2->nd_lit = rb_str_intern($2->nd_lit));
-			}
-			$$ = list_append(p, $1, $2);
+			$$ = symbol_append(p, $1, evstr2dstr(p, $2));
 		    /*%
 			$$ = dispatch2(symbols_add, $1, $2);
 		    %*/
@@ -3658,12 +3652,8 @@ qsym_list	: /* none */
 		| qsym_list tSTRING_CONTENT ' '
 		    {
 		    /*%%%*/
-			VALUE lit;
-			lit = $2->nd_lit;
-			nd_set_type($2, NODE_LIT);
-			add_mark_object(p, $2->nd_lit = ID2SYM(rb_intern_str(lit)));
 			nd_set_loc($2, &@2);
-			$$ = list_append(p, $1, $2);
+			$$ = symbol_append(p, $1, $2);
 		    /*%
 			$$ = dispatch2(qsymbols_add, $1, $2);
 		    %*/
@@ -8958,6 +8948,19 @@ new_defined(struct parser_params *p, NODE *expr, const YYLTYPE *loc)
     return NEW_DEFINED(remove_begin_all(expr), loc);
 }
 
+static NODE*
+symbol_append(struct parser_params *p, NODE *symbols, NODE *symbol)
+{
+    if (nd_type(symbol) == NODE_DSTR) {
+	nd_set_type(symbol, NODE_DSYM);
+    }
+    else {
+	nd_set_type(symbol, NODE_LIT);
+	symbol->nd_lit = add_mark_object(p, rb_str_intern(symbol->nd_lit));
+    }
+    return list_append(p, symbols, symbol);
+}
+
 static NODE *
 new_regexp(struct parser_params *p, NODE *node, int options, const YYLTYPE *loc)
 {