From c56ac0863637b1315099be600fa5ef624d658ebb Mon Sep 17 00:00:00 2001
From: yui-knk <yui-knk@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 25 Nov 2017 11:57:33 +0000
Subject: [PATCH] parse.y: opt_arg_append

* parse.y (opt_arg_append): extract optional arguments
  append.

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

diff --git a/parse.y b/parse.y
index 2961a33166..07797c05d9 100644
--- a/parse.y
+++ b/parse.y
@@ -494,6 +494,7 @@ static NODE *const_decl_gen(struct parser_params *parser, NODE* path, const YYLT
 #define var_field(n) (n)
 #define backref_assign_error(n, a, location) (rb_backref_error(n), new_begin(0, location))
 
+static NODE *opt_arg_append(NODE*, NODE*);
 static NODE *kwd_append(NODE*, NODE*);
 
 static NODE *new_hash_gen(struct parser_params *parser, NODE *hash, const YYLTYPE *location);
@@ -4797,13 +4798,7 @@ f_block_optarg	: f_block_opt
 		| f_block_optarg ',' f_block_opt
 		    {
 		    /*%%%*/
-			NODE *opts = $1;
-
-			while (opts->nd_next) {
-			    opts = opts->nd_next;
-			}
-			opts->nd_next = $3;
-			$$ = $1;
+			$$ = opt_arg_append($1, $3);
 		    /*%
 			$$ = rb_ary_push($1, get_value($3));
 		    %*/
@@ -4821,13 +4816,7 @@ f_optarg	: f_opt
 		| f_optarg ',' f_opt
 		    {
 		    /*%%%*/
-			NODE *opts = $1;
-
-			while (opts->nd_next) {
-			    opts = opts->nd_next;
-			}
-			opts->nd_next = $3;
-			$$ = $1;
+			$$ = opt_arg_append($1, $3);
 		    /*%
 			$$ = rb_ary_push($1, get_value($3));
 		    %*/
@@ -9350,6 +9339,19 @@ gettable_gen(struct parser_params *parser, ID id, const YYLTYPE *location)
     return 0;
 }
 
+static NODE *
+opt_arg_append(NODE *opt_list, NODE *opt)
+{
+    NODE *opts = opt_list;
+
+    while (opts->nd_next) {
+	opts = opts->nd_next;
+    }
+    opts->nd_next = opt;
+
+    return opt_list;
+}
+
 static NODE *
 kwd_append(NODE *kwlist, NODE *kw)
 {