From 6c456aa15e558959338feda7614139df5e89bf81 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Thu, 16 Mar 2017 09:17:58 +0000 Subject: [PATCH] - Add trustanchor.unbound CH TXT that gets a response with a number of TXT RRs with a string like "example.com. 2345 1234" with the trust anchors and their keytags. git-svn-id: file:///svn/unbound/trunk@4051 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/worker.c | 121 +- doc/Changelog | 6 + doc/example.conf.in | 3 + doc/unbound.conf.5.in | 3 + testdata/chaos_trustanchor.rpl | 145 ++ util/config_file.c | 3 + util/config_file.h | 2 + util/configlexer.c | 2858 ++++++++++++++++---------------- util/configlexer.lex | 1 + util/configparser.c | 1656 +++++++++--------- util/configparser.h | 16 +- util/configparser.y | 14 +- util/shm_side/shm_main.c | 2 + 13 files changed, 2565 insertions(+), 2265 deletions(-) create mode 100644 testdata/chaos_trustanchor.rpl diff --git a/daemon/worker.c b/daemon/worker.c index 2a274a1b5..5dc45a64f 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -69,10 +69,12 @@ #include "iterator/iter_hints.h" #include "validator/autotrust.h" #include "validator/val_anchor.h" +#include "validator/val_sigcrypt.h" #include "respip/respip.h" #include "libunbound/context.h" #include "libunbound/libworker.h" #include "sldns/sbuffer.h" +#include "sldns/wire2str.h" #include "util/shm_side/shm_main.h" #ifdef HAVE_SYS_TYPES_H @@ -728,36 +730,41 @@ reply_and_prefetch(struct worker* worker, struct query_info* qinfo, * Fill CH class answer into buffer. Keeps query. * @param pkt: buffer * @param str: string to put into text record (<255). + * array of strings, every string becomes a text record. + * @param num: number of strings in array. * @param edns: edns reply information. * @param worker: worker with scratch region. */ static void -chaos_replystr(sldns_buffer* pkt, const char* str, struct edns_data* edns, +chaos_replystr(sldns_buffer* pkt, char** str, int num, struct edns_data* edns, struct worker* worker) { - size_t len = strlen(str); + int i; unsigned int rd = LDNS_RD_WIRE(sldns_buffer_begin(pkt)); unsigned int cd = LDNS_CD_WIRE(sldns_buffer_begin(pkt)); - if(len>255) len=255; /* cap size of TXT record */ sldns_buffer_clear(pkt); sldns_buffer_skip(pkt, (ssize_t)sizeof(uint16_t)); /* skip id */ sldns_buffer_write_u16(pkt, (uint16_t)(BIT_QR|BIT_RA)); if(rd) LDNS_RD_SET(sldns_buffer_begin(pkt)); if(cd) LDNS_CD_SET(sldns_buffer_begin(pkt)); sldns_buffer_write_u16(pkt, 1); /* qdcount */ - sldns_buffer_write_u16(pkt, 1); /* ancount */ + sldns_buffer_write_u16(pkt, (uint16_t)num); /* ancount */ sldns_buffer_write_u16(pkt, 0); /* nscount */ sldns_buffer_write_u16(pkt, 0); /* arcount */ (void)query_dname_len(pkt); /* skip qname */ sldns_buffer_skip(pkt, (ssize_t)sizeof(uint16_t)); /* skip qtype */ sldns_buffer_skip(pkt, (ssize_t)sizeof(uint16_t)); /* skip qclass */ - sldns_buffer_write_u16(pkt, 0xc00c); /* compr ptr to query */ - sldns_buffer_write_u16(pkt, LDNS_RR_TYPE_TXT); - sldns_buffer_write_u16(pkt, LDNS_RR_CLASS_CH); - sldns_buffer_write_u32(pkt, 0); /* TTL */ - sldns_buffer_write_u16(pkt, sizeof(uint8_t) + len); - sldns_buffer_write_u8(pkt, len); - sldns_buffer_write(pkt, str, len); + for(i=0; i255) len=255; /* cap size of TXT record */ + sldns_buffer_write_u16(pkt, 0xc00c); /* compr ptr to query */ + sldns_buffer_write_u16(pkt, LDNS_RR_TYPE_TXT); + sldns_buffer_write_u16(pkt, LDNS_RR_CLASS_CH); + sldns_buffer_write_u32(pkt, 0); /* TTL */ + sldns_buffer_write_u16(pkt, sizeof(uint8_t) + len); + sldns_buffer_write_u8(pkt, len); + sldns_buffer_write(pkt, str[i], len); + } sldns_buffer_flip(pkt); edns->edns_version = EDNS_ADVERTISED_VERSION; edns->udp_size = EDNS_ADVERTISED_SIZE; @@ -768,6 +775,79 @@ chaos_replystr(sldns_buffer* pkt, const char* str, struct edns_data* edns, attach_edns_record(pkt, edns); } +/** + * Create CH class trustanchor answer. + * @param pkt: buffer + * @param edns: edns reply information. + * @param worker: worker with scratch region. + */ +static void +chaos_trustanchor(sldns_buffer* pkt, struct edns_data* edns, struct worker* w) +{ + int max_txt = 16; + int max_ids = 32; + char* str_array[16]; + int num = 0; + struct trust_anchor* ta; + log_info("trustanchor.unbound CH TXT"); + + if(!w->env.need_to_validate) { + /* no validator module, reply no trustanchors */ + chaos_replystr(pkt, NULL, 0, edns, w); + } + + /* fill the string with contents */ + lock_basic_lock(&w->env.anchors->lock); + RBTREE_FOR(ta, struct trust_anchor*, w->env.anchors->tree) { + int numid = 0; + char* str = (char*)regional_alloc(w->scratchpad, 255); + size_t str_len = 255; + if(!str || num == max_txt) continue; + lock_basic_lock(&ta->lock); + if(ta->numDS == 0 && ta->numDNSKEY == 0) { + /* empty, insecure point */ + lock_basic_unlock(&ta->lock); + continue; + } + str_array[num] = str; + num++; + + /* spool name of anchor */ + (void)sldns_wire2str_dname_buf(ta->name, ta->namelen, str, str_len); + str_len -= strlen(str); str += strlen(str); + /* spool DS */ + if(ta->numDS != 0 && ta->ds_rrset) { + struct packed_rrset_data* d=(struct packed_rrset_data*) + ta->ds_rrset->entry.data; + size_t i; + for(i=0; icount; i++) { + uint16_t tag = ds_get_keytag(ta->ds_rrset, i); + if(numid++ > max_ids) continue; + snprintf(str, str_len, " %u", (unsigned)tag); + str_len -= strlen(str); str += strlen(str); + } + } + /* spool DNSKEY */ + if(ta->numDNSKEY != 0 && ta->dnskey_rrset) { + struct packed_rrset_data* d=(struct packed_rrset_data*) + ta->dnskey_rrset->entry.data; + size_t i; + for(i=0; icount; i++) { + uint16_t tag = dnskey_calc_keytag(ta->dnskey_rrset, i); + if(numid++ > max_ids) continue; + snprintf(str, str_len, " %u", (unsigned)tag); + str_len -= strlen(str); str += strlen(str); + } + } + log_info("insert string [%d] %s", num, str_array[num-1]); + lock_basic_unlock(&ta->lock); + } + lock_basic_unlock(&w->env.anchors->lock); + + chaos_replystr(pkt, str_array, num, edns, w); + regional_free_all(w->scratchpad); +} + /** * Answer CH class queries. * @param w: worker @@ -794,13 +874,13 @@ answer_chaos(struct worker* w, struct query_info* qinfo, char buf[MAXHOSTNAMELEN+1]; if (gethostname(buf, MAXHOSTNAMELEN) == 0) { buf[MAXHOSTNAMELEN] = 0; - chaos_replystr(pkt, buf, edns, w); + chaos_replystr(pkt, (char**)&buf, 1, edns, w); } else { log_err("gethostname: %s", strerror(errno)); - chaos_replystr(pkt, "no hostname", edns, w); + chaos_replystr(pkt, (char**)&"no hostname", 1, edns, w); } } - else chaos_replystr(pkt, cfg->identity, edns, w); + else chaos_replystr(pkt, &cfg->identity, 1, edns, w); return 1; } if(query_dname_compare(qinfo->qname, @@ -811,10 +891,19 @@ answer_chaos(struct worker* w, struct query_info* qinfo, if(cfg->hide_version) return 0; if(cfg->version==NULL || cfg->version[0]==0) - chaos_replystr(pkt, PACKAGE_STRING, edns, w); - else chaos_replystr(pkt, cfg->version, edns, w); + chaos_replystr(pkt, (char**)&PACKAGE_STRING, 1, edns, w); + else chaos_replystr(pkt, (char**)&cfg->version, 1, edns, w); return 1; } + if(query_dname_compare(qinfo->qname, + (uint8_t*)"\013trustanchor\007unbound") == 0) + { + if(cfg->hide_trustanchor) + return 0; + chaos_trustanchor(pkt, edns, w); + return 1; + } + return 0; } diff --git a/doc/Changelog b/doc/Changelog index bebd67521..184300fbb 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,9 @@ +16 March 2017: Wouter + - Fix that SHM is not inited if not enabled. + - Add trustanchor.unbound CH TXT that gets a response with a number + of TXT RRs with a string like "example.com. 2345 1234" with + the trust anchors and their keytags. + 13 March 2017: Wouter - testbound understands Deckard MATCH rcode question answer commands. - Fix #1235: Fix too long DNAME expansion produces SERVFAIL instead diff --git a/doc/example.conf.in b/doc/example.conf.in index 552e2640a..ff2c58944 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -316,6 +316,9 @@ server: # enable to not answer version.server and version.bind queries. # hide-version: no + + # enable to not answer trustanchor.unbound queries. + # hide-trustanchor: no # the identity to report. Leave "" or default to return hostname. # identity: "" diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 61faffdcf..c0e910a09 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -596,6 +596,9 @@ If enabled version.server and version.bind queries are refused. Set the version to report. If set to "", the default, then the package version is returned. .TP +.B hide\-trustanchor: \fI +If enabled trustanchor.unbound queries are refused. +.TP .B target\-fetch\-policy: \fI<"list of numbers"> Set the target fetch policy used by unbound to determine if it should fetch nameserver target addresses opportunistically. The policy is described per diff --git a/testdata/chaos_trustanchor.rpl b/testdata/chaos_trustanchor.rpl new file mode 100644 index 000000000..b46b7dcf1 --- /dev/null +++ b/testdata/chaos_trustanchor.rpl @@ -0,0 +1,145 @@ +; config options +; The island of trust is at example.com +server: + trust-anchor: "example.com. 3600 IN DS 2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b" + hide-trustanchor: no + val-override-date: "20070916134226" + target-fetch-policy: "0 0 0 0 0" + fake-sha1: yes + +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. +CONFIG_END + +SCENARIO_BEGIN Test chaos trustanchor query + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 100 + ADDRESS 192.5.6.30 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION ANSWER +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END +RANGE_END + +; ns.example.com. +RANGE_BEGIN 0 100 + ADDRESS 1.2.3.4 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION ANSWER +example.com. IN NS ns.example.com. +example.com. 3600 IN RRSIG NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854} +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ns.example.com. 3600 IN RRSIG A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854} +ENTRY_END + +; response to DNSKEY priming query +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.com. IN DNSKEY +SECTION ANSWER +example.com. 3600 IN DNSKEY 256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b} +example.com. 3600 IN RRSIG DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854} +SECTION AUTHORITY +example.com. IN NS ns.example.com. +example.com. 3600 IN RRSIG NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854} +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ns.example.com. 3600 IN RRSIG A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854} +ENTRY_END + +; response to query of interest +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ns.example.com. 3600 IN RRSIG A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCQMyTjn7WWwpwAR1LlVeLpRgZGuQIUCcJDEkwAuzytTDRlYK7nIMwH1CM= ;{id = 2854} +SECTION AUTHORITY +example.com. IN NS ns.example.com. +example.com. 3600 IN RRSIG NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854} +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +www.example.com. 3600 IN RRSIG A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFC99iE9K5y2WNgI0gFvBWaTi9wm6AhUAoUqOpDtG5Zct+Qr9F3mSdnbc6V4= ;{id = 2854} +ENTRY_END +RANGE_END + +STEP 1 QUERY +ENTRY_BEGIN +REPLY RD DO +SECTION QUESTION +trustanchor.unbound. CH TXT +ENTRY_END + +; recursion happens here. +STEP 10 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA DO NOERROR +SECTION QUESTION +trustanchor.unbound. CH TXT +SECTION ANSWER +trustanchor.unbound. CH TXT "example.com. 2854" +ENTRY_END + +SCENARIO_END diff --git a/util/config_file.c b/util/config_file.c index e51651c1b..ad957ed7e 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -189,6 +189,7 @@ config_create(void) cfg->unwanted_threshold = 0; cfg->hide_identity = 0; cfg->hide_version = 0; + cfg->hide_trustanchor = 0; cfg->identity = NULL; cfg->version = NULL; cfg->auto_trust_anchor_file_list = NULL; @@ -437,6 +438,7 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_STR("pidfile:", pidfile) else S_YNO("hide-identity:", hide_identity) else S_YNO("hide-version:", hide_version) + else S_YNO("hide-trustanchor:", hide_trustanchor) else S_STR("identity:", identity) else S_STR("version:", version) else S_STRLIST("root-hints:", root_hints) @@ -759,6 +761,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_STR(opt, "pidfile", pidfile) else O_YNO(opt, "hide-identity", hide_identity) else O_YNO(opt, "hide-version", hide_version) + else O_YNO(opt, "hide-trustanchor", hide_trustanchor) else O_STR(opt, "identity", identity) else O_STR(opt, "version", version) else O_STR(opt, "target-fetch-policy", target_fetch_policy) diff --git a/util/config_file.h b/util/config_file.h index c184748a3..2cb9a854f 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -238,6 +238,8 @@ struct config_file { int hide_identity; /** do not report version (version.server, version.bind) */ int hide_version; + /** do not report trustanchor (trustanchor.unbound) */ + int hide_trustanchor; /** identity, hostname is returned if "". */ char* identity; /** version, package version returned if "". */ diff --git a/util/configlexer.c b/util/configlexer.c index a5ea38913..abda039e5 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -378,8 +378,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 209 -#define YY_END_OF_BUFFER 210 +#define YY_NUM_RULES 210 +#define YY_END_OF_BUFFER 211 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -387,232 +387,233 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[2036] = +static yyconst flex_int16_t yy_accept[2048] = { 0, - 1, 1, 191, 191, 195, 195, 199, 199, 203, 203, - 1, 1, 210, 207, 1, 189, 189, 208, 2, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 191, 192, 192, 193, 208, 195, 196, 196, 197, 208, - 202, 199, 200, 200, 201, 208, 203, 204, 204, 205, - 208, 206, 190, 2, 194, 208, 206, 207, 0, 1, - 2, 2, 2, 2, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, + 1, 1, 192, 192, 196, 196, 200, 200, 204, 204, + 1, 1, 211, 208, 1, 190, 190, 209, 2, 209, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 192, 193, 193, 194, 209, 196, 197, 197, 198, 209, + 203, 200, 201, 201, 202, 209, 204, 205, 205, 206, + 209, 207, 191, 2, 195, 209, 207, 208, 0, 1, + 2, 2, 2, 2, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 191, - 0, 195, 0, 202, 0, 199, 203, 0, 206, 0, - 2, 2, 206, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 192, + 0, 196, 0, 203, 0, 200, 204, 0, 207, 0, + 2, 2, 207, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 206, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 206, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 207, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 207, 208, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 77, 207, 207, - 207, 207, 207, 207, 8, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 88, 206, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 77, 208, 208, + 208, 208, 208, 208, 8, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 88, 207, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 207, 207, 207, 207, 206, 207, 207, 207, 207, 207, - 37, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 162, 207, 14, 15, 207, 18, 17, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 148, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 3, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 207, 208, 208, 208, 208, + 208, 37, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 163, 208, 14, 15, 208, 18, 17, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 149, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 3, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 206, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 198, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 40, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 41, 207, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 207, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 199, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 40, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 41, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 137, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 20, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 96, 207, 198, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 112, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 95, 207, 207, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 138, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 20, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 97, 208, 199, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 113, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 96, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 75, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 25, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 38, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 39, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 75, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 25, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 38, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 39, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 207, 207, 113, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 28, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 177, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 32, - 207, 33, 207, 207, 207, 78, 207, 79, 207, 207, - 76, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 7, 207, 207, + 208, 208, 208, 208, 208, 208, 114, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 28, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 178, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 32, 208, 33, 208, 208, 208, + 78, 208, 79, 208, 208, 76, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 155, 207, 207, 207, 207, 98, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 29, 207, 207, 207, 207, 207, 207, 207, - 129, 207, 128, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 16, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 42, 207, 207, 207, 207, 207, 136, 207, + 208, 208, 7, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 156, 208, 208, + 208, 208, 99, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 29, 208, + 208, 208, 208, 208, 208, 208, 130, 208, 129, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 16, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 42, 208, - 207, 207, 207, 81, 80, 207, 207, 207, 207, 207, - 207, 207, 207, 123, 207, 207, 207, 207, 207, 207, - 207, 207, 89, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 60, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 64, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 36, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 126, 127, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 6, 207, + 208, 208, 208, 208, 137, 208, 208, 208, 208, 81, + 80, 208, 208, 208, 208, 208, 208, 208, 208, 124, + 208, 208, 208, 208, 208, 208, 208, 208, 89, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 60, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 64, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 36, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 127, 128, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 187, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 26, 207, 207, 207, - 207, 207, 207, 207, 207, 119, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 141, 207, 120, 207, 207, - 153, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 27, 207, 207, 207, 207, 84, 207, 85, 207, - 83, 207, 207, 207, 207, 207, 207, 207, 94, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 6, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 188, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 26, 208, 208, 208, 208, 208, 208, + 208, 208, 120, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 142, 208, 121, 208, 208, 154, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 27, 208, + 208, 208, 208, 84, 208, 85, 208, 83, 208, 208, + 208, 208, 208, 208, 208, 208, 94, 208, 208, 208, - 176, 207, 207, 121, 207, 207, 207, 207, 207, 124, - 207, 152, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 74, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 34, 207, 207, 22, 207, 207, 207, - 207, 19, 207, 103, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 49, 51, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 163, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 86, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 208, 208, 208, 177, 208, + 208, 122, 208, 208, 208, 208, 208, 125, 208, 153, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 74, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 34, 208, 208, 22, 208, 208, 208, 208, 19, + 208, 104, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 49, 51, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 164, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 207, 93, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 97, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 147, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 111, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 107, 207, 114, 207, 207, 207, - 207, 207, 92, 207, 207, 70, 207, 139, 207, 207, - 207, 207, 207, 154, 207, 207, 207, 207, 207, 207, - 207, 168, 207, 207, 207, 207, 207, 207, 207, 207, + 208, 86, 208, 208, 208, 208, 208, 208, 208, 93, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 98, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 148, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 112, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 108, 208, 115, 208, 208, 208, 208, + 208, 92, 208, 208, 70, 208, 140, 208, 208, 208, + 208, 208, 155, 208, 208, 208, 208, 208, 208, 208, - 207, 207, 207, 207, 110, 207, 207, 207, 207, 207, - 52, 53, 207, 207, 207, 207, 207, 35, 59, 115, - 207, 130, 207, 156, 125, 207, 207, 45, 207, 117, - 207, 207, 207, 207, 207, 9, 207, 207, 207, 73, - 207, 207, 207, 207, 181, 207, 138, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 99, 167, 207, 207, 207, 207, 207, 207, 207, 207, - 149, 207, 207, 207, 207, 207, 207, 207, 207, 207, + 169, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 111, 208, 208, 208, 208, 208, + 52, 53, 208, 208, 208, 208, 208, 35, 59, 116, + 208, 131, 208, 157, 126, 208, 208, 45, 208, 118, + 208, 208, 208, 208, 208, 9, 208, 208, 208, 73, + 208, 208, 208, 208, 182, 208, 139, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 100, 168, 208, 208, 208, 208, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 116, 207, 207, 44, 46, 207, 207, 207, 207, 207, - 207, 207, 72, 207, 207, 207, 207, 179, 207, 186, - 207, 207, 207, 207, 143, 23, 24, 207, 207, 207, - 207, 207, 207, 207, 207, 69, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 145, 142, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 43, - 207, 207, 207, 207, 207, 207, 207, 207, 13, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 12, 207, 207, 21, 207, 207, 207, 185, + 150, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 117, 208, 208, 44, 46, 208, 208, 208, 208, + 208, 208, 208, 72, 208, 208, 208, 208, 180, 208, + 187, 208, 208, 208, 208, 144, 23, 24, 208, 208, + 208, 208, 208, 208, 208, 208, 69, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 146, + 143, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 43, 208, 208, 208, 208, 208, 208, 208, 208, 95, + 13, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 207, 188, 47, 207, 151, 144, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 106, 105, - 207, 207, 207, 207, 146, 140, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 54, 207, 207, 207, - 180, 207, 207, 150, 207, 207, 207, 207, 207, 207, - 207, 207, 48, 207, 207, 82, 207, 100, 102, 131, - 207, 207, 207, 104, 207, 207, 157, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 164, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 12, 208, 208, 21, 208, 208, + 208, 186, 208, 189, 47, 208, 152, 145, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 107, 106, 208, 208, 208, 208, 147, 141, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 54, 208, + 208, 208, 181, 208, 208, 151, 208, 208, 208, 208, + 208, 208, 208, 208, 48, 208, 208, 82, 208, 101, + 103, 132, 208, 208, 208, 105, 208, 208, 158, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 165, - 207, 132, 207, 207, 178, 207, 207, 30, 207, 207, - 207, 207, 4, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 160, 207, 207, 207, 207, 207, - 207, 207, 207, 166, 207, 207, 135, 207, 207, 207, - 207, 207, 207, 207, 207, 57, 207, 31, 184, 161, - 207, 11, 207, 207, 207, 207, 207, 207, 133, 61, - 207, 207, 207, 109, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 165, 90, 207, 87, 207, 207, - 207, 63, 67, 62, 207, 55, 207, 10, 207, 207, - 207, 182, 207, 207, 108, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 133, 208, 208, 179, 208, 208, 30, + 208, 208, 208, 208, 4, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 161, 208, 208, 208, + 208, 208, 208, 208, 208, 167, 208, 208, 136, 208, + 208, 208, 208, 208, 208, 208, 208, 57, 208, 31, + 185, 162, 208, 11, 208, 208, 208, 208, 208, 208, + 134, 61, 208, 208, 208, 110, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 166, 90, 208, 87, + 208, 208, 208, 63, 67, 62, 208, 55, 208, 10, - 207, 207, 207, 207, 207, 207, 207, 207, 68, 66, - 207, 56, 207, 122, 207, 207, 134, 207, 207, 207, - 207, 101, 50, 207, 207, 207, 207, 207, 207, 207, - 91, 65, 58, 207, 183, 207, 207, 207, 159, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 71, 207, - 158, 175, 207, 207, 207, 207, 207, 207, 5, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 118, 207, 207, 207, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 183, 208, 208, 109, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 68, 66, 208, 56, 208, 123, 208, 208, 135, 208, + 208, 208, 208, 102, 50, 208, 208, 208, 208, 208, + 208, 208, 91, 65, 58, 208, 184, 208, 208, 208, + 160, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 71, 208, 159, 176, 208, 208, 208, 208, 208, 208, + 5, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 171, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 169, 207, 172, 173, 207, 207, 207, - 207, 207, 170, 174, 0 + 208, 208, 119, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 172, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 170, 208, 173, 174, 208, + 208, 208, 208, 208, 171, 175, 0 } ; static yyconst YY_CHAR yy_ec[256] = @@ -655,23 +656,23 @@ static yyconst YY_CHAR yy_meta[41] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_uint16_t yy_base[2050] = +static yyconst flex_uint16_t yy_base[2062] = { 0, 0, 0, 38, 41, 44, 46, 59, 65, 71, 77, - 90, 112, 3367, 3270, 81, 3997, 3997, 3997, 96, 52, + 90, 112, 3658, 3473, 81, 4028, 4028, 4028, 96, 52, 72, 107, 111, 70, 91, 109, 124, 98, 114, 117, 133, 136, 64, 144, 129, 145, 156, 165, 158, 173, - 3017, 3997, 3997, 3997, 164, 2646, 3997, 3997, 3997, 137, - 2462, 2408, 3997, 3997, 3997, 196, 1874, 3997, 3997, 3997, - 189, 1815, 3997, 200, 3997, 204, 167, 1401, 208, 147, + 3445, 4028, 4028, 4028, 164, 3387, 4028, 4028, 4028, 137, + 3338, 3156, 4028, 4028, 4028, 196, 1883, 4028, 4028, 4028, + 189, 1606, 4028, 200, 4028, 204, 167, 1379, 208, 147, 0, 215, 0, 0, 209, 147, 202, 210, 211, 204, 219, 216, 217, 221, 230, 223, 227, 233, 220, 228, 232, 245, 241, 248, 63, 242, 252, 253, 249, 258, 259, 262, 265, 264, 266, 270, 274, 276, 275, 282, 281, 283, 285, 289, 170, 288, 286, 296, 300, 298, - 311, 295, 299, 297, 314, 317, 319, 303, 320, 1373, - 333, 1291, 336, 1222, 345, 884, 716, 337, 628, 351, + 311, 295, 299, 297, 314, 317, 319, 303, 320, 1229, + 333, 1177, 336, 969, 345, 937, 716, 337, 628, 351, 355, 0, 347, 349, 340, 351, 352, 353, 356, 357, 88, 364, 362, 368, 376, 361, 374, 379, 363, 384, 385, 373, 387, 392, 386, 393, 398, 399, 401, 402, @@ -692,428 +693,432 @@ static yyconst flex_uint16_t yy_base[2050] = 687, 688, 695, 689, 708, 691, 705, 706, 715, 710, 713, 724, 712, 714, 719, 723, 725, 729, 734, 728, - 731, 739, 740, 736, 743, 742, 750, 752, 754, 755, - 757, 756, 763, 765, 758, 766, 774, 775, 769, 772, - 778, 780, 781, 782, 784, 786, 793, 3997, 795, 788, - 791, 797, 798, 800, 3997, 801, 802, 803, 810, 805, - 808, 811, 815, 826, 830, 827, 828, 816, 829, 831, - 832, 834, 836, 837, 857, 840, 842, 843, 870, 846, - 851, 844, 853, 854, 862, 867, 866, 868, 869, 880, - 884, 882, 874, 886, 3997, 890, 902, 888, 895, 897, + 731, 739, 740, 736, 743, 742, 750, 752, 754, 758, + 763, 755, 756, 764, 765, 766, 776, 777, 771, 774, + 780, 772, 782, 787, 785, 783, 793, 4028, 795, 791, + 797, 798, 799, 801, 4028, 800, 802, 803, 814, 806, + 811, 809, 821, 830, 831, 826, 827, 828, 833, 834, + 836, 837, 839, 841, 861, 843, 845, 852, 853, 856, + 846, 870, 810, 872, 874, 876, 875, 865, 857, 878, + 882, 881, 886, 892, 4028, 844, 899, 885, 894, 895, - 898, 904, 899, 914, 905, 909, 907, 915, 916, 918, - 927, 923, 925, 929, 938, 931, 940, 941, 933, 942, - 943, 944, 945, 956, 951, 948, 946, 963, 959, 958, - 965, 960, 969, 961, 971, 975, 967, 988, 974, 984, - 985, 986, 990, 992, 993, 994, 996, 997, 1004, 1001, - 1000, 1002, 1010, 1013, 1014, 1022, 1018, 1025, 1017, 1021, - 1030, 1027, 1032, 1039, 1034, 1035, 1038, 1037, 1049, 1046, - 1036, 1050, 1051, 1055, 1054, 1058, 1059, 1060, 1062, 1064, - 1067, 1063, 1065, 1068, 1075, 1071, 1074, 1085, 1087, 1077, - 1089, 1079, 1092, 1096, 1097, 1098, 1099, 1100, 1102, 1101, + 896, 903, 905, 913, 906, 911, 909, 910, 916, 920, + 927, 922, 929, 931, 938, 934, 941, 943, 923, 942, + 945, 946, 948, 955, 953, 950, 951, 958, 965, 961, + 960, 967, 962, 971, 963, 977, 983, 973, 990, 976, + 986, 991, 992, 993, 994, 996, 999, 1000, 1001, 1008, + 1005, 1003, 1012, 1014, 1007, 1018, 1026, 1022, 1029, 1021, + 1028, 1036, 1031, 1034, 1043, 1038, 1039, 1042, 1041, 1055, + 1050, 1040, 1056, 1052, 1059, 1062, 1063, 1053, 1064, 1066, + 1067, 1068, 1069, 1073, 1074, 1085, 1075, 1077, 1090, 1078, + 1086, 1088, 1095, 1098, 1099, 1100, 1101, 1102, 1103, 1105, - 1108, 1112, 1110, 1113, 1118, 1114, 1116, 1125, 1126, 1128, - 3997, 1136, 1129, 1134, 1131, 1132, 1139, 1140, 1141, 1142, - 1151, 3997, 1147, 3997, 3997, 1144, 3997, 3997, 1145, 1152, - 1153, 1164, 1168, 1172, 1174, 1177, 1171, 1155, 1184, 1191, - 1188, 1196, 1179, 1198, 1200, 1201, 1202, 1183, 1203, 1206, - 1208, 1210, 1209, 1211, 1216, 1213, 1214, 1218, 1219, 1221, - 1239, 1240, 1223, 1235, 1236, 1237, 1238, 1242, 1243, 1246, - 1249, 1251, 1253, 1258, 1254, 3997, 1255, 1257, 1259, 1263, - 1267, 1269, 1271, 306, 1272, 3997, 1274, 1278, 1279, 1280, - 1282, 1284, 1287, 1288, 1289, 1290, 1292, 1293, 1296, 1295, + 1104, 1113, 1114, 1115, 1116, 1119, 1118, 1126, 1127, 1131, + 1128, 4028, 1139, 1134, 1138, 1135, 1141, 1149, 1136, 1145, + 1146, 1153, 4028, 1151, 4028, 4028, 1150, 4028, 4028, 1152, + 1164, 1156, 1168, 1173, 1182, 1183, 1181, 1157, 1179, 1155, + 1188, 1193, 1189, 1198, 1194, 1203, 1200, 1207, 1206, 1212, + 1208, 1213, 1215, 1217, 1216, 1218, 1222, 1225, 1223, 1221, + 1226, 1228, 1240, 1244, 1242, 1243, 1246, 1247, 1230, 1251, + 1250, 1252, 1259, 1253, 1260, 1267, 1263, 4028, 1264, 1265, + 1266, 1270, 1272, 1276, 1278, 306, 1280, 4028, 1279, 1285, + 1287, 1289, 1288, 1290, 1292, 1295, 1296, 1297, 1298, 1299, - 1297, 1313, 1302, 1306, 1314, 1321, 1322, 1320, 1299, 1317, - 1325, 1323, 1331, 1333, 1335, 1334, 1336, 1345, 1340, 1342, - 1343, 1347, 1348, 1350, 1351, 1353, 1355, 1356, 1378, 1357, - 1362, 1359, 1365, 1364, 1367, 1375, 1371, 1372, 1384, 1391, - 1392, 1393, 1395, 1379, 1396, 1402, 1411, 1404, 1417, 1413, - 1415, 1418, 1416, 1422, 1424, 1426, 1420, 1429, 1433, 1436, - 1437, 3997, 1444, 1442, 1440, 1447, 1454, 1446, 1449, 1453, - 1455, 1450, 1456, 1457, 1458, 1461, 1469, 1467, 1470, 1471, - 1478, 3997, 1473, 1475, 1474, 1477, 1485, 1486, 1488, 1494, - 1502, 1498, 3997, 1484, 1505, 1506, 1509, 1501, 1503, 1513, + 1302, 1300, 1303, 1307, 1320, 1304, 1321, 1328, 1329, 1326, + 1306, 1327, 1331, 1332, 1333, 1343, 1338, 1340, 1342, 1350, + 1345, 1349, 1346, 1352, 1354, 1356, 1357, 1359, 1361, 1362, + 1384, 1366, 1368, 1363, 1371, 1370, 1373, 1380, 1377, 1390, + 1394, 1386, 1392, 1403, 1399, 1381, 1406, 1409, 1416, 1412, + 1419, 1417, 1421, 1422, 1424, 1428, 1429, 1426, 1434, 1432, + 1435, 1437, 1445, 1447, 4028, 1455, 1450, 1439, 1448, 1463, + 1459, 1441, 1462, 1465, 1452, 1466, 1467, 1472, 1469, 1470, + 1473, 1476, 1478, 1488, 4028, 1479, 1481, 1480, 1491, 1492, + 1500, 1494, 1501, 1510, 1506, 4028, 1507, 1514, 1511, 1517, - 1514, 1516, 1517, 1518, 1519, 1521, 1522, 1525, 3997, 1524, - 1529, 1532, 1534, 1531, 1541, 1543, 1542, 1544, 1547, 1548, - 1555, 1551, 1552, 3997, 1550, 1562, 1553, 1554, 1575, 1576, - 1558, 1572, 1579, 1571, 1574, 1580, 1585, 1582, 1584, 1583, - 1586, 3997, 1587, 566, 1589, 1594, 1595, 1597, 1604, 1596, - 1605, 1599, 1607, 1612, 1608, 1614, 1618, 1616, 1619, 1627, - 1620, 1622, 1624, 1628, 1635, 1632, 1639, 1629, 1641, 1642, - 1645, 1647, 1649, 1650, 1651, 3997, 1657, 1658, 1663, 1659, - 1661, 1664, 1666, 1653, 1667, 1669, 1671, 1675, 1676, 1677, - 1678, 3997, 1688, 1684, 1685, 1683, 1694, 1692, 1701, 1696, + 1516, 1509, 1518, 1527, 1522, 1525, 1524, 1531, 1532, 1534, + 1526, 4028, 1535, 1536, 1540, 1544, 1548, 1549, 1550, 1551, + 1554, 1555, 1558, 1562, 1559, 1560, 4028, 1561, 1563, 1570, + 1568, 1578, 1582, 1574, 1583, 1585, 1577, 1586, 1587, 1594, + 1591, 1592, 1593, 1595, 4028, 1597, 566, 1603, 1598, 1602, + 1610, 1611, 1614, 1618, 1607, 1615, 1625, 1624, 1608, 1483, + 1626, 1628, 1632, 1634, 1633, 1636, 1635, 1637, 1640, 1643, + 1644, 1646, 1652, 1653, 1654, 1656, 1660, 1657, 4028, 1664, + 1667, 1668, 1666, 1661, 1669, 1672, 1673, 1674, 1678, 1682, + 1683, 1686, 1687, 1688, 1694, 4028, 1696, 1691, 1698, 1692, - 1702, 1705, 1706, 1708, 1710, 1717, 1712, 1709, 1720, 1722, - 1723, 1724, 1726, 1731, 1730, 1732, 1739, 1740, 1737, 1741, - 1738, 1748, 1753, 1746, 3997, 1755, 1760, 1743, 1762, 1769, - 1764, 1765, 1766, 1772, 1767, 1770, 1773, 1776, 1777, 1784, - 1787, 1789, 3997, 1790, 1792, 1786, 1795, 1796, 1799, 1803, - 1800, 1807, 1804, 1809, 1810, 1812, 1819, 1811, 1822, 1823, - 1813, 3997, 1831, 1833, 1832, 1840, 1835, 1836, 1838, 1842, - 1839, 1843, 1845, 1852, 1847, 1850, 1848, 1851, 1853, 1856, - 1857, 1862, 1866, 1865, 1858, 1872, 3997, 1873, 1884, 1879, - 1885, 1887, 1886, 1896, 1891, 1894, 1897, 1875, 1899, 1898, + 1697, 1704, 1715, 1710, 1711, 1713, 1717, 1719, 1721, 1728, + 1723, 1731, 1733, 1734, 1735, 1737, 1741, 1743, 1744, 1727, + 1752, 1753, 1749, 1751, 1756, 1759, 1763, 1757, 4028, 1762, + 1764, 1767, 1769, 1781, 1773, 1777, 1771, 1783, 1782, 1784, + 1788, 1695, 1789, 1798, 1792, 1800, 4028, 1801, 1803, 1795, + 1810, 1802, 1812, 1813, 1805, 1816, 1817, 1819, 1820, 1825, + 1831, 1821, 1823, 1827, 1833, 4028, 1841, 1842, 1838, 1850, + 1840, 1845, 1847, 1852, 1848, 1853, 1854, 1861, 1856, 1859, + 1857, 1860, 1862, 1865, 1866, 1871, 1867, 1875, 1880, 1881, + 4028, 1882, 1893, 1888, 1890, 1894, 1895, 1905, 1900, 1902, - 1902, 1904, 3997, 1906, 1907, 1908, 1909, 1912, 1913, 1914, - 1911, 1918, 1915, 1931, 1919, 1932, 1933, 1934, 1935, 1938, - 1945, 1950, 1946, 1951, 3997, 1954, 1955, 1949, 1942, 1957, - 1961, 1963, 1970, 1972, 1965, 1967, 1968, 1973, 1974, 1976, - 1977, 1984, 1979, 1980, 1988, 1989, 1990, 1981, 1991, 1993, - 2009, 2001, 1997, 2005, 2011, 2003, 2014, 2017, 2018, 3997, - 2019, 2022, 2026, 2027, 2029, 2028, 2021, 2040, 2036, 3997, - 2031, 3997, 2042, 2043, 2051, 3997, 2053, 3997, 2055, 2048, - 3997, 2056, 2057, 2050, 2060, 2061, 2062, 2063, 2069, 2066, - 2071, 2072, 2074, 2076, 2077, 2079, 2083, 3997, 2090, 2082, + 1906, 1884, 1908, 1907, 1911, 1914, 4028, 1915, 1917, 1918, + 1916, 1922, 1923, 1924, 1921, 1927, 1941, 1942, 1931, 1943, + 1944, 1946, 1950, 1930, 1953, 1960, 1963, 1964, 1966, 4028, + 1969, 1955, 1962, 1970, 1972, 1973, 1974, 1981, 1984, 1976, + 1979, 1982, 1985, 1986, 1989, 1991, 2000, 1990, 1992, 1995, + 1999, 2002, 2003, 2005, 2006, 2010, 2015, 2022, 2023, 2025, + 1920, 2017, 2019, 2031, 4028, 2034, 2030, 2036, 2038, 2040, + 2039, 2041, 2048, 2052, 4028, 2045, 4028, 2053, 2055, 2065, + 4028, 2067, 4028, 2069, 2060, 4028, 2070, 2071, 2047, 2049, + 2064, 2075, 2077, 2082, 2079, 2084, 2085, 2087, 2088, 2089, - 2080, 2092, 2097, 2084, 2086, 2099, 2095, 2101, 2105, 2113, - 2109, 2117, 3997, 2112, 2119, 2114, 2116, 3997, 2120, 2123, - 2125, 2121, 2128, 2136, 2127, 2138, 2135, 2139, 2142, 2149, - 2150, 2148, 2152, 2153, 2160, 2156, 2163, 2155, 2162, 2159, - 2165, 2168, 2169, 2172, 2174, 2175, 2177, 2182, 2179, 2180, - 2181, 2183, 3997, 2185, 2191, 2193, 2194, 2196, 2201, 2202, - 3997, 2197, 3997, 2205, 2207, 2215, 2216, 2220, 2208, 2222, - 2221, 2223, 2227, 2234, 2238, 2226, 2229, 2233, 2239, 2241, - 2243, 3997, 2244, 2245, 2247, 2249, 2250, 2256, 2266, 2262, - 2252, 2278, 3997, 2260, 2258, 2268, 2285, 2280, 3997, 2264, + 2091, 2090, 4028, 2097, 2094, 2100, 2101, 2098, 2105, 2106, + 2107, 2108, 2111, 2115, 2123, 2118, 2127, 4028, 2119, 2130, + 2122, 2131, 4028, 2124, 2134, 2132, 2136, 2139, 2146, 2147, + 2149, 2150, 2143, 2151, 2159, 2160, 2162, 2163, 2164, 2171, + 2167, 2175, 2166, 2173, 2177, 2174, 2170, 2181, 2183, 2185, + 2186, 2190, 2191, 2193, 2192, 2194, 2195, 2196, 4028, 2198, + 2205, 2206, 2207, 2208, 2218, 2210, 4028, 2213, 4028, 2216, + 2220, 2224, 2229, 2231, 2221, 2234, 2235, 2238, 2239, 2246, + 2245, 2242, 2251, 2249, 2252, 2253, 2256, 4028, 2255, 2257, + 2258, 2260, 2261, 2272, 2273, 2278, 2263, 2285, 4028, 2271, - 2288, 2283, 2289, 3997, 3997, 2275, 2287, 2290, 2291, 2293, - 2305, 2297, 2300, 3997, 2302, 2304, 2306, 2311, 2314, 2315, - 2308, 2307, 3997, 2321, 2323, 2325, 2326, 2328, 2329, 2327, - 2337, 2332, 2334, 2342, 2350, 2335, 2354, 3997, 2351, 2355, - 2358, 2347, 2360, 2361, 2362, 2363, 2366, 2367, 2368, 2369, - 2373, 2381, 2377, 2380, 2382, 2386, 2383, 2391, 2379, 2393, - 2397, 2410, 2405, 3997, 2412, 2395, 2415, 2394, 2417, 2420, - 2424, 2414, 2387, 2411, 2429, 2422, 3997, 2436, 2425, 2432, - 2438, 2434, 2440, 2443, 2444, 2445, 2448, 3997, 3997, 2449, - 2451, 2452, 2454, 2455, 2456, 2468, 2457, 2459, 3997, 2465, + 2282, 2286, 2289, 2292, 4028, 2293, 2301, 2294, 2296, 4028, + 4028, 2297, 2302, 2304, 2303, 2306, 2314, 2311, 2312, 4028, + 2319, 2309, 2320, 2323, 2326, 2332, 2333, 2315, 4028, 2334, + 2336, 2339, 2340, 2343, 2344, 2322, 2351, 2346, 2348, 2354, + 2362, 2364, 2369, 4028, 2352, 2350, 2371, 2363, 2372, 2365, + 2373, 2376, 2378, 2379, 2380, 2381, 2387, 2390, 2382, 2389, + 2392, 2394, 2395, 2398, 2399, 2405, 2402, 2413, 2411, 4028, + 2416, 2409, 2423, 2418, 2419, 2425, 2428, 2432, 2421, 2430, + 2431, 2442, 2437, 4028, 2445, 2438, 2441, 2447, 2448, 2453, + 2449, 2455, 2458, 2461, 4028, 4028, 2456, 2464, 2466, 2468, - 2477, 2472, 2473, 2484, 2485, 2487, 2476, 2488, 2474, 2489, - 2490, 2493, 2491, 2495, 2498, 2500, 2503, 3997, 2501, 2504, - 2506, 2505, 2513, 2517, 2514, 2527, 2512, 2518, 2524, 2534, - 2536, 2543, 2545, 2529, 2538, 2546, 3997, 2541, 2547, 2548, - 2531, 2558, 2549, 2563, 2554, 3997, 2559, 2564, 2568, 2570, - 2561, 2572, 2574, 2576, 2575, 3997, 2580, 3997, 2583, 2577, - 3997, 2587, 2591, 2573, 2588, 2592, 2594, 2596, 2598, 2601, - 2602, 3997, 2605, 2604, 2609, 2611, 3997, 2608, 3997, 2612, - 3997, 2614, 2619, 2621, 2623, 2624, 2343, 2627, 3997, 2630, - 2631, 2634, 2632, 2636, 2638, 2642, 2643, 2639, 2644, 2647, + 2467, 2470, 2471, 2473, 2478, 4028, 2479, 2486, 2482, 2483, + 2491, 2493, 2489, 2492, 2495, 2498, 2500, 2501, 2503, 2505, + 2507, 2508, 2510, 2511, 4028, 2516, 2512, 2517, 2514, 2528, + 2530, 2532, 2539, 2524, 2522, 2526, 2540, 2542, 2550, 2553, + 2551, 2552, 2560, 4028, 2555, 2557, 2556, 2558, 2565, 2562, + 2569, 2566, 4028, 2570, 2571, 2575, 2580, 2576, 2581, 2585, + 2582, 2586, 4028, 2589, 4028, 2597, 2591, 4028, 2592, 2599, + 2593, 2601, 2602, 2605, 2607, 2609, 2612, 2608, 4028, 2615, + 2617, 2619, 2621, 4028, 2626, 4028, 2618, 4028, 2623, 2629, + 2637, 2632, 2639, 2642, 2646, 2633, 4028, 2647, 2636, 2650, - 3997, 2648, 2649, 3997, 2656, 2658, 2645, 2662, 2664, 3997, - 2670, 3997, 2672, 2674, 2652, 2675, 2681, 2677, 2684, 2676, - 2685, 2693, 2690, 2688, 2691, 3997, 2692, 2696, 2698, 2702, - 2700, 2704, 2712, 2708, 2707, 2714, 2716, 2718, 2720, 2721, - 2728, 2722, 2725, 3997, 2730, 2733, 3997, 2734, 2736, 2739, - 2742, 3997, 2740, 3997, 2743, 2744, 2741, 2745, 2751, 2752, - 2763, 2748, 2760, 2765, 2755, 2775, 2771, 2753, 3997, 3997, - 2777, 2772, 2783, 2784, 2778, 2780, 2792, 2788, 2795, 3997, - 2787, 2791, 2797, 2789, 2800, 2799, 2802, 2807, 2809, 2801, - 2803, 2810, 2811, 3997, 2814, 2815, 2819, 2821, 2823, 2822, + 2648, 2652, 2653, 2655, 2658, 2659, 2660, 2662, 4028, 2663, + 2664, 4028, 2661, 2669, 2672, 2674, 2680, 4028, 2677, 4028, + 2678, 2689, 2676, 2691, 2693, 2694, 2698, 2682, 2697, 2707, + 2704, 2705, 2706, 4028, 2708, 2710, 2712, 2715, 2713, 2719, + 2726, 2725, 2721, 2722, 2731, 2735, 2729, 2740, 2744, 2737, + 2733, 4028, 2747, 2748, 4028, 2749, 2750, 2751, 2755, 4028, + 2754, 4028, 2757, 2758, 2756, 2759, 2765, 2766, 2777, 2761, + 2774, 2767, 2779, 2788, 2783, 2784, 4028, 4028, 2786, 2789, + 2794, 2795, 2790, 2797, 2805, 2801, 2808, 4028, 2800, 2809, + 2803, 2812, 2811, 2810, 2813, 2818, 2819, 2820, 2831, 2821, - 2824, 3997, 2826, 2828, 2829, 2827, 2835, 2846, 2850, 2852, - 2839, 2853, 2855, 2858, 2860, 2862, 2864, 2857, 2869, 2865, - 2872, 2874, 2875, 3997, 2832, 2878, 2879, 2881, 2882, 2884, - 2885, 2886, 2892, 2889, 2895, 2893, 2897, 3997, 2899, 2901, - 2903, 2905, 2907, 2904, 2914, 2911, 2915, 2916, 2920, 2917, - 3997, 2925, 2927, 2928, 2930, 2929, 2933, 2934, 2936, 2935, - 2940, 2941, 2952, 2954, 3997, 2945, 3997, 2947, 2959, 2963, - 2961, 2964, 3997, 2966, 2967, 3997, 2968, 3997, 2969, 2973, - 2971, 2975, 2983, 3997, 2989, 2979, 2994, 2985, 2990, 2977, - 2998, 3997, 3001, 3000, 3007, 3008, 2992, 3002, 3009, 3010, + 2822, 4028, 2824, 2830, 2832, 2833, 2834, 2837, 2838, 4028, + 2839, 2845, 2848, 2850, 2846, 2857, 2861, 2865, 2867, 2858, + 2868, 2871, 2874, 2876, 2878, 2880, 2869, 2885, 2882, 2890, + 2892, 2887, 4028, 2893, 2895, 2896, 2902, 2899, 2897, 2904, + 2908, 2911, 2912, 2905, 2913, 2919, 4028, 2914, 2916, 2921, + 2922, 2928, 2923, 2930, 2925, 2933, 2935, 2937, 2941, 4028, + 2943, 2944, 2946, 2947, 2948, 2951, 2952, 2953, 2954, 2958, + 2959, 2970, 2962, 4028, 2965, 4028, 2972, 2974, 2982, 2977, + 2979, 4028, 2980, 2983, 4028, 2984, 4028, 2987, 2988, 2989, + 2991, 2998, 4028, 3005, 2994, 3006, 3000, 3002, 3010, 3013, - 3011, 3015, 3024, 3019, 3997, 3016, 3021, 3033, 3028, 3035, - 3997, 3997, 3029, 3038, 3041, 2948, 3045, 3997, 3997, 3997, - 3048, 3997, 3034, 3997, 3997, 3049, 3051, 3997, 3056, 3997, - 3059, 3057, 3060, 3040, 3061, 3997, 3063, 3030, 3065, 3997, - 3068, 3073, 3069, 3070, 3997, 3072, 3997, 3074, 3079, 3081, - 3088, 3080, 3084, 3092, 3096, 3098, 3093, 3083, 3099, 3102, - 3103, 3104, 3106, 3107, 3109, 3110, 3112, 3113, 3117, 3118, - 3120, 3121, 3123, 3125, 3124, 3126, 3135, 3129, 3137, 3144, - 3997, 3997, 3139, 3147, 3141, 3148, 3149, 3150, 3151, 3152, - 3997, 3155, 3157, 3156, 3160, 3161, 3162, 3164, 3171, 3172, + 4028, 3011, 3017, 3019, 3021, 3022, 3023, 3024, 3027, 3025, + 3028, 3036, 3034, 3032, 4028, 3035, 3039, 3047, 3046, 2840, + 4028, 4028, 3048, 3052, 3055, 3037, 3056, 4028, 4028, 4028, + 3060, 4028, 3049, 4028, 4028, 3061, 3065, 4028, 3069, 4028, + 3076, 3071, 3073, 3074, 3075, 4028, 3078, 3079, 3082, 4028, + 3077, 3090, 3083, 3085, 4028, 3088, 4028, 3092, 3095, 3098, + 3102, 3099, 3105, 3107, 3109, 3112, 3114, 3115, 3116, 3118, + 3119, 3120, 3122, 3121, 3124, 3125, 3128, 3129, 3135, 3136, + 3137, 3138, 3143, 3140, 3142, 3145, 3156, 3147, 3163, 3165, + 4028, 4028, 3153, 3157, 3155, 3159, 3167, 3168, 3169, 3170, - 3178, 3179, 3175, 3181, 3183, 3184, 3185, 3186, 3190, 3192, - 3997, 3188, 3198, 3997, 3997, 3199, 3200, 3208, 3201, 3204, - 3210, 3211, 3997, 3212, 3214, 3221, 3213, 3997, 3224, 3997, - 3229, 3225, 3231, 3233, 3997, 3997, 3997, 3234, 3236, 3237, - 3238, 3240, 3241, 3242, 3243, 3997, 3239, 3248, 3252, 3249, - 3256, 3260, 3262, 3263, 3271, 3267, 3274, 3276, 3997, 3997, - 3266, 3283, 3278, 3280, 3281, 3284, 3286, 3287, 3288, 3997, - 3293, 3297, 3289, 3291, 3301, 3303, 3305, 3308, 3997, 3295, - 3298, 3309, 3316, 3311, 3313, 3319, 3321, 3323, 3325, 3327, - 3324, 3331, 3997, 3335, 3333, 3997, 3337, 3338, 3339, 3997, + 4028, 3181, 3174, 3172, 3178, 3182, 3184, 3186, 3189, 3191, + 3193, 3195, 3206, 3196, 3198, 3199, 3203, 3201, 3207, 3211, + 3215, 4028, 3219, 3212, 4028, 4028, 3209, 3220, 3225, 3222, + 3226, 3233, 3230, 4028, 3235, 3236, 3239, 3241, 4028, 3243, + 4028, 3246, 3247, 3249, 3252, 4028, 4028, 4028, 3255, 3253, + 3257, 3258, 3259, 3260, 3261, 3263, 4028, 3262, 3268, 3269, + 3272, 3279, 3282, 3276, 3284, 3291, 3288, 3295, 3297, 4028, + 4028, 3286, 3298, 3300, 3301, 3302, 3290, 3307, 3303, 3309, + 4028, 3310, 3312, 3314, 3316, 3318, 3319, 3322, 3324, 4028, + 4028, 3320, 3325, 3330, 3335, 3331, 3337, 3326, 3343, 3336, - 3347, 3997, 3997, 3350, 3997, 3997, 3340, 3355, 3358, 3359, - 3364, 3366, 3368, 3343, 3369, 3351, 3371, 3372, 3997, 3997, - 3379, 3374, 3375, 3386, 3997, 3997, 3377, 3384, 3385, 3387, - 3388, 3389, 3392, 3393, 3396, 3394, 3398, 3406, 3409, 3395, - 3414, 3400, 3415, 3416, 3417, 3418, 3997, 3422, 3423, 3424, - 3997, 3428, 3429, 3997, 3430, 3432, 3435, 3436, 3440, 3450, - 3433, 3443, 3997, 3447, 3451, 3997, 3453, 3997, 3997, 3997, - 3454, 3457, 3460, 3997, 3461, 3464, 3997, 3471, 3467, 3462, - 3479, 3472, 3475, 3474, 3483, 3481, 3485, 3997, 3486, 3487, - 3489, 3490, 3491, 3498, 3494, 3496, 3500, 3499, 3497, 3512, + 3340, 3348, 3351, 3352, 4028, 3353, 3354, 4028, 3356, 3358, + 3361, 4028, 3363, 4028, 4028, 3366, 4028, 4028, 3368, 3369, + 3374, 3375, 3380, 3382, 3384, 3371, 3377, 3392, 3394, 3395, + 4028, 4028, 3402, 3385, 3397, 3404, 4028, 4028, 3400, 3406, + 3407, 3409, 3390, 3411, 3414, 3415, 3418, 3416, 3419, 3421, + 3428, 3417, 3431, 3430, 3432, 3437, 3439, 3440, 4028, 3442, + 3444, 3438, 4028, 3449, 3452, 4028, 3443, 3454, 3451, 3462, + 3463, 3470, 3466, 3465, 4028, 3467, 3468, 4028, 3472, 4028, + 4028, 4028, 3477, 3483, 3481, 4028, 3486, 3488, 4028, 3494, + 3487, 3475, 3504, 3485, 3500, 3499, 3507, 3502, 3509, 4028, - 3501, 3997, 3514, 3517, 3997, 3519, 3521, 3997, 3525, 3509, - 3522, 3527, 3997, 3530, 3528, 3532, 3534, 3536, 3537, 3538, - 3539, 3541, 3544, 3548, 3997, 3543, 3551, 3557, 3553, 3561, - 3568, 3552, 3564, 3997, 3566, 3567, 3997, 3573, 3574, 3575, - 3576, 3578, 3583, 3585, 3587, 3997, 3591, 3997, 3997, 3997, - 3593, 3997, 3596, 3588, 3597, 3598, 3600, 3601, 3997, 3997, - 3603, 3605, 3608, 3997, 3609, 3610, 3614, 3612, 3615, 3616, - 3620, 3621, 3622, 3626, 3997, 3997, 3625, 3997, 3628, 3633, - 3637, 3997, 3997, 3997, 3647, 3997, 3640, 3997, 3649, 3635, - 3642, 3997, 3651, 3652, 3997, 3654, 3655, 3657, 3660, 3662, + 3503, 3510, 3512, 3513, 3514, 3515, 3516, 3519, 3520, 3529, + 3521, 3531, 3523, 4028, 3536, 3540, 4028, 3544, 3541, 4028, + 3549, 3533, 3537, 3545, 4028, 3550, 3552, 3554, 3556, 3558, + 3559, 3561, 3562, 3568, 3569, 3570, 4028, 3563, 3565, 3574, + 3579, 3580, 3587, 3583, 3589, 4028, 3591, 3586, 4028, 3593, + 3597, 3594, 3598, 3596, 3607, 3610, 3611, 4028, 3613, 4028, + 4028, 4028, 3614, 4028, 3618, 3619, 3604, 3620, 3622, 3623, + 4028, 4028, 3626, 3631, 3627, 4028, 3625, 3635, 3636, 3637, + 3638, 3639, 3640, 3642, 3643, 3647, 4028, 4028, 3648, 4028, + 3651, 3654, 3658, 4028, 4028, 4028, 3666, 4028, 3663, 4028, - 3663, 3665, 3666, 3670, 3669, 3671, 3673, 3678, 3997, 3997, - 3680, 3997, 3683, 3997, 3675, 3686, 3997, 3687, 3688, 3693, - 3695, 3997, 3997, 3697, 3702, 3698, 3701, 3703, 3705, 3704, - 3997, 3997, 3997, 3707, 3997, 3709, 3711, 3714, 3997, 3715, - 3716, 3717, 3719, 3718, 3721, 3724, 3725, 3733, 3735, 3741, - 3743, 3747, 3748, 3730, 3749, 3756, 3751, 3758, 3997, 3754, - 3997, 3997, 3759, 3766, 3767, 3762, 3768, 3763, 3997, 3770, - 3771, 3772, 3773, 3774, 3775, 3783, 3777, 3791, 3789, 3795, - 3797, 3779, 3805, 3804, 3801, 3787, 3807, 3815, 3810, 3811, - 3997, 3812, 3813, 3814, 3818, 3819, 3816, 3822, 3827, 3834, + 3670, 3661, 3671, 4028, 3673, 3674, 4028, 3675, 3677, 3680, + 3683, 3688, 3690, 3676, 3684, 3691, 3692, 3698, 3694, 3705, + 4028, 4028, 3707, 4028, 3709, 4028, 3702, 3715, 4028, 3710, + 3716, 3718, 3720, 4028, 4028, 3721, 3729, 3725, 3726, 3727, + 3678, 3728, 4028, 4028, 4028, 3732, 4028, 3730, 3736, 3737, + 4028, 3738, 3740, 3741, 3743, 3742, 3745, 3747, 3748, 3755, + 3750, 3764, 3766, 3752, 3767, 3769, 3771, 3779, 3774, 3776, + 4028, 3777, 4028, 4028, 3778, 3787, 3789, 3782, 3780, 3784, + 4028, 3785, 3790, 3791, 3795, 3798, 3800, 3801, 3802, 3810, + 3807, 3813, 3814, 3815, 3822, 3824, 3820, 3825, 3826, 3835, - 3825, 3836, 3823, 3838, 3839, 3840, 3844, 3845, 3848, 3997, - 3849, 3851, 3852, 3853, 3857, 3855, 3859, 3860, 3865, 3862, - 3876, 3880, 3866, 3997, 3877, 3997, 3997, 3881, 3868, 3870, - 3884, 3891, 3997, 3997, 3997, 3905, 3912, 3919, 3926, 3933, - 388, 3940, 3947, 3954, 3961, 3968, 3975, 3982, 3989 + 3828, 3830, 4028, 3831, 3832, 3833, 3837, 3838, 3841, 3840, + 3848, 3853, 3855, 3856, 3842, 3858, 3862, 3864, 3865, 3867, + 3866, 4028, 3868, 3870, 3874, 3876, 3877, 3879, 3880, 3881, + 3887, 3883, 3889, 3892, 3894, 4028, 3897, 4028, 4028, 3900, + 3896, 3903, 3907, 3909, 4028, 4028, 4028, 3936, 3943, 3950, + 3957, 3964, 388, 3971, 3978, 3985, 3992, 3999, 4006, 4013, + 4020 } ; -static yyconst flex_int16_t yy_def[2050] = +static yyconst flex_int16_t yy_def[2062] = { 0, - 2035, 1, 2036, 2036, 2037, 2037, 2038, 2038, 2039, 2039, - 2040, 2040, 2035, 2041, 2035, 2035, 2035, 2035, 2042, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2043, 2035, 2035, 2035, 2043, 2044, 2035, 2035, 2035, 2044, - 2045, 2035, 2035, 2035, 2035, 2045, 2046, 2035, 2035, 2035, - 2046, 2047, 2035, 2048, 2035, 2047, 2047, 2041, 2041, 2035, - 2049, 2042, 2049, 2042, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2047, 1, 2048, 2048, 2049, 2049, 2050, 2050, 2051, 2051, + 2052, 2052, 2047, 2053, 2047, 2047, 2047, 2047, 2054, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2055, 2047, 2047, 2047, 2055, 2056, 2047, 2047, 2047, 2056, + 2057, 2047, 2047, 2047, 2047, 2057, 2058, 2047, 2047, 2047, + 2058, 2059, 2047, 2060, 2047, 2059, 2059, 2053, 2053, 2047, + 2061, 2054, 2061, 2054, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2043, - 2043, 2044, 2044, 2045, 2045, 2035, 2046, 2046, 2047, 2047, - 2048, 2048, 2047, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2055, + 2055, 2056, 2056, 2057, 2057, 2047, 2058, 2058, 2059, 2059, + 2060, 2060, 2059, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2047, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2047, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2059, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2059, 2053, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, - 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2035, 2047, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2059, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2047, 2041, 2041, 2041, 2041, 2041, - 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2035, 2041, 2035, 2035, 2041, 2035, 2035, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2059, 2053, 2053, 2053, 2053, + 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2047, 2053, 2047, 2047, 2053, 2047, 2047, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2047, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2059, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2035, 2041, 2047, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2053, 2059, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, - 2041, 2035, 2041, 2041, 2041, 2035, 2041, 2035, 2041, 2041, - 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2053, 2047, 2053, 2053, 2053, + 2047, 2053, 2047, 2053, 2053, 2047, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2035, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2035, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2035, 2041, + 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, + 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2047, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, - 2041, 2041, 2041, 2035, 2035, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, + 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2047, + 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2047, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2035, 2041, 2041, - 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2035, 2041, 2041, 2041, 2041, 2035, 2041, 2035, 2041, - 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2047, 2053, 2047, 2053, 2053, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, + 2053, 2053, 2053, 2047, 2053, 2047, 2053, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, - 2035, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2035, - 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041, - 2041, 2035, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, + 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2047, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2047, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2047, + 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2035, 2041, 2035, 2041, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2035, 2041, 2041, - 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2047, 2053, 2047, 2053, 2053, 2053, 2053, + 2053, 2047, 2053, 2053, 2047, 2053, 2047, 2053, 2053, 2053, + 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, - 2035, 2035, 2041, 2041, 2041, 2041, 2041, 2035, 2035, 2035, - 2041, 2035, 2041, 2035, 2035, 2041, 2041, 2035, 2041, 2035, - 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2035, - 2041, 2041, 2041, 2041, 2035, 2041, 2035, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2035, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, + 2047, 2047, 2053, 2053, 2053, 2053, 2053, 2047, 2047, 2047, + 2053, 2047, 2053, 2047, 2047, 2053, 2053, 2047, 2053, 2047, + 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2047, + 2053, 2053, 2053, 2053, 2047, 2053, 2047, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2047, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2035, 2041, 2041, 2035, 2035, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2035, 2041, 2035, - 2041, 2041, 2041, 2041, 2035, 2035, 2035, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041, 2035, + 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2047, 2053, 2053, 2047, 2047, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2047, 2053, + 2047, 2053, 2053, 2053, 2053, 2047, 2047, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, + 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, + 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2035, 2035, 2041, 2035, 2035, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035, - 2041, 2041, 2041, 2041, 2035, 2035, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, - 2035, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2035, 2035, 2035, - 2041, 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2047, 2053, 2053, + 2053, 2047, 2053, 2047, 2047, 2053, 2047, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2047, 2047, 2053, 2053, 2053, 2053, 2047, 2047, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, + 2053, 2053, 2047, 2053, 2053, 2047, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2047, 2053, 2047, + 2047, 2047, 2053, 2053, 2053, 2047, 2053, 2053, 2047, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, - 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2041, - 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2035, 2041, 2035, 2035, 2035, - 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035, - 2041, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2035, 2035, 2041, 2035, 2041, 2041, - 2041, 2035, 2035, 2035, 2041, 2035, 2041, 2035, 2041, 2041, - 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2047, 2053, 2053, 2047, 2053, 2053, 2047, + 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2053, 2047, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2047, + 2047, 2047, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, + 2047, 2047, 2053, 2053, 2053, 2047, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2047, 2047, 2053, 2047, + 2053, 2053, 2053, 2047, 2047, 2047, 2053, 2047, 2053, 2047, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2035, - 2041, 2035, 2041, 2035, 2041, 2041, 2035, 2041, 2041, 2041, - 2041, 2035, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2035, 2035, 2035, 2041, 2035, 2041, 2041, 2041, 2035, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, - 2035, 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2035, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2035, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, + 2053, 2053, 2053, 2047, 2053, 2053, 2047, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2047, 2047, 2053, 2047, 2053, 2047, 2053, 2053, 2047, 2053, + 2053, 2053, 2053, 2047, 2047, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2047, 2047, 2047, 2053, 2047, 2053, 2053, 2053, + 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2047, 2053, 2047, 2047, 2053, 2053, 2053, 2053, 2053, 2053, + 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2035, - 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, 2041, - 2041, 2041, 2041, 2035, 2041, 2035, 2035, 2041, 2041, 2041, - 2041, 2041, 2035, 2035, 0, 2035, 2035, 2035, 2035, 2035, - 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035 + 2053, 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2047, 2053, 2053, 2053, 2053, 2053, 2053, 2053, 2053, + 2053, 2053, 2053, 2053, 2053, 2047, 2053, 2047, 2047, 2053, + 2053, 2053, 2053, 2053, 2047, 2047, 0, 2047, 2047, 2047, + 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, + 2047 } ; -static yyconst flex_uint16_t yy_nxt[4038] = +static yyconst flex_uint16_t yy_nxt[4069] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 14, 18, 20, 21, 14, 22, 23, 24, 25, @@ -1152,7 +1157,7 @@ static yyconst flex_uint16_t yy_nxt[4038] = 69, 69, 69, 69, 190, 193, 69, 197, 192, 69, 196, 194, 198, 200, 69, 201, 203, 69, 204, 206, 69, 205, 69, 69, 210, 208, 130, 130, 211, 132, - 137, 137, 132, 705, 209, 202, 134, 214, 134, 134, + 137, 137, 132, 708, 209, 202, 134, 214, 134, 134, 207, 134, 139, 69, 139, 139, 73, 139, 73, 73, 140, 73, 69, 212, 69, 69, 69, 213, 142, 69, 69, 221, 226, 216, 69, 69, 69, 69, 222, 215, @@ -1197,371 +1202,374 @@ static yyconst flex_uint16_t yy_nxt[4038] = 402, 69, 410, 69, 407, 69, 69, 69, 69, 138, 408, 412, 69, 409, 413, 414, 69, 69, 69, 411, 419, 69, 69, 416, 69, 415, 420, 69, 417, 69, - 418, 421, 69, 69, 428, 69, 69, 431, 424, 423, - 429, 425, 427, 69, 430, 69, 422, 69, 69, 69, - 69, 69, 434, 433, 426, 435, 69, 437, 69, 69, - 440, 441, 69, 438, 439, 69, 432, 69, 69, 436, - 444, 69, 442, 69, 69, 69, 448, 69, 447, 69, + 418, 421, 69, 69, 429, 69, 69, 432, 424, 423, + 430, 425, 428, 69, 431, 69, 422, 69, 69, 69, + 438, 69, 426, 434, 427, 435, 69, 69, 69, 69, + 441, 436, 439, 442, 69, 69, 433, 69, 437, 69, + 69, 440, 445, 69, 443, 69, 69, 447, 69, 448, - 445, 69, 449, 443, 69, 446, 69, 451, 69, 452, - 69, 69, 454, 69, 69, 69, 69, 462, 69, 455, - 450, 69, 453, 69, 69, 457, 464, 463, 69, 69, - 461, 456, 458, 467, 459, 460, 466, 468, 465, 69, - 69, 69, 69, 69, 69, 69, 471, 69, 474, 69, - 69, 472, 476, 69, 470, 69, 69, 69, 492, 69, - 475, 469, 490, 473, 69, 477, 69, 69, 494, 478, - 69, 479, 487, 485, 486, 69, 480, 488, 481, 69, - 69, 69, 69, 69, 491, 136, 482, 69, 489, 483, - 495, 493, 496, 69, 497, 69, 484, 69, 500, 69, + 69, 449, 446, 450, 69, 444, 69, 452, 69, 453, + 69, 69, 69, 69, 69, 69, 69, 451, 455, 69, + 456, 463, 69, 69, 69, 454, 458, 69, 464, 465, + 462, 459, 457, 460, 69, 461, 466, 468, 469, 69, + 69, 69, 467, 69, 69, 472, 69, 69, 494, 69, + 69, 475, 69, 471, 69, 477, 69, 140, 69, 69, + 489, 506, 470, 473, 476, 69, 69, 474, 478, 69, + 69, 490, 491, 479, 69, 480, 486, 487, 69, 492, + 481, 488, 482, 69, 493, 69, 495, 69, 69, 69, + 483, 69, 500, 484, 69, 69, 501, 499, 69, 69, - 498, 69, 503, 140, 499, 504, 501, 505, 69, 506, - 69, 69, 69, 507, 502, 69, 511, 69, 69, 510, - 69, 513, 69, 509, 512, 515, 508, 69, 69, 69, - 514, 69, 518, 517, 521, 516, 69, 524, 69, 522, - 69, 525, 69, 527, 69, 526, 69, 519, 529, 523, - 520, 69, 528, 69, 69, 69, 69, 69, 69, 69, - 531, 69, 534, 535, 69, 533, 537, 530, 536, 69, - 539, 69, 69, 69, 69, 532, 69, 540, 69, 538, - 69, 542, 69, 546, 69, 541, 543, 69, 69, 548, - 544, 545, 547, 549, 550, 551, 552, 69, 69, 69, + 485, 497, 496, 498, 502, 69, 507, 69, 69, 69, + 508, 505, 69, 503, 504, 512, 69, 511, 69, 69, + 514, 510, 69, 69, 69, 509, 69, 516, 518, 69, + 513, 515, 519, 69, 522, 69, 69, 517, 136, 523, + 69, 525, 69, 526, 69, 527, 528, 69, 524, 520, + 530, 69, 521, 529, 69, 69, 69, 531, 69, 69, + 532, 69, 536, 69, 69, 535, 69, 534, 69, 539, + 537, 69, 541, 69, 69, 69, 69, 533, 69, 542, + 69, 538, 135, 544, 69, 548, 69, 543, 545, 69, + 69, 540, 546, 547, 549, 550, 69, 553, 554, 69, - 553, 69, 554, 69, 556, 69, 69, 69, 557, 69, - 69, 563, 560, 69, 69, 69, 565, 69, 566, 559, - 564, 558, 562, 69, 555, 561, 69, 69, 567, 570, - 69, 69, 572, 573, 69, 69, 571, 575, 69, 574, - 69, 569, 576, 69, 568, 69, 579, 69, 69, 69, - 69, 69, 69, 577, 582, 584, 585, 581, 578, 69, - 587, 586, 69, 69, 69, 589, 580, 69, 69, 583, - 591, 69, 69, 69, 588, 69, 69, 69, 69, 596, - 69, 69, 602, 590, 69, 592, 597, 69, 69, 593, - 69, 594, 69, 595, 599, 598, 601, 600, 69, 605, + 552, 551, 555, 69, 69, 69, 69, 69, 556, 69, + 558, 559, 69, 69, 69, 565, 69, 562, 69, 567, + 69, 69, 561, 560, 566, 69, 564, 69, 568, 563, + 557, 69, 569, 572, 69, 69, 574, 575, 570, 69, + 573, 69, 69, 577, 69, 571, 576, 69, 578, 69, + 581, 69, 69, 69, 69, 69, 69, 579, 584, 586, + 580, 583, 587, 69, 589, 69, 69, 588, 69, 69, + 582, 591, 69, 585, 593, 69, 69, 69, 590, 69, + 69, 69, 69, 598, 592, 596, 69, 69, 69, 599, + 69, 69, 604, 594, 595, 608, 600, 597, 69, 69, - 69, 607, 69, 603, 606, 69, 604, 608, 609, 69, - 69, 69, 69, 69, 69, 69, 613, 612, 615, 614, - 616, 69, 611, 69, 610, 69, 69, 69, 618, 69, - 623, 140, 617, 624, 619, 621, 622, 620, 69, 69, - 626, 69, 69, 629, 69, 69, 634, 69, 627, 69, - 628, 631, 69, 69, 69, 69, 632, 69, 69, 625, - 69, 635, 630, 633, 69, 69, 69, 645, 69, 638, - 647, 646, 636, 639, 644, 643, 640, 69, 648, 650, - 637, 69, 649, 641, 69, 69, 642, 69, 651, 652, - 69, 653, 69, 660, 654, 658, 69, 69, 670, 655, + 601, 69, 603, 69, 607, 602, 610, 605, 69, 606, + 609, 69, 69, 69, 69, 69, 69, 69, 69, 615, + 614, 617, 616, 618, 611, 613, 69, 69, 69, 69, + 612, 69, 140, 620, 625, 619, 621, 624, 623, 69, + 69, 69, 622, 626, 69, 628, 631, 69, 69, 69, + 630, 69, 69, 629, 69, 633, 636, 637, 69, 69, + 634, 627, 69, 69, 69, 69, 69, 632, 69, 69, + 69, 640, 635, 649, 647, 641, 638, 69, 642, 645, + 646, 69, 650, 648, 639, 643, 69, 651, 644, 652, + 133, 661, 69, 663, 69, 69, 69, 653, 654, 660, - 661, 69, 659, 662, 69, 656, 657, 665, 663, 69, - 664, 69, 666, 69, 69, 69, 69, 668, 667, 69, - 669, 69, 69, 69, 69, 676, 69, 69, 671, 69, - 675, 69, 69, 682, 69, 135, 69, 681, 672, 685, - 678, 673, 674, 680, 677, 679, 683, 684, 69, 69, - 69, 69, 69, 69, 686, 69, 69, 687, 688, 69, - 690, 693, 69, 691, 69, 696, 69, 69, 69, 689, - 69, 69, 69, 694, 695, 700, 69, 698, 692, 699, - 69, 701, 69, 703, 69, 69, 697, 69, 706, 708, - 709, 69, 69, 69, 702, 69, 707, 69, 711, 704, + 655, 69, 69, 656, 664, 665, 69, 69, 657, 666, + 662, 69, 667, 69, 658, 659, 69, 669, 670, 69, + 69, 69, 668, 671, 672, 69, 69, 673, 69, 69, + 69, 69, 679, 674, 69, 69, 69, 678, 69, 69, + 685, 69, 131, 69, 684, 675, 683, 686, 676, 677, + 680, 687, 681, 69, 682, 69, 69, 69, 688, 69, + 69, 692, 689, 69, 69, 69, 69, 690, 691, 693, + 694, 696, 69, 69, 699, 697, 69, 69, 69, 69, + 69, 698, 703, 69, 695, 69, 701, 702, 704, 69, + 706, 69, 69, 69, 711, 700, 709, 712, 69, 705, - 69, 69, 69, 69, 133, 69, 69, 717, 69, 69, - 69, 716, 69, 710, 724, 69, 712, 713, 720, 69, - 721, 715, 714, 718, 722, 719, 69, 69, 727, 728, - 69, 730, 723, 69, 69, 69, 69, 729, 69, 725, - 736, 726, 731, 733, 69, 735, 69, 69, 69, 69, - 732, 737, 740, 69, 742, 69, 69, 734, 69, 744, - 140, 69, 739, 69, 69, 738, 69, 746, 69, 69, - 69, 757, 69, 741, 743, 69, 745, 69, 69, 758, - 69, 761, 749, 747, 69, 69, 131, 759, 69, 750, - 748, 69, 69, 763, 751, 762, 752, 69, 764, 765, + 69, 69, 69, 69, 710, 69, 707, 714, 69, 69, + 69, 69, 69, 69, 720, 69, 69, 69, 719, 69, + 69, 713, 715, 716, 723, 724, 726, 717, 718, 721, + 725, 722, 727, 69, 69, 730, 731, 728, 733, 69, + 69, 69, 69, 732, 69, 69, 69, 738, 729, 736, + 739, 69, 734, 69, 740, 69, 69, 743, 69, 69, + 735, 745, 69, 69, 747, 140, 737, 69, 742, 69, + 69, 741, 69, 749, 69, 69, 69, 746, 744, 69, + 760, 69, 748, 69, 69, 761, 69, 764, 752, 750, + 69, 762, 69, 69, 69, 753, 751, 69, 766, 69, - 753, 766, 754, 760, 69, 69, 69, 755, 69, 69, - 768, 770, 756, 772, 69, 69, 776, 69, 775, 767, - 769, 774, 771, 773, 69, 777, 69, 778, 69, 69, - 69, 69, 779, 69, 780, 69, 784, 69, 787, 69, - 783, 789, 69, 785, 788, 781, 69, 786, 792, 69, - 69, 794, 782, 69, 793, 69, 790, 69, 795, 69, - 69, 798, 69, 69, 799, 791, 69, 69, 69, 69, - 69, 69, 796, 797, 69, 801, 806, 802, 804, 803, - 69, 800, 69, 69, 69, 812, 69, 69, 69, 805, - 69, 69, 810, 811, 807, 816, 808, 69, 69, 69, + 754, 765, 755, 69, 767, 69, 756, 69, 757, 763, + 771, 769, 69, 758, 770, 775, 69, 768, 759, 69, + 772, 773, 69, 778, 779, 69, 774, 780, 777, 69, + 69, 781, 69, 776, 69, 69, 782, 69, 783, 69, + 787, 69, 69, 790, 791, 69, 786, 69, 69, 784, + 69, 788, 69, 789, 69, 792, 785, 796, 69, 793, + 69, 69, 798, 69, 797, 69, 799, 794, 69, 795, + 802, 800, 69, 804, 801, 69, 69, 803, 69, 69, + 69, 807, 69, 69, 805, 69, 69, 806, 808, 69, + 810, 69, 69, 69, 69, 816, 69, 812, 814, 809, - 809, 69, 815, 817, 818, 813, 814, 69, 820, 821, - 819, 69, 824, 823, 69, 69, 69, 825, 69, 69, - 826, 832, 69, 827, 822, 828, 69, 69, 829, 69, - 69, 69, 69, 834, 69, 69, 830, 69, 69, 837, - 838, 831, 69, 840, 69, 69, 843, 69, 836, 833, - 839, 842, 835, 844, 69, 69, 69, 69, 841, 846, - 69, 69, 851, 69, 69, 69, 69, 69, 69, 852, - 853, 69, 845, 847, 850, 69, 848, 856, 855, 857, - 849, 854, 858, 859, 69, 69, 860, 69, 69, 69, - 861, 862, 69, 69, 866, 69, 69, 69, 69, 69, + 815, 69, 811, 888, 69, 69, 813, 69, 819, 820, + 821, 817, 818, 69, 69, 824, 823, 825, 822, 69, + 69, 828, 69, 69, 69, 830, 829, 69, 831, 69, + 69, 69, 826, 832, 836, 69, 827, 69, 69, 69, + 69, 838, 834, 833, 69, 69, 835, 69, 69, 69, + 841, 843, 842, 69, 844, 837, 847, 69, 839, 846, + 840, 69, 69, 69, 69, 845, 850, 69, 69, 855, + 848, 69, 69, 69, 69, 69, 69, 856, 857, 859, + 849, 69, 851, 69, 854, 862, 852, 69, 853, 863, + 69, 69, 858, 861, 860, 69, 69, 866, 69, 69, - 69, 864, 69, 863, 875, 865, 868, 69, 69, 69, - 69, 876, 69, 867, 877, 869, 872, 69, 69, 871, - 69, 69, 873, 878, 870, 69, 879, 69, 874, 69, - 881, 69, 69, 69, 880, 69, 882, 69, 884, 887, - 69, 69, 69, 890, 885, 69, 883, 888, 69, 892, - 893, 886, 69, 889, 69, 69, 895, 896, 69, 894, - 69, 891, 69, 69, 69, 899, 69, 898, 901, 903, - 69, 69, 69, 897, 69, 904, 69, 69, 910, 69, - 69, 900, 69, 902, 69, 905, 909, 906, 69, 69, - 69, 69, 908, 907, 914, 918, 69, 69, 69, 911, + 69, 865, 864, 870, 69, 69, 69, 69, 69, 867, + 69, 69, 869, 868, 872, 69, 69, 879, 880, 140, + 69, 69, 871, 69, 69, 873, 877, 69, 69, 875, + 876, 69, 881, 874, 883, 878, 882, 69, 69, 69, + 887, 69, 884, 885, 891, 69, 69, 69, 69, 69, + 69, 896, 886, 69, 889, 894, 69, 69, 897, 69, + 890, 892, 900, 898, 893, 69, 69, 69, 895, 69, + 69, 899, 903, 69, 69, 902, 907, 69, 905, 69, + 69, 69, 69, 901, 908, 69, 69, 69, 904, 906, + 909, 69, 913, 911, 910, 69, 69, 912, 914, 69, - 917, 69, 913, 912, 915, 69, 920, 69, 924, 69, - 916, 919, 922, 925, 69, 69, 921, 923, 69, 69, - 929, 69, 69, 69, 932, 69, 933, 934, 926, 927, - 69, 928, 931, 69, 930, 69, 69, 69, 938, 69, - 936, 937, 935, 69, 69, 69, 943, 944, 939, 940, - 69, 69, 69, 69, 69, 945, 69, 941, 946, 69, - 947, 69, 952, 942, 953, 948, 69, 949, 69, 950, - 954, 951, 955, 69, 957, 69, 959, 69, 69, 69, - 69, 960, 69, 69, 958, 69, 69, 962, 956, 69, - 69, 961, 966, 964, 965, 969, 970, 69, 963, 69, + 69, 69, 918, 923, 69, 69, 915, 69, 69, 69, + 69, 69, 916, 917, 919, 927, 922, 69, 924, 925, + 920, 921, 929, 69, 69, 926, 69, 930, 69, 928, + 69, 934, 69, 973, 69, 937, 69, 938, 932, 933, + 69, 69, 931, 936, 69, 935, 69, 69, 69, 939, + 69, 943, 941, 942, 69, 940, 69, 69, 947, 948, + 949, 945, 69, 944, 69, 69, 69, 950, 951, 69, + 69, 946, 69, 957, 958, 69, 69, 69, 952, 960, + 69, 959, 69, 953, 69, 954, 69, 955, 964, 956, + 69, 963, 961, 965, 69, 69, 69, 69, 962, 967, - 69, 972, 69, 69, 967, 69, 973, 976, 69, 69, - 974, 978, 69, 69, 968, 971, 69, 69, 975, 981, - 69, 979, 69, 69, 69, 69, 69, 983, 140, 977, - 985, 984, 69, 986, 980, 69, 69, 982, 991, 990, - 992, 988, 987, 989, 69, 69, 69, 994, 69, 69, - 993, 69, 69, 69, 998, 69, 69, 995, 69, 1002, - 69, 69, 997, 69, 69, 69, 69, 1008, 996, 69, - 69, 69, 999, 1006, 1003, 69, 1000, 1013, 69, 69, - 1004, 1001, 1007, 1005, 1012, 69, 69, 138, 69, 1009, - 1015, 1017, 69, 1011, 1014, 1010, 1018, 69, 69, 69, + 966, 69, 69, 968, 969, 69, 971, 974, 69, 970, + 975, 69, 977, 69, 69, 69, 69, 978, 69, 972, + 976, 979, 981, 69, 983, 69, 69, 980, 986, 69, + 69, 984, 69, 69, 69, 982, 69, 988, 69, 985, + 69, 989, 993, 990, 69, 991, 69, 994, 996, 997, + 987, 69, 992, 69, 69, 69, 998, 999, 69, 995, + 69, 69, 1000, 69, 1003, 69, 69, 69, 1007, 69, + 69, 1002, 69, 69, 69, 69, 1013, 1001, 69, 69, + 69, 1004, 1011, 1008, 69, 1017, 1005, 1018, 69, 1009, + 1006, 1012, 1010, 69, 69, 69, 138, 69, 1014, 1020, - 69, 1019, 1021, 1023, 69, 1016, 1020, 69, 1024, 69, - 69, 69, 69, 1022, 1027, 69, 1029, 69, 1025, 69, - 69, 69, 69, 1032, 69, 69, 69, 69, 69, 1026, - 1028, 69, 69, 1030, 1035, 1041, 1040, 1031, 1033, 1036, - 1034, 1037, 1038, 1039, 69, 69, 69, 69, 69, 1042, - 1043, 69, 1049, 1046, 1044, 69, 1048, 1050, 69, 69, - 1051, 1045, 69, 69, 69, 1052, 1053, 69, 69, 1047, - 69, 1055, 1054, 1056, 69, 1057, 69, 1060, 69, 1062, - 69, 69, 1061, 69, 1063, 69, 69, 69, 1058, 69, - 69, 1071, 69, 69, 69, 1059, 1070, 69, 1064, 1065, + 1022, 69, 1016, 69, 1015, 1023, 69, 69, 69, 1026, + 1024, 1025, 1028, 69, 1021, 69, 1019, 1029, 69, 69, + 69, 69, 1027, 1032, 69, 1034, 1030, 69, 69, 69, + 69, 69, 1037, 69, 69, 69, 69, 69, 1031, 1033, + 69, 1040, 1035, 69, 69, 1045, 1091, 1036, 1038, 1041, + 1039, 1042, 1043, 1044, 69, 69, 69, 69, 1050, 69, + 1047, 1046, 1048, 69, 1053, 1049, 69, 1055, 69, 1052, + 1056, 1054, 1060, 69, 1051, 69, 69, 69, 1057, 69, + 1058, 1059, 69, 69, 1061, 69, 69, 69, 1066, 69, + 1063, 1068, 69, 1067, 69, 69, 1069, 69, 69, 69, - 1066, 69, 69, 69, 69, 1067, 69, 1079, 1069, 1082, - 69, 1072, 1073, 1068, 69, 1077, 69, 1076, 69, 1078, - 1074, 1075, 69, 1083, 69, 1080, 1081, 69, 1084, 1085, - 69, 69, 69, 1088, 69, 69, 1086, 1089, 1093, 69, - 69, 69, 69, 1087, 69, 1094, 1095, 1098, 1099, 69, - 1090, 1092, 1091, 69, 1097, 69, 69, 1102, 1103, 1096, - 1101, 69, 1100, 69, 69, 1104, 69, 1105, 69, 69, - 69, 1108, 1107, 69, 69, 69, 69, 1106, 1109, 69, - 1112, 1114, 69, 1115, 69, 69, 1117, 69, 1111, 69, - 69, 1113, 69, 69, 1120, 69, 69, 69, 1110, 69, + 1064, 1062, 69, 69, 69, 69, 1065, 1077, 69, 1070, + 1076, 1071, 69, 69, 1072, 69, 69, 1073, 69, 69, + 1085, 1075, 1078, 69, 1079, 1074, 1086, 1080, 69, 1082, + 69, 1081, 69, 1084, 1088, 69, 69, 1083, 69, 1092, + 1087, 1089, 1090, 69, 69, 1093, 1094, 69, 1099, 69, + 1095, 69, 69, 69, 69, 1104, 1100, 1101, 69, 1098, + 69, 69, 69, 1096, 1105, 69, 69, 1097, 69, 1108, + 1102, 1107, 1109, 69, 1103, 1115, 1106, 69, 69, 1110, + 69, 1111, 69, 69, 69, 1114, 1113, 1116, 69, 1112, + 69, 1117, 69, 1118, 1120, 69, 1121, 69, 69, 1123, - 1119, 1122, 1123, 69, 1116, 69, 1126, 1125, 69, 1118, - 69, 1121, 69, 1124, 69, 1127, 1132, 1128, 69, 1129, - 1134, 1130, 69, 1133, 1136, 69, 69, 69, 1131, 69, - 69, 1138, 69, 69, 69, 1140, 69, 1142, 69, 1137, - 69, 69, 1135, 1148, 1145, 1149, 1139, 1146, 69, 69, - 1143, 69, 69, 1151, 1144, 69, 1154, 1141, 1153, 1147, - 1150, 69, 69, 69, 1155, 69, 69, 1159, 69, 69, - 1161, 1164, 69, 69, 1160, 69, 69, 1152, 69, 1156, - 1163, 69, 69, 1165, 1157, 69, 1158, 69, 69, 1172, - 69, 1162, 69, 69, 69, 69, 69, 1177, 69, 1166, + 69, 69, 69, 69, 69, 1119, 1126, 69, 1128, 1129, + 69, 69, 1125, 69, 69, 1132, 1133, 1122, 69, 69, + 69, 69, 1124, 1127, 69, 1130, 1138, 1131, 69, 1136, + 1140, 69, 69, 1139, 1142, 69, 69, 69, 1134, 1135, + 69, 1137, 1144, 69, 69, 69, 1143, 69, 1148, 69, + 1146, 1141, 69, 1154, 1145, 1151, 69, 1149, 1152, 69, + 69, 1147, 69, 69, 69, 1155, 1160, 1159, 1157, 1150, + 1153, 1156, 69, 69, 1161, 69, 69, 69, 1165, 69, + 69, 1158, 1167, 69, 69, 1166, 69, 69, 69, 1170, + 69, 1169, 1171, 1162, 69, 1163, 69, 1164, 69, 69, - 1170, 1169, 1167, 1171, 69, 1168, 69, 69, 1175, 69, - 69, 1179, 1173, 1174, 69, 69, 1181, 1176, 69, 1188, - 69, 69, 1180, 1182, 1178, 1185, 1183, 1189, 69, 69, - 1186, 1184, 1190, 69, 69, 69, 69, 1192, 1191, 69, - 69, 1198, 69, 1187, 1193, 1195, 69, 69, 1196, 1197, - 1199, 69, 69, 1194, 69, 1201, 69, 69, 69, 1200, - 69, 1208, 69, 69, 1202, 69, 1203, 1219, 1205, 69, - 1204, 69, 1210, 69, 1211, 69, 1207, 69, 1209, 69, - 1212, 69, 1206, 1216, 1214, 1217, 1221, 1215, 69, 1220, - 1218, 69, 1222, 69, 1213, 1225, 69, 1224, 69, 1223, + 1179, 1172, 1168, 69, 69, 69, 69, 69, 69, 69, + 1184, 69, 1175, 1176, 1173, 1177, 1174, 1178, 69, 69, + 69, 69, 1182, 69, 1186, 1180, 69, 1181, 1188, 69, + 1183, 69, 1195, 69, 69, 1187, 1196, 69, 1185, 1191, + 1189, 1192, 69, 1190, 69, 1197, 1193, 69, 69, 1198, + 1199, 69, 69, 1205, 1194, 69, 1200, 1206, 69, 69, + 1202, 1204, 69, 1203, 69, 69, 69, 1201, 69, 69, + 69, 69, 1215, 69, 69, 1207, 69, 1208, 1226, 1210, + 1209, 1212, 1211, 1217, 69, 69, 69, 1219, 1214, 1216, + 1218, 69, 1224, 1213, 1223, 69, 1229, 1225, 69, 69, - 69, 69, 69, 69, 69, 1227, 69, 1229, 1230, 1226, - 69, 1228, 1234, 69, 1237, 69, 1231, 69, 69, 69, - 69, 69, 1232, 1239, 69, 1233, 1235, 69, 69, 1240, - 1243, 1236, 1241, 1242, 69, 1246, 69, 1238, 69, 69, - 69, 69, 69, 1244, 1252, 69, 1248, 69, 69, 1245, - 69, 1257, 1247, 1249, 1250, 69, 69, 1253, 1401, 1251, - 69, 1255, 1256, 69, 69, 1254, 1258, 69, 69, 1259, - 1261, 69, 1262, 69, 69, 69, 69, 1260, 1263, 69, - 69, 69, 69, 1264, 1267, 1272, 69, 1265, 1273, 1268, - 69, 1266, 69, 69, 69, 69, 69, 1271, 1277, 69, + 1221, 1220, 69, 1222, 1228, 69, 69, 69, 1232, 69, + 69, 1230, 1234, 1227, 69, 69, 69, 69, 1235, 69, + 1233, 1241, 69, 1237, 69, 69, 1231, 69, 69, 1236, + 1238, 1244, 69, 69, 1239, 69, 69, 1246, 1240, 69, + 1242, 1247, 1245, 1243, 1248, 69, 69, 69, 1253, 69, + 1249, 1251, 69, 69, 1258, 1250, 69, 69, 1259, 69, + 1255, 69, 1252, 69, 69, 69, 1254, 69, 1256, 1257, + 1266, 1260, 1267, 1262, 1263, 69, 69, 69, 69, 1261, + 1264, 1265, 69, 1268, 69, 69, 69, 1271, 1269, 69, + 1270, 69, 69, 69, 69, 69, 1274, 1280, 1272, 1279, - 69, 1270, 1269, 1279, 69, 1281, 69, 69, 69, 136, - 69, 1274, 1275, 1280, 1282, 1276, 1278, 1283, 69, 1285, - 1296, 1284, 1287, 69, 69, 69, 1286, 69, 69, 1289, - 69, 1291, 1288, 69, 1290, 69, 1298, 69, 69, 1292, - 1293, 1294, 69, 1300, 1297, 69, 1295, 69, 1301, 69, - 1304, 69, 1302, 69, 1306, 1299, 69, 69, 69, 1309, - 1310, 69, 69, 1312, 69, 69, 1303, 69, 69, 69, - 69, 1311, 69, 1305, 1314, 135, 1307, 1315, 69, 1308, - 1313, 69, 1317, 1320, 1321, 69, 69, 69, 1319, 69, - 69, 1324, 1325, 1323, 1327, 1316, 1318, 69, 69, 1326, + 69, 1275, 69, 69, 1273, 69, 1284, 69, 69, 1278, + 1286, 69, 69, 1277, 1276, 69, 1281, 1288, 69, 1289, + 1290, 1282, 69, 1292, 69, 1283, 69, 1291, 1285, 69, + 1294, 69, 69, 1287, 69, 1296, 69, 1297, 69, 1299, + 1293, 69, 1298, 69, 69, 69, 1300, 1301, 1302, 1306, + 69, 69, 1308, 1303, 69, 69, 1295, 1309, 69, 1312, + 69, 69, 69, 1304, 1305, 1310, 69, 1314, 69, 69, + 1307, 69, 1317, 1318, 69, 1311, 1320, 69, 1319, 69, + 69, 69, 1315, 69, 69, 1325, 69, 1313, 1322, 1323, + 1316, 69, 69, 1329, 1321, 69, 69, 1328, 1332, 69, - 69, 69, 69, 69, 69, 1322, 69, 1329, 69, 1332, - 1328, 69, 1335, 69, 69, 1331, 69, 69, 69, 69, - 1337, 1330, 1333, 1341, 1342, 69, 69, 69, 1336, 1344, - 69, 69, 1340, 1339, 1334, 1343, 1338, 69, 1345, 1347, - 69, 1351, 69, 1346, 69, 1349, 1348, 69, 1352, 69, - 1353, 69, 1355, 1358, 69, 1354, 69, 1350, 69, 69, - 69, 69, 69, 1357, 1360, 1363, 1359, 69, 1356, 1362, - 1365, 69, 69, 1361, 69, 1367, 69, 69, 1368, 1366, - 1369, 69, 1370, 69, 1364, 69, 69, 69, 69, 69, - 69, 1372, 1373, 69, 1371, 1374, 69, 1375, 1376, 1377, + 1333, 1334, 69, 1331, 69, 69, 69, 1327, 69, 1324, + 1335, 69, 1326, 69, 69, 1330, 69, 1336, 69, 1340, + 69, 69, 1343, 69, 69, 69, 1339, 69, 1345, 69, + 69, 1337, 1338, 1350, 1349, 69, 1341, 69, 1344, 69, + 1348, 69, 1352, 69, 1346, 69, 1342, 1359, 1347, 1357, + 1351, 1355, 69, 69, 1360, 69, 1353, 1361, 1356, 1358, + 1363, 1354, 1362, 69, 69, 69, 69, 1366, 69, 69, + 69, 69, 1371, 69, 1368, 69, 1373, 1365, 69, 69, + 1367, 1369, 69, 69, 69, 1376, 1375, 1377, 69, 69, + 1364, 1374, 1378, 69, 69, 69, 1370, 1372, 69, 69, - 69, 69, 1378, 1380, 69, 69, 1381, 69, 1387, 69, - 1382, 69, 1379, 1385, 69, 69, 1386, 69, 69, 1389, - 1394, 69, 69, 1383, 69, 69, 1384, 69, 1398, 1388, - 1390, 1392, 69, 1393, 69, 1391, 69, 69, 1400, 1402, - 69, 1395, 1396, 69, 69, 69, 1397, 69, 1405, 69, - 1403, 69, 69, 1399, 1406, 69, 69, 69, 69, 133, - 69, 69, 69, 1408, 1404, 69, 1413, 1409, 1410, 69, - 1407, 69, 1412, 1418, 1417, 69, 1419, 69, 1411, 1414, - 1420, 1415, 1416, 69, 1421, 69, 1424, 69, 69, 69, - 69, 1425, 1422, 1426, 69, 1428, 1427, 69, 69, 1423, + 1380, 1382, 69, 1381, 69, 69, 69, 1384, 1383, 1379, + 69, 1388, 69, 1385, 69, 69, 1386, 1387, 69, 1395, + 69, 69, 69, 1390, 1393, 69, 1389, 1394, 69, 1397, + 69, 69, 69, 1391, 69, 1396, 69, 1392, 1402, 69, + 1398, 1400, 69, 1401, 1406, 69, 69, 1403, 1399, 69, + 69, 1404, 69, 1408, 1411, 69, 1405, 1409, 1410, 69, + 69, 69, 1407, 69, 1414, 69, 69, 1412, 69, 1413, + 1415, 69, 69, 69, 69, 69, 69, 69, 1417, 1426, + 1418, 1422, 69, 1419, 1427, 69, 1416, 69, 1421, 69, + 69, 69, 1429, 69, 1423, 69, 1424, 1425, 1420, 1431, - 1432, 69, 1429, 69, 69, 69, 69, 1430, 1433, 69, - 1438, 69, 1435, 69, 1434, 69, 1439, 69, 1431, 1442, - 69, 69, 1444, 1437, 1436, 69, 1443, 69, 1440, 69, - 1446, 69, 1447, 69, 69, 69, 1450, 1441, 69, 1445, - 1451, 69, 1448, 69, 1452, 1449, 69, 69, 1454, 69, - 1453, 1455, 69, 69, 69, 69, 69, 69, 69, 1460, - 1456, 69, 1461, 1465, 69, 69, 69, 1464, 69, 1457, - 1458, 1459, 1462, 69, 1466, 1467, 69, 1469, 69, 1463, - 1468, 1471, 1472, 1470, 69, 69, 1475, 1473, 69, 1476, - 69, 69, 1474, 69, 1477, 1478, 69, 69, 1479, 1482, + 1430, 1433, 69, 1428, 69, 1432, 69, 69, 1436, 1435, + 69, 69, 1437, 1439, 1441, 1434, 1438, 69, 69, 69, + 69, 69, 1442, 69, 1447, 69, 69, 1444, 69, 1448, + 1440, 1443, 69, 1451, 69, 69, 1453, 1446, 69, 69, + 1445, 1449, 69, 1452, 69, 1455, 69, 1454, 69, 1456, + 69, 1457, 1450, 69, 1458, 1459, 1460, 69, 1462, 1461, + 69, 69, 69, 69, 69, 1463, 1464, 69, 69, 69, + 69, 69, 69, 1469, 69, 1465, 1470, 1474, 69, 69, + 69, 1473, 1467, 1466, 1468, 1479, 1471, 69, 1475, 1476, + 69, 1478, 69, 1477, 1472, 1481, 69, 69, 1485, 69, - 69, 69, 69, 1480, 69, 69, 1483, 1484, 69, 1486, - 69, 1481, 69, 69, 69, 69, 69, 1488, 1489, 1492, - 69, 1495, 69, 69, 69, 1485, 1493, 69, 69, 1494, - 1490, 1491, 69, 1487, 69, 69, 69, 69, 1505, 69, - 69, 69, 69, 1497, 1506, 69, 1498, 1503, 69, 1496, - 1527, 1499, 69, 1501, 1508, 1507, 1500, 1502, 1504, 69, - 1510, 1509, 1511, 69, 1512, 69, 69, 1513, 69, 1515, - 69, 69, 1518, 69, 1519, 69, 1520, 69, 69, 1514, - 1516, 1522, 69, 1517, 1524, 69, 1525, 69, 69, 1521, - 1528, 69, 69, 1530, 69, 69, 1523, 69, 69, 69, + 1482, 69, 69, 69, 1483, 1480, 1487, 69, 69, 1488, + 69, 1486, 1491, 69, 69, 1489, 69, 1484, 69, 1492, + 1493, 69, 69, 69, 69, 69, 69, 1495, 1490, 1498, + 1501, 69, 69, 69, 69, 69, 1502, 69, 1494, 1496, + 1497, 1499, 1500, 69, 69, 69, 69, 69, 1503, 1504, + 69, 69, 69, 69, 1506, 1616, 1507, 1515, 69, 69, + 1505, 69, 1512, 69, 1516, 1510, 1508, 1514, 1511, 1509, + 69, 69, 1513, 1518, 69, 1520, 1517, 1521, 69, 1522, + 69, 69, 69, 1519, 69, 1525, 1523, 69, 1528, 69, + 1529, 69, 1530, 69, 1524, 69, 1526, 1532, 69, 1527, - 1534, 1533, 69, 1532, 1536, 69, 69, 1526, 69, 1540, - 69, 1529, 69, 1531, 69, 1535, 69, 69, 69, 1545, - 69, 1537, 1544, 1538, 69, 1539, 1547, 69, 69, 69, - 69, 1543, 1541, 69, 1551, 1549, 1546, 1542, 69, 1552, - 69, 69, 69, 69, 1548, 1554, 69, 69, 69, 69, - 1553, 1558, 1559, 69, 69, 1550, 1556, 1561, 69, 1564, - 69, 69, 1562, 1557, 1560, 69, 1555, 69, 1563, 1567, - 1569, 1565, 69, 1568, 69, 1570, 69, 69, 1566, 69, - 69, 69, 69, 1571, 69, 1577, 69, 1609, 69, 1575, - 69, 1578, 69, 1576, 1574, 1581, 69, 1572, 69, 1573, + 69, 1531, 1534, 69, 1535, 69, 69, 1538, 69, 69, + 69, 1537, 69, 1533, 1540, 69, 1542, 69, 69, 1536, + 1543, 69, 1544, 1546, 69, 69, 69, 69, 1539, 69, + 1541, 1550, 69, 1548, 69, 69, 69, 1545, 69, 1554, + 1555, 69, 1557, 69, 1547, 1549, 69, 1551, 69, 1553, + 69, 1561, 1552, 1559, 69, 1556, 69, 69, 1558, 69, + 69, 69, 1564, 1562, 69, 69, 69, 69, 1563, 1568, + 1569, 69, 69, 1566, 1560, 69, 1571, 1574, 69, 1575, + 1572, 1570, 1567, 69, 1565, 69, 1573, 69, 1578, 1579, + 69, 1580, 69, 69, 1577, 69, 69, 69, 1576, 1581, - 1580, 1582, 69, 69, 1579, 69, 1583, 69, 1584, 1587, - 1585, 69, 1588, 69, 69, 69, 1590, 1586, 1589, 1591, - 69, 69, 69, 69, 69, 1593, 1592, 1596, 69, 69, - 131, 1599, 69, 1598, 69, 1594, 1595, 69, 1600, 1602, - 1603, 69, 69, 69, 1597, 1601, 69, 69, 69, 1604, - 1605, 69, 1607, 69, 69, 1622, 1606, 1608, 69, 1610, - 1611, 69, 69, 1614, 69, 1612, 1616, 1613, 1615, 69, - 69, 1617, 69, 69, 69, 1619, 69, 1623, 69, 1620, - 1625, 69, 69, 69, 1628, 69, 69, 69, 1629, 1618, - 1624, 1630, 69, 69, 69, 1621, 69, 69, 1627, 1631, + 69, 69, 69, 1587, 69, 1585, 1588, 69, 1584, 1586, + 1591, 69, 1582, 69, 1583, 69, 1590, 1592, 69, 69, + 1594, 1593, 1589, 69, 69, 1595, 69, 1598, 1599, 1596, + 69, 1601, 69, 1600, 69, 69, 69, 69, 69, 1602, + 69, 69, 1597, 1609, 1606, 69, 1608, 69, 69, 69, + 69, 1605, 69, 1610, 1614, 1603, 1604, 1613, 1607, 69, + 69, 69, 69, 1611, 1612, 69, 1618, 1615, 69, 69, + 1621, 1619, 1622, 69, 69, 1617, 1620, 1625, 69, 1624, + 1623, 1626, 69, 1627, 69, 1628, 69, 69, 69, 69, + 69, 69, 69, 1631, 1634, 69, 69, 1636, 69, 1635, - 1626, 69, 1634, 1632, 1635, 69, 69, 1633, 1636, 69, - 1637, 69, 69, 1640, 1639, 69, 69, 69, 1638, 69, - 69, 1646, 69, 69, 1644, 69, 69, 1641, 1642, 1643, - 69, 69, 1647, 69, 69, 1653, 69, 69, 69, 69, - 1645, 1659, 69, 1650, 1657, 1654, 1649, 1652, 69, 1660, - 69, 1648, 69, 1658, 69, 1651, 1655, 69, 1661, 1656, - 69, 69, 69, 69, 69, 69, 1669, 1670, 69, 69, - 69, 1666, 1662, 69, 69, 69, 1664, 69, 1663, 1671, - 1673, 1665, 1668, 1667, 69, 69, 1680, 1672, 69, 1674, - 1679, 69, 69, 1675, 69, 1676, 69, 69, 69, 69, + 1639, 69, 1629, 69, 1633, 69, 1640, 1641, 69, 1630, + 1632, 69, 69, 1638, 1637, 69, 1642, 1643, 69, 1646, + 69, 1647, 69, 1645, 1648, 69, 1644, 69, 69, 69, + 1651, 69, 69, 69, 69, 69, 1657, 69, 69, 1649, + 1655, 69, 69, 1652, 1653, 1654, 1650, 1658, 69, 69, + 69, 69, 1664, 69, 1656, 69, 69, 136, 69, 1670, + 69, 1661, 1660, 1668, 1663, 1665, 69, 1659, 69, 69, + 69, 1666, 69, 1662, 1669, 1671, 69, 1667, 69, 1672, + 69, 69, 69, 69, 1680, 69, 1673, 69, 1674, 1677, + 1675, 69, 1676, 1681, 69, 69, 1682, 69, 1684, 69, - 1677, 69, 1684, 69, 1678, 69, 1681, 1688, 1687, 1682, - 1689, 69, 69, 69, 69, 1683, 1692, 69, 1685, 1686, - 1693, 69, 1696, 69, 69, 69, 69, 69, 1697, 1694, - 1690, 1699, 1691, 1700, 69, 1695, 1702, 69, 69, 1701, - 1698, 1703, 69, 1705, 69, 1706, 69, 69, 1707, 69, - 69, 69, 69, 69, 69, 69, 69, 1704, 1711, 1712, - 1710, 69, 69, 1709, 1714, 69, 1716, 1715, 1719, 69, - 1717, 1708, 1720, 69, 1713, 69, 69, 1718, 1723, 69, - 69, 1722, 1721, 69, 69, 1724, 1725, 69, 1726, 69, - 1728, 69, 1727, 69, 69, 1729, 69, 69, 1730, 69, + 1679, 1678, 69, 1683, 69, 1690, 69, 1691, 69, 69, + 1685, 69, 69, 1692, 69, 1686, 69, 1687, 1688, 69, + 69, 1696, 69, 1689, 69, 69, 1694, 1693, 69, 1699, + 1700, 1695, 69, 69, 1697, 69, 1704, 1705, 69, 69, + 1698, 1701, 1703, 69, 1702, 1708, 69, 1709, 69, 69, + 1706, 1712, 69, 1711, 69, 1714, 69, 1707, 1715, 69, + 69, 1717, 69, 1710, 1718, 69, 69, 1713, 69, 1719, + 69, 69, 69, 69, 69, 69, 69, 1723, 1724, 1716, + 1722, 69, 69, 1721, 1726, 69, 1728, 1729, 1720, 69, + 1727, 1731, 69, 1725, 1732, 69, 1733, 69, 1735, 69, - 69, 69, 69, 1731, 69, 1734, 69, 1733, 69, 1736, - 69, 69, 1732, 1735, 69, 1737, 69, 1739, 69, 1742, - 1738, 69, 69, 1740, 69, 1741, 69, 1744, 1747, 69, - 1743, 1745, 69, 1751, 69, 1749, 69, 69, 69, 1754, - 69, 1746, 1753, 1748, 69, 1755, 69, 1750, 69, 1756, - 69, 69, 69, 69, 1759, 1752, 69, 1757, 1773, 1758, - 69, 1762, 1763, 69, 69, 1760, 2035, 1761, 69, 1765, - 1766, 69, 69, 1764, 1771, 1767, 1768, 69, 1769, 69, - 1770, 69, 69, 1774, 69, 69, 1776, 69, 69, 1775, - 69, 1777, 69, 1780, 1779, 1781, 1772, 69, 69, 69, + 1730, 69, 1734, 69, 69, 1740, 1736, 1737, 69, 1738, + 69, 69, 1739, 69, 69, 69, 69, 1741, 1744, 1742, + 69, 1746, 69, 69, 1743, 69, 1748, 69, 1745, 69, + 1749, 69, 69, 69, 1747, 69, 1754, 69, 69, 69, + 1752, 1753, 1751, 69, 69, 1750, 1755, 1759, 69, 69, + 69, 135, 1756, 69, 1762, 1763, 69, 1765, 1757, 1761, + 1766, 69, 1758, 1760, 69, 69, 69, 69, 1764, 69, + 1768, 69, 1767, 1771, 69, 1769, 69, 1774, 1775, 69, + 1770, 69, 69, 1777, 69, 1772, 1778, 69, 69, 1773, + 69, 1779, 1780, 69, 1781, 69, 1782, 69, 69, 1785, - 69, 69, 69, 1784, 1788, 69, 69, 69, 69, 69, - 1778, 69, 1792, 69, 1782, 1783, 1787, 1790, 1785, 69, - 1793, 1786, 69, 1794, 1795, 1789, 1791, 69, 69, 69, - 69, 69, 1796, 1797, 1802, 69, 69, 69, 1799, 1803, - 1805, 69, 69, 69, 1808, 69, 69, 1806, 69, 69, - 1800, 1801, 1809, 69, 1798, 1804, 69, 1812, 1810, 1814, - 69, 1807, 1813, 69, 69, 1815, 69, 69, 1811, 1816, - 69, 1820, 1819, 69, 69, 69, 1817, 69, 1823, 1822, - 69, 1824, 1821, 1825, 69, 69, 1828, 69, 69, 1826, - 1832, 1818, 69, 1830, 69, 1827, 69, 1834, 69, 69, + 133, 1776, 1783, 69, 1784, 69, 1786, 69, 69, 1788, + 69, 1792, 1787, 69, 1789, 69, 1791, 69, 1793, 69, + 69, 1790, 69, 1798, 69, 1796, 1800, 69, 69, 69, + 69, 69, 69, 1804, 69, 1805, 1794, 1795, 1799, 1802, + 1797, 69, 1806, 69, 69, 69, 1807, 1801, 1803, 1808, + 69, 69, 69, 69, 1814, 69, 69, 69, 131, 1811, + 1815, 1817, 69, 1809, 69, 69, 1820, 69, 1821, 1816, + 1818, 1810, 1812, 1813, 1819, 69, 69, 1824, 69, 69, + 69, 69, 1825, 69, 1822, 69, 69, 1827, 69, 1828, + 69, 1823, 1826, 1829, 69, 1831, 69, 1832, 69, 69, - 69, 1837, 69, 69, 69, 1831, 1829, 69, 1839, 69, - 69, 69, 69, 69, 69, 1836, 1838, 1844, 1835, 1833, - 1840, 1843, 69, 1841, 1846, 69, 1848, 69, 1842, 1849, - 69, 1850, 69, 1847, 69, 69, 1845, 1852, 69, 1851, - 69, 69, 1853, 69, 1856, 69, 1859, 69, 1860, 69, - 69, 69, 69, 1864, 69, 1857, 69, 69, 1854, 1855, - 1865, 69, 1866, 1862, 69, 69, 69, 1858, 1867, 1861, - 69, 1870, 1863, 1869, 69, 1872, 1875, 69, 1876, 69, - 69, 69, 1873, 1874, 1868, 1878, 69, 69, 69, 69, - 1882, 69, 1879, 1871, 1881, 1883, 69, 1884, 69, 1877, + 69, 69, 1835, 1833, 1834, 1836, 1837, 69, 1839, 1838, + 1830, 1840, 69, 69, 1844, 69, 69, 69, 1842, 1841, + 69, 1846, 69, 69, 1849, 69, 69, 69, 69, 69, + 1843, 1851, 69, 69, 69, 1847, 69, 1852, 1848, 1850, + 1845, 1855, 69, 1858, 69, 1853, 69, 1856, 1860, 69, + 69, 1854, 1861, 69, 69, 1859, 1862, 69, 69, 1863, + 1857, 1864, 69, 69, 1868, 69, 1865, 69, 1871, 69, + 1872, 69, 69, 1866, 69, 69, 69, 1867, 69, 1869, + 1876, 69, 69, 69, 1878, 1877, 1874, 69, 1879, 1870, + 1881, 1873, 69, 69, 1884, 1875, 69, 1882, 1880, 69, - 69, 69, 1880, 1886, 69, 1885, 69, 1887, 1888, 69, - 69, 69, 1892, 69, 69, 1889, 69, 1895, 69, 1893, - 1891, 69, 69, 69, 1894, 69, 1896, 69, 69, 69, - 1890, 2035, 1899, 69, 69, 69, 1901, 1900, 69, 69, - 1909, 69, 1897, 1898, 1907, 1910, 69, 1902, 69, 1903, - 69, 1904, 1905, 69, 1911, 69, 1906, 1913, 1908, 1912, - 69, 1914, 69, 1917, 69, 69, 1915, 69, 69, 1916, - 69, 1921, 1922, 69, 1923, 69, 69, 1920, 69, 69, - 1918, 1924, 69, 69, 69, 1919, 69, 1928, 69, 1929, - 1931, 69, 1932, 69, 1926, 1933, 69, 1934, 1935, 69, + 69, 1887, 69, 1888, 69, 1890, 69, 69, 1894, 69, + 69, 69, 1883, 1885, 1886, 1891, 1893, 69, 1889, 1895, + 69, 1892, 1896, 69, 69, 1898, 69, 69, 1899, 1897, + 1900, 69, 69, 69, 1904, 69, 69, 1902, 69, 69, + 69, 1905, 1903, 1907, 69, 1908, 1901, 1906, 69, 69, + 69, 69, 69, 69, 1911, 69, 69, 2047, 1909, 1913, + 69, 69, 1912, 1921, 69, 1919, 1922, 69, 1910, 1915, + 1914, 69, 1916, 1917, 69, 1923, 69, 1918, 1924, 69, + 1925, 1920, 1926, 69, 69, 1929, 69, 69, 69, 69, + 69, 69, 1927, 69, 1933, 1934, 69, 69, 1928, 1932, - 69, 69, 1937, 1925, 1927, 1930, 69, 1939, 69, 1941, - 69, 69, 1936, 1940, 69, 69, 69, 69, 69, 1943, - 69, 1938, 69, 1947, 69, 1942, 1948, 69, 69, 69, - 69, 69, 69, 1946, 69, 1944, 1945, 69, 69, 1951, - 2035, 1950, 1952, 69, 1949, 1959, 69, 1955, 69, 1953, - 1954, 2035, 1957, 1961, 69, 1962, 69, 1960, 1958, 1956, - 69, 69, 69, 1967, 69, 1963, 1964, 69, 1965, 69, - 1969, 69, 69, 1972, 1973, 69, 69, 1966, 1968, 69, - 69, 69, 1970, 69, 69, 69, 69, 69, 69, 1974, - 69, 1971, 69, 1982, 1975, 1976, 69, 1977, 1979, 1980, + 1935, 69, 1930, 69, 69, 69, 1931, 69, 1936, 1957, + 1940, 69, 1938, 2047, 1937, 69, 1941, 1943, 69, 1944, + 69, 1945, 69, 69, 1946, 1939, 1942, 1947, 69, 69, + 1949, 69, 1951, 69, 69, 1948, 1953, 1952, 69, 69, + 69, 69, 69, 69, 1955, 69, 1950, 1960, 1959, 69, + 69, 69, 1954, 69, 69, 69, 69, 1958, 69, 1956, + 69, 69, 1963, 69, 1962, 69, 1964, 1971, 69, 1961, + 1975, 1967, 1972, 1965, 1966, 1969, 1973, 69, 1974, 69, + 69, 1970, 69, 1968, 69, 1976, 1979, 69, 1981, 69, + 69, 69, 69, 69, 1984, 69, 1985, 69, 69, 1978, - 69, 1983, 69, 1978, 69, 1985, 1981, 1986, 69, 1984, - 69, 1989, 1990, 1987, 69, 1988, 1991, 69, 69, 1993, - 69, 1992, 1995, 69, 69, 69, 69, 69, 69, 69, - 1998, 69, 69, 2002, 2003, 69, 69, 1997, 69, 1994, - 69, 2005, 1996, 2007, 2001, 1999, 2000, 69, 2006, 69, - 2010, 69, 69, 69, 2004, 2009, 2008, 69, 69, 2011, - 2012, 69, 69, 2014, 69, 69, 69, 2016, 69, 2017, - 69, 2020, 69, 69, 2023, 69, 2013, 2024, 69, 69, - 2015, 69, 2025, 69, 2018, 2019, 2028, 2021, 2026, 69, - 69, 2022, 2027, 69, 69, 2029, 2033, 69, 2035, 2030, + 69, 1980, 69, 69, 69, 1982, 1987, 1977, 69, 1986, + 1983, 69, 1989, 69, 69, 69, 1988, 1991, 1994, 1995, + 69, 1992, 1990, 69, 1997, 1998, 69, 69, 69, 2002, + 1993, 1999, 2000, 69, 1996, 69, 2003, 69, 69, 69, + 2004, 69, 2007, 69, 69, 69, 69, 2001, 69, 2010, + 69, 69, 2014, 69, 69, 69, 2009, 2005, 2006, 2015, + 2008, 69, 2017, 2013, 2011, 2012, 69, 2018, 69, 69, + 2022, 69, 2016, 2019, 2021, 69, 2020, 69, 69, 69, + 69, 69, 2023, 69, 2024, 2026, 2028, 69, 2029, 69, + 69, 2032, 69, 69, 69, 2035, 69, 2025, 2027, 2036, - 2031, 2035, 2032, 2034, 69, 41, 41, 41, 41, 41, - 41, 41, 46, 46, 46, 46, 46, 46, 46, 51, - 51, 51, 51, 51, 51, 51, 57, 57, 57, 57, - 57, 57, 57, 62, 62, 62, 62, 62, 62, 62, - 72, 72, 2035, 72, 72, 72, 72, 130, 130, 2035, - 2035, 2035, 130, 130, 132, 132, 2035, 2035, 132, 2035, - 132, 134, 2035, 2035, 2035, 2035, 2035, 134, 137, 137, - 2035, 2035, 2035, 137, 137, 139, 2035, 2035, 2035, 2035, - 2035, 139, 141, 141, 2035, 141, 141, 141, 141, 73, - 73, 2035, 73, 73, 73, 73, 13, 2035, 2035, 2035, + 69, 2038, 69, 2037, 2039, 69, 2030, 69, 2031, 69, + 69, 2033, 2034, 69, 2040, 2041, 69, 2047, 2042, 2045, + 69, 2046, 69, 2047, 2047, 2047, 2047, 2047, 2043, 2047, + 2047, 2047, 2047, 2047, 2047, 2044, 41, 41, 41, 41, + 41, 41, 41, 46, 46, 46, 46, 46, 46, 46, + 51, 51, 51, 51, 51, 51, 51, 57, 57, 57, + 57, 57, 57, 57, 62, 62, 62, 62, 62, 62, + 62, 72, 72, 2047, 72, 72, 72, 72, 130, 130, + 2047, 2047, 2047, 130, 130, 132, 132, 2047, 2047, 132, + 2047, 132, 134, 2047, 2047, 2047, 2047, 2047, 134, 137, - 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, - 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, - 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, - 2035, 2035, 2035, 2035, 2035, 2035, 2035 + 137, 2047, 2047, 2047, 137, 137, 139, 2047, 2047, 2047, + 2047, 2047, 139, 141, 141, 2047, 141, 141, 141, 141, + 73, 73, 2047, 73, 73, 73, 73, 13, 2047, 2047, + 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, + 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, + 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, + 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047 } ; -static yyconst flex_int16_t yy_chk[4038] = +static yyconst flex_int16_t yy_chk[4069] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1597,14 +1605,14 @@ static yyconst flex_int16_t yy_chk[4038] = 97, 103, 105, 108, 111, 110, 112, 112, 113, 117, 110, 116, 114, 106, 110, 107, 109, 119, 122, 118, - 124, 120, 123, 119, 111, 114, 128, 117, 113, 584, + 124, 120, 123, 119, 111, 114, 128, 117, 113, 586, 116, 114, 118, 120, 121, 121, 122, 125, 123, 125, 126, 124, 127, 129, 128, 126, 131, 131, 129, 133, - 138, 138, 133, 584, 127, 121, 135, 145, 135, 135, + 138, 138, 133, 586, 127, 121, 135, 145, 135, 135, 125, 135, 140, 145, 140, 140, 141, 140, 141, 141, 143, 141, 144, 143, 146, 147, 148, 144, 141, 149, 150, 152, 156, 147, 156, 153, 159, 152, 152, 146, - 153, 154, 154, 155, 149, 148, 162, 157, 2041, 155, + 153, 154, 154, 155, 149, 148, 162, 157, 2053, 155, 150, 157, 158, 158, 156, 159, 157, 160, 161, 165, 163, 157, 160, 161, 163, 164, 166, 157, 157, 162, @@ -1625,7 +1633,7 @@ static yyconst flex_int16_t yy_chk[4038] = 227, 227, 226, 228, 228, 229, 233, 234, 231, 230, 222, 231, 232, 234, 235, 233, 232, 236, 237, 237, 238, 229, 240, 236, 239, 238, 241, 242, 235, 246, - 239, 248, 243, 244, 244, 245, 247, 250, 245, 744, + 239, 248, 243, 244, 244, 245, 247, 250, 245, 747, 247, 251, 240, 257, 241, 243, 252, 246, 242, 248, 249, 249, 252, 251, 253, 250, 254, 253, 255, 258, @@ -1646,367 +1654,370 @@ static yyconst flex_int16_t yy_chk[4038] = 307, 311, 315, 308, 312, 312, 316, 312, 317, 310, 317, 320, 318, 314, 321, 313, 318, 319, 315, 324, 316, 319, 322, 323, 324, 326, 325, 327, 321, 320, - 325, 322, 323, 327, 326, 328, 319, 329, 330, 332, - 331, 335, 330, 329, 322, 331, 333, 333, 334, 336, - 336, 337, 339, 334, 335, 340, 328, 337, 338, 332, - 340, 341, 338, 342, 343, 344, 344, 345, 343, 346, + 325, 322, 323, 327, 326, 328, 319, 329, 332, 333, + 333, 330, 322, 329, 322, 330, 331, 334, 335, 336, + 336, 331, 334, 337, 339, 342, 328, 340, 332, 337, + 338, 335, 340, 341, 338, 343, 346, 342, 345, 343, - 341, 350, 345, 339, 351, 342, 347, 347, 349, 349, - 352, 353, 351, 354, 356, 357, 358, 359, 360, 352, - 346, 361, 350, 359, 362, 354, 361, 360, 363, 368, - 358, 353, 356, 364, 356, 357, 363, 365, 362, 364, - 366, 367, 369, 365, 370, 371, 367, 372, 370, 373, - 374, 368, 372, 376, 366, 377, 378, 382, 382, 380, - 371, 365, 380, 369, 381, 373, 383, 384, 384, 374, - 375, 375, 378, 376, 377, 385, 375, 379, 375, 387, - 386, 388, 389, 379, 381, 136, 375, 393, 379, 375, - 385, 383, 386, 390, 387, 392, 375, 391, 390, 394, + 344, 344, 341, 345, 350, 339, 347, 347, 349, 349, + 351, 352, 353, 356, 354, 357, 358, 346, 351, 360, + 352, 359, 362, 383, 361, 350, 354, 359, 360, 361, + 358, 356, 353, 356, 363, 357, 362, 364, 365, 366, + 367, 368, 363, 364, 365, 367, 369, 370, 383, 371, + 372, 370, 373, 366, 374, 372, 376, 396, 377, 381, + 379, 396, 365, 368, 371, 378, 379, 369, 373, 380, + 389, 379, 380, 374, 375, 375, 376, 377, 388, 381, + 375, 378, 375, 382, 382, 384, 384, 385, 387, 386, + 375, 390, 389, 375, 392, 391, 390, 388, 398, 393, - 388, 398, 393, 396, 389, 394, 391, 396, 399, 397, - 400, 401, 403, 398, 392, 397, 402, 402, 405, 401, - 407, 404, 406, 400, 403, 406, 399, 404, 408, 409, - 405, 410, 409, 408, 411, 407, 412, 413, 413, 411, - 411, 414, 414, 416, 416, 415, 419, 410, 418, 412, - 410, 415, 417, 417, 418, 420, 421, 422, 423, 427, - 420, 426, 423, 424, 425, 422, 426, 419, 425, 424, - 428, 430, 429, 432, 434, 421, 428, 429, 431, 427, - 437, 431, 433, 433, 435, 430, 431, 439, 436, 435, - 431, 432, 434, 436, 437, 438, 439, 440, 441, 442, + 375, 386, 385, 387, 391, 394, 397, 399, 400, 401, + 398, 394, 397, 392, 393, 402, 402, 401, 403, 405, + 404, 400, 407, 408, 406, 399, 404, 406, 408, 409, + 403, 405, 409, 410, 411, 412, 419, 407, 136, 411, + 411, 413, 413, 414, 414, 415, 416, 416, 412, 410, + 418, 415, 410, 417, 417, 420, 418, 419, 421, 422, + 420, 423, 424, 426, 427, 423, 425, 422, 424, 427, + 425, 428, 429, 431, 430, 433, 435, 421, 429, 430, + 432, 426, 134, 432, 434, 434, 438, 431, 432, 440, + 436, 428, 432, 433, 435, 436, 437, 439, 440, 441, - 440, 438, 441, 443, 442, 444, 445, 446, 443, 447, - 448, 449, 446, 451, 450, 452, 451, 449, 452, 445, - 450, 444, 448, 453, 441, 447, 454, 455, 453, 456, - 459, 457, 458, 459, 460, 456, 457, 461, 458, 460, - 462, 455, 461, 461, 454, 463, 464, 465, 466, 471, - 468, 467, 464, 462, 467, 468, 469, 466, 463, 470, - 470, 469, 469, 472, 473, 472, 465, 475, 474, 467, - 474, 476, 477, 478, 471, 479, 482, 480, 483, 479, - 481, 484, 485, 473, 486, 475, 480, 487, 485, 476, - 490, 477, 492, 478, 482, 481, 484, 483, 488, 488, + 438, 437, 441, 439, 442, 443, 444, 445, 442, 446, + 443, 444, 447, 448, 449, 450, 452, 447, 451, 452, + 455, 450, 446, 445, 451, 453, 449, 454, 453, 448, + 442, 456, 454, 457, 460, 458, 459, 460, 455, 457, + 458, 461, 459, 462, 463, 456, 461, 464, 462, 462, + 465, 466, 467, 472, 469, 468, 465, 463, 468, 469, + 464, 467, 470, 471, 471, 474, 478, 470, 470, 473, + 466, 473, 475, 468, 475, 476, 477, 479, 472, 480, + 481, 482, 483, 480, 474, 478, 484, 485, 487, 481, + 488, 490, 486, 476, 477, 490, 482, 479, 486, 491, - 489, 490, 491, 486, 489, 493, 487, 491, 492, 494, - 495, 496, 497, 498, 500, 499, 496, 495, 498, 497, - 499, 501, 494, 503, 493, 502, 504, 506, 501, 507, - 506, 505, 500, 507, 502, 504, 505, 503, 508, 509, - 509, 510, 513, 512, 515, 516, 517, 514, 509, 512, - 510, 514, 517, 518, 519, 520, 515, 526, 529, 508, - 523, 518, 513, 516, 521, 530, 531, 529, 538, 521, - 531, 530, 519, 521, 526, 523, 521, 532, 532, 534, - 520, 533, 533, 521, 537, 534, 521, 535, 535, 535, - 536, 535, 543, 538, 535, 536, 548, 539, 548, 535, + 483, 492, 485, 489, 489, 484, 492, 487, 493, 488, + 491, 494, 495, 496, 497, 498, 499, 501, 500, 497, + 496, 499, 498, 500, 493, 495, 502, 503, 504, 505, + 494, 507, 506, 502, 507, 501, 503, 506, 505, 508, + 509, 511, 504, 508, 510, 510, 513, 514, 516, 519, + 511, 515, 513, 510, 517, 515, 518, 519, 520, 521, + 516, 509, 518, 527, 524, 530, 522, 514, 540, 532, + 538, 522, 517, 532, 530, 522, 520, 531, 522, 524, + 527, 533, 533, 531, 521, 522, 534, 534, 522, 535, + 132, 538, 539, 540, 537, 535, 536, 536, 536, 537, - 539, 541, 537, 540, 540, 535, 535, 543, 541, 542, - 542, 544, 544, 545, 546, 547, 549, 546, 545, 550, - 547, 551, 553, 552, 554, 554, 556, 557, 549, 555, - 553, 558, 559, 560, 560, 134, 563, 559, 550, 563, - 556, 551, 552, 558, 555, 557, 561, 562, 564, 565, - 566, 567, 561, 562, 564, 568, 569, 565, 566, 570, - 568, 571, 571, 569, 572, 574, 573, 575, 577, 567, - 578, 574, 579, 572, 573, 579, 580, 577, 570, 578, - 581, 580, 582, 582, 583, 585, 575, 587, 585, 587, - 588, 588, 589, 590, 581, 591, 585, 592, 590, 583, + 536, 541, 543, 536, 541, 542, 542, 545, 536, 543, + 539, 544, 544, 547, 536, 536, 546, 546, 547, 549, + 548, 551, 545, 548, 549, 550, 552, 550, 553, 555, + 554, 556, 556, 551, 560, 557, 559, 555, 558, 561, + 562, 562, 130, 569, 561, 552, 560, 563, 553, 554, + 557, 564, 558, 563, 559, 565, 566, 564, 565, 567, + 568, 569, 566, 571, 570, 572, 574, 567, 568, 570, + 571, 573, 573, 575, 576, 574, 577, 579, 580, 581, + 576, 575, 581, 582, 572, 583, 579, 580, 582, 584, + 584, 585, 589, 587, 589, 577, 587, 590, 590, 583, - 593, 594, 595, 596, 132, 597, 598, 596, 600, 599, - 601, 595, 609, 589, 603, 603, 591, 592, 599, 604, - 600, 594, 593, 597, 601, 598, 602, 605, 606, 607, - 610, 609, 602, 608, 606, 607, 612, 608, 611, 604, - 614, 605, 610, 611, 613, 613, 614, 616, 615, 617, - 610, 615, 618, 619, 620, 620, 621, 612, 618, 622, - 622, 623, 617, 624, 625, 616, 626, 624, 627, 628, - 630, 630, 632, 619, 621, 631, 623, 634, 633, 631, - 635, 634, 627, 625, 637, 638, 130, 632, 636, 628, - 626, 629, 644, 636, 629, 635, 629, 639, 637, 638, + 591, 593, 592, 594, 587, 595, 585, 592, 596, 597, + 598, 599, 600, 602, 598, 601, 603, 606, 597, 611, + 604, 591, 593, 594, 601, 602, 604, 595, 596, 599, + 603, 600, 605, 605, 607, 608, 609, 606, 611, 610, + 612, 608, 609, 610, 613, 614, 615, 615, 607, 613, + 616, 617, 612, 618, 617, 619, 616, 620, 621, 623, + 612, 622, 622, 620, 624, 624, 614, 625, 619, 626, + 627, 618, 628, 626, 629, 630, 634, 623, 621, 632, + 632, 633, 625, 636, 635, 633, 637, 636, 629, 627, + 639, 634, 68, 638, 646, 630, 628, 631, 638, 642, - 629, 639, 629, 633, 640, 641, 642, 629, 643, 645, - 641, 642, 629, 644, 68, 646, 648, 648, 647, 640, - 641, 646, 643, 645, 647, 649, 650, 650, 651, 653, - 649, 652, 650, 657, 650, 654, 652, 655, 655, 656, - 651, 657, 658, 653, 656, 650, 659, 654, 660, 660, - 661, 663, 650, 665, 661, 664, 658, 663, 664, 668, - 666, 667, 669, 672, 668, 659, 670, 667, 671, 673, - 674, 675, 665, 666, 676, 670, 675, 671, 673, 672, - 678, 669, 677, 679, 680, 681, 683, 685, 684, 674, - 686, 681, 679, 680, 676, 686, 677, 694, 687, 688, + 631, 637, 631, 640, 639, 643, 631, 641, 631, 635, + 643, 641, 645, 631, 642, 646, 644, 640, 631, 647, + 643, 644, 648, 649, 650, 650, 645, 651, 648, 649, + 652, 652, 651, 647, 653, 654, 652, 655, 652, 658, + 654, 656, 657, 657, 658, 660, 653, 659, 661, 652, + 662, 655, 668, 656, 672, 659, 652, 663, 663, 660, + 664, 669, 666, 667, 664, 675, 667, 661, 666, 662, + 670, 668, 671, 672, 669, 673, 670, 671, 674, 676, + 677, 675, 679, 680, 673, 678, 681, 674, 676, 682, + 678, 683, 686, 688, 687, 684, 760, 680, 682, 677, - 678, 689, 685, 687, 688, 683, 684, 690, 690, 691, - 689, 692, 695, 694, 698, 691, 699, 695, 695, 696, - 696, 701, 697, 696, 692, 697, 700, 701, 698, 702, - 703, 704, 705, 703, 706, 707, 699, 710, 708, 706, - 707, 700, 711, 710, 714, 712, 713, 713, 705, 702, - 708, 712, 704, 714, 715, 717, 716, 718, 711, 716, - 719, 720, 721, 725, 722, 723, 727, 728, 721, 722, - 723, 731, 715, 717, 720, 726, 718, 727, 726, 728, - 719, 725, 729, 730, 734, 732, 731, 735, 729, 730, - 732, 733, 733, 736, 737, 738, 740, 739, 737, 741, + 683, 684, 679, 760, 689, 690, 681, 692, 688, 689, + 690, 686, 687, 691, 693, 693, 692, 694, 691, 695, + 697, 698, 702, 694, 699, 699, 698, 698, 699, 701, + 700, 703, 695, 700, 704, 705, 697, 707, 706, 711, + 704, 706, 702, 701, 708, 709, 703, 710, 713, 714, + 709, 711, 710, 715, 713, 705, 716, 716, 707, 715, + 708, 717, 718, 719, 720, 714, 719, 721, 722, 724, + 717, 723, 725, 726, 728, 724, 729, 725, 726, 729, + 718, 731, 720, 730, 723, 732, 721, 734, 722, 733, + 737, 732, 728, 731, 730, 733, 735, 736, 736, 738, - 743, 735, 745, 734, 748, 736, 739, 746, 747, 750, - 748, 749, 752, 738, 750, 740, 745, 749, 751, 743, - 753, 755, 746, 751, 741, 754, 752, 756, 747, 758, - 754, 757, 759, 761, 753, 762, 755, 763, 757, 760, - 760, 764, 768, 763, 758, 766, 756, 761, 765, 765, - 766, 759, 767, 762, 769, 770, 768, 769, 771, 767, - 772, 764, 773, 774, 775, 772, 784, 771, 774, 777, - 777, 778, 780, 770, 781, 778, 779, 782, 784, 783, - 785, 773, 786, 775, 787, 779, 783, 780, 788, 789, - 790, 791, 782, 781, 788, 793, 796, 794, 795, 785, + 739, 735, 734, 740, 741, 742, 743, 740, 744, 737, + 746, 749, 739, 738, 742, 750, 748, 751, 752, 62, + 755, 759, 741, 751, 752, 743, 749, 753, 756, 746, + 748, 754, 753, 744, 755, 750, 754, 758, 757, 761, + 759, 762, 756, 757, 763, 763, 765, 764, 767, 766, + 768, 768, 758, 769, 761, 766, 770, 771, 769, 772, + 762, 764, 772, 770, 765, 773, 774, 775, 767, 776, + 778, 771, 775, 777, 784, 774, 780, 780, 777, 783, + 781, 782, 785, 773, 781, 786, 787, 788, 776, 778, + 782, 789, 786, 784, 783, 790, 791, 785, 787, 792, - 791, 793, 787, 786, 789, 798, 795, 797, 799, 800, - 790, 794, 797, 799, 799, 801, 796, 798, 802, 803, - 803, 804, 808, 805, 806, 807, 807, 808, 800, 801, - 806, 802, 805, 809, 804, 810, 811, 812, 812, 813, - 810, 811, 809, 815, 814, 816, 817, 818, 813, 814, - 819, 821, 817, 818, 820, 819, 828, 815, 820, 824, - 821, 822, 822, 816, 823, 821, 823, 821, 826, 821, - 824, 821, 826, 827, 828, 829, 830, 831, 832, 833, - 835, 830, 830, 836, 829, 834, 837, 832, 827, 838, - 839, 831, 836, 834, 835, 839, 840, 840, 833, 846, + 793, 794, 791, 797, 798, 800, 788, 795, 842, 797, + 801, 799, 789, 790, 792, 801, 795, 802, 798, 799, + 793, 794, 803, 804, 805, 800, 806, 803, 803, 802, + 807, 807, 808, 842, 809, 810, 811, 811, 805, 806, + 820, 810, 804, 809, 812, 808, 813, 814, 815, 812, + 816, 816, 814, 815, 817, 813, 818, 819, 820, 821, + 822, 818, 823, 817, 824, 821, 822, 823, 824, 825, + 828, 819, 826, 826, 827, 830, 827, 831, 825, 830, + 832, 828, 833, 825, 837, 825, 835, 825, 834, 825, + 836, 833, 831, 834, 834, 839, 838, 840, 832, 836, - 841, 842, 842, 844, 837, 845, 844, 847, 847, 848, - 845, 849, 849, 851, 838, 841, 850, 853, 846, 852, - 852, 850, 854, 855, 858, 856, 861, 854, 62, 848, - 856, 855, 857, 857, 851, 859, 860, 853, 863, 861, - 864, 859, 858, 860, 863, 865, 864, 866, 867, 868, - 865, 869, 871, 866, 870, 870, 872, 867, 873, 874, - 875, 877, 869, 876, 878, 874, 879, 879, 868, 880, - 881, 885, 871, 877, 875, 882, 872, 884, 884, 883, - 875, 873, 878, 876, 883, 886, 888, 57, 898, 880, - 886, 889, 890, 882, 885, 881, 889, 889, 891, 893, + 835, 841, 843, 837, 838, 845, 840, 843, 850, 839, + 844, 844, 846, 846, 848, 852, 849, 848, 855, 841, + 845, 849, 851, 851, 853, 853, 854, 850, 856, 856, + 857, 854, 858, 859, 862, 852, 863, 858, 860, 855, + 864, 859, 863, 860, 861, 861, 865, 864, 867, 868, + 857, 869, 862, 871, 867, 868, 869, 870, 872, 865, + 873, 875, 871, 870, 874, 874, 876, 877, 878, 879, + 881, 873, 880, 882, 878, 883, 883, 872, 884, 885, + 887, 875, 881, 879, 886, 887, 876, 888, 888, 879, + 877, 882, 880, 889, 890, 892, 57, 902, 884, 890, - 892, 890, 892, 894, 895, 888, 891, 896, 895, 894, - 897, 900, 899, 893, 898, 901, 900, 902, 896, 904, - 905, 906, 907, 904, 911, 908, 909, 910, 913, 897, - 899, 912, 915, 901, 907, 913, 912, 902, 905, 908, - 906, 909, 910, 911, 914, 916, 917, 918, 919, 914, - 915, 920, 921, 918, 916, 929, 920, 922, 921, 923, - 923, 917, 928, 922, 924, 924, 926, 926, 927, 919, - 930, 928, 927, 929, 931, 930, 932, 933, 935, 934, - 936, 937, 933, 933, 934, 934, 938, 939, 931, 940, - 941, 942, 943, 944, 948, 932, 941, 942, 935, 936, + 893, 894, 886, 895, 885, 893, 893, 896, 897, 896, + 894, 895, 898, 899, 892, 900, 889, 899, 898, 901, + 904, 903, 897, 902, 905, 904, 900, 906, 908, 911, + 909, 910, 908, 961, 915, 912, 913, 914, 901, 903, + 916, 911, 905, 924, 919, 916, 961, 906, 909, 912, + 910, 913, 914, 915, 917, 918, 920, 921, 921, 922, + 918, 917, 919, 923, 924, 920, 925, 926, 932, 923, + 927, 925, 932, 926, 922, 933, 927, 928, 928, 929, + 929, 931, 931, 934, 933, 935, 936, 937, 938, 940, + 935, 939, 941, 938, 938, 942, 939, 939, 943, 944, - 937, 945, 946, 947, 949, 938, 950, 950, 940, 953, - 953, 943, 944, 939, 952, 948, 956, 947, 954, 949, - 945, 946, 951, 954, 955, 951, 952, 957, 955, 956, - 958, 959, 961, 959, 967, 962, 957, 959, 963, 963, - 964, 966, 965, 958, 971, 964, 965, 968, 969, 969, - 959, 962, 961, 968, 967, 973, 974, 974, 975, 966, - 973, 980, 971, 984, 975, 977, 977, 979, 979, 982, - 983, 983, 982, 985, 986, 987, 988, 980, 984, 990, - 987, 989, 989, 990, 991, 992, 992, 993, 986, 994, - 995, 988, 996, 1001, 995, 1000, 997, 1004, 985, 1005, + 936, 934, 945, 948, 946, 949, 937, 947, 950, 940, + 946, 941, 951, 947, 942, 952, 953, 943, 954, 955, + 955, 945, 948, 956, 949, 944, 956, 950, 957, 952, + 962, 951, 963, 954, 958, 958, 959, 953, 960, 962, + 957, 959, 960, 967, 964, 963, 964, 966, 968, 968, + 964, 969, 971, 970, 972, 973, 969, 970, 976, 967, + 989, 973, 990, 964, 974, 974, 978, 966, 979, 979, + 971, 978, 980, 985, 972, 989, 976, 991, 980, 982, + 982, 984, 984, 987, 988, 988, 987, 990, 992, 985, + 993, 991, 995, 992, 994, 994, 995, 996, 997, 997, - 994, 997, 999, 999, 991, 1002, 1002, 1001, 1007, 993, - 1003, 996, 1006, 1000, 1008, 1003, 1008, 1004, 1009, 1005, - 1010, 1006, 1011, 1009, 1012, 1014, 1010, 1016, 1007, 1017, - 1012, 1015, 1015, 1019, 1022, 1017, 1020, 1020, 1021, 1014, - 1025, 1023, 1011, 1024, 1023, 1025, 1016, 1023, 1027, 1024, - 1021, 1026, 1028, 1027, 1022, 1029, 1030, 1019, 1029, 1023, - 1026, 1032, 1030, 1031, 1031, 1033, 1034, 1035, 1038, 1036, - 1037, 1040, 1040, 1035, 1036, 1039, 1037, 1028, 1041, 1032, - 1039, 1042, 1043, 1041, 1033, 1044, 1034, 1045, 1046, 1048, - 1047, 1038, 1049, 1050, 1051, 1048, 1052, 1054, 1054, 1042, + 998, 999, 1000, 1002, 1001, 993, 1000, 1005, 1002, 1004, + 1004, 1008, 999, 1006, 1007, 1007, 1008, 996, 1009, 1010, + 1011, 1012, 998, 1001, 1013, 1005, 1013, 1006, 1014, 1011, + 1015, 1016, 1019, 1014, 1017, 1021, 1015, 1024, 1009, 1010, + 1017, 1012, 1020, 1020, 1022, 1026, 1019, 1025, 1025, 1027, + 1022, 1016, 1028, 1029, 1021, 1028, 1033, 1026, 1028, 1029, + 1030, 1024, 1031, 1032, 1034, 1030, 1035, 1034, 1032, 1027, + 1028, 1031, 1035, 1036, 1036, 1037, 1038, 1039, 1040, 1043, + 1041, 1033, 1042, 1047, 1040, 1041, 1044, 1046, 1042, 1045, + 1045, 1044, 1046, 1037, 1048, 1038, 1049, 1039, 1050, 1051, - 1046, 1045, 1043, 1047, 1055, 1044, 1056, 1057, 1051, 1058, - 1062, 1056, 1049, 1050, 1059, 1060, 1058, 1052, 1064, 1065, - 1065, 1069, 1057, 1059, 1055, 1062, 1059, 1066, 1066, 1067, - 1062, 1060, 1067, 1068, 1071, 1070, 1072, 1069, 1068, 1076, - 1073, 1074, 1077, 1064, 1070, 1072, 1078, 1074, 1072, 1073, - 1075, 1075, 1079, 1071, 1080, 1077, 1081, 1083, 1084, 1076, - 1085, 1085, 1086, 1087, 1078, 1091, 1079, 1094, 1081, 1088, - 1080, 1095, 1087, 1094, 1088, 1090, 1084, 1100, 1086, 1089, - 1089, 1096, 1083, 1091, 1090, 1092, 1096, 1090, 1106, 1095, - 1092, 1092, 1097, 1098, 1089, 1101, 1102, 1100, 1097, 1098, + 1054, 1047, 1043, 1052, 1053, 1055, 1054, 1056, 1057, 1058, + 1060, 1060, 1050, 1051, 1048, 1052, 1049, 1053, 1061, 1062, + 1063, 1064, 1057, 1066, 1062, 1055, 1068, 1056, 1064, 1070, + 1058, 1065, 1071, 1071, 1075, 1063, 1072, 1072, 1061, 1066, + 1065, 1068, 1073, 1065, 1074, 1073, 1068, 1076, 1077, 1074, + 1075, 1078, 1079, 1080, 1070, 1082, 1076, 1081, 1081, 1080, + 1078, 1079, 1084, 1078, 1083, 1085, 1086, 1077, 1089, 1087, + 1090, 1091, 1091, 1092, 1093, 1082, 1097, 1083, 1100, 1085, + 1084, 1087, 1086, 1093, 1100, 1094, 1095, 1095, 1090, 1092, + 1094, 1096, 1098, 1089, 1097, 1101, 1103, 1098, 1098, 1102, - 1107, 1101, 1103, 1108, 1109, 1103, 1110, 1106, 1107, 1102, - 1112, 1103, 1111, 1113, 1115, 1115, 1108, 1116, 1111, 1117, - 1122, 1121, 1109, 1117, 1118, 1110, 1112, 1119, 1120, 1118, - 1121, 1113, 1119, 1120, 1124, 1125, 1125, 1116, 1126, 1127, - 1130, 1128, 1129, 1122, 1131, 1132, 1127, 1133, 1136, 1124, - 1131, 1136, 1126, 1128, 1129, 1134, 1287, 1132, 1287, 1130, - 1142, 1134, 1135, 1135, 1139, 1133, 1137, 1137, 1140, 1139, - 1141, 1141, 1142, 1143, 1144, 1145, 1146, 1140, 1143, 1147, - 1148, 1149, 1150, 1144, 1147, 1151, 1151, 1145, 1152, 1148, - 1153, 1146, 1159, 1154, 1152, 1155, 1157, 1150, 1156, 1156, + 1096, 1095, 1103, 1096, 1102, 1104, 1106, 1108, 1107, 1109, + 1112, 1104, 1109, 1101, 1107, 1113, 1115, 1114, 1109, 1116, + 1108, 1117, 1122, 1113, 1118, 1119, 1106, 1117, 1128, 1112, + 1114, 1121, 1121, 1123, 1115, 1136, 1124, 1123, 1116, 1125, + 1118, 1124, 1122, 1119, 1125, 1126, 1127, 1130, 1131, 1131, + 1126, 1128, 1132, 1133, 1136, 1127, 1134, 1135, 1137, 1138, + 1133, 1139, 1130, 1146, 1137, 1145, 1132, 1140, 1134, 1135, + 1145, 1138, 1146, 1140, 1141, 1141, 1148, 1142, 1150, 1139, + 1142, 1143, 1143, 1147, 1147, 1149, 1151, 1150, 1148, 1152, + 1149, 1153, 1154, 1155, 1156, 1159, 1153, 1158, 1151, 1157, - 1173, 1149, 1148, 1158, 1158, 1160, 1160, 1168, 1166, 52, - 1161, 1153, 1154, 1159, 1161, 1155, 1157, 1162, 1163, 1165, - 1173, 1163, 1167, 1162, 1174, 1165, 1166, 1172, 1167, 1169, - 1169, 1171, 1168, 1170, 1170, 1176, 1175, 1171, 1179, 1172, - 1172, 1172, 1175, 1178, 1174, 1180, 1172, 1182, 1178, 1178, - 1181, 1181, 1179, 1183, 1183, 1176, 1184, 1185, 1186, 1186, - 1187, 1187, 1190, 1191, 1191, 1192, 1180, 1193, 1194, 1195, - 1197, 1190, 1198, 1182, 1193, 51, 1184, 1194, 1200, 1185, - 1192, 1196, 1196, 1200, 1201, 1202, 1203, 1209, 1198, 1207, - 1201, 1204, 1205, 1203, 1207, 1195, 1197, 1204, 1205, 1206, + 1157, 1154, 1160, 1158, 1152, 1161, 1162, 1162, 1163, 1156, + 1164, 1164, 1165, 1155, 1154, 1167, 1159, 1166, 1166, 1167, + 1168, 1160, 1172, 1171, 1169, 1161, 1168, 1169, 1163, 1171, + 1173, 1174, 1175, 1165, 1179, 1175, 1173, 1176, 1176, 1178, + 1172, 1177, 1177, 1180, 1181, 1178, 1179, 1179, 1179, 1182, + 1183, 1186, 1185, 1179, 1187, 1182, 1174, 1185, 1185, 1188, + 1188, 1189, 1191, 1180, 1181, 1186, 1190, 1190, 1192, 1197, + 1183, 1193, 1193, 1194, 1194, 1187, 1198, 1198, 1197, 1199, + 1201, 1200, 1191, 1202, 1203, 1203, 1204, 1189, 1200, 1201, + 1192, 1205, 1207, 1208, 1199, 1209, 1210, 1207, 1211, 1208, - 1206, 1208, 1210, 1211, 1213, 1202, 1212, 1209, 1214, 1212, - 1208, 1215, 1215, 1216, 1219, 1211, 1217, 1220, 1222, 1221, - 1217, 1210, 1213, 1221, 1222, 1227, 1223, 1225, 1216, 1224, - 1224, 1228, 1220, 1219, 1214, 1223, 1217, 1229, 1225, 1226, - 1226, 1230, 1234, 1225, 1241, 1228, 1227, 1230, 1231, 1231, - 1232, 1235, 1233, 1236, 1238, 1232, 1232, 1229, 1233, 1236, - 1239, 1240, 1243, 1235, 1239, 1242, 1238, 1245, 1234, 1241, - 1244, 1242, 1247, 1240, 1251, 1247, 1244, 1248, 1248, 1245, - 1249, 1249, 1250, 1250, 1243, 1252, 1264, 1253, 1255, 1254, - 1260, 1252, 1253, 1257, 1251, 1254, 1259, 1255, 1257, 1259, + 1212, 1213, 1213, 1210, 1211, 1214, 1212, 1205, 1215, 1202, + 1214, 1216, 1204, 1217, 1218, 1209, 1219, 1215, 1220, 1219, + 1221, 1222, 1222, 1223, 1224, 1227, 1218, 1229, 1224, 1226, + 1228, 1216, 1217, 1229, 1228, 1235, 1220, 1234, 1223, 1236, + 1227, 1230, 1231, 1231, 1224, 1232, 1221, 1237, 1226, 1235, + 1230, 1233, 1233, 1237, 1238, 1238, 1232, 1239, 1234, 1236, + 1240, 1232, 1239, 1239, 1241, 1242, 1240, 1243, 1245, 1247, + 1246, 1248, 1249, 1243, 1246, 1250, 1251, 1242, 1249, 1252, + 1245, 1247, 1251, 1254, 1255, 1255, 1254, 1256, 1256, 1258, + 1241, 1252, 1257, 1257, 1259, 1261, 1248, 1250, 1260, 1262, - 1262, 1265, 1260, 1263, 1263, 1266, 1264, 1267, 1270, 1268, - 1265, 1269, 1262, 1268, 1270, 1271, 1269, 1274, 1273, 1273, - 1278, 1278, 1275, 1266, 1276, 1280, 1267, 1282, 1284, 1271, - 1273, 1275, 1283, 1276, 1284, 1274, 1285, 1286, 1286, 1288, - 1288, 1280, 1282, 1290, 1291, 1293, 1283, 1292, 1292, 1294, - 1290, 1295, 1298, 1285, 1293, 1296, 1297, 1299, 1307, 46, - 1300, 1302, 1303, 1295, 1291, 1315, 1300, 1296, 1297, 1305, - 1294, 1306, 1299, 1306, 1305, 1308, 1307, 1309, 1298, 1300, - 1308, 1302, 1303, 1311, 1309, 1313, 1314, 1314, 1316, 1320, - 1318, 1315, 1311, 1316, 1317, 1318, 1317, 1319, 1321, 1313, + 1259, 1261, 1264, 1260, 1267, 1269, 1271, 1264, 1262, 1258, + 1266, 1270, 1270, 1266, 1272, 1273, 1267, 1269, 1274, 1277, + 1275, 1278, 1276, 1272, 1275, 1277, 1271, 1276, 1280, 1280, + 1281, 1287, 1282, 1273, 1283, 1278, 1289, 1274, 1285, 1285, + 1280, 1282, 1290, 1283, 1291, 1292, 1296, 1287, 1281, 1299, + 1291, 1289, 1293, 1293, 1296, 1294, 1290, 1294, 1295, 1295, + 1298, 1301, 1292, 1300, 1300, 1302, 1303, 1298, 1304, 1299, + 1301, 1305, 1306, 1307, 1313, 1308, 1310, 1311, 1303, 1313, + 1304, 1308, 1314, 1305, 1314, 1315, 1302, 1316, 1307, 1323, + 1319, 1321, 1316, 1317, 1308, 1328, 1310, 1311, 1306, 1319, - 1322, 1324, 1319, 1323, 1325, 1327, 1322, 1320, 1323, 1328, - 1329, 1329, 1325, 1331, 1324, 1330, 1330, 1332, 1321, 1333, - 1335, 1334, 1335, 1328, 1327, 1333, 1334, 1336, 1331, 1337, - 1337, 1338, 1338, 1339, 1340, 1342, 1340, 1332, 1343, 1336, - 1341, 1341, 1339, 1345, 1342, 1339, 1346, 1348, 1345, 1349, - 1343, 1346, 1350, 1353, 1357, 1351, 1355, 1356, 1358, 1353, - 1348, 1362, 1355, 1359, 1359, 1360, 1368, 1358, 1365, 1349, - 1350, 1351, 1356, 1363, 1360, 1361, 1361, 1363, 1364, 1357, - 1362, 1365, 1366, 1364, 1367, 1372, 1368, 1366, 1366, 1371, - 1371, 1375, 1367, 1376, 1372, 1373, 1373, 1374, 1374, 1377, + 1317, 1322, 1322, 1315, 1324, 1321, 1325, 1326, 1325, 1324, + 1329, 1327, 1326, 1328, 1330, 1323, 1327, 1331, 1332, 1333, + 1330, 1335, 1331, 1336, 1337, 1337, 1339, 1333, 1338, 1338, + 1329, 1332, 1340, 1341, 1343, 1344, 1343, 1336, 1342, 1341, + 1335, 1339, 1347, 1342, 1345, 1345, 1351, 1344, 1346, 1346, + 1350, 1347, 1340, 1348, 1347, 1348, 1349, 1349, 1351, 1350, + 1353, 1354, 1356, 1357, 1358, 1353, 1354, 1361, 1359, 1365, + 1363, 1364, 1366, 1361, 1370, 1356, 1363, 1367, 1367, 1368, + 1372, 1366, 1358, 1357, 1359, 1372, 1364, 1371, 1368, 1369, + 1369, 1371, 1373, 1370, 1365, 1374, 1375, 1376, 1379, 1379, - 1381, 1378, 1384, 1375, 1382, 1377, 1378, 1379, 1379, 1382, - 1383, 1376, 1386, 1385, 1390, 1387, 1391, 1384, 1385, 1388, - 1388, 1391, 1389, 1392, 1393, 1381, 1389, 1395, 1396, 1390, - 1386, 1387, 1397, 1383, 1398, 1400, 1399, 1401, 1403, 1403, - 1406, 1404, 1405, 1393, 1404, 1425, 1395, 1400, 1407, 1392, - 1425, 1396, 1411, 1398, 1406, 1405, 1397, 1399, 1401, 1408, - 1408, 1407, 1409, 1409, 1410, 1410, 1412, 1411, 1413, 1413, - 1418, 1414, 1415, 1415, 1416, 1416, 1417, 1417, 1420, 1412, - 1414, 1419, 1419, 1414, 1421, 1421, 1422, 1422, 1423, 1418, - 1426, 1426, 1427, 1428, 1428, 1429, 1420, 1430, 1431, 1432, + 1374, 1374, 1380, 1383, 1375, 1373, 1381, 1381, 1382, 1382, + 1384, 1380, 1385, 1389, 1386, 1383, 1391, 1376, 1385, 1386, + 1387, 1387, 1390, 1394, 1393, 1392, 1395, 1390, 1384, 1393, + 1396, 1396, 1397, 1398, 1400, 1401, 1397, 1403, 1389, 1391, + 1392, 1394, 1395, 1404, 1399, 1405, 1406, 1407, 1398, 1399, + 1408, 1409, 1411, 1520, 1401, 1520, 1403, 1412, 1412, 1415, + 1400, 1413, 1408, 1414, 1413, 1406, 1404, 1411, 1407, 1405, + 1416, 1420, 1409, 1415, 1417, 1417, 1414, 1418, 1418, 1419, + 1419, 1421, 1427, 1416, 1422, 1422, 1420, 1423, 1424, 1424, + 1425, 1425, 1426, 1426, 1421, 1429, 1423, 1428, 1428, 1423, - 1432, 1431, 1434, 1430, 1433, 1433, 1436, 1423, 1435, 1437, - 1437, 1427, 1439, 1429, 1440, 1432, 1441, 1444, 1442, 1443, - 1443, 1434, 1442, 1435, 1446, 1436, 1445, 1445, 1447, 1448, - 1450, 1441, 1439, 1449, 1449, 1447, 1444, 1440, 1452, 1450, - 1453, 1454, 1456, 1455, 1446, 1453, 1457, 1458, 1460, 1459, - 1452, 1457, 1458, 1461, 1462, 1448, 1455, 1460, 1466, 1463, - 1468, 1516, 1461, 1456, 1459, 1463, 1454, 1464, 1462, 1468, - 1470, 1464, 1469, 1469, 1471, 1471, 1470, 1472, 1466, 1474, - 1475, 1477, 1479, 1471, 1481, 1479, 1480, 1516, 1482, 1475, - 1490, 1480, 1486, 1477, 1474, 1483, 1483, 1472, 1488, 1472, + 1432, 1427, 1430, 1430, 1431, 1431, 1434, 1435, 1435, 1436, + 1439, 1434, 1438, 1429, 1437, 1437, 1439, 1440, 1444, 1432, + 1440, 1441, 1441, 1442, 1442, 1443, 1445, 1448, 1436, 1449, + 1438, 1446, 1446, 1444, 1450, 1451, 1453, 1441, 1455, 1451, + 1452, 1452, 1454, 1454, 1443, 1445, 1456, 1448, 1457, 1450, + 1458, 1458, 1449, 1456, 1459, 1453, 1461, 1462, 1455, 1463, + 1464, 1465, 1462, 1459, 1466, 1467, 1468, 1469, 1461, 1466, + 1467, 1470, 1471, 1464, 1457, 1473, 1469, 1472, 1475, 1473, + 1470, 1468, 1465, 1472, 1463, 1477, 1471, 1478, 1478, 1479, + 1480, 1480, 1481, 1483, 1477, 1479, 1484, 1486, 1475, 1480, - 1482, 1485, 1485, 1489, 1481, 1497, 1486, 1487, 1487, 1490, - 1488, 1491, 1491, 1494, 1493, 1498, 1494, 1489, 1493, 1495, - 1495, 1496, 1499, 1500, 1501, 1497, 1496, 1500, 1502, 1506, - 41, 1503, 1504, 1502, 1507, 1498, 1499, 1503, 1504, 1507, - 1508, 1509, 1513, 1538, 1501, 1506, 1508, 1523, 1510, 1509, - 1510, 1514, 1514, 1534, 1515, 1538, 1513, 1515, 1517, 1517, - 1521, 1521, 1526, 1527, 1527, 1523, 1531, 1526, 1529, 1529, - 1532, 1532, 1531, 1533, 1535, 1534, 1537, 1539, 1539, 1535, - 1542, 1541, 1543, 1544, 1546, 1546, 1542, 1548, 1548, 1533, - 1541, 1549, 1549, 1552, 1550, 1537, 1558, 1553, 1544, 1550, + 1488, 1489, 1490, 1488, 1491, 1484, 1489, 1495, 1483, 1486, + 1492, 1492, 1481, 1497, 1481, 1498, 1491, 1494, 1494, 1496, + 1496, 1495, 1490, 1499, 1502, 1497, 1500, 1500, 1502, 1498, + 1503, 1504, 1504, 1503, 1505, 1506, 1507, 1508, 1510, 1505, + 1509, 1511, 1499, 1512, 1509, 1514, 1511, 1513, 1516, 1512, + 1526, 1508, 1517, 1513, 1518, 1506, 1507, 1517, 1510, 1519, + 1518, 1523, 1533, 1514, 1516, 1524, 1524, 1519, 1525, 1527, + 1527, 1525, 1531, 1531, 1536, 1523, 1526, 1537, 1537, 1536, + 1533, 1539, 1539, 1541, 1542, 1542, 1543, 1544, 1545, 1541, + 1551, 1547, 1548, 1545, 1549, 1549, 1553, 1552, 1554, 1551, - 1543, 1551, 1553, 1551, 1554, 1554, 1557, 1552, 1555, 1555, - 1556, 1556, 1559, 1559, 1558, 1560, 1561, 1562, 1557, 1563, - 1564, 1565, 1565, 1566, 1563, 1567, 1568, 1560, 1561, 1562, - 1569, 1570, 1566, 1571, 1572, 1572, 1573, 1575, 1574, 1576, - 1564, 1578, 1578, 1569, 1576, 1573, 1568, 1571, 1577, 1579, - 1579, 1567, 1583, 1577, 1585, 1570, 1574, 1580, 1580, 1575, - 1584, 1586, 1587, 1588, 1589, 1590, 1590, 1592, 1592, 1594, - 1593, 1587, 1583, 1595, 1596, 1597, 1585, 1598, 1584, 1593, - 1595, 1586, 1589, 1588, 1599, 1600, 1602, 1594, 1603, 1596, - 1601, 1601, 1602, 1597, 1604, 1598, 1605, 1606, 1607, 1608, + 1556, 1556, 1543, 1552, 1548, 1558, 1558, 1559, 1559, 1544, + 1547, 1560, 1562, 1554, 1553, 1561, 1560, 1561, 1563, 1564, + 1564, 1565, 1565, 1563, 1566, 1566, 1562, 1567, 1568, 1569, + 1569, 1570, 1571, 1572, 1574, 1573, 1575, 1575, 1576, 1567, + 1573, 1577, 1578, 1570, 1571, 1572, 1568, 1576, 1579, 1580, + 1581, 1582, 1582, 1584, 1574, 1585, 1583, 52, 1586, 1588, + 1588, 1579, 1578, 1586, 1581, 1583, 1593, 1577, 1595, 1587, + 1594, 1584, 1596, 1580, 1587, 1589, 1589, 1585, 1590, 1590, + 1597, 1598, 1599, 1600, 1600, 1604, 1593, 1603, 1594, 1597, + 1595, 1605, 1596, 1602, 1602, 1606, 1603, 1607, 1605, 1608, - 1599, 1612, 1606, 1609, 1600, 1610, 1603, 1610, 1609, 1604, - 1612, 1613, 1616, 1617, 1619, 1605, 1617, 1620, 1607, 1608, - 1618, 1618, 1621, 1621, 1622, 1624, 1627, 1625, 1622, 1619, - 1613, 1625, 1616, 1626, 1626, 1620, 1629, 1629, 1632, 1627, - 1624, 1631, 1631, 1633, 1633, 1634, 1634, 1638, 1638, 1639, - 1640, 1641, 1647, 1642, 1643, 1644, 1645, 1632, 1642, 1643, - 1641, 1648, 1650, 1640, 1645, 1649, 1648, 1647, 1651, 1651, - 1649, 1639, 1652, 1652, 1644, 1653, 1654, 1650, 1655, 1661, - 1656, 1654, 1653, 14, 1655, 1656, 1657, 1657, 1658, 1658, - 1662, 1663, 1661, 1664, 1665, 1663, 1662, 1666, 1664, 1667, + 1599, 1598, 1609, 1604, 1610, 1611, 1611, 1612, 1612, 1614, + 1606, 1615, 1616, 1613, 1618, 1607, 1617, 1608, 1609, 1613, + 1619, 1617, 1627, 1610, 1620, 1624, 1615, 1614, 1621, 1620, + 1621, 1616, 1623, 1628, 1618, 1630, 1628, 1629, 1629, 1631, + 1619, 1623, 1627, 1633, 1624, 1632, 1632, 1633, 1635, 1636, + 1630, 1637, 1637, 1636, 1638, 1640, 1640, 1631, 1642, 1642, + 1643, 1644, 1644, 1635, 1645, 1645, 1650, 1638, 1649, 1649, + 1651, 1652, 1653, 1654, 1655, 1658, 1656, 1653, 1654, 1643, + 1652, 1659, 1660, 1651, 1656, 1661, 1659, 1660, 1650, 1664, + 1658, 1662, 1662, 1655, 1663, 1663, 1664, 1665, 1666, 1672, - 1668, 1669, 1673, 1665, 1674, 1668, 1671, 1667, 1680, 1671, - 1672, 1681, 1666, 1669, 1675, 1672, 1676, 1674, 1677, 1677, - 1673, 1678, 1682, 1675, 1684, 1676, 1685, 1680, 1683, 1683, - 1678, 1681, 1686, 1687, 1687, 1685, 1688, 1691, 1689, 1690, - 1690, 1682, 1689, 1684, 1692, 1691, 1695, 1686, 1694, 1692, - 1697, 1698, 1699, 1707, 1697, 1688, 1714, 1694, 1716, 1695, - 1701, 1701, 1704, 1704, 1716, 1698, 13, 1699, 1708, 1708, - 1709, 1709, 1710, 1707, 1714, 1710, 1711, 1711, 1712, 1712, - 1713, 1713, 1715, 1717, 1717, 1718, 1721, 1722, 1723, 1718, - 1727, 1721, 1721, 1724, 1723, 1727, 1715, 1728, 1729, 1724, + 1661, 1667, 1665, 1677, 1666, 1673, 1667, 1668, 1668, 1669, + 1669, 1673, 1672, 1674, 1675, 1676, 1679, 1674, 1677, 1675, + 1678, 1679, 1680, 1682, 1676, 1683, 1682, 1684, 1678, 1685, + 1683, 1686, 1687, 1692, 1680, 1688, 1688, 1689, 1693, 1698, + 1686, 1687, 1685, 1694, 1696, 1684, 1689, 1695, 1695, 1700, + 1697, 51, 1692, 1701, 1698, 1699, 1699, 1701, 1693, 1697, + 1702, 1702, 1694, 1696, 1703, 1704, 1706, 1707, 1700, 1709, + 1704, 1710, 1703, 1709, 1711, 1706, 1713, 1713, 1716, 1716, + 1707, 1719, 1720, 1720, 1726, 1710, 1721, 1721, 1722, 1711, + 1727, 1722, 1723, 1723, 1724, 1724, 1725, 1725, 1734, 1728, - 1730, 1731, 1732, 1729, 1733, 1733, 1734, 1736, 1740, 1735, - 1722, 1737, 1737, 1742, 1728, 1728, 1732, 1735, 1730, 1738, - 1738, 1731, 1739, 1739, 1740, 1734, 1736, 1741, 1743, 1744, - 1745, 1746, 1741, 1742, 1748, 1748, 1749, 1750, 1744, 1749, - 1752, 1752, 1753, 1755, 1756, 1756, 1761, 1753, 1757, 1758, - 1745, 1746, 1757, 1759, 1743, 1750, 1762, 1760, 1758, 1761, - 1764, 1755, 1760, 1760, 1765, 1762, 1767, 1771, 1759, 1764, - 1772, 1772, 1771, 1773, 1775, 1780, 1765, 1776, 1776, 1775, - 1779, 1776, 1773, 1778, 1778, 1782, 1781, 1784, 1783, 1779, - 1785, 1767, 1781, 1783, 1786, 1780, 1785, 1787, 1787, 1789, + 46, 1719, 1726, 1743, 1727, 1728, 1729, 1729, 1730, 1733, + 1735, 1736, 1730, 1739, 1733, 1733, 1735, 1736, 1739, 1740, + 1741, 1734, 1742, 1743, 1744, 1741, 1745, 1745, 1746, 1748, + 1752, 1747, 1749, 1749, 1750, 1750, 1740, 1740, 1744, 1747, + 1742, 1751, 1751, 1754, 1753, 1755, 1752, 1746, 1748, 1753, + 1756, 1762, 1757, 1758, 1760, 1760, 1767, 1761, 41, 1756, + 1761, 1764, 1764, 1754, 1769, 1765, 1768, 1768, 1769, 1762, + 1765, 1755, 1757, 1758, 1767, 1770, 1771, 1772, 1774, 1773, + 1776, 1777, 1772, 1772, 1770, 1779, 14, 1774, 1792, 1776, + 1783, 1771, 1773, 1777, 1785, 1783, 1784, 1784, 1794, 1787, - 1790, 1791, 1791, 1792, 1793, 1784, 1782, 1795, 1793, 1796, - 1799, 1794, 1798, 1797, 1801, 1790, 1792, 1798, 1789, 1786, - 1794, 1797, 1810, 1795, 1800, 1800, 1803, 1803, 1796, 1804, - 1804, 1806, 1806, 1801, 1807, 1811, 1799, 1809, 1809, 1807, - 1812, 1815, 1810, 1814, 1814, 1816, 1817, 1817, 1818, 1818, - 1819, 1820, 1821, 1822, 1822, 1815, 1826, 1823, 1811, 1812, - 1823, 1824, 1824, 1820, 1827, 1832, 1829, 1816, 1826, 1819, - 1828, 1829, 1821, 1828, 1830, 1831, 1833, 1833, 1835, 1835, - 1836, 1831, 1832, 1832, 1827, 1838, 1838, 1839, 1840, 1841, - 1842, 1842, 1839, 1830, 1841, 1843, 1843, 1844, 1844, 1836, + 1791, 1788, 1788, 1785, 1787, 1788, 1790, 1790, 1792, 1791, + 1779, 1793, 1796, 1795, 1797, 1798, 1801, 1793, 1795, 1794, + 1797, 1799, 1799, 1802, 1803, 1803, 1804, 1805, 1806, 1807, + 1796, 1805, 1808, 1809, 1811, 1801, 1813, 1806, 1802, 1804, + 1798, 1809, 1810, 1812, 1812, 1807, 1822, 1810, 1815, 1815, + 1823, 1808, 1816, 1816, 1819, 1813, 1818, 1818, 1824, 1819, + 1811, 1821, 1821, 1826, 1826, 1827, 1822, 1828, 1829, 1829, + 1830, 1830, 1831, 1823, 1832, 1833, 1838, 1824, 1839, 1827, + 1834, 1834, 1835, 1836, 1836, 1835, 1832, 1840, 1838, 1828, + 1840, 1831, 1841, 1842, 1843, 1833, 1844, 1841, 1839, 1848, - 1845, 1854, 1840, 1847, 1847, 1845, 1851, 1851, 1853, 1853, - 1855, 1856, 1857, 1857, 1858, 1854, 1861, 1862, 1862, 1858, - 1856, 1863, 1865, 1866, 1861, 1868, 1863, 1867, 1869, 1870, - 1855, 0, 1867, 1871, 1872, 1873, 1869, 1868, 1877, 1874, - 1879, 1879, 1865, 1866, 1874, 1880, 1880, 1870, 1890, 1871, - 1881, 1872, 1872, 1887, 1881, 1891, 1873, 1887, 1877, 1885, - 1885, 1889, 1889, 1893, 1893, 1894, 1890, 1896, 1897, 1891, - 1898, 1898, 1899, 1899, 1900, 1900, 1901, 1897, 1902, 1903, - 1894, 1901, 1905, 1904, 1906, 1896, 1907, 1905, 1915, 1906, - 1908, 1908, 1911, 1911, 1903, 1913, 1913, 1915, 1916, 1916, + 1843, 1845, 1845, 1847, 1847, 1850, 1850, 1852, 1854, 1854, + 1851, 1853, 1842, 1844, 1844, 1851, 1853, 1867, 1848, 1855, + 1855, 1852, 1856, 1856, 1857, 1859, 1859, 1863, 1863, 1857, + 1865, 1865, 1866, 1868, 1869, 1869, 1870, 1867, 1877, 1873, + 1875, 1870, 1868, 1874, 1874, 1875, 1866, 1873, 1878, 1879, + 1880, 1881, 1882, 1883, 1879, 1884, 1885, 13, 1877, 1881, + 1886, 1889, 1880, 1891, 1891, 1886, 1892, 1892, 1878, 1883, + 1882, 1893, 1884, 1884, 1902, 1893, 1899, 1885, 1897, 1897, + 1899, 1889, 1901, 1901, 1903, 1905, 1905, 1906, 1908, 1914, + 1909, 1941, 1902, 1910, 1910, 1911, 1911, 1915, 1903, 1909, - 1918, 1919, 1919, 1902, 1904, 1907, 1920, 1921, 1921, 1925, - 1924, 1926, 1918, 1924, 1927, 1925, 1928, 1930, 1929, 1927, - 1934, 1920, 1936, 1934, 1937, 1926, 1936, 1938, 1940, 1941, - 1942, 1944, 1943, 1930, 1945, 1928, 1929, 1946, 1947, 1940, - 0, 1938, 1941, 1954, 1937, 1948, 1948, 1944, 1949, 1942, - 1943, 0, 1946, 1950, 1950, 1951, 1951, 1949, 1947, 1945, - 1952, 1953, 1955, 1956, 1957, 1952, 1953, 1960, 1954, 1956, - 1958, 1958, 1963, 1964, 1965, 1966, 1968, 1955, 1957, 1964, - 1965, 1967, 1960, 1970, 1971, 1972, 1973, 1974, 1975, 1966, - 1977, 1963, 1982, 1975, 1967, 1968, 1976, 1970, 1972, 1973, + 1912, 1912, 1906, 1913, 1916, 1917, 1908, 1919, 1913, 1941, + 1917, 1918, 1915, 0, 1914, 1927, 1918, 1920, 1920, 1923, + 1923, 1925, 1925, 1930, 1927, 1916, 1919, 1928, 1928, 1931, + 1931, 1932, 1933, 1933, 1936, 1930, 1937, 1936, 1938, 1939, + 1940, 1942, 1937, 1948, 1939, 1946, 1932, 1948, 1946, 1949, + 1950, 1952, 1938, 1953, 1954, 1956, 1955, 1942, 1957, 1940, + 1958, 1959, 1952, 1961, 1950, 1964, 1953, 1960, 1960, 1949, + 1964, 1956, 1961, 1954, 1955, 1958, 1962, 1962, 1963, 1963, + 1965, 1959, 1966, 1957, 1967, 1965, 1968, 1969, 1970, 1970, + 1972, 1975, 1968, 1979, 1976, 1978, 1977, 1980, 1982, 1967, - 1986, 1976, 1979, 1971, 1978, 1978, 1974, 1979, 1980, 1977, - 1981, 1982, 1983, 1980, 1985, 1981, 1984, 1984, 1983, 1986, - 1987, 1985, 1988, 1989, 1990, 1992, 1993, 1994, 1988, 1997, - 1992, 1995, 1996, 1996, 1997, 1998, 2003, 1990, 2001, 1987, - 1999, 1999, 1989, 2001, 1995, 1993, 1994, 2000, 2000, 2002, - 2004, 2004, 2005, 2006, 1998, 2003, 2002, 2007, 2008, 2005, - 2006, 2009, 2011, 2008, 2012, 2013, 2014, 2011, 2016, 2012, - 2015, 2015, 2017, 2018, 2018, 2020, 2007, 2019, 2019, 2023, - 2009, 2029, 2020, 2030, 2013, 2014, 2023, 2016, 2021, 2021, - 2025, 2017, 2022, 2022, 2028, 2025, 2031, 2031, 0, 2028, + 1976, 1969, 1977, 1983, 1984, 1972, 1979, 1966, 1985, 1978, + 1975, 1986, 1982, 1987, 1988, 1989, 1980, 1984, 1987, 1988, + 1991, 1985, 1983, 1990, 1990, 1991, 1992, 1993, 1994, 1995, + 1986, 1992, 1993, 1997, 1989, 1995, 1996, 1996, 1998, 1999, + 1997, 2001, 2000, 2002, 2004, 2005, 2006, 1994, 2000, 2004, + 2007, 2008, 2008, 2010, 2009, 2015, 2002, 1998, 1999, 2009, + 2001, 2011, 2011, 2007, 2005, 2006, 2012, 2012, 2013, 2014, + 2016, 2016, 2010, 2013, 2015, 2017, 2014, 2018, 2019, 2021, + 2020, 2023, 2017, 2024, 2018, 2020, 2023, 2025, 2024, 2026, + 2027, 2027, 2028, 2029, 2030, 2030, 2032, 2019, 2021, 2031, - 2029, 0, 2030, 2032, 2032, 2036, 2036, 2036, 2036, 2036, - 2036, 2036, 2037, 2037, 2037, 2037, 2037, 2037, 2037, 2038, - 2038, 2038, 2038, 2038, 2038, 2038, 2039, 2039, 2039, 2039, - 2039, 2039, 2039, 2040, 2040, 2040, 2040, 2040, 2040, 2040, - 2042, 2042, 0, 2042, 2042, 2042, 2042, 2043, 2043, 0, - 0, 0, 2043, 2043, 2044, 2044, 0, 0, 2044, 0, - 2044, 2045, 0, 0, 0, 0, 0, 2045, 2046, 2046, - 0, 0, 0, 2046, 2046, 2047, 0, 0, 0, 0, - 0, 2047, 2048, 2048, 0, 2048, 2048, 2048, 2048, 2049, - 2049, 0, 2049, 2049, 2049, 2049, 2035, 2035, 2035, 2035, + 2031, 2033, 2033, 2032, 2034, 2034, 2025, 2035, 2026, 2041, + 2037, 2028, 2029, 2040, 2035, 2037, 2042, 0, 2040, 2043, + 2043, 2044, 2044, 0, 0, 0, 0, 0, 2041, 0, + 0, 0, 0, 0, 0, 2042, 2048, 2048, 2048, 2048, + 2048, 2048, 2048, 2049, 2049, 2049, 2049, 2049, 2049, 2049, + 2050, 2050, 2050, 2050, 2050, 2050, 2050, 2051, 2051, 2051, + 2051, 2051, 2051, 2051, 2052, 2052, 2052, 2052, 2052, 2052, + 2052, 2054, 2054, 0, 2054, 2054, 2054, 2054, 2055, 2055, + 0, 0, 0, 2055, 2055, 2056, 2056, 0, 0, 2056, + 0, 2056, 2057, 0, 0, 0, 0, 0, 2057, 2058, - 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, - 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, - 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, 2035, - 2035, 2035, 2035, 2035, 2035, 2035, 2035 + 2058, 0, 0, 0, 2058, 2058, 2059, 0, 0, 0, + 0, 0, 2059, 2060, 2060, 0, 2060, 2060, 2060, 2060, + 2061, 2061, 0, 2061, 2061, 2061, 2061, 2047, 2047, 2047, + 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, + 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, + 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, + 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047 } ; static yy_state_type yy_last_accepting_state; @@ -2217,7 +2228,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 2219 "" +#line 2230 "" #define INITIAL 0 #define quotedstring 1 @@ -2440,7 +2451,7 @@ YY_DECL { #line 207 "./util/configlexer.lex" -#line 2442 "" +#line 2453 "" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -2473,13 +2484,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 >= 2036 ) + if ( yy_current_state >= 2048 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 3997 ); + while ( yy_base[yy_current_state] != 4028 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2979,515 +2990,520 @@ YY_RULE_SETUP case 95: YY_RULE_SETUP #line 305 "./util/configlexer.lex" -{ YDVAR(1, VAR_IDENTITY) } +{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) } YY_BREAK case 96: YY_RULE_SETUP #line 306 "./util/configlexer.lex" -{ YDVAR(1, VAR_VERSION) } +{ YDVAR(1, VAR_IDENTITY) } YY_BREAK case 97: YY_RULE_SETUP #line 307 "./util/configlexer.lex" -{ YDVAR(1, VAR_MODULE_CONF) } +{ YDVAR(1, VAR_VERSION) } YY_BREAK case 98: YY_RULE_SETUP #line 308 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR) } +{ YDVAR(1, VAR_MODULE_CONF) } YY_BREAK case 99: YY_RULE_SETUP #line 309 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR) } YY_BREAK case 100: YY_RULE_SETUP #line 310 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } YY_BREAK case 101: YY_RULE_SETUP #line 311 "./util/configlexer.lex" -{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } YY_BREAK case 102: YY_RULE_SETUP #line 312 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } +{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } YY_BREAK case 103: YY_RULE_SETUP #line 313 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR) } +{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } YY_BREAK case 104: YY_RULE_SETUP #line 314 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } +{ YDVAR(1, VAR_TRUST_ANCHOR) } YY_BREAK case 105: YY_RULE_SETUP #line 315 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } +{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 106: YY_RULE_SETUP #line 316 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 107: YY_RULE_SETUP #line 317 "./util/configlexer.lex" -{ YDVAR(1, VAR_BOGUS_TTL) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 108: YY_RULE_SETUP #line 318 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } +{ YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 109: YY_RULE_SETUP #line 319 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } +{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 110: YY_RULE_SETUP #line 320 "./util/configlexer.lex" -{ YDVAR(1, VAR_IGNORE_CD_FLAG) } +{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 111: YY_RULE_SETUP #line 321 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED) } +{ YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 112: YY_RULE_SETUP #line 322 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_DSA) } +{ YDVAR(1, VAR_SERVE_EXPIRED) } YY_BREAK case 113: YY_RULE_SETUP #line 323 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_SHA1) } +{ YDVAR(1, VAR_FAKE_DSA) } YY_BREAK case 114: YY_RULE_SETUP #line 324 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_LOG_LEVEL) } +{ YDVAR(1, VAR_FAKE_SHA1) } YY_BREAK case 115: YY_RULE_SETUP #line 325 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SIZE) } +{ YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 116: YY_RULE_SETUP #line 326 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SLABS) } +{ YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 117: YY_RULE_SETUP #line 327 "./util/configlexer.lex" -{ YDVAR(1, VAR_NEG_CACHE_SIZE) } +{ YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 118: YY_RULE_SETUP #line 328 "./util/configlexer.lex" -{ - YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +{ YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 119: YY_RULE_SETUP -#line 330 "./util/configlexer.lex" -{ YDVAR(1, VAR_ADD_HOLDDOWN) } +#line 329 "./util/configlexer.lex" +{ + YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 120: YY_RULE_SETUP #line 331 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEL_HOLDDOWN) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 121: YY_RULE_SETUP #line 332 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEEP_MISSING) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 122: YY_RULE_SETUP #line 333 "./util/configlexer.lex" -{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 123: YY_RULE_SETUP #line 334 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } YY_BREAK case 124: YY_RULE_SETUP #line 335 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_IDENTITY) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 125: YY_RULE_SETUP #line 336 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_LOG_IDENTITY) } YY_BREAK case 126: YY_RULE_SETUP #line 337 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_QUERIES) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 127: YY_RULE_SETUP #line 338 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_REPLIES) } +{ YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 128: YY_RULE_SETUP #line 339 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_LOG_REPLIES) } YY_BREAK case 129: YY_RULE_SETUP #line 340 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 130: YY_RULE_SETUP #line 341 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 131: YY_RULE_SETUP #line 342 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 132: YY_RULE_SETUP #line 343 "./util/configlexer.lex" -{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } +{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } YY_BREAK case 133: YY_RULE_SETUP #line 344 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } YY_BREAK case 134: YY_RULE_SETUP #line 345 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 135: YY_RULE_SETUP #line 346 "./util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 136: YY_RULE_SETUP #line 347 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_ENABLE) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 137: YY_RULE_SETUP #line 348 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_KEY) } +{ YDVAR(1, VAR_SHM_ENABLE) } YY_BREAK case 138: YY_RULE_SETUP #line 349 "./util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_SHM_KEY) } YY_BREAK case 139: YY_RULE_SETUP #line 350 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 140: YY_RULE_SETUP #line 351 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 141: YY_RULE_SETUP #line 352 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 142: YY_RULE_SETUP #line 353 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_USE_CERT) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 143: YY_RULE_SETUP #line 354 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_USE_CERT) } YY_BREAK case 144: YY_RULE_SETUP #line 355 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 145: YY_RULE_SETUP #line 356 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 146: YY_RULE_SETUP #line 357 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 147: YY_RULE_SETUP #line 358 "./util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 148: YY_RULE_SETUP #line 359 "./util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 149: YY_RULE_SETUP #line 360 "./util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 150: YY_RULE_SETUP #line 361 "./util/configlexer.lex" -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 151: YY_RULE_SETUP #line 362 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 152: YY_RULE_SETUP #line 363 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 153: YY_RULE_SETUP #line 364 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_PREFIX) } +{ YDVAR(1, VAR_MAX_UDP_SIZE) } YY_BREAK case 154: YY_RULE_SETUP #line 365 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_SYNTHALL) } +{ YDVAR(1, VAR_DNS64_PREFIX) } YY_BREAK case 155: YY_RULE_SETUP #line 366 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEFINE_TAG) } +{ YDVAR(1, VAR_DNS64_SYNTHALL) } YY_BREAK case 156: YY_RULE_SETUP #line 367 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } +{ YDVAR(1, VAR_DEFINE_TAG) } YY_BREAK case 157: YY_RULE_SETUP #line 368 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } +{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } YY_BREAK case 158: YY_RULE_SETUP #line 369 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } +{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } YY_BREAK case 159: YY_RULE_SETUP #line 370 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } YY_BREAK case 160: YY_RULE_SETUP #line 371 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } YY_BREAK case 161: YY_RULE_SETUP #line 372 "./util/configlexer.lex" -{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } +{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } YY_BREAK case 162: YY_RULE_SETUP #line 373 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSTAP) } +{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } YY_BREAK case 163: YY_RULE_SETUP #line 374 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_ENABLE) } +{ YDVAR(0, VAR_DNSTAP) } YY_BREAK case 164: YY_RULE_SETUP #line 375 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } +{ YDVAR(1, VAR_DNSTAP_ENABLE) } YY_BREAK case 165: YY_RULE_SETUP #line 376 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } YY_BREAK case 166: YY_RULE_SETUP #line 377 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } +{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } YY_BREAK case 167: YY_RULE_SETUP #line 378 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } YY_BREAK case 168: YY_RULE_SETUP #line 379 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_VERSION) } +{ YDVAR(1, VAR_DNSTAP_IDENTITY) } YY_BREAK case 169: YY_RULE_SETUP #line 380 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } +{ YDVAR(1, VAR_DNSTAP_VERSION) } YY_BREAK case 170: YY_RULE_SETUP -#line 382 "./util/configlexer.lex" +#line 381 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } YY_BREAK case 171: YY_RULE_SETUP -#line 384 "./util/configlexer.lex" +#line 383 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } YY_BREAK case 172: YY_RULE_SETUP -#line 386 "./util/configlexer.lex" +#line 385 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } YY_BREAK case 173: YY_RULE_SETUP -#line 388 "./util/configlexer.lex" +#line 387 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } YY_BREAK case 174: YY_RULE_SETUP -#line 390 "./util/configlexer.lex" +#line 389 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } YY_BREAK case 175: YY_RULE_SETUP -#line 392 "./util/configlexer.lex" -{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } +#line 391 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } YY_BREAK case 176: YY_RULE_SETUP #line 393 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT) } +{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } YY_BREAK case 177: YY_RULE_SETUP #line 394 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT) } +{ YDVAR(1, VAR_IP_RATELIMIT) } YY_BREAK case 178: YY_RULE_SETUP #line 395 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_RATELIMIT) } YY_BREAK case 179: YY_RULE_SETUP #line 396 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } YY_BREAK case 180: YY_RULE_SETUP #line 397 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_RATELIMIT_SLABS) } YY_BREAK case 181: YY_RULE_SETUP #line 398 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } YY_BREAK case 182: YY_RULE_SETUP #line 399 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } +{ YDVAR(1, VAR_RATELIMIT_SIZE) } YY_BREAK case 183: YY_RULE_SETUP #line 400 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } +{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } YY_BREAK case 184: YY_RULE_SETUP #line 401 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } +{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 185: YY_RULE_SETUP #line 402 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_FACTOR) } +{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } YY_BREAK case 186: YY_RULE_SETUP #line 403 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_TAG) } +{ YDVAR(1, VAR_RATELIMIT_FACTOR) } YY_BREAK case 187: YY_RULE_SETUP #line 404 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP) } +{ YDVAR(2, VAR_RESPONSE_IP_TAG) } YY_BREAK case 188: YY_RULE_SETUP #line 405 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_DATA) } +{ YDVAR(2, VAR_RESPONSE_IP) } YY_BREAK case 189: -/* rule 189 can match eol */ YY_RULE_SETUP #line 406 "./util/configlexer.lex" +{ YDVAR(2, VAR_RESPONSE_IP_DATA) } + YY_BREAK +case 190: +/* rule 190 can match eol */ +YY_RULE_SETUP +#line 407 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 190: +case 191: YY_RULE_SETUP -#line 409 "./util/configlexer.lex" +#line 410 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 410 "./util/configlexer.lex" +#line 411 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 191: -YY_RULE_SETUP -#line 415 "./util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 192: -/* rule 192 can match eol */ YY_RULE_SETUP #line 416 "./util/configlexer.lex" +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } + YY_BREAK +case 193: +/* rule 193 can match eol */ +YY_RULE_SETUP +#line 417 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 193: +case 194: YY_RULE_SETUP -#line 418 "./util/configlexer.lex" +#line 419 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3500,34 +3516,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 194: +case 195: YY_RULE_SETUP -#line 430 "./util/configlexer.lex" +#line 431 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 431 "./util/configlexer.lex" +#line 432 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 195: -YY_RULE_SETUP -#line 436 "./util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 196: -/* rule 196 can match eol */ YY_RULE_SETUP #line 437 "./util/configlexer.lex" +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } + YY_BREAK +case 197: +/* rule 197 can match eol */ +YY_RULE_SETUP +#line 438 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 197: +case 198: YY_RULE_SETUP -#line 439 "./util/configlexer.lex" +#line 440 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3540,38 +3556,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 198: +case 199: YY_RULE_SETUP -#line 451 "./util/configlexer.lex" +#line 452 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 453 "./util/configlexer.lex" +#line 454 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 199: -YY_RULE_SETUP -#line 457 "./util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 200: -/* rule 200 can match eol */ YY_RULE_SETUP #line 458 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 201: +/* rule 201 can match eol */ YY_RULE_SETUP #line 459 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 202: YY_RULE_SETUP #line 460 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 203: +YY_RULE_SETUP +#line 461 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext); @@ -3579,27 +3595,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 465 "./util/configlexer.lex" +#line 466 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 203: -YY_RULE_SETUP -#line 469 "./util/configlexer.lex" -{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } - YY_BREAK case 204: -/* rule 204 can match eol */ YY_RULE_SETUP #line 470 "./util/configlexer.lex" +{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } + YY_BREAK +case 205: +/* rule 205 can match eol */ +YY_RULE_SETUP +#line 471 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 205: +case 206: YY_RULE_SETUP -#line 472 "./util/configlexer.lex" +#line 473 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -3609,7 +3625,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 478 "./util/configlexer.lex" +#line 479 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -3621,33 +3637,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 206: +case 207: YY_RULE_SETUP -#line 489 "./util/configlexer.lex" +#line 490 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 207: +case 208: YY_RULE_SETUP -#line 493 "./util/configlexer.lex" +#line 494 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 208: +case 209: YY_RULE_SETUP -#line 497 "./util/configlexer.lex" +#line 498 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 209: +case 210: YY_RULE_SETUP -#line 501 "./util/configlexer.lex" +#line 502 "./util/configlexer.lex" ECHO; YY_BREAK -#line 3649 "" +#line 3665 "" case YY_END_OF_BUFFER: { @@ -3938,7 +3954,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 >= 2036 ) + if ( yy_current_state >= 2048 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -3966,11 +3982,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 >= 2036 ) + if ( yy_current_state >= 2048 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 2035); + yy_is_jam = (yy_current_state == 2047); return yy_is_jam ? 0 : yy_current_state; } @@ -4609,7 +4625,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 501 "./util/configlexer.lex" +#line 502 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index bc7e21bf0..bd1572293 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -302,6 +302,7 @@ do-not-query-localhost{COLON} { YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } access-control{COLON} { YDVAR(2, VAR_ACCESS_CONTROL) } hide-identity{COLON} { YDVAR(1, VAR_HIDE_IDENTITY) } hide-version{COLON} { YDVAR(1, VAR_HIDE_VERSION) } +hide-trustanchor{COLON} { YDVAR(1, VAR_HIDE_TRUSTANCHOR) } identity{COLON} { YDVAR(1, VAR_IDENTITY) } version{COLON} { YDVAR(1, VAR_VERSION) } module-config{COLON} { YDVAR(1, VAR_MODULE_CONF) } diff --git a/util/configparser.c b/util/configparser.c index d215588a8..d40b824d1 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -316,9 +316,10 @@ extern int yydebug; VAR_FAKE_DSA = 445, VAR_FAKE_SHA1 = 446, VAR_LOG_IDENTITY = 447, - VAR_USE_SYSTEMD = 448, - VAR_SHM_ENABLE = 449, - VAR_SHM_KEY = 450 + VAR_HIDE_TRUSTANCHOR = 448, + VAR_USE_SYSTEMD = 449, + VAR_SHM_ENABLE = 450, + VAR_SHM_KEY = 451 }; #endif /* Tokens. */ @@ -512,9 +513,10 @@ extern int yydebug; #define VAR_FAKE_DSA 445 #define VAR_FAKE_SHA1 446 #define VAR_LOG_IDENTITY 447 -#define VAR_USE_SYSTEMD 448 -#define VAR_SHM_ENABLE 449 -#define VAR_SHM_KEY 450 +#define VAR_HIDE_TRUSTANCHOR 448 +#define VAR_USE_SYSTEMD 449 +#define VAR_SHM_ENABLE 450 +#define VAR_SHM_KEY 451 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -525,7 +527,7 @@ union YYSTYPE char* str; -#line 529 "util/configparser.c" /* yacc.c:355 */ +#line 531 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -542,7 +544,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 546 "util/configparser.c" /* yacc.c:358 */ +#line 548 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -784,21 +786,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 396 +#define YYLAST 398 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 196 +#define YYNTOKENS 197 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 208 +#define YYNNTS 209 /* YYNRULES -- Number of rules. */ -#define YYNRULES 399 +#define YYNRULES 401 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 603 +#define YYNSTATES 606 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 450 +#define YYMAXUTOK 451 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -852,7 +854,7 @@ static const yytype_uint8 yytranslate[] = 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, - 195 + 195, 196 }; #if YYDEBUG @@ -875,30 +877,31 @@ static const yytype_uint16 yyrline[] = 208, 208, 209, 210, 210, 211, 212, 212, 213, 213, 214, 214, 214, 215, 215, 216, 216, 217, 217, 218, 218, 219, 219, 219, 220, 220, 220, 221, 221, 221, - 223, 235, 236, 237, 237, 237, 237, 237, 238, 240, - 252, 253, 254, 254, 254, 254, 255, 257, 271, 272, - 273, 273, 273, 273, 274, 274, 276, 285, 294, 305, - 314, 323, 332, 343, 352, 365, 380, 389, 398, 407, - 416, 425, 434, 443, 452, 461, 470, 479, 488, 497, - 506, 515, 522, 529, 538, 547, 556, 570, 579, 588, - 597, 604, 611, 637, 645, 652, 659, 666, 673, 681, - 689, 697, 704, 711, 720, 729, 736, 743, 751, 759, - 769, 779, 789, 802, 813, 821, 834, 843, 852, 861, - 871, 881, 889, 902, 911, 919, 928, 936, 949, 958, - 965, 975, 985, 995, 1005, 1015, 1025, 1035, 1045, 1052, - 1059, 1066, 1075, 1084, 1093, 1100, 1110, 1127, 1134, 1152, - 1165, 1178, 1187, 1196, 1205, 1214, 1224, 1234, 1243, 1252, - 1265, 1278, 1287, 1294, 1303, 1312, 1321, 1330, 1338, 1351, - 1359, 1387, 1394, 1409, 1419, 1429, 1436, 1443, 1452, 1466, - 1485, 1504, 1516, 1528, 1540, 1551, 1570, 1580, 1589, 1597, - 1605, 1618, 1631, 1644, 1657, 1666, 1675, 1685, 1695, 1705, - 1712, 1719, 1728, 1738, 1748, 1758, 1765, 1772, 1781, 1791, - 1801, 1830, 1840, 1848, 1857, 1866, 1871, 1872, 1873, 1873, - 1873, 1874, 1874, 1874, 1875, 1875, 1877, 1887, 1896, 1903, - 1913, 1920, 1927, 1934, 1941, 1946, 1947, 1948, 1948, 1949, - 1949, 1950, 1950, 1951, 1952, 1953, 1954, 1955, 1956, 1958, - 1966, 1973, 1981, 1989, 1996, 2003, 2012, 2021, 2030, 2039, - 2048, 2057, 2062, 2063, 2064, 2066, 2072, 2082, 2089, 2098 + 222, 224, 236, 237, 238, 238, 238, 238, 238, 239, + 241, 253, 254, 255, 255, 255, 255, 256, 258, 272, + 273, 274, 274, 274, 274, 275, 275, 277, 286, 295, + 306, 315, 324, 333, 344, 353, 366, 381, 390, 399, + 408, 417, 426, 435, 444, 453, 462, 471, 480, 489, + 498, 507, 516, 523, 530, 539, 548, 557, 571, 580, + 589, 598, 605, 612, 638, 646, 653, 660, 667, 674, + 682, 690, 698, 705, 712, 721, 730, 739, 746, 753, + 761, 769, 779, 789, 799, 812, 823, 831, 844, 853, + 862, 871, 881, 891, 899, 912, 921, 929, 938, 946, + 959, 968, 975, 985, 995, 1005, 1015, 1025, 1035, 1045, + 1055, 1062, 1069, 1076, 1085, 1094, 1103, 1110, 1120, 1137, + 1144, 1162, 1175, 1188, 1197, 1206, 1215, 1224, 1234, 1244, + 1253, 1262, 1275, 1288, 1297, 1304, 1313, 1322, 1331, 1340, + 1348, 1361, 1369, 1397, 1404, 1419, 1429, 1439, 1446, 1453, + 1462, 1476, 1495, 1514, 1526, 1538, 1550, 1561, 1580, 1590, + 1599, 1607, 1615, 1628, 1641, 1654, 1667, 1676, 1685, 1695, + 1705, 1715, 1722, 1729, 1738, 1748, 1758, 1768, 1775, 1782, + 1791, 1801, 1811, 1840, 1850, 1858, 1867, 1876, 1881, 1882, + 1883, 1883, 1883, 1884, 1884, 1884, 1885, 1885, 1887, 1897, + 1906, 1913, 1923, 1930, 1937, 1944, 1951, 1956, 1957, 1958, + 1958, 1959, 1959, 1960, 1960, 1961, 1962, 1963, 1964, 1965, + 1966, 1968, 1976, 1983, 1991, 1999, 2006, 2013, 2022, 2031, + 2040, 2049, 2058, 2067, 2072, 2073, 2074, 2076, 2082, 2092, + 2099, 2108 }; #endif @@ -974,11 +977,11 @@ static const char *const yytname[] = "VAR_ACCESS_CONTROL_TAG_ACTION", "VAR_ACCESS_CONTROL_TAG_DATA", "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW", "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", "VAR_FAKE_SHA1", "VAR_LOG_IDENTITY", - "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", "VAR_SHM_KEY", "$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", + "VAR_HIDE_TRUSTANCHOR", "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", + "VAR_SHM_KEY", "$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_interface", @@ -996,34 +999,35 @@ static const char *const yytname[] = "server_dlv_anchor", "server_auto_trust_anchor_file", "server_trust_anchor_file", "server_trusted_keys_file", "server_trust_anchor", "server_domain_insecure", "server_hide_identity", - "server_hide_version", "server_identity", "server_version", - "server_so_rcvbuf", "server_so_sndbuf", "server_so_reuseport", - "server_ip_transparent", "server_ip_freebind", "server_edns_buffer_size", - "server_msg_buffer_size", "server_msg_cache_size", - "server_msg_cache_slabs", "server_num_queries_per_thread", - "server_jostle_timeout", "server_delay_close", - "server_unblock_lan_zones", "server_insecure_lan_zones", - "server_rrset_cache_size", "server_rrset_cache_slabs", - "server_infra_host_ttl", "server_infra_lame_ttl", - "server_infra_cache_numhosts", "server_infra_cache_lame_size", - "server_infra_cache_slabs", "server_infra_cache_min_rtt", - "server_target_fetch_policy", "server_harden_short_bufsize", - "server_harden_large_queries", "server_harden_glue", - "server_harden_dnssec_stripped", "server_harden_below_nxdomain", - "server_harden_referral_path", "server_harden_algo_downgrade", - "server_use_caps_for_id", "server_caps_whitelist", - "server_private_address", "server_private_domain", "server_prefetch", - "server_prefetch_key", "server_unwanted_reply_threshold", - "server_do_not_query_address", "server_do_not_query_localhost", - "server_access_control", "server_module_conf", - "server_val_override_date", "server_val_sig_skew_min", - "server_val_sig_skew_max", "server_cache_max_ttl", - "server_cache_max_negative_ttl", "server_cache_min_ttl", - "server_bogus_ttl", "server_val_clean_additional", - "server_val_permissive_mode", "server_ignore_cd_flag", - "server_serve_expired", "server_fake_dsa", "server_fake_sha1", - "server_val_log_level", "server_val_nsec3_keysize_iterations", - "server_add_holddown", "server_del_holddown", "server_keep_missing", + "server_hide_version", "server_hide_trustanchor", "server_identity", + "server_version", "server_so_rcvbuf", "server_so_sndbuf", + "server_so_reuseport", "server_ip_transparent", "server_ip_freebind", + "server_edns_buffer_size", "server_msg_buffer_size", + "server_msg_cache_size", "server_msg_cache_slabs", + "server_num_queries_per_thread", "server_jostle_timeout", + "server_delay_close", "server_unblock_lan_zones", + "server_insecure_lan_zones", "server_rrset_cache_size", + "server_rrset_cache_slabs", "server_infra_host_ttl", + "server_infra_lame_ttl", "server_infra_cache_numhosts", + "server_infra_cache_lame_size", "server_infra_cache_slabs", + "server_infra_cache_min_rtt", "server_target_fetch_policy", + "server_harden_short_bufsize", "server_harden_large_queries", + "server_harden_glue", "server_harden_dnssec_stripped", + "server_harden_below_nxdomain", "server_harden_referral_path", + "server_harden_algo_downgrade", "server_use_caps_for_id", + "server_caps_whitelist", "server_private_address", + "server_private_domain", "server_prefetch", "server_prefetch_key", + "server_unwanted_reply_threshold", "server_do_not_query_address", + "server_do_not_query_localhost", "server_access_control", + "server_module_conf", "server_val_override_date", + "server_val_sig_skew_min", "server_val_sig_skew_max", + "server_cache_max_ttl", "server_cache_max_negative_ttl", + "server_cache_min_ttl", "server_bogus_ttl", + "server_val_clean_additional", "server_val_permissive_mode", + "server_ignore_cd_flag", "server_serve_expired", "server_fake_dsa", + "server_fake_sha1", "server_val_log_level", + "server_val_nsec3_keysize_iterations", "server_add_holddown", + "server_del_holddown", "server_keep_missing", "server_permit_small_holddown", "server_key_cache_size", "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone", "server_local_data", "server_local_data_ptr", "server_minimal_responses", @@ -1085,7 +1089,7 @@ static const yytype_uint16 yytoknum[] = 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, - 445, 446, 447, 448, 449, 450 + 445, 446, 447, 448, 449, 450, 451 }; # endif @@ -1119,8 +1123,8 @@ static const yytype_int16 yypact[] = 134, 136, 138, 167, 168, 169, 170, 174, 175, 218, 219, 220, 221, 222, 224, 225, 226, 230, 234, 235, 261, 262, 272, 273, 274, 275, 276, 277, 278, 279, - 280, 281, 282, 283, 284, 313, 315, 323, 324, 325, - 326, -132, -132, -132, -132, -132, -132, -132, -132, -132, + 280, 281, 282, 283, 284, 313, 315, 324, 325, 326, + 327, 328, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, @@ -1134,36 +1138,36 @@ static const yytype_int16 yypact[] = -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, -132, -132, -132, -132, -132, 327, 328, - 329, 330, 331, 332, -132, -132, -132, -132, -132, -132, - -132, 333, 334, 335, 336, 337, -132, -132, -132, -132, - -132, -132, 338, 339, 340, 341, 344, 345, -132, -132, - -132, -132, -132, -132, -132, 346, 347, 348, 349, 350, - 351, 352, 353, -132, -132, -132, -132, -132, -132, -132, - -132, -132, 354, 355, 356, 357, 358, 359, 360, 361, - 362, 363, 364, 365, -132, -132, -132, -132, -132, -132, - -132, -132, -132, -132, -132, -132, -132, 366, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + 329, 330, 331, 332, 333, 334, -132, -132, -132, -132, + -132, -132, -132, 335, 336, 337, 338, 339, -132, -132, + -132, -132, -132, -132, 340, 341, 344, 345, 346, 347, + -132, -132, -132, -132, -132, -132, -132, 348, 349, 350, + 351, 352, 353, 354, 355, -132, -132, -132, -132, -132, + -132, -132, -132, -132, 356, 357, 358, 359, 360, 361, + 362, 363, 364, 365, 366, 367, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, 368, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, -132, -132, -132, 367, 368, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, 369, 370, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - 369, 370, 372, -132, -132, -132, -132, -132, -132, -132, - -132, -132, 373, 374, -132, -132, -132, -132, -132, -132, - -132, -132, -132, 375, 376, 377, 378, 379, 380, -132, + -132, -132, 372, 373, 374, -132, -132, -132, -132, -132, + -132, -132, -132, -132, 375, 376, -132, -132, -132, -132, + -132, -132, -132, -132, -132, 377, 378, 379, 380, 381, + 382, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, -132, -132, -132, -132, -132, 381, -132, - 382, 383, -132, -132, -132, -132, -132, -132, -132, -132, + -132, 383, -132, 384, 385, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, 384, 385, 386, -132, -132, -132, -132, - -132, -132, -132 + -132, -132, -132, -132, -132, -132, 386, 387, 388, -132, + -132, -132, -132, -132, -132, -132 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1171,8 +1175,8 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 11, 160, 169, 345, 391, 364, 177, - 3, 13, 162, 171, 179, 347, 366, 393, 4, 5, + 2, 0, 1, 11, 161, 170, 347, 393, 366, 178, + 3, 13, 163, 172, 180, 349, 368, 395, 4, 5, 6, 10, 8, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1188,50 +1192,50 @@ 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, 12, 14, 15, 74, 77, 86, 157, 158, 16, - 25, 65, 17, 78, 79, 36, 58, 73, 18, 19, - 21, 22, 20, 23, 24, 109, 110, 111, 112, 113, - 153, 75, 64, 90, 107, 108, 26, 27, 28, 29, - 30, 66, 80, 81, 96, 52, 62, 53, 91, 46, - 47, 48, 49, 100, 104, 117, 125, 140, 101, 59, - 31, 32, 33, 88, 118, 119, 120, 34, 35, 37, - 38, 40, 41, 39, 123, 42, 43, 44, 50, 69, - 105, 83, 124, 76, 136, 84, 85, 102, 103, 89, - 45, 67, 70, 51, 54, 92, 93, 68, 137, 94, - 55, 56, 57, 106, 150, 151, 159, 95, 63, 97, - 98, 99, 138, 60, 61, 82, 71, 72, 87, 114, - 115, 116, 121, 122, 141, 142, 144, 146, 147, 145, - 148, 154, 126, 127, 130, 131, 128, 129, 132, 133, - 135, 134, 139, 149, 143, 152, 155, 156, 0, 0, - 0, 0, 0, 0, 161, 163, 164, 165, 167, 168, - 166, 0, 0, 0, 0, 0, 170, 172, 173, 174, - 175, 176, 0, 0, 0, 0, 0, 0, 178, 180, - 181, 184, 185, 182, 183, 0, 0, 0, 0, 0, - 0, 0, 0, 346, 348, 350, 349, 355, 351, 352, - 353, 354, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 365, 367, 368, 369, 370, 371, - 372, 373, 374, 375, 376, 377, 378, 0, 392, 394, - 187, 186, 193, 196, 194, 202, 203, 206, 204, 205, - 207, 208, 220, 221, 222, 223, 224, 244, 245, 246, - 251, 252, 199, 253, 254, 257, 255, 256, 259, 260, - 261, 274, 233, 234, 235, 236, 262, 277, 229, 231, - 278, 284, 285, 286, 200, 243, 297, 298, 230, 292, - 216, 195, 225, 275, 281, 263, 0, 0, 301, 201, - 188, 215, 267, 189, 197, 198, 226, 227, 299, 265, - 269, 270, 190, 302, 247, 273, 217, 232, 279, 280, - 283, 291, 228, 295, 293, 294, 237, 242, 271, 272, - 238, 239, 264, 287, 218, 219, 209, 210, 211, 212, - 213, 303, 304, 305, 248, 249, 250, 258, 306, 307, - 0, 0, 0, 266, 240, 396, 316, 320, 318, 317, - 321, 319, 0, 0, 324, 325, 268, 282, 296, 326, - 327, 241, 308, 0, 0, 0, 0, 0, 0, 288, - 289, 290, 397, 214, 191, 192, 328, 329, 330, 333, - 332, 331, 334, 335, 336, 337, 338, 339, 0, 343, - 0, 0, 344, 356, 358, 357, 360, 361, 362, 363, - 359, 379, 380, 381, 382, 383, 384, 385, 386, 387, - 388, 389, 390, 395, 276, 300, 315, 398, 399, 322, - 323, 309, 310, 0, 0, 0, 314, 340, 341, 342, - 313, 311, 312 + 0, 0, 12, 14, 15, 74, 77, 86, 157, 158, + 16, 25, 65, 17, 78, 79, 36, 58, 73, 18, + 19, 21, 22, 20, 23, 24, 109, 110, 111, 112, + 113, 153, 75, 64, 90, 107, 108, 26, 27, 28, + 29, 30, 66, 80, 81, 96, 52, 62, 53, 91, + 46, 47, 160, 48, 49, 100, 104, 117, 125, 140, + 101, 59, 31, 32, 33, 88, 118, 119, 120, 34, + 35, 37, 38, 40, 41, 39, 123, 42, 43, 44, + 50, 69, 105, 83, 124, 76, 136, 84, 85, 102, + 103, 89, 45, 67, 70, 51, 54, 92, 93, 68, + 137, 94, 55, 56, 57, 106, 150, 151, 159, 95, + 63, 97, 98, 99, 138, 60, 61, 82, 71, 72, + 87, 114, 115, 116, 121, 122, 141, 142, 144, 146, + 147, 145, 148, 154, 126, 127, 130, 131, 128, 129, + 132, 133, 135, 134, 139, 149, 143, 152, 155, 156, + 0, 0, 0, 0, 0, 0, 162, 164, 165, 166, + 168, 169, 167, 0, 0, 0, 0, 0, 171, 173, + 174, 175, 176, 177, 0, 0, 0, 0, 0, 0, + 179, 181, 182, 185, 186, 183, 184, 0, 0, 0, + 0, 0, 0, 0, 0, 348, 350, 352, 351, 357, + 353, 354, 355, 356, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 367, 369, 370, 371, + 372, 373, 374, 375, 376, 377, 378, 379, 380, 0, + 394, 396, 188, 187, 194, 197, 195, 203, 204, 207, + 205, 206, 208, 209, 221, 222, 223, 224, 225, 246, + 247, 248, 253, 254, 200, 255, 256, 259, 257, 258, + 261, 262, 263, 276, 234, 235, 237, 238, 264, 279, + 230, 232, 280, 286, 287, 288, 201, 245, 299, 300, + 231, 294, 217, 196, 226, 277, 283, 265, 0, 0, + 303, 202, 189, 216, 269, 190, 198, 199, 227, 228, + 301, 267, 271, 272, 191, 304, 249, 275, 218, 233, + 281, 282, 285, 293, 229, 297, 295, 296, 239, 244, + 273, 274, 240, 241, 266, 289, 219, 220, 210, 211, + 212, 213, 214, 305, 306, 307, 250, 251, 252, 260, + 308, 309, 0, 0, 0, 268, 242, 398, 318, 322, + 320, 319, 323, 321, 0, 0, 326, 327, 270, 284, + 298, 328, 329, 243, 310, 0, 0, 0, 0, 0, + 0, 290, 291, 292, 399, 236, 215, 192, 193, 330, + 331, 332, 335, 334, 333, 336, 337, 338, 339, 340, + 341, 0, 345, 0, 0, 346, 358, 360, 359, 362, + 363, 364, 365, 361, 381, 382, 383, 384, 385, 386, + 387, 388, 389, 390, 391, 392, 397, 278, 302, 317, + 400, 401, 324, 325, 311, 312, 0, 0, 0, 316, + 342, 343, 344, 315, 313, 314 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1257,33 +1261,33 @@ static const yytype_int16 yypgoto[] = -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, -132, -132, -132, -132, -132 + -132, -132, -132, -132, -132, -132, -132, -132, -132 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 10, 11, 18, 171, 12, 19, 324, 13, - 20, 336, 14, 21, 348, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, - 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, - 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, - 217, 218, 219, 220, 221, 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, 325, 326, 327, - 328, 329, 330, 337, 338, 339, 340, 341, 349, 350, - 351, 352, 353, 354, 15, 22, 363, 364, 365, 366, - 367, 368, 369, 370, 371, 16, 23, 384, 385, 386, - 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, - 17, 24, 398, 399, 314, 315, 316, 317 + -1, 1, 10, 11, 18, 172, 12, 19, 326, 13, + 20, 338, 14, 21, 350, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, + 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 218, 219, 220, 221, 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, 327, 328, + 329, 330, 331, 332, 339, 340, 341, 342, 343, 351, + 352, 353, 354, 355, 356, 15, 22, 365, 366, 367, + 368, 369, 370, 371, 372, 373, 16, 23, 386, 387, + 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, + 398, 17, 24, 400, 401, 316, 317, 318, 319 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1291,46 +1295,46 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 318, 397, 319, 320, 331, 400, 401, 402, 403, - 0, 3, 404, 332, 333, 372, 373, 374, 375, 376, - 377, 378, 379, 380, 381, 382, 383, 355, 356, 357, - 358, 359, 360, 361, 362, 405, 406, 407, 408, 409, - 410, 4, 411, 412, 413, 414, 415, 5, 416, 417, - 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, - 428, 429, 430, 431, 321, 432, 433, 434, 435, 436, - 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, - 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, - 457, 6, 458, 459, 322, 460, 323, 334, 461, 335, - 462, 463, 464, 465, 466, 467, 468, 7, 469, 470, - 471, 472, 473, 474, 475, 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, - 501, 502, 503, 504, 505, 8, 506, 0, 507, 25, + 2, 320, 399, 321, 322, 333, 402, 403, 404, 405, + 0, 3, 406, 334, 335, 374, 375, 376, 377, 378, + 379, 380, 381, 382, 383, 384, 385, 357, 358, 359, + 360, 361, 362, 363, 364, 407, 408, 409, 410, 411, + 412, 4, 413, 414, 415, 416, 417, 5, 418, 419, + 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, + 430, 431, 432, 433, 323, 434, 435, 436, 437, 438, + 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, + 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, + 459, 6, 460, 461, 324, 462, 325, 336, 463, 337, + 464, 465, 466, 467, 468, 469, 470, 7, 471, 472, + 473, 474, 475, 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, 501, 502, + 503, 504, 505, 506, 507, 8, 508, 0, 509, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 508, 509, 510, - 511, 53, 54, 55, 512, 513, 9, 56, 57, 58, + 46, 47, 48, 49, 50, 51, 52, 510, 511, 512, + 513, 53, 54, 55, 514, 515, 9, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, 96, 514, 515, - 516, 517, 518, 342, 519, 520, 521, 97, 98, 99, - 522, 100, 101, 102, 523, 524, 103, 104, 105, 106, + 89, 90, 91, 92, 93, 94, 95, 96, 516, 517, + 518, 519, 520, 344, 521, 522, 523, 97, 98, 99, + 524, 100, 101, 102, 525, 526, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 117, 118, 119, 120, 121, 122, 123, 124, 125, 343, - 344, 525, 526, 126, 127, 128, 129, 130, 131, 132, - 133, 134, 527, 528, 529, 530, 531, 532, 533, 534, - 535, 536, 537, 538, 539, 135, 136, 137, 138, 139, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 345, + 346, 527, 528, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 529, 530, 531, 532, 533, 534, 535, 536, + 537, 538, 539, 540, 541, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 540, 163, 541, 164, 165, 166, 167, - 168, 169, 170, 542, 543, 544, 545, 546, 547, 548, - 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, - 559, 560, 345, 346, 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, 347, 588, 589, 590, 591, 592, 593, 594, 595, - 596, 597, 598, 599, 600, 601, 602 + 160, 161, 162, 542, 163, 543, 164, 165, 166, 167, + 168, 169, 170, 171, 544, 545, 546, 547, 548, 549, + 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, + 560, 561, 347, 348, 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, 349, 589, 590, 591, 592, 593, 594, 595, 596, + 597, 598, 599, 600, 601, 602, 603, 604, 605 }; static const yytype_int16 yycheck[] = @@ -1368,22 +1372,22 @@ static const yytype_int16 yycheck[] = 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 10, 187, 10, 189, 190, 191, 192, - 193, 194, 195, 10, 10, 10, 10, 10, 10, 10, + 193, 194, 195, 196, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 159, 160, 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, 188, 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, 197, 0, 11, 41, 47, 91, 107, 145, 186, - 198, 199, 202, 205, 208, 370, 381, 396, 200, 203, - 206, 209, 371, 382, 397, 12, 13, 14, 15, 16, + 0, 198, 0, 11, 41, 47, 91, 107, 145, 186, + 199, 200, 203, 206, 209, 372, 383, 398, 201, 204, + 207, 210, 373, 384, 399, 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, @@ -1398,7 +1402,7 @@ static const yytype_uint16 yystos[] = 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 187, 189, 190, 191, 192, 193, 194, - 195, 201, 211, 212, 213, 214, 215, 216, 217, 218, + 195, 196, 202, 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, @@ -1412,15 +1416,16 @@ static const yytype_uint16 yystos[] = 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, 350, 351, 352, 400, 401, 402, 403, 40, 42, - 43, 103, 133, 135, 204, 353, 354, 355, 356, 357, - 358, 40, 48, 49, 132, 134, 207, 359, 360, 361, - 362, 363, 40, 76, 77, 159, 160, 188, 210, 364, - 365, 366, 367, 368, 369, 92, 93, 94, 95, 96, - 97, 98, 99, 372, 373, 374, 375, 376, 377, 378, - 379, 380, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 383, 384, 385, 386, 387, 388, - 389, 390, 391, 392, 393, 394, 395, 108, 398, 399, + 349, 350, 351, 352, 353, 354, 402, 403, 404, 405, + 40, 42, 43, 103, 133, 135, 205, 355, 356, 357, + 358, 359, 360, 40, 48, 49, 132, 134, 208, 361, + 362, 363, 364, 365, 40, 76, 77, 159, 160, 188, + 211, 366, 367, 368, 369, 370, 371, 92, 93, 94, + 95, 96, 97, 98, 99, 374, 375, 376, 377, 378, + 379, 380, 381, 382, 146, 147, 148, 149, 150, 151, + 152, 153, 154, 155, 156, 157, 385, 386, 387, 388, + 389, 390, 391, 392, 393, 394, 395, 396, 397, 108, + 400, 401, 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, @@ -1440,32 +1445,31 @@ static const yytype_uint16 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10 + 10, 10, 10, 10, 10, 10 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 196, 197, 197, 198, 198, 198, 198, 198, 198, - 198, 199, 200, 200, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 202, 203, 203, 204, 204, 204, 204, 204, 204, 205, - 206, 206, 207, 207, 207, 207, 207, 208, 209, 209, - 210, 210, 210, 210, 210, 210, 211, 212, 213, 214, + 0, 197, 198, 198, 199, 199, 199, 199, 199, 199, + 199, 200, 201, 201, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 202, 203, 204, 204, 205, 205, 205, 205, 205, 205, + 206, 207, 207, 208, 208, 208, 208, 208, 209, 210, + 210, 211, 211, 211, 211, 211, 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, @@ -1481,12 +1485,13 @@ static const yytype_uint16 yyr1[] = 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, - 365, 366, 367, 368, 369, 370, 371, 371, 372, 372, - 372, 372, 372, 372, 372, 372, 373, 374, 375, 376, - 377, 378, 379, 380, 381, 382, 382, 383, 383, 383, - 383, 383, 383, 383, 383, 383, 383, 383, 383, 384, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 373, + 374, 374, 374, 374, 374, 374, 374, 374, 375, 376, + 377, 378, 379, 380, 381, 382, 383, 384, 384, 385, + 385, 385, 385, 385, 385, 385, 385, 385, 385, 385, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, - 395, 396, 397, 397, 398, 399, 400, 401, 402, 403 + 395, 396, 397, 398, 399, 399, 400, 401, 402, 403, + 404, 405 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1508,9 +1513,9 @@ 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, 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, 2, 2, 2, 2, + 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, 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, @@ -1519,19 +1524,20 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 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, 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, - 3, 3, 3, 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 + 2, 2, 3, 3, 3, 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 }; @@ -2212,11 +2218,11 @@ yyreduce: { OUTYY(("\nP(server:)\n")); } -#line 2216 "util/configparser.c" /* yacc.c:1646 */ +#line 2222 "util/configparser.c" /* yacc.c:1646 */ break; - case 160: -#line 224 "./util/configparser.y" /* yacc.c:1646 */ + case 161: +#line 225 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2227,11 +2233,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2231 "util/configparser.c" /* yacc.c:1646 */ +#line 2237 "util/configparser.c" /* yacc.c:1646 */ break; - case 169: -#line 241 "./util/configparser.y" /* yacc.c:1646 */ + case 170: +#line 242 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2242,11 +2248,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2246 "util/configparser.c" /* yacc.c:1646 */ +#line 2252 "util/configparser.c" /* yacc.c:1646 */ break; - case 177: -#line 258 "./util/configparser.y" /* yacc.c:1646 */ + case 178: +#line 259 "./util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2259,11 +2265,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2263 "util/configparser.c" /* yacc.c:1646 */ +#line 2269 "util/configparser.c" /* yacc.c:1646 */ break; - case 186: -#line 277 "./util/configparser.y" /* yacc.c:1646 */ + case 187: +#line 278 "./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) @@ -2271,11 +2277,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2275 "util/configparser.c" /* yacc.c:1646 */ +#line 2281 "util/configparser.c" /* yacc.c:1646 */ break; - case 187: -#line 286 "./util/configparser.y" /* yacc.c:1646 */ + case 188: +#line 287 "./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) @@ -2283,11 +2289,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2287 "util/configparser.c" /* yacc.c:1646 */ +#line 2293 "util/configparser.c" /* yacc.c:1646 */ break; - case 188: -#line 295 "./util/configparser.y" /* yacc.c:1646 */ + case 189: +#line 296 "./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) @@ -2297,11 +2303,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2301 "util/configparser.c" /* yacc.c:1646 */ +#line 2307 "util/configparser.c" /* yacc.c:1646 */ break; - case 189: -#line 306 "./util/configparser.y" /* yacc.c:1646 */ + case 190: +#line 307 "./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) @@ -2309,11 +2315,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2313 "util/configparser.c" /* yacc.c:1646 */ +#line 2319 "util/configparser.c" /* yacc.c:1646 */ break; - case 190: -#line 315 "./util/configparser.y" /* yacc.c:1646 */ + case 191: +#line 316 "./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) @@ -2321,11 +2327,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2325 "util/configparser.c" /* yacc.c:1646 */ +#line 2331 "util/configparser.c" /* yacc.c:1646 */ break; - case 191: -#line 324 "./util/configparser.y" /* yacc.c:1646 */ + case 192: +#line 325 "./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) @@ -2333,11 +2339,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2337 "util/configparser.c" /* yacc.c:1646 */ +#line 2343 "util/configparser.c" /* yacc.c:1646 */ break; - case 192: -#line 333 "./util/configparser.y" /* yacc.c:1646 */ + case 193: +#line 334 "./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) @@ -2347,11 +2353,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2351 "util/configparser.c" /* yacc.c:1646 */ +#line 2357 "util/configparser.c" /* yacc.c:1646 */ break; - case 193: -#line 344 "./util/configparser.y" /* yacc.c:1646 */ + case 194: +#line 345 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2359,11 +2365,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2363 "util/configparser.c" /* yacc.c:1646 */ +#line 2369 "util/configparser.c" /* yacc.c:1646 */ break; - case 194: -#line 353 "./util/configparser.y" /* yacc.c:1646 */ + case 195: +#line 354 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2375,11 +2381,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2379 "util/configparser.c" /* yacc.c:1646 */ +#line 2385 "util/configparser.c" /* yacc.c:1646 */ break; - case 195: -#line 366 "./util/configparser.y" /* yacc.c:1646 */ + case 196: +#line 367 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2393,11 +2399,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2397 "util/configparser.c" /* yacc.c:1646 */ +#line 2403 "util/configparser.c" /* yacc.c:1646 */ break; - case 196: -#line 381 "./util/configparser.y" /* yacc.c:1646 */ + case 197: +#line 382 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2405,11 +2411,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2409 "util/configparser.c" /* yacc.c:1646 */ +#line 2415 "util/configparser.c" /* yacc.c:1646 */ break; - case 197: -#line 390 "./util/configparser.y" /* yacc.c:1646 */ + case 198: +#line 391 "./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, @@ -2417,11 +2423,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2421 "util/configparser.c" /* yacc.c:1646 */ +#line 2427 "util/configparser.c" /* yacc.c:1646 */ break; - case 198: -#line 399 "./util/configparser.y" /* yacc.c:1646 */ + case 199: +#line 400 "./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, @@ -2429,11 +2435,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2433 "util/configparser.c" /* yacc.c:1646 */ +#line 2439 "util/configparser.c" /* yacc.c:1646 */ break; - case 199: -#line 408 "./util/configparser.y" /* yacc.c:1646 */ + case 200: +#line 409 "./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) @@ -2441,11 +2447,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2445 "util/configparser.c" /* yacc.c:1646 */ +#line 2451 "util/configparser.c" /* yacc.c:1646 */ break; - case 200: -#line 417 "./util/configparser.y" /* yacc.c:1646 */ + case 201: +#line 418 "./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) @@ -2453,11 +2459,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2457 "util/configparser.c" /* yacc.c:1646 */ +#line 2463 "util/configparser.c" /* yacc.c:1646 */ break; - case 201: -#line 426 "./util/configparser.y" /* yacc.c:1646 */ + case 202: +#line 427 "./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) @@ -2465,11 +2471,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2469 "util/configparser.c" /* yacc.c:1646 */ +#line 2475 "util/configparser.c" /* yacc.c:1646 */ break; - case 202: -#line 435 "./util/configparser.y" /* yacc.c:1646 */ + case 203: +#line 436 "./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) @@ -2477,11 +2483,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2481 "util/configparser.c" /* yacc.c:1646 */ +#line 2487 "util/configparser.c" /* yacc.c:1646 */ break; - case 203: -#line 444 "./util/configparser.y" /* yacc.c:1646 */ + case 204: +#line 445 "./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) @@ -2489,11 +2495,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2493 "util/configparser.c" /* yacc.c:1646 */ +#line 2499 "util/configparser.c" /* yacc.c:1646 */ break; - case 204: -#line 453 "./util/configparser.y" /* yacc.c:1646 */ + case 205: +#line 454 "./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) @@ -2501,11 +2507,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2505 "util/configparser.c" /* yacc.c:1646 */ +#line 2511 "util/configparser.c" /* yacc.c:1646 */ break; - case 205: -#line 462 "./util/configparser.y" /* yacc.c:1646 */ + case 206: +#line 463 "./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) @@ -2513,11 +2519,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2517 "util/configparser.c" /* yacc.c:1646 */ +#line 2523 "util/configparser.c" /* yacc.c:1646 */ break; - case 206: -#line 471 "./util/configparser.y" /* yacc.c:1646 */ + case 207: +#line 472 "./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) @@ -2525,11 +2531,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2529 "util/configparser.c" /* yacc.c:1646 */ +#line 2535 "util/configparser.c" /* yacc.c:1646 */ break; - case 207: -#line 480 "./util/configparser.y" /* yacc.c:1646 */ + case 208: +#line 481 "./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) @@ -2537,11 +2543,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2541 "util/configparser.c" /* yacc.c:1646 */ +#line 2547 "util/configparser.c" /* yacc.c:1646 */ break; - case 208: -#line 489 "./util/configparser.y" /* yacc.c:1646 */ + case 209: +#line 490 "./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) @@ -2549,11 +2555,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2553 "util/configparser.c" /* yacc.c:1646 */ +#line 2559 "util/configparser.c" /* yacc.c:1646 */ break; - case 209: -#line 498 "./util/configparser.y" /* yacc.c:1646 */ + case 210: +#line 499 "./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) @@ -2561,11 +2567,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2565 "util/configparser.c" /* yacc.c:1646 */ +#line 2571 "util/configparser.c" /* yacc.c:1646 */ break; - case 210: -#line 507 "./util/configparser.y" /* yacc.c:1646 */ + case 211: +#line 508 "./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) @@ -2573,31 +2579,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2577 "util/configparser.c" /* yacc.c:1646 */ +#line 2583 "util/configparser.c" /* yacc.c:1646 */ break; - case 211: -#line 516 "./util/configparser.y" /* yacc.c:1646 */ + case 212: +#line 517 "./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 2587 "util/configparser.c" /* yacc.c:1646 */ +#line 2593 "util/configparser.c" /* yacc.c:1646 */ break; - case 212: -#line 523 "./util/configparser.y" /* yacc.c:1646 */ + case 213: +#line 524 "./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 2597 "util/configparser.c" /* yacc.c:1646 */ +#line 2603 "util/configparser.c" /* yacc.c:1646 */ break; - case 213: -#line 530 "./util/configparser.y" /* yacc.c:1646 */ + case 214: +#line 531 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2605,11 +2611,11 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2609 "util/configparser.c" /* yacc.c:1646 */ +#line 2615 "util/configparser.c" /* yacc.c:1646 */ break; - case 214: -#line 539 "./util/configparser.y" /* yacc.c:1646 */ + case 215: +#line 540 "./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) @@ -2617,11 +2623,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2621 "util/configparser.c" /* yacc.c:1646 */ +#line 2627 "util/configparser.c" /* yacc.c:1646 */ break; - case 215: -#line 548 "./util/configparser.y" /* yacc.c:1646 */ + case 216: +#line 549 "./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) @@ -2629,11 +2635,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2633 "util/configparser.c" /* yacc.c:1646 */ +#line 2639 "util/configparser.c" /* yacc.c:1646 */ break; - case 216: -#line 557 "./util/configparser.y" /* yacc.c:1646 */ + case 217: +#line 558 "./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) @@ -2646,11 +2652,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2650 "util/configparser.c" /* yacc.c:1646 */ +#line 2656 "util/configparser.c" /* yacc.c:1646 */ break; - case 217: -#line 571 "./util/configparser.y" /* yacc.c:1646 */ + case 218: +#line 572 "./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) @@ -2658,11 +2664,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2662 "util/configparser.c" /* yacc.c:1646 */ +#line 2668 "util/configparser.c" /* yacc.c:1646 */ break; - case 218: -#line 580 "./util/configparser.y" /* yacc.c:1646 */ + case 219: +#line 581 "./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) @@ -2670,11 +2676,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2674 "util/configparser.c" /* yacc.c:1646 */ +#line 2680 "util/configparser.c" /* yacc.c:1646 */ break; - case 219: -#line 589 "./util/configparser.y" /* yacc.c:1646 */ + case 220: +#line 590 "./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) @@ -2682,31 +2688,31 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2686 "util/configparser.c" /* yacc.c:1646 */ +#line 2692 "util/configparser.c" /* yacc.c:1646 */ break; - case 220: -#line 598 "./util/configparser.y" /* yacc.c:1646 */ + case 221: +#line 599 "./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 2696 "util/configparser.c" /* yacc.c:1646 */ +#line 2702 "util/configparser.c" /* yacc.c:1646 */ break; - case 221: -#line 605 "./util/configparser.y" /* yacc.c:1646 */ + case 222: +#line 606 "./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 2706 "util/configparser.c" /* yacc.c:1646 */ +#line 2712 "util/configparser.c" /* yacc.c:1646 */ break; - case 222: -#line 612 "./util/configparser.y" /* yacc.c:1646 */ + case 223: +#line 613 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -2731,115 +2737,115 @@ yyreduce: } } } -#line 2735 "util/configparser.c" /* yacc.c:1646 */ +#line 2741 "util/configparser.c" /* yacc.c:1646 */ break; - case 223: -#line 638 "./util/configparser.y" /* yacc.c:1646 */ + case 224: +#line 639 "./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 2746 "util/configparser.c" /* yacc.c:1646 */ +#line 2752 "util/configparser.c" /* yacc.c:1646 */ break; - case 224: -#line 646 "./util/configparser.y" /* yacc.c:1646 */ + case 225: +#line 647 "./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 2756 "util/configparser.c" /* yacc.c:1646 */ +#line 2762 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: -#line 653 "./util/configparser.y" /* yacc.c:1646 */ + case 226: +#line 654 "./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 2766 "util/configparser.c" /* yacc.c:1646 */ +#line 2772 "util/configparser.c" /* yacc.c:1646 */ break; - case 226: -#line 660 "./util/configparser.y" /* yacc.c:1646 */ + case 227: +#line 661 "./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 2776 "util/configparser.c" /* yacc.c:1646 */ +#line 2782 "util/configparser.c" /* yacc.c:1646 */ break; - case 227: -#line 667 "./util/configparser.y" /* yacc.c:1646 */ + case 228: +#line 668 "./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 2786 "util/configparser.c" /* yacc.c:1646 */ +#line 2792 "util/configparser.c" /* yacc.c:1646 */ break; - case 228: -#line 674 "./util/configparser.y" /* yacc.c:1646 */ + case 229: +#line 675 "./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 2797 "util/configparser.c" /* yacc.c:1646 */ +#line 2803 "util/configparser.c" /* yacc.c:1646 */ break; - case 229: -#line 682 "./util/configparser.y" /* yacc.c:1646 */ + case 230: +#line 683 "./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 2808 "util/configparser.c" /* yacc.c:1646 */ +#line 2814 "util/configparser.c" /* yacc.c:1646 */ break; - case 230: -#line 690 "./util/configparser.y" /* yacc.c:1646 */ + case 231: +#line 691 "./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 2819 "util/configparser.c" /* yacc.c:1646 */ +#line 2825 "util/configparser.c" /* yacc.c:1646 */ break; - case 231: -#line 698 "./util/configparser.y" /* yacc.c:1646 */ + case 232: +#line 699 "./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 2829 "util/configparser.c" /* yacc.c:1646 */ +#line 2835 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: -#line 705 "./util/configparser.y" /* yacc.c:1646 */ + case 233: +#line 706 "./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 2839 "util/configparser.c" /* yacc.c:1646 */ +#line 2845 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: -#line 712 "./util/configparser.y" /* yacc.c:1646 */ + case 234: +#line 713 "./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) @@ -2847,11 +2853,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2851 "util/configparser.c" /* yacc.c:1646 */ +#line 2857 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: -#line 721 "./util/configparser.y" /* yacc.c:1646 */ + case 235: +#line 722 "./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) @@ -2859,53 +2865,65 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2863 "util/configparser.c" /* yacc.c:1646 */ +#line 2869 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: -#line 730 "./util/configparser.y" /* yacc.c:1646 */ + case 236: +#line 731 "./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) + yyerror("expected yes or no."); + else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 2881 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 237: +#line 740 "./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 2873 "util/configparser.c" /* yacc.c:1646 */ +#line 2891 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: -#line 737 "./util/configparser.y" /* yacc.c:1646 */ + case 238: +#line 747 "./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 2883 "util/configparser.c" /* yacc.c:1646 */ +#line 2901 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: -#line 744 "./util/configparser.y" /* yacc.c:1646 */ + case 239: +#line 754 "./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 2894 "util/configparser.c" /* yacc.c:1646 */ +#line 2912 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: -#line 752 "./util/configparser.y" /* yacc.c:1646 */ + case 240: +#line 762 "./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 2905 "util/configparser.c" /* yacc.c:1646 */ +#line 2923 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: -#line 760 "./util/configparser.y" /* yacc.c:1646 */ + case 241: +#line 770 "./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) @@ -2914,11 +2932,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2918 "util/configparser.c" /* yacc.c:1646 */ +#line 2936 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: -#line 770 "./util/configparser.y" /* yacc.c:1646 */ + case 242: +#line 780 "./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) @@ -2927,11 +2945,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2931 "util/configparser.c" /* yacc.c:1646 */ +#line 2949 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: -#line 780 "./util/configparser.y" /* yacc.c:1646 */ + case 243: +#line 790 "./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) @@ -2940,11 +2958,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2944 "util/configparser.c" /* yacc.c:1646 */ +#line 2962 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: -#line 790 "./util/configparser.y" /* yacc.c:1646 */ + case 244: +#line 800 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2956,11 +2974,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2960 "util/configparser.c" /* yacc.c:1646 */ +#line 2978 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: -#line 803 "./util/configparser.y" /* yacc.c:1646 */ + case 245: +#line 813 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2970,22 +2988,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2974 "util/configparser.c" /* yacc.c:1646 */ +#line 2992 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: -#line 814 "./util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 824 "./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 2985 "util/configparser.c" /* yacc.c:1646 */ +#line 3003 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: -#line 822 "./util/configparser.y" /* yacc.c:1646 */ + case 247: +#line 832 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2997,11 +3015,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3001 "util/configparser.c" /* yacc.c:1646 */ +#line 3019 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: -#line 835 "./util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 845 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3009,11 +3027,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3013 "util/configparser.c" /* yacc.c:1646 */ +#line 3031 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: -#line 844 "./util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 854 "./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) @@ -3021,11 +3039,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3025 "util/configparser.c" /* yacc.c:1646 */ +#line 3043 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: -#line 853 "./util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 863 "./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) @@ -3033,11 +3051,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3037 "util/configparser.c" /* yacc.c:1646 */ +#line 3055 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: -#line 862 "./util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 872 "./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) @@ -3046,11 +3064,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3050 "util/configparser.c" /* yacc.c:1646 */ +#line 3068 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: -#line 872 "./util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 882 "./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) @@ -3059,22 +3077,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3063 "util/configparser.c" /* yacc.c:1646 */ +#line 3081 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: -#line 882 "./util/configparser.y" /* yacc.c:1646 */ + case 253: +#line 892 "./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 3074 "util/configparser.c" /* yacc.c:1646 */ +#line 3092 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: -#line 890 "./util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 900 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3086,11 +3104,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3090 "util/configparser.c" /* yacc.c:1646 */ +#line 3108 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: -#line 903 "./util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 913 "./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) @@ -3098,22 +3116,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3102 "util/configparser.c" /* yacc.c:1646 */ +#line 3120 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: -#line 912 "./util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 922 "./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 3113 "util/configparser.c" /* yacc.c:1646 */ +#line 3131 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 920 "./util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 930 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3121,22 +3139,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3125 "util/configparser.c" /* yacc.c:1646 */ +#line 3143 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 929 "./util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 939 "./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 3136 "util/configparser.c" /* yacc.c:1646 */ +#line 3154 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 937 "./util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 947 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3148,11 +3166,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3152 "util/configparser.c" /* yacc.c:1646 */ +#line 3170 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 950 "./util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 960 "./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) @@ -3160,21 +3178,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3164 "util/configparser.c" /* yacc.c:1646 */ +#line 3182 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 959 "./util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 969 "./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 3174 "util/configparser.c" /* yacc.c:1646 */ +#line 3192 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 966 "./util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 976 "./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) @@ -3183,11 +3201,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3187 "util/configparser.c" /* yacc.c:1646 */ +#line 3205 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 976 "./util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 986 "./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) @@ -3196,11 +3214,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3200 "util/configparser.c" /* yacc.c:1646 */ +#line 3218 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 986 "./util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 996 "./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) @@ -3209,11 +3227,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3213 "util/configparser.c" /* yacc.c:1646 */ +#line 3231 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 996 "./util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 1006 "./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) @@ -3222,11 +3240,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3226 "util/configparser.c" /* yacc.c:1646 */ +#line 3244 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 1006 "./util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 1016 "./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) @@ -3235,11 +3253,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3239 "util/configparser.c" /* yacc.c:1646 */ +#line 3257 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 1016 "./util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 1026 "./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) @@ -3248,11 +3266,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3252 "util/configparser.c" /* yacc.c:1646 */ +#line 3270 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 1026 "./util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 1036 "./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) @@ -3261,11 +3279,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3265 "util/configparser.c" /* yacc.c:1646 */ +#line 3283 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 1036 "./util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 1046 "./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) @@ -3274,41 +3292,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3278 "util/configparser.c" /* yacc.c:1646 */ +#line 3296 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 1046 "./util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 1056 "./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 3288 "util/configparser.c" /* yacc.c:1646 */ +#line 3306 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 1053 "./util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 1063 "./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 3298 "util/configparser.c" /* yacc.c:1646 */ +#line 3316 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 1060 "./util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 1070 "./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 3308 "util/configparser.c" /* yacc.c:1646 */ +#line 3326 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 1067 "./util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 1077 "./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) @@ -3316,11 +3334,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3320 "util/configparser.c" /* yacc.c:1646 */ +#line 3338 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 1076 "./util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 1086 "./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) @@ -3328,11 +3346,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3332 "util/configparser.c" /* yacc.c:1646 */ +#line 3350 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 1085 "./util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 1095 "./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) @@ -3340,21 +3358,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3344 "util/configparser.c" /* yacc.c:1646 */ +#line 3362 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 1094 "./util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 1104 "./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 3354 "util/configparser.c" /* yacc.c:1646 */ +#line 3372 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 1101 "./util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 1111 "./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) @@ -3363,11 +3381,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3367 "util/configparser.c" /* yacc.c:1646 */ +#line 3385 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 1111 "./util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 1121 "./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 && @@ -3383,21 +3401,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 3387 "util/configparser.c" /* yacc.c:1646 */ +#line 3405 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 1128 "./util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 1138 "./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 3397 "util/configparser.c" /* yacc.c:1646 */ +#line 3415 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 1135 "./util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 1145 "./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) { @@ -3414,11 +3432,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3418 "util/configparser.c" /* yacc.c:1646 */ +#line 3436 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 1153 "./util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 1163 "./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) { @@ -3430,11 +3448,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3434 "util/configparser.c" /* yacc.c:1646 */ +#line 3452 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 1166 "./util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 1176 "./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) { @@ -3446,11 +3464,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3450 "util/configparser.c" /* yacc.c:1646 */ +#line 3468 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 1179 "./util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 1189 "./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) @@ -3458,11 +3476,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3462 "util/configparser.c" /* yacc.c:1646 */ +#line 3480 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 1188 "./util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 1198 "./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) @@ -3470,11 +3488,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3474 "util/configparser.c" /* yacc.c:1646 */ +#line 3492 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 1197 "./util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 1207 "./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) @@ -3482,11 +3500,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3486 "util/configparser.c" /* yacc.c:1646 */ +#line 3504 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 1206 "./util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 1216 "./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) @@ -3494,11 +3512,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3498 "util/configparser.c" /* yacc.c:1646 */ +#line 3516 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 1215 "./util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 1225 "./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) @@ -3507,11 +3525,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3511 "util/configparser.c" /* yacc.c:1646 */ +#line 3529 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 1225 "./util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 1235 "./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) @@ -3520,11 +3538,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3524 "util/configparser.c" /* yacc.c:1646 */ +#line 3542 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 1235 "./util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 1245 "./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) @@ -3532,11 +3550,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3536 "util/configparser.c" /* yacc.c:1646 */ +#line 3554 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 1244 "./util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 1254 "./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) @@ -3544,11 +3562,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3548 "util/configparser.c" /* yacc.c:1646 */ +#line 3566 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 1253 "./util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 1263 "./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) @@ -3560,11 +3578,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3564 "util/configparser.c" /* yacc.c:1646 */ +#line 3582 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 1266 "./util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 1276 "./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) @@ -3576,11 +3594,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3580 "util/configparser.c" /* yacc.c:1646 */ +#line 3598 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 1279 "./util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 1289 "./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) @@ -3588,21 +3606,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3592 "util/configparser.c" /* yacc.c:1646 */ +#line 3610 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 1288 "./util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 1298 "./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 3602 "util/configparser.c" /* yacc.c:1646 */ +#line 3620 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 1295 "./util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 1305 "./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) @@ -3610,11 +3628,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3614 "util/configparser.c" /* yacc.c:1646 */ +#line 3632 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 1304 "./util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 1314 "./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) @@ -3622,11 +3640,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3626 "util/configparser.c" /* yacc.c:1646 */ +#line 3644 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 1313 "./util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 1323 "./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) @@ -3634,11 +3652,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3638 "util/configparser.c" /* yacc.c:1646 */ +#line 3656 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 1322 "./util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 1332 "./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) @@ -3647,22 +3665,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3651 "util/configparser.c" /* yacc.c:1646 */ +#line 3669 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 1331 "./util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 1341 "./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 3662 "util/configparser.c" /* yacc.c:1646 */ +#line 3680 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 1339 "./util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 1349 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3674,22 +3692,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3678 "util/configparser.c" /* yacc.c:1646 */ +#line 3696 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 1352 "./util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 1362 "./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 3689 "util/configparser.c" /* yacc.c:1646 */ +#line 3707 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 1360 "./util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 1370 "./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 && @@ -3716,21 +3734,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 3720 "util/configparser.c" /* yacc.c:1646 */ +#line 3738 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1388 "./util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1398 "./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 3730 "util/configparser.c" /* yacc.c:1646 */ +#line 3748 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1395 "./util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1405 "./util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -3744,11 +3762,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 3748 "util/configparser.c" /* yacc.c:1646 */ +#line 3766 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1410 "./util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 1420 "./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) @@ -3757,11 +3775,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3761 "util/configparser.c" /* yacc.c:1646 */ +#line 3779 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1420 "./util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1430 "./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) @@ -3770,31 +3788,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3774 "util/configparser.c" /* yacc.c:1646 */ +#line 3792 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1430 "./util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 1440 "./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 3784 "util/configparser.c" /* yacc.c:1646 */ +#line 3802 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1437 "./util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1447 "./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 3794 "util/configparser.c" /* yacc.c:1646 */ +#line 3812 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1444 "./util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 1454 "./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) @@ -3802,11 +3820,11 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3806 "util/configparser.c" /* yacc.c:1646 */ +#line 3824 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1453 "./util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1463 "./util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -3819,11 +3837,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3823 "util/configparser.c" /* yacc.c:1646 */ +#line 3841 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1467 "./util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1477 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -3841,11 +3859,11 @@ yyreduce: } } } -#line 3845 "util/configparser.c" /* yacc.c:1646 */ +#line 3863 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1486 "./util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1496 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -3863,11 +3881,11 @@ yyreduce: } } } -#line 3867 "util/configparser.c" /* yacc.c:1646 */ +#line 3885 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1505 "./util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1515 "./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, @@ -3878,11 +3896,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3882 "util/configparser.c" /* yacc.c:1646 */ +#line 3900 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1517 "./util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1527 "./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, @@ -3893,11 +3911,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3897 "util/configparser.c" /* yacc.c:1646 */ +#line 3915 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1529 "./util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1539 "./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, @@ -3908,11 +3926,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3912 "util/configparser.c" /* yacc.c:1646 */ +#line 3930 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1541 "./util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1551 "./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, @@ -3922,11 +3940,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3926 "util/configparser.c" /* yacc.c:1646 */ +#line 3944 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1552 "./util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1562 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -3944,11 +3962,11 @@ yyreduce: } } } -#line 3948 "util/configparser.c" /* yacc.c:1646 */ +#line 3966 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1571 "./util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1581 "./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) @@ -3956,11 +3974,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3960 "util/configparser.c" /* yacc.c:1646 */ +#line 3978 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1581 "./util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1591 "./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) @@ -3968,33 +3986,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3972 "util/configparser.c" /* yacc.c:1646 */ +#line 3990 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1590 "./util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1600 "./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 3983 "util/configparser.c" /* yacc.c:1646 */ +#line 4001 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1598 "./util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1608 "./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 3994 "util/configparser.c" /* yacc.c:1646 */ +#line 4012 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 1606 "./util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1616 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4006,11 +4024,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4010 "util/configparser.c" /* yacc.c:1646 */ +#line 4028 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 1619 "./util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1629 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4022,11 +4040,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4026 "util/configparser.c" /* yacc.c:1646 */ +#line 4044 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 1632 "./util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1642 "./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) { @@ -4038,11 +4056,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4042 "util/configparser.c" /* yacc.c:1646 */ +#line 4060 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 1645 "./util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1655 "./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) { @@ -4054,11 +4072,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4058 "util/configparser.c" /* yacc.c:1646 */ +#line 4076 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 1658 "./util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1668 "./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) @@ -4066,11 +4084,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4070 "util/configparser.c" /* yacc.c:1646 */ +#line 4088 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 1667 "./util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1677 "./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) @@ -4078,11 +4096,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4082 "util/configparser.c" /* yacc.c:1646 */ +#line 4100 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1676 "./util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1686 "./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) @@ -4091,11 +4109,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4095 "util/configparser.c" /* yacc.c:1646 */ +#line 4113 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1686 "./util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1696 "./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) @@ -4104,11 +4122,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4108 "util/configparser.c" /* yacc.c:1646 */ +#line 4126 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1696 "./util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1706 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -4117,31 +4135,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 4121 "util/configparser.c" /* yacc.c:1646 */ +#line 4139 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1706 "./util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1716 "./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 4131 "util/configparser.c" /* yacc.c:1646 */ +#line 4149 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1713 "./util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1723 "./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 4141 "util/configparser.c" /* yacc.c:1646 */ +#line 4159 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1720 "./util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1730 "./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) @@ -4149,11 +4167,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4153 "util/configparser.c" /* yacc.c:1646 */ +#line 4171 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1729 "./util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1739 "./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) @@ -4162,11 +4180,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4166 "util/configparser.c" /* yacc.c:1646 */ +#line 4184 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1739 "./util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1749 "./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) @@ -4175,11 +4193,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4179 "util/configparser.c" /* yacc.c:1646 */ +#line 4197 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1749 "./util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1759 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -4188,31 +4206,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 4192 "util/configparser.c" /* yacc.c:1646 */ +#line 4210 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1759 "./util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1769 "./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 4202 "util/configparser.c" /* yacc.c:1646 */ +#line 4220 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1766 "./util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1776 "./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 4212 "util/configparser.c" /* yacc.c:1646 */ +#line 4230 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1773 "./util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1783 "./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) @@ -4220,11 +4238,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4224 "util/configparser.c" /* yacc.c:1646 */ +#line 4242 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1782 "./util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1792 "./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) @@ -4233,11 +4251,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4237 "util/configparser.c" /* yacc.c:1646 */ +#line 4255 "util/configparser.c" /* yacc.c:1646 */ break; - case 339: -#line 1792 "./util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1802 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -4246,11 +4264,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 4250 "util/configparser.c" /* yacc.c:1646 */ +#line 4268 "util/configparser.c" /* yacc.c:1646 */ break; - case 340: -#line 1802 "./util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1812 "./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 && @@ -4278,11 +4296,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4282 "util/configparser.c" /* yacc.c:1646 */ +#line 4300 "util/configparser.c" /* yacc.c:1646 */ break; - case 341: -#line 1831 "./util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1841 "./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)); @@ -4291,22 +4309,22 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 4295 "util/configparser.c" /* yacc.c:1646 */ +#line 4313 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1841 "./util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1851 "./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 4306 "util/configparser.c" /* yacc.c:1646 */ +#line 4324 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1849 "./util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1859 "./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))) { @@ -4314,11 +4332,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4318 "util/configparser.c" /* yacc.c:1646 */ +#line 4336 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1858 "./util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1868 "./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) @@ -4326,19 +4344,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4330 "util/configparser.c" /* yacc.c:1646 */ +#line 4348 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1867 "./util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1877 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 4338 "util/configparser.c" /* yacc.c:1646 */ +#line 4356 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1878 "./util/configparser.y" /* yacc.c:1646 */ + case 358: +#line 1888 "./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) @@ -4347,11 +4365,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4351 "util/configparser.c" /* yacc.c:1646 */ +#line 4369 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1888 "./util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1898 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4359,21 +4377,21 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4363 "util/configparser.c" /* yacc.c:1646 */ +#line 4381 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1897 "./util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1907 "./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 4373 "util/configparser.c" /* yacc.c:1646 */ +#line 4391 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1904 "./util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1914 "./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) @@ -4382,122 +4400,122 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4386 "util/configparser.c" /* yacc.c:1646 */ +#line 4404 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1914 "./util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1924 "./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 4396 "util/configparser.c" /* yacc.c:1646 */ +#line 4414 "util/configparser.c" /* yacc.c:1646 */ break; - case 361: -#line 1921 "./util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1931 "./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 4406 "util/configparser.c" /* yacc.c:1646 */ +#line 4424 "util/configparser.c" /* yacc.c:1646 */ break; - case 362: -#line 1928 "./util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1938 "./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 4416 "util/configparser.c" /* yacc.c:1646 */ +#line 4434 "util/configparser.c" /* yacc.c:1646 */ break; - case 363: -#line 1935 "./util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1945 "./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 4426 "util/configparser.c" /* yacc.c:1646 */ +#line 4444 "util/configparser.c" /* yacc.c:1646 */ break; - case 364: -#line 1942 "./util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1952 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 4434 "util/configparser.c" /* yacc.c:1646 */ +#line 4452 "util/configparser.c" /* yacc.c:1646 */ break; - case 379: -#line 1959 "./util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 1969 "./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 4445 "util/configparser.c" /* yacc.c:1646 */ +#line 4463 "util/configparser.c" /* yacc.c:1646 */ break; - case 380: -#line 1967 "./util/configparser.y" /* yacc.c:1646 */ + case 382: +#line 1977 "./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 4455 "util/configparser.c" /* yacc.c:1646 */ +#line 4473 "util/configparser.c" /* yacc.c:1646 */ break; - case 381: -#line 1974 "./util/configparser.y" /* yacc.c:1646 */ + case 383: +#line 1984 "./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 4466 "util/configparser.c" /* yacc.c:1646 */ +#line 4484 "util/configparser.c" /* yacc.c:1646 */ break; - case 382: -#line 1982 "./util/configparser.y" /* yacc.c:1646 */ + case 384: +#line 1992 "./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 4477 "util/configparser.c" /* yacc.c:1646 */ +#line 4495 "util/configparser.c" /* yacc.c:1646 */ break; - case 383: -#line 1990 "./util/configparser.y" /* yacc.c:1646 */ + case 385: +#line 2000 "./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 4487 "util/configparser.c" /* yacc.c:1646 */ +#line 4505 "util/configparser.c" /* yacc.c:1646 */ break; - case 384: -#line 1997 "./util/configparser.y" /* yacc.c:1646 */ + case 386: +#line 2007 "./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 4497 "util/configparser.c" /* yacc.c:1646 */ +#line 4515 "util/configparser.c" /* yacc.c:1646 */ break; - case 385: -#line 2004 "./util/configparser.y" /* yacc.c:1646 */ + case 387: +#line 2014 "./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) @@ -4505,11 +4523,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4509 "util/configparser.c" /* yacc.c:1646 */ +#line 4527 "util/configparser.c" /* yacc.c:1646 */ break; - case 386: -#line 2013 "./util/configparser.y" /* yacc.c:1646 */ + case 388: +#line 2023 "./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) @@ -4517,11 +4535,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4521 "util/configparser.c" /* yacc.c:1646 */ +#line 4539 "util/configparser.c" /* yacc.c:1646 */ break; - case 387: -#line 2022 "./util/configparser.y" /* yacc.c:1646 */ + case 389: +#line 2032 "./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) @@ -4529,11 +4547,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4533 "util/configparser.c" /* yacc.c:1646 */ +#line 4551 "util/configparser.c" /* yacc.c:1646 */ break; - case 388: -#line 2031 "./util/configparser.y" /* yacc.c:1646 */ + case 390: +#line 2041 "./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) @@ -4541,11 +4559,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4545 "util/configparser.c" /* yacc.c:1646 */ +#line 4563 "util/configparser.c" /* yacc.c:1646 */ break; - case 389: -#line 2040 "./util/configparser.y" /* yacc.c:1646 */ + case 391: +#line 2050 "./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) @@ -4553,11 +4571,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4557 "util/configparser.c" /* yacc.c:1646 */ +#line 4575 "util/configparser.c" /* yacc.c:1646 */ break; - case 390: -#line 2049 "./util/configparser.y" /* yacc.c:1646 */ + case 392: +#line 2059 "./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) @@ -4565,29 +4583,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4569 "util/configparser.c" /* yacc.c:1646 */ +#line 4587 "util/configparser.c" /* yacc.c:1646 */ break; - case 391: -#line 2058 "./util/configparser.y" /* yacc.c:1646 */ + case 393: +#line 2068 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(python:)\n")); } -#line 4577 "util/configparser.c" /* yacc.c:1646 */ +#line 4595 "util/configparser.c" /* yacc.c:1646 */ break; - case 395: -#line 2067 "./util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 2077 "./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 4587 "util/configparser.c" /* yacc.c:1646 */ +#line 4605 "util/configparser.c" /* yacc.c:1646 */ break; - case 396: -#line 2073 "./util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 2083 "./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) @@ -4596,21 +4614,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4600 "util/configparser.c" /* yacc.c:1646 */ +#line 4618 "util/configparser.c" /* yacc.c:1646 */ break; - case 397: -#line 2083 "./util/configparser.y" /* yacc.c:1646 */ + case 399: +#line 2093 "./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 4610 "util/configparser.c" /* yacc.c:1646 */ +#line 4628 "util/configparser.c" /* yacc.c:1646 */ break; - case 398: -#line 2090 "./util/configparser.y" /* yacc.c:1646 */ + case 400: +#line 2100 "./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)); @@ -4618,22 +4636,22 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 4622 "util/configparser.c" /* yacc.c:1646 */ +#line 4640 "util/configparser.c" /* yacc.c:1646 */ break; - case 399: -#line 2099 "./util/configparser.y" /* yacc.c:1646 */ + case 401: +#line 2109 "./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 4633 "util/configparser.c" /* yacc.c:1646 */ +#line 4651 "util/configparser.c" /* yacc.c:1646 */ break; -#line 4637 "util/configparser.c" /* yacc.c:1646 */ +#line 4655 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4861,7 +4879,7 @@ yyreturn: #endif return yyresult; } -#line 2106 "./util/configparser.y" /* yacc.c:1906 */ +#line 2116 "./util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index c3706847f..997230070 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -235,9 +235,10 @@ extern int yydebug; VAR_FAKE_DSA = 445, VAR_FAKE_SHA1 = 446, VAR_LOG_IDENTITY = 447, - VAR_USE_SYSTEMD = 448, - VAR_SHM_ENABLE = 449, - VAR_SHM_KEY = 450 + VAR_HIDE_TRUSTANCHOR = 448, + VAR_USE_SYSTEMD = 449, + VAR_SHM_ENABLE = 450, + VAR_SHM_KEY = 451 }; #endif /* Tokens. */ @@ -431,9 +432,10 @@ extern int yydebug; #define VAR_FAKE_DSA 445 #define VAR_FAKE_SHA1 446 #define VAR_LOG_IDENTITY 447 -#define VAR_USE_SYSTEMD 448 -#define VAR_SHM_ENABLE 449 -#define VAR_SHM_KEY 450 +#define VAR_HIDE_TRUSTANCHOR 448 +#define VAR_USE_SYSTEMD 449 +#define VAR_SHM_ENABLE 450 +#define VAR_SHM_KEY 451 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -444,7 +446,7 @@ union YYSTYPE char* str; -#line 448 "util/configparser.h" /* yacc.c:1909 */ +#line 450 "util/configparser.h" /* yacc.c:1909 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/util/configparser.y b/util/configparser.y index f9ed8593f..a16ab6424 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -137,7 +137,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_LOCAL_ZONE_OVERRIDE VAR_ACCESS_CONTROL_TAG_ACTION %token VAR_ACCESS_CONTROL_TAG_DATA VAR_VIEW VAR_ACCESS_CONTROL_VIEW %token VAR_VIEW_FIRST VAR_SERVE_EXPIRED VAR_FAKE_DSA VAR_FAKE_SHA1 -%token VAR_LOG_IDENTITY +%token VAR_LOG_IDENTITY VAR_HIDE_TRUSTANCHOR %token VAR_USE_SYSTEMD VAR_SHM_ENABLE VAR_SHM_KEY %% @@ -218,7 +218,8 @@ content_server: server_num_threads | server_verbosity | server_port | server_qname_minimisation_strict | server_serve_expired | server_fake_dsa | server_log_identity | server_use_systemd | server_response_ip_tag | server_response_ip | server_response_ip_data | - server_shm_enable | server_shm_key | server_fake_sha1 + server_shm_enable | server_shm_key | server_fake_sha1 | + server_hide_trustanchor ; stubstart: VAR_STUB_ZONE { @@ -726,6 +727,15 @@ server_hide_version: VAR_HIDE_VERSION STRING_ARG free($2); } ; +server_hide_trustanchor: VAR_HIDE_TRUSTANCHOR STRING_ARG + { + OUTYY(("P(server_hide_trustanchor:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->hide_trustanchor = (strcmp($2, "yes")==0); + free($2); + } + ; server_identity: VAR_IDENTITY STRING_ARG { OUTYY(("P(server_identity:%s)\n", $2)); diff --git a/util/shm_side/shm_main.c b/util/shm_side/shm_main.c index 337da99f2..2911db790 100644 --- a/util/shm_side/shm_main.c +++ b/util/shm_side/shm_main.c @@ -89,6 +89,8 @@ int shm_main_init(struct daemon* daemon) /* sanitize */ if(!daemon) return 0; + if(!daemon->cfg->shm_enable) + return 1; if(daemon->cfg->stat_interval == 0) log_warn("shm-enable is yes but statistics-interval is 0");