summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2013-04-25 15:00:52 +0000
committermichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2013-04-25 15:00:52 +0000
commit26c553d0b0b4edb6088324d44c9b05c513d4253e (patch)
tree2e712920fa5f79385b3a2f69e02f63bdca481984
parentbdb5e02835c2dd4120c0b189c2ac7c7ab88f82e1 (diff)
- Added basic support for libGeoIP
- Added exempt configuration option to resv{} blocks git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1858 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat
-rw-r--r--doc/reference.conf40
-rw-r--r--include/client.h1
-rw-r--r--include/conf.h16
-rw-r--r--include/ircd.h3
-rw-r--r--include/resv.h4
-rw-r--r--include/stdinc.h4
-rw-r--r--modules/core/m_join.c5
-rw-r--r--modules/m_info.c6
-rw-r--r--modules/m_resv.c4
-rw-r--r--src/channel.c4
-rw-r--r--src/conf.c12
-rw-r--r--src/conf_db.c22
-rw-r--r--src/conf_lexer.c2024
-rw-r--r--src/conf_lexer.l2
-rw-r--r--src/conf_parser.c2263
-rw-r--r--src/conf_parser.h240
-rw-r--r--src/conf_parser.y32
-rw-r--r--src/ircd.c7
-rw-r--r--src/resv.c122
-rw-r--r--src/s_bsd.c9
20 files changed, 2452 insertions, 2368 deletions
diff --git a/doc/reference.conf b/doc/reference.conf
index 66901ba..eebc917 100644
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -710,15 +710,31 @@ exempt {
/*
* resv {}: nicks and channels users may not use/join
*/
-resv { nick = "clone*"; reason = "Clone bots"; };
-resv { nick = "NickServ"; reason = "Reserved for services"; };
-resv { nick = "OperServ"; reason = "Reserved for services"; };
-resv { nick = "MemoServ"; reason = "Reserved for services"; };
-resv { nick = "BotServ"; reason = "Reserved for services"; };
-resv { nick = "HelpServ"; reason = "Reserved for services"; };
-resv { nick = "HostServ"; reason = "Reserved for services"; };
-resv { nick = "StatServ"; reason = "Reserved for services"; };
-resv { channel = "#*services*"; reason = "Reserved for services"; };
+resv { mask = "clone*"; reason = "Clone bots"; };
+resv { mask = "NickServ"; reason = "Reserved for services"; };
+resv { mask = "OperServ"; reason = "Reserved for services"; };
+resv { mask = "MemoServ"; reason = "Reserved for services"; };
+resv { mask = "BotServ"; reason = "Reserved for services"; };
+resv { mask = "HelpServ"; reason = "Reserved for services"; };
+resv { mask = "HostServ"; reason = "Reserved for services"; };
+resv { mask = "StatServ"; reason = "Reserved for services"; };
+resv { mask = "#*services*"; reason = "Reserved for services"; };
+
+resv {
+ /*
+ * mask: masks starting with a '#' are automatically considered
+ * as channel name mask
+ */
+ mask = "#helsinki";
+ reason = "Channel is reserved for finnish inhabitants";
+
+ /*
+ * exempt: can be either a ISO 3166 alpha-2 two letter country
+ * code, or a nick!user@host mask. CIDR is supported. Exempt
+ * entries can be stacked.
+ */
+ exempt = "FI";
+};
/*
* gecos {}: The X: replacement, used for banning users based on
@@ -764,12 +780,6 @@ channel {
disable_fake_channels = yes;
/*
- * restrict_channels: reverse channel RESVs logic, only reserved
- * channels are allowed
- */
- restrict_channels = no;
-
- /*
* knock_delay: The amount of time a user must wait between issuing
* the knock command.
*/
diff --git a/include/client.h b/include/client.h
index ed8ddb4..782101f 100644
--- a/include/client.h
+++ b/include/client.h
@@ -356,6 +356,7 @@ struct LocalUser
dlink_list invited; /**< chain of invite pointer blocks */
struct irc_ssaddr ip;
int aftype; /**< Makes life easier for DNS res in IPV6 */
+ int country_id; /**< ID corresponding to a ISO 3166 country code */
char *passwd;
fde_t fd;
diff --git a/include/conf.h b/include/conf.h
index fd1a3cf..faacd27 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -155,6 +155,7 @@ struct MaskItem
dlink_node node;
dlink_list leaf_list;
dlink_list hub_list;
+ dlink_list exempt_list;
enum maskitem_type type;
unsigned int dns_failed;
unsigned int dns_pending;
@@ -184,6 +185,20 @@ struct MaskItem
void *regexhost;
};
+struct exempt
+{
+ dlink_node node;
+ char *name;
+ char *user;
+ char *host;
+ size_t len;
+ time_t when;
+ struct irc_ssaddr addr;
+ int bits;
+ int type;
+ int coid;
+};
+
struct CidrItem
{
dlink_node node;
@@ -258,7 +273,6 @@ struct config_file_entry
struct config_channel_entry
{
int disable_fake_channels;
- int restrict_channels;
int knock_delay;
int knock_delay_channel;
unsigned int max_bans;
diff --git a/include/ircd.h b/include/ircd.h
index 5a1e4c4..7d8917b 100644
--- a/include/ircd.h
+++ b/include/ircd.h
@@ -88,6 +88,9 @@ struct ServerState_t
};
+#ifdef HAVE_LIBGEOIP
+extern GeoIP *geoip_ctx;
+#endif
extern char **myargv;
extern const char *infotext[];
extern const char *serno;
diff --git a/include/resv.h b/include/resv.h
index 85dd3cf..02dbee7 100644
--- a/include/resv.h
+++ b/include/resv.h
@@ -28,11 +28,11 @@
extern dlink_list nresv_items;
extern dlink_list resv_channel_list;
-extern struct MaskItem *create_channel_resv(const char *, const char *);
-extern struct MaskItem *create_nick_resv(const char *, const char *);
+extern struct MaskItem *create_resv(const char *, const char *, const dlink_list *);
extern void report_resv(struct Client *);
extern int valid_wild_card_simple(const char *);
+extern int resv_find_exempt(const struct Client *, const struct MaskItem *);
extern struct MaskItem *match_find_resv(const char *);
#endif /* INCLUDED_resv_h */
diff --git a/include/stdinc.h b/include/stdinc.h
index 4596f8a..3acaab9 100644
--- a/include/stdinc.h
+++ b/include/stdinc.h
@@ -51,6 +51,10 @@
#include <openssl/err.h>
#endif
+#ifdef HAVE_LIBGEOIP
+#include <GeoIP.h>
+#endif
+
#include <stdio.h>
#include <assert.h>
#include <time.h>
diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 2073d5d..f8eef23 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -135,10 +135,9 @@ m_join(struct Client *client_p, struct Client *source_p,
if (!IsExemptResv(source_p) &&
!(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv) &&
- (!(conf = match_find_resv(chan)) == ConfigChannel.restrict_channels))
+ ((conf = match_find_resv(chan)) && !resv_find_exempt(source_p, conf)))
{
- if (conf)
- ++conf->count;
+ ++conf->count;
sendto_one(source_p, form_str(ERR_CHANBANREASON), me.name, source_p->name,
chan, conf ? conf->reason : "Reserved channel");
sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
diff --git a/modules/m_info.c b/modules/m_info.c
index e03d06a..f2c29a1 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -151,12 +151,6 @@ static const struct InfoStruct info_table[] =
"Forbids channels with special ASCII characters in their name"
},
{
- "restrict_channels",
- OUTPUT_BOOLEAN_YN,
- &ConfigChannel.restrict_channels,
- "Only reserved channels are allowed"
- },
- {
"knock_delay",
OUTPUT_DECIMAL,
&ConfigChannel.knock_delay,
diff --git a/modules/m_resv.c b/modules/m_resv.c
index 6cdd293..9fd3cbb 100644
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -221,7 +221,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason)
{
struct MaskItem *conf = NULL;
- if ((conf = create_channel_resv(name, reason)) == NULL)
+ if ((conf = create_resv(name, reason, NULL)) == NULL)
{
sendto_one(source_p,
":%s NOTICE %s :A RESV has already been placed on channel: %s",
@@ -281,7 +281,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason)
return;
}
- if ((conf = create_nick_resv(name, reason)) == NULL)
+ if ((conf = create_resv(name, reason, NULL)) == NULL)
{
sendto_one(source_p,
":%s NOTICE %s :A RESV has already been placed on nick %s",
diff --git a/src/channel.c b/src/channel.c
index 888cf79..f20b4c1 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -708,12 +708,14 @@ find_channel_link(struct Client *client_p, struct Channel *chptr)
int
can_send(struct Channel *chptr, struct Client *source_p, struct Membership *ms)
{
+ struct MaskItem *conf = NULL;
+
if (IsServer(source_p) || HasFlag(source_p, FLAGS_SERVICE))
return CAN_SEND_OPV;
if (MyClient(source_p) && !IsExemptResv(source_p))
if (!(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv))
- if (!match_find_resv(chptr->chname) == ConfigChannel.restrict_channels)
+ if ((conf = match_find_resv(chptr->chname)) && !resv_find_exempt(source_p, conf))
return ERR_CANNOTSENDTOCHAN;
if (ms != NULL || (ms = find_channel_link(source_p, chptr)))
diff --git a/src/conf.c b/src/conf.c
index 6d6fc76..23e3a49 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -208,6 +208,17 @@ conf_free(struct MaskItem *conf)
free_dlink_node(ptr);
}
+ DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
+ {
+ struct exempt *exptr = ptr->data;
+
+ MyFree(exptr->name);
+ MyFree(exptr->user);
+ MyFree(exptr->host);
+ MyFree(exptr);
+ free_dlink_node(ptr);
+ }
+
MyFree(conf);
}
@@ -1340,7 +1351,6 @@ set_default_conf(void)
ConfigLoggingEntry.use_logging = 1;
ConfigChannel.disable_fake_channels = 0;
- ConfigChannel.restrict_channels = 0;
ConfigChannel.knock_delay = 300;
ConfigChannel.knock_delay_channel = 60;
ConfigChannel.max_chans_per_user = 25;
diff --git a/src/conf_db.c b/src/conf_db.c
index 5fb74da..87b00cd 100644
--- a/src/conf_db.c
+++ b/src/conf_db.c
@@ -907,24 +907,12 @@ load_resv_database(void)
SAFE_READ(read_uint64(&tmp64_setat, f));
SAFE_READ(read_uint64(&tmp64_hold, f));
- if (IsChanPrefix(*name))
- {
- if ((conf = create_channel_resv(name, reason)) == NULL)
- continue;
-
- conf->setat = tmp64_setat;
- conf->until = tmp64_hold;
- SetConfDatabase(conf);
- }
- else
- {
- if ((conf = create_nick_resv(name, reason)) == NULL)
- continue;
+ if ((conf = create_resv(name, reason, NULL)) == NULL)
+ continue;
- conf->setat = tmp64_setat;
- conf->until = tmp64_hold;
- SetConfDatabase(conf);
- }
+ conf->setat = tmp64_setat;
+ conf->until = tmp64_hold;
+ SetConfDatabase(conf);
MyFree(name);
MyFree(reason);
diff --git a/src/conf_lexer.c b/src/conf_lexer.c
index a75f2a2..a558707 100644
--- a/src/conf_lexer.c
+++ b/src/conf_lexer.c
@@ -373,7 +373,7 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[1596] =
+static yyconst flex_int16_t yy_accept[1583] =
{ 0,
4, 4, 250, 248, 4, 3, 248, 5, 248, 248,
6, 248, 248, 248, 248, 248, 248, 248, 248, 248,
@@ -384,7 +384,7 @@ static yyconst flex_int16_t yy_accept[1596] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 70, 0, 241, 0, 0, 0, 0, 0, 0,
- 0, 246, 0, 0, 0, 0, 0, 0, 0, 101,
+ 0, 246, 0, 0, 0, 0, 0, 0, 0, 102,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -410,9 +410,9 @@ static yyconst flex_int16_t yy_accept[1596] =
0, 0, 0, 65, 230, 0, 0, 0, 71, 72,
0, 0, 75, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 95, 0,
- 0, 0, 99, 0, 0, 0, 0, 0, 0, 109,
- 0, 0, 196, 0, 116, 0, 0, 0, 0, 0,
+ 82, 0, 0, 0, 0, 0, 0, 0, 96, 0,
+ 0, 0, 100, 0, 0, 0, 0, 0, 0, 110,
+ 0, 0, 196, 0, 117, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 130, 0, 0, 0, 0,
0, 0, 153, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 157, 0, 0, 0, 0,
@@ -427,130 +427,128 @@ static yyconst flex_int16_t yy_accept[1596] =
0, 0, 0, 0, 0, 245, 0, 0, 0, 0,
0, 224, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 121, 0, 124, 0, 0, 0, 0,
- 0, 0, 0, 143, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 122, 0, 125, 0, 0, 0, 0,
+ 0, 0, 143, 0, 0, 0, 0, 0, 0, 208,
- 208, 0, 154, 140, 0, 0, 0, 0, 0, 0,
- 141, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 167, 0, 0, 0, 225, 170, 221,
- 0, 0, 0, 11, 0, 0, 0, 0, 0, 0,
+ 0, 154, 140, 0, 0, 0, 0, 0, 0, 141,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 40, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 58, 0, 0, 0, 0, 0, 0, 239, 0,
- 0, 0, 0, 0, 0, 80, 220, 82, 0, 0,
+ 0, 0, 167, 0, 0, 0, 225, 170, 221, 0,
+ 0, 0, 11, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 244, 0, 232, 0, 0, 195, 223, 0, 0, 0,
+ 40, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 58, 0, 0, 0, 0, 0, 0, 239, 0, 0,
+ 0, 0, 0, 0, 80, 220, 83, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 244,
+ 0, 232, 0, 0, 195, 223, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 112, 0, 0, 0, 0,
- 0, 0, 120, 0, 0, 125, 126, 0, 0, 0,
- 0, 0, 234, 0, 144, 0, 0, 150, 0, 0,
+ 0, 0, 0, 0, 113, 0, 0, 0, 0, 0,
+ 0, 121, 0, 0, 126, 127, 0, 0, 0, 0,
+ 234, 0, 144, 0, 0, 150, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 159, 211, 0, 0, 0, 199, 0, 0,
- 0, 168, 217, 0, 169, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 18, 0, 22, 23, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 45,
- 0, 0, 0, 0, 0, 53, 0, 0, 0, 0,
+ 159, 211, 0, 0, 0, 199, 0, 0, 0, 168,
+ 217, 0, 169, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 18, 0, 22, 23, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 45, 0, 0,
+ 0, 0, 0, 53, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 231, 0, 0, 194,
- 209, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 231, 0, 0, 194, 209, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 128, 0, 0,
- 0, 0, 233, 0, 0, 0, 147, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 161, 160, 0, 198,
- 163, 0, 0, 0, 0, 0, 0, 0, 14, 218,
+ 0, 0, 0, 0, 0, 129, 0, 0, 0, 233,
+ 0, 0, 0, 147, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 161, 160, 0, 198, 163, 0, 0,
+ 0, 0, 0, 0, 0, 14, 218, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 213,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 213, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 67, 0, 0,
- 0, 0, 238, 0, 0, 0, 0, 0, 193, 0,
- 0, 0, 0, 85, 0, 0, 0, 0, 0, 0,
- 243, 86, 0, 0, 0, 0, 0, 106, 0, 0,
- 0, 105, 0, 111, 0, 214, 0, 0, 0, 0,
- 113, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 67, 0, 0, 0, 0, 238,
+ 0, 0, 0, 0, 0, 193, 0, 0, 0, 0,
+ 86, 0, 0, 0, 0, 0, 0, 243, 87, 0,
+ 0, 0, 0, 0, 107, 0, 0, 0, 106, 0,
+ 112, 0, 214, 0, 0, 0, 0, 114, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 15, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 38,
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 216, 0, 0, 237,
- 0, 0, 79, 0, 0, 0, 0, 0, 84, 87,
- 0, 0, 0, 0, 92, 242, 0, 0, 0, 0,
+ 0, 0, 0, 15, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 38, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 189, 0, 115, 0, 0, 0, 122, 123, 127, 0,
+ 0, 0, 216, 0, 0, 237, 0, 0, 79, 0,
+ 0, 0, 0, 0, 85, 88, 0, 0, 0, 0,
+ 93, 242, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 189, 0, 116, 0,
+ 0, 0, 123, 124, 128, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 162, 0, 0, 0,
- 1, 0, 1, 0, 0, 0, 0, 0, 204, 0,
+ 0, 162, 0, 0, 0, 1, 0, 1, 0, 0,
+ 0, 0, 0, 204, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 55,
+ 0, 0, 0, 0, 55, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 173, 0, 0,
+ 89, 0, 0, 0, 90, 0, 0, 0, 56, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 173, 0, 0, 88, 0, 0, 0, 89,
- 0, 0, 0, 56, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 117, 0,
- 0, 0, 0, 0, 0, 0, 145, 146, 0, 215,
+ 0, 0, 0, 118, 0, 0, 0, 0, 0, 0,
+ 145, 146, 0, 215, 151, 0, 0, 0, 0, 0,
- 151, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 24, 0, 0, 29,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 54, 0, 59, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 191, 182, 0, 83, 0,
- 0, 0, 197, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 201, 0, 114, 0,
- 119, 0, 131, 0, 0, 0, 0, 0, 0, 0,
+ 24, 0, 0, 29, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 54, 0, 59,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 191,
+ 182, 0, 84, 0, 0, 0, 197, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-
- 0, 0, 0, 0, 164, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 31, 0, 0, 0, 36, 39,
- 0, 0, 0, 47, 48, 0, 0, 0, 0, 62,
- 0, 0, 0, 0, 0, 0, 0, 0, 78, 0,
- 0, 0, 0, 0, 0, 0, 0, 97, 98, 100,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 118,
- 0, 0, 0, 0, 0, 219, 155, 0, 0, 0,
+ 201, 0, 115, 0, 120, 131, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 180, 0, 0, 0, 10, 0, 0, 0, 0, 0,
- 0, 0, 0, 35, 0, 43, 0, 0, 0, 0,
-
- 0, 0, 63, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 177, 0, 0, 96, 0, 0, 104,
- 0, 108, 0, 0, 0, 0, 0, 0, 0, 142,
- 148, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 165, 0, 0, 181, 183, 0, 0, 0, 16,
- 0, 0, 0, 0, 0, 0, 49, 51, 0, 0,
- 0, 0, 64, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 110,
+ 0, 0, 0, 0, 0, 0, 0, 164, 0, 0,
+
+ 0, 0, 0, 0, 0, 0, 0, 31, 0, 0,
+ 0, 36, 39, 0, 0, 0, 47, 48, 0, 0,
+ 0, 0, 62, 0, 0, 0, 0, 0, 0, 0,
+ 0, 78, 0, 0, 0, 0, 0, 0, 0, 0,
+ 98, 99, 101, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 119, 0, 0, 0, 0, 219, 155, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 180, 0, 0, 0, 10, 0, 0, 0,
+ 0, 0, 0, 0, 0, 35, 0, 43, 0, 0,
+ 0, 0, 0, 0, 63, 0, 0, 0, 0, 0,
+
+ 0, 0, 0, 0, 0, 177, 0, 0, 97, 0,
+ 0, 105, 0, 109, 0, 0, 0, 0, 0, 0,
+ 142, 148, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 165, 0, 0, 181, 183, 0, 0, 0,
+ 16, 0, 0, 0, 0, 0, 0, 49, 51, 0,
+ 0, 0, 0, 64, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 111, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 8, 178, 0, 0,
-
0, 0, 0, 0, 0, 0, 52, 0, 0, 0,
+
61, 68, 0, 0, 74, 0, 0, 0, 0, 0,
- 90, 0, 93, 0, 0, 107, 0, 0, 0, 0,
- 0, 0, 0, 139, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 19, 20, 0, 0, 0,
- 0, 0, 0, 0, 57, 0, 0, 73, 0, 0,
- 0, 0, 174, 91, 0, 0, 103, 0, 200, 190,
- 0, 0, 0, 0, 0, 0, 0, 184, 0, 0,
+ 91, 0, 94, 0, 0, 108, 0, 0, 0, 0,
+ 0, 0, 139, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 19, 20, 0, 0, 0, 0,
+ 0, 0, 0, 57, 0, 0, 73, 0, 0, 0,
+ 0, 174, 92, 0, 0, 104, 0, 200, 190, 0,
+ 0, 0, 0, 0, 0, 184, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-
- 0, 129, 0, 0, 0, 136, 138, 137, 187, 186,
- 185, 188, 0, 0, 0, 25, 0, 0, 0, 0,
- 172, 0, 0, 0, 0, 0, 175, 176, 0, 102,
- 0, 0, 0, 0, 0, 158, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 192, 0, 0, 0, 133,
- 0, 0, 0, 0, 0, 0, 0, 0, 60, 69,
- 0, 0, 0, 132, 135, 0, 0, 0, 0, 32,
- 0, 0, 76, 0, 17, 156, 0, 0, 0, 0,
- 50, 94, 0, 0, 0, 33, 0, 0, 27, 0,
- 0, 0, 26, 179, 0
-
+ 0, 0, 136, 138, 137, 187, 186, 185, 188, 0,
+
+ 0, 0, 25, 0, 0, 0, 0, 172, 0, 0,
+ 0, 0, 0, 175, 176, 0, 103, 0, 0, 0,
+ 0, 0, 158, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 192, 0, 0, 0, 133, 0, 0, 0,
+ 0, 0, 0, 0, 0, 60, 69, 0, 0, 0,
+ 132, 135, 0, 0, 0, 0, 32, 0, 0, 76,
+ 0, 17, 156, 0, 0, 0, 0, 50, 95, 0,
+ 0, 0, 33, 0, 0, 27, 0, 0, 0, 26,
+ 179, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -596,13 +594,13 @@ static yyconst flex_int32_t yy_meta[69] =
1, 1, 1, 1, 1, 1, 1, 1
} ;
-static yyconst flex_int16_t yy_base[1601] =
+static yyconst flex_int16_t yy_base[1588] =
{ 0,
- 0, 0, 3059, 3060, 3056, 0, 66, 0, 64, 66,
+ 0, 0, 3034, 3035, 3031, 0, 66, 0, 64, 66,
66, 98, 43, 146, 75, 58, 85, 76, 117, 109,
51, 154, 155, 197, 239, 53, 177, 57, 143, 283,
- 323, 190, 122, 168, 128, 175, 3055, 0, 86, 3060,
- 0, 3060, 170, 3060, 0, 220, 191, 188, 188, 198,
+ 323, 190, 122, 168, 128, 175, 3030, 0, 86, 3035,
+ 0, 3035, 170, 3035, 0, 220, 191, 188, 188, 198,
200, 202, 203, 204, 220, 223, 240, 239, 245, 231,
227, 276, 278, 244, 237, 254, 261, 271, 308, 287,
288, 305, 300, 329, 335, 298, 332, 330, 335, 331,
@@ -611,352 +609,348 @@ static yyconst flex_int16_t yy_base[1601] =
387, 397, 416, 389, 386, 433, 392, 469, 409, 471,
438, 434, 412, 422, 429, 428, 450, 438, 445, 440,
- 447, 3014, 459, 475, 518, 488, 479, 493, 505, 487,
- 507, 495, 508, 505, 499, 3060, 518, 535, 509, 526,
- 521, 3013, 525, 530, 527, 528, 529, 538, 540, 555,
- 541, 563, 540, 564, 3060, 567, 559, 557, 562, 571,
+ 447, 2989, 459, 475, 518, 488, 479, 493, 505, 487,
+ 507, 495, 508, 505, 499, 3035, 518, 535, 509, 526,
+ 521, 2988, 525, 530, 527, 528, 529, 538, 540, 555,
+ 541, 563, 540, 564, 3035, 567, 559, 557, 562, 571,
563, 577, 570, 579, 573, 582, 586, 578, 581, 592,
- 584, 597, 596, 611, 582, 586, 3012, 598, 609, 137,
- 605, 601, 615, 608, 629, 628, 624, 616, 622, 3060,
- 627, 3011, 619, 640, 623, 626, 631, 647, 652, 651,
+ 584, 597, 596, 611, 582, 586, 2987, 598, 609, 137,
+ 605, 601, 615, 608, 629, 628, 624, 616, 622, 3035,
+ 627, 2986, 619, 640, 623, 626, 631, 647, 652, 651,
633, 647, 645, 666, 665, 652, 667, 654, 667, 670,
- 664, 670, 684, 686, 672, 670, 684, 690, 697, 3060,
- 686, 685, 3010, 691, 705, 688, 3060, 694, 696, 3060,
- 716, 711, 704, 711, 3060, 708, 707, 714, 722, 716,
+ 664, 670, 684, 686, 672, 670, 684, 690, 697, 3035,
+ 686, 685, 2985, 691, 705, 688, 3035, 694, 696, 3035,
+ 716, 711, 704, 711, 3035, 708, 707, 714, 722, 716,
735, 729, 738, 740, 724, 734, 735, 740, 750, 747,
- 748, 741, 749, 748, 754, 753, 754, 759, 3060, 766,
- 764, 767, 767, 3009, 3060, 781, 3060, 766, 787, 788,
- 782, 783, 3008, 779, 779, 795, 3060, 3060, 794, 781,
- 3060, 785, 804, 804, 3007, 798, 802, 790, 811, 801,
- 800, 815, 3060, 803, 811, 3060, 813, 816, 830, 836,
-
- 825, 833, 3006, 3060, 827, 835, 832, 834, 3060, 3060,
- 3005, 849, 3004, 853, 851, 846, 3003, 841, 858, 851,
- 863, 895, 867, 872, 856, 891, 867, 877, 3060, 872,
- 3002, 874, 3001, 878, 875, 893, 894, 902, 909, 920,
- 3000, 894, 3060, 2999, 3060, 921, 906, 913, 915, 916,
- 922, 922, 931, 931, 951, 2998, 938, 942, 941, 966,
- 954, 941, 3060, 950, 960, 958, 3028, 989, 953, 954,
- 962, 3028, 2995, 981, 983, 3060, 982, 974, 986, 988,
- 987, 985, 996, 3060, 1001, 990, 997, 2994, 997, 997,
- 1012, 999, 1002, 1005, 1017, 1023, 1015, 1015, 3060, 1018,
-
- 1026, 2993, 1036, 1044, 3060, 1042, 1045, 3060, 1037, 1042,
- 1042, 3060, 1049, 1044, 3060, 1044, 1058, 1044, 1052, 1063,
- 3060, 1064, 3060, 1069, 2992, 1059, 1056, 1057, 1070, 1066,
- 1073, 3060, 1082, 1079, 1079, 1084, 1076, 1097, 1076, 2991,
- 2990, 1089, 2989, 1089, 1086, 1104, 1109, 1112, 1106, 1104,
- 1116, 1106, 1115, 1122, 1124, 1107, 1106, 1128, 1130, 1123,
- 1137, 1125, 1139, 1140, 1136, 1152, 1139, 1154, 1153, 1161,
- 1155, 1150, 1150, 2988, 1171, 1159, 1154, 1175, 1185, 1171,
- 2987, 1174, 1177, 3060, 1184, 3060, 1184, 1191, 1180, 1199,
- 1204, 1192, 1207, 3060, 1200, 1202, 1218, 1207, 1220, 2986,
-
- 3060, 1225, 2985, 3060, 1245, 1220, 1224, 2984, 1211, 1228,
- 3060, 1220, 1215, 1223, 1223, 1236, 1231, 1232, 1243, 1237,
- 1248, 1256, 1249, 3012, 1249, 1253, 1267, 3060, 3060, 3060,
- 1270, 2982, 1256, 3060, 1267, 1262, 1266, 1273, 1268, 1279,
- 1275, 1279, 1275, 1275, 1276, 1282, 1294, 1290, 1294, 1288,
- 2981, 3060, 1310, 2980, 1299, 1304, 1314, 2979, 1298, 2978,
- 1317, 2977, 1320, 1323, 1310, 2976, 1328, 1322, 3060, 1328,
- 1317, 1336, 1338, 1346, 1345, 3060, 3060, 3060, 1347, 1338,
- 1352, 1349, 1345, 1360, 1359, 1364, 1357, 1353, 1357, 1355,
- 3060, 1358, 1362, 1370, 1369, 1365, 3060, 1381, 1384, 1389,
-
- 1380, 1385, 1390, 1395, 1387, 1385, 1400, 2975, 1391, 1405,
- 1400, 1400, 1415, 1406, 1420, 3060, 1406, 1410, 1417, 1407,
- 1414, 2974, 3060, 1417, 1430, 3060, 1434, 1417, 1435, 1416,
- 1433, 1442, 1426, 1446, 1441, 1450, 1437, 3060, 1445, 1448,
- 1447, 1448, 1452, 1461, 2973, 1455, 1487, 1466, 2972, 1464,
- 2971, 1466, 3060, 3060, 1476, 1478, 1466, 3060, 1484, 1486,
- 1484, 3060, 3060, 1479, 3060, 1494, 1485, 1484, 1506, 1510,
- 1498, 1510, 1506, 1505, 1501, 3060, 1504, 3060, 1521, 2970,
- 1512, 2969, 2968, 2967, 1528, 1522, 1523, 1522, 2966, 3060,
- 1519, 1529, 1535, 1540, 1535, 3060, 1530, 1545, 1538, 1543,
-
- 1538, 1542, 1547, 1561, 1553, 1551, 1567, 1564, 1550, 1571,
- 1559, 1576, 1581, 1568, 1574, 1584, 1589, 1580, 1592, 1597,
- 1588, 1598, 1595, 1595, 1603, 1602, 3060, 1604, 1587, 3060,
- 3060, 1606, 1593, 2965, 1616, 1612, 1600, 2964, 2963, 1617,
- 1607, 1610, 1605, 1620, 1623, 1621, 1626, 1633, 1639, 1630,
- 1635, 1642, 1638, 1644, 1636, 1638, 1657, 3060, 1640, 1656,
- 1641, 1652, 3060, 1646, 1657, 1657, 1654, 1665, 1661, 1665,
- 1667, 1664, 1678, 1684, 1678, 1673, 2962, 2961, 2960, 2959,
- 2958, 1691, 1692, 2957, 1695, 2956, 3060, 3060, 1697, 3060,
- 3060, 1698, 2955, 90, 1705, 1689, 1697, 1697, 3060, 3060,
-
- 1708, 1710, 1703, 1705, 1700, 1719, 1710, 1730, 1711, 1711,
- 1724, 1721, 3060, 1724, 1731, 1731, 1749, 1746, 1739, 1739,
- 1750, 1755, 1747, 1761, 1759, 1744, 1753, 3060, 1754, 1766,
- 1757, 1754, 1755, 1774, 1769, 1771, 1772, 1769, 3060, 1771,
- 1778, 1793, 1777, 3060, 1790, 2954, 1798, 1799, 1802, 1799,
- 1791, 3060, 1804, 1800, 1796, 1812, 1804, 3060, 1815, 1807,
- 1817, 3060, 1820, 3060, 1811, 3060, 1803, 1814, 1831, 1816,
- 3060, 1827, 1834, 1830, 2953, 1842, 1828, 1829, 1842, 2952,
- 1844, 1857, 1850, 1842, 1860, 1861, 2951, 1865, 1849, 1865,
- 1852, 1865, 1871, 1863, 1878, 1875, 1877, 1867, 1872, 1874,
-
- 1875, 2950, 1868, 1878, 1893, 1896, 1898, 1896, 1896, 1924,
- 2987, 2975, 1893, 1914, 2947, 2943, 2942, 3060, 1906, 1916,
- 1917, 1912, 1910, 1913, 1909, 1930, 1928, 1930, 1934, 3060,
- 1923, 1933, 1931, 1940, 1941, 1931, 2940, 1925, 1935, 1949,
- 1932, 1941, 2939, 1967, 1950, 1952, 2937, 1960, 1961, 3060,
- 1956, 1974, 3060, 1977, 1960, 2936, 1962, 1972, 3060, 3060,
- 1986, 1967, 1967, 2935, 3060, 3060, 1976, 1970, 1969, 1989,
- 1994, 1990, 2934, 1986, 1989, 1986, 2007, 2933, 2932, 2005,
- 2930, 2004, 3060, 2013, 2018, 2011, 3060, 3060, 3060, 2023,
- 2013, 2010, 2029, 2011, 2031, 2023, 2025, 2036, 2038, 2025,
-
- 2035, 2040, 2030, 2029, 2033, 2034, 2045, 2039, 2042, 2044,
- 2046, 2044, 2051, 2056, 2062, 2072, 3060, 2066, 2071, 2967,
- 2965, 2952, 2950, 2065, 2066, 2082, 2085, 2069, 3060, 2079,
- 2078, 2081, 2085, 2084, 2080, 2091, 2090, 2100, 2086, 2099,
- 2091, 2098, 2094, 2104, 2102, 2118, 2121, 2116, 2127, 3060,
- 2129, 2131, 2120, 2137, 2921, 2121, 2129, 2920, 1448, 2130,
- 2122, 2124, 3060, 2134, 2132, 3060, 2144, 2149, 2147, 3060,
- 2138, 2147, 2156, 3060, 2147, 2144, 2153, 2163, 2155, 1151,
- 2157, 938, 2156, 2159, 2164, 2166, 2169, 2186, 3060, 2191,
- 2189, 2188, 2178, 2195, 864, 2186, 3060, 3060, 2202, 3060,
-
- 3060, 2195, 2202, 2197, 861, 844, 2207, 843, 2191, 2206,
- 2208, 2209, 2211, 2208, 2211, 2217, 2204, 2214, 2222, 2225,
- 2213, 2224, 2230, 2221, 2245, 842, 3060, 2233, 2241, 3060,
- 2244, 2249, 2240, 2243, 2250, 2239, 465, 2249, 2253, 2259,
- 2245, 2258, 2249, 3060, 437, 3060, 2252, 2261, 2266, 2265,
- 2257, 2264, 2280, 2270, 2273, 431, 3060, 2291, 3060, 2298,
- 2288, 2291, 3060, 2301, 2305, 2291, 2308, 2307, 2294, 2300,
- 2296, 2301, 2315, 2300, 2308, 2317, 3060, 2316, 3060, 2314,
- 3060, 2329, 3060, 425, 2321, 2316, 2324, 2340, 2342, 2347,
- 2341, 2341, 2343, 2345, 2359, 2344, 2345, 2347, 2348, 2354,
-
- 2350, 2351, 2369, 2352, 3060, 2359, 2360, 2358, 2363, 2370,
- 2373, 2375, 2382, 2368, 3060, 423, 2371, 2378, 3060, 3060,
- 2387, 2385, 2392, 3060, 3060, 2404, 2390, 2409, 2399, 3060,
- 2407, 2398, 2403, 422, 420, 2405, 2412, 2413, 3060, 2420,
- 2406, 2412, 2420, 2424, 2416, 2431, 2429, 3060, 3060, 3060,
- 418, 2420, 2434, 2431, 2426, 416, 2430, 2433, 2442, 3060,
- 2444, 2450, 2457, 2460, 2461, 3060, 3060, 2467, 2461, 2466,
- 381, 2468, 2472, 380, 339, 289, 287, 2470, 2471, 281,
- 3060, 2476, 2473, 2462, 3060, 2466, 2463, 2464, 2470, 2484,
- 280, 2487, 2487, 3060, 2479, 3060, 2482, 2481, 259, 2491,
-
- 2496, 2496, 3060, 2496, 2496, 2515, 2499, 2509, 2511, 2517,
- 249, 2520, 2508, 3060, 2522, 2512, 3060, 2512, 2520, 3060,
- 2530, 3060, 2532, 2533, 2516, 2524, 2527, 2539, 2521, 3060,
- 3060, 2528, 2531, 2533, 2554, 2543, 2554, 2554, 2555, 2557,
- 2559, 3060, 237, 2570, 3060, 3060, 2574, 2575, 236, 3060,
- 2559, 2567, 2564, 2576, 229, 2566, 3060, 257, 2584, 2575,
- 200, 2572, 3060, 2573, 2579, 2581, 2593, 2595, 2601, 2599,
- 2599, 2599, 2597, 2619, 2608, 2617, 2610, 2629, 2627, 3060,
- 2621, 2630, 2611, 152, 2632, 2618, 2631, 2631, 2634, 2638,
- 2631, 2632, 2634, 2635, 2638, 2642, 3060, 3060, 2643, 144,
-
- 2637, 2656, 2649, 2670, 2671, 2668, 3060, 2657, 2674, 2667,
- 3060, 3060, 2670, 2666, 3060, 150, 2673, 2673, 2671, 2672,
- 3060, 2684, 145, 2681, 2674, 3060, 2684, 2678, 2694, 2688,
- 124, 2696, 109, 3060, 2688, 2694, 2693, 2706, 2700, 2703,
- 2710, 2713, 2713, 2716, 2727, 3060, 3060, 2720, 2718, 2733,
- 2726, 2726, 2740, 2726, 3060, 2729, 2732, 3060, 2735, 2734,
- 2745, 2746, 3060, 3060, 2734, 2745, 3060, 2744, 3060, 3060,
- 2738, 2754, 2753, 2758, 2762, 2764, 2772, 3060, 2754, 2757,
- 2760, 2761, 2768, 2775, 2773, 2774, 2773, 2779, 2784, 2786,
- 2795, 2800, 2797, 2799, 2796, 2802, 2790, 2792, 2802, 2794,
-
- 2811, 3060, 2809, 2808, 2814, 3060, 3060, 3060, 3060, 3060,
- 3060, 3060, 2821, 2829, 2817, 3060, 2834, 100, 2835, 2829,
- 3060, 2824, 2828, 2845, 2836, 2839, 3060, 3060, 2839, 3060,
- 2835, 2842, 2850, 2844, 2855, 3060, 2858, 2843, 2859, 2852,
- 2864, 2859, 2851, 2852, 2865, 3060, 2861, 2875, 2882, 3060,
- 2885, 2888, 2887, 95, 2881, 2879, 2886, 2887, 3060, 3060,
- 2883, 2893, 2902, 3060, 3060, 2888, 2903, 2906, 2889, 3060,
- 2908, 2899, 3060, 2910, 3060, 3060, 93, 2901, 2904, 2900,
- 3060, 3060, 2902, 2903, 2906, 3060, 2919, 2917, 3060, 2925,
- 2921, 2939, 3060, 3060, 3060, 105, 2986, 97, 84, 81
-
+ 748, 741, 749, 748, 754, 753, 754, 759, 3035, 766,
+ 764, 767, 767, 2984, 3035, 781, 3035, 766, 787, 788,
+ 782, 783, 2983, 779, 779, 795, 3035, 3035, 794, 781,
+ 3035, 785, 804, 804, 2982, 798, 802, 790, 811, 801,
+ 800, 815, 3035, 803, 811, 3035, 813, 816, 830, 836,
+
+ 825, 833, 2981, 3035, 827, 835, 832, 834, 3035, 3035,
+ 2980, 849, 2979, 853, 851, 846, 2978, 841, 858, 851,
+ 863, 895, 867, 872, 856, 891, 867, 877, 3035, 872,
+ 2977, 874, 2976, 878, 875, 893, 894, 902, 909, 920,
+ 2975, 894, 3035, 2974, 3035, 921, 906, 913, 915, 916,
+ 922, 922, 931, 931, 951, 2973, 938, 942, 941, 960,
+ 954, 941, 3035, 950, 960, 958, 3003, 968, 956, 956,
+ 966, 3003, 2970, 981, 983, 3035, 988, 974, 986, 988,
+ 987, 985, 996, 3035, 1001, 988, 995, 2969, 994, 996,
+ 1011, 998, 997, 999, 1014, 1020, 1015, 1011, 3035, 1010,
+
+ 1018, 2968, 1031, 1036, 3035, 1036, 1044, 3035, 1036, 1040,
+ 1039, 3035, 1045, 1043, 3035, 1043, 1056, 1042, 1050, 1062,
+ 3035, 1062, 3035, 1068, 2967, 1058, 1055, 1052, 1064, 1063,
+ 1071, 3035, 1078, 1077, 1074, 1078, 1069, 1089, 1070, 2966,
+ 2965, 1088, 2964, 1088, 1084, 1101, 1105, 1111, 1106, 1101,
+ 1112, 1105, 1112, 1122, 1123, 1106, 1101, 1122, 1127, 1119,
+ 1131, 1119, 1135, 1140, 1126, 1143, 1137, 1152, 1150, 1157,
+ 1154, 1149, 1148, 2963, 1169, 1159, 1149, 1173, 1176, 1164,
+ 2962, 1168, 1171, 3035, 1171, 3035, 1183, 1187, 1180, 1195,
+ 1192, 1199, 3035, 1193, 1193, 1213, 1205, 1217, 2961, 3035,
+
+ 1221, 2960, 3035, 1219, 1218, 1224, 2959, 1212, 1228, 3035,
+ 1220, 1211, 1221, 1222, 1234, 1230, 1231, 1237, 1228, 1238,
+ 1247, 1242, 2987, 1247, 1250, 1262, 3035, 3035, 3035, 1263,
+ 2957, 1251, 3035, 1265, 1259, 1262, 1269, 1265, 1276, 1271,
+ 1276, 1268, 1267, 1268, 1273, 1288, 1281, 1286, 1279, 2956,
+ 3035, 1299, 2955, 1290, 1294, 1319, 2954, 1289, 2953, 1307,
+ 2952, 1313, 1313, 1300, 2951, 1319, 1316, 3035, 1322, 1314,
+ 1331, 1335, 1339, 1337, 3035, 3035, 3035, 1339, 1329, 1346,
+ 1340, 1337, 1348, 1351, 1355, 1349, 1347, 1355, 1352, 3035,
+ 1353, 1356, 1365, 1364, 1363, 3035, 1378, 1380, 1385, 1377,
+
+ 1382, 1386, 1392, 1380, 1377, 1392, 2950, 1382, 1399, 1391,
+ 1392, 1406, 1395, 1411, 3035, 1396, 1401, 1410, 1405, 1411,
+ 2949, 3035, 1412, 1424, 3035, 1429, 1412, 1412, 1428, 1436,
+ 1421, 1441, 1436, 1442, 1428, 3035, 1436, 1438, 1437, 1437,
+ 1441, 1451, 2948, 1443, 1474, 1454, 2947, 1453, 2946, 1456,
+ 3035, 3035, 1468, 1475, 1461, 3035, 1481, 1487, 1485, 3035,
+ 3035, 1479, 3035, 1491, 1482, 1479, 1498, 1501, 1489, 1500,
+ 1496, 1494, 1490, 3035, 1494, 3035, 1509, 2945, 1500, 2944,
+ 2943, 2942, 1517, 1512, 1515, 1518, 2941, 3035, 1513, 1521,
+ 1528, 1534, 1529, 3035, 1525, 1539, 1532, 1536, 1532, 1537,
+
+ 1542, 1553, 1544, 1542, 1557, 1554, 1539, 1560, 1549, 1564,
+ 1569, 1557, 1564, 1576, 1585, 1574, 1584, 1590, 1582, 1592,
+ 1590, 1589, 1596, 1595, 3035, 1597, 1581, 3035, 3035, 1601,
+ 1588, 2940, 1608, 1603, 1591, 2939, 2938, 1607, 1597, 1599,
+ 1594, 1610, 1611, 1609, 1615, 1623, 1631, 1626, 1629, 1634,
+ 1631, 1638, 1630, 1633, 1651, 3035, 1648, 1632, 1644, 3035,
+ 1639, 1651, 1647, 1644, 1655, 1650, 1654, 1652, 1651, 1665,
+ 1671, 1661, 1660, 2937, 2936, 2935, 2934, 2933, 1679, 1681,
+ 2932, 1685, 2931, 3035, 3035, 1690, 3035, 3035, 1689, 2930,
+ 90, 1696, 1681, 1690, 1689, 3035, 3035, 1701, 1702, 1695,
+
+ 1696, 1692, 1706, 1705, 1730, 1706, 1701, 1714, 1710, 3035,
+ 1704, 1715, 1712, 1737, 1735, 1729, 1732, 1741, 1746, 1739,
+ 1754, 1751, 1737, 1745, 3035, 1746, 1757, 1749, 1747, 1749,
+ 1764, 1759, 1761, 1761, 1758, 3035, 1760, 1767, 1783, 1765,
+ 3035, 1778, 2929, 1787, 1789, 1794, 1794, 1784, 3035, 1795,
+ 1791, 1788, 1806, 1795, 3035, 1808, 1799, 1809, 3035, 1811,
+ 3035, 1802, 3035, 1797, 1804, 1821, 1806, 3035, 1816, 1823,
+ 1819, 2928, 1831, 1818, 1817, 1830, 1833, 1847, 1842, 1837,
+ 1853, 1852, 2927, 1856, 1841, 1858, 1844, 1858, 1863, 1855,
+ 1869, 1867, 1870, 1861, 1862, 1864, 1865, 2926, 1857, 1867,
+
+ 1882, 1885, 1888, 1884, 1884, 1913, 2963, 2951, 1886, 1909,
+ 2923, 2922, 2921, 3035, 1899, 1908, 1910, 1905, 1902, 1906,
+ 1901, 1922, 1919, 1922, 1926, 3035, 1915, 1924, 1921, 1930,
+ 1931, 1921, 2920, 1914, 1924, 1938, 1921, 1930, 2919, 1960,
+ 1940, 1940, 2918, 1948, 1954, 3035, 1951, 1966, 3035, 1970,
+ 1952, 2917, 1955, 1964, 3035, 3035, 1975, 1959, 1960, 2916,
+ 3035, 3035, 1969, 1962, 1960, 1979, 1984, 1981, 2915, 1975,
+ 1978, 1975, 1996, 2914, 2913, 1995, 2912, 1992, 3035, 2001,
+ 2011, 2006, 3035, 3035, 3035, 2003, 2001, 2020, 2002, 2021,
+ 2014, 2016, 2026, 2028, 2016, 2026, 2030, 2019, 2018, 2021,
+
+ 2023, 2033, 2027, 2028, 2031, 2033, 2031, 2038, 2039, 2048,
+ 2062, 3035, 2058, 2061, 2949, 2942, 2924, 2919, 2056, 2057,
+ 2073, 2075, 2060, 3035, 2070, 2068, 2071, 2076, 2075, 2070,
+ 2080, 2079, 2088, 2075, 2087, 2079, 2084, 2081, 2091, 2089,
+ 2105, 2104, 2102, 2117, 3035, 2121, 2121, 2111, 2128, 2891,
+ 2112, 2119, 2886, 2884, 2121, 2113, 2114, 3035, 2124, 2123,
+ 3035, 2135, 2139, 2136, 3035, 2127, 2135, 2145, 3035, 2135,
+ 2132, 2139, 2150, 2142, 1694, 2144, 1435, 2143, 2142, 2150,
+ 2156, 2161, 2176, 3035, 2182, 2180, 2167, 2183, 864, 2176,
+ 3035, 3035, 2191, 3035, 3035, 2184, 2191, 2187, 861, 844,
+
+ 2196, 843, 2179, 2194, 2195, 2196, 2198, 2195, 2196, 2201,
+ 2189, 2199, 2206, 2207, 2194, 2207, 2217, 2210, 2234, 842,
+ 3035, 2222, 2230, 3035, 2233, 2237, 2230, 2232, 2239, 2228,
+ 465, 2239, 2242, 2247, 2233, 2245, 2236, 3035, 437, 3035,
+ 2239, 2240, 2253, 2251, 2244, 2251, 2268, 2250, 2256, 431,
+ 3035, 2278, 3035, 2288, 2277, 2280, 3035, 2289, 2292, 2278,
+ 2296, 2295, 2282, 2288, 2285, 2290, 2303, 2288, 2295, 2304,
+ 3035, 2302, 3035, 2299, 3035, 3035, 425, 2303, 2299, 2306,
+ 2320, 2320, 2327, 2325, 2329, 2330, 2332, 2346, 2330, 2331,
+ 2332, 2335, 2341, 2337, 2338, 2357, 2339, 3035, 2346, 2346,
+
+ 2344, 2348, 2356, 2357, 2358, 2364, 2351, 3035, 423, 2353,
+ 2358, 3035, 3035, 2365, 2365, 2376, 3035, 3035, 2392, 2377,
+ 2396, 2386, 3035, 2393, 2384, 2388, 422, 420, 2392, 2399,
+ 2400, 3035, 2407, 2394, 2399, 2407, 2410, 2402, 2416, 2415,
+ 3035, 3035, 3035, 418, 2404, 2417, 2413, 2409, 416, 2412,
+ 2413, 2420, 3035, 2427, 2440, 2446, 2446, 3035, 3035, 2452,
+ 2446, 2451, 381, 2452, 2456, 380, 339, 289, 287, 2456,
+ 2457, 281, 3035, 2462, 2459, 2448, 3035, 2452, 2448, 2449,
+ 2454, 2468, 280, 2470, 2469, 3035, 2460, 3035, 2462, 2461,
+ 259, 2466, 2473, 2471, 3035, 2473, 2479, 2501, 2484, 2494,
+
+ 2496, 2502, 249, 2504, 2492, 3035, 2508, 2498, 3035, 2498,
+ 2506, 3035, 2516, 3035, 2518, 2518, 2501, 2508, 2520, 2502,
+ 3035, 3035, 2508, 2510, 2510, 2527, 2515, 2528, 2526, 2531,
+ 2538, 2543, 3035, 237, 2553, 3035, 3035, 2557, 2559, 236,
+ 3035, 2542, 2550, 2550, 2558, 229, 2550, 3035, 257, 2568,
+ 2560, 200, 2556, 3035, 2557, 2562, 2564, 2574, 2576, 2581,
+ 2568, 2579, 2579, 2574, 2591, 2584, 2598, 2594, 2612, 2610,
+ 3035, 2605, 2593, 152, 2614, 2600, 2615, 2615, 2617, 2621,
+ 2614, 2615, 2616, 2617, 2618, 2621, 3035, 3035, 2622, 144,
+ 2615, 2632, 2619, 2640, 2640, 2639, 3035, 2628, 2648, 2646,
+
+ 3035, 3035, 2652, 2647, 3035, 150, 2655, 2655, 2653, 2654,
+ 3035, 2666, 145, 2665, 2658, 3035, 2667, 2661, 2677, 124,
+ 2677, 109, 3035, 2669, 2673, 2671, 2683, 2677, 2678, 2679,
+ 2680, 2680, 2682, 2697, 3035, 3035, 2689, 2690, 2710, 2706,
+ 2706, 2720, 2707, 3035, 2710, 2713, 3035, 2716, 2717, 2727,
+ 2728, 3035, 3035, 2715, 2727, 3035, 2725, 3035, 3035, 2732,
+ 2730, 2734, 2737, 2738, 2740, 3035, 2720, 2721, 2724, 2726,
+ 2736, 2742, 2743, 2749, 2752, 2757, 2763, 2766, 2775, 2780,
+ 2777, 2780, 2777, 2782, 2770, 2772, 2782, 2772, 2788, 2785,
+ 2783, 2788, 3035, 3035, 3035, 3035, 3035, 3035, 3035, 2789,
+
+ 2795, 2781, 3035, 2798, 100, 2800, 2797, 3035, 2791, 2798,
+ 2820, 2815, 2817, 3035, 3035, 2818, 3035, 2815, 2822, 2830,
+ 2824, 2836, 3035, 2839, 2823, 2839, 2832, 2844, 2837, 2828,
+ 2828, 2840, 3035, 2835, 2843, 2848, 3035, 2849, 2852, 2852,
+ 95, 2849, 2846, 2856, 2862, 3035, 3035, 2862, 2871, 2881,
+ 3035, 3035, 2868, 2883, 2886, 2869, 3035, 2889, 2880, 3035,
+ 2890, 3035, 3035, 93, 2881, 2884, 2880, 3035, 3035, 2880,
+ 2880, 2882, 3035, 2894, 2891, 3035, 2893, 2887, 2903, 3035,
+ 3035, 3035, 105, 2950, 97, 84, 81
} ;
-static yyconst flex_int16_t yy_def[1601] =
+static yyconst flex_int16_t yy_def[1588] =
{ 0,
- 1595, 1, 1595, 1595, 1595, 1596, 1597, 1598, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1596, 1597, 1595,
- 1598, 1595, 1595, 1595, 1598, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1599, 1600, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1599,
- 1599, 1600, 1600, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 0, 1595, 1595, 1595, 1595, 1595
-
+ 1582, 1, 1582, 1582, 1582, 1583, 1584, 1585, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1583, 1584, 1582,
+ 1585, 1582, 1582, 1582, 1585, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1586, 1587, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1586, 1586, 1587, 1587, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 0, 1582, 1582, 1582, 1582, 1582
} ;
-static yyconst flex_int16_t yy_nxt[3129] =
+static yyconst flex_int16_t yy_nxt[3104] =
{ 0,
4, 5, 6, 7, 8, 4, 9, 10, 11, 11,
11, 11, 11, 4, 4, 12, 13, 14, 15, 16,
@@ -966,54 +960,54 @@ static yyconst flex_int16_t yy_nxt[3129] =
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 4, 40, 40,
42, 44, 53, 45, 46, 46, 46, 46, 46, 66,
- 83, 1022, 54, 102, 1020, 67, 68, 43, 40, 40,
- 61, 910, 106, 911, 62, 74, 69, 41, 63, 53,
+ 83, 1017, 54, 102, 1015, 67, 68, 43, 40, 40,
+ 61, 906, 106, 907, 62, 74, 69, 41, 63, 53,
- 70, 64, 75, 912, 65, 38, 66, 83, 71, 54,
+ 70, 64, 75, 908, 65, 38, 66, 83, 71, 54,
102, 72, 67, 68, 43, 47, 48, 61, 49, 106,
73, 62, 74, 69, 50, 63, 51, 70, 64, 75,
- 80, 65, 76, 52, 1583, 71, 1568, 81, 72, 82,
- 77, 1539, 47, 48, 127, 49, 78, 73, 309, 310,
- 1474, 50, 79, 51, 130, 1446, 1447, 80, 107, 76,
- 52, 55, 108, 56, 81, 1472, 82, 77, 57, 58,
+ 80, 65, 76, 52, 1570, 71, 1555, 81, 72, 82,
+ 77, 1526, 47, 48, 127, 49, 78, 73, 309, 310,
+ 1462, 50, 79, 51, 130, 1435, 1436, 80, 107, 76,
+ 52, 55, 108, 56, 81, 1460, 82, 77, 57, 58,
84, 127, 59, 78, 88, 60, 109, 85, 89, 79,
- 86, 130, 87, 128, 90, 107, 1465, 129, 55, 108,
- 56, 1459, 103, 1432, 131, 57, 58, 84, 132, 59,
+ 86, 130, 87, 128, 90, 107, 1454, 129, 55, 108,
+ 56, 1448, 103, 1421, 131, 57, 58, 84, 132, 59,
104, 88, 60, 109, 85, 89, 105, 86, 133, 87,
128, 90, 91, 92, 129, 134, 93, 124, 125, 103,
94, 131, 135, 126, 136, 132, 95, 104, 46, 46,
46, 46, 46, 105, 137, 133, 138, 139, 140, 91,
- 92, 1410, 134, 93, 124, 125, 141, 94, 142, 135,
+ 92, 1400, 134, 93, 124, 125, 141, 94, 142, 135,
126, 136, 143, 95, 96, 144, 97, 145, 98, 148,
- 146, 137, 99, 138, 139, 140, 149, 157, 100, 1407,
- 1405, 158, 159, 141, 101, 142, 160, 1399, 1395, 143,
+ 146, 137, 99, 138, 139, 140, 149, 157, 100, 1397,
+ 1395, 158, 159, 141, 101, 142, 160, 1389, 1385, 143,
147, 96, 144, 97, 145, 98, 148, 146, 161, 99,
- 1370, 150, 151, 149, 157, 100, 152, 155, 158, 159,
+ 1361, 150, 151, 149, 157, 100, 152, 155, 158, 159,
- 1359, 101, 110, 160, 153, 111, 112, 147, 113, 154,
+ 1350, 101, 110, 160, 153, 111, 112, 147, 113, 154,
165, 156, 114, 115, 166, 161, 116, 117, 150, 151,
- 167, 1353, 1344, 152, 155, 162, 168, 163, 1341, 110,
- 1340, 153, 111, 112, 173, 113, 154, 165, 156, 114,
+ 167, 1344, 1335, 152, 155, 162, 168, 163, 1332, 110,
+ 1331, 153, 111, 112, 173, 113, 154, 165, 156, 114,
115, 166, 164, 116, 117, 118, 169, 167, 119, 120,
174, 177, 162, 168, 163, 121, 122, 170, 171, 178,
179, 173, 123, 175, 172, 176, 180, 181, 182, 164,
183, 184, 118, 169, 185, 119, 120, 174, 177, 186,
- 1339, 193, 121, 122, 170, 171, 178, 179, 194, 123,
+ 1330, 193, 121, 122, 170, 171, 178, 179, 194, 123,
175, 172, 176, 180, 181, 182, 189, 183, 184, 187,
190, 185, 191, 195, 188, 198, 186, 192, 193, 196,
199, 202, 203, 200, 205, 194, 206, 210, 211, 197,
- 214, 1338, 1335, 189, 223, 204, 187, 190, 201, 191,
+ 214, 1329, 1326, 189, 223, 204, 187, 190, 201, 191,
195, 188, 198, 207, 192, 232, 196, 199, 202, 203,
200, 205, 233, 206, 210, 211, 197, 214, 212, 208,
- 209, 223, 230, 228, 236, 201, 213, 1323, 234, 1318,
- 207, 1306, 232, 1305, 1292, 237, 1262, 229, 235, 233,
- 238, 239, 1240, 240, 231, 212, 208, 209, 1228, 230,
+ 209, 223, 230, 228, 236, 201, 213, 1315, 234, 1310,
+ 207, 1298, 232, 1297, 1284, 237, 1254, 229, 235, 233,
+ 238, 239, 1233, 240, 231, 212, 208, 209, 1221, 230,
228, 236, 241, 213, 215, 234, 216, 217, 224, 243,
218, 219, 237, 220, 229, 235, 221, 238, 239, 225,
- 240, 231, 222, 226, 244, 227, 1221, 251, 252, 241,
+ 240, 231, 222, 226, 244, 227, 1214, 251, 252, 241,
257, 215, 260, 216, 217, 224, 243, 218, 219, 253,
220, 255, 258, 221, 256, 254, 225, 261, 262, 222,
226, 244, 227, 245, 251, 252, 246, 257, 263, 260,
@@ -1054,257 +1048,255 @@ static yyconst flex_int16_t yy_nxt[3129] =
412, 426, 430, 428, 414, 415, 416, 417, 418, 419,
432, 420, 433, 421, 434, 427, 429, 435, 437, 439,
440, 441, 422, 423, 443, 424, 425, 444, 426, 430,
- 428, 445, 446, 1212, 1194, 1192, 456, 432, 457, 433,
+ 428, 445, 446, 1205, 1187, 1185, 456, 432, 457, 433,
458, 434, 427, 461, 435, 437, 439, 440, 441, 462,
- 463, 443, 1191, 465, 444, 1185, 467, 468, 445, 446,
+ 463, 443, 1184, 465, 444, 1178, 467, 468, 445, 446,
447, 448, 449, 456, 459, 457, 450, 458, 451, 460,
461, 452, 469, 453, 470, 471, 462, 463, 472, 454,
465, 478, 455, 467, 468, 473, 480, 447, 448, 449,
481, 459, 482, 450, 483, 451, 460, 484, 452, 469,
453, 470, 471, 474, 485, 472, 454, 475, 478, 455,
- 486, 476, 473, 480, 487, 488, 489, 481, 492, 482,
- 493, 483, 494, 499, 484, 500, 501, 502, 503, 1173,
- 474, 485, 495, 490, 475, 496, 508, 486, 509, 497,
- 510, 487, 488, 489, 498, 492, 513, 493, 514, 494,
-
- 499, 515, 500, 501, 502, 503, 505, 506, 516, 517,
- 490, 518, 496, 508, 519, 509, 497, 510, 520, 521,
- 522, 498, 507, 513, 524, 514, 525, 523, 515, 527,
- 528, 529, 530, 505, 506, 516, 517, 531, 518, 532,
- 533, 519, 534, 535, 537, 520, 521, 522, 536, 507,
- 538, 524, 539, 525, 523, 541, 527, 528, 529, 530,
- 542, 543, 544, 545, 531, 546, 532, 533, 547, 534,
- 535, 537, 548, 549, 550, 536, 551, 538, 552, 539,
- 553, 554, 541, 555, 556, 558, 559, 542, 543, 544,
- 545, 560, 546, 561, 562, 547, 563, 565, 566, 548,
-
- 549, 550, 567, 551, 568, 552, 564, 553, 554, 569,
- 555, 556, 558, 559, 570, 571, 574, 576, 560, 577,
- 561, 562, 578, 563, 565, 566, 579, 580, 581, 567,
- 583, 568, 582, 564, 584, 585, 569, 588, 586, 590,
- 591, 570, 571, 574, 576, 592, 577, 593, 594, 578,
- 587, 589, 595, 579, 580, 581, 596, 583, 597, 582,
- 598, 584, 585, 599, 588, 586, 590, 591, 601, 602,
- 600, 603, 592, 604, 593, 594, 605, 587, 589, 595,
- 606, 607, 608, 596, 609, 597, 611, 598, 612, 613,
- 599, 615, 1171, 616, 614, 601, 602, 600, 603, 620,
-
- 604, 622, 618, 605, 617, 623, 626, 606, 607, 608,
- 627, 609, 628, 611, 624, 612, 613, 625, 615, 619,
- 616, 614, 629, 630, 631, 633, 620, 632, 622, 618,
- 634, 617, 623, 626, 635, 636, 637, 627, 638, 628,
- 640, 624, 645, 646, 625, 648, 619, 649, 650, 629,
- 630, 631, 633, 651, 632, 652, 653, 634, 654, 655,
- 656, 635, 636, 637, 642, 638, 657, 640, 643, 645,
- 646, 644, 648, 658, 649, 650, 659, 660, 661, 663,
- 651, 664, 652, 653, 665, 654, 655, 656, 666, 668,
- 669, 642, 670, 657, 671, 643, 672, 674, 644, 675,
-
- 658, 676, 677, 659, 660, 661, 663, 678, 664, 679,
- 680, 665, 681, 682, 673, 666, 668, 669, 683, 670,
- 684, 671, 685, 672, 674, 687, 675, 689, 676, 677,
- 690, 696, 691, 692, 678, 698, 679, 680, 700, 681,
- 682, 693, 701, 703, 705, 683, 694, 684, 706, 685,
- 707, 708, 687, 702, 689, 709, 710, 690, 696, 691,
- 692, 711, 698, 712, 713, 700, 714, 715, 693, 701,
- 703, 705, 716, 694, 717, 706, 720, 707, 708, 718,
- 702, 721, 709, 710, 722, 723, 719, 724, 711, 725,
- 712, 713, 726, 714, 715, 727, 728, 729, 730, 716,
-
- 731, 717, 732, 720, 733, 734, 718, 735, 721, 736,
- 737, 722, 723, 719, 724, 738, 725, 739, 740, 726,
- 742, 743, 727, 728, 729, 730, 744, 731, 745, 732,
- 746, 733, 734, 747, 735, 748, 736, 737, 749, 750,
- 751, 752, 738, 753, 739, 740, 755, 742, 743, 756,
- 757, 758, 759, 744, 760, 745, 761, 746, 762, 763,
- 747, 764, 748, 765, 766, 749, 750, 751, 752, 767,
- 753, 768, 769, 755, 770, 771, 756, 757, 758, 759,
- 772, 760, 773, 761, 774, 762, 763, 776, 764, 1154,
- 765, 766, 782, 784, 786, 787, 767, 788, 768, 769,
-
- 789, 770, 771, 790, 791, 792, 777, 772, 793, 773,
- 778, 774, 779, 794, 776, 795, 780, 781, 796, 782,
- 784, 786, 787, 797, 788, 798, 799, 789, 800, 801,
- 790, 791, 792, 777, 802, 793, 803, 778, 804, 779,
- 794, 805, 795, 780, 781, 796, 807, 811, 812, 813,
- 797, 814, 798, 799, 816, 800, 801, 817, 819, 820,
- 821, 802, 822, 803, 823, 804, 824, 818, 805, 825,
- 826, 827, 828, 807, 811, 812, 813, 829, 814, 830,
- 831, 816, 832, 833, 817, 819, 820, 821, 834, 822,
- 835, 823, 836, 824, 818, 837, 825, 826, 827, 828,
-
- 838, 839, 840, 841, 829, 842, 830, 831, 843, 832,
- 833, 844, 845, 846, 847, 834, 848, 835, 849, 836,
- 850, 851, 837, 852, 853, 854, 855, 838, 839, 840,
- 841, 857, 842, 858, 859, 843, 862, 863, 844, 845,
- 846, 847, 864, 848, 865, 849, 866, 850, 851, 867,
- 852, 853, 854, 855, 868, 869, 870, 871, 857, 872,
- 858, 859, 873, 862, 863, 874, 875, 876, 877, 864,
- 878, 865, 879, 866, 880, 881, 867, 882, 883, 884,
- 885, 868, 869, 870, 871, 886, 872, 887, 888, 873,
- 889, 890, 874, 875, 876, 877, 891, 878, 892, 879,
-
- 893, 880, 881, 894, 882, 883, 884, 885, 895, 896,
- 902, 903, 886, 905, 887, 888, 907, 889, 890, 908,
- 913, 914, 915, 891, 916, 892, 917, 893, 918, 919,
- 894, 920, 921, 924, 928, 895, 896, 902, 903, 922,
- 905, 929, 930, 907, 931, 925, 908, 913, 914, 915,
- 926, 916, 923, 917, 932, 918, 919, 933, 920, 921,
- 924, 928, 927, 934, 935, 936, 922, 937, 929, 930,
- 938, 931, 925, 939, 940, 941, 942, 926, 943, 923,
- 944, 932, 945, 946, 933, 947, 948, 949, 950, 927,
- 934, 935, 936, 951, 937, 952, 953, 938, 954, 955,
-
- 939, 940, 941, 942, 956, 943, 957, 944, 958, 945,
- 946, 959, 947, 948, 949, 950, 960, 962, 963, 964,
- 951, 965, 952, 953, 966, 954, 955, 967, 968, 969,
- 970, 956, 972, 957, 973, 958, 974, 975, 959, 976,
- 971, 977, 978, 960, 962, 963, 964, 979, 965, 980,
- 981, 966, 982, 983, 967, 968, 969, 970, 984, 972,
- 986, 973, 987, 974, 975, 988, 976, 971, 977, 978,
- 989, 991, 992, 993, 979, 994, 980, 981, 995, 982,
- 983, 996, 998, 999, 1000, 984, 1001, 986, 1002, 987,
- 1003, 1004, 988, 1005, 1006, 1007, 1008, 989, 991, 992,
-
- 993, 1009, 994, 1010, 1011, 995, 1013, 1014, 996, 998,
- 999, 1000, 1015, 1001, 1016, 1002, 1017, 1003, 1004, 1018,
- 1005, 1006, 1007, 1008, 1019, 910, 1024, 911, 1009, 1025,
- 1010, 1011, 1029, 1013, 1014, 1030, 1031, 912, 1032, 1015,
- 1033, 1016, 1034, 1017, 1035, 1036, 1018, 1037, 1038, 1039,
- 1040, 1019, 1041, 1024, 1042, 1043, 1025, 1044, 1045, 1029,
- 1047, 1048, 1030, 1031, 1049, 1032, 1050, 1033, 1051, 1034,
- 1055, 1035, 1036, 1056, 1037, 1038, 1039, 1040, 1058, 1041,
- 1059, 1042, 1043, 1060, 1044, 1045, 1053, 1047, 1048, 1061,
- 1054, 1049, 1062, 1050, 1063, 1051, 1065, 1055, 1066, 1070,
-
- 1056, 1071, 1073, 1067, 1074, 1058, 1075, 1059, 1076, 1077,
- 1060, 1078, 1068, 1053, 1080, 1081, 1061, 1054, 1082, 1062,
- 1069, 1063, 1083, 1065, 1086, 1066, 1070, 1088, 1071, 1073,
- 1067, 1074, 1089, 1075, 1090, 1076, 1077, 1091, 1078, 1068,
- 1092, 1080, 1081, 1093, 1094, 1082, 1095, 1069, 1096, 1083,
- 1097, 1086, 1098, 1099, 1088, 1100, 1101, 1102, 1103, 1089,
- 1104, 1090, 1105, 1106, 1091, 1107, 1108, 1092, 1109, 1110,
- 1093, 1094, 1111, 1095, 1112, 1096, 1113, 1097, 1114, 1098,
- 1099, 1115, 1100, 1101, 1102, 1103, 1116, 1104, 1117, 1105,
- 1106, 1118, 1107, 1108, 1119, 1109, 1110, 1120, 1121, 1111,
-
- 1122, 1112, 1123, 1113, 1124, 1114, 1125, 1126, 1115, 1127,
- 1128, 1129, 1130, 1116, 1131, 1117, 1132, 1133, 1118, 1134,
- 1135, 1119, 1136, 1137, 1120, 1121, 1138, 1122, 1139, 1123,
- 1140, 1124, 1141, 1125, 1126, 1142, 1127, 1128, 1129, 1130,
- 1143, 1131, 1144, 1132, 1133, 1145, 1134, 1135, 1146, 1136,
- 1137, 1147, 1148, 1138, 1149, 1139, 1151, 1140, 1152, 1141,
- 1155, 1156, 1142, 1157, 1158, 1159, 1160, 1143, 1161, 1144,
- 1162, 1163, 1145, 1164, 1165, 1146, 1166, 1167, 1147, 1148,
- 1168, 1149, 1169, 1151, 1170, 1152, 1172, 1155, 1156, 1174,
- 1157, 1158, 1159, 1160, 1175, 1161, 1176, 1162, 1163, 1177,
-
- 1164, 1165, 1178, 1166, 1167, 1179, 1180, 1168, 1181, 1169,
- 1182, 1170, 1183, 1172, 1184, 1186, 1174, 1187, 1188, 1189,
- 1190, 1175, 1193, 1176, 1195, 1196, 1177, 1197, 1198, 1178,
- 1199, 1200, 1179, 1180, 1201, 1181, 1202, 1182, 1203, 1183,
- 1204, 1184, 1186, 1205, 1187, 1188, 1189, 1190, 1206, 1193,
- 1207, 1195, 1196, 1208, 1197, 1198, 1209, 1199, 1200, 1210,
- 1211, 1201, 1213, 1202, 1214, 1203, 1215, 1204, 1216, 1217,
- 1205, 1218, 1219, 1220, 1222, 1206, 1223, 1207, 1224, 1225,
- 1208, 1226, 1227, 1209, 1229, 1232, 1210, 1211, 1233, 1213,
- 1234, 1214, 1235, 1215, 1230, 1216, 1217, 1236, 1218, 1219,
-
- 1220, 1222, 1231, 1223, 1238, 1224, 1225, 1239, 1226, 1227,
- 1241, 1229, 1232, 1242, 1237, 1233, 1243, 1234, 1244, 1235,
- 1245, 1230, 1246, 1247, 1236, 1248, 1249, 1250, 1251, 1252,
- 1253, 1238, 1254, 1256, 1239, 1257, 1258, 1241, 1255, 1259,
- 1242, 1237, 1260, 1243, 1261, 1244, 1263, 1245, 1264, 1246,
- 1247, 1265, 1248, 1249, 1250, 1251, 1252, 1253, 1266, 1254,
- 1256, 1267, 1257, 1258, 1268, 1255, 1259, 1269, 1270, 1260,
- 1271, 1261, 1272, 1263, 1273, 1264, 1274, 1275, 1265, 1276,
- 1277, 1278, 1279, 1280, 1281, 1266, 1282, 1283, 1267, 1284,
- 1285, 1268, 1286, 1287, 1269, 1270, 1288, 1271, 1289, 1272,
-
- 1290, 1273, 1291, 1274, 1275, 1293, 1276, 1277, 1278, 1279,
- 1280, 1281, 1294, 1282, 1283, 1295, 1284, 1285, 1296, 1286,
- 1287, 1297, 1298, 1288, 1299, 1289, 1300, 1290, 1301, 1291,
- 1302, 1303, 1293, 1304, 1307, 1308, 1309, 1310, 1311, 1294,
- 1312, 1313, 1295, 1314, 1315, 1296, 1316, 1317, 1297, 1298,
- 1319, 1299, 1320, 1300, 1321, 1301, 1322, 1302, 1303, 1324,
- 1304, 1307, 1308, 1309, 1310, 1311, 1325, 1312, 1313, 1326,
- 1314, 1315, 1327, 1316, 1317, 1328, 1329, 1319, 1330, 1320,
- 1331, 1321, 1332, 1322, 1333, 1334, 1324, 1336, 1337, 1342,
- 1343, 1345, 1346, 1325, 1347, 1348, 1326, 1349, 1350, 1327,
-
- 1351, 1352, 1328, 1329, 1354, 1330, 1355, 1331, 1356, 1332,
- 1357, 1333, 1334, 1358, 1336, 1337, 1342, 1343, 1345, 1346,
- 1360, 1347, 1348, 1361, 1349, 1350, 1362, 1351, 1352, 1363,
- 1364, 1354, 1365, 1355, 1366, 1356, 1367, 1357, 1368, 1369,
- 1358, 1371, 1372, 1373, 1374, 1375, 1376, 1360, 1377, 1378,
- 1361, 1379, 1380, 1362, 1381, 1382, 1363, 1364, 1383, 1365,
- 1384, 1366, 1385, 1367, 1386, 1368, 1369, 1387, 1371, 1372,
- 1373, 1374, 1375, 1376, 1388, 1377, 1378, 1389, 1379, 1380,
- 1390, 1381, 1382, 1391, 1392, 1383, 1393, 1384, 1394, 1385,
- 1396, 1386, 1397, 1398, 1387, 1400, 1401, 1402, 1404, 1403,
-
- 1406, 1388, 1408, 1409, 1389, 1411, 1412, 1390, 1413, 1414,
- 1391, 1392, 1415, 1393, 1416, 1394, 1417, 1396, 1420, 1397,
- 1398, 1421, 1400, 1401, 1402, 1404, 1403, 1406, 1418, 1408,
- 1409, 1422, 1411, 1412, 1419, 1413, 1414, 1423, 1424, 1415,
- 1425, 1416, 1426, 1417, 1427, 1420, 1428, 1429, 1421, 1430,
- 1431, 1433, 1434, 1435, 1436, 1418, 1437, 1438, 1422, 1439,
- 1440, 1419, 1441, 1442, 1423, 1424, 1443, 1425, 1444, 1426,
- 1445, 1427, 1448, 1428, 1429, 1449, 1430, 1431, 1433, 1434,
- 1435, 1436, 1450, 1437, 1438, 1451, 1439, 1440, 1452, 1441,
- 1442, 1453, 1454, 1443, 1455, 1444, 1456, 1445, 1457, 1448,
-
- 1458, 1460, 1449, 1461, 1462, 1463, 1464, 1466, 1467, 1450,
- 1468, 1469, 1451, 1470, 1471, 1452, 1473, 1475, 1453, 1454,
- 1476, 1455, 1477, 1456, 1478, 1457, 1479, 1458, 1460, 1480,
- 1461, 1462, 1463, 1464, 1466, 1467, 1481, 1468, 1469, 1482,
- 1470, 1471, 1483, 1473, 1475, 1484, 1485, 1476, 1486, 1477,
- 1487, 1478, 1488, 1479, 1489, 1490, 1480, 1491, 1492, 1493,
- 1494, 1495, 1496, 1481, 1497, 1498, 1482, 1499, 1500, 1483,
- 1501, 1502, 1484, 1485, 1503, 1486, 1504, 1487, 1505, 1488,
- 1506, 1489, 1490, 1507, 1491, 1492, 1493, 1494, 1495, 1496,
- 1508, 1497, 1498, 1509, 1499, 1500, 1510, 1501, 1502, 1511,
-
- 1512, 1503, 1513, 1504, 1514, 1505, 1515, 1506, 1516, 1517,
- 1507, 1518, 1519, 1520, 1521, 1522, 1523, 1508, 1524, 1525,
- 1509, 1526, 1527, 1510, 1528, 1529, 1511, 1512, 1530, 1513,
- 1531, 1514, 1532, 1515, 1533, 1516, 1517, 1534, 1518, 1519,
- 1520, 1521, 1522, 1523, 1535, 1524, 1525, 1536, 1526, 1527,
- 1537, 1528, 1529, 1538, 1540, 1530, 1541, 1531, 1542, 1532,
- 1543, 1533, 1544, 1545, 1534, 1546, 1547, 1548, 1549, 1550,
- 1551, 1535, 1552, 1553, 1536, 1554, 1555, 1537, 1556, 1557,
- 1538, 1540, 1558, 1541, 1559, 1542, 1560, 1543, 1561, 1544,
- 1545, 1562, 1546, 1547, 1548, 1549, 1550, 1551, 1563, 1552,
-
- 1553, 1564, 1554, 1555, 1565, 1556, 1557, 1566, 1567, 1558,
- 1569, 1559, 1570, 1560, 1571, 1561, 1572, 1573, 1562, 1574,
- 1575, 1576, 1577, 1578, 1579, 1563, 1580, 1581, 1564, 1582,
- 1584, 1565, 1585, 1586, 1566, 1567, 1587, 1569, 1588, 1570,
- 1589, 1571, 1590, 1572, 1573, 1591, 1574, 1575, 1576, 1577,
- 1578, 1579, 1592, 1580, 1581, 1593, 1582, 1584, 1594, 1585,
- 1586, 1153, 1150, 1587, 1023, 1588, 1023, 1589, 1021, 1590,
- 1021, 1087, 1591, 1085, 1084, 1079, 1072, 1064, 1057, 1592,
- 1052, 1046, 1593, 1028, 1027, 1594, 39, 39, 1026, 1023,
- 1021, 1012, 997, 990, 985, 961, 909, 906, 904, 901,
-
- 900, 899, 898, 897, 861, 860, 856, 815, 810, 809,
- 808, 806, 785, 783, 775, 754, 741, 704, 699, 697,
- 695, 688, 686, 667, 662, 647, 641, 639, 621, 610,
- 575, 573, 572, 557, 540, 526, 512, 511, 504, 491,
- 479, 477, 466, 464, 442, 438, 436, 431, 413, 404,
- 397, 357, 322, 306, 270, 242, 37, 37, 1595, 3,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595
+ 486, 476, 473, 480, 487, 488, 489, 481, 491, 482,
+ 492, 483, 493, 498, 484, 499, 500, 501, 502, 495,
+ 474, 485, 494, 496, 475, 504, 505, 486, 497, 507,
+ 508, 487, 488, 489, 509, 491, 512, 492, 513, 493,
+
+ 498, 506, 499, 500, 501, 502, 495, 514, 515, 516,
+ 496, 517, 504, 505, 518, 497, 507, 508, 519, 520,
+ 521, 509, 523, 512, 524, 513, 526, 522, 506, 527,
+ 528, 529, 530, 531, 514, 515, 516, 532, 517, 533,
+ 536, 518, 537, 534, 538, 519, 520, 521, 535, 523,
+ 540, 524, 541, 526, 522, 542, 527, 528, 529, 530,
+ 531, 543, 544, 545, 532, 546, 533, 536, 547, 537,
+ 534, 538, 548, 549, 550, 535, 551, 540, 552, 541,
+ 553, 554, 542, 555, 557, 558, 559, 560, 543, 544,
+ 545, 561, 546, 564, 562, 547, 565, 566, 567, 548,
+
+ 549, 550, 568, 551, 563, 552, 569, 553, 554, 570,
+ 555, 557, 558, 559, 560, 573, 575, 576, 561, 577,
+ 564, 562, 578, 565, 566, 567, 579, 582, 580, 568,
+ 583, 563, 581, 569, 584, 585, 570, 587, 589, 590,
+ 591, 592, 573, 575, 576, 593, 577, 586, 594, 578,
+ 595, 588, 596, 579, 582, 580, 597, 583, 600, 581,
+ 601, 584, 585, 598, 587, 589, 590, 591, 592, 602,
+ 599, 603, 593, 604, 586, 594, 605, 595, 588, 596,
+ 606, 607, 608, 597, 610, 600, 614, 601, 611, 612,
+ 598, 615, 619, 617, 613, 621, 602, 599, 603, 622,
+
+ 604, 623, 616, 605, 624, 625, 626, 606, 607, 608,
+ 618, 610, 627, 614, 628, 611, 612, 631, 615, 619,
+ 617, 613, 621, 632, 629, 633, 622, 630, 623, 616,
+ 634, 624, 625, 626, 635, 636, 638, 618, 640, 627,
+ 643, 628, 641, 644, 631, 642, 646, 647, 648, 649,
+ 632, 629, 633, 650, 630, 651, 652, 634, 653, 654,
+ 655, 635, 636, 638, 656, 640, 657, 643, 658, 641,
+ 644, 659, 642, 646, 647, 648, 649, 661, 662, 663,
+ 650, 664, 651, 652, 666, 653, 654, 655, 667, 668,
+ 669, 656, 670, 657, 672, 658, 673, 674, 659, 675,
+
+ 676, 677, 678, 679, 661, 662, 663, 680, 664, 681,
+ 671, 666, 682, 683, 685, 667, 668, 669, 687, 670,
+ 688, 672, 694, 673, 674, 696, 675, 676, 677, 678,
+ 679, 698, 699, 701, 680, 703, 681, 689, 690, 682,
+ 683, 685, 704, 700, 705, 687, 691, 688, 706, 694,
+ 707, 692, 696, 708, 709, 710, 711, 712, 698, 699,
+ 701, 713, 703, 714, 689, 690, 715, 716, 718, 704,
+ 700, 705, 719, 691, 717, 706, 720, 707, 692, 721,
+ 708, 709, 710, 711, 712, 722, 723, 724, 713, 725,
+ 714, 726, 727, 715, 716, 718, 728, 729, 730, 719,
+
+ 731, 717, 732, 720, 733, 734, 721, 735, 736, 737,
+ 738, 740, 722, 723, 724, 741, 725, 742, 726, 727,
+ 743, 744, 745, 728, 729, 730, 746, 731, 747, 732,
+ 748, 733, 734, 749, 735, 736, 737, 738, 740, 750,
+ 751, 753, 741, 754, 742, 755, 756, 743, 744, 745,
+ 757, 758, 759, 746, 760, 747, 761, 748, 762, 763,
+ 749, 764, 765, 766, 767, 768, 750, 751, 753, 769,
+ 754, 770, 755, 756, 771, 773, 1167, 757, 758, 759,
+ 779, 760, 781, 761, 783, 762, 763, 784, 764, 765,
+ 766, 767, 768, 774, 785, 786, 769, 775, 770, 776,
+
+ 787, 771, 773, 777, 778, 788, 789, 779, 790, 781,
+ 791, 783, 792, 793, 784, 794, 795, 796, 797, 798,
+ 774, 785, 786, 799, 775, 800, 776, 787, 801, 802,
+ 777, 778, 788, 789, 804, 790, 808, 791, 809, 792,
+ 793, 810, 794, 795, 796, 797, 798, 811, 813, 814,
+ 799, 816, 800, 817, 818, 801, 802, 819, 820, 815,
+ 821, 804, 822, 808, 823, 809, 824, 825, 810, 826,
+ 827, 828, 829, 830, 811, 813, 814, 831, 816, 832,
+ 817, 818, 833, 834, 819, 820, 815, 821, 835, 822,
+ 836, 823, 837, 824, 825, 838, 826, 827, 828, 829,
+
+ 830, 839, 840, 841, 831, 842, 832, 843, 844, 833,
+ 834, 845, 846, 847, 848, 835, 849, 836, 850, 837,
+ 851, 852, 838, 854, 855, 856, 859, 860, 839, 840,
+ 841, 861, 842, 862, 843, 844, 863, 864, 845, 846,
+ 847, 848, 865, 849, 866, 850, 867, 851, 852, 868,
+ 854, 855, 856, 859, 860, 869, 870, 871, 861, 872,
+ 862, 873, 874, 863, 864, 875, 876, 877, 878, 865,
+ 879, 866, 880, 867, 881, 882, 868, 883, 884, 885,
+ 886, 887, 869, 870, 871, 888, 872, 889, 873, 874,
+ 890, 891, 875, 876, 877, 878, 892, 879, 898, 880,
+
+ 899, 881, 882, 901, 883, 884, 885, 886, 887, 903,
+ 904, 909, 888, 910, 889, 911, 912, 890, 891, 913,
+ 914, 915, 916, 892, 917, 898, 918, 899, 920, 924,
+ 901, 925, 926, 927, 928, 1165, 903, 904, 909, 919,
+ 910, 929, 911, 912, 930, 921, 913, 914, 915, 916,
+ 922, 917, 931, 918, 932, 920, 924, 933, 925, 926,
+ 927, 928, 923, 934, 935, 936, 919, 937, 929, 938,
+ 939, 930, 921, 940, 941, 942, 943, 922, 944, 931,
+ 945, 932, 946, 947, 933, 948, 949, 950, 951, 923,
+ 934, 935, 936, 952, 937, 953, 938, 939, 954, 955,
+
+ 940, 941, 942, 943, 956, 944, 958, 945, 959, 946,
+ 947, 960, 948, 949, 950, 951, 961, 962, 963, 964,
+ 952, 965, 953, 968, 966, 954, 955, 969, 970, 971,
+ 972, 956, 973, 958, 967, 959, 974, 975, 960, 976,
+ 977, 978, 979, 961, 962, 963, 964, 980, 965, 982,
+ 968, 966, 983, 984, 969, 970, 971, 972, 985, 973,
+ 986, 967, 987, 974, 975, 988, 976, 977, 978, 979,
+ 989, 990, 991, 993, 980, 994, 982, 995, 996, 983,
+ 984, 997, 998, 999, 1000, 985, 1001, 986, 1002, 987,
+ 1003, 1004, 988, 1005, 1006, 1008, 1009, 989, 990, 991,
+
+ 993, 1010, 994, 1011, 995, 996, 1012, 1013, 997, 998,
+ 999, 1000, 1014, 1001, 906, 1002, 907, 1003, 1004, 1019,
+ 1005, 1006, 1008, 1009, 1020, 1024, 908, 1025, 1010, 1026,
+ 1011, 1027, 1028, 1012, 1013, 1029, 1030, 1031, 1032, 1014,
+ 1033, 1034, 1035, 1036, 1037, 1038, 1019, 1039, 1040, 1042,
+ 1043, 1020, 1024, 1044, 1025, 1045, 1026, 1046, 1027, 1028,
+ 1050, 1051, 1029, 1030, 1031, 1032, 1053, 1033, 1034, 1035,
+ 1036, 1037, 1038, 1054, 1039, 1040, 1042, 1043, 1055, 1048,
+ 1044, 1056, 1045, 1049, 1046, 1057, 1058, 1050, 1051, 1060,
+ 1061, 1065, 1062, 1053, 1066, 1068, 1069, 1070, 1071, 1072,
+
+ 1054, 1063, 1073, 1075, 1076, 1055, 1048, 1077, 1056, 1064,
+ 1049, 1078, 1057, 1058, 1081, 1083, 1060, 1061, 1065, 1062,
+ 1084, 1066, 1068, 1069, 1070, 1071, 1072, 1085, 1063, 1073,
+ 1075, 1076, 1086, 1087, 1077, 1088, 1064, 1089, 1078, 1090,
+ 1091, 1081, 1083, 1092, 1093, 1094, 1095, 1084, 1096, 1097,
+ 1098, 1099, 1100, 1101, 1085, 1102, 1103, 1104, 1105, 1086,
+ 1087, 1106, 1088, 1107, 1089, 1108, 1090, 1091, 1109, 1110,
+ 1092, 1093, 1094, 1095, 1111, 1096, 1097, 1098, 1099, 1100,
+ 1101, 1112, 1102, 1103, 1104, 1105, 1113, 1114, 1106, 1115,
+ 1107, 1116, 1108, 1117, 1118, 1109, 1110, 1119, 1120, 1121,
+
+ 1122, 1111, 1123, 1124, 1125, 1126, 1127, 1128, 1112, 1129,
+ 1130, 1131, 1132, 1113, 1114, 1133, 1115, 1134, 1116, 1135,
+ 1117, 1118, 1136, 1137, 1119, 1120, 1121, 1122, 1138, 1123,
+ 1124, 1125, 1126, 1127, 1128, 1139, 1129, 1130, 1131, 1132,
+ 1140, 1141, 1133, 1142, 1134, 1143, 1135, 1145, 1146, 1136,
+ 1137, 1149, 1150, 1151, 1152, 1138, 1153, 1154, 1155, 1156,
+ 1157, 1158, 1139, 1159, 1160, 1161, 1162, 1140, 1141, 1163,
+ 1142, 1164, 1143, 1166, 1145, 1146, 1168, 1169, 1149, 1150,
+ 1151, 1152, 1170, 1153, 1154, 1155, 1156, 1157, 1158, 1171,
+ 1159, 1160, 1161, 1162, 1172, 1173, 1163, 1174, 1164, 1175,
+
+ 1166, 1176, 1177, 1168, 1169, 1179, 1180, 1181, 1182, 1170,
+ 1183, 1186, 1188, 1189, 1190, 1191, 1171, 1192, 1193, 1194,
+ 1195, 1172, 1173, 1196, 1174, 1197, 1175, 1198, 1176, 1177,
+ 1199, 1200, 1179, 1180, 1181, 1182, 1201, 1183, 1186, 1188,
+ 1189, 1190, 1191, 1202, 1192, 1193, 1194, 1195, 1203, 1204,
+ 1196, 1206, 1197, 1207, 1198, 1208, 1209, 1199, 1200, 1210,
+ 1211, 1212, 1213, 1201, 1215, 1216, 1217, 1218, 1219, 1220,
+ 1202, 1222, 1225, 1223, 1226, 1203, 1204, 1227, 1206, 1228,
+ 1207, 1224, 1208, 1209, 1231, 1229, 1210, 1211, 1212, 1213,
+ 1232, 1215, 1216, 1217, 1218, 1219, 1220, 1234, 1222, 1225,
+
+ 1223, 1226, 1230, 1235, 1227, 1236, 1228, 1237, 1238, 1239,
+ 1240, 1231, 1229, 1241, 1242, 1243, 1244, 1232, 1245, 1246,
+ 1247, 1249, 1250, 1251, 1234, 1252, 1248, 1253, 1255, 1230,
+ 1235, 1256, 1236, 1257, 1237, 1238, 1239, 1240, 1258, 1259,
+ 1241, 1242, 1243, 1244, 1260, 1245, 1246, 1247, 1249, 1250,
+ 1251, 1261, 1252, 1248, 1253, 1255, 1262, 1263, 1256, 1264,
+ 1257, 1265, 1266, 1267, 1268, 1258, 1259, 1269, 1270, 1271,
+ 1272, 1260, 1273, 1274, 1275, 1276, 1277, 1278, 1261, 1279,
+ 1280, 1281, 1282, 1262, 1263, 1283, 1264, 1285, 1265, 1266,
+ 1267, 1268, 1286, 1287, 1269, 1270, 1271, 1272, 1288, 1273,
+
+ 1274, 1275, 1276, 1277, 1278, 1289, 1279, 1280, 1281, 1282,
+ 1290, 1291, 1283, 1292, 1285, 1293, 1294, 1295, 1296, 1286,
+ 1287, 1299, 1300, 1301, 1302, 1288, 1303, 1304, 1305, 1306,
+ 1307, 1308, 1289, 1309, 1311, 1312, 1313, 1290, 1291, 1314,
+ 1292, 1316, 1293, 1294, 1295, 1296, 1317, 1318, 1299, 1300,
+ 1301, 1302, 1319, 1303, 1304, 1305, 1306, 1307, 1308, 1320,
+ 1309, 1311, 1312, 1313, 1321, 1322, 1314, 1323, 1316, 1324,
+ 1325, 1327, 1328, 1317, 1318, 1333, 1334, 1336, 1337, 1319,
+ 1338, 1339, 1340, 1341, 1342, 1343, 1320, 1345, 1346, 1347,
+ 1348, 1321, 1322, 1349, 1323, 1351, 1324, 1325, 1327, 1328,
+
+ 1352, 1353, 1333, 1334, 1336, 1337, 1354, 1338, 1339, 1340,
+ 1341, 1342, 1343, 1355, 1345, 1346, 1347, 1348, 1356, 1357,
+ 1349, 1358, 1351, 1359, 1360, 1362, 1363, 1352, 1353, 1364,
+ 1365, 1366, 1367, 1354, 1368, 1369, 1370, 1371, 1372, 1373,
+ 1355, 1374, 1375, 1376, 1377, 1356, 1357, 1378, 1358, 1379,
+ 1359, 1360, 1362, 1363, 1380, 1381, 1364, 1365, 1366, 1367,
+ 1382, 1368, 1369, 1370, 1371, 1372, 1373, 1383, 1374, 1375,
+ 1376, 1377, 1384, 1386, 1378, 1387, 1379, 1388, 1390, 1391,
+ 1394, 1380, 1381, 1392, 1396, 1393, 1398, 1382, 1399, 1401,
+ 1402, 1403, 1404, 1405, 1383, 1406, 1407, 1408, 1410, 1384,
+
+ 1386, 1411, 1387, 1409, 1388, 1390, 1391, 1394, 1412, 1413,
+ 1392, 1396, 1393, 1398, 1414, 1399, 1401, 1402, 1403, 1404,
+ 1405, 1415, 1406, 1407, 1408, 1410, 1416, 1417, 1411, 1418,
+ 1409, 1419, 1420, 1422, 1423, 1412, 1413, 1424, 1425, 1426,
+ 1427, 1414, 1428, 1429, 1430, 1431, 1432, 1433, 1415, 1434,
+ 1437, 1438, 1439, 1416, 1417, 1440, 1418, 1441, 1419, 1420,
+ 1422, 1423, 1442, 1443, 1424, 1425, 1426, 1427, 1444, 1428,
+ 1429, 1430, 1431, 1432, 1433, 1445, 1434, 1437, 1438, 1439,
+ 1446, 1447, 1440, 1449, 1441, 1450, 1451, 1452, 1453, 1442,
+ 1443, 1455, 1456, 1457, 1458, 1444, 1459, 1461, 1463, 1464,
+
+ 1465, 1466, 1445, 1467, 1468, 1469, 1470, 1446, 1447, 1471,
+ 1449, 1472, 1450, 1451, 1452, 1453, 1473, 1474, 1455, 1456,
+ 1457, 1458, 1475, 1459, 1461, 1463, 1464, 1465, 1466, 1476,
+ 1467, 1468, 1469, 1470, 1477, 1478, 1471, 1479, 1472, 1480,
+ 1481, 1482, 1483, 1473, 1474, 1484, 1485, 1486, 1487, 1475,
+ 1488, 1489, 1490, 1491, 1492, 1493, 1476, 1494, 1495, 1496,
+ 1497, 1477, 1478, 1498, 1479, 1499, 1480, 1481, 1482, 1483,
+ 1500, 1501, 1484, 1485, 1486, 1487, 1502, 1488, 1489, 1490,
+ 1491, 1492, 1493, 1503, 1494, 1495, 1496, 1497, 1504, 1505,
+ 1498, 1506, 1499, 1507, 1508, 1509, 1510, 1500, 1501, 1511,
+
+ 1512, 1513, 1514, 1502, 1515, 1516, 1517, 1518, 1519, 1520,
+ 1503, 1521, 1522, 1523, 1524, 1504, 1505, 1525, 1506, 1527,
+ 1507, 1508, 1509, 1510, 1528, 1529, 1511, 1512, 1513, 1514,
+ 1530, 1515, 1516, 1517, 1518, 1519, 1520, 1531, 1521, 1522,
+ 1523, 1524, 1532, 1533, 1525, 1534, 1527, 1535, 1536, 1537,
+ 1538, 1528, 1529, 1539, 1540, 1541, 1542, 1530, 1543, 1544,
+ 1545, 1546, 1547, 1548, 1531, 1549, 1550, 1551, 1552, 1532,
+ 1533, 1553, 1534, 1554, 1535, 1536, 1537, 1538, 1556, 1557,
+ 1539, 1540, 1541, 1542, 1558, 1543, 1544, 1545, 1546, 1547,
+ 1548, 1559, 1549, 1550, 1551, 1552, 1560, 1561, 1553, 1562,
+
+ 1554, 1563, 1564, 1565, 1566, 1556, 1557, 1567, 1568, 1569,
+ 1571, 1558, 1572, 1573, 1574, 1575, 1576, 1577, 1559, 1578,
+ 1579, 1580, 1581, 1560, 1561, 1148, 1562, 1147, 1563, 1564,
+ 1565, 1566, 1144, 1018, 1567, 1568, 1569, 1571, 1018, 1572,
+ 1573, 1574, 1575, 1576, 1577, 1016, 1578, 1579, 1580, 1581,
+ 39, 39, 1016, 1082, 1080, 1079, 1074, 1067, 1059, 1052,
+ 1047, 1041, 1023, 1022, 1021, 1018, 1016, 1007, 992, 981,
+ 957, 905, 902, 900, 897, 896, 895, 894, 893, 858,
+ 857, 853, 812, 807, 806, 805, 803, 782, 780, 772,
+ 752, 739, 702, 697, 695, 693, 686, 684, 665, 660,
+
+ 645, 639, 637, 620, 609, 574, 572, 571, 556, 539,
+ 525, 511, 510, 503, 490, 479, 477, 466, 464, 442,
+ 438, 436, 431, 413, 404, 397, 357, 322, 306, 270,
+ 242, 37, 37, 1582, 3, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582
} ;
-static yyconst flex_int16_t yy_chk[3129] =
+static yyconst flex_int16_t yy_chk[3104] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -1314,54 +1306,54 @@ static yyconst flex_int16_t yy_chk[3129] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 7, 7,
9, 10, 13, 10, 11, 11, 11, 11, 11, 16,
- 21, 1600, 13, 26, 1599, 16, 16, 9, 39, 39,
- 15, 794, 28, 794, 15, 18, 16, 1598, 15, 13,
+ 21, 1587, 13, 26, 1586, 16, 16, 9, 39, 39,
+ 15, 791, 28, 791, 15, 18, 16, 1585, 15, 13,
- 17, 15, 18, 794, 15, 1596, 16, 21, 17, 13,
+ 17, 15, 18, 791, 15, 1583, 16, 21, 17, 13,
26, 17, 16, 16, 9, 12, 12, 15, 12, 28,
17, 15, 18, 16, 12, 15, 12, 17, 15, 18,
- 20, 15, 19, 12, 1577, 17, 1554, 20, 17, 20,
- 19, 1518, 12, 12, 33, 12, 19, 17, 180, 180,
- 1433, 12, 19, 12, 35, 1400, 1400, 20, 29, 19,
- 12, 14, 29, 14, 20, 1431, 20, 19, 14, 14,
+ 20, 15, 19, 12, 1564, 17, 1541, 20, 17, 20,
+ 19, 1505, 12, 12, 33, 12, 19, 17, 180, 180,
+ 1422, 12, 19, 12, 35, 1390, 1390, 20, 29, 19,
+ 12, 14, 29, 14, 20, 1420, 20, 19, 14, 14,
22, 33, 14, 19, 23, 14, 29, 22, 23, 19,
- 22, 35, 22, 34, 23, 29, 1423, 34, 14, 29,
- 14, 1416, 27, 1384, 36, 14, 14, 22, 43, 14,
+ 22, 35, 22, 34, 23, 29, 1413, 34, 14, 29,
+ 14, 1406, 27, 1374, 36, 14, 14, 22, 43, 14,
27, 23, 14, 29, 22, 23, 27, 22, 47, 22,
34, 23, 24, 24, 34, 48, 24, 32, 32, 27,
24, 36, 49, 32, 50, 43, 24, 27, 46, 46,
46, 46, 46, 27, 51, 47, 52, 53, 54, 24,
- 24, 1361, 48, 24, 32, 32, 55, 24, 55, 49,
+ 24, 1352, 48, 24, 32, 32, 55, 24, 55, 49,
32, 50, 56, 24, 25, 57, 25, 58, 25, 60,
- 59, 51, 25, 52, 53, 54, 61, 64, 25, 1358,
- 1355, 65, 66, 55, 25, 55, 67, 1349, 1343, 56,
+ 59, 51, 25, 52, 53, 54, 61, 64, 25, 1349,
+ 1346, 65, 66, 55, 25, 55, 67, 1340, 1334, 56,
59, 25, 57, 25, 58, 25, 60, 59, 68, 25,
- 1311, 62, 62, 61, 64, 25, 62, 63, 65, 66,
+ 1303, 62, 62, 61, 64, 25, 62, 63, 65, 66,
- 1299, 25, 30, 67, 62, 30, 30, 59, 30, 62,
+ 1291, 25, 30, 67, 62, 30, 30, 59, 30, 62,
70, 63, 30, 30, 71, 68, 30, 30, 62, 62,
- 72, 1291, 1280, 62, 63, 69, 73, 69, 1277, 30,
- 1276, 62, 30, 30, 76, 30, 62, 70, 63, 30,
+ 72, 1283, 1272, 62, 63, 69, 73, 69, 1269, 30,
+ 1268, 62, 30, 30, 76, 30, 62, 70, 63, 30,
30, 71, 69, 30, 30, 31, 74, 72, 31, 31,
77, 79, 69, 73, 69, 31, 31, 74, 75, 80,
81, 76, 31, 78, 75, 78, 82, 83, 84, 69,
85, 86, 31, 74, 87, 31, 31, 77, 79, 88,
- 1275, 92, 31, 31, 74, 75, 80, 81, 93, 31,
+ 1267, 92, 31, 31, 74, 75, 80, 81, 93, 31,
78, 75, 78, 82, 83, 84, 90, 85, 86, 89,
90, 87, 91, 94, 89, 96, 88, 91, 92, 95,
97, 99, 100, 98, 101, 93, 102, 104, 105, 95,
- 107, 1274, 1271, 90, 109, 100, 89, 90, 98, 91,
+ 107, 1266, 1263, 90, 109, 100, 89, 90, 98, 91,
94, 89, 96, 103, 91, 113, 95, 97, 99, 100,
98, 101, 114, 102, 104, 105, 95, 107, 106, 103,
- 103, 109, 112, 111, 116, 98, 106, 1256, 115, 1251,
- 103, 1235, 113, 1234, 1216, 117, 1184, 111, 115, 114,
- 118, 119, 1156, 120, 112, 106, 103, 103, 1145, 112,
+ 103, 109, 112, 111, 116, 98, 106, 1249, 115, 1244,
+ 103, 1228, 113, 1227, 1209, 117, 1177, 111, 115, 114,
+ 118, 119, 1150, 120, 112, 106, 103, 103, 1139, 112,
111, 116, 121, 106, 108, 115, 108, 108, 110, 123,
108, 108, 117, 108, 111, 115, 108, 118, 119, 110,
- 120, 112, 108, 110, 124, 110, 1137, 126, 127, 121,
+ 120, 112, 108, 110, 124, 110, 1131, 126, 127, 121,
130, 108, 132, 108, 108, 110, 123, 108, 108, 128,
108, 129, 131, 108, 129, 128, 110, 133, 134, 108,
110, 124, 110, 125, 126, 127, 125, 130, 135, 132,
@@ -1402,254 +1394,252 @@ static yyconst flex_int16_t yy_chk[3129] =
284, 300, 302, 301, 286, 287, 288, 289, 290, 291,
305, 292, 306, 294, 307, 300, 301, 308, 312, 314,
315, 316, 295, 297, 318, 298, 299, 319, 300, 302,
- 301, 320, 321, 1126, 1108, 1106, 323, 305, 324, 306,
+ 301, 320, 321, 1120, 1102, 1100, 323, 305, 324, 306,
325, 307, 300, 327, 308, 312, 314, 315, 316, 328,
- 330, 318, 1105, 332, 319, 1095, 334, 335, 320, 321,
+ 330, 318, 1099, 332, 319, 1089, 334, 335, 320, 321,
322, 322, 322, 323, 326, 324, 322, 325, 322, 326,
327, 322, 336, 322, 337, 338, 328, 330, 339, 322,
332, 342, 322, 334, 335, 340, 346, 322, 322, 322,
347, 326, 348, 322, 349, 322, 326, 350, 322, 336,
322, 337, 338, 340, 351, 339, 322, 340, 342, 322,
352, 340, 340, 346, 353, 354, 355, 347, 357, 348,
- 358, 349, 359, 361, 350, 362, 364, 365, 366, 1082,
- 340, 351, 359, 355, 340, 360, 369, 352, 370, 360,
- 371, 353, 354, 355, 360, 357, 374, 358, 375, 359,
-
- 361, 377, 362, 364, 365, 366, 368, 368, 378, 379,
- 355, 380, 360, 369, 381, 370, 360, 371, 382, 383,
- 385, 360, 368, 374, 386, 375, 387, 385, 377, 389,
- 390, 391, 392, 368, 368, 378, 379, 393, 380, 394,
- 395, 381, 396, 397, 398, 382, 383, 385, 397, 368,
- 400, 386, 401, 387, 385, 403, 389, 390, 391, 392,
- 404, 406, 407, 409, 393, 410, 394, 395, 411, 396,
- 397, 398, 413, 414, 416, 397, 417, 400, 418, 401,
- 419, 420, 403, 422, 424, 426, 427, 404, 406, 407,
- 409, 428, 410, 429, 430, 411, 431, 433, 434, 413,
-
- 414, 416, 435, 417, 436, 418, 431, 419, 420, 437,
- 422, 424, 426, 427, 438, 439, 442, 444, 428, 445,
- 429, 430, 446, 431, 433, 434, 447, 448, 449, 435,
- 450, 436, 449, 431, 451, 452, 437, 454, 453, 455,
- 456, 438, 439, 442, 444, 457, 445, 458, 459, 446,
- 453, 454, 460, 447, 448, 449, 461, 450, 462, 449,
- 463, 451, 452, 464, 454, 453, 455, 456, 465, 466,
- 464, 467, 457, 468, 458, 459, 469, 453, 454, 460,
- 470, 471, 472, 461, 473, 462, 475, 463, 476, 476,
- 464, 477, 1080, 478, 476, 465, 466, 464, 467, 480,
-
- 468, 482, 479, 469, 478, 483, 487, 470, 471, 472,
- 488, 473, 489, 475, 485, 476, 476, 485, 477, 479,
- 478, 476, 490, 491, 492, 493, 480, 492, 482, 479,
- 495, 478, 483, 487, 496, 497, 498, 488, 499, 489,
- 502, 485, 506, 507, 485, 509, 479, 510, 512, 490,
- 491, 492, 493, 513, 492, 514, 515, 495, 516, 517,
- 518, 496, 497, 498, 505, 499, 519, 502, 505, 506,
- 507, 505, 509, 520, 510, 512, 521, 522, 523, 525,
- 513, 526, 514, 515, 527, 516, 517, 518, 531, 533,
- 535, 505, 536, 519, 537, 505, 538, 539, 505, 540,
-
- 520, 541, 542, 521, 522, 523, 525, 543, 526, 544,
- 545, 527, 546, 547, 538, 531, 533, 535, 548, 536,
- 549, 537, 550, 538, 539, 553, 540, 555, 541, 542,
- 556, 559, 557, 557, 543, 561, 544, 545, 563, 546,
- 547, 557, 564, 565, 567, 548, 557, 549, 568, 550,
- 570, 571, 553, 564, 555, 572, 573, 556, 559, 557,
- 557, 574, 561, 575, 579, 563, 580, 581, 557, 564,
- 565, 567, 582, 557, 583, 568, 585, 570, 571, 584,
- 564, 586, 572, 573, 587, 588, 584, 589, 574, 590,
- 575, 579, 592, 580, 581, 593, 594, 595, 596, 582,
-
- 598, 583, 599, 585, 600, 601, 584, 602, 586, 603,
- 604, 587, 588, 584, 589, 605, 590, 606, 607, 592,
- 609, 610, 593, 594, 595, 596, 611, 598, 612, 599,
- 613, 600, 601, 614, 602, 615, 603, 604, 617, 618,
- 619, 620, 605, 621, 606, 607, 624, 609, 610, 625,
- 627, 628, 629, 611, 630, 612, 631, 613, 632, 633,
- 614, 634, 615, 635, 635, 617, 618, 619, 620, 636,
- 621, 637, 639, 624, 640, 641, 625, 627, 628, 629,
- 642, 630, 643, 631, 644, 632, 633, 646, 634, 1059,
- 635, 635, 648, 650, 652, 655, 636, 656, 637, 639,
-
- 657, 640, 641, 659, 660, 661, 647, 642, 664, 643,
- 647, 644, 647, 666, 646, 667, 647, 647, 668, 648,
- 650, 652, 655, 669, 656, 670, 671, 657, 672, 673,
- 659, 660, 661, 647, 674, 664, 675, 647, 677, 647,
- 666, 679, 667, 647, 647, 668, 681, 685, 686, 687,
- 669, 688, 670, 671, 691, 672, 673, 692, 693, 694,
- 695, 674, 697, 675, 698, 677, 699, 692, 679, 700,
- 701, 702, 703, 681, 685, 686, 687, 704, 688, 705,
- 706, 691, 707, 708, 692, 693, 694, 695, 709, 697,
- 710, 698, 711, 699, 692, 712, 700, 701, 702, 703,
-
- 713, 714, 715, 716, 704, 717, 705, 706, 718, 707,
- 708, 719, 720, 721, 722, 709, 723, 710, 724, 711,
- 725, 726, 712, 728, 729, 732, 733, 713, 714, 715,
- 716, 735, 717, 736, 737, 718, 740, 741, 719, 720,
- 721, 722, 742, 723, 743, 724, 744, 725, 726, 745,
- 728, 729, 732, 733, 746, 747, 748, 749, 735, 750,
- 736, 737, 751, 740, 741, 752, 753, 754, 755, 742,
- 756, 743, 757, 744, 759, 760, 745, 761, 762, 764,
- 765, 746, 747, 748, 749, 766, 750, 767, 768, 751,
- 769, 770, 752, 753, 754, 755, 771, 756, 772, 757,
-
- 773, 759, 760, 774, 761, 762, 764, 765, 775, 776,
- 782, 783, 766, 785, 767, 768, 789, 769, 770, 792,
- 795, 796, 797, 771, 798, 772, 801, 773, 802, 803,
- 774, 804, 805, 807, 809, 775, 776, 782, 783, 806,
- 785, 810, 811, 789, 812, 808, 792, 795, 796, 797,
- 808, 798, 806, 801, 814, 802, 803, 815, 804, 805,
- 807, 809, 808, 816, 817, 818, 806, 819, 810, 811,
- 820, 812, 808, 821, 822, 823, 824, 808, 825, 806,
- 826, 814, 827, 829, 815, 830, 831, 832, 833, 808,
- 816, 817, 818, 834, 819, 835, 836, 820, 837, 838,
-
- 821, 822, 823, 824, 840, 825, 841, 826, 842, 827,
- 829, 843, 830, 831, 832, 833, 845, 847, 848, 849,
- 834, 850, 835, 836, 851, 837, 838, 853, 854, 855,
- 856, 840, 857, 841, 859, 842, 860, 861, 843, 863,
- 856, 865, 867, 845, 847, 848, 849, 868, 850, 869,
- 870, 851, 872, 873, 853, 854, 855, 856, 874, 857,
- 876, 859, 877, 860, 861, 878, 863, 856, 865, 867,
- 879, 881, 882, 883, 868, 884, 869, 870, 885, 872,
- 873, 886, 888, 889, 890, 874, 891, 876, 892, 877,
- 893, 894, 878, 895, 896, 897, 898, 879, 881, 882,
-
- 883, 899, 884, 900, 901, 885, 903, 904, 886, 888,
- 889, 890, 905, 891, 906, 892, 907, 893, 894, 908,
- 895, 896, 897, 898, 909, 910, 913, 910, 899, 914,
- 900, 901, 919, 903, 904, 920, 921, 910, 922, 905,
- 923, 906, 924, 907, 925, 926, 908, 927, 928, 929,
- 931, 909, 932, 913, 933, 934, 914, 935, 936, 919,
- 938, 939, 920, 921, 940, 922, 941, 923, 942, 924,
- 945, 925, 926, 946, 927, 928, 929, 931, 948, 932,
- 949, 933, 934, 951, 935, 936, 944, 938, 939, 952,
- 944, 940, 954, 941, 955, 942, 957, 945, 958, 962,
-
- 946, 963, 967, 961, 968, 948, 969, 949, 970, 971,
- 951, 972, 961, 944, 974, 975, 952, 944, 976, 954,
- 961, 955, 977, 957, 980, 958, 962, 982, 963, 967,
- 961, 968, 984, 969, 985, 970, 971, 986, 972, 961,
- 990, 974, 975, 991, 992, 976, 993, 961, 994, 977,
- 995, 980, 996, 997, 982, 998, 999, 1000, 1001, 984,
- 1002, 985, 1003, 1004, 986, 1005, 1006, 990, 1007, 1008,
- 991, 992, 1009, 993, 1010, 994, 1011, 995, 1012, 996,
- 997, 1013, 998, 999, 1000, 1001, 1014, 1002, 1015, 1003,
- 1004, 1016, 1005, 1006, 1018, 1007, 1008, 1019, 1024, 1009,
-
- 1025, 1010, 1026, 1011, 1027, 1012, 1028, 1030, 1013, 1031,
- 1032, 1033, 1034, 1014, 1035, 1015, 1036, 1037, 1016, 1038,
- 1039, 1018, 1040, 1041, 1019, 1024, 1042, 1025, 1043, 1026,
- 1044, 1027, 1045, 1028, 1030, 1046, 1031, 1032, 1033, 1034,
- 1047, 1035, 1048, 1036, 1037, 1049, 1038, 1039, 1051, 1040,
- 1041, 1052, 1053, 1042, 1054, 1043, 1056, 1044, 1057, 1045,
- 1060, 1061, 1046, 1062, 1064, 1065, 1067, 1047, 1068, 1048,
- 1069, 1071, 1049, 1072, 1073, 1051, 1075, 1076, 1052, 1053,
- 1077, 1054, 1078, 1056, 1079, 1057, 1081, 1060, 1061, 1083,
- 1062, 1064, 1065, 1067, 1084, 1068, 1085, 1069, 1071, 1086,
-
- 1072, 1073, 1087, 1075, 1076, 1088, 1090, 1077, 1091, 1078,
- 1092, 1079, 1093, 1081, 1094, 1096, 1083, 1099, 1102, 1103,
- 1104, 1084, 1107, 1085, 1109, 1110, 1086, 1111, 1112, 1087,
- 1113, 1114, 1088, 1090, 1115, 1091, 1116, 1092, 1117, 1093,
- 1118, 1094, 1096, 1119, 1099, 1102, 1103, 1104, 1120, 1107,
- 1121, 1109, 1110, 1122, 1111, 1112, 1123, 1113, 1114, 1124,
- 1125, 1115, 1128, 1116, 1129, 1117, 1131, 1118, 1132, 1133,
- 1119, 1134, 1135, 1136, 1138, 1120, 1139, 1121, 1140, 1141,
- 1122, 1142, 1143, 1123, 1147, 1149, 1124, 1125, 1150, 1128,
- 1151, 1129, 1152, 1131, 1148, 1132, 1133, 1153, 1134, 1135,
-
- 1136, 1138, 1148, 1139, 1154, 1140, 1141, 1155, 1142, 1143,
- 1158, 1147, 1149, 1160, 1153, 1150, 1161, 1151, 1162, 1152,
- 1164, 1148, 1165, 1166, 1153, 1167, 1168, 1169, 1170, 1171,
- 1172, 1154, 1173, 1174, 1155, 1175, 1176, 1158, 1173, 1178,
- 1160, 1153, 1180, 1161, 1182, 1162, 1185, 1164, 1186, 1165,
- 1166, 1187, 1167, 1168, 1169, 1170, 1171, 1172, 1188, 1173,
- 1174, 1189, 1175, 1176, 1190, 1173, 1178, 1191, 1192, 1180,
- 1193, 1182, 1194, 1185, 1195, 1186, 1196, 1197, 1187, 1198,
- 1199, 1200, 1201, 1202, 1203, 1188, 1204, 1206, 1189, 1207,
- 1208, 1190, 1209, 1210, 1191, 1192, 1211, 1193, 1212, 1194,
-
- 1213, 1195, 1214, 1196, 1197, 1217, 1198, 1199, 1200, 1201,
- 1202, 1203, 1218, 1204, 1206, 1221, 1207, 1208, 1222, 1209,
- 1210, 1223, 1226, 1211, 1227, 1212, 1228, 1213, 1229, 1214,
- 1231, 1232, 1217, 1233, 1236, 1237, 1238, 1240, 1241, 1218,
- 1242, 1243, 1221, 1244, 1245, 1222, 1246, 1247, 1223, 1226,
- 1252, 1227, 1253, 1228, 1254, 1229, 1255, 1231, 1232, 1257,
- 1233, 1236, 1237, 1238, 1240, 1241, 1258, 1242, 1243, 1259,
- 1244, 1245, 1261, 1246, 1247, 1262, 1263, 1252, 1264, 1253,
- 1265, 1254, 1268, 1255, 1269, 1270, 1257, 1272, 1273, 1278,
- 1279, 1282, 1283, 1258, 1284, 1286, 1259, 1287, 1288, 1261,
-
- 1289, 1290, 1262, 1263, 1292, 1264, 1293, 1265, 1295, 1268,
- 1297, 1269, 1270, 1298, 1272, 1273, 1278, 1279, 1282, 1283,
- 1300, 1284, 1286, 1301, 1287, 1288, 1302, 1289, 1290, 1304,
- 1305, 1292, 1306, 1293, 1307, 1295, 1308, 1297, 1309, 1310,
- 1298, 1312, 1313, 1315, 1316, 1318, 1319, 1300, 1321, 1323,
- 1301, 1324, 1325, 1302, 1326, 1327, 1304, 1305, 1328, 1306,
- 1329, 1307, 1332, 1308, 1333, 1309, 1310, 1334, 1312, 1313,
- 1315, 1316, 1318, 1319, 1335, 1321, 1323, 1336, 1324, 1325,
- 1337, 1326, 1327, 1338, 1339, 1328, 1340, 1329, 1341, 1332,
- 1344, 1333, 1347, 1348, 1334, 1351, 1352, 1353, 1354, 1353,
-
- 1356, 1335, 1359, 1360, 1336, 1362, 1364, 1337, 1365, 1366,
- 1338, 1339, 1367, 1340, 1368, 1341, 1369, 1344, 1371, 1347,
- 1348, 1372, 1351, 1352, 1353, 1354, 1353, 1356, 1370, 1359,
- 1360, 1373, 1362, 1364, 1370, 1365, 1366, 1374, 1375, 1367,
- 1376, 1368, 1377, 1369, 1378, 1371, 1379, 1381, 1372, 1382,
- 1383, 1385, 1386, 1387, 1388, 1370, 1389, 1390, 1373, 1391,
- 1392, 1370, 1393, 1394, 1374, 1375, 1395, 1376, 1396, 1377,
- 1399, 1378, 1401, 1379, 1381, 1402, 1382, 1383, 1385, 1386,
- 1387, 1388, 1403, 1389, 1390, 1404, 1391, 1392, 1405, 1393,
- 1394, 1406, 1408, 1395, 1409, 1396, 1410, 1399, 1413, 1401,
-
- 1414, 1417, 1402, 1418, 1419, 1420, 1422, 1424, 1425, 1403,
- 1427, 1428, 1404, 1429, 1430, 1405, 1432, 1435, 1406, 1408,
- 1436, 1409, 1437, 1410, 1438, 1413, 1439, 1414, 1417, 1440,
- 1418, 1419, 1420, 1422, 1424, 1425, 1441, 1427, 1428, 1442,
- 1429, 1430, 1443, 1432, 1435, 1444, 1445, 1436, 1448, 1437,
- 1449, 1438, 1450, 1439, 1451, 1452, 1440, 1453, 1454, 1456,
- 1457, 1459, 1460, 1441, 1461, 1462, 1442, 1465, 1466, 1443,
- 1468, 1471, 1444, 1445, 1472, 1448, 1473, 1449, 1474, 1450,
- 1475, 1451, 1452, 1476, 1453, 1454, 1456, 1457, 1459, 1460,
- 1477, 1461, 1462, 1479, 1465, 1466, 1480, 1468, 1471, 1481,
-
- 1482, 1472, 1483, 1473, 1484, 1474, 1485, 1475, 1486, 1487,
- 1476, 1488, 1489, 1490, 1491, 1492, 1493, 1477, 1494, 1495,
- 1479, 1496, 1497, 1480, 1498, 1499, 1481, 1482, 1500, 1483,
- 1501, 1484, 1503, 1485, 1504, 1486, 1487, 1505, 1488, 1489,
- 1490, 1491, 1492, 1493, 1513, 1494, 1495, 1514, 1496, 1497,
- 1515, 1498, 1499, 1517, 1519, 1500, 1520, 1501, 1522, 1503,
- 1523, 1504, 1524, 1525, 1505, 1526, 1529, 1531, 1532, 1533,
- 1534, 1513, 1535, 1537, 1514, 1538, 1539, 1515, 1540, 1541,
- 1517, 1519, 1542, 1520, 1543, 1522, 1544, 1523, 1545, 1524,
- 1525, 1547, 1526, 1529, 1531, 1532, 1533, 1534, 1548, 1535,
-
- 1537, 1549, 1538, 1539, 1551, 1540, 1541, 1552, 1553, 1542,
- 1555, 1543, 1556, 1544, 1557, 1545, 1558, 1561, 1547, 1562,
- 1563, 1566, 1567, 1568, 1569, 1548, 1571, 1572, 1549, 1574,
- 1578, 1551, 1579, 1580, 1552, 1553, 1583, 1555, 1584, 1556,
- 1585, 1557, 1587, 1558, 1561, 1588, 1562, 1563, 1566, 1567,
- 1568, 1569, 1590, 1571, 1572, 1591, 1574, 1578, 1592, 1579,
- 1580, 1058, 1055, 1583, 1023, 1584, 1022, 1585, 1021, 1587,
- 1020, 981, 1588, 979, 978, 973, 964, 956, 947, 1590,
- 943, 937, 1591, 917, 916, 1592, 1597, 1597, 915, 912,
- 911, 902, 887, 880, 875, 846, 793, 786, 784, 781,
-
- 780, 779, 778, 777, 739, 738, 734, 689, 684, 683,
- 682, 680, 651, 649, 645, 622, 608, 566, 562, 560,
- 558, 554, 551, 532, 524, 508, 503, 500, 481, 474,
- 443, 441, 440, 425, 402, 388, 373, 372, 367, 356,
- 344, 341, 333, 331, 317, 313, 311, 303, 285, 273,
- 264, 223, 192, 177, 142, 122, 37, 5, 3, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
-
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595,
- 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595
+ 358, 349, 359, 361, 350, 362, 364, 365, 366, 360,
+ 340, 351, 359, 360, 340, 368, 368, 352, 360, 369,
+ 370, 353, 354, 355, 371, 357, 374, 358, 375, 359,
+
+ 361, 368, 362, 364, 365, 366, 360, 377, 378, 379,
+ 360, 380, 368, 368, 381, 360, 369, 370, 382, 383,
+ 385, 371, 386, 374, 387, 375, 389, 385, 368, 390,
+ 391, 392, 393, 394, 377, 378, 379, 395, 380, 396,
+ 398, 381, 400, 397, 401, 382, 383, 385, 397, 386,
+ 403, 387, 404, 389, 385, 406, 390, 391, 392, 393,
+ 394, 407, 409, 410, 395, 411, 396, 398, 413, 400,
+ 397, 401, 414, 416, 417, 397, 418, 403, 419, 404,
+ 420, 422, 406, 424, 426, 427, 428, 429, 407, 409,
+ 410, 430, 411, 433, 431, 413, 434, 435, 436, 414,
+
+ 416, 417, 437, 418, 431, 419, 438, 420, 422, 439,
+ 424, 426, 427, 428, 429, 442, 444, 445, 430, 446,
+ 433, 431, 447, 434, 435, 436, 448, 450, 449, 437,
+ 451, 431, 449, 438, 452, 453, 439, 454, 455, 456,
+ 457, 458, 442, 444, 445, 459, 446, 453, 460, 447,
+ 461, 454, 462, 448, 450, 449, 463, 451, 465, 449,
+ 466, 452, 453, 464, 454, 455, 456, 457, 458, 467,
+ 464, 468, 459, 469, 453, 460, 470, 461, 454, 462,
+ 471, 472, 473, 463, 475, 465, 477, 466, 476, 476,
+ 464, 478, 480, 479, 476, 482, 467, 464, 468, 483,
+
+ 469, 485, 478, 470, 485, 487, 488, 471, 472, 473,
+ 479, 475, 489, 477, 490, 476, 476, 492, 478, 480,
+ 479, 476, 482, 494, 491, 495, 483, 491, 485, 478,
+ 496, 485, 487, 488, 497, 498, 501, 479, 504, 489,
+ 505, 490, 504, 506, 492, 504, 508, 509, 511, 512,
+ 494, 491, 495, 513, 491, 514, 515, 496, 516, 517,
+ 518, 497, 498, 501, 519, 504, 520, 505, 521, 504,
+ 506, 522, 504, 508, 509, 511, 512, 524, 525, 526,
+ 513, 530, 514, 515, 532, 516, 517, 518, 534, 535,
+ 536, 519, 537, 520, 538, 521, 539, 540, 522, 541,
+
+ 542, 543, 544, 545, 524, 525, 526, 546, 530, 547,
+ 537, 532, 548, 549, 552, 534, 535, 536, 554, 537,
+ 555, 538, 558, 539, 540, 560, 541, 542, 543, 544,
+ 545, 562, 563, 564, 546, 566, 547, 556, 556, 548,
+ 549, 552, 567, 563, 569, 554, 556, 555, 570, 558,
+ 571, 556, 560, 572, 573, 574, 578, 579, 562, 563,
+ 564, 580, 566, 581, 556, 556, 582, 583, 584, 567,
+ 563, 569, 585, 556, 583, 570, 586, 571, 556, 587,
+ 572, 573, 574, 578, 579, 588, 589, 591, 580, 592,
+ 581, 593, 594, 582, 583, 584, 595, 597, 598, 585,
+
+ 599, 583, 600, 586, 601, 602, 587, 603, 604, 605,
+ 606, 608, 588, 589, 591, 609, 592, 610, 593, 594,
+ 611, 612, 613, 595, 597, 598, 614, 599, 616, 600,
+ 617, 601, 602, 618, 603, 604, 605, 606, 608, 619,
+ 620, 623, 609, 624, 610, 626, 627, 611, 612, 613,
+ 628, 629, 630, 614, 631, 616, 632, 617, 633, 633,
+ 618, 634, 635, 637, 638, 639, 619, 620, 623, 640,
+ 624, 641, 626, 627, 642, 644, 1077, 628, 629, 630,
+ 646, 631, 648, 632, 650, 633, 633, 653, 634, 635,
+ 637, 638, 639, 645, 654, 655, 640, 645, 641, 645,
+
+ 657, 642, 644, 645, 645, 658, 659, 646, 662, 648,
+ 664, 650, 665, 666, 653, 667, 668, 669, 670, 671,
+ 645, 654, 655, 672, 645, 673, 645, 657, 675, 677,
+ 645, 645, 658, 659, 679, 662, 683, 664, 684, 665,
+ 666, 685, 667, 668, 669, 670, 671, 686, 689, 690,
+ 672, 691, 673, 692, 693, 675, 677, 695, 696, 690,
+ 697, 679, 698, 683, 699, 684, 700, 701, 685, 702,
+ 703, 704, 705, 706, 686, 689, 690, 707, 691, 708,
+ 692, 693, 709, 710, 695, 696, 690, 697, 711, 698,
+ 712, 699, 713, 700, 701, 714, 702, 703, 704, 705,
+
+ 706, 715, 716, 717, 707, 718, 708, 719, 720, 709,
+ 710, 721, 722, 723, 724, 711, 726, 712, 727, 713,
+ 730, 731, 714, 733, 734, 735, 738, 739, 715, 716,
+ 717, 740, 718, 741, 719, 720, 742, 743, 721, 722,
+ 723, 724, 744, 726, 745, 727, 746, 730, 731, 747,
+ 733, 734, 735, 738, 739, 748, 749, 750, 740, 751,
+ 741, 752, 753, 742, 743, 754, 755, 757, 758, 744,
+ 759, 745, 761, 746, 762, 763, 747, 764, 765, 766,
+ 767, 768, 748, 749, 750, 769, 751, 770, 752, 753,
+ 771, 772, 754, 755, 757, 758, 773, 759, 779, 761,
+
+ 780, 762, 763, 782, 764, 765, 766, 767, 768, 786,
+ 789, 792, 769, 793, 770, 794, 795, 771, 772, 798,
+ 799, 800, 801, 773, 802, 779, 803, 780, 804, 806,
+ 782, 807, 808, 809, 811, 1075, 786, 789, 792, 803,
+ 793, 812, 794, 795, 813, 805, 798, 799, 800, 801,
+ 805, 802, 814, 803, 815, 804, 806, 816, 807, 808,
+ 809, 811, 805, 817, 818, 819, 803, 820, 812, 821,
+ 822, 813, 805, 823, 824, 826, 827, 805, 828, 814,
+ 829, 815, 830, 831, 816, 832, 833, 834, 835, 805,
+ 817, 818, 819, 837, 820, 838, 821, 822, 839, 840,
+
+ 823, 824, 826, 827, 842, 828, 844, 829, 845, 830,
+ 831, 846, 832, 833, 834, 835, 847, 848, 850, 851,
+ 837, 852, 838, 854, 853, 839, 840, 856, 857, 858,
+ 860, 842, 862, 844, 853, 845, 864, 865, 846, 866,
+ 867, 869, 870, 847, 848, 850, 851, 871, 852, 873,
+ 854, 853, 874, 875, 856, 857, 858, 860, 876, 862,
+ 877, 853, 878, 864, 865, 879, 866, 867, 869, 870,
+ 880, 881, 882, 884, 871, 885, 873, 886, 887, 874,
+ 875, 888, 889, 890, 891, 876, 892, 877, 893, 878,
+ 894, 895, 879, 896, 897, 899, 900, 880, 881, 882,
+
+ 884, 901, 885, 902, 886, 887, 903, 904, 888, 889,
+ 890, 891, 905, 892, 906, 893, 906, 894, 895, 909,
+ 896, 897, 899, 900, 910, 915, 906, 916, 901, 917,
+ 902, 918, 919, 903, 904, 920, 921, 922, 923, 905,
+ 924, 925, 927, 928, 929, 930, 909, 931, 932, 934,
+ 935, 910, 915, 936, 916, 937, 917, 938, 918, 919,
+ 941, 942, 920, 921, 922, 923, 944, 924, 925, 927,
+ 928, 929, 930, 945, 931, 932, 934, 935, 947, 940,
+ 936, 948, 937, 940, 938, 950, 951, 941, 942, 953,
+ 954, 958, 957, 944, 959, 963, 964, 965, 966, 967,
+
+ 945, 957, 968, 970, 971, 947, 940, 972, 948, 957,
+ 940, 973, 950, 951, 976, 978, 953, 954, 958, 957,
+ 980, 959, 963, 964, 965, 966, 967, 981, 957, 968,
+ 970, 971, 982, 986, 972, 987, 957, 988, 973, 989,
+ 990, 976, 978, 991, 992, 993, 994, 980, 995, 996,
+ 997, 998, 999, 1000, 981, 1001, 1002, 1003, 1004, 982,
+ 986, 1005, 987, 1006, 988, 1007, 989, 990, 1008, 1009,
+ 991, 992, 993, 994, 1010, 995, 996, 997, 998, 999,
+ 1000, 1011, 1001, 1002, 1003, 1004, 1013, 1014, 1005, 1019,
+ 1006, 1020, 1007, 1021, 1022, 1008, 1009, 1023, 1025, 1026,
+
+ 1027, 1010, 1028, 1029, 1030, 1031, 1032, 1033, 1011, 1034,
+ 1035, 1036, 1037, 1013, 1014, 1038, 1019, 1039, 1020, 1040,
+ 1021, 1022, 1041, 1042, 1023, 1025, 1026, 1027, 1043, 1028,
+ 1029, 1030, 1031, 1032, 1033, 1044, 1034, 1035, 1036, 1037,
+ 1046, 1047, 1038, 1048, 1039, 1049, 1040, 1051, 1052, 1041,
+ 1042, 1055, 1056, 1057, 1059, 1043, 1060, 1062, 1063, 1064,
+ 1066, 1067, 1044, 1068, 1070, 1071, 1072, 1046, 1047, 1073,
+ 1048, 1074, 1049, 1076, 1051, 1052, 1078, 1079, 1055, 1056,
+ 1057, 1059, 1080, 1060, 1062, 1063, 1064, 1066, 1067, 1081,
+ 1068, 1070, 1071, 1072, 1082, 1083, 1073, 1085, 1074, 1086,
+
+ 1076, 1087, 1088, 1078, 1079, 1090, 1093, 1096, 1097, 1080,
+ 1098, 1101, 1103, 1104, 1105, 1106, 1081, 1107, 1108, 1109,
+ 1110, 1082, 1083, 1111, 1085, 1112, 1086, 1113, 1087, 1088,
+ 1114, 1115, 1090, 1093, 1096, 1097, 1116, 1098, 1101, 1103,
+ 1104, 1105, 1106, 1117, 1107, 1108, 1109, 1110, 1118, 1119,
+ 1111, 1122, 1112, 1123, 1113, 1125, 1126, 1114, 1115, 1127,
+ 1128, 1129, 1130, 1116, 1132, 1133, 1134, 1135, 1136, 1137,
+ 1117, 1141, 1143, 1142, 1144, 1118, 1119, 1145, 1122, 1146,
+ 1123, 1142, 1125, 1126, 1148, 1147, 1127, 1128, 1129, 1130,
+ 1149, 1132, 1133, 1134, 1135, 1136, 1137, 1152, 1141, 1143,
+
+ 1142, 1144, 1147, 1154, 1145, 1155, 1146, 1156, 1158, 1159,
+ 1160, 1148, 1147, 1161, 1162, 1163, 1164, 1149, 1165, 1166,
+ 1167, 1168, 1169, 1170, 1152, 1172, 1167, 1174, 1178, 1147,
+ 1154, 1179, 1155, 1180, 1156, 1158, 1159, 1160, 1181, 1182,
+ 1161, 1162, 1163, 1164, 1183, 1165, 1166, 1167, 1168, 1169,
+ 1170, 1184, 1172, 1167, 1174, 1178, 1185, 1186, 1179, 1187,
+ 1180, 1188, 1189, 1190, 1191, 1181, 1182, 1192, 1193, 1194,
+ 1195, 1183, 1196, 1197, 1199, 1200, 1201, 1202, 1184, 1203,
+ 1204, 1205, 1206, 1185, 1186, 1207, 1187, 1210, 1188, 1189,
+ 1190, 1191, 1211, 1214, 1192, 1193, 1194, 1195, 1215, 1196,
+
+ 1197, 1199, 1200, 1201, 1202, 1216, 1203, 1204, 1205, 1206,
+ 1219, 1220, 1207, 1221, 1210, 1222, 1224, 1225, 1226, 1211,
+ 1214, 1229, 1230, 1231, 1233, 1215, 1234, 1235, 1236, 1237,
+ 1238, 1239, 1216, 1240, 1245, 1246, 1247, 1219, 1220, 1248,
+ 1221, 1250, 1222, 1224, 1225, 1226, 1251, 1252, 1229, 1230,
+ 1231, 1233, 1254, 1234, 1235, 1236, 1237, 1238, 1239, 1255,
+ 1240, 1245, 1246, 1247, 1256, 1257, 1248, 1260, 1250, 1261,
+ 1262, 1264, 1265, 1251, 1252, 1270, 1271, 1274, 1275, 1254,
+ 1276, 1278, 1279, 1280, 1281, 1282, 1255, 1284, 1285, 1287,
+ 1289, 1256, 1257, 1290, 1260, 1292, 1261, 1262, 1264, 1265,
+
+ 1293, 1294, 1270, 1271, 1274, 1275, 1296, 1276, 1278, 1279,
+ 1280, 1281, 1282, 1297, 1284, 1285, 1287, 1289, 1298, 1299,
+ 1290, 1300, 1292, 1301, 1302, 1304, 1305, 1293, 1294, 1307,
+ 1308, 1310, 1311, 1296, 1313, 1315, 1316, 1317, 1318, 1319,
+ 1297, 1320, 1323, 1324, 1325, 1298, 1299, 1326, 1300, 1327,
+ 1301, 1302, 1304, 1305, 1328, 1329, 1307, 1308, 1310, 1311,
+ 1330, 1313, 1315, 1316, 1317, 1318, 1319, 1331, 1320, 1323,
+ 1324, 1325, 1332, 1335, 1326, 1338, 1327, 1339, 1342, 1343,
+ 1345, 1328, 1329, 1344, 1347, 1344, 1350, 1330, 1351, 1353,
+ 1355, 1356, 1357, 1358, 1331, 1359, 1360, 1361, 1362, 1332,
+
+ 1335, 1363, 1338, 1361, 1339, 1342, 1343, 1345, 1364, 1365,
+ 1344, 1347, 1344, 1350, 1366, 1351, 1353, 1355, 1356, 1357,
+ 1358, 1367, 1359, 1360, 1361, 1362, 1368, 1369, 1363, 1370,
+ 1361, 1372, 1373, 1375, 1376, 1364, 1365, 1377, 1378, 1379,
+ 1380, 1366, 1381, 1382, 1383, 1384, 1385, 1386, 1367, 1389,
+ 1391, 1392, 1393, 1368, 1369, 1394, 1370, 1395, 1372, 1373,
+ 1375, 1376, 1396, 1398, 1377, 1378, 1379, 1380, 1399, 1381,
+ 1382, 1383, 1384, 1385, 1386, 1400, 1389, 1391, 1392, 1393,
+ 1403, 1404, 1394, 1407, 1395, 1408, 1409, 1410, 1412, 1396,
+ 1398, 1414, 1415, 1417, 1418, 1399, 1419, 1421, 1424, 1425,
+
+ 1426, 1427, 1400, 1428, 1429, 1430, 1431, 1403, 1404, 1432,
+ 1407, 1433, 1408, 1409, 1410, 1412, 1434, 1437, 1414, 1415,
+ 1417, 1418, 1438, 1419, 1421, 1424, 1425, 1426, 1427, 1439,
+ 1428, 1429, 1430, 1431, 1440, 1441, 1432, 1442, 1433, 1443,
+ 1445, 1446, 1448, 1434, 1437, 1449, 1450, 1451, 1454, 1438,
+ 1455, 1457, 1460, 1461, 1462, 1463, 1439, 1464, 1465, 1467,
+ 1468, 1440, 1441, 1469, 1442, 1470, 1443, 1445, 1446, 1448,
+ 1471, 1472, 1449, 1450, 1451, 1454, 1473, 1455, 1457, 1460,
+ 1461, 1462, 1463, 1474, 1464, 1465, 1467, 1468, 1475, 1476,
+ 1469, 1477, 1470, 1478, 1479, 1480, 1481, 1471, 1472, 1482,
+
+ 1483, 1484, 1485, 1473, 1486, 1487, 1488, 1489, 1490, 1491,
+ 1474, 1492, 1500, 1501, 1502, 1475, 1476, 1504, 1477, 1506,
+ 1478, 1479, 1480, 1481, 1507, 1509, 1482, 1483, 1484, 1485,
+ 1510, 1486, 1487, 1488, 1489, 1490, 1491, 1511, 1492, 1500,
+ 1501, 1502, 1512, 1513, 1504, 1516, 1506, 1518, 1519, 1520,
+ 1521, 1507, 1509, 1522, 1524, 1525, 1526, 1510, 1527, 1528,
+ 1529, 1530, 1531, 1532, 1511, 1534, 1535, 1536, 1538, 1512,
+ 1513, 1539, 1516, 1540, 1518, 1519, 1520, 1521, 1542, 1543,
+ 1522, 1524, 1525, 1526, 1544, 1527, 1528, 1529, 1530, 1531,
+ 1532, 1545, 1534, 1535, 1536, 1538, 1548, 1549, 1539, 1550,
+
+ 1540, 1553, 1554, 1555, 1556, 1542, 1543, 1558, 1559, 1561,
+ 1565, 1544, 1566, 1567, 1570, 1571, 1572, 1574, 1545, 1575,
+ 1577, 1578, 1579, 1548, 1549, 1054, 1550, 1053, 1553, 1554,
+ 1555, 1556, 1050, 1018, 1558, 1559, 1561, 1565, 1017, 1566,
+ 1567, 1570, 1571, 1572, 1574, 1016, 1575, 1577, 1578, 1579,
+ 1584, 1584, 1015, 977, 975, 974, 969, 960, 952, 943,
+ 939, 933, 913, 912, 911, 908, 907, 898, 883, 872,
+ 843, 790, 783, 781, 778, 777, 776, 775, 774, 737,
+ 736, 732, 687, 682, 681, 680, 678, 649, 647, 643,
+ 621, 607, 565, 561, 559, 557, 553, 550, 531, 523,
+
+ 507, 502, 499, 481, 474, 443, 441, 440, 425, 402,
+ 388, 373, 372, 367, 356, 344, 341, 333, 331, 317,
+ 313, 311, 303, 285, 273, 264, 223, 192, 177, 142,
+ 122, 37, 5, 3, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+ 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582,
+
+ 1582, 1582, 1582
} ;
static yy_state_type yy_last_accepting_state;
@@ -1732,7 +1722,7 @@ conf_yy_fatal_error(const char *msg)
return 0;
}
-#line 1736 "conf_lexer.c"
+#line 1726 "conf_lexer.c"
#define INITIAL 0
@@ -1914,7 +1904,7 @@ YY_DECL
#line 78 "conf_lexer.l"
-#line 1918 "conf_lexer.c"
+#line 1908 "conf_lexer.c"
if ( !(yy_init) )
{
@@ -1973,13 +1963,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 >= 1596 )
+ if ( yy_current_state >= 1583 )
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_current_state != 1595 );
+ while ( yy_current_state != 1582 );
yy_cp = (yy_last_accepting_cpos);
yy_current_state = (yy_last_accepting_state);
@@ -2452,157 +2442,157 @@ YY_RULE_SETUP
case 82:
YY_RULE_SETUP
#line 208 "conf_lexer.l"
-{ return TMASKED; }
+{ return MASK; }
YY_BREAK
case 83:
YY_RULE_SETUP
#line 209 "conf_lexer.l"
-{ return T_MAX_CLIENTS; }
+{ return TMASKED; }
YY_BREAK
case 84:
YY_RULE_SETUP
#line 210 "conf_lexer.l"
-{ return MAX_IDENT; }
+{ return T_MAX_CLIENTS; }
YY_BREAK
case 85:
YY_RULE_SETUP
#line 211 "conf_lexer.l"
-{ return MAX_IDLE; }
+{ return MAX_IDENT; }
YY_BREAK
case 86:
YY_RULE_SETUP
#line 212 "conf_lexer.l"
-{ return MIN_IDLE; }
+{ return MAX_IDLE; }
YY_BREAK
case 87:
YY_RULE_SETUP
#line 213 "conf_lexer.l"
-{ return MAX_LOCAL; }
+{ return MIN_IDLE; }
YY_BREAK
case 88:
YY_RULE_SETUP
#line 214 "conf_lexer.l"
-{ return MAX_GLOBAL; }
+{ return MAX_LOCAL; }
YY_BREAK
case 89:
YY_RULE_SETUP
#line 215 "conf_lexer.l"
-{ return MAX_NUMBER; }
+{ return MAX_GLOBAL; }
YY_BREAK
case 90:
YY_RULE_SETUP
#line 216 "conf_lexer.l"
-{ return MAX_NICK_LENGTH; }
+{ return MAX_NUMBER; }
YY_BREAK
case 91:
YY_RULE_SETUP
#line 217 "conf_lexer.l"
-{ return MAX_TOPIC_LENGTH; }
+{ return MAX_NICK_LENGTH; }
YY_BREAK
case 92:
YY_RULE_SETUP
#line 218 "conf_lexer.l"
-{ return MAX_WATCH; }
+{ return MAX_TOPIC_LENGTH; }
YY_BREAK
case 93:
YY_RULE_SETUP
#line 219 "conf_lexer.l"
-{ return MIN_NONWILDCARD; }
+{ return MAX_WATCH; }
YY_BREAK
case 94:
YY_RULE_SETUP
#line 220 "conf_lexer.l"
-{ return MIN_NONWILDCARD_SIMPLE; }
+{ return MIN_NONWILDCARD; }
YY_BREAK
case 95:
YY_RULE_SETUP
#line 221 "conf_lexer.l"
-{ return NAME; }
+{ return MIN_NONWILDCARD_SIMPLE; }
YY_BREAK
case 96:
YY_RULE_SETUP
#line 222 "conf_lexer.l"
-{ return NEED_PASSWORD; }
+{ return NAME; }
YY_BREAK
case 97:
YY_RULE_SETUP
#line 223 "conf_lexer.l"
-{ return NETWORK_DESC; }
+{ return NEED_PASSWORD; }
YY_BREAK
case 98:
YY_RULE_SETUP
#line 224 "conf_lexer.l"
-{ return NETWORK_NAME; }
+{ return NETWORK_DESC; }
YY_BREAK
case 99:
YY_RULE_SETUP
#line 225 "conf_lexer.l"
-{ return NICK; }
+{ return NETWORK_NAME; }
YY_BREAK
case 100:
YY_RULE_SETUP
#line 226 "conf_lexer.l"
-{ return NICK_CHANGES; }
+{ return NICK; }
YY_BREAK
case 101:
YY_RULE_SETUP
#line 227 "conf_lexer.l"
-{ yylval.number = 0; return TBOOL; }
+{ return NICK_CHANGES; }
YY_BREAK
case 102:
YY_RULE_SETUP
#line 228 "conf_lexer.l"
-{ return NO_CREATE_ON_SPLIT; }
+{ yylval.number = 0; return TBOOL; }
YY_BREAK
case 103:
YY_RULE_SETUP
#line 229 "conf_lexer.l"
-{ return NO_JOIN_ON_SPLIT; }
+{ return NO_CREATE_ON_SPLIT; }
YY_BREAK
case 104:
YY_RULE_SETUP
#line 230 "conf_lexer.l"
-{ return NO_OPER_FLOOD; }
+{ return NO_JOIN_ON_SPLIT; }
YY_BREAK
case 105:
YY_RULE_SETUP
#line 231 "conf_lexer.l"
-{ return NO_TILDE; }
+{ return NO_OPER_FLOOD; }
YY_BREAK
case 106:
YY_RULE_SETUP
#line 232 "conf_lexer.l"
-{ return T_NONONREG; }
+{ return NO_TILDE; }
YY_BREAK
case 107:
YY_RULE_SETUP
#line 233 "conf_lexer.l"
-{ return NUMBER_PER_CIDR; }
+{ return T_NONONREG; }
YY_BREAK
case 108:
YY_RULE_SETUP
#line 234 "conf_lexer.l"
-{ return NUMBER_PER_IP; }
+{ return NUMBER_PER_CIDR; }
YY_BREAK
case 109:
YY_RULE_SETUP
#line 235 "conf_lexer.l"
-{ return OPERATOR; }
+{ return NUMBER_PER_IP; }
YY_BREAK
case 110:
YY_RULE_SETUP
#line 236 "conf_lexer.l"
-{ return OPER_PASS_RESV; }
+{ return OPERATOR; }
YY_BREAK
case 111:
YY_RULE_SETUP
#line 237 "conf_lexer.l"
-{ return OPERATOR; }
+{ return OPER_PASS_RESV; }
YY_BREAK
case 112:
YY_RULE_SETUP
#line 238 "conf_lexer.l"
-{ return PASSWORD; }
+{ return OPERATOR; }
YY_BREAK
case 113:
YY_RULE_SETUP
@@ -2612,82 +2602,82 @@ YY_RULE_SETUP
case 114:
YY_RULE_SETUP
#line 240 "conf_lexer.l"
-{ return PING_COOKIE; }
+{ return PASSWORD; }
YY_BREAK
case 115:
YY_RULE_SETUP
#line 241 "conf_lexer.l"
-{ return PING_TIME; }
+{ return PING_COOKIE; }
YY_BREAK
case 116:
YY_RULE_SETUP
#line 242 "conf_lexer.l"
-{ return PORT; }
+{ return PING_TIME; }
YY_BREAK
case 117:
YY_RULE_SETUP
#line 243 "conf_lexer.l"
-{ return RESV; }
+{ return PORT; }
YY_BREAK
case 118:
YY_RULE_SETUP
#line 244 "conf_lexer.l"
-{ return QUIET_ON_BAN; }
+{ return RESV; }
YY_BREAK
case 119:
YY_RULE_SETUP
#line 245 "conf_lexer.l"
-{ return RANDOM_IDLE; }
+{ return QUIET_ON_BAN; }
YY_BREAK
case 120:
YY_RULE_SETUP
#line 246 "conf_lexer.l"
-{ return REASON; }
+{ return RANDOM_IDLE; }
YY_BREAK
case 121:
YY_RULE_SETUP
#line 247 "conf_lexer.l"
-{ return T_RECVQ; }
+{ return REASON; }
YY_BREAK
case 122:
YY_RULE_SETUP
#line 248 "conf_lexer.l"
-{ return REDIRPORT; }
+{ return T_RECVQ; }
YY_BREAK
case 123:
YY_RULE_SETUP
#line 249 "conf_lexer.l"
-{ return REDIRSERV; }
+{ return REDIRPORT; }
YY_BREAK
case 124:
YY_RULE_SETUP
#line 250 "conf_lexer.l"
-{ return REGEX_T; }
+{ return REDIRSERV; }
YY_BREAK
case 125:
YY_RULE_SETUP
#line 251 "conf_lexer.l"
-{ return REHASH; }
+{ return REGEX_T; }
YY_BREAK
case 126:
YY_RULE_SETUP
#line 252 "conf_lexer.l"
-{ return REMOTE; }
+{ return REHASH; }
YY_BREAK
case 127:
YY_RULE_SETUP
#line 253 "conf_lexer.l"
-{ return REMOTEBAN; }
+{ return REMOTE; }
YY_BREAK
case 128:
YY_RULE_SETUP
#line 254 "conf_lexer.l"
-{ return T_RESTART; }
+{ return REMOTEBAN; }
YY_BREAK
case 129:
YY_RULE_SETUP
#line 255 "conf_lexer.l"
-{ return RESTRICT_CHANNELS; }
+{ return T_RESTART; }
YY_BREAK
case 130:
YY_RULE_SETUP
@@ -3293,7 +3283,7 @@ YY_RULE_SETUP
#line 384 "conf_lexer.l"
ECHO;
YY_BREAK
-#line 3297 "conf_lexer.c"
+#line 3287 "conf_lexer.c"
case YY_END_OF_BUFFER:
{
@@ -3584,7 +3574,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 >= 1596 )
+ if ( yy_current_state >= 1583 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -3612,11 +3602,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 >= 1596 )
+ if ( yy_current_state >= 1583 )
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 == 1595);
+ yy_is_jam = (yy_current_state == 1582);
return yy_is_jam ? 0 : yy_current_state;
}
diff --git a/src/conf_lexer.l b/src/conf_lexer.l
index 8faf240..ddace2d 100644
--- a/src/conf_lexer.l
+++ b/src/conf_lexer.l
@@ -205,6 +205,7 @@ kline_exempt { return KLINE_EXEMPT; }
leaf_mask { return LEAF_MASK; }
listen { return LISTEN; }
log { return T_LOG; }
+mask { return MASK; }
masked { return TMASKED; }
max_clients { return T_MAX_CLIENTS; }
max_ident { return MAX_IDENT; }
@@ -252,7 +253,6 @@ rehash { return REHASH; }
remote { return REMOTE; }
remoteban { return REMOTEBAN; }
restart { return T_RESTART; }
-restrict_channels { return RESTRICT_CHANNELS; }
resv { return RESV; }
resv_exempt { return RESV_EXEMPT; }
rsa_private_key_file { return RSA_PRIVATE_KEY_FILE; }
diff --git a/src/conf_parser.c b/src/conf_parser.c
index a148a0a..adfd2c8 100644
--- a/src/conf_parser.c
+++ b/src/conf_parser.c
@@ -283,66 +283,66 @@ extern int yydebug;
LINKS_DELAY = 325,
LISTEN = 326,
T_LOG = 327,
- MAX_ACCEPT = 328,
- MAX_BANS = 329,
- MAX_CHANS_PER_OPER = 330,
- MAX_CHANS_PER_USER = 331,
- MAX_GLOBAL = 332,
- MAX_IDENT = 333,
- MAX_LOCAL = 334,
- MAX_NICK_CHANGES = 335,
- MAX_NICK_LENGTH = 336,
- MAX_NICK_TIME = 337,
- MAX_NUMBER = 338,
- MAX_TARGETS = 339,
- MAX_TOPIC_LENGTH = 340,
- MAX_WATCH = 341,
- MIN_NONWILDCARD = 342,
- MIN_NONWILDCARD_SIMPLE = 343,
- MIN_IDLE = 344,
- MAX_IDLE = 345,
- RANDOM_IDLE = 346,
- HIDE_IDLE_FROM_OPERS = 347,
- MODULE = 348,
- MODULES = 349,
- NAME = 350,
- NEED_PASSWORD = 351,
- NETWORK_DESC = 352,
- NETWORK_NAME = 353,
- NICK = 354,
- NICK_CHANGES = 355,
- NO_CREATE_ON_SPLIT = 356,
- NO_JOIN_ON_SPLIT = 357,
- NO_OPER_FLOOD = 358,
- NO_TILDE = 359,
- NUMBER = 360,
- NUMBER_PER_CIDR = 361,
- NUMBER_PER_IP = 362,
- OPERATOR = 363,
- OPERS_BYPASS_CALLERID = 364,
- OPER_ONLY_UMODES = 365,
- OPER_PASS_RESV = 366,
- OPER_SPY_T = 367,
- OPER_UMODES = 368,
- JOIN_FLOOD_COUNT = 369,
- JOIN_FLOOD_TIME = 370,
- PACE_WAIT = 371,
- PACE_WAIT_SIMPLE = 372,
- PASSWORD = 373,
- PATH = 374,
- PING_COOKIE = 375,
- PING_TIME = 376,
- PORT = 377,
- QSTRING = 378,
- QUIET_ON_BAN = 379,
- REASON = 380,
- REDIRPORT = 381,
- REDIRSERV = 382,
- REGEX_T = 383,
- REHASH = 384,
- REMOTE = 385,
- REMOTEBAN = 386,
- RESTRICT_CHANNELS = 387,
+ MASK = 328,
+ MAX_ACCEPT = 329,
+ MAX_BANS = 330,
+ MAX_CHANS_PER_OPER = 331,
+ MAX_CHANS_PER_USER = 332,
+ MAX_GLOBAL = 333,
+ MAX_IDENT = 334,
+ MAX_LOCAL = 335,
+ MAX_NICK_CHANGES = 336,
+ MAX_NICK_LENGTH = 337,
+ MAX_NICK_TIME = 338,
+ MAX_NUMBER = 339,
+ MAX_TARGETS = 340,
+ MAX_TOPIC_LENGTH = 341,
+ MAX_WATCH = 342,
+ MIN_NONWILDCARD = 343,
+ MIN_NONWILDCARD_SIMPLE = 344,
+ MIN_IDLE = 345,
+ MAX_IDLE = 346,
+ RANDOM_IDLE = 347,
+ HIDE_IDLE_FROM_OPERS = 348,
+ MODULE = 349,
+ MODULES = 350,
+ NAME = 351,
+ NEED_PASSWORD = 352,
+ NETWORK_DESC = 353,
+ NETWORK_NAME = 354,
+ NICK = 355,
+ NICK_CHANGES = 356,
+ NO_CREATE_ON_SPLIT = 357,
+ NO_JOIN_ON_SPLIT = 358,
+ NO_OPER_FLOOD = 359,
+ NO_TILDE = 360,
+ NUMBER = 361,
+ NUMBER_PER_CIDR = 362,
+ NUMBER_PER_IP = 363,
+ OPERATOR = 364,
+ OPERS_BYPASS_CALLERID = 365,
+ OPER_ONLY_UMODES = 366,
+ OPER_PASS_RESV = 367,
+ OPER_SPY_T = 368,
+ OPER_UMODES = 369,
+ JOIN_FLOOD_COUNT = 370,
+ JOIN_FLOOD_TIME = 371,
+ PACE_WAIT = 372,
+ PACE_WAIT_SIMPLE = 373,
+ PASSWORD = 374,
+ PATH = 375,
+ PING_COOKIE = 376,
+ PING_TIME = 377,
+ PORT = 378,
+ QSTRING = 379,
+ QUIET_ON_BAN = 380,
+ REASON = 381,
+ REDIRPORT = 382,
+ REDIRSERV = 383,
+ REGEX_T = 384,
+ REHASH = 385,
+ REMOTE = 386,
+ REMOTEBAN = 387,
RSA_PRIVATE_KEY_FILE = 388,
RSA_PUBLIC_KEY_FILE = 389,
SSL_CERTIFICATE_FILE = 390,
@@ -507,66 +507,66 @@ extern int yydebug;
#define LINKS_DELAY 325
#define LISTEN 326
#define T_LOG 327
-#define MAX_ACCEPT 328
-#define MAX_BANS 329
-#define MAX_CHANS_PER_OPER 330
-#define MAX_CHANS_PER_USER 331
-#define MAX_GLOBAL 332
-#define MAX_IDENT 333
-#define MAX_LOCAL 334
-#define MAX_NICK_CHANGES 335
-#define MAX_NICK_LENGTH 336
-#define MAX_NICK_TIME 337
-#define MAX_NUMBER 338
-#define MAX_TARGETS 339
-#define MAX_TOPIC_LENGTH 340
-#define MAX_WATCH 341
-#define MIN_NONWILDCARD 342
-#define MIN_NONWILDCARD_SIMPLE 343
-#define MIN_IDLE 344
-#define MAX_IDLE 345
-#define RANDOM_IDLE 346
-#define HIDE_IDLE_FROM_OPERS 347
-#define MODULE 348
-#define MODULES 349
-#define NAME 350
-#define NEED_PASSWORD 351
-#define NETWORK_DESC 352
-#define NETWORK_NAME 353
-#define NICK 354
-#define NICK_CHANGES 355
-#define NO_CREATE_ON_SPLIT 356
-#define NO_JOIN_ON_SPLIT 357
-#define NO_OPER_FLOOD 358
-#define NO_TILDE 359
-#define NUMBER 360
-#define NUMBER_PER_CIDR 361
-#define NUMBER_PER_IP 362
-#define OPERATOR 363
-#define OPERS_BYPASS_CALLERID 364
-#define OPER_ONLY_UMODES 365
-#define OPER_PASS_RESV 366
-#define OPER_SPY_T 367
-#define OPER_UMODES 368
-#define JOIN_FLOOD_COUNT 369
-#define JOIN_FLOOD_TIME 370
-#define PACE_WAIT 371
-#define PACE_WAIT_SIMPLE 372
-#define PASSWORD 373
-#define PATH 374
-#define PING_COOKIE 375
-#define PING_TIME 376
-#define PORT 377
-#define QSTRING 378
-#define QUIET_ON_BAN 379
-#define REASON 380
-#define REDIRPORT 381
-#define REDIRSERV 382
-#define REGEX_T 383
-#define REHASH 384
-#define REMOTE 385
-#define REMOTEBAN 386
-#define RESTRICT_CHANNELS 387
+#define MASK 328
+#define MAX_ACCEPT 329
+#define MAX_BANS 330
+#define MAX_CHANS_PER_OPER 331
+#define MAX_CHANS_PER_USER 332
+#define MAX_GLOBAL 333
+#define MAX_IDENT 334
+#define MAX_LOCAL 335
+#define MAX_NICK_CHANGES 336
+#define MAX_NICK_LENGTH 337
+#define MAX_NICK_TIME 338
+#define MAX_NUMBER 339
+#define MAX_TARGETS 340
+#define MAX_TOPIC_LENGTH 341
+#define MAX_WATCH 342
+#define MIN_NONWILDCARD 343
+#define MIN_NONWILDCARD_SIMPLE 344
+#define MIN_IDLE 345
+#define MAX_IDLE 346
+#define RANDOM_IDLE 347
+#define HIDE_IDLE_FROM_OPERS 348
+#define MODULE 349
+#define MODULES 350
+#define NAME 351
+#define NEED_PASSWORD 352
+#define NETWORK_DESC 353
+#define NETWORK_NAME 354
+#define NICK 355
+#define NICK_CHANGES 356
+#define NO_CREATE_ON_SPLIT 357
+#define NO_JOIN_ON_SPLIT 358
+#define NO_OPER_FLOOD 359
+#define NO_TILDE 360
+#define NUMBER 361
+#define NUMBER_PER_CIDR 362
+#define NUMBER_PER_IP 363
+#define OPERATOR 364
+#define OPERS_BYPASS_CALLERID 365
+#define OPER_ONLY_UMODES 366
+#define OPER_PASS_RESV 367
+#define OPER_SPY_T 368
+#define OPER_UMODES 369
+#define JOIN_FLOOD_COUNT 370
+#define JOIN_FLOOD_TIME 371
+#define PACE_WAIT 372
+#define PACE_WAIT_SIMPLE 373
+#define PASSWORD 374
+#define PATH 375
+#define PING_COOKIE 376
+#define PING_TIME 377
+#define PORT 378
+#define QSTRING 379
+#define QUIET_ON_BAN 380
+#define REASON 381
+#define REDIRPORT 382
+#define REDIRSERV 383
+#define REGEX_T 384
+#define REHASH 385
+#define REMOTE 386
+#define REMOTEBAN 387
#define RSA_PRIVATE_KEY_FILE 388
#define RSA_PUBLIC_KEY_FILE 389
#define SSL_CERTIFICATE_FILE 390
@@ -929,16 +929,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1281
+#define YYLAST 1293
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 229
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 290
+#define YYNNTS 289
/* YYNRULES -- Number of rules. */
-#define YYNRULES 645
+#define YYNRULES 643
/* YYNRULES -- Number of states. */
-#define YYNSTATES 1261
+#define YYNSTATES 1256
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -1066,10 +1066,10 @@ static const yytype_uint16 yyprhs[] =
1749, 1751, 1753, 1755, 1757, 1759, 1761, 1763, 1765, 1767,
1769, 1771, 1773, 1775, 1780, 1785, 1790, 1796, 1799, 1801,
1803, 1805, 1807, 1809, 1811, 1813, 1815, 1817, 1819, 1821,
- 1823, 1825, 1827, 1829, 1831, 1836, 1841, 1846, 1851, 1856,
- 1861, 1866, 1871, 1876, 1881, 1886, 1891, 1896, 1901, 1907,
- 1910, 1912, 1914, 1916, 1918, 1920, 1922, 1924, 1926, 1928,
- 1933, 1938, 1943, 1948, 1953, 1958
+ 1823, 1825, 1827, 1829, 1834, 1839, 1844, 1849, 1854, 1859,
+ 1864, 1869, 1874, 1879, 1884, 1889, 1894, 1900, 1903, 1905,
+ 1907, 1909, 1911, 1913, 1915, 1917, 1919, 1921, 1926, 1931,
+ 1936, 1941, 1946, 1951
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -1077,18 +1077,18 @@ static const yytype_int16 yyrhs[] =
{
230, 0, -1, -1, 230, 231, -1, 265, -1, 271,
-1, 285, -1, 492, -1, 303, -1, 326, -1, 340,
- -1, 241, -1, 509, -1, 355, -1, 362, -1, 366,
+ -1, 241, -1, 508, -1, 355, -1, 362, -1, 366,
-1, 376, -1, 385, -1, 405, -1, 415, -1, 421,
-1, 435, -1, 425, -1, 236, -1, 1, 224, -1,
- 1, 225, -1, -1, 233, -1, 105, 232, -1, 105,
- 143, 232, -1, 105, 144, 232, -1, 105, 145, 232,
- -1, 105, 146, 232, -1, 105, 147, 232, -1, 105,
- 148, 232, -1, 105, 149, 232, -1, -1, 235, -1,
- 105, 234, -1, 105, 9, 234, -1, 105, 10, 234,
- -1, 105, 11, 234, -1, 94, 226, 237, 225, 224,
+ 1, 225, -1, -1, 233, -1, 106, 232, -1, 106,
+ 143, 232, -1, 106, 144, 232, -1, 106, 145, 232,
+ -1, 106, 146, 232, -1, 106, 147, 232, -1, 106,
+ 148, 232, -1, 106, 149, 232, -1, -1, 235, -1,
+ 106, 234, -1, 106, 9, 234, -1, 106, 10, 234,
+ -1, 106, 11, 234, -1, 95, 226, 237, 225, 224,
-1, 237, 238, -1, 238, -1, 239, -1, 240, -1,
- 1, 224, -1, 93, 227, 123, 224, -1, 119, 227,
- 123, 224, -1, 153, 226, 242, 225, 224, -1, 242,
+ 1, 224, -1, 94, 227, 124, 224, -1, 120, 227,
+ 124, 224, -1, 153, 226, 242, 225, 224, -1, 242,
243, -1, 243, -1, 254, -1, 259, -1, 264, -1,
256, -1, 257, -1, 258, -1, 261, -1, 262, -1,
263, -1, 252, -1, 251, -1, 260, -1, 255, -1,
@@ -1096,32 +1096,32 @@ static const yytype_int16 yyrhs[] =
-1, 137, 227, 246, 224, -1, 138, 227, 248, 224,
-1, 246, 228, 247, -1, 247, -1, 139, -1, 140,
-1, 248, 228, 249, -1, 249, -1, 139, -1, 140,
- -1, 135, 227, 123, 224, -1, 133, 227, 123, 224,
- -1, 136, 227, 123, 224, -1, 178, 227, 123, 224,
- -1, 95, 227, 123, 224, -1, 154, 227, 123, 224,
- -1, 24, 227, 123, 224, -1, 98, 227, 123, 224,
- -1, 97, 227, 123, 224, -1, 218, 227, 123, 224,
- -1, 219, 227, 123, 224, -1, 188, 227, 105, 224,
- -1, 81, 227, 105, 224, -1, 85, 227, 105, 224,
+ -1, 135, 227, 124, 224, -1, 133, 227, 124, 224,
+ -1, 136, 227, 124, 224, -1, 178, 227, 124, 224,
+ -1, 96, 227, 124, 224, -1, 154, 227, 124, 224,
+ -1, 24, 227, 124, 224, -1, 99, 227, 124, 224,
+ -1, 98, 227, 124, 224, -1, 218, 227, 124, 224,
+ -1, 219, 227, 124, 224, -1, 188, 227, 106, 224,
+ -1, 82, 227, 106, 224, -1, 86, 227, 106, 224,
-1, 58, 227, 167, 224, -1, 4, 226, 266, 225,
224, -1, 266, 267, -1, 267, -1, 268, -1, 270,
- -1, 269, -1, 1, 224, -1, 95, 227, 123, 224,
- -1, 31, 227, 123, 224, -1, 24, 227, 123, 224,
+ -1, 269, -1, 1, 224, -1, 96, 227, 124, 224,
+ -1, 31, 227, 124, 224, -1, 24, 227, 124, 224,
-1, 72, 226, 272, 225, 224, -1, 272, 273, -1,
273, -1, 274, -1, 275, -1, 1, 224, -1, 217,
227, 167, 224, -1, -1, 276, 223, 226, 277, 225,
224, -1, 277, 278, -1, 278, -1, 279, -1, 281,
- -1, 280, -1, 1, 224, -1, 95, 227, 123, 224,
+ -1, 280, -1, 1, 224, -1, 96, 227, 124, 224,
-1, 222, 227, 235, 224, -1, 222, 227, 203, 224,
-1, -1, 158, 282, 227, 283, 224, -1, 283, 228,
- 284, -1, 284, -1, 215, -1, 108, -1, 40, -1,
- 181, -1, 65, -1, 63, -1, 180, -1, -1, 108,
+ 284, -1, 284, -1, 215, -1, 109, -1, 40, -1,
+ 181, -1, 65, -1, 63, -1, 180, -1, -1, 109,
286, 226, 287, 225, 224, -1, 287, 288, -1, 288,
-1, 289, -1, 290, -1, 291, -1, 295, -1, 294,
-1, 292, -1, 293, -1, 299, -1, 1, 224, -1,
- 95, 227, 123, 224, -1, 215, 227, 123, 224, -1,
- 118, 227, 123, 224, -1, 32, 227, 167, 224, -1,
- 134, 227, 123, 224, -1, 17, 227, 123, 224, -1,
+ 96, 227, 124, 224, -1, 215, 227, 124, 224, -1,
+ 119, 227, 124, 224, -1, 32, 227, 167, 224, -1,
+ 134, 227, 124, 224, -1, 17, 227, 124, 224, -1,
-1, 200, 296, 227, 297, 224, -1, 297, 228, 298,
-1, 298, -1, 173, -1, 176, -1, 177, -1, 179,
-1, 180, -1, 183, -1, 51, -1, 197, -1, 189,
@@ -1129,56 +1129,56 @@ static const yytype_int16 yyrhs[] =
-1, 195, -1, 184, -1, 207, -1, 174, -1, 175,
-1, 187, -1, 190, -1, -1, 36, 300, 227, 301,
224, -1, 301, 228, 302, -1, 302, -1, 47, -1,
- 130, -1, 65, -1, 214, -1, 181, -1, 202, -1,
- 220, -1, 40, -1, 25, -1, 209, -1, 129, -1,
- 4, -1, 100, -1, 191, -1, 206, -1, 112, -1,
- 131, -1, 196, -1, 93, -1, -1, 17, 304, 226,
+ 131, -1, 65, -1, 214, -1, 181, -1, 202, -1,
+ 220, -1, 40, -1, 25, -1, 209, -1, 130, -1,
+ 4, -1, 101, -1, 191, -1, 206, -1, 113, -1,
+ 132, -1, 196, -1, 94, -1, -1, 17, 304, 226,
305, 225, 224, -1, 305, 306, -1, 306, -1, 307,
-1, 317, -1, 318, -1, 308, -1, 319, -1, 309,
-1, 310, -1, 311, -1, 312, -1, 313, -1, 314,
-1, 315, -1, 316, -1, 320, -1, 321, -1, 322,
- -1, 1, 224, -1, 95, 227, 123, 224, -1, 121,
- 227, 233, 224, -1, 107, 227, 105, 224, -1, 19,
- 227, 233, 224, -1, 83, 227, 105, 224, -1, 77,
- 227, 105, 224, -1, 79, 227, 105, 224, -1, 78,
- 227, 105, 224, -1, 150, 227, 235, 224, -1, 192,
- 227, 235, 224, -1, 15, 227, 105, 224, -1, 16,
- 227, 105, 224, -1, 106, 227, 105, 224, -1, 89,
- 227, 233, 224, -1, 90, 227, 233, 224, -1, -1,
+ -1, 1, 224, -1, 96, 227, 124, 224, -1, 122,
+ 227, 233, 224, -1, 108, 227, 106, 224, -1, 19,
+ 227, 233, 224, -1, 84, 227, 106, 224, -1, 78,
+ 227, 106, 224, -1, 80, 227, 106, 224, -1, 79,
+ 227, 106, 224, -1, 150, 227, 235, 224, -1, 192,
+ 227, 235, 224, -1, 15, 227, 106, 224, -1, 16,
+ 227, 106, 224, -1, 107, 227, 106, 224, -1, 90,
+ 227, 233, 224, -1, 91, 227, 233, 224, -1, -1,
36, 323, 227, 324, 224, -1, 324, 228, 325, -1,
- 325, -1, 91, -1, 92, -1, -1, 71, 327, 226,
+ 325, -1, 92, -1, 93, -1, -1, 71, 327, 226,
332, 225, 224, -1, -1, 36, 329, 227, 330, 224,
-1, 330, 228, 331, -1, 331, -1, 199, -1, 51,
-1, 194, -1, 332, 333, -1, 333, -1, 334, -1,
328, -1, 338, -1, 339, -1, 1, 224, -1, -1,
- 122, 227, 336, 335, 224, -1, 336, 228, 337, -1,
- 337, -1, 105, -1, 105, 171, 105, -1, 62, 227,
- 123, 224, -1, 57, 227, 123, 224, -1, -1, 48,
+ 123, 227, 336, 335, 224, -1, 336, 228, 337, -1,
+ 337, -1, 106, -1, 106, 171, 106, -1, 62, 227,
+ 124, 224, -1, 57, 227, 124, 224, -1, -1, 48,
341, 226, 342, 225, 224, -1, 342, 343, -1, 343,
-1, 344, -1, 345, -1, 346, -1, 348, -1, 352,
-1, 353, -1, 354, -1, 347, -1, 1, 224, -1,
- 215, 227, 123, 224, -1, 118, 227, 123, 224, -1,
- 17, 227, 123, 224, -1, 32, 227, 167, 224, -1,
+ 215, 227, 124, 224, -1, 119, 227, 124, 224, -1,
+ 17, 227, 124, 224, -1, 32, 227, 167, 224, -1,
-1, 36, 349, 227, 350, 224, -1, 350, 228, 351,
-1, 351, -1, 161, -1, 33, -1, 66, -1, 49,
- -1, 13, -1, 104, -1, 43, -1, 142, -1, 208,
- -1, 96, -1, 160, 227, 123, 224, -1, 127, 227,
- 123, 224, -1, 126, 227, 105, 224, -1, -1, 141,
+ -1, 13, -1, 105, -1, 43, -1, 142, -1, 208,
+ -1, 97, -1, 160, 227, 124, 224, -1, 128, 227,
+ 124, 224, -1, 127, 227, 106, 224, -1, -1, 141,
356, 226, 357, 225, 224, -1, 357, 358, -1, 358,
-1, 359, -1, 360, -1, 361, -1, 1, 224, -1,
- 125, 227, 123, 224, -1, 14, 227, 123, 224, -1,
- 99, 227, 123, 224, -1, 210, 226, 363, 225, 224,
+ 73, 227, 124, 224, -1, 126, 227, 124, 224, -1,
+ 34, 227, 124, 224, -1, 210, 226, 363, 225, 224,
-1, 363, 364, -1, 364, -1, 365, -1, 1, -1,
- 95, 227, 123, 224, -1, -1, 156, 367, 226, 368,
+ 96, 227, 124, 224, -1, -1, 156, 367, 226, 368,
225, 224, -1, 368, 369, -1, 369, -1, 370, -1,
- 371, -1, 372, -1, 1, 224, -1, 95, 227, 123,
- 224, -1, 215, 227, 123, 224, -1, -1, 158, 373,
+ 371, -1, 372, -1, 1, 224, -1, 96, 227, 124,
+ 224, -1, 215, 227, 124, 224, -1, -1, 158, 373,
227, 374, 224, -1, 374, 228, 375, -1, 375, -1,
65, -1, 214, -1, 181, -1, 202, -1, 220, -1,
205, -1, 141, -1, 204, -1, 187, -1, 172, -1,
-1, 157, 377, 226, 378, 225, 224, -1, 378, 379,
-1, 379, -1, 380, -1, 381, -1, 1, 224, -1,
- 95, 227, 123, 224, -1, -1, 158, 382, 227, 383,
+ 96, 227, 124, 224, -1, -1, 158, 382, 227, 383,
224, -1, 383, 228, 384, -1, 384, -1, 65, -1,
214, -1, 181, -1, 202, -1, 220, -1, 205, -1,
141, -1, 204, -1, 187, -1, 172, -1, -1, 18,
@@ -1186,29 +1186,29 @@ static const yytype_int16 yyrhs[] =
-1, 389, -1, 390, -1, 391, -1, 392, -1, 393,
-1, 395, -1, 394, -1, 404, -1, 396, -1, 401,
-1, 402, -1, 403, -1, 400, -1, 1, 224, -1,
- 95, 227, 123, 224, -1, 57, 227, 123, 224, -1,
- 218, 227, 123, 224, -1, 151, 227, 123, 224, -1,
- 3, 227, 123, 224, -1, 122, 227, 105, 224, -1,
+ 96, 227, 124, 224, -1, 57, 227, 124, 224, -1,
+ 218, 227, 124, 224, -1, 151, 227, 124, 224, -1,
+ 3, 227, 124, 224, -1, 123, 227, 106, 224, -1,
5, 227, 185, 224, -1, 5, 227, 186, 224, -1,
-1, 36, 397, 227, 398, 224, -1, 398, 228, 399,
-1, 399, -1, 8, -1, 199, -1, 32, 227, 167,
- 224, -1, 59, 227, 123, 224, -1, 69, 227, 123,
- 224, -1, 17, 227, 123, 224, -1, 178, 227, 123,
+ 224, -1, 59, 227, 124, 224, -1, 69, 227, 124,
+ 224, -1, 17, 227, 124, 224, -1, 178, 227, 124,
224, -1, -1, 63, 406, 226, 411, 225, 224, -1,
-1, 158, 408, 227, 409, 224, -1, 409, 228, 410,
- -1, 410, -1, 128, -1, 411, 412, -1, 412, -1,
+ -1, 410, -1, 129, -1, 411, 412, -1, 412, -1,
413, -1, 414, -1, 407, -1, 1, -1, 215, 227,
- 123, 224, -1, 125, 227, 123, 224, -1, -1, 23,
+ 124, 224, -1, 126, 227, 124, 224, -1, -1, 23,
416, 226, 417, 225, 224, -1, 417, 418, -1, 418,
- -1, 419, -1, 420, -1, 1, -1, 62, 227, 123,
- 224, -1, 125, 227, 123, 224, -1, 34, 226, 422,
+ -1, 419, -1, 420, -1, 1, -1, 62, 227, 124,
+ 224, -1, 126, 227, 124, 224, -1, 34, 226, 422,
225, 224, -1, 422, 423, -1, 423, -1, 424, -1,
- 1, -1, 62, 227, 123, 224, -1, -1, 38, 426,
+ 1, -1, 62, 227, 124, 224, -1, -1, 38, 426,
226, 431, 225, 224, -1, -1, 158, 428, 227, 429,
- 224, -1, 429, 228, 430, -1, 430, -1, 128, -1,
+ 224, -1, 429, 228, 430, -1, 430, -1, 129, -1,
431, 432, -1, 432, -1, 433, -1, 434, -1, 427,
- -1, 1, -1, 95, 227, 123, 224, -1, 125, 227,
- 123, 224, -1, 39, 226, 436, 225, 224, -1, 436,
+ -1, 1, -1, 96, 227, 124, 224, -1, 126, 227,
+ 124, 224, -1, 39, 226, 436, 225, 224, -1, 436,
437, -1, 437, -1, 446, -1, 447, -1, 449, -1,
450, -1, 451, -1, 452, -1, 453, -1, 454, -1,
455, -1, 456, -1, 445, -1, 458, -1, 459, -1,
@@ -1219,59 +1219,58 @@ static const yytype_int16 yyrhs[] =
490, -1, 448, -1, 480, -1, 457, -1, 478, -1,
479, -1, 444, -1, 439, -1, 440, -1, 441, -1,
442, -1, 443, -1, 460, -1, 438, -1, 477, -1,
- 1, -1, 86, 227, 105, 224, -1, 42, 227, 167,
+ 1, -1, 87, 227, 106, 224, -1, 42, 227, 167,
224, -1, 41, 227, 233, 224, -1, 44, 227, 233,
- 224, -1, 45, 227, 105, 224, -1, 46, 227, 105,
+ 224, -1, 45, 227, 106, 224, -1, 46, 227, 106,
224, -1, 155, 227, 167, 224, -1, 64, 227, 233,
224, -1, 56, 227, 167, 224, -1, 60, 227, 167,
224, -1, 28, 227, 167, 224, -1, 35, 227, 167,
- 224, -1, 6, 227, 167, 224, -1, 82, 227, 233,
- 224, -1, 80, 227, 105, 224, -1, 73, 227, 105,
+ 224, -1, 6, 227, 167, 224, -1, 83, 227, 233,
+ 224, -1, 81, 227, 106, 224, -1, 74, 227, 106,
224, -1, 7, 227, 233, 224, -1, 170, 227, 233,
- 224, -1, 169, 227, 233, 224, -1, 50, 227, 105,
+ 224, -1, 169, 227, 233, 224, -1, 50, 227, 106,
224, -1, 61, 227, 167, 224, -1, 221, 227, 167,
224, -1, 162, 227, 167, 224, -1, 165, 227, 167,
224, -1, 166, 227, 167, 224, -1, 164, 227, 167,
224, -1, 164, 227, 168, 224, -1, 163, 227, 167,
- 224, -1, 163, 227, 168, 224, -1, 116, 227, 233,
- 224, -1, 12, 227, 233, 224, -1, 109, 227, 167,
- 224, -1, 117, 227, 233, 224, -1, 159, 227, 167,
- 224, -1, 103, 227, 167, 224, -1, 213, 227, 167,
- 224, -1, 111, 227, 167, 224, -1, 29, 227, 105,
- 224, -1, 84, 227, 105, 224, -1, 216, 227, 167,
- 224, -1, 30, 227, 123, 224, -1, 211, 227, 123,
- 224, -1, 120, 227, 167, 224, -1, 26, 227, 167,
- 224, -1, 212, 227, 233, 224, -1, -1, 113, 482,
+ 224, -1, 163, 227, 168, 224, -1, 117, 227, 233,
+ 224, -1, 12, 227, 233, 224, -1, 110, 227, 167,
+ 224, -1, 118, 227, 233, 224, -1, 159, 227, 167,
+ 224, -1, 104, 227, 167, 224, -1, 213, 227, 167,
+ 224, -1, 112, 227, 167, 224, -1, 29, 227, 106,
+ 224, -1, 85, 227, 106, 224, -1, 216, 227, 167,
+ 224, -1, 30, 227, 124, 224, -1, 211, 227, 124,
+ 224, -1, 121, 227, 167, 224, -1, 26, 227, 167,
+ 224, -1, 212, 227, 233, 224, -1, -1, 114, 482,
227, 483, 224, -1, 483, 228, 484, -1, 484, -1,
173, -1, 176, -1, 177, -1, 179, -1, 180, -1,
183, -1, 51, -1, 197, -1, 189, -1, 193, -1,
201, -1, 198, -1, 182, -1, 191, -1, 195, -1,
184, -1, 207, -1, 174, -1, 175, -1, 187, -1,
- -1, 110, 486, 227, 487, 224, -1, 487, 228, 488,
+ -1, 111, 486, 227, 487, 224, -1, 487, 228, 488,
-1, 488, -1, 173, -1, 176, -1, 177, -1, 179,
-1, 180, -1, 183, -1, 197, -1, 51, -1, 189,
-1, 193, -1, 201, -1, 198, -1, 182, -1, 191,
-1, 195, -1, 184, -1, 207, -1, 174, -1, 175,
- -1, 187, -1, 190, -1, 87, 227, 105, 224, -1,
- 88, 227, 105, 224, -1, 20, 227, 105, 224, -1,
+ -1, 187, -1, 190, -1, 88, 227, 106, 224, -1,
+ 89, 227, 106, 224, -1, 20, 227, 106, 224, -1,
14, 226, 493, 225, 224, -1, 493, 494, -1, 494,
- -1, 502, -1, 497, -1, 498, -1, 499, -1, 500,
- -1, 501, -1, 503, -1, 504, -1, 505, -1, 496,
- -1, 506, -1, 507, -1, 508, -1, 495, -1, 1,
- -1, 27, 227, 167, 224, -1, 132, 227, 167, 224,
- -1, 67, 227, 233, 224, -1, 68, 227, 233, 224,
- -1, 76, 227, 105, 224, -1, 75, 227, 105, 224,
- -1, 124, 227, 167, 224, -1, 74, 227, 105, 224,
- -1, 22, 227, 105, 224, -1, 21, 227, 105, 224,
- -1, 101, 227, 167, 224, -1, 102, 227, 167, 224,
- -1, 114, 227, 105, 224, -1, 115, 227, 233, 224,
- -1, 152, 226, 510, 225, 224, -1, 510, 511, -1,
- 511, -1, 512, -1, 513, -1, 514, -1, 516, -1,
- 517, -1, 515, -1, 518, -1, 1, -1, 37, 227,
- 167, 224, -1, 54, 227, 167, 224, -1, 55, 227,
- 167, 224, -1, 52, 227, 123, 224, -1, 70, 227,
- 233, 224, -1, 51, 227, 167, 224, -1, 53, 227,
- 167, 224, -1
+ -1, 501, -1, 496, -1, 497, -1, 498, -1, 499,
+ -1, 500, -1, 502, -1, 503, -1, 504, -1, 505,
+ -1, 506, -1, 507, -1, 495, -1, 1, -1, 27,
+ 227, 167, 224, -1, 67, 227, 233, 224, -1, 68,
+ 227, 233, 224, -1, 77, 227, 106, 224, -1, 76,
+ 227, 106, 224, -1, 125, 227, 167, 224, -1, 75,
+ 227, 106, 224, -1, 22, 227, 106, 224, -1, 21,
+ 227, 106, 224, -1, 102, 227, 167, 224, -1, 103,
+ 227, 167, 224, -1, 115, 227, 106, 224, -1, 116,
+ 227, 233, 224, -1, 152, 226, 509, 225, 224, -1,
+ 509, 510, -1, 510, -1, 511, -1, 512, -1, 513,
+ -1, 515, -1, 516, -1, 514, -1, 517, -1, 1,
+ -1, 37, 227, 167, 224, -1, 54, 227, 167, 224,
+ -1, 55, 227, 167, 224, -1, 52, 227, 124, 224,
+ -1, 70, 227, 233, 224, -1, 51, 227, 167, 224,
+ -1, 53, 227, 167, 224, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -1308,40 +1307,40 @@ static const yytype_uint16 yyrline[] =
1595, 1597, 1603, 1609, 1615, 1627, 1626, 1632, 1632, 1633,
1637, 1641, 1645, 1649, 1653, 1657, 1661, 1665, 1669, 1675,
1689, 1698, 1712, 1711, 1726, 1726, 1727, 1727, 1727, 1727,
- 1729, 1735, 1741, 1750, 1752, 1752, 1753, 1753, 1755, 1771,
- 1770, 1795, 1795, 1796, 1796, 1796, 1796, 1798, 1804, 1824,
- 1823, 1829, 1829, 1830, 1834, 1838, 1842, 1846, 1850, 1854,
- 1858, 1862, 1866, 1876, 1875, 1896, 1896, 1897, 1897, 1897,
- 1899, 1906, 1905, 1911, 1911, 1912, 1916, 1920, 1924, 1928,
- 1932, 1936, 1940, 1944, 1948, 1958, 1957, 2023, 2023, 2024,
- 2024, 2024, 2025, 2025, 2026, 2026, 2026, 2027, 2027, 2027,
- 2028, 2028, 2029, 2031, 2037, 2043, 2049, 2062, 2075, 2081,
- 2085, 2094, 2093, 2098, 2098, 2099, 2103, 2109, 2120, 2126,
- 2132, 2138, 2154, 2153, 2216, 2215, 2221, 2221, 2222, 2228,
- 2228, 2229, 2229, 2229, 2229, 2231, 2251, 2261, 2260, 2287,
- 2287, 2288, 2288, 2288, 2290, 2296, 2305, 2307, 2307, 2308,
- 2308, 2310, 2328, 2327, 2373, 2372, 2378, 2378, 2379, 2385,
- 2385, 2386, 2386, 2386, 2386, 2388, 2394, 2403, 2406, 2406,
- 2407, 2407, 2408, 2408, 2409, 2409, 2410, 2410, 2411, 2411,
- 2412, 2413, 2414, 2414, 2415, 2415, 2416, 2416, 2417, 2417,
- 2418, 2418, 2419, 2419, 2420, 2420, 2421, 2421, 2422, 2422,
- 2423, 2423, 2424, 2424, 2425, 2426, 2426, 2427, 2428, 2429,
- 2429, 2430, 2430, 2431, 2432, 2433, 2434, 2434, 2435, 2438,
- 2443, 2449, 2455, 2461, 2466, 2471, 2476, 2481, 2486, 2491,
- 2496, 2501, 2506, 2511, 2516, 2521, 2526, 2531, 2537, 2548,
- 2553, 2558, 2563, 2568, 2573, 2576, 2581, 2584, 2589, 2594,
- 2599, 2604, 2609, 2614, 2619, 2624, 2629, 2634, 2639, 2644,
- 2653, 2662, 2667, 2672, 2678, 2677, 2682, 2682, 2683, 2686,
- 2689, 2692, 2695, 2698, 2701, 2704, 2707, 2710, 2713, 2716,
- 2719, 2722, 2725, 2728, 2731, 2734, 2737, 2740, 2746, 2745,
- 2750, 2750, 2751, 2754, 2757, 2760, 2763, 2766, 2769, 2772,
- 2775, 2778, 2781, 2784, 2787, 2790, 2793, 2796, 2799, 2802,
- 2805, 2808, 2811, 2816, 2821, 2826, 2835, 2838, 2838, 2839,
- 2840, 2840, 2841, 2841, 2842, 2842, 2843, 2844, 2844, 2845,
- 2846, 2846, 2847, 2847, 2849, 2854, 2859, 2864, 2869, 2874,
- 2879, 2884, 2889, 2894, 2899, 2904, 2909, 2914, 2922, 2925,
- 2925, 2926, 2926, 2927, 2928, 2929, 2929, 2930, 2931, 2933,
- 2939, 2945, 2951, 2960, 2974, 2980
+ 1729, 1735, 1741, 1751, 1753, 1753, 1754, 1754, 1756, 1772,
+ 1771, 1796, 1796, 1797, 1797, 1797, 1797, 1799, 1805, 1825,
+ 1824, 1830, 1830, 1831, 1835, 1839, 1843, 1847, 1851, 1855,
+ 1859, 1863, 1867, 1877, 1876, 1897, 1897, 1898, 1898, 1898,
+ 1900, 1907, 1906, 1912, 1912, 1913, 1917, 1921, 1925, 1929,
+ 1933, 1937, 1941, 1945, 1949, 1959, 1958, 2024, 2024, 2025,
+ 2025, 2025, 2026, 2026, 2027, 2027, 2027, 2028, 2028, 2028,
+ 2029, 2029, 2030, 2032, 2038, 2044, 2050, 2063, 2076, 2082,
+ 2086, 2095, 2094, 2099, 2099, 2100, 2104, 2110, 2121, 2127,
+ 2133, 2139, 2155, 2154, 2217, 2216, 2222, 2222, 2223, 2229,
+ 2229, 2230, 2230, 2230, 2230, 2232, 2252, 2262, 2261, 2288,
+ 2288, 2289, 2289, 2289, 2291, 2297, 2306, 2308, 2308, 2309,
+ 2309, 2311, 2329, 2328, 2374, 2373, 2379, 2379, 2380, 2386,
+ 2386, 2387, 2387, 2387, 2387, 2389, 2395, 2404, 2407, 2407,
+ 2408, 2408, 2409, 2409, 2410, 2410, 2411, 2411, 2412, 2412,
+ 2413, 2414, 2415, 2415, 2416, 2416, 2417, 2417, 2418, 2418,
+ 2419, 2419, 2420, 2420, 2421, 2421, 2422, 2422, 2423, 2423,
+ 2424, 2424, 2425, 2425, 2426, 2427, 2427, 2428, 2429, 2430,
+ 2430, 2431, 2431, 2432, 2433, 2434, 2435, 2435, 2436, 2439,
+ 2444, 2450, 2456, 2462, 2467, 2472, 2477, 2482, 2487, 2492,
+ 2497, 2502, 2507, 2512, 2517, 2522, 2527, 2532, 2538, 2549,
+ 2554, 2559, 2564, 2569, 2574, 2577, 2582, 2585, 2590, 2595,
+ 2600, 2605, 2610, 2615, 2620, 2625, 2630, 2635, 2640, 2645,
+ 2654, 2663, 2668, 2673, 2679, 2678, 2683, 2683, 2684, 2687,
+ 2690, 2693, 2696, 2699, 2702, 2705, 2708, 2711, 2714, 2717,
+ 2720, 2723, 2726, 2729, 2732, 2735, 2738, 2741, 2747, 2746,
+ 2751, 2751, 2752, 2755, 2758, 2761, 2764, 2767, 2770, 2773,
+ 2776, 2779, 2782, 2785, 2788, 2791, 2794, 2797, 2800, 2803,
+ 2806, 2809, 2812, 2817, 2822, 2827, 2836, 2839, 2839, 2840,
+ 2841, 2841, 2842, 2842, 2843, 2843, 2844, 2845, 2846, 2847,
+ 2847, 2848, 2848, 2850, 2855, 2860, 2865, 2870, 2875, 2880,
+ 2885, 2890, 2895, 2900, 2905, 2910, 2918, 2921, 2921, 2922,
+ 2922, 2923, 2924, 2925, 2925, 2926, 2927, 2929, 2935, 2941,
+ 2947, 2956, 2970, 2976
};
#endif
@@ -1366,7 +1365,7 @@ static const char *const yytname[] =
"HIDE_SPOOF_IPS", "HOST", "HUB", "HUB_MASK", "IGNORE_BOGUS_TS",
"INVISIBLE_ON_CONNECT", "IP", "KILL", "KILL_CHASE_TIME_LIMIT", "KLINE",
"KLINE_EXEMPT", "KNOCK_DELAY", "KNOCK_DELAY_CHANNEL", "LEAF_MASK",
- "LINKS_DELAY", "LISTEN", "T_LOG", "MAX_ACCEPT", "MAX_BANS",
+ "LINKS_DELAY", "LISTEN", "T_LOG", "MASK", "MAX_ACCEPT", "MAX_BANS",
"MAX_CHANS_PER_OPER", "MAX_CHANS_PER_USER", "MAX_GLOBAL", "MAX_IDENT",
"MAX_LOCAL", "MAX_NICK_CHANGES", "MAX_NICK_LENGTH", "MAX_NICK_TIME",
"MAX_NUMBER", "MAX_TARGETS", "MAX_TOPIC_LENGTH", "MAX_WATCH",
@@ -1380,15 +1379,15 @@ static const char *const yytname[] =
"PACE_WAIT", "PACE_WAIT_SIMPLE", "PASSWORD", "PATH", "PING_COOKIE",
"PING_TIME", "PORT", "QSTRING", "QUIET_ON_BAN", "REASON", "REDIRPORT",
"REDIRSERV", "REGEX_T", "REHASH", "REMOTE", "REMOTEBAN",
- "RESTRICT_CHANNELS", "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE",
- "SSL_CERTIFICATE_FILE", "SSL_DH_PARAM_FILE", "T_SSL_CLIENT_METHOD",
- "T_SSL_SERVER_METHOD", "T_SSLV3", "T_TLSV1", "RESV", "RESV_EXEMPT",
- "SECONDS", "MINUTES", "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS",
- "SENDQ", "SEND_PASSWORD", "SERVERHIDE", "SERVERINFO", "IRCD_SID",
- "TKLINE_EXPIRE_NOTICES", "T_SHARED", "T_CLUSTER", "TYPE", "SHORT_MOTD",
- "SPOOF", "SPOOF_NOTICE", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
- "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "TBOOL",
- "TMASKED", "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS", "T_ALL", "T_BOTS",
+ "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE", "SSL_CERTIFICATE_FILE",
+ "SSL_DH_PARAM_FILE", "T_SSL_CLIENT_METHOD", "T_SSL_SERVER_METHOD",
+ "T_SSLV3", "T_TLSV1", "RESV", "RESV_EXEMPT", "SECONDS", "MINUTES",
+ "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS", "SENDQ", "SEND_PASSWORD",
+ "SERVERHIDE", "SERVERINFO", "IRCD_SID", "TKLINE_EXPIRE_NOTICES",
+ "T_SHARED", "T_CLUSTER", "TYPE", "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE",
+ "STATS_E_DISABLED", "STATS_I_OPER_ONLY", "STATS_K_OPER_ONLY",
+ "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "TBOOL", "TMASKED",
+ "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS", "T_ALL", "T_BOTS",
"T_SOFTCALLERID", "T_CALLERID", "T_CCONN", "T_CCONN_FULL",
"T_SSL_CIPHER_LIST", "T_DEAF", "T_DEBUG", "T_DLINE", "T_EXTERNAL",
"T_FULL", "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS", "T_MAX_CLIENTS",
@@ -1435,7 +1434,7 @@ static const char *const yytname[] =
"auth_passwd", "auth_class", "auth_encrypted", "auth_flags", "$@12",
"auth_flags_items", "auth_flags_item", "auth_spoof", "auth_redir_serv",
"auth_redir_port", "resv_entry", "$@13", "resv_items", "resv_item",
- "resv_reason", "resv_channel", "resv_nick", "service_entry",
+ "resv_mask", "resv_reason", "resv_exempt", "service_entry",
"service_items", "service_item", "service_name", "shared_entry", "$@14",
"shared_items", "shared_item", "shared_name", "shared_user",
"shared_type", "$@15", "shared_types", "shared_type_item",
@@ -1478,10 +1477,9 @@ static const char *const yytname[] =
"$@26", "umode_items", "umode_item", "general_min_nonwildcard",
"general_min_nonwildcard_simple", "general_default_floodcount",
"channel_entry", "channel_items", "channel_item",
- "channel_disable_fake_channels", "channel_restrict_channels",
- "channel_knock_delay", "channel_knock_delay_channel",
- "channel_max_chans_per_user", "channel_max_chans_per_oper",
- "channel_quiet_on_ban", "channel_max_bans",
+ "channel_disable_fake_channels", "channel_knock_delay",
+ "channel_knock_delay_channel", "channel_max_chans_per_user",
+ "channel_max_chans_per_oper", "channel_quiet_on_ban", "channel_max_bans",
"channel_default_split_user_count", "channel_default_split_server_count",
"channel_no_create_on_split", "channel_no_join_on_split",
"channel_jflood_count", "channel_jflood_time", "serverhide_entry",
@@ -1587,10 +1585,10 @@ static const yytype_uint16 yyr1[] =
488, 488, 488, 488, 488, 488, 488, 488, 488, 488,
488, 488, 488, 489, 490, 491, 492, 493, 493, 494,
494, 494, 494, 494, 494, 494, 494, 494, 494, 494,
- 494, 494, 494, 494, 495, 496, 497, 498, 499, 500,
- 501, 502, 503, 504, 505, 506, 507, 508, 509, 510,
- 510, 511, 511, 511, 511, 511, 511, 511, 511, 512,
- 513, 514, 515, 516, 517, 518
+ 494, 494, 494, 495, 496, 497, 498, 499, 500, 501,
+ 502, 503, 504, 505, 506, 507, 508, 509, 509, 510,
+ 510, 510, 510, 510, 510, 510, 510, 511, 512, 513,
+ 514, 515, 516, 517
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -1657,10 +1655,10 @@ static const yytype_uint8 yyr2[] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 4, 4, 4, 5, 2, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 5, 2,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
- 4, 4, 4, 4, 4, 4
+ 1, 1, 1, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 5, 2, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 4, 4, 4,
+ 4, 4, 4, 4
};
/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -1675,328 +1673,326 @@ static const yytype_uint16 yydefact[] =
20, 22, 21, 7, 12, 24, 25, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 98, 99, 101, 100, 613, 0, 0, 0,
+ 0, 0, 98, 99, 101, 100, 612, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 598, 612, 608, 600, 601, 602, 603, 604,
- 599, 605, 606, 607, 609, 610, 611, 0, 0, 0,
- 430, 0, 0, 428, 429, 0, 498, 0, 0, 0,
+ 0, 598, 611, 600, 601, 602, 603, 604, 599, 605,
+ 606, 607, 608, 609, 610, 0, 0, 0, 430, 0,
+ 0, 428, 429, 0, 498, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 568, 0, 544, 0, 0,
+ 0, 0, 0, 568, 0, 544, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 449, 496, 490, 491,
- 492, 493, 494, 489, 460, 450, 451, 484, 452, 453,
- 454, 455, 456, 457, 458, 459, 486, 461, 462, 495,
- 464, 469, 465, 467, 466, 479, 480, 468, 470, 471,
- 472, 473, 463, 475, 476, 477, 497, 487, 488, 485,
- 478, 474, 482, 483, 481, 0, 0, 0, 0, 0,
- 0, 108, 109, 110, 0, 0, 0, 0, 0, 44,
- 45, 46, 0, 0, 638, 0, 0, 0, 0, 0,
- 0, 0, 0, 630, 631, 632, 633, 636, 634, 635,
- 637, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 449, 496, 490, 491, 492, 493,
+ 494, 489, 460, 450, 451, 484, 452, 453, 454, 455,
+ 456, 457, 458, 459, 486, 461, 462, 495, 464, 469,
+ 465, 467, 466, 479, 480, 468, 470, 471, 472, 473,
+ 463, 475, 476, 477, 497, 487, 488, 485, 478, 474,
+ 482, 483, 481, 0, 0, 0, 0, 0, 0, 108,
+ 109, 110, 0, 0, 0, 0, 0, 44, 45, 46,
+ 0, 0, 636, 0, 0, 0, 0, 0, 0, 0,
+ 0, 628, 629, 630, 631, 634, 632, 633, 635, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 52, 67, 68, 66, 63, 62, 69, 53, 65, 56,
- 57, 58, 54, 64, 59, 60, 61, 55, 0, 0,
- 317, 0, 0, 315, 316, 102, 0, 0, 0, 0,
- 97, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 597, 0, 0, 0,
- 0, 238, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 205, 206, 209, 211, 212,
- 213, 214, 215, 216, 217, 218, 207, 208, 210, 219,
- 220, 221, 0, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 368, 369, 370,
- 371, 372, 373, 375, 374, 377, 381, 378, 379, 380,
- 376, 423, 0, 0, 0, 420, 421, 422, 0, 0,
- 427, 444, 0, 0, 434, 443, 0, 440, 441, 442,
+ 0, 0, 0, 0, 0, 0, 0, 0, 52, 67,
+ 68, 66, 63, 62, 69, 53, 65, 56, 57, 58,
+ 54, 64, 59, 60, 61, 55, 0, 0, 317, 0,
+ 0, 315, 316, 102, 0, 0, 0, 0, 97, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 597, 0, 0, 0, 0, 238, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 205, 206, 209, 211, 212, 213, 214, 215,
+ 216, 217, 218, 207, 208, 210, 219, 220, 221, 0,
+ 0, 0, 0, 0, 391, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 368, 369, 370, 371, 372, 373,
+ 375, 374, 377, 381, 378, 379, 380, 376, 423, 0,
+ 0, 0, 420, 421, 422, 0, 0, 427, 444, 0,
+ 0, 434, 443, 0, 440, 441, 442, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 448,
- 0, 0, 0, 285, 0, 0, 0, 0, 0, 0,
- 271, 272, 273, 274, 279, 275, 276, 277, 278, 414,
- 0, 404, 0, 413, 0, 410, 411, 412, 0, 246,
- 0, 0, 0, 256, 0, 254, 255, 257, 258, 111,
- 0, 0, 107, 0, 47, 0, 0, 0, 43, 0,
- 0, 0, 179, 0, 0, 0, 154, 0, 0, 138,
- 139, 140, 141, 144, 145, 143, 142, 146, 0, 0,
- 0, 0, 0, 305, 306, 307, 308, 0, 0, 0,
- 0, 0, 0, 0, 0, 629, 70, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 51, 0, 0, 329, 0,
- 0, 322, 323, 324, 325, 0, 0, 351, 0, 346,
- 347, 348, 0, 0, 314, 0, 0, 0, 96, 0,
- 0, 0, 26, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 596, 222, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 204, 382, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 367,
- 0, 0, 0, 419, 0, 426, 0, 0, 0, 0,
- 439, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 448, 0, 0, 0,
+ 285, 0, 0, 0, 0, 0, 0, 271, 272, 273,
+ 274, 279, 275, 276, 277, 278, 414, 0, 404, 0,
+ 413, 0, 410, 411, 412, 0, 246, 0, 0, 0,
+ 256, 0, 254, 255, 257, 258, 111, 0, 0, 107,
+ 0, 47, 0, 0, 0, 43, 0, 0, 0, 179,
+ 0, 0, 0, 154, 0, 0, 138, 139, 140, 141,
+ 144, 145, 143, 142, 146, 0, 0, 0, 0, 0,
+ 305, 306, 307, 308, 0, 0, 0, 0, 0, 0,
+ 0, 0, 627, 70, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 51, 0, 0, 329, 0, 0, 322, 323,
+ 324, 325, 0, 0, 351, 0, 346, 347, 348, 0,
+ 0, 314, 0, 0, 0, 96, 0, 0, 0, 26,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 596, 222, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 204,
+ 382, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 367, 0, 0, 0, 419,
+ 0, 426, 0, 0, 0, 0, 439, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 447, 280, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 270, 0, 0, 0, 0, 409, 259, 0,
- 0, 0, 0, 0, 253, 0, 106, 0, 0, 0,
- 42, 147, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 137, 309, 0, 0, 0, 0, 304, 0, 0,
- 0, 0, 0, 0, 0, 628, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 75, 76, 0, 74,
- 79, 80, 0, 78, 0, 0, 0, 0, 0, 50,
- 326, 0, 0, 0, 0, 321, 349, 0, 0, 0,
- 345, 0, 313, 105, 104, 103, 623, 622, 614, 26,
- 26, 26, 26, 26, 26, 26, 28, 27, 616, 617,
- 621, 619, 618, 624, 625, 626, 627, 620, 615, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 36, 0, 0, 203, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 366, 0, 0, 418, 431, 0, 0, 0, 433,
- 511, 515, 529, 595, 542, 509, 536, 539, 510, 501,
- 500, 502, 503, 504, 518, 507, 508, 519, 506, 514,
- 513, 512, 537, 499, 593, 594, 533, 530, 579, 572,
- 589, 590, 573, 574, 575, 576, 584, 577, 587, 591,
- 580, 592, 585, 581, 586, 578, 583, 582, 588, 0,
- 571, 535, 554, 548, 565, 566, 549, 550, 551, 552,
- 560, 553, 563, 567, 556, 561, 557, 562, 555, 559,
- 558, 564, 0, 547, 528, 531, 541, 505, 532, 521,
- 526, 527, 524, 525, 522, 523, 517, 516, 540, 543,
- 534, 538, 520, 0, 0, 0, 0, 0, 0, 0,
- 0, 269, 0, 0, 0, 403, 0, 0, 0, 264,
- 260, 263, 245, 112, 0, 0, 124, 0, 0, 116,
- 117, 119, 118, 48, 49, 0, 0, 0, 0, 0,
- 0, 0, 0, 136, 0, 0, 0, 303, 639, 644,
- 642, 645, 640, 641, 643, 87, 95, 93, 94, 85,
- 89, 88, 82, 81, 83, 71, 0, 72, 0, 86,
- 84, 92, 90, 91, 0, 0, 0, 320, 0, 0,
- 344, 318, 29, 30, 31, 32, 33, 34, 35, 233,
- 234, 226, 242, 243, 0, 241, 228, 230, 229, 227,
- 236, 237, 223, 235, 225, 224, 36, 36, 36, 38,
- 37, 231, 232, 387, 389, 390, 400, 397, 395, 396,
- 0, 394, 384, 398, 399, 383, 388, 386, 401, 385,
- 424, 425, 445, 446, 438, 0, 437, 569, 0, 545,
- 0, 283, 284, 293, 290, 295, 292, 291, 298, 294,
- 296, 289, 297, 0, 288, 282, 301, 300, 299, 281,
- 416, 408, 0, 407, 415, 251, 252, 250, 0, 249,
- 267, 266, 0, 0, 0, 120, 0, 0, 0, 0,
- 115, 153, 151, 194, 191, 190, 183, 185, 201, 195,
- 198, 193, 184, 199, 187, 196, 200, 188, 197, 192,
- 186, 189, 0, 182, 148, 150, 152, 164, 158, 175,
- 176, 159, 160, 161, 162, 170, 163, 173, 177, 166,
- 178, 171, 167, 172, 165, 169, 168, 174, 0, 157,
- 149, 311, 312, 310, 73, 77, 327, 333, 339, 342,
- 335, 341, 336, 340, 338, 334, 337, 0, 332, 328,
- 350, 355, 361, 364, 357, 363, 358, 362, 360, 356,
- 359, 0, 354, 239, 0, 39, 40, 41, 392, 0,
- 435, 0, 570, 546, 286, 0, 405, 0, 247, 0,
- 265, 262, 261, 0, 0, 0, 0, 114, 180, 0,
- 155, 0, 330, 0, 352, 0, 240, 393, 436, 287,
- 406, 248, 121, 130, 133, 132, 129, 134, 131, 128,
- 0, 127, 123, 122, 181, 156, 331, 353, 125, 0,
- 126
+ 0, 0, 0, 0, 0, 0, 0, 447, 280, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 270, 0,
+ 0, 0, 0, 409, 259, 0, 0, 0, 0, 0,
+ 253, 0, 106, 0, 0, 0, 42, 147, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 137, 309, 0,
+ 0, 0, 0, 304, 0, 0, 0, 0, 0, 0,
+ 0, 626, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 75, 76, 0, 74, 79, 80, 0, 78,
+ 0, 0, 0, 0, 0, 50, 326, 0, 0, 0,
+ 0, 321, 349, 0, 0, 0, 345, 0, 313, 105,
+ 104, 103, 621, 620, 613, 26, 26, 26, 26, 26,
+ 26, 26, 28, 27, 614, 615, 619, 617, 616, 622,
+ 623, 624, 625, 618, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 36, 0,
+ 0, 203, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 366, 0, 0, 418,
+ 431, 0, 0, 0, 433, 511, 515, 529, 595, 542,
+ 509, 536, 539, 510, 501, 500, 502, 503, 504, 518,
+ 507, 508, 519, 506, 514, 513, 512, 537, 499, 593,
+ 594, 533, 530, 579, 572, 589, 590, 573, 574, 575,
+ 576, 584, 577, 587, 591, 580, 592, 585, 581, 586,
+ 578, 583, 582, 588, 0, 571, 535, 554, 548, 565,
+ 566, 549, 550, 551, 552, 560, 553, 563, 567, 556,
+ 561, 557, 562, 555, 559, 558, 564, 0, 547, 528,
+ 531, 541, 505, 532, 521, 526, 527, 524, 525, 522,
+ 523, 517, 516, 540, 543, 534, 538, 520, 0, 0,
+ 0, 0, 0, 0, 0, 0, 269, 0, 0, 0,
+ 403, 0, 0, 0, 264, 260, 263, 245, 112, 0,
+ 0, 124, 0, 0, 116, 117, 119, 118, 48, 49,
+ 0, 0, 0, 0, 0, 0, 0, 0, 136, 0,
+ 0, 0, 303, 637, 642, 640, 643, 638, 639, 641,
+ 87, 95, 93, 94, 85, 89, 88, 82, 81, 83,
+ 71, 0, 72, 0, 86, 84, 92, 90, 91, 0,
+ 0, 0, 320, 0, 0, 344, 318, 29, 30, 31,
+ 32, 33, 34, 35, 233, 234, 226, 242, 243, 0,
+ 241, 228, 230, 229, 227, 236, 237, 223, 235, 225,
+ 224, 36, 36, 36, 38, 37, 231, 232, 387, 389,
+ 390, 400, 397, 395, 396, 0, 394, 384, 398, 399,
+ 383, 388, 386, 401, 385, 424, 425, 445, 446, 438,
+ 0, 437, 569, 0, 545, 0, 283, 284, 293, 290,
+ 295, 292, 291, 298, 294, 296, 289, 297, 0, 288,
+ 282, 301, 300, 299, 281, 416, 408, 0, 407, 415,
+ 251, 252, 250, 0, 249, 267, 266, 0, 0, 0,
+ 120, 0, 0, 0, 0, 115, 153, 151, 194, 191,
+ 190, 183, 185, 201, 195, 198, 193, 184, 199, 187,
+ 196, 200, 188, 197, 192, 186, 189, 0, 182, 148,
+ 150, 152, 164, 158, 175, 176, 159, 160, 161, 162,
+ 170, 163, 173, 177, 166, 178, 171, 167, 172, 165,
+ 169, 168, 174, 0, 157, 149, 312, 310, 311, 73,
+ 77, 327, 333, 339, 342, 335, 341, 336, 340, 338,
+ 334, 337, 0, 332, 328, 350, 355, 361, 364, 357,
+ 363, 358, 362, 360, 356, 359, 0, 354, 239, 0,
+ 39, 40, 41, 392, 0, 435, 0, 570, 546, 286,
+ 0, 405, 0, 247, 0, 265, 262, 261, 0, 0,
+ 0, 0, 114, 180, 0, 155, 0, 330, 0, 352,
+ 0, 240, 393, 436, 287, 406, 248, 121, 130, 133,
+ 132, 129, 134, 131, 128, 0, 127, 123, 122, 181,
+ 156, 331, 353, 125, 0, 126
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 1, 24, 796, 797, 1049, 1050, 25, 228, 229,
- 230, 231, 26, 269, 270, 271, 272, 758, 759, 762,
- 763, 273, 274, 275, 276, 277, 278, 279, 280, 281,
- 282, 283, 284, 285, 286, 287, 27, 71, 72, 73,
- 74, 75, 28, 220, 221, 222, 223, 224, 968, 969,
- 970, 971, 972, 1117, 1250, 1251, 29, 60, 508, 509,
- 510, 511, 512, 513, 514, 515, 516, 728, 1168, 1169,
- 517, 724, 1142, 1143, 30, 49, 334, 335, 336, 337,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 599, 1034, 1035, 31, 57, 483,
- 709, 1108, 1109, 484, 485, 486, 1114, 960, 961, 487,
- 488, 32, 55, 459, 460, 461, 462, 463, 464, 465,
- 695, 1093, 1094, 466, 467, 468, 33, 61, 522, 523,
- 524, 525, 526, 34, 292, 293, 294, 35, 64, 560,
- 561, 562, 563, 564, 772, 1187, 1188, 36, 65, 568,
- 569, 570, 571, 778, 1201, 1202, 37, 50, 366, 367,
- 368, 369, 370, 371, 372, 373, 374, 375, 619, 1060,
- 1061, 376, 377, 378, 379, 380, 38, 56, 473, 704,
- 1102, 1103, 474, 475, 476, 477, 39, 51, 384, 385,
- 386, 387, 40, 112, 113, 114, 41, 53, 395, 638,
- 1075, 1076, 396, 397, 398, 399, 42, 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, 430, 922, 923, 211, 428, 899, 900,
- 212, 213, 214, 43, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 44, 242, 243, 244, 245, 246, 247, 248, 249, 250
+ -1, 1, 24, 792, 793, 1044, 1045, 25, 226, 227,
+ 228, 229, 26, 267, 268, 269, 270, 754, 755, 758,
+ 759, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 27, 71, 72, 73,
+ 74, 75, 28, 218, 219, 220, 221, 222, 963, 964,
+ 965, 966, 967, 1112, 1245, 1246, 29, 60, 505, 506,
+ 507, 508, 509, 510, 511, 512, 513, 724, 1163, 1164,
+ 514, 720, 1137, 1138, 30, 49, 331, 332, 333, 334,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 595, 1029, 1030, 31, 57, 480,
+ 705, 1103, 1104, 481, 482, 483, 1109, 955, 956, 484,
+ 485, 32, 55, 456, 457, 458, 459, 460, 461, 462,
+ 691, 1088, 1089, 463, 464, 465, 33, 61, 519, 520,
+ 521, 522, 523, 34, 290, 291, 292, 35, 64, 557,
+ 558, 559, 560, 561, 768, 1182, 1183, 36, 65, 565,
+ 566, 567, 568, 774, 1196, 1197, 37, 50, 363, 364,
+ 365, 366, 367, 368, 369, 370, 371, 372, 615, 1055,
+ 1056, 373, 374, 375, 376, 377, 38, 56, 470, 700,
+ 1097, 1098, 471, 472, 473, 474, 39, 51, 381, 382,
+ 383, 384, 40, 110, 111, 112, 41, 53, 392, 634,
+ 1070, 1071, 393, 394, 395, 396, 42, 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, 427, 917, 918, 209, 425, 894, 895,
+ 210, 211, 212, 43, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 44,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -705
+#define YYPACT_NINF -985
static const yytype_int16 yypact[] =
{
- -705, 647, -705, -134, -212, -173, -705, -705, -705, -155,
- -705, -133, -705, -705, -705, -128, -114, -705, -705, -108,
- -101, -705, -705, -90, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, 338, 848, -80,
- -69, -54, 16, -48, 402, -16, -9, -4, 3, 8,
- 6, 31, 550, 444, 38, 59, 33, -186, -159, 42,
- 79, 18, -705, -705, -705, -705, -705, 82, 91, 93,
- 104, 113, 118, 120, 124, 138, 139, 140, 141, 145,
- 147, 303, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, 610, 316, 10,
- -705, 149, 14, -705, -705, 203, -705, 153, 154, 155,
- 157, 159, 160, 161, 162, 168, 169, 171, 174, 180,
- 183, 185, 186, 188, 192, 194, 196, 197, 199, 202,
- 207, 212, 213, 214, 215, -705, 222, -705, 226, 227,
- 229, 232, 233, 234, 237, 238, 242, 243, 244, 245,
- 246, 247, 249, 250, 251, 125, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, 265, 191, 81, 178, 252,
- 4, -705, -705, -705, 60, 257, 256, 258, 22, -705,
- -705, -705, 419, 291, -705, 264, 266, 276, 277, 279,
- 282, 283, 110, -705, -705, -705, -705, -705, -705, -705,
- -705, 268, 289, 293, 294, 297, 299, 300, 304, 305,
- 306, 308, 309, 311, 317, 318, 319, 320, 322, 175,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, 119, 26,
- -705, 323, 29, -705, -705, -705, 327, 407, 420, 328,
- -705, 449, 450, 389, 453, 453, 454, 455, 457, 396,
- 406, 469, 453, 408, 409, 359, -705, 361, 362, 363,
- 365, -705, 366, 367, 368, 369, 370, 372, 373, 379,
- 380, 383, 385, 390, 172, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, 364, 394, 397, 400, 401, -705, 403, 404,
- 411, 412, 413, 414, 415, 416, 28, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, 422, 423, 27, -705, -705, -705, 463, 428,
- -705, -705, 426, 427, -705, -705, 19, -705, -705, -705,
- 466, 453, 453, 531, 488, 490, 553, 536, 493, 453,
- 499, 453, 562, 563, 564, 504, 505, 509, 453, 572,
- 573, 453, 574, 575, 585, 586, 525, 527, 470, 529,
- 471, 453, 453, 534, 535, 537, 539, -64, 57, 540,
- 541, 453, 453, 580, 453, 542, 546, 547, 487, -705,
- 496, 494, 495, -705, 500, 501, 502, 506, 507, 56,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- 510, -705, 511, -705, 43, -705, -705, -705, 508, -705,
- 512, 515, 516, -705, 12, -705, -705, -705, -705, -705,
- 556, 528, -705, 173, -705, 603, 613, 530, -705, 532,
- 522, 524, -705, 538, 545, 548, -705, 552, 15, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, 558, 559,
- 566, 567, 23, -705, -705, -705, -705, 592, 595, 638,
- 599, 623, 629, 453, 589, -705, -705, 657, 630, 693,
- 705, 694, 695, 701, 703, 708, 709, 55, 135, 719,
- 723, 742, 730, 732, 604, -705, 637, 636, -705, 640,
- 61, -705, -705, -705, -705, 641, 644, -705, 107, -705,
- -705, -705, 741, 648, -705, 649, 650, 652, -705, 653,
- 654, 655, 352, 656, 658, 662, 663, 664, 665, 666,
- 667, 668, 670, 671, -705, -705, 780, 791, 453, 673,
- 792, 793, 796, 797, 453, 453, 781, 798, 800, 453,
- 801, 801, 683, -705, -705, 785, 114, 786, 743, 684,
- 789, 790, 794, 795, 809, 802, 803, 804, 696, -705,
- 805, 806, 697, -705, 706, -705, 808, 810, 692, 710,
- -705, 711, 712, 713, 714, 715, 716, 717, 718, 720,
- 721, 722, 724, 727, 728, 729, 731, 733, 734, 735,
- 736, 737, 740, 744, 745, 746, 747, 749, 750, 594,
- 751, 661, 752, 753, 754, 755, 757, 758, 759, 760,
- 761, 762, 763, 764, 765, 766, 767, 768, 769, 770,
- 771, -705, -705, 820, 787, 738, 824, 827, 833, 843,
- 844, 772, -705, 874, 773, 875, 775, -705, -705, 774,
- 879, 880, 899, 782, -705, 783, -705, 105, 784, 788,
- -705, -705, 882, 842, 799, 887, 888, 890, 807, 891,
- 811, -705, -705, 892, 893, 894, 812, -705, 813, 814,
- 815, 816, 817, 818, 819, -705, 821, 822, 823, 825,
- 826, 828, 829, 830, 831, 832, -705, -705, -216, -705,
- -705, -705, -203, -705, 834, 835, 836, 837, 838, -705,
- -705, 895, 839, 896, 840, -705, -705, 897, 841, 845,
- -705, 846, -705, -705, -705, -705, -705, -705, -705, 453,
- 453, 453, 453, 453, 453, 453, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, 847,
- 849, 850, 223, 851, 852, 853, 854, 855, 856, 857,
- 858, 859, 860, 85, 861, 862, -705, 863, 864, 865,
- 866, 867, -2, 868, 869, 870, 871, 872, 873, 876,
- 877, -705, 878, 881, -705, -705, 883, 884, 900, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -202,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -189, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, 885, 886, 474, 889, 898, 901, 902,
- 903, -705, 904, 905, 906, -705, 24, 907, 908, 927,
- 909, -705, -705, -705, 910, 911, -705, 912, 101, -705,
- -705, -705, -705, -705, -705, 916, 917, 544, 918, 919,
- 920, 632, 921, -705, 922, 923, 924, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, 55, -705, 135, -705,
- -705, -705, -705, -705, 925, 543, 926, -705, 928, 679,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -188, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, 801, 801, 801, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -178, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -172, -705, -705, 594, -705,
- 661, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -170, -705, -705, -705, -705, -705, -705,
- -705, -705, -169, -705, -705, -705, -705, -705, -163, -705,
- -705, -705, 939, 899, 929, -705, 934, 930, -98, 931,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -161, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -158, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -147, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -145, -705, -705, 223, -705, -705, -705, -705, -2,
- -705, 900, -705, -705, -705, 474, -705, 905, -705, 24,
- -705, -705, -705, 932, -22, 935, 936, -705, -705, 544,
- -705, 632, -705, 543, -705, 679, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -144, -705, -705, -705, -705, -705, -705, -705, -705, -22,
- -705
+ -985, 599, -985, -196, -221, -213, -985, -985, -985, -188,
+ -985, -185, -985, -985, -985, -182, -141, -985, -985, -132,
+ -119, -985, -985, -112, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, 348, 839, -104,
+ -99, -91, 31, -84, 347, -75, -59, -56, 72, 266,
+ -37, -9, 425, 389, -1, 45, 15, -191, -44, 37,
+ 56, 16, -985, -985, -985, -985, -985, 75, 77, 85,
+ 120, 124, 125, 131, 135, 136, 144, 154, 156, 157,
+ 241, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, 565, 529, 26, -985, 158,
+ 13, -985, -985, 17, -985, 160, 169, 171, 173, 175,
+ 177, 178, 179, 183, 185, 188, 189, 191, 192, 193,
+ 195, 196, 197, 198, 200, 204, 206, 211, 213, 215,
+ 216, 218, 219, -985, 226, -985, 228, 229, 233, 236,
+ 242, 243, 245, 247, 254, 257, 259, 262, 265, 270,
+ 273, 274, 276, 36, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, 363, 62, 271, 57, 277, 20, -985,
+ -985, -985, 67, 105, 278, 281, 51, -985, -985, -985,
+ 333, 82, -985, 288, 291, 292, 294, 301, 302, 304,
+ 269, -985, -985, -985, -985, -985, -985, -985, -985, 116,
+ 318, 320, 322, 324, 325, 326, 329, 335, 337, 342,
+ 343, 344, 345, 346, 349, 352, 355, 78, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, 38, 8, -985, 356,
+ 53, -985, -985, -985, 162, 246, 369, 225, -985, 390,
+ 392, 132, 468, 468, 481, 491, 496, 283, 418, 499,
+ 468, 439, 385, -985, 386, 387, 388, 391, -985, 394,
+ 397, 399, 400, 401, 402, 403, 404, 405, 407, 408,
+ 412, 143, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, 395,
+ 419, 421, 423, 426, -985, 427, 430, 431, 432, 436,
+ 437, 438, 440, 223, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, 441,
+ 442, 6, -985, -985, -985, 488, 451, -985, -985, 449,
+ 450, -985, -985, 35, -985, -985, -985, 511, 468, 468,
+ 573, 515, 518, 580, 564, 522, 468, 523, 468, 586,
+ 589, 590, 530, 531, 533, 468, 596, 598, 468, 603,
+ 604, 605, 607, 538, 547, 490, 551, 493, 468, 468,
+ 554, 555, 556, 558, -117, 5, 559, 560, 468, 468,
+ 608, 468, 561, 562, 566, 507, -985, 512, 514, 516,
+ -985, 517, 519, 521, 526, 527, 59, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, 536, -985, 539,
+ -985, 54, -985, -985, -985, 513, -985, 543, 544, 546,
+ -985, 10, -985, -985, -985, -985, -985, 567, 525, -985,
+ 524, -985, 614, 615, 553, -985, 557, 552, 563, -985,
+ 568, 574, 577, -985, 581, 73, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, 569, 588, 592, 595, 11,
+ -985, -985, -985, -985, 575, 578, 660, 618, 620, 621,
+ 468, 570, -985, -985, 665, 624, 711, 717, 709, 713,
+ 714, 720, 722, 724, -70, 64, 728, 730, 749, 732,
+ 734, 638, -985, 639, 637, -985, 640, 60, -985, -985,
+ -985, -985, 641, 642, -985, 86, -985, -985, -985, 744,
+ 646, -985, 647, 649, 653, -985, 654, 655, 656, 393,
+ 657, 658, 659, 661, 662, 663, 664, 667, 668, 669,
+ -985, -985, 770, 783, 468, 671, 788, 789, 790, 791,
+ 468, 468, 775, 794, 795, 468, 796, 796, 679, -985,
+ -985, 780, 24, 781, 741, 682, 786, 787, 793, 797,
+ 806, 798, 799, 800, 689, -985, 801, 802, 694, -985,
+ 695, -985, 803, 804, 693, 705, -985, 706, 707, 708,
+ 710, 712, 715, 716, 719, 721, 723, 725, 726, 727,
+ 729, 733, 735, 736, 737, 738, 739, 742, 743, 745,
+ 746, 747, 748, 750, 751, 585, 752, 652, 753, 754,
+ 755, 756, 757, 758, 759, 760, 761, 762, 763, 764,
+ 765, 766, 767, 768, 769, 771, 772, -985, -985, 809,
+ 777, 731, 811, 831, 814, 822, 824, 773, -985, 828,
+ 774, 832, 776, -985, -985, 778, 841, 844, 867, 779,
+ -985, 782, -985, 7, 784, 785, -985, -985, 870, 835,
+ 792, 874, 875, 880, 805, 883, 807, -985, -985, 886,
+ 887, 888, 810, -985, 812, 813, 815, 816, 817, 818,
+ 819, -985, 820, 821, 823, 825, 826, 827, 829, 830,
+ 833, 834, -985, -985, -209, -985, -985, -985, -202, -985,
+ 836, 837, 838, 840, 842, -985, -985, 889, 808, 890,
+ 843, -985, -985, 891, 845, 846, -985, 847, -985, -985,
+ -985, -985, -985, -985, -985, 468, 468, 468, 468, 468,
+ 468, 468, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, 849, 850, 851, 222, 852, 853,
+ 854, 855, 856, 857, 858, 859, 860, 861, 14, 862,
+ 863, -985, 864, 865, 866, 868, 869, -2, 871, 872,
+ 873, 876, 877, 878, 879, 881, -985, 882, 884, -985,
+ -985, 885, 892, 893, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -194, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -193, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, 894, 895,
+ 312, 896, 897, 898, 899, 900, -985, 901, 904, 902,
+ -985, -31, 903, 905, 920, 906, -985, -985, -985, 907,
+ 908, -985, 909, 88, -985, -985, -985, -985, -985, -985,
+ 913, 914, 510, 915, 916, 917, 623, 918, -985, 919,
+ 921, 922, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -70, -985, 64, -985, -985, -985, -985, -985, 923,
+ 479, 924, -985, 925, 670, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -175,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, 796, 796, 796, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -98, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -43, -985, -985, 585, -985, 652, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -34, -985,
+ -985, -985, -985, -985, -985, -985, -985, 30, -985, -985,
+ -985, -985, -985, 63, -985, -985, -985, 910, 867, 926,
+ -985, 928, 927, -102, 929, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, 102, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, 103, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, 108, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, 113, -985, -985, 222,
+ -985, -985, -985, -985, -2, -985, 893, -985, -985, -985,
+ 312, -985, 904, -985, -31, -985, -985, -985, 931, 374,
+ 932, 933, -985, -985, 510, -985, 623, -985, 479, -985,
+ 670, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, 114, -985, -985, -985, -985,
+ -985, -985, -985, -985, 374, -985
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -705, -705, -705, -435, -302, -704, -610, -705, -705, 933,
- -705, -705, -705, -705, 756, -705, -705, -705, 17, -705,
- 13, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, 951, -705,
- -705, -705, -705, -705, 913, -705, -705, -705, -705, 62,
- -705, -705, -705, -705, -705, -235, -705, -705, -705, 519,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -200,
- -705, -705, -705, -197, -705, -705, -705, 777, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -175, -705, -705, -705,
- -705, -705, -171, -705, 579, -705, -705, -705, -62, -705,
- -705, -705, -705, -705, 606, -705, -705, -705, -705, -705,
- -705, -705, -148, -705, -705, -705, -705, -705, -705, 577,
- -705, -705, -705, -705, -705, 914, -705, -705, -705, -705,
- 554, -705, -705, -705, -705, -705, -130, -705, -705, -705,
- 549, -705, -705, -705, -705, -131, -705, -705, -705, 915,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -137, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -111, -705, 642, -705, -705, -705, -705, -705, 739,
- -705, -705, -705, -705, 1000, -705, -705, -705, -705, -705,
- -705, -96, -705, 725, -705, -705, -705, -705, 953, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, 39, -705, -705, -705, 46,
- -705, -705, -705, -705, -705, 1029, -705, -705, -705, -705,
- -705, -705, -705, -705, -705, -705, -705, -705, -705, -705,
- -705, -705, 937, -705, -705, -705, -705, -705, -705, -705
+ -985, -985, -985, -195, -300, -984, -606, -985, -985, 934,
+ -985, -985, -985, -985, 848, -985, -985, -985, 19, -985,
+ 18, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, 946, -985,
+ -985, -985, -985, -985, 912, -985, -985, -985, -985, 55,
+ -985, -985, -985, -985, -985, -231, -985, -985, -985, 520,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -200,
+ -985, -985, -985, -197, -985, -985, -985, 697, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -170, -985, -985, -985,
+ -985, -985, -190, -985, 549, -985, -985, -985, -62, -985,
+ -985, -985, -985, -985, 582, -985, -985, -985, -985, -985,
+ -985, -985, -162, -985, -985, -985, -985, -985, -985, 537,
+ -985, -985, -985, -985, -985, 911, -985, -985, -985, -985,
+ 498, -985, -985, -985, -985, -985, -169, -985, -985, -985,
+ 500, -985, -985, -985, -985, -167, -985, -985, -985, 930,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -136, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -143, -985, 627, -985, -985, -985, -985, -985, 718,
+ -985, -985, -985, -985, 984, -985, -985, -985, -985, -985,
+ -985, -96, -985, 740, -985, -985, -985, -985, 941, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, 32, -985, -985, -985, 39,
+ -985, -985, -985, -985, -985, 1021, -985, -985, -985, -985,
+ -985, -985, -985, -985, -985, -985, -985, -985, -985, -985,
+ -985, 935, -985, -985, -985, -985, -985, -985, -985
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -2005,127 +2001,128 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -114
static const yytype_int16 yytable[] =
{
- 824, 825, 583, 584, 218, 218, 1058, 823, 1005, 225,
- 591, 381, 1006, 478, 47, 110, 499, 110, 1243, 67,
- 391, 1007, 1077, 225, 518, 1008, 1078, 565, 381, 352,
- 290, 353, 500, 354, 290, 1079, 1203, 519, 295, 1080,
- 1204, 1244, 68, 1245, 469, 355, 1208, 501, 479, 69,
- 1209, 502, 1210, 48, 1214, 1216, 1211, 450, 1215, 1217,
- 356, 1218, 556, 1228, 357, 1219, 1230, 1229, 296, 480,
- 1231, 52, 382, 451, 481, 1105, 111, 1232, 111, 1234,
- 1258, 1233, 478, 1235, 1259, 358, 1246, 359, 452, 382,
- 45, 46, 453, 54, 1046, 1047, 1048, 360, 58, 642,
- 643, 226, 964, 678, 679, 1225, 964, 650, 565, 652,
- 503, 234, 59, 70, 392, 226, 659, 479, 62, 662,
- 556, 566, 520, 361, 291, 63, 116, 227, 291, 672,
- 673, 117, 118, 504, 482, 383, 66, 119, 480, 684,
- 685, 227, 687, 481, 393, 120, 107, 235, 521, 505,
- 362, 121, 383, 122, 123, 124, 557, 108, 1247, 1248,
- 125, 236, 237, 238, 239, 240, 126, 127, 470, 128,
- 129, 130, 109, 317, 454, 131, 251, 394, 115, 363,
- 241, 132, 455, 456, 567, 133, 134, 318, 319, 135,
- 823, 320, 469, 1249, 756, 757, 965, 1059, 136, 252,
- 965, 471, 566, 482, 391, 137, 364, 138, 321, 139,
- 215, 140, 141, 142, 557, 506, 457, 216, 1106, 558,
- 219, 219, 217, 1107, 680, 681, -113, -113, 143, 491,
- 507, 744, 232, 253, 144, 145, 146, 713, 147, 389,
- 730, 148, 149, 299, 639, 150, 365, 497, 736, 322,
- 323, 324, 632, 628, 573, 325, 254, 233, 472, 966,
- 255, 326, 327, 966, 288, 567, 450, 328, 706, 297,
- 256, 458, 257, 258, 760, 761, 559, 558, 329, 330,
- 151, 701, 451, 493, 152, 289, 774, 153, 154, 155,
- 156, 157, 518, 331, 158, 159, 811, 452, 392, 828,
- 829, 453, 817, 818, 76, 519, 298, 822, 259, 301,
- 260, 261, 262, 263, 1032, 1033, 470, 352, 302, 353,
- 303, 354, 332, 967, 77, 78, 1119, 967, 393, 264,
- 79, 304, 779, 355, 559, 534, 160, 161, 162, 67,
- 305, 163, 1205, 1206, 1207, 306, 164, 307, 356, 471,
- 448, 308, 357, 265, 1022, 1023, 1024, 1025, 1026, 1027,
- 1028, 394, 68, 266, 333, 309, 310, 311, 312, 69,
- 80, 81, 313, 358, 314, 359, 388, 82, 83, 84,
- 400, 401, 402, 454, 403, 360, 404, 405, 406, 407,
- 520, 455, 456, 267, 268, 408, 409, 612, 410, 717,
- 554, 411, 489, 116, 85, 86, 472, 412, 117, 118,
- 413, 361, 414, 415, 119, 416, 521, 87, 88, 417,
- 499, 418, 120, 419, 420, 457, 421, 89, 121, 422,
- 122, 123, 124, 70, 423, 90, 500, 125, 362, 424,
- 425, 426, 427, 126, 127, 251, 128, 129, 130, 429,
- 575, 501, 131, 431, 432, 502, 433, 582, 132, 434,
- 435, 436, 133, 134, 437, 438, 135, 363, 252, 439,
- 440, 441, 442, 443, 444, 136, 445, 446, 447, 490,
- 458, 494, 137, 495, 138, 496, 139, 1083, 140, 141,
- 142, 527, 536, 528, 364, 789, 790, 791, 792, 793,
- 794, 795, 253, 529, 530, 143, 531, 1084, 1226, 532,
- 533, 144, 145, 146, 503, 147, 537, 1085, 148, 149,
- 538, 539, 150, 1086, 540, 254, 541, 542, 315, 255,
- 576, 543, 544, 545, 365, 546, 547, 504, 548, 256,
- 1087, 257, 258, 577, 549, 550, 551, 552, 1123, 553,
- 572, 234, 578, 505, 579, 580, 581, 151, 582, 585,
- 586, 152, 587, 588, 153, 154, 155, 156, 157, 1124,
- 1088, 158, 159, 589, 590, 592, 593, 259, 1089, 260,
- 261, 262, 263, 594, 1125, 595, 634, 235, 614, 596,
- 597, 1126, 598, 600, 601, 602, 603, 604, 264, 605,
- 606, 236, 237, 238, 239, 240, 607, 608, 1177, 1127,
- 609, 317, 610, 160, 161, 162, 1090, 611, 163, 506,
- 241, 615, 265, 164, 616, 318, 319, 617, 618, 320,
- 620, 621, 266, 641, 507, 1091, 644, 1128, 622, 623,
- 624, 625, 626, 627, 1129, 878, 321, 2, 3, 630,
- 631, 4, 635, 636, 637, 645, 1130, 646, 647, 648,
- 649, 5, 267, 268, 6, 7, 651, 653, 654, 655,
- 8, 656, 657, 1131, 1132, 1133, 658, 660, 661, 663,
- 664, 9, 1092, 1147, 1178, 10, 11, 322, 323, 324,
- 665, 666, 667, 325, 668, 12, 670, 669, 671, 326,
- 327, 674, 675, 686, 676, 328, 677, 682, 683, 688,
- 13, 691, 902, 689, 690, 1179, 329, 330, 14, 15,
- 692, 693, 694, 715, 1180, 1134, 718, 696, 697, 698,
- 1181, 331, 708, 699, 700, 1135, 719, 703, 705, 710,
- 1136, 16, 711, 712, 1191, 1182, 1137, 1183, 1184, 722,
- 1138, 723, 716, 1139, 720, 17, 721, 1185, 1140, 738,
- 332, 740, 739, 1186, 1141, 725, 741, 879, 880, 881,
- 882, 883, 726, 884, 885, 727, 886, 887, 888, 729,
- 746, 889, 732, 890, 891, 892, 733, 893, 18, 894,
- 742, 895, 896, 734, 735, 897, 743, 747, 748, 19,
- 20, 898, 333, 21, 22, 1148, 1149, 1150, 1151, 1152,
- 749, 1153, 1154, 745, 1155, 1156, 1157, 750, 751, 1158,
- 1192, 1159, 1160, 1161, 752, 1162, 753, 1163, 769, 1164,
- 1165, 754, 755, 1166, 903, 904, 905, 906, 907, 1167,
- 908, 909, 764, 910, 911, 912, 765, 766, 913, 76,
- 914, 1193, 915, 767, 916, 768, 917, 23, 918, 919,
- 1194, 770, 920, 771, 781, 776, 1195, 773, 921, 77,
- 78, 777, 782, 783, 784, 79, 785, 786, 787, 788,
- 798, 1196, 799, 1197, 1198, 809, 800, 801, 802, 803,
- 804, 805, 806, 1199, 807, 808, 810, 813, 814, 1200,
- 812, 815, 816, 820, 819, 821, 823, 826, 827, 830,
- 831, 832, 833, 834, 837, 80, 81, 835, 836, 848,
- 841, 844, 82, 83, 84, 838, 839, 840, 842, 843,
- 845, 846, 947, 847, 849, 850, 851, 852, 853, 854,
- 855, 856, 857, 943, 858, 859, 860, 946, 861, 85,
- 86, 862, 863, 864, 944, 865, 948, 866, 867, 868,
- 869, 870, 87, 88, 871, 945, 949, 950, 872, 873,
- 874, 875, 89, 876, 877, 901, 924, 925, 926, 927,
- 90, 928, 929, 930, 931, 932, 933, 934, 935, 936,
- 937, 938, 939, 940, 941, 942, 951, 952, 954, 955,
- 953, 956, 957, 958, 959, 975, 962, 963, 973, 976,
- 978, 979, 974, 980, 982, 984, 985, 986, 1014, 1016,
- 1018, 1175, 300, 1174, 1260, 555, 977, 731, 1074, 1236,
- 1120, 1255, 1254, 1101, 981, 983, 987, 988, 989, 990,
- 991, 992, 993, 994, 1220, 995, 996, 997, 1241, 998,
- 999, 1221, 1000, 1001, 1002, 1003, 1004, 1223, 1009, 1010,
- 1011, 1012, 1013, 714, 1017, 702, 1015, 1239, 1019, 1020,
- 1021, 1029, 1237, 1030, 1031, 1036, 1037, 1038, 1039, 1040,
- 1041, 1042, 1043, 1044, 1045, 1051, 1052, 1053, 1054, 1055,
- 1056, 1057, 1062, 1063, 1064, 1065, 1066, 1067, 1112, 737,
- 1068, 1069, 1070, 1256, 1257, 1071, 1240, 1072, 1073, 1081,
- 1082, 613, 390, 1095, 775, 1238, 707, 780, 449, 1213,
- 316, 640, 1096, 633, 1212, 1097, 1098, 1099, 1100, 0,
- 1104, 1110, 1111, 492, 1115, 0, 0, 1113, 1116, 1118,
- 1121, 1122, 1144, 1145, 1146, 1170, 1171, 1172, 1173, 1176,
- 1189, 0, 1190, 1222, 0, 1227, 1242, 1224, 0, 1252,
- 1253, 498, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 535,
+ 819, 820, 580, 581, 818, 47, 1053, 378, 959, 562,
+ 588, 475, 515, 48, 108, 1000, 288, 67, 388, 1001,
+ 1100, 216, 1002, 1041, 1042, 1043, 1003, 378, 45, 46,
+ 1072, 1074, 108, 293, 1073, 1075, 388, 114, 52, 553,
+ 68, 54, 115, 116, 58, 516, 476, 69, 117, 1198,
+ 674, 675, 223, 1199, 288, 466, 118, 1200, 1201, 1202,
+ 447, 553, 119, 466, 120, 121, 122, 477, 379, 752,
+ 753, 123, 478, 216, 496, 109, 448, 124, 125, 249,
+ 126, 127, 128, 515, 517, 59, 129, 562, 379, 959,
+ 497, 449, 130, 109, 62, 450, 131, 132, 638, 639,
+ 133, 1220, 250, 960, 563, 498, 646, 63, 648, 499,
+ 134, 289, 70, 389, 66, 655, 516, 135, 658, 136,
+ 818, 137, 105, 138, 139, 140, 1203, 106, 668, 669,
+ 1204, 389, 380, 479, 554, 107, 251, 518, 680, 681,
+ 141, 683, 113, 390, 314, 224, 142, 143, 144, 289,
+ 145, 213, 380, 146, 147, 517, 554, 148, 315, 316,
+ 252, 390, 317, 1101, 253, 961, 564, 214, 1102, 500,
+ 215, 225, 676, 677, 254, 391, 255, 256, 451, 318,
+ 467, 1205, 563, 294, 960, 1206, 452, 453, 467, 230,
+ 1209, 149, 501, 391, 1210, 150, 555, 1054, 151, 152,
+ 153, 154, 155, 756, 757, 156, 157, 502, 518, 823,
+ 824, 257, 468, 258, 259, 260, 261, 231, 555, 454,
+ 468, 319, 320, 321, 349, 286, 350, 322, 351, 962,
+ 740, 628, 262, 323, 324, 709, 732, 217, 386, 325,
+ 352, 297, 76, -113, 564, 488, 961, 158, 159, 160,
+ 326, 327, 161, 556, 1211, 353, 263, 162, 1212, 354,
+ 635, 445, 77, 78, 295, 328, 264, 223, 79, 469,
+ 232, 287, 475, 503, 455, 556, 494, 469, 570, 702,
+ 355, 486, 356, 296, 697, 770, 572, 1213, 504, 217,
+ 490, 1214, 357, 329, 806, -113, 265, 266, 726, 578,
+ 812, 813, 299, 551, 300, 817, 233, 476, 80, 81,
+ 962, 775, 301, 1114, 1027, 1028, 82, 83, 84, 358,
+ 234, 235, 236, 237, 238, 1078, 1223, 1225, 477, 491,
+ 1224, 1226, 1227, 478, 496, 330, 1228, 1229, 1253, 239,
+ 533, 1230, 1254, 85, 86, 1079, 359, 302, 114, 67,
+ 497, 303, 304, 115, 116, 1080, 87, 88, 305, 117,
+ 224, 1081, 306, 307, 447, 498, 89, 118, 608, 499,
+ 573, 308, 68, 119, 360, 120, 121, 122, 1082, 69,
+ 448, 309, 123, 310, 311, 385, 225, 397, 124, 125,
+ 249, 126, 127, 128, 479, 449, 398, 129, 399, 450,
+ 400, 361, 401, 130, 402, 403, 404, 131, 132, 1083,
+ 405, 133, 406, 250, 1238, 407, 408, 1084, 409, 410,
+ 411, 134, 412, 413, 414, 415, 232, 416, 135, 500,
+ 136, 417, 137, 418, 138, 139, 140, 1239, 419, 1240,
+ 420, 362, 421, 422, 70, 423, 424, 251, 624, 575,
+ 585, 141, 501, 426, 1085, 428, 429, 142, 143, 144,
+ 430, 145, 233, 431, 146, 147, 312, 502, 148, 432,
+ 433, 252, 434, 1086, 435, 253, 234, 235, 236, 237,
+ 238, 436, 451, 1241, 437, 254, 438, 255, 256, 439,
+ 452, 453, 440, 574, 531, 239, 576, 441, 577, 579,
+ 442, 443, 149, 444, 487, 492, 150, 1221, 493, 151,
+ 152, 153, 154, 155, 1118, 524, 156, 157, 525, 526,
+ 1087, 527, 257, 454, 258, 259, 260, 261, 528, 529,
+ 349, 530, 350, 503, 351, 1119, 785, 786, 787, 788,
+ 789, 790, 791, 262, 1172, 534, 352, 535, 504, 536,
+ 1120, 537, 538, 539, 1242, 1243, 540, 1121, 158, 159,
+ 160, 353, 541, 161, 542, 354, 314, 263, 162, 543,
+ 544, 545, 546, 547, 579, 1122, 548, 264, 455, 549,
+ 315, 316, 550, 569, 317, 586, 355, 582, 356, 1244,
+ 1017, 1018, 1019, 1020, 1021, 1022, 1023, 583, 357, 2,
+ 3, 318, 584, 4, 1123, 587, 589, 265, 266, 590,
+ 591, 1124, 630, 5, 592, 593, 6, 7, 594, 610,
+ 1173, 596, 8, 1125, 597, 358, 598, 599, 600, 601,
+ 602, 603, 604, 9, 605, 606, 873, 10, 11, 607,
+ 1126, 1127, 1128, 319, 320, 321, 611, 12, 612, 322,
+ 613, 1174, 359, 614, 616, 323, 324, 617, 618, 619,
+ 1175, 325, 13, 620, 621, 622, 1176, 623, 626, 627,
+ 14, 15, 326, 327, 1142, 631, 632, 633, 637, 640,
+ 360, 1177, 641, 1178, 1179, 642, 643, 328, 644, 645,
+ 647, 1129, 649, 1180, 16, 650, 651, 652, 653, 1181,
+ 654, 1130, 656, 897, 657, 663, 1131, 361, 17, 659,
+ 660, 661, 1132, 662, 664, 329, 1133, 665, 666, 1134,
+ 667, 670, 671, 672, 1135, 673, 678, 679, 684, 685,
+ 1136, 687, 682, 686, 711, 1186, 688, 704, 714, 715,
+ 18, 689, 734, 690, 692, 735, 693, 362, 694, 712,
+ 713, 19, 20, 695, 696, 21, 22, 330, 874, 875,
+ 876, 877, 878, 699, 879, 880, 701, 881, 882, 883,
+ 706, 707, 884, 708, 885, 886, 887, 716, 888, 718,
+ 889, 717, 890, 891, 736, 737, 892, 738, 739, 742,
+ 719, 743, 893, 728, 741, 721, 1143, 1144, 1145, 1146,
+ 1147, 722, 1148, 1149, 723, 1150, 1151, 1152, 725, 23,
+ 1153, 1187, 1154, 1155, 1156, 729, 1157, 744, 1158, 730,
+ 1159, 1160, 731, 745, 1161, 898, 899, 900, 901, 902,
+ 1162, 903, 904, 746, 905, 906, 907, 747, 748, 908,
+ 76, 909, 1188, 910, 749, 911, 750, 912, 751, 913,
+ 914, 1189, 760, 915, 761, 762, 763, 1190, 764, 916,
+ 77, 78, 765, 766, 767, 772, 79, 769, 777, 773,
+ 778, 779, 1191, 780, 1192, 1193, 804, 781, 782, 783,
+ 784, 794, 795, 796, 1194, 797, 798, 799, 800, 805,
+ 1195, 801, 802, 803, 808, 809, 810, 811, 807, 814,
+ 815, 816, 818, 821, 822, 825, 80, 81, 826, 827,
+ 828, 829, 832, 836, 82, 83, 84, 830, 839, 840,
+ 843, 831, 833, 834, 835, 837, 838, 841, 842, 844,
+ 845, 846, 847, 938, 848, 941, 849, 942, 943, 850,
+ 851, 85, 86, 852, 939, 853, 944, 854, 945, 855,
+ 856, 857, 947, 858, 87, 88, 949, 859, 940, 860,
+ 861, 862, 863, 864, 89, 952, 865, 866, 953, 867,
+ 868, 869, 870, 954, 871, 872, 896, 919, 920, 921,
+ 922, 923, 924, 925, 926, 927, 928, 929, 930, 931,
+ 932, 933, 934, 935, 970, 936, 937, 946, 973, 974,
+ 950, 948, 971, 957, 975, 951, 958, 977, 968, 969,
+ 979, 980, 981, 1009, 1011, 1013, 1215, 298, 1115, 972,
+ 1169, 1170, 1069, 1255, 1236, 727, 1250, 1249, 609, 1231,
+ 710, 978, 976, 1096, 982, 1010, 983, 984, 698, 985,
+ 986, 987, 988, 989, 990, 991, 1216, 992, 1234, 993,
+ 994, 995, 1218, 996, 997, 771, 733, 998, 999, 1251,
+ 1004, 1005, 1006, 1252, 1007, 776, 1008, 1012, 1232, 1235,
+ 1015, 1016, 1014, 1024, 1025, 1026, 1031, 1032, 1033, 1034,
+ 1035, 1036, 1037, 1038, 1039, 1040, 1046, 1047, 1048, 1049,
+ 1050, 1107, 1051, 1052, 387, 1057, 1058, 1059, 703, 629,
+ 1060, 1061, 1062, 1063, 446, 1064, 1065, 1208, 1066, 1067,
+ 1233, 313, 1207, 0, 0, 552, 1068, 0, 1076, 1077,
+ 1090, 1091, 1092, 1093, 1094, 1095, 1099, 1105, 0, 1106,
+ 489, 1110, 0, 636, 1108, 1111, 1113, 1116, 1117, 1139,
+ 1140, 1141, 1165, 1166, 0, 1167, 1168, 1171, 1184, 1185,
+ 1217, 0, 0, 1222, 1219, 1237, 1247, 1248, 0, 0,
+ 495, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 532, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 571, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 574, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2133,138 +2130,138 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 629
+ 0, 0, 0, 625
};
#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-705)))
+ (!!((Yystate) == (-985)))
#define yytable_value_is_error(Yytable_value) \
YYID (0)
static const yytype_int16 yycheck[] =
{
- 610, 611, 304, 305, 1, 1, 8, 105, 224, 1,
- 312, 1, 228, 1, 226, 1, 1, 1, 40, 1,
- 1, 224, 224, 1, 1, 228, 228, 1, 1, 1,
- 1, 3, 17, 5, 1, 224, 224, 14, 224, 228,
- 228, 63, 24, 65, 1, 17, 224, 32, 36, 31,
- 228, 36, 224, 226, 224, 224, 228, 1, 228, 228,
- 32, 224, 1, 224, 36, 228, 224, 228, 227, 57,
- 228, 226, 62, 17, 62, 51, 62, 224, 62, 224,
- 224, 228, 1, 228, 228, 57, 108, 59, 32, 62,
- 224, 225, 36, 226, 9, 10, 11, 69, 226, 401,
- 402, 93, 1, 167, 168, 203, 1, 409, 1, 411,
- 95, 1, 226, 95, 95, 93, 418, 36, 226, 421,
- 1, 95, 99, 95, 95, 226, 1, 119, 95, 431,
- 432, 6, 7, 118, 122, 125, 226, 12, 57, 441,
- 442, 119, 444, 62, 125, 20, 226, 37, 125, 134,
- 122, 26, 125, 28, 29, 30, 95, 226, 180, 181,
- 35, 51, 52, 53, 54, 55, 41, 42, 125, 44,
- 45, 46, 226, 1, 118, 50, 1, 158, 226, 151,
- 70, 56, 126, 127, 158, 60, 61, 15, 16, 64,
- 105, 19, 1, 215, 139, 140, 95, 199, 73, 24,
- 95, 158, 95, 122, 1, 80, 178, 82, 36, 84,
- 226, 86, 87, 88, 95, 200, 160, 226, 194, 158,
- 217, 217, 226, 199, 167, 168, 223, 223, 103, 225,
- 215, 533, 226, 58, 109, 110, 111, 225, 113, 225,
- 225, 116, 117, 225, 225, 120, 218, 225, 225, 77,
- 78, 79, 225, 225, 225, 83, 81, 226, 215, 158,
- 85, 89, 90, 158, 226, 158, 1, 95, 225, 227,
- 95, 215, 97, 98, 139, 140, 215, 158, 106, 107,
- 155, 225, 17, 223, 159, 226, 225, 162, 163, 164,
- 165, 166, 1, 121, 169, 170, 598, 32, 95, 185,
- 186, 36, 604, 605, 1, 14, 227, 609, 133, 227,
- 135, 136, 137, 138, 91, 92, 125, 1, 227, 3,
- 227, 5, 150, 222, 21, 22, 225, 222, 125, 154,
- 27, 227, 225, 17, 215, 225, 211, 212, 213, 1,
- 227, 216, 1046, 1047, 1048, 227, 221, 227, 32, 158,
- 225, 227, 36, 178, 789, 790, 791, 792, 793, 794,
- 795, 158, 24, 188, 192, 227, 227, 227, 227, 31,
- 67, 68, 227, 57, 227, 59, 227, 74, 75, 76,
- 227, 227, 227, 118, 227, 69, 227, 227, 227, 227,
- 99, 126, 127, 218, 219, 227, 227, 225, 227, 226,
- 225, 227, 224, 1, 101, 102, 215, 227, 6, 7,
- 227, 95, 227, 227, 12, 227, 125, 114, 115, 227,
- 1, 227, 20, 227, 227, 160, 227, 124, 26, 227,
- 28, 29, 30, 95, 227, 132, 17, 35, 122, 227,
- 227, 227, 227, 41, 42, 1, 44, 45, 46, 227,
- 123, 32, 50, 227, 227, 36, 227, 105, 56, 227,
- 227, 227, 60, 61, 227, 227, 64, 151, 24, 227,
- 227, 227, 227, 227, 227, 73, 227, 227, 227, 227,
- 215, 224, 80, 227, 82, 227, 84, 13, 86, 87,
- 88, 227, 224, 227, 178, 143, 144, 145, 146, 147,
- 148, 149, 58, 227, 227, 103, 227, 33, 1118, 227,
- 227, 109, 110, 111, 95, 113, 227, 43, 116, 117,
- 227, 227, 120, 49, 227, 81, 227, 227, 225, 85,
- 123, 227, 227, 227, 218, 227, 227, 118, 227, 95,
- 66, 97, 98, 123, 227, 227, 227, 227, 4, 227,
- 227, 1, 224, 134, 105, 105, 167, 155, 105, 105,
- 105, 159, 105, 167, 162, 163, 164, 165, 166, 25,
- 96, 169, 170, 167, 105, 167, 167, 133, 104, 135,
- 136, 137, 138, 224, 40, 224, 123, 37, 224, 227,
- 227, 47, 227, 227, 227, 227, 227, 227, 154, 227,
- 227, 51, 52, 53, 54, 55, 227, 227, 65, 65,
- 227, 1, 227, 211, 212, 213, 142, 227, 216, 200,
- 70, 227, 178, 221, 227, 15, 16, 227, 227, 19,
- 227, 227, 188, 167, 215, 161, 105, 93, 227, 227,
- 227, 227, 227, 227, 100, 51, 36, 0, 1, 227,
- 227, 4, 224, 227, 227, 167, 112, 167, 105, 123,
- 167, 14, 218, 219, 17, 18, 167, 105, 105, 105,
- 23, 167, 167, 129, 130, 131, 167, 105, 105, 105,
- 105, 34, 208, 51, 141, 38, 39, 77, 78, 79,
- 105, 105, 167, 83, 167, 48, 167, 227, 227, 89,
- 90, 167, 167, 123, 167, 95, 167, 167, 167, 167,
- 63, 224, 51, 167, 167, 172, 106, 107, 71, 72,
- 224, 227, 227, 167, 181, 181, 123, 227, 227, 227,
- 187, 121, 224, 227, 227, 191, 123, 227, 227, 227,
- 196, 94, 227, 227, 65, 202, 202, 204, 205, 227,
- 206, 227, 224, 209, 224, 108, 224, 214, 214, 167,
- 150, 123, 167, 220, 220, 227, 167, 173, 174, 175,
- 176, 177, 227, 179, 180, 227, 182, 183, 184, 227,
- 123, 187, 224, 189, 190, 191, 227, 193, 141, 195,
- 167, 197, 198, 227, 227, 201, 167, 167, 105, 152,
- 153, 207, 192, 156, 157, 173, 174, 175, 176, 177,
- 105, 179, 180, 224, 182, 183, 184, 123, 123, 187,
- 141, 189, 190, 191, 123, 193, 123, 195, 224, 197,
- 198, 123, 123, 201, 173, 174, 175, 176, 177, 207,
- 179, 180, 123, 182, 183, 184, 123, 105, 187, 1,
- 189, 172, 191, 123, 193, 123, 195, 210, 197, 198,
- 181, 224, 201, 227, 123, 224, 187, 227, 207, 21,
- 22, 227, 224, 224, 224, 27, 224, 224, 224, 224,
- 224, 202, 224, 204, 205, 105, 224, 224, 224, 224,
- 224, 224, 224, 214, 224, 224, 105, 105, 105, 220,
- 227, 105, 105, 105, 123, 105, 105, 224, 123, 123,
- 167, 227, 123, 123, 105, 67, 68, 123, 123, 227,
- 224, 224, 74, 75, 76, 123, 123, 123, 123, 123,
- 224, 123, 105, 123, 224, 224, 224, 224, 224, 224,
- 224, 224, 224, 123, 224, 224, 224, 123, 224, 101,
- 102, 224, 224, 224, 167, 224, 123, 224, 224, 224,
- 224, 224, 114, 115, 224, 227, 123, 123, 224, 224,
- 224, 224, 124, 224, 224, 224, 224, 224, 224, 224,
- 132, 224, 224, 224, 224, 224, 224, 224, 224, 224,
- 224, 224, 224, 224, 224, 224, 224, 123, 123, 224,
- 227, 227, 123, 123, 105, 123, 224, 224, 224, 167,
- 123, 123, 224, 123, 123, 123, 123, 123, 123, 123,
- 123, 1008, 71, 1006, 1259, 269, 227, 508, 128, 1204,
- 968, 1231, 1229, 128, 227, 224, 224, 224, 224, 224,
- 224, 224, 224, 224, 105, 224, 224, 224, 1219, 224,
- 224, 1113, 224, 224, 224, 224, 224, 123, 224, 224,
- 224, 224, 224, 484, 224, 459, 227, 1215, 227, 224,
- 224, 224, 1209, 224, 224, 224, 224, 224, 224, 224,
+ 606, 607, 302, 303, 106, 226, 8, 1, 1, 1,
+ 310, 1, 1, 226, 1, 224, 1, 1, 1, 228,
+ 51, 1, 224, 9, 10, 11, 228, 1, 224, 225,
+ 224, 224, 1, 224, 228, 228, 1, 1, 226, 1,
+ 24, 226, 6, 7, 226, 34, 36, 31, 12, 224,
+ 167, 168, 1, 228, 1, 1, 20, 1041, 1042, 1043,
+ 1, 1, 26, 1, 28, 29, 30, 57, 62, 139,
+ 140, 35, 62, 1, 1, 62, 17, 41, 42, 1,
+ 44, 45, 46, 1, 73, 226, 50, 1, 62, 1,
+ 17, 32, 56, 62, 226, 36, 60, 61, 398, 399,
+ 64, 203, 24, 96, 96, 32, 406, 226, 408, 36,
+ 74, 96, 96, 96, 226, 415, 34, 81, 418, 83,
+ 106, 85, 226, 87, 88, 89, 224, 226, 428, 429,
+ 228, 96, 126, 123, 96, 226, 58, 126, 438, 439,
+ 104, 441, 226, 126, 1, 94, 110, 111, 112, 96,
+ 114, 226, 126, 117, 118, 73, 96, 121, 15, 16,
+ 82, 126, 19, 194, 86, 158, 158, 226, 199, 96,
+ 226, 120, 167, 168, 96, 158, 98, 99, 119, 36,
+ 126, 224, 96, 227, 96, 228, 127, 128, 126, 226,
+ 224, 155, 119, 158, 228, 159, 158, 199, 162, 163,
+ 164, 165, 166, 139, 140, 169, 170, 134, 126, 185,
+ 186, 133, 158, 135, 136, 137, 138, 226, 158, 160,
+ 158, 78, 79, 80, 1, 226, 3, 84, 5, 222,
+ 530, 225, 154, 90, 91, 225, 225, 217, 225, 96,
+ 17, 225, 1, 223, 158, 225, 158, 211, 212, 213,
+ 107, 108, 216, 215, 224, 32, 178, 221, 228, 36,
+ 225, 225, 21, 22, 227, 122, 188, 1, 27, 215,
+ 1, 226, 1, 200, 215, 215, 225, 215, 225, 225,
+ 57, 224, 59, 227, 225, 225, 124, 224, 215, 217,
+ 223, 228, 69, 150, 594, 223, 218, 219, 225, 167,
+ 600, 601, 227, 225, 227, 605, 37, 36, 67, 68,
+ 222, 225, 227, 225, 92, 93, 75, 76, 77, 96,
+ 51, 52, 53, 54, 55, 13, 224, 224, 57, 224,
+ 228, 228, 224, 62, 1, 192, 228, 224, 224, 70,
+ 224, 228, 228, 102, 103, 33, 123, 227, 1, 1,
+ 17, 227, 227, 6, 7, 43, 115, 116, 227, 12,
+ 94, 49, 227, 227, 1, 32, 125, 20, 225, 36,
+ 124, 227, 24, 26, 151, 28, 29, 30, 66, 31,
+ 17, 227, 35, 227, 227, 227, 120, 227, 41, 42,
+ 1, 44, 45, 46, 123, 32, 227, 50, 227, 36,
+ 227, 178, 227, 56, 227, 227, 227, 60, 61, 97,
+ 227, 64, 227, 24, 40, 227, 227, 105, 227, 227,
+ 227, 74, 227, 227, 227, 227, 1, 227, 81, 96,
+ 83, 227, 85, 227, 87, 88, 89, 63, 227, 65,
+ 227, 218, 227, 227, 96, 227, 227, 58, 225, 224,
+ 167, 104, 119, 227, 142, 227, 227, 110, 111, 112,
+ 227, 114, 37, 227, 117, 118, 225, 134, 121, 227,
+ 227, 82, 227, 161, 227, 86, 51, 52, 53, 54,
+ 55, 227, 119, 109, 227, 96, 227, 98, 99, 227,
+ 127, 128, 227, 124, 225, 70, 106, 227, 106, 106,
+ 227, 227, 155, 227, 227, 227, 159, 1113, 227, 162,
+ 163, 164, 165, 166, 4, 227, 169, 170, 227, 227,
+ 208, 227, 133, 160, 135, 136, 137, 138, 227, 227,
+ 1, 227, 3, 200, 5, 25, 143, 144, 145, 146,
+ 147, 148, 149, 154, 65, 227, 17, 227, 215, 227,
+ 40, 227, 227, 227, 180, 181, 227, 47, 211, 212,
+ 213, 32, 227, 216, 227, 36, 1, 178, 221, 227,
+ 227, 227, 227, 227, 106, 65, 227, 188, 215, 227,
+ 15, 16, 227, 227, 19, 167, 57, 106, 59, 215,
+ 785, 786, 787, 788, 789, 790, 791, 106, 69, 0,
+ 1, 36, 106, 4, 94, 106, 167, 218, 219, 224,
+ 224, 101, 124, 14, 227, 227, 17, 18, 227, 224,
+ 141, 227, 23, 113, 227, 96, 227, 227, 227, 227,
+ 227, 227, 227, 34, 227, 227, 51, 38, 39, 227,
+ 130, 131, 132, 78, 79, 80, 227, 48, 227, 84,
+ 227, 172, 123, 227, 227, 90, 91, 227, 227, 227,
+ 181, 96, 63, 227, 227, 227, 187, 227, 227, 227,
+ 71, 72, 107, 108, 51, 224, 227, 227, 167, 106,
+ 151, 202, 167, 204, 205, 167, 106, 122, 124, 167,
+ 167, 181, 106, 214, 95, 106, 106, 167, 167, 220,
+ 167, 191, 106, 51, 106, 167, 196, 178, 109, 106,
+ 106, 106, 202, 106, 167, 150, 206, 227, 167, 209,
+ 227, 167, 167, 167, 214, 167, 167, 167, 167, 167,
+ 220, 224, 124, 167, 167, 65, 224, 224, 124, 124,
+ 141, 227, 167, 227, 227, 167, 227, 218, 227, 224,
+ 226, 152, 153, 227, 227, 156, 157, 192, 173, 174,
+ 175, 176, 177, 227, 179, 180, 227, 182, 183, 184,
+ 227, 227, 187, 227, 189, 190, 191, 224, 193, 227,
+ 195, 224, 197, 198, 124, 167, 201, 167, 167, 124,
+ 227, 167, 207, 224, 224, 227, 173, 174, 175, 176,
+ 177, 227, 179, 180, 227, 182, 183, 184, 227, 210,
+ 187, 141, 189, 190, 191, 227, 193, 106, 195, 227,
+ 197, 198, 227, 106, 201, 173, 174, 175, 176, 177,
+ 207, 179, 180, 124, 182, 183, 184, 124, 124, 187,
+ 1, 189, 172, 191, 124, 193, 124, 195, 124, 197,
+ 198, 181, 124, 201, 124, 106, 124, 187, 124, 207,
+ 21, 22, 224, 224, 227, 224, 27, 227, 124, 227,
+ 224, 224, 202, 224, 204, 205, 106, 224, 224, 224,
+ 224, 224, 224, 224, 214, 224, 224, 224, 224, 106,
+ 220, 224, 224, 224, 106, 106, 106, 106, 227, 124,
+ 106, 106, 106, 224, 124, 124, 67, 68, 167, 227,
+ 124, 124, 106, 224, 75, 76, 77, 124, 224, 224,
+ 227, 124, 124, 124, 124, 124, 124, 124, 124, 224,
+ 224, 224, 224, 124, 224, 124, 224, 106, 124, 224,
+ 224, 102, 103, 224, 167, 224, 124, 224, 124, 224,
+ 224, 224, 124, 224, 115, 116, 124, 224, 227, 224,
+ 224, 224, 224, 224, 125, 124, 224, 224, 124, 224,
+ 224, 224, 224, 106, 224, 224, 224, 224, 224, 224,
224, 224, 224, 224, 224, 224, 224, 224, 224, 224,
- 224, 224, 224, 224, 224, 224, 224, 224, 171, 522,
- 224, 224, 224, 1233, 1235, 224, 1217, 224, 224, 224,
- 224, 334, 112, 224, 560, 1211, 474, 568, 165, 1080,
- 91, 396, 224, 384, 1078, 224, 224, 224, 224, -1,
- 224, 224, 224, 220, 224, -1, -1, 228, 227, 227,
+ 224, 224, 224, 224, 124, 224, 224, 224, 124, 124,
+ 224, 227, 167, 224, 124, 227, 224, 124, 224, 224,
+ 124, 124, 124, 124, 124, 124, 106, 71, 963, 227,
+ 1001, 1003, 129, 1254, 1214, 505, 1226, 1224, 331, 1199,
+ 481, 224, 227, 129, 224, 227, 224, 224, 456, 224,
+ 224, 224, 224, 224, 224, 224, 1108, 224, 1210, 224,
+ 224, 224, 124, 224, 224, 557, 519, 224, 224, 1228,
+ 224, 224, 224, 1230, 224, 565, 224, 224, 1204, 1212,
+ 224, 224, 227, 224, 224, 224, 224, 224, 224, 224,
224, 224, 224, 224, 224, 224, 224, 224, 224, 224,
- 224, -1, 224, 224, -1, 224, 224, 227, -1, 224,
- 224, 228, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 242,
+ 224, 171, 224, 224, 110, 224, 224, 224, 471, 381,
+ 224, 224, 224, 224, 163, 224, 224, 1075, 224, 224,
+ 1206, 90, 1073, -1, -1, 267, 224, -1, 224, 224,
+ 224, 224, 224, 224, 224, 224, 224, 224, -1, 224,
+ 218, 224, -1, 393, 228, 227, 227, 224, 224, 224,
+ 224, 224, 224, 224, -1, 224, 224, 224, 224, 224,
+ 224, -1, -1, 224, 227, 224, 224, 224, -1, -1,
+ 226, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 240, -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, 292, -1, -1, -1,
+ -1, 290, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -2272,7 +2269,8 @@ static const yytype_int16 yycheck[] =
-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, 366
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 363
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2280,132 +2278,131 @@ static const yytype_int16 yycheck[] =
static const yytype_uint16 yystos[] =
{
0, 230, 0, 1, 4, 14, 17, 18, 23, 34,
- 38, 39, 48, 63, 71, 72, 94, 108, 141, 152,
+ 38, 39, 48, 63, 71, 72, 95, 109, 141, 152,
153, 156, 157, 210, 231, 236, 241, 265, 271, 285,
303, 326, 340, 355, 362, 366, 376, 385, 405, 415,
- 421, 425, 435, 492, 509, 224, 225, 226, 226, 304,
+ 421, 425, 435, 492, 508, 224, 225, 226, 226, 304,
386, 416, 226, 426, 226, 341, 406, 327, 226, 226,
286, 356, 226, 226, 367, 377, 226, 1, 24, 31,
- 95, 266, 267, 268, 269, 270, 1, 21, 22, 27,
- 67, 68, 74, 75, 76, 101, 102, 114, 115, 124,
- 132, 493, 494, 495, 496, 497, 498, 499, 500, 501,
- 502, 503, 504, 505, 506, 507, 508, 226, 226, 226,
- 1, 62, 422, 423, 424, 226, 1, 6, 7, 12,
- 20, 26, 28, 29, 30, 35, 41, 42, 44, 45,
- 46, 50, 56, 60, 61, 64, 73, 80, 82, 84,
- 86, 87, 88, 103, 109, 110, 111, 113, 116, 117,
- 120, 155, 159, 162, 163, 164, 165, 166, 169, 170,
- 211, 212, 213, 216, 221, 436, 437, 438, 439, 440,
- 441, 442, 443, 444, 445, 446, 447, 448, 449, 450,
- 451, 452, 453, 454, 455, 456, 457, 458, 459, 460,
- 461, 462, 463, 464, 465, 466, 467, 468, 469, 470,
- 471, 472, 473, 474, 475, 476, 477, 478, 479, 480,
- 481, 485, 489, 490, 491, 226, 226, 226, 1, 217,
- 272, 273, 274, 275, 276, 1, 93, 119, 237, 238,
- 239, 240, 226, 226, 1, 37, 51, 52, 53, 54,
- 55, 70, 510, 511, 512, 513, 514, 515, 516, 517,
- 518, 1, 24, 58, 81, 85, 95, 97, 98, 133,
- 135, 136, 137, 138, 154, 178, 188, 218, 219, 242,
- 243, 244, 245, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 226, 226,
- 1, 95, 363, 364, 365, 224, 227, 227, 227, 225,
- 267, 227, 227, 227, 227, 227, 227, 227, 227, 227,
- 227, 227, 227, 227, 227, 225, 494, 1, 15, 16,
- 19, 36, 77, 78, 79, 83, 89, 90, 95, 106,
- 107, 121, 150, 192, 305, 306, 307, 308, 309, 310,
- 311, 312, 313, 314, 315, 316, 317, 318, 319, 320,
- 321, 322, 1, 3, 5, 17, 32, 36, 57, 59,
- 69, 95, 122, 151, 178, 218, 387, 388, 389, 390,
- 391, 392, 393, 394, 395, 396, 400, 401, 402, 403,
- 404, 1, 62, 125, 417, 418, 419, 420, 227, 225,
- 423, 1, 95, 125, 158, 427, 431, 432, 433, 434,
+ 96, 266, 267, 268, 269, 270, 1, 21, 22, 27,
+ 67, 68, 75, 76, 77, 102, 103, 115, 116, 125,
+ 493, 494, 495, 496, 497, 498, 499, 500, 501, 502,
+ 503, 504, 505, 506, 507, 226, 226, 226, 1, 62,
+ 422, 423, 424, 226, 1, 6, 7, 12, 20, 26,
+ 28, 29, 30, 35, 41, 42, 44, 45, 46, 50,
+ 56, 60, 61, 64, 74, 81, 83, 85, 87, 88,
+ 89, 104, 110, 111, 112, 114, 117, 118, 121, 155,
+ 159, 162, 163, 164, 165, 166, 169, 170, 211, 212,
+ 213, 216, 221, 436, 437, 438, 439, 440, 441, 442,
+ 443, 444, 445, 446, 447, 448, 449, 450, 451, 452,
+ 453, 454, 455, 456, 457, 458, 459, 460, 461, 462,
+ 463, 464, 465, 466, 467, 468, 469, 470, 471, 472,
+ 473, 474, 475, 476, 477, 478, 479, 480, 481, 485,
+ 489, 490, 491, 226, 226, 226, 1, 217, 272, 273,
+ 274, 275, 276, 1, 94, 120, 237, 238, 239, 240,
+ 226, 226, 1, 37, 51, 52, 53, 54, 55, 70,
+ 509, 510, 511, 512, 513, 514, 515, 516, 517, 1,
+ 24, 58, 82, 86, 96, 98, 99, 133, 135, 136,
+ 137, 138, 154, 178, 188, 218, 219, 242, 243, 244,
+ 245, 250, 251, 252, 253, 254, 255, 256, 257, 258,
+ 259, 260, 261, 262, 263, 264, 226, 226, 1, 96,
+ 363, 364, 365, 224, 227, 227, 227, 225, 267, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 225, 494, 1, 15, 16, 19, 36, 78,
+ 79, 80, 84, 90, 91, 96, 107, 108, 122, 150,
+ 192, 305, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 315, 316, 317, 318, 319, 320, 321, 322, 1,
+ 3, 5, 17, 32, 36, 57, 59, 69, 96, 123,
+ 151, 178, 218, 387, 388, 389, 390, 391, 392, 393,
+ 394, 395, 396, 400, 401, 402, 403, 404, 1, 62,
+ 126, 417, 418, 419, 420, 227, 225, 423, 1, 96,
+ 126, 158, 427, 431, 432, 433, 434, 227, 227, 227,
227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
- 227, 227, 227, 227, 227, 227, 227, 227, 486, 227,
- 482, 227, 227, 227, 227, 227, 227, 227, 227, 227,
- 227, 227, 227, 227, 227, 227, 227, 227, 225, 437,
- 1, 17, 32, 36, 118, 126, 127, 160, 215, 342,
- 343, 344, 345, 346, 347, 348, 352, 353, 354, 1,
- 125, 158, 215, 407, 411, 412, 413, 414, 1, 36,
- 57, 62, 122, 328, 332, 333, 334, 338, 339, 224,
- 227, 225, 273, 223, 224, 227, 227, 225, 238, 1,
- 17, 32, 36, 95, 118, 134, 200, 215, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 299, 1, 14,
- 99, 125, 357, 358, 359, 360, 361, 227, 227, 227,
- 227, 227, 227, 227, 225, 511, 224, 227, 227, 227,
+ 227, 227, 227, 227, 227, 486, 227, 482, 227, 227,
227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
- 227, 227, 227, 227, 225, 243, 1, 95, 158, 215,
- 368, 369, 370, 371, 372, 1, 95, 158, 378, 379,
- 380, 381, 227, 225, 364, 123, 123, 123, 224, 105,
- 105, 167, 105, 233, 233, 105, 105, 105, 167, 167,
- 105, 233, 167, 167, 224, 224, 227, 227, 227, 323,
+ 227, 227, 227, 227, 227, 225, 437, 1, 17, 32,
+ 36, 119, 127, 128, 160, 215, 342, 343, 344, 345,
+ 346, 347, 348, 352, 353, 354, 1, 126, 158, 215,
+ 407, 411, 412, 413, 414, 1, 36, 57, 62, 123,
+ 328, 332, 333, 334, 338, 339, 224, 227, 225, 273,
+ 223, 224, 227, 227, 225, 238, 1, 17, 32, 36,
+ 96, 119, 134, 200, 215, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 299, 1, 34, 73, 126, 357,
+ 358, 359, 360, 361, 227, 227, 227, 227, 227, 227,
+ 227, 225, 510, 224, 227, 227, 227, 227, 227, 227,
227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
- 227, 227, 225, 306, 224, 227, 227, 227, 227, 397,
- 227, 227, 227, 227, 227, 227, 227, 227, 225, 388,
- 227, 227, 225, 418, 123, 224, 227, 227, 428, 225,
- 432, 167, 233, 233, 105, 167, 167, 105, 123, 167,
- 233, 167, 233, 105, 105, 105, 167, 167, 167, 233,
- 105, 105, 233, 105, 105, 105, 105, 167, 167, 227,
- 167, 227, 233, 233, 167, 167, 167, 167, 167, 168,
- 167, 168, 167, 167, 233, 233, 123, 233, 167, 167,
- 167, 224, 224, 227, 227, 349, 227, 227, 227, 227,
- 227, 225, 343, 227, 408, 227, 225, 412, 224, 329,
- 227, 227, 227, 225, 333, 167, 224, 226, 123, 123,
- 224, 224, 227, 227, 300, 227, 227, 227, 296, 227,
- 225, 288, 224, 227, 227, 227, 225, 358, 167, 167,
- 123, 167, 167, 167, 233, 224, 123, 167, 105, 105,
- 123, 123, 123, 123, 123, 123, 139, 140, 246, 247,
- 139, 140, 248, 249, 123, 123, 105, 123, 123, 224,
- 224, 227, 373, 227, 225, 369, 224, 227, 382, 225,
- 379, 123, 224, 224, 224, 224, 224, 224, 224, 143,
- 144, 145, 146, 147, 148, 149, 232, 233, 224, 224,
- 224, 224, 224, 224, 224, 224, 224, 224, 224, 105,
- 105, 233, 227, 105, 105, 105, 105, 233, 233, 123,
- 105, 105, 233, 105, 235, 235, 224, 123, 185, 186,
- 123, 167, 227, 123, 123, 123, 123, 105, 123, 123,
- 123, 224, 123, 123, 224, 224, 123, 123, 227, 224,
+ 227, 225, 243, 1, 96, 158, 215, 368, 369, 370,
+ 371, 372, 1, 96, 158, 378, 379, 380, 381, 227,
+ 225, 364, 124, 124, 124, 224, 106, 106, 167, 106,
+ 233, 233, 106, 106, 106, 167, 167, 106, 233, 167,
+ 224, 224, 227, 227, 227, 323, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 225, 306,
+ 224, 227, 227, 227, 227, 397, 227, 227, 227, 227,
+ 227, 227, 227, 227, 225, 388, 227, 227, 225, 418,
+ 124, 224, 227, 227, 428, 225, 432, 167, 233, 233,
+ 106, 167, 167, 106, 124, 167, 233, 167, 233, 106,
+ 106, 106, 167, 167, 167, 233, 106, 106, 233, 106,
+ 106, 106, 106, 167, 167, 227, 167, 227, 233, 233,
+ 167, 167, 167, 167, 167, 168, 167, 168, 167, 167,
+ 233, 233, 124, 233, 167, 167, 167, 224, 224, 227,
+ 227, 349, 227, 227, 227, 227, 227, 225, 343, 227,
+ 408, 227, 225, 412, 224, 329, 227, 227, 227, 225,
+ 333, 167, 224, 226, 124, 124, 224, 224, 227, 227,
+ 300, 227, 227, 227, 296, 227, 225, 288, 224, 227,
+ 227, 227, 225, 358, 167, 167, 124, 167, 167, 167,
+ 233, 224, 124, 167, 106, 106, 124, 124, 124, 124,
+ 124, 124, 139, 140, 246, 247, 139, 140, 248, 249,
+ 124, 124, 106, 124, 124, 224, 224, 227, 373, 227,
+ 225, 369, 224, 227, 382, 225, 379, 124, 224, 224,
+ 224, 224, 224, 224, 224, 143, 144, 145, 146, 147,
+ 148, 149, 232, 233, 224, 224, 224, 224, 224, 224,
+ 224, 224, 224, 224, 106, 106, 233, 227, 106, 106,
+ 106, 106, 233, 233, 124, 106, 106, 233, 106, 235,
+ 235, 224, 124, 185, 186, 124, 167, 227, 124, 124,
+ 124, 124, 106, 124, 124, 124, 224, 124, 124, 224,
+ 224, 124, 124, 227, 224, 224, 224, 224, 224, 224,
224, 224, 224, 224, 224, 224, 224, 224, 224, 224,
224, 224, 224, 224, 224, 224, 224, 224, 224, 224,
- 224, 224, 224, 224, 224, 224, 224, 224, 51, 173,
- 174, 175, 176, 177, 179, 180, 182, 183, 184, 187,
- 189, 190, 191, 193, 195, 197, 198, 201, 207, 487,
- 488, 224, 51, 173, 174, 175, 176, 177, 179, 180,
- 182, 183, 184, 187, 189, 191, 193, 195, 197, 198,
- 201, 207, 483, 484, 224, 224, 224, 224, 224, 224,
+ 224, 224, 224, 51, 173, 174, 175, 176, 177, 179,
+ 180, 182, 183, 184, 187, 189, 190, 191, 193, 195,
+ 197, 198, 201, 207, 487, 488, 224, 51, 173, 174,
+ 175, 176, 177, 179, 180, 182, 183, 184, 187, 189,
+ 191, 193, 195, 197, 198, 201, 207, 483, 484, 224,
224, 224, 224, 224, 224, 224, 224, 224, 224, 224,
- 224, 224, 224, 123, 167, 227, 123, 105, 123, 123,
- 123, 224, 123, 227, 123, 224, 227, 123, 123, 105,
- 336, 337, 224, 224, 1, 95, 158, 222, 277, 278,
- 279, 280, 281, 224, 224, 123, 167, 227, 123, 123,
- 123, 227, 123, 224, 123, 123, 123, 224, 224, 224,
+ 224, 224, 224, 224, 224, 224, 224, 224, 124, 167,
+ 227, 124, 106, 124, 124, 124, 224, 124, 227, 124,
+ 224, 227, 124, 124, 106, 336, 337, 224, 224, 1,
+ 96, 158, 222, 277, 278, 279, 280, 281, 224, 224,
+ 124, 167, 227, 124, 124, 124, 227, 124, 224, 124,
+ 124, 124, 224, 224, 224, 224, 224, 224, 224, 224,
224, 224, 224, 224, 224, 224, 224, 224, 224, 224,
- 224, 224, 224, 224, 224, 224, 228, 224, 228, 224,
- 224, 224, 224, 224, 123, 227, 123, 224, 123, 227,
- 224, 224, 232, 232, 232, 232, 232, 232, 232, 224,
- 224, 224, 91, 92, 324, 325, 224, 224, 224, 224,
- 224, 224, 224, 224, 224, 224, 9, 10, 11, 234,
- 235, 224, 224, 224, 224, 224, 224, 224, 8, 199,
- 398, 399, 224, 224, 224, 224, 224, 224, 224, 224,
- 224, 224, 224, 224, 128, 429, 430, 224, 228, 224,
- 228, 224, 224, 13, 33, 43, 49, 66, 96, 104,
- 142, 161, 208, 350, 351, 224, 224, 224, 224, 224,
- 224, 128, 409, 410, 224, 51, 194, 199, 330, 331,
- 224, 224, 171, 228, 335, 224, 227, 282, 227, 225,
- 278, 224, 224, 4, 25, 40, 47, 65, 93, 100,
- 112, 129, 130, 131, 181, 191, 196, 202, 206, 209,
- 214, 220, 301, 302, 224, 224, 224, 51, 173, 174,
- 175, 176, 177, 179, 180, 182, 183, 184, 187, 189,
- 190, 191, 193, 195, 197, 198, 201, 207, 297, 298,
- 224, 224, 224, 224, 247, 249, 224, 65, 141, 172,
- 181, 187, 202, 204, 205, 214, 220, 374, 375, 224,
- 224, 65, 141, 172, 181, 187, 202, 204, 205, 214,
- 220, 383, 384, 224, 228, 234, 234, 234, 224, 228,
- 224, 228, 488, 484, 224, 228, 224, 228, 224, 228,
- 105, 337, 224, 123, 227, 203, 235, 224, 224, 228,
- 224, 228, 224, 228, 224, 228, 325, 399, 430, 351,
- 410, 331, 224, 40, 63, 65, 108, 180, 181, 215,
- 283, 284, 224, 224, 302, 298, 375, 384, 224, 228,
- 284
+ 224, 228, 224, 228, 224, 224, 224, 224, 224, 124,
+ 227, 124, 224, 124, 227, 224, 224, 232, 232, 232,
+ 232, 232, 232, 232, 224, 224, 224, 92, 93, 324,
+ 325, 224, 224, 224, 224, 224, 224, 224, 224, 224,
+ 224, 9, 10, 11, 234, 235, 224, 224, 224, 224,
+ 224, 224, 224, 8, 199, 398, 399, 224, 224, 224,
+ 224, 224, 224, 224, 224, 224, 224, 224, 224, 129,
+ 429, 430, 224, 228, 224, 228, 224, 224, 13, 33,
+ 43, 49, 66, 97, 105, 142, 161, 208, 350, 351,
+ 224, 224, 224, 224, 224, 224, 129, 409, 410, 224,
+ 51, 194, 199, 330, 331, 224, 224, 171, 228, 335,
+ 224, 227, 282, 227, 225, 278, 224, 224, 4, 25,
+ 40, 47, 65, 94, 101, 113, 130, 131, 132, 181,
+ 191, 196, 202, 206, 209, 214, 220, 301, 302, 224,
+ 224, 224, 51, 173, 174, 175, 176, 177, 179, 180,
+ 182, 183, 184, 187, 189, 190, 191, 193, 195, 197,
+ 198, 201, 207, 297, 298, 224, 224, 224, 224, 247,
+ 249, 224, 65, 141, 172, 181, 187, 202, 204, 205,
+ 214, 220, 374, 375, 224, 224, 65, 141, 172, 181,
+ 187, 202, 204, 205, 214, 220, 383, 384, 224, 228,
+ 234, 234, 234, 224, 228, 224, 228, 488, 484, 224,
+ 228, 224, 228, 224, 228, 106, 337, 224, 124, 227,
+ 203, 235, 224, 224, 228, 224, 228, 224, 228, 224,
+ 228, 325, 399, 430, 351, 410, 331, 224, 40, 63,
+ 65, 109, 180, 181, 215, 283, 284, 224, 224, 302,
+ 298, 375, 384, 224, 228, 284
};
#define yyerrok (yyerrstatus = 0)
@@ -5018,10 +5015,10 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 1719 "conf_parser.y"
{
- if (IsChanPrefix(block_state.name.buf[0]))
- create_channel_resv(block_state.name.buf, block_state.rpass.buf);
- else if (block_state.name.buf[0])
- create_nick_resv(block_state.name.buf, block_state.rpass.buf);
+ if (conf_parser_ctx.pass != 2)
+ break;
+
+ create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
}
break;
@@ -5030,7 +5027,7 @@ yyreduce:
#line 1730 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
- strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
+ strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
}
break;
@@ -5039,7 +5036,7 @@ yyreduce:
#line 1736 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
- strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
+ strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
}
break;
@@ -5048,13 +5045,13 @@ yyreduce:
#line 1742 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
- strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
+ dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
}
break;
case 318:
/* Line 1787 of yacc.c */
-#line 1756 "conf_parser.y"
+#line 1757 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
{
@@ -5069,7 +5066,7 @@ yyreduce:
case 319:
/* Line 1787 of yacc.c */
-#line 1771 "conf_parser.y"
+#line 1772 "conf_parser.y"
{
if (conf_parser_ctx.pass != 2)
break;
@@ -5085,7 +5082,7 @@ yyreduce:
case 320:
/* Line 1787 of yacc.c */
-#line 1782 "conf_parser.y"
+#line 1783 "conf_parser.y"
{
struct MaskItem *conf = NULL;
@@ -5102,7 +5099,7 @@ yyreduce:
case 327:
/* Line 1787 of yacc.c */
-#line 1799 "conf_parser.y"
+#line 1800 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
@@ -5111,7 +5108,7 @@ yyreduce:
case 328:
/* Line 1787 of yacc.c */
-#line 1805 "conf_parser.y"
+#line 1806 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
{
@@ -5133,7 +5130,7 @@ yyreduce:
case 329:
/* Line 1787 of yacc.c */
-#line 1824 "conf_parser.y"
+#line 1825 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = 0;
@@ -5142,7 +5139,7 @@ yyreduce:
case 333:
/* Line 1787 of yacc.c */
-#line 1831 "conf_parser.y"
+#line 1832 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_KLINE;
@@ -5151,7 +5148,7 @@ yyreduce:
case 334:
/* Line 1787 of yacc.c */
-#line 1835 "conf_parser.y"
+#line 1836 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNKLINE;
@@ -5160,7 +5157,7 @@ yyreduce:
case 335:
/* Line 1787 of yacc.c */
-#line 1839 "conf_parser.y"
+#line 1840 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_DLINE;
@@ -5169,7 +5166,7 @@ yyreduce:
case 336:
/* Line 1787 of yacc.c */
-#line 1843 "conf_parser.y"
+#line 1844 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNDLINE;
@@ -5178,7 +5175,7 @@ yyreduce:
case 337:
/* Line 1787 of yacc.c */
-#line 1847 "conf_parser.y"
+#line 1848 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_XLINE;
@@ -5187,7 +5184,7 @@ yyreduce:
case 338:
/* Line 1787 of yacc.c */
-#line 1851 "conf_parser.y"
+#line 1852 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNXLINE;
@@ -5196,7 +5193,7 @@ yyreduce:
case 339:
/* Line 1787 of yacc.c */
-#line 1855 "conf_parser.y"
+#line 1856 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_RESV;
@@ -5205,7 +5202,7 @@ yyreduce:
case 340:
/* Line 1787 of yacc.c */
-#line 1859 "conf_parser.y"
+#line 1860 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNRESV;
@@ -5214,7 +5211,7 @@ yyreduce:
case 341:
/* Line 1787 of yacc.c */
-#line 1863 "conf_parser.y"
+#line 1864 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_LOCOPS;
@@ -5223,7 +5220,7 @@ yyreduce:
case 342:
/* Line 1787 of yacc.c */
-#line 1867 "conf_parser.y"
+#line 1868 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = SHARED_ALL;
@@ -5232,7 +5229,7 @@ yyreduce:
case 343:
/* Line 1787 of yacc.c */
-#line 1876 "conf_parser.y"
+#line 1877 "conf_parser.y"
{
if (conf_parser_ctx.pass != 2)
break;
@@ -5246,7 +5243,7 @@ yyreduce:
case 344:
/* Line 1787 of yacc.c */
-#line 1885 "conf_parser.y"
+#line 1886 "conf_parser.y"
{
struct MaskItem *conf = NULL;
@@ -5261,7 +5258,7 @@ yyreduce:
case 350:
/* Line 1787 of yacc.c */
-#line 1900 "conf_parser.y"
+#line 1901 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
@@ -5270,7 +5267,7 @@ yyreduce:
case 351:
/* Line 1787 of yacc.c */
-#line 1906 "conf_parser.y"
+#line 1907 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = 0;
@@ -5279,7 +5276,7 @@ yyreduce:
case 355:
/* Line 1787 of yacc.c */
-#line 1913 "conf_parser.y"
+#line 1914 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_KLINE;
@@ -5288,7 +5285,7 @@ yyreduce:
case 356:
/* Line 1787 of yacc.c */
-#line 1917 "conf_parser.y"
+#line 1918 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNKLINE;
@@ -5297,7 +5294,7 @@ yyreduce:
case 357:
/* Line 1787 of yacc.c */
-#line 1921 "conf_parser.y"
+#line 1922 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_DLINE;
@@ -5306,7 +5303,7 @@ yyreduce:
case 358:
/* Line 1787 of yacc.c */
-#line 1925 "conf_parser.y"
+#line 1926 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNDLINE;
@@ -5315,7 +5312,7 @@ yyreduce:
case 359:
/* Line 1787 of yacc.c */
-#line 1929 "conf_parser.y"
+#line 1930 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_XLINE;
@@ -5324,7 +5321,7 @@ yyreduce:
case 360:
/* Line 1787 of yacc.c */
-#line 1933 "conf_parser.y"
+#line 1934 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNXLINE;
@@ -5333,7 +5330,7 @@ yyreduce:
case 361:
/* Line 1787 of yacc.c */
-#line 1937 "conf_parser.y"
+#line 1938 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_RESV;
@@ -5342,7 +5339,7 @@ yyreduce:
case 362:
/* Line 1787 of yacc.c */
-#line 1941 "conf_parser.y"
+#line 1942 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_UNRESV;
@@ -5351,7 +5348,7 @@ yyreduce:
case 363:
/* Line 1787 of yacc.c */
-#line 1945 "conf_parser.y"
+#line 1946 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= SHARED_LOCOPS;
@@ -5360,7 +5357,7 @@ yyreduce:
case 364:
/* Line 1787 of yacc.c */
-#line 1949 "conf_parser.y"
+#line 1950 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value = SHARED_ALL;
@@ -5369,7 +5366,7 @@ yyreduce:
case 365:
/* Line 1787 of yacc.c */
-#line 1958 "conf_parser.y"
+#line 1959 "conf_parser.y"
{
if (conf_parser_ctx.pass != 2)
@@ -5382,7 +5379,7 @@ yyreduce:
case 366:
/* Line 1787 of yacc.c */
-#line 1966 "conf_parser.y"
+#line 1967 "conf_parser.y"
{
struct MaskItem *conf = NULL;
struct addrinfo hints, *res;
@@ -5443,7 +5440,7 @@ yyreduce:
case 383:
/* Line 1787 of yacc.c */
-#line 2032 "conf_parser.y"
+#line 2033 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
@@ -5452,7 +5449,7 @@ yyreduce:
case 384:
/* Line 1787 of yacc.c */
-#line 2038 "conf_parser.y"
+#line 2039 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
@@ -5461,7 +5458,7 @@ yyreduce:
case 385:
/* Line 1787 of yacc.c */
-#line 2044 "conf_parser.y"
+#line 2045 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
@@ -5470,7 +5467,7 @@ yyreduce:
case 386:
/* Line 1787 of yacc.c */
-#line 2050 "conf_parser.y"
+#line 2051 "conf_parser.y"
{
if (conf_parser_ctx.pass != 2)
break;
@@ -5486,7 +5483,7 @@ yyreduce:
case 387:
/* Line 1787 of yacc.c */
-#line 2063 "conf_parser.y"
+#line 2064 "conf_parser.y"
{
if (conf_parser_ctx.pass != 2)
break;
@@ -5502,7 +5499,7 @@ yyreduce:
case 388:
/* Line 1787 of yacc.c */
-#line 2076 "conf_parser.y"
+#line 2077 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.port.value = (yyvsp[(3) - (4)].number);
@@ -5511,7 +5508,7 @@ yyreduce:
case 389:
/* Line 1787 of yacc.c */
-#line 2082 "conf_parser.y"
+#line 2083 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.aftype.value = AF_INET;
@@ -5520,7 +5517,7 @@ yyreduce:
case 390:
/* Line 1787 of yacc.c */
-#line 2086 "conf_parser.y"
+#line 2087 "conf_parser.y"
{
#ifdef IPV6
if (conf_parser_ctx.pass == 2)
@@ -5531,7 +5528,7 @@ yyreduce:
case 391:
/* Line 1787 of yacc.c */
-#line 2094 "conf_parser.y"
+#line 2095 "conf_parser.y"
{
block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
}
@@ -5539,7 +5536,7 @@ yyreduce:
case 395:
/* Line 1787 of yacc.c */
-#line 2100 "conf_parser.y"
+#line 2101 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
@@ -5548,7 +5545,7 @@ yyreduce:
case 396:
/* Line 1787 of yacc.c */
-#line 2104 "conf_parser.y"
+#line 2105 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.flags.value |= CONF_FLAGS_SSL;
@@ -5557,7 +5554,7 @@ yyreduce:
case 397:
/* Line 1787 of yacc.c */
-#line 2110 "conf_parser.y"
+#line 2111 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
{
@@ -5571,7 +5568,7 @@ yyreduce:
case 398:
/* Line 1787 of yacc.c */
-#line 2121 "conf_parser.y"
+#line 2122 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
@@ -5580,7 +5577,7 @@ yyreduce:
case 399:
/* Line 1787 of yacc.c */
-#line 2127 "conf_parser.y"
+#line 2128 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
@@ -5589,7 +5586,7 @@ yyreduce:
case 400:
/* Line 1787 of yacc.c */
-#line 2133 "conf_parser.y"
+#line 2134 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
@@ -5598,7 +5595,7 @@ yyreduce:
case 401:
/* Line 1787 of yacc.c */
-#line 2139 "conf_parser.y"
+#line 2140 "conf_parser.y"
{
#ifdef HAVE_LIBCRYPTO
if (conf_parser_ctx.pass == 2)
@@ -5612,7 +5609,7 @@ yyreduce:
case 402:
/* Line 1787 of yacc.c */
-#line 2154 "conf_parser.y"
+#line 2155 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
@@ -5621,7 +5618,7 @@ yyreduce:
case 403:
/* Line 1787 of yacc.c */
-#line 2158 "conf_parser.y"
+#line 2159 "conf_parser.y"
{
struct MaskItem *conf = NULL;
@@ -5682,7 +5679,7 @@ yyreduce:
case 404:
/* Line 1787 of yacc.c */
-#line 2216 "conf_parser.y"
+#line 2217 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.port.value = 0;
@@ -5691,7 +5688,7 @@ yyreduce:
case 408:
/* Line 1787 of yacc.c */
-#line 2223 "conf_parser.y"
+#line 2224 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.port.value = 1;
@@ -5700,7 +5697,7 @@ yyreduce:
case 415:
/* Line 1787 of yacc.c */
-#line 2232 "conf_parser.y"
+#line 2233 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
@@ -5723,7 +5720,7 @@ yyreduce:
case 416:
/* Line 1787 of yacc.c */
-#line 2252 "conf_parser.y"
+#line 2253 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
@@ -5732,7 +5729,7 @@ yyreduce:
case 417:
/* Line 1787 of yacc.c */
-#line 2261 "conf_parser.y"
+#line 2262 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
@@ -5741,7 +5738,7 @@ yyreduce:
case 418:
/* Line 1787 of yacc.c */
-#line 2265 "conf_parser.y"
+#line 2266 "conf_parser.y"
{
struct MaskItem *conf = NULL;
@@ -5767,7 +5764,7 @@ yyreduce:
case 424:
/* Line 1787 of yacc.c */
-#line 2291 "conf_parser.y"
+#line 2292 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
@@ -5776,7 +5773,7 @@ yyreduce:
case 425:
/* Line 1787 of yacc.c */
-#line 2297 "conf_parser.y"
+#line 2298 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
@@ -5785,7 +5782,7 @@ yyreduce:
case 431:
/* Line 1787 of yacc.c */
-#line 2311 "conf_parser.y"
+#line 2312 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
{
@@ -5802,7 +5799,7 @@ yyreduce:
case 432:
/* Line 1787 of yacc.c */
-#line 2328 "conf_parser.y"
+#line 2329 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
reset_block_state();
@@ -5811,7 +5808,7 @@ yyreduce:
case 433:
/* Line 1787 of yacc.c */
-#line 2332 "conf_parser.y"
+#line 2333 "conf_parser.y"
{
struct MaskItem *conf = NULL;
@@ -5855,7 +5852,7 @@ yyreduce:
case 434:
/* Line 1787 of yacc.c */
-#line 2373 "conf_parser.y"
+#line 2374 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.port.value = 0;
@@ -5864,7 +5861,7 @@ yyreduce:
case 438:
/* Line 1787 of yacc.c */
-#line 2380 "conf_parser.y"
+#line 2381 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
block_state.port.value = 1;
@@ -5873,7 +5870,7 @@ yyreduce:
case 445:
/* Line 1787 of yacc.c */
-#line 2389 "conf_parser.y"
+#line 2390 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
@@ -5882,7 +5879,7 @@ yyreduce:
case 446:
/* Line 1787 of yacc.c */
-#line 2395 "conf_parser.y"
+#line 2396 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
@@ -5891,7 +5888,7 @@ yyreduce:
case 499:
/* Line 1787 of yacc.c */
-#line 2439 "conf_parser.y"
+#line 2440 "conf_parser.y"
{
ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number);
}
@@ -5899,7 +5896,7 @@ yyreduce:
case 500:
/* Line 1787 of yacc.c */
-#line 2444 "conf_parser.y"
+#line 2445 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.glines = yylval.number;
@@ -5908,7 +5905,7 @@ yyreduce:
case 501:
/* Line 1787 of yacc.c */
-#line 2450 "conf_parser.y"
+#line 2451 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
@@ -5917,7 +5914,7 @@ yyreduce:
case 502:
/* Line 1787 of yacc.c */
-#line 2456 "conf_parser.y"
+#line 2457 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number);
@@ -5926,7 +5923,7 @@ yyreduce:
case 503:
/* Line 1787 of yacc.c */
-#line 2462 "conf_parser.y"
+#line 2463 "conf_parser.y"
{
ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
}
@@ -5934,7 +5931,7 @@ yyreduce:
case 504:
/* Line 1787 of yacc.c */
-#line 2467 "conf_parser.y"
+#line 2468 "conf_parser.y"
{
ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
}
@@ -5942,7 +5939,7 @@ yyreduce:
case 505:
/* Line 1787 of yacc.c */
-#line 2472 "conf_parser.y"
+#line 2473 "conf_parser.y"
{
ConfigFileEntry.tkline_expire_notices = yylval.number;
}
@@ -5950,7 +5947,7 @@ yyreduce:
case 506:
/* Line 1787 of yacc.c */
-#line 2477 "conf_parser.y"
+#line 2478 "conf_parser.y"
{
ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
}
@@ -5958,7 +5955,7 @@ yyreduce:
case 507:
/* Line 1787 of yacc.c */
-#line 2482 "conf_parser.y"
+#line 2483 "conf_parser.y"
{
ConfigFileEntry.hide_spoof_ips = yylval.number;
}
@@ -5966,7 +5963,7 @@ yyreduce:
case 508:
/* Line 1787 of yacc.c */
-#line 2487 "conf_parser.y"
+#line 2488 "conf_parser.y"
{
ConfigFileEntry.ignore_bogus_ts = yylval.number;
}
@@ -5974,7 +5971,7 @@ yyreduce:
case 509:
/* Line 1787 of yacc.c */
-#line 2492 "conf_parser.y"
+#line 2493 "conf_parser.y"
{
ConfigFileEntry.disable_remote = yylval.number;
}
@@ -5982,7 +5979,7 @@ yyreduce:
case 510:
/* Line 1787 of yacc.c */
-#line 2497 "conf_parser.y"
+#line 2498 "conf_parser.y"
{
ConfigFileEntry.failed_oper_notice = yylval.number;
}
@@ -5990,7 +5987,7 @@ yyreduce:
case 511:
/* Line 1787 of yacc.c */
-#line 2502 "conf_parser.y"
+#line 2503 "conf_parser.y"
{
ConfigFileEntry.anti_nick_flood = yylval.number;
}
@@ -5998,7 +5995,7 @@ yyreduce:
case 512:
/* Line 1787 of yacc.c */
-#line 2507 "conf_parser.y"
+#line 2508 "conf_parser.y"
{
ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number);
}
@@ -6006,7 +6003,7 @@ yyreduce:
case 513:
/* Line 1787 of yacc.c */
-#line 2512 "conf_parser.y"
+#line 2513 "conf_parser.y"
{
ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
}
@@ -6014,7 +6011,7 @@ yyreduce:
case 514:
/* Line 1787 of yacc.c */
-#line 2517 "conf_parser.y"
+#line 2518 "conf_parser.y"
{
ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
}
@@ -6022,7 +6019,7 @@ yyreduce:
case 515:
/* Line 1787 of yacc.c */
-#line 2522 "conf_parser.y"
+#line 2523 "conf_parser.y"
{
ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
}
@@ -6030,7 +6027,7 @@ yyreduce:
case 516:
/* Line 1787 of yacc.c */
-#line 2527 "conf_parser.y"
+#line 2528 "conf_parser.y"
{
ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
}
@@ -6038,7 +6035,7 @@ yyreduce:
case 517:
/* Line 1787 of yacc.c */
-#line 2532 "conf_parser.y"
+#line 2533 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
@@ -6047,7 +6044,7 @@ yyreduce:
case 518:
/* Line 1787 of yacc.c */
-#line 2538 "conf_parser.y"
+#line 2539 "conf_parser.y"
{
if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1)
{
@@ -6061,7 +6058,7 @@ yyreduce:
case 519:
/* Line 1787 of yacc.c */
-#line 2549 "conf_parser.y"
+#line 2550 "conf_parser.y"
{
ConfigFileEntry.invisible_on_connect = yylval.number;
}
@@ -6069,7 +6066,7 @@ yyreduce:
case 520:
/* Line 1787 of yacc.c */
-#line 2554 "conf_parser.y"
+#line 2555 "conf_parser.y"
{
ConfigFileEntry.warn_no_nline = yylval.number;
}
@@ -6077,7 +6074,7 @@ yyreduce:
case 521:
/* Line 1787 of yacc.c */
-#line 2559 "conf_parser.y"
+#line 2560 "conf_parser.y"
{
ConfigFileEntry.stats_e_disabled = yylval.number;
}
@@ -6085,7 +6082,7 @@ yyreduce:
case 522:
/* Line 1787 of yacc.c */
-#line 2564 "conf_parser.y"
+#line 2565 "conf_parser.y"
{
ConfigFileEntry.stats_o_oper_only = yylval.number;
}
@@ -6093,7 +6090,7 @@ yyreduce:
case 523:
/* Line 1787 of yacc.c */
-#line 2569 "conf_parser.y"
+#line 2570 "conf_parser.y"
{
ConfigFileEntry.stats_P_oper_only = yylval.number;
}
@@ -6101,7 +6098,7 @@ yyreduce:
case 524:
/* Line 1787 of yacc.c */
-#line 2574 "conf_parser.y"
+#line 2575 "conf_parser.y"
{
ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
}
@@ -6109,7 +6106,7 @@ yyreduce:
case 525:
/* Line 1787 of yacc.c */
-#line 2577 "conf_parser.y"
+#line 2578 "conf_parser.y"
{
ConfigFileEntry.stats_k_oper_only = 1;
}
@@ -6117,7 +6114,7 @@ yyreduce:
case 526:
/* Line 1787 of yacc.c */
-#line 2582 "conf_parser.y"
+#line 2583 "conf_parser.y"
{
ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
}
@@ -6125,7 +6122,7 @@ yyreduce:
case 527:
/* Line 1787 of yacc.c */
-#line 2585 "conf_parser.y"
+#line 2586 "conf_parser.y"
{
ConfigFileEntry.stats_i_oper_only = 1;
}
@@ -6133,7 +6130,7 @@ yyreduce:
case 528:
/* Line 1787 of yacc.c */
-#line 2590 "conf_parser.y"
+#line 2591 "conf_parser.y"
{
ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
}
@@ -6141,7 +6138,7 @@ yyreduce:
case 529:
/* Line 1787 of yacc.c */
-#line 2595 "conf_parser.y"
+#line 2596 "conf_parser.y"
{
ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
}
@@ -6149,7 +6146,7 @@ yyreduce:
case 530:
/* Line 1787 of yacc.c */
-#line 2600 "conf_parser.y"
+#line 2601 "conf_parser.y"
{
ConfigFileEntry.opers_bypass_callerid = yylval.number;
}
@@ -6157,7 +6154,7 @@ yyreduce:
case 531:
/* Line 1787 of yacc.c */
-#line 2605 "conf_parser.y"
+#line 2606 "conf_parser.y"
{
ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
}
@@ -6165,7 +6162,7 @@ yyreduce:
case 532:
/* Line 1787 of yacc.c */
-#line 2610 "conf_parser.y"
+#line 2611 "conf_parser.y"
{
ConfigFileEntry.short_motd = yylval.number;
}
@@ -6173,7 +6170,7 @@ yyreduce:
case 533:
/* Line 1787 of yacc.c */
-#line 2615 "conf_parser.y"
+#line 2616 "conf_parser.y"
{
ConfigFileEntry.no_oper_flood = yylval.number;
}
@@ -6181,7 +6178,7 @@ yyreduce:
case 534:
/* Line 1787 of yacc.c */
-#line 2620 "conf_parser.y"
+#line 2621 "conf_parser.y"
{
ConfigFileEntry.true_no_oper_flood = yylval.number;
}
@@ -6189,7 +6186,7 @@ yyreduce:
case 535:
/* Line 1787 of yacc.c */
-#line 2625 "conf_parser.y"
+#line 2626 "conf_parser.y"
{
ConfigFileEntry.oper_pass_resv = yylval.number;
}
@@ -6197,7 +6194,7 @@ yyreduce:
case 536:
/* Line 1787 of yacc.c */
-#line 2630 "conf_parser.y"
+#line 2631 "conf_parser.y"
{
ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
}
@@ -6205,7 +6202,7 @@ yyreduce:
case 537:
/* Line 1787 of yacc.c */
-#line 2635 "conf_parser.y"
+#line 2636 "conf_parser.y"
{
ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
}
@@ -6213,7 +6210,7 @@ yyreduce:
case 538:
/* Line 1787 of yacc.c */
-#line 2640 "conf_parser.y"
+#line 2641 "conf_parser.y"
{
ConfigFileEntry.use_egd = yylval.number;
}
@@ -6221,7 +6218,7 @@ yyreduce:
case 539:
/* Line 1787 of yacc.c */
-#line 2645 "conf_parser.y"
+#line 2646 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
{
@@ -6233,7 +6230,7 @@ yyreduce:
case 540:
/* Line 1787 of yacc.c */
-#line 2654 "conf_parser.y"
+#line 2655 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
{
@@ -6245,7 +6242,7 @@ yyreduce:
case 541:
/* Line 1787 of yacc.c */
-#line 2663 "conf_parser.y"
+#line 2664 "conf_parser.y"
{
ConfigFileEntry.ping_cookie = yylval.number;
}
@@ -6253,7 +6250,7 @@ yyreduce:
case 542:
/* Line 1787 of yacc.c */
-#line 2668 "conf_parser.y"
+#line 2669 "conf_parser.y"
{
ConfigFileEntry.disable_auth = yylval.number;
}
@@ -6261,7 +6258,7 @@ yyreduce:
case 543:
/* Line 1787 of yacc.c */
-#line 2673 "conf_parser.y"
+#line 2674 "conf_parser.y"
{
ConfigFileEntry.throttle_time = yylval.number;
}
@@ -6269,7 +6266,7 @@ yyreduce:
case 544:
/* Line 1787 of yacc.c */
-#line 2678 "conf_parser.y"
+#line 2679 "conf_parser.y"
{
ConfigFileEntry.oper_umodes = 0;
}
@@ -6277,7 +6274,7 @@ yyreduce:
case 548:
/* Line 1787 of yacc.c */
-#line 2684 "conf_parser.y"
+#line 2685 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_BOTS;
}
@@ -6285,7 +6282,7 @@ yyreduce:
case 549:
/* Line 1787 of yacc.c */
-#line 2687 "conf_parser.y"
+#line 2688 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_CCONN;
}
@@ -6293,7 +6290,7 @@ yyreduce:
case 550:
/* Line 1787 of yacc.c */
-#line 2690 "conf_parser.y"
+#line 2691 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
}
@@ -6301,7 +6298,7 @@ yyreduce:
case 551:
/* Line 1787 of yacc.c */
-#line 2693 "conf_parser.y"
+#line 2694 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_DEAF;
}
@@ -6309,7 +6306,7 @@ yyreduce:
case 552:
/* Line 1787 of yacc.c */
-#line 2696 "conf_parser.y"
+#line 2697 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
}
@@ -6317,7 +6314,7 @@ yyreduce:
case 553:
/* Line 1787 of yacc.c */
-#line 2699 "conf_parser.y"
+#line 2700 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_FULL;
}
@@ -6325,7 +6322,7 @@ yyreduce:
case 554:
/* Line 1787 of yacc.c */
-#line 2702 "conf_parser.y"
+#line 2703 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
}
@@ -6333,7 +6330,7 @@ yyreduce:
case 555:
/* Line 1787 of yacc.c */
-#line 2705 "conf_parser.y"
+#line 2706 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_SKILL;
}
@@ -6341,7 +6338,7 @@ yyreduce:
case 556:
/* Line 1787 of yacc.c */
-#line 2708 "conf_parser.y"
+#line 2709 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
}
@@ -6349,7 +6346,7 @@ yyreduce:
case 557:
/* Line 1787 of yacc.c */
-#line 2711 "conf_parser.y"
+#line 2712 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_REJ;
}
@@ -6357,7 +6354,7 @@ yyreduce:
case 558:
/* Line 1787 of yacc.c */
-#line 2714 "conf_parser.y"
+#line 2715 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
}
@@ -6365,7 +6362,7 @@ yyreduce:
case 559:
/* Line 1787 of yacc.c */
-#line 2717 "conf_parser.y"
+#line 2718 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_SPY;
}
@@ -6373,7 +6370,7 @@ yyreduce:
case 560:
/* Line 1787 of yacc.c */
-#line 2720 "conf_parser.y"
+#line 2721 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
}
@@ -6381,7 +6378,7 @@ yyreduce:
case 561:
/* Line 1787 of yacc.c */
-#line 2723 "conf_parser.y"
+#line 2724 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
}
@@ -6389,7 +6386,7 @@ yyreduce:
case 562:
/* Line 1787 of yacc.c */
-#line 2726 "conf_parser.y"
+#line 2727 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
}
@@ -6397,7 +6394,7 @@ yyreduce:
case 563:
/* Line 1787 of yacc.c */
-#line 2729 "conf_parser.y"
+#line 2730 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
}
@@ -6405,7 +6402,7 @@ yyreduce:
case 564:
/* Line 1787 of yacc.c */
-#line 2732 "conf_parser.y"
+#line 2733 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
}
@@ -6413,7 +6410,7 @@ yyreduce:
case 565:
/* Line 1787 of yacc.c */
-#line 2735 "conf_parser.y"
+#line 2736 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
}
@@ -6421,7 +6418,7 @@ yyreduce:
case 566:
/* Line 1787 of yacc.c */
-#line 2738 "conf_parser.y"
+#line 2739 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
}
@@ -6429,7 +6426,7 @@ yyreduce:
case 567:
/* Line 1787 of yacc.c */
-#line 2741 "conf_parser.y"
+#line 2742 "conf_parser.y"
{
ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
}
@@ -6437,7 +6434,7 @@ yyreduce:
case 568:
/* Line 1787 of yacc.c */
-#line 2746 "conf_parser.y"
+#line 2747 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes = 0;
}
@@ -6445,7 +6442,7 @@ yyreduce:
case 572:
/* Line 1787 of yacc.c */
-#line 2752 "conf_parser.y"
+#line 2753 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
}
@@ -6453,7 +6450,7 @@ yyreduce:
case 573:
/* Line 1787 of yacc.c */
-#line 2755 "conf_parser.y"
+#line 2756 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
}
@@ -6461,7 +6458,7 @@ yyreduce:
case 574:
/* Line 1787 of yacc.c */
-#line 2758 "conf_parser.y"
+#line 2759 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
}
@@ -6469,7 +6466,7 @@ yyreduce:
case 575:
/* Line 1787 of yacc.c */
-#line 2761 "conf_parser.y"
+#line 2762 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
}
@@ -6477,7 +6474,7 @@ yyreduce:
case 576:
/* Line 1787 of yacc.c */
-#line 2764 "conf_parser.y"
+#line 2765 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
}
@@ -6485,7 +6482,7 @@ yyreduce:
case 577:
/* Line 1787 of yacc.c */
-#line 2767 "conf_parser.y"
+#line 2768 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
}
@@ -6493,7 +6490,7 @@ yyreduce:
case 578:
/* Line 1787 of yacc.c */
-#line 2770 "conf_parser.y"
+#line 2771 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
}
@@ -6501,7 +6498,7 @@ yyreduce:
case 579:
/* Line 1787 of yacc.c */
-#line 2773 "conf_parser.y"
+#line 2774 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
}
@@ -6509,7 +6506,7 @@ yyreduce:
case 580:
/* Line 1787 of yacc.c */
-#line 2776 "conf_parser.y"
+#line 2777 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
}
@@ -6517,7 +6514,7 @@ yyreduce:
case 581:
/* Line 1787 of yacc.c */
-#line 2779 "conf_parser.y"
+#line 2780 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
}
@@ -6525,7 +6522,7 @@ yyreduce:
case 582:
/* Line 1787 of yacc.c */
-#line 2782 "conf_parser.y"
+#line 2783 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
}
@@ -6533,7 +6530,7 @@ yyreduce:
case 583:
/* Line 1787 of yacc.c */
-#line 2785 "conf_parser.y"
+#line 2786 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
}
@@ -6541,7 +6538,7 @@ yyreduce:
case 584:
/* Line 1787 of yacc.c */
-#line 2788 "conf_parser.y"
+#line 2789 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
}
@@ -6549,7 +6546,7 @@ yyreduce:
case 585:
/* Line 1787 of yacc.c */
-#line 2791 "conf_parser.y"
+#line 2792 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
}
@@ -6557,7 +6554,7 @@ yyreduce:
case 586:
/* Line 1787 of yacc.c */
-#line 2794 "conf_parser.y"
+#line 2795 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
}
@@ -6565,7 +6562,7 @@ yyreduce:
case 587:
/* Line 1787 of yacc.c */
-#line 2797 "conf_parser.y"
+#line 2798 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
}
@@ -6573,7 +6570,7 @@ yyreduce:
case 588:
/* Line 1787 of yacc.c */
-#line 2800 "conf_parser.y"
+#line 2801 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
}
@@ -6581,7 +6578,7 @@ yyreduce:
case 589:
/* Line 1787 of yacc.c */
-#line 2803 "conf_parser.y"
+#line 2804 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
}
@@ -6589,7 +6586,7 @@ yyreduce:
case 590:
/* Line 1787 of yacc.c */
-#line 2806 "conf_parser.y"
+#line 2807 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
}
@@ -6597,7 +6594,7 @@ yyreduce:
case 591:
/* Line 1787 of yacc.c */
-#line 2809 "conf_parser.y"
+#line 2810 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
}
@@ -6605,7 +6602,7 @@ yyreduce:
case 592:
/* Line 1787 of yacc.c */
-#line 2812 "conf_parser.y"
+#line 2813 "conf_parser.y"
{
ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
}
@@ -6613,7 +6610,7 @@ yyreduce:
case 593:
/* Line 1787 of yacc.c */
-#line 2817 "conf_parser.y"
+#line 2818 "conf_parser.y"
{
ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
}
@@ -6621,7 +6618,7 @@ yyreduce:
case 594:
/* Line 1787 of yacc.c */
-#line 2822 "conf_parser.y"
+#line 2823 "conf_parser.y"
{
ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
}
@@ -6629,154 +6626,146 @@ yyreduce:
case 595:
/* Line 1787 of yacc.c */
-#line 2827 "conf_parser.y"
+#line 2828 "conf_parser.y"
{
ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
}
break;
- case 614:
+ case 613:
/* Line 1787 of yacc.c */
-#line 2850 "conf_parser.y"
+#line 2851 "conf_parser.y"
{
ConfigChannel.disable_fake_channels = yylval.number;
}
break;
- case 615:
-/* Line 1787 of yacc.c */
-#line 2855 "conf_parser.y"
- {
- ConfigChannel.restrict_channels = yylval.number;
-}
- break;
-
- case 616:
+ case 614:
/* Line 1787 of yacc.c */
-#line 2860 "conf_parser.y"
+#line 2856 "conf_parser.y"
{
ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
}
break;
- case 617:
+ case 615:
/* Line 1787 of yacc.c */
-#line 2865 "conf_parser.y"
+#line 2861 "conf_parser.y"
{
ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
}
break;
- case 618:
+ case 616:
/* Line 1787 of yacc.c */
-#line 2870 "conf_parser.y"
+#line 2866 "conf_parser.y"
{
ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
}
break;
- case 619:
+ case 617:
/* Line 1787 of yacc.c */
-#line 2875 "conf_parser.y"
+#line 2871 "conf_parser.y"
{
ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number);
}
break;
- case 620:
+ case 618:
/* Line 1787 of yacc.c */
-#line 2880 "conf_parser.y"
+#line 2876 "conf_parser.y"
{
ConfigChannel.quiet_on_ban = yylval.number;
}
break;
- case 621:
+ case 619:
/* Line 1787 of yacc.c */
-#line 2885 "conf_parser.y"
+#line 2881 "conf_parser.y"
{
ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
}
break;
- case 622:
+ case 620:
/* Line 1787 of yacc.c */
-#line 2890 "conf_parser.y"
+#line 2886 "conf_parser.y"
{
ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
}
break;
- case 623:
+ case 621:
/* Line 1787 of yacc.c */
-#line 2895 "conf_parser.y"
+#line 2891 "conf_parser.y"
{
ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
}
break;
- case 624:
+ case 622:
/* Line 1787 of yacc.c */
-#line 2900 "conf_parser.y"
+#line 2896 "conf_parser.y"
{
ConfigChannel.no_create_on_split = yylval.number;
}
break;
- case 625:
+ case 623:
/* Line 1787 of yacc.c */
-#line 2905 "conf_parser.y"
+#line 2901 "conf_parser.y"
{
ConfigChannel.no_join_on_split = yylval.number;
}
break;
- case 626:
+ case 624:
/* Line 1787 of yacc.c */
-#line 2910 "conf_parser.y"
+#line 2906 "conf_parser.y"
{
GlobalSetOptions.joinfloodcount = yylval.number;
}
break;
- case 627:
+ case 625:
/* Line 1787 of yacc.c */
-#line 2915 "conf_parser.y"
+#line 2911 "conf_parser.y"
{
GlobalSetOptions.joinfloodtime = yylval.number;
}
break;
- case 639:
+ case 637:
/* Line 1787 of yacc.c */
-#line 2934 "conf_parser.y"
+#line 2930 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.flatten_links = yylval.number;
}
break;
- case 640:
+ case 638:
/* Line 1787 of yacc.c */
-#line 2940 "conf_parser.y"
+#line 2936 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_servers = yylval.number;
}
break;
- case 641:
+ case 639:
/* Line 1787 of yacc.c */
-#line 2946 "conf_parser.y"
+#line 2942 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_services = yylval.number;
}
break;
- case 642:
+ case 640:
/* Line 1787 of yacc.c */
-#line 2952 "conf_parser.y"
+#line 2948 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
{
@@ -6786,9 +6775,9 @@ yyreduce:
}
break;
- case 643:
+ case 641:
/* Line 1787 of yacc.c */
-#line 2961 "conf_parser.y"
+#line 2957 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
{
@@ -6803,18 +6792,18 @@ yyreduce:
}
break;
- case 644:
+ case 642:
/* Line 1787 of yacc.c */
-#line 2975 "conf_parser.y"
+#line 2971 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hidden = yylval.number;
}
break;
- case 645:
+ case 643:
/* Line 1787 of yacc.c */
-#line 2981 "conf_parser.y"
+#line 2977 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_server_ips = yylval.number;
@@ -6823,7 +6812,7 @@ yyreduce:
/* Line 1787 of yacc.c */
-#line 6827 "conf_parser.c"
+#line 6816 "conf_parser.c"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
diff --git a/src/conf_parser.h b/src/conf_parser.h
index eb3bb45..7a056d5 100644
--- a/src/conf_parser.h
+++ b/src/conf_parser.h
@@ -116,66 +116,66 @@ extern int yydebug;
LINKS_DELAY = 325,
LISTEN = 326,
T_LOG = 327,
- MAX_ACCEPT = 328,
- MAX_BANS = 329,
- MAX_CHANS_PER_OPER = 330,
- MAX_CHANS_PER_USER = 331,
- MAX_GLOBAL = 332,
- MAX_IDENT = 333,
- MAX_LOCAL = 334,
- MAX_NICK_CHANGES = 335,
- MAX_NICK_LENGTH = 336,
- MAX_NICK_TIME = 337,
- MAX_NUMBER = 338,
- MAX_TARGETS = 339,
- MAX_TOPIC_LENGTH = 340,
- MAX_WATCH = 341,
- MIN_NONWILDCARD = 342,
- MIN_NONWILDCARD_SIMPLE = 343,
- MIN_IDLE = 344,
- MAX_IDLE = 345,
- RANDOM_IDLE = 346,
- HIDE_IDLE_FROM_OPERS = 347,
- MODULE = 348,
- MODULES = 349,
- NAME = 350,
- NEED_PASSWORD = 351,
- NETWORK_DESC = 352,
- NETWORK_NAME = 353,
- NICK = 354,
- NICK_CHANGES = 355,
- NO_CREATE_ON_SPLIT = 356,
- NO_JOIN_ON_SPLIT = 357,
- NO_OPER_FLOOD = 358,
- NO_TILDE = 359,
- NUMBER = 360,
- NUMBER_PER_CIDR = 361,
- NUMBER_PER_IP = 362,
- OPERATOR = 363,
- OPERS_BYPASS_CALLERID = 364,
- OPER_ONLY_UMODES = 365,
- OPER_PASS_RESV = 366,
- OPER_SPY_T = 367,
- OPER_UMODES = 368,
- JOIN_FLOOD_COUNT = 369,
- JOIN_FLOOD_TIME = 370,
- PACE_WAIT = 371,
- PACE_WAIT_SIMPLE = 372,
- PASSWORD = 373,
- PATH = 374,
- PING_COOKIE = 375,
- PING_TIME = 376,
- PORT = 377,
- QSTRING = 378,
- QUIET_ON_BAN = 379,
- REASON = 380,
- REDIRPORT = 381,
- REDIRSERV = 382,
- REGEX_T = 383,
- REHASH = 384,
- REMOTE = 385,
- REMOTEBAN = 386,
- RESTRICT_CHANNELS = 387,
+ MASK = 328,
+ MAX_ACCEPT = 329,
+ MAX_BANS = 330,
+ MAX_CHANS_PER_OPER = 331,
+ MAX_CHANS_PER_USER = 332,
+ MAX_GLOBAL = 333,
+ MAX_IDENT = 334,
+ MAX_LOCAL = 335,
+ MAX_NICK_CHANGES = 336,
+ MAX_NICK_LENGTH = 337,
+ MAX_NICK_TIME = 338,
+ MAX_NUMBER = 339,
+ MAX_TARGETS = 340,
+ MAX_TOPIC_LENGTH = 341,
+ MAX_WATCH = 342,
+ MIN_NONWILDCARD = 343,
+ MIN_NONWILDCARD_SIMPLE = 344,
+ MIN_IDLE = 345,
+ MAX_IDLE = 346,
+ RANDOM_IDLE = 347,
+ HIDE_IDLE_FROM_OPERS = 348,
+ MODULE = 349,
+ MODULES = 350,
+ NAME = 351,
+ NEED_PASSWORD = 352,
+ NETWORK_DESC = 353,
+ NETWORK_NAME = 354,
+ NICK = 355,
+ NICK_CHANGES = 356,
+ NO_CREATE_ON_SPLIT = 357,
+ NO_JOIN_ON_SPLIT = 358,
+ NO_OPER_FLOOD = 359,
+ NO_TILDE = 360,
+ NUMBER = 361,
+ NUMBER_PER_CIDR = 362,
+ NUMBER_PER_IP = 363,
+ OPERATOR = 364,
+ OPERS_BYPASS_CALLERID = 365,
+ OPER_ONLY_UMODES = 366,
+ OPER_PASS_RESV = 367,
+ OPER_SPY_T = 368,
+ OPER_UMODES = 369,
+ JOIN_FLOOD_COUNT = 370,
+ JOIN_FLOOD_TIME = 371,
+ PACE_WAIT = 372,
+ PACE_WAIT_SIMPLE = 373,
+ PASSWORD = 374,
+ PATH = 375,
+ PING_COOKIE = 376,
+ PING_TIME = 377,
+ PORT = 378,
+ QSTRING = 379,
+ QUIET_ON_BAN = 380,
+ REASON = 381,
+ REDIRPORT = 382,
+ REDIRSERV = 383,
+ REGEX_T = 384,
+ REHASH = 385,
+ REMOTE = 386,
+ REMOTEBAN = 387,
RSA_PRIVATE_KEY_FILE = 388,
RSA_PUBLIC_KEY_FILE = 389,
SSL_CERTIFICATE_FILE = 390,
@@ -340,66 +340,66 @@ extern int yydebug;
#define LINKS_DELAY 325
#define LISTEN 326
#define T_LOG 327
-#define MAX_ACCEPT 328
-#define MAX_BANS 329
-#define MAX_CHANS_PER_OPER 330
-#define MAX_CHANS_PER_USER 331
-#define MAX_GLOBAL 332
-#define MAX_IDENT 333
-#define MAX_LOCAL 334
-#define MAX_NICK_CHANGES 335
-#define MAX_NICK_LENGTH 336
-#define MAX_NICK_TIME 337
-#define MAX_NUMBER 338
-#define MAX_TARGETS 339
-#define MAX_TOPIC_LENGTH 340
-#define MAX_WATCH 341
-#define MIN_NONWILDCARD 342
-#define MIN_NONWILDCARD_SIMPLE 343
-#define MIN_IDLE 344
-#define MAX_IDLE 345
-#define RANDOM_IDLE 346
-#define HIDE_IDLE_FROM_OPERS 347
-#define MODULE 348
-#define MODULES 349
-#define NAME 350
-#define NEED_PASSWORD 351
-#define NETWORK_DESC 352
-#define NETWORK_NAME 353
-#define NICK 354
-#define NICK_CHANGES 355
-#define NO_CREATE_ON_SPLIT 356
-#define NO_JOIN_ON_SPLIT 357
-#define NO_OPER_FLOOD 358
-#define NO_TILDE 359
-#define NUMBER 360
-#define NUMBER_PER_CIDR 361
-#define NUMBER_PER_IP 362
-#define OPERATOR 363
-#define OPERS_BYPASS_CALLERID 364
-#define OPER_ONLY_UMODES 365
-#define OPER_PASS_RESV 366
-#define OPER_SPY_T 367
-#define OPER_UMODES 368
-#define JOIN_FLOOD_COUNT 369
-#define JOIN_FLOOD_TIME 370
-#define PACE_WAIT 371
-#define PACE_WAIT_SIMPLE 372
-#define PASSWORD 373
-#define PATH 374
-#define PING_COOKIE 375
-#define PING_TIME 376
-#define PORT 377
-#define QSTRING 378
-#define QUIET_ON_BAN 379
-#define REASON 380
-#define REDIRPORT 381
-#define REDIRSERV 382
-#define REGEX_T 383
-#define REHASH 384
-#define REMOTE 385
-#define REMOTEBAN 386
-#define RESTRICT_CHANNELS 387
+#define MASK 328
+#define MAX_ACCEPT 329
+#define MAX_BANS 330
+#define MAX_CHANS_PER_OPER 331
+#define MAX_CHANS_PER_USER 332
+#define MAX_GLOBAL 333
+#define MAX_IDENT 334
+#define MAX_LOCAL 335
+#define MAX_NICK_CHANGES 336
+#define MAX_NICK_LENGTH 337
+#define MAX_NICK_TIME 338
+#define MAX_NUMBER 339
+#define MAX_TARGETS 340
+#define MAX_TOPIC_LENGTH 341
+#define MAX_WATCH 342
+#define MIN_NONWILDCARD 343
+#define MIN_NONWILDCARD_SIMPLE 344
+#define MIN_IDLE 345
+#define MAX_IDLE 346
+#define RANDOM_IDLE 347
+#define HIDE_IDLE_FROM_OPERS 348
+#define MODULE 349
+#define MODULES 350
+#define NAME 351
+#define NEED_PASSWORD 352
+#define NETWORK_DESC 353
+#define NETWORK_NAME 354
+#define NICK 355
+#define NICK_CHANGES 356
+#define NO_CREATE_ON_SPLIT 357
+#define NO_JOIN_ON_SPLIT 358
+#define NO_OPER_FLOOD 359
+#define NO_TILDE 360
+#define NUMBER 361
+#define NUMBER_PER_CIDR 362
+#define NUMBER_PER_IP 363
+#define OPERATOR 364
+#define OPERS_BYPASS_CALLERID 365
+#define OPER_ONLY_UMODES 366
+#define OPER_PASS_RESV 367
+#define OPER_SPY_T 368
+#define OPER_UMODES 369
+#define JOIN_FLOOD_COUNT 370
+#define JOIN_FLOOD_TIME 371
+#define PACE_WAIT 372
+#define PACE_WAIT_SIMPLE 373
+#define PASSWORD 374
+#define PATH 375
+#define PING_COOKIE 376
+#define PING_TIME 377
+#define PORT 378
+#define QSTRING 379
+#define QUIET_ON_BAN 380
+#define REASON 381
+#define REDIRPORT 382
+#define REDIRSERV 383
+#define REGEX_T 384
+#define REHASH 385
+#define REMOTE 386
+#define REMOTEBAN 387
#define RSA_PRIVATE_KEY_FILE 388
#define RSA_PUBLIC_KEY_FILE 389
#define SSL_CERTIFICATE_FILE 390
diff --git a/src/conf_parser.y b/src/conf_parser.y
index 1cb4010..2e17b7e 100644
--- a/src/conf_parser.y
+++ b/src/conf_parser.y
@@ -208,6 +208,7 @@ reset_block_state(void)
%token LINKS_DELAY
%token LISTEN
%token T_LOG
+%token MASK
%token MAX_ACCEPT
%token MAX_BANS
%token MAX_CHANS_PER_OPER
@@ -267,7 +268,6 @@ reset_block_state(void)
%token REHASH
%token REMOTE
%token REMOTEBAN
-%token RESTRICT_CHANNELS
%token RSA_PRIVATE_KEY_FILE
%token RSA_PUBLIC_KEY_FILE
%token SSL_CERTIFICATE_FILE
@@ -1717,33 +1717,34 @@ resv_entry: RESV
strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
} '{' resv_items '}' ';'
{
- if (IsChanPrefix(block_state.name.buf[0]))
- create_channel_resv(block_state.name.buf, block_state.rpass.buf);
- else if (block_state.name.buf[0])
- create_nick_resv(block_state.name.buf, block_state.rpass.buf);
+ if (conf_parser_ctx.pass != 2)
+ break;
+
+ create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
};
resv_items: resv_items resv_item | resv_item;
-resv_item: resv_reason | resv_channel | resv_nick | error ';' ;
+resv_item: resv_mask | resv_reason | resv_exempt | error ';' ;
-resv_reason: REASON '=' QSTRING ';'
+resv_mask: MASK '=' QSTRING ';'
{
if (conf_parser_ctx.pass == 2)
- strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
+ strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
};
-resv_channel: CHANNEL '=' QSTRING ';'
+resv_reason: REASON '=' QSTRING ';'
{
if (conf_parser_ctx.pass == 2)
- strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
+ strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
};
-resv_nick: NICK '=' QSTRING ';'
+resv_exempt: EXEMPT '=' QSTRING ';'
{
if (conf_parser_ctx.pass == 2)
- strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
+ dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
};
+
/***************************************************************************
* section service
***************************************************************************/
@@ -2841,7 +2842,7 @@ channel_item: channel_max_bans |
channel_max_chans_per_user | channel_max_chans_per_oper |
channel_quiet_on_ban | channel_default_split_user_count |
channel_default_split_server_count |
- channel_no_create_on_split | channel_restrict_channels |
+ channel_no_create_on_split |
channel_no_join_on_split |
channel_jflood_count | channel_jflood_time |
channel_disable_fake_channels | error;
@@ -2851,11 +2852,6 @@ channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
ConfigChannel.disable_fake_channels = yylval.number;
};
-channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
-{
- ConfigChannel.restrict_channels = yylval.number;
-};
-
channel_knock_delay: KNOCK_DELAY '=' timespec ';'
{
ConfigChannel.knock_delay = $3;
diff --git a/src/ircd.c b/src/ircd.c
index 65033f3..b15d10e 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -62,6 +62,10 @@
#include "conf_db.h"
#include "conf_class.h"
+
+#ifdef HAVE_LIBGEOIP
+GeoIP *geoip_ctx;
+#endif
/* /quote set variables */
struct SetOptions GlobalSetOptions;
@@ -559,6 +563,9 @@ main(int argc, char *argv[])
initialize_server_capabs(); /* Set up default_server_capabs */
initialize_global_set_options();
channel_init();
+#ifdef HAVE_LIBGEOIP
+ geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
+#endif
if (EmptyString(ServerInfo.sid))
{
diff --git a/src/resv.c b/src/resv.c
index 3ac0490..50e8dcf 100644
--- a/src/resv.c
+++ b/src/resv.c
@@ -36,60 +36,128 @@
#include "s_misc.h"
#include "conf.h"
#include "conf_db.h"
+#include "channel.h"
+#include "hostmask.h"
dlink_list resv_channel_list = { NULL, NULL, 0 };
-/* create_channel_resv()
+/* create_resv()
*
- * inputs - name of channel to create resv for
+ * inputs - name of nick to create resv for
* - reason for resv
- * - flag, 1 for from ircd.conf 0 from elsehwere
- * output - pointer to struct ResvChannel
+ * - 1 if from ircd.conf, 0 if from elsewhere
+ * output - pointer to struct ResvNick
* side effects -
*/
struct MaskItem *
-create_channel_resv(const char *name, const char *reason)
+create_resv(const char *name, const char *reason, const dlink_list *list)
{
struct MaskItem *conf = NULL;
+ enum maskitem_type type;
if (name == NULL || reason == NULL)
return NULL;
- if (find_exact_name_conf(CONF_CRESV, NULL, name, NULL, NULL))
+ if (IsChanPrefix(*name))
+ type = CONF_CRESV;
+ else
+ type = CONF_NRESV;
+
+ if (find_exact_name_conf(type, NULL, name, NULL, NULL))
return NULL;
- conf = conf_make(CONF_CRESV);
+ conf = conf_make(type);
conf->name = xstrdup(name);
conf->reason = xstrndup(reason, IRCD_MIN(strlen(reason), REASONLEN));
+ if (list)
+ {
+ if (strlen(name) == 2 && IsAlpha(*(name + 1) && IsAlpha(*(name + 2))))
+ {
+ struct exempt *exptr = MyMalloc(sizeof(*exptr));
+
+ exptr->name = xstrdup(name);
+ exptr->coid = GeoIP_id_by_code(name);
+ dlinkAdd(exptr, &exptr->node, &conf->exempt_list);
+ }
+ else
+ {
+ dlink_node *ptr = NULL;
+
+ DLINK_FOREACH(ptr, list->head)
+ {
+ char nick[NICKLEN + 1];
+ char user[USERLEN + 1];
+ char host[HOSTLEN + 1];
+ struct split_nuh_item nuh;
+ struct exempt *exptr = NULL;
+
+ nuh.nuhmask = ptr->data;
+ nuh.nickptr = nick;
+ nuh.userptr = user;
+ nuh.hostptr = host;
+
+ nuh.nicksize = sizeof(name);
+ nuh.usersize = sizeof(user);
+ nuh.hostsize = sizeof(host);
+
+ split_nuh(&nuh);
+
+ exptr = MyMalloc(sizeof(*exptr));
+ exptr->name = xstrdup(name);
+ exptr->user = xstrdup(user);
+ exptr->host = xstrdup(host);
+ exptr->type = parse_netmask(host, &exptr->addr, &exptr->bits);
+ dlinkAdd(exptr, &exptr->node, &conf->exempt_list);
+ }
+ }
+ }
+
return conf;
}
-/* create_nick_resv()
- *
- * inputs - name of nick to create resv for
- * - reason for resv
- * - 1 if from ircd.conf, 0 if from elsewhere
- * output - pointer to struct ResvNick
- * side effects -
- */
-struct MaskItem *
-create_nick_resv(const char *name, const char *reason)
+int
+resv_find_exempt(const struct Client *who, const struct MaskItem *conf)
{
- struct MaskItem *conf = NULL;
+ const dlink_node *ptr = NULL;
- if (name == NULL || reason == NULL)
- return NULL;
-
- if (find_exact_name_conf(CONF_NRESV, NULL, name, NULL, NULL))
- return NULL;
+ DLINK_FOREACH(ptr, conf->exempt_list.head)
+ {
+ const struct exempt *exptr = ptr->data;
- conf = conf_make(CONF_NRESV);
- conf->name = xstrdup(name);
- conf->reason = xstrndup(reason, IRCD_MIN(strlen(reason), REASONLEN));
+ if (exptr->coid)
+ {
+ if (exptr->coid == who->localClient->country_id)
+ return 1;
+ }
+ else if (!match(exptr->name, who->name) && !match(exptr->user, who->username))
+ {
+ switch (exptr->type)
+ {
+ case HM_HOST:
+ if (!match(exptr->host, who->host) || !match(exptr->host, who->sockhost))
+ return 1;
+ break;
+ case HM_IPV4:
+ if (who->localClient->aftype == AF_INET)
+ if (match_ipv4(&who->localClient->ip, &exptr->addr, exptr->bits))
+ return 1;
+ break;
+#ifdef IPV6
+ case HM_IPV6:
+ if (who->localClient->aftype == AF_INET6)
+ if (match_ipv6(&who->localClient->ip, &exptr->addr, exptr->bits))
+ return 1;
+ break;
+#endif
+ default:
+ assert(0);
+ }
+ }
+ }
- return conf;
+ return 0;
}
/* match_find_resv()
diff --git a/src/s_bsd.c b/src/s_bsd.c
index 049c46b..cf9d749 100644
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -302,6 +302,15 @@ add_connection(struct Listener *listener, struct irc_ssaddr *irn, int fd)
sizeof(new_client->sockhost), NULL, 0, NI_NUMERICHOST);
new_client->localClient->aftype = new_client->localClient->ip.ss.ss_family;
+#ifdef HAVE_LIBGEOIP
+ /* XXX IPV6 SUPPORT XXX */
+ if (irn->ss.ss_family == AF_INET && geoip_ctx)
+ {
+ const struct sockaddr_in *v4 = (const struct sockaddr_in *)&new_client->localClient->ip;
+ new_client->localClient->country_id = GeoIP_id_by_ipnum(geoip_ctx, (unsigned long)ntohl(v4->sin_addr.s_addr));
+ }
+#endif
+
if (new_client->sockhost[0] == ':' && new_client->sockhost[1] == ':')
{
strlcpy(new_client->host, "0", sizeof(new_client->host));
generated by cgit (git 2.34.1) at 2025-05-10 03:45:51 +0000