diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-04-27 21:15:59 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-04-27 21:15:59 +0000 |
| commit | 7c014db8bfaec4acc71528aa32885e4c715f3c45 (patch) | |
| tree | 6abef77c1e6f16570c62976b20cc7228c9035643 /src | |
| parent | 6d0cdc16113bfa699073fbf4f137f7e52d3b3cfd (diff) | |
- Removed operflag 'nick_changes'. Operators can now set +n at will
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@1903 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf.c | 1 | ||||
| -rw-r--r-- | src/conf_lexer.c | 2206 | ||||
| -rw-r--r-- | src/conf_lexer.l | 1 | ||||
| -rw-r--r-- | src/conf_parser.c | 3623 | ||||
| -rw-r--r-- | src/conf_parser.h | 492 | ||||
| -rw-r--r-- | src/conf_parser.y | 5 | ||||
| -rw-r--r-- | src/s_user.c | 9 |
7 files changed, 3139 insertions, 3198 deletions
@@ -1667,7 +1667,6 @@ static const struct oper_privs { OPER_FLAG_REHASH, 'H' }, { OPER_FLAG_K, 'K' }, { OPER_FLAG_OPERWALL, 'L' }, - { OPER_FLAG_N, 'N' }, { OPER_FLAG_GLOBAL_KILL, 'O' }, { OPER_FLAG_REMOTE, 'R' }, { OPER_FLAG_OPER_SPY, 'S' }, diff --git a/src/conf_lexer.c b/src/conf_lexer.c index a558707..ce492c8 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 249 -#define YY_END_OF_BUFFER 250 +#define YY_NUM_RULES 248 +#define YY_END_OF_BUFFER 249 /* 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[1583] = +static yyconst flex_int16_t yy_accept[1575] = { 0, - 4, 4, 250, 248, 4, 3, 248, 5, 248, 248, - 6, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 4, 3, 0, 7, - 5, 247, 0, 2, 5, 6, 0, 0, 0, 0, + 4, 4, 249, 247, 4, 3, 247, 5, 247, 247, + 6, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 4, 3, 0, 7, + 5, 246, 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, 70, 0, 241, 0, 0, 0, 0, 0, 0, - 0, 246, 0, 0, 0, 0, 0, 0, 0, 102, + 0, 70, 0, 240, 0, 0, 0, 0, 0, 0, + 0, 245, 0, 0, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 228, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 227, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, @@ -398,157 +398,156 @@ static yyconst flex_int16_t yy_accept[1583] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, - 0, 0, 0, 0, 0, 0, 149, 0, 0, 152, - 0, 0, 0, 0, 212, 134, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 209, + 0, 0, 0, 0, 0, 0, 148, 0, 0, 151, + 0, 0, 0, 0, 211, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 171, 0, - 0, 0, 0, 0, 13, 0, 202, 236, 0, 0, - 0, 0, 0, 0, 0, 0, 227, 205, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 170, 0, + 0, 0, 0, 0, 13, 0, 201, 235, 0, 0, + 0, 0, 0, 0, 0, 0, 226, 204, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 41, 0, 0, 207, 0, 0, 0, 0, + 0, 0, 41, 0, 0, 206, 0, 0, 0, 0, - 0, 0, 0, 65, 230, 0, 0, 0, 71, 72, + 0, 0, 0, 65, 229, 0, 0, 0, 71, 72, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 96, 0, - 0, 0, 100, 0, 0, 0, 0, 0, 0, 110, - 0, 0, 196, 0, 117, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 130, 0, 0, 0, 0, - 0, 0, 153, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 157, 0, 0, 0, 0, - 0, 0, 0, 166, 0, 0, 0, 0, 0, 226, - 0, 222, 0, 0, 9, 0, 0, 0, 235, 0, - - 0, 203, 0, 0, 21, 0, 0, 206, 0, 0, + 0, 0, 100, 0, 0, 0, 0, 0, 0, 109, + 0, 0, 195, 0, 116, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 129, 0, 0, 0, 0, + 0, 0, 152, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 156, 0, 0, 0, 0, + 0, 0, 0, 165, 0, 0, 0, 0, 0, 225, + 0, 221, 0, 0, 9, 0, 0, 0, 234, 0, + + 0, 202, 0, 0, 21, 0, 0, 205, 0, 0, 0, 34, 0, 0, 37, 0, 0, 0, 0, 0, 42, 0, 44, 0, 46, 0, 0, 0, 0, 0, - 0, 229, 0, 0, 0, 0, 240, 0, 0, 77, + 0, 228, 0, 0, 0, 0, 239, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 245, 0, 0, 0, 0, - 0, 224, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 244, 0, 0, 0, 0, + 0, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 122, 0, 125, 0, 0, 0, 0, - 0, 0, 143, 0, 0, 0, 0, 0, 0, 208, + 0, 0, 121, 0, 124, 0, 0, 0, 0, 0, + 0, 142, 0, 0, 0, 0, 0, 0, 207, 0, - 0, 154, 140, 0, 0, 0, 0, 0, 0, 141, + 153, 139, 0, 0, 0, 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 167, 0, 0, 0, 225, 170, 221, 0, - 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 58, 0, 0, 0, 0, 0, 0, 239, 0, 0, - 0, 0, 0, 0, 80, 220, 83, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 244, - 0, 232, 0, 0, 195, 223, 0, 0, 0, 0, + 0, 166, 0, 0, 0, 224, 169, 220, 0, 0, + 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, + 0, 0, 0, 0, 0, 0, 238, 0, 0, 0, + 0, 0, 0, 80, 219, 83, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 243, 0, + 231, 0, 0, 194, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 113, 0, 0, 0, 0, 0, - 0, 121, 0, 0, 126, 127, 0, 0, 0, 0, - 234, 0, 144, 0, 0, 150, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 159, 211, 0, 0, 0, 199, 0, 0, 0, 168, - 217, 0, 169, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 18, 0, 22, 23, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 45, 0, 0, - 0, 0, 0, 53, 0, 0, 0, 0, 0, 0, + 0, 0, 112, 0, 0, 0, 0, 0, 0, 120, + 0, 0, 125, 126, 0, 0, 0, 0, 233, 0, + 143, 0, 0, 149, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 158, 210, + 0, 0, 0, 198, 0, 0, 0, 167, 216, 0, + 168, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 18, 0, 22, 23, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 45, 0, 0, 0, 0, + 0, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 231, 0, 0, 194, 209, 0, + 0, 0, 230, 0, 0, 193, 208, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 129, 0, 0, 0, 233, - 0, 0, 0, 147, 0, 0, 0, 0, 0, 0, + 0, 0, 128, 0, 0, 0, 232, 0, 0, 0, + 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 161, 160, 0, 198, 163, 0, 0, - 0, 0, 0, 0, 0, 14, 218, 0, 0, 0, + 160, 159, 0, 197, 162, 0, 0, 0, 0, 0, + 0, 0, 14, 217, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 213, + 0, 0, 0, 0, 0, 0, 212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 67, 0, 0, 0, 0, 238, - 0, 0, 0, 0, 0, 193, 0, 0, 0, 0, - 86, 0, 0, 0, 0, 0, 0, 243, 87, 0, - 0, 0, 0, 0, 107, 0, 0, 0, 106, 0, - 112, 0, 214, 0, 0, 0, 0, 114, 0, 0, + 0, 67, 0, 0, 0, 0, 237, 0, 0, 0, + 0, 0, 192, 0, 0, 0, 0, 86, 0, 0, + 0, 0, 0, 0, 242, 87, 0, 0, 0, 0, + 106, 0, 0, 0, 105, 0, 111, 0, 213, 0, + 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 215, 0, + 0, 236, 0, 0, 79, 0, 0, 0, 0, 0, + 85, 88, 0, 0, 0, 0, 93, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, + 0, 188, 0, 115, 0, 0, 0, 122, 123, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 216, 0, 0, 237, 0, 0, 79, 0, - 0, 0, 0, 0, 85, 88, 0, 0, 0, 0, - 93, 242, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 189, 0, 116, 0, - 0, 0, 123, 124, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 161, 0, 0, 0, + 1, 0, 1, 0, 0, 0, 0, 0, 203, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 162, 0, 0, 0, 1, 0, 1, 0, 0, - 0, 0, 0, 204, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 173, 0, 0, - 89, 0, 0, 0, 90, 0, 0, 0, 56, 0, + 0, 0, 172, 0, 0, 89, 0, 0, 0, 90, + 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 117, 0, 0, + 0, 0, 0, 0, 144, 145, 0, 214, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 118, 0, 0, 0, 0, 0, 0, - 145, 146, 0, 215, 151, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 24, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 24, 0, 0, 29, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 54, 0, 59, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, - 182, 0, 84, 0, 0, 0, 197, 0, 0, 0, + 0, 54, 0, 59, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 190, 181, 0, 84, 0, 0, 0, + 196, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 200, 0, 114, 0, 119, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 201, 0, 115, 0, 120, 131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 164, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, - 0, 36, 39, 0, 0, 0, 47, 48, 0, 0, - 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, - 0, 78, 0, 0, 0, 0, 0, 0, 0, 0, - 98, 99, 101, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 119, 0, 0, 0, 0, 219, 155, 0, + 163, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 31, 0, 0, 0, 36, 39, 0, 0, 0, 47, + 48, 0, 0, 0, 0, 62, 0, 0, 0, 0, + 0, 0, 0, 0, 78, 0, 0, 0, 0, 0, + 0, 0, 0, 98, 99, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 118, 0, 0, 0, 0, 218, + 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 179, 0, 0, 0, 10, 0, + 0, 0, 0, 0, 0, 0, 0, 35, 0, 43, + 0, 0, 0, 0, 0, 0, 63, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 176, 0, 0, + + 97, 0, 0, 104, 0, 108, 0, 0, 0, 0, + 0, 0, 141, 147, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 164, 0, 0, 180, 182, 0, + 0, 0, 16, 0, 0, 0, 0, 0, 0, 49, + 51, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 180, 0, 0, 0, 10, 0, 0, 0, - 0, 0, 0, 0, 0, 35, 0, 43, 0, 0, - 0, 0, 0, 0, 63, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 177, 0, 0, 97, 0, - 0, 105, 0, 109, 0, 0, 0, 0, 0, 0, - 142, 148, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 165, 0, 0, 181, 183, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 49, 51, 0, - 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, + 0, 0, 110, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 8, 177, + 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, + 0, 0, 61, 68, 0, 0, 74, 0, 0, 0, + + 0, 0, 91, 0, 94, 0, 0, 107, 0, 0, + 0, 0, 0, 0, 138, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 19, 20, 0, 0, + 0, 0, 0, 0, 0, 57, 0, 0, 73, 0, + 0, 0, 0, 173, 92, 0, 0, 103, 0, 199, + 189, 0, 0, 0, 0, 0, 0, 183, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 8, 178, 0, 0, - 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, - - 61, 68, 0, 0, 74, 0, 0, 0, 0, 0, - 91, 0, 94, 0, 0, 108, 0, 0, 0, 0, - 0, 0, 139, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 20, 0, 0, 0, 0, - 0, 0, 0, 57, 0, 0, 73, 0, 0, 0, - 0, 174, 92, 0, 0, 104, 0, 200, 190, 0, - 0, 0, 0, 0, 0, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 136, 138, 137, 187, 186, 185, 188, 0, - - 0, 0, 25, 0, 0, 0, 0, 172, 0, 0, - 0, 0, 0, 175, 176, 0, 103, 0, 0, 0, - 0, 0, 158, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 192, 0, 0, 0, 133, 0, 0, 0, - 0, 0, 0, 0, 0, 60, 69, 0, 0, 0, - 132, 135, 0, 0, 0, 0, 32, 0, 0, 76, - 0, 17, 156, 0, 0, 0, 0, 50, 95, 0, - 0, 0, 33, 0, 0, 27, 0, 0, 0, 26, - 179, 0 + 0, 0, 0, 0, 135, 137, 136, 186, 185, 184, + 187, 0, 0, 0, 25, 0, 0, 0, 0, 171, + + 0, 0, 0, 0, 0, 174, 175, 0, 102, 0, + 0, 0, 0, 0, 157, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 191, 0, 0, 0, 132, 0, + 0, 0, 0, 0, 0, 0, 0, 60, 69, 0, + 0, 0, 131, 134, 0, 0, 0, 0, 32, 0, + 0, 76, 0, 17, 155, 0, 0, 0, 0, 50, + 95, 0, 0, 0, 33, 0, 0, 27, 0, 0, + 0, 26, 178, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -594,13 +593,13 @@ static yyconst flex_int32_t yy_meta[69] = 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[1588] = +static yyconst flex_int16_t yy_base[1580] = { 0, - 0, 0, 3034, 3035, 3031, 0, 66, 0, 64, 66, + 0, 0, 3019, 3020, 3016, 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, 3015, 0, 86, 3020, + 0, 3020, 170, 3020, 0, 220, 191, 188, 188, 198, 200, 202, 203, 204, 220, 223, 240, 239, 245, 231, 227, 276, 278, 244, 237, 254, 261, 271, 308, 287, 288, 305, 300, 329, 335, 298, 332, 330, 335, 331, @@ -609,348 +608,346 @@ static yyconst flex_int16_t yy_base[1588] = 387, 397, 416, 389, 386, 433, 392, 469, 409, 471, 438, 434, 412, 422, 429, 428, 450, 438, 445, 440, - 447, 2989, 459, 475, 518, 488, 479, 493, 505, 487, - 507, 495, 508, 505, 499, 3035, 518, 535, 509, 526, - 521, 2988, 525, 530, 527, 528, 529, 538, 540, 555, - 541, 563, 540, 564, 3035, 567, 559, 557, 562, 571, + 447, 2974, 459, 475, 518, 488, 479, 493, 505, 487, + 507, 495, 508, 505, 499, 3020, 518, 535, 509, 526, + 521, 2973, 525, 530, 527, 528, 529, 538, 540, 555, + 541, 563, 540, 564, 3020, 567, 559, 557, 562, 571, 563, 577, 570, 579, 573, 582, 586, 578, 581, 592, - 584, 597, 596, 611, 582, 586, 2987, 598, 609, 137, - 605, 601, 615, 608, 629, 628, 624, 616, 622, 3035, - 627, 2986, 619, 640, 623, 626, 631, 647, 652, 651, + 584, 597, 596, 611, 582, 586, 2972, 598, 609, 137, + 605, 601, 615, 608, 629, 628, 624, 616, 622, 3020, + 627, 2971, 619, 640, 623, 626, 631, 647, 652, 651, 633, 647, 645, 666, 665, 652, 667, 654, 667, 670, - 664, 670, 684, 686, 672, 670, 684, 690, 697, 3035, - 686, 685, 2985, 691, 705, 688, 3035, 694, 696, 3035, - 716, 711, 704, 711, 3035, 708, 707, 714, 722, 716, + 664, 670, 684, 686, 672, 670, 684, 690, 697, 3020, + 686, 685, 2970, 691, 705, 688, 3020, 694, 696, 3020, + 716, 711, 704, 711, 3020, 708, 707, 714, 722, 716, 735, 729, 738, 740, 724, 734, 735, 740, 750, 747, - 748, 741, 749, 748, 754, 753, 754, 759, 3035, 766, - 764, 767, 767, 2984, 3035, 781, 3035, 766, 787, 788, - 782, 783, 2983, 779, 779, 795, 3035, 3035, 794, 781, - 3035, 785, 804, 804, 2982, 798, 802, 790, 811, 801, - 800, 815, 3035, 803, 811, 3035, 813, 816, 830, 836, - - 825, 833, 2981, 3035, 827, 835, 832, 834, 3035, 3035, - 2980, 849, 2979, 853, 851, 846, 2978, 841, 858, 851, - 863, 895, 867, 872, 856, 891, 867, 877, 3035, 872, - 2977, 874, 2976, 878, 875, 893, 894, 902, 909, 920, - 2975, 894, 3035, 2974, 3035, 921, 906, 913, 915, 916, - 922, 922, 931, 931, 951, 2973, 938, 942, 941, 960, - 954, 941, 3035, 950, 960, 958, 3003, 968, 956, 956, - 966, 3003, 2970, 981, 983, 3035, 988, 974, 986, 988, - 987, 985, 996, 3035, 1001, 988, 995, 2969, 994, 996, - 1011, 998, 997, 999, 1014, 1020, 1015, 1011, 3035, 1010, - - 1018, 2968, 1031, 1036, 3035, 1036, 1044, 3035, 1036, 1040, - 1039, 3035, 1045, 1043, 3035, 1043, 1056, 1042, 1050, 1062, - 3035, 1062, 3035, 1068, 2967, 1058, 1055, 1052, 1064, 1063, - 1071, 3035, 1078, 1077, 1074, 1078, 1069, 1089, 1070, 2966, - 2965, 1088, 2964, 1088, 1084, 1101, 1105, 1111, 1106, 1101, + 748, 741, 749, 748, 754, 753, 754, 759, 3020, 766, + 764, 767, 767, 2969, 3020, 781, 3020, 766, 787, 788, + 782, 783, 2968, 779, 779, 795, 3020, 3020, 794, 781, + 3020, 785, 804, 804, 2967, 798, 802, 790, 811, 801, + 800, 815, 3020, 803, 811, 3020, 813, 816, 830, 836, + + 825, 833, 2966, 3020, 827, 835, 832, 834, 3020, 3020, + 2965, 849, 2964, 853, 851, 846, 2963, 841, 858, 851, + 863, 895, 867, 872, 856, 891, 867, 877, 3020, 872, + 2962, 874, 3020, 878, 875, 893, 894, 902, 909, 920, + 2961, 894, 3020, 2960, 3020, 921, 906, 913, 915, 916, + 922, 922, 931, 931, 951, 2959, 938, 942, 941, 960, + 954, 941, 3020, 950, 960, 958, 2989, 968, 956, 956, + 966, 2989, 2956, 981, 983, 3020, 988, 974, 986, 988, + 987, 985, 996, 3020, 1001, 988, 995, 2955, 994, 996, + 1011, 998, 997, 999, 1014, 1020, 1015, 1011, 3020, 1010, + + 1018, 2954, 1031, 1036, 3020, 1036, 1044, 3020, 1036, 1040, + 1039, 3020, 1045, 1043, 3020, 1043, 1056, 1042, 1050, 1062, + 3020, 1062, 3020, 1068, 2953, 1058, 1055, 1052, 1064, 1063, + 1071, 3020, 1078, 1077, 1074, 1078, 1069, 1089, 1070, 2952, + 2951, 1088, 2950, 1088, 1084, 1101, 1105, 1111, 1106, 1101, 1112, 1105, 1112, 1122, 1123, 1106, 1101, 1122, 1127, 1119, - 1131, 1119, 1135, 1140, 1126, 1143, 1137, 1152, 1150, 1157, - 1154, 1149, 1148, 2963, 1169, 1159, 1149, 1173, 1176, 1164, - 2962, 1168, 1171, 3035, 1171, 3035, 1183, 1187, 1180, 1195, - 1192, 1199, 3035, 1193, 1193, 1213, 1205, 1217, 2961, 3035, - - 1221, 2960, 3035, 1219, 1218, 1224, 2959, 1212, 1228, 3035, - 1220, 1211, 1221, 1222, 1234, 1230, 1231, 1237, 1228, 1238, - 1247, 1242, 2987, 1247, 1250, 1262, 3035, 3035, 3035, 1263, - 2957, 1251, 3035, 1265, 1259, 1262, 1269, 1265, 1276, 1271, - 1276, 1268, 1267, 1268, 1273, 1288, 1281, 1286, 1279, 2956, - 3035, 1299, 2955, 1290, 1294, 1319, 2954, 1289, 2953, 1307, - 2952, 1313, 1313, 1300, 2951, 1319, 1316, 3035, 1322, 1314, - 1331, 1335, 1339, 1337, 3035, 3035, 3035, 1339, 1329, 1346, - 1340, 1337, 1348, 1351, 1355, 1349, 1347, 1355, 1352, 3035, - 1353, 1356, 1365, 1364, 1363, 3035, 1378, 1380, 1385, 1377, - - 1382, 1386, 1392, 1380, 1377, 1392, 2950, 1382, 1399, 1391, - 1392, 1406, 1395, 1411, 3035, 1396, 1401, 1410, 1405, 1411, - 2949, 3035, 1412, 1424, 3035, 1429, 1412, 1412, 1428, 1436, - 1421, 1441, 1436, 1442, 1428, 3035, 1436, 1438, 1437, 1437, - 1441, 1451, 2948, 1443, 1474, 1454, 2947, 1453, 2946, 1456, - 3035, 3035, 1468, 1475, 1461, 3035, 1481, 1487, 1485, 3035, - 3035, 1479, 3035, 1491, 1482, 1479, 1498, 1501, 1489, 1500, - 1496, 1494, 1490, 3035, 1494, 3035, 1509, 2945, 1500, 2944, - 2943, 2942, 1517, 1512, 1515, 1518, 2941, 3035, 1513, 1521, - 1528, 1534, 1529, 3035, 1525, 1539, 1532, 1536, 1532, 1537, - - 1542, 1553, 1544, 1542, 1557, 1554, 1539, 1560, 1549, 1564, - 1569, 1557, 1564, 1576, 1585, 1574, 1584, 1590, 1582, 1592, - 1590, 1589, 1596, 1595, 3035, 1597, 1581, 3035, 3035, 1601, - 1588, 2940, 1608, 1603, 1591, 2939, 2938, 1607, 1597, 1599, - 1594, 1610, 1611, 1609, 1615, 1623, 1631, 1626, 1629, 1634, - 1631, 1638, 1630, 1633, 1651, 3035, 1648, 1632, 1644, 3035, - 1639, 1651, 1647, 1644, 1655, 1650, 1654, 1652, 1651, 1665, - 1671, 1661, 1660, 2937, 2936, 2935, 2934, 2933, 1679, 1681, - 2932, 1685, 2931, 3035, 3035, 1690, 3035, 3035, 1689, 2930, - 90, 1696, 1681, 1690, 1689, 3035, 3035, 1701, 1702, 1695, - - 1696, 1692, 1706, 1705, 1730, 1706, 1701, 1714, 1710, 3035, - 1704, 1715, 1712, 1737, 1735, 1729, 1732, 1741, 1746, 1739, - 1754, 1751, 1737, 1745, 3035, 1746, 1757, 1749, 1747, 1749, - 1764, 1759, 1761, 1761, 1758, 3035, 1760, 1767, 1783, 1765, - 3035, 1778, 2929, 1787, 1789, 1794, 1794, 1784, 3035, 1795, - 1791, 1788, 1806, 1795, 3035, 1808, 1799, 1809, 3035, 1811, - 3035, 1802, 3035, 1797, 1804, 1821, 1806, 3035, 1816, 1823, - 1819, 2928, 1831, 1818, 1817, 1830, 1833, 1847, 1842, 1837, - 1853, 1852, 2927, 1856, 1841, 1858, 1844, 1858, 1863, 1855, - 1869, 1867, 1870, 1861, 1862, 1864, 1865, 2926, 1857, 1867, - - 1882, 1885, 1888, 1884, 1884, 1913, 2963, 2951, 1886, 1909, - 2923, 2922, 2921, 3035, 1899, 1908, 1910, 1905, 1902, 1906, - 1901, 1922, 1919, 1922, 1926, 3035, 1915, 1924, 1921, 1930, - 1931, 1921, 2920, 1914, 1924, 1938, 1921, 1930, 2919, 1960, - 1940, 1940, 2918, 1948, 1954, 3035, 1951, 1966, 3035, 1970, - 1952, 2917, 1955, 1964, 3035, 3035, 1975, 1959, 1960, 2916, - 3035, 3035, 1969, 1962, 1960, 1979, 1984, 1981, 2915, 1975, - 1978, 1975, 1996, 2914, 2913, 1995, 2912, 1992, 3035, 2001, - 2011, 2006, 3035, 3035, 3035, 2003, 2001, 2020, 2002, 2021, - 2014, 2016, 2026, 2028, 2016, 2026, 2030, 2019, 2018, 2021, - - 2023, 2033, 2027, 2028, 2031, 2033, 2031, 2038, 2039, 2048, - 2062, 3035, 2058, 2061, 2949, 2942, 2924, 2919, 2056, 2057, - 2073, 2075, 2060, 3035, 2070, 2068, 2071, 2076, 2075, 2070, - 2080, 2079, 2088, 2075, 2087, 2079, 2084, 2081, 2091, 2089, - 2105, 2104, 2102, 2117, 3035, 2121, 2121, 2111, 2128, 2891, - 2112, 2119, 2886, 2884, 2121, 2113, 2114, 3035, 2124, 2123, - 3035, 2135, 2139, 2136, 3035, 2127, 2135, 2145, 3035, 2135, - 2132, 2139, 2150, 2142, 1694, 2144, 1435, 2143, 2142, 2150, - 2156, 2161, 2176, 3035, 2182, 2180, 2167, 2183, 864, 2176, - 3035, 3035, 2191, 3035, 3035, 2184, 2191, 2187, 861, 844, - - 2196, 843, 2179, 2194, 2195, 2196, 2198, 2195, 2196, 2201, - 2189, 2199, 2206, 2207, 2194, 2207, 2217, 2210, 2234, 842, - 3035, 2222, 2230, 3035, 2233, 2237, 2230, 2232, 2239, 2228, - 465, 2239, 2242, 2247, 2233, 2245, 2236, 3035, 437, 3035, - 2239, 2240, 2253, 2251, 2244, 2251, 2268, 2250, 2256, 431, - 3035, 2278, 3035, 2288, 2277, 2280, 3035, 2289, 2292, 2278, - 2296, 2295, 2282, 2288, 2285, 2290, 2303, 2288, 2295, 2304, - 3035, 2302, 3035, 2299, 3035, 3035, 425, 2303, 2299, 2306, - 2320, 2320, 2327, 2325, 2329, 2330, 2332, 2346, 2330, 2331, - 2332, 2335, 2341, 2337, 2338, 2357, 2339, 3035, 2346, 2346, - - 2344, 2348, 2356, 2357, 2358, 2364, 2351, 3035, 423, 2353, - 2358, 3035, 3035, 2365, 2365, 2376, 3035, 3035, 2392, 2377, - 2396, 2386, 3035, 2393, 2384, 2388, 422, 420, 2392, 2399, - 2400, 3035, 2407, 2394, 2399, 2407, 2410, 2402, 2416, 2415, - 3035, 3035, 3035, 418, 2404, 2417, 2413, 2409, 416, 2412, - 2413, 2420, 3035, 2427, 2440, 2446, 2446, 3035, 3035, 2452, - 2446, 2451, 381, 2452, 2456, 380, 339, 289, 287, 2456, - 2457, 281, 3035, 2462, 2459, 2448, 3035, 2452, 2448, 2449, - 2454, 2468, 280, 2470, 2469, 3035, 2460, 3035, 2462, 2461, - 259, 2466, 2473, 2471, 3035, 2473, 2479, 2501, 2484, 2494, - - 2496, 2502, 249, 2504, 2492, 3035, 2508, 2498, 3035, 2498, - 2506, 3035, 2516, 3035, 2518, 2518, 2501, 2508, 2520, 2502, - 3035, 3035, 2508, 2510, 2510, 2527, 2515, 2528, 2526, 2531, - 2538, 2543, 3035, 237, 2553, 3035, 3035, 2557, 2559, 236, - 3035, 2542, 2550, 2550, 2558, 229, 2550, 3035, 257, 2568, - 2560, 200, 2556, 3035, 2557, 2562, 2564, 2574, 2576, 2581, - 2568, 2579, 2579, 2574, 2591, 2584, 2598, 2594, 2612, 2610, - 3035, 2605, 2593, 152, 2614, 2600, 2615, 2615, 2617, 2621, - 2614, 2615, 2616, 2617, 2618, 2621, 3035, 3035, 2622, 144, - 2615, 2632, 2619, 2640, 2640, 2639, 3035, 2628, 2648, 2646, - - 3035, 3035, 2652, 2647, 3035, 150, 2655, 2655, 2653, 2654, - 3035, 2666, 145, 2665, 2658, 3035, 2667, 2661, 2677, 124, - 2677, 109, 3035, 2669, 2673, 2671, 2683, 2677, 2678, 2679, - 2680, 2680, 2682, 2697, 3035, 3035, 2689, 2690, 2710, 2706, - 2706, 2720, 2707, 3035, 2710, 2713, 3035, 2716, 2717, 2727, - 2728, 3035, 3035, 2715, 2727, 3035, 2725, 3035, 3035, 2732, - 2730, 2734, 2737, 2738, 2740, 3035, 2720, 2721, 2724, 2726, - 2736, 2742, 2743, 2749, 2752, 2757, 2763, 2766, 2775, 2780, - 2777, 2780, 2777, 2782, 2770, 2772, 2782, 2772, 2788, 2785, - 2783, 2788, 3035, 3035, 3035, 3035, 3035, 3035, 3035, 2789, - - 2795, 2781, 3035, 2798, 100, 2800, 2797, 3035, 2791, 2798, - 2820, 2815, 2817, 3035, 3035, 2818, 3035, 2815, 2822, 2830, - 2824, 2836, 3035, 2839, 2823, 2839, 2832, 2844, 2837, 2828, - 2828, 2840, 3035, 2835, 2843, 2848, 3035, 2849, 2852, 2852, - 95, 2849, 2846, 2856, 2862, 3035, 3035, 2862, 2871, 2881, - 3035, 3035, 2868, 2883, 2886, 2869, 3035, 2889, 2880, 3035, - 2890, 3035, 3035, 93, 2881, 2884, 2880, 3035, 3035, 2880, - 2880, 2882, 3035, 2894, 2891, 3035, 2893, 2887, 2903, 3035, - 3035, 3035, 105, 2950, 97, 84, 81 + 1131, 1119, 1135, 1140, 1126, 1128, 1150, 1148, 1154, 1150, + 1148, 1147, 2949, 1167, 1159, 1147, 1173, 1176, 1158, 2948, + 1165, 1167, 3020, 1171, 3020, 1177, 1186, 1174, 1193, 1182, + 1205, 3020, 1194, 1193, 1210, 1201, 1216, 2947, 3020, 1220, + + 2946, 3020, 1217, 1216, 1223, 2945, 1211, 1227, 3020, 1219, + 1210, 1217, 1220, 1233, 1228, 1230, 1236, 1224, 1236, 1245, + 1239, 2973, 1241, 1249, 1261, 3020, 3020, 3020, 1261, 2943, + 1248, 3020, 1261, 1258, 1261, 1269, 1261, 1274, 1270, 1274, + 1267, 1266, 1267, 1272, 1284, 1279, 1283, 1278, 2942, 3020, + 1298, 2941, 1286, 1292, 1319, 2940, 1287, 2939, 1304, 2938, + 1307, 1312, 1299, 2937, 1317, 1309, 3020, 1321, 1310, 1329, + 1332, 1338, 1336, 3020, 3020, 3020, 1338, 1328, 1342, 1338, + 1334, 1348, 1349, 1351, 1345, 1344, 1349, 1351, 3020, 1352, + 1354, 1363, 1363, 1359, 3020, 1377, 1379, 1383, 1375, 1383, + + 1389, 1377, 1375, 1390, 2936, 1380, 1394, 1385, 1387, 1402, + 1393, 1406, 3020, 1390, 1397, 1405, 1396, 1404, 2935, 3020, + 1410, 1421, 3020, 1425, 1409, 1407, 1423, 1434, 1418, 1437, + 1436, 1435, 1422, 3020, 1434, 1436, 1435, 1432, 1435, 1446, + 2934, 1439, 1474, 1448, 2933, 1446, 2932, 1452, 3020, 3020, + 1463, 1465, 1453, 3020, 1475, 1477, 1479, 3020, 3020, 1476, + 3020, 1487, 1478, 1476, 1495, 1498, 1487, 1498, 1494, 1489, + 1484, 3020, 1489, 3020, 1505, 2931, 1494, 2930, 2929, 2928, + 1510, 1508, 1510, 1509, 2927, 3020, 1506, 1519, 1525, 1530, + 1526, 3020, 1521, 1535, 1530, 1533, 1528, 1533, 1539, 1550, + + 1541, 1540, 1555, 1552, 1534, 1554, 1544, 1560, 1563, 1550, + 1560, 1571, 1576, 1567, 1582, 1587, 1578, 1589, 1586, 1585, + 1594, 1593, 3020, 1594, 1577, 3020, 3020, 1597, 1585, 2926, + 1599, 1587, 2925, 2924, 1604, 1594, 1593, 1587, 1601, 1605, + 1600, 1607, 1614, 1624, 1615, 1619, 1626, 1627, 1633, 1625, + 1627, 1646, 3020, 1643, 1629, 1640, 3020, 1634, 1645, 1642, + 1639, 1651, 1646, 1651, 1649, 1645, 1658, 1662, 1655, 1651, + 2923, 2922, 2921, 2920, 2919, 1671, 1672, 2918, 1678, 2917, + 3020, 3020, 1679, 3020, 3020, 1679, 2916, 90, 1688, 1677, + 1685, 1684, 3020, 3020, 1695, 1697, 1690, 1693, 1688, 1701, + + 1699, 1709, 1703, 1698, 1713, 1709, 3020, 1703, 1709, 1707, + 1729, 1726, 1722, 1721, 1731, 1738, 1735, 1749, 1746, 1731, + 1740, 3020, 1741, 1754, 1745, 1742, 1743, 1759, 1754, 1757, + 1757, 1755, 3020, 1753, 1759, 1773, 1755, 3020, 1767, 2915, + 1776, 1779, 1782, 1782, 1773, 3020, 1785, 1783, 1784, 1800, + 3020, 1800, 1792, 1803, 3020, 1805, 3020, 1797, 3020, 1790, + 1797, 1814, 1800, 3020, 1811, 1818, 1811, 2914, 1822, 1807, + 1806, 1815, 1820, 1834, 1829, 1820, 1840, 1840, 2913, 1845, + 1831, 1852, 1838, 1850, 1856, 1849, 1863, 1862, 1864, 1854, + 1855, 1857, 1859, 2912, 1852, 1862, 1874, 1876, 1877, 1873, + + 1869, 1913, 2949, 2937, 1868, 1888, 2909, 2908, 2907, 3020, + 1880, 1888, 1893, 1893, 1895, 1898, 1894, 1916, 1913, 1917, + 1921, 3020, 1910, 1919, 1917, 1926, 1926, 1916, 2906, 1909, + 1919, 1932, 1914, 1922, 2905, 1932, 1930, 1932, 2904, 1939, + 1941, 3020, 1934, 1951, 3020, 1958, 1945, 2903, 1947, 1957, + 3020, 3020, 1968, 1954, 1955, 2897, 3020, 3020, 1964, 1957, + 1955, 1976, 1981, 2892, 1969, 1972, 1967, 1986, 2891, 2888, + 1984, 2886, 1981, 3020, 1986, 1991, 1983, 3020, 3020, 3020, + 1981, 1980, 1998, 1983, 2008, 2004, 2007, 2018, 2021, 2008, + 2020, 2024, 2013, 2012, 2016, 2017, 2027, 2021, 2022, 2023, + + 2025, 2022, 2027, 2028, 2033, 2042, 3020, 2035, 2039, 2922, + 2920, 2908, 2906, 2035, 2035, 2054, 2062, 2050, 3020, 2061, + 2060, 2064, 2068, 2069, 2064, 2074, 2073, 2083, 2069, 2081, + 2073, 2078, 2073, 2083, 2080, 2094, 2093, 2087, 2097, 3020, + 2098, 2099, 2090, 2106, 2876, 2093, 2106, 2875, 2874, 2111, + 2104, 2106, 3020, 2117, 2115, 3020, 2129, 2133, 2130, 3020, + 2121, 2130, 2139, 3020, 2129, 2126, 2133, 2132, 2230, 2134, + 1435, 2131, 2130, 2134, 2134, 2136, 2152, 3020, 2158, 2157, + 2143, 2163, 864, 2160, 3020, 3020, 2180, 3020, 3020, 2174, + 2182, 2178, 861, 844, 2187, 843, 2172, 2187, 2188, 2189, + + 2191, 2188, 2189, 2194, 2180, 2189, 2196, 2195, 2182, 2191, + 2195, 2185, 2210, 842, 3020, 2198, 2207, 3020, 2209, 2217, + 2214, 2221, 2229, 2219, 465, 2230, 2233, 2240, 2226, 2238, + 2229, 3020, 437, 3020, 2232, 2232, 2247, 2244, 2235, 2241, + 2264, 2238, 2240, 431, 3020, 2256, 3020, 2262, 2251, 2257, + 3020, 2266, 2273, 2265, 2283, 2284, 2277, 2274, 2280, 2293, + 2280, 2287, 2296, 3020, 2295, 3020, 2291, 3020, 3020, 425, + 2295, 2289, 2295, 2305, 2307, 2311, 2303, 2304, 2306, 2308, + 2323, 2307, 2312, 2319, 2320, 2327, 2325, 2327, 2346, 2329, + 3020, 2336, 2338, 2336, 2340, 2347, 2349, 2350, 2356, 2341, + + 3020, 423, 2342, 2343, 3020, 3020, 2352, 2349, 2354, 3020, + 3020, 2367, 2353, 2372, 2363, 3020, 2370, 2365, 2375, 422, + 420, 2377, 2385, 2388, 3020, 2396, 2383, 2389, 2397, 2402, + 2394, 2408, 2406, 3020, 3020, 418, 2396, 2409, 2405, 2399, + 416, 2401, 2398, 2407, 3020, 2411, 2418, 2421, 2422, 3020, + 3020, 2428, 2423, 2428, 381, 2433, 2443, 380, 339, 289, + 287, 2441, 2443, 281, 3020, 2450, 2448, 2437, 3020, 2442, + 2438, 2441, 2446, 2460, 280, 2461, 2461, 3020, 2452, 3020, + 2454, 2451, 259, 2455, 2458, 2458, 3020, 2457, 2457, 2476, + 2460, 2470, 2473, 2479, 249, 2485, 2479, 3020, 2493, 2484, + + 3020, 2486, 2495, 3020, 2505, 3020, 2508, 2508, 2493, 2500, + 2512, 2493, 3020, 3020, 2500, 2502, 2502, 2517, 2504, 2513, + 2513, 2515, 2516, 2518, 3020, 237, 2529, 3020, 3020, 2533, + 2536, 236, 3020, 2519, 2531, 2535, 2545, 229, 2539, 3020, + 257, 2557, 2549, 200, 2546, 3020, 2547, 2554, 2556, 2566, + 2567, 2573, 2561, 2570, 2569, 2558, 2575, 2568, 2576, 2569, + 2588, 2586, 3020, 2582, 2570, 152, 2595, 2587, 2600, 2601, + 2605, 2610, 2603, 2605, 2606, 2609, 2610, 2613, 3020, 3020, + 2613, 144, 2607, 2624, 2611, 2630, 2629, 2624, 3020, 2615, + 2632, 2624, 3020, 3020, 2627, 2623, 3020, 150, 2631, 2632, + + 2630, 2635, 3020, 2653, 145, 2650, 2644, 3020, 2655, 2650, + 2666, 124, 2667, 109, 3020, 2659, 2665, 2663, 2675, 2668, + 2670, 2671, 2672, 2670, 2671, 2682, 3020, 3020, 2676, 2674, + 2688, 2681, 2682, 2696, 2684, 3020, 2687, 2694, 3020, 2703, + 2702, 2713, 2716, 3020, 3020, 2704, 2716, 3020, 2715, 3020, + 3020, 2722, 2722, 2726, 2729, 2729, 2732, 3020, 2712, 2713, + 2714, 2715, 2721, 2729, 2727, 2727, 2727, 2733, 2739, 2743, + 2752, 2761, 2764, 2765, 2763, 2770, 2759, 2761, 2772, 2762, + 2780, 2777, 2775, 2779, 3020, 3020, 3020, 3020, 3020, 3020, + 3020, 2781, 2787, 2773, 3020, 2788, 100, 2789, 2782, 3020, + + 2778, 2782, 2798, 2790, 2793, 3020, 3020, 2794, 3020, 2792, + 2799, 2811, 2811, 2821, 3020, 2825, 2811, 2828, 2821, 2834, + 2827, 2820, 2820, 2832, 3020, 2826, 2835, 2840, 3020, 2841, + 2842, 2841, 95, 2834, 2833, 2840, 2840, 3020, 3020, 2837, + 2847, 2857, 3020, 3020, 2845, 2860, 2867, 2856, 3020, 2874, + 2866, 3020, 2878, 3020, 3020, 93, 2870, 2873, 2870, 3020, + 3020, 2870, 2872, 2874, 3020, 2886, 2882, 3020, 2885, 2879, + 2895, 3020, 3020, 3020, 105, 2942, 97, 84, 81 } ; -static yyconst flex_int16_t yy_def[1588] = +static yyconst flex_int16_t yy_def[1580] = { 0, - 1582, 1, 1582, 1582, 1582, 1583, 1584, 1585, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1583, 1584, 1582, - 1585, 1582, 1582, 1582, 1585, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1586, 1587, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1586, 1586, 1587, 1587, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 0, 1582, 1582, 1582, 1582, 1582 + 1574, 1, 1574, 1574, 1574, 1575, 1576, 1577, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1575, 1576, 1574, + 1577, 1574, 1574, 1574, 1577, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1578, 1579, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1578, + 1578, 1579, 1579, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 0, 1574, 1574, 1574, 1574, 1574 } ; -static yyconst flex_int16_t yy_nxt[3104] = +static yyconst flex_int16_t yy_nxt[3089] = { 0, 4, 5, 6, 7, 8, 4, 9, 10, 11, 11, 11, 11, 11, 4, 4, 12, 13, 14, 15, 16, @@ -960,54 +957,54 @@ 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, 1017, 54, 102, 1015, 67, 68, 43, 40, 40, - 61, 906, 106, 907, 62, 74, 69, 41, 63, 53, + 83, 1012, 54, 102, 1010, 67, 68, 43, 40, 40, + 61, 902, 106, 903, 62, 74, 69, 41, 63, 53, - 70, 64, 75, 908, 65, 38, 66, 83, 71, 54, + 70, 64, 75, 904, 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, 1570, 71, 1555, 81, 72, 82, - 77, 1526, 47, 48, 127, 49, 78, 73, 309, 310, - 1462, 50, 79, 51, 130, 1435, 1436, 80, 107, 76, - 52, 55, 108, 56, 81, 1460, 82, 77, 57, 58, + 80, 65, 76, 52, 1562, 71, 1547, 81, 72, 82, + 77, 1518, 47, 48, 127, 49, 78, 73, 309, 310, + 1454, 50, 79, 51, 130, 1427, 1428, 80, 107, 76, + 52, 55, 108, 56, 81, 1452, 82, 77, 57, 58, 84, 127, 59, 78, 88, 60, 109, 85, 89, 79, - 86, 130, 87, 128, 90, 107, 1454, 129, 55, 108, - 56, 1448, 103, 1421, 131, 57, 58, 84, 132, 59, + 86, 130, 87, 128, 90, 107, 1446, 129, 55, 108, + 56, 1440, 103, 1413, 131, 57, 58, 84, 132, 59, 104, 88, 60, 109, 85, 89, 105, 86, 133, 87, 128, 90, 91, 92, 129, 134, 93, 124, 125, 103, 94, 131, 135, 126, 136, 132, 95, 104, 46, 46, 46, 46, 46, 105, 137, 133, 138, 139, 140, 91, - 92, 1400, 134, 93, 124, 125, 141, 94, 142, 135, + 92, 1392, 134, 93, 124, 125, 141, 94, 142, 135, 126, 136, 143, 95, 96, 144, 97, 145, 98, 148, - 146, 137, 99, 138, 139, 140, 149, 157, 100, 1397, - 1395, 158, 159, 141, 101, 142, 160, 1389, 1385, 143, + 146, 137, 99, 138, 139, 140, 149, 157, 100, 1389, + 1387, 158, 159, 141, 101, 142, 160, 1381, 1377, 143, 147, 96, 144, 97, 145, 98, 148, 146, 161, 99, - 1361, 150, 151, 149, 157, 100, 152, 155, 158, 159, + 1353, 150, 151, 149, 157, 100, 152, 155, 158, 159, - 1350, 101, 110, 160, 153, 111, 112, 147, 113, 154, + 1342, 101, 110, 160, 153, 111, 112, 147, 113, 154, 165, 156, 114, 115, 166, 161, 116, 117, 150, 151, - 167, 1344, 1335, 152, 155, 162, 168, 163, 1332, 110, - 1331, 153, 111, 112, 173, 113, 154, 165, 156, 114, + 167, 1336, 1327, 152, 155, 162, 168, 163, 1324, 110, + 1323, 153, 111, 112, 173, 113, 154, 165, 156, 114, 115, 166, 164, 116, 117, 118, 169, 167, 119, 120, 174, 177, 162, 168, 163, 121, 122, 170, 171, 178, 179, 173, 123, 175, 172, 176, 180, 181, 182, 164, 183, 184, 118, 169, 185, 119, 120, 174, 177, 186, - 1330, 193, 121, 122, 170, 171, 178, 179, 194, 123, + 1322, 193, 121, 122, 170, 171, 178, 179, 194, 123, 175, 172, 176, 180, 181, 182, 189, 183, 184, 187, 190, 185, 191, 195, 188, 198, 186, 192, 193, 196, 199, 202, 203, 200, 205, 194, 206, 210, 211, 197, - 214, 1329, 1326, 189, 223, 204, 187, 190, 201, 191, + 214, 1321, 1318, 189, 223, 204, 187, 190, 201, 191, 195, 188, 198, 207, 192, 232, 196, 199, 202, 203, 200, 205, 233, 206, 210, 211, 197, 214, 212, 208, - 209, 223, 230, 228, 236, 201, 213, 1315, 234, 1310, - 207, 1298, 232, 1297, 1284, 237, 1254, 229, 235, 233, - 238, 239, 1233, 240, 231, 212, 208, 209, 1221, 230, + 209, 223, 230, 228, 236, 201, 213, 1307, 234, 1302, + 207, 1290, 232, 1289, 1276, 237, 1246, 229, 235, 233, + 238, 239, 1226, 240, 231, 212, 208, 209, 1214, 230, 228, 236, 241, 213, 215, 234, 216, 217, 224, 243, 218, 219, 237, 220, 229, 235, 221, 238, 239, 225, - 240, 231, 222, 226, 244, 227, 1214, 251, 252, 241, + 240, 231, 222, 226, 244, 227, 1207, 251, 252, 241, 257, 215, 260, 216, 217, 224, 243, 218, 219, 253, 220, 255, 258, 221, 256, 254, 225, 261, 262, 222, 226, 244, 227, 245, 251, 252, 246, 257, 263, 260, @@ -1048,255 +1045,252 @@ static yyconst flex_int16_t yy_nxt[3104] = 412, 426, 430, 428, 414, 415, 416, 417, 418, 419, 432, 420, 433, 421, 434, 427, 429, 435, 437, 439, 440, 441, 422, 423, 443, 424, 425, 444, 426, 430, - 428, 445, 446, 1205, 1187, 1185, 456, 432, 457, 433, + 428, 445, 446, 1198, 1180, 1178, 456, 432, 457, 433, 458, 434, 427, 461, 435, 437, 439, 440, 441, 462, - 463, 443, 1184, 465, 444, 1178, 467, 468, 445, 446, + 463, 443, 1177, 465, 444, 1171, 466, 467, 445, 446, 447, 448, 449, 456, 459, 457, 450, 458, 451, 460, - 461, 452, 469, 453, 470, 471, 462, 463, 472, 454, - 465, 478, 455, 467, 468, 473, 480, 447, 448, 449, - 481, 459, 482, 450, 483, 451, 460, 484, 452, 469, - 453, 470, 471, 474, 485, 472, 454, 475, 478, 455, - 486, 476, 473, 480, 487, 488, 489, 481, 491, 482, - 492, 483, 493, 498, 484, 499, 500, 501, 502, 495, - 474, 485, 494, 496, 475, 504, 505, 486, 497, 507, - 508, 487, 488, 489, 509, 491, 512, 492, 513, 493, - - 498, 506, 499, 500, 501, 502, 495, 514, 515, 516, - 496, 517, 504, 505, 518, 497, 507, 508, 519, 520, - 521, 509, 523, 512, 524, 513, 526, 522, 506, 527, - 528, 529, 530, 531, 514, 515, 516, 532, 517, 533, - 536, 518, 537, 534, 538, 519, 520, 521, 535, 523, - 540, 524, 541, 526, 522, 542, 527, 528, 529, 530, - 531, 543, 544, 545, 532, 546, 533, 536, 547, 537, - 534, 538, 548, 549, 550, 535, 551, 540, 552, 541, - 553, 554, 542, 555, 557, 558, 559, 560, 543, 544, - 545, 561, 546, 564, 562, 547, 565, 566, 567, 548, - - 549, 550, 568, 551, 563, 552, 569, 553, 554, 570, - 555, 557, 558, 559, 560, 573, 575, 576, 561, 577, - 564, 562, 578, 565, 566, 567, 579, 582, 580, 568, - 583, 563, 581, 569, 584, 585, 570, 587, 589, 590, - 591, 592, 573, 575, 576, 593, 577, 586, 594, 578, - 595, 588, 596, 579, 582, 580, 597, 583, 600, 581, - 601, 584, 585, 598, 587, 589, 590, 591, 592, 602, - 599, 603, 593, 604, 586, 594, 605, 595, 588, 596, - 606, 607, 608, 597, 610, 600, 614, 601, 611, 612, - 598, 615, 619, 617, 613, 621, 602, 599, 603, 622, - - 604, 623, 616, 605, 624, 625, 626, 606, 607, 608, - 618, 610, 627, 614, 628, 611, 612, 631, 615, 619, - 617, 613, 621, 632, 629, 633, 622, 630, 623, 616, - 634, 624, 625, 626, 635, 636, 638, 618, 640, 627, - 643, 628, 641, 644, 631, 642, 646, 647, 648, 649, - 632, 629, 633, 650, 630, 651, 652, 634, 653, 654, - 655, 635, 636, 638, 656, 640, 657, 643, 658, 641, - 644, 659, 642, 646, 647, 648, 649, 661, 662, 663, - 650, 664, 651, 652, 666, 653, 654, 655, 667, 668, - 669, 656, 670, 657, 672, 658, 673, 674, 659, 675, - - 676, 677, 678, 679, 661, 662, 663, 680, 664, 681, - 671, 666, 682, 683, 685, 667, 668, 669, 687, 670, - 688, 672, 694, 673, 674, 696, 675, 676, 677, 678, - 679, 698, 699, 701, 680, 703, 681, 689, 690, 682, - 683, 685, 704, 700, 705, 687, 691, 688, 706, 694, - 707, 692, 696, 708, 709, 710, 711, 712, 698, 699, - 701, 713, 703, 714, 689, 690, 715, 716, 718, 704, - 700, 705, 719, 691, 717, 706, 720, 707, 692, 721, - 708, 709, 710, 711, 712, 722, 723, 724, 713, 725, - 714, 726, 727, 715, 716, 718, 728, 729, 730, 719, - - 731, 717, 732, 720, 733, 734, 721, 735, 736, 737, - 738, 740, 722, 723, 724, 741, 725, 742, 726, 727, - 743, 744, 745, 728, 729, 730, 746, 731, 747, 732, - 748, 733, 734, 749, 735, 736, 737, 738, 740, 750, - 751, 753, 741, 754, 742, 755, 756, 743, 744, 745, - 757, 758, 759, 746, 760, 747, 761, 748, 762, 763, - 749, 764, 765, 766, 767, 768, 750, 751, 753, 769, - 754, 770, 755, 756, 771, 773, 1167, 757, 758, 759, - 779, 760, 781, 761, 783, 762, 763, 784, 764, 765, - 766, 767, 768, 774, 785, 786, 769, 775, 770, 776, - - 787, 771, 773, 777, 778, 788, 789, 779, 790, 781, - 791, 783, 792, 793, 784, 794, 795, 796, 797, 798, - 774, 785, 786, 799, 775, 800, 776, 787, 801, 802, - 777, 778, 788, 789, 804, 790, 808, 791, 809, 792, - 793, 810, 794, 795, 796, 797, 798, 811, 813, 814, - 799, 816, 800, 817, 818, 801, 802, 819, 820, 815, - 821, 804, 822, 808, 823, 809, 824, 825, 810, 826, - 827, 828, 829, 830, 811, 813, 814, 831, 816, 832, - 817, 818, 833, 834, 819, 820, 815, 821, 835, 822, - 836, 823, 837, 824, 825, 838, 826, 827, 828, 829, - - 830, 839, 840, 841, 831, 842, 832, 843, 844, 833, - 834, 845, 846, 847, 848, 835, 849, 836, 850, 837, - 851, 852, 838, 854, 855, 856, 859, 860, 839, 840, - 841, 861, 842, 862, 843, 844, 863, 864, 845, 846, - 847, 848, 865, 849, 866, 850, 867, 851, 852, 868, - 854, 855, 856, 859, 860, 869, 870, 871, 861, 872, - 862, 873, 874, 863, 864, 875, 876, 877, 878, 865, - 879, 866, 880, 867, 881, 882, 868, 883, 884, 885, - 886, 887, 869, 870, 871, 888, 872, 889, 873, 874, - 890, 891, 875, 876, 877, 878, 892, 879, 898, 880, - - 899, 881, 882, 901, 883, 884, 885, 886, 887, 903, - 904, 909, 888, 910, 889, 911, 912, 890, 891, 913, - 914, 915, 916, 892, 917, 898, 918, 899, 920, 924, - 901, 925, 926, 927, 928, 1165, 903, 904, 909, 919, - 910, 929, 911, 912, 930, 921, 913, 914, 915, 916, - 922, 917, 931, 918, 932, 920, 924, 933, 925, 926, - 927, 928, 923, 934, 935, 936, 919, 937, 929, 938, - 939, 930, 921, 940, 941, 942, 943, 922, 944, 931, - 945, 932, 946, 947, 933, 948, 949, 950, 951, 923, - 934, 935, 936, 952, 937, 953, 938, 939, 954, 955, - - 940, 941, 942, 943, 956, 944, 958, 945, 959, 946, - 947, 960, 948, 949, 950, 951, 961, 962, 963, 964, - 952, 965, 953, 968, 966, 954, 955, 969, 970, 971, - 972, 956, 973, 958, 967, 959, 974, 975, 960, 976, - 977, 978, 979, 961, 962, 963, 964, 980, 965, 982, - 968, 966, 983, 984, 969, 970, 971, 972, 985, 973, - 986, 967, 987, 974, 975, 988, 976, 977, 978, 979, - 989, 990, 991, 993, 980, 994, 982, 995, 996, 983, - 984, 997, 998, 999, 1000, 985, 1001, 986, 1002, 987, - 1003, 1004, 988, 1005, 1006, 1008, 1009, 989, 990, 991, - - 993, 1010, 994, 1011, 995, 996, 1012, 1013, 997, 998, - 999, 1000, 1014, 1001, 906, 1002, 907, 1003, 1004, 1019, - 1005, 1006, 1008, 1009, 1020, 1024, 908, 1025, 1010, 1026, - 1011, 1027, 1028, 1012, 1013, 1029, 1030, 1031, 1032, 1014, - 1033, 1034, 1035, 1036, 1037, 1038, 1019, 1039, 1040, 1042, - 1043, 1020, 1024, 1044, 1025, 1045, 1026, 1046, 1027, 1028, - 1050, 1051, 1029, 1030, 1031, 1032, 1053, 1033, 1034, 1035, - 1036, 1037, 1038, 1054, 1039, 1040, 1042, 1043, 1055, 1048, - 1044, 1056, 1045, 1049, 1046, 1057, 1058, 1050, 1051, 1060, - 1061, 1065, 1062, 1053, 1066, 1068, 1069, 1070, 1071, 1072, - - 1054, 1063, 1073, 1075, 1076, 1055, 1048, 1077, 1056, 1064, - 1049, 1078, 1057, 1058, 1081, 1083, 1060, 1061, 1065, 1062, - 1084, 1066, 1068, 1069, 1070, 1071, 1072, 1085, 1063, 1073, - 1075, 1076, 1086, 1087, 1077, 1088, 1064, 1089, 1078, 1090, - 1091, 1081, 1083, 1092, 1093, 1094, 1095, 1084, 1096, 1097, - 1098, 1099, 1100, 1101, 1085, 1102, 1103, 1104, 1105, 1086, - 1087, 1106, 1088, 1107, 1089, 1108, 1090, 1091, 1109, 1110, - 1092, 1093, 1094, 1095, 1111, 1096, 1097, 1098, 1099, 1100, - 1101, 1112, 1102, 1103, 1104, 1105, 1113, 1114, 1106, 1115, - 1107, 1116, 1108, 1117, 1118, 1109, 1110, 1119, 1120, 1121, - - 1122, 1111, 1123, 1124, 1125, 1126, 1127, 1128, 1112, 1129, - 1130, 1131, 1132, 1113, 1114, 1133, 1115, 1134, 1116, 1135, - 1117, 1118, 1136, 1137, 1119, 1120, 1121, 1122, 1138, 1123, - 1124, 1125, 1126, 1127, 1128, 1139, 1129, 1130, 1131, 1132, - 1140, 1141, 1133, 1142, 1134, 1143, 1135, 1145, 1146, 1136, - 1137, 1149, 1150, 1151, 1152, 1138, 1153, 1154, 1155, 1156, - 1157, 1158, 1139, 1159, 1160, 1161, 1162, 1140, 1141, 1163, - 1142, 1164, 1143, 1166, 1145, 1146, 1168, 1169, 1149, 1150, - 1151, 1152, 1170, 1153, 1154, 1155, 1156, 1157, 1158, 1171, - 1159, 1160, 1161, 1162, 1172, 1173, 1163, 1174, 1164, 1175, - - 1166, 1176, 1177, 1168, 1169, 1179, 1180, 1181, 1182, 1170, - 1183, 1186, 1188, 1189, 1190, 1191, 1171, 1192, 1193, 1194, - 1195, 1172, 1173, 1196, 1174, 1197, 1175, 1198, 1176, 1177, - 1199, 1200, 1179, 1180, 1181, 1182, 1201, 1183, 1186, 1188, - 1189, 1190, 1191, 1202, 1192, 1193, 1194, 1195, 1203, 1204, - 1196, 1206, 1197, 1207, 1198, 1208, 1209, 1199, 1200, 1210, - 1211, 1212, 1213, 1201, 1215, 1216, 1217, 1218, 1219, 1220, - 1202, 1222, 1225, 1223, 1226, 1203, 1204, 1227, 1206, 1228, - 1207, 1224, 1208, 1209, 1231, 1229, 1210, 1211, 1212, 1213, - 1232, 1215, 1216, 1217, 1218, 1219, 1220, 1234, 1222, 1225, - - 1223, 1226, 1230, 1235, 1227, 1236, 1228, 1237, 1238, 1239, - 1240, 1231, 1229, 1241, 1242, 1243, 1244, 1232, 1245, 1246, - 1247, 1249, 1250, 1251, 1234, 1252, 1248, 1253, 1255, 1230, - 1235, 1256, 1236, 1257, 1237, 1238, 1239, 1240, 1258, 1259, - 1241, 1242, 1243, 1244, 1260, 1245, 1246, 1247, 1249, 1250, - 1251, 1261, 1252, 1248, 1253, 1255, 1262, 1263, 1256, 1264, - 1257, 1265, 1266, 1267, 1268, 1258, 1259, 1269, 1270, 1271, - 1272, 1260, 1273, 1274, 1275, 1276, 1277, 1278, 1261, 1279, - 1280, 1281, 1282, 1262, 1263, 1283, 1264, 1285, 1265, 1266, - 1267, 1268, 1286, 1287, 1269, 1270, 1271, 1272, 1288, 1273, - - 1274, 1275, 1276, 1277, 1278, 1289, 1279, 1280, 1281, 1282, - 1290, 1291, 1283, 1292, 1285, 1293, 1294, 1295, 1296, 1286, - 1287, 1299, 1300, 1301, 1302, 1288, 1303, 1304, 1305, 1306, - 1307, 1308, 1289, 1309, 1311, 1312, 1313, 1290, 1291, 1314, - 1292, 1316, 1293, 1294, 1295, 1296, 1317, 1318, 1299, 1300, - 1301, 1302, 1319, 1303, 1304, 1305, 1306, 1307, 1308, 1320, - 1309, 1311, 1312, 1313, 1321, 1322, 1314, 1323, 1316, 1324, - 1325, 1327, 1328, 1317, 1318, 1333, 1334, 1336, 1337, 1319, - 1338, 1339, 1340, 1341, 1342, 1343, 1320, 1345, 1346, 1347, - 1348, 1321, 1322, 1349, 1323, 1351, 1324, 1325, 1327, 1328, - - 1352, 1353, 1333, 1334, 1336, 1337, 1354, 1338, 1339, 1340, - 1341, 1342, 1343, 1355, 1345, 1346, 1347, 1348, 1356, 1357, - 1349, 1358, 1351, 1359, 1360, 1362, 1363, 1352, 1353, 1364, - 1365, 1366, 1367, 1354, 1368, 1369, 1370, 1371, 1372, 1373, - 1355, 1374, 1375, 1376, 1377, 1356, 1357, 1378, 1358, 1379, - 1359, 1360, 1362, 1363, 1380, 1381, 1364, 1365, 1366, 1367, - 1382, 1368, 1369, 1370, 1371, 1372, 1373, 1383, 1374, 1375, - 1376, 1377, 1384, 1386, 1378, 1387, 1379, 1388, 1390, 1391, - 1394, 1380, 1381, 1392, 1396, 1393, 1398, 1382, 1399, 1401, - 1402, 1403, 1404, 1405, 1383, 1406, 1407, 1408, 1410, 1384, - - 1386, 1411, 1387, 1409, 1388, 1390, 1391, 1394, 1412, 1413, - 1392, 1396, 1393, 1398, 1414, 1399, 1401, 1402, 1403, 1404, - 1405, 1415, 1406, 1407, 1408, 1410, 1416, 1417, 1411, 1418, - 1409, 1419, 1420, 1422, 1423, 1412, 1413, 1424, 1425, 1426, - 1427, 1414, 1428, 1429, 1430, 1431, 1432, 1433, 1415, 1434, - 1437, 1438, 1439, 1416, 1417, 1440, 1418, 1441, 1419, 1420, - 1422, 1423, 1442, 1443, 1424, 1425, 1426, 1427, 1444, 1428, - 1429, 1430, 1431, 1432, 1433, 1445, 1434, 1437, 1438, 1439, - 1446, 1447, 1440, 1449, 1441, 1450, 1451, 1452, 1453, 1442, - 1443, 1455, 1456, 1457, 1458, 1444, 1459, 1461, 1463, 1464, - - 1465, 1466, 1445, 1467, 1468, 1469, 1470, 1446, 1447, 1471, - 1449, 1472, 1450, 1451, 1452, 1453, 1473, 1474, 1455, 1456, - 1457, 1458, 1475, 1459, 1461, 1463, 1464, 1465, 1466, 1476, - 1467, 1468, 1469, 1470, 1477, 1478, 1471, 1479, 1472, 1480, - 1481, 1482, 1483, 1473, 1474, 1484, 1485, 1486, 1487, 1475, - 1488, 1489, 1490, 1491, 1492, 1493, 1476, 1494, 1495, 1496, - 1497, 1477, 1478, 1498, 1479, 1499, 1480, 1481, 1482, 1483, - 1500, 1501, 1484, 1485, 1486, 1487, 1502, 1488, 1489, 1490, - 1491, 1492, 1493, 1503, 1494, 1495, 1496, 1497, 1504, 1505, - 1498, 1506, 1499, 1507, 1508, 1509, 1510, 1500, 1501, 1511, - - 1512, 1513, 1514, 1502, 1515, 1516, 1517, 1518, 1519, 1520, - 1503, 1521, 1522, 1523, 1524, 1504, 1505, 1525, 1506, 1527, - 1507, 1508, 1509, 1510, 1528, 1529, 1511, 1512, 1513, 1514, - 1530, 1515, 1516, 1517, 1518, 1519, 1520, 1531, 1521, 1522, - 1523, 1524, 1532, 1533, 1525, 1534, 1527, 1535, 1536, 1537, - 1538, 1528, 1529, 1539, 1540, 1541, 1542, 1530, 1543, 1544, - 1545, 1546, 1547, 1548, 1531, 1549, 1550, 1551, 1552, 1532, - 1533, 1553, 1534, 1554, 1535, 1536, 1537, 1538, 1556, 1557, - 1539, 1540, 1541, 1542, 1558, 1543, 1544, 1545, 1546, 1547, - 1548, 1559, 1549, 1550, 1551, 1552, 1560, 1561, 1553, 1562, - - 1554, 1563, 1564, 1565, 1566, 1556, 1557, 1567, 1568, 1569, - 1571, 1558, 1572, 1573, 1574, 1575, 1576, 1577, 1559, 1578, - 1579, 1580, 1581, 1560, 1561, 1148, 1562, 1147, 1563, 1564, - 1565, 1566, 1144, 1018, 1567, 1568, 1569, 1571, 1018, 1572, - 1573, 1574, 1575, 1576, 1577, 1016, 1578, 1579, 1580, 1581, - 39, 39, 1016, 1082, 1080, 1079, 1074, 1067, 1059, 1052, - 1047, 1041, 1023, 1022, 1021, 1018, 1016, 1007, 992, 981, - 957, 905, 902, 900, 897, 896, 895, 894, 893, 858, - 857, 853, 812, 807, 806, 805, 803, 782, 780, 772, - 752, 739, 702, 697, 695, 693, 686, 684, 665, 660, - - 645, 639, 637, 620, 609, 574, 572, 571, 556, 539, - 525, 511, 510, 503, 490, 479, 477, 466, 464, 442, - 438, 436, 431, 413, 404, 397, 357, 322, 306, 270, - 242, 37, 37, 1582, 3, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582 + 461, 452, 468, 453, 469, 470, 462, 463, 471, 454, + 465, 477, 455, 466, 467, 472, 479, 447, 448, 449, + 480, 459, 481, 450, 482, 451, 460, 483, 452, 468, + 453, 469, 470, 473, 484, 471, 454, 474, 477, 455, + 485, 475, 472, 479, 486, 487, 488, 480, 490, 481, + 491, 482, 492, 497, 483, 498, 499, 500, 501, 494, + 473, 484, 493, 495, 474, 503, 504, 485, 496, 506, + 507, 486, 487, 488, 508, 490, 511, 491, 512, 492, + + 497, 505, 498, 499, 500, 501, 494, 513, 514, 515, + 495, 516, 503, 504, 517, 496, 506, 507, 518, 519, + 520, 508, 522, 511, 523, 512, 525, 521, 505, 526, + 527, 528, 529, 530, 513, 514, 515, 531, 516, 532, + 535, 517, 536, 533, 537, 518, 519, 520, 534, 522, + 539, 523, 540, 525, 521, 541, 526, 527, 528, 529, + 530, 542, 543, 544, 531, 545, 532, 535, 546, 536, + 533, 537, 547, 548, 549, 534, 550, 539, 551, 540, + 552, 553, 541, 554, 556, 557, 558, 559, 542, 543, + 544, 560, 545, 563, 561, 546, 564, 565, 566, 547, + + 548, 549, 567, 550, 562, 551, 568, 552, 553, 569, + 554, 556, 557, 558, 559, 572, 574, 575, 560, 576, + 563, 561, 577, 564, 565, 566, 578, 581, 579, 567, + 582, 562, 580, 568, 583, 584, 569, 586, 588, 589, + 590, 591, 572, 574, 575, 592, 576, 585, 593, 577, + 594, 587, 595, 578, 581, 579, 596, 582, 599, 580, + 600, 583, 584, 597, 586, 588, 589, 590, 591, 601, + 598, 602, 592, 603, 585, 593, 604, 594, 587, 595, + 605, 606, 608, 596, 612, 599, 617, 600, 609, 610, + 597, 613, 619, 615, 611, 620, 601, 598, 602, 623, + + 603, 621, 614, 604, 622, 624, 625, 605, 606, 608, + 616, 612, 626, 617, 627, 609, 610, 628, 613, 619, + 615, 611, 620, 629, 630, 631, 623, 632, 621, 614, + 633, 622, 624, 625, 634, 636, 638, 616, 641, 626, + 639, 627, 642, 640, 628, 644, 645, 646, 647, 648, + 629, 630, 631, 649, 632, 650, 651, 633, 652, 653, + 654, 634, 636, 638, 655, 641, 656, 639, 657, 642, + 640, 659, 644, 645, 646, 647, 648, 660, 661, 662, + 649, 664, 650, 651, 665, 652, 653, 654, 666, 667, + 670, 655, 668, 656, 671, 657, 672, 673, 659, 674, + + 675, 676, 677, 678, 660, 661, 662, 679, 664, 680, + 669, 665, 681, 683, 685, 666, 667, 670, 686, 668, + 692, 671, 694, 672, 673, 696, 674, 675, 676, 677, + 678, 697, 699, 701, 679, 702, 680, 687, 688, 681, + 683, 685, 698, 703, 704, 686, 689, 692, 705, 694, + 706, 690, 696, 707, 708, 709, 710, 711, 697, 699, + 701, 712, 702, 713, 687, 688, 716, 714, 717, 698, + 703, 704, 718, 689, 715, 705, 719, 706, 690, 720, + 707, 708, 709, 710, 711, 721, 722, 723, 712, 724, + 713, 725, 726, 716, 714, 717, 727, 728, 729, 718, + + 730, 715, 731, 719, 732, 733, 720, 734, 735, 737, + 738, 739, 721, 722, 723, 740, 724, 741, 725, 726, + 742, 743, 744, 727, 728, 729, 745, 730, 746, 731, + 747, 732, 733, 748, 734, 735, 737, 738, 739, 750, + 751, 752, 740, 753, 741, 754, 755, 742, 743, 744, + 756, 757, 758, 745, 761, 746, 762, 747, 759, 760, + 748, 763, 764, 765, 766, 767, 750, 751, 752, 768, + 753, 770, 754, 755, 776, 778, 1160, 756, 757, 758, + 780, 761, 781, 762, 782, 759, 760, 783, 763, 764, + 765, 766, 767, 771, 784, 785, 768, 772, 770, 773, + + 786, 776, 778, 774, 775, 787, 788, 780, 789, 781, + 790, 782, 791, 792, 783, 793, 794, 795, 796, 797, + 771, 784, 785, 798, 772, 799, 773, 786, 801, 805, + 774, 775, 787, 788, 806, 789, 807, 790, 808, 791, + 792, 810, 793, 794, 795, 796, 797, 811, 813, 814, + 798, 815, 799, 816, 817, 801, 805, 812, 818, 819, + 820, 806, 821, 807, 822, 808, 823, 824, 810, 825, + 826, 827, 828, 829, 811, 813, 814, 830, 815, 831, + 816, 817, 832, 833, 812, 818, 819, 820, 834, 821, + 835, 822, 836, 823, 824, 837, 825, 826, 827, 828, + + 829, 838, 839, 840, 830, 841, 831, 842, 843, 832, + 833, 844, 845, 846, 847, 834, 848, 835, 849, 836, + 851, 852, 837, 855, 856, 857, 858, 859, 838, 839, + 840, 860, 841, 861, 842, 843, 862, 863, 844, 845, + 846, 847, 864, 848, 865, 849, 866, 851, 852, 867, + 855, 856, 857, 858, 859, 868, 869, 870, 860, 871, + 861, 872, 873, 862, 863, 874, 875, 876, 877, 864, + 878, 865, 879, 866, 880, 881, 867, 882, 883, 884, + 885, 886, 868, 869, 870, 887, 871, 888, 872, 873, + 894, 895, 874, 875, 876, 877, 897, 878, 899, 879, + + 900, 880, 881, 905, 882, 883, 884, 885, 886, 906, + 907, 908, 887, 909, 888, 910, 911, 894, 895, 912, + 913, 914, 916, 897, 917, 899, 920, 900, 921, 918, + 905, 922, 923, 924, 915, 925, 906, 907, 908, 926, + 909, 919, 910, 911, 927, 928, 912, 913, 914, 916, + 929, 917, 930, 920, 931, 921, 918, 932, 922, 923, + 924, 915, 925, 933, 934, 935, 926, 936, 919, 937, + 938, 927, 928, 939, 940, 941, 942, 929, 943, 930, + 944, 931, 945, 946, 932, 947, 948, 949, 950, 951, + 933, 934, 935, 952, 936, 954, 937, 938, 955, 956, + + 939, 940, 941, 942, 957, 943, 958, 944, 959, 945, + 946, 960, 947, 948, 949, 950, 951, 961, 962, 964, + 952, 965, 954, 966, 967, 955, 956, 968, 963, 969, + 970, 957, 971, 958, 972, 959, 973, 974, 960, 975, + 977, 978, 979, 980, 961, 962, 964, 981, 965, 982, + 966, 967, 983, 984, 968, 963, 969, 970, 985, 971, + 986, 972, 988, 973, 974, 989, 975, 977, 978, 979, + 980, 990, 991, 992, 981, 993, 982, 994, 995, 983, + 984, 996, 997, 998, 999, 985, 1000, 986, 1001, 988, + 1003, 1004, 989, 1005, 1006, 1007, 1008, 1009, 990, 991, + + 992, 1014, 993, 1015, 994, 995, 1019, 1020, 996, 997, + 998, 999, 1021, 1000, 902, 1001, 903, 1003, 1004, 1022, + 1005, 1006, 1007, 1008, 1009, 1023, 904, 1024, 1014, 1025, + 1015, 1026, 1027, 1019, 1020, 1028, 1029, 1030, 1031, 1021, + 1032, 1033, 1034, 1035, 1037, 1038, 1022, 1039, 1040, 1041, + 1045, 1043, 1023, 1046, 1024, 1044, 1025, 1048, 1026, 1027, + 1049, 1050, 1028, 1029, 1030, 1031, 1051, 1032, 1033, 1034, + 1035, 1037, 1038, 1052, 1039, 1040, 1041, 1045, 1043, 1053, + 1046, 1055, 1044, 1056, 1048, 1057, 1060, 1049, 1050, 1061, + 1063, 1064, 1065, 1051, 1058, 1066, 1067, 1069, 1070, 1071, + + 1052, 1072, 1059, 1075, 1077, 1078, 1053, 1079, 1055, 1080, + 1056, 1081, 1057, 1060, 1082, 1083, 1061, 1063, 1064, 1065, + 1084, 1058, 1066, 1067, 1069, 1070, 1071, 1085, 1072, 1059, + 1075, 1077, 1078, 1086, 1079, 1087, 1080, 1088, 1081, 1089, + 1090, 1082, 1083, 1091, 1092, 1093, 1094, 1084, 1095, 1096, + 1097, 1098, 1099, 1100, 1085, 1101, 1102, 1103, 1104, 1105, + 1086, 1106, 1087, 1107, 1088, 1108, 1089, 1090, 1109, 1110, + 1091, 1092, 1093, 1094, 1111, 1095, 1096, 1097, 1098, 1099, + 1100, 1112, 1101, 1102, 1103, 1104, 1105, 1113, 1106, 1114, + 1107, 1115, 1108, 1116, 1117, 1109, 1110, 1118, 1119, 1120, + + 1121, 1111, 1122, 1123, 1124, 1125, 1126, 1127, 1112, 1128, + 1129, 1130, 1131, 1132, 1113, 1133, 1114, 1134, 1115, 1135, + 1116, 1117, 1136, 1137, 1118, 1119, 1120, 1121, 1139, 1122, + 1123, 1124, 1125, 1126, 1127, 1140, 1128, 1129, 1130, 1131, + 1132, 1143, 1133, 1144, 1134, 1145, 1135, 1146, 1147, 1136, + 1137, 1148, 1149, 1150, 1151, 1139, 1152, 1153, 1154, 1155, + 1156, 1157, 1140, 1159, 1161, 1162, 1163, 1164, 1143, 1165, + 1144, 1166, 1145, 1167, 1146, 1147, 1168, 1169, 1148, 1149, + 1150, 1151, 1170, 1152, 1153, 1154, 1155, 1156, 1157, 1172, + 1159, 1161, 1162, 1163, 1164, 1173, 1165, 1174, 1166, 1175, + + 1167, 1176, 1179, 1168, 1169, 1181, 1182, 1183, 1184, 1170, + 1185, 1186, 1187, 1188, 1189, 1190, 1172, 1191, 1192, 1193, + 1194, 1195, 1173, 1196, 1174, 1197, 1175, 1199, 1176, 1179, + 1200, 1201, 1181, 1182, 1183, 1184, 1202, 1185, 1186, 1187, + 1188, 1189, 1190, 1203, 1191, 1192, 1193, 1194, 1195, 1204, + 1196, 1205, 1197, 1206, 1199, 1208, 1209, 1200, 1201, 1210, + 1211, 1212, 1213, 1202, 1215, 1216, 1218, 1219, 1220, 1221, + 1203, 1158, 1224, 1217, 1225, 1227, 1204, 1228, 1205, 1229, + 1206, 1222, 1208, 1209, 1230, 1231, 1210, 1211, 1212, 1213, + 1232, 1215, 1216, 1218, 1219, 1220, 1221, 1233, 1223, 1224, + + 1234, 1225, 1227, 1235, 1228, 1236, 1229, 1237, 1222, 1238, + 1239, 1230, 1231, 1241, 1242, 1243, 1240, 1232, 1244, 1245, + 1247, 1248, 1249, 1250, 1233, 1223, 1251, 1234, 1252, 1253, + 1235, 1254, 1236, 1255, 1237, 1256, 1238, 1239, 1257, 1258, + 1241, 1242, 1243, 1240, 1259, 1244, 1245, 1247, 1248, 1249, + 1250, 1260, 1261, 1251, 1262, 1252, 1253, 1263, 1254, 1264, + 1255, 1265, 1256, 1266, 1267, 1257, 1258, 1268, 1269, 1270, + 1271, 1259, 1272, 1273, 1274, 1275, 1277, 1278, 1260, 1261, + 1279, 1262, 1280, 1281, 1263, 1282, 1264, 1283, 1265, 1284, + 1266, 1267, 1285, 1286, 1268, 1269, 1270, 1271, 1287, 1272, + + 1273, 1274, 1275, 1277, 1278, 1288, 1291, 1279, 1292, 1280, + 1281, 1293, 1282, 1294, 1283, 1295, 1284, 1296, 1297, 1285, + 1286, 1298, 1299, 1300, 1301, 1287, 1303, 1304, 1305, 1306, + 1308, 1309, 1288, 1291, 1310, 1292, 1311, 1312, 1293, 1313, + 1294, 1314, 1295, 1315, 1296, 1297, 1316, 1317, 1298, 1299, + 1300, 1301, 1319, 1303, 1304, 1305, 1306, 1308, 1309, 1320, + 1325, 1310, 1326, 1311, 1312, 1328, 1313, 1329, 1314, 1330, + 1315, 1331, 1332, 1316, 1317, 1333, 1334, 1335, 1337, 1319, + 1338, 1339, 1340, 1341, 1343, 1344, 1320, 1325, 1345, 1326, + 1346, 1347, 1328, 1348, 1329, 1349, 1330, 1350, 1331, 1332, + + 1351, 1352, 1333, 1334, 1335, 1337, 1354, 1338, 1339, 1340, + 1341, 1343, 1344, 1355, 1356, 1345, 1357, 1346, 1347, 1358, + 1348, 1359, 1349, 1360, 1350, 1361, 1362, 1351, 1352, 1363, + 1364, 1365, 1366, 1354, 1367, 1368, 1369, 1370, 1371, 1372, + 1355, 1356, 1373, 1357, 1374, 1375, 1358, 1376, 1359, 1378, + 1360, 1379, 1361, 1362, 1380, 1382, 1363, 1364, 1365, 1366, + 1383, 1367, 1368, 1369, 1370, 1371, 1372, 1386, 1384, 1373, + 1385, 1374, 1375, 1388, 1376, 1390, 1378, 1391, 1379, 1393, + 1394, 1380, 1382, 1395, 1396, 1397, 1398, 1383, 1399, 1402, + 1400, 1403, 1404, 1405, 1386, 1384, 1401, 1385, 1406, 1407, + + 1388, 1408, 1390, 1409, 1391, 1410, 1393, 1394, 1411, 1412, + 1395, 1396, 1397, 1398, 1414, 1399, 1402, 1400, 1403, 1404, + 1405, 1415, 1416, 1401, 1417, 1406, 1407, 1418, 1408, 1419, + 1409, 1420, 1410, 1421, 1422, 1411, 1412, 1423, 1424, 1425, + 1426, 1414, 1429, 1430, 1431, 1432, 1433, 1434, 1415, 1416, + 1435, 1417, 1436, 1437, 1418, 1438, 1419, 1439, 1420, 1441, + 1421, 1422, 1442, 1443, 1423, 1424, 1425, 1426, 1444, 1429, + 1430, 1431, 1432, 1433, 1434, 1445, 1447, 1435, 1448, 1436, + 1437, 1449, 1438, 1450, 1439, 1451, 1441, 1453, 1455, 1442, + 1443, 1456, 1457, 1458, 1459, 1444, 1460, 1461, 1462, 1463, + + 1464, 1465, 1445, 1447, 1466, 1448, 1467, 1468, 1449, 1469, + 1450, 1470, 1451, 1471, 1453, 1455, 1472, 1473, 1456, 1457, + 1458, 1459, 1474, 1460, 1461, 1462, 1463, 1464, 1465, 1475, + 1476, 1466, 1477, 1467, 1468, 1478, 1469, 1479, 1470, 1480, + 1471, 1481, 1482, 1472, 1473, 1483, 1484, 1485, 1486, 1474, + 1487, 1488, 1489, 1490, 1491, 1492, 1475, 1476, 1493, 1477, + 1494, 1495, 1478, 1496, 1479, 1497, 1480, 1498, 1481, 1482, + 1499, 1500, 1483, 1484, 1485, 1486, 1501, 1487, 1488, 1489, + 1490, 1491, 1492, 1502, 1503, 1493, 1504, 1494, 1495, 1505, + 1496, 1506, 1497, 1507, 1498, 1508, 1509, 1499, 1500, 1510, + + 1511, 1512, 1513, 1501, 1514, 1515, 1516, 1517, 1519, 1520, + 1502, 1503, 1521, 1504, 1522, 1523, 1505, 1524, 1506, 1525, + 1507, 1526, 1508, 1509, 1527, 1528, 1510, 1511, 1512, 1513, + 1529, 1514, 1515, 1516, 1517, 1519, 1520, 1530, 1531, 1521, + 1532, 1522, 1523, 1533, 1524, 1534, 1525, 1535, 1526, 1536, + 1537, 1527, 1528, 1538, 1539, 1540, 1541, 1529, 1542, 1543, + 1544, 1545, 1546, 1548, 1530, 1531, 1549, 1532, 1550, 1551, + 1533, 1552, 1534, 1553, 1535, 1554, 1536, 1537, 1555, 1556, + 1538, 1539, 1540, 1541, 1557, 1542, 1543, 1544, 1545, 1546, + 1548, 1558, 1559, 1549, 1560, 1550, 1551, 1561, 1552, 1563, + + 1553, 1564, 1554, 1565, 1566, 1555, 1556, 1567, 1568, 1569, + 1570, 1557, 1571, 1572, 1573, 1142, 1141, 1138, 1558, 1559, + 1013, 1560, 1013, 1011, 1561, 1011, 1563, 1076, 1564, 1074, + 1565, 1566, 1073, 1068, 1567, 1568, 1569, 1570, 1062, 1571, + 1572, 1573, 39, 39, 1054, 1047, 1042, 1036, 1018, 1017, + 1016, 1013, 1011, 1002, 987, 976, 953, 901, 898, 896, + 893, 892, 891, 890, 889, 854, 853, 850, 809, 804, + 803, 802, 800, 779, 777, 769, 749, 736, 700, 695, + 693, 691, 684, 682, 663, 658, 643, 637, 635, 618, + 607, 573, 571, 570, 555, 538, 524, 510, 509, 502, + + 489, 478, 476, 464, 442, 438, 436, 431, 413, 404, + 397, 357, 322, 306, 270, 242, 37, 37, 1574, 3, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574 } ; -static yyconst flex_int16_t yy_chk[3104] = +static yyconst flex_int16_t yy_chk[3089] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1306,54 +1300,54 @@ 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, 1587, 13, 26, 1586, 16, 16, 9, 39, 39, - 15, 791, 28, 791, 15, 18, 16, 1585, 15, 13, + 21, 1579, 13, 26, 1578, 16, 16, 9, 39, 39, + 15, 788, 28, 788, 15, 18, 16, 1577, 15, 13, - 17, 15, 18, 791, 15, 1583, 16, 21, 17, 13, + 17, 15, 18, 788, 15, 1575, 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, 1564, 17, 1541, 20, 17, 20, - 19, 1505, 12, 12, 33, 12, 19, 17, 180, 180, - 1422, 12, 19, 12, 35, 1390, 1390, 20, 29, 19, - 12, 14, 29, 14, 20, 1420, 20, 19, 14, 14, + 20, 15, 19, 12, 1556, 17, 1533, 20, 17, 20, + 19, 1497, 12, 12, 33, 12, 19, 17, 180, 180, + 1414, 12, 19, 12, 35, 1382, 1382, 20, 29, 19, + 12, 14, 29, 14, 20, 1412, 20, 19, 14, 14, 22, 33, 14, 19, 23, 14, 29, 22, 23, 19, - 22, 35, 22, 34, 23, 29, 1413, 34, 14, 29, - 14, 1406, 27, 1374, 36, 14, 14, 22, 43, 14, + 22, 35, 22, 34, 23, 29, 1405, 34, 14, 29, + 14, 1398, 27, 1366, 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, 1352, 48, 24, 32, 32, 55, 24, 55, 49, + 24, 1344, 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, 1349, - 1346, 65, 66, 55, 25, 55, 67, 1340, 1334, 56, + 59, 51, 25, 52, 53, 54, 61, 64, 25, 1341, + 1338, 65, 66, 55, 25, 55, 67, 1332, 1326, 56, 59, 25, 57, 25, 58, 25, 60, 59, 68, 25, - 1303, 62, 62, 61, 64, 25, 62, 63, 65, 66, + 1295, 62, 62, 61, 64, 25, 62, 63, 65, 66, - 1291, 25, 30, 67, 62, 30, 30, 59, 30, 62, + 1283, 25, 30, 67, 62, 30, 30, 59, 30, 62, 70, 63, 30, 30, 71, 68, 30, 30, 62, 62, - 72, 1283, 1272, 62, 63, 69, 73, 69, 1269, 30, - 1268, 62, 30, 30, 76, 30, 62, 70, 63, 30, + 72, 1275, 1264, 62, 63, 69, 73, 69, 1261, 30, + 1260, 62, 30, 30, 76, 30, 62, 70, 63, 30, 30, 71, 69, 30, 30, 31, 74, 72, 31, 31, 77, 79, 69, 73, 69, 31, 31, 74, 75, 80, 81, 76, 31, 78, 75, 78, 82, 83, 84, 69, 85, 86, 31, 74, 87, 31, 31, 77, 79, 88, - 1267, 92, 31, 31, 74, 75, 80, 81, 93, 31, + 1259, 92, 31, 31, 74, 75, 80, 81, 93, 31, 78, 75, 78, 82, 83, 84, 90, 85, 86, 89, 90, 87, 91, 94, 89, 96, 88, 91, 92, 95, 97, 99, 100, 98, 101, 93, 102, 104, 105, 95, - 107, 1266, 1263, 90, 109, 100, 89, 90, 98, 91, + 107, 1258, 1255, 90, 109, 100, 89, 90, 98, 91, 94, 89, 96, 103, 91, 113, 95, 97, 99, 100, 98, 101, 114, 102, 104, 105, 95, 107, 106, 103, - 103, 109, 112, 111, 116, 98, 106, 1249, 115, 1244, - 103, 1228, 113, 1227, 1209, 117, 1177, 111, 115, 114, - 118, 119, 1150, 120, 112, 106, 103, 103, 1139, 112, + 103, 109, 112, 111, 116, 98, 106, 1241, 115, 1236, + 103, 1221, 113, 1220, 1202, 117, 1170, 111, 115, 114, + 118, 119, 1144, 120, 112, 106, 103, 103, 1133, 112, 111, 116, 121, 106, 108, 115, 108, 108, 110, 123, 108, 108, 117, 108, 111, 115, 108, 118, 119, 110, - 120, 112, 108, 110, 124, 110, 1131, 126, 127, 121, + 120, 112, 108, 110, 124, 110, 1125, 126, 127, 121, 130, 108, 132, 108, 108, 110, 123, 108, 108, 128, 108, 129, 131, 108, 129, 128, 110, 133, 134, 108, 110, 124, 110, 125, 126, 127, 125, 130, 135, 132, @@ -1394,10 +1388,10 @@ static yyconst flex_int16_t yy_chk[3104] = 284, 300, 302, 301, 286, 287, 288, 289, 290, 291, 305, 292, 306, 294, 307, 300, 301, 308, 312, 314, 315, 316, 295, 297, 318, 298, 299, 319, 300, 302, - 301, 320, 321, 1120, 1102, 1100, 323, 305, 324, 306, + 301, 320, 321, 1114, 1096, 1094, 323, 305, 324, 306, 325, 307, 300, 327, 308, 312, 314, 315, 316, 328, - 330, 318, 1099, 332, 319, 1089, 334, 335, 320, 321, + 330, 318, 1093, 332, 319, 1083, 334, 335, 320, 321, 322, 322, 322, 323, 326, 324, 322, 325, 322, 326, 327, 322, 336, 322, 337, 338, 328, 330, 339, 322, 332, 342, 322, 334, 335, 340, 346, 322, 322, 322, @@ -1427,219 +1421,216 @@ static yyconst flex_int16_t yy_chk[3104] = 461, 454, 462, 448, 450, 449, 463, 451, 465, 449, 466, 452, 453, 464, 454, 455, 456, 457, 458, 467, 464, 468, 459, 469, 453, 460, 470, 461, 454, 462, - 471, 472, 473, 463, 475, 465, 477, 466, 476, 476, - 464, 478, 480, 479, 476, 482, 467, 464, 468, 483, - - 469, 485, 478, 470, 485, 487, 488, 471, 472, 473, - 479, 475, 489, 477, 490, 476, 476, 492, 478, 480, - 479, 476, 482, 494, 491, 495, 483, 491, 485, 478, - 496, 485, 487, 488, 497, 498, 501, 479, 504, 489, - 505, 490, 504, 506, 492, 504, 508, 509, 511, 512, - 494, 491, 495, 513, 491, 514, 515, 496, 516, 517, - 518, 497, 498, 501, 519, 504, 520, 505, 521, 504, - 506, 522, 504, 508, 509, 511, 512, 524, 525, 526, - 513, 530, 514, 515, 532, 516, 517, 518, 534, 535, - 536, 519, 537, 520, 538, 521, 539, 540, 522, 541, - - 542, 543, 544, 545, 524, 525, 526, 546, 530, 547, - 537, 532, 548, 549, 552, 534, 535, 536, 554, 537, - 555, 538, 558, 539, 540, 560, 541, 542, 543, 544, - 545, 562, 563, 564, 546, 566, 547, 556, 556, 548, - 549, 552, 567, 563, 569, 554, 556, 555, 570, 558, - 571, 556, 560, 572, 573, 574, 578, 579, 562, 563, - 564, 580, 566, 581, 556, 556, 582, 583, 584, 567, - 563, 569, 585, 556, 583, 570, 586, 571, 556, 587, - 572, 573, 574, 578, 579, 588, 589, 591, 580, 592, - 581, 593, 594, 582, 583, 584, 595, 597, 598, 585, - - 599, 583, 600, 586, 601, 602, 587, 603, 604, 605, - 606, 608, 588, 589, 591, 609, 592, 610, 593, 594, - 611, 612, 613, 595, 597, 598, 614, 599, 616, 600, - 617, 601, 602, 618, 603, 604, 605, 606, 608, 619, - 620, 623, 609, 624, 610, 626, 627, 611, 612, 613, - 628, 629, 630, 614, 631, 616, 632, 617, 633, 633, - 618, 634, 635, 637, 638, 639, 619, 620, 623, 640, - 624, 641, 626, 627, 642, 644, 1077, 628, 629, 630, - 646, 631, 648, 632, 650, 633, 633, 653, 634, 635, - 637, 638, 639, 645, 654, 655, 640, 645, 641, 645, - - 657, 642, 644, 645, 645, 658, 659, 646, 662, 648, - 664, 650, 665, 666, 653, 667, 668, 669, 670, 671, - 645, 654, 655, 672, 645, 673, 645, 657, 675, 677, - 645, 645, 658, 659, 679, 662, 683, 664, 684, 665, - 666, 685, 667, 668, 669, 670, 671, 686, 689, 690, - 672, 691, 673, 692, 693, 675, 677, 695, 696, 690, - 697, 679, 698, 683, 699, 684, 700, 701, 685, 702, - 703, 704, 705, 706, 686, 689, 690, 707, 691, 708, - 692, 693, 709, 710, 695, 696, 690, 697, 711, 698, + 471, 472, 474, 463, 476, 465, 479, 466, 475, 475, + 464, 477, 481, 478, 475, 482, 467, 464, 468, 486, + + 469, 484, 477, 470, 484, 487, 488, 471, 472, 474, + 478, 476, 489, 479, 490, 475, 475, 490, 477, 481, + 478, 475, 482, 491, 493, 494, 486, 495, 484, 477, + 496, 484, 487, 488, 497, 500, 503, 478, 504, 489, + 503, 490, 505, 503, 490, 507, 508, 510, 511, 512, + 491, 493, 494, 513, 495, 514, 515, 496, 516, 517, + 518, 497, 500, 503, 519, 504, 520, 503, 521, 505, + 503, 523, 507, 508, 510, 511, 512, 524, 525, 529, + 513, 531, 514, 515, 533, 516, 517, 518, 534, 535, + 537, 519, 536, 520, 538, 521, 539, 540, 523, 541, + + 542, 543, 544, 545, 524, 525, 529, 546, 531, 547, + 536, 533, 548, 551, 553, 534, 535, 537, 554, 536, + 557, 538, 559, 539, 540, 561, 541, 542, 543, 544, + 545, 562, 563, 565, 546, 566, 547, 555, 555, 548, + 551, 553, 562, 568, 569, 554, 555, 557, 570, 559, + 571, 555, 561, 572, 573, 577, 578, 579, 562, 563, + 565, 580, 566, 581, 555, 555, 583, 582, 584, 562, + 568, 569, 585, 555, 582, 570, 586, 571, 555, 587, + 572, 573, 577, 578, 579, 588, 590, 591, 580, 592, + 581, 593, 594, 583, 582, 584, 596, 597, 598, 585, + + 599, 582, 600, 586, 601, 602, 587, 603, 604, 606, + 607, 608, 588, 590, 591, 609, 592, 610, 593, 594, + 611, 612, 614, 596, 597, 598, 615, 599, 616, 600, + 617, 601, 602, 618, 603, 604, 606, 607, 608, 621, + 622, 624, 609, 625, 610, 626, 627, 611, 612, 614, + 628, 629, 630, 615, 632, 616, 633, 617, 631, 631, + 618, 635, 636, 637, 638, 639, 621, 622, 624, 640, + 625, 642, 626, 627, 644, 646, 1071, 628, 629, 630, + 648, 632, 651, 633, 652, 631, 631, 653, 635, 636, + 637, 638, 639, 643, 655, 656, 640, 643, 642, 643, + + 657, 644, 646, 643, 643, 660, 662, 648, 663, 651, + 664, 652, 665, 666, 653, 667, 668, 669, 670, 671, + 643, 655, 656, 673, 643, 675, 643, 657, 677, 681, + 643, 643, 660, 662, 682, 663, 683, 664, 684, 665, + 666, 687, 667, 668, 669, 670, 671, 688, 689, 690, + 673, 691, 675, 693, 694, 677, 681, 688, 695, 696, + 697, 682, 698, 683, 699, 684, 700, 701, 687, 702, + 703, 704, 705, 706, 688, 689, 690, 707, 691, 708, + 693, 694, 709, 710, 688, 695, 696, 697, 711, 698, 712, 699, 713, 700, 701, 714, 702, 703, 704, 705, 706, 715, 716, 717, 707, 718, 708, 719, 720, 709, - 710, 721, 722, 723, 724, 711, 726, 712, 727, 713, - 730, 731, 714, 733, 734, 735, 738, 739, 715, 716, + 710, 721, 722, 724, 725, 711, 728, 712, 729, 713, + 731, 732, 714, 735, 736, 737, 738, 739, 715, 716, 717, 740, 718, 741, 719, 720, 742, 743, 721, 722, - 723, 724, 744, 726, 745, 727, 746, 730, 731, 747, - 733, 734, 735, 738, 739, 748, 749, 750, 740, 751, - 741, 752, 753, 742, 743, 754, 755, 757, 758, 744, - 759, 745, 761, 746, 762, 763, 747, 764, 765, 766, - 767, 768, 748, 749, 750, 769, 751, 770, 752, 753, - 771, 772, 754, 755, 757, 758, 773, 759, 779, 761, - - 780, 762, 763, 782, 764, 765, 766, 767, 768, 786, - 789, 792, 769, 793, 770, 794, 795, 771, 772, 798, - 799, 800, 801, 773, 802, 779, 803, 780, 804, 806, - 782, 807, 808, 809, 811, 1075, 786, 789, 792, 803, - 793, 812, 794, 795, 813, 805, 798, 799, 800, 801, - 805, 802, 814, 803, 815, 804, 806, 816, 807, 808, - 809, 811, 805, 817, 818, 819, 803, 820, 812, 821, - 822, 813, 805, 823, 824, 826, 827, 805, 828, 814, - 829, 815, 830, 831, 816, 832, 833, 834, 835, 805, - 817, 818, 819, 837, 820, 838, 821, 822, 839, 840, - - 823, 824, 826, 827, 842, 828, 844, 829, 845, 830, - 831, 846, 832, 833, 834, 835, 847, 848, 850, 851, - 837, 852, 838, 854, 853, 839, 840, 856, 857, 858, - 860, 842, 862, 844, 853, 845, 864, 865, 846, 866, - 867, 869, 870, 847, 848, 850, 851, 871, 852, 873, - 854, 853, 874, 875, 856, 857, 858, 860, 876, 862, - 877, 853, 878, 864, 865, 879, 866, 867, 869, 870, - 880, 881, 882, 884, 871, 885, 873, 886, 887, 874, - 875, 888, 889, 890, 891, 876, 892, 877, 893, 878, - 894, 895, 879, 896, 897, 899, 900, 880, 881, 882, - - 884, 901, 885, 902, 886, 887, 903, 904, 888, 889, - 890, 891, 905, 892, 906, 893, 906, 894, 895, 909, - 896, 897, 899, 900, 910, 915, 906, 916, 901, 917, - 902, 918, 919, 903, 904, 920, 921, 922, 923, 905, - 924, 925, 927, 928, 929, 930, 909, 931, 932, 934, - 935, 910, 915, 936, 916, 937, 917, 938, 918, 919, - 941, 942, 920, 921, 922, 923, 944, 924, 925, 927, - 928, 929, 930, 945, 931, 932, 934, 935, 947, 940, - 936, 948, 937, 940, 938, 950, 951, 941, 942, 953, - 954, 958, 957, 944, 959, 963, 964, 965, 966, 967, - - 945, 957, 968, 970, 971, 947, 940, 972, 948, 957, - 940, 973, 950, 951, 976, 978, 953, 954, 958, 957, - 980, 959, 963, 964, 965, 966, 967, 981, 957, 968, - 970, 971, 982, 986, 972, 987, 957, 988, 973, 989, - 990, 976, 978, 991, 992, 993, 994, 980, 995, 996, - 997, 998, 999, 1000, 981, 1001, 1002, 1003, 1004, 982, - 986, 1005, 987, 1006, 988, 1007, 989, 990, 1008, 1009, - 991, 992, 993, 994, 1010, 995, 996, 997, 998, 999, - 1000, 1011, 1001, 1002, 1003, 1004, 1013, 1014, 1005, 1019, - 1006, 1020, 1007, 1021, 1022, 1008, 1009, 1023, 1025, 1026, - - 1027, 1010, 1028, 1029, 1030, 1031, 1032, 1033, 1011, 1034, - 1035, 1036, 1037, 1013, 1014, 1038, 1019, 1039, 1020, 1040, - 1021, 1022, 1041, 1042, 1023, 1025, 1026, 1027, 1043, 1028, - 1029, 1030, 1031, 1032, 1033, 1044, 1034, 1035, 1036, 1037, - 1046, 1047, 1038, 1048, 1039, 1049, 1040, 1051, 1052, 1041, - 1042, 1055, 1056, 1057, 1059, 1043, 1060, 1062, 1063, 1064, - 1066, 1067, 1044, 1068, 1070, 1071, 1072, 1046, 1047, 1073, - 1048, 1074, 1049, 1076, 1051, 1052, 1078, 1079, 1055, 1056, - 1057, 1059, 1080, 1060, 1062, 1063, 1064, 1066, 1067, 1081, - 1068, 1070, 1071, 1072, 1082, 1083, 1073, 1085, 1074, 1086, - - 1076, 1087, 1088, 1078, 1079, 1090, 1093, 1096, 1097, 1080, - 1098, 1101, 1103, 1104, 1105, 1106, 1081, 1107, 1108, 1109, - 1110, 1082, 1083, 1111, 1085, 1112, 1086, 1113, 1087, 1088, - 1114, 1115, 1090, 1093, 1096, 1097, 1116, 1098, 1101, 1103, - 1104, 1105, 1106, 1117, 1107, 1108, 1109, 1110, 1118, 1119, - 1111, 1122, 1112, 1123, 1113, 1125, 1126, 1114, 1115, 1127, - 1128, 1129, 1130, 1116, 1132, 1133, 1134, 1135, 1136, 1137, - 1117, 1141, 1143, 1142, 1144, 1118, 1119, 1145, 1122, 1146, - 1123, 1142, 1125, 1126, 1148, 1147, 1127, 1128, 1129, 1130, - 1149, 1132, 1133, 1134, 1135, 1136, 1137, 1152, 1141, 1143, - - 1142, 1144, 1147, 1154, 1145, 1155, 1146, 1156, 1158, 1159, - 1160, 1148, 1147, 1161, 1162, 1163, 1164, 1149, 1165, 1166, - 1167, 1168, 1169, 1170, 1152, 1172, 1167, 1174, 1178, 1147, - 1154, 1179, 1155, 1180, 1156, 1158, 1159, 1160, 1181, 1182, - 1161, 1162, 1163, 1164, 1183, 1165, 1166, 1167, 1168, 1169, - 1170, 1184, 1172, 1167, 1174, 1178, 1185, 1186, 1179, 1187, - 1180, 1188, 1189, 1190, 1191, 1181, 1182, 1192, 1193, 1194, - 1195, 1183, 1196, 1197, 1199, 1200, 1201, 1202, 1184, 1203, - 1204, 1205, 1206, 1185, 1186, 1207, 1187, 1210, 1188, 1189, - 1190, 1191, 1211, 1214, 1192, 1193, 1194, 1195, 1215, 1196, - - 1197, 1199, 1200, 1201, 1202, 1216, 1203, 1204, 1205, 1206, - 1219, 1220, 1207, 1221, 1210, 1222, 1224, 1225, 1226, 1211, - 1214, 1229, 1230, 1231, 1233, 1215, 1234, 1235, 1236, 1237, - 1238, 1239, 1216, 1240, 1245, 1246, 1247, 1219, 1220, 1248, - 1221, 1250, 1222, 1224, 1225, 1226, 1251, 1252, 1229, 1230, - 1231, 1233, 1254, 1234, 1235, 1236, 1237, 1238, 1239, 1255, - 1240, 1245, 1246, 1247, 1256, 1257, 1248, 1260, 1250, 1261, - 1262, 1264, 1265, 1251, 1252, 1270, 1271, 1274, 1275, 1254, - 1276, 1278, 1279, 1280, 1281, 1282, 1255, 1284, 1285, 1287, - 1289, 1256, 1257, 1290, 1260, 1292, 1261, 1262, 1264, 1265, - - 1293, 1294, 1270, 1271, 1274, 1275, 1296, 1276, 1278, 1279, - 1280, 1281, 1282, 1297, 1284, 1285, 1287, 1289, 1298, 1299, - 1290, 1300, 1292, 1301, 1302, 1304, 1305, 1293, 1294, 1307, - 1308, 1310, 1311, 1296, 1313, 1315, 1316, 1317, 1318, 1319, - 1297, 1320, 1323, 1324, 1325, 1298, 1299, 1326, 1300, 1327, - 1301, 1302, 1304, 1305, 1328, 1329, 1307, 1308, 1310, 1311, - 1330, 1313, 1315, 1316, 1317, 1318, 1319, 1331, 1320, 1323, - 1324, 1325, 1332, 1335, 1326, 1338, 1327, 1339, 1342, 1343, - 1345, 1328, 1329, 1344, 1347, 1344, 1350, 1330, 1351, 1353, - 1355, 1356, 1357, 1358, 1331, 1359, 1360, 1361, 1362, 1332, - - 1335, 1363, 1338, 1361, 1339, 1342, 1343, 1345, 1364, 1365, - 1344, 1347, 1344, 1350, 1366, 1351, 1353, 1355, 1356, 1357, - 1358, 1367, 1359, 1360, 1361, 1362, 1368, 1369, 1363, 1370, - 1361, 1372, 1373, 1375, 1376, 1364, 1365, 1377, 1378, 1379, - 1380, 1366, 1381, 1382, 1383, 1384, 1385, 1386, 1367, 1389, - 1391, 1392, 1393, 1368, 1369, 1394, 1370, 1395, 1372, 1373, - 1375, 1376, 1396, 1398, 1377, 1378, 1379, 1380, 1399, 1381, - 1382, 1383, 1384, 1385, 1386, 1400, 1389, 1391, 1392, 1393, - 1403, 1404, 1394, 1407, 1395, 1408, 1409, 1410, 1412, 1396, - 1398, 1414, 1415, 1417, 1418, 1399, 1419, 1421, 1424, 1425, - - 1426, 1427, 1400, 1428, 1429, 1430, 1431, 1403, 1404, 1432, - 1407, 1433, 1408, 1409, 1410, 1412, 1434, 1437, 1414, 1415, - 1417, 1418, 1438, 1419, 1421, 1424, 1425, 1426, 1427, 1439, - 1428, 1429, 1430, 1431, 1440, 1441, 1432, 1442, 1433, 1443, - 1445, 1446, 1448, 1434, 1437, 1449, 1450, 1451, 1454, 1438, - 1455, 1457, 1460, 1461, 1462, 1463, 1439, 1464, 1465, 1467, - 1468, 1440, 1441, 1469, 1442, 1470, 1443, 1445, 1446, 1448, - 1471, 1472, 1449, 1450, 1451, 1454, 1473, 1455, 1457, 1460, - 1461, 1462, 1463, 1474, 1464, 1465, 1467, 1468, 1475, 1476, - 1469, 1477, 1470, 1478, 1479, 1480, 1481, 1471, 1472, 1482, - - 1483, 1484, 1485, 1473, 1486, 1487, 1488, 1489, 1490, 1491, - 1474, 1492, 1500, 1501, 1502, 1475, 1476, 1504, 1477, 1506, - 1478, 1479, 1480, 1481, 1507, 1509, 1482, 1483, 1484, 1485, - 1510, 1486, 1487, 1488, 1489, 1490, 1491, 1511, 1492, 1500, - 1501, 1502, 1512, 1513, 1504, 1516, 1506, 1518, 1519, 1520, - 1521, 1507, 1509, 1522, 1524, 1525, 1526, 1510, 1527, 1528, - 1529, 1530, 1531, 1532, 1511, 1534, 1535, 1536, 1538, 1512, - 1513, 1539, 1516, 1540, 1518, 1519, 1520, 1521, 1542, 1543, - 1522, 1524, 1525, 1526, 1544, 1527, 1528, 1529, 1530, 1531, - 1532, 1545, 1534, 1535, 1536, 1538, 1548, 1549, 1539, 1550, - - 1540, 1553, 1554, 1555, 1556, 1542, 1543, 1558, 1559, 1561, - 1565, 1544, 1566, 1567, 1570, 1571, 1572, 1574, 1545, 1575, - 1577, 1578, 1579, 1548, 1549, 1054, 1550, 1053, 1553, 1554, - 1555, 1556, 1050, 1018, 1558, 1559, 1561, 1565, 1017, 1566, - 1567, 1570, 1571, 1572, 1574, 1016, 1575, 1577, 1578, 1579, - 1584, 1584, 1015, 977, 975, 974, 969, 960, 952, 943, - 939, 933, 913, 912, 911, 908, 907, 898, 883, 872, - 843, 790, 783, 781, 778, 777, 776, 775, 774, 737, - 736, 732, 687, 682, 681, 680, 678, 649, 647, 643, - 621, 607, 565, 561, 559, 557, 553, 550, 531, 523, - - 507, 502, 499, 481, 474, 443, 441, 440, 425, 402, - 388, 373, 372, 367, 356, 344, 341, 333, 331, 317, - 313, 311, 303, 285, 273, 264, 223, 192, 177, 142, - 122, 37, 5, 3, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, 1582, - - 1582, 1582, 1582 + 724, 725, 744, 728, 745, 729, 746, 731, 732, 747, + 735, 736, 737, 738, 739, 748, 749, 750, 740, 751, + 741, 752, 754, 742, 743, 755, 756, 758, 759, 744, + 760, 745, 761, 746, 762, 763, 747, 764, 765, 766, + 767, 768, 748, 749, 750, 769, 751, 770, 752, 754, + 776, 777, 755, 756, 758, 759, 779, 760, 783, 761, + + 786, 762, 763, 789, 764, 765, 766, 767, 768, 790, + 791, 792, 769, 795, 770, 796, 797, 776, 777, 798, + 799, 800, 801, 779, 802, 783, 803, 786, 804, 802, + 789, 805, 806, 808, 800, 809, 790, 791, 792, 810, + 795, 802, 796, 797, 811, 812, 798, 799, 800, 801, + 813, 802, 814, 803, 815, 804, 802, 816, 805, 806, + 808, 800, 809, 817, 818, 819, 810, 820, 802, 821, + 823, 811, 812, 824, 825, 826, 827, 813, 828, 814, + 829, 815, 830, 831, 816, 832, 834, 835, 836, 837, + 817, 818, 819, 839, 820, 841, 821, 823, 842, 843, + + 824, 825, 826, 827, 844, 828, 845, 829, 847, 830, + 831, 848, 832, 834, 835, 836, 837, 849, 850, 852, + 839, 853, 841, 854, 856, 842, 843, 858, 850, 860, + 861, 844, 862, 845, 863, 847, 865, 866, 848, 867, + 869, 870, 871, 872, 849, 850, 852, 873, 853, 874, + 854, 856, 875, 876, 858, 850, 860, 861, 877, 862, + 878, 863, 880, 865, 866, 881, 867, 869, 870, 871, + 872, 882, 883, 884, 873, 885, 874, 886, 887, 875, + 876, 888, 889, 890, 891, 877, 892, 878, 893, 880, + 895, 896, 881, 897, 898, 899, 900, 901, 882, 883, + + 884, 905, 885, 906, 886, 887, 911, 912, 888, 889, + 890, 891, 913, 892, 902, 893, 902, 895, 896, 914, + 897, 898, 899, 900, 901, 915, 902, 916, 905, 917, + 906, 918, 919, 911, 912, 920, 921, 923, 924, 913, + 925, 926, 927, 928, 930, 931, 914, 932, 933, 934, + 937, 936, 915, 938, 916, 936, 917, 940, 918, 919, + 941, 943, 920, 921, 923, 924, 944, 925, 926, 927, + 928, 930, 931, 946, 932, 933, 934, 937, 936, 947, + 938, 949, 936, 950, 940, 953, 954, 941, 943, 955, + 959, 960, 961, 944, 953, 962, 963, 965, 966, 967, + + 946, 968, 953, 971, 973, 975, 947, 976, 949, 977, + 950, 981, 953, 954, 982, 983, 955, 959, 960, 961, + 984, 953, 962, 963, 965, 966, 967, 985, 968, 953, + 971, 973, 975, 986, 976, 987, 977, 988, 981, 989, + 990, 982, 983, 991, 992, 993, 994, 984, 995, 996, + 997, 998, 999, 1000, 985, 1001, 1002, 1003, 1004, 1005, + 986, 1006, 987, 1008, 988, 1009, 989, 990, 1014, 1015, + 991, 992, 993, 994, 1016, 995, 996, 997, 998, 999, + 1000, 1017, 1001, 1002, 1003, 1004, 1005, 1018, 1006, 1020, + 1008, 1021, 1009, 1022, 1023, 1014, 1015, 1024, 1025, 1026, + + 1027, 1016, 1028, 1029, 1030, 1031, 1032, 1033, 1017, 1034, + 1035, 1036, 1037, 1038, 1018, 1039, 1020, 1041, 1021, 1042, + 1022, 1023, 1043, 1044, 1024, 1025, 1026, 1027, 1046, 1028, + 1029, 1030, 1031, 1032, 1033, 1047, 1034, 1035, 1036, 1037, + 1038, 1050, 1039, 1051, 1041, 1052, 1042, 1054, 1055, 1043, + 1044, 1057, 1058, 1059, 1061, 1046, 1062, 1063, 1065, 1066, + 1067, 1068, 1047, 1070, 1072, 1073, 1074, 1075, 1050, 1076, + 1051, 1077, 1052, 1079, 1054, 1055, 1080, 1081, 1057, 1058, + 1059, 1061, 1082, 1062, 1063, 1065, 1066, 1067, 1068, 1084, + 1070, 1072, 1073, 1074, 1075, 1087, 1076, 1090, 1077, 1091, + + 1079, 1092, 1095, 1080, 1081, 1097, 1098, 1099, 1100, 1082, + 1101, 1102, 1103, 1104, 1105, 1106, 1084, 1107, 1108, 1109, + 1110, 1111, 1087, 1112, 1090, 1113, 1091, 1116, 1092, 1095, + 1117, 1119, 1097, 1098, 1099, 1100, 1120, 1101, 1102, 1103, + 1104, 1105, 1106, 1121, 1107, 1108, 1109, 1110, 1111, 1122, + 1112, 1123, 1113, 1124, 1116, 1126, 1127, 1117, 1119, 1128, + 1129, 1130, 1131, 1120, 1135, 1136, 1137, 1138, 1139, 1140, + 1121, 1069, 1142, 1136, 1143, 1146, 1122, 1148, 1123, 1149, + 1124, 1141, 1126, 1127, 1150, 1152, 1128, 1129, 1130, 1131, + 1153, 1135, 1136, 1137, 1138, 1139, 1140, 1154, 1141, 1142, + + 1155, 1143, 1146, 1156, 1148, 1157, 1149, 1158, 1141, 1159, + 1160, 1150, 1152, 1161, 1162, 1163, 1160, 1153, 1165, 1167, + 1171, 1172, 1173, 1174, 1154, 1141, 1175, 1155, 1176, 1177, + 1156, 1178, 1157, 1179, 1158, 1180, 1159, 1160, 1181, 1182, + 1161, 1162, 1163, 1160, 1183, 1165, 1167, 1171, 1172, 1173, + 1174, 1184, 1185, 1175, 1186, 1176, 1177, 1187, 1178, 1188, + 1179, 1189, 1180, 1190, 1192, 1181, 1182, 1193, 1194, 1195, + 1196, 1183, 1197, 1198, 1199, 1200, 1203, 1204, 1184, 1185, + 1207, 1186, 1208, 1209, 1187, 1212, 1188, 1213, 1189, 1214, + 1190, 1192, 1215, 1217, 1193, 1194, 1195, 1196, 1218, 1197, + + 1198, 1199, 1200, 1203, 1204, 1219, 1222, 1207, 1223, 1208, + 1209, 1224, 1212, 1226, 1213, 1227, 1214, 1228, 1229, 1215, + 1217, 1230, 1231, 1232, 1233, 1218, 1237, 1238, 1239, 1240, + 1242, 1243, 1219, 1222, 1244, 1223, 1246, 1247, 1224, 1248, + 1226, 1249, 1227, 1252, 1228, 1229, 1253, 1254, 1230, 1231, + 1232, 1233, 1256, 1237, 1238, 1239, 1240, 1242, 1243, 1257, + 1262, 1244, 1263, 1246, 1247, 1266, 1248, 1267, 1249, 1268, + 1252, 1270, 1271, 1253, 1254, 1272, 1273, 1274, 1276, 1256, + 1277, 1279, 1281, 1282, 1284, 1285, 1257, 1262, 1286, 1263, + 1288, 1289, 1266, 1290, 1267, 1291, 1268, 1292, 1270, 1271, + + 1293, 1294, 1272, 1273, 1274, 1276, 1296, 1277, 1279, 1281, + 1282, 1284, 1285, 1297, 1299, 1286, 1300, 1288, 1289, 1302, + 1290, 1303, 1291, 1305, 1292, 1307, 1308, 1293, 1294, 1309, + 1310, 1311, 1312, 1296, 1315, 1316, 1317, 1318, 1319, 1320, + 1297, 1299, 1321, 1300, 1322, 1323, 1302, 1324, 1303, 1327, + 1305, 1330, 1307, 1308, 1331, 1334, 1309, 1310, 1311, 1312, + 1335, 1315, 1316, 1317, 1318, 1319, 1320, 1337, 1336, 1321, + 1336, 1322, 1323, 1339, 1324, 1342, 1327, 1343, 1330, 1345, + 1347, 1331, 1334, 1348, 1349, 1350, 1351, 1335, 1352, 1354, + 1353, 1355, 1356, 1357, 1337, 1336, 1353, 1336, 1358, 1359, + + 1339, 1360, 1342, 1361, 1343, 1362, 1345, 1347, 1364, 1365, + 1348, 1349, 1350, 1351, 1367, 1352, 1354, 1353, 1355, 1356, + 1357, 1368, 1369, 1353, 1370, 1358, 1359, 1371, 1360, 1372, + 1361, 1373, 1362, 1374, 1375, 1364, 1365, 1376, 1377, 1378, + 1381, 1367, 1383, 1384, 1385, 1386, 1387, 1388, 1368, 1369, + 1390, 1370, 1391, 1392, 1371, 1395, 1372, 1396, 1373, 1399, + 1374, 1375, 1400, 1401, 1376, 1377, 1378, 1381, 1402, 1383, + 1384, 1385, 1386, 1387, 1388, 1404, 1406, 1390, 1407, 1391, + 1392, 1409, 1395, 1410, 1396, 1411, 1399, 1413, 1416, 1400, + 1401, 1417, 1418, 1419, 1420, 1402, 1421, 1422, 1423, 1424, + + 1425, 1426, 1404, 1406, 1429, 1407, 1430, 1431, 1409, 1432, + 1410, 1433, 1411, 1434, 1413, 1416, 1435, 1437, 1417, 1418, + 1419, 1420, 1438, 1421, 1422, 1423, 1424, 1425, 1426, 1440, + 1441, 1429, 1442, 1430, 1431, 1443, 1432, 1446, 1433, 1447, + 1434, 1449, 1452, 1435, 1437, 1453, 1454, 1455, 1456, 1438, + 1457, 1459, 1460, 1461, 1462, 1463, 1440, 1441, 1464, 1442, + 1465, 1466, 1443, 1467, 1446, 1468, 1447, 1469, 1449, 1452, + 1470, 1471, 1453, 1454, 1455, 1456, 1472, 1457, 1459, 1460, + 1461, 1462, 1463, 1473, 1474, 1464, 1475, 1465, 1466, 1476, + 1467, 1477, 1468, 1478, 1469, 1479, 1480, 1470, 1471, 1481, + + 1482, 1483, 1484, 1472, 1492, 1493, 1494, 1496, 1498, 1499, + 1473, 1474, 1501, 1475, 1502, 1503, 1476, 1504, 1477, 1505, + 1478, 1508, 1479, 1480, 1510, 1511, 1481, 1482, 1483, 1484, + 1512, 1492, 1493, 1494, 1496, 1498, 1499, 1513, 1514, 1501, + 1516, 1502, 1503, 1517, 1504, 1518, 1505, 1519, 1508, 1520, + 1521, 1510, 1511, 1522, 1523, 1524, 1526, 1512, 1527, 1528, + 1530, 1531, 1532, 1534, 1513, 1514, 1535, 1516, 1536, 1537, + 1517, 1540, 1518, 1541, 1519, 1542, 1520, 1521, 1545, 1546, + 1522, 1523, 1524, 1526, 1547, 1527, 1528, 1530, 1531, 1532, + 1534, 1548, 1550, 1535, 1551, 1536, 1537, 1553, 1540, 1557, + + 1541, 1558, 1542, 1559, 1562, 1545, 1546, 1563, 1564, 1566, + 1567, 1547, 1569, 1570, 1571, 1049, 1048, 1045, 1548, 1550, + 1013, 1551, 1012, 1011, 1553, 1010, 1557, 972, 1558, 970, + 1559, 1562, 969, 964, 1563, 1564, 1566, 1567, 956, 1569, + 1570, 1571, 1576, 1576, 948, 939, 935, 929, 909, 908, + 907, 904, 903, 894, 879, 868, 840, 787, 780, 778, + 775, 774, 773, 772, 771, 734, 733, 730, 685, 680, + 679, 678, 676, 647, 645, 641, 619, 605, 564, 560, + 558, 556, 552, 549, 530, 522, 506, 501, 498, 480, + 473, 443, 441, 440, 425, 402, 388, 373, 372, 367, + + 356, 344, 341, 331, 317, 313, 311, 303, 285, 273, + 264, 223, 192, 177, 142, 122, 37, 5, 3, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574 } ; static yy_state_type yy_last_accepting_state; @@ -1722,7 +1713,7 @@ conf_yy_fatal_error(const char *msg) return 0; } -#line 1726 "conf_lexer.c" +#line 1717 "conf_lexer.c" #define INITIAL 0 @@ -1904,7 +1895,7 @@ YY_DECL #line 78 "conf_lexer.l" -#line 1908 "conf_lexer.c" +#line 1899 "conf_lexer.c" if ( !(yy_init) ) { @@ -1963,13 +1954,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 >= 1583 ) + if ( yy_current_state >= 1575 ) 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 != 1582 ); + while ( yy_current_state != 1574 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -2537,62 +2528,62 @@ YY_RULE_SETUP case 101: YY_RULE_SETUP #line 227 "conf_lexer.l" -{ return NICK_CHANGES; } +{ yylval.number = 0; return TBOOL; } YY_BREAK case 102: YY_RULE_SETUP #line 228 "conf_lexer.l" -{ yylval.number = 0; return TBOOL; } +{ return NO_CREATE_ON_SPLIT; } YY_BREAK case 103: YY_RULE_SETUP #line 229 "conf_lexer.l" -{ return NO_CREATE_ON_SPLIT; } +{ return NO_JOIN_ON_SPLIT; } YY_BREAK case 104: YY_RULE_SETUP #line 230 "conf_lexer.l" -{ return NO_JOIN_ON_SPLIT; } +{ return NO_OPER_FLOOD; } YY_BREAK case 105: YY_RULE_SETUP #line 231 "conf_lexer.l" -{ return NO_OPER_FLOOD; } +{ return NO_TILDE; } YY_BREAK case 106: YY_RULE_SETUP #line 232 "conf_lexer.l" -{ return NO_TILDE; } +{ return T_NONONREG; } YY_BREAK case 107: YY_RULE_SETUP #line 233 "conf_lexer.l" -{ return T_NONONREG; } +{ return NUMBER_PER_CIDR; } YY_BREAK case 108: YY_RULE_SETUP #line 234 "conf_lexer.l" -{ return NUMBER_PER_CIDR; } +{ return NUMBER_PER_IP; } YY_BREAK case 109: YY_RULE_SETUP #line 235 "conf_lexer.l" -{ return NUMBER_PER_IP; } +{ return OPERATOR; } YY_BREAK case 110: YY_RULE_SETUP #line 236 "conf_lexer.l" -{ return OPERATOR; } +{ return OPER_PASS_RESV; } YY_BREAK case 111: YY_RULE_SETUP #line 237 "conf_lexer.l" -{ return OPER_PASS_RESV; } +{ return OPERATOR; } YY_BREAK case 112: YY_RULE_SETUP #line 238 "conf_lexer.l" -{ return OPERATOR; } +{ return PASSWORD; } YY_BREAK case 113: YY_RULE_SETUP @@ -2602,537 +2593,537 @@ YY_RULE_SETUP case 114: YY_RULE_SETUP #line 240 "conf_lexer.l" -{ return PASSWORD; } +{ return PING_COOKIE; } YY_BREAK case 115: YY_RULE_SETUP #line 241 "conf_lexer.l" -{ return PING_COOKIE; } +{ return PING_TIME; } YY_BREAK case 116: YY_RULE_SETUP #line 242 "conf_lexer.l" -{ return PING_TIME; } +{ return PORT; } YY_BREAK case 117: YY_RULE_SETUP #line 243 "conf_lexer.l" -{ return PORT; } +{ return RESV; } YY_BREAK case 118: YY_RULE_SETUP #line 244 "conf_lexer.l" -{ return RESV; } +{ return QUIET_ON_BAN; } YY_BREAK case 119: YY_RULE_SETUP #line 245 "conf_lexer.l" -{ return QUIET_ON_BAN; } +{ return RANDOM_IDLE; } YY_BREAK case 120: YY_RULE_SETUP #line 246 "conf_lexer.l" -{ return RANDOM_IDLE; } +{ return REASON; } YY_BREAK case 121: YY_RULE_SETUP #line 247 "conf_lexer.l" -{ return REASON; } +{ return T_RECVQ; } YY_BREAK case 122: YY_RULE_SETUP #line 248 "conf_lexer.l" -{ return T_RECVQ; } +{ return REDIRPORT; } YY_BREAK case 123: YY_RULE_SETUP #line 249 "conf_lexer.l" -{ return REDIRPORT; } +{ return REDIRSERV; } YY_BREAK case 124: YY_RULE_SETUP #line 250 "conf_lexer.l" -{ return REDIRSERV; } +{ return REGEX_T; } YY_BREAK case 125: YY_RULE_SETUP #line 251 "conf_lexer.l" -{ return REGEX_T; } +{ return REHASH; } YY_BREAK case 126: YY_RULE_SETUP #line 252 "conf_lexer.l" -{ return REHASH; } +{ return REMOTE; } YY_BREAK case 127: YY_RULE_SETUP #line 253 "conf_lexer.l" -{ return REMOTE; } +{ return REMOTEBAN; } YY_BREAK case 128: YY_RULE_SETUP #line 254 "conf_lexer.l" -{ return REMOTEBAN; } +{ return T_RESTART; } YY_BREAK case 129: YY_RULE_SETUP #line 255 "conf_lexer.l" -{ return T_RESTART; } +{ return RESV; } YY_BREAK case 130: YY_RULE_SETUP #line 256 "conf_lexer.l" -{ return RESV; } +{ return RESV_EXEMPT; } YY_BREAK case 131: YY_RULE_SETUP #line 257 "conf_lexer.l" -{ return RESV_EXEMPT; } +{ return RSA_PRIVATE_KEY_FILE; } YY_BREAK case 132: YY_RULE_SETUP #line 258 "conf_lexer.l" -{ return RSA_PRIVATE_KEY_FILE; } +{ return RSA_PUBLIC_KEY_FILE; } YY_BREAK case 133: YY_RULE_SETUP #line 259 "conf_lexer.l" -{ return RSA_PUBLIC_KEY_FILE; } +{ return T_SSL; } YY_BREAK case 134: YY_RULE_SETUP #line 260 "conf_lexer.l" -{ return T_SSL; } +{ return SSL_CERTIFICATE_FILE; } YY_BREAK case 135: YY_RULE_SETUP #line 261 "conf_lexer.l" -{ return SSL_CERTIFICATE_FILE; } +{ return T_SSL_CLIENT_METHOD; } YY_BREAK case 136: YY_RULE_SETUP #line 262 "conf_lexer.l" -{ return T_SSL_CLIENT_METHOD; } +{ return T_SSL_SERVER_METHOD; } YY_BREAK case 137: YY_RULE_SETUP #line 263 "conf_lexer.l" -{ return T_SSL_SERVER_METHOD; } +{ return SSL_DH_PARAM_FILE; } YY_BREAK case 138: YY_RULE_SETUP #line 264 "conf_lexer.l" -{ return SSL_DH_PARAM_FILE; } +{ return T_SSL_CIPHER_LIST; } YY_BREAK case 139: YY_RULE_SETUP #line 265 "conf_lexer.l" -{ return T_SSL_CIPHER_LIST; } +{ return T_SSLV3; } YY_BREAK case 140: YY_RULE_SETUP #line 266 "conf_lexer.l" -{ return T_SSLV3; } +{ return T_TLSV1; } YY_BREAK case 141: YY_RULE_SETUP #line 267 "conf_lexer.l" -{ return T_TLSV1; } +{ return SEND_PASSWORD; } YY_BREAK case 142: YY_RULE_SETUP #line 268 "conf_lexer.l" -{ return SEND_PASSWORD; } +{ return SENDQ; } YY_BREAK case 143: YY_RULE_SETUP #line 269 "conf_lexer.l" -{ return SENDQ; } +{ return T_SERVER; } YY_BREAK case 144: YY_RULE_SETUP #line 270 "conf_lexer.l" -{ return T_SERVER; } +{ return SERVERHIDE; } YY_BREAK case 145: YY_RULE_SETUP #line 271 "conf_lexer.l" -{ return SERVERHIDE; } +{ return SERVERINFO; } YY_BREAK case 146: YY_RULE_SETUP #line 272 "conf_lexer.l" -{ return SERVERINFO; } +{ return T_SERVICE; } YY_BREAK case 147: YY_RULE_SETUP #line 273 "conf_lexer.l" -{ return T_SERVICE; } +{ return T_SERVICES_NAME; } YY_BREAK case 148: YY_RULE_SETUP #line 274 "conf_lexer.l" -{ return T_SERVICES_NAME; } +{ return T_SET; } YY_BREAK case 149: YY_RULE_SETUP #line 275 "conf_lexer.l" -{ return T_SET; } +{ return T_SHARED; } YY_BREAK case 150: YY_RULE_SETUP #line 276 "conf_lexer.l" -{ return T_SHARED; } +{ return SHORT_MOTD; } YY_BREAK case 151: YY_RULE_SETUP #line 277 "conf_lexer.l" -{ return SHORT_MOTD; } +{ return IRCD_SID; } YY_BREAK case 152: YY_RULE_SETUP #line 278 "conf_lexer.l" -{ return IRCD_SID; } +{ return T_SIZE; } YY_BREAK case 153: YY_RULE_SETUP #line 279 "conf_lexer.l" -{ return T_SIZE; } +{ return SPOOF; } YY_BREAK case 154: YY_RULE_SETUP #line 280 "conf_lexer.l" -{ return SPOOF; } +{ return SPOOF_NOTICE; } YY_BREAK case 155: YY_RULE_SETUP #line 281 "conf_lexer.l" -{ return SPOOF_NOTICE; } +{ return TKLINE_EXPIRE_NOTICES; } YY_BREAK case 156: YY_RULE_SETUP #line 282 "conf_lexer.l" -{ return TKLINE_EXPIRE_NOTICES; } +{ return TYPE; } YY_BREAK case 157: YY_RULE_SETUP #line 283 "conf_lexer.l" -{ return TYPE; } +{ return TRUE_NO_OPER_FLOOD; } YY_BREAK case 158: YY_RULE_SETUP #line 284 "conf_lexer.l" -{ return TRUE_NO_OPER_FLOOD; } +{ return T_UMODES; } YY_BREAK case 159: YY_RULE_SETUP #line 285 "conf_lexer.l" -{ return T_UMODES; } +{ return UNKLINE; } YY_BREAK case 160: YY_RULE_SETUP #line 286 "conf_lexer.l" -{ return UNKLINE; } +{ return T_UNDLINE; } YY_BREAK case 161: YY_RULE_SETUP #line 287 "conf_lexer.l" -{ return T_UNDLINE; } +{ return T_UNLIMITED; } YY_BREAK case 162: YY_RULE_SETUP #line 288 "conf_lexer.l" -{ return T_UNLIMITED; } +{ return USE_EGD; } YY_BREAK case 163: YY_RULE_SETUP #line 289 "conf_lexer.l" -{ return USE_EGD; } +{ return USE_LOGGING; } YY_BREAK case 164: YY_RULE_SETUP #line 290 "conf_lexer.l" -{ return USE_LOGGING; } +{ return THROTTLE_TIME; } YY_BREAK case 165: YY_RULE_SETUP #line 291 "conf_lexer.l" -{ return THROTTLE_TIME; } +{ return USER; } YY_BREAK case 166: YY_RULE_SETUP #line 292 "conf_lexer.l" -{ return USER; } +{ return VHOST; } YY_BREAK case 167: YY_RULE_SETUP #line 293 "conf_lexer.l" -{ return VHOST; } +{ return VHOST6; } YY_BREAK case 168: YY_RULE_SETUP #line 294 "conf_lexer.l" -{ return VHOST6; } +{ return T_WEBIRC; } YY_BREAK case 169: YY_RULE_SETUP #line 295 "conf_lexer.l" -{ return T_WEBIRC; } +{ return XLINE; } YY_BREAK case 170: YY_RULE_SETUP #line 296 "conf_lexer.l" -{ return XLINE; } +{ yylval.number = 1; return TBOOL; } YY_BREAK case 171: YY_RULE_SETUP -#line 297 "conf_lexer.l" -{ yylval.number = 1; return TBOOL; } +#line 298 "conf_lexer.l" +{ return FAILED_OPER_NOTICE; } YY_BREAK case 172: YY_RULE_SETUP #line 299 "conf_lexer.l" -{ return FAILED_OPER_NOTICE; } +{ return MAX_ACCEPT; } YY_BREAK case 173: YY_RULE_SETUP #line 300 "conf_lexer.l" -{ return MAX_ACCEPT; } +{ return MAX_NICK_CHANGES; } YY_BREAK case 174: YY_RULE_SETUP #line 301 "conf_lexer.l" -{ return MAX_NICK_CHANGES; } +{ return MAX_CHANS_PER_OPER; } YY_BREAK case 175: YY_RULE_SETUP #line 302 "conf_lexer.l" -{ return MAX_CHANS_PER_OPER; } +{ return MAX_CHANS_PER_USER; } YY_BREAK case 176: YY_RULE_SETUP #line 303 "conf_lexer.l" -{ return MAX_CHANS_PER_USER; } +{ return MAX_NICK_TIME; } YY_BREAK case 177: YY_RULE_SETUP #line 304 "conf_lexer.l" -{ return MAX_NICK_TIME; } +{ return ANTI_NICK_FLOOD; } YY_BREAK case 178: YY_RULE_SETUP #line 305 "conf_lexer.l" -{ return ANTI_NICK_FLOOD; } +{ return ANTI_SPAM_EXIT_MESSAGE_TIME; } YY_BREAK case 179: YY_RULE_SETUP #line 306 "conf_lexer.l" -{ return ANTI_SPAM_EXIT_MESSAGE_TIME; } +{ return TS_MAX_DELTA; } YY_BREAK case 180: YY_RULE_SETUP #line 307 "conf_lexer.l" -{ return TS_MAX_DELTA; } +{ return TS_WARN_DELTA; } YY_BREAK case 181: YY_RULE_SETUP #line 308 "conf_lexer.l" -{ return TS_WARN_DELTA; } +{ return LINKS_DELAY; } YY_BREAK case 182: YY_RULE_SETUP #line 309 "conf_lexer.l" -{ return LINKS_DELAY; } +{ return WARN_NO_NLINE; } YY_BREAK case 183: YY_RULE_SETUP -#line 310 "conf_lexer.l" -{ return WARN_NO_NLINE; } +#line 311 "conf_lexer.l" +{ return STATS_E_DISABLED; } YY_BREAK case 184: YY_RULE_SETUP #line 312 "conf_lexer.l" -{ return STATS_E_DISABLED; } +{ return STATS_O_OPER_ONLY; } YY_BREAK case 185: YY_RULE_SETUP #line 313 "conf_lexer.l" -{ return STATS_O_OPER_ONLY; } +{ return STATS_K_OPER_ONLY; } YY_BREAK case 186: YY_RULE_SETUP #line 314 "conf_lexer.l" -{ return STATS_K_OPER_ONLY; } +{ return STATS_I_OPER_ONLY; } YY_BREAK case 187: YY_RULE_SETUP #line 315 "conf_lexer.l" -{ return STATS_I_OPER_ONLY; } +{ return STATS_P_OPER_ONLY; } YY_BREAK case 188: YY_RULE_SETUP #line 316 "conf_lexer.l" -{ return STATS_P_OPER_ONLY; } +{ return PACE_WAIT; } YY_BREAK case 189: YY_RULE_SETUP #line 317 "conf_lexer.l" -{ return PACE_WAIT; } +{ return PACE_WAIT_SIMPLE; } YY_BREAK case 190: YY_RULE_SETUP #line 318 "conf_lexer.l" -{ return PACE_WAIT_SIMPLE; } +{ return KNOCK_DELAY; } YY_BREAK case 191: YY_RULE_SETUP #line 319 "conf_lexer.l" -{ return KNOCK_DELAY; } +{ return KNOCK_DELAY_CHANNEL; } YY_BREAK case 192: YY_RULE_SETUP #line 320 "conf_lexer.l" -{ return KNOCK_DELAY_CHANNEL; } +{ return MAX_BANS; } YY_BREAK case 193: YY_RULE_SETUP #line 321 "conf_lexer.l" -{ return MAX_BANS; } +{ return MODULES; } YY_BREAK case 194: YY_RULE_SETUP #line 322 "conf_lexer.l" -{ return MODULES; } +{ return MODULE; } YY_BREAK case 195: YY_RULE_SETUP #line 323 "conf_lexer.l" -{ return MODULE; } +{ return PATH; } YY_BREAK case 196: YY_RULE_SETUP #line 324 "conf_lexer.l" -{ return PATH; } +{ return MAX_TARGETS; } YY_BREAK case 197: YY_RULE_SETUP -#line 325 "conf_lexer.l" -{ return MAX_TARGETS; } +#line 326 "conf_lexer.l" +{ return T_UNXLINE; } YY_BREAK case 198: YY_RULE_SETUP #line 327 "conf_lexer.l" -{ return T_UNXLINE; } +{ return T_UNRESV; } YY_BREAK case 199: YY_RULE_SETUP -#line 328 "conf_lexer.l" -{ return T_UNRESV; } +#line 329 "conf_lexer.l" +{ return OPER_ONLY_UMODES; } YY_BREAK case 200: YY_RULE_SETUP #line 330 "conf_lexer.l" -{ return OPER_ONLY_UMODES; } +{ return OPER_UMODES; } YY_BREAK case 201: YY_RULE_SETUP #line 331 "conf_lexer.l" -{ return OPER_UMODES; } +{ return T_BOTS; } YY_BREAK case 202: YY_RULE_SETUP #line 332 "conf_lexer.l" -{ return T_BOTS; } +{ return T_CCONN; } YY_BREAK case 203: YY_RULE_SETUP #line 333 "conf_lexer.l" -{ return T_CCONN; } +{ return T_CCONN_FULL; } YY_BREAK case 204: YY_RULE_SETUP #line 334 "conf_lexer.l" -{ return T_CCONN_FULL; } +{ return T_DEAF; } YY_BREAK case 205: YY_RULE_SETUP #line 335 "conf_lexer.l" -{ return T_DEAF; } +{ return T_DEBUG; } YY_BREAK case 206: YY_RULE_SETUP #line 336 "conf_lexer.l" -{ return T_DEBUG; } +{ return T_FULL; } YY_BREAK case 207: YY_RULE_SETUP #line 337 "conf_lexer.l" -{ return T_FULL; } +{ return T_SKILL; } YY_BREAK case 208: YY_RULE_SETUP #line 338 "conf_lexer.l" -{ return T_SKILL; } +{ return T_NCHANGE; } YY_BREAK case 209: YY_RULE_SETUP #line 339 "conf_lexer.l" -{ return T_NCHANGE; } +{ return T_REJ; } YY_BREAK case 210: YY_RULE_SETUP #line 340 "conf_lexer.l" -{ return T_REJ; } +{ return T_UNAUTH; } YY_BREAK case 211: YY_RULE_SETUP #line 341 "conf_lexer.l" -{ return T_UNAUTH; } +{ return T_SPY; } YY_BREAK case 212: YY_RULE_SETUP #line 342 "conf_lexer.l" -{ return T_SPY; } +{ return T_EXTERNAL; } YY_BREAK case 213: YY_RULE_SETUP #line 343 "conf_lexer.l" -{ return T_EXTERNAL; } +{ return T_OPERWALL; } YY_BREAK case 214: YY_RULE_SETUP #line 344 "conf_lexer.l" -{ return T_OPERWALL; } +{ return T_SERVNOTICE; } YY_BREAK case 215: YY_RULE_SETUP #line 345 "conf_lexer.l" -{ return T_SERVNOTICE; } +{ return T_INVISIBLE; } YY_BREAK case 216: YY_RULE_SETUP #line 346 "conf_lexer.l" -{ return T_INVISIBLE; } +{ return T_WALLOP; } YY_BREAK case 217: YY_RULE_SETUP #line 347 "conf_lexer.l" -{ return T_WALLOP; } +{ return T_CALLERID; } YY_BREAK case 218: YY_RULE_SETUP #line 348 "conf_lexer.l" -{ return T_CALLERID; } +{ return T_SOFTCALLERID; } YY_BREAK case 219: YY_RULE_SETUP #line 349 "conf_lexer.l" -{ return T_SOFTCALLERID; } +{ return T_LOCOPS; } YY_BREAK case 220: YY_RULE_SETUP -#line 350 "conf_lexer.l" -{ return T_LOCOPS; } +#line 351 "conf_lexer.l" +{ return YEARS; } YY_BREAK case 221: YY_RULE_SETUP @@ -3142,7 +3133,7 @@ YY_RULE_SETUP case 222: YY_RULE_SETUP #line 353 "conf_lexer.l" -{ return YEARS; } +{ return MONTHS; } YY_BREAK case 223: YY_RULE_SETUP @@ -3152,7 +3143,7 @@ YY_RULE_SETUP case 224: YY_RULE_SETUP #line 355 "conf_lexer.l" -{ return MONTHS; } +{ return WEEKS; } YY_BREAK case 225: YY_RULE_SETUP @@ -3162,7 +3153,7 @@ YY_RULE_SETUP case 226: YY_RULE_SETUP #line 357 "conf_lexer.l" -{ return WEEKS; } +{ return DAYS; } YY_BREAK case 227: YY_RULE_SETUP @@ -3172,7 +3163,7 @@ YY_RULE_SETUP case 228: YY_RULE_SETUP #line 359 "conf_lexer.l" -{ return DAYS; } +{ return HOURS; } YY_BREAK case 229: YY_RULE_SETUP @@ -3182,7 +3173,7 @@ YY_RULE_SETUP case 230: YY_RULE_SETUP #line 361 "conf_lexer.l" -{ return HOURS; } +{ return MINUTES; } YY_BREAK case 231: YY_RULE_SETUP @@ -3192,7 +3183,7 @@ YY_RULE_SETUP case 232: YY_RULE_SETUP #line 363 "conf_lexer.l" -{ return MINUTES; } +{ return SECONDS; } YY_BREAK case 233: YY_RULE_SETUP @@ -3201,8 +3192,8 @@ YY_RULE_SETUP YY_BREAK case 234: YY_RULE_SETUP -#line 365 "conf_lexer.l" -{ return SECONDS; } +#line 366 "conf_lexer.l" +{ return BYTES; } YY_BREAK case 235: YY_RULE_SETUP @@ -3212,7 +3203,7 @@ YY_RULE_SETUP case 236: YY_RULE_SETUP #line 368 "conf_lexer.l" -{ return BYTES; } +{ return KBYTES; } YY_BREAK case 237: YY_RULE_SETUP @@ -3237,7 +3228,7 @@ YY_RULE_SETUP case 241: YY_RULE_SETUP #line 373 "conf_lexer.l" -{ return KBYTES; } +{ return MBYTES; } YY_BREAK case 242: YY_RULE_SETUP @@ -3262,28 +3253,23 @@ YY_RULE_SETUP case 246: YY_RULE_SETUP #line 378 "conf_lexer.l" -{ return MBYTES; } - YY_BREAK -case 247: -YY_RULE_SETUP -#line 379 "conf_lexer.l" { return TWODOTS; } YY_BREAK -case 248: +case 247: YY_RULE_SETUP -#line 381 "conf_lexer.l" +#line 380 "conf_lexer.l" { return yytext[0]; } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 382 "conf_lexer.l" +#line 381 "conf_lexer.l" { if (ieof()) yyterminate(); } YY_BREAK -case 249: +case 248: YY_RULE_SETUP -#line 384 "conf_lexer.l" +#line 383 "conf_lexer.l" ECHO; YY_BREAK -#line 3287 "conf_lexer.c" +#line 3273 "conf_lexer.c" case YY_END_OF_BUFFER: { @@ -3574,7 +3560,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 >= 1583 ) + if ( yy_current_state >= 1575 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -3602,11 +3588,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 >= 1583 ) + if ( yy_current_state >= 1575 ) 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 == 1582); + yy_is_jam = (yy_current_state == 1574); return yy_is_jam ? 0 : yy_current_state; } @@ -4239,7 +4225,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 384 "conf_lexer.l" +#line 383 "conf_lexer.l" diff --git a/src/conf_lexer.l b/src/conf_lexer.l index ddace2d..138a283 100644 --- a/src/conf_lexer.l +++ b/src/conf_lexer.l @@ -224,7 +224,6 @@ need_password { return NEED_PASSWORD; } network_desc { return NETWORK_DESC; } network_name { return NETWORK_NAME; } nick { return NICK; } -nick_changes { return NICK_CHANGES; } no { yylval.number = 0; return TBOOL; } no_create_on_split { return NO_CREATE_ON_SPLIT; } no_join_on_split { return NO_JOIN_ON_SPLIT; } diff --git a/src/conf_parser.c b/src/conf_parser.c index adfd2c8..c6ad5a3 100644 --- a/src/conf_parser.c +++ b/src/conf_parser.c @@ -311,129 +311,128 @@ extern int yydebug; NETWORK_DESC = 353, NETWORK_NAME = 354, NICK = 355, - NICK_CHANGES = 356, - NO_CREATE_ON_SPLIT = 357, - NO_JOIN_ON_SPLIT = 358, - NO_OPER_FLOOD = 359, - NO_TILDE = 360, - NUMBER = 361, - NUMBER_PER_CIDR = 362, - NUMBER_PER_IP = 363, - OPERATOR = 364, - OPERS_BYPASS_CALLERID = 365, - OPER_ONLY_UMODES = 366, - OPER_PASS_RESV = 367, - OPER_SPY_T = 368, - OPER_UMODES = 369, - JOIN_FLOOD_COUNT = 370, - JOIN_FLOOD_TIME = 371, - PACE_WAIT = 372, - PACE_WAIT_SIMPLE = 373, - PASSWORD = 374, - PATH = 375, - PING_COOKIE = 376, - PING_TIME = 377, - PORT = 378, - QSTRING = 379, - QUIET_ON_BAN = 380, - REASON = 381, - REDIRPORT = 382, - REDIRSERV = 383, - REGEX_T = 384, - REHASH = 385, - REMOTE = 386, - REMOTEBAN = 387, - RSA_PRIVATE_KEY_FILE = 388, - RSA_PUBLIC_KEY_FILE = 389, - SSL_CERTIFICATE_FILE = 390, - SSL_DH_PARAM_FILE = 391, - T_SSL_CLIENT_METHOD = 392, - T_SSL_SERVER_METHOD = 393, - T_SSLV3 = 394, - T_TLSV1 = 395, - RESV = 396, - RESV_EXEMPT = 397, - SECONDS = 398, - MINUTES = 399, - HOURS = 400, - DAYS = 401, - WEEKS = 402, - MONTHS = 403, - YEARS = 404, - SENDQ = 405, - SEND_PASSWORD = 406, - SERVERHIDE = 407, - SERVERINFO = 408, - IRCD_SID = 409, - TKLINE_EXPIRE_NOTICES = 410, - T_SHARED = 411, - T_CLUSTER = 412, - TYPE = 413, - SHORT_MOTD = 414, - SPOOF = 415, - SPOOF_NOTICE = 416, - STATS_E_DISABLED = 417, - STATS_I_OPER_ONLY = 418, - STATS_K_OPER_ONLY = 419, - STATS_O_OPER_ONLY = 420, - STATS_P_OPER_ONLY = 421, - TBOOL = 422, - TMASKED = 423, - TS_MAX_DELTA = 424, - TS_WARN_DELTA = 425, - TWODOTS = 426, - T_ALL = 427, - T_BOTS = 428, - T_SOFTCALLERID = 429, - T_CALLERID = 430, - T_CCONN = 431, - T_CCONN_FULL = 432, - T_SSL_CIPHER_LIST = 433, - T_DEAF = 434, - T_DEBUG = 435, - T_DLINE = 436, - T_EXTERNAL = 437, - T_FULL = 438, - T_INVISIBLE = 439, - T_IPV4 = 440, - T_IPV6 = 441, - T_LOCOPS = 442, - T_MAX_CLIENTS = 443, - T_NCHANGE = 444, - T_NONONREG = 445, - T_OPERWALL = 446, - T_RECVQ = 447, - T_REJ = 448, - T_SERVER = 449, - T_SERVNOTICE = 450, - T_SET = 451, - T_SKILL = 452, - T_SPY = 453, - T_SSL = 454, - T_UMODES = 455, - T_UNAUTH = 456, - T_UNDLINE = 457, - T_UNLIMITED = 458, - T_UNRESV = 459, - T_UNXLINE = 460, - T_GLOBOPS = 461, - T_WALLOP = 462, - T_WEBIRC = 463, - T_RESTART = 464, - T_SERVICE = 465, - T_SERVICES_NAME = 466, - THROTTLE_TIME = 467, - TRUE_NO_OPER_FLOOD = 468, - UNKLINE = 469, - USER = 470, - USE_EGD = 471, - USE_LOGGING = 472, - VHOST = 473, - VHOST6 = 474, - XLINE = 475, - WARN_NO_NLINE = 476, - T_SIZE = 477, - T_FILE = 478 + NO_CREATE_ON_SPLIT = 356, + NO_JOIN_ON_SPLIT = 357, + NO_OPER_FLOOD = 358, + NO_TILDE = 359, + NUMBER = 360, + NUMBER_PER_CIDR = 361, + NUMBER_PER_IP = 362, + OPERATOR = 363, + OPERS_BYPASS_CALLERID = 364, + OPER_ONLY_UMODES = 365, + OPER_PASS_RESV = 366, + OPER_SPY_T = 367, + OPER_UMODES = 368, + JOIN_FLOOD_COUNT = 369, + JOIN_FLOOD_TIME = 370, + PACE_WAIT = 371, + PACE_WAIT_SIMPLE = 372, + PASSWORD = 373, + PATH = 374, + PING_COOKIE = 375, + PING_TIME = 376, + PORT = 377, + QSTRING = 378, + QUIET_ON_BAN = 379, + REASON = 380, + REDIRPORT = 381, + REDIRSERV = 382, + REGEX_T = 383, + REHASH = 384, + REMOTE = 385, + REMOTEBAN = 386, + RSA_PRIVATE_KEY_FILE = 387, + RSA_PUBLIC_KEY_FILE = 388, + SSL_CERTIFICATE_FILE = 389, + SSL_DH_PARAM_FILE = 390, + T_SSL_CLIENT_METHOD = 391, + T_SSL_SERVER_METHOD = 392, + T_SSLV3 = 393, + T_TLSV1 = 394, + RESV = 395, + RESV_EXEMPT = 396, + SECONDS = 397, + MINUTES = 398, + HOURS = 399, + DAYS = 400, + WEEKS = 401, + MONTHS = 402, + YEARS = 403, + SENDQ = 404, + SEND_PASSWORD = 405, + SERVERHIDE = 406, + SERVERINFO = 407, + IRCD_SID = 408, + TKLINE_EXPIRE_NOTICES = 409, + T_SHARED = 410, + T_CLUSTER = 411, + TYPE = 412, + SHORT_MOTD = 413, + SPOOF = 414, + SPOOF_NOTICE = 415, + STATS_E_DISABLED = 416, + STATS_I_OPER_ONLY = 417, + STATS_K_OPER_ONLY = 418, + STATS_O_OPER_ONLY = 419, + STATS_P_OPER_ONLY = 420, + TBOOL = 421, + TMASKED = 422, + TS_MAX_DELTA = 423, + TS_WARN_DELTA = 424, + TWODOTS = 425, + T_ALL = 426, + T_BOTS = 427, + T_SOFTCALLERID = 428, + T_CALLERID = 429, + T_CCONN = 430, + T_CCONN_FULL = 431, + T_SSL_CIPHER_LIST = 432, + T_DEAF = 433, + T_DEBUG = 434, + T_DLINE = 435, + T_EXTERNAL = 436, + T_FULL = 437, + T_INVISIBLE = 438, + T_IPV4 = 439, + T_IPV6 = 440, + T_LOCOPS = 441, + T_MAX_CLIENTS = 442, + T_NCHANGE = 443, + T_NONONREG = 444, + T_OPERWALL = 445, + T_RECVQ = 446, + T_REJ = 447, + T_SERVER = 448, + T_SERVNOTICE = 449, + T_SET = 450, + T_SKILL = 451, + T_SPY = 452, + T_SSL = 453, + T_UMODES = 454, + T_UNAUTH = 455, + T_UNDLINE = 456, + T_UNLIMITED = 457, + T_UNRESV = 458, + T_UNXLINE = 459, + T_GLOBOPS = 460, + T_WALLOP = 461, + T_WEBIRC = 462, + T_RESTART = 463, + T_SERVICE = 464, + T_SERVICES_NAME = 465, + THROTTLE_TIME = 466, + TRUE_NO_OPER_FLOOD = 467, + UNKLINE = 468, + USER = 469, + USE_EGD = 470, + USE_LOGGING = 471, + VHOST = 472, + VHOST6 = 473, + XLINE = 474, + WARN_NO_NLINE = 475, + T_SIZE = 476, + T_FILE = 477 }; #endif /* Tokens. */ @@ -535,129 +534,128 @@ extern int yydebug; #define NETWORK_DESC 353 #define NETWORK_NAME 354 #define NICK 355 -#define NICK_CHANGES 356 -#define NO_CREATE_ON_SPLIT 357 -#define NO_JOIN_ON_SPLIT 358 -#define NO_OPER_FLOOD 359 -#define NO_TILDE 360 -#define NUMBER 361 -#define NUMBER_PER_CIDR 362 -#define NUMBER_PER_IP 363 -#define OPERATOR 364 -#define OPERS_BYPASS_CALLERID 365 -#define OPER_ONLY_UMODES 366 -#define OPER_PASS_RESV 367 -#define OPER_SPY_T 368 -#define OPER_UMODES 369 -#define JOIN_FLOOD_COUNT 370 -#define JOIN_FLOOD_TIME 371 -#define PACE_WAIT 372 -#define PACE_WAIT_SIMPLE 373 -#define PASSWORD 374 -#define PATH 375 -#define PING_COOKIE 376 -#define PING_TIME 377 -#define PORT 378 -#define QSTRING 379 -#define QUIET_ON_BAN 380 -#define REASON 381 -#define REDIRPORT 382 -#define REDIRSERV 383 -#define REGEX_T 384 -#define REHASH 385 -#define REMOTE 386 -#define REMOTEBAN 387 -#define RSA_PRIVATE_KEY_FILE 388 -#define RSA_PUBLIC_KEY_FILE 389 -#define SSL_CERTIFICATE_FILE 390 -#define SSL_DH_PARAM_FILE 391 -#define T_SSL_CLIENT_METHOD 392 -#define T_SSL_SERVER_METHOD 393 -#define T_SSLV3 394 -#define T_TLSV1 395 -#define RESV 396 -#define RESV_EXEMPT 397 -#define SECONDS 398 -#define MINUTES 399 -#define HOURS 400 -#define DAYS 401 -#define WEEKS 402 -#define MONTHS 403 -#define YEARS 404 -#define SENDQ 405 -#define SEND_PASSWORD 406 -#define SERVERHIDE 407 -#define SERVERINFO 408 -#define IRCD_SID 409 -#define TKLINE_EXPIRE_NOTICES 410 -#define T_SHARED 411 -#define T_CLUSTER 412 -#define TYPE 413 -#define SHORT_MOTD 414 -#define SPOOF 415 -#define SPOOF_NOTICE 416 -#define STATS_E_DISABLED 417 -#define STATS_I_OPER_ONLY 418 -#define STATS_K_OPER_ONLY 419 -#define STATS_O_OPER_ONLY 420 -#define STATS_P_OPER_ONLY 421 -#define TBOOL 422 -#define TMASKED 423 -#define TS_MAX_DELTA 424 -#define TS_WARN_DELTA 425 -#define TWODOTS 426 -#define T_ALL 427 -#define T_BOTS 428 -#define T_SOFTCALLERID 429 -#define T_CALLERID 430 -#define T_CCONN 431 -#define T_CCONN_FULL 432 -#define T_SSL_CIPHER_LIST 433 -#define T_DEAF 434 -#define T_DEBUG 435 -#define T_DLINE 436 -#define T_EXTERNAL 437 -#define T_FULL 438 -#define T_INVISIBLE 439 -#define T_IPV4 440 -#define T_IPV6 441 -#define T_LOCOPS 442 -#define T_MAX_CLIENTS 443 -#define T_NCHANGE 444 -#define T_NONONREG 445 -#define T_OPERWALL 446 -#define T_RECVQ 447 -#define T_REJ 448 -#define T_SERVER 449 -#define T_SERVNOTICE 450 -#define T_SET 451 -#define T_SKILL 452 -#define T_SPY 453 -#define T_SSL 454 -#define T_UMODES 455 -#define T_UNAUTH 456 -#define T_UNDLINE 457 -#define T_UNLIMITED 458 -#define T_UNRESV 459 -#define T_UNXLINE 460 -#define T_GLOBOPS 461 -#define T_WALLOP 462 -#define T_WEBIRC 463 -#define T_RESTART 464 -#define T_SERVICE 465 -#define T_SERVICES_NAME 466 -#define THROTTLE_TIME 467 -#define TRUE_NO_OPER_FLOOD 468 -#define UNKLINE 469 -#define USER 470 -#define USE_EGD 471 -#define USE_LOGGING 472 -#define VHOST 473 -#define VHOST6 474 -#define XLINE 475 -#define WARN_NO_NLINE 476 -#define T_SIZE 477 -#define T_FILE 478 +#define NO_CREATE_ON_SPLIT 356 +#define NO_JOIN_ON_SPLIT 357 +#define NO_OPER_FLOOD 358 +#define NO_TILDE 359 +#define NUMBER 360 +#define NUMBER_PER_CIDR 361 +#define NUMBER_PER_IP 362 +#define OPERATOR 363 +#define OPERS_BYPASS_CALLERID 364 +#define OPER_ONLY_UMODES 365 +#define OPER_PASS_RESV 366 +#define OPER_SPY_T 367 +#define OPER_UMODES 368 +#define JOIN_FLOOD_COUNT 369 +#define JOIN_FLOOD_TIME 370 +#define PACE_WAIT 371 +#define PACE_WAIT_SIMPLE 372 +#define PASSWORD 373 +#define PATH 374 +#define PING_COOKIE 375 +#define PING_TIME 376 +#define PORT 377 +#define QSTRING 378 +#define QUIET_ON_BAN 379 +#define REASON 380 +#define REDIRPORT 381 +#define REDIRSERV 382 +#define REGEX_T 383 +#define REHASH 384 +#define REMOTE 385 +#define REMOTEBAN 386 +#define RSA_PRIVATE_KEY_FILE 387 +#define RSA_PUBLIC_KEY_FILE 388 +#define SSL_CERTIFICATE_FILE 389 +#define SSL_DH_PARAM_FILE 390 +#define T_SSL_CLIENT_METHOD 391 +#define T_SSL_SERVER_METHOD 392 +#define T_SSLV3 393 +#define T_TLSV1 394 +#define RESV 395 +#define RESV_EXEMPT 396 +#define SECONDS 397 +#define MINUTES 398 +#define HOURS 399 +#define DAYS 400 +#define WEEKS 401 +#define MONTHS 402 +#define YEARS 403 +#define SENDQ 404 +#define SEND_PASSWORD 405 +#define SERVERHIDE 406 +#define SERVERINFO 407 +#define IRCD_SID 408 +#define TKLINE_EXPIRE_NOTICES 409 +#define T_SHARED 410 +#define T_CLUSTER 411 +#define TYPE 412 +#define SHORT_MOTD 413 +#define SPOOF 414 +#define SPOOF_NOTICE 415 +#define STATS_E_DISABLED 416 +#define STATS_I_OPER_ONLY 417 +#define STATS_K_OPER_ONLY 418 +#define STATS_O_OPER_ONLY 419 +#define STATS_P_OPER_ONLY 420 +#define TBOOL 421 +#define TMASKED 422 +#define TS_MAX_DELTA 423 +#define TS_WARN_DELTA 424 +#define TWODOTS 425 +#define T_ALL 426 +#define T_BOTS 427 +#define T_SOFTCALLERID 428 +#define T_CALLERID 429 +#define T_CCONN 430 +#define T_CCONN_FULL 431 +#define T_SSL_CIPHER_LIST 432 +#define T_DEAF 433 +#define T_DEBUG 434 +#define T_DLINE 435 +#define T_EXTERNAL 436 +#define T_FULL 437 +#define T_INVISIBLE 438 +#define T_IPV4 439 +#define T_IPV6 440 +#define T_LOCOPS 441 +#define T_MAX_CLIENTS 442 +#define T_NCHANGE 443 +#define T_NONONREG 444 +#define T_OPERWALL 445 +#define T_RECVQ 446 +#define T_REJ 447 +#define T_SERVER 448 +#define T_SERVNOTICE 449 +#define T_SET 450 +#define T_SKILL 451 +#define T_SPY 452 +#define T_SSL 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_GLOBOPS 460 +#define T_WALLOP 461 +#define T_WEBIRC 462 +#define T_RESTART 463 +#define T_SERVICE 464 +#define T_SERVICES_NAME 465 +#define THROTTLE_TIME 466 +#define TRUE_NO_OPER_FLOOD 467 +#define UNKLINE 468 +#define USER 469 +#define USE_EGD 470 +#define USE_LOGGING 471 +#define VHOST 472 +#define VHOST6 473 +#define XLINE 474 +#define WARN_NO_NLINE 475 +#define T_SIZE 476 +#define T_FILE 477 @@ -672,7 +670,7 @@ typedef union YYSTYPE /* Line 387 of yacc.c */ -#line 676 "conf_parser.c" +#line 674 "conf_parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -700,7 +698,7 @@ int yyparse (); /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 704 "conf_parser.c" +#line 702 "conf_parser.c" #ifdef short # undef short @@ -929,20 +927,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1293 +#define YYLAST 1213 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 229 +#define YYNTOKENS 228 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 289 /* YYNRULES -- Number of rules. */ -#define YYNRULES 643 +#define YYNRULES 642 /* YYNRULES -- Number of states. */ -#define YYNSTATES 1256 +#define YYNSTATES 1255 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 478 +#define YYMAXUTOK 477 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -954,15 +952,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, 2, 224, - 2, 227, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 227, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 223, + 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, 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, 225, 2, 224, 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, @@ -997,7 +995,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 }; #if YYDEBUG @@ -1025,322 +1023,322 @@ static const yytype_uint16 yyprhs[] = 507, 509, 511, 513, 515, 517, 519, 521, 523, 525, 526, 532, 536, 538, 540, 542, 544, 546, 548, 550, 552, 554, 556, 558, 560, 562, 564, 566, 568, 570, - 572, 574, 576, 577, 584, 587, 589, 591, 593, 595, + 572, 574, 575, 582, 585, 587, 589, 591, 593, 595, 597, 599, 601, 603, 605, 607, 609, 611, 613, 615, - 617, 619, 621, 624, 629, 634, 639, 644, 649, 654, - 659, 664, 669, 674, 679, 684, 689, 694, 699, 700, - 706, 710, 712, 714, 716, 717, 724, 725, 731, 735, - 737, 739, 741, 743, 746, 748, 750, 752, 754, 756, - 759, 760, 766, 770, 772, 774, 778, 783, 788, 789, - 796, 799, 801, 803, 805, 807, 809, 811, 813, 815, - 817, 820, 825, 830, 835, 840, 841, 847, 851, 853, - 855, 857, 859, 861, 863, 865, 867, 869, 871, 873, - 878, 883, 888, 889, 896, 899, 901, 903, 905, 907, - 910, 915, 920, 925, 931, 934, 936, 938, 940, 945, - 946, 953, 956, 958, 960, 962, 964, 967, 972, 977, - 978, 984, 988, 990, 992, 994, 996, 998, 1000, 1002, - 1004, 1006, 1008, 1010, 1011, 1018, 1021, 1023, 1025, 1027, - 1030, 1035, 1036, 1042, 1046, 1048, 1050, 1052, 1054, 1056, - 1058, 1060, 1062, 1064, 1066, 1068, 1069, 1076, 1079, 1081, + 617, 619, 622, 627, 632, 637, 642, 647, 652, 657, + 662, 667, 672, 677, 682, 687, 692, 697, 698, 704, + 708, 710, 712, 714, 715, 722, 723, 729, 733, 735, + 737, 739, 741, 744, 746, 748, 750, 752, 754, 757, + 758, 764, 768, 770, 772, 776, 781, 786, 787, 794, + 797, 799, 801, 803, 805, 807, 809, 811, 813, 815, + 818, 823, 828, 833, 838, 839, 845, 849, 851, 853, + 855, 857, 859, 861, 863, 865, 867, 869, 871, 876, + 881, 886, 887, 894, 897, 899, 901, 903, 905, 908, + 913, 918, 923, 929, 932, 934, 936, 938, 943, 944, + 951, 954, 956, 958, 960, 962, 965, 970, 975, 976, + 982, 986, 988, 990, 992, 994, 996, 998, 1000, 1002, + 1004, 1006, 1008, 1009, 1016, 1019, 1021, 1023, 1025, 1028, + 1033, 1034, 1040, 1044, 1046, 1048, 1050, 1052, 1054, 1056, + 1058, 1060, 1062, 1064, 1066, 1067, 1074, 1077, 1079, 1081, 1083, 1085, 1087, 1089, 1091, 1093, 1095, 1097, 1099, 1101, - 1103, 1105, 1107, 1110, 1115, 1120, 1125, 1130, 1135, 1140, - 1145, 1150, 1151, 1157, 1161, 1163, 1165, 1167, 1172, 1177, - 1182, 1187, 1192, 1193, 1200, 1201, 1207, 1211, 1213, 1215, - 1218, 1220, 1222, 1224, 1226, 1228, 1233, 1238, 1239, 1246, - 1249, 1251, 1253, 1255, 1257, 1262, 1267, 1273, 1276, 1278, - 1280, 1282, 1287, 1288, 1295, 1296, 1302, 1306, 1308, 1310, - 1313, 1315, 1317, 1319, 1321, 1323, 1328, 1333, 1339, 1342, + 1103, 1105, 1108, 1113, 1118, 1123, 1128, 1133, 1138, 1143, + 1148, 1149, 1155, 1159, 1161, 1163, 1165, 1170, 1175, 1180, + 1185, 1190, 1191, 1198, 1199, 1205, 1209, 1211, 1213, 1216, + 1218, 1220, 1222, 1224, 1226, 1231, 1236, 1237, 1244, 1247, + 1249, 1251, 1253, 1255, 1260, 1265, 1271, 1274, 1276, 1278, + 1280, 1285, 1286, 1293, 1294, 1300, 1304, 1306, 1308, 1311, + 1313, 1315, 1317, 1319, 1321, 1326, 1331, 1337, 1340, 1342, 1344, 1346, 1348, 1350, 1352, 1354, 1356, 1358, 1360, 1362, 1364, 1366, 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, - 1447, 1452, 1457, 1462, 1467, 1472, 1477, 1482, 1487, 1492, - 1497, 1502, 1507, 1512, 1517, 1522, 1527, 1532, 1537, 1542, - 1547, 1552, 1557, 1562, 1567, 1572, 1577, 1582, 1587, 1592, - 1597, 1602, 1607, 1612, 1617, 1622, 1627, 1632, 1637, 1642, - 1647, 1652, 1657, 1662, 1667, 1668, 1674, 1678, 1680, 1682, + 1424, 1426, 1428, 1430, 1432, 1434, 1436, 1438, 1440, 1445, + 1450, 1455, 1460, 1465, 1470, 1475, 1480, 1485, 1490, 1495, + 1500, 1505, 1510, 1515, 1520, 1525, 1530, 1535, 1540, 1545, + 1550, 1555, 1560, 1565, 1570, 1575, 1580, 1585, 1590, 1595, + 1600, 1605, 1610, 1615, 1620, 1625, 1630, 1635, 1640, 1645, + 1650, 1655, 1660, 1665, 1666, 1672, 1676, 1678, 1680, 1682, 1684, 1686, 1688, 1690, 1692, 1694, 1696, 1698, 1700, 1702, - 1704, 1706, 1708, 1710, 1712, 1714, 1716, 1718, 1720, 1721, - 1727, 1731, 1733, 1735, 1737, 1739, 1741, 1743, 1745, 1747, + 1704, 1706, 1708, 1710, 1712, 1714, 1716, 1718, 1719, 1725, + 1729, 1731, 1733, 1735, 1737, 1739, 1741, 1743, 1745, 1747, 1749, 1751, 1753, 1755, 1757, 1759, 1761, 1763, 1765, 1767, - 1769, 1771, 1773, 1775, 1780, 1785, 1790, 1796, 1799, 1801, + 1769, 1771, 1773, 1778, 1783, 1788, 1794, 1797, 1799, 1801, 1803, 1805, 1807, 1809, 1811, 1813, 1815, 1817, 1819, 1821, - 1823, 1825, 1827, 1829, 1834, 1839, 1844, 1849, 1854, 1859, - 1864, 1869, 1874, 1879, 1884, 1889, 1894, 1900, 1903, 1905, - 1907, 1909, 1911, 1913, 1915, 1917, 1919, 1921, 1926, 1931, - 1936, 1941, 1946, 1951 + 1823, 1825, 1827, 1832, 1837, 1842, 1847, 1852, 1857, 1862, + 1867, 1872, 1877, 1882, 1887, 1892, 1898, 1901, 1903, 1905, + 1907, 1909, 1911, 1913, 1915, 1917, 1919, 1924, 1929, 1934, + 1939, 1944, 1949 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 230, 0, -1, -1, 230, 231, -1, 265, -1, 271, - -1, 285, -1, 492, -1, 303, -1, 326, -1, 340, - -1, 241, -1, 508, -1, 355, -1, 362, -1, 366, - -1, 376, -1, 385, -1, 405, -1, 415, -1, 421, - -1, 435, -1, 425, -1, 236, -1, 1, 224, -1, - 1, 225, -1, -1, 233, -1, 106, 232, -1, 106, - 143, 232, -1, 106, 144, 232, -1, 106, 145, 232, - -1, 106, 146, 232, -1, 106, 147, 232, -1, 106, - 148, 232, -1, 106, 149, 232, -1, -1, 235, -1, - 106, 234, -1, 106, 9, 234, -1, 106, 10, 234, - -1, 106, 11, 234, -1, 95, 226, 237, 225, 224, - -1, 237, 238, -1, 238, -1, 239, -1, 240, -1, - 1, 224, -1, 94, 227, 124, 224, -1, 120, 227, - 124, 224, -1, 153, 226, 242, 225, 224, -1, 242, - 243, -1, 243, -1, 254, -1, 259, -1, 264, -1, - 256, -1, 257, -1, 258, -1, 261, -1, 262, -1, - 263, -1, 252, -1, 251, -1, 260, -1, 255, -1, - 250, -1, 244, -1, 245, -1, 253, -1, 1, 224, - -1, 137, 227, 246, 224, -1, 138, 227, 248, 224, - -1, 246, 228, 247, -1, 247, -1, 139, -1, 140, - -1, 248, 228, 249, -1, 249, -1, 139, -1, 140, - -1, 135, 227, 124, 224, -1, 133, 227, 124, 224, - -1, 136, 227, 124, 224, -1, 178, 227, 124, 224, - -1, 96, 227, 124, 224, -1, 154, 227, 124, 224, - -1, 24, 227, 124, 224, -1, 99, 227, 124, 224, - -1, 98, 227, 124, 224, -1, 218, 227, 124, 224, - -1, 219, 227, 124, 224, -1, 188, 227, 106, 224, - -1, 82, 227, 106, 224, -1, 86, 227, 106, 224, - -1, 58, 227, 167, 224, -1, 4, 226, 266, 225, - 224, -1, 266, 267, -1, 267, -1, 268, -1, 270, - -1, 269, -1, 1, 224, -1, 96, 227, 124, 224, - -1, 31, 227, 124, 224, -1, 24, 227, 124, 224, - -1, 72, 226, 272, 225, 224, -1, 272, 273, -1, - 273, -1, 274, -1, 275, -1, 1, 224, -1, 217, - 227, 167, 224, -1, -1, 276, 223, 226, 277, 225, - 224, -1, 277, 278, -1, 278, -1, 279, -1, 281, - -1, 280, -1, 1, 224, -1, 96, 227, 124, 224, - -1, 222, 227, 235, 224, -1, 222, 227, 203, 224, - -1, -1, 158, 282, 227, 283, 224, -1, 283, 228, - 284, -1, 284, -1, 215, -1, 109, -1, 40, -1, - 181, -1, 65, -1, 63, -1, 180, -1, -1, 109, - 286, 226, 287, 225, 224, -1, 287, 288, -1, 288, - -1, 289, -1, 290, -1, 291, -1, 295, -1, 294, - -1, 292, -1, 293, -1, 299, -1, 1, 224, -1, - 96, 227, 124, 224, -1, 215, 227, 124, 224, -1, - 119, 227, 124, 224, -1, 32, 227, 167, 224, -1, - 134, 227, 124, 224, -1, 17, 227, 124, 224, -1, - -1, 200, 296, 227, 297, 224, -1, 297, 228, 298, - -1, 298, -1, 173, -1, 176, -1, 177, -1, 179, - -1, 180, -1, 183, -1, 51, -1, 197, -1, 189, - -1, 193, -1, 201, -1, 198, -1, 182, -1, 191, - -1, 195, -1, 184, -1, 207, -1, 174, -1, 175, - -1, 187, -1, 190, -1, -1, 36, 300, 227, 301, - 224, -1, 301, 228, 302, -1, 302, -1, 47, -1, - 131, -1, 65, -1, 214, -1, 181, -1, 202, -1, - 220, -1, 40, -1, 25, -1, 209, -1, 130, -1, - 4, -1, 101, -1, 191, -1, 206, -1, 113, -1, - 132, -1, 196, -1, 94, -1, -1, 17, 304, 226, - 305, 225, 224, -1, 305, 306, -1, 306, -1, 307, - -1, 317, -1, 318, -1, 308, -1, 319, -1, 309, + 229, 0, -1, -1, 229, 230, -1, 264, -1, 270, + -1, 284, -1, 491, -1, 302, -1, 325, -1, 339, + -1, 240, -1, 507, -1, 354, -1, 361, -1, 365, + -1, 375, -1, 384, -1, 404, -1, 414, -1, 420, + -1, 434, -1, 424, -1, 235, -1, 1, 223, -1, + 1, 224, -1, -1, 232, -1, 105, 231, -1, 105, + 142, 231, -1, 105, 143, 231, -1, 105, 144, 231, + -1, 105, 145, 231, -1, 105, 146, 231, -1, 105, + 147, 231, -1, 105, 148, 231, -1, -1, 234, -1, + 105, 233, -1, 105, 9, 233, -1, 105, 10, 233, + -1, 105, 11, 233, -1, 95, 225, 236, 224, 223, + -1, 236, 237, -1, 237, -1, 238, -1, 239, -1, + 1, 223, -1, 94, 226, 123, 223, -1, 119, 226, + 123, 223, -1, 152, 225, 241, 224, 223, -1, 241, + 242, -1, 242, -1, 253, -1, 258, -1, 263, -1, + 255, -1, 256, -1, 257, -1, 260, -1, 261, -1, + 262, -1, 251, -1, 250, -1, 259, -1, 254, -1, + 249, -1, 243, -1, 244, -1, 252, -1, 1, 223, + -1, 136, 226, 245, 223, -1, 137, 226, 247, 223, + -1, 245, 227, 246, -1, 246, -1, 138, -1, 139, + -1, 247, 227, 248, -1, 248, -1, 138, -1, 139, + -1, 134, 226, 123, 223, -1, 132, 226, 123, 223, + -1, 135, 226, 123, 223, -1, 177, 226, 123, 223, + -1, 96, 226, 123, 223, -1, 153, 226, 123, 223, + -1, 24, 226, 123, 223, -1, 99, 226, 123, 223, + -1, 98, 226, 123, 223, -1, 217, 226, 123, 223, + -1, 218, 226, 123, 223, -1, 187, 226, 105, 223, + -1, 82, 226, 105, 223, -1, 86, 226, 105, 223, + -1, 58, 226, 166, 223, -1, 4, 225, 265, 224, + 223, -1, 265, 266, -1, 266, -1, 267, -1, 269, + -1, 268, -1, 1, 223, -1, 96, 226, 123, 223, + -1, 31, 226, 123, 223, -1, 24, 226, 123, 223, + -1, 72, 225, 271, 224, 223, -1, 271, 272, -1, + 272, -1, 273, -1, 274, -1, 1, 223, -1, 216, + 226, 166, 223, -1, -1, 275, 222, 225, 276, 224, + 223, -1, 276, 277, -1, 277, -1, 278, -1, 280, + -1, 279, -1, 1, 223, -1, 96, 226, 123, 223, + -1, 221, 226, 234, 223, -1, 221, 226, 202, 223, + -1, -1, 157, 281, 226, 282, 223, -1, 282, 227, + 283, -1, 283, -1, 214, -1, 108, -1, 40, -1, + 180, -1, 65, -1, 63, -1, 179, -1, -1, 108, + 285, 225, 286, 224, 223, -1, 286, 287, -1, 287, + -1, 288, -1, 289, -1, 290, -1, 294, -1, 293, + -1, 291, -1, 292, -1, 298, -1, 1, 223, -1, + 96, 226, 123, 223, -1, 214, 226, 123, 223, -1, + 118, 226, 123, 223, -1, 32, 226, 166, 223, -1, + 133, 226, 123, 223, -1, 17, 226, 123, 223, -1, + -1, 199, 295, 226, 296, 223, -1, 296, 227, 297, + -1, 297, -1, 172, -1, 175, -1, 176, -1, 178, + -1, 179, -1, 182, -1, 51, -1, 196, -1, 188, + -1, 192, -1, 200, -1, 197, -1, 181, -1, 190, + -1, 194, -1, 183, -1, 206, -1, 173, -1, 174, + -1, 186, -1, 189, -1, -1, 36, 299, 226, 300, + 223, -1, 300, 227, 301, -1, 301, -1, 47, -1, + 130, -1, 65, -1, 213, -1, 180, -1, 201, -1, + 219, -1, 40, -1, 25, -1, 208, -1, 129, -1, + 4, -1, 190, -1, 205, -1, 112, -1, 131, -1, + 195, -1, 94, -1, -1, 17, 303, 225, 304, 224, + 223, -1, 304, 305, -1, 305, -1, 306, -1, 316, + -1, 317, -1, 307, -1, 318, -1, 308, -1, 309, -1, 310, -1, 311, -1, 312, -1, 313, -1, 314, - -1, 315, -1, 316, -1, 320, -1, 321, -1, 322, - -1, 1, 224, -1, 96, 227, 124, 224, -1, 122, - 227, 233, 224, -1, 108, 227, 106, 224, -1, 19, - 227, 233, 224, -1, 84, 227, 106, 224, -1, 78, - 227, 106, 224, -1, 80, 227, 106, 224, -1, 79, - 227, 106, 224, -1, 150, 227, 235, 224, -1, 192, - 227, 235, 224, -1, 15, 227, 106, 224, -1, 16, - 227, 106, 224, -1, 107, 227, 106, 224, -1, 90, - 227, 233, 224, -1, 91, 227, 233, 224, -1, -1, - 36, 323, 227, 324, 224, -1, 324, 228, 325, -1, - 325, -1, 92, -1, 93, -1, -1, 71, 327, 226, - 332, 225, 224, -1, -1, 36, 329, 227, 330, 224, - -1, 330, 228, 331, -1, 331, -1, 199, -1, 51, - -1, 194, -1, 332, 333, -1, 333, -1, 334, -1, - 328, -1, 338, -1, 339, -1, 1, 224, -1, -1, - 123, 227, 336, 335, 224, -1, 336, 228, 337, -1, - 337, -1, 106, -1, 106, 171, 106, -1, 62, 227, - 124, 224, -1, 57, 227, 124, 224, -1, -1, 48, - 341, 226, 342, 225, 224, -1, 342, 343, -1, 343, - -1, 344, -1, 345, -1, 346, -1, 348, -1, 352, - -1, 353, -1, 354, -1, 347, -1, 1, 224, -1, - 215, 227, 124, 224, -1, 119, 227, 124, 224, -1, - 17, 227, 124, 224, -1, 32, 227, 167, 224, -1, - -1, 36, 349, 227, 350, 224, -1, 350, 228, 351, - -1, 351, -1, 161, -1, 33, -1, 66, -1, 49, - -1, 13, -1, 105, -1, 43, -1, 142, -1, 208, - -1, 97, -1, 160, 227, 124, 224, -1, 128, 227, - 124, 224, -1, 127, 227, 106, 224, -1, -1, 141, - 356, 226, 357, 225, 224, -1, 357, 358, -1, 358, - -1, 359, -1, 360, -1, 361, -1, 1, 224, -1, - 73, 227, 124, 224, -1, 126, 227, 124, 224, -1, - 34, 227, 124, 224, -1, 210, 226, 363, 225, 224, - -1, 363, 364, -1, 364, -1, 365, -1, 1, -1, - 96, 227, 124, 224, -1, -1, 156, 367, 226, 368, - 225, 224, -1, 368, 369, -1, 369, -1, 370, -1, - 371, -1, 372, -1, 1, 224, -1, 96, 227, 124, - 224, -1, 215, 227, 124, 224, -1, -1, 158, 373, - 227, 374, 224, -1, 374, 228, 375, -1, 375, -1, - 65, -1, 214, -1, 181, -1, 202, -1, 220, -1, - 205, -1, 141, -1, 204, -1, 187, -1, 172, -1, - -1, 157, 377, 226, 378, 225, 224, -1, 378, 379, - -1, 379, -1, 380, -1, 381, -1, 1, 224, -1, - 96, 227, 124, 224, -1, -1, 158, 382, 227, 383, - 224, -1, 383, 228, 384, -1, 384, -1, 65, -1, - 214, -1, 181, -1, 202, -1, 220, -1, 205, -1, - 141, -1, 204, -1, 187, -1, 172, -1, -1, 18, - 386, 226, 387, 225, 224, -1, 387, 388, -1, 388, - -1, 389, -1, 390, -1, 391, -1, 392, -1, 393, - -1, 395, -1, 394, -1, 404, -1, 396, -1, 401, - -1, 402, -1, 403, -1, 400, -1, 1, 224, -1, - 96, 227, 124, 224, -1, 57, 227, 124, 224, -1, - 218, 227, 124, 224, -1, 151, 227, 124, 224, -1, - 3, 227, 124, 224, -1, 123, 227, 106, 224, -1, - 5, 227, 185, 224, -1, 5, 227, 186, 224, -1, - -1, 36, 397, 227, 398, 224, -1, 398, 228, 399, - -1, 399, -1, 8, -1, 199, -1, 32, 227, 167, - 224, -1, 59, 227, 124, 224, -1, 69, 227, 124, - 224, -1, 17, 227, 124, 224, -1, 178, 227, 124, - 224, -1, -1, 63, 406, 226, 411, 225, 224, -1, - -1, 158, 408, 227, 409, 224, -1, 409, 228, 410, - -1, 410, -1, 129, -1, 411, 412, -1, 412, -1, - 413, -1, 414, -1, 407, -1, 1, -1, 215, 227, - 124, 224, -1, 126, 227, 124, 224, -1, -1, 23, - 416, 226, 417, 225, 224, -1, 417, 418, -1, 418, - -1, 419, -1, 420, -1, 1, -1, 62, 227, 124, - 224, -1, 126, 227, 124, 224, -1, 34, 226, 422, - 225, 224, -1, 422, 423, -1, 423, -1, 424, -1, - 1, -1, 62, 227, 124, 224, -1, -1, 38, 426, - 226, 431, 225, 224, -1, -1, 158, 428, 227, 429, - 224, -1, 429, 228, 430, -1, 430, -1, 129, -1, - 431, 432, -1, 432, -1, 433, -1, 434, -1, 427, - -1, 1, -1, 96, 227, 124, 224, -1, 126, 227, - 124, 224, -1, 39, 226, 436, 225, 224, -1, 436, - 437, -1, 437, -1, 446, -1, 447, -1, 449, -1, + -1, 315, -1, 319, -1, 320, -1, 321, -1, 1, + 223, -1, 96, 226, 123, 223, -1, 121, 226, 232, + 223, -1, 107, 226, 105, 223, -1, 19, 226, 232, + 223, -1, 84, 226, 105, 223, -1, 78, 226, 105, + 223, -1, 80, 226, 105, 223, -1, 79, 226, 105, + 223, -1, 149, 226, 234, 223, -1, 191, 226, 234, + 223, -1, 15, 226, 105, 223, -1, 16, 226, 105, + 223, -1, 106, 226, 105, 223, -1, 90, 226, 232, + 223, -1, 91, 226, 232, 223, -1, -1, 36, 322, + 226, 323, 223, -1, 323, 227, 324, -1, 324, -1, + 92, -1, 93, -1, -1, 71, 326, 225, 331, 224, + 223, -1, -1, 36, 328, 226, 329, 223, -1, 329, + 227, 330, -1, 330, -1, 198, -1, 51, -1, 193, + -1, 331, 332, -1, 332, -1, 333, -1, 327, -1, + 337, -1, 338, -1, 1, 223, -1, -1, 122, 226, + 335, 334, 223, -1, 335, 227, 336, -1, 336, -1, + 105, -1, 105, 170, 105, -1, 62, 226, 123, 223, + -1, 57, 226, 123, 223, -1, -1, 48, 340, 225, + 341, 224, 223, -1, 341, 342, -1, 342, -1, 343, + -1, 344, -1, 345, -1, 347, -1, 351, -1, 352, + -1, 353, -1, 346, -1, 1, 223, -1, 214, 226, + 123, 223, -1, 118, 226, 123, 223, -1, 17, 226, + 123, 223, -1, 32, 226, 166, 223, -1, -1, 36, + 348, 226, 349, 223, -1, 349, 227, 350, -1, 350, + -1, 160, -1, 33, -1, 66, -1, 49, -1, 13, + -1, 104, -1, 43, -1, 141, -1, 207, -1, 97, + -1, 159, 226, 123, 223, -1, 127, 226, 123, 223, + -1, 126, 226, 105, 223, -1, -1, 140, 355, 225, + 356, 224, 223, -1, 356, 357, -1, 357, -1, 358, + -1, 359, -1, 360, -1, 1, 223, -1, 73, 226, + 123, 223, -1, 125, 226, 123, 223, -1, 34, 226, + 123, 223, -1, 209, 225, 362, 224, 223, -1, 362, + 363, -1, 363, -1, 364, -1, 1, -1, 96, 226, + 123, 223, -1, -1, 155, 366, 225, 367, 224, 223, + -1, 367, 368, -1, 368, -1, 369, -1, 370, -1, + 371, -1, 1, 223, -1, 96, 226, 123, 223, -1, + 214, 226, 123, 223, -1, -1, 157, 372, 226, 373, + 223, -1, 373, 227, 374, -1, 374, -1, 65, -1, + 213, -1, 180, -1, 201, -1, 219, -1, 204, -1, + 140, -1, 203, -1, 186, -1, 171, -1, -1, 156, + 376, 225, 377, 224, 223, -1, 377, 378, -1, 378, + -1, 379, -1, 380, -1, 1, 223, -1, 96, 226, + 123, 223, -1, -1, 157, 381, 226, 382, 223, -1, + 382, 227, 383, -1, 383, -1, 65, -1, 213, -1, + 180, -1, 201, -1, 219, -1, 204, -1, 140, -1, + 203, -1, 186, -1, 171, -1, -1, 18, 385, 225, + 386, 224, 223, -1, 386, 387, -1, 387, -1, 388, + -1, 389, -1, 390, -1, 391, -1, 392, -1, 394, + -1, 393, -1, 403, -1, 395, -1, 400, -1, 401, + -1, 402, -1, 399, -1, 1, 223, -1, 96, 226, + 123, 223, -1, 57, 226, 123, 223, -1, 217, 226, + 123, 223, -1, 150, 226, 123, 223, -1, 3, 226, + 123, 223, -1, 122, 226, 105, 223, -1, 5, 226, + 184, 223, -1, 5, 226, 185, 223, -1, -1, 36, + 396, 226, 397, 223, -1, 397, 227, 398, -1, 398, + -1, 8, -1, 198, -1, 32, 226, 166, 223, -1, + 59, 226, 123, 223, -1, 69, 226, 123, 223, -1, + 17, 226, 123, 223, -1, 177, 226, 123, 223, -1, + -1, 63, 405, 225, 410, 224, 223, -1, -1, 157, + 407, 226, 408, 223, -1, 408, 227, 409, -1, 409, + -1, 128, -1, 410, 411, -1, 411, -1, 412, -1, + 413, -1, 406, -1, 1, -1, 214, 226, 123, 223, + -1, 125, 226, 123, 223, -1, -1, 23, 415, 225, + 416, 224, 223, -1, 416, 417, -1, 417, -1, 418, + -1, 419, -1, 1, -1, 62, 226, 123, 223, -1, + 125, 226, 123, 223, -1, 34, 225, 421, 224, 223, + -1, 421, 422, -1, 422, -1, 423, -1, 1, -1, + 62, 226, 123, 223, -1, -1, 38, 425, 225, 430, + 224, 223, -1, -1, 157, 427, 226, 428, 223, -1, + 428, 227, 429, -1, 429, -1, 128, -1, 430, 431, + -1, 431, -1, 432, -1, 433, -1, 426, -1, 1, + -1, 96, 226, 123, 223, -1, 125, 226, 123, 223, + -1, 39, 225, 435, 224, 223, -1, 435, 436, -1, + 436, -1, 445, -1, 446, -1, 448, -1, 449, -1, 450, -1, 451, -1, 452, -1, 453, -1, 454, -1, - 455, -1, 456, -1, 445, -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, 448, -1, 480, -1, 457, -1, 478, -1, - 479, -1, 444, -1, 439, -1, 440, -1, 441, -1, - 442, -1, 443, -1, 460, -1, 438, -1, 477, -1, - 1, -1, 87, 227, 106, 224, -1, 42, 227, 167, - 224, -1, 41, 227, 233, 224, -1, 44, 227, 233, - 224, -1, 45, 227, 106, 224, -1, 46, 227, 106, - 224, -1, 155, 227, 167, 224, -1, 64, 227, 233, - 224, -1, 56, 227, 167, 224, -1, 60, 227, 167, - 224, -1, 28, 227, 167, 224, -1, 35, 227, 167, - 224, -1, 6, 227, 167, 224, -1, 83, 227, 233, - 224, -1, 81, 227, 106, 224, -1, 74, 227, 106, - 224, -1, 7, 227, 233, 224, -1, 170, 227, 233, - 224, -1, 169, 227, 233, 224, -1, 50, 227, 106, - 224, -1, 61, 227, 167, 224, -1, 221, 227, 167, - 224, -1, 162, 227, 167, 224, -1, 165, 227, 167, - 224, -1, 166, 227, 167, 224, -1, 164, 227, 167, - 224, -1, 164, 227, 168, 224, -1, 163, 227, 167, - 224, -1, 163, 227, 168, 224, -1, 117, 227, 233, - 224, -1, 12, 227, 233, 224, -1, 110, 227, 167, - 224, -1, 118, 227, 233, 224, -1, 159, 227, 167, - 224, -1, 104, 227, 167, 224, -1, 213, 227, 167, - 224, -1, 112, 227, 167, 224, -1, 29, 227, 106, - 224, -1, 85, 227, 106, 224, -1, 216, 227, 167, - 224, -1, 30, 227, 124, 224, -1, 211, 227, 124, - 224, -1, 121, 227, 167, 224, -1, 26, 227, 167, - 224, -1, 212, 227, 233, 224, -1, -1, 114, 482, - 227, 483, 224, -1, 483, 228, 484, -1, 484, -1, - 173, -1, 176, -1, 177, -1, 179, -1, 180, -1, - 183, -1, 51, -1, 197, -1, 189, -1, 193, -1, - 201, -1, 198, -1, 182, -1, 191, -1, 195, -1, - 184, -1, 207, -1, 174, -1, 175, -1, 187, -1, - -1, 111, 486, 227, 487, 224, -1, 487, 228, 488, - -1, 488, -1, 173, -1, 176, -1, 177, -1, 179, - -1, 180, -1, 183, -1, 197, -1, 51, -1, 189, - -1, 193, -1, 201, -1, 198, -1, 182, -1, 191, - -1, 195, -1, 184, -1, 207, -1, 174, -1, 175, - -1, 187, -1, 190, -1, 88, 227, 106, 224, -1, - 89, 227, 106, 224, -1, 20, 227, 106, 224, -1, - 14, 226, 493, 225, 224, -1, 493, 494, -1, 494, - -1, 501, -1, 496, -1, 497, -1, 498, -1, 499, - -1, 500, -1, 502, -1, 503, -1, 504, -1, 505, - -1, 506, -1, 507, -1, 495, -1, 1, -1, 27, - 227, 167, 224, -1, 67, 227, 233, 224, -1, 68, - 227, 233, 224, -1, 77, 227, 106, 224, -1, 76, - 227, 106, 224, -1, 125, 227, 167, 224, -1, 75, - 227, 106, 224, -1, 22, 227, 106, 224, -1, 21, - 227, 106, 224, -1, 102, 227, 167, 224, -1, 103, - 227, 167, 224, -1, 115, 227, 106, 224, -1, 116, - 227, 233, 224, -1, 152, 226, 509, 225, 224, -1, - 509, 510, -1, 510, -1, 511, -1, 512, -1, 513, - -1, 515, -1, 516, -1, 514, -1, 517, -1, 1, - -1, 37, 227, 167, 224, -1, 54, 227, 167, 224, - -1, 55, 227, 167, 224, -1, 52, 227, 124, 224, - -1, 70, 227, 233, 224, -1, 51, 227, 167, 224, - -1, 53, 227, 167, 224, -1 + 455, -1, 444, -1, 457, -1, 458, -1, 472, -1, + 460, -1, 462, -1, 464, -1, 463, -1, 467, -1, + 461, -1, 468, -1, 469, -1, 470, -1, 471, -1, + 484, -1, 473, -1, 474, -1, 475, -1, 480, -1, + 465, -1, 466, -1, 490, -1, 488, -1, 489, -1, + 447, -1, 479, -1, 456, -1, 477, -1, 478, -1, + 443, -1, 438, -1, 439, -1, 440, -1, 441, -1, + 442, -1, 459, -1, 437, -1, 476, -1, 1, -1, + 87, 226, 105, 223, -1, 42, 226, 166, 223, -1, + 41, 226, 232, 223, -1, 44, 226, 232, 223, -1, + 45, 226, 105, 223, -1, 46, 226, 105, 223, -1, + 154, 226, 166, 223, -1, 64, 226, 232, 223, -1, + 56, 226, 166, 223, -1, 60, 226, 166, 223, -1, + 28, 226, 166, 223, -1, 35, 226, 166, 223, -1, + 6, 226, 166, 223, -1, 83, 226, 232, 223, -1, + 81, 226, 105, 223, -1, 74, 226, 105, 223, -1, + 7, 226, 232, 223, -1, 169, 226, 232, 223, -1, + 168, 226, 232, 223, -1, 50, 226, 105, 223, -1, + 61, 226, 166, 223, -1, 220, 226, 166, 223, -1, + 161, 226, 166, 223, -1, 164, 226, 166, 223, -1, + 165, 226, 166, 223, -1, 163, 226, 166, 223, -1, + 163, 226, 167, 223, -1, 162, 226, 166, 223, -1, + 162, 226, 167, 223, -1, 116, 226, 232, 223, -1, + 12, 226, 232, 223, -1, 109, 226, 166, 223, -1, + 117, 226, 232, 223, -1, 158, 226, 166, 223, -1, + 103, 226, 166, 223, -1, 212, 226, 166, 223, -1, + 111, 226, 166, 223, -1, 29, 226, 105, 223, -1, + 85, 226, 105, 223, -1, 215, 226, 166, 223, -1, + 30, 226, 123, 223, -1, 210, 226, 123, 223, -1, + 120, 226, 166, 223, -1, 26, 226, 166, 223, -1, + 211, 226, 232, 223, -1, -1, 113, 481, 226, 482, + 223, -1, 482, 227, 483, -1, 483, -1, 172, -1, + 175, -1, 176, -1, 178, -1, 179, -1, 182, -1, + 51, -1, 196, -1, 188, -1, 192, -1, 200, -1, + 197, -1, 181, -1, 190, -1, 194, -1, 183, -1, + 206, -1, 173, -1, 174, -1, 186, -1, -1, 110, + 485, 226, 486, 223, -1, 486, 227, 487, -1, 487, + -1, 172, -1, 175, -1, 176, -1, 178, -1, 179, + -1, 182, -1, 196, -1, 51, -1, 188, -1, 192, + -1, 200, -1, 197, -1, 181, -1, 190, -1, 194, + -1, 183, -1, 206, -1, 173, -1, 174, -1, 186, + -1, 189, -1, 88, 226, 105, 223, -1, 89, 226, + 105, 223, -1, 20, 226, 105, 223, -1, 14, 225, + 492, 224, 223, -1, 492, 493, -1, 493, -1, 500, + -1, 495, -1, 496, -1, 497, -1, 498, -1, 499, + -1, 501, -1, 502, -1, 503, -1, 504, -1, 505, + -1, 506, -1, 494, -1, 1, -1, 27, 226, 166, + 223, -1, 67, 226, 232, 223, -1, 68, 226, 232, + 223, -1, 77, 226, 105, 223, -1, 76, 226, 105, + 223, -1, 124, 226, 166, 223, -1, 75, 226, 105, + 223, -1, 22, 226, 105, 223, -1, 21, 226, 105, + 223, -1, 101, 226, 166, 223, -1, 102, 226, 166, + 223, -1, 114, 226, 105, 223, -1, 115, 226, 232, + 223, -1, 151, 225, 508, 224, 223, -1, 508, 509, + -1, 509, -1, 510, -1, 511, -1, 512, -1, 514, + -1, 515, -1, 513, -1, 516, -1, 1, -1, 37, + 226, 166, 223, -1, 54, 226, 166, 223, -1, 55, + 226, 166, 223, -1, 52, 226, 123, 223, -1, 70, + 226, 232, 223, -1, 51, 226, 166, 223, -1, 53, + 226, 166, 223, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 365, 365, 366, 369, 370, 371, 372, 373, 374, - 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, - 385, 386, 387, 388, 389, 390, 394, 394, 395, 399, - 403, 407, 411, 415, 419, 423, 429, 429, 430, 431, - 432, 433, 440, 443, 443, 444, 444, 444, 446, 452, - 459, 461, 461, 462, 462, 463, 463, 464, 464, 465, - 465, 466, 466, 467, 467, 468, 468, 469, 469, 470, - 471, 474, 475, 477, 477, 478, 484, 492, 492, 493, - 499, 507, 549, 608, 636, 644, 659, 674, 683, 697, - 706, 734, 764, 789, 811, 833, 842, 844, 844, 845, - 845, 846, 846, 848, 857, 866, 878, 879, 879, 881, - 881, 882, 884, 891, 891, 904, 905, 907, 907, 908, - 908, 910, 918, 921, 927, 926, 932, 932, 933, 937, - 941, 945, 949, 953, 957, 968, 967, 1044, 1044, 1045, - 1045, 1045, 1046, 1046, 1046, 1047, 1047, 1047, 1049, 1055, - 1061, 1067, 1078, 1084, 1091, 1090, 1096, 1096, 1097, 1101, - 1105, 1109, 1113, 1117, 1121, 1125, 1129, 1133, 1137, 1141, - 1145, 1149, 1153, 1157, 1161, 1165, 1169, 1173, 1177, 1184, - 1183, 1189, 1189, 1190, 1194, 1198, 1202, 1206, 1210, 1214, - 1218, 1222, 1226, 1230, 1234, 1238, 1242, 1246, 1250, 1254, - 1258, 1262, 1273, 1272, 1333, 1333, 1334, 1335, 1335, 1336, - 1337, 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1344, 1345, - 1346, 1347, 1348, 1350, 1356, 1362, 1368, 1374, 1380, 1386, - 1392, 1398, 1404, 1411, 1417, 1423, 1429, 1438, 1448, 1447, - 1453, 1453, 1454, 1458, 1469, 1468, 1475, 1474, 1479, 1479, - 1480, 1484, 1488, 1494, 1494, 1495, 1495, 1495, 1495, 1495, - 1497, 1497, 1499, 1499, 1501, 1515, 1535, 1541, 1551, 1550, - 1592, 1592, 1593, 1593, 1593, 1593, 1594, 1594, 1594, 1595, - 1595, 1597, 1603, 1609, 1615, 1627, 1626, 1632, 1632, 1633, - 1637, 1641, 1645, 1649, 1653, 1657, 1661, 1665, 1669, 1675, - 1689, 1698, 1712, 1711, 1726, 1726, 1727, 1727, 1727, 1727, - 1729, 1735, 1741, 1751, 1753, 1753, 1754, 1754, 1756, 1772, - 1771, 1796, 1796, 1797, 1797, 1797, 1797, 1799, 1805, 1825, - 1824, 1830, 1830, 1831, 1835, 1839, 1843, 1847, 1851, 1855, - 1859, 1863, 1867, 1877, 1876, 1897, 1897, 1898, 1898, 1898, - 1900, 1907, 1906, 1912, 1912, 1913, 1917, 1921, 1925, 1929, - 1933, 1937, 1941, 1945, 1949, 1959, 1958, 2024, 2024, 2025, - 2025, 2025, 2026, 2026, 2027, 2027, 2027, 2028, 2028, 2028, - 2029, 2029, 2030, 2032, 2038, 2044, 2050, 2063, 2076, 2082, - 2086, 2095, 2094, 2099, 2099, 2100, 2104, 2110, 2121, 2127, - 2133, 2139, 2155, 2154, 2217, 2216, 2222, 2222, 2223, 2229, - 2229, 2230, 2230, 2230, 2230, 2232, 2252, 2262, 2261, 2288, - 2288, 2289, 2289, 2289, 2291, 2297, 2306, 2308, 2308, 2309, - 2309, 2311, 2329, 2328, 2374, 2373, 2379, 2379, 2380, 2386, - 2386, 2387, 2387, 2387, 2387, 2389, 2395, 2404, 2407, 2407, - 2408, 2408, 2409, 2409, 2410, 2410, 2411, 2411, 2412, 2412, - 2413, 2414, 2415, 2415, 2416, 2416, 2417, 2417, 2418, 2418, - 2419, 2419, 2420, 2420, 2421, 2421, 2422, 2422, 2423, 2423, - 2424, 2424, 2425, 2425, 2426, 2427, 2427, 2428, 2429, 2430, - 2430, 2431, 2431, 2432, 2433, 2434, 2435, 2435, 2436, 2439, - 2444, 2450, 2456, 2462, 2467, 2472, 2477, 2482, 2487, 2492, - 2497, 2502, 2507, 2512, 2517, 2522, 2527, 2532, 2538, 2549, - 2554, 2559, 2564, 2569, 2574, 2577, 2582, 2585, 2590, 2595, - 2600, 2605, 2610, 2615, 2620, 2625, 2630, 2635, 2640, 2645, - 2654, 2663, 2668, 2673, 2679, 2678, 2683, 2683, 2684, 2687, - 2690, 2693, 2696, 2699, 2702, 2705, 2708, 2711, 2714, 2717, - 2720, 2723, 2726, 2729, 2732, 2735, 2738, 2741, 2747, 2746, - 2751, 2751, 2752, 2755, 2758, 2761, 2764, 2767, 2770, 2773, - 2776, 2779, 2782, 2785, 2788, 2791, 2794, 2797, 2800, 2803, - 2806, 2809, 2812, 2817, 2822, 2827, 2836, 2839, 2839, 2840, - 2841, 2841, 2842, 2842, 2843, 2843, 2844, 2845, 2846, 2847, - 2847, 2848, 2848, 2850, 2855, 2860, 2865, 2870, 2875, 2880, - 2885, 2890, 2895, 2900, 2905, 2910, 2918, 2921, 2921, 2922, - 2922, 2923, 2924, 2925, 2925, 2926, 2927, 2929, 2935, 2941, - 2947, 2956, 2970, 2976 + 0, 364, 364, 365, 368, 369, 370, 371, 372, 373, + 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, + 384, 385, 386, 387, 388, 389, 393, 393, 394, 398, + 402, 406, 410, 414, 418, 422, 428, 428, 429, 430, + 431, 432, 439, 442, 442, 443, 443, 443, 445, 451, + 458, 460, 460, 461, 461, 462, 462, 463, 463, 464, + 464, 465, 465, 466, 466, 467, 467, 468, 468, 469, + 470, 473, 474, 476, 476, 477, 483, 491, 491, 492, + 498, 506, 548, 607, 635, 643, 658, 673, 682, 696, + 705, 733, 763, 788, 810, 832, 841, 843, 843, 844, + 844, 845, 845, 847, 856, 865, 877, 878, 878, 880, + 880, 881, 883, 890, 890, 903, 904, 906, 906, 907, + 907, 909, 917, 920, 926, 925, 931, 931, 932, 936, + 940, 944, 948, 952, 956, 967, 966, 1043, 1043, 1044, + 1044, 1044, 1045, 1045, 1045, 1046, 1046, 1046, 1048, 1054, + 1060, 1066, 1077, 1083, 1090, 1089, 1095, 1095, 1096, 1100, + 1104, 1108, 1112, 1116, 1120, 1124, 1128, 1132, 1136, 1140, + 1144, 1148, 1152, 1156, 1160, 1164, 1168, 1172, 1176, 1183, + 1182, 1188, 1188, 1189, 1193, 1197, 1201, 1205, 1209, 1213, + 1217, 1221, 1225, 1229, 1233, 1237, 1241, 1245, 1249, 1253, + 1257, 1268, 1267, 1328, 1328, 1329, 1330, 1330, 1331, 1332, + 1333, 1334, 1335, 1336, 1337, 1338, 1339, 1339, 1340, 1341, + 1342, 1343, 1345, 1351, 1357, 1363, 1369, 1375, 1381, 1387, + 1393, 1399, 1406, 1412, 1418, 1424, 1433, 1443, 1442, 1448, + 1448, 1449, 1453, 1464, 1463, 1470, 1469, 1474, 1474, 1475, + 1479, 1483, 1489, 1489, 1490, 1490, 1490, 1490, 1490, 1492, + 1492, 1494, 1494, 1496, 1510, 1530, 1536, 1546, 1545, 1587, + 1587, 1588, 1588, 1588, 1588, 1589, 1589, 1589, 1590, 1590, + 1592, 1598, 1604, 1610, 1622, 1621, 1627, 1627, 1628, 1632, + 1636, 1640, 1644, 1648, 1652, 1656, 1660, 1664, 1670, 1684, + 1693, 1707, 1706, 1721, 1721, 1722, 1722, 1722, 1722, 1724, + 1730, 1736, 1746, 1748, 1748, 1749, 1749, 1751, 1767, 1766, + 1791, 1791, 1792, 1792, 1792, 1792, 1794, 1800, 1820, 1819, + 1825, 1825, 1826, 1830, 1834, 1838, 1842, 1846, 1850, 1854, + 1858, 1862, 1872, 1871, 1892, 1892, 1893, 1893, 1893, 1895, + 1902, 1901, 1907, 1907, 1908, 1912, 1916, 1920, 1924, 1928, + 1932, 1936, 1940, 1944, 1954, 1953, 2019, 2019, 2020, 2020, + 2020, 2021, 2021, 2022, 2022, 2022, 2023, 2023, 2023, 2024, + 2024, 2025, 2027, 2033, 2039, 2045, 2058, 2071, 2077, 2081, + 2090, 2089, 2094, 2094, 2095, 2099, 2105, 2116, 2122, 2128, + 2134, 2150, 2149, 2212, 2211, 2217, 2217, 2218, 2224, 2224, + 2225, 2225, 2225, 2225, 2227, 2247, 2257, 2256, 2283, 2283, + 2284, 2284, 2284, 2286, 2292, 2301, 2303, 2303, 2304, 2304, + 2306, 2324, 2323, 2369, 2368, 2374, 2374, 2375, 2381, 2381, + 2382, 2382, 2382, 2382, 2384, 2390, 2399, 2402, 2402, 2403, + 2403, 2404, 2404, 2405, 2405, 2406, 2406, 2407, 2407, 2408, + 2409, 2410, 2410, 2411, 2411, 2412, 2412, 2413, 2413, 2414, + 2414, 2415, 2415, 2416, 2416, 2417, 2417, 2418, 2418, 2419, + 2419, 2420, 2420, 2421, 2422, 2422, 2423, 2424, 2425, 2425, + 2426, 2426, 2427, 2428, 2429, 2430, 2430, 2431, 2434, 2439, + 2445, 2451, 2457, 2462, 2467, 2472, 2477, 2482, 2487, 2492, + 2497, 2502, 2507, 2512, 2517, 2522, 2527, 2533, 2544, 2549, + 2554, 2559, 2564, 2569, 2572, 2577, 2580, 2585, 2590, 2595, + 2600, 2605, 2610, 2615, 2620, 2625, 2630, 2635, 2640, 2649, + 2658, 2663, 2668, 2674, 2673, 2678, 2678, 2679, 2682, 2685, + 2688, 2691, 2694, 2697, 2700, 2703, 2706, 2709, 2712, 2715, + 2718, 2721, 2724, 2727, 2730, 2733, 2736, 2742, 2741, 2746, + 2746, 2747, 2750, 2753, 2756, 2759, 2762, 2765, 2768, 2771, + 2774, 2777, 2780, 2783, 2786, 2789, 2792, 2795, 2798, 2801, + 2804, 2807, 2812, 2817, 2822, 2831, 2834, 2834, 2835, 2836, + 2836, 2837, 2837, 2838, 2838, 2839, 2840, 2841, 2842, 2842, + 2843, 2843, 2845, 2850, 2855, 2860, 2865, 2870, 2875, 2880, + 2885, 2890, 2895, 2900, 2905, 2913, 2916, 2916, 2917, 2917, + 2918, 2919, 2920, 2920, 2921, 2922, 2924, 2930, 2936, 2942, + 2951, 2965, 2971 }; #endif @@ -1371,7 +1369,7 @@ static const char *const yytname[] = "MAX_NUMBER", "MAX_TARGETS", "MAX_TOPIC_LENGTH", "MAX_WATCH", "MIN_NONWILDCARD", "MIN_NONWILDCARD_SIMPLE", "MIN_IDLE", "MAX_IDLE", "RANDOM_IDLE", "HIDE_IDLE_FROM_OPERS", "MODULE", "MODULES", "NAME", - "NEED_PASSWORD", "NETWORK_DESC", "NETWORK_NAME", "NICK", "NICK_CHANGES", + "NEED_PASSWORD", "NETWORK_DESC", "NETWORK_NAME", "NICK", "NO_CREATE_ON_SPLIT", "NO_JOIN_ON_SPLIT", "NO_OPER_FLOOD", "NO_TILDE", "NUMBER", "NUMBER_PER_CIDR", "NUMBER_PER_IP", "OPERATOR", "OPERS_BYPASS_CALLERID", "OPER_ONLY_UMODES", "OPER_PASS_RESV", @@ -1517,78 +1515,78 @@ 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 + 475, 476, 477, 59, 125, 123, 61, 44 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 229, 230, 230, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 232, 232, 233, 233, - 233, 233, 233, 233, 233, 233, 234, 234, 235, 235, - 235, 235, 236, 237, 237, 238, 238, 238, 239, 240, - 241, 242, 242, 243, 243, 243, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, - 243, 244, 245, 246, 246, 247, 247, 248, 248, 249, - 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 263, 264, 265, 266, 266, 267, - 267, 267, 267, 268, 269, 270, 271, 272, 272, 273, - 273, 273, 274, 276, 275, 277, 277, 278, 278, 278, - 278, 279, 280, 280, 282, 281, 283, 283, 284, 284, - 284, 284, 284, 284, 284, 286, 285, 287, 287, 288, - 288, 288, 288, 288, 288, 288, 288, 288, 289, 290, - 291, 292, 293, 294, 296, 295, 297, 297, 298, 298, - 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, - 298, 298, 298, 298, 298, 298, 298, 298, 298, 300, - 299, 301, 301, 302, 302, 302, 302, 302, 302, 302, - 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, - 302, 302, 304, 303, 305, 305, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 307, 308, 309, 310, 311, 312, 313, - 314, 315, 316, 317, 318, 319, 320, 321, 323, 322, - 324, 324, 325, 325, 327, 326, 329, 328, 330, 330, - 331, 331, 331, 332, 332, 333, 333, 333, 333, 333, - 335, 334, 336, 336, 337, 337, 338, 339, 341, 340, - 342, 342, 343, 343, 343, 343, 343, 343, 343, 343, - 343, 344, 345, 346, 347, 349, 348, 350, 350, 351, - 351, 351, 351, 351, 351, 351, 351, 351, 351, 352, - 353, 354, 356, 355, 357, 357, 358, 358, 358, 358, - 359, 360, 361, 362, 363, 363, 364, 364, 365, 367, - 366, 368, 368, 369, 369, 369, 369, 370, 371, 373, - 372, 374, 374, 375, 375, 375, 375, 375, 375, 375, - 375, 375, 375, 377, 376, 378, 378, 379, 379, 379, - 380, 382, 381, 383, 383, 384, 384, 384, 384, 384, - 384, 384, 384, 384, 384, 386, 385, 387, 387, 388, - 388, 388, 388, 388, 388, 388, 388, 388, 388, 388, - 388, 388, 388, 389, 390, 391, 392, 393, 394, 395, - 395, 397, 396, 398, 398, 399, 399, 400, 401, 402, - 403, 404, 406, 405, 408, 407, 409, 409, 410, 411, - 411, 412, 412, 412, 412, 413, 414, 416, 415, 417, - 417, 418, 418, 418, 419, 420, 421, 422, 422, 423, - 423, 424, 426, 425, 428, 427, 429, 429, 430, 431, - 431, 432, 432, 432, 432, 433, 434, 435, 436, 436, - 437, 437, 437, 437, 437, 437, 437, 437, 437, 437, - 437, 437, 437, 437, 437, 437, 437, 437, 437, 437, - 437, 437, 437, 437, 437, 437, 437, 437, 437, 437, - 437, 437, 437, 437, 437, 437, 437, 437, 437, 437, - 437, 437, 437, 437, 437, 437, 437, 437, 437, 438, + 0, 228, 229, 229, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 231, 231, 232, 232, + 232, 232, 232, 232, 232, 232, 233, 233, 234, 234, + 234, 234, 235, 236, 236, 237, 237, 237, 238, 239, + 240, 241, 241, 242, 242, 242, 242, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, + 242, 243, 244, 245, 245, 246, 246, 247, 247, 248, + 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 258, 259, 260, 261, 262, 263, 264, 265, 265, 266, + 266, 266, 266, 267, 268, 269, 270, 271, 271, 272, + 272, 272, 273, 275, 274, 276, 276, 277, 277, 277, + 277, 278, 279, 279, 281, 280, 282, 282, 283, 283, + 283, 283, 283, 283, 283, 285, 284, 286, 286, 287, + 287, 287, 287, 287, 287, 287, 287, 287, 288, 289, + 290, 291, 292, 293, 295, 294, 296, 296, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 297, + 297, 297, 297, 297, 297, 297, 297, 297, 297, 299, + 298, 300, 300, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 303, 302, 304, 304, 305, 305, 305, 305, 305, + 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, + 305, 305, 306, 307, 308, 309, 310, 311, 312, 313, + 314, 315, 316, 317, 318, 319, 320, 322, 321, 323, + 323, 324, 324, 326, 325, 328, 327, 329, 329, 330, + 330, 330, 331, 331, 332, 332, 332, 332, 332, 334, + 333, 335, 335, 336, 336, 337, 338, 340, 339, 341, + 341, 342, 342, 342, 342, 342, 342, 342, 342, 342, + 343, 344, 345, 346, 348, 347, 349, 349, 350, 350, + 350, 350, 350, 350, 350, 350, 350, 350, 351, 352, + 353, 355, 354, 356, 356, 357, 357, 357, 357, 358, + 359, 360, 361, 362, 362, 363, 363, 364, 366, 365, + 367, 367, 368, 368, 368, 368, 369, 370, 372, 371, + 373, 373, 374, 374, 374, 374, 374, 374, 374, 374, + 374, 374, 376, 375, 377, 377, 378, 378, 378, 379, + 381, 380, 382, 382, 383, 383, 383, 383, 383, 383, + 383, 383, 383, 383, 385, 384, 386, 386, 387, 387, + 387, 387, 387, 387, 387, 387, 387, 387, 387, 387, + 387, 387, 388, 389, 390, 391, 392, 393, 394, 394, + 396, 395, 397, 397, 398, 398, 399, 400, 401, 402, + 403, 405, 404, 407, 406, 408, 408, 409, 410, 410, + 411, 411, 411, 411, 412, 413, 415, 414, 416, 416, + 417, 417, 417, 418, 419, 420, 421, 421, 422, 422, + 423, 425, 424, 427, 426, 428, 428, 429, 430, 430, + 431, 431, 431, 431, 432, 433, 434, 435, 435, 436, + 436, 436, 436, 436, 436, 436, 436, 436, 436, 436, + 436, 436, 436, 436, 436, 436, 436, 436, 436, 436, + 436, 436, 436, 436, 436, 436, 436, 436, 436, 436, + 436, 436, 436, 436, 436, 436, 436, 436, 436, 436, + 436, 436, 436, 436, 436, 436, 436, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, - 459, 460, 461, 462, 463, 463, 464, 464, 465, 466, + 459, 460, 461, 462, 462, 463, 463, 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, 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, 494, 495, 496, 497, 498, 499, 500, 501, - 502, 503, 504, 505, 506, 507, 508, 509, 509, 510, - 510, 510, 510, 510, 510, 510, 510, 511, 512, 513, - 514, 515, 516, 517 + 477, 478, 479, 481, 480, 482, 482, 483, 483, 483, + 483, 483, 483, 483, 483, 483, 483, 483, 483, 483, + 483, 483, 483, 483, 483, 483, 483, 485, 484, 486, + 486, 487, 487, 487, 487, 487, 487, 487, 487, 487, + 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, + 487, 487, 488, 489, 490, 491, 492, 492, 493, 493, + 493, 493, 493, 493, 493, 493, 493, 493, 493, 493, + 493, 493, 494, 495, 496, 497, 498, 499, 500, 501, + 502, 503, 504, 505, 506, 507, 508, 508, 509, 509, + 509, 509, 509, 509, 509, 509, 510, 511, 512, 513, + 514, 515, 516 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1614,51 +1612,51 @@ static const yytype_uint8 yyr2[] = 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, 0, 6, 2, 1, 1, 1, 1, 1, + 1, 0, 6, 2, 1, 1, 1, 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, 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, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 0, 6, 2, 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, 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, 0, 5, 3, 1, 1, 1, 4, 4, 4, - 4, 4, 0, 6, 0, 5, 3, 1, 1, 2, - 1, 1, 1, 1, 1, 4, 4, 0, 6, 2, + 1, 2, 4, 4, 4, 4, 4, 4, 4, 4, + 0, 5, 3, 1, 1, 1, 4, 4, 4, 4, + 4, 0, 6, 0, 5, 3, 1, 1, 2, 1, + 1, 1, 1, 1, 4, 4, 0, 6, 2, 1, + 1, 1, 1, 4, 4, 5, 2, 1, 1, 1, + 4, 0, 6, 0, 5, 3, 1, 1, 2, 1, 1, 1, 1, 1, 4, 4, 5, 2, 1, 1, - 1, 4, 0, 6, 0, 5, 3, 1, 1, 2, - 1, 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, 1, 1, 1, 4, + 1, 1, 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, - 4, 4, 4, 4, 0, 5, 3, 1, 1, 1, + 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, 1, 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 4, 4, 4, 5, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 5, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, - 4, 4, 4, 4 + 1, 1, 4, 4, 4, 5, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 5, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, + 4, 4, 4 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -1666,132 +1664,132 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 0, 0, 0, 202, 365, 417, 0, - 432, 0, 268, 402, 244, 0, 0, 135, 302, 0, - 0, 319, 343, 0, 3, 23, 11, 4, 5, 6, + 2, 0, 1, 0, 0, 0, 201, 364, 416, 0, + 431, 0, 267, 401, 243, 0, 0, 135, 301, 0, + 0, 318, 342, 0, 3, 23, 11, 4, 5, 6, 8, 9, 10, 13, 14, 15, 16, 17, 18, 19, 20, 22, 21, 7, 12, 24, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 98, 99, 101, 100, 612, 0, 0, 0, + 0, 0, 98, 99, 101, 100, 611, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 598, 611, 600, 601, 602, 603, 604, 599, 605, - 606, 607, 608, 609, 610, 0, 0, 0, 430, 0, - 0, 428, 429, 0, 498, 0, 0, 0, 0, 0, + 0, 597, 610, 599, 600, 601, 602, 603, 598, 604, + 605, 606, 607, 608, 609, 0, 0, 0, 429, 0, + 0, 427, 428, 0, 497, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 568, 0, 544, 0, 0, 0, 0, + 0, 0, 0, 567, 0, 543, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 449, 496, 490, 491, 492, 493, - 494, 489, 460, 450, 451, 484, 452, 453, 454, 455, - 456, 457, 458, 459, 486, 461, 462, 495, 464, 469, - 465, 467, 466, 479, 480, 468, 470, 471, 472, 473, - 463, 475, 476, 477, 497, 487, 488, 485, 478, 474, - 482, 483, 481, 0, 0, 0, 0, 0, 0, 108, + 0, 0, 0, 0, 448, 495, 489, 490, 491, 492, + 493, 488, 459, 449, 450, 483, 451, 452, 453, 454, + 455, 456, 457, 458, 485, 460, 461, 494, 463, 468, + 464, 466, 465, 478, 479, 467, 469, 470, 471, 472, + 462, 474, 475, 476, 496, 486, 487, 484, 477, 473, + 481, 482, 480, 0, 0, 0, 0, 0, 0, 108, 109, 110, 0, 0, 0, 0, 0, 44, 45, 46, - 0, 0, 636, 0, 0, 0, 0, 0, 0, 0, - 0, 628, 629, 630, 631, 634, 632, 633, 635, 0, + 0, 0, 635, 0, 0, 0, 0, 0, 0, 0, + 0, 627, 628, 629, 630, 633, 631, 632, 634, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 67, 68, 66, 63, 62, 69, 53, 65, 56, 57, 58, - 54, 64, 59, 60, 61, 55, 0, 0, 317, 0, - 0, 315, 316, 102, 0, 0, 0, 0, 97, 0, + 54, 64, 59, 60, 61, 55, 0, 0, 316, 0, + 0, 314, 315, 102, 0, 0, 0, 0, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 597, 0, 0, 0, 0, 238, 0, + 0, 0, 0, 596, 0, 0, 0, 0, 237, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 205, 206, 209, 211, 212, 213, 214, 215, - 216, 217, 218, 207, 208, 210, 219, 220, 221, 0, - 0, 0, 0, 0, 391, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 368, 369, 370, 371, 372, 373, - 375, 374, 377, 381, 378, 379, 380, 376, 423, 0, - 0, 0, 420, 421, 422, 0, 0, 427, 444, 0, - 0, 434, 443, 0, 440, 441, 442, 0, 0, 0, + 0, 0, 204, 205, 208, 210, 211, 212, 213, 214, + 215, 216, 217, 206, 207, 209, 218, 219, 220, 0, + 0, 0, 0, 0, 390, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 367, 368, 369, 370, 371, 372, + 374, 373, 376, 380, 377, 378, 379, 375, 422, 0, + 0, 0, 419, 420, 421, 0, 0, 426, 443, 0, + 0, 433, 442, 0, 439, 440, 441, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 448, 0, 0, 0, - 285, 0, 0, 0, 0, 0, 0, 271, 272, 273, - 274, 279, 275, 276, 277, 278, 414, 0, 404, 0, - 413, 0, 410, 411, 412, 0, 246, 0, 0, 0, - 256, 0, 254, 255, 257, 258, 111, 0, 0, 107, + 0, 0, 0, 0, 0, 0, 447, 0, 0, 0, + 284, 0, 0, 0, 0, 0, 0, 270, 271, 272, + 273, 278, 274, 275, 276, 277, 413, 0, 403, 0, + 412, 0, 409, 410, 411, 0, 245, 0, 0, 0, + 255, 0, 253, 254, 256, 257, 111, 0, 0, 107, 0, 47, 0, 0, 0, 43, 0, 0, 0, 179, 0, 0, 0, 154, 0, 0, 138, 139, 140, 141, 144, 145, 143, 142, 146, 0, 0, 0, 0, 0, - 305, 306, 307, 308, 0, 0, 0, 0, 0, 0, - 0, 0, 627, 70, 0, 0, 0, 0, 0, 0, + 304, 305, 306, 307, 0, 0, 0, 0, 0, 0, + 0, 0, 626, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 51, 0, 0, 329, 0, 0, 322, 323, - 324, 325, 0, 0, 351, 0, 346, 347, 348, 0, - 0, 314, 0, 0, 0, 96, 0, 0, 0, 26, + 0, 0, 51, 0, 0, 328, 0, 0, 321, 322, + 323, 324, 0, 0, 350, 0, 345, 346, 347, 0, + 0, 313, 0, 0, 0, 96, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 596, 222, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, - 382, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 367, 0, 0, 0, 419, - 0, 426, 0, 0, 0, 0, 439, 0, 0, 0, + 595, 221, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 203, + 381, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 366, 0, 0, 0, 418, + 0, 425, 0, 0, 0, 0, 438, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 447, 280, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 270, 0, - 0, 0, 0, 409, 259, 0, 0, 0, 0, 0, - 253, 0, 106, 0, 0, 0, 42, 147, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 137, 309, 0, - 0, 0, 0, 304, 0, 0, 0, 0, 0, 0, - 0, 626, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 446, 279, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 269, 0, + 0, 0, 0, 408, 258, 0, 0, 0, 0, 0, + 252, 0, 106, 0, 0, 0, 42, 147, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 137, 308, 0, + 0, 0, 0, 303, 0, 0, 0, 0, 0, 0, + 0, 625, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, 76, 0, 74, 79, 80, 0, 78, - 0, 0, 0, 0, 0, 50, 326, 0, 0, 0, - 0, 321, 349, 0, 0, 0, 345, 0, 313, 105, - 104, 103, 621, 620, 613, 26, 26, 26, 26, 26, - 26, 26, 28, 27, 614, 615, 619, 617, 616, 622, - 623, 624, 625, 618, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 325, 0, 0, 0, + 0, 320, 348, 0, 0, 0, 344, 0, 312, 105, + 104, 103, 620, 619, 612, 26, 26, 26, 26, 26, + 26, 26, 28, 27, 613, 614, 618, 616, 615, 621, + 622, 623, 624, 617, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, - 0, 203, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 366, 0, 0, 418, - 431, 0, 0, 0, 433, 511, 515, 529, 595, 542, - 509, 536, 539, 510, 501, 500, 502, 503, 504, 518, - 507, 508, 519, 506, 514, 513, 512, 537, 499, 593, - 594, 533, 530, 579, 572, 589, 590, 573, 574, 575, - 576, 584, 577, 587, 591, 580, 592, 585, 581, 586, - 578, 583, 582, 588, 0, 571, 535, 554, 548, 565, - 566, 549, 550, 551, 552, 560, 553, 563, 567, 556, - 561, 557, 562, 555, 559, 558, 564, 0, 547, 528, - 531, 541, 505, 532, 521, 526, 527, 524, 525, 522, - 523, 517, 516, 540, 543, 534, 538, 520, 0, 0, - 0, 0, 0, 0, 0, 0, 269, 0, 0, 0, - 403, 0, 0, 0, 264, 260, 263, 245, 112, 0, + 0, 202, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 365, 0, 0, 417, + 430, 0, 0, 0, 432, 510, 514, 528, 594, 541, + 508, 535, 538, 509, 500, 499, 501, 502, 503, 517, + 506, 507, 518, 505, 513, 512, 511, 536, 498, 592, + 593, 532, 529, 578, 571, 588, 589, 572, 573, 574, + 575, 583, 576, 586, 590, 579, 591, 584, 580, 585, + 577, 582, 581, 587, 0, 570, 534, 553, 547, 564, + 565, 548, 549, 550, 551, 559, 552, 562, 566, 555, + 560, 556, 561, 554, 558, 557, 563, 0, 546, 527, + 530, 540, 504, 531, 520, 525, 526, 523, 524, 521, + 522, 516, 515, 539, 542, 533, 537, 519, 0, 0, + 0, 0, 0, 0, 0, 0, 268, 0, 0, 0, + 402, 0, 0, 0, 263, 259, 262, 244, 112, 0, 0, 124, 0, 0, 116, 117, 119, 118, 48, 49, 0, 0, 0, 0, 0, 0, 0, 0, 136, 0, - 0, 0, 303, 637, 642, 640, 643, 638, 639, 641, + 0, 0, 302, 636, 641, 639, 642, 637, 638, 640, 87, 95, 93, 94, 85, 89, 88, 82, 81, 83, 71, 0, 72, 0, 86, 84, 92, 90, 91, 0, - 0, 0, 320, 0, 0, 344, 318, 29, 30, 31, - 32, 33, 34, 35, 233, 234, 226, 242, 243, 0, - 241, 228, 230, 229, 227, 236, 237, 223, 235, 225, - 224, 36, 36, 36, 38, 37, 231, 232, 387, 389, - 390, 400, 397, 395, 396, 0, 394, 384, 398, 399, - 383, 388, 386, 401, 385, 424, 425, 445, 446, 438, - 0, 437, 569, 0, 545, 0, 283, 284, 293, 290, - 295, 292, 291, 298, 294, 296, 289, 297, 0, 288, - 282, 301, 300, 299, 281, 416, 408, 0, 407, 415, - 251, 252, 250, 0, 249, 267, 266, 0, 0, 0, + 0, 0, 319, 0, 0, 343, 317, 29, 30, 31, + 32, 33, 34, 35, 232, 233, 225, 241, 242, 0, + 240, 227, 229, 228, 226, 235, 236, 222, 234, 224, + 223, 36, 36, 36, 38, 37, 230, 231, 386, 388, + 389, 399, 396, 394, 395, 0, 393, 383, 397, 398, + 382, 387, 385, 400, 384, 423, 424, 444, 445, 437, + 0, 436, 568, 0, 544, 0, 282, 283, 292, 289, + 294, 291, 290, 297, 293, 295, 288, 296, 0, 287, + 281, 300, 299, 298, 280, 415, 407, 0, 406, 414, + 250, 251, 249, 0, 248, 266, 265, 0, 0, 0, 120, 0, 0, 0, 0, 115, 153, 151, 194, 191, - 190, 183, 185, 201, 195, 198, 193, 184, 199, 187, - 196, 200, 188, 197, 192, 186, 189, 0, 182, 148, - 150, 152, 164, 158, 175, 176, 159, 160, 161, 162, - 170, 163, 173, 177, 166, 178, 171, 167, 172, 165, - 169, 168, 174, 0, 157, 149, 312, 310, 311, 73, - 77, 327, 333, 339, 342, 335, 341, 336, 340, 338, - 334, 337, 0, 332, 328, 350, 355, 361, 364, 357, - 363, 358, 362, 360, 356, 359, 0, 354, 239, 0, - 39, 40, 41, 392, 0, 435, 0, 570, 546, 286, - 0, 405, 0, 247, 0, 265, 262, 261, 0, 0, - 0, 0, 114, 180, 0, 155, 0, 330, 0, 352, - 0, 240, 393, 436, 287, 406, 248, 121, 130, 133, - 132, 129, 134, 131, 128, 0, 127, 123, 122, 181, - 156, 331, 353, 125, 0, 126 + 190, 183, 185, 200, 197, 193, 184, 198, 187, 195, + 199, 188, 196, 192, 186, 189, 0, 182, 148, 150, + 152, 164, 158, 175, 176, 159, 160, 161, 162, 170, + 163, 173, 177, 166, 178, 171, 167, 172, 165, 169, + 168, 174, 0, 157, 149, 311, 309, 310, 73, 77, + 326, 332, 338, 341, 334, 340, 335, 339, 337, 333, + 336, 0, 331, 327, 349, 354, 360, 363, 356, 362, + 357, 361, 359, 355, 358, 0, 353, 238, 0, 39, + 40, 41, 391, 0, 434, 0, 569, 545, 285, 0, + 404, 0, 246, 0, 264, 261, 260, 0, 0, 0, + 0, 114, 180, 0, 155, 0, 329, 0, 351, 0, + 239, 392, 435, 286, 405, 247, 121, 130, 133, 132, + 129, 134, 131, 128, 0, 127, 123, 122, 181, 156, + 330, 352, 125, 0, 126 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -1802,17 +1800,17 @@ static const yytype_int16 yydefgoto[] = 759, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 27, 71, 72, 73, 74, 75, 28, 218, 219, 220, 221, 222, 963, 964, - 965, 966, 967, 1112, 1245, 1246, 29, 60, 505, 506, - 507, 508, 509, 510, 511, 512, 513, 724, 1163, 1164, - 514, 720, 1137, 1138, 30, 49, 331, 332, 333, 334, + 965, 966, 967, 1112, 1244, 1245, 29, 60, 505, 506, + 507, 508, 509, 510, 511, 512, 513, 724, 1162, 1163, + 514, 720, 1136, 1137, 30, 49, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 595, 1029, 1030, 31, 57, 480, 705, 1103, 1104, 481, 482, 483, 1109, 955, 956, 484, 485, 32, 55, 456, 457, 458, 459, 460, 461, 462, 691, 1088, 1089, 463, 464, 465, 33, 61, 519, 520, 521, 522, 523, 34, 290, 291, 292, 35, 64, 557, - 558, 559, 560, 561, 768, 1182, 1183, 36, 65, 565, - 566, 567, 568, 774, 1196, 1197, 37, 50, 363, 364, + 558, 559, 560, 561, 768, 1181, 1182, 36, 65, 565, + 566, 567, 568, 774, 1195, 1196, 37, 50, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 615, 1055, 1056, 373, 374, 375, 376, 377, 38, 56, 470, 700, 1097, 1098, 471, 472, 473, 474, 39, 51, 381, 382, @@ -1830,169 +1828,169 @@ static const yytype_int16 yydefgoto[] = /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -985 +#define YYPACT_NINF -736 static const yytype_int16 yypact[] = { - -985, 599, -985, -196, -221, -213, -985, -985, -985, -188, - -985, -185, -985, -985, -985, -182, -141, -985, -985, -132, - -119, -985, -985, -112, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, 348, 839, -104, - -99, -91, 31, -84, 347, -75, -59, -56, 72, 266, - -37, -9, 425, 389, -1, 45, 15, -191, -44, 37, - 56, 16, -985, -985, -985, -985, -985, 75, 77, 85, - 120, 124, 125, 131, 135, 136, 144, 154, 156, 157, - 241, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, 565, 529, 26, -985, 158, - 13, -985, -985, 17, -985, 160, 169, 171, 173, 175, - 177, 178, 179, 183, 185, 188, 189, 191, 192, 193, - 195, 196, 197, 198, 200, 204, 206, 211, 213, 215, - 216, 218, 219, -985, 226, -985, 228, 229, 233, 236, - 242, 243, 245, 247, 254, 257, 259, 262, 265, 270, - 273, 274, 276, 36, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, 363, 62, 271, 57, 277, 20, -985, - -985, -985, 67, 105, 278, 281, 51, -985, -985, -985, - 333, 82, -985, 288, 291, 292, 294, 301, 302, 304, - 269, -985, -985, -985, -985, -985, -985, -985, -985, 116, - 318, 320, 322, 324, 325, 326, 329, 335, 337, 342, - 343, 344, 345, 346, 349, 352, 355, 78, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, 38, 8, -985, 356, - 53, -985, -985, -985, 162, 246, 369, 225, -985, 390, - 392, 132, 468, 468, 481, 491, 496, 283, 418, 499, - 468, 439, 385, -985, 386, 387, 388, 391, -985, 394, - 397, 399, 400, 401, 402, 403, 404, 405, 407, 408, - 412, 143, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, 395, - 419, 421, 423, 426, -985, 427, 430, 431, 432, 436, - 437, 438, 440, 223, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, 441, - 442, 6, -985, -985, -985, 488, 451, -985, -985, 449, - 450, -985, -985, 35, -985, -985, -985, 511, 468, 468, - 573, 515, 518, 580, 564, 522, 468, 523, 468, 586, - 589, 590, 530, 531, 533, 468, 596, 598, 468, 603, - 604, 605, 607, 538, 547, 490, 551, 493, 468, 468, - 554, 555, 556, 558, -117, 5, 559, 560, 468, 468, - 608, 468, 561, 562, 566, 507, -985, 512, 514, 516, - -985, 517, 519, 521, 526, 527, 59, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, 536, -985, 539, - -985, 54, -985, -985, -985, 513, -985, 543, 544, 546, - -985, 10, -985, -985, -985, -985, -985, 567, 525, -985, - 524, -985, 614, 615, 553, -985, 557, 552, 563, -985, - 568, 574, 577, -985, 581, 73, -985, -985, -985, -985, - -985, -985, -985, -985, -985, 569, 588, 592, 595, 11, - -985, -985, -985, -985, 575, 578, 660, 618, 620, 621, - 468, 570, -985, -985, 665, 624, 711, 717, 709, 713, - 714, 720, 722, 724, -70, 64, 728, 730, 749, 732, - 734, 638, -985, 639, 637, -985, 640, 60, -985, -985, - -985, -985, 641, 642, -985, 86, -985, -985, -985, 744, - 646, -985, 647, 649, 653, -985, 654, 655, 656, 393, - 657, 658, 659, 661, 662, 663, 664, 667, 668, 669, - -985, -985, 770, 783, 468, 671, 788, 789, 790, 791, - 468, 468, 775, 794, 795, 468, 796, 796, 679, -985, - -985, 780, 24, 781, 741, 682, 786, 787, 793, 797, - 806, 798, 799, 800, 689, -985, 801, 802, 694, -985, - 695, -985, 803, 804, 693, 705, -985, 706, 707, 708, - 710, 712, 715, 716, 719, 721, 723, 725, 726, 727, - 729, 733, 735, 736, 737, 738, 739, 742, 743, 745, - 746, 747, 748, 750, 751, 585, 752, 652, 753, 754, - 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, - 765, 766, 767, 768, 769, 771, 772, -985, -985, 809, - 777, 731, 811, 831, 814, 822, 824, 773, -985, 828, - 774, 832, 776, -985, -985, 778, 841, 844, 867, 779, - -985, 782, -985, 7, 784, 785, -985, -985, 870, 835, - 792, 874, 875, 880, 805, 883, 807, -985, -985, 886, - 887, 888, 810, -985, 812, 813, 815, 816, 817, 818, - 819, -985, 820, 821, 823, 825, 826, 827, 829, 830, - 833, 834, -985, -985, -209, -985, -985, -985, -202, -985, - 836, 837, 838, 840, 842, -985, -985, 889, 808, 890, - 843, -985, -985, 891, 845, 846, -985, 847, -985, -985, - -985, -985, -985, -985, -985, 468, 468, 468, 468, 468, - 468, 468, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, 849, 850, 851, 222, 852, 853, - 854, 855, 856, 857, 858, 859, 860, 861, 14, 862, - 863, -985, 864, 865, 866, 868, 869, -2, 871, 872, - 873, 876, 877, 878, 879, 881, -985, 882, 884, -985, - -985, 885, 892, 893, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -194, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -193, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, 894, 895, - 312, 896, 897, 898, 899, 900, -985, 901, 904, 902, - -985, -31, 903, 905, 920, 906, -985, -985, -985, 907, - 908, -985, 909, 88, -985, -985, -985, -985, -985, -985, - 913, 914, 510, 915, 916, 917, 623, 918, -985, 919, - 921, 922, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -70, -985, 64, -985, -985, -985, -985, -985, 923, - 479, 924, -985, 925, 670, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -175, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, 796, 796, 796, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -98, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -43, -985, -985, 585, -985, 652, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -34, -985, - -985, -985, -985, -985, -985, -985, -985, 30, -985, -985, - -985, -985, -985, 63, -985, -985, -985, 910, 867, 926, - -985, 928, 927, -102, 929, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, 102, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, 103, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, 108, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, 113, -985, -985, 222, - -985, -985, -985, -985, -2, -985, 893, -985, -985, -985, - 312, -985, 904, -985, -31, -985, -985, -985, 931, 374, - 932, 933, -985, -985, 510, -985, 623, -985, 479, -985, - 670, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, 114, -985, -985, -985, -985, - -985, -985, -985, -985, 374, -985 + -736, 650, -736, -180, -212, -210, -736, -736, -736, -200, + -736, -197, -736, -736, -736, -171, -164, -736, -736, -157, + -138, -736, -736, -136, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, 316, 648, -131, + -128, -114, 16, -112, 432, -101, -98, -92, 36, 78, + -79, -77, 586, 349, -52, -47, 11, -42, -43, -40, + -35, 7, -736, -736, -736, -736, -736, -22, -3, 12, + 58, 71, 83, 92, 93, 94, 96, 98, 100, 102, + 8, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, 732, 552, 64, -736, 103, + 19, -736, -736, 51, -736, 104, 112, 115, 117, 119, + 123, 125, 127, 128, 131, 135, 137, 140, 142, 143, + 146, 148, 149, 152, 155, 156, 157, 159, 162, 164, + 165, 166, 167, -736, 168, -736, 171, 172, 174, 177, + 179, 180, 182, 183, 184, 185, 187, 188, 189, 198, + 200, 201, 204, 124, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, 310, 10, 33, 2, 206, 32, -736, + -736, -736, 29, 181, 208, 214, 23, -736, -736, -736, + 486, 46, -736, 215, 217, 220, 223, 224, 225, 227, + 4, -736, -736, -736, -736, -736, -736, -736, -736, 231, + 229, 230, 233, 237, 238, 240, 242, 246, 249, 253, + 263, 265, 268, 269, 272, 273, 279, 178, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, 6, 20, -736, 282, + 49, -736, -736, -736, 334, 378, 386, 287, -736, 406, + 407, 348, 411, 411, 418, 420, 422, 362, 363, 425, + 411, 366, 311, -736, 315, 307, 313, 321, -736, 324, + 325, 328, 330, 332, 333, 336, 339, 342, 345, 346, + 350, 280, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, 337, + 351, 352, 354, 355, -736, 357, 359, 372, 373, 376, + 377, 379, 381, 320, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, 382, + 384, 26, -736, -736, -736, 451, 391, -736, -736, 389, + 390, -736, -736, 18, -736, -736, -736, 409, 411, 411, + 484, 452, 454, 512, 501, 459, 411, 460, 411, 522, + 524, 525, 466, 467, 468, 411, 530, 531, 411, 541, + 548, 550, 553, 491, 493, 435, 496, 437, 411, 411, + 499, 500, 505, 506, -96, -62, 511, 513, 411, 411, + 557, 411, 515, 520, 521, 469, -736, 470, 464, 465, + -736, 473, 475, 477, 485, 488, 31, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, 492, -736, 502, + -736, 35, -736, -736, -736, 471, -736, 504, 508, 509, + -736, 15, -736, -736, -736, -736, -736, 546, 494, -736, + 47, -736, 603, 604, 514, -736, 517, 510, 516, -736, + 518, 526, 527, -736, 528, 266, -736, -736, -736, -736, + -736, -736, -736, -736, -736, 536, 534, 538, 539, 39, + -736, -736, -736, -736, 565, 572, 609, 575, 577, 600, + 411, 547, -736, -736, 652, 607, 671, 672, 655, 657, + 658, 659, 660, 661, 76, 141, 664, 666, 686, 669, + 670, 573, -736, 576, 569, -736, 574, 5, -736, -736, + -736, -736, 581, 582, -736, 38, -736, -736, -736, 675, + 584, -736, 590, 591, 592, -736, 594, 596, 601, 275, + 602, 606, 608, 610, 611, 612, 614, 622, 625, 629, + -736, -736, 721, 722, 411, 583, 727, 750, 756, 758, + 411, 411, 744, 761, 764, 411, 765, 765, 649, -736, + -736, 748, 106, 752, 707, 662, 766, 768, 772, 774, + 779, 776, 780, 782, 679, -736, 783, 784, 685, -736, + 688, -736, 786, 789, 687, 691, -736, 697, 705, 709, + 711, 713, 715, 718, 719, 723, 724, 725, 728, 729, + 730, 731, 733, 734, 735, 736, 737, 738, 739, 740, + 741, 742, 745, 746, 747, 668, 749, 743, 751, 753, + 754, 755, 757, 759, 760, 762, 763, 767, 769, 770, + 771, 773, 775, 777, 778, 781, 785, -736, -736, 804, + 800, 787, 807, 839, 822, 827, 832, 788, -736, 844, + 790, 848, 791, -736, -736, 792, 850, 852, 874, 794, + -736, 796, -736, 25, 797, 798, -736, -736, 858, 818, + 799, 864, 865, 866, 801, 868, 803, -736, -736, 872, + 876, 879, 805, -736, 806, 808, 809, 810, 811, 812, + 813, -736, 814, 815, 816, 817, 819, 820, 821, 823, + 824, 825, -736, -736, -205, -736, -736, -736, -181, -736, + 826, 828, 829, 830, 831, -736, -736, 880, 833, 882, + 834, -736, -736, 883, 835, 837, -736, 840, -736, -736, + -736, -736, -736, -736, -736, 411, 411, 411, 411, 411, + 411, 411, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, 841, 842, 843, 211, 845, 846, + 847, 849, 851, 853, 854, 855, 856, 857, 82, 859, + 860, -736, 861, 862, 863, 867, 869, -4, 870, 871, + 873, 875, 877, 878, 881, 884, -736, 885, 886, -736, + -736, 887, 888, 894, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -174, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -163, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, 889, 890, + 579, 891, 892, 893, 895, 896, -736, 897, 902, 898, + -736, -37, 899, 900, 99, 901, -736, -736, -736, 903, + 836, -736, 904, 44, -736, -736, -736, -736, -736, -736, + 906, 908, 566, 909, 910, 911, 704, 912, -736, 913, + 914, 915, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, 76, -736, 141, -736, -736, -736, -736, -736, 916, + 360, 917, -736, 918, 617, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -161, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, 765, 765, 765, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -141, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -127, -736, -736, 668, -736, 743, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -27, -736, + -736, -736, -736, -736, -736, -736, -736, -24, -736, -736, + -736, -736, -736, -17, -736, -736, -736, 905, 874, 919, + -736, 922, 920, -82, 921, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -6, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -1, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, 30, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, 43, -736, -736, 211, -736, + -736, -736, -736, -4, -736, 894, -736, -736, -736, 579, + -736, 902, -736, -37, -736, -736, -736, 924, 153, 925, + 926, -736, -736, 566, -736, 704, -736, 360, -736, 617, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, 48, -736, -736, -736, -736, -736, + -736, -736, -736, 153, -736 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -985, -985, -985, -195, -300, -984, -606, -985, -985, 934, - -985, -985, -985, -985, 848, -985, -985, -985, 19, -985, - 18, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, 946, -985, - -985, -985, -985, -985, 912, -985, -985, -985, -985, 55, - -985, -985, -985, -985, -985, -231, -985, -985, -985, 520, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -200, - -985, -985, -985, -197, -985, -985, -985, 697, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -170, -985, -985, -985, - -985, -985, -190, -985, 549, -985, -985, -985, -62, -985, - -985, -985, -985, -985, 582, -985, -985, -985, -985, -985, - -985, -985, -162, -985, -985, -985, -985, -985, -985, 537, - -985, -985, -985, -985, -985, 911, -985, -985, -985, -985, - 498, -985, -985, -985, -985, -985, -169, -985, -985, -985, - 500, -985, -985, -985, -985, -167, -985, -985, -985, 930, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -136, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -143, -985, 627, -985, -985, -985, -985, -985, 718, - -985, -985, -985, -985, 984, -985, -985, -985, -985, -985, - -985, -96, -985, 740, -985, -985, -985, -985, 941, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, -985, -985, -985, -985, 32, -985, -985, -985, 39, - -985, -985, -985, -985, -985, 1021, -985, -985, -985, -985, - -985, -985, -985, -985, -985, -985, -985, -985, -985, -985, - -985, 935, -985, -985, -985, -985, -985, -985, -985 + -736, -736, -736, -81, -300, -735, -606, -736, -736, 927, + -736, -736, -736, -736, 838, -736, -736, -736, 14, -736, + 9, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, 936, -736, + -736, -736, -736, -736, 907, -736, -736, -736, -736, 34, + -736, -736, -736, -736, -736, -244, -736, -736, -736, 519, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -202, + -736, -736, -736, -182, -736, -736, -736, 793, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -148, -736, -736, -736, + -736, -736, -158, -736, 616, -736, -736, -736, -50, -736, + -736, -736, -736, -736, 615, -736, -736, -736, -736, -736, + -736, -736, -153, -736, -736, -736, -736, -736, -736, 554, + -736, -736, -736, -736, -736, 923, -736, -736, -736, -736, + 532, -736, -736, -736, -736, -736, -160, -736, -736, -736, + 523, -736, -736, -736, -736, -154, -736, -736, -736, 795, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -122, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -124, -736, 620, -736, -736, -736, -736, -736, 714, + -736, -736, -736, -736, 989, -736, -736, -736, -736, -736, + -736, -103, -736, 710, -736, -736, -736, -736, 943, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, 42, -736, -736, -736, 54, + -736, -736, -736, -736, -736, 1053, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, 928, -736, -736, -736, -736, -736, -736, -736 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2001,408 +1999,392 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -114 static const yytype_int16 yytable[] = { - 819, 820, 580, 581, 818, 47, 1053, 378, 959, 562, - 588, 475, 515, 48, 108, 1000, 288, 67, 388, 1001, - 1100, 216, 1002, 1041, 1042, 1043, 1003, 378, 45, 46, - 1072, 1074, 108, 293, 1073, 1075, 388, 114, 52, 553, - 68, 54, 115, 116, 58, 516, 476, 69, 117, 1198, - 674, 675, 223, 1199, 288, 466, 118, 1200, 1201, 1202, - 447, 553, 119, 466, 120, 121, 122, 477, 379, 752, - 753, 123, 478, 216, 496, 109, 448, 124, 125, 249, - 126, 127, 128, 515, 517, 59, 129, 562, 379, 959, - 497, 449, 130, 109, 62, 450, 131, 132, 638, 639, - 133, 1220, 250, 960, 563, 498, 646, 63, 648, 499, - 134, 289, 70, 389, 66, 655, 516, 135, 658, 136, - 818, 137, 105, 138, 139, 140, 1203, 106, 668, 669, - 1204, 389, 380, 479, 554, 107, 251, 518, 680, 681, - 141, 683, 113, 390, 314, 224, 142, 143, 144, 289, - 145, 213, 380, 146, 147, 517, 554, 148, 315, 316, - 252, 390, 317, 1101, 253, 961, 564, 214, 1102, 500, - 215, 225, 676, 677, 254, 391, 255, 256, 451, 318, - 467, 1205, 563, 294, 960, 1206, 452, 453, 467, 230, - 1209, 149, 501, 391, 1210, 150, 555, 1054, 151, 152, - 153, 154, 155, 756, 757, 156, 157, 502, 518, 823, - 824, 257, 468, 258, 259, 260, 261, 231, 555, 454, - 468, 319, 320, 321, 349, 286, 350, 322, 351, 962, - 740, 628, 262, 323, 324, 709, 732, 217, 386, 325, - 352, 297, 76, -113, 564, 488, 961, 158, 159, 160, - 326, 327, 161, 556, 1211, 353, 263, 162, 1212, 354, - 635, 445, 77, 78, 295, 328, 264, 223, 79, 469, - 232, 287, 475, 503, 455, 556, 494, 469, 570, 702, - 355, 486, 356, 296, 697, 770, 572, 1213, 504, 217, - 490, 1214, 357, 329, 806, -113, 265, 266, 726, 578, - 812, 813, 299, 551, 300, 817, 233, 476, 80, 81, - 962, 775, 301, 1114, 1027, 1028, 82, 83, 84, 358, - 234, 235, 236, 237, 238, 1078, 1223, 1225, 477, 491, - 1224, 1226, 1227, 478, 496, 330, 1228, 1229, 1253, 239, - 533, 1230, 1254, 85, 86, 1079, 359, 302, 114, 67, - 497, 303, 304, 115, 116, 1080, 87, 88, 305, 117, - 224, 1081, 306, 307, 447, 498, 89, 118, 608, 499, - 573, 308, 68, 119, 360, 120, 121, 122, 1082, 69, - 448, 309, 123, 310, 311, 385, 225, 397, 124, 125, - 249, 126, 127, 128, 479, 449, 398, 129, 399, 450, - 400, 361, 401, 130, 402, 403, 404, 131, 132, 1083, - 405, 133, 406, 250, 1238, 407, 408, 1084, 409, 410, - 411, 134, 412, 413, 414, 415, 232, 416, 135, 500, - 136, 417, 137, 418, 138, 139, 140, 1239, 419, 1240, - 420, 362, 421, 422, 70, 423, 424, 251, 624, 575, - 585, 141, 501, 426, 1085, 428, 429, 142, 143, 144, - 430, 145, 233, 431, 146, 147, 312, 502, 148, 432, - 433, 252, 434, 1086, 435, 253, 234, 235, 236, 237, - 238, 436, 451, 1241, 437, 254, 438, 255, 256, 439, - 452, 453, 440, 574, 531, 239, 576, 441, 577, 579, - 442, 443, 149, 444, 487, 492, 150, 1221, 493, 151, - 152, 153, 154, 155, 1118, 524, 156, 157, 525, 526, - 1087, 527, 257, 454, 258, 259, 260, 261, 528, 529, - 349, 530, 350, 503, 351, 1119, 785, 786, 787, 788, - 789, 790, 791, 262, 1172, 534, 352, 535, 504, 536, - 1120, 537, 538, 539, 1242, 1243, 540, 1121, 158, 159, - 160, 353, 541, 161, 542, 354, 314, 263, 162, 543, - 544, 545, 546, 547, 579, 1122, 548, 264, 455, 549, - 315, 316, 550, 569, 317, 586, 355, 582, 356, 1244, - 1017, 1018, 1019, 1020, 1021, 1022, 1023, 583, 357, 2, - 3, 318, 584, 4, 1123, 587, 589, 265, 266, 590, - 591, 1124, 630, 5, 592, 593, 6, 7, 594, 610, - 1173, 596, 8, 1125, 597, 358, 598, 599, 600, 601, - 602, 603, 604, 9, 605, 606, 873, 10, 11, 607, - 1126, 1127, 1128, 319, 320, 321, 611, 12, 612, 322, - 613, 1174, 359, 614, 616, 323, 324, 617, 618, 619, - 1175, 325, 13, 620, 621, 622, 1176, 623, 626, 627, - 14, 15, 326, 327, 1142, 631, 632, 633, 637, 640, - 360, 1177, 641, 1178, 1179, 642, 643, 328, 644, 645, - 647, 1129, 649, 1180, 16, 650, 651, 652, 653, 1181, - 654, 1130, 656, 897, 657, 663, 1131, 361, 17, 659, - 660, 661, 1132, 662, 664, 329, 1133, 665, 666, 1134, - 667, 670, 671, 672, 1135, 673, 678, 679, 684, 685, - 1136, 687, 682, 686, 711, 1186, 688, 704, 714, 715, - 18, 689, 734, 690, 692, 735, 693, 362, 694, 712, - 713, 19, 20, 695, 696, 21, 22, 330, 874, 875, - 876, 877, 878, 699, 879, 880, 701, 881, 882, 883, - 706, 707, 884, 708, 885, 886, 887, 716, 888, 718, - 889, 717, 890, 891, 736, 737, 892, 738, 739, 742, - 719, 743, 893, 728, 741, 721, 1143, 1144, 1145, 1146, - 1147, 722, 1148, 1149, 723, 1150, 1151, 1152, 725, 23, - 1153, 1187, 1154, 1155, 1156, 729, 1157, 744, 1158, 730, - 1159, 1160, 731, 745, 1161, 898, 899, 900, 901, 902, - 1162, 903, 904, 746, 905, 906, 907, 747, 748, 908, - 76, 909, 1188, 910, 749, 911, 750, 912, 751, 913, - 914, 1189, 760, 915, 761, 762, 763, 1190, 764, 916, - 77, 78, 765, 766, 767, 772, 79, 769, 777, 773, - 778, 779, 1191, 780, 1192, 1193, 804, 781, 782, 783, - 784, 794, 795, 796, 1194, 797, 798, 799, 800, 805, - 1195, 801, 802, 803, 808, 809, 810, 811, 807, 814, - 815, 816, 818, 821, 822, 825, 80, 81, 826, 827, - 828, 829, 832, 836, 82, 83, 84, 830, 839, 840, - 843, 831, 833, 834, 835, 837, 838, 841, 842, 844, - 845, 846, 847, 938, 848, 941, 849, 942, 943, 850, - 851, 85, 86, 852, 939, 853, 944, 854, 945, 855, - 856, 857, 947, 858, 87, 88, 949, 859, 940, 860, - 861, 862, 863, 864, 89, 952, 865, 866, 953, 867, - 868, 869, 870, 954, 871, 872, 896, 919, 920, 921, - 922, 923, 924, 925, 926, 927, 928, 929, 930, 931, - 932, 933, 934, 935, 970, 936, 937, 946, 973, 974, - 950, 948, 971, 957, 975, 951, 958, 977, 968, 969, - 979, 980, 981, 1009, 1011, 1013, 1215, 298, 1115, 972, - 1169, 1170, 1069, 1255, 1236, 727, 1250, 1249, 609, 1231, - 710, 978, 976, 1096, 982, 1010, 983, 984, 698, 985, - 986, 987, 988, 989, 990, 991, 1216, 992, 1234, 993, - 994, 995, 1218, 996, 997, 771, 733, 998, 999, 1251, - 1004, 1005, 1006, 1252, 1007, 776, 1008, 1012, 1232, 1235, - 1015, 1016, 1014, 1024, 1025, 1026, 1031, 1032, 1033, 1034, - 1035, 1036, 1037, 1038, 1039, 1040, 1046, 1047, 1048, 1049, - 1050, 1107, 1051, 1052, 387, 1057, 1058, 1059, 703, 629, - 1060, 1061, 1062, 1063, 446, 1064, 1065, 1208, 1066, 1067, - 1233, 313, 1207, 0, 0, 552, 1068, 0, 1076, 1077, - 1090, 1091, 1092, 1093, 1094, 1095, 1099, 1105, 0, 1106, - 489, 1110, 0, 636, 1108, 1111, 1113, 1116, 1117, 1139, - 1140, 1141, 1165, 1166, 0, 1167, 1168, 1171, 1184, 1185, - 1217, 0, 0, 1222, 1219, 1237, 1247, 1248, 0, 0, - 495, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 532, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 571, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 819, 820, 580, 581, 1053, 232, 553, 553, 67, 76, + 588, 466, 288, 47, 1100, 48, 475, 108, 1000, 388, + 108, 562, 1001, 818, 223, 52, 959, 378, 54, 77, + 78, 68, 447, 216, 475, 79, 466, 216, 69, 562, + 515, 233, 1002, 45, 46, 959, 1003, 515, 448, 1072, + 288, 476, 388, 1073, 58, 234, 235, 236, 237, 238, + 1074, 59, 1197, 449, 1075, 378, 1198, 450, 62, 476, + 674, 675, 477, 516, 239, 80, 81, 478, 109, 223, + 516, 109, 1202, 82, 83, 84, 1203, 63, 379, 66, + 477, 1041, 1042, 1043, 105, 478, 1204, 106, 638, 639, + 1205, 554, 554, 70, 676, 677, 646, 289, 648, 85, + 86, 107, 517, 113, 389, 655, 563, 224, 658, 517, + 1219, 960, 87, 88, 213, 114, 379, 214, 668, 669, + 115, 116, 89, 215, 563, 467, 117, 479, 680, 681, + 960, 683, 225, 390, 118, 289, 230, 389, 231, 451, + 119, 380, 120, 121, 122, 479, 1101, 452, 453, 123, + 467, 1102, 555, 555, 518, 124, 125, 468, 126, 127, + 128, 518, 224, 286, 129, 391, 390, 564, 287, 249, + 130, 293, 961, 294, 131, 132, 295, 818, 133, 380, + 454, 296, 468, 1237, 1054, 564, 1208, 225, 134, 1210, + 1209, 961, 250, 1211, 299, 135, 1212, 136, 391, 137, + 1213, 138, 139, 140, 752, 753, 1238, 1222, 1239, 556, + 556, 1223, 1224, 300, 469, 486, 1225, 141, 531, 770, + 740, 297, 312, 142, 143, 144, 251, 145, 301, 709, + 146, 147, 635, 386, 148, 455, 962, 494, 217, 469, + 628, 490, 217, 1226, -113, 697, 488, 1227, -113, 702, + 252, 1240, 775, 732, 253, 962, 1228, 496, 1114, 1107, + 1229, 1252, 713, 570, 254, 1253, 255, 256, 149, 756, + 757, 314, 150, 497, 302, 151, 152, 153, 154, 155, + 823, 824, 156, 157, 806, 315, 316, 303, 498, 317, + 812, 813, 499, 1027, 1028, 817, 1199, 1200, 1201, 304, + 257, 447, 258, 259, 260, 261, 318, 67, 305, 306, + 307, 349, 308, 350, 309, 351, 310, 448, 311, 385, + 397, 262, 1241, 1242, 158, 159, 160, 352, 398, 161, + 68, 399, 449, 400, 162, 401, 450, 69, 445, 402, + 249, 403, 353, 404, 405, 263, 354, 406, 319, 320, + 321, 407, 500, 408, 322, 264, 409, 1243, 410, 411, + 323, 324, 412, 250, 413, 414, 325, 355, 415, 356, + 579, 416, 417, 418, 501, 419, 326, 327, 420, 357, + 421, 422, 423, 424, 426, 265, 266, 428, 429, 502, + 430, 328, 551, 431, 491, 432, 433, 251, 434, 435, + 436, 437, 70, 438, 439, 440, 358, 785, 786, 787, + 788, 789, 790, 791, 441, 1171, 442, 443, 451, 329, + 444, 252, 487, 114, 492, 253, 452, 453, 115, 116, + 493, 524, 359, 525, 117, 254, 526, 255, 256, 527, + 528, 529, 118, 530, 533, 534, 535, 572, 119, 536, + 120, 121, 122, 537, 538, 503, 539, 123, 540, 454, + 360, 330, 541, 124, 125, 542, 126, 127, 128, 543, + 504, 257, 129, 258, 259, 260, 261, 496, 130, 544, + 726, 545, 131, 132, 546, 547, 133, 361, 548, 549, + 1172, 573, 262, 497, 608, 550, 134, 1220, 569, 574, + 575, 576, 577, 135, 578, 136, 579, 137, 498, 138, + 139, 140, 499, 582, 455, 583, 263, 584, 585, 586, + 587, 1173, 589, 592, 590, 141, 264, 362, 591, 593, + 1174, 142, 143, 144, 624, 145, 1175, 594, 146, 147, + 596, 597, 148, 349, 598, 350, 599, 351, 600, 601, + 610, 1176, 602, 1177, 1178, 603, 265, 266, 604, 352, + 1118, 605, 606, 1179, 630, 637, 607, 611, 612, 1180, + 613, 614, 500, 616, 353, 617, 149, 232, 354, 640, + 150, 1119, 1078, 151, 152, 153, 154, 155, 618, 619, + 156, 157, 620, 621, 501, 622, 1120, 623, 626, 355, + 627, 356, 1079, 1121, 631, 632, 633, 643, 641, 502, + 642, 357, 1080, 233, 644, 645, 647, 649, 1081, 650, + 651, 1122, 652, 653, 654, 656, 657, 234, 235, 236, + 237, 238, 158, 159, 160, 1082, 659, 161, 358, 76, + 2, 3, 162, 660, 4, 661, 239, 663, 662, 664, + 1123, 665, 666, 667, 5, 670, 671, 6, 7, 77, + 78, 672, 673, 8, 359, 79, 1083, 678, 1124, 679, + 682, 684, 1185, 1084, 9, 503, 685, 686, 10, 11, + 689, 690, 687, 688, 704, 1125, 1126, 1127, 12, 692, + 504, 693, 360, 694, 1017, 1018, 1019, 1020, 1021, 1022, + 1023, 695, 711, 13, 696, 80, 81, 712, 699, 873, + 1085, 14, 15, 82, 83, 84, 714, 715, 701, 361, + 706, 734, 736, 314, 707, 708, 718, 716, 735, 1086, + 717, 737, 719, 738, 721, 16, 1128, 315, 316, 85, + 86, 317, 722, 723, 725, 1141, 1129, 1186, 17, 728, + 729, 1130, 87, 88, 730, 731, 739, 1131, 318, 362, + 741, 1132, 89, 743, 1133, 742, 744, 745, 746, 1134, + 747, 748, 749, 750, 751, 1135, 1087, 760, 1187, 761, + 18, 762, 763, 764, 897, 767, 765, 1188, 777, 766, + 769, 19, 20, 1189, 772, 21, 22, 778, 773, 807, + 319, 320, 321, 779, 780, 781, 322, 782, 1190, 783, + 1191, 1192, 323, 324, 784, 794, 804, 805, 325, 795, + 1193, 796, 808, 797, 798, 799, 1194, 800, 326, 327, + 874, 875, 876, 877, 878, 801, 879, 880, 802, 881, + 882, 883, 803, 328, 884, 809, 885, 886, 887, 23, + 888, 810, 889, 811, 890, 891, 815, 814, 892, 816, + 818, 822, 821, 826, 893, 825, 1142, 1143, 1144, 1145, + 1146, 329, 1147, 1148, 832, 1149, 1150, 1151, 827, 828, + 1152, 829, 1153, 1154, 1155, 830, 1156, 831, 1157, 833, + 1158, 1159, 836, 834, 1160, 835, 837, 838, 839, 841, + 1161, 840, 842, 843, 844, 898, 899, 900, 901, 902, + 845, 903, 904, 330, 905, 906, 907, 938, 846, 908, + 941, 909, 847, 910, 848, 911, 849, 912, 850, 913, + 914, 851, 852, 915, 942, 943, 853, 854, 855, 916, + 944, 856, 857, 858, 859, 945, 860, 861, 862, 863, + 864, 865, 866, 867, 868, 869, 939, 947, 870, 871, + 872, 949, 896, 952, 919, 953, 920, 921, 922, 954, + 923, 970, 924, 925, 971, 926, 927, 973, 974, 975, + 928, 977, 929, 930, 931, 979, 932, 1115, 933, 980, + 934, 935, 981, 1009, 936, 1011, 1013, 298, 937, 1254, + 1214, 946, 1169, 940, 950, 1168, 948, 957, 951, 958, + 968, 969, 1069, 1249, 727, 972, 978, 976, 982, 983, + 1096, 984, 985, 986, 987, 988, 989, 990, 991, 992, + 993, 1248, 994, 995, 996, 1217, 997, 998, 999, 1004, + 1230, 1005, 1006, 1007, 1008, 1235, 1233, 1012, 1215, 1010, + 1015, 1014, 1111, 1016, 1024, 1025, 1026, 1250, 1031, 1032, + 1033, 698, 1034, 733, 1035, 1251, 1036, 1037, 1038, 1039, + 1040, 1231, 1046, 1047, 1048, 1049, 1050, 1234, 776, 771, + 1051, 703, 1052, 1057, 1058, 629, 1059, 710, 1060, 387, + 1061, 1062, 1232, 636, 1063, 552, 446, 1064, 1065, 1066, + 1067, 1068, 1076, 1077, 1090, 1091, 1092, 1207, 1093, 1094, + 1095, 1099, 1105, 1106, 609, 489, 1110, 1206, 1108, 1116, + 1113, 1117, 1138, 1139, 1140, 1164, 1165, 1166, 1167, 1170, + 1183, 1184, 1216, 313, 1221, 0, 1218, 1236, 1246, 1247, + 0, 0, 0, 495, 0, 0, 0, 0, 625, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 532, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 625 + 0, 0, 0, 571 }; #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-985))) + (!!((Yystate) == (-736))) #define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int16 yycheck[] = { - 606, 607, 302, 303, 106, 226, 8, 1, 1, 1, - 310, 1, 1, 226, 1, 224, 1, 1, 1, 228, - 51, 1, 224, 9, 10, 11, 228, 1, 224, 225, - 224, 224, 1, 224, 228, 228, 1, 1, 226, 1, - 24, 226, 6, 7, 226, 34, 36, 31, 12, 224, - 167, 168, 1, 228, 1, 1, 20, 1041, 1042, 1043, - 1, 1, 26, 1, 28, 29, 30, 57, 62, 139, - 140, 35, 62, 1, 1, 62, 17, 41, 42, 1, - 44, 45, 46, 1, 73, 226, 50, 1, 62, 1, - 17, 32, 56, 62, 226, 36, 60, 61, 398, 399, - 64, 203, 24, 96, 96, 32, 406, 226, 408, 36, - 74, 96, 96, 96, 226, 415, 34, 81, 418, 83, - 106, 85, 226, 87, 88, 89, 224, 226, 428, 429, - 228, 96, 126, 123, 96, 226, 58, 126, 438, 439, - 104, 441, 226, 126, 1, 94, 110, 111, 112, 96, - 114, 226, 126, 117, 118, 73, 96, 121, 15, 16, - 82, 126, 19, 194, 86, 158, 158, 226, 199, 96, - 226, 120, 167, 168, 96, 158, 98, 99, 119, 36, - 126, 224, 96, 227, 96, 228, 127, 128, 126, 226, - 224, 155, 119, 158, 228, 159, 158, 199, 162, 163, - 164, 165, 166, 139, 140, 169, 170, 134, 126, 185, - 186, 133, 158, 135, 136, 137, 138, 226, 158, 160, - 158, 78, 79, 80, 1, 226, 3, 84, 5, 222, - 530, 225, 154, 90, 91, 225, 225, 217, 225, 96, - 17, 225, 1, 223, 158, 225, 158, 211, 212, 213, - 107, 108, 216, 215, 224, 32, 178, 221, 228, 36, - 225, 225, 21, 22, 227, 122, 188, 1, 27, 215, - 1, 226, 1, 200, 215, 215, 225, 215, 225, 225, - 57, 224, 59, 227, 225, 225, 124, 224, 215, 217, - 223, 228, 69, 150, 594, 223, 218, 219, 225, 167, - 600, 601, 227, 225, 227, 605, 37, 36, 67, 68, - 222, 225, 227, 225, 92, 93, 75, 76, 77, 96, - 51, 52, 53, 54, 55, 13, 224, 224, 57, 224, - 228, 228, 224, 62, 1, 192, 228, 224, 224, 70, - 224, 228, 228, 102, 103, 33, 123, 227, 1, 1, - 17, 227, 227, 6, 7, 43, 115, 116, 227, 12, - 94, 49, 227, 227, 1, 32, 125, 20, 225, 36, - 124, 227, 24, 26, 151, 28, 29, 30, 66, 31, - 17, 227, 35, 227, 227, 227, 120, 227, 41, 42, - 1, 44, 45, 46, 123, 32, 227, 50, 227, 36, - 227, 178, 227, 56, 227, 227, 227, 60, 61, 97, - 227, 64, 227, 24, 40, 227, 227, 105, 227, 227, - 227, 74, 227, 227, 227, 227, 1, 227, 81, 96, - 83, 227, 85, 227, 87, 88, 89, 63, 227, 65, - 227, 218, 227, 227, 96, 227, 227, 58, 225, 224, - 167, 104, 119, 227, 142, 227, 227, 110, 111, 112, - 227, 114, 37, 227, 117, 118, 225, 134, 121, 227, - 227, 82, 227, 161, 227, 86, 51, 52, 53, 54, - 55, 227, 119, 109, 227, 96, 227, 98, 99, 227, - 127, 128, 227, 124, 225, 70, 106, 227, 106, 106, - 227, 227, 155, 227, 227, 227, 159, 1113, 227, 162, - 163, 164, 165, 166, 4, 227, 169, 170, 227, 227, - 208, 227, 133, 160, 135, 136, 137, 138, 227, 227, - 1, 227, 3, 200, 5, 25, 143, 144, 145, 146, - 147, 148, 149, 154, 65, 227, 17, 227, 215, 227, - 40, 227, 227, 227, 180, 181, 227, 47, 211, 212, - 213, 32, 227, 216, 227, 36, 1, 178, 221, 227, - 227, 227, 227, 227, 106, 65, 227, 188, 215, 227, - 15, 16, 227, 227, 19, 167, 57, 106, 59, 215, - 785, 786, 787, 788, 789, 790, 791, 106, 69, 0, - 1, 36, 106, 4, 94, 106, 167, 218, 219, 224, - 224, 101, 124, 14, 227, 227, 17, 18, 227, 224, - 141, 227, 23, 113, 227, 96, 227, 227, 227, 227, - 227, 227, 227, 34, 227, 227, 51, 38, 39, 227, - 130, 131, 132, 78, 79, 80, 227, 48, 227, 84, - 227, 172, 123, 227, 227, 90, 91, 227, 227, 227, - 181, 96, 63, 227, 227, 227, 187, 227, 227, 227, - 71, 72, 107, 108, 51, 224, 227, 227, 167, 106, - 151, 202, 167, 204, 205, 167, 106, 122, 124, 167, - 167, 181, 106, 214, 95, 106, 106, 167, 167, 220, - 167, 191, 106, 51, 106, 167, 196, 178, 109, 106, - 106, 106, 202, 106, 167, 150, 206, 227, 167, 209, - 227, 167, 167, 167, 214, 167, 167, 167, 167, 167, - 220, 224, 124, 167, 167, 65, 224, 224, 124, 124, - 141, 227, 167, 227, 227, 167, 227, 218, 227, 224, - 226, 152, 153, 227, 227, 156, 157, 192, 173, 174, - 175, 176, 177, 227, 179, 180, 227, 182, 183, 184, - 227, 227, 187, 227, 189, 190, 191, 224, 193, 227, - 195, 224, 197, 198, 124, 167, 201, 167, 167, 124, - 227, 167, 207, 224, 224, 227, 173, 174, 175, 176, - 177, 227, 179, 180, 227, 182, 183, 184, 227, 210, - 187, 141, 189, 190, 191, 227, 193, 106, 195, 227, - 197, 198, 227, 106, 201, 173, 174, 175, 176, 177, - 207, 179, 180, 124, 182, 183, 184, 124, 124, 187, - 1, 189, 172, 191, 124, 193, 124, 195, 124, 197, - 198, 181, 124, 201, 124, 106, 124, 187, 124, 207, - 21, 22, 224, 224, 227, 224, 27, 227, 124, 227, - 224, 224, 202, 224, 204, 205, 106, 224, 224, 224, - 224, 224, 224, 224, 214, 224, 224, 224, 224, 106, - 220, 224, 224, 224, 106, 106, 106, 106, 227, 124, - 106, 106, 106, 224, 124, 124, 67, 68, 167, 227, - 124, 124, 106, 224, 75, 76, 77, 124, 224, 224, - 227, 124, 124, 124, 124, 124, 124, 124, 124, 224, - 224, 224, 224, 124, 224, 124, 224, 106, 124, 224, - 224, 102, 103, 224, 167, 224, 124, 224, 124, 224, - 224, 224, 124, 224, 115, 116, 124, 224, 227, 224, - 224, 224, 224, 224, 125, 124, 224, 224, 124, 224, - 224, 224, 224, 106, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 124, 224, 224, 224, 124, 124, - 224, 227, 167, 224, 124, 227, 224, 124, 224, 224, - 124, 124, 124, 124, 124, 124, 106, 71, 963, 227, - 1001, 1003, 129, 1254, 1214, 505, 1226, 1224, 331, 1199, - 481, 224, 227, 129, 224, 227, 224, 224, 456, 224, - 224, 224, 224, 224, 224, 224, 1108, 224, 1210, 224, - 224, 224, 124, 224, 224, 557, 519, 224, 224, 1228, - 224, 224, 224, 1230, 224, 565, 224, 224, 1204, 1212, - 224, 224, 227, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 171, 224, 224, 110, 224, 224, 224, 471, 381, - 224, 224, 224, 224, 163, 224, 224, 1075, 224, 224, - 1206, 90, 1073, -1, -1, 267, 224, -1, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, -1, 224, - 218, 224, -1, 393, 228, 227, 227, 224, 224, 224, - 224, 224, 224, 224, -1, 224, 224, 224, 224, 224, - 224, -1, -1, 224, 227, 224, 224, 224, -1, -1, - 226, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 240, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 606, 607, 302, 303, 8, 1, 1, 1, 1, 1, + 310, 1, 1, 225, 51, 225, 1, 1, 223, 1, + 1, 1, 227, 105, 1, 225, 1, 1, 225, 21, + 22, 24, 1, 1, 1, 27, 1, 1, 31, 1, + 1, 37, 223, 223, 224, 1, 227, 1, 17, 223, + 1, 36, 1, 227, 225, 51, 52, 53, 54, 55, + 223, 225, 223, 32, 227, 1, 227, 36, 225, 36, + 166, 167, 57, 34, 70, 67, 68, 62, 62, 1, + 34, 62, 223, 75, 76, 77, 227, 225, 62, 225, + 57, 9, 10, 11, 225, 62, 223, 225, 398, 399, + 227, 96, 96, 96, 166, 167, 406, 96, 408, 101, + 102, 225, 73, 225, 96, 415, 96, 94, 418, 73, + 202, 96, 114, 115, 225, 1, 62, 225, 428, 429, + 6, 7, 124, 225, 96, 125, 12, 122, 438, 439, + 96, 441, 119, 125, 20, 96, 225, 96, 225, 118, + 26, 125, 28, 29, 30, 122, 193, 126, 127, 35, + 125, 198, 157, 157, 125, 41, 42, 157, 44, 45, + 46, 125, 94, 225, 50, 157, 125, 157, 225, 1, + 56, 223, 157, 226, 60, 61, 226, 105, 64, 125, + 159, 226, 157, 40, 198, 157, 223, 119, 74, 223, + 227, 157, 24, 227, 226, 81, 223, 83, 157, 85, + 227, 87, 88, 89, 138, 139, 63, 223, 65, 214, + 214, 227, 223, 226, 214, 223, 227, 103, 224, 224, + 530, 224, 224, 109, 110, 111, 58, 113, 226, 224, + 116, 117, 224, 224, 120, 214, 221, 224, 216, 214, + 224, 222, 216, 223, 222, 224, 224, 227, 222, 224, + 82, 108, 224, 224, 86, 221, 223, 1, 224, 170, + 227, 223, 225, 224, 96, 227, 98, 99, 154, 138, + 139, 1, 158, 17, 226, 161, 162, 163, 164, 165, + 184, 185, 168, 169, 594, 15, 16, 226, 32, 19, + 600, 601, 36, 92, 93, 605, 1041, 1042, 1043, 226, + 132, 1, 134, 135, 136, 137, 36, 1, 226, 226, + 226, 1, 226, 3, 226, 5, 226, 17, 226, 226, + 226, 153, 179, 180, 210, 211, 212, 17, 226, 215, + 24, 226, 32, 226, 220, 226, 36, 31, 224, 226, + 1, 226, 32, 226, 226, 177, 36, 226, 78, 79, + 80, 226, 96, 226, 84, 187, 226, 214, 226, 226, + 90, 91, 226, 24, 226, 226, 96, 57, 226, 59, + 105, 226, 226, 226, 118, 226, 106, 107, 226, 69, + 226, 226, 226, 226, 226, 217, 218, 226, 226, 133, + 226, 121, 224, 226, 223, 226, 226, 58, 226, 226, + 226, 226, 96, 226, 226, 226, 96, 142, 143, 144, + 145, 146, 147, 148, 226, 65, 226, 226, 118, 149, + 226, 82, 226, 1, 226, 86, 126, 127, 6, 7, + 226, 226, 122, 226, 12, 96, 226, 98, 99, 226, + 226, 226, 20, 226, 223, 226, 226, 123, 26, 226, + 28, 29, 30, 226, 226, 199, 226, 35, 226, 159, + 150, 191, 226, 41, 42, 226, 44, 45, 46, 226, + 214, 132, 50, 134, 135, 136, 137, 1, 56, 226, + 224, 226, 60, 61, 226, 226, 64, 177, 226, 226, + 140, 123, 153, 17, 224, 226, 74, 1113, 226, 123, + 223, 105, 105, 81, 166, 83, 105, 85, 32, 87, + 88, 89, 36, 105, 214, 105, 177, 105, 166, 166, + 105, 171, 166, 226, 223, 103, 187, 217, 223, 226, + 180, 109, 110, 111, 224, 113, 186, 226, 116, 117, + 226, 226, 120, 1, 226, 3, 226, 5, 226, 226, + 223, 201, 226, 203, 204, 226, 217, 218, 226, 17, + 4, 226, 226, 213, 123, 166, 226, 226, 226, 219, + 226, 226, 96, 226, 32, 226, 154, 1, 36, 105, + 158, 25, 13, 161, 162, 163, 164, 165, 226, 226, + 168, 169, 226, 226, 118, 226, 40, 226, 226, 57, + 226, 59, 33, 47, 223, 226, 226, 105, 166, 133, + 166, 69, 43, 37, 123, 166, 166, 105, 49, 105, + 105, 65, 166, 166, 166, 105, 105, 51, 52, 53, + 54, 55, 210, 211, 212, 66, 105, 215, 96, 1, + 0, 1, 220, 105, 4, 105, 70, 166, 105, 166, + 94, 226, 166, 226, 14, 166, 166, 17, 18, 21, + 22, 166, 166, 23, 122, 27, 97, 166, 112, 166, + 123, 166, 65, 104, 34, 199, 166, 166, 38, 39, + 226, 226, 223, 223, 223, 129, 130, 131, 48, 226, + 214, 226, 150, 226, 785, 786, 787, 788, 789, 790, + 791, 226, 166, 63, 226, 67, 68, 223, 226, 51, + 141, 71, 72, 75, 76, 77, 123, 123, 226, 177, + 226, 166, 123, 1, 226, 226, 226, 223, 166, 160, + 223, 166, 226, 166, 226, 95, 180, 15, 16, 101, + 102, 19, 226, 226, 226, 51, 190, 140, 108, 223, + 226, 195, 114, 115, 226, 226, 166, 201, 36, 217, + 223, 205, 124, 166, 208, 123, 105, 105, 123, 213, + 123, 123, 123, 123, 123, 219, 207, 123, 171, 123, + 140, 105, 123, 123, 51, 226, 223, 180, 123, 223, + 226, 151, 152, 186, 223, 155, 156, 223, 226, 226, + 78, 79, 80, 223, 223, 223, 84, 223, 201, 223, + 203, 204, 90, 91, 223, 223, 105, 105, 96, 223, + 213, 223, 105, 223, 223, 223, 219, 223, 106, 107, + 172, 173, 174, 175, 176, 223, 178, 179, 223, 181, + 182, 183, 223, 121, 186, 105, 188, 189, 190, 209, + 192, 105, 194, 105, 196, 197, 105, 123, 200, 105, + 105, 123, 223, 166, 206, 123, 172, 173, 174, 175, + 176, 149, 178, 179, 105, 181, 182, 183, 226, 123, + 186, 123, 188, 189, 190, 123, 192, 123, 194, 123, + 196, 197, 223, 123, 200, 123, 123, 123, 223, 123, + 206, 223, 123, 226, 223, 172, 173, 174, 175, 176, + 223, 178, 179, 191, 181, 182, 183, 123, 223, 186, + 123, 188, 223, 190, 223, 192, 223, 194, 223, 196, + 197, 223, 223, 200, 105, 123, 223, 223, 223, 206, + 123, 223, 223, 223, 223, 123, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 166, 123, 223, 223, + 223, 123, 223, 123, 223, 123, 223, 223, 223, 105, + 223, 123, 223, 223, 166, 223, 223, 123, 123, 123, + 223, 123, 223, 223, 223, 123, 223, 963, 223, 123, + 223, 223, 123, 123, 223, 123, 123, 71, 223, 1253, + 105, 223, 1003, 226, 223, 1001, 226, 223, 226, 223, + 223, 223, 128, 1225, 505, 226, 223, 226, 223, 223, + 128, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 1223, 223, 223, 223, 123, 223, 223, 223, 223, + 1198, 223, 223, 223, 223, 1213, 1209, 223, 1108, 226, + 223, 226, 226, 223, 223, 223, 223, 1227, 223, 223, + 223, 456, 223, 519, 223, 1229, 223, 223, 223, 223, + 223, 1203, 223, 223, 223, 223, 223, 1211, 565, 557, + 223, 471, 223, 223, 223, 381, 223, 481, 223, 110, + 223, 223, 1205, 393, 223, 267, 163, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 1075, 223, 223, + 223, 223, 223, 223, 331, 218, 223, 1073, 227, 223, + 226, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 90, 223, -1, 226, 223, 223, 223, + -1, -1, -1, 226, -1, -1, -1, -1, 363, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 240, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -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, -1, -1, -1, - -1, -1, -1, 363 + -1, -1, -1, 290 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 230, 0, 1, 4, 14, 17, 18, 23, 34, - 38, 39, 48, 63, 71, 72, 95, 109, 141, 152, - 153, 156, 157, 210, 231, 236, 241, 265, 271, 285, - 303, 326, 340, 355, 362, 366, 376, 385, 405, 415, - 421, 425, 435, 492, 508, 224, 225, 226, 226, 304, - 386, 416, 226, 426, 226, 341, 406, 327, 226, 226, - 286, 356, 226, 226, 367, 377, 226, 1, 24, 31, - 96, 266, 267, 268, 269, 270, 1, 21, 22, 27, - 67, 68, 75, 76, 77, 102, 103, 115, 116, 125, - 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, - 503, 504, 505, 506, 507, 226, 226, 226, 1, 62, - 422, 423, 424, 226, 1, 6, 7, 12, 20, 26, + 0, 229, 0, 1, 4, 14, 17, 18, 23, 34, + 38, 39, 48, 63, 71, 72, 95, 108, 140, 151, + 152, 155, 156, 209, 230, 235, 240, 264, 270, 284, + 302, 325, 339, 354, 361, 365, 375, 384, 404, 414, + 420, 424, 434, 491, 507, 223, 224, 225, 225, 303, + 385, 415, 225, 425, 225, 340, 405, 326, 225, 225, + 285, 355, 225, 225, 366, 376, 225, 1, 24, 31, + 96, 265, 266, 267, 268, 269, 1, 21, 22, 27, + 67, 68, 75, 76, 77, 101, 102, 114, 115, 124, + 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, + 502, 503, 504, 505, 506, 225, 225, 225, 1, 62, + 421, 422, 423, 225, 1, 6, 7, 12, 20, 26, 28, 29, 30, 35, 41, 42, 44, 45, 46, 50, 56, 60, 61, 64, 74, 81, 83, 85, 87, 88, - 89, 104, 110, 111, 112, 114, 117, 118, 121, 155, - 159, 162, 163, 164, 165, 166, 169, 170, 211, 212, - 213, 216, 221, 436, 437, 438, 439, 440, 441, 442, - 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, - 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, - 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, - 473, 474, 475, 476, 477, 478, 479, 480, 481, 485, - 489, 490, 491, 226, 226, 226, 1, 217, 272, 273, - 274, 275, 276, 1, 94, 120, 237, 238, 239, 240, - 226, 226, 1, 37, 51, 52, 53, 54, 55, 70, - 509, 510, 511, 512, 513, 514, 515, 516, 517, 1, - 24, 58, 82, 86, 96, 98, 99, 133, 135, 136, - 137, 138, 154, 178, 188, 218, 219, 242, 243, 244, - 245, 250, 251, 252, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 263, 264, 226, 226, 1, 96, - 363, 364, 365, 224, 227, 227, 227, 225, 267, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 225, 494, 1, 15, 16, 19, 36, 78, - 79, 80, 84, 90, 91, 96, 107, 108, 122, 150, - 192, 305, 306, 307, 308, 309, 310, 311, 312, 313, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 1, - 3, 5, 17, 32, 36, 57, 59, 69, 96, 123, - 151, 178, 218, 387, 388, 389, 390, 391, 392, 393, - 394, 395, 396, 400, 401, 402, 403, 404, 1, 62, - 126, 417, 418, 419, 420, 227, 225, 423, 1, 96, - 126, 158, 427, 431, 432, 433, 434, 227, 227, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 486, 227, 482, 227, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 225, 437, 1, 17, 32, - 36, 119, 127, 128, 160, 215, 342, 343, 344, 345, - 346, 347, 348, 352, 353, 354, 1, 126, 158, 215, - 407, 411, 412, 413, 414, 1, 36, 57, 62, 123, - 328, 332, 333, 334, 338, 339, 224, 227, 225, 273, - 223, 224, 227, 227, 225, 238, 1, 17, 32, 36, - 96, 119, 134, 200, 215, 287, 288, 289, 290, 291, - 292, 293, 294, 295, 299, 1, 34, 73, 126, 357, - 358, 359, 360, 361, 227, 227, 227, 227, 227, 227, - 227, 225, 510, 224, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 225, 243, 1, 96, 158, 215, 368, 369, 370, - 371, 372, 1, 96, 158, 378, 379, 380, 381, 227, - 225, 364, 124, 124, 124, 224, 106, 106, 167, 106, - 233, 233, 106, 106, 106, 167, 167, 106, 233, 167, - 224, 224, 227, 227, 227, 323, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 225, 306, - 224, 227, 227, 227, 227, 397, 227, 227, 227, 227, - 227, 227, 227, 227, 225, 388, 227, 227, 225, 418, - 124, 224, 227, 227, 428, 225, 432, 167, 233, 233, - 106, 167, 167, 106, 124, 167, 233, 167, 233, 106, - 106, 106, 167, 167, 167, 233, 106, 106, 233, 106, - 106, 106, 106, 167, 167, 227, 167, 227, 233, 233, - 167, 167, 167, 167, 167, 168, 167, 168, 167, 167, - 233, 233, 124, 233, 167, 167, 167, 224, 224, 227, - 227, 349, 227, 227, 227, 227, 227, 225, 343, 227, - 408, 227, 225, 412, 224, 329, 227, 227, 227, 225, - 333, 167, 224, 226, 124, 124, 224, 224, 227, 227, - 300, 227, 227, 227, 296, 227, 225, 288, 224, 227, - 227, 227, 225, 358, 167, 167, 124, 167, 167, 167, - 233, 224, 124, 167, 106, 106, 124, 124, 124, 124, - 124, 124, 139, 140, 246, 247, 139, 140, 248, 249, - 124, 124, 106, 124, 124, 224, 224, 227, 373, 227, - 225, 369, 224, 227, 382, 225, 379, 124, 224, 224, - 224, 224, 224, 224, 224, 143, 144, 145, 146, 147, - 148, 149, 232, 233, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 106, 106, 233, 227, 106, 106, - 106, 106, 233, 233, 124, 106, 106, 233, 106, 235, - 235, 224, 124, 185, 186, 124, 167, 227, 124, 124, - 124, 124, 106, 124, 124, 124, 224, 124, 124, 224, - 224, 124, 124, 227, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 51, 173, 174, 175, 176, 177, 179, - 180, 182, 183, 184, 187, 189, 190, 191, 193, 195, - 197, 198, 201, 207, 487, 488, 224, 51, 173, 174, - 175, 176, 177, 179, 180, 182, 183, 184, 187, 189, - 191, 193, 195, 197, 198, 201, 207, 483, 484, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 124, 167, - 227, 124, 106, 124, 124, 124, 224, 124, 227, 124, - 224, 227, 124, 124, 106, 336, 337, 224, 224, 1, - 96, 158, 222, 277, 278, 279, 280, 281, 224, 224, - 124, 167, 227, 124, 124, 124, 227, 124, 224, 124, - 124, 124, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 228, 224, 228, 224, 224, 224, 224, 224, 124, - 227, 124, 224, 124, 227, 224, 224, 232, 232, 232, - 232, 232, 232, 232, 224, 224, 224, 92, 93, 324, - 325, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 9, 10, 11, 234, 235, 224, 224, 224, 224, - 224, 224, 224, 8, 199, 398, 399, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 129, - 429, 430, 224, 228, 224, 228, 224, 224, 13, 33, - 43, 49, 66, 97, 105, 142, 161, 208, 350, 351, - 224, 224, 224, 224, 224, 224, 129, 409, 410, 224, - 51, 194, 199, 330, 331, 224, 224, 171, 228, 335, - 224, 227, 282, 227, 225, 278, 224, 224, 4, 25, - 40, 47, 65, 94, 101, 113, 130, 131, 132, 181, - 191, 196, 202, 206, 209, 214, 220, 301, 302, 224, - 224, 224, 51, 173, 174, 175, 176, 177, 179, 180, - 182, 183, 184, 187, 189, 190, 191, 193, 195, 197, - 198, 201, 207, 297, 298, 224, 224, 224, 224, 247, - 249, 224, 65, 141, 172, 181, 187, 202, 204, 205, - 214, 220, 374, 375, 224, 224, 65, 141, 172, 181, - 187, 202, 204, 205, 214, 220, 383, 384, 224, 228, - 234, 234, 234, 224, 228, 224, 228, 488, 484, 224, - 228, 224, 228, 224, 228, 106, 337, 224, 124, 227, - 203, 235, 224, 224, 228, 224, 228, 224, 228, 224, - 228, 325, 399, 430, 351, 410, 331, 224, 40, 63, - 65, 109, 180, 181, 215, 283, 284, 224, 224, 302, - 298, 375, 384, 224, 228, 284 + 89, 103, 109, 110, 111, 113, 116, 117, 120, 154, + 158, 161, 162, 163, 164, 165, 168, 169, 210, 211, + 212, 215, 220, 435, 436, 437, 438, 439, 440, 441, + 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, + 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, + 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, + 472, 473, 474, 475, 476, 477, 478, 479, 480, 484, + 488, 489, 490, 225, 225, 225, 1, 216, 271, 272, + 273, 274, 275, 1, 94, 119, 236, 237, 238, 239, + 225, 225, 1, 37, 51, 52, 53, 54, 55, 70, + 508, 509, 510, 511, 512, 513, 514, 515, 516, 1, + 24, 58, 82, 86, 96, 98, 99, 132, 134, 135, + 136, 137, 153, 177, 187, 217, 218, 241, 242, 243, + 244, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 258, 259, 260, 261, 262, 263, 225, 225, 1, 96, + 362, 363, 364, 223, 226, 226, 226, 224, 266, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 224, 493, 1, 15, 16, 19, 36, 78, + 79, 80, 84, 90, 91, 96, 106, 107, 121, 149, + 191, 304, 305, 306, 307, 308, 309, 310, 311, 312, + 313, 314, 315, 316, 317, 318, 319, 320, 321, 1, + 3, 5, 17, 32, 36, 57, 59, 69, 96, 122, + 150, 177, 217, 386, 387, 388, 389, 390, 391, 392, + 393, 394, 395, 399, 400, 401, 402, 403, 1, 62, + 125, 416, 417, 418, 419, 226, 224, 422, 1, 96, + 125, 157, 426, 430, 431, 432, 433, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 485, 226, 481, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 224, 436, 1, 17, 32, + 36, 118, 126, 127, 159, 214, 341, 342, 343, 344, + 345, 346, 347, 351, 352, 353, 1, 125, 157, 214, + 406, 410, 411, 412, 413, 1, 36, 57, 62, 122, + 327, 331, 332, 333, 337, 338, 223, 226, 224, 272, + 222, 223, 226, 226, 224, 237, 1, 17, 32, 36, + 96, 118, 133, 199, 214, 286, 287, 288, 289, 290, + 291, 292, 293, 294, 298, 1, 34, 73, 125, 356, + 357, 358, 359, 360, 226, 226, 226, 226, 226, 226, + 226, 224, 509, 223, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 224, 242, 1, 96, 157, 214, 367, 368, 369, + 370, 371, 1, 96, 157, 377, 378, 379, 380, 226, + 224, 363, 123, 123, 123, 223, 105, 105, 166, 105, + 232, 232, 105, 105, 105, 166, 166, 105, 232, 166, + 223, 223, 226, 226, 226, 322, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 224, 305, + 223, 226, 226, 226, 226, 396, 226, 226, 226, 226, + 226, 226, 226, 226, 224, 387, 226, 226, 224, 417, + 123, 223, 226, 226, 427, 224, 431, 166, 232, 232, + 105, 166, 166, 105, 123, 166, 232, 166, 232, 105, + 105, 105, 166, 166, 166, 232, 105, 105, 232, 105, + 105, 105, 105, 166, 166, 226, 166, 226, 232, 232, + 166, 166, 166, 166, 166, 167, 166, 167, 166, 166, + 232, 232, 123, 232, 166, 166, 166, 223, 223, 226, + 226, 348, 226, 226, 226, 226, 226, 224, 342, 226, + 407, 226, 224, 411, 223, 328, 226, 226, 226, 224, + 332, 166, 223, 225, 123, 123, 223, 223, 226, 226, + 299, 226, 226, 226, 295, 226, 224, 287, 223, 226, + 226, 226, 224, 357, 166, 166, 123, 166, 166, 166, + 232, 223, 123, 166, 105, 105, 123, 123, 123, 123, + 123, 123, 138, 139, 245, 246, 138, 139, 247, 248, + 123, 123, 105, 123, 123, 223, 223, 226, 372, 226, + 224, 368, 223, 226, 381, 224, 378, 123, 223, 223, + 223, 223, 223, 223, 223, 142, 143, 144, 145, 146, + 147, 148, 231, 232, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 105, 105, 232, 226, 105, 105, + 105, 105, 232, 232, 123, 105, 105, 232, 105, 234, + 234, 223, 123, 184, 185, 123, 166, 226, 123, 123, + 123, 123, 105, 123, 123, 123, 223, 123, 123, 223, + 223, 123, 123, 226, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 51, 172, 173, 174, 175, 176, 178, + 179, 181, 182, 183, 186, 188, 189, 190, 192, 194, + 196, 197, 200, 206, 486, 487, 223, 51, 172, 173, + 174, 175, 176, 178, 179, 181, 182, 183, 186, 188, + 190, 192, 194, 196, 197, 200, 206, 482, 483, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 123, 166, + 226, 123, 105, 123, 123, 123, 223, 123, 226, 123, + 223, 226, 123, 123, 105, 335, 336, 223, 223, 1, + 96, 157, 221, 276, 277, 278, 279, 280, 223, 223, + 123, 166, 226, 123, 123, 123, 226, 123, 223, 123, + 123, 123, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 227, 223, 227, 223, 223, 223, 223, 223, 123, + 226, 123, 223, 123, 226, 223, 223, 231, 231, 231, + 231, 231, 231, 231, 223, 223, 223, 92, 93, 323, + 324, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 9, 10, 11, 233, 234, 223, 223, 223, 223, + 223, 223, 223, 8, 198, 397, 398, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 128, + 428, 429, 223, 227, 223, 227, 223, 223, 13, 33, + 43, 49, 66, 97, 104, 141, 160, 207, 349, 350, + 223, 223, 223, 223, 223, 223, 128, 408, 409, 223, + 51, 193, 198, 329, 330, 223, 223, 170, 227, 334, + 223, 226, 281, 226, 224, 277, 223, 223, 4, 25, + 40, 47, 65, 94, 112, 129, 130, 131, 180, 190, + 195, 201, 205, 208, 213, 219, 300, 301, 223, 223, + 223, 51, 172, 173, 174, 175, 176, 178, 179, 181, + 182, 183, 186, 188, 189, 190, 192, 194, 196, 197, + 200, 206, 296, 297, 223, 223, 223, 223, 246, 248, + 223, 65, 140, 171, 180, 186, 201, 203, 204, 213, + 219, 373, 374, 223, 223, 65, 140, 171, 180, 186, + 201, 203, 204, 213, 219, 382, 383, 223, 227, 233, + 233, 233, 223, 227, 223, 227, 487, 483, 223, 227, + 223, 227, 223, 227, 105, 336, 223, 123, 226, 202, + 234, 223, 223, 227, 223, 227, 223, 227, 223, 227, + 324, 398, 429, 350, 409, 330, 223, 40, 63, 65, + 108, 179, 180, 214, 282, 283, 223, 223, 301, 297, + 374, 383, 223, 227, 283 }; #define yyerrok (yyerrstatus = 0) @@ -3195,13 +3177,13 @@ yyreduce: { case 26: /* Line 1787 of yacc.c */ -#line 394 "conf_parser.y" +#line 393 "conf_parser.y" { (yyval.number) = 0; } break; case 28: /* Line 1787 of yacc.c */ -#line 396 "conf_parser.y" +#line 395 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); } @@ -3209,7 +3191,7 @@ yyreduce: case 29: /* Line 1787 of yacc.c */ -#line 400 "conf_parser.y" +#line 399 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); } @@ -3217,7 +3199,7 @@ yyreduce: case 30: /* Line 1787 of yacc.c */ -#line 404 "conf_parser.y" +#line 403 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number); } @@ -3225,7 +3207,7 @@ yyreduce: case 31: /* Line 1787 of yacc.c */ -#line 408 "conf_parser.y" +#line 407 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number); } @@ -3233,7 +3215,7 @@ yyreduce: case 32: /* Line 1787 of yacc.c */ -#line 412 "conf_parser.y" +#line 411 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number); } @@ -3241,7 +3223,7 @@ yyreduce: case 33: /* Line 1787 of yacc.c */ -#line 416 "conf_parser.y" +#line 415 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number); } @@ -3249,7 +3231,7 @@ yyreduce: case 34: /* Line 1787 of yacc.c */ -#line 420 "conf_parser.y" +#line 419 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 * 4 + (yyvsp[(3) - (3)].number); } @@ -3257,7 +3239,7 @@ yyreduce: case 35: /* Line 1787 of yacc.c */ -#line 424 "conf_parser.y" +#line 423 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 365 + (yyvsp[(3) - (3)].number); } @@ -3265,37 +3247,37 @@ yyreduce: case 36: /* Line 1787 of yacc.c */ -#line 429 "conf_parser.y" +#line 428 "conf_parser.y" { (yyval.number) = 0; } break; case 38: /* Line 1787 of yacc.c */ -#line 430 "conf_parser.y" +#line 429 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); } break; case 39: /* Line 1787 of yacc.c */ -#line 431 "conf_parser.y" +#line 430 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); } break; case 40: /* Line 1787 of yacc.c */ -#line 432 "conf_parser.y" +#line 431 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); } break; case 41: /* Line 1787 of yacc.c */ -#line 433 "conf_parser.y" +#line 432 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); } break; case 48: /* Line 1787 of yacc.c */ -#line 447 "conf_parser.y" +#line 446 "conf_parser.y" { if (conf_parser_ctx.pass == 2) add_conf_module(libio_basename(yylval.string)); @@ -3304,7 +3286,7 @@ yyreduce: case 49: /* Line 1787 of yacc.c */ -#line 453 "conf_parser.y" +#line 452 "conf_parser.y" { if (conf_parser_ctx.pass == 2) mod_add_path(yylval.string); @@ -3313,7 +3295,7 @@ yyreduce: case 75: /* Line 1787 of yacc.c */ -#line 479 "conf_parser.y" +#line 478 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx) @@ -3324,7 +3306,7 @@ yyreduce: case 76: /* Line 1787 of yacc.c */ -#line 485 "conf_parser.y" +#line 484 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx) @@ -3335,7 +3317,7 @@ yyreduce: case 79: /* Line 1787 of yacc.c */ -#line 494 "conf_parser.y" +#line 493 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3346,7 +3328,7 @@ yyreduce: case 80: /* Line 1787 of yacc.c */ -#line 500 "conf_parser.y" +#line 499 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3357,7 +3339,7 @@ yyreduce: case 81: /* Line 1787 of yacc.c */ -#line 508 "conf_parser.y" +#line 507 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3402,7 +3384,7 @@ yyreduce: case 82: /* Line 1787 of yacc.c */ -#line 550 "conf_parser.y" +#line 549 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 1) @@ -3464,7 +3446,7 @@ yyreduce: case 83: /* Line 1787 of yacc.c */ -#line 609 "conf_parser.y" +#line 608 "conf_parser.y" { /* TBD - XXX: error reporting */ #ifdef HAVE_LIBCRYPTO @@ -3495,7 +3477,7 @@ yyreduce: case 84: /* Line 1787 of yacc.c */ -#line 637 "conf_parser.y" +#line 636 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3506,7 +3488,7 @@ yyreduce: case 85: /* Line 1787 of yacc.c */ -#line 645 "conf_parser.y" +#line 644 "conf_parser.y" { /* this isn't rehashable */ if (conf_parser_ctx.pass == 2 && !ServerInfo.name) @@ -3524,7 +3506,7 @@ yyreduce: case 86: /* Line 1787 of yacc.c */ -#line 660 "conf_parser.y" +#line 659 "conf_parser.y" { /* this isn't rehashable */ if (conf_parser_ctx.pass == 2 && !ServerInfo.sid) @@ -3542,7 +3524,7 @@ yyreduce: case 87: /* Line 1787 of yacc.c */ -#line 675 "conf_parser.y" +#line 674 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3554,7 +3536,7 @@ yyreduce: case 88: /* Line 1787 of yacc.c */ -#line 684 "conf_parser.y" +#line 683 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3571,7 +3553,7 @@ yyreduce: case 89: /* Line 1787 of yacc.c */ -#line 698 "conf_parser.y" +#line 697 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3583,7 +3565,7 @@ yyreduce: case 90: /* Line 1787 of yacc.c */ -#line 707 "conf_parser.y" +#line 706 "conf_parser.y" { if (conf_parser_ctx.pass == 2 && *yylval.string != '*') { @@ -3614,7 +3596,7 @@ yyreduce: case 91: /* Line 1787 of yacc.c */ -#line 735 "conf_parser.y" +#line 734 "conf_parser.y" { #ifdef IPV6 if (conf_parser_ctx.pass == 2 && *yylval.string != '*') @@ -3647,7 +3629,7 @@ yyreduce: case 92: /* Line 1787 of yacc.c */ -#line 765 "conf_parser.y" +#line 764 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3675,7 +3657,7 @@ yyreduce: case 93: /* Line 1787 of yacc.c */ -#line 790 "conf_parser.y" +#line 789 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3700,7 +3682,7 @@ yyreduce: case 94: /* Line 1787 of yacc.c */ -#line 812 "conf_parser.y" +#line 811 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3725,7 +3707,7 @@ yyreduce: case 95: /* Line 1787 of yacc.c */ -#line 834 "conf_parser.y" +#line 833 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ServerInfo.hub = yylval.number; @@ -3734,7 +3716,7 @@ yyreduce: case 103: /* Line 1787 of yacc.c */ -#line 849 "conf_parser.y" +#line 848 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3746,7 +3728,7 @@ yyreduce: case 104: /* Line 1787 of yacc.c */ -#line 858 "conf_parser.y" +#line 857 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3758,7 +3740,7 @@ yyreduce: case 105: /* Line 1787 of yacc.c */ -#line 867 "conf_parser.y" +#line 866 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3770,7 +3752,7 @@ yyreduce: case 112: /* Line 1787 of yacc.c */ -#line 885 "conf_parser.y" +#line 884 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigLoggingEntry.use_logging = yylval.number; @@ -3779,7 +3761,7 @@ yyreduce: case 113: /* Line 1787 of yacc.c */ -#line 891 "conf_parser.y" +#line 890 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); @@ -3788,7 +3770,7 @@ yyreduce: case 114: /* Line 1787 of yacc.c */ -#line 895 "conf_parser.y" +#line 894 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3801,7 +3783,7 @@ yyreduce: case 121: /* Line 1787 of yacc.c */ -#line 911 "conf_parser.y" +#line 910 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3812,7 +3794,7 @@ yyreduce: case 122: /* Line 1787 of yacc.c */ -#line 919 "conf_parser.y" +#line 918 "conf_parser.y" { block_state.size.value = (yyvsp[(3) - (4)].number); } @@ -3820,7 +3802,7 @@ yyreduce: case 123: /* Line 1787 of yacc.c */ -#line 922 "conf_parser.y" +#line 921 "conf_parser.y" { block_state.size.value = 0; } @@ -3828,7 +3810,7 @@ yyreduce: case 124: /* Line 1787 of yacc.c */ -#line 927 "conf_parser.y" +#line 926 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = 0; @@ -3837,7 +3819,7 @@ yyreduce: case 128: /* Line 1787 of yacc.c */ -#line 934 "conf_parser.y" +#line 933 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_USER; @@ -3846,7 +3828,7 @@ yyreduce: case 129: /* Line 1787 of yacc.c */ -#line 938 "conf_parser.y" +#line 937 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_OPER; @@ -3855,7 +3837,7 @@ yyreduce: case 130: /* Line 1787 of yacc.c */ -#line 942 "conf_parser.y" +#line 941 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_GLINE; @@ -3864,7 +3846,7 @@ yyreduce: case 131: /* Line 1787 of yacc.c */ -#line 946 "conf_parser.y" +#line 945 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_DLINE; @@ -3873,7 +3855,7 @@ yyreduce: case 132: /* Line 1787 of yacc.c */ -#line 950 "conf_parser.y" +#line 949 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_KLINE; @@ -3882,7 +3864,7 @@ yyreduce: case 133: /* Line 1787 of yacc.c */ -#line 954 "conf_parser.y" +#line 953 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_KILL; @@ -3891,7 +3873,7 @@ yyreduce: case 134: /* Line 1787 of yacc.c */ -#line 958 "conf_parser.y" +#line 957 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_DEBUG; @@ -3900,7 +3882,7 @@ yyreduce: case 135: /* Line 1787 of yacc.c */ -#line 968 "conf_parser.y" +#line 967 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3912,7 +3894,7 @@ yyreduce: case 136: /* Line 1787 of yacc.c */ -#line 975 "conf_parser.y" +#line 974 "conf_parser.y" { dlink_node *ptr = NULL; @@ -3985,7 +3967,7 @@ yyreduce: case 148: /* Line 1787 of yacc.c */ -#line 1050 "conf_parser.y" +#line 1049 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); @@ -3994,7 +3976,7 @@ yyreduce: case 149: /* Line 1787 of yacc.c */ -#line 1056 "conf_parser.y" +#line 1055 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); @@ -4003,7 +3985,7 @@ yyreduce: case 150: /* Line 1787 of yacc.c */ -#line 1062 "conf_parser.y" +#line 1061 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); @@ -4012,7 +3994,7 @@ yyreduce: case 151: /* Line 1787 of yacc.c */ -#line 1068 "conf_parser.y" +#line 1067 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4026,7 +4008,7 @@ yyreduce: case 152: /* Line 1787 of yacc.c */ -#line 1079 "conf_parser.y" +#line 1078 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf)); @@ -4035,7 +4017,7 @@ yyreduce: case 153: /* Line 1787 of yacc.c */ -#line 1085 "conf_parser.y" +#line 1084 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); @@ -4044,7 +4026,7 @@ yyreduce: case 154: /* Line 1787 of yacc.c */ -#line 1091 "conf_parser.y" +#line 1090 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value = 0; @@ -4053,7 +4035,7 @@ yyreduce: case 158: /* Line 1787 of yacc.c */ -#line 1098 "conf_parser.y" +#line 1097 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_BOTS; @@ -4062,7 +4044,7 @@ yyreduce: case 159: /* Line 1787 of yacc.c */ -#line 1102 "conf_parser.y" +#line 1101 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CCONN; @@ -4071,7 +4053,7 @@ yyreduce: case 160: /* Line 1787 of yacc.c */ -#line 1106 "conf_parser.y" +#line 1105 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CCONN_FULL; @@ -4080,7 +4062,7 @@ yyreduce: case 161: /* Line 1787 of yacc.c */ -#line 1110 "conf_parser.y" +#line 1109 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_DEAF; @@ -4089,7 +4071,7 @@ yyreduce: case 162: /* Line 1787 of yacc.c */ -#line 1114 "conf_parser.y" +#line 1113 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_DEBUG; @@ -4098,7 +4080,7 @@ yyreduce: case 163: /* Line 1787 of yacc.c */ -#line 1118 "conf_parser.y" +#line 1117 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_FULL; @@ -4107,7 +4089,7 @@ yyreduce: case 164: /* Line 1787 of yacc.c */ -#line 1122 "conf_parser.y" +#line 1121 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_HIDDEN; @@ -4116,7 +4098,7 @@ yyreduce: case 165: /* Line 1787 of yacc.c */ -#line 1126 "conf_parser.y" +#line 1125 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SKILL; @@ -4125,7 +4107,7 @@ yyreduce: case 166: /* Line 1787 of yacc.c */ -#line 1130 "conf_parser.y" +#line 1129 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_NCHANGE; @@ -4134,7 +4116,7 @@ yyreduce: case 167: /* Line 1787 of yacc.c */ -#line 1134 "conf_parser.y" +#line 1133 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_REJ; @@ -4143,7 +4125,7 @@ yyreduce: case 168: /* Line 1787 of yacc.c */ -#line 1138 "conf_parser.y" +#line 1137 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_UNAUTH; @@ -4152,7 +4134,7 @@ yyreduce: case 169: /* Line 1787 of yacc.c */ -#line 1142 "conf_parser.y" +#line 1141 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SPY; @@ -4161,7 +4143,7 @@ yyreduce: case 170: /* Line 1787 of yacc.c */ -#line 1146 "conf_parser.y" +#line 1145 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_EXTERNAL; @@ -4170,7 +4152,7 @@ yyreduce: case 171: /* Line 1787 of yacc.c */ -#line 1150 "conf_parser.y" +#line 1149 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_OPERWALL; @@ -4179,7 +4161,7 @@ yyreduce: case 172: /* Line 1787 of yacc.c */ -#line 1154 "conf_parser.y" +#line 1153 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SERVNOTICE; @@ -4188,7 +4170,7 @@ yyreduce: case 173: /* Line 1787 of yacc.c */ -#line 1158 "conf_parser.y" +#line 1157 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_INVISIBLE; @@ -4197,7 +4179,7 @@ yyreduce: case 174: /* Line 1787 of yacc.c */ -#line 1162 "conf_parser.y" +#line 1161 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_WALLOP; @@ -4206,7 +4188,7 @@ yyreduce: case 175: /* Line 1787 of yacc.c */ -#line 1166 "conf_parser.y" +#line 1165 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SOFTCALLERID; @@ -4215,7 +4197,7 @@ yyreduce: case 176: /* Line 1787 of yacc.c */ -#line 1170 "conf_parser.y" +#line 1169 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CALLERID; @@ -4224,7 +4206,7 @@ yyreduce: case 177: /* Line 1787 of yacc.c */ -#line 1174 "conf_parser.y" +#line 1173 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_LOCOPS; @@ -4233,7 +4215,7 @@ yyreduce: case 178: /* Line 1787 of yacc.c */ -#line 1178 "conf_parser.y" +#line 1177 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_REGONLY; @@ -4242,7 +4224,7 @@ yyreduce: case 179: /* Line 1787 of yacc.c */ -#line 1184 "conf_parser.y" +#line 1183 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 0; @@ -4251,7 +4233,7 @@ yyreduce: case 183: /* Line 1787 of yacc.c */ -#line 1191 "conf_parser.y" +#line 1190 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLOBAL_KILL; @@ -4260,7 +4242,7 @@ yyreduce: case 184: /* Line 1787 of yacc.c */ -#line 1195 "conf_parser.y" +#line 1194 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REMOTE; @@ -4269,7 +4251,7 @@ yyreduce: case 185: /* Line 1787 of yacc.c */ -#line 1199 "conf_parser.y" +#line 1198 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_K; @@ -4278,7 +4260,7 @@ yyreduce: case 186: /* Line 1787 of yacc.c */ -#line 1203 "conf_parser.y" +#line 1202 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_UNKLINE; @@ -4287,7 +4269,7 @@ yyreduce: case 187: /* Line 1787 of yacc.c */ -#line 1207 "conf_parser.y" +#line 1206 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_DLINE; @@ -4296,7 +4278,7 @@ yyreduce: case 188: /* Line 1787 of yacc.c */ -#line 1211 "conf_parser.y" +#line 1210 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_UNDLINE; @@ -4305,7 +4287,7 @@ yyreduce: case 189: /* Line 1787 of yacc.c */ -#line 1215 "conf_parser.y" +#line 1214 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_X; @@ -4314,7 +4296,7 @@ yyreduce: case 190: /* Line 1787 of yacc.c */ -#line 1219 "conf_parser.y" +#line 1218 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLINE; @@ -4323,7 +4305,7 @@ yyreduce: case 191: /* Line 1787 of yacc.c */ -#line 1223 "conf_parser.y" +#line 1222 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_DIE; @@ -4332,7 +4314,7 @@ yyreduce: case 192: /* Line 1787 of yacc.c */ -#line 1227 "conf_parser.y" +#line 1226 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_RESTART; @@ -4341,7 +4323,7 @@ yyreduce: case 193: /* Line 1787 of yacc.c */ -#line 1231 "conf_parser.y" +#line 1230 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REHASH; @@ -4350,7 +4332,7 @@ yyreduce: case 194: /* Line 1787 of yacc.c */ -#line 1235 "conf_parser.y" +#line 1234 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_ADMIN; @@ -4359,70 +4341,61 @@ yyreduce: case 195: /* Line 1787 of yacc.c */ -#line 1239 "conf_parser.y" - { - if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_N; -} - break; - - case 196: -/* Line 1787 of yacc.c */ -#line 1243 "conf_parser.y" +#line 1238 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_OPERWALL; } break; - case 197: + case 196: /* Line 1787 of yacc.c */ -#line 1247 "conf_parser.y" +#line 1242 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLOBOPS; } break; - case 198: + case 197: /* Line 1787 of yacc.c */ -#line 1251 "conf_parser.y" +#line 1246 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_OPER_SPY; } break; - case 199: + case 198: /* Line 1787 of yacc.c */ -#line 1255 "conf_parser.y" +#line 1250 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REMOTEBAN; } break; - case 200: + case 199: /* Line 1787 of yacc.c */ -#line 1259 "conf_parser.y" +#line 1254 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_SET; } break; - case 201: + case 200: /* Line 1787 of yacc.c */ -#line 1263 "conf_parser.y" +#line 1258 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_MODULE; } break; - case 202: + case 201: /* Line 1787 of yacc.c */ -#line 1273 "conf_parser.y" +#line 1268 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4437,9 +4410,9 @@ yyreduce: } break; - case 203: + case 202: /* Line 1787 of yacc.c */ -#line 1285 "conf_parser.y" +#line 1280 "conf_parser.y" { struct ClassItem *class = NULL; @@ -4489,90 +4462,90 @@ yyreduce: } break; - case 223: + case 222: /* Line 1787 of yacc.c */ -#line 1351 "conf_parser.y" +#line 1346 "conf_parser.y" { if (conf_parser_ctx.pass == 1) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 224: + case 223: /* Line 1787 of yacc.c */ -#line 1357 "conf_parser.y" +#line 1352 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.ping_freq.value = (yyvsp[(3) - (4)].number); } break; - case 225: + case 224: /* Line 1787 of yacc.c */ -#line 1363 "conf_parser.y" +#line 1358 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_perip.value = (yyvsp[(3) - (4)].number); } break; - case 226: + case 225: /* Line 1787 of yacc.c */ -#line 1369 "conf_parser.y" +#line 1364 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.con_freq.value = (yyvsp[(3) - (4)].number); } break; - case 227: + case 226: /* Line 1787 of yacc.c */ -#line 1375 "conf_parser.y" +#line 1370 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_total.value = (yyvsp[(3) - (4)].number); } break; - case 228: + case 227: /* Line 1787 of yacc.c */ -#line 1381 "conf_parser.y" +#line 1376 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_global.value = (yyvsp[(3) - (4)].number); } break; - case 229: + case 228: /* Line 1787 of yacc.c */ -#line 1387 "conf_parser.y" +#line 1382 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_local.value = (yyvsp[(3) - (4)].number); } break; - case 230: + case 229: /* Line 1787 of yacc.c */ -#line 1393 "conf_parser.y" +#line 1388 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_ident.value = (yyvsp[(3) - (4)].number); } break; - case 231: + case 230: /* Line 1787 of yacc.c */ -#line 1399 "conf_parser.y" +#line 1394 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_sendq.value = (yyvsp[(3) - (4)].number); } break; - case 232: + case 231: /* Line 1787 of yacc.c */ -#line 1405 "conf_parser.y" +#line 1400 "conf_parser.y" { if (conf_parser_ctx.pass == 1) if ((yyvsp[(3) - (4)].number) >= CLIENT_FLOOD_MIN && (yyvsp[(3) - (4)].number) <= CLIENT_FLOOD_MAX) @@ -4580,36 +4553,36 @@ yyreduce: } break; - case 233: + case 232: /* Line 1787 of yacc.c */ -#line 1412 "conf_parser.y" +#line 1407 "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 234: + case 233: /* Line 1787 of yacc.c */ -#line 1418 "conf_parser.y" +#line 1413 "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 235: + case 234: /* Line 1787 of yacc.c */ -#line 1424 "conf_parser.y" +#line 1419 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.number_per_cidr.value = (yyvsp[(3) - (4)].number); } break; - case 236: + case 235: /* Line 1787 of yacc.c */ -#line 1430 "conf_parser.y" +#line 1425 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4619,9 +4592,9 @@ yyreduce: } break; - case 237: + case 236: /* Line 1787 of yacc.c */ -#line 1439 "conf_parser.y" +#line 1434 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4631,86 +4604,86 @@ yyreduce: } break; - case 238: + case 237: /* Line 1787 of yacc.c */ -#line 1448 "conf_parser.y" +#line 1443 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE; } break; - case 242: + case 241: /* Line 1787 of yacc.c */ -#line 1455 "conf_parser.y" +#line 1450 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE; } break; - case 243: + case 242: /* Line 1787 of yacc.c */ -#line 1459 "conf_parser.y" +#line 1454 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS; } break; - case 244: + case 243: /* Line 1787 of yacc.c */ -#line 1469 "conf_parser.y" +#line 1464 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 246: + case 245: /* Line 1787 of yacc.c */ -#line 1475 "conf_parser.y" +#line 1470 "conf_parser.y" { block_state.flags.value = 0; } break; - case 250: + case 249: /* Line 1787 of yacc.c */ -#line 1481 "conf_parser.y" +#line 1476 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_SSL; } break; - case 251: + case 250: /* Line 1787 of yacc.c */ -#line 1485 "conf_parser.y" +#line 1480 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_HIDDEN; } break; - case 252: + case 251: /* Line 1787 of yacc.c */ -#line 1489 "conf_parser.y" +#line 1484 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_SERVER; } break; - case 260: + case 259: /* Line 1787 of yacc.c */ -#line 1497 "conf_parser.y" +#line 1492 "conf_parser.y" { block_state.flags.value = 0; } break; - case 264: + case 263: /* Line 1787 of yacc.c */ -#line 1502 "conf_parser.y" +#line 1497 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4727,9 +4700,9 @@ yyreduce: } break; - case 265: + case 264: /* Line 1787 of yacc.c */ -#line 1516 "conf_parser.y" +#line 1511 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4750,36 +4723,36 @@ yyreduce: } break; - case 266: + case 265: /* Line 1787 of yacc.c */ -#line 1536 "conf_parser.y" +#line 1531 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 267: + case 266: /* Line 1787 of yacc.c */ -#line 1542 "conf_parser.y" +#line 1537 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 268: + case 267: /* Line 1787 of yacc.c */ -#line 1551 "conf_parser.y" +#line 1546 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 269: + case 268: /* Line 1787 of yacc.c */ -#line 1555 "conf_parser.y" +#line 1550 "conf_parser.y" { dlink_node *ptr = NULL; @@ -4818,36 +4791,36 @@ yyreduce: } break; - case 281: + case 280: /* Line 1787 of yacc.c */ -#line 1598 "conf_parser.y" +#line 1593 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); } break; - case 282: + case 281: /* Line 1787 of yacc.c */ -#line 1604 "conf_parser.y" +#line 1599 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 283: + case 282: /* Line 1787 of yacc.c */ -#line 1610 "conf_parser.y" +#line 1605 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 284: + case 283: /* Line 1787 of yacc.c */ -#line 1616 "conf_parser.y" +#line 1611 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4859,108 +4832,108 @@ yyreduce: } break; - case 285: + case 284: /* Line 1787 of yacc.c */ -#line 1627 "conf_parser.y" +#line 1622 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } break; - case 289: + case 288: /* Line 1787 of yacc.c */ -#line 1634 "conf_parser.y" +#line 1629 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE; } break; - case 290: + case 289: /* Line 1787 of yacc.c */ -#line 1638 "conf_parser.y" +#line 1633 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NOLIMIT; } break; - case 291: + case 290: /* Line 1787 of yacc.c */ -#line 1642 "conf_parser.y" +#line 1637 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE; } break; - case 292: + case 291: /* Line 1787 of yacc.c */ -#line 1646 "conf_parser.y" +#line 1641 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NEED_IDENTD; } break; - case 293: + case 292: /* Line 1787 of yacc.c */ -#line 1650 "conf_parser.y" +#line 1645 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_CAN_FLOOD; } break; - case 294: + case 293: /* Line 1787 of yacc.c */ -#line 1654 "conf_parser.y" +#line 1649 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NO_TILDE; } break; - case 295: + case 294: /* Line 1787 of yacc.c */ -#line 1658 "conf_parser.y" +#line 1653 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE; } break; - case 296: + case 295: /* Line 1787 of yacc.c */ -#line 1662 "conf_parser.y" +#line 1657 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTRESV; } break; - case 297: + case 296: /* Line 1787 of yacc.c */ -#line 1666 "conf_parser.y" +#line 1661 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_WEBIRC; } break; - case 298: + case 297: /* Line 1787 of yacc.c */ -#line 1670 "conf_parser.y" +#line 1665 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD; } break; - case 299: + case 298: /* Line 1787 of yacc.c */ -#line 1676 "conf_parser.y" +#line 1671 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4975,9 +4948,9 @@ yyreduce: } break; - case 300: + case 299: /* Line 1787 of yacc.c */ -#line 1690 "conf_parser.y" +#line 1685 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4987,9 +4960,9 @@ yyreduce: } break; - case 301: + case 300: /* Line 1787 of yacc.c */ -#line 1699 "conf_parser.y" +#line 1694 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4999,9 +4972,9 @@ yyreduce: } break; - case 302: + case 301: /* Line 1787 of yacc.c */ -#line 1712 "conf_parser.y" +#line 1707 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5011,9 +4984,9 @@ yyreduce: } break; - case 303: + case 302: /* Line 1787 of yacc.c */ -#line 1719 "conf_parser.y" +#line 1714 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5022,36 +4995,36 @@ yyreduce: } break; - case 310: + case 309: /* Line 1787 of yacc.c */ -#line 1730 "conf_parser.y" +#line 1725 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 311: + case 310: /* Line 1787 of yacc.c */ -#line 1736 "conf_parser.y" +#line 1731 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 312: + case 311: /* Line 1787 of yacc.c */ -#line 1742 "conf_parser.y" +#line 1737 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); } break; - case 318: + case 317: /* Line 1787 of yacc.c */ -#line 1757 "conf_parser.y" +#line 1752 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5064,9 +5037,9 @@ yyreduce: } break; - case 319: + case 318: /* Line 1787 of yacc.c */ -#line 1772 "conf_parser.y" +#line 1767 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5080,9 +5053,9 @@ yyreduce: } break; - case 320: + case 319: /* Line 1787 of yacc.c */ -#line 1783 "conf_parser.y" +#line 1778 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5097,18 +5070,18 @@ yyreduce: } break; - case 327: + case 326: /* Line 1787 of yacc.c */ -#line 1800 "conf_parser.y" +#line 1795 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 328: + case 327: /* Line 1787 of yacc.c */ -#line 1806 "conf_parser.y" +#line 1801 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5128,108 +5101,108 @@ yyreduce: } break; - case 329: + case 328: /* Line 1787 of yacc.c */ -#line 1825 "conf_parser.y" +#line 1820 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = 0; } break; - case 333: + case 332: /* Line 1787 of yacc.c */ -#line 1832 "conf_parser.y" +#line 1827 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_KLINE; } break; - case 334: + case 333: /* Line 1787 of yacc.c */ -#line 1836 "conf_parser.y" +#line 1831 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNKLINE; } break; - case 335: + case 334: /* Line 1787 of yacc.c */ -#line 1840 "conf_parser.y" +#line 1835 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_DLINE; } break; - case 336: + case 335: /* Line 1787 of yacc.c */ -#line 1844 "conf_parser.y" +#line 1839 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNDLINE; } break; - case 337: + case 336: /* Line 1787 of yacc.c */ -#line 1848 "conf_parser.y" +#line 1843 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_XLINE; } break; - case 338: + case 337: /* Line 1787 of yacc.c */ -#line 1852 "conf_parser.y" +#line 1847 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNXLINE; } break; - case 339: + case 338: /* Line 1787 of yacc.c */ -#line 1856 "conf_parser.y" +#line 1851 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_RESV; } break; - case 340: + case 339: /* Line 1787 of yacc.c */ -#line 1860 "conf_parser.y" +#line 1855 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNRESV; } break; - case 341: + case 340: /* Line 1787 of yacc.c */ -#line 1864 "conf_parser.y" +#line 1859 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_LOCOPS; } break; - case 342: + case 341: /* Line 1787 of yacc.c */ -#line 1868 "conf_parser.y" +#line 1863 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = SHARED_ALL; } break; - case 343: + case 342: /* Line 1787 of yacc.c */ -#line 1877 "conf_parser.y" +#line 1872 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5241,9 +5214,9 @@ yyreduce: } break; - case 344: + case 343: /* Line 1787 of yacc.c */ -#line 1886 "conf_parser.y" +#line 1881 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5256,117 +5229,117 @@ yyreduce: } break; - case 350: + case 349: /* Line 1787 of yacc.c */ -#line 1901 "conf_parser.y" +#line 1896 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 351: + case 350: /* Line 1787 of yacc.c */ -#line 1907 "conf_parser.y" +#line 1902 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = 0; } break; - case 355: + case 354: /* Line 1787 of yacc.c */ -#line 1914 "conf_parser.y" +#line 1909 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_KLINE; } break; - case 356: + case 355: /* Line 1787 of yacc.c */ -#line 1918 "conf_parser.y" +#line 1913 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNKLINE; } break; - case 357: + case 356: /* Line 1787 of yacc.c */ -#line 1922 "conf_parser.y" +#line 1917 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_DLINE; } break; - case 358: + case 357: /* Line 1787 of yacc.c */ -#line 1926 "conf_parser.y" +#line 1921 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNDLINE; } break; - case 359: + case 358: /* Line 1787 of yacc.c */ -#line 1930 "conf_parser.y" +#line 1925 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_XLINE; } break; - case 360: + case 359: /* Line 1787 of yacc.c */ -#line 1934 "conf_parser.y" +#line 1929 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNXLINE; } break; - case 361: + case 360: /* Line 1787 of yacc.c */ -#line 1938 "conf_parser.y" +#line 1933 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_RESV; } break; - case 362: + case 361: /* Line 1787 of yacc.c */ -#line 1942 "conf_parser.y" +#line 1937 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNRESV; } break; - case 363: + case 362: /* Line 1787 of yacc.c */ -#line 1946 "conf_parser.y" +#line 1941 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_LOCOPS; } break; - case 364: + case 363: /* Line 1787 of yacc.c */ -#line 1950 "conf_parser.y" +#line 1945 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = SHARED_ALL; } break; - case 365: + case 364: /* Line 1787 of yacc.c */ -#line 1959 "conf_parser.y" +#line 1954 "conf_parser.y" { if (conf_parser_ctx.pass != 2) @@ -5377,9 +5350,9 @@ yyreduce: } break; - case 366: + case 365: /* Line 1787 of yacc.c */ -#line 1967 "conf_parser.y" +#line 1962 "conf_parser.y" { struct MaskItem *conf = NULL; struct addrinfo hints, *res; @@ -5438,36 +5411,36 @@ yyreduce: } break; - case 383: + case 382: /* Line 1787 of yacc.c */ -#line 2033 "conf_parser.y" +#line 2028 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 384: + case 383: /* Line 1787 of yacc.c */ -#line 2039 "conf_parser.y" +#line 2034 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf)); } break; - case 385: + case 384: /* Line 1787 of yacc.c */ -#line 2045 "conf_parser.y" +#line 2040 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf)); } break; - case 386: + case 385: /* Line 1787 of yacc.c */ -#line 2051 "conf_parser.y" +#line 2046 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5481,9 +5454,9 @@ yyreduce: } break; - case 387: + case 386: /* Line 1787 of yacc.c */ -#line 2064 "conf_parser.y" +#line 2059 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5497,27 +5470,27 @@ yyreduce: } break; - case 388: + case 387: /* Line 1787 of yacc.c */ -#line 2077 "conf_parser.y" +#line 2072 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = (yyvsp[(3) - (4)].number); } break; - case 389: + case 388: /* Line 1787 of yacc.c */ -#line 2083 "conf_parser.y" +#line 2078 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.aftype.value = AF_INET; } break; - case 390: + case 389: /* Line 1787 of yacc.c */ -#line 2087 "conf_parser.y" +#line 2082 "conf_parser.y" { #ifdef IPV6 if (conf_parser_ctx.pass == 2) @@ -5526,35 +5499,35 @@ yyreduce: } break; - case 391: + case 390: /* Line 1787 of yacc.c */ -#line 2095 "conf_parser.y" +#line 2090 "conf_parser.y" { block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } break; - case 395: + case 394: /* Line 1787 of yacc.c */ -#line 2101 "conf_parser.y" +#line 2096 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN; } break; - case 396: + case 395: /* Line 1787 of yacc.c */ -#line 2105 "conf_parser.y" +#line 2100 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SSL; } break; - case 397: + case 396: /* Line 1787 of yacc.c */ -#line 2111 "conf_parser.y" +#line 2106 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5566,36 +5539,36 @@ yyreduce: } break; - case 398: + case 397: /* Line 1787 of yacc.c */ -#line 2122 "conf_parser.y" +#line 2117 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list); } break; - case 399: + case 398: /* Line 1787 of yacc.c */ -#line 2128 "conf_parser.y" +#line 2123 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list); } break; - case 400: + case 399: /* Line 1787 of yacc.c */ -#line 2134 "conf_parser.y" +#line 2129 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 401: + case 400: /* Line 1787 of yacc.c */ -#line 2140 "conf_parser.y" +#line 2135 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2) @@ -5607,18 +5580,18 @@ yyreduce: } break; - case 402: + case 401: /* Line 1787 of yacc.c */ -#line 2155 "conf_parser.y" +#line 2150 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 403: + case 402: /* Line 1787 of yacc.c */ -#line 2159 "conf_parser.y" +#line 2154 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5677,27 +5650,27 @@ yyreduce: } break; - case 404: + case 403: /* Line 1787 of yacc.c */ -#line 2217 "conf_parser.y" +#line 2212 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 0; } break; - case 408: + case 407: /* Line 1787 of yacc.c */ -#line 2224 "conf_parser.y" +#line 2219 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 1; } break; - case 415: + case 414: /* Line 1787 of yacc.c */ -#line 2233 "conf_parser.y" +#line 2228 "conf_parser.y" { if (conf_parser_ctx.pass == 2) @@ -5718,27 +5691,27 @@ yyreduce: } break; - case 416: + case 415: /* Line 1787 of yacc.c */ -#line 2253 "conf_parser.y" +#line 2248 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 417: + case 416: /* Line 1787 of yacc.c */ -#line 2262 "conf_parser.y" +#line 2257 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 418: + case 417: /* Line 1787 of yacc.c */ -#line 2266 "conf_parser.y" +#line 2261 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5762,27 +5735,27 @@ yyreduce: } break; - case 424: + case 423: /* Line 1787 of yacc.c */ -#line 2292 "conf_parser.y" +#line 2287 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 425: + case 424: /* Line 1787 of yacc.c */ -#line 2298 "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 431: + case 430: /* Line 1787 of yacc.c */ -#line 2312 "conf_parser.y" +#line 2307 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5797,18 +5770,18 @@ yyreduce: } break; - case 432: + case 431: /* Line 1787 of yacc.c */ -#line 2329 "conf_parser.y" +#line 2324 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 433: + case 432: /* Line 1787 of yacc.c */ -#line 2333 "conf_parser.y" +#line 2328 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5850,82 +5823,90 @@ yyreduce: } break; - case 434: + case 433: /* Line 1787 of yacc.c */ -#line 2374 "conf_parser.y" +#line 2369 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 0; } break; - case 438: + case 437: /* Line 1787 of yacc.c */ -#line 2381 "conf_parser.y" +#line 2376 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 1; } break; - case 445: + case 444: /* Line 1787 of yacc.c */ -#line 2390 "conf_parser.y" +#line 2385 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 446: + case 445: /* Line 1787 of yacc.c */ -#line 2396 "conf_parser.y" +#line 2391 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 499: + case 498: /* Line 1787 of yacc.c */ -#line 2440 "conf_parser.y" +#line 2435 "conf_parser.y" { ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number); } break; - case 500: + case 499: /* Line 1787 of yacc.c */ -#line 2445 "conf_parser.y" +#line 2440 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.glines = yylval.number; } break; - case 501: + case 500: /* Line 1787 of yacc.c */ -#line 2451 "conf_parser.y" +#line 2446 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number); } break; - case 502: + case 501: /* Line 1787 of yacc.c */ -#line 2457 "conf_parser.y" +#line 2452 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number); } break; + case 502: +/* Line 1787 of yacc.c */ +#line 2458 "conf_parser.y" + { + ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number); +} + break; + case 503: /* Line 1787 of yacc.c */ #line 2463 "conf_parser.y" { - ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number); + ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number); } break; @@ -5933,7 +5914,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2468 "conf_parser.y" { - ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number); + ConfigFileEntry.tkline_expire_notices = yylval.number; } break; @@ -5941,7 +5922,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2473 "conf_parser.y" { - ConfigFileEntry.tkline_expire_notices = yylval.number; + ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number); } break; @@ -5949,7 +5930,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2478 "conf_parser.y" { - ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number); + ConfigFileEntry.hide_spoof_ips = yylval.number; } break; @@ -5957,7 +5938,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2483 "conf_parser.y" { - ConfigFileEntry.hide_spoof_ips = yylval.number; + ConfigFileEntry.ignore_bogus_ts = yylval.number; } break; @@ -5965,7 +5946,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2488 "conf_parser.y" { - ConfigFileEntry.ignore_bogus_ts = yylval.number; + ConfigFileEntry.disable_remote = yylval.number; } break; @@ -5973,7 +5954,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2493 "conf_parser.y" { - ConfigFileEntry.disable_remote = yylval.number; + ConfigFileEntry.failed_oper_notice = yylval.number; } break; @@ -5981,7 +5962,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2498 "conf_parser.y" { - ConfigFileEntry.failed_oper_notice = yylval.number; + ConfigFileEntry.anti_nick_flood = yylval.number; } break; @@ -5989,7 +5970,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2503 "conf_parser.y" { - ConfigFileEntry.anti_nick_flood = yylval.number; + ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); } break; @@ -5997,7 +5978,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2508 "conf_parser.y" { - ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); + ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number); } break; @@ -6005,7 +5986,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2513 "conf_parser.y" { - ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number); + ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number); } break; @@ -6013,7 +5994,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2518 "conf_parser.y" { - ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number); + ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number); } break; @@ -6021,7 +6002,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2523 "conf_parser.y" { - ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number); + ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number); } break; @@ -6029,22 +6010,14 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2528 "conf_parser.y" { - ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number); -} - break; - - case 517: -/* Line 1787 of yacc.c */ -#line 2533 "conf_parser.y" - { if (conf_parser_ctx.pass == 2) ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number); } break; - case 518: + case 517: /* Line 1787 of yacc.c */ -#line 2539 "conf_parser.y" +#line 2534 "conf_parser.y" { if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1) { @@ -6056,11 +6029,19 @@ yyreduce: } break; + case 518: +/* Line 1787 of yacc.c */ +#line 2545 "conf_parser.y" + { + ConfigFileEntry.invisible_on_connect = yylval.number; +} + break; + case 519: /* Line 1787 of yacc.c */ #line 2550 "conf_parser.y" { - ConfigFileEntry.invisible_on_connect = yylval.number; + ConfigFileEntry.warn_no_nline = yylval.number; } break; @@ -6068,7 +6049,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2555 "conf_parser.y" { - ConfigFileEntry.warn_no_nline = yylval.number; + ConfigFileEntry.stats_e_disabled = yylval.number; } break; @@ -6076,7 +6057,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2560 "conf_parser.y" { - ConfigFileEntry.stats_e_disabled = yylval.number; + ConfigFileEntry.stats_o_oper_only = yylval.number; } break; @@ -6084,7 +6065,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2565 "conf_parser.y" { - ConfigFileEntry.stats_o_oper_only = yylval.number; + ConfigFileEntry.stats_P_oper_only = yylval.number; } break; @@ -6092,15 +6073,15 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2570 "conf_parser.y" { - ConfigFileEntry.stats_P_oper_only = yylval.number; + ConfigFileEntry.stats_k_oper_only = 2 * yylval.number; } break; case 524: /* Line 1787 of yacc.c */ -#line 2575 "conf_parser.y" +#line 2573 "conf_parser.y" { - ConfigFileEntry.stats_k_oper_only = 2 * yylval.number; + ConfigFileEntry.stats_k_oper_only = 1; } break; @@ -6108,15 +6089,15 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2578 "conf_parser.y" { - ConfigFileEntry.stats_k_oper_only = 1; + ConfigFileEntry.stats_i_oper_only = 2 * yylval.number; } break; case 526: /* Line 1787 of yacc.c */ -#line 2583 "conf_parser.y" +#line 2581 "conf_parser.y" { - ConfigFileEntry.stats_i_oper_only = 2 * yylval.number; + ConfigFileEntry.stats_i_oper_only = 1; } break; @@ -6124,7 +6105,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2586 "conf_parser.y" { - ConfigFileEntry.stats_i_oper_only = 1; + ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number); } break; @@ -6132,7 +6113,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2591 "conf_parser.y" { - ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number); + ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number); } break; @@ -6140,7 +6121,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2596 "conf_parser.y" { - ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number); + ConfigFileEntry.opers_bypass_callerid = yylval.number; } break; @@ -6148,7 +6129,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2601 "conf_parser.y" { - ConfigFileEntry.opers_bypass_callerid = yylval.number; + ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number); } break; @@ -6156,7 +6137,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2606 "conf_parser.y" { - ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number); + ConfigFileEntry.short_motd = yylval.number; } break; @@ -6164,7 +6145,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2611 "conf_parser.y" { - ConfigFileEntry.short_motd = yylval.number; + ConfigFileEntry.no_oper_flood = yylval.number; } break; @@ -6172,7 +6153,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2616 "conf_parser.y" { - ConfigFileEntry.no_oper_flood = yylval.number; + ConfigFileEntry.true_no_oper_flood = yylval.number; } break; @@ -6180,7 +6161,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2621 "conf_parser.y" { - ConfigFileEntry.true_no_oper_flood = yylval.number; + ConfigFileEntry.oper_pass_resv = yylval.number; } break; @@ -6188,7 +6169,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2626 "conf_parser.y" { - ConfigFileEntry.oper_pass_resv = yylval.number; + ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number); } break; @@ -6196,7 +6177,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2631 "conf_parser.y" { - ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number); + ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number); } break; @@ -6204,7 +6185,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2636 "conf_parser.y" { - ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number); + ConfigFileEntry.use_egd = yylval.number; } break; @@ -6212,14 +6193,6 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2641 "conf_parser.y" { - ConfigFileEntry.use_egd = yylval.number; -} - break; - - case 539: -/* Line 1787 of yacc.c */ -#line 2646 "conf_parser.y" - { if (conf_parser_ctx.pass == 2) { MyFree(ConfigFileEntry.egdpool_path); @@ -6228,9 +6201,9 @@ yyreduce: } break; - case 540: + case 539: /* Line 1787 of yacc.c */ -#line 2655 "conf_parser.y" +#line 2650 "conf_parser.y" { if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string)) { @@ -6240,371 +6213,379 @@ yyreduce: } break; - case 541: + case 540: /* Line 1787 of yacc.c */ -#line 2664 "conf_parser.y" +#line 2659 "conf_parser.y" { ConfigFileEntry.ping_cookie = yylval.number; } break; - case 542: + case 541: /* Line 1787 of yacc.c */ -#line 2669 "conf_parser.y" +#line 2664 "conf_parser.y" { ConfigFileEntry.disable_auth = yylval.number; } break; - case 543: + case 542: /* Line 1787 of yacc.c */ -#line 2674 "conf_parser.y" +#line 2669 "conf_parser.y" { ConfigFileEntry.throttle_time = yylval.number; } break; - case 544: + case 543: /* Line 1787 of yacc.c */ -#line 2679 "conf_parser.y" +#line 2674 "conf_parser.y" { ConfigFileEntry.oper_umodes = 0; } break; - case 548: + case 547: /* Line 1787 of yacc.c */ -#line 2685 "conf_parser.y" +#line 2680 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_BOTS; } break; - case 549: + case 548: /* Line 1787 of yacc.c */ -#line 2688 "conf_parser.y" +#line 2683 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CCONN; } break; - case 550: + case 549: /* Line 1787 of yacc.c */ -#line 2691 "conf_parser.y" +#line 2686 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL; } break; - case 551: + case 550: /* Line 1787 of yacc.c */ -#line 2694 "conf_parser.y" +#line 2689 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_DEAF; } break; - case 552: + case 551: /* Line 1787 of yacc.c */ -#line 2697 "conf_parser.y" +#line 2692 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_DEBUG; } break; - case 553: + case 552: /* Line 1787 of yacc.c */ -#line 2700 "conf_parser.y" +#line 2695 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_FULL; } break; - case 554: + case 553: /* Line 1787 of yacc.c */ -#line 2703 "conf_parser.y" +#line 2698 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_HIDDEN; } break; - case 555: + case 554: /* Line 1787 of yacc.c */ -#line 2706 "conf_parser.y" +#line 2701 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SKILL; } break; - case 556: + case 555: /* Line 1787 of yacc.c */ -#line 2709 "conf_parser.y" +#line 2704 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_NCHANGE; } break; - case 557: + case 556: /* Line 1787 of yacc.c */ -#line 2712 "conf_parser.y" +#line 2707 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_REJ; } break; - case 558: + case 557: /* Line 1787 of yacc.c */ -#line 2715 "conf_parser.y" +#line 2710 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_UNAUTH; } break; - case 559: + case 558: /* Line 1787 of yacc.c */ -#line 2718 "conf_parser.y" +#line 2713 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SPY; } break; - case 560: + case 559: /* Line 1787 of yacc.c */ -#line 2721 "conf_parser.y" +#line 2716 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL; } break; - case 561: + case 560: /* Line 1787 of yacc.c */ -#line 2724 "conf_parser.y" +#line 2719 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_OPERWALL; } break; - case 562: + case 561: /* Line 1787 of yacc.c */ -#line 2727 "conf_parser.y" +#line 2722 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE; } break; - case 563: + case 562: /* Line 1787 of yacc.c */ -#line 2730 "conf_parser.y" +#line 2725 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE; } break; - case 564: + case 563: /* Line 1787 of yacc.c */ -#line 2733 "conf_parser.y" +#line 2728 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_WALLOP; } break; - case 565: + case 564: /* Line 1787 of yacc.c */ -#line 2736 "conf_parser.y" +#line 2731 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID; } break; - case 566: + case 565: /* Line 1787 of yacc.c */ -#line 2739 "conf_parser.y" +#line 2734 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CALLERID; } break; - case 567: + case 566: /* Line 1787 of yacc.c */ -#line 2742 "conf_parser.y" +#line 2737 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_LOCOPS; } break; - case 568: + case 567: /* Line 1787 of yacc.c */ -#line 2747 "conf_parser.y" +#line 2742 "conf_parser.y" { ConfigFileEntry.oper_only_umodes = 0; } break; - case 572: + case 571: /* Line 1787 of yacc.c */ -#line 2753 "conf_parser.y" +#line 2748 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_BOTS; } break; - case 573: + case 572: /* Line 1787 of yacc.c */ -#line 2756 "conf_parser.y" +#line 2751 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CCONN; } break; - case 574: + case 573: /* Line 1787 of yacc.c */ -#line 2759 "conf_parser.y" +#line 2754 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL; } break; - case 575: + case 574: /* Line 1787 of yacc.c */ -#line 2762 "conf_parser.y" +#line 2757 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_DEAF; } break; - case 576: + case 575: /* Line 1787 of yacc.c */ -#line 2765 "conf_parser.y" +#line 2760 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG; } break; - case 577: + case 576: /* Line 1787 of yacc.c */ -#line 2768 "conf_parser.y" +#line 2763 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_FULL; } break; - case 578: + case 577: /* Line 1787 of yacc.c */ -#line 2771 "conf_parser.y" +#line 2766 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SKILL; } break; - case 579: + case 578: /* Line 1787 of yacc.c */ -#line 2774 "conf_parser.y" +#line 2769 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN; } break; - case 580: + case 579: /* Line 1787 of yacc.c */ -#line 2777 "conf_parser.y" +#line 2772 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE; } break; - case 581: + case 580: /* Line 1787 of yacc.c */ -#line 2780 "conf_parser.y" +#line 2775 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_REJ; } break; - case 582: + case 581: /* Line 1787 of yacc.c */ -#line 2783 "conf_parser.y" +#line 2778 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH; } break; - case 583: + case 582: /* Line 1787 of yacc.c */ -#line 2786 "conf_parser.y" +#line 2781 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SPY; } break; - case 584: + case 583: /* Line 1787 of yacc.c */ -#line 2789 "conf_parser.y" +#line 2784 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL; } break; - case 585: + case 584: /* Line 1787 of yacc.c */ -#line 2792 "conf_parser.y" +#line 2787 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL; } break; - case 586: + case 585: /* Line 1787 of yacc.c */ -#line 2795 "conf_parser.y" +#line 2790 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE; } break; - case 587: + case 586: /* Line 1787 of yacc.c */ -#line 2798 "conf_parser.y" +#line 2793 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE; } break; - case 588: + case 587: /* Line 1787 of yacc.c */ -#line 2801 "conf_parser.y" +#line 2796 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP; } break; - case 589: + case 588: /* Line 1787 of yacc.c */ -#line 2804 "conf_parser.y" +#line 2799 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID; } break; - case 590: + case 589: /* Line 1787 of yacc.c */ -#line 2807 "conf_parser.y" +#line 2802 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID; } break; - case 591: + case 590: /* Line 1787 of yacc.c */ -#line 2810 "conf_parser.y" +#line 2805 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS; } break; + case 591: +/* Line 1787 of yacc.c */ +#line 2808 "conf_parser.y" + { + ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY; +} + break; + case 592: /* Line 1787 of yacc.c */ #line 2813 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY; + ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number); } break; @@ -6612,7 +6593,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2818 "conf_parser.y" { - ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number); + ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number); } break; @@ -6620,15 +6601,15 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2823 "conf_parser.y" { - ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number); + ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number); } break; - case 595: + case 612: /* Line 1787 of yacc.c */ -#line 2828 "conf_parser.y" +#line 2846 "conf_parser.y" { - ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number); + ConfigChannel.disable_fake_channels = yylval.number; } break; @@ -6636,7 +6617,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2851 "conf_parser.y" { - ConfigChannel.disable_fake_channels = yylval.number; + ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number); } break; @@ -6644,7 +6625,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2856 "conf_parser.y" { - ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number); + ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number); } break; @@ -6652,7 +6633,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2861 "conf_parser.y" { - ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number); + ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number); } break; @@ -6660,7 +6641,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2866 "conf_parser.y" { - ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number); + ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number); } break; @@ -6668,7 +6649,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2871 "conf_parser.y" { - ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number); + ConfigChannel.quiet_on_ban = yylval.number; } break; @@ -6676,7 +6657,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2876 "conf_parser.y" { - ConfigChannel.quiet_on_ban = yylval.number; + ConfigChannel.max_bans = (yyvsp[(3) - (4)].number); } break; @@ -6684,7 +6665,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2881 "conf_parser.y" { - ConfigChannel.max_bans = (yyvsp[(3) - (4)].number); + ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number); } break; @@ -6692,7 +6673,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2886 "conf_parser.y" { - ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number); + ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number); } break; @@ -6700,7 +6681,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2891 "conf_parser.y" { - ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number); + ConfigChannel.no_create_on_split = yylval.number; } break; @@ -6708,7 +6689,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2896 "conf_parser.y" { - ConfigChannel.no_create_on_split = yylval.number; + ConfigChannel.no_join_on_split = yylval.number; } break; @@ -6716,7 +6697,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2901 "conf_parser.y" { - ConfigChannel.no_join_on_split = yylval.number; + GlobalSetOptions.joinfloodcount = yylval.number; } break; @@ -6724,48 +6705,40 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2906 "conf_parser.y" { - GlobalSetOptions.joinfloodcount = yylval.number; -} - break; - - case 625: -/* Line 1787 of yacc.c */ -#line 2911 "conf_parser.y" - { GlobalSetOptions.joinfloodtime = yylval.number; } break; - case 637: + case 636: /* Line 1787 of yacc.c */ -#line 2930 "conf_parser.y" +#line 2925 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.flatten_links = yylval.number; } break; - case 638: + case 637: /* Line 1787 of yacc.c */ -#line 2936 "conf_parser.y" +#line 2931 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_servers = yylval.number; } break; - case 639: + case 638: /* Line 1787 of yacc.c */ -#line 2942 "conf_parser.y" +#line 2937 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_services = yylval.number; } break; - case 640: + case 639: /* Line 1787 of yacc.c */ -#line 2948 "conf_parser.y" +#line 2943 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6775,9 +6748,9 @@ yyreduce: } break; - case 641: + case 640: /* Line 1787 of yacc.c */ -#line 2957 "conf_parser.y" +#line 2952 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6792,18 +6765,18 @@ yyreduce: } break; - case 642: + case 641: /* Line 1787 of yacc.c */ -#line 2971 "conf_parser.y" +#line 2966 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hidden = yylval.number; } break; - case 643: + case 642: /* Line 1787 of yacc.c */ -#line 2977 "conf_parser.y" +#line 2972 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_server_ips = yylval.number; @@ -6812,7 +6785,7 @@ yyreduce: /* Line 1787 of yacc.c */ -#line 6816 "conf_parser.c" +#line 6789 "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 7a056d5..bfb989a 100644 --- a/src/conf_parser.h +++ b/src/conf_parser.h @@ -144,129 +144,128 @@ extern int yydebug; NETWORK_DESC = 353, NETWORK_NAME = 354, NICK = 355, - NICK_CHANGES = 356, - NO_CREATE_ON_SPLIT = 357, - NO_JOIN_ON_SPLIT = 358, - NO_OPER_FLOOD = 359, - NO_TILDE = 360, - NUMBER = 361, - NUMBER_PER_CIDR = 362, - NUMBER_PER_IP = 363, - OPERATOR = 364, - OPERS_BYPASS_CALLERID = 365, - OPER_ONLY_UMODES = 366, - OPER_PASS_RESV = 367, - OPER_SPY_T = 368, - OPER_UMODES = 369, - JOIN_FLOOD_COUNT = 370, - JOIN_FLOOD_TIME = 371, - PACE_WAIT = 372, - PACE_WAIT_SIMPLE = 373, - PASSWORD = 374, - PATH = 375, - PING_COOKIE = 376, - PING_TIME = 377, - PORT = 378, - QSTRING = 379, - QUIET_ON_BAN = 380, - REASON = 381, - REDIRPORT = 382, - REDIRSERV = 383, - REGEX_T = 384, - REHASH = 385, - REMOTE = 386, - REMOTEBAN = 387, - RSA_PRIVATE_KEY_FILE = 388, - RSA_PUBLIC_KEY_FILE = 389, - SSL_CERTIFICATE_FILE = 390, - SSL_DH_PARAM_FILE = 391, - T_SSL_CLIENT_METHOD = 392, - T_SSL_SERVER_METHOD = 393, - T_SSLV3 = 394, - T_TLSV1 = 395, - RESV = 396, - RESV_EXEMPT = 397, - SECONDS = 398, - MINUTES = 399, - HOURS = 400, - DAYS = 401, - WEEKS = 402, - MONTHS = 403, - YEARS = 404, - SENDQ = 405, - SEND_PASSWORD = 406, - SERVERHIDE = 407, - SERVERINFO = 408, - IRCD_SID = 409, - TKLINE_EXPIRE_NOTICES = 410, - T_SHARED = 411, - T_CLUSTER = 412, - TYPE = 413, - SHORT_MOTD = 414, - SPOOF = 415, - SPOOF_NOTICE = 416, - STATS_E_DISABLED = 417, - STATS_I_OPER_ONLY = 418, - STATS_K_OPER_ONLY = 419, - STATS_O_OPER_ONLY = 420, - STATS_P_OPER_ONLY = 421, - TBOOL = 422, - TMASKED = 423, - TS_MAX_DELTA = 424, - TS_WARN_DELTA = 425, - TWODOTS = 426, - T_ALL = 427, - T_BOTS = 428, - T_SOFTCALLERID = 429, - T_CALLERID = 430, - T_CCONN = 431, - T_CCONN_FULL = 432, - T_SSL_CIPHER_LIST = 433, - T_DEAF = 434, - T_DEBUG = 435, - T_DLINE = 436, - T_EXTERNAL = 437, - T_FULL = 438, - T_INVISIBLE = 439, - T_IPV4 = 440, - T_IPV6 = 441, - T_LOCOPS = 442, - T_MAX_CLIENTS = 443, - T_NCHANGE = 444, - T_NONONREG = 445, - T_OPERWALL = 446, - T_RECVQ = 447, - T_REJ = 448, - T_SERVER = 449, - T_SERVNOTICE = 450, - T_SET = 451, - T_SKILL = 452, - T_SPY = 453, - T_SSL = 454, - T_UMODES = 455, - T_UNAUTH = 456, - T_UNDLINE = 457, - T_UNLIMITED = 458, - T_UNRESV = 459, - T_UNXLINE = 460, - T_GLOBOPS = 461, - T_WALLOP = 462, - T_WEBIRC = 463, - T_RESTART = 464, - T_SERVICE = 465, - T_SERVICES_NAME = 466, - THROTTLE_TIME = 467, - TRUE_NO_OPER_FLOOD = 468, - UNKLINE = 469, - USER = 470, - USE_EGD = 471, - USE_LOGGING = 472, - VHOST = 473, - VHOST6 = 474, - XLINE = 475, - WARN_NO_NLINE = 476, - T_SIZE = 477, - T_FILE = 478 + NO_CREATE_ON_SPLIT = 356, + NO_JOIN_ON_SPLIT = 357, + NO_OPER_FLOOD = 358, + NO_TILDE = 359, + NUMBER = 360, + NUMBER_PER_CIDR = 361, + NUMBER_PER_IP = 362, + OPERATOR = 363, + OPERS_BYPASS_CALLERID = 364, + OPER_ONLY_UMODES = 365, + OPER_PASS_RESV = 366, + OPER_SPY_T = 367, + OPER_UMODES = 368, + JOIN_FLOOD_COUNT = 369, + JOIN_FLOOD_TIME = 370, + PACE_WAIT = 371, + PACE_WAIT_SIMPLE = 372, + PASSWORD = 373, + PATH = 374, + PING_COOKIE = 375, + PING_TIME = 376, + PORT = 377, + QSTRING = 378, + QUIET_ON_BAN = 379, + REASON = 380, + REDIRPORT = 381, + REDIRSERV = 382, + REGEX_T = 383, + REHASH = 384, + REMOTE = 385, + REMOTEBAN = 386, + RSA_PRIVATE_KEY_FILE = 387, + RSA_PUBLIC_KEY_FILE = 388, + SSL_CERTIFICATE_FILE = 389, + SSL_DH_PARAM_FILE = 390, + T_SSL_CLIENT_METHOD = 391, + T_SSL_SERVER_METHOD = 392, + T_SSLV3 = 393, + T_TLSV1 = 394, + RESV = 395, + RESV_EXEMPT = 396, + SECONDS = 397, + MINUTES = 398, + HOURS = 399, + DAYS = 400, + WEEKS = 401, + MONTHS = 402, + YEARS = 403, + SENDQ = 404, + SEND_PASSWORD = 405, + SERVERHIDE = 406, + SERVERINFO = 407, + IRCD_SID = 408, + TKLINE_EXPIRE_NOTICES = 409, + T_SHARED = 410, + T_CLUSTER = 411, + TYPE = 412, + SHORT_MOTD = 413, + SPOOF = 414, + SPOOF_NOTICE = 415, + STATS_E_DISABLED = 416, + STATS_I_OPER_ONLY = 417, + STATS_K_OPER_ONLY = 418, + STATS_O_OPER_ONLY = 419, + STATS_P_OPER_ONLY = 420, + TBOOL = 421, + TMASKED = 422, + TS_MAX_DELTA = 423, + TS_WARN_DELTA = 424, + TWODOTS = 425, + T_ALL = 426, + T_BOTS = 427, + T_SOFTCALLERID = 428, + T_CALLERID = 429, + T_CCONN = 430, + T_CCONN_FULL = 431, + T_SSL_CIPHER_LIST = 432, + T_DEAF = 433, + T_DEBUG = 434, + T_DLINE = 435, + T_EXTERNAL = 436, + T_FULL = 437, + T_INVISIBLE = 438, + T_IPV4 = 439, + T_IPV6 = 440, + T_LOCOPS = 441, + T_MAX_CLIENTS = 442, + T_NCHANGE = 443, + T_NONONREG = 444, + T_OPERWALL = 445, + T_RECVQ = 446, + T_REJ = 447, + T_SERVER = 448, + T_SERVNOTICE = 449, + T_SET = 450, + T_SKILL = 451, + T_SPY = 452, + T_SSL = 453, + T_UMODES = 454, + T_UNAUTH = 455, + T_UNDLINE = 456, + T_UNLIMITED = 457, + T_UNRESV = 458, + T_UNXLINE = 459, + T_GLOBOPS = 460, + T_WALLOP = 461, + T_WEBIRC = 462, + T_RESTART = 463, + T_SERVICE = 464, + T_SERVICES_NAME = 465, + THROTTLE_TIME = 466, + TRUE_NO_OPER_FLOOD = 467, + UNKLINE = 468, + USER = 469, + USE_EGD = 470, + USE_LOGGING = 471, + VHOST = 472, + VHOST6 = 473, + XLINE = 474, + WARN_NO_NLINE = 475, + T_SIZE = 476, + T_FILE = 477 }; #endif /* Tokens. */ @@ -368,129 +367,128 @@ extern int yydebug; #define NETWORK_DESC 353 #define NETWORK_NAME 354 #define NICK 355 -#define NICK_CHANGES 356 -#define NO_CREATE_ON_SPLIT 357 -#define NO_JOIN_ON_SPLIT 358 -#define NO_OPER_FLOOD 359 -#define NO_TILDE 360 -#define NUMBER 361 -#define NUMBER_PER_CIDR 362 -#define NUMBER_PER_IP 363 -#define OPERATOR 364 -#define OPERS_BYPASS_CALLERID 365 -#define OPER_ONLY_UMODES 366 -#define OPER_PASS_RESV 367 -#define OPER_SPY_T 368 -#define OPER_UMODES 369 -#define JOIN_FLOOD_COUNT 370 -#define JOIN_FLOOD_TIME 371 -#define PACE_WAIT 372 -#define PACE_WAIT_SIMPLE 373 -#define PASSWORD 374 -#define PATH 375 -#define PING_COOKIE 376 -#define PING_TIME 377 -#define PORT 378 -#define QSTRING 379 -#define QUIET_ON_BAN 380 -#define REASON 381 -#define REDIRPORT 382 -#define REDIRSERV 383 -#define REGEX_T 384 -#define REHASH 385 -#define REMOTE 386 -#define REMOTEBAN 387 -#define RSA_PRIVATE_KEY_FILE 388 -#define RSA_PUBLIC_KEY_FILE 389 -#define SSL_CERTIFICATE_FILE 390 -#define SSL_DH_PARAM_FILE 391 -#define T_SSL_CLIENT_METHOD 392 -#define T_SSL_SERVER_METHOD 393 -#define T_SSLV3 394 -#define T_TLSV1 395 -#define RESV 396 -#define RESV_EXEMPT 397 -#define SECONDS 398 -#define MINUTES 399 -#define HOURS 400 -#define DAYS 401 -#define WEEKS 402 -#define MONTHS 403 -#define YEARS 404 -#define SENDQ 405 -#define SEND_PASSWORD 406 -#define SERVERHIDE 407 -#define SERVERINFO 408 -#define IRCD_SID 409 -#define TKLINE_EXPIRE_NOTICES 410 -#define T_SHARED 411 -#define T_CLUSTER 412 -#define TYPE 413 -#define SHORT_MOTD 414 -#define SPOOF 415 -#define SPOOF_NOTICE 416 -#define STATS_E_DISABLED 417 -#define STATS_I_OPER_ONLY 418 -#define STATS_K_OPER_ONLY 419 -#define STATS_O_OPER_ONLY 420 -#define STATS_P_OPER_ONLY 421 -#define TBOOL 422 -#define TMASKED 423 -#define TS_MAX_DELTA 424 -#define TS_WARN_DELTA 425 -#define TWODOTS 426 -#define T_ALL 427 -#define T_BOTS 428 -#define T_SOFTCALLERID 429 -#define T_CALLERID 430 -#define T_CCONN 431 -#define T_CCONN_FULL 432 -#define T_SSL_CIPHER_LIST 433 -#define T_DEAF 434 -#define T_DEBUG 435 -#define T_DLINE 436 -#define T_EXTERNAL 437 -#define T_FULL 438 -#define T_INVISIBLE 439 -#define T_IPV4 440 -#define T_IPV6 441 -#define T_LOCOPS 442 -#define T_MAX_CLIENTS 443 -#define T_NCHANGE 444 -#define T_NONONREG 445 -#define T_OPERWALL 446 -#define T_RECVQ 447 -#define T_REJ 448 -#define T_SERVER 449 -#define T_SERVNOTICE 450 -#define T_SET 451 -#define T_SKILL 452 -#define T_SPY 453 -#define T_SSL 454 -#define T_UMODES 455 -#define T_UNAUTH 456 -#define T_UNDLINE 457 -#define T_UNLIMITED 458 -#define T_UNRESV 459 -#define T_UNXLINE 460 -#define T_GLOBOPS 461 -#define T_WALLOP 462 -#define T_WEBIRC 463 -#define T_RESTART 464 -#define T_SERVICE 465 -#define T_SERVICES_NAME 466 -#define THROTTLE_TIME 467 -#define TRUE_NO_OPER_FLOOD 468 -#define UNKLINE 469 -#define USER 470 -#define USE_EGD 471 -#define USE_LOGGING 472 -#define VHOST 473 -#define VHOST6 474 -#define XLINE 475 -#define WARN_NO_NLINE 476 -#define T_SIZE 477 -#define T_FILE 478 +#define NO_CREATE_ON_SPLIT 356 +#define NO_JOIN_ON_SPLIT 357 +#define NO_OPER_FLOOD 358 +#define NO_TILDE 359 +#define NUMBER 360 +#define NUMBER_PER_CIDR 361 +#define NUMBER_PER_IP 362 +#define OPERATOR 363 +#define OPERS_BYPASS_CALLERID 364 +#define OPER_ONLY_UMODES 365 +#define OPER_PASS_RESV 366 +#define OPER_SPY_T 367 +#define OPER_UMODES 368 +#define JOIN_FLOOD_COUNT 369 +#define JOIN_FLOOD_TIME 370 +#define PACE_WAIT 371 +#define PACE_WAIT_SIMPLE 372 +#define PASSWORD 373 +#define PATH 374 +#define PING_COOKIE 375 +#define PING_TIME 376 +#define PORT 377 +#define QSTRING 378 +#define QUIET_ON_BAN 379 +#define REASON 380 +#define REDIRPORT 381 +#define REDIRSERV 382 +#define REGEX_T 383 +#define REHASH 384 +#define REMOTE 385 +#define REMOTEBAN 386 +#define RSA_PRIVATE_KEY_FILE 387 +#define RSA_PUBLIC_KEY_FILE 388 +#define SSL_CERTIFICATE_FILE 389 +#define SSL_DH_PARAM_FILE 390 +#define T_SSL_CLIENT_METHOD 391 +#define T_SSL_SERVER_METHOD 392 +#define T_SSLV3 393 +#define T_TLSV1 394 +#define RESV 395 +#define RESV_EXEMPT 396 +#define SECONDS 397 +#define MINUTES 398 +#define HOURS 399 +#define DAYS 400 +#define WEEKS 401 +#define MONTHS 402 +#define YEARS 403 +#define SENDQ 404 +#define SEND_PASSWORD 405 +#define SERVERHIDE 406 +#define SERVERINFO 407 +#define IRCD_SID 408 +#define TKLINE_EXPIRE_NOTICES 409 +#define T_SHARED 410 +#define T_CLUSTER 411 +#define TYPE 412 +#define SHORT_MOTD 413 +#define SPOOF 414 +#define SPOOF_NOTICE 415 +#define STATS_E_DISABLED 416 +#define STATS_I_OPER_ONLY 417 +#define STATS_K_OPER_ONLY 418 +#define STATS_O_OPER_ONLY 419 +#define STATS_P_OPER_ONLY 420 +#define TBOOL 421 +#define TMASKED 422 +#define TS_MAX_DELTA 423 +#define TS_WARN_DELTA 424 +#define TWODOTS 425 +#define T_ALL 426 +#define T_BOTS 427 +#define T_SOFTCALLERID 428 +#define T_CALLERID 429 +#define T_CCONN 430 +#define T_CCONN_FULL 431 +#define T_SSL_CIPHER_LIST 432 +#define T_DEAF 433 +#define T_DEBUG 434 +#define T_DLINE 435 +#define T_EXTERNAL 436 +#define T_FULL 437 +#define T_INVISIBLE 438 +#define T_IPV4 439 +#define T_IPV6 440 +#define T_LOCOPS 441 +#define T_MAX_CLIENTS 442 +#define T_NCHANGE 443 +#define T_NONONREG 444 +#define T_OPERWALL 445 +#define T_RECVQ 446 +#define T_REJ 447 +#define T_SERVER 448 +#define T_SERVNOTICE 449 +#define T_SET 450 +#define T_SKILL 451 +#define T_SPY 452 +#define T_SSL 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_GLOBOPS 460 +#define T_WALLOP 461 +#define T_WEBIRC 462 +#define T_RESTART 463 +#define T_SERVICE 464 +#define T_SERVICES_NAME 465 +#define THROTTLE_TIME 466 +#define TRUE_NO_OPER_FLOOD 467 +#define UNKLINE 468 +#define USER 469 +#define USE_EGD 470 +#define USE_LOGGING 471 +#define VHOST 472 +#define VHOST6 473 +#define XLINE 474 +#define WARN_NO_NLINE 475 +#define T_SIZE 476 +#define T_FILE 477 @@ -505,7 +503,7 @@ typedef union YYSTYPE /* Line 2053 of yacc.c */ -#line 509 "conf_parser.h" +#line 507 "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 2e17b7e..5d21b11 100644 --- a/src/conf_parser.y +++ b/src/conf_parser.y @@ -236,7 +236,6 @@ reset_block_state(void) %token NETWORK_DESC %token NETWORK_NAME %token NICK -%token NICK_CHANGES %token NO_CREATE_ON_SPLIT %token NO_JOIN_ON_SPLIT %token NO_OPER_FLOOD @@ -1235,10 +1234,6 @@ oper_flags_item: GLOBAL_KILL { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_ADMIN; -} | NICK_CHANGES -{ - if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_N; } | T_OPERWALL { if (conf_parser_ctx.pass == 2) diff --git a/src/s_user.c b/src/s_user.c index 702ce5d..18bee9a 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -954,13 +954,6 @@ set_user_mode(struct Client *client_p, struct Client *source_p, sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG), me.name, source_p->name); - if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N)) - { - sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;", - me.name, source_p->name); - DelUMode(source_p, UMODE_NCHANGE); - } - if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) && !HasOFlag(source_p, OPER_FLAG_ADMIN)) { @@ -1227,8 +1220,6 @@ oper_up(struct Client *source_p) if (HasOFlag(source_p, OPER_FLAG_ADMIN)) AddUMode(source_p, UMODE_ADMIN); - if (!HasOFlag(source_p, OPER_FLAG_N)) - DelUMode(source_p, UMODE_NCHANGE); sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator", get_oper_name(source_p)); |