diff options
Diffstat (limited to 'src/parser.y')
| -rw-r--r-- | src/parser.y | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/src/parser.y b/src/parser.y index 38b655d7..3e08e21e 100644 --- a/src/parser.y +++ b/src/parser.y @@ -365,10 +365,8 @@ static int monitor_lookup_event(const char *event) %token QUEUE "queue" %token QUEUENUM "num" -%token QUEUETOTAL "total" %token QUEUEBYPASS "bypass" %token QUEUECPUFANOUT "fanout" -%token OPTIONS "options" %token POSITION "position" %token COMMENT "comment" @@ -425,7 +423,7 @@ static int monitor_lookup_event(const char *event) %destructor { stmt_free($$); } reject_stmt %type <stmt> nat_stmt nat_stmt_alloc %destructor { stmt_free($$); } nat_stmt nat_stmt_alloc -%type <stmt> queue_stmt queue_stmt_alloc +%type <stmt> queue_stmt queue_stmt_alloc queue_range %destructor { stmt_free($$); } queue_stmt queue_stmt_alloc %type <val> queue_flags queue_flag @@ -1438,30 +1436,46 @@ queue_stmt : queue_stmt_alloc | queue_stmt_alloc queue_args ; -queue_stmt_alloc : QUEUE +queue_stmt_alloc : QUEUE { $$ = queue_stmt_alloc(&@$); } ; -queue_args : queue_arg +queue_args : QUEUENUM queue_range queue_flags { - $<stmt>$ = $<stmt>0; + $<stmt>0->queue.from = $2->queue.from; + $<stmt>0->queue.to = $2->queue.to; + $<stmt>0->queue.flags = $3; } - | queue_args queue_arg - ; - -queue_arg : QUEUENUM NUM + | QUEUENUM queue_range { - $<stmt>0->queue.queuenum = $2; + $<stmt>0->queue.from = $2->queue.from; + $<stmt>0->queue.to = $2->queue.to; } - | QUEUETOTAL NUM + | queue_flags { - $<stmt>0->queue.queues_total = $2; + $<stmt>0->queue.flags = $1; } - | OPTIONS queue_flags + ; + +queue_range : NUM { - $<stmt>0->queue.flags = $2; + $<stmt>0->queue.from = $1; + $<stmt>0->queue.to = $1; + $$ = $<stmt>0; + } + | NUM DASH NUM + { + if ($3 < $1) { + erec_queue(error(&@1, + "invalid range %d-%d", + $1, $3), state->msgs); + YYERROR; + } + $<stmt>0->queue.from = $1; + $<stmt>0->queue.to = $3; + $$ = $<stmt>0; } ; @@ -1469,9 +1483,9 @@ queue_flags : queue_flag { $$ = $1; } - | queue_flags COMMA queue_flag + | queue_flags queue_flag { - $$ |= $1 | $3; + $$ |= $1 | $2; } ; |