From 84ee11474385fe67f551486c9bbcc94e387ba927 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 12 Feb 2021 17:59:29 +0100 Subject: [PATCH 1/2] parser_bison: rename chain_identifier to chain_block_identifier Signed-off-by: Pablo Neira Ayuso --- src/parser_bison.y | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/parser_bison.y b/src/parser_bison.y index 11e899ff2f20..825f134c33ff 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -588,8 +588,8 @@ int nft_lex(void *, void *, void *); %type base_cmd add_cmd replace_cmd create_cmd insert_cmd delete_cmd get_cmd list_cmd reset_cmd flush_cmd rename_cmd export_cmd monitor_cmd describe_cmd import_cmd %destructor { cmd_free($$); } base_cmd add_cmd replace_cmd create_cmd insert_cmd delete_cmd get_cmd list_cmd reset_cmd flush_cmd rename_cmd export_cmd monitor_cmd describe_cmd import_cmd -%type table_spec tableid_spec chain_spec chainid_spec flowtable_spec chain_identifier ruleid_spec handle_spec position_spec rule_position ruleset_spec index_spec -%destructor { handle_free(&$$); } table_spec tableid_spec chain_spec chainid_spec flowtable_spec chain_identifier ruleid_spec handle_spec position_spec rule_position ruleset_spec index_spec +%type table_spec tableid_spec chain_spec chainid_spec flowtable_spec chain_block_identifier ruleid_spec handle_spec position_spec rule_position ruleset_spec index_spec +%destructor { handle_free(&$$); } table_spec tableid_spec chain_spec chainid_spec flowtable_spec chain_block_identifier ruleid_spec handle_spec position_spec rule_position ruleset_spec index_spec %type set_spec setid_spec set_identifier flowtableid_spec flowtable_identifier obj_spec objid_spec obj_identifier %destructor { handle_free(&$$); } set_spec setid_spec set_identifier flowtableid_spec obj_spec objid_spec obj_identifier %type family_spec family_spec_explicit @@ -1576,7 +1576,7 @@ table_block : /* empty */ { $$ = $-1; } | table_block common_block | table_block stmt_separator | table_block table_options stmt_separator - | table_block CHAIN chain_identifier + | table_block CHAIN chain_block_identifier chain_block_alloc '{' chain_block '}' stmt_separator { @@ -2463,7 +2463,7 @@ chainid_spec : table_spec HANDLE NUM } ; -chain_identifier : identifier +chain_block_identifier : identifier { memset(&$$, 0, sizeof($$)); $$.chain.name = $1; -- 2.20.1