diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-06-15 22:08:30 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-06-15 22:08:30 +0000 |
| commit | 6ba883ff9d3934eacf35d4dc6844052d9f1301ad (patch) | |
| tree | 5104c894d66e9e6c08de6f770a4d8387763f2009 | |
| parent | 6bdc9f5a66d8248bd0105d456aa7c54fb5f59434 (diff) | |
- rename 'fingerprint' configuration directive to 'ssl_certificate_fingerprint'
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2245 82007160-df01-0410-b94d-b575c5fd34c7
| -rw-r--r-- | doc/reference.conf | 16 | ||||
| -rw-r--r-- | src/conf_lexer.c | 2104 | ||||
| -rw-r--r-- | src/conf_lexer.l | 2 | ||||
| -rw-r--r-- | src/conf_parser.c | 1370 | ||||
| -rw-r--r-- | src/conf_parser.h | 72 | ||||
| -rw-r--r-- | src/conf_parser.y | 11 |
6 files changed, 1787 insertions, 1788 deletions
diff --git a/doc/reference.conf b/doc/reference.conf index 4cb5fe2..9a2748f 100644 --- a/doc/reference.conf +++ b/doc/reference.conf @@ -458,16 +458,16 @@ operator { # rsa_public_key_file = "/usr/local/ircd/etc/oper.pub"; /* - * fingerprint: enhances security by additionally checking the oper's - * client certificate fingerprint against the specified fingerprint - * below. + * ssl_certificate_fingerprint: enhances security by additionally checking + * the oper's client certificate fingerprint against the specified + * fingerprint below. * * Hint: your users can use the following command to obtain a SHA-256 hash * of their ssl certificate: * * openssl x509 -sha256 -noout -fingerprint -in cert.pem | sed -e 's/^.*=//;s/://g' */ -# fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D"; +# ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D"; /* class: the class the oper joins when they successfully /oper */ class = "opers"; @@ -612,11 +612,11 @@ connect { # ssl_cipher_list = "DHE-RSA-AES256-SHA:AES256-SHA"; /* - * fingerprint: enhances security by additionally checking the server's - * client certificate fingerprint against the specified fingerprint - * below. + * ssl_certificate_fingerprint: enhances security by additionally checking + * the server's client certificate fingerprint against the specified + * fingerprint below. */ -# fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D"; +# ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D"; /* * autoconn - controls whether we autoconnect to this server or not, diff --git a/src/conf_lexer.c b/src/conf_lexer.c index 25e7d40..78c08c6 100644 --- a/src/conf_lexer.c +++ b/src/conf_lexer.c @@ -383,7 +383,7 @@ static yyconst flex_int16_t yy_accept[1581] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 81, 0, 242, 0, 0, 0, 0, 0, 0, + 0, 80, 0, 242, 0, 0, 0, 0, 0, 0, 0, 247, 0, 0, 0, 0, 0, 0, 0, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -393,161 +393,161 @@ static yyconst flex_int16_t yy_accept[1581] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 229, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 76, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, + 0, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 157, 0, 0, 0, 0, 0, 0, 173, 0, - 0, 176, 0, 0, 0, 0, 182, 0, 184, 0, + 156, 0, 0, 0, 0, 0, 0, 172, 0, 0, + 175, 0, 0, 0, 0, 181, 0, 183, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 220, 0, 0, 0, 0, 0, 15, 0, 17, - 237, 0, 0, 0, 0, 0, 0, 0, 0, 228, - 29, 0, 0, 34, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 50, 0, 0, 0, - - 54, 0, 0, 0, 0, 0, 0, 0, 75, 231, - 0, 0, 0, 82, 83, 0, 0, 86, 0, 0, - 0, 0, 0, 0, 0, 97, 0, 0, 0, 0, - 0, 0, 0, 120, 121, 0, 0, 0, 127, 0, - 0, 0, 0, 0, 0, 135, 0, 0, 146, 0, - 149, 0, 0, 0, 0, 0, 0, 0, 0, 161, - 0, 0, 0, 0, 0, 0, 177, 0, 0, 0, + 220, 0, 0, 0, 0, 0, 15, 0, 17, 237, + 0, 0, 0, 0, 0, 0, 0, 0, 228, 29, + 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 0, 0, 53, 0, + + 0, 0, 0, 0, 0, 0, 74, 231, 0, 0, + 0, 81, 82, 0, 0, 85, 0, 0, 0, 0, + 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, + 0, 119, 120, 0, 0, 0, 126, 0, 0, 0, + 0, 0, 0, 134, 0, 0, 145, 0, 148, 0, + 0, 0, 0, 0, 0, 0, 0, 160, 0, 0, + 0, 0, 0, 0, 176, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 202, 0, + 0, 0, 0, 0, 0, 0, 212, 0, 0, 0, + 0, 0, 227, 0, 223, 0, 0, 9, 0, 0, + + 0, 236, 0, 0, 21, 0, 0, 25, 0, 0, + 30, 0, 0, 0, 40, 0, 0, 43, 0, 0, + 0, 0, 0, 0, 51, 0, 54, 0, 56, 0, + 0, 0, 0, 0, 0, 230, 0, 0, 0, 0, + 241, 0, 0, 87, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 246, + 0, 0, 0, 0, 0, 225, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 202, 0, 0, 0, 0, 0, 0, 0, 212, 0, - 0, 0, 0, 0, 227, 0, 223, 0, 0, 9, - - 0, 0, 0, 236, 0, 0, 21, 0, 0, 25, - 0, 0, 30, 0, 0, 0, 40, 0, 0, 43, - 0, 0, 0, 0, 0, 0, 0, 52, 0, 55, - 0, 57, 0, 0, 0, 0, 0, 0, 230, 0, - 0, 0, 0, 241, 0, 0, 88, 0, 0, 0, + 0, 0, 0, 0, 0, 152, 0, 0, 0, 0, + 0, 0, 0, 165, 0, 0, 0, 0, 0, 0, + + 177, 0, 179, 182, 190, 0, 0, 0, 0, 0, + 0, 198, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 213, 0, 0, 0, 226, 219, + 222, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 246, 0, 0, 0, 0, 0, 225, 0, + 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 67, 0, 0, 0, 0, 0, 0, 240, + 0, 0, 0, 0, 0, 0, 93, 94, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 153, 0, - 0, 0, 0, 0, 0, 0, 166, 0, 0, 0, + 0, 245, 0, 233, 0, 0, 117, 224, 0, 0, - 0, 0, 0, 178, 0, 180, 183, 190, 0, 0, - 0, 0, 0, 0, 198, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 213, 0, 0, - 0, 226, 219, 222, 0, 0, 0, 11, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, - 0, 0, 0, 240, 0, 0, 0, 0, 0, 0, - 94, 95, 98, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 245, 0, 233, 0, 0, - - 118, 224, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, - 0, 0, 0, 0, 0, 152, 0, 0, 156, 158, - 0, 0, 0, 0, 235, 0, 167, 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 203, 204, 0, 0, 0, 208, - 0, 0, 0, 214, 215, 0, 218, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 22, 0, 26, 27, + 0, 0, 0, 0, 0, 143, 0, 0, 0, 0, + 0, 151, 0, 0, 155, 157, 0, 0, 0, 0, + 235, 0, 166, 0, 0, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 56, 0, 0, 0, 0, 0, 65, 0, + 203, 204, 0, 0, 0, 208, 0, 0, 0, 214, + 215, 0, 218, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 22, 0, 26, 27, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, + 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 232, - 0, 0, 119, 122, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 232, 0, 0, 118, 121, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 160, 0, - 0, 0, 234, 0, 0, 0, 170, 0, 0, 0, + 0, 0, 0, 159, 0, 0, 0, 234, 0, 0, + 0, 169, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 205, 206, 0, 209, 210, 0, 216, 0, 0, + 0, 0, 0, 0, 16, 19, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 76, 0, 0, 0, 0, 239, 0, + 0, 0, 0, 0, 99, 0, 0, 0, 0, 105, + 0, 0, 0, 0, 0, 0, 244, 114, 0, 0, + 0, 0, 131, 0, 0, 0, 130, 0, 138, 0, + 140, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 205, 206, 0, 209, - 210, 0, 216, 0, 0, 0, 0, 0, 0, 16, - - 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, - 0, 0, 0, 0, 239, 0, 0, 0, 0, 0, - 100, 0, 0, 0, 0, 106, 0, 0, 0, 0, - 0, 0, 244, 115, 0, 0, 0, 0, 132, 0, - 0, 0, 131, 0, 139, 0, 141, 0, 0, 0, - 0, 145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 44, 0, 0, + 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, + 0, 0, 238, 0, 0, 91, 0, 0, 0, 0, + 0, 104, 106, 0, 0, 0, 0, 113, 243, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 141, 0, 147, 0, 0, 153, 154, 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 79, 0, 0, 238, - 0, 0, 92, 0, 0, 0, 0, 0, 105, 107, - 0, 0, 0, 0, 114, 243, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 142, - 0, 148, 0, 0, 154, 155, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 207, 0, 0, 0, + 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 207, 0, 0, 0, 1, 0, 1, + 49, 0, 0, 0, 0, 0, 0, 0, 0, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, + 0, 0, 98, 0, 0, 103, 0, 0, 0, 110, + 0, 0, 0, 122, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 149, 0, 0, + 0, 0, 0, 167, 168, 0, 171, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 99, 0, 0, 104, 0, 0, 0, 111, 0, 0, - 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 150, 0, 0, 0, 0, - 0, 168, 169, 0, 172, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 28, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 28, 0, 0, 35, 0, 0, 0, 0, 0, - 0, 0, 51, 0, 0, 0, 0, 0, 0, 64, - 0, 69, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 90, 93, 0, 103, 0, 0, 0, 112, 0, + 63, 0, 68, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 89, 92, 0, 102, 0, 0, 0, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 138, 0, 147, 151, 162, 0, 0, 0, 0, + 0, 0, 137, 0, 146, 150, 161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 211, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, - 0, 42, 45, 0, 0, 0, 59, 60, 0, 0, - 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, - 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, - 125, 126, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 179, 181, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 211, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, + + 0, 0, 42, 45, 0, 0, 0, 58, 59, 0, + 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, + 0, 0, 88, 0, 0, 0, 0, 0, 0, 0, + 0, 124, 125, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 178, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 200, 0, 0, 0, 10, 0, 0, 0, 0, 0, - 0, 0, 0, 41, 0, 53, 0, 0, 0, 0, + 0, 200, 0, 0, 0, 10, 0, 0, 0, 0, + 0, 0, 0, 0, 41, 0, 52, 0, 0, 0, + 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 109, 0, 0, 123, 0, 0, + + 129, 0, 133, 0, 0, 0, 0, 0, 0, 164, + 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 196, 0, 0, 201, 217, 0, 0, 0, 18, + 0, 0, 0, 0, 0, 0, 57, 60, 0, 0, 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 110, 0, 0, 124, 0, 0, 130, - 0, 134, 0, 0, 0, 0, 0, 0, 165, 171, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 196, 0, 0, 201, 217, 0, 0, 0, 18, 0, - 0, 0, 0, 0, 0, 58, 61, 0, 0, 0, - 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 137, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 8, 13, 0, 0, 0, 0, - 0, 0, 0, 0, 62, 0, 0, 0, 71, 78, - - 0, 0, 85, 0, 0, 0, 0, 0, 109, 0, - 116, 0, 0, 133, 0, 0, 0, 0, 0, 0, - 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 23, 24, 0, 0, 0, 0, 0, 0, - 0, 67, 0, 0, 84, 0, 0, 0, 0, 108, - 113, 0, 0, 129, 0, 136, 143, 0, 0, 0, - 0, 0, 0, 191, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 8, 13, 0, 0, 0, + 0, 0, 0, 0, 0, 61, 0, 0, 0, 70, + 77, 0, 0, 84, 0, 0, 0, 0, 0, 108, + + 0, 115, 0, 0, 132, 0, 0, 0, 0, 0, + 0, 186, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 23, 24, 0, 0, 0, 0, 0, + 0, 0, 66, 0, 0, 83, 0, 0, 0, 0, + 107, 112, 0, 0, 128, 0, 135, 142, 0, 0, + 0, 0, 0, 0, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 187, 188, 189, 192, 193, 194, 195, 0, 0, 0, - - 31, 0, 0, 0, 0, 48, 0, 0, 0, 0, - 0, 101, 102, 0, 128, 0, 0, 0, 0, 0, - 199, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 91, 0, 0, 0, 164, 0, 0, 0, 0, 0, - 0, 0, 0, 70, 80, 0, 0, 0, 163, 185, - 0, 0, 0, 0, 38, 0, 0, 87, 0, 140, - 197, 0, 0, 0, 0, 63, 117, 0, 0, 0, - 39, 0, 0, 33, 0, 0, 0, 32, 14, 0 + 0, 187, 188, 189, 192, 193, 194, 195, 0, 0, + 0, 31, 0, 0, 0, 0, 48, 0, 0, 0, + + 0, 0, 100, 101, 0, 127, 0, 0, 0, 0, + 0, 199, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 90, 0, 0, 0, 163, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 69, 79, 0, 0, 0, + 162, 184, 0, 0, 0, 0, 0, 38, 0, 0, + 86, 0, 139, 0, 197, 0, 0, 0, 0, 62, + 116, 0, 0, 0, 0, 39, 0, 0, 0, 33, + 0, 0, 0, 0, 0, 32, 0, 14, 185, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -602,173 +602,173 @@ static yyconst flex_int16_t yy_base[1586] = 0, 3035, 170, 3035, 0, 220, 191, 188, 188, 198, 200, 202, 203, 204, 220, 223, 240, 239, 245, 231, 227, 276, 278, 244, 237, 254, 261, 271, 308, 314, - 325, 305, 304, 333, 336, 322, 342, 333, 347, 339, - 334, 335, 351, 340, 355, 361, 362, 381, 371, 386, - 367, 363, 388, 382, 394, 386, 392, 401, 398, 397, - - 389, 398, 431, 391, 392, 418, 417, 478, 435, 442, - 438, 439, 431, 436, 432, 423, 437, 467, 455, 463, - 466, 469, 2989, 477, 479, 524, 491, 484, 492, 509, - 494, 515, 502, 514, 513, 502, 3035, 520, 525, 520, - 539, 533, 2988, 533, 536, 533, 534, 538, 544, 540, - 558, 544, 567, 545, 570, 3035, 575, 565, 562, 566, - 574, 569, 583, 576, 585, 581, 591, 591, 591, 592, - 589, 587, 599, 591, 605, 606, 614, 593, 604, 2987, - 609, 618, 137, 616, 613, 629, 621, 633, 631, 631, - 623, 632, 3035, 637, 2986, 630, 651, 632, 634, 636, - - 654, 656, 664, 662, 644, 661, 658, 681, 674, 660, - 676, 667, 679, 682, 670, 677, 693, 679, 680, 695, - 705, 3035, 692, 690, 2985, 694, 711, 697, 3035, 702, - 703, 3035, 721, 715, 710, 717, 3035, 726, 716, 720, - 726, 735, 723, 744, 737, 746, 748, 734, 744, 746, - 752, 758, 752, 748, 750, 758, 759, 765, 769, 767, - 766, 3035, 774, 773, 778, 778, 2984, 3035, 792, 3035, - 779, 794, 796, 789, 790, 2983, 786, 786, 804, 3035, - 3035, 803, 791, 3035, 796, 813, 812, 2982, 803, 808, - 798, 819, 811, 810, 829, 820, 3035, 833, 821, 823, - - 3035, 827, 830, 844, 851, 842, 848, 2981, 3035, 838, - 845, 841, 841, 3035, 3035, 2980, 858, 2979, 862, 863, - 860, 2978, 853, 869, 861, 873, 905, 877, 886, 869, - 888, 882, 888, 3035, 3035, 886, 2977, 888, 3035, 896, - 893, 898, 902, 911, 917, 931, 2976, 903, 3035, 2975, - 3035, 935, 927, 928, 931, 933, 937, 937, 959, 2974, - 945, 948, 947, 962, 960, 946, 3035, 956, 969, 967, - 959, 3004, 982, 961, 962, 976, 3004, 2971, 995, 996, - 3035, 997, 984, 996, 999, 997, 992, 1005, 3035, 1010, - 996, 1003, 2970, 1001, 1001, 1016, 1006, 1005, 1007, 1021, - - 1028, 1020, 1021, 3035, 1022, 1032, 3035, 1045, 1049, 3035, - 1050, 1053, 3035, 1046, 1050, 1050, 3035, 1055, 1050, 3035, - 1052, 1065, 1050, 1058, 1069, 1060, 1057, 3035, 1071, 3035, - 1078, 2969, 1068, 1065, 1064, 1078, 1074, 1085, 3035, 1089, - 1088, 1089, 1099, 1090, 1107, 1087, 2968, 2967, 1100, 2966, - 1102, 1099, 1115, 1119, 1122, 1116, 1114, 1123, 1114, 1121, - 1132, 1133, 1116, 1113, 1136, 1140, 1133, 1147, 1139, 1152, - 1154, 1146, 1148, 1162, 1163, 1168, 1164, 1159, 1158, 2965, - 1179, 1166, 1160, 1180, 1186, 1174, 1179, 1182, 3035, 1182, - 1194, 1207, 1195, 1212, 1200, 1216, 3035, 1208, 1208, 1224, - - 1215, 1227, 2964, 3035, 1231, 2963, 3035, 3035, 1229, 1227, - 1231, 2962, 1217, 1237, 3035, 1229, 1222, 1231, 1231, 1244, - 1241, 1242, 1251, 1244, 1253, 1264, 1257, 2990, 1258, 1261, - 1275, 3035, 3035, 3035, 1276, 2960, 1262, 3035, 1275, 1269, - 1272, 1279, 1274, 1278, 1282, 1274, 1275, 1276, 1281, 1295, - 1289, 1292, 1289, 2959, 3035, 1309, 2958, 1300, 1304, 1307, - 1313, 1338, 2957, 1307, 2956, 1324, 2955, 1328, 1328, 1315, - 2954, 1333, 1326, 3035, 1331, 1320, 1340, 1342, 1348, 1346, - 3035, 3035, 3035, 1351, 1343, 1357, 1354, 1349, 1363, 1371, - 1376, 1367, 1364, 1370, 1367, 3035, 1368, 1370, 1380, 1379, - - 1375, 3035, 1391, 1393, 1397, 1388, 1395, 1402, 1390, 1387, - 1404, 2953, 1395, 1409, 1400, 1403, 1417, 1409, 1427, 3035, - 1411, 1418, 1425, 1416, 2952, 3035, 1425, 1436, 3035, 1440, - 1423, 1422, 1438, 1446, 1431, 1450, 1444, 1449, 1437, 3035, - 1445, 1447, 1448, 1446, 1449, 1457, 2951, 1453, 1485, 1460, - 2950, 1461, 2949, 1468, 3035, 3035, 1478, 1482, 1468, 3035, - 1490, 1493, 1495, 3035, 1485, 1490, 3035, 1501, 1491, 1488, - 1508, 1511, 1499, 1512, 1509, 1504, 3035, 1500, 3035, 1519, - 2948, 1506, 2947, 2946, 2945, 1525, 1524, 1525, 1526, 1537, - 1526, 2944, 3035, 1527, 1535, 1541, 1546, 1543, 3035, 1537, - - 1551, 1544, 1548, 1543, 1547, 1554, 1564, 1555, 1555, 1571, - 1568, 1550, 1574, 1561, 1579, 1585, 1572, 1581, 1591, 1596, - 1588, 1598, 1603, 1594, 1606, 1602, 1601, 1609, 1608, 3035, - 1609, 1592, 3035, 3035, 1611, 1600, 2943, 1613, 1601, 2942, - 2941, 1619, 1610, 1609, 1603, 1621, 1622, 1619, 1629, 1636, - 1645, 1635, 1639, 1647, 1648, 1640, 1641, 1661, 3035, 1658, - 1642, 1654, 3035, 1648, 1659, 1655, 1651, 1664, 1659, 1663, - 1663, 1660, 1673, 1677, 1671, 1666, 2940, 2939, 2938, 2937, - 2936, 1687, 1693, 2935, 1695, 2934, 3035, 3035, 1698, 3035, - 3035, 1697, 3035, 2933, 90, 1705, 1692, 1700, 1699, 3035, - - 3035, 1709, 1712, 1705, 1700, 1715, 1711, 1723, 1713, 1707, - 1723, 1719, 3035, 1716, 1732, 1727, 1730, 1728, 1751, 1748, - 1743, 1741, 1751, 1759, 1751, 1765, 1762, 1748, 1756, 3035, - 1757, 1769, 1760, 1757, 1758, 1773, 1769, 1771, 1771, 1770, - 3035, 1769, 1775, 1789, 1775, 3035, 1784, 2932, 1795, 1801, - 1804, 1803, 1793, 3035, 1805, 1804, 1800, 1816, 3035, 1816, - 1809, 1819, 3035, 1821, 3035, 1812, 3035, 1804, 1812, 1828, - 1815, 3035, 1825, 1832, 1826, 1838, 1823, 1822, 1835, 1837, - 1853, 1851, 1842, 1861, 1860, 2931, 1865, 1852, 1868, 1854, - 1866, 1873, 1865, 1879, 1877, 1879, 1869, 1870, 1871, 1874, - - 2930, 1866, 1876, 1889, 1892, 1893, 1889, 1889, 465, 2967, - 2955, 1885, 1907, 2927, 2926, 2925, 3035, 1909, 1910, 1907, - 1904, 1907, 1905, 1926, 1923, 1925, 1931, 3035, 1920, 1929, - 1916, 1923, 1929, 1938, 1938, 1930, 2924, 1923, 1933, 1947, - 1930, 1938, 2923, 1953, 1946, 1950, 2922, 1964, 1964, 3035, - 1960, 1973, 3035, 1975, 1960, 2921, 1961, 1970, 3035, 3035, - 1985, 1965, 1966, 2920, 3035, 3035, 1975, 1970, 1968, 1987, - 1992, 2919, 1980, 1986, 1981, 2001, 2918, 2917, 1999, 2916, - 1997, 3035, 2006, 2000, 3035, 3035, 3035, 2000, 2002, 2020, - 2004, 2023, 2015, 2020, 2030, 2032, 2019, 2031, 2035, 2024, - - 2024, 2027, 2028, 2038, 2032, 2035, 2036, 2037, 2036, 2042, - 2043, 2048, 2060, 3035, 2052, 2058, 2953, 2952, 2940, 2934, - 2057, 2057, 2075, 2077, 2061, 2074, 2072, 2075, 2079, 2080, - 2075, 2085, 2085, 2094, 2080, 2092, 2084, 3035, 2085, 2092, - 2087, 2098, 2096, 2110, 2109, 2107, 2116, 3035, 2119, 2124, - 2113, 2132, 2903, 2115, 2123, 2902, 2897, 2126, 2118, 2119, - 3035, 2129, 2129, 3035, 2141, 2145, 2143, 3035, 2134, 2142, - 2151, 3035, 2141, 2140, 2147, 2146, 2896, 2149, 2895, 2147, - 2146, 2150, 2154, 2155, 2173, 3035, 2179, 2165, 2184, 2890, - 2175, 3035, 3035, 2191, 3035, 3035, 2187, 2194, 2189, 2889, - - 2888, 2198, 2885, 2183, 2198, 2199, 2201, 2202, 2199, 2200, - 2205, 2193, 2202, 2208, 2209, 2197, 2206, 2210, 2203, 2227, - 2884, 3035, 2217, 2229, 3035, 2231, 2238, 2229, 2232, 2242, - 2231, 1302, 3035, 2241, 2244, 2251, 2237, 2249, 2241, 3035, - 904, 3035, 2243, 2245, 2257, 2254, 2248, 2254, 2266, 2254, - 2255, 865, 3035, 2271, 3035, 2280, 2268, 2279, 3035, 2288, - 2294, 2280, 2296, 2295, 2290, 2286, 2291, 2307, 2288, 2298, - 2307, 3035, 2305, 3035, 3035, 3035, 854, 2304, 2299, 2305, - 2317, 2317, 2320, 2316, 2316, 2317, 2322, 2335, 2322, 2328, - 2329, 2333, 2339, 2335, 2336, 2357, 2339, 3035, 2346, 2346, - - 2346, 2350, 2357, 2359, 2360, 2366, 2351, 3035, 480, 2352, - 2355, 3035, 3035, 2362, 2358, 2367, 3035, 3035, 2379, 2364, - 2386, 2375, 3035, 2385, 2381, 2385, 474, 471, 2390, 2397, - 2398, 3035, 2405, 2394, 2399, 2407, 2410, 2404, 2418, 2416, - 3035, 3035, 432, 2406, 2419, 2415, 2409, 428, 2411, 2410, - 2417, 2420, 2431, 2433, 2433, 3035, 3035, 2442, 2435, 2443, - 380, 2449, 2453, 293, 287, 285, 281, 2454, 2455, 280, - 3035, 2460, 2457, 2448, 3035, 2452, 2448, 2449, 2456, 2470, - 269, 2471, 2471, 3035, 2462, 3035, 2464, 2461, 259, 2465, - 2470, 2468, 3035, 2466, 2470, 2488, 2471, 2484, 2485, 2494, - - 249, 2501, 2489, 3035, 2506, 2496, 3035, 2496, 2504, 3035, - 2516, 3035, 2518, 2518, 2501, 2510, 2522, 2503, 3035, 3035, - 2510, 2512, 2512, 2527, 2514, 2525, 2523, 2524, 2529, 2530, - 3035, 237, 2540, 3035, 3035, 2547, 2548, 236, 3035, 2534, - 2547, 2548, 2555, 229, 2548, 3035, 257, 2566, 2560, 200, - 2556, 3035, 2557, 2562, 2566, 2576, 2577, 2583, 2570, 2581, - 2579, 2568, 2588, 2577, 2589, 2581, 2599, 2600, 3035, 2594, - 2585, 152, 2611, 2597, 2613, 2613, 2615, 2619, 2614, 2615, - 2616, 2617, 2620, 2623, 3035, 3035, 2623, 144, 2617, 2634, - 2621, 2640, 2639, 2636, 3035, 2625, 2641, 2637, 3035, 3035, - - 2639, 2634, 3035, 150, 2645, 2644, 2645, 2651, 3035, 2663, - 145, 2663, 2656, 3035, 2665, 2659, 2677, 124, 2677, 109, - 3035, 2669, 2673, 2673, 2685, 2678, 2680, 2681, 2682, 2680, - 2681, 2694, 3035, 3035, 2686, 2683, 2701, 2693, 2693, 2710, - 2696, 3035, 2702, 2710, 3035, 2713, 2715, 2725, 2726, 3035, - 3035, 2713, 2727, 3035, 2725, 3035, 3035, 2732, 2730, 2736, - 2739, 2739, 2742, 3035, 2722, 2723, 2724, 2725, 2733, 2739, - 2736, 2740, 2739, 2744, 2753, 2755, 2767, 2777, 2774, 2778, - 2775, 2780, 2768, 2772, 2782, 2772, 2788, 2787, 2785, 2789, - 3035, 3035, 3035, 3035, 3035, 3035, 3035, 2791, 2797, 2783, - - 3035, 2798, 100, 2799, 2794, 3035, 2788, 2791, 2811, 2802, - 2804, 3035, 3035, 2808, 3035, 2804, 2814, 2827, 2821, 2834, - 3035, 2837, 2821, 2837, 2832, 2844, 2837, 2828, 2830, 2842, - 3035, 2836, 2845, 2850, 3035, 2851, 2852, 2851, 95, 2846, - 2843, 2849, 2853, 3035, 3035, 2849, 2858, 2871, 3035, 3035, - 2857, 2875, 2883, 2866, 3035, 2887, 2878, 3035, 2888, 3035, - 3035, 93, 2879, 2884, 2880, 3035, 3035, 2880, 2880, 2884, - 3035, 2896, 2892, 3035, 2895, 2889, 2905, 3035, 3035, 3035, - 105, 2952, 97, 84, 81 + 294, 311, 304, 333, 336, 315, 340, 333, 344, 335, + 331, 334, 348, 335, 353, 357, 352, 369, 363, 382, + 367, 363, 383, 381, 394, 383, 391, 400, 397, 392, + + 388, 397, 418, 389, 389, 423, 417, 465, 435, 441, + 439, 446, 434, 443, 437, 432, 444, 459, 456, 473, + 471, 470, 2989, 476, 479, 521, 492, 488, 492, 511, + 498, 507, 506, 509, 506, 495, 3035, 514, 536, 508, + 523, 517, 2988, 524, 532, 530, 538, 539, 547, 543, + 557, 543, 566, 543, 566, 3035, 569, 560, 557, 561, + 570, 562, 576, 569, 578, 574, 584, 587, 591, 581, + 584, 595, 588, 603, 607, 611, 597, 600, 2987, 606, + 613, 137, 609, 604, 616, 616, 630, 628, 624, 616, + 622, 3035, 629, 2986, 621, 645, 626, 631, 634, 652, + + 654, 664, 662, 646, 659, 656, 674, 670, 657, 671, + 659, 672, 675, 665, 669, 684, 671, 669, 686, 699, + 3035, 686, 686, 2985, 695, 709, 697, 3035, 702, 705, + 3035, 719, 713, 706, 714, 3035, 721, 709, 712, 719, + 729, 717, 736, 731, 737, 739, 724, 736, 737, 746, + 755, 750, 746, 744, 755, 760, 768, 767, 765, 762, + 3035, 771, 768, 771, 770, 2984, 3035, 785, 3035, 773, + 788, 789, 782, 783, 2983, 779, 779, 795, 3035, 3035, + 795, 782, 3035, 790, 807, 809, 2982, 801, 805, 793, + 816, 812, 813, 827, 818, 3035, 815, 817, 3035, 819, + + 821, 835, 841, 835, 841, 2981, 3035, 828, 837, 833, + 833, 3035, 3035, 2980, 848, 2979, 852, 852, 852, 2978, + 849, 865, 855, 867, 899, 877, 883, 867, 879, 877, + 883, 3035, 3035, 880, 2977, 881, 3035, 889, 886, 890, + 891, 901, 912, 924, 2976, 903, 3035, 2975, 3035, 935, + 924, 926, 925, 927, 929, 930, 953, 2974, 939, 942, + 940, 971, 954, 940, 3035, 949, 959, 958, 945, 3004, + 975, 952, 953, 976, 3004, 2971, 992, 994, 3035, 991, + 977, 990, 992, 989, 985, 999, 3035, 1004, 990, 996, + 2970, 995, 995, 1010, 999, 998, 1005, 1018, 1025, 1020, + + 1017, 3035, 1015, 1032, 3035, 1042, 1046, 3035, 1044, 1047, + 3035, 1039, 1044, 1043, 3035, 1047, 1043, 3035, 1046, 1059, + 1044, 1051, 1063, 1054, 3035, 1064, 3035, 1069, 2969, 1060, + 1057, 1059, 1072, 1070, 1079, 3035, 1085, 1082, 1084, 1095, + 1083, 1100, 1079, 2968, 2967, 1092, 2966, 1093, 1090, 1106, + 1109, 1115, 1109, 1106, 1115, 1107, 1114, 1123, 1125, 1108, + 1108, 1135, 1137, 1127, 1142, 1133, 1148, 1147, 1139, 1140, + 1154, 1152, 1159, 1154, 1152, 1151, 2965, 1171, 1160, 1150, + 1174, 1174, 1166, 1174, 1178, 3035, 1190, 1187, 1191, 1183, + 1205, 1194, 1207, 3035, 1197, 1199, 1215, 1205, 1220, 2964, + + 3035, 1224, 2963, 3035, 3035, 1222, 1218, 1224, 2962, 1210, + 1227, 3035, 1221, 1217, 1225, 1227, 1240, 1235, 1236, 1246, + 1238, 1249, 1257, 1250, 2990, 1250, 1253, 1266, 3035, 3035, + 3035, 1267, 2960, 1253, 3035, 1265, 1262, 1265, 1275, 1265, + 1269, 1274, 1267, 1266, 1268, 1273, 1290, 1283, 1288, 1283, + 2959, 3035, 1303, 2958, 1295, 1300, 1305, 1315, 2957, 1299, + 2956, 1317, 2955, 1319, 1321, 1306, 2954, 1327, 1320, 3035, + 1326, 1315, 1333, 1335, 1339, 1338, 3035, 3035, 3035, 1340, + 1335, 1350, 1345, 1342, 1363, 1355, 1360, 1358, 1354, 1357, + 1354, 3035, 1357, 1360, 1368, 1368, 1364, 3035, 1381, 1383, + + 1387, 1378, 1386, 1391, 1379, 1376, 1392, 2953, 1382, 1401, + 1393, 1394, 1410, 1399, 1416, 3035, 1404, 1410, 1417, 1407, + 2952, 3035, 1413, 1424, 3035, 1429, 1413, 1410, 1427, 1435, + 1421, 1440, 1434, 1440, 1426, 3035, 1434, 1436, 1436, 1433, + 1441, 1450, 2951, 1444, 1476, 1454, 2950, 1456, 2949, 1462, + 3035, 3035, 1474, 1475, 1462, 3035, 1478, 1484, 1483, 3035, + 1475, 1480, 3035, 1491, 1481, 1479, 1497, 1500, 1488, 1500, + 1496, 1496, 3035, 1493, 3035, 1510, 2948, 1500, 2947, 2946, + 2945, 1520, 1518, 1521, 1519, 1530, 2944, 3035, 1515, 1525, + 1528, 1536, 1531, 3035, 1526, 1540, 1532, 1536, 1532, 1536, + + 1542, 1552, 1543, 1541, 1557, 1554, 1541, 1562, 1551, 1569, + 1574, 1565, 1573, 1583, 1587, 1576, 1586, 1592, 1584, 1594, + 1591, 1590, 1597, 1597, 3035, 1598, 1581, 3035, 3035, 1600, + 1588, 2943, 1601, 1589, 2942, 2941, 1605, 1596, 1595, 1594, + 1609, 1612, 1609, 1618, 1629, 1637, 1627, 1630, 1635, 1636, + 1629, 1631, 1649, 3035, 1647, 1631, 1642, 3035, 1637, 1648, + 1644, 1640, 1652, 1647, 1651, 1649, 1646, 1659, 1668, 1659, + 1656, 2940, 2939, 2938, 2937, 2936, 1677, 1682, 2935, 1688, + 2934, 3035, 3035, 1690, 3035, 3035, 1689, 3035, 2933, 90, + 1696, 1680, 1688, 1688, 3035, 3035, 1699, 1700, 1694, 1689, + + 1702, 1701, 1711, 1702, 1697, 1711, 1707, 3035, 1702, 1717, + 1715, 1714, 1735, 1736, 1732, 1732, 1741, 1746, 1738, 1752, + 1750, 1735, 1743, 3035, 1745, 1756, 1747, 1745, 1746, 1761, + 1755, 1758, 1758, 1755, 3035, 1753, 1760, 1774, 1761, 3035, + 1771, 2932, 1781, 1785, 1792, 1792, 1784, 3035, 1795, 1791, + 1787, 1805, 3035, 1802, 1796, 1806, 3035, 1809, 3035, 1799, + 3035, 1791, 1799, 1816, 1801, 3035, 1812, 1819, 1811, 1822, + 1808, 1807, 1821, 1824, 1839, 1835, 1830, 1850, 1851, 2931, + 1855, 1839, 1855, 1841, 1854, 1860, 1852, 1867, 1864, 1866, + 1857, 1858, 1859, 1860, 2930, 1853, 1863, 1874, 1876, 1878, + + 1874, 1875, 1924, 2967, 2955, 1872, 1893, 2927, 2926, 2925, + 3035, 1893, 1898, 1896, 1896, 1899, 1894, 1916, 1914, 1916, + 1921, 3035, 1911, 1921, 1907, 1919, 1928, 1929, 1919, 2924, + 1912, 1922, 1935, 1917, 1925, 2923, 1943, 1934, 1936, 2922, + 1941, 1945, 3035, 1944, 1961, 3035, 1965, 1948, 2921, 1949, + 1959, 3035, 3035, 1970, 1956, 1956, 2920, 3035, 3035, 1966, + 1960, 1958, 1978, 1984, 2919, 1972, 1975, 1970, 1990, 2918, + 2917, 1987, 2916, 1985, 3035, 1992, 1987, 3035, 3035, 3035, + 1986, 1984, 2003, 1988, 2011, 2005, 2008, 2018, 2021, 2009, + 2019, 2024, 2014, 2014, 2017, 2018, 2028, 2023, 2024, 2025, + + 2026, 2024, 2029, 2030, 2036, 2046, 3035, 2039, 2044, 2953, + 2949, 2935, 2934, 2039, 2040, 2059, 2065, 2051, 2062, 2060, + 2064, 2069, 2068, 2064, 2075, 2075, 2084, 2070, 2082, 2075, + 3035, 2080, 2075, 2084, 2082, 2096, 2095, 2090, 2101, 3035, + 2102, 2104, 2094, 2111, 2902, 2098, 2109, 2897, 2895, 2112, + 2105, 2106, 3035, 2117, 2116, 3035, 2128, 2133, 2131, 3035, + 2123, 2131, 2140, 3035, 2130, 2128, 2135, 2134, 2893, 2135, + 2890, 2133, 2132, 2136, 2137, 2140, 2156, 3035, 2159, 2146, + 2163, 2888, 2158, 3035, 3035, 2177, 3035, 3035, 2173, 2181, + 2176, 1438, 931, 2186, 897, 2170, 2185, 2187, 2189, 2191, + + 2188, 2189, 2194, 2181, 2190, 2196, 2195, 2183, 2192, 2196, + 2186, 2212, 865, 3035, 2200, 2209, 3035, 2212, 2217, 2212, + 2218, 2228, 2218, 859, 2228, 2232, 2238, 2224, 2237, 2229, + 3035, 848, 3035, 2232, 2233, 2246, 2244, 2236, 2242, 2254, + 2238, 2241, 479, 3035, 2257, 3035, 2263, 2253, 2256, 3035, + 2267, 2273, 2263, 2283, 2282, 2276, 2273, 2278, 2295, 2276, + 2284, 2295, 3035, 2293, 3035, 3035, 3035, 471, 2294, 2288, + 2294, 2305, 2305, 2308, 2300, 2302, 2303, 2305, 2320, 2305, + 2308, 2310, 2312, 2322, 2322, 2323, 2343, 2326, 3035, 2333, + 2334, 2333, 2337, 2345, 2347, 2349, 2355, 2340, 3035, 430, + + 2341, 2343, 3035, 3035, 2350, 2346, 2351, 3035, 3035, 2365, + 2350, 2369, 2360, 3035, 2368, 2361, 2366, 419, 418, 2369, + 2380, 2385, 3035, 2392, 2380, 2386, 2394, 2398, 2391, 2405, + 2404, 3035, 3035, 415, 2394, 2408, 2404, 2398, 412, 2400, + 2398, 2405, 2408, 2415, 2419, 2419, 3035, 3035, 2425, 2420, + 2426, 384, 2429, 2434, 383, 293, 287, 281, 2433, 2438, + 280, 3035, 2447, 2444, 2434, 3035, 2439, 2435, 2437, 2443, + 2457, 269, 2459, 2459, 3035, 2451, 3035, 2453, 2450, 259, + 2454, 2458, 2456, 3035, 2454, 2454, 2474, 2457, 2467, 2470, + 2477, 249, 2481, 2470, 3035, 2485, 2479, 3035, 2483, 2491, + + 3035, 2502, 3035, 2505, 2505, 2489, 2497, 2509, 2491, 3035, + 3035, 2498, 2501, 2501, 2516, 2503, 2513, 2511, 2512, 2513, + 2516, 3035, 237, 2526, 3035, 3035, 2530, 2533, 236, 3035, + 2517, 2527, 2525, 2543, 229, 2536, 3035, 257, 2553, 2546, + 200, 2543, 3035, 2544, 2550, 2553, 2563, 2565, 2571, 2559, + 2570, 2568, 2557, 2575, 2565, 2573, 2567, 2585, 2583, 3035, + 2579, 2568, 152, 2591, 2578, 2592, 2596, 2602, 2606, 2600, + 2602, 2603, 2605, 2607, 2610, 3035, 3035, 2611, 144, 2605, + 2623, 2610, 2629, 2628, 2624, 3035, 2613, 2629, 2621, 3035, + 3035, 2625, 2620, 3035, 150, 2628, 2629, 2628, 2631, 3035, + + 2644, 145, 2642, 2639, 3035, 2652, 2646, 2663, 124, 2664, + 109, 3035, 2656, 2661, 2660, 2672, 2666, 2668, 2670, 2671, + 2669, 2670, 2682, 3035, 3035, 2674, 2671, 2685, 2679, 2679, + 2693, 2681, 3035, 2685, 2690, 3035, 2694, 2694, 2708, 2713, + 3035, 3035, 2700, 2713, 3035, 2712, 3035, 3035, 2719, 2718, + 2723, 2726, 2727, 2730, 3035, 2711, 2712, 2713, 2714, 2721, + 2727, 2724, 2724, 2725, 2730, 2736, 2740, 2750, 2757, 2755, + 2757, 2758, 2767, 2755, 2758, 2769, 2759, 2776, 2774, 2772, + 2777, 3035, 3035, 3035, 3035, 3035, 3035, 3035, 2779, 2786, + 2772, 3035, 2787, 100, 2788, 2782, 3035, 2776, 2779, 2795, + + 2788, 2790, 3035, 3035, 2791, 3035, 2789, 2797, 2807, 2802, + 2818, 3035, 2825, 2809, 2827, 2820, 2832, 2826, 2818, 2818, + 2831, 3035, 2826, 2835, 2840, 3035, 2841, 2840, 2844, 2843, + 95, 2836, 2833, 2841, 2841, 3035, 3035, 2838, 2849, 2859, + 3035, 3035, 2861, 2849, 2865, 2872, 2859, 3035, 2877, 2870, + 3035, 2881, 3035, 2869, 3035, 93, 2874, 2877, 2873, 3035, + 3035, 2878, 2876, 2877, 2879, 3035, 2882, 2892, 2889, 3035, + 2895, 2892, 2886, 2895, 2905, 3035, 2892, 3035, 3035, 3035, + 105, 2954, 97, 84, 81 } ; static yyconst flex_int16_t yy_def[1586] = @@ -872,8 +872,7 @@ static yyconst flex_int16_t yy_def[1586] = 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1584, - 1585, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, + 1580, 1580, 1580, 1584, 1585, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, @@ -882,9 +881,10 @@ static yyconst flex_int16_t yy_def[1586] = 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1580, 1580, 1584, 1584, 1585, 1585, + + 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1584, + 1584, 1585, 1585, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, @@ -959,332 +959,332 @@ 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, 1019, 54, 102, 1017, 67, 68, 43, 40, 40, - 61, 909, 106, 910, 62, 74, 69, 41, 63, 53, + 83, 1012, 54, 102, 1010, 67, 68, 43, 40, 40, + 61, 903, 106, 904, 62, 74, 69, 41, 63, 53, - 70, 64, 75, 911, 65, 38, 66, 83, 71, 54, + 70, 64, 75, 905, 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, 1568, 71, 1553, 81, 72, 82, - 77, 1524, 47, 48, 128, 49, 78, 73, 314, 315, - 1460, 50, 79, 51, 131, 1433, 1434, 80, 107, 76, - 52, 55, 108, 56, 81, 1458, 82, 77, 57, 58, + 80, 65, 76, 52, 1563, 71, 1546, 81, 72, 82, + 77, 1515, 47, 48, 128, 49, 78, 73, 312, 313, + 1451, 50, 79, 51, 131, 1424, 1425, 80, 107, 76, + 52, 55, 108, 56, 81, 1449, 82, 77, 57, 58, 84, 128, 59, 78, 88, 60, 109, 85, 89, 79, - 86, 131, 87, 129, 90, 107, 1452, 130, 55, 108, - 56, 1446, 103, 1419, 132, 57, 58, 84, 133, 59, + 86, 131, 87, 129, 90, 107, 1443, 130, 55, 108, + 56, 1437, 103, 1410, 132, 57, 58, 84, 133, 59, 104, 88, 60, 109, 85, 89, 105, 86, 134, 87, 129, 90, 91, 92, 130, 135, 93, 125, 126, 103, 94, 132, 136, 127, 137, 133, 95, 104, 46, 46, 46, 46, 46, 105, 138, 134, 139, 140, 141, 91, - 92, 1398, 135, 93, 125, 126, 142, 94, 143, 136, + 92, 1389, 135, 93, 125, 126, 142, 94, 143, 136, 127, 137, 144, 95, 96, 145, 97, 146, 98, 149, - 147, 138, 99, 139, 140, 141, 150, 158, 100, 1395, - 1393, 159, 160, 142, 101, 143, 161, 1387, 1383, 144, + 147, 138, 99, 139, 140, 141, 150, 158, 100, 1386, + 1384, 159, 160, 142, 101, 143, 161, 1378, 1374, 144, 148, 96, 145, 97, 146, 98, 149, 147, 162, 99, - 1359, 151, 152, 150, 158, 100, 153, 156, 159, 160, - - 1348, 101, 110, 161, 154, 111, 112, 148, 113, 155, - 1342, 157, 114, 115, 116, 162, 117, 118, 151, 152, - 170, 1333, 1330, 153, 156, 163, 1329, 164, 1328, 110, - 171, 154, 111, 112, 1327, 113, 155, 166, 157, 114, - 115, 116, 165, 117, 118, 119, 167, 170, 120, 121, - 172, 168, 163, 169, 164, 122, 123, 171, 176, 174, - 177, 173, 124, 180, 166, 175, 178, 181, 179, 165, - 182, 183, 119, 167, 184, 120, 121, 172, 168, 185, - 169, 186, 122, 123, 187, 176, 174, 177, 173, 124, - 180, 188, 175, 178, 181, 179, 189, 182, 183, 190, - - 194, 184, 196, 192, 191, 195, 185, 193, 186, 197, - 198, 187, 199, 202, 203, 206, 209, 210, 188, 214, - 204, 1324, 200, 189, 215, 207, 190, 194, 201, 196, - 192, 191, 195, 216, 193, 205, 197, 198, 208, 199, - 202, 203, 206, 209, 210, 217, 214, 204, 211, 200, - 225, 215, 207, 230, 234, 201, 235, 232, 238, 226, - 216, 236, 205, 239, 212, 213, 909, 231, 910, 1313, - 227, 237, 217, 1308, 228, 211, 229, 225, 911, 233, - 230, 234, 240, 235, 232, 238, 226, 241, 236, 242, - 239, 212, 213, 218, 231, 219, 220, 227, 237, 243, - - 221, 228, 222, 229, 244, 223, 233, 246, 247, 240, - 254, 224, 1296, 255, 241, 1295, 242, 260, 256, 263, - 218, 1282, 219, 220, 257, 258, 243, 221, 259, 222, - 261, 244, 223, 264, 246, 247, 265, 254, 224, 248, - 255, 266, 249, 267, 260, 256, 263, 268, 262, 250, - 251, 257, 258, 270, 269, 259, 252, 261, 271, 272, - 264, 274, 253, 265, 275, 276, 248, 277, 266, 249, - 267, 278, 279, 280, 268, 262, 250, 251, 281, 282, - 270, 269, 283, 252, 284, 271, 272, 285, 274, 253, - 286, 275, 276, 287, 277, 288, 289, 290, 278, 279, - - 280, 291, 292, 293, 294, 281, 282, 295, 296, 283, - 297, 284, 298, 299, 285, 301, 302, 286, 303, 304, - 287, 305, 288, 289, 290, 306, 300, 309, 291, 292, - 293, 294, 307, 308, 295, 296, 310, 297, 312, 298, - 299, 313, 301, 302, 316, 303, 304, 317, 305, 320, - 321, 322, 306, 300, 309, 318, 323, 324, 319, 307, - 308, 325, 326, 310, 328, 312, 329, 330, 313, 332, - 333, 316, 334, 331, 317, 335, 320, 321, 322, 336, - 337, 338, 318, 323, 324, 319, 339, 340, 325, 326, - 345, 328, 346, 329, 330, 347, 332, 333, 341, 334, - - 348, 349, 335, 350, 351, 342, 336, 337, 338, 352, - 343, 353, 354, 339, 340, 344, 355, 345, 356, 346, - 357, 358, 347, 362, 359, 341, 360, 348, 349, 363, - 350, 351, 342, 364, 365, 366, 352, 343, 353, 354, - 367, 368, 344, 355, 369, 356, 370, 357, 358, 371, - 362, 359, 372, 360, 374, 375, 363, 373, 376, 377, - 364, 365, 366, 378, 379, 381, 382, 367, 368, 383, - 384, 369, 385, 370, 380, 386, 371, 387, 388, 372, - 389, 374, 375, 391, 392, 376, 377, 393, 394, 390, - 378, 379, 381, 382, 395, 396, 383, 384, 397, 385, - - 398, 380, 386, 399, 387, 388, 400, 389, 401, 403, - 391, 392, 404, 405, 393, 394, 406, 407, 408, 410, - 411, 395, 396, 412, 413, 397, 414, 398, 415, 416, - 399, 417, 419, 400, 420, 401, 403, 421, 422, 404, - 405, 423, 424, 406, 407, 408, 410, 411, 425, 426, - 412, 413, 427, 414, 428, 415, 416, 429, 417, 419, - 430, 420, 431, 432, 421, 422, 433, 437, 423, 424, - 435, 439, 440, 441, 442, 425, 426, 444, 446, 427, - 434, 428, 447, 436, 429, 448, 450, 430, 451, 431, - 432, 452, 453, 433, 437, 1252, 463, 435, 439, 440, - - 441, 442, 464, 465, 444, 446, 1233, 434, 468, 447, - 469, 466, 448, 450, 470, 451, 467, 472, 452, 453, - 454, 455, 456, 463, 473, 474, 457, 475, 458, 464, - 465, 459, 476, 460, 477, 468, 478, 469, 466, 461, - 484, 470, 462, 467, 472, 1221, 479, 454, 455, 456, - 486, 473, 474, 457, 475, 458, 487, 488, 459, 476, - 460, 477, 489, 478, 480, 490, 461, 484, 481, 462, - 491, 492, 482, 479, 493, 495, 496, 486, 497, 502, - 503, 499, 504, 487, 488, 500, 505, 506, 498, 489, - 501, 480, 490, 507, 512, 481, 513, 491, 492, 509, - - 510, 493, 495, 496, 514, 497, 502, 503, 499, 504, - 517, 518, 500, 505, 506, 511, 519, 501, 520, 521, - 507, 512, 522, 513, 523, 524, 509, 510, 525, 526, - 528, 514, 529, 531, 532, 533, 527, 517, 518, 534, - 535, 536, 511, 519, 537, 520, 521, 538, 539, 522, - 541, 523, 524, 540, 542, 525, 526, 528, 543, 529, - 531, 532, 533, 527, 544, 545, 534, 535, 536, 546, - 547, 537, 548, 549, 538, 539, 550, 541, 551, 552, - 540, 542, 553, 554, 555, 543, 556, 557, 558, 559, - 560, 544, 545, 561, 563, 564, 546, 547, 565, 548, - - 549, 566, 567, 550, 570, 551, 552, 571, 568, 553, - 554, 555, 572, 556, 557, 558, 559, 560, 569, 573, - 561, 563, 564, 574, 575, 565, 576, 579, 566, 567, - 581, 570, 582, 583, 571, 568, 584, 585, 586, 572, - 588, 589, 587, 590, 591, 569, 573, 593, 595, 596, - 574, 575, 597, 576, 579, 598, 592, 581, 599, 582, - 583, 594, 600, 584, 585, 586, 601, 588, 589, 587, - 590, 591, 602, 603, 593, 595, 596, 604, 606, 597, - 607, 608, 598, 592, 605, 599, 609, 610, 594, 600, - 611, 612, 613, 601, 615, 616, 617, 619, 620, 602, - - 603, 618, 624, 622, 604, 606, 625, 607, 608, 621, - 626, 605, 627, 609, 610, 628, 629, 611, 612, 613, - 623, 615, 616, 617, 619, 620, 630, 631, 618, 624, - 622, 632, 633, 625, 635, 634, 621, 626, 636, 627, - 637, 638, 628, 629, 639, 640, 642, 623, 644, 647, - 648, 650, 645, 630, 631, 646, 651, 652, 632, 633, - 653, 635, 634, 654, 655, 636, 656, 637, 638, 657, - 658, 639, 640, 642, 659, 644, 647, 648, 650, 645, - 660, 661, 646, 651, 652, 662, 663, 653, 665, 666, - 654, 655, 667, 656, 668, 670, 657, 658, 671, 672, - - 673, 659, 674, 676, 677, 678, 679, 660, 661, 680, - 681, 682, 662, 663, 683, 665, 666, 684, 685, 667, - 675, 668, 670, 686, 688, 671, 672, 673, 690, 674, - 676, 677, 678, 679, 691, 692, 680, 681, 682, 693, - 699, 683, 701, 1214, 684, 685, 703, 704, 706, 708, - 686, 688, 709, 710, 711, 690, 694, 695, 705, 712, - 713, 691, 692, 714, 715, 696, 693, 699, 716, 701, - 697, 717, 718, 703, 704, 706, 708, 719, 720, 709, - 710, 711, 721, 694, 695, 705, 712, 713, 723, 722, - 714, 715, 696, 724, 725, 716, 726, 697, 717, 718, - - 727, 728, 729, 730, 719, 720, 731, 732, 733, 721, - 734, 735, 736, 737, 738, 723, 722, 739, 740, 741, - 724, 725, 742, 726, 744, 745, 746, 727, 728, 729, - 730, 747, 748, 731, 732, 733, 749, 734, 735, 736, - 737, 738, 750, 751, 739, 740, 741, 752, 753, 742, - 754, 744, 745, 746, 756, 757, 758, 759, 747, 748, - 760, 761, 762, 749, 763, 764, 765, 766, 767, 750, - 751, 768, 769, 770, 752, 753, 771, 754, 772, 773, - 774, 756, 757, 758, 759, 776, 782, 760, 761, 762, - 784, 763, 764, 765, 766, 767, 786, 787, 768, 769, - - 770, 788, 789, 771, 777, 772, 773, 774, 778, 790, - 779, 791, 776, 782, 780, 781, 792, 784, 793, 794, - 795, 796, 797, 786, 787, 798, 799, 800, 788, 789, - 801, 777, 802, 803, 804, 778, 790, 779, 791, 805, - 807, 780, 781, 792, 811, 793, 794, 795, 796, 797, - 812, 813, 798, 799, 800, 814, 815, 801, 816, 802, - 803, 804, 818, 819, 821, 822, 805, 807, 823, 824, - 825, 811, 826, 820, 827, 828, 829, 812, 813, 830, - 831, 832, 814, 815, 833, 816, 834, 835, 836, 818, - 819, 821, 822, 837, 838, 823, 824, 825, 839, 826, - - 820, 827, 828, 829, 840, 841, 830, 831, 832, 842, - 843, 833, 844, 834, 835, 836, 845, 846, 847, 848, - 837, 838, 849, 850, 851, 839, 852, 853, 854, 855, - 856, 840, 841, 857, 859, 860, 842, 843, 863, 844, - 864, 865, 866, 845, 846, 847, 848, 867, 868, 849, - 850, 851, 869, 852, 853, 854, 855, 856, 870, 871, - 857, 859, 860, 872, 873, 863, 874, 864, 865, 866, - 875, 876, 877, 878, 867, 868, 879, 880, 881, 869, - 882, 883, 884, 885, 886, 870, 871, 887, 888, 889, - 872, 873, 890, 874, 891, 892, 893, 875, 876, 877, - - 878, 894, 895, 879, 880, 881, 901, 882, 883, 884, - 885, 886, 902, 904, 887, 888, 889, 906, 907, 890, - 912, 891, 892, 893, 913, 914, 915, 916, 894, 895, - 917, 918, 919, 901, 922, 920, 926, 927, 923, 902, - 904, 928, 929, 924, 906, 907, 930, 912, 921, 931, - 932, 913, 914, 915, 916, 925, 933, 917, 918, 919, - 934, 922, 920, 926, 927, 923, 935, 936, 928, 929, - 924, 937, 938, 930, 939, 921, 931, 932, 940, 941, - 942, 943, 925, 933, 944, 945, 946, 934, 947, 948, - 949, 950, 951, 935, 936, 952, 953, 954, 937, 938, - - 955, 939, 956, 957, 958, 940, 941, 942, 943, 959, - 960, 944, 945, 946, 962, 947, 948, 949, 950, 951, - 963, 964, 952, 953, 954, 965, 966, 955, 967, 956, - 957, 958, 968, 969, 970, 972, 959, 960, 973, 974, - 975, 962, 976, 977, 971, 978, 979, 963, 964, 980, - 981, 982, 965, 966, 983, 967, 984, 985, 986, 968, - 969, 970, 972, 987, 988, 973, 974, 975, 989, 976, - 977, 971, 978, 979, 990, 991, 980, 981, 982, 992, - 993, 983, 995, 984, 985, 986, 996, 997, 998, 999, - 987, 988, 1000, 1001, 1002, 989, 1003, 1004, 1005, 1006, - - 1007, 990, 991, 1008, 1010, 1011, 992, 993, 1012, 995, - 1013, 1014, 1015, 996, 997, 998, 999, 1016, 1021, 1000, - 1001, 1002, 1022, 1003, 1004, 1005, 1006, 1007, 1026, 1027, - 1008, 1010, 1011, 1028, 1029, 1012, 1030, 1013, 1014, 1015, - 1031, 1032, 1033, 1034, 1016, 1021, 1035, 1036, 1037, 1022, - 1038, 1039, 1040, 1041, 1042, 1026, 1027, 1043, 1045, 1046, - 1028, 1029, 1047, 1030, 1048, 1049, 1053, 1031, 1032, 1033, - 1034, 1054, 1051, 1035, 1036, 1037, 1052, 1038, 1039, 1040, - 1041, 1042, 1056, 1057, 1043, 1045, 1046, 1058, 1059, 1047, - 1060, 1048, 1049, 1053, 1061, 1063, 1064, 1068, 1054, 1051, - - 1069, 1071, 1065, 1052, 1072, 1073, 1074, 1075, 1077, 1056, - 1057, 1066, 1078, 1079, 1058, 1059, 1080, 1060, 1083, 1067, - 1085, 1061, 1063, 1064, 1068, 1086, 1087, 1069, 1071, 1065, - 1088, 1072, 1073, 1074, 1075, 1077, 1089, 1090, 1066, 1078, - 1079, 1091, 1092, 1080, 1093, 1083, 1067, 1085, 1094, 1095, - 1096, 1097, 1086, 1087, 1098, 1099, 1100, 1088, 1101, 1102, - 1103, 1104, 1105, 1089, 1090, 1106, 1107, 1108, 1091, 1092, - 1109, 1093, 1110, 1111, 1112, 1094, 1095, 1096, 1097, 1113, - 1114, 1098, 1099, 1100, 1115, 1101, 1102, 1103, 1104, 1105, - 1116, 1117, 1106, 1107, 1108, 1118, 1119, 1109, 1120, 1110, - - 1111, 1112, 1121, 1122, 1123, 1124, 1113, 1114, 1125, 1126, - 1127, 1115, 1128, 1129, 1130, 1131, 1132, 1116, 1117, 1133, - 1134, 1135, 1118, 1119, 1136, 1120, 1137, 1138, 1139, 1121, - 1122, 1123, 1124, 1140, 1141, 1125, 1126, 1127, 1142, 1128, - 1129, 1130, 1131, 1132, 1143, 1144, 1133, 1134, 1135, 1145, - 1147, 1136, 1148, 1137, 1138, 1139, 1151, 1152, 1153, 1154, - 1140, 1141, 1155, 1156, 1157, 1142, 1158, 1159, 1160, 1161, - 1162, 1143, 1144, 1163, 1164, 1165, 1145, 1147, 1167, 1148, - 1169, 1170, 1171, 1151, 1152, 1153, 1154, 1172, 1173, 1155, - 1156, 1157, 1174, 1158, 1159, 1160, 1161, 1162, 1175, 1176, - - 1163, 1164, 1165, 1177, 1179, 1167, 1180, 1169, 1170, 1171, - 1181, 1182, 1183, 1186, 1172, 1173, 1188, 1189, 1190, 1174, - 1191, 1192, 1193, 1194, 1195, 1175, 1176, 1196, 1197, 1198, - 1177, 1179, 1199, 1180, 1200, 1201, 1202, 1181, 1182, 1183, - 1186, 1203, 1204, 1188, 1189, 1190, 1206, 1191, 1192, 1193, - 1194, 1195, 1207, 1208, 1196, 1197, 1198, 1209, 1210, 1199, - 1211, 1200, 1201, 1202, 1212, 1213, 1215, 1216, 1203, 1204, - 1217, 1218, 1219, 1206, 1220, 1222, 1225, 1226, 1223, 1207, - 1208, 1227, 1228, 1229, 1209, 1210, 1224, 1211, 1231, 1232, - 1234, 1212, 1213, 1215, 1216, 1235, 1236, 1217, 1218, 1219, - - 1230, 1220, 1222, 1225, 1226, 1223, 1237, 1238, 1227, 1228, - 1229, 1239, 1240, 1241, 1242, 1231, 1232, 1234, 1243, 1244, - 1245, 1248, 1235, 1236, 1246, 1249, 1250, 1230, 1251, 1253, - 1247, 1254, 1255, 1237, 1238, 1256, 1257, 1258, 1239, 1240, - 1241, 1242, 1259, 1260, 1261, 1243, 1244, 1245, 1248, 1262, - 1263, 1246, 1249, 1250, 1264, 1251, 1253, 1247, 1254, 1255, - 1265, 1266, 1256, 1257, 1258, 1267, 1268, 1269, 1270, 1259, - 1260, 1261, 1271, 1272, 1273, 1274, 1262, 1263, 1275, 1276, - 1277, 1264, 1278, 1279, 1280, 1281, 1283, 1265, 1266, 1284, - 1285, 1286, 1267, 1268, 1269, 1270, 1287, 1288, 1289, 1271, - - 1272, 1273, 1274, 1290, 1291, 1275, 1276, 1277, 1292, 1278, - 1279, 1280, 1281, 1283, 1293, 1294, 1284, 1285, 1286, 1297, - 1298, 1299, 1300, 1287, 1288, 1289, 1301, 1302, 1303, 1304, - 1290, 1291, 1305, 1306, 1307, 1292, 1309, 1310, 1311, 1312, - 1314, 1293, 1294, 1315, 1316, 1317, 1297, 1298, 1299, 1300, - 1318, 1319, 1320, 1301, 1302, 1303, 1304, 1321, 1322, 1305, - 1306, 1307, 1323, 1309, 1310, 1311, 1312, 1314, 1325, 1326, - 1315, 1316, 1317, 1331, 1332, 1334, 1335, 1318, 1319, 1320, - 1336, 1337, 1338, 1339, 1321, 1322, 1340, 1341, 1343, 1323, - 1344, 1345, 1346, 1347, 1349, 1325, 1326, 1350, 1351, 1352, - - 1331, 1332, 1334, 1335, 1353, 1354, 1355, 1336, 1337, 1338, - 1339, 1356, 1357, 1340, 1341, 1343, 1358, 1344, 1345, 1346, - 1347, 1349, 1360, 1361, 1350, 1351, 1352, 1362, 1363, 1364, - 1365, 1353, 1354, 1355, 1366, 1367, 1368, 1369, 1356, 1357, - 1370, 1371, 1372, 1358, 1373, 1374, 1375, 1376, 1377, 1360, - 1361, 1378, 1379, 1380, 1362, 1363, 1364, 1365, 1381, 1382, - 1384, 1366, 1367, 1368, 1369, 1385, 1386, 1370, 1371, 1372, - 1388, 1373, 1374, 1375, 1376, 1377, 1389, 1392, 1378, 1379, - 1380, 1390, 1394, 1391, 1396, 1381, 1382, 1384, 1397, 1399, - 1400, 1401, 1385, 1386, 1402, 1403, 1404, 1388, 1405, 1406, - - 1408, 1409, 1410, 1389, 1392, 1407, 1411, 1412, 1390, 1394, - 1391, 1396, 1413, 1414, 1415, 1397, 1399, 1400, 1401, 1416, - 1417, 1402, 1403, 1404, 1418, 1405, 1406, 1408, 1409, 1410, - 1420, 1421, 1407, 1411, 1412, 1422, 1423, 1424, 1425, 1413, - 1414, 1415, 1426, 1427, 1428, 1429, 1416, 1417, 1430, 1431, - 1432, 1418, 1435, 1436, 1437, 1438, 1439, 1420, 1421, 1440, - 1441, 1442, 1422, 1423, 1424, 1425, 1443, 1444, 1445, 1426, - 1427, 1428, 1429, 1447, 1448, 1430, 1431, 1432, 1449, 1435, - 1436, 1437, 1438, 1439, 1450, 1451, 1440, 1441, 1442, 1453, - 1454, 1455, 1456, 1443, 1444, 1445, 1457, 1459, 1461, 1462, - - 1447, 1448, 1463, 1464, 1465, 1449, 1466, 1467, 1468, 1469, - 1470, 1450, 1451, 1471, 1472, 1473, 1453, 1454, 1455, 1456, - 1474, 1475, 1476, 1457, 1459, 1461, 1462, 1477, 1478, 1463, - 1464, 1465, 1479, 1466, 1467, 1468, 1469, 1470, 1480, 1481, - 1471, 1472, 1473, 1482, 1483, 1484, 1485, 1474, 1475, 1476, - 1486, 1487, 1488, 1489, 1477, 1478, 1490, 1491, 1492, 1479, - 1493, 1494, 1495, 1496, 1497, 1480, 1481, 1498, 1499, 1500, - 1482, 1483, 1484, 1485, 1501, 1502, 1503, 1486, 1487, 1488, - 1489, 1504, 1505, 1490, 1491, 1492, 1506, 1493, 1494, 1495, - 1496, 1497, 1507, 1508, 1498, 1499, 1500, 1509, 1510, 1511, - - 1512, 1501, 1502, 1503, 1513, 1514, 1515, 1516, 1504, 1505, - 1517, 1518, 1519, 1506, 1520, 1521, 1522, 1523, 1525, 1507, - 1508, 1526, 1527, 1528, 1509, 1510, 1511, 1512, 1529, 1530, - 1531, 1513, 1514, 1515, 1516, 1532, 1533, 1517, 1518, 1519, - 1534, 1520, 1521, 1522, 1523, 1525, 1535, 1536, 1526, 1527, - 1528, 1537, 1538, 1539, 1540, 1529, 1530, 1531, 1541, 1542, - 1543, 1544, 1532, 1533, 1545, 1546, 1547, 1534, 1548, 1549, - 1550, 1551, 1552, 1535, 1536, 1554, 1555, 1556, 1537, 1538, - 1539, 1540, 1557, 1558, 1559, 1541, 1542, 1543, 1544, 1560, - 1561, 1545, 1546, 1547, 1562, 1548, 1549, 1550, 1551, 1552, - - 1563, 1564, 1554, 1555, 1556, 1565, 1566, 1567, 1569, 1557, - 1558, 1559, 1570, 1571, 1572, 1573, 1560, 1561, 1574, 1575, - 1576, 1562, 1577, 1578, 1579, 1205, 1187, 1563, 1564, 1185, - 1184, 1178, 1565, 1566, 1567, 1569, 1168, 1166, 1150, 1570, - 1571, 1572, 1573, 1149, 1146, 1574, 1575, 1576, 1020, 1577, - 1578, 1579, 39, 39, 1020, 1018, 1018, 1084, 1082, 1081, - 1076, 1070, 1062, 1055, 1050, 1044, 1025, 1024, 1023, 1020, - 1018, 1009, 994, 961, 908, 905, 903, 900, 899, 898, - 897, 896, 862, 861, 858, 817, 810, 809, 808, 806, - 785, 783, 775, 755, 743, 707, 702, 700, 698, 689, - - 687, 669, 664, 649, 643, 641, 614, 580, 578, 577, - 562, 530, 516, 515, 508, 494, 485, 483, 471, 449, - 445, 443, 438, 418, 409, 402, 361, 327, 311, 273, - 245, 37, 37, 1580, 3, 1580, 1580, 1580, 1580, 1580, + 1350, 151, 152, 150, 158, 100, 153, 156, 159, 160, + + 1339, 101, 110, 161, 154, 111, 112, 148, 113, 155, + 1333, 157, 114, 115, 116, 162, 117, 118, 151, 152, + 168, 1324, 1321, 153, 156, 163, 169, 164, 1320, 110, + 170, 154, 111, 112, 1319, 113, 155, 166, 157, 114, + 115, 116, 165, 117, 118, 119, 167, 168, 120, 121, + 171, 175, 163, 169, 164, 122, 123, 170, 176, 173, + 179, 172, 124, 180, 166, 174, 177, 181, 178, 165, + 182, 183, 119, 167, 184, 120, 121, 171, 175, 185, + 186, 187, 122, 123, 188, 176, 173, 179, 172, 124, + 180, 189, 174, 177, 181, 178, 190, 182, 183, 191, + + 193, 184, 195, 192, 196, 194, 185, 186, 187, 197, + 201, 188, 198, 202, 205, 208, 209, 213, 189, 203, + 206, 214, 199, 190, 1318, 1315, 191, 193, 200, 195, + 192, 196, 194, 207, 204, 210, 197, 201, 215, 198, + 202, 205, 208, 209, 213, 216, 203, 206, 214, 199, + 224, 211, 212, 1304, 229, 200, 1299, 233, 225, 1287, + 1286, 204, 210, 234, 231, 215, 235, 237, 230, 226, + 238, 1273, 216, 227, 239, 228, 236, 224, 211, 212, + 217, 229, 218, 219, 233, 225, 232, 220, 240, 221, + 234, 231, 222, 235, 237, 230, 226, 238, 223, 241, + + 227, 239, 228, 236, 242, 243, 245, 217, 246, 218, + 219, 253, 1243, 232, 220, 240, 221, 254, 255, 222, + 1224, 259, 260, 262, 256, 223, 241, 257, 263, 264, + 258, 242, 243, 245, 265, 246, 247, 266, 253, 248, + 261, 269, 270, 271, 254, 255, 249, 250, 259, 260, + 262, 256, 273, 251, 257, 263, 264, 258, 267, 252, + 274, 265, 275, 247, 266, 268, 248, 261, 269, 270, + 271, 276, 277, 249, 250, 278, 279, 280, 281, 273, + 251, 282, 283, 284, 285, 267, 252, 274, 286, 275, + 287, 288, 268, 289, 290, 291, 292, 293, 276, 277, + + 294, 295, 278, 279, 280, 281, 296, 299, 282, 283, + 284, 285, 297, 300, 301, 286, 302, 287, 288, 303, + 289, 290, 291, 292, 293, 298, 304, 294, 295, 305, + 306, 307, 308, 296, 299, 310, 311, 314, 315, 297, + 300, 301, 316, 302, 318, 317, 303, 319, 320, 321, + 322, 323, 298, 304, 324, 326, 305, 306, 307, 308, + 327, 328, 310, 311, 314, 315, 330, 329, 331, 316, + 332, 318, 317, 333, 319, 320, 321, 322, 323, 334, + 335, 324, 326, 336, 337, 338, 343, 327, 328, 344, + 345, 339, 346, 330, 347, 331, 348, 332, 340, 349, + + 333, 350, 351, 341, 352, 353, 334, 335, 342, 354, + 336, 337, 338, 343, 355, 356, 344, 345, 339, 346, + 357, 347, 358, 348, 360, 340, 349, 361, 350, 351, + 341, 352, 353, 362, 363, 342, 354, 364, 365, 366, + 367, 355, 356, 368, 369, 370, 372, 357, 373, 358, + 371, 360, 374, 375, 361, 376, 379, 380, 377, 381, + 362, 363, 382, 383, 364, 365, 366, 367, 378, 384, + 368, 369, 370, 372, 385, 373, 386, 389, 387, 374, + 375, 390, 376, 379, 380, 377, 381, 388, 391, 382, + 383, 392, 393, 394, 395, 378, 384, 396, 397, 398, + + 399, 385, 401, 386, 389, 387, 402, 403, 390, 404, + 405, 406, 408, 409, 410, 391, 411, 412, 392, 393, + 394, 395, 413, 414, 396, 397, 398, 399, 415, 401, + 417, 418, 419, 402, 403, 420, 404, 405, 406, 408, + 409, 410, 421, 411, 412, 422, 423, 424, 425, 413, + 414, 426, 427, 428, 429, 415, 430, 417, 418, 419, + 434, 436, 420, 432, 437, 438, 439, 441, 443, 421, + 431, 444, 422, 423, 424, 425, 433, 445, 426, 427, + 428, 429, 447, 430, 448, 449, 450, 434, 436, 1212, + 432, 437, 438, 439, 441, 443, 460, 431, 444, 461, + + 1205, 462, 463, 465, 445, 466, 1196, 464, 467, 447, + 469, 448, 449, 450, 451, 452, 453, 470, 471, 472, + 454, 473, 455, 460, 474, 456, 461, 457, 462, 463, + 465, 475, 466, 458, 464, 467, 459, 469, 1178, 476, + 481, 451, 452, 453, 470, 471, 472, 454, 473, 455, + 483, 474, 456, 484, 457, 485, 486, 477, 475, 487, + 458, 478, 488, 459, 489, 479, 476, 481, 490, 492, + 493, 494, 1176, 499, 500, 501, 502, 483, 503, 504, + 484, 495, 485, 486, 477, 509, 487, 510, 478, 488, + 496, 489, 506, 507, 497, 490, 492, 493, 494, 498, + + 499, 500, 501, 502, 511, 503, 504, 514, 508, 515, + 516, 517, 509, 518, 510, 519, 520, 496, 521, 506, + 507, 497, 522, 523, 525, 526, 498, 528, 529, 530, + 524, 511, 531, 532, 514, 508, 515, 516, 517, 533, + 518, 534, 519, 520, 535, 521, 538, 539, 536, 522, + 523, 525, 526, 537, 528, 529, 530, 524, 540, 531, + 532, 541, 542, 543, 544, 545, 533, 546, 534, 547, + 548, 535, 549, 538, 539, 536, 550, 551, 552, 553, + 537, 554, 555, 556, 557, 540, 559, 560, 541, 542, + 543, 544, 545, 561, 546, 562, 547, 548, 563, 549, + + 566, 567, 564, 550, 551, 552, 553, 568, 554, 555, + 556, 557, 565, 559, 560, 569, 570, 571, 572, 575, + 561, 577, 562, 578, 579, 563, 580, 566, 567, 564, + 581, 582, 584, 585, 568, 583, 586, 587, 589, 565, + 591, 592, 569, 570, 571, 572, 575, 593, 577, 588, + 578, 579, 590, 580, 594, 595, 596, 581, 582, 584, + 585, 597, 583, 586, 587, 589, 598, 591, 592, 599, + 600, 602, 603, 604, 593, 605, 588, 601, 606, 590, + 607, 594, 595, 596, 608, 609, 611, 615, 597, 612, + 613, 618, 616, 598, 620, 614, 599, 600, 602, 603, + + 604, 621, 605, 617, 601, 606, 622, 607, 619, 625, + 626, 608, 609, 611, 615, 627, 612, 613, 618, 616, + 623, 620, 614, 624, 628, 631, 629, 632, 621, 630, + 617, 633, 634, 622, 635, 619, 625, 626, 636, 638, + 643, 640, 627, 644, 646, 641, 647, 623, 642, 648, + 624, 628, 631, 629, 632, 649, 630, 650, 633, 634, + 651, 635, 652, 653, 654, 636, 638, 643, 640, 655, + 644, 646, 641, 647, 656, 642, 648, 657, 658, 659, + 661, 662, 649, 663, 650, 664, 666, 651, 667, 652, + 653, 654, 668, 669, 672, 673, 655, 674, 670, 675, + + 676, 656, 677, 678, 657, 658, 659, 661, 662, 679, + 663, 680, 664, 666, 681, 667, 671, 682, 684, 668, + 669, 672, 673, 686, 674, 670, 675, 676, 687, 677, + 678, 688, 694, 689, 690, 696, 679, 698, 680, 701, + 699, 681, 691, 703, 682, 684, 704, 692, 705, 706, + 686, 700, 707, 708, 709, 687, 710, 711, 688, 694, + 689, 690, 696, 712, 698, 713, 701, 699, 714, 691, + 703, 715, 718, 704, 692, 705, 706, 719, 700, 707, + 708, 709, 716, 710, 711, 720, 721, 722, 723, 717, + 712, 724, 713, 725, 726, 714, 727, 728, 715, 718, + + 729, 730, 731, 732, 719, 733, 734, 735, 736, 716, + 737, 739, 720, 721, 722, 723, 717, 740, 724, 741, + 725, 726, 742, 727, 728, 743, 744, 729, 730, 731, + 732, 745, 733, 734, 735, 736, 746, 737, 739, 747, + 748, 749, 751, 752, 740, 753, 741, 754, 755, 742, + 756, 757, 743, 744, 758, 759, 760, 761, 745, 762, + 763, 764, 765, 746, 766, 767, 747, 748, 749, 751, + 752, 768, 753, 769, 754, 755, 771, 756, 757, 1175, + 777, 758, 759, 760, 761, 779, 762, 763, 764, 765, + 781, 766, 767, 782, 783, 772, 784, 785, 768, 773, + + 769, 774, 786, 771, 787, 775, 776, 777, 788, 789, + 790, 791, 779, 792, 793, 794, 795, 781, 796, 797, + 782, 783, 772, 784, 785, 798, 773, 799, 774, 786, + 800, 787, 775, 776, 802, 788, 789, 790, 791, 806, + 792, 793, 794, 795, 807, 796, 797, 808, 809, 810, + 812, 815, 798, 813, 799, 816, 817, 800, 818, 819, + 820, 802, 821, 814, 822, 823, 806, 824, 825, 826, + 827, 807, 828, 829, 808, 809, 810, 812, 815, 830, + 813, 831, 816, 817, 832, 818, 819, 820, 833, 821, + 814, 822, 823, 834, 824, 825, 826, 827, 835, 828, + + 829, 836, 837, 838, 839, 840, 830, 841, 831, 842, + 843, 832, 844, 845, 846, 833, 847, 848, 849, 850, + 834, 851, 853, 854, 857, 835, 858, 859, 836, 837, + 838, 839, 840, 860, 841, 861, 842, 843, 862, 844, + 845, 846, 863, 847, 848, 849, 850, 864, 851, 853, + 854, 857, 865, 858, 859, 866, 867, 868, 869, 870, + 860, 871, 861, 872, 873, 862, 874, 875, 876, 863, + 877, 878, 879, 880, 864, 881, 882, 883, 884, 865, + 885, 886, 866, 867, 868, 869, 870, 887, 871, 888, + 872, 873, 889, 874, 875, 876, 895, 877, 878, 879, + + 880, 896, 881, 882, 883, 884, 898, 885, 886, 900, + 901, 906, 907, 908, 887, 909, 888, 910, 911, 889, + 912, 913, 914, 895, 916, 920, 917, 921, 896, 922, + 923, 918, 924, 898, 925, 915, 900, 901, 906, 907, + 908, 926, 909, 919, 910, 911, 927, 912, 913, 914, + 928, 916, 920, 917, 921, 929, 922, 923, 918, 924, + 930, 925, 915, 931, 932, 933, 934, 935, 926, 936, + 919, 937, 938, 927, 939, 940, 941, 928, 942, 943, + 944, 945, 929, 946, 947, 948, 949, 930, 950, 951, + 931, 932, 933, 934, 935, 952, 936, 953, 937, 938, + + 955, 939, 940, 941, 956, 942, 943, 944, 945, 957, + 946, 947, 948, 949, 958, 950, 951, 959, 960, 961, + 962, 965, 952, 963, 953, 966, 967, 955, 968, 969, + 970, 956, 971, 964, 972, 973, 957, 974, 975, 976, + 977, 958, 978, 979, 959, 960, 961, 962, 965, 980, + 963, 981, 966, 967, 982, 968, 969, 970, 983, 971, + 964, 972, 973, 984, 974, 975, 976, 977, 985, 978, + 979, 986, 988, 989, 990, 991, 980, 992, 981, 993, + 994, 982, 995, 996, 997, 983, 998, 999, 1000, 1001, + 984, 1003, 1004, 1005, 1006, 985, 1007, 1008, 986, 988, + + 989, 990, 991, 1009, 992, 1014, 993, 994, 1015, 995, + 996, 997, 1019, 998, 999, 1000, 1001, 1020, 1003, 1004, + 1005, 1006, 1021, 1007, 1008, 903, 1022, 904, 1023, 1024, + 1009, 1025, 1014, 1026, 1027, 1015, 1028, 905, 1029, 1019, + 1030, 1031, 1032, 1033, 1020, 1034, 1035, 1037, 1038, 1021, + 1039, 1040, 1041, 1022, 1045, 1023, 1024, 1046, 1025, 1048, + 1026, 1027, 1043, 1028, 1049, 1029, 1044, 1030, 1031, 1032, + 1033, 1050, 1034, 1035, 1037, 1038, 1051, 1039, 1040, 1041, + 1052, 1045, 1053, 1055, 1046, 1056, 1048, 1057, 1060, 1043, + 1061, 1049, 1063, 1044, 1064, 1065, 1058, 1066, 1050, 1067, + + 1069, 1070, 1071, 1051, 1059, 1072, 1075, 1052, 1077, 1053, + 1055, 1078, 1056, 1079, 1057, 1060, 1080, 1061, 1081, 1063, + 1082, 1064, 1065, 1058, 1066, 1083, 1067, 1069, 1070, 1071, + 1084, 1059, 1072, 1075, 1085, 1077, 1086, 1087, 1078, 1088, + 1079, 1089, 1090, 1080, 1091, 1081, 1092, 1082, 1093, 1094, + 1095, 1096, 1083, 1097, 1098, 1099, 1100, 1084, 1101, 1102, + 1103, 1085, 1104, 1086, 1087, 1105, 1088, 1106, 1089, 1090, + 1107, 1091, 1108, 1092, 1109, 1093, 1094, 1095, 1096, 1110, + 1097, 1098, 1099, 1100, 1111, 1101, 1102, 1103, 1112, 1104, + 1113, 1114, 1105, 1115, 1106, 1116, 1117, 1107, 1118, 1108, + + 1119, 1109, 1120, 1121, 1122, 1123, 1110, 1124, 1125, 1126, + 1127, 1111, 1128, 1129, 1130, 1112, 1131, 1113, 1114, 1132, + 1115, 1133, 1116, 1117, 1134, 1118, 1135, 1119, 1136, 1120, + 1121, 1122, 1123, 1138, 1124, 1125, 1126, 1127, 1139, 1128, + 1129, 1130, 1142, 1131, 1143, 1144, 1132, 1145, 1133, 1146, + 1147, 1134, 1148, 1135, 1149, 1136, 1150, 1151, 1152, 1153, + 1138, 1154, 1155, 1156, 1158, 1139, 1160, 1161, 1162, 1142, + 1163, 1143, 1144, 1164, 1145, 1165, 1146, 1147, 1166, 1148, + 1167, 1149, 1168, 1150, 1151, 1152, 1153, 1170, 1154, 1155, + 1156, 1158, 1171, 1160, 1161, 1162, 1172, 1163, 1173, 1174, + + 1164, 1177, 1165, 1179, 1180, 1166, 1181, 1167, 1182, 1168, + 1183, 1184, 1185, 1186, 1170, 1187, 1188, 1189, 1190, 1171, + 1191, 1192, 1193, 1172, 1194, 1173, 1174, 1195, 1177, 1197, + 1179, 1180, 1198, 1181, 1199, 1182, 1200, 1183, 1184, 1185, + 1186, 1201, 1187, 1188, 1189, 1190, 1202, 1191, 1192, 1193, + 1203, 1194, 1204, 1206, 1195, 1207, 1197, 1208, 1209, 1198, + 1210, 1199, 1211, 1200, 1213, 1216, 1214, 1217, 1201, 1218, + 1219, 1220, 1222, 1202, 1215, 1223, 1225, 1203, 1226, 1204, + 1206, 1227, 1207, 1228, 1208, 1209, 1229, 1210, 1221, 1211, + 1230, 1213, 1216, 1214, 1217, 1231, 1218, 1219, 1220, 1222, + + 1232, 1233, 1223, 1225, 1234, 1226, 1235, 1236, 1227, 1239, + 1228, 1240, 1237, 1229, 1241, 1221, 1242, 1230, 1238, 1244, + 1245, 1246, 1231, 1247, 1248, 1249, 1250, 1232, 1233, 1251, + 1252, 1234, 1253, 1235, 1236, 1254, 1239, 1255, 1240, 1237, + 1256, 1241, 1257, 1242, 1258, 1238, 1244, 1245, 1246, 1259, + 1247, 1248, 1249, 1250, 1260, 1261, 1251, 1252, 1262, 1253, + 1263, 1264, 1254, 1265, 1255, 1266, 1267, 1256, 1268, 1257, + 1269, 1258, 1270, 1271, 1272, 1274, 1259, 1275, 1276, 1277, + 1278, 1260, 1261, 1279, 1280, 1262, 1281, 1263, 1264, 1282, + 1265, 1283, 1266, 1267, 1284, 1268, 1285, 1269, 1288, 1270, + + 1271, 1272, 1274, 1289, 1275, 1276, 1277, 1278, 1290, 1291, + 1279, 1280, 1292, 1281, 1293, 1294, 1282, 1295, 1283, 1296, + 1297, 1284, 1298, 1285, 1300, 1288, 1301, 1302, 1303, 1305, + 1289, 1306, 1307, 1308, 1309, 1290, 1291, 1310, 1311, 1292, + 1312, 1293, 1294, 1313, 1295, 1314, 1296, 1297, 1316, 1298, + 1317, 1300, 1322, 1301, 1302, 1303, 1305, 1323, 1306, 1307, + 1308, 1309, 1325, 1326, 1310, 1311, 1327, 1312, 1328, 1329, + 1313, 1330, 1314, 1331, 1332, 1316, 1334, 1317, 1335, 1322, + 1336, 1337, 1338, 1340, 1323, 1341, 1342, 1343, 1344, 1325, + 1326, 1345, 1346, 1327, 1347, 1328, 1329, 1348, 1330, 1349, + + 1331, 1332, 1351, 1334, 1352, 1335, 1353, 1336, 1337, 1338, + 1340, 1354, 1341, 1342, 1343, 1344, 1355, 1356, 1345, 1346, + 1357, 1347, 1358, 1359, 1348, 1360, 1349, 1361, 1362, 1351, + 1363, 1352, 1364, 1353, 1365, 1366, 1367, 1368, 1354, 1369, + 1370, 1371, 1372, 1355, 1356, 1373, 1375, 1357, 1376, 1358, + 1359, 1377, 1360, 1379, 1361, 1362, 1380, 1363, 1381, 1364, + 1382, 1365, 1366, 1367, 1368, 1383, 1369, 1370, 1371, 1372, + 1385, 1387, 1373, 1375, 1388, 1376, 1390, 1391, 1377, 1392, + 1379, 1393, 1394, 1380, 1395, 1381, 1396, 1382, 1397, 1399, + 1400, 1401, 1383, 1402, 1398, 1403, 1404, 1385, 1387, 1405, + + 1406, 1388, 1407, 1390, 1391, 1408, 1392, 1409, 1393, 1394, + 1411, 1395, 1412, 1396, 1413, 1397, 1399, 1400, 1401, 1414, + 1402, 1398, 1403, 1404, 1415, 1416, 1405, 1406, 1417, 1407, + 1418, 1419, 1408, 1420, 1409, 1421, 1422, 1411, 1423, 1412, + 1426, 1413, 1427, 1428, 1429, 1430, 1414, 1431, 1432, 1433, + 1434, 1415, 1416, 1435, 1436, 1417, 1438, 1418, 1419, 1439, + 1420, 1440, 1421, 1422, 1441, 1423, 1442, 1426, 1444, 1427, + 1428, 1429, 1430, 1445, 1431, 1432, 1433, 1434, 1446, 1447, + 1435, 1436, 1448, 1438, 1450, 1452, 1439, 1453, 1440, 1454, + 1455, 1441, 1456, 1442, 1457, 1444, 1458, 1459, 1460, 1461, + + 1445, 1462, 1463, 1464, 1465, 1446, 1447, 1466, 1467, 1448, + 1468, 1450, 1452, 1469, 1453, 1470, 1454, 1455, 1471, 1456, + 1472, 1457, 1473, 1458, 1459, 1460, 1461, 1474, 1462, 1463, + 1464, 1465, 1475, 1476, 1466, 1467, 1477, 1468, 1478, 1479, + 1469, 1480, 1470, 1481, 1482, 1471, 1483, 1472, 1484, 1473, + 1485, 1486, 1487, 1488, 1474, 1489, 1490, 1491, 1492, 1475, + 1476, 1493, 1494, 1477, 1495, 1478, 1479, 1496, 1480, 1497, + 1481, 1482, 1498, 1483, 1499, 1484, 1500, 1485, 1486, 1487, + 1488, 1501, 1489, 1490, 1491, 1492, 1502, 1503, 1493, 1494, + 1504, 1495, 1505, 1506, 1496, 1507, 1497, 1508, 1509, 1498, + + 1510, 1499, 1511, 1500, 1512, 1513, 1514, 1516, 1501, 1517, + 1518, 1519, 1520, 1502, 1503, 1521, 1522, 1504, 1523, 1505, + 1506, 1524, 1507, 1525, 1508, 1509, 1526, 1510, 1527, 1511, + 1528, 1512, 1513, 1514, 1516, 1529, 1517, 1518, 1519, 1520, + 1530, 1531, 1521, 1522, 1532, 1523, 1533, 1534, 1524, 1535, + 1525, 1536, 1537, 1526, 1538, 1527, 1539, 1528, 1540, 1541, + 1542, 1543, 1529, 1544, 1545, 1547, 1548, 1530, 1531, 1549, + 1550, 1532, 1551, 1533, 1534, 1552, 1535, 1553, 1536, 1537, + 1554, 1538, 1555, 1539, 1556, 1540, 1541, 1542, 1543, 1557, + 1544, 1545, 1547, 1548, 1558, 1559, 1549, 1550, 1560, 1551, + + 1561, 1562, 1552, 1564, 1553, 1565, 1566, 1554, 1567, 1555, + 1568, 1556, 1569, 1570, 1571, 1572, 1557, 1573, 1574, 1575, + 1576, 1558, 1559, 1577, 1578, 1560, 1579, 1561, 1562, 1169, + 1564, 1159, 1565, 1566, 1157, 1567, 1141, 1568, 1140, 1569, + 1570, 1571, 1572, 1137, 1573, 1574, 1575, 1576, 1013, 1013, + 1577, 1578, 1011, 1579, 39, 39, 1011, 1076, 1074, 1073, + 1068, 1062, 1054, 1047, 1042, 1036, 1018, 1017, 1016, 1013, + 1011, 1002, 987, 954, 902, 899, 897, 894, 893, 892, + 891, 890, 856, 855, 852, 811, 805, 804, 803, 801, + 780, 778, 770, 750, 738, 702, 697, 695, 693, 685, + + 683, 665, 660, 645, 639, 637, 610, 576, 574, 573, + 558, 527, 513, 512, 505, 491, 482, 480, 468, 446, + 442, 440, 435, 416, 407, 400, 359, 325, 309, 272, + 244, 37, 37, 1580, 3, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, @@ -1306,330 +1306,330 @@ static yyconst flex_int16_t yy_chk[3104] = 1, 1, 1, 1, 1, 1, 1, 1, 7, 7, 9, 10, 13, 10, 11, 11, 11, 11, 11, 16, 21, 1585, 13, 26, 1584, 16, 16, 9, 39, 39, - 15, 795, 28, 795, 15, 18, 16, 1583, 15, 13, + 15, 790, 28, 790, 15, 18, 16, 1583, 15, 13, - 17, 15, 18, 795, 15, 1581, 16, 21, 17, 13, + 17, 15, 18, 790, 15, 1581, 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, 1562, 17, 1539, 20, 17, 20, - 19, 1503, 12, 12, 33, 12, 19, 17, 183, 183, - 1420, 12, 19, 12, 35, 1388, 1388, 20, 29, 19, - 12, 14, 29, 14, 20, 1418, 20, 19, 14, 14, + 20, 15, 19, 12, 1556, 17, 1531, 20, 17, 20, + 19, 1494, 12, 12, 33, 12, 19, 17, 182, 182, + 1411, 12, 19, 12, 35, 1379, 1379, 20, 29, 19, + 12, 14, 29, 14, 20, 1409, 20, 19, 14, 14, 22, 33, 14, 19, 23, 14, 29, 22, 23, 19, - 22, 35, 22, 34, 23, 29, 1411, 34, 14, 29, - 14, 1404, 27, 1372, 36, 14, 14, 22, 43, 14, + 22, 35, 22, 34, 23, 29, 1402, 34, 14, 29, + 14, 1395, 27, 1363, 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, 1350, 48, 24, 32, 32, 55, 24, 55, 49, + 24, 1341, 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, 1347, - 1344, 65, 66, 55, 25, 55, 67, 1338, 1332, 56, + 59, 51, 25, 52, 53, 54, 61, 64, 25, 1338, + 1335, 65, 66, 55, 25, 55, 67, 1329, 1323, 56, 59, 25, 57, 25, 58, 25, 60, 59, 68, 25, - 1301, 62, 62, 61, 64, 25, 62, 63, 65, 66, - - 1289, 25, 30, 67, 62, 30, 30, 59, 30, 62, - 1281, 63, 30, 30, 30, 68, 30, 30, 62, 62, - 72, 1270, 1267, 62, 63, 69, 1266, 69, 1265, 30, - 73, 62, 30, 30, 1264, 30, 62, 70, 63, 30, - 30, 30, 69, 30, 30, 31, 70, 72, 31, 31, - 74, 71, 69, 71, 69, 31, 31, 73, 76, 75, - 77, 74, 31, 79, 70, 75, 78, 80, 78, 69, - 81, 82, 31, 70, 83, 31, 31, 74, 71, 84, - 71, 85, 31, 31, 86, 76, 75, 77, 74, 31, - 79, 87, 75, 78, 80, 78, 88, 81, 82, 89, - - 91, 83, 92, 90, 89, 91, 84, 90, 85, 93, - 94, 86, 95, 96, 97, 99, 101, 102, 87, 104, - 98, 1261, 95, 88, 105, 100, 89, 91, 95, 92, - 90, 89, 91, 106, 90, 98, 93, 94, 100, 95, - 96, 97, 99, 101, 102, 107, 104, 98, 103, 95, - 109, 105, 100, 111, 113, 95, 114, 112, 116, 110, - 106, 115, 98, 117, 103, 103, 909, 111, 909, 1248, - 110, 115, 107, 1243, 110, 103, 110, 109, 909, 112, - 111, 113, 118, 114, 112, 116, 110, 119, 115, 120, - 117, 103, 103, 108, 111, 108, 108, 110, 115, 121, - - 108, 110, 108, 110, 122, 108, 112, 124, 125, 118, - 127, 108, 1228, 128, 119, 1227, 120, 131, 129, 133, - 108, 1209, 108, 108, 129, 130, 121, 108, 130, 108, - 132, 122, 108, 134, 124, 125, 135, 127, 108, 126, - 128, 136, 126, 138, 131, 129, 133, 139, 132, 126, - 126, 129, 130, 140, 139, 130, 126, 132, 141, 142, - 134, 144, 126, 135, 145, 146, 126, 147, 136, 126, - 138, 148, 149, 150, 139, 132, 126, 126, 151, 152, - 140, 139, 153, 126, 154, 141, 142, 155, 144, 126, - 157, 145, 146, 158, 147, 159, 160, 161, 148, 149, - - 150, 162, 163, 164, 165, 151, 152, 166, 167, 153, - 168, 154, 169, 170, 155, 171, 172, 157, 173, 174, - 158, 175, 159, 160, 161, 176, 170, 178, 162, 163, - 164, 165, 177, 177, 166, 167, 179, 168, 181, 169, - 170, 182, 171, 172, 184, 173, 174, 185, 175, 187, - 188, 189, 176, 170, 178, 186, 190, 191, 186, 177, - 177, 192, 194, 179, 196, 181, 197, 198, 182, 199, - 200, 184, 201, 198, 185, 202, 187, 188, 189, 203, - 204, 205, 186, 190, 191, 186, 206, 207, 192, 194, - 209, 196, 210, 197, 198, 211, 199, 200, 208, 201, - - 212, 213, 202, 214, 215, 208, 203, 204, 205, 216, - 208, 217, 218, 206, 207, 208, 219, 209, 220, 210, - 221, 223, 211, 226, 224, 208, 224, 212, 213, 227, - 214, 215, 208, 228, 230, 231, 216, 208, 217, 218, - 233, 234, 208, 219, 235, 220, 236, 221, 223, 238, - 226, 224, 239, 224, 240, 241, 227, 239, 242, 243, - 228, 230, 231, 244, 245, 246, 247, 233, 234, 248, - 249, 235, 250, 236, 245, 251, 238, 252, 253, 239, - 254, 240, 241, 255, 256, 242, 243, 257, 258, 254, - 244, 245, 246, 247, 259, 260, 248, 249, 261, 250, - - 263, 245, 251, 264, 252, 253, 265, 254, 266, 269, - 255, 256, 271, 272, 257, 258, 273, 274, 275, 277, - 278, 259, 260, 279, 282, 261, 283, 263, 285, 286, - 264, 287, 289, 265, 290, 266, 269, 291, 292, 271, - 272, 293, 294, 273, 274, 275, 277, 278, 295, 296, - 279, 282, 298, 283, 299, 285, 286, 300, 287, 289, - 302, 290, 303, 304, 291, 292, 305, 307, 293, 294, - 306, 310, 311, 312, 313, 295, 296, 317, 319, 298, - 305, 299, 320, 306, 300, 321, 323, 302, 324, 303, - 304, 325, 326, 305, 307, 1177, 328, 306, 310, 311, - - 312, 313, 329, 330, 317, 319, 1152, 305, 332, 320, - 333, 331, 321, 323, 336, 324, 331, 338, 325, 326, - 327, 327, 327, 328, 340, 341, 327, 342, 327, 329, - 330, 327, 343, 327, 344, 332, 345, 333, 331, 327, - 348, 336, 327, 331, 338, 1141, 346, 327, 327, 327, - 352, 340, 341, 327, 342, 327, 353, 354, 327, 343, - 327, 344, 355, 345, 346, 356, 327, 348, 346, 327, - 357, 358, 346, 346, 359, 361, 362, 352, 363, 365, - 366, 364, 368, 353, 354, 364, 369, 370, 363, 355, - 364, 346, 356, 371, 374, 346, 375, 357, 358, 373, - - 373, 359, 361, 362, 376, 363, 365, 366, 364, 368, - 379, 380, 364, 369, 370, 373, 382, 364, 383, 384, - 371, 374, 385, 375, 386, 387, 373, 373, 388, 390, - 391, 376, 392, 394, 395, 396, 390, 379, 380, 397, - 398, 399, 373, 382, 400, 383, 384, 401, 402, 385, - 403, 386, 387, 402, 405, 388, 390, 391, 406, 392, - 394, 395, 396, 390, 408, 409, 397, 398, 399, 411, - 412, 400, 414, 415, 401, 402, 416, 403, 418, 419, - 402, 405, 421, 422, 423, 406, 424, 425, 426, 427, - 429, 408, 409, 431, 433, 434, 411, 412, 435, 414, - - 415, 436, 437, 416, 440, 418, 419, 441, 438, 421, - 422, 423, 442, 424, 425, 426, 427, 429, 438, 443, - 431, 433, 434, 444, 445, 435, 446, 449, 436, 437, - 451, 440, 452, 453, 441, 438, 454, 455, 456, 442, - 457, 458, 456, 459, 460, 438, 443, 461, 462, 463, - 444, 445, 464, 446, 449, 465, 460, 451, 466, 452, - 453, 461, 467, 454, 455, 456, 468, 457, 458, 456, - 459, 460, 469, 470, 461, 462, 463, 471, 472, 464, - 473, 474, 465, 460, 471, 466, 475, 476, 461, 467, - 477, 478, 479, 468, 481, 482, 482, 483, 484, 469, - - 470, 482, 486, 485, 471, 472, 487, 473, 474, 484, - 488, 471, 490, 475, 476, 490, 491, 477, 478, 479, - 485, 481, 482, 482, 483, 484, 492, 493, 482, 486, - 485, 494, 495, 487, 496, 495, 484, 488, 498, 490, - 499, 500, 490, 491, 501, 502, 505, 485, 509, 510, - 511, 513, 509, 492, 493, 509, 514, 516, 494, 495, - 517, 496, 495, 518, 519, 498, 520, 499, 500, 521, - 522, 501, 502, 505, 523, 509, 510, 511, 513, 509, - 524, 525, 509, 514, 516, 526, 527, 517, 529, 530, - 518, 519, 531, 520, 535, 537, 521, 522, 539, 540, - - 541, 523, 542, 543, 544, 545, 546, 524, 525, 547, - 548, 549, 526, 527, 550, 529, 530, 551, 552, 531, - 542, 535, 537, 553, 556, 539, 540, 541, 558, 542, - 543, 544, 545, 546, 559, 560, 547, 548, 549, 561, - 564, 550, 566, 1132, 551, 552, 568, 569, 570, 572, - 553, 556, 573, 575, 576, 558, 562, 562, 569, 577, - 578, 559, 560, 579, 580, 562, 561, 564, 584, 566, - 562, 585, 586, 568, 569, 570, 572, 587, 588, 573, - 575, 576, 589, 562, 562, 569, 577, 578, 590, 589, - 579, 580, 562, 591, 592, 584, 593, 562, 585, 586, - - 594, 595, 597, 598, 587, 588, 599, 600, 601, 589, - 603, 604, 605, 606, 607, 590, 589, 608, 609, 610, - 591, 592, 611, 593, 613, 614, 615, 594, 595, 597, - 598, 616, 617, 599, 600, 601, 618, 603, 604, 605, - 606, 607, 619, 621, 608, 609, 610, 622, 623, 611, - 624, 613, 614, 615, 627, 628, 630, 631, 616, 617, - 632, 633, 634, 618, 635, 636, 637, 637, 638, 619, - 621, 639, 641, 642, 622, 623, 643, 624, 644, 645, - 646, 627, 628, 630, 631, 648, 650, 632, 633, 634, - 652, 635, 636, 637, 637, 638, 654, 657, 639, 641, - - 642, 658, 659, 643, 649, 644, 645, 646, 649, 661, - 649, 662, 648, 650, 649, 649, 663, 652, 665, 666, - 668, 669, 670, 654, 657, 671, 672, 673, 658, 659, - 674, 649, 675, 676, 678, 649, 661, 649, 662, 680, - 682, 649, 649, 663, 686, 665, 666, 668, 669, 670, - 687, 688, 671, 672, 673, 689, 690, 674, 691, 675, - 676, 678, 694, 695, 696, 697, 680, 682, 698, 700, - 701, 686, 702, 695, 703, 704, 705, 687, 688, 706, - 707, 708, 689, 690, 709, 691, 710, 711, 712, 694, - 695, 696, 697, 713, 714, 698, 700, 701, 715, 702, - - 695, 703, 704, 705, 716, 717, 706, 707, 708, 718, - 719, 709, 720, 710, 711, 712, 721, 722, 723, 724, - 713, 714, 725, 726, 727, 715, 728, 729, 731, 732, - 735, 716, 717, 736, 738, 739, 718, 719, 742, 720, - 743, 744, 745, 721, 722, 723, 724, 746, 747, 725, - 726, 727, 748, 728, 729, 731, 732, 735, 749, 750, - 736, 738, 739, 751, 752, 742, 753, 743, 744, 745, - 754, 755, 756, 757, 746, 747, 758, 760, 761, 748, - 762, 764, 765, 766, 767, 749, 750, 768, 769, 770, - 751, 752, 771, 753, 772, 773, 774, 754, 755, 756, - - 757, 775, 776, 758, 760, 761, 782, 762, 764, 765, - 766, 767, 783, 785, 768, 769, 770, 789, 792, 771, - 796, 772, 773, 774, 797, 798, 799, 802, 775, 776, - 803, 804, 805, 782, 807, 806, 809, 810, 808, 783, - 785, 811, 812, 808, 789, 792, 814, 796, 806, 815, - 816, 797, 798, 799, 802, 808, 817, 803, 804, 805, - 818, 807, 806, 809, 810, 808, 819, 820, 811, 812, - 808, 821, 822, 814, 823, 806, 815, 816, 824, 825, - 826, 827, 808, 817, 828, 829, 831, 818, 832, 833, - 834, 835, 836, 819, 820, 837, 838, 839, 821, 822, - - 840, 823, 842, 843, 844, 824, 825, 826, 827, 845, - 847, 828, 829, 831, 849, 832, 833, 834, 835, 836, - 850, 851, 837, 838, 839, 852, 853, 840, 855, 842, - 843, 844, 856, 857, 858, 860, 845, 847, 861, 862, - 864, 849, 866, 868, 858, 869, 870, 850, 851, 871, - 873, 874, 852, 853, 875, 855, 876, 877, 878, 856, - 857, 858, 860, 879, 880, 861, 862, 864, 881, 866, - 868, 858, 869, 870, 882, 883, 871, 873, 874, 884, - 885, 875, 887, 876, 877, 878, 888, 889, 890, 891, - 879, 880, 892, 893, 894, 881, 895, 896, 897, 898, - - 899, 882, 883, 900, 902, 903, 884, 885, 904, 887, - 905, 906, 907, 888, 889, 890, 891, 908, 912, 892, - 893, 894, 913, 895, 896, 897, 898, 899, 918, 919, - 900, 902, 903, 920, 921, 904, 922, 905, 906, 907, - 923, 924, 925, 926, 908, 912, 927, 929, 930, 913, - 931, 932, 933, 934, 935, 918, 919, 936, 938, 939, - 920, 921, 940, 922, 941, 942, 945, 923, 924, 925, - 926, 946, 944, 927, 929, 930, 944, 931, 932, 933, - 934, 935, 948, 949, 936, 938, 939, 951, 952, 940, - 954, 941, 942, 945, 955, 957, 958, 962, 946, 944, - - 963, 967, 961, 944, 968, 969, 970, 971, 973, 948, - 949, 961, 974, 975, 951, 952, 976, 954, 979, 961, - 981, 955, 957, 958, 962, 983, 984, 963, 967, 961, - 988, 968, 969, 970, 971, 973, 989, 990, 961, 974, - 975, 991, 992, 976, 993, 979, 961, 981, 994, 995, - 996, 997, 983, 984, 998, 999, 1000, 988, 1001, 1002, - 1003, 1004, 1005, 989, 990, 1006, 1007, 1008, 991, 992, - 1009, 993, 1010, 1011, 1012, 994, 995, 996, 997, 1013, - 1015, 998, 999, 1000, 1016, 1001, 1002, 1003, 1004, 1005, - 1021, 1022, 1006, 1007, 1008, 1023, 1024, 1009, 1025, 1010, - - 1011, 1012, 1026, 1027, 1028, 1029, 1013, 1015, 1030, 1031, - 1032, 1016, 1033, 1034, 1035, 1036, 1037, 1021, 1022, 1039, - 1040, 1041, 1023, 1024, 1042, 1025, 1043, 1044, 1045, 1026, - 1027, 1028, 1029, 1046, 1047, 1030, 1031, 1032, 1049, 1033, - 1034, 1035, 1036, 1037, 1050, 1051, 1039, 1040, 1041, 1052, - 1054, 1042, 1055, 1043, 1044, 1045, 1058, 1059, 1060, 1062, - 1046, 1047, 1063, 1065, 1066, 1049, 1067, 1069, 1070, 1071, - 1073, 1050, 1051, 1074, 1075, 1076, 1052, 1054, 1078, 1055, - 1080, 1081, 1082, 1058, 1059, 1060, 1062, 1083, 1084, 1063, - 1065, 1066, 1085, 1067, 1069, 1070, 1071, 1073, 1087, 1088, - - 1074, 1075, 1076, 1089, 1091, 1078, 1094, 1080, 1081, 1082, - 1097, 1098, 1099, 1102, 1083, 1084, 1104, 1105, 1106, 1085, - 1107, 1108, 1109, 1110, 1111, 1087, 1088, 1112, 1113, 1114, - 1089, 1091, 1115, 1094, 1116, 1117, 1118, 1097, 1098, 1099, - 1102, 1119, 1120, 1104, 1105, 1106, 1123, 1107, 1108, 1109, - 1110, 1111, 1124, 1126, 1112, 1113, 1114, 1127, 1128, 1115, - 1129, 1116, 1117, 1118, 1130, 1131, 1134, 1135, 1119, 1120, - 1136, 1137, 1138, 1123, 1139, 1143, 1145, 1146, 1144, 1124, - 1126, 1147, 1148, 1149, 1127, 1128, 1144, 1129, 1150, 1151, - 1154, 1130, 1131, 1134, 1135, 1156, 1157, 1136, 1137, 1138, - - 1149, 1139, 1143, 1145, 1146, 1144, 1158, 1160, 1147, 1148, - 1149, 1161, 1162, 1163, 1164, 1150, 1151, 1154, 1165, 1166, - 1167, 1169, 1156, 1157, 1168, 1170, 1171, 1149, 1173, 1178, - 1168, 1179, 1180, 1158, 1160, 1181, 1182, 1183, 1161, 1162, - 1163, 1164, 1184, 1185, 1186, 1165, 1166, 1167, 1169, 1187, - 1188, 1168, 1170, 1171, 1189, 1173, 1178, 1168, 1179, 1180, - 1190, 1191, 1181, 1182, 1183, 1192, 1193, 1194, 1195, 1184, - 1185, 1186, 1196, 1197, 1199, 1200, 1187, 1188, 1201, 1202, - 1203, 1189, 1204, 1205, 1206, 1207, 1210, 1190, 1191, 1211, - 1214, 1215, 1192, 1193, 1194, 1195, 1216, 1219, 1220, 1196, - - 1197, 1199, 1200, 1221, 1222, 1201, 1202, 1203, 1224, 1204, - 1205, 1206, 1207, 1210, 1225, 1226, 1211, 1214, 1215, 1229, - 1230, 1231, 1233, 1216, 1219, 1220, 1234, 1235, 1236, 1237, - 1221, 1222, 1238, 1239, 1240, 1224, 1244, 1245, 1246, 1247, - 1249, 1225, 1226, 1250, 1251, 1252, 1229, 1230, 1231, 1233, - 1253, 1254, 1255, 1234, 1235, 1236, 1237, 1258, 1259, 1238, - 1239, 1240, 1260, 1244, 1245, 1246, 1247, 1249, 1262, 1263, - 1250, 1251, 1252, 1268, 1269, 1272, 1273, 1253, 1254, 1255, - 1274, 1276, 1277, 1278, 1258, 1259, 1279, 1280, 1282, 1260, - 1283, 1285, 1287, 1288, 1290, 1262, 1263, 1291, 1292, 1294, - - 1268, 1269, 1272, 1273, 1295, 1296, 1297, 1274, 1276, 1277, - 1278, 1298, 1299, 1279, 1280, 1282, 1300, 1283, 1285, 1287, - 1288, 1290, 1302, 1303, 1291, 1292, 1294, 1305, 1306, 1308, - 1309, 1295, 1296, 1297, 1311, 1313, 1314, 1315, 1298, 1299, - 1316, 1317, 1318, 1300, 1321, 1322, 1323, 1324, 1325, 1302, - 1303, 1326, 1327, 1328, 1305, 1306, 1308, 1309, 1329, 1330, - 1333, 1311, 1313, 1314, 1315, 1336, 1337, 1316, 1317, 1318, - 1340, 1321, 1322, 1323, 1324, 1325, 1341, 1343, 1326, 1327, - 1328, 1342, 1345, 1342, 1348, 1329, 1330, 1333, 1349, 1351, - 1353, 1354, 1336, 1337, 1355, 1356, 1357, 1340, 1358, 1359, - - 1360, 1361, 1362, 1341, 1343, 1359, 1363, 1364, 1342, 1345, - 1342, 1348, 1365, 1366, 1367, 1349, 1351, 1353, 1354, 1368, - 1370, 1355, 1356, 1357, 1371, 1358, 1359, 1360, 1361, 1362, - 1373, 1374, 1359, 1363, 1364, 1375, 1376, 1377, 1378, 1365, - 1366, 1367, 1379, 1380, 1381, 1382, 1368, 1370, 1383, 1384, - 1387, 1371, 1389, 1390, 1391, 1392, 1393, 1373, 1374, 1394, - 1396, 1397, 1375, 1376, 1377, 1378, 1398, 1401, 1402, 1379, - 1380, 1381, 1382, 1405, 1406, 1383, 1384, 1387, 1407, 1389, - 1390, 1391, 1392, 1393, 1408, 1410, 1394, 1396, 1397, 1412, - 1413, 1415, 1416, 1398, 1401, 1402, 1417, 1419, 1422, 1423, - - 1405, 1406, 1424, 1425, 1426, 1407, 1427, 1428, 1429, 1430, - 1431, 1408, 1410, 1432, 1435, 1436, 1412, 1413, 1415, 1416, - 1437, 1438, 1439, 1417, 1419, 1422, 1423, 1440, 1441, 1424, - 1425, 1426, 1443, 1427, 1428, 1429, 1430, 1431, 1444, 1446, - 1432, 1435, 1436, 1447, 1448, 1449, 1452, 1437, 1438, 1439, - 1453, 1455, 1458, 1459, 1440, 1441, 1460, 1461, 1462, 1443, - 1463, 1465, 1466, 1467, 1468, 1444, 1446, 1469, 1470, 1471, - 1447, 1448, 1449, 1452, 1472, 1473, 1474, 1453, 1455, 1458, - 1459, 1475, 1476, 1460, 1461, 1462, 1477, 1463, 1465, 1466, - 1467, 1468, 1478, 1479, 1469, 1470, 1471, 1480, 1481, 1482, - - 1483, 1472, 1473, 1474, 1484, 1485, 1486, 1487, 1475, 1476, - 1488, 1489, 1490, 1477, 1498, 1499, 1500, 1502, 1504, 1478, - 1479, 1505, 1507, 1508, 1480, 1481, 1482, 1483, 1509, 1510, - 1511, 1484, 1485, 1486, 1487, 1514, 1516, 1488, 1489, 1490, - 1517, 1498, 1499, 1500, 1502, 1504, 1518, 1519, 1505, 1507, - 1508, 1520, 1522, 1523, 1524, 1509, 1510, 1511, 1525, 1526, - 1527, 1528, 1514, 1516, 1529, 1530, 1532, 1517, 1533, 1534, - 1536, 1537, 1538, 1518, 1519, 1540, 1541, 1542, 1520, 1522, - 1523, 1524, 1543, 1546, 1547, 1525, 1526, 1527, 1528, 1548, - 1551, 1529, 1530, 1532, 1552, 1533, 1534, 1536, 1537, 1538, - - 1553, 1554, 1540, 1541, 1542, 1556, 1557, 1559, 1563, 1543, - 1546, 1547, 1564, 1565, 1568, 1569, 1548, 1551, 1570, 1572, - 1573, 1552, 1575, 1576, 1577, 1121, 1103, 1553, 1554, 1101, - 1100, 1090, 1556, 1557, 1559, 1563, 1079, 1077, 1057, 1564, - 1565, 1568, 1569, 1056, 1053, 1570, 1572, 1573, 1020, 1575, - 1576, 1577, 1582, 1582, 1019, 1018, 1017, 980, 978, 977, - 972, 964, 956, 947, 943, 937, 916, 915, 914, 911, - 910, 901, 886, 848, 794, 786, 784, 781, 780, 779, - 778, 777, 741, 740, 737, 692, 685, 684, 683, 681, - 653, 651, 647, 625, 612, 571, 567, 565, 563, 557, - - 554, 536, 528, 512, 506, 503, 480, 450, 448, 447, - 432, 393, 378, 377, 372, 360, 350, 347, 337, 322, - 318, 316, 308, 288, 276, 267, 225, 195, 180, 143, + 1292, 62, 62, 61, 64, 25, 62, 63, 65, 66, + + 1280, 25, 30, 67, 62, 30, 30, 59, 30, 62, + 1272, 63, 30, 30, 30, 68, 30, 30, 62, 62, + 71, 1261, 1258, 62, 63, 69, 72, 69, 1257, 30, + 73, 62, 30, 30, 1256, 30, 62, 70, 63, 30, + 30, 30, 69, 30, 30, 31, 70, 71, 31, 31, + 74, 76, 69, 72, 69, 31, 31, 73, 77, 75, + 79, 74, 31, 80, 70, 75, 78, 81, 78, 69, + 82, 83, 31, 70, 84, 31, 31, 74, 76, 85, + 86, 87, 31, 31, 88, 77, 75, 79, 74, 31, + 80, 89, 75, 78, 81, 78, 89, 82, 83, 90, + + 91, 84, 92, 90, 93, 91, 85, 86, 87, 94, + 96, 88, 95, 97, 99, 101, 102, 104, 89, 98, + 100, 105, 95, 89, 1255, 1252, 90, 91, 95, 92, + 90, 93, 91, 100, 98, 103, 94, 96, 106, 95, + 97, 99, 101, 102, 104, 107, 98, 100, 105, 95, + 109, 103, 103, 1239, 111, 95, 1234, 113, 110, 1219, + 1218, 98, 103, 114, 112, 106, 115, 116, 111, 110, + 117, 1200, 107, 110, 118, 110, 115, 109, 103, 103, + 108, 111, 108, 108, 113, 110, 112, 108, 119, 108, + 114, 112, 108, 115, 116, 111, 110, 117, 108, 120, + + 110, 118, 110, 115, 121, 122, 124, 108, 125, 108, + 108, 127, 1168, 112, 108, 119, 108, 128, 129, 108, + 1143, 131, 132, 133, 129, 108, 120, 130, 134, 135, + 130, 121, 122, 124, 136, 125, 126, 138, 127, 126, + 132, 140, 141, 142, 128, 129, 126, 126, 131, 132, + 133, 129, 144, 126, 130, 134, 135, 130, 139, 126, + 145, 136, 146, 126, 138, 139, 126, 132, 140, 141, + 142, 147, 148, 126, 126, 149, 150, 151, 152, 144, + 126, 153, 154, 155, 157, 139, 126, 145, 158, 146, + 159, 160, 139, 161, 162, 163, 164, 165, 147, 148, + + 166, 167, 149, 150, 151, 152, 168, 170, 153, 154, + 155, 157, 169, 171, 172, 158, 173, 159, 160, 174, + 161, 162, 163, 164, 165, 169, 175, 166, 167, 176, + 176, 177, 178, 168, 170, 180, 181, 183, 184, 169, + 171, 172, 185, 173, 186, 185, 174, 187, 188, 189, + 190, 191, 169, 175, 193, 195, 176, 176, 177, 178, + 196, 197, 180, 181, 183, 184, 198, 197, 199, 185, + 200, 186, 185, 201, 187, 188, 189, 190, 191, 202, + 203, 193, 195, 204, 205, 206, 208, 196, 197, 209, + 210, 207, 211, 198, 212, 199, 213, 200, 207, 214, + + 201, 215, 216, 207, 217, 218, 202, 203, 207, 219, + 204, 205, 206, 208, 220, 222, 209, 210, 207, 211, + 223, 212, 223, 213, 225, 207, 214, 226, 215, 216, + 207, 217, 218, 227, 229, 207, 219, 230, 232, 233, + 234, 220, 222, 235, 237, 238, 239, 223, 240, 223, + 238, 225, 241, 242, 226, 243, 245, 246, 244, 247, + 227, 229, 248, 249, 230, 232, 233, 234, 244, 250, + 235, 237, 238, 239, 251, 240, 252, 254, 253, 241, + 242, 255, 243, 245, 246, 244, 247, 253, 256, 248, + 249, 257, 258, 259, 260, 244, 250, 262, 263, 264, + + 265, 251, 268, 252, 254, 253, 270, 271, 255, 272, + 273, 274, 276, 277, 278, 256, 281, 282, 257, 258, + 259, 260, 284, 285, 262, 263, 264, 265, 286, 268, + 288, 289, 290, 270, 271, 291, 272, 273, 274, 276, + 277, 278, 292, 281, 282, 293, 294, 295, 297, 284, + 285, 298, 300, 301, 302, 286, 303, 288, 289, 290, + 305, 308, 291, 304, 309, 310, 311, 315, 317, 292, + 303, 318, 293, 294, 295, 297, 304, 319, 298, 300, + 301, 302, 321, 303, 322, 323, 324, 305, 308, 1132, + 304, 309, 310, 311, 315, 317, 326, 303, 318, 327, + + 1124, 328, 329, 330, 319, 331, 1113, 329, 334, 321, + 336, 322, 323, 324, 325, 325, 325, 338, 339, 340, + 325, 341, 325, 326, 342, 325, 327, 325, 328, 329, + 330, 343, 331, 325, 329, 334, 325, 336, 1095, 344, + 346, 325, 325, 325, 338, 339, 340, 325, 341, 325, + 350, 342, 325, 351, 325, 352, 353, 344, 343, 354, + 325, 344, 355, 325, 356, 344, 344, 346, 357, 359, + 360, 361, 1093, 363, 364, 366, 367, 350, 368, 369, + 351, 361, 352, 353, 344, 372, 354, 373, 344, 355, + 362, 356, 371, 371, 362, 357, 359, 360, 361, 362, + + 363, 364, 366, 367, 374, 368, 369, 377, 371, 378, + 380, 381, 372, 382, 373, 383, 384, 362, 385, 371, + 371, 362, 386, 388, 389, 390, 362, 392, 393, 394, + 388, 374, 395, 396, 377, 371, 378, 380, 381, 397, + 382, 398, 383, 384, 399, 385, 401, 403, 400, 386, + 388, 389, 390, 400, 392, 393, 394, 388, 404, 395, + 396, 406, 407, 409, 410, 412, 397, 413, 398, 414, + 416, 399, 417, 401, 403, 400, 419, 420, 421, 422, + 400, 423, 424, 426, 428, 404, 430, 431, 406, 407, + 409, 410, 412, 432, 413, 433, 414, 416, 434, 417, + + 437, 438, 435, 419, 420, 421, 422, 439, 423, 424, + 426, 428, 435, 430, 431, 440, 441, 442, 443, 446, + 432, 448, 433, 449, 450, 434, 451, 437, 438, 435, + 452, 453, 454, 455, 439, 453, 456, 457, 458, 435, + 459, 460, 440, 441, 442, 443, 446, 461, 448, 457, + 449, 450, 458, 451, 462, 463, 464, 452, 453, 454, + 455, 465, 453, 456, 457, 458, 466, 459, 460, 467, + 468, 469, 470, 471, 461, 472, 457, 468, 473, 458, + 474, 462, 463, 464, 475, 476, 478, 480, 465, 479, + 479, 482, 481, 466, 483, 479, 467, 468, 469, 470, + + 471, 484, 472, 481, 468, 473, 485, 474, 482, 488, + 489, 475, 476, 478, 480, 490, 479, 479, 482, 481, + 487, 483, 479, 487, 491, 493, 492, 495, 484, 492, + 481, 496, 497, 485, 498, 482, 488, 489, 499, 502, + 507, 506, 490, 508, 510, 506, 511, 487, 506, 513, + 487, 491, 493, 492, 495, 514, 492, 515, 496, 497, + 516, 498, 517, 518, 519, 499, 502, 507, 506, 520, + 508, 510, 506, 511, 521, 506, 513, 522, 523, 524, + 526, 527, 514, 528, 515, 532, 534, 516, 536, 517, + 518, 519, 537, 538, 540, 541, 520, 542, 539, 543, + + 544, 521, 545, 546, 522, 523, 524, 526, 527, 547, + 528, 548, 532, 534, 549, 536, 539, 550, 553, 537, + 538, 540, 541, 555, 542, 539, 543, 544, 556, 545, + 546, 557, 560, 558, 558, 562, 547, 564, 548, 566, + 565, 549, 558, 568, 550, 553, 569, 558, 571, 572, + 555, 565, 573, 574, 575, 556, 576, 580, 557, 560, + 558, 558, 562, 581, 564, 582, 566, 565, 583, 558, + 568, 584, 586, 569, 558, 571, 572, 587, 565, 573, + 574, 575, 585, 576, 580, 588, 589, 590, 591, 585, + 581, 593, 582, 594, 595, 583, 596, 597, 584, 586, + + 599, 600, 601, 602, 587, 603, 604, 605, 606, 585, + 607, 609, 588, 589, 590, 591, 585, 610, 593, 611, + 594, 595, 612, 596, 597, 613, 614, 599, 600, 601, + 602, 615, 603, 604, 605, 606, 617, 607, 609, 618, + 619, 620, 623, 624, 610, 626, 611, 627, 628, 612, + 629, 630, 613, 614, 631, 632, 633, 633, 615, 634, + 635, 637, 638, 617, 639, 640, 618, 619, 620, 623, + 624, 641, 626, 642, 627, 628, 644, 629, 630, 1092, + 646, 631, 632, 633, 633, 648, 634, 635, 637, 638, + 650, 639, 640, 653, 654, 645, 655, 657, 641, 645, + + 642, 645, 658, 644, 659, 645, 645, 646, 661, 662, + 664, 665, 648, 666, 667, 668, 669, 650, 670, 671, + 653, 654, 645, 655, 657, 672, 645, 674, 645, 658, + 676, 659, 645, 645, 678, 661, 662, 664, 665, 682, + 666, 667, 668, 669, 683, 670, 671, 684, 685, 686, + 689, 691, 672, 690, 674, 692, 693, 676, 695, 696, + 697, 678, 698, 690, 699, 700, 682, 701, 702, 703, + 704, 683, 705, 706, 684, 685, 686, 689, 691, 707, + 690, 708, 692, 693, 709, 695, 696, 697, 710, 698, + 690, 699, 700, 711, 701, 702, 703, 704, 712, 705, + + 706, 713, 714, 715, 716, 717, 707, 718, 708, 719, + 720, 709, 721, 722, 723, 710, 724, 726, 727, 730, + 711, 731, 733, 734, 737, 712, 738, 739, 713, 714, + 715, 716, 717, 740, 718, 741, 719, 720, 742, 721, + 722, 723, 743, 724, 726, 727, 730, 744, 731, 733, + 734, 737, 745, 738, 739, 746, 747, 748, 749, 750, + 740, 751, 741, 752, 753, 742, 755, 756, 757, 743, + 759, 760, 761, 762, 744, 763, 764, 765, 766, 745, + 767, 768, 746, 747, 748, 749, 750, 769, 751, 770, + 752, 753, 771, 755, 756, 757, 777, 759, 760, 761, + + 762, 778, 763, 764, 765, 766, 780, 767, 768, 784, + 787, 791, 792, 793, 769, 794, 770, 797, 798, 771, + 799, 800, 801, 777, 802, 804, 803, 805, 778, 806, + 807, 803, 809, 780, 810, 801, 784, 787, 791, 792, + 793, 811, 794, 803, 797, 798, 812, 799, 800, 801, + 813, 802, 804, 803, 805, 814, 806, 807, 803, 809, + 815, 810, 801, 816, 817, 818, 819, 820, 811, 821, + 803, 822, 823, 812, 825, 826, 827, 813, 828, 829, + 830, 831, 814, 832, 833, 834, 836, 815, 837, 838, + 816, 817, 818, 819, 820, 839, 821, 841, 822, 823, + + 843, 825, 826, 827, 844, 828, 829, 830, 831, 845, + 832, 833, 834, 836, 846, 837, 838, 847, 849, 850, + 851, 854, 839, 852, 841, 855, 856, 843, 858, 860, + 862, 844, 863, 852, 864, 865, 845, 867, 868, 869, + 870, 846, 871, 872, 847, 849, 850, 851, 854, 873, + 852, 874, 855, 856, 875, 858, 860, 862, 876, 863, + 852, 864, 865, 877, 867, 868, 869, 870, 878, 871, + 872, 879, 881, 882, 883, 884, 873, 885, 874, 886, + 887, 875, 888, 889, 890, 876, 891, 892, 893, 894, + 877, 896, 897, 898, 899, 878, 900, 901, 879, 881, + + 882, 883, 884, 902, 885, 906, 886, 887, 907, 888, + 889, 890, 912, 891, 892, 893, 894, 913, 896, 897, + 898, 899, 914, 900, 901, 903, 915, 903, 916, 917, + 902, 918, 906, 919, 920, 907, 921, 903, 923, 912, + 924, 925, 926, 927, 913, 928, 929, 931, 932, 914, + 933, 934, 935, 915, 938, 916, 917, 939, 918, 941, + 919, 920, 937, 921, 942, 923, 937, 924, 925, 926, + 927, 944, 928, 929, 931, 932, 945, 933, 934, 935, + 947, 938, 948, 950, 939, 951, 941, 954, 955, 937, + 956, 942, 960, 937, 961, 962, 954, 963, 944, 964, + + 966, 967, 968, 945, 954, 969, 972, 947, 974, 948, + 950, 976, 951, 977, 954, 955, 981, 956, 982, 960, + 983, 961, 962, 954, 963, 984, 964, 966, 967, 968, + 985, 954, 969, 972, 986, 974, 987, 988, 976, 989, + 977, 990, 991, 981, 992, 982, 993, 983, 994, 995, + 996, 997, 984, 998, 999, 1000, 1001, 985, 1002, 1003, + 1004, 986, 1005, 987, 988, 1006, 989, 1008, 990, 991, + 1009, 992, 1014, 993, 1015, 994, 995, 996, 997, 1016, + 998, 999, 1000, 1001, 1017, 1002, 1003, 1004, 1018, 1005, + 1019, 1020, 1006, 1021, 1008, 1022, 1023, 1009, 1024, 1014, + + 1025, 1015, 1026, 1027, 1028, 1029, 1016, 1030, 1032, 1033, + 1034, 1017, 1035, 1036, 1037, 1018, 1038, 1019, 1020, 1039, + 1021, 1041, 1022, 1023, 1042, 1024, 1043, 1025, 1044, 1026, + 1027, 1028, 1029, 1046, 1030, 1032, 1033, 1034, 1047, 1035, + 1036, 1037, 1050, 1038, 1051, 1052, 1039, 1054, 1041, 1055, + 1057, 1042, 1058, 1043, 1059, 1044, 1061, 1062, 1063, 1065, + 1046, 1066, 1067, 1068, 1070, 1047, 1072, 1073, 1074, 1050, + 1075, 1051, 1052, 1076, 1054, 1077, 1055, 1057, 1079, 1058, + 1080, 1059, 1081, 1061, 1062, 1063, 1065, 1083, 1066, 1067, + 1068, 1070, 1086, 1072, 1073, 1074, 1089, 1075, 1090, 1091, + + 1076, 1094, 1077, 1096, 1097, 1079, 1098, 1080, 1099, 1081, + 1100, 1101, 1102, 1103, 1083, 1104, 1105, 1106, 1107, 1086, + 1108, 1109, 1110, 1089, 1111, 1090, 1091, 1112, 1094, 1115, + 1096, 1097, 1116, 1098, 1118, 1099, 1119, 1100, 1101, 1102, + 1103, 1120, 1104, 1105, 1106, 1107, 1121, 1108, 1109, 1110, + 1122, 1111, 1123, 1125, 1112, 1126, 1115, 1127, 1128, 1116, + 1129, 1118, 1130, 1119, 1134, 1136, 1135, 1137, 1120, 1138, + 1139, 1140, 1141, 1121, 1135, 1142, 1145, 1122, 1147, 1123, + 1125, 1148, 1126, 1149, 1127, 1128, 1151, 1129, 1140, 1130, + 1152, 1134, 1136, 1135, 1137, 1153, 1138, 1139, 1140, 1141, + + 1154, 1155, 1142, 1145, 1156, 1147, 1157, 1158, 1148, 1160, + 1149, 1161, 1159, 1151, 1162, 1140, 1164, 1152, 1159, 1169, + 1170, 1171, 1153, 1172, 1173, 1174, 1175, 1154, 1155, 1176, + 1177, 1156, 1178, 1157, 1158, 1179, 1160, 1180, 1161, 1159, + 1181, 1162, 1182, 1164, 1183, 1159, 1169, 1170, 1171, 1184, + 1172, 1173, 1174, 1175, 1185, 1186, 1176, 1177, 1187, 1178, + 1188, 1190, 1179, 1191, 1180, 1192, 1193, 1181, 1194, 1182, + 1195, 1183, 1196, 1197, 1198, 1201, 1184, 1202, 1205, 1206, + 1207, 1185, 1186, 1210, 1211, 1187, 1212, 1188, 1190, 1213, + 1191, 1215, 1192, 1193, 1216, 1194, 1217, 1195, 1220, 1196, + + 1197, 1198, 1201, 1221, 1202, 1205, 1206, 1207, 1222, 1224, + 1210, 1211, 1225, 1212, 1226, 1227, 1213, 1228, 1215, 1229, + 1230, 1216, 1231, 1217, 1235, 1220, 1236, 1237, 1238, 1240, + 1221, 1241, 1242, 1243, 1244, 1222, 1224, 1245, 1246, 1225, + 1249, 1226, 1227, 1250, 1228, 1251, 1229, 1230, 1253, 1231, + 1254, 1235, 1259, 1236, 1237, 1238, 1240, 1260, 1241, 1242, + 1243, 1244, 1263, 1264, 1245, 1246, 1265, 1249, 1267, 1268, + 1250, 1269, 1251, 1270, 1271, 1253, 1273, 1254, 1274, 1259, + 1276, 1278, 1279, 1281, 1260, 1282, 1283, 1285, 1286, 1263, + 1264, 1287, 1288, 1265, 1289, 1267, 1268, 1290, 1269, 1291, + + 1270, 1271, 1293, 1273, 1294, 1274, 1296, 1276, 1278, 1279, + 1281, 1297, 1282, 1283, 1285, 1286, 1299, 1300, 1287, 1288, + 1302, 1289, 1304, 1305, 1290, 1306, 1291, 1307, 1308, 1293, + 1309, 1294, 1312, 1296, 1313, 1314, 1315, 1316, 1297, 1317, + 1318, 1319, 1320, 1299, 1300, 1321, 1324, 1302, 1327, 1304, + 1305, 1328, 1306, 1331, 1307, 1308, 1332, 1309, 1333, 1312, + 1333, 1313, 1314, 1315, 1316, 1334, 1317, 1318, 1319, 1320, + 1336, 1339, 1321, 1324, 1340, 1327, 1342, 1344, 1328, 1345, + 1331, 1346, 1347, 1332, 1348, 1333, 1349, 1333, 1350, 1351, + 1352, 1353, 1334, 1354, 1350, 1355, 1356, 1336, 1339, 1357, + + 1358, 1340, 1359, 1342, 1344, 1361, 1345, 1362, 1346, 1347, + 1364, 1348, 1365, 1349, 1366, 1350, 1351, 1352, 1353, 1367, + 1354, 1350, 1355, 1356, 1368, 1369, 1357, 1358, 1370, 1359, + 1371, 1372, 1361, 1373, 1362, 1374, 1375, 1364, 1378, 1365, + 1380, 1366, 1381, 1382, 1383, 1384, 1367, 1385, 1387, 1388, + 1389, 1368, 1369, 1392, 1393, 1370, 1396, 1371, 1372, 1397, + 1373, 1398, 1374, 1375, 1399, 1378, 1401, 1380, 1403, 1381, + 1382, 1383, 1384, 1404, 1385, 1387, 1388, 1389, 1406, 1407, + 1392, 1393, 1408, 1396, 1410, 1413, 1397, 1414, 1398, 1415, + 1416, 1399, 1417, 1401, 1418, 1403, 1419, 1420, 1421, 1422, + + 1404, 1423, 1426, 1427, 1428, 1406, 1407, 1429, 1430, 1408, + 1431, 1410, 1413, 1432, 1414, 1434, 1415, 1416, 1435, 1417, + 1437, 1418, 1438, 1419, 1420, 1421, 1422, 1439, 1423, 1426, + 1427, 1428, 1440, 1443, 1429, 1430, 1444, 1431, 1446, 1449, + 1432, 1450, 1434, 1451, 1452, 1435, 1453, 1437, 1454, 1438, + 1456, 1457, 1458, 1459, 1439, 1460, 1461, 1462, 1463, 1440, + 1443, 1464, 1465, 1444, 1466, 1446, 1449, 1467, 1450, 1468, + 1451, 1452, 1469, 1453, 1470, 1454, 1471, 1456, 1457, 1458, + 1459, 1472, 1460, 1461, 1462, 1463, 1473, 1474, 1464, 1465, + 1475, 1466, 1476, 1477, 1467, 1478, 1468, 1479, 1480, 1469, + + 1481, 1470, 1489, 1471, 1490, 1491, 1493, 1495, 1472, 1496, + 1498, 1499, 1500, 1473, 1474, 1501, 1502, 1475, 1505, 1476, + 1477, 1507, 1478, 1508, 1479, 1480, 1509, 1481, 1510, 1489, + 1510, 1490, 1491, 1493, 1495, 1511, 1496, 1498, 1499, 1500, + 1513, 1514, 1501, 1502, 1515, 1505, 1516, 1517, 1507, 1518, + 1508, 1519, 1520, 1509, 1521, 1510, 1523, 1510, 1524, 1525, + 1527, 1528, 1511, 1529, 1530, 1532, 1533, 1513, 1514, 1534, + 1535, 1515, 1538, 1516, 1517, 1539, 1518, 1540, 1519, 1520, + 1543, 1521, 1544, 1523, 1545, 1524, 1525, 1527, 1528, 1546, + 1529, 1530, 1532, 1533, 1547, 1549, 1534, 1535, 1550, 1538, + + 1552, 1554, 1539, 1557, 1540, 1558, 1559, 1543, 1562, 1544, + 1563, 1545, 1564, 1565, 1567, 1568, 1546, 1569, 1571, 1572, + 1573, 1547, 1549, 1574, 1575, 1550, 1577, 1552, 1554, 1082, + 1557, 1071, 1558, 1559, 1069, 1562, 1049, 1563, 1048, 1564, + 1565, 1567, 1568, 1045, 1569, 1571, 1572, 1573, 1013, 1012, + 1574, 1575, 1011, 1577, 1582, 1582, 1010, 973, 971, 970, + 965, 957, 949, 940, 936, 930, 910, 909, 908, 905, + 904, 895, 880, 842, 789, 781, 779, 776, 775, 774, + 773, 772, 736, 735, 732, 687, 681, 680, 679, 677, + 649, 647, 643, 621, 608, 567, 563, 561, 559, 554, + + 551, 533, 525, 509, 503, 500, 477, 447, 445, 444, + 429, 391, 376, 375, 370, 358, 348, 345, 335, 320, + 316, 314, 306, 287, 275, 266, 224, 194, 179, 143, 123, 37, 5, 3, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, 1580, @@ -2286,467 +2286,467 @@ YY_RULE_SETUP case 51: YY_RULE_SETUP #line 177 "conf_lexer.l" -{ return T_FINGERPRINT; } +{ return IRCD_FLAGS; } YY_BREAK case 52: YY_RULE_SETUP #line 178 "conf_lexer.l" -{ return IRCD_FLAGS; } +{ return FLATTEN_LINKS; } YY_BREAK case 53: YY_RULE_SETUP #line 179 "conf_lexer.l" -{ return FLATTEN_LINKS; } +{ return T_FULL; } YY_BREAK case 54: YY_RULE_SETUP #line 180 "conf_lexer.l" -{ return T_FULL; } +{ return GECOS; } YY_BREAK case 55: YY_RULE_SETUP #line 181 "conf_lexer.l" -{ return GECOS; } +{ return GENERAL; } YY_BREAK case 56: YY_RULE_SETUP #line 182 "conf_lexer.l" -{ return GENERAL; } +{ return GLINE; } YY_BREAK case 57: YY_RULE_SETUP #line 183 "conf_lexer.l" -{ return GLINE; } +{ return GLINE_DURATION; } YY_BREAK case 58: YY_RULE_SETUP #line 184 "conf_lexer.l" -{ return GLINE_DURATION; } +{ return GLINE_ENABLE; } YY_BREAK case 59: YY_RULE_SETUP #line 185 "conf_lexer.l" -{ return GLINE_ENABLE; } +{ return GLINE_EXEMPT; } YY_BREAK case 60: YY_RULE_SETUP #line 186 "conf_lexer.l" -{ return GLINE_EXEMPT; } +{ return GLINE_MIN_CIDR; } YY_BREAK case 61: YY_RULE_SETUP #line 187 "conf_lexer.l" -{ return GLINE_MIN_CIDR; } +{ return GLINE_MIN_CIDR6; } YY_BREAK case 62: YY_RULE_SETUP #line 188 "conf_lexer.l" -{ return GLINE_MIN_CIDR6; } +{ return GLINE_REQUEST_DURATION; } YY_BREAK case 63: YY_RULE_SETUP #line 189 "conf_lexer.l" -{ return GLINE_REQUEST_DURATION; } +{ return GLOBAL_KILL; } YY_BREAK case 64: YY_RULE_SETUP #line 190 "conf_lexer.l" -{ return GLOBAL_KILL; } +{ return T_GLOBOPS; } YY_BREAK case 65: YY_RULE_SETUP #line 191 "conf_lexer.l" -{ return T_GLOBOPS; } +{ return NEED_IDENT; } YY_BREAK case 66: YY_RULE_SETUP #line 192 "conf_lexer.l" -{ return NEED_IDENT; } +{ return HAVENT_READ_CONF; } YY_BREAK case 67: YY_RULE_SETUP #line 193 "conf_lexer.l" -{ return HAVENT_READ_CONF; } +{ return HIDDEN; } YY_BREAK case 68: YY_RULE_SETUP #line 194 "conf_lexer.l" -{ return HIDDEN; } +{ return HIDDEN_NAME; } YY_BREAK case 69: YY_RULE_SETUP #line 195 "conf_lexer.l" -{ return HIDDEN_NAME; } +{ return HIDE_IDLE_FROM_OPERS; } YY_BREAK case 70: YY_RULE_SETUP #line 196 "conf_lexer.l" -{ return HIDE_IDLE_FROM_OPERS; } +{ return HIDE_SERVER_IPS; } YY_BREAK case 71: YY_RULE_SETUP #line 197 "conf_lexer.l" -{ return HIDE_SERVER_IPS; } +{ return HIDE_SERVERS; } YY_BREAK case 72: YY_RULE_SETUP #line 198 "conf_lexer.l" -{ return HIDE_SERVERS; } +{ return HIDE_SERVICES; } YY_BREAK case 73: YY_RULE_SETUP #line 199 "conf_lexer.l" -{ return HIDE_SERVICES; } +{ return HIDE_SPOOF_IPS; } YY_BREAK case 74: YY_RULE_SETUP #line 200 "conf_lexer.l" -{ return HIDE_SPOOF_IPS; } +{ return HOST; } YY_BREAK case 75: YY_RULE_SETUP #line 201 "conf_lexer.l" -{ return HOST; } +{ return HUB; } YY_BREAK case 76: YY_RULE_SETUP #line 202 "conf_lexer.l" -{ return HUB; } +{ return HUB_MASK; } YY_BREAK case 77: YY_RULE_SETUP #line 203 "conf_lexer.l" -{ return HUB_MASK; } +{ return IGNORE_BOGUS_TS; } YY_BREAK case 78: YY_RULE_SETUP #line 204 "conf_lexer.l" -{ return IGNORE_BOGUS_TS; } +{ return T_INVISIBLE; } YY_BREAK case 79: YY_RULE_SETUP #line 205 "conf_lexer.l" -{ return T_INVISIBLE; } +{ return INVISIBLE_ON_CONNECT; } YY_BREAK case 80: YY_RULE_SETUP #line 206 "conf_lexer.l" -{ return INVISIBLE_ON_CONNECT; } +{ return IP; } YY_BREAK case 81: YY_RULE_SETUP #line 207 "conf_lexer.l" -{ return IP; } +{ return T_IPV4; } YY_BREAK case 82: YY_RULE_SETUP #line 208 "conf_lexer.l" -{ return T_IPV4; } +{ return T_IPV6; } YY_BREAK case 83: YY_RULE_SETUP #line 209 "conf_lexer.l" -{ return T_IPV6; } +{ return JOIN_FLOOD_COUNT; } YY_BREAK case 84: YY_RULE_SETUP #line 210 "conf_lexer.l" -{ return JOIN_FLOOD_COUNT; } +{ return JOIN_FLOOD_TIME; } YY_BREAK case 85: YY_RULE_SETUP #line 211 "conf_lexer.l" -{ return JOIN_FLOOD_TIME; } +{ return KILL; } YY_BREAK case 86: YY_RULE_SETUP #line 212 "conf_lexer.l" -{ return KILL; } +{ return KILL_CHASE_TIME_LIMIT; } YY_BREAK case 87: YY_RULE_SETUP #line 213 "conf_lexer.l" -{ return KILL_CHASE_TIME_LIMIT; } +{ return KLINE; } YY_BREAK case 88: YY_RULE_SETUP #line 214 "conf_lexer.l" -{ return KLINE; } +{ return KLINE_EXEMPT; } YY_BREAK case 89: YY_RULE_SETUP #line 215 "conf_lexer.l" -{ return KLINE_EXEMPT; } +{ return KNOCK_DELAY; } YY_BREAK case 90: YY_RULE_SETUP #line 216 "conf_lexer.l" -{ return KNOCK_DELAY; } +{ return KNOCK_DELAY_CHANNEL; } YY_BREAK case 91: YY_RULE_SETUP #line 217 "conf_lexer.l" -{ return KNOCK_DELAY_CHANNEL; } +{ return LEAF_MASK; } YY_BREAK case 92: YY_RULE_SETUP #line 218 "conf_lexer.l" -{ return LEAF_MASK; } +{ return LINKS_DELAY; } YY_BREAK case 93: YY_RULE_SETUP #line 219 "conf_lexer.l" -{ return LINKS_DELAY; } +{ return LISTEN; } YY_BREAK case 94: YY_RULE_SETUP #line 220 "conf_lexer.l" -{ return LISTEN; } +{ return T_LOCOPS; } YY_BREAK case 95: YY_RULE_SETUP #line 221 "conf_lexer.l" -{ return T_LOCOPS; } +{ return T_LOG; } YY_BREAK case 96: YY_RULE_SETUP #line 222 "conf_lexer.l" -{ return T_LOG; } +{ return MASK; } YY_BREAK case 97: YY_RULE_SETUP #line 223 "conf_lexer.l" -{ return MASK; } +{ return TMASKED; } YY_BREAK case 98: YY_RULE_SETUP #line 224 "conf_lexer.l" -{ return TMASKED; } +{ return MAX_ACCEPT; } YY_BREAK case 99: YY_RULE_SETUP #line 225 "conf_lexer.l" -{ return MAX_ACCEPT; } +{ return MAX_BANS; } YY_BREAK case 100: YY_RULE_SETUP #line 226 "conf_lexer.l" -{ return MAX_BANS; } +{ return MAX_CHANS_PER_OPER; } YY_BREAK case 101: YY_RULE_SETUP #line 227 "conf_lexer.l" -{ return MAX_CHANS_PER_OPER; } +{ return MAX_CHANS_PER_USER; } YY_BREAK case 102: YY_RULE_SETUP #line 228 "conf_lexer.l" -{ return MAX_CHANS_PER_USER; } +{ return T_MAX_CLIENTS; } YY_BREAK case 103: YY_RULE_SETUP #line 229 "conf_lexer.l" -{ return T_MAX_CLIENTS; } +{ return MAX_GLOBAL; } YY_BREAK case 104: YY_RULE_SETUP #line 230 "conf_lexer.l" -{ return MAX_GLOBAL; } +{ return MAX_IDENT; } YY_BREAK case 105: YY_RULE_SETUP #line 231 "conf_lexer.l" -{ return MAX_IDENT; } +{ return MAX_IDLE; } YY_BREAK case 106: YY_RULE_SETUP #line 232 "conf_lexer.l" -{ return MAX_IDLE; } +{ return MAX_LOCAL; } YY_BREAK case 107: YY_RULE_SETUP #line 233 "conf_lexer.l" -{ return MAX_LOCAL; } +{ return MAX_NICK_CHANGES; } YY_BREAK case 108: YY_RULE_SETUP #line 234 "conf_lexer.l" -{ return MAX_NICK_CHANGES; } +{ return MAX_NICK_LENGTH; } YY_BREAK case 109: YY_RULE_SETUP #line 235 "conf_lexer.l" -{ return MAX_NICK_LENGTH; } +{ return MAX_NICK_TIME; } YY_BREAK case 110: YY_RULE_SETUP #line 236 "conf_lexer.l" -{ return MAX_NICK_TIME; } +{ return MAX_NUMBER; } YY_BREAK case 111: YY_RULE_SETUP #line 237 "conf_lexer.l" -{ return MAX_NUMBER; } +{ return MAX_TARGETS; } YY_BREAK case 112: YY_RULE_SETUP #line 238 "conf_lexer.l" -{ return MAX_TARGETS; } +{ return MAX_TOPIC_LENGTH; } YY_BREAK case 113: YY_RULE_SETUP #line 239 "conf_lexer.l" -{ return MAX_TOPIC_LENGTH; } +{ return MAX_WATCH; } YY_BREAK case 114: YY_RULE_SETUP #line 240 "conf_lexer.l" -{ return MAX_WATCH; } +{ return MIN_IDLE; } YY_BREAK case 115: YY_RULE_SETUP #line 241 "conf_lexer.l" -{ return MIN_IDLE; } +{ return MIN_NONWILDCARD; } YY_BREAK case 116: YY_RULE_SETUP #line 242 "conf_lexer.l" -{ return MIN_NONWILDCARD; } +{ return MIN_NONWILDCARD_SIMPLE; } YY_BREAK case 117: YY_RULE_SETUP #line 243 "conf_lexer.l" -{ return MIN_NONWILDCARD_SIMPLE; } +{ return MODULE; } YY_BREAK case 118: YY_RULE_SETUP #line 244 "conf_lexer.l" -{ return MODULE; } +{ return MODULES; } YY_BREAK case 119: YY_RULE_SETUP #line 245 "conf_lexer.l" -{ return MODULES; } +{ return MOTD; } YY_BREAK case 120: YY_RULE_SETUP #line 246 "conf_lexer.l" -{ return MOTD; } +{ return NAME; } YY_BREAK case 121: YY_RULE_SETUP #line 247 "conf_lexer.l" -{ return NAME; } +{ return T_NCHANGE; } YY_BREAK case 122: YY_RULE_SETUP #line 248 "conf_lexer.l" -{ return T_NCHANGE; } +{ return NEED_IDENT; } YY_BREAK case 123: YY_RULE_SETUP #line 249 "conf_lexer.l" -{ return NEED_IDENT; } +{ return NEED_PASSWORD; } YY_BREAK case 124: YY_RULE_SETUP #line 250 "conf_lexer.l" -{ return NEED_PASSWORD; } +{ return NETWORK_DESC; } YY_BREAK case 125: YY_RULE_SETUP #line 251 "conf_lexer.l" -{ return NETWORK_DESC; } +{ return NETWORK_NAME; } YY_BREAK case 126: YY_RULE_SETUP #line 252 "conf_lexer.l" -{ return NETWORK_NAME; } +{ return NICK; } YY_BREAK case 127: YY_RULE_SETUP #line 253 "conf_lexer.l" -{ return NICK; } +{ return NO_CREATE_ON_SPLIT; } YY_BREAK case 128: YY_RULE_SETUP #line 254 "conf_lexer.l" -{ return NO_CREATE_ON_SPLIT; } +{ return NO_JOIN_ON_SPLIT; } YY_BREAK case 129: YY_RULE_SETUP #line 255 "conf_lexer.l" -{ return NO_JOIN_ON_SPLIT; } +{ return NO_OPER_FLOOD; } YY_BREAK case 130: YY_RULE_SETUP #line 256 "conf_lexer.l" -{ return NO_OPER_FLOOD; } +{ return NO_TILDE; } YY_BREAK case 131: YY_RULE_SETUP #line 257 "conf_lexer.l" -{ return NO_TILDE; } +{ return T_NONONREG; } YY_BREAK case 132: YY_RULE_SETUP #line 258 "conf_lexer.l" -{ return T_NONONREG; } +{ return NUMBER_PER_CIDR; } YY_BREAK case 133: YY_RULE_SETUP #line 259 "conf_lexer.l" -{ return NUMBER_PER_CIDR; } +{ return NUMBER_PER_IP; } YY_BREAK case 134: YY_RULE_SETUP #line 260 "conf_lexer.l" -{ return NUMBER_PER_IP; } +{ return OPERATOR; } YY_BREAK case 135: YY_RULE_SETUP #line 261 "conf_lexer.l" -{ return OPERATOR; } +{ return OPER_ONLY_UMODES; } YY_BREAK case 136: YY_RULE_SETUP #line 262 "conf_lexer.l" -{ return OPER_ONLY_UMODES; } +{ return OPER_PASS_RESV; } YY_BREAK case 137: YY_RULE_SETUP #line 263 "conf_lexer.l" -{ return OPER_PASS_RESV; } +{ return OPER_UMODES; } YY_BREAK case 138: YY_RULE_SETUP #line 264 "conf_lexer.l" -{ return OPER_UMODES; } +{ return OPERATOR; } YY_BREAK case 139: YY_RULE_SETUP #line 265 "conf_lexer.l" -{ return OPERATOR; } +{ return OPERS_BYPASS_CALLERID; } YY_BREAK case 140: YY_RULE_SETUP #line 266 "conf_lexer.l" -{ return OPERS_BYPASS_CALLERID; } +{ return T_OPERWALL; } YY_BREAK case 141: YY_RULE_SETUP #line 267 "conf_lexer.l" -{ return T_OPERWALL; } +{ return PACE_WAIT; } YY_BREAK case 142: YY_RULE_SETUP #line 268 "conf_lexer.l" -{ return PACE_WAIT; } +{ return PACE_WAIT_SIMPLE; } YY_BREAK case 143: YY_RULE_SETUP #line 269 "conf_lexer.l" -{ return PACE_WAIT_SIMPLE; } +{ return PASSWORD; } YY_BREAK case 144: YY_RULE_SETUP @@ -2756,207 +2756,207 @@ YY_RULE_SETUP case 145: YY_RULE_SETUP #line 271 "conf_lexer.l" -{ return PASSWORD; } +{ return PATH; } YY_BREAK case 146: YY_RULE_SETUP #line 272 "conf_lexer.l" -{ return PATH; } +{ return PING_COOKIE; } YY_BREAK case 147: YY_RULE_SETUP #line 273 "conf_lexer.l" -{ return PING_COOKIE; } +{ return PING_TIME; } YY_BREAK case 148: YY_RULE_SETUP #line 274 "conf_lexer.l" -{ return PING_TIME; } +{ return PORT; } YY_BREAK case 149: YY_RULE_SETUP #line 275 "conf_lexer.l" -{ return PORT; } +{ return RESV; } YY_BREAK case 150: YY_RULE_SETUP #line 276 "conf_lexer.l" -{ return RESV; } +{ return RANDOM_IDLE; } YY_BREAK case 151: YY_RULE_SETUP #line 277 "conf_lexer.l" -{ return RANDOM_IDLE; } +{ return REASON; } YY_BREAK case 152: YY_RULE_SETUP #line 278 "conf_lexer.l" -{ return REASON; } +{ return T_RECVQ; } YY_BREAK case 153: YY_RULE_SETUP #line 279 "conf_lexer.l" -{ return T_RECVQ; } +{ return REDIRPORT; } YY_BREAK case 154: YY_RULE_SETUP #line 280 "conf_lexer.l" -{ return REDIRPORT; } +{ return REDIRSERV; } YY_BREAK case 155: YY_RULE_SETUP #line 281 "conf_lexer.l" -{ return REDIRSERV; } +{ return REHASH; } YY_BREAK case 156: YY_RULE_SETUP #line 282 "conf_lexer.l" -{ return REHASH; } +{ return T_REJ; } YY_BREAK case 157: YY_RULE_SETUP #line 283 "conf_lexer.l" -{ return T_REJ; } +{ return REMOTE; } YY_BREAK case 158: YY_RULE_SETUP #line 284 "conf_lexer.l" -{ return REMOTE; } +{ return REMOTEBAN; } YY_BREAK case 159: YY_RULE_SETUP #line 285 "conf_lexer.l" -{ return REMOTEBAN; } +{ return T_RESTART; } YY_BREAK case 160: YY_RULE_SETUP #line 286 "conf_lexer.l" -{ return T_RESTART; } +{ return RESV; } YY_BREAK case 161: YY_RULE_SETUP #line 287 "conf_lexer.l" -{ return RESV; } +{ return RESV_EXEMPT; } YY_BREAK case 162: YY_RULE_SETUP #line 288 "conf_lexer.l" -{ return RESV_EXEMPT; } +{ return RSA_PRIVATE_KEY_FILE; } YY_BREAK case 163: YY_RULE_SETUP #line 289 "conf_lexer.l" -{ return RSA_PRIVATE_KEY_FILE; } +{ return RSA_PUBLIC_KEY_FILE; } YY_BREAK case 164: YY_RULE_SETUP #line 290 "conf_lexer.l" -{ return RSA_PUBLIC_KEY_FILE; } +{ return SEND_PASSWORD; } YY_BREAK case 165: YY_RULE_SETUP #line 291 "conf_lexer.l" -{ return SEND_PASSWORD; } +{ return SENDQ; } YY_BREAK case 166: YY_RULE_SETUP #line 292 "conf_lexer.l" -{ return SENDQ; } +{ return T_SERVER; } YY_BREAK case 167: YY_RULE_SETUP #line 293 "conf_lexer.l" -{ return T_SERVER; } +{ return SERVERHIDE; } YY_BREAK case 168: YY_RULE_SETUP #line 294 "conf_lexer.l" -{ return SERVERHIDE; } +{ return SERVERINFO; } YY_BREAK case 169: YY_RULE_SETUP #line 295 "conf_lexer.l" -{ return SERVERINFO; } +{ return T_SERVICE; } YY_BREAK case 170: YY_RULE_SETUP #line 296 "conf_lexer.l" -{ return T_SERVICE; } +{ return T_SERVICES_NAME; } YY_BREAK case 171: YY_RULE_SETUP #line 297 "conf_lexer.l" -{ return T_SERVICES_NAME; } +{ return T_SERVNOTICE; } YY_BREAK case 172: YY_RULE_SETUP #line 298 "conf_lexer.l" -{ return T_SERVNOTICE; } +{ return T_SET; } YY_BREAK case 173: YY_RULE_SETUP #line 299 "conf_lexer.l" -{ return T_SET; } +{ return T_SHARED; } YY_BREAK case 174: YY_RULE_SETUP #line 300 "conf_lexer.l" -{ return T_SHARED; } +{ return SHORT_MOTD; } YY_BREAK case 175: YY_RULE_SETUP #line 301 "conf_lexer.l" -{ return SHORT_MOTD; } +{ return IRCD_SID; } YY_BREAK case 176: YY_RULE_SETUP #line 302 "conf_lexer.l" -{ return IRCD_SID; } +{ return T_SIZE; } YY_BREAK case 177: YY_RULE_SETUP #line 303 "conf_lexer.l" -{ return T_SIZE; } +{ return T_SKILL; } YY_BREAK case 178: YY_RULE_SETUP #line 304 "conf_lexer.l" -{ return T_SKILL; } +{ return T_SOFTCALLERID; } YY_BREAK case 179: YY_RULE_SETUP #line 305 "conf_lexer.l" -{ return T_SOFTCALLERID; } +{ return SPOOF; } YY_BREAK case 180: YY_RULE_SETUP #line 306 "conf_lexer.l" -{ return SPOOF; } +{ return SPOOF_NOTICE; } YY_BREAK case 181: YY_RULE_SETUP #line 307 "conf_lexer.l" -{ return SPOOF_NOTICE; } +{ return T_SPY; } YY_BREAK case 182: YY_RULE_SETUP #line 308 "conf_lexer.l" -{ return T_SPY; } +{ return SQUIT; } YY_BREAK case 183: YY_RULE_SETUP #line 309 "conf_lexer.l" -{ return SQUIT; } +{ return T_SSL; } YY_BREAK case 184: YY_RULE_SETUP #line 310 "conf_lexer.l" -{ return T_SSL; } +{ return SSL_CERTIFICATE_FILE; } YY_BREAK case 185: YY_RULE_SETUP #line 311 "conf_lexer.l" -{ return SSL_CERTIFICATE_FILE; } +{ return SSL_CERTIFICATE_FINGERPRINT; } YY_BREAK case 186: YY_RULE_SETUP diff --git a/src/conf_lexer.l b/src/conf_lexer.l index b1789db..31532fe 100644 --- a/src/conf_lexer.l +++ b/src/conf_lexer.l @@ -174,7 +174,6 @@ external { return T_EXTERNAL; } failed_oper_notice { return FAILED_OPER_NOTICE; } farconnect { return T_FARCONNECT; } file { return T_FILE; } -fingerprint { return T_FINGERPRINT; } flags { return IRCD_FLAGS; } flatten_links { return FLATTEN_LINKS; } full { return T_FULL; } @@ -309,6 +308,7 @@ spy { return T_SPY; } squit { return SQUIT; } ssl { return T_SSL; } ssl_certificate_file { return SSL_CERTIFICATE_FILE; } +ssl_certificate_fingerprint { return SSL_CERTIFICATE_FINGERPRINT; } ssl_cipher_list { return T_SSL_CIPHER_LIST; } ssl_client_method { return T_SSL_CLIENT_METHOD; } ssl_dh_param_file { return SSL_DH_PARAM_FILE; } diff --git a/src/conf_parser.c b/src/conf_parser.c index 04dbb1c..de089fd 100644 --- a/src/conf_parser.c +++ b/src/conf_parser.c @@ -362,24 +362,24 @@ extern int yydebug; SPOOF_NOTICE = 402, SQUIT = 403, SSL_CERTIFICATE_FILE = 404, - SSL_DH_PARAM_FILE = 405, - STATS_E_DISABLED = 406, - STATS_I_OPER_ONLY = 407, - STATS_K_OPER_ONLY = 408, - STATS_O_OPER_ONLY = 409, - STATS_P_OPER_ONLY = 410, - T_ALL = 411, - T_BOTS = 412, - T_CALLERID = 413, - T_CCONN = 414, - T_CLUSTER = 415, - T_DEAF = 416, - T_DEBUG = 417, - T_DLINE = 418, - T_EXTERNAL = 419, - T_FARCONNECT = 420, - T_FILE = 421, - T_FINGERPRINT = 422, + SSL_CERTIFICATE_FINGERPRINT = 405, + SSL_DH_PARAM_FILE = 406, + STATS_E_DISABLED = 407, + STATS_I_OPER_ONLY = 408, + STATS_K_OPER_ONLY = 409, + STATS_O_OPER_ONLY = 410, + STATS_P_OPER_ONLY = 411, + T_ALL = 412, + T_BOTS = 413, + T_CALLERID = 414, + T_CCONN = 415, + T_CLUSTER = 416, + T_DEAF = 417, + T_DEBUG = 418, + T_DLINE = 419, + T_EXTERNAL = 420, + T_FARCONNECT = 421, + T_FILE = 422, T_FULL = 423, T_GLOBOPS = 424, T_INVISIBLE = 425, @@ -586,24 +586,24 @@ extern int yydebug; #define SPOOF_NOTICE 402 #define SQUIT 403 #define SSL_CERTIFICATE_FILE 404 -#define SSL_DH_PARAM_FILE 405 -#define STATS_E_DISABLED 406 -#define STATS_I_OPER_ONLY 407 -#define STATS_K_OPER_ONLY 408 -#define STATS_O_OPER_ONLY 409 -#define STATS_P_OPER_ONLY 410 -#define T_ALL 411 -#define T_BOTS 412 -#define T_CALLERID 413 -#define T_CCONN 414 -#define T_CLUSTER 415 -#define T_DEAF 416 -#define T_DEBUG 417 -#define T_DLINE 418 -#define T_EXTERNAL 419 -#define T_FARCONNECT 420 -#define T_FILE 421 -#define T_FINGERPRINT 422 +#define SSL_CERTIFICATE_FINGERPRINT 405 +#define SSL_DH_PARAM_FILE 406 +#define STATS_E_DISABLED 407 +#define STATS_I_OPER_ONLY 408 +#define STATS_K_OPER_ONLY 409 +#define STATS_O_OPER_ONLY 410 +#define STATS_P_OPER_ONLY 411 +#define T_ALL 412 +#define T_BOTS 413 +#define T_CALLERID 414 +#define T_CCONN 415 +#define T_CLUSTER 416 +#define T_DEAF 417 +#define T_DEBUG 418 +#define T_DLINE 419 +#define T_EXTERNAL 420 +#define T_FARCONNECT 421 +#define T_FILE 422 #define T_FULL 423 #define T_GLOBOPS 424 #define T_INVISIBLE 425 @@ -931,7 +931,7 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1221 +#define YYLAST 1219 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 230 @@ -1099,7 +1099,7 @@ static const yytype_int16 yyrhs[] = 249, 224, -1, 247, 228, 248, -1, 248, -1, 196, -1, 197, -1, 249, 228, 250, -1, 250, -1, 196, -1, 197, -1, 149, 227, 122, 224, -1, 132, 227, - 122, 224, -1, 150, 227, 122, 224, -1, 193, 227, + 122, 224, -1, 151, 227, 122, 224, -1, 193, 227, 122, 224, -1, 97, 227, 122, 224, -1, 63, 227, 122, 224, -1, 24, 227, 122, 224, -1, 101, 227, 122, 224, -1, 100, 227, 122, 224, -1, 220, 227, @@ -1111,32 +1111,32 @@ static const yytype_int16 yyrhs[] = 122, 224, -1, 31, 227, 122, 224, -1, 24, 227, 122, 224, -1, -1, 96, 273, 226, 274, 225, 224, -1, 274, 275, -1, 275, -1, 276, -1, 277, -1, - 1, 224, -1, 75, 227, 122, 224, -1, 166, 227, + 1, 224, -1, 75, 227, 122, 224, -1, 167, 227, 122, 224, -1, 174, 226, 279, 225, 224, -1, 279, 280, -1, 280, -1, 281, -1, 282, -1, 1, 224, - -1, 218, 227, 207, 224, -1, -1, 283, 166, 226, + -1, 218, 227, 207, 224, -1, -1, 283, 167, 226, 284, 225, 224, -1, 284, 285, -1, 285, -1, 286, -1, 288, -1, 287, -1, 1, 224, -1, 97, 227, 122, 224, -1, 188, 227, 236, 224, -1, 188, 227, 201, 224, -1, -1, 215, 289, 227, 290, 224, -1, 290, 228, 291, -1, 291, -1, 219, -1, 113, -1, - 39, -1, 163, -1, 68, -1, 66, -1, 162, -1, + 39, -1, 164, -1, 68, -1, 66, -1, 163, -1, -1, 113, 293, 226, 294, 225, 224, -1, 294, 295, -1, 295, -1, 296, -1, 297, -1, 298, -1, 303, -1, 302, -1, 299, -1, 300, -1, 301, -1, 307, -1, 1, 224, -1, 97, 227, 122, 224, -1, 219, 227, 122, 224, -1, 117, 227, 122, 224, -1, 32, - 227, 207, 224, -1, 133, 227, 122, 224, -1, 167, + 227, 207, 224, -1, 133, 227, 122, 224, -1, 150, 227, 122, 224, -1, 17, 227, 122, 224, -1, -1, 198, 304, 227, 305, 224, -1, 305, 228, 306, -1, - 306, -1, 157, -1, 159, -1, 161, -1, 162, -1, + 306, -1, 158, -1, 160, -1, 162, -1, 163, -1, 168, -1, 48, -1, 189, -1, 176, -1, 180, -1, - 199, -1, 191, -1, 164, -1, 178, -1, 185, -1, - 170, -1, 204, -1, 190, -1, 158, -1, 173, -1, - 177, -1, 165, -1, -1, 62, 308, 227, 309, 224, + 199, -1, 191, -1, 165, -1, 178, -1, 185, -1, + 170, -1, 204, -1, 190, -1, 159, -1, 173, -1, + 177, -1, 166, -1, -1, 62, 308, 227, 309, 224, -1, 309, 228, 310, -1, 310, -1, 66, 229, 128, -1, 66, -1, 18, 229, 128, -1, 18, -1, 148, - 229, 128, -1, 148, -1, 68, -1, 216, -1, 163, + 229, 128, -1, 148, -1, 68, -1, 216, -1, 164, -1, 200, -1, 223, -1, 39, -1, 25, -1, 181, -1, 127, -1, 4, -1, 178, -1, 169, -1, 205, -1, 173, -1, 129, -1, 186, -1, 94, -1, -1, @@ -1181,14 +1181,14 @@ static const yytype_int16 yyrhs[] = -1, 378, -1, 379, -1, 380, -1, 1, 224, -1, 97, 227, 122, 224, -1, 219, 227, 122, 224, -1, -1, 215, 381, 227, 382, 224, -1, 382, 228, 383, - -1, 383, -1, 68, -1, 216, -1, 163, -1, 200, + -1, 383, -1, 68, -1, 216, -1, 164, -1, 200, -1, 223, -1, 203, -1, 130, -1, 202, -1, 173, - -1, 156, -1, -1, 160, 385, 226, 386, 225, 224, + -1, 157, -1, -1, 161, 385, 226, 386, 225, 224, -1, 386, 387, -1, 387, -1, 388, -1, 389, -1, 1, 224, -1, 97, 227, 122, 224, -1, -1, 215, 390, 227, 391, 224, -1, 391, 228, 392, -1, 392, - -1, 68, -1, 216, -1, 163, -1, 200, -1, 223, - -1, 203, -1, 130, -1, 202, -1, 173, -1, 156, + -1, 68, -1, 216, -1, 164, -1, 200, -1, 223, + -1, 203, -1, 130, -1, 202, -1, 173, -1, 157, -1, -1, 18, 394, 226, 395, 225, 224, -1, 395, 396, -1, 396, -1, 397, -1, 398, -1, 399, -1, 400, -1, 401, -1, 402, -1, 404, -1, 403, -1, @@ -1196,7 +1196,7 @@ static const yytype_int16 yyrhs[] = 409, -1, 1, 224, -1, 97, 227, 122, 224, -1, 55, 227, 122, 224, -1, 220, 227, 122, 224, -1, 141, 227, 122, 224, -1, 3, 227, 122, 224, -1, - 167, 227, 122, 224, -1, 121, 227, 107, 224, -1, + 150, 227, 122, 224, -1, 121, 227, 107, 224, -1, 5, 227, 171, 224, -1, 5, 227, 172, 224, -1, -1, 62, 406, 227, 407, 224, -1, 407, 228, 408, -1, 408, -1, 8, -1, 192, -1, 32, 227, 207, @@ -1234,10 +1234,10 @@ static const yytype_int16 yyrhs[] = -1, 7, 227, 234, 224, -1, 213, 227, 234, 224, -1, 212, 227, 234, 224, -1, 47, 227, 107, 224, -1, 59, 227, 207, 224, -1, 222, 227, 207, 224, - -1, 151, 227, 207, 224, -1, 154, 227, 207, 224, - -1, 155, 227, 207, 224, -1, 153, 227, 207, 224, - -1, 153, 227, 210, 224, -1, 152, 227, 207, 224, - -1, 152, 227, 210, 224, -1, 115, 227, 234, 224, + -1, 152, 227, 207, 224, -1, 155, 227, 207, 224, + -1, 156, 227, 207, 224, -1, 154, 227, 207, 224, + -1, 154, 227, 210, 224, -1, 153, 227, 207, 224, + -1, 153, 227, 210, 224, -1, 115, 227, 234, 224, -1, 12, 227, 234, 224, -1, 114, 227, 207, 224, -1, 116, 227, 234, 224, -1, 145, 227, 207, 224, -1, 105, 227, 207, 224, -1, 211, 227, 207, 224, @@ -1246,17 +1246,17 @@ static const yytype_int16 yyrhs[] = -1, 30, 227, 122, 224, -1, 184, 227, 122, 224, -1, 119, 227, 207, 224, -1, 26, 227, 207, 224, -1, 208, 227, 234, 224, -1, -1, 112, 482, 227, - 483, 224, -1, 483, 228, 484, -1, 484, -1, 157, - -1, 159, -1, 161, -1, 162, -1, 168, -1, 48, + 483, 224, -1, 483, 228, 484, -1, 484, -1, 158, + -1, 160, -1, 162, -1, 163, -1, 168, -1, 48, -1, 189, -1, 176, -1, 180, -1, 199, -1, 191, - -1, 164, -1, 178, -1, 185, -1, 170, -1, 204, - -1, 190, -1, 158, -1, 173, -1, 177, -1, 165, + -1, 165, -1, 178, -1, 185, -1, 170, -1, 204, + -1, 190, -1, 159, -1, 173, -1, 177, -1, 166, -1, -1, 110, 486, 227, 487, 224, -1, 487, 228, - 488, -1, 488, -1, 157, -1, 159, -1, 161, -1, - 162, -1, 168, -1, 189, -1, 48, -1, 176, -1, - 180, -1, 199, -1, 191, -1, 164, -1, 178, -1, - 185, -1, 170, -1, 204, -1, 190, -1, 158, -1, - 173, -1, 177, -1, 165, -1, 92, 227, 107, 224, + 488, -1, 488, -1, 158, -1, 160, -1, 162, -1, + 163, -1, 168, -1, 189, -1, 48, -1, 176, -1, + 180, -1, 199, -1, 191, -1, 165, -1, 178, -1, + 185, -1, 170, -1, 204, -1, 190, -1, 159, -1, + 173, -1, 177, -1, 166, -1, 92, 227, 107, 224, -1, 93, 227, 107, 224, -1, 20, 227, 107, 224, -1, 14, 226, 493, 225, 224, -1, 493, 494, -1, 494, -1, 500, -1, 496, -1, 497, -1, 498, -1, @@ -1319,32 +1319,32 @@ static const yytype_uint16 yyrline[] = 1941, 1962, 1962, 1963, 1963, 1963, 1965, 1972, 1971, 1977, 1977, 1978, 1982, 1986, 1990, 1994, 1998, 2002, 2006, 2010, 2014, 2024, 2023, 2093, 2093, 2094, 2094, 2094, 2095, 2095, - 2095, 2096, 2096, 2096, 2097, 2097, 2097, 2098, 2098, 2099, - 2101, 2107, 2113, 2119, 2132, 2145, 2151, 2157, 2161, 2170, - 2169, 2174, 2174, 2175, 2179, 2185, 2196, 2202, 2208, 2214, - 2230, 2229, 2255, 2255, 2256, 2256, 2256, 2258, 2278, 2288, - 2287, 2314, 2314, 2315, 2315, 2315, 2317, 2323, 2332, 2334, - 2334, 2335, 2335, 2337, 2355, 2354, 2377, 2377, 2378, 2378, - 2378, 2380, 2386, 2395, 2398, 2398, 2399, 2399, 2400, 2400, - 2401, 2401, 2402, 2402, 2403, 2403, 2404, 2405, 2406, 2406, - 2407, 2407, 2408, 2408, 2409, 2409, 2410, 2410, 2411, 2411, - 2412, 2412, 2413, 2413, 2414, 2414, 2415, 2415, 2416, 2416, - 2417, 2417, 2418, 2419, 2420, 2420, 2421, 2421, 2422, 2423, - 2424, 2425, 2425, 2426, 2429, 2434, 2440, 2446, 2452, 2457, - 2462, 2467, 2472, 2477, 2482, 2487, 2492, 2497, 2502, 2507, - 2512, 2517, 2523, 2534, 2539, 2544, 2549, 2554, 2559, 2562, - 2567, 2570, 2575, 2580, 2585, 2590, 2595, 2600, 2605, 2610, - 2615, 2620, 2625, 2630, 2639, 2648, 2653, 2658, 2664, 2663, - 2668, 2668, 2669, 2672, 2675, 2678, 2681, 2684, 2687, 2690, - 2693, 2696, 2699, 2702, 2705, 2708, 2711, 2714, 2717, 2720, - 2723, 2726, 2729, 2735, 2734, 2739, 2739, 2740, 2743, 2746, - 2749, 2752, 2755, 2758, 2761, 2764, 2767, 2770, 2773, 2776, - 2779, 2782, 2785, 2788, 2791, 2794, 2797, 2800, 2805, 2810, - 2815, 2824, 2827, 2827, 2828, 2829, 2829, 2830, 2830, 2831, - 2832, 2833, 2834, 2835, 2835, 2836, 2836, 2838, 2843, 2848, - 2853, 2858, 2863, 2868, 2873, 2878, 2883, 2888, 2893, 2901, - 2904, 2904, 2905, 2905, 2906, 2907, 2908, 2909, 2909, 2910, - 2911, 2913, 2919, 2925, 2931, 2937, 2946, 2960, 2966 + 2096, 2097, 2097, 2097, 2098, 2098, 2098, 2099, 2099, 2100, + 2102, 2108, 2114, 2120, 2133, 2146, 2152, 2158, 2162, 2171, + 2170, 2175, 2175, 2176, 2180, 2186, 2197, 2203, 2209, 2215, + 2231, 2230, 2256, 2256, 2257, 2257, 2257, 2259, 2279, 2289, + 2288, 2315, 2315, 2316, 2316, 2316, 2318, 2324, 2333, 2335, + 2335, 2336, 2336, 2338, 2356, 2355, 2378, 2378, 2379, 2379, + 2379, 2381, 2387, 2396, 2399, 2399, 2400, 2400, 2401, 2401, + 2402, 2402, 2403, 2403, 2404, 2404, 2405, 2406, 2407, 2407, + 2408, 2408, 2409, 2409, 2410, 2410, 2411, 2411, 2412, 2412, + 2413, 2413, 2414, 2414, 2415, 2415, 2416, 2416, 2417, 2417, + 2418, 2418, 2419, 2420, 2421, 2421, 2422, 2422, 2423, 2424, + 2425, 2426, 2426, 2427, 2430, 2435, 2441, 2447, 2453, 2458, + 2463, 2468, 2473, 2478, 2483, 2488, 2493, 2498, 2503, 2508, + 2513, 2518, 2524, 2535, 2540, 2545, 2550, 2555, 2560, 2563, + 2568, 2571, 2576, 2581, 2586, 2591, 2596, 2601, 2606, 2611, + 2616, 2621, 2626, 2631, 2640, 2649, 2654, 2659, 2665, 2664, + 2669, 2669, 2670, 2673, 2676, 2679, 2682, 2685, 2688, 2691, + 2694, 2697, 2700, 2703, 2706, 2709, 2712, 2715, 2718, 2721, + 2724, 2727, 2730, 2736, 2735, 2740, 2740, 2741, 2744, 2747, + 2750, 2753, 2756, 2759, 2762, 2765, 2768, 2771, 2774, 2777, + 2780, 2783, 2786, 2789, 2792, 2795, 2798, 2801, 2806, 2811, + 2816, 2825, 2828, 2828, 2829, 2830, 2830, 2831, 2831, 2832, + 2833, 2834, 2835, 2836, 2836, 2837, 2837, 2839, 2844, 2849, + 2854, 2859, 2864, 2869, 2874, 2879, 2884, 2889, 2894, 2902, + 2905, 2905, 2906, 2906, 2907, 2908, 2909, 2910, 2910, 2911, + 2912, 2914, 2920, 2926, 2932, 2938, 2947, 2961, 2967 }; #endif @@ -1386,11 +1386,11 @@ static const char *const yytname[] = "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE", "SECONDS", "MINUTES", "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS", "SEND_PASSWORD", "SENDQ", "SERVERHIDE", "SERVERINFO", "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE", - "SQUIT", "SSL_CERTIFICATE_FILE", "SSL_DH_PARAM_FILE", "STATS_E_DISABLED", - "STATS_I_OPER_ONLY", "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", - "STATS_P_OPER_ONLY", "T_ALL", "T_BOTS", "T_CALLERID", "T_CCONN", - "T_CLUSTER", "T_DEAF", "T_DEBUG", "T_DLINE", "T_EXTERNAL", - "T_FARCONNECT", "T_FILE", "T_FINGERPRINT", "T_FULL", "T_GLOBOPS", + "SQUIT", "SSL_CERTIFICATE_FILE", "SSL_CERTIFICATE_FINGERPRINT", + "SSL_DH_PARAM_FILE", "STATS_E_DISABLED", "STATS_I_OPER_ONLY", + "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "T_ALL", + "T_BOTS", "T_CALLERID", "T_CCONN", "T_CLUSTER", "T_DEAF", "T_DEBUG", + "T_DLINE", "T_EXTERNAL", "T_FARCONNECT", "T_FILE", "T_FULL", "T_GLOBOPS", "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS", "T_LOG", "T_MAX_CLIENTS", "T_NCHANGE", "T_NONONREG", "T_OPERWALL", "T_RECVQ", "T_REJ", "T_RESTART", "T_SERVER", "T_SERVICE", "T_SERVICES_NAME", "T_SERVNOTICE", "T_SET", @@ -1423,14 +1423,14 @@ static const char *const yytname[] = "logging_file_size", "logging_file_type", "$@3", "logging_file_type_items", "logging_file_type_item", "oper_entry", "$@4", "oper_items", "oper_item", "oper_name", "oper_user", "oper_password", - "oper_encrypted", "oper_rsa_public_key_file", "oper_fingerprint", - "oper_class", "oper_umodes", "$@5", "oper_umodes_items", - "oper_umodes_item", "oper_flags", "$@6", "oper_flags_items", - "oper_flags_item", "class_entry", "$@7", "class_items", "class_item", - "class_name", "class_ping_time", "class_number_per_ip", - "class_connectfreq", "class_max_number", "class_max_global", - "class_max_local", "class_max_ident", "class_sendq", "class_recvq", - "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6", + "oper_encrypted", "oper_rsa_public_key_file", + "oper_ssl_certificate_fingerprint", "oper_class", "oper_umodes", "$@5", + "oper_umodes_items", "oper_umodes_item", "oper_flags", "$@6", + "oper_flags_items", "oper_flags_item", "class_entry", "$@7", + "class_items", "class_item", "class_name", "class_ping_time", + "class_number_per_ip", "class_connectfreq", "class_max_number", + "class_max_global", "class_max_local", "class_max_ident", "class_sendq", + "class_recvq", "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6", "class_number_per_cidr", "class_min_idle", "class_max_idle", "class_flags", "$@8", "class_flags_items", "class_flags_item", "listen_entry", "$@9", "listen_flags", "$@10", "listen_flags_items", @@ -1448,40 +1448,40 @@ static const char *const yytname[] = "cluster_type", "$@18", "cluster_types", "cluster_type_item", "connect_entry", "$@19", "connect_items", "connect_item", "connect_name", "connect_host", "connect_vhost", "connect_send_password", - "connect_accept_password", "connect_fingerprint", "connect_port", - "connect_aftype", "connect_flags", "$@20", "connect_flags_items", - "connect_flags_item", "connect_encrypted", "connect_hub_mask", - "connect_leaf_mask", "connect_class", "connect_ssl_cipher_list", - "kill_entry", "$@21", "kill_items", "kill_item", "kill_user", - "kill_reason", "deny_entry", "$@22", "deny_items", "deny_item", - "deny_ip", "deny_reason", "exempt_entry", "exempt_items", "exempt_item", - "exempt_ip", "gecos_entry", "$@23", "gecos_items", "gecos_item", - "gecos_name", "gecos_reason", "general_entry", "general_items", - "general_item", "general_max_watch", "general_gline_enable", - "general_gline_duration", "general_gline_request_duration", - "general_gline_min_cidr", "general_gline_min_cidr6", - "general_tkline_expire_notices", "general_kill_chase_time_limit", - "general_hide_spoof_ips", "general_ignore_bogus_ts", - "general_failed_oper_notice", "general_anti_nick_flood", - "general_max_nick_time", "general_max_nick_changes", - "general_max_accept", "general_anti_spam_exit_message_time", - "general_ts_warn_delta", "general_ts_max_delta", - "general_havent_read_conf", "general_invisible_on_connect", - "general_warn_no_nline", "general_stats_e_disabled", - "general_stats_o_oper_only", "general_stats_P_oper_only", - "general_stats_k_oper_only", "general_stats_i_oper_only", - "general_pace_wait", "general_caller_id_wait", - "general_opers_bypass_callerid", "general_pace_wait_simple", - "general_short_motd", "general_no_oper_flood", - "general_true_no_oper_flood", "general_oper_pass_resv", - "general_dots_in_ident", "general_max_targets", "general_use_egd", - "general_egdpool_path", "general_services_name", "general_ping_cookie", - "general_disable_auth", "general_throttle_time", "general_oper_umodes", - "$@24", "umode_oitems", "umode_oitem", "general_oper_only_umodes", - "$@25", "umode_items", "umode_item", "general_min_nonwildcard", - "general_min_nonwildcard_simple", "general_default_floodcount", - "channel_entry", "channel_items", "channel_item", - "channel_disable_fake_channels", "channel_knock_delay", + "connect_accept_password", "connect_ssl_certificate_fingerprint", + "connect_port", "connect_aftype", "connect_flags", "$@20", + "connect_flags_items", "connect_flags_item", "connect_encrypted", + "connect_hub_mask", "connect_leaf_mask", "connect_class", + "connect_ssl_cipher_list", "kill_entry", "$@21", "kill_items", + "kill_item", "kill_user", "kill_reason", "deny_entry", "$@22", + "deny_items", "deny_item", "deny_ip", "deny_reason", "exempt_entry", + "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@23", + "gecos_items", "gecos_item", "gecos_name", "gecos_reason", + "general_entry", "general_items", "general_item", "general_max_watch", + "general_gline_enable", "general_gline_duration", + "general_gline_request_duration", "general_gline_min_cidr", + "general_gline_min_cidr6", "general_tkline_expire_notices", + "general_kill_chase_time_limit", "general_hide_spoof_ips", + "general_ignore_bogus_ts", "general_failed_oper_notice", + "general_anti_nick_flood", "general_max_nick_time", + "general_max_nick_changes", "general_max_accept", + "general_anti_spam_exit_message_time", "general_ts_warn_delta", + "general_ts_max_delta", "general_havent_read_conf", + "general_invisible_on_connect", "general_warn_no_nline", + "general_stats_e_disabled", "general_stats_o_oper_only", + "general_stats_P_oper_only", "general_stats_k_oper_only", + "general_stats_i_oper_only", "general_pace_wait", + "general_caller_id_wait", "general_opers_bypass_callerid", + "general_pace_wait_simple", "general_short_motd", + "general_no_oper_flood", "general_true_no_oper_flood", + "general_oper_pass_resv", "general_dots_in_ident", "general_max_targets", + "general_use_egd", "general_egdpool_path", "general_services_name", + "general_ping_cookie", "general_disable_auth", "general_throttle_time", + "general_oper_umodes", "$@24", "umode_oitems", "umode_oitem", + "general_oper_only_umodes", "$@25", "umode_items", "umode_item", + "general_min_nonwildcard", "general_min_nonwildcard_simple", + "general_default_floodcount", "channel_entry", "channel_items", + "channel_item", "channel_disable_fake_channels", "channel_knock_delay", "channel_knock_delay_channel", "channel_max_chans_per_user", "channel_max_chans_per_oper", "channel_max_bans", "channel_default_split_user_count", "channel_default_split_server_count", @@ -1836,170 +1836,170 @@ static const yytype_int16 yydefgoto[] = /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -736 +#define YYPACT_NINF -990 static const yytype_int16 yypact[] = { - -736, 630, -736, -163, -195, -186, -736, -736, -736, -184, - -736, -174, -736, -736, -736, -172, -736, -736, -736, -148, - -145, -736, -143, -138, -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, 311, - 925, -125, -92, -71, 25, -58, 424, -53, -50, -38, - 49, -22, -20, 2, 622, 338, 27, 9, 26, 39, - -131, -16, 51, 70, 8, -736, -736, -736, -736, -736, - 72, 74, 76, 80, 83, 98, 100, 103, 104, 110, - 116, 118, 325, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, 650, 352, 189, -736, - 122, 15, -736, -736, 65, -736, 123, 127, 129, 131, - 132, 133, 134, 136, 137, 139, 140, 141, 143, 144, - 148, 150, 151, 152, 153, 155, 156, 158, 159, 160, - 161, 164, -736, 165, -736, 166, 170, 171, 178, 183, - 185, 188, 190, 191, 192, 194, 199, 205, 206, 207, - 210, 213, 214, 107, -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, 475, 6, 278, 48, 215, 216, 46, -736, - -736, -736, 11, 489, 17, -736, 218, 220, 221, 224, - 225, 228, 229, 230, 7, -736, -736, -736, -736, -736, - -736, -736, -736, -736, 124, 231, 233, 235, 236, 239, - 247, 248, 250, 252, 257, 258, 259, 262, 268, 269, - 270, 271, 21, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, 35, 281, 276, 18, -736, -736, -736, 120, -736, - 282, 62, -736, -736, 5, -736, 291, 294, 380, 287, - -736, 411, 413, 315, 417, 418, 418, 418, 419, 420, - 421, 323, 334, 322, -736, 324, 320, 326, 327, -736, - 330, 333, 335, 336, 337, 340, 341, 344, 346, 347, - 353, 356, 186, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - 328, 358, 360, 361, 362, 363, 364, -736, 367, 370, - 371, 372, 375, 377, 383, 279, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, 384, 385, 22, -736, -736, -736, 439, 389, - -736, -736, 387, 388, 20, -736, -736, -736, 400, 418, - 418, 458, 410, 511, 497, 431, 418, 433, 513, 518, - 418, 519, 435, 436, 445, 418, 520, 521, 418, 548, - 552, 553, 554, 456, 450, 465, 453, 477, 418, 418, - 478, 481, 482, -182, -139, 483, 486, 560, 418, 490, - 491, 418, 418, 493, 494, 459, -736, 479, 480, 484, - -736, 495, 496, 500, 501, 502, 32, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, 507, 509, 45, - -736, -736, -736, 485, 512, 515, -736, 517, -736, 10, - -736, -736, -736, -736, -736, 580, 584, 514, -736, 522, - 530, 534, 14, -736, -736, -736, 524, 535, 536, -736, - 537, 538, 539, 540, -736, 541, 12, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, 545, 544, 549, - 550, 4, -736, -736, -736, -736, 503, 533, 565, 598, - 568, 571, 572, 418, 556, -736, -736, 599, 574, 602, - 638, 675, 661, 662, 663, 664, 665, 666, 682, 669, - -98, 59, 672, 673, 573, -736, 575, 569, -736, 89, - -736, -736, -736, -736, 591, 576, -736, 577, 679, 578, - -736, 581, 582, -736, 583, 19, -736, -736, -736, -736, - 587, 588, 596, -736, 600, 604, 607, 608, 579, 612, - 614, 615, 616, 617, 619, 620, 621, -736, -736, 700, - 716, 418, 623, 719, 742, 418, 744, 746, 418, 686, - 747, 748, 418, 750, 750, 628, -736, -736, 751, 121, - 753, 660, 754, 758, 637, 760, 761, 763, 762, 765, - 766, 767, 648, -736, 771, 773, 674, -736, 684, -736, - 774, 775, 688, -736, 690, 692, 693, 695, 696, 703, - 704, 705, 707, 708, 709, 713, 715, 718, 721, 724, - 726, 727, 729, 731, 732, 733, 734, 735, 736, 739, - 657, 740, 701, 741, 743, 749, 752, 755, 756, 757, - 759, 764, 768, 769, 770, 776, 777, 781, 782, 783, - 784, 785, 786, -736, -736, 802, 678, 772, 821, 792, - 840, 844, 846, 787, -736, 847, 848, 788, -736, -736, - 849, 850, 789, 867, 790, -736, 791, 793, -736, -736, - 853, 855, 794, -736, -736, 856, 778, 795, 860, 862, - 864, 865, 796, 869, 797, -736, -736, 875, 876, 891, - 800, -736, 801, 803, 806, 807, 808, 809, 810, 811, - -736, 812, 813, 814, 815, 816, 817, 818, 819, 820, - 822, 823, 824, 825, -736, -736, -194, -736, -736, -736, - -187, -736, 826, 827, -736, -736, 897, 799, 828, -736, - 829, -736, 66, 830, -736, -736, 898, 831, 923, 832, - -736, -736, -736, -736, -736, -736, -736, -736, 418, 418, - 418, 418, 418, 418, 418, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, 833, 835, 836, -36, 837, - 838, 839, 841, 842, 843, 845, 851, 852, 854, 265, - 857, 858, -736, 859, 861, 863, 866, 868, 870, 871, - 16, 872, 873, 874, 877, 878, 879, 880, -736, 881, - 882, -736, -736, 883, 884, -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, -171, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -155, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, 885, - 886, 275, 887, 888, 889, 890, 892, -736, 893, 894, - -736, 895, 896, 0, 901, 899, -736, -736, -736, -736, - 900, 902, -736, 904, 905, 476, 906, 907, 908, 909, - 745, 910, -736, 911, 912, 913, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -98, - -736, 59, -736, -736, 914, 393, -736, -736, 915, 916, - 917, -736, 75, -736, -736, -736, -736, -736, 918, 738, - 921, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -133, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, 750, 750, 750, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -124, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, 657, -736, 701, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -104, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -68, -736, 948, 867, 922, - -736, -736, -736, -736, -736, 919, -736, -736, 920, -736, - -736, -736, -736, 924, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -43, -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, -30, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -21, -736, -736, 942, -90, 927, 926, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -15, - -736, -736, -736, -36, -736, -736, -736, -736, 16, -736, - -736, -736, 275, -736, 0, -736, -736, -736, 940, 943, - 944, -736, 476, -736, 745, -736, 393, 928, 931, 932, - 516, -736, -736, 738, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, 61, -736, -736, -736, 516, -736 + -990, 660, -990, -163, -210, -201, -990, -990, -990, -195, + -990, -192, -990, -990, -990, -190, -990, -990, -990, -178, + -172, -990, -150, -148, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, 248, + 886, -127, -125, -106, 27, -92, 424, -71, -58, -53, + 49, -42, -40, -34, 320, 395, -28, 9, 26, -20, + -131, -16, 1, 38, 8, -990, -990, -990, -990, -990, + 87, 90, 103, 108, 112, 113, 115, 116, 117, 119, + 122, 123, 337, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, 700, 380, 51, -990, + 125, 25, -990, -990, 80, -990, 126, 127, 130, 133, + 134, 136, 139, 140, 143, 147, 148, 150, 151, 152, + 153, 155, 157, 159, 160, 161, 162, 163, 164, 167, + 168, 171, -990, 172, -990, 176, 177, 182, 183, 190, + 191, 194, 195, 196, 197, 199, 200, 201, 205, 206, + 207, 211, 212, 107, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, 330, 6, 11, 101, 216, 218, 46, -990, + -990, -990, 13, 501, 17, -990, 219, 221, 222, 230, + 233, 235, 236, 239, 7, -990, -990, -990, -990, -990, + -990, -990, -990, -990, 189, 243, 246, 247, 252, 254, + 258, 259, 260, 261, 262, 263, 266, 267, 270, 271, + 276, 278, 21, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, 85, 251, 280, 18, -990, -990, -990, 73, -990, + 282, 62, -990, -990, 5, -990, 384, 389, 391, 291, + -990, 412, 413, 315, 416, 417, 417, 417, 418, 419, + 425, 334, 335, 313, -990, 323, 321, 324, 326, -990, + 338, 340, 341, 344, 345, 348, 355, 357, 358, 359, + 360, 364, 186, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + 368, 367, 369, 370, 372, 374, 375, -990, 376, 377, + 378, 382, 385, 386, 387, 279, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, 390, 392, 22, -990, -990, -990, 428, 383, + -990, -990, 393, 402, 20, -990, -990, -990, 404, 417, + 417, 457, 423, 524, 516, 435, 417, 436, 537, 542, + 417, 543, 438, 441, 445, 417, 546, 548, 417, 550, + 551, 552, 555, 456, 439, 458, 440, 462, 417, 417, + 463, 464, 466, 83, 94, 469, 472, 559, 417, 475, + 477, 417, 417, 478, 479, 465, -990, 468, 460, 476, + -990, 480, 482, 483, 485, 487, 32, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, 490, 491, 39, + -990, -990, -990, 498, 496, 497, -990, 502, -990, 10, + -990, -990, -990, -990, -990, 568, 571, 504, -990, 506, + 508, 509, 14, -990, -990, -990, 507, 510, 517, -990, + 518, 519, 521, 522, -990, 525, 12, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, 529, 530, 531, + 532, 4, -990, -990, -990, -990, 499, 526, 544, 582, + 553, 556, 557, 417, 547, -990, -990, 603, 558, 644, + 661, 663, 645, 650, 653, 655, 656, 657, 677, 664, + 57, 59, 666, 667, 569, -990, 570, 565, -990, 74, + -990, -990, -990, -990, 588, 572, -990, 573, 676, 576, + -990, 577, 575, -990, 578, 19, -990, -990, -990, -990, + 583, 586, 587, -990, 589, 592, 594, 595, 421, 598, + 599, 600, 601, 602, 605, 606, 607, -990, -990, 699, + 720, 417, 609, 725, 730, 417, 731, 732, 417, 711, + 733, 734, 417, 737, 737, 621, -990, -990, 724, 104, + 736, 641, 738, 740, 625, 741, 743, 748, 744, 750, + 751, 752, 646, -990, 753, 755, 654, -990, 659, -990, + 771, 775, 674, -990, 681, 685, 686, 688, 690, 694, + 695, 696, 697, 698, 702, 709, 712, 714, 716, 717, + 719, 728, 729, 742, 745, 746, 747, 754, 756, 757, + 691, 758, 726, 759, 760, 761, 762, 763, 764, 767, + 768, 770, 772, 773, 774, 776, 777, 778, 779, 780, + 781, 782, 783, -990, -990, 801, 693, 721, 802, 794, + 822, 833, 839, 784, -990, 840, 845, 785, -990, -990, + 850, 852, 749, 868, 786, -990, 787, 788, -990, -990, + 855, 857, 789, -990, -990, 871, 792, 790, 873, 892, + 893, 894, 791, 897, 796, -990, -990, 899, 900, 901, + 800, -990, 803, 804, 805, 806, 807, 808, 809, 810, + -990, 811, 812, 813, 814, 815, 816, 817, 818, 819, + 820, 821, 823, 824, -990, -990, -187, -990, -990, -990, + -182, -990, 825, 826, -990, -990, 903, 799, 827, -990, + 828, -990, 97, 829, -990, -990, 924, 830, 932, 831, + -990, -990, -990, -990, -990, -990, -990, -990, 417, 417, + 417, 417, 417, 417, 417, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, 832, 834, 835, -33, 836, + 837, 838, 841, 842, 843, 844, 846, 847, 848, 179, + 849, 851, -990, 853, 854, 856, 858, 859, 860, 861, + 16, 862, 863, 864, 865, 866, 867, 869, -990, 870, + 872, -990, -990, 874, 875, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -171, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -133, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, 876, + 877, 541, 878, 879, 880, 881, 882, -990, 883, 884, + -990, 885, 887, 121, 896, 888, -990, -990, -990, -990, + 889, 890, -990, 891, 895, 527, 898, 902, 904, 905, + 769, 906, -990, 907, 908, 909, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, 57, + -990, 59, -990, -990, 910, 538, -990, -990, 911, 912, + 913, -990, 82, -990, -990, -990, -990, -990, 914, 612, + 917, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -124, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, 737, 737, 737, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -68, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, 691, -990, 726, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -21, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -15, -990, 956, 868, 918, + -990, -990, -990, -990, -990, 915, -990, -990, 916, -990, + -990, -990, -990, 919, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, 50, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, 64, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + 98, -990, -990, 942, -77, 920, 922, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, 99, + -990, -990, -990, -33, -990, -990, -990, -990, 16, -990, + -990, -990, 541, -990, 121, -990, -990, -990, 941, 946, + 948, -990, 527, -990, 769, -990, 538, 925, 926, 927, + 242, -990, -990, 612, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, 109, -990, -990, -990, 242, -990 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -736, -736, -736, -48, -303, -735, -613, -736, -736, 903, - -736, -736, -736, -736, 929, -736, -736, -736, 64, -736, - 63, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, 996, -736, - -736, -736, -736, -736, -736, 585, -736, -736, -736, -736, - 804, -736, -736, -736, -736, 57, -736, -736, -736, -736, - -736, -188, -736, -736, -736, 593, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -150, -736, -736, -736, - -146, -736, -736, -736, 834, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, - -736, -736, -736, -122, -736, -736, -736, -736, -736, -135, - -736, 643, -736, -736, -736, -25, -736, -736, -736, -736, - -736, 644, -736, -736, -736, -736, -736, -736, -736, -99, - -736, -736, -736, -736, -736, -736, 626, -736, -736, -736, - -736, -736, 930, -736, -736, -736, -736, 566, -736, -736, - -736, -736, -736, -118, -736, -736, -736, 592, -736, -736, - -736, -736, -96, -736, -736, -736, 798, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -61, -736, - -736, -736, -736, -736, -736, -736, -736, 689, -736, -736, - -736, -736, -736, 780, -736, -736, -736, -736, 1048, -736, - -736, -736, -736, 779, -736, -736, -736, -736, 997, -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, 73, -736, -736, -736, 79, -736, - -736, -736, -736, -736, 1070, -736, -736, -736, -736, -736, - -736, -736, -736, -736, -736, -736, -736, -736, -736, 933, - -736, -736, -736, -736, -736, -736, -736, -736 + -990, -990, -990, -176, -303, -989, -613, -990, -990, 934, + -990, -990, -990, -990, 921, -990, -990, -990, 70, -990, + 81, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, 1007, -990, + -990, -990, -990, -990, -990, 620, -990, -990, -990, -990, + 923, -990, -990, -990, -990, 75, -990, -990, -990, -990, + -990, -173, -990, -990, -990, 611, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -116, -990, -990, -990, + -112, -990, -990, -990, 793, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -90, -990, -990, -990, -990, -990, -103, + -990, 648, -990, -990, -990, 35, -990, -990, -990, -990, + -990, 668, -990, -990, -990, -990, -990, -990, -990, -86, + -990, -990, -990, -990, -990, -990, 616, -990, -990, -990, + -990, -990, 928, -990, -990, -990, -990, 579, -990, -990, + -990, -990, -990, -100, -990, -990, -990, 596, -990, -990, + -990, -990, -80, -990, -990, -990, 795, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -61, -990, + -990, -990, -990, -990, -990, -990, -990, 689, -990, -990, + -990, -990, -990, 797, -990, -990, -990, -990, 1048, -990, + -990, -990, -990, 798, -990, -990, -990, -990, 998, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, -990, + -990, -990, -990, -990, 76, -990, -990, -990, 77, -990, + -990, -990, -990, -990, 1070, -990, -990, -990, -990, -990, + -990, -990, -990, -990, -990, -990, -990, -990, -990, 931, + -990, -990, -990, -990, -990, -990, -990, -990 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2009,132 +2009,131 @@ static const yytype_int16 yypgoto[] = static const yytype_int16 yytable[] = { 830, 831, 589, 590, 591, 517, 571, 466, 225, 70, - 282, 473, 489, 496, 1042, 489, 109, 829, 517, 282, - 571, 391, 244, 381, 1070, 679, 109, 289, 680, 497, - 1008, 49, 71, 447, 1009, 226, 556, 1010, 518, 72, - 50, 1011, 54, 227, 498, 245, 466, 215, 1112, 448, - 215, 518, 56, 1085, 60, 228, 229, 1086, 230, 231, - 232, 47, 48, 289, 449, 474, 391, 1018, 681, 1087, - 475, 682, 476, 1088, 499, 110, 1018, 246, 64, 519, - 233, 65, 382, 67, 247, 110, 490, 1043, 68, 490, - 556, 1212, 519, 295, 450, 1213, 645, 646, 764, 765, - 1217, 106, 572, 652, 1218, 73, 248, 656, 115, 500, - 249, 1238, 661, 116, 117, 664, 572, 392, 250, 118, - 1221, 251, 252, 290, 1222, 674, 675, 119, 520, 501, - 467, 477, 557, 120, 107, 686, 121, 122, 689, 690, + 282, 473, 473, 496, 489, 489, 49, 1042, 517, 282, + 571, 391, 244, 381, 1070, 50, 109, 289, 109, 497, + 829, 54, 71, 447, 56, 226, 60, 1008, 518, 72, + 466, 1009, 1010, 227, 498, 245, 1011, 215, 64, 448, + 215, 518, 381, 1085, 65, 228, 229, 1086, 230, 231, + 232, 47, 48, 289, 449, 474, 474, 1214, 1215, 1216, + 475, 475, 476, 476, 499, 556, 67, 246, 68, 519, + 233, 391, 382, 1018, 247, 110, 556, 110, 490, 490, + 1043, 1087, 519, 295, 450, 1088, 645, 646, 1018, 106, + 1212, 107, 572, 652, 1213, 73, 248, 656, 115, 500, + 249, 382, 661, 116, 117, 664, 572, 392, 250, 118, + 108, 251, 252, 290, 1238, 674, 675, 119, 520, 501, + 467, 477, 477, 120, 114, 686, 121, 122, 689, 690, 216, 520, 123, 216, 393, 502, 383, 124, 125, 451, - 126, 127, 128, 253, 129, 108, 1223, 452, 453, 290, - 1224, 130, 392, 1019, 217, 131, 132, 217, 114, 467, - 254, 255, 1019, 212, 133, -123, 213, 491, 454, 503, - 491, 1231, 1113, 134, -123, 1232, 557, 315, 214, 393, - 381, 135, 1114, 136, 1233, 137, 256, 138, 1234, 139, - 140, 316, 317, 1235, 222, 318, 223, 1236, 1071, 1242, - 504, 296, 141, 1243, 257, 258, 259, 142, 143, 144, - 573, 145, 146, 147, 574, 468, 148, 283, 224, 740, + 126, 127, 128, 253, 129, 212, 1217, 452, 453, 290, + 1218, 130, 503, 467, 217, 131, 132, 217, 213, 1112, + 254, 557, 255, 214, 133, 383, -123, 392, 454, 1019, + 491, 491, 557, 134, 222, -123, 223, 315, 1056, 1057, + 1058, 135, 224, 136, 1019, 137, 256, 138, 281, 139, + 140, 316, 317, 1221, 393, 318, 294, 1222, 1071, 1223, + 504, 296, 141, 1224, 257, 258, 259, 142, 143, 144, + 573, 145, 146, 147, 574, 468, 148, 283, 297, 740, 749, 505, 534, 299, 573, 714, 283, 734, 574, 722, - 389, 260, 261, 565, 789, 642, 554, 636, 319, 382, - 558, 455, 149, 281, 1020, 768, 769, 703, 150, 151, - 152, 153, 154, 1020, 468, 294, 320, 321, 322, 323, - 707, 487, 484, 324, 1056, 1057, 1058, 325, 297, 473, - 350, 1021, 351, 326, 352, 1267, 567, 569, 1091, 1268, - 1021, 155, 834, 835, 327, 328, 353, 298, 817, 301, - 1196, 302, 821, 303, 558, 824, 329, 304, 1092, 828, - 305, 354, 70, 383, 778, 156, 157, 1093, 158, 159, - 160, 1214, 1215, 1216, 161, 306, 79, 307, 330, 162, - 308, 309, 445, 474, 355, 71, 356, 310, 475, 244, - 476, 357, 72, 311, 1094, 312, 80, 81, 536, 388, - 398, 358, 82, 350, 399, 351, 400, 352, 401, 402, - 403, 404, 245, 405, 406, 331, 407, 408, 409, 353, - 410, 411, 829, 1095, 1096, 412, 359, 413, 414, 415, - 416, 1097, 417, 418, 354, 419, 420, 421, 422, 83, - 84, 423, 425, 427, 246, 85, 86, 428, 429, 477, - 360, 247, 87, 88, 89, 430, 1098, 355, 73, 356, - 431, 615, 432, 580, 357, 433, 581, 434, 435, 436, - 361, 437, 1099, 248, 358, 115, 438, 249, 90, 91, - 116, 117, 439, 440, 441, 250, 118, 442, 251, 252, - 443, 444, 485, 486, 119, 526, 362, 527, 528, 359, - 120, 529, 530, 121, 122, 531, 532, 533, 537, 123, - 538, 1180, 539, 540, 124, 125, 541, 126, 127, 128, - 253, 129, 363, 360, 542, 543, 447, 544, 130, 545, - 1124, 1100, 131, 132, 546, 547, 548, 254, 255, 549, - 496, 133, 448, 361, 1125, 550, 551, 552, 553, 364, - 134, 1126, 582, 564, 632, 563, 497, 449, 135, 568, - 136, 583, 137, 256, 138, 1127, 139, 140, 584, 362, - 585, 498, 586, 1181, 587, 588, 592, 593, 594, 141, - 595, 257, 258, 259, 142, 143, 144, 450, 145, 146, - 147, 596, 1128, 148, 1129, 363, 597, 599, 598, 1182, - 313, 499, 617, 600, 601, 1257, 1183, 603, 260, 261, - 604, 638, 605, 606, 607, 647, 1184, 608, 609, 149, - 1130, 610, 364, 611, 612, 150, 151, 152, 153, 154, - 613, 1239, 1258, 614, 1259, 618, 500, 619, 620, 621, - 622, 623, 451, 1185, 625, 1186, 1187, 626, 627, 628, - 452, 453, 629, 1131, 630, 1132, 501, 644, 155, 1188, - 631, 634, 635, 639, 640, 641, 1189, 648, 649, 650, - 654, 454, 502, 225, 1133, 655, 657, 662, 663, 1260, - 2, 3, 156, 157, 4, 158, 159, 160, 651, 1134, - 653, 161, 658, 659, 5, 1135, 162, 6, 7, 1136, - 226, 315, 660, 8, 1137, 665, 503, 1138, 227, 666, - 667, 668, 1139, 669, 9, 316, 317, 10, 11, 318, - 228, 229, 671, 230, 231, 232, 1140, 670, 1261, 1262, - 672, 1141, 685, 693, 673, 676, 588, 504, 677, 678, - 683, 12, 1142, 684, 455, 233, 13, 687, 688, 1143, - 691, 692, 716, 694, 14, 882, 717, 695, 505, 709, - 742, 696, 319, 798, 799, 800, 801, 802, 803, 804, - 745, 751, 698, 699, 753, 15, 16, 700, 701, 702, - 320, 321, 322, 323, 705, 1263, 706, 324, 718, 710, - 743, 325, 711, 17, 713, 754, 719, 326, 724, 906, - 1032, 1033, 1034, 1035, 1036, 1037, 1038, 720, 327, 328, - 18, 721, 725, 726, 728, 729, 730, 731, 733, 736, - 329, 737, 744, 19, 20, 746, 738, 739, 747, 748, - 750, 752, 755, 756, 757, 758, 759, 760, 761, 762, - 21, 763, 330, 1150, 772, 773, 776, 774, 780, 775, - 781, 783, 784, 782, 22, 785, 1199, 815, 825, 786, - 788, 791, 792, 23, 883, 884, 885, 24, 886, 887, - 793, 888, 889, 816, 794, 890, 819, 891, 795, 331, - 892, 796, 797, 893, 894, 895, 807, 896, 808, 809, - 810, 811, 897, 812, 813, 814, 898, 899, 900, 820, - 818, 822, 832, 823, 826, 827, 901, 829, 907, 908, - 909, 902, 910, 911, 840, 912, 913, 837, 1200, 914, - 843, 915, 848, 833, 916, 836, 838, 917, 918, 919, - 839, 920, 841, 842, 844, 950, 921, 845, 846, 847, - 922, 923, 924, 849, 1201, 850, 853, 854, 851, 953, - 925, 1202, 1151, 1152, 1153, 926, 1154, 1155, 852, 1156, - 1157, 1203, 855, 1158, 856, 1159, 857, 858, 1160, 859, - 860, 1161, 1162, 1163, 949, 1164, 79, 861, 862, 863, - 1165, 864, 865, 866, 1166, 1167, 1168, 867, 1204, 868, - 1205, 1206, 869, 952, 1169, 870, 80, 81, 871, 1170, - 872, 873, 82, 874, 1207, 875, 876, 877, 878, 879, - 880, 1208, 954, 881, 905, 929, 955, 930, 956, 958, - 959, 961, 962, 931, 964, 970, 932, 971, 973, 933, - 934, 935, 976, 936, 977, 974, 978, 979, 937, 83, - 84, 981, 938, 939, 940, 85, 86, 983, 984, 951, - 941, 942, 87, 88, 89, 943, 944, 945, 946, 947, - 948, 957, 960, 985, 967, 968, 963, 969, 972, 1014, - 1028, 982, 975, 980, 986, 987, 1015, 988, 90, 91, - 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, - 999, 1000, 1001, 1002, 1003, 1030, 1004, 1005, 1006, 1007, - 1012, 1013, 1016, 1017, 1027, 1225, 1031, 1039, 1029, 1040, - 1041, 1046, 1047, 1048, 1237, 1049, 1050, 1051, 1248, 1052, - 300, 1249, 1250, 1177, 1178, 1053, 1054, 723, 1055, 1197, - 1269, 1061, 1062, 1063, 1252, 1064, 1251, 1065, 566, 1247, - 1066, 1244, 1067, 1226, 1068, 1069, 1074, 1075, 1076, 735, - 704, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1089, - 1090, 1103, 1104, 1105, 1106, 1117, 1107, 1108, 1109, 1110, - 1111, 488, 715, 1246, 1120, 1266, 1121, 1118, 1122, 1123, - 1146, 1147, 1148, 1149, 1173, 1174, 1175, 1176, 1179, 1192, - 1253, 790, 1198, 1193, 1194, 1211, 1227, 741, 1228, 1229, - 1241, 779, 1254, 1230, 1240, 1255, 1256, 1245, 708, 390, - 446, 1220, 314, 633, 637, 1219, 616, 535, 0, 0, - 0, 0, 0, 643, 0, 0, 0, 0, 0, 0, + 567, 260, 261, 565, 789, 642, 554, 636, 319, 70, + 389, 455, 149, 764, 765, 768, 769, 703, 468, 150, + 151, 152, 153, 154, 707, 298, 320, 321, 322, 323, + 1020, 487, 71, 324, 1231, 834, 835, 325, 1232, 72, + 350, 1257, 351, 326, 352, 1020, 829, 569, 1233, 558, + 679, 155, 1234, 680, 327, 328, 353, 1021, 817, 778, + 558, 681, 821, 1113, 682, 824, 329, 1196, 1258, 828, + 1259, 354, 1021, 1114, 301, 156, 157, 302, 158, 159, + 160, 225, 1235, 1242, 161, 484, 1236, 1243, 330, 162, + 303, 447, 445, 1267, 355, 304, 356, 1268, 79, 305, + 306, 357, 307, 308, 309, 73, 310, 448, 226, 311, + 312, 358, 388, 398, 399, 1260, 227, 400, 80, 81, + 401, 402, 449, 403, 82, 331, 404, 405, 228, 229, + 406, 230, 231, 232, 407, 408, 359, 409, 410, 411, + 412, 350, 413, 351, 414, 352, 415, 416, 417, 418, + 419, 420, 450, 233, 421, 422, 244, 353, 423, 425, + 360, 83, 84, 427, 428, 1261, 1262, 85, 86, 429, + 430, 615, 354, 536, 87, 88, 89, 431, 432, 245, + 361, 433, 434, 435, 436, 115, 437, 438, 439, 362, + 116, 117, 440, 441, 442, 355, 118, 356, 443, 444, + 90, 91, 357, 485, 119, 486, 526, 451, 527, 528, + 120, 246, 358, 121, 122, 452, 453, 529, 247, 123, + 530, 1263, 531, 532, 124, 125, 533, 126, 127, 128, + 537, 129, 363, 538, 539, 563, 454, 359, 130, 540, + 248, 541, 131, 132, 249, 542, 543, 544, 545, 546, + 547, 133, 250, 548, 549, 251, 252, 550, 551, 364, + 134, 360, 496, 552, 632, 553, 580, 564, 135, 568, + 136, 581, 137, 582, 138, 583, 139, 140, 497, 584, + 585, 361, 586, 587, 588, 592, 593, 253, 588, 141, + 362, 1124, 594, 498, 142, 143, 144, 597, 145, 146, + 147, 595, 596, 148, 254, 1125, 255, 598, 599, 455, + 638, 600, 1126, 601, 1091, 798, 799, 800, 801, 802, + 803, 804, 313, 499, 647, 603, 1127, 604, 605, 149, + 256, 606, 607, 363, 1092, 608, 150, 151, 152, 153, + 154, 1239, 609, 1093, 610, 611, 612, 613, 257, 258, + 259, 614, 617, 1128, 618, 1129, 619, 620, 500, 621, + 364, 622, 623, 625, 626, 627, 1180, 639, 155, 628, + 1094, 644, 629, 630, 631, 260, 261, 634, 501, 635, + 640, 1130, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 641, + 648, 649, 156, 157, 502, 158, 159, 160, 650, 1095, + 1096, 161, 651, 653, 654, 658, 162, 1097, 659, 655, + 657, 503, 660, 662, 1131, 663, 1132, 665, 666, 667, + 2, 3, 668, 669, 4, 671, 670, 672, 1181, 673, + 676, 677, 1098, 678, 5, 1133, 683, 6, 7, 684, + 1199, 685, 687, 8, 688, 691, 692, 695, 1099, 693, + 716, 1134, 694, 717, 9, 1182, 1135, 10, 11, 504, + 1136, 315, 1183, 696, 745, 1137, 742, 698, 1138, 699, + 700, 1184, 701, 1139, 702, 316, 317, 705, 706, 318, + 505, 12, 709, 710, 711, 751, 13, 1140, 718, 713, + 719, 724, 1141, 743, 14, 720, 721, 725, 1185, 882, + 1186, 1187, 1200, 1142, 726, 728, 729, 1100, 730, 731, + 1143, 744, 733, 736, 1188, 15, 16, 737, 738, 739, + 746, 1189, 319, 747, 748, 752, 753, 756, 754, 1201, + 755, 750, 757, 17, 906, 758, 1202, 759, 760, 761, + 320, 321, 322, 323, 762, 1203, 763, 324, 772, 773, + 18, 325, 776, 774, 775, 780, 781, 326, 783, 782, + 784, 785, 786, 19, 20, 788, 815, 791, 327, 328, + 792, 793, 1204, 794, 1205, 1206, 795, 1150, 796, 797, + 329, 21, 807, 808, 809, 810, 811, 816, 1207, 812, + 813, 814, 819, 825, 22, 1208, 818, 820, 822, 823, + 826, 827, 330, 23, 829, 832, 833, 24, 837, 883, + 884, 885, 840, 886, 887, 843, 888, 889, 836, 890, + 838, 891, 839, 841, 892, 842, 844, 893, 894, 895, + 848, 896, 845, 846, 847, 849, 897, 850, 851, 331, + 898, 899, 900, 852, 907, 908, 909, 79, 910, 911, + 901, 912, 913, 853, 914, 902, 915, 854, 855, 916, + 950, 953, 917, 918, 919, 856, 920, 80, 81, 857, + 858, 921, 859, 82, 860, 922, 923, 924, 861, 862, + 863, 864, 865, 949, 952, 925, 866, 1151, 1152, 1153, + 926, 1154, 1155, 867, 1156, 1157, 868, 1158, 869, 1159, + 870, 871, 1160, 872, 954, 1161, 1162, 1163, 951, 1164, + 83, 84, 873, 874, 1165, 955, 85, 86, 1166, 1167, + 1168, 956, 958, 87, 88, 89, 875, 959, 1169, 876, + 877, 878, 961, 1170, 962, 964, 963, 970, 879, 971, + 880, 881, 905, 929, 930, 931, 932, 933, 934, 90, + 91, 935, 936, 973, 937, 976, 938, 939, 940, 974, + 941, 942, 943, 944, 945, 946, 947, 948, 957, 960, + 967, 968, 969, 972, 977, 978, 979, 975, 980, 981, + 982, 983, 984, 985, 986, 1014, 1015, 987, 988, 989, + 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, + 1000, 1001, 1002, 1003, 1004, 1005, 1028, 1006, 1007, 1012, + 1013, 1016, 1017, 1027, 1030, 1031, 1039, 1029, 1040, 1041, + 1046, 1047, 1048, 1225, 1237, 1049, 1050, 1051, 1052, 1248, + 1053, 1054, 1055, 1061, 1249, 1062, 1250, 1063, 1064, 1177, + 1065, 300, 1066, 1067, 1068, 1069, 1074, 1075, 1076, 1077, + 1078, 1079, 1178, 1080, 1081, 1269, 1082, 1197, 1083, 1084, + 1089, 1090, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, + 1117, 1111, 723, 1120, 1121, 1122, 1118, 735, 1252, 1123, + 1251, 1247, 1146, 1244, 704, 616, 1147, 715, 1148, 1149, + 1173, 1174, 1175, 1176, 1179, 1192, 1246, 741, 1198, 1193, + 1194, 1211, 1227, 1266, 1228, 1229, 1241, 1240, 1230, 1254, + 1255, 1256, 488, 1226, 790, 779, 1253, 1245, 708, 390, + 633, 446, 314, 1219, 1220, 535, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 555, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 570 + 0, 637, 0, 555, 0, 0, 0, 0, 0, 0, + 0, 0, 643, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 566, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 570 }; #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-736))) + (!!((Yystate) == (-990))) #define yytable_value_is_error(Yytable_value) \ YYID (0) @@ -2142,128 +2141,127 @@ static const yytype_int16 yytable[] = static const yytype_int16 yycheck[] = { 613, 614, 305, 306, 307, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 50, 1, 1, 107, 1, 1, - 1, 1, 1, 1, 8, 207, 1, 1, 210, 17, - 224, 226, 24, 1, 228, 28, 1, 224, 34, 31, - 226, 228, 226, 36, 32, 24, 1, 1, 48, 17, - 1, 34, 226, 224, 226, 48, 49, 228, 51, 52, - 53, 224, 225, 1, 32, 55, 1, 1, 207, 224, - 60, 210, 62, 228, 62, 60, 1, 56, 226, 75, - 73, 226, 60, 226, 63, 60, 75, 123, 226, 75, - 1, 224, 75, 224, 62, 228, 399, 400, 196, 197, + 1, 1, 1, 1, 1, 1, 226, 50, 1, 1, + 1, 1, 1, 1, 8, 226, 1, 1, 1, 17, + 107, 226, 24, 1, 226, 28, 226, 224, 34, 31, + 1, 228, 224, 36, 32, 24, 228, 1, 226, 17, + 1, 34, 1, 224, 226, 48, 49, 228, 51, 52, + 53, 224, 225, 1, 32, 55, 55, 1056, 1057, 1058, + 60, 60, 62, 62, 62, 1, 226, 56, 226, 75, + 73, 1, 60, 1, 63, 60, 1, 60, 75, 75, + 123, 224, 75, 224, 62, 228, 399, 400, 1, 226, 224, 226, 97, 406, 228, 97, 85, 410, 1, 97, - 89, 201, 415, 6, 7, 418, 97, 97, 97, 12, - 224, 100, 101, 97, 228, 428, 429, 20, 124, 117, - 124, 121, 97, 26, 226, 438, 29, 30, 441, 442, + 89, 60, 415, 6, 7, 418, 97, 97, 97, 12, + 226, 100, 101, 97, 201, 428, 429, 20, 124, 117, + 124, 121, 121, 26, 226, 438, 29, 30, 441, 442, 94, 124, 35, 94, 124, 133, 124, 40, 41, 117, 43, 44, 45, 132, 47, 226, 224, 125, 126, 97, - 228, 54, 97, 97, 118, 58, 59, 118, 226, 124, - 149, 150, 97, 226, 67, 166, 226, 166, 146, 167, - 166, 224, 182, 76, 166, 228, 97, 1, 226, 124, - 1, 84, 192, 86, 224, 88, 175, 90, 228, 92, - 93, 15, 16, 224, 226, 19, 226, 228, 192, 224, + 228, 54, 150, 124, 118, 58, 59, 118, 226, 48, + 149, 97, 151, 226, 67, 124, 167, 97, 146, 97, + 167, 167, 97, 76, 226, 167, 226, 1, 9, 10, + 11, 84, 226, 86, 97, 88, 175, 90, 226, 92, + 93, 15, 16, 224, 124, 19, 226, 228, 192, 224, 198, 227, 105, 228, 193, 194, 195, 110, 111, 112, - 215, 114, 115, 116, 219, 219, 119, 218, 226, 225, + 215, 114, 115, 116, 219, 219, 119, 218, 227, 225, 533, 219, 225, 225, 215, 225, 218, 225, 219, 225, - 225, 220, 221, 225, 225, 225, 225, 225, 62, 60, - 215, 219, 145, 226, 188, 196, 197, 225, 151, 152, - 153, 154, 155, 188, 219, 226, 80, 81, 82, 83, - 225, 225, 224, 87, 9, 10, 11, 91, 227, 1, - 1, 215, 3, 97, 5, 224, 166, 225, 13, 228, - 215, 184, 171, 172, 108, 109, 17, 227, 601, 227, - 225, 227, 605, 227, 215, 608, 120, 227, 33, 612, - 227, 32, 1, 124, 225, 208, 209, 42, 211, 212, - 213, 1056, 1057, 1058, 217, 227, 1, 227, 142, 222, - 227, 227, 225, 55, 55, 24, 57, 227, 60, 1, - 62, 62, 31, 227, 69, 227, 21, 22, 224, 227, - 227, 72, 27, 1, 227, 3, 227, 5, 227, 227, - 227, 227, 24, 227, 227, 179, 227, 227, 227, 17, - 227, 227, 107, 98, 99, 227, 97, 227, 227, 227, - 227, 106, 227, 227, 32, 227, 227, 227, 227, 64, - 65, 227, 227, 227, 56, 70, 71, 227, 227, 121, - 121, 63, 77, 78, 79, 227, 131, 55, 97, 57, - 227, 225, 227, 122, 62, 227, 122, 227, 227, 227, - 141, 227, 147, 85, 72, 1, 227, 89, 103, 104, - 6, 7, 227, 227, 227, 97, 12, 227, 100, 101, - 227, 227, 227, 227, 20, 227, 167, 227, 227, 97, - 26, 227, 227, 29, 30, 227, 227, 227, 227, 35, - 227, 68, 227, 227, 40, 41, 227, 43, 44, 45, - 132, 47, 193, 121, 227, 227, 1, 227, 54, 227, - 4, 206, 58, 59, 227, 227, 227, 149, 150, 227, - 1, 67, 17, 141, 18, 227, 227, 227, 227, 220, - 76, 25, 122, 227, 225, 224, 17, 32, 84, 227, - 86, 224, 88, 175, 90, 39, 92, 93, 107, 167, - 107, 32, 207, 130, 107, 107, 107, 107, 107, 105, - 207, 193, 194, 195, 110, 111, 112, 62, 114, 115, - 116, 207, 66, 119, 68, 193, 224, 227, 224, 156, - 225, 62, 224, 227, 227, 39, 163, 227, 220, 221, - 227, 122, 227, 227, 227, 107, 173, 227, 227, 145, - 94, 227, 220, 227, 227, 151, 152, 153, 154, 155, - 227, 1194, 66, 227, 68, 227, 97, 227, 227, 227, - 227, 227, 117, 200, 227, 202, 203, 227, 227, 227, - 125, 126, 227, 127, 227, 129, 117, 207, 184, 216, - 227, 227, 227, 224, 227, 227, 223, 207, 107, 122, - 107, 146, 133, 1, 148, 107, 107, 107, 107, 113, - 0, 1, 208, 209, 4, 211, 212, 213, 207, 163, - 207, 217, 207, 207, 14, 169, 222, 17, 18, 173, - 28, 1, 207, 23, 178, 107, 167, 181, 36, 107, - 107, 107, 186, 207, 34, 15, 16, 37, 38, 19, - 48, 49, 207, 51, 52, 53, 200, 227, 162, 163, - 227, 205, 122, 224, 207, 207, 107, 198, 207, 207, - 207, 61, 216, 207, 219, 73, 66, 207, 207, 223, - 207, 207, 122, 224, 74, 48, 122, 227, 219, 224, - 207, 227, 62, 134, 135, 136, 137, 138, 139, 140, - 122, 122, 227, 227, 122, 95, 96, 227, 227, 227, - 80, 81, 82, 83, 227, 219, 227, 87, 224, 227, - 207, 91, 227, 113, 227, 107, 224, 97, 224, 48, - 798, 799, 800, 801, 802, 803, 804, 227, 108, 109, - 130, 227, 227, 227, 227, 227, 227, 227, 227, 224, - 120, 227, 207, 143, 144, 207, 227, 227, 207, 207, - 224, 207, 107, 122, 122, 122, 122, 122, 122, 107, - 160, 122, 142, 48, 122, 122, 227, 224, 207, 224, - 224, 122, 224, 226, 174, 224, 68, 107, 122, 227, - 227, 224, 224, 183, 157, 158, 159, 187, 161, 162, - 224, 164, 165, 107, 224, 168, 107, 170, 224, 179, - 173, 224, 224, 176, 177, 178, 224, 180, 224, 224, - 224, 224, 185, 224, 224, 224, 189, 190, 191, 107, - 227, 107, 224, 107, 107, 107, 199, 107, 157, 158, - 159, 204, 161, 162, 227, 164, 165, 207, 130, 168, - 107, 170, 224, 122, 173, 122, 122, 176, 177, 178, - 122, 180, 122, 122, 122, 207, 185, 122, 122, 122, - 189, 190, 191, 122, 156, 122, 122, 122, 224, 107, - 199, 163, 157, 158, 159, 204, 161, 162, 224, 164, - 165, 173, 224, 168, 224, 170, 224, 224, 173, 224, - 224, 176, 177, 178, 122, 180, 1, 224, 224, 224, - 185, 224, 224, 224, 189, 190, 191, 224, 200, 224, - 202, 203, 224, 122, 199, 224, 21, 22, 224, 204, - 224, 224, 27, 224, 216, 224, 224, 224, 224, 224, - 224, 223, 122, 224, 224, 224, 122, 224, 122, 122, - 122, 122, 122, 224, 107, 122, 224, 122, 122, 224, - 224, 224, 122, 224, 122, 207, 122, 122, 224, 64, - 65, 122, 224, 224, 224, 70, 71, 122, 122, 227, - 224, 224, 77, 78, 79, 224, 224, 224, 224, 224, - 224, 224, 224, 122, 224, 224, 227, 224, 224, 122, - 122, 224, 227, 227, 224, 224, 227, 224, 103, 104, + 167, 220, 221, 225, 225, 225, 225, 225, 62, 1, + 225, 219, 145, 196, 197, 196, 197, 225, 219, 152, + 153, 154, 155, 156, 225, 227, 80, 81, 82, 83, + 188, 225, 24, 87, 224, 171, 172, 91, 228, 31, + 1, 39, 3, 97, 5, 188, 107, 225, 224, 215, + 207, 184, 228, 210, 108, 109, 17, 215, 601, 225, + 215, 207, 605, 182, 210, 608, 120, 225, 66, 612, + 68, 32, 215, 192, 227, 208, 209, 227, 211, 212, + 213, 1, 224, 224, 217, 224, 228, 228, 142, 222, + 227, 1, 225, 224, 55, 227, 57, 228, 1, 227, + 227, 62, 227, 227, 227, 97, 227, 17, 28, 227, + 227, 72, 227, 227, 227, 113, 36, 227, 21, 22, + 227, 227, 32, 227, 27, 179, 227, 227, 48, 49, + 227, 51, 52, 53, 227, 227, 97, 227, 227, 227, + 227, 1, 227, 3, 227, 5, 227, 227, 227, 227, + 227, 227, 62, 73, 227, 227, 1, 17, 227, 227, + 121, 64, 65, 227, 227, 163, 164, 70, 71, 227, + 227, 225, 32, 224, 77, 78, 79, 227, 227, 24, + 141, 227, 227, 227, 227, 1, 227, 227, 227, 150, + 6, 7, 227, 227, 227, 55, 12, 57, 227, 227, + 103, 104, 62, 227, 20, 227, 227, 117, 227, 227, + 26, 56, 72, 29, 30, 125, 126, 227, 63, 35, + 227, 219, 227, 227, 40, 41, 227, 43, 44, 45, + 227, 47, 193, 227, 227, 224, 146, 97, 54, 227, + 85, 227, 58, 59, 89, 227, 227, 227, 227, 227, + 227, 67, 97, 227, 227, 100, 101, 227, 227, 220, + 76, 121, 1, 227, 225, 227, 122, 227, 84, 227, + 86, 122, 88, 122, 90, 224, 92, 93, 17, 107, + 107, 141, 207, 107, 107, 107, 107, 132, 107, 105, + 150, 4, 107, 32, 110, 111, 112, 224, 114, 115, + 116, 207, 207, 119, 149, 18, 151, 224, 227, 219, + 122, 227, 25, 227, 13, 134, 135, 136, 137, 138, + 139, 140, 225, 62, 107, 227, 39, 227, 227, 145, + 175, 227, 227, 193, 33, 227, 152, 153, 154, 155, + 156, 1194, 227, 42, 227, 227, 227, 227, 193, 194, + 195, 227, 224, 66, 227, 68, 227, 227, 97, 227, + 220, 227, 227, 227, 227, 227, 68, 224, 184, 227, + 69, 207, 227, 227, 227, 220, 221, 227, 117, 227, + 227, 94, 798, 799, 800, 801, 802, 803, 804, 227, + 207, 107, 208, 209, 133, 211, 212, 213, 122, 98, + 99, 217, 207, 207, 107, 207, 222, 106, 207, 107, + 107, 150, 207, 107, 127, 107, 129, 107, 107, 107, + 0, 1, 107, 207, 4, 207, 227, 227, 130, 207, + 207, 207, 131, 207, 14, 148, 207, 17, 18, 207, + 68, 122, 207, 23, 207, 207, 207, 227, 147, 224, + 122, 164, 224, 122, 34, 157, 169, 37, 38, 198, + 173, 1, 164, 227, 122, 178, 207, 227, 181, 227, + 227, 173, 227, 186, 227, 15, 16, 227, 227, 19, + 219, 61, 224, 227, 227, 122, 66, 200, 224, 227, + 224, 224, 205, 207, 74, 227, 227, 227, 200, 48, + 202, 203, 130, 216, 227, 227, 227, 206, 227, 227, + 223, 207, 227, 224, 216, 95, 96, 227, 227, 227, + 207, 223, 62, 207, 207, 207, 122, 122, 107, 157, + 107, 224, 122, 113, 48, 122, 164, 122, 122, 122, + 80, 81, 82, 83, 107, 173, 122, 87, 122, 122, + 130, 91, 227, 224, 224, 207, 224, 97, 122, 226, + 224, 224, 227, 143, 144, 227, 107, 224, 108, 109, + 224, 224, 200, 224, 202, 203, 224, 48, 224, 224, + 120, 161, 224, 224, 224, 224, 224, 107, 216, 224, + 224, 224, 107, 122, 174, 223, 227, 107, 107, 107, + 107, 107, 142, 183, 107, 224, 122, 187, 207, 158, + 159, 160, 227, 162, 163, 107, 165, 166, 122, 168, + 122, 170, 122, 122, 173, 122, 122, 176, 177, 178, + 224, 180, 122, 122, 122, 122, 185, 122, 224, 179, + 189, 190, 191, 224, 158, 159, 160, 1, 162, 163, + 199, 165, 166, 122, 168, 204, 170, 122, 224, 173, + 207, 107, 176, 177, 178, 224, 180, 21, 22, 224, + 224, 185, 224, 27, 224, 189, 190, 191, 224, 224, + 224, 224, 224, 122, 122, 199, 224, 158, 159, 160, + 204, 162, 163, 224, 165, 166, 224, 168, 224, 170, + 224, 224, 173, 224, 122, 176, 177, 178, 227, 180, + 64, 65, 224, 224, 185, 122, 70, 71, 189, 190, + 191, 122, 122, 77, 78, 79, 224, 122, 199, 224, + 224, 224, 122, 204, 122, 107, 227, 122, 224, 122, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 103, + 104, 224, 224, 122, 224, 122, 224, 224, 224, 207, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 122, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 107, 224, 224, 227, 224, - 224, 224, 224, 224, 122, 224, 224, 224, 128, 224, - 74, 128, 128, 1009, 1011, 224, 224, 492, 224, 1022, - 1268, 224, 224, 224, 1234, 224, 1232, 224, 284, 1224, - 224, 1213, 224, 1118, 224, 224, 224, 224, 224, 506, - 456, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 224, 214, 224, 224, 224, 224, - 224, 218, 479, 1222, 224, 1243, 224, 228, 224, 224, + 224, 224, 224, 224, 122, 122, 122, 227, 227, 122, + 224, 122, 122, 122, 224, 122, 227, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 1236, 575, 224, 227, 227, 224, 224, 521, 229, 229, - 224, 559, 224, 229, 227, 224, 224, 1218, 469, 111, - 163, 1088, 92, 365, 384, 1086, 332, 234, -1, -1, - -1, -1, -1, 394, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 262, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 224, 224, 224, 224, 224, 224, 122, 224, 224, 224, + 224, 224, 224, 224, 122, 224, 224, 227, 224, 224, + 224, 224, 224, 107, 122, 224, 224, 224, 224, 128, + 224, 224, 224, 224, 128, 224, 128, 224, 224, 1009, + 224, 74, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 1011, 224, 224, 1268, 224, 1022, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 214, 224, 492, 224, 224, 224, 228, 506, 1234, 224, + 1232, 1224, 224, 1213, 456, 332, 224, 479, 224, 224, + 224, 224, 224, 224, 224, 224, 1222, 521, 224, 227, + 227, 224, 224, 1243, 229, 229, 224, 227, 229, 224, + 224, 224, 218, 1118, 575, 559, 1236, 1218, 469, 111, + 365, 163, 92, 1086, 1088, 234, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 291 + -1, 384, -1, 262, -1, -1, -1, -1, -1, -1, + -1, -1, 394, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 284, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 291 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -2272,7 +2270,7 @@ static const yytype_uint16 yystos[] = { 0, 231, 0, 1, 4, 14, 17, 18, 23, 34, 37, 38, 61, 66, 74, 95, 96, 113, 130, 143, - 144, 160, 174, 183, 187, 232, 237, 242, 266, 272, + 144, 161, 174, 183, 187, 232, 237, 242, 266, 272, 278, 292, 311, 334, 348, 363, 370, 374, 384, 393, 414, 420, 426, 430, 436, 492, 507, 224, 225, 226, 226, 312, 394, 421, 226, 431, 226, 349, 415, 335, @@ -2285,7 +2283,7 @@ static const yytype_uint16 yystos[] = 26, 29, 30, 35, 40, 41, 43, 44, 45, 47, 54, 58, 59, 67, 76, 84, 86, 88, 90, 92, 93, 105, 110, 111, 112, 114, 115, 116, 119, 145, - 151, 152, 153, 154, 155, 184, 208, 209, 211, 212, + 152, 153, 154, 155, 156, 184, 208, 209, 211, 212, 213, 217, 222, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, @@ -2295,7 +2293,7 @@ static const yytype_uint16 yystos[] = 240, 241, 226, 226, 226, 1, 28, 36, 48, 49, 51, 52, 53, 73, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 1, 24, 56, 63, 85, 89, - 97, 100, 101, 132, 149, 150, 175, 193, 194, 195, + 97, 100, 101, 132, 149, 151, 175, 193, 194, 195, 220, 221, 243, 244, 245, 246, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 226, 1, 218, 279, 280, 281, 282, 283, 1, @@ -2306,7 +2304,7 @@ static const yytype_uint16 yystos[] = 142, 179, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 1, 3, 5, 17, 32, 55, 57, 62, 72, 97, - 121, 141, 167, 193, 220, 395, 396, 397, 398, 399, + 121, 141, 150, 193, 220, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 409, 410, 411, 412, 413, 1, 60, 124, 422, 423, 424, 425, 227, 225, 428, 1, 97, 124, 432, 433, 434, 435, 227, 227, @@ -2319,14 +2317,14 @@ static const yytype_uint16 yystos[] = 354, 355, 356, 360, 361, 362, 1, 124, 219, 416, 417, 418, 419, 1, 55, 60, 62, 121, 336, 340, 341, 342, 346, 347, 224, 227, 227, 225, 239, 1, - 75, 166, 274, 275, 276, 277, 1, 17, 32, 62, - 97, 117, 133, 167, 198, 219, 294, 295, 296, 297, + 75, 167, 274, 275, 276, 277, 1, 17, 32, 62, + 97, 117, 133, 150, 198, 219, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 307, 1, 34, 75, 124, 365, 366, 367, 368, 369, 227, 227, 227, 227, 227, 227, 227, 227, 225, 509, 224, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 225, 244, 1, 97, 215, 386, - 387, 388, 389, 224, 227, 225, 280, 166, 227, 225, + 387, 388, 389, 224, 227, 225, 280, 167, 227, 225, 372, 1, 97, 215, 219, 376, 377, 378, 379, 380, 122, 122, 122, 224, 107, 107, 207, 107, 107, 234, 234, 234, 107, 107, 107, 207, 207, 224, 224, 227, @@ -2358,10 +2356,10 @@ static const yytype_uint16 yystos[] = 122, 224, 224, 122, 122, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 48, 157, 158, 159, 161, 162, 164, 165, + 224, 224, 48, 158, 159, 160, 162, 163, 165, 166, 168, 170, 173, 176, 177, 178, 180, 185, 189, 190, - 191, 199, 204, 487, 488, 224, 48, 157, 158, 159, - 161, 162, 164, 165, 168, 170, 173, 176, 177, 178, + 191, 199, 204, 487, 488, 224, 48, 158, 159, 160, + 162, 163, 165, 166, 168, 170, 173, 176, 177, 178, 180, 185, 189, 190, 191, 199, 204, 483, 484, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 122, @@ -2383,20 +2381,20 @@ static const yytype_uint16 yystos[] = 206, 358, 359, 224, 224, 224, 224, 224, 224, 224, 224, 224, 48, 182, 192, 338, 339, 214, 228, 343, 224, 224, 224, 224, 4, 18, 25, 39, 66, 68, - 94, 127, 129, 148, 163, 169, 173, 178, 181, 186, + 94, 127, 129, 148, 164, 169, 173, 178, 181, 186, 200, 205, 216, 223, 309, 310, 224, 224, 224, 224, - 48, 157, 158, 159, 161, 162, 164, 165, 168, 170, + 48, 158, 159, 160, 162, 163, 165, 166, 168, 170, 173, 176, 177, 178, 180, 185, 189, 190, 191, 199, 204, 305, 306, 224, 224, 224, 224, 248, 250, 224, - 68, 130, 156, 163, 173, 200, 202, 203, 216, 223, + 68, 130, 157, 164, 173, 200, 202, 203, 216, 223, 391, 392, 224, 227, 227, 289, 225, 285, 224, 68, - 130, 156, 163, 173, 200, 202, 203, 216, 223, 382, + 130, 157, 164, 173, 200, 202, 203, 216, 223, 382, 383, 224, 224, 228, 235, 235, 235, 224, 228, 488, 484, 224, 228, 224, 228, 107, 345, 224, 229, 229, 229, 224, 228, 224, 228, 224, 228, 122, 201, 236, 227, 224, 224, 228, 333, 408, 359, 339, 128, 128, 128, 310, 306, 392, 224, 224, 224, 39, 66, 68, - 113, 162, 163, 219, 290, 291, 383, 224, 228, 291 + 113, 163, 164, 219, 290, 291, 383, 224, 228, 291 }; #define yyerrok (yyerrstatus = 0) @@ -5530,7 +5528,7 @@ yyreduce: case 400: /* Line 1787 of yacc.c */ -#line 2102 "conf_parser.y" +#line 2103 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); @@ -5539,7 +5537,7 @@ yyreduce: case 401: /* Line 1787 of yacc.c */ -#line 2108 "conf_parser.y" +#line 2109 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf)); @@ -5548,7 +5546,7 @@ yyreduce: case 402: /* Line 1787 of yacc.c */ -#line 2114 "conf_parser.y" +#line 2115 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf)); @@ -5557,7 +5555,7 @@ yyreduce: case 403: /* Line 1787 of yacc.c */ -#line 2120 "conf_parser.y" +#line 2121 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5573,7 +5571,7 @@ yyreduce: case 404: /* Line 1787 of yacc.c */ -#line 2133 "conf_parser.y" +#line 2134 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5589,7 +5587,7 @@ yyreduce: case 405: /* Line 1787 of yacc.c */ -#line 2146 "conf_parser.y" +#line 2147 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf)); @@ -5598,7 +5596,7 @@ yyreduce: case 406: /* Line 1787 of yacc.c */ -#line 2152 "conf_parser.y" +#line 2153 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = (yyvsp[(3) - (4)].number); @@ -5607,7 +5605,7 @@ yyreduce: case 407: /* Line 1787 of yacc.c */ -#line 2158 "conf_parser.y" +#line 2159 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.aftype.value = AF_INET; @@ -5616,7 +5614,7 @@ yyreduce: case 408: /* Line 1787 of yacc.c */ -#line 2162 "conf_parser.y" +#line 2163 "conf_parser.y" { #ifdef IPV6 if (conf_parser_ctx.pass == 2) @@ -5627,7 +5625,7 @@ yyreduce: case 409: /* Line 1787 of yacc.c */ -#line 2170 "conf_parser.y" +#line 2171 "conf_parser.y" { block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } @@ -5635,7 +5633,7 @@ yyreduce: case 413: /* Line 1787 of yacc.c */ -#line 2176 "conf_parser.y" +#line 2177 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN; @@ -5644,7 +5642,7 @@ yyreduce: case 414: /* Line 1787 of yacc.c */ -#line 2180 "conf_parser.y" +#line 2181 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SSL; @@ -5653,7 +5651,7 @@ yyreduce: case 415: /* Line 1787 of yacc.c */ -#line 2186 "conf_parser.y" +#line 2187 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5667,7 +5665,7 @@ yyreduce: case 416: /* Line 1787 of yacc.c */ -#line 2197 "conf_parser.y" +#line 2198 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list); @@ -5676,7 +5674,7 @@ yyreduce: case 417: /* Line 1787 of yacc.c */ -#line 2203 "conf_parser.y" +#line 2204 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list); @@ -5685,7 +5683,7 @@ yyreduce: case 418: /* Line 1787 of yacc.c */ -#line 2209 "conf_parser.y" +#line 2210 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); @@ -5694,7 +5692,7 @@ yyreduce: case 419: /* Line 1787 of yacc.c */ -#line 2215 "conf_parser.y" +#line 2216 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2) @@ -5708,7 +5706,7 @@ yyreduce: case 420: /* Line 1787 of yacc.c */ -#line 2230 "conf_parser.y" +#line 2231 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); @@ -5717,7 +5715,7 @@ yyreduce: case 421: /* Line 1787 of yacc.c */ -#line 2234 "conf_parser.y" +#line 2235 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5742,7 +5740,7 @@ yyreduce: case 427: /* Line 1787 of yacc.c */ -#line 2259 "conf_parser.y" +#line 2260 "conf_parser.y" { if (conf_parser_ctx.pass == 2) @@ -5765,7 +5763,7 @@ yyreduce: case 428: /* Line 1787 of yacc.c */ -#line 2279 "conf_parser.y" +#line 2280 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); @@ -5774,7 +5772,7 @@ yyreduce: case 429: /* Line 1787 of yacc.c */ -#line 2288 "conf_parser.y" +#line 2289 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); @@ -5783,7 +5781,7 @@ yyreduce: case 430: /* Line 1787 of yacc.c */ -#line 2292 "conf_parser.y" +#line 2293 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5809,7 +5807,7 @@ yyreduce: case 436: /* Line 1787 of yacc.c */ -#line 2318 "conf_parser.y" +#line 2319 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); @@ -5818,7 +5816,7 @@ yyreduce: case 437: /* Line 1787 of yacc.c */ -#line 2324 "conf_parser.y" +#line 2325 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); @@ -5827,7 +5825,7 @@ yyreduce: case 443: /* Line 1787 of yacc.c */ -#line 2338 "conf_parser.y" +#line 2339 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5844,7 +5842,7 @@ yyreduce: case 444: /* Line 1787 of yacc.c */ -#line 2355 "conf_parser.y" +#line 2356 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); @@ -5853,7 +5851,7 @@ yyreduce: case 445: /* Line 1787 of yacc.c */ -#line 2359 "conf_parser.y" +#line 2360 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5875,7 +5873,7 @@ yyreduce: case 451: /* Line 1787 of yacc.c */ -#line 2381 "conf_parser.y" +#line 2382 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); @@ -5884,7 +5882,7 @@ yyreduce: case 452: /* Line 1787 of yacc.c */ -#line 2387 "conf_parser.y" +#line 2388 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); @@ -5893,7 +5891,7 @@ yyreduce: case 504: /* Line 1787 of yacc.c */ -#line 2430 "conf_parser.y" +#line 2431 "conf_parser.y" { ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number); } @@ -5901,7 +5899,7 @@ yyreduce: case 505: /* Line 1787 of yacc.c */ -#line 2435 "conf_parser.y" +#line 2436 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.glines = yylval.number; @@ -5910,7 +5908,7 @@ yyreduce: case 506: /* Line 1787 of yacc.c */ -#line 2441 "conf_parser.y" +#line 2442 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number); @@ -5919,7 +5917,7 @@ yyreduce: case 507: /* Line 1787 of yacc.c */ -#line 2447 "conf_parser.y" +#line 2448 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number); @@ -5928,7 +5926,7 @@ yyreduce: case 508: /* Line 1787 of yacc.c */ -#line 2453 "conf_parser.y" +#line 2454 "conf_parser.y" { ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number); } @@ -5936,7 +5934,7 @@ yyreduce: case 509: /* Line 1787 of yacc.c */ -#line 2458 "conf_parser.y" +#line 2459 "conf_parser.y" { ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number); } @@ -5944,7 +5942,7 @@ yyreduce: case 510: /* Line 1787 of yacc.c */ -#line 2463 "conf_parser.y" +#line 2464 "conf_parser.y" { ConfigFileEntry.tkline_expire_notices = yylval.number; } @@ -5952,7 +5950,7 @@ yyreduce: case 511: /* Line 1787 of yacc.c */ -#line 2468 "conf_parser.y" +#line 2469 "conf_parser.y" { ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number); } @@ -5960,7 +5958,7 @@ yyreduce: case 512: /* Line 1787 of yacc.c */ -#line 2473 "conf_parser.y" +#line 2474 "conf_parser.y" { ConfigFileEntry.hide_spoof_ips = yylval.number; } @@ -5968,7 +5966,7 @@ yyreduce: case 513: /* Line 1787 of yacc.c */ -#line 2478 "conf_parser.y" +#line 2479 "conf_parser.y" { ConfigFileEntry.ignore_bogus_ts = yylval.number; } @@ -5976,7 +5974,7 @@ yyreduce: case 514: /* Line 1787 of yacc.c */ -#line 2483 "conf_parser.y" +#line 2484 "conf_parser.y" { ConfigFileEntry.failed_oper_notice = yylval.number; } @@ -5984,7 +5982,7 @@ yyreduce: case 515: /* Line 1787 of yacc.c */ -#line 2488 "conf_parser.y" +#line 2489 "conf_parser.y" { ConfigFileEntry.anti_nick_flood = yylval.number; } @@ -5992,7 +5990,7 @@ yyreduce: case 516: /* Line 1787 of yacc.c */ -#line 2493 "conf_parser.y" +#line 2494 "conf_parser.y" { ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); } @@ -6000,7 +5998,7 @@ yyreduce: case 517: /* Line 1787 of yacc.c */ -#line 2498 "conf_parser.y" +#line 2499 "conf_parser.y" { ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number); } @@ -6008,7 +6006,7 @@ yyreduce: case 518: /* Line 1787 of yacc.c */ -#line 2503 "conf_parser.y" +#line 2504 "conf_parser.y" { ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number); } @@ -6016,7 +6014,7 @@ yyreduce: case 519: /* Line 1787 of yacc.c */ -#line 2508 "conf_parser.y" +#line 2509 "conf_parser.y" { ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number); } @@ -6024,7 +6022,7 @@ yyreduce: case 520: /* Line 1787 of yacc.c */ -#line 2513 "conf_parser.y" +#line 2514 "conf_parser.y" { ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number); } @@ -6032,7 +6030,7 @@ yyreduce: case 521: /* Line 1787 of yacc.c */ -#line 2518 "conf_parser.y" +#line 2519 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number); @@ -6041,7 +6039,7 @@ yyreduce: case 522: /* Line 1787 of yacc.c */ -#line 2524 "conf_parser.y" +#line 2525 "conf_parser.y" { if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1) { @@ -6055,7 +6053,7 @@ yyreduce: case 523: /* Line 1787 of yacc.c */ -#line 2535 "conf_parser.y" +#line 2536 "conf_parser.y" { ConfigFileEntry.invisible_on_connect = yylval.number; } @@ -6063,7 +6061,7 @@ yyreduce: case 524: /* Line 1787 of yacc.c */ -#line 2540 "conf_parser.y" +#line 2541 "conf_parser.y" { ConfigFileEntry.warn_no_nline = yylval.number; } @@ -6071,7 +6069,7 @@ yyreduce: case 525: /* Line 1787 of yacc.c */ -#line 2545 "conf_parser.y" +#line 2546 "conf_parser.y" { ConfigFileEntry.stats_e_disabled = yylval.number; } @@ -6079,7 +6077,7 @@ yyreduce: case 526: /* Line 1787 of yacc.c */ -#line 2550 "conf_parser.y" +#line 2551 "conf_parser.y" { ConfigFileEntry.stats_o_oper_only = yylval.number; } @@ -6087,7 +6085,7 @@ yyreduce: case 527: /* Line 1787 of yacc.c */ -#line 2555 "conf_parser.y" +#line 2556 "conf_parser.y" { ConfigFileEntry.stats_P_oper_only = yylval.number; } @@ -6095,7 +6093,7 @@ yyreduce: case 528: /* Line 1787 of yacc.c */ -#line 2560 "conf_parser.y" +#line 2561 "conf_parser.y" { ConfigFileEntry.stats_k_oper_only = 2 * yylval.number; } @@ -6103,7 +6101,7 @@ yyreduce: case 529: /* Line 1787 of yacc.c */ -#line 2563 "conf_parser.y" +#line 2564 "conf_parser.y" { ConfigFileEntry.stats_k_oper_only = 1; } @@ -6111,7 +6109,7 @@ yyreduce: case 530: /* Line 1787 of yacc.c */ -#line 2568 "conf_parser.y" +#line 2569 "conf_parser.y" { ConfigFileEntry.stats_i_oper_only = 2 * yylval.number; } @@ -6119,7 +6117,7 @@ yyreduce: case 531: /* Line 1787 of yacc.c */ -#line 2571 "conf_parser.y" +#line 2572 "conf_parser.y" { ConfigFileEntry.stats_i_oper_only = 1; } @@ -6127,7 +6125,7 @@ yyreduce: case 532: /* Line 1787 of yacc.c */ -#line 2576 "conf_parser.y" +#line 2577 "conf_parser.y" { ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number); } @@ -6135,7 +6133,7 @@ yyreduce: case 533: /* Line 1787 of yacc.c */ -#line 2581 "conf_parser.y" +#line 2582 "conf_parser.y" { ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number); } @@ -6143,7 +6141,7 @@ yyreduce: case 534: /* Line 1787 of yacc.c */ -#line 2586 "conf_parser.y" +#line 2587 "conf_parser.y" { ConfigFileEntry.opers_bypass_callerid = yylval.number; } @@ -6151,7 +6149,7 @@ yyreduce: case 535: /* Line 1787 of yacc.c */ -#line 2591 "conf_parser.y" +#line 2592 "conf_parser.y" { ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number); } @@ -6159,7 +6157,7 @@ yyreduce: case 536: /* Line 1787 of yacc.c */ -#line 2596 "conf_parser.y" +#line 2597 "conf_parser.y" { ConfigFileEntry.short_motd = yylval.number; } @@ -6167,7 +6165,7 @@ yyreduce: case 537: /* Line 1787 of yacc.c */ -#line 2601 "conf_parser.y" +#line 2602 "conf_parser.y" { ConfigFileEntry.no_oper_flood = yylval.number; } @@ -6175,7 +6173,7 @@ yyreduce: case 538: /* Line 1787 of yacc.c */ -#line 2606 "conf_parser.y" +#line 2607 "conf_parser.y" { ConfigFileEntry.true_no_oper_flood = yylval.number; } @@ -6183,7 +6181,7 @@ yyreduce: case 539: /* Line 1787 of yacc.c */ -#line 2611 "conf_parser.y" +#line 2612 "conf_parser.y" { ConfigFileEntry.oper_pass_resv = yylval.number; } @@ -6191,7 +6189,7 @@ yyreduce: case 540: /* Line 1787 of yacc.c */ -#line 2616 "conf_parser.y" +#line 2617 "conf_parser.y" { ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number); } @@ -6199,7 +6197,7 @@ yyreduce: case 541: /* Line 1787 of yacc.c */ -#line 2621 "conf_parser.y" +#line 2622 "conf_parser.y" { ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number); } @@ -6207,7 +6205,7 @@ yyreduce: case 542: /* Line 1787 of yacc.c */ -#line 2626 "conf_parser.y" +#line 2627 "conf_parser.y" { ConfigFileEntry.use_egd = yylval.number; } @@ -6215,7 +6213,7 @@ yyreduce: case 543: /* Line 1787 of yacc.c */ -#line 2631 "conf_parser.y" +#line 2632 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6227,7 +6225,7 @@ yyreduce: case 544: /* Line 1787 of yacc.c */ -#line 2640 "conf_parser.y" +#line 2641 "conf_parser.y" { if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string)) { @@ -6239,7 +6237,7 @@ yyreduce: case 545: /* Line 1787 of yacc.c */ -#line 2649 "conf_parser.y" +#line 2650 "conf_parser.y" { ConfigFileEntry.ping_cookie = yylval.number; } @@ -6247,7 +6245,7 @@ yyreduce: case 546: /* Line 1787 of yacc.c */ -#line 2654 "conf_parser.y" +#line 2655 "conf_parser.y" { ConfigFileEntry.disable_auth = yylval.number; } @@ -6255,7 +6253,7 @@ yyreduce: case 547: /* Line 1787 of yacc.c */ -#line 2659 "conf_parser.y" +#line 2660 "conf_parser.y" { ConfigFileEntry.throttle_time = yylval.number; } @@ -6263,7 +6261,7 @@ yyreduce: case 548: /* Line 1787 of yacc.c */ -#line 2664 "conf_parser.y" +#line 2665 "conf_parser.y" { ConfigFileEntry.oper_umodes = 0; } @@ -6271,7 +6269,7 @@ yyreduce: case 552: /* Line 1787 of yacc.c */ -#line 2670 "conf_parser.y" +#line 2671 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_BOTS; } @@ -6279,7 +6277,7 @@ yyreduce: case 553: /* Line 1787 of yacc.c */ -#line 2673 "conf_parser.y" +#line 2674 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CCONN; } @@ -6287,7 +6285,7 @@ yyreduce: case 554: /* Line 1787 of yacc.c */ -#line 2676 "conf_parser.y" +#line 2677 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_DEAF; } @@ -6295,7 +6293,7 @@ yyreduce: case 555: /* Line 1787 of yacc.c */ -#line 2679 "conf_parser.y" +#line 2680 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_DEBUG; } @@ -6303,7 +6301,7 @@ yyreduce: case 556: /* Line 1787 of yacc.c */ -#line 2682 "conf_parser.y" +#line 2683 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_FULL; } @@ -6311,7 +6309,7 @@ yyreduce: case 557: /* Line 1787 of yacc.c */ -#line 2685 "conf_parser.y" +#line 2686 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_HIDDEN; } @@ -6319,7 +6317,7 @@ yyreduce: case 558: /* Line 1787 of yacc.c */ -#line 2688 "conf_parser.y" +#line 2689 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SKILL; } @@ -6327,7 +6325,7 @@ yyreduce: case 559: /* Line 1787 of yacc.c */ -#line 2691 "conf_parser.y" +#line 2692 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_NCHANGE; } @@ -6335,7 +6333,7 @@ yyreduce: case 560: /* Line 1787 of yacc.c */ -#line 2694 "conf_parser.y" +#line 2695 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_REJ; } @@ -6343,7 +6341,7 @@ yyreduce: case 561: /* Line 1787 of yacc.c */ -#line 2697 "conf_parser.y" +#line 2698 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_UNAUTH; } @@ -6351,7 +6349,7 @@ yyreduce: case 562: /* Line 1787 of yacc.c */ -#line 2700 "conf_parser.y" +#line 2701 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SPY; } @@ -6359,7 +6357,7 @@ yyreduce: case 563: /* Line 1787 of yacc.c */ -#line 2703 "conf_parser.y" +#line 2704 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL; } @@ -6367,7 +6365,7 @@ yyreduce: case 564: /* Line 1787 of yacc.c */ -#line 2706 "conf_parser.y" +#line 2707 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_OPERWALL; } @@ -6375,7 +6373,7 @@ yyreduce: case 565: /* Line 1787 of yacc.c */ -#line 2709 "conf_parser.y" +#line 2710 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE; } @@ -6383,7 +6381,7 @@ yyreduce: case 566: /* Line 1787 of yacc.c */ -#line 2712 "conf_parser.y" +#line 2713 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE; } @@ -6391,7 +6389,7 @@ yyreduce: case 567: /* Line 1787 of yacc.c */ -#line 2715 "conf_parser.y" +#line 2716 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_WALLOP; } @@ -6399,7 +6397,7 @@ yyreduce: case 568: /* Line 1787 of yacc.c */ -#line 2718 "conf_parser.y" +#line 2719 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID; } @@ -6407,7 +6405,7 @@ yyreduce: case 569: /* Line 1787 of yacc.c */ -#line 2721 "conf_parser.y" +#line 2722 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CALLERID; } @@ -6415,7 +6413,7 @@ yyreduce: case 570: /* Line 1787 of yacc.c */ -#line 2724 "conf_parser.y" +#line 2725 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_LOCOPS; } @@ -6423,7 +6421,7 @@ yyreduce: case 571: /* Line 1787 of yacc.c */ -#line 2727 "conf_parser.y" +#line 2728 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_REGONLY; } @@ -6431,7 +6429,7 @@ yyreduce: case 572: /* Line 1787 of yacc.c */ -#line 2730 "conf_parser.y" +#line 2731 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT; } @@ -6439,7 +6437,7 @@ yyreduce: case 573: /* Line 1787 of yacc.c */ -#line 2735 "conf_parser.y" +#line 2736 "conf_parser.y" { ConfigFileEntry.oper_only_umodes = 0; } @@ -6447,7 +6445,7 @@ yyreduce: case 577: /* Line 1787 of yacc.c */ -#line 2741 "conf_parser.y" +#line 2742 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_BOTS; } @@ -6455,7 +6453,7 @@ yyreduce: case 578: /* Line 1787 of yacc.c */ -#line 2744 "conf_parser.y" +#line 2745 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CCONN; } @@ -6463,7 +6461,7 @@ yyreduce: case 579: /* Line 1787 of yacc.c */ -#line 2747 "conf_parser.y" +#line 2748 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_DEAF; } @@ -6471,7 +6469,7 @@ yyreduce: case 580: /* Line 1787 of yacc.c */ -#line 2750 "conf_parser.y" +#line 2751 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG; } @@ -6479,7 +6477,7 @@ yyreduce: case 581: /* Line 1787 of yacc.c */ -#line 2753 "conf_parser.y" +#line 2754 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_FULL; } @@ -6487,7 +6485,7 @@ yyreduce: case 582: /* Line 1787 of yacc.c */ -#line 2756 "conf_parser.y" +#line 2757 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SKILL; } @@ -6495,7 +6493,7 @@ yyreduce: case 583: /* Line 1787 of yacc.c */ -#line 2759 "conf_parser.y" +#line 2760 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN; } @@ -6503,7 +6501,7 @@ yyreduce: case 584: /* Line 1787 of yacc.c */ -#line 2762 "conf_parser.y" +#line 2763 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE; } @@ -6511,7 +6509,7 @@ yyreduce: case 585: /* Line 1787 of yacc.c */ -#line 2765 "conf_parser.y" +#line 2766 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_REJ; } @@ -6519,7 +6517,7 @@ yyreduce: case 586: /* Line 1787 of yacc.c */ -#line 2768 "conf_parser.y" +#line 2769 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH; } @@ -6527,7 +6525,7 @@ yyreduce: case 587: /* Line 1787 of yacc.c */ -#line 2771 "conf_parser.y" +#line 2772 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SPY; } @@ -6535,7 +6533,7 @@ yyreduce: case 588: /* Line 1787 of yacc.c */ -#line 2774 "conf_parser.y" +#line 2775 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL; } @@ -6543,7 +6541,7 @@ yyreduce: case 589: /* Line 1787 of yacc.c */ -#line 2777 "conf_parser.y" +#line 2778 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL; } @@ -6551,7 +6549,7 @@ yyreduce: case 590: /* Line 1787 of yacc.c */ -#line 2780 "conf_parser.y" +#line 2781 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE; } @@ -6559,7 +6557,7 @@ yyreduce: case 591: /* Line 1787 of yacc.c */ -#line 2783 "conf_parser.y" +#line 2784 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE; } @@ -6567,7 +6565,7 @@ yyreduce: case 592: /* Line 1787 of yacc.c */ -#line 2786 "conf_parser.y" +#line 2787 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP; } @@ -6575,7 +6573,7 @@ yyreduce: case 593: /* Line 1787 of yacc.c */ -#line 2789 "conf_parser.y" +#line 2790 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID; } @@ -6583,7 +6581,7 @@ yyreduce: case 594: /* Line 1787 of yacc.c */ -#line 2792 "conf_parser.y" +#line 2793 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID; } @@ -6591,7 +6589,7 @@ yyreduce: case 595: /* Line 1787 of yacc.c */ -#line 2795 "conf_parser.y" +#line 2796 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS; } @@ -6599,7 +6597,7 @@ yyreduce: case 596: /* Line 1787 of yacc.c */ -#line 2798 "conf_parser.y" +#line 2799 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY; } @@ -6607,7 +6605,7 @@ yyreduce: case 597: /* Line 1787 of yacc.c */ -#line 2801 "conf_parser.y" +#line 2802 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT; } @@ -6615,7 +6613,7 @@ yyreduce: case 598: /* Line 1787 of yacc.c */ -#line 2806 "conf_parser.y" +#line 2807 "conf_parser.y" { ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number); } @@ -6623,7 +6621,7 @@ yyreduce: case 599: /* Line 1787 of yacc.c */ -#line 2811 "conf_parser.y" +#line 2812 "conf_parser.y" { ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number); } @@ -6631,7 +6629,7 @@ yyreduce: case 600: /* Line 1787 of yacc.c */ -#line 2816 "conf_parser.y" +#line 2817 "conf_parser.y" { ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number); } @@ -6639,7 +6637,7 @@ yyreduce: case 617: /* Line 1787 of yacc.c */ -#line 2839 "conf_parser.y" +#line 2840 "conf_parser.y" { ConfigChannel.disable_fake_channels = yylval.number; } @@ -6647,7 +6645,7 @@ yyreduce: case 618: /* Line 1787 of yacc.c */ -#line 2844 "conf_parser.y" +#line 2845 "conf_parser.y" { ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number); } @@ -6655,7 +6653,7 @@ yyreduce: case 619: /* Line 1787 of yacc.c */ -#line 2849 "conf_parser.y" +#line 2850 "conf_parser.y" { ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number); } @@ -6663,7 +6661,7 @@ yyreduce: case 620: /* Line 1787 of yacc.c */ -#line 2854 "conf_parser.y" +#line 2855 "conf_parser.y" { ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number); } @@ -6671,7 +6669,7 @@ yyreduce: case 621: /* Line 1787 of yacc.c */ -#line 2859 "conf_parser.y" +#line 2860 "conf_parser.y" { ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number); } @@ -6679,7 +6677,7 @@ yyreduce: case 622: /* Line 1787 of yacc.c */ -#line 2864 "conf_parser.y" +#line 2865 "conf_parser.y" { ConfigChannel.max_bans = (yyvsp[(3) - (4)].number); } @@ -6687,7 +6685,7 @@ yyreduce: case 623: /* Line 1787 of yacc.c */ -#line 2869 "conf_parser.y" +#line 2870 "conf_parser.y" { ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number); } @@ -6695,7 +6693,7 @@ yyreduce: case 624: /* Line 1787 of yacc.c */ -#line 2874 "conf_parser.y" +#line 2875 "conf_parser.y" { ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number); } @@ -6703,7 +6701,7 @@ yyreduce: case 625: /* Line 1787 of yacc.c */ -#line 2879 "conf_parser.y" +#line 2880 "conf_parser.y" { ConfigChannel.no_create_on_split = yylval.number; } @@ -6711,7 +6709,7 @@ yyreduce: case 626: /* Line 1787 of yacc.c */ -#line 2884 "conf_parser.y" +#line 2885 "conf_parser.y" { ConfigChannel.no_join_on_split = yylval.number; } @@ -6719,7 +6717,7 @@ yyreduce: case 627: /* Line 1787 of yacc.c */ -#line 2889 "conf_parser.y" +#line 2890 "conf_parser.y" { GlobalSetOptions.joinfloodcount = yylval.number; } @@ -6727,7 +6725,7 @@ yyreduce: case 628: /* Line 1787 of yacc.c */ -#line 2894 "conf_parser.y" +#line 2895 "conf_parser.y" { GlobalSetOptions.joinfloodtime = yylval.number; } @@ -6735,7 +6733,7 @@ yyreduce: case 641: /* Line 1787 of yacc.c */ -#line 2914 "conf_parser.y" +#line 2915 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.flatten_links = yylval.number; @@ -6744,7 +6742,7 @@ yyreduce: case 642: /* Line 1787 of yacc.c */ -#line 2920 "conf_parser.y" +#line 2921 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.disable_remote_commands = yylval.number; @@ -6753,7 +6751,7 @@ yyreduce: case 643: /* Line 1787 of yacc.c */ -#line 2926 "conf_parser.y" +#line 2927 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_servers = yylval.number; @@ -6762,7 +6760,7 @@ yyreduce: case 644: /* Line 1787 of yacc.c */ -#line 2932 "conf_parser.y" +#line 2933 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_services = yylval.number; @@ -6771,7 +6769,7 @@ yyreduce: case 645: /* Line 1787 of yacc.c */ -#line 2938 "conf_parser.y" +#line 2939 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6783,7 +6781,7 @@ yyreduce: case 646: /* Line 1787 of yacc.c */ -#line 2947 "conf_parser.y" +#line 2948 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6800,7 +6798,7 @@ yyreduce: case 647: /* Line 1787 of yacc.c */ -#line 2961 "conf_parser.y" +#line 2962 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hidden = yylval.number; @@ -6809,7 +6807,7 @@ yyreduce: case 648: /* Line 1787 of yacc.c */ -#line 2967 "conf_parser.y" +#line 2968 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_server_ips = yylval.number; @@ -6818,7 +6816,7 @@ yyreduce: /* Line 1787 of yacc.c */ -#line 6822 "conf_parser.c" +#line 6820 "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 5e499fd..eddc7f8 100644 --- a/src/conf_parser.h +++ b/src/conf_parser.h @@ -193,24 +193,24 @@ extern int yydebug; SPOOF_NOTICE = 402, SQUIT = 403, SSL_CERTIFICATE_FILE = 404, - SSL_DH_PARAM_FILE = 405, - STATS_E_DISABLED = 406, - STATS_I_OPER_ONLY = 407, - STATS_K_OPER_ONLY = 408, - STATS_O_OPER_ONLY = 409, - STATS_P_OPER_ONLY = 410, - T_ALL = 411, - T_BOTS = 412, - T_CALLERID = 413, - T_CCONN = 414, - T_CLUSTER = 415, - T_DEAF = 416, - T_DEBUG = 417, - T_DLINE = 418, - T_EXTERNAL = 419, - T_FARCONNECT = 420, - T_FILE = 421, - T_FINGERPRINT = 422, + SSL_CERTIFICATE_FINGERPRINT = 405, + SSL_DH_PARAM_FILE = 406, + STATS_E_DISABLED = 407, + STATS_I_OPER_ONLY = 408, + STATS_K_OPER_ONLY = 409, + STATS_O_OPER_ONLY = 410, + STATS_P_OPER_ONLY = 411, + T_ALL = 412, + T_BOTS = 413, + T_CALLERID = 414, + T_CCONN = 415, + T_CLUSTER = 416, + T_DEAF = 417, + T_DEBUG = 418, + T_DLINE = 419, + T_EXTERNAL = 420, + T_FARCONNECT = 421, + T_FILE = 422, T_FULL = 423, T_GLOBOPS = 424, T_INVISIBLE = 425, @@ -417,24 +417,24 @@ extern int yydebug; #define SPOOF_NOTICE 402 #define SQUIT 403 #define SSL_CERTIFICATE_FILE 404 -#define SSL_DH_PARAM_FILE 405 -#define STATS_E_DISABLED 406 -#define STATS_I_OPER_ONLY 407 -#define STATS_K_OPER_ONLY 408 -#define STATS_O_OPER_ONLY 409 -#define STATS_P_OPER_ONLY 410 -#define T_ALL 411 -#define T_BOTS 412 -#define T_CALLERID 413 -#define T_CCONN 414 -#define T_CLUSTER 415 -#define T_DEAF 416 -#define T_DEBUG 417 -#define T_DLINE 418 -#define T_EXTERNAL 419 -#define T_FARCONNECT 420 -#define T_FILE 421 -#define T_FINGERPRINT 422 +#define SSL_CERTIFICATE_FINGERPRINT 405 +#define SSL_DH_PARAM_FILE 406 +#define STATS_E_DISABLED 407 +#define STATS_I_OPER_ONLY 408 +#define STATS_K_OPER_ONLY 409 +#define STATS_O_OPER_ONLY 410 +#define STATS_P_OPER_ONLY 411 +#define T_ALL 412 +#define T_BOTS 413 +#define T_CALLERID 414 +#define T_CCONN 415 +#define T_CLUSTER 416 +#define T_DEAF 417 +#define T_DEBUG 418 +#define T_DLINE 419 +#define T_EXTERNAL 420 +#define T_FARCONNECT 421 +#define T_FILE 422 #define T_FULL 423 #define T_GLOBOPS 424 #define T_INVISIBLE 425 diff --git a/src/conf_parser.y b/src/conf_parser.y index 8008dc4..47b7f28 100644 --- a/src/conf_parser.y +++ b/src/conf_parser.y @@ -281,6 +281,7 @@ reset_block_state(void) %token SPOOF_NOTICE %token SQUIT %token SSL_CERTIFICATE_FILE +%token SSL_CERTIFICATE_FINGERPRINT %token SSL_DH_PARAM_FILE %token STATS_E_DISABLED %token STATS_I_OPER_ONLY @@ -298,7 +299,6 @@ reset_block_state(void) %token T_EXTERNAL %token T_FARCONNECT %token T_FILE -%token T_FINGERPRINT %token T_FULL %token T_GLOBOPS %token T_INVISIBLE @@ -1086,7 +1086,7 @@ oper_entry: OPERATOR oper_items: oper_items oper_item | oper_item; oper_item: oper_name | oper_user | oper_password | oper_umodes | oper_class | oper_encrypted | - oper_rsa_public_key_file | oper_fingerprint | + oper_rsa_public_key_file | oper_ssl_certificate_fingerprint | oper_flags | error ';' ; oper_name: NAME '=' QSTRING ';' @@ -1124,7 +1124,7 @@ oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';' strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf)); }; -oper_fingerprint: T_FINGERPRINT '=' QSTRING ';' +oper_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';' { if (conf_parser_ctx.pass == 2) strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf)); @@ -2092,7 +2092,8 @@ connect_entry: CONNECT connect_items: connect_items connect_item | connect_item; connect_item: connect_name | connect_host | connect_vhost | - connect_send_password | connect_accept_password | connect_fingerprint | + connect_send_password | connect_accept_password | + connect_ssl_certificate_fingerprint | connect_aftype | connect_port | connect_ssl_cipher_list | connect_flags | connect_hub_mask | connect_leaf_mask | connect_class | connect_encrypted | @@ -2142,7 +2143,7 @@ connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';' strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); }; -connect_fingerprint: T_FINGERPRINT '=' QSTRING ';' +connect_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';' { if (conf_parser_ctx.pass == 2) strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf)); |