diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-06-16 11:30:30 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-06-16 11:30:30 +0000 |
| commit | d4882ea1a16af359f9aea4ab818a690e1d807d11 (patch) | |
| tree | 8f61987b87e066cbc832ccfedd5853c0e59d057c | |
| parent | ef672ecfcc78b21f04143c6f21c5450c972cdffc (diff) | |
- Add operator::ssl_connection_required configuration option
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2249 82007160-df01-0410-b94d-b575c5fd34c7
| -rw-r--r-- | doc/reference.conf | 6 | ||||
| -rw-r--r-- | modules/m_challenge.c | 7 | ||||
| -rw-r--r-- | modules/m_oper.c | 7 | ||||
| -rw-r--r-- | src/conf_lexer.c | 1936 | ||||
| -rw-r--r-- | src/conf_lexer.l | 1 | ||||
| -rw-r--r-- | src/conf_parser.c | 3741 | ||||
| -rw-r--r-- | src/conf_parser.h | 296 | ||||
| -rw-r--r-- | src/conf_parser.y | 13 |
8 files changed, 3046 insertions, 2961 deletions
diff --git a/doc/reference.conf b/doc/reference.conf index 9a2748f..ecc1794 100644 --- a/doc/reference.conf +++ b/doc/reference.conf @@ -469,6 +469,12 @@ operator { */ # ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D"; + /* + * ssl_connection_required: client must be connected over SSL/TLS + * in order to be able to use this oper{} block. + */ + ssl_connection_required = no; + /* class: the class the oper joins when they successfully /oper */ class = "opers"; diff --git a/modules/m_challenge.c b/modules/m_challenge.c index 83fa9ea..29ff32f 100644 --- a/modules/m_challenge.c +++ b/modules/m_challenge.c @@ -144,6 +144,13 @@ m_challenge(struct Client *client_p, struct Client *source_p, return; } + if (IsConfSSL(conf) && !HasUMode(source_p, UMODE_SSL)) + { + sendto_one(source_p, form_str(ERR_NOOPERHOST), me.name, source_p->name); + failed_challenge_notice(source_p, conf->name, "requires SSL/TLS"); + return; + } + if (!EmptyString(conf->certfp)) { if (EmptyString(source_p->certfp) || strcasecmp(source_p->certfp, conf->certfp)) diff --git a/modules/m_oper.c b/modules/m_oper.c index 52d4033..976fdc4 100644 --- a/modules/m_oper.c +++ b/modules/m_oper.c @@ -95,6 +95,13 @@ m_oper(struct Client *client_p, struct Client *source_p, return; } + if (IsConfSSL(conf) && !HasUMode(source_p, UMODE_SSL)) + { + sendto_one(source_p, form_str(ERR_NOOPERHOST), me.name, source_p->name); + failed_oper_notice(source_p, name, "requires SSL/TLS"); + return; + } + if (!EmptyString(conf->certfp)) { if (EmptyString(source_p->certfp) || strcasecmp(source_p->certfp, conf->certfp)) diff --git a/src/conf_lexer.c b/src/conf_lexer.c index 78c08c6..cf80e73 100644 --- a/src/conf_lexer.c +++ b/src/conf_lexer.c @@ -364,8 +364,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 250 -#define YY_END_OF_BUFFER 251 +#define YY_NUM_RULES 251 +#define YY_END_OF_BUFFER 252 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -373,24 +373,24 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1581] = +static yyconst flex_int16_t yy_accept[1599] = { 0, - 4, 4, 251, 249, 4, 3, 249, 5, 249, 249, - 6, 249, 249, 249, 249, 249, 249, 249, 249, 249, - 249, 249, 249, 249, 249, 249, 249, 249, 249, 249, - 249, 249, 249, 249, 249, 249, 4, 3, 0, 7, - 5, 248, 0, 2, 5, 6, 0, 0, 0, 0, + 4, 4, 252, 250, 4, 3, 250, 5, 250, 250, + 6, 250, 250, 250, 250, 250, 250, 250, 250, 250, + 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, + 250, 250, 250, 250, 250, 250, 4, 3, 0, 7, + 5, 249, 0, 2, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 80, 0, 242, 0, 0, 0, 0, 0, 0, - 0, 247, 0, 0, 0, 0, 0, 0, 0, 221, + 0, 80, 0, 243, 0, 0, 0, 0, 0, 0, + 0, 248, 0, 0, 0, 0, 0, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 229, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, 0, @@ -403,151 +403,154 @@ static yyconst flex_int16_t yy_accept[1581] = 175, 0, 0, 0, 0, 181, 0, 183, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 220, 0, 0, 0, 0, 0, 15, 0, 17, 237, - 0, 0, 0, 0, 0, 0, 0, 0, 228, 29, + 221, 0, 0, 0, 0, 0, 15, 0, 17, 238, + 0, 0, 0, 0, 0, 0, 0, 0, 229, 29, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 0, 0, 53, 0, - 0, 0, 0, 0, 0, 0, 74, 231, 0, 0, + 0, 0, 0, 0, 0, 0, 74, 232, 0, 0, 0, 81, 82, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 119, 120, 0, 0, 0, 126, 0, 0, 0, 0, 0, 0, 134, 0, 0, 145, 0, 148, 0, 0, 0, 0, 0, 0, 0, 0, 160, 0, 0, 0, 0, 0, 0, 176, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 202, 0, - 0, 0, 0, 0, 0, 0, 212, 0, 0, 0, - 0, 0, 227, 0, 223, 0, 0, 9, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 203, 0, + 0, 0, 0, 0, 0, 0, 213, 0, 0, 0, + 0, 0, 228, 0, 224, 0, 0, 9, 0, 0, - 0, 236, 0, 0, 21, 0, 0, 25, 0, 0, + 0, 237, 0, 0, 21, 0, 0, 25, 0, 0, 30, 0, 0, 0, 40, 0, 0, 43, 0, 0, 0, 0, 0, 0, 51, 0, 54, 0, 56, 0, - 0, 0, 0, 0, 0, 230, 0, 0, 0, 0, - 241, 0, 0, 87, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 246, - 0, 0, 0, 0, 0, 225, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 231, 0, 0, 0, 0, + 242, 0, 0, 87, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 247, + 0, 0, 0, 0, 0, 226, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 152, 0, 0, 0, 0, 0, 0, 0, 165, 0, 0, 0, 0, 0, 0, - 177, 0, 179, 182, 190, 0, 0, 0, 0, 0, - 0, 198, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 213, 0, 0, 0, 226, 219, - 222, 0, 0, 0, 11, 0, 0, 0, 0, 0, + 177, 0, 179, 182, 191, 0, 0, 0, 0, 0, + 0, 199, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 214, 0, 0, 0, 227, 220, + 223, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 67, 0, 0, 0, 0, 0, 0, 240, + 0, 0, 67, 0, 0, 0, 0, 0, 0, 241, 0, 0, 0, 0, 0, 0, 93, 94, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 245, 0, 233, 0, 0, 117, 224, 0, 0, + 0, 246, 0, 234, 0, 0, 117, 225, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 143, 0, 0, 0, 0, 0, 151, 0, 0, 155, 157, 0, 0, 0, 0, - 235, 0, 166, 0, 0, 173, 0, 0, 0, 0, + 236, 0, 166, 0, 0, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 203, 204, 0, 0, 0, 208, 0, 0, 0, 214, - 215, 0, 218, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 22, 0, 26, 27, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, - 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, + 0, 204, 205, 0, 0, 0, 209, 0, 0, 0, + 215, 216, 0, 219, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 22, 0, 26, 27, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 55, 0, + 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 232, 0, 0, 118, 121, 0, + 0, 0, 0, 0, 0, 233, 0, 0, 118, 121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 159, 0, 0, 0, 234, 0, 0, - 0, 169, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 159, 0, 0, 0, 235, 0, + 0, 0, 169, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 205, 206, 0, 209, 210, 0, 216, 0, 0, - 0, 0, 0, 0, 16, 19, 0, 0, 0, 0, + 0, 0, 0, 206, 207, 0, 210, 211, 0, 217, + 0, 0, 0, 0, 0, 0, 16, 19, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 76, 0, 0, 0, 0, 239, 0, - 0, 0, 0, 0, 99, 0, 0, 0, 0, 105, - 0, 0, 0, 0, 0, 0, 244, 114, 0, 0, - 0, 0, 131, 0, 0, 0, 130, 0, 138, 0, - 140, 0, 0, 0, 0, 144, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 76, 0, 0, 0, 0, + 240, 0, 0, 0, 0, 0, 99, 0, 0, 0, + 0, 105, 0, 0, 0, 0, 0, 0, 245, 114, + 0, 0, 0, 0, 131, 0, 0, 0, 130, 0, + 138, 0, 140, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, - 0, 0, 238, 0, 0, 91, 0, 0, 0, 0, - 0, 104, 106, 0, 0, 0, 0, 113, 243, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 141, 0, 147, 0, 0, 153, 154, 158, + 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 78, 0, 0, 239, 0, 0, 91, 0, + 0, 0, 0, 0, 104, 106, 0, 0, 0, 0, + 113, 244, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 141, 0, 147, 0, 0, + 153, 154, 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 207, 0, 0, 0, - 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 49, 0, 0, 0, 0, 0, 0, 0, 0, 65, + 208, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 98, 0, 0, 103, 0, 0, 0, 110, - 0, 0, 0, 122, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 149, 0, 0, - 0, 0, 0, 167, 168, 0, 171, 174, 0, 0, + 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, + 0, 0, 0, 65, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 98, 0, 0, 103, + 0, 0, 0, 110, 0, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 149, 0, 0, 0, 0, 0, 167, 168, 0, + 171, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 28, 0, 0, 35, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 63, 0, 68, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 89, 92, 0, 102, 0, 0, 0, 111, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 137, 0, 146, 150, 161, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 28, 0, + 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 63, 0, 68, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 89, 92, 0, + 102, 0, 0, 0, 111, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 137, 0, 146, + 150, 161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 211, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, - - 0, 0, 42, 45, 0, 0, 0, 58, 59, 0, - 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, - 0, 0, 88, 0, 0, 0, 0, 0, 0, 0, - 0, 124, 125, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 178, 180, 0, 0, + 0, 0, 0, 0, 212, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 37, 0, 0, 0, 42, 45, + 0, 0, 0, 58, 59, 0, 0, 0, 0, 71, + 0, 0, 0, 0, 0, 0, 0, 0, 88, 0, + 0, 0, 0, 0, 0, 0, 0, 124, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 200, 0, 0, 0, 10, 0, 0, 0, 0, - 0, 0, 0, 0, 41, 0, 52, 0, 0, 0, - 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 109, 0, 0, 123, 0, 0, - - 129, 0, 133, 0, 0, 0, 0, 0, 0, 164, - 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 196, 0, 0, 201, 217, 0, 0, 0, 18, - 0, 0, 0, 0, 0, 0, 57, 60, 0, 0, - 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 136, + 0, 0, 178, 180, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 201, 0, + 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, + 0, 41, 0, 52, 0, 0, 0, 0, 0, 0, + 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 109, 0, 0, 123, 0, 0, 129, 0, 133, + 0, 0, 0, 0, 0, 0, 164, 170, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 197, + 0, 0, 202, 218, 0, 0, 0, 18, 0, 0, + 0, 0, 0, 0, 57, 60, 0, 0, 0, 0, + 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 8, 13, 0, 0, 0, - 0, 0, 0, 0, 0, 61, 0, 0, 0, 70, - 77, 0, 0, 84, 0, 0, 0, 0, 0, 108, + 0, 0, 0, 0, 8, 13, 0, 0, 0, 0, + 0, 0, 0, 0, 61, 0, 0, 0, 70, 77, - 0, 115, 0, 0, 132, 0, 0, 0, 0, 0, - 0, 186, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 84, 0, 0, 0, 0, 0, 108, 0, + 115, 0, 0, 132, 0, 0, 0, 0, 0, 0, + 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 24, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 83, 0, 0, 0, 0, 107, 112, 0, 0, 128, 0, 135, 142, 0, 0, - 0, 0, 0, 0, 191, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 187, 188, 189, 192, 193, 194, 195, 0, 0, - 0, 31, 0, 0, 0, 0, 48, 0, 0, 0, + 0, 0, 187, 0, 189, 190, 193, 194, 195, 196, + + 0, 0, 0, 31, 0, 0, 0, 0, 48, 0, + 0, 0, 0, 0, 100, 101, 0, 127, 0, 0, + 0, 0, 0, 0, 200, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 90, 0, 0, 0, 163, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 69, + 79, 0, 0, 0, 162, 184, 0, 0, 0, 0, + 0, 0, 38, 0, 0, 86, 0, 139, 0, 0, + 198, 0, 0, 0, 0, 62, 116, 0, 0, 0, + 0, 0, 39, 0, 188, 0, 0, 33, 0, 0, + 0, 0, 0, 32, 0, 14, 185, 0 - 0, 0, 100, 101, 0, 127, 0, 0, 0, 0, - 0, 199, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 90, 0, 0, 0, 163, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 69, 79, 0, 0, 0, - 162, 184, 0, 0, 0, 0, 0, 38, 0, 0, - 86, 0, 139, 0, 197, 0, 0, 0, 0, 62, - 116, 0, 0, 0, 0, 39, 0, 0, 0, 33, - 0, 0, 0, 0, 0, 32, 0, 14, 185, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -593,13 +596,13 @@ static yyconst flex_int32_t yy_meta[69] = 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[1586] = +static yyconst flex_int16_t yy_base[1604] = { 0, - 0, 0, 3034, 3035, 3031, 0, 66, 0, 64, 66, + 0, 0, 3069, 3070, 3066, 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, 3030, 0, 86, 3035, - 0, 3035, 170, 3035, 0, 220, 191, 188, 188, 198, + 323, 190, 122, 168, 128, 175, 3065, 0, 86, 3070, + 0, 3070, 170, 3070, 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, 314, 294, 311, 304, 333, 336, 315, 340, 333, 344, 335, @@ -608,348 +611,354 @@ static yyconst flex_int16_t yy_base[1586] = 388, 397, 418, 389, 389, 423, 417, 465, 435, 441, 439, 446, 434, 443, 437, 432, 444, 459, 456, 473, - 471, 470, 2989, 476, 479, 521, 492, 488, 492, 511, - 498, 507, 506, 509, 506, 495, 3035, 514, 536, 508, - 523, 517, 2988, 524, 532, 530, 538, 539, 547, 543, - 557, 543, 566, 543, 566, 3035, 569, 560, 557, 561, + 471, 470, 3024, 476, 479, 521, 492, 488, 492, 511, + 498, 507, 506, 509, 506, 495, 3070, 514, 536, 508, + 523, 517, 3023, 524, 532, 530, 538, 539, 547, 543, + 557, 543, 566, 543, 566, 3070, 569, 560, 557, 561, 570, 562, 576, 569, 578, 574, 584, 587, 591, 581, - 584, 595, 588, 603, 607, 611, 597, 600, 2987, 606, + 584, 595, 588, 603, 607, 611, 597, 600, 3022, 606, 613, 137, 609, 604, 616, 616, 630, 628, 624, 616, - 622, 3035, 629, 2986, 621, 645, 626, 631, 634, 652, + 622, 3070, 629, 3021, 621, 645, 626, 631, 634, 652, 654, 664, 662, 646, 659, 656, 674, 670, 657, 671, 659, 672, 675, 665, 669, 684, 671, 669, 686, 699, - 3035, 686, 686, 2985, 695, 709, 697, 3035, 702, 705, - 3035, 719, 713, 706, 714, 3035, 721, 709, 712, 719, + 3070, 686, 686, 3020, 695, 709, 697, 3070, 702, 705, + 3070, 719, 713, 706, 714, 3070, 721, 709, 712, 719, 729, 717, 736, 731, 737, 739, 724, 736, 737, 746, 755, 750, 746, 744, 755, 760, 768, 767, 765, 762, - 3035, 771, 768, 771, 770, 2984, 3035, 785, 3035, 773, - 788, 789, 782, 783, 2983, 779, 779, 795, 3035, 3035, - 795, 782, 3035, 790, 807, 809, 2982, 801, 805, 793, - 816, 812, 813, 827, 818, 3035, 815, 817, 3035, 819, + 3070, 771, 768, 771, 770, 3019, 3070, 785, 3070, 773, + 788, 789, 782, 783, 3018, 779, 779, 795, 3070, 3070, + 795, 782, 3070, 790, 807, 809, 3017, 801, 805, 793, + 816, 812, 813, 827, 818, 3070, 815, 817, 3070, 819, - 821, 835, 841, 835, 841, 2981, 3035, 828, 837, 833, - 833, 3035, 3035, 2980, 848, 2979, 852, 852, 852, 2978, + 821, 835, 841, 835, 841, 3016, 3070, 828, 837, 833, + 833, 3070, 3070, 3015, 848, 3014, 852, 852, 852, 3013, 849, 865, 855, 867, 899, 877, 883, 867, 879, 877, - 883, 3035, 3035, 880, 2977, 881, 3035, 889, 886, 890, - 891, 901, 912, 924, 2976, 903, 3035, 2975, 3035, 935, - 924, 926, 925, 927, 929, 930, 953, 2974, 939, 942, - 940, 971, 954, 940, 3035, 949, 959, 958, 945, 3004, - 975, 952, 953, 976, 3004, 2971, 992, 994, 3035, 991, - 977, 990, 992, 989, 985, 999, 3035, 1004, 990, 996, - 2970, 995, 995, 1010, 999, 998, 1005, 1018, 1025, 1020, - - 1017, 3035, 1015, 1032, 3035, 1042, 1046, 3035, 1044, 1047, - 3035, 1039, 1044, 1043, 3035, 1047, 1043, 3035, 1046, 1059, - 1044, 1051, 1063, 1054, 3035, 1064, 3035, 1069, 2969, 1060, - 1057, 1059, 1072, 1070, 1079, 3035, 1085, 1082, 1084, 1095, - 1083, 1100, 1079, 2968, 2967, 1092, 2966, 1093, 1090, 1106, + 883, 3070, 3070, 880, 3012, 881, 3070, 889, 886, 890, + 891, 901, 912, 924, 3011, 903, 3070, 3010, 3070, 935, + 924, 926, 925, 927, 929, 930, 953, 3009, 939, 942, + 940, 971, 954, 940, 3070, 949, 959, 958, 945, 3039, + 975, 952, 953, 976, 3039, 3006, 992, 994, 3070, 991, + 977, 990, 992, 989, 985, 999, 3070, 1004, 990, 996, + 3005, 995, 995, 1010, 999, 998, 1005, 1018, 1025, 1020, + + 1017, 3070, 1015, 1032, 3070, 1042, 1046, 3070, 1044, 1047, + 3070, 1039, 1044, 1043, 3070, 1047, 1043, 3070, 1046, 1059, + 1044, 1051, 1063, 1054, 3070, 1064, 3070, 1069, 3004, 1060, + 1057, 1059, 1072, 1070, 1079, 3070, 1085, 1082, 1084, 1095, + 1083, 1100, 1079, 3003, 3002, 1092, 3001, 1093, 1090, 1106, 1109, 1115, 1109, 1106, 1115, 1107, 1114, 1123, 1125, 1108, 1108, 1135, 1137, 1127, 1142, 1133, 1148, 1147, 1139, 1140, - 1154, 1152, 1159, 1154, 1152, 1151, 2965, 1171, 1160, 1150, - 1174, 1174, 1166, 1174, 1178, 3035, 1190, 1187, 1191, 1183, - 1205, 1194, 1207, 3035, 1197, 1199, 1215, 1205, 1220, 2964, - - 3035, 1224, 2963, 3035, 3035, 1222, 1218, 1224, 2962, 1210, - 1227, 3035, 1221, 1217, 1225, 1227, 1240, 1235, 1236, 1246, - 1238, 1249, 1257, 1250, 2990, 1250, 1253, 1266, 3035, 3035, - 3035, 1267, 2960, 1253, 3035, 1265, 1262, 1265, 1275, 1265, - 1269, 1274, 1267, 1266, 1268, 1273, 1290, 1283, 1288, 1283, - 2959, 3035, 1303, 2958, 1295, 1300, 1305, 1315, 2957, 1299, - 2956, 1317, 2955, 1319, 1321, 1306, 2954, 1327, 1320, 3035, - 1326, 1315, 1333, 1335, 1339, 1338, 3035, 3035, 3035, 1340, - 1335, 1350, 1345, 1342, 1363, 1355, 1360, 1358, 1354, 1357, - 1354, 3035, 1357, 1360, 1368, 1368, 1364, 3035, 1381, 1383, - - 1387, 1378, 1386, 1391, 1379, 1376, 1392, 2953, 1382, 1401, - 1393, 1394, 1410, 1399, 1416, 3035, 1404, 1410, 1417, 1407, - 2952, 3035, 1413, 1424, 3035, 1429, 1413, 1410, 1427, 1435, - 1421, 1440, 1434, 1440, 1426, 3035, 1434, 1436, 1436, 1433, - 1441, 1450, 2951, 1444, 1476, 1454, 2950, 1456, 2949, 1462, - 3035, 3035, 1474, 1475, 1462, 3035, 1478, 1484, 1483, 3035, - 1475, 1480, 3035, 1491, 1481, 1479, 1497, 1500, 1488, 1500, - 1496, 1496, 3035, 1493, 3035, 1510, 2948, 1500, 2947, 2946, - 2945, 1520, 1518, 1521, 1519, 1530, 2944, 3035, 1515, 1525, - 1528, 1536, 1531, 3035, 1526, 1540, 1532, 1536, 1532, 1536, - - 1542, 1552, 1543, 1541, 1557, 1554, 1541, 1562, 1551, 1569, - 1574, 1565, 1573, 1583, 1587, 1576, 1586, 1592, 1584, 1594, - 1591, 1590, 1597, 1597, 3035, 1598, 1581, 3035, 3035, 1600, - 1588, 2943, 1601, 1589, 2942, 2941, 1605, 1596, 1595, 1594, - 1609, 1612, 1609, 1618, 1629, 1637, 1627, 1630, 1635, 1636, - 1629, 1631, 1649, 3035, 1647, 1631, 1642, 3035, 1637, 1648, - 1644, 1640, 1652, 1647, 1651, 1649, 1646, 1659, 1668, 1659, - 1656, 2940, 2939, 2938, 2937, 2936, 1677, 1682, 2935, 1688, - 2934, 3035, 3035, 1690, 3035, 3035, 1689, 3035, 2933, 90, - 1696, 1680, 1688, 1688, 3035, 3035, 1699, 1700, 1694, 1689, - - 1702, 1701, 1711, 1702, 1697, 1711, 1707, 3035, 1702, 1717, - 1715, 1714, 1735, 1736, 1732, 1732, 1741, 1746, 1738, 1752, - 1750, 1735, 1743, 3035, 1745, 1756, 1747, 1745, 1746, 1761, - 1755, 1758, 1758, 1755, 3035, 1753, 1760, 1774, 1761, 3035, - 1771, 2932, 1781, 1785, 1792, 1792, 1784, 3035, 1795, 1791, - 1787, 1805, 3035, 1802, 1796, 1806, 3035, 1809, 3035, 1799, - 3035, 1791, 1799, 1816, 1801, 3035, 1812, 1819, 1811, 1822, - 1808, 1807, 1821, 1824, 1839, 1835, 1830, 1850, 1851, 2931, - 1855, 1839, 1855, 1841, 1854, 1860, 1852, 1867, 1864, 1866, - 1857, 1858, 1859, 1860, 2930, 1853, 1863, 1874, 1876, 1878, - - 1874, 1875, 1924, 2967, 2955, 1872, 1893, 2927, 2926, 2925, - 3035, 1893, 1898, 1896, 1896, 1899, 1894, 1916, 1914, 1916, - 1921, 3035, 1911, 1921, 1907, 1919, 1928, 1929, 1919, 2924, - 1912, 1922, 1935, 1917, 1925, 2923, 1943, 1934, 1936, 2922, - 1941, 1945, 3035, 1944, 1961, 3035, 1965, 1948, 2921, 1949, - 1959, 3035, 3035, 1970, 1956, 1956, 2920, 3035, 3035, 1966, - 1960, 1958, 1978, 1984, 2919, 1972, 1975, 1970, 1990, 2918, - 2917, 1987, 2916, 1985, 3035, 1992, 1987, 3035, 3035, 3035, - 1986, 1984, 2003, 1988, 2011, 2005, 2008, 2018, 2021, 2009, - 2019, 2024, 2014, 2014, 2017, 2018, 2028, 2023, 2024, 2025, - - 2026, 2024, 2029, 2030, 2036, 2046, 3035, 2039, 2044, 2953, - 2949, 2935, 2934, 2039, 2040, 2059, 2065, 2051, 2062, 2060, - 2064, 2069, 2068, 2064, 2075, 2075, 2084, 2070, 2082, 2075, - 3035, 2080, 2075, 2084, 2082, 2096, 2095, 2090, 2101, 3035, - 2102, 2104, 2094, 2111, 2902, 2098, 2109, 2897, 2895, 2112, - 2105, 2106, 3035, 2117, 2116, 3035, 2128, 2133, 2131, 3035, - 2123, 2131, 2140, 3035, 2130, 2128, 2135, 2134, 2893, 2135, - 2890, 2133, 2132, 2136, 2137, 2140, 2156, 3035, 2159, 2146, - 2163, 2888, 2158, 3035, 3035, 2177, 3035, 3035, 2173, 2181, - 2176, 1438, 931, 2186, 897, 2170, 2185, 2187, 2189, 2191, - - 2188, 2189, 2194, 2181, 2190, 2196, 2195, 2183, 2192, 2196, - 2186, 2212, 865, 3035, 2200, 2209, 3035, 2212, 2217, 2212, - 2218, 2228, 2218, 859, 2228, 2232, 2238, 2224, 2237, 2229, - 3035, 848, 3035, 2232, 2233, 2246, 2244, 2236, 2242, 2254, - 2238, 2241, 479, 3035, 2257, 3035, 2263, 2253, 2256, 3035, - 2267, 2273, 2263, 2283, 2282, 2276, 2273, 2278, 2295, 2276, - 2284, 2295, 3035, 2293, 3035, 3035, 3035, 471, 2294, 2288, - 2294, 2305, 2305, 2308, 2300, 2302, 2303, 2305, 2320, 2305, - 2308, 2310, 2312, 2322, 2322, 2323, 2343, 2326, 3035, 2333, - 2334, 2333, 2337, 2345, 2347, 2349, 2355, 2340, 3035, 430, - - 2341, 2343, 3035, 3035, 2350, 2346, 2351, 3035, 3035, 2365, - 2350, 2369, 2360, 3035, 2368, 2361, 2366, 419, 418, 2369, - 2380, 2385, 3035, 2392, 2380, 2386, 2394, 2398, 2391, 2405, - 2404, 3035, 3035, 415, 2394, 2408, 2404, 2398, 412, 2400, - 2398, 2405, 2408, 2415, 2419, 2419, 3035, 3035, 2425, 2420, - 2426, 384, 2429, 2434, 383, 293, 287, 281, 2433, 2438, - 280, 3035, 2447, 2444, 2434, 3035, 2439, 2435, 2437, 2443, - 2457, 269, 2459, 2459, 3035, 2451, 3035, 2453, 2450, 259, - 2454, 2458, 2456, 3035, 2454, 2454, 2474, 2457, 2467, 2470, - 2477, 249, 2481, 2470, 3035, 2485, 2479, 3035, 2483, 2491, - - 3035, 2502, 3035, 2505, 2505, 2489, 2497, 2509, 2491, 3035, - 3035, 2498, 2501, 2501, 2516, 2503, 2513, 2511, 2512, 2513, - 2516, 3035, 237, 2526, 3035, 3035, 2530, 2533, 236, 3035, - 2517, 2527, 2525, 2543, 229, 2536, 3035, 257, 2553, 2546, - 200, 2543, 3035, 2544, 2550, 2553, 2563, 2565, 2571, 2559, - 2570, 2568, 2557, 2575, 2565, 2573, 2567, 2585, 2583, 3035, - 2579, 2568, 152, 2591, 2578, 2592, 2596, 2602, 2606, 2600, - 2602, 2603, 2605, 2607, 2610, 3035, 3035, 2611, 144, 2605, - 2623, 2610, 2629, 2628, 2624, 3035, 2613, 2629, 2621, 3035, - 3035, 2625, 2620, 3035, 150, 2628, 2629, 2628, 2631, 3035, - - 2644, 145, 2642, 2639, 3035, 2652, 2646, 2663, 124, 2664, - 109, 3035, 2656, 2661, 2660, 2672, 2666, 2668, 2670, 2671, - 2669, 2670, 2682, 3035, 3035, 2674, 2671, 2685, 2679, 2679, - 2693, 2681, 3035, 2685, 2690, 3035, 2694, 2694, 2708, 2713, - 3035, 3035, 2700, 2713, 3035, 2712, 3035, 3035, 2719, 2718, - 2723, 2726, 2727, 2730, 3035, 2711, 2712, 2713, 2714, 2721, - 2727, 2724, 2724, 2725, 2730, 2736, 2740, 2750, 2757, 2755, - 2757, 2758, 2767, 2755, 2758, 2769, 2759, 2776, 2774, 2772, - 2777, 3035, 3035, 3035, 3035, 3035, 3035, 3035, 2779, 2786, - 2772, 3035, 2787, 100, 2788, 2782, 3035, 2776, 2779, 2795, - - 2788, 2790, 3035, 3035, 2791, 3035, 2789, 2797, 2807, 2802, - 2818, 3035, 2825, 2809, 2827, 2820, 2832, 2826, 2818, 2818, - 2831, 3035, 2826, 2835, 2840, 3035, 2841, 2840, 2844, 2843, - 95, 2836, 2833, 2841, 2841, 3035, 3035, 2838, 2849, 2859, - 3035, 3035, 2861, 2849, 2865, 2872, 2859, 3035, 2877, 2870, - 3035, 2881, 3035, 2869, 3035, 93, 2874, 2877, 2873, 3035, - 3035, 2878, 2876, 2877, 2879, 3035, 2882, 2892, 2889, 3035, - 2895, 2892, 2886, 2895, 2905, 3035, 2892, 3035, 3035, 3035, - 105, 2954, 97, 84, 81 + 1154, 1152, 1159, 1154, 1152, 1151, 3000, 1171, 1160, 1150, + 1174, 1174, 1166, 1174, 1178, 3070, 1190, 1187, 1191, 1183, + 1205, 1194, 1207, 3070, 1197, 1199, 1215, 1205, 1220, 2999, + + 3070, 1224, 2998, 3070, 3070, 1241, 1219, 1225, 2997, 1211, + 1227, 3070, 1220, 1211, 1223, 1224, 1240, 1235, 1241, 1251, + 1241, 1250, 1258, 1251, 3025, 1251, 1255, 1268, 3070, 3070, + 3070, 1268, 2995, 1255, 3070, 1269, 1263, 1267, 1275, 1270, + 1274, 1279, 1271, 1275, 1277, 1284, 1298, 1290, 1295, 1289, + 2994, 3070, 1309, 2993, 1300, 1303, 1306, 1315, 2992, 1302, + 2991, 1319, 2990, 1321, 1324, 1307, 2989, 1330, 1323, 3070, + 1330, 1319, 1337, 1339, 1348, 1347, 3070, 3070, 3070, 1351, + 1343, 1357, 1352, 1348, 1359, 1365, 1369, 1360, 1356, 1359, + 1357, 3070, 1359, 1361, 1370, 1369, 1367, 3070, 1382, 1385, + + 1391, 1382, 1389, 1395, 1383, 1385, 1401, 2988, 1393, 1409, + 1400, 1401, 1416, 1405, 1421, 3070, 1407, 1411, 1418, 1408, + 2987, 3070, 1414, 1426, 3070, 1431, 1414, 1412, 1428, 1438, + 1422, 1442, 1438, 1443, 1430, 3070, 1438, 1445, 1445, 1444, + 1449, 1457, 1455, 2986, 1453, 1486, 1460, 2985, 1461, 2984, + 1465, 3070, 3070, 1475, 1476, 1462, 3070, 1478, 1481, 1480, + 3070, 1469, 1475, 3070, 1489, 1484, 1484, 1502, 1510, 1499, + 1512, 1510, 1505, 3070, 1503, 3070, 1519, 2983, 1506, 2982, + 2981, 2980, 1525, 1521, 1522, 1520, 1531, 2979, 3070, 1516, + 1525, 1532, 1537, 1533, 3070, 1527, 1543, 1537, 1542, 1537, + + 1541, 1547, 1557, 1553, 1552, 1569, 1568, 1550, 1572, 1560, + 1575, 1579, 1568, 1574, 1584, 1588, 1577, 1588, 1594, 1585, + 1596, 1592, 1593, 1600, 1600, 3070, 1603, 1586, 3070, 3070, + 1605, 1593, 2978, 1606, 1599, 2977, 2976, 1616, 1608, 1609, + 1603, 1619, 1621, 1615, 1623, 1632, 1638, 1628, 1631, 1636, + 1638, 1631, 1632, 1651, 3070, 1648, 1634, 1645, 3070, 1640, + 1653, 1649, 1645, 1657, 1652, 1661, 1660, 1658, 1673, 1677, + 1671, 1671, 1666, 2975, 2974, 2973, 2972, 2971, 1687, 1690, + 2970, 1692, 2969, 3070, 3070, 1692, 3070, 3070, 1691, 3070, + 2968, 90, 1698, 1683, 1692, 1691, 3070, 3070, 1702, 1703, + + 1698, 1693, 1710, 1704, 1726, 1709, 1704, 1717, 1726, 3070, + 1720, 1736, 1729, 1724, 1745, 1744, 1736, 1734, 1743, 1748, + 1741, 1756, 1753, 1738, 1746, 3070, 1749, 1760, 1752, 1751, + 1753, 1769, 1763, 1770, 1771, 1770, 3070, 1770, 1776, 1792, + 1775, 3070, 1784, 2967, 1793, 1795, 1800, 1796, 1786, 3070, + 1797, 1793, 1790, 1807, 3070, 1807, 1799, 1809, 3070, 1813, + 3070, 1803, 3070, 1799, 1807, 1824, 1809, 3070, 1824, 1832, + 1826, 1839, 1824, 1825, 1835, 1837, 1851, 1845, 1838, 1854, + 1853, 2966, 1857, 1841, 1858, 1845, 1857, 1863, 1855, 1867, + 1872, 1870, 1874, 1865, 1867, 1868, 1874, 2965, 1867, 1879, + + 1892, 1894, 1897, 1894, 1890, 1924, 3002, 2990, 1887, 1907, + 2962, 2961, 2960, 3070, 1907, 1909, 1903, 1901, 1904, 1899, + 1921, 1921, 1923, 1928, 3070, 1919, 1929, 1916, 1928, 1937, + 1938, 1930, 2959, 1924, 1936, 1949, 1931, 1939, 2958, 1953, + 1949, 1950, 2957, 1956, 1961, 3070, 1955, 1968, 3070, 1970, + 1953, 2956, 1954, 1964, 3070, 3070, 1985, 1962, 1961, 2955, + 3070, 3070, 1971, 1966, 1967, 1986, 1991, 2951, 1980, 1987, + 1984, 2003, 2950, 2949, 2001, 2944, 2000, 3070, 2006, 2000, + 3070, 3070, 3070, 1998, 1996, 2017, 1999, 2018, 2010, 2013, + 2023, 2026, 2016, 2026, 2031, 2022, 2022, 2041, 2027, 2028, + + 2039, 2035, 2037, 2040, 2042, 2039, 2044, 2047, 2053, 2061, + 3070, 2054, 2058, 2980, 2977, 2964, 2963, 2055, 2056, 2071, + 2074, 2058, 2068, 2067, 2073, 2077, 2077, 2074, 2085, 2085, + 2094, 2080, 2093, 2087, 3070, 2093, 2090, 2100, 2097, 2111, + 2112, 2107, 2116, 3070, 2117, 2118, 2110, 2127, 2935, 2110, + 2118, 2933, 2931, 2119, 2111, 2113, 3070, 2126, 2124, 3070, + 2137, 2143, 2141, 3070, 2133, 2141, 2150, 3070, 2141, 2140, + 2148, 2149, 2928, 2151, 2926, 2148, 2147, 2153, 2154, 2155, + 2171, 3070, 2173, 2162, 2179, 1690, 2170, 3070, 3070, 2186, + 3070, 3070, 2180, 2187, 2183, 1202, 1199, 2176, 2196, 931, + + 2180, 2197, 2199, 2201, 2202, 2199, 2201, 2208, 2195, 2206, + 2213, 2212, 2199, 2210, 2215, 2204, 2229, 897, 3070, 2217, + 2227, 3070, 2230, 2234, 2226, 2229, 2236, 2226, 865, 2239, + 2242, 2248, 2236, 2249, 2241, 3070, 859, 3070, 2243, 2245, + 2257, 2258, 2250, 2260, 2272, 2256, 2259, 848, 3070, 2276, + 3070, 2281, 2270, 2273, 3070, 2285, 2290, 2277, 2294, 2293, + 2285, 2281, 2289, 2307, 2286, 2294, 2307, 3070, 2305, 3070, + 3070, 3070, 479, 2304, 2300, 2308, 2319, 2323, 2326, 2318, + 2320, 2326, 2323, 2325, 2339, 2326, 2328, 2329, 2331, 2338, + 2334, 2335, 2353, 2338, 3070, 2345, 2346, 2346, 2351, 2359, + + 2360, 2361, 2368, 2355, 3070, 471, 2357, 2362, 3070, 3070, + 2369, 2365, 2372, 3070, 3070, 2385, 2370, 2389, 2379, 3070, + 2389, 2381, 2385, 430, 419, 2388, 2396, 2397, 3070, 2404, + 2390, 2398, 2406, 2410, 2404, 2419, 2418, 3070, 3070, 418, + 2407, 2420, 2417, 2413, 415, 2416, 2417, 2424, 2427, 2436, + 2439, 2439, 3070, 3070, 2445, 2439, 2447, 2439, 412, 2450, + 2455, 384, 383, 293, 287, 2454, 2455, 281, 3070, 2460, + 2457, 2448, 3070, 2452, 2449, 2452, 2458, 2473, 280, 2474, + 2473, 3070, 2465, 3070, 2469, 2467, 269, 2475, 2478, 2476, + 3070, 2476, 2477, 2495, 2479, 2489, 2493, 2500, 259, 2502, + + 2491, 3070, 2506, 2496, 3070, 2496, 2504, 3070, 2516, 3070, + 2518, 2519, 2504, 2512, 2525, 2506, 3070, 3070, 2512, 2515, + 2517, 2525, 2538, 2525, 2534, 2534, 2536, 2537, 2539, 3070, + 249, 2550, 3070, 3070, 2556, 2558, 237, 3070, 2541, 2550, + 2548, 2560, 236, 2550, 3070, 258, 2570, 2561, 228, 2558, + 3070, 2561, 2567, 2570, 2580, 2581, 2587, 2578, 2586, 2590, + 2580, 2599, 2589, 2597, 2590, 2609, 2609, 3070, 2604, 2592, + 200, 2614, 2601, 2614, 152, 2614, 2616, 2623, 2615, 2617, + 2620, 2622, 2624, 2627, 3070, 3070, 2627, 144, 2621, 2640, + 2628, 2651, 2650, 2645, 3070, 2636, 2653, 2645, 3070, 3070, + + 2648, 2644, 3070, 150, 2654, 2654, 2652, 2654, 3070, 2667, + 145, 2664, 2657, 3070, 2666, 2663, 2678, 124, 2679, 109, + 3070, 2673, 2672, 2680, 2678, 2690, 2684, 2687, 2689, 2694, + 2692, 2693, 2706, 3070, 3070, 2699, 2696, 2711, 2704, 2707, + 2721, 2707, 3070, 2711, 2715, 3070, 2718, 2717, 2727, 2731, + 3070, 3070, 2718, 2730, 3070, 2730, 3070, 3070, 2738, 2737, + 2741, 2744, 2745, 2748, 2751, 3070, 2735, 2736, 2737, 2740, + 2747, 2753, 2751, 2752, 2754, 2760, 2765, 2768, 2778, 2783, + 2780, 2781, 2781, 2786, 2775, 2778, 2789, 2780, 2796, 2793, + 2792, 2798, 3070, 2792, 3070, 3070, 3070, 3070, 3070, 3070, + + 2805, 2811, 2797, 3070, 2814, 100, 2816, 2809, 3070, 2804, + 2808, 2827, 2819, 2821, 3070, 3070, 2822, 3070, 2819, 2826, + 2834, 2833, 2819, 2841, 3070, 2849, 2834, 2851, 2843, 2855, + 2849, 2842, 2843, 2859, 3070, 2853, 2861, 2868, 3070, 2870, + 2869, 2869, 2875, 2877, 95, 2871, 2868, 2875, 2876, 3070, + 3070, 2872, 2881, 2890, 3070, 3070, 2893, 2881, 2882, 2899, + 2903, 2887, 3070, 2905, 2896, 3070, 2907, 3070, 2897, 2912, + 3070, 93, 2907, 2909, 2905, 3070, 3070, 2911, 2925, 2910, + 2911, 2914, 3070, 2920, 3070, 2931, 2927, 3070, 2934, 2932, + 2926, 2933, 2943, 3070, 2932, 3070, 3070, 3070, 105, 2994, + + 97, 84, 81 } ; -static yyconst flex_int16_t yy_def[1586] = +static yyconst flex_int16_t yy_def[1604] = { 0, - 1580, 1, 1580, 1580, 1580, 1581, 1582, 1583, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1581, 1582, 1580, - 1583, 1580, 1580, 1580, 1583, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1584, 1585, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1584, - 1584, 1585, 1585, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 0, - 1580, 1580, 1580, 1580, 1580 + 1598, 1, 1598, 1598, 1598, 1599, 1600, 1601, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1599, 1600, 1598, + 1601, 1598, 1598, 1598, 1601, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1602, 1603, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1602, 1602, 1603, 1603, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 0, 1598, 1598, + + 1598, 1598, 1598 } ; -static yyconst flex_int16_t yy_nxt[3104] = +static yyconst flex_int16_t yy_nxt[3139] = { 0, 4, 5, 6, 7, 8, 4, 9, 10, 11, 11, 11, 11, 11, 4, 4, 12, 13, 14, 15, 16, @@ -959,35 +968,35 @@ static yyconst flex_int16_t yy_nxt[3104] = 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, 1012, 54, 102, 1010, 67, 68, 43, 40, 40, - 61, 903, 106, 904, 62, 74, 69, 41, 63, 53, + 83, 1016, 54, 102, 1014, 67, 68, 43, 40, 40, + 61, 906, 106, 907, 62, 74, 69, 41, 63, 53, - 70, 64, 75, 905, 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, 1563, 71, 1546, 81, 72, 82, - 77, 1515, 47, 48, 128, 49, 78, 73, 312, 313, - 1451, 50, 79, 51, 131, 1424, 1425, 80, 107, 76, - 52, 55, 108, 56, 81, 1449, 82, 77, 57, 58, + 80, 65, 76, 52, 1580, 71, 1561, 81, 72, 82, + 77, 1528, 47, 48, 128, 49, 78, 73, 312, 313, + 1461, 50, 79, 51, 131, 1434, 1435, 80, 107, 76, + 52, 55, 108, 56, 81, 1459, 82, 77, 57, 58, 84, 128, 59, 78, 88, 60, 109, 85, 89, 79, - 86, 131, 87, 129, 90, 107, 1443, 130, 55, 108, - 56, 1437, 103, 1410, 132, 57, 58, 84, 133, 59, + 86, 131, 87, 129, 90, 107, 1453, 130, 55, 108, + 56, 1447, 103, 1423, 132, 57, 58, 84, 133, 59, 104, 88, 60, 109, 85, 89, 105, 86, 134, 87, 129, 90, 91, 92, 130, 135, 93, 125, 126, 103, 94, 132, 136, 127, 137, 133, 95, 104, 46, 46, 46, 46, 46, 105, 138, 134, 139, 140, 141, 91, - 92, 1389, 135, 93, 125, 126, 142, 94, 143, 136, + 92, 1419, 135, 93, 125, 126, 142, 94, 143, 136, 127, 137, 144, 95, 96, 145, 97, 146, 98, 149, - 147, 138, 99, 139, 140, 141, 150, 158, 100, 1386, - 1384, 159, 160, 142, 101, 143, 161, 1378, 1374, 144, + 147, 138, 99, 139, 140, 141, 150, 158, 100, 1398, + 1395, 159, 160, 142, 101, 143, 161, 1393, 1387, 144, 148, 96, 145, 97, 146, 98, 149, 147, 162, 99, - 1350, 151, 152, 150, 158, 100, 153, 156, 159, 160, + 1383, 151, 152, 150, 158, 100, 153, 156, 159, 160, - 1339, 101, 110, 161, 154, 111, 112, 148, 113, 155, - 1333, 157, 114, 115, 116, 162, 117, 118, 151, 152, - 168, 1324, 1321, 153, 156, 163, 169, 164, 1320, 110, - 170, 154, 111, 112, 1319, 113, 155, 166, 157, 114, + 1358, 101, 110, 161, 154, 111, 112, 148, 113, 155, + 1347, 157, 114, 115, 116, 162, 117, 118, 151, 152, + 168, 1341, 1332, 153, 156, 163, 169, 164, 1329, 110, + 170, 154, 111, 112, 1328, 113, 155, 166, 157, 114, 115, 116, 165, 117, 118, 119, 167, 168, 120, 121, 171, 175, 163, 169, 164, 122, 123, 170, 176, 173, 179, 172, 124, 180, 166, 174, 177, 181, 178, 165, @@ -997,18 +1006,18 @@ static yyconst flex_int16_t yy_nxt[3104] = 193, 184, 195, 192, 196, 194, 185, 186, 187, 197, 201, 188, 198, 202, 205, 208, 209, 213, 189, 203, - 206, 214, 199, 190, 1318, 1315, 191, 193, 200, 195, + 206, 214, 199, 190, 1327, 1326, 191, 193, 200, 195, 192, 196, 194, 207, 204, 210, 197, 201, 215, 198, 202, 205, 208, 209, 213, 216, 203, 206, 214, 199, - 224, 211, 212, 1304, 229, 200, 1299, 233, 225, 1287, - 1286, 204, 210, 234, 231, 215, 235, 237, 230, 226, - 238, 1273, 216, 227, 239, 228, 236, 224, 211, 212, + 224, 211, 212, 1323, 229, 200, 1311, 233, 225, 1306, + 1294, 204, 210, 234, 231, 215, 235, 237, 230, 226, + 238, 1293, 216, 227, 239, 228, 236, 224, 211, 212, 217, 229, 218, 219, 233, 225, 232, 220, 240, 221, 234, 231, 222, 235, 237, 230, 226, 238, 223, 241, 227, 239, 228, 236, 242, 243, 245, 217, 246, 218, - 219, 253, 1243, 232, 220, 240, 221, 254, 255, 222, - 1224, 259, 260, 262, 256, 223, 241, 257, 263, 264, + 219, 253, 1280, 232, 220, 240, 221, 254, 255, 222, + 1249, 259, 260, 262, 256, 223, 241, 257, 263, 264, 258, 242, 243, 245, 265, 246, 247, 266, 253, 248, 261, 269, 270, 271, 254, 255, 249, 250, 259, 260, 262, 256, 273, 251, 257, 263, 264, 258, 267, 252, @@ -1047,17 +1056,17 @@ static yyconst flex_int16_t yy_nxt[3104] = 414, 426, 427, 428, 429, 415, 430, 417, 418, 419, 434, 436, 420, 432, 437, 438, 439, 441, 443, 421, 431, 444, 422, 423, 424, 425, 433, 445, 426, 427, - 428, 429, 447, 430, 448, 449, 450, 434, 436, 1212, + 428, 429, 447, 430, 448, 449, 450, 434, 436, 1230, 432, 437, 438, 439, 441, 443, 460, 431, 444, 461, - 1205, 462, 463, 465, 445, 466, 1196, 464, 467, 447, + 1218, 462, 463, 465, 445, 466, 1211, 464, 467, 447, 469, 448, 449, 450, 451, 452, 453, 470, 471, 472, 454, 473, 455, 460, 474, 456, 461, 457, 462, 463, - 465, 475, 466, 458, 464, 467, 459, 469, 1178, 476, + 465, 475, 466, 458, 464, 467, 459, 469, 1202, 476, 481, 451, 452, 453, 470, 471, 472, 454, 473, 455, 483, 474, 456, 484, 457, 485, 486, 477, 475, 487, 458, 478, 488, 459, 489, 479, 476, 481, 490, 492, - 493, 494, 1176, 499, 500, 501, 502, 483, 503, 504, + 493, 494, 1184, 499, 500, 501, 502, 483, 503, 504, 484, 495, 485, 486, 477, 509, 487, 510, 478, 488, 496, 489, 506, 507, 497, 490, 492, 493, 494, 498, @@ -1087,215 +1096,218 @@ static yyconst flex_int16_t yy_nxt[3104] = 626, 608, 609, 611, 615, 627, 612, 613, 618, 616, 623, 620, 614, 624, 628, 631, 629, 632, 621, 630, 617, 633, 634, 622, 635, 619, 625, 626, 636, 638, - 643, 640, 627, 644, 646, 641, 647, 623, 642, 648, - 624, 628, 631, 629, 632, 649, 630, 650, 633, 634, - 651, 635, 652, 653, 654, 636, 638, 643, 640, 655, - 644, 646, 641, 647, 656, 642, 648, 657, 658, 659, - 661, 662, 649, 663, 650, 664, 666, 651, 667, 652, - 653, 654, 668, 669, 672, 673, 655, 674, 670, 675, - - 676, 656, 677, 678, 657, 658, 659, 661, 662, 679, - 663, 680, 664, 666, 681, 667, 671, 682, 684, 668, - 669, 672, 673, 686, 674, 670, 675, 676, 687, 677, - 678, 688, 694, 689, 690, 696, 679, 698, 680, 701, - 699, 681, 691, 703, 682, 684, 704, 692, 705, 706, - 686, 700, 707, 708, 709, 687, 710, 711, 688, 694, - 689, 690, 696, 712, 698, 713, 701, 699, 714, 691, - 703, 715, 718, 704, 692, 705, 706, 719, 700, 707, - 708, 709, 716, 710, 711, 720, 721, 722, 723, 717, - 712, 724, 713, 725, 726, 714, 727, 728, 715, 718, - - 729, 730, 731, 732, 719, 733, 734, 735, 736, 716, - 737, 739, 720, 721, 722, 723, 717, 740, 724, 741, - 725, 726, 742, 727, 728, 743, 744, 729, 730, 731, - 732, 745, 733, 734, 735, 736, 746, 737, 739, 747, - 748, 749, 751, 752, 740, 753, 741, 754, 755, 742, - 756, 757, 743, 744, 758, 759, 760, 761, 745, 762, - 763, 764, 765, 746, 766, 767, 747, 748, 749, 751, - 752, 768, 753, 769, 754, 755, 771, 756, 757, 1175, - 777, 758, 759, 760, 761, 779, 762, 763, 764, 765, - 781, 766, 767, 782, 783, 772, 784, 785, 768, 773, - - 769, 774, 786, 771, 787, 775, 776, 777, 788, 789, - 790, 791, 779, 792, 793, 794, 795, 781, 796, 797, - 782, 783, 772, 784, 785, 798, 773, 799, 774, 786, - 800, 787, 775, 776, 802, 788, 789, 790, 791, 806, - 792, 793, 794, 795, 807, 796, 797, 808, 809, 810, - 812, 815, 798, 813, 799, 816, 817, 800, 818, 819, - 820, 802, 821, 814, 822, 823, 806, 824, 825, 826, - 827, 807, 828, 829, 808, 809, 810, 812, 815, 830, - 813, 831, 816, 817, 832, 818, 819, 820, 833, 821, - 814, 822, 823, 834, 824, 825, 826, 827, 835, 828, - - 829, 836, 837, 838, 839, 840, 830, 841, 831, 842, - 843, 832, 844, 845, 846, 833, 847, 848, 849, 850, - 834, 851, 853, 854, 857, 835, 858, 859, 836, 837, - 838, 839, 840, 860, 841, 861, 842, 843, 862, 844, - 845, 846, 863, 847, 848, 849, 850, 864, 851, 853, - 854, 857, 865, 858, 859, 866, 867, 868, 869, 870, - 860, 871, 861, 872, 873, 862, 874, 875, 876, 863, - 877, 878, 879, 880, 864, 881, 882, 883, 884, 865, - 885, 886, 866, 867, 868, 869, 870, 887, 871, 888, - 872, 873, 889, 874, 875, 876, 895, 877, 878, 879, - - 880, 896, 881, 882, 883, 884, 898, 885, 886, 900, - 901, 906, 907, 908, 887, 909, 888, 910, 911, 889, - 912, 913, 914, 895, 916, 920, 917, 921, 896, 922, - 923, 918, 924, 898, 925, 915, 900, 901, 906, 907, - 908, 926, 909, 919, 910, 911, 927, 912, 913, 914, - 928, 916, 920, 917, 921, 929, 922, 923, 918, 924, - 930, 925, 915, 931, 932, 933, 934, 935, 926, 936, - 919, 937, 938, 927, 939, 940, 941, 928, 942, 943, - 944, 945, 929, 946, 947, 948, 949, 930, 950, 951, - 931, 932, 933, 934, 935, 952, 936, 953, 937, 938, - - 955, 939, 940, 941, 956, 942, 943, 944, 945, 957, - 946, 947, 948, 949, 958, 950, 951, 959, 960, 961, - 962, 965, 952, 963, 953, 966, 967, 955, 968, 969, - 970, 956, 971, 964, 972, 973, 957, 974, 975, 976, - 977, 958, 978, 979, 959, 960, 961, 962, 965, 980, - 963, 981, 966, 967, 982, 968, 969, 970, 983, 971, - 964, 972, 973, 984, 974, 975, 976, 977, 985, 978, - 979, 986, 988, 989, 990, 991, 980, 992, 981, 993, - 994, 982, 995, 996, 997, 983, 998, 999, 1000, 1001, - 984, 1003, 1004, 1005, 1006, 985, 1007, 1008, 986, 988, - - 989, 990, 991, 1009, 992, 1014, 993, 994, 1015, 995, - 996, 997, 1019, 998, 999, 1000, 1001, 1020, 1003, 1004, - 1005, 1006, 1021, 1007, 1008, 903, 1022, 904, 1023, 1024, - 1009, 1025, 1014, 1026, 1027, 1015, 1028, 905, 1029, 1019, - 1030, 1031, 1032, 1033, 1020, 1034, 1035, 1037, 1038, 1021, - 1039, 1040, 1041, 1022, 1045, 1023, 1024, 1046, 1025, 1048, - 1026, 1027, 1043, 1028, 1049, 1029, 1044, 1030, 1031, 1032, - 1033, 1050, 1034, 1035, 1037, 1038, 1051, 1039, 1040, 1041, - 1052, 1045, 1053, 1055, 1046, 1056, 1048, 1057, 1060, 1043, - 1061, 1049, 1063, 1044, 1064, 1065, 1058, 1066, 1050, 1067, - - 1069, 1070, 1071, 1051, 1059, 1072, 1075, 1052, 1077, 1053, - 1055, 1078, 1056, 1079, 1057, 1060, 1080, 1061, 1081, 1063, - 1082, 1064, 1065, 1058, 1066, 1083, 1067, 1069, 1070, 1071, - 1084, 1059, 1072, 1075, 1085, 1077, 1086, 1087, 1078, 1088, - 1079, 1089, 1090, 1080, 1091, 1081, 1092, 1082, 1093, 1094, - 1095, 1096, 1083, 1097, 1098, 1099, 1100, 1084, 1101, 1102, - 1103, 1085, 1104, 1086, 1087, 1105, 1088, 1106, 1089, 1090, - 1107, 1091, 1108, 1092, 1109, 1093, 1094, 1095, 1096, 1110, - 1097, 1098, 1099, 1100, 1111, 1101, 1102, 1103, 1112, 1104, - 1113, 1114, 1105, 1115, 1106, 1116, 1117, 1107, 1118, 1108, - - 1119, 1109, 1120, 1121, 1122, 1123, 1110, 1124, 1125, 1126, - 1127, 1111, 1128, 1129, 1130, 1112, 1131, 1113, 1114, 1132, - 1115, 1133, 1116, 1117, 1134, 1118, 1135, 1119, 1136, 1120, - 1121, 1122, 1123, 1138, 1124, 1125, 1126, 1127, 1139, 1128, - 1129, 1130, 1142, 1131, 1143, 1144, 1132, 1145, 1133, 1146, - 1147, 1134, 1148, 1135, 1149, 1136, 1150, 1151, 1152, 1153, - 1138, 1154, 1155, 1156, 1158, 1139, 1160, 1161, 1162, 1142, - 1163, 1143, 1144, 1164, 1145, 1165, 1146, 1147, 1166, 1148, - 1167, 1149, 1168, 1150, 1151, 1152, 1153, 1170, 1154, 1155, - 1156, 1158, 1171, 1160, 1161, 1162, 1172, 1163, 1173, 1174, - - 1164, 1177, 1165, 1179, 1180, 1166, 1181, 1167, 1182, 1168, - 1183, 1184, 1185, 1186, 1170, 1187, 1188, 1189, 1190, 1171, - 1191, 1192, 1193, 1172, 1194, 1173, 1174, 1195, 1177, 1197, - 1179, 1180, 1198, 1181, 1199, 1182, 1200, 1183, 1184, 1185, - 1186, 1201, 1187, 1188, 1189, 1190, 1202, 1191, 1192, 1193, - 1203, 1194, 1204, 1206, 1195, 1207, 1197, 1208, 1209, 1198, - 1210, 1199, 1211, 1200, 1213, 1216, 1214, 1217, 1201, 1218, - 1219, 1220, 1222, 1202, 1215, 1223, 1225, 1203, 1226, 1204, - 1206, 1227, 1207, 1228, 1208, 1209, 1229, 1210, 1221, 1211, - 1230, 1213, 1216, 1214, 1217, 1231, 1218, 1219, 1220, 1222, - - 1232, 1233, 1223, 1225, 1234, 1226, 1235, 1236, 1227, 1239, - 1228, 1240, 1237, 1229, 1241, 1221, 1242, 1230, 1238, 1244, - 1245, 1246, 1231, 1247, 1248, 1249, 1250, 1232, 1233, 1251, - 1252, 1234, 1253, 1235, 1236, 1254, 1239, 1255, 1240, 1237, - 1256, 1241, 1257, 1242, 1258, 1238, 1244, 1245, 1246, 1259, - 1247, 1248, 1249, 1250, 1260, 1261, 1251, 1252, 1262, 1253, - 1263, 1264, 1254, 1265, 1255, 1266, 1267, 1256, 1268, 1257, - 1269, 1258, 1270, 1271, 1272, 1274, 1259, 1275, 1276, 1277, - 1278, 1260, 1261, 1279, 1280, 1262, 1281, 1263, 1264, 1282, - 1265, 1283, 1266, 1267, 1284, 1268, 1285, 1269, 1288, 1270, - - 1271, 1272, 1274, 1289, 1275, 1276, 1277, 1278, 1290, 1291, - 1279, 1280, 1292, 1281, 1293, 1294, 1282, 1295, 1283, 1296, - 1297, 1284, 1298, 1285, 1300, 1288, 1301, 1302, 1303, 1305, - 1289, 1306, 1307, 1308, 1309, 1290, 1291, 1310, 1311, 1292, - 1312, 1293, 1294, 1313, 1295, 1314, 1296, 1297, 1316, 1298, - 1317, 1300, 1322, 1301, 1302, 1303, 1305, 1323, 1306, 1307, - 1308, 1309, 1325, 1326, 1310, 1311, 1327, 1312, 1328, 1329, - 1313, 1330, 1314, 1331, 1332, 1316, 1334, 1317, 1335, 1322, - 1336, 1337, 1338, 1340, 1323, 1341, 1342, 1343, 1344, 1325, - 1326, 1345, 1346, 1327, 1347, 1328, 1329, 1348, 1330, 1349, - - 1331, 1332, 1351, 1334, 1352, 1335, 1353, 1336, 1337, 1338, - 1340, 1354, 1341, 1342, 1343, 1344, 1355, 1356, 1345, 1346, - 1357, 1347, 1358, 1359, 1348, 1360, 1349, 1361, 1362, 1351, - 1363, 1352, 1364, 1353, 1365, 1366, 1367, 1368, 1354, 1369, - 1370, 1371, 1372, 1355, 1356, 1373, 1375, 1357, 1376, 1358, - 1359, 1377, 1360, 1379, 1361, 1362, 1380, 1363, 1381, 1364, - 1382, 1365, 1366, 1367, 1368, 1383, 1369, 1370, 1371, 1372, - 1385, 1387, 1373, 1375, 1388, 1376, 1390, 1391, 1377, 1392, - 1379, 1393, 1394, 1380, 1395, 1381, 1396, 1382, 1397, 1399, - 1400, 1401, 1383, 1402, 1398, 1403, 1404, 1385, 1387, 1405, - - 1406, 1388, 1407, 1390, 1391, 1408, 1392, 1409, 1393, 1394, - 1411, 1395, 1412, 1396, 1413, 1397, 1399, 1400, 1401, 1414, - 1402, 1398, 1403, 1404, 1415, 1416, 1405, 1406, 1417, 1407, - 1418, 1419, 1408, 1420, 1409, 1421, 1422, 1411, 1423, 1412, - 1426, 1413, 1427, 1428, 1429, 1430, 1414, 1431, 1432, 1433, - 1434, 1415, 1416, 1435, 1436, 1417, 1438, 1418, 1419, 1439, - 1420, 1440, 1421, 1422, 1441, 1423, 1442, 1426, 1444, 1427, - 1428, 1429, 1430, 1445, 1431, 1432, 1433, 1434, 1446, 1447, - 1435, 1436, 1448, 1438, 1450, 1452, 1439, 1453, 1440, 1454, - 1455, 1441, 1456, 1442, 1457, 1444, 1458, 1459, 1460, 1461, - - 1445, 1462, 1463, 1464, 1465, 1446, 1447, 1466, 1467, 1448, - 1468, 1450, 1452, 1469, 1453, 1470, 1454, 1455, 1471, 1456, - 1472, 1457, 1473, 1458, 1459, 1460, 1461, 1474, 1462, 1463, - 1464, 1465, 1475, 1476, 1466, 1467, 1477, 1468, 1478, 1479, - 1469, 1480, 1470, 1481, 1482, 1471, 1483, 1472, 1484, 1473, - 1485, 1486, 1487, 1488, 1474, 1489, 1490, 1491, 1492, 1475, - 1476, 1493, 1494, 1477, 1495, 1478, 1479, 1496, 1480, 1497, - 1481, 1482, 1498, 1483, 1499, 1484, 1500, 1485, 1486, 1487, - 1488, 1501, 1489, 1490, 1491, 1492, 1502, 1503, 1493, 1494, - 1504, 1495, 1505, 1506, 1496, 1507, 1497, 1508, 1509, 1498, - - 1510, 1499, 1511, 1500, 1512, 1513, 1514, 1516, 1501, 1517, - 1518, 1519, 1520, 1502, 1503, 1521, 1522, 1504, 1523, 1505, - 1506, 1524, 1507, 1525, 1508, 1509, 1526, 1510, 1527, 1511, - 1528, 1512, 1513, 1514, 1516, 1529, 1517, 1518, 1519, 1520, - 1530, 1531, 1521, 1522, 1532, 1523, 1533, 1534, 1524, 1535, - 1525, 1536, 1537, 1526, 1538, 1527, 1539, 1528, 1540, 1541, - 1542, 1543, 1529, 1544, 1545, 1547, 1548, 1530, 1531, 1549, - 1550, 1532, 1551, 1533, 1534, 1552, 1535, 1553, 1536, 1537, - 1554, 1538, 1555, 1539, 1556, 1540, 1541, 1542, 1543, 1557, - 1544, 1545, 1547, 1548, 1558, 1559, 1549, 1550, 1560, 1551, - - 1561, 1562, 1552, 1564, 1553, 1565, 1566, 1554, 1567, 1555, - 1568, 1556, 1569, 1570, 1571, 1572, 1557, 1573, 1574, 1575, - 1576, 1558, 1559, 1577, 1578, 1560, 1579, 1561, 1562, 1169, - 1564, 1159, 1565, 1566, 1157, 1567, 1141, 1568, 1140, 1569, - 1570, 1571, 1572, 1137, 1573, 1574, 1575, 1576, 1013, 1013, - 1577, 1578, 1011, 1579, 39, 39, 1011, 1076, 1074, 1073, - 1068, 1062, 1054, 1047, 1042, 1036, 1018, 1017, 1016, 1013, - 1011, 1002, 987, 954, 902, 899, 897, 894, 893, 892, - 891, 890, 856, 855, 852, 811, 805, 804, 803, 801, - 780, 778, 770, 750, 738, 702, 697, 695, 693, 685, - - 683, 665, 660, 645, 639, 637, 610, 576, 574, 573, - 558, 527, 513, 512, 505, 491, 482, 480, 468, 446, - 442, 440, 435, 416, 407, 400, 359, 325, 309, 272, - 244, 37, 37, 1580, 3, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580 + 1181, 644, 627, 1180, 645, 647, 648, 623, 649, 650, + 624, 628, 631, 629, 632, 651, 630, 652, 633, 634, + 640, 635, 653, 654, 641, 636, 638, 642, 644, 655, + 643, 645, 647, 648, 656, 649, 650, 657, 658, 659, + 660, 662, 651, 663, 652, 664, 665, 640, 667, 653, + 654, 641, 668, 669, 642, 670, 655, 643, 671, 673, + + 674, 656, 675, 676, 657, 658, 659, 660, 662, 677, + 663, 678, 664, 665, 679, 667, 672, 680, 681, 668, + 669, 682, 670, 683, 685, 671, 673, 674, 687, 675, + 676, 688, 689, 690, 691, 695, 677, 697, 678, 699, + 702, 679, 692, 700, 680, 681, 704, 693, 682, 705, + 683, 685, 706, 707, 701, 687, 708, 709, 688, 689, + 690, 691, 695, 710, 697, 711, 699, 702, 712, 692, + 700, 713, 714, 704, 693, 715, 705, 716, 717, 706, + 707, 701, 719, 708, 709, 718, 720, 721, 722, 723, + 710, 724, 711, 725, 726, 712, 727, 728, 713, 714, + + 729, 730, 715, 731, 716, 717, 732, 733, 734, 719, + 735, 736, 718, 720, 721, 722, 723, 737, 724, 738, + 725, 726, 740, 727, 728, 741, 742, 729, 730, 743, + 731, 744, 745, 732, 733, 734, 746, 735, 736, 747, + 748, 749, 750, 752, 737, 753, 738, 754, 755, 740, + 756, 757, 741, 742, 758, 759, 743, 760, 744, 745, + 761, 762, 763, 746, 764, 765, 747, 748, 749, 750, + 752, 766, 753, 767, 754, 755, 768, 756, 757, 769, + 770, 758, 759, 771, 760, 773, 779, 761, 762, 763, + 781, 764, 765, 783, 784, 785, 786, 787, 766, 788, + + 767, 789, 790, 768, 791, 774, 769, 770, 792, 775, + 771, 776, 773, 779, 793, 777, 778, 781, 794, 795, + 783, 784, 785, 786, 787, 796, 788, 797, 789, 790, + 798, 791, 774, 799, 800, 792, 775, 801, 776, 802, + 804, 793, 777, 778, 808, 794, 795, 809, 810, 811, + 812, 814, 796, 815, 797, 817, 818, 798, 819, 820, + 799, 800, 821, 816, 801, 822, 802, 804, 823, 824, + 825, 808, 826, 827, 809, 810, 811, 812, 814, 828, + 815, 829, 817, 818, 830, 819, 820, 831, 832, 821, + 816, 833, 822, 834, 835, 823, 824, 825, 836, 826, + + 827, 837, 838, 839, 840, 841, 828, 842, 829, 843, + 844, 830, 845, 846, 831, 832, 847, 848, 833, 849, + 834, 835, 850, 851, 852, 836, 853, 855, 837, 838, + 839, 840, 841, 856, 842, 859, 843, 844, 860, 845, + 846, 861, 862, 847, 848, 863, 849, 864, 865, 850, + 851, 852, 866, 853, 855, 867, 868, 869, 870, 871, + 856, 872, 859, 873, 874, 860, 875, 876, 861, 862, + 877, 878, 863, 879, 864, 865, 880, 881, 882, 866, + 883, 884, 867, 868, 869, 870, 871, 885, 872, 886, + 873, 874, 887, 875, 876, 888, 889, 877, 878, 890, + + 879, 891, 892, 880, 881, 882, 898, 883, 884, 899, + 901, 903, 904, 909, 885, 910, 886, 911, 912, 887, + 913, 914, 888, 889, 915, 916, 890, 919, 891, 892, + 917, 1174, 923, 898, 924, 925, 899, 901, 903, 904, + 909, 920, 910, 918, 911, 912, 921, 913, 914, 926, + 927, 915, 916, 928, 919, 929, 930, 917, 922, 923, + 931, 924, 925, 932, 933, 934, 935, 936, 920, 937, + 918, 938, 939, 921, 940, 941, 926, 927, 942, 943, + 928, 944, 929, 930, 945, 922, 946, 931, 947, 948, + 932, 933, 934, 935, 936, 949, 937, 950, 938, 939, + + 951, 940, 941, 952, 953, 942, 943, 954, 944, 955, + 956, 945, 958, 946, 959, 947, 948, 960, 961, 962, + 963, 964, 949, 965, 950, 966, 968, 951, 969, 970, + 952, 953, 971, 972, 954, 967, 955, 956, 973, 958, + 974, 959, 975, 976, 960, 961, 962, 963, 964, 977, + 965, 978, 966, 968, 979, 969, 970, 980, 981, 971, + 972, 982, 967, 983, 984, 973, 985, 974, 986, 975, + 976, 987, 988, 989, 991, 992, 977, 993, 978, 994, + 995, 979, 996, 997, 980, 981, 998, 999, 982, 1000, + 983, 984, 1001, 985, 1002, 986, 1003, 1004, 987, 988, + + 989, 991, 992, 1005, 993, 1007, 994, 995, 1008, 996, + 997, 1009, 1010, 998, 999, 1011, 1000, 1012, 1013, 1001, + 1018, 1002, 1019, 1003, 1004, 906, 1023, 907, 1024, 1025, + 1005, 1026, 1007, 1027, 1028, 1008, 1029, 908, 1009, 1010, + 1030, 1031, 1011, 1032, 1012, 1013, 1033, 1018, 1034, 1019, + 1035, 1036, 1037, 1023, 1038, 1024, 1025, 1039, 1026, 1041, + 1027, 1028, 1042, 1029, 1043, 1044, 1045, 1030, 1031, 1049, + 1032, 1050, 1047, 1033, 1052, 1034, 1048, 1035, 1036, 1037, + 1053, 1038, 1054, 1055, 1039, 1056, 1041, 1057, 1059, 1042, + 1060, 1043, 1044, 1045, 1064, 1065, 1049, 1067, 1050, 1047, + + 1068, 1052, 1061, 1048, 1069, 1070, 1071, 1053, 1073, 1054, + 1055, 1062, 1056, 1074, 1057, 1059, 1075, 1060, 1076, 1063, + 1079, 1064, 1065, 1081, 1067, 1082, 1083, 1068, 1084, 1061, + 1085, 1069, 1070, 1071, 1086, 1073, 1087, 1088, 1062, 1089, + 1074, 1090, 1091, 1075, 1092, 1076, 1063, 1079, 1093, 1094, + 1081, 1095, 1082, 1083, 1096, 1084, 1097, 1085, 1098, 1099, + 1100, 1086, 1101, 1087, 1088, 1102, 1089, 1103, 1090, 1091, + 1104, 1092, 1105, 1106, 1107, 1093, 1094, 1108, 1095, 1109, + 1110, 1096, 1111, 1097, 1112, 1098, 1099, 1100, 1113, 1101, + 1114, 1115, 1102, 1116, 1103, 1117, 1118, 1104, 1119, 1105, + + 1106, 1107, 1120, 1121, 1108, 1122, 1109, 1110, 1123, 1111, + 1124, 1112, 1125, 1126, 1127, 1113, 1128, 1114, 1115, 1129, + 1116, 1130, 1117, 1118, 1131, 1119, 1132, 1133, 1134, 1120, + 1121, 1135, 1122, 1136, 1137, 1123, 1138, 1124, 1139, 1125, + 1126, 1127, 1140, 1128, 1141, 1143, 1129, 1144, 1130, 1147, + 1148, 1131, 1149, 1132, 1133, 1134, 1150, 1151, 1135, 1152, + 1136, 1137, 1153, 1138, 1154, 1139, 1155, 1156, 1157, 1140, + 1158, 1141, 1143, 1159, 1144, 1160, 1147, 1148, 1161, 1149, + 1163, 1165, 1166, 1150, 1151, 1167, 1152, 1168, 1169, 1153, + 1170, 1154, 1171, 1155, 1156, 1157, 1172, 1158, 1173, 1175, + + 1159, 1176, 1160, 1177, 1178, 1161, 1179, 1163, 1165, 1166, + 1182, 1183, 1167, 1185, 1168, 1169, 1186, 1170, 1187, 1171, + 1188, 1189, 1190, 1172, 1191, 1173, 1175, 1192, 1176, 1193, + 1177, 1178, 1194, 1179, 1195, 1196, 1197, 1182, 1183, 1198, + 1185, 1199, 1200, 1186, 1201, 1187, 1203, 1188, 1189, 1190, + 1204, 1191, 1205, 1206, 1192, 1207, 1193, 1208, 1209, 1194, + 1210, 1195, 1196, 1197, 1212, 1213, 1198, 1214, 1199, 1200, + 1215, 1201, 1216, 1203, 1217, 1219, 1222, 1204, 1220, 1205, + 1206, 1223, 1207, 1224, 1208, 1209, 1221, 1210, 1225, 1226, + 1228, 1212, 1213, 1229, 1214, 1231, 1232, 1215, 1233, 1216, + + 1234, 1217, 1219, 1222, 1235, 1220, 1227, 1236, 1223, 1237, + 1224, 1238, 1239, 1240, 1241, 1225, 1226, 1228, 1242, 1245, + 1229, 1246, 1231, 1232, 1243, 1233, 1247, 1234, 1248, 1250, + 1244, 1235, 1251, 1227, 1236, 1252, 1237, 1253, 1238, 1239, + 1240, 1241, 1254, 1255, 1256, 1242, 1245, 1257, 1246, 1258, + 1259, 1243, 1260, 1247, 1261, 1248, 1250, 1244, 1262, 1251, + 1263, 1264, 1252, 1265, 1253, 1266, 1267, 1268, 1269, 1254, + 1255, 1256, 1270, 1271, 1257, 1272, 1258, 1259, 1273, 1260, + 1274, 1261, 1275, 1276, 1277, 1262, 1278, 1263, 1264, 1279, + 1265, 1281, 1266, 1267, 1268, 1269, 1282, 1283, 1284, 1270, + + 1271, 1285, 1272, 1286, 1287, 1273, 1288, 1274, 1289, 1275, + 1276, 1277, 1290, 1278, 1291, 1292, 1279, 1295, 1281, 1296, + 1297, 1298, 1299, 1282, 1283, 1284, 1300, 1301, 1285, 1302, + 1286, 1287, 1303, 1288, 1304, 1289, 1305, 1307, 1308, 1290, + 1309, 1291, 1292, 1310, 1295, 1312, 1296, 1297, 1298, 1299, + 1313, 1314, 1315, 1300, 1301, 1316, 1302, 1317, 1318, 1303, + 1319, 1304, 1320, 1305, 1307, 1308, 1321, 1309, 1322, 1324, + 1310, 1325, 1312, 1330, 1331, 1333, 1334, 1313, 1314, 1315, + 1335, 1336, 1316, 1337, 1317, 1318, 1338, 1319, 1339, 1320, + 1340, 1342, 1343, 1321, 1344, 1322, 1324, 1345, 1325, 1346, + + 1330, 1331, 1333, 1334, 1348, 1349, 1350, 1335, 1336, 1351, + 1337, 1352, 1353, 1338, 1354, 1339, 1355, 1340, 1342, 1343, + 1356, 1344, 1357, 1359, 1345, 1360, 1346, 1361, 1362, 1363, + 1364, 1348, 1349, 1350, 1365, 1366, 1351, 1367, 1352, 1353, + 1368, 1354, 1369, 1355, 1370, 1371, 1372, 1356, 1373, 1357, + 1359, 1374, 1360, 1375, 1361, 1362, 1363, 1364, 1376, 1377, + 1378, 1365, 1366, 1379, 1367, 1380, 1381, 1368, 1382, 1369, + 1384, 1370, 1371, 1372, 1385, 1373, 1386, 1388, 1374, 1389, + 1375, 1390, 1392, 1391, 1394, 1376, 1377, 1378, 1396, 1397, + 1379, 1399, 1380, 1381, 1400, 1382, 1401, 1384, 1402, 1403, + + 1404, 1385, 1405, 1386, 1388, 1408, 1389, 1406, 1390, 1392, + 1391, 1394, 1409, 1407, 1410, 1396, 1397, 1411, 1399, 1412, + 1413, 1400, 1414, 1401, 1415, 1402, 1403, 1404, 1416, 1405, + 1417, 1418, 1408, 1420, 1406, 1421, 1422, 1424, 1425, 1409, + 1407, 1410, 1426, 1427, 1411, 1428, 1412, 1413, 1429, 1414, + 1430, 1415, 1431, 1432, 1433, 1416, 1436, 1417, 1418, 1437, + 1420, 1438, 1421, 1422, 1424, 1425, 1439, 1440, 1441, 1426, + 1427, 1442, 1428, 1443, 1444, 1429, 1445, 1430, 1446, 1431, + 1432, 1433, 1448, 1436, 1449, 1450, 1437, 1451, 1438, 1452, + 1454, 1455, 1456, 1439, 1440, 1441, 1457, 1458, 1442, 1460, + + 1443, 1444, 1462, 1445, 1463, 1446, 1464, 1465, 1466, 1448, + 1467, 1449, 1450, 1468, 1451, 1469, 1452, 1454, 1455, 1456, + 1470, 1471, 1472, 1457, 1458, 1473, 1460, 1474, 1475, 1462, + 1476, 1463, 1477, 1464, 1465, 1466, 1478, 1467, 1479, 1480, + 1468, 1481, 1469, 1482, 1483, 1484, 1485, 1470, 1471, 1472, + 1486, 1487, 1473, 1488, 1474, 1475, 1489, 1476, 1490, 1477, + 1491, 1492, 1493, 1478, 1494, 1479, 1480, 1495, 1481, 1496, + 1482, 1483, 1484, 1485, 1497, 1498, 1499, 1486, 1487, 1500, + 1488, 1501, 1502, 1489, 1503, 1490, 1504, 1491, 1492, 1493, + 1505, 1494, 1506, 1507, 1495, 1508, 1496, 1509, 1510, 1511, + + 1512, 1497, 1498, 1499, 1513, 1514, 1500, 1515, 1501, 1502, + 1516, 1503, 1517, 1504, 1518, 1519, 1520, 1505, 1521, 1506, + 1507, 1522, 1508, 1523, 1509, 1510, 1511, 1512, 1524, 1525, + 1526, 1513, 1514, 1527, 1515, 1529, 1530, 1516, 1531, 1517, + 1532, 1518, 1519, 1520, 1533, 1521, 1534, 1535, 1522, 1536, + 1523, 1537, 1538, 1539, 1542, 1524, 1525, 1526, 1543, 1540, + 1527, 1541, 1529, 1530, 1544, 1531, 1545, 1532, 1546, 1547, + 1548, 1533, 1549, 1534, 1535, 1550, 1536, 1551, 1537, 1538, + 1539, 1542, 1552, 1553, 1554, 1543, 1540, 1555, 1541, 1556, + 1557, 1544, 1558, 1545, 1559, 1546, 1547, 1548, 1560, 1549, + + 1562, 1563, 1550, 1564, 1551, 1565, 1566, 1567, 1568, 1552, + 1553, 1554, 1569, 1570, 1555, 1571, 1556, 1557, 1572, 1558, + 1573, 1559, 1574, 1575, 1576, 1560, 1577, 1562, 1563, 1578, + 1564, 1579, 1565, 1566, 1567, 1568, 1581, 1582, 1583, 1569, + 1570, 1584, 1571, 1585, 1586, 1572, 1587, 1573, 1588, 1574, + 1575, 1576, 1589, 1577, 1590, 1591, 1578, 1592, 1579, 1593, + 1594, 1595, 1596, 1581, 1582, 1583, 1597, 1164, 1584, 1162, + 1585, 1586, 1146, 1587, 1145, 1588, 1142, 1017, 1017, 1589, + 1015, 1590, 1591, 1015, 1592, 1080, 1593, 1594, 1595, 1596, + 1078, 1077, 1072, 1597, 39, 39, 1066, 1058, 1051, 1046, + + 1040, 1022, 1021, 1020, 1017, 1015, 1006, 990, 957, 905, + 902, 900, 897, 896, 895, 894, 893, 858, 857, 854, + 813, 807, 806, 805, 803, 782, 780, 772, 751, 739, + 703, 698, 696, 694, 686, 684, 666, 661, 646, 639, + 637, 610, 576, 574, 573, 558, 527, 513, 512, 505, + 491, 482, 480, 468, 446, 442, 440, 435, 416, 407, + 400, 359, 325, 309, 272, 244, 37, 37, 1598, 3, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598 } ; -static yyconst flex_int16_t yy_chk[3104] = +static yyconst flex_int16_t yy_chk[3139] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1305,35 +1317,35 @@ static yyconst flex_int16_t yy_chk[3104] = 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, 1585, 13, 26, 1584, 16, 16, 9, 39, 39, - 15, 790, 28, 790, 15, 18, 16, 1583, 15, 13, + 21, 1603, 13, 26, 1602, 16, 16, 9, 39, 39, + 15, 792, 28, 792, 15, 18, 16, 1601, 15, 13, - 17, 15, 18, 790, 15, 1581, 16, 21, 17, 13, + 17, 15, 18, 792, 15, 1599, 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, 1556, 17, 1531, 20, 17, 20, - 19, 1494, 12, 12, 33, 12, 19, 17, 182, 182, - 1411, 12, 19, 12, 35, 1379, 1379, 20, 29, 19, - 12, 14, 29, 14, 20, 1409, 20, 19, 14, 14, + 20, 15, 19, 12, 1572, 17, 1545, 20, 17, 20, + 19, 1506, 12, 12, 33, 12, 19, 17, 182, 182, + 1420, 12, 19, 12, 35, 1388, 1388, 20, 29, 19, + 12, 14, 29, 14, 20, 1418, 20, 19, 14, 14, 22, 33, 14, 19, 23, 14, 29, 22, 23, 19, - 22, 35, 22, 34, 23, 29, 1402, 34, 14, 29, - 14, 1395, 27, 1363, 36, 14, 14, 22, 43, 14, + 22, 35, 22, 34, 23, 29, 1411, 34, 14, 29, + 14, 1404, 27, 1375, 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, 1341, 48, 24, 32, 32, 55, 24, 55, 49, + 24, 1371, 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, 1338, - 1335, 65, 66, 55, 25, 55, 67, 1329, 1323, 56, + 59, 51, 25, 52, 53, 54, 61, 64, 25, 1349, + 1346, 65, 66, 55, 25, 55, 67, 1343, 1337, 56, 59, 25, 57, 25, 58, 25, 60, 59, 68, 25, - 1292, 62, 62, 61, 64, 25, 62, 63, 65, 66, + 1331, 62, 62, 61, 64, 25, 62, 63, 65, 66, - 1280, 25, 30, 67, 62, 30, 30, 59, 30, 62, - 1272, 63, 30, 30, 30, 68, 30, 30, 62, 62, - 71, 1261, 1258, 62, 63, 69, 72, 69, 1257, 30, - 73, 62, 30, 30, 1256, 30, 62, 70, 63, 30, + 1299, 25, 30, 67, 62, 30, 30, 59, 30, 62, + 1287, 63, 30, 30, 30, 68, 30, 30, 62, 62, + 71, 1279, 1268, 62, 63, 69, 72, 69, 1265, 30, + 73, 62, 30, 30, 1264, 30, 62, 70, 63, 30, 30, 30, 69, 30, 30, 31, 70, 71, 31, 31, 74, 76, 69, 72, 69, 31, 31, 73, 77, 75, 79, 74, 31, 80, 70, 75, 78, 81, 78, 69, @@ -1343,18 +1355,18 @@ static yyconst flex_int16_t yy_chk[3104] = 91, 84, 92, 90, 93, 91, 85, 86, 87, 94, 96, 88, 95, 97, 99, 101, 102, 104, 89, 98, - 100, 105, 95, 89, 1255, 1252, 90, 91, 95, 92, + 100, 105, 95, 89, 1263, 1262, 90, 91, 95, 92, 90, 93, 91, 100, 98, 103, 94, 96, 106, 95, 97, 99, 101, 102, 104, 107, 98, 100, 105, 95, - 109, 103, 103, 1239, 111, 95, 1234, 113, 110, 1219, - 1218, 98, 103, 114, 112, 106, 115, 116, 111, 110, - 117, 1200, 107, 110, 118, 110, 115, 109, 103, 103, + 109, 103, 103, 1259, 111, 95, 1245, 113, 110, 1240, + 1225, 98, 103, 114, 112, 106, 115, 116, 111, 110, + 117, 1224, 107, 110, 118, 110, 115, 109, 103, 103, 108, 111, 108, 108, 113, 110, 112, 108, 119, 108, 114, 112, 108, 115, 116, 111, 110, 117, 108, 120, 110, 118, 110, 115, 121, 122, 124, 108, 125, 108, - 108, 127, 1168, 112, 108, 119, 108, 128, 129, 108, - 1143, 131, 132, 133, 129, 108, 120, 130, 134, 135, + 108, 127, 1206, 112, 108, 119, 108, 128, 129, 108, + 1173, 131, 132, 133, 129, 108, 120, 130, 134, 135, 130, 121, 122, 124, 136, 125, 126, 138, 127, 126, 132, 140, 141, 142, 128, 129, 126, 126, 131, 132, 133, 129, 144, 126, 130, 134, 135, 130, 139, 126, @@ -1393,17 +1405,17 @@ static yyconst flex_int16_t yy_chk[3104] = 285, 298, 300, 301, 302, 286, 303, 288, 289, 290, 305, 308, 291, 304, 309, 310, 311, 315, 317, 292, 303, 318, 293, 294, 295, 297, 304, 319, 298, 300, - 301, 302, 321, 303, 322, 323, 324, 305, 308, 1132, + 301, 302, 321, 303, 322, 323, 324, 305, 308, 1148, 304, 309, 310, 311, 315, 317, 326, 303, 318, 327, - 1124, 328, 329, 330, 319, 331, 1113, 329, 334, 321, + 1137, 328, 329, 330, 319, 331, 1129, 329, 334, 321, 336, 322, 323, 324, 325, 325, 325, 338, 339, 340, 325, 341, 325, 326, 342, 325, 327, 325, 328, 329, - 330, 343, 331, 325, 329, 334, 325, 336, 1095, 344, + 330, 343, 331, 325, 329, 334, 325, 336, 1118, 344, 346, 325, 325, 325, 338, 339, 340, 325, 341, 325, 350, 342, 325, 351, 325, 352, 353, 344, 343, 354, 325, 344, 355, 325, 356, 344, 344, 346, 357, 359, - 360, 361, 1093, 363, 364, 366, 367, 350, 368, 369, + 360, 361, 1100, 363, 364, 366, 367, 350, 368, 369, 351, 361, 352, 353, 344, 372, 354, 373, 344, 355, 362, 356, 371, 371, 362, 357, 359, 360, 361, 362, @@ -1433,212 +1445,215 @@ static yyconst flex_int16_t yy_chk[3104] = 489, 475, 476, 478, 480, 490, 479, 479, 482, 481, 487, 483, 479, 487, 491, 493, 492, 495, 484, 492, 481, 496, 497, 485, 498, 482, 488, 489, 499, 502, - 507, 506, 490, 508, 510, 506, 511, 487, 506, 513, - 487, 491, 493, 492, 495, 514, 492, 515, 496, 497, - 516, 498, 517, 518, 519, 499, 502, 507, 506, 520, - 508, 510, 506, 511, 521, 506, 513, 522, 523, 524, - 526, 527, 514, 528, 515, 532, 534, 516, 536, 517, - 518, 519, 537, 538, 540, 541, 520, 542, 539, 543, - - 544, 521, 545, 546, 522, 523, 524, 526, 527, 547, - 528, 548, 532, 534, 549, 536, 539, 550, 553, 537, - 538, 540, 541, 555, 542, 539, 543, 544, 556, 545, - 546, 557, 560, 558, 558, 562, 547, 564, 548, 566, - 565, 549, 558, 568, 550, 553, 569, 558, 571, 572, - 555, 565, 573, 574, 575, 556, 576, 580, 557, 560, - 558, 558, 562, 581, 564, 582, 566, 565, 583, 558, - 568, 584, 586, 569, 558, 571, 572, 587, 565, 573, - 574, 575, 585, 576, 580, 588, 589, 590, 591, 585, - 581, 593, 582, 594, 595, 583, 596, 597, 584, 586, - - 599, 600, 601, 602, 587, 603, 604, 605, 606, 585, - 607, 609, 588, 589, 590, 591, 585, 610, 593, 611, - 594, 595, 612, 596, 597, 613, 614, 599, 600, 601, - 602, 615, 603, 604, 605, 606, 617, 607, 609, 618, - 619, 620, 623, 624, 610, 626, 611, 627, 628, 612, - 629, 630, 613, 614, 631, 632, 633, 633, 615, 634, - 635, 637, 638, 617, 639, 640, 618, 619, 620, 623, - 624, 641, 626, 642, 627, 628, 644, 629, 630, 1092, - 646, 631, 632, 633, 633, 648, 634, 635, 637, 638, - 650, 639, 640, 653, 654, 645, 655, 657, 641, 645, - - 642, 645, 658, 644, 659, 645, 645, 646, 661, 662, - 664, 665, 648, 666, 667, 668, 669, 650, 670, 671, - 653, 654, 645, 655, 657, 672, 645, 674, 645, 658, - 676, 659, 645, 645, 678, 661, 662, 664, 665, 682, - 666, 667, 668, 669, 683, 670, 671, 684, 685, 686, - 689, 691, 672, 690, 674, 692, 693, 676, 695, 696, - 697, 678, 698, 690, 699, 700, 682, 701, 702, 703, - 704, 683, 705, 706, 684, 685, 686, 689, 691, 707, - 690, 708, 692, 693, 709, 695, 696, 697, 710, 698, - 690, 699, 700, 711, 701, 702, 703, 704, 712, 705, - - 706, 713, 714, 715, 716, 717, 707, 718, 708, 719, - 720, 709, 721, 722, 723, 710, 724, 726, 727, 730, - 711, 731, 733, 734, 737, 712, 738, 739, 713, 714, - 715, 716, 717, 740, 718, 741, 719, 720, 742, 721, - 722, 723, 743, 724, 726, 727, 730, 744, 731, 733, - 734, 737, 745, 738, 739, 746, 747, 748, 749, 750, - 740, 751, 741, 752, 753, 742, 755, 756, 757, 743, - 759, 760, 761, 762, 744, 763, 764, 765, 766, 745, - 767, 768, 746, 747, 748, 749, 750, 769, 751, 770, - 752, 753, 771, 755, 756, 757, 777, 759, 760, 761, - - 762, 778, 763, 764, 765, 766, 780, 767, 768, 784, - 787, 791, 792, 793, 769, 794, 770, 797, 798, 771, - 799, 800, 801, 777, 802, 804, 803, 805, 778, 806, - 807, 803, 809, 780, 810, 801, 784, 787, 791, 792, - 793, 811, 794, 803, 797, 798, 812, 799, 800, 801, - 813, 802, 804, 803, 805, 814, 806, 807, 803, 809, - 815, 810, 801, 816, 817, 818, 819, 820, 811, 821, - 803, 822, 823, 812, 825, 826, 827, 813, 828, 829, - 830, 831, 814, 832, 833, 834, 836, 815, 837, 838, - 816, 817, 818, 819, 820, 839, 821, 841, 822, 823, - - 843, 825, 826, 827, 844, 828, 829, 830, 831, 845, - 832, 833, 834, 836, 846, 837, 838, 847, 849, 850, - 851, 854, 839, 852, 841, 855, 856, 843, 858, 860, - 862, 844, 863, 852, 864, 865, 845, 867, 868, 869, - 870, 846, 871, 872, 847, 849, 850, 851, 854, 873, - 852, 874, 855, 856, 875, 858, 860, 862, 876, 863, - 852, 864, 865, 877, 867, 868, 869, 870, 878, 871, - 872, 879, 881, 882, 883, 884, 873, 885, 874, 886, - 887, 875, 888, 889, 890, 876, 891, 892, 893, 894, - 877, 896, 897, 898, 899, 878, 900, 901, 879, 881, - - 882, 883, 884, 902, 885, 906, 886, 887, 907, 888, - 889, 890, 912, 891, 892, 893, 894, 913, 896, 897, - 898, 899, 914, 900, 901, 903, 915, 903, 916, 917, - 902, 918, 906, 919, 920, 907, 921, 903, 923, 912, - 924, 925, 926, 927, 913, 928, 929, 931, 932, 914, - 933, 934, 935, 915, 938, 916, 917, 939, 918, 941, - 919, 920, 937, 921, 942, 923, 937, 924, 925, 926, - 927, 944, 928, 929, 931, 932, 945, 933, 934, 935, - 947, 938, 948, 950, 939, 951, 941, 954, 955, 937, - 956, 942, 960, 937, 961, 962, 954, 963, 944, 964, - - 966, 967, 968, 945, 954, 969, 972, 947, 974, 948, - 950, 976, 951, 977, 954, 955, 981, 956, 982, 960, - 983, 961, 962, 954, 963, 984, 964, 966, 967, 968, - 985, 954, 969, 972, 986, 974, 987, 988, 976, 989, - 977, 990, 991, 981, 992, 982, 993, 983, 994, 995, - 996, 997, 984, 998, 999, 1000, 1001, 985, 1002, 1003, - 1004, 986, 1005, 987, 988, 1006, 989, 1008, 990, 991, - 1009, 992, 1014, 993, 1015, 994, 995, 996, 997, 1016, - 998, 999, 1000, 1001, 1017, 1002, 1003, 1004, 1018, 1005, - 1019, 1020, 1006, 1021, 1008, 1022, 1023, 1009, 1024, 1014, - - 1025, 1015, 1026, 1027, 1028, 1029, 1016, 1030, 1032, 1033, - 1034, 1017, 1035, 1036, 1037, 1018, 1038, 1019, 1020, 1039, - 1021, 1041, 1022, 1023, 1042, 1024, 1043, 1025, 1044, 1026, - 1027, 1028, 1029, 1046, 1030, 1032, 1033, 1034, 1047, 1035, - 1036, 1037, 1050, 1038, 1051, 1052, 1039, 1054, 1041, 1055, - 1057, 1042, 1058, 1043, 1059, 1044, 1061, 1062, 1063, 1065, - 1046, 1066, 1067, 1068, 1070, 1047, 1072, 1073, 1074, 1050, - 1075, 1051, 1052, 1076, 1054, 1077, 1055, 1057, 1079, 1058, - 1080, 1059, 1081, 1061, 1062, 1063, 1065, 1083, 1066, 1067, - 1068, 1070, 1086, 1072, 1073, 1074, 1089, 1075, 1090, 1091, - - 1076, 1094, 1077, 1096, 1097, 1079, 1098, 1080, 1099, 1081, - 1100, 1101, 1102, 1103, 1083, 1104, 1105, 1106, 1107, 1086, - 1108, 1109, 1110, 1089, 1111, 1090, 1091, 1112, 1094, 1115, - 1096, 1097, 1116, 1098, 1118, 1099, 1119, 1100, 1101, 1102, - 1103, 1120, 1104, 1105, 1106, 1107, 1121, 1108, 1109, 1110, - 1122, 1111, 1123, 1125, 1112, 1126, 1115, 1127, 1128, 1116, - 1129, 1118, 1130, 1119, 1134, 1136, 1135, 1137, 1120, 1138, - 1139, 1140, 1141, 1121, 1135, 1142, 1145, 1122, 1147, 1123, - 1125, 1148, 1126, 1149, 1127, 1128, 1151, 1129, 1140, 1130, - 1152, 1134, 1136, 1135, 1137, 1153, 1138, 1139, 1140, 1141, - - 1154, 1155, 1142, 1145, 1156, 1147, 1157, 1158, 1148, 1160, - 1149, 1161, 1159, 1151, 1162, 1140, 1164, 1152, 1159, 1169, - 1170, 1171, 1153, 1172, 1173, 1174, 1175, 1154, 1155, 1176, - 1177, 1156, 1178, 1157, 1158, 1179, 1160, 1180, 1161, 1159, - 1181, 1162, 1182, 1164, 1183, 1159, 1169, 1170, 1171, 1184, - 1172, 1173, 1174, 1175, 1185, 1186, 1176, 1177, 1187, 1178, - 1188, 1190, 1179, 1191, 1180, 1192, 1193, 1181, 1194, 1182, - 1195, 1183, 1196, 1197, 1198, 1201, 1184, 1202, 1205, 1206, - 1207, 1185, 1186, 1210, 1211, 1187, 1212, 1188, 1190, 1213, - 1191, 1215, 1192, 1193, 1216, 1194, 1217, 1195, 1220, 1196, - - 1197, 1198, 1201, 1221, 1202, 1205, 1206, 1207, 1222, 1224, - 1210, 1211, 1225, 1212, 1226, 1227, 1213, 1228, 1215, 1229, - 1230, 1216, 1231, 1217, 1235, 1220, 1236, 1237, 1238, 1240, - 1221, 1241, 1242, 1243, 1244, 1222, 1224, 1245, 1246, 1225, - 1249, 1226, 1227, 1250, 1228, 1251, 1229, 1230, 1253, 1231, - 1254, 1235, 1259, 1236, 1237, 1238, 1240, 1260, 1241, 1242, - 1243, 1244, 1263, 1264, 1245, 1246, 1265, 1249, 1267, 1268, - 1250, 1269, 1251, 1270, 1271, 1253, 1273, 1254, 1274, 1259, - 1276, 1278, 1279, 1281, 1260, 1282, 1283, 1285, 1286, 1263, - 1264, 1287, 1288, 1265, 1289, 1267, 1268, 1290, 1269, 1291, - - 1270, 1271, 1293, 1273, 1294, 1274, 1296, 1276, 1278, 1279, - 1281, 1297, 1282, 1283, 1285, 1286, 1299, 1300, 1287, 1288, - 1302, 1289, 1304, 1305, 1290, 1306, 1291, 1307, 1308, 1293, - 1309, 1294, 1312, 1296, 1313, 1314, 1315, 1316, 1297, 1317, - 1318, 1319, 1320, 1299, 1300, 1321, 1324, 1302, 1327, 1304, - 1305, 1328, 1306, 1331, 1307, 1308, 1332, 1309, 1333, 1312, - 1333, 1313, 1314, 1315, 1316, 1334, 1317, 1318, 1319, 1320, - 1336, 1339, 1321, 1324, 1340, 1327, 1342, 1344, 1328, 1345, - 1331, 1346, 1347, 1332, 1348, 1333, 1349, 1333, 1350, 1351, - 1352, 1353, 1334, 1354, 1350, 1355, 1356, 1336, 1339, 1357, - - 1358, 1340, 1359, 1342, 1344, 1361, 1345, 1362, 1346, 1347, - 1364, 1348, 1365, 1349, 1366, 1350, 1351, 1352, 1353, 1367, - 1354, 1350, 1355, 1356, 1368, 1369, 1357, 1358, 1370, 1359, - 1371, 1372, 1361, 1373, 1362, 1374, 1375, 1364, 1378, 1365, - 1380, 1366, 1381, 1382, 1383, 1384, 1367, 1385, 1387, 1388, - 1389, 1368, 1369, 1392, 1393, 1370, 1396, 1371, 1372, 1397, - 1373, 1398, 1374, 1375, 1399, 1378, 1401, 1380, 1403, 1381, - 1382, 1383, 1384, 1404, 1385, 1387, 1388, 1389, 1406, 1407, - 1392, 1393, 1408, 1396, 1410, 1413, 1397, 1414, 1398, 1415, - 1416, 1399, 1417, 1401, 1418, 1403, 1419, 1420, 1421, 1422, - - 1404, 1423, 1426, 1427, 1428, 1406, 1407, 1429, 1430, 1408, - 1431, 1410, 1413, 1432, 1414, 1434, 1415, 1416, 1435, 1417, - 1437, 1418, 1438, 1419, 1420, 1421, 1422, 1439, 1423, 1426, - 1427, 1428, 1440, 1443, 1429, 1430, 1444, 1431, 1446, 1449, - 1432, 1450, 1434, 1451, 1452, 1435, 1453, 1437, 1454, 1438, - 1456, 1457, 1458, 1459, 1439, 1460, 1461, 1462, 1463, 1440, - 1443, 1464, 1465, 1444, 1466, 1446, 1449, 1467, 1450, 1468, - 1451, 1452, 1469, 1453, 1470, 1454, 1471, 1456, 1457, 1458, - 1459, 1472, 1460, 1461, 1462, 1463, 1473, 1474, 1464, 1465, - 1475, 1466, 1476, 1477, 1467, 1478, 1468, 1479, 1480, 1469, - - 1481, 1470, 1489, 1471, 1490, 1491, 1493, 1495, 1472, 1496, - 1498, 1499, 1500, 1473, 1474, 1501, 1502, 1475, 1505, 1476, - 1477, 1507, 1478, 1508, 1479, 1480, 1509, 1481, 1510, 1489, - 1510, 1490, 1491, 1493, 1495, 1511, 1496, 1498, 1499, 1500, - 1513, 1514, 1501, 1502, 1515, 1505, 1516, 1517, 1507, 1518, - 1508, 1519, 1520, 1509, 1521, 1510, 1523, 1510, 1524, 1525, - 1527, 1528, 1511, 1529, 1530, 1532, 1533, 1513, 1514, 1534, - 1535, 1515, 1538, 1516, 1517, 1539, 1518, 1540, 1519, 1520, - 1543, 1521, 1544, 1523, 1545, 1524, 1525, 1527, 1528, 1546, - 1529, 1530, 1532, 1533, 1547, 1549, 1534, 1535, 1550, 1538, - - 1552, 1554, 1539, 1557, 1540, 1558, 1559, 1543, 1562, 1544, - 1563, 1545, 1564, 1565, 1567, 1568, 1546, 1569, 1571, 1572, - 1573, 1547, 1549, 1574, 1575, 1550, 1577, 1552, 1554, 1082, - 1557, 1071, 1558, 1559, 1069, 1562, 1049, 1563, 1048, 1564, - 1565, 1567, 1568, 1045, 1569, 1571, 1572, 1573, 1013, 1012, - 1574, 1575, 1011, 1577, 1582, 1582, 1010, 973, 971, 970, - 965, 957, 949, 940, 936, 930, 910, 909, 908, 905, - 904, 895, 880, 842, 789, 781, 779, 776, 775, 774, - 773, 772, 736, 735, 732, 687, 681, 680, 679, 677, - 649, 647, 643, 621, 608, 567, 563, 561, 559, 554, - - 551, 533, 525, 509, 503, 500, 477, 447, 445, 444, - 429, 391, 376, 375, 370, 358, 348, 345, 335, 320, - 316, 314, 306, 287, 275, 266, 224, 194, 179, 143, - 123, 37, 5, 3, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - - 1580, 1580, 1580 + 1097, 507, 490, 1096, 508, 510, 511, 487, 513, 514, + 487, 491, 493, 492, 495, 515, 492, 516, 496, 497, + 506, 498, 517, 518, 506, 499, 502, 506, 507, 519, + 506, 508, 510, 511, 520, 513, 514, 521, 522, 523, + 524, 526, 515, 527, 516, 528, 532, 506, 534, 517, + 518, 506, 536, 537, 506, 538, 519, 506, 539, 540, + + 541, 520, 542, 543, 521, 522, 523, 524, 526, 544, + 527, 545, 528, 532, 546, 534, 539, 547, 548, 536, + 537, 549, 538, 550, 553, 539, 540, 541, 555, 542, + 543, 556, 557, 558, 558, 560, 544, 562, 545, 564, + 566, 546, 558, 565, 547, 548, 568, 558, 549, 569, + 550, 553, 571, 572, 565, 555, 573, 574, 556, 557, + 558, 558, 560, 575, 562, 576, 564, 566, 580, 558, + 565, 581, 582, 568, 558, 583, 569, 584, 585, 571, + 572, 565, 586, 573, 574, 585, 587, 588, 589, 590, + 575, 591, 576, 593, 594, 580, 595, 596, 581, 582, + + 597, 599, 583, 600, 584, 585, 601, 602, 603, 586, + 604, 605, 585, 587, 588, 589, 590, 606, 591, 607, + 593, 594, 609, 595, 596, 610, 611, 597, 599, 612, + 600, 613, 614, 601, 602, 603, 615, 604, 605, 617, + 618, 619, 620, 623, 606, 624, 607, 626, 627, 609, + 628, 629, 610, 611, 630, 631, 612, 632, 613, 614, + 633, 633, 634, 615, 635, 637, 617, 618, 619, 620, + 623, 638, 624, 639, 626, 627, 640, 628, 629, 641, + 642, 630, 631, 643, 632, 645, 647, 633, 633, 634, + 649, 635, 637, 651, 654, 655, 656, 658, 638, 659, + + 639, 660, 662, 640, 663, 646, 641, 642, 665, 646, + 643, 646, 645, 647, 666, 646, 646, 649, 667, 668, + 651, 654, 655, 656, 658, 669, 659, 670, 660, 662, + 671, 663, 646, 672, 673, 665, 646, 675, 646, 677, + 679, 666, 646, 646, 683, 667, 668, 684, 685, 686, + 687, 690, 669, 691, 670, 692, 693, 671, 694, 696, + 672, 673, 697, 691, 675, 698, 677, 679, 699, 700, + 701, 683, 702, 703, 684, 685, 686, 687, 690, 704, + 691, 705, 692, 693, 706, 694, 696, 707, 708, 697, + 691, 709, 698, 710, 711, 699, 700, 701, 712, 702, + + 703, 713, 714, 715, 716, 717, 704, 718, 705, 719, + 720, 706, 721, 722, 707, 708, 723, 724, 709, 725, + 710, 711, 727, 728, 731, 712, 732, 734, 713, 714, + 715, 716, 717, 735, 718, 738, 719, 720, 739, 721, + 722, 740, 741, 723, 724, 742, 725, 743, 744, 727, + 728, 731, 745, 732, 734, 746, 747, 748, 749, 750, + 735, 751, 738, 752, 753, 739, 754, 756, 740, 741, + 757, 758, 742, 760, 743, 744, 761, 762, 763, 745, + 764, 765, 746, 747, 748, 749, 750, 766, 751, 767, + 752, 753, 768, 754, 756, 769, 770, 757, 758, 771, + + 760, 772, 773, 761, 762, 763, 779, 764, 765, 780, + 782, 786, 789, 793, 766, 794, 767, 795, 796, 768, + 799, 800, 769, 770, 801, 802, 771, 804, 772, 773, + 803, 1086, 806, 779, 807, 808, 780, 782, 786, 789, + 793, 805, 794, 803, 795, 796, 805, 799, 800, 809, + 811, 801, 802, 812, 804, 813, 814, 803, 805, 806, + 815, 807, 808, 816, 817, 818, 819, 820, 805, 821, + 803, 822, 823, 805, 824, 825, 809, 811, 827, 828, + 812, 829, 813, 814, 830, 805, 831, 815, 832, 833, + 816, 817, 818, 819, 820, 834, 821, 835, 822, 823, + + 836, 824, 825, 838, 839, 827, 828, 840, 829, 841, + 843, 830, 845, 831, 846, 832, 833, 847, 848, 849, + 851, 852, 834, 853, 835, 854, 856, 836, 857, 858, + 838, 839, 860, 862, 840, 854, 841, 843, 864, 845, + 865, 846, 866, 867, 847, 848, 849, 851, 852, 869, + 853, 870, 854, 856, 871, 857, 858, 872, 873, 860, + 862, 874, 854, 875, 876, 864, 877, 865, 878, 866, + 867, 879, 880, 881, 883, 884, 869, 885, 870, 886, + 887, 871, 888, 889, 872, 873, 890, 891, 874, 892, + 875, 876, 893, 877, 894, 878, 895, 896, 879, 880, + + 881, 883, 884, 897, 885, 899, 886, 887, 900, 888, + 889, 901, 902, 890, 891, 903, 892, 904, 905, 893, + 909, 894, 910, 895, 896, 906, 915, 906, 916, 917, + 897, 918, 899, 919, 920, 900, 921, 906, 901, 902, + 922, 923, 903, 924, 904, 905, 926, 909, 927, 910, + 928, 929, 930, 915, 931, 916, 917, 932, 918, 934, + 919, 920, 935, 921, 936, 937, 938, 922, 923, 941, + 924, 942, 940, 926, 944, 927, 940, 928, 929, 930, + 945, 931, 947, 948, 932, 950, 934, 951, 953, 935, + 954, 936, 937, 938, 958, 959, 941, 963, 942, 940, + + 964, 944, 957, 940, 965, 966, 967, 945, 969, 947, + 948, 957, 950, 970, 951, 953, 971, 954, 972, 957, + 975, 958, 959, 977, 963, 979, 980, 964, 984, 957, + 985, 965, 966, 967, 986, 969, 987, 988, 957, 989, + 970, 990, 991, 971, 992, 972, 957, 975, 993, 994, + 977, 995, 979, 980, 996, 984, 997, 985, 998, 999, + 1000, 986, 1001, 987, 988, 1002, 989, 1003, 990, 991, + 1004, 992, 1005, 1006, 1007, 993, 994, 1008, 995, 1009, + 1010, 996, 1012, 997, 1013, 998, 999, 1000, 1018, 1001, + 1019, 1020, 1002, 1021, 1003, 1022, 1023, 1004, 1024, 1005, + + 1006, 1007, 1025, 1026, 1008, 1027, 1009, 1010, 1028, 1012, + 1029, 1013, 1030, 1031, 1032, 1018, 1033, 1019, 1020, 1034, + 1021, 1036, 1022, 1023, 1037, 1024, 1038, 1039, 1040, 1025, + 1026, 1041, 1027, 1042, 1043, 1028, 1045, 1029, 1046, 1030, + 1031, 1032, 1047, 1033, 1048, 1050, 1034, 1051, 1036, 1054, + 1055, 1037, 1056, 1038, 1039, 1040, 1058, 1059, 1041, 1061, + 1042, 1043, 1062, 1045, 1063, 1046, 1065, 1066, 1067, 1047, + 1069, 1048, 1050, 1070, 1051, 1071, 1054, 1055, 1072, 1056, + 1074, 1076, 1077, 1058, 1059, 1078, 1061, 1079, 1080, 1062, + 1081, 1063, 1083, 1065, 1066, 1067, 1084, 1069, 1085, 1087, + + 1070, 1090, 1071, 1093, 1094, 1072, 1095, 1074, 1076, 1077, + 1098, 1099, 1078, 1101, 1079, 1080, 1102, 1081, 1103, 1083, + 1104, 1105, 1106, 1084, 1107, 1085, 1087, 1108, 1090, 1109, + 1093, 1094, 1110, 1095, 1111, 1112, 1113, 1098, 1099, 1114, + 1101, 1115, 1116, 1102, 1117, 1103, 1120, 1104, 1105, 1106, + 1121, 1107, 1123, 1124, 1108, 1125, 1109, 1126, 1127, 1110, + 1128, 1111, 1112, 1113, 1130, 1131, 1114, 1132, 1115, 1116, + 1133, 1117, 1134, 1120, 1135, 1139, 1141, 1121, 1140, 1123, + 1124, 1142, 1125, 1143, 1126, 1127, 1140, 1128, 1144, 1145, + 1146, 1130, 1131, 1147, 1132, 1150, 1152, 1133, 1153, 1134, + + 1154, 1135, 1139, 1141, 1156, 1140, 1145, 1157, 1142, 1158, + 1143, 1159, 1160, 1161, 1162, 1144, 1145, 1146, 1163, 1165, + 1147, 1166, 1150, 1152, 1164, 1153, 1167, 1154, 1169, 1174, + 1164, 1156, 1175, 1145, 1157, 1176, 1158, 1177, 1159, 1160, + 1161, 1162, 1178, 1179, 1180, 1163, 1165, 1181, 1166, 1182, + 1183, 1164, 1184, 1167, 1185, 1169, 1174, 1164, 1186, 1175, + 1187, 1188, 1176, 1189, 1177, 1190, 1191, 1192, 1193, 1178, + 1179, 1180, 1194, 1196, 1181, 1197, 1182, 1183, 1198, 1184, + 1199, 1185, 1200, 1201, 1202, 1186, 1203, 1187, 1188, 1204, + 1189, 1207, 1190, 1191, 1192, 1193, 1208, 1211, 1212, 1194, + + 1196, 1213, 1197, 1216, 1217, 1198, 1218, 1199, 1219, 1200, + 1201, 1202, 1221, 1203, 1222, 1223, 1204, 1226, 1207, 1227, + 1228, 1230, 1231, 1208, 1211, 1212, 1232, 1233, 1213, 1234, + 1216, 1217, 1235, 1218, 1236, 1219, 1237, 1241, 1242, 1221, + 1243, 1222, 1223, 1244, 1226, 1246, 1227, 1228, 1230, 1231, + 1247, 1248, 1249, 1232, 1233, 1250, 1234, 1251, 1252, 1235, + 1255, 1236, 1256, 1237, 1241, 1242, 1257, 1243, 1258, 1260, + 1244, 1261, 1246, 1266, 1267, 1270, 1271, 1247, 1248, 1249, + 1272, 1274, 1250, 1275, 1251, 1252, 1276, 1255, 1277, 1256, + 1278, 1280, 1281, 1257, 1283, 1258, 1260, 1285, 1261, 1286, + + 1266, 1267, 1270, 1271, 1288, 1289, 1290, 1272, 1274, 1292, + 1275, 1293, 1294, 1276, 1295, 1277, 1296, 1278, 1280, 1281, + 1297, 1283, 1298, 1300, 1285, 1301, 1286, 1303, 1304, 1306, + 1307, 1288, 1289, 1290, 1309, 1311, 1292, 1312, 1293, 1294, + 1313, 1295, 1314, 1296, 1315, 1316, 1319, 1297, 1320, 1298, + 1300, 1321, 1301, 1322, 1303, 1304, 1306, 1307, 1323, 1324, + 1325, 1309, 1311, 1326, 1312, 1327, 1328, 1313, 1329, 1314, + 1332, 1315, 1316, 1319, 1335, 1320, 1336, 1339, 1321, 1340, + 1322, 1341, 1342, 1341, 1344, 1323, 1324, 1325, 1347, 1348, + 1326, 1350, 1327, 1328, 1352, 1329, 1353, 1332, 1354, 1355, + + 1356, 1335, 1357, 1336, 1339, 1359, 1340, 1358, 1341, 1342, + 1341, 1344, 1360, 1358, 1361, 1347, 1348, 1362, 1350, 1363, + 1364, 1352, 1365, 1353, 1366, 1354, 1355, 1356, 1367, 1357, + 1369, 1370, 1359, 1372, 1358, 1373, 1374, 1376, 1377, 1360, + 1358, 1361, 1378, 1379, 1362, 1380, 1363, 1364, 1381, 1365, + 1382, 1366, 1383, 1384, 1387, 1367, 1389, 1369, 1370, 1390, + 1372, 1391, 1373, 1374, 1376, 1377, 1392, 1393, 1394, 1378, + 1379, 1396, 1380, 1397, 1398, 1381, 1401, 1382, 1402, 1383, + 1384, 1387, 1405, 1389, 1406, 1407, 1390, 1408, 1391, 1410, + 1412, 1413, 1415, 1392, 1393, 1394, 1416, 1417, 1396, 1419, + + 1397, 1398, 1422, 1401, 1423, 1402, 1424, 1425, 1426, 1405, + 1427, 1406, 1407, 1428, 1408, 1429, 1410, 1412, 1413, 1415, + 1430, 1431, 1432, 1416, 1417, 1433, 1419, 1436, 1437, 1422, + 1438, 1423, 1439, 1424, 1425, 1426, 1440, 1427, 1441, 1442, + 1428, 1444, 1429, 1445, 1447, 1448, 1449, 1430, 1431, 1432, + 1450, 1453, 1433, 1454, 1436, 1437, 1456, 1438, 1459, 1439, + 1460, 1461, 1462, 1440, 1463, 1441, 1442, 1464, 1444, 1465, + 1445, 1447, 1448, 1449, 1467, 1468, 1469, 1450, 1453, 1470, + 1454, 1471, 1472, 1456, 1473, 1459, 1474, 1460, 1461, 1462, + 1475, 1463, 1476, 1477, 1464, 1478, 1465, 1479, 1480, 1481, + + 1482, 1467, 1468, 1469, 1483, 1484, 1470, 1485, 1471, 1472, + 1486, 1473, 1487, 1474, 1488, 1489, 1490, 1475, 1491, 1476, + 1477, 1492, 1478, 1494, 1479, 1480, 1481, 1482, 1501, 1502, + 1503, 1483, 1484, 1505, 1485, 1507, 1508, 1486, 1510, 1487, + 1511, 1488, 1489, 1490, 1512, 1491, 1513, 1514, 1492, 1517, + 1494, 1519, 1520, 1521, 1523, 1501, 1502, 1503, 1524, 1522, + 1505, 1522, 1507, 1508, 1526, 1510, 1527, 1511, 1528, 1529, + 1530, 1512, 1531, 1513, 1514, 1532, 1517, 1533, 1519, 1520, + 1521, 1523, 1534, 1536, 1537, 1524, 1522, 1538, 1522, 1540, + 1541, 1526, 1542, 1527, 1543, 1528, 1529, 1530, 1544, 1531, + + 1546, 1547, 1532, 1548, 1533, 1549, 1552, 1553, 1554, 1534, + 1536, 1537, 1557, 1558, 1538, 1559, 1540, 1541, 1560, 1542, + 1561, 1543, 1562, 1564, 1565, 1544, 1567, 1546, 1547, 1569, + 1548, 1570, 1549, 1552, 1553, 1554, 1573, 1574, 1575, 1557, + 1558, 1578, 1559, 1579, 1580, 1560, 1581, 1561, 1582, 1562, + 1564, 1565, 1584, 1567, 1586, 1587, 1569, 1589, 1570, 1590, + 1591, 1592, 1593, 1573, 1574, 1575, 1595, 1075, 1578, 1073, + 1579, 1580, 1053, 1581, 1052, 1582, 1049, 1017, 1016, 1584, + 1015, 1586, 1587, 1014, 1589, 976, 1590, 1591, 1592, 1593, + 974, 973, 968, 1595, 1600, 1600, 960, 952, 943, 939, + + 933, 913, 912, 911, 908, 907, 898, 882, 844, 791, + 783, 781, 778, 777, 776, 775, 774, 737, 736, 733, + 688, 682, 681, 680, 678, 650, 648, 644, 621, 608, + 567, 563, 561, 559, 554, 551, 533, 525, 509, 503, + 500, 477, 447, 445, 444, 429, 391, 376, 375, 370, + 358, 348, 345, 335, 320, 316, 314, 306, 287, 275, + 266, 224, 194, 179, 143, 123, 37, 5, 3, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598 } ; static yy_state_type yy_last_accepting_state; @@ -1721,7 +1736,7 @@ conf_yy_fatal_error(const char *msg) return 0; } -#line 1725 "conf_lexer.c" +#line 1740 "conf_lexer.c" #define INITIAL 0 @@ -1903,7 +1918,7 @@ YY_DECL #line 78 "conf_lexer.l" -#line 1907 "conf_lexer.c" +#line 1922 "conf_lexer.c" if ( !(yy_init) ) { @@ -1962,13 +1977,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 >= 1581 ) + if ( yy_current_state >= 1599 ) 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 != 1580 ); + while ( yy_current_state != 1598 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -2971,177 +2986,177 @@ YY_RULE_SETUP case 188: YY_RULE_SETUP #line 314 "conf_lexer.l" -{ return SSL_DH_PARAM_FILE; } +{ return SSL_CONNECTION_REQUIRED; } YY_BREAK case 189: YY_RULE_SETUP #line 315 "conf_lexer.l" -{ return T_SSL_SERVER_METHOD; } +{ return SSL_DH_PARAM_FILE; } YY_BREAK case 190: YY_RULE_SETUP #line 316 "conf_lexer.l" -{ return T_SSLV3; } +{ return T_SSL_SERVER_METHOD; } YY_BREAK case 191: YY_RULE_SETUP #line 317 "conf_lexer.l" -{ return STATS_E_DISABLED; } +{ return T_SSLV3; } YY_BREAK case 192: YY_RULE_SETUP #line 318 "conf_lexer.l" -{ return STATS_I_OPER_ONLY; } +{ return STATS_E_DISABLED; } YY_BREAK case 193: YY_RULE_SETUP #line 319 "conf_lexer.l" -{ return STATS_K_OPER_ONLY; } +{ return STATS_I_OPER_ONLY; } YY_BREAK case 194: YY_RULE_SETUP #line 320 "conf_lexer.l" -{ return STATS_O_OPER_ONLY; } +{ return STATS_K_OPER_ONLY; } YY_BREAK case 195: YY_RULE_SETUP #line 321 "conf_lexer.l" -{ return STATS_P_OPER_ONLY; } +{ return STATS_O_OPER_ONLY; } YY_BREAK case 196: YY_RULE_SETUP #line 322 "conf_lexer.l" -{ return THROTTLE_TIME; } +{ return STATS_P_OPER_ONLY; } YY_BREAK case 197: YY_RULE_SETUP #line 323 "conf_lexer.l" -{ return TKLINE_EXPIRE_NOTICES; } +{ return THROTTLE_TIME; } YY_BREAK case 198: YY_RULE_SETUP #line 324 "conf_lexer.l" -{ return T_TLSV1; } +{ return TKLINE_EXPIRE_NOTICES; } YY_BREAK case 199: YY_RULE_SETUP #line 325 "conf_lexer.l" -{ return TRUE_NO_OPER_FLOOD; } +{ return T_TLSV1; } YY_BREAK case 200: YY_RULE_SETUP #line 326 "conf_lexer.l" -{ return TS_MAX_DELTA; } +{ return TRUE_NO_OPER_FLOOD; } YY_BREAK case 201: YY_RULE_SETUP #line 327 "conf_lexer.l" -{ return TS_WARN_DELTA; } +{ return TS_MAX_DELTA; } YY_BREAK case 202: YY_RULE_SETUP #line 328 "conf_lexer.l" -{ return TYPE; } +{ return TS_WARN_DELTA; } YY_BREAK case 203: YY_RULE_SETUP #line 329 "conf_lexer.l" -{ return T_UMODES; } +{ return TYPE; } YY_BREAK case 204: YY_RULE_SETUP #line 330 "conf_lexer.l" -{ return T_UNAUTH; } +{ return T_UMODES; } YY_BREAK case 205: YY_RULE_SETUP #line 331 "conf_lexer.l" -{ return T_UNDLINE; } +{ return T_UNAUTH; } YY_BREAK case 206: YY_RULE_SETUP #line 332 "conf_lexer.l" -{ return UNKLINE; } +{ return T_UNDLINE; } YY_BREAK case 207: YY_RULE_SETUP #line 333 "conf_lexer.l" -{ return T_UNLIMITED; } +{ return UNKLINE; } YY_BREAK case 208: YY_RULE_SETUP #line 334 "conf_lexer.l" -{ return T_UNRESV; } +{ return T_UNLIMITED; } YY_BREAK case 209: YY_RULE_SETUP #line 335 "conf_lexer.l" -{ return T_UNXLINE; } +{ return T_UNRESV; } YY_BREAK case 210: YY_RULE_SETUP #line 336 "conf_lexer.l" -{ return USE_EGD; } +{ return T_UNXLINE; } YY_BREAK case 211: YY_RULE_SETUP #line 337 "conf_lexer.l" -{ return USE_LOGGING; } +{ return USE_EGD; } YY_BREAK case 212: YY_RULE_SETUP #line 338 "conf_lexer.l" -{ return USER; } +{ return USE_LOGGING; } YY_BREAK case 213: YY_RULE_SETUP #line 339 "conf_lexer.l" -{ return VHOST; } +{ return USER; } YY_BREAK case 214: YY_RULE_SETUP #line 340 "conf_lexer.l" -{ return VHOST6; } +{ return VHOST; } YY_BREAK case 215: YY_RULE_SETUP #line 341 "conf_lexer.l" -{ return T_WALLOP; } +{ return VHOST6; } YY_BREAK case 216: YY_RULE_SETUP #line 342 "conf_lexer.l" -{ return T_WALLOPS; } +{ return T_WALLOP; } YY_BREAK case 217: YY_RULE_SETUP #line 343 "conf_lexer.l" -{ return WARN_NO_NLINE; } +{ return T_WALLOPS; } YY_BREAK case 218: YY_RULE_SETUP #line 344 "conf_lexer.l" -{ return T_WEBIRC; } +{ return WARN_NO_NLINE; } YY_BREAK case 219: YY_RULE_SETUP #line 345 "conf_lexer.l" -{ return XLINE; } +{ return T_WEBIRC; } YY_BREAK case 220: YY_RULE_SETUP -#line 347 "conf_lexer.l" -{ yylval.number = 1; return TBOOL; } +#line 346 "conf_lexer.l" +{ return XLINE; } YY_BREAK case 221: YY_RULE_SETUP #line 348 "conf_lexer.l" -{ yylval.number = 0; return TBOOL; } +{ yylval.number = 1; return TBOOL; } YY_BREAK case 222: YY_RULE_SETUP -#line 350 "conf_lexer.l" -{ return YEARS; } +#line 349 "conf_lexer.l" +{ yylval.number = 0; return TBOOL; } YY_BREAK case 223: YY_RULE_SETUP @@ -3151,7 +3166,7 @@ YY_RULE_SETUP case 224: YY_RULE_SETUP #line 352 "conf_lexer.l" -{ return MONTHS; } +{ return YEARS; } YY_BREAK case 225: YY_RULE_SETUP @@ -3161,7 +3176,7 @@ YY_RULE_SETUP case 226: YY_RULE_SETUP #line 354 "conf_lexer.l" -{ return WEEKS; } +{ return MONTHS; } YY_BREAK case 227: YY_RULE_SETUP @@ -3171,7 +3186,7 @@ YY_RULE_SETUP case 228: YY_RULE_SETUP #line 356 "conf_lexer.l" -{ return DAYS; } +{ return WEEKS; } YY_BREAK case 229: YY_RULE_SETUP @@ -3181,7 +3196,7 @@ YY_RULE_SETUP case 230: YY_RULE_SETUP #line 358 "conf_lexer.l" -{ return HOURS; } +{ return DAYS; } YY_BREAK case 231: YY_RULE_SETUP @@ -3191,7 +3206,7 @@ YY_RULE_SETUP case 232: YY_RULE_SETUP #line 360 "conf_lexer.l" -{ return MINUTES; } +{ return HOURS; } YY_BREAK case 233: YY_RULE_SETUP @@ -3201,7 +3216,7 @@ YY_RULE_SETUP case 234: YY_RULE_SETUP #line 362 "conf_lexer.l" -{ return SECONDS; } +{ return MINUTES; } YY_BREAK case 235: YY_RULE_SETUP @@ -3210,8 +3225,8 @@ YY_RULE_SETUP YY_BREAK case 236: YY_RULE_SETUP -#line 365 "conf_lexer.l" -{ return BYTES; } +#line 364 "conf_lexer.l" +{ return SECONDS; } YY_BREAK case 237: YY_RULE_SETUP @@ -3221,7 +3236,7 @@ YY_RULE_SETUP case 238: YY_RULE_SETUP #line 367 "conf_lexer.l" -{ return KBYTES; } +{ return BYTES; } YY_BREAK case 239: YY_RULE_SETUP @@ -3246,7 +3261,7 @@ YY_RULE_SETUP case 243: YY_RULE_SETUP #line 372 "conf_lexer.l" -{ return MBYTES; } +{ return KBYTES; } YY_BREAK case 244: YY_RULE_SETUP @@ -3271,23 +3286,28 @@ YY_RULE_SETUP case 248: YY_RULE_SETUP #line 377 "conf_lexer.l" -{ return TWODOTS; } +{ return MBYTES; } YY_BREAK case 249: YY_RULE_SETUP -#line 379 "conf_lexer.l" +#line 378 "conf_lexer.l" +{ return TWODOTS; } + YY_BREAK +case 250: +YY_RULE_SETUP +#line 380 "conf_lexer.l" { return yytext[0]; } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 380 "conf_lexer.l" +#line 381 "conf_lexer.l" { if (ieof()) yyterminate(); } YY_BREAK -case 250: +case 251: YY_RULE_SETUP -#line 382 "conf_lexer.l" +#line 383 "conf_lexer.l" ECHO; YY_BREAK -#line 3291 "conf_lexer.c" +#line 3311 "conf_lexer.c" case YY_END_OF_BUFFER: { @@ -3578,7 +3598,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 >= 1581 ) + if ( yy_current_state >= 1599 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -3606,11 +3626,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 >= 1581 ) + if ( yy_current_state >= 1599 ) 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 == 1580); + yy_is_jam = (yy_current_state == 1598); return yy_is_jam ? 0 : yy_current_state; } @@ -4243,7 +4263,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 382 "conf_lexer.l" +#line 383 "conf_lexer.l" diff --git a/src/conf_lexer.l b/src/conf_lexer.l index 31532fe..468226c 100644 --- a/src/conf_lexer.l +++ b/src/conf_lexer.l @@ -311,6 +311,7 @@ ssl_certificate_file { return SSL_CERTIFICATE_FILE; } ssl_certificate_fingerprint { return SSL_CERTIFICATE_FINGERPRINT; } ssl_cipher_list { return T_SSL_CIPHER_LIST; } ssl_client_method { return T_SSL_CLIENT_METHOD; } +ssl_connection_required { return SSL_CONNECTION_REQUIRED; } ssl_dh_param_file { return SSL_DH_PARAM_FILE; } ssl_server_method { return T_SSL_SERVER_METHOD; } sslv3 { return T_SSLV3; } diff --git a/src/conf_parser.c b/src/conf_parser.c index de089fd..960de42 100644 --- a/src/conf_parser.c +++ b/src/conf_parser.c @@ -363,79 +363,80 @@ extern int yydebug; SQUIT = 403, SSL_CERTIFICATE_FILE = 404, SSL_CERTIFICATE_FINGERPRINT = 405, - SSL_DH_PARAM_FILE = 406, - STATS_E_DISABLED = 407, - STATS_I_OPER_ONLY = 408, - STATS_K_OPER_ONLY = 409, - STATS_O_OPER_ONLY = 410, - STATS_P_OPER_ONLY = 411, - T_ALL = 412, - T_BOTS = 413, - T_CALLERID = 414, - T_CCONN = 415, - T_CLUSTER = 416, - T_DEAF = 417, - T_DEBUG = 418, - T_DLINE = 419, - T_EXTERNAL = 420, - T_FARCONNECT = 421, - T_FILE = 422, - T_FULL = 423, - T_GLOBOPS = 424, - T_INVISIBLE = 425, - T_IPV4 = 426, - T_IPV6 = 427, - T_LOCOPS = 428, - T_LOG = 429, - T_MAX_CLIENTS = 430, - T_NCHANGE = 431, - T_NONONREG = 432, - T_OPERWALL = 433, - T_RECVQ = 434, - T_REJ = 435, - T_RESTART = 436, - T_SERVER = 437, - T_SERVICE = 438, - T_SERVICES_NAME = 439, - T_SERVNOTICE = 440, - T_SET = 441, - T_SHARED = 442, - T_SIZE = 443, - T_SKILL = 444, - T_SOFTCALLERID = 445, - T_SPY = 446, - T_SSL = 447, - T_SSL_CIPHER_LIST = 448, - T_SSL_CLIENT_METHOD = 449, - T_SSL_SERVER_METHOD = 450, - T_SSLV3 = 451, - T_TLSV1 = 452, - T_UMODES = 453, - T_UNAUTH = 454, - T_UNDLINE = 455, - T_UNLIMITED = 456, - T_UNRESV = 457, - T_UNXLINE = 458, - T_WALLOP = 459, - T_WALLOPS = 460, - T_WEBIRC = 461, - TBOOL = 462, - THROTTLE_TIME = 463, - TKLINE_EXPIRE_NOTICES = 464, - TMASKED = 465, - TRUE_NO_OPER_FLOOD = 466, - TS_MAX_DELTA = 467, - TS_WARN_DELTA = 468, - TWODOTS = 469, - TYPE = 470, - UNKLINE = 471, - USE_EGD = 472, - USE_LOGGING = 473, - USER = 474, - VHOST = 475, - VHOST6 = 476, - WARN_NO_NLINE = 477, - XLINE = 478 + SSL_CONNECTION_REQUIRED = 406, + SSL_DH_PARAM_FILE = 407, + STATS_E_DISABLED = 408, + STATS_I_OPER_ONLY = 409, + STATS_K_OPER_ONLY = 410, + STATS_O_OPER_ONLY = 411, + STATS_P_OPER_ONLY = 412, + T_ALL = 413, + T_BOTS = 414, + T_CALLERID = 415, + T_CCONN = 416, + T_CLUSTER = 417, + T_DEAF = 418, + T_DEBUG = 419, + T_DLINE = 420, + T_EXTERNAL = 421, + T_FARCONNECT = 422, + T_FILE = 423, + T_FULL = 424, + T_GLOBOPS = 425, + T_INVISIBLE = 426, + T_IPV4 = 427, + T_IPV6 = 428, + T_LOCOPS = 429, + T_LOG = 430, + T_MAX_CLIENTS = 431, + T_NCHANGE = 432, + T_NONONREG = 433, + T_OPERWALL = 434, + T_RECVQ = 435, + T_REJ = 436, + T_RESTART = 437, + T_SERVER = 438, + T_SERVICE = 439, + T_SERVICES_NAME = 440, + T_SERVNOTICE = 441, + T_SET = 442, + T_SHARED = 443, + T_SIZE = 444, + T_SKILL = 445, + T_SOFTCALLERID = 446, + T_SPY = 447, + T_SSL = 448, + T_SSL_CIPHER_LIST = 449, + T_SSL_CLIENT_METHOD = 450, + T_SSL_SERVER_METHOD = 451, + T_SSLV3 = 452, + T_TLSV1 = 453, + T_UMODES = 454, + T_UNAUTH = 455, + T_UNDLINE = 456, + T_UNLIMITED = 457, + T_UNRESV = 458, + T_UNXLINE = 459, + T_WALLOP = 460, + T_WALLOPS = 461, + T_WEBIRC = 462, + TBOOL = 463, + THROTTLE_TIME = 464, + TKLINE_EXPIRE_NOTICES = 465, + TMASKED = 466, + TRUE_NO_OPER_FLOOD = 467, + TS_MAX_DELTA = 468, + TS_WARN_DELTA = 469, + TWODOTS = 470, + TYPE = 471, + UNKLINE = 472, + USE_EGD = 473, + USE_LOGGING = 474, + USER = 475, + VHOST = 476, + VHOST6 = 477, + WARN_NO_NLINE = 478, + XLINE = 479 }; #endif /* Tokens. */ @@ -587,79 +588,80 @@ extern int yydebug; #define SQUIT 403 #define SSL_CERTIFICATE_FILE 404 #define SSL_CERTIFICATE_FINGERPRINT 405 -#define SSL_DH_PARAM_FILE 406 -#define STATS_E_DISABLED 407 -#define STATS_I_OPER_ONLY 408 -#define STATS_K_OPER_ONLY 409 -#define STATS_O_OPER_ONLY 410 -#define STATS_P_OPER_ONLY 411 -#define T_ALL 412 -#define T_BOTS 413 -#define T_CALLERID 414 -#define T_CCONN 415 -#define T_CLUSTER 416 -#define T_DEAF 417 -#define T_DEBUG 418 -#define T_DLINE 419 -#define T_EXTERNAL 420 -#define T_FARCONNECT 421 -#define T_FILE 422 -#define T_FULL 423 -#define T_GLOBOPS 424 -#define T_INVISIBLE 425 -#define T_IPV4 426 -#define T_IPV6 427 -#define T_LOCOPS 428 -#define T_LOG 429 -#define T_MAX_CLIENTS 430 -#define T_NCHANGE 431 -#define T_NONONREG 432 -#define T_OPERWALL 433 -#define T_RECVQ 434 -#define T_REJ 435 -#define T_RESTART 436 -#define T_SERVER 437 -#define T_SERVICE 438 -#define T_SERVICES_NAME 439 -#define T_SERVNOTICE 440 -#define T_SET 441 -#define T_SHARED 442 -#define T_SIZE 443 -#define T_SKILL 444 -#define T_SOFTCALLERID 445 -#define T_SPY 446 -#define T_SSL 447 -#define T_SSL_CIPHER_LIST 448 -#define T_SSL_CLIENT_METHOD 449 -#define T_SSL_SERVER_METHOD 450 -#define T_SSLV3 451 -#define T_TLSV1 452 -#define T_UMODES 453 -#define T_UNAUTH 454 -#define T_UNDLINE 455 -#define T_UNLIMITED 456 -#define T_UNRESV 457 -#define T_UNXLINE 458 -#define T_WALLOP 459 -#define T_WALLOPS 460 -#define T_WEBIRC 461 -#define TBOOL 462 -#define THROTTLE_TIME 463 -#define TKLINE_EXPIRE_NOTICES 464 -#define TMASKED 465 -#define TRUE_NO_OPER_FLOOD 466 -#define TS_MAX_DELTA 467 -#define TS_WARN_DELTA 468 -#define TWODOTS 469 -#define TYPE 470 -#define UNKLINE 471 -#define USE_EGD 472 -#define USE_LOGGING 473 -#define USER 474 -#define VHOST 475 -#define VHOST6 476 -#define WARN_NO_NLINE 477 -#define XLINE 478 +#define SSL_CONNECTION_REQUIRED 406 +#define SSL_DH_PARAM_FILE 407 +#define STATS_E_DISABLED 408 +#define STATS_I_OPER_ONLY 409 +#define STATS_K_OPER_ONLY 410 +#define STATS_O_OPER_ONLY 411 +#define STATS_P_OPER_ONLY 412 +#define T_ALL 413 +#define T_BOTS 414 +#define T_CALLERID 415 +#define T_CCONN 416 +#define T_CLUSTER 417 +#define T_DEAF 418 +#define T_DEBUG 419 +#define T_DLINE 420 +#define T_EXTERNAL 421 +#define T_FARCONNECT 422 +#define T_FILE 423 +#define T_FULL 424 +#define T_GLOBOPS 425 +#define T_INVISIBLE 426 +#define T_IPV4 427 +#define T_IPV6 428 +#define T_LOCOPS 429 +#define T_LOG 430 +#define T_MAX_CLIENTS 431 +#define T_NCHANGE 432 +#define T_NONONREG 433 +#define T_OPERWALL 434 +#define T_RECVQ 435 +#define T_REJ 436 +#define T_RESTART 437 +#define T_SERVER 438 +#define T_SERVICE 439 +#define T_SERVICES_NAME 440 +#define T_SERVNOTICE 441 +#define T_SET 442 +#define T_SHARED 443 +#define T_SIZE 444 +#define T_SKILL 445 +#define T_SOFTCALLERID 446 +#define T_SPY 447 +#define T_SSL 448 +#define T_SSL_CIPHER_LIST 449 +#define T_SSL_CLIENT_METHOD 450 +#define T_SSL_SERVER_METHOD 451 +#define T_SSLV3 452 +#define T_TLSV1 453 +#define T_UMODES 454 +#define T_UNAUTH 455 +#define T_UNDLINE 456 +#define T_UNLIMITED 457 +#define T_UNRESV 458 +#define T_UNXLINE 459 +#define T_WALLOP 460 +#define T_WALLOPS 461 +#define T_WEBIRC 462 +#define TBOOL 463 +#define THROTTLE_TIME 464 +#define TKLINE_EXPIRE_NOTICES 465 +#define TMASKED 466 +#define TRUE_NO_OPER_FLOOD 467 +#define TS_MAX_DELTA 468 +#define TS_WARN_DELTA 469 +#define TWODOTS 470 +#define TYPE 471 +#define UNKLINE 472 +#define USE_EGD 473 +#define USE_LOGGING 474 +#define USER 475 +#define VHOST 476 +#define VHOST6 477 +#define WARN_NO_NLINE 478 +#define XLINE 479 @@ -674,7 +676,7 @@ typedef union YYSTYPE /* Line 387 of yacc.c */ -#line 678 "conf_parser.c" +#line 680 "conf_parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -702,7 +704,7 @@ int yyparse (); /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 706 "conf_parser.c" +#line 708 "conf_parser.c" #ifdef short # undef short @@ -931,20 +933,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1219 +#define YYLAST 1223 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 230 +#define YYNTOKENS 231 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 288 +#define YYNNTS 289 /* YYNRULES -- Number of rules. */ -#define YYNRULES 648 +#define YYNRULES 650 /* YYNRULES -- Number of states. */ -#define YYNSTATES 1270 +#define YYNSTATES 1275 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 478 +#define YYMAXUTOK 479 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -956,15 +958,15 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 228, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 229, 224, - 2, 227, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 229, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 230, 225, + 2, 228, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 226, 2, 225, 2, 2, 2, 2, + 2, 2, 2, 227, 2, 226, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -999,7 +1001,7 @@ static const yytype_uint8 yytranslate[] = 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 223 + 215, 216, 217, 218, 219, 220, 221, 222, 223, 224 }; #if YYDEBUG @@ -1022,329 +1024,332 @@ static const yytype_uint16 yyprhs[] = 366, 368, 371, 376, 377, 384, 387, 389, 391, 393, 395, 398, 403, 408, 413, 414, 420, 424, 426, 428, 430, 432, 434, 436, 438, 440, 441, 448, 451, 453, - 455, 457, 459, 461, 463, 465, 467, 469, 471, 474, - 479, 484, 489, 494, 499, 504, 509, 510, 516, 520, - 522, 524, 526, 528, 530, 532, 534, 536, 538, 540, - 542, 544, 546, 548, 550, 552, 554, 556, 558, 560, - 562, 564, 565, 571, 575, 577, 581, 583, 587, 589, - 593, 595, 597, 599, 601, 603, 605, 607, 609, 611, - 613, 615, 617, 619, 621, 623, 625, 627, 629, 630, - 637, 640, 642, 644, 646, 648, 650, 652, 654, 656, - 658, 660, 662, 664, 666, 668, 670, 672, 674, 677, - 682, 687, 692, 697, 702, 707, 712, 717, 722, 727, - 732, 737, 742, 747, 752, 753, 759, 763, 765, 767, - 769, 770, 777, 778, 784, 788, 790, 792, 794, 796, - 799, 801, 803, 805, 807, 809, 812, 813, 819, 823, - 825, 827, 831, 836, 841, 842, 849, 852, 854, 856, - 858, 860, 862, 864, 866, 868, 870, 873, 878, 883, - 888, 893, 894, 900, 904, 906, 908, 910, 912, 914, - 916, 918, 920, 922, 924, 926, 931, 936, 941, 942, - 949, 952, 954, 956, 958, 960, 963, 968, 973, 978, - 984, 987, 989, 991, 993, 998, 999, 1006, 1009, 1011, - 1013, 1015, 1017, 1020, 1025, 1030, 1031, 1037, 1041, 1043, - 1045, 1047, 1049, 1051, 1053, 1055, 1057, 1059, 1061, 1063, - 1064, 1071, 1074, 1076, 1078, 1080, 1083, 1088, 1089, 1095, - 1099, 1101, 1103, 1105, 1107, 1109, 1111, 1113, 1115, 1117, - 1119, 1121, 1122, 1129, 1132, 1134, 1136, 1138, 1140, 1142, - 1144, 1146, 1148, 1150, 1152, 1154, 1156, 1158, 1160, 1162, - 1165, 1170, 1175, 1180, 1185, 1190, 1195, 1200, 1205, 1210, - 1211, 1217, 1221, 1223, 1225, 1227, 1232, 1237, 1242, 1247, - 1252, 1253, 1260, 1263, 1265, 1267, 1269, 1271, 1276, 1281, - 1282, 1289, 1292, 1294, 1296, 1298, 1300, 1305, 1310, 1316, - 1319, 1321, 1323, 1325, 1330, 1331, 1338, 1341, 1343, 1345, - 1347, 1349, 1354, 1359, 1365, 1368, 1370, 1372, 1374, 1376, - 1378, 1380, 1382, 1384, 1386, 1388, 1390, 1392, 1394, 1396, - 1398, 1400, 1402, 1404, 1406, 1408, 1410, 1412, 1414, 1416, - 1418, 1420, 1422, 1424, 1426, 1428, 1430, 1432, 1434, 1436, - 1438, 1440, 1442, 1444, 1446, 1448, 1450, 1452, 1454, 1456, - 1458, 1460, 1462, 1464, 1466, 1471, 1476, 1481, 1486, 1491, - 1496, 1501, 1506, 1511, 1516, 1521, 1526, 1531, 1536, 1541, - 1546, 1551, 1556, 1561, 1566, 1571, 1576, 1581, 1586, 1591, - 1596, 1601, 1606, 1611, 1616, 1621, 1626, 1631, 1636, 1641, - 1646, 1651, 1656, 1661, 1666, 1671, 1676, 1681, 1686, 1687, - 1693, 1697, 1699, 1701, 1703, 1705, 1707, 1709, 1711, 1713, - 1715, 1717, 1719, 1721, 1723, 1725, 1727, 1729, 1731, 1733, - 1735, 1737, 1739, 1741, 1742, 1748, 1752, 1754, 1756, 1758, - 1760, 1762, 1764, 1766, 1768, 1770, 1772, 1774, 1776, 1778, - 1780, 1782, 1784, 1786, 1788, 1790, 1792, 1794, 1796, 1801, - 1806, 1811, 1817, 1820, 1822, 1824, 1826, 1828, 1830, 1832, - 1834, 1836, 1838, 1840, 1842, 1844, 1846, 1848, 1853, 1858, - 1863, 1868, 1873, 1878, 1883, 1888, 1893, 1898, 1903, 1908, - 1914, 1917, 1919, 1921, 1923, 1925, 1927, 1929, 1931, 1933, - 1935, 1937, 1942, 1947, 1952, 1957, 1962, 1967, 1972 + 455, 457, 459, 461, 463, 465, 467, 469, 471, 473, + 476, 481, 486, 491, 496, 501, 506, 511, 516, 517, + 523, 527, 529, 531, 533, 535, 537, 539, 541, 543, + 545, 547, 549, 551, 553, 555, 557, 559, 561, 563, + 565, 567, 569, 571, 572, 578, 582, 584, 588, 590, + 594, 596, 600, 602, 604, 606, 608, 610, 612, 614, + 616, 618, 620, 622, 624, 626, 628, 630, 632, 634, + 636, 637, 644, 647, 649, 651, 653, 655, 657, 659, + 661, 663, 665, 667, 669, 671, 673, 675, 677, 679, + 681, 684, 689, 694, 699, 704, 709, 714, 719, 724, + 729, 734, 739, 744, 749, 754, 759, 760, 766, 770, + 772, 774, 776, 777, 784, 785, 791, 795, 797, 799, + 801, 803, 806, 808, 810, 812, 814, 816, 819, 820, + 826, 830, 832, 834, 838, 843, 848, 849, 856, 859, + 861, 863, 865, 867, 869, 871, 873, 875, 877, 880, + 885, 890, 895, 900, 901, 907, 911, 913, 915, 917, + 919, 921, 923, 925, 927, 929, 931, 933, 938, 943, + 948, 949, 956, 959, 961, 963, 965, 967, 970, 975, + 980, 985, 991, 994, 996, 998, 1000, 1005, 1006, 1013, + 1016, 1018, 1020, 1022, 1024, 1027, 1032, 1037, 1038, 1044, + 1048, 1050, 1052, 1054, 1056, 1058, 1060, 1062, 1064, 1066, + 1068, 1070, 1071, 1078, 1081, 1083, 1085, 1087, 1090, 1095, + 1096, 1102, 1106, 1108, 1110, 1112, 1114, 1116, 1118, 1120, + 1122, 1124, 1126, 1128, 1129, 1136, 1139, 1141, 1143, 1145, + 1147, 1149, 1151, 1153, 1155, 1157, 1159, 1161, 1163, 1165, + 1167, 1169, 1172, 1177, 1182, 1187, 1192, 1197, 1202, 1207, + 1212, 1217, 1218, 1224, 1228, 1230, 1232, 1234, 1239, 1244, + 1249, 1254, 1259, 1260, 1267, 1270, 1272, 1274, 1276, 1278, + 1283, 1288, 1289, 1296, 1299, 1301, 1303, 1305, 1307, 1312, + 1317, 1323, 1326, 1328, 1330, 1332, 1337, 1338, 1345, 1348, + 1350, 1352, 1354, 1356, 1361, 1366, 1372, 1375, 1377, 1379, + 1381, 1383, 1385, 1387, 1389, 1391, 1393, 1395, 1397, 1399, + 1401, 1403, 1405, 1407, 1409, 1411, 1413, 1415, 1417, 1419, + 1421, 1423, 1425, 1427, 1429, 1431, 1433, 1435, 1437, 1439, + 1441, 1443, 1445, 1447, 1449, 1451, 1453, 1455, 1457, 1459, + 1461, 1463, 1465, 1467, 1469, 1471, 1473, 1478, 1483, 1488, + 1493, 1498, 1503, 1508, 1513, 1518, 1523, 1528, 1533, 1538, + 1543, 1548, 1553, 1558, 1563, 1568, 1573, 1578, 1583, 1588, + 1593, 1598, 1603, 1608, 1613, 1618, 1623, 1628, 1633, 1638, + 1643, 1648, 1653, 1658, 1663, 1668, 1673, 1678, 1683, 1688, + 1693, 1694, 1700, 1704, 1706, 1708, 1710, 1712, 1714, 1716, + 1718, 1720, 1722, 1724, 1726, 1728, 1730, 1732, 1734, 1736, + 1738, 1740, 1742, 1744, 1746, 1748, 1749, 1755, 1759, 1761, + 1763, 1765, 1767, 1769, 1771, 1773, 1775, 1777, 1779, 1781, + 1783, 1785, 1787, 1789, 1791, 1793, 1795, 1797, 1799, 1801, + 1803, 1808, 1813, 1818, 1824, 1827, 1829, 1831, 1833, 1835, + 1837, 1839, 1841, 1843, 1845, 1847, 1849, 1851, 1853, 1855, + 1860, 1865, 1870, 1875, 1880, 1885, 1890, 1895, 1900, 1905, + 1910, 1915, 1921, 1924, 1926, 1928, 1930, 1932, 1934, 1936, + 1938, 1940, 1942, 1944, 1949, 1954, 1959, 1964, 1969, 1974, + 1979 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 231, 0, -1, -1, 231, 232, -1, 266, -1, 278, - -1, 292, -1, 492, -1, 311, -1, 334, -1, 348, - -1, 242, -1, 507, -1, 363, -1, 370, -1, 374, - -1, 384, -1, 393, -1, 414, -1, 420, -1, 426, - -1, 436, -1, 430, -1, 237, -1, 272, -1, 1, - 224, -1, 1, 225, -1, -1, 234, -1, 107, 233, - -1, 107, 134, 233, -1, 107, 135, 233, -1, 107, - 136, 233, -1, 107, 137, 233, -1, 107, 138, 233, - -1, 107, 139, 233, -1, 107, 140, 233, -1, -1, - 236, -1, 107, 235, -1, 107, 9, 235, -1, 107, - 10, 235, -1, 107, 11, 235, -1, 95, 226, 238, - 225, 224, -1, 238, 239, -1, 239, -1, 240, -1, - 241, -1, 1, 224, -1, 94, 227, 122, 224, -1, - 118, 227, 122, 224, -1, 144, 226, 243, 225, 224, - -1, 243, 244, -1, 244, -1, 255, -1, 260, -1, - 265, -1, 257, -1, 258, -1, 259, -1, 262, -1, - 263, -1, 264, -1, 253, -1, 252, -1, 261, -1, - 256, -1, 251, -1, 245, -1, 246, -1, 254, -1, - 1, 224, -1, 194, 227, 247, 224, -1, 195, 227, - 249, 224, -1, 247, 228, 248, -1, 248, -1, 196, - -1, 197, -1, 249, 228, 250, -1, 250, -1, 196, - -1, 197, -1, 149, 227, 122, 224, -1, 132, 227, - 122, 224, -1, 151, 227, 122, 224, -1, 193, 227, - 122, 224, -1, 97, 227, 122, 224, -1, 63, 227, - 122, 224, -1, 24, 227, 122, 224, -1, 101, 227, - 122, 224, -1, 100, 227, 122, 224, -1, 220, 227, - 122, 224, -1, 221, 227, 122, 224, -1, 175, 227, - 107, 224, -1, 85, 227, 107, 224, -1, 89, 227, - 107, 224, -1, 56, 227, 207, 224, -1, 4, 226, - 267, 225, 224, -1, 267, 268, -1, 268, -1, 269, - -1, 271, -1, 270, -1, 1, 224, -1, 97, 227, - 122, 224, -1, 31, 227, 122, 224, -1, 24, 227, - 122, 224, -1, -1, 96, 273, 226, 274, 225, 224, - -1, 274, 275, -1, 275, -1, 276, -1, 277, -1, - 1, 224, -1, 75, 227, 122, 224, -1, 167, 227, - 122, 224, -1, 174, 226, 279, 225, 224, -1, 279, - 280, -1, 280, -1, 281, -1, 282, -1, 1, 224, - -1, 218, 227, 207, 224, -1, -1, 283, 167, 226, - 284, 225, 224, -1, 284, 285, -1, 285, -1, 286, - -1, 288, -1, 287, -1, 1, 224, -1, 97, 227, - 122, 224, -1, 188, 227, 236, 224, -1, 188, 227, - 201, 224, -1, -1, 215, 289, 227, 290, 224, -1, - 290, 228, 291, -1, 291, -1, 219, -1, 113, -1, - 39, -1, 164, -1, 68, -1, 66, -1, 163, -1, - -1, 113, 293, 226, 294, 225, 224, -1, 294, 295, - -1, 295, -1, 296, -1, 297, -1, 298, -1, 303, - -1, 302, -1, 299, -1, 300, -1, 301, -1, 307, - -1, 1, 224, -1, 97, 227, 122, 224, -1, 219, - 227, 122, 224, -1, 117, 227, 122, 224, -1, 32, - 227, 207, 224, -1, 133, 227, 122, 224, -1, 150, - 227, 122, 224, -1, 17, 227, 122, 224, -1, -1, - 198, 304, 227, 305, 224, -1, 305, 228, 306, -1, - 306, -1, 158, -1, 160, -1, 162, -1, 163, -1, - 168, -1, 48, -1, 189, -1, 176, -1, 180, -1, - 199, -1, 191, -1, 165, -1, 178, -1, 185, -1, - 170, -1, 204, -1, 190, -1, 159, -1, 173, -1, - 177, -1, 166, -1, -1, 62, 308, 227, 309, 224, - -1, 309, 228, 310, -1, 310, -1, 66, 229, 128, - -1, 66, -1, 18, 229, 128, -1, 18, -1, 148, - 229, 128, -1, 148, -1, 68, -1, 216, -1, 164, - -1, 200, -1, 223, -1, 39, -1, 25, -1, 181, - -1, 127, -1, 4, -1, 178, -1, 169, -1, 205, - -1, 173, -1, 129, -1, 186, -1, 94, -1, -1, - 17, 312, 226, 313, 225, 224, -1, 313, 314, -1, - 314, -1, 315, -1, 325, -1, 326, -1, 316, -1, - 327, -1, 317, -1, 318, -1, 319, -1, 320, -1, - 321, -1, 322, -1, 323, -1, 324, -1, 328, -1, - 329, -1, 330, -1, 1, 224, -1, 97, 227, 122, - 224, -1, 120, 227, 234, 224, -1, 109, 227, 107, - 224, -1, 19, 227, 234, 224, -1, 87, 227, 107, - 224, -1, 80, 227, 107, 224, -1, 83, 227, 107, - 224, -1, 81, 227, 107, 224, -1, 142, 227, 236, - 224, -1, 179, 227, 236, 224, -1, 15, 227, 107, - 224, -1, 16, 227, 107, 224, -1, 108, 227, 107, - 224, -1, 91, 227, 234, 224, -1, 82, 227, 234, - 224, -1, -1, 62, 331, 227, 332, 224, -1, 332, - 228, 333, -1, 333, -1, 123, -1, 50, -1, -1, - 74, 335, 226, 340, 225, 224, -1, -1, 62, 337, - 227, 338, 224, -1, 338, 228, 339, -1, 339, -1, - 192, -1, 48, -1, 182, -1, 340, 341, -1, 341, - -1, 342, -1, 336, -1, 346, -1, 347, -1, 1, - 224, -1, -1, 121, 227, 344, 343, 224, -1, 344, - 228, 345, -1, 345, -1, 107, -1, 107, 214, 107, - -1, 60, 227, 122, 224, -1, 55, 227, 122, 224, - -1, -1, 61, 349, 226, 350, 225, 224, -1, 350, - 351, -1, 351, -1, 352, -1, 353, -1, 354, -1, - 356, -1, 360, -1, 361, -1, 362, -1, 355, -1, - 1, 224, -1, 219, 227, 122, 224, -1, 117, 227, - 122, 224, -1, 17, 227, 122, 224, -1, 32, 227, - 207, 224, -1, -1, 62, 357, 227, 358, 224, -1, - 358, 228, 359, -1, 359, -1, 147, -1, 33, -1, - 69, -1, 98, -1, 13, -1, 106, -1, 42, -1, - 131, -1, 206, -1, 99, -1, 146, 227, 122, 224, - -1, 126, 227, 122, 224, -1, 125, 227, 107, 224, - -1, -1, 130, 364, 226, 365, 225, 224, -1, 365, - 366, -1, 366, -1, 367, -1, 368, -1, 369, -1, - 1, 224, -1, 75, 227, 122, 224, -1, 124, 227, - 122, 224, -1, 34, 227, 122, 224, -1, 183, 226, - 371, 225, 224, -1, 371, 372, -1, 372, -1, 373, - -1, 1, -1, 97, 227, 122, 224, -1, -1, 187, - 375, 226, 376, 225, 224, -1, 376, 377, -1, 377, - -1, 378, -1, 379, -1, 380, -1, 1, 224, -1, - 97, 227, 122, 224, -1, 219, 227, 122, 224, -1, - -1, 215, 381, 227, 382, 224, -1, 382, 228, 383, - -1, 383, -1, 68, -1, 216, -1, 164, -1, 200, - -1, 223, -1, 203, -1, 130, -1, 202, -1, 173, - -1, 157, -1, -1, 161, 385, 226, 386, 225, 224, - -1, 386, 387, -1, 387, -1, 388, -1, 389, -1, - 1, 224, -1, 97, 227, 122, 224, -1, -1, 215, - 390, 227, 391, 224, -1, 391, 228, 392, -1, 392, - -1, 68, -1, 216, -1, 164, -1, 200, -1, 223, - -1, 203, -1, 130, -1, 202, -1, 173, -1, 157, - -1, -1, 18, 394, 226, 395, 225, 224, -1, 395, - 396, -1, 396, -1, 397, -1, 398, -1, 399, -1, - 400, -1, 401, -1, 402, -1, 404, -1, 403, -1, - 413, -1, 405, -1, 410, -1, 411, -1, 412, -1, - 409, -1, 1, 224, -1, 97, 227, 122, 224, -1, - 55, 227, 122, 224, -1, 220, 227, 122, 224, -1, - 141, 227, 122, 224, -1, 3, 227, 122, 224, -1, - 150, 227, 122, 224, -1, 121, 227, 107, 224, -1, - 5, 227, 171, 224, -1, 5, 227, 172, 224, -1, - -1, 62, 406, 227, 407, 224, -1, 407, 228, 408, - -1, 408, -1, 8, -1, 192, -1, 32, 227, 207, - 224, -1, 57, 227, 122, 224, -1, 72, 227, 122, - 224, -1, 17, 227, 122, 224, -1, 193, 227, 122, - 224, -1, -1, 66, 415, 226, 416, 225, 224, -1, - 416, 417, -1, 417, -1, 418, -1, 419, -1, 1, - -1, 219, 227, 122, 224, -1, 124, 227, 122, 224, - -1, -1, 23, 421, 226, 422, 225, 224, -1, 422, - 423, -1, 423, -1, 424, -1, 425, -1, 1, -1, - 60, 227, 122, 224, -1, 124, 227, 122, 224, -1, - 34, 226, 427, 225, 224, -1, 427, 428, -1, 428, - -1, 429, -1, 1, -1, 60, 227, 122, 224, -1, - -1, 37, 431, 226, 432, 225, 224, -1, 432, 433, - -1, 433, -1, 434, -1, 435, -1, 1, -1, 97, - 227, 122, 224, -1, 124, 227, 122, 224, -1, 38, - 226, 437, 225, 224, -1, 437, 438, -1, 438, -1, - 447, -1, 448, -1, 449, -1, 450, -1, 451, -1, - 452, -1, 453, -1, 454, -1, 455, -1, 456, -1, - 446, -1, 458, -1, 459, -1, 473, -1, 461, -1, - 463, -1, 465, -1, 464, -1, 468, -1, 462, -1, - 469, -1, 470, -1, 471, -1, 472, -1, 485, -1, - 474, -1, 475, -1, 476, -1, 481, -1, 466, -1, - 467, -1, 491, -1, 489, -1, 490, -1, 480, -1, - 457, -1, 478, -1, 479, -1, 445, -1, 440, -1, - 441, -1, 442, -1, 443, -1, 444, -1, 460, -1, - 439, -1, 477, -1, 1, -1, 90, 227, 107, 224, - -1, 41, 227, 207, 224, -1, 40, 227, 234, 224, - -1, 45, 227, 234, 224, -1, 43, 227, 107, 224, - -1, 44, 227, 107, 224, -1, 209, 227, 207, 224, - -1, 67, 227, 234, 224, -1, 54, 227, 207, 224, - -1, 58, 227, 207, 224, -1, 35, 227, 207, 224, - -1, 6, 227, 207, 224, -1, 86, 227, 234, 224, - -1, 84, 227, 107, 224, -1, 76, 227, 107, 224, - -1, 7, 227, 234, 224, -1, 213, 227, 234, 224, - -1, 212, 227, 234, 224, -1, 47, 227, 107, 224, - -1, 59, 227, 207, 224, -1, 222, 227, 207, 224, - -1, 152, 227, 207, 224, -1, 155, 227, 207, 224, - -1, 156, 227, 207, 224, -1, 154, 227, 207, 224, - -1, 154, 227, 210, 224, -1, 153, 227, 207, 224, - -1, 153, 227, 210, 224, -1, 115, 227, 234, 224, - -1, 12, 227, 234, 224, -1, 114, 227, 207, 224, - -1, 116, 227, 234, 224, -1, 145, 227, 207, 224, - -1, 105, 227, 207, 224, -1, 211, 227, 207, 224, - -1, 111, 227, 207, 224, -1, 29, 227, 107, 224, - -1, 88, 227, 107, 224, -1, 217, 227, 207, 224, - -1, 30, 227, 122, 224, -1, 184, 227, 122, 224, - -1, 119, 227, 207, 224, -1, 26, 227, 207, 224, - -1, 208, 227, 234, 224, -1, -1, 112, 482, 227, - 483, 224, -1, 483, 228, 484, -1, 484, -1, 158, - -1, 160, -1, 162, -1, 163, -1, 168, -1, 48, - -1, 189, -1, 176, -1, 180, -1, 199, -1, 191, - -1, 165, -1, 178, -1, 185, -1, 170, -1, 204, - -1, 190, -1, 159, -1, 173, -1, 177, -1, 166, - -1, -1, 110, 486, 227, 487, 224, -1, 487, 228, - 488, -1, 488, -1, 158, -1, 160, -1, 162, -1, - 163, -1, 168, -1, 189, -1, 48, -1, 176, -1, - 180, -1, 199, -1, 191, -1, 165, -1, 178, -1, - 185, -1, 170, -1, 204, -1, 190, -1, 159, -1, - 173, -1, 177, -1, 166, -1, 92, 227, 107, 224, - -1, 93, 227, 107, 224, -1, 20, 227, 107, 224, - -1, 14, 226, 493, 225, 224, -1, 493, 494, -1, - 494, -1, 500, -1, 496, -1, 497, -1, 498, -1, - 499, -1, 501, -1, 502, -1, 503, -1, 504, -1, - 505, -1, 506, -1, 495, -1, 1, -1, 27, 227, - 207, 224, -1, 70, 227, 234, 224, -1, 71, 227, - 234, 224, -1, 79, 227, 107, 224, -1, 78, 227, - 107, 224, -1, 77, 227, 107, 224, -1, 22, 227, - 107, 224, -1, 21, 227, 107, 224, -1, 103, 227, - 207, 224, -1, 104, 227, 207, 224, -1, 64, 227, - 107, 224, -1, 65, 227, 234, 224, -1, 143, 226, - 508, 225, 224, -1, 508, 509, -1, 509, -1, 510, - -1, 511, -1, 512, -1, 513, -1, 515, -1, 516, - -1, 514, -1, 517, -1, 1, -1, 36, 227, 207, - 224, -1, 28, 227, 207, 224, -1, 52, 227, 207, - 224, -1, 53, 227, 207, 224, -1, 49, 227, 122, - 224, -1, 73, 227, 234, 224, -1, 48, 227, 207, - 224, -1, 51, 227, 207, 224, -1 + 232, 0, -1, -1, 232, 233, -1, 267, -1, 279, + -1, 293, -1, 494, -1, 313, -1, 336, -1, 350, + -1, 243, -1, 509, -1, 365, -1, 372, -1, 376, + -1, 386, -1, 395, -1, 416, -1, 422, -1, 428, + -1, 438, -1, 432, -1, 238, -1, 273, -1, 1, + 225, -1, 1, 226, -1, -1, 235, -1, 107, 234, + -1, 107, 134, 234, -1, 107, 135, 234, -1, 107, + 136, 234, -1, 107, 137, 234, -1, 107, 138, 234, + -1, 107, 139, 234, -1, 107, 140, 234, -1, -1, + 237, -1, 107, 236, -1, 107, 9, 236, -1, 107, + 10, 236, -1, 107, 11, 236, -1, 95, 227, 239, + 226, 225, -1, 239, 240, -1, 240, -1, 241, -1, + 242, -1, 1, 225, -1, 94, 228, 122, 225, -1, + 118, 228, 122, 225, -1, 144, 227, 244, 226, 225, + -1, 244, 245, -1, 245, -1, 256, -1, 261, -1, + 266, -1, 258, -1, 259, -1, 260, -1, 263, -1, + 264, -1, 265, -1, 254, -1, 253, -1, 262, -1, + 257, -1, 252, -1, 246, -1, 247, -1, 255, -1, + 1, 225, -1, 195, 228, 248, 225, -1, 196, 228, + 250, 225, -1, 248, 229, 249, -1, 249, -1, 197, + -1, 198, -1, 250, 229, 251, -1, 251, -1, 197, + -1, 198, -1, 149, 228, 122, 225, -1, 132, 228, + 122, 225, -1, 152, 228, 122, 225, -1, 194, 228, + 122, 225, -1, 97, 228, 122, 225, -1, 63, 228, + 122, 225, -1, 24, 228, 122, 225, -1, 101, 228, + 122, 225, -1, 100, 228, 122, 225, -1, 221, 228, + 122, 225, -1, 222, 228, 122, 225, -1, 176, 228, + 107, 225, -1, 85, 228, 107, 225, -1, 89, 228, + 107, 225, -1, 56, 228, 208, 225, -1, 4, 227, + 268, 226, 225, -1, 268, 269, -1, 269, -1, 270, + -1, 272, -1, 271, -1, 1, 225, -1, 97, 228, + 122, 225, -1, 31, 228, 122, 225, -1, 24, 228, + 122, 225, -1, -1, 96, 274, 227, 275, 226, 225, + -1, 275, 276, -1, 276, -1, 277, -1, 278, -1, + 1, 225, -1, 75, 228, 122, 225, -1, 168, 228, + 122, 225, -1, 175, 227, 280, 226, 225, -1, 280, + 281, -1, 281, -1, 282, -1, 283, -1, 1, 225, + -1, 219, 228, 208, 225, -1, -1, 284, 168, 227, + 285, 226, 225, -1, 285, 286, -1, 286, -1, 287, + -1, 289, -1, 288, -1, 1, 225, -1, 97, 228, + 122, 225, -1, 189, 228, 237, 225, -1, 189, 228, + 202, 225, -1, -1, 216, 290, 228, 291, 225, -1, + 291, 229, 292, -1, 292, -1, 220, -1, 113, -1, + 39, -1, 165, -1, 68, -1, 66, -1, 164, -1, + -1, 113, 294, 227, 295, 226, 225, -1, 295, 296, + -1, 296, -1, 297, -1, 298, -1, 299, -1, 305, + -1, 304, -1, 300, -1, 301, -1, 302, -1, 303, + -1, 309, -1, 1, 225, -1, 97, 228, 122, 225, + -1, 220, 228, 122, 225, -1, 117, 228, 122, 225, + -1, 32, 228, 208, 225, -1, 133, 228, 122, 225, + -1, 150, 228, 122, 225, -1, 151, 228, 208, 225, + -1, 17, 228, 122, 225, -1, -1, 199, 306, 228, + 307, 225, -1, 307, 229, 308, -1, 308, -1, 159, + -1, 161, -1, 163, -1, 164, -1, 169, -1, 48, + -1, 190, -1, 177, -1, 181, -1, 200, -1, 192, + -1, 166, -1, 179, -1, 186, -1, 171, -1, 205, + -1, 191, -1, 160, -1, 174, -1, 178, -1, 167, + -1, -1, 62, 310, 228, 311, 225, -1, 311, 229, + 312, -1, 312, -1, 66, 230, 128, -1, 66, -1, + 18, 230, 128, -1, 18, -1, 148, 230, 128, -1, + 148, -1, 68, -1, 217, -1, 165, -1, 201, -1, + 224, -1, 39, -1, 25, -1, 182, -1, 127, -1, + 4, -1, 179, -1, 170, -1, 206, -1, 174, -1, + 129, -1, 187, -1, 94, -1, -1, 17, 314, 227, + 315, 226, 225, -1, 315, 316, -1, 316, -1, 317, + -1, 327, -1, 328, -1, 318, -1, 329, -1, 319, + -1, 320, -1, 321, -1, 322, -1, 323, -1, 324, + -1, 325, -1, 326, -1, 330, -1, 331, -1, 332, + -1, 1, 225, -1, 97, 228, 122, 225, -1, 120, + 228, 235, 225, -1, 109, 228, 107, 225, -1, 19, + 228, 235, 225, -1, 87, 228, 107, 225, -1, 80, + 228, 107, 225, -1, 83, 228, 107, 225, -1, 81, + 228, 107, 225, -1, 142, 228, 237, 225, -1, 180, + 228, 237, 225, -1, 15, 228, 107, 225, -1, 16, + 228, 107, 225, -1, 108, 228, 107, 225, -1, 91, + 228, 235, 225, -1, 82, 228, 235, 225, -1, -1, + 62, 333, 228, 334, 225, -1, 334, 229, 335, -1, + 335, -1, 123, -1, 50, -1, -1, 74, 337, 227, + 342, 226, 225, -1, -1, 62, 339, 228, 340, 225, + -1, 340, 229, 341, -1, 341, -1, 193, -1, 48, + -1, 183, -1, 342, 343, -1, 343, -1, 344, -1, + 338, -1, 348, -1, 349, -1, 1, 225, -1, -1, + 121, 228, 346, 345, 225, -1, 346, 229, 347, -1, + 347, -1, 107, -1, 107, 215, 107, -1, 60, 228, + 122, 225, -1, 55, 228, 122, 225, -1, -1, 61, + 351, 227, 352, 226, 225, -1, 352, 353, -1, 353, + -1, 354, -1, 355, -1, 356, -1, 358, -1, 362, + -1, 363, -1, 364, -1, 357, -1, 1, 225, -1, + 220, 228, 122, 225, -1, 117, 228, 122, 225, -1, + 17, 228, 122, 225, -1, 32, 228, 208, 225, -1, + -1, 62, 359, 228, 360, 225, -1, 360, 229, 361, + -1, 361, -1, 147, -1, 33, -1, 69, -1, 98, + -1, 13, -1, 106, -1, 42, -1, 131, -1, 207, + -1, 99, -1, 146, 228, 122, 225, -1, 126, 228, + 122, 225, -1, 125, 228, 107, 225, -1, -1, 130, + 366, 227, 367, 226, 225, -1, 367, 368, -1, 368, + -1, 369, -1, 370, -1, 371, -1, 1, 225, -1, + 75, 228, 122, 225, -1, 124, 228, 122, 225, -1, + 34, 228, 122, 225, -1, 184, 227, 373, 226, 225, + -1, 373, 374, -1, 374, -1, 375, -1, 1, -1, + 97, 228, 122, 225, -1, -1, 188, 377, 227, 378, + 226, 225, -1, 378, 379, -1, 379, -1, 380, -1, + 381, -1, 382, -1, 1, 225, -1, 97, 228, 122, + 225, -1, 220, 228, 122, 225, -1, -1, 216, 383, + 228, 384, 225, -1, 384, 229, 385, -1, 385, -1, + 68, -1, 217, -1, 165, -1, 201, -1, 224, -1, + 204, -1, 130, -1, 203, -1, 174, -1, 158, -1, + -1, 162, 387, 227, 388, 226, 225, -1, 388, 389, + -1, 389, -1, 390, -1, 391, -1, 1, 225, -1, + 97, 228, 122, 225, -1, -1, 216, 392, 228, 393, + 225, -1, 393, 229, 394, -1, 394, -1, 68, -1, + 217, -1, 165, -1, 201, -1, 224, -1, 204, -1, + 130, -1, 203, -1, 174, -1, 158, -1, -1, 18, + 396, 227, 397, 226, 225, -1, 397, 398, -1, 398, + -1, 399, -1, 400, -1, 401, -1, 402, -1, 403, + -1, 404, -1, 406, -1, 405, -1, 415, -1, 407, + -1, 412, -1, 413, -1, 414, -1, 411, -1, 1, + 225, -1, 97, 228, 122, 225, -1, 55, 228, 122, + 225, -1, 221, 228, 122, 225, -1, 141, 228, 122, + 225, -1, 3, 228, 122, 225, -1, 150, 228, 122, + 225, -1, 121, 228, 107, 225, -1, 5, 228, 172, + 225, -1, 5, 228, 173, 225, -1, -1, 62, 408, + 228, 409, 225, -1, 409, 229, 410, -1, 410, -1, + 8, -1, 193, -1, 32, 228, 208, 225, -1, 57, + 228, 122, 225, -1, 72, 228, 122, 225, -1, 17, + 228, 122, 225, -1, 194, 228, 122, 225, -1, -1, + 66, 417, 227, 418, 226, 225, -1, 418, 419, -1, + 419, -1, 420, -1, 421, -1, 1, -1, 220, 228, + 122, 225, -1, 124, 228, 122, 225, -1, -1, 23, + 423, 227, 424, 226, 225, -1, 424, 425, -1, 425, + -1, 426, -1, 427, -1, 1, -1, 60, 228, 122, + 225, -1, 124, 228, 122, 225, -1, 34, 227, 429, + 226, 225, -1, 429, 430, -1, 430, -1, 431, -1, + 1, -1, 60, 228, 122, 225, -1, -1, 37, 433, + 227, 434, 226, 225, -1, 434, 435, -1, 435, -1, + 436, -1, 437, -1, 1, -1, 97, 228, 122, 225, + -1, 124, 228, 122, 225, -1, 38, 227, 439, 226, + 225, -1, 439, 440, -1, 440, -1, 449, -1, 450, + -1, 451, -1, 452, -1, 453, -1, 454, -1, 455, + -1, 456, -1, 457, -1, 458, -1, 448, -1, 460, + -1, 461, -1, 475, -1, 463, -1, 465, -1, 467, + -1, 466, -1, 470, -1, 464, -1, 471, -1, 472, + -1, 473, -1, 474, -1, 487, -1, 476, -1, 477, + -1, 478, -1, 483, -1, 468, -1, 469, -1, 493, + -1, 491, -1, 492, -1, 482, -1, 459, -1, 480, + -1, 481, -1, 447, -1, 442, -1, 443, -1, 444, + -1, 445, -1, 446, -1, 462, -1, 441, -1, 479, + -1, 1, -1, 90, 228, 107, 225, -1, 41, 228, + 208, 225, -1, 40, 228, 235, 225, -1, 45, 228, + 235, 225, -1, 43, 228, 107, 225, -1, 44, 228, + 107, 225, -1, 210, 228, 208, 225, -1, 67, 228, + 235, 225, -1, 54, 228, 208, 225, -1, 58, 228, + 208, 225, -1, 35, 228, 208, 225, -1, 6, 228, + 208, 225, -1, 86, 228, 235, 225, -1, 84, 228, + 107, 225, -1, 76, 228, 107, 225, -1, 7, 228, + 235, 225, -1, 214, 228, 235, 225, -1, 213, 228, + 235, 225, -1, 47, 228, 107, 225, -1, 59, 228, + 208, 225, -1, 223, 228, 208, 225, -1, 153, 228, + 208, 225, -1, 156, 228, 208, 225, -1, 157, 228, + 208, 225, -1, 155, 228, 208, 225, -1, 155, 228, + 211, 225, -1, 154, 228, 208, 225, -1, 154, 228, + 211, 225, -1, 115, 228, 235, 225, -1, 12, 228, + 235, 225, -1, 114, 228, 208, 225, -1, 116, 228, + 235, 225, -1, 145, 228, 208, 225, -1, 105, 228, + 208, 225, -1, 212, 228, 208, 225, -1, 111, 228, + 208, 225, -1, 29, 228, 107, 225, -1, 88, 228, + 107, 225, -1, 218, 228, 208, 225, -1, 30, 228, + 122, 225, -1, 185, 228, 122, 225, -1, 119, 228, + 208, 225, -1, 26, 228, 208, 225, -1, 209, 228, + 235, 225, -1, -1, 112, 484, 228, 485, 225, -1, + 485, 229, 486, -1, 486, -1, 159, -1, 161, -1, + 163, -1, 164, -1, 169, -1, 48, -1, 190, -1, + 177, -1, 181, -1, 200, -1, 192, -1, 166, -1, + 179, -1, 186, -1, 171, -1, 205, -1, 191, -1, + 160, -1, 174, -1, 178, -1, 167, -1, -1, 110, + 488, 228, 489, 225, -1, 489, 229, 490, -1, 490, + -1, 159, -1, 161, -1, 163, -1, 164, -1, 169, + -1, 190, -1, 48, -1, 177, -1, 181, -1, 200, + -1, 192, -1, 166, -1, 179, -1, 186, -1, 171, + -1, 205, -1, 191, -1, 160, -1, 174, -1, 178, + -1, 167, -1, 92, 228, 107, 225, -1, 93, 228, + 107, 225, -1, 20, 228, 107, 225, -1, 14, 227, + 495, 226, 225, -1, 495, 496, -1, 496, -1, 502, + -1, 498, -1, 499, -1, 500, -1, 501, -1, 503, + -1, 504, -1, 505, -1, 506, -1, 507, -1, 508, + -1, 497, -1, 1, -1, 27, 228, 208, 225, -1, + 70, 228, 235, 225, -1, 71, 228, 235, 225, -1, + 79, 228, 107, 225, -1, 78, 228, 107, 225, -1, + 77, 228, 107, 225, -1, 22, 228, 107, 225, -1, + 21, 228, 107, 225, -1, 103, 228, 208, 225, -1, + 104, 228, 208, 225, -1, 64, 228, 107, 225, -1, + 65, 228, 235, 225, -1, 143, 227, 510, 226, 225, + -1, 510, 511, -1, 511, -1, 512, -1, 513, -1, + 514, -1, 515, -1, 517, -1, 518, -1, 516, -1, + 519, -1, 1, -1, 36, 228, 208, 225, -1, 28, + 228, 208, 225, -1, 52, 228, 208, 225, -1, 53, + 228, 208, 225, -1, 49, 228, 122, 225, -1, 73, + 228, 235, 225, -1, 48, 228, 208, 225, -1, 51, + 228, 208, 225, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 367, 367, 368, 371, 372, 373, 374, 375, 376, - 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, - 387, 388, 389, 390, 391, 392, 393, 397, 397, 398, - 402, 406, 410, 414, 418, 422, 426, 432, 432, 433, - 434, 435, 436, 443, 446, 446, 447, 447, 447, 449, - 455, 462, 464, 464, 465, 465, 466, 466, 467, 467, - 468, 468, 469, 469, 470, 470, 471, 471, 472, 472, - 473, 474, 477, 478, 480, 480, 481, 487, 495, 495, - 496, 502, 510, 552, 611, 639, 647, 662, 677, 686, - 700, 709, 737, 767, 792, 814, 836, 845, 847, 847, - 848, 848, 849, 849, 851, 860, 869, 882, 881, 899, - 899, 900, 900, 900, 902, 908, 917, 918, 918, 920, - 920, 921, 923, 930, 930, 943, 944, 946, 946, 947, - 947, 949, 957, 960, 966, 965, 971, 971, 972, 976, - 980, 984, 988, 992, 996, 1007, 1006, 1086, 1086, 1087, - 1087, 1087, 1088, 1088, 1088, 1089, 1089, 1090, 1090, 1092, - 1098, 1104, 1110, 1121, 1127, 1133, 1140, 1139, 1145, 1145, - 1146, 1150, 1154, 1158, 1162, 1166, 1170, 1174, 1178, 1182, - 1186, 1190, 1194, 1198, 1202, 1206, 1210, 1214, 1218, 1222, - 1226, 1233, 1232, 1238, 1238, 1239, 1243, 1247, 1251, 1255, - 1259, 1263, 1267, 1271, 1275, 1279, 1283, 1287, 1291, 1295, - 1299, 1303, 1307, 1311, 1315, 1319, 1323, 1327, 1338, 1337, - 1398, 1398, 1399, 1400, 1400, 1401, 1402, 1403, 1404, 1405, - 1406, 1407, 1408, 1409, 1409, 1410, 1411, 1412, 1413, 1415, - 1421, 1427, 1433, 1439, 1445, 1451, 1457, 1463, 1469, 1476, - 1482, 1488, 1494, 1503, 1513, 1512, 1518, 1518, 1519, 1523, - 1534, 1533, 1540, 1539, 1544, 1544, 1545, 1549, 1553, 1559, - 1559, 1560, 1560, 1560, 1560, 1560, 1562, 1562, 1564, 1564, - 1566, 1580, 1600, 1606, 1616, 1615, 1657, 1657, 1658, 1658, - 1658, 1658, 1659, 1659, 1659, 1660, 1660, 1662, 1668, 1674, - 1680, 1692, 1691, 1697, 1697, 1698, 1702, 1706, 1710, 1714, - 1718, 1722, 1726, 1730, 1734, 1740, 1754, 1763, 1777, 1776, - 1791, 1791, 1792, 1792, 1792, 1792, 1794, 1800, 1806, 1816, - 1818, 1818, 1819, 1819, 1821, 1837, 1836, 1861, 1861, 1862, - 1862, 1862, 1862, 1864, 1870, 1890, 1889, 1895, 1895, 1896, - 1900, 1904, 1908, 1912, 1916, 1920, 1924, 1928, 1932, 1942, - 1941, 1962, 1962, 1963, 1963, 1963, 1965, 1972, 1971, 1977, - 1977, 1978, 1982, 1986, 1990, 1994, 1998, 2002, 2006, 2010, - 2014, 2024, 2023, 2093, 2093, 2094, 2094, 2094, 2095, 2095, - 2096, 2097, 2097, 2097, 2098, 2098, 2098, 2099, 2099, 2100, - 2102, 2108, 2114, 2120, 2133, 2146, 2152, 2158, 2162, 2171, - 2170, 2175, 2175, 2176, 2180, 2186, 2197, 2203, 2209, 2215, - 2231, 2230, 2256, 2256, 2257, 2257, 2257, 2259, 2279, 2289, - 2288, 2315, 2315, 2316, 2316, 2316, 2318, 2324, 2333, 2335, - 2335, 2336, 2336, 2338, 2356, 2355, 2378, 2378, 2379, 2379, - 2379, 2381, 2387, 2396, 2399, 2399, 2400, 2400, 2401, 2401, - 2402, 2402, 2403, 2403, 2404, 2404, 2405, 2406, 2407, 2407, - 2408, 2408, 2409, 2409, 2410, 2410, 2411, 2411, 2412, 2412, - 2413, 2413, 2414, 2414, 2415, 2415, 2416, 2416, 2417, 2417, - 2418, 2418, 2419, 2420, 2421, 2421, 2422, 2422, 2423, 2424, - 2425, 2426, 2426, 2427, 2430, 2435, 2441, 2447, 2453, 2458, - 2463, 2468, 2473, 2478, 2483, 2488, 2493, 2498, 2503, 2508, - 2513, 2518, 2524, 2535, 2540, 2545, 2550, 2555, 2560, 2563, - 2568, 2571, 2576, 2581, 2586, 2591, 2596, 2601, 2606, 2611, - 2616, 2621, 2626, 2631, 2640, 2649, 2654, 2659, 2665, 2664, - 2669, 2669, 2670, 2673, 2676, 2679, 2682, 2685, 2688, 2691, - 2694, 2697, 2700, 2703, 2706, 2709, 2712, 2715, 2718, 2721, - 2724, 2727, 2730, 2736, 2735, 2740, 2740, 2741, 2744, 2747, - 2750, 2753, 2756, 2759, 2762, 2765, 2768, 2771, 2774, 2777, - 2780, 2783, 2786, 2789, 2792, 2795, 2798, 2801, 2806, 2811, - 2816, 2825, 2828, 2828, 2829, 2830, 2830, 2831, 2831, 2832, - 2833, 2834, 2835, 2836, 2836, 2837, 2837, 2839, 2844, 2849, - 2854, 2859, 2864, 2869, 2874, 2879, 2884, 2889, 2894, 2902, - 2905, 2905, 2906, 2906, 2907, 2908, 2909, 2910, 2910, 2911, - 2912, 2914, 2920, 2926, 2932, 2938, 2947, 2961, 2967 + 0, 368, 368, 369, 372, 373, 374, 375, 376, 377, + 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, + 388, 389, 390, 391, 392, 393, 394, 398, 398, 399, + 403, 407, 411, 415, 419, 423, 427, 433, 433, 434, + 435, 436, 437, 444, 447, 447, 448, 448, 448, 450, + 456, 463, 465, 465, 466, 466, 467, 467, 468, 468, + 469, 469, 470, 470, 471, 471, 472, 472, 473, 473, + 474, 475, 478, 479, 481, 481, 482, 488, 496, 496, + 497, 503, 511, 553, 612, 640, 648, 663, 678, 687, + 701, 710, 738, 768, 793, 815, 837, 846, 848, 848, + 849, 849, 850, 850, 852, 861, 870, 883, 882, 900, + 900, 901, 901, 901, 903, 909, 918, 919, 919, 921, + 921, 922, 924, 931, 931, 944, 945, 947, 947, 948, + 948, 950, 958, 961, 967, 966, 972, 972, 973, 977, + 981, 985, 989, 993, 997, 1008, 1007, 1087, 1087, 1088, + 1088, 1088, 1089, 1089, 1089, 1090, 1090, 1091, 1092, 1092, + 1094, 1100, 1106, 1112, 1123, 1129, 1135, 1146, 1153, 1152, + 1158, 1158, 1159, 1163, 1167, 1171, 1175, 1179, 1183, 1187, + 1191, 1195, 1199, 1203, 1207, 1211, 1215, 1219, 1223, 1227, + 1231, 1235, 1239, 1246, 1245, 1251, 1251, 1252, 1256, 1260, + 1264, 1268, 1272, 1276, 1280, 1284, 1288, 1292, 1296, 1300, + 1304, 1308, 1312, 1316, 1320, 1324, 1328, 1332, 1336, 1340, + 1351, 1350, 1411, 1411, 1412, 1413, 1413, 1414, 1415, 1416, + 1417, 1418, 1419, 1420, 1421, 1422, 1422, 1423, 1424, 1425, + 1426, 1428, 1434, 1440, 1446, 1452, 1458, 1464, 1470, 1476, + 1482, 1489, 1495, 1501, 1507, 1516, 1526, 1525, 1531, 1531, + 1532, 1536, 1547, 1546, 1553, 1552, 1557, 1557, 1558, 1562, + 1566, 1572, 1572, 1573, 1573, 1573, 1573, 1573, 1575, 1575, + 1577, 1577, 1579, 1593, 1613, 1619, 1629, 1628, 1670, 1670, + 1671, 1671, 1671, 1671, 1672, 1672, 1672, 1673, 1673, 1675, + 1681, 1687, 1693, 1705, 1704, 1710, 1710, 1711, 1715, 1719, + 1723, 1727, 1731, 1735, 1739, 1743, 1747, 1753, 1767, 1776, + 1790, 1789, 1804, 1804, 1805, 1805, 1805, 1805, 1807, 1813, + 1819, 1829, 1831, 1831, 1832, 1832, 1834, 1850, 1849, 1874, + 1874, 1875, 1875, 1875, 1875, 1877, 1883, 1903, 1902, 1908, + 1908, 1909, 1913, 1917, 1921, 1925, 1929, 1933, 1937, 1941, + 1945, 1955, 1954, 1975, 1975, 1976, 1976, 1976, 1978, 1985, + 1984, 1990, 1990, 1991, 1995, 1999, 2003, 2007, 2011, 2015, + 2019, 2023, 2027, 2037, 2036, 2106, 2106, 2107, 2107, 2107, + 2108, 2108, 2109, 2110, 2110, 2110, 2111, 2111, 2111, 2112, + 2112, 2113, 2115, 2121, 2127, 2133, 2146, 2159, 2165, 2171, + 2175, 2184, 2183, 2188, 2188, 2189, 2193, 2199, 2210, 2216, + 2222, 2228, 2244, 2243, 2269, 2269, 2270, 2270, 2270, 2272, + 2292, 2302, 2301, 2328, 2328, 2329, 2329, 2329, 2331, 2337, + 2346, 2348, 2348, 2349, 2349, 2351, 2369, 2368, 2391, 2391, + 2392, 2392, 2392, 2394, 2400, 2409, 2412, 2412, 2413, 2413, + 2414, 2414, 2415, 2415, 2416, 2416, 2417, 2417, 2418, 2419, + 2420, 2420, 2421, 2421, 2422, 2422, 2423, 2423, 2424, 2424, + 2425, 2425, 2426, 2426, 2427, 2427, 2428, 2428, 2429, 2429, + 2430, 2430, 2431, 2431, 2432, 2433, 2434, 2434, 2435, 2435, + 2436, 2437, 2438, 2439, 2439, 2440, 2443, 2448, 2454, 2460, + 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, 2743, 2749, 2748, 2753, 2753, 2754, + 2757, 2760, 2763, 2766, 2769, 2772, 2775, 2778, 2781, 2784, + 2787, 2790, 2793, 2796, 2799, 2802, 2805, 2808, 2811, 2814, + 2819, 2824, 2829, 2838, 2841, 2841, 2842, 2843, 2843, 2844, + 2844, 2845, 2846, 2847, 2848, 2849, 2849, 2850, 2850, 2852, + 2857, 2862, 2867, 2872, 2877, 2882, 2887, 2892, 2897, 2902, + 2907, 2915, 2918, 2918, 2919, 2919, 2920, 2921, 2922, 2923, + 2923, 2924, 2925, 2927, 2933, 2939, 2945, 2951, 2960, 2974, + 2980 }; #endif @@ -1387,14 +1392,15 @@ static const char *const yytname[] = "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS", "SEND_PASSWORD", "SENDQ", "SERVERHIDE", "SERVERINFO", "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE", "SQUIT", "SSL_CERTIFICATE_FILE", "SSL_CERTIFICATE_FINGERPRINT", - "SSL_DH_PARAM_FILE", "STATS_E_DISABLED", "STATS_I_OPER_ONLY", - "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "T_ALL", - "T_BOTS", "T_CALLERID", "T_CCONN", "T_CLUSTER", "T_DEAF", "T_DEBUG", - "T_DLINE", "T_EXTERNAL", "T_FARCONNECT", "T_FILE", "T_FULL", "T_GLOBOPS", - "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS", "T_LOG", "T_MAX_CLIENTS", - "T_NCHANGE", "T_NONONREG", "T_OPERWALL", "T_RECVQ", "T_REJ", "T_RESTART", - "T_SERVER", "T_SERVICE", "T_SERVICES_NAME", "T_SERVNOTICE", "T_SET", - "T_SHARED", "T_SIZE", "T_SKILL", "T_SOFTCALLERID", "T_SPY", "T_SSL", + "SSL_CONNECTION_REQUIRED", "SSL_DH_PARAM_FILE", "STATS_E_DISABLED", + "STATS_I_OPER_ONLY", "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", + "STATS_P_OPER_ONLY", "T_ALL", "T_BOTS", "T_CALLERID", "T_CCONN", + "T_CLUSTER", "T_DEAF", "T_DEBUG", "T_DLINE", "T_EXTERNAL", + "T_FARCONNECT", "T_FILE", "T_FULL", "T_GLOBOPS", "T_INVISIBLE", "T_IPV4", + "T_IPV6", "T_LOCOPS", "T_LOG", "T_MAX_CLIENTS", "T_NCHANGE", + "T_NONONREG", "T_OPERWALL", "T_RECVQ", "T_REJ", "T_RESTART", "T_SERVER", + "T_SERVICE", "T_SERVICES_NAME", "T_SERVNOTICE", "T_SET", "T_SHARED", + "T_SIZE", "T_SKILL", "T_SOFTCALLERID", "T_SPY", "T_SSL", "T_SSL_CIPHER_LIST", "T_SSL_CLIENT_METHOD", "T_SSL_SERVER_METHOD", "T_SSLV3", "T_TLSV1", "T_UMODES", "T_UNAUTH", "T_UNDLINE", "T_UNLIMITED", "T_UNRESV", "T_UNXLINE", "T_WALLOP", "T_WALLOPS", "T_WEBIRC", "TBOOL", @@ -1424,13 +1430,14 @@ static const char *const yytname[] = "logging_file_type_items", "logging_file_type_item", "oper_entry", "$@4", "oper_items", "oper_item", "oper_name", "oper_user", "oper_password", "oper_encrypted", "oper_rsa_public_key_file", - "oper_ssl_certificate_fingerprint", "oper_class", "oper_umodes", "$@5", - "oper_umodes_items", "oper_umodes_item", "oper_flags", "$@6", - "oper_flags_items", "oper_flags_item", "class_entry", "$@7", - "class_items", "class_item", "class_name", "class_ping_time", - "class_number_per_ip", "class_connectfreq", "class_max_number", - "class_max_global", "class_max_local", "class_max_ident", "class_sendq", - "class_recvq", "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6", + "oper_ssl_certificate_fingerprint", "oper_ssl_connection_required", + "oper_class", "oper_umodes", "$@5", "oper_umodes_items", + "oper_umodes_item", "oper_flags", "$@6", "oper_flags_items", + "oper_flags_item", "class_entry", "$@7", "class_items", "class_item", + "class_name", "class_ping_time", "class_number_per_ip", + "class_connectfreq", "class_max_number", "class_max_global", + "class_max_local", "class_max_ident", "class_sendq", "class_recvq", + "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6", "class_number_per_cidr", "class_min_idle", "class_max_idle", "class_flags", "$@8", "class_flags_items", "class_flags_item", "listen_entry", "$@9", "listen_flags", "$@10", "listen_flags_items", @@ -1522,78 +1529,80 @@ static const yytype_uint16 yytoknum[] = 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, - 475, 476, 477, 478, 59, 125, 123, 61, 44, 58 + 475, 476, 477, 478, 479, 59, 125, 123, 61, 44, + 58 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 230, 231, 231, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 233, 233, 234, - 234, 234, 234, 234, 234, 234, 234, 235, 235, 236, - 236, 236, 236, 237, 238, 238, 239, 239, 239, 240, - 241, 242, 243, 243, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 245, 246, 247, 247, 248, 248, 249, 249, - 250, 250, 251, 252, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 263, 264, 265, 266, 267, 267, - 268, 268, 268, 268, 269, 270, 271, 273, 272, 274, - 274, 275, 275, 275, 276, 277, 278, 279, 279, 280, - 280, 280, 281, 283, 282, 284, 284, 285, 285, 285, - 285, 286, 287, 287, 289, 288, 290, 290, 291, 291, - 291, 291, 291, 291, 291, 293, 292, 294, 294, 295, - 295, 295, 295, 295, 295, 295, 295, 295, 295, 296, - 297, 298, 299, 300, 301, 302, 304, 303, 305, 305, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 308, 307, 309, 309, 310, 310, 310, 310, 310, - 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, - 310, 310, 310, 310, 310, 310, 310, 310, 312, 311, - 313, 313, 314, 314, 314, 314, 314, 314, 314, 314, - 314, 314, 314, 314, 314, 314, 314, 314, 314, 315, + 0, 231, 232, 232, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 234, 234, 235, + 235, 235, 235, 235, 235, 235, 235, 236, 236, 237, + 237, 237, 237, 238, 239, 239, 240, 240, 240, 241, + 242, 243, 244, 244, 245, 245, 245, 245, 245, 245, + 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, + 245, 245, 246, 247, 248, 248, 249, 249, 250, 250, + 251, 251, 252, 253, 254, 255, 256, 257, 258, 259, + 260, 261, 262, 263, 264, 265, 266, 267, 268, 268, + 269, 269, 269, 269, 270, 271, 272, 274, 273, 275, + 275, 276, 276, 276, 277, 278, 279, 280, 280, 281, + 281, 281, 282, 284, 283, 285, 285, 286, 286, 286, + 286, 287, 288, 288, 290, 289, 291, 291, 292, 292, + 292, 292, 292, 292, 292, 294, 293, 295, 295, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 306, 305, + 307, 307, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 308, 308, 308, 310, 309, 311, 311, 312, 312, 312, + 312, 312, 312, 312, 312, 312, 312, 312, 312, 312, + 312, 312, 312, 312, 312, 312, 312, 312, 312, 312, + 314, 313, 315, 315, 316, 316, 316, 316, 316, 316, + 316, 316, 316, 316, 316, 316, 316, 316, 316, 316, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, - 326, 327, 328, 329, 331, 330, 332, 332, 333, 333, - 335, 334, 337, 336, 338, 338, 339, 339, 339, 340, - 340, 341, 341, 341, 341, 341, 343, 342, 344, 344, - 345, 345, 346, 347, 349, 348, 350, 350, 351, 351, - 351, 351, 351, 351, 351, 351, 351, 352, 353, 354, - 355, 357, 356, 358, 358, 359, 359, 359, 359, 359, - 359, 359, 359, 359, 359, 360, 361, 362, 364, 363, - 365, 365, 366, 366, 366, 366, 367, 368, 369, 370, - 371, 371, 372, 372, 373, 375, 374, 376, 376, 377, - 377, 377, 377, 378, 379, 381, 380, 382, 382, 383, - 383, 383, 383, 383, 383, 383, 383, 383, 383, 385, - 384, 386, 386, 387, 387, 387, 388, 390, 389, 391, - 391, 392, 392, 392, 392, 392, 392, 392, 392, 392, - 392, 394, 393, 395, 395, 396, 396, 396, 396, 396, - 396, 396, 396, 396, 396, 396, 396, 396, 396, 396, - 397, 398, 399, 400, 401, 402, 403, 404, 404, 406, - 405, 407, 407, 408, 408, 409, 410, 411, 412, 413, - 415, 414, 416, 416, 417, 417, 417, 418, 419, 421, - 420, 422, 422, 423, 423, 423, 424, 425, 426, 427, - 427, 428, 428, 429, 431, 430, 432, 432, 433, 433, - 433, 434, 435, 436, 437, 437, 438, 438, 438, 438, - 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, - 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, - 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, - 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, - 438, 438, 438, 438, 439, 440, 441, 442, 443, 444, + 326, 327, 328, 329, 330, 331, 333, 332, 334, 334, + 335, 335, 337, 336, 339, 338, 340, 340, 341, 341, + 341, 342, 342, 343, 343, 343, 343, 343, 345, 344, + 346, 346, 347, 347, 348, 349, 351, 350, 352, 352, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 354, + 355, 356, 357, 359, 358, 360, 360, 361, 361, 361, + 361, 361, 361, 361, 361, 361, 361, 362, 363, 364, + 366, 365, 367, 367, 368, 368, 368, 368, 369, 370, + 371, 372, 373, 373, 374, 374, 375, 377, 376, 378, + 378, 379, 379, 379, 379, 380, 381, 383, 382, 384, + 384, 385, 385, 385, 385, 385, 385, 385, 385, 385, + 385, 387, 386, 388, 388, 389, 389, 389, 390, 392, + 391, 393, 393, 394, 394, 394, 394, 394, 394, 394, + 394, 394, 394, 396, 395, 397, 397, 398, 398, 398, + 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, + 398, 398, 399, 400, 401, 402, 403, 404, 405, 406, + 406, 408, 407, 409, 409, 410, 410, 411, 412, 413, + 414, 415, 417, 416, 418, 418, 419, 419, 419, 420, + 421, 423, 422, 424, 424, 425, 425, 425, 426, 427, + 428, 429, 429, 430, 430, 431, 433, 432, 434, 434, + 435, 435, 435, 436, 437, 438, 439, 439, 440, 440, + 440, 440, 440, 440, 440, 440, 440, 440, 440, 440, + 440, 440, 440, 440, 440, 440, 440, 440, 440, 440, + 440, 440, 440, 440, 440, 440, 440, 440, 440, 440, + 440, 440, 440, 440, 440, 440, 440, 440, 440, 440, + 440, 440, 440, 440, 440, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, - 455, 456, 457, 458, 459, 460, 461, 462, 463, 463, - 464, 464, 465, 466, 467, 468, 469, 470, 471, 472, - 473, 474, 475, 476, 477, 478, 479, 480, 482, 481, - 483, 483, 484, 484, 484, 484, 484, 484, 484, 484, - 484, 484, 484, 484, 484, 484, 484, 484, 484, 484, - 484, 484, 484, 486, 485, 487, 487, 488, 488, 488, - 488, 488, 488, 488, 488, 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, 495, 496, 497, + 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, + 465, 465, 466, 466, 467, 468, 469, 470, 471, 472, + 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, + 484, 483, 485, 485, 486, 486, 486, 486, 486, 486, + 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, + 486, 486, 486, 486, 486, 488, 487, 489, 489, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 491, 492, 493, 494, 495, 495, 496, 496, 496, 496, + 496, 496, 496, 496, 496, 496, 496, 496, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, - 508, 508, 509, 509, 509, 509, 509, 509, 509, 509, - 509, 510, 511, 512, 513, 514, 515, 516, 517 + 508, 509, 510, 510, 511, 511, 511, 511, 511, 511, + 511, 511, 511, 512, 513, 514, 515, 516, 517, 518, + 519 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1614,56 +1623,57 @@ static const yytype_uint8 yyr2[] = 1, 2, 4, 0, 6, 2, 1, 1, 1, 1, 2, 4, 4, 4, 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 6, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, - 4, 4, 4, 4, 4, 4, 0, 5, 3, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 4, 4, 4, 4, 4, 4, 4, 4, 0, 5, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0, 5, 3, 1, 3, 1, 3, + 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 5, 3, 1, 3, 1, 3, 1, 3, + 0, 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 0, 6, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 0, 5, 3, 1, + 1, 1, 0, 6, 0, 5, 3, 1, 1, 1, + 1, 2, 1, 1, 1, 1, 1, 2, 0, 5, + 3, 1, 1, 3, 4, 4, 0, 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 0, 5, 3, 1, 1, 1, - 0, 6, 0, 5, 3, 1, 1, 1, 1, 2, - 1, 1, 1, 1, 1, 2, 0, 5, 3, 1, - 1, 3, 4, 4, 0, 6, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 4, 4, 4, - 4, 0, 5, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 4, 4, 4, 0, 6, - 2, 1, 1, 1, 1, 2, 4, 4, 4, 5, - 2, 1, 1, 1, 4, 0, 6, 2, 1, 1, - 1, 1, 2, 4, 4, 0, 5, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 6, 2, 1, 1, 1, 2, 4, 0, 5, 3, + 4, 4, 4, 0, 5, 3, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, + 0, 6, 2, 1, 1, 1, 1, 2, 4, 4, + 4, 5, 2, 1, 1, 1, 4, 0, 6, 2, + 1, 1, 1, 1, 2, 4, 4, 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 6, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, - 5, 3, 1, 1, 1, 4, 4, 4, 4, 4, - 0, 6, 2, 1, 1, 1, 1, 4, 4, 0, - 6, 2, 1, 1, 1, 1, 4, 4, 5, 2, - 1, 1, 1, 4, 0, 6, 2, 1, 1, 1, - 1, 4, 4, 5, 2, 1, 1, 1, 1, 1, + 1, 0, 6, 2, 1, 1, 1, 2, 4, 0, + 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0, 6, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 0, 5, 3, 1, 1, 1, 4, 4, 4, + 4, 4, 0, 6, 2, 1, 1, 1, 1, 4, + 4, 0, 6, 2, 1, 1, 1, 1, 4, 4, + 5, 2, 1, 1, 1, 4, 0, 6, 2, 1, + 1, 1, 1, 4, 4, 5, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, + 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 0, 5, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, + 4, 4, 4, 5, 2, 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, 5, 2, 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, 5, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4 + 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, + 4 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -1671,335 +1681,337 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 0, 0, 0, 218, 381, 429, 0, - 444, 0, 284, 420, 260, 0, 107, 145, 318, 0, - 0, 359, 0, 0, 335, 3, 23, 11, 4, 24, + 2, 0, 1, 0, 0, 0, 220, 383, 431, 0, + 446, 0, 286, 422, 262, 0, 107, 145, 320, 0, + 0, 361, 0, 0, 337, 3, 23, 11, 4, 24, 5, 6, 8, 9, 10, 13, 14, 15, 16, 17, 18, 19, 20, 22, 21, 7, 12, 25, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 99, 100, 102, 101, 616, + 0, 0, 0, 0, 0, 99, 100, 102, 101, 618, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 603, 615, 605, 606, 607, 608, 604, - 609, 610, 611, 612, 613, 614, 0, 0, 0, 442, - 0, 0, 440, 441, 0, 503, 0, 0, 0, 0, + 0, 0, 0, 605, 617, 607, 608, 609, 610, 606, + 611, 612, 613, 614, 615, 616, 0, 0, 0, 444, + 0, 0, 442, 443, 0, 505, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 573, 0, 548, 0, 0, 0, 0, 0, + 0, 0, 575, 0, 550, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 455, 501, 495, 496, 497, 498, - 499, 494, 466, 456, 457, 458, 459, 460, 461, 462, - 463, 464, 465, 491, 467, 468, 500, 470, 475, 471, - 473, 472, 485, 486, 474, 476, 477, 478, 479, 469, - 481, 482, 483, 502, 492, 493, 490, 484, 480, 488, - 489, 487, 0, 0, 0, 0, 0, 0, 0, 45, - 46, 47, 0, 0, 0, 640, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 631, 632, 633, 634, 635, - 638, 636, 637, 639, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 457, 503, 497, 498, 499, 500, + 501, 496, 468, 458, 459, 460, 461, 462, 463, 464, + 465, 466, 467, 493, 469, 470, 502, 472, 477, 473, + 475, 474, 487, 488, 476, 478, 479, 480, 481, 471, + 483, 484, 485, 504, 494, 495, 492, 486, 482, 490, + 491, 489, 0, 0, 0, 0, 0, 0, 0, 45, + 46, 47, 0, 0, 0, 642, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 633, 634, 635, 636, 637, + 640, 638, 639, 641, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 68, 69, 67, 64, 63, 70, 54, 66, 57, 58, 59, 55, 65, 60, 61, 62, - 56, 0, 0, 0, 0, 118, 119, 120, 0, 333, - 0, 0, 331, 332, 0, 103, 0, 0, 0, 0, + 56, 0, 0, 0, 0, 118, 119, 120, 0, 335, + 0, 0, 333, 334, 0, 103, 0, 0, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 602, 0, 0, 0, 0, 254, + 0, 0, 0, 0, 604, 0, 0, 0, 0, 256, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 221, 222, 225, 227, 228, 229, 230, - 231, 232, 233, 234, 223, 224, 226, 235, 236, 237, - 0, 0, 0, 0, 0, 0, 0, 409, 0, 0, - 0, 0, 0, 0, 0, 0, 384, 385, 386, 387, - 388, 389, 390, 392, 391, 394, 398, 395, 396, 397, - 393, 435, 0, 0, 0, 432, 433, 434, 0, 0, - 439, 450, 0, 0, 0, 447, 448, 449, 0, 0, + 0, 0, 0, 223, 224, 227, 229, 230, 231, 232, + 233, 234, 235, 236, 225, 226, 228, 237, 238, 239, + 0, 0, 0, 0, 0, 0, 0, 411, 0, 0, + 0, 0, 0, 0, 0, 0, 386, 387, 388, 389, + 390, 391, 392, 394, 393, 396, 400, 397, 398, 399, + 395, 437, 0, 0, 0, 434, 435, 436, 0, 0, + 441, 452, 0, 0, 0, 449, 450, 451, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 454, 0, 0, 0, - 301, 0, 0, 0, 0, 0, 0, 287, 288, 289, - 290, 295, 291, 292, 293, 294, 426, 0, 0, 0, - 423, 424, 425, 0, 0, 0, 262, 0, 272, 0, - 270, 271, 273, 274, 48, 0, 0, 0, 44, 0, - 0, 0, 0, 110, 111, 112, 0, 0, 0, 191, - 0, 0, 0, 0, 166, 0, 0, 148, 149, 150, - 151, 154, 155, 156, 153, 152, 157, 0, 0, 0, - 0, 0, 321, 322, 323, 324, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 630, 71, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 456, 0, 0, 0, + 303, 0, 0, 0, 0, 0, 0, 289, 290, 291, + 292, 297, 293, 294, 295, 296, 428, 0, 0, 0, + 425, 426, 427, 0, 0, 0, 264, 0, 274, 0, + 272, 273, 275, 276, 48, 0, 0, 0, 44, 0, + 0, 0, 0, 110, 111, 112, 0, 0, 0, 193, + 0, 0, 0, 0, 0, 168, 0, 0, 148, 149, + 150, 151, 154, 155, 156, 157, 153, 152, 158, 0, + 0, 0, 0, 0, 323, 324, 325, 326, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 632, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 52, 0, 0, 367, 0, - 362, 363, 364, 121, 0, 0, 117, 0, 0, 0, - 330, 0, 0, 345, 0, 0, 338, 339, 340, 341, - 0, 0, 0, 97, 0, 0, 0, 0, 27, 0, - 0, 0, 0, 0, 0, 0, 0, 601, 238, 0, + 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, + 369, 0, 364, 365, 366, 121, 0, 0, 117, 0, + 0, 0, 332, 0, 0, 347, 0, 0, 340, 341, + 342, 343, 0, 0, 0, 97, 0, 0, 0, 0, + 27, 0, 0, 0, 0, 0, 0, 0, 0, 603, + 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 222, 401, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 220, 399, 0, 0, + 0, 0, 0, 0, 0, 385, 0, 0, 0, 433, + 0, 440, 0, 0, 0, 448, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 383, 0, 0, 0, 431, 0, 438, - 0, 0, 0, 446, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 455, 298, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 288, 0, 0, 0, + 424, 277, 0, 0, 0, 0, 0, 271, 0, 0, + 43, 113, 0, 0, 0, 109, 159, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 147, 327, + 0, 0, 0, 0, 322, 0, 0, 0, 0, 0, + 0, 0, 0, 631, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 76, 77, 0, + 75, 80, 81, 0, 79, 0, 0, 51, 367, 0, + 0, 0, 363, 0, 116, 0, 0, 331, 344, 0, + 0, 0, 0, 339, 106, 105, 104, 626, 625, 619, + 629, 27, 27, 27, 27, 27, 27, 27, 29, 28, + 630, 620, 621, 624, 623, 622, 627, 628, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 453, 296, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 286, 0, 0, 0, 422, 275, - 0, 0, 0, 0, 0, 269, 0, 0, 43, 113, - 0, 0, 0, 109, 158, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 147, 325, 0, 0, 0, - 0, 320, 0, 0, 0, 0, 0, 0, 0, 0, - 629, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 76, 77, 0, 75, 80, 81, - 0, 79, 0, 0, 51, 365, 0, 0, 0, 361, - 0, 116, 0, 0, 329, 342, 0, 0, 0, 0, - 337, 106, 105, 104, 624, 623, 617, 627, 27, 27, - 27, 27, 27, 27, 27, 29, 28, 628, 618, 619, - 622, 621, 620, 625, 626, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, - 0, 0, 219, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 382, 0, - 0, 430, 443, 0, 0, 445, 515, 519, 533, 600, - 546, 540, 543, 514, 506, 505, 508, 509, 507, 522, - 512, 513, 523, 511, 518, 517, 516, 541, 504, 598, - 599, 537, 583, 577, 594, 578, 579, 580, 588, 597, - 581, 591, 595, 584, 596, 589, 585, 590, 582, 593, - 587, 586, 592, 0, 576, 539, 557, 552, 569, 553, - 554, 555, 563, 572, 556, 566, 570, 559, 571, 564, - 560, 565, 558, 568, 562, 561, 567, 0, 551, 534, - 532, 535, 545, 536, 525, 530, 531, 528, 529, 526, - 527, 544, 547, 510, 538, 521, 520, 542, 524, 0, - 0, 0, 0, 0, 0, 0, 0, 285, 0, 0, - 421, 0, 0, 0, 280, 276, 279, 261, 49, 50, - 0, 0, 108, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 146, 0, 0, 0, 319, 642, 641, 647, - 645, 648, 643, 644, 646, 88, 96, 87, 94, 95, - 86, 90, 89, 83, 82, 84, 93, 85, 72, 0, - 73, 0, 91, 92, 0, 0, 360, 122, 0, 0, - 0, 134, 0, 126, 127, 129, 128, 334, 0, 0, - 0, 336, 30, 31, 32, 33, 34, 35, 36, 249, - 250, 242, 259, 258, 0, 257, 244, 246, 253, 245, - 243, 252, 239, 251, 241, 240, 37, 37, 37, 39, - 38, 247, 248, 404, 407, 408, 418, 415, 401, 416, - 413, 414, 0, 412, 417, 400, 406, 403, 405, 419, - 402, 436, 437, 451, 452, 574, 0, 549, 0, 299, - 300, 309, 306, 311, 307, 308, 314, 310, 312, 305, - 313, 0, 304, 298, 317, 316, 315, 297, 428, 427, - 283, 282, 267, 268, 266, 0, 265, 0, 0, 0, - 114, 115, 165, 162, 210, 198, 207, 206, 196, 201, - 217, 209, 215, 200, 203, 212, 214, 211, 208, 216, - 204, 213, 202, 205, 0, 194, 159, 161, 163, 164, - 175, 170, 187, 171, 172, 173, 181, 190, 174, 184, - 188, 177, 189, 182, 178, 183, 176, 186, 180, 179, - 185, 0, 169, 160, 328, 326, 327, 74, 78, 366, - 371, 377, 380, 373, 379, 374, 378, 376, 372, 375, - 0, 370, 130, 0, 0, 0, 0, 125, 343, 349, - 355, 358, 351, 357, 352, 356, 354, 350, 353, 0, - 348, 344, 255, 0, 40, 41, 42, 410, 0, 575, - 550, 302, 0, 263, 0, 281, 278, 277, 0, 0, - 0, 192, 0, 167, 0, 368, 0, 0, 0, 0, - 0, 124, 346, 0, 256, 411, 303, 264, 197, 195, - 199, 193, 168, 369, 131, 133, 132, 140, 143, 142, - 139, 144, 141, 138, 0, 137, 347, 135, 0, 136 + 0, 0, 37, 0, 0, 221, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 384, 0, 0, 432, 445, 0, 0, 447, 517, + 521, 535, 602, 548, 542, 545, 516, 508, 507, 510, + 511, 509, 524, 514, 515, 525, 513, 520, 519, 518, + 543, 506, 600, 601, 539, 585, 579, 596, 580, 581, + 582, 590, 599, 583, 593, 597, 586, 598, 591, 587, + 592, 584, 595, 589, 588, 594, 0, 578, 541, 559, + 554, 571, 555, 556, 557, 565, 574, 558, 568, 572, + 561, 573, 566, 562, 567, 560, 570, 564, 563, 569, + 0, 553, 536, 534, 537, 547, 538, 527, 532, 533, + 530, 531, 528, 529, 546, 549, 512, 540, 523, 522, + 544, 526, 0, 0, 0, 0, 0, 0, 0, 0, + 287, 0, 0, 423, 0, 0, 0, 282, 278, 281, + 263, 49, 50, 0, 0, 108, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 146, 0, 0, 0, + 321, 644, 643, 649, 647, 650, 645, 646, 648, 88, + 96, 87, 94, 95, 86, 90, 89, 83, 82, 84, + 93, 85, 72, 0, 73, 0, 91, 92, 0, 0, + 362, 122, 0, 0, 0, 134, 0, 126, 127, 129, + 128, 336, 0, 0, 0, 338, 30, 31, 32, 33, + 34, 35, 36, 251, 252, 244, 261, 260, 0, 259, + 246, 248, 255, 247, 245, 254, 241, 253, 243, 242, + 37, 37, 37, 39, 38, 249, 250, 406, 409, 410, + 420, 417, 403, 418, 415, 416, 0, 414, 419, 402, + 408, 405, 407, 421, 404, 438, 439, 453, 454, 576, + 0, 551, 0, 301, 302, 311, 308, 313, 309, 310, + 316, 312, 314, 307, 315, 0, 306, 300, 319, 318, + 317, 299, 430, 429, 285, 284, 269, 270, 268, 0, + 267, 0, 0, 0, 114, 115, 167, 163, 212, 200, + 209, 208, 198, 203, 219, 211, 217, 202, 205, 214, + 216, 213, 210, 218, 206, 215, 204, 207, 0, 196, + 160, 162, 164, 165, 166, 177, 172, 189, 173, 174, + 175, 183, 192, 176, 186, 190, 179, 191, 184, 180, + 185, 178, 188, 182, 181, 187, 0, 171, 161, 330, + 328, 329, 74, 78, 368, 373, 379, 382, 375, 381, + 376, 380, 378, 374, 377, 0, 372, 130, 0, 0, + 0, 0, 125, 345, 351, 357, 360, 353, 359, 354, + 358, 356, 352, 355, 0, 350, 346, 257, 0, 40, + 41, 42, 412, 0, 577, 552, 304, 0, 265, 0, + 283, 280, 279, 0, 0, 0, 194, 0, 169, 0, + 370, 0, 0, 0, 0, 0, 124, 348, 0, 258, + 413, 305, 266, 199, 197, 201, 195, 170, 371, 131, + 133, 132, 140, 143, 142, 139, 144, 141, 138, 0, + 137, 349, 135, 0, 136 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 25, 805, 806, 1059, 1060, 26, 218, 219, - 220, 221, 27, 262, 263, 264, 265, 766, 767, 770, - 771, 266, 267, 268, 269, 270, 271, 272, 273, 274, + -1, 1, 25, 808, 809, 1063, 1064, 26, 218, 219, + 220, 221, 27, 262, 263, 264, 265, 769, 770, 773, + 774, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 28, 74, 75, 76, 77, 78, 29, 61, 492, 493, 494, 495, 30, 284, - 285, 286, 287, 288, 1022, 1023, 1024, 1025, 1026, 1195, - 1264, 1265, 31, 62, 506, 507, 508, 509, 510, 511, - 512, 513, 514, 515, 732, 1171, 1172, 516, 727, 1144, - 1145, 32, 51, 332, 333, 334, 335, 336, 337, 338, - 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, - 349, 602, 1044, 1045, 33, 59, 478, 712, 1115, 1116, - 479, 480, 481, 1119, 965, 966, 482, 483, 34, 57, - 456, 457, 458, 459, 460, 461, 462, 697, 1101, 1102, - 463, 464, 465, 35, 63, 521, 522, 523, 524, 525, - 36, 291, 292, 293, 37, 69, 575, 576, 577, 578, - 579, 787, 1209, 1210, 38, 66, 559, 560, 561, 562, - 777, 1190, 1191, 39, 52, 365, 366, 367, 368, 369, - 370, 371, 372, 373, 374, 375, 624, 1072, 1073, 376, - 377, 378, 379, 380, 40, 58, 469, 470, 471, 472, - 41, 53, 384, 385, 386, 387, 42, 111, 112, 113, - 43, 55, 394, 395, 396, 397, 44, 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, 426, 927, 928, 208, 424, 903, 904, 209, - 210, 211, 45, 92, 93, 94, 95, 96, 97, 98, - 99, 100, 101, 102, 103, 104, 105, 46, 234, 235, - 236, 237, 238, 239, 240, 241, 242, 243 + 285, 286, 287, 288, 1026, 1027, 1028, 1029, 1030, 1200, + 1269, 1270, 31, 62, 507, 508, 509, 510, 511, 512, + 513, 514, 515, 516, 517, 735, 1176, 1177, 518, 729, + 1148, 1149, 32, 51, 332, 333, 334, 335, 336, 337, + 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, + 348, 349, 604, 1048, 1049, 33, 59, 478, 714, 1119, + 1120, 479, 480, 481, 1123, 968, 969, 482, 483, 34, + 57, 456, 457, 458, 459, 460, 461, 462, 699, 1105, + 1106, 463, 464, 465, 35, 63, 523, 524, 525, 526, + 527, 36, 291, 292, 293, 37, 69, 577, 578, 579, + 580, 581, 790, 1214, 1215, 38, 66, 561, 562, 563, + 564, 780, 1195, 1196, 39, 52, 365, 366, 367, 368, + 369, 370, 371, 372, 373, 374, 375, 626, 1076, 1077, + 376, 377, 378, 379, 380, 40, 58, 469, 470, 471, + 472, 41, 53, 384, 385, 386, 387, 42, 111, 112, + 113, 43, 55, 394, 395, 396, 397, 44, 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, 426, 930, 931, 208, 424, 906, 907, + 209, 210, 211, 45, 92, 93, 94, 95, 96, 97, + 98, 99, 100, 101, 102, 103, 104, 105, 46, 234, + 235, 236, 237, 238, 239, 240, 241, 242, 243 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -990 +#define YYPACT_NINF -1050 static const yytype_int16 yypact[] = { - -990, 660, -990, -163, -210, -201, -990, -990, -990, -195, - -990, -192, -990, -990, -990, -190, -990, -990, -990, -178, - -172, -990, -150, -148, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, 248, - 886, -127, -125, -106, 27, -92, 424, -71, -58, -53, - 49, -42, -40, -34, 320, 395, -28, 9, 26, -20, - -131, -16, 1, 38, 8, -990, -990, -990, -990, -990, - 87, 90, 103, 108, 112, 113, 115, 116, 117, 119, - 122, 123, 337, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, 700, 380, 51, -990, - 125, 25, -990, -990, 80, -990, 126, 127, 130, 133, - 134, 136, 139, 140, 143, 147, 148, 150, 151, 152, - 153, 155, 157, 159, 160, 161, 162, 163, 164, 167, - 168, 171, -990, 172, -990, 176, 177, 182, 183, 190, - 191, 194, 195, 196, 197, 199, 200, 201, 205, 206, - 207, 211, 212, 107, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, 330, 6, 11, 101, 216, 218, 46, -990, - -990, -990, 13, 501, 17, -990, 219, 221, 222, 230, - 233, 235, 236, 239, 7, -990, -990, -990, -990, -990, - -990, -990, -990, -990, 189, 243, 246, 247, 252, 254, - 258, 259, 260, 261, 262, 263, 266, 267, 270, 271, - 276, 278, 21, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, 85, 251, 280, 18, -990, -990, -990, 73, -990, - 282, 62, -990, -990, 5, -990, 384, 389, 391, 291, - -990, 412, 413, 315, 416, 417, 417, 417, 418, 419, - 425, 334, 335, 313, -990, 323, 321, 324, 326, -990, - 338, 340, 341, 344, 345, 348, 355, 357, 358, 359, - 360, 364, 186, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - 368, 367, 369, 370, 372, 374, 375, -990, 376, 377, - 378, 382, 385, 386, 387, 279, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, 390, 392, 22, -990, -990, -990, 428, 383, - -990, -990, 393, 402, 20, -990, -990, -990, 404, 417, - 417, 457, 423, 524, 516, 435, 417, 436, 537, 542, - 417, 543, 438, 441, 445, 417, 546, 548, 417, 550, - 551, 552, 555, 456, 439, 458, 440, 462, 417, 417, - 463, 464, 466, 83, 94, 469, 472, 559, 417, 475, - 477, 417, 417, 478, 479, 465, -990, 468, 460, 476, - -990, 480, 482, 483, 485, 487, 32, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, 490, 491, 39, - -990, -990, -990, 498, 496, 497, -990, 502, -990, 10, - -990, -990, -990, -990, -990, 568, 571, 504, -990, 506, - 508, 509, 14, -990, -990, -990, 507, 510, 517, -990, - 518, 519, 521, 522, -990, 525, 12, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, 529, 530, 531, - 532, 4, -990, -990, -990, -990, 499, 526, 544, 582, - 553, 556, 557, 417, 547, -990, -990, 603, 558, 644, - 661, 663, 645, 650, 653, 655, 656, 657, 677, 664, - 57, 59, 666, 667, 569, -990, 570, 565, -990, 74, - -990, -990, -990, -990, 588, 572, -990, 573, 676, 576, - -990, 577, 575, -990, 578, 19, -990, -990, -990, -990, - 583, 586, 587, -990, 589, 592, 594, 595, 421, 598, - 599, 600, 601, 602, 605, 606, 607, -990, -990, 699, - 720, 417, 609, 725, 730, 417, 731, 732, 417, 711, - 733, 734, 417, 737, 737, 621, -990, -990, 724, 104, - 736, 641, 738, 740, 625, 741, 743, 748, 744, 750, - 751, 752, 646, -990, 753, 755, 654, -990, 659, -990, - 771, 775, 674, -990, 681, 685, 686, 688, 690, 694, - 695, 696, 697, 698, 702, 709, 712, 714, 716, 717, - 719, 728, 729, 742, 745, 746, 747, 754, 756, 757, - 691, 758, 726, 759, 760, 761, 762, 763, 764, 767, - 768, 770, 772, 773, 774, 776, 777, 778, 779, 780, - 781, 782, 783, -990, -990, 801, 693, 721, 802, 794, - 822, 833, 839, 784, -990, 840, 845, 785, -990, -990, - 850, 852, 749, 868, 786, -990, 787, 788, -990, -990, - 855, 857, 789, -990, -990, 871, 792, 790, 873, 892, - 893, 894, 791, 897, 796, -990, -990, 899, 900, 901, - 800, -990, 803, 804, 805, 806, 807, 808, 809, 810, - -990, 811, 812, 813, 814, 815, 816, 817, 818, 819, - 820, 821, 823, 824, -990, -990, -187, -990, -990, -990, - -182, -990, 825, 826, -990, -990, 903, 799, 827, -990, - 828, -990, 97, 829, -990, -990, 924, 830, 932, 831, - -990, -990, -990, -990, -990, -990, -990, -990, 417, 417, - 417, 417, 417, 417, 417, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, 832, 834, 835, -33, 836, - 837, 838, 841, 842, 843, 844, 846, 847, 848, 179, - 849, 851, -990, 853, 854, 856, 858, 859, 860, 861, - 16, 862, 863, 864, 865, 866, 867, 869, -990, 870, - 872, -990, -990, 874, 875, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -171, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -133, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, 876, - 877, 541, 878, 879, 880, 881, 882, -990, 883, 884, - -990, 885, 887, 121, 896, 888, -990, -990, -990, -990, - 889, 890, -990, 891, 895, 527, 898, 902, 904, 905, - 769, 906, -990, 907, 908, 909, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, 57, - -990, 59, -990, -990, 910, 538, -990, -990, 911, 912, - 913, -990, 82, -990, -990, -990, -990, -990, 914, 612, - 917, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -124, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, 737, 737, 737, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -68, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, 691, -990, 726, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -21, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -15, -990, 956, 868, 918, - -990, -990, -990, -990, -990, 915, -990, -990, 916, -990, - -990, -990, -990, 919, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, 50, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, 64, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - 98, -990, -990, 942, -77, 920, 922, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, 99, - -990, -990, -990, -33, -990, -990, -990, -990, 16, -990, - -990, -990, 541, -990, 121, -990, -990, -990, 941, 946, - 948, -990, 527, -990, 769, -990, 538, 925, 926, 927, - 242, -990, -990, 612, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, 109, -990, -990, -990, 242, -990 + -1050, 656, -1050, -170, -181, -163, -1050, -1050, -1050, -158, + -1050, -151, -1050, -1050, -1050, -111, -1050, -1050, -1050, -93, + -87, -1050, -69, -58, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, 20, + 926, -33, -3, 0, 30, 11, 387, 39, 62, 74, + 197, 81, 82, 83, 685, 428, 87, 40, 60, 91, + -176, 29, 43, 66, 8, -1050, -1050, -1050, -1050, -1050, + 94, 95, 109, 111, 112, 113, 115, 116, 117, 118, + 122, 123, 7, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, 683, 364, 35, -1050, + 124, 23, -1050, -1050, 200, -1050, 125, 127, 129, 130, + 132, 133, 135, 136, 138, 142, 143, 144, 145, 149, + 150, 151, 152, 155, 156, 157, 159, 161, 162, 164, + 172, 175, -1050, 176, -1050, 177, 181, 182, 183, 184, + 186, 187, 190, 192, 195, 205, 209, 210, 212, 215, + 216, 219, 220, 107, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, 449, 19, 287, -47, 221, 223, 5, -1050, + -1050, -1050, 16, 438, 6, -1050, 225, 228, 229, 230, + 231, 232, 236, 237, 14, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, 110, 240, 244, 246, 248, 250, + 254, 258, 259, 260, 261, 267, 268, 279, 280, 281, + 282, 284, 180, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, 34, 173, 288, 9, -1050, -1050, -1050, 119, -1050, + 298, 44, -1050, -1050, 59, -1050, 214, 303, 393, 302, + -1050, 423, 427, 328, 430, 431, 431, 431, 432, 439, + 441, 337, 342, 326, -1050, 327, 325, 333, 334, -1050, + 335, 336, 340, 341, 345, 350, 351, 353, 354, 355, + 358, 362, 105, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + 331, 363, 365, 370, 374, 378, 379, -1050, 380, 381, + 383, 384, 397, 399, 400, 241, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, 401, 403, 22, -1050, -1050, -1050, 435, 396, + -1050, -1050, 406, 408, 58, -1050, -1050, -1050, 346, 431, + 431, 458, 433, 463, 516, 434, 431, 437, 536, 539, + 431, 541, 443, 445, 446, 431, 548, 552, 431, 554, + 555, 556, 557, 459, 440, 464, 447, 468, 431, 431, + 469, 470, 472, -189, -178, 475, 477, 569, 431, 484, + 487, 431, 431, 488, 489, 476, -1050, 478, 479, 481, + -1050, 482, 483, 486, 490, 491, 128, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, 492, 496, 79, + -1050, -1050, -1050, 500, 498, 499, -1050, 501, -1050, 108, + -1050, -1050, -1050, -1050, -1050, 578, 582, 503, -1050, 506, + 511, 512, 69, -1050, -1050, -1050, 517, 515, 518, -1050, + 519, 520, 522, 525, 526, -1050, 527, 56, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, 531, + 529, 532, 540, 4, -1050, -1050, -1050, -1050, 497, 504, + 507, 584, 559, 563, 564, 431, 551, -1050, -1050, 586, + 565, 622, 672, 674, 661, 663, 665, 666, 667, 668, + 688, 675, -123, -105, 676, 679, 571, -1050, 577, 566, + -1050, 25, -1050, -1050, -1050, -1050, 596, 580, -1050, 579, + 686, 585, -1050, 587, 581, -1050, 583, 52, -1050, -1050, + -1050, -1050, 589, 590, 591, -1050, 592, 594, 599, 601, + 480, 602, 603, 604, 605, 607, 608, 609, 610, -1050, + -1050, 700, 714, 431, 611, 731, 734, 431, 735, 738, + 431, 715, 742, 745, 431, 748, 748, 632, -1050, -1050, + 737, -71, 740, 652, 747, 749, 639, 750, 752, 763, + 753, 754, 758, 759, 657, -1050, 761, 762, 660, -1050, + 670, -1050, 764, 766, 673, -1050, 677, 678, 680, 681, + 689, 690, 692, 693, 694, 698, 708, 712, 713, 716, + 720, 724, 725, 727, 729, 733, 736, 739, 741, 743, + 744, 746, 687, 751, 730, 755, 756, 757, 760, 767, + 768, 769, 770, 773, 774, 775, 776, 777, 781, 782, + 783, 784, 785, 786, 787, -1050, -1050, 778, 702, 684, + 791, 833, 837, 838, 840, 788, -1050, 841, 845, 789, + -1050, -1050, 850, 851, 790, 867, 792, -1050, 794, 795, + -1050, -1050, 853, 855, 796, -1050, -1050, 856, 771, 797, + 861, 862, 864, 865, 780, 798, 893, 799, -1050, -1050, + 894, 900, 901, 802, -1050, 803, 806, 807, 808, 809, + 810, 811, 812, -1050, 813, 814, 815, 816, 817, 818, + 819, 820, 821, 822, 823, 824, 825, -1050, -1050, -211, + -1050, -1050, -1050, -182, -1050, 826, 827, -1050, -1050, 931, + 828, 829, -1050, 830, -1050, 170, 832, -1050, -1050, 936, + 831, 938, 836, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, 431, 431, 431, 431, 431, 431, 431, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, 839, 842, + 843, -34, 844, 846, 847, 848, 849, 852, 854, 857, + 858, 859, 317, 860, 863, -1050, 866, 868, 869, 870, + 871, 872, 873, 17, 874, 875, 876, 877, 878, 879, + 880, -1050, 881, 882, -1050, -1050, 883, 884, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -177, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -171, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, 885, 886, 534, 887, 888, 889, 890, 891, + -1050, 892, 895, -1050, 896, 897, -21, 903, 834, -1050, + -1050, -1050, -1050, 898, 899, -1050, 902, 904, 465, 905, + 906, 907, 908, 909, 765, 910, -1050, 911, 912, 913, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -123, -1050, -105, -1050, -1050, 914, 558, + -1050, -1050, 915, 916, 917, -1050, 67, -1050, -1050, -1050, + -1050, -1050, 918, 619, 921, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -131, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + 748, 748, 748, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -125, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + 687, -1050, 730, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -50, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -49, + -1050, 955, 867, 922, -1050, -1050, -1050, -1050, -1050, 835, + -1050, -1050, 919, -1050, -1050, -1050, -1050, 920, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -20, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -14, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -9, -1050, -1050, 944, -70, + 923, 927, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, 61, -1050, -1050, -1050, -34, -1050, + -1050, -1050, -1050, 17, -1050, -1050, -1050, 534, -1050, -21, + -1050, -1050, -1050, 942, 947, 948, -1050, 465, -1050, 765, + -1050, 558, 928, 929, 930, 329, -1050, -1050, 619, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, 77, + -1050, -1050, -1050, 329, -1050 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -990, -990, -990, -176, -303, -989, -613, -990, -990, 934, - -990, -990, -990, -990, 921, -990, -990, -990, 70, -990, - 81, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, 1007, -990, - -990, -990, -990, -990, -990, 620, -990, -990, -990, -990, - 923, -990, -990, -990, -990, 75, -990, -990, -990, -990, - -990, -173, -990, -990, -990, 611, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -116, -990, -990, -990, - -112, -990, -990, -990, 793, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -90, -990, -990, -990, -990, -990, -103, - -990, 648, -990, -990, -990, 35, -990, -990, -990, -990, - -990, 668, -990, -990, -990, -990, -990, -990, -990, -86, - -990, -990, -990, -990, -990, -990, 616, -990, -990, -990, - -990, -990, 928, -990, -990, -990, -990, 579, -990, -990, - -990, -990, -990, -100, -990, -990, -990, 596, -990, -990, - -990, -990, -80, -990, -990, -990, 795, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -61, -990, - -990, -990, -990, -990, -990, -990, -990, 689, -990, -990, - -990, -990, -990, 797, -990, -990, -990, -990, 1048, -990, - -990, -990, -990, 798, -990, -990, -990, -990, 998, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, - -990, -990, -990, -990, 76, -990, -990, -990, 77, -990, - -990, -990, -990, -990, 1070, -990, -990, -990, -990, -990, - -990, -990, -990, -990, -990, -990, -990, -990, -990, 931, - -990, -990, -990, -990, -990, -990, -990, -990 + -1050, -1050, -1050, -283, -303, -1049, -615, -1050, -1050, 924, + -1050, -1050, -1050, -1050, 925, -1050, -1050, -1050, -24, -1050, + 63, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, 1006, -1050, + -1050, -1050, -1050, -1050, -1050, 595, -1050, -1050, -1050, -1050, + 805, -1050, -1050, -1050, -1050, 55, -1050, -1050, -1050, -1050, + -1050, -187, -1050, -1050, -1050, 612, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -149, -1050, -1050, + -1050, -145, -1050, -1050, -1050, 793, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -92, -1050, -1050, -1050, -1050, -1050, + -101, -1050, 662, -1050, -1050, -1050, 26, -1050, -1050, -1050, + -1050, -1050, 701, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -68, -1050, -1050, -1050, -1050, -1050, -1050, 633, -1050, -1050, + -1050, -1050, -1050, 932, -1050, -1050, -1050, -1050, 588, -1050, + -1050, -1050, -1050, -1050, -90, -1050, -1050, -1050, 600, -1050, + -1050, -1050, -1050, -81, -1050, -1050, -1050, 801, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -61, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, 695, -1050, + -1050, -1050, -1050, -1050, 779, -1050, -1050, -1050, -1050, 1056, + -1050, -1050, -1050, -1050, 800, -1050, -1050, -1050, -1050, 1005, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, 78, -1050, -1050, -1050, 84, + -1050, -1050, -1050, -1050, -1050, 1077, -1050, -1050, -1050, -1050, + -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050, + 937, -1050, -1050, -1050, -1050, -1050, -1050, -1050, -1050 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2008,393 +2020,396 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -124 static const yytype_int16 yytable[] = { - 830, 831, 589, 590, 591, 517, 571, 466, 225, 70, - 282, 473, 473, 496, 489, 489, 49, 1042, 517, 282, - 571, 391, 244, 381, 1070, 50, 109, 289, 109, 497, - 829, 54, 71, 447, 56, 226, 60, 1008, 518, 72, - 466, 1009, 1010, 227, 498, 245, 1011, 215, 64, 448, - 215, 518, 381, 1085, 65, 228, 229, 1086, 230, 231, - 232, 47, 48, 289, 449, 474, 474, 1214, 1215, 1216, - 475, 475, 476, 476, 499, 556, 67, 246, 68, 519, - 233, 391, 382, 1018, 247, 110, 556, 110, 490, 490, - 1043, 1087, 519, 295, 450, 1088, 645, 646, 1018, 106, - 1212, 107, 572, 652, 1213, 73, 248, 656, 115, 500, - 249, 382, 661, 116, 117, 664, 572, 392, 250, 118, - 108, 251, 252, 290, 1238, 674, 675, 119, 520, 501, - 467, 477, 477, 120, 114, 686, 121, 122, 689, 690, - 216, 520, 123, 216, 393, 502, 383, 124, 125, 451, - 126, 127, 128, 253, 129, 212, 1217, 452, 453, 290, - 1218, 130, 503, 467, 217, 131, 132, 217, 213, 1112, - 254, 557, 255, 214, 133, 383, -123, 392, 454, 1019, - 491, 491, 557, 134, 222, -123, 223, 315, 1056, 1057, - 1058, 135, 224, 136, 1019, 137, 256, 138, 281, 139, - 140, 316, 317, 1221, 393, 318, 294, 1222, 1071, 1223, - 504, 296, 141, 1224, 257, 258, 259, 142, 143, 144, - 573, 145, 146, 147, 574, 468, 148, 283, 297, 740, - 749, 505, 534, 299, 573, 714, 283, 734, 574, 722, - 567, 260, 261, 565, 789, 642, 554, 636, 319, 70, - 389, 455, 149, 764, 765, 768, 769, 703, 468, 150, - 151, 152, 153, 154, 707, 298, 320, 321, 322, 323, - 1020, 487, 71, 324, 1231, 834, 835, 325, 1232, 72, - 350, 1257, 351, 326, 352, 1020, 829, 569, 1233, 558, - 679, 155, 1234, 680, 327, 328, 353, 1021, 817, 778, - 558, 681, 821, 1113, 682, 824, 329, 1196, 1258, 828, - 1259, 354, 1021, 1114, 301, 156, 157, 302, 158, 159, - 160, 225, 1235, 1242, 161, 484, 1236, 1243, 330, 162, - 303, 447, 445, 1267, 355, 304, 356, 1268, 79, 305, - 306, 357, 307, 308, 309, 73, 310, 448, 226, 311, - 312, 358, 388, 398, 399, 1260, 227, 400, 80, 81, - 401, 402, 449, 403, 82, 331, 404, 405, 228, 229, - 406, 230, 231, 232, 407, 408, 359, 409, 410, 411, - 412, 350, 413, 351, 414, 352, 415, 416, 417, 418, - 419, 420, 450, 233, 421, 422, 244, 353, 423, 425, - 360, 83, 84, 427, 428, 1261, 1262, 85, 86, 429, - 430, 615, 354, 536, 87, 88, 89, 431, 432, 245, - 361, 433, 434, 435, 436, 115, 437, 438, 439, 362, - 116, 117, 440, 441, 442, 355, 118, 356, 443, 444, - 90, 91, 357, 485, 119, 486, 526, 451, 527, 528, - 120, 246, 358, 121, 122, 452, 453, 529, 247, 123, - 530, 1263, 531, 532, 124, 125, 533, 126, 127, 128, - 537, 129, 363, 538, 539, 563, 454, 359, 130, 540, - 248, 541, 131, 132, 249, 542, 543, 544, 545, 546, - 547, 133, 250, 548, 549, 251, 252, 550, 551, 364, - 134, 360, 496, 552, 632, 553, 580, 564, 135, 568, - 136, 581, 137, 582, 138, 583, 139, 140, 497, 584, - 585, 361, 586, 587, 588, 592, 593, 253, 588, 141, - 362, 1124, 594, 498, 142, 143, 144, 597, 145, 146, - 147, 595, 596, 148, 254, 1125, 255, 598, 599, 455, - 638, 600, 1126, 601, 1091, 798, 799, 800, 801, 802, - 803, 804, 313, 499, 647, 603, 1127, 604, 605, 149, - 256, 606, 607, 363, 1092, 608, 150, 151, 152, 153, - 154, 1239, 609, 1093, 610, 611, 612, 613, 257, 258, - 259, 614, 617, 1128, 618, 1129, 619, 620, 500, 621, - 364, 622, 623, 625, 626, 627, 1180, 639, 155, 628, - 1094, 644, 629, 630, 631, 260, 261, 634, 501, 635, - 640, 1130, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 641, - 648, 649, 156, 157, 502, 158, 159, 160, 650, 1095, - 1096, 161, 651, 653, 654, 658, 162, 1097, 659, 655, - 657, 503, 660, 662, 1131, 663, 1132, 665, 666, 667, - 2, 3, 668, 669, 4, 671, 670, 672, 1181, 673, - 676, 677, 1098, 678, 5, 1133, 683, 6, 7, 684, - 1199, 685, 687, 8, 688, 691, 692, 695, 1099, 693, - 716, 1134, 694, 717, 9, 1182, 1135, 10, 11, 504, - 1136, 315, 1183, 696, 745, 1137, 742, 698, 1138, 699, - 700, 1184, 701, 1139, 702, 316, 317, 705, 706, 318, - 505, 12, 709, 710, 711, 751, 13, 1140, 718, 713, - 719, 724, 1141, 743, 14, 720, 721, 725, 1185, 882, - 1186, 1187, 1200, 1142, 726, 728, 729, 1100, 730, 731, - 1143, 744, 733, 736, 1188, 15, 16, 737, 738, 739, - 746, 1189, 319, 747, 748, 752, 753, 756, 754, 1201, - 755, 750, 757, 17, 906, 758, 1202, 759, 760, 761, - 320, 321, 322, 323, 762, 1203, 763, 324, 772, 773, - 18, 325, 776, 774, 775, 780, 781, 326, 783, 782, - 784, 785, 786, 19, 20, 788, 815, 791, 327, 328, - 792, 793, 1204, 794, 1205, 1206, 795, 1150, 796, 797, - 329, 21, 807, 808, 809, 810, 811, 816, 1207, 812, - 813, 814, 819, 825, 22, 1208, 818, 820, 822, 823, - 826, 827, 330, 23, 829, 832, 833, 24, 837, 883, - 884, 885, 840, 886, 887, 843, 888, 889, 836, 890, - 838, 891, 839, 841, 892, 842, 844, 893, 894, 895, - 848, 896, 845, 846, 847, 849, 897, 850, 851, 331, - 898, 899, 900, 852, 907, 908, 909, 79, 910, 911, - 901, 912, 913, 853, 914, 902, 915, 854, 855, 916, - 950, 953, 917, 918, 919, 856, 920, 80, 81, 857, - 858, 921, 859, 82, 860, 922, 923, 924, 861, 862, - 863, 864, 865, 949, 952, 925, 866, 1151, 1152, 1153, - 926, 1154, 1155, 867, 1156, 1157, 868, 1158, 869, 1159, - 870, 871, 1160, 872, 954, 1161, 1162, 1163, 951, 1164, - 83, 84, 873, 874, 1165, 955, 85, 86, 1166, 1167, - 1168, 956, 958, 87, 88, 89, 875, 959, 1169, 876, - 877, 878, 961, 1170, 962, 964, 963, 970, 879, 971, - 880, 881, 905, 929, 930, 931, 932, 933, 934, 90, - 91, 935, 936, 973, 937, 976, 938, 939, 940, 974, - 941, 942, 943, 944, 945, 946, 947, 948, 957, 960, - 967, 968, 969, 972, 977, 978, 979, 975, 980, 981, - 982, 983, 984, 985, 986, 1014, 1015, 987, 988, 989, - 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, - 1000, 1001, 1002, 1003, 1004, 1005, 1028, 1006, 1007, 1012, - 1013, 1016, 1017, 1027, 1030, 1031, 1039, 1029, 1040, 1041, - 1046, 1047, 1048, 1225, 1237, 1049, 1050, 1051, 1052, 1248, - 1053, 1054, 1055, 1061, 1249, 1062, 1250, 1063, 1064, 1177, - 1065, 300, 1066, 1067, 1068, 1069, 1074, 1075, 1076, 1077, - 1078, 1079, 1178, 1080, 1081, 1269, 1082, 1197, 1083, 1084, - 1089, 1090, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, - 1117, 1111, 723, 1120, 1121, 1122, 1118, 735, 1252, 1123, - 1251, 1247, 1146, 1244, 704, 616, 1147, 715, 1148, 1149, - 1173, 1174, 1175, 1176, 1179, 1192, 1246, 741, 1198, 1193, - 1194, 1211, 1227, 1266, 1228, 1229, 1241, 1240, 1230, 1254, - 1255, 1256, 488, 1226, 790, 779, 1253, 1245, 708, 390, - 633, 446, 314, 1219, 1220, 535, 0, 0, 0, 0, + 833, 834, 591, 592, 593, 519, 215, 519, 79, 70, + 282, 1219, 1220, 1221, 1012, 225, 1046, 489, 1013, 681, + 466, 70, 682, 381, 109, 1074, 558, 1116, 80, 81, + 683, 109, 71, 684, 82, 558, 381, 832, 520, 72, + 520, 282, 226, 1014, 71, 289, 49, 1015, 1089, 295, + 227, 72, 1090, 573, 1091, 47, 48, 496, 1092, 391, + 573, 289, 228, 229, 50, 230, 231, 232, 1022, 54, + 489, 83, 84, 497, 767, 768, 56, 85, 86, 521, + 466, 521, 382, 110, 87, 88, 89, 233, 498, 1047, + 110, 490, 771, 772, 1217, 382, 647, 648, 1218, 216, + 1222, 837, 838, 654, 1223, 73, 315, 658, 115, 473, + 90, 91, 663, 116, 117, 666, 60, 73, 499, 118, + 316, 317, 559, 217, 318, 676, 677, 119, 522, 447, + 522, 559, 1243, 120, 64, 688, 121, 122, 691, 692, + 65, 290, 123, 467, 490, 448, 383, 124, 125, 574, + 126, 127, 128, 500, 129, 392, 574, 290, 67, 383, + 449, 130, 1117, 474, 1023, 131, 132, 319, 475, 68, + 476, 1022, 1118, 501, 133, 1226, 1228, -123, 484, 1227, + 1229, 244, 393, 134, 491, 320, 321, 322, 323, 502, + 450, 135, 324, 136, 106, 137, 325, 138, 215, 139, + 140, 391, 326, 467, 245, 1236, 503, 504, -123, 1237, + 1075, 1238, 141, 327, 328, 1239, 1240, 142, 143, 144, + 1241, 145, 146, 147, 107, 329, 148, 108, 283, 477, + 743, 487, 752, 313, 299, 567, 246, 491, 114, 468, + 536, 560, 350, 247, 351, 451, 352, 330, 638, 389, + 560, 781, 149, 452, 453, 505, 1024, 296, 353, 283, + 150, 151, 152, 153, 154, 248, 212, 1023, 575, 249, + 571, 297, 576, 354, 454, 575, 506, 250, 792, 576, + 251, 252, 737, 1025, 644, 331, 1247, 569, 473, 213, + 1248, 216, 155, 1201, 298, 724, 355, 392, 356, 468, + 820, 214, 1272, 357, 824, 709, 1273, 827, 222, 223, + 224, 831, 253, 358, 281, 217, 156, 157, 294, 158, + 159, 160, 301, 302, 393, 161, 1060, 1061, 1062, 254, + 162, 617, 255, 445, 716, 538, 582, 303, 359, 304, + 305, 306, 474, 307, 308, 309, 310, 475, 455, 476, + 311, 312, 388, 398, 705, 399, 256, 400, 401, 1024, + 402, 403, 360, 404, 405, 350, 406, 351, 1262, 352, + 407, 408, 409, 410, 257, 258, 259, 411, 412, 413, + 414, 353, 361, 415, 416, 417, 1025, 418, 115, 419, + 420, 362, 421, 116, 117, 1263, 354, 1264, 565, 118, + 422, 260, 261, 423, 425, 427, 556, 119, 477, 428, + 429, 430, 431, 120, 432, 433, 121, 122, 434, 355, + 435, 356, 123, 436, 832, 583, 357, 124, 125, 244, + 126, 127, 128, 437, 129, 363, 358, 438, 439, 496, + 440, 130, 1265, 441, 442, 131, 132, 443, 444, 485, + 447, 486, 245, 528, 133, 497, 529, 530, 531, 532, + 533, 359, 364, 134, 534, 535, 448, 634, 539, 1128, + 498, 135, 540, 136, 541, 137, 542, 138, 543, 139, + 140, 449, 544, 1129, 246, 360, 545, 546, 547, 548, + 1130, 247, 141, 1266, 1267, 549, 550, 142, 143, 144, + 499, 145, 146, 147, 1131, 361, 148, 551, 552, 553, + 554, 450, 555, 248, 362, 584, 566, 249, 1036, 1037, + 1038, 1039, 1040, 1041, 1042, 250, 570, 585, 251, 252, + 586, 1132, 149, 1133, 587, 500, 588, 589, 590, 594, + 150, 151, 152, 153, 154, 597, 595, 1095, 596, 1268, + 598, 599, 600, 601, 646, 501, 619, 640, 363, 1134, + 253, 602, 603, 605, 606, 649, 451, 1096, 607, 608, + 651, 502, 155, 609, 452, 453, 1097, 254, 610, 611, + 255, 612, 613, 614, 1244, 364, 615, 590, 503, 504, + 616, 620, 1135, 621, 1136, 454, 156, 157, 622, 158, + 159, 160, 623, 1098, 256, 161, 624, 625, 627, 628, + 162, 629, 630, 1137, 801, 802, 803, 804, 805, 806, + 807, 641, 257, 258, 259, 631, 1185, 632, 633, 636, + 1138, 637, 1099, 1100, 642, 1139, 643, 505, 652, 1140, + 1101, 650, 653, 656, 1141, 655, 657, 1142, 659, 260, + 261, 660, 1143, 661, 662, 664, 2, 3, 506, 665, + 4, 667, 668, 669, 670, 1102, 1144, 671, 672, 455, + 5, 1145, 673, 6, 7, 674, 675, 678, 679, 8, + 680, 1103, 1146, 685, 315, 686, 225, 1204, 1186, 1147, + 9, 687, 689, 10, 11, 690, 693, 694, 316, 317, + 718, 695, 318, 696, 719, 745, 748, 697, 754, 698, + 700, 701, 746, 226, 702, 747, 1187, 12, 703, 704, + 707, 227, 13, 1188, 708, 711, 712, 713, 720, 715, + 14, 721, 1189, 228, 229, 885, 230, 231, 232, 722, + 723, 1104, 726, 727, 756, 319, 728, 730, 731, 1205, + 732, 15, 16, 733, 734, 736, 739, 740, 233, 1190, + 741, 1191, 1192, 320, 321, 322, 323, 749, 742, 17, + 324, 750, 751, 755, 325, 1193, 753, 1206, 909, 757, + 326, 758, 1194, 759, 1207, 760, 18, 761, 762, 763, + 764, 327, 328, 1208, 779, 765, 777, 766, 775, 19, + 20, 776, 778, 329, 783, 784, 785, 818, 786, 789, + 787, 791, 788, 1155, 794, 795, 796, 797, 21, 798, + 1209, 819, 1210, 1211, 799, 330, 800, 810, 811, 812, + 813, 22, 814, 815, 816, 817, 1212, 828, 822, 821, + 23, 823, 825, 1213, 24, 826, 886, 887, 888, 829, + 889, 890, 830, 891, 892, 832, 893, 835, 894, 836, + 840, 895, 839, 331, 896, 897, 898, 843, 899, 841, + 846, 842, 844, 900, 845, 847, 848, 901, 902, 903, + 849, 850, 851, 852, 853, 854, 856, 904, 857, 910, + 911, 912, 905, 913, 914, 855, 915, 916, 858, 917, + 952, 918, 859, 860, 919, 861, 862, 920, 921, 922, + 953, 923, 954, 955, 863, 864, 924, 865, 866, 867, + 925, 926, 927, 868, 1156, 1157, 1158, 79, 1159, 1160, + 928, 1161, 1162, 869, 1163, 929, 1164, 870, 871, 1165, + 956, 872, 1166, 1167, 1168, 873, 1169, 80, 81, 874, + 875, 1170, 876, 82, 877, 1171, 1172, 1173, 878, 957, + 958, 879, 959, 961, 880, 1174, 881, 962, 882, 883, + 1175, 884, 964, 965, 967, 973, 908, 974, 976, 977, + 932, 933, 934, 979, 980, 935, 981, 982, 983, 1182, + 83, 84, 936, 937, 938, 939, 85, 86, 940, 941, + 942, 943, 944, 87, 88, 89, 945, 946, 947, 948, + 949, 950, 951, 960, 963, 985, 987, 970, 966, 971, + 972, 975, 988, 989, 986, 978, 984, 990, 991, 90, + 91, 992, 993, 994, 995, 996, 997, 998, 999, 1000, + 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, + 1011, 1016, 1017, 1018, 1020, 1021, 1019, 1031, 1032, 1033, + 1034, 1035, 1230, 1122, 1043, 1233, 1242, 1044, 1045, 1050, + 1253, 1051, 1052, 1053, 1054, 1254, 1255, 1055, 1183, 1056, + 300, 1202, 1057, 1058, 1059, 1065, 1274, 725, 1066, 568, + 1257, 1067, 1256, 1068, 1069, 1070, 1071, 1072, 1073, 1078, + 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, + 1093, 1094, 1107, 1108, 1109, 1110, 1111, 1112, 1121, 738, + 1113, 1114, 1115, 1124, 1125, 618, 1249, 1126, 1252, 1127, + 1150, 1151, 1152, 1153, 1154, 1178, 1179, 1180, 1181, 1184, + 1197, 717, 488, 1203, 1198, 1199, 1216, 1232, 1231, 1234, + 1235, 1245, 1246, 1259, 1260, 1261, 744, 706, 1271, 1251, + 1258, 782, 1250, 639, 710, 793, 635, 390, 446, 314, + 1225, 537, 0, 0, 1224, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 557, 0, 0, + 0, 0, 0, 0, 645, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 637, 0, 555, 0, 0, 0, 0, 0, 0, - 0, 0, 643, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 566, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 570 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 572 }; #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-990))) + (!!((Yystate) == (-1050))) #define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int16 yycheck[] = { - 613, 614, 305, 306, 307, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 226, 50, 1, 1, - 1, 1, 1, 1, 8, 226, 1, 1, 1, 17, - 107, 226, 24, 1, 226, 28, 226, 224, 34, 31, - 1, 228, 224, 36, 32, 24, 228, 1, 226, 17, - 1, 34, 1, 224, 226, 48, 49, 228, 51, 52, - 53, 224, 225, 1, 32, 55, 55, 1056, 1057, 1058, - 60, 60, 62, 62, 62, 1, 226, 56, 226, 75, - 73, 1, 60, 1, 63, 60, 1, 60, 75, 75, - 123, 224, 75, 224, 62, 228, 399, 400, 1, 226, - 224, 226, 97, 406, 228, 97, 85, 410, 1, 97, - 89, 60, 415, 6, 7, 418, 97, 97, 97, 12, - 226, 100, 101, 97, 201, 428, 429, 20, 124, 117, - 124, 121, 121, 26, 226, 438, 29, 30, 441, 442, - 94, 124, 35, 94, 124, 133, 124, 40, 41, 117, - 43, 44, 45, 132, 47, 226, 224, 125, 126, 97, - 228, 54, 150, 124, 118, 58, 59, 118, 226, 48, - 149, 97, 151, 226, 67, 124, 167, 97, 146, 97, - 167, 167, 97, 76, 226, 167, 226, 1, 9, 10, - 11, 84, 226, 86, 97, 88, 175, 90, 226, 92, - 93, 15, 16, 224, 124, 19, 226, 228, 192, 224, - 198, 227, 105, 228, 193, 194, 195, 110, 111, 112, - 215, 114, 115, 116, 219, 219, 119, 218, 227, 225, - 533, 219, 225, 225, 215, 225, 218, 225, 219, 225, - 167, 220, 221, 225, 225, 225, 225, 225, 62, 1, - 225, 219, 145, 196, 197, 196, 197, 225, 219, 152, - 153, 154, 155, 156, 225, 227, 80, 81, 82, 83, - 188, 225, 24, 87, 224, 171, 172, 91, 228, 31, - 1, 39, 3, 97, 5, 188, 107, 225, 224, 215, - 207, 184, 228, 210, 108, 109, 17, 215, 601, 225, - 215, 207, 605, 182, 210, 608, 120, 225, 66, 612, - 68, 32, 215, 192, 227, 208, 209, 227, 211, 212, - 213, 1, 224, 224, 217, 224, 228, 228, 142, 222, - 227, 1, 225, 224, 55, 227, 57, 228, 1, 227, - 227, 62, 227, 227, 227, 97, 227, 17, 28, 227, - 227, 72, 227, 227, 227, 113, 36, 227, 21, 22, - 227, 227, 32, 227, 27, 179, 227, 227, 48, 49, - 227, 51, 52, 53, 227, 227, 97, 227, 227, 227, - 227, 1, 227, 3, 227, 5, 227, 227, 227, 227, - 227, 227, 62, 73, 227, 227, 1, 17, 227, 227, - 121, 64, 65, 227, 227, 163, 164, 70, 71, 227, - 227, 225, 32, 224, 77, 78, 79, 227, 227, 24, - 141, 227, 227, 227, 227, 1, 227, 227, 227, 150, - 6, 7, 227, 227, 227, 55, 12, 57, 227, 227, - 103, 104, 62, 227, 20, 227, 227, 117, 227, 227, - 26, 56, 72, 29, 30, 125, 126, 227, 63, 35, - 227, 219, 227, 227, 40, 41, 227, 43, 44, 45, - 227, 47, 193, 227, 227, 224, 146, 97, 54, 227, - 85, 227, 58, 59, 89, 227, 227, 227, 227, 227, - 227, 67, 97, 227, 227, 100, 101, 227, 227, 220, - 76, 121, 1, 227, 225, 227, 122, 227, 84, 227, - 86, 122, 88, 122, 90, 224, 92, 93, 17, 107, - 107, 141, 207, 107, 107, 107, 107, 132, 107, 105, - 150, 4, 107, 32, 110, 111, 112, 224, 114, 115, - 116, 207, 207, 119, 149, 18, 151, 224, 227, 219, - 122, 227, 25, 227, 13, 134, 135, 136, 137, 138, - 139, 140, 225, 62, 107, 227, 39, 227, 227, 145, - 175, 227, 227, 193, 33, 227, 152, 153, 154, 155, - 156, 1194, 227, 42, 227, 227, 227, 227, 193, 194, - 195, 227, 224, 66, 227, 68, 227, 227, 97, 227, - 220, 227, 227, 227, 227, 227, 68, 224, 184, 227, - 69, 207, 227, 227, 227, 220, 221, 227, 117, 227, - 227, 94, 798, 799, 800, 801, 802, 803, 804, 227, - 207, 107, 208, 209, 133, 211, 212, 213, 122, 98, - 99, 217, 207, 207, 107, 207, 222, 106, 207, 107, - 107, 150, 207, 107, 127, 107, 129, 107, 107, 107, - 0, 1, 107, 207, 4, 207, 227, 227, 130, 207, - 207, 207, 131, 207, 14, 148, 207, 17, 18, 207, - 68, 122, 207, 23, 207, 207, 207, 227, 147, 224, - 122, 164, 224, 122, 34, 157, 169, 37, 38, 198, - 173, 1, 164, 227, 122, 178, 207, 227, 181, 227, - 227, 173, 227, 186, 227, 15, 16, 227, 227, 19, - 219, 61, 224, 227, 227, 122, 66, 200, 224, 227, - 224, 224, 205, 207, 74, 227, 227, 227, 200, 48, - 202, 203, 130, 216, 227, 227, 227, 206, 227, 227, - 223, 207, 227, 224, 216, 95, 96, 227, 227, 227, - 207, 223, 62, 207, 207, 207, 122, 122, 107, 157, - 107, 224, 122, 113, 48, 122, 164, 122, 122, 122, - 80, 81, 82, 83, 107, 173, 122, 87, 122, 122, - 130, 91, 227, 224, 224, 207, 224, 97, 122, 226, - 224, 224, 227, 143, 144, 227, 107, 224, 108, 109, - 224, 224, 200, 224, 202, 203, 224, 48, 224, 224, - 120, 161, 224, 224, 224, 224, 224, 107, 216, 224, - 224, 224, 107, 122, 174, 223, 227, 107, 107, 107, - 107, 107, 142, 183, 107, 224, 122, 187, 207, 158, - 159, 160, 227, 162, 163, 107, 165, 166, 122, 168, - 122, 170, 122, 122, 173, 122, 122, 176, 177, 178, - 224, 180, 122, 122, 122, 122, 185, 122, 224, 179, - 189, 190, 191, 224, 158, 159, 160, 1, 162, 163, - 199, 165, 166, 122, 168, 204, 170, 122, 224, 173, - 207, 107, 176, 177, 178, 224, 180, 21, 22, 224, - 224, 185, 224, 27, 224, 189, 190, 191, 224, 224, - 224, 224, 224, 122, 122, 199, 224, 158, 159, 160, - 204, 162, 163, 224, 165, 166, 224, 168, 224, 170, - 224, 224, 173, 224, 122, 176, 177, 178, 227, 180, - 64, 65, 224, 224, 185, 122, 70, 71, 189, 190, - 191, 122, 122, 77, 78, 79, 224, 122, 199, 224, - 224, 224, 122, 204, 122, 107, 227, 122, 224, 122, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 103, - 104, 224, 224, 122, 224, 122, 224, 224, 224, 207, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 122, 122, 122, 227, 227, 122, - 224, 122, 122, 122, 224, 122, 227, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 122, 224, 224, 224, - 224, 224, 224, 224, 122, 224, 224, 227, 224, 224, - 224, 224, 224, 107, 122, 224, 224, 224, 224, 128, - 224, 224, 224, 224, 128, 224, 128, 224, 224, 1009, - 224, 74, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 1011, 224, 224, 1268, 224, 1022, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 214, 224, 492, 224, 224, 224, 228, 506, 1234, 224, - 1232, 1224, 224, 1213, 456, 332, 224, 479, 224, 224, - 224, 224, 224, 224, 224, 224, 1222, 521, 224, 227, - 227, 224, 224, 1243, 229, 229, 224, 227, 229, 224, - 224, 224, 218, 1118, 575, 559, 1236, 1218, 469, 111, - 365, 163, 92, 1086, 1088, 234, -1, -1, -1, -1, + 615, 616, 305, 306, 307, 1, 1, 1, 1, 1, + 1, 1060, 1061, 1062, 225, 1, 50, 1, 229, 208, + 1, 1, 211, 1, 1, 8, 1, 48, 21, 22, + 208, 1, 24, 211, 27, 1, 1, 107, 34, 31, + 34, 1, 28, 225, 24, 1, 227, 229, 225, 225, + 36, 31, 229, 1, 225, 225, 226, 1, 229, 1, + 1, 1, 48, 49, 227, 51, 52, 53, 1, 227, + 1, 64, 65, 17, 197, 198, 227, 70, 71, 75, + 1, 75, 60, 60, 77, 78, 79, 73, 32, 123, + 60, 75, 197, 198, 225, 60, 399, 400, 229, 94, + 225, 172, 173, 406, 229, 97, 1, 410, 1, 1, + 103, 104, 415, 6, 7, 418, 227, 97, 62, 12, + 15, 16, 97, 118, 19, 428, 429, 20, 124, 1, + 124, 97, 202, 26, 227, 438, 29, 30, 441, 442, + 227, 97, 35, 124, 75, 17, 124, 40, 41, 97, + 43, 44, 45, 97, 47, 97, 97, 97, 227, 124, + 32, 54, 183, 55, 97, 58, 59, 62, 60, 227, + 62, 1, 193, 117, 67, 225, 225, 168, 225, 229, + 229, 1, 124, 76, 168, 80, 81, 82, 83, 133, + 62, 84, 87, 86, 227, 88, 91, 90, 1, 92, + 93, 1, 97, 124, 24, 225, 150, 151, 168, 229, + 193, 225, 105, 108, 109, 229, 225, 110, 111, 112, + 229, 114, 115, 116, 227, 120, 119, 227, 219, 121, + 226, 226, 535, 226, 226, 226, 56, 168, 227, 220, + 226, 216, 1, 63, 3, 117, 5, 142, 226, 226, + 216, 226, 145, 125, 126, 199, 189, 228, 17, 219, + 153, 154, 155, 156, 157, 85, 227, 97, 216, 89, + 226, 228, 220, 32, 146, 216, 220, 97, 226, 220, + 100, 101, 226, 216, 226, 180, 225, 168, 1, 227, + 229, 94, 185, 226, 228, 226, 55, 97, 57, 220, + 603, 227, 225, 62, 607, 226, 229, 610, 227, 227, + 227, 614, 132, 72, 227, 118, 209, 210, 227, 212, + 213, 214, 228, 228, 124, 218, 9, 10, 11, 149, + 223, 226, 152, 226, 226, 225, 122, 228, 97, 228, + 228, 228, 55, 228, 228, 228, 228, 60, 220, 62, + 228, 228, 228, 228, 226, 228, 176, 228, 228, 189, + 228, 228, 121, 228, 228, 1, 228, 3, 39, 5, + 228, 228, 228, 228, 194, 195, 196, 228, 228, 228, + 228, 17, 141, 228, 228, 228, 216, 228, 1, 228, + 228, 150, 228, 6, 7, 66, 32, 68, 225, 12, + 228, 221, 222, 228, 228, 228, 226, 20, 121, 228, + 228, 228, 228, 26, 228, 228, 29, 30, 228, 55, + 228, 57, 35, 228, 107, 122, 62, 40, 41, 1, + 43, 44, 45, 228, 47, 194, 72, 228, 228, 1, + 228, 54, 113, 228, 228, 58, 59, 228, 228, 228, + 1, 228, 24, 228, 67, 17, 228, 228, 228, 228, + 228, 97, 221, 76, 228, 228, 17, 226, 228, 4, + 32, 84, 228, 86, 228, 88, 228, 90, 228, 92, + 93, 32, 228, 18, 56, 121, 228, 228, 228, 228, + 25, 63, 105, 164, 165, 228, 228, 110, 111, 112, + 62, 114, 115, 116, 39, 141, 119, 228, 228, 228, + 228, 62, 228, 85, 150, 122, 228, 89, 801, 802, + 803, 804, 805, 806, 807, 97, 228, 225, 100, 101, + 107, 66, 145, 68, 107, 97, 208, 107, 107, 107, + 153, 154, 155, 156, 157, 208, 107, 13, 107, 220, + 208, 225, 225, 228, 208, 117, 225, 122, 194, 94, + 132, 228, 228, 228, 228, 107, 117, 33, 228, 228, + 107, 133, 185, 228, 125, 126, 42, 149, 228, 228, + 152, 228, 228, 228, 1199, 221, 228, 107, 150, 151, + 228, 228, 127, 228, 129, 146, 209, 210, 228, 212, + 213, 214, 228, 69, 176, 218, 228, 228, 228, 228, + 223, 228, 228, 148, 134, 135, 136, 137, 138, 139, + 140, 225, 194, 195, 196, 228, 68, 228, 228, 228, + 165, 228, 98, 99, 228, 170, 228, 199, 122, 174, + 106, 208, 208, 107, 179, 208, 107, 182, 107, 221, + 222, 208, 187, 208, 208, 107, 0, 1, 220, 107, + 4, 107, 107, 107, 107, 131, 201, 208, 228, 220, + 14, 206, 208, 17, 18, 228, 208, 208, 208, 23, + 208, 147, 217, 208, 1, 208, 1, 68, 130, 224, + 34, 122, 208, 37, 38, 208, 208, 208, 15, 16, + 122, 225, 19, 225, 122, 208, 122, 228, 122, 228, + 228, 228, 208, 28, 228, 208, 158, 61, 228, 228, + 228, 36, 66, 165, 228, 225, 228, 228, 225, 228, + 74, 225, 174, 48, 49, 48, 51, 52, 53, 228, + 228, 207, 225, 228, 122, 62, 228, 228, 228, 130, + 228, 95, 96, 228, 228, 228, 225, 228, 73, 201, + 228, 203, 204, 80, 81, 82, 83, 208, 228, 113, + 87, 208, 208, 208, 91, 217, 225, 158, 48, 107, + 97, 107, 224, 122, 165, 122, 130, 122, 122, 122, + 122, 108, 109, 174, 228, 107, 225, 122, 122, 143, + 144, 122, 225, 120, 208, 225, 227, 107, 122, 228, + 225, 228, 225, 48, 225, 225, 225, 225, 162, 225, + 201, 107, 203, 204, 225, 142, 225, 225, 225, 225, + 225, 175, 225, 225, 225, 225, 217, 122, 107, 228, + 184, 107, 107, 224, 188, 107, 159, 160, 161, 107, + 163, 164, 107, 166, 167, 107, 169, 225, 171, 122, + 208, 174, 122, 180, 177, 178, 179, 228, 181, 122, + 107, 122, 122, 186, 122, 122, 122, 190, 191, 192, + 122, 122, 225, 122, 122, 225, 122, 200, 122, 159, + 160, 161, 205, 163, 164, 225, 166, 167, 225, 169, + 122, 171, 225, 225, 174, 225, 225, 177, 178, 179, + 208, 181, 228, 122, 225, 225, 186, 225, 225, 225, + 190, 191, 192, 225, 159, 160, 161, 1, 163, 164, + 200, 166, 167, 225, 169, 205, 171, 225, 225, 174, + 107, 225, 177, 178, 179, 225, 181, 21, 22, 225, + 225, 186, 225, 27, 225, 190, 191, 192, 225, 122, + 122, 225, 122, 122, 225, 200, 225, 122, 225, 225, + 205, 225, 122, 122, 107, 122, 225, 122, 122, 208, + 225, 225, 225, 122, 122, 225, 122, 122, 208, 1013, + 64, 65, 225, 225, 225, 225, 70, 71, 225, 225, + 225, 225, 225, 77, 78, 79, 225, 225, 225, 225, + 225, 225, 225, 225, 225, 122, 122, 225, 228, 225, + 225, 225, 122, 122, 225, 228, 228, 225, 225, 103, + 104, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 225, 225, 225, 122, 225, 225, 228, 225, 122, 228, + 122, 225, 107, 229, 225, 230, 122, 225, 225, 225, + 128, 225, 225, 225, 225, 128, 128, 225, 1015, 225, + 74, 1026, 225, 225, 225, 225, 1273, 492, 225, 284, + 1239, 225, 1237, 225, 225, 225, 225, 225, 225, 225, + 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 225, 225, 225, 225, 225, 225, 225, 225, 215, 507, + 225, 225, 225, 225, 225, 332, 1218, 225, 1229, 225, + 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 225, 479, 218, 225, 228, 228, 225, 225, 1122, 230, + 230, 228, 225, 225, 225, 225, 523, 456, 1248, 1227, + 1241, 561, 1223, 384, 469, 577, 365, 111, 163, 92, + 1092, 234, -1, -1, 1090, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 262, -1, -1, + -1, -1, -1, -1, 394, -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, 384, -1, 262, -1, -1, -1, -1, -1, -1, - -1, -1, 394, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 284, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 291 + -1, -1, -1, 291 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 231, 0, 1, 4, 14, 17, 18, 23, 34, + 0, 232, 0, 1, 4, 14, 17, 18, 23, 34, 37, 38, 61, 66, 74, 95, 96, 113, 130, 143, - 144, 161, 174, 183, 187, 232, 237, 242, 266, 272, - 278, 292, 311, 334, 348, 363, 370, 374, 384, 393, - 414, 420, 426, 430, 436, 492, 507, 224, 225, 226, - 226, 312, 394, 421, 226, 431, 226, 349, 415, 335, - 226, 273, 293, 364, 226, 226, 385, 226, 226, 375, - 1, 24, 31, 97, 267, 268, 269, 270, 271, 1, + 144, 162, 175, 184, 188, 233, 238, 243, 267, 273, + 279, 293, 313, 336, 350, 365, 372, 376, 386, 395, + 416, 422, 428, 432, 438, 494, 509, 225, 226, 227, + 227, 314, 396, 423, 227, 433, 227, 351, 417, 337, + 227, 274, 294, 366, 227, 227, 387, 227, 227, 377, + 1, 24, 31, 97, 268, 269, 270, 271, 272, 1, 21, 22, 27, 64, 65, 70, 71, 77, 78, 79, - 103, 104, 493, 494, 495, 496, 497, 498, 499, 500, - 501, 502, 503, 504, 505, 506, 226, 226, 226, 1, - 60, 427, 428, 429, 226, 1, 6, 7, 12, 20, + 103, 104, 495, 496, 497, 498, 499, 500, 501, 502, + 503, 504, 505, 506, 507, 508, 227, 227, 227, 1, + 60, 429, 430, 431, 227, 1, 6, 7, 12, 20, 26, 29, 30, 35, 40, 41, 43, 44, 45, 47, 54, 58, 59, 67, 76, 84, 86, 88, 90, 92, 93, 105, 110, 111, 112, 114, 115, 116, 119, 145, - 152, 153, 154, 155, 156, 184, 208, 209, 211, 212, - 213, 217, 222, 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, 94, 118, 238, 239, - 240, 241, 226, 226, 226, 1, 28, 36, 48, 49, - 51, 52, 53, 73, 508, 509, 510, 511, 512, 513, - 514, 515, 516, 517, 1, 24, 56, 63, 85, 89, - 97, 100, 101, 132, 149, 151, 175, 193, 194, 195, - 220, 221, 243, 244, 245, 246, 251, 252, 253, 254, - 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 226, 1, 218, 279, 280, 281, 282, 283, 1, - 97, 371, 372, 373, 226, 224, 227, 227, 227, 225, - 268, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 225, 494, 1, 15, 16, 19, 62, + 153, 154, 155, 156, 157, 185, 209, 210, 212, 213, + 214, 218, 223, 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, 482, 483, 487, 491, + 492, 493, 227, 227, 227, 1, 94, 118, 239, 240, + 241, 242, 227, 227, 227, 1, 28, 36, 48, 49, + 51, 52, 53, 73, 510, 511, 512, 513, 514, 515, + 516, 517, 518, 519, 1, 24, 56, 63, 85, 89, + 97, 100, 101, 132, 149, 152, 176, 194, 195, 196, + 221, 222, 244, 245, 246, 247, 252, 253, 254, 255, + 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, + 266, 227, 1, 219, 280, 281, 282, 283, 284, 1, + 97, 373, 374, 375, 227, 225, 228, 228, 228, 226, + 269, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 226, 496, 1, 15, 16, 19, 62, 80, 81, 82, 83, 87, 91, 97, 108, 109, 120, - 142, 179, 313, 314, 315, 316, 317, 318, 319, 320, - 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, + 142, 180, 315, 316, 317, 318, 319, 320, 321, 322, + 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 1, 3, 5, 17, 32, 55, 57, 62, 72, 97, - 121, 141, 150, 193, 220, 395, 396, 397, 398, 399, - 400, 401, 402, 403, 404, 405, 409, 410, 411, 412, - 413, 1, 60, 124, 422, 423, 424, 425, 227, 225, - 428, 1, 97, 124, 432, 433, 434, 435, 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, 227, 225, 438, 1, 17, 32, - 62, 117, 125, 126, 146, 219, 350, 351, 352, 353, - 354, 355, 356, 360, 361, 362, 1, 124, 219, 416, - 417, 418, 419, 1, 55, 60, 62, 121, 336, 340, - 341, 342, 346, 347, 224, 227, 227, 225, 239, 1, - 75, 167, 274, 275, 276, 277, 1, 17, 32, 62, - 97, 117, 133, 150, 198, 219, 294, 295, 296, 297, - 298, 299, 300, 301, 302, 303, 307, 1, 34, 75, - 124, 365, 366, 367, 368, 369, 227, 227, 227, 227, - 227, 227, 227, 227, 225, 509, 224, 227, 227, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 225, 244, 1, 97, 215, 386, - 387, 388, 389, 224, 227, 225, 280, 167, 227, 225, - 372, 1, 97, 215, 219, 376, 377, 378, 379, 380, - 122, 122, 122, 224, 107, 107, 207, 107, 107, 234, - 234, 234, 107, 107, 107, 207, 207, 224, 224, 227, - 227, 227, 331, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 225, 314, 224, 227, 227, - 227, 227, 227, 227, 406, 227, 227, 227, 227, 227, - 227, 227, 225, 396, 227, 227, 225, 423, 122, 224, - 227, 227, 225, 433, 207, 234, 234, 107, 207, 107, - 122, 207, 234, 207, 107, 107, 234, 107, 207, 207, - 207, 234, 107, 107, 234, 107, 107, 107, 107, 207, - 227, 207, 227, 207, 234, 234, 207, 207, 207, 207, - 210, 207, 210, 207, 207, 122, 234, 207, 207, 234, - 234, 207, 207, 224, 224, 227, 227, 357, 227, 227, - 227, 227, 227, 225, 351, 227, 227, 225, 417, 224, - 227, 227, 337, 227, 225, 341, 122, 122, 224, 224, - 227, 227, 225, 275, 224, 227, 227, 308, 227, 227, - 227, 227, 304, 227, 225, 295, 224, 227, 227, 227, - 225, 366, 207, 207, 207, 122, 207, 207, 207, 234, - 224, 122, 207, 122, 107, 107, 122, 122, 122, 122, - 122, 122, 107, 122, 196, 197, 247, 248, 196, 197, - 249, 250, 122, 122, 224, 224, 227, 390, 225, 387, - 207, 224, 226, 122, 224, 224, 227, 381, 227, 225, - 377, 224, 224, 224, 224, 224, 224, 224, 134, 135, - 136, 137, 138, 139, 140, 233, 234, 224, 224, 224, - 224, 224, 224, 224, 224, 107, 107, 234, 227, 107, - 107, 234, 107, 107, 234, 122, 107, 107, 234, 107, - 236, 236, 224, 122, 171, 172, 122, 207, 122, 122, - 227, 122, 122, 107, 122, 122, 122, 122, 224, 122, - 122, 224, 224, 122, 122, 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, 48, 158, 159, 160, 162, 163, 165, 166, - 168, 170, 173, 176, 177, 178, 180, 185, 189, 190, - 191, 199, 204, 487, 488, 224, 48, 158, 159, 160, - 162, 163, 165, 166, 168, 170, 173, 176, 177, 178, - 180, 185, 189, 190, 191, 199, 204, 483, 484, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 122, - 207, 227, 122, 107, 122, 122, 122, 224, 122, 122, - 224, 122, 122, 227, 107, 344, 345, 224, 224, 224, - 122, 122, 224, 122, 207, 227, 122, 122, 122, 122, - 227, 122, 224, 122, 122, 122, 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, 122, 227, 224, 224, 1, 97, - 188, 215, 284, 285, 286, 287, 288, 224, 122, 227, - 122, 224, 233, 233, 233, 233, 233, 233, 233, 224, - 224, 224, 50, 123, 332, 333, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 9, 10, 11, 235, - 236, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 8, 192, 407, 408, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 228, 224, 228, 224, - 224, 13, 33, 42, 69, 98, 99, 106, 131, 147, - 206, 358, 359, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 48, 182, 192, 338, 339, 214, 228, 343, - 224, 224, 224, 224, 4, 18, 25, 39, 66, 68, - 94, 127, 129, 148, 164, 169, 173, 178, 181, 186, - 200, 205, 216, 223, 309, 310, 224, 224, 224, 224, - 48, 158, 159, 160, 162, 163, 165, 166, 168, 170, - 173, 176, 177, 178, 180, 185, 189, 190, 191, 199, - 204, 305, 306, 224, 224, 224, 224, 248, 250, 224, - 68, 130, 157, 164, 173, 200, 202, 203, 216, 223, - 391, 392, 224, 227, 227, 289, 225, 285, 224, 68, - 130, 157, 164, 173, 200, 202, 203, 216, 223, 382, - 383, 224, 224, 228, 235, 235, 235, 224, 228, 488, - 484, 224, 228, 224, 228, 107, 345, 224, 229, 229, - 229, 224, 228, 224, 228, 224, 228, 122, 201, 236, - 227, 224, 224, 228, 333, 408, 359, 339, 128, 128, - 128, 310, 306, 392, 224, 224, 224, 39, 66, 68, - 113, 163, 164, 219, 290, 291, 383, 224, 228, 291 + 121, 141, 150, 194, 221, 397, 398, 399, 400, 401, + 402, 403, 404, 405, 406, 407, 411, 412, 413, 414, + 415, 1, 60, 124, 424, 425, 426, 427, 228, 226, + 430, 1, 97, 124, 434, 435, 436, 437, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 488, 228, 484, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 226, 440, 1, 17, 32, + 62, 117, 125, 126, 146, 220, 352, 353, 354, 355, + 356, 357, 358, 362, 363, 364, 1, 124, 220, 418, + 419, 420, 421, 1, 55, 60, 62, 121, 338, 342, + 343, 344, 348, 349, 225, 228, 228, 226, 240, 1, + 75, 168, 275, 276, 277, 278, 1, 17, 32, 62, + 97, 117, 133, 150, 151, 199, 220, 295, 296, 297, + 298, 299, 300, 301, 302, 303, 304, 305, 309, 1, + 34, 75, 124, 367, 368, 369, 370, 371, 228, 228, + 228, 228, 228, 228, 228, 228, 226, 511, 225, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 226, 245, 1, 97, + 216, 388, 389, 390, 391, 225, 228, 226, 281, 168, + 228, 226, 374, 1, 97, 216, 220, 378, 379, 380, + 381, 382, 122, 122, 122, 225, 107, 107, 208, 107, + 107, 235, 235, 235, 107, 107, 107, 208, 208, 225, + 225, 228, 228, 228, 333, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 226, 316, 225, + 228, 228, 228, 228, 228, 228, 408, 228, 228, 228, + 228, 228, 228, 228, 226, 398, 228, 228, 226, 425, + 122, 225, 228, 228, 226, 435, 208, 235, 235, 107, + 208, 107, 122, 208, 235, 208, 107, 107, 235, 107, + 208, 208, 208, 235, 107, 107, 235, 107, 107, 107, + 107, 208, 228, 208, 228, 208, 235, 235, 208, 208, + 208, 208, 211, 208, 211, 208, 208, 122, 235, 208, + 208, 235, 235, 208, 208, 225, 225, 228, 228, 359, + 228, 228, 228, 228, 228, 226, 353, 228, 228, 226, + 419, 225, 228, 228, 339, 228, 226, 343, 122, 122, + 225, 225, 228, 228, 226, 276, 225, 228, 228, 310, + 228, 228, 228, 228, 228, 306, 228, 226, 296, 225, + 228, 228, 228, 226, 368, 208, 208, 208, 122, 208, + 208, 208, 235, 225, 122, 208, 122, 107, 107, 122, + 122, 122, 122, 122, 122, 107, 122, 197, 198, 248, + 249, 197, 198, 250, 251, 122, 122, 225, 225, 228, + 392, 226, 389, 208, 225, 227, 122, 225, 225, 228, + 383, 228, 226, 379, 225, 225, 225, 225, 225, 225, + 225, 134, 135, 136, 137, 138, 139, 140, 234, 235, + 225, 225, 225, 225, 225, 225, 225, 225, 107, 107, + 235, 228, 107, 107, 235, 107, 107, 235, 122, 107, + 107, 235, 107, 237, 237, 225, 122, 172, 173, 122, + 208, 122, 122, 228, 122, 122, 107, 122, 122, 122, + 122, 225, 122, 122, 225, 225, 122, 122, 225, 225, + 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 225, 225, 225, 225, 225, 48, 159, 160, 161, 163, + 164, 166, 167, 169, 171, 174, 177, 178, 179, 181, + 186, 190, 191, 192, 200, 205, 489, 490, 225, 48, + 159, 160, 161, 163, 164, 166, 167, 169, 171, 174, + 177, 178, 179, 181, 186, 190, 191, 192, 200, 205, + 485, 486, 225, 225, 225, 225, 225, 225, 225, 225, + 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 225, 225, 122, 208, 228, 122, 107, 122, 122, 122, + 225, 122, 122, 225, 122, 122, 228, 107, 346, 347, + 225, 225, 225, 122, 122, 225, 122, 208, 228, 122, + 122, 122, 122, 208, 228, 122, 225, 122, 122, 122, + 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 225, 225, 225, 229, 225, 229, 225, 225, 122, 228, + 225, 225, 1, 97, 189, 216, 285, 286, 287, 288, + 289, 225, 122, 228, 122, 225, 234, 234, 234, 234, + 234, 234, 234, 225, 225, 225, 50, 123, 334, 335, + 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 9, 10, 11, 236, 237, 225, 225, 225, 225, 225, + 225, 225, 225, 225, 8, 193, 409, 410, 225, 225, + 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, + 229, 225, 229, 225, 225, 13, 33, 42, 69, 98, + 99, 106, 131, 147, 207, 360, 361, 225, 225, 225, + 225, 225, 225, 225, 225, 225, 48, 183, 193, 340, + 341, 215, 229, 345, 225, 225, 225, 225, 4, 18, + 25, 39, 66, 68, 94, 127, 129, 148, 165, 170, + 174, 179, 182, 187, 201, 206, 217, 224, 311, 312, + 225, 225, 225, 225, 225, 48, 159, 160, 161, 163, + 164, 166, 167, 169, 171, 174, 177, 178, 179, 181, + 186, 190, 191, 192, 200, 205, 307, 308, 225, 225, + 225, 225, 249, 251, 225, 68, 130, 158, 165, 174, + 201, 203, 204, 217, 224, 393, 394, 225, 228, 228, + 290, 226, 286, 225, 68, 130, 158, 165, 174, 201, + 203, 204, 217, 224, 384, 385, 225, 225, 229, 236, + 236, 236, 225, 229, 490, 486, 225, 229, 225, 229, + 107, 347, 225, 230, 230, 230, 225, 229, 225, 229, + 225, 229, 122, 202, 237, 228, 225, 225, 229, 335, + 410, 361, 341, 128, 128, 128, 312, 308, 394, 225, + 225, 225, 39, 66, 68, 113, 164, 165, 220, 291, + 292, 385, 225, 229, 292 }; #define yyerrok (yyerrstatus = 0) @@ -3187,13 +3202,13 @@ yyreduce: { case 27: /* Line 1787 of yacc.c */ -#line 397 "conf_parser.y" +#line 398 "conf_parser.y" { (yyval.number) = 0; } break; case 29: /* Line 1787 of yacc.c */ -#line 399 "conf_parser.y" +#line 400 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); } @@ -3201,7 +3216,7 @@ yyreduce: case 30: /* Line 1787 of yacc.c */ -#line 403 "conf_parser.y" +#line 404 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); } @@ -3209,7 +3224,7 @@ yyreduce: case 31: /* Line 1787 of yacc.c */ -#line 407 "conf_parser.y" +#line 408 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number); } @@ -3217,7 +3232,7 @@ yyreduce: case 32: /* Line 1787 of yacc.c */ -#line 411 "conf_parser.y" +#line 412 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number); } @@ -3225,7 +3240,7 @@ yyreduce: case 33: /* Line 1787 of yacc.c */ -#line 415 "conf_parser.y" +#line 416 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number); } @@ -3233,7 +3248,7 @@ yyreduce: case 34: /* Line 1787 of yacc.c */ -#line 419 "conf_parser.y" +#line 420 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number); } @@ -3241,7 +3256,7 @@ yyreduce: case 35: /* Line 1787 of yacc.c */ -#line 423 "conf_parser.y" +#line 424 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 * 4 + (yyvsp[(3) - (3)].number); } @@ -3249,7 +3264,7 @@ yyreduce: case 36: /* Line 1787 of yacc.c */ -#line 427 "conf_parser.y" +#line 428 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 365 + (yyvsp[(3) - (3)].number); } @@ -3257,37 +3272,37 @@ yyreduce: case 37: /* Line 1787 of yacc.c */ -#line 432 "conf_parser.y" +#line 433 "conf_parser.y" { (yyval.number) = 0; } break; case 39: /* Line 1787 of yacc.c */ -#line 433 "conf_parser.y" +#line 434 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); } break; case 40: /* Line 1787 of yacc.c */ -#line 434 "conf_parser.y" +#line 435 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); } break; case 41: /* Line 1787 of yacc.c */ -#line 435 "conf_parser.y" +#line 436 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); } break; case 42: /* Line 1787 of yacc.c */ -#line 436 "conf_parser.y" +#line 437 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); } break; case 49: /* Line 1787 of yacc.c */ -#line 450 "conf_parser.y" +#line 451 "conf_parser.y" { if (conf_parser_ctx.pass == 2) add_conf_module(libio_basename(yylval.string)); @@ -3296,7 +3311,7 @@ yyreduce: case 50: /* Line 1787 of yacc.c */ -#line 456 "conf_parser.y" +#line 457 "conf_parser.y" { if (conf_parser_ctx.pass == 2) mod_add_path(yylval.string); @@ -3305,7 +3320,7 @@ yyreduce: case 76: /* Line 1787 of yacc.c */ -#line 482 "conf_parser.y" +#line 483 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx) @@ -3316,7 +3331,7 @@ yyreduce: case 77: /* Line 1787 of yacc.c */ -#line 488 "conf_parser.y" +#line 489 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx) @@ -3327,7 +3342,7 @@ yyreduce: case 80: /* Line 1787 of yacc.c */ -#line 497 "conf_parser.y" +#line 498 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3338,7 +3353,7 @@ yyreduce: case 81: /* Line 1787 of yacc.c */ -#line 503 "conf_parser.y" +#line 504 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3349,7 +3364,7 @@ yyreduce: case 82: /* Line 1787 of yacc.c */ -#line 511 "conf_parser.y" +#line 512 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3394,7 +3409,7 @@ yyreduce: case 83: /* Line 1787 of yacc.c */ -#line 553 "conf_parser.y" +#line 554 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO BIO *file = NULL; @@ -3456,7 +3471,7 @@ yyreduce: case 84: /* Line 1787 of yacc.c */ -#line 612 "conf_parser.y" +#line 613 "conf_parser.y" { /* TBD - XXX: error reporting */ #ifdef HAVE_LIBCRYPTO @@ -3487,7 +3502,7 @@ yyreduce: case 85: /* Line 1787 of yacc.c */ -#line 640 "conf_parser.y" +#line 641 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3498,7 +3513,7 @@ yyreduce: case 86: /* Line 1787 of yacc.c */ -#line 648 "conf_parser.y" +#line 649 "conf_parser.y" { /* this isn't rehashable */ if (conf_parser_ctx.pass == 2 && !ServerInfo.name) @@ -3516,7 +3531,7 @@ yyreduce: case 87: /* Line 1787 of yacc.c */ -#line 663 "conf_parser.y" +#line 664 "conf_parser.y" { /* this isn't rehashable */ if (conf_parser_ctx.pass == 2 && !ServerInfo.sid) @@ -3534,7 +3549,7 @@ yyreduce: case 88: /* Line 1787 of yacc.c */ -#line 678 "conf_parser.y" +#line 679 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3546,7 +3561,7 @@ yyreduce: case 89: /* Line 1787 of yacc.c */ -#line 687 "conf_parser.y" +#line 688 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3563,7 +3578,7 @@ yyreduce: case 90: /* Line 1787 of yacc.c */ -#line 701 "conf_parser.y" +#line 702 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3575,7 +3590,7 @@ yyreduce: case 91: /* Line 1787 of yacc.c */ -#line 710 "conf_parser.y" +#line 711 "conf_parser.y" { if (conf_parser_ctx.pass == 2 && *yylval.string != '*') { @@ -3606,7 +3621,7 @@ yyreduce: case 92: /* Line 1787 of yacc.c */ -#line 738 "conf_parser.y" +#line 739 "conf_parser.y" { #ifdef IPV6 if (conf_parser_ctx.pass == 2 && *yylval.string != '*') @@ -3639,7 +3654,7 @@ yyreduce: case 93: /* Line 1787 of yacc.c */ -#line 768 "conf_parser.y" +#line 769 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3667,7 +3682,7 @@ yyreduce: case 94: /* Line 1787 of yacc.c */ -#line 793 "conf_parser.y" +#line 794 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3692,7 +3707,7 @@ yyreduce: case 95: /* Line 1787 of yacc.c */ -#line 815 "conf_parser.y" +#line 816 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3717,7 +3732,7 @@ yyreduce: case 96: /* Line 1787 of yacc.c */ -#line 837 "conf_parser.y" +#line 838 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ServerInfo.hub = yylval.number; @@ -3726,7 +3741,7 @@ yyreduce: case 104: /* Line 1787 of yacc.c */ -#line 852 "conf_parser.y" +#line 853 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3738,7 +3753,7 @@ yyreduce: case 105: /* Line 1787 of yacc.c */ -#line 861 "conf_parser.y" +#line 862 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3750,7 +3765,7 @@ yyreduce: case 106: /* Line 1787 of yacc.c */ -#line 870 "conf_parser.y" +#line 871 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3762,7 +3777,7 @@ yyreduce: case 107: /* Line 1787 of yacc.c */ -#line 882 "conf_parser.y" +#line 883 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); @@ -3771,7 +3786,7 @@ yyreduce: case 108: /* Line 1787 of yacc.c */ -#line 886 "conf_parser.y" +#line 887 "conf_parser.y" { dlink_node *ptr = NULL; @@ -3788,7 +3803,7 @@ yyreduce: case 114: /* Line 1787 of yacc.c */ -#line 903 "conf_parser.y" +#line 904 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); @@ -3797,7 +3812,7 @@ yyreduce: case 115: /* Line 1787 of yacc.c */ -#line 909 "conf_parser.y" +#line 910 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf)); @@ -3806,7 +3821,7 @@ yyreduce: case 122: /* Line 1787 of yacc.c */ -#line 924 "conf_parser.y" +#line 925 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigLoggingEntry.use_logging = yylval.number; @@ -3815,7 +3830,7 @@ yyreduce: case 123: /* Line 1787 of yacc.c */ -#line 930 "conf_parser.y" +#line 931 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); @@ -3824,7 +3839,7 @@ yyreduce: case 124: /* Line 1787 of yacc.c */ -#line 934 "conf_parser.y" +#line 935 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3837,7 +3852,7 @@ yyreduce: case 131: /* Line 1787 of yacc.c */ -#line 950 "conf_parser.y" +#line 951 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3848,7 +3863,7 @@ yyreduce: case 132: /* Line 1787 of yacc.c */ -#line 958 "conf_parser.y" +#line 959 "conf_parser.y" { block_state.size.value = (yyvsp[(3) - (4)].number); } @@ -3856,7 +3871,7 @@ yyreduce: case 133: /* Line 1787 of yacc.c */ -#line 961 "conf_parser.y" +#line 962 "conf_parser.y" { block_state.size.value = 0; } @@ -3864,7 +3879,7 @@ yyreduce: case 134: /* Line 1787 of yacc.c */ -#line 966 "conf_parser.y" +#line 967 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = 0; @@ -3873,7 +3888,7 @@ yyreduce: case 138: /* Line 1787 of yacc.c */ -#line 973 "conf_parser.y" +#line 974 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_USER; @@ -3882,7 +3897,7 @@ yyreduce: case 139: /* Line 1787 of yacc.c */ -#line 977 "conf_parser.y" +#line 978 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_OPER; @@ -3891,7 +3906,7 @@ yyreduce: case 140: /* Line 1787 of yacc.c */ -#line 981 "conf_parser.y" +#line 982 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_GLINE; @@ -3900,7 +3915,7 @@ yyreduce: case 141: /* Line 1787 of yacc.c */ -#line 985 "conf_parser.y" +#line 986 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_DLINE; @@ -3909,7 +3924,7 @@ yyreduce: case 142: /* Line 1787 of yacc.c */ -#line 989 "conf_parser.y" +#line 990 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_KLINE; @@ -3918,7 +3933,7 @@ yyreduce: case 143: /* Line 1787 of yacc.c */ -#line 993 "conf_parser.y" +#line 994 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_KILL; @@ -3927,7 +3942,7 @@ yyreduce: case 144: /* Line 1787 of yacc.c */ -#line 997 "conf_parser.y" +#line 998 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_DEBUG; @@ -3936,7 +3951,7 @@ yyreduce: case 145: /* Line 1787 of yacc.c */ -#line 1007 "conf_parser.y" +#line 1008 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3948,7 +3963,7 @@ yyreduce: case 146: /* Line 1787 of yacc.c */ -#line 1014 "conf_parser.y" +#line 1015 "conf_parser.y" { dlink_node *ptr = NULL; @@ -4022,36 +4037,36 @@ yyreduce: } break; - case 159: + case 160: /* Line 1787 of yacc.c */ -#line 1093 "conf_parser.y" +#line 1095 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 160: + case 161: /* Line 1787 of yacc.c */ -#line 1099 "conf_parser.y" +#line 1101 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); } break; - case 161: + case 162: /* Line 1787 of yacc.c */ -#line 1105 "conf_parser.y" +#line 1107 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 162: + case 163: /* Line 1787 of yacc.c */ -#line 1111 "conf_parser.y" +#line 1113 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4063,450 +4078,464 @@ yyreduce: } break; - case 163: + case 164: /* Line 1787 of yacc.c */ -#line 1122 "conf_parser.y" +#line 1124 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf)); } break; - case 164: + case 165: /* Line 1787 of yacc.c */ -#line 1128 "conf_parser.y" +#line 1130 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf)); } break; - case 165: + case 166: +/* Line 1787 of yacc.c */ +#line 1136 "conf_parser.y" + { + if (conf_parser_ctx.pass != 2) + break; + + if (yylval.number) + block_state.flags.value |= CONF_FLAGS_SSL; + else + block_state.flags.value &= ~CONF_FLAGS_SSL; +} + break; + + case 167: /* Line 1787 of yacc.c */ -#line 1134 "conf_parser.y" +#line 1147 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 166: + case 168: /* Line 1787 of yacc.c */ -#line 1140 "conf_parser.y" +#line 1153 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value = 0; } break; - case 170: + case 172: /* Line 1787 of yacc.c */ -#line 1147 "conf_parser.y" +#line 1160 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_BOTS; } break; - case 171: + case 173: /* Line 1787 of yacc.c */ -#line 1151 "conf_parser.y" +#line 1164 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CCONN; } break; - case 172: + case 174: /* Line 1787 of yacc.c */ -#line 1155 "conf_parser.y" +#line 1168 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_DEAF; } break; - case 173: + case 175: /* Line 1787 of yacc.c */ -#line 1159 "conf_parser.y" +#line 1172 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_DEBUG; } break; - case 174: + case 176: /* Line 1787 of yacc.c */ -#line 1163 "conf_parser.y" +#line 1176 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_FULL; } break; - case 175: + case 177: /* Line 1787 of yacc.c */ -#line 1167 "conf_parser.y" +#line 1180 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_HIDDEN; } break; - case 176: + case 178: /* Line 1787 of yacc.c */ -#line 1171 "conf_parser.y" +#line 1184 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SKILL; } break; - case 177: + case 179: /* Line 1787 of yacc.c */ -#line 1175 "conf_parser.y" +#line 1188 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_NCHANGE; } break; - case 178: + case 180: /* Line 1787 of yacc.c */ -#line 1179 "conf_parser.y" +#line 1192 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_REJ; } break; - case 179: + case 181: /* Line 1787 of yacc.c */ -#line 1183 "conf_parser.y" +#line 1196 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_UNAUTH; } break; - case 180: + case 182: /* Line 1787 of yacc.c */ -#line 1187 "conf_parser.y" +#line 1200 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SPY; } break; - case 181: + case 183: /* Line 1787 of yacc.c */ -#line 1191 "conf_parser.y" +#line 1204 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_EXTERNAL; } break; - case 182: + case 184: /* Line 1787 of yacc.c */ -#line 1195 "conf_parser.y" +#line 1208 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_OPERWALL; } break; - case 183: + case 185: /* Line 1787 of yacc.c */ -#line 1199 "conf_parser.y" +#line 1212 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SERVNOTICE; } break; - case 184: + case 186: /* Line 1787 of yacc.c */ -#line 1203 "conf_parser.y" +#line 1216 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_INVISIBLE; } break; - case 185: + case 187: /* Line 1787 of yacc.c */ -#line 1207 "conf_parser.y" +#line 1220 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_WALLOP; } break; - case 186: + case 188: /* Line 1787 of yacc.c */ -#line 1211 "conf_parser.y" +#line 1224 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SOFTCALLERID; } break; - case 187: + case 189: /* Line 1787 of yacc.c */ -#line 1215 "conf_parser.y" +#line 1228 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CALLERID; } break; - case 188: + case 190: /* Line 1787 of yacc.c */ -#line 1219 "conf_parser.y" +#line 1232 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_LOCOPS; } break; - case 189: + case 191: /* Line 1787 of yacc.c */ -#line 1223 "conf_parser.y" +#line 1236 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_REGONLY; } break; - case 190: + case 192: /* Line 1787 of yacc.c */ -#line 1227 "conf_parser.y" +#line 1240 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_FARCONNECT; } break; - case 191: + case 193: /* Line 1787 of yacc.c */ -#line 1233 "conf_parser.y" +#line 1246 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 0; } break; - case 195: + case 197: /* Line 1787 of yacc.c */ -#line 1240 "conf_parser.y" +#line 1253 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_KILL_REMOTE; } break; - case 196: + case 198: /* Line 1787 of yacc.c */ -#line 1244 "conf_parser.y" +#line 1257 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_KILL; } break; - case 197: + case 199: /* Line 1787 of yacc.c */ -#line 1248 "conf_parser.y" +#line 1261 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_CONNECT_REMOTE; } break; - case 198: + case 200: /* Line 1787 of yacc.c */ -#line 1252 "conf_parser.y" +#line 1265 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_CONNECT; } break; - case 199: + case 201: /* Line 1787 of yacc.c */ -#line 1256 "conf_parser.y" +#line 1269 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_SQUIT_REMOTE; } break; - case 200: + case 202: /* Line 1787 of yacc.c */ -#line 1260 "conf_parser.y" +#line 1273 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_SQUIT; } break; - case 201: + case 203: /* Line 1787 of yacc.c */ -#line 1264 "conf_parser.y" +#line 1277 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_K; } break; - case 202: + case 204: /* Line 1787 of yacc.c */ -#line 1268 "conf_parser.y" +#line 1281 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_UNKLINE; } break; - case 203: + case 205: /* Line 1787 of yacc.c */ -#line 1272 "conf_parser.y" +#line 1285 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_DLINE; } break; - case 204: + case 206: /* Line 1787 of yacc.c */ -#line 1276 "conf_parser.y" +#line 1289 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_UNDLINE; } break; - case 205: + case 207: /* Line 1787 of yacc.c */ -#line 1280 "conf_parser.y" +#line 1293 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_X; } break; - case 206: + case 208: /* Line 1787 of yacc.c */ -#line 1284 "conf_parser.y" +#line 1297 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLINE; } break; - case 207: + case 209: /* Line 1787 of yacc.c */ -#line 1288 "conf_parser.y" +#line 1301 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_DIE; } break; - case 208: + case 210: /* Line 1787 of yacc.c */ -#line 1292 "conf_parser.y" +#line 1305 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_RESTART; } break; - case 209: + case 211: /* Line 1787 of yacc.c */ -#line 1296 "conf_parser.y" +#line 1309 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REHASH; } break; - case 210: + case 212: /* Line 1787 of yacc.c */ -#line 1300 "conf_parser.y" +#line 1313 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_ADMIN; } break; - case 211: + case 213: /* Line 1787 of yacc.c */ -#line 1304 "conf_parser.y" +#line 1317 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_OPERWALL; } break; - case 212: + case 214: /* Line 1787 of yacc.c */ -#line 1308 "conf_parser.y" +#line 1321 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLOBOPS; } break; - case 213: + case 215: /* Line 1787 of yacc.c */ -#line 1312 "conf_parser.y" +#line 1325 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_WALLOPS; } break; - case 214: + case 216: /* Line 1787 of yacc.c */ -#line 1316 "conf_parser.y" +#line 1329 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_LOCOPS; } break; - case 215: + case 217: /* Line 1787 of yacc.c */ -#line 1320 "conf_parser.y" +#line 1333 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REMOTEBAN; } break; - case 216: + case 218: /* Line 1787 of yacc.c */ -#line 1324 "conf_parser.y" +#line 1337 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_SET; } break; - case 217: + case 219: /* Line 1787 of yacc.c */ -#line 1328 "conf_parser.y" +#line 1341 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_MODULE; } break; - case 218: + case 220: /* Line 1787 of yacc.c */ -#line 1338 "conf_parser.y" +#line 1351 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4521,9 +4550,9 @@ yyreduce: } break; - case 219: + case 221: /* Line 1787 of yacc.c */ -#line 1350 "conf_parser.y" +#line 1363 "conf_parser.y" { struct ClassItem *class = NULL; @@ -4573,90 +4602,90 @@ yyreduce: } break; - case 239: + case 241: /* Line 1787 of yacc.c */ -#line 1416 "conf_parser.y" +#line 1429 "conf_parser.y" { if (conf_parser_ctx.pass == 1) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 240: + case 242: /* Line 1787 of yacc.c */ -#line 1422 "conf_parser.y" +#line 1435 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.ping_freq.value = (yyvsp[(3) - (4)].number); } break; - case 241: + case 243: /* Line 1787 of yacc.c */ -#line 1428 "conf_parser.y" +#line 1441 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_perip.value = (yyvsp[(3) - (4)].number); } break; - case 242: + case 244: /* Line 1787 of yacc.c */ -#line 1434 "conf_parser.y" +#line 1447 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.con_freq.value = (yyvsp[(3) - (4)].number); } break; - case 243: + case 245: /* Line 1787 of yacc.c */ -#line 1440 "conf_parser.y" +#line 1453 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_total.value = (yyvsp[(3) - (4)].number); } break; - case 244: + case 246: /* Line 1787 of yacc.c */ -#line 1446 "conf_parser.y" +#line 1459 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_global.value = (yyvsp[(3) - (4)].number); } break; - case 245: + case 247: /* Line 1787 of yacc.c */ -#line 1452 "conf_parser.y" +#line 1465 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_local.value = (yyvsp[(3) - (4)].number); } break; - case 246: + case 248: /* Line 1787 of yacc.c */ -#line 1458 "conf_parser.y" +#line 1471 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_ident.value = (yyvsp[(3) - (4)].number); } break; - case 247: + case 249: /* Line 1787 of yacc.c */ -#line 1464 "conf_parser.y" +#line 1477 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_sendq.value = (yyvsp[(3) - (4)].number); } break; - case 248: + case 250: /* Line 1787 of yacc.c */ -#line 1470 "conf_parser.y" +#line 1483 "conf_parser.y" { if (conf_parser_ctx.pass == 1) if ((yyvsp[(3) - (4)].number) >= CLIENT_FLOOD_MIN && (yyvsp[(3) - (4)].number) <= CLIENT_FLOOD_MAX) @@ -4664,36 +4693,36 @@ yyreduce: } break; - case 249: + case 251: /* Line 1787 of yacc.c */ -#line 1477 "conf_parser.y" +#line 1490 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.cidr_bitlen_ipv4.value = (yyvsp[(3) - (4)].number) > 32 ? 32 : (yyvsp[(3) - (4)].number); } break; - case 250: + case 252: /* Line 1787 of yacc.c */ -#line 1483 "conf_parser.y" +#line 1496 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.cidr_bitlen_ipv6.value = (yyvsp[(3) - (4)].number) > 128 ? 128 : (yyvsp[(3) - (4)].number); } break; - case 251: + case 253: /* Line 1787 of yacc.c */ -#line 1489 "conf_parser.y" +#line 1502 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.number_per_cidr.value = (yyvsp[(3) - (4)].number); } break; - case 252: + case 254: /* Line 1787 of yacc.c */ -#line 1495 "conf_parser.y" +#line 1508 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4703,9 +4732,9 @@ yyreduce: } break; - case 253: + case 255: /* Line 1787 of yacc.c */ -#line 1504 "conf_parser.y" +#line 1517 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4715,86 +4744,86 @@ yyreduce: } break; - case 254: + case 256: /* Line 1787 of yacc.c */ -#line 1513 "conf_parser.y" +#line 1526 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE; } break; - case 258: + case 260: /* Line 1787 of yacc.c */ -#line 1520 "conf_parser.y" +#line 1533 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE; } break; - case 259: + case 261: /* Line 1787 of yacc.c */ -#line 1524 "conf_parser.y" +#line 1537 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS; } break; - case 260: + case 262: /* Line 1787 of yacc.c */ -#line 1534 "conf_parser.y" +#line 1547 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 262: + case 264: /* Line 1787 of yacc.c */ -#line 1540 "conf_parser.y" +#line 1553 "conf_parser.y" { block_state.flags.value = 0; } break; - case 266: + case 268: /* Line 1787 of yacc.c */ -#line 1546 "conf_parser.y" +#line 1559 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_SSL; } break; - case 267: + case 269: /* Line 1787 of yacc.c */ -#line 1550 "conf_parser.y" +#line 1563 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_HIDDEN; } break; - case 268: + case 270: /* Line 1787 of yacc.c */ -#line 1554 "conf_parser.y" +#line 1567 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_SERVER; } break; - case 276: + case 278: /* Line 1787 of yacc.c */ -#line 1562 "conf_parser.y" +#line 1575 "conf_parser.y" { block_state.flags.value = 0; } break; - case 280: + case 282: /* Line 1787 of yacc.c */ -#line 1567 "conf_parser.y" +#line 1580 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4811,9 +4840,9 @@ yyreduce: } break; - case 281: + case 283: /* Line 1787 of yacc.c */ -#line 1581 "conf_parser.y" +#line 1594 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4834,36 +4863,36 @@ yyreduce: } break; - case 282: + case 284: /* Line 1787 of yacc.c */ -#line 1601 "conf_parser.y" +#line 1614 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 283: + case 285: /* Line 1787 of yacc.c */ -#line 1607 "conf_parser.y" +#line 1620 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 284: + case 286: /* Line 1787 of yacc.c */ -#line 1616 "conf_parser.y" +#line 1629 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 285: + case 287: /* Line 1787 of yacc.c */ -#line 1620 "conf_parser.y" +#line 1633 "conf_parser.y" { dlink_node *ptr = NULL; @@ -4902,36 +4931,36 @@ yyreduce: } break; - case 297: + case 299: /* Line 1787 of yacc.c */ -#line 1663 "conf_parser.y" +#line 1676 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); } break; - case 298: + case 300: /* Line 1787 of yacc.c */ -#line 1669 "conf_parser.y" +#line 1682 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 299: + case 301: /* Line 1787 of yacc.c */ -#line 1675 "conf_parser.y" +#line 1688 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 300: + case 302: /* Line 1787 of yacc.c */ -#line 1681 "conf_parser.y" +#line 1694 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4943,108 +4972,108 @@ yyreduce: } break; - case 301: + case 303: /* Line 1787 of yacc.c */ -#line 1692 "conf_parser.y" +#line 1705 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP); } break; - case 305: + case 307: /* Line 1787 of yacc.c */ -#line 1699 "conf_parser.y" +#line 1712 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE; } break; - case 306: + case 308: /* Line 1787 of yacc.c */ -#line 1703 "conf_parser.y" +#line 1716 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NOLIMIT; } break; - case 307: + case 309: /* Line 1787 of yacc.c */ -#line 1707 "conf_parser.y" +#line 1720 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE; } break; - case 308: + case 310: /* Line 1787 of yacc.c */ -#line 1711 "conf_parser.y" +#line 1724 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NEED_IDENTD; } break; - case 309: + case 311: /* Line 1787 of yacc.c */ -#line 1715 "conf_parser.y" +#line 1728 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_CAN_FLOOD; } break; - case 310: + case 312: /* Line 1787 of yacc.c */ -#line 1719 "conf_parser.y" +#line 1732 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NO_TILDE; } break; - case 311: + case 313: /* Line 1787 of yacc.c */ -#line 1723 "conf_parser.y" +#line 1736 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE; } break; - case 312: + case 314: /* Line 1787 of yacc.c */ -#line 1727 "conf_parser.y" +#line 1740 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTRESV; } break; - case 313: + case 315: /* Line 1787 of yacc.c */ -#line 1731 "conf_parser.y" +#line 1744 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_WEBIRC; } break; - case 314: + case 316: /* Line 1787 of yacc.c */ -#line 1735 "conf_parser.y" +#line 1748 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD; } break; - case 315: + case 317: /* Line 1787 of yacc.c */ -#line 1741 "conf_parser.y" +#line 1754 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5059,9 +5088,9 @@ yyreduce: } break; - case 316: + case 318: /* Line 1787 of yacc.c */ -#line 1755 "conf_parser.y" +#line 1768 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5071,9 +5100,9 @@ yyreduce: } break; - case 317: + case 319: /* Line 1787 of yacc.c */ -#line 1764 "conf_parser.y" +#line 1777 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5083,9 +5112,9 @@ yyreduce: } break; - case 318: + case 320: /* Line 1787 of yacc.c */ -#line 1777 "conf_parser.y" +#line 1790 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5095,9 +5124,9 @@ yyreduce: } break; - case 319: + case 321: /* Line 1787 of yacc.c */ -#line 1784 "conf_parser.y" +#line 1797 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5106,36 +5135,36 @@ yyreduce: } break; - case 326: + case 328: /* Line 1787 of yacc.c */ -#line 1795 "conf_parser.y" +#line 1808 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 327: + case 329: /* Line 1787 of yacc.c */ -#line 1801 "conf_parser.y" +#line 1814 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 328: + case 330: /* Line 1787 of yacc.c */ -#line 1807 "conf_parser.y" +#line 1820 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); } break; - case 334: + case 336: /* Line 1787 of yacc.c */ -#line 1822 "conf_parser.y" +#line 1835 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5148,9 +5177,9 @@ yyreduce: } break; - case 335: + case 337: /* Line 1787 of yacc.c */ -#line 1837 "conf_parser.y" +#line 1850 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5164,9 +5193,9 @@ yyreduce: } break; - case 336: + case 338: /* Line 1787 of yacc.c */ -#line 1848 "conf_parser.y" +#line 1861 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5181,18 +5210,18 @@ yyreduce: } break; - case 343: + case 345: /* Line 1787 of yacc.c */ -#line 1865 "conf_parser.y" +#line 1878 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 344: + case 346: /* Line 1787 of yacc.c */ -#line 1871 "conf_parser.y" +#line 1884 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5212,108 +5241,108 @@ yyreduce: } break; - case 345: + case 347: /* Line 1787 of yacc.c */ -#line 1890 "conf_parser.y" +#line 1903 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = 0; } break; - case 349: + case 351: /* Line 1787 of yacc.c */ -#line 1897 "conf_parser.y" +#line 1910 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_KLINE; } break; - case 350: + case 352: /* Line 1787 of yacc.c */ -#line 1901 "conf_parser.y" +#line 1914 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNKLINE; } break; - case 351: + case 353: /* Line 1787 of yacc.c */ -#line 1905 "conf_parser.y" +#line 1918 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_DLINE; } break; - case 352: + case 354: /* Line 1787 of yacc.c */ -#line 1909 "conf_parser.y" +#line 1922 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNDLINE; } break; - case 353: + case 355: /* Line 1787 of yacc.c */ -#line 1913 "conf_parser.y" +#line 1926 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_XLINE; } break; - case 354: + case 356: /* Line 1787 of yacc.c */ -#line 1917 "conf_parser.y" +#line 1930 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNXLINE; } break; - case 355: + case 357: /* Line 1787 of yacc.c */ -#line 1921 "conf_parser.y" +#line 1934 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_RESV; } break; - case 356: + case 358: /* Line 1787 of yacc.c */ -#line 1925 "conf_parser.y" +#line 1938 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNRESV; } break; - case 357: + case 359: /* Line 1787 of yacc.c */ -#line 1929 "conf_parser.y" +#line 1942 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_LOCOPS; } break; - case 358: + case 360: /* Line 1787 of yacc.c */ -#line 1933 "conf_parser.y" +#line 1946 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = SHARED_ALL; } break; - case 359: + case 361: /* Line 1787 of yacc.c */ -#line 1942 "conf_parser.y" +#line 1955 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5325,9 +5354,9 @@ yyreduce: } break; - case 360: + case 362: /* Line 1787 of yacc.c */ -#line 1951 "conf_parser.y" +#line 1964 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5340,117 +5369,117 @@ yyreduce: } break; - case 366: + case 368: /* Line 1787 of yacc.c */ -#line 1966 "conf_parser.y" +#line 1979 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 367: + case 369: /* Line 1787 of yacc.c */ -#line 1972 "conf_parser.y" +#line 1985 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = 0; } break; - case 371: + case 373: /* Line 1787 of yacc.c */ -#line 1979 "conf_parser.y" +#line 1992 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_KLINE; } break; - case 372: + case 374: /* Line 1787 of yacc.c */ -#line 1983 "conf_parser.y" +#line 1996 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNKLINE; } break; - case 373: + case 375: /* Line 1787 of yacc.c */ -#line 1987 "conf_parser.y" +#line 2000 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_DLINE; } break; - case 374: + case 376: /* Line 1787 of yacc.c */ -#line 1991 "conf_parser.y" +#line 2004 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNDLINE; } break; - case 375: + case 377: /* Line 1787 of yacc.c */ -#line 1995 "conf_parser.y" +#line 2008 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_XLINE; } break; - case 376: + case 378: /* Line 1787 of yacc.c */ -#line 1999 "conf_parser.y" +#line 2012 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNXLINE; } break; - case 377: + case 379: /* Line 1787 of yacc.c */ -#line 2003 "conf_parser.y" +#line 2016 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_RESV; } break; - case 378: + case 380: /* Line 1787 of yacc.c */ -#line 2007 "conf_parser.y" +#line 2020 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNRESV; } break; - case 379: + case 381: /* Line 1787 of yacc.c */ -#line 2011 "conf_parser.y" +#line 2024 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_LOCOPS; } break; - case 380: + case 382: /* Line 1787 of yacc.c */ -#line 2015 "conf_parser.y" +#line 2028 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = SHARED_ALL; } break; - case 381: + case 383: /* Line 1787 of yacc.c */ -#line 2024 "conf_parser.y" +#line 2037 "conf_parser.y" { if (conf_parser_ctx.pass != 2) @@ -5461,9 +5490,9 @@ yyreduce: } break; - case 382: + case 384: /* Line 1787 of yacc.c */ -#line 2032 "conf_parser.y" +#line 2045 "conf_parser.y" { struct MaskItem *conf = NULL; struct addrinfo hints, *res; @@ -5526,36 +5555,36 @@ yyreduce: } break; - case 400: + case 402: /* Line 1787 of yacc.c */ -#line 2103 "conf_parser.y" +#line 2116 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 401: + case 403: /* Line 1787 of yacc.c */ -#line 2109 "conf_parser.y" +#line 2122 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf)); } break; - case 402: + case 404: /* Line 1787 of yacc.c */ -#line 2115 "conf_parser.y" +#line 2128 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf)); } break; - case 403: + case 405: /* Line 1787 of yacc.c */ -#line 2121 "conf_parser.y" +#line 2134 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5569,9 +5598,9 @@ yyreduce: } break; - case 404: + case 406: /* Line 1787 of yacc.c */ -#line 2134 "conf_parser.y" +#line 2147 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5585,36 +5614,36 @@ yyreduce: } break; - case 405: + case 407: /* Line 1787 of yacc.c */ -#line 2147 "conf_parser.y" +#line 2160 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf)); } break; - case 406: + case 408: /* Line 1787 of yacc.c */ -#line 2153 "conf_parser.y" +#line 2166 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = (yyvsp[(3) - (4)].number); } break; - case 407: + case 409: /* Line 1787 of yacc.c */ -#line 2159 "conf_parser.y" +#line 2172 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.aftype.value = AF_INET; } break; - case 408: + case 410: /* Line 1787 of yacc.c */ -#line 2163 "conf_parser.y" +#line 2176 "conf_parser.y" { #ifdef IPV6 if (conf_parser_ctx.pass == 2) @@ -5623,35 +5652,35 @@ yyreduce: } break; - case 409: + case 411: /* Line 1787 of yacc.c */ -#line 2171 "conf_parser.y" +#line 2184 "conf_parser.y" { block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } break; - case 413: + case 415: /* Line 1787 of yacc.c */ -#line 2177 "conf_parser.y" +#line 2190 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN; } break; - case 414: + case 416: /* Line 1787 of yacc.c */ -#line 2181 "conf_parser.y" +#line 2194 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SSL; } break; - case 415: + case 417: /* Line 1787 of yacc.c */ -#line 2187 "conf_parser.y" +#line 2200 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5663,36 +5692,36 @@ yyreduce: } break; - case 416: + case 418: /* Line 1787 of yacc.c */ -#line 2198 "conf_parser.y" +#line 2211 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list); } break; - case 417: + case 419: /* Line 1787 of yacc.c */ -#line 2204 "conf_parser.y" +#line 2217 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list); } break; - case 418: + case 420: /* Line 1787 of yacc.c */ -#line 2210 "conf_parser.y" +#line 2223 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 419: + case 421: /* Line 1787 of yacc.c */ -#line 2216 "conf_parser.y" +#line 2229 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2) @@ -5704,18 +5733,18 @@ yyreduce: } break; - case 420: + case 422: /* Line 1787 of yacc.c */ -#line 2231 "conf_parser.y" +#line 2244 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 421: + case 423: /* Line 1787 of yacc.c */ -#line 2235 "conf_parser.y" +#line 2248 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5738,9 +5767,9 @@ yyreduce: } break; - case 427: + case 429: /* Line 1787 of yacc.c */ -#line 2260 "conf_parser.y" +#line 2273 "conf_parser.y" { if (conf_parser_ctx.pass == 2) @@ -5761,27 +5790,27 @@ yyreduce: } break; - case 428: + case 430: /* Line 1787 of yacc.c */ -#line 2280 "conf_parser.y" +#line 2293 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 429: + case 431: /* Line 1787 of yacc.c */ -#line 2289 "conf_parser.y" +#line 2302 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 430: + case 432: /* Line 1787 of yacc.c */ -#line 2293 "conf_parser.y" +#line 2306 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5805,27 +5834,27 @@ yyreduce: } break; - case 436: + case 438: /* Line 1787 of yacc.c */ -#line 2319 "conf_parser.y" +#line 2332 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 437: + case 439: /* Line 1787 of yacc.c */ -#line 2325 "conf_parser.y" +#line 2338 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 443: + case 445: /* Line 1787 of yacc.c */ -#line 2339 "conf_parser.y" +#line 2352 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5840,18 +5869,18 @@ yyreduce: } break; - case 444: + case 446: /* Line 1787 of yacc.c */ -#line 2356 "conf_parser.y" +#line 2369 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 445: + case 447: /* Line 1787 of yacc.c */ -#line 2360 "conf_parser.y" +#line 2373 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5871,175 +5900,175 @@ yyreduce: } break; - case 451: + case 453: /* Line 1787 of yacc.c */ -#line 2382 "conf_parser.y" +#line 2395 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 452: + case 454: /* Line 1787 of yacc.c */ -#line 2388 "conf_parser.y" +#line 2401 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 504: + case 506: /* Line 1787 of yacc.c */ -#line 2431 "conf_parser.y" +#line 2444 "conf_parser.y" { ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number); } break; - case 505: + case 507: /* Line 1787 of yacc.c */ -#line 2436 "conf_parser.y" +#line 2449 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.glines = yylval.number; } break; - case 506: + case 508: /* Line 1787 of yacc.c */ -#line 2442 "conf_parser.y" +#line 2455 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number); } break; - case 507: + case 509: /* Line 1787 of yacc.c */ -#line 2448 "conf_parser.y" +#line 2461 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number); } break; - case 508: + case 510: /* Line 1787 of yacc.c */ -#line 2454 "conf_parser.y" +#line 2467 "conf_parser.y" { ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number); } break; - case 509: + case 511: /* Line 1787 of yacc.c */ -#line 2459 "conf_parser.y" +#line 2472 "conf_parser.y" { ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number); } break; - case 510: + case 512: /* Line 1787 of yacc.c */ -#line 2464 "conf_parser.y" +#line 2477 "conf_parser.y" { ConfigFileEntry.tkline_expire_notices = yylval.number; } break; - case 511: + case 513: /* Line 1787 of yacc.c */ -#line 2469 "conf_parser.y" +#line 2482 "conf_parser.y" { ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number); } break; - case 512: + case 514: /* Line 1787 of yacc.c */ -#line 2474 "conf_parser.y" +#line 2487 "conf_parser.y" { ConfigFileEntry.hide_spoof_ips = yylval.number; } break; - case 513: + case 515: /* Line 1787 of yacc.c */ -#line 2479 "conf_parser.y" +#line 2492 "conf_parser.y" { ConfigFileEntry.ignore_bogus_ts = yylval.number; } break; - case 514: + case 516: /* Line 1787 of yacc.c */ -#line 2484 "conf_parser.y" +#line 2497 "conf_parser.y" { ConfigFileEntry.failed_oper_notice = yylval.number; } break; - case 515: + case 517: /* Line 1787 of yacc.c */ -#line 2489 "conf_parser.y" +#line 2502 "conf_parser.y" { ConfigFileEntry.anti_nick_flood = yylval.number; } break; - case 516: + case 518: /* Line 1787 of yacc.c */ -#line 2494 "conf_parser.y" +#line 2507 "conf_parser.y" { ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); } break; - case 517: + case 519: /* Line 1787 of yacc.c */ -#line 2499 "conf_parser.y" +#line 2512 "conf_parser.y" { ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number); } break; - case 518: + case 520: /* Line 1787 of yacc.c */ -#line 2504 "conf_parser.y" +#line 2517 "conf_parser.y" { ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number); } break; - case 519: + case 521: /* Line 1787 of yacc.c */ -#line 2509 "conf_parser.y" +#line 2522 "conf_parser.y" { ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number); } break; - case 520: + case 522: /* Line 1787 of yacc.c */ -#line 2514 "conf_parser.y" +#line 2527 "conf_parser.y" { ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number); } break; - case 521: + case 523: /* Line 1787 of yacc.c */ -#line 2519 "conf_parser.y" +#line 2532 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number); } break; - case 522: + case 524: /* Line 1787 of yacc.c */ -#line 2525 "conf_parser.y" +#line 2538 "conf_parser.y" { if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1) { @@ -6051,169 +6080,169 @@ yyreduce: } break; - case 523: + case 525: /* Line 1787 of yacc.c */ -#line 2536 "conf_parser.y" +#line 2549 "conf_parser.y" { ConfigFileEntry.invisible_on_connect = yylval.number; } break; - case 524: + case 526: /* Line 1787 of yacc.c */ -#line 2541 "conf_parser.y" +#line 2554 "conf_parser.y" { ConfigFileEntry.warn_no_nline = yylval.number; } break; - case 525: + case 527: /* Line 1787 of yacc.c */ -#line 2546 "conf_parser.y" +#line 2559 "conf_parser.y" { ConfigFileEntry.stats_e_disabled = yylval.number; } break; - case 526: + case 528: /* Line 1787 of yacc.c */ -#line 2551 "conf_parser.y" +#line 2564 "conf_parser.y" { ConfigFileEntry.stats_o_oper_only = yylval.number; } break; - case 527: + case 529: /* Line 1787 of yacc.c */ -#line 2556 "conf_parser.y" +#line 2569 "conf_parser.y" { ConfigFileEntry.stats_P_oper_only = yylval.number; } break; - case 528: + case 530: /* Line 1787 of yacc.c */ -#line 2561 "conf_parser.y" +#line 2574 "conf_parser.y" { ConfigFileEntry.stats_k_oper_only = 2 * yylval.number; } break; - case 529: + case 531: /* Line 1787 of yacc.c */ -#line 2564 "conf_parser.y" +#line 2577 "conf_parser.y" { ConfigFileEntry.stats_k_oper_only = 1; } break; - case 530: + case 532: /* Line 1787 of yacc.c */ -#line 2569 "conf_parser.y" +#line 2582 "conf_parser.y" { ConfigFileEntry.stats_i_oper_only = 2 * yylval.number; } break; - case 531: + case 533: /* Line 1787 of yacc.c */ -#line 2572 "conf_parser.y" +#line 2585 "conf_parser.y" { ConfigFileEntry.stats_i_oper_only = 1; } break; - case 532: + case 534: /* Line 1787 of yacc.c */ -#line 2577 "conf_parser.y" +#line 2590 "conf_parser.y" { ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number); } break; - case 533: + case 535: /* Line 1787 of yacc.c */ -#line 2582 "conf_parser.y" +#line 2595 "conf_parser.y" { ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number); } break; - case 534: + case 536: /* Line 1787 of yacc.c */ -#line 2587 "conf_parser.y" +#line 2600 "conf_parser.y" { ConfigFileEntry.opers_bypass_callerid = yylval.number; } break; - case 535: + case 537: /* Line 1787 of yacc.c */ -#line 2592 "conf_parser.y" +#line 2605 "conf_parser.y" { ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number); } break; - case 536: + case 538: /* Line 1787 of yacc.c */ -#line 2597 "conf_parser.y" +#line 2610 "conf_parser.y" { ConfigFileEntry.short_motd = yylval.number; } break; - case 537: + case 539: /* Line 1787 of yacc.c */ -#line 2602 "conf_parser.y" +#line 2615 "conf_parser.y" { ConfigFileEntry.no_oper_flood = yylval.number; } break; - case 538: + case 540: /* Line 1787 of yacc.c */ -#line 2607 "conf_parser.y" +#line 2620 "conf_parser.y" { ConfigFileEntry.true_no_oper_flood = yylval.number; } break; - case 539: + case 541: /* Line 1787 of yacc.c */ -#line 2612 "conf_parser.y" +#line 2625 "conf_parser.y" { ConfigFileEntry.oper_pass_resv = yylval.number; } break; - case 540: + case 542: /* Line 1787 of yacc.c */ -#line 2617 "conf_parser.y" +#line 2630 "conf_parser.y" { ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number); } break; - case 541: + case 543: /* Line 1787 of yacc.c */ -#line 2622 "conf_parser.y" +#line 2635 "conf_parser.y" { ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number); } break; - case 542: + case 544: /* Line 1787 of yacc.c */ -#line 2627 "conf_parser.y" +#line 2640 "conf_parser.y" { ConfigFileEntry.use_egd = yylval.number; } break; - case 543: + case 545: /* Line 1787 of yacc.c */ -#line 2632 "conf_parser.y" +#line 2645 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6223,9 +6252,9 @@ yyreduce: } break; - case 544: + case 546: /* Line 1787 of yacc.c */ -#line 2641 "conf_parser.y" +#line 2654 "conf_parser.y" { if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string)) { @@ -6235,541 +6264,541 @@ yyreduce: } break; - case 545: + case 547: /* Line 1787 of yacc.c */ -#line 2650 "conf_parser.y" +#line 2663 "conf_parser.y" { ConfigFileEntry.ping_cookie = yylval.number; } break; - case 546: + case 548: /* Line 1787 of yacc.c */ -#line 2655 "conf_parser.y" +#line 2668 "conf_parser.y" { ConfigFileEntry.disable_auth = yylval.number; } break; - case 547: + case 549: /* Line 1787 of yacc.c */ -#line 2660 "conf_parser.y" +#line 2673 "conf_parser.y" { ConfigFileEntry.throttle_time = yylval.number; } break; - case 548: + case 550: /* Line 1787 of yacc.c */ -#line 2665 "conf_parser.y" +#line 2678 "conf_parser.y" { ConfigFileEntry.oper_umodes = 0; } break; - case 552: + case 554: /* Line 1787 of yacc.c */ -#line 2671 "conf_parser.y" +#line 2684 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_BOTS; } break; - case 553: + case 555: /* Line 1787 of yacc.c */ -#line 2674 "conf_parser.y" +#line 2687 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CCONN; } break; - case 554: + case 556: /* Line 1787 of yacc.c */ -#line 2677 "conf_parser.y" +#line 2690 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_DEAF; } break; - case 555: + case 557: /* Line 1787 of yacc.c */ -#line 2680 "conf_parser.y" +#line 2693 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_DEBUG; } break; - case 556: + case 558: /* Line 1787 of yacc.c */ -#line 2683 "conf_parser.y" +#line 2696 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_FULL; } break; - case 557: + case 559: /* Line 1787 of yacc.c */ -#line 2686 "conf_parser.y" +#line 2699 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_HIDDEN; } break; - case 558: + case 560: /* Line 1787 of yacc.c */ -#line 2689 "conf_parser.y" +#line 2702 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SKILL; } break; - case 559: + case 561: /* Line 1787 of yacc.c */ -#line 2692 "conf_parser.y" +#line 2705 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_NCHANGE; } break; - case 560: + case 562: /* Line 1787 of yacc.c */ -#line 2695 "conf_parser.y" +#line 2708 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_REJ; } break; - case 561: + case 563: /* Line 1787 of yacc.c */ -#line 2698 "conf_parser.y" +#line 2711 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_UNAUTH; } break; - case 562: + case 564: /* Line 1787 of yacc.c */ -#line 2701 "conf_parser.y" +#line 2714 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SPY; } break; - case 563: + case 565: /* Line 1787 of yacc.c */ -#line 2704 "conf_parser.y" +#line 2717 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL; } break; - case 564: + case 566: /* Line 1787 of yacc.c */ -#line 2707 "conf_parser.y" +#line 2720 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_OPERWALL; } break; - case 565: + case 567: /* Line 1787 of yacc.c */ -#line 2710 "conf_parser.y" +#line 2723 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE; } break; - case 566: + case 568: /* Line 1787 of yacc.c */ -#line 2713 "conf_parser.y" +#line 2726 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE; } break; - case 567: + case 569: /* Line 1787 of yacc.c */ -#line 2716 "conf_parser.y" +#line 2729 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_WALLOP; } break; - case 568: + case 570: /* Line 1787 of yacc.c */ -#line 2719 "conf_parser.y" +#line 2732 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID; } break; - case 569: + case 571: /* Line 1787 of yacc.c */ -#line 2722 "conf_parser.y" +#line 2735 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CALLERID; } break; - case 570: + case 572: /* Line 1787 of yacc.c */ -#line 2725 "conf_parser.y" +#line 2738 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_LOCOPS; } break; - case 571: + case 573: /* Line 1787 of yacc.c */ -#line 2728 "conf_parser.y" +#line 2741 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_REGONLY; } break; - case 572: + case 574: /* Line 1787 of yacc.c */ -#line 2731 "conf_parser.y" +#line 2744 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT; } break; - case 573: + case 575: /* Line 1787 of yacc.c */ -#line 2736 "conf_parser.y" +#line 2749 "conf_parser.y" { ConfigFileEntry.oper_only_umodes = 0; } break; - case 577: + case 579: /* Line 1787 of yacc.c */ -#line 2742 "conf_parser.y" +#line 2755 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_BOTS; } break; - case 578: + case 580: /* Line 1787 of yacc.c */ -#line 2745 "conf_parser.y" +#line 2758 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CCONN; } break; - case 579: + case 581: /* Line 1787 of yacc.c */ -#line 2748 "conf_parser.y" +#line 2761 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_DEAF; } break; - case 580: + case 582: /* Line 1787 of yacc.c */ -#line 2751 "conf_parser.y" +#line 2764 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG; } break; - case 581: + case 583: /* Line 1787 of yacc.c */ -#line 2754 "conf_parser.y" +#line 2767 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_FULL; } break; - case 582: + case 584: /* Line 1787 of yacc.c */ -#line 2757 "conf_parser.y" +#line 2770 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SKILL; } break; - case 583: + case 585: /* Line 1787 of yacc.c */ -#line 2760 "conf_parser.y" +#line 2773 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN; } break; - case 584: + case 586: /* Line 1787 of yacc.c */ -#line 2763 "conf_parser.y" +#line 2776 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE; } break; - case 585: + case 587: /* Line 1787 of yacc.c */ -#line 2766 "conf_parser.y" +#line 2779 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_REJ; } break; - case 586: + case 588: /* Line 1787 of yacc.c */ -#line 2769 "conf_parser.y" +#line 2782 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH; } break; - case 587: + case 589: /* Line 1787 of yacc.c */ -#line 2772 "conf_parser.y" +#line 2785 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SPY; } break; - case 588: + case 590: /* Line 1787 of yacc.c */ -#line 2775 "conf_parser.y" +#line 2788 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL; } break; - case 589: + case 591: /* Line 1787 of yacc.c */ -#line 2778 "conf_parser.y" +#line 2791 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL; } break; - case 590: + case 592: /* Line 1787 of yacc.c */ -#line 2781 "conf_parser.y" +#line 2794 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE; } break; - case 591: + case 593: /* Line 1787 of yacc.c */ -#line 2784 "conf_parser.y" +#line 2797 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE; } break; - case 592: + case 594: /* Line 1787 of yacc.c */ -#line 2787 "conf_parser.y" +#line 2800 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP; } break; - case 593: + case 595: /* Line 1787 of yacc.c */ -#line 2790 "conf_parser.y" +#line 2803 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID; } break; - case 594: + case 596: /* Line 1787 of yacc.c */ -#line 2793 "conf_parser.y" +#line 2806 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID; } break; - case 595: + case 597: /* Line 1787 of yacc.c */ -#line 2796 "conf_parser.y" +#line 2809 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS; } break; - case 596: + case 598: /* Line 1787 of yacc.c */ -#line 2799 "conf_parser.y" +#line 2812 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY; } break; - case 597: + case 599: /* Line 1787 of yacc.c */ -#line 2802 "conf_parser.y" +#line 2815 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT; } break; - case 598: + case 600: /* Line 1787 of yacc.c */ -#line 2807 "conf_parser.y" +#line 2820 "conf_parser.y" { ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number); } break; - case 599: + case 601: /* Line 1787 of yacc.c */ -#line 2812 "conf_parser.y" +#line 2825 "conf_parser.y" { ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number); } break; - case 600: + case 602: /* Line 1787 of yacc.c */ -#line 2817 "conf_parser.y" +#line 2830 "conf_parser.y" { ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number); } break; - case 617: + case 619: /* Line 1787 of yacc.c */ -#line 2840 "conf_parser.y" +#line 2853 "conf_parser.y" { ConfigChannel.disable_fake_channels = yylval.number; } break; - case 618: + case 620: /* Line 1787 of yacc.c */ -#line 2845 "conf_parser.y" +#line 2858 "conf_parser.y" { ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number); } break; - case 619: + case 621: /* Line 1787 of yacc.c */ -#line 2850 "conf_parser.y" +#line 2863 "conf_parser.y" { ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number); } break; - case 620: + case 622: /* Line 1787 of yacc.c */ -#line 2855 "conf_parser.y" +#line 2868 "conf_parser.y" { ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number); } break; - case 621: + case 623: /* Line 1787 of yacc.c */ -#line 2860 "conf_parser.y" +#line 2873 "conf_parser.y" { ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number); } break; - case 622: + case 624: /* Line 1787 of yacc.c */ -#line 2865 "conf_parser.y" +#line 2878 "conf_parser.y" { ConfigChannel.max_bans = (yyvsp[(3) - (4)].number); } break; - case 623: + case 625: /* Line 1787 of yacc.c */ -#line 2870 "conf_parser.y" +#line 2883 "conf_parser.y" { ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number); } break; - case 624: + case 626: /* Line 1787 of yacc.c */ -#line 2875 "conf_parser.y" +#line 2888 "conf_parser.y" { ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number); } break; - case 625: + case 627: /* Line 1787 of yacc.c */ -#line 2880 "conf_parser.y" +#line 2893 "conf_parser.y" { ConfigChannel.no_create_on_split = yylval.number; } break; - case 626: + case 628: /* Line 1787 of yacc.c */ -#line 2885 "conf_parser.y" +#line 2898 "conf_parser.y" { ConfigChannel.no_join_on_split = yylval.number; } break; - case 627: + case 629: /* Line 1787 of yacc.c */ -#line 2890 "conf_parser.y" +#line 2903 "conf_parser.y" { GlobalSetOptions.joinfloodcount = yylval.number; } break; - case 628: + case 630: /* Line 1787 of yacc.c */ -#line 2895 "conf_parser.y" +#line 2908 "conf_parser.y" { GlobalSetOptions.joinfloodtime = yylval.number; } break; - case 641: + case 643: /* Line 1787 of yacc.c */ -#line 2915 "conf_parser.y" +#line 2928 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.flatten_links = yylval.number; } break; - case 642: + case 644: /* Line 1787 of yacc.c */ -#line 2921 "conf_parser.y" +#line 2934 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.disable_remote_commands = yylval.number; } break; - case 643: + case 645: /* Line 1787 of yacc.c */ -#line 2927 "conf_parser.y" +#line 2940 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_servers = yylval.number; } break; - case 644: + case 646: /* Line 1787 of yacc.c */ -#line 2933 "conf_parser.y" +#line 2946 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_services = yylval.number; } break; - case 645: + case 647: /* Line 1787 of yacc.c */ -#line 2939 "conf_parser.y" +#line 2952 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6779,9 +6808,9 @@ yyreduce: } break; - case 646: + case 648: /* Line 1787 of yacc.c */ -#line 2948 "conf_parser.y" +#line 2961 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6796,18 +6825,18 @@ yyreduce: } break; - case 647: + case 649: /* Line 1787 of yacc.c */ -#line 2962 "conf_parser.y" +#line 2975 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hidden = yylval.number; } break; - case 648: + case 650: /* Line 1787 of yacc.c */ -#line 2968 "conf_parser.y" +#line 2981 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_server_ips = yylval.number; @@ -6816,7 +6845,7 @@ yyreduce: /* Line 1787 of yacc.c */ -#line 6820 "conf_parser.c" +#line 6849 "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 eddc7f8..278bc02 100644 --- a/src/conf_parser.h +++ b/src/conf_parser.h @@ -194,79 +194,80 @@ extern int yydebug; SQUIT = 403, SSL_CERTIFICATE_FILE = 404, SSL_CERTIFICATE_FINGERPRINT = 405, - SSL_DH_PARAM_FILE = 406, - STATS_E_DISABLED = 407, - STATS_I_OPER_ONLY = 408, - STATS_K_OPER_ONLY = 409, - STATS_O_OPER_ONLY = 410, - STATS_P_OPER_ONLY = 411, - T_ALL = 412, - T_BOTS = 413, - T_CALLERID = 414, - T_CCONN = 415, - T_CLUSTER = 416, - T_DEAF = 417, - T_DEBUG = 418, - T_DLINE = 419, - T_EXTERNAL = 420, - T_FARCONNECT = 421, - T_FILE = 422, - T_FULL = 423, - T_GLOBOPS = 424, - T_INVISIBLE = 425, - T_IPV4 = 426, - T_IPV6 = 427, - T_LOCOPS = 428, - T_LOG = 429, - T_MAX_CLIENTS = 430, - T_NCHANGE = 431, - T_NONONREG = 432, - T_OPERWALL = 433, - T_RECVQ = 434, - T_REJ = 435, - T_RESTART = 436, - T_SERVER = 437, - T_SERVICE = 438, - T_SERVICES_NAME = 439, - T_SERVNOTICE = 440, - T_SET = 441, - T_SHARED = 442, - T_SIZE = 443, - T_SKILL = 444, - T_SOFTCALLERID = 445, - T_SPY = 446, - T_SSL = 447, - T_SSL_CIPHER_LIST = 448, - T_SSL_CLIENT_METHOD = 449, - T_SSL_SERVER_METHOD = 450, - T_SSLV3 = 451, - T_TLSV1 = 452, - T_UMODES = 453, - T_UNAUTH = 454, - T_UNDLINE = 455, - T_UNLIMITED = 456, - T_UNRESV = 457, - T_UNXLINE = 458, - T_WALLOP = 459, - T_WALLOPS = 460, - T_WEBIRC = 461, - TBOOL = 462, - THROTTLE_TIME = 463, - TKLINE_EXPIRE_NOTICES = 464, - TMASKED = 465, - TRUE_NO_OPER_FLOOD = 466, - TS_MAX_DELTA = 467, - TS_WARN_DELTA = 468, - TWODOTS = 469, - TYPE = 470, - UNKLINE = 471, - USE_EGD = 472, - USE_LOGGING = 473, - USER = 474, - VHOST = 475, - VHOST6 = 476, - WARN_NO_NLINE = 477, - XLINE = 478 + SSL_CONNECTION_REQUIRED = 406, + SSL_DH_PARAM_FILE = 407, + STATS_E_DISABLED = 408, + STATS_I_OPER_ONLY = 409, + STATS_K_OPER_ONLY = 410, + STATS_O_OPER_ONLY = 411, + STATS_P_OPER_ONLY = 412, + T_ALL = 413, + T_BOTS = 414, + T_CALLERID = 415, + T_CCONN = 416, + T_CLUSTER = 417, + T_DEAF = 418, + T_DEBUG = 419, + T_DLINE = 420, + T_EXTERNAL = 421, + T_FARCONNECT = 422, + T_FILE = 423, + T_FULL = 424, + T_GLOBOPS = 425, + T_INVISIBLE = 426, + T_IPV4 = 427, + T_IPV6 = 428, + T_LOCOPS = 429, + T_LOG = 430, + T_MAX_CLIENTS = 431, + T_NCHANGE = 432, + T_NONONREG = 433, + T_OPERWALL = 434, + T_RECVQ = 435, + T_REJ = 436, + T_RESTART = 437, + T_SERVER = 438, + T_SERVICE = 439, + T_SERVICES_NAME = 440, + T_SERVNOTICE = 441, + T_SET = 442, + T_SHARED = 443, + T_SIZE = 444, + T_SKILL = 445, + T_SOFTCALLERID = 446, + T_SPY = 447, + T_SSL = 448, + T_SSL_CIPHER_LIST = 449, + T_SSL_CLIENT_METHOD = 450, + T_SSL_SERVER_METHOD = 451, + T_SSLV3 = 452, + T_TLSV1 = 453, + T_UMODES = 454, + T_UNAUTH = 455, + T_UNDLINE = 456, + T_UNLIMITED = 457, + T_UNRESV = 458, + T_UNXLINE = 459, + T_WALLOP = 460, + T_WALLOPS = 461, + T_WEBIRC = 462, + TBOOL = 463, + THROTTLE_TIME = 464, + TKLINE_EXPIRE_NOTICES = 465, + TMASKED = 466, + TRUE_NO_OPER_FLOOD = 467, + TS_MAX_DELTA = 468, + TS_WARN_DELTA = 469, + TWODOTS = 470, + TYPE = 471, + UNKLINE = 472, + USE_EGD = 473, + USE_LOGGING = 474, + USER = 475, + VHOST = 476, + VHOST6 = 477, + WARN_NO_NLINE = 478, + XLINE = 479 }; #endif /* Tokens. */ @@ -418,79 +419,80 @@ extern int yydebug; #define SQUIT 403 #define SSL_CERTIFICATE_FILE 404 #define SSL_CERTIFICATE_FINGERPRINT 405 -#define SSL_DH_PARAM_FILE 406 -#define STATS_E_DISABLED 407 -#define STATS_I_OPER_ONLY 408 -#define STATS_K_OPER_ONLY 409 -#define STATS_O_OPER_ONLY 410 -#define STATS_P_OPER_ONLY 411 -#define T_ALL 412 -#define T_BOTS 413 -#define T_CALLERID 414 -#define T_CCONN 415 -#define T_CLUSTER 416 -#define T_DEAF 417 -#define T_DEBUG 418 -#define T_DLINE 419 -#define T_EXTERNAL 420 -#define T_FARCONNECT 421 -#define T_FILE 422 -#define T_FULL 423 -#define T_GLOBOPS 424 -#define T_INVISIBLE 425 -#define T_IPV4 426 -#define T_IPV6 427 -#define T_LOCOPS 428 -#define T_LOG 429 -#define T_MAX_CLIENTS 430 -#define T_NCHANGE 431 -#define T_NONONREG 432 -#define T_OPERWALL 433 -#define T_RECVQ 434 -#define T_REJ 435 -#define T_RESTART 436 -#define T_SERVER 437 -#define T_SERVICE 438 -#define T_SERVICES_NAME 439 -#define T_SERVNOTICE 440 -#define T_SET 441 -#define T_SHARED 442 -#define T_SIZE 443 -#define T_SKILL 444 -#define T_SOFTCALLERID 445 -#define T_SPY 446 -#define T_SSL 447 -#define T_SSL_CIPHER_LIST 448 -#define T_SSL_CLIENT_METHOD 449 -#define T_SSL_SERVER_METHOD 450 -#define T_SSLV3 451 -#define T_TLSV1 452 -#define T_UMODES 453 -#define T_UNAUTH 454 -#define T_UNDLINE 455 -#define T_UNLIMITED 456 -#define T_UNRESV 457 -#define T_UNXLINE 458 -#define T_WALLOP 459 -#define T_WALLOPS 460 -#define T_WEBIRC 461 -#define TBOOL 462 -#define THROTTLE_TIME 463 -#define TKLINE_EXPIRE_NOTICES 464 -#define TMASKED 465 -#define TRUE_NO_OPER_FLOOD 466 -#define TS_MAX_DELTA 467 -#define TS_WARN_DELTA 468 -#define TWODOTS 469 -#define TYPE 470 -#define UNKLINE 471 -#define USE_EGD 472 -#define USE_LOGGING 473 -#define USER 474 -#define VHOST 475 -#define VHOST6 476 -#define WARN_NO_NLINE 477 -#define XLINE 478 +#define SSL_CONNECTION_REQUIRED 406 +#define SSL_DH_PARAM_FILE 407 +#define STATS_E_DISABLED 408 +#define STATS_I_OPER_ONLY 409 +#define STATS_K_OPER_ONLY 410 +#define STATS_O_OPER_ONLY 411 +#define STATS_P_OPER_ONLY 412 +#define T_ALL 413 +#define T_BOTS 414 +#define T_CALLERID 415 +#define T_CCONN 416 +#define T_CLUSTER 417 +#define T_DEAF 418 +#define T_DEBUG 419 +#define T_DLINE 420 +#define T_EXTERNAL 421 +#define T_FARCONNECT 422 +#define T_FILE 423 +#define T_FULL 424 +#define T_GLOBOPS 425 +#define T_INVISIBLE 426 +#define T_IPV4 427 +#define T_IPV6 428 +#define T_LOCOPS 429 +#define T_LOG 430 +#define T_MAX_CLIENTS 431 +#define T_NCHANGE 432 +#define T_NONONREG 433 +#define T_OPERWALL 434 +#define T_RECVQ 435 +#define T_REJ 436 +#define T_RESTART 437 +#define T_SERVER 438 +#define T_SERVICE 439 +#define T_SERVICES_NAME 440 +#define T_SERVNOTICE 441 +#define T_SET 442 +#define T_SHARED 443 +#define T_SIZE 444 +#define T_SKILL 445 +#define T_SOFTCALLERID 446 +#define T_SPY 447 +#define T_SSL 448 +#define T_SSL_CIPHER_LIST 449 +#define T_SSL_CLIENT_METHOD 450 +#define T_SSL_SERVER_METHOD 451 +#define T_SSLV3 452 +#define T_TLSV1 453 +#define T_UMODES 454 +#define T_UNAUTH 455 +#define T_UNDLINE 456 +#define T_UNLIMITED 457 +#define T_UNRESV 458 +#define T_UNXLINE 459 +#define T_WALLOP 460 +#define T_WALLOPS 461 +#define T_WEBIRC 462 +#define TBOOL 463 +#define THROTTLE_TIME 464 +#define TKLINE_EXPIRE_NOTICES 465 +#define TMASKED 466 +#define TRUE_NO_OPER_FLOOD 467 +#define TS_MAX_DELTA 468 +#define TS_WARN_DELTA 469 +#define TWODOTS 470 +#define TYPE 471 +#define UNKLINE 472 +#define USE_EGD 473 +#define USE_LOGGING 474 +#define USER 475 +#define VHOST 476 +#define VHOST6 477 +#define WARN_NO_NLINE 478 +#define XLINE 479 @@ -505,7 +507,7 @@ typedef union YYSTYPE /* Line 2053 of yacc.c */ -#line 509 "conf_parser.h" +#line 511 "conf_parser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/src/conf_parser.y b/src/conf_parser.y index 47b7f28..128696a 100644 --- a/src/conf_parser.y +++ b/src/conf_parser.y @@ -282,6 +282,7 @@ reset_block_state(void) %token SQUIT %token SSL_CERTIFICATE_FILE %token SSL_CERTIFICATE_FINGERPRINT +%token SSL_CONNECTION_REQUIRED %token SSL_DH_PARAM_FILE %token STATS_E_DISABLED %token STATS_I_OPER_ONLY @@ -1087,6 +1088,7 @@ oper_items: oper_items oper_item | oper_item; oper_item: oper_name | oper_user | oper_password | oper_umodes | oper_class | oper_encrypted | oper_rsa_public_key_file | oper_ssl_certificate_fingerprint | + oper_ssl_connection_required | oper_flags | error ';' ; oper_name: NAME '=' QSTRING ';' @@ -1130,6 +1132,17 @@ oper_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';' strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf)); }; +oper_ssl_connection_required: SSL_CONNECTION_REQUIRED '=' TBOOL ';' +{ + if (conf_parser_ctx.pass != 2) + break; + + if (yylval.number) + block_state.flags.value |= CONF_FLAGS_SSL; + else + block_state.flags.value &= ~CONF_FLAGS_SSL; +}; + oper_class: CLASS '=' QSTRING ';' { if (conf_parser_ctx.pass == 2) |