From d8e5a833929d72f98892b0f178436811fbc51aac Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 28 Jan 2014 14:35:55 +0000 Subject: [PATCH] - delay-close: msec option that delays closing ports for which the UDP reply has timed out. Keeps the port open, only accepts the correct reply. This correct reply is not used, but the port is open so that no port-denied ICMPs are generated. git-svn-id: file:///svn/unbound/trunk@3058 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/worker.c | 2 +- doc/Changelog | 4 + doc/example.conf.in | 3 + doc/unbound.conf.5.in | 9 + libunbound/libworker.c | 3 +- services/outside_network.c | 46 +- services/outside_network.h | 11 +- testcode/fake_event.c | 8 +- util/config_file.c | 3 + util/config_file.h | 2 + util/configlexer.c | 2270 ++++++++++++++++++------------------ util/configlexer.lex | 1 + util/configparser.c | 875 +++++++------- util/configparser.h | 6 +- util/configparser.y | 13 +- util/fptr_wlist.c | 1 + 16 files changed, 1684 insertions(+), 1573 deletions(-) diff --git a/daemon/worker.c b/daemon/worker.c index a07f2a46e..d98647fcd 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -1156,7 +1156,7 @@ worker_init(struct worker* worker, struct config_file *cfg, worker->daemon->env->infra_cache, worker->rndstate, cfg->use_caps_bits_for_id, worker->ports, worker->numports, cfg->unwanted_threshold, &worker_alloc_cleanup, worker, - cfg->do_udp, worker->daemon->connect_sslctx); + cfg->do_udp, worker->daemon->connect_sslctx, cfg->delay_close); if(!worker->back) { log_err("could not create outgoing sockets"); worker_delete(worker); diff --git a/doc/Changelog b/doc/Changelog index 44812295d..a1bcf7ece 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,10 @@ - iana portlist updated. - iana portlist test updated so it does not touch the source if there are no changes. + - delay-close: msec option that delays closing ports for which + the UDP reply has timed out. Keeps the port open, only accepts + the correct reply. This correct reply is not used, but the port + is open so that no port-denied ICMPs are generated. 27 January 2014: Wouter - reuseport is attempted, then fallback to without on failure. diff --git a/doc/example.conf.in b/doc/example.conf.in index 9a496f9f5..3656d0511 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -114,6 +114,9 @@ server: # if very busy, 50% queries run to completion, 50% get timeout in msec # jostle-timeout: 200 + + # msec to wait before close of port on timeout UDP. 0 disables. + # delay-close: 0 # the amount of memory to use for the RRset cache. # plain value in bytes or you can append k, m or G. default is "4Mb". diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 93885fd7d..b41b7cd8d 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -228,6 +228,15 @@ The qps for short queries can be about (numqueriesperthread / 2) / (jostletimeout in whole seconds) qps per thread, about (1024/2)*5 = 2560 qps by default. .TP +.B delay\-close: \fI +Extra delay for timeouted UDP ports before they are closed, in msec. +Default is 0, and that disables it. This prevents very delayed answer +packets from the upstream (recursive) servers from bouncing against +closed ports and setting off all sort of close-port counters, with +eg. 1500 msec. When timeouts happen you need extra sockets, it checks +the ID and remote IP of packets, and unwanted packets are added to the +unwanted packet counter. +.TP .B so\-rcvbuf: \fI If not 0, then set the SO_RCVBUF socket option to get more buffer space on UDP port 53 incoming queries. So that short spikes on busy diff --git a/libunbound/libworker.c b/libunbound/libworker.c index 9a767a53c..c33f687df 100644 --- a/libunbound/libworker.c +++ b/libunbound/libworker.c @@ -229,7 +229,8 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct event_base* eb) cfg->do_tcp?cfg->outgoing_num_tcp:0, w->env->infra_cache, w->env->rnd, cfg->use_caps_bits_for_id, ports, numports, cfg->unwanted_threshold, - &libworker_alloc_cleanup, w, cfg->do_udp, w->sslctx); + &libworker_alloc_cleanup, w, cfg->do_udp, w->sslctx, + cfg->delay_close); if(!w->is_bg || w->is_bg_thread) { lock_basic_unlock(&ctx->cfglock); } diff --git a/services/outside_network.c b/services/outside_network.c index cda02f1cb..fa5000a4f 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -381,9 +381,11 @@ outnet_send_wait_udp(struct outside_network* outnet) if(!randomize_and_send_udp(outnet, pend, outnet->udp_buff, pend->timeout)) { /* callback error on pending */ - fptr_ok(fptr_whitelist_pending_udp(pend->cb)); - (void)(*pend->cb)(outnet->unused_fds->cp, pend->cb_arg, - NETEVENT_CLOSED, NULL); + if(pend->cb) { + fptr_ok(fptr_whitelist_pending_udp(pend->cb)); + (void)(*pend->cb)(outnet->unused_fds->cp, pend->cb_arg, + NETEVENT_CLOSED, NULL); + } pending_delete(outnet, pend); } } @@ -460,8 +462,10 @@ outnet_udp_cb(struct comm_point* c, void* arg, int error, verbose(VERB_ALGO, "outnet handle udp reply"); /* delete from tree first in case callback creates a retry */ (void)rbtree_delete(outnet->pending, p->node.key); - fptr_ok(fptr_whitelist_pending_udp(p->cb)); - (void)(*p->cb)(p->pc->cp, p->cb_arg, NETEVENT_NOERROR, reply_info); + if(p->cb) { + fptr_ok(fptr_whitelist_pending_udp(p->cb)); + (void)(*p->cb)(p->pc->cp, p->cb_arg, NETEVENT_NOERROR, reply_info); + } portcomm_loweruse(outnet, p->pc); pending_delete(NULL, p); outnet_send_wait_udp(outnet); @@ -496,6 +500,17 @@ calc_num46(char** ifs, int num_ifs, int do_ip4, int do_ip6, } +void +pending_udp_timer_delay_cb(void* arg) +{ + struct pending* p = (struct pending*)arg; + struct outside_network* outnet = p->outnet; + verbose(VERB_ALGO, "timeout udp with delay"); + portcomm_loweruse(outnet, p->pc); + pending_delete(outnet, p); + outnet_send_wait_udp(outnet); +} + void pending_udp_timer_cb(void *arg) { @@ -503,8 +518,16 @@ pending_udp_timer_cb(void *arg) struct outside_network* outnet = p->outnet; /* it timed out */ verbose(VERB_ALGO, "timeout udp"); - fptr_ok(fptr_whitelist_pending_udp(p->cb)); - (void)(*p->cb)(p->pc->cp, p->cb_arg, NETEVENT_TIMEOUT, NULL); + if(p->cb) { + fptr_ok(fptr_whitelist_pending_udp(p->cb)); + (void)(*p->cb)(p->pc->cp, p->cb_arg, NETEVENT_TIMEOUT, NULL); + } + if(outnet->delayclose) { + p->cb = NULL; + p->timer->callback = &pending_udp_timer_delay_cb; + comm_timer_set(p->timer, &outnet->delay_tv); + return; + } portcomm_loweruse(outnet, p->pc); pending_delete(outnet, p); outnet_send_wait_udp(outnet); @@ -561,7 +584,7 @@ outside_network_create(struct comm_base *base, size_t bufsize, struct ub_randstate* rnd, int use_caps_for_id, int* availports, int numavailports, size_t unwanted_threshold, void (*unwanted_action)(void*), void* unwanted_param, int do_udp, - void* sslctx) + void* sslctx, int delayclose) { struct outside_network* outnet = (struct outside_network*) calloc(1, sizeof(struct outside_network)); @@ -583,6 +606,13 @@ outside_network_create(struct comm_base *base, size_t bufsize, outnet->unwanted_param = unwanted_param; outnet->use_caps_for_id = use_caps_for_id; outnet->do_udp = do_udp; +#ifndef S_SPLINT_S + if(delayclose) { + outnet->delayclose = 1; + outnet->delay_tv.tv_sec = delayclose/1000; + outnet->delay_tv.tv_usec = (delayclose%1000)*1000; + } +#endif if(numavailports == 0) { log_err("no outgoing ports available"); outside_network_delete(outnet); diff --git a/services/outside_network.h b/services/outside_network.h index ece06c093..80cbc350b 100644 --- a/services/outside_network.h +++ b/services/outside_network.h @@ -95,6 +95,10 @@ struct outside_network { struct port_comm* unused_fds; /** if udp is done */ int do_udp; + /** if udp is delay-closed (delayed answers do not meet closed port)*/ + int delayclose; + /** timeout for delayclose */ + struct timeval delay_tv; /** array of outgoing IP4 interfaces */ struct port_if* ip4_ifs; @@ -377,6 +381,8 @@ struct serviced_query { * @param unwanted_param: user parameter to action. * @param do_udp: if udp is done. * @param sslctx: context to create outgoing connections with (if enabled). + * @param delayclose: if not0, udp sockets are delayed before timeout closure. + * msec to wait on timeouted udp sockets. * @return: the new structure (with no pending answers) or NULL on error. */ struct outside_network* outside_network_create(struct comm_base* base, @@ -385,7 +391,7 @@ struct outside_network* outside_network_create(struct comm_base* base, struct ub_randstate* rnd, int use_caps_for_id, int* availports, int numavailports, size_t unwanted_threshold, void (*unwanted_action)(void*), void* unwanted_param, int do_udp, - void* sslctx); + void* sslctx, int delayclose); /** * Delete outside_network structure. @@ -516,6 +522,9 @@ int outnet_tcp_cb(struct comm_point* c, void* arg, int error, /** callback for udp timeout */ void pending_udp_timer_cb(void *arg); +/** callback for udp delay for timeout */ +void pending_udp_timer_delay_cb(void *arg); + /** callback for outgoing TCP timer event */ void outnet_tcptimer(void* arg); diff --git a/testcode/fake_event.c b/testcode/fake_event.c index b64ac3ad5..6675530b5 100644 --- a/testcode/fake_event.c +++ b/testcode/fake_event.c @@ -900,7 +900,8 @@ outside_network_create(struct comm_base* base, size_t bufsize, int ATTR_UNUSED(use_caps_for_id), int* ATTR_UNUSED(availports), int ATTR_UNUSED(numavailports), size_t ATTR_UNUSED(unwanted_threshold), void (*unwanted_action)(void*), void* ATTR_UNUSED(unwanted_param), - int ATTR_UNUSED(do_udp), void* ATTR_UNUSED(sslctx)) + int ATTR_UNUSED(do_udp), void* ATTR_UNUSED(sslctx), + int ATTR_UNUSED(delayclose)) { struct replay_runtime* runtime = (struct replay_runtime*)base; struct outside_network* outnet = calloc(1, @@ -1229,6 +1230,11 @@ void pending_udp_timer_cb(void *ATTR_UNUSED(arg)) log_assert(0); } +void pending_udp_timer_delay_cb(void *ATTR_UNUSED(arg)) +{ + log_assert(0); +} + void outnet_tcptimer(void* ATTR_UNUSED(arg)) { log_assert(0); diff --git a/util/config_file.c b/util/config_file.c index 510f0d3e1..9bdf7b6ff 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -138,6 +138,7 @@ config_create(void) cfg->prefetch_key = 0; cfg->infra_cache_slabs = 4; cfg->infra_cache_numhosts = 10000; + cfg->delay_close = 0; if(!(cfg->outgoing_avail_ports = (int*)calloc(65536, sizeof(int)))) goto error_exit; init_outgoing_availports(cfg->outgoing_avail_ports, 65536); @@ -378,6 +379,7 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_NUMBER_OR_ZERO("infra-host-ttl:", host_ttl) else S_POW2("infra-cache-slabs:", infra_cache_slabs) else S_SIZET_NONZERO("infra-cache-numhosts:", infra_cache_numhosts) + else S_NUMBER_OR_ZERO("delay-close:", delay_close) else S_STR("chroot:", chrootdir) else S_STR("username:", username) else S_STR("directory:", directory) @@ -622,6 +624,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_DEC(opt, "infra-host-ttl", host_ttl) else O_DEC(opt, "infra-cache-slabs", infra_cache_slabs) else O_MEM(opt, "infra-cache-numhosts", infra_cache_numhosts) + else O_UNS(opt, "delay-close", delay_close) else O_YNO(opt, "do-ip4", do_ip4) else O_YNO(opt, "do-ip6", do_ip6) else O_YNO(opt, "do-udp", do_udp) diff --git a/util/config_file.h b/util/config_file.h index afc2ec943..f7da1a60a 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -119,6 +119,8 @@ struct config_file { size_t infra_cache_slabs; /** max number of hosts in the infra cache */ size_t infra_cache_numhosts; + /** delay close of udp-timeouted ports, if 0 no delayclose. in msec */ + int delay_close; /** the target fetch policy for the iterator */ char* target_fetch_policy; diff --git a/util/configlexer.c b/util/configlexer.c index 96247fa68..80683687b 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -363,8 +363,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 145 -#define YY_END_OF_BUFFER 146 +#define YY_NUM_RULES 146 +#define YY_END_OF_BUFFER 147 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -372,159 +372,160 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1374] = +static yyconst flex_int16_t yy_accept[1383] = { 0, - 1, 1, 127, 127, 131, 131, 135, 135, 139, 139, - 1, 1, 146, 143, 1, 125, 125, 144, 2, 144, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 127, - 128, 128, 129, 144, 131, 132, 132, 133, 144, 138, - 135, 136, 136, 137, 144, 139, 140, 140, 141, 144, - 142, 126, 2, 130, 144, 142, 143, 0, 1, 2, - 2, 2, 2, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 127, 0, 131, 0, 138, 0, 135, 139, 0, - 142, 0, 2, 2, 142, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 142, 143, 143, 143, 143, 143, 143, 143, 143, 143, - - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 142, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 64, 143, 143, 143, 143, - - 143, 6, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 142, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 142, 143, 143, 143, - 143, 29, 143, 143, 143, 143, 143, 12, 13, 143, - 15, 14, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 120, - 143, 143, 143, 143, 143, 3, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - - 143, 143, 143, 143, 143, 142, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 134, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 32, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 33, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 79, 134, 143, 143, 143, 143, 143, - - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 78, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 62, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 20, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 30, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 31, - - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 22, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 26, 143, 27, 143, 143, - 143, 65, 143, 66, 143, 63, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 5, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 81, 143, 143, 143, 143, 143, 143, - - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 23, 143, 143, - 143, 143, 106, 105, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 34, 143, 143, 143, 143, 143, 143, - 143, 143, 68, 67, 143, 143, 143, 143, 143, 143, - 102, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 53, 143, 143, 143, 143, 143, 143, 143, 143, - - 143, 143, 143, 143, 143, 143, 143, 143, 104, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 4, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 99, 143, 143, 143, 143, 143, 143, 143, 114, - 100, 143, 21, 143, 143, 143, 143, 70, 143, 71, - 69, 143, 143, 143, 143, 143, 143, 77, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 101, 143, 143, - 143, 143, 124, 143, 143, 143, 143, 143, 143, 143, - - 143, 143, 143, 143, 61, 143, 143, 143, 143, 143, - 143, 143, 143, 28, 143, 143, 17, 143, 143, 143, - 16, 143, 86, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 41, 42, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 72, 143, 143, - 143, 143, 143, 76, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 80, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 119, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 90, 143, 94, 143, - - 143, 143, 143, 75, 143, 143, 112, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 93, 143, 143, 143, 143, 43, 44, 143, 49, 95, - 143, 107, 103, 143, 143, 37, 143, 97, 143, 143, - 143, 143, 143, 7, 143, 60, 111, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 82, 143, 143, 121, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 96, 143, 36, - 38, 143, 143, 143, 143, 143, 59, 143, 143, 143, - - 143, 115, 18, 19, 143, 143, 143, 143, 143, 143, - 57, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 117, 143, 143, 35, 143, 143, 143, 143, 143, 143, - 11, 143, 143, 143, 143, 143, 143, 143, 10, 143, - 143, 39, 143, 123, 116, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 143, 89, 88, 143, 118, 113, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - 45, 143, 122, 143, 143, 143, 143, 40, 143, 143, - 143, 83, 85, 143, 143, 143, 87, 143, 143, 143, - 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, - - 143, 24, 143, 143, 143, 143, 143, 143, 143, 143, - 143, 143, 143, 143, 110, 143, 143, 143, 143, 143, - 143, 143, 25, 143, 9, 143, 143, 108, 50, 143, - 143, 143, 92, 143, 73, 143, 143, 143, 52, 56, - 51, 143, 46, 143, 8, 143, 143, 91, 143, 143, - 143, 55, 143, 47, 143, 109, 143, 143, 84, 74, - 54, 48, 143, 143, 143, 143, 58, 143, 143, 143, - 143, 98, 0 + 1, 1, 128, 128, 132, 132, 136, 136, 140, 140, + 1, 1, 147, 144, 1, 126, 126, 145, 2, 145, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 128, + 129, 129, 130, 145, 132, 133, 133, 134, 145, 139, + 136, 137, 137, 138, 145, 140, 141, 141, 142, 145, + 143, 127, 2, 131, 145, 143, 144, 0, 1, 2, + 2, 2, 2, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 128, 0, 132, 0, 139, 0, 136, 140, 0, + 143, 0, 2, 2, 143, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 143, 144, 144, 144, 144, 144, 144, 144, 144, 144, + + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 143, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 65, 144, 144, + + 144, 144, 144, 6, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 143, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 143, + 144, 144, 144, 144, 29, 144, 144, 144, 144, 144, + 144, 12, 13, 144, 15, 14, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 121, 144, 144, 144, 144, 144, 3, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + + 144, 144, 144, 144, 144, 144, 144, 144, 144, 143, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 135, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 32, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 33, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 80, 135, + + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 79, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 63, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 20, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 30, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + + 144, 144, 144, 144, 144, 144, 31, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 22, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 26, 144, 27, 144, 144, 144, 66, 144, + 67, 144, 64, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 5, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + + 144, 82, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 23, 144, 144, 144, 144, + 107, 106, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 34, 144, 144, 144, 144, 144, 144, 144, 144, + 69, 68, 144, 144, 144, 144, 144, 144, 103, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 50, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + + 54, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 105, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 4, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 100, 144, 144, 144, 144, 144, 144, 144, 115, 101, + 144, 21, 144, 144, 144, 144, 71, 144, 72, 70, + 144, 144, 144, 144, 144, 144, 78, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 102, 144, 144, 144, + + 144, 125, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 62, 144, 144, 144, 144, 144, 144, + 144, 144, 28, 144, 144, 17, 144, 144, 144, 16, + 144, 87, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 41, 42, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 73, 144, 144, 144, + 144, 144, 77, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 81, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 120, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + + 144, 144, 144, 144, 144, 91, 144, 95, 144, 144, + 144, 144, 76, 144, 144, 113, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 94, + 144, 144, 144, 144, 43, 44, 144, 49, 96, 144, + 108, 104, 144, 144, 37, 144, 98, 144, 144, 144, + 144, 144, 7, 144, 61, 112, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 83, 144, 144, 122, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 144, 144, 97, 144, 36, 38, + + 144, 144, 144, 144, 144, 60, 144, 144, 144, 144, + 116, 18, 19, 144, 144, 144, 144, 144, 144, 58, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 118, + 144, 144, 35, 144, 144, 144, 144, 144, 144, 11, + 144, 144, 144, 144, 144, 144, 144, 10, 144, 144, + 39, 144, 124, 117, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 144, 90, 89, 144, 119, 114, 144, + 144, 144, 144, 144, 144, 144, 144, 144, 144, 45, + 144, 123, 144, 144, 144, 144, 40, 144, 144, 144, + 84, 86, 144, 144, 144, 88, 144, 144, 144, 144, + + 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 24, 144, 144, 144, 144, 144, 144, 144, 144, 144, + 144, 144, 144, 111, 144, 144, 144, 144, 144, 144, + 144, 25, 144, 9, 144, 144, 109, 51, 144, 144, + 144, 93, 144, 74, 144, 144, 144, 53, 57, 52, + 144, 46, 144, 8, 144, 144, 92, 144, 144, 144, + 56, 144, 47, 144, 110, 144, 144, 85, 75, 55, + 48, 144, 144, 144, 144, 59, 144, 144, 144, 144, + 99, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -567,319 +568,323 @@ static yyconst flex_int32_t yy_meta[40] = 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[1388] = +static yyconst flex_int16_t yy_base[1397] = { 0, 0, 0, 37, 40, 44, 51, 63, 75, 56, 68, - 87, 108, 2567, 2432, 50, 2744, 2744, 2744, 129, 94, + 87, 108, 2653, 2569, 50, 2760, 2760, 2760, 129, 94, 70, 104, 122, 90, 92, 115, 126, 95, 84, 132, - 135, 138, 50, 146, 148, 157, 167, 160, 151, 2387, - 2744, 2744, 2744, 70, 2247, 2744, 2744, 2744, 42, 2211, - 2022, 2744, 2744, 2744, 189, 1580, 2744, 2744, 2744, 195, - 1490, 2744, 199, 2744, 203, 111, 1105, 209, 120, 0, + 135, 138, 50, 146, 148, 157, 167, 160, 151, 2566, + 2760, 2760, 2760, 70, 2404, 2760, 2760, 2760, 42, 2139, + 1931, 2760, 2760, 2760, 189, 1601, 2760, 2760, 2760, 195, + 1479, 2760, 199, 2760, 203, 111, 635, 209, 120, 0, 220, 0, 0, 103, 141, 149, 202, 189, 182, 204, 206, 210, 218, 215, 217, 221, 222, 223, 225, 228, 235, 248, 165, 244, 247, 233, 245, 252, 246, 251, 258, 260, 261, 262, 267, 263, 270, 271, 158, 274, 276, 280, 277, 278, 282, 286, 283, 49, 287, 291, - 288, 804, 304, 766, 307, 586, 316, 420, 297, 320, + 288, 588, 304, 558, 307, 386, 316, 354, 297, 320, 236, 324, 328, 0, 321, 309, 330, 323, 226, 326, - 327, 334, 331, 337, 348, 339, 335, 344, 333, 342, - 345, 351, 343, 355, 353, 359, 360, 363, 366, 377, - 373, 380, 381, 378, 379, 389, 385, 393, 396, 392, - 395, 394, 397, 398, 402, 404, 405, 406, 407, 408, - 417, 413, 416, 415, 428, 421, 430, 437, 439, 441, - 424, 435, 438, 447, 444, 448, 450, 445, 456, 451, - - 457, 461, 464, 462, 466, 467, 474, 471, 472, 475, - 483, 481, 482, 484, 486, 487, 489, 490, 491, 497, - 493, 498, 495, 502, 504, 506, 508, 514, 522, 523, - 513, 509, 518, 529, 531, 534, 532, 537, 543, 539, - 540, 541, 542, 548, 549, 555, 560, 551, 553, 552, - 568, 561, 588, 562, 554, 574, 570, 578, 576, 584, - 581, 582, 583, 585, 580, 606, 612, 599, 592, 613, - 614, 615, 616, 618, 621, 622, 623, 625, 633, 634, - 645, 641, 638, 646, 626, 648, 655, 652, 653, 654, - 656, 657, 659, 661, 667, 2744, 669, 663, 671, 665, - - 675, 2744, 672, 676, 677, 678, 680, 686, 685, 689, - 693, 690, 695, 697, 699, 698, 718, 700, 705, 727, - 708, 706, 704, 712, 701, 723, 725, 730, 709, 733, - 736, 737, 739, 742, 748, 741, 747, 750, 752, 755, - 757, 758, 624, 759, 761, 771, 779, 776, 778, 785, - 762, 781, 764, 787, 784, 789, 790, 796, 792, 793, - 800, 798, 795, 806, 802, 814, 805, 815, 816, 818, - 819, 821, 827, 824, 825, 834, 836, 826, 832, 838, - 839, 840, 852, 853, 849, 854, 860, 861, 850, 862, - 856, 865, 866, 867, 871, 868, 873, 876, 878, 884, - - 870, 880, 882, 890, 891, 892, 896, 897, 898, 899, - 900, 908, 901, 910, 912, 902, 915, 922, 914, 923, - 926, 2744, 929, 928, 930, 931, 934, 2744, 2744, 933, - 2744, 2744, 936, 937, 938, 946, 951, 947, 954, 940, - 956, 961, 957, 966, 962, 973, 968, 975, 976, 978, - 979, 981, 983, 984, 985, 989, 991, 999, 992, 1000, - 993, 1003, 1004, 1005, 1007, 1009, 1012, 1018, 1015, 2744, - 1016, 1017, 1023, 1021, 1026, 2744, 1025, 1027, 1028, 1030, - 1033, 1038, 1035, 1039, 1041, 1042, 1045, 1048, 1047, 1040, - 1051, 1057, 1063, 1056, 1064, 1066, 1068, 1069, 1077, 1078, - - 1073, 1074, 1084, 1080, 1083, 1086, 1088, 1090, 1092, 1093, - 1095, 1118, 1097, 1099, 1098, 1096, 1104, 1102, 1106, 1119, - 1130, 1115, 1108, 1128, 1132, 1137, 1135, 1139, 1107, 1145, - 1146, 2744, 1152, 1148, 1141, 1149, 1154, 1155, 1157, 1158, - 1163, 1161, 1164, 1167, 1170, 2744, 1169, 1171, 1172, 1175, - 1179, 1185, 1173, 1191, 1198, 2744, 1200, 1201, 1183, 1194, - 1196, 1203, 1197, 1207, 1208, 1204, 1211, 1214, 1222, 1215, - 1217, 1223, 1219, 1225, 1228, 1229, 1231, 1233, 1232, 1240, - 1230, 1239, 1251, 1245, 1253, 1247, 1249, 1255, 1258, 1256, - 1259, 1257, 1261, 2744, 175, 1264, 1262, 1265, 1275, 1284, - - 1282, 1269, 1280, 1288, 1281, 1289, 1272, 1273, 1290, 1292, - 1295, 1298, 1300, 1301, 1302, 1306, 1307, 1308, 1309, 1310, - 1312, 1317, 1318, 1315, 1316, 2744, 1329, 1313, 1326, 1332, - 1336, 1343, 1337, 1340, 1339, 1349, 1345, 1350, 1354, 1357, - 1351, 1361, 1362, 1347, 1368, 1369, 1367, 1370, 1371, 1373, - 2744, 1375, 1377, 1378, 1381, 1382, 1383, 1386, 1388, 1390, - 1394, 1397, 1399, 2744, 1402, 1403, 1404, 1410, 1407, 1414, - 1411, 1418, 1419, 1420, 1421, 1426, 1422, 1424, 1428, 2744, - 1437, 1438, 1436, 1447, 1434, 1444, 1445, 1449, 1446, 1450, - 1457, 1451, 1454, 1458, 1459, 1455, 1453, 1461, 1462, 2744, - - 1469, 1465, 1470, 1467, 1477, 1480, 1482, 1481, 1483, 1484, - 1489, 1487, 1492, 1494, 1503, 1493, 1496, 1507, 1509, 1510, - 1512, 1518, 1519, 1520, 2744, 1524, 1525, 1526, 1516, 1533, - 1537, 1527, 1529, 1534, 1538, 1539, 1547, 1543, 1544, 1549, - 1550, 1541, 1551, 1552, 1553, 1556, 1566, 1558, 1564, 1559, - 1575, 1576, 1578, 1565, 1588, 2744, 1577, 2744, 1584, 1586, - 1596, 2744, 1593, 2744, 1598, 2744, 1599, 1600, 1590, 1594, - 1603, 1606, 1610, 1604, 1611, 1607, 1614, 1613, 1615, 1618, - 2744, 1620, 1616, 1626, 1622, 1628, 1631, 1633, 1632, 1641, - 1639, 1640, 1643, 2744, 1645, 1644, 1652, 1658, 1646, 1656, - - 1657, 1660, 1661, 1662, 1663, 1665, 1667, 1670, 1671, 1673, - 1675, 1678, 1679, 1682, 1681, 1683, 1684, 2744, 1687, 1697, - 1686, 1694, 2744, 2744, 1700, 1706, 1707, 1708, 1711, 1696, - 1713, 1714, 1721, 1718, 1719, 1727, 1726, 1728, 1729, 1730, - 1731, 1733, 1734, 2744, 1741, 1735, 1743, 1745, 1737, 1755, - 1746, 1758, 2744, 2744, 1756, 1747, 1762, 1763, 1765, 1766, - 2744, 1768, 1769, 1770, 1771, 1772, 1774, 1778, 1779, 1786, - 1789, 1787, 1790, 1796, 1792, 1793, 1800, 1798, 1808, 1805, - 1810, 1817, 1795, 1813, 1815, 1819, 1820, 1822, 1824, 1830, - 1826, 2744, 1833, 1827, 1836, 1834, 1838, 1841, 1844, 1843, - - 1846, 1847, 1848, 1849, 1851, 1852, 1853, 1856, 2744, 1860, - 1864, 1858, 1865, 1871, 1861, 1874, 1877, 1879, 2744, 1881, - 1888, 1882, 1884, 1890, 1892, 1885, 1893, 1896, 1898, 1899, - 1900, 1901, 1905, 1907, 1909, 1912, 1915, 1921, 1920, 1927, - 1930, 1924, 1937, 1928, 1931, 1934, 1938, 1944, 1942, 1948, - 1941, 2744, 1947, 1952, 1955, 1956, 1960, 1961, 1949, 2744, - 2744, 1945, 2744, 1968, 1959, 1966, 1970, 2744, 1972, 2744, - 2744, 1973, 1981, 1974, 1982, 1984, 1989, 2744, 1978, 1990, - 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2744, 2000, 2001, - 2002, 2012, 2744, 2004, 2017, 2006, 2022, 2023, 2024, 2026, - - 2028, 2014, 2035, 2033, 2744, 2036, 2037, 2040, 2041, 2045, - 2042, 2043, 2047, 2744, 2056, 2058, 2744, 2049, 2048, 2050, - 2744, 2064, 2744, 2065, 2060, 2067, 2073, 2069, 2075, 2077, - 2079, 2081, 2080, 2088, 2082, 2744, 2744, 2089, 2092, 2094, - 2097, 2099, 2101, 2100, 2102, 2084, 2103, 2744, 2106, 2108, - 2111, 2112, 2113, 2744, 2117, 2118, 2120, 2123, 2125, 2129, - 2138, 2131, 2140, 2142, 2135, 2146, 2148, 2143, 2744, 2114, - 2150, 2151, 2153, 2155, 2157, 2156, 2160, 2165, 2158, 2167, - 2744, 2169, 2171, 2174, 2172, 2178, 2179, 2180, 2182, 2183, - 2186, 2185, 2187, 2189, 2193, 2199, 2744, 2192, 2744, 2201, - - 2206, 2213, 2214, 2744, 2194, 2216, 2744, 2217, 2219, 2222, - 2225, 2227, 2232, 2233, 2226, 2235, 2234, 2236, 2242, 2243, - 2744, 2202, 2240, 2244, 2248, 2744, 2744, 2255, 2744, 2744, - 2258, 2744, 2744, 2259, 2261, 2744, 2263, 2744, 2270, 2266, - 2253, 2251, 2271, 2744, 2275, 2744, 2744, 2272, 2278, 2268, - 2279, 2286, 2288, 2290, 2281, 2283, 2291, 2292, 2294, 2295, - 2297, 2298, 2299, 2300, 2305, 2302, 2308, 2309, 2311, 2312, - 2314, 2744, 2310, 2323, 2744, 2330, 2331, 2319, 2321, 2332, - 2333, 2335, 2337, 2343, 2341, 2342, 2344, 2744, 2346, 2744, - 2744, 2347, 2345, 2352, 2353, 2355, 2744, 2358, 2359, 2363, - - 2370, 2744, 2744, 2744, 2371, 2360, 2366, 2374, 2376, 2377, - 2744, 2380, 2383, 2384, 2386, 2391, 2393, 2399, 2397, 2403, - 2744, 2400, 2398, 2744, 2404, 2406, 2408, 2409, 2411, 2413, - 2744, 2414, 2415, 2421, 2416, 2424, 2427, 2426, 2744, 2428, - 2429, 2744, 2439, 2744, 2744, 2430, 2440, 2443, 2445, 2448, - 2436, 2449, 2456, 2453, 2455, 2744, 2744, 2458, 2744, 2744, - 2457, 2460, 2461, 2465, 2462, 2467, 2469, 2470, 2473, 2471, - 2744, 2474, 2744, 2475, 2484, 2481, 2479, 2744, 2486, 2487, - 2490, 2744, 2744, 2492, 2500, 2494, 2744, 2502, 2504, 2498, - 2505, 2509, 2510, 2506, 2511, 2516, 2518, 2512, 2514, 2526, - - 2527, 2744, 2529, 2521, 2531, 2535, 2537, 2539, 2540, 2542, - 2544, 2545, 2547, 2548, 2744, 2549, 2550, 2560, 2565, 2569, - 2551, 2571, 2744, 2572, 2744, 2575, 2561, 2744, 2744, 2576, - 2578, 2580, 2744, 2581, 2744, 2579, 2583, 2587, 2744, 2744, - 2744, 2589, 2744, 2590, 2744, 2593, 2595, 2744, 2596, 2598, - 2601, 2744, 2603, 2744, 2605, 2744, 2606, 2607, 2744, 2744, - 2744, 2744, 2609, 2611, 2616, 2612, 2744, 2617, 2619, 2620, - 2623, 2744, 2744, 2652, 2659, 2666, 2673, 2680, 94, 2687, - 2694, 2701, 2708, 2715, 2722, 2729, 2736 + 327, 334, 331, 337, 348, 339, 342, 344, 333, 346, + 353, 345, 351, 355, 354, 360, 363, 371, 373, 379, + 375, 382, 383, 381, 380, 392, 393, 399, 400, 396, + 402, 384, 405, 385, 406, 397, 409, 410, 413, 418, + 421, 419, 420, 417, 428, 425, 426, 438, 445, 430, + 431, 434, 442, 446, 447, 448, 451, 454, 455, 457, + + 458, 464, 461, 466, 467, 468, 473, 476, 474, 478, + 484, 490, 475, 483, 486, 487, 491, 493, 494, 496, + 502, 503, 504, 505, 509, 499, 510, 512, 526, 514, + 527, 515, 519, 531, 537, 533, 541, 539, 543, 549, + 545, 546, 547, 548, 553, 555, 561, 566, 557, 559, + 567, 570, 568, 590, 560, 576, 577, 580, 586, 583, + 596, 587, 595, 597, 613, 594, 611, 615, 619, 618, + 584, 621, 622, 624, 517, 623, 628, 630, 631, 627, + 629, 634, 649, 645, 646, 648, 647, 654, 661, 657, + 658, 659, 662, 663, 665, 668, 672, 2760, 674, 669, + + 676, 677, 679, 2760, 680, 681, 682, 683, 685, 692, + 694, 695, 697, 698, 699, 703, 704, 705, 725, 707, + 706, 716, 709, 734, 713, 736, 715, 728, 732, 723, + 739, 743, 710, 744, 745, 746, 754, 752, 753, 755, + 757, 758, 762, 766, 765, 772, 773, 777, 779, 787, + 784, 789, 790, 781, 791, 793, 799, 800, 798, 792, + 806, 805, 795, 808, 813, 807, 822, 815, 818, 819, + 826, 827, 828, 830, 829, 837, 836, 835, 844, 834, + 843, 848, 849, 850, 851, 860, 857, 858, 863, 869, + 870, 865, 871, 874, 875, 876, 877, 878, 879, 883, + + 885, 886, 894, 880, 890, 896, 902, 904, 887, 905, + 908, 909, 910, 911, 919, 912, 921, 913, 923, 926, + 929, 934, 925, 935, 2760, 945, 939, 941, 933, 759, + 927, 2760, 2760, 947, 2760, 2760, 948, 949, 950, 961, + 965, 958, 952, 960, 959, 974, 968, 978, 966, 986, + 988, 971, 980, 982, 989, 992, 990, 994, 998, 996, + 1004, 1007, 1006, 1008, 1010, 1011, 1013, 1015, 1016, 1022, + 1017, 1029, 1026, 2760, 1027, 1028, 1032, 1034, 1035, 2760, + 1036, 1039, 1037, 1040, 1041, 1047, 1043, 1050, 1048, 1051, + 1053, 1055, 1059, 1056, 1061, 1073, 1074, 1064, 1072, 1077, + + 1071, 1079, 1086, 1085, 1087, 1089, 1095, 1091, 1094, 1097, + 1098, 1099, 1100, 1101, 1104, 1126, 1106, 1107, 1108, 1109, + 1114, 1115, 1116, 1117, 1132, 1138, 1140, 1120, 1141, 1147, + 1149, 1143, 1152, 1150, 1156, 1157, 2760, 1163, 1159, 1160, + 1165, 1167, 1168, 1112, 1170, 1171, 1173, 1174, 1175, 1182, + 2760, 1180, 1183, 1181, 1185, 1186, 1192, 1194, 1204, 1200, + 2760, 1207, 1208, 1210, 1211, 1198, 1214, 1215, 1216, 1219, + 1222, 1223, 1225, 1230, 1232, 1220, 1234, 1227, 1233, 1235, + 1240, 1242, 1243, 1244, 1246, 1250, 1256, 1259, 1257, 1264, + 1258, 1260, 1266, 1269, 1267, 1270, 1268, 1271, 2760, 175, + + 1275, 1273, 1280, 1281, 1291, 1290, 1283, 1284, 1294, 1292, + 1293, 1282, 1303, 1304, 1305, 1306, 1309, 1310, 1312, 1313, + 1316, 1318, 1319, 1320, 1321, 1323, 1324, 1329, 1326, 1327, + 1330, 2760, 1343, 1336, 1337, 1346, 1348, 1356, 1349, 1352, + 1354, 1362, 1358, 1364, 1367, 1360, 1370, 1371, 1373, 1374, + 1380, 1382, 1378, 1381, 1384, 1386, 2760, 1390, 1388, 1389, + 1391, 1395, 1396, 1399, 1401, 1406, 1409, 1410, 1412, 2760, + 1415, 1416, 1417, 1423, 1420, 1427, 1424, 1433, 1428, 1430, + 1434, 1438, 1437, 1439, 1444, 2760, 1446, 1452, 1449, 1458, + 1450, 1456, 1457, 1461, 1462, 1463, 1469, 1465, 1467, 1466, + + 1470, 1472, 1473, 1476, 1474, 1478, 2760, 1496, 1477, 1481, + 1488, 1489, 1480, 1501, 1490, 1502, 1504, 1509, 1506, 1510, + 1512, 1511, 1513, 1514, 1517, 1520, 1522, 1528, 1534, 1535, + 1536, 2760, 1539, 1540, 1527, 1542, 1549, 1547, 1550, 1551, + 1552, 1553, 1554, 1562, 1555, 1556, 1558, 1563, 1559, 1564, + 1565, 1566, 1571, 1579, 1568, 1584, 1586, 1588, 1589, 1591, + 1590, 1597, 2760, 1596, 2760, 1598, 1599, 1607, 2760, 1605, + 2760, 1609, 2760, 1612, 1616, 1611, 1613, 1618, 1619, 1621, + 1622, 1624, 1627, 1628, 1629, 1631, 1630, 2760, 1636, 1632, + 1640, 1637, 1643, 1644, 1645, 1648, 1656, 1652, 1655, 1659, + + 1660, 2760, 1662, 1661, 1665, 1675, 1673, 1671, 1676, 1677, + 1678, 1679, 1680, 1682, 1687, 1688, 1684, 1690, 1691, 1696, + 1694, 1698, 1699, 1700, 1701, 2760, 1703, 1709, 1712, 1711, + 2760, 2760, 1714, 1723, 1725, 1715, 1728, 1717, 1729, 1733, + 1739, 1744, 1732, 1735, 1740, 1745, 1746, 1747, 1749, 1751, + 1754, 2760, 1760, 1756, 1762, 1763, 1753, 1766, 1764, 1775, + 2760, 2760, 1768, 1770, 1779, 1780, 1782, 1785, 2760, 1781, + 1786, 1787, 1788, 1789, 1791, 1795, 1796, 1805, 1802, 1807, + 1808, 1814, 1810, 1806, 1815, 1813, 1826, 2760, 1823, 1828, + 1834, 1817, 1830, 1831, 1836, 1833, 1840, 1842, 1848, 1844, + + 2760, 1850, 1837, 1857, 1846, 1859, 1860, 1867, 1854, 1856, + 1863, 1864, 1865, 1870, 1872, 1874, 1877, 2760, 1878, 1880, + 1881, 1882, 1885, 1888, 1890, 1892, 1893, 2760, 1895, 1904, + 1901, 1903, 1906, 1902, 1908, 1911, 1912, 1913, 1915, 1916, + 1919, 1924, 1925, 1934, 1926, 1929, 1940, 1938, 1949, 1950, + 1939, 1957, 1942, 1955, 1946, 1953, 1961, 1960, 1967, 1963, + 2760, 1965, 1970, 1972, 1973, 1976, 1974, 1977, 2760, 2760, + 1983, 2760, 1984, 1987, 1988, 1989, 2760, 1991, 2760, 2760, + 1992, 1999, 1993, 2000, 1964, 2003, 2760, 2004, 2007, 2008, + 2012, 2013, 2014, 2016, 2015, 2017, 2760, 2018, 2019, 2020, + + 2022, 2760, 2029, 2035, 2024, 2036, 2040, 2039, 2046, 2045, + 2032, 2053, 2049, 2760, 2047, 2055, 2057, 2058, 2059, 2060, + 2064, 2065, 2760, 2067, 2074, 2760, 2075, 2061, 2076, 2760, + 2078, 2760, 2080, 2082, 2085, 2090, 2087, 2098, 2083, 2091, + 2099, 2093, 2101, 2103, 2760, 2760, 2105, 2109, 2112, 2110, + 2115, 2117, 2116, 2118, 2119, 2124, 2760, 2125, 2127, 2126, + 2128, 2129, 2760, 2133, 2134, 2135, 2138, 2141, 2153, 2155, + 2144, 2159, 2161, 2156, 2163, 2165, 2166, 2760, 2167, 2169, + 2170, 2174, 2176, 2130, 2177, 2181, 2179, 2171, 2184, 2760, + 2187, 2188, 2191, 2193, 2195, 2196, 2198, 2199, 2200, 2203, + + 2204, 2206, 2209, 2210, 2213, 2760, 2211, 2760, 2216, 2226, + 2229, 2232, 2760, 2220, 2222, 2760, 2236, 2237, 2244, 2245, + 2247, 2252, 2248, 2238, 2255, 2240, 2256, 2262, 2263, 2760, + 2230, 2265, 2264, 2266, 2760, 2760, 2273, 2760, 2760, 2276, + 2760, 2760, 2277, 2279, 2760, 2281, 2760, 2288, 2284, 2271, + 2267, 2286, 2760, 2293, 2760, 2760, 2290, 2294, 2297, 2298, + 2300, 2302, 2305, 2306, 2307, 2308, 2309, 2310, 2312, 2314, + 2315, 2228, 2316, 2317, 2319, 2323, 2326, 2328, 2329, 2339, + 2760, 2327, 2340, 2760, 2347, 2342, 2335, 2331, 2348, 2352, + 2353, 2355, 2361, 2358, 2357, 2359, 2760, 2362, 2760, 2760, + + 2360, 2364, 2370, 2363, 2365, 2760, 2375, 2371, 2385, 2387, + 2760, 2760, 2760, 2388, 2377, 2382, 2392, 2393, 2394, 2760, + 2395, 2396, 2400, 2403, 2407, 2409, 2416, 2413, 2415, 2760, + 2417, 2419, 2760, 2420, 2421, 2424, 2426, 2427, 2429, 2760, + 2425, 2430, 2437, 2432, 2440, 2442, 2443, 2760, 2445, 2446, + 2760, 2452, 2760, 2760, 2447, 2455, 2457, 2462, 2464, 2453, + 2458, 2470, 2469, 2473, 2760, 2760, 2474, 2760, 2760, 2466, + 2475, 2476, 2478, 2481, 2482, 2484, 2486, 2489, 2488, 2760, + 2490, 2760, 2491, 2500, 2492, 2494, 2760, 2501, 2502, 2505, + 2760, 2760, 2506, 2515, 2513, 2760, 2518, 2517, 2519, 2520, + + 2525, 2527, 2521, 2528, 2531, 2529, 2507, 2532, 2541, 2543, + 2760, 2545, 2542, 2546, 2550, 2553, 2554, 2555, 2556, 2558, + 2559, 2561, 2563, 2760, 2564, 2565, 2575, 2580, 2584, 2572, + 2586, 2760, 2587, 2760, 2590, 2591, 2760, 2760, 2592, 2594, + 2597, 2760, 2598, 2760, 2581, 2605, 2595, 2760, 2760, 2760, + 2607, 2760, 2608, 2760, 2610, 2611, 2760, 2613, 2615, 2617, + 2760, 2619, 2760, 2621, 2760, 2622, 2623, 2760, 2760, 2760, + 2760, 2625, 2627, 2633, 2628, 2760, 2630, 2635, 2636, 2639, + 2760, 2760, 2668, 2675, 2682, 2689, 2696, 94, 2703, 2710, + 2717, 2724, 2731, 2738, 2745, 2752 + } ; -static yyconst flex_int16_t yy_def[1388] = +static yyconst flex_int16_t yy_def[1397] = { 0, - 1373, 1, 1374, 1374, 1375, 1375, 1376, 1376, 1377, 1377, - 1378, 1378, 1373, 1379, 1373, 1373, 1373, 1373, 1380, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1381, - 1373, 1373, 1373, 1381, 1382, 1373, 1373, 1373, 1382, 1383, - 1373, 1373, 1373, 1373, 1383, 1384, 1373, 1373, 1373, 1384, - 1385, 1373, 1386, 1373, 1385, 1385, 1379, 1379, 1373, 1387, - 1380, 1387, 1380, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1381, 1381, 1382, 1382, 1383, 1383, 1373, 1384, 1384, - 1385, 1385, 1386, 1386, 1385, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1385, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1385, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, - - 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1385, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1385, 1379, 1379, 1379, - 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1373, 1373, 1379, - 1373, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, - 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - - 1379, 1379, 1379, 1379, 1379, 1385, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1373, 1385, 1379, 1379, 1379, 1379, 1379, - - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, - - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1373, 1379, 1379, - 1379, 1373, 1379, 1373, 1379, 1373, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, - - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, - 1379, 1379, 1373, 1373, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1373, 1373, 1379, 1379, 1379, 1379, 1379, 1379, - 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, - 1373, 1379, 1373, 1379, 1379, 1379, 1379, 1373, 1379, 1373, - 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, - 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - - 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1373, 1379, 1379, 1373, 1379, 1379, 1379, - 1373, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1373, 1373, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, - 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1373, 1379, - - 1379, 1379, 1379, 1373, 1379, 1379, 1373, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1373, 1379, 1379, 1379, 1379, 1373, 1373, 1379, 1373, 1373, - 1379, 1373, 1373, 1379, 1379, 1373, 1379, 1373, 1379, 1379, - 1379, 1379, 1379, 1373, 1379, 1373, 1373, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1373, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1373, - 1373, 1379, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, - - 1379, 1373, 1373, 1373, 1379, 1379, 1379, 1379, 1379, 1379, - 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1373, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, - 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1373, 1379, - 1379, 1373, 1379, 1373, 1373, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1373, 1373, 1379, 1373, 1373, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1373, 1379, 1373, 1379, 1379, 1379, 1379, 1373, 1379, 1379, - 1379, 1373, 1373, 1379, 1379, 1379, 1373, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - - 1379, 1373, 1379, 1379, 1379, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, 1379, 1379, - 1379, 1379, 1373, 1379, 1373, 1379, 1379, 1373, 1373, 1379, - 1379, 1379, 1373, 1379, 1373, 1379, 1379, 1379, 1373, 1373, - 1373, 1379, 1373, 1379, 1373, 1379, 1379, 1373, 1379, 1379, - 1379, 1373, 1379, 1373, 1379, 1373, 1379, 1379, 1373, 1373, - 1373, 1373, 1379, 1379, 1379, 1379, 1373, 1379, 1379, 1379, - 1379, 1373, 0, 1373, 1373, 1373, 1373, 1373, 1373, 1373, - 1373, 1373, 1373, 1373, 1373, 1373, 1373 + 1382, 1, 1383, 1383, 1384, 1384, 1385, 1385, 1386, 1386, + 1387, 1387, 1382, 1388, 1382, 1382, 1382, 1382, 1389, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1390, + 1382, 1382, 1382, 1390, 1391, 1382, 1382, 1382, 1391, 1392, + 1382, 1382, 1382, 1382, 1392, 1393, 1382, 1382, 1382, 1393, + 1394, 1382, 1395, 1382, 1394, 1394, 1388, 1388, 1382, 1396, + 1389, 1396, 1389, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1390, 1390, 1391, 1391, 1392, 1392, 1382, 1393, 1393, + 1394, 1394, 1395, 1395, 1394, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1394, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1394, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, + + 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1394, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1394, + 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, + 1388, 1382, 1382, 1388, 1382, 1382, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1382, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1394, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1394, + + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + + 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1382, 1388, 1382, 1388, 1388, 1388, 1382, 1388, + 1382, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + + 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, + 1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + + 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1382, + 1388, 1382, 1388, 1388, 1388, 1388, 1382, 1388, 1382, 1382, + 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, + + 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1382, 1388, 1388, 1382, 1388, 1388, 1388, 1382, + 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1382, 1382, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, + 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + + 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1382, 1388, 1388, + 1388, 1388, 1382, 1388, 1388, 1382, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, + 1388, 1388, 1388, 1388, 1382, 1382, 1388, 1382, 1382, 1388, + 1382, 1382, 1388, 1388, 1382, 1388, 1382, 1388, 1388, 1388, + 1388, 1388, 1382, 1388, 1382, 1382, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1382, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1382, 1382, + + 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, + 1382, 1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1382, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, + 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1382, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, + 1382, 1388, 1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1388, 1382, 1382, 1388, 1382, 1382, 1388, + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, + 1388, 1382, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, + 1382, 1382, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, + + 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, + 1388, 1382, 1388, 1382, 1388, 1388, 1382, 1382, 1388, 1388, + 1388, 1382, 1388, 1382, 1388, 1388, 1388, 1382, 1382, 1382, + 1388, 1382, 1388, 1382, 1388, 1388, 1382, 1388, 1388, 1388, + 1382, 1388, 1382, 1388, 1382, 1388, 1388, 1382, 1382, 1382, + 1382, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, + 1382, 0, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, + 1382, 1382, 1382, 1382, 1382, 1382 + } ; -static yyconst flex_int16_t yy_nxt[2784] = +static yyconst flex_int16_t yy_nxt[2800] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 18, 20, 21, 14, 22, 23, 24, 25, 14, @@ -918,278 +923,280 @@ static yyconst flex_int16_t yy_nxt[2784] = 124, 183, 184, 124, 185, 189, 186, 126, 190, 126, 126, 68, 126, 129, 129, 131, 192, 131, 131, 72, 131, 72, 72, 132, 72, 68, 191, 193, 68, 68, - 134, 198, 68, 68, 200, 68, 68, 68, 199, 68, - 194, 68, 206, 196, 68, 68, 68, 68, 210, 197, - 68, 208, 211, 68, 201, 68, 207, 68, 209, 202, - 213, 68, 68, 218, 203, 68, 217, 212, 68, 214, - 204, 205, 215, 216, 221, 68, 222, 223, 225, 68, - 68, 68, 68, 68, 220, 219, 228, 68, 224, 226, - - 230, 68, 229, 231, 68, 68, 68, 68, 68, 68, - 68, 232, 227, 233, 68, 235, 68, 68, 68, 68, - 68, 128, 237, 240, 244, 68, 234, 68, 68, 68, - 246, 238, 236, 68, 247, 248, 132, 239, 242, 243, - 68, 241, 68, 250, 251, 245, 253, 68, 256, 68, - 68, 68, 249, 68, 259, 254, 68, 68, 258, 68, - 68, 260, 68, 68, 265, 263, 257, 252, 68, 68, - 266, 264, 255, 68, 68, 261, 68, 269, 68, 68, - 262, 272, 270, 68, 68, 274, 68, 68, 271, 267, - 276, 268, 275, 68, 68, 68, 68, 273, 68, 68, - - 281, 68, 68, 68, 285, 68, 283, 68, 286, 68, - 68, 280, 278, 277, 68, 284, 68, 279, 68, 282, - 68, 68, 287, 290, 288, 68, 68, 289, 294, 295, - 68, 292, 293, 296, 68, 68, 300, 291, 297, 301, - 302, 68, 298, 68, 68, 299, 68, 304, 303, 68, - 307, 68, 68, 68, 68, 68, 310, 309, 311, 305, - 68, 68, 317, 68, 68, 68, 68, 68, 312, 306, - 316, 308, 68, 68, 68, 333, 313, 318, 321, 314, - 68, 315, 68, 322, 319, 320, 132, 324, 68, 332, - 68, 338, 68, 68, 68, 68, 68, 68, 127, 323, - - 68, 335, 325, 326, 68, 336, 343, 334, 337, 340, - 341, 68, 327, 339, 328, 329, 330, 342, 68, 331, - 348, 345, 346, 344, 68, 68, 68, 68, 68, 351, - 68, 347, 352, 68, 68, 68, 68, 68, 68, 426, - 350, 349, 358, 355, 357, 68, 68, 354, 353, 359, - 68, 365, 361, 68, 363, 360, 356, 68, 68, 362, - 68, 366, 367, 364, 68, 68, 68, 68, 68, 68, - 372, 68, 371, 68, 369, 68, 373, 68, 370, 68, - 375, 68, 376, 68, 68, 368, 379, 68, 68, 68, - 68, 378, 68, 386, 374, 384, 377, 68, 68, 380, - - 385, 68, 68, 383, 381, 68, 390, 68, 382, 68, - 68, 68, 68, 68, 392, 387, 68, 68, 68, 405, - 68, 68, 391, 388, 68, 407, 389, 393, 408, 394, - 68, 395, 400, 401, 402, 68, 396, 68, 397, 68, - 404, 406, 68, 412, 403, 68, 398, 409, 68, 68, - 413, 68, 410, 68, 132, 418, 399, 414, 417, 68, - 68, 411, 68, 422, 68, 419, 416, 68, 415, 68, - 68, 68, 428, 68, 68, 421, 68, 420, 125, 423, - 436, 424, 429, 68, 427, 425, 430, 431, 68, 432, - 68, 68, 433, 68, 437, 434, 68, 68, 435, 68, - - 438, 68, 68, 441, 68, 68, 439, 68, 68, 442, - 68, 447, 68, 449, 68, 444, 123, 68, 68, 443, - 445, 452, 440, 450, 446, 448, 68, 68, 68, 451, - 68, 68, 454, 68, 459, 456, 68, 68, 68, 68, - 461, 455, 460, 453, 68, 458, 68, 457, 68, 462, - 68, 68, 68, 463, 467, 466, 464, 468, 465, 469, - 471, 68, 68, 470, 68, 68, 68, 475, 68, 473, - 472, 476, 68, 68, 68, 477, 479, 68, 68, 68, - 68, 478, 68, 68, 474, 68, 480, 484, 68, 485, - 68, 489, 68, 491, 68, 481, 68, 482, 492, 483, - - 486, 490, 68, 68, 68, 488, 487, 493, 68, 68, - 68, 68, 68, 68, 68, 498, 497, 500, 499, 494, - 68, 496, 68, 495, 68, 501, 68, 132, 505, 503, - 508, 502, 506, 504, 68, 68, 512, 507, 68, 510, - 68, 68, 68, 68, 513, 68, 68, 511, 68, 68, - 68, 515, 68, 521, 520, 519, 509, 518, 68, 68, - 514, 516, 517, 68, 528, 522, 68, 523, 68, 68, - 524, 531, 532, 68, 68, 525, 533, 530, 68, 534, - 68, 526, 527, 537, 529, 68, 536, 68, 68, 535, - 68, 68, 538, 68, 542, 68, 68, 68, 547, 541, - - 546, 68, 545, 68, 68, 68, 548, 549, 539, 540, - 543, 68, 68, 551, 544, 68, 68, 68, 550, 68, - 556, 68, 554, 552, 68, 558, 555, 68, 68, 68, - 68, 560, 557, 68, 553, 68, 562, 68, 68, 68, - 68, 564, 68, 561, 567, 68, 559, 68, 563, 565, - 68, 68, 68, 68, 68, 573, 572, 68, 566, 68, - 68, 568, 569, 68, 581, 578, 576, 570, 68, 68, - 571, 574, 579, 575, 577, 68, 68, 580, 68, 582, - 68, 68, 587, 585, 588, 68, 68, 583, 584, 68, - 68, 592, 68, 589, 594, 68, 68, 595, 132, 591, - - 68, 586, 68, 590, 68, 68, 597, 68, 68, 68, - 68, 68, 593, 606, 68, 596, 68, 68, 68, 68, - 68, 600, 609, 598, 612, 608, 613, 68, 611, 599, - 68, 68, 618, 601, 619, 602, 607, 610, 625, 603, - 68, 604, 68, 614, 68, 621, 605, 68, 615, 68, - 616, 68, 620, 68, 622, 623, 626, 68, 68, 628, - 68, 68, 627, 629, 68, 624, 68, 68, 617, 68, - 68, 632, 630, 68, 631, 68, 68, 640, 634, 68, - 636, 68, 68, 68, 68, 68, 633, 68, 639, 635, - 638, 68, 644, 637, 647, 68, 645, 68, 654, 643, - - 641, 642, 646, 68, 648, 649, 68, 650, 68, 68, - 68, 651, 68, 68, 652, 68, 68, 653, 657, 68, - 68, 655, 661, 68, 659, 660, 68, 68, 656, 68, - 658, 68, 663, 664, 68, 68, 665, 68, 667, 662, - 68, 68, 68, 68, 68, 68, 677, 666, 672, 668, - 673, 68, 68, 676, 671, 675, 669, 68, 678, 68, - 670, 68, 674, 68, 680, 68, 684, 68, 68, 68, - 68, 68, 679, 68, 68, 682, 68, 68, 681, 683, - 686, 68, 692, 700, 68, 68, 685, 68, 687, 690, - 689, 693, 68, 68, 68, 695, 68, 691, 688, 694, - - 68, 68, 68, 701, 68, 697, 696, 68, 698, 703, - 68, 702, 68, 68, 68, 705, 699, 707, 68, 68, - 68, 68, 68, 708, 68, 68, 704, 68, 68, 68, - 68, 706, 711, 709, 710, 715, 719, 718, 68, 720, - 712, 68, 714, 713, 68, 716, 721, 717, 68, 68, - 724, 68, 68, 723, 725, 68, 729, 68, 730, 68, - 728, 68, 68, 68, 722, 727, 68, 731, 726, 68, - 733, 732, 734, 68, 68, 738, 739, 737, 735, 68, - 68, 68, 68, 68, 740, 68, 741, 68, 736, 68, - 68, 747, 742, 68, 68, 68, 746, 743, 68, 744, - - 68, 745, 68, 752, 748, 756, 68, 750, 749, 68, - 758, 68, 753, 751, 68, 68, 68, 759, 754, 68, - 760, 762, 68, 68, 757, 764, 68, 755, 765, 766, - 68, 68, 68, 68, 68, 761, 68, 768, 68, 763, - 68, 769, 772, 770, 774, 775, 68, 773, 68, 68, - 68, 767, 771, 776, 777, 778, 68, 68, 68, 68, - 781, 68, 68, 68, 784, 68, 68, 68, 780, 68, - 68, 68, 788, 68, 68, 779, 793, 68, 782, 68, - 794, 68, 68, 785, 797, 783, 786, 789, 787, 68, - 790, 791, 68, 68, 68, 68, 68, 792, 800, 68, - - 796, 68, 132, 795, 68, 68, 68, 798, 68, 806, - 803, 801, 799, 807, 802, 68, 804, 810, 805, 68, - 808, 68, 68, 809, 68, 815, 816, 812, 68, 814, - 68, 68, 68, 817, 811, 818, 68, 68, 68, 68, - 822, 68, 819, 813, 823, 68, 68, 821, 824, 68, - 68, 68, 820, 68, 830, 68, 68, 829, 825, 68, - 826, 68, 68, 68, 68, 68, 838, 835, 68, 828, - 68, 68, 827, 839, 831, 832, 68, 68, 68, 837, - 833, 834, 840, 841, 836, 842, 844, 68, 68, 68, - 68, 843, 130, 845, 846, 848, 68, 847, 68, 851, - - 68, 850, 68, 852, 853, 68, 68, 849, 68, 854, - 68, 68, 68, 856, 855, 68, 68, 857, 68, 68, - 859, 861, 68, 68, 863, 68, 68, 68, 68, 866, - 68, 858, 68, 860, 68, 868, 862, 865, 68, 871, - 68, 864, 870, 68, 68, 68, 867, 875, 877, 876, - 869, 68, 68, 68, 872, 68, 68, 68, 68, 885, - 873, 880, 881, 874, 68, 884, 879, 883, 68, 68, - 68, 878, 68, 68, 68, 68, 892, 68, 889, 68, - 891, 882, 68, 68, 893, 68, 886, 68, 887, 900, - 68, 68, 888, 68, 68, 68, 68, 890, 68, 68, - - 894, 897, 898, 895, 899, 896, 68, 906, 68, 68, - 907, 909, 68, 901, 904, 902, 905, 903, 68, 68, - 68, 910, 908, 68, 911, 68, 68, 914, 918, 919, - 68, 68, 913, 68, 915, 917, 912, 916, 68, 68, - 68, 68, 68, 68, 926, 68, 68, 68, 929, 68, - 931, 920, 921, 68, 923, 68, 922, 68, 68, 68, - 925, 927, 934, 932, 928, 930, 924, 68, 68, 933, - 68, 935, 939, 936, 68, 68, 938, 68, 68, 937, - 68, 68, 68, 68, 68, 945, 68, 946, 947, 948, - 68, 68, 940, 942, 941, 949, 943, 952, 68, 68, - - 944, 68, 68, 956, 68, 68, 951, 68, 68, 960, - 68, 954, 68, 950, 955, 953, 957, 68, 959, 961, - 68, 963, 68, 958, 964, 68, 962, 68, 965, 68, - 968, 68, 68, 970, 68, 971, 68, 972, 68, 68, - 974, 973, 68, 976, 966, 68, 68, 967, 68, 978, - 68, 980, 969, 68, 979, 68, 68, 975, 68, 68, - 68, 68, 988, 68, 68, 68, 990, 981, 68, 982, - 68, 977, 68, 68, 983, 993, 68, 68, 984, 985, - 986, 992, 987, 68, 995, 994, 68, 998, 991, 68, - 989, 68, 996, 68, 68, 1002, 68, 68, 1001, 997, - - 68, 1005, 68, 1004, 68, 68, 1007, 1000, 68, 1006, - 68, 68, 68, 68, 1003, 999, 1014, 68, 1012, 68, - 1017, 68, 1013, 1009, 68, 1008, 1011, 68, 1020, 1010, - 1015, 1021, 68, 68, 1022, 1016, 68, 1024, 1023, 68, - 68, 1019, 68, 68, 1026, 1018, 68, 1028, 1025, 68, - 68, 1031, 1027, 68, 68, 1033, 68, 68, 1029, 68, - 68, 68, 1035, 1036, 68, 1034, 1037, 68, 68, 1042, - 1041, 68, 68, 68, 1038, 1030, 1032, 1039, 68, 1040, - 68, 1043, 68, 1048, 68, 68, 68, 1046, 1050, 1045, - 68, 1047, 1044, 68, 68, 1052, 68, 1055, 1053, 1049, - - 1054, 68, 68, 1051, 68, 1057, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 1065, 68, 1064, 68, 1059, - 1060, 1061, 1056, 128, 68, 1062, 68, 1058, 1069, 68, - 1068, 1063, 1066, 1067, 68, 68, 68, 1072, 68, 1071, - 68, 1073, 1077, 1074, 1070, 68, 1076, 68, 68, 68, - 1078, 1081, 68, 68, 68, 68, 1085, 68, 1075, 68, - 68, 68, 68, 1080, 1086, 1082, 1083, 1079, 68, 1084, - 68, 1087, 68, 1088, 1090, 1089, 68, 68, 1092, 68, - 1091, 68, 1093, 1094, 1097, 68, 1099, 68, 1096, 68, - 1098, 68, 68, 68, 68, 1101, 68, 1095, 1102, 1104, - - 68, 68, 1105, 1107, 68, 1103, 68, 1108, 1100, 68, - 1106, 68, 68, 68, 68, 68, 1110, 1111, 68, 1113, - 68, 1109, 1114, 68, 68, 68, 68, 1112, 1121, 68, - 68, 1135, 68, 1122, 1115, 68, 1119, 68, 1125, 1117, - 1126, 68, 1116, 68, 1118, 1123, 1120, 68, 1124, 1127, - 68, 1129, 68, 1130, 68, 68, 1128, 1132, 68, 1133, - 68, 1136, 68, 68, 1138, 68, 1131, 68, 68, 68, - 68, 1141, 68, 1142, 1134, 1140, 1144, 68, 1146, 68, - 1147, 68, 1137, 68, 68, 1139, 68, 1149, 1143, 1145, - 68, 68, 68, 1150, 68, 68, 1152, 68, 68, 68, - - 1160, 68, 1151, 1156, 68, 68, 68, 1154, 1158, 1148, - 1159, 68, 1157, 68, 68, 1161, 1155, 1153, 68, 1164, - 1165, 1168, 1163, 127, 1162, 68, 68, 1166, 68, 68, - 1183, 68, 1170, 1172, 68, 1167, 1171, 68, 68, 68, - 1169, 1173, 1174, 1175, 68, 68, 68, 68, 68, 1181, - 1176, 1178, 68, 1180, 68, 68, 68, 1184, 1177, 125, - 68, 1182, 1186, 68, 1185, 68, 1179, 68, 1187, 1188, - 68, 68, 1190, 68, 1191, 68, 1189, 1192, 68, 1193, - 68, 1194, 68, 68, 68, 1195, 1197, 68, 1196, 1198, - 68, 68, 1199, 68, 1200, 68, 1201, 1202, 68, 1203, - - 68, 1204, 68, 68, 68, 1205, 68, 68, 1211, 68, - 68, 68, 68, 1206, 68, 1207, 1208, 68, 1209, 1212, - 68, 68, 68, 68, 68, 1221, 68, 1210, 1219, 1220, - 1215, 68, 1214, 68, 1217, 68, 1223, 1213, 1216, 1218, - 1222, 1224, 68, 68, 68, 68, 1226, 68, 1231, 68, - 1232, 1227, 1225, 68, 68, 68, 68, 68, 68, 68, - 1238, 1229, 1228, 1239, 68, 68, 1230, 68, 1233, 1242, - 68, 68, 68, 1234, 1244, 68, 1235, 1236, 68, 1237, - 1240, 1245, 68, 68, 1246, 1241, 68, 1248, 68, 68, - 1243, 1249, 68, 1250, 1247, 68, 68, 1251, 68, 123, - - 1253, 1254, 1256, 68, 1257, 68, 1258, 1252, 1259, 68, - 68, 68, 68, 1255, 1260, 68, 68, 1261, 68, 1263, - 68, 68, 1262, 68, 1267, 68, 68, 68, 68, 1265, - 1266, 1264, 1271, 68, 1268, 1273, 68, 1272, 68, 68, - 68, 68, 68, 1275, 68, 1269, 1270, 1274, 68, 1276, - 1278, 68, 68, 1280, 1277, 68, 1282, 68, 1281, 1283, - 68, 68, 1279, 1286, 1287, 68, 1284, 68, 68, 68, - 68, 1288, 68, 68, 68, 1285, 1289, 68, 1293, 68, - 1291, 68, 68, 68, 1295, 68, 68, 68, 1290, 1300, - 1294, 68, 1292, 68, 1298, 1302, 68, 1303, 68, 68, - - 1304, 1296, 68, 1299, 68, 1301, 68, 1305, 1297, 1308, - 68, 1306, 68, 1309, 68, 1310, 68, 68, 68, 1311, - 1315, 68, 68, 68, 68, 1312, 68, 1307, 68, 1313, - 68, 1316, 1314, 68, 1317, 1320, 1319, 1323, 68, 68, - 1325, 68, 1318, 68, 1324, 1322, 1328, 68, 1329, 68, - 1321, 68, 68, 1326, 68, 1333, 68, 68, 1335, 68, - 68, 68, 68, 68, 1331, 1327, 1373, 1338, 1342, 1334, - 1330, 1339, 68, 68, 1332, 1337, 1340, 68, 1346, 1336, - 1341, 68, 1343, 68, 68, 1344, 1345, 68, 68, 1348, - 68, 68, 68, 68, 1352, 68, 1347, 1349, 1350, 68, - - 1354, 68, 68, 1353, 1356, 68, 1355, 68, 68, 1359, - 68, 1351, 1360, 68, 1361, 68, 1362, 68, 68, 68, - 1364, 68, 1357, 68, 68, 1365, 1358, 1367, 68, 68, - 1363, 68, 68, 1368, 1372, 68, 1373, 1373, 1373, 1373, - 1373, 1373, 1373, 1366, 1369, 1370, 1373, 1373, 1373, 1373, - 1373, 1371, 40, 40, 40, 40, 40, 40, 40, 45, - 45, 45, 45, 45, 45, 45, 50, 50, 50, 50, - 50, 50, 50, 56, 56, 56, 56, 56, 56, 56, - 61, 61, 61, 61, 61, 61, 61, 71, 71, 1373, - 71, 71, 71, 71, 122, 122, 1373, 1373, 1373, 122, - - 122, 124, 124, 1373, 1373, 124, 1373, 124, 126, 1373, - 1373, 1373, 1373, 1373, 126, 129, 129, 1373, 1373, 1373, - 129, 129, 131, 1373, 1373, 1373, 1373, 1373, 131, 133, - 133, 1373, 133, 133, 133, 133, 72, 72, 1373, 72, - 72, 72, 72, 13, 1373, 1373, 1373, 1373, 1373, 1373, - 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, - 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, - 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, - 1373, 1373, 1373 + 134, 198, 68, 68, 201, 68, 68, 199, 200, 68, + 194, 68, 207, 196, 68, 128, 68, 68, 68, 197, + 68, 209, 211, 68, 202, 68, 68, 68, 210, 203, + 212, 213, 68, 208, 204, 68, 219, 218, 214, 215, + 205, 206, 216, 68, 217, 68, 222, 68, 223, 224, + 226, 68, 68, 68, 68, 68, 68, 68, 127, 229, + + 225, 221, 227, 220, 68, 68, 231, 232, 68, 68, + 230, 68, 68, 228, 68, 233, 235, 68, 68, 237, + 234, 68, 68, 236, 239, 68, 238, 241, 245, 68, + 68, 68, 68, 68, 247, 249, 248, 68, 68, 251, + 68, 240, 68, 132, 255, 252, 68, 242, 243, 244, + 68, 246, 254, 260, 68, 257, 250, 68, 68, 68, + 68, 256, 259, 68, 261, 258, 68, 68, 253, 68, + 68, 267, 266, 68, 264, 262, 68, 268, 68, 68, + 68, 263, 271, 274, 272, 68, 68, 68, 68, 269, + 68, 276, 265, 270, 273, 68, 68, 278, 68, 68, + + 275, 277, 68, 68, 283, 68, 68, 279, 68, 287, + 285, 68, 282, 280, 68, 68, 68, 68, 288, 281, + 286, 68, 68, 284, 68, 298, 68, 68, 289, 68, + 292, 68, 293, 355, 290, 294, 295, 291, 68, 68, + 296, 297, 299, 68, 300, 68, 302, 301, 304, 68, + 305, 68, 303, 68, 306, 68, 309, 68, 68, 68, + 68, 68, 312, 311, 313, 68, 307, 68, 319, 68, + 125, 68, 68, 68, 314, 308, 318, 310, 68, 68, + 68, 315, 68, 320, 316, 324, 317, 334, 68, 132, + 321, 322, 68, 323, 326, 68, 68, 335, 68, 68, + + 123, 325, 68, 340, 327, 328, 68, 68, 68, 68, + 336, 337, 351, 338, 329, 339, 330, 331, 332, 341, + 344, 333, 342, 68, 343, 68, 345, 68, 348, 349, + 68, 68, 347, 68, 68, 68, 68, 346, 354, 68, + 68, 68, 68, 68, 361, 362, 68, 68, 353, 352, + 350, 358, 360, 356, 357, 363, 364, 68, 68, 68, + 68, 68, 366, 365, 359, 367, 68, 369, 370, 68, + 68, 68, 368, 68, 68, 68, 375, 68, 374, 372, + 68, 68, 376, 373, 68, 378, 68, 379, 68, 68, + 371, 68, 68, 68, 68, 68, 381, 68, 382, 389, + + 387, 377, 380, 383, 68, 388, 68, 68, 386, 68, + 68, 68, 384, 385, 393, 68, 68, 68, 68, 68, + 395, 68, 68, 405, 390, 68, 394, 68, 68, 391, + 392, 417, 396, 406, 404, 68, 397, 68, 398, 403, + 68, 407, 411, 399, 68, 400, 68, 408, 68, 410, + 409, 68, 412, 401, 414, 68, 68, 68, 132, 413, + 416, 421, 420, 402, 68, 68, 68, 68, 425, 68, + 68, 68, 419, 415, 68, 418, 422, 68, 68, 520, + 424, 428, 426, 423, 68, 68, 427, 430, 432, 68, + 433, 68, 429, 68, 434, 435, 68, 437, 431, 68, + + 436, 68, 68, 68, 68, 68, 441, 68, 439, 440, + 68, 68, 68, 445, 438, 443, 442, 68, 68, 68, + 68, 447, 446, 448, 444, 68, 451, 68, 449, 453, + 68, 68, 450, 455, 68, 456, 454, 452, 68, 68, + 68, 68, 68, 458, 463, 460, 68, 68, 68, 68, + 465, 467, 459, 462, 464, 68, 68, 457, 461, 466, + 68, 68, 68, 68, 475, 471, 470, 473, 472, 68, + 68, 474, 68, 468, 469, 68, 479, 68, 477, 476, + 480, 68, 68, 68, 481, 483, 68, 68, 68, 68, + 68, 68, 68, 478, 488, 68, 482, 68, 68, 68, + + 489, 493, 68, 495, 484, 485, 68, 486, 68, 487, + 490, 494, 496, 492, 68, 491, 68, 68, 499, 497, + 68, 68, 68, 68, 68, 68, 502, 501, 504, 503, + 500, 68, 498, 68, 508, 68, 505, 68, 132, 68, + 507, 68, 506, 510, 511, 68, 68, 68, 514, 509, + 512, 68, 516, 68, 521, 517, 515, 68, 513, 68, + 68, 68, 68, 519, 68, 518, 525, 524, 526, 523, + 68, 68, 68, 68, 536, 533, 522, 68, 68, 527, + 68, 528, 534, 68, 529, 537, 68, 538, 543, 530, + 68, 539, 68, 540, 68, 531, 532, 535, 68, 541, + + 68, 68, 68, 542, 68, 547, 68, 551, 68, 546, + 68, 552, 544, 545, 553, 550, 68, 548, 68, 68, + 68, 554, 68, 68, 549, 68, 555, 68, 68, 68, + 556, 557, 559, 561, 68, 560, 563, 562, 68, 68, + 68, 68, 565, 558, 68, 567, 68, 68, 68, 68, + 569, 68, 68, 68, 566, 68, 572, 564, 570, 68, + 68, 568, 68, 68, 577, 68, 578, 68, 68, 571, + 573, 68, 574, 68, 581, 575, 68, 583, 579, 576, + 586, 582, 580, 68, 68, 68, 68, 585, 584, 68, + 587, 68, 592, 593, 590, 588, 589, 68, 68, 68, + + 594, 68, 597, 68, 591, 599, 68, 68, 600, 132, + 68, 68, 68, 68, 596, 602, 68, 595, 68, 68, + 68, 68, 611, 598, 68, 601, 68, 68, 68, 68, + 605, 603, 68, 640, 612, 618, 614, 604, 68, 619, + 615, 606, 617, 607, 68, 613, 625, 608, 616, 609, + 68, 620, 68, 68, 610, 68, 621, 624, 622, 68, + 627, 68, 68, 629, 68, 626, 628, 632, 68, 68, + 634, 68, 68, 633, 635, 68, 623, 68, 630, 68, + 68, 631, 68, 68, 638, 68, 68, 68, 642, 646, + 637, 636, 68, 68, 68, 68, 645, 68, 68, 639, + + 644, 641, 650, 651, 68, 643, 68, 655, 649, 652, + 68, 647, 68, 648, 656, 653, 68, 654, 657, 68, + 68, 658, 68, 68, 659, 660, 68, 68, 68, 663, + 662, 68, 68, 665, 68, 68, 666, 68, 661, 68, + 667, 670, 68, 669, 68, 68, 68, 68, 664, 673, + 672, 668, 68, 671, 68, 68, 68, 674, 68, 678, + 679, 681, 68, 683, 675, 677, 684, 676, 68, 68, + 68, 68, 68, 682, 680, 686, 68, 690, 68, 68, + 68, 68, 68, 68, 685, 68, 688, 68, 698, 687, + 689, 692, 68, 68, 68, 68, 68, 691, 699, 693, + + 696, 695, 68, 68, 68, 68, 68, 700, 694, 701, + 702, 703, 697, 706, 707, 68, 68, 68, 68, 704, + 705, 68, 68, 710, 68, 68, 709, 712, 68, 714, + 68, 68, 68, 68, 708, 68, 68, 715, 68, 68, + 711, 68, 68, 713, 718, 716, 717, 722, 68, 68, + 726, 725, 719, 723, 721, 68, 720, 728, 68, 724, + 68, 68, 727, 731, 68, 730, 68, 732, 68, 736, + 68, 737, 68, 740, 68, 735, 68, 734, 729, 68, + 733, 738, 68, 68, 739, 68, 68, 745, 742, 746, + 68, 741, 68, 68, 68, 747, 68, 748, 68, 743, + + 68, 68, 68, 68, 744, 749, 754, 68, 68, 753, + 750, 68, 751, 68, 752, 755, 759, 757, 68, 756, + 763, 68, 68, 765, 68, 760, 758, 68, 68, 68, + 766, 761, 68, 767, 769, 68, 68, 764, 771, 68, + 68, 772, 68, 762, 773, 68, 68, 775, 768, 68, + 68, 68, 770, 781, 776, 777, 68, 779, 68, 782, + 774, 68, 68, 780, 68, 784, 783, 778, 68, 68, + 68, 785, 788, 68, 68, 68, 791, 68, 68, 68, + 787, 68, 68, 795, 68, 68, 68, 786, 68, 68, + 68, 132, 68, 68, 789, 800, 794, 792, 790, 793, + + 68, 68, 68, 801, 796, 805, 798, 802, 68, 799, + 797, 804, 807, 68, 68, 803, 68, 808, 68, 806, + 809, 68, 68, 68, 68, 68, 68, 814, 816, 68, + 811, 815, 68, 810, 68, 818, 812, 813, 820, 68, + 68, 823, 824, 817, 819, 822, 68, 68, 68, 825, + 826, 68, 68, 828, 68, 821, 830, 827, 832, 68, + 831, 68, 68, 68, 68, 68, 68, 68, 68, 838, + 68, 68, 837, 829, 68, 68, 68, 68, 68, 846, + 68, 833, 834, 68, 836, 843, 839, 840, 847, 841, + 835, 68, 845, 849, 842, 848, 68, 844, 68, 852, + + 68, 68, 68, 68, 856, 850, 853, 854, 68, 68, + 68, 68, 859, 130, 860, 858, 861, 68, 851, 68, + 862, 68, 855, 68, 68, 68, 857, 863, 68, 864, + 68, 68, 869, 68, 68, 867, 68, 871, 865, 68, + 68, 68, 68, 68, 68, 874, 868, 876, 68, 68, + 866, 873, 68, 879, 870, 68, 68, 68, 878, 883, + 68, 872, 875, 885, 68, 884, 877, 68, 68, 880, + 888, 68, 68, 68, 68, 881, 882, 68, 889, 890, + 892, 887, 893, 68, 886, 68, 894, 68, 68, 68, + 68, 68, 68, 901, 68, 898, 68, 900, 891, 68, + + 68, 895, 68, 68, 902, 909, 68, 896, 68, 897, + 68, 68, 68, 68, 899, 68, 904, 906, 903, 908, + 907, 68, 905, 68, 68, 918, 68, 68, 914, 68, + 913, 910, 911, 915, 912, 68, 916, 68, 919, 917, + 68, 68, 920, 921, 68, 68, 927, 68, 923, 922, + 924, 68, 68, 925, 926, 928, 68, 68, 68, 68, + 930, 68, 935, 68, 929, 68, 68, 938, 68, 940, + 931, 932, 68, 943, 68, 68, 68, 934, 68, 936, + 68, 941, 68, 933, 937, 942, 939, 68, 947, 944, + 945, 68, 68, 68, 68, 948, 946, 68, 68, 68, + + 68, 68, 954, 68, 955, 956, 957, 68, 68, 949, + 951, 950, 958, 953, 68, 952, 961, 68, 68, 68, + 68, 965, 68, 960, 969, 68, 68, 68, 962, 68, + 959, 963, 964, 968, 966, 68, 967, 970, 68, 972, + 68, 973, 68, 68, 971, 68, 68, 977, 68, 68, + 974, 979, 68, 980, 68, 981, 68, 983, 68, 982, + 68, 975, 68, 976, 985, 978, 68, 984, 68, 68, + 987, 68, 68, 988, 989, 68, 68, 68, 990, 68, + 991, 997, 68, 986, 68, 992, 68, 999, 993, 68, + 68, 1002, 68, 68, 68, 994, 995, 68, 996, 1001, + + 68, 1004, 68, 1007, 68, 68, 1005, 68, 1003, 1000, + 998, 1011, 1010, 68, 68, 68, 68, 1014, 68, 1015, + 68, 1009, 1013, 68, 68, 68, 1006, 68, 68, 1016, + 1008, 68, 128, 1012, 1021, 1023, 68, 68, 68, 1018, + 1022, 68, 1020, 1017, 1019, 1026, 68, 1029, 1024, 1030, + 68, 68, 68, 1025, 68, 1028, 1031, 1033, 68, 1027, + 1032, 68, 68, 1034, 1035, 68, 1036, 68, 1040, 68, + 1038, 1037, 68, 68, 1042, 68, 68, 68, 1062, 68, + 1044, 1045, 68, 1046, 68, 68, 68, 1043, 68, 68, + 1039, 1047, 1049, 1048, 1041, 68, 68, 1052, 1050, 68, + + 68, 68, 1057, 68, 68, 68, 1059, 1051, 1053, 1055, + 1056, 68, 68, 1061, 1063, 68, 68, 1054, 1058, 68, + 68, 1066, 1060, 1064, 68, 68, 68, 68, 68, 68, + 68, 68, 68, 1074, 68, 1073, 68, 1068, 1069, 1065, + 1070, 68, 1071, 1076, 68, 1067, 1078, 68, 68, 1072, + 1075, 68, 68, 1080, 1081, 1077, 1082, 68, 68, 68, + 1086, 68, 1079, 1083, 1085, 68, 1087, 68, 1090, 68, + 68, 68, 68, 68, 1094, 1084, 68, 68, 1088, 68, + 1092, 1089, 1091, 1093, 1097, 1095, 68, 68, 68, 1096, + 68, 1098, 68, 1100, 68, 68, 1102, 68, 1103, 68, + + 1099, 1106, 68, 68, 1101, 68, 1105, 1110, 1107, 1108, + 68, 68, 1113, 68, 1109, 68, 1111, 68, 1112, 1104, + 1116, 68, 68, 1114, 68, 1117, 1115, 68, 68, 68, + 68, 68, 1119, 1120, 1118, 1122, 68, 68, 68, 68, + 68, 68, 68, 1121, 1130, 68, 68, 68, 1149, 1131, + 68, 127, 1128, 68, 1134, 1124, 68, 1123, 1126, 1127, + 1132, 1125, 1129, 1133, 1135, 68, 1136, 68, 68, 1137, + 1138, 68, 1139, 68, 1141, 68, 1142, 68, 68, 68, + 1145, 68, 68, 68, 1144, 1147, 68, 1140, 68, 68, + 1153, 68, 1150, 68, 1151, 1155, 68, 1143, 1156, 68, + + 68, 1146, 1154, 68, 1158, 68, 1148, 68, 68, 1152, + 68, 68, 68, 1161, 1159, 68, 68, 1169, 68, 1160, + 1165, 68, 68, 68, 1163, 68, 1157, 1167, 68, 1170, + 1168, 1166, 68, 1164, 68, 1162, 1174, 1172, 68, 1173, + 68, 68, 68, 1171, 68, 1175, 1178, 1177, 68, 68, + 68, 1179, 68, 1176, 1180, 1181, 68, 68, 1192, 68, + 68, 1182, 1183, 1184, 68, 1185, 1222, 68, 68, 1190, + 1186, 1187, 1188, 1189, 68, 68, 68, 68, 68, 68, + 1195, 1191, 1193, 68, 1194, 68, 1196, 1197, 68, 68, + 1199, 68, 1200, 68, 1198, 1201, 68, 1202, 68, 1203, + + 68, 1204, 68, 1205, 1206, 68, 68, 1207, 1208, 68, + 68, 1211, 68, 1212, 68, 1210, 1213, 68, 68, 68, + 68, 68, 68, 1209, 68, 1220, 68, 68, 68, 68, + 1214, 68, 1216, 1217, 1218, 68, 1221, 1215, 68, 68, + 68, 68, 1224, 68, 1219, 1228, 1229, 68, 1223, 1226, + 1230, 68, 68, 1232, 68, 1225, 1227, 1231, 1233, 68, + 68, 1236, 1235, 1234, 68, 68, 1240, 68, 1241, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 1237, 1247, + 1238, 1248, 68, 68, 1239, 1242, 1251, 68, 1243, 68, + 1249, 1244, 1246, 1245, 68, 1250, 1253, 68, 1254, 68, + + 68, 1255, 1252, 1257, 68, 68, 68, 68, 68, 1258, + 1259, 1256, 68, 1262, 1260, 68, 125, 1263, 1265, 68, + 1266, 68, 1261, 1267, 1268, 68, 1269, 68, 68, 68, + 1264, 68, 68, 68, 1270, 1272, 68, 68, 68, 68, + 1276, 68, 68, 1271, 68, 1274, 1273, 1275, 1280, 68, + 1277, 1282, 68, 1281, 68, 68, 1278, 68, 68, 68, + 1284, 1279, 1283, 1287, 68, 68, 1285, 68, 1289, 68, + 68, 1286, 1290, 1291, 68, 1292, 68, 1295, 68, 1288, + 1296, 68, 68, 1293, 1294, 68, 68, 68, 68, 1297, + 68, 1302, 1298, 68, 68, 1300, 68, 1299, 68, 1304, + + 68, 68, 68, 68, 68, 1309, 68, 1301, 1312, 1303, + 1307, 1311, 68, 68, 68, 1313, 1305, 68, 68, 68, + 1308, 1310, 1314, 1317, 1306, 68, 1315, 68, 1318, 68, + 68, 68, 68, 68, 1319, 1320, 1324, 68, 1321, 68, + 68, 68, 1316, 68, 68, 1330, 1329, 1323, 1325, 1326, + 1322, 1328, 1332, 68, 68, 68, 1334, 68, 68, 1327, + 1333, 1337, 68, 1331, 1338, 68, 68, 68, 68, 1342, + 68, 68, 1344, 68, 1335, 68, 68, 68, 123, 1340, + 1336, 68, 1347, 1343, 68, 1339, 1348, 68, 1341, 1351, + 1346, 1349, 68, 68, 1345, 1350, 68, 1352, 68, 68, + + 1353, 1354, 68, 68, 68, 1357, 68, 68, 1355, 68, + 68, 1362, 1356, 1360, 1358, 1359, 1361, 68, 1363, 68, + 68, 1365, 68, 68, 1364, 68, 1368, 68, 1369, 68, + 1370, 68, 1371, 68, 68, 68, 1373, 68, 1366, 68, + 68, 1374, 68, 1367, 1376, 68, 1372, 68, 68, 1377, + 1381, 68, 1382, 1382, 1382, 1382, 1382, 1378, 1382, 1375, + 1382, 1379, 1382, 1382, 1382, 1382, 1382, 1380, 40, 40, + 40, 40, 40, 40, 40, 45, 45, 45, 45, 45, + 45, 45, 50, 50, 50, 50, 50, 50, 50, 56, + 56, 56, 56, 56, 56, 56, 61, 61, 61, 61, + + 61, 61, 61, 71, 71, 1382, 71, 71, 71, 71, + 122, 122, 1382, 1382, 1382, 122, 122, 124, 124, 1382, + 1382, 124, 1382, 124, 126, 1382, 1382, 1382, 1382, 1382, + 126, 129, 129, 1382, 1382, 1382, 129, 129, 131, 1382, + 1382, 1382, 1382, 1382, 131, 133, 133, 1382, 133, 133, + 133, 133, 72, 72, 1382, 72, 72, 72, 72, 13, + 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, + 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, + 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, + 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382 + } ; -static yyconst flex_int16_t yy_chk[2784] = +static yyconst flex_int16_t yy_chk[2800] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1200,7 +1207,7 @@ static yyconst flex_int16_t yy_chk[2784] = 9, 118, 33, 6, 7, 7, 7, 7, 9, 7, 10, 10, 10, 44, 44, 7, 8, 8, 8, 8, 10, 8, 21, 33, 118, 21, 21, 8, 11, 11, - 11, 11, 11, 11, 1379, 20, 29, 20, 20, 11, + 11, 11, 11, 11, 1388, 20, 29, 20, 20, 11, 20, 29, 24, 21, 25, 20, 24, 28, 11, 12, 12, 12, 12, 12, 12, 74, 22, 22, 74, 25, @@ -1210,7 +1217,7 @@ static yyconst flex_int16_t yy_chk[2784] = 32, 32, 27, 75, 27, 32, 31, 75, 34, 30, 35, 76, 31, 39, 39, 35, 31, 34, 39, 36, 109, 32, 38, 34, 36, 35, 34, 93, 35, 37, - 37, 76, 37, 34, 36, 109, 38, 595, 36, 36, + 37, 76, 37, 34, 36, 109, 38, 600, 36, 36, 55, 38, 55, 55, 79, 55, 93, 37, 60, 60, 63, 78, 63, 63, 65, 63, 65, 65, 79, 65, @@ -1228,275 +1235,277 @@ static yyconst flex_int16_t yy_chk[2784] = 125, 114, 115, 125, 116, 120, 117, 127, 121, 127, 127, 136, 127, 130, 130, 132, 136, 132, 132, 133, 132, 133, 133, 135, 133, 138, 135, 137, 140, 141, - 133, 142, 137, 143, 144, 149, 142, 147, 143, 144, - 138, 146, 146, 140, 150, 153, 148, 151, 150, 141, - 145, 148, 151, 152, 145, 155, 147, 154, 149, 145, - 153, 156, 157, 157, 145, 158, 156, 152, 159, 154, - 145, 145, 154, 155, 160, 161, 161, 162, 163, 160, - 164, 165, 162, 163, 159, 158, 166, 167, 162, 164, - - 168, 166, 167, 169, 170, 168, 172, 171, 169, 173, - 174, 170, 165, 171, 175, 173, 176, 177, 178, 179, - 180, 128, 175, 178, 181, 182, 172, 184, 183, 181, - 183, 176, 174, 186, 184, 185, 191, 177, 180, 180, - 185, 179, 187, 187, 188, 182, 189, 192, 191, 188, - 193, 189, 186, 190, 194, 190, 195, 198, 193, 194, - 196, 195, 197, 200, 200, 198, 192, 188, 199, 201, - 201, 199, 190, 202, 204, 196, 203, 204, 205, 206, - 197, 207, 205, 208, 209, 209, 207, 210, 206, 202, - 211, 203, 210, 212, 213, 211, 214, 208, 215, 216, - - 216, 217, 218, 219, 220, 221, 218, 223, 221, 220, - 222, 215, 213, 212, 224, 219, 225, 214, 226, 217, - 227, 232, 222, 224, 223, 231, 228, 223, 228, 228, - 233, 226, 227, 229, 229, 230, 232, 225, 230, 233, - 234, 234, 231, 235, 237, 231, 236, 236, 235, 238, - 239, 240, 241, 242, 243, 239, 242, 241, 242, 237, - 244, 245, 246, 248, 250, 249, 255, 246, 243, 238, - 245, 240, 247, 252, 254, 255, 244, 247, 250, 244, - 251, 244, 257, 251, 248, 249, 256, 252, 259, 254, - 258, 260, 265, 261, 262, 263, 260, 264, 126, 251, - - 253, 257, 253, 253, 269, 258, 265, 256, 259, 262, - 263, 268, 253, 261, 253, 253, 253, 264, 266, 253, - 269, 267, 267, 266, 267, 270, 271, 272, 273, 272, - 274, 268, 273, 275, 276, 277, 343, 278, 285, 343, - 271, 270, 278, 276, 277, 279, 280, 275, 274, 279, - 283, 285, 281, 282, 283, 280, 276, 281, 284, 282, - 286, 286, 287, 284, 288, 289, 290, 287, 291, 292, - 292, 293, 291, 294, 289, 298, 293, 300, 290, 295, - 295, 297, 297, 299, 303, 288, 300, 301, 304, 305, - 306, 299, 307, 308, 294, 306, 298, 309, 308, 301, - - 307, 310, 312, 305, 303, 311, 312, 313, 304, 314, - 316, 315, 318, 325, 314, 309, 323, 319, 322, 322, - 321, 329, 313, 310, 324, 324, 311, 315, 325, 316, - 317, 317, 318, 319, 320, 326, 317, 327, 317, 320, - 321, 323, 328, 329, 320, 330, 317, 326, 331, 332, - 330, 333, 327, 336, 334, 335, 317, 331, 334, 337, - 335, 328, 338, 339, 339, 336, 333, 340, 332, 341, - 342, 344, 345, 345, 351, 338, 353, 337, 124, 340, - 353, 341, 346, 346, 344, 342, 347, 348, 348, 349, - 349, 347, 350, 352, 354, 351, 355, 350, 352, 354, - - 355, 356, 357, 358, 359, 360, 356, 363, 358, 359, - 362, 362, 361, 364, 365, 361, 122, 367, 364, 360, - 361, 367, 357, 365, 361, 363, 366, 368, 369, 366, - 370, 371, 368, 372, 373, 370, 374, 375, 378, 373, - 375, 369, 374, 367, 379, 372, 376, 371, 377, 376, - 380, 381, 382, 377, 381, 380, 378, 382, 379, 383, - 384, 385, 389, 383, 383, 384, 386, 387, 391, 386, - 385, 387, 387, 388, 390, 388, 390, 392, 393, 394, - 396, 389, 401, 395, 386, 397, 391, 395, 398, 396, - 399, 400, 402, 402, 403, 392, 400, 393, 403, 394, - - 397, 401, 404, 405, 406, 399, 398, 404, 407, 408, - 409, 410, 411, 413, 416, 409, 408, 411, 410, 405, - 412, 407, 414, 406, 415, 412, 419, 417, 416, 414, - 419, 413, 417, 415, 418, 420, 423, 418, 421, 421, - 424, 423, 425, 426, 424, 430, 427, 421, 433, 434, - 435, 426, 440, 436, 435, 434, 420, 433, 436, 438, - 425, 427, 430, 437, 438, 437, 439, 437, 441, 443, - 437, 441, 442, 442, 445, 437, 443, 440, 444, 444, - 447, 437, 437, 447, 439, 446, 446, 448, 449, 445, - 450, 451, 448, 452, 452, 453, 454, 455, 457, 451, - - 456, 456, 455, 457, 459, 461, 458, 459, 449, 450, - 453, 458, 460, 461, 454, 462, 463, 464, 460, 465, - 466, 466, 464, 462, 467, 468, 465, 469, 471, 472, - 468, 471, 467, 474, 463, 473, 473, 477, 475, 478, - 479, 475, 480, 472, 478, 481, 469, 483, 474, 475, - 482, 484, 490, 485, 486, 484, 483, 487, 477, 489, - 488, 479, 480, 491, 492, 489, 487, 481, 494, 492, - 482, 485, 490, 486, 488, 493, 495, 491, 496, 493, - 497, 498, 498, 496, 499, 501, 502, 494, 495, 499, - 500, 503, 504, 500, 505, 505, 503, 506, 506, 502, - - 507, 497, 508, 501, 509, 510, 508, 511, 516, 513, - 515, 514, 504, 513, 518, 507, 517, 67, 519, 529, - 523, 511, 516, 509, 519, 515, 520, 522, 518, 510, - 512, 520, 522, 512, 523, 512, 514, 517, 529, 512, - 524, 512, 521, 521, 525, 525, 512, 527, 521, 526, - 521, 528, 524, 535, 526, 527, 530, 530, 531, 533, - 534, 536, 531, 534, 533, 528, 537, 538, 521, 539, - 540, 537, 535, 542, 536, 541, 543, 545, 539, 544, - 541, 547, 545, 548, 549, 553, 538, 550, 544, 540, - 543, 551, 550, 542, 553, 559, 551, 552, 559, 549, - - 547, 548, 552, 554, 554, 555, 560, 557, 561, 563, - 555, 557, 557, 558, 558, 562, 566, 558, 562, 564, - 565, 560, 566, 567, 564, 565, 568, 570, 561, 571, - 563, 573, 568, 569, 569, 572, 570, 574, 572, 567, - 575, 576, 581, 577, 579, 578, 582, 571, 577, 573, - 578, 582, 580, 581, 576, 580, 574, 584, 583, 586, - 575, 587, 579, 583, 585, 585, 589, 588, 590, 592, - 589, 591, 584, 593, 597, 587, 596, 598, 586, 588, - 591, 602, 599, 607, 607, 608, 590, 599, 592, 597, - 596, 600, 603, 605, 601, 602, 600, 598, 593, 601, - - 604, 606, 609, 608, 610, 604, 603, 611, 605, 610, - 612, 609, 613, 614, 615, 612, 606, 614, 616, 617, - 618, 619, 620, 615, 621, 628, 611, 624, 625, 622, - 623, 613, 618, 616, 617, 622, 627, 625, 629, 628, - 619, 627, 621, 620, 630, 623, 629, 624, 631, 633, - 632, 635, 634, 631, 632, 632, 636, 637, 637, 644, - 635, 636, 638, 641, 630, 634, 639, 638, 633, 640, - 640, 639, 641, 642, 643, 645, 646, 644, 642, 647, - 645, 646, 648, 649, 647, 650, 648, 652, 643, 653, - 654, 652, 649, 655, 656, 657, 650, 649, 658, 649, - - 659, 649, 660, 657, 653, 661, 661, 655, 654, 662, - 663, 663, 658, 656, 665, 666, 667, 665, 659, 669, - 666, 668, 668, 671, 662, 670, 670, 660, 671, 672, - 672, 673, 674, 675, 677, 667, 678, 674, 676, 669, - 679, 675, 678, 676, 681, 682, 685, 679, 683, 681, - 682, 673, 677, 683, 684, 685, 686, 687, 689, 684, - 688, 688, 690, 692, 691, 697, 693, 696, 687, 691, - 694, 695, 695, 698, 699, 686, 701, 702, 689, 704, - 701, 701, 703, 692, 704, 690, 693, 696, 694, 705, - 697, 698, 706, 708, 707, 709, 710, 699, 707, 712, - - 703, 711, 61, 702, 713, 716, 714, 705, 717, 713, - 710, 708, 706, 714, 709, 715, 711, 717, 712, 718, - 715, 719, 720, 716, 721, 722, 723, 719, 729, 721, - 722, 723, 724, 724, 718, 726, 726, 727, 728, 732, - 730, 733, 727, 720, 730, 730, 734, 729, 731, 731, - 735, 736, 728, 742, 737, 738, 739, 736, 732, 737, - 733, 740, 741, 743, 744, 745, 745, 742, 746, 735, - 748, 750, 734, 746, 738, 739, 749, 754, 747, 744, - 740, 741, 747, 748, 743, 749, 751, 751, 752, 757, - 753, 750, 56, 752, 753, 755, 759, 754, 760, 760, - - 755, 759, 769, 761, 763, 763, 770, 757, 761, 765, - 765, 767, 768, 768, 767, 771, 774, 769, 772, 776, - 771, 773, 773, 775, 775, 778, 777, 779, 783, 778, - 780, 770, 782, 772, 785, 780, 774, 777, 784, 784, - 786, 776, 783, 787, 789, 788, 779, 788, 790, 789, - 782, 791, 792, 790, 785, 793, 796, 795, 799, 799, - 786, 793, 795, 787, 797, 798, 792, 797, 800, 801, - 798, 791, 802, 803, 804, 805, 806, 806, 803, 807, - 805, 796, 808, 809, 807, 810, 800, 811, 801, 814, - 812, 813, 802, 815, 814, 816, 817, 804, 821, 819, - - 808, 811, 812, 809, 813, 810, 822, 821, 830, 820, - 821, 825, 825, 815, 819, 816, 820, 817, 826, 827, - 828, 826, 822, 829, 827, 831, 832, 830, 833, 834, - 834, 835, 829, 833, 831, 832, 828, 831, 837, 836, - 838, 839, 840, 841, 841, 842, 843, 846, 845, 849, - 847, 835, 836, 845, 838, 847, 837, 848, 851, 856, - 840, 842, 850, 848, 843, 846, 839, 850, 855, 849, - 852, 851, 856, 852, 857, 858, 855, 859, 860, 852, - 862, 863, 864, 865, 866, 863, 867, 864, 865, 866, - 868, 869, 857, 859, 858, 867, 860, 870, 870, 872, - - 862, 871, 873, 874, 875, 876, 869, 883, 874, 878, - 878, 872, 877, 868, 873, 871, 875, 880, 877, 879, - 879, 881, 881, 876, 882, 884, 880, 885, 883, 882, - 886, 886, 887, 888, 888, 889, 889, 890, 891, 894, - 893, 891, 890, 895, 884, 893, 896, 885, 895, 897, - 897, 899, 887, 898, 898, 900, 899, 894, 901, 902, - 903, 904, 905, 905, 906, 907, 907, 900, 908, 900, - 912, 896, 910, 915, 900, 911, 911, 913, 901, 902, - 903, 910, 904, 914, 913, 912, 916, 916, 908, 917, - 906, 918, 914, 920, 922, 921, 923, 926, 920, 915, - - 921, 924, 924, 923, 925, 927, 926, 918, 928, 925, - 929, 930, 931, 932, 922, 917, 933, 933, 931, 934, - 935, 935, 932, 928, 936, 927, 930, 937, 938, 929, - 934, 939, 939, 938, 940, 934, 942, 941, 940, 940, - 944, 937, 941, 945, 943, 936, 946, 945, 942, 943, - 947, 948, 944, 951, 949, 950, 948, 962, 946, 953, - 950, 959, 953, 954, 954, 951, 955, 955, 956, 962, - 959, 965, 957, 958, 956, 947, 949, 957, 966, 958, - 964, 964, 967, 969, 969, 972, 974, 966, 973, 965, - 979, 967, 964, 973, 975, 975, 976, 979, 976, 972, - - 977, 977, 980, 974, 981, 981, 982, 983, 984, 985, - 986, 987, 989, 990, 991, 990, 994, 989, 996, 983, - 984, 985, 980, 51, 992, 986, 1002, 982, 995, 995, - 994, 987, 991, 992, 997, 998, 999, 998, 1000, 997, - 1001, 999, 1003, 1000, 996, 1004, 1002, 1003, 1006, 1007, - 1004, 1008, 1008, 1009, 1011, 1012, 1011, 1010, 1001, 1013, - 1019, 1018, 1020, 1007, 1012, 1009, 1010, 1006, 1015, 1010, - 1016, 1013, 1025, 1015, 1018, 1016, 1022, 1024, 1020, 1026, - 1019, 1028, 1022, 1024, 1027, 1027, 1029, 1029, 1026, 1030, - 1028, 1031, 1033, 1032, 1035, 1031, 1046, 1025, 1032, 1034, - - 1034, 1038, 1035, 1039, 1039, 1033, 1040, 1040, 1030, 1041, - 1038, 1042, 1044, 1043, 1045, 1047, 1042, 1043, 1049, 1045, - 1050, 1041, 1046, 1051, 1052, 1053, 1070, 1044, 1055, 1055, - 1056, 1070, 1057, 1056, 1047, 1058, 1052, 1059, 1059, 1050, - 1060, 1060, 1049, 1062, 1051, 1057, 1053, 1065, 1058, 1061, - 1061, 1063, 1063, 1064, 1064, 1068, 1062, 1066, 1066, 1067, - 1067, 1071, 1071, 1072, 1073, 1073, 1065, 1074, 1076, 1075, - 1079, 1076, 1077, 1077, 1068, 1075, 1078, 1078, 1080, 1080, - 1082, 1082, 1072, 1083, 1085, 1074, 1084, 1084, 1077, 1079, - 1086, 1087, 1088, 1085, 1089, 1090, 1087, 1092, 1091, 1093, - - 1095, 1094, 1086, 1091, 1098, 1095, 1105, 1089, 1093, 1083, - 1094, 1096, 1092, 1100, 1122, 1096, 1090, 1088, 1101, 1101, - 1102, 1105, 1100, 50, 1098, 1102, 1103, 1103, 1106, 1108, - 1122, 1109, 1108, 1110, 1110, 1103, 1109, 1111, 1115, 1112, - 1106, 1111, 1112, 1113, 1113, 1114, 1117, 1116, 1118, 1119, - 1114, 1116, 1123, 1118, 1119, 1120, 1124, 1123, 1115, 45, - 1125, 1120, 1125, 1142, 1124, 1141, 1117, 1128, 1128, 1131, - 1131, 1134, 1135, 1135, 1137, 1137, 1134, 1139, 1140, 1140, - 1150, 1141, 1139, 1143, 1148, 1142, 1145, 1145, 1143, 1148, - 1149, 1151, 1149, 1155, 1150, 1156, 1151, 1152, 1152, 1153, - - 1153, 1154, 1154, 1157, 1158, 1155, 1159, 1160, 1161, 1161, - 1162, 1163, 1164, 1156, 1166, 1157, 1158, 1165, 1159, 1162, - 1167, 1168, 1173, 1169, 1170, 1171, 1171, 1160, 1169, 1170, - 1165, 1178, 1164, 1179, 1167, 1174, 1174, 1163, 1166, 1168, - 1173, 1176, 1176, 1177, 1180, 1181, 1178, 1182, 1183, 1183, - 1184, 1179, 1177, 1185, 1186, 1184, 1187, 1193, 1189, 1192, - 1193, 1181, 1180, 1194, 1194, 1195, 1182, 1196, 1185, 1198, - 1198, 1199, 1206, 1186, 1200, 1200, 1187, 1189, 1207, 1192, - 1195, 1201, 1201, 1205, 1205, 1196, 1208, 1207, 1209, 1210, - 1199, 1208, 1212, 1209, 1206, 1213, 1214, 1210, 1215, 40, - - 1213, 1214, 1216, 1216, 1217, 1217, 1218, 1212, 1219, 1219, - 1223, 1218, 1222, 1215, 1220, 1220, 1225, 1222, 1226, 1225, - 1227, 1228, 1223, 1229, 1229, 1230, 1232, 1233, 1235, 1227, - 1228, 1226, 1234, 1234, 1230, 1236, 1236, 1235, 1238, 1237, - 1240, 1241, 1246, 1238, 14, 1232, 1233, 1237, 1251, 1240, - 1243, 1243, 1247, 1247, 1241, 1248, 1249, 1249, 1248, 1250, - 1250, 1252, 1246, 1253, 1254, 1254, 1251, 1255, 1253, 1261, - 1258, 1255, 1262, 1263, 1265, 1252, 1258, 1264, 1264, 1266, - 1262, 1267, 1268, 1270, 1266, 1269, 1272, 1274, 1261, 1272, - 1265, 1277, 1263, 1276, 1269, 1275, 1275, 1276, 1279, 1280, - - 1277, 1267, 1281, 1270, 1284, 1274, 1286, 1279, 1268, 1284, - 1290, 1280, 1285, 1285, 1288, 1286, 1289, 1291, 1294, 1288, - 1292, 1292, 1293, 1295, 1298, 1289, 1299, 1281, 1296, 1290, - 1297, 1293, 1291, 1304, 1294, 1297, 1296, 1300, 1300, 1301, - 1303, 1303, 1295, 1305, 1301, 1299, 1306, 1306, 1307, 1307, - 1298, 1308, 1309, 1304, 1310, 1311, 1311, 1312, 1313, 1313, - 1314, 1316, 1317, 1321, 1309, 1305, 13, 1317, 1321, 1312, - 1308, 1318, 1318, 1327, 1310, 1316, 1319, 1319, 1327, 1314, - 1320, 1320, 1322, 1322, 1324, 1324, 1326, 1326, 1330, 1331, - 1331, 1336, 1332, 1334, 1337, 1337, 1330, 1332, 1334, 1338, - - 1342, 1342, 1344, 1338, 1346, 1346, 1344, 1347, 1349, 1350, - 1350, 1336, 1351, 1351, 1353, 1353, 1355, 1355, 1357, 1358, - 1358, 1363, 1347, 1364, 1366, 1363, 1349, 1365, 1365, 1368, - 1357, 1369, 1370, 1366, 1371, 1371, 0, 0, 0, 0, - 0, 0, 0, 1364, 1368, 1369, 0, 0, 0, 0, - 0, 1370, 1374, 1374, 1374, 1374, 1374, 1374, 1374, 1375, - 1375, 1375, 1375, 1375, 1375, 1375, 1376, 1376, 1376, 1376, - 1376, 1376, 1376, 1377, 1377, 1377, 1377, 1377, 1377, 1377, - 1378, 1378, 1378, 1378, 1378, 1378, 1378, 1380, 1380, 0, - 1380, 1380, 1380, 1380, 1381, 1381, 0, 0, 0, 1381, - - 1381, 1382, 1382, 0, 0, 1382, 0, 1382, 1383, 0, - 0, 0, 0, 0, 1383, 1384, 1384, 0, 0, 0, - 1384, 1384, 1385, 0, 0, 0, 0, 0, 1385, 1386, - 1386, 0, 1386, 1386, 1386, 1386, 1387, 1387, 0, 1387, - 1387, 1387, 1387, 1373, 1373, 1373, 1373, 1373, 1373, 1373, - 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, - 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, - 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, 1373, - 1373, 1373, 1373 + 133, 142, 137, 143, 144, 149, 142, 142, 143, 144, + 138, 146, 146, 140, 147, 128, 148, 152, 150, 141, + 145, 148, 150, 153, 145, 151, 155, 154, 149, 145, + 151, 152, 156, 147, 145, 157, 157, 156, 153, 154, + 145, 145, 154, 158, 155, 159, 160, 161, 161, 162, + 163, 160, 165, 164, 162, 163, 172, 174, 126, 166, + + 162, 159, 164, 158, 166, 167, 168, 169, 170, 176, + 167, 168, 169, 165, 171, 170, 172, 173, 175, 174, + 171, 177, 178, 173, 176, 179, 175, 178, 181, 184, + 180, 182, 183, 181, 183, 185, 184, 186, 187, 187, + 185, 177, 190, 191, 190, 188, 192, 179, 180, 180, + 188, 182, 189, 194, 193, 191, 186, 189, 194, 195, + 196, 190, 193, 197, 195, 192, 198, 199, 188, 200, + 201, 201, 200, 203, 198, 196, 202, 202, 204, 205, + 206, 197, 205, 208, 206, 207, 209, 213, 208, 203, + 210, 210, 199, 204, 207, 214, 211, 212, 215, 216, + + 209, 211, 212, 217, 217, 218, 219, 213, 220, 221, + 219, 226, 216, 214, 221, 222, 223, 224, 222, 215, + 220, 225, 227, 218, 228, 230, 230, 232, 223, 275, + 225, 233, 226, 275, 224, 227, 228, 224, 229, 231, + 229, 229, 231, 234, 232, 236, 233, 232, 235, 235, + 236, 238, 234, 237, 237, 239, 240, 241, 242, 243, + 244, 240, 243, 242, 243, 245, 238, 246, 247, 249, + 124, 250, 255, 247, 244, 239, 246, 241, 248, 251, + 253, 245, 252, 248, 245, 252, 245, 255, 256, 257, + 249, 250, 258, 251, 253, 260, 271, 256, 259, 262, + + 122, 252, 254, 261, 254, 254, 266, 263, 261, 264, + 257, 258, 271, 259, 254, 260, 254, 254, 254, 262, + 265, 254, 263, 267, 264, 265, 266, 268, 269, 269, + 270, 269, 268, 272, 273, 276, 274, 267, 274, 280, + 277, 281, 278, 279, 280, 281, 282, 67, 273, 272, + 270, 278, 279, 276, 277, 282, 283, 284, 285, 287, + 286, 283, 285, 284, 278, 286, 288, 288, 289, 290, + 291, 292, 287, 289, 293, 294, 294, 295, 293, 291, + 296, 300, 295, 292, 297, 297, 299, 299, 301, 302, + 290, 303, 305, 306, 307, 308, 301, 309, 302, 310, + + 308, 296, 300, 303, 310, 309, 311, 312, 307, 313, + 314, 315, 305, 306, 314, 316, 317, 318, 321, 320, + 316, 323, 333, 322, 311, 325, 315, 327, 322, 312, + 313, 333, 317, 322, 321, 330, 318, 319, 319, 320, + 328, 323, 327, 319, 329, 319, 324, 324, 326, 326, + 325, 331, 328, 319, 330, 332, 334, 335, 336, 329, + 332, 337, 336, 319, 338, 339, 337, 340, 341, 341, + 342, 430, 335, 331, 343, 334, 338, 345, 344, 430, + 340, 344, 342, 339, 346, 347, 343, 346, 348, 348, + 349, 349, 345, 354, 350, 351, 351, 353, 347, 350, + + 352, 352, 353, 355, 360, 356, 357, 363, 355, 356, + 359, 357, 358, 361, 354, 359, 358, 362, 361, 366, + 364, 363, 362, 364, 360, 365, 365, 368, 364, 367, + 369, 370, 364, 369, 367, 370, 368, 366, 371, 372, + 373, 375, 374, 371, 376, 373, 380, 378, 377, 376, + 378, 380, 372, 375, 377, 381, 379, 370, 374, 379, + 382, 383, 384, 385, 387, 384, 383, 386, 385, 387, + 388, 386, 386, 381, 382, 389, 390, 392, 389, 388, + 390, 390, 391, 393, 391, 393, 394, 395, 396, 397, + 398, 399, 404, 389, 398, 400, 392, 401, 402, 409, + + 399, 403, 405, 405, 394, 395, 403, 396, 406, 397, + 400, 404, 406, 402, 407, 401, 408, 410, 409, 407, + 411, 412, 413, 414, 416, 418, 412, 411, 414, 413, + 410, 415, 408, 417, 418, 419, 415, 423, 420, 431, + 417, 421, 416, 420, 421, 429, 422, 424, 424, 419, + 422, 427, 426, 428, 431, 427, 424, 426, 423, 434, + 437, 438, 439, 429, 443, 428, 439, 438, 440, 437, + 442, 445, 444, 440, 445, 442, 434, 441, 449, 441, + 447, 441, 443, 452, 441, 446, 446, 447, 452, 441, + 448, 448, 453, 449, 454, 441, 441, 444, 450, 450, + + 451, 455, 457, 451, 456, 456, 458, 460, 460, 455, + 459, 461, 453, 454, 462, 459, 461, 457, 463, 462, + 464, 463, 465, 466, 458, 467, 464, 468, 469, 471, + 465, 466, 468, 470, 470, 469, 472, 471, 473, 475, + 476, 472, 475, 467, 477, 477, 478, 479, 481, 483, + 479, 482, 484, 485, 476, 487, 482, 473, 479, 486, + 489, 478, 488, 490, 487, 491, 488, 492, 494, 481, + 483, 493, 484, 495, 491, 485, 498, 493, 489, 486, + 496, 492, 490, 501, 499, 496, 497, 495, 494, 500, + 497, 502, 502, 503, 500, 498, 499, 504, 503, 505, + + 504, 506, 507, 508, 501, 509, 509, 507, 510, 510, + 511, 512, 513, 514, 506, 512, 515, 505, 517, 518, + 519, 520, 517, 508, 544, 511, 521, 522, 523, 524, + 515, 513, 528, 544, 518, 524, 520, 514, 516, 525, + 521, 516, 523, 516, 525, 519, 528, 516, 522, 516, + 526, 526, 527, 529, 516, 532, 526, 527, 526, 530, + 530, 531, 534, 532, 533, 529, 531, 535, 535, 536, + 538, 539, 540, 536, 539, 538, 526, 541, 533, 542, + 543, 534, 545, 546, 542, 547, 548, 549, 546, 550, + 541, 540, 552, 554, 550, 553, 549, 555, 556, 543, + + 548, 545, 555, 556, 557, 547, 558, 560, 554, 557, + 566, 552, 560, 553, 562, 558, 559, 559, 562, 562, + 563, 563, 564, 565, 563, 564, 567, 568, 569, 567, + 566, 570, 576, 569, 571, 572, 570, 573, 565, 578, + 571, 574, 574, 573, 575, 579, 577, 580, 568, 577, + 576, 572, 581, 575, 582, 583, 584, 578, 585, 582, + 583, 585, 586, 587, 579, 581, 588, 580, 587, 589, + 591, 588, 592, 586, 584, 590, 590, 594, 593, 595, + 597, 594, 596, 598, 589, 602, 592, 601, 604, 591, + 593, 596, 603, 604, 612, 607, 608, 595, 605, 597, + + 602, 601, 606, 605, 610, 611, 609, 606, 598, 607, + 608, 609, 603, 612, 613, 613, 614, 615, 616, 610, + 611, 617, 618, 616, 619, 620, 615, 618, 621, 620, + 622, 623, 624, 625, 614, 626, 627, 621, 629, 630, + 617, 628, 631, 619, 624, 622, 623, 628, 634, 635, + 633, 631, 625, 629, 627, 633, 626, 635, 636, 630, + 637, 639, 634, 638, 640, 637, 641, 638, 638, 642, + 643, 643, 646, 646, 642, 641, 644, 640, 636, 645, + 639, 644, 647, 648, 645, 649, 650, 651, 648, 652, + 653, 647, 651, 654, 652, 653, 655, 654, 656, 649, + + 659, 660, 658, 661, 650, 655, 658, 662, 663, 656, + 655, 664, 655, 665, 655, 659, 663, 661, 666, 660, + 667, 667, 668, 669, 669, 664, 662, 671, 672, 673, + 671, 665, 675, 672, 674, 674, 677, 668, 676, 676, + 679, 677, 680, 666, 678, 678, 681, 680, 673, 683, + 682, 684, 675, 687, 681, 682, 685, 684, 687, 688, + 679, 689, 691, 685, 688, 690, 689, 683, 692, 693, + 690, 691, 694, 694, 695, 696, 697, 698, 700, 699, + 693, 697, 701, 701, 702, 703, 705, 692, 704, 709, + 706, 61, 713, 710, 695, 706, 700, 698, 696, 699, + + 711, 712, 715, 708, 702, 711, 704, 708, 708, 705, + 703, 710, 713, 714, 716, 709, 717, 714, 719, 712, + 715, 718, 720, 722, 721, 723, 724, 720, 722, 725, + 717, 721, 726, 716, 727, 724, 718, 719, 726, 735, + 728, 729, 730, 723, 725, 728, 729, 730, 731, 731, + 733, 733, 734, 735, 736, 727, 737, 734, 738, 738, + 737, 737, 739, 740, 741, 742, 743, 745, 746, 744, + 747, 749, 743, 736, 744, 748, 750, 751, 752, 752, + 755, 739, 740, 753, 742, 749, 745, 746, 753, 747, + 741, 754, 751, 755, 748, 754, 756, 750, 757, 758, + + 758, 759, 761, 760, 762, 756, 759, 760, 764, 762, + 766, 767, 767, 56, 768, 766, 770, 770, 757, 768, + 772, 772, 761, 776, 774, 777, 764, 774, 775, 775, + 778, 779, 780, 780, 781, 778, 782, 782, 776, 783, + 784, 785, 787, 786, 790, 785, 779, 787, 789, 792, + 777, 784, 791, 791, 781, 793, 794, 795, 790, 795, + 796, 783, 786, 797, 798, 796, 789, 799, 797, 792, + 800, 800, 801, 804, 803, 793, 794, 805, 801, 803, + 805, 799, 806, 808, 798, 807, 807, 806, 809, 810, + 811, 812, 813, 814, 814, 811, 817, 813, 804, 815, + + 816, 808, 818, 819, 815, 822, 821, 809, 820, 810, + 822, 823, 824, 825, 812, 827, 817, 819, 816, 821, + 820, 828, 818, 830, 829, 833, 833, 836, 828, 838, + 827, 823, 824, 829, 825, 834, 829, 835, 834, 830, + 837, 839, 835, 836, 843, 840, 841, 844, 838, 837, + 839, 841, 845, 839, 840, 842, 842, 846, 847, 848, + 844, 849, 849, 850, 843, 857, 851, 853, 854, 855, + 845, 846, 853, 858, 855, 856, 859, 848, 858, 850, + 863, 856, 864, 847, 851, 857, 854, 860, 863, 859, + 860, 865, 866, 870, 867, 864, 860, 868, 871, 872, + + 873, 874, 871, 875, 872, 873, 874, 876, 877, 865, + 867, 866, 875, 870, 879, 868, 878, 878, 884, 880, + 881, 882, 883, 877, 886, 886, 882, 885, 879, 892, + 876, 880, 881, 885, 883, 889, 884, 887, 887, 890, + 890, 891, 893, 894, 889, 896, 891, 895, 895, 903, + 892, 897, 897, 898, 898, 899, 900, 902, 905, 900, + 899, 893, 902, 894, 904, 896, 909, 903, 910, 904, + 906, 906, 907, 907, 908, 911, 912, 913, 909, 908, + 909, 914, 914, 905, 915, 909, 916, 916, 910, 917, + 919, 920, 920, 921, 922, 911, 912, 923, 913, 919, + + 924, 922, 925, 925, 926, 927, 923, 929, 921, 917, + 915, 930, 929, 931, 934, 932, 930, 933, 933, 934, + 935, 927, 932, 936, 937, 938, 924, 939, 940, 935, + 926, 941, 51, 931, 940, 942, 942, 943, 945, 937, + 941, 946, 939, 936, 938, 944, 944, 947, 943, 948, + 948, 951, 947, 943, 953, 946, 949, 950, 955, 945, + 949, 949, 950, 951, 952, 956, 953, 954, 957, 952, + 955, 954, 958, 957, 959, 960, 985, 962, 985, 959, + 962, 963, 963, 964, 964, 965, 967, 960, 966, 968, + 956, 965, 967, 966, 958, 971, 973, 973, 968, 974, + + 975, 976, 978, 978, 981, 983, 982, 971, 973, 975, + 976, 982, 984, 984, 986, 986, 988, 974, 981, 989, + 990, 990, 983, 988, 991, 992, 993, 995, 994, 996, + 998, 999, 1000, 999, 1001, 998, 1005, 992, 993, 989, + 994, 1003, 995, 1001, 1011, 991, 1004, 1004, 1006, 996, + 1000, 1008, 1007, 1006, 1007, 1003, 1008, 1010, 1009, 1015, + 1012, 1013, 1005, 1009, 1011, 1012, 1013, 1016, 1017, 1017, + 1018, 1019, 1020, 1028, 1020, 1010, 1021, 1022, 1015, 1024, + 1019, 1016, 1018, 1019, 1024, 1021, 1025, 1027, 1029, 1022, + 1031, 1025, 1033, 1028, 1034, 1039, 1031, 1035, 1033, 1037, + + 1027, 1036, 1036, 1040, 1029, 1042, 1035, 1040, 1037, 1038, + 1038, 1041, 1043, 1043, 1039, 1044, 1041, 1047, 1042, 1034, + 1048, 1048, 1050, 1044, 1049, 1049, 1047, 1051, 1053, 1052, + 1054, 1055, 1051, 1052, 1050, 1054, 1056, 1058, 1060, 1059, + 1061, 1062, 1084, 1053, 1064, 1064, 1065, 1066, 1084, 1065, + 1067, 50, 1061, 1068, 1068, 1056, 1071, 1055, 1059, 1060, + 1066, 1058, 1062, 1067, 1069, 1069, 1070, 1070, 1074, 1071, + 1072, 1072, 1073, 1073, 1075, 1075, 1076, 1076, 1077, 1079, + 1080, 1080, 1081, 1088, 1079, 1082, 1082, 1074, 1083, 1085, + 1087, 1087, 1085, 1086, 1086, 1089, 1089, 1077, 1091, 1091, + + 1092, 1081, 1088, 1093, 1093, 1094, 1083, 1095, 1096, 1086, + 1097, 1098, 1099, 1096, 1094, 1100, 1101, 1104, 1102, 1095, + 1100, 1103, 1104, 1107, 1098, 1105, 1092, 1102, 1109, 1105, + 1103, 1101, 1114, 1099, 1115, 1097, 1111, 1109, 1110, 1110, + 1172, 1111, 1131, 1107, 1112, 1112, 1115, 1114, 1117, 1118, + 1124, 1117, 1126, 1112, 1118, 1119, 1119, 1120, 1131, 1121, + 1123, 1120, 1121, 1122, 1122, 1123, 1172, 1125, 1127, 1128, + 1124, 1125, 1126, 1127, 1128, 1129, 1133, 1132, 1134, 1151, + 1134, 1129, 1132, 1150, 1133, 1137, 1137, 1140, 1140, 1143, + 1144, 1144, 1146, 1146, 1143, 1148, 1149, 1149, 1152, 1150, + + 1148, 1151, 1157, 1152, 1154, 1154, 1158, 1157, 1158, 1159, + 1160, 1161, 1161, 1162, 1162, 1160, 1163, 1163, 1164, 1165, + 1166, 1167, 1168, 1159, 1169, 1170, 1170, 1171, 1173, 1174, + 1164, 1175, 1166, 1167, 1168, 1176, 1171, 1165, 1177, 1182, + 1178, 1179, 1174, 1188, 1169, 1178, 1179, 1187, 1173, 1176, + 1180, 1180, 1183, 1183, 1186, 1175, 1177, 1182, 1185, 1185, + 1189, 1188, 1187, 1186, 1190, 1191, 1192, 1192, 1193, 1195, + 1194, 1196, 1201, 1193, 1198, 1204, 1202, 1205, 1189, 1202, + 1190, 1203, 1203, 1208, 1191, 1194, 1207, 1207, 1195, 1215, + 1204, 1196, 1201, 1198, 1216, 1205, 1209, 1209, 1210, 1210, + + 1214, 1214, 1208, 1216, 1217, 1218, 1219, 1221, 1222, 1217, + 1218, 1215, 1223, 1222, 1219, 1224, 45, 1223, 1225, 1225, + 1226, 1226, 1221, 1227, 1228, 1228, 1229, 1229, 1227, 1231, + 1224, 1232, 1234, 1235, 1231, 1234, 1236, 1241, 1237, 1238, + 1238, 1239, 1242, 1232, 1244, 1236, 1235, 1237, 1243, 1243, + 1239, 1245, 1245, 1244, 1246, 1247, 1241, 1249, 1250, 1255, + 1247, 1242, 1246, 1252, 1252, 1260, 1249, 1256, 1256, 1257, + 1261, 1250, 1257, 1258, 1258, 1259, 1259, 1262, 1270, 1255, + 1263, 1263, 1262, 1260, 1261, 1264, 1267, 1271, 1272, 1264, + 1273, 1273, 1267, 1274, 1275, 1271, 1276, 1270, 1277, 1275, + + 1279, 1278, 1281, 1283, 1285, 1281, 1286, 1272, 1285, 1274, + 1278, 1284, 1284, 1288, 1289, 1286, 1276, 1290, 1293, 1307, + 1279, 1283, 1288, 1293, 1277, 1295, 1289, 1294, 1294, 1298, + 1297, 1299, 1300, 1303, 1295, 1297, 1301, 1301, 1298, 1302, + 1304, 1306, 1290, 1305, 1308, 1307, 1306, 1300, 1302, 1303, + 1299, 1305, 1309, 1309, 1313, 1310, 1312, 1312, 1314, 1304, + 1310, 1315, 1315, 1308, 1316, 1316, 1317, 1318, 1319, 1320, + 1320, 1321, 1322, 1322, 1313, 1323, 1325, 1326, 40, 1318, + 1314, 14, 1326, 1321, 1330, 1317, 1327, 1327, 1319, 1330, + 1325, 1328, 1328, 1345, 1323, 1329, 1329, 1331, 1331, 1333, + + 1333, 1335, 1335, 1336, 1339, 1340, 1340, 1347, 1336, 1341, + 1343, 1347, 1339, 1345, 1341, 1343, 1346, 1346, 1351, 1351, + 1353, 1355, 1355, 1356, 1353, 1358, 1359, 1359, 1360, 1360, + 1362, 1362, 1364, 1364, 1366, 1367, 1367, 1372, 1356, 1373, + 1375, 1372, 1377, 1358, 1374, 1374, 1366, 1378, 1379, 1375, + 1380, 1380, 13, 0, 0, 0, 0, 1377, 0, 1373, + 0, 1378, 0, 0, 0, 0, 0, 1379, 1383, 1383, + 1383, 1383, 1383, 1383, 1383, 1384, 1384, 1384, 1384, 1384, + 1384, 1384, 1385, 1385, 1385, 1385, 1385, 1385, 1385, 1386, + 1386, 1386, 1386, 1386, 1386, 1386, 1387, 1387, 1387, 1387, + + 1387, 1387, 1387, 1389, 1389, 0, 1389, 1389, 1389, 1389, + 1390, 1390, 0, 0, 0, 1390, 1390, 1391, 1391, 0, + 0, 1391, 0, 1391, 1392, 0, 0, 0, 0, 0, + 1392, 1393, 1393, 0, 0, 0, 1393, 1393, 1394, 0, + 0, 0, 0, 0, 1394, 1395, 1395, 0, 1395, 1395, + 1395, 1395, 1396, 1396, 0, 1396, 1396, 1396, 1396, 1382, + 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, + 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, + 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, + 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382 + } ; static yy_state_type yy_last_accepting_state; @@ -1698,7 +1707,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 1700 "" +#line 1709 "" #define INITIAL 0 #define quotedstring 1 @@ -1885,7 +1894,7 @@ YY_DECL #line 198 "./util/configlexer.lex" -#line 1887 "" +#line 1896 "" if ( !(yy_init) ) { @@ -1944,13 +1953,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1374 ) + if ( yy_current_state >= 1383 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 2744 ); + while ( yy_base[yy_current_state] != 2760 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2225,414 +2234,419 @@ YY_RULE_SETUP case 50: YY_RULE_SETUP #line 251 "./util/configlexer.lex" -{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } +{ YDVAR(1, VAR_DELAY_CLOSE) } YY_BREAK case 51: YY_RULE_SETUP #line 252 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } +{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } YY_BREAK case 52: YY_RULE_SETUP #line 253 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } +{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } YY_BREAK case 53: YY_RULE_SETUP #line 254 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_GLUE) } +{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } YY_BREAK case 54: YY_RULE_SETUP #line 255 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } +{ YDVAR(1, VAR_HARDEN_GLUE) } YY_BREAK case 55: YY_RULE_SETUP #line 256 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } +{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } YY_BREAK case 56: YY_RULE_SETUP #line 257 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } +{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } YY_BREAK case 57: YY_RULE_SETUP #line 258 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } +{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } YY_BREAK case 58: YY_RULE_SETUP #line 259 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } +{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } YY_BREAK case 59: YY_RULE_SETUP #line 260 "./util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_ADDRESS) } +{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } YY_BREAK case 60: YY_RULE_SETUP #line 261 "./util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_DOMAIN) } +{ YDVAR(1, VAR_PRIVATE_ADDRESS) } YY_BREAK case 61: YY_RULE_SETUP #line 262 "./util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH_KEY) } +{ YDVAR(1, VAR_PRIVATE_DOMAIN) } YY_BREAK case 62: YY_RULE_SETUP #line 263 "./util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH) } +{ YDVAR(1, VAR_PREFETCH_KEY) } YY_BREAK case 63: YY_RULE_SETUP #line 264 "./util/configlexer.lex" -{ YDVAR(0, VAR_STUB_ZONE) } +{ YDVAR(1, VAR_PREFETCH) } YY_BREAK case 64: YY_RULE_SETUP #line 265 "./util/configlexer.lex" -{ YDVAR(1, VAR_NAME) } +{ YDVAR(0, VAR_STUB_ZONE) } YY_BREAK case 65: YY_RULE_SETUP #line 266 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_ADDR) } +{ YDVAR(1, VAR_NAME) } YY_BREAK case 66: YY_RULE_SETUP #line 267 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_HOST) } +{ YDVAR(1, VAR_STUB_ADDR) } YY_BREAK case 67: YY_RULE_SETUP #line 268 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_PRIME) } +{ YDVAR(1, VAR_STUB_HOST) } YY_BREAK case 68: YY_RULE_SETUP #line 269 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_FIRST) } +{ YDVAR(1, VAR_STUB_PRIME) } YY_BREAK case 69: YY_RULE_SETUP #line 270 "./util/configlexer.lex" -{ YDVAR(0, VAR_FORWARD_ZONE) } +{ YDVAR(1, VAR_STUB_FIRST) } YY_BREAK case 70: YY_RULE_SETUP #line 271 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_ADDR) } +{ YDVAR(0, VAR_FORWARD_ZONE) } YY_BREAK case 71: YY_RULE_SETUP #line 272 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_HOST) } +{ YDVAR(1, VAR_FORWARD_ADDR) } YY_BREAK case 72: YY_RULE_SETUP #line 273 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_FIRST) } +{ YDVAR(1, VAR_FORWARD_HOST) } YY_BREAK case 73: YY_RULE_SETUP #line 274 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } +{ YDVAR(1, VAR_FORWARD_FIRST) } YY_BREAK case 74: YY_RULE_SETUP #line 275 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } +{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } YY_BREAK case 75: YY_RULE_SETUP #line 276 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL) } +{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } YY_BREAK case 76: YY_RULE_SETUP #line 277 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_IDENTITY) } +{ YDVAR(2, VAR_ACCESS_CONTROL) } YY_BREAK case 77: YY_RULE_SETUP #line 278 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_VERSION) } +{ YDVAR(1, VAR_HIDE_IDENTITY) } YY_BREAK case 78: YY_RULE_SETUP #line 279 "./util/configlexer.lex" -{ YDVAR(1, VAR_IDENTITY) } +{ YDVAR(1, VAR_HIDE_VERSION) } YY_BREAK case 79: YY_RULE_SETUP #line 280 "./util/configlexer.lex" -{ YDVAR(1, VAR_VERSION) } +{ YDVAR(1, VAR_IDENTITY) } YY_BREAK case 80: YY_RULE_SETUP #line 281 "./util/configlexer.lex" -{ YDVAR(1, VAR_MODULE_CONF) } +{ YDVAR(1, VAR_VERSION) } YY_BREAK case 81: YY_RULE_SETUP #line 282 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR) } +{ YDVAR(1, VAR_MODULE_CONF) } YY_BREAK case 82: YY_RULE_SETUP #line 283 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR) } YY_BREAK case 83: YY_RULE_SETUP #line 284 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } YY_BREAK case 84: YY_RULE_SETUP #line 285 "./util/configlexer.lex" -{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } YY_BREAK case 85: YY_RULE_SETUP #line 286 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } +{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } YY_BREAK case 86: YY_RULE_SETUP #line 287 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR) } +{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } YY_BREAK case 87: YY_RULE_SETUP #line 288 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } +{ YDVAR(1, VAR_TRUST_ANCHOR) } YY_BREAK case 88: YY_RULE_SETUP #line 289 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } +{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 89: YY_RULE_SETUP #line 290 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 90: YY_RULE_SETUP #line 291 "./util/configlexer.lex" -{ YDVAR(1, VAR_BOGUS_TTL) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 91: YY_RULE_SETUP #line 292 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } +{ YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 92: YY_RULE_SETUP #line 293 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } +{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 93: YY_RULE_SETUP #line 294 "./util/configlexer.lex" -{ YDVAR(1, VAR_IGNORE_CD_FLAG) } +{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 94: YY_RULE_SETUP #line 295 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_LOG_LEVEL) } +{ YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 95: YY_RULE_SETUP #line 296 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SIZE) } +{ YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 96: YY_RULE_SETUP #line 297 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SLABS) } +{ YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 97: YY_RULE_SETUP #line 298 "./util/configlexer.lex" -{ YDVAR(1, VAR_NEG_CACHE_SIZE) } +{ YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 98: YY_RULE_SETUP #line 299 "./util/configlexer.lex" -{ - YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +{ YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 99: YY_RULE_SETUP -#line 301 "./util/configlexer.lex" -{ YDVAR(1, VAR_ADD_HOLDDOWN) } +#line 300 "./util/configlexer.lex" +{ + YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 100: YY_RULE_SETUP #line 302 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEL_HOLDDOWN) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 101: YY_RULE_SETUP #line 303 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEEP_MISSING) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 102: YY_RULE_SETUP #line 304 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 103: YY_RULE_SETUP #line 305 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 104: YY_RULE_SETUP #line 306 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_QUERIES) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 105: YY_RULE_SETUP #line 307 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 106: YY_RULE_SETUP #line 308 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 107: YY_RULE_SETUP #line 309 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 108: YY_RULE_SETUP #line 310 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 109: YY_RULE_SETUP #line 311 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 110: YY_RULE_SETUP #line 312 "./util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 111: YY_RULE_SETUP #line 313 "./util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 112: YY_RULE_SETUP #line 314 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 113: YY_RULE_SETUP #line 315 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 114: YY_RULE_SETUP #line 316 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 115: YY_RULE_SETUP #line 317 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 116: YY_RULE_SETUP #line 318 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 117: YY_RULE_SETUP #line 319 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 118: YY_RULE_SETUP #line 320 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 119: YY_RULE_SETUP #line 321 "./util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 120: YY_RULE_SETUP #line 322 "./util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 121: YY_RULE_SETUP #line 323 "./util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 122: YY_RULE_SETUP #line 324 "./util/configlexer.lex" -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 123: YY_RULE_SETUP #line 325 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 124: YY_RULE_SETUP #line 326 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 125: -/* rule 125 can match eol */ YY_RULE_SETUP #line 327 "./util/configlexer.lex" +{ YDVAR(1, VAR_MAX_UDP_SIZE) } + YY_BREAK +case 126: +/* rule 126 can match eol */ +YY_RULE_SETUP +#line 328 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 126: +case 127: YY_RULE_SETUP -#line 330 "./util/configlexer.lex" +#line 331 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 331 "./util/configlexer.lex" +#line 332 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 127: +case 128: YY_RULE_SETUP -#line 336 "./util/configlexer.lex" +#line 337 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 128: -/* rule 128 can match eol */ +case 129: +/* rule 129 can match eol */ YY_RULE_SETUP -#line 337 "./util/configlexer.lex" +#line 338 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 129: +case 130: YY_RULE_SETUP -#line 339 "./util/configlexer.lex" +#line 340 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -2645,34 +2659,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 130: +case 131: YY_RULE_SETUP -#line 351 "./util/configlexer.lex" +#line 352 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 352 "./util/configlexer.lex" +#line 353 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 131: +case 132: YY_RULE_SETUP -#line 357 "./util/configlexer.lex" +#line 358 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 132: -/* rule 132 can match eol */ +case 133: +/* rule 133 can match eol */ YY_RULE_SETUP -#line 358 "./util/configlexer.lex" +#line 359 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 133: +case 134: YY_RULE_SETUP -#line 360 "./util/configlexer.lex" +#line 361 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -2685,38 +2699,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 134: +case 135: YY_RULE_SETUP -#line 372 "./util/configlexer.lex" +#line 373 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 374 "./util/configlexer.lex" +#line 375 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 135: -YY_RULE_SETUP -#line 378 "./util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 136: -/* rule 136 can match eol */ YY_RULE_SETUP #line 379 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 137: +/* rule 137 can match eol */ YY_RULE_SETUP #line 380 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 138: YY_RULE_SETUP #line 381 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 139: +YY_RULE_SETUP +#line 382 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext); @@ -2724,27 +2738,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 386 "./util/configlexer.lex" +#line 387 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 139: +case 140: YY_RULE_SETUP -#line 390 "./util/configlexer.lex" +#line 391 "./util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 140: -/* rule 140 can match eol */ +case 141: +/* rule 141 can match eol */ YY_RULE_SETUP -#line 391 "./util/configlexer.lex" +#line 392 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 141: +case 142: YY_RULE_SETUP -#line 393 "./util/configlexer.lex" +#line 394 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -2754,7 +2768,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 399 "./util/configlexer.lex" +#line 400 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -2766,33 +2780,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 142: +case 143: YY_RULE_SETUP -#line 410 "./util/configlexer.lex" +#line 411 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 143: +case 144: YY_RULE_SETUP -#line 414 "./util/configlexer.lex" +#line 415 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 144: +case 145: YY_RULE_SETUP -#line 418 "./util/configlexer.lex" +#line 419 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 145: +case 146: YY_RULE_SETUP -#line 422 "./util/configlexer.lex" +#line 423 "./util/configlexer.lex" ECHO; YY_BREAK -#line 2794 "" +#line 2808 "" case YY_END_OF_BUFFER: { @@ -3082,7 +3096,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1374 ) + if ( yy_current_state >= 1383 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -3110,11 +3124,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1374 ) + if ( yy_current_state >= 1383 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 1373); + yy_is_jam = (yy_current_state == 1382); return yy_is_jam ? 0 : yy_current_state; } @@ -3747,7 +3761,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 422 "./util/configlexer.lex" +#line 423 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 5e625c850..b36c8af88 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -248,6 +248,7 @@ infra-cache-numhosts{COLON} { YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } infra-cache-lame-size{COLON} { YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } num-queries-per-thread{COLON} { YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } jostle-timeout{COLON} { YDVAR(1, VAR_JOSTLE_TIMEOUT) } +delay-close{COLON} { YDVAR(1, VAR_DELAY_CLOSE) } target-fetch-policy{COLON} { YDVAR(1, VAR_TARGET_FETCH_POLICY) } harden-short-bufsize{COLON} { YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } harden-large-queries{COLON} { YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } diff --git a/util/configparser.c b/util/configparser.c index f07d2d26d..eb2d43fc6 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -255,7 +255,8 @@ extern int yydebug; VAR_STUB_FIRST = 383, VAR_MINIMAL_RESPONSES = 384, VAR_RRSET_ROUNDROBIN = 385, - VAR_MAX_UDP_SIZE = 386 + VAR_MAX_UDP_SIZE = 386, + VAR_DELAY_CLOSE = 387 }; #endif /* Tokens. */ @@ -388,6 +389,7 @@ extern int yydebug; #define VAR_MINIMAL_RESPONSES 384 #define VAR_RRSET_ROUNDROBIN 385 #define VAR_MAX_UDP_SIZE 386 +#define VAR_DELAY_CLOSE 387 @@ -401,7 +403,7 @@ typedef union YYSTYPE /* Line 350 of yacc.c */ -#line 405 "util/configparser.c" +#line 407 "util/configparser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -429,7 +431,7 @@ int yyparse (); /* Copy the second part of user declarations. */ /* Line 353 of yacc.c */ -#line 433 "util/configparser.c" +#line 435 "util/configparser.c" #ifdef short # undef short @@ -649,20 +651,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 242 +#define YYLAST 244 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 132 +#define YYNTOKENS 133 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 135 +#define YYNNTS 136 /* YYNRULES -- Number of rules. */ -#define YYNRULES 257 +#define YYNRULES 259 /* YYNRULES -- Number of states. */ -#define YYNSTATES 377 +#define YYNSTATES 380 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 386 +#define YYMAXUTOK 387 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -708,7 +710,7 @@ static const yytype_uint8 yytranslate[] = 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131 + 125, 126, 127, 128, 129, 130, 131, 132 }; #if YYDEBUG @@ -727,90 +729,91 @@ static const yytype_uint16 yyprhs[] = 164, 166, 168, 170, 172, 174, 176, 178, 180, 182, 184, 186, 188, 190, 192, 194, 196, 198, 200, 202, 204, 206, 208, 210, 212, 214, 216, 218, 220, 222, - 224, 226, 228, 230, 233, 234, 236, 238, 240, 242, - 244, 246, 249, 250, 252, 254, 256, 258, 261, 264, - 267, 270, 273, 276, 279, 282, 285, 288, 291, 294, - 297, 300, 303, 306, 309, 312, 315, 318, 321, 324, - 327, 330, 333, 336, 339, 342, 345, 348, 351, 354, - 357, 360, 363, 366, 369, 372, 375, 378, 381, 384, - 387, 390, 393, 396, 399, 402, 405, 408, 411, 414, - 417, 420, 423, 426, 429, 432, 435, 438, 441, 444, - 447, 450, 453, 456, 459, 462, 465, 468, 471, 474, - 477, 480, 483, 487, 490, 493, 496, 499, 502, 505, - 508, 511, 514, 517, 520, 523, 526, 529, 532, 535, - 538, 541, 545, 548, 551, 554, 557, 560, 563, 566, - 569, 572, 575, 578, 581, 584, 587, 589, 592, 593, - 595, 597, 599, 601, 603, 605, 607, 610, 613, 616, - 619, 622, 625, 628, 630, 633, 634, 636 + 224, 226, 228, 230, 232, 235, 236, 238, 240, 242, + 244, 246, 248, 251, 252, 254, 256, 258, 260, 263, + 266, 269, 272, 275, 278, 281, 284, 287, 290, 293, + 296, 299, 302, 305, 308, 311, 314, 317, 320, 323, + 326, 329, 332, 335, 338, 341, 344, 347, 350, 353, + 356, 359, 362, 365, 368, 371, 374, 377, 380, 383, + 386, 389, 392, 395, 398, 401, 404, 407, 410, 413, + 416, 419, 422, 425, 428, 431, 434, 437, 440, 443, + 446, 449, 452, 455, 458, 461, 464, 467, 470, 473, + 476, 479, 482, 485, 488, 492, 495, 498, 501, 504, + 507, 510, 513, 516, 519, 522, 525, 528, 531, 534, + 537, 540, 543, 546, 550, 553, 556, 559, 562, 565, + 568, 571, 574, 577, 580, 583, 586, 589, 592, 594, + 597, 598, 600, 602, 604, 606, 608, 610, 612, 615, + 618, 621, 624, 627, 630, 633, 635, 638, 639, 641 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 133, 0, -1, -1, 133, 134, -1, 135, 136, -1, - 138, 139, -1, 141, 142, -1, 263, 264, -1, 253, - 254, -1, 11, -1, 136, 137, -1, -1, 144, -1, - 145, -1, 149, -1, 152, -1, 158, -1, 159, -1, - 160, -1, 161, -1, 150, -1, 171, -1, 172, -1, - 173, -1, 174, -1, 175, -1, 193, -1, 194, -1, - 195, -1, 197, -1, 198, -1, 155, -1, 199, -1, - 200, -1, 203, -1, 201, -1, 202, -1, 204, -1, - 205, -1, 206, -1, 217, -1, 184, -1, 185, -1, - 186, -1, 187, -1, 207, -1, 220, -1, 180, -1, - 182, -1, 221, -1, 226, -1, 227, -1, 228, -1, - 156, -1, 192, -1, 235, -1, 236, -1, 181, -1, - 231, -1, 168, -1, 151, -1, 176, -1, 218, -1, - 224, -1, 208, -1, 219, -1, 238, -1, 239, -1, - 157, -1, 146, -1, 167, -1, 211, -1, 147, -1, - 153, -1, 154, -1, 177, -1, 178, -1, 237, -1, - 210, -1, 212, -1, 213, -1, 148, -1, 240, -1, - 196, -1, 216, -1, 169, -1, 183, -1, 222, -1, - 223, -1, 225, -1, 230, -1, 179, -1, 232, -1, - 233, -1, 234, -1, 188, -1, 191, -1, 214, -1, - 215, -1, 189, -1, 209, -1, 229, -1, 170, -1, - 162, -1, 163, -1, 164, -1, 165, -1, 166, -1, - 241, -1, 242, -1, 243, -1, 190, -1, 38, -1, - 139, 140, -1, -1, 244, -1, 245, -1, 246, -1, - 248, -1, 247, -1, 44, -1, 142, 143, -1, -1, - 249, -1, 250, -1, 251, -1, 252, -1, 13, 10, - -1, 12, 10, -1, 76, 10, -1, 79, 10, -1, - 96, 10, -1, 14, 10, -1, 16, 10, -1, 67, - 10, -1, 15, 10, -1, 80, 10, -1, 81, 10, - -1, 31, 10, -1, 60, 10, -1, 75, 10, -1, - 17, 10, -1, 18, 10, -1, 19, 10, -1, 20, - 10, -1, 122, 10, -1, 123, 10, -1, 124, 10, - -1, 125, 10, -1, 126, 10, -1, 77, 10, -1, - 66, 10, -1, 101, 10, -1, 121, 10, -1, 21, - 10, -1, 22, 10, -1, 23, 10, -1, 24, 10, - -1, 25, 10, -1, 68, 10, -1, 82, 10, -1, - 83, 10, -1, 109, 10, -1, 54, 10, -1, 64, - 10, -1, 55, 10, -1, 102, 10, -1, 48, 10, - -1, 49, 10, -1, 50, 10, -1, 51, 10, -1, - 113, 10, -1, 117, 10, -1, 118, 10, -1, 114, - 10, -1, 61, 10, -1, 26, 10, -1, 27, 10, - -1, 28, 10, -1, 98, 10, -1, 29, 10, -1, - 30, 10, -1, 32, 10, -1, 33, 10, -1, 35, - 10, -1, 36, 10, -1, 34, 10, -1, 41, 10, - -1, 42, 10, -1, 43, 10, -1, 52, 10, -1, - 71, 10, -1, 119, 10, -1, 85, 10, -1, 78, - 10, -1, 86, 10, -1, 87, 10, -1, 115, 10, - -1, 116, 10, -1, 100, 10, -1, 47, 10, -1, - 69, 10, -1, 72, 10, 10, -1, 53, 10, -1, - 56, 10, -1, 105, 10, -1, 106, 10, -1, 70, - 10, -1, 107, 10, -1, 57, 10, -1, 58, 10, - -1, 59, 10, -1, 120, 10, -1, 108, 10, -1, - 65, 10, -1, 111, 10, -1, 112, 10, -1, 110, - 10, -1, 62, 10, -1, 63, 10, -1, 84, 10, - -1, 73, 10, 10, -1, 74, 10, -1, 97, 10, - -1, 129, 10, -1, 130, 10, -1, 131, 10, -1, - 37, 10, -1, 39, 10, -1, 40, 10, -1, 128, - 10, -1, 99, 10, -1, 37, 10, -1, 45, 10, - -1, 46, 10, -1, 127, 10, -1, 88, -1, 254, - 255, -1, -1, 256, -1, 258, -1, 257, -1, 259, - -1, 260, -1, 261, -1, 262, -1, 89, 10, -1, - 91, 10, -1, 90, 10, -1, 92, 10, -1, 93, - 10, -1, 94, 10, -1, 95, 10, -1, 103, -1, - 264, 265, -1, -1, 266, -1, 104, 10, -1 + 134, 0, -1, -1, 134, 135, -1, 136, 137, -1, + 139, 140, -1, 142, 143, -1, 265, 266, -1, 255, + 256, -1, 11, -1, 137, 138, -1, -1, 145, -1, + 146, -1, 150, -1, 153, -1, 159, -1, 160, -1, + 161, -1, 162, -1, 151, -1, 172, -1, 173, -1, + 174, -1, 175, -1, 176, -1, 194, -1, 195, -1, + 196, -1, 199, -1, 200, -1, 156, -1, 201, -1, + 202, -1, 205, -1, 203, -1, 204, -1, 206, -1, + 207, -1, 208, -1, 219, -1, 185, -1, 186, -1, + 187, -1, 188, -1, 209, -1, 222, -1, 181, -1, + 183, -1, 223, -1, 228, -1, 229, -1, 230, -1, + 157, -1, 193, -1, 237, -1, 238, -1, 182, -1, + 233, -1, 169, -1, 152, -1, 177, -1, 220, -1, + 226, -1, 210, -1, 221, -1, 240, -1, 241, -1, + 158, -1, 147, -1, 168, -1, 213, -1, 148, -1, + 154, -1, 155, -1, 178, -1, 179, -1, 239, -1, + 212, -1, 214, -1, 215, -1, 149, -1, 242, -1, + 197, -1, 218, -1, 170, -1, 184, -1, 224, -1, + 225, -1, 227, -1, 232, -1, 180, -1, 234, -1, + 235, -1, 236, -1, 189, -1, 192, -1, 216, -1, + 217, -1, 190, -1, 211, -1, 231, -1, 171, -1, + 163, -1, 164, -1, 165, -1, 166, -1, 167, -1, + 243, -1, 244, -1, 245, -1, 191, -1, 198, -1, + 38, -1, 140, 141, -1, -1, 246, -1, 247, -1, + 248, -1, 250, -1, 249, -1, 44, -1, 143, 144, + -1, -1, 251, -1, 252, -1, 253, -1, 254, -1, + 13, 10, -1, 12, 10, -1, 76, 10, -1, 79, + 10, -1, 96, 10, -1, 14, 10, -1, 16, 10, + -1, 67, 10, -1, 15, 10, -1, 80, 10, -1, + 81, 10, -1, 31, 10, -1, 60, 10, -1, 75, + 10, -1, 17, 10, -1, 18, 10, -1, 19, 10, + -1, 20, 10, -1, 122, 10, -1, 123, 10, -1, + 124, 10, -1, 125, 10, -1, 126, 10, -1, 77, + 10, -1, 66, 10, -1, 101, 10, -1, 121, 10, + -1, 21, 10, -1, 22, 10, -1, 23, 10, -1, + 24, 10, -1, 25, 10, -1, 68, 10, -1, 82, + 10, -1, 83, 10, -1, 109, 10, -1, 54, 10, + -1, 64, 10, -1, 55, 10, -1, 102, 10, -1, + 48, 10, -1, 49, 10, -1, 50, 10, -1, 51, + 10, -1, 113, 10, -1, 117, 10, -1, 118, 10, + -1, 114, 10, -1, 61, 10, -1, 26, 10, -1, + 27, 10, -1, 28, 10, -1, 98, 10, -1, 132, + 10, -1, 29, 10, -1, 30, 10, -1, 32, 10, + -1, 33, 10, -1, 35, 10, -1, 36, 10, -1, + 34, 10, -1, 41, 10, -1, 42, 10, -1, 43, + 10, -1, 52, 10, -1, 71, 10, -1, 119, 10, + -1, 85, 10, -1, 78, 10, -1, 86, 10, -1, + 87, 10, -1, 115, 10, -1, 116, 10, -1, 100, + 10, -1, 47, 10, -1, 69, 10, -1, 72, 10, + 10, -1, 53, 10, -1, 56, 10, -1, 105, 10, + -1, 106, 10, -1, 70, 10, -1, 107, 10, -1, + 57, 10, -1, 58, 10, -1, 59, 10, -1, 120, + 10, -1, 108, 10, -1, 65, 10, -1, 111, 10, + -1, 112, 10, -1, 110, 10, -1, 62, 10, -1, + 63, 10, -1, 84, 10, -1, 73, 10, 10, -1, + 74, 10, -1, 97, 10, -1, 129, 10, -1, 130, + 10, -1, 131, 10, -1, 37, 10, -1, 39, 10, + -1, 40, 10, -1, 128, 10, -1, 99, 10, -1, + 37, 10, -1, 45, 10, -1, 46, 10, -1, 127, + 10, -1, 88, -1, 256, 257, -1, -1, 258, -1, + 260, -1, 259, -1, 261, -1, 262, -1, 263, -1, + 264, -1, 89, 10, -1, 91, 10, -1, 90, 10, + -1, 92, 10, -1, 93, 10, -1, 94, 10, -1, + 95, 10, -1, 103, -1, 266, 267, -1, -1, 268, + -1, 104, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -827,21 +830,21 @@ static const yytype_uint16 yyrline[] = 154, 154, 155, 155, 156, 156, 157, 157, 158, 158, 158, 159, 159, 160, 160, 160, 161, 161, 161, 162, 162, 162, 163, 163, 163, 164, 164, 164, 165, 165, - 165, 166, 168, 180, 181, 182, 182, 182, 182, 182, - 184, 196, 197, 198, 198, 198, 198, 200, 209, 218, - 229, 238, 247, 256, 269, 284, 293, 302, 311, 320, - 329, 338, 347, 356, 365, 374, 383, 392, 399, 406, - 415, 424, 438, 447, 456, 463, 470, 477, 485, 492, - 499, 506, 513, 521, 529, 537, 544, 551, 560, 569, - 576, 583, 591, 599, 609, 622, 633, 641, 654, 663, - 672, 680, 693, 702, 710, 719, 727, 740, 747, 757, - 767, 777, 787, 797, 807, 817, 824, 831, 840, 849, - 858, 865, 875, 892, 899, 917, 930, 943, 952, 961, - 970, 980, 990, 999, 1008, 1015, 1024, 1033, 1042, 1050, - 1063, 1071, 1093, 1100, 1115, 1125, 1135, 1142, 1152, 1159, - 1166, 1175, 1185, 1195, 1202, 1209, 1218, 1223, 1224, 1225, - 1225, 1225, 1226, 1226, 1226, 1227, 1229, 1239, 1248, 1255, - 1262, 1269, 1276, 1283, 1288, 1289, 1290, 1292 + 165, 166, 166, 168, 180, 181, 182, 182, 182, 182, + 182, 184, 196, 197, 198, 198, 198, 198, 200, 209, + 218, 229, 238, 247, 256, 269, 284, 293, 302, 311, + 320, 329, 338, 347, 356, 365, 374, 383, 392, 399, + 406, 415, 424, 438, 447, 456, 463, 470, 477, 485, + 492, 499, 506, 513, 521, 529, 537, 544, 551, 560, + 569, 576, 583, 591, 599, 609, 622, 633, 641, 654, + 663, 672, 681, 689, 702, 711, 719, 728, 736, 749, + 756, 766, 776, 786, 796, 806, 816, 826, 833, 840, + 849, 858, 867, 874, 884, 901, 908, 926, 939, 952, + 961, 970, 979, 989, 999, 1008, 1017, 1024, 1033, 1042, + 1051, 1059, 1072, 1080, 1102, 1109, 1124, 1134, 1144, 1151, + 1161, 1168, 1175, 1184, 1194, 1204, 1211, 1218, 1227, 1232, + 1233, 1234, 1234, 1234, 1235, 1235, 1235, 1236, 1238, 1248, + 1257, 1264, 1271, 1278, 1285, 1292, 1297, 1298, 1299, 1301 }; #endif @@ -892,16 +895,17 @@ static const char *const yytname[] = "VAR_SSL_UPSTREAM", "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM", "VAR_SSL_PORT", "VAR_FORWARD_FIRST", "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", - "$accept", "toplevelvars", "toplevelvar", "serverstart", - "contents_server", "content_server", "stubstart", "contents_stub", - "content_stub", "forwardstart", "contents_forward", "content_forward", - "server_num_threads", "server_verbosity", "server_statistics_interval", - "server_statistics_cumulative", "server_extended_statistics", - "server_port", "server_interface", "server_outgoing_interface", - "server_outgoing_range", "server_outgoing_port_permit", - "server_outgoing_port_avoid", "server_outgoing_num_tcp", - "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4", - "server_do_ip6", "server_do_udp", "server_do_tcp", "server_tcp_upstream", + "VAR_DELAY_CLOSE", "$accept", "toplevelvars", "toplevelvar", + "serverstart", "contents_server", "content_server", "stubstart", + "contents_stub", "content_stub", "forwardstart", "contents_forward", + "content_forward", "server_num_threads", "server_verbosity", + "server_statistics_interval", "server_statistics_cumulative", + "server_extended_statistics", "server_port", "server_interface", + "server_outgoing_interface", "server_outgoing_range", + "server_outgoing_port_permit", "server_outgoing_port_avoid", + "server_outgoing_num_tcp", "server_incoming_num_tcp", + "server_interface_automatic", "server_do_ip4", "server_do_ip6", + "server_do_udp", "server_do_tcp", "server_tcp_upstream", "server_ssl_upstream", "server_ssl_service_key", "server_ssl_service_pem", "server_ssl_port", "server_do_daemonize", "server_use_syslog", "server_log_time_ascii", "server_log_queries", @@ -915,20 +919,21 @@ static const char *const yytname[] = "server_edns_buffer_size", "server_msg_buffer_size", "server_msg_cache_size", "server_msg_cache_slabs", "server_num_queries_per_thread", "server_jostle_timeout", - "server_rrset_cache_size", "server_rrset_cache_slabs", - "server_infra_host_ttl", "server_infra_lame_ttl", - "server_infra_cache_numhosts", "server_infra_cache_lame_size", - "server_infra_cache_slabs", "server_target_fetch_policy", - "server_harden_short_bufsize", "server_harden_large_queries", - "server_harden_glue", "server_harden_dnssec_stripped", - "server_harden_below_nxdomain", "server_harden_referral_path", - "server_use_caps_for_id", "server_private_address", - "server_private_domain", "server_prefetch", "server_prefetch_key", - "server_unwanted_reply_threshold", "server_do_not_query_address", - "server_do_not_query_localhost", "server_access_control", - "server_module_conf", "server_val_override_date", - "server_val_sig_skew_min", "server_val_sig_skew_max", - "server_cache_max_ttl", "server_cache_min_ttl", "server_bogus_ttl", + "server_delay_close", "server_rrset_cache_size", + "server_rrset_cache_slabs", "server_infra_host_ttl", + "server_infra_lame_ttl", "server_infra_cache_numhosts", + "server_infra_cache_lame_size", "server_infra_cache_slabs", + "server_target_fetch_policy", "server_harden_short_bufsize", + "server_harden_large_queries", "server_harden_glue", + "server_harden_dnssec_stripped", "server_harden_below_nxdomain", + "server_harden_referral_path", "server_use_caps_for_id", + "server_private_address", "server_private_domain", "server_prefetch", + "server_prefetch_key", "server_unwanted_reply_threshold", + "server_do_not_query_address", "server_do_not_query_localhost", + "server_access_control", "server_module_conf", + "server_val_override_date", "server_val_sig_skew_min", + "server_val_sig_skew_max", "server_cache_max_ttl", + "server_cache_min_ttl", "server_bogus_ttl", "server_val_clean_additional", "server_val_permissive_mode", "server_ignore_cd_flag", "server_val_log_level", "server_val_nsec3_keysize_iterations", "server_add_holddown", @@ -963,26 +968,26 @@ static const yytype_uint16 yytoknum[] = 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, - 385, 386 + 385, 386, 387 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 132, 133, 133, 134, 134, 134, 134, 134, 135, - 136, 136, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 138, 139, 139, 140, 140, 140, 140, 140, - 141, 142, 142, 143, 143, 143, 143, 144, 145, 146, + 0, 133, 134, 134, 135, 135, 135, 135, 135, 136, + 137, 137, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 139, 140, 140, 141, 141, 141, 141, + 141, 142, 143, 143, 144, 144, 144, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, @@ -993,9 +998,9 @@ static const yytype_uint16 yyr1[] = 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, - 247, 248, 249, 250, 251, 252, 253, 254, 254, 255, - 255, 255, 255, 255, 255, 255, 256, 257, 258, 259, - 260, 261, 262, 263, 264, 264, 265, 266 + 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, + 256, 257, 257, 257, 257, 257, 257, 257, 258, 259, + 260, 261, 262, 263, 264, 265, 266, 266, 267, 268 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1012,8 +1017,8 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, - 1, 2, 0, 1, 1, 1, 1, 2, 2, 2, + 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, + 1, 1, 2, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1021,12 +1026,12 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, - 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, - 2, 2, 2, 1, 2, 0, 1, 2 + 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, + 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, + 2, 2, 2, 2, 2, 1, 2, 0, 1, 2 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -1034,8 +1039,8 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 9, 112, 120, 236, 253, 3, 11, - 114, 122, 238, 255, 4, 5, 6, 8, 7, 0, + 2, 0, 1, 9, 113, 121, 238, 255, 3, 11, + 115, 123, 240, 257, 4, 5, 6, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1045,52 +1050,52 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, - 12, 13, 69, 72, 81, 14, 20, 60, 15, 73, - 74, 31, 53, 68, 16, 17, 18, 19, 103, 104, - 105, 106, 107, 70, 59, 85, 102, 21, 22, 23, - 24, 25, 61, 75, 76, 91, 47, 57, 48, 86, - 41, 42, 43, 44, 95, 99, 111, 96, 54, 26, - 27, 28, 83, 29, 30, 32, 33, 35, 36, 34, - 37, 38, 39, 45, 64, 100, 78, 71, 79, 80, - 97, 98, 84, 40, 62, 65, 46, 49, 87, 88, - 63, 89, 50, 51, 52, 101, 90, 58, 92, 93, - 94, 55, 56, 77, 66, 67, 82, 108, 109, 110, - 0, 0, 0, 0, 0, 113, 115, 116, 117, 119, - 118, 0, 0, 0, 0, 121, 123, 124, 125, 126, - 0, 0, 0, 0, 0, 0, 0, 237, 239, 241, - 240, 242, 243, 244, 245, 0, 254, 256, 128, 127, - 132, 135, 133, 141, 142, 143, 144, 154, 155, 156, - 157, 158, 176, 177, 178, 180, 181, 138, 182, 183, - 186, 184, 185, 187, 188, 189, 200, 167, 168, 169, - 170, 190, 203, 163, 165, 204, 209, 210, 211, 139, - 175, 218, 219, 164, 214, 151, 134, 159, 201, 207, - 191, 0, 0, 222, 140, 129, 150, 194, 130, 136, - 137, 160, 161, 220, 193, 195, 196, 131, 223, 179, - 199, 152, 166, 205, 206, 208, 213, 162, 217, 215, - 216, 171, 174, 197, 198, 172, 173, 192, 212, 153, - 145, 146, 147, 148, 149, 224, 225, 226, 227, 228, - 229, 231, 230, 232, 233, 234, 235, 246, 248, 247, - 249, 250, 251, 252, 257, 202, 221 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 10, 12, 13, 69, 72, 81, 14, 20, 60, 15, + 73, 74, 31, 53, 68, 16, 17, 18, 19, 103, + 104, 105, 106, 107, 70, 59, 85, 102, 21, 22, + 23, 24, 25, 61, 75, 76, 91, 47, 57, 48, + 86, 41, 42, 43, 44, 95, 99, 111, 96, 54, + 26, 27, 28, 83, 112, 29, 30, 32, 33, 35, + 36, 34, 37, 38, 39, 45, 64, 100, 78, 71, + 79, 80, 97, 98, 84, 40, 62, 65, 46, 49, + 87, 88, 63, 89, 50, 51, 52, 101, 90, 58, + 92, 93, 94, 55, 56, 77, 66, 67, 82, 108, + 109, 110, 0, 0, 0, 0, 0, 114, 116, 117, + 118, 120, 119, 0, 0, 0, 0, 122, 124, 125, + 126, 127, 0, 0, 0, 0, 0, 0, 0, 239, + 241, 243, 242, 244, 245, 246, 247, 0, 256, 258, + 129, 128, 133, 136, 134, 142, 143, 144, 145, 155, + 156, 157, 158, 159, 177, 178, 179, 182, 183, 139, + 184, 185, 188, 186, 187, 189, 190, 191, 202, 168, + 169, 170, 171, 192, 205, 164, 166, 206, 211, 212, + 213, 140, 176, 220, 221, 165, 216, 152, 135, 160, + 203, 209, 193, 0, 0, 224, 141, 130, 151, 196, + 131, 137, 138, 161, 162, 222, 195, 197, 198, 132, + 225, 180, 201, 153, 167, 207, 208, 210, 215, 163, + 219, 217, 218, 172, 175, 199, 200, 173, 174, 194, + 214, 154, 146, 147, 148, 149, 150, 226, 227, 228, + 181, 229, 230, 231, 233, 232, 234, 235, 236, 237, + 248, 250, 249, 251, 252, 253, 254, 259, 204, 223 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 8, 9, 14, 119, 10, 15, 225, 11, - 16, 235, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, - 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, - 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, - 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, - 218, 219, 226, 227, 228, 229, 230, 236, 237, 238, - 239, 12, 17, 247, 248, 249, 250, 251, 252, 253, - 254, 13, 18, 256, 257 + -1, 1, 8, 9, 14, 120, 10, 15, 227, 11, + 16, 237, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, + 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, + 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, + 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, + 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, + 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, + 219, 220, 221, 228, 229, 230, 231, 232, 238, 239, + 240, 241, 12, 17, 249, 250, 251, 252, 253, 254, + 255, 256, 13, 18, 258, 259 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -1101,15 +1106,15 @@ static const yytype_int16 yypact[] = -80, 115, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -12, 39, 46, 38, -79, 16, 17, 18, 22, 23, 24, 67, 70, 71, 72, 77, - 106, 110, 111, 112, 113, 114, 124, 125, 126, 127, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 144, 145, 146, 147, 148, 150, - 151, 152, 153, 154, 155, 156, 158, 159, 160, 161, - 162, 164, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, - 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 209, 210, 211, 212, 213, -80, + 106, 111, 112, 113, 114, 124, 125, 126, 127, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 144, 145, 146, 147, 148, 150, 151, + 152, 153, 154, 155, 156, 158, 159, 160, 161, 162, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 194, + 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, + 205, 206, 207, 209, 210, 211, 212, 213, 214, 215, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, @@ -1120,22 +1125,22 @@ static const yytype_int16 yypact[] = -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, - 214, 215, 216, 217, 218, -80, -80, -80, -80, -80, - -80, 219, 220, 221, 222, -80, -80, -80, -80, -80, - 223, 224, 225, 226, 227, 228, 229, -80, -80, -80, - -80, -80, -80, -80, -80, 230, -80, -80, -80, -80, + -80, -80, 216, 217, 218, 219, 220, -80, -80, -80, + -80, -80, -80, 221, 222, 223, 224, -80, -80, -80, + -80, -80, 225, 226, 227, 228, 229, 230, 231, -80, + -80, -80, -80, -80, -80, -80, -80, 232, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, - -80, 231, 232, -80, -80, -80, -80, -80, -80, -80, + -80, -80, -80, 233, 234, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80, -80, -80, -80 + -80, -80, -80, -80, -80, -80, -80, -80, -80, -80 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1154,7 +1159,7 @@ static const yytype_int8 yypgoto[] = -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80, -80 + -80, -80, -80, -80, -80, -80 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1165,29 +1170,29 @@ static const yytype_uint16 yytable[] = { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 43, 255, 258, 259, 260, 44, - 45, 46, 261, 262, 263, 47, 48, 49, 50, 51, + 39, 40, 41, 42, 43, 257, 260, 261, 262, 44, + 45, 46, 263, 264, 265, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 220, 264, 221, 222, - 265, 266, 267, 231, 88, 89, 90, 268, 91, 92, - 93, 232, 233, 94, 95, 96, 97, 98, 99, 100, + 82, 83, 84, 85, 86, 87, 222, 266, 223, 224, + 267, 268, 269, 233, 88, 89, 90, 270, 91, 92, + 93, 234, 235, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 2, 269, 116, 117, 118, - 270, 271, 272, 273, 274, 0, 3, 240, 241, 242, - 243, 244, 245, 246, 275, 276, 277, 278, 223, 279, - 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, - 290, 291, 292, 4, 293, 294, 295, 296, 297, 5, - 298, 299, 300, 301, 302, 303, 304, 224, 305, 306, - 307, 308, 309, 234, 310, 311, 312, 313, 314, 315, - 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, - 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, - 336, 337, 338, 6, 339, 340, 341, 342, 343, 344, - 345, 346, 347, 348, 349, 350, 351, 352, 7, 353, - 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, - 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, - 374, 375, 376 + 111, 112, 113, 114, 115, 2, 271, 116, 117, 118, + 119, 272, 273, 274, 275, 0, 3, 242, 243, 244, + 245, 246, 247, 248, 276, 277, 278, 279, 225, 280, + 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, + 291, 292, 293, 4, 294, 295, 296, 297, 298, 5, + 299, 300, 301, 302, 303, 304, 305, 226, 306, 307, + 308, 309, 310, 236, 311, 312, 313, 314, 315, 316, + 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, + 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, + 337, 338, 339, 6, 340, 341, 342, 343, 344, 345, + 346, 347, 348, 349, 350, 351, 352, 353, 7, 354, + 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379 }; #define yypact_value_is_default(yystate) \ @@ -1210,7 +1215,7 @@ static const yytype_int16 yycheck[] = 102, 45, 46, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 0, 10, 129, 130, 131, - 10, 10, 10, 10, 10, -1, 11, 89, 90, 91, + 132, 10, 10, 10, 10, -1, 11, 89, 90, 91, 92, 93, 94, 95, 10, 10, 10, 10, 99, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 38, 10, 10, 10, 10, 10, 44, @@ -1222,15 +1227,15 @@ static const yytype_int16 yycheck[] = 10, 10, 10, 10, 10, 10, 10, 10, 103, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10 + 10, 10, 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 133, 0, 11, 38, 44, 88, 103, 134, 135, - 138, 141, 253, 263, 136, 139, 142, 254, 264, 12, + 0, 134, 0, 11, 38, 44, 88, 103, 135, 136, + 139, 142, 255, 265, 137, 140, 143, 256, 266, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 41, 42, 43, 47, 48, 49, @@ -1240,8 +1245,8 @@ static const yytype_uint16 yystos[] = 80, 81, 82, 83, 84, 85, 86, 87, 96, 97, 98, 100, 101, 102, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 129, 130, 131, 137, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, + 121, 122, 123, 124, 125, 126, 129, 130, 131, 132, + 138, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, @@ -1251,10 +1256,10 @@ static const yytype_uint16 yystos[] = 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, - 37, 39, 40, 99, 128, 140, 244, 245, 246, 247, - 248, 37, 45, 46, 127, 143, 249, 250, 251, 252, - 89, 90, 91, 92, 93, 94, 95, 255, 256, 257, - 258, 259, 260, 261, 262, 104, 265, 266, 10, 10, + 244, 245, 37, 39, 40, 99, 128, 141, 246, 247, + 248, 249, 250, 37, 45, 46, 127, 144, 251, 252, + 253, 254, 89, 90, 91, 92, 93, 94, 95, 257, + 258, 259, 260, 261, 262, 263, 264, 104, 267, 268, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1266,7 +1271,7 @@ static const yytype_uint16 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 }; #define yyerrok (yyerrstatus = 0) @@ -2097,7 +2102,7 @@ yyreduce: } break; - case 112: + case 113: /* Line 1787 of yacc.c */ #line 169 "./util/configparser.y" { @@ -2112,7 +2117,7 @@ yyreduce: } break; - case 120: + case 121: /* Line 1787 of yacc.c */ #line 185 "./util/configparser.y" { @@ -2127,7 +2132,7 @@ yyreduce: } break; - case 127: + case 128: /* Line 1787 of yacc.c */ #line 201 "./util/configparser.y" { @@ -2139,7 +2144,7 @@ yyreduce: } break; - case 128: + case 129: /* Line 1787 of yacc.c */ #line 210 "./util/configparser.y" { @@ -2151,7 +2156,7 @@ yyreduce: } break; - case 129: + case 130: /* Line 1787 of yacc.c */ #line 219 "./util/configparser.y" { @@ -2165,7 +2170,7 @@ yyreduce: } break; - case 130: + case 131: /* Line 1787 of yacc.c */ #line 230 "./util/configparser.y" { @@ -2177,7 +2182,7 @@ yyreduce: } break; - case 131: + case 132: /* Line 1787 of yacc.c */ #line 239 "./util/configparser.y" { @@ -2189,7 +2194,7 @@ yyreduce: } break; - case 132: + case 133: /* Line 1787 of yacc.c */ #line 248 "./util/configparser.y" { @@ -2201,7 +2206,7 @@ yyreduce: } break; - case 133: + case 134: /* Line 1787 of yacc.c */ #line 257 "./util/configparser.y" { @@ -2217,7 +2222,7 @@ yyreduce: } break; - case 134: + case 135: /* Line 1787 of yacc.c */ #line 270 "./util/configparser.y" { @@ -2235,7 +2240,7 @@ yyreduce: } break; - case 135: + case 136: /* Line 1787 of yacc.c */ #line 285 "./util/configparser.y" { @@ -2247,7 +2252,7 @@ yyreduce: } break; - case 136: + case 137: /* Line 1787 of yacc.c */ #line 294 "./util/configparser.y" { @@ -2259,7 +2264,7 @@ yyreduce: } break; - case 137: + case 138: /* Line 1787 of yacc.c */ #line 303 "./util/configparser.y" { @@ -2271,7 +2276,7 @@ yyreduce: } break; - case 138: + case 139: /* Line 1787 of yacc.c */ #line 312 "./util/configparser.y" { @@ -2283,7 +2288,7 @@ yyreduce: } break; - case 139: + case 140: /* Line 1787 of yacc.c */ #line 321 "./util/configparser.y" { @@ -2295,7 +2300,7 @@ yyreduce: } break; - case 140: + case 141: /* Line 1787 of yacc.c */ #line 330 "./util/configparser.y" { @@ -2307,7 +2312,7 @@ yyreduce: } break; - case 141: + case 142: /* Line 1787 of yacc.c */ #line 339 "./util/configparser.y" { @@ -2319,7 +2324,7 @@ yyreduce: } break; - case 142: + case 143: /* Line 1787 of yacc.c */ #line 348 "./util/configparser.y" { @@ -2331,7 +2336,7 @@ yyreduce: } break; - case 143: + case 144: /* Line 1787 of yacc.c */ #line 357 "./util/configparser.y" { @@ -2343,7 +2348,7 @@ yyreduce: } break; - case 144: + case 145: /* Line 1787 of yacc.c */ #line 366 "./util/configparser.y" { @@ -2355,7 +2360,7 @@ yyreduce: } break; - case 145: + case 146: /* Line 1787 of yacc.c */ #line 375 "./util/configparser.y" { @@ -2367,7 +2372,7 @@ yyreduce: } break; - case 146: + case 147: /* Line 1787 of yacc.c */ #line 384 "./util/configparser.y" { @@ -2379,7 +2384,7 @@ yyreduce: } break; - case 147: + case 148: /* Line 1787 of yacc.c */ #line 393 "./util/configparser.y" { @@ -2389,7 +2394,7 @@ yyreduce: } break; - case 148: + case 149: /* Line 1787 of yacc.c */ #line 400 "./util/configparser.y" { @@ -2399,7 +2404,7 @@ yyreduce: } break; - case 149: + case 150: /* Line 1787 of yacc.c */ #line 407 "./util/configparser.y" { @@ -2411,7 +2416,7 @@ yyreduce: } break; - case 150: + case 151: /* Line 1787 of yacc.c */ #line 416 "./util/configparser.y" { @@ -2423,7 +2428,7 @@ yyreduce: } break; - case 151: + case 152: /* Line 1787 of yacc.c */ #line 425 "./util/configparser.y" { @@ -2440,7 +2445,7 @@ yyreduce: } break; - case 152: + case 153: /* Line 1787 of yacc.c */ #line 439 "./util/configparser.y" { @@ -2452,7 +2457,7 @@ yyreduce: } break; - case 153: + case 154: /* Line 1787 of yacc.c */ #line 448 "./util/configparser.y" { @@ -2464,7 +2469,7 @@ yyreduce: } break; - case 154: + case 155: /* Line 1787 of yacc.c */ #line 457 "./util/configparser.y" { @@ -2474,7 +2479,7 @@ yyreduce: } break; - case 155: + case 156: /* Line 1787 of yacc.c */ #line 464 "./util/configparser.y" { @@ -2484,7 +2489,7 @@ yyreduce: } break; - case 156: + case 157: /* Line 1787 of yacc.c */ #line 471 "./util/configparser.y" { @@ -2494,7 +2499,7 @@ yyreduce: } break; - case 157: + case 158: /* Line 1787 of yacc.c */ #line 478 "./util/configparser.y" { @@ -2505,7 +2510,7 @@ yyreduce: } break; - case 158: + case 159: /* Line 1787 of yacc.c */ #line 486 "./util/configparser.y" { @@ -2515,7 +2520,7 @@ yyreduce: } break; - case 159: + case 160: /* Line 1787 of yacc.c */ #line 493 "./util/configparser.y" { @@ -2525,7 +2530,7 @@ yyreduce: } break; - case 160: + case 161: /* Line 1787 of yacc.c */ #line 500 "./util/configparser.y" { @@ -2535,7 +2540,7 @@ yyreduce: } break; - case 161: + case 162: /* Line 1787 of yacc.c */ #line 507 "./util/configparser.y" { @@ -2545,7 +2550,7 @@ yyreduce: } break; - case 162: + case 163: /* Line 1787 of yacc.c */ #line 514 "./util/configparser.y" { @@ -2556,7 +2561,7 @@ yyreduce: } break; - case 163: + case 164: /* Line 1787 of yacc.c */ #line 522 "./util/configparser.y" { @@ -2567,7 +2572,7 @@ yyreduce: } break; - case 164: + case 165: /* Line 1787 of yacc.c */ #line 530 "./util/configparser.y" { @@ -2578,7 +2583,7 @@ yyreduce: } break; - case 165: + case 166: /* Line 1787 of yacc.c */ #line 538 "./util/configparser.y" { @@ -2588,7 +2593,7 @@ yyreduce: } break; - case 166: + case 167: /* Line 1787 of yacc.c */ #line 545 "./util/configparser.y" { @@ -2598,7 +2603,7 @@ yyreduce: } break; - case 167: + case 168: /* Line 1787 of yacc.c */ #line 552 "./util/configparser.y" { @@ -2610,7 +2615,7 @@ yyreduce: } break; - case 168: + case 169: /* Line 1787 of yacc.c */ #line 561 "./util/configparser.y" { @@ -2622,7 +2627,7 @@ yyreduce: } break; - case 169: + case 170: /* Line 1787 of yacc.c */ #line 570 "./util/configparser.y" { @@ -2632,7 +2637,7 @@ yyreduce: } break; - case 170: + case 171: /* Line 1787 of yacc.c */ #line 577 "./util/configparser.y" { @@ -2642,7 +2647,7 @@ yyreduce: } break; - case 171: + case 172: /* Line 1787 of yacc.c */ #line 584 "./util/configparser.y" { @@ -2653,7 +2658,7 @@ yyreduce: } break; - case 172: + case 173: /* Line 1787 of yacc.c */ #line 592 "./util/configparser.y" { @@ -2664,7 +2669,7 @@ yyreduce: } break; - case 173: + case 174: /* Line 1787 of yacc.c */ #line 600 "./util/configparser.y" { @@ -2677,7 +2682,7 @@ yyreduce: } break; - case 174: + case 175: /* Line 1787 of yacc.c */ #line 610 "./util/configparser.y" { @@ -2693,7 +2698,7 @@ yyreduce: } break; - case 175: + case 176: /* Line 1787 of yacc.c */ #line 623 "./util/configparser.y" { @@ -2707,7 +2712,7 @@ yyreduce: } break; - case 176: + case 177: /* Line 1787 of yacc.c */ #line 634 "./util/configparser.y" { @@ -2718,7 +2723,7 @@ yyreduce: } break; - case 177: + case 178: /* Line 1787 of yacc.c */ #line 642 "./util/configparser.y" { @@ -2734,7 +2739,7 @@ yyreduce: } break; - case 178: + case 179: /* Line 1787 of yacc.c */ #line 655 "./util/configparser.y" { @@ -2746,7 +2751,7 @@ yyreduce: } break; - case 179: + case 180: /* Line 1787 of yacc.c */ #line 664 "./util/configparser.y" { @@ -2758,9 +2763,21 @@ yyreduce: } break; - case 180: + case 181: /* Line 1787 of yacc.c */ #line 673 "./util/configparser.y" + { + OUTYY(("P(server_delay_close:%s)\n", (yyvsp[(2) - (2)].str))); + if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->delay_close = atoi((yyvsp[(2) - (2)].str)); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 182: +/* Line 1787 of yacc.c */ +#line 682 "./util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->rrset_cache_size)) @@ -2769,9 +2786,9 @@ yyreduce: } break; - case 181: + case 183: /* Line 1787 of yacc.c */ -#line 681 "./util/configparser.y" +#line 690 "./util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2785,9 +2802,9 @@ yyreduce: } break; - case 182: + case 184: /* Line 1787 of yacc.c */ -#line 694 "./util/configparser.y" +#line 703 "./util/configparser.y" { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2797,9 +2814,9 @@ yyreduce: } break; - case 183: + case 185: /* Line 1787 of yacc.c */ -#line 703 "./util/configparser.y" +#line 712 "./util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " @@ -2808,9 +2825,9 @@ yyreduce: } break; - case 184: + case 186: /* Line 1787 of yacc.c */ -#line 711 "./util/configparser.y" +#line 720 "./util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2820,9 +2837,9 @@ yyreduce: } break; - case 185: + case 187: /* Line 1787 of yacc.c */ -#line 720 "./util/configparser.y" +#line 729 "./util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str))); verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s " @@ -2831,9 +2848,9 @@ yyreduce: } break; - case 186: + case 188: /* Line 1787 of yacc.c */ -#line 728 "./util/configparser.y" +#line 737 "./util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2847,9 +2864,9 @@ yyreduce: } break; - case 187: + case 189: /* Line 1787 of yacc.c */ -#line 741 "./util/configparser.y" +#line 750 "./util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -2857,9 +2874,9 @@ yyreduce: } break; - case 188: + case 190: /* Line 1787 of yacc.c */ -#line 748 "./util/configparser.y" +#line 757 "./util/configparser.y" { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2870,9 +2887,9 @@ yyreduce: } break; - case 189: + case 191: /* Line 1787 of yacc.c */ -#line 758 "./util/configparser.y" +#line 767 "./util/configparser.y" { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2883,9 +2900,9 @@ yyreduce: } break; - case 190: + case 192: /* Line 1787 of yacc.c */ -#line 768 "./util/configparser.y" +#line 777 "./util/configparser.y" { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2896,9 +2913,9 @@ yyreduce: } break; - case 191: + case 193: /* Line 1787 of yacc.c */ -#line 778 "./util/configparser.y" +#line 787 "./util/configparser.y" { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2909,9 +2926,9 @@ yyreduce: } break; - case 192: + case 194: /* Line 1787 of yacc.c */ -#line 788 "./util/configparser.y" +#line 797 "./util/configparser.y" { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2922,9 +2939,9 @@ yyreduce: } break; - case 193: + case 195: /* Line 1787 of yacc.c */ -#line 798 "./util/configparser.y" +#line 807 "./util/configparser.y" { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2935,9 +2952,9 @@ yyreduce: } break; - case 194: + case 196: /* Line 1787 of yacc.c */ -#line 808 "./util/configparser.y" +#line 817 "./util/configparser.y" { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2948,9 +2965,9 @@ yyreduce: } break; - case 195: + case 197: /* Line 1787 of yacc.c */ -#line 818 "./util/configparser.y" +#line 827 "./util/configparser.y" { OUTYY(("P(server_private_address:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[(2) - (2)].str))) @@ -2958,9 +2975,9 @@ yyreduce: } break; - case 196: + case 198: /* Line 1787 of yacc.c */ -#line 825 "./util/configparser.y" +#line 834 "./util/configparser.y" { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[(2) - (2)].str))) @@ -2968,9 +2985,9 @@ yyreduce: } break; - case 197: + case 199: /* Line 1787 of yacc.c */ -#line 832 "./util/configparser.y" +#line 841 "./util/configparser.y" { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2980,9 +2997,9 @@ yyreduce: } break; - case 198: + case 200: /* Line 1787 of yacc.c */ -#line 841 "./util/configparser.y" +#line 850 "./util/configparser.y" { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2992,9 +3009,9 @@ yyreduce: } break; - case 199: + case 201: /* Line 1787 of yacc.c */ -#line 850 "./util/configparser.y" +#line 859 "./util/configparser.y" { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3004,9 +3021,9 @@ yyreduce: } break; - case 200: + case 202: /* Line 1787 of yacc.c */ -#line 859 "./util/configparser.y" +#line 868 "./util/configparser.y" { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[(2) - (2)].str))) @@ -3014,9 +3031,9 @@ yyreduce: } break; - case 201: + case 203: /* Line 1787 of yacc.c */ -#line 866 "./util/configparser.y" +#line 875 "./util/configparser.y" { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3027,9 +3044,9 @@ yyreduce: } break; - case 202: + case 204: /* Line 1787 of yacc.c */ -#line 876 "./util/configparser.y" +#line 885 "./util/configparser.y" { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); if(strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 && @@ -3047,9 +3064,9 @@ yyreduce: } break; - case 203: + case 205: /* Line 1787 of yacc.c */ -#line 893 "./util/configparser.y" +#line 902 "./util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -3057,9 +3074,9 @@ yyreduce: } break; - case 204: + case 206: /* Line 1787 of yacc.c */ -#line 900 "./util/configparser.y" +#line 909 "./util/configparser.y" { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str))); if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) { @@ -3078,9 +3095,9 @@ yyreduce: } break; - case 205: + case 207: /* Line 1787 of yacc.c */ -#line 918 "./util/configparser.y" +#line 927 "./util/configparser.y" { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[(2) - (2)].str))); if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) { @@ -3094,9 +3111,9 @@ yyreduce: } break; - case 206: + case 208: /* Line 1787 of yacc.c */ -#line 931 "./util/configparser.y" +#line 940 "./util/configparser.y" { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[(2) - (2)].str))); if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) { @@ -3110,9 +3127,9 @@ yyreduce: } break; - case 207: + case 209: /* Line 1787 of yacc.c */ -#line 944 "./util/configparser.y" +#line 953 "./util/configparser.y" { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3122,9 +3139,9 @@ yyreduce: } break; - case 208: + case 210: /* Line 1787 of yacc.c */ -#line 953 "./util/configparser.y" +#line 962 "./util/configparser.y" { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3134,9 +3151,9 @@ yyreduce: } break; - case 209: + case 211: /* Line 1787 of yacc.c */ -#line 962 "./util/configparser.y" +#line 971 "./util/configparser.y" { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3146,9 +3163,9 @@ yyreduce: } break; - case 210: + case 212: /* Line 1787 of yacc.c */ -#line 971 "./util/configparser.y" +#line 980 "./util/configparser.y" { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3159,9 +3176,9 @@ yyreduce: } break; - case 211: + case 213: /* Line 1787 of yacc.c */ -#line 981 "./util/configparser.y" +#line 990 "./util/configparser.y" { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3172,9 +3189,9 @@ yyreduce: } break; - case 212: + case 214: /* Line 1787 of yacc.c */ -#line 991 "./util/configparser.y" +#line 1000 "./util/configparser.y" { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3184,9 +3201,9 @@ yyreduce: } break; - case 213: + case 215: /* Line 1787 of yacc.c */ -#line 1000 "./util/configparser.y" +#line 1009 "./util/configparser.y" { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3196,9 +3213,9 @@ yyreduce: } break; - case 214: + case 216: /* Line 1787 of yacc.c */ -#line 1009 "./util/configparser.y" +#line 1018 "./util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -3206,9 +3223,9 @@ yyreduce: } break; - case 215: + case 217: /* Line 1787 of yacc.c */ -#line 1016 "./util/configparser.y" +#line 1025 "./util/configparser.y" { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3218,9 +3235,9 @@ yyreduce: } break; - case 216: + case 218: /* Line 1787 of yacc.c */ -#line 1025 "./util/configparser.y" +#line 1034 "./util/configparser.y" { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3230,9 +3247,9 @@ yyreduce: } break; - case 217: + case 219: /* Line 1787 of yacc.c */ -#line 1034 "./util/configparser.y" +#line 1043 "./util/configparser.y" { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3242,9 +3259,9 @@ yyreduce: } break; - case 218: + case 220: /* Line 1787 of yacc.c */ -#line 1043 "./util/configparser.y" +#line 1052 "./util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->key_cache_size)) @@ -3253,9 +3270,9 @@ yyreduce: } break; - case 219: + case 221: /* Line 1787 of yacc.c */ -#line 1051 "./util/configparser.y" +#line 1060 "./util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3269,9 +3286,9 @@ yyreduce: } break; - case 220: + case 222: /* Line 1787 of yacc.c */ -#line 1064 "./util/configparser.y" +#line 1073 "./util/configparser.y" { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->neg_cache_size)) @@ -3280,9 +3297,9 @@ yyreduce: } break; - case 221: + case 223: /* Line 1787 of yacc.c */ -#line 1072 "./util/configparser.y" +#line 1081 "./util/configparser.y" { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); if(strcmp((yyvsp[(3) - (3)].str), "static")!=0 && strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && @@ -3305,9 +3322,9 @@ yyreduce: } break; - case 222: + case 224: /* Line 1787 of yacc.c */ -#line 1094 "./util/configparser.y" +#line 1103 "./util/configparser.y" { OUTYY(("P(server_local_data:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[(2) - (2)].str))) @@ -3315,9 +3332,9 @@ yyreduce: } break; - case 223: + case 225: /* Line 1787 of yacc.c */ -#line 1101 "./util/configparser.y" +#line 1110 "./util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3333,9 +3350,9 @@ yyreduce: } break; - case 224: + case 226: /* Line 1787 of yacc.c */ -#line 1116 "./util/configparser.y" +#line 1125 "./util/configparser.y" { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3346,9 +3363,9 @@ yyreduce: } break; - case 225: + case 227: /* Line 1787 of yacc.c */ -#line 1126 "./util/configparser.y" +#line 1135 "./util/configparser.y" { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3359,9 +3376,9 @@ yyreduce: } break; - case 226: + case 228: /* Line 1787 of yacc.c */ -#line 1136 "./util/configparser.y" +#line 1145 "./util/configparser.y" { OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[(2) - (2)].str))); cfg_parser->cfg->max_udp_size = atoi((yyvsp[(2) - (2)].str)); @@ -3369,9 +3386,9 @@ yyreduce: } break; - case 227: + case 229: /* Line 1787 of yacc.c */ -#line 1143 "./util/configparser.y" +#line 1152 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->stubs->name) @@ -3382,9 +3399,9 @@ yyreduce: } break; - case 228: + case 230: /* Line 1787 of yacc.c */ -#line 1153 "./util/configparser.y" +#line 1162 "./util/configparser.y" { OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[(2) - (2)].str))) @@ -3392,9 +3409,9 @@ yyreduce: } break; - case 229: + case 231: /* Line 1787 of yacc.c */ -#line 1160 "./util/configparser.y" +#line 1169 "./util/configparser.y" { OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[(2) - (2)].str))) @@ -3402,9 +3419,9 @@ yyreduce: } break; - case 230: + case 232: /* Line 1787 of yacc.c */ -#line 1167 "./util/configparser.y" +#line 1176 "./util/configparser.y" { OUTYY(("P(stub-first:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3414,9 +3431,9 @@ yyreduce: } break; - case 231: + case 233: /* Line 1787 of yacc.c */ -#line 1176 "./util/configparser.y" +#line 1185 "./util/configparser.y" { OUTYY(("P(stub-prime:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3427,9 +3444,9 @@ yyreduce: } break; - case 232: + case 234: /* Line 1787 of yacc.c */ -#line 1186 "./util/configparser.y" +#line 1195 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->forwards->name) @@ -3440,9 +3457,9 @@ yyreduce: } break; - case 233: + case 235: /* Line 1787 of yacc.c */ -#line 1196 "./util/configparser.y" +#line 1205 "./util/configparser.y" { OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[(2) - (2)].str))) @@ -3450,9 +3467,9 @@ yyreduce: } break; - case 234: + case 236: /* Line 1787 of yacc.c */ -#line 1203 "./util/configparser.y" +#line 1212 "./util/configparser.y" { OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[(2) - (2)].str))) @@ -3460,9 +3477,9 @@ yyreduce: } break; - case 235: + case 237: /* Line 1787 of yacc.c */ -#line 1210 "./util/configparser.y" +#line 1219 "./util/configparser.y" { OUTYY(("P(forward-first:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3472,17 +3489,17 @@ yyreduce: } break; - case 236: + case 238: /* Line 1787 of yacc.c */ -#line 1219 "./util/configparser.y" +#line 1228 "./util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } break; - case 246: + case 248: /* Line 1787 of yacc.c */ -#line 1230 "./util/configparser.y" +#line 1239 "./util/configparser.y" { OUTYY(("P(control_enable:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3493,9 +3510,9 @@ yyreduce: } break; - case 247: + case 249: /* Line 1787 of yacc.c */ -#line 1240 "./util/configparser.y" +#line 1249 "./util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3505,9 +3522,9 @@ yyreduce: } break; - case 248: + case 250: /* Line 1787 of yacc.c */ -#line 1249 "./util/configparser.y" +#line 1258 "./util/configparser.y" { OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[(2) - (2)].str))) @@ -3515,9 +3532,9 @@ yyreduce: } break; - case 249: + case 251: /* Line 1787 of yacc.c */ -#line 1256 "./util/configparser.y" +#line 1265 "./util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_key_file); @@ -3525,9 +3542,9 @@ yyreduce: } break; - case 250: + case 252: /* Line 1787 of yacc.c */ -#line 1263 "./util/configparser.y" +#line 1272 "./util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_cert_file); @@ -3535,9 +3552,9 @@ yyreduce: } break; - case 251: + case 253: /* Line 1787 of yacc.c */ -#line 1270 "./util/configparser.y" +#line 1279 "./util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_key_file); @@ -3545,9 +3562,9 @@ yyreduce: } break; - case 252: + case 254: /* Line 1787 of yacc.c */ -#line 1277 "./util/configparser.y" +#line 1286 "./util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_cert_file); @@ -3555,17 +3572,17 @@ yyreduce: } break; - case 253: + case 255: /* Line 1787 of yacc.c */ -#line 1284 "./util/configparser.y" +#line 1293 "./util/configparser.y" { OUTYY(("\nP(python:)\n")); } break; - case 257: + case 259: /* Line 1787 of yacc.c */ -#line 1293 "./util/configparser.y" +#line 1302 "./util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->python_script); @@ -3575,7 +3592,7 @@ yyreduce: /* Line 1787 of yacc.c */ -#line 3579 "util/configparser.c" +#line 3596 "util/configparser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3805,7 +3822,7 @@ yyreturn: /* Line 2048 of yacc.c */ -#line 1298 "./util/configparser.y" +#line 1307 "./util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 407be5e9c..b447b1966 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -174,7 +174,8 @@ extern int yydebug; VAR_STUB_FIRST = 383, VAR_MINIMAL_RESPONSES = 384, VAR_RRSET_ROUNDROBIN = 385, - VAR_MAX_UDP_SIZE = 386 + VAR_MAX_UDP_SIZE = 386, + VAR_DELAY_CLOSE = 387 }; #endif /* Tokens. */ @@ -307,6 +308,7 @@ extern int yydebug; #define VAR_MINIMAL_RESPONSES 384 #define VAR_RRSET_ROUNDROBIN 385 #define VAR_MAX_UDP_SIZE 386 +#define VAR_DELAY_CLOSE 387 @@ -320,7 +322,7 @@ typedef union YYSTYPE /* Line 2049 of yacc.c */ -#line 324 "util/configparser.h" +#line 326 "util/configparser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/util/configparser.y b/util/configparser.y index 5b69d6671..46be149e1 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -105,7 +105,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_IGNORE_CD_FLAG VAR_LOG_QUERIES VAR_TCP_UPSTREAM VAR_SSL_UPSTREAM %token VAR_SSL_SERVICE_KEY VAR_SSL_SERVICE_PEM VAR_SSL_PORT VAR_FORWARD_FIRST %token VAR_STUB_FIRST VAR_MINIMAL_RESPONSES VAR_RRSET_ROUNDROBIN -%token VAR_MAX_UDP_SIZE +%token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -163,7 +163,7 @@ content_server: server_num_threads | server_verbosity | server_port | server_log_queries | server_tcp_upstream | server_ssl_upstream | server_ssl_service_key | server_ssl_service_pem | server_ssl_port | server_minimal_responses | server_rrset_roundrobin | server_max_udp_size | - server_so_reuseport + server_so_reuseport | server_delay_close ; stubstart: VAR_STUB_ZONE { @@ -669,6 +669,15 @@ server_jostle_timeout: VAR_JOSTLE_TIMEOUT STRING_ARG free($2); } ; +server_delay_close: VAR_DELAY_CLOSE STRING_ARG + { + OUTYY(("P(server_delay_close:%s)\n", $2)); + if(atoi($2) == 0 && strcmp($2, "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->delay_close = atoi($2); + free($2); + } + ; server_rrset_cache_size: VAR_RRSET_CACHE_SIZE STRING_ARG { OUTYY(("P(server_rrset_cache_size:%s)\n", $2)); diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c index 537e3675a..a9bfe311a 100644 --- a/util/fptr_wlist.c +++ b/util/fptr_wlist.c @@ -104,6 +104,7 @@ fptr_whitelist_comm_timer(void (*fptr)(void*)) { if(fptr == &pending_udp_timer_cb) return 1; else if(fptr == &outnet_tcptimer) return 1; + else if(fptr == &pending_udp_timer_delay_cb) return 1; else if(fptr == &worker_stat_timer_cb) return 1; else if(fptr == &worker_probe_timer_cb) return 1; #ifdef UB_ON_WINDOWS -- 2.47.2