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 <phil@xxxxxx> --- 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 bf8b0e93f7438..d13eaa666a1e0 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -594,16 +594,16 @@ int nft_lex(void *, void *, void *); %type <expr> multiton_rhs_expr %destructor { expr_free($$); } multiton_rhs_expr -%type <expr> prefix_rhs_expr range_rhs_expr wildcard_rhs_expr -%destructor { expr_free($$); } prefix_rhs_expr range_rhs_expr wildcard_rhs_expr +%type <expr> prefix_rhs_expr range_rhs_expr +%destructor { expr_free($$); } prefix_rhs_expr range_rhs_expr %type <expr> 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 <expr> multiton_stmt_expr %destructor { expr_free($$); } multiton_stmt_expr -%type <expr> prefix_stmt_expr range_stmt_expr wildcard_stmt_expr -%destructor { expr_free($$); } prefix_stmt_expr range_stmt_expr wildcard_stmt_expr +%type <expr> prefix_stmt_expr range_stmt_expr wildcard_expr +%destructor { expr_free($$); } prefix_stmt_expr range_stmt_expr wildcard_expr %type <expr> primary_stmt_expr basic_stmt_expr %destructor { expr_free($$); } primary_stmt_expr basic_stmt_expr @@ -2542,7 +2542,7 @@ range_stmt_expr : basic_stmt_expr DASH basic_stmt_expr } ; -wildcard_stmt_expr : ASTERISK +wildcard_expr : ASTERISK { struct expr *expr; @@ -2555,7 +2555,7 @@ wildcard_stmt_expr : ASTERISK multiton_stmt_expr : prefix_stmt_expr | range_stmt_expr - | wildcard_stmt_expr + | wildcard_expr ; stmt_expr : map_stmt_expr @@ -2982,20 +2982,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 -- 2.17.0 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html