From caf5cb10fbde15845a63e857e0639921036b3f73 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 1 Jun 2018 17:32:06 +0200 Subject: parser_bison: Merge wildcard_rhs_expr and wildcard_stmt_expr The two are absolutely identical, just referenced at different places. Since there is no need for the distinction, just merge them into one. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/parser_bison.y | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/parser_bison.y b/src/parser_bison.y index 1eb6ec6e..b67dc69d 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -594,16 +594,16 @@ int nft_lex(void *, void *, void *); %type multiton_rhs_expr %destructor { expr_free($$); } multiton_rhs_expr -%type prefix_rhs_expr range_rhs_expr wildcard_rhs_expr -%destructor { expr_free($$); } prefix_rhs_expr range_rhs_expr wildcard_rhs_expr +%type prefix_rhs_expr range_rhs_expr +%destructor { expr_free($$); } prefix_rhs_expr range_rhs_expr %type stmt_expr concat_stmt_expr map_stmt_expr map_stmt_expr_set %destructor { expr_free($$); } stmt_expr concat_stmt_expr map_stmt_expr map_stmt_expr_set %type multiton_stmt_expr %destructor { expr_free($$); } multiton_stmt_expr -%type prefix_stmt_expr range_stmt_expr wildcard_stmt_expr -%destructor { expr_free($$); } prefix_stmt_expr range_stmt_expr wildcard_stmt_expr +%type prefix_stmt_expr range_stmt_expr wildcard_expr +%destructor { expr_free($$); } prefix_stmt_expr range_stmt_expr wildcard_expr %type primary_stmt_expr basic_stmt_expr %destructor { expr_free($$); } primary_stmt_expr basic_stmt_expr @@ -2540,7 +2540,7 @@ range_stmt_expr : basic_stmt_expr DASH basic_stmt_expr } ; -wildcard_stmt_expr : ASTERISK +wildcard_expr : ASTERISK { struct expr *expr; @@ -2553,7 +2553,7 @@ wildcard_stmt_expr : ASTERISK multiton_stmt_expr : prefix_stmt_expr | range_stmt_expr - | wildcard_stmt_expr + | wildcard_expr ; stmt_expr : map_stmt_expr @@ -2980,20 +2980,9 @@ range_rhs_expr : basic_rhs_expr DASH basic_rhs_expr } ; -wildcard_rhs_expr : ASTERISK - { - struct expr *expr; - - expr = constant_expr_alloc(&@$, &integer_type, - BYTEORDER_HOST_ENDIAN, - 0, NULL); - $$ = prefix_expr_alloc(&@$, expr, 0); - } - ; - multiton_rhs_expr : prefix_rhs_expr | range_rhs_expr - | wildcard_rhs_expr + | wildcard_expr ; map_expr : concat_expr MAP rhs_expr -- cgit v1.2.3