diff options
| author | Florian Westphal <fw@strlen.de> | 2021-03-04 02:07:34 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2021-03-06 01:12:12 +0100 |
| commit | f04ae7d3969c48084180e524841fd1fb1f68ffbe (patch) | |
| tree | 3def41c13756d5fcec3a17b724ccb500494d6b0a /src/parser_bison.y | |
| parent | f6e2589f3fad8562914a52805bd585adb76f4596 (diff) | |
parser: compact map RHS type
Similar to previous patch, we can avoid duplication.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/parser_bison.y')
| -rw-r--r-- | src/parser_bison.y | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index 363569ff..c4f3e341 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -627,6 +627,7 @@ int nft_lex(void *, void *, void *); %type <set> map_block_alloc map_block %destructor { set_free($$); } map_block_alloc +%type <val> map_block_obj_type %type <flowtable> flowtable_block_alloc flowtable_block %destructor { flowtable_free($$); } flowtable_block_alloc @@ -1877,6 +1878,12 @@ map_block_alloc : /* empty */ } ; +map_block_obj_type : COUNTER { $$ = NFT_OBJECT_COUNTER; } + | QUOTA { $$ = NFT_OBJECT_QUOTA; } + | LIMIT { $$ = NFT_OBJECT_LIMIT; } + | SECMARK { $$ = NFT_OBJECT_SECMARK; } + ; + map_block : /* empty */ { $$ = $<set>-1; } | map_block common_block | map_block stmt_separator @@ -1930,38 +1937,11 @@ map_block : /* empty */ { $$ = $<set>-1; } $$ = $1; } | map_block TYPE - data_type_expr COLON COUNTER - stmt_separator - { - $1->key = $3; - $1->objtype = NFT_OBJECT_COUNTER; - $1->flags |= NFT_SET_OBJECT; - $$ = $1; - } - | map_block TYPE - data_type_expr COLON QUOTA - stmt_separator - { - $1->key = $3; - $1->objtype = NFT_OBJECT_QUOTA; - $1->flags |= NFT_SET_OBJECT; - $$ = $1; - } - | map_block TYPE - data_type_expr COLON LIMIT - stmt_separator - { - $1->key = $3; - $1->objtype = NFT_OBJECT_LIMIT; - $1->flags |= NFT_SET_OBJECT; - $$ = $1; - } - | map_block TYPE - data_type_expr COLON SECMARK + data_type_expr COLON map_block_obj_type stmt_separator { $1->key = $3; - $1->objtype = NFT_OBJECT_SECMARK; + $1->objtype = $5; $1->flags |= NFT_SET_OBJECT; $$ = $1; } |