diff options
| author | des <des@FreeBSD.org> | 2014-07-18 11:32:44 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-07-18 11:32:44 +0000 |
| commit | d96c67cabdd8553d6547ab549c8a31d73216ca58 (patch) | |
| tree | be4bfe814455ceb6ca5c8d81a2b77a7723bacde0 /contrib/unbound | |
| parent | 4691d48742e02c973343f0e0b07fa08d0ae9a5a8 (diff) | |
| download | FreeBSD-src-d96c67cabdd8553d6547ab549c8a31d73216ca58.zip FreeBSD-src-d96c67cabdd8553d6547ab549c8a31d73216ca58.tar.gz | |
Import unblock-lan-zones feature backported from upstream svn trunk.
This is a partial fix for reverse lookups in RFC 1918 networks. With
this option enabled, unbound no longer ignores these queries; however,
it will still reject the answer it gets from the forwarder, because
the RFC 1918 reverse zones are signed.
Submitted by: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Diffstat (limited to 'contrib/unbound')
| -rw-r--r-- | contrib/unbound/doc/example.conf.in | 9 | ||||
| -rw-r--r-- | contrib/unbound/doc/unbound.conf.5 | 11 | ||||
| -rw-r--r-- | contrib/unbound/doc/unbound.conf.5.in | 11 | ||||
| -rw-r--r-- | contrib/unbound/services/localzone.c | 10 | ||||
| -rw-r--r-- | contrib/unbound/util/config_file.c | 3 | ||||
| -rw-r--r-- | contrib/unbound/util/config_file.h | 2 | ||||
| -rw-r--r-- | contrib/unbound/util/configlexer.c | 2144 | ||||
| -rw-r--r-- | contrib/unbound/util/configlexer.lex | 1 | ||||
| -rw-r--r-- | contrib/unbound/util/configparser.c | 716 | ||||
| -rw-r--r-- | contrib/unbound/util/configparser.h | 1 | ||||
| -rw-r--r-- | contrib/unbound/util/configparser.y | 14 |
11 files changed, 1508 insertions, 1414 deletions
diff --git a/contrib/unbound/doc/example.conf.in b/contrib/unbound/doc/example.conf.in index c13fbae..9e91d1f 100644 --- a/contrib/unbound/doc/example.conf.in +++ b/contrib/unbound/doc/example.conf.in @@ -437,7 +437,14 @@ server: # the amount of memory to use for the negative cache (used for DLV). # plain value in bytes or you can append k, m or G. default is "1Mb". # neg-cache-size: 1m - + + # if unbound is running service for the local host then it is useful + # to perform lan-wide lookups to the upstream, and unblock the + # long list of local-zones above. If this unbound is a dns server + # for a network of computers, disabled is better and stops information + # leakage of local lan information. + # unblock-lan-zones: no + # By default, for a number of zones a small default 'nothing here' # reply is built-in. Query traffic is thus blocked. If you # wish to serve such zone you can unblock them by uncommenting one diff --git a/contrib/unbound/doc/unbound.conf.5 b/contrib/unbound/doc/unbound.conf.5 index 6a8d6a6..a106733 100644 --- a/contrib/unbound/doc/unbound.conf.5 +++ b/contrib/unbound/doc/unbound.conf.5 @@ -778,6 +778,17 @@ Number of bytes size of the aggressive negative cache. Default is 1 megabyte. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes or gigabytes (1024*1024 bytes in a megabyte). .TP +.B unblock\-lan\-zones: \fI<yesno> +Default is disabled. If enabled, then for private address space, +the reverse lookups are no longer filtered. This allows unbound when +running as dns service on a host where it provides service for that host, +to put out all of the queries for the 'lan' upstream. When enabled, +only localhost, 127.0.0.1 reverse and ::1 reverse zones are configured +with default local zones. Disable the option when unbound is running +as a (DHCP-) DNS network resolver for a group of machines, where such +lookups should be filtered (RFC compliance), this also stops potential +data leakage about the local network to the upstream DNS servers. +.TP .B local\-zone: \fI<zone> <type> Configure a local zone. The type determines the answer to give if there is no match from local\-data. The types are deny, refuse, static, diff --git a/contrib/unbound/doc/unbound.conf.5.in b/contrib/unbound/doc/unbound.conf.5.in index 75967e1..aadd0da 100644 --- a/contrib/unbound/doc/unbound.conf.5.in +++ b/contrib/unbound/doc/unbound.conf.5.in @@ -778,6 +778,17 @@ Number of bytes size of the aggressive negative cache. Default is 1 megabyte. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes or gigabytes (1024*1024 bytes in a megabyte). .TP +.B unblock\-lan\-zones: \fI<yesno> +Default is disabled. If enabled, then for private address space, +the reverse lookups are no longer filtered. This allows unbound when +running as dns service on a host where it provides service for that host, +to put out all of the queries for the 'lan' upstream. When enabled, +only localhost, 127.0.0.1 reverse and ::1 reverse zones are configured +with default local zones. Disable the option when unbound is running +as a (DHCP-) DNS network resolver for a group of machines, where such +lookups should be filtered (RFC compliance), this also stops potential +data leakage about the local network to the upstream DNS servers. +.TP .B local\-zone: \fI<zone> <type> Configure a local zone. The type determines the answer to give if there is no match from local\-data. The types are deny, refuse, static, diff --git a/contrib/unbound/services/localzone.c b/contrib/unbound/services/localzone.c index ac889799..a1688e1 100644 --- a/contrib/unbound/services/localzone.c +++ b/contrib/unbound/services/localzone.c @@ -594,6 +594,8 @@ lz_enter_defaults(struct local_zones* zones, struct config_file* cfg) /* this list of zones is from RFC 6303 */ + /* block localhost level zones, first, later the LAN zones */ + /* localhost. zone */ if(!lz_exists(zones, "localhost.") && !lz_nodefault(cfg, "localhost.")) { @@ -650,6 +652,14 @@ lz_enter_defaults(struct local_zones* zones, struct config_file* cfg) } lock_rw_unlock(&z->lock); } + + /* if unblock lan-zones, then do not add the zones below. + * we do add the zones above, about 127.0.0.1, because localhost is + * not on the lan. */ + if(cfg->unblock_lan_zones) + return 1; + + /* block LAN level zones */ if ( !add_as112_default(zones, cfg, "10.in-addr.arpa.") || !add_as112_default(zones, cfg, "16.172.in-addr.arpa.") || !add_as112_default(zones, cfg, "17.172.in-addr.arpa.") || diff --git a/contrib/unbound/util/config_file.c b/contrib/unbound/util/config_file.c index 3466109..1e6a42c 100644 --- a/contrib/unbound/util/config_file.c +++ b/contrib/unbound/util/config_file.c @@ -191,6 +191,7 @@ config_create(void) cfg->local_zones = NULL; cfg->local_zones_nodefault = NULL; cfg->local_data = NULL; + cfg->unblock_lan_zones = 0; cfg->python_script = NULL; cfg->remote_control_enable = 0; cfg->control_ifs = NULL; @@ -414,6 +415,7 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_YNO("minimal-responses:", minimal_responses) else S_YNO("rrset-roundrobin:", rrset_roundrobin) else S_STRLIST("local-data:", local_data) + else S_YNO("unblock-lan-zones:", unblock_lan_zones) else S_YNO("control-enable:", remote_control_enable) else S_STRLIST("control-interface:", control_ifs) else S_NUMBER_NONZERO("control-port:", control_port) @@ -678,6 +680,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_UNS(opt, "val-override-date", val_date_override) else O_YNO(opt, "minimal-responses", minimal_responses) else O_YNO(opt, "rrset-roundrobin", rrset_roundrobin) + else O_YNO(opt, "unblock-lan-zones", unblock_lan_zones) else O_DEC(opt, "max-udp-size", max_udp_size) else O_STR(opt, "python-script", python_script) else O_DEC(opt, "val-sig-skew-min", val_sig_skew_min) diff --git a/contrib/unbound/util/config_file.h b/contrib/unbound/util/config_file.h index 8515eef..f041df1 100644 --- a/contrib/unbound/util/config_file.h +++ b/contrib/unbound/util/config_file.h @@ -273,6 +273,8 @@ struct config_file { struct config_strlist* local_zones_nodefault; /** local data RRs configged */ struct config_strlist* local_data; + /** unblock lan zones (reverse lookups for 10/8 and so on) */ + int unblock_lan_zones; /** remote control section. enable toggle. */ int remote_control_enable; diff --git a/contrib/unbound/util/configlexer.c b/contrib/unbound/util/configlexer.c index 723a043..10caec2 100644 --- a/contrib/unbound/util/configlexer.c +++ b/contrib/unbound/util/configlexer.c @@ -375,8 +375,8 @@ static void yy_fatal_error (yyconst char msg[] ) __dead2; *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 146 -#define YY_END_OF_BUFFER 147 +#define YY_NUM_RULES 147 +#define YY_END_OF_BUFFER 148 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -384,160 +384,162 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1383] = +static yyconst flex_int16_t yy_accept[1399] = { 0, - 1, 1, 128, 128, 132, 132, 136, 136, 140, 140, - 1, 1, 147, 144, 1, 126, 126, 145, 2, 145, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 128, - 129, 129, 130, 145, 132, 133, 133, 134, 145, 139, - 136, 137, 137, 138, 145, 140, 141, 141, 142, 145, - 143, 127, 2, 131, 145, 143, 144, 0, 1, 2, - 2, 2, 2, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 128, 0, 132, 0, 139, 0, 136, 140, 0, - 143, 0, 2, 2, 143, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 143, 144, 144, 144, 144, 144, 144, 144, 144, 144, - - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 143, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 65, 144, 144, - - 144, 144, 144, 6, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 143, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 143, - 144, 144, 144, 144, 29, 144, 144, 144, 144, 144, - 144, 12, 13, 144, 15, 14, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 121, 144, 144, 144, 144, 144, 3, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - - 144, 144, 144, 144, 144, 144, 144, 144, 144, 143, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 135, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 32, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 33, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 80, 135, - - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 79, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 63, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 20, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 30, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - - 144, 144, 144, 144, 144, 144, 31, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 22, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 26, 144, 27, 144, 144, 144, 66, 144, - 67, 144, 64, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 5, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - - 144, 82, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 23, 144, 144, 144, 144, - 107, 106, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 34, 144, 144, 144, 144, 144, 144, 144, 144, - 69, 68, 144, 144, 144, 144, 144, 144, 103, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 50, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - - 54, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 105, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 4, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 100, 144, 144, 144, 144, 144, 144, 144, 115, 101, - 144, 21, 144, 144, 144, 144, 71, 144, 72, 70, - 144, 144, 144, 144, 144, 144, 78, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 102, 144, 144, 144, - - 144, 125, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 62, 144, 144, 144, 144, 144, 144, - 144, 144, 28, 144, 144, 17, 144, 144, 144, 16, - 144, 87, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 41, 42, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 73, 144, 144, 144, - 144, 144, 77, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 81, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 120, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - - 144, 144, 144, 144, 144, 91, 144, 95, 144, 144, - 144, 144, 76, 144, 144, 113, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 94, - 144, 144, 144, 144, 43, 44, 144, 49, 96, 144, - 108, 104, 144, 144, 37, 144, 98, 144, 144, 144, - 144, 144, 7, 144, 61, 112, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 83, 144, 144, 122, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 97, 144, 36, 38, - - 144, 144, 144, 144, 144, 60, 144, 144, 144, 144, - 116, 18, 19, 144, 144, 144, 144, 144, 144, 58, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 118, - 144, 144, 35, 144, 144, 144, 144, 144, 144, 11, - 144, 144, 144, 144, 144, 144, 144, 10, 144, 144, - 39, 144, 124, 117, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 90, 89, 144, 119, 114, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 45, - 144, 123, 144, 144, 144, 144, 40, 144, 144, 144, - 84, 86, 144, 144, 144, 88, 144, 144, 144, 144, - - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 24, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 111, 144, 144, 144, 144, 144, 144, - 144, 25, 144, 9, 144, 144, 109, 51, 144, 144, - 144, 93, 144, 74, 144, 144, 144, 53, 57, 52, - 144, 46, 144, 8, 144, 144, 92, 144, 144, 144, - 56, 144, 47, 144, 110, 144, 144, 85, 75, 55, - 48, 144, 144, 144, 144, 59, 144, 144, 144, 144, - 99, 0 + 1, 1, 129, 129, 133, 133, 137, 137, 141, 141, + 1, 1, 148, 145, 1, 127, 127, 146, 2, 146, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 129, + 130, 130, 131, 146, 133, 134, 134, 135, 146, 140, + 137, 138, 138, 139, 146, 141, 142, 142, 143, 146, + 144, 128, 2, 132, 146, 144, 145, 0, 1, 2, + 2, 2, 2, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 129, 0, 133, 0, 140, 0, 137, 141, 0, + 144, 0, 2, 2, 144, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 144, 145, 145, 145, 145, 145, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 144, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 65, + + 145, 145, 145, 145, 145, 6, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 144, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 144, 145, 145, 145, 145, 29, 145, + 145, 145, 145, 145, 145, 12, 13, 145, 15, 14, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 122, 145, 145, + 145, 145, 145, 3, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 144, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 136, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 32, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 33, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + + 145, 145, 145, 145, 80, 136, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 79, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 63, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 20, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 30, 145, 145, 145, 145, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 31, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 22, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 26, + 145, 27, 145, 145, 145, 66, 145, 67, 145, 64, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 5, 145, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 145, 145, 82, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 23, 145, 145, 145, 145, 107, 106, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 34, + 145, 145, 145, 145, 145, 145, 145, 145, 69, 68, + 145, 145, 145, 145, 145, 145, 145, 103, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 50, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 145, 145, 54, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 105, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 4, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 100, 145, 145, 145, 145, 145, 145, 145, 116, 101, + 145, 21, 145, 145, 145, 145, 71, 145, 72, 70, + 145, 145, 145, 145, 145, 145, 78, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 102, 145, 145, 145, + 145, 126, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 62, 145, 145, 145, 145, 145, 145, + 145, 145, 28, 145, 145, 17, 145, 145, 145, 16, + 145, 87, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 41, 42, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 73, 145, 145, + 145, 145, 145, 77, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 81, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + + 121, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 91, 145, 95, + 145, 145, 145, 145, 76, 145, 145, 114, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 94, 145, 145, 145, 145, 43, 44, 145, 49, + 96, 145, 108, 104, 145, 145, 37, 145, 98, 145, + 145, 145, 145, 145, 7, 145, 61, 113, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 83, 145, 145, 123, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 145, 145, 97, + 145, 36, 38, 145, 145, 145, 145, 145, 60, 145, + 145, 145, 145, 117, 18, 19, 145, 145, 145, 145, + 145, 145, 145, 58, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 119, 145, 145, 35, 145, 145, 145, + 145, 145, 145, 11, 145, 145, 145, 145, 145, 145, + 145, 10, 145, 145, 39, 145, 125, 118, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 90, + 89, 145, 120, 115, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 45, 145, 124, 145, 145, 145, + + 145, 40, 145, 145, 145, 84, 86, 109, 145, 145, + 145, 88, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 24, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 112, + 145, 145, 145, 145, 145, 145, 145, 25, 145, 9, + 145, 145, 110, 51, 145, 145, 145, 93, 145, 74, + 145, 145, 145, 53, 57, 52, 145, 46, 145, 8, + 145, 145, 92, 145, 145, 145, 56, 145, 47, 145, + 111, 145, 145, 85, 75, 55, 48, 145, 145, 145, + 145, 59, 145, 145, 145, 145, 99, 0 + } ; static yyconst flex_int32_t yy_ec[256] = @@ -580,323 +582,327 @@ static yyconst flex_int32_t yy_meta[40] = 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[1397] = +static yyconst flex_int16_t yy_base[1413] = { 0, 0, 0, 37, 40, 44, 51, 63, 75, 56, 68, - 87, 108, 2653, 2569, 50, 2760, 2760, 2760, 129, 94, + 87, 108, 2067, 1442, 50, 2793, 2793, 2793, 129, 94, 70, 104, 122, 90, 92, 115, 126, 95, 84, 132, - 135, 138, 50, 146, 148, 157, 167, 160, 151, 2566, - 2760, 2760, 2760, 70, 2404, 2760, 2760, 2760, 42, 2139, - 1931, 2760, 2760, 2760, 189, 1601, 2760, 2760, 2760, 195, - 1479, 2760, 199, 2760, 203, 111, 635, 209, 120, 0, + 135, 138, 50, 146, 148, 157, 167, 160, 151, 1368, + 2793, 2793, 2793, 70, 1259, 2793, 2793, 2793, 42, 1197, + 1142, 2793, 2793, 2793, 189, 824, 2793, 2793, 2793, 195, + 789, 2793, 199, 2793, 203, 111, 761, 209, 120, 0, 220, 0, 0, 103, 141, 149, 202, 189, 182, 204, 206, 210, 218, 215, 217, 221, 222, 223, 225, 228, 235, 248, 165, 244, 247, 233, 245, 252, 246, 251, 258, 260, 261, 262, 267, 263, 270, 271, 158, 274, - 276, 280, 277, 278, 282, 286, 283, 49, 287, 291, - 288, 588, 304, 558, 307, 386, 316, 354, 297, 320, - 236, 324, 328, 0, 321, 309, 330, 323, 226, 326, - 327, 334, 331, 337, 348, 339, 342, 344, 333, 346, - 353, 345, 351, 355, 354, 360, 363, 371, 373, 379, - 375, 382, 383, 381, 380, 392, 393, 399, 400, 396, - 402, 384, 405, 385, 406, 397, 409, 410, 413, 418, - 421, 419, 420, 417, 428, 425, 426, 438, 445, 430, - 431, 434, 442, 446, 447, 448, 451, 454, 455, 457, - - 458, 464, 461, 466, 467, 468, 473, 476, 474, 478, - 484, 490, 475, 483, 486, 487, 491, 493, 494, 496, - 502, 503, 504, 505, 509, 499, 510, 512, 526, 514, - 527, 515, 519, 531, 537, 533, 541, 539, 543, 549, - 545, 546, 547, 548, 553, 555, 561, 566, 557, 559, - 567, 570, 568, 590, 560, 576, 577, 580, 586, 583, - 596, 587, 595, 597, 613, 594, 611, 615, 619, 618, - 584, 621, 622, 624, 517, 623, 628, 630, 631, 627, - 629, 634, 649, 645, 646, 648, 647, 654, 661, 657, - 658, 659, 662, 663, 665, 668, 672, 2760, 674, 669, - - 676, 677, 679, 2760, 680, 681, 682, 683, 685, 692, - 694, 695, 697, 698, 699, 703, 704, 705, 725, 707, - 706, 716, 709, 734, 713, 736, 715, 728, 732, 723, - 739, 743, 710, 744, 745, 746, 754, 752, 753, 755, - 757, 758, 762, 766, 765, 772, 773, 777, 779, 787, - 784, 789, 790, 781, 791, 793, 799, 800, 798, 792, - 806, 805, 795, 808, 813, 807, 822, 815, 818, 819, - 826, 827, 828, 830, 829, 837, 836, 835, 844, 834, - 843, 848, 849, 850, 851, 860, 857, 858, 863, 869, - 870, 865, 871, 874, 875, 876, 877, 878, 879, 883, - - 885, 886, 894, 880, 890, 896, 902, 904, 887, 905, - 908, 909, 910, 911, 919, 912, 921, 913, 923, 926, - 929, 934, 925, 935, 2760, 945, 939, 941, 933, 759, - 927, 2760, 2760, 947, 2760, 2760, 948, 949, 950, 961, - 965, 958, 952, 960, 959, 974, 968, 978, 966, 986, - 988, 971, 980, 982, 989, 992, 990, 994, 998, 996, - 1004, 1007, 1006, 1008, 1010, 1011, 1013, 1015, 1016, 1022, - 1017, 1029, 1026, 2760, 1027, 1028, 1032, 1034, 1035, 2760, - 1036, 1039, 1037, 1040, 1041, 1047, 1043, 1050, 1048, 1051, - 1053, 1055, 1059, 1056, 1061, 1073, 1074, 1064, 1072, 1077, - - 1071, 1079, 1086, 1085, 1087, 1089, 1095, 1091, 1094, 1097, - 1098, 1099, 1100, 1101, 1104, 1126, 1106, 1107, 1108, 1109, - 1114, 1115, 1116, 1117, 1132, 1138, 1140, 1120, 1141, 1147, - 1149, 1143, 1152, 1150, 1156, 1157, 2760, 1163, 1159, 1160, - 1165, 1167, 1168, 1112, 1170, 1171, 1173, 1174, 1175, 1182, - 2760, 1180, 1183, 1181, 1185, 1186, 1192, 1194, 1204, 1200, - 2760, 1207, 1208, 1210, 1211, 1198, 1214, 1215, 1216, 1219, - 1222, 1223, 1225, 1230, 1232, 1220, 1234, 1227, 1233, 1235, - 1240, 1242, 1243, 1244, 1246, 1250, 1256, 1259, 1257, 1264, - 1258, 1260, 1266, 1269, 1267, 1270, 1268, 1271, 2760, 175, - - 1275, 1273, 1280, 1281, 1291, 1290, 1283, 1284, 1294, 1292, - 1293, 1282, 1303, 1304, 1305, 1306, 1309, 1310, 1312, 1313, - 1316, 1318, 1319, 1320, 1321, 1323, 1324, 1329, 1326, 1327, - 1330, 2760, 1343, 1336, 1337, 1346, 1348, 1356, 1349, 1352, - 1354, 1362, 1358, 1364, 1367, 1360, 1370, 1371, 1373, 1374, - 1380, 1382, 1378, 1381, 1384, 1386, 2760, 1390, 1388, 1389, - 1391, 1395, 1396, 1399, 1401, 1406, 1409, 1410, 1412, 2760, - 1415, 1416, 1417, 1423, 1420, 1427, 1424, 1433, 1428, 1430, - 1434, 1438, 1437, 1439, 1444, 2760, 1446, 1452, 1449, 1458, - 1450, 1456, 1457, 1461, 1462, 1463, 1469, 1465, 1467, 1466, - - 1470, 1472, 1473, 1476, 1474, 1478, 2760, 1496, 1477, 1481, - 1488, 1489, 1480, 1501, 1490, 1502, 1504, 1509, 1506, 1510, - 1512, 1511, 1513, 1514, 1517, 1520, 1522, 1528, 1534, 1535, - 1536, 2760, 1539, 1540, 1527, 1542, 1549, 1547, 1550, 1551, - 1552, 1553, 1554, 1562, 1555, 1556, 1558, 1563, 1559, 1564, - 1565, 1566, 1571, 1579, 1568, 1584, 1586, 1588, 1589, 1591, - 1590, 1597, 2760, 1596, 2760, 1598, 1599, 1607, 2760, 1605, - 2760, 1609, 2760, 1612, 1616, 1611, 1613, 1618, 1619, 1621, - 1622, 1624, 1627, 1628, 1629, 1631, 1630, 2760, 1636, 1632, - 1640, 1637, 1643, 1644, 1645, 1648, 1656, 1652, 1655, 1659, - - 1660, 2760, 1662, 1661, 1665, 1675, 1673, 1671, 1676, 1677, - 1678, 1679, 1680, 1682, 1687, 1688, 1684, 1690, 1691, 1696, - 1694, 1698, 1699, 1700, 1701, 2760, 1703, 1709, 1712, 1711, - 2760, 2760, 1714, 1723, 1725, 1715, 1728, 1717, 1729, 1733, - 1739, 1744, 1732, 1735, 1740, 1745, 1746, 1747, 1749, 1751, - 1754, 2760, 1760, 1756, 1762, 1763, 1753, 1766, 1764, 1775, - 2760, 2760, 1768, 1770, 1779, 1780, 1782, 1785, 2760, 1781, - 1786, 1787, 1788, 1789, 1791, 1795, 1796, 1805, 1802, 1807, - 1808, 1814, 1810, 1806, 1815, 1813, 1826, 2760, 1823, 1828, - 1834, 1817, 1830, 1831, 1836, 1833, 1840, 1842, 1848, 1844, - - 2760, 1850, 1837, 1857, 1846, 1859, 1860, 1867, 1854, 1856, - 1863, 1864, 1865, 1870, 1872, 1874, 1877, 2760, 1878, 1880, - 1881, 1882, 1885, 1888, 1890, 1892, 1893, 2760, 1895, 1904, - 1901, 1903, 1906, 1902, 1908, 1911, 1912, 1913, 1915, 1916, - 1919, 1924, 1925, 1934, 1926, 1929, 1940, 1938, 1949, 1950, - 1939, 1957, 1942, 1955, 1946, 1953, 1961, 1960, 1967, 1963, - 2760, 1965, 1970, 1972, 1973, 1976, 1974, 1977, 2760, 2760, - 1983, 2760, 1984, 1987, 1988, 1989, 2760, 1991, 2760, 2760, - 1992, 1999, 1993, 2000, 1964, 2003, 2760, 2004, 2007, 2008, - 2012, 2013, 2014, 2016, 2015, 2017, 2760, 2018, 2019, 2020, - - 2022, 2760, 2029, 2035, 2024, 2036, 2040, 2039, 2046, 2045, - 2032, 2053, 2049, 2760, 2047, 2055, 2057, 2058, 2059, 2060, - 2064, 2065, 2760, 2067, 2074, 2760, 2075, 2061, 2076, 2760, - 2078, 2760, 2080, 2082, 2085, 2090, 2087, 2098, 2083, 2091, - 2099, 2093, 2101, 2103, 2760, 2760, 2105, 2109, 2112, 2110, - 2115, 2117, 2116, 2118, 2119, 2124, 2760, 2125, 2127, 2126, - 2128, 2129, 2760, 2133, 2134, 2135, 2138, 2141, 2153, 2155, - 2144, 2159, 2161, 2156, 2163, 2165, 2166, 2760, 2167, 2169, - 2170, 2174, 2176, 2130, 2177, 2181, 2179, 2171, 2184, 2760, - 2187, 2188, 2191, 2193, 2195, 2196, 2198, 2199, 2200, 2203, - - 2204, 2206, 2209, 2210, 2213, 2760, 2211, 2760, 2216, 2226, - 2229, 2232, 2760, 2220, 2222, 2760, 2236, 2237, 2244, 2245, - 2247, 2252, 2248, 2238, 2255, 2240, 2256, 2262, 2263, 2760, - 2230, 2265, 2264, 2266, 2760, 2760, 2273, 2760, 2760, 2276, - 2760, 2760, 2277, 2279, 2760, 2281, 2760, 2288, 2284, 2271, - 2267, 2286, 2760, 2293, 2760, 2760, 2290, 2294, 2297, 2298, - 2300, 2302, 2305, 2306, 2307, 2308, 2309, 2310, 2312, 2314, - 2315, 2228, 2316, 2317, 2319, 2323, 2326, 2328, 2329, 2339, - 2760, 2327, 2340, 2760, 2347, 2342, 2335, 2331, 2348, 2352, - 2353, 2355, 2361, 2358, 2357, 2359, 2760, 2362, 2760, 2760, - - 2360, 2364, 2370, 2363, 2365, 2760, 2375, 2371, 2385, 2387, - 2760, 2760, 2760, 2388, 2377, 2382, 2392, 2393, 2394, 2760, - 2395, 2396, 2400, 2403, 2407, 2409, 2416, 2413, 2415, 2760, - 2417, 2419, 2760, 2420, 2421, 2424, 2426, 2427, 2429, 2760, - 2425, 2430, 2437, 2432, 2440, 2442, 2443, 2760, 2445, 2446, - 2760, 2452, 2760, 2760, 2447, 2455, 2457, 2462, 2464, 2453, - 2458, 2470, 2469, 2473, 2760, 2760, 2474, 2760, 2760, 2466, - 2475, 2476, 2478, 2481, 2482, 2484, 2486, 2489, 2488, 2760, - 2490, 2760, 2491, 2500, 2492, 2494, 2760, 2501, 2502, 2505, - 2760, 2760, 2506, 2515, 2513, 2760, 2518, 2517, 2519, 2520, - - 2525, 2527, 2521, 2528, 2531, 2529, 2507, 2532, 2541, 2543, - 2760, 2545, 2542, 2546, 2550, 2553, 2554, 2555, 2556, 2558, - 2559, 2561, 2563, 2760, 2564, 2565, 2575, 2580, 2584, 2572, - 2586, 2760, 2587, 2760, 2590, 2591, 2760, 2760, 2592, 2594, - 2597, 2760, 2598, 2760, 2581, 2605, 2595, 2760, 2760, 2760, - 2607, 2760, 2608, 2760, 2610, 2611, 2760, 2613, 2615, 2617, - 2760, 2619, 2760, 2621, 2760, 2622, 2623, 2760, 2760, 2760, - 2760, 2625, 2627, 2633, 2628, 2760, 2630, 2635, 2636, 2639, - 2760, 2760, 2668, 2675, 2682, 2689, 2696, 94, 2703, 2710, - 2717, 2724, 2731, 2738, 2745, 2752 - + 276, 280, 277, 278, 282, 286, 283, 295, 287, 291, + 288, 653, 316, 558, 307, 417, 320, 388, 347, 324, + 236, 328, 332, 0, 310, 325, 333, 327, 226, 329, + 331, 339, 336, 343, 352, 345, 335, 348, 49, 355, + 357, 349, 350, 364, 360, 369, 367, 370, 371, 380, + 381, 388, 389, 296, 337, 391, 392, 398, 400, 396, + 399, 401, 402, 385, 404, 409, 406, 410, 411, 413, + 419, 416, 418, 422, 428, 425, 427, 434, 442, 443, + 445, 440, 430, 446, 453, 450, 441, 451, 457, 458, + + 459, 466, 470, 461, 463, 472, 476, 473, 479, 481, + 484, 486, 492, 468, 489, 490, 493, 496, 494, 498, + 501, 504, 500, 505, 508, 509, 510, 514, 520, 519, + 516, 523, 524, 530, 529, 534, 535, 536, 539, 542, + 548, 546, 547, 550, 549, 551, 556, 564, 568, 557, + 560, 561, 569, 571, 575, 591, 577, 579, 581, 582, + 584, 595, 609, 596, 585, 597, 613, 598, 611, 614, + 623, 617, 622, 624, 627, 626, 629, 630, 631, 634, + 635, 642, 632, 646, 654, 651, 658, 659, 639, 586, + 665, 650, 661, 663, 668, 666, 669, 673, 676, 2793, + + 678, 680, 681, 682, 683, 2793, 684, 685, 686, 687, + 688, 698, 690, 697, 699, 702, 703, 707, 709, 710, + 730, 713, 711, 721, 714, 715, 722, 724, 739, 728, + 732, 737, 734, 741, 742, 745, 748, 750, 751, 762, + 758, 759, 760, 769, 764, 766, 771, 772, 779, 775, + 781, 784, 790, 792, 794, 800, 786, 796, 798, 804, + 805, 803, 797, 811, 810, 812, 813, 818, 814, 827, + 820, 828, 830, 833, 823, 835, 837, 839, 846, 842, + 844, 849, 845, 843, 854, 855, 859, 858, 870, 871, + 864, 872, 879, 880, 857, 881, 867, 877, 884, 886, + + 887, 888, 889, 892, 893, 899, 896, 900, 898, 905, + 907, 909, 911, 913, 914, 917, 920, 918, 919, 928, + 929, 931, 933, 932, 935, 939, 934, 941, 2793, 949, + 948, 945, 951, 953, 956, 2793, 2793, 958, 2793, 2793, + 954, 959, 960, 967, 976, 968, 966, 972, 974, 982, + 979, 989, 970, 991, 993, 998, 987, 999, 1000, 1001, + 1004, 1005, 1006, 1010, 1017, 1020, 1013, 1021, 1014, 1024, + 1025, 1026, 1028, 1030, 1033, 1039, 1036, 2793, 1037, 1038, + 1044, 1042, 1047, 2793, 1046, 1048, 1049, 1051, 1054, 1059, + 1056, 1060, 1062, 1063, 1066, 1069, 1068, 1061, 1072, 1078, + + 1089, 1087, 1077, 1085, 1088, 1090, 1094, 1103, 1099, 1092, + 1100, 1106, 1104, 1108, 1115, 1105, 1112, 1109, 1117, 1118, + 1142, 1119, 1121, 1125, 1122, 1126, 1127, 1129, 1133, 1135, + 1154, 1144, 1138, 1134, 1156, 1159, 1161, 1163, 1165, 1167, + 1168, 2793, 1175, 1171, 1173, 1176, 1178, 1179, 1181, 1182, + 1186, 1185, 1188, 1187, 1199, 2793, 1193, 1195, 1200, 1203, + 1204, 1206, 1207, 1217, 1219, 2793, 1225, 1222, 1227, 1221, + 1228, 1229, 1210, 1233, 1234, 1235, 1237, 1240, 1243, 1245, + 1244, 1247, 1249, 1251, 1252, 1255, 1256, 1258, 1257, 1266, + 1260, 1264, 1278, 1279, 1265, 1282, 1277, 1283, 1286, 1288, + + 1285, 1290, 1287, 1289, 2793, 175, 1291, 1292, 1293, 1300, + 1309, 1310, 1294, 1302, 1312, 1311, 1318, 1301, 1322, 1319, + 1323, 1324, 1325, 1330, 1327, 1334, 1331, 1328, 1336, 1341, + 1339, 1342, 1347, 1348, 1345, 1349, 1350, 2793, 1357, 1356, + 1364, 1355, 1361, 1378, 1362, 1367, 1374, 1376, 1384, 1382, + 1386, 1388, 1390, 1392, 1379, 1394, 1400, 1401, 1398, 1402, + 1404, 1405, 2793, 1407, 1408, 1409, 1410, 1414, 1417, 1415, + 1419, 1421, 1431, 1426, 1435, 2793, 1436, 1438, 1428, 1445, + 1432, 1449, 1450, 1454, 1440, 1451, 1457, 1458, 1461, 1459, + 1464, 1466, 2793, 1472, 1474, 1471, 1480, 1478, 1479, 1481, + + 1483, 1468, 1484, 1490, 1486, 1489, 1493, 1494, 1496, 1497, + 1499, 1491, 1500, 2793, 1513, 1501, 1502, 1510, 1503, 1504, + 1519, 1518, 1525, 1526, 1528, 1529, 1530, 1531, 1532, 1533, + 1541, 1534, 1539, 1542, 1547, 1558, 1559, 1555, 2793, 1561, + 1557, 1564, 1546, 1571, 1568, 1569, 1572, 1573, 1574, 1575, + 1582, 1576, 1579, 1583, 1584, 1580, 1585, 1586, 1589, 1587, + 1596, 1597, 1604, 1605, 1608, 1609, 1611, 1612, 1621, 2793, + 1617, 2793, 1618, 1619, 1627, 2793, 1629, 2793, 1631, 2793, + 1633, 1637, 1624, 1626, 1634, 1640, 1641, 1643, 1644, 1646, + 1649, 1650, 1653, 1654, 1655, 2793, 1652, 1658, 1662, 1659, + + 1665, 1666, 1667, 1675, 1681, 1668, 1677, 1683, 1678, 2793, + 1687, 1674, 1690, 1694, 1695, 1697, 1698, 1700, 1701, 1702, + 1703, 1705, 1707, 1709, 1710, 1711, 1714, 1721, 1713, 1723, + 1716, 1719, 1722, 2793, 1729, 1734, 1737, 1724, 2793, 2793, + 1748, 1732, 1745, 1738, 1742, 1752, 1753, 1755, 1761, 1758, + 1759, 1760, 1763, 1766, 1767, 1768, 1769, 1772, 1775, 2793, + 1782, 1776, 1783, 1784, 1785, 1796, 1774, 1795, 2793, 2793, + 1789, 1799, 1800, 1801, 1807, 1803, 1806, 2793, 1808, 1809, + 1810, 1811, 1817, 1814, 1821, 1825, 1827, 1829, 1830, 1833, + 1836, 1834, 1832, 1835, 1838, 1848, 2793, 1849, 1852, 1859, + + 1839, 1853, 1855, 1857, 1861, 1863, 1865, 1871, 1867, 2793, + 1873, 1869, 1879, 1876, 1878, 1882, 1885, 1884, 1886, 1888, + 1889, 1890, 1892, 1893, 1894, 1897, 2793, 1904, 1900, 1905, + 1907, 1912, 1902, 1915, 1910, 1918, 2793, 1922, 1929, 1923, + 1925, 1931, 1933, 1926, 1937, 1939, 1940, 1941, 1942, 1944, + 1946, 1947, 1950, 1951, 1952, 1960, 1962, 1969, 1970, 1967, + 1971, 1978, 1974, 1975, 1976, 1977, 1985, 1981, 1987, 1984, + 2793, 1989, 1991, 1995, 1998, 2000, 2001, 1997, 2793, 2793, + 1999, 2793, 2008, 2010, 2012, 2013, 2793, 2015, 2793, 2793, + 2016, 2023, 2017, 2024, 2027, 2032, 2793, 2019, 2033, 2035, + + 2037, 2038, 2039, 2040, 2041, 2042, 2793, 2043, 2044, 2045, + 2055, 2793, 2047, 2060, 2049, 2065, 2066, 2067, 2069, 2071, + 2057, 2078, 2076, 2793, 2079, 2080, 2083, 2084, 2088, 2085, + 2086, 2090, 2793, 2099, 2101, 2793, 2092, 2091, 2093, 2793, + 2107, 2793, 2108, 2103, 2110, 2112, 2116, 2117, 2120, 2122, + 2123, 2124, 2125, 2131, 2128, 2793, 2793, 2133, 2140, 2143, + 2134, 2132, 2145, 2147, 2148, 2150, 2151, 2793, 2154, 2152, + 2156, 2155, 2158, 2793, 2160, 2161, 2168, 2169, 2165, 2173, + 2175, 2180, 2184, 2186, 2187, 2189, 2191, 2192, 2793, 2194, + 2196, 2197, 2201, 2202, 2157, 2204, 2208, 2213, 2198, 2215, + + 2793, 2219, 2203, 2221, 2223, 2225, 2205, 2226, 2227, 2228, + 2230, 2231, 2233, 2234, 2236, 2244, 2241, 2793, 2238, 2793, + 2247, 2252, 2259, 2260, 2793, 2248, 2255, 2793, 2262, 2266, + 2273, 2264, 2274, 2276, 2278, 2270, 2280, 2279, 2281, 2287, + 2285, 2793, 2288, 2289, 2292, 2293, 2793, 2793, 2296, 2793, + 2793, 2302, 2793, 2793, 2298, 2306, 2793, 2308, 2793, 2314, + 2310, 2312, 2313, 2315, 2793, 2317, 2793, 2793, 2318, 2319, + 2322, 2324, 2326, 2331, 2333, 2327, 2334, 2337, 2338, 2341, + 2340, 2342, 2344, 2346, 2347, 2348, 2351, 2354, 2356, 2357, + 2358, 2360, 2367, 2793, 2359, 2371, 2793, 2380, 2374, 2361, + + 2369, 2381, 2382, 2384, 2386, 2393, 2389, 2390, 2391, 2793, + 2394, 2793, 2793, 2392, 2397, 2396, 2401, 2402, 2793, 2406, + 2407, 2415, 2418, 2793, 2793, 2793, 2421, 2408, 2410, 2423, + 2424, 2425, 2427, 2793, 2431, 2432, 2433, 2434, 2440, 2442, + 2448, 2451, 2453, 2793, 2454, 2445, 2793, 2455, 2447, 2456, + 2461, 2462, 2464, 2793, 2466, 2467, 2469, 2471, 2475, 2476, + 2472, 2793, 2478, 2479, 2793, 2482, 2793, 2793, 2483, 2488, + 2490, 2495, 2497, 2499, 2491, 2500, 2506, 2505, 2507, 2793, + 2793, 2502, 2793, 2793, 2510, 2512, 2513, 2515, 2517, 2518, + 2519, 2521, 2522, 2524, 2793, 2525, 2793, 2527, 2535, 2526, + + 2537, 2793, 2540, 2536, 2538, 2793, 2793, 2793, 2550, 2541, + 2543, 2793, 2551, 2553, 2554, 2557, 2559, 2560, 2561, 2564, + 2566, 2565, 2567, 2568, 2576, 2579, 2793, 2581, 2571, 2578, + 2586, 2589, 2582, 2590, 2592, 2595, 2596, 2598, 2599, 2793, + 2603, 2604, 2606, 2611, 2614, 2615, 2622, 2793, 2623, 2793, + 2626, 2627, 2793, 2793, 2628, 2630, 2633, 2793, 2634, 2793, + 2631, 2641, 2642, 2793, 2793, 2793, 2644, 2793, 2645, 2793, + 2648, 2635, 2793, 2619, 2653, 2655, 2793, 2657, 2793, 2659, + 2793, 2660, 2661, 2793, 2793, 2793, 2793, 2663, 2664, 2666, + 2607, 2793, 2668, 2671, 2669, 2674, 2793, 2793, 2701, 2708, + + 2715, 2722, 2729, 94, 2736, 2743, 2750, 2757, 2764, 2771, + 2778, 2785 } ; -static yyconst flex_int16_t yy_def[1397] = +static yyconst flex_int16_t yy_def[1413] = { 0, - 1382, 1, 1383, 1383, 1384, 1384, 1385, 1385, 1386, 1386, - 1387, 1387, 1382, 1388, 1382, 1382, 1382, 1382, 1389, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1390, - 1382, 1382, 1382, 1390, 1391, 1382, 1382, 1382, 1391, 1392, - 1382, 1382, 1382, 1382, 1392, 1393, 1382, 1382, 1382, 1393, - 1394, 1382, 1395, 1382, 1394, 1394, 1388, 1388, 1382, 1396, - 1389, 1396, 1389, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1390, 1390, 1391, 1391, 1392, 1392, 1382, 1393, 1393, - 1394, 1394, 1395, 1395, 1394, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1394, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1394, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, - - 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1394, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1394, - 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, - 1388, 1382, 1382, 1388, 1382, 1382, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1382, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1394, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1394, - - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - - 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1382, 1388, 1382, 1388, 1388, 1388, 1382, 1388, - 1382, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - - 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, - 1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - - 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1382, - 1388, 1382, 1388, 1388, 1388, 1388, 1382, 1388, 1382, 1382, - 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, - - 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1382, 1388, 1388, 1382, 1388, 1388, 1388, 1382, - 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1382, 1382, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, - 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - - 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1382, 1388, 1388, - 1388, 1388, 1382, 1388, 1388, 1382, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, - 1388, 1388, 1388, 1388, 1382, 1382, 1388, 1382, 1382, 1388, - 1382, 1382, 1388, 1388, 1382, 1388, 1382, 1388, 1388, 1388, - 1388, 1388, 1382, 1388, 1382, 1382, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1382, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1382, 1382, - - 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, - 1382, 1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1382, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, - 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1382, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, - 1382, 1388, 1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1388, 1382, 1382, 1388, 1382, 1382, 1388, - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, - 1388, 1382, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, - 1382, 1382, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, - - 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1382, 1388, 1382, 1388, 1388, 1382, 1382, 1388, 1388, - 1388, 1382, 1388, 1382, 1388, 1388, 1388, 1382, 1382, 1382, - 1388, 1382, 1388, 1382, 1388, 1388, 1382, 1388, 1388, 1388, - 1382, 1388, 1382, 1388, 1382, 1388, 1388, 1382, 1382, 1382, - 1382, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, - 1382, 0, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, - 1382, 1382, 1382, 1382, 1382, 1382 - + 1398, 1, 1399, 1399, 1400, 1400, 1401, 1401, 1402, 1402, + 1403, 1403, 1398, 1404, 1398, 1398, 1398, 1398, 1405, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1406, + 1398, 1398, 1398, 1406, 1407, 1398, 1398, 1398, 1407, 1408, + 1398, 1398, 1398, 1398, 1408, 1409, 1398, 1398, 1398, 1409, + 1410, 1398, 1411, 1398, 1410, 1410, 1404, 1404, 1398, 1412, + 1405, 1412, 1405, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1406, 1406, 1407, 1407, 1408, 1408, 1398, 1409, 1409, + 1410, 1410, 1411, 1411, 1410, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1410, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1410, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, + + 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1410, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1410, 1404, 1404, 1404, 1404, 1398, 1404, + 1404, 1404, 1404, 1404, 1404, 1398, 1398, 1404, 1398, 1398, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, + 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1410, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + + 1404, 1404, 1404, 1404, 1398, 1410, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, + 1404, 1398, 1404, 1404, 1404, 1398, 1404, 1398, 1404, 1398, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, + + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1398, 1398, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1398, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, + + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1398, + 1404, 1398, 1404, 1404, 1404, 1404, 1398, 1404, 1398, 1398, + 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, + + 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, + 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1398, 1404, 1404, 1398, 1404, 1404, 1404, 1398, + 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1398, 1398, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, + 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + + 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1398, + 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1398, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1398, 1404, 1404, 1404, 1404, 1398, 1398, 1404, 1398, + 1398, 1404, 1398, 1398, 1404, 1404, 1398, 1404, 1398, 1404, + 1404, 1404, 1404, 1404, 1398, 1404, 1398, 1398, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1398, 1404, 1404, 1398, 1404, 1404, 1404, + + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, + 1404, 1398, 1398, 1404, 1404, 1404, 1404, 1404, 1398, 1404, + 1404, 1404, 1404, 1398, 1398, 1398, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1398, 1404, 1404, 1398, 1404, 1404, 1404, + 1404, 1404, 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1398, 1404, 1404, 1398, 1404, 1398, 1398, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, + 1398, 1404, 1398, 1398, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1398, 1404, 1398, 1404, 1404, 1404, + + 1404, 1398, 1404, 1404, 1404, 1398, 1398, 1398, 1404, 1404, + 1404, 1398, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1404, 1404, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, + 1404, 1404, 1404, 1404, 1404, 1404, 1404, 1398, 1404, 1398, + 1404, 1404, 1398, 1398, 1404, 1404, 1404, 1398, 1404, 1398, + 1404, 1404, 1404, 1398, 1398, 1398, 1404, 1398, 1404, 1398, + 1404, 1404, 1398, 1404, 1404, 1404, 1398, 1404, 1398, 1404, + 1398, 1404, 1404, 1398, 1398, 1398, 1398, 1404, 1404, 1404, + 1404, 1398, 1404, 1404, 1404, 1404, 1398, 0, 1398, 1398, + + 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, + 1398, 1398 } ; -static yyconst flex_int16_t yy_nxt[2800] = +static yyconst flex_int16_t yy_nxt[2833] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 18, 20, 21, 14, 22, 23, 24, 25, 14, @@ -906,7 +912,7 @@ static yyconst flex_int16_t yy_nxt[2800] = 48, 69, 44, 46, 47, 70, 49, 48, 57, 58, 59, 68, 68, 49, 51, 52, 53, 54, 60, 18, 57, 58, 59, 122, 122, 55, 51, 52, 53, 54, - 60, 18, 68, 103, 187, 74, 75, 55, 15, 16, + 60, 18, 68, 103, 211, 74, 75, 55, 15, 16, 17, 62, 63, 64, 67, 67, 68, 67, 67, 65, 67, 94, 68, 76, 68, 67, 84, 68, 66, 15, @@ -924,291 +930,295 @@ static yyconst flex_int16_t yy_nxt[2800] = 67, 134, 67, 67, 68, 67, 68, 139, 68, 140, 67, 72, 68, 72, 72, 145, 72, 68, 142, 68, 68, 72, 73, 68, 68, 68, 143, 68, 68, 151, - 68, 147, 152, 146, 144, 68, 195, 68, 132, 148, + 68, 147, 152, 146, 144, 68, 196, 68, 132, 148, 154, 149, 150, 155, 153, 157, 68, 68, 68, 68, 68, 159, 161, 68, 68, 166, 162, 156, 165, 163, 68, 164, 68, 68, 68, 68, 167, 168, 171, 68, 173, 160, 68, 68, 174, 169, 68, 180, 68, 68, 68, 182, 68, 170, 68, 68, 176, 172, 68, 68, - 68, 181, 175, 68, 188, 178, 179, 122, 122, 130, - 124, 183, 184, 124, 185, 189, 186, 126, 190, 126, - 126, 68, 126, 129, 129, 131, 192, 131, 131, 72, - 131, 72, 72, 132, 72, 68, 191, 193, 68, 68, - 134, 198, 68, 68, 201, 68, 68, 199, 200, 68, - 194, 68, 207, 196, 68, 128, 68, 68, 68, 197, - 68, 209, 211, 68, 202, 68, 68, 68, 210, 203, - 212, 213, 68, 208, 204, 68, 219, 218, 214, 215, - 205, 206, 216, 68, 217, 68, 222, 68, 223, 224, - 226, 68, 68, 68, 68, 68, 68, 68, 127, 229, - - 225, 221, 227, 220, 68, 68, 231, 232, 68, 68, - 230, 68, 68, 228, 68, 233, 235, 68, 68, 237, - 234, 68, 68, 236, 239, 68, 238, 241, 245, 68, - 68, 68, 68, 68, 247, 249, 248, 68, 68, 251, - 68, 240, 68, 132, 255, 252, 68, 242, 243, 244, - 68, 246, 254, 260, 68, 257, 250, 68, 68, 68, - 68, 256, 259, 68, 261, 258, 68, 68, 253, 68, - 68, 267, 266, 68, 264, 262, 68, 268, 68, 68, - 68, 263, 271, 274, 272, 68, 68, 68, 68, 269, - 68, 276, 265, 270, 273, 68, 68, 278, 68, 68, - - 275, 277, 68, 68, 283, 68, 68, 279, 68, 287, - 285, 68, 282, 280, 68, 68, 68, 68, 288, 281, - 286, 68, 68, 284, 68, 298, 68, 68, 289, 68, - 292, 68, 293, 355, 290, 294, 295, 291, 68, 68, - 296, 297, 299, 68, 300, 68, 302, 301, 304, 68, - 305, 68, 303, 68, 306, 68, 309, 68, 68, 68, - 68, 68, 312, 311, 313, 68, 307, 68, 319, 68, - 125, 68, 68, 68, 314, 308, 318, 310, 68, 68, - 68, 315, 68, 320, 316, 324, 317, 334, 68, 132, - 321, 322, 68, 323, 326, 68, 68, 335, 68, 68, - - 123, 325, 68, 340, 327, 328, 68, 68, 68, 68, - 336, 337, 351, 338, 329, 339, 330, 331, 332, 341, - 344, 333, 342, 68, 343, 68, 345, 68, 348, 349, - 68, 68, 347, 68, 68, 68, 68, 346, 354, 68, - 68, 68, 68, 68, 361, 362, 68, 68, 353, 352, - 350, 358, 360, 356, 357, 363, 364, 68, 68, 68, - 68, 68, 366, 365, 359, 367, 68, 369, 370, 68, - 68, 68, 368, 68, 68, 68, 375, 68, 374, 372, - 68, 68, 376, 373, 68, 378, 68, 379, 68, 68, - 371, 68, 68, 68, 68, 68, 381, 68, 382, 389, - - 387, 377, 380, 383, 68, 388, 68, 68, 386, 68, - 68, 68, 384, 385, 393, 68, 68, 68, 68, 68, - 395, 68, 68, 405, 390, 68, 394, 68, 68, 391, - 392, 417, 396, 406, 404, 68, 397, 68, 398, 403, - 68, 407, 411, 399, 68, 400, 68, 408, 68, 410, - 409, 68, 412, 401, 414, 68, 68, 68, 132, 413, - 416, 421, 420, 402, 68, 68, 68, 68, 425, 68, - 68, 68, 419, 415, 68, 418, 422, 68, 68, 520, - 424, 428, 426, 423, 68, 68, 427, 430, 432, 68, - 433, 68, 429, 68, 434, 435, 68, 437, 431, 68, - - 436, 68, 68, 68, 68, 68, 441, 68, 439, 440, - 68, 68, 68, 445, 438, 443, 442, 68, 68, 68, - 68, 447, 446, 448, 444, 68, 451, 68, 449, 453, - 68, 68, 450, 455, 68, 456, 454, 452, 68, 68, - 68, 68, 68, 458, 463, 460, 68, 68, 68, 68, - 465, 467, 459, 462, 464, 68, 68, 457, 461, 466, - 68, 68, 68, 68, 475, 471, 470, 473, 472, 68, - 68, 474, 68, 468, 469, 68, 479, 68, 477, 476, - 480, 68, 68, 68, 481, 483, 68, 68, 68, 68, - 68, 68, 68, 478, 488, 68, 482, 68, 68, 68, - - 489, 493, 68, 495, 484, 485, 68, 486, 68, 487, - 490, 494, 496, 492, 68, 491, 68, 68, 499, 497, - 68, 68, 68, 68, 68, 68, 502, 501, 504, 503, - 500, 68, 498, 68, 508, 68, 505, 68, 132, 68, - 507, 68, 506, 510, 511, 68, 68, 68, 514, 509, - 512, 68, 516, 68, 521, 517, 515, 68, 513, 68, - 68, 68, 68, 519, 68, 518, 525, 524, 526, 523, - 68, 68, 68, 68, 536, 533, 522, 68, 68, 527, - 68, 528, 534, 68, 529, 537, 68, 538, 543, 530, - 68, 539, 68, 540, 68, 531, 532, 535, 68, 541, - - 68, 68, 68, 542, 68, 547, 68, 551, 68, 546, - 68, 552, 544, 545, 553, 550, 68, 548, 68, 68, - 68, 554, 68, 68, 549, 68, 555, 68, 68, 68, - 556, 557, 559, 561, 68, 560, 563, 562, 68, 68, - 68, 68, 565, 558, 68, 567, 68, 68, 68, 68, - 569, 68, 68, 68, 566, 68, 572, 564, 570, 68, - 68, 568, 68, 68, 577, 68, 578, 68, 68, 571, - 573, 68, 574, 68, 581, 575, 68, 583, 579, 576, - 586, 582, 580, 68, 68, 68, 68, 585, 584, 68, - 587, 68, 592, 593, 590, 588, 589, 68, 68, 68, - - 594, 68, 597, 68, 591, 599, 68, 68, 600, 132, - 68, 68, 68, 68, 596, 602, 68, 595, 68, 68, - 68, 68, 611, 598, 68, 601, 68, 68, 68, 68, - 605, 603, 68, 640, 612, 618, 614, 604, 68, 619, - 615, 606, 617, 607, 68, 613, 625, 608, 616, 609, - 68, 620, 68, 68, 610, 68, 621, 624, 622, 68, - 627, 68, 68, 629, 68, 626, 628, 632, 68, 68, - 634, 68, 68, 633, 635, 68, 623, 68, 630, 68, - 68, 631, 68, 68, 638, 68, 68, 68, 642, 646, - 637, 636, 68, 68, 68, 68, 645, 68, 68, 639, - - 644, 641, 650, 651, 68, 643, 68, 655, 649, 652, - 68, 647, 68, 648, 656, 653, 68, 654, 657, 68, - 68, 658, 68, 68, 659, 660, 68, 68, 68, 663, - 662, 68, 68, 665, 68, 68, 666, 68, 661, 68, - 667, 670, 68, 669, 68, 68, 68, 68, 664, 673, - 672, 668, 68, 671, 68, 68, 68, 674, 68, 678, - 679, 681, 68, 683, 675, 677, 684, 676, 68, 68, - 68, 68, 68, 682, 680, 686, 68, 690, 68, 68, - 68, 68, 68, 68, 685, 68, 688, 68, 698, 687, - 689, 692, 68, 68, 68, 68, 68, 691, 699, 693, - - 696, 695, 68, 68, 68, 68, 68, 700, 694, 701, - 702, 703, 697, 706, 707, 68, 68, 68, 68, 704, - 705, 68, 68, 710, 68, 68, 709, 712, 68, 714, - 68, 68, 68, 68, 708, 68, 68, 715, 68, 68, - 711, 68, 68, 713, 718, 716, 717, 722, 68, 68, - 726, 725, 719, 723, 721, 68, 720, 728, 68, 724, - 68, 68, 727, 731, 68, 730, 68, 732, 68, 736, - 68, 737, 68, 740, 68, 735, 68, 734, 729, 68, - 733, 738, 68, 68, 739, 68, 68, 745, 742, 746, - 68, 741, 68, 68, 68, 747, 68, 748, 68, 743, - - 68, 68, 68, 68, 744, 749, 754, 68, 68, 753, - 750, 68, 751, 68, 752, 755, 759, 757, 68, 756, - 763, 68, 68, 765, 68, 760, 758, 68, 68, 68, - 766, 761, 68, 767, 769, 68, 68, 764, 771, 68, - 68, 772, 68, 762, 773, 68, 68, 775, 768, 68, - 68, 68, 770, 781, 776, 777, 68, 779, 68, 782, - 774, 68, 68, 780, 68, 784, 783, 778, 68, 68, - 68, 785, 788, 68, 68, 68, 791, 68, 68, 68, - 787, 68, 68, 795, 68, 68, 68, 786, 68, 68, - 68, 132, 68, 68, 789, 800, 794, 792, 790, 793, - - 68, 68, 68, 801, 796, 805, 798, 802, 68, 799, - 797, 804, 807, 68, 68, 803, 68, 808, 68, 806, - 809, 68, 68, 68, 68, 68, 68, 814, 816, 68, - 811, 815, 68, 810, 68, 818, 812, 813, 820, 68, - 68, 823, 824, 817, 819, 822, 68, 68, 68, 825, - 826, 68, 68, 828, 68, 821, 830, 827, 832, 68, - 831, 68, 68, 68, 68, 68, 68, 68, 68, 838, - 68, 68, 837, 829, 68, 68, 68, 68, 68, 846, - 68, 833, 834, 68, 836, 843, 839, 840, 847, 841, - 835, 68, 845, 849, 842, 848, 68, 844, 68, 852, - - 68, 68, 68, 68, 856, 850, 853, 854, 68, 68, - 68, 68, 859, 130, 860, 858, 861, 68, 851, 68, - 862, 68, 855, 68, 68, 68, 857, 863, 68, 864, - 68, 68, 869, 68, 68, 867, 68, 871, 865, 68, - 68, 68, 68, 68, 68, 874, 868, 876, 68, 68, - 866, 873, 68, 879, 870, 68, 68, 68, 878, 883, - 68, 872, 875, 885, 68, 884, 877, 68, 68, 880, - 888, 68, 68, 68, 68, 881, 882, 68, 889, 890, - 892, 887, 893, 68, 886, 68, 894, 68, 68, 68, - 68, 68, 68, 901, 68, 898, 68, 900, 891, 68, - - 68, 895, 68, 68, 902, 909, 68, 896, 68, 897, - 68, 68, 68, 68, 899, 68, 904, 906, 903, 908, - 907, 68, 905, 68, 68, 918, 68, 68, 914, 68, - 913, 910, 911, 915, 912, 68, 916, 68, 919, 917, - 68, 68, 920, 921, 68, 68, 927, 68, 923, 922, - 924, 68, 68, 925, 926, 928, 68, 68, 68, 68, - 930, 68, 935, 68, 929, 68, 68, 938, 68, 940, - 931, 932, 68, 943, 68, 68, 68, 934, 68, 936, - 68, 941, 68, 933, 937, 942, 939, 68, 947, 944, - 945, 68, 68, 68, 68, 948, 946, 68, 68, 68, - - 68, 68, 954, 68, 955, 956, 957, 68, 68, 949, - 951, 950, 958, 953, 68, 952, 961, 68, 68, 68, - 68, 965, 68, 960, 969, 68, 68, 68, 962, 68, - 959, 963, 964, 968, 966, 68, 967, 970, 68, 972, - 68, 973, 68, 68, 971, 68, 68, 977, 68, 68, - 974, 979, 68, 980, 68, 981, 68, 983, 68, 982, - 68, 975, 68, 976, 985, 978, 68, 984, 68, 68, - 987, 68, 68, 988, 989, 68, 68, 68, 990, 68, - 991, 997, 68, 986, 68, 992, 68, 999, 993, 68, - 68, 1002, 68, 68, 68, 994, 995, 68, 996, 1001, - - 68, 1004, 68, 1007, 68, 68, 1005, 68, 1003, 1000, - 998, 1011, 1010, 68, 68, 68, 68, 1014, 68, 1015, - 68, 1009, 1013, 68, 68, 68, 1006, 68, 68, 1016, - 1008, 68, 128, 1012, 1021, 1023, 68, 68, 68, 1018, - 1022, 68, 1020, 1017, 1019, 1026, 68, 1029, 1024, 1030, - 68, 68, 68, 1025, 68, 1028, 1031, 1033, 68, 1027, - 1032, 68, 68, 1034, 1035, 68, 1036, 68, 1040, 68, - 1038, 1037, 68, 68, 1042, 68, 68, 68, 1062, 68, - 1044, 1045, 68, 1046, 68, 68, 68, 1043, 68, 68, - 1039, 1047, 1049, 1048, 1041, 68, 68, 1052, 1050, 68, - - 68, 68, 1057, 68, 68, 68, 1059, 1051, 1053, 1055, - 1056, 68, 68, 1061, 1063, 68, 68, 1054, 1058, 68, - 68, 1066, 1060, 1064, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 1074, 68, 1073, 68, 1068, 1069, 1065, - 1070, 68, 1071, 1076, 68, 1067, 1078, 68, 68, 1072, - 1075, 68, 68, 1080, 1081, 1077, 1082, 68, 68, 68, - 1086, 68, 1079, 1083, 1085, 68, 1087, 68, 1090, 68, - 68, 68, 68, 68, 1094, 1084, 68, 68, 1088, 68, - 1092, 1089, 1091, 1093, 1097, 1095, 68, 68, 68, 1096, - 68, 1098, 68, 1100, 68, 68, 1102, 68, 1103, 68, - - 1099, 1106, 68, 68, 1101, 68, 1105, 1110, 1107, 1108, - 68, 68, 1113, 68, 1109, 68, 1111, 68, 1112, 1104, - 1116, 68, 68, 1114, 68, 1117, 1115, 68, 68, 68, - 68, 68, 1119, 1120, 1118, 1122, 68, 68, 68, 68, - 68, 68, 68, 1121, 1130, 68, 68, 68, 1149, 1131, - 68, 127, 1128, 68, 1134, 1124, 68, 1123, 1126, 1127, - 1132, 1125, 1129, 1133, 1135, 68, 1136, 68, 68, 1137, - 1138, 68, 1139, 68, 1141, 68, 1142, 68, 68, 68, - 1145, 68, 68, 68, 1144, 1147, 68, 1140, 68, 68, - 1153, 68, 1150, 68, 1151, 1155, 68, 1143, 1156, 68, - - 68, 1146, 1154, 68, 1158, 68, 1148, 68, 68, 1152, - 68, 68, 68, 1161, 1159, 68, 68, 1169, 68, 1160, - 1165, 68, 68, 68, 1163, 68, 1157, 1167, 68, 1170, - 1168, 1166, 68, 1164, 68, 1162, 1174, 1172, 68, 1173, - 68, 68, 68, 1171, 68, 1175, 1178, 1177, 68, 68, - 68, 1179, 68, 1176, 1180, 1181, 68, 68, 1192, 68, - 68, 1182, 1183, 1184, 68, 1185, 1222, 68, 68, 1190, - 1186, 1187, 1188, 1189, 68, 68, 68, 68, 68, 68, - 1195, 1191, 1193, 68, 1194, 68, 1196, 1197, 68, 68, - 1199, 68, 1200, 68, 1198, 1201, 68, 1202, 68, 1203, - - 68, 1204, 68, 1205, 1206, 68, 68, 1207, 1208, 68, - 68, 1211, 68, 1212, 68, 1210, 1213, 68, 68, 68, - 68, 68, 68, 1209, 68, 1220, 68, 68, 68, 68, - 1214, 68, 1216, 1217, 1218, 68, 1221, 1215, 68, 68, - 68, 68, 1224, 68, 1219, 1228, 1229, 68, 1223, 1226, - 1230, 68, 68, 1232, 68, 1225, 1227, 1231, 1233, 68, - 68, 1236, 1235, 1234, 68, 68, 1240, 68, 1241, 68, - 68, 68, 68, 68, 68, 68, 68, 68, 1237, 1247, - 1238, 1248, 68, 68, 1239, 1242, 1251, 68, 1243, 68, - 1249, 1244, 1246, 1245, 68, 1250, 1253, 68, 1254, 68, - - 68, 1255, 1252, 1257, 68, 68, 68, 68, 68, 1258, - 1259, 1256, 68, 1262, 1260, 68, 125, 1263, 1265, 68, - 1266, 68, 1261, 1267, 1268, 68, 1269, 68, 68, 68, - 1264, 68, 68, 68, 1270, 1272, 68, 68, 68, 68, - 1276, 68, 68, 1271, 68, 1274, 1273, 1275, 1280, 68, - 1277, 1282, 68, 1281, 68, 68, 1278, 68, 68, 68, - 1284, 1279, 1283, 1287, 68, 68, 1285, 68, 1289, 68, - 68, 1286, 1290, 1291, 68, 1292, 68, 1295, 68, 1288, - 1296, 68, 68, 1293, 1294, 68, 68, 68, 68, 1297, - 68, 1302, 1298, 68, 68, 1300, 68, 1299, 68, 1304, - - 68, 68, 68, 68, 68, 1309, 68, 1301, 1312, 1303, - 1307, 1311, 68, 68, 68, 1313, 1305, 68, 68, 68, - 1308, 1310, 1314, 1317, 1306, 68, 1315, 68, 1318, 68, - 68, 68, 68, 68, 1319, 1320, 1324, 68, 1321, 68, - 68, 68, 1316, 68, 68, 1330, 1329, 1323, 1325, 1326, - 1322, 1328, 1332, 68, 68, 68, 1334, 68, 68, 1327, - 1333, 1337, 68, 1331, 1338, 68, 68, 68, 68, 1342, - 68, 68, 1344, 68, 1335, 68, 68, 68, 123, 1340, - 1336, 68, 1347, 1343, 68, 1339, 1348, 68, 1341, 1351, - 1346, 1349, 68, 68, 1345, 1350, 68, 1352, 68, 68, - - 1353, 1354, 68, 68, 68, 1357, 68, 68, 1355, 68, - 68, 1362, 1356, 1360, 1358, 1359, 1361, 68, 1363, 68, - 68, 1365, 68, 68, 1364, 68, 1368, 68, 1369, 68, - 1370, 68, 1371, 68, 68, 68, 1373, 68, 1366, 68, - 68, 1374, 68, 1367, 1376, 68, 1372, 68, 68, 1377, - 1381, 68, 1382, 1382, 1382, 1382, 1382, 1378, 1382, 1375, - 1382, 1379, 1382, 1382, 1382, 1382, 1382, 1380, 40, 40, - 40, 40, 40, 40, 40, 45, 45, 45, 45, 45, - 45, 45, 50, 50, 50, 50, 50, 50, 50, 56, - 56, 56, 56, 56, 56, 56, 61, 61, 61, 61, - - 61, 61, 61, 71, 71, 1382, 71, 71, 71, 71, - 122, 122, 1382, 1382, 1382, 122, 122, 124, 124, 1382, - 1382, 124, 1382, 124, 126, 1382, 1382, 1382, 1382, 1382, - 126, 129, 129, 1382, 1382, 1382, 129, 129, 131, 1382, - 1382, 1382, 1382, 1382, 131, 133, 133, 1382, 133, 133, - 133, 133, 72, 72, 1382, 72, 72, 72, 72, 13, - 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, - 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, - 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, - 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382 - + 68, 181, 175, 68, 189, 178, 179, 68, 68, 187, + 124, 183, 184, 124, 185, 190, 186, 228, 191, 122, + 122, 126, 132, 126, 126, 192, 126, 129, 129, 131, + 188, 131, 131, 72, 131, 72, 72, 68, 72, 68, + 194, 68, 193, 68, 134, 68, 199, 68, 68, 68, + 202, 68, 200, 201, 195, 68, 197, 68, 208, 130, + 68, 68, 68, 198, 68, 210, 209, 68, 203, 68, + 229, 212, 68, 204, 213, 214, 68, 215, 205, 68, + 220, 68, 68, 68, 206, 207, 219, 223, 216, 128, + 218, 217, 68, 68, 224, 225, 227, 68, 230, 222, + + 68, 68, 221, 68, 68, 232, 226, 233, 68, 231, + 68, 68, 68, 68, 68, 234, 68, 235, 68, 238, + 237, 68, 68, 68, 239, 68, 246, 242, 68, 127, + 68, 68, 248, 236, 68, 250, 240, 68, 241, 68, + 68, 249, 68, 244, 245, 243, 68, 253, 247, 254, + 256, 252, 132, 68, 68, 68, 251, 68, 68, 257, + 262, 260, 68, 68, 259, 68, 261, 263, 264, 68, + 68, 68, 255, 68, 268, 68, 258, 266, 68, 269, + 68, 265, 68, 270, 68, 68, 276, 273, 68, 271, + 272, 68, 274, 68, 275, 267, 68, 278, 68, 280, + + 281, 68, 68, 279, 68, 68, 68, 277, 68, 285, + 68, 289, 68, 68, 287, 290, 68, 68, 284, 282, + 68, 68, 68, 283, 286, 288, 68, 300, 68, 291, + 294, 68, 68, 298, 299, 68, 68, 292, 301, 296, + 293, 68, 68, 295, 297, 306, 68, 68, 68, 308, + 305, 68, 307, 302, 68, 311, 303, 304, 68, 68, + 68, 68, 68, 68, 313, 314, 309, 315, 68, 68, + 125, 321, 68, 68, 310, 316, 68, 320, 312, 317, + 68, 68, 318, 68, 319, 322, 327, 68, 325, 68, + 323, 68, 324, 132, 68, 326, 68, 68, 68, 372, + + 338, 329, 328, 68, 337, 330, 331, 68, 68, 68, + 68, 341, 345, 340, 339, 332, 343, 333, 334, 335, + 347, 68, 336, 68, 346, 68, 68, 342, 344, 68, + 348, 350, 351, 352, 68, 68, 68, 349, 68, 68, + 357, 68, 68, 68, 68, 358, 68, 68, 365, 353, + 354, 68, 355, 356, 68, 361, 363, 360, 68, 364, + 359, 367, 68, 68, 371, 123, 68, 366, 362, 368, + 68, 68, 373, 68, 369, 68, 370, 68, 68, 378, + 68, 68, 375, 374, 377, 68, 379, 376, 68, 381, + 68, 382, 68, 68, 68, 68, 68, 68, 68, 68, + + 68, 384, 68, 385, 390, 392, 380, 386, 391, 68, + 68, 68, 389, 383, 68, 68, 387, 388, 396, 68, + 393, 68, 68, 68, 398, 68, 68, 68, 408, 410, + 397, 394, 395, 68, 68, 412, 68, 399, 409, 407, + 68, 400, 68, 401, 68, 406, 68, 411, 402, 68, + 403, 68, 414, 68, 68, 415, 416, 68, 404, 420, + 68, 413, 68, 132, 417, 418, 421, 424, 405, 425, + 68, 68, 68, 68, 68, 419, 68, 423, 68, 422, + 429, 68, 426, 68, 68, 428, 432, 68, 430, 427, + 431, 68, 436, 68, 434, 437, 68, 438, 68, 433, + + 435, 132, 68, 439, 68, 440, 68, 441, 68, 68, + 68, 445, 68, 443, 444, 68, 68, 68, 449, 442, + 447, 446, 68, 68, 68, 68, 68, 450, 452, 448, + 68, 455, 68, 453, 457, 68, 130, 454, 451, 68, + 68, 458, 68, 459, 456, 68, 460, 68, 463, 68, + 462, 68, 464, 467, 68, 68, 68, 68, 68, 469, + 468, 68, 471, 466, 470, 465, 68, 68, 461, 68, + 68, 68, 474, 472, 475, 476, 68, 477, 479, 68, + 473, 478, 68, 68, 68, 480, 483, 481, 486, 68, + 484, 68, 68, 68, 485, 487, 68, 488, 68, 68, + + 68, 68, 482, 492, 68, 68, 497, 489, 68, 493, + 68, 68, 68, 499, 500, 490, 494, 68, 491, 68, + 496, 68, 495, 68, 502, 68, 68, 498, 501, 68, + 68, 68, 68, 506, 507, 509, 510, 503, 505, 508, + 68, 68, 504, 68, 132, 68, 68, 68, 512, 515, + 516, 68, 513, 68, 519, 517, 521, 68, 511, 514, + 68, 68, 520, 68, 522, 68, 68, 518, 68, 523, + 68, 68, 68, 525, 531, 528, 530, 529, 68, 68, + 68, 524, 68, 526, 68, 538, 68, 527, 68, 541, + 532, 68, 533, 542, 68, 534, 539, 545, 543, 68, + + 535, 68, 544, 68, 546, 68, 536, 537, 547, 540, + 68, 68, 68, 68, 552, 548, 68, 68, 68, 549, + 551, 556, 68, 555, 557, 68, 68, 558, 559, 68, + 550, 553, 68, 68, 561, 554, 68, 68, 68, 560, + 68, 566, 68, 564, 562, 68, 568, 565, 68, 68, + 68, 68, 570, 567, 68, 563, 68, 572, 68, 68, + 68, 68, 574, 68, 571, 577, 68, 569, 68, 573, + 575, 68, 68, 68, 68, 68, 583, 582, 68, 576, + 68, 68, 578, 579, 68, 591, 588, 586, 580, 68, + 68, 581, 584, 589, 585, 587, 592, 68, 590, 68, + + 68, 68, 68, 593, 68, 596, 68, 598, 594, 595, + 599, 68, 68, 603, 600, 68, 68, 68, 68, 605, + 68, 68, 601, 597, 68, 602, 606, 132, 608, 68, + 68, 68, 607, 68, 68, 617, 604, 68, 68, 68, + 609, 68, 625, 128, 611, 68, 68, 68, 618, 620, + 68, 624, 621, 610, 68, 623, 68, 612, 632, 613, + 622, 630, 619, 614, 631, 615, 68, 626, 68, 633, + 616, 68, 627, 68, 628, 68, 634, 68, 638, 68, + 68, 635, 640, 68, 639, 68, 641, 68, 68, 636, + 68, 68, 629, 68, 68, 644, 637, 68, 68, 68, + + 68, 643, 646, 648, 642, 68, 652, 68, 651, 127, + 645, 68, 68, 647, 650, 68, 68, 649, 68, 68, + 656, 657, 68, 658, 653, 654, 661, 655, 659, 68, + 660, 68, 662, 68, 68, 664, 663, 68, 665, 68, + 68, 68, 666, 670, 669, 68, 68, 68, 667, 68, + 671, 672, 68, 673, 676, 68, 68, 68, 675, 68, + 668, 68, 679, 68, 68, 674, 677, 68, 68, 68, + 68, 125, 68, 684, 678, 685, 68, 68, 68, 680, + 683, 687, 681, 688, 682, 690, 691, 686, 689, 68, + 68, 68, 692, 693, 68, 68, 697, 68, 68, 68, + + 68, 68, 68, 68, 68, 68, 68, 705, 694, 695, + 696, 699, 68, 68, 68, 698, 706, 702, 700, 703, + 708, 68, 68, 68, 68, 704, 701, 707, 709, 710, + 68, 68, 713, 714, 68, 68, 68, 68, 711, 68, + 68, 717, 68, 68, 716, 712, 68, 719, 68, 715, + 721, 68, 722, 68, 68, 723, 718, 68, 720, 68, + 68, 68, 68, 724, 733, 725, 729, 68, 68, 68, + 726, 732, 730, 68, 68, 727, 68, 728, 737, 68, + 123, 731, 734, 743, 735, 738, 68, 736, 68, 739, + 68, 68, 741, 740, 68, 742, 68, 744, 68, 745, + + 68, 747, 68, 746, 68, 750, 68, 752, 753, 749, + 68, 748, 68, 68, 68, 754, 68, 68, 755, 68, + 68, 68, 68, 761, 751, 756, 68, 68, 760, 68, + 757, 68, 758, 68, 759, 762, 764, 766, 68, 763, + 68, 767, 770, 68, 68, 765, 772, 68, 68, 768, + 68, 773, 68, 771, 68, 774, 776, 68, 769, 775, + 778, 68, 68, 68, 777, 780, 68, 779, 782, 68, + 68, 68, 781, 68, 785, 784, 68, 783, 68, 789, + 68, 790, 787, 68, 68, 788, 68, 792, 791, 786, + 68, 68, 68, 68, 796, 68, 68, 799, 68, 793, + + 797, 68, 68, 68, 795, 68, 68, 803, 68, 68, + 794, 68, 68, 68, 68, 68, 68, 808, 800, 798, + 809, 801, 68, 802, 810, 68, 807, 813, 804, 806, + 68, 68, 812, 814, 805, 816, 815, 68, 68, 811, + 68, 68, 68, 68, 68, 68, 68, 822, 817, 824, + 823, 68, 819, 68, 68, 820, 818, 828, 68, 68, + 821, 827, 826, 825, 830, 831, 832, 68, 833, 68, + 68, 68, 834, 68, 835, 829, 68, 837, 838, 840, + 68, 68, 839, 68, 68, 68, 68, 68, 68, 846, + 836, 68, 68, 845, 68, 68, 68, 68, 68, 68, + + 841, 68, 854, 842, 855, 844, 851, 847, 68, 68, + 848, 843, 856, 853, 849, 850, 68, 68, 852, 860, + 68, 68, 857, 68, 68, 858, 861, 862, 864, 68, + 68, 68, 867, 68, 868, 866, 68, 859, 68, 68, + 869, 68, 870, 68, 863, 68, 68, 865, 871, 68, + 872, 873, 68, 68, 878, 68, 68, 876, 68, 880, + 875, 68, 68, 874, 68, 68, 68, 68, 877, 883, + 68, 68, 885, 882, 68, 888, 879, 68, 68, 68, + 68, 892, 886, 881, 887, 884, 68, 68, 894, 68, + 68, 889, 893, 68, 897, 68, 898, 890, 891, 68, + + 895, 902, 68, 896, 899, 901, 68, 68, 903, 68, + 68, 900, 68, 68, 68, 68, 910, 68, 907, 68, + 909, 68, 68, 68, 911, 68, 68, 904, 68, 905, + 918, 68, 906, 68, 68, 68, 68, 908, 917, 912, + 915, 68, 913, 914, 68, 916, 68, 928, 919, 68, + 68, 920, 926, 923, 68, 921, 922, 68, 924, 927, + 68, 925, 929, 931, 68, 68, 930, 68, 936, 937, + 68, 68, 68, 68, 933, 68, 935, 934, 68, 68, + 68, 68, 944, 932, 68, 939, 68, 68, 68, 947, + 949, 938, 941, 940, 68, 68, 68, 68, 943, 953, + + 945, 68, 950, 952, 942, 946, 948, 68, 68, 956, + 954, 68, 68, 68, 960, 68, 955, 951, 68, 68, + 68, 68, 68, 68, 957, 964, 68, 965, 966, 68, + 958, 961, 959, 68, 967, 968, 962, 68, 971, 68, + 963, 68, 68, 975, 68, 68, 68, 68, 68, 979, + 68, 68, 970, 978, 973, 972, 969, 974, 976, 980, + 68, 68, 977, 982, 68, 68, 983, 68, 987, 68, + 981, 68, 984, 68, 989, 68, 990, 68, 991, 68, + 993, 68, 992, 68, 985, 68, 995, 986, 68, 997, + 68, 68, 999, 988, 68, 998, 68, 68, 68, 994, + + 68, 68, 68, 1007, 68, 68, 68, 1009, 1000, 68, + 1001, 1012, 68, 996, 68, 1002, 68, 68, 1003, 68, + 1004, 1005, 68, 1006, 68, 1011, 1014, 68, 1017, 1010, + 68, 1008, 1013, 1015, 68, 68, 1021, 68, 68, 1020, + 1016, 68, 1024, 68, 1023, 68, 1019, 1026, 1018, 68, + 1025, 68, 68, 68, 68, 1022, 68, 1033, 68, 68, + 1031, 1036, 68, 68, 68, 1032, 1028, 1039, 1030, 1027, + 1034, 1029, 68, 1040, 68, 1035, 1041, 1043, 1038, 68, + 1042, 68, 68, 68, 1037, 1046, 68, 68, 68, 68, + 68, 1048, 1051, 68, 1053, 1045, 68, 68, 1047, 68, + + 1049, 68, 1056, 68, 1055, 1044, 1057, 68, 1054, 68, + 68, 68, 68, 68, 1050, 1052, 1058, 1059, 1061, 1060, + 68, 1063, 68, 1062, 68, 68, 1068, 68, 68, 68, + 1070, 68, 1064, 1066, 1067, 68, 68, 1072, 1075, 68, + 1065, 1073, 1069, 1074, 68, 68, 1071, 68, 1077, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 1085, 68, + 1084, 68, 1079, 1080, 1081, 1076, 1398, 68, 1082, 68, + 1078, 1089, 68, 1088, 1083, 1086, 1087, 68, 68, 68, + 1092, 68, 1091, 68, 1093, 1097, 1094, 1090, 68, 1096, + 68, 68, 68, 1098, 1101, 68, 68, 68, 68, 1105, + + 68, 1095, 68, 68, 68, 68, 1100, 1106, 1102, 1103, + 1099, 68, 1104, 68, 1107, 68, 1108, 1110, 1109, 68, + 68, 1112, 68, 1111, 68, 1113, 1114, 1118, 68, 68, + 1115, 1120, 68, 1117, 68, 68, 68, 68, 1119, 1122, + 68, 1123, 1125, 68, 68, 68, 68, 1116, 1126, 1131, + 1124, 1128, 68, 1121, 1127, 68, 1129, 68, 1130, 68, + 68, 1132, 68, 68, 68, 1134, 68, 68, 68, 68, + 68, 1142, 68, 68, 1133, 1161, 1143, 68, 1146, 1140, + 68, 68, 1136, 1138, 1147, 68, 1148, 68, 1135, 1139, + 1137, 1141, 68, 1144, 1145, 1150, 68, 1151, 68, 68, + + 1153, 68, 1154, 68, 68, 1149, 68, 1157, 68, 68, + 68, 1156, 1159, 68, 68, 68, 68, 68, 1152, 1162, + 68, 1163, 1173, 1155, 1165, 68, 1167, 68, 1158, 1166, + 1168, 68, 1160, 68, 1170, 68, 1164, 68, 68, 68, + 68, 1169, 68, 68, 1171, 68, 68, 1177, 68, 1172, + 68, 1182, 1175, 68, 1179, 1180, 68, 1183, 1178, 68, + 68, 1176, 1181, 1174, 68, 1186, 1187, 68, 1185, 1398, + 1184, 68, 68, 1188, 68, 1190, 68, 1192, 68, 1191, + 1195, 1189, 68, 1193, 1194, 68, 68, 1197, 68, 1196, + 68, 68, 68, 68, 1203, 1198, 1200, 68, 1202, 68, + + 68, 68, 1199, 1204, 68, 68, 1206, 1208, 68, 1209, + 68, 1201, 1207, 1210, 68, 1211, 1205, 1212, 68, 1213, + 68, 1214, 68, 1215, 68, 68, 68, 68, 1219, 68, + 68, 68, 1218, 1221, 68, 1220, 68, 1224, 68, 68, + 1216, 1223, 1225, 68, 1226, 68, 68, 1217, 1222, 68, + 68, 1227, 68, 68, 68, 1234, 68, 1232, 68, 68, + 68, 1229, 1230, 68, 1228, 1231, 68, 1235, 68, 68, + 68, 68, 68, 68, 1233, 1242, 1238, 1243, 1244, 68, + 1237, 68, 1240, 68, 1246, 1236, 68, 1241, 1249, 1245, + 1239, 1247, 68, 68, 68, 1248, 68, 1254, 68, 1250, + + 1255, 68, 68, 68, 68, 68, 68, 1262, 68, 68, + 1252, 1251, 1261, 68, 68, 1253, 1256, 1265, 68, 68, + 68, 1257, 68, 1258, 1260, 1259, 1267, 68, 1263, 1268, + 68, 1271, 1264, 68, 1269, 68, 68, 68, 1266, 68, + 1272, 1273, 1270, 68, 68, 68, 68, 1275, 1398, 1277, + 1278, 1280, 68, 1281, 68, 1282, 1274, 68, 1276, 68, + 68, 1279, 1283, 68, 1284, 68, 68, 68, 68, 1286, + 1287, 1285, 1288, 68, 68, 1291, 68, 1289, 68, 68, + 1295, 68, 1290, 68, 68, 1292, 1297, 68, 68, 1299, + 68, 68, 1296, 1302, 68, 68, 1298, 1293, 1294, 1300, + + 68, 1304, 68, 68, 1301, 1305, 1306, 68, 1307, 68, + 1308, 68, 68, 1311, 68, 1303, 1312, 68, 68, 68, + 1314, 1309, 68, 1313, 68, 68, 1310, 68, 1318, 68, + 68, 68, 1316, 68, 68, 1320, 68, 68, 68, 68, + 1325, 1315, 1328, 1323, 1317, 1319, 1327, 68, 68, 68, + 68, 1321, 68, 68, 1334, 68, 1324, 1326, 1329, 1322, + 1331, 1330, 68, 68, 1335, 68, 68, 1333, 1336, 68, + 1340, 68, 68, 68, 1337, 1332, 68, 68, 68, 68, + 68, 1341, 1345, 68, 1339, 1338, 1344, 1348, 68, 1342, + 68, 68, 1350, 68, 68, 1343, 1349, 1353, 68, 1347, + + 1354, 68, 68, 1351, 68, 1346, 1358, 68, 68, 1360, + 68, 68, 1352, 1355, 1356, 68, 68, 1364, 68, 68, + 1359, 1363, 1365, 68, 1357, 1366, 68, 68, 1393, 1362, + 1361, 68, 1367, 1368, 68, 68, 1369, 1370, 68, 68, + 68, 1373, 68, 68, 1371, 68, 68, 68, 1372, 1383, + 1374, 1375, 1377, 68, 68, 1379, 68, 68, 1378, 1381, + 68, 1380, 1382, 1376, 1384, 68, 1385, 68, 1386, 68, + 1387, 68, 68, 68, 1389, 68, 68, 1392, 68, 1390, + 68, 68, 1398, 68, 1388, 1397, 68, 1398, 1398, 1398, + 1398, 1398, 1398, 1398, 1398, 1394, 1391, 1395, 1398, 1398, + + 1396, 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, 1398, 71, + 71, 71, 71, 122, 122, 1398, 1398, 1398, 122, 122, + 124, 124, 1398, 1398, 124, 1398, 124, 126, 1398, 1398, + 1398, 1398, 1398, 126, 129, 129, 1398, 1398, 1398, 129, + 129, 131, 1398, 1398, 1398, 1398, 1398, 131, 133, 133, + 1398, 133, 133, 133, 133, 72, 72, 1398, 72, 72, + 72, 72, 13, 1398, 1398, 1398, 1398, 1398, 1398, 1398, + + 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, + 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, + 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, + 1398, 1398 } ; -static yyconst flex_int16_t yy_chk[2800] = +static yyconst flex_int16_t yy_chk[2833] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1216,10 +1226,10 @@ static yyconst flex_int16_t yy_chk[2800] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 4, 4, 4, 49, 5, 5, 49, 3, 5, 15, 4, 6, 6, 15, 5, 6, 9, 9, - 9, 118, 33, 6, 7, 7, 7, 7, 9, 7, + 9, 149, 33, 6, 7, 7, 7, 7, 9, 7, 10, 10, 10, 44, 44, 7, 8, 8, 8, 8, - 10, 8, 21, 33, 118, 21, 21, 8, 11, 11, - 11, 11, 11, 11, 1388, 20, 29, 20, 20, 11, + 10, 8, 21, 33, 149, 21, 21, 8, 11, 11, + 11, 11, 11, 11, 1404, 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, @@ -1229,7 +1239,7 @@ static yyconst flex_int16_t yy_chk[2800] = 32, 32, 27, 75, 27, 32, 31, 75, 34, 30, 35, 76, 31, 39, 39, 35, 31, 34, 39, 36, 109, 32, 38, 34, 36, 35, 34, 93, 35, 37, - 37, 76, 37, 34, 36, 109, 38, 600, 36, 36, + 37, 76, 37, 34, 36, 109, 38, 606, 36, 36, 55, 38, 55, 55, 79, 55, 93, 37, 60, 60, 63, 78, 63, 63, 65, 63, 65, 65, 79, 65, @@ -1243,281 +1253,285 @@ static yyconst flex_int16_t yy_chk[2800] = 106, 94, 107, 108, 106, 102, 110, 112, 111, 113, 114, 114, 112, 103, 115, 117, 108, 105, 116, 119, - 121, 113, 107, 120, 119, 110, 111, 123, 123, 129, - 125, 114, 115, 125, 116, 120, 117, 127, 121, 127, - 127, 136, 127, 130, 130, 132, 136, 132, 132, 133, - 132, 133, 133, 135, 133, 138, 135, 137, 140, 141, - 133, 142, 137, 143, 144, 149, 142, 142, 143, 144, - 138, 146, 146, 140, 147, 128, 148, 152, 150, 141, - 145, 148, 150, 153, 145, 151, 155, 154, 149, 145, - 151, 152, 156, 147, 145, 157, 157, 156, 153, 154, - 145, 145, 154, 158, 155, 159, 160, 161, 161, 162, - 163, 160, 165, 164, 162, 163, 172, 174, 126, 166, - - 162, 159, 164, 158, 166, 167, 168, 169, 170, 176, - 167, 168, 169, 165, 171, 170, 172, 173, 175, 174, - 171, 177, 178, 173, 176, 179, 175, 178, 181, 184, - 180, 182, 183, 181, 183, 185, 184, 186, 187, 187, - 185, 177, 190, 191, 190, 188, 192, 179, 180, 180, - 188, 182, 189, 194, 193, 191, 186, 189, 194, 195, - 196, 190, 193, 197, 195, 192, 198, 199, 188, 200, - 201, 201, 200, 203, 198, 196, 202, 202, 204, 205, - 206, 197, 205, 208, 206, 207, 209, 213, 208, 203, - 210, 210, 199, 204, 207, 214, 211, 212, 215, 216, - - 209, 211, 212, 217, 217, 218, 219, 213, 220, 221, - 219, 226, 216, 214, 221, 222, 223, 224, 222, 215, - 220, 225, 227, 218, 228, 230, 230, 232, 223, 275, - 225, 233, 226, 275, 224, 227, 228, 224, 229, 231, - 229, 229, 231, 234, 232, 236, 233, 232, 235, 235, - 236, 238, 234, 237, 237, 239, 240, 241, 242, 243, - 244, 240, 243, 242, 243, 245, 238, 246, 247, 249, - 124, 250, 255, 247, 244, 239, 246, 241, 248, 251, - 253, 245, 252, 248, 245, 252, 245, 255, 256, 257, - 249, 250, 258, 251, 253, 260, 271, 256, 259, 262, - - 122, 252, 254, 261, 254, 254, 266, 263, 261, 264, - 257, 258, 271, 259, 254, 260, 254, 254, 254, 262, - 265, 254, 263, 267, 264, 265, 266, 268, 269, 269, - 270, 269, 268, 272, 273, 276, 274, 267, 274, 280, - 277, 281, 278, 279, 280, 281, 282, 67, 273, 272, - 270, 278, 279, 276, 277, 282, 283, 284, 285, 287, - 286, 283, 285, 284, 278, 286, 288, 288, 289, 290, - 291, 292, 287, 289, 293, 294, 294, 295, 293, 291, - 296, 300, 295, 292, 297, 297, 299, 299, 301, 302, - 290, 303, 305, 306, 307, 308, 301, 309, 302, 310, - - 308, 296, 300, 303, 310, 309, 311, 312, 307, 313, - 314, 315, 305, 306, 314, 316, 317, 318, 321, 320, - 316, 323, 333, 322, 311, 325, 315, 327, 322, 312, - 313, 333, 317, 322, 321, 330, 318, 319, 319, 320, - 328, 323, 327, 319, 329, 319, 324, 324, 326, 326, - 325, 331, 328, 319, 330, 332, 334, 335, 336, 329, - 332, 337, 336, 319, 338, 339, 337, 340, 341, 341, - 342, 430, 335, 331, 343, 334, 338, 345, 344, 430, - 340, 344, 342, 339, 346, 347, 343, 346, 348, 348, - 349, 349, 345, 354, 350, 351, 351, 353, 347, 350, - - 352, 352, 353, 355, 360, 356, 357, 363, 355, 356, - 359, 357, 358, 361, 354, 359, 358, 362, 361, 366, - 364, 363, 362, 364, 360, 365, 365, 368, 364, 367, - 369, 370, 364, 369, 367, 370, 368, 366, 371, 372, - 373, 375, 374, 371, 376, 373, 380, 378, 377, 376, - 378, 380, 372, 375, 377, 381, 379, 370, 374, 379, - 382, 383, 384, 385, 387, 384, 383, 386, 385, 387, - 388, 386, 386, 381, 382, 389, 390, 392, 389, 388, - 390, 390, 391, 393, 391, 393, 394, 395, 396, 397, - 398, 399, 404, 389, 398, 400, 392, 401, 402, 409, - - 399, 403, 405, 405, 394, 395, 403, 396, 406, 397, - 400, 404, 406, 402, 407, 401, 408, 410, 409, 407, - 411, 412, 413, 414, 416, 418, 412, 411, 414, 413, - 410, 415, 408, 417, 418, 419, 415, 423, 420, 431, - 417, 421, 416, 420, 421, 429, 422, 424, 424, 419, - 422, 427, 426, 428, 431, 427, 424, 426, 423, 434, - 437, 438, 439, 429, 443, 428, 439, 438, 440, 437, - 442, 445, 444, 440, 445, 442, 434, 441, 449, 441, - 447, 441, 443, 452, 441, 446, 446, 447, 452, 441, - 448, 448, 453, 449, 454, 441, 441, 444, 450, 450, - - 451, 455, 457, 451, 456, 456, 458, 460, 460, 455, - 459, 461, 453, 454, 462, 459, 461, 457, 463, 462, - 464, 463, 465, 466, 458, 467, 464, 468, 469, 471, - 465, 466, 468, 470, 470, 469, 472, 471, 473, 475, - 476, 472, 475, 467, 477, 477, 478, 479, 481, 483, - 479, 482, 484, 485, 476, 487, 482, 473, 479, 486, - 489, 478, 488, 490, 487, 491, 488, 492, 494, 481, - 483, 493, 484, 495, 491, 485, 498, 493, 489, 486, - 496, 492, 490, 501, 499, 496, 497, 495, 494, 500, - 497, 502, 502, 503, 500, 498, 499, 504, 503, 505, - - 504, 506, 507, 508, 501, 509, 509, 507, 510, 510, - 511, 512, 513, 514, 506, 512, 515, 505, 517, 518, - 519, 520, 517, 508, 544, 511, 521, 522, 523, 524, - 515, 513, 528, 544, 518, 524, 520, 514, 516, 525, - 521, 516, 523, 516, 525, 519, 528, 516, 522, 516, - 526, 526, 527, 529, 516, 532, 526, 527, 526, 530, - 530, 531, 534, 532, 533, 529, 531, 535, 535, 536, - 538, 539, 540, 536, 539, 538, 526, 541, 533, 542, - 543, 534, 545, 546, 542, 547, 548, 549, 546, 550, - 541, 540, 552, 554, 550, 553, 549, 555, 556, 543, - - 548, 545, 555, 556, 557, 547, 558, 560, 554, 557, - 566, 552, 560, 553, 562, 558, 559, 559, 562, 562, - 563, 563, 564, 565, 563, 564, 567, 568, 569, 567, - 566, 570, 576, 569, 571, 572, 570, 573, 565, 578, - 571, 574, 574, 573, 575, 579, 577, 580, 568, 577, - 576, 572, 581, 575, 582, 583, 584, 578, 585, 582, - 583, 585, 586, 587, 579, 581, 588, 580, 587, 589, - 591, 588, 592, 586, 584, 590, 590, 594, 593, 595, - 597, 594, 596, 598, 589, 602, 592, 601, 604, 591, - 593, 596, 603, 604, 612, 607, 608, 595, 605, 597, - - 602, 601, 606, 605, 610, 611, 609, 606, 598, 607, - 608, 609, 603, 612, 613, 613, 614, 615, 616, 610, - 611, 617, 618, 616, 619, 620, 615, 618, 621, 620, - 622, 623, 624, 625, 614, 626, 627, 621, 629, 630, - 617, 628, 631, 619, 624, 622, 623, 628, 634, 635, - 633, 631, 625, 629, 627, 633, 626, 635, 636, 630, - 637, 639, 634, 638, 640, 637, 641, 638, 638, 642, - 643, 643, 646, 646, 642, 641, 644, 640, 636, 645, - 639, 644, 647, 648, 645, 649, 650, 651, 648, 652, - 653, 647, 651, 654, 652, 653, 655, 654, 656, 649, - - 659, 660, 658, 661, 650, 655, 658, 662, 663, 656, - 655, 664, 655, 665, 655, 659, 663, 661, 666, 660, - 667, 667, 668, 669, 669, 664, 662, 671, 672, 673, - 671, 665, 675, 672, 674, 674, 677, 668, 676, 676, - 679, 677, 680, 666, 678, 678, 681, 680, 673, 683, - 682, 684, 675, 687, 681, 682, 685, 684, 687, 688, - 679, 689, 691, 685, 688, 690, 689, 683, 692, 693, - 690, 691, 694, 694, 695, 696, 697, 698, 700, 699, - 693, 697, 701, 701, 702, 703, 705, 692, 704, 709, - 706, 61, 713, 710, 695, 706, 700, 698, 696, 699, - - 711, 712, 715, 708, 702, 711, 704, 708, 708, 705, - 703, 710, 713, 714, 716, 709, 717, 714, 719, 712, - 715, 718, 720, 722, 721, 723, 724, 720, 722, 725, - 717, 721, 726, 716, 727, 724, 718, 719, 726, 735, - 728, 729, 730, 723, 725, 728, 729, 730, 731, 731, - 733, 733, 734, 735, 736, 727, 737, 734, 738, 738, - 737, 737, 739, 740, 741, 742, 743, 745, 746, 744, - 747, 749, 743, 736, 744, 748, 750, 751, 752, 752, - 755, 739, 740, 753, 742, 749, 745, 746, 753, 747, - 741, 754, 751, 755, 748, 754, 756, 750, 757, 758, - - 758, 759, 761, 760, 762, 756, 759, 760, 764, 762, - 766, 767, 767, 56, 768, 766, 770, 770, 757, 768, - 772, 772, 761, 776, 774, 777, 764, 774, 775, 775, - 778, 779, 780, 780, 781, 778, 782, 782, 776, 783, - 784, 785, 787, 786, 790, 785, 779, 787, 789, 792, - 777, 784, 791, 791, 781, 793, 794, 795, 790, 795, - 796, 783, 786, 797, 798, 796, 789, 799, 797, 792, - 800, 800, 801, 804, 803, 793, 794, 805, 801, 803, - 805, 799, 806, 808, 798, 807, 807, 806, 809, 810, - 811, 812, 813, 814, 814, 811, 817, 813, 804, 815, - - 816, 808, 818, 819, 815, 822, 821, 809, 820, 810, - 822, 823, 824, 825, 812, 827, 817, 819, 816, 821, - 820, 828, 818, 830, 829, 833, 833, 836, 828, 838, - 827, 823, 824, 829, 825, 834, 829, 835, 834, 830, - 837, 839, 835, 836, 843, 840, 841, 844, 838, 837, - 839, 841, 845, 839, 840, 842, 842, 846, 847, 848, - 844, 849, 849, 850, 843, 857, 851, 853, 854, 855, - 845, 846, 853, 858, 855, 856, 859, 848, 858, 850, - 863, 856, 864, 847, 851, 857, 854, 860, 863, 859, - 860, 865, 866, 870, 867, 864, 860, 868, 871, 872, - - 873, 874, 871, 875, 872, 873, 874, 876, 877, 865, - 867, 866, 875, 870, 879, 868, 878, 878, 884, 880, - 881, 882, 883, 877, 886, 886, 882, 885, 879, 892, - 876, 880, 881, 885, 883, 889, 884, 887, 887, 890, - 890, 891, 893, 894, 889, 896, 891, 895, 895, 903, - 892, 897, 897, 898, 898, 899, 900, 902, 905, 900, - 899, 893, 902, 894, 904, 896, 909, 903, 910, 904, - 906, 906, 907, 907, 908, 911, 912, 913, 909, 908, - 909, 914, 914, 905, 915, 909, 916, 916, 910, 917, - 919, 920, 920, 921, 922, 911, 912, 923, 913, 919, - - 924, 922, 925, 925, 926, 927, 923, 929, 921, 917, - 915, 930, 929, 931, 934, 932, 930, 933, 933, 934, - 935, 927, 932, 936, 937, 938, 924, 939, 940, 935, - 926, 941, 51, 931, 940, 942, 942, 943, 945, 937, - 941, 946, 939, 936, 938, 944, 944, 947, 943, 948, - 948, 951, 947, 943, 953, 946, 949, 950, 955, 945, - 949, 949, 950, 951, 952, 956, 953, 954, 957, 952, - 955, 954, 958, 957, 959, 960, 985, 962, 985, 959, - 962, 963, 963, 964, 964, 965, 967, 960, 966, 968, - 956, 965, 967, 966, 958, 971, 973, 973, 968, 974, - - 975, 976, 978, 978, 981, 983, 982, 971, 973, 975, - 976, 982, 984, 984, 986, 986, 988, 974, 981, 989, - 990, 990, 983, 988, 991, 992, 993, 995, 994, 996, - 998, 999, 1000, 999, 1001, 998, 1005, 992, 993, 989, - 994, 1003, 995, 1001, 1011, 991, 1004, 1004, 1006, 996, - 1000, 1008, 1007, 1006, 1007, 1003, 1008, 1010, 1009, 1015, - 1012, 1013, 1005, 1009, 1011, 1012, 1013, 1016, 1017, 1017, - 1018, 1019, 1020, 1028, 1020, 1010, 1021, 1022, 1015, 1024, - 1019, 1016, 1018, 1019, 1024, 1021, 1025, 1027, 1029, 1022, - 1031, 1025, 1033, 1028, 1034, 1039, 1031, 1035, 1033, 1037, - - 1027, 1036, 1036, 1040, 1029, 1042, 1035, 1040, 1037, 1038, - 1038, 1041, 1043, 1043, 1039, 1044, 1041, 1047, 1042, 1034, - 1048, 1048, 1050, 1044, 1049, 1049, 1047, 1051, 1053, 1052, - 1054, 1055, 1051, 1052, 1050, 1054, 1056, 1058, 1060, 1059, - 1061, 1062, 1084, 1053, 1064, 1064, 1065, 1066, 1084, 1065, - 1067, 50, 1061, 1068, 1068, 1056, 1071, 1055, 1059, 1060, - 1066, 1058, 1062, 1067, 1069, 1069, 1070, 1070, 1074, 1071, - 1072, 1072, 1073, 1073, 1075, 1075, 1076, 1076, 1077, 1079, - 1080, 1080, 1081, 1088, 1079, 1082, 1082, 1074, 1083, 1085, - 1087, 1087, 1085, 1086, 1086, 1089, 1089, 1077, 1091, 1091, - - 1092, 1081, 1088, 1093, 1093, 1094, 1083, 1095, 1096, 1086, - 1097, 1098, 1099, 1096, 1094, 1100, 1101, 1104, 1102, 1095, - 1100, 1103, 1104, 1107, 1098, 1105, 1092, 1102, 1109, 1105, - 1103, 1101, 1114, 1099, 1115, 1097, 1111, 1109, 1110, 1110, - 1172, 1111, 1131, 1107, 1112, 1112, 1115, 1114, 1117, 1118, - 1124, 1117, 1126, 1112, 1118, 1119, 1119, 1120, 1131, 1121, - 1123, 1120, 1121, 1122, 1122, 1123, 1172, 1125, 1127, 1128, - 1124, 1125, 1126, 1127, 1128, 1129, 1133, 1132, 1134, 1151, - 1134, 1129, 1132, 1150, 1133, 1137, 1137, 1140, 1140, 1143, - 1144, 1144, 1146, 1146, 1143, 1148, 1149, 1149, 1152, 1150, - - 1148, 1151, 1157, 1152, 1154, 1154, 1158, 1157, 1158, 1159, - 1160, 1161, 1161, 1162, 1162, 1160, 1163, 1163, 1164, 1165, - 1166, 1167, 1168, 1159, 1169, 1170, 1170, 1171, 1173, 1174, - 1164, 1175, 1166, 1167, 1168, 1176, 1171, 1165, 1177, 1182, - 1178, 1179, 1174, 1188, 1169, 1178, 1179, 1187, 1173, 1176, - 1180, 1180, 1183, 1183, 1186, 1175, 1177, 1182, 1185, 1185, - 1189, 1188, 1187, 1186, 1190, 1191, 1192, 1192, 1193, 1195, - 1194, 1196, 1201, 1193, 1198, 1204, 1202, 1205, 1189, 1202, - 1190, 1203, 1203, 1208, 1191, 1194, 1207, 1207, 1195, 1215, - 1204, 1196, 1201, 1198, 1216, 1205, 1209, 1209, 1210, 1210, - - 1214, 1214, 1208, 1216, 1217, 1218, 1219, 1221, 1222, 1217, - 1218, 1215, 1223, 1222, 1219, 1224, 45, 1223, 1225, 1225, - 1226, 1226, 1221, 1227, 1228, 1228, 1229, 1229, 1227, 1231, - 1224, 1232, 1234, 1235, 1231, 1234, 1236, 1241, 1237, 1238, - 1238, 1239, 1242, 1232, 1244, 1236, 1235, 1237, 1243, 1243, - 1239, 1245, 1245, 1244, 1246, 1247, 1241, 1249, 1250, 1255, - 1247, 1242, 1246, 1252, 1252, 1260, 1249, 1256, 1256, 1257, - 1261, 1250, 1257, 1258, 1258, 1259, 1259, 1262, 1270, 1255, - 1263, 1263, 1262, 1260, 1261, 1264, 1267, 1271, 1272, 1264, - 1273, 1273, 1267, 1274, 1275, 1271, 1276, 1270, 1277, 1275, - - 1279, 1278, 1281, 1283, 1285, 1281, 1286, 1272, 1285, 1274, - 1278, 1284, 1284, 1288, 1289, 1286, 1276, 1290, 1293, 1307, - 1279, 1283, 1288, 1293, 1277, 1295, 1289, 1294, 1294, 1298, - 1297, 1299, 1300, 1303, 1295, 1297, 1301, 1301, 1298, 1302, - 1304, 1306, 1290, 1305, 1308, 1307, 1306, 1300, 1302, 1303, - 1299, 1305, 1309, 1309, 1313, 1310, 1312, 1312, 1314, 1304, - 1310, 1315, 1315, 1308, 1316, 1316, 1317, 1318, 1319, 1320, - 1320, 1321, 1322, 1322, 1313, 1323, 1325, 1326, 40, 1318, - 1314, 14, 1326, 1321, 1330, 1317, 1327, 1327, 1319, 1330, - 1325, 1328, 1328, 1345, 1323, 1329, 1329, 1331, 1331, 1333, - - 1333, 1335, 1335, 1336, 1339, 1340, 1340, 1347, 1336, 1341, - 1343, 1347, 1339, 1345, 1341, 1343, 1346, 1346, 1351, 1351, - 1353, 1355, 1355, 1356, 1353, 1358, 1359, 1359, 1360, 1360, - 1362, 1362, 1364, 1364, 1366, 1367, 1367, 1372, 1356, 1373, - 1375, 1372, 1377, 1358, 1374, 1374, 1366, 1378, 1379, 1375, - 1380, 1380, 13, 0, 0, 0, 0, 1377, 0, 1373, - 0, 1378, 0, 0, 0, 0, 0, 1379, 1383, 1383, - 1383, 1383, 1383, 1383, 1383, 1384, 1384, 1384, 1384, 1384, - 1384, 1384, 1385, 1385, 1385, 1385, 1385, 1385, 1385, 1386, - 1386, 1386, 1386, 1386, 1386, 1386, 1387, 1387, 1387, 1387, - - 1387, 1387, 1387, 1389, 1389, 0, 1389, 1389, 1389, 1389, - 1390, 1390, 0, 0, 0, 1390, 1390, 1391, 1391, 0, - 0, 1391, 0, 1391, 1392, 0, 0, 0, 0, 0, - 1392, 1393, 1393, 0, 0, 0, 1393, 1393, 1394, 0, - 0, 0, 0, 0, 1394, 1395, 1395, 0, 1395, 1395, - 1395, 1395, 1396, 1396, 0, 1396, 1396, 1396, 1396, 1382, - 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, - 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, - 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, - 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382 - + 121, 113, 107, 120, 119, 110, 111, 118, 164, 118, + 125, 114, 115, 125, 116, 120, 117, 164, 121, 123, + 123, 127, 135, 127, 127, 135, 127, 130, 130, 132, + 118, 132, 132, 133, 132, 133, 133, 136, 133, 138, + 137, 140, 136, 141, 133, 137, 142, 147, 143, 165, + 144, 142, 142, 143, 138, 144, 140, 146, 146, 129, + 148, 152, 153, 141, 145, 148, 147, 150, 145, 151, + 165, 150, 155, 145, 151, 152, 154, 153, 145, 157, + 157, 156, 158, 159, 145, 145, 156, 160, 154, 128, + 155, 154, 160, 161, 161, 162, 163, 174, 166, 159, + + 162, 163, 158, 166, 167, 168, 162, 169, 170, 167, + 168, 171, 169, 172, 173, 170, 175, 171, 177, 174, + 173, 176, 178, 179, 175, 180, 181, 178, 182, 126, + 183, 181, 183, 172, 184, 185, 176, 186, 177, 187, + 185, 184, 193, 180, 180, 179, 188, 188, 182, 189, + 190, 187, 192, 197, 189, 190, 186, 191, 194, 191, + 195, 193, 196, 198, 192, 195, 194, 196, 197, 199, + 200, 201, 189, 204, 201, 205, 191, 199, 202, 202, + 214, 198, 203, 203, 206, 208, 209, 206, 207, 204, + 205, 209, 207, 210, 208, 200, 211, 211, 212, 213, + + 214, 215, 216, 212, 213, 217, 219, 210, 218, 218, + 220, 222, 223, 221, 220, 223, 222, 224, 217, 215, + 225, 226, 227, 216, 219, 221, 228, 231, 231, 224, + 226, 230, 229, 230, 230, 232, 233, 225, 232, 228, + 225, 235, 234, 227, 229, 236, 236, 237, 238, 238, + 235, 239, 237, 233, 240, 241, 233, 234, 242, 243, + 241, 245, 244, 246, 243, 244, 239, 244, 247, 250, + 124, 248, 251, 252, 240, 245, 248, 247, 242, 246, + 249, 253, 246, 254, 246, 249, 254, 255, 252, 257, + 250, 258, 251, 259, 260, 253, 261, 265, 290, 290, + + 258, 255, 254, 256, 257, 256, 256, 262, 264, 266, + 268, 261, 265, 260, 259, 256, 263, 256, 256, 256, + 267, 263, 256, 269, 266, 267, 270, 262, 264, 272, + 268, 270, 271, 271, 273, 271, 274, 269, 276, 275, + 276, 277, 278, 279, 283, 277, 280, 281, 283, 272, + 273, 289, 274, 275, 282, 280, 281, 279, 284, 282, + 278, 285, 292, 286, 289, 122, 285, 284, 280, 286, + 287, 288, 291, 293, 287, 294, 288, 291, 296, 296, + 295, 297, 293, 292, 295, 298, 297, 294, 299, 299, + 301, 301, 302, 303, 304, 305, 307, 308, 309, 310, + + 311, 303, 313, 304, 310, 312, 298, 305, 311, 314, + 312, 315, 309, 302, 316, 317, 307, 308, 316, 318, + 313, 319, 320, 323, 318, 322, 325, 326, 324, 325, + 317, 314, 315, 324, 327, 327, 328, 319, 324, 323, + 330, 320, 321, 321, 331, 322, 333, 326, 321, 332, + 321, 329, 329, 334, 335, 330, 331, 336, 321, 335, + 337, 328, 338, 339, 332, 333, 336, 339, 321, 340, + 341, 342, 343, 67, 340, 334, 345, 338, 346, 337, + 344, 344, 341, 347, 348, 343, 347, 350, 345, 342, + 346, 349, 351, 351, 349, 352, 352, 353, 357, 348, + + 350, 61, 353, 354, 354, 355, 355, 356, 358, 363, + 359, 360, 356, 358, 359, 362, 360, 361, 364, 357, + 362, 361, 365, 364, 366, 367, 369, 365, 367, 363, + 368, 368, 371, 367, 370, 375, 56, 367, 366, 370, + 372, 371, 373, 372, 369, 374, 373, 376, 375, 377, + 374, 378, 376, 379, 380, 384, 381, 383, 379, 381, + 380, 382, 383, 378, 382, 377, 385, 386, 373, 395, + 388, 387, 386, 384, 387, 388, 391, 389, 390, 397, + 385, 389, 389, 390, 392, 391, 393, 392, 395, 398, + 393, 393, 394, 396, 394, 396, 399, 397, 400, 401, + + 402, 403, 392, 401, 404, 405, 406, 398, 407, 402, + 409, 406, 408, 408, 409, 399, 403, 410, 400, 411, + 405, 412, 404, 413, 411, 414, 415, 407, 410, 416, + 418, 419, 417, 415, 416, 418, 419, 412, 414, 417, + 420, 421, 413, 422, 424, 423, 427, 425, 421, 424, + 425, 426, 422, 428, 428, 426, 430, 432, 420, 423, + 431, 430, 428, 433, 431, 434, 441, 427, 435, 432, + 438, 442, 443, 434, 444, 441, 443, 442, 447, 444, + 446, 433, 453, 435, 448, 446, 449, 438, 445, 449, + 445, 451, 445, 450, 450, 445, 447, 453, 451, 457, + + 445, 452, 452, 454, 454, 455, 445, 445, 455, 448, + 456, 458, 459, 460, 460, 456, 461, 462, 463, 457, + 459, 464, 464, 463, 465, 467, 469, 466, 467, 465, + 458, 461, 466, 468, 469, 462, 470, 471, 472, 468, + 473, 474, 474, 472, 470, 475, 476, 473, 477, 479, + 480, 476, 479, 475, 482, 471, 481, 481, 485, 483, + 486, 487, 483, 488, 480, 486, 489, 477, 491, 482, + 483, 490, 492, 498, 493, 494, 492, 491, 495, 485, + 497, 496, 487, 488, 499, 500, 497, 495, 489, 503, + 500, 490, 493, 498, 494, 496, 501, 504, 499, 502, + + 505, 501, 506, 502, 510, 505, 507, 507, 503, 504, + 508, 509, 511, 512, 509, 508, 513, 516, 512, 514, + 514, 518, 510, 506, 517, 511, 515, 515, 517, 519, + 520, 522, 516, 523, 525, 522, 513, 524, 526, 527, + 518, 528, 530, 51, 520, 529, 534, 530, 523, 525, + 533, 529, 526, 519, 521, 528, 532, 521, 534, 521, + 527, 532, 524, 521, 533, 521, 531, 531, 535, 535, + 521, 536, 531, 537, 531, 538, 536, 539, 540, 540, + 541, 537, 543, 544, 541, 545, 544, 543, 546, 538, + 547, 548, 531, 549, 550, 547, 539, 552, 551, 554, + + 553, 546, 549, 551, 545, 557, 555, 558, 554, 50, + 548, 555, 559, 550, 553, 560, 561, 552, 562, 563, + 560, 561, 573, 562, 557, 558, 565, 559, 563, 564, + 564, 565, 567, 570, 568, 568, 567, 567, 568, 569, + 571, 572, 569, 573, 572, 574, 575, 576, 570, 577, + 574, 575, 578, 576, 579, 579, 581, 580, 578, 582, + 571, 583, 582, 584, 585, 577, 580, 586, 587, 589, + 588, 45, 591, 587, 581, 588, 592, 595, 590, 583, + 586, 590, 584, 591, 585, 593, 594, 589, 592, 597, + 593, 594, 595, 596, 596, 598, 600, 601, 599, 603, + + 600, 604, 602, 607, 608, 609, 613, 610, 597, 598, + 599, 602, 610, 618, 614, 601, 611, 607, 603, 608, + 613, 611, 612, 616, 615, 609, 604, 612, 614, 615, + 617, 620, 618, 619, 619, 621, 622, 623, 616, 625, + 628, 622, 624, 627, 621, 617, 626, 624, 629, 620, + 626, 631, 627, 630, 632, 628, 623, 635, 625, 633, + 634, 636, 637, 629, 639, 630, 634, 642, 640, 639, + 631, 637, 635, 643, 645, 632, 641, 633, 643, 646, + 40, 636, 640, 648, 641, 644, 647, 642, 648, 644, + 644, 655, 646, 645, 650, 647, 649, 649, 651, 650, + + 652, 652, 653, 651, 654, 655, 656, 657, 658, 654, + 659, 653, 657, 658, 660, 659, 661, 662, 660, 664, + 665, 666, 667, 664, 656, 661, 668, 670, 662, 669, + 661, 671, 661, 672, 661, 665, 667, 669, 674, 666, + 679, 670, 673, 673, 681, 668, 675, 675, 677, 671, + 678, 677, 685, 674, 14, 678, 680, 680, 672, 679, + 682, 682, 683, 686, 681, 684, 684, 683, 686, 687, + 688, 690, 685, 689, 689, 688, 691, 687, 692, 694, + 702, 695, 691, 696, 694, 692, 695, 697, 696, 690, + 698, 699, 697, 700, 701, 701, 703, 704, 705, 698, + + 702, 706, 704, 712, 700, 707, 708, 708, 709, 710, + 699, 711, 713, 716, 717, 719, 720, 713, 705, 703, + 715, 706, 718, 707, 715, 715, 712, 718, 709, 711, + 722, 721, 717, 719, 710, 721, 720, 723, 724, 716, + 725, 726, 727, 728, 729, 730, 732, 727, 722, 729, + 728, 733, 724, 731, 734, 725, 723, 733, 743, 735, + 726, 732, 731, 730, 735, 736, 737, 738, 738, 741, + 736, 737, 740, 740, 741, 734, 742, 743, 744, 745, + 745, 746, 744, 744, 747, 748, 749, 750, 752, 751, + 742, 753, 756, 750, 751, 754, 755, 757, 758, 760, + + 746, 759, 759, 747, 760, 749, 756, 752, 761, 762, + 753, 748, 761, 758, 754, 755, 763, 764, 757, 765, + 765, 766, 762, 767, 768, 763, 766, 767, 769, 771, + 773, 774, 774, 769, 775, 773, 783, 764, 784, 775, + 777, 777, 779, 779, 768, 781, 785, 771, 781, 782, + 782, 783, 786, 787, 788, 788, 789, 786, 790, 790, + 785, 791, 792, 784, 797, 793, 794, 795, 787, 793, + 798, 800, 795, 792, 799, 799, 789, 801, 802, 803, + 806, 803, 797, 791, 798, 794, 812, 804, 805, 807, + 809, 800, 804, 805, 808, 808, 809, 801, 802, 811, + + 806, 814, 813, 807, 811, 813, 814, 815, 815, 816, + 817, 812, 818, 819, 820, 821, 822, 822, 819, 823, + 821, 824, 825, 826, 823, 829, 827, 816, 831, 817, + 830, 832, 818, 828, 833, 830, 838, 820, 829, 824, + 827, 835, 825, 826, 842, 828, 836, 842, 831, 837, + 844, 832, 838, 836, 845, 833, 835, 843, 837, 841, + 841, 837, 843, 845, 846, 847, 844, 848, 849, 850, + 850, 851, 852, 849, 847, 853, 848, 847, 854, 855, + 856, 857, 857, 846, 858, 852, 867, 859, 862, 861, + 863, 851, 854, 853, 861, 863, 864, 865, 856, 867, + + 858, 871, 864, 866, 855, 859, 862, 868, 866, 871, + 868, 872, 873, 874, 875, 876, 868, 865, 877, 875, + 879, 880, 881, 882, 872, 880, 884, 881, 882, 883, + 873, 876, 874, 885, 883, 884, 877, 886, 887, 887, + 879, 888, 889, 891, 893, 890, 892, 894, 891, 895, + 895, 901, 886, 894, 889, 888, 885, 890, 892, 896, + 896, 898, 893, 899, 899, 902, 900, 903, 904, 904, + 898, 900, 901, 905, 906, 906, 907, 907, 908, 909, + 911, 912, 909, 908, 902, 911, 913, 903, 914, 915, + 915, 913, 917, 905, 916, 916, 918, 917, 919, 912, + + 920, 921, 922, 923, 923, 924, 925, 925, 918, 926, + 918, 929, 929, 914, 933, 918, 928, 930, 919, 931, + 920, 921, 935, 922, 932, 928, 931, 934, 934, 926, + 936, 924, 930, 932, 938, 940, 939, 941, 944, 938, + 933, 939, 942, 942, 941, 943, 936, 944, 935, 945, + 943, 946, 947, 948, 949, 940, 950, 951, 951, 952, + 949, 953, 953, 954, 955, 950, 946, 956, 948, 945, + 952, 947, 956, 957, 957, 952, 958, 959, 955, 960, + 958, 958, 959, 961, 954, 962, 963, 964, 965, 966, + 962, 964, 967, 968, 969, 961, 970, 967, 963, 969, + + 965, 972, 973, 973, 972, 960, 974, 974, 970, 978, + 975, 981, 976, 977, 966, 968, 975, 976, 978, 977, + 983, 983, 984, 981, 985, 986, 988, 988, 991, 993, + 992, 998, 983, 985, 986, 992, 994, 994, 998, 995, + 984, 995, 991, 996, 996, 999, 993, 1000, 1000, 1001, + 1002, 1003, 1004, 1005, 1006, 1008, 1009, 1010, 1009, 1013, + 1008, 1015, 1002, 1003, 1004, 999, 13, 1011, 1005, 1021, + 1001, 1014, 1014, 1013, 1006, 1010, 1011, 1016, 1017, 1018, + 1017, 1019, 1016, 1020, 1018, 1022, 1019, 1015, 1023, 1021, + 1022, 1025, 1026, 1023, 1027, 1027, 1028, 1030, 1031, 1030, + + 1029, 1020, 1032, 1038, 1037, 1039, 1026, 1031, 1028, 1029, + 1025, 1034, 1029, 1035, 1032, 1044, 1034, 1037, 1035, 1041, + 1043, 1039, 1045, 1038, 1046, 1041, 1043, 1047, 1047, 1048, + 1044, 1049, 1049, 1046, 1050, 1051, 1052, 1053, 1048, 1051, + 1055, 1052, 1054, 1054, 1062, 1058, 1061, 1045, 1055, 1062, + 1053, 1059, 1059, 1050, 1058, 1060, 1060, 1063, 1061, 1064, + 1065, 1063, 1066, 1067, 1070, 1065, 1069, 1072, 1071, 1095, + 1073, 1075, 1075, 1076, 1064, 1095, 1076, 1079, 1079, 1072, + 1077, 1078, 1067, 1070, 1080, 1080, 1081, 1081, 1066, 1071, + 1069, 1073, 1082, 1077, 1078, 1083, 1083, 1084, 1084, 1085, + + 1086, 1086, 1087, 1087, 1088, 1082, 1090, 1091, 1091, 1092, + 1099, 1090, 1093, 1093, 1094, 1103, 1096, 1107, 1085, 1096, + 1097, 1097, 1107, 1088, 1098, 1098, 1100, 1100, 1092, 1099, + 1102, 1102, 1094, 1104, 1104, 1105, 1097, 1106, 1108, 1109, + 1110, 1103, 1111, 1112, 1105, 1113, 1114, 1111, 1115, 1106, + 1119, 1116, 1109, 1117, 1113, 1114, 1116, 1117, 1112, 1121, + 1126, 1110, 1115, 1108, 1122, 1122, 1123, 1127, 1121, 0, + 1119, 1123, 1124, 1124, 1129, 1126, 1132, 1129, 1130, 1127, + 1132, 1124, 1136, 1130, 1131, 1131, 1133, 1134, 1134, 1133, + 1135, 1138, 1137, 1139, 1140, 1135, 1137, 1141, 1139, 1140, + + 1143, 1144, 1136, 1141, 1145, 1146, 1144, 1146, 1149, 1149, + 1155, 1138, 1145, 1152, 1152, 1155, 1143, 1156, 1156, 1158, + 1158, 1160, 1161, 1161, 1162, 1163, 1160, 1164, 1166, 1166, + 1169, 1170, 1164, 1170, 1171, 1169, 1172, 1173, 1173, 1176, + 1162, 1172, 1174, 1174, 1175, 1175, 1177, 1163, 1171, 1178, + 1179, 1176, 1181, 1180, 1182, 1183, 1183, 1181, 1184, 1185, + 1186, 1178, 1179, 1187, 1177, 1180, 1188, 1184, 1189, 1190, + 1191, 1195, 1192, 1200, 1182, 1191, 1187, 1192, 1193, 1193, + 1186, 1201, 1189, 1196, 1196, 1185, 1199, 1190, 1200, 1195, + 1188, 1198, 1198, 1202, 1203, 1199, 1204, 1205, 1205, 1201, + + 1206, 1207, 1208, 1209, 1214, 1206, 1211, 1216, 1216, 1215, + 1203, 1202, 1215, 1217, 1218, 1204, 1207, 1220, 1220, 1221, + 1228, 1208, 1229, 1209, 1214, 1211, 1222, 1222, 1217, 1223, + 1223, 1229, 1218, 1227, 1227, 1230, 1231, 1232, 1221, 1233, + 1230, 1231, 1228, 1235, 1236, 1237, 1238, 1233, 0, 1236, + 1237, 1239, 1239, 1240, 1240, 1241, 1232, 1246, 1235, 1249, + 1241, 1238, 1242, 1242, 1243, 1243, 1245, 1248, 1250, 1246, + 1248, 1245, 1249, 1251, 1252, 1252, 1253, 1250, 1255, 1256, + 1257, 1257, 1251, 1258, 1261, 1253, 1259, 1259, 1260, 1261, + 1263, 1264, 1258, 1266, 1266, 1269, 1260, 1255, 1256, 1263, + + 1270, 1270, 1271, 1275, 1264, 1271, 1272, 1272, 1273, 1273, + 1274, 1274, 1276, 1277, 1282, 1269, 1278, 1278, 1277, 1279, + 1282, 1275, 1285, 1279, 1286, 1287, 1276, 1288, 1288, 1289, + 1290, 1291, 1286, 1292, 1293, 1290, 1294, 1296, 1300, 1298, + 1296, 1285, 1300, 1293, 1287, 1289, 1299, 1299, 1304, 1301, + 1305, 1291, 1303, 1310, 1310, 1311, 1294, 1298, 1301, 1292, + 1304, 1303, 1309, 1313, 1311, 1314, 1315, 1309, 1313, 1316, + 1317, 1317, 1318, 1319, 1314, 1305, 1320, 1322, 1321, 1323, + 1324, 1318, 1322, 1329, 1316, 1315, 1321, 1325, 1325, 1319, + 1330, 1326, 1328, 1328, 1333, 1320, 1326, 1331, 1331, 1324, + + 1332, 1332, 1334, 1329, 1335, 1323, 1336, 1336, 1337, 1338, + 1338, 1339, 1330, 1333, 1334, 1341, 1342, 1343, 1343, 1391, + 1337, 1342, 1344, 1344, 1335, 1345, 1345, 1346, 1391, 1341, + 1339, 1374, 1346, 1347, 1347, 1349, 1349, 1351, 1351, 1352, + 1355, 1356, 1356, 1361, 1352, 1357, 1359, 1372, 1355, 1374, + 1357, 1359, 1362, 1362, 1363, 1367, 1367, 1369, 1363, 1371, + 1371, 1369, 1372, 1361, 1375, 1375, 1376, 1376, 1378, 1378, + 1380, 1380, 1382, 1383, 1383, 1388, 1389, 1390, 1390, 1388, + 1393, 1395, 0, 1394, 1382, 1396, 1396, 0, 0, 0, + 0, 0, 0, 0, 0, 1393, 1389, 1394, 0, 0, + + 1395, 1399, 1399, 1399, 1399, 1399, 1399, 1399, 1400, 1400, + 1400, 1400, 1400, 1400, 1400, 1401, 1401, 1401, 1401, 1401, + 1401, 1401, 1402, 1402, 1402, 1402, 1402, 1402, 1402, 1403, + 1403, 1403, 1403, 1403, 1403, 1403, 1405, 1405, 0, 1405, + 1405, 1405, 1405, 1406, 1406, 0, 0, 0, 1406, 1406, + 1407, 1407, 0, 0, 1407, 0, 1407, 1408, 0, 0, + 0, 0, 0, 1408, 1409, 1409, 0, 0, 0, 1409, + 1409, 1410, 0, 0, 0, 0, 0, 1410, 1411, 1411, + 0, 1411, 1411, 1411, 1411, 1412, 1412, 0, 1412, 1412, + 1412, 1412, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, + + 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, + 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, + 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, 1398, + 1398, 1398 } ; static yy_state_type yy_last_accepting_state; @@ -1956,13 +1970,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 >= 1383 ) + if ( yy_current_state >= 1399 ) 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] != 2760 ); + while ( yy_base[yy_current_state] != 2793 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2424,79 +2438,83 @@ YY_RULE_SETUP YY_BREAK case 109: YY_RULE_SETUP -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } YY_BREAK case 110: YY_RULE_SETUP -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 111: YY_RULE_SETUP -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 112: YY_RULE_SETUP -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 113: YY_RULE_SETUP -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 114: YY_RULE_SETUP -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 115: YY_RULE_SETUP -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 116: YY_RULE_SETUP -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 117: YY_RULE_SETUP -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 118: YY_RULE_SETUP -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 119: YY_RULE_SETUP -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 120: YY_RULE_SETUP -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 121: YY_RULE_SETUP -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 122: YY_RULE_SETUP -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 123: YY_RULE_SETUP -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 124: YY_RULE_SETUP -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 125: YY_RULE_SETUP -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 126: -/* rule 126 can match eol */ +YY_RULE_SETUP +{ YDVAR(1, VAR_MAX_UDP_SIZE) } + YY_BREAK +case 127: +/* rule 127 can match eol */ YY_RULE_SETUP { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 127: +case 128: YY_RULE_SETUP { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK @@ -2507,17 +2525,17 @@ case YY_STATE_EOF(quotedstring): else { BEGIN(val); } } YY_BREAK -case 128: +case 129: YY_RULE_SETUP { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 129: -/* rule 129 can match eol */ +case 130: +/* rule 130 can match eol */ YY_RULE_SETUP { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 130: +case 131: YY_RULE_SETUP { LEXOUT(("QE ")); @@ -2531,7 +2549,7 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 131: +case 132: YY_RULE_SETUP { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK @@ -2542,17 +2560,17 @@ case YY_STATE_EOF(singlequotedstr): else { BEGIN(val); } } YY_BREAK -case 132: +case 133: YY_RULE_SETUP { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 133: -/* rule 133 can match eol */ +case 134: +/* rule 134 can match eol */ YY_RULE_SETUP { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 134: +case 135: YY_RULE_SETUP { LEXOUT(("SQE ")); @@ -2566,7 +2584,7 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 135: +case 136: YY_RULE_SETUP { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } @@ -2577,20 +2595,20 @@ case YY_STATE_EOF(include): BEGIN(inc_prev); } YY_BREAK -case 136: +case 137: YY_RULE_SETUP { LEXOUT(("ISP ")); /* ignore */ } YY_BREAK -case 137: -/* rule 137 can match eol */ +case 138: +/* rule 138 can match eol */ YY_RULE_SETUP { LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK -case 138: +case 139: YY_RULE_SETUP { LEXOUT(("IQS ")); BEGIN(include_quoted); } YY_BREAK -case 139: +case 140: YY_RULE_SETUP { LEXOUT(("Iunquotedstr(%s) ", yytext)); @@ -2604,17 +2622,17 @@ case YY_STATE_EOF(include_quoted): BEGIN(inc_prev); } YY_BREAK -case 140: +case 141: YY_RULE_SETUP { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 141: -/* rule 141 can match eol */ +case 142: +/* rule 142 can match eol */ YY_RULE_SETUP { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 142: +case 143: YY_RULE_SETUP { LEXOUT(("IQE ")); @@ -2636,25 +2654,25 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 143: +case 144: YY_RULE_SETUP { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 144: +case 145: YY_RULE_SETUP { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 145: +case 146: YY_RULE_SETUP { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 146: +case 147: YY_RULE_SETUP ECHO; YY_BREAK @@ -2947,7 +2965,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 >= 1383 ) + if ( yy_current_state >= 1399 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2975,11 +2993,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 >= 1383 ) + if ( yy_current_state >= 1399 ) 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 == 1382); + yy_is_jam = (yy_current_state == 1398); return yy_is_jam ? 0 : yy_current_state; } diff --git a/contrib/unbound/util/configlexer.lex b/contrib/unbound/util/configlexer.lex index b36c8af..9e7d696 100644 --- a/contrib/unbound/util/configlexer.lex +++ b/contrib/unbound/util/configlexer.lex @@ -308,6 +308,7 @@ log-queries{COLON} { YDVAR(1, VAR_LOG_QUERIES) } local-zone{COLON} { YDVAR(2, VAR_LOCAL_ZONE) } local-data{COLON} { YDVAR(1, VAR_LOCAL_DATA) } local-data-ptr{COLON} { YDVAR(1, VAR_LOCAL_DATA_PTR) } +unblock-lan-zones{COLON} { YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } statistics-interval{COLON} { YDVAR(1, VAR_STATISTICS_INTERVAL) } statistics-cumulative{COLON} { YDVAR(1, VAR_STATISTICS_CUMULATIVE) } extended-statistics{COLON} { YDVAR(1, VAR_EXTENDED_STATISTICS) } diff --git a/contrib/unbound/util/configparser.c b/contrib/unbound/util/configparser.c index f2db7c9..6ceb421 100644 --- a/contrib/unbound/util/configparser.c +++ b/contrib/unbound/util/configparser.c @@ -1,16 +1,18 @@ -#ifndef lint -static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; -#endif +/* original parser id follows */ +/* yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93" */ +/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140409 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) #define yyerrok (yyerrflag = 0) #define YYRECOVERING() (yyerrflag != 0) - +#define YYENOMEM (-2) +#define YYEOF 0 #define YYPREFIX "yy" #define YYPURE 0 @@ -51,7 +53,7 @@ typedef union { char* str; } YYSTYPE; #endif /* !YYSTYPE_IS_DECLARED */ -#line 54 "util/configparser.c" +#line 57 "util/configparser.c" /* compatibility with bison */ #ifdef YYPARSE_PARAM @@ -214,8 +216,10 @@ extern int YYPARSE_DECL(); #define VAR_RRSET_ROUNDROBIN 384 #define VAR_MAX_UDP_SIZE 385 #define VAR_DELAY_CLOSE 386 +#define VAR_UNBLOCK_LAN_ZONES 387 #define YYERRCODE 256 -static const short yylhs[] = { -1, +typedef short YYINT; +static const YYINT yylhs[] = { -1, 0, 0, 1, 1, 1, 1, 1, 2, 3, 3, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, @@ -227,23 +231,23 @@ static const short yylhs[] = { -1, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 4, 5, 5, 114, 114, 114, 114, 114, 6, - 7, 7, 120, 120, 120, 120, 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, 97, 55, 27, 28, 29, 84, 113, - 30, 31, 33, 34, 36, 37, 35, 38, 39, 40, - 46, 65, 101, 79, 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, 117, - 119, 118, 121, 122, 123, 124, 10, 11, 11, 125, - 125, 125, 125, 125, 125, 125, 126, 128, 127, 129, - 130, 131, 132, 8, 9, 9, 133, 134, + 12, 12, 4, 5, 5, 115, 115, 115, 115, 115, + 6, 7, 7, 121, 121, 121, 121, 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, 97, 55, 27, 28, 29, 84, + 113, 114, 30, 31, 33, 34, 36, 37, 35, 38, + 39, 40, 46, 65, 101, 79, 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, 116, + 117, 118, 120, 119, 122, 123, 124, 125, 10, 11, + 11, 126, 126, 126, 126, 126, 126, 126, 127, 129, + 128, 130, 131, 132, 133, 8, 9, 9, 134, 135, }; -static const short yylen[] = { 2, +static const YYINT yylen[] = { 2, 0, 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -255,8 +259,8 @@ static const short yylen[] = { 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, - 2, 0, 1, 1, 1, 1, 2, 2, 2, 2, + 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, @@ -264,82 +268,83 @@ static const short yylen[] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, - 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, - 2, 2, 2, 1, 2, 0, 1, 2, + 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, + 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, + 2, 2, 2, 2, 2, 1, 2, 0, 1, 2, }; -static const short yydefred[] = { 1, - 0, 8, 112, 120, 237, 254, 2, 10, 114, 122, - 256, 239, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 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, 9, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 0, 0, 0, 0, 0, 113, 115, 116, 117, 118, - 119, 0, 0, 0, 0, 121, 123, 124, 125, 126, - 0, 255, 257, 0, 0, 0, 0, 0, 0, 0, - 238, 240, 241, 242, 243, 244, 245, 246, 128, 127, - 132, 135, 133, 141, 142, 143, 144, 154, 155, 156, - 157, 158, 176, 177, 178, 181, 182, 138, 183, 184, - 187, 185, 186, 188, 189, 190, 201, 167, 168, 169, - 170, 191, 204, 163, 165, 205, 210, 211, 212, 139, - 175, 219, 220, 164, 215, 151, 134, 159, 202, 208, - 192, 0, 0, 223, 140, 129, 150, 195, 130, 136, - 137, 160, 161, 221, 194, 196, 197, 131, 224, 179, - 200, 152, 166, 206, 207, 209, 214, 162, 218, 216, - 217, 171, 174, 198, 199, 172, 173, 193, 213, 153, - 145, 146, 147, 148, 149, 225, 226, 227, 180, 228, - 229, 230, 232, 231, 233, 234, 235, 236, 258, 247, - 249, 248, 250, 251, 252, 253, 203, 222, +static const YYINT yydefred[] = { 1, + 0, 8, 113, 121, 239, 256, 2, 10, 115, 123, + 258, 241, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 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, 9, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, + 111, 112, 0, 0, 0, 0, 0, 114, 116, 117, + 118, 119, 120, 0, 0, 0, 0, 122, 124, 125, + 126, 127, 0, 257, 259, 0, 0, 0, 0, 0, + 0, 0, 240, 242, 243, 244, 245, 246, 247, 248, + 129, 128, 133, 136, 134, 142, 143, 144, 145, 155, + 156, 157, 158, 159, 177, 178, 179, 183, 184, 139, + 185, 186, 189, 187, 188, 190, 191, 192, 203, 168, + 169, 170, 171, 193, 206, 164, 166, 207, 212, 213, + 214, 140, 176, 221, 222, 165, 217, 152, 135, 160, + 204, 210, 194, 0, 0, 225, 141, 130, 151, 197, + 131, 137, 138, 161, 162, 223, 196, 198, 199, 132, + 226, 180, 202, 153, 167, 208, 209, 211, 216, 163, + 220, 218, 219, 172, 175, 200, 201, 173, 174, 195, + 215, 154, 146, 147, 148, 149, 150, 227, 228, 229, + 181, 182, 230, 231, 232, 234, 233, 235, 236, 237, + 238, 260, 249, 251, 250, 252, 253, 254, 255, 205, + 224, }; -static const short yydgoto[] = { 1, +static const YYINT yydgoto[] = { 1, 7, 8, 13, 9, 14, 10, 15, 11, 16, 12, - 17, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, - 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, - 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, - 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, - 218, 219, 220, 226, 227, 228, 229, 230, 231, 236, - 237, 238, 239, 240, 251, 252, 253, 254, 255, 256, - 257, 258, 242, 243, + 17, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, + 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, + 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, + 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, + 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, + 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, + 219, 220, 221, 222, 228, 229, 230, 231, 232, 233, + 238, 239, 240, 241, 242, 253, 254, 255, 256, 257, + 258, 259, 260, 244, 245, }; -static const short yysindex[] = { 0, +static const YYINT yysindex[] = { 0, -144, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -260, -209, -202, -358, -216, -233, -232, -231, + 0, 0, -260, -209, -202, -358, -215, -233, -232, -231, -230, -226, -225, -224, -181, -178, -177, -176, -171, -142, - -130, -129, -128, -127, -126, -125, -124, -123, -122, -121, - -119, -118, -117, -115, -114, -113, -112, -111, -109, -108, - -107, -106, -105, -104, -103, -102, -101, -100, -99, -98, - -97, -96, -95, -94, -93, -92, -90, -89, -88, -87, - -86, -84, -83, -82, -81, -80, -79, -78, -77, -76, - -75, -74, -73, -72, -71, -70, -69, -68, -67, -65, - -64, -63, -62, -61, -60, -59, -58, -57, -56, -55, - -54, -53, -52, -50, -49, -48, -47, -46, -45, -44, - -43, -42, -41, -40, -39, -38, -37, -36, 0, 0, + -129, -128, -127, -126, -125, -124, -123, -122, -121, -119, + -118, -117, -115, -114, -113, -112, -111, -109, -108, -107, + -106, -105, -104, -103, -102, -101, -100, -99, -98, -97, + -96, -95, -94, -93, -92, -90, -89, -88, -87, -86, + -84, -83, -82, -81, -80, -79, -78, -77, -76, -75, + -74, -73, -72, -71, -70, -69, -68, -67, -65, -64, + -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, + -53, -52, -50, -49, -48, -47, -46, -45, -44, -43, + -42, -41, -40, -39, -38, -37, -36, -35, -34, 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, @@ -350,24 +355,25 @@ static const short yysindex[] = { 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, - -35, -34, -33, -32, -31, 0, 0, 0, 0, 0, - 0, -30, -29, -28, -27, 0, 0, 0, 0, 0, - -26, 0, 0, -25, -24, -23, -22, -21, -20, -19, + 0, 0, -33, -32, -31, -30, -29, 0, 0, 0, + 0, 0, 0, -28, -27, -26, -25, 0, 0, 0, + 0, 0, -24, 0, 0, -23, -22, -21, -20, -19, + -18, -17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -16, -15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -18, -17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, }; -static const short yyrindex[] = { 0, +static const YYINT yyrindex[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -405,9 +411,10 @@ static const short yyrindex[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, }; -static const short yygindex[] = { 0, +static const YYINT yygindex[] = { 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, @@ -421,35 +428,35 @@ static const short yygindex[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, + 0, 0, 0, 0, 0, }; #define YYTABLESIZE 362 -static const short yytable[] = { 241, +static const YYINT yytable[] = { 243, 3, 4, 5, 6, 7, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 259, 260, 261, 262, 43, 44, 45, 263, 264, 265, + 261, 262, 263, 264, 43, 44, 45, 265, 266, 267, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 221, 266, 222, 223, 267, 268, 269, 232, 87, - 88, 89, 270, 90, 91, 92, 233, 234, 93, 94, + 86, 223, 268, 224, 225, 269, 270, 271, 234, 87, + 88, 89, 272, 90, 91, 92, 235, 236, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 2, 271, 115, 116, 117, 118, 244, 245, 246, 247, - 248, 249, 250, 272, 273, 274, 275, 276, 277, 278, - 279, 280, 281, 224, 282, 283, 284, 3, 285, 286, - 287, 288, 289, 4, 290, 291, 292, 293, 294, 295, - 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, - 306, 307, 225, 308, 309, 310, 311, 312, 235, 313, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 330, 5, 331, 332, - 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, - 343, 344, 6, 345, 346, 347, 348, 349, 350, 351, - 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, - 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, - 372, 373, 374, 375, 376, 377, 378, 0, 0, 0, + 2, 273, 115, 116, 117, 118, 119, 246, 247, 248, + 249, 250, 251, 252, 274, 275, 276, 277, 278, 279, + 280, 281, 282, 226, 283, 284, 285, 3, 286, 287, + 288, 289, 290, 4, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, + 307, 308, 227, 309, 310, 311, 312, 313, 237, 314, + 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, + 325, 326, 327, 328, 329, 330, 331, 5, 332, 333, + 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, + 344, 345, 6, 346, 347, 348, 349, 350, 351, 352, + 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, + 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, + 373, 374, 375, 376, 377, 378, 379, 380, 381, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -463,7 +470,7 @@ static const short yytable[] = { 241, 0, 0, 0, 0, 0, 0, 0, 3, 4, 5, 6, 7, }; -static const short yycheck[] = { 358, +static const YYINT yycheck[] = { 358, 0, 0, 0, 0, 0, 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, @@ -476,8 +483,8 @@ static const short yycheck[] = { 358, 351, 352, 264, 354, 355, 356, 299, 300, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, - 265, 264, 383, 384, 385, 386, 343, 344, 345, 346, - 347, 348, 349, 264, 264, 264, 264, 264, 264, 264, + 265, 264, 383, 384, 385, 386, 387, 343, 344, 345, + 346, 347, 348, 349, 264, 264, 264, 264, 264, 264, 264, 264, 264, 353, 264, 264, 264, 292, 264, 264, 264, 264, 264, 298, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, @@ -488,7 +495,7 @@ static const short yycheck[] = { 358, 264, 264, 357, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - 264, 264, 264, 264, 264, 264, 264, -1, -1, -1, + 264, 264, 264, 264, 264, 264, 264, 264, 264, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 265, 265, 265, 265, 265, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -506,9 +513,11 @@ static const short yycheck[] = { 358, #ifndef YYDEBUG #define YYDEBUG 0 #endif -#define YYMAXTOKEN 386 +#define YYMAXTOKEN 387 +#define YYUNDFTOKEN 525 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) #if YYDEBUG -static const char *yyname[] = { +static const char *const yyname[] = { "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,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, @@ -554,9 +563,13 @@ static const char *yyname[] = { "VAR_TCP_UPSTREAM","VAR_SSL_UPSTREAM","VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM","VAR_SSL_PORT","VAR_FORWARD_FIRST","VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES","VAR_RRSET_ROUNDROBIN","VAR_MAX_UDP_SIZE", -"VAR_DELAY_CLOSE", +"VAR_DELAY_CLOSE","VAR_UNBLOCK_LAN_ZONES",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +"illegal-symbol", }; -static const char *yyrule[] = { +static const char *const yyrule[] = { "$accept : toplevelvars", "toplevelvars :", "toplevelvars : toplevelvars toplevelvar", @@ -669,6 +682,7 @@ static const char *yyrule[] = { "content_server : server_max_udp_size", "content_server : server_so_reuseport", "content_server : server_delay_close", +"content_server : server_unblock_lan_zones", "stubstart : VAR_STUB_ZONE", "contents_stub : contents_stub content_stub", "contents_stub :", @@ -738,6 +752,7 @@ static const char *yyrule[] = { "server_num_queries_per_thread : VAR_NUM_QUERIES_PER_THREAD STRING_ARG", "server_jostle_timeout : VAR_JOSTLE_TIMEOUT STRING_ARG", "server_delay_close : VAR_DELAY_CLOSE STRING_ARG", +"server_unblock_lan_zones : VAR_UNBLOCK_LAN_ZONES STRING_ARG", "server_rrset_cache_size : VAR_RRSET_CACHE_SIZE STRING_ARG", "server_rrset_cache_slabs : VAR_RRSET_CACHE_SLABS STRING_ARG", "server_infra_host_ttl : VAR_INFRA_HOST_TTL STRING_ARG", @@ -836,27 +851,27 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; - short *s_base; - short *s_mark; - short *s_last; + YYINT *s_base; + YYINT *s_mark; + YYINT *s_last; YYSTYPE *l_base; YYSTYPE *l_mark; } YYSTACKDATA; /* variables for the parser stack */ static YYSTACKDATA yystack; -#line 1308 "util/configparser.y" +#line 1318 "util/configparser.y" /* parse helper routines could be here */ -#line 859 "util/configparser.c" +#line 875 "util/configparser.c" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -870,27 +885,27 @@ static int yygrowstack(YYSTACKDATA *data) { int i; unsigned newsize; - short *newss; + YYINT *newss; YYSTYPE *newvs; if ((newsize = data->stacksize) == 0) newsize = YYINITSTACKSIZE; else if (newsize >= YYMAXDEPTH) - return -1; + return YYENOMEM; else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; i = (int) (data->s_mark - data->s_base); - newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); + newss = (YYINT *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) - return -1; + return YYENOMEM; data->s_base = newss; data->s_mark = newss + i; newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs)); if (newvs == 0) - return -1; + return YYENOMEM; data->l_base = newvs; data->l_mark = newvs + i; @@ -940,7 +955,7 @@ YYPARSE_DECL() memset(&yystack, 0, sizeof(yystack)); #endif - if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow; + if (yystack.s_base == NULL && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow; yystack.s_mark = yystack.s_base; yystack.l_mark = yystack.l_base; yystate = 0; @@ -950,13 +965,11 @@ yyloop: if ((yyn = yydefred[yystate]) != 0) goto yyreduce; if (yychar < 0) { - if ((yychar = YYLEX) < 0) yychar = 0; + if ((yychar = YYLEX) < 0) yychar = YYEOF; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -970,7 +983,7 @@ yyloop: printf("%sdebug: state %d, shifting to state %d\n", YYPREFIX, yystate, yytable[yyn]); #endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack)) + if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) { goto yyoverflow; } @@ -989,7 +1002,7 @@ yyloop: } if (yyerrflag) goto yyinrecovery; - yyerror("syntax error"); + YYERROR_CALL("syntax error"); goto yyerrlab; @@ -1010,7 +1023,7 @@ yyinrecovery: printf("%sdebug: state %d, error recovery shifting\ to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]); #endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack)) + if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) { goto yyoverflow; } @@ -1034,13 +1047,11 @@ yyinrecovery: } else { - if (yychar == 0) goto yyabort; + if (yychar == YYEOF) goto yyabort; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -1068,7 +1079,7 @@ case 8: OUTYY(("\nP(server:)\n")); } break; -case 112: +case 113: #line 169 "util/configparser.y" { struct config_stub* s; @@ -1081,7 +1092,7 @@ case 112: yyerror("out of memory"); } break; -case 120: +case 121: #line 185 "util/configparser.y" { struct config_stub* s; @@ -1094,7 +1105,7 @@ case 120: yyerror("out of memory"); } break; -case 127: +case 128: #line 201 "util/configparser.y" { OUTYY(("P(server_num_threads:%s)\n", yystack.l_mark[0].str)); @@ -1104,7 +1115,7 @@ case 127: free(yystack.l_mark[0].str); } break; -case 128: +case 129: #line 210 "util/configparser.y" { OUTYY(("P(server_verbosity:%s)\n", yystack.l_mark[0].str)); @@ -1114,7 +1125,7 @@ case 128: free(yystack.l_mark[0].str); } break; -case 129: +case 130: #line 219 "util/configparser.y" { OUTYY(("P(server_statistics_interval:%s)\n", yystack.l_mark[0].str)); @@ -1126,7 +1137,7 @@ case 129: free(yystack.l_mark[0].str); } break; -case 130: +case 131: #line 230 "util/configparser.y" { OUTYY(("P(server_statistics_cumulative:%s)\n", yystack.l_mark[0].str)); @@ -1136,7 +1147,7 @@ case 130: free(yystack.l_mark[0].str); } break; -case 131: +case 132: #line 239 "util/configparser.y" { OUTYY(("P(server_extended_statistics:%s)\n", yystack.l_mark[0].str)); @@ -1146,7 +1157,7 @@ case 131: free(yystack.l_mark[0].str); } break; -case 132: +case 133: #line 248 "util/configparser.y" { OUTYY(("P(server_port:%s)\n", yystack.l_mark[0].str)); @@ -1156,7 +1167,7 @@ case 132: free(yystack.l_mark[0].str); } break; -case 133: +case 134: #line 257 "util/configparser.y" { OUTYY(("P(server_interface:%s)\n", yystack.l_mark[0].str)); @@ -1170,7 +1181,7 @@ case 133: cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = yystack.l_mark[0].str; } break; -case 134: +case 135: #line 270 "util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", yystack.l_mark[0].str)); @@ -1186,7 +1197,7 @@ case 134: cfg_parser->cfg->num_out_ifs++] = yystack.l_mark[0].str; } break; -case 135: +case 136: #line 285 "util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", yystack.l_mark[0].str)); @@ -1196,7 +1207,7 @@ case 135: free(yystack.l_mark[0].str); } break; -case 136: +case 137: #line 294 "util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", yystack.l_mark[0].str)); @@ -1206,7 +1217,7 @@ case 136: free(yystack.l_mark[0].str); } break; -case 137: +case 138: #line 303 "util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", yystack.l_mark[0].str)); @@ -1216,7 +1227,7 @@ case 137: free(yystack.l_mark[0].str); } break; -case 138: +case 139: #line 312 "util/configparser.y" { OUTYY(("P(server_outgoing_num_tcp:%s)\n", yystack.l_mark[0].str)); @@ -1226,7 +1237,7 @@ case 138: free(yystack.l_mark[0].str); } break; -case 139: +case 140: #line 321 "util/configparser.y" { OUTYY(("P(server_incoming_num_tcp:%s)\n", yystack.l_mark[0].str)); @@ -1236,7 +1247,7 @@ case 139: free(yystack.l_mark[0].str); } break; -case 140: +case 141: #line 330 "util/configparser.y" { OUTYY(("P(server_interface_automatic:%s)\n", yystack.l_mark[0].str)); @@ -1246,7 +1257,7 @@ case 140: free(yystack.l_mark[0].str); } break; -case 141: +case 142: #line 339 "util/configparser.y" { OUTYY(("P(server_do_ip4:%s)\n", yystack.l_mark[0].str)); @@ -1256,7 +1267,7 @@ case 141: free(yystack.l_mark[0].str); } break; -case 142: +case 143: #line 348 "util/configparser.y" { OUTYY(("P(server_do_ip6:%s)\n", yystack.l_mark[0].str)); @@ -1266,7 +1277,7 @@ case 142: free(yystack.l_mark[0].str); } break; -case 143: +case 144: #line 357 "util/configparser.y" { OUTYY(("P(server_do_udp:%s)\n", yystack.l_mark[0].str)); @@ -1276,7 +1287,7 @@ case 143: free(yystack.l_mark[0].str); } break; -case 144: +case 145: #line 366 "util/configparser.y" { OUTYY(("P(server_do_tcp:%s)\n", yystack.l_mark[0].str)); @@ -1286,7 +1297,7 @@ case 144: free(yystack.l_mark[0].str); } break; -case 145: +case 146: #line 375 "util/configparser.y" { OUTYY(("P(server_tcp_upstream:%s)\n", yystack.l_mark[0].str)); @@ -1296,7 +1307,7 @@ case 145: free(yystack.l_mark[0].str); } break; -case 146: +case 147: #line 384 "util/configparser.y" { OUTYY(("P(server_ssl_upstream:%s)\n", yystack.l_mark[0].str)); @@ -1306,7 +1317,7 @@ case 146: free(yystack.l_mark[0].str); } break; -case 147: +case 148: #line 393 "util/configparser.y" { OUTYY(("P(server_ssl_service_key:%s)\n", yystack.l_mark[0].str)); @@ -1314,7 +1325,7 @@ case 147: cfg_parser->cfg->ssl_service_key = yystack.l_mark[0].str; } break; -case 148: +case 149: #line 400 "util/configparser.y" { OUTYY(("P(server_ssl_service_pem:%s)\n", yystack.l_mark[0].str)); @@ -1322,7 +1333,7 @@ case 148: cfg_parser->cfg->ssl_service_pem = yystack.l_mark[0].str; } break; -case 149: +case 150: #line 407 "util/configparser.y" { OUTYY(("P(server_ssl_port:%s)\n", yystack.l_mark[0].str)); @@ -1332,7 +1343,7 @@ case 149: free(yystack.l_mark[0].str); } break; -case 150: +case 151: #line 416 "util/configparser.y" { OUTYY(("P(server_do_daemonize:%s)\n", yystack.l_mark[0].str)); @@ -1342,7 +1353,7 @@ case 150: free(yystack.l_mark[0].str); } break; -case 151: +case 152: #line 425 "util/configparser.y" { OUTYY(("P(server_use_syslog:%s)\n", yystack.l_mark[0].str)); @@ -1357,7 +1368,7 @@ case 151: free(yystack.l_mark[0].str); } break; -case 152: +case 153: #line 439 "util/configparser.y" { OUTYY(("P(server_log_time_ascii:%s)\n", yystack.l_mark[0].str)); @@ -1367,7 +1378,7 @@ case 152: free(yystack.l_mark[0].str); } break; -case 153: +case 154: #line 448 "util/configparser.y" { OUTYY(("P(server_log_queries:%s)\n", yystack.l_mark[0].str)); @@ -1377,7 +1388,7 @@ case 153: free(yystack.l_mark[0].str); } break; -case 154: +case 155: #line 457 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", yystack.l_mark[0].str)); @@ -1385,7 +1396,7 @@ case 154: cfg_parser->cfg->chrootdir = yystack.l_mark[0].str; } break; -case 155: +case 156: #line 464 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", yystack.l_mark[0].str)); @@ -1393,7 +1404,7 @@ case 155: cfg_parser->cfg->username = yystack.l_mark[0].str; } break; -case 156: +case 157: #line 471 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", yystack.l_mark[0].str)); @@ -1401,7 +1412,7 @@ case 156: cfg_parser->cfg->directory = yystack.l_mark[0].str; } break; -case 157: +case 158: #line 478 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", yystack.l_mark[0].str)); @@ -1410,7 +1421,7 @@ case 157: cfg_parser->cfg->use_syslog = 0; } break; -case 158: +case 159: #line 486 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", yystack.l_mark[0].str)); @@ -1418,7 +1429,7 @@ case 158: cfg_parser->cfg->pidfile = yystack.l_mark[0].str; } break; -case 159: +case 160: #line 493 "util/configparser.y" { OUTYY(("P(server_root_hints:%s)\n", yystack.l_mark[0].str)); @@ -1426,7 +1437,7 @@ case 159: yyerror("out of memory"); } break; -case 160: +case 161: #line 500 "util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", yystack.l_mark[0].str)); @@ -1434,7 +1445,7 @@ case 160: cfg_parser->cfg->dlv_anchor_file = yystack.l_mark[0].str; } break; -case 161: +case 162: #line 507 "util/configparser.y" { OUTYY(("P(server_dlv_anchor:%s)\n", yystack.l_mark[0].str)); @@ -1442,7 +1453,7 @@ case 161: yyerror("out of memory"); } break; -case 162: +case 163: #line 514 "util/configparser.y" { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", yystack.l_mark[0].str)); @@ -1451,7 +1462,7 @@ case 162: yyerror("out of memory"); } break; -case 163: +case 164: #line 522 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", yystack.l_mark[0].str)); @@ -1460,7 +1471,7 @@ case 163: yyerror("out of memory"); } break; -case 164: +case 165: #line 530 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", yystack.l_mark[0].str)); @@ -1469,7 +1480,7 @@ case 164: yyerror("out of memory"); } break; -case 165: +case 166: #line 538 "util/configparser.y" { OUTYY(("P(server_trust_anchor:%s)\n", yystack.l_mark[0].str)); @@ -1477,7 +1488,7 @@ case 165: yyerror("out of memory"); } break; -case 166: +case 167: #line 545 "util/configparser.y" { OUTYY(("P(server_domain_insecure:%s)\n", yystack.l_mark[0].str)); @@ -1485,7 +1496,7 @@ case 166: yyerror("out of memory"); } break; -case 167: +case 168: #line 552 "util/configparser.y" { OUTYY(("P(server_hide_identity:%s)\n", yystack.l_mark[0].str)); @@ -1495,7 +1506,7 @@ case 167: free(yystack.l_mark[0].str); } break; -case 168: +case 169: #line 561 "util/configparser.y" { OUTYY(("P(server_hide_version:%s)\n", yystack.l_mark[0].str)); @@ -1505,7 +1516,7 @@ case 168: free(yystack.l_mark[0].str); } break; -case 169: +case 170: #line 570 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", yystack.l_mark[0].str)); @@ -1513,7 +1524,7 @@ case 169: cfg_parser->cfg->identity = yystack.l_mark[0].str; } break; -case 170: +case 171: #line 577 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", yystack.l_mark[0].str)); @@ -1521,7 +1532,7 @@ case 170: cfg_parser->cfg->version = yystack.l_mark[0].str; } break; -case 171: +case 172: #line 584 "util/configparser.y" { OUTYY(("P(server_so_rcvbuf:%s)\n", yystack.l_mark[0].str)); @@ -1530,7 +1541,7 @@ case 171: free(yystack.l_mark[0].str); } break; -case 172: +case 173: #line 592 "util/configparser.y" { OUTYY(("P(server_so_sndbuf:%s)\n", yystack.l_mark[0].str)); @@ -1539,7 +1550,7 @@ case 172: free(yystack.l_mark[0].str); } break; -case 173: +case 174: #line 600 "util/configparser.y" { OUTYY(("P(server_so_reuseport:%s)\n", yystack.l_mark[0].str)); @@ -1550,7 +1561,7 @@ case 173: free(yystack.l_mark[0].str); } break; -case 174: +case 175: #line 610 "util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", yystack.l_mark[0].str)); @@ -1564,7 +1575,7 @@ case 174: free(yystack.l_mark[0].str); } break; -case 175: +case 176: #line 623 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", yystack.l_mark[0].str)); @@ -1576,7 +1587,7 @@ case 175: free(yystack.l_mark[0].str); } break; -case 176: +case 177: #line 634 "util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", yystack.l_mark[0].str)); @@ -1585,7 +1596,7 @@ case 176: free(yystack.l_mark[0].str); } break; -case 177: +case 178: #line 642 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", yystack.l_mark[0].str)); @@ -1599,7 +1610,7 @@ case 177: free(yystack.l_mark[0].str); } break; -case 178: +case 179: #line 655 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", yystack.l_mark[0].str)); @@ -1609,7 +1620,7 @@ case 178: free(yystack.l_mark[0].str); } break; -case 179: +case 180: #line 664 "util/configparser.y" { OUTYY(("P(server_jostle_timeout:%s)\n", yystack.l_mark[0].str)); @@ -1619,7 +1630,7 @@ case 179: free(yystack.l_mark[0].str); } break; -case 180: +case 181: #line 673 "util/configparser.y" { OUTYY(("P(server_delay_close:%s)\n", yystack.l_mark[0].str)); @@ -1629,17 +1640,28 @@ case 180: free(yystack.l_mark[0].str); } break; -case 181: +case 182: #line 682 "util/configparser.y" { + OUTYY(("P(server_unblock_lan_zones:%s)\n", yystack.l_mark[0].str)); + if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->unblock_lan_zones = + (strcmp(yystack.l_mark[0].str, "yes")==0); + free(yystack.l_mark[0].str); + } +break; +case 183: +#line 692 "util/configparser.y" + { OUTYY(("P(server_rrset_cache_size:%s)\n", yystack.l_mark[0].str)); if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->rrset_cache_size)) yyerror("memory size expected"); free(yystack.l_mark[0].str); } break; -case 182: -#line 690 "util/configparser.y" +case 184: +#line 700 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0) @@ -1652,8 +1674,8 @@ case 182: free(yystack.l_mark[0].str); } break; -case 183: -#line 703 "util/configparser.y" +case 185: +#line 713 "util/configparser.y" { OUTYY(("P(server_infra_host_ttl:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) @@ -1662,8 +1684,8 @@ case 183: free(yystack.l_mark[0].str); } break; -case 184: -#line 712 "util/configparser.y" +case 186: +#line 722 "util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", yystack.l_mark[0].str)); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " @@ -1671,8 +1693,8 @@ case 184: free(yystack.l_mark[0].str); } break; -case 185: -#line 720 "util/configparser.y" +case 187: +#line 730 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0) @@ -1681,8 +1703,8 @@ case 185: free(yystack.l_mark[0].str); } break; -case 186: -#line 729 "util/configparser.y" +case 188: +#line 739 "util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", yystack.l_mark[0].str)); verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s " @@ -1690,8 +1712,8 @@ case 186: free(yystack.l_mark[0].str); } break; -case 187: -#line 737 "util/configparser.y" +case 189: +#line 747 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0) @@ -1704,16 +1726,16 @@ case 187: free(yystack.l_mark[0].str); } break; -case 188: -#line 750 "util/configparser.y" +case 190: +#line 760 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", yystack.l_mark[0].str)); free(cfg_parser->cfg->target_fetch_policy); cfg_parser->cfg->target_fetch_policy = yystack.l_mark[0].str; } break; -case 189: -#line 757 "util/configparser.y" +case 191: +#line 767 "util/configparser.y" { OUTYY(("P(server_harden_short_bufsize:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1723,8 +1745,8 @@ case 189: free(yystack.l_mark[0].str); } break; -case 190: -#line 767 "util/configparser.y" +case 192: +#line 777 "util/configparser.y" { OUTYY(("P(server_harden_large_queries:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1734,8 +1756,8 @@ case 190: free(yystack.l_mark[0].str); } break; -case 191: -#line 777 "util/configparser.y" +case 193: +#line 787 "util/configparser.y" { OUTYY(("P(server_harden_glue:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1745,8 +1767,8 @@ case 191: free(yystack.l_mark[0].str); } break; -case 192: -#line 787 "util/configparser.y" +case 194: +#line 797 "util/configparser.y" { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1756,8 +1778,8 @@ case 192: free(yystack.l_mark[0].str); } break; -case 193: -#line 797 "util/configparser.y" +case 195: +#line 807 "util/configparser.y" { OUTYY(("P(server_harden_below_nxdomain:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1767,8 +1789,8 @@ case 193: free(yystack.l_mark[0].str); } break; -case 194: -#line 807 "util/configparser.y" +case 196: +#line 817 "util/configparser.y" { OUTYY(("P(server_harden_referral_path:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1778,8 +1800,8 @@ case 194: free(yystack.l_mark[0].str); } break; -case 195: -#line 817 "util/configparser.y" +case 197: +#line 827 "util/configparser.y" { OUTYY(("P(server_use_caps_for_id:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1789,24 +1811,24 @@ case 195: free(yystack.l_mark[0].str); } break; -case 196: -#line 827 "util/configparser.y" +case 198: +#line 837 "util/configparser.y" { OUTYY(("P(server_private_address:%s)\n", yystack.l_mark[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, yystack.l_mark[0].str)) yyerror("out of memory"); } break; -case 197: -#line 834 "util/configparser.y" +case 199: +#line 844 "util/configparser.y" { OUTYY(("P(server_private_domain:%s)\n", yystack.l_mark[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, yystack.l_mark[0].str)) yyerror("out of memory"); } break; -case 198: -#line 841 "util/configparser.y" +case 200: +#line 851 "util/configparser.y" { OUTYY(("P(server_prefetch:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1815,8 +1837,8 @@ case 198: free(yystack.l_mark[0].str); } break; -case 199: -#line 850 "util/configparser.y" +case 201: +#line 860 "util/configparser.y" { OUTYY(("P(server_prefetch_key:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1825,8 +1847,8 @@ case 199: free(yystack.l_mark[0].str); } break; -case 200: -#line 859 "util/configparser.y" +case 202: +#line 869 "util/configparser.y" { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) @@ -1835,16 +1857,16 @@ case 200: free(yystack.l_mark[0].str); } break; -case 201: -#line 868 "util/configparser.y" +case 203: +#line 878 "util/configparser.y" { OUTYY(("P(server_do_not_query_address:%s)\n", yystack.l_mark[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, yystack.l_mark[0].str)) yyerror("out of memory"); } break; -case 202: -#line 875 "util/configparser.y" +case 204: +#line 885 "util/configparser.y" { OUTYY(("P(server_do_not_query_localhost:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1854,8 +1876,8 @@ case 202: free(yystack.l_mark[0].str); } break; -case 203: -#line 885 "util/configparser.y" +case 205: +#line 895 "util/configparser.y" { OUTYY(("P(server_access_control:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "deny")!=0 && strcmp(yystack.l_mark[0].str, "refuse")!=0 && @@ -1872,16 +1894,16 @@ case 203: } } break; -case 204: -#line 902 "util/configparser.y" +case 206: +#line 912 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", yystack.l_mark[0].str)); free(cfg_parser->cfg->module_conf); cfg_parser->cfg->module_conf = yystack.l_mark[0].str; } break; -case 205: -#line 909 "util/configparser.y" +case 207: +#line 919 "util/configparser.y" { OUTYY(("P(server_val_override_date:%s)\n", yystack.l_mark[0].str)); if(strlen(yystack.l_mark[0].str) == 0 || strcmp(yystack.l_mark[0].str, "0") == 0) { @@ -1899,8 +1921,8 @@ case 205: free(yystack.l_mark[0].str); } break; -case 206: -#line 927 "util/configparser.y" +case 208: +#line 937 "util/configparser.y" { OUTYY(("P(server_val_sig_skew_min:%s)\n", yystack.l_mark[0].str)); if(strlen(yystack.l_mark[0].str) == 0 || strcmp(yystack.l_mark[0].str, "0") == 0) { @@ -1913,8 +1935,8 @@ case 206: free(yystack.l_mark[0].str); } break; -case 207: -#line 940 "util/configparser.y" +case 209: +#line 950 "util/configparser.y" { OUTYY(("P(server_val_sig_skew_max:%s)\n", yystack.l_mark[0].str)); if(strlen(yystack.l_mark[0].str) == 0 || strcmp(yystack.l_mark[0].str, "0") == 0) { @@ -1927,8 +1949,8 @@ case 207: free(yystack.l_mark[0].str); } break; -case 208: -#line 953 "util/configparser.y" +case 210: +#line 963 "util/configparser.y" { OUTYY(("P(server_cache_max_ttl:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) @@ -1937,8 +1959,8 @@ case 208: free(yystack.l_mark[0].str); } break; -case 209: -#line 962 "util/configparser.y" +case 211: +#line 972 "util/configparser.y" { OUTYY(("P(server_cache_min_ttl:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) @@ -1947,8 +1969,8 @@ case 209: free(yystack.l_mark[0].str); } break; -case 210: -#line 971 "util/configparser.y" +case 212: +#line 981 "util/configparser.y" { OUTYY(("P(server_bogus_ttl:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) @@ -1957,8 +1979,8 @@ case 210: free(yystack.l_mark[0].str); } break; -case 211: -#line 980 "util/configparser.y" +case 213: +#line 990 "util/configparser.y" { OUTYY(("P(server_val_clean_additional:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1968,8 +1990,8 @@ case 211: free(yystack.l_mark[0].str); } break; -case 212: -#line 990 "util/configparser.y" +case 214: +#line 1000 "util/configparser.y" { OUTYY(("P(server_val_permissive_mode:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1979,8 +2001,8 @@ case 212: free(yystack.l_mark[0].str); } break; -case 213: -#line 1000 "util/configparser.y" +case 215: +#line 1010 "util/configparser.y" { OUTYY(("P(server_ignore_cd_flag:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -1989,8 +2011,8 @@ case 213: free(yystack.l_mark[0].str); } break; -case 214: -#line 1009 "util/configparser.y" +case 216: +#line 1019 "util/configparser.y" { OUTYY(("P(server_val_log_level:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) @@ -1999,16 +2021,16 @@ case 214: free(yystack.l_mark[0].str); } break; -case 215: -#line 1018 "util/configparser.y" +case 217: +#line 1028 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", yystack.l_mark[0].str)); free(cfg_parser->cfg->val_nsec3_key_iterations); cfg_parser->cfg->val_nsec3_key_iterations = yystack.l_mark[0].str; } break; -case 216: -#line 1025 "util/configparser.y" +case 218: +#line 1035 "util/configparser.y" { OUTYY(("P(server_add_holddown:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) @@ -2017,8 +2039,8 @@ case 216: free(yystack.l_mark[0].str); } break; -case 217: -#line 1034 "util/configparser.y" +case 219: +#line 1044 "util/configparser.y" { OUTYY(("P(server_del_holddown:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) @@ -2027,8 +2049,8 @@ case 217: free(yystack.l_mark[0].str); } break; -case 218: -#line 1043 "util/configparser.y" +case 220: +#line 1053 "util/configparser.y" { OUTYY(("P(server_keep_missing:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0) @@ -2037,8 +2059,8 @@ case 218: free(yystack.l_mark[0].str); } break; -case 219: -#line 1052 "util/configparser.y" +case 221: +#line 1062 "util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", yystack.l_mark[0].str)); if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->key_cache_size)) @@ -2046,8 +2068,8 @@ case 219: free(yystack.l_mark[0].str); } break; -case 220: -#line 1060 "util/configparser.y" +case 222: +#line 1070 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0) @@ -2060,8 +2082,8 @@ case 220: free(yystack.l_mark[0].str); } break; -case 221: -#line 1073 "util/configparser.y" +case 223: +#line 1083 "util/configparser.y" { OUTYY(("P(server_neg_cache_size:%s)\n", yystack.l_mark[0].str)); if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->neg_cache_size)) @@ -2069,8 +2091,8 @@ case 221: free(yystack.l_mark[0].str); } break; -case 222: -#line 1081 "util/configparser.y" +case 224: +#line 1091 "util/configparser.y" { OUTYY(("P(server_local_zone:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "static")!=0 && strcmp(yystack.l_mark[0].str, "deny")!=0 && @@ -2092,16 +2114,16 @@ case 222: } } break; -case 223: -#line 1103 "util/configparser.y" +case 225: +#line 1113 "util/configparser.y" { OUTYY(("P(server_local_data:%s)\n", yystack.l_mark[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, yystack.l_mark[0].str)) fatal_exit("out of memory adding local-data"); } break; -case 224: -#line 1110 "util/configparser.y" +case 226: +#line 1120 "util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", yystack.l_mark[0].str)); @@ -2116,8 +2138,8 @@ case 224: } } break; -case 225: -#line 1125 "util/configparser.y" +case 227: +#line 1135 "util/configparser.y" { OUTYY(("P(server_minimal_responses:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -2127,8 +2149,8 @@ case 225: free(yystack.l_mark[0].str); } break; -case 226: -#line 1135 "util/configparser.y" +case 228: +#line 1145 "util/configparser.y" { OUTYY(("P(server_rrset_roundrobin:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -2138,16 +2160,16 @@ case 226: free(yystack.l_mark[0].str); } break; -case 227: -#line 1145 "util/configparser.y" +case 229: +#line 1155 "util/configparser.y" { OUTYY(("P(server_max_udp_size:%s)\n", yystack.l_mark[0].str)); cfg_parser->cfg->max_udp_size = atoi(yystack.l_mark[0].str); free(yystack.l_mark[0].str); } break; -case 228: -#line 1152 "util/configparser.y" +case 230: +#line 1162 "util/configparser.y" { OUTYY(("P(name:%s)\n", yystack.l_mark[0].str)); if(cfg_parser->cfg->stubs->name) @@ -2157,24 +2179,24 @@ case 228: cfg_parser->cfg->stubs->name = yystack.l_mark[0].str; } break; -case 229: -#line 1162 "util/configparser.y" +case 231: +#line 1172 "util/configparser.y" { OUTYY(("P(stub-host:%s)\n", yystack.l_mark[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, yystack.l_mark[0].str)) yyerror("out of memory"); } break; -case 230: -#line 1169 "util/configparser.y" +case 232: +#line 1179 "util/configparser.y" { OUTYY(("P(stub-addr:%s)\n", yystack.l_mark[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, yystack.l_mark[0].str)) yyerror("out of memory"); } break; -case 231: -#line 1176 "util/configparser.y" +case 233: +#line 1186 "util/configparser.y" { OUTYY(("P(stub-first:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -2183,8 +2205,8 @@ case 231: free(yystack.l_mark[0].str); } break; -case 232: -#line 1185 "util/configparser.y" +case 234: +#line 1195 "util/configparser.y" { OUTYY(("P(stub-prime:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -2194,8 +2216,8 @@ case 232: free(yystack.l_mark[0].str); } break; -case 233: -#line 1195 "util/configparser.y" +case 235: +#line 1205 "util/configparser.y" { OUTYY(("P(name:%s)\n", yystack.l_mark[0].str)); if(cfg_parser->cfg->forwards->name) @@ -2205,24 +2227,24 @@ case 233: cfg_parser->cfg->forwards->name = yystack.l_mark[0].str; } break; -case 234: -#line 1205 "util/configparser.y" +case 236: +#line 1215 "util/configparser.y" { OUTYY(("P(forward-host:%s)\n", yystack.l_mark[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, yystack.l_mark[0].str)) yyerror("out of memory"); } break; -case 235: -#line 1212 "util/configparser.y" +case 237: +#line 1222 "util/configparser.y" { OUTYY(("P(forward-addr:%s)\n", yystack.l_mark[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, yystack.l_mark[0].str)) yyerror("out of memory"); } break; -case 236: -#line 1219 "util/configparser.y" +case 238: +#line 1229 "util/configparser.y" { OUTYY(("P(forward-first:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -2231,14 +2253,14 @@ case 236: free(yystack.l_mark[0].str); } break; -case 237: -#line 1228 "util/configparser.y" +case 239: +#line 1238 "util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } break; -case 247: -#line 1239 "util/configparser.y" +case 249: +#line 1249 "util/configparser.y" { OUTYY(("P(control_enable:%s)\n", yystack.l_mark[0].str)); if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0) @@ -2248,8 +2270,8 @@ case 247: free(yystack.l_mark[0].str); } break; -case 248: -#line 1249 "util/configparser.y" +case 250: +#line 1259 "util/configparser.y" { OUTYY(("P(control_port:%s)\n", yystack.l_mark[0].str)); if(atoi(yystack.l_mark[0].str) == 0) @@ -2258,61 +2280,61 @@ case 248: free(yystack.l_mark[0].str); } break; -case 249: -#line 1258 "util/configparser.y" +case 251: +#line 1268 "util/configparser.y" { OUTYY(("P(control_interface:%s)\n", yystack.l_mark[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, yystack.l_mark[0].str)) yyerror("out of memory"); } break; -case 250: -#line 1265 "util/configparser.y" +case 252: +#line 1275 "util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", yystack.l_mark[0].str)); free(cfg_parser->cfg->server_key_file); cfg_parser->cfg->server_key_file = yystack.l_mark[0].str; } break; -case 251: -#line 1272 "util/configparser.y" +case 253: +#line 1282 "util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", yystack.l_mark[0].str)); free(cfg_parser->cfg->server_cert_file); cfg_parser->cfg->server_cert_file = yystack.l_mark[0].str; } break; -case 252: -#line 1279 "util/configparser.y" +case 254: +#line 1289 "util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", yystack.l_mark[0].str)); free(cfg_parser->cfg->control_key_file); cfg_parser->cfg->control_key_file = yystack.l_mark[0].str; } break; -case 253: -#line 1286 "util/configparser.y" +case 255: +#line 1296 "util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", yystack.l_mark[0].str)); free(cfg_parser->cfg->control_cert_file); cfg_parser->cfg->control_cert_file = yystack.l_mark[0].str; } break; -case 254: -#line 1293 "util/configparser.y" +case 256: +#line 1303 "util/configparser.y" { OUTYY(("\nP(python:)\n")); } break; -case 258: -#line 1302 "util/configparser.y" +case 260: +#line 1312 "util/configparser.y" { OUTYY(("P(python-script:%s)\n", yystack.l_mark[0].str)); free(cfg_parser->cfg->python_script); cfg_parser->cfg->python_script = yystack.l_mark[0].str; } break; -#line 2315 "util/configparser.c" +#line 2338 "util/configparser.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -2330,19 +2352,17 @@ break; *++yystack.l_mark = yyval; if (yychar < 0) { - if ((yychar = YYLEX) < 0) yychar = 0; + if ((yychar = YYLEX) < 0) yychar = YYEOF; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } #endif } - if (yychar == 0) goto yyaccept; + if (yychar == YYEOF) goto yyaccept; goto yyloop; } if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 && @@ -2355,16 +2375,16 @@ break; printf("%sdebug: after reduction, shifting from state %d \ to state %d\n", YYPREFIX, *yystack.s_mark, yystate); #endif - if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack)) + if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) { goto yyoverflow; } - *++yystack.s_mark = (short) yystate; + *++yystack.s_mark = (YYINT) yystate; *++yystack.l_mark = yyval; goto yyloop; yyoverflow: - yyerror("yacc stack overflow"); + YYERROR_CALL("yacc stack overflow"); yyabort: yyfreestack(&yystack); diff --git a/contrib/unbound/util/configparser.h b/contrib/unbound/util/configparser.h index 2c49561..0415e69 100644 --- a/contrib/unbound/util/configparser.h +++ b/contrib/unbound/util/configparser.h @@ -128,6 +128,7 @@ #define VAR_RRSET_ROUNDROBIN 384 #define VAR_MAX_UDP_SIZE 385 #define VAR_DELAY_CLOSE 386 +#define VAR_UNBLOCK_LAN_ZONES 387 #ifdef YYSTYPE #undef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 diff --git a/contrib/unbound/util/configparser.y b/contrib/unbound/util/configparser.y index 74b5b79..22fc9b7 100644 --- a/contrib/unbound/util/configparser.y +++ b/contrib/unbound/util/configparser.y @@ -105,7 +105,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_IGNORE_CD_FLAG VAR_LOG_QUERIES VAR_TCP_UPSTREAM VAR_SSL_UPSTREAM %token VAR_SSL_SERVICE_KEY VAR_SSL_SERVICE_PEM VAR_SSL_PORT VAR_FORWARD_FIRST %token VAR_STUB_FIRST VAR_MINIMAL_RESPONSES VAR_RRSET_ROUNDROBIN -%token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE +%token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE VAR_UNBLOCK_LAN_ZONES %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -163,7 +163,7 @@ content_server: server_num_threads | server_verbosity | server_port | server_log_queries | server_tcp_upstream | server_ssl_upstream | server_ssl_service_key | server_ssl_service_pem | server_ssl_port | server_minimal_responses | server_rrset_roundrobin | server_max_udp_size | - server_so_reuseport | server_delay_close + server_so_reuseport | server_delay_close | server_unblock_lan_zones ; stubstart: VAR_STUB_ZONE { @@ -678,6 +678,16 @@ server_delay_close: VAR_DELAY_CLOSE STRING_ARG free($2); } ; +server_unblock_lan_zones: VAR_UNBLOCK_LAN_ZONES STRING_ARG + { + OUTYY(("P(server_unblock_lan_zones:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->unblock_lan_zones = + (strcmp($2, "yes")==0); + free($2); + } + ; server_rrset_cache_size: VAR_RRSET_CACHE_SIZE STRING_ARG { OUTYY(("P(server_rrset_cache_size:%s)\n", $2)); |
