Rename f_optarg to f_opt_arg for consistency in parser rules

ydah · ydah · commit b68172caada4 · 2025-04-15T00:39:12.000+09:00
diff --git a/parse.y b/parse.y
@@ -2984,15 +2984,15 @@ rb_parser_ary_free(rb_parser_t *p, rb_parser_ary_t *ary)
                     }
                 ;
 
-%rule f_optarg(value) <node_opt_arg>
+%rule f_opt_arg(value) <node_opt_arg>
                 : f_opt(value)
                     {
                         $$ = $f_opt;
                     /*% ripper: rb_ary_new3(1, $:1) %*/
                     }
-                | f_optarg(value) ',' f_opt(value)
+                | f_opt_arg(value) ',' f_opt(value)
                     {
-                        $$ = opt_arg_append($f_optarg, $f_opt);
+                        $$ = opt_arg_append($f_opt_arg, $f_opt);
                     /*% ripper: rb_ary_push($:1, $:3) %*/
                     }
                 ;
@@ -4968,22 +4968,22 @@ excessed_comma	: ','
                     }
                 ;
 
-block_param	: f_arg ',' f_optarg(primary_value) ',' f_rest_arg opt_args_tail(block_args_tail)
+block_param	: f_arg ',' f_opt_arg(primary_value) ',' f_rest_arg opt_args_tail(block_args_tail)
                     {
                         $$ = new_args(p, $1, $3, $5, 0, $6, &@$);
                     /*% ripper: params!($:1, $:3, $:5, Qnil, *$:6[0..2]) %*/
                     }
-                | f_arg ',' f_optarg(primary_value) ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)
+                | f_arg ',' f_opt_arg(primary_value) ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)
                     {
                         $$ = new_args(p, $1, $3, $5, $7, $8, &@$);
                     /*% ripper: params!($:1, $:3, $:5, $:7, *$:8[0..2]) %*/
                     }
-                | f_arg ',' f_optarg(primary_value) opt_args_tail(block_args_tail)
+                | f_arg ',' f_opt_arg(primary_value) opt_args_tail(block_args_tail)
                     {
                         $$ = new_args(p, $1, $3, 0, 0, $4, &@$);
                     /*% ripper: params!($:1, $:3, Qnil, Qnil, *$:4[0..2]) %*/
                     }
-                | f_arg ',' f_optarg(primary_value) ',' f_arg opt_args_tail(block_args_tail)
+                | f_arg ',' f_opt_arg(primary_value) ',' f_arg opt_args_tail(block_args_tail)
                     {
                         $$ = new_args(p, $1, $3, 0, $5, $6, &@$);
                     /*% ripper: params!($:1, $:3, Qnil, $:5, *$:6[0..2]) %*/
@@ -5009,22 +5009,22 @@ block_param	: f_arg ',' f_optarg(primary_value) ',' f_rest_arg opt_args_tail(blo
                         $$ = new_args(p, $1, 0, 0, 0, $2, &@$);
                     /*% ripper: params!($:1, Qnil, Qnil, Qnil, *$:2[0..2]) %*/
                     }
-                | f_optarg(primary_value) ',' f_rest_arg opt_args_tail(block_args_tail)
+                | f_opt_arg(primary_value) ',' f_rest_arg opt_args_tail(block_args_tail)
                     {
                         $$ = new_args(p, 0, $1, $3, 0, $4, &@$);
                     /*% ripper: params!(Qnil, $:1, $:3, Qnil, *$:4[0..2]) %*/
                     }
-                | f_optarg(primary_value) ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)
+                | f_opt_arg(primary_value) ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)
                     {
                         $$ = new_args(p, 0, $1, $3, $5, $6, &@$);
                     /*% ripper: params!(Qnil, $:1, $:3, $:5, *$:6[0..2]) %*/
                     }
-                | f_optarg(primary_value) opt_args_tail(block_args_tail)
+                | f_opt_arg(primary_value) opt_args_tail(block_args_tail)
                     {
                         $$ = new_args(p, 0, $1, 0, 0, $2, &@$);
                     /*% ripper: params!(Qnil, $:1, Qnil, Qnil, *$:2[0..2]) %*/
                     }
-                | f_optarg(primary_value) ',' f_arg opt_args_tail(block_args_tail)
+                | f_opt_arg(primary_value) ',' f_arg opt_args_tail(block_args_tail)
                     {
                         $$ = new_args(p, 0, $1, 0, $3, $4, &@$);
                     /*% ripper: params!(Qnil, $:1, Qnil, $:3, *$:4[0..2]) %*/
@@ -6281,22 +6281,22 @@ args_tail	: args_tail_basic(arg_value)
                     }
                 ;
 
-f_args		: f_arg ',' f_optarg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)
+f_args		: f_arg ',' f_opt_arg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)
                     {
                         $$ = new_args(p, $1, $3, $5, 0, $6, &@$);
                     /*% ripper: params!($:1, $:3, $:5, Qnil, *$:6[0..2]) %*/
                     }
-                | f_arg ',' f_optarg(arg_value) ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)
+                | f_arg ',' f_opt_arg(arg_value) ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)
                     {
                         $$ = new_args(p, $1, $3, $5, $7, $8, &@$);
                     /*% ripper: params!($:1, $:3, $:5, $:7, *$:8[0..2]) %*/
                     }
-                | f_arg ',' f_optarg(arg_value) opt_args_tail(args_tail)
+                | f_arg ',' f_opt_arg(arg_value) opt_args_tail(args_tail)
                     {
                         $$ = new_args(p, $1, $3, 0, 0, $4, &@$);
                     /*% ripper: params!($:1, $:3, Qnil, Qnil, *$:4[0..2]) %*/
                     }
-                | f_arg ',' f_optarg(arg_value) ',' f_arg opt_args_tail(args_tail)
+                | f_arg ',' f_opt_arg(arg_value) ',' f_arg opt_args_tail(args_tail)
                     {
                         $$ = new_args(p, $1, $3, 0, $5, $6, &@$);
                     /*% ripper: params!($:1, $:3, Qnil, $:5, *$:6[0..2]) %*/
@@ -6316,22 +6316,22 @@ f_args		: f_arg ',' f_optarg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)
                         $$ = new_args(p, $1, 0, 0, 0, $2, &@$);
                     /*% ripper: params!($:1, Qnil, Qnil, Qnil, *$:2[0..2]) %*/
                     }
-                | f_optarg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)
+                | f_opt_arg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)
                     {
                         $$ = new_args(p, 0, $1, $3, 0, $4, &@$);
                     /*% ripper: params!(Qnil, $:1, $:3, Qnil, *$:4[0..2]) %*/
                     }
-                | f_optarg(arg_value) ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)
+                | f_opt_arg(arg_value) ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)
                     {
                         $$ = new_args(p, 0, $1, $3, $5, $6, &@$);
                     /*% ripper: params!(Qnil, $:1, $:3, $:5, *$:6[0..2]) %*/
                     }
-                | f_optarg(arg_value) opt_args_tail(args_tail)
+                | f_opt_arg(arg_value) opt_args_tail(args_tail)
                     {
                         $$ = new_args(p, 0, $1, 0, 0, $2, &@$);
                     /*% ripper: params!(Qnil, $:1, Qnil, Qnil, *$:2[0..2]) %*/
                     }
-                | f_optarg(arg_value) ',' f_arg opt_args_tail(args_tail)
+                | f_opt_arg(arg_value) ',' f_arg opt_args_tail(args_tail)
                     {
                         $$ = new_args(p, 0, $1, 0, $3, $4, &@$);
                     /*% ripper: params!(Qnil, $:1, Qnil, $:3, *$:4[0..2]) %*/

Original file line number	Diff line number	Diff line change
`@@ -2984,15 +2984,15 @@ rb_parser_ary_free(rb_parser_t p, rb_parser_ary_t ary)`
`2984`	`2984`	`}`
`2985`	`2985`	`;`
`2986`	`2986`
`2987`		`-%rule f_optarg(value) <node_opt_arg>`
	`2987`	`+%rule f_opt_arg(value) <node_opt_arg>`
`2988`	`2988`	`: f_opt(value)`
`2989`	`2989`	`{`
`2990`	`2990`	`$$ = $f_opt;`
`2991`	`2991`	`/% ripper: rb_ary_new3(1, $:1) %/`
`2992`	`2992`	`}`
`2993`		`- \| f_optarg(value) ',' f_opt(value)`
	`2993`	`+ \| f_opt_arg(value) ',' f_opt(value)`
`2994`	`2994`	`{`
`2995`		`- $$ = opt_arg_append($f_optarg, $f_opt);`
	`2995`	`+ $$ = opt_arg_append($f_opt_arg, $f_opt);`
`2996`	`2996`	`/% ripper: rb_ary_push($:1, $:3) %/`
`2997`	`2997`	`}`
`2998`	`2998`	`;`
`@@ -4968,22 +4968,22 @@ excessed_comma : ','`
`4968`	`4968`	`}`
`4969`	`4969`	`;`
`4970`	`4970`
`4971`		`-block_param : f_arg ',' f_optarg(primary_value) ',' f_rest_arg opt_args_tail(block_args_tail)`
	`4971`	`+block_param : f_arg ',' f_opt_arg(primary_value) ',' f_rest_arg opt_args_tail(block_args_tail)`
`4972`	`4972`	`{`
`4973`	`4973`	`$$ = new_args(p, $1, $3, $5, 0, $6, &@$);`
`4974`	`4974`	`/% ripper: params!($:1, $:3, $:5, Qnil, $:6[0..2]) %*/`
`4975`	`4975`	`}`
`4976`		`- \| f_arg ',' f_optarg(primary_value) ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)`
	`4976`	`+ \| f_arg ',' f_opt_arg(primary_value) ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)`
`4977`	`4977`	`{`
`4978`	`4978`	`$$ = new_args(p, $1, $3, $5, $7, $8, &@$);`
`4979`	`4979`	`/% ripper: params!($:1, $:3, $:5, $:7, $:8[0..2]) %*/`
`4980`	`4980`	`}`
`4981`		`- \| f_arg ',' f_optarg(primary_value) opt_args_tail(block_args_tail)`
	`4981`	`+ \| f_arg ',' f_opt_arg(primary_value) opt_args_tail(block_args_tail)`
`4982`	`4982`	`{`
`4983`	`4983`	`$$ = new_args(p, $1, $3, 0, 0, $4, &@$);`
`4984`	`4984`	`/% ripper: params!($:1, $:3, Qnil, Qnil, $:4[0..2]) %*/`
`4985`	`4985`	`}`
`4986`		`- \| f_arg ',' f_optarg(primary_value) ',' f_arg opt_args_tail(block_args_tail)`
	`4986`	`+ \| f_arg ',' f_opt_arg(primary_value) ',' f_arg opt_args_tail(block_args_tail)`
`4987`	`4987`	`{`
`4988`	`4988`	`$$ = new_args(p, $1, $3, 0, $5, $6, &@$);`
`4989`	`4989`	`/% ripper: params!($:1, $:3, Qnil, $:5, $:6[0..2]) %*/`
`@@ -5009,22 +5009,22 @@ block_param : f_arg ',' f_optarg(primary_value) ',' f_rest_arg opt_args_tail(blo`
`5009`	`5009`	`$$ = new_args(p, $1, 0, 0, 0, $2, &@$);`
`5010`	`5010`	`/% ripper: params!($:1, Qnil, Qnil, Qnil, $:2[0..2]) %*/`
`5011`	`5011`	`}`
`5012`		`- \| f_optarg(primary_value) ',' f_rest_arg opt_args_tail(block_args_tail)`
	`5012`	`+ \| f_opt_arg(primary_value) ',' f_rest_arg opt_args_tail(block_args_tail)`
`5013`	`5013`	`{`
`5014`	`5014`	`$$ = new_args(p, 0, $1, $3, 0, $4, &@$);`
`5015`	`5015`	`/% ripper: params!(Qnil, $:1, $:3, Qnil, $:4[0..2]) %*/`
`5016`	`5016`	`}`
`5017`		`- \| f_optarg(primary_value) ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)`
	`5017`	`+ \| f_opt_arg(primary_value) ',' f_rest_arg ',' f_arg opt_args_tail(block_args_tail)`
`5018`	`5018`	`{`
`5019`	`5019`	`$$ = new_args(p, 0, $1, $3, $5, $6, &@$);`
`5020`	`5020`	`/% ripper: params!(Qnil, $:1, $:3, $:5, $:6[0..2]) %*/`
`5021`	`5021`	`}`
`5022`		`- \| f_optarg(primary_value) opt_args_tail(block_args_tail)`
	`5022`	`+ \| f_opt_arg(primary_value) opt_args_tail(block_args_tail)`
`5023`	`5023`	`{`
`5024`	`5024`	`$$ = new_args(p, 0, $1, 0, 0, $2, &@$);`
`5025`	`5025`	`/% ripper: params!(Qnil, $:1, Qnil, Qnil, $:2[0..2]) %*/`
`5026`	`5026`	`}`
`5027`		`- \| f_optarg(primary_value) ',' f_arg opt_args_tail(block_args_tail)`
	`5027`	`+ \| f_opt_arg(primary_value) ',' f_arg opt_args_tail(block_args_tail)`
`5028`	`5028`	`{`
`5029`	`5029`	`$$ = new_args(p, 0, $1, 0, $3, $4, &@$);`
`5030`	`5030`	`/% ripper: params!(Qnil, $:1, Qnil, $:3, $:4[0..2]) %*/`
`@@ -6281,22 +6281,22 @@ args_tail : args_tail_basic(arg_value)`
`6281`	`6281`	`}`
`6282`	`6282`	`;`
`6283`	`6283`
`6284`		`-f_args : f_arg ',' f_optarg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)`
	`6284`	`+f_args : f_arg ',' f_opt_arg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)`
`6285`	`6285`	`{`
`6286`	`6286`	`$$ = new_args(p, $1, $3, $5, 0, $6, &@$);`
`6287`	`6287`	`/% ripper: params!($:1, $:3, $:5, Qnil, $:6[0..2]) %*/`
`6288`	`6288`	`}`
`6289`		`- \| f_arg ',' f_optarg(arg_value) ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)`
	`6289`	`+ \| f_arg ',' f_opt_arg(arg_value) ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)`
`6290`	`6290`	`{`
`6291`	`6291`	`$$ = new_args(p, $1, $3, $5, $7, $8, &@$);`
`6292`	`6292`	`/% ripper: params!($:1, $:3, $:5, $:7, $:8[0..2]) %*/`
`6293`	`6293`	`}`
`6294`		`- \| f_arg ',' f_optarg(arg_value) opt_args_tail(args_tail)`
	`6294`	`+ \| f_arg ',' f_opt_arg(arg_value) opt_args_tail(args_tail)`
`6295`	`6295`	`{`
`6296`	`6296`	`$$ = new_args(p, $1, $3, 0, 0, $4, &@$);`
`6297`	`6297`	`/% ripper: params!($:1, $:3, Qnil, Qnil, $:4[0..2]) %*/`
`6298`	`6298`	`}`
`6299`		`- \| f_arg ',' f_optarg(arg_value) ',' f_arg opt_args_tail(args_tail)`
	`6299`	`+ \| f_arg ',' f_opt_arg(arg_value) ',' f_arg opt_args_tail(args_tail)`
`6300`	`6300`	`{`
`6301`	`6301`	`$$ = new_args(p, $1, $3, 0, $5, $6, &@$);`
`6302`	`6302`	`/% ripper: params!($:1, $:3, Qnil, $:5, $:6[0..2]) %*/`
`@@ -6316,22 +6316,22 @@ f_args : f_arg ',' f_optarg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)`
`6316`	`6316`	`$$ = new_args(p, $1, 0, 0, 0, $2, &@$);`
`6317`	`6317`	`/% ripper: params!($:1, Qnil, Qnil, Qnil, $:2[0..2]) %*/`
`6318`	`6318`	`}`
`6319`		`- \| f_optarg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)`
	`6319`	`+ \| f_opt_arg(arg_value) ',' f_rest_arg opt_args_tail(args_tail)`
`6320`	`6320`	`{`
`6321`	`6321`	`$$ = new_args(p, 0, $1, $3, 0, $4, &@$);`
`6322`	`6322`	`/% ripper: params!(Qnil, $:1, $:3, Qnil, $:4[0..2]) %*/`
`6323`	`6323`	`}`
`6324`		`- \| f_optarg(arg_value) ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)`
	`6324`	`+ \| f_opt_arg(arg_value) ',' f_rest_arg ',' f_arg opt_args_tail(args_tail)`
`6325`	`6325`	`{`
`6326`	`6326`	`$$ = new_args(p, 0, $1, $3, $5, $6, &@$);`
`6327`	`6327`	`/% ripper: params!(Qnil, $:1, $:3, $:5, $:6[0..2]) %*/`
`6328`	`6328`	`}`
`6329`		`- \| f_optarg(arg_value) opt_args_tail(args_tail)`
	`6329`	`+ \| f_opt_arg(arg_value) opt_args_tail(args_tail)`
`6330`	`6330`	`{`
`6331`	`6331`	`$$ = new_args(p, 0, $1, 0, 0, $2, &@$);`
`6332`	`6332`	`/% ripper: params!(Qnil, $:1, Qnil, Qnil, $:2[0..2]) %*/`
`6333`	`6333`	`}`
`6334`		`- \| f_optarg(arg_value) ',' f_arg opt_args_tail(args_tail)`
	`6334`	`+ \| f_opt_arg(arg_value) ',' f_arg opt_args_tail(args_tail)`
`6335`	`6335`	`{`
`6336`	`6336`	`$$ = new_args(p, 0, $1, 0, $3, $4, &@$);`
`6337`	`6337`	`/% ripper: params!(Qnil, $:1, Qnil, $:3, $:4[0..2]) %*/`