netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Florian Westphal <fw@strlen.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nft 3/3] bison: permit keywords in list_stmt_expressions
Date: Wed, 27 Sep 2017 19:57:13 +0200	[thread overview]
Message-ID: <20170927175713.GC17665@salvia> (raw)
In-Reply-To: <20170927173807.29882-4-fw@strlen.de>

On Wed, Sep 27, 2017 at 07:38:07PM +0200, Florian Westphal wrote:
> 'ct event set label' and 'ct event set new or label' work, but
> 'ct event set new, label' did not:
> 
>   nft add rule filter input ct event set new,label
>   Error: syntax error, unexpected label
> 
> This changes the definition to also contain keyword symbol expressions.
> 
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
>  src/parser_bison.y        | 11 +++++++----
>  tests/py/any/ct.t         |  1 +
>  tests/py/any/ct.t.payload |  5 +++++
>  3 files changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/src/parser_bison.y b/src/parser_bison.y
> index ce6a77a89847..87ae4c30712a 100644
> --- a/src/parser_bison.y
> +++ b/src/parser_bison.y
> @@ -609,8 +609,8 @@ static void location_update(struct location *loc, struct location *rhs, int n)
>  
>  %type <expr>			rhs_expr concat_rhs_expr basic_rhs_expr
>  %destructor { expr_free($$); }	rhs_expr concat_rhs_expr basic_rhs_expr
> -%type <expr>			primary_rhs_expr list_rhs_expr shift_rhs_expr
> -%destructor { expr_free($$); }	primary_rhs_expr list_rhs_expr shift_rhs_expr
> +%type <expr>			primary_rhs_expr list_rhs_expr shift_rhs_expr symbol_rhs_expr
> +%destructor { expr_free($$); }	primary_rhs_expr list_rhs_expr shift_rhs_expr symbol_rhs_expr
>  %type <expr>			and_rhs_expr exclusive_or_rhs_expr inclusive_or_rhs_expr
>  %destructor { expr_free($$); }	and_rhs_expr exclusive_or_rhs_expr inclusive_or_rhs_expr
>  
> @@ -3302,14 +3302,17 @@ ct_key_dir_optional	:	BYTES		{ $$ = NFT_CT_BYTES; }
>  			|	ZONE		{ $$ = NFT_CT_ZONE; }
>  			;
>  
> +symbol_rhs_expr		:	symbol_expr
> +			|	keyword_expr

Could you rename this to symbol_stmt_expr?

So it's clear this refers to the grammar tree that deals with
*stmt_expr. Apart from that nitpick.

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

      reply	other threads:[~2017-09-27 17:57 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-27 17:38 [PATCH nft 1/3] ct: make ct event set work with COMMA syntax Florian Westphal
2017-09-27 17:38 ` [PATCH nft 1/3] src: prepare for future ct timeout policy support Florian Westphal
2017-09-27 17:53   ` Pablo Neira Ayuso
2017-09-27 17:38 ` [PATCH nft 2/3] src: parser_bison: rename ct_block to ct_helper_block Florian Westphal
2017-09-27 17:54   ` Pablo Neira Ayuso
2017-09-27 17:38 ` [PATCH nft 3/3] bison: permit keywords in list_stmt_expressions Florian Westphal
2017-09-27 17:57   ` Pablo Neira Ayuso [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170927175713.GC17665@salvia \
    --to=pablo@netfilter.org \
    --cc=fw@strlen.de \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).