diff --git a/daemon/worker.c b/daemon/worker.c index 683f93169..ac7053abd 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -1633,7 +1633,8 @@ worker_init(struct worker* worker, struct config_file *cfg, cfg->use_caps_bits_for_id, worker->ports, worker->numports, cfg->unwanted_threshold, cfg->outgoing_tcp_mss, &worker_alloc_cleanup, worker, - cfg->do_udp, worker->daemon->connect_sslctx, cfg->delay_close, + cfg->do_udp || cfg->udp_upstream_without_downstream, + worker->daemon->connect_sslctx, cfg->delay_close, dtenv); if(!worker->back) { log_err("could not create outgoing sockets"); diff --git a/doc/Changelog b/doc/Changelog index 39bc68e1d..f047d129f 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,8 @@ - tag 1.6.6 (is 1.6.6rc2) - Fix that looping modules always stop the query, and don't pass control. + - Fix #1435: Please allow UDP to be disabled separately upstream and + downstream. 15 September 2017: Wouter - Fix unbound-host to report error for DNSSEC state of failed lookups. diff --git a/doc/example.conf.in b/doc/example.conf.in index ef584b3f2..9ac01fa1b 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -199,6 +199,10 @@ server: # upstream connections use TCP only (and no UDP), "yes" or "no" # useful for tunneling scenarios, default no. # tcp-upstream: no + + # upstream connections also use UDP (even if do-udp is no). + # useful if if you want UDP upstream, but don't provide UDP downstream. + # udp-upstream-without-downstream: no # Maximum segment size (MSS) of TCP socket on which the server # responds to queries. Default is 0, system default MSS. diff --git a/libunbound/libworker.c b/libunbound/libworker.c index f6a1d1d1c..8cf4fab29 100644 --- a/libunbound/libworker.c +++ b/libunbound/libworker.c @@ -232,8 +232,8 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_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, - cfg->outgoing_tcp_mss, - &libworker_alloc_cleanup, w, cfg->do_udp, w->sslctx, + cfg->outgoing_tcp_mss, &libworker_alloc_cleanup, w, + cfg->do_udp || cfg->udp_upstream_without_downstream, w->sslctx, cfg->delay_close, NULL); if(!w->is_bg || w->is_bg_thread) { lock_basic_unlock(&ctx->cfglock); diff --git a/util/config_file.c b/util/config_file.c index 32d3978aa..9b204e276 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -101,6 +101,7 @@ config_create(void) cfg->do_udp = 1; cfg->do_tcp = 1; cfg->tcp_upstream = 0; + cfg->udp_upstream_without_downstream = 0; cfg->tcp_mss = 0; cfg->outgoing_tcp_mss = 0; cfg->ssl_service_key = NULL; @@ -426,6 +427,8 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_YNO("do-udp:", do_udp) else S_YNO("do-tcp:", do_tcp) else S_YNO("tcp-upstream:", tcp_upstream) + else S_YNO("udp-upstream-without-downstream:", + udp_upstream_without_downstream) else S_NUMBER_NONZERO("tcp-mss:", tcp_mss) else S_NUMBER_NONZERO("outgoing-tcp-mss:", outgoing_tcp_mss) else S_YNO("ssl-upstream:", ssl_upstream) @@ -828,6 +831,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_YNO(opt, "do-udp", do_udp) else O_YNO(opt, "do-tcp", do_tcp) else O_YNO(opt, "tcp-upstream", tcp_upstream) + else O_YNO(opt, "udp-upstream-without-downstream", udp_upstream_without_downstream) else O_DEC(opt, "tcp-mss", tcp_mss) else O_DEC(opt, "outgoing-tcp-mss", outgoing_tcp_mss) else O_YNO(opt, "ssl-upstream", ssl_upstream) diff --git a/util/config_file.h b/util/config_file.h index a3398f762..2e09253d9 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -84,6 +84,8 @@ struct config_file { int do_tcp; /** tcp upstream queries (no UDP upstream queries) */ int tcp_upstream; + /** udp upstream enabled when no UDP downstream is enabled (do_udp no)*/ + int udp_upstream_without_downstream; /** maximum segment size of tcp socket which queries are answered */ int tcp_mss; /** maximum segment size of tcp socket for outgoing queries */ diff --git a/util/configlexer.c b/util/configlexer.c index dfbc73607..31f2a2b39 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -363,8 +363,8 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 234 -#define YY_END_OF_BUFFER 235 +#define YY_NUM_RULES 235 +#define YY_END_OF_BUFFER 236 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -372,259 +372,263 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[2288] = +static yyconst flex_int16_t yy_accept[2319] = { 0, - 1, 1, 216, 216, 220, 220, 224, 224, 228, 228, - 1, 1, 235, 232, 1, 214, 214, 233, 2, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 216, 217, 217, 218, 233, 220, 221, 221, 222, - 233, 227, 224, 225, 225, 226, 233, 228, 229, 229, - 230, 233, 231, 215, 2, 219, 233, 231, 232, 0, - 1, 2, 2, 2, 2, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 1, 1, 217, 217, 221, 221, 225, 225, 229, 229, + 1, 1, 236, 233, 1, 215, 215, 234, 2, 234, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 217, 218, 218, 219, 234, 221, 222, 222, 223, + 234, 228, 225, 226, 226, 227, 234, 229, 230, 230, + 231, 234, 232, 216, 2, 220, 234, 232, 233, 0, + 1, 2, 2, 2, 2, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 216, 0, 220, 0, 227, 0, 224, 228, - 0, 231, 0, 2, 2, 231, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 217, 0, 221, 0, 228, 0, 225, + 229, 0, 232, 0, 2, 2, 232, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 231, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 232, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 231, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 77, 232, 232, 232, - 232, 232, 232, 8, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 232, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 77, + 233, 233, 233, 233, 233, 233, 8, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 88, 231, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 88, + 232, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 231, 232, 232, 232, 232, 232, - 232, 232, 37, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 170, 232, 14, 15, 232, - 18, 17, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 232, + 233, 233, 233, 233, 233, 233, 233, 37, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 170, 233, 14, 15, 233, 18, 17, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 156, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 3, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 231, 232, 232, 232, 212, 232, 232, 211, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 156, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 3, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 232, 233, 233, 233, + 212, 233, 233, 211, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 232, 223, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 40, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 41, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 145, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 20, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 103, - 232, 223, 232, 232, 232, 232, 232, 232, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 224, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 40, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 41, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 145, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 20, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 103, 233, 224, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 197, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 120, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 102, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 75, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 25, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 197, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 120, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 102, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 75, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 38, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 39, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 121, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 28, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 233, 233, 233, 233, 233, 25, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 38, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 39, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 121, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 28, 233, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 185, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 32, - 232, 33, 232, 232, 232, 78, 232, 79, 232, 232, - 76, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 7, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 163, 232, 232, 232, 232, 105, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 185, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 32, 233, 33, + 233, 233, 233, 78, 233, 79, 233, 233, 76, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 7, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 163, 233, 233, 233, 233, 105, 233, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 29, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 137, 232, 136, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 16, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 42, 232, 232, 232, - 232, 232, 232, 232, 144, 232, 232, 232, 232, 81, - 80, 232, 232, 232, 232, 232, 232, 232, 232, 131, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 29, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 137, 233, 136, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 16, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 42, 233, 233, 233, 233, + 233, 233, 233, 144, 233, 233, 233, 233, 81, 80, - 232, 232, 232, 232, 232, 232, 232, 232, 89, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 60, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 64, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 36, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 134, 135, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 6, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 131, + 233, 233, 233, 233, 233, 233, 233, 233, 89, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 60, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 64, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 36, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 134, 135, 233, 233, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 195, 232, 232, - 213, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 26, 232, - 232, 232, 232, 232, 232, 232, 232, 127, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 149, 232, - 128, 232, 232, 161, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 27, - 232, 232, 232, 232, 84, 232, 85, 232, 83, 232, - 232, 232, 232, 232, 232, 232, 232, 100, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 6, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 195, 233, 233, + 213, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 26, + 233, 233, 233, 233, 233, 233, 233, 233, 127, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 149, + 233, 128, 233, 233, 161, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 27, 233, 233, 233, 233, 84, 233, 85, 233, 83, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 184, - 232, 232, 232, 232, 232, 232, 232, 232, 129, 232, - 232, 232, 232, 232, 132, 232, 232, 160, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 74, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 34, 232, 232, 22, 232, 232, 232, 232, 19, 232, - 110, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 49, 51, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 199, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 100, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 184, 233, 233, 233, 233, 233, 233, 233, 233, 129, + 233, 233, 233, 233, 233, 132, 233, 233, 160, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 74, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 34, 233, 233, 22, 233, 233, 233, 233, 19, + 233, 110, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 49, 51, 233, - 232, 232, 171, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 86, 232, 232, 232, - 232, 232, 232, 232, 99, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 207, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 104, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 155, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 119, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 115, 232, 122, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 199, 233, 233, 233, 171, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 86, 233, + 233, 233, 233, 233, 233, 233, 99, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 207, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 104, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 155, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 119, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 232, 92, 232, 232, 70, 232, - 232, 232, 232, 147, 232, 232, 232, 232, 232, 162, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 176, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 118, 232, 232, 232, 232, - 232, 52, 53, 232, 232, 232, 232, 232, 35, 232, - 232, 232, 232, 232, 59, 123, 232, 138, 232, 164, - 133, 232, 232, 232, 45, 232, 125, 232, 232, 232, - 232, 232, 9, 232, 232, 232, 73, 232, 232, 232, - 232, 189, 232, 146, 232, 232, 232, 232, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 115, 233, 122, 233, 233, 233, 233, 233, 92, 233, + 233, 70, 233, 233, 233, 233, 147, 233, 233, 233, + 233, 233, 162, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 176, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 118, 233, + 233, 233, 233, 233, 52, 53, 233, 233, 233, 233, + 233, 35, 233, 233, 233, 233, 233, 59, 123, 233, + 138, 233, 164, 133, 233, 233, 233, 45, 233, 125, + 233, 233, 233, 233, 233, 9, 233, 233, 233, 73, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 106, 198, 232, 232, 232, 175, 232, 232, - 232, 232, 232, 232, 232, 232, 157, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 210, 232, 124, 232, 232, 232, 44, 46, 232, 232, - 232, 232, 232, 232, 232, 72, 232, 232, 232, 232, - 187, 232, 194, 232, 232, 232, 232, 232, 151, 23, + 233, 233, 233, 233, 189, 233, 146, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 106, 198, 233, 233, + 233, 175, 233, 233, 233, 233, 233, 233, 233, 233, + 157, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 210, 233, 124, 233, 233, 233, + 44, 46, 233, 233, 233, 233, 233, 233, 233, 72, - 24, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 69, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 153, 150, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 43, 232, 232, 232, 232, 232, 232, 232, 232, 101, - 13, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 205, 232, 208, 232, 232, 232, 232, 232, 232, 12, - 232, 232, 21, 232, 232, 232, 193, 232, 196, 47, - 232, 159, 232, 152, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 114, 113, 232, + 233, 233, 233, 233, 187, 233, 194, 233, 233, 233, + 233, 233, 151, 23, 24, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 69, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 153, 150, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 43, 233, 233, 233, 233, + 233, 233, 233, 233, 101, 13, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 205, 233, 208, 233, 233, + 233, 233, 233, 233, 12, 233, 233, 21, 233, 233, + 233, 193, 233, 196, 47, 233, 159, 233, 152, 233, - 232, 232, 232, 232, 232, 232, 154, 148, 232, 232, - 200, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 54, 232, 232, 232, 188, 232, 232, 232, - 232, 232, 158, 232, 232, 232, 232, 232, 232, 232, - 232, 48, 232, 232, 232, 82, 232, 107, 232, 109, - 139, 232, 232, 232, 112, 232, 232, 165, 232, 232, - 232, 232, 232, 94, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 172, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 140, 232, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 114, 113, 233, 233, 233, 233, 233, + 233, 233, 154, 148, 233, 233, 200, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 54, 233, + 233, 233, 188, 233, 233, 233, 233, 233, 158, 233, + 233, 233, 233, 233, 233, 233, 233, 48, 233, 233, + 233, 82, 233, 107, 233, 109, 233, 139, 233, 233, + 233, 112, 233, 233, 165, 233, 233, 233, 233, 233, + 94, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 232, 186, 232, 209, 232, 232, 232, 30, 232, 232, - 232, 232, 4, 232, 232, 93, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 168, 232, 232, 232, - 232, 232, 232, 201, 232, 232, 232, 232, 232, 232, - 174, 232, 232, 143, 232, 232, 232, 232, 232, 232, - 232, 232, 57, 232, 31, 192, 232, 169, 232, 232, - 11, 232, 232, 232, 232, 232, 232, 141, 61, 232, - 232, 232, 232, 117, 232, 232, 232, 232, 232, 96, - 232, 232, 232, 232, 232, 232, 232, 232, 173, 90, - 232, 87, 232, 232, 232, 63, 67, 62, 232, 55, + 233, 172, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 140, 233, 233, 186, 233, + 209, 233, 233, 233, 30, 233, 233, 233, 233, 4, + 233, 233, 93, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 168, 233, 233, 233, 233, 233, + 233, 201, 233, 233, 233, 233, 233, 233, 174, 233, + 233, 143, 233, 233, 233, 233, 233, 233, 233, 233, + 57, 233, 31, 192, 233, 169, 233, 233, 11, 233, + 233, 233, 233, 233, 233, 141, 61, 233, 233, 233, + 233, 233, 117, 233, 233, 233, 233, 233, 96, 233, - 232, 232, 232, 10, 232, 232, 232, 190, 232, 232, - 232, 116, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 68, 66, - 232, 56, 206, 232, 232, 232, 130, 232, 232, 142, - 232, 232, 232, 232, 232, 108, 50, 232, 232, 202, - 232, 232, 232, 232, 232, 232, 232, 91, 65, 97, - 98, 58, 232, 191, 111, 232, 232, 232, 167, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 71, 232, 166, 232, 183, 232, 232, 232, + 233, 233, 233, 233, 233, 233, 233, 173, 90, 233, + 87, 233, 233, 233, 63, 67, 62, 233, 55, 233, + 233, 233, 10, 233, 233, 233, 190, 233, 233, 233, + 233, 116, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 68, 66, + 233, 56, 206, 233, 233, 233, 130, 233, 233, 142, + 233, 233, 233, 233, 233, 233, 108, 50, 233, 233, + 202, 233, 233, 233, 233, 233, 233, 233, 91, 65, + 97, 98, 58, 233, 191, 111, 233, 233, 233, 233, + 167, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 232, 232, 232, 232, 5, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 95, 232, 232, 232, 232, 232, - 232, 232, 126, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 179, 232, - 232, 232, 232, 232, 203, 232, 232, 232, 232, 232, - 232, 204, 232, 232, 232, 177, 232, 180, 181, 232, - 232, 232, 232, 232, 178, 182, 0 + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 71, 233, 166, 233, + 183, 233, 233, 233, 233, 233, 233, 233, 5, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 95, 233, 233, 233, 233, 233, 233, 233, 233, + 126, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 214, 233, 233, 179, + 233, 233, 233, 233, 233, 203, 233, 233, 233, 233, + + 233, 233, 204, 233, 233, 233, 177, 233, 180, 181, + 233, 233, 233, 233, 233, 178, 182, 0 } ; static yyconst YY_CHAR yy_ec[256] = @@ -667,523 +671,529 @@ static yyconst YY_CHAR yy_meta[41] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_uint16_t yy_base[2302] = +static yyconst flex_uint16_t yy_base[2333] = { 0, 0, 0, 38, 41, 44, 46, 59, 65, 71, 77, - 90, 112, 2091, 2047, 81, 4490, 4490, 4490, 96, 52, + 90, 112, 3634, 3113, 81, 4542, 4542, 4542, 96, 52, 72, 63, 107, 111, 70, 91, 109, 124, 98, 127, - 114, 133, 136, 130, 144, 146, 163, 165, 171, 147, - 182, 1992, 4490, 4490, 4490, 164, 1828, 4490, 4490, 4490, - 95, 1657, 1592, 4490, 4490, 4490, 202, 1496, 4490, 4490, - 4490, 185, 1225, 4490, 206, 4490, 210, 188, 1072, 217, - 147, 0, 221, 0, 0, 215, 213, 97, 219, 223, - 186, 158, 224, 225, 227, 228, 229, 236, 233, 232, - 145, 235, 240, 251, 254, 242, 257, 267, 243, 264, + 114, 133, 136, 130, 144, 146, 163, 165, 171, 179, + 186, 2967, 4542, 4542, 4542, 164, 2750, 4542, 4542, 4542, + 95, 2626, 2480, 4542, 4542, 4542, 206, 2158, 4542, 4542, + 4542, 176, 2063, 4542, 212, 4542, 216, 147, 1851, 220, + 147, 0, 227, 0, 0, 221, 188, 97, 222, 228, + 158, 214, 216, 229, 232, 233, 156, 240, 238, 236, + 190, 239, 242, 243, 145, 245, 258, 254, 246, 262, - 265, 266, 270, 271, 143, 274, 234, 278, 273, 279, - 281, 280, 283, 282, 294, 296, 299, 300, 301, 303, - 309, 310, 307, 313, 305, 308, 311, 325, 326, 328, - 329, 330, 904, 346, 784, 348, 668, 361, 635, 584, - 352, 423, 365, 369, 0, 361, 339, 371, 363, 366, - 367, 368, 370, 345, 372, 373, 380, 379, 388, 396, - 395, 397, 399, 383, 386, 403, 404, 405, 407, 410, - 413, 414, 376, 416, 420, 430, 432, 419, 422, 440, - 441, 449, 451, 435, 433, 452, 453, 462, 463, 459, - 333, 461, 460, 464, 447, 465, 468, 471, 472, 474, + 263, 268, 269, 271, 272, 276, 274, 280, 282, 285, + 284, 286, 290, 291, 296, 294, 300, 301, 298, 306, + 305, 321, 237, 307, 312, 310, 322, 323, 325, 177, + 329, 331, 332, 1744, 343, 1464, 345, 1234, 354, 1000, + 778, 360, 336, 364, 368, 0, 360, 362, 346, 364, + 365, 366, 353, 369, 370, 371, 373, 386, 378, 388, + 396, 394, 395, 400, 393, 398, 402, 385, 377, 405, + 406, 411, 413, 417, 418, 419, 421, 429, 430, 431, + 438, 436, 446, 448, 444, 433, 449, 451, 461, 463, + 458, 459, 460, 462, 464, 445, 468, 471, 469, 473, - 475, 477, 478, 479, 484, 491, 486, 494, 489, 177, - 492, 503, 493, 498, 500, 508, 513, 514, 511, 515, - 517, 520, 524, 525, 532, 529, 531, 521, 522, 538, - 539, 519, 542, 541, 548, 553, 551, 554, 556, 558, - 560, 559, 561, 563, 570, 566, 573, 576, 578, 585, - 568, 571, 581, 582, 586, 590, 591, 592, 594, 597, - 599, 600, 601, 610, 605, 606, 607, 611, 619, 615, - 614, 629, 634, 635, 630, 621, 637, 639, 642, 644, - 651, 643, 654, 645, 653, 655, 662, 660, 661, 669, - 667, 671, 674, 664, 665, 683, 691, 688, 687, 675, + 475, 477, 478, 480, 481, 479, 492, 487, 495, 490, + 494, 493, 508, 499, 509, 504, 511, 513, 520, 515, + 519, 521, 522, 524, 529, 525, 535, 543, 536, 538, + 526, 539, 546, 545, 547, 555, 527, 559, 548, 560, + 562, 549, 558, 564, 568, 569, 577, 574, 581, 579, + 582, 589, 576, 584, 585, 586, 590, 592, 593, 594, + 597, 600, 603, 604, 605, 614, 609, 610, 616, 618, + 620, 613, 619, 635, 629, 639, 630, 640, 643, 644, + 646, 649, 656, 648, 659, 658, 651, 660, 667, 662, + 668, 672, 669, 676, 680, 665, 677, 686, 684, 689, - 689, 696, 694, 698, 714, 690, 702, 707, 699, 703, - 709, 715, 718, 727, 719, 723, 725, 734, 736, 737, - 744, 739, 746, 740, 753, 748, 750, 751, 763, 755, - 762, 764, 757, 765, 768, 770, 769, 776, 777, 779, - 791, 781, 783, 800, 782, 795, 798, 804, 793, 805, - 807, 810, 808, 811, 822, 814, 817, 819, 823, 825, - 827, 826, 828, 831, 833, 834, 4490, 840, 842, 843, - 844, 845, 846, 4490, 848, 847, 850, 855, 852, 857, - 856, 869, 878, 859, 871, 881, 873, 880, 860, 876, - 884, 883, 886, 889, 890, 910, 892, 894, 901, 902, + 688, 690, 691, 692, 697, 699, 700, 719, 705, 704, + 729, 703, 706, 715, 716, 726, 743, 727, 732, 739, + 741, 744, 742, 751, 746, 748, 753, 761, 754, 758, + 763, 772, 762, 764, 765, 771, 773, 783, 784, 776, + 777, 786, 708, 792, 789, 790, 802, 798, 801, 800, + 805, 809, 811, 813, 815, 814, 816, 824, 821, 822, + 823, 830, 832, 833, 831, 836, 841, 834, 847, 4542, + 849, 838, 624, 842, 840, 852, 4542, 853, 854, 856, + 863, 858, 861, 862, 869, 878, 865, 879, 881, 880, + 883, 868, 884, 887, 886, 892, 893, 889, 910, 895, - 900, 895, 919, 906, 921, 893, 923, 924, 914, 925, - 927, 928, 930, 938, 934, 4490, 941, 948, 943, 944, - 946, 951, 952, 957, 959, 966, 956, 967, 963, 969, - 970, 971, 974, 973, 978, 987, 980, 983, 991, 1001, - 997, 999, 1006, 984, 1002, 1003, 1004, 1009, 1014, 1011, - 1010, 1016, 1017, 1024, 1020, 1019, 1023, 1027, 1029, 1032, - 1034, 1036, 1038, 1040, 1048, 979, 1043, 1047, 1044, 1053, - 1054, 1056, 1057, 1059, 1060, 1063, 1067, 1065, 1074, 1078, - 1079, 1064, 1066, 1089, 1085, 1092, 1088, 1093, 1100, 1095, - 1096, 1103, 1087, 1101, 1102, 1113, 1104, 1112, 1124, 1114, + 898, 896, 919, 904, 900, 902, 906, 914, 927, 923, + 921, 925, 930, 931, 932, 934, 935, 941, 942, 4542, + 946, 951, 947, 944, 957, 952, 958, 955, 967, 970, + 968, 975, 971, 973, 972, 974, 978, 977, 982, 990, + 986, 992, 995, 1003, 1001, 1005, 1008, 985, 1007, 1009, + 1010, 1011, 1019, 1016, 1014, 1017, 1021, 1029, 1025, 1024, + 1031, 1026, 1035, 1027, 1037, 1046, 1033, 1040, 1054, 1049, + 1050, 1052, 1057, 1059, 1060, 1061, 1063, 1066, 1065, 1067, + 1077, 1080, 1069, 1070, 1082, 1083, 1084, 1091, 1088, 1095, + 1094, 1099, 1106, 1090, 1096, 1108, 1092, 1107, 1110, 1118, - 1111, 1119, 1122, 1125, 1126, 1128, 1129, 1130, 1131, 1133, - 1132, 1134, 1137, 1138, 1145, 1140, 1143, 1154, 1157, 1149, - 1158, 1151, 1164, 1165, 1166, 1169, 1168, 1171, 1172, 1170, - 1179, 1180, 1181, 1182, 1185, 1184, 1192, 1193, 1198, 1199, - 1202, 1194, 4490, 1204, 1211, 1206, 1209, 1207, 1210, 1218, - 1216, 1215, 1217, 1220, 1222, 4490, 1221, 4490, 4490, 1229, - 4490, 4490, 1230, 1232, 1243, 1248, 1250, 1258, 1259, 1257, - 1235, 1237, 1245, 1264, 1254, 1265, 1268, 1273, 1274, 1276, - 1279, 1280, 1284, 1283, 1287, 1289, 1290, 1292, 1291, 1296, - 1294, 1298, 1300, 1301, 1302, 1304, 1314, 1321, 1322, 1305, + 1114, 1115, 1123, 1124, 1119, 1127, 1121, 1130, 1131, 1133, + 1134, 1135, 1137, 1136, 1139, 1138, 1142, 1143, 1152, 1147, + 1148, 1159, 1164, 1150, 1162, 1165, 1163, 1157, 1171, 1174, + 1172, 1175, 1178, 1180, 1186, 1187, 1188, 1189, 1190, 1191, + 1192, 1198, 1193, 1201, 1206, 1209, 1210, 4542, 1205, 1217, + 1212, 1216, 1213, 1218, 1227, 1222, 1223, 1226, 1228, 1233, + 4542, 1229, 4542, 4542, 1237, 4542, 4542, 1231, 1243, 1235, + 1246, 1256, 1259, 1260, 1258, 1250, 1265, 1266, 1270, 1269, + 1274, 1275, 1277, 1284, 1282, 1286, 1288, 1294, 1290, 1280, + 1297, 1295, 1298, 1300, 1303, 1305, 1307, 1306, 1310, 1309, - 1317, 1320, 1324, 1325, 1326, 1327, 1329, 1336, 1330, 1333, - 1344, 1337, 4490, 1340, 1342, 1347, 1352, 1345, 1353, 1346, - 1355, 1358, 1360, 1362, 4490, 1364, 1369, 1370, 1371, 1372, - 1363, 1375, 1378, 1377, 1381, 1382, 1380, 1379, 1389, 1390, - 1396, 1395, 1387, 1392, 1409, 1411, 1408, 1410, 1413, 1414, - 1415, 1416, 1424, 1420, 1421, 1422, 1432, 1427, 1431, 1428, - 1438, 1434, 1440, 1441, 4490, 1442, 1443, 4490, 1445, 1448, - 1470, 1450, 1452, 1453, 1455, 1454, 1459, 1462, 1463, 1484, - 1471, 1472, 1482, 1487, 1488, 1489, 1490, 1494, 1495, 1504, - 1500, 1510, 1506, 1509, 1513, 1515, 1516, 1519, 1517, 1523, + 1312, 1313, 1325, 1329, 1327, 1326, 1328, 1331, 1316, 1333, + 1335, 1337, 1341, 1343, 1345, 1350, 1346, 4542, 1348, 1349, + 1351, 1355, 1347, 1362, 1359, 1364, 1366, 1367, 1368, 4542, + 1370, 1377, 1369, 1373, 1380, 1382, 1381, 1384, 1385, 1388, + 1387, 1389, 1386, 1397, 1393, 1400, 1399, 1396, 1410, 1417, + 1412, 1419, 1414, 1415, 1421, 1420, 1422, 1426, 1429, 1428, + 1430, 1436, 1444, 1435, 1440, 1442, 1446, 1437, 1447, 1450, + 4542, 1453, 1454, 4542, 1456, 1457, 1479, 1458, 1461, 1466, + 1462, 1463, 1470, 1475, 1472, 1497, 1489, 1494, 1492, 1499, + 1501, 1502, 1505, 1508, 1509, 1517, 1474, 1518, 1519, 1471, - 1524, 1526, 1527, 1534, 1535, 4490, 1536, 1461, 1537, 1540, - 1547, 1543, 1542, 1549, 1550, 1544, 1557, 1554, 1552, 1562, - 1555, 1564, 1565, 1568, 1570, 1572, 4490, 1569, 1573, 1576, - 1574, 1581, 1582, 1588, 1590, 1595, 1597, 1598, 4490, 1584, - 1607, 1604, 1609, 1602, 1603, 1610, 1619, 1614, 1615, 1617, - 1621, 1622, 1620, 1624, 1628, 1630, 4490, 1631, 1632, 1635, - 1640, 1643, 1644, 1646, 1645, 1647, 1650, 1651, 1659, 1655, - 1656, 4490, 1654, 1665, 1658, 1667, 1677, 1680, 1673, 1676, - 1683, 1675, 1678, 1684, 1689, 1686, 1690, 1687, 1691, 4490, - 1693, 244, 1695, 1698, 1697, 1707, 1708, 1700, 1718, 1710, + 1523, 1510, 1521, 1529, 1531, 1532, 1534, 1493, 1535, 1542, + 1539, 4542, 1550, 1546, 1537, 1547, 1557, 1553, 1552, 1555, + 1559, 1561, 1569, 1565, 1562, 1567, 1566, 1570, 1573, 1576, + 1578, 1588, 4542, 1575, 1579, 1583, 1580, 1591, 1592, 1594, + 1600, 1602, 1610, 1605, 4542, 1590, 1613, 1615, 1608, 1614, + 1617, 1620, 1627, 1622, 1623, 1624, 1625, 1629, 1631, 1633, + 1636, 1632, 4542, 1640, 1639, 1643, 1651, 1648, 1652, 1653, + 1654, 1658, 1659, 1660, 1667, 1663, 1664, 4542, 1662, 1671, + 1665, 1666, 1675, 1688, 1689, 1678, 1681, 1691, 1685, 1692, + 1695, 1698, 1696, 1699, 1697, 1700, 4542, 1701, 143, 1703, - 1711, 1714, 1719, 1721, 1703, 1723, 1726, 1727, 1732, 1729, - 1733, 1734, 1735, 1737, 4490, 1738, 1744, 1745, 1747, 1754, - 1748, 1750, 1758, 1760, 1762, 1764, 4490, 1769, 1770, 1771, - 1772, 1765, 1773, 1775, 1777, 1776, 1778, 1785, 1786, 1781, - 1790, 1791, 1793, 4490, 1800, 1798, 1797, 1801, 1804, 1806, - 1814, 1807, 1815, 1817, 1819, 1831, 1822, 1816, 1833, 1823, - 1832, 1834, 1841, 1842, 1848, 1838, 1851, 1852, 1845, 1853, - 1861, 1862, 1863, 1865, 1864, 1866, 1872, 1874, 4490, 1875, - 1876, 1877, 1881, 1889, 1886, 1887, 1892, 1893, 1894, 1897, - 1898, 1904, 1899, 1903, 1905, 1907, 1909, 1915, 4490, 1916, + 1709, 1702, 1711, 1718, 1710, 1719, 1723, 1713, 1726, 1729, + 1730, 1731, 1732, 1733, 1735, 1737, 1738, 1741, 1743, 1742, + 1751, 4542, 1746, 1753, 1757, 1755, 1760, 1761, 1765, 1766, + 1768, 1772, 1773, 4542, 1776, 1778, 1780, 1781, 1783, 1784, + 1786, 1785, 1788, 1790, 1791, 1794, 1795, 1798, 1801, 1803, + 4542, 1814, 1805, 1815, 1804, 1817, 1813, 1832, 1816, 1806, + 1827, 1828, 1841, 1830, 1833, 1844, 1836, 1834, 1847, 1848, + 1852, 1858, 1845, 1861, 1862, 1855, 1863, 1872, 1874, 1871, + 1873, 1875, 1878, 1882, 1883, 4542, 1886, 1885, 1887, 1888, + 1902, 1892, 1898, 1899, 1903, 1908, 1904, 1910, 1912, 1913, - 1918, 1920, 1922, 1925, 1927, 1929, 1930, 1932, 1933, 1935, - 1936, 1937, 1946, 1938, 1943, 1941, 1950, 4490, 1958, 1960, - 1957, 1961, 1959, 1964, 1965, 1967, 1969, 1970, 1971, 1978, - 1973, 1975, 1974, 1977, 1979, 1980, 1982, 1984, 1985, 1996, - 1999, 1988, 2000, 4490, 2004, 2013, 2006, 2008, 2010, 2014, - 2017, 2018, 2019, 2027, 2026, 2028, 2031, 2034, 2035, 2036, - 2037, 2038, 4490, 2040, 2043, 2045, 2042, 2048, 2051, 2052, - 2046, 2063, 2049, 2069, 2057, 2070, 2071, 2073, 2076, 2059, - 2078, 2087, 2090, 2085, 2091, 4490, 2094, 2095, 2089, 2096, - 2097, 2100, 2101, 2102, 2104, 2105, 2107, 2106, 2109, 2122, + 1914, 1915, 1917, 1919, 1926, 4542, 1927, 1923, 1929, 1933, + 1935, 1937, 1938, 1940, 1942, 1944, 1945, 1946, 1947, 1951, + 1957, 1949, 1953, 1962, 1960, 4542, 1971, 1972, 1963, 1976, + 1974, 1975, 1977, 1979, 1980, 1981, 1982, 1990, 1989, 1986, + 1985, 1993, 1992, 1995, 1991, 1987, 1998, 1999, 2014, 2002, + 2015, 4542, 2008, 2023, 2019, 2018, 2021, 2024, 2029, 2030, + 2031, 2044, 2036, 2041, 2043, 2033, 2046, 2048, 2047, 2049, + 4542, 2050, 2055, 2051, 2056, 2057, 2060, 2061, 2058, 2067, + 2074, 2078, 2066, 2079, 2085, 2080, 2087, 2082, 2089, 2096, + 2097, 2098, 2100, 4542, 2105, 2102, 2107, 2092, 2108, 2109, - 2131, 2117, 2110, 2119, 2123, 2132, 2118, 2127, 2133, 2140, - 2135, 2136, 2141, 2143, 2145, 2147, 2148, 2149, 2153, 2152, - 2158, 2161, 2165, 2167, 2170, 2171, 2172, 4490, 2173, 2176, - 2182, 2183, 2185, 2186, 2175, 2187, 2177, 2200, 2199, 4490, - 2196, 4490, 2201, 2202, 2210, 4490, 2208, 4490, 2212, 2209, - 4490, 2213, 2217, 2215, 2219, 2220, 2221, 2222, 2224, 2227, - 2228, 2232, 2229, 2235, 2236, 2238, 2242, 4490, 2250, 2241, - 2239, 2254, 2256, 2243, 2245, 2258, 2264, 2252, 2260, 2266, - 2274, 2270, 2279, 4490, 2275, 2277, 2278, 2280, 4490, 2281, - 2282, 2284, 2288, 2287, 2291, 2292, 2295, 2296, 2308, 2304, + 2111, 2112, 2114, 2115, 2120, 2117, 2119, 2127, 2136, 2128, + 2132, 2133, 2137, 2145, 2129, 2140, 2141, 2149, 2142, 2144, + 2146, 2150, 2153, 2154, 2157, 2170, 2173, 2162, 2178, 2179, + 2160, 2168, 2180, 2182, 2185, 4542, 2166, 2183, 2193, 2196, + 2190, 2198, 2188, 2197, 2200, 2209, 2206, 4542, 2207, 4542, + 2211, 2212, 2223, 4542, 2219, 4542, 2222, 2210, 4542, 2224, + 2228, 2230, 2214, 2231, 2233, 2235, 2234, 2237, 2238, 2241, + 2243, 2246, 2248, 2250, 2251, 2252, 4542, 2256, 2253, 2258, + 2262, 2260, 2264, 2266, 2267, 2269, 2273, 2275, 2278, 2285, + 2280, 2287, 4542, 2282, 2289, 2290, 2291, 4542, 2292, 2294, - 2310, 2300, 2312, 2299, 2318, 2319, 2322, 2320, 2325, 2327, - 2334, 2330, 2337, 2329, 2336, 2333, 2340, 2339, 2342, 2343, - 2346, 2350, 2349, 2353, 2354, 2351, 2355, 2356, 2358, 4490, - 2368, 2365, 2369, 2372, 2376, 2378, 2359, 2377, 2380, 2381, - 2386, 2388, 2382, 4490, 2384, 4490, 2387, 2402, 2406, 2407, - 2390, 2403, 2411, 2413, 2414, 2416, 2415, 2423, 2419, 2420, - 2421, 2426, 2429, 2430, 2435, 4490, 2431, 2432, 2436, 2438, - 2439, 2452, 2458, 2451, 2449, 2470, 4490, 2461, 2453, 2442, - 2468, 2472, 2480, 2475, 4490, 2445, 2482, 2466, 2483, 4490, - 4490, 2478, 2485, 2487, 2484, 2488, 2495, 2490, 2491, 4490, + 2298, 2301, 2302, 2303, 2304, 2308, 2307, 2312, 2328, 2321, + 2314, 2324, 2310, 2331, 2338, 2336, 2325, 2333, 2339, 2346, + 2342, 2350, 2341, 2348, 2355, 2351, 2345, 2349, 2357, 2358, + 2360, 2361, 2362, 2371, 2366, 2367, 2368, 2370, 4542, 2379, + 2376, 2380, 2383, 2388, 2381, 2389, 2390, 2392, 2394, 2393, + 2398, 2399, 4542, 2397, 4542, 2402, 2405, 2419, 2411, 2406, + 2416, 2420, 2422, 2423, 2426, 2424, 2434, 2430, 2432, 2437, + 2439, 2440, 2443, 2441, 4542, 2444, 2445, 2446, 2448, 2449, + 2451, 2460, 2462, 2455, 2478, 4542, 2476, 2465, 2467, 2485, + 2481, 2488, 2484, 4542, 2480, 2493, 2489, 2492, 4542, 4542, - 2499, 2494, 2501, 2503, 2510, 2511, 2504, 2496, 4490, 2512, - 2518, 2520, 2521, 2523, 2524, 2522, 2525, 2532, 2530, 2529, - 2531, 2539, 2540, 2549, 4490, 2546, 2544, 2555, 2550, 2301, - 2552, 2556, 2557, 2558, 2559, 2560, 2561, 2565, 2563, 2570, - 2566, 2567, 2584, 2577, 2574, 2581, 2585, 2588, 2589, 2591, - 2593, 2597, 2594, 2607, 2599, 4490, 2610, 2603, 2612, 2608, - 2613, 2618, 2619, 2628, 2611, 2615, 2626, 2637, 2627, 4490, - 2640, 2629, 2636, 2641, 2642, 2650, 2645, 2648, 2632, 2656, - 2649, 2658, 2651, 2660, 2661, 2664, 4490, 4490, 2665, 2666, - 2670, 2673, 2672, 2667, 2677, 2680, 2678, 2683, 4490, 2684, + 2491, 2496, 2494, 2497, 2498, 2499, 2509, 2505, 2506, 4542, + 2514, 2508, 2516, 2518, 2522, 2525, 2526, 2511, 4542, 2529, + 2532, 2519, 2536, 2537, 2538, 2539, 2540, 2547, 2542, 2545, + 2546, 2556, 2548, 2562, 4542, 2559, 2557, 2568, 2553, 2311, + 2569, 2570, 2572, 2573, 2571, 2574, 2575, 2578, 2577, 2579, + 2580, 2581, 2585, 2603, 2586, 2594, 2595, 2599, 2602, 2605, + 2606, 2609, 2610, 2617, 2616, 4542, 2618, 2620, 2629, 2621, + 2625, 2631, 2632, 2640, 2635, 2624, 2636, 2643, 2639, 4542, + 2651, 2641, 2658, 2642, 2652, 2663, 2661, 2662, 2664, 2666, + 2668, 2671, 2669, 2673, 2674, 2677, 4542, 4542, 2678, 2679, - 2691, 2686, 2690, 2698, 2700, 2696, 2702, 2701, 2693, 2705, - 2708, 2709, 2711, 2714, 2715, 2717, 2718, 4490, 2723, 2719, - 4490, 2725, 2726, 2721, 2728, 2736, 2739, 2746, 2731, 2733, - 2741, 2749, 2754, 2757, 2764, 2748, 2759, 2766, 4490, 2763, - 2765, 2767, 2762, 2776, 2768, 2778, 2773, 4490, 2777, 2781, - 2784, 2789, 2786, 2797, 2792, 2794, 2795, 2793, 4490, 2800, - 4490, 2804, 2796, 4490, 2803, 2809, 2811, 2813, 2812, 2814, - 2824, 2816, 2818, 2820, 2825, 2826, 2828, 2835, 2831, 4490, - 2839, 2832, 2834, 2837, 4490, 2842, 4490, 2847, 4490, 2849, - 2848, 2858, 2853, 2854, 2857, 2861, 2865, 4490, 2867, 2856, + 2681, 2683, 2684, 2688, 2686, 2692, 2690, 2699, 4542, 2696, + 2708, 2703, 2704, 2713, 2720, 2706, 2717, 2709, 2710, 2719, + 2721, 2724, 2725, 2726, 2728, 2731, 2735, 4542, 2732, 2734, + 4542, 2737, 2736, 2741, 2744, 2758, 2748, 2761, 2742, 2754, + 2745, 2772, 2770, 2777, 2773, 2780, 2762, 2775, 2784, 4542, + 2779, 2781, 2782, 2783, 2792, 2789, 2796, 2793, 4542, 2795, + 2799, 2802, 2804, 2797, 2812, 2807, 2809, 2810, 2815, 4542, + 2818, 4542, 2819, 2820, 4542, 2821, 2825, 2827, 2829, 2830, + 2831, 2840, 2828, 2834, 2841, 2842, 2845, 2846, 2850, 2852, + 4542, 2853, 2855, 2847, 2858, 4542, 2863, 4542, 2860, 4542, - 2868, 2866, 2871, 2872, 2877, 2878, 2879, 2880, 2881, 4490, - 2882, 2885, 2894, 2883, 2886, 2888, 2898, 2896, 4490, 2899, - 2907, 2908, 2910, 2911, 4490, 2912, 2917, 4490, 2913, 2923, - 2914, 2920, 2928, 2924, 2931, 2932, 2933, 2941, 2934, 2938, - 2937, 4490, 2942, 2943, 2947, 2948, 2944, 2952, 2960, 2958, - 2962, 2955, 2965, 2968, 2970, 2971, 2956, 2975, 2976, 2978, - 4490, 2981, 2983, 4490, 2980, 2984, 2987, 2991, 4490, 2989, - 4490, 2992, 2994, 2996, 2997, 3000, 3001, 3003, 3011, 3012, - 3013, 3014, 3023, 3020, 3015, 4490, 4490, 3025, 3031, 3029, - 3034, 3036, 3039, 3026, 3047, 3040, 3043, 3048, 4490, 3050, + 2857, 2864, 2874, 2869, 2870, 2875, 2880, 2881, 4542, 2883, + 2882, 2884, 2887, 2888, 2891, 2892, 2893, 2894, 2895, 2900, + 4542, 2897, 2899, 2908, 2898, 2901, 2912, 2913, 2914, 4542, + 2922, 2923, 2924, 2926, 2928, 4542, 2929, 2930, 4542, 2933, + 2937, 2939, 2940, 2941, 2944, 2946, 2948, 2950, 2958, 2954, + 2955, 2953, 4542, 2956, 2957, 2963, 2972, 2964, 2960, 2982, + 2969, 2981, 2977, 2984, 2986, 2988, 2990, 2978, 2994, 2995, + 2991, 4542, 2996, 3002, 4542, 2998, 3005, 3006, 3010, 4542, + 3008, 4542, 3009, 3012, 3013, 3016, 3020, 3018, 3021, 3023, + 3019, 3032, 3034, 3031, 3043, 3040, 3033, 4542, 4542, 3046, - 3049, 3052, 4490, 3055, 3058, 3059, 3060, 3061, 3065, 3062, - 3068, 3070, 3064, 3071, 3072, 3073, 4490, 3077, 3081, 3084, - 3086, 3085, 3087, 3088, 4490, 3095, 3090, 3091, 3100, 3093, - 3101, 3102, 3112, 3116, 3117, 3118, 3119, 3121, 3123, 3124, - 4490, 3134, 3125, 3126, 3128, 3136, 3138, 3141, 3143, 3144, - 3148, 3150, 3151, 3152, 4490, 3153, 3155, 3156, 3164, 3159, - 3161, 3166, 3172, 3179, 3157, 3168, 3170, 3181, 4490, 3174, - 3182, 3184, 3186, 3192, 3185, 3196, 3187, 3193, 3197, 3201, - 3203, 3206, 4490, 3198, 3209, 3211, 3213, 3216, 3215, 3217, - 3218, 3219, 3221, 3225, 3224, 3235, 3227, 4490, 3232, 4490, + 3049, 3047, 3052, 3054, 3057, 3058, 3065, 3061, 3063, 3067, + 4542, 3070, 3060, 3073, 4542, 3068, 3078, 3071, 3081, 3079, + 3082, 3085, 3087, 3088, 3089, 3090, 3091, 3097, 4542, 3099, + 3098, 3102, 3103, 3106, 3107, 3108, 4542, 3105, 3110, 3111, + 3112, 3123, 3115, 3130, 3133, 3135, 3124, 3136, 3140, 3138, + 3143, 3146, 4542, 3148, 3144, 3145, 3154, 3156, 3158, 3152, + 3160, 3161, 3163, 3168, 3169, 3170, 4542, 3172, 3174, 3175, + 3181, 3178, 3176, 3184, 3185, 3191, 3188, 3193, 3192, 3198, + 4542, 3195, 3199, 3202, 3200, 3206, 3209, 3213, 3203, 3214, + 3210, 3218, 3216, 3224, 4542, 3220, 3229, 3227, 3230, 3233, - 3239, 3240, 3249, 3244, 3242, 4490, 3246, 3247, 4490, 3251, - 3250, 3254, 3255, 4490, 3257, 3265, 3258, 3259, 3273, 4490, - 3275, 3276, 3283, 3285, 3287, 3268, 3288, 3280, 3284, 3290, - 3293, 4490, 3291, 3296, 3301, 3297, 3303, 3304, 3305, 3306, - 3307, 3308, 3317, 3312, 3314, 4490, 3315, 3316, 3326, 3322, - 3333, 4490, 4490, 3325, 3328, 3334, 3336, 3340, 4490, 3338, - 3349, 3344, 3346, 3348, 4490, 4490, 3351, 4490, 3347, 4490, - 4490, 3353, 3354, 3361, 4490, 3364, 4490, 3372, 3367, 3355, - 3352, 3370, 4490, 3369, 3373, 3377, 4490, 3378, 3386, 3379, - 3381, 4490, 3383, 4490, 3389, 3392, 3393, 3399, 3394, 3395, + 3235, 3237, 3231, 3238, 3239, 3241, 3244, 3245, 3255, 3256, + 4542, 3251, 4542, 3257, 3261, 3264, 3267, 3263, 4542, 3265, + 3269, 4542, 3270, 3272, 3274, 3275, 4542, 3281, 3286, 3273, + 3290, 3295, 4542, 3297, 3298, 3305, 3306, 3308, 3301, 3309, + 3292, 3311, 3312, 3313, 4542, 3316, 3318, 3323, 3319, 3317, + 3326, 3327, 3328, 3329, 3330, 3339, 3334, 3336, 4542, 3342, + 3338, 3350, 3345, 3277, 4542, 4542, 3347, 3351, 3356, 3348, + 3362, 4542, 3360, 3371, 3355, 3369, 3357, 4542, 4542, 3373, + 4542, 3370, 4542, 4542, 3375, 3376, 3378, 4542, 3383, 4542, + 3385, 3386, 3384, 3389, 3390, 4542, 3391, 3392, 3394, 4542, - 3400, 3403, 3407, 3411, 3404, 3412, 3413, 3415, 3417, 3418, - 3419, 3421, 3420, 3423, 3424, 3428, 3432, 3434, 3435, 3436, - 3437, 3439, 3442, 3441, 3443, 3446, 3444, 3451, 3457, 3465, - 3468, 3469, 4490, 4490, 3453, 3461, 3455, 4490, 3473, 3476, - 3475, 3478, 3477, 3479, 3482, 3480, 4490, 3484, 3487, 3485, - 3488, 3489, 3490, 3491, 3501, 3492, 3506, 3513, 3516, 3502, - 3507, 3514, 3518, 3515, 3519, 3521, 3525, 3529, 3530, 3537, - 4490, 3524, 4490, 3531, 3534, 3538, 4490, 4490, 3541, 3542, - 3547, 3544, 3548, 3550, 3551, 4490, 3552, 3556, 3563, 3558, - 4490, 3565, 4490, 3569, 3553, 3574, 3570, 3577, 4490, 4490, + 3396, 3403, 3398, 3399, 4542, 3402, 4542, 3406, 3409, 3412, + 3413, 3418, 3419, 3420, 3422, 3424, 3427, 3428, 3429, 3430, + 3434, 3436, 3435, 3437, 3438, 3439, 3441, 3451, 3443, 3445, + 3453, 3454, 3455, 3456, 3459, 3457, 3462, 3463, 3464, 3465, + 3469, 3472, 3476, 3475, 3489, 3490, 4542, 4542, 3478, 3482, + 3484, 4542, 3486, 3492, 3494, 3495, 3498, 3497, 3500, 3501, + 4542, 3505, 3499, 3509, 3512, 3511, 3513, 3514, 3520, 3521, + 3523, 3525, 3534, 3529, 3530, 3533, 3537, 3535, 3538, 3539, + 3541, 3549, 3551, 3557, 4542, 3546, 4542, 3550, 3554, 3560, + 4542, 4542, 3561, 3563, 3568, 3562, 3564, 3570, 3571, 4542, - 4490, 3578, 3580, 3581, 3582, 3583, 3584, 3585, 3586, 3587, - 4490, 3589, 3592, 3596, 3593, 3600, 3607, 3603, 3609, 3617, - 3613, 3615, 3612, 3619, 3621, 3623, 4490, 4490, 3625, 3632, - 3628, 3629, 3636, 3635, 3637, 3640, 3641, 3643, 3645, 3646, - 4490, 3644, 3648, 3652, 3654, 3655, 3657, 3659, 3662, 4490, - 4490, 3661, 3663, 3665, 3669, 3672, 3673, 3674, 3676, 3677, - 4490, 3678, 4490, 3679, 3681, 3692, 3688, 3690, 3695, 4490, - 3694, 3697, 4490, 3701, 3702, 3704, 4490, 3706, 4490, 4490, - 3709, 4490, 3711, 4490, 3712, 3713, 3718, 3720, 3722, 3724, - 3727, 3729, 3715, 3730, 3740, 3736, 3737, 4490, 4490, 3748, + 3572, 3576, 3584, 3573, 4542, 3589, 4542, 3591, 3578, 3593, + 3594, 3596, 4542, 4542, 4542, 3600, 3585, 3598, 3603, 3604, + 3602, 3605, 3606, 3608, 3613, 4542, 3615, 3617, 3618, 3619, + 3625, 3629, 3626, 3631, 3638, 3635, 3641, 3637, 3639, 3646, + 3648, 4542, 4542, 3643, 3655, 3653, 3657, 3665, 3660, 3661, + 3663, 3667, 3668, 3669, 3671, 4542, 3670, 3675, 3677, 3678, + 3679, 3681, 3650, 3684, 4542, 4542, 3685, 3686, 3689, 3697, + 3692, 3694, 3687, 3699, 3700, 4542, 3701, 4542, 3705, 3709, + 3718, 3715, 3720, 3717, 4542, 3721, 3710, 4542, 3727, 3724, + 3726, 4542, 3732, 4542, 4542, 3735, 4542, 3729, 4542, 3736, - 3738, 3739, 3749, 3746, 3750, 3752, 4490, 4490, 3753, 3756, - 4490, 3755, 3757, 3764, 3762, 3765, 3766, 3763, 3769, 3770, - 3776, 3772, 3773, 3778, 3787, 3785, 3790, 3792, 3793, 3794, - 3796, 3797, 4490, 3799, 3802, 3800, 4490, 3807, 3804, 3809, - 3810, 3813, 4490, 3814, 3821, 3823, 3824, 3825, 3835, 3826, - 3828, 4490, 3831, 3836, 3838, 4490, 3841, 4490, 3842, 4490, - 4490, 3843, 3846, 3844, 4490, 3851, 3857, 4490, 3860, 3855, - 3849, 3852, 3862, 4490, 3874, 3865, 3873, 3863, 3875, 3877, - 3876, 3884, 3879, 3886, 4490, 3880, 3883, 3888, 3889, 3891, - 3892, 3890, 3893, 3897, 3903, 3900, 3910, 3911, 4490, 3914, + 3739, 3743, 3744, 3746, 3750, 3753, 3748, 3755, 3757, 3758, + 3765, 3761, 3762, 4542, 4542, 3770, 3767, 3768, 3777, 3773, + 3776, 3779, 4542, 4542, 3781, 3782, 4542, 3783, 3784, 3788, + 3789, 3791, 3792, 3793, 3796, 3797, 3802, 3799, 3800, 3803, + 3813, 3811, 3815, 3817, 3819, 3821, 3822, 3823, 4542, 3825, + 3826, 3828, 4542, 3832, 3833, 3835, 3836, 3838, 4542, 3839, + 3849, 3850, 3844, 3851, 3861, 3852, 3858, 4542, 3863, 3859, + 3864, 4542, 3856, 4542, 3870, 4542, 3869, 4542, 3872, 3873, + 3871, 4542, 3878, 3884, 4542, 3887, 3889, 3875, 3891, 3892, + 4542, 3899, 3896, 3903, 3894, 3879, 3904, 3905, 3913, 3906, - 3916, 4490, 3907, 4490, 3918, 3919, 3920, 4490, 3922, 3923, - 3924, 3927, 4490, 3931, 3934, 4490, 3929, 3937, 3939, 3933, - 3940, 3941, 3944, 3950, 3952, 3956, 4490, 3954, 3945, 3967, - 3963, 3968, 3958, 4490, 3969, 3970, 3960, 3978, 3973, 3981, - 4490, 3983, 3977, 4490, 3985, 3987, 3986, 3988, 3995, 3998, - 4002, 3999, 4490, 4006, 4490, 4490, 3989, 4490, 4003, 4009, - 4490, 4012, 4007, 4013, 4014, 4016, 4017, 4490, 4490, 4018, - 4019, 4029, 4026, 4490, 4020, 4024, 4030, 4034, 4036, 4490, - 4037, 4038, 4039, 4043, 4041, 4047, 4048, 4049, 4490, 4490, - 4050, 4490, 4052, 4056, 4062, 4490, 4490, 4490, 4068, 4490, + 3915, 4542, 3908, 3911, 3917, 3919, 3918, 3920, 3921, 3924, + 3925, 3930, 3928, 3939, 3934, 4542, 3941, 3945, 4542, 3936, + 4542, 3947, 3942, 3950, 4542, 3949, 3951, 3952, 3959, 4542, + 3960, 3956, 4542, 3962, 3964, 3966, 3967, 3968, 3972, 3969, + 3973, 3980, 3974, 3982, 4542, 3985, 3986, 3995, 3999, 3987, + 3992, 4542, 3996, 4000, 3994, 4008, 4003, 4012, 4542, 4015, + 4004, 4542, 4017, 4019, 4018, 4022, 4026, 4029, 4031, 4033, + 4542, 4035, 4542, 4542, 4036, 4542, 4037, 4039, 4542, 4042, + 4043, 4044, 4045, 4047, 4048, 4542, 4542, 4049, 4056, 4052, + 4062, 4065, 4542, 4051, 4058, 4067, 4068, 4069, 4542, 4066, - 4072, 4076, 4075, 4490, 4078, 4063, 4080, 4490, 4083, 4053, - 4084, 4490, 4085, 4086, 4087, 4090, 4092, 4093, 4096, 4098, - 4106, 4102, 4104, 4105, 4107, 4109, 4110, 4116, 4490, 4490, - 4118, 4490, 4490, 4121, 4123, 4125, 4490, 4128, 4131, 4490, - 4133, 4134, 4135, 4138, 4140, 4490, 4490, 4141, 4142, 4490, - 4144, 4149, 4148, 4150, 4151, 4154, 4152, 4490, 4490, 4490, - 4490, 4490, 4157, 4490, 4490, 4161, 4156, 4163, 4490, 4158, - 4164, 4166, 4169, 4171, 4173, 4178, 4174, 4180, 4183, 4185, - 4179, 4187, 4192, 4197, 4198, 4200, 4202, 4189, 4204, 4212, - 4208, 4210, 4490, 4211, 4490, 4213, 4490, 4215, 4216, 4224, + 4073, 4076, 4077, 4081, 4082, 4083, 4079, 4542, 4542, 4085, + 4542, 4087, 4089, 4090, 4542, 4542, 4542, 4092, 4542, 4102, + 4109, 4108, 4542, 4111, 4098, 4103, 4542, 4114, 4115, 4119, + 4118, 4542, 4120, 4121, 4124, 4127, 4129, 4131, 4132, 4135, + 4142, 4139, 4140, 4141, 4143, 4144, 4147, 4151, 4542, 4542, + 4153, 4542, 4542, 4157, 4159, 4161, 4542, 4145, 4168, 4542, + 4170, 4163, 4165, 4171, 4173, 4175, 4542, 4542, 4176, 4179, + 4542, 4180, 4187, 4184, 4185, 4186, 4189, 4192, 4542, 4542, + 4542, 4542, 4542, 4193, 4542, 4542, 4191, 4195, 4197, 4201, + 4542, 4200, 4202, 4203, 4206, 4209, 4211, 4210, 4212, 4216, - 4227, 4220, 4217, 4225, 4490, 4228, 4229, 4232, 4236, 4238, - 4239, 4240, 4241, 4243, 4245, 4250, 4253, 4256, 4258, 4260, - 4261, 4254, 4268, 4270, 4490, 4267, 4271, 4272, 4274, 4281, - 4276, 4277, 4490, 4280, 4279, 4282, 4283, 4285, 4287, 4294, - 4296, 4303, 4297, 4305, 4307, 4309, 4310, 4300, 4313, 4111, - 4312, 4320, 4321, 4315, 4324, 4323, 4326, 4330, 4490, 4331, - 4332, 4333, 4335, 4338, 4490, 4341, 4343, 4344, 4345, 4348, - 4350, 4490, 4356, 4359, 4353, 4490, 4361, 4490, 4490, 4364, - 4351, 4365, 4368, 4372, 4490, 4490, 4490, 4398, 4405, 4412, - 4419, 4426, 70, 4433, 4440, 4447, 4454, 4461, 4468, 4475, + 4218, 4220, 4222, 4224, 4236, 4239, 4242, 4227, 4243, 4244, + 4225, 4232, 4251, 4246, 4253, 4254, 4542, 4255, 4542, 4256, + 4542, 4257, 4258, 4267, 4268, 4264, 4259, 4263, 4542, 4266, + 4269, 4271, 4276, 4279, 4280, 4284, 4285, 4287, 4289, 4288, + 4290, 4296, 4305, 4300, 4302, 4303, 4310, 4311, 4318, 4314, + 4317, 4542, 4313, 4320, 4321, 4322, 4329, 4324, 4325, 4333, + 4542, 4335, 4326, 4336, 4337, 4339, 4345, 4348, 4349, 4328, + 4350, 4342, 4357, 4359, 4363, 4364, 4365, 4367, 4369, 4007, + 4373, 4370, 4375, 4376, 4378, 4379, 4542, 4381, 4385, 4542, + 4386, 4387, 4388, 4389, 4393, 4542, 4397, 4390, 4399, 4400, - 4482 + 4403, 4405, 4542, 4411, 4414, 4415, 4542, 4416, 4542, 4542, + 4419, 4406, 4417, 4427, 4429, 4542, 4542, 4542, 4450, 4457, + 4464, 4471, 4478, 70, 4485, 4492, 4499, 4506, 4513, 4520, + 4527, 4534 } ; -static yyconst flex_int16_t yy_def[2302] = +static yyconst flex_int16_t yy_def[2333] = { 0, - 2287, 1, 2288, 2288, 2289, 2289, 2290, 2290, 2291, 2291, - 2292, 2292, 2287, 2293, 2287, 2287, 2287, 2287, 2294, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2295, 2287, 2287, 2287, 2295, 2296, 2287, 2287, 2287, - 2296, 2297, 2287, 2287, 2287, 2287, 2297, 2298, 2287, 2287, - 2287, 2298, 2299, 2287, 2300, 2287, 2299, 2299, 2293, 2293, - 2287, 2301, 2294, 2301, 2294, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, + 2318, 1, 2319, 2319, 2320, 2320, 2321, 2321, 2322, 2322, + 2323, 2323, 2318, 2324, 2318, 2318, 2318, 2318, 2325, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2326, 2318, 2318, 2318, 2326, 2327, 2318, 2318, 2318, + 2327, 2328, 2318, 2318, 2318, 2318, 2328, 2329, 2318, 2318, + 2318, 2329, 2330, 2318, 2331, 2318, 2330, 2330, 2324, 2324, + 2318, 2332, 2325, 2332, 2325, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2295, 2295, 2296, 2296, 2297, 2297, 2287, 2298, - 2298, 2299, 2299, 2300, 2300, 2299, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2326, 2326, 2327, 2327, 2328, 2328, 2318, + 2329, 2329, 2330, 2330, 2331, 2331, 2330, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2299, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2330, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2299, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, - 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2330, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, + 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2287, 2299, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, + 2330, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2299, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2287, 2287, 2293, - 2287, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2330, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2318, 2318, 2324, 2318, 2318, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2299, 2293, 2293, 2293, 2287, 2293, 2293, 2287, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2330, 2324, 2324, 2324, + 2318, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, - 2293, 2299, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2330, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, - 2293, 2287, 2293, 2293, 2293, 2287, 2293, 2287, 2293, 2293, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2318, + 2324, 2324, 2324, 2318, 2324, 2318, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2318, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2287, 2293, 2287, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2287, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2318, 2324, 2318, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2318, 2318, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2287, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2318, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, - 2287, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, - 2293, 2293, 2293, 2293, 2287, 2293, 2287, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, + 2324, 2318, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2318, 2324, 2318, 2324, 2318, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2287, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2287, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2287, 2293, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2287, 2287, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2318, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2318, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2318, 2324, - 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2287, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2287, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, - 2293, 2287, 2287, 2293, 2293, 2293, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2287, 2287, 2293, 2287, 2293, 2287, - 2287, 2293, 2293, 2293, 2287, 2293, 2287, 2293, 2293, 2293, - 2293, 2293, 2287, 2293, 2293, 2293, 2287, 2293, 2293, 2293, - 2293, 2287, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2318, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, + 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2318, 2318, 2324, 2324, 2324, 2324, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2318, 2318, 2324, + 2318, 2324, 2318, 2318, 2324, 2324, 2324, 2318, 2324, 2318, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2318, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2287, 2287, 2293, 2293, 2293, 2287, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2287, 2293, 2287, 2293, 2293, 2293, 2287, 2287, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, - 2287, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2287, 2287, + 2324, 2324, 2324, 2324, 2318, 2324, 2318, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2318, 2324, 2324, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2318, 2324, 2318, 2324, 2324, 2324, + 2318, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2287, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2287, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2287, - 2293, 2293, 2287, 2293, 2293, 2293, 2287, 2293, 2287, 2287, - 2293, 2287, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2287, 2293, + 2324, 2324, 2324, 2324, 2318, 2324, 2318, 2324, 2324, 2324, + 2324, 2324, 2318, 2318, 2318, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2318, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2318, 2318, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2318, 2324, 2324, + 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2318, 2324, 2324, + 2324, 2318, 2324, 2318, 2318, 2324, 2318, 2324, 2318, 2324, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2287, 2293, 2293, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2287, 2293, 2293, 2293, 2287, 2293, 2293, 2293, - 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2287, 2293, 2293, 2293, 2287, 2293, 2287, 2293, 2287, - 2287, 2293, 2293, 2293, 2287, 2293, 2293, 2287, 2293, 2293, - 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2318, 2318, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2318, 2318, 2324, 2324, 2318, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, + 2324, 2318, 2324, 2318, 2324, 2318, 2324, 2318, 2324, 2324, + 2324, 2318, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2287, 2293, 2287, 2293, 2293, 2293, 2287, 2293, 2293, - 2293, 2293, 2287, 2293, 2293, 2287, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, - 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, - 2287, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2287, 2293, 2287, 2287, 2293, 2287, 2293, 2293, - 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2287, 2293, - 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2287, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2287, - 2293, 2287, 2293, 2293, 2293, 2287, 2287, 2287, 2293, 2287, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2318, 2324, + 2318, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2318, + 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2318, 2318, 2324, 2318, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2318, 2318, 2324, 2324, 2324, + 2324, 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2318, 2324, - 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2287, 2293, 2293, - 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2287, - 2293, 2287, 2287, 2293, 2293, 2293, 2287, 2293, 2293, 2287, - 2293, 2293, 2293, 2293, 2293, 2287, 2287, 2293, 2293, 2287, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2287, 2287, - 2287, 2287, 2293, 2287, 2287, 2293, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2287, 2293, 2287, 2293, 2287, 2293, 2293, 2293, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2318, 2324, + 2318, 2324, 2324, 2324, 2318, 2318, 2318, 2324, 2318, 2324, + 2324, 2324, 2318, 2324, 2324, 2324, 2318, 2324, 2324, 2324, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2318, + 2324, 2318, 2318, 2324, 2324, 2324, 2318, 2324, 2324, 2318, + 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2318, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2318, + 2318, 2318, 2318, 2324, 2318, 2318, 2324, 2324, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, - 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2293, 2287, 2293, - 2293, 2293, 2293, 2293, 2287, 2293, 2293, 2293, 2293, 2293, - 2293, 2287, 2293, 2293, 2293, 2287, 2293, 2287, 2287, 2293, - 2293, 2293, 2293, 2293, 2287, 2287, 0, 2287, 2287, 2287, - 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2318, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2318, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, 2324, + 2324, 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2318, + 2324, 2324, 2324, 2324, 2324, 2318, 2324, 2324, 2324, 2324, - 2287 + 2324, 2324, 2318, 2324, 2324, 2324, 2318, 2324, 2318, 2318, + 2324, 2324, 2324, 2324, 2324, 2318, 2318, 0, 2318, 2318, + 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, + 2318, 2318 } ; -static yyconst flex_uint16_t yy_nxt[4531] = +static yyconst flex_uint16_t yy_nxt[4583] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 14, 18, 20, 21, 22, 23, 24, 25, 26, @@ -1194,498 +1204,504 @@ static yyconst flex_uint16_t yy_nxt[4531] = 53, 54, 55, 56, 69, 18, 53, 54, 55, 56, 69, 18, 57, 59, 60, 61, 70, 79, 57, 59, 60, 61, 71, 70, 62, 70, 72, 89, 76, 77, - 62, 15, 16, 17, 64, 65, 66, 74, 135, 74, + 62, 15, 16, 17, 64, 65, 66, 74, 136, 74, - 74, 135, 74, 67, 70, 91, 78, 90, 74, 75, + 74, 136, 74, 67, 70, 91, 78, 90, 74, 75, 70, 70, 68, 15, 16, 17, 64, 65, 66, 92, 70, 80, 70, 93, 70, 67, 99, 70, 81, 84, - 149, 94, 82, 85, 68, 83, 86, 70, 87, 88, + 150, 94, 82, 85, 68, 83, 86, 70, 87, 88, 70, 95, 101, 70, 96, 100, 70, 102, 71, 70, - 106, 97, 72, 98, 107, 103, 70, 70, 70, 70, - 70, 104, 110, 186, 109, 105, 111, 133, 133, 166, - 108, 70, 112, 115, 128, 113, 70, 116, 70, 129, - 154, 117, 114, 120, 70, 125, 121, 126, 140, 140, - 70, 118, 297, 122, 119, 70, 130, 123, 124, 70, + 106, 97, 72, 98, 107, 103, 144, 70, 70, 70, + 144, 104, 110, 171, 109, 105, 111, 134, 134, 70, + 108, 70, 112, 115, 147, 113, 70, 116, 70, 141, + 141, 117, 114, 120, 70, 125, 121, 126, 162, 154, + 70, 118, 70, 122, 119, 218, 128, 123, 124, 70, - 131, 143, 127, 137, 132, 137, 137, 74, 137, 74, - 74, 142, 74, 142, 142, 146, 142, 153, 69, 145, - 69, 69, 74, 69, 74, 74, 70, 74, 70, 69, - 148, 147, 70, 74, 75, 150, 70, 70, 70, 151, - 70, 70, 70, 162, 156, 70, 70, 70, 70, 70, - 157, 155, 152, 70, 188, 70, 70, 143, 158, 159, - 164, 161, 163, 160, 70, 165, 167, 70, 169, 171, - 70, 168, 170, 172, 176, 178, 173, 70, 70, 70, - 70, 181, 179, 70, 70, 182, 70, 70, 185, 174, - 175, 70, 70, 70, 70, 70, 70, 184, 192, 177, + 131, 70, 127, 70, 132, 149, 129, 138, 133, 138, + 138, 130, 138, 74, 167, 74, 74, 143, 74, 143, + 143, 69, 143, 69, 69, 146, 69, 70, 74, 70, + 74, 74, 69, 74, 70, 70, 155, 148, 151, 74, + 75, 70, 70, 156, 152, 70, 70, 163, 157, 70, + 70, 70, 70, 70, 158, 70, 70, 153, 70, 70, + 170, 177, 209, 159, 160, 165, 164, 70, 161, 166, + 168, 70, 172, 169, 173, 70, 70, 174, 179, 182, + 180, 70, 70, 183, 70, 70, 178, 70, 186, 70, + 175, 176, 187, 70, 189, 70, 185, 70, 70, 70, - 187, 194, 180, 183, 189, 195, 190, 70, 197, 70, - 191, 193, 70, 70, 70, 196, 70, 207, 70, 203, - 70, 70, 70, 70, 70, 199, 70, 209, 201, 198, - 204, 200, 208, 202, 205, 206, 211, 212, 70, 70, - 214, 70, 70, 70, 216, 213, 70, 210, 219, 133, - 133, 135, 70, 217, 135, 140, 140, 221, 70, 277, - 218, 215, 137, 228, 137, 137, 142, 137, 142, 142, - 74, 142, 74, 74, 143, 74, 70, 220, 222, 70, - 70, 70, 145, 70, 70, 70, 70, 231, 225, 70, - 224, 223, 70, 70, 232, 230, 70, 233, 227, 70, + 181, 193, 188, 70, 70, 184, 190, 70, 195, 70, + 198, 70, 196, 70, 70, 191, 192, 194, 70, 70, + 70, 210, 204, 70, 197, 70, 200, 199, 208, 202, + 203, 207, 201, 205, 70, 70, 70, 206, 70, 213, + 216, 211, 70, 212, 70, 70, 134, 134, 136, 144, + 221, 136, 215, 224, 219, 138, 214, 138, 138, 70, + 138, 217, 220, 141, 141, 143, 70, 143, 143, 74, + 143, 74, 74, 144, 74, 70, 222, 70, 70, 70, + 223, 146, 70, 70, 70, 228, 70, 227, 230, 226, + 70, 70, 225, 233, 251, 232, 235, 229, 70, 70, - 226, 70, 234, 235, 246, 229, 236, 255, 70, 70, - 70, 237, 70, 244, 239, 245, 70, 70, 70, 240, - 70, 247, 249, 70, 241, 250, 70, 70, 238, 70, - 242, 243, 70, 70, 256, 70, 143, 251, 257, 253, - 248, 252, 254, 70, 258, 70, 70, 265, 70, 259, - 262, 264, 263, 70, 70, 266, 267, 270, 269, 272, - 70, 260, 70, 261, 70, 70, 70, 271, 268, 274, - 275, 273, 70, 70, 70, 70, 70, 70, 70, 276, - 278, 70, 281, 280, 70, 70, 282, 70, 70, 284, - 70, 70, 70, 279, 283, 288, 290, 70, 292, 70, + 234, 70, 236, 237, 231, 238, 70, 70, 70, 70, + 239, 70, 241, 70, 246, 70, 248, 242, 70, 70, + 249, 250, 243, 252, 70, 247, 70, 240, 244, 245, + 70, 70, 70, 253, 70, 260, 258, 259, 255, 254, + 261, 256, 70, 70, 70, 267, 70, 264, 257, 70, + 268, 70, 262, 269, 263, 271, 274, 70, 70, 70, + 266, 70, 70, 265, 70, 270, 272, 273, 276, 275, + 277, 70, 70, 70, 70, 70, 70, 70, 278, 280, + 283, 70, 70, 282, 70, 279, 70, 286, 70, 284, + 70, 70, 70, 70, 70, 281, 290, 285, 292, 294, - 285, 295, 70, 286, 70, 70, 70, 70, 287, 289, - 299, 70, 298, 70, 302, 303, 70, 293, 294, 291, - 305, 70, 296, 301, 70, 300, 70, 70, 143, 306, - 70, 312, 70, 70, 70, 70, 315, 70, 70, 304, - 309, 311, 70, 313, 70, 70, 307, 308, 317, 310, - 314, 70, 70, 318, 70, 70, 323, 321, 322, 316, - 320, 70, 324, 325, 70, 319, 70, 70, 327, 70, - 328, 70, 70, 70, 70, 331, 70, 334, 332, 70, - 336, 70, 326, 70, 70, 333, 70, 329, 330, 70, - 337, 70, 339, 335, 70, 70, 338, 141, 70, 70, + 70, 287, 297, 70, 288, 70, 70, 70, 70, 299, + 289, 291, 70, 300, 293, 301, 303, 70, 295, 296, + 306, 70, 70, 298, 70, 305, 70, 308, 70, 304, + 309, 302, 70, 70, 144, 70, 315, 70, 70, 70, + 70, 327, 70, 316, 307, 314, 312, 310, 70, 70, + 318, 70, 70, 317, 313, 311, 70, 321, 70, 70, + 70, 70, 70, 325, 319, 320, 322, 323, 70, 328, + 326, 70, 70, 70, 330, 70, 331, 70, 332, 329, + 334, 70, 70, 324, 337, 335, 333, 70, 339, 70, + 70, 336, 70, 340, 70, 70, 342, 70, 70, 70, - 344, 340, 341, 70, 70, 70, 345, 70, 343, 347, - 70, 349, 70, 70, 70, 342, 351, 353, 70, 70, - 70, 354, 346, 70, 70, 348, 352, 70, 70, 356, - 350, 355, 70, 360, 70, 361, 139, 357, 358, 364, - 359, 363, 70, 70, 365, 366, 367, 70, 70, 371, - 70, 368, 70, 362, 374, 70, 70, 70, 70, 372, - 369, 373, 375, 370, 70, 376, 70, 70, 70, 382, - 379, 377, 378, 70, 70, 70, 385, 70, 70, 384, - 70, 138, 70, 381, 70, 386, 380, 70, 70, 387, - 389, 391, 390, 383, 392, 388, 70, 393, 396, 394, + 341, 338, 70, 70, 347, 70, 70, 70, 348, 343, + 70, 350, 346, 70, 352, 344, 70, 70, 70, 345, + 354, 356, 70, 70, 349, 357, 70, 70, 351, 70, + 355, 70, 70, 70, 353, 358, 364, 70, 359, 366, + 363, 370, 70, 70, 367, 486, 360, 361, 70, 362, + 368, 369, 70, 70, 365, 371, 70, 70, 377, 70, + 372, 70, 70, 373, 70, 375, 376, 378, 374, 70, + 379, 70, 70, 70, 385, 70, 380, 381, 70, 388, + 70, 70, 70, 382, 383, 70, 387, 389, 384, 70, + 70, 399, 394, 70, 390, 386, 392, 70, 393, 70, - 70, 70, 70, 70, 70, 395, 397, 70, 400, 70, - 403, 70, 143, 398, 415, 70, 70, 401, 413, 416, - 70, 399, 70, 402, 414, 405, 404, 70, 70, 406, - 407, 70, 70, 417, 422, 418, 70, 419, 70, 408, - 70, 409, 410, 411, 423, 421, 412, 70, 420, 70, - 70, 430, 70, 70, 428, 424, 425, 70, 426, 70, - 434, 70, 427, 70, 70, 429, 70, 433, 70, 437, - 70, 432, 431, 438, 439, 70, 70, 70, 70, 436, - 444, 70, 70, 70, 443, 445, 435, 446, 440, 70, - 70, 441, 70, 442, 70, 70, 70, 136, 455, 450, + 391, 70, 70, 70, 70, 70, 395, 400, 398, 396, + 70, 397, 70, 70, 401, 407, 144, 70, 70, 70, + 405, 70, 402, 403, 406, 404, 418, 409, 70, 70, + 457, 408, 70, 417, 410, 411, 419, 421, 422, 70, + 70, 420, 70, 423, 412, 70, 413, 414, 415, 424, + 426, 416, 70, 425, 70, 70, 70, 70, 434, 70, + 427, 70, 432, 428, 70, 429, 70, 70, 438, 431, + 433, 70, 430, 436, 70, 70, 70, 70, 70, 435, + 437, 441, 442, 443, 70, 70, 70, 440, 448, 70, + 70, 142, 439, 445, 446, 444, 70, 70, 447, 70, - 448, 453, 447, 449, 70, 456, 70, 457, 70, 454, - 451, 70, 452, 70, 459, 460, 458, 70, 70, 463, - 70, 70, 461, 70, 70, 467, 462, 70, 465, 468, - 70, 469, 70, 464, 466, 70, 70, 471, 70, 70, - 70, 70, 476, 475, 70, 472, 70, 70, 479, 477, - 473, 470, 474, 70, 480, 70, 70, 70, 70, 70, - 70, 70, 490, 70, 482, 70, 483, 478, 70, 70, - 70, 485, 70, 70, 491, 492, 481, 489, 484, 486, - 488, 487, 70, 493, 70, 495, 70, 497, 498, 70, - 494, 70, 496, 70, 70, 502, 70, 70, 501, 70, + 449, 450, 70, 70, 453, 70, 459, 452, 454, 461, + 458, 70, 460, 70, 70, 70, 451, 464, 70, 455, + 463, 456, 70, 465, 70, 467, 70, 70, 70, 70, + 471, 472, 462, 469, 70, 70, 70, 70, 473, 468, + 470, 475, 466, 70, 70, 70, 70, 70, 479, 70, + 480, 70, 476, 70, 70, 70, 474, 477, 478, 481, + 70, 483, 70, 484, 487, 70, 70, 70, 482, 70, + 494, 70, 485, 488, 70, 70, 70, 489, 70, 496, + 495, 70, 70, 493, 490, 499, 491, 492, 502, 497, + 498, 70, 70, 70, 70, 501, 70, 70, 500, 70, - 500, 504, 70, 70, 506, 70, 70, 70, 70, 518, - 503, 505, 499, 70, 70, 70, 520, 134, 507, 70, - 519, 525, 508, 70, 509, 515, 516, 70, 521, 510, - 517, 511, 70, 522, 70, 524, 70, 70, 70, 512, - 70, 70, 513, 70, 523, 530, 528, 70, 526, 514, - 531, 70, 527, 534, 143, 536, 70, 70, 535, 70, - 529, 70, 532, 539, 70, 70, 533, 541, 537, 70, - 70, 543, 70, 544, 546, 538, 70, 540, 542, 70, - 70, 545, 70, 70, 70, 548, 70, 70, 547, 550, - 551, 70, 70, 70, 555, 558, 70, 70, 549, 556, + 70, 505, 70, 506, 508, 70, 70, 504, 70, 70, + 510, 70, 503, 70, 509, 70, 525, 70, 507, 70, + 527, 512, 511, 70, 513, 521, 522, 70, 519, 514, + 520, 515, 70, 524, 70, 526, 70, 523, 70, 516, + 70, 529, 517, 70, 70, 70, 531, 70, 70, 518, + 535, 530, 528, 532, 70, 70, 536, 70, 541, 144, + 70, 539, 533, 540, 70, 70, 534, 537, 70, 538, + 70, 70, 542, 546, 544, 543, 547, 549, 545, 548, + 70, 70, 551, 70, 70, 70, 70, 70, 70, 553, + 70, 70, 555, 550, 556, 70, 552, 560, 70, 70, - 70, 588, 552, 559, 70, 553, 557, 554, 560, 561, - 70, 562, 70, 563, 70, 70, 70, 70, 564, 70, - 565, 569, 70, 70, 70, 567, 568, 70, 570, 70, - 70, 574, 70, 70, 572, 566, 70, 70, 575, 577, - 70, 571, 70, 581, 578, 70, 576, 70, 579, 70, - 573, 70, 583, 70, 584, 587, 70, 70, 580, 589, - 70, 70, 592, 582, 590, 585, 70, 70, 586, 70, - 70, 593, 70, 70, 600, 596, 70, 70, 70, 70, - 70, 597, 595, 594, 601, 70, 591, 70, 599, 598, - 602, 70, 70, 606, 603, 605, 607, 604, 70, 609, + 554, 140, 561, 70, 563, 70, 557, 564, 70, 558, + 565, 559, 562, 566, 70, 568, 70, 567, 70, 569, + 70, 70, 70, 70, 70, 570, 574, 70, 573, 70, + 70, 572, 70, 575, 70, 577, 579, 70, 70, 70, + 70, 571, 70, 580, 70, 576, 70, 582, 70, 586, + 70, 581, 583, 70, 578, 588, 584, 585, 587, 70, + 590, 592, 70, 70, 589, 70, 594, 70, 591, 595, + 70, 593, 70, 70, 70, 597, 70, 598, 70, 70, + 70, 601, 70, 70, 605, 607, 608, 600, 602, 599, + 70, 596, 604, 70, 603, 70, 70, 70, 612, 606, - 70, 70, 70, 608, 610, 70, 70, 612, 70, 70, - 616, 611, 613, 70, 70, 70, 70, 70, 619, 617, - 621, 614, 615, 618, 70, 70, 70, 70, 626, 622, - 623, 624, 70, 620, 628, 70, 625, 70, 70, 70, - 630, 70, 70, 70, 70, 70, 70, 70, 635, 627, - 70, 70, 641, 70, 629, 636, 70, 631, 70, 632, - 637, 633, 70, 634, 70, 638, 640, 70, 644, 639, - 70, 70, 642, 646, 645, 643, 647, 70, 70, 70, - 648, 70, 70, 70, 70, 70, 651, 652, 653, 654, - 655, 650, 70, 70, 70, 70, 649, 70, 143, 657, + 609, 70, 614, 70, 70, 70, 613, 70, 70, 70, + 615, 611, 70, 617, 610, 621, 619, 616, 618, 70, + 70, 70, 620, 70, 622, 626, 624, 70, 70, 623, + 629, 70, 70, 628, 70, 630, 70, 70, 631, 627, + 70, 625, 633, 70, 70, 635, 70, 70, 70, 70, + 70, 70, 70, 634, 640, 70, 70, 632, 641, 646, + 70, 70, 636, 70, 637, 70, 638, 642, 639, 643, + 70, 645, 70, 649, 644, 70, 70, 70, 70, 647, + 648, 650, 651, 653, 70, 70, 652, 70, 70, 655, + 658, 70, 654, 70, 657, 659, 660, 656, 661, 70, - 662, 656, 658, 661, 660, 70, 70, 70, 659, 663, - 665, 70, 70, 666, 668, 70, 669, 70, 671, 70, - 70, 667, 70, 70, 70, 676, 673, 664, 70, 70, - 70, 70, 674, 70, 70, 70, 670, 677, 143, 672, - 681, 675, 70, 70, 682, 70, 678, 683, 70, 686, - 70, 689, 688, 680, 684, 679, 70, 685, 70, 687, - 690, 70, 691, 70, 692, 693, 706, 70, 703, 702, - 70, 70, 70, 694, 695, 701, 696, 70, 70, 697, - 705, 70, 708, 704, 698, 707, 70, 70, 710, 70, - 699, 700, 70, 70, 711, 712, 70, 70, 713, 714, + 70, 70, 70, 70, 144, 70, 70, 663, 668, 667, + 664, 70, 666, 671, 70, 669, 665, 662, 70, 70, + 672, 674, 70, 70, 677, 70, 70, 670, 673, 70, + 70, 70, 675, 679, 682, 70, 70, 676, 680, 70, + 70, 70, 70, 683, 70, 678, 70, 139, 70, 681, + 70, 687, 696, 694, 684, 688, 70, 692, 689, 70, + 697, 686, 695, 70, 685, 690, 699, 693, 691, 70, + 698, 70, 70, 70, 700, 701, 707, 702, 70, 70, + 703, 712, 70, 70, 708, 704, 711, 70, 70, 714, + 70, 705, 706, 70, 713, 70, 709, 70, 716, 70, - 70, 709, 70, 70, 70, 70, 717, 70, 715, 70, - 721, 70, 720, 70, 70, 70, 727, 70, 70, 716, - 726, 731, 722, 718, 719, 723, 725, 70, 729, 730, - 70, 724, 728, 70, 70, 70, 732, 70, 70, 70, - 70, 733, 70, 70, 736, 734, 70, 737, 739, 70, - 70, 742, 740, 70, 741, 70, 735, 70, 70, 70, - 70, 738, 744, 746, 745, 70, 70, 749, 70, 743, - 747, 70, 748, 70, 750, 70, 70, 70, 754, 756, - 752, 757, 70, 70, 70, 70, 755, 751, 70, 759, - 70, 70, 70, 70, 70, 70, 761, 753, 765, 764, + 717, 70, 718, 70, 710, 715, 719, 70, 70, 720, + 70, 70, 722, 70, 723, 721, 70, 727, 70, 70, + 70, 726, 70, 70, 733, 70, 70, 732, 724, 70, + 725, 734, 735, 728, 729, 731, 736, 730, 70, 70, + 70, 70, 70, 737, 70, 738, 70, 741, 70, 739, + 70, 742, 740, 745, 70, 743, 70, 748, 70, 70, + 70, 70, 70, 70, 70, 746, 747, 752, 70, 744, + 750, 751, 70, 753, 754, 70, 755, 70, 749, 70, + 70, 70, 70, 70, 760, 762, 70, 756, 758, 763, + 70, 765, 761, 70, 70, 70, 757, 70, 70, 70, - 70, 768, 70, 70, 758, 70, 760, 772, 70, 70, - 762, 763, 767, 766, 769, 771, 775, 770, 776, 774, - 773, 70, 70, 70, 70, 777, 70, 70, 70, 70, - 783, 784, 781, 70, 70, 70, 785, 70, 779, 788, - 70, 70, 778, 790, 70, 70, 780, 70, 787, 782, - 792, 143, 786, 70, 70, 70, 70, 794, 70, 791, - 789, 70, 793, 70, 806, 70, 70, 70, 70, 807, - 797, 810, 70, 795, 70, 70, 70, 847, 798, 796, - 812, 808, 799, 70, 70, 70, 800, 811, 801, 817, - 813, 814, 802, 809, 803, 70, 815, 70, 816, 804, + 70, 70, 70, 764, 759, 771, 70, 770, 774, 70, + 70, 778, 70, 70, 766, 767, 768, 769, 772, 777, + 776, 773, 775, 70, 781, 70, 783, 70, 70, 779, + 70, 784, 70, 70, 70, 70, 791, 780, 788, 70, + 790, 70, 70, 70, 792, 782, 786, 785, 70, 70, + 70, 795, 797, 70, 787, 70, 789, 70, 799, 144, + 70, 793, 794, 70, 801, 800, 70, 70, 796, 70, + 70, 70, 813, 798, 70, 70, 70, 137, 814, 70, + 817, 804, 802, 70, 70, 70, 834, 70, 70, 805, + 803, 806, 70, 819, 815, 807, 841, 808, 818, 820, - 70, 70, 70, 70, 805, 819, 821, 70, 70, 141, - 818, 826, 827, 70, 825, 820, 822, 70, 828, 70, - 829, 824, 70, 70, 823, 830, 70, 831, 70, 70, - 70, 835, 70, 838, 834, 839, 70, 70, 832, 70, - 70, 837, 836, 846, 840, 833, 844, 70, 70, 70, - 70, 841, 845, 70, 850, 70, 70, 70, 842, 843, - 70, 851, 70, 70, 856, 70, 849, 70, 70, 848, - 70, 853, 854, 855, 852, 70, 857, 70, 70, 865, - 859, 70, 70, 70, 858, 70, 70, 70, 860, 70, - 863, 861, 864, 139, 70, 70, 866, 70, 862, 870, + 816, 809, 70, 810, 821, 70, 70, 70, 811, 822, + 70, 824, 70, 812, 70, 70, 823, 826, 70, 828, + 825, 70, 70, 70, 833, 849, 835, 827, 832, 829, + 70, 70, 70, 836, 70, 831, 70, 843, 837, 830, + 838, 842, 70, 845, 70, 70, 844, 70, 70, 846, + 70, 839, 70, 847, 851, 70, 852, 853, 840, 70, + 70, 848, 854, 70, 857, 70, 70, 850, 70, 855, + 70, 858, 70, 856, 70, 70, 863, 860, 70, 70, + 70, 861, 70, 70, 859, 866, 70, 864, 70, 70, + 862, 70, 70, 70, 865, 872, 70, 868, 870, 867, - 871, 70, 869, 70, 875, 867, 872, 868, 70, 874, - 70, 70, 873, 877, 878, 70, 70, 70, 880, 879, - 70, 881, 70, 70, 876, 882, 886, 70, 70, 883, - 70, 888, 70, 70, 70, 70, 884, 70, 885, 890, - 891, 70, 893, 70, 70, 70, 894, 887, 70, 892, - 896, 889, 899, 70, 898, 895, 70, 70, 70, 70, - 70, 897, 902, 70, 70, 900, 907, 70, 70, 70, - 138, 70, 70, 908, 909, 901, 903, 906, 70, 904, - 70, 911, 912, 905, 914, 910, 70, 915, 70, 70, - 70, 70, 913, 70, 917, 918, 70, 70, 922, 70, + 871, 70, 873, 70, 70, 70, 869, 70, 876, 877, + 878, 874, 879, 70, 875, 70, 881, 882, 70, 884, + 885, 70, 880, 70, 889, 886, 70, 70, 70, 887, + 70, 883, 888, 70, 893, 70, 70, 70, 70, 895, + 70, 890, 70, 897, 70, 70, 70, 898, 892, 70, + 891, 900, 70, 70, 901, 894, 70, 902, 896, 903, + 899, 70, 905, 906, 70, 70, 70, 70, 904, 909, + 907, 70, 70, 70, 914, 70, 70, 70, 70, 70, + 70, 915, 916, 908, 70, 910, 913, 918, 70, 919, + 911, 70, 912, 917, 70, 922, 923, 920, 70, 925, - 70, 916, 70, 70, 70, 920, 70, 919, 70, 921, - 70, 70, 924, 70, 931, 932, 70, 923, 933, 925, - 70, 70, 928, 70, 70, 927, 929, 70, 935, 926, - 930, 70, 70, 934, 70, 940, 70, 938, 936, 70, - 70, 937, 70, 941, 944, 70, 70, 70, 70, 939, - 70, 70, 952, 947, 942, 949, 945, 70, 70, 943, - 70, 70, 953, 70, 946, 954, 950, 70, 948, 951, - 956, 70, 958, 70, 955, 70, 959, 70, 70, 957, - 961, 963, 70, 70, 70, 70, 70, 964, 70, 70, - 70, 70, 960, 965, 70, 969, 962, 967, 70, 70, + 921, 70, 70, 926, 70, 70, 924, 930, 70, 70, + 70, 70, 70, 70, 70, 70, 70, 927, 939, 928, + 929, 932, 70, 70, 70, 940, 70, 931, 941, 933, + 936, 70, 70, 935, 942, 938, 70, 937, 934, 70, + 944, 943, 70, 70, 70, 70, 70, 946, 70, 952, + 70, 70, 949, 945, 70, 70, 70, 135, 947, 70, + 960, 950, 955, 948, 70, 953, 70, 951, 70, 957, + 70, 961, 954, 70, 70, 956, 964, 962, 70, 70, + 958, 70, 963, 959, 967, 70, 70, 966, 971, 70, + 969, 70, 965, 70, 70, 972, 70, 70, 70, 70, - 966, 968, 970, 70, 70, 974, 70, 979, 971, 975, - 70, 70, 972, 70, 70, 978, 973, 70, 981, 70, - 70, 985, 983, 976, 977, 980, 986, 70, 70, 70, - 70, 984, 70, 990, 982, 70, 70, 1000, 998, 987, - 999, 136, 988, 989, 70, 70, 70, 70, 997, 991, - 1001, 70, 992, 993, 70, 70, 1002, 994, 70, 1003, - 1004, 70, 1005, 995, 70, 70, 70, 996, 1011, 1012, - 1008, 1006, 1009, 1007, 70, 70, 70, 70, 70, 70, - 1020, 1013, 1014, 1021, 1010, 70, 1015, 70, 70, 70, - 70, 1016, 1023, 1017, 70, 1018, 1027, 1019, 1022, 70, + 968, 70, 973, 70, 70, 970, 977, 70, 70, 974, + 978, 70, 976, 982, 70, 975, 70, 70, 70, 70, + 979, 987, 981, 983, 980, 986, 70, 70, 70, 70, + 70, 984, 988, 996, 985, 991, 989, 990, 992, 993, + 70, 70, 998, 70, 994, 70, 70, 70, 995, 70, + 1008, 1007, 1009, 997, 70, 1006, 1005, 70, 70, 999, + 70, 70, 1000, 1001, 70, 70, 1011, 1002, 70, 1010, + 1012, 70, 1013, 1003, 70, 70, 70, 1004, 1014, 1019, + 1016, 1020, 1017, 1015, 70, 70, 70, 70, 70, 1021, + 1022, 70, 1028, 1029, 1018, 70, 70, 1023, 70, 70, - 70, 1028, 70, 1026, 1024, 70, 70, 70, 1025, 1030, - 70, 70, 70, 1029, 1032, 1034, 70, 70, 70, 1040, - 70, 1033, 70, 1039, 1031, 1035, 1036, 1042, 70, 70, - 1037, 70, 1043, 70, 1046, 70, 1044, 1041, 70, 1048, - 70, 1038, 70, 70, 1051, 70, 70, 1049, 70, 70, - 70, 70, 1045, 1053, 70, 1055, 70, 1054, 1047, 70, - 1056, 1059, 1058, 70, 1050, 1061, 1052, 1062, 1064, 1057, - 70, 70, 70, 70, 70, 1063, 1060, 70, 70, 1068, - 70, 1065, 70, 70, 70, 1072, 70, 70, 70, 1067, - 70, 70, 70, 70, 1079, 70, 1066, 70, 70, 1076, + 70, 70, 1024, 1031, 1025, 70, 1026, 1030, 1027, 1035, + 1034, 70, 70, 1032, 1036, 70, 70, 70, 1033, 1037, + 1038, 70, 1042, 70, 1040, 70, 70, 70, 70, 1048, + 70, 1039, 70, 1047, 1044, 1041, 70, 1043, 1050, 70, + 70, 1052, 70, 1051, 1045, 1054, 70, 1049, 70, 1056, + 70, 70, 1046, 70, 1059, 70, 1057, 70, 70, 70, + 70, 1053, 70, 1061, 70, 1063, 70, 1062, 1055, 1064, + 70, 1065, 1067, 70, 1058, 70, 70, 1060, 1070, 1071, + 1066, 1072, 1068, 1073, 70, 70, 1069, 70, 70, 70, + 70, 1077, 70, 70, 70, 70, 1074, 1081, 70, 70, - 1073, 70, 1069, 1070, 1077, 134, 1074, 1071, 1075, 70, - 1078, 1084, 70, 70, 1083, 1080, 1082, 70, 1086, 70, - 1088, 70, 1081, 70, 1085, 1089, 70, 70, 1090, 1091, - 70, 70, 70, 1097, 1099, 1095, 1087, 1092, 1096, 70, - 70, 70, 1093, 1100, 70, 1094, 1098, 70, 70, 70, - 70, 70, 1101, 70, 1105, 70, 70, 1108, 70, 70, - 70, 70, 70, 1102, 70, 70, 1104, 1111, 1106, 1117, - 70, 1107, 70, 1103, 1109, 1112, 70, 1110, 1115, 1113, - 1114, 1116, 70, 70, 70, 1121, 70, 1118, 1119, 70, - 2287, 70, 1120, 1124, 1126, 1123, 1125, 1127, 70, 1128, + 70, 1076, 70, 70, 70, 70, 70, 1075, 70, 1088, + 1085, 70, 70, 1078, 1079, 70, 1082, 1092, 1080, 1084, + 1086, 70, 1083, 1087, 1089, 1090, 1093, 70, 70, 1091, + 1097, 70, 70, 1095, 70, 1098, 70, 70, 1094, 1100, + 1096, 1099, 70, 70, 70, 1106, 70, 1104, 1101, 70, + 1105, 1108, 1102, 1109, 70, 1103, 70, 70, 1107, 70, + 70, 70, 70, 70, 70, 1110, 1114, 1117, 70, 70, + 70, 70, 1112, 70, 70, 1111, 144, 1113, 1115, 70, + 70, 1120, 1116, 1119, 1121, 1125, 1118, 70, 1122, 1123, + 1124, 70, 70, 70, 1126, 70, 1127, 1128, 70, 1130, - 70, 1122, 70, 70, 70, 1129, 1130, 70, 70, 70, - 70, 1132, 1131, 70, 70, 70, 1137, 70, 70, 70, - 70, 1136, 70, 70, 1134, 1140, 1139, 1133, 1135, 1143, - 70, 70, 70, 1141, 1144, 70, 70, 1138, 1145, 1151, - 70, 1142, 1148, 1146, 70, 70, 70, 1155, 70, 70, - 1147, 1149, 1154, 70, 70, 1150, 70, 1152, 70, 1153, - 70, 70, 70, 1163, 2287, 70, 70, 1156, 1157, 1164, - 1166, 70, 1160, 1158, 70, 1159, 1162, 1165, 70, 1167, - 70, 1161, 1168, 70, 70, 70, 70, 1172, 70, 70, - 70, 1173, 1170, 1169, 1177, 70, 70, 1171, 70, 70, + 70, 1129, 70, 1135, 1136, 70, 1132, 1134, 1131, 70, + 70, 70, 1137, 70, 1138, 70, 1133, 1139, 70, 1140, + 70, 70, 70, 1142, 70, 70, 1146, 70, 70, 1141, + 70, 1145, 70, 70, 1152, 1143, 1148, 1144, 1149, 1153, + 70, 70, 70, 1154, 1150, 70, 70, 1147, 1155, 70, + 70, 1151, 1160, 70, 70, 70, 1164, 70, 70, 70, + 1163, 1156, 70, 70, 1157, 1158, 70, 70, 1161, 1159, + 70, 142, 1162, 70, 1165, 70, 1166, 1177, 1167, 70, + 1169, 70, 1168, 70, 1172, 1171, 70, 1174, 1170, 1173, + 1175, 70, 70, 70, 1178, 70, 70, 1176, 70, 1184, - 70, 1178, 1179, 1180, 1174, 1176, 1175, 1184, 1181, 70, - 1183, 1185, 70, 70, 70, 70, 1188, 1189, 1182, 1187, - 1190, 70, 70, 70, 1191, 70, 70, 1186, 70, 1193, - 70, 1194, 70, 70, 70, 70, 1200, 70, 1192, 1198, - 70, 70, 70, 1195, 1201, 70, 1203, 1197, 70, 70, - 1199, 70, 70, 1206, 70, 70, 70, 1196, 70, 1205, - 1208, 1202, 1209, 70, 1204, 70, 1211, 70, 1212, 70, - 1207, 70, 1210, 70, 1213, 1219, 1214, 70, 1215, 70, - 1216, 1221, 1217, 70, 1220, 1218, 1223, 70, 70, 1225, - 70, 70, 70, 70, 70, 70, 1229, 70, 1230, 1227, + 1181, 70, 1179, 70, 1182, 1186, 70, 1188, 1180, 70, + 70, 70, 1185, 70, 1187, 1189, 1193, 1183, 1194, 70, + 70, 1190, 70, 70, 70, 70, 1197, 70, 1191, 1196, + 1198, 1199, 70, 1192, 1200, 70, 70, 70, 1195, 1201, + 1202, 70, 1203, 70, 70, 1206, 70, 70, 70, 1210, + 70, 70, 1205, 1208, 70, 1211, 70, 1213, 1204, 70, + 1207, 70, 1209, 70, 70, 70, 70, 1216, 1219, 70, + 1218, 70, 1215, 70, 1212, 70, 1222, 70, 1223, 70, + 70, 1214, 70, 1217, 1220, 1221, 70, 1227, 70, 1226, + 1229, 70, 1231, 70, 1233, 70, 1230, 1224, 70, 1225, - 70, 70, 1224, 1222, 70, 70, 1234, 1233, 70, 70, - 1226, 1240, 70, 70, 70, 1232, 1366, 70, 1228, 1231, - 1235, 70, 1242, 70, 1237, 70, 1246, 1238, 1241, 1236, - 1243, 70, 70, 70, 1245, 70, 1247, 1244, 70, 1239, - 70, 1251, 70, 70, 1253, 1256, 70, 70, 1252, 70, - 70, 1248, 70, 70, 1255, 70, 70, 1249, 1257, 70, - 1250, 1265, 70, 70, 70, 1254, 70, 70, 70, 70, - 1258, 70, 70, 1261, 1263, 1259, 1260, 1262, 70, 1264, - 1270, 70, 70, 1268, 1266, 70, 1273, 1272, 1267, 70, - 70, 70, 1269, 70, 70, 70, 1276, 70, 1271, 70, + 70, 1235, 70, 70, 70, 70, 1228, 70, 1239, 1234, + 1237, 70, 1240, 1232, 70, 70, 70, 70, 1244, 1243, + 70, 70, 1236, 70, 70, 70, 1377, 70, 1247, 1238, + 1242, 1248, 1241, 1245, 70, 1250, 1252, 70, 70, 1251, + 1246, 70, 1253, 1249, 70, 1256, 70, 1255, 1254, 70, + 1257, 70, 70, 1261, 70, 70, 1258, 1263, 70, 70, + 1262, 70, 70, 70, 70, 1259, 1265, 1266, 70, 1267, + 70, 70, 1260, 70, 70, 70, 1268, 1264, 1275, 70, + 70, 70, 1269, 70, 70, 1271, 1273, 1272, 1274, 70, + 1270, 1280, 70, 70, 70, 1278, 70, 1283, 1282, 1276, - 70, 70, 1278, 70, 1274, 1275, 1280, 2287, 1277, 1279, - 1281, 1283, 1284, 1282, 1287, 70, 70, 1285, 1288, 70, - 70, 1291, 1290, 1289, 70, 1286, 70, 70, 70, 70, - 1298, 1299, 70, 70, 70, 1293, 70, 1297, 1295, 70, - 1292, 1296, 70, 70, 70, 70, 1294, 1301, 70, 70, - 1308, 70, 70, 1300, 1321, 70, 1303, 1302, 70, 1304, - 1305, 1310, 70, 1307, 70, 70, 70, 1309, 1319, 1306, - 1311, 70, 1312, 1314, 70, 1322, 1315, 1317, 1326, 70, - 1316, 70, 1318, 70, 1320, 70, 1313, 1324, 70, 1327, - 1323, 70, 1328, 70, 1325, 70, 70, 70, 70, 1329, + 1277, 70, 70, 70, 1279, 70, 70, 70, 1285, 1281, + 70, 70, 70, 1290, 1288, 70, 1284, 1297, 70, 70, + 1291, 1287, 1289, 1292, 70, 1294, 1286, 1299, 1293, 70, + 1295, 1298, 70, 70, 1301, 70, 70, 70, 1300, 70, + 1296, 1308, 1309, 70, 1303, 70, 1307, 70, 1305, 1302, + 70, 1306, 70, 70, 70, 1304, 70, 70, 70, 70, + 1318, 70, 70, 1311, 70, 1310, 1315, 1313, 70, 1321, + 1312, 1320, 1314, 70, 1322, 70, 1317, 1319, 70, 1331, + 70, 140, 1316, 1329, 1324, 1327, 1326, 1325, 1323, 70, + 1328, 70, 1332, 70, 70, 1334, 1330, 70, 70, 1333, - 70, 70, 1336, 70, 70, 1330, 1332, 70, 70, 70, - 1331, 1339, 70, 1333, 70, 1334, 70, 70, 1341, 1337, - 1335, 1342, 1338, 70, 70, 70, 1345, 1340, 1343, 1344, - 1348, 70, 1346, 70, 70, 70, 70, 70, 70, 1355, - 1347, 1350, 70, 70, 70, 70, 2287, 1349, 1351, 1352, - 1358, 1359, 70, 70, 1353, 1356, 1360, 70, 1354, 70, - 1357, 1361, 70, 70, 1362, 70, 1363, 1364, 70, 70, - 70, 70, 70, 70, 70, 1365, 70, 1371, 70, 70, - 70, 1375, 1372, 70, 1381, 1367, 1373, 70, 1369, 1370, - 70, 1368, 1376, 1374, 70, 1379, 1380, 70, 70, 1378, + 1337, 70, 70, 1335, 70, 70, 70, 70, 1339, 70, + 70, 70, 70, 1336, 1340, 1338, 1347, 1342, 70, 70, + 1343, 70, 70, 1341, 70, 1346, 1350, 70, 1344, 70, + 1345, 70, 70, 1352, 1348, 70, 1353, 1349, 70, 70, + 1354, 1351, 70, 1355, 1359, 70, 1360, 1357, 1356, 70, + 70, 70, 70, 70, 1366, 70, 1361, 1358, 70, 70, + 70, 70, 1362, 1363, 1371, 1369, 70, 1367, 1370, 70, + 70, 1364, 70, 1365, 1372, 70, 1368, 1373, 1376, 1374, + 1375, 70, 70, 70, 70, 70, 70, 70, 70, 1382, + 70, 70, 70, 70, 70, 1386, 1383, 1391, 70, 70, - 1385, 70, 70, 1387, 70, 1377, 70, 70, 1382, 1389, - 70, 1390, 70, 1383, 1391, 1392, 70, 1393, 1384, 1395, - 70, 70, 1386, 70, 70, 70, 70, 1388, 70, 1397, - 1398, 70, 70, 1399, 1394, 1400, 1401, 1402, 1403, 70, - 70, 70, 70, 1404, 1407, 70, 1396, 1409, 1405, 70, - 70, 1412, 1410, 70, 70, 70, 1411, 1415, 70, 1406, - 1408, 70, 70, 70, 70, 1413, 1418, 1416, 1419, 70, - 1414, 70, 1421, 70, 70, 1424, 1425, 70, 70, 70, - 70, 1417, 1428, 70, 1422, 70, 70, 1426, 1420, 1431, - 70, 70, 1430, 70, 1433, 1423, 70, 70, 1437, 70, + 1384, 1387, 1378, 1380, 1381, 1379, 1385, 70, 70, 1390, + 1392, 1396, 70, 1389, 1388, 70, 70, 1398, 70, 70, + 1393, 1400, 70, 70, 1402, 1404, 1394, 1401, 1395, 70, + 70, 70, 1403, 70, 70, 1397, 1406, 70, 70, 139, + 1399, 1408, 70, 1409, 70, 70, 1410, 1411, 70, 70, + 1418, 1405, 70, 70, 70, 70, 70, 1416, 1420, 1407, + 1412, 1413, 1414, 1421, 70, 70, 1424, 1415, 1422, 1417, + 1426, 70, 1419, 1423, 70, 70, 70, 70, 1430, 70, + 1425, 70, 70, 1427, 70, 1432, 70, 70, 1435, 1436, + 70, 70, 70, 1439, 70, 1428, 70, 70, 1429, 70, - 1427, 1429, 1436, 70, 70, 1440, 70, 1441, 1442, 70, - 1439, 70, 1435, 70, 70, 70, 1432, 1434, 70, 1438, - 1443, 70, 70, 1444, 70, 1448, 1445, 70, 70, 1451, - 70, 70, 70, 1447, 70, 1453, 70, 1446, 70, 70, - 1459, 70, 1449, 1458, 70, 1452, 70, 1456, 1461, 70, - 1460, 1454, 70, 1450, 70, 1455, 1468, 1457, 1464, 70, - 1466, 70, 70, 1462, 1470, 1465, 1469, 70, 1463, 1471, - 70, 1472, 70, 1475, 1467, 70, 70, 70, 70, 70, - 70, 70, 1477, 1480, 1474, 1482, 70, 1473, 1476, 70, - 70, 70, 1478, 1484, 70, 1485, 1486, 70, 1483, 70, + 1437, 70, 1433, 70, 1441, 70, 1444, 1431, 1434, 70, + 1442, 1440, 70, 1438, 1447, 1448, 70, 70, 1453, 70, + 1451, 70, 70, 70, 1450, 1443, 70, 1452, 1446, 1445, + 70, 1455, 70, 70, 70, 1454, 1449, 70, 70, 70, + 1459, 70, 1462, 1456, 70, 70, 1458, 70, 70, 70, + 70, 1457, 1464, 1469, 70, 70, 1460, 70, 70, 1463, + 1470, 70, 1467, 137, 1466, 1461, 1471, 70, 1465, 1468, + 1472, 70, 1473, 1475, 70, 70, 1476, 1474, 1478, 1479, + 1483, 1477, 1480, 70, 1481, 70, 70, 1484, 70, 1482, + 70, 1487, 70, 70, 70, 70, 70, 70, 1489, 1492, - 1479, 1487, 70, 1481, 1489, 70, 70, 70, 70, 70, - 70, 1490, 1491, 70, 1492, 1493, 70, 70, 1494, 1488, - 1495, 1496, 70, 1499, 70, 70, 70, 70, 1497, 70, - 1501, 70, 1502, 70, 1498, 1500, 1503, 70, 70, 70, - 1505, 70, 1510, 1508, 70, 70, 1509, 70, 70, 1504, - 70, 1506, 70, 1512, 1517, 70, 1515, 1507, 1511, 1516, - 70, 70, 70, 1514, 1513, 1521, 70, 70, 1523, 70, - 70, 70, 1524, 1525, 70, 1520, 1518, 1519, 70, 70, - 70, 70, 1529, 1522, 70, 70, 1526, 1527, 1530, 1528, - 70, 70, 70, 70, 70, 70, 70, 1532, 70, 70, + 1486, 1485, 70, 1494, 1488, 70, 70, 1490, 70, 70, + 70, 1496, 70, 1497, 1498, 70, 1499, 70, 1495, 1501, + 70, 1491, 70, 70, 1493, 70, 1502, 1503, 70, 1504, + 1500, 70, 70, 70, 70, 1507, 1506, 1505, 70, 1511, + 70, 70, 70, 70, 70, 1508, 1509, 70, 1513, 1514, + 1510, 1512, 1515, 70, 70, 70, 1517, 1522, 70, 70, + 70, 1516, 1520, 70, 1521, 70, 70, 1524, 70, 1527, + 70, 70, 1518, 70, 1519, 1529, 70, 70, 1525, 1523, + 1528, 1533, 70, 70, 1535, 1531, 1526, 70, 70, 1530, + 1536, 1532, 1537, 70, 70, 70, 70, 70, 1541, 1534, - 1537, 70, 1533, 1534, 1544, 1531, 1541, 70, 1536, 70, - 1540, 70, 70, 1538, 1542, 1539, 1545, 1547, 1535, 1543, - 70, 70, 1548, 70, 70, 70, 70, 70, 1550, 1546, - 70, 1551, 1553, 70, 1552, 1555, 70, 70, 1557, 1549, - 1554, 70, 1559, 1558, 70, 70, 70, 70, 1563, 1560, - 70, 70, 1564, 1556, 70, 70, 70, 70, 1566, 1569, - 70, 70, 1570, 1561, 1565, 70, 1562, 1573, 70, 70, - 1568, 70, 1571, 70, 1567, 70, 1574, 1575, 70, 1577, - 1576, 70, 1578, 70, 70, 1572, 1581, 1583, 70, 70, - 1582, 70, 1579, 70, 70, 1580, 70, 70, 1584, 1586, + 70, 70, 1538, 1539, 70, 70, 70, 70, 70, 1542, + 70, 70, 70, 70, 70, 1540, 1544, 1545, 1546, 1549, + 1553, 70, 1543, 1548, 1552, 70, 70, 70, 1556, 1554, + 1551, 1557, 1550, 1547, 1555, 70, 70, 70, 1560, 70, + 1559, 70, 70, 70, 1562, 1565, 70, 1558, 1563, 1567, + 70, 1564, 70, 70, 70, 1561, 1570, 70, 1569, 70, + 1566, 70, 1571, 70, 1572, 1575, 70, 70, 70, 70, + 70, 70, 1576, 70, 1578, 1581, 70, 70, 1568, 1573, + 135, 1577, 70, 1574, 1580, 70, 1582, 1586, 1579, 1585, + 70, 70, 1583, 1584, 70, 70, 1587, 70, 1589, 70, - 70, 1587, 70, 1585, 70, 70, 1588, 70, 1592, 70, - 70, 1594, 1598, 70, 70, 1600, 70, 1589, 1590, 1597, - 1591, 1593, 1595, 1599, 70, 70, 70, 70, 70, 1602, - 1605, 1603, 2287, 70, 1596, 1606, 70, 1609, 70, 70, - 1604, 1607, 70, 1601, 70, 1610, 1614, 70, 1608, 70, - 1615, 1613, 70, 70, 1618, 1620, 70, 1617, 1619, 1611, - 70, 70, 70, 70, 1616, 70, 1621, 1622, 70, 1624, - 1612, 70, 70, 70, 70, 70, 1626, 70, 70, 1629, - 1632, 70, 1623, 70, 70, 70, 70, 1633, 1628, 1635, - 70, 1631, 1634, 1625, 70, 1627, 1630, 70, 70, 70, + 1590, 70, 1588, 70, 70, 1593, 1595, 70, 70, 70, + 1591, 70, 1594, 1592, 1598, 70, 1597, 1596, 70, 70, + 1599, 70, 70, 70, 1600, 70, 70, 1604, 1606, 70, + 1611, 70, 70, 70, 70, 1613, 70, 1602, 1601, 1603, + 1605, 1608, 1610, 1612, 70, 70, 70, 70, 1607, 1615, + 1618, 1614, 1616, 70, 1609, 1619, 70, 1617, 1622, 70, + 70, 1620, 70, 1623, 1627, 70, 1621, 70, 1628, 1626, + 70, 70, 1631, 70, 70, 1633, 70, 1624, 70, 1632, + 70, 70, 1629, 70, 70, 1634, 70, 1635, 1625, 1630, + 1637, 70, 70, 1636, 70, 70, 1639, 1642, 70, 1645, - 70, 70, 1646, 70, 70, 1637, 70, 1647, 70, 1638, - 2287, 1636, 1643, 70, 70, 70, 1651, 1639, 1641, 1642, - 1649, 1640, 1644, 1645, 1652, 70, 1648, 1650, 1653, 70, - 70, 70, 70, 1656, 70, 1659, 70, 70, 70, 70, - 2287, 70, 1660, 1657, 1655, 1654, 1658, 70, 1665, 70, - 1666, 70, 1661, 1664, 70, 1668, 70, 70, 1662, 1663, - 1670, 70, 1671, 70, 70, 70, 70, 1675, 70, 70, - 70, 1674, 70, 1667, 70, 1669, 1677, 70, 1672, 70, - 1679, 70, 1680, 70, 1673, 70, 1681, 70, 1676, 1684, - 1678, 1683, 70, 1687, 70, 70, 1685, 70, 70, 70, + 70, 70, 70, 70, 70, 1646, 1638, 1640, 1648, 1641, + 70, 70, 70, 1643, 1644, 70, 70, 1647, 70, 70, + 70, 70, 1659, 70, 70, 70, 70, 1660, 70, 1650, + 1649, 1651, 1656, 1658, 1652, 1654, 70, 70, 1661, 1653, + 1655, 1663, 1657, 70, 1664, 1665, 70, 1666, 70, 70, + 1662, 70, 1667, 70, 1669, 1672, 70, 70, 70, 70, + 1670, 70, 1668, 1671, 1673, 70, 1674, 70, 1678, 70, + 1679, 70, 1681, 70, 70, 1683, 70, 1675, 1676, 1677, + 1684, 70, 70, 70, 1680, 70, 1688, 70, 70, 70, + 1687, 70, 1682, 1690, 70, 1692, 1685, 70, 70, 1694, - 70, 1682, 1686, 1691, 1692, 70, 70, 1688, 1694, 70, - 70, 70, 1690, 1696, 70, 1698, 70, 1693, 1689, 70, - 1695, 1700, 70, 1701, 70, 1699, 70, 1702, 70, 70, - 70, 70, 70, 1706, 70, 1707, 1697, 70, 70, 1704, - 70, 1709, 1713, 1710, 1714, 70, 1708, 1711, 70, 1703, - 1705, 1712, 70, 70, 1717, 70, 1718, 70, 1719, 70, - 70, 1716, 70, 70, 70, 1715, 1720, 70, 70, 1724, - 70, 70, 70, 1729, 1723, 1721, 1725, 1722, 70, 1726, - 1728, 70, 1727, 1730, 1732, 1733, 70, 1734, 70, 70, - 1736, 1731, 1737, 70, 1735, 1739, 70, 70, 70, 1738, + 1693, 70, 1686, 1696, 70, 70, 70, 1689, 70, 1691, + 1700, 70, 70, 70, 1695, 70, 70, 1704, 1705, 70, + 1697, 1698, 70, 70, 1699, 1707, 70, 70, 1701, 70, + 1703, 70, 1711, 70, 1709, 1702, 1708, 70, 1712, 1713, + 70, 1706, 70, 70, 70, 1714, 70, 1715, 70, 1710, + 70, 70, 70, 1719, 70, 1720, 1717, 70, 70, 1721, + 1722, 1723, 1727, 1724, 70, 1716, 1725, 1718, 70, 70, + 70, 1732, 1726, 1728, 70, 1731, 70, 70, 70, 1730, + 70, 1733, 70, 70, 1729, 70, 70, 70, 70, 1734, + 70, 1738, 1776, 1737, 70, 1739, 1735, 1743, 1736, 70, - 70, 70, 1740, 70, 70, 1741, 70, 1744, 1745, 70, - 70, 1742, 1746, 1747, 70, 1748, 70, 70, 70, 70, - 70, 70, 1743, 1752, 1755, 70, 1754, 70, 70, 70, - 70, 1756, 1751, 1760, 1759, 70, 1749, 1750, 70, 70, - 1753, 70, 1764, 1761, 1758, 1757, 70, 70, 1762, 70, - 1765, 70, 1763, 70, 1767, 1768, 1769, 70, 1771, 70, - 70, 70, 70, 1773, 70, 70, 70, 70, 70, 1770, - 1772, 1775, 1776, 1777, 70, 1766, 1778, 70, 1774, 1779, - 70, 1780, 70, 70, 1781, 70, 70, 1782, 1783, 1786, - 70, 70, 70, 1788, 70, 1791, 70, 2287, 1785, 70, + 1742, 1740, 1741, 70, 1744, 70, 1745, 1747, 70, 1748, + 70, 70, 1750, 1751, 70, 1746, 1749, 1755, 70, 70, + 1752, 70, 70, 1754, 70, 70, 70, 1758, 1753, 70, + 70, 70, 70, 1759, 1760, 1761, 70, 1762, 1756, 70, + 70, 70, 70, 70, 1757, 1766, 1769, 70, 1768, 70, + 1763, 70, 70, 1770, 1765, 70, 1773, 1774, 70, 1764, + 70, 70, 1767, 70, 70, 1778, 1775, 1771, 70, 70, + 70, 1772, 1779, 70, 1777, 70, 1781, 1782, 1783, 1786, + 1784, 1785, 70, 70, 70, 1787, 70, 1780, 70, 70, + 1791, 70, 1793, 1789, 1790, 1792, 70, 70, 70, 70, - 1787, 1784, 70, 1792, 1793, 70, 70, 70, 70, 1790, - 1789, 1794, 70, 70, 1795, 1799, 70, 70, 1798, 1800, - 70, 1796, 1797, 1801, 70, 70, 70, 1804, 70, 1802, - 70, 70, 70, 70, 70, 1811, 70, 70, 1807, 1809, - 1805, 70, 1806, 1803, 1808, 70, 1812, 70, 70, 70, - 70, 1818, 70, 1810, 70, 70, 70, 70, 2287, 70, - 1815, 1819, 1823, 1817, 70, 1814, 70, 1813, 70, 1825, - 70, 1824, 1816, 1820, 70, 1826, 1821, 1827, 70, 1822, - 1828, 70, 70, 1829, 1830, 1831, 70, 1832, 70, 70, - 70, 70, 70, 70, 1840, 70, 1841, 70, 70, 1837, + 1794, 1788, 70, 70, 70, 70, 1800, 70, 1797, 70, + 1802, 70, 70, 1795, 1805, 70, 70, 1799, 1801, 70, + 1806, 1807, 70, 1798, 1796, 70, 70, 1804, 1809, 1803, + 1808, 70, 70, 70, 1813, 70, 1814, 70, 1812, 1815, + 70, 70, 70, 70, 1818, 1810, 1811, 70, 70, 70, + 70, 70, 70, 1816, 70, 1821, 70, 1824, 70, 1819, + 1817, 1820, 1822, 1826, 70, 1827, 70, 70, 70, 70, + 70, 1823, 70, 1833, 1825, 70, 70, 70, 70, 1834, + 1830, 1838, 70, 1832, 1828, 70, 1829, 1842, 70, 70, + 1840, 70, 1831, 1835, 1841, 70, 1839, 70, 1836, 70, - 70, 70, 70, 70, 70, 70, 1833, 1834, 1844, 1842, - 1835, 1836, 1838, 1839, 70, 70, 1843, 1845, 1850, 70, - 70, 1846, 1847, 1852, 1849, 1851, 70, 70, 70, 70, - 1848, 70, 70, 1853, 70, 1854, 1856, 70, 70, 1859, - 1860, 1861, 70, 70, 70, 1862, 1855, 70, 1857, 1863, - 70, 70, 1858, 1865, 70, 70, 1864, 70, 1869, 1870, - 70, 70, 1873, 70, 70, 70, 70, 1866, 1874, 70, - 1867, 70, 1871, 1876, 1868, 1877, 70, 1879, 70, 1872, - 1875, 1880, 70, 70, 1878, 1881, 1882, 70, 1883, 1884, - 70, 70, 1885, 70, 70, 70, 70, 70, 70, 70, + 1837, 1843, 70, 70, 1844, 70, 1846, 70, 70, 1845, + 70, 70, 70, 70, 70, 1855, 1847, 1856, 70, 1848, + 1852, 1857, 70, 1849, 70, 70, 70, 70, 1851, 1850, + 1853, 1854, 1859, 70, 70, 1865, 70, 1866, 70, 1860, + 1858, 1867, 70, 70, 1861, 1862, 70, 70, 70, 1863, + 70, 70, 70, 1864, 70, 1871, 1875, 1874, 1869, 70, + 1868, 1876, 70, 70, 70, 1870, 1877, 70, 1872, 1878, + 70, 1873, 1880, 70, 70, 70, 70, 70, 1879, 1884, + 1885, 70, 1888, 70, 70, 70, 70, 1881, 1889, 70, + 1886, 70, 1882, 1891, 1883, 1887, 1892, 70, 70, 1893, - 70, 1889, 70, 1891, 1888, 70, 70, 1887, 1893, 70, - 1895, 1890, 1898, 70, 1896, 1886, 70, 1894, 1892, 1899, - 70, 1897, 70, 1900, 1902, 70, 70, 1901, 70, 1904, - 70, 1903, 70, 1907, 70, 1908, 70, 1906, 70, 1910, - 1905, 70, 70, 1914, 1911, 70, 1912, 1913, 70, 70, - 70, 1909, 1915, 70, 70, 1916, 70, 70, 70, 70, - 1922, 70, 1917, 1920, 1919, 70, 1923, 70, 70, 1918, - 70, 1921, 70, 1928, 70, 70, 70, 1926, 70, 1927, - 1925, 1933, 70, 1924, 1929, 70, 70, 70, 1937, 70, - 70, 70, 70, 1930, 70, 1935, 1931, 1932, 1941, 1942, + 1890, 1894, 70, 1895, 70, 1897, 70, 70, 1899, 70, + 1896, 70, 1898, 70, 1900, 70, 70, 70, 70, 70, + 1901, 70, 1904, 1906, 1902, 1903, 70, 1907, 70, 1905, + 70, 70, 70, 2318, 1909, 1911, 1912, 1914, 70, 70, + 1908, 1915, 70, 1910, 70, 1918, 1916, 1913, 70, 1917, + 70, 70, 70, 1919, 70, 1920, 70, 1922, 1923, 70, + 1924, 70, 1926, 70, 1944, 1921, 70, 1927, 70, 1925, + 70, 1928, 1930, 70, 70, 1929, 70, 1931, 70, 1932, + 70, 70, 70, 70, 70, 1933, 1938, 1936, 70, 1935, + 70, 70, 70, 1939, 70, 1934, 1937, 70, 70, 70, - 1943, 70, 1936, 70, 1934, 70, 1939, 70, 70, 1938, - 70, 1944, 1940, 1945, 70, 70, 1946, 70, 1948, 70, - 1951, 1952, 70, 1947, 70, 70, 70, 1955, 70, 1949, - 1956, 70, 1950, 70, 1958, 70, 1957, 70, 1959, 1960, - 70, 1961, 70, 70, 1953, 1954, 1962, 1964, 1965, 70, - 70, 70, 70, 70, 1966, 1967, 1971, 1963, 1970, 70, - 1968, 70, 70, 70, 1974, 70, 70, 1973, 70, 70, - 70, 1975, 1976, 1978, 1969, 70, 70, 70, 70, 70, - 1981, 1985, 70, 70, 1972, 70, 70, 1989, 2287, 70, - 1984, 70, 1990, 1977, 1979, 1980, 1982, 1987, 70, 1983, + 70, 1942, 70, 1943, 1941, 70, 1945, 70, 1940, 1949, + 70, 1953, 70, 70, 70, 1952, 1951, 1946, 70, 1947, + 2318, 1948, 70, 70, 1950, 1958, 1957, 1959, 70, 1955, + 70, 70, 1954, 70, 70, 1961, 1963, 70, 1956, 70, + 70, 1960, 70, 1962, 1964, 70, 1967, 1968, 70, 70, + 2318, 1965, 70, 1971, 1966, 1972, 70, 70, 1974, 70, + 1973, 70, 1969, 70, 1975, 1976, 70, 1978, 70, 1970, + 70, 70, 1981, 1982, 70, 70, 1977, 1984, 70, 1983, + 70, 70, 1985, 70, 1988, 1980, 70, 1987, 1979, 70, + 70, 1991, 70, 1990, 70, 70, 70, 70, 1993, 1992, - 70, 1991, 1986, 70, 1988, 70, 70, 70, 1993, 70, - 70, 1999, 70, 70, 1992, 70, 1996, 70, 2000, 2002, - 70, 2004, 70, 70, 2003, 1994, 70, 70, 2005, 1997, - 1998, 2001, 1995, 2008, 70, 2006, 70, 70, 70, 70, - 2009, 70, 2012, 2016, 70, 2007, 2010, 2013, 70, 70, - 2015, 70, 2014, 2011, 70, 70, 70, 70, 2017, 70, - 2022, 2021, 70, 2018, 70, 70, 2023, 2020, 70, 2024, - 70, 2025, 2027, 70, 2026, 70, 70, 2028, 70, 2019, - 2031, 2032, 2029, 2033, 2030, 2034, 70, 70, 70, 70, - 70, 2039, 70, 70, 2035, 2037, 70, 70, 2041, 70, + 1995, 70, 70, 1986, 70, 70, 70, 1998, 2002, 70, + 70, 1989, 70, 70, 2006, 70, 70, 2007, 1996, 1997, + 2001, 1994, 1999, 2004, 70, 2000, 70, 2008, 70, 2003, + 70, 2005, 70, 2010, 70, 70, 70, 2016, 70, 70, + 2009, 70, 2017, 2013, 2019, 70, 70, 2021, 70, 70, + 2011, 70, 70, 2020, 2022, 2014, 2015, 70, 2012, 2018, + 2023, 2025, 70, 70, 70, 70, 2027, 2026, 2029, 70, + 2024, 70, 70, 2030, 70, 2033, 70, 70, 2031, 2028, + 2032, 2034, 70, 70, 70, 70, 70, 2040, 70, 2035, + 2039, 70, 70, 2041, 2036, 2037, 2042, 70, 2043, 2045, - 2044, 70, 70, 70, 70, 70, 70, 2038, 2046, 2036, - 70, 2043, 2042, 70, 2047, 2045, 70, 2040, 2050, 2048, - 70, 2051, 2053, 70, 70, 2049, 2055, 70, 2056, 70, - 2058, 70, 70, 70, 2061, 70, 70, 70, 2060, 2052, - 70, 2057, 70, 2054, 70, 2065, 70, 70, 2059, 2068, - 70, 2069, 70, 70, 70, 2070, 2062, 70, 70, 2064, - 2063, 2066, 2074, 70, 2067, 70, 2072, 70, 2075, 70, - 2076, 70, 2071, 70, 2079, 2080, 70, 2073, 2078, 2077, - 70, 70, 70, 70, 2081, 2086, 70, 2083, 2084, 2082, - 70, 70, 2085, 2089, 70, 2090, 70, 2092, 70, 70, + 70, 2044, 70, 2038, 70, 70, 2050, 70, 2047, 70, + 2049, 2046, 70, 2054, 2051, 2052, 70, 70, 70, 70, + 2057, 70, 2055, 2048, 70, 2053, 70, 2059, 70, 2062, + 70, 70, 70, 70, 70, 2064, 2056, 70, 70, 2061, + 2060, 70, 2065, 70, 2058, 2063, 2068, 70, 2069, 70, + 2066, 2071, 70, 2073, 70, 70, 2067, 2074, 70, 2076, + 70, 2079, 70, 70, 70, 70, 2072, 2070, 2078, 70, + 2075, 2077, 70, 70, 2083, 70, 2086, 70, 2087, 70, + 70, 70, 70, 2084, 2080, 70, 70, 70, 2081, 2088, + 2094, 2082, 2093, 70, 2091, 70, 2095, 2085, 70, 70, - 70, 70, 70, 2087, 2088, 2093, 2095, 2096, 70, 2091, - 2097, 70, 70, 2094, 2098, 70, 70, 2099, 2100, 70, - 70, 2101, 70, 2103, 2104, 70, 70, 70, 2108, 70, - 70, 70, 70, 70, 2105, 2109, 2107, 70, 2102, 70, - 2111, 2112, 70, 70, 2113, 2110, 2106, 70, 2116, 70, - 70, 70, 70, 2114, 70, 2118, 70, 2115, 2119, 2117, - 70, 70, 70, 70, 2129, 70, 70, 2127, 2130, 70, - 2123, 2120, 2121, 2141, 2122, 70, 70, 2124, 2125, 2131, - 2132, 70, 2126, 2128, 2133, 70, 2134, 2135, 70, 70, - 2137, 70, 2136, 70, 2138, 2140, 70, 70, 70, 70, + 70, 2089, 2098, 2100, 2090, 70, 2092, 70, 70, 70, + 2096, 2099, 70, 70, 2102, 2105, 70, 70, 2103, 2097, + 70, 70, 2289, 2101, 2108, 70, 2104, 2109, 70, 2111, + 70, 70, 70, 2106, 2107, 70, 2110, 2112, 2115, 70, + 2114, 2116, 70, 2117, 70, 2113, 70, 2119, 70, 70, + 70, 2118, 70, 2122, 2123, 70, 70, 70, 70, 2127, + 70, 70, 70, 2130, 70, 70, 2128, 2126, 2120, 70, + 2124, 70, 2121, 2131, 2132, 70, 2129, 2125, 70, 70, + 70, 70, 70, 2133, 2134, 2136, 70, 2139, 2138, 70, + 70, 2135, 70, 2137, 70, 70, 70, 2147, 70, 2149, - 70, 2145, 2146, 70, 2147, 70, 70, 2139, 2144, 70, - 2150, 70, 2142, 2151, 2149, 70, 2143, 70, 70, 70, - 70, 2148, 70, 70, 70, 2155, 2258, 2156, 2158, 70, - 2159, 70, 2153, 2160, 70, 2161, 70, 2162, 70, 2154, - 2152, 70, 2157, 2164, 70, 2165, 70, 70, 70, 2167, - 2163, 70, 2169, 70, 70, 70, 2173, 70, 2171, 2166, - 2172, 70, 70, 70, 70, 70, 2168, 70, 2175, 70, - 70, 70, 2170, 2179, 70, 2174, 70, 70, 2180, 70, - 2185, 2178, 70, 2176, 70, 2177, 70, 70, 2184, 2181, - 2182, 70, 70, 70, 2183, 2186, 70, 2193, 70, 2195, + 70, 2150, 70, 70, 2152, 70, 2140, 2151, 2142, 2141, + 2143, 70, 2144, 2145, 2153, 70, 70, 2146, 2148, 2154, + 2155, 70, 70, 2157, 70, 2156, 2160, 70, 70, 2158, + 2159, 70, 70, 70, 70, 2161, 2162, 70, 2166, 2167, + 70, 2168, 70, 2165, 70, 70, 2163, 2171, 70, 2172, + 2170, 2164, 70, 70, 70, 70, 70, 70, 70, 2169, + 70, 2176, 2177, 2179, 70, 2180, 70, 2184, 2174, 2181, + 70, 2182, 70, 2183, 70, 2175, 70, 2173, 70, 2178, + 2185, 70, 2186, 70, 70, 2189, 70, 2191, 70, 70, + 2188, 2187, 70, 70, 2195, 2193, 2194, 70, 70, 70, - 70, 2194, 70, 2187, 2188, 70, 2196, 2189, 2191, 2197, - 70, 70, 2190, 70, 2198, 70, 2192, 70, 2199, 2203, - 2200, 70, 2205, 70, 70, 70, 70, 2201, 70, 70, - 70, 2210, 2202, 70, 2211, 2204, 2208, 70, 70, 2206, - 70, 70, 70, 2213, 2207, 70, 2216, 2212, 2209, 70, - 2217, 70, 70, 70, 70, 2215, 70, 2214, 70, 2222, - 2226, 2223, 2225, 70, 2219, 2220, 70, 70, 2218, 70, - 2227, 70, 2221, 70, 70, 2232, 2228, 2224, 2229, 2230, - 70, 70, 2233, 70, 70, 70, 2231, 70, 2238, 70, - 70, 2235, 70, 70, 70, 70, 70, 2243, 70, 2234, + 70, 2190, 70, 2197, 70, 70, 70, 2192, 70, 2201, + 70, 2196, 2203, 70, 70, 70, 70, 2208, 2198, 70, + 2199, 2200, 70, 70, 70, 70, 2207, 2202, 2205, 70, + 2204, 70, 2209, 70, 2217, 70, 2206, 70, 70, 2212, + 70, 2210, 2211, 2222, 2214, 70, 2218, 2216, 2219, 70, + 2213, 2215, 70, 2220, 2221, 70, 70, 70, 2227, 70, + 2226, 2223, 2224, 2225, 70, 2229, 70, 70, 70, 70, + 70, 70, 70, 2228, 2235, 2236, 70, 70, 2233, 70, + 70, 70, 70, 2231, 70, 2238, 2230, 2232, 2242, 70, + 2234, 2237, 70, 70, 2243, 2239, 2241, 70, 70, 2240, - 70, 2247, 2241, 2240, 2236, 2242, 2237, 70, 2239, 70, - 70, 2246, 2248, 70, 2244, 2245, 70, 2250, 70, 2252, - 70, 2253, 70, 70, 2259, 70, 70, 2254, 70, 2251, - 2255, 2257, 2256, 70, 70, 2249, 70, 70, 2265, 70, - 2260, 2261, 2263, 70, 70, 70, 70, 2262, 70, 2267, - 2268, 70, 2271, 2272, 70, 2264, 70, 70, 70, 2275, - 2276, 70, 2266, 70, 70, 2269, 70, 2270, 2278, 70, - 2277, 2279, 70, 2280, 70, 2273, 2274, 70, 70, 2281, - 2285, 70, 2282, 2283, 2286, 70, 2287, 2287, 2287, 2287, - 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2284, 42, 42, + 70, 70, 70, 70, 2318, 2248, 2245, 2249, 2252, 70, + 2246, 2244, 2253, 70, 2254, 70, 70, 2247, 70, 2250, + 2255, 2256, 2251, 70, 70, 2259, 70, 70, 2257, 2261, + 70, 70, 2260, 70, 70, 70, 2266, 70, 70, 70, + 2263, 70, 70, 2258, 2272, 2262, 70, 2269, 70, 70, + 70, 2268, 70, 2264, 2265, 70, 2267, 2270, 70, 2276, + 2271, 70, 70, 70, 2280, 2275, 2277, 2279, 2273, 2274, + 70, 2282, 70, 2283, 2281, 2278, 70, 70, 70, 2287, + 70, 2284, 70, 70, 2285, 2290, 70, 2288, 70, 70, + 2291, 70, 70, 2296, 70, 2292, 2294, 2286, 70, 70, - 42, 42, 42, 42, 42, 47, 47, 47, 47, 47, - 47, 47, 52, 52, 52, 52, 52, 52, 52, 58, - 58, 58, 58, 58, 58, 58, 63, 63, 63, 63, - 63, 63, 63, 73, 73, 2287, 73, 73, 73, 73, - 133, 133, 2287, 2287, 2287, 133, 133, 135, 135, 2287, - 2287, 135, 2287, 135, 137, 2287, 2287, 2287, 2287, 2287, - 137, 140, 140, 2287, 2287, 2287, 140, 140, 142, 2287, - 2287, 2287, 2287, 2287, 142, 144, 144, 2287, 144, 144, - 144, 144, 74, 74, 2287, 74, 74, 74, 74, 13, - 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, + 70, 70, 70, 70, 2298, 2299, 70, 2302, 2293, 2303, + 70, 2295, 70, 70, 2306, 2307, 70, 2297, 70, 70, + 2300, 2301, 2304, 2309, 70, 2308, 2310, 70, 70, 70, + 70, 2305, 70, 2318, 2312, 2311, 2318, 2313, 2314, 2316, + 70, 2317, 70, 2318, 2318, 2318, 2318, 2318, 2318, 2315, + 42, 42, 42, 42, 42, 42, 42, 47, 47, 47, + 47, 47, 47, 47, 52, 52, 52, 52, 52, 52, + 52, 58, 58, 58, 58, 58, 58, 58, 63, 63, + 63, 63, 63, 63, 63, 73, 73, 2318, 73, 73, + 73, 73, 134, 134, 2318, 2318, 2318, 134, 134, 136, - 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, - 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, - 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287 + 136, 2318, 2318, 136, 2318, 136, 138, 2318, 2318, 2318, + 2318, 2318, 138, 141, 141, 2318, 2318, 2318, 141, 141, + 143, 2318, 2318, 2318, 2318, 2318, 143, 145, 145, 2318, + 145, 145, 145, 145, 74, 74, 2318, 74, 74, 74, + 74, 13, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, + 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, + 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, + 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, + 2318, 2318 } ; -static yyconst flex_int16_t yy_chk[4531] = +static yyconst flex_int16_t yy_chk[4583] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1694,7 +1710,7 @@ static yyconst flex_int16_t yy_chk[4531] = 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 5, 3, 6, 20, 4, 20, 20, 5, 20, 6, 7, 7, 7, 7, 20, 7, 8, 8, 8, 8, - 2293, 8, 7, 9, 9, 9, 22, 22, 8, 10, + 2324, 8, 7, 9, 9, 9, 22, 22, 8, 10, 10, 10, 15, 25, 9, 21, 15, 25, 21, 21, 10, 11, 11, 11, 11, 11, 11, 19, 51, 19, @@ -1703,488 +1719,494 @@ static yyconst flex_int16_t yy_chk[4531] = 23, 23, 27, 27, 24, 12, 29, 31, 23, 24, 78, 27, 23, 24, 12, 23, 24, 28, 24, 24, 30, 28, 31, 34, 28, 30, 32, 32, 71, 33, - 33, 28, 71, 28, 33, 32, 105, 35, 91, 36, - 40, 32, 35, 105, 34, 32, 35, 46, 46, 91, - 33, 82, 35, 36, 40, 35, 37, 37, 38, 40, - 82, 37, 35, 38, 39, 39, 38, 39, 62, 62, - 210, 37, 210, 38, 37, 41, 41, 38, 38, 81, + 33, 28, 71, 28, 33, 32, 799, 35, 95, 36, + 68, 32, 35, 95, 34, 32, 35, 46, 46, 87, + 33, 81, 35, 36, 68, 35, 37, 37, 38, 62, + 62, 37, 35, 38, 39, 39, 38, 39, 87, 81, + 130, 37, 40, 38, 37, 130, 40, 38, 38, 41, - 41, 68, 39, 57, 41, 57, 57, 65, 57, 65, - 65, 67, 65, 67, 67, 68, 67, 81, 70, 65, - 70, 70, 73, 70, 73, 73, 77, 73, 76, 70, - 77, 76, 79, 73, 73, 79, 80, 83, 84, 80, - 85, 86, 87, 88, 84, 90, 89, 107, 92, 88, - 84, 83, 80, 93, 107, 96, 99, 792, 85, 85, - 89, 87, 88, 86, 94, 90, 92, 95, 94, 96, - 97, 93, 95, 97, 98, 99, 97, 100, 101, 102, - 98, 101, 100, 103, 104, 101, 109, 106, 104, 97, - 97, 108, 110, 112, 111, 114, 113, 103, 111, 98, + 41, 77, 39, 91, 41, 77, 40, 57, 41, 57, + 57, 40, 57, 65, 91, 65, 65, 67, 65, 67, + 67, 70, 67, 70, 70, 65, 70, 82, 73, 83, + 73, 73, 70, 73, 76, 79, 82, 76, 79, 73, + 73, 80, 84, 83, 80, 85, 86, 88, 84, 90, + 123, 89, 92, 88, 84, 93, 94, 80, 96, 99, + 94, 98, 123, 85, 85, 89, 88, 98, 86, 90, + 92, 97, 96, 93, 97, 100, 101, 97, 99, 101, + 100, 102, 103, 101, 104, 105, 98, 107, 104, 106, + 97, 97, 105, 108, 107, 109, 103, 111, 110, 112, - 106, 113, 100, 102, 108, 113, 109, 115, 115, 116, - 110, 112, 117, 118, 119, 114, 120, 122, 125, 120, - 123, 126, 121, 122, 127, 117, 124, 124, 118, 116, - 120, 117, 123, 119, 120, 121, 125, 126, 128, 129, - 128, 130, 131, 132, 129, 127, 191, 124, 132, 134, - 134, 136, 147, 130, 136, 141, 141, 147, 154, 191, - 131, 128, 138, 154, 138, 138, 143, 138, 143, 143, - 144, 143, 144, 144, 146, 144, 149, 146, 148, 150, - 151, 152, 144, 153, 148, 155, 156, 157, 151, 173, - 150, 149, 158, 157, 157, 156, 164, 158, 153, 165, + 100, 111, 106, 113, 114, 102, 108, 116, 113, 115, + 115, 119, 113, 117, 118, 109, 110, 112, 121, 120, + 124, 124, 120, 126, 114, 125, 117, 116, 122, 118, + 119, 121, 117, 120, 122, 127, 128, 120, 129, 126, + 129, 124, 131, 125, 132, 133, 135, 135, 137, 143, + 133, 137, 128, 149, 131, 139, 127, 139, 139, 149, + 139, 129, 132, 142, 142, 144, 153, 144, 144, 145, + 144, 145, 145, 147, 145, 148, 147, 150, 151, 152, + 148, 145, 154, 155, 156, 153, 157, 152, 155, 151, + 169, 159, 150, 158, 169, 157, 159, 154, 168, 158, - 152, 159, 159, 160, 165, 155, 161, 173, 161, 160, - 162, 161, 163, 163, 162, 164, 166, 167, 168, 162, - 169, 166, 168, 170, 162, 169, 171, 172, 161, 174, - 162, 162, 178, 175, 174, 179, 142, 170, 175, 172, - 167, 171, 172, 176, 176, 177, 185, 180, 184, 176, - 177, 179, 178, 180, 181, 181, 182, 184, 183, 186, - 195, 176, 182, 176, 183, 186, 187, 185, 182, 188, - 189, 187, 190, 193, 192, 188, 189, 194, 196, 190, - 192, 197, 195, 194, 198, 199, 196, 200, 201, 198, - 202, 203, 204, 193, 197, 202, 204, 205, 206, 207, + 158, 160, 160, 161, 156, 162, 165, 162, 163, 161, + 162, 166, 163, 164, 164, 167, 166, 163, 170, 171, + 167, 168, 163, 170, 172, 165, 173, 162, 163, 163, + 174, 175, 176, 171, 177, 177, 175, 176, 173, 172, + 177, 173, 178, 179, 180, 181, 186, 178, 174, 182, + 182, 181, 177, 183, 177, 184, 187, 185, 196, 183, + 180, 184, 187, 179, 188, 183, 185, 186, 189, 188, + 190, 191, 192, 193, 189, 194, 190, 195, 191, 193, + 196, 197, 199, 195, 198, 192, 200, 199, 201, 197, + 202, 203, 206, 204, 205, 194, 203, 198, 205, 207, - 199, 208, 209, 200, 206, 211, 213, 208, 201, 203, - 212, 214, 211, 215, 215, 216, 212, 207, 207, 205, - 217, 216, 209, 214, 219, 213, 217, 218, 220, 218, - 221, 223, 232, 222, 228, 229, 226, 223, 224, 216, - 220, 222, 226, 224, 227, 225, 218, 219, 228, 221, - 225, 230, 231, 229, 234, 233, 234, 232, 233, 227, - 231, 235, 235, 236, 237, 230, 236, 238, 238, 239, - 239, 240, 242, 241, 243, 242, 244, 245, 243, 246, - 247, 251, 237, 245, 252, 244, 247, 240, 241, 248, - 248, 249, 250, 246, 253, 254, 249, 140, 250, 255, + 208, 200, 209, 210, 201, 207, 212, 211, 209, 211, + 202, 204, 214, 212, 206, 213, 215, 216, 208, 208, + 218, 213, 215, 210, 217, 217, 218, 219, 220, 216, + 220, 214, 221, 219, 222, 223, 225, 224, 226, 231, + 237, 237, 225, 226, 218, 224, 222, 220, 227, 229, + 228, 230, 232, 227, 223, 221, 228, 231, 234, 233, + 235, 239, 242, 235, 229, 230, 232, 233, 236, 238, + 236, 243, 238, 240, 240, 241, 241, 244, 242, 239, + 244, 245, 246, 234, 247, 245, 243, 248, 249, 253, + 247, 246, 250, 250, 249, 251, 252, 254, 255, 256, - 255, 251, 252, 256, 257, 258, 256, 259, 254, 258, - 260, 260, 261, 262, 263, 253, 262, 264, 265, 266, - 267, 265, 257, 264, 268, 259, 263, 271, 270, 267, - 261, 266, 269, 268, 276, 269, 139, 267, 267, 271, - 267, 270, 272, 275, 272, 272, 273, 273, 274, 276, - 277, 274, 278, 269, 279, 279, 282, 280, 284, 277, - 275, 278, 280, 275, 281, 281, 285, 283, 286, 287, - 284, 282, 283, 288, 289, 287, 290, 294, 295, 289, - 291, 137, 290, 286, 292, 291, 285, 293, 300, 292, - 293, 294, 293, 288, 295, 292, 296, 295, 297, 295, + 251, 248, 252, 257, 257, 258, 259, 260, 258, 253, + 261, 260, 256, 262, 262, 254, 263, 264, 265, 255, + 264, 266, 267, 268, 259, 267, 272, 266, 261, 269, + 265, 270, 273, 271, 263, 268, 271, 373, 269, 272, + 270, 275, 275, 277, 273, 373, 269, 269, 274, 269, + 274, 274, 276, 278, 271, 276, 279, 280, 281, 281, + 277, 284, 282, 277, 287, 279, 280, 282, 278, 283, + 283, 286, 285, 288, 289, 290, 284, 285, 296, 292, + 289, 291, 293, 286, 287, 292, 291, 293, 288, 294, + 297, 299, 296, 295, 294, 290, 295, 299, 295, 298, - 299, 298, 301, 306, 297, 296, 298, 303, 300, 302, - 303, 304, 309, 299, 308, 307, 310, 301, 306, 308, - 308, 299, 311, 302, 307, 304, 303, 305, 312, 305, - 305, 313, 315, 309, 314, 310, 316, 311, 317, 305, - 314, 305, 305, 305, 314, 313, 305, 318, 312, 319, - 320, 321, 322, 324, 319, 315, 316, 321, 317, 323, - 325, 326, 318, 327, 328, 320, 325, 324, 330, 328, - 333, 323, 322, 329, 329, 331, 329, 332, 334, 327, - 334, 335, 337, 336, 333, 335, 326, 336, 330, 338, - 339, 331, 340, 332, 342, 345, 343, 135, 342, 339, + 294, 301, 300, 302, 303, 304, 297, 300, 298, 297, + 305, 297, 306, 307, 301, 306, 312, 310, 309, 313, + 304, 343, 301, 302, 305, 303, 310, 307, 314, 315, + 343, 306, 308, 309, 308, 308, 311, 312, 313, 316, + 318, 311, 311, 314, 308, 319, 308, 308, 308, 315, + 317, 308, 320, 316, 321, 323, 317, 322, 324, 325, + 317, 326, 322, 318, 324, 319, 327, 329, 328, 321, + 323, 330, 320, 326, 328, 333, 331, 334, 335, 325, + 327, 331, 332, 332, 336, 332, 337, 330, 337, 340, + 341, 141, 329, 334, 335, 333, 338, 339, 336, 342, - 337, 340, 336, 338, 341, 343, 349, 344, 346, 341, - 339, 347, 339, 344, 346, 347, 345, 348, 350, 350, - 351, 353, 348, 352, 354, 354, 349, 356, 352, 355, - 357, 356, 358, 351, 353, 355, 359, 358, 360, 362, - 361, 363, 363, 362, 364, 359, 365, 366, 366, 364, - 360, 357, 361, 368, 368, 369, 370, 371, 372, 373, - 376, 375, 378, 377, 370, 379, 371, 365, 378, 381, - 380, 373, 384, 389, 379, 380, 369, 377, 372, 375, - 376, 375, 382, 381, 385, 383, 387, 385, 386, 390, - 382, 383, 384, 388, 386, 389, 392, 391, 388, 393, + 338, 339, 345, 346, 341, 344, 345, 340, 342, 347, + 344, 348, 346, 350, 349, 347, 339, 350, 351, 342, + 349, 342, 352, 351, 353, 353, 354, 356, 355, 357, + 357, 358, 348, 355, 359, 360, 361, 358, 359, 354, + 356, 361, 352, 362, 365, 363, 364, 368, 365, 366, + 366, 372, 362, 375, 367, 374, 360, 363, 364, 367, + 369, 369, 371, 371, 374, 376, 378, 379, 368, 380, + 381, 382, 372, 375, 383, 384, 381, 376, 387, 383, + 382, 392, 385, 380, 378, 386, 378, 379, 389, 384, + 385, 386, 388, 390, 389, 388, 391, 393, 387, 395, - 387, 391, 394, 395, 393, 397, 406, 398, 402, 400, - 390, 392, 386, 401, 399, 400, 401, 133, 394, 404, - 400, 406, 395, 396, 396, 397, 398, 409, 402, 396, - 399, 396, 403, 403, 405, 405, 407, 408, 410, 396, - 411, 412, 396, 413, 404, 411, 409, 415, 407, 396, - 412, 414, 408, 415, 417, 418, 419, 420, 417, 421, - 410, 418, 413, 421, 422, 423, 414, 423, 419, 427, - 424, 425, 425, 426, 428, 420, 429, 422, 424, 426, - 428, 427, 430, 431, 432, 430, 434, 433, 429, 432, - 433, 435, 466, 437, 436, 438, 438, 444, 431, 436, + 394, 391, 398, 392, 394, 396, 397, 390, 400, 402, + 396, 401, 389, 405, 395, 406, 405, 404, 393, 407, + 407, 398, 397, 399, 399, 402, 403, 408, 400, 399, + 401, 399, 403, 404, 411, 406, 410, 403, 412, 399, + 409, 409, 399, 413, 414, 415, 411, 416, 417, 399, + 415, 410, 408, 412, 418, 419, 416, 424, 422, 421, + 423, 419, 413, 421, 422, 426, 414, 417, 428, 418, + 425, 427, 423, 427, 425, 424, 428, 430, 426, 429, + 429, 431, 432, 430, 433, 435, 434, 436, 432, 434, + 438, 437, 436, 431, 437, 439, 433, 440, 448, 441, - 436, 466, 434, 439, 439, 434, 437, 435, 440, 441, - 441, 442, 442, 443, 440, 445, 446, 447, 444, 443, - 445, 449, 448, 451, 450, 447, 448, 449, 450, 452, - 453, 454, 456, 455, 452, 446, 457, 454, 455, 457, - 458, 451, 459, 459, 457, 460, 456, 461, 457, 462, - 453, 463, 461, 464, 462, 465, 467, 469, 458, 467, - 468, 465, 469, 460, 468, 463, 470, 471, 464, 472, - 473, 470, 474, 475, 477, 473, 476, 482, 478, 483, - 477, 474, 472, 471, 478, 69, 468, 479, 476, 475, - 479, 480, 481, 483, 480, 482, 484, 481, 485, 486, + 435, 140, 440, 440, 442, 442, 438, 443, 443, 438, + 444, 439, 441, 445, 445, 447, 444, 446, 446, 448, + 449, 447, 450, 451, 452, 449, 453, 455, 452, 454, + 456, 451, 453, 454, 457, 456, 458, 460, 459, 462, + 464, 450, 458, 459, 461, 455, 467, 461, 463, 463, + 465, 460, 461, 468, 457, 465, 461, 462, 464, 466, + 467, 469, 470, 471, 466, 472, 471, 469, 468, 472, + 473, 470, 474, 475, 476, 473, 477, 474, 479, 478, + 480, 477, 483, 484, 481, 483, 484, 476, 478, 475, + 481, 472, 480, 482, 479, 485, 486, 487, 488, 482, - 493, 487, 484, 485, 487, 486, 488, 489, 490, 491, - 492, 488, 489, 489, 494, 495, 492, 497, 495, 493, - 496, 490, 491, 494, 501, 498, 496, 500, 500, 497, - 498, 499, 502, 495, 502, 503, 499, 499, 504, 505, - 504, 506, 507, 508, 509, 511, 510, 512, 509, 501, - 513, 514, 515, 516, 503, 510, 517, 505, 515, 506, - 511, 507, 520, 508, 522, 512, 514, 518, 518, 513, - 519, 521, 516, 520, 519, 517, 521, 523, 524, 525, - 522, 527, 526, 530, 528, 529, 525, 526, 527, 528, - 529, 524, 531, 532, 533, 534, 523, 536, 535, 531, + 485, 489, 490, 494, 488, 497, 489, 491, 490, 495, + 491, 487, 492, 493, 486, 496, 494, 492, 493, 493, + 498, 496, 495, 499, 497, 500, 499, 501, 502, 498, + 503, 500, 505, 502, 507, 503, 503, 504, 504, 501, + 506, 499, 506, 508, 509, 508, 510, 511, 512, 514, + 513, 516, 515, 507, 513, 517, 518, 505, 514, 519, + 520, 521, 509, 524, 510, 519, 511, 515, 512, 516, + 528, 518, 522, 522, 517, 525, 527, 523, 526, 520, + 521, 523, 524, 526, 529, 531, 525, 530, 532, 528, + 531, 533, 527, 534, 530, 532, 533, 529, 534, 535, - 536, 530, 532, 535, 534, 537, 538, 542, 533, 537, - 539, 539, 540, 540, 541, 541, 542, 544, 545, 546, - 548, 540, 547, 549, 545, 550, 547, 538, 552, 551, - 553, 550, 548, 554, 557, 555, 544, 551, 63, 546, - 555, 549, 560, 563, 555, 564, 552, 555, 571, 557, - 572, 564, 563, 554, 555, 553, 565, 555, 573, 560, - 565, 566, 566, 567, 567, 568, 575, 575, 572, 571, - 570, 568, 569, 569, 569, 570, 569, 574, 576, 569, - 574, 577, 577, 573, 569, 576, 578, 579, 579, 580, - 569, 569, 581, 582, 580, 581, 584, 583, 582, 583, + 536, 537, 538, 539, 540, 541, 543, 536, 541, 540, + 537, 542, 539, 544, 544, 542, 538, 535, 549, 545, + 545, 546, 546, 547, 550, 551, 553, 543, 545, 552, + 550, 554, 547, 552, 555, 556, 557, 549, 553, 558, + 555, 559, 562, 556, 568, 551, 560, 138, 570, 554, + 565, 560, 570, 568, 557, 560, 569, 562, 560, 571, + 571, 559, 569, 576, 558, 560, 573, 565, 560, 572, + 572, 575, 573, 574, 574, 574, 575, 574, 577, 578, + 574, 580, 580, 579, 576, 574, 579, 581, 582, 582, + 583, 574, 574, 590, 581, 585, 577, 584, 584, 586, - 585, 578, 586, 587, 589, 588, 586, 591, 584, 590, - 590, 592, 589, 593, 594, 595, 596, 596, 600, 585, - 595, 600, 591, 587, 588, 592, 594, 597, 598, 599, - 601, 593, 597, 602, 598, 599, 601, 603, 604, 605, - 606, 602, 607, 609, 605, 603, 610, 606, 608, 608, - 612, 611, 609, 614, 610, 615, 604, 611, 618, 620, - 616, 607, 614, 616, 615, 617, 619, 619, 621, 612, - 617, 622, 618, 623, 620, 624, 631, 626, 624, 626, - 622, 627, 627, 628, 629, 630, 624, 621, 632, 629, - 634, 633, 638, 637, 635, 636, 631, 623, 635, 634, + 585, 587, 586, 589, 578, 583, 587, 588, 592, 588, + 591, 593, 590, 594, 591, 589, 595, 595, 596, 598, + 597, 594, 600, 599, 601, 601, 602, 600, 592, 609, + 593, 602, 603, 596, 597, 599, 604, 598, 603, 606, + 605, 607, 604, 605, 608, 606, 610, 609, 611, 607, + 612, 610, 608, 613, 613, 611, 614, 616, 615, 617, + 623, 619, 620, 616, 621, 614, 615, 621, 622, 612, + 619, 620, 625, 622, 623, 624, 624, 626, 617, 627, + 628, 629, 633, 631, 629, 631, 634, 625, 627, 632, + 632, 634, 629, 635, 637, 636, 626, 638, 639, 643, - 643, 638, 639, 640, 628, 644, 630, 642, 642, 641, - 632, 633, 637, 636, 639, 641, 645, 640, 646, 644, - 643, 647, 645, 648, 646, 647, 649, 650, 651, 652, - 652, 653, 650, 654, 655, 656, 654, 653, 649, 657, - 658, 660, 648, 659, 659, 657, 649, 662, 656, 651, - 661, 661, 655, 663, 664, 666, 667, 663, 669, 660, - 658, 670, 662, 672, 672, 673, 674, 676, 675, 673, - 667, 676, 677, 664, 708, 678, 679, 708, 669, 666, - 678, 674, 670, 671, 681, 682, 671, 677, 671, 682, - 679, 680, 671, 675, 671, 683, 680, 680, 681, 671, + 641, 640, 642, 633, 628, 640, 645, 639, 643, 648, + 644, 647, 647, 646, 635, 636, 637, 638, 641, 646, + 645, 642, 644, 649, 650, 651, 652, 653, 654, 648, + 650, 653, 652, 656, 655, 657, 659, 649, 656, 658, + 658, 660, 659, 661, 660, 651, 655, 654, 664, 662, + 668, 663, 665, 665, 655, 666, 657, 663, 667, 667, + 669, 661, 662, 670, 669, 668, 672, 673, 664, 675, + 676, 678, 678, 666, 679, 681, 682, 136, 679, 680, + 682, 673, 670, 683, 700, 685, 697, 697, 684, 675, + 672, 676, 677, 684, 680, 677, 700, 677, 683, 685, - 684, 685, 686, 687, 671, 684, 685, 688, 689, 58, - 683, 690, 691, 691, 689, 684, 686, 690, 692, 693, - 693, 688, 694, 692, 687, 693, 695, 693, 696, 697, - 699, 695, 698, 698, 694, 699, 700, 701, 693, 702, - 703, 697, 696, 707, 700, 693, 704, 704, 705, 707, - 709, 701, 705, 710, 711, 713, 712, 716, 702, 703, - 711, 712, 714, 715, 717, 719, 710, 718, 721, 709, - 717, 714, 715, 716, 713, 720, 718, 722, 723, 726, - 720, 724, 728, 725, 719, 726, 729, 731, 721, 730, - 724, 722, 725, 53, 732, 733, 728, 740, 723, 732, + 681, 677, 687, 677, 686, 689, 708, 688, 677, 686, + 686, 688, 690, 677, 691, 692, 687, 690, 693, 691, + 689, 694, 695, 702, 696, 708, 698, 690, 695, 692, + 696, 698, 699, 699, 703, 694, 701, 702, 699, 693, + 699, 701, 704, 704, 705, 706, 703, 707, 709, 705, + 715, 699, 711, 706, 710, 710, 711, 713, 699, 714, + 716, 707, 714, 713, 717, 719, 718, 709, 720, 715, + 717, 718, 721, 716, 722, 725, 723, 720, 724, 727, + 726, 721, 723, 728, 719, 726, 729, 724, 734, 730, + 722, 731, 735, 737, 725, 732, 736, 728, 730, 727, - 733, 734, 731, 735, 737, 729, 734, 730, 736, 736, - 737, 738, 735, 740, 741, 744, 745, 742, 742, 741, - 741, 742, 743, 746, 738, 743, 747, 748, 749, 744, - 750, 749, 747, 753, 751, 752, 745, 754, 746, 751, - 752, 755, 754, 756, 758, 759, 755, 748, 760, 753, - 758, 750, 761, 761, 760, 756, 762, 763, 765, 764, - 766, 759, 764, 767, 768, 762, 769, 773, 770, 771, - 52, 775, 769, 770, 771, 763, 765, 768, 774, 766, - 776, 774, 775, 767, 777, 773, 779, 778, 782, 780, - 777, 783, 776, 778, 780, 781, 781, 784, 785, 786, + 731, 732, 734, 746, 738, 739, 729, 740, 737, 738, + 739, 735, 740, 741, 736, 742, 742, 743, 744, 746, + 747, 749, 741, 743, 749, 747, 747, 750, 748, 748, + 751, 744, 748, 752, 753, 754, 755, 756, 757, 755, + 753, 750, 758, 757, 759, 762, 760, 758, 752, 761, + 751, 760, 765, 764, 761, 754, 766, 762, 756, 764, + 759, 768, 766, 767, 767, 769, 770, 771, 765, 770, + 768, 772, 773, 774, 775, 779, 776, 777, 781, 782, + 775, 776, 777, 769, 780, 771, 774, 780, 783, 781, + 772, 786, 773, 779, 787, 784, 785, 782, 789, 787, - 788, 779, 785, 787, 789, 783, 791, 782, 793, 784, - 795, 794, 787, 798, 796, 797, 805, 786, 798, 788, - 796, 797, 793, 800, 801, 791, 794, 802, 800, 789, - 795, 799, 803, 799, 804, 805, 806, 803, 801, 807, - 808, 802, 810, 806, 809, 809, 811, 812, 813, 804, - 814, 816, 816, 812, 807, 814, 810, 817, 818, 808, - 819, 821, 817, 822, 811, 818, 814, 820, 813, 814, - 820, 823, 822, 824, 819, 825, 823, 826, 832, 821, - 825, 828, 828, 829, 830, 831, 833, 829, 834, 836, - 835, 837, 824, 830, 840, 834, 826, 832, 838, 839, + 783, 784, 785, 788, 788, 790, 786, 792, 791, 793, + 795, 792, 794, 796, 798, 802, 800, 789, 803, 790, + 791, 794, 801, 805, 803, 804, 808, 793, 805, 795, + 800, 804, 806, 798, 806, 802, 807, 801, 796, 809, + 808, 807, 810, 811, 812, 813, 814, 810, 815, 816, + 816, 817, 813, 809, 818, 820, 819, 134, 811, 823, + 823, 814, 819, 812, 821, 817, 824, 815, 826, 821, + 825, 824, 818, 827, 828, 820, 827, 825, 829, 830, + 821, 831, 826, 821, 830, 832, 833, 829, 835, 835, + 832, 836, 828, 837, 838, 836, 839, 840, 842, 841, - 831, 833, 835, 841, 842, 839, 843, 845, 836, 840, - 847, 846, 837, 845, 848, 843, 838, 849, 847, 850, - 852, 851, 849, 841, 842, 846, 851, 851, 853, 858, - 854, 850, 855, 855, 848, 857, 860, 860, 858, 852, - 859, 47, 853, 854, 856, 861, 859, 862, 857, 856, - 861, 866, 856, 856, 863, 864, 862, 856, 869, 863, - 864, 865, 865, 856, 867, 868, 870, 856, 871, 872, - 868, 866, 869, 867, 871, 872, 873, 875, 874, 876, - 876, 873, 874, 877, 870, 877, 875, 878, 880, 881, - 882, 875, 880, 875, 883, 875, 884, 875, 878, 885, + 831, 843, 837, 844, 845, 833, 841, 846, 847, 838, + 842, 848, 840, 846, 849, 839, 850, 855, 853, 860, + 843, 852, 845, 847, 844, 850, 857, 852, 854, 859, + 856, 848, 853, 860, 849, 856, 854, 855, 857, 858, + 861, 862, 862, 864, 858, 858, 865, 868, 859, 867, + 867, 866, 868, 861, 863, 865, 864, 866, 873, 863, + 869, 870, 863, 863, 69, 871, 870, 863, 876, 869, + 871, 872, 872, 863, 874, 875, 877, 863, 873, 878, + 875, 879, 876, 874, 880, 878, 881, 879, 882, 880, + 881, 883, 883, 884, 877, 884, 885, 882, 888, 887, - 886, 884, 884, 883, 881, 887, 888, 889, 882, 886, - 890, 891, 893, 885, 888, 890, 894, 892, 895, 896, - 896, 889, 897, 895, 887, 891, 892, 898, 898, 900, - 893, 901, 900, 902, 903, 903, 901, 897, 904, 905, - 905, 894, 906, 907, 908, 908, 909, 906, 910, 911, - 912, 914, 902, 910, 916, 912, 915, 911, 904, 913, - 913, 916, 915, 917, 907, 919, 909, 920, 922, 914, - 921, 919, 923, 920, 922, 921, 917, 924, 925, 926, - 926, 923, 927, 928, 929, 930, 931, 933, 932, 925, - 934, 930, 935, 936, 936, 937, 924, 938, 939, 933, + 889, 890, 882, 887, 882, 892, 882, 885, 882, 891, + 890, 893, 894, 888, 891, 891, 895, 897, 889, 892, + 893, 896, 897, 898, 895, 899, 900, 901, 902, 903, + 903, 894, 904, 902, 899, 896, 908, 898, 905, 905, + 907, 908, 909, 907, 900, 910, 910, 904, 911, 912, + 912, 913, 901, 914, 915, 915, 913, 916, 917, 918, + 919, 909, 922, 917, 920, 919, 923, 918, 911, 920, + 921, 921, 923, 925, 914, 924, 929, 916, 927, 928, + 922, 929, 924, 930, 927, 928, 925, 931, 932, 930, + 933, 934, 934, 935, 936, 937, 931, 938, 941, 940, - 931, 942, 927, 928, 934, 42, 931, 929, 932, 940, - 935, 941, 941, 943, 940, 937, 939, 945, 943, 947, - 946, 948, 938, 949, 942, 946, 946, 950, 947, 948, - 951, 952, 953, 952, 954, 951, 945, 949, 951, 955, - 954, 956, 950, 955, 957, 950, 953, 958, 959, 960, - 961, 962, 956, 964, 960, 967, 965, 964, 966, 971, - 14, 968, 973, 957, 969, 970, 959, 967, 961, 973, - 975, 962, 980, 958, 965, 968, 972, 966, 971, 969, - 970, 972, 974, 976, 977, 977, 978, 974, 975, 979, - 13, 981, 976, 980, 982, 979, 981, 983, 984, 984, + 946, 933, 939, 938, 945, 943, 942, 932, 944, 944, + 941, 947, 948, 935, 936, 950, 939, 948, 937, 940, + 942, 953, 939, 943, 945, 946, 949, 949, 951, 947, + 954, 956, 955, 951, 957, 954, 954, 958, 950, 956, + 953, 955, 959, 960, 961, 960, 966, 959, 957, 963, + 959, 962, 958, 963, 964, 958, 965, 962, 961, 967, + 969, 968, 970, 972, 974, 964, 968, 972, 973, 975, + 976, 979, 966, 977, 978, 965, 63, 967, 969, 983, + 980, 975, 970, 974, 976, 980, 973, 981, 977, 978, + 979, 982, 984, 986, 981, 988, 982, 983, 985, 985, - 982, 978, 989, 983, 985, 985, 987, 987, 988, 990, - 991, 989, 988, 992, 993, 994, 994, 995, 996, 998, - 997, 993, 999, 1003, 991, 997, 996, 990, 992, 1000, - 1002, 1007, 1004, 998, 1000, 1000, 1005, 995, 1001, 1006, - 1008, 999, 1003, 1001, 1001, 1006, 1009, 1010, 1011, 1012, - 1002, 1004, 1009, 1010, 1013, 1005, 1014, 1007, 1015, 1008, - 1016, 1017, 1018, 1018, 0, 1020, 1019, 1011, 1012, 1019, - 1021, 1021, 1015, 1013, 1022, 1014, 1017, 1020, 1023, 1022, - 1024, 1016, 1023, 1025, 1026, 1027, 1029, 1027, 1035, 1030, - 1037, 1027, 1025, 1024, 1031, 1031, 1032, 1026, 1033, 1034, + 987, 984, 989, 990, 991, 998, 987, 989, 986, 990, + 991, 992, 992, 993, 993, 996, 988, 995, 995, 996, + 997, 999, 1000, 998, 1001, 1002, 1002, 1003, 1004, 997, + 1006, 1001, 1007, 1005, 1008, 999, 1004, 1000, 1005, 1008, + 1008, 1010, 1015, 1009, 1006, 1011, 1012, 1003, 1009, 1009, + 1013, 1007, 1014, 1016, 1017, 1019, 1018, 1020, 1014, 1021, + 1017, 1010, 1018, 1022, 1011, 1012, 1023, 1024, 1015, 1013, + 1025, 58, 1016, 1031, 1019, 1028, 1020, 1031, 1021, 1037, + 1023, 1032, 1022, 1026, 1026, 1025, 1027, 1028, 1024, 1027, + 1029, 1029, 1030, 1033, 1032, 1034, 1038, 1030, 1035, 1037, - 1036, 1032, 1033, 1034, 1027, 1030, 1029, 1038, 1035, 1041, - 1037, 1039, 1039, 1038, 1043, 1044, 1044, 1045, 1036, 1043, - 1047, 1047, 1050, 1045, 1049, 1049, 1052, 1041, 1054, 1052, - 1053, 1053, 1055, 1056, 1057, 1058, 1059, 1059, 1050, 1057, - 1060, 1061, 1063, 1054, 1060, 1062, 1062, 1056, 1064, 1065, - 1058, 1066, 1071, 1065, 1070, 1067, 1074, 1055, 1075, 1064, - 1067, 1061, 1069, 1069, 1063, 1078, 1071, 1072, 1072, 1073, - 1066, 1076, 1070, 1079, 1073, 1079, 1074, 1077, 1075, 1080, - 1076, 1081, 1077, 1082, 1080, 1078, 1083, 1081, 1085, 1086, - 1086, 1087, 1083, 1088, 1090, 1091, 1091, 1092, 1092, 1088, + 1035, 1043, 1033, 1041, 1035, 1039, 1039, 1041, 1034, 1040, + 1044, 1042, 1038, 1045, 1040, 1042, 1046, 1035, 1047, 1047, + 1049, 1043, 1046, 1058, 1051, 1052, 1052, 1063, 1044, 1051, + 1053, 1055, 1055, 1045, 1057, 1057, 1053, 1060, 1049, 1058, + 1060, 1061, 1061, 1062, 1064, 1064, 1065, 1067, 1066, 1068, + 1068, 1069, 1063, 1066, 1070, 1069, 1071, 1071, 1062, 1072, + 1065, 1073, 1067, 1074, 1075, 1076, 1079, 1074, 1078, 1078, + 1076, 1080, 1073, 1082, 1070, 1081, 1081, 1083, 1082, 1084, + 1085, 1072, 1086, 1075, 1079, 1080, 1087, 1086, 1088, 1085, + 1088, 1089, 1090, 1091, 1092, 1094, 1089, 1083, 1090, 1084, - 1094, 1093, 1085, 1082, 1095, 1096, 1096, 1095, 1097, 1098, - 1087, 1100, 1104, 1102, 1230, 1094, 1230, 1100, 1090, 1093, - 1097, 1099, 1102, 1101, 1099, 1103, 1106, 1099, 1101, 1098, - 1103, 1105, 1106, 1108, 1105, 1107, 1107, 1104, 1109, 1099, - 1110, 1111, 1114, 1112, 1113, 1116, 1116, 1111, 1112, 1115, - 1113, 1108, 1118, 1117, 1115, 1119, 1120, 1109, 1117, 1121, - 1110, 1125, 1123, 1122, 1126, 1114, 1124, 1125, 1127, 1128, - 1118, 1129, 1137, 1121, 1123, 1119, 1120, 1122, 1132, 1124, - 1131, 1131, 1133, 1128, 1126, 1134, 1134, 1133, 1127, 1135, - 1138, 1136, 1129, 1139, 1140, 1143, 1137, 1145, 1132, 1141, + 1092, 1095, 1095, 1096, 1097, 1099, 1087, 1100, 1100, 1094, + 1097, 1101, 1101, 1091, 1102, 1103, 1104, 1105, 1105, 1104, + 1107, 1106, 1096, 1113, 1240, 1108, 1240, 1111, 1108, 1099, + 1103, 1108, 1102, 1106, 1110, 1109, 1111, 1112, 1117, 1110, + 1107, 1109, 1112, 1108, 1114, 1115, 1118, 1114, 1113, 1116, + 1116, 1115, 1119, 1120, 1123, 1121, 1117, 1122, 1127, 1120, + 1121, 1124, 1128, 1122, 1126, 1118, 1124, 1125, 1125, 1126, + 1129, 1130, 1119, 1131, 1132, 1133, 1127, 1123, 1134, 1135, + 1136, 1137, 1128, 1138, 1134, 1130, 1132, 1131, 1133, 1141, + 1129, 1140, 1140, 1142, 1145, 1137, 1143, 1143, 1142, 1135, - 1147, 1142, 1139, 1151, 1135, 1136, 1141, 0, 1138, 1140, - 1142, 1143, 1145, 1142, 1148, 1148, 1152, 1145, 1149, 1149, - 1150, 1152, 1151, 1150, 1153, 1147, 1154, 1155, 1157, 1156, - 1158, 1159, 1159, 1160, 1161, 1154, 1158, 1157, 1156, 1162, - 1153, 1156, 1163, 1164, 1167, 1168, 1155, 1161, 1165, 1169, - 1169, 1170, 1171, 1160, 1180, 1180, 1163, 1162, 1186, 1164, - 1165, 1171, 1175, 1168, 1174, 1172, 1179, 1170, 1178, 1167, - 1172, 1173, 1173, 1174, 1178, 1181, 1174, 1176, 1186, 1188, - 1175, 1181, 1176, 1176, 1179, 1182, 1173, 1183, 1184, 1187, - 1182, 1192, 1188, 1183, 1184, 1187, 1189, 1195, 1193, 1189, + 1136, 1144, 1146, 1147, 1138, 1148, 1150, 1149, 1145, 1141, + 1154, 1151, 1152, 1150, 1148, 1156, 1144, 1157, 1157, 1160, + 1151, 1147, 1149, 1151, 1159, 1154, 1146, 1159, 1152, 1161, + 1154, 1158, 1158, 1162, 1161, 1163, 1164, 1166, 1160, 1165, + 1156, 1167, 1168, 1168, 1163, 1169, 1166, 1167, 1165, 1162, + 1170, 1165, 1171, 1172, 1174, 1164, 1173, 1176, 1177, 1178, + 1178, 1179, 1180, 1170, 1181, 1169, 1174, 1172, 1184, 1181, + 1171, 1180, 1173, 1182, 1182, 1183, 1177, 1179, 1188, 1189, + 1189, 53, 1176, 1187, 1183, 1185, 1184, 1183, 1182, 1187, + 1185, 1185, 1190, 1195, 1191, 1192, 1188, 1193, 1190, 1191, - 1194, 1196, 1197, 1198, 1199, 1189, 1193, 1202, 1197, 1208, - 1192, 1201, 1201, 1194, 1203, 1195, 1204, 1207, 1203, 1198, - 1196, 1204, 1199, 1205, 1206, 1210, 1207, 1202, 1205, 1206, - 1211, 1211, 1208, 1212, 1213, 1216, 1214, 1215, 1217, 1218, - 1210, 1213, 1220, 1219, 1221, 1218, 0, 1212, 1214, 1215, - 1221, 1222, 1222, 1223, 1216, 1219, 1223, 1227, 1217, 1226, - 1220, 1224, 1224, 1229, 1226, 1231, 1227, 1228, 1228, 1232, - 1233, 1234, 1235, 1236, 1237, 1229, 1239, 1235, 1238, 1241, - 1242, 1239, 1236, 1240, 1244, 1231, 1237, 1245, 1233, 1234, - 1244, 1232, 1240, 1238, 1246, 1242, 1243, 1243, 1247, 1241, + 1196, 1192, 1197, 1193, 1201, 1198, 1196, 1203, 1198, 1202, + 1204, 1205, 1206, 1195, 1198, 1197, 1207, 1202, 1208, 1209, + 1203, 1212, 1207, 1201, 1218, 1206, 1211, 1211, 1204, 1213, + 1205, 1214, 1222, 1213, 1208, 1215, 1214, 1209, 1216, 1217, + 1215, 1212, 1220, 1216, 1221, 1221, 1222, 1218, 1217, 1223, + 1224, 1225, 1226, 1227, 1228, 1229, 1223, 1220, 1230, 1231, + 1228, 1233, 1224, 1225, 1233, 1231, 1239, 1229, 1232, 1232, + 1237, 1226, 1236, 1227, 1234, 1234, 1230, 1236, 1239, 1237, + 1238, 1238, 1241, 1242, 1245, 1243, 1244, 1246, 1247, 1245, + 1249, 1248, 1250, 1251, 1252, 1249, 1246, 1253, 1253, 1255, - 1248, 1248, 1249, 1250, 1250, 1240, 1251, 1253, 1245, 1252, - 1252, 1253, 1255, 1246, 1254, 1255, 1258, 1257, 1247, 1259, - 1254, 1260, 1249, 1257, 1265, 1259, 1261, 1251, 1266, 1261, - 1262, 1262, 1263, 1263, 1258, 1264, 1265, 1265, 1265, 1267, - 1269, 1264, 1272, 1265, 1268, 1279, 1260, 1271, 1266, 1273, - 1268, 1273, 1271, 1271, 1274, 1275, 1272, 1276, 1277, 1267, - 1269, 1278, 1281, 1276, 1283, 1274, 1279, 1277, 1280, 1280, - 1275, 1282, 1282, 1284, 1285, 1285, 1286, 1286, 1289, 1290, - 1294, 1278, 1291, 1291, 1283, 1293, 1292, 1289, 1281, 1294, - 1295, 1297, 1293, 1296, 1296, 1284, 1298, 1300, 1301, 1302, + 1247, 1250, 1241, 1243, 1244, 1242, 1248, 1256, 1257, 1252, + 1254, 1258, 1258, 1251, 1250, 1259, 1254, 1260, 1260, 1261, + 1255, 1262, 1262, 1263, 1264, 1267, 1256, 1263, 1257, 1265, + 1264, 1267, 1265, 1268, 1270, 1259, 1269, 1276, 1271, 52, + 1261, 1271, 1269, 1272, 1272, 1273, 1273, 1274, 1275, 1277, + 1278, 1268, 1279, 1274, 1282, 1284, 1278, 1276, 1281, 1270, + 1275, 1275, 1275, 1281, 1281, 1285, 1284, 1275, 1282, 1277, + 1286, 1283, 1279, 1283, 1287, 1288, 1286, 1289, 1290, 1290, + 1285, 1291, 1293, 1287, 1292, 1292, 1294, 1295, 1295, 1296, + 1296, 1299, 1300, 1301, 1301, 1288, 1302, 1303, 1289, 1305, - 1290, 1292, 1300, 1303, 1301, 1304, 1309, 1305, 1306, 1306, - 1303, 1304, 1298, 1305, 1308, 1307, 1295, 1297, 1310, 1302, - 1307, 1311, 1312, 1308, 1313, 1312, 1309, 1314, 1315, 1315, - 1316, 1317, 1320, 1311, 1324, 1317, 1319, 1310, 1322, 1323, - 1324, 1325, 1313, 1323, 1329, 1316, 1330, 1320, 1326, 1326, - 1325, 1317, 1327, 1314, 1331, 1319, 1332, 1322, 1328, 1328, - 1330, 1336, 1332, 1327, 1334, 1329, 1333, 1333, 1327, 1334, - 1334, 1335, 1337, 1338, 1331, 1343, 1340, 1335, 1341, 1338, - 1342, 1345, 1341, 1344, 1337, 1346, 1347, 1336, 1340, 1344, - 1349, 1346, 1342, 1349, 1350, 1350, 1351, 1351, 1347, 1353, + 1299, 1304, 1293, 1307, 1303, 1306, 1306, 1291, 1294, 1310, + 1304, 1302, 1308, 1300, 1310, 1311, 1312, 1313, 1316, 1316, + 1314, 1311, 1318, 1319, 1313, 1305, 1314, 1315, 1308, 1307, + 1317, 1318, 1320, 1315, 1321, 1317, 1312, 1322, 1323, 1324, + 1322, 1325, 1325, 1319, 1326, 1329, 1321, 1330, 1327, 1333, + 1332, 1320, 1327, 1333, 1334, 1339, 1323, 1335, 1341, 1326, + 1334, 1337, 1330, 47, 1329, 1324, 1335, 1340, 1327, 1332, + 1336, 1336, 1337, 1338, 1338, 1347, 1339, 1337, 1341, 1342, + 1345, 1340, 1343, 1343, 1344, 1342, 1345, 1346, 1348, 1344, + 1344, 1349, 1351, 1346, 1352, 1353, 1354, 1349, 1352, 1355, - 1343, 1352, 1352, 1345, 1354, 1355, 1358, 1356, 1357, 1363, - 1354, 1355, 1356, 1360, 1357, 1358, 1365, 1362, 1360, 1353, - 1362, 1363, 1366, 1367, 1367, 1369, 1368, 1370, 1365, 1372, - 1369, 1373, 1370, 1374, 1366, 1368, 1371, 1371, 1375, 1376, - 1373, 1377, 1378, 1376, 1379, 1382, 1377, 1383, 1378, 1372, - 1384, 1374, 1381, 1381, 1386, 1386, 1383, 1375, 1379, 1384, - 1388, 1391, 1390, 1382, 1381, 1392, 1393, 1394, 1394, 1400, - 1395, 1392, 1395, 1396, 1396, 1391, 1388, 1390, 1397, 1402, - 1399, 1401, 1401, 1393, 1403, 1404, 1397, 1399, 1402, 1400, - 1405, 1406, 1407, 1408, 1409, 1411, 1414, 1404, 1412, 1415, + 1348, 1347, 1356, 1357, 1351, 1355, 1358, 1353, 1360, 1357, + 1364, 1360, 1361, 1361, 1362, 1362, 1363, 1363, 1358, 1365, + 1366, 1354, 1367, 1368, 1356, 1365, 1366, 1367, 1369, 1368, + 1364, 1371, 1373, 1374, 1376, 1373, 1371, 1369, 1377, 1378, + 1378, 1383, 1379, 1380, 1381, 1374, 1376, 1384, 1380, 1381, + 1377, 1379, 1382, 1382, 1385, 1386, 1384, 1389, 1387, 1388, + 1394, 1383, 1387, 1389, 1388, 1390, 1392, 1392, 1393, 1394, + 1401, 1395, 1385, 1399, 1386, 1397, 1397, 1402, 1392, 1390, + 1395, 1403, 1404, 1405, 1405, 1401, 1393, 1403, 1406, 1399, + 1406, 1402, 1407, 1407, 1408, 1411, 1410, 1412, 1412, 1404, - 1409, 1416, 1405, 1406, 1416, 1403, 1413, 1413, 1408, 1418, - 1412, 1417, 1420, 1409, 1414, 1411, 1417, 1420, 1407, 1415, - 1421, 1422, 1421, 1423, 1424, 1426, 1429, 1431, 1423, 1418, - 1427, 1424, 1427, 1432, 1426, 1430, 1430, 1434, 1432, 1422, - 1429, 1433, 1434, 1433, 1435, 1436, 1437, 1439, 1438, 1435, - 1441, 1440, 1439, 1431, 1438, 1443, 1444, 1447, 1441, 1445, - 1445, 1446, 1446, 1436, 1440, 1448, 1437, 1449, 1452, 1457, - 1444, 1450, 1447, 1449, 1443, 1451, 1450, 1451, 1453, 1453, - 1452, 1454, 1454, 1455, 1456, 1448, 1456, 1458, 1458, 1459, - 1457, 1460, 1455, 1465, 1462, 1455, 1463, 1466, 1459, 1462, + 1413, 1414, 1408, 1410, 1415, 1416, 1417, 1418, 1419, 1413, + 1422, 1425, 1423, 1420, 1426, 1411, 1415, 1416, 1417, 1420, + 1424, 1424, 1414, 1419, 1423, 1427, 1428, 1429, 1427, 1425, + 1422, 1428, 1420, 1418, 1426, 1431, 1432, 1433, 1432, 1434, + 1431, 1435, 1437, 1438, 1434, 1438, 1440, 1429, 1435, 1441, + 1441, 1437, 1442, 1443, 1444, 1433, 1444, 1445, 1443, 1446, + 1440, 1447, 1445, 1448, 1446, 1449, 1452, 1450, 1451, 1454, + 1455, 1449, 1450, 1459, 1452, 1456, 1456, 1458, 1442, 1447, + 42, 1451, 1461, 1448, 1455, 1457, 1457, 1461, 1454, 1460, + 1463, 1468, 1458, 1459, 1462, 1460, 1462, 1464, 1464, 1465, - 1467, 1463, 1470, 1460, 1468, 1472, 1465, 1473, 1470, 1474, - 1475, 1472, 1476, 1476, 1477, 1478, 1478, 1466, 1467, 1475, - 1468, 1470, 1473, 1477, 1479, 1480, 1481, 1482, 1485, 1480, - 1483, 1481, 0, 1484, 1474, 1483, 1483, 1488, 1488, 1494, - 1482, 1484, 1490, 1479, 1489, 1489, 1491, 1491, 1485, 1492, - 1492, 1490, 1493, 1496, 1495, 1497, 1497, 1494, 1496, 1489, - 1495, 1498, 1501, 1500, 1493, 1502, 1498, 1500, 1504, 1502, - 1489, 1505, 1506, 1507, 1508, 1510, 1505, 1513, 1509, 1508, - 1511, 1511, 1501, 1512, 1514, 1515, 1516, 1512, 1507, 1514, - 1518, 1510, 1513, 1504, 1519, 1506, 1509, 1520, 1522, 1521, + 1465, 1466, 1463, 1467, 1471, 1467, 1469, 1469, 1470, 1473, + 1466, 1476, 1468, 1466, 1473, 1474, 1471, 1470, 1477, 1478, + 1474, 1481, 1483, 1479, 1476, 1484, 1485, 1481, 1483, 1486, + 1488, 1488, 1491, 1487, 1489, 1490, 1490, 1478, 1477, 1479, + 1481, 1485, 1487, 1489, 1494, 1492, 1497, 1493, 1484, 1492, + 1495, 1491, 1493, 1496, 1486, 1495, 1495, 1494, 1500, 1500, + 1502, 1496, 1501, 1501, 1503, 1503, 1497, 1504, 1504, 1502, + 1505, 1506, 1507, 1513, 1508, 1509, 1509, 1501, 1507, 1508, + 1510, 1516, 1505, 1512, 1518, 1510, 1514, 1512, 1501, 1506, + 1514, 1517, 1520, 1513, 1519, 1521, 1517, 1520, 1522, 1523, - 1523, 1524, 1527, 1527, 1528, 1516, 1530, 1528, 1526, 1518, - 0, 1515, 1523, 1529, 1531, 1532, 1532, 1519, 1521, 1522, - 1530, 1520, 1524, 1526, 1533, 1533, 1529, 1531, 1534, 1534, - 1535, 1536, 1537, 1537, 1538, 1539, 1539, 1540, 1543, 1544, - 0, 1545, 1540, 1538, 1536, 1535, 1538, 1542, 1546, 1546, - 1547, 1547, 1542, 1545, 1548, 1549, 1549, 1550, 1543, 1544, - 1551, 1551, 1552, 1552, 1553, 1554, 1556, 1557, 1557, 1558, - 1565, 1556, 1560, 1548, 1561, 1550, 1559, 1559, 1553, 1562, - 1561, 1566, 1562, 1567, 1554, 1563, 1563, 1570, 1558, 1565, - 1560, 1564, 1564, 1568, 1568, 1571, 1566, 1572, 1575, 1573, + 1523, 1524, 1525, 1526, 1527, 1524, 1516, 1518, 1526, 1519, + 1528, 1531, 1530, 1521, 1522, 1532, 1533, 1525, 1538, 1534, + 1535, 1536, 1539, 1539, 1540, 1541, 14, 1540, 1543, 1528, + 1527, 1530, 1535, 1538, 1531, 1533, 1542, 1547, 1541, 1532, + 1534, 1543, 1536, 1544, 1544, 1545, 1545, 1546, 1546, 1548, + 1542, 1550, 1547, 1549, 1549, 1551, 1551, 1555, 1556, 1552, + 1550, 1554, 1548, 1550, 1552, 1560, 1554, 1557, 1558, 1558, + 1559, 1559, 1561, 1561, 1562, 1563, 1563, 1555, 1556, 1557, + 1564, 1564, 1565, 1566, 1560, 1568, 1569, 1569, 1570, 1573, + 1568, 1572, 1562, 1571, 1571, 1573, 1565, 1574, 1575, 1575, - 1577, 1563, 1567, 1573, 1574, 1574, 1578, 1570, 1576, 1576, - 1579, 1584, 1572, 1578, 1580, 1580, 1581, 1575, 1571, 1582, - 1577, 1582, 1585, 1584, 1586, 1581, 1587, 1585, 1589, 1588, - 1590, 1591, 1592, 1589, 1593, 1590, 1579, 1595, 1594, 1587, - 1597, 1592, 1596, 1593, 1597, 1599, 1591, 1594, 1596, 1586, - 1588, 1595, 1601, 1602, 1602, 1605, 1603, 1604, 1604, 1607, - 1608, 1601, 1603, 1611, 1610, 1599, 1604, 1612, 1613, 1608, - 1615, 1617, 1618, 1615, 1607, 1605, 1610, 1605, 1616, 1611, - 1613, 1626, 1612, 1616, 1618, 1619, 1619, 1621, 1621, 1622, - 1623, 1617, 1624, 1628, 1622, 1626, 1623, 1629, 1624, 1625, + 1574, 1577, 1566, 1576, 1576, 1579, 1578, 1570, 1582, 1572, + 1580, 1580, 1583, 1585, 1575, 1584, 1589, 1585, 1586, 1586, + 1577, 1578, 1587, 1591, 1579, 1588, 1588, 1590, 1582, 1593, + 1584, 1592, 1592, 1596, 1590, 1583, 1589, 1594, 1593, 1594, + 1598, 1587, 1597, 1599, 1603, 1596, 1600, 1597, 1601, 1591, + 1602, 1604, 1605, 1601, 1606, 1602, 1599, 1607, 1608, 1603, + 1604, 1605, 1609, 1606, 1612, 1598, 1607, 1600, 1609, 1610, + 1614, 1616, 1608, 1610, 1615, 1615, 1618, 1616, 1620, 1614, + 1617, 1617, 1621, 1623, 1612, 1624, 1630, 1625, 1626, 1617, + 1664, 1621, 1664, 1620, 1628, 1623, 1618, 1628, 1618, 1629, - 1625, 1627, 1627, 1630, 1633, 1628, 1631, 1631, 1633, 1634, - 1636, 1629, 1634, 1635, 1635, 1636, 1637, 1638, 1639, 1640, - 1641, 1642, 1630, 1640, 1643, 1644, 1642, 1645, 1647, 1648, - 1643, 1644, 1639, 1649, 1648, 1650, 1637, 1638, 1654, 1649, - 1641, 1655, 1655, 1650, 1647, 1645, 1651, 1656, 1651, 1657, - 1656, 1660, 1654, 1658, 1658, 1660, 1661, 1662, 1663, 1663, - 1669, 1664, 1661, 1667, 1667, 1681, 1672, 1673, 1680, 1662, - 1664, 1672, 1673, 1674, 1674, 1657, 1676, 1676, 1669, 1678, - 1679, 1679, 1684, 1682, 1680, 1678, 1685, 1681, 1682, 1686, - 1686, 1688, 1690, 1689, 1691, 1693, 1693, 0, 1685, 1689, + 1626, 1624, 1625, 1631, 1629, 1641, 1630, 1632, 1632, 1634, + 1634, 1635, 1636, 1637, 1639, 1631, 1635, 1641, 1636, 1637, + 1638, 1638, 1640, 1640, 1642, 1643, 1644, 1644, 1639, 1646, + 1650, 1647, 1649, 1646, 1647, 1648, 1648, 1649, 1642, 1651, + 1652, 1653, 1654, 1655, 1643, 1653, 1656, 1657, 1655, 1658, + 1650, 1661, 1656, 1657, 1652, 1660, 1661, 1662, 1663, 1651, + 1667, 1670, 1654, 1662, 1668, 1668, 1663, 1658, 1675, 1669, + 1677, 1660, 1669, 1673, 1667, 1671, 1671, 1673, 1674, 1677, + 1675, 1676, 1676, 1682, 1674, 1680, 1680, 1670, 1685, 1686, + 1687, 1687, 1691, 1685, 1686, 1689, 1689, 1693, 1691, 1692, - 1688, 1684, 1695, 1695, 1696, 1696, 1697, 1699, 1700, 1691, - 1690, 1697, 1698, 1701, 1698, 1702, 1702, 1705, 1701, 1703, - 1703, 1699, 1700, 1704, 1704, 1706, 1707, 1707, 1708, 1705, - 1709, 1710, 1711, 1713, 1712, 1714, 1714, 1715, 1710, 1712, - 1708, 1716, 1709, 1706, 1711, 1717, 1715, 1718, 1719, 1720, - 1721, 1721, 1722, 1713, 1724, 1723, 1725, 1727, 0, 1726, - 1718, 1722, 1726, 1720, 1728, 1717, 1735, 1716, 1737, 1728, - 1729, 1727, 1719, 1723, 1736, 1729, 1724, 1730, 1730, 1725, - 1731, 1731, 1732, 1732, 1735, 1736, 1739, 1737, 1741, 1740, - 1743, 1742, 1744, 1746, 1746, 1745, 1748, 1748, 1750, 1743, + 1692, 1682, 1694, 1695, 1697, 1698, 1699, 1699, 1695, 1701, + 1702, 1703, 1704, 1693, 1706, 1706, 1702, 1698, 1701, 1708, + 1708, 1709, 1709, 1697, 1694, 1710, 1711, 1704, 1711, 1703, + 1710, 1712, 1713, 1714, 1715, 1715, 1716, 1716, 1714, 1717, + 1717, 1718, 1719, 1720, 1720, 1712, 1713, 1721, 1723, 1722, + 1724, 1725, 1726, 1718, 1727, 1723, 1729, 1726, 1730, 1721, + 1719, 1722, 1724, 1728, 1728, 1729, 1731, 1732, 1733, 1734, + 1736, 1725, 1735, 1735, 1727, 1737, 1738, 1739, 1740, 1736, + 1732, 1740, 1741, 1734, 1730, 1742, 1731, 1744, 1744, 1743, + 1742, 1749, 1733, 1737, 1743, 1750, 1741, 1751, 1738, 1753, - 1749, 1751, 1752, 1753, 1754, 1756, 1739, 1740, 1751, 1749, - 1741, 1742, 1744, 1745, 1755, 1760, 1750, 1752, 1757, 1757, - 1761, 1753, 1754, 1759, 1756, 1758, 1758, 1762, 1764, 1759, - 1755, 1763, 1765, 1760, 1766, 1761, 1763, 1772, 1767, 1766, - 1767, 1768, 1768, 1769, 1774, 1769, 1762, 1775, 1764, 1770, - 1770, 1776, 1765, 1774, 1779, 1780, 1772, 1782, 1780, 1781, - 1781, 1783, 1784, 1784, 1785, 1787, 1795, 1775, 1785, 1788, - 1776, 1790, 1782, 1788, 1779, 1789, 1789, 1792, 1792, 1783, - 1787, 1794, 1794, 1797, 1790, 1795, 1796, 1796, 1797, 1798, - 1798, 1802, 1802, 1803, 1804, 1805, 1806, 1807, 1808, 1809, + 1739, 1745, 1745, 1746, 1746, 1754, 1750, 1755, 1756, 1749, + 1758, 1757, 1763, 1759, 1760, 1760, 1751, 1762, 1762, 1753, + 1757, 1763, 1764, 1754, 1766, 1765, 1767, 1768, 1756, 1755, + 1758, 1759, 1765, 1769, 1770, 1771, 1771, 1772, 1772, 1766, + 1764, 1773, 1774, 1775, 1767, 1768, 1776, 1773, 1778, 1769, + 1777, 1779, 1780, 1770, 1781, 1777, 1781, 1780, 1775, 1786, + 1774, 1782, 1782, 1788, 1783, 1776, 1783, 1789, 1778, 1784, + 1784, 1779, 1788, 1790, 1793, 1796, 1794, 1797, 1786, 1794, + 1795, 1795, 1798, 1798, 1799, 1801, 1804, 1789, 1799, 1802, + 1796, 1809, 1790, 1802, 1793, 1797, 1803, 1803, 1817, 1804, - 1810, 1806, 1812, 1808, 1805, 1813, 1815, 1804, 1810, 1814, - 1813, 1807, 1816, 1816, 1814, 1803, 1818, 1812, 1809, 1817, - 1817, 1815, 1819, 1818, 1820, 1823, 1821, 1819, 1822, 1822, - 1820, 1821, 1824, 1825, 1825, 1826, 1826, 1824, 1829, 1830, - 1823, 1831, 1832, 1833, 1830, 1830, 1831, 1832, 1834, 1833, - 1835, 1829, 1834, 1836, 1837, 1835, 1838, 1842, 1839, 1840, - 1842, 1843, 1836, 1839, 1838, 1844, 1843, 1845, 1846, 1837, - 1847, 1840, 1848, 1848, 1852, 1849, 1853, 1846, 1854, 1847, - 1845, 1855, 1855, 1844, 1849, 1856, 1857, 1858, 1859, 1859, - 1860, 1862, 1864, 1852, 1865, 1857, 1853, 1854, 1865, 1866, + 1801, 1806, 1806, 1808, 1808, 1810, 1810, 1811, 1812, 1812, + 1809, 1818, 1811, 1816, 1816, 1821, 1819, 1820, 1822, 1823, + 1817, 1824, 1820, 1822, 1818, 1819, 1825, 1823, 1827, 1821, + 1828, 1829, 1830, 13, 1825, 1828, 1829, 1831, 1831, 1833, + 1824, 1832, 1832, 1827, 1834, 1835, 1833, 1830, 1836, 1834, + 1838, 1835, 1839, 1836, 1837, 1837, 1844, 1839, 1840, 1840, + 1841, 1841, 1845, 1863, 1863, 1838, 1846, 1845, 1845, 1844, + 1847, 1846, 1848, 1849, 1850, 1847, 1851, 1849, 1848, 1850, + 1852, 1853, 1854, 1857, 1855, 1851, 1857, 1854, 1858, 1853, + 1859, 1860, 1861, 1858, 1862, 1852, 1855, 1864, 1867, 1868, - 1867, 1867, 1858, 1868, 1856, 1866, 1862, 1871, 1869, 1860, - 1872, 1868, 1864, 1869, 1874, 1875, 1871, 1876, 1874, 1878, - 1878, 1881, 1881, 1872, 1883, 1885, 1886, 1886, 1893, 1875, - 1887, 1887, 1876, 1888, 1889, 1889, 1888, 1890, 1890, 1891, - 1891, 1892, 1892, 1894, 1883, 1885, 1893, 1895, 1896, 1896, - 1897, 1901, 1902, 1895, 1897, 1900, 1903, 1894, 1902, 1904, - 1900, 1900, 1903, 1905, 1906, 1906, 1909, 1905, 1912, 1910, - 1913, 1909, 1910, 1913, 1901, 1915, 1918, 1914, 1916, 1917, - 1915, 1919, 1919, 1920, 1904, 1922, 1923, 1923, 0, 1921, - 1918, 1924, 1924, 1912, 1914, 1914, 1916, 1921, 1926, 1917, + 1873, 1861, 1869, 1862, 1860, 1871, 1864, 1872, 1859, 1870, + 1870, 1874, 1874, 1875, 1877, 1873, 1872, 1867, 1879, 1868, + 0, 1869, 1880, 1887, 1871, 1881, 1880, 1882, 1882, 1877, + 1884, 1881, 1875, 1883, 1886, 1884, 1887, 1890, 1879, 1891, + 1889, 1883, 1898, 1886, 1889, 1893, 1893, 1896, 1896, 1900, + 0, 1890, 1901, 1901, 1891, 1902, 1902, 1903, 1904, 1904, + 1903, 1907, 1898, 1905, 1905, 1906, 1906, 1908, 1908, 1900, + 1909, 1910, 1911, 1912, 1912, 1913, 1907, 1916, 1911, 1913, + 1917, 1918, 1916, 1916, 1919, 1910, 1920, 1918, 1909, 1921, + 1919, 1922, 1922, 1921, 1925, 1926, 1928, 1929, 1926, 1925, - 1925, 1925, 1920, 1927, 1922, 1928, 1929, 1930, 1927, 1931, - 1932, 1934, 1934, 1936, 1926, 1935, 1930, 1939, 1935, 1938, - 1938, 1940, 1940, 1941, 1939, 1928, 1942, 1944, 1941, 1931, - 1932, 1936, 1929, 1945, 1945, 1942, 1946, 1947, 1948, 1950, - 1946, 1951, 1949, 1953, 1953, 1944, 1947, 1949, 1949, 1954, - 1951, 1955, 1950, 1948, 1957, 1959, 1962, 1964, 1954, 1963, - 1963, 1962, 1971, 1955, 1966, 1972, 1964, 1959, 1970, 1966, - 1967, 1967, 1969, 1969, 1967, 1973, 1978, 1970, 1976, 1957, - 1973, 1975, 1971, 1976, 1972, 1977, 1977, 1975, 1979, 1981, - 1980, 1982, 1983, 1986, 1978, 1980, 1987, 1982, 1984, 1984, + 1929, 1930, 1931, 1917, 1932, 1933, 1934, 1931, 1935, 1935, + 1936, 1920, 1938, 1939, 1939, 1937, 1940, 1940, 1930, 1930, + 1934, 1928, 1932, 1937, 1942, 1933, 1941, 1941, 1943, 1936, + 1944, 1938, 1945, 1943, 1946, 1947, 1948, 1950, 1950, 1951, + 1942, 1952, 1951, 1946, 1954, 1954, 1955, 1956, 1956, 1957, + 1944, 1958, 1960, 1955, 1957, 1947, 1948, 1963, 1945, 1952, + 1958, 1961, 1961, 1962, 1964, 1966, 1963, 1962, 1965, 1973, + 1960, 1967, 1970, 1965, 1965, 1969, 1969, 1971, 1966, 1964, + 1967, 1970, 1977, 1975, 1981, 1979, 1980, 1980, 1988, 1971, + 1979, 1983, 1996, 1981, 1973, 1975, 1983, 1984, 1984, 1986, - 1988, 1988, 1989, 1992, 1990, 1991, 1993, 1981, 1990, 1979, - 1994, 1987, 1986, 1996, 1991, 1989, 1995, 1983, 1994, 1992, - 2003, 1995, 1997, 1997, 1998, 1993, 2000, 2000, 2001, 2001, - 2005, 2005, 2006, 2007, 2009, 2009, 2010, 2011, 2007, 1996, - 2012, 2003, 2017, 1998, 2014, 2014, 2020, 2015, 2006, 2018, - 2018, 2019, 2019, 2021, 2022, 2020, 2010, 2023, 2029, 2012, - 2011, 2015, 2024, 2024, 2017, 2025, 2022, 2028, 2025, 2026, - 2026, 2033, 2021, 2037, 2030, 2031, 2031, 2023, 2029, 2028, - 2030, 2032, 2035, 2036, 2032, 2038, 2039, 2035, 2036, 2033, - 2043, 2038, 2037, 2040, 2040, 2042, 2042, 2045, 2045, 2047, + 1986, 1984, 1987, 1977, 1989, 1990, 1992, 1995, 1988, 1993, + 1990, 1987, 1992, 1996, 1993, 1994, 1994, 1997, 1998, 2000, + 1999, 2003, 1997, 1989, 2004, 1995, 1999, 2001, 2001, 2005, + 2005, 2007, 2006, 2008, 2009, 2007, 1998, 2010, 2011, 2004, + 2003, 2013, 2008, 2012, 2000, 2006, 2011, 2015, 2012, 2020, + 2009, 2014, 2014, 2017, 2017, 2023, 2010, 2018, 2018, 2022, + 2022, 2026, 2026, 2024, 2027, 2028, 2015, 2013, 2024, 2032, + 2020, 2023, 2029, 2031, 2031, 2034, 2035, 2035, 2036, 2036, + 2037, 2038, 2040, 2032, 2027, 2039, 2041, 2043, 2028, 2037, + 2043, 2029, 2042, 2042, 2040, 2044, 2044, 2034, 2046, 2047, - 2046, 2048, 2057, 2039, 2039, 2046, 2048, 2049, 2049, 2043, - 2050, 2050, 2052, 2047, 2051, 2051, 2059, 2052, 2054, 2054, - 2063, 2057, 2060, 2060, 2062, 2062, 2064, 2065, 2066, 2066, - 2067, 2070, 2071, 2075, 2063, 2067, 2065, 2076, 2059, 2073, - 2071, 2072, 2072, 2077, 2073, 2070, 2064, 2078, 2077, 2079, - 2081, 2082, 2083, 2075, 2085, 2079, 2084, 2076, 2081, 2078, - 2086, 2087, 2088, 2091, 2093, 2093, 2110, 2088, 2094, 2094, - 2085, 2082, 2083, 2110, 2084, 2095, 2106, 2086, 2086, 2095, - 2099, 2099, 2087, 2091, 2101, 2101, 2102, 2102, 2103, 2102, - 2105, 2105, 2103, 2107, 2106, 2109, 2109, 2111, 2113, 2114, + 2050, 2038, 2048, 2050, 2039, 2051, 2041, 2055, 2048, 2053, + 2046, 2049, 2049, 2054, 2053, 2056, 2057, 2061, 2054, 2047, + 2280, 2056, 2280, 2051, 2058, 2058, 2055, 2060, 2060, 2063, + 2063, 2065, 2064, 2057, 2057, 2066, 2061, 2064, 2067, 2067, + 2066, 2068, 2068, 2069, 2069, 2065, 2070, 2072, 2072, 2075, + 2077, 2070, 2078, 2078, 2080, 2080, 2081, 2082, 2083, 2084, + 2084, 2085, 2088, 2089, 2094, 2090, 2085, 2083, 2075, 2089, + 2081, 2095, 2077, 2090, 2091, 2091, 2088, 2082, 2092, 2100, + 2096, 2097, 2098, 2092, 2094, 2096, 2101, 2100, 2098, 2102, + 2103, 2095, 2107, 2097, 2104, 2105, 2106, 2107, 2110, 2112, - 2115, 2115, 2116, 2116, 2117, 2117, 2118, 2107, 2114, 2119, - 2120, 2120, 2111, 2121, 2119, 2122, 2113, 2123, 2124, 2121, - 2125, 2118, 2126, 2127, 2250, 2125, 2250, 2126, 2128, 2128, - 2131, 2131, 2123, 2134, 2134, 2135, 2135, 2136, 2136, 2124, - 2122, 2138, 2127, 2139, 2139, 2141, 2141, 2142, 2143, 2143, - 2138, 2144, 2145, 2145, 2148, 2149, 2152, 2151, 2149, 2142, - 2151, 2153, 2152, 2154, 2155, 2157, 2144, 2156, 2154, 2167, - 2163, 2170, 2148, 2163, 2166, 2153, 2168, 2171, 2166, 2172, - 2172, 2157, 2173, 2155, 2174, 2156, 2175, 2177, 2171, 2167, - 2168, 2176, 2181, 2178, 2170, 2173, 2179, 2180, 2180, 2182, + 2112, 2113, 2113, 2114, 2118, 2118, 2101, 2114, 2103, 2102, + 2104, 2125, 2105, 2105, 2120, 2120, 2126, 2106, 2110, 2121, + 2121, 2122, 2121, 2124, 2124, 2122, 2128, 2128, 2129, 2125, + 2126, 2131, 2130, 2133, 2134, 2129, 2130, 2135, 2135, 2136, + 2136, 2137, 2137, 2134, 2138, 2139, 2131, 2140, 2140, 2141, + 2139, 2133, 2142, 2143, 2144, 2141, 2145, 2146, 2158, 2138, + 2147, 2145, 2146, 2148, 2148, 2151, 2151, 2158, 2143, 2154, + 2154, 2155, 2155, 2156, 2156, 2144, 2162, 2142, 2163, 2147, + 2159, 2159, 2161, 2161, 2164, 2164, 2165, 2166, 2166, 2169, + 2163, 2162, 2170, 2172, 2173, 2170, 2172, 2174, 2175, 2176, - 2182, 2181, 2188, 2174, 2175, 2183, 2183, 2176, 2178, 2184, - 2184, 2185, 2177, 2186, 2185, 2187, 2179, 2189, 2186, 2190, - 2187, 2191, 2192, 2192, 2194, 2190, 2196, 2188, 2198, 2199, - 2203, 2200, 2189, 2202, 2201, 2191, 2198, 2200, 2204, 2194, - 2201, 2206, 2207, 2203, 2196, 2208, 2207, 2202, 2199, 2209, - 2208, 2210, 2211, 2212, 2213, 2206, 2214, 2204, 2215, 2213, - 2217, 2214, 2216, 2216, 2210, 2211, 2217, 2222, 2209, 2218, - 2218, 2219, 2212, 2220, 2221, 2223, 2219, 2215, 2220, 2221, - 2226, 2223, 2224, 2224, 2227, 2228, 2222, 2229, 2230, 2231, - 2232, 2227, 2235, 2234, 2230, 2236, 2237, 2235, 2238, 2226, + 2173, 2165, 2177, 2175, 2187, 2178, 2184, 2169, 2188, 2184, + 2189, 2174, 2188, 2192, 2190, 2193, 2194, 2194, 2176, 2195, + 2177, 2178, 2196, 2198, 2197, 2199, 2193, 2187, 2190, 2200, + 2189, 2201, 2195, 2202, 2203, 2203, 2192, 2204, 2211, 2198, + 2208, 2196, 2197, 2208, 2200, 2212, 2204, 2202, 2205, 2205, + 2199, 2201, 2206, 2206, 2207, 2207, 2209, 2210, 2213, 2214, + 2212, 2209, 2210, 2211, 2213, 2215, 2215, 2216, 2218, 2220, + 2222, 2223, 2227, 2214, 2224, 2225, 2228, 2226, 2222, 2230, + 2224, 2225, 2231, 2218, 2232, 2227, 2216, 2220, 2232, 2233, + 2223, 2226, 2234, 2235, 2233, 2228, 2231, 2236, 2237, 2230, - 2239, 2239, 2234, 2232, 2228, 2234, 2229, 2240, 2231, 2241, - 2243, 2238, 2240, 2248, 2236, 2237, 2242, 2242, 2244, 2244, - 2245, 2245, 2246, 2247, 2251, 2251, 2249, 2246, 2254, 2243, - 2247, 2249, 2248, 2252, 2253, 2241, 2256, 2255, 2257, 2257, - 2252, 2253, 2255, 2258, 2260, 2261, 2262, 2254, 2263, 2260, - 2261, 2264, 2264, 2266, 2266, 2256, 2267, 2268, 2269, 2269, - 2270, 2270, 2258, 2271, 2281, 2262, 2275, 2263, 2273, 2273, - 2271, 2274, 2274, 2275, 2277, 2267, 2268, 2280, 2282, 2277, - 2283, 2283, 2280, 2281, 2284, 2284, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 2282, 2288, 2288, + 2238, 2240, 2239, 2241, 0, 2238, 2235, 2239, 2242, 2242, + 2236, 2234, 2243, 2244, 2244, 2245, 2246, 2237, 2243, 2240, + 2245, 2246, 2241, 2247, 2248, 2249, 2253, 2250, 2247, 2251, + 2251, 2249, 2250, 2254, 2255, 2256, 2257, 2258, 2259, 2263, + 2254, 2270, 2257, 2248, 2263, 2253, 2260, 2260, 2262, 2264, + 2265, 2259, 2266, 2255, 2256, 2272, 2258, 2262, 2267, 2267, + 2262, 2268, 2269, 2271, 2271, 2266, 2268, 2270, 2264, 2265, + 2273, 2273, 2274, 2274, 2272, 2269, 2275, 2276, 2277, 2278, + 2278, 2275, 2279, 2282, 2276, 2281, 2281, 2279, 2283, 2284, + 2282, 2285, 2286, 2288, 2288, 2283, 2285, 2277, 2289, 2291, - 2288, 2288, 2288, 2288, 2288, 2289, 2289, 2289, 2289, 2289, - 2289, 2289, 2290, 2290, 2290, 2290, 2290, 2290, 2290, 2291, - 2291, 2291, 2291, 2291, 2291, 2291, 2292, 2292, 2292, 2292, - 2292, 2292, 2292, 2294, 2294, 0, 2294, 2294, 2294, 2294, - 2295, 2295, 0, 0, 0, 2295, 2295, 2296, 2296, 0, - 0, 2296, 0, 2296, 2297, 0, 0, 0, 0, 0, - 2297, 2298, 2298, 0, 0, 0, 2298, 2298, 2299, 0, - 0, 0, 0, 0, 2299, 2300, 2300, 0, 2300, 2300, - 2300, 2300, 2301, 2301, 0, 2301, 2301, 2301, 2301, 2287, - 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, + 2292, 2293, 2294, 2298, 2291, 2292, 2295, 2295, 2284, 2297, + 2297, 2286, 2299, 2300, 2300, 2301, 2301, 2289, 2302, 2312, + 2293, 2294, 2298, 2304, 2304, 2302, 2305, 2305, 2306, 2308, + 2313, 2299, 2311, 0, 2308, 2306, 0, 2311, 2312, 2314, + 2314, 2315, 2315, 0, 0, 0, 0, 0, 0, 2313, + 2319, 2319, 2319, 2319, 2319, 2319, 2319, 2320, 2320, 2320, + 2320, 2320, 2320, 2320, 2321, 2321, 2321, 2321, 2321, 2321, + 2321, 2322, 2322, 2322, 2322, 2322, 2322, 2322, 2323, 2323, + 2323, 2323, 2323, 2323, 2323, 2325, 2325, 0, 2325, 2325, + 2325, 2325, 2326, 2326, 0, 0, 0, 2326, 2326, 2327, - 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, - 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, - 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287, 2287 + 2327, 0, 0, 2327, 0, 2327, 2328, 0, 0, 0, + 0, 0, 2328, 2329, 2329, 0, 0, 0, 2329, 2329, + 2330, 0, 0, 0, 0, 0, 2330, 2331, 2331, 0, + 2331, 2331, 2331, 2331, 2332, 2332, 0, 2332, 2332, 2332, + 2332, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, + 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, + 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, + 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, + 2318, 2318 } ; static yy_state_type yy_last_accepting_state; @@ -2395,7 +2417,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 2397 "" +#line 2419 "" #define INITIAL 0 #define quotedstring 1 @@ -2618,7 +2640,7 @@ YY_DECL { #line 207 "./util/configlexer.lex" -#line 2620 "" +#line 2642 "" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -2651,13 +2673,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 >= 2288 ) + if ( yy_current_state >= 2319 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 4490 ); + while ( yy_base[yy_current_state] != 4542 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -3759,40 +3781,45 @@ YY_RULE_SETUP { YDVAR(1, VAR_CACHEDB_SECRETSEED) } YY_BREAK case 214: -/* rule 214 can match eol */ YY_RULE_SETUP #line 433 "./util/configlexer.lex" +{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } + YY_BREAK +case 215: +/* rule 215 can match eol */ +YY_RULE_SETUP +#line 434 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 215: +case 216: YY_RULE_SETUP -#line 436 "./util/configlexer.lex" +#line 437 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 437 "./util/configlexer.lex" +#line 438 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 216: -YY_RULE_SETUP -#line 442 "./util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 217: -/* rule 217 can match eol */ YY_RULE_SETUP #line 443 "./util/configlexer.lex" +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } + YY_BREAK +case 218: +/* rule 218 can match eol */ +YY_RULE_SETUP +#line 444 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 218: +case 219: YY_RULE_SETUP -#line 445 "./util/configlexer.lex" +#line 446 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3805,34 +3832,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 219: +case 220: YY_RULE_SETUP -#line 457 "./util/configlexer.lex" +#line 458 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 458 "./util/configlexer.lex" +#line 459 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 220: -YY_RULE_SETUP -#line 463 "./util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 221: -/* rule 221 can match eol */ YY_RULE_SETUP #line 464 "./util/configlexer.lex" +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } + YY_BREAK +case 222: +/* rule 222 can match eol */ +YY_RULE_SETUP +#line 465 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 222: +case 223: YY_RULE_SETUP -#line 466 "./util/configlexer.lex" +#line 467 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3845,38 +3872,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 223: +case 224: YY_RULE_SETUP -#line 478 "./util/configlexer.lex" +#line 479 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 480 "./util/configlexer.lex" +#line 481 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 224: -YY_RULE_SETUP -#line 484 "./util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 225: -/* rule 225 can match eol */ YY_RULE_SETUP #line 485 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 226: +/* rule 226 can match eol */ YY_RULE_SETUP #line 486 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 227: YY_RULE_SETUP #line 487 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 228: +YY_RULE_SETUP +#line 488 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext); @@ -3884,27 +3911,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 492 "./util/configlexer.lex" +#line 493 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 228: -YY_RULE_SETUP -#line 496 "./util/configlexer.lex" -{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } - YY_BREAK case 229: -/* rule 229 can match eol */ YY_RULE_SETUP #line 497 "./util/configlexer.lex" +{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } + YY_BREAK +case 230: +/* rule 230 can match eol */ +YY_RULE_SETUP +#line 498 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 230: +case 231: YY_RULE_SETUP -#line 499 "./util/configlexer.lex" +#line 500 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -3914,7 +3941,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 505 "./util/configlexer.lex" +#line 506 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -3926,33 +3953,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 231: +case 232: YY_RULE_SETUP -#line 516 "./util/configlexer.lex" +#line 517 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 232: +case 233: YY_RULE_SETUP -#line 520 "./util/configlexer.lex" +#line 521 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 233: +case 234: YY_RULE_SETUP -#line 524 "./util/configlexer.lex" +#line 525 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 234: +case 235: YY_RULE_SETUP -#line 528 "./util/configlexer.lex" +#line 529 "./util/configlexer.lex" ECHO; YY_BREAK -#line 3954 "" +#line 3981 "" case YY_END_OF_BUFFER: { @@ -4243,7 +4270,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 >= 2288 ) + if ( yy_current_state >= 2319 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; @@ -4271,11 +4298,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 >= 2288 ) + if ( yy_current_state >= 2319 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - yy_is_jam = (yy_current_state == 2287); + yy_is_jam = (yy_current_state == 2318); return yy_is_jam ? 0 : yy_current_state; } @@ -4914,7 +4941,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 528 "./util/configlexer.lex" +#line 529 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 0c9a4df04..a12040d27 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -430,6 +430,7 @@ ipsecmod-strict{COLON} { YDVAR(1, VAR_IPSECMOD_STRICT) } cachedb{COLON} { YDVAR(0, VAR_CACHEDB) } backend{COLON} { YDVAR(1, VAR_CACHEDB_BACKEND) } secret-seed{COLON} { YDVAR(1, VAR_CACHEDB_SECRETSEED) } +udp-upstream-without-downstream{COLON} { YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } {NEWLINE} { LEXOUT(("NL\n")); cfg_parser->line++; } /* Quoted strings. Strip leading and ending quotes */ diff --git a/util/configparser.c b/util/configparser.c index 0e7e9eec8..7a93ce37f 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -343,7 +343,8 @@ extern int yydebug; VAR_IPSECMOD_STRICT = 472, VAR_CACHEDB = 473, VAR_CACHEDB_BACKEND = 474, - VAR_CACHEDB_SECRETSEED = 475 + VAR_CACHEDB_SECRETSEED = 475, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 476 }; #endif /* Tokens. */ @@ -565,6 +566,7 @@ extern int yydebug; #define VAR_CACHEDB 473 #define VAR_CACHEDB_BACKEND 474 #define VAR_CACHEDB_SECRETSEED 475 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 476 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -575,7 +577,7 @@ union YYSTYPE char* str; -#line 579 "util/configparser.c" /* yacc.c:355 */ +#line 581 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -592,7 +594,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 596 "util/configparser.c" /* yacc.c:358 */ +#line 598 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -834,21 +836,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 446 +#define YYLAST 448 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 221 +#define YYNTOKENS 222 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 238 +#define YYNNTS 239 /* YYNRULES -- Number of rules. */ -#define YYNRULES 455 +#define YYNRULES 457 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 683 +#define YYNSTATES 686 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 475 +#define YYMAXUTOK 476 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -904,59 +906,59 @@ static const yytype_uint8 yytranslate[] = 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 + 215, 216, 217, 218, 219, 220, 221 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 154, 154, 154, 155, 155, 156, 156, 157, 157, - 157, 159, 160, 164, 169, 170, 171, 171, 171, 172, - 172, 173, 173, 174, 174, 175, 175, 176, 176, 176, - 177, 177, 177, 178, 178, 179, 179, 180, 180, 181, - 181, 182, 182, 183, 183, 184, 184, 185, 185, 186, - 186, 186, 187, 187, 187, 188, 188, 188, 189, 189, - 190, 190, 191, 191, 192, 192, 193, 193, 193, 194, - 194, 195, 195, 196, 196, 196, 197, 197, 198, 198, - 199, 199, 200, 200, 200, 201, 201, 202, 202, 203, - 203, 204, 204, 205, 205, 206, 206, 206, 207, 207, - 208, 208, 208, 209, 209, 209, 210, 210, 210, 211, - 211, 211, 211, 212, 212, 212, 213, 213, 213, 214, - 214, 215, 215, 216, 216, 217, 217, 218, 218, 218, - 219, 219, 220, 220, 221, 222, 222, 223, 223, 224, - 224, 225, 226, 226, 227, 227, 228, 228, 229, 229, - 229, 230, 230, 231, 231, 232, 232, 233, 233, 234, - 234, 234, 235, 235, 235, 236, 236, 236, 237, 237, - 238, 238, 239, 239, 240, 240, 242, 254, 255, 256, - 256, 256, 256, 256, 257, 259, 271, 272, 273, 273, - 273, 273, 274, 276, 290, 291, 292, 292, 292, 292, - 293, 293, 293, 295, 304, 313, 324, 333, 342, 351, - 362, 371, 382, 395, 410, 421, 438, 455, 468, 483, - 492, 501, 510, 519, 528, 537, 546, 555, 564, 573, - 582, 591, 600, 609, 618, 625, 632, 641, 650, 659, - 673, 682, 691, 700, 707, 714, 740, 748, 755, 762, - 769, 776, 784, 792, 800, 807, 818, 825, 834, 843, - 852, 859, 866, 874, 882, 892, 902, 912, 925, 936, - 944, 957, 966, 975, 984, 994, 1004, 1012, 1025, 1034, - 1042, 1051, 1059, 1072, 1081, 1088, 1098, 1108, 1118, 1128, - 1138, 1148, 1158, 1168, 1175, 1182, 1189, 1198, 1207, 1216, - 1223, 1233, 1250, 1257, 1275, 1288, 1301, 1310, 1319, 1328, - 1337, 1347, 1357, 1366, 1375, 1388, 1401, 1410, 1417, 1426, - 1435, 1444, 1453, 1461, 1474, 1482, 1510, 1517, 1532, 1542, - 1552, 1559, 1566, 1575, 1589, 1608, 1627, 1639, 1651, 1663, - 1674, 1693, 1703, 1712, 1720, 1728, 1741, 1754, 1767, 1780, - 1789, 1798, 1808, 1818, 1831, 1844, 1855, 1868, 1879, 1892, - 1902, 1909, 1916, 1925, 1935, 1945, 1955, 1962, 1969, 1978, - 1988, 1998, 2027, 2037, 2045, 2054, 2069, 2078, 2083, 2084, - 2085, 2085, 2085, 2086, 2086, 2086, 2087, 2087, 2089, 2099, - 2108, 2115, 2125, 2132, 2139, 2146, 2153, 2158, 2159, 2160, - 2160, 2161, 2161, 2162, 2162, 2163, 2164, 2165, 2166, 2167, - 2168, 2170, 2178, 2185, 2193, 2201, 2208, 2215, 2224, 2233, - 2242, 2251, 2260, 2269, 2274, 2275, 2276, 2278, 2284, 2294, - 2301, 2310, 2318, 2324, 2325, 2327, 2327, 2327, 2328, 2328, - 2329, 2330, 2332, 2342, 2352, 2359, 2366, 2373, 2381, 2394, - 2399, 2400, 2401, 2401, 2403, 2417 + 0, 155, 155, 155, 156, 156, 157, 157, 158, 158, + 158, 160, 161, 165, 170, 171, 172, 172, 172, 173, + 173, 174, 174, 175, 175, 176, 176, 177, 177, 177, + 178, 178, 178, 179, 179, 180, 180, 181, 181, 182, + 182, 183, 183, 184, 184, 185, 185, 186, 186, 187, + 187, 187, 188, 188, 188, 189, 189, 189, 190, 190, + 191, 191, 192, 192, 193, 193, 194, 194, 194, 195, + 195, 196, 196, 197, 197, 197, 198, 198, 199, 199, + 200, 200, 201, 201, 201, 202, 202, 203, 203, 204, + 204, 205, 205, 206, 206, 207, 207, 207, 208, 208, + 209, 209, 209, 210, 210, 210, 211, 211, 211, 212, + 212, 212, 212, 213, 213, 213, 214, 214, 214, 215, + 215, 216, 216, 217, 217, 218, 218, 219, 219, 219, + 220, 220, 221, 221, 222, 223, 223, 224, 224, 225, + 225, 226, 227, 227, 228, 228, 229, 229, 230, 230, + 230, 231, 231, 232, 232, 233, 233, 234, 234, 235, + 235, 235, 236, 236, 236, 237, 237, 237, 238, 238, + 239, 239, 240, 240, 241, 241, 242, 244, 256, 257, + 258, 258, 258, 258, 258, 259, 261, 273, 274, 275, + 275, 275, 275, 276, 278, 292, 293, 294, 294, 294, + 294, 295, 295, 295, 297, 306, 315, 326, 335, 344, + 353, 364, 373, 384, 397, 412, 423, 440, 457, 470, + 485, 494, 503, 512, 521, 530, 539, 548, 557, 566, + 575, 584, 593, 602, 611, 620, 629, 636, 643, 652, + 661, 670, 684, 693, 702, 711, 718, 725, 751, 759, + 766, 773, 780, 787, 795, 803, 811, 818, 829, 836, + 845, 854, 863, 870, 877, 885, 893, 903, 913, 923, + 936, 947, 955, 968, 977, 986, 995, 1005, 1015, 1023, + 1036, 1045, 1053, 1062, 1070, 1083, 1092, 1099, 1109, 1119, + 1129, 1139, 1149, 1159, 1169, 1179, 1186, 1193, 1200, 1209, + 1218, 1227, 1234, 1244, 1261, 1268, 1286, 1299, 1312, 1321, + 1330, 1339, 1348, 1358, 1368, 1377, 1386, 1399, 1412, 1421, + 1428, 1437, 1446, 1455, 1464, 1472, 1485, 1493, 1521, 1528, + 1543, 1553, 1563, 1570, 1577, 1586, 1600, 1619, 1638, 1650, + 1662, 1674, 1685, 1704, 1714, 1723, 1731, 1739, 1752, 1765, + 1778, 1791, 1800, 1809, 1819, 1829, 1842, 1855, 1866, 1879, + 1890, 1903, 1913, 1920, 1927, 1936, 1946, 1956, 1966, 1973, + 1980, 1989, 1999, 2009, 2038, 2048, 2056, 2065, 2080, 2089, + 2094, 2095, 2096, 2096, 2096, 2097, 2097, 2097, 2098, 2098, + 2100, 2110, 2119, 2126, 2136, 2143, 2150, 2157, 2164, 2169, + 2170, 2171, 2171, 2172, 2172, 2173, 2173, 2174, 2175, 2176, + 2177, 2178, 2179, 2181, 2189, 2196, 2204, 2212, 2219, 2226, + 2235, 2244, 2253, 2262, 2271, 2280, 2285, 2286, 2287, 2289, + 2295, 2305, 2312, 2321, 2329, 2335, 2336, 2338, 2338, 2338, + 2339, 2339, 2340, 2341, 2343, 2353, 2363, 2370, 2377, 2384, + 2392, 2405, 2410, 2411, 2412, 2412, 2414, 2428 }; #endif @@ -1043,15 +1045,15 @@ static const char *const yytname[] = "VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS", "VAR_IPSECMOD_ENABLED", "VAR_IPSECMOD_HOOK", "VAR_IPSECMOD_IGNORE_BOGUS", "VAR_IPSECMOD_MAX_TTL", "VAR_IPSECMOD_WHITELIST", "VAR_IPSECMOD_STRICT", "VAR_CACHEDB", - "VAR_CACHEDB_BACKEND", "VAR_CACHEDB_SECRETSEED", "$accept", - "toplevelvars", "toplevelvar", "serverstart", "contents_server", - "content_server", "stubstart", "contents_stub", "content_stub", - "forwardstart", "contents_forward", "content_forward", "viewstart", - "contents_view", "content_view", "server_num_threads", - "server_verbosity", "server_statistics_interval", - "server_statistics_cumulative", "server_extended_statistics", - "server_shm_enable", "server_shm_key", "server_port", - "server_send_client_subnet", "server_client_subnet_zone", + "VAR_CACHEDB_BACKEND", "VAR_CACHEDB_SECRETSEED", + "VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM", "$accept", "toplevelvars", + "toplevelvar", "serverstart", "contents_server", "content_server", + "stubstart", "contents_stub", "content_stub", "forwardstart", + "contents_forward", "content_forward", "viewstart", "contents_view", + "content_view", "server_num_threads", "server_verbosity", + "server_statistics_interval", "server_statistics_cumulative", + "server_extended_statistics", "server_shm_enable", "server_shm_key", + "server_port", "server_send_client_subnet", "server_client_subnet_zone", "server_client_subnet_always_forward", "server_client_subnet_opcode", "server_max_client_subnet_ipv4", "server_max_client_subnet_ipv6", "server_interface", "server_outgoing_interface", "server_outgoing_range", @@ -1059,7 +1061,8 @@ static const char *const yytname[] = "server_outgoing_num_tcp", "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4", "server_do_ip6", "server_do_udp", "server_do_tcp", "server_prefer_ip6", "server_tcp_mss", - "server_outgoing_tcp_mss", "server_tcp_upstream", "server_ssl_upstream", + "server_outgoing_tcp_mss", "server_tcp_upstream", + "server_udp_upstream_without_downstream", "server_ssl_upstream", "server_ssl_service_key", "server_ssl_service_pem", "server_ssl_port", "server_use_systemd", "server_do_daemonize", "server_use_syslog", "server_log_time_ascii", "server_log_queries", "server_log_replies", @@ -1171,7 +1174,7 @@ static const yytype_uint16 yytoknum[] = 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, - 475 + 475, 476 }; # endif @@ -1208,7 +1211,7 @@ static const yytype_int16 yypact[] = 175, 176, 177, 178, 179, 180, 181, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, - 237, -213, -213, -213, -213, -213, -213, -213, -213, -213, + 237, 238, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, @@ -1224,40 +1227,40 @@ static const yytype_int16 yypact[] = -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, - -213, -213, 238, 239, 240, 244, 245, 246, -213, -213, - -213, -213, -213, -213, -213, 288, 289, 290, 291, 292, - -213, -213, -213, -213, -213, -213, 293, 294, 295, 296, - 300, 304, 305, -213, -213, -213, -213, -213, -213, -213, - -213, 329, 330, 331, 332, 342, 343, 344, 345, -213, - -213, -213, -213, -213, -213, -213, -213, -213, 346, 347, - 348, 349, 350, 351, 352, 353, 354, 389, 391, 401, - -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, - -213, -213, -213, 402, -213, -213, 403, 404, 405, 406, - 407, 408, 415, -213, -213, -213, -213, -213, -213, -213, - -213, 416, 417, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, 239, 240, 244, 245, 246, 288, + -213, -213, -213, -213, -213, -213, -213, 289, 290, 291, + 292, 293, -213, -213, -213, -213, -213, -213, 294, 295, + 296, 300, 304, 305, 329, -213, -213, -213, -213, -213, + -213, -213, -213, 330, 331, 332, 342, 343, 344, 345, + 346, -213, -213, -213, -213, -213, -213, -213, -213, -213, + 347, 348, 349, 350, 351, 352, 353, 354, 389, 391, + 401, 402, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, 403, -213, -213, 404, 405, + 406, 407, 408, 415, 416, -213, -213, -213, -213, -213, + -213, -213, -213, 417, 419, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, - -213, -213, 418, 419, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, 420, 421, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, - -213, -213, -213, -213, -213, -213, 420, 421, 422, -213, - -213, -213, -213, -213, -213, -213, -213, -213, 423, 424, + -213, -213, -213, -213, -213, -213, -213, -213, 422, 423, + 424, -213, -213, -213, -213, -213, -213, -213, -213, -213, + 425, 426, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, 427, 428, 429, + 430, 431, 432, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, - -213, -213, -213, -213, -213, 425, 426, 427, 428, 429, - 430, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, - -213, -213, -213, -213, -213, -213, -213, -213, 431, -213, - -213, 432, 433, -213, -213, -213, -213, -213, -213, -213, + -213, 433, -213, -213, 434, 435, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, - -213, -213, -213, 434, 435, 436, -213, -213, -213, -213, - -213, -213, -213 + -213, -213, -213, -213, -213, -213, 436, 437, 438, -213, + -213, -213, -213, -213, -213, -213 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1265,9 +1268,9 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 13, 176, 185, 377, 423, 396, 193, - 432, 449, 3, 15, 178, 187, 195, 379, 398, 425, - 434, 451, 4, 5, 6, 10, 8, 9, 7, 11, + 2, 0, 1, 13, 177, 186, 379, 425, 398, 194, + 434, 451, 3, 15, 179, 188, 196, 381, 400, 427, + 436, 453, 4, 5, 6, 10, 8, 9, 7, 11, 12, 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, @@ -1284,56 +1287,56 @@ 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, 14, 16, 17, 76, 79, 88, 165, 166, 18, - 138, 139, 140, 141, 142, 143, 27, 67, 19, 80, - 81, 38, 60, 75, 20, 21, 23, 24, 22, 25, - 26, 111, 112, 113, 114, 115, 161, 77, 66, 92, - 109, 110, 28, 29, 30, 31, 32, 68, 82, 83, - 98, 54, 64, 55, 169, 93, 48, 49, 168, 50, - 51, 102, 106, 119, 127, 148, 103, 61, 33, 34, - 35, 90, 120, 121, 122, 36, 37, 39, 40, 42, - 43, 41, 125, 44, 45, 46, 52, 71, 107, 85, - 126, 78, 144, 86, 87, 104, 105, 91, 47, 69, - 72, 53, 56, 94, 95, 70, 145, 96, 57, 58, - 59, 108, 158, 159, 167, 97, 65, 99, 100, 101, - 146, 62, 63, 84, 73, 74, 89, 116, 117, 118, - 123, 124, 149, 150, 152, 154, 155, 153, 156, 162, - 128, 129, 132, 133, 130, 131, 134, 135, 137, 136, - 147, 157, 170, 172, 171, 173, 174, 175, 151, 160, - 163, 164, 0, 0, 0, 0, 0, 0, 177, 179, - 180, 181, 183, 184, 182, 0, 0, 0, 0, 0, - 186, 188, 189, 190, 191, 192, 0, 0, 0, 0, - 0, 0, 0, 194, 196, 197, 200, 201, 198, 202, - 199, 0, 0, 0, 0, 0, 0, 0, 0, 378, - 380, 382, 381, 387, 383, 384, 385, 386, 0, 0, + 0, 0, 14, 16, 17, 76, 79, 88, 165, 166, + 18, 138, 139, 140, 141, 142, 143, 27, 67, 19, + 80, 81, 38, 60, 75, 20, 21, 23, 24, 22, + 25, 26, 111, 176, 112, 113, 114, 115, 161, 77, + 66, 92, 109, 110, 28, 29, 30, 31, 32, 68, + 82, 83, 98, 54, 64, 55, 169, 93, 48, 49, + 168, 50, 51, 102, 106, 119, 127, 148, 103, 61, + 33, 34, 35, 90, 120, 121, 122, 36, 37, 39, + 40, 42, 43, 41, 125, 44, 45, 46, 52, 71, + 107, 85, 126, 78, 144, 86, 87, 104, 105, 91, + 47, 69, 72, 53, 56, 94, 95, 70, 145, 96, + 57, 58, 59, 108, 158, 159, 167, 97, 65, 99, + 100, 101, 146, 62, 63, 84, 73, 74, 89, 116, + 117, 118, 123, 124, 149, 150, 152, 154, 155, 153, + 156, 162, 128, 129, 132, 133, 130, 131, 134, 135, + 137, 136, 147, 157, 170, 172, 171, 173, 174, 175, + 151, 160, 163, 164, 0, 0, 0, 0, 0, 0, + 178, 180, 181, 182, 184, 185, 183, 0, 0, 0, + 0, 0, 187, 189, 190, 191, 192, 193, 0, 0, + 0, 0, 0, 0, 0, 195, 197, 198, 201, 202, + 199, 203, 200, 0, 0, 0, 0, 0, 0, 0, + 0, 380, 382, 384, 383, 389, 385, 386, 387, 388, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 397, 399, 400, 401, 402, 403, 404, 405, 406, 407, - 408, 409, 410, 0, 424, 426, 0, 0, 0, 0, - 0, 0, 0, 433, 435, 436, 437, 439, 438, 440, - 441, 0, 0, 450, 452, 453, 204, 203, 210, 219, - 217, 225, 226, 229, 227, 228, 230, 231, 243, 244, - 245, 246, 247, 269, 270, 271, 276, 277, 222, 278, - 279, 282, 280, 281, 284, 285, 286, 299, 257, 258, - 260, 261, 287, 302, 252, 254, 303, 309, 310, 311, - 223, 268, 322, 323, 253, 317, 239, 218, 248, 300, - 306, 288, 0, 0, 326, 224, 205, 238, 292, 206, - 220, 221, 249, 250, 324, 290, 294, 295, 207, 327, - 272, 298, 240, 256, 304, 305, 308, 316, 251, 320, - 318, 319, 262, 267, 296, 297, 263, 264, 289, 312, - 241, 242, 232, 233, 234, 235, 236, 328, 329, 330, - 273, 274, 275, 283, 331, 332, 0, 0, 0, 291, - 265, 428, 341, 345, 343, 342, 346, 344, 0, 0, - 349, 350, 211, 212, 213, 214, 215, 216, 293, 307, - 321, 351, 352, 266, 333, 0, 0, 0, 0, 0, - 0, 313, 314, 315, 429, 259, 255, 237, 208, 209, - 353, 355, 354, 356, 357, 358, 359, 360, 361, 364, - 363, 362, 365, 366, 367, 368, 369, 370, 0, 374, - 375, 0, 0, 376, 388, 390, 389, 392, 393, 394, - 395, 391, 411, 412, 413, 414, 415, 416, 417, 418, - 419, 420, 421, 422, 427, 442, 443, 444, 446, 445, - 447, 448, 454, 455, 301, 325, 340, 430, 431, 347, - 348, 334, 335, 0, 0, 0, 339, 371, 372, 373, - 338, 336, 337 + 0, 0, 399, 401, 402, 403, 404, 405, 406, 407, + 408, 409, 410, 411, 412, 0, 426, 428, 0, 0, + 0, 0, 0, 0, 0, 435, 437, 438, 439, 441, + 440, 442, 443, 0, 0, 452, 454, 455, 205, 204, + 211, 220, 218, 226, 227, 230, 228, 229, 231, 232, + 245, 246, 247, 248, 249, 271, 272, 273, 278, 279, + 223, 280, 281, 284, 282, 283, 286, 287, 288, 301, + 259, 260, 262, 263, 289, 304, 254, 256, 305, 311, + 312, 313, 224, 270, 324, 325, 255, 319, 241, 219, + 250, 302, 308, 290, 0, 0, 328, 225, 206, 240, + 294, 207, 221, 222, 251, 252, 326, 292, 296, 297, + 208, 329, 274, 300, 242, 258, 306, 307, 310, 318, + 253, 322, 320, 321, 264, 269, 298, 299, 265, 266, + 291, 314, 243, 244, 233, 235, 236, 237, 238, 330, + 331, 332, 275, 276, 277, 285, 333, 334, 0, 0, + 0, 293, 267, 430, 343, 347, 345, 344, 348, 346, + 0, 0, 351, 352, 212, 213, 214, 215, 216, 217, + 295, 309, 323, 353, 354, 268, 335, 0, 0, 0, + 0, 0, 0, 315, 316, 317, 431, 261, 257, 239, + 209, 210, 355, 357, 356, 358, 359, 360, 234, 361, + 362, 363, 366, 365, 364, 367, 368, 369, 370, 371, + 372, 0, 376, 377, 0, 0, 378, 390, 392, 391, + 394, 395, 396, 397, 393, 413, 414, 415, 416, 417, + 418, 419, 420, 421, 422, 423, 424, 429, 444, 445, + 446, 448, 447, 449, 450, 456, 457, 303, 327, 342, + 432, 433, 349, 350, 336, 337, 0, 0, 0, 341, + 373, 374, 375, 340, 338, 339 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1362,36 +1365,36 @@ static const yytype_int16 yypgoto[] = -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, - -213, -213, -213, -213, -213, -213, -213, -213 + -213, -213, -213, -213, -213, -213, -213, -213, -213 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 12, 13, 22, 191, 14, 23, 358, 15, - 24, 370, 16, 25, 383, 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, 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, 255, 256, - 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, - 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, - 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, - 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, - 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, - 307, 308, 309, 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, 339, 340, 341, 342, 343, 344, 345, 346, - 347, 359, 360, 361, 362, 363, 364, 371, 372, 373, - 374, 375, 384, 385, 386, 387, 388, 389, 390, 17, - 26, 399, 400, 401, 402, 403, 404, 405, 406, 407, - 18, 27, 420, 421, 422, 423, 424, 425, 426, 427, - 428, 429, 430, 431, 432, 19, 28, 434, 435, 348, - 349, 350, 351, 20, 29, 443, 444, 445, 446, 447, - 448, 449, 450, 21, 30, 453, 454, 455 + -1, 1, 12, 13, 22, 192, 14, 23, 360, 15, + 24, 372, 16, 25, 385, 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, 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, 255, 256, 257, + 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, + 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, + 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, + 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, + 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, + 308, 309, 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, 339, 340, 341, 342, 343, 344, 345, 346, 347, + 348, 349, 361, 362, 363, 364, 365, 366, 373, 374, + 375, 376, 377, 386, 387, 388, 389, 390, 391, 392, + 17, 26, 401, 402, 403, 404, 405, 406, 407, 408, + 409, 18, 27, 422, 423, 424, 425, 426, 427, 428, + 429, 430, 431, 432, 433, 434, 19, 28, 436, 437, + 350, 351, 352, 353, 20, 29, 445, 446, 447, 448, + 449, 450, 451, 452, 21, 30, 455, 456, 457 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1399,51 +1402,51 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 376, 352, 433, 353, 354, 365, 451, 452, 456, - 0, 3, 457, 458, 366, 367, 408, 409, 410, 411, - 412, 413, 414, 415, 416, 417, 418, 419, 391, 392, - 393, 394, 395, 396, 397, 398, 459, 377, 378, 460, - 461, 4, 462, 463, 464, 465, 466, 5, 436, 437, - 438, 439, 440, 441, 442, 467, 468, 469, 470, 471, - 472, 473, 379, 474, 475, 355, 476, 477, 478, 479, - 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, - 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, - 500, 6, 501, 502, 503, 356, 504, 357, 368, 505, - 369, 506, 507, 508, 509, 510, 511, 7, 512, 513, - 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, - 380, 381, 524, 525, 526, 527, 528, 529, 530, 531, - 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, - 542, 543, 544, 545, 546, 8, 547, 548, 549, 550, - 551, 552, 553, 554, 555, 382, 556, 557, 558, 559, - 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, - 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, - 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, - 590, 591, 9, 592, 593, 594, 595, 596, 597, 598, - 599, 600, 601, 602, 10, 603, 604, 605, 606, 607, - 608, 609, 610, 611, 612, 613, 614, 0, 11, 31, + 2, 378, 354, 435, 355, 356, 367, 453, 454, 458, + 0, 3, 459, 460, 368, 369, 410, 411, 412, 413, + 414, 415, 416, 417, 418, 419, 420, 421, 393, 394, + 395, 396, 397, 398, 399, 400, 461, 379, 380, 462, + 463, 4, 464, 465, 466, 467, 468, 5, 438, 439, + 440, 441, 442, 443, 444, 469, 470, 471, 472, 473, + 474, 475, 381, 476, 477, 357, 478, 479, 480, 481, + 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, + 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, + 502, 6, 503, 504, 505, 358, 506, 359, 370, 507, + 371, 508, 509, 510, 511, 512, 513, 7, 514, 515, + 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, + 382, 383, 526, 527, 528, 529, 530, 531, 532, 533, + 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, + 544, 545, 546, 547, 548, 8, 549, 550, 551, 552, + 553, 554, 555, 556, 557, 384, 558, 559, 560, 561, + 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, + 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, + 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, + 592, 593, 9, 594, 595, 596, 597, 598, 599, 600, + 601, 602, 603, 604, 10, 605, 606, 607, 608, 609, + 610, 611, 612, 613, 614, 615, 616, 0, 11, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 615, 616, 617, - 618, 59, 60, 61, 619, 620, 621, 62, 63, 64, + 52, 53, 54, 55, 56, 57, 58, 617, 618, 619, + 620, 59, 60, 61, 621, 622, 623, 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, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 622, 623, - 624, 625, 626, 627, 628, 629, 630, 103, 104, 105, - 631, 106, 107, 108, 632, 633, 109, 110, 111, 112, + 95, 96, 97, 98, 99, 100, 101, 102, 624, 625, + 626, 627, 628, 629, 630, 631, 632, 103, 104, 105, + 633, 106, 107, 108, 634, 635, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, - 123, 124, 125, 126, 127, 128, 129, 130, 131, 634, - 635, 636, 637, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 638, 639, 640, 641, 642, 643, 644, 645, - 646, 647, 648, 649, 650, 141, 142, 143, 144, 145, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 636, + 637, 638, 639, 132, 133, 134, 135, 136, 137, 138, + 139, 140, 640, 641, 642, 643, 644, 645, 646, 647, + 648, 649, 650, 651, 652, 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, 651, - 175, 652, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 653, 654, 655, 656, 657, 658, 659, 660, 185, - 186, 187, 188, 189, 190, 661, 662, 663, 664, 665, - 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, - 676, 677, 678, 679, 680, 681, 682 + 166, 167, 168, 169, 170, 171, 172, 173, 174, 653, + 175, 654, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 655, 656, 657, 658, 659, 660, 661, 662, 185, + 186, 187, 188, 189, 190, 663, 664, 665, 191, 666, + 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, + 677, 678, 679, 680, 681, 682, 683, 684, 685 }; static const yytype_int16 yycheck[] = @@ -1490,19 +1493,19 @@ static const yytype_int16 yycheck[] = 183, 184, 185, 186, 187, 188, 189, 190, 191, 10, 193, 10, 195, 196, 197, 198, 199, 200, 201, 202, 203, 10, 10, 10, 10, 10, 10, 10, 10, 212, - 213, 214, 215, 216, 217, 10, 10, 10, 10, 10, + 213, 214, 215, 216, 217, 10, 10, 10, 221, 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, 222, 0, 11, 41, 47, 91, 107, 145, 192, - 204, 218, 223, 224, 227, 230, 233, 410, 421, 436, - 444, 454, 225, 228, 231, 234, 411, 422, 437, 445, - 455, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 0, 223, 0, 11, 41, 47, 91, 107, 145, 192, + 204, 218, 224, 225, 228, 231, 234, 412, 423, 438, + 446, 456, 226, 229, 232, 235, 413, 424, 439, 447, + 457, 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, 37, 38, 39, 44, 45, 46, 50, 51, 52, 53, 54, 55, 56, 57, @@ -1518,7 +1521,7 @@ static const yytype_uint16 yystos[] = 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 193, 195, 196, 197, 198, 199, 200, 201, 202, 203, 212, 213, 214, 215, 216, - 217, 226, 236, 237, 238, 239, 240, 241, 242, 243, + 217, 221, 227, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, @@ -1533,18 +1536,18 @@ static const yytype_uint16 yystos[] = 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, 380, 381, 382, 383, - 384, 385, 386, 387, 388, 389, 390, 391, 440, 441, - 442, 443, 40, 42, 43, 103, 133, 135, 229, 392, - 393, 394, 395, 396, 397, 40, 48, 49, 132, 134, - 232, 398, 399, 400, 401, 402, 40, 76, 77, 101, - 159, 160, 194, 235, 403, 404, 405, 406, 407, 408, - 409, 92, 93, 94, 95, 96, 97, 98, 99, 412, - 413, 414, 415, 416, 417, 418, 419, 420, 146, 147, - 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, - 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, - 433, 434, 435, 108, 438, 439, 205, 206, 207, 208, - 209, 210, 211, 446, 447, 448, 449, 450, 451, 452, - 453, 219, 220, 456, 457, 458, 10, 10, 10, 10, + 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, + 442, 443, 444, 445, 40, 42, 43, 103, 133, 135, + 230, 394, 395, 396, 397, 398, 399, 40, 48, 49, + 132, 134, 233, 400, 401, 402, 403, 404, 40, 76, + 77, 101, 159, 160, 194, 236, 405, 406, 407, 408, + 409, 410, 411, 92, 93, 94, 95, 96, 97, 98, + 99, 414, 415, 416, 417, 418, 419, 420, 421, 422, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, + 156, 157, 425, 426, 427, 428, 429, 430, 431, 432, + 433, 434, 435, 436, 437, 108, 440, 441, 205, 206, + 207, 208, 209, 210, 211, 448, 449, 450, 451, 452, + 453, 454, 455, 219, 220, 458, 459, 460, 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, @@ -1567,33 +1570,33 @@ 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 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 221, 222, 222, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 224, 225, 225, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 227, 228, 228, 229, - 229, 229, 229, 229, 229, 230, 231, 231, 232, 232, - 232, 232, 232, 233, 234, 234, 235, 235, 235, 235, - 235, 235, 235, 236, 237, 238, 239, 240, 241, 242, + 0, 222, 223, 223, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 225, 226, 226, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 228, 229, 229, + 230, 230, 230, 230, 230, 230, 231, 232, 232, 233, + 233, 233, 233, 233, 234, 235, 235, 236, 236, 236, + 236, 236, 236, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, @@ -1610,15 +1613,15 @@ static const yytype_uint16 yyr1[] = 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, - 403, 404, 405, 406, 407, 408, 409, 410, 411, 411, - 412, 412, 412, 412, 412, 412, 412, 412, 413, 414, - 415, 416, 417, 418, 419, 420, 421, 422, 422, 423, - 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, - 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, - 433, 434, 435, 436, 437, 437, 438, 439, 440, 441, - 442, 443, 444, 445, 445, 446, 446, 446, 446, 446, - 446, 446, 447, 448, 449, 450, 451, 452, 453, 454, - 455, 455, 456, 456, 457, 458 + 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, + 413, 413, 414, 414, 414, 414, 414, 414, 414, 414, + 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, + 424, 425, 425, 425, 425, 425, 425, 425, 425, 425, + 425, 425, 425, 426, 427, 428, 429, 430, 431, 432, + 433, 434, 435, 436, 437, 438, 439, 439, 440, 441, + 442, 443, 444, 445, 446, 447, 447, 448, 448, 448, + 448, 448, 448, 448, 449, 450, 451, 452, 453, 454, + 455, 456, 457, 457, 458, 458, 459, 460 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1641,35 +1644,35 @@ 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, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, - 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, - 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 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, 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, 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, + 2, 2, 2, 3, 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, 3, 3, 4, 4, + 4, 3, 3, 2, 2, 2, 2, 2, 2, 3, + 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 3, 3, 3, 2, 2, 2, 1, + 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 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, 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, 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, 2, - 2, 3, 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, 3, 3, 4, 4, 4, 3, - 3, 2, 2, 2, 2, 2, 2, 3, 3, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 3, 3, 2, 2, 2, 1, 2, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 1, 2, 0, 1, 2, 2, 2, - 3, 3, 1, 2, 0, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 2, 2, 2, 1, - 2, 0, 1, 1, 2, 2 + 2, 2, 2, 2, 2, 1, 2, 0, 1, 2, + 2, 2, 3, 3, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 2, 1, 2, 0, 1, 1, 2, 2 }; @@ -2346,15 +2349,15 @@ yyreduce: switch (yyn) { case 13: -#line 165 "./util/configparser.y" /* yacc.c:1646 */ +#line 166 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(server:)\n")); } -#line 2354 "util/configparser.c" /* yacc.c:1646 */ +#line 2357 "util/configparser.c" /* yacc.c:1646 */ break; - case 176: -#line 243 "./util/configparser.y" /* yacc.c:1646 */ + case 177: +#line 245 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2365,11 +2368,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2369 "util/configparser.c" /* yacc.c:1646 */ +#line 2372 "util/configparser.c" /* yacc.c:1646 */ break; - case 185: -#line 260 "./util/configparser.y" /* yacc.c:1646 */ + case 186: +#line 262 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2380,11 +2383,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2384 "util/configparser.c" /* yacc.c:1646 */ +#line 2387 "util/configparser.c" /* yacc.c:1646 */ break; - case 193: -#line 277 "./util/configparser.y" /* yacc.c:1646 */ + case 194: +#line 279 "./util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2397,11 +2400,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2401 "util/configparser.c" /* yacc.c:1646 */ +#line 2404 "util/configparser.c" /* yacc.c:1646 */ break; - case 203: -#line 296 "./util/configparser.y" /* yacc.c:1646 */ + case 204: +#line 298 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2409,11 +2412,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2413 "util/configparser.c" /* yacc.c:1646 */ +#line 2416 "util/configparser.c" /* yacc.c:1646 */ break; - case 204: -#line 305 "./util/configparser.y" /* yacc.c:1646 */ + case 205: +#line 307 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2421,11 +2424,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2425 "util/configparser.c" /* yacc.c:1646 */ +#line 2428 "util/configparser.c" /* yacc.c:1646 */ break; - case 205: -#line 314 "./util/configparser.y" /* yacc.c:1646 */ + case 206: +#line 316 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2435,11 +2438,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2439 "util/configparser.c" /* yacc.c:1646 */ +#line 2442 "util/configparser.c" /* yacc.c:1646 */ break; - case 206: -#line 325 "./util/configparser.y" /* yacc.c:1646 */ + case 207: +#line 327 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2447,11 +2450,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2451 "util/configparser.c" /* yacc.c:1646 */ +#line 2454 "util/configparser.c" /* yacc.c:1646 */ break; - case 207: -#line 334 "./util/configparser.y" /* yacc.c:1646 */ + case 208: +#line 336 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2459,11 +2462,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2463 "util/configparser.c" /* yacc.c:1646 */ +#line 2466 "util/configparser.c" /* yacc.c:1646 */ break; - case 208: -#line 343 "./util/configparser.y" /* yacc.c:1646 */ + case 209: +#line 345 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2471,11 +2474,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2475 "util/configparser.c" /* yacc.c:1646 */ +#line 2478 "util/configparser.c" /* yacc.c:1646 */ break; - case 209: -#line 352 "./util/configparser.y" /* yacc.c:1646 */ + case 210: +#line 354 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2485,11 +2488,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2489 "util/configparser.c" /* yacc.c:1646 */ +#line 2492 "util/configparser.c" /* yacc.c:1646 */ break; - case 210: -#line 363 "./util/configparser.y" /* yacc.c:1646 */ + case 211: +#line 365 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2497,11 +2500,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2501 "util/configparser.c" /* yacc.c:1646 */ +#line 2504 "util/configparser.c" /* yacc.c:1646 */ break; - case 211: -#line 372 "./util/configparser.y" /* yacc.c:1646 */ + case 212: +#line 374 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -2511,11 +2514,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2515 "util/configparser.c" /* yacc.c:1646 */ +#line 2518 "util/configparser.c" /* yacc.c:1646 */ break; - case 212: -#line 383 "./util/configparser.y" /* yacc.c:1646 */ + case 213: +#line 385 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -2526,11 +2529,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2530 "util/configparser.c" /* yacc.c:1646 */ +#line 2533 "util/configparser.c" /* yacc.c:1646 */ break; - case 213: -#line 396 "./util/configparser.y" /* yacc.c:1646 */ + case 214: +#line 398 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -2544,11 +2547,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2548 "util/configparser.c" /* yacc.c:1646 */ +#line 2551 "util/configparser.c" /* yacc.c:1646 */ break; - case 214: -#line 411 "./util/configparser.y" /* yacc.c:1646 */ + case 215: +#line 413 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -2558,11 +2561,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2562 "util/configparser.c" /* yacc.c:1646 */ +#line 2565 "util/configparser.c" /* yacc.c:1646 */ break; - case 215: -#line 422 "./util/configparser.y" /* yacc.c:1646 */ + case 216: +#line 424 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -2578,11 +2581,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2582 "util/configparser.c" /* yacc.c:1646 */ +#line 2585 "util/configparser.c" /* yacc.c:1646 */ break; - case 216: -#line 439 "./util/configparser.y" /* yacc.c:1646 */ + case 217: +#line 441 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -2598,11 +2601,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2602 "util/configparser.c" /* yacc.c:1646 */ +#line 2605 "util/configparser.c" /* yacc.c:1646 */ break; - case 217: -#line 456 "./util/configparser.y" /* yacc.c:1646 */ + case 218: +#line 458 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2614,11 +2617,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2618 "util/configparser.c" /* yacc.c:1646 */ +#line 2621 "util/configparser.c" /* yacc.c:1646 */ break; - case 218: -#line 469 "./util/configparser.y" /* yacc.c:1646 */ + case 219: +#line 471 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2632,11 +2635,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2636 "util/configparser.c" /* yacc.c:1646 */ +#line 2639 "util/configparser.c" /* yacc.c:1646 */ break; - case 219: -#line 484 "./util/configparser.y" /* yacc.c:1646 */ + case 220: +#line 486 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2644,11 +2647,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2648 "util/configparser.c" /* yacc.c:1646 */ +#line 2651 "util/configparser.c" /* yacc.c:1646 */ break; - case 220: -#line 493 "./util/configparser.y" /* yacc.c:1646 */ + case 221: +#line 495 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -2656,11 +2659,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2660 "util/configparser.c" /* yacc.c:1646 */ +#line 2663 "util/configparser.c" /* yacc.c:1646 */ break; - case 221: -#line 502 "./util/configparser.y" /* yacc.c:1646 */ + case 222: +#line 504 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -2668,11 +2671,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2672 "util/configparser.c" /* yacc.c:1646 */ +#line 2675 "util/configparser.c" /* yacc.c:1646 */ break; - case 222: -#line 511 "./util/configparser.y" /* yacc.c:1646 */ + case 223: +#line 513 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2680,11 +2683,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2684 "util/configparser.c" /* yacc.c:1646 */ +#line 2687 "util/configparser.c" /* yacc.c:1646 */ break; - case 223: -#line 520 "./util/configparser.y" /* yacc.c:1646 */ + case 224: +#line 522 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2692,11 +2695,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2696 "util/configparser.c" /* yacc.c:1646 */ +#line 2699 "util/configparser.c" /* yacc.c:1646 */ break; - case 224: -#line 529 "./util/configparser.y" /* yacc.c:1646 */ + case 225: +#line 531 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2704,11 +2707,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2708 "util/configparser.c" /* yacc.c:1646 */ +#line 2711 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: -#line 538 "./util/configparser.y" /* yacc.c:1646 */ + case 226: +#line 540 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2716,11 +2719,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2720 "util/configparser.c" /* yacc.c:1646 */ +#line 2723 "util/configparser.c" /* yacc.c:1646 */ break; - case 226: -#line 547 "./util/configparser.y" /* yacc.c:1646 */ + case 227: +#line 549 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2728,11 +2731,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2732 "util/configparser.c" /* yacc.c:1646 */ +#line 2735 "util/configparser.c" /* yacc.c:1646 */ break; - case 227: -#line 556 "./util/configparser.y" /* yacc.c:1646 */ + case 228: +#line 558 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2740,11 +2743,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2744 "util/configparser.c" /* yacc.c:1646 */ +#line 2747 "util/configparser.c" /* yacc.c:1646 */ break; - case 228: -#line 565 "./util/configparser.y" /* yacc.c:1646 */ + case 229: +#line 567 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2752,11 +2755,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2756 "util/configparser.c" /* yacc.c:1646 */ +#line 2759 "util/configparser.c" /* yacc.c:1646 */ break; - case 229: -#line 574 "./util/configparser.y" /* yacc.c:1646 */ + case 230: +#line 576 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2764,11 +2767,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2768 "util/configparser.c" /* yacc.c:1646 */ +#line 2771 "util/configparser.c" /* yacc.c:1646 */ break; - case 230: -#line 583 "./util/configparser.y" /* yacc.c:1646 */ + case 231: +#line 585 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2776,11 +2779,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2780 "util/configparser.c" /* yacc.c:1646 */ +#line 2783 "util/configparser.c" /* yacc.c:1646 */ break; - case 231: -#line 592 "./util/configparser.y" /* yacc.c:1646 */ + case 232: +#line 594 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2788,11 +2791,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2792 "util/configparser.c" /* yacc.c:1646 */ +#line 2795 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: -#line 601 "./util/configparser.y" /* yacc.c:1646 */ + case 233: +#line 603 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2800,11 +2803,23 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2804 "util/configparser.c" /* yacc.c:1646 */ +#line 2807 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: -#line 610 "./util/configparser.y" /* yacc.c:1646 */ + case 234: +#line 612 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 2819 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 235: +#line 621 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2812,31 +2827,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2816 "util/configparser.c" /* yacc.c:1646 */ +#line 2831 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: -#line 619 "./util/configparser.y" /* yacc.c:1646 */ + case 236: +#line 630 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_key); cfg_parser->cfg->ssl_service_key = (yyvsp[0].str); } -#line 2826 "util/configparser.c" /* yacc.c:1646 */ +#line 2841 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: -#line 626 "./util/configparser.y" /* yacc.c:1646 */ + case 237: +#line 637 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_pem); cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str); } -#line 2836 "util/configparser.c" /* yacc.c:1646 */ +#line 2851 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: -#line 633 "./util/configparser.y" /* yacc.c:1646 */ + case 238: +#line 644 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2844,11 +2859,11 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2848 "util/configparser.c" /* yacc.c:1646 */ +#line 2863 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: -#line 642 "./util/configparser.y" /* yacc.c:1646 */ + case 239: +#line 653 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2856,11 +2871,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2860 "util/configparser.c" /* yacc.c:1646 */ +#line 2875 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: -#line 651 "./util/configparser.y" /* yacc.c:1646 */ + case 240: +#line 662 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2868,11 +2883,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2872 "util/configparser.c" /* yacc.c:1646 */ +#line 2887 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: -#line 660 "./util/configparser.y" /* yacc.c:1646 */ + case 241: +#line 671 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2885,11 +2900,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2889 "util/configparser.c" /* yacc.c:1646 */ +#line 2904 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: -#line 674 "./util/configparser.y" /* yacc.c:1646 */ + case 242: +#line 685 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2897,11 +2912,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2901 "util/configparser.c" /* yacc.c:1646 */ +#line 2916 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: -#line 683 "./util/configparser.y" /* yacc.c:1646 */ + case 243: +#line 694 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2909,11 +2924,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2913 "util/configparser.c" /* yacc.c:1646 */ +#line 2928 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: -#line 692 "./util/configparser.y" /* yacc.c:1646 */ + case 244: +#line 703 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2921,31 +2936,31 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2925 "util/configparser.c" /* yacc.c:1646 */ +#line 2940 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: -#line 701 "./util/configparser.y" /* yacc.c:1646 */ + case 245: +#line 712 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 2935 "util/configparser.c" /* yacc.c:1646 */ +#line 2950 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: -#line 708 "./util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 719 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 2945 "util/configparser.c" /* yacc.c:1646 */ +#line 2960 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: -#line 715 "./util/configparser.y" /* yacc.c:1646 */ + case 247: +#line 726 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -2970,105 +2985,105 @@ yyreduce: } } } -#line 2974 "util/configparser.c" /* yacc.c:1646 */ +#line 2989 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: -#line 741 "./util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 752 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->logfile); cfg_parser->cfg->logfile = (yyvsp[0].str); cfg_parser->cfg->use_syslog = 0; } -#line 2985 "util/configparser.c" /* yacc.c:1646 */ +#line 3000 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: -#line 749 "./util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 760 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 2995 "util/configparser.c" /* yacc.c:1646 */ +#line 3010 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: -#line 756 "./util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 767 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3005 "util/configparser.c" /* yacc.c:1646 */ +#line 3020 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: -#line 763 "./util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 774 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dlv_anchor_file); cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str); } -#line 3015 "util/configparser.c" /* yacc.c:1646 */ +#line 3030 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: -#line 770 "./util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 781 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3025 "util/configparser.c" /* yacc.c:1646 */ +#line 3040 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: -#line 777 "./util/configparser.y" /* yacc.c:1646 */ + case 253: +#line 788 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> auto_trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3036 "util/configparser.c" /* yacc.c:1646 */ +#line 3051 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: -#line 785 "./util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 796 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3047 "util/configparser.c" /* yacc.c:1646 */ +#line 3062 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: -#line 793 "./util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 804 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trusted_keys_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3058 "util/configparser.c" /* yacc.c:1646 */ +#line 3073 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: -#line 801 "./util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 812 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3068 "util/configparser.c" /* yacc.c:1646 */ +#line 3083 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 808 "./util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 819 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3078,21 +3093,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3082 "util/configparser.c" /* yacc.c:1646 */ +#line 3097 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 819 "./util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 830 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3092 "util/configparser.c" /* yacc.c:1646 */ +#line 3107 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 826 "./util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 837 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3100,11 +3115,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3104 "util/configparser.c" /* yacc.c:1646 */ +#line 3119 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 835 "./util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 846 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3112,11 +3127,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3116 "util/configparser.c" /* yacc.c:1646 */ +#line 3131 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 844 "./util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 855 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3124,53 +3139,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3128 "util/configparser.c" /* yacc.c:1646 */ +#line 3143 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 853 "./util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 864 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 3138 "util/configparser.c" /* yacc.c:1646 */ +#line 3153 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 860 "./util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 871 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 3148 "util/configparser.c" /* yacc.c:1646 */ +#line 3163 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 867 "./util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 878 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 3159 "util/configparser.c" /* yacc.c:1646 */ +#line 3174 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 875 "./util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 886 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 3170 "util/configparser.c" /* yacc.c:1646 */ +#line 3185 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 883 "./util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 894 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3179,11 +3194,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3183 "util/configparser.c" /* yacc.c:1646 */ +#line 3198 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 893 "./util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 904 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3192,11 +3207,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3196 "util/configparser.c" /* yacc.c:1646 */ +#line 3211 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 903 "./util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 914 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3205,11 +3220,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3209 "util/configparser.c" /* yacc.c:1646 */ +#line 3224 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 913 "./util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 924 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3221,11 +3236,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3225 "util/configparser.c" /* yacc.c:1646 */ +#line 3240 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 926 "./util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 937 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3235,22 +3250,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3239 "util/configparser.c" /* yacc.c:1646 */ +#line 3254 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 937 "./util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 948 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3250 "util/configparser.c" /* yacc.c:1646 */ +#line 3265 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 945 "./util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 956 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3262,11 +3277,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3266 "util/configparser.c" /* yacc.c:1646 */ +#line 3281 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 958 "./util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 969 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3274,11 +3289,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3278 "util/configparser.c" /* yacc.c:1646 */ +#line 3293 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 967 "./util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 978 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3286,11 +3301,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3290 "util/configparser.c" /* yacc.c:1646 */ +#line 3305 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 976 "./util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 987 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3298,11 +3313,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3302 "util/configparser.c" /* yacc.c:1646 */ +#line 3317 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 985 "./util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 996 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3311,11 +3326,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3315 "util/configparser.c" /* yacc.c:1646 */ +#line 3330 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 995 "./util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 1006 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3324,22 +3339,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3328 "util/configparser.c" /* yacc.c:1646 */ +#line 3343 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 1005 "./util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 1016 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3339 "util/configparser.c" /* yacc.c:1646 */ +#line 3354 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 1013 "./util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 1024 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3351,11 +3366,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3355 "util/configparser.c" /* yacc.c:1646 */ +#line 3370 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 1026 "./util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 1037 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3363,22 +3378,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3367 "util/configparser.c" /* yacc.c:1646 */ +#line 3382 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 1035 "./util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 1046 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " "removed, use infra-host-ttl)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3378 "util/configparser.c" /* yacc.c:1646 */ +#line 3393 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 1043 "./util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 1054 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3386,22 +3401,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3390 "util/configparser.c" /* yacc.c:1646 */ +#line 3405 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 1052 "./util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 1063 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s " "(option removed, use infra-cache-numhosts)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3401 "util/configparser.c" /* yacc.c:1646 */ +#line 3416 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 1060 "./util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 1071 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3413,11 +3428,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3417 "util/configparser.c" /* yacc.c:1646 */ +#line 3432 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 1073 "./util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 1084 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3425,21 +3440,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3429 "util/configparser.c" /* yacc.c:1646 */ +#line 3444 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 1082 "./util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 1093 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->target_fetch_policy); cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str); } -#line 3439 "util/configparser.c" /* yacc.c:1646 */ +#line 3454 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 1089 "./util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 1100 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3448,11 +3463,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3452 "util/configparser.c" /* yacc.c:1646 */ +#line 3467 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 1099 "./util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 1110 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3461,11 +3476,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3465 "util/configparser.c" /* yacc.c:1646 */ +#line 3480 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 1109 "./util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 1120 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3474,11 +3489,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3478 "util/configparser.c" /* yacc.c:1646 */ +#line 3493 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 1119 "./util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 1130 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3487,11 +3502,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3491 "util/configparser.c" /* yacc.c:1646 */ +#line 3506 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 1129 "./util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 1140 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3500,11 +3515,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3504 "util/configparser.c" /* yacc.c:1646 */ +#line 3519 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 1139 "./util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 1150 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3513,11 +3528,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3517 "util/configparser.c" /* yacc.c:1646 */ +#line 3532 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 1149 "./util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 1160 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3526,11 +3541,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3530 "util/configparser.c" /* yacc.c:1646 */ +#line 3545 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 1159 "./util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 1170 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3539,41 +3554,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3543 "util/configparser.c" /* yacc.c:1646 */ +#line 3558 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 1169 "./util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 1180 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3553 "util/configparser.c" /* yacc.c:1646 */ +#line 3568 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 1176 "./util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 1187 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3563 "util/configparser.c" /* yacc.c:1646 */ +#line 3578 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 1183 "./util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 1194 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3573 "util/configparser.c" /* yacc.c:1646 */ +#line 3588 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 1190 "./util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 1201 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3581,11 +3596,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3585 "util/configparser.c" /* yacc.c:1646 */ +#line 3600 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 1199 "./util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 1210 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3593,11 +3608,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3597 "util/configparser.c" /* yacc.c:1646 */ +#line 3612 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 1208 "./util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 1219 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3605,21 +3620,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3609 "util/configparser.c" /* yacc.c:1646 */ +#line 3624 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 1217 "./util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 1228 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3619 "util/configparser.c" /* yacc.c:1646 */ +#line 3634 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 1224 "./util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 1235 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3628,11 +3643,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3632 "util/configparser.c" /* yacc.c:1646 */ +#line 3647 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1234 "./util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1245 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 && @@ -3648,21 +3663,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 3652 "util/configparser.c" /* yacc.c:1646 */ +#line 3667 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1251 "./util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1262 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->module_conf); cfg_parser->cfg->module_conf = (yyvsp[0].str); } -#line 3662 "util/configparser.c" /* yacc.c:1646 */ +#line 3677 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1258 "./util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 1269 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3679,11 +3694,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3683 "util/configparser.c" /* yacc.c:1646 */ +#line 3698 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1276 "./util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1287 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3695,11 +3710,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3699 "util/configparser.c" /* yacc.c:1646 */ +#line 3714 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1289 "./util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 1300 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3711,11 +3726,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3715 "util/configparser.c" /* yacc.c:1646 */ +#line 3730 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1302 "./util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1313 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3723,11 +3738,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3727 "util/configparser.c" /* yacc.c:1646 */ +#line 3742 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1311 "./util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 1322 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3735,11 +3750,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3739 "util/configparser.c" /* yacc.c:1646 */ +#line 3754 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1320 "./util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1331 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3747,11 +3762,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3751 "util/configparser.c" /* yacc.c:1646 */ +#line 3766 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1329 "./util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1340 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3759,11 +3774,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3763 "util/configparser.c" /* yacc.c:1646 */ +#line 3778 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1338 "./util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1349 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3772,11 +3787,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3776 "util/configparser.c" /* yacc.c:1646 */ +#line 3791 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1348 "./util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1359 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3785,11 +3800,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3789 "util/configparser.c" /* yacc.c:1646 */ +#line 3804 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1358 "./util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1369 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3797,11 +3812,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3801 "util/configparser.c" /* yacc.c:1646 */ +#line 3816 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1367 "./util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1378 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3809,11 +3824,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3813 "util/configparser.c" /* yacc.c:1646 */ +#line 3828 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1376 "./util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1387 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3825,11 +3840,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3829 "util/configparser.c" /* yacc.c:1646 */ +#line 3844 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1389 "./util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1400 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3841,11 +3856,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3845 "util/configparser.c" /* yacc.c:1646 */ +#line 3860 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1402 "./util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1413 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3853,21 +3868,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3857 "util/configparser.c" /* yacc.c:1646 */ +#line 3872 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1411 "./util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1422 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str); } -#line 3867 "util/configparser.c" /* yacc.c:1646 */ +#line 3882 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1418 "./util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1429 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3875,11 +3890,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3879 "util/configparser.c" /* yacc.c:1646 */ +#line 3894 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1427 "./util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1438 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3887,11 +3902,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3891 "util/configparser.c" /* yacc.c:1646 */ +#line 3906 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 1436 "./util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1447 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3899,11 +3914,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3903 "util/configparser.c" /* yacc.c:1646 */ +#line 3918 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 1445 "./util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1456 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3912,22 +3927,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3916 "util/configparser.c" /* yacc.c:1646 */ +#line 3931 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 1454 "./util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1465 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3927 "util/configparser.c" /* yacc.c:1646 */ +#line 3942 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 1462 "./util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1473 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3939,22 +3954,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3943 "util/configparser.c" /* yacc.c:1646 */ +#line 3958 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 1475 "./util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1486 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3954 "util/configparser.c" /* yacc.c:1646 */ +#line 3969 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 1483 "./util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1494 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -3981,21 +3996,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 3985 "util/configparser.c" /* yacc.c:1646 */ +#line 4000 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1511 "./util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1522 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str))) fatal_exit("out of memory adding local-data"); } -#line 3995 "util/configparser.c" /* yacc.c:1646 */ +#line 4010 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1518 "./util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1529 "./util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4009,11 +4024,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4013 "util/configparser.c" /* yacc.c:1646 */ +#line 4028 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1533 "./util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1544 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4022,11 +4037,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4026 "util/configparser.c" /* yacc.c:1646 */ +#line 4041 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1543 "./util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1554 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4035,31 +4050,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4039 "util/configparser.c" /* yacc.c:1646 */ +#line 4054 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1553 "./util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1564 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4049 "util/configparser.c" /* yacc.c:1646 */ +#line 4064 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1560 "./util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1571 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 4059 "util/configparser.c" /* yacc.c:1646 */ +#line 4074 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1567 "./util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1578 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4067,11 +4082,11 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4071 "util/configparser.c" /* yacc.c:1646 */ +#line 4086 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1576 "./util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1587 "./util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -4084,11 +4099,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4088 "util/configparser.c" /* yacc.c:1646 */ +#line 4103 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1590 "./util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1601 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4106,11 +4121,11 @@ yyreduce: } } } -#line 4110 "util/configparser.c" /* yacc.c:1646 */ +#line 4125 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1609 "./util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1620 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4128,11 +4143,11 @@ yyreduce: } } } -#line 4132 "util/configparser.c" /* yacc.c:1646 */ +#line 4147 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1628 "./util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1639 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions, @@ -4143,11 +4158,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4147 "util/configparser.c" /* yacc.c:1646 */ +#line 4162 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1640 "./util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1651 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas, @@ -4158,11 +4173,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4162 "util/configparser.c" /* yacc.c:1646 */ +#line 4177 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1652 "./util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1663 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides, @@ -4173,11 +4188,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4177 "util/configparser.c" /* yacc.c:1646 */ +#line 4192 "util/configparser.c" /* yacc.c:1646 */ break; - case 339: -#line 1664 "./util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1675 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -4187,11 +4202,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4191 "util/configparser.c" /* yacc.c:1646 */ +#line 4206 "util/configparser.c" /* yacc.c:1646 */ break; - case 340: -#line 1675 "./util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1686 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4209,11 +4224,11 @@ yyreduce: } } } -#line 4213 "util/configparser.c" /* yacc.c:1646 */ +#line 4228 "util/configparser.c" /* yacc.c:1646 */ break; - case 341: -#line 1694 "./util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1705 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4221,11 +4236,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4225 "util/configparser.c" /* yacc.c:1646 */ +#line 4240 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1704 "./util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1715 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4233,33 +4248,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4237 "util/configparser.c" /* yacc.c:1646 */ +#line 4252 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1713 "./util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1724 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4248 "util/configparser.c" /* yacc.c:1646 */ +#line 4263 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1721 "./util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1732 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4259 "util/configparser.c" /* yacc.c:1646 */ +#line 4274 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1729 "./util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1740 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4271,11 +4286,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4275 "util/configparser.c" /* yacc.c:1646 */ +#line 4290 "util/configparser.c" /* yacc.c:1646 */ break; - case 346: -#line 1742 "./util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1753 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4287,11 +4302,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4291 "util/configparser.c" /* yacc.c:1646 */ +#line 4306 "util/configparser.c" /* yacc.c:1646 */ break; - case 347: -#line 1755 "./util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1766 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -4303,11 +4318,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4307 "util/configparser.c" /* yacc.c:1646 */ +#line 4322 "util/configparser.c" /* yacc.c:1646 */ break; - case 348: -#line 1768 "./util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1779 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -4319,11 +4334,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4323 "util/configparser.c" /* yacc.c:1646 */ +#line 4338 "util/configparser.c" /* yacc.c:1646 */ break; - case 349: -#line 1781 "./util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1792 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4331,11 +4346,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4335 "util/configparser.c" /* yacc.c:1646 */ +#line 4350 "util/configparser.c" /* yacc.c:1646 */ break; - case 350: -#line 1790 "./util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1801 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4343,11 +4358,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4347 "util/configparser.c" /* yacc.c:1646 */ +#line 4362 "util/configparser.c" /* yacc.c:1646 */ break; - case 351: -#line 1799 "./util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1810 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4356,11 +4371,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4360 "util/configparser.c" /* yacc.c:1646 */ +#line 4375 "util/configparser.c" /* yacc.c:1646 */ break; - case 352: -#line 1809 "./util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1820 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4369,11 +4384,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4373 "util/configparser.c" /* yacc.c:1646 */ +#line 4388 "util/configparser.c" /* yacc.c:1646 */ break; - case 353: -#line 1819 "./util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1830 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -4385,11 +4400,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4389 "util/configparser.c" /* yacc.c:1646 */ +#line 4404 "util/configparser.c" /* yacc.c:1646 */ break; - case 354: -#line 1832 "./util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1843 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -4401,11 +4416,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4405 "util/configparser.c" /* yacc.c:1646 */ +#line 4420 "util/configparser.c" /* yacc.c:1646 */ break; - case 355: -#line 1845 "./util/configparser.y" /* yacc.c:1646 */ + case 357: +#line 1856 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -4415,11 +4430,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4419 "util/configparser.c" /* yacc.c:1646 */ +#line 4434 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1856 "./util/configparser.y" /* yacc.c:1646 */ + case 358: +#line 1867 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -4431,11 +4446,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4435 "util/configparser.c" /* yacc.c:1646 */ +#line 4450 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1869 "./util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1880 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -4445,11 +4460,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4449 "util/configparser.c" /* yacc.c:1646 */ +#line 4464 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1880 "./util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1891 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -4461,11 +4476,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4465 "util/configparser.c" /* yacc.c:1646 */ +#line 4480 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1893 "./util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1904 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -4474,31 +4489,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 4478 "util/configparser.c" /* yacc.c:1646 */ +#line 4493 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1903 "./util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1914 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4488 "util/configparser.c" /* yacc.c:1646 */ +#line 4503 "util/configparser.c" /* yacc.c:1646 */ break; - case 361: -#line 1910 "./util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1921 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4498 "util/configparser.c" /* yacc.c:1646 */ +#line 4513 "util/configparser.c" /* yacc.c:1646 */ break; - case 362: -#line 1917 "./util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1928 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4506,11 +4521,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4510 "util/configparser.c" /* yacc.c:1646 */ +#line 4525 "util/configparser.c" /* yacc.c:1646 */ break; - case 363: -#line 1926 "./util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1937 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4519,11 +4534,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4523 "util/configparser.c" /* yacc.c:1646 */ +#line 4538 "util/configparser.c" /* yacc.c:1646 */ break; - case 364: -#line 1936 "./util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1947 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4532,11 +4547,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4536 "util/configparser.c" /* yacc.c:1646 */ +#line 4551 "util/configparser.c" /* yacc.c:1646 */ break; - case 365: -#line 1946 "./util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1957 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -4545,31 +4560,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 4549 "util/configparser.c" /* yacc.c:1646 */ +#line 4564 "util/configparser.c" /* yacc.c:1646 */ break; - case 366: -#line 1956 "./util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1967 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4559 "util/configparser.c" /* yacc.c:1646 */ +#line 4574 "util/configparser.c" /* yacc.c:1646 */ break; - case 367: -#line 1963 "./util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1974 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4569 "util/configparser.c" /* yacc.c:1646 */ +#line 4584 "util/configparser.c" /* yacc.c:1646 */ break; - case 368: -#line 1970 "./util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1981 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4577,11 +4592,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4581 "util/configparser.c" /* yacc.c:1646 */ +#line 4596 "util/configparser.c" /* yacc.c:1646 */ break; - case 369: -#line 1979 "./util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1990 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4590,11 +4605,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4594 "util/configparser.c" /* yacc.c:1646 */ +#line 4609 "util/configparser.c" /* yacc.c:1646 */ break; - case 370: -#line 1989 "./util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 2000 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -4603,11 +4618,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 4607 "util/configparser.c" /* yacc.c:1646 */ +#line 4622 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 1999 "./util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 2010 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -4635,11 +4650,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4639 "util/configparser.c" /* yacc.c:1646 */ +#line 4654 "util/configparser.c" /* yacc.c:1646 */ break; - case 372: -#line 2028 "./util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 2039 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -4648,22 +4663,22 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 4652 "util/configparser.c" /* yacc.c:1646 */ +#line 4667 "util/configparser.c" /* yacc.c:1646 */ break; - case 373: -#line 2038 "./util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 2049 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert( &cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 4663 "util/configparser.c" /* yacc.c:1646 */ +#line 4678 "util/configparser.c" /* yacc.c:1646 */ break; - case 374: -#line 2046 "./util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 2057 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) { @@ -4671,11 +4686,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4675 "util/configparser.c" /* yacc.c:1646 */ +#line 4690 "util/configparser.c" /* yacc.c:1646 */ break; - case 375: -#line 2055 "./util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 2066 "./util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4689,11 +4704,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4693 "util/configparser.c" /* yacc.c:1646 */ +#line 4708 "util/configparser.c" /* yacc.c:1646 */ break; - case 376: -#line 2070 "./util/configparser.y" /* yacc.c:1646 */ + case 378: +#line 2081 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4701,19 +4716,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4705 "util/configparser.c" /* yacc.c:1646 */ +#line 4720 "util/configparser.c" /* yacc.c:1646 */ break; - case 377: -#line 2079 "./util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 2090 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 4713 "util/configparser.c" /* yacc.c:1646 */ +#line 4728 "util/configparser.c" /* yacc.c:1646 */ break; - case 388: -#line 2090 "./util/configparser.y" /* yacc.c:1646 */ + case 390: +#line 2101 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4722,11 +4737,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4726 "util/configparser.c" /* yacc.c:1646 */ +#line 4741 "util/configparser.c" /* yacc.c:1646 */ break; - case 389: -#line 2100 "./util/configparser.y" /* yacc.c:1646 */ + case 391: +#line 2111 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4734,21 +4749,21 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4738 "util/configparser.c" /* yacc.c:1646 */ +#line 4753 "util/configparser.c" /* yacc.c:1646 */ break; - case 390: -#line 2109 "./util/configparser.y" /* yacc.c:1646 */ + case 392: +#line 2120 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4748 "util/configparser.c" /* yacc.c:1646 */ +#line 4763 "util/configparser.c" /* yacc.c:1646 */ break; - case 391: -#line 2116 "./util/configparser.y" /* yacc.c:1646 */ + case 393: +#line 2127 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4757,122 +4772,122 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4761 "util/configparser.c" /* yacc.c:1646 */ +#line 4776 "util/configparser.c" /* yacc.c:1646 */ break; - case 392: -#line 2126 "./util/configparser.y" /* yacc.c:1646 */ + case 394: +#line 2137 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_key_file); cfg_parser->cfg->server_key_file = (yyvsp[0].str); } -#line 4771 "util/configparser.c" /* yacc.c:1646 */ +#line 4786 "util/configparser.c" /* yacc.c:1646 */ break; - case 393: -#line 2133 "./util/configparser.y" /* yacc.c:1646 */ + case 395: +#line 2144 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_cert_file); cfg_parser->cfg->server_cert_file = (yyvsp[0].str); } -#line 4781 "util/configparser.c" /* yacc.c:1646 */ +#line 4796 "util/configparser.c" /* yacc.c:1646 */ break; - case 394: -#line 2140 "./util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 2151 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_key_file); cfg_parser->cfg->control_key_file = (yyvsp[0].str); } -#line 4791 "util/configparser.c" /* yacc.c:1646 */ +#line 4806 "util/configparser.c" /* yacc.c:1646 */ break; - case 395: -#line 2147 "./util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 2158 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_cert_file); cfg_parser->cfg->control_cert_file = (yyvsp[0].str); } -#line 4801 "util/configparser.c" /* yacc.c:1646 */ +#line 4816 "util/configparser.c" /* yacc.c:1646 */ break; - case 396: -#line 2154 "./util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 2165 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 4809 "util/configparser.c" /* yacc.c:1646 */ +#line 4824 "util/configparser.c" /* yacc.c:1646 */ break; - case 411: -#line 2171 "./util/configparser.y" /* yacc.c:1646 */ + case 413: +#line 2182 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4820 "util/configparser.c" /* yacc.c:1646 */ +#line 4835 "util/configparser.c" /* yacc.c:1646 */ break; - case 412: -#line 2179 "./util/configparser.y" /* yacc.c:1646 */ + case 414: +#line 2190 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_socket_path); cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str); } -#line 4830 "util/configparser.c" /* yacc.c:1646 */ +#line 4845 "util/configparser.c" /* yacc.c:1646 */ break; - case 413: -#line 2186 "./util/configparser.y" /* yacc.c:1646 */ + case 415: +#line 2197 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4841 "util/configparser.c" /* yacc.c:1646 */ +#line 4856 "util/configparser.c" /* yacc.c:1646 */ break; - case 414: -#line 2194 "./util/configparser.y" /* yacc.c:1646 */ + case 416: +#line 2205 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4852 "util/configparser.c" /* yacc.c:1646 */ +#line 4867 "util/configparser.c" /* yacc.c:1646 */ break; - case 415: -#line 2202 "./util/configparser.y" /* yacc.c:1646 */ + case 417: +#line 2213 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_identity); cfg_parser->cfg->dnstap_identity = (yyvsp[0].str); } -#line 4862 "util/configparser.c" /* yacc.c:1646 */ +#line 4877 "util/configparser.c" /* yacc.c:1646 */ break; - case 416: -#line 2209 "./util/configparser.y" /* yacc.c:1646 */ + case 418: +#line 2220 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_version); cfg_parser->cfg->dnstap_version = (yyvsp[0].str); } -#line 4872 "util/configparser.c" /* yacc.c:1646 */ +#line 4887 "util/configparser.c" /* yacc.c:1646 */ break; - case 417: -#line 2216 "./util/configparser.y" /* yacc.c:1646 */ + case 419: +#line 2227 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4880,11 +4895,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4884 "util/configparser.c" /* yacc.c:1646 */ +#line 4899 "util/configparser.c" /* yacc.c:1646 */ break; - case 418: -#line 2225 "./util/configparser.y" /* yacc.c:1646 */ + case 420: +#line 2236 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4892,11 +4907,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4896 "util/configparser.c" /* yacc.c:1646 */ +#line 4911 "util/configparser.c" /* yacc.c:1646 */ break; - case 419: -#line 2234 "./util/configparser.y" /* yacc.c:1646 */ + case 421: +#line 2245 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4904,11 +4919,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4908 "util/configparser.c" /* yacc.c:1646 */ +#line 4923 "util/configparser.c" /* yacc.c:1646 */ break; - case 420: -#line 2243 "./util/configparser.y" /* yacc.c:1646 */ + case 422: +#line 2254 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4916,11 +4931,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4920 "util/configparser.c" /* yacc.c:1646 */ +#line 4935 "util/configparser.c" /* yacc.c:1646 */ break; - case 421: -#line 2252 "./util/configparser.y" /* yacc.c:1646 */ + case 423: +#line 2263 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4928,11 +4943,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4932 "util/configparser.c" /* yacc.c:1646 */ +#line 4947 "util/configparser.c" /* yacc.c:1646 */ break; - case 422: -#line 2261 "./util/configparser.y" /* yacc.c:1646 */ + case 424: +#line 2272 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4940,29 +4955,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4944 "util/configparser.c" /* yacc.c:1646 */ +#line 4959 "util/configparser.c" /* yacc.c:1646 */ break; - case 423: -#line 2270 "./util/configparser.y" /* yacc.c:1646 */ + case 425: +#line 2281 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(python:)\n")); } -#line 4952 "util/configparser.c" /* yacc.c:1646 */ +#line 4967 "util/configparser.c" /* yacc.c:1646 */ break; - case 427: -#line 2279 "./util/configparser.y" /* yacc.c:1646 */ + case 429: +#line 2290 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(python-script:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->python_script); cfg_parser->cfg->python_script = (yyvsp[0].str); } -#line 4962 "util/configparser.c" /* yacc.c:1646 */ +#line 4977 "util/configparser.c" /* yacc.c:1646 */ break; - case 428: -#line 2285 "./util/configparser.y" /* yacc.c:1646 */ + case 430: +#line 2296 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4971,21 +4986,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4975 "util/configparser.c" /* yacc.c:1646 */ +#line 4990 "util/configparser.c" /* yacc.c:1646 */ break; - case 429: -#line 2295 "./util/configparser.y" /* yacc.c:1646 */ + case 431: +#line 2306 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->log_identity); cfg_parser->cfg->log_identity = (yyvsp[0].str); } -#line 4985 "util/configparser.c" /* yacc.c:1646 */ +#line 5000 "util/configparser.c" /* yacc.c:1646 */ break; - case 430: -#line 2302 "./util/configparser.y" /* yacc.c:1646 */ + case 432: +#line 2313 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -4993,31 +5008,31 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 4997 "util/configparser.c" /* yacc.c:1646 */ +#line 5012 "util/configparser.c" /* yacc.c:1646 */ break; - case 431: -#line 2311 "./util/configparser.y" /* yacc.c:1646 */ + case 433: +#line 2322 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 5008 "util/configparser.c" /* yacc.c:1646 */ +#line 5023 "util/configparser.c" /* yacc.c:1646 */ break; - case 432: -#line 2319 "./util/configparser.y" /* yacc.c:1646 */ + case 434: +#line 2330 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnscrypt:)\n")); OUTYY(("\nP(dnscrypt:)\n")); } -#line 5017 "util/configparser.c" /* yacc.c:1646 */ +#line 5032 "util/configparser.c" /* yacc.c:1646 */ break; - case 442: -#line 2333 "./util/configparser.y" /* yacc.c:1646 */ + case 444: +#line 2344 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5025,11 +5040,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5029 "util/configparser.c" /* yacc.c:1646 */ +#line 5044 "util/configparser.c" /* yacc.c:1646 */ break; - case 443: -#line 2343 "./util/configparser.y" /* yacc.c:1646 */ + case 445: +#line 2354 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); @@ -5038,52 +5053,52 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5042 "util/configparser.c" /* yacc.c:1646 */ +#line 5057 "util/configparser.c" /* yacc.c:1646 */ break; - case 444: -#line 2353 "./util/configparser.y" /* yacc.c:1646 */ + case 446: +#line 2364 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnscrypt_provider); cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str); } -#line 5052 "util/configparser.c" /* yacc.c:1646 */ +#line 5067 "util/configparser.c" /* yacc.c:1646 */ break; - case 445: -#line 2360 "./util/configparser.y" /* yacc.c:1646 */ + case 447: +#line 2371 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 5062 "util/configparser.c" /* yacc.c:1646 */ +#line 5077 "util/configparser.c" /* yacc.c:1646 */ break; - case 446: -#line 2367 "./util/configparser.y" /* yacc.c:1646 */ + case 448: +#line 2378 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 5072 "util/configparser.c" /* yacc.c:1646 */ +#line 5087 "util/configparser.c" /* yacc.c:1646 */ break; - case 447: -#line 2374 "./util/configparser.y" /* yacc.c:1646 */ + case 449: +#line 2385 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5083 "util/configparser.c" /* yacc.c:1646 */ +#line 5098 "util/configparser.c" /* yacc.c:1646 */ break; - case 448: -#line 2382 "./util/configparser.y" /* yacc.c:1646 */ + case 450: +#line 2393 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5095,19 +5110,19 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5099 "util/configparser.c" /* yacc.c:1646 */ +#line 5114 "util/configparser.c" /* yacc.c:1646 */ break; - case 449: -#line 2395 "./util/configparser.y" /* yacc.c:1646 */ + case 451: +#line 2406 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(cachedb:)\n")); } -#line 5107 "util/configparser.c" /* yacc.c:1646 */ +#line 5122 "util/configparser.c" /* yacc.c:1646 */ break; - case 454: -#line 2404 "./util/configparser.y" /* yacc.c:1646 */ + case 456: +#line 2415 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -5120,11 +5135,11 @@ yyreduce: OUTYY(("P(Compiled without cachedb, ignoring)\n")); #endif } -#line 5124 "util/configparser.c" /* yacc.c:1646 */ +#line 5139 "util/configparser.c" /* yacc.c:1646 */ break; - case 455: -#line 2418 "./util/configparser.y" /* yacc.c:1646 */ + case 457: +#line 2429 "./util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -5138,11 +5153,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5142 "util/configparser.c" /* yacc.c:1646 */ +#line 5157 "util/configparser.c" /* yacc.c:1646 */ break; -#line 5146 "util/configparser.c" /* yacc.c:1646 */ +#line 5161 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5370,7 +5385,7 @@ yyreturn: #endif return yyresult; } -#line 2432 "./util/configparser.y" /* yacc.c:1906 */ +#line 2443 "./util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index d287fefb1..468736007 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -262,7 +262,8 @@ extern int yydebug; VAR_IPSECMOD_STRICT = 472, VAR_CACHEDB = 473, VAR_CACHEDB_BACKEND = 474, - VAR_CACHEDB_SECRETSEED = 475 + VAR_CACHEDB_SECRETSEED = 475, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 476 }; #endif /* Tokens. */ @@ -484,6 +485,7 @@ extern int yydebug; #define VAR_CACHEDB 473 #define VAR_CACHEDB_BACKEND 474 #define VAR_CACHEDB_SECRETSEED 475 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 476 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -494,7 +496,7 @@ union YYSTYPE char* str; -#line 498 "util/configparser.h" /* yacc.c:1909 */ +#line 500 "util/configparser.h" /* yacc.c:1909 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/util/configparser.y b/util/configparser.y index 40a3dd3f9..4ddc8fc34 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -149,6 +149,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_IPSECMOD_ENABLED VAR_IPSECMOD_HOOK VAR_IPSECMOD_IGNORE_BOGUS %token VAR_IPSECMOD_MAX_TTL VAR_IPSECMOD_WHITELIST VAR_IPSECMOD_STRICT %token VAR_CACHEDB VAR_CACHEDB_BACKEND VAR_CACHEDB_SECRETSEED +%token VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -237,7 +238,8 @@ content_server: server_num_threads | server_verbosity | server_port | server_hide_trustanchor | server_trust_anchor_signaling | server_ipsecmod_enabled | server_ipsecmod_hook | server_ipsecmod_ignore_bogus | server_ipsecmod_max_ttl | - server_ipsecmod_whitelist | server_ipsecmod_strict + server_ipsecmod_whitelist | server_ipsecmod_strict | + server_udp_upstream_without_downstream ; stubstart: VAR_STUB_ZONE { @@ -606,6 +608,15 @@ server_tcp_upstream: VAR_TCP_UPSTREAM STRING_ARG free($2); } ; +server_udp_upstream_without_downstream: VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM STRING_ARG + { + OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp($2, "yes")==0); + free($2); + } + ; server_ssl_upstream: VAR_SSL_UPSTREAM STRING_ARG { OUTYY(("P(server_ssl_upstream:%s)\n", $2));