diff options
| author | Florian Westphal <fw@strlen.de> | 2021-03-08 18:18:34 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2021-03-11 13:43:31 +0100 |
| commit | 992a5dc69742717af9056be61d46b455a5448bae (patch) | |
| tree | 1f88eaca0ede5a5be3ae7ada93653b3acb67707c | |
| parent | 5896772fe3c5f01696188ea04957a825ee601b12 (diff) | |
scanner: queue: move to own scope
allows to remove 3 queue specific keywords from INITIAL scope.
Signed-off-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | include/parser.h | 1 | ||||
| -rw-r--r-- | src/parser_bison.y | 5 | ||||
| -rw-r--r-- | src/scanner.l | 12 |
3 files changed, 11 insertions, 7 deletions
diff --git a/include/parser.h b/include/parser.h index b2ebd7aa..c3a85a4c 100644 --- a/include/parser.h +++ b/include/parser.h @@ -30,6 +30,7 @@ enum startcond_type { PARSER_SC_BEGIN, PARSER_SC_EXPR_HASH, PARSER_SC_EXPR_NUMGEN, + PARSER_SC_EXPR_QUEUE, }; struct mnl_socket; diff --git a/src/parser_bison.y b/src/parser_bison.y index 1ac4dbe4..423dddfc 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -863,6 +863,7 @@ opt_newline : NEWLINE close_scope_hash : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_HASH); }; close_scope_numgen : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_NUMGEN); }; +close_scope_queue : { scanner_pop_start_cond(nft->scanner, PARSER_SC_EXPR_QUEUE); }; common_block : INCLUDE QUOTED_STRING stmt_separator { @@ -3635,8 +3636,8 @@ nf_nat_flag : RANDOM { $$ = NF_NAT_RANGE_PROTO_RANDOM; } | PERSISTENT { $$ = NF_NAT_RANGE_PERSISTENT; } ; -queue_stmt : queue_stmt_alloc - | queue_stmt_alloc queue_stmt_args +queue_stmt : queue_stmt_alloc close_scope_queue + | queue_stmt_alloc queue_stmt_args close_scope_queue ; queue_stmt_alloc : QUEUE diff --git a/src/scanner.l b/src/scanner.l index 94225c29..893364b7 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -198,6 +198,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) %option stack %s SCANSTATE_EXPR_HASH %s SCANSTATE_EXPR_NUMGEN +%s SCANSTATE_EXPR_QUEUE %% @@ -346,11 +347,12 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "queue-threshold" { return QUEUE_THRESHOLD; } "level" { return LEVEL; } -"queue" { return QUEUE;} -"num" { return QUEUENUM;} -"bypass" { return BYPASS;} -"fanout" { return FANOUT;} - +"queue" { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_QUEUE); return QUEUE;} +<SCANSTATE_EXPR_QUEUE>{ + "num" { return QUEUENUM;} + "bypass" { return BYPASS;} + "fanout" { return FANOUT;} +} "limit" { return LIMIT; } "rate" { return RATE; } "burst" { return BURST; } |