From e9a36f8abe3fae23878fd99ed5078717b9b7e826 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 17 Sep 2023 15:30:06 +0900
Subject: [PATCH] Tag `p_lparen` and `p_lbracket` as `tbl`

Remove tagging to the component for each reference.
---
 parse.y | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/parse.y b/parse.y
index ed9bfe6b7e..a653ffa0b9 100644
--- a/parse.y
+++ b/parse.y
@@ -1628,6 +1628,7 @@ static int looking_at_eol_p(struct parser_params *p);
 %type <id>   p_kwrest p_kwnorest p_any_kwrest p_kw_label
 %type <id>   f_no_kwarg f_any_kwrest args_forward excessed_comma nonlocal_var
 %type <ctxt> lex_ctxt begin_defined k_class k_module
+%type <tbl>  p_lparen p_lbracket
 %token END_OF_INPUT 0	"end-of-input"
 %token <id> '.'
 /* escaped chars, should be ignored otherwise */
@@ -4625,14 +4626,14 @@ p_alt		: p_alt '|' p_expr_basic
                 | p_expr_basic
                 ;
 
-p_lparen	: '(' {$<tbl>$ = push_pktbl(p);};
-p_lbracket	: '[' {$<tbl>$ = push_pktbl(p);};
+p_lparen	: '(' {$$ = push_pktbl(p);};
+p_lbracket	: '[' {$$ = push_pktbl(p);};
 
 p_expr_basic	: p_value
                 | p_variable
                 | p_const p_lparen p_args rparen
                     {
-                        pop_pktbl(p, $<tbl>2);
+                        pop_pktbl(p, $2);
                         $$ = new_array_pattern(p, $1, Qnone, $3, &@$);
                     /*%%%*/
                         nd_set_first_loc($$, @1.beg_pos);
@@ -4641,7 +4642,7 @@ p_expr_basic	: p_value
                     }
                 | p_const p_lparen p_find rparen
                     {
-                        pop_pktbl(p, $<tbl>2);
+                        pop_pktbl(p, $2);
                         $$ = new_find_pattern(p, $1, $3, &@$);
                     /*%%%*/
                         nd_set_first_loc($$, @1.beg_pos);
@@ -4650,7 +4651,7 @@ p_expr_basic	: p_value
                     }
                 | p_const p_lparen p_kwargs rparen
                     {
-                        pop_pktbl(p, $<tbl>2);
+                        pop_pktbl(p, $2);
                         $$ = new_hash_pattern(p, $1, $3, &@$);
                     /*%%%*/
                         nd_set_first_loc($$, @1.beg_pos);
@@ -4664,7 +4665,7 @@ p_expr_basic	: p_value
                     }
                 | p_const p_lbracket p_args rbracket
                     {
-                        pop_pktbl(p, $<tbl>2);
+                        pop_pktbl(p, $2);
                         $$ = new_array_pattern(p, $1, Qnone, $3, &@$);
                     /*%%%*/
                         nd_set_first_loc($$, @1.beg_pos);
@@ -4673,7 +4674,7 @@ p_expr_basic	: p_value
                     }
                 | p_const p_lbracket p_find rbracket
                     {
-                        pop_pktbl(p, $<tbl>2);
+                        pop_pktbl(p, $2);
                         $$ = new_find_pattern(p, $1, $3, &@$);
                     /*%%%*/
                         nd_set_first_loc($$, @1.beg_pos);
@@ -4682,7 +4683,7 @@ p_expr_basic	: p_value
                     }
                 | p_const p_lbracket p_kwargs rbracket
                     {
-                        pop_pktbl(p, $<tbl>2);
+                        pop_pktbl(p, $2);
                         $$ = new_hash_pattern(p, $1, $3, &@$);
                     /*%%%*/
                         nd_set_first_loc($$, @1.beg_pos);