From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B14BCC433ED for ; Mon, 10 May 2021 16:53:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A45E611C2 for ; Mon, 10 May 2021 16:53:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231984AbhEJQyd (ORCPT ); Mon, 10 May 2021 12:54:33 -0400 Received: from mail.netfilter.org ([217.70.188.207]:54294 "EHLO mail.netfilter.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232047AbhEJQyc (ORCPT ); Mon, 10 May 2021 12:54:32 -0400 Received: from localhost.localdomain (unknown [90.77.255.23]) by mail.netfilter.org (Postfix) with ESMTPSA id AF92164164 for ; Mon, 10 May 2021 18:52:38 +0200 (CEST) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nftables 1/2] parser_bison: add set_elem_key_expr rule Date: Mon, 10 May 2021 18:53:20 +0200 Message-Id: <20210510165322.130181-1-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Add a rule to specify the set key expression in preparation for the catch-all element support. Signed-off-by: Pablo Neira Ayuso --- src/parser_bison.y | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/parser_bison.y b/src/parser_bison.y index b50b60649d2e..e4a5ade296d7 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -842,6 +842,9 @@ int nft_lex(void *, void *, void *); %type xfrm_expr %destructor { expr_free($$); } xfrm_expr +%type set_elem_key_expr +%destructor { expr_free($$); } set_elem_key_expr + %% input : /* empty */ @@ -4084,13 +4087,16 @@ set_elem_expr : set_elem_expr_alloc | set_elem_expr_alloc set_elem_expr_options ; -set_elem_expr_alloc : set_lhs_expr set_elem_stmt_list +set_elem_key_expr : set_lhs_expr { $$ = $1; } + ; + +set_elem_expr_alloc : set_elem_key_expr set_elem_stmt_list { $$ = set_elem_expr_alloc(&@1, $1); list_splice_tail($2, &$$->stmt_list); xfree($2); } - | set_lhs_expr + | set_elem_key_expr { $$ = set_elem_expr_alloc(&@1, $1); } -- 2.30.2