[PATCH nft] parser_bison: get rid of unneeded statement

[PATCH nft] parser_bison: get rid of unneeded statement

[Florian Westphal]

Was used for the legacy flow statement, but that was removed in
2ee93ca27ddc ("parser_bison: remove deprecated flow statement")

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 src/parser_bison.y | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/parser_bison.y b/src/parser_bison.y
index f55127839a9b..e494079d6373 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -811,8 +811,8 @@ int nft_lex(void *, void *, void *);
 %type <val>			set_stmt_op
 %type <stmt>			map_stmt
 %destructor { stmt_free($$); }	map_stmt
-%type <stmt>			meter_stmt meter_stmt_alloc
-%destructor { stmt_free($$); }	meter_stmt meter_stmt_alloc
+%type <stmt>			meter_stmt
+%destructor { stmt_free($$); }	meter_stmt
 
 %type <expr>			symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr
 %destructor { expr_free($$); }	symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr
@@ -4192,10 +4192,7 @@ map_stmt		:	set_stmt_op	set_ref_expr '{' set_elem_expr_stmt	COLON	set_elem_expr_
 			}
 			;
 
-meter_stmt		:	meter_stmt_alloc		{ $$ = $1; }
-			;
-
-meter_stmt_alloc	:	METER	identifier		'{' meter_key_expr stmt '}'
+meter_stmt 		:	METER	identifier		'{' meter_key_expr stmt '}'
 			{
 				$$ = meter_stmt_alloc(&@$);
 				$$->meter.name = $2;
-- 
2.45.3

Re: [PATCH nft] parser_bison: get rid of unneeded statement

[Pablo Neira Ayuso]

On Mon, Feb 24, 2025 at 06:52:11PM +0100, Florian Westphal wrote:
> Was used for the legacy flow statement, but that was removed in
> 2ee93ca27ddc ("parser_bison: remove deprecated flow statement")
> 
> Signed-off-by: Florian Westphal <fw@strlen.de>

Reviewed-by: Pablo Neira Ayuso <pablo@netfilter.org>

Thanks.

> ---
>  src/parser_bison.y | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/src/parser_bison.y b/src/parser_bison.y
> index f55127839a9b..e494079d6373 100644
> --- a/src/parser_bison.y
> +++ b/src/parser_bison.y
> @@ -811,8 +811,8 @@ int nft_lex(void *, void *, void *);
>  %type <val>			set_stmt_op
>  %type <stmt>			map_stmt
>  %destructor { stmt_free($$); }	map_stmt
> -%type <stmt>			meter_stmt meter_stmt_alloc
> -%destructor { stmt_free($$); }	meter_stmt meter_stmt_alloc
> +%type <stmt>			meter_stmt
> +%destructor { stmt_free($$); }	meter_stmt
>  
>  %type <expr>			symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr
>  %destructor { expr_free($$); }	symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr
> @@ -4192,10 +4192,7 @@ map_stmt		:	set_stmt_op	set_ref_expr '{' set_elem_expr_stmt	COLON	set_elem_expr_
>  			}
>  			;
>  
> -meter_stmt		:	meter_stmt_alloc		{ $$ = $1; }
> -			;
> -
> -meter_stmt_alloc	:	METER	identifier		'{' meter_key_expr stmt '}'
> +meter_stmt 		:	METER	identifier		'{' meter_key_expr stmt '}'
>  			{
>  				$$ = meter_stmt_alloc(&@$);
>  				$$->meter.name = $2;
> -- 
> 2.45.3
> 
>