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 <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/parser_bison.y b/src/parser_bison.y
index 1eb6ec6e93f254eecd2ec8f5ee9cb2df344a5ac3..b67dc69df391379aa2038c22a95b0e6b2fda2444 100644 (file)
--- 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
@@ -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