diff options
| author | Florian Westphal <fw@strlen.de> | 2024-02-27 15:53:19 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2024-03-01 00:32:14 +0100 |
| commit | fb98cb91c575880617e5da2cb6f094525516cb78 (patch) | |
| tree | 536622e934f0a0d8f1ca3e8035eb335c06b09f81 /src/parser_bison.y | |
| parent | 81fc7aee0d523d61077518534036ff10beddb3e9 (diff) | |
parser: compact type/typeof set rules
Set/maps keys can be declared either by 'type' or 'typeof' keyword.
Compact this to use a common block for both cases.
The datatype_set call is redundant, remove it:
at this point $3 == $1->key, so this is a no-op.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/parser_bison.y')
| -rw-r--r-- | src/parser_bison.y | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index 2b496828..cba37c68 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -812,8 +812,8 @@ int nft_lex(void *, void *, void *); %type <expr> symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr %destructor { expr_free($$); } symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr -%type <expr> primary_expr shift_expr and_expr typeof_expr typeof_data_expr typeof_verdict_expr -%destructor { expr_free($$); } primary_expr shift_expr and_expr typeof_expr typeof_data_expr typeof_verdict_expr +%type <expr> primary_expr shift_expr and_expr typeof_expr typeof_data_expr typeof_key_expr typeof_verdict_expr +%destructor { expr_free($$); } primary_expr shift_expr and_expr typeof_expr typeof_data_expr typeof_key_expr typeof_verdict_expr %type <expr> exclusive_or_expr inclusive_or_expr %destructor { expr_free($$); } exclusive_or_expr inclusive_or_expr %type <expr> basic_expr @@ -2182,27 +2182,21 @@ set_block_alloc : /* empty */ } ; +typeof_key_expr : TYPEOF typeof_expr { $$ = $2; } + | TYPE data_type_expr close_scope_type { $$ = $2; } + ; + set_block : /* empty */ { $$ = $<set>-1; } | set_block common_block | set_block stmt_separator - | set_block TYPE data_type_expr stmt_separator close_scope_type + | set_block typeof_key_expr stmt_separator { if (already_set($1->key, &@2, state)) { - expr_free($3); + expr_free($2); YYERROR; } - $1->key = $3; - $$ = $1; - } - | set_block TYPEOF typeof_expr stmt_separator - { - if (already_set($1->key, &@2, state)) { - expr_free($3); - YYERROR; - } - $1->key = $3; - datatype_set($1->key, $3->dtype); + $1->key = $2; $$ = $1; } | set_block FLAGS set_flag_list stmt_separator |