From: Wouter Wijngaards Date: Thu, 16 Apr 2015 14:18:50 +0000 (+0000) Subject: - Ratelimit does not apply to prefetched queries, and ratelimit-factor X-Git-Tag: release-1.5.4~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=628ff052858b4de8ddd599b785b8f679a588ea2e;p=thirdparty%2Funbound.git - Ratelimit does not apply to prefetched queries, and ratelimit-factor is default 10. Repeated normal queries get resolved and with prefetch stay in the cache. git-svn-id: file:///svn/unbound/trunk@3399 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/Makefile.in b/Makefile.in index 94b126d31..d4fe319bd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -642,8 +642,8 @@ iterator.lo iterator.o: $(srcdir)/iterator/iterator.c config.h $(srcdir)/iterato $(srcdir)/validator/val_neg.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/infra.h \ $(srcdir)/util/rtt.h $(srcdir)/util/netevent.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \ $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/util/config_file.h $(srcdir)/sldns/wire2str.h \ - $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/util/config_file.h $(srcdir)/util/random.h \ + $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h iter_delegpt.lo iter_delegpt.o: $(srcdir)/iterator/iter_delegpt.c config.h $(srcdir)/iterator/iter_delegpt.h \ $(srcdir)/util/log.h $(srcdir)/services/cache/dns.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/regional.h \ diff --git a/doc/Changelog b/doc/Changelog index de05cddb7..f516556ad 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,8 @@ 16 April 2015: Wouter - Add local-zone type inform_deny, that logs query and drops answer. + - Ratelimit does not apply to prefetched queries, and ratelimit-factor + is default 10. Repeated normal queries get resolved and with + prefetch stay in the cache. 10 April 2015: Wouter - unbound-control ratelimit_list lists high rate domains. diff --git a/doc/example.conf.in b/doc/example.conf.in index 542de49b1..4c45badcf 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -561,6 +561,9 @@ server: # ratelimit-size: 4m # ratelimit cache slabs, reduces lock contention if equal to cpucount. # ratelimit-slabs: 4 + + # 0 blocks when ratelimited, otherwise let 1/xth traffic through + # ratelimit-factor: 10 # override the ratelimit for a specific domain name. # give this setting multiple times to have multiple overrides. diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 403ef82c5..a5d0cc8ca 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -1006,6 +1006,15 @@ Give power of 2 number of slabs, this is used to reduce lock contention in the ratelimit tracking data structure. Close to the number of cpus is a fairly good setting. .TP 5 +.B ratelimit\-factor: \fI +Set the amount of queries to rate limit when the limit is exceeded. +If set to 0, all queries are dropped for domains where the limit is +exceeded. If set to another value, 1 in that number is allowed through +to complete. Default is 10, allowing 1/10 traffic to flow normally. +This can make ordinary queries complete (if repeatedly queried for), +and enter the cache, whilst also mitigiting the traffic flow by the +factor given. +.TP 5 .B ratelimit\-for\-domain: \fI Override the global ratelimit for an exact match domain name with the listed number. You can give this for any number of names. For example, for diff --git a/iterator/iterator.c b/iterator/iterator.c index 947255824..9c65b1d99 100644 --- a/iterator/iterator.c +++ b/iterator/iterator.c @@ -61,6 +61,7 @@ #include "util/data/msgencode.h" #include "util/fptr_wlist.h" #include "util/config_file.h" +#include "util/random.h" #include "sldns/rrdef.h" #include "sldns/wire2str.h" #include "sldns/parseutil.h" @@ -120,6 +121,7 @@ iter_new(struct module_qstate* qstate, int id) iq->query_restart_count = 0; iq->referral_count = 0; iq->sent_count = 0; + iq->ratelimit_ok = 0; iq->target_count = NULL; iq->wait_priming_stub = 0; iq->refetch_glue = 0; @@ -1125,17 +1127,31 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq, * results of priming. */ return 0; } - if(infra_ratelimit_exceeded(qstate->env->infra_cache, - iq->dp->name, iq->dp->namelen, *qstate->env->now)) { + if(!iq->ratelimit_ok && qstate->prefetch_leeway) + iq->ratelimit_ok = 1; /* allow prefetches, this keeps + otherwise valid data in the cache */ + if(!iq->ratelimit_ok && infra_ratelimit_exceeded( + qstate->env->infra_cache, iq->dp->name, + iq->dp->namelen, *qstate->env->now)) { /* and increment the rate, so that the rate for time * now will also exceed the rate, keeping cache fresh */ (void)infra_ratelimit_inc(qstate->env->infra_cache, iq->dp->name, iq->dp->namelen, *qstate->env->now); - log_nametypeclass(VERB_ALGO, "ratelimit exceeded with " - "delegation point", iq->dp->name, - LDNS_RR_TYPE_NS, LDNS_RR_CLASS_IN); - return error_response(qstate, id, LDNS_RCODE_SERVFAIL); + /* see if we are passed through with slip factor */ + if(qstate->env->cfg->ratelimit_factor != 0 && + ub_random_max(qstate->env->rnd, + qstate->env->cfg->ratelimit_factor) == 1) { + iq->ratelimit_ok = 1; + log_nametypeclass(VERB_ALGO, "ratelimit allowed through for " + "delegation point", iq->dp->name, + LDNS_RR_TYPE_NS, LDNS_RR_CLASS_IN); + } else { + log_nametypeclass(VERB_ALGO, "ratelimit exceeded with " + "delegation point", iq->dp->name, + LDNS_RR_TYPE_NS, LDNS_RR_CLASS_IN); + return error_response(qstate, id, LDNS_RCODE_SERVFAIL); + } } /* see if this dp not useless. @@ -1927,7 +1943,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, } /* if not forwarding, check ratelimits per delegationpoint name */ - if(!(iq->chase_flags & BIT_RD)) { + if(!(iq->chase_flags & BIT_RD) && !iq->ratelimit_ok) { if(!infra_ratelimit_inc(qstate->env->infra_cache, iq->dp->name, iq->dp->namelen, *qstate->env->now)) { verbose(VERB_ALGO, "query exceeded ratelimits"); @@ -1954,7 +1970,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, if(!outq) { log_addr(VERB_DETAIL, "error sending query to auth server", &target->addr, target->addrlen); - if(!(iq->chase_flags & BIT_RD)) + if(!(iq->chase_flags & BIT_RD) && !iq->ratelimit_ok) infra_ratelimit_dec(qstate->env->infra_cache, iq->dp->name, iq->dp->namelen, *qstate->env->now); return next_state(iq, QUERYTARGETS_STATE); @@ -2107,7 +2123,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq, * delegation point, and back to the QUERYTARGETS_STATE. */ verbose(VERB_DETAIL, "query response was REFERRAL"); - if(!(iq->chase_flags & BIT_RD)) { + if(!(iq->chase_flags & BIT_RD) && !iq->ratelimit_ok) { /* we have a referral, no ratelimit, we can send * our queries to the given name */ infra_ratelimit_dec(qstate->env->infra_cache, diff --git a/iterator/iterator.h b/iterator/iterator.h index cb8043fd5..36d3a6916 100644 --- a/iterator/iterator.h +++ b/iterator/iterator.h @@ -259,6 +259,9 @@ struct iter_qstate { * subqueries, the malloced-array is shared, [0] refcount. */ int* target_count; + /** if true, already tested for ratelimiting and passed the test */ + int ratelimit_ok; + /** * The query must store NS records from referrals as parentside RRs * Enabled once it hits resolution problems, to throttle retries. diff --git a/util/config_file.c b/util/config_file.c index af06ed7f5..eae7f2e42 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -234,6 +234,7 @@ config_create(void) cfg->ratelimit_size = 4*1024*1024; cfg->ratelimit_for_domain = NULL; cfg->ratelimit_below_domain = NULL; + cfg->ratelimit_factor = 10; return cfg; error_exit: config_delete(cfg); @@ -460,6 +461,7 @@ int config_set_option(struct config_file* cfg, const char* opt, } else S_MEMSIZE("ratelimit-size:", ratelimit_size) else S_POW2("ratelimit-slabs:", ratelimit_slabs) + else S_NUMBER_OR_ZERO("ratelimit-factor:", ratelimit_factor) /* val_sig_skew_min and max are copied into val_env during init, * so this does not update val_env with set_option */ else if(strcmp(opt, "val-sig-skew-min:") == 0) @@ -728,6 +730,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_DEC(opt, "ratelimit-slabs", ratelimit_slabs) else O_LS2(opt, "ratelimit-for-domain", ratelimit_for_domain) else O_LS2(opt, "ratelimit-below-domain", ratelimit_below_domain) + else O_DEC(opt, "ratelimit-factor", ratelimit_factor) else O_DEC(opt, "val-sig-skew-min", val_sig_skew_min) else O_DEC(opt, "val-sig-skew-max", val_sig_skew_max) /* not here: diff --git a/util/config_file.h b/util/config_file.h index 9e9dabcab..40afce5fd 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -352,10 +352,12 @@ struct config_file { size_t ratelimit_slabs; /** memory size in bytes for ratelimit cache */ size_t ratelimit_size; - /* ratelimits for domain (exact match) */ + /** ratelimits for domain (exact match) */ struct config_str2list* ratelimit_for_domain; - /* ratelimits below domain */ + /** ratelimits below domain */ struct config_str2list* ratelimit_below_domain; + /** ratelimit factor, 0 blocks all, 10 allows 1/10 of traffic */ + int ratelimit_factor; }; /** from cfg username, after daemonise setup performed */ diff --git a/util/configlexer.c b/util/configlexer.c index 57e85feac..69a84816a 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -363,8 +363,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 171 -#define YY_END_OF_BUFFER 172 +#define YY_NUM_RULES 172 +#define YY_END_OF_BUFFER 173 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -372,195 +372,196 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1699] = +static yyconst flex_int16_t yy_accept[1705] = { 0, - 1, 1, 153, 153, 157, 157, 161, 161, 165, 165, - 1, 1, 172, 169, 1, 151, 151, 170, 2, 170, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 153, - 154, 154, 155, 170, 157, 158, 158, 159, 170, 164, - 161, 162, 162, 163, 170, 165, 166, 166, 167, 170, - 168, 152, 2, 156, 170, 168, 169, 0, 1, 2, - 2, 2, 2, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 153, 0, 157, 0, 164, 0, 161, - 165, 0, 168, 0, 2, 2, 168, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 168, 169, 169, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 168, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 68, 169, 169, 169, 169, 169, 6, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 168, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 168, - 169, 169, 169, 169, 30, 169, 169, 169, 169, 169, - 169, 169, 169, 133, 169, 12, 13, 169, 15, 14, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 126, 169, - - 169, 169, 169, 169, 169, 3, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 168, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 160, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 33, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 34, 169, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 83, 160, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 82, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - - 169, 169, 169, 169, 169, 66, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 20, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 31, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 32, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 22, 169, 169, 169, 169, 169, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 146, - 169, 169, 169, 169, 169, 169, 26, 169, 27, 169, - 169, 169, 69, 169, 70, 169, 67, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 5, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 85, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - - 23, 169, 169, 169, 169, 169, 110, 109, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 35, 169, 169, 169, 169, 169, 169, 169, 169, 72, - 71, 169, 169, 169, 169, 169, 169, 169, 106, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 52, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 56, 169, 169, 169, 169, 169, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 108, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 4, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 103, 169, - 169, 169, 169, 169, 169, 169, 119, 169, 104, 169, - 131, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 21, 169, 169, 169, 169, 74, 169, 75, 73, - 169, 169, 169, 169, 169, 169, 169, 81, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 169, 105, - 169, 169, 169, 169, 130, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 65, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 28, - 169, 169, 17, 169, 169, 169, 16, 169, 90, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 42, 43, 169, 169, 169, 169, 169, 169, - 169, 134, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 76, 169, 169, 169, 169, - 169, 169, 80, 169, 169, 169, 169, 169, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 169, 84, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 125, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 94, 169, 98, 169, 169, 169, 169, 79, - 169, 169, 117, 169, 169, 169, 169, 132, 169, 169, - 169, 169, 169, 169, 169, 139, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 97, 169, 169, - 169, 169, 169, 44, 45, 169, 29, 51, 99, 169, - 111, 107, 169, 169, 38, 169, 101, 169, 169, 169, - - 169, 169, 7, 169, 64, 169, 169, 148, 169, 116, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 86, 138, 169, 169, - 169, 169, 169, 169, 169, 169, 127, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 100, 169, 37, 39, 169, 169, 169, 169, 169, - 63, 169, 169, 147, 169, 169, 169, 169, 121, 18, - 19, 169, 169, 169, 169, 169, 169, 169, 61, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 123, 120, - - 169, 169, 169, 169, 169, 169, 169, 169, 36, 169, - 169, 169, 169, 169, 169, 169, 11, 169, 169, 169, - 169, 169, 169, 169, 169, 10, 169, 169, 169, 169, - 40, 169, 129, 122, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 93, 92, 169, 124, 118, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 46, 169, - 128, 169, 169, 169, 169, 169, 169, 41, 169, 169, - 169, 87, 89, 112, 169, 169, 169, 91, 169, 169, - 169, 169, 169, 169, 169, 169, 135, 169, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 24, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 137, - 169, 169, 115, 169, 169, 169, 169, 169, 169, 169, - 49, 169, 25, 169, 9, 169, 169, 169, 169, 113, - 53, 169, 169, 169, 96, 169, 169, 169, 169, 169, - 169, 136, 77, 169, 169, 169, 169, 55, 59, 54, - 169, 47, 169, 8, 169, 149, 169, 169, 95, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 60, 58, - 169, 48, 169, 169, 114, 169, 169, 88, 169, 169, - - 169, 169, 169, 169, 78, 57, 50, 150, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 62, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 102, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 142, 169, 169, 169, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 140, 169, 143, 144, - 169, 169, 169, 169, 169, 141, 145, 0 - + 1, 1, 154, 154, 158, 158, 162, 162, 166, 166, + 1, 1, 173, 170, 1, 152, 152, 171, 2, 171, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 154, + 155, 155, 156, 171, 158, 159, 159, 160, 171, 165, + 162, 163, 163, 164, 171, 166, 167, 167, 168, 171, + 169, 153, 2, 157, 171, 169, 170, 0, 1, 2, + 2, 2, 2, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 154, 0, 158, 0, 165, 0, 162, + 166, 0, 169, 0, 2, 2, 169, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 169, 170, 170, 170, 170, + + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 169, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 68, 170, 170, 170, 170, 170, 6, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 169, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 169, + 170, 170, 170, 170, 30, 170, 170, 170, 170, 170, + 170, 170, 170, 133, 170, 12, 13, 170, 15, 14, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 126, 170, + + 170, 170, 170, 170, 170, 3, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 169, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 161, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 33, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 34, 170, 170, 170, + + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 83, 161, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 82, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + + 170, 170, 170, 170, 170, 66, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 20, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 31, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 32, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 22, 170, 170, 170, 170, 170, 170, 170, + + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 146, + 170, 170, 170, 170, 170, 170, 26, 170, 27, 170, + 170, 170, 69, 170, 70, 170, 67, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 5, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 85, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + + 23, 170, 170, 170, 170, 170, 110, 109, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 35, 170, 170, 170, 170, 170, 170, 170, 170, 72, + 71, 170, 170, 170, 170, 170, 170, 170, 106, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 52, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 56, 170, 170, 170, 170, 170, 170, 170, + + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 108, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 4, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 103, + 170, 170, 170, 170, 170, 170, 170, 119, 170, 104, + 170, 131, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 21, 170, 170, 170, 170, 74, 170, 75, + 73, 170, 170, 170, 170, 170, 170, 170, 81, 170, + + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 105, 170, 170, 170, 170, 130, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 65, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 28, 170, 170, 17, 170, 170, 170, 16, 170, + 90, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 42, 43, 170, 170, 170, 170, + 170, 170, 170, 134, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 76, 170, 170, + 170, 170, 170, 170, 80, 170, 170, 170, 170, 170, + + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 84, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 125, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 94, 170, 98, 170, 170, + 170, 170, 79, 170, 170, 117, 170, 170, 170, 170, + 132, 170, 170, 170, 170, 170, 170, 170, 139, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 97, 170, 170, 170, 170, 170, 44, 45, 170, 29, + 51, 99, 170, 111, 107, 170, 170, 38, 170, 101, + + 170, 170, 170, 170, 170, 7, 170, 64, 170, 170, + 170, 148, 170, 116, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 86, 138, 170, 170, 170, 170, 170, 170, 170, 170, + 127, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 100, 170, 37, 39, 170, + 170, 170, 170, 170, 63, 170, 170, 170, 147, 170, + 170, 170, 170, 121, 18, 19, 170, 170, 170, 170, + 170, 170, 170, 61, 170, 170, 170, 170, 170, 170, + + 170, 170, 170, 123, 120, 170, 170, 170, 170, 170, + 170, 170, 170, 36, 170, 170, 170, 170, 170, 170, + 170, 11, 170, 170, 170, 170, 170, 170, 170, 170, + 10, 170, 170, 170, 151, 170, 40, 170, 129, 122, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 93, 92, 170, 124, 118, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 46, 170, 128, 170, 170, 170, + 170, 170, 170, 41, 170, 170, 170, 87, 89, 112, + 170, 170, 170, 91, 170, 170, 170, 170, 170, 170, + + 170, 170, 135, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 24, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 137, 170, 170, 115, 170, + 170, 170, 170, 170, 170, 170, 49, 170, 25, 170, + 9, 170, 170, 170, 170, 113, 53, 170, 170, 170, + 96, 170, 170, 170, 170, 170, 170, 136, 77, 170, + 170, 170, 170, 55, 59, 54, 170, 47, 170, 8, + 170, 149, 170, 170, 95, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 60, 58, 170, 48, 170, 170, + + 114, 170, 170, 88, 170, 170, 170, 170, 170, 170, + 78, 57, 50, 150, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 62, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 102, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 142, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, + 170, 170, 140, 170, 143, 144, 170, 170, 170, 170, + + 170, 141, 145, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -603,15 +604,15 @@ static yyconst flex_int32_t yy_meta[40] = 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[1713] = +static yyconst flex_int16_t yy_base[1719] = { 0, 0, 0, 37, 40, 44, 51, 63, 75, 56, 68, - 87, 108, 3005, 2883, 50, 3371, 3371, 3371, 129, 94, + 87, 108, 2907, 2759, 50, 3384, 3384, 3384, 129, 94, 70, 104, 130, 90, 92, 115, 127, 95, 84, 111, - 137, 148, 50, 150, 161, 158, 154, 167, 182, 2745, - 3371, 3371, 3371, 70, 2207, 3371, 3371, 3371, 42, 2179, - 2055, 3371, 3371, 3371, 199, 1990, 3371, 3371, 3371, 141, - 1867, 3371, 203, 3371, 207, 122, 1593, 213, 120, 0, + 137, 148, 50, 150, 161, 158, 154, 167, 182, 2510, + 3384, 3384, 3384, 70, 2461, 3384, 3384, 3384, 42, 2413, + 2316, 3384, 3384, 3384, 199, 2217, 3384, 3384, 3384, 141, + 1867, 3384, 203, 3384, 207, 122, 1593, 213, 120, 0, 224, 0, 0, 103, 147, 140, 171, 208, 170, 209, 210, 189, 200, 222, 206, 214, 225, 227, 229, 180, 230, 236, 237, 231, 241, 248, 238, 240, 249, 252, @@ -639,7 +640,7 @@ static yyconst flex_int16_t yy_base[1713] = 655, 652, 658, 666, 672, 671, 669, 678, 680, 670, 681, 689, 674, 687, 686, 688, 690, 694, 693, 700, - 3371, 702, 697, 704, 706, 705, 3371, 707, 708, 709, + 3384, 702, 697, 704, 706, 705, 3384, 707, 708, 709, 710, 711, 713, 725, 722, 724, 726, 729, 730, 731, 732, 734, 754, 737, 735, 744, 738, 743, 758, 742, 764, 756, 761, 766, 750, 752, 772, 775, 768, 776, @@ -653,343 +654,343 @@ static yyconst flex_int16_t yy_base[1713] = 911, 912, 913, 915, 916, 917, 919, 918, 921, 920, 924, 934, 925, 940, 928, 468, 942, 943, 926, 948, 946, 949, 950, 951, 955, 952, 958, 962, 963, 964, - 972, 974, 966, 967, 3371, 984, 981, 980, 973, 982, - 983, 986, 1012, 3371, 988, 3371, 3371, 989, 3371, 3371, + 972, 974, 966, 967, 3384, 984, 981, 980, 973, 982, + 983, 986, 1012, 3384, 988, 3384, 3384, 989, 3384, 3384, 993, 994, 995, 1009, 1035, 1005, 996, 997, 1013, 1008, 1018, 1019, 1015, 1026, 1029, 1023, 1033, 1038, 1040, 1041, 1043, 1045, 1046, 1050, 1057, 1066, 1067, 1048, 1063, 1065, - 1068, 1070, 1072, 1071, 1075, 1079, 1085, 1081, 3371, 1082, + 1068, 1070, 1072, 1071, 1075, 1079, 1085, 1081, 3384, 1082, - 1083, 1084, 1089, 1092, 1093, 3371, 1094, 1097, 1095, 1099, + 1083, 1084, 1089, 1092, 1093, 3384, 1094, 1097, 1095, 1099, 1101, 1105, 1103, 1106, 1108, 1109, 1111, 1113, 1118, 1114, 1117, 1135, 1137, 1129, 1121, 1136, 1138, 1139, 1141, 1149, 1147, 1145, 1146, 1156, 1152, 1154, 1158, 1155, 1161, 1162, 1164, 1166, 1189, 1167, 1168, 1174, 1169, 1173, 1176, 1177, 1175, 1182, 1196, 1202, 1195, 1185, 1203, 1187, 1213, 1214, 1204, 1218, 1212, 1219, 1224, 1227, 1221, 1228, 1230, 1234, - 1235, 3371, 1241, 1243, 1237, 1238, 1245, 1244, 1248, 1252, - 1247, 1253, 1254, 1255, 1259, 1262, 3371, 1260, 1265, 1267, - 1270, 1271, 1272, 1278, 1280, 1289, 3371, 1291, 1292, 1285, + 1235, 3384, 1241, 1243, 1237, 1238, 1245, 1244, 1248, 1252, + 1247, 1253, 1254, 1255, 1259, 1262, 3384, 1260, 1265, 1267, + 1270, 1271, 1272, 1278, 1280, 1289, 3384, 1291, 1292, 1285, 1294, 1295, 1297, 1298, 1299, 1300, 1302, 1303, 1306, 1312, 1316, 1304, 1308, 1321, 1311, 1319, 1323, 1327, 1325, 1328, 1331, 1332, 1334, 1336, 1342, 1344, 1341, 1347, 1350, 1351, - 1352, 1357, 1354, 1358, 1355, 1359, 3371, 125, 1361, 1362, + 1352, 1357, 1354, 1358, 1355, 1359, 3384, 125, 1361, 1362, 1360, 1368, 1371, 1373, 1376, 1379, 1381, 1370, 1382, 1383, 1387, 1389, 1391, 1394, 1392, 1395, 1397, 1403, 1399, 1404, 1405, 1408, 1411, 1414, 1415, 1418, 1421, 1419, 1424, 1426, - 1422, 1430, 1427, 1431, 1432, 1434, 1436, 1435, 1438, 3371, + 1422, 1430, 1427, 1431, 1432, 1434, 1436, 1435, 1438, 3384, 1448, 1444, 1445, 1449, 1454, 1461, 1457, 1462, 1464, 1465, 1471, 1467, 1470, 1473, 1479, 1472, 1482, 1483, 1484, 1490, - 1491, 1488, 1492, 1489, 1495, 3371, 1500, 1494, 1499, 1513, - 1501, 1510, 1511, 1514, 1516, 1518, 1521, 1522, 1524, 3371, + 1491, 1488, 1492, 1489, 1495, 3384, 1500, 1494, 1499, 1513, + 1501, 1510, 1511, 1514, 1516, 1518, 1521, 1522, 1524, 3384, 1527, 1526, 1525, 1533, 1535, 1539, 1536, 1546, 1540, 1542, - 1548, 1549, 1550, 1552, 1553, 1557, 3371, 1563, 1566, 1562, + 1548, 1549, 1550, 1552, 1553, 1557, 3384, 1563, 1566, 1562, 1573, 1565, 1569, 1571, 1576, 1572, 1577, 1583, 1579, 1581, - 1580, 1584, 1586, 1587, 1589, 1590, 1591, 1597, 3371, 1609, + 1580, 1584, 1586, 1587, 1589, 1590, 1591, 1597, 3384, 1609, 1594, 1605, 1615, 1596, 1616, 1618, 1619, 1620, 1621, 1623, 1624, 1625, 1626, 1627, 1632, 1633, 1628, 1634, 1636, 1635, 1640, 1637, 1648, 1638, 1655, 1657, 1659, 1658, 1661, 1667, - 1668, 1669, 3371, 1674, 1660, 1671, 1675, 1677, 1685, 1682, + 1668, 1669, 3384, 1674, 1660, 1671, 1675, 1677, 1685, 1682, 1683, 1686, 1687, 1688, 1691, 1695, 1692, 1693, 1698, 1699, - 1694, 1700, 1701, 1703, 1709, 1706, 1715, 1720, 1724, 3371, - 1719, 1723, 1727, 1731, 1725, 1738, 3371, 1734, 3371, 1736, - 1746, 1742, 3371, 1749, 3371, 1751, 3371, 1753, 1754, 1744, + 1694, 1700, 1701, 1703, 1709, 1706, 1715, 1720, 1724, 3384, + 1719, 1723, 1727, 1731, 1725, 1738, 3384, 1734, 3384, 1736, + 1746, 1742, 3384, 1749, 3384, 1751, 3384, 1753, 1754, 1744, 1740, 1757, 1758, 1760, 1762, 1764, 1766, 1768, 1769, 1770, - 1772, 1773, 3371, 1776, 1779, 1781, 1777, 1783, 1785, 1786, - 1787, 1800, 1789, 1801, 1798, 1807, 1802, 3371, 1799, 1810, + 1772, 1773, 3384, 1776, 1779, 1781, 1777, 1783, 1785, 1786, + 1787, 1800, 1789, 1801, 1798, 1807, 1802, 3384, 1799, 1810, 1804, 1813, 1814, 1824, 1821, 1818, 1825, 1815, 1828, 1834, 1835, 1837, 1822, 1838, 1839, 1847, 1843, 1845, 1849, 1846, 1852, 1853, 1854, 1857, 1856, 1859, 1865, 1861, 1862, 1863, - 3371, 1864, 1875, 1876, 1877, 1878, 3371, 3371, 1880, 1885, + 3384, 1864, 1875, 1876, 1877, 1878, 3384, 3384, 1880, 1885, 1887, 1891, 1893, 1895, 1896, 1897, 1903, 1900, 1901, 1904, 1909, 1910, 1911, 1912, 1915, 1913, 1918, 1919, 1926, 1922, - 3371, 1925, 1928, 1937, 1933, 1931, 1947, 1941, 1949, 3371, - 3371, 1945, 1943, 1944, 1948, 1955, 1957, 1959, 3371, 1960, - 1961, 1963, 1964, 1966, 1970, 1972, 1974, 1976, 1978, 1981, - 1982, 1988, 1984, 1985, 1991, 1987, 1998, 2000, 3371, 2002, - 2005, 2006, 2007, 2008, 2009, 2010, 2014, 2013, 2016, 2015, - 2024, 2031, 2020, 2027, 2028, 2033, 2029, 2038, 2040, 2043, - 2050, 2051, 3371, 2057, 2042, 2058, 2034, 2056, 2061, 2068, - - 2064, 2065, 2066, 2067, 2070, 2069, 2072, 2073, 2074, 2080, - 3371, 2079, 2082, 2089, 2091, 2092, 2093, 2094, 2096, 2097, - 3371, 2102, 2108, 2105, 2109, 2111, 2112, 2106, 2114, 2118, - 2120, 2121, 2123, 2126, 2127, 2128, 2129, 2131, 2133, 2137, - 2145, 2136, 2142, 2154, 2151, 2160, 2163, 2139, 2152, 2166, - 2162, 2167, 2168, 2169, 2175, 2173, 2177, 2176, 3371, 2178, - 2183, 2185, 2186, 2191, 2187, 2189, 3371, 2197, 3371, 2199, - 3371, 2200, 2204, 2190, 2205, 2201, 2206, 2209, 2215, 2221, - 2208, 3371, 2217, 2223, 2224, 2226, 3371, 2228, 3371, 3371, - 2230, 2232, 2236, 2234, 2237, 2240, 2244, 3371, 2247, 2239, - - 2248, 2252, 2250, 2253, 2255, 2256, 2257, 2258, 2260, 3371, - 2264, 2273, 2263, 2270, 3371, 2262, 2283, 2266, 2284, 2285, - 2286, 2288, 2277, 2274, 2301, 2297, 3371, 2290, 2298, 2300, - 2303, 2310, 2306, 2313, 2304, 2308, 2319, 2314, 2322, 3371, - 2324, 2325, 3371, 2326, 2307, 2328, 3371, 2331, 3371, 2332, - 2333, 2335, 2336, 2341, 2342, 2347, 2343, 2349, 2350, 2352, - 2357, 2358, 3371, 3371, 2354, 2368, 2369, 2359, 2361, 2372, - 2374, 3371, 2364, 2375, 2376, 2378, 2381, 2382, 2385, 2384, - 2387, 2388, 2390, 2392, 2394, 3371, 2396, 2397, 2398, 2402, - 2404, 2405, 3371, 2407, 2408, 2409, 2410, 2412, 2414, 2428, - - 2430, 2420, 2432, 2435, 2437, 2438, 2440, 2442, 2443, 3371, - 2444, 2446, 2447, 2451, 2452, 2448, 2453, 2458, 2461, 2463, - 2465, 3371, 2455, 2467, 2469, 2472, 2476, 2473, 2479, 2477, - 2481, 2483, 2484, 2485, 2487, 2489, 2490, 2492, 2495, 2496, - 2502, 2503, 3371, 2500, 3371, 2506, 2511, 2518, 2516, 3371, - 2514, 2519, 3371, 2521, 2522, 2523, 2533, 3371, 2535, 2526, - 2536, 2530, 2538, 2528, 2544, 3371, 2546, 2548, 2554, 2555, - 2539, 2549, 2557, 2556, 2562, 2569, 2565, 3371, 2558, 2568, - 2575, 2572, 2577, 3371, 3371, 2581, 3371, 3371, 3371, 2584, - 3371, 3371, 2585, 2587, 3371, 2589, 3371, 2596, 2592, 2578, - - 2595, 2597, 3371, 2599, 3371, 2605, 2601, 3371, 2604, 3371, - 2606, 2607, 2608, 2610, 2613, 2619, 2621, 2614, 2623, 2624, - 2625, 2627, 2628, 2629, 2631, 2634, 2632, 2635, 2638, 2640, - 2642, 2644, 2645, 2647, 2654, 2660, 3371, 3371, 2646, 2657, - 2648, 2661, 2663, 2665, 2668, 2673, 3371, 2677, 2669, 2680, - 2667, 2671, 2679, 2683, 2684, 2691, 2693, 2692, 2694, 2695, - 2696, 3371, 2698, 3371, 3371, 2700, 2701, 2706, 2707, 2708, - 3371, 2711, 2712, 3371, 2719, 2702, 2724, 2728, 3371, 3371, - 3371, 2729, 2713, 2731, 2732, 2733, 2734, 2736, 3371, 2739, - 2741, 2742, 2743, 2749, 2751, 2757, 2756, 2760, 3371, 3371, - - 2766, 2763, 2764, 2762, 2765, 2768, 2770, 2772, 3371, 2774, - 2773, 2779, 2778, 2781, 2782, 2785, 3371, 2786, 2788, 2793, - 2796, 2789, 2800, 2801, 2797, 3371, 2804, 2803, 2806, 2810, - 3371, 2815, 3371, 3371, 2807, 2817, 2819, 2824, 2826, 2829, - 2820, 2830, 2836, 2833, 2835, 3371, 3371, 2834, 3371, 3371, - 2837, 2841, 2842, 2843, 2845, 2848, 2849, 2850, 2851, 2852, - 2856, 2861, 2862, 2864, 2865, 2866, 2869, 2872, 3371, 2871, - 3371, 2876, 2879, 2881, 2873, 2880, 2886, 3371, 2887, 2888, - 2541, 3371, 3371, 3371, 2897, 2898, 2901, 3371, 2903, 2904, - 2890, 2907, 2905, 2914, 2906, 2916, 3371, 2917, 2918, 2920, - - 2921, 2926, 2922, 2924, 2929, 2927, 2928, 2940, 2930, 2942, - 2945, 3371, 2947, 2944, 2951, 2934, 2953, 2956, 2958, 2959, - 2960, 2961, 2963, 2965, 2966, 2967, 2973, 2970, 2980, 3371, - 2983, 2974, 3371, 2984, 2976, 2991, 2995, 2998, 3000, 3001, - 3371, 3003, 3371, 3004, 3371, 3008, 3009, 3011, 3012, 3371, - 3371, 3013, 3015, 3019, 3371, 3020, 3016, 2969, 3022, 3023, - 3026, 3371, 3371, 3027, 3029, 3033, 3037, 3371, 3371, 3371, - 3036, 3371, 3038, 3371, 3043, 3371, 3046, 3048, 3371, 3049, - 3051, 3030, 3053, 3052, 3054, 3056, 3058, 3065, 3371, 3371, - 3070, 3371, 3072, 3075, 3371, 3066, 3079, 3371, 3081, 3082, - - 3083, 3084, 3086, 3085, 3371, 3371, 3371, 3371, 3087, 3089, - 3092, 3093, 3090, 3094, 3095, 3098, 3100, 3097, 3102, 3111, - 3114, 3115, 3122, 3118, 3371, 3119, 3121, 3128, 3129, 3127, - 3125, 3126, 3133, 3131, 3135, 3136, 3137, 3146, 3152, 3142, - 3143, 3153, 3154, 3155, 3162, 3168, 3165, 3166, 3167, 3169, - 3175, 3171, 3172, 3371, 3174, 3176, 3177, 3178, 3182, 3184, - 3180, 3192, 3197, 3200, 3187, 3201, 3203, 3204, 3206, 3207, - 3209, 3208, 3371, 3210, 3212, 3216, 3218, 3221, 3219, 3223, - 3224, 3229, 3232, 3231, 3234, 3236, 3371, 3240, 3371, 3371, - 3241, 3244, 3247, 3249, 3251, 3371, 3371, 3371, 3279, 3286, - - 3293, 3300, 3307, 94, 3314, 3321, 3328, 3335, 3342, 3349, - 3356, 3363 + 3384, 1933, 1925, 1937, 1939, 1931, 1946, 1942, 1944, 3384, + 3384, 1948, 1949, 1950, 1952, 1959, 1957, 1958, 3384, 1960, + 1961, 1964, 1967, 1970, 1974, 1963, 1966, 1978, 1979, 1982, + 1984, 1990, 1987, 1988, 1989, 1992, 1997, 2002, 3384, 1998, + 2004, 2005, 2008, 2009, 2010, 2011, 2014, 2012, 2015, 2016, + 2024, 2025, 2027, 2028, 2029, 2033, 2030, 2037, 2039, 2040, + 2046, 2042, 3384, 2056, 2043, 2057, 2053, 2055, 2058, 2065, + + 2062, 2063, 2064, 2066, 2068, 2067, 2070, 2071, 2072, 2079, + 3384, 2080, 2091, 2077, 2087, 2093, 2085, 2095, 2098, 2100, + 3384, 2101, 2108, 2105, 2107, 2110, 2112, 2104, 2115, 2118, + 2119, 2120, 2121, 2126, 2128, 2123, 2129, 2131, 2132, 2134, + 2139, 2146, 2136, 2140, 2153, 2152, 2161, 2163, 2149, 2159, + 2167, 2164, 2165, 2166, 2168, 2177, 2170, 2179, 2173, 3384, + 2180, 2182, 2187, 2184, 2189, 2191, 2195, 3384, 2196, 3384, + 2188, 3384, 2198, 2203, 2199, 2205, 2206, 2207, 2208, 2211, + 2218, 2209, 3384, 2220, 2215, 2222, 2225, 3384, 2228, 3384, + 3384, 2229, 2235, 2241, 2230, 2237, 2240, 2246, 3384, 2243, + + 2239, 2251, 2248, 2253, 2254, 2255, 2256, 2258, 2260, 2261, + 3384, 2264, 2263, 2270, 2262, 3384, 2272, 2276, 2277, 2278, + 2282, 2285, 2287, 2279, 2289, 2296, 2293, 3384, 2294, 2300, + 2302, 2295, 2299, 2311, 2307, 2315, 2304, 2318, 2320, 2323, + 2321, 3384, 2324, 2326, 3384, 2325, 2308, 2334, 3384, 2335, + 3384, 2336, 2337, 2339, 2340, 2344, 2345, 2347, 2348, 2351, + 2353, 2356, 2360, 2357, 3384, 3384, 2361, 2363, 2371, 2366, + 2368, 2374, 2376, 3384, 2373, 2377, 2380, 2381, 2383, 2384, + 2385, 2390, 2387, 2392, 2394, 2393, 2395, 3384, 2397, 2400, + 2404, 2405, 2406, 2408, 3384, 2410, 2412, 2417, 2411, 2421, + + 2427, 2432, 2436, 2433, 2438, 2440, 2442, 2443, 2445, 2448, + 2449, 3384, 2450, 2452, 2453, 2457, 2458, 2416, 2460, 2464, + 2467, 2454, 2470, 3384, 2459, 2471, 2474, 2484, 2475, 2488, + 2477, 2489, 2491, 2481, 2492, 2479, 2485, 2495, 2496, 2499, + 2502, 2506, 2505, 2512, 2509, 3384, 2508, 3384, 2517, 2520, + 2523, 2524, 3384, 2522, 2527, 3384, 2529, 2530, 2531, 2541, + 3384, 2543, 2534, 2544, 2538, 2546, 2536, 2552, 3384, 2554, + 2556, 2562, 2563, 2547, 2557, 2565, 2564, 2570, 2577, 2573, + 3384, 2566, 2576, 2583, 2580, 2585, 3384, 3384, 2589, 3384, + 3384, 3384, 2592, 3384, 3384, 2593, 2595, 3384, 2597, 3384, + + 2604, 2600, 2586, 2603, 2605, 3384, 2607, 3384, 2613, 2609, + 2611, 3384, 2615, 3384, 2612, 2616, 2619, 2623, 2621, 2630, + 2632, 2622, 2624, 2635, 2636, 2637, 2638, 2639, 2641, 2644, + 2645, 2646, 2650, 2651, 2654, 2652, 2655, 2656, 2658, 2665, + 3384, 3384, 2662, 2667, 2669, 2672, 2674, 2673, 2676, 2677, + 3384, 2680, 2681, 2688, 2684, 2686, 2687, 2696, 2689, 2698, + 2706, 2700, 2702, 2703, 2707, 3384, 2709, 3384, 3384, 2710, + 2711, 2716, 2719, 2713, 3384, 2720, 2726, 2723, 3384, 2733, + 2721, 2738, 2742, 3384, 3384, 3384, 2743, 2729, 2739, 2745, + 2747, 2735, 2749, 3384, 2746, 2753, 2755, 2756, 2763, 2765, + + 2772, 2769, 2774, 3384, 3384, 2775, 2776, 2777, 2778, 2766, + 2783, 2779, 2785, 3384, 2786, 2788, 2790, 2792, 2793, 2794, + 2796, 3384, 2798, 2799, 2804, 2808, 2800, 2811, 2812, 2813, + 3384, 2815, 2814, 2816, 3384, 2821, 3384, 2826, 3384, 3384, + 2828, 2829, 2832, 2834, 2837, 2839, 2840, 2841, 2847, 2844, + 2845, 3384, 3384, 2846, 3384, 3384, 2850, 2851, 2853, 2854, + 2859, 2861, 2857, 2862, 2863, 2864, 2877, 2869, 2875, 2866, + 2872, 2879, 2881, 2883, 3384, 2884, 3384, 2889, 2891, 2892, + 2893, 2895, 2897, 3384, 2900, 2899, 2549, 3384, 3384, 3384, + 2905, 2912, 2914, 3384, 2915, 2916, 2917, 2919, 2904, 2926, + + 2918, 2928, 3384, 2929, 2930, 2932, 2933, 2935, 2934, 2936, + 2939, 2941, 2940, 2952, 2942, 2954, 2957, 3384, 2959, 2949, + 2963, 2956, 2960, 2968, 2972, 2965, 2973, 2974, 2976, 2977, + 2978, 2979, 2986, 2987, 2991, 3384, 2993, 2980, 3384, 2995, + 2988, 2996, 3007, 3009, 3011, 3012, 3384, 3014, 3384, 3015, + 3384, 3019, 3020, 3022, 3023, 3384, 3384, 3024, 3026, 3030, + 3384, 3031, 3027, 3033, 3034, 3037, 3038, 3384, 3384, 3039, + 3041, 3047, 3044, 3384, 3384, 3384, 3054, 3384, 3056, 3384, + 3050, 3384, 3062, 3042, 3384, 3055, 3066, 3063, 3067, 3068, + 3069, 3070, 3071, 3077, 3384, 3384, 3079, 3384, 3081, 3084, + + 3384, 3085, 3086, 3384, 3096, 3092, 3093, 3094, 3099, 3095, + 3384, 3384, 3384, 3384, 3100, 3101, 3102, 3103, 3105, 3108, + 3107, 3110, 3119, 3120, 3109, 3126, 3112, 3127, 3133, 3116, + 3384, 3134, 3135, 3141, 3143, 3139, 3144, 3140, 3146, 3145, + 3148, 3150, 3147, 3151, 3162, 3152, 3168, 3165, 3172, 3173, + 3155, 3180, 3182, 3176, 3179, 3184, 3190, 3186, 3187, 3384, + 3188, 3189, 3191, 3194, 3195, 3192, 3199, 3201, 3211, 3204, + 3206, 3214, 3216, 3217, 3219, 3220, 3222, 3221, 3384, 3223, + 3225, 3229, 3231, 3234, 3232, 3236, 3237, 3242, 3245, 3244, + 3247, 3249, 3384, 3253, 3384, 3384, 3254, 3257, 3260, 3262, + + 3264, 3384, 3384, 3384, 3292, 3299, 3306, 3313, 3320, 94, + 3327, 3334, 3341, 3348, 3355, 3362, 3369, 3376 } ; -static yyconst flex_int16_t yy_def[1713] = +static yyconst flex_int16_t yy_def[1719] = { 0, - 1698, 1, 1699, 1699, 1700, 1700, 1701, 1701, 1702, 1702, - 1703, 1703, 1698, 1704, 1698, 1698, 1698, 1698, 1705, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1706, - 1698, 1698, 1698, 1706, 1707, 1698, 1698, 1698, 1707, 1708, - 1698, 1698, 1698, 1698, 1708, 1709, 1698, 1698, 1698, 1709, - 1710, 1698, 1711, 1698, 1710, 1710, 1704, 1704, 1698, 1712, - 1705, 1712, 1705, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1706, 1706, 1707, 1707, 1708, 1708, 1698, - 1709, 1709, 1710, 1710, 1711, 1711, 1710, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1710, 1704, 1704, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1710, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1698, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1710, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1710, - 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1698, 1704, 1698, 1698, 1704, 1698, 1698, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, - - 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1710, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1710, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1698, 1704, - 1704, 1704, 1698, 1704, 1698, 1704, 1698, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - - 1698, 1704, 1704, 1704, 1704, 1704, 1698, 1698, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, - 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1698, 1704, - 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1698, 1704, 1704, 1704, 1704, 1698, 1704, 1698, 1698, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, - 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, - 1704, 1704, 1698, 1704, 1704, 1704, 1698, 1704, 1698, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1698, 1698, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, - 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1698, 1704, 1698, 1704, 1704, 1704, 1704, 1698, - 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1698, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, - 1704, 1704, 1704, 1698, 1698, 1704, 1698, 1698, 1698, 1704, - 1698, 1698, 1704, 1704, 1698, 1704, 1698, 1704, 1704, 1704, - - 1704, 1704, 1698, 1704, 1698, 1704, 1704, 1698, 1704, 1698, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1698, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1698, 1704, 1698, 1698, 1704, 1704, 1704, 1704, 1704, - 1698, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1698, 1698, - 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1698, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, - 1698, 1704, 1698, 1698, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1698, 1698, 1704, 1698, 1698, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, - 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, - 1704, 1698, 1698, 1698, 1704, 1704, 1704, 1698, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, - - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, - 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1698, 1704, 1698, 1704, 1698, 1704, 1704, 1704, 1704, 1698, - 1698, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, - 1704, 1698, 1698, 1704, 1704, 1704, 1704, 1698, 1698, 1698, - 1704, 1698, 1704, 1698, 1704, 1698, 1704, 1704, 1698, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1698, - 1704, 1698, 1704, 1704, 1698, 1704, 1704, 1698, 1704, 1704, - - 1704, 1704, 1704, 1704, 1698, 1698, 1698, 1698, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, - 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1698, 1698, - 1704, 1704, 1704, 1704, 1704, 1698, 1698, 0, 1698, 1698, - - 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, - 1698, 1698 + 1704, 1, 1705, 1705, 1706, 1706, 1707, 1707, 1708, 1708, + 1709, 1709, 1704, 1710, 1704, 1704, 1704, 1704, 1711, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1712, + 1704, 1704, 1704, 1712, 1713, 1704, 1704, 1704, 1713, 1714, + 1704, 1704, 1704, 1704, 1714, 1715, 1704, 1704, 1704, 1715, + 1716, 1704, 1717, 1704, 1716, 1716, 1710, 1710, 1704, 1718, + 1711, 1718, 1711, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1712, 1712, 1713, 1713, 1714, 1714, 1704, + 1715, 1715, 1716, 1716, 1717, 1717, 1716, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1716, 1710, 1710, 1710, 1710, + + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1716, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1716, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1716, + 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1704, 1710, 1704, 1704, 1710, 1704, 1704, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, + + 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1716, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1710, + + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1716, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + + 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, + 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1704, 1710, + 1710, 1710, 1704, 1710, 1704, 1710, 1704, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + + 1704, 1710, 1710, 1710, 1710, 1710, 1704, 1704, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, + 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1704, + 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1704, 1710, 1704, + 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, + + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1704, 1710, 1710, 1704, 1710, 1710, 1710, 1704, 1710, + 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1704, 1704, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, + 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, + + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1704, 1710, 1710, + 1710, 1710, 1704, 1710, 1710, 1704, 1710, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1710, 1710, 1704, 1704, 1710, 1704, + 1704, 1704, 1710, 1704, 1704, 1710, 1710, 1704, 1710, 1704, + + 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1704, 1710, 1710, + 1710, 1704, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1704, 1704, 1710, + 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1704, 1710, + 1710, 1710, 1710, 1704, 1704, 1704, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, + + 1710, 1710, 1710, 1704, 1704, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1704, 1710, 1704, 1710, 1704, 1704, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1704, 1704, 1710, 1704, 1704, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1704, 1710, 1704, 1710, 1710, 1710, + 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1704, 1704, 1704, + 1710, 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, + + 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1710, 1704, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, 1704, 1710, + 1704, 1710, 1710, 1710, 1710, 1704, 1704, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1704, 1710, + 1710, 1710, 1710, 1704, 1704, 1704, 1710, 1704, 1710, 1704, + 1710, 1704, 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1704, 1704, 1710, 1704, 1710, 1710, + + 1704, 1710, 1710, 1704, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1704, 1704, 1704, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1704, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1704, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1710, + 1710, 1710, 1704, 1710, 1704, 1704, 1710, 1710, 1710, 1710, + + 1710, 1704, 1704, 0, 1704, 1704, 1704, 1704, 1704, 1704, + 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704 } ; -static yyconst flex_int16_t yy_nxt[3411] = +static yyconst flex_int16_t yy_nxt[3424] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 18, 20, 21, 14, 22, 23, 24, 25, 14, @@ -1203,172 +1204,174 @@ static yyconst flex_int16_t yy_nxt[3411] = 1012, 1009, 1006, 68, 1013, 68, 1010, 68, 68, 68, 1020, 1021, 68, 68, 1015, 68, 68, 1017, 1019, 1014, 1018, 68, 68, 68, 68, 68, 1016, 68, 1028, 1023, - 68, 68, 1035, 1022, 68, 1030, 1025, 68, 68, 1024, - 68, 1029, 1027, 68, 1037, 68, 1031, 1032, 1026, 68, - 1033, 1038, 1034, 68, 1040, 68, 68, 68, 1036, 68, - 68, 68, 1048, 1039, 1042, 1044, 1041, 68, 1045, 68, - 1043, 68, 68, 68, 1046, 68, 68, 1052, 68, 1047, - 1053, 1054, 68, 1055, 68, 1049, 68, 1059, 68, 1050, - 68, 1056, 1051, 68, 68, 1063, 68, 68, 1067, 68, - - 68, 1058, 132, 68, 1060, 1061, 1062, 1057, 1064, 1066, - 68, 1069, 68, 1068, 68, 1065, 1071, 68, 68, 68, - 68, 68, 68, 1070, 1073, 68, 68, 68, 68, 1074, - 1072, 1077, 68, 1075, 1078, 1082, 68, 1076, 1083, 68, - 68, 68, 1081, 68, 1087, 68, 68, 1079, 1080, 1089, - 68, 1090, 68, 1084, 68, 68, 130, 1092, 1085, 1091, - 1086, 1088, 68, 68, 1094, 1096, 1093, 1098, 68, 68, - 68, 1097, 1095, 68, 1099, 1100, 68, 68, 68, 68, - 68, 68, 68, 1110, 68, 68, 68, 1112, 1101, 1102, - 1103, 68, 68, 1115, 68, 1104, 1108, 1105, 1106, 1107, - - 1114, 68, 1109, 68, 68, 68, 68, 1120, 68, 68, - 1117, 1111, 1113, 1118, 68, 1124, 1116, 68, 68, 1123, - 68, 68, 1127, 68, 68, 1122, 68, 1129, 1126, 1128, - 68, 1119, 68, 68, 1121, 68, 1134, 1125, 68, 68, - 68, 68, 1131, 68, 1140, 68, 1130, 1138, 68, 68, - 1132, 68, 1139, 1135, 68, 1137, 1143, 68, 1136, 1133, - 1141, 1146, 1147, 68, 68, 1142, 68, 1148, 1145, 1144, - 1150, 1149, 68, 1153, 68, 68, 1152, 1151, 68, 68, - 68, 68, 1158, 1155, 1160, 68, 1154, 68, 68, 68, - 68, 129, 1156, 1162, 1163, 68, 1164, 68, 68, 68, - - 1161, 68, 68, 68, 1165, 1167, 1157, 1159, 1166, 68, - 1168, 68, 68, 68, 1169, 1172, 68, 68, 68, 127, - 68, 68, 1173, 1170, 1171, 1177, 1174, 68, 1179, 68, - 1181, 1175, 1178, 68, 1180, 68, 68, 1176, 68, 1186, - 68, 1182, 68, 1189, 68, 1184, 68, 1185, 68, 68, - 1191, 68, 68, 1183, 1192, 1193, 68, 1187, 1188, 68, - 68, 1196, 68, 1190, 68, 68, 1194, 68, 68, 68, - 68, 1195, 68, 1197, 68, 68, 68, 1199, 68, 1200, - 1201, 1205, 68, 1198, 1202, 68, 68, 1206, 1209, 68, - 1203, 1208, 1204, 1207, 1210, 68, 68, 68, 68, 1213, - - 68, 1212, 68, 1214, 1211, 1215, 1217, 1216, 1218, 68, - 68, 1222, 68, 68, 1219, 68, 68, 1224, 68, 68, - 68, 1220, 68, 1225, 1221, 68, 68, 1226, 1227, 1228, - 1223, 68, 1229, 1230, 68, 1231, 68, 68, 68, 1236, - 68, 1233, 1234, 68, 68, 68, 1232, 68, 68, 1238, - 1239, 1235, 1243, 68, 68, 68, 1237, 1242, 1245, 68, - 1240, 68, 68, 1244, 68, 1247, 68, 1248, 1250, 68, - 68, 68, 1241, 68, 1246, 1252, 68, 1249, 1251, 1253, - 68, 68, 1254, 1255, 68, 1258, 68, 68, 68, 1257, - 68, 1256, 1260, 68, 68, 1266, 68, 68, 1263, 68, - - 68, 1259, 68, 1267, 68, 1262, 68, 1269, 68, 68, - 68, 1261, 1264, 1265, 68, 1268, 68, 68, 1278, 68, - 68, 68, 68, 1279, 68, 1271, 68, 1283, 1276, 1274, - 1270, 1272, 68, 1273, 1280, 1275, 1281, 1282, 1277, 1284, - 68, 1285, 68, 1287, 68, 1286, 1288, 68, 1289, 68, - 68, 1291, 68, 1292, 68, 68, 68, 1295, 68, 68, - 68, 1294, 1297, 68, 68, 68, 1299, 68, 1300, 1290, - 68, 1301, 1303, 68, 1293, 68, 1305, 68, 1296, 68, - 1308, 68, 1298, 1307, 68, 68, 1302, 1310, 68, 68, - 1306, 68, 1312, 68, 1304, 68, 68, 68, 1313, 68, - - 1315, 68, 68, 1309, 68, 1314, 1319, 68, 68, 1324, - 1317, 1311, 68, 1321, 68, 68, 1322, 1320, 68, 1325, - 1318, 1316, 1323, 68, 1328, 1329, 68, 1327, 68, 1330, - 68, 68, 1326, 68, 68, 68, 1334, 1331, 68, 1335, - 68, 1332, 68, 1333, 1337, 68, 1338, 68, 68, 1340, - 68, 68, 1339, 68, 1341, 1336, 68, 1344, 68, 1343, - 68, 68, 1345, 1346, 1342, 1347, 68, 68, 68, 68, - 68, 1349, 1348, 1351, 68, 1350, 1354, 68, 1519, 1353, - 68, 68, 1358, 1355, 68, 1357, 1356, 68, 1352, 68, - 68, 1360, 1359, 68, 1361, 1362, 68, 68, 1364, 68, - - 1365, 68, 1363, 1366, 68, 1367, 1368, 68, 68, 68, - 1371, 68, 1372, 68, 1370, 1374, 68, 68, 68, 68, - 68, 1376, 68, 1375, 1379, 68, 68, 1378, 1373, 1369, - 1380, 68, 1381, 68, 1377, 68, 68, 68, 1382, 68, - 68, 68, 1389, 68, 68, 1387, 68, 68, 1384, 1385, - 68, 1386, 68, 1383, 68, 1390, 68, 68, 68, 68, - 68, 1388, 1397, 1393, 1398, 1399, 68, 1392, 1395, 68, - 1391, 1400, 68, 68, 1396, 68, 1394, 68, 1401, 68, - 68, 68, 1403, 68, 1405, 68, 1408, 1402, 1409, 68, - 1410, 68, 68, 1404, 1412, 68, 68, 1406, 1407, 1411, - - 1418, 1413, 1417, 68, 68, 68, 68, 68, 68, 1414, - 68, 1415, 68, 68, 68, 1416, 1425, 1426, 68, 68, - 68, 1420, 1419, 68, 68, 68, 1421, 1429, 1422, 1423, - 1431, 68, 1424, 1432, 1427, 1433, 68, 1430, 1428, 1434, - 68, 68, 1435, 68, 68, 68, 68, 1436, 68, 1438, - 1439, 68, 1437, 68, 68, 68, 1441, 125, 1443, 1444, - 1446, 68, 1447, 68, 1448, 1440, 1442, 1449, 68, 68, - 1445, 1450, 68, 1451, 68, 68, 68, 68, 68, 1452, - 68, 1453, 68, 1454, 68, 68, 68, 1457, 1456, 1459, - 68, 68, 1455, 68, 68, 1464, 1458, 68, 68, 1462, - - 68, 68, 1463, 1460, 1461, 68, 1465, 1469, 68, 68, - 1470, 1471, 68, 68, 1473, 68, 68, 1466, 68, 68, - 1467, 1472, 68, 1477, 1468, 1474, 1478, 68, 1475, 68, - 1480, 68, 68, 1476, 1481, 1482, 68, 1483, 68, 1479, - 1484, 68, 68, 1487, 1488, 68, 68, 68, 68, 68, - 1485, 1489, 1490, 68, 68, 68, 1486, 68, 1493, 1497, - 68, 68, 68, 68, 68, 1501, 1491, 1492, 68, 1502, - 1499, 1496, 1494, 68, 68, 1495, 68, 68, 68, 1504, - 1498, 68, 1500, 68, 68, 68, 1510, 1507, 68, 1503, - 1512, 68, 68, 68, 1514, 68, 1505, 1513, 68, 68, - - 68, 1508, 68, 1506, 1509, 1515, 1511, 1516, 1517, 68, - 68, 1521, 1518, 68, 1520, 68, 68, 68, 68, 68, - 1523, 1528, 1522, 1525, 1526, 1524, 68, 1530, 68, 68, - 68, 1533, 68, 68, 68, 1527, 68, 1534, 68, 68, - 68, 68, 68, 1529, 1539, 1532, 68, 1535, 1531, 1538, - 1536, 1541, 68, 1543, 68, 1537, 68, 68, 1545, 68, - 1548, 1542, 1544, 68, 1547, 68, 1540, 1550, 68, 1551, - 68, 68, 68, 68, 1555, 68, 1546, 68, 68, 68, - 1559, 68, 68, 1557, 1553, 68, 68, 1549, 68, 1556, - 1552, 1562, 68, 1554, 1563, 68, 68, 1583, 1558, 1560, - - 1561, 1565, 1566, 68, 1698, 1564, 1568, 68, 1567, 1569, - 68, 1570, 68, 68, 1572, 68, 68, 1573, 1571, 1574, - 68, 68, 1576, 68, 68, 68, 1579, 68, 68, 1577, - 1575, 68, 68, 1578, 68, 68, 1580, 1581, 68, 68, - 1589, 68, 68, 1587, 1590, 68, 1582, 1592, 68, 68, - 68, 1584, 1585, 1591, 1593, 68, 1586, 1595, 68, 1588, - 68, 68, 1598, 68, 68, 68, 68, 1599, 68, 1594, - 68, 1602, 1698, 1603, 1698, 1596, 1605, 68, 68, 1597, - 1600, 1606, 68, 1607, 68, 1601, 1608, 68, 1611, 1604, - 1609, 68, 1610, 68, 68, 68, 68, 68, 68, 68, - - 1613, 68, 68, 1617, 68, 68, 68, 68, 1612, 68, - 68, 1625, 68, 1616, 68, 1614, 1615, 1619, 1626, 1627, - 1621, 1618, 1622, 68, 1620, 1624, 68, 68, 1628, 1631, - 68, 68, 1623, 68, 68, 1635, 1636, 68, 68, 68, - 68, 68, 1630, 68, 1632, 68, 1633, 68, 68, 68, - 1638, 1629, 1634, 1637, 68, 68, 1648, 1639, 68, 1640, - 1642, 1643, 1641, 1645, 68, 68, 68, 68, 1644, 1646, - 1649, 1650, 1651, 1647, 68, 1653, 1654, 68, 68, 68, - 68, 68, 1658, 68, 68, 1655, 68, 68, 68, 68, - 68, 1661, 68, 1652, 68, 1665, 68, 1660, 1656, 68, - - 1657, 1666, 1659, 1664, 68, 1668, 1671, 1662, 1663, 68, - 1669, 1667, 68, 68, 1673, 68, 68, 1670, 68, 68, - 68, 68, 68, 1674, 68, 1675, 1677, 1679, 68, 1680, - 68, 68, 1672, 68, 1683, 68, 68, 1686, 1676, 1678, - 1687, 68, 1689, 68, 68, 1690, 68, 1681, 68, 1682, - 1684, 1688, 68, 68, 1685, 1691, 68, 1692, 1693, 68, - 1696, 68, 1697, 68, 1698, 1698, 1698, 1698, 1698, 1698, - 1698, 1698, 1698, 1698, 1698, 1694, 1698, 1698, 1695, 40, - 40, 40, 40, 40, 40, 40, 45, 45, 45, 45, - 45, 45, 45, 50, 50, 50, 50, 50, 50, 50, - - 56, 56, 56, 56, 56, 56, 56, 61, 61, 61, - 61, 61, 61, 61, 71, 71, 1698, 71, 71, 71, - 71, 124, 124, 1698, 1698, 1698, 124, 124, 126, 126, - 1698, 1698, 126, 1698, 126, 128, 1698, 1698, 1698, 1698, - 1698, 128, 131, 131, 1698, 1698, 1698, 131, 131, 133, - 1698, 1698, 1698, 1698, 1698, 133, 135, 135, 1698, 135, - 135, 135, 135, 72, 72, 1698, 72, 72, 72, 72, - 13, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, - 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, - 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, - - 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698 + 68, 68, 1031, 1022, 68, 1030, 1025, 68, 68, 1024, + 1036, 1029, 1027, 68, 1038, 68, 1032, 1033, 1026, 68, + 1034, 68, 1035, 1041, 68, 1037, 68, 1039, 68, 1043, + 68, 68, 68, 1040, 68, 1044, 1049, 1042, 1045, 68, + 68, 68, 68, 68, 1046, 68, 68, 1053, 68, 68, + 1047, 1054, 68, 1048, 1055, 1050, 68, 1056, 1051, 1060, + 68, 68, 1052, 1059, 68, 1057, 68, 1064, 1058, 68, + + 68, 68, 68, 1068, 68, 1061, 1062, 1067, 1063, 68, + 68, 1065, 1069, 1070, 68, 1072, 68, 68, 1066, 1071, + 68, 68, 68, 68, 68, 1074, 68, 68, 68, 1073, + 1075, 1078, 1084, 1079, 1076, 1083, 68, 68, 1077, 68, + 68, 68, 68, 1082, 1088, 68, 1080, 1081, 1090, 68, + 1091, 68, 68, 1093, 68, 68, 1092, 1094, 68, 1086, + 1085, 1087, 1089, 1095, 1097, 68, 1099, 68, 68, 68, + 68, 1100, 1101, 1096, 68, 68, 68, 68, 68, 68, + 68, 1111, 68, 68, 68, 1113, 1102, 1103, 1104, 68, + 1098, 68, 68, 1105, 1109, 1106, 1107, 68, 1108, 68, + + 1110, 1115, 1116, 68, 1117, 68, 1118, 68, 1121, 1112, + 68, 1114, 68, 68, 1119, 1125, 68, 68, 1124, 68, + 68, 1128, 68, 1120, 68, 1130, 1127, 68, 1123, 1129, + 68, 68, 68, 68, 1133, 68, 1122, 1126, 68, 1136, + 68, 68, 1132, 68, 68, 1142, 68, 1131, 68, 1140, + 1134, 68, 68, 1141, 1138, 1137, 1139, 1145, 68, 1135, + 1148, 68, 1143, 1149, 68, 68, 1147, 1144, 1150, 1146, + 1152, 68, 1151, 68, 1155, 68, 68, 68, 68, 68, + 68, 1157, 68, 1154, 1160, 68, 1162, 1153, 1156, 68, + 1158, 68, 68, 1165, 68, 1164, 68, 1163, 1166, 68, + + 68, 68, 1167, 68, 1161, 1159, 1168, 68, 68, 1169, + 68, 68, 1172, 1171, 1174, 68, 1170, 68, 68, 68, + 68, 68, 1173, 68, 1179, 1181, 1176, 68, 1180, 132, + 68, 1175, 68, 1183, 68, 1182, 1177, 68, 1178, 1188, + 68, 68, 68, 1186, 1184, 1185, 1187, 68, 1191, 68, + 1193, 68, 68, 68, 1194, 68, 1189, 1195, 68, 1192, + 68, 1190, 1196, 68, 1198, 68, 68, 68, 68, 1199, + 68, 1197, 68, 68, 68, 68, 68, 1208, 1201, 1202, + 1203, 1207, 68, 1210, 68, 1204, 1200, 1212, 68, 68, + 68, 68, 1205, 1206, 68, 1214, 1215, 68, 1211, 68, + + 1209, 68, 1216, 1220, 1217, 68, 68, 68, 68, 1218, + 1221, 68, 68, 1224, 68, 1213, 68, 130, 1227, 68, + 68, 1219, 1225, 68, 1228, 1222, 1223, 68, 1230, 1229, + 68, 1226, 68, 68, 1233, 68, 68, 68, 68, 1231, + 1239, 1236, 1232, 1237, 1234, 1235, 68, 68, 68, 68, + 1238, 68, 68, 1241, 1242, 1246, 68, 68, 1248, 68, + 68, 1245, 1240, 68, 1243, 68, 1247, 1250, 68, 68, + 1251, 1253, 68, 68, 1256, 68, 1244, 1254, 68, 1249, + 68, 1252, 1255, 68, 1257, 68, 68, 1261, 68, 68, + 1258, 1260, 68, 68, 1263, 68, 68, 68, 1259, 68, + + 1266, 1269, 68, 1270, 68, 68, 68, 68, 1265, 68, + 1262, 1272, 68, 1268, 1267, 1264, 68, 68, 68, 1271, + 68, 1281, 68, 68, 68, 129, 1274, 1282, 68, 68, + 1279, 1273, 1275, 68, 1302, 1277, 1276, 1284, 1278, 68, + 1286, 1280, 1283, 1287, 68, 68, 1285, 1288, 68, 1290, + 68, 1291, 68, 1292, 68, 68, 1294, 68, 1289, 1295, + 68, 68, 68, 1298, 68, 68, 68, 1297, 1300, 68, + 68, 68, 68, 127, 1293, 1303, 68, 1304, 1306, 68, + 1296, 1308, 68, 68, 1299, 1307, 68, 68, 1301, 68, + 1311, 68, 1305, 68, 1309, 1312, 68, 68, 1310, 1314, + + 68, 68, 1316, 68, 68, 1318, 1313, 68, 68, 1319, + 1321, 68, 1317, 1323, 68, 1315, 1320, 68, 68, 1328, + 68, 68, 125, 1325, 68, 1329, 1324, 1326, 1322, 68, + 1333, 1327, 68, 1332, 68, 68, 68, 1334, 1331, 68, + 1330, 68, 68, 68, 1338, 1335, 68, 1339, 68, 1336, + 68, 1337, 1341, 68, 1342, 68, 68, 1344, 68, 68, + 1343, 68, 1345, 1340, 68, 1348, 68, 1347, 68, 68, + 1349, 1350, 1346, 1351, 68, 68, 68, 68, 68, 1353, + 1352, 1355, 68, 1354, 1358, 68, 1525, 1357, 68, 68, + 1362, 1359, 68, 1361, 1360, 68, 1356, 68, 68, 1364, + + 1363, 68, 1365, 1366, 68, 68, 1368, 68, 1369, 68, + 1367, 1370, 68, 1371, 1372, 68, 68, 68, 1375, 68, + 1376, 68, 1374, 68, 68, 68, 1379, 68, 68, 1380, + 1381, 68, 1384, 68, 68, 68, 68, 1373, 1378, 1377, + 1383, 1385, 68, 1386, 68, 1382, 1387, 68, 68, 68, + 68, 68, 1394, 68, 1388, 1392, 68, 68, 68, 1389, + 1390, 1391, 68, 68, 68, 1395, 68, 68, 68, 1404, + 68, 1393, 1402, 1403, 68, 1398, 1405, 68, 1397, 68, + 1400, 68, 1401, 1396, 68, 68, 68, 1399, 68, 68, + 1413, 1414, 68, 68, 1406, 1410, 68, 1407, 68, 68, + + 68, 68, 1415, 1408, 1409, 1411, 1412, 1416, 68, 1422, + 68, 1417, 68, 1423, 68, 68, 1418, 1419, 68, 68, + 1421, 68, 68, 68, 1420, 68, 1430, 1431, 68, 1425, + 1424, 68, 68, 68, 1426, 68, 1434, 1435, 68, 1427, + 1428, 68, 1429, 1433, 1437, 68, 1432, 68, 1436, 1439, + 68, 68, 1438, 1440, 68, 68, 1441, 68, 68, 68, + 1443, 68, 1444, 1442, 1445, 68, 1446, 68, 68, 1447, + 1449, 68, 1450, 1448, 1452, 68, 1453, 68, 68, 1454, + 1455, 68, 1457, 1451, 68, 1456, 68, 68, 68, 68, + 68, 68, 1458, 1461, 1459, 68, 1463, 68, 68, 1460, + + 68, 1465, 68, 1462, 68, 68, 68, 1470, 68, 1464, + 68, 68, 68, 1468, 1469, 1467, 68, 1471, 1466, 1475, + 68, 1476, 1477, 68, 68, 68, 68, 68, 68, 1472, + 1479, 1473, 1478, 68, 1483, 1474, 1480, 1484, 68, 1481, + 68, 68, 1486, 1482, 68, 1488, 68, 1487, 1489, 68, + 1490, 68, 68, 68, 1493, 1494, 68, 68, 68, 68, + 1485, 1495, 68, 68, 1496, 68, 68, 1492, 1499, 68, + 1491, 68, 1503, 68, 68, 68, 68, 1507, 68, 1497, + 1498, 68, 1505, 1500, 68, 1502, 1501, 68, 1504, 68, + 1508, 68, 1510, 68, 1506, 68, 68, 1509, 1511, 1516, + + 1513, 68, 1518, 68, 68, 68, 1704, 68, 1519, 68, + 1512, 68, 68, 1514, 1520, 1515, 68, 68, 1522, 1517, + 1521, 1523, 1526, 1524, 68, 1527, 68, 68, 68, 68, + 68, 68, 1529, 1534, 1533, 1528, 1532, 1530, 68, 1536, + 68, 68, 68, 1539, 68, 68, 68, 68, 68, 1540, + 1531, 68, 68, 68, 68, 1535, 1541, 1538, 1545, 1544, + 1537, 68, 1542, 1547, 68, 1549, 68, 1543, 68, 68, + 1551, 68, 68, 1548, 1550, 68, 1553, 68, 1546, 1556, + 68, 1552, 1554, 1557, 68, 68, 68, 1561, 68, 68, + 68, 68, 68, 1565, 1555, 1563, 1558, 1559, 68, 68, + + 68, 1562, 1568, 68, 1569, 68, 1560, 68, 68, 1704, + 1564, 1570, 1571, 1573, 1572, 1704, 1566, 1567, 1574, 68, + 1575, 68, 1576, 68, 68, 1578, 68, 68, 1579, 1577, + 1580, 68, 68, 1582, 68, 68, 68, 1585, 68, 68, + 1583, 1581, 68, 68, 1584, 68, 68, 1586, 1587, 68, + 68, 68, 1595, 68, 68, 1593, 68, 1588, 1596, 68, + 1597, 1589, 68, 1590, 1591, 1598, 68, 68, 68, 1602, + 1592, 1594, 1599, 1601, 68, 68, 1600, 1604, 68, 68, + 68, 68, 68, 68, 1704, 1603, 1608, 1609, 1611, 68, + 1612, 68, 1613, 68, 1606, 1614, 68, 68, 68, 1616, + + 1605, 1607, 1610, 1617, 68, 68, 68, 68, 68, 1615, + 1619, 68, 68, 68, 68, 68, 1623, 68, 1618, 68, + 68, 68, 68, 1622, 68, 1620, 1633, 1625, 68, 1621, + 1631, 68, 68, 1624, 1626, 1627, 1628, 1630, 68, 68, + 1637, 1632, 1638, 1634, 1629, 68, 68, 68, 1641, 1635, + 1642, 68, 68, 68, 1636, 68, 68, 68, 68, 68, + 68, 1639, 68, 68, 68, 1643, 1640, 68, 1651, 1644, + 1704, 1645, 1646, 1648, 68, 1649, 1647, 68, 1650, 1652, + 68, 1654, 1655, 1653, 68, 68, 1658, 1659, 68, 1656, + 1657, 68, 68, 1660, 68, 1661, 68, 1664, 68, 68, + + 68, 68, 68, 68, 68, 1667, 68, 68, 1671, 1672, + 1662, 68, 1666, 68, 1674, 1663, 68, 1665, 68, 1670, + 1668, 1676, 1669, 68, 1675, 1677, 68, 1679, 68, 68, + 1673, 68, 68, 68, 68, 68, 1680, 68, 1681, 1683, + 1685, 68, 1686, 68, 68, 1678, 68, 1689, 68, 68, + 1692, 1682, 1684, 1693, 68, 1695, 68, 68, 1696, 68, + 1687, 68, 1688, 1690, 1694, 68, 68, 1691, 1697, 68, + 1698, 1699, 68, 1702, 68, 1703, 68, 1704, 1704, 1704, + 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1700, 1704, + 1704, 1701, 40, 40, 40, 40, 40, 40, 40, 45, + + 45, 45, 45, 45, 45, 45, 50, 50, 50, 50, + 50, 50, 50, 56, 56, 56, 56, 56, 56, 56, + 61, 61, 61, 61, 61, 61, 61, 71, 71, 1704, + 71, 71, 71, 71, 124, 124, 1704, 1704, 1704, 124, + 124, 126, 126, 1704, 1704, 126, 1704, 126, 128, 1704, + 1704, 1704, 1704, 1704, 128, 131, 131, 1704, 1704, 1704, + 131, 131, 133, 1704, 1704, 1704, 1704, 1704, 133, 135, + 135, 1704, 135, 135, 135, 135, 72, 72, 1704, 72, + 72, 72, 72, 13, 1704, 1704, 1704, 1704, 1704, 1704, + 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, + + 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, + 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, + 1704, 1704, 1704 } ; -static yyconst flex_int16_t yy_chk[3411] = +static yyconst flex_int16_t yy_chk[3424] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1379,7 +1382,7 @@ static yyconst flex_int16_t yy_chk[3411] = 9, 152, 33, 6, 7, 7, 7, 7, 9, 7, 10, 10, 10, 44, 44, 7, 8, 8, 8, 8, 10, 8, 21, 33, 152, 21, 21, 8, 11, 11, - 11, 11, 11, 11, 1704, 20, 29, 20, 20, 11, + 11, 11, 11, 11, 1710, 20, 29, 20, 20, 11, 20, 29, 24, 21, 25, 20, 24, 28, 11, 12, 12, 12, 12, 12, 12, 74, 22, 22, 74, 25, @@ -1582,169 +1585,171 @@ static yyconst flex_int16_t yy_chk[3411] = 910, 905, 903, 912, 911, 913, 906, 914, 915, 916, 917, 918, 918, 919, 913, 917, 920, 915, 916, 912, 915, 921, 922, 923, 924, 926, 914, 925, 925, 920, - 927, 928, 932, 919, 930, 927, 922, 932, 929, 921, - 933, 926, 924, 936, 934, 935, 928, 929, 923, 934, - 929, 935, 930, 938, 937, 943, 944, 942, 933, 937, - 945, 939, 946, 936, 939, 942, 938, 946, 943, 947, - 939, 948, 950, 951, 944, 952, 953, 951, 954, 945, - 952, 953, 955, 954, 956, 947, 957, 958, 958, 948, - 959, 955, 950, 960, 961, 962, 963, 964, 966, 966, - - 962, 957, 56, 965, 959, 960, 961, 956, 963, 965, - 967, 968, 968, 967, 970, 964, 971, 971, 972, 973, - 974, 975, 976, 970, 973, 978, 977, 980, 979, 974, - 972, 977, 983, 975, 978, 981, 981, 976, 982, 984, - 985, 987, 980, 982, 986, 986, 997, 978, 979, 988, - 988, 989, 989, 983, 995, 990, 51, 991, 984, 990, - 985, 987, 991, 992, 994, 996, 992, 998, 998, 994, - 996, 997, 995, 999, 999, 1000, 1001, 1002, 1003, 1004, - 1000, 1006, 1005, 1007, 1007, 1008, 1009, 1009, 1001, 1001, - 1001, 1012, 1010, 1013, 1013, 1001, 1005, 1002, 1003, 1004, - - 1012, 1014, 1006, 1015, 1016, 1017, 1018, 1018, 1019, 1020, - 1015, 1008, 1010, 1016, 1022, 1023, 1014, 1024, 1028, 1022, - 1023, 1025, 1026, 1026, 1027, 1020, 1029, 1028, 1025, 1027, - 1030, 1017, 1031, 1032, 1019, 1033, 1033, 1024, 1034, 1035, - 1036, 1037, 1030, 1038, 1039, 1039, 1029, 1037, 1042, 1040, - 1031, 1048, 1038, 1034, 1043, 1036, 1041, 1041, 1035, 1032, - 1040, 1044, 1045, 1045, 1049, 1040, 1044, 1046, 1043, 1042, - 1047, 1046, 1046, 1050, 1051, 1047, 1049, 1048, 1050, 1052, - 1053, 1054, 1055, 1052, 1057, 1056, 1051, 1055, 1058, 1057, - 1060, 50, 1053, 1060, 1061, 1061, 1062, 1062, 1063, 1065, - - 1058, 1066, 1074, 1064, 1063, 1065, 1054, 1056, 1064, 1068, - 1066, 1070, 1072, 1076, 1068, 1073, 1073, 1075, 1077, 45, - 1081, 1078, 1074, 1070, 1072, 1078, 1075, 1079, 1080, 1083, - 1083, 1076, 1079, 1080, 1081, 1084, 1085, 1077, 1086, 1088, - 1088, 1083, 1091, 1093, 1092, 1085, 1094, 1086, 1093, 1095, - 1095, 1100, 1096, 1084, 1096, 1097, 1097, 1091, 1092, 1099, - 1101, 1101, 1103, 1094, 1102, 1104, 1099, 1105, 1106, 1107, - 1108, 1100, 1109, 1102, 1116, 1113, 1111, 1104, 1118, 1105, - 1106, 1111, 1114, 1103, 1107, 1112, 1124, 1112, 1116, 1123, - 1108, 1114, 1109, 1113, 1117, 1117, 1119, 1120, 1121, 1120, - - 1122, 1119, 1128, 1121, 1118, 1122, 1124, 1123, 1125, 1126, - 1129, 1130, 1130, 1125, 1126, 1131, 1135, 1132, 1133, 1145, - 1136, 1128, 1132, 1133, 1129, 1134, 1138, 1134, 1135, 1136, - 1131, 1137, 1136, 1137, 1139, 1138, 1141, 1142, 1144, 1145, - 1146, 1141, 1142, 1148, 1150, 1151, 1139, 1152, 1153, 1148, - 1150, 1144, 1154, 1154, 1155, 1157, 1146, 1153, 1156, 1156, - 1151, 1158, 1159, 1155, 1160, 1158, 1165, 1159, 1161, 1161, - 1162, 1168, 1152, 1169, 1157, 1165, 1173, 1160, 1162, 1166, - 1166, 1167, 1167, 1168, 1170, 1171, 1171, 1174, 1175, 1170, - 1176, 1169, 1174, 1177, 1178, 1180, 1180, 1179, 1177, 1181, - - 1182, 1173, 1183, 1181, 1184, 1176, 1185, 1183, 1187, 1188, - 1189, 1175, 1178, 1179, 1190, 1182, 1191, 1192, 1194, 1194, - 1195, 1196, 1197, 1195, 1198, 1185, 1199, 1199, 1191, 1189, - 1184, 1187, 1202, 1188, 1196, 1190, 1197, 1198, 1192, 1200, - 1200, 1201, 1201, 1203, 1203, 1202, 1204, 1204, 1205, 1205, - 1206, 1207, 1207, 1208, 1208, 1209, 1211, 1212, 1212, 1213, - 1216, 1211, 1214, 1214, 1215, 1217, 1216, 1223, 1217, 1206, - 1218, 1218, 1219, 1219, 1209, 1220, 1221, 1221, 1213, 1224, - 1225, 1225, 1215, 1224, 1226, 1228, 1218, 1227, 1227, 1230, - 1223, 1229, 1229, 1231, 1220, 1232, 1233, 1234, 1230, 1235, - - 1232, 1236, 1237, 1226, 1238, 1231, 1236, 1239, 1240, 1241, - 1234, 1228, 1244, 1238, 1241, 1242, 1239, 1237, 1246, 1242, - 1235, 1233, 1240, 1247, 1247, 1248, 1251, 1246, 1249, 1249, - 1248, 1252, 1244, 1254, 1255, 1256, 1254, 1249, 1260, 1255, - 1264, 1251, 1262, 1252, 1257, 1257, 1259, 1259, 1261, 1261, - 1263, 1271, 1260, 1481, 1262, 1256, 1265, 1265, 1267, 1264, - 1268, 1272, 1267, 1268, 1263, 1269, 1269, 1270, 1274, 1273, - 1279, 1271, 1270, 1273, 1275, 1272, 1276, 1277, 1481, 1275, - 1280, 1276, 1281, 1277, 1282, 1280, 1279, 1281, 1274, 1283, - 1300, 1283, 1282, 1286, 1286, 1290, 1290, 1293, 1294, 1294, - - 1296, 1296, 1293, 1298, 1299, 1299, 1300, 1301, 1298, 1302, - 1304, 1304, 1306, 1307, 1302, 1309, 1309, 1306, 1311, 1312, - 1313, 1312, 1314, 1311, 1315, 1315, 1318, 1314, 1307, 1301, - 1316, 1316, 1317, 1317, 1313, 1319, 1320, 1321, 1318, 1322, - 1323, 1324, 1325, 1325, 1327, 1323, 1326, 1328, 1320, 1321, - 1329, 1322, 1330, 1319, 1331, 1326, 1332, 1333, 1339, 1334, - 1341, 1324, 1333, 1329, 1334, 1335, 1335, 1328, 1331, 1340, - 1327, 1336, 1336, 1342, 1332, 1343, 1330, 1344, 1339, 1351, - 1345, 1349, 1341, 1352, 1343, 1346, 1346, 1340, 1348, 1348, - 1349, 1353, 1350, 1342, 1351, 1354, 1355, 1344, 1345, 1350, - - 1357, 1352, 1356, 1356, 1358, 1357, 1359, 1360, 1361, 1353, - 1363, 1354, 1366, 1367, 1376, 1355, 1367, 1368, 1368, 1369, - 1370, 1359, 1358, 1372, 1373, 1383, 1360, 1372, 1361, 1363, - 1375, 1375, 1366, 1376, 1369, 1377, 1377, 1373, 1370, 1378, - 1378, 1382, 1382, 1384, 1385, 1386, 1387, 1383, 1388, 1385, - 1386, 1390, 1384, 1391, 1392, 1393, 1388, 40, 1391, 1392, - 1394, 1394, 1395, 1395, 1396, 1387, 1390, 1397, 1397, 1396, - 1393, 1398, 1398, 1401, 1404, 1402, 1403, 1405, 1401, 1402, - 1406, 1403, 1407, 1404, 1408, 1411, 1410, 1407, 1406, 1410, - 1413, 1412, 1405, 1414, 1415, 1415, 1408, 1416, 1418, 1413, - - 1419, 1422, 1414, 1411, 1412, 1420, 1416, 1421, 1421, 1425, - 1422, 1423, 1423, 1424, 1425, 1428, 1427, 1418, 1429, 1435, - 1419, 1424, 1430, 1430, 1420, 1427, 1432, 1432, 1428, 1436, - 1436, 1437, 1441, 1429, 1437, 1438, 1438, 1439, 1439, 1435, - 1440, 1440, 1442, 1443, 1444, 1444, 1448, 1445, 1443, 1451, - 1441, 1445, 1448, 1452, 1453, 1454, 1442, 1455, 1452, 1456, - 1456, 1457, 1458, 1459, 1460, 1460, 1451, 1451, 1461, 1461, - 1458, 1455, 1453, 1462, 1463, 1454, 1464, 1465, 1466, 1463, - 1457, 1467, 1459, 1470, 1468, 1475, 1470, 1466, 1472, 1462, - 1473, 1473, 1476, 1474, 1475, 14, 1464, 1474, 1477, 1479, - - 1480, 1467, 1491, 1465, 1468, 1476, 1472, 1477, 1479, 1485, - 1486, 1486, 1480, 1487, 1485, 1489, 1490, 1493, 1495, 1492, - 1489, 1494, 1487, 1491, 1492, 1490, 1494, 1496, 1496, 1498, - 1499, 1500, 1500, 1501, 1503, 1493, 1504, 1501, 1502, 1506, - 1507, 1505, 1509, 1495, 1506, 1499, 1516, 1502, 1498, 1505, - 1503, 1508, 1508, 1510, 1510, 1504, 1514, 1511, 1513, 1513, - 1516, 1509, 1511, 1515, 1515, 1517, 1507, 1518, 1518, 1519, - 1519, 1520, 1521, 1522, 1523, 1523, 1514, 1524, 1525, 1526, - 1527, 1558, 1528, 1525, 1521, 1527, 1532, 1517, 1535, 1524, - 1520, 1529, 1529, 1522, 1531, 1531, 1534, 1558, 1526, 1528, - - 1528, 1534, 1535, 1536, 13, 1532, 1537, 1537, 1536, 1538, - 1538, 1539, 1539, 1540, 1542, 1542, 1544, 1544, 1540, 1546, - 1546, 1547, 1548, 1548, 1549, 1552, 1553, 1553, 1557, 1549, - 1547, 1554, 1556, 1552, 1559, 1560, 1554, 1556, 1561, 1564, - 1565, 1565, 1582, 1561, 1566, 1566, 1557, 1571, 1571, 1567, - 1573, 1559, 1559, 1567, 1573, 1575, 1560, 1577, 1577, 1564, - 1578, 1580, 1581, 1581, 1584, 1583, 1585, 1582, 1586, 1575, - 1587, 1585, 0, 1586, 0, 1578, 1588, 1588, 1596, 1580, - 1583, 1591, 1591, 1593, 1593, 1584, 1594, 1594, 1599, 1587, - 1596, 1597, 1597, 1599, 1600, 1601, 1602, 1604, 1603, 1609, - - 1601, 1610, 1613, 1609, 1611, 1612, 1614, 1615, 1600, 1618, - 1616, 1617, 1617, 1604, 1619, 1602, 1603, 1611, 1618, 1619, - 1613, 1610, 1614, 1620, 1612, 1616, 1621, 1622, 1620, 1623, - 1624, 1626, 1615, 1627, 1623, 1628, 1629, 1631, 1632, 1630, - 1628, 1629, 1622, 1634, 1624, 1633, 1626, 1635, 1636, 1637, - 1631, 1621, 1627, 1630, 1640, 1641, 1641, 1632, 1638, 1633, - 1635, 1636, 1634, 1638, 1639, 1642, 1643, 1644, 1637, 1639, - 1642, 1643, 1644, 1640, 1645, 1646, 1647, 1647, 1648, 1649, - 1646, 1650, 1651, 1652, 1653, 1648, 1655, 1651, 1656, 1657, - 1658, 1655, 1661, 1645, 1659, 1659, 1660, 1653, 1649, 1665, - - 1650, 1660, 1652, 1658, 1662, 1662, 1665, 1656, 1657, 1663, - 1663, 1661, 1664, 1666, 1667, 1667, 1668, 1664, 1669, 1670, - 1672, 1671, 1674, 1668, 1675, 1669, 1671, 1674, 1676, 1675, - 1677, 1679, 1666, 1678, 1678, 1680, 1681, 1681, 1670, 1672, - 1682, 1682, 1684, 1684, 1683, 1685, 1685, 1676, 1686, 1677, - 1679, 1683, 1688, 1691, 1680, 1686, 1692, 1688, 1691, 1693, - 1694, 1694, 1695, 1695, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1692, 0, 0, 1693, 1699, - 1699, 1699, 1699, 1699, 1699, 1699, 1700, 1700, 1700, 1700, - 1700, 1700, 1700, 1701, 1701, 1701, 1701, 1701, 1701, 1701, - - 1702, 1702, 1702, 1702, 1702, 1702, 1702, 1703, 1703, 1703, - 1703, 1703, 1703, 1703, 1705, 1705, 0, 1705, 1705, 1705, - 1705, 1706, 1706, 0, 0, 0, 1706, 1706, 1707, 1707, - 0, 0, 1707, 0, 1707, 1708, 0, 0, 0, 0, - 0, 1708, 1709, 1709, 0, 0, 0, 1709, 1709, 1710, - 0, 0, 0, 0, 0, 1710, 1711, 1711, 0, 1711, - 1711, 1711, 1711, 1712, 1712, 0, 1712, 1712, 1712, 1712, - 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, - 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, - 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, - - 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698 + 927, 928, 928, 919, 930, 927, 922, 933, 929, 921, + 932, 926, 924, 936, 934, 932, 928, 929, 923, 934, + 929, 935, 930, 937, 938, 933, 939, 935, 937, 939, + 942, 943, 944, 936, 945, 939, 946, 938, 942, 947, + 948, 946, 950, 951, 943, 956, 952, 951, 957, 953, + 944, 952, 954, 945, 953, 947, 955, 954, 948, 958, + 958, 959, 950, 957, 960, 955, 961, 962, 956, 963, + + 964, 965, 962, 966, 966, 959, 960, 965, 961, 967, + 970, 963, 967, 968, 968, 971, 971, 972, 964, 970, + 973, 974, 975, 976, 978, 973, 977, 979, 980, 972, + 974, 977, 982, 978, 975, 981, 981, 982, 976, 983, + 984, 985, 987, 980, 986, 986, 978, 979, 988, 988, + 989, 989, 990, 991, 992, 995, 990, 992, 991, 984, + 983, 985, 987, 994, 996, 997, 998, 998, 994, 996, + 999, 999, 1000, 995, 1001, 1002, 1003, 1000, 1004, 1006, + 1005, 1007, 1007, 1008, 1009, 1009, 1001, 1001, 1001, 1014, + 997, 1010, 1012, 1001, 1005, 1002, 1003, 1017, 1004, 1015, + + 1006, 1012, 1013, 1013, 1014, 1016, 1015, 1018, 1018, 1008, + 1019, 1010, 1020, 1022, 1016, 1023, 1028, 1024, 1022, 1025, + 1023, 1026, 1026, 1017, 1027, 1028, 1025, 1029, 1020, 1027, + 1030, 1031, 1032, 1033, 1031, 1036, 1019, 1024, 1034, 1034, + 1035, 1037, 1030, 1038, 1039, 1040, 1040, 1029, 1043, 1038, + 1032, 1041, 1044, 1039, 1036, 1035, 1037, 1042, 1042, 1033, + 1045, 1049, 1041, 1046, 1046, 1045, 1044, 1041, 1047, 1043, + 1048, 1050, 1047, 1047, 1051, 1048, 1052, 1053, 1054, 1051, + 1055, 1053, 1057, 1050, 1056, 1059, 1058, 1049, 1052, 1056, + 1054, 1058, 1061, 1062, 1062, 1061, 1064, 1059, 1063, 1063, + + 1071, 1065, 1064, 1066, 1057, 1055, 1065, 1067, 1069, 1066, + 1073, 1075, 1071, 1069, 1074, 1074, 1067, 1076, 1077, 1078, + 1079, 1082, 1073, 1080, 1079, 1081, 1076, 1085, 1080, 56, + 1081, 1075, 1084, 1084, 1086, 1082, 1077, 1087, 1078, 1089, + 1089, 1092, 1095, 1086, 1084, 1085, 1087, 1093, 1094, 1096, + 1096, 1101, 1097, 1094, 1097, 1100, 1092, 1098, 1098, 1095, + 1103, 1093, 1100, 1102, 1102, 1104, 1105, 1106, 1107, 1103, + 1108, 1101, 1109, 1110, 1115, 1113, 1112, 1113, 1105, 1106, + 1107, 1112, 1114, 1115, 1117, 1108, 1104, 1118, 1118, 1119, + 1120, 1124, 1109, 1110, 1121, 1120, 1121, 1122, 1117, 1123, + + 1114, 1125, 1122, 1126, 1123, 1127, 1129, 1132, 1126, 1124, + 1127, 1133, 1130, 1131, 1131, 1119, 1137, 51, 1134, 1135, + 1147, 1125, 1132, 1134, 1135, 1129, 1130, 1136, 1137, 1136, + 1138, 1133, 1139, 1141, 1139, 1140, 1143, 1146, 1144, 1138, + 1147, 1143, 1138, 1144, 1140, 1141, 1148, 1150, 1152, 1153, + 1146, 1154, 1155, 1150, 1152, 1156, 1156, 1157, 1158, 1158, + 1159, 1155, 1148, 1160, 1153, 1161, 1157, 1160, 1162, 1164, + 1161, 1163, 1163, 1167, 1168, 1168, 1154, 1164, 1170, 1159, + 1171, 1162, 1167, 1169, 1169, 1175, 1172, 1173, 1173, 1176, + 1170, 1172, 1177, 1178, 1176, 1179, 1180, 1181, 1171, 1183, + + 1179, 1182, 1182, 1183, 1184, 1186, 1185, 1187, 1178, 1189, + 1175, 1185, 1190, 1181, 1180, 1177, 1191, 1192, 1193, 1184, + 1194, 1196, 1196, 1199, 1197, 50, 1187, 1197, 1218, 1198, + 1193, 1186, 1189, 1200, 1218, 1191, 1190, 1199, 1192, 1201, + 1201, 1194, 1198, 1202, 1202, 1204, 1200, 1203, 1203, 1205, + 1205, 1206, 1206, 1207, 1207, 1208, 1209, 1209, 1204, 1210, + 1210, 1211, 1213, 1214, 1214, 1215, 1222, 1213, 1216, 1216, + 1217, 1225, 1219, 45, 1208, 1219, 1220, 1220, 1221, 1221, + 1211, 1223, 1223, 1226, 1215, 1222, 1227, 1229, 1217, 1231, + 1227, 1236, 1220, 1234, 1225, 1228, 1228, 1237, 1226, 1230, + + 1230, 1232, 1232, 1233, 1235, 1234, 1229, 1238, 1239, 1235, + 1237, 1240, 1233, 1239, 1241, 1231, 1236, 1243, 1242, 1244, + 1247, 1245, 40, 1241, 1244, 1245, 1240, 1242, 1238, 1249, + 1251, 1243, 1250, 1250, 1254, 1251, 1252, 1252, 1249, 1255, + 1247, 1257, 1258, 1259, 1257, 1252, 1263, 1258, 1267, 1254, + 1265, 1255, 1260, 1260, 1262, 1262, 1264, 1264, 1266, 1274, + 1263, 1487, 1265, 1259, 1268, 1268, 1270, 1267, 1271, 1275, + 1270, 1271, 1266, 1272, 1272, 1273, 1277, 1276, 1282, 1274, + 1273, 1276, 1278, 1275, 1279, 1280, 1487, 1278, 1283, 1279, + 1284, 1280, 1285, 1283, 1282, 1284, 1277, 1286, 1303, 1286, + + 1285, 1289, 1289, 1293, 1293, 1296, 1297, 1297, 1299, 1299, + 1296, 1301, 1302, 1302, 1303, 1304, 1301, 1305, 1307, 1307, + 1309, 1310, 1305, 1311, 1315, 1309, 1313, 1313, 1316, 1315, + 1316, 1317, 1319, 1319, 1322, 1318, 1323, 1304, 1311, 1310, + 1318, 1320, 1320, 1321, 1321, 1317, 1322, 1324, 1325, 1326, + 1327, 1328, 1329, 1329, 1323, 1327, 1330, 1331, 1332, 1324, + 1325, 1326, 1333, 1334, 1336, 1330, 1335, 1337, 1338, 1339, + 1339, 1328, 1337, 1338, 1343, 1333, 1340, 1340, 1332, 1344, + 1335, 1345, 1336, 1331, 1346, 1348, 1347, 1334, 1349, 1350, + 1350, 1352, 1352, 1353, 1343, 1347, 1355, 1344, 1356, 1357, + + 1354, 1359, 1353, 1345, 1346, 1348, 1349, 1354, 1358, 1360, + 1360, 1355, 1362, 1361, 1363, 1364, 1356, 1357, 1361, 1365, + 1359, 1367, 1370, 1371, 1358, 1374, 1371, 1372, 1372, 1363, + 1362, 1373, 1376, 1381, 1364, 1378, 1376, 1377, 1377, 1365, + 1367, 1388, 1370, 1374, 1380, 1380, 1373, 1392, 1378, 1382, + 1382, 1389, 1381, 1383, 1383, 1387, 1387, 1390, 1395, 1391, + 1389, 1393, 1390, 1388, 1391, 1396, 1392, 1397, 1398, 1393, + 1396, 14, 1397, 1395, 1399, 1399, 1400, 1400, 1410, 1401, + 1402, 1402, 1406, 1398, 1401, 1403, 1403, 1406, 1407, 1408, + 1409, 1412, 1407, 1410, 1408, 1411, 1412, 1413, 1415, 1409, + + 1416, 1415, 1417, 1411, 1418, 1419, 1420, 1420, 1421, 1413, + 1423, 1424, 1427, 1418, 1419, 1417, 1425, 1421, 1416, 1426, + 1426, 1427, 1428, 1428, 1429, 1430, 1433, 1432, 1434, 1423, + 1430, 1424, 1429, 1436, 1436, 1425, 1432, 1438, 1438, 1433, + 1441, 1442, 1442, 1434, 1443, 1444, 1444, 1443, 1445, 1445, + 1446, 1446, 1447, 1448, 1449, 1450, 1450, 1451, 1454, 1449, + 1441, 1451, 1457, 1458, 1454, 1459, 1460, 1448, 1458, 1463, + 1447, 1461, 1462, 1462, 1464, 1465, 1466, 1466, 1470, 1457, + 1457, 1468, 1464, 1459, 1471, 1461, 1460, 1469, 1463, 1467, + 1467, 1472, 1469, 1473, 1465, 1474, 1476, 1468, 1470, 1476, + + 1472, 1478, 1479, 1479, 1480, 1481, 13, 1482, 1480, 1483, + 1471, 1486, 1485, 1473, 1481, 1474, 1499, 1491, 1483, 1478, + 1482, 1485, 1491, 1486, 1492, 1492, 1493, 1495, 1496, 1497, + 1501, 1498, 1495, 1500, 1499, 1493, 1498, 1496, 1500, 1502, + 1502, 1504, 1505, 1506, 1506, 1507, 1509, 1508, 1510, 1507, + 1497, 1511, 1513, 1512, 1515, 1501, 1508, 1505, 1512, 1511, + 1504, 1520, 1509, 1514, 1514, 1516, 1516, 1510, 1522, 1517, + 1519, 1519, 1523, 1515, 1517, 1521, 1521, 1526, 1513, 1524, + 1524, 1520, 1522, 1525, 1525, 1527, 1528, 1529, 1529, 1530, + 1531, 1532, 1538, 1533, 1523, 1531, 1526, 1527, 1533, 1534, + + 1541, 1530, 1535, 1535, 1537, 1537, 1528, 1540, 1542, 0, + 1532, 1538, 1540, 1542, 1541, 0, 1534, 1534, 1543, 1543, + 1544, 1544, 1545, 1545, 1546, 1548, 1548, 1550, 1550, 1546, + 1552, 1552, 1553, 1554, 1554, 1555, 1558, 1559, 1559, 1563, + 1555, 1553, 1560, 1562, 1558, 1564, 1565, 1560, 1562, 1566, + 1567, 1570, 1571, 1571, 1584, 1567, 1573, 1563, 1572, 1572, + 1573, 1564, 1581, 1565, 1565, 1577, 1577, 1586, 1579, 1584, + 1566, 1570, 1579, 1583, 1583, 1588, 1581, 1587, 1587, 1589, + 1590, 1591, 1592, 1593, 0, 1586, 1591, 1592, 1594, 1594, + 1597, 1597, 1599, 1599, 1589, 1600, 1600, 1602, 1603, 1603, + + 1588, 1590, 1593, 1605, 1606, 1607, 1608, 1610, 1605, 1602, + 1607, 1609, 1615, 1616, 1617, 1618, 1615, 1619, 1606, 1621, + 1620, 1625, 1622, 1610, 1627, 1608, 1625, 1617, 1630, 1609, + 1623, 1623, 1624, 1616, 1618, 1619, 1620, 1622, 1626, 1628, + 1629, 1624, 1630, 1626, 1621, 1629, 1632, 1633, 1634, 1627, + 1635, 1636, 1638, 1634, 1628, 1635, 1637, 1640, 1639, 1643, + 1641, 1632, 1642, 1644, 1646, 1636, 1633, 1651, 1644, 1637, + 0, 1638, 1639, 1641, 1645, 1642, 1640, 1648, 1643, 1645, + 1647, 1647, 1648, 1646, 1649, 1650, 1651, 1652, 1654, 1649, + 1650, 1655, 1652, 1653, 1653, 1654, 1656, 1657, 1658, 1659, + + 1661, 1662, 1657, 1663, 1666, 1661, 1664, 1665, 1665, 1666, + 1655, 1667, 1659, 1668, 1668, 1656, 1670, 1658, 1671, 1664, + 1662, 1670, 1663, 1669, 1669, 1671, 1672, 1673, 1673, 1674, + 1667, 1675, 1676, 1678, 1677, 1680, 1674, 1681, 1675, 1677, + 1680, 1682, 1681, 1683, 1685, 1672, 1684, 1684, 1686, 1687, + 1687, 1676, 1678, 1688, 1688, 1690, 1690, 1689, 1691, 1691, + 1682, 1692, 1683, 1685, 1689, 1694, 1697, 1686, 1692, 1698, + 1694, 1697, 1699, 1700, 1700, 1701, 1701, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1698, 0, + 0, 1699, 1705, 1705, 1705, 1705, 1705, 1705, 1705, 1706, + + 1706, 1706, 1706, 1706, 1706, 1706, 1707, 1707, 1707, 1707, + 1707, 1707, 1707, 1708, 1708, 1708, 1708, 1708, 1708, 1708, + 1709, 1709, 1709, 1709, 1709, 1709, 1709, 1711, 1711, 0, + 1711, 1711, 1711, 1711, 1712, 1712, 0, 0, 0, 1712, + 1712, 1713, 1713, 0, 0, 1713, 0, 1713, 1714, 0, + 0, 0, 0, 0, 1714, 1715, 1715, 0, 0, 0, + 1715, 1715, 1716, 0, 0, 0, 0, 0, 1716, 1717, + 1717, 0, 1717, 1717, 1717, 1717, 1718, 1718, 0, 1718, + 1718, 1718, 1718, 1704, 1704, 1704, 1704, 1704, 1704, 1704, + 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, + + 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, + 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, + 1704, 1704, 1704 } ; static yy_state_type yy_last_accepting_state; @@ -1945,7 +1950,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 1947 "" +#line 1952 "" #define INITIAL 0 #define quotedstring 1 @@ -2132,7 +2137,7 @@ YY_DECL #line 197 "./util/configlexer.lex" -#line 2134 "" +#line 2139 "" if ( !(yy_init) ) { @@ -2191,13 +2196,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 >= 1699 ) + if ( yy_current_state >= 1705 ) 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] != 3371 ); + while ( yy_base[yy_current_state] != 3384 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2982,40 +2987,45 @@ YY_RULE_SETUP { YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 151: -/* rule 151 can match eol */ YY_RULE_SETUP #line 358 "./util/configlexer.lex" +{ YDVAR(1, VAR_RATELIMIT_FACTOR) } + YY_BREAK +case 152: +/* rule 152 can match eol */ +YY_RULE_SETUP +#line 359 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 152: +case 153: YY_RULE_SETUP -#line 361 "./util/configlexer.lex" +#line 362 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 362 "./util/configlexer.lex" +#line 363 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 153: +case 154: YY_RULE_SETUP -#line 367 "./util/configlexer.lex" +#line 368 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 154: -/* rule 154 can match eol */ +case 155: +/* rule 155 can match eol */ YY_RULE_SETUP -#line 368 "./util/configlexer.lex" +#line 369 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 155: +case 156: YY_RULE_SETUP -#line 370 "./util/configlexer.lex" +#line 371 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3028,34 +3038,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 156: +case 157: YY_RULE_SETUP -#line 382 "./util/configlexer.lex" +#line 383 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 383 "./util/configlexer.lex" +#line 384 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 157: +case 158: YY_RULE_SETUP -#line 388 "./util/configlexer.lex" +#line 389 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 158: -/* rule 158 can match eol */ +case 159: +/* rule 159 can match eol */ YY_RULE_SETUP -#line 389 "./util/configlexer.lex" +#line 390 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 159: +case 160: YY_RULE_SETUP -#line 391 "./util/configlexer.lex" +#line 392 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3068,38 +3078,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 160: +case 161: YY_RULE_SETUP -#line 403 "./util/configlexer.lex" +#line 404 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 405 "./util/configlexer.lex" +#line 406 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 161: -YY_RULE_SETUP -#line 409 "./util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 162: -/* rule 162 can match eol */ YY_RULE_SETUP #line 410 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 163: +/* rule 163 can match eol */ YY_RULE_SETUP #line 411 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 164: YY_RULE_SETUP #line 412 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 165: +YY_RULE_SETUP +#line 413 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext); @@ -3107,27 +3117,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 417 "./util/configlexer.lex" +#line 418 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 165: +case 166: YY_RULE_SETUP -#line 421 "./util/configlexer.lex" +#line 422 "./util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 166: -/* rule 166 can match eol */ +case 167: +/* rule 167 can match eol */ YY_RULE_SETUP -#line 422 "./util/configlexer.lex" +#line 423 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 167: +case 168: YY_RULE_SETUP -#line 424 "./util/configlexer.lex" +#line 425 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -3137,7 +3147,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 430 "./util/configlexer.lex" +#line 431 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -3149,33 +3159,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 168: +case 169: YY_RULE_SETUP -#line 441 "./util/configlexer.lex" +#line 442 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 169: +case 170: YY_RULE_SETUP -#line 445 "./util/configlexer.lex" +#line 446 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 170: +case 171: YY_RULE_SETUP -#line 449 "./util/configlexer.lex" +#line 450 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 171: +case 172: YY_RULE_SETUP -#line 453 "./util/configlexer.lex" +#line 454 "./util/configlexer.lex" ECHO; YY_BREAK -#line 3177 "" +#line 3187 "" case YY_END_OF_BUFFER: { @@ -3465,7 +3475,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 >= 1699 ) + if ( yy_current_state >= 1705 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -3493,11 +3503,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 >= 1699 ) + if ( yy_current_state >= 1705 ) 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 == 1698); + yy_is_jam = (yy_current_state == 1704); return yy_is_jam ? 0 : yy_current_state; } @@ -4130,7 +4140,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 453 "./util/configlexer.lex" +#line 454 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 9e5896c46..dee003b06 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -355,6 +355,7 @@ ratelimit-slabs{COLON} { YDVAR(1, VAR_RATELIMIT_SLABS) } ratelimit-size{COLON} { YDVAR(1, VAR_RATELIMIT_SIZE) } ratelimit-for-domain{COLON} { YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } ratelimit-below-domain{COLON} { YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } +ratelimit-factor{COLON} { YDVAR(1, VAR_RATELIMIT_FACTOR) } {NEWLINE} { LEXOUT(("NL\n")); cfg_parser->line++; } /* Quoted strings. Strip leading and ending quotes */ diff --git a/util/configparser.c b/util/configparser.c index 7befbbca8..acbd59b74 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -281,7 +281,8 @@ extern int yydebug; VAR_RATELIMIT_SLABS = 409, VAR_RATELIMIT_SIZE = 410, VAR_RATELIMIT_FOR_DOMAIN = 411, - VAR_RATELIMIT_BELOW_DOMAIN = 412 + VAR_RATELIMIT_BELOW_DOMAIN = 412, + VAR_RATELIMIT_FACTOR = 413 }; #endif /* Tokens. */ @@ -440,6 +441,7 @@ extern int yydebug; #define VAR_RATELIMIT_SIZE 410 #define VAR_RATELIMIT_FOR_DOMAIN 411 #define VAR_RATELIMIT_BELOW_DOMAIN 412 +#define VAR_RATELIMIT_FACTOR 413 @@ -453,7 +455,7 @@ typedef union YYSTYPE /* Line 387 of yacc.c */ -#line 457 "util/configparser.c" +#line 459 "util/configparser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -481,7 +483,7 @@ int yyparse (); /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 485 "util/configparser.c" +#line 487 "util/configparser.c" #ifdef short # undef short @@ -701,20 +703,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 295 +#define YYLAST 297 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 158 +#define YYNTOKENS 159 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 163 +#define YYNNTS 164 /* YYNRULES -- Number of rules. */ -#define YYNRULES 311 +#define YYNRULES 313 /* YYNRULES -- Number of states. */ -#define YYNSTATES 458 +#define YYNSTATES 461 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 412 +#define YYMAXUTOK 413 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -763,7 +765,7 @@ static const yytype_uint8 yytranslate[] = 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157 + 155, 156, 157, 158 }; #if YYDEBUG @@ -783,109 +785,109 @@ static const yytype_uint16 yyprhs[] = 185, 187, 189, 191, 193, 195, 197, 199, 201, 203, 205, 207, 209, 211, 213, 215, 217, 219, 221, 223, 225, 227, 229, 231, 233, 235, 237, 239, 241, 243, - 245, 247, 249, 251, 253, 255, 257, 260, 261, 263, - 265, 267, 269, 271, 273, 276, 277, 279, 281, 283, - 285, 288, 291, 294, 297, 300, 303, 306, 309, 312, - 315, 318, 321, 324, 327, 330, 333, 336, 339, 342, - 345, 348, 351, 354, 357, 360, 363, 366, 369, 372, - 375, 378, 381, 384, 387, 390, 393, 396, 399, 402, - 405, 408, 411, 414, 417, 420, 423, 426, 429, 432, - 435, 438, 441, 444, 447, 450, 453, 456, 459, 462, - 465, 468, 471, 474, 477, 480, 483, 486, 489, 492, - 495, 498, 501, 504, 507, 510, 513, 516, 519, 522, - 525, 529, 532, 535, 538, 541, 544, 547, 550, 553, - 556, 559, 562, 565, 568, 571, 574, 577, 580, 583, - 587, 590, 593, 596, 599, 602, 605, 608, 611, 614, - 617, 621, 625, 628, 631, 634, 637, 640, 643, 646, - 649, 652, 654, 657, 658, 660, 662, 664, 666, 668, - 670, 672, 674, 677, 680, 683, 686, 689, 692, 695, - 698, 700, 703, 704, 706, 708, 710, 712, 714, 716, - 718, 720, 722, 724, 726, 728, 731, 734, 737, 740, - 743, 746, 749, 752, 755, 758, 761, 764, 766, 769, - 770, 772 + 245, 247, 249, 251, 253, 255, 257, 259, 262, 263, + 265, 267, 269, 271, 273, 275, 278, 279, 281, 283, + 285, 287, 290, 293, 296, 299, 302, 305, 308, 311, + 314, 317, 320, 323, 326, 329, 332, 335, 338, 341, + 344, 347, 350, 353, 356, 359, 362, 365, 368, 371, + 374, 377, 380, 383, 386, 389, 392, 395, 398, 401, + 404, 407, 410, 413, 416, 419, 422, 425, 428, 431, + 434, 437, 440, 443, 446, 449, 452, 455, 458, 461, + 464, 467, 470, 473, 476, 479, 482, 485, 488, 491, + 494, 497, 500, 503, 506, 509, 512, 515, 518, 521, + 524, 527, 531, 534, 537, 540, 543, 546, 549, 552, + 555, 558, 561, 564, 567, 570, 573, 576, 579, 582, + 585, 589, 592, 595, 598, 601, 604, 607, 610, 613, + 616, 619, 623, 627, 630, 633, 636, 639, 642, 645, + 648, 651, 654, 657, 659, 662, 663, 665, 667, 669, + 671, 673, 675, 677, 679, 682, 685, 688, 691, 694, + 697, 700, 703, 705, 708, 709, 711, 713, 715, 717, + 719, 721, 723, 725, 727, 729, 731, 733, 736, 739, + 742, 745, 748, 751, 754, 757, 760, 763, 766, 769, + 771, 774, 775, 777 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 159, 0, -1, -1, 159, 160, -1, 161, 162, -1, - 164, 165, -1, 167, 168, -1, 317, 318, -1, 291, - 292, -1, 302, 303, -1, 11, -1, 162, 163, -1, - -1, 170, -1, 171, -1, 175, -1, 178, -1, 184, - -1, 185, -1, 186, -1, 187, -1, 176, -1, 197, - -1, 198, -1, 199, -1, 200, -1, 201, -1, 220, - -1, 221, -1, 222, -1, 226, -1, 227, -1, 181, - -1, 228, -1, 229, -1, 232, -1, 230, -1, 231, - -1, 234, -1, 235, -1, 236, -1, 248, -1, 210, - -1, 211, -1, 212, -1, 213, -1, 237, -1, 251, - -1, 206, -1, 208, -1, 252, -1, 257, -1, 258, - -1, 259, -1, 182, -1, 219, -1, 266, -1, 267, - -1, 207, -1, 262, -1, 194, -1, 177, -1, 202, - -1, 249, -1, 255, -1, 238, -1, 250, -1, 269, - -1, 270, -1, 183, -1, 172, -1, 193, -1, 242, - -1, 173, -1, 179, -1, 180, -1, 203, -1, 204, - -1, 268, -1, 240, -1, 243, -1, 244, -1, 174, - -1, 271, -1, 223, -1, 247, -1, 195, -1, 209, - -1, 253, -1, 254, -1, 256, -1, 261, -1, 205, - -1, 263, -1, 264, -1, 265, -1, 214, -1, 218, - -1, 245, -1, 246, -1, 215, -1, 239, -1, 260, - -1, 196, -1, 188, -1, 189, -1, 190, -1, 191, - -1, 192, -1, 272, -1, 273, -1, 274, -1, 216, - -1, 224, -1, 225, -1, 275, -1, 276, -1, 233, - -1, 241, -1, 217, -1, 277, -1, 279, -1, 278, - -1, 280, -1, 281, -1, 38, -1, 165, 166, -1, - -1, 282, -1, 283, -1, 284, -1, 286, -1, 285, - -1, 44, -1, 168, 169, -1, -1, 287, -1, 288, - -1, 289, -1, 290, -1, 13, 10, -1, 12, 10, - -1, 76, 10, -1, 79, 10, -1, 97, 10, -1, - 14, 10, -1, 16, 10, -1, 67, 10, -1, 15, - 10, -1, 80, 10, -1, 81, 10, -1, 31, 10, - -1, 60, 10, -1, 75, 10, -1, 17, 10, -1, - 18, 10, -1, 19, 10, -1, 20, 10, -1, 123, - 10, -1, 124, 10, -1, 125, 10, -1, 126, 10, - -1, 127, 10, -1, 77, 10, -1, 66, 10, -1, - 102, 10, -1, 122, 10, -1, 21, 10, -1, 22, - 10, -1, 23, 10, -1, 24, 10, -1, 25, 10, - -1, 68, 10, -1, 82, 10, -1, 83, 10, -1, - 110, 10, -1, 54, 10, -1, 64, 10, -1, 55, - 10, -1, 103, 10, -1, 48, 10, -1, 49, 10, - -1, 50, 10, -1, 51, 10, -1, 114, 10, -1, - 118, 10, -1, 119, 10, -1, 152, 10, -1, 115, - 10, -1, 61, 10, -1, 26, 10, -1, 27, 10, - -1, 28, 10, -1, 99, 10, -1, 133, 10, -1, - 134, 10, -1, 29, 10, -1, 30, 10, -1, 32, - 10, -1, 33, 10, -1, 35, 10, -1, 36, 10, - -1, 34, 10, -1, 135, 10, -1, 41, 10, -1, - 42, 10, -1, 43, 10, -1, 52, 10, -1, 71, - 10, -1, 120, 10, -1, 85, 10, -1, 151, 10, - -1, 78, 10, -1, 86, 10, -1, 87, 10, -1, - 116, 10, -1, 117, 10, -1, 101, 10, -1, 47, - 10, -1, 69, 10, -1, 72, 10, 10, -1, 53, - 10, -1, 56, 10, -1, 106, 10, -1, 107, 10, - -1, 70, 10, -1, 108, 10, -1, 57, 10, -1, - 58, 10, -1, 59, 10, -1, 121, 10, -1, 109, - 10, -1, 65, 10, -1, 112, 10, -1, 113, 10, - -1, 111, 10, -1, 62, 10, -1, 63, 10, -1, - 84, 10, -1, 73, 10, 10, -1, 74, 10, -1, - 98, 10, -1, 130, 10, -1, 131, 10, -1, 132, - 10, -1, 136, 10, -1, 137, 10, -1, 153, 10, - -1, 155, 10, -1, 154, 10, -1, 156, 10, 10, - -1, 157, 10, 10, -1, 37, 10, -1, 39, 10, - -1, 40, 10, -1, 129, 10, -1, 100, 10, -1, - 37, 10, -1, 45, 10, -1, 46, 10, -1, 128, - 10, -1, 88, -1, 292, 293, -1, -1, 294, -1, - 296, -1, 295, -1, 298, -1, 299, -1, 300, -1, - 301, -1, 297, -1, 89, 10, -1, 91, 10, -1, - 90, 10, -1, 96, 10, -1, 92, 10, -1, 93, - 10, -1, 94, 10, -1, 95, 10, -1, 138, -1, - 303, 304, -1, -1, 305, -1, 306, -1, 307, -1, - 308, -1, 309, -1, 310, -1, 311, -1, 312, -1, - 313, -1, 314, -1, 315, -1, 316, -1, 139, 10, - -1, 140, 10, -1, 141, 10, -1, 142, 10, -1, - 143, 10, -1, 144, 10, -1, 145, 10, -1, 146, - 10, -1, 147, 10, -1, 148, 10, -1, 149, 10, - -1, 150, 10, -1, 104, -1, 318, 319, -1, -1, - 320, -1, 105, 10, -1 + 160, 0, -1, -1, 160, 161, -1, 162, 163, -1, + 165, 166, -1, 168, 169, -1, 319, 320, -1, 293, + 294, -1, 304, 305, -1, 11, -1, 163, 164, -1, + -1, 171, -1, 172, -1, 176, -1, 179, -1, 185, + -1, 186, -1, 187, -1, 188, -1, 177, -1, 198, + -1, 199, -1, 200, -1, 201, -1, 202, -1, 221, + -1, 222, -1, 223, -1, 227, -1, 228, -1, 182, + -1, 229, -1, 230, -1, 233, -1, 231, -1, 232, + -1, 235, -1, 236, -1, 237, -1, 249, -1, 211, + -1, 212, -1, 213, -1, 214, -1, 238, -1, 252, + -1, 207, -1, 209, -1, 253, -1, 258, -1, 259, + -1, 260, -1, 183, -1, 220, -1, 267, -1, 268, + -1, 208, -1, 263, -1, 195, -1, 178, -1, 203, + -1, 250, -1, 256, -1, 239, -1, 251, -1, 270, + -1, 271, -1, 184, -1, 173, -1, 194, -1, 243, + -1, 174, -1, 180, -1, 181, -1, 204, -1, 205, + -1, 269, -1, 241, -1, 244, -1, 245, -1, 175, + -1, 272, -1, 224, -1, 248, -1, 196, -1, 210, + -1, 254, -1, 255, -1, 257, -1, 262, -1, 206, + -1, 264, -1, 265, -1, 266, -1, 215, -1, 219, + -1, 246, -1, 247, -1, 216, -1, 240, -1, 261, + -1, 197, -1, 189, -1, 190, -1, 191, -1, 192, + -1, 193, -1, 273, -1, 274, -1, 275, -1, 217, + -1, 225, -1, 226, -1, 276, -1, 277, -1, 234, + -1, 242, -1, 218, -1, 278, -1, 280, -1, 279, + -1, 281, -1, 282, -1, 283, -1, 38, -1, 166, + 167, -1, -1, 284, -1, 285, -1, 286, -1, 288, + -1, 287, -1, 44, -1, 169, 170, -1, -1, 289, + -1, 290, -1, 291, -1, 292, -1, 13, 10, -1, + 12, 10, -1, 76, 10, -1, 79, 10, -1, 97, + 10, -1, 14, 10, -1, 16, 10, -1, 67, 10, + -1, 15, 10, -1, 80, 10, -1, 81, 10, -1, + 31, 10, -1, 60, 10, -1, 75, 10, -1, 17, + 10, -1, 18, 10, -1, 19, 10, -1, 20, 10, + -1, 123, 10, -1, 124, 10, -1, 125, 10, -1, + 126, 10, -1, 127, 10, -1, 77, 10, -1, 66, + 10, -1, 102, 10, -1, 122, 10, -1, 21, 10, + -1, 22, 10, -1, 23, 10, -1, 24, 10, -1, + 25, 10, -1, 68, 10, -1, 82, 10, -1, 83, + 10, -1, 110, 10, -1, 54, 10, -1, 64, 10, + -1, 55, 10, -1, 103, 10, -1, 48, 10, -1, + 49, 10, -1, 50, 10, -1, 51, 10, -1, 114, + 10, -1, 118, 10, -1, 119, 10, -1, 152, 10, + -1, 115, 10, -1, 61, 10, -1, 26, 10, -1, + 27, 10, -1, 28, 10, -1, 99, 10, -1, 133, + 10, -1, 134, 10, -1, 29, 10, -1, 30, 10, + -1, 32, 10, -1, 33, 10, -1, 35, 10, -1, + 36, 10, -1, 34, 10, -1, 135, 10, -1, 41, + 10, -1, 42, 10, -1, 43, 10, -1, 52, 10, + -1, 71, 10, -1, 120, 10, -1, 85, 10, -1, + 151, 10, -1, 78, 10, -1, 86, 10, -1, 87, + 10, -1, 116, 10, -1, 117, 10, -1, 101, 10, + -1, 47, 10, -1, 69, 10, -1, 72, 10, 10, + -1, 53, 10, -1, 56, 10, -1, 106, 10, -1, + 107, 10, -1, 70, 10, -1, 108, 10, -1, 57, + 10, -1, 58, 10, -1, 59, 10, -1, 121, 10, + -1, 109, 10, -1, 65, 10, -1, 112, 10, -1, + 113, 10, -1, 111, 10, -1, 62, 10, -1, 63, + 10, -1, 84, 10, -1, 73, 10, 10, -1, 74, + 10, -1, 98, 10, -1, 130, 10, -1, 131, 10, + -1, 132, 10, -1, 136, 10, -1, 137, 10, -1, + 153, 10, -1, 155, 10, -1, 154, 10, -1, 156, + 10, 10, -1, 157, 10, 10, -1, 158, 10, -1, + 37, 10, -1, 39, 10, -1, 40, 10, -1, 129, + 10, -1, 100, 10, -1, 37, 10, -1, 45, 10, + -1, 46, 10, -1, 128, 10, -1, 88, -1, 294, + 295, -1, -1, 296, -1, 298, -1, 297, -1, 300, + -1, 301, -1, 302, -1, 303, -1, 299, -1, 89, + 10, -1, 91, 10, -1, 90, 10, -1, 96, 10, + -1, 92, 10, -1, 93, 10, -1, 94, 10, -1, + 95, 10, -1, 138, -1, 305, 306, -1, -1, 307, + -1, 308, -1, 309, -1, 310, -1, 311, -1, 312, + -1, 313, -1, 314, -1, 315, -1, 316, -1, 317, + -1, 318, -1, 139, 10, -1, 140, 10, -1, 141, + 10, -1, 142, 10, -1, 143, 10, -1, 144, 10, + -1, 145, 10, -1, 146, 10, -1, 147, 10, -1, + 148, 10, -1, 149, 10, -1, 150, 10, -1, 104, + -1, 320, 321, -1, -1, 322, -1, 105, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -903,26 +905,26 @@ static const yytype_uint16 yyrline[] = 173, 173, 174, 174, 175, 175, 175, 176, 176, 176, 177, 177, 177, 178, 178, 178, 179, 179, 179, 180, 180, 180, 181, 181, 181, 182, 182, 183, 183, 184, - 184, 184, 185, 185, 186, 188, 200, 201, 202, 202, - 202, 202, 202, 204, 216, 217, 218, 218, 218, 218, - 220, 229, 238, 249, 258, 267, 276, 289, 304, 313, - 322, 331, 340, 349, 358, 367, 376, 385, 394, 403, - 412, 419, 426, 435, 444, 458, 467, 476, 483, 490, - 497, 505, 512, 519, 526, 533, 541, 549, 557, 564, - 571, 580, 589, 596, 603, 611, 619, 629, 639, 652, - 663, 671, 684, 693, 702, 711, 721, 729, 742, 751, - 759, 768, 776, 789, 798, 805, 815, 825, 835, 845, - 855, 865, 875, 885, 892, 899, 908, 917, 926, 933, - 943, 960, 967, 985, 998, 1011, 1020, 1029, 1038, 1048, - 1058, 1067, 1076, 1083, 1092, 1101, 1110, 1118, 1131, 1139, - 1163, 1170, 1185, 1195, 1205, 1212, 1219, 1228, 1237, 1245, - 1258, 1271, 1284, 1294, 1301, 1308, 1317, 1327, 1337, 1344, - 1351, 1360, 1365, 1366, 1367, 1367, 1367, 1368, 1368, 1368, - 1369, 1369, 1371, 1381, 1390, 1397, 1407, 1414, 1421, 1428, - 1435, 1440, 1441, 1442, 1442, 1443, 1443, 1444, 1444, 1445, - 1446, 1447, 1448, 1449, 1450, 1452, 1460, 1467, 1475, 1483, - 1490, 1497, 1506, 1515, 1524, 1533, 1542, 1551, 1556, 1557, - 1558, 1560 + 184, 184, 185, 185, 186, 186, 188, 200, 201, 202, + 202, 202, 202, 202, 204, 216, 217, 218, 218, 218, + 218, 220, 229, 238, 249, 258, 267, 276, 289, 304, + 313, 322, 331, 340, 349, 358, 367, 376, 385, 394, + 403, 412, 419, 426, 435, 444, 458, 467, 476, 483, + 490, 497, 505, 512, 519, 526, 533, 541, 549, 557, + 564, 571, 580, 589, 596, 603, 611, 619, 629, 639, + 652, 663, 671, 684, 693, 702, 711, 721, 729, 742, + 751, 759, 768, 776, 789, 798, 805, 815, 825, 835, + 845, 855, 865, 875, 885, 892, 899, 908, 917, 926, + 933, 943, 960, 967, 985, 998, 1011, 1020, 1029, 1038, + 1048, 1058, 1067, 1076, 1083, 1092, 1101, 1110, 1118, 1131, + 1139, 1163, 1170, 1185, 1195, 1205, 1212, 1219, 1228, 1237, + 1245, 1258, 1271, 1284, 1293, 1303, 1310, 1317, 1326, 1336, + 1346, 1353, 1360, 1369, 1374, 1375, 1376, 1376, 1376, 1377, + 1377, 1377, 1378, 1378, 1380, 1390, 1399, 1406, 1416, 1423, + 1430, 1437, 1444, 1449, 1450, 1451, 1451, 1452, 1452, 1453, + 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1461, 1469, 1476, + 1484, 1492, 1499, 1506, 1515, 1524, 1533, 1542, 1551, 1560, + 1565, 1566, 1567, 1569 }; #endif @@ -986,17 +988,17 @@ static const char *const yytname[] = "VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES", "VAR_HARDEN_ALGO_DOWNGRADE", "VAR_IP_TRANSPARENT", "VAR_RATELIMIT", "VAR_RATELIMIT_SLABS", "VAR_RATELIMIT_SIZE", "VAR_RATELIMIT_FOR_DOMAIN", - "VAR_RATELIMIT_BELOW_DOMAIN", "$accept", "toplevelvars", "toplevelvar", - "serverstart", "contents_server", "content_server", "stubstart", - "contents_stub", "content_stub", "forwardstart", "contents_forward", - "content_forward", "server_num_threads", "server_verbosity", - "server_statistics_interval", "server_statistics_cumulative", - "server_extended_statistics", "server_port", "server_interface", - "server_outgoing_interface", "server_outgoing_range", - "server_outgoing_port_permit", "server_outgoing_port_avoid", - "server_outgoing_num_tcp", "server_incoming_num_tcp", - "server_interface_automatic", "server_do_ip4", "server_do_ip6", - "server_do_udp", "server_do_tcp", "server_tcp_upstream", + "VAR_RATELIMIT_BELOW_DOMAIN", "VAR_RATELIMIT_FACTOR", "$accept", + "toplevelvars", "toplevelvar", "serverstart", "contents_server", + "content_server", "stubstart", "contents_stub", "content_stub", + "forwardstart", "contents_forward", "content_forward", + "server_num_threads", "server_verbosity", "server_statistics_interval", + "server_statistics_cumulative", "server_extended_statistics", + "server_port", "server_interface", "server_outgoing_interface", + "server_outgoing_range", "server_outgoing_port_permit", + "server_outgoing_port_avoid", "server_outgoing_num_tcp", + "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4", + "server_do_ip6", "server_do_udp", "server_do_tcp", "server_tcp_upstream", "server_ssl_upstream", "server_ssl_service_key", "server_ssl_service_pem", "server_ssl_port", "server_do_daemonize", "server_use_syslog", "server_log_time_ascii", "server_log_queries", @@ -1036,15 +1038,15 @@ static const char *const yytname[] = "server_rrset_roundrobin", "server_max_udp_size", "server_dns64_prefix", "server_dns64_synthall", "server_ratelimit", "server_ratelimit_size", "server_ratelimit_slabs", "server_ratelimit_for_domain", - "server_ratelimit_below_domain", "stub_name", "stub_host", "stub_addr", - "stub_first", "stub_prime", "forward_name", "forward_host", - "forward_addr", "forward_first", "rcstart", "contents_rc", "content_rc", - "rc_control_enable", "rc_control_port", "rc_control_interface", - "rc_control_use_cert", "rc_server_key_file", "rc_server_cert_file", - "rc_control_key_file", "rc_control_cert_file", "dtstart", "contents_dt", - "content_dt", "dt_dnstap_enable", "dt_dnstap_socket_path", - "dt_dnstap_send_identity", "dt_dnstap_send_version", - "dt_dnstap_identity", "dt_dnstap_version", + "server_ratelimit_below_domain", "server_ratelimit_factor", "stub_name", + "stub_host", "stub_addr", "stub_first", "stub_prime", "forward_name", + "forward_host", "forward_addr", "forward_first", "rcstart", + "contents_rc", "content_rc", "rc_control_enable", "rc_control_port", + "rc_control_interface", "rc_control_use_cert", "rc_server_key_file", + "rc_server_cert_file", "rc_control_key_file", "rc_control_cert_file", + "dtstart", "contents_dt", "content_dt", "dt_dnstap_enable", + "dt_dnstap_socket_path", "dt_dnstap_send_identity", + "dt_dnstap_send_version", "dt_dnstap_identity", "dt_dnstap_version", "dt_dnstap_log_resolver_query_messages", "dt_dnstap_log_resolver_response_messages", "dt_dnstap_log_client_query_messages", @@ -1075,27 +1077,27 @@ static const yytype_uint16 yytoknum[] = 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, - 405, 406, 407, 408, 409, 410, 411, 412 + 405, 406, 407, 408, 409, 410, 411, 412, 413 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 158, 159, 159, 160, 160, 160, 160, 160, 160, - 161, 162, 162, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 164, 165, 165, 166, 166, - 166, 166, 166, 167, 168, 168, 169, 169, 169, 169, + 0, 159, 160, 160, 161, 161, 161, 161, 161, 161, + 162, 163, 163, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 165, 166, 166, 167, + 167, 167, 167, 167, 168, 169, 169, 170, 170, 170, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, @@ -1108,12 +1110,12 @@ static const yytype_uint16 yyr1[] = 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, 292, 293, 293, 293, 293, 293, 293, - 293, 293, 294, 295, 296, 297, 298, 299, 300, 301, - 302, 303, 303, 304, 304, 304, 304, 304, 304, 304, - 304, 304, 304, 304, 304, 305, 306, 307, 308, 309, - 310, 311, 312, 313, 314, 315, 316, 317, 318, 318, - 319, 320 + 290, 291, 292, 293, 294, 294, 295, 295, 295, 295, + 295, 295, 295, 295, 296, 297, 298, 299, 300, 301, + 302, 303, 304, 305, 305, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 307, 308, 309, + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 320, 320, 321, 322 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1131,8 +1133,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, 1, 1, 1, 1, 1, 2, 0, 1, 1, - 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, + 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 2, 2, 2, 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, @@ -1140,17 +1143,16 @@ 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, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 1, 2, 0, - 1, 2 + 2, 3, 3, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 1, 2, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, + 2, 0, 1, 2 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -1158,8 +1160,8 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 10, 125, 133, 261, 307, 280, 3, - 12, 127, 135, 263, 282, 309, 4, 5, 6, 8, + 2, 0, 1, 10, 126, 134, 263, 309, 282, 3, + 12, 128, 136, 265, 284, 311, 4, 5, 6, 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, 0, 0, 0, @@ -1171,61 +1173,62 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 11, 13, 14, 70, 73, 82, - 15, 21, 61, 16, 74, 75, 32, 54, 69, 17, - 18, 19, 20, 104, 105, 106, 107, 108, 71, 60, - 86, 103, 22, 23, 24, 25, 26, 62, 76, 77, - 92, 48, 58, 49, 87, 42, 43, 44, 45, 96, - 100, 112, 119, 97, 55, 27, 28, 29, 84, 113, - 114, 30, 31, 33, 34, 36, 37, 35, 117, 38, - 39, 40, 46, 65, 101, 79, 118, 72, 80, 81, - 98, 99, 85, 41, 63, 66, 47, 50, 88, 89, - 64, 90, 51, 52, 53, 102, 91, 59, 93, 94, - 95, 56, 57, 78, 67, 68, 83, 109, 110, 111, - 115, 116, 120, 122, 121, 123, 124, 0, 0, 0, - 0, 0, 126, 128, 129, 130, 132, 131, 0, 0, - 0, 0, 134, 136, 137, 138, 139, 0, 0, 0, - 0, 0, 0, 0, 0, 262, 264, 266, 265, 271, - 267, 268, 269, 270, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 281, 283, 284, 285, - 286, 287, 288, 289, 290, 291, 292, 293, 294, 0, - 308, 310, 141, 140, 145, 148, 146, 154, 155, 156, - 157, 167, 168, 169, 170, 171, 190, 191, 192, 196, - 197, 151, 198, 199, 202, 200, 201, 204, 205, 206, - 218, 180, 181, 182, 183, 207, 221, 176, 178, 222, - 227, 228, 229, 152, 189, 236, 237, 177, 232, 164, - 147, 172, 219, 225, 208, 0, 0, 240, 153, 142, - 163, 212, 143, 149, 150, 173, 174, 238, 210, 213, - 214, 144, 241, 193, 217, 165, 179, 223, 224, 226, - 231, 175, 235, 233, 234, 184, 188, 215, 216, 185, - 186, 209, 230, 166, 158, 159, 160, 161, 162, 242, - 243, 244, 194, 195, 203, 245, 246, 211, 187, 247, - 249, 248, 0, 0, 252, 253, 254, 256, 255, 257, - 258, 259, 260, 272, 274, 273, 276, 277, 278, 279, - 275, 295, 296, 297, 298, 299, 300, 301, 302, 303, - 304, 305, 306, 311, 220, 239, 250, 251 + 0, 0, 0, 0, 0, 11, 13, 14, 70, 73, + 82, 15, 21, 61, 16, 74, 75, 32, 54, 69, + 17, 18, 19, 20, 104, 105, 106, 107, 108, 71, + 60, 86, 103, 22, 23, 24, 25, 26, 62, 76, + 77, 92, 48, 58, 49, 87, 42, 43, 44, 45, + 96, 100, 112, 119, 97, 55, 27, 28, 29, 84, + 113, 114, 30, 31, 33, 34, 36, 37, 35, 117, + 38, 39, 40, 46, 65, 101, 79, 118, 72, 80, + 81, 98, 99, 85, 41, 63, 66, 47, 50, 88, + 89, 64, 90, 51, 52, 53, 102, 91, 59, 93, + 94, 95, 56, 57, 78, 67, 68, 83, 109, 110, + 111, 115, 116, 120, 122, 121, 123, 124, 125, 0, + 0, 0, 0, 0, 127, 129, 130, 131, 133, 132, + 0, 0, 0, 0, 135, 137, 138, 139, 140, 0, + 0, 0, 0, 0, 0, 0, 0, 264, 266, 268, + 267, 273, 269, 270, 271, 272, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 283, 285, + 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, + 296, 0, 310, 312, 142, 141, 146, 149, 147, 155, + 156, 157, 158, 168, 169, 170, 171, 172, 191, 192, + 193, 197, 198, 152, 199, 200, 203, 201, 202, 205, + 206, 207, 219, 181, 182, 183, 184, 208, 222, 177, + 179, 223, 228, 229, 230, 153, 190, 237, 238, 178, + 233, 165, 148, 173, 220, 226, 209, 0, 0, 241, + 154, 143, 164, 213, 144, 150, 151, 174, 175, 239, + 211, 214, 215, 145, 242, 194, 218, 166, 180, 224, + 225, 227, 232, 176, 236, 234, 235, 185, 189, 216, + 217, 186, 187, 210, 231, 167, 159, 160, 161, 162, + 163, 243, 244, 245, 195, 196, 204, 246, 247, 212, + 188, 248, 250, 249, 0, 0, 253, 254, 255, 256, + 258, 257, 259, 260, 261, 262, 274, 276, 275, 278, + 279, 280, 281, 277, 297, 298, 299, 300, 301, 302, + 303, 304, 305, 306, 307, 308, 313, 221, 240, 251, + 252 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 9, 10, 16, 134, 11, 17, 252, 12, - 18, 262, 135, 136, 137, 138, 139, 140, 141, 142, - 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, - 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, - 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, - 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, - 213, 214, 215, 216, 217, 218, 219, 220, 221, 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, 253, 254, 255, 256, 257, 263, - 264, 265, 266, 13, 19, 275, 276, 277, 278, 279, - 280, 281, 282, 283, 14, 20, 296, 297, 298, 299, - 300, 301, 302, 303, 304, 305, 306, 307, 308, 15, - 21, 310, 311 + -1, 1, 9, 10, 16, 135, 11, 17, 254, 12, + 18, 264, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, + 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, + 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, + 214, 215, 216, 217, 218, 219, 220, 221, 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, 255, 256, 257, 258, 259, + 265, 266, 267, 268, 13, 19, 277, 278, 279, 280, + 281, 282, 283, 284, 285, 14, 20, 298, 299, 300, + 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, + 15, 21, 312, 313 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -1236,17 +1239,17 @@ static const yytype_int16 yypact[] = -81, 116, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -12, 89, 47, -13, 22, -80, 16, 17, 18, 23, 24, 78, 107, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 136, 137, - 138, 139, 140, 141, 142, 143, 145, 146, 147, 148, - 149, 163, 164, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, - 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 207, 209, 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, 245, 246, 247, - 248, 249, 250, 251, -81, -81, -81, -81, -81, -81, + 121, 122, 123, 124, 125, 126, 127, 128, 137, 138, + 139, 140, 141, 142, 143, 145, 146, 147, 148, 149, + 163, 164, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 190, 191, 192, 193, 195, + 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, + 206, 207, 209, 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, 245, 246, 247, 248, + 249, 250, 251, 252, 253, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, @@ -1257,28 +1260,29 @@ static const yytype_int16 yypact[] = -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - -81, -81, -81, -81, -81, -81, -81, 252, 253, 254, - 255, 256, -81, -81, -81, -81, -81, -81, 257, 258, - 259, 260, -81, -81, -81, -81, -81, 261, 262, 263, - 264, 265, 266, 267, 268, -81, -81, -81, -81, -81, - -81, -81, -81, -81, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, -81, -81, -81, -81, - -81, -81, -81, -81, -81, -81, -81, -81, -81, 281, + -81, -81, -81, -81, -81, -81, -81, -81, -81, 254, + 255, 256, 257, 258, -81, -81, -81, -81, -81, -81, + 259, 260, 261, 262, -81, -81, -81, -81, -81, 263, + 264, 265, 266, 267, 268, 269, 270, -81, -81, -81, + -81, -81, -81, -81, -81, -81, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, + -81, 283, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - -81, -81, -81, -81, -81, 282, 283, -81, -81, -81, + -81, -81, -81, -81, -81, -81, -81, 284, 285, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - -81, -81, 284, 285, -81, -81, -81, -81, -81, -81, + -81, -81, -81, -81, 286, 287, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - -81, -81, -81, -81, -81, -81, -81, -81 + -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, + -81 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1300,7 +1304,7 @@ static const yytype_int8 yypgoto[] = -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - -81, -81, -81 + -81, -81, -81, -81 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1311,34 +1315,34 @@ static const yytype_uint16 yytable[] = { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 309, 312, 313, 314, 47, - 48, 49, 0, 315, 316, 50, 51, 52, 53, 54, + 42, 43, 44, 45, 46, 311, 314, 315, 316, 47, + 48, 49, 0, 317, 318, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 267, 268, 269, 270, - 271, 272, 273, 274, 258, 91, 92, 93, 317, 94, - 95, 96, 259, 260, 97, 98, 99, 100, 101, 102, + 85, 86, 87, 88, 89, 90, 269, 270, 271, 272, + 273, 274, 275, 276, 260, 91, 92, 93, 319, 94, + 95, 96, 261, 262, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 115, 116, 117, 118, 2, 318, 119, 120, - 121, 122, 123, 124, 125, 126, 247, 3, 248, 249, - 319, 320, 321, 322, 323, 324, 325, 326, 327, 127, - 128, 129, 130, 131, 132, 133, 328, 329, 330, 331, - 332, 333, 334, 335, 4, 336, 337, 338, 339, 340, - 5, 284, 285, 286, 287, 288, 289, 290, 291, 292, - 293, 294, 295, 341, 342, 261, 343, 344, 345, 346, - 347, 348, 349, 350, 351, 352, 353, 354, 355, 250, - 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, - 366, 367, 368, 369, 6, 370, 371, 372, 373, 374, - 375, 376, 377, 378, 379, 380, 381, 382, 251, 383, - 7, 384, 385, 386, 387, 388, 389, 390, 391, 392, - 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, - 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, - 413, 414, 415, 416, 8, 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, 451, - 452, 453, 454, 455, 456, 457 + 113, 114, 115, 116, 117, 118, 2, 320, 119, 120, + 121, 122, 123, 124, 125, 126, 249, 3, 250, 251, + 321, 322, 323, 324, 325, 326, 327, 328, 329, 127, + 128, 129, 130, 131, 132, 133, 134, 330, 331, 332, + 333, 334, 335, 336, 4, 337, 338, 339, 340, 341, + 5, 286, 287, 288, 289, 290, 291, 292, 293, 294, + 295, 296, 297, 342, 343, 263, 344, 345, 346, 347, + 348, 349, 350, 351, 352, 353, 354, 355, 356, 252, + 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, + 367, 368, 369, 370, 6, 371, 372, 373, 374, 375, + 376, 377, 378, 379, 380, 381, 382, 383, 253, 384, + 7, 385, 386, 387, 388, 389, 390, 391, 392, 393, + 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, + 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, + 414, 415, 416, 417, 8, 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, 451, 452, + 453, 454, 455, 456, 457, 458, 459, 460 }; #define yypact_value_is_default(Yystate) \ @@ -1363,7 +1367,7 @@ static const yytype_int16 yycheck[] = 122, 123, 124, 125, 126, 127, 0, 10, 130, 131, 132, 133, 134, 135, 136, 137, 37, 11, 39, 40, 10, 10, 10, 10, 10, 10, 10, 10, 10, 151, - 152, 153, 154, 155, 156, 157, 10, 10, 10, 10, + 152, 153, 154, 155, 156, 157, 158, 10, 10, 10, 10, 10, 10, 10, 38, 10, 10, 10, 10, 10, 44, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 10, 10, 128, 10, 10, 10, 10, @@ -1378,16 +1382,16 @@ static const yytype_int16 yycheck[] = 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 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 159, 0, 11, 38, 44, 88, 104, 138, 160, - 161, 164, 167, 291, 302, 317, 162, 165, 168, 292, - 303, 318, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 160, 0, 11, 38, 44, 88, 104, 138, 161, + 162, 165, 168, 293, 304, 319, 163, 166, 169, 294, + 305, 320, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 41, 42, 43, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, @@ -1398,7 +1402,7 @@ static const yytype_uint16 yystos[] = 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 130, 131, 132, 133, 134, 135, 136, 137, 151, 152, 153, - 154, 155, 156, 157, 163, 170, 171, 172, 173, 174, + 154, 155, 156, 157, 158, 164, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, @@ -1409,14 +1413,14 @@ static const yytype_uint16 yystos[] = 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, 37, 39, 40, - 100, 129, 166, 282, 283, 284, 285, 286, 37, 45, - 46, 128, 169, 287, 288, 289, 290, 89, 90, 91, - 92, 93, 94, 95, 96, 293, 294, 295, 296, 297, - 298, 299, 300, 301, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 304, 305, 306, 307, - 308, 309, 310, 311, 312, 313, 314, 315, 316, 105, - 319, 320, 10, 10, 10, 10, 10, 10, 10, 10, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 37, + 39, 40, 100, 129, 167, 284, 285, 286, 287, 288, + 37, 45, 46, 128, 170, 289, 290, 291, 292, 89, + 90, 91, 92, 93, 94, 95, 96, 295, 296, 297, + 298, 299, 300, 301, 302, 303, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 150, 306, 307, + 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, + 318, 105, 321, 322, 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, @@ -1430,7 +1434,8 @@ 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 }; #define yyerrok (yyerrstatus = 0) @@ -2238,7 +2243,7 @@ yyreduce: } break; - case 125: + case 126: /* Line 1792 of yacc.c */ #line 189 "./util/configparser.y" { @@ -2253,7 +2258,7 @@ yyreduce: } break; - case 133: + case 134: /* Line 1792 of yacc.c */ #line 205 "./util/configparser.y" { @@ -2268,7 +2273,7 @@ yyreduce: } break; - case 140: + case 141: /* Line 1792 of yacc.c */ #line 221 "./util/configparser.y" { @@ -2280,7 +2285,7 @@ yyreduce: } break; - case 141: + case 142: /* Line 1792 of yacc.c */ #line 230 "./util/configparser.y" { @@ -2292,7 +2297,7 @@ yyreduce: } break; - case 142: + case 143: /* Line 1792 of yacc.c */ #line 239 "./util/configparser.y" { @@ -2306,7 +2311,7 @@ yyreduce: } break; - case 143: + case 144: /* Line 1792 of yacc.c */ #line 250 "./util/configparser.y" { @@ -2318,7 +2323,7 @@ yyreduce: } break; - case 144: + case 145: /* Line 1792 of yacc.c */ #line 259 "./util/configparser.y" { @@ -2330,7 +2335,7 @@ yyreduce: } break; - case 145: + case 146: /* Line 1792 of yacc.c */ #line 268 "./util/configparser.y" { @@ -2342,7 +2347,7 @@ yyreduce: } break; - case 146: + case 147: /* Line 1792 of yacc.c */ #line 277 "./util/configparser.y" { @@ -2358,7 +2363,7 @@ yyreduce: } break; - case 147: + case 148: /* Line 1792 of yacc.c */ #line 290 "./util/configparser.y" { @@ -2376,7 +2381,7 @@ yyreduce: } break; - case 148: + case 149: /* Line 1792 of yacc.c */ #line 305 "./util/configparser.y" { @@ -2388,7 +2393,7 @@ yyreduce: } break; - case 149: + case 150: /* Line 1792 of yacc.c */ #line 314 "./util/configparser.y" { @@ -2400,7 +2405,7 @@ yyreduce: } break; - case 150: + case 151: /* Line 1792 of yacc.c */ #line 323 "./util/configparser.y" { @@ -2412,7 +2417,7 @@ yyreduce: } break; - case 151: + case 152: /* Line 1792 of yacc.c */ #line 332 "./util/configparser.y" { @@ -2424,7 +2429,7 @@ yyreduce: } break; - case 152: + case 153: /* Line 1792 of yacc.c */ #line 341 "./util/configparser.y" { @@ -2436,7 +2441,7 @@ yyreduce: } break; - case 153: + case 154: /* Line 1792 of yacc.c */ #line 350 "./util/configparser.y" { @@ -2448,7 +2453,7 @@ yyreduce: } break; - case 154: + case 155: /* Line 1792 of yacc.c */ #line 359 "./util/configparser.y" { @@ -2460,7 +2465,7 @@ yyreduce: } break; - case 155: + case 156: /* Line 1792 of yacc.c */ #line 368 "./util/configparser.y" { @@ -2472,7 +2477,7 @@ yyreduce: } break; - case 156: + case 157: /* Line 1792 of yacc.c */ #line 377 "./util/configparser.y" { @@ -2484,7 +2489,7 @@ yyreduce: } break; - case 157: + case 158: /* Line 1792 of yacc.c */ #line 386 "./util/configparser.y" { @@ -2496,7 +2501,7 @@ yyreduce: } break; - case 158: + case 159: /* Line 1792 of yacc.c */ #line 395 "./util/configparser.y" { @@ -2508,7 +2513,7 @@ yyreduce: } break; - case 159: + case 160: /* Line 1792 of yacc.c */ #line 404 "./util/configparser.y" { @@ -2520,7 +2525,7 @@ yyreduce: } break; - case 160: + case 161: /* Line 1792 of yacc.c */ #line 413 "./util/configparser.y" { @@ -2530,7 +2535,7 @@ yyreduce: } break; - case 161: + case 162: /* Line 1792 of yacc.c */ #line 420 "./util/configparser.y" { @@ -2540,7 +2545,7 @@ yyreduce: } break; - case 162: + case 163: /* Line 1792 of yacc.c */ #line 427 "./util/configparser.y" { @@ -2552,7 +2557,7 @@ yyreduce: } break; - case 163: + case 164: /* Line 1792 of yacc.c */ #line 436 "./util/configparser.y" { @@ -2564,7 +2569,7 @@ yyreduce: } break; - case 164: + case 165: /* Line 1792 of yacc.c */ #line 445 "./util/configparser.y" { @@ -2581,7 +2586,7 @@ yyreduce: } break; - case 165: + case 166: /* Line 1792 of yacc.c */ #line 459 "./util/configparser.y" { @@ -2593,7 +2598,7 @@ yyreduce: } break; - case 166: + case 167: /* Line 1792 of yacc.c */ #line 468 "./util/configparser.y" { @@ -2605,7 +2610,7 @@ yyreduce: } break; - case 167: + case 168: /* Line 1792 of yacc.c */ #line 477 "./util/configparser.y" { @@ -2615,7 +2620,7 @@ yyreduce: } break; - case 168: + case 169: /* Line 1792 of yacc.c */ #line 484 "./util/configparser.y" { @@ -2625,7 +2630,7 @@ yyreduce: } break; - case 169: + case 170: /* Line 1792 of yacc.c */ #line 491 "./util/configparser.y" { @@ -2635,7 +2640,7 @@ yyreduce: } break; - case 170: + case 171: /* Line 1792 of yacc.c */ #line 498 "./util/configparser.y" { @@ -2646,7 +2651,7 @@ yyreduce: } break; - case 171: + case 172: /* Line 1792 of yacc.c */ #line 506 "./util/configparser.y" { @@ -2656,7 +2661,7 @@ yyreduce: } break; - case 172: + case 173: /* Line 1792 of yacc.c */ #line 513 "./util/configparser.y" { @@ -2666,7 +2671,7 @@ yyreduce: } break; - case 173: + case 174: /* Line 1792 of yacc.c */ #line 520 "./util/configparser.y" { @@ -2676,7 +2681,7 @@ yyreduce: } break; - case 174: + case 175: /* Line 1792 of yacc.c */ #line 527 "./util/configparser.y" { @@ -2686,7 +2691,7 @@ yyreduce: } break; - case 175: + case 176: /* Line 1792 of yacc.c */ #line 534 "./util/configparser.y" { @@ -2697,7 +2702,7 @@ yyreduce: } break; - case 176: + case 177: /* Line 1792 of yacc.c */ #line 542 "./util/configparser.y" { @@ -2708,7 +2713,7 @@ yyreduce: } break; - case 177: + case 178: /* Line 1792 of yacc.c */ #line 550 "./util/configparser.y" { @@ -2719,7 +2724,7 @@ yyreduce: } break; - case 178: + case 179: /* Line 1792 of yacc.c */ #line 558 "./util/configparser.y" { @@ -2729,7 +2734,7 @@ yyreduce: } break; - case 179: + case 180: /* Line 1792 of yacc.c */ #line 565 "./util/configparser.y" { @@ -2739,7 +2744,7 @@ yyreduce: } break; - case 180: + case 181: /* Line 1792 of yacc.c */ #line 572 "./util/configparser.y" { @@ -2751,7 +2756,7 @@ yyreduce: } break; - case 181: + case 182: /* Line 1792 of yacc.c */ #line 581 "./util/configparser.y" { @@ -2763,7 +2768,7 @@ yyreduce: } break; - case 182: + case 183: /* Line 1792 of yacc.c */ #line 590 "./util/configparser.y" { @@ -2773,7 +2778,7 @@ yyreduce: } break; - case 183: + case 184: /* Line 1792 of yacc.c */ #line 597 "./util/configparser.y" { @@ -2783,7 +2788,7 @@ yyreduce: } break; - case 184: + case 185: /* Line 1792 of yacc.c */ #line 604 "./util/configparser.y" { @@ -2794,7 +2799,7 @@ yyreduce: } break; - case 185: + case 186: /* Line 1792 of yacc.c */ #line 612 "./util/configparser.y" { @@ -2805,7 +2810,7 @@ yyreduce: } break; - case 186: + case 187: /* Line 1792 of yacc.c */ #line 620 "./util/configparser.y" { @@ -2818,7 +2823,7 @@ yyreduce: } break; - case 187: + case 188: /* Line 1792 of yacc.c */ #line 630 "./util/configparser.y" { @@ -2831,7 +2836,7 @@ yyreduce: } break; - case 188: + case 189: /* Line 1792 of yacc.c */ #line 640 "./util/configparser.y" { @@ -2847,7 +2852,7 @@ yyreduce: } break; - case 189: + case 190: /* Line 1792 of yacc.c */ #line 653 "./util/configparser.y" { @@ -2861,7 +2866,7 @@ yyreduce: } break; - case 190: + case 191: /* Line 1792 of yacc.c */ #line 664 "./util/configparser.y" { @@ -2872,7 +2877,7 @@ yyreduce: } break; - case 191: + case 192: /* Line 1792 of yacc.c */ #line 672 "./util/configparser.y" { @@ -2888,7 +2893,7 @@ yyreduce: } break; - case 192: + case 193: /* Line 1792 of yacc.c */ #line 685 "./util/configparser.y" { @@ -2900,7 +2905,7 @@ yyreduce: } break; - case 193: + case 194: /* Line 1792 of yacc.c */ #line 694 "./util/configparser.y" { @@ -2912,7 +2917,7 @@ yyreduce: } break; - case 194: + case 195: /* Line 1792 of yacc.c */ #line 703 "./util/configparser.y" { @@ -2924,7 +2929,7 @@ yyreduce: } break; - case 195: + case 196: /* Line 1792 of yacc.c */ #line 712 "./util/configparser.y" { @@ -2937,7 +2942,7 @@ yyreduce: } break; - case 196: + case 197: /* Line 1792 of yacc.c */ #line 722 "./util/configparser.y" { @@ -2948,7 +2953,7 @@ yyreduce: } break; - case 197: + case 198: /* Line 1792 of yacc.c */ #line 730 "./util/configparser.y" { @@ -2964,7 +2969,7 @@ yyreduce: } break; - case 198: + case 199: /* Line 1792 of yacc.c */ #line 743 "./util/configparser.y" { @@ -2976,7 +2981,7 @@ yyreduce: } break; - case 199: + case 200: /* Line 1792 of yacc.c */ #line 752 "./util/configparser.y" { @@ -2987,7 +2992,7 @@ yyreduce: } break; - case 200: + case 201: /* Line 1792 of yacc.c */ #line 760 "./util/configparser.y" { @@ -2999,7 +3004,7 @@ yyreduce: } break; - case 201: + case 202: /* Line 1792 of yacc.c */ #line 769 "./util/configparser.y" { @@ -3010,7 +3015,7 @@ yyreduce: } break; - case 202: + case 203: /* Line 1792 of yacc.c */ #line 777 "./util/configparser.y" { @@ -3026,7 +3031,7 @@ yyreduce: } break; - case 203: + case 204: /* Line 1792 of yacc.c */ #line 790 "./util/configparser.y" { @@ -3038,7 +3043,7 @@ yyreduce: } break; - case 204: + case 205: /* Line 1792 of yacc.c */ #line 799 "./util/configparser.y" { @@ -3048,7 +3053,7 @@ yyreduce: } break; - case 205: + case 206: /* Line 1792 of yacc.c */ #line 806 "./util/configparser.y" { @@ -3061,7 +3066,7 @@ yyreduce: } break; - case 206: + case 207: /* Line 1792 of yacc.c */ #line 816 "./util/configparser.y" { @@ -3074,7 +3079,7 @@ yyreduce: } break; - case 207: + case 208: /* Line 1792 of yacc.c */ #line 826 "./util/configparser.y" { @@ -3087,7 +3092,7 @@ yyreduce: } break; - case 208: + case 209: /* Line 1792 of yacc.c */ #line 836 "./util/configparser.y" { @@ -3100,7 +3105,7 @@ yyreduce: } break; - case 209: + case 210: /* Line 1792 of yacc.c */ #line 846 "./util/configparser.y" { @@ -3113,7 +3118,7 @@ yyreduce: } break; - case 210: + case 211: /* Line 1792 of yacc.c */ #line 856 "./util/configparser.y" { @@ -3126,7 +3131,7 @@ yyreduce: } break; - case 211: + case 212: /* Line 1792 of yacc.c */ #line 866 "./util/configparser.y" { @@ -3139,7 +3144,7 @@ yyreduce: } break; - case 212: + case 213: /* Line 1792 of yacc.c */ #line 876 "./util/configparser.y" { @@ -3152,7 +3157,7 @@ yyreduce: } break; - case 213: + case 214: /* Line 1792 of yacc.c */ #line 886 "./util/configparser.y" { @@ -3162,7 +3167,7 @@ yyreduce: } break; - case 214: + case 215: /* Line 1792 of yacc.c */ #line 893 "./util/configparser.y" { @@ -3172,7 +3177,7 @@ yyreduce: } break; - case 215: + case 216: /* Line 1792 of yacc.c */ #line 900 "./util/configparser.y" { @@ -3184,7 +3189,7 @@ yyreduce: } break; - case 216: + case 217: /* Line 1792 of yacc.c */ #line 909 "./util/configparser.y" { @@ -3196,7 +3201,7 @@ yyreduce: } break; - case 217: + case 218: /* Line 1792 of yacc.c */ #line 918 "./util/configparser.y" { @@ -3208,7 +3213,7 @@ yyreduce: } break; - case 218: + case 219: /* Line 1792 of yacc.c */ #line 927 "./util/configparser.y" { @@ -3218,7 +3223,7 @@ yyreduce: } break; - case 219: + case 220: /* Line 1792 of yacc.c */ #line 934 "./util/configparser.y" { @@ -3231,7 +3236,7 @@ yyreduce: } break; - case 220: + case 221: /* Line 1792 of yacc.c */ #line 944 "./util/configparser.y" { @@ -3251,7 +3256,7 @@ yyreduce: } break; - case 221: + case 222: /* Line 1792 of yacc.c */ #line 961 "./util/configparser.y" { @@ -3261,7 +3266,7 @@ yyreduce: } break; - case 222: + case 223: /* Line 1792 of yacc.c */ #line 968 "./util/configparser.y" { @@ -3282,7 +3287,7 @@ yyreduce: } break; - case 223: + case 224: /* Line 1792 of yacc.c */ #line 986 "./util/configparser.y" { @@ -3298,7 +3303,7 @@ yyreduce: } break; - case 224: + case 225: /* Line 1792 of yacc.c */ #line 999 "./util/configparser.y" { @@ -3314,7 +3319,7 @@ yyreduce: } break; - case 225: + case 226: /* Line 1792 of yacc.c */ #line 1012 "./util/configparser.y" { @@ -3326,7 +3331,7 @@ yyreduce: } break; - case 226: + case 227: /* Line 1792 of yacc.c */ #line 1021 "./util/configparser.y" { @@ -3338,7 +3343,7 @@ yyreduce: } break; - case 227: + case 228: /* Line 1792 of yacc.c */ #line 1030 "./util/configparser.y" { @@ -3350,7 +3355,7 @@ yyreduce: } break; - case 228: + case 229: /* Line 1792 of yacc.c */ #line 1039 "./util/configparser.y" { @@ -3363,7 +3368,7 @@ yyreduce: } break; - case 229: + case 230: /* Line 1792 of yacc.c */ #line 1049 "./util/configparser.y" { @@ -3376,7 +3381,7 @@ yyreduce: } break; - case 230: + case 231: /* Line 1792 of yacc.c */ #line 1059 "./util/configparser.y" { @@ -3388,7 +3393,7 @@ yyreduce: } break; - case 231: + case 232: /* Line 1792 of yacc.c */ #line 1068 "./util/configparser.y" { @@ -3400,7 +3405,7 @@ yyreduce: } break; - case 232: + case 233: /* Line 1792 of yacc.c */ #line 1077 "./util/configparser.y" { @@ -3410,7 +3415,7 @@ yyreduce: } break; - case 233: + case 234: /* Line 1792 of yacc.c */ #line 1084 "./util/configparser.y" { @@ -3422,7 +3427,7 @@ yyreduce: } break; - case 234: + case 235: /* Line 1792 of yacc.c */ #line 1093 "./util/configparser.y" { @@ -3434,7 +3439,7 @@ yyreduce: } break; - case 235: + case 236: /* Line 1792 of yacc.c */ #line 1102 "./util/configparser.y" { @@ -3446,7 +3451,7 @@ yyreduce: } break; - case 236: + case 237: /* Line 1792 of yacc.c */ #line 1111 "./util/configparser.y" { @@ -3457,7 +3462,7 @@ yyreduce: } break; - case 237: + case 238: /* Line 1792 of yacc.c */ #line 1119 "./util/configparser.y" { @@ -3473,7 +3478,7 @@ yyreduce: } break; - case 238: + case 239: /* Line 1792 of yacc.c */ #line 1132 "./util/configparser.y" { @@ -3484,7 +3489,7 @@ yyreduce: } break; - case 239: + case 240: /* Line 1792 of yacc.c */ #line 1140 "./util/configparser.y" { @@ -3511,7 +3516,7 @@ yyreduce: } break; - case 240: + case 241: /* Line 1792 of yacc.c */ #line 1164 "./util/configparser.y" { @@ -3521,7 +3526,7 @@ yyreduce: } break; - case 241: + case 242: /* Line 1792 of yacc.c */ #line 1171 "./util/configparser.y" { @@ -3539,7 +3544,7 @@ yyreduce: } break; - case 242: + case 243: /* Line 1792 of yacc.c */ #line 1186 "./util/configparser.y" { @@ -3552,7 +3557,7 @@ yyreduce: } break; - case 243: + case 244: /* Line 1792 of yacc.c */ #line 1196 "./util/configparser.y" { @@ -3565,7 +3570,7 @@ yyreduce: } break; - case 244: + case 245: /* Line 1792 of yacc.c */ #line 1206 "./util/configparser.y" { @@ -3575,7 +3580,7 @@ yyreduce: } break; - case 245: + case 246: /* Line 1792 of yacc.c */ #line 1213 "./util/configparser.y" { @@ -3585,7 +3590,7 @@ yyreduce: } break; - case 246: + case 247: /* Line 1792 of yacc.c */ #line 1220 "./util/configparser.y" { @@ -3597,7 +3602,7 @@ yyreduce: } break; - case 247: + case 248: /* Line 1792 of yacc.c */ #line 1229 "./util/configparser.y" { @@ -3609,7 +3614,7 @@ yyreduce: } break; - case 248: + case 249: /* Line 1792 of yacc.c */ #line 1238 "./util/configparser.y" { @@ -3620,7 +3625,7 @@ yyreduce: } break; - case 249: + case 250: /* Line 1792 of yacc.c */ #line 1246 "./util/configparser.y" { @@ -3636,7 +3641,7 @@ yyreduce: } break; - case 250: + case 251: /* Line 1792 of yacc.c */ #line 1259 "./util/configparser.y" { @@ -3652,7 +3657,7 @@ yyreduce: } break; - case 251: + case 252: /* Line 1792 of yacc.c */ #line 1272 "./util/configparser.y" { @@ -3668,9 +3673,21 @@ yyreduce: } break; - case 252: + case 253: /* Line 1792 of yacc.c */ #line 1285 "./util/configparser.y" + { + OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[(2) - (2)].str))); + if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[(2) - (2)].str)); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 254: +/* Line 1792 of yacc.c */ +#line 1294 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->stubs->name) @@ -3681,9 +3698,9 @@ yyreduce: } break; - case 253: + case 255: /* Line 1792 of yacc.c */ -#line 1295 "./util/configparser.y" +#line 1304 "./util/configparser.y" { OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[(2) - (2)].str))) @@ -3691,9 +3708,9 @@ yyreduce: } break; - case 254: + case 256: /* Line 1792 of yacc.c */ -#line 1302 "./util/configparser.y" +#line 1311 "./util/configparser.y" { OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[(2) - (2)].str))) @@ -3701,9 +3718,9 @@ yyreduce: } break; - case 255: + case 257: /* Line 1792 of yacc.c */ -#line 1309 "./util/configparser.y" +#line 1318 "./util/configparser.y" { OUTYY(("P(stub-first:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3713,9 +3730,9 @@ yyreduce: } break; - case 256: + case 258: /* Line 1792 of yacc.c */ -#line 1318 "./util/configparser.y" +#line 1327 "./util/configparser.y" { OUTYY(("P(stub-prime:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3726,9 +3743,9 @@ yyreduce: } break; - case 257: + case 259: /* Line 1792 of yacc.c */ -#line 1328 "./util/configparser.y" +#line 1337 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->forwards->name) @@ -3739,9 +3756,9 @@ yyreduce: } break; - case 258: + case 260: /* Line 1792 of yacc.c */ -#line 1338 "./util/configparser.y" +#line 1347 "./util/configparser.y" { OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[(2) - (2)].str))) @@ -3749,9 +3766,9 @@ yyreduce: } break; - case 259: + case 261: /* Line 1792 of yacc.c */ -#line 1345 "./util/configparser.y" +#line 1354 "./util/configparser.y" { OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[(2) - (2)].str))) @@ -3759,9 +3776,9 @@ yyreduce: } break; - case 260: + case 262: /* Line 1792 of yacc.c */ -#line 1352 "./util/configparser.y" +#line 1361 "./util/configparser.y" { OUTYY(("P(forward-first:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3771,17 +3788,17 @@ yyreduce: } break; - case 261: + case 263: /* Line 1792 of yacc.c */ -#line 1361 "./util/configparser.y" +#line 1370 "./util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } break; - case 272: + case 274: /* Line 1792 of yacc.c */ -#line 1372 "./util/configparser.y" +#line 1381 "./util/configparser.y" { OUTYY(("P(control_enable:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3792,9 +3809,9 @@ yyreduce: } break; - case 273: + case 275: /* Line 1792 of yacc.c */ -#line 1382 "./util/configparser.y" +#line 1391 "./util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3804,9 +3821,9 @@ yyreduce: } break; - case 274: + case 276: /* Line 1792 of yacc.c */ -#line 1391 "./util/configparser.y" +#line 1400 "./util/configparser.y" { OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[(2) - (2)].str))) @@ -3814,9 +3831,9 @@ yyreduce: } break; - case 275: + case 277: /* Line 1792 of yacc.c */ -#line 1398 "./util/configparser.y" +#line 1407 "./util/configparser.y" { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3827,9 +3844,9 @@ yyreduce: } break; - case 276: + case 278: /* Line 1792 of yacc.c */ -#line 1408 "./util/configparser.y" +#line 1417 "./util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_key_file); @@ -3837,9 +3854,9 @@ yyreduce: } break; - case 277: + case 279: /* Line 1792 of yacc.c */ -#line 1415 "./util/configparser.y" +#line 1424 "./util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_cert_file); @@ -3847,9 +3864,9 @@ yyreduce: } break; - case 278: + case 280: /* Line 1792 of yacc.c */ -#line 1422 "./util/configparser.y" +#line 1431 "./util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_key_file); @@ -3857,9 +3874,9 @@ yyreduce: } break; - case 279: + case 281: /* Line 1792 of yacc.c */ -#line 1429 "./util/configparser.y" +#line 1438 "./util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_cert_file); @@ -3867,17 +3884,17 @@ yyreduce: } break; - case 280: + case 282: /* Line 1792 of yacc.c */ -#line 1436 "./util/configparser.y" +#line 1445 "./util/configparser.y" { OUTYY(("\nP(dnstap:)\n")); } break; - case 295: + case 297: /* Line 1792 of yacc.c */ -#line 1453 "./util/configparser.y" +#line 1462 "./util/configparser.y" { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3886,9 +3903,9 @@ yyreduce: } break; - case 296: + case 298: /* Line 1792 of yacc.c */ -#line 1461 "./util/configparser.y" +#line 1470 "./util/configparser.y" { OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dnstap_socket_path); @@ -3896,9 +3913,9 @@ yyreduce: } break; - case 297: + case 299: /* Line 1792 of yacc.c */ -#line 1468 "./util/configparser.y" +#line 1477 "./util/configparser.y" { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3907,9 +3924,9 @@ yyreduce: } break; - case 298: + case 300: /* Line 1792 of yacc.c */ -#line 1476 "./util/configparser.y" +#line 1485 "./util/configparser.y" { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3918,9 +3935,9 @@ yyreduce: } break; - case 299: + case 301: /* Line 1792 of yacc.c */ -#line 1484 "./util/configparser.y" +#line 1493 "./util/configparser.y" { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dnstap_identity); @@ -3928,9 +3945,9 @@ yyreduce: } break; - case 300: + case 302: /* Line 1792 of yacc.c */ -#line 1491 "./util/configparser.y" +#line 1500 "./util/configparser.y" { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dnstap_version); @@ -3938,9 +3955,9 @@ yyreduce: } break; - case 301: + case 303: /* Line 1792 of yacc.c */ -#line 1498 "./util/configparser.y" +#line 1507 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3950,9 +3967,9 @@ yyreduce: } break; - case 302: + case 304: /* Line 1792 of yacc.c */ -#line 1507 "./util/configparser.y" +#line 1516 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3962,9 +3979,9 @@ yyreduce: } break; - case 303: + case 305: /* Line 1792 of yacc.c */ -#line 1516 "./util/configparser.y" +#line 1525 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3974,9 +3991,9 @@ yyreduce: } break; - case 304: + case 306: /* Line 1792 of yacc.c */ -#line 1525 "./util/configparser.y" +#line 1534 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3986,9 +4003,9 @@ yyreduce: } break; - case 305: + case 307: /* Line 1792 of yacc.c */ -#line 1534 "./util/configparser.y" +#line 1543 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3998,9 +4015,9 @@ yyreduce: } break; - case 306: + case 308: /* Line 1792 of yacc.c */ -#line 1543 "./util/configparser.y" +#line 1552 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -4010,17 +4027,17 @@ yyreduce: } break; - case 307: + case 309: /* Line 1792 of yacc.c */ -#line 1552 "./util/configparser.y" +#line 1561 "./util/configparser.y" { OUTYY(("\nP(python:)\n")); } break; - case 311: + case 313: /* Line 1792 of yacc.c */ -#line 1561 "./util/configparser.y" +#line 1570 "./util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->python_script); @@ -4030,7 +4047,7 @@ yyreduce: /* Line 1792 of yacc.c */ -#line 4034 "util/configparser.c" +#line 4051 "util/configparser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4262,7 +4279,7 @@ yyreturn: /* Line 2055 of yacc.c */ -#line 1566 "./util/configparser.y" +#line 1575 "./util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 70145a316..c981269ab 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -200,7 +200,8 @@ extern int yydebug; VAR_RATELIMIT_SLABS = 409, VAR_RATELIMIT_SIZE = 410, VAR_RATELIMIT_FOR_DOMAIN = 411, - VAR_RATELIMIT_BELOW_DOMAIN = 412 + VAR_RATELIMIT_BELOW_DOMAIN = 412, + VAR_RATELIMIT_FACTOR = 413 }; #endif /* Tokens. */ @@ -359,6 +360,7 @@ extern int yydebug; #define VAR_RATELIMIT_SIZE 410 #define VAR_RATELIMIT_FOR_DOMAIN 411 #define VAR_RATELIMIT_BELOW_DOMAIN 412 +#define VAR_RATELIMIT_FACTOR 413 @@ -372,7 +374,7 @@ typedef union YYSTYPE /* Line 2058 of yacc.c */ -#line 376 "util/configparser.h" +#line 378 "util/configparser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/util/configparser.y b/util/configparser.y index 3c0ea328c..45e438afb 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -120,7 +120,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES %token VAR_HARDEN_ALGO_DOWNGRADE VAR_IP_TRANSPARENT %token VAR_RATELIMIT VAR_RATELIMIT_SLABS VAR_RATELIMIT_SIZE -%token VAR_RATELIMIT_FOR_DOMAIN VAR_RATELIMIT_BELOW_DOMAIN +%token VAR_RATELIMIT_FOR_DOMAIN VAR_RATELIMIT_BELOW_DOMAIN VAR_RATELIMIT_FACTOR %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -183,7 +183,7 @@ content_server: server_num_threads | server_verbosity | server_port | server_infra_cache_min_rtt | server_harden_algo_downgrade | server_ip_transparent | server_ratelimit | server_ratelimit_slabs | server_ratelimit_size | server_ratelimit_for_domain | - server_ratelimit_below_domain + server_ratelimit_below_domain | server_ratelimit_factor ; stubstart: VAR_STUB_ZONE { @@ -1281,6 +1281,15 @@ server_ratelimit_below_domain: VAR_RATELIMIT_BELOW_DOMAIN STRING_ARG STRING_ARG } } ; +server_ratelimit_factor: VAR_RATELIMIT_FACTOR STRING_ARG + { + OUTYY(("P(server_ratelimit_factor:%s)\n", $2)); + if(atoi($2) == 0 && strcmp($2, "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->ratelimit_factor = atoi($2); + free($2); + } + ; stub_name: VAR_NAME STRING_ARG { OUTYY(("P(name:%s)\n", $2));