diff options
author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-05-10 18:36:27 +0000 |
---|---|---|
committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-05-10 18:36:27 +0000 |
commit | 79623442a5b6e0231e141eb29e5a8b753c7f5c0f (patch) | |
tree | 3adc4cfe273652403d728bb05dc8c8da773f0ea4 | |
parent | 8dfdb6a2b5e1d9872f3d9edc05cd8863c73c1e31 (diff) |
- Removed unused OFLAG_OPER_SPY definition
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@1993 82007160-df01-0410-b94d-b575c5fd34c7
-rw-r--r-- | include/client.h | 28 | ||||
-rw-r--r-- | src/conf.c | 1 | ||||
-rw-r--r-- | src/conf_parser.c | 3566 | ||||
-rw-r--r-- | src/conf_parser.h | 440 | ||||
-rw-r--r-- | src/conf_parser.y | 5 |
5 files changed, 2009 insertions, 2031 deletions
diff --git a/include/client.h b/include/client.h index 063003a..bb3b80e 100644 --- a/include/client.h +++ b/include/client.h @@ -178,21 +178,19 @@ #define OPER_FLAG_REMOTE 0x00000002 /**> Oper can do squits/connects */ #define OPER_FLAG_UNKLINE 0x00000004 /**< Oper can use unkline */ #define OPER_FLAG_GLINE 0x00000008 /**< Oper can use gline */ -#define OPER_FLAG____ 0x00000010 /**< */ -#define OPER_FLAG_K 0x00000020 /**< Oper can kill/kline */ -#define OPER_FLAG_X 0x00000040 /**< Oper can xline */ -#define OPER_FLAG_DIE 0x00000080 /**< Oper can die */ -#define OPER_FLAG_REHASH 0x00000100 /**< Oper can rehash */ -#define OPER_FLAG_ADMIN 0x00000200 /**< Oper can set umode +a */ -#define OPER_FLAG_OPERWALL 0x00000400 /**< Oper can use OPERWALL command */ -#define OPER_FLAG_OPER_SPY 0x00000800 /* */ -#define OPER_FLAG_REMOTEBAN 0x00001000 /**< Oper can set remote bans */ -#define OPER_FLAG_GLOBOPS 0x00002000 /**< Oper can use GLOBOPS command */ -#define OPER_FLAG_MODULE 0x00004000 /**< Oper can use MODULE commands */ -#define OPER_FLAG_RESTART 0x00008000 /**< Oper can use RESTART command */ -#define OPER_FLAG_DLINE 0x00010000 /**< Oper can use DLINE command */ -#define OPER_FLAG_UNDLINE 0x00020000 /**< Oper can use UNDLINE command */ -#define OPER_FLAG_SET 0x00040000 /**< Oper can use SET command */ +#define OPER_FLAG_K 0x00000010 /**< Oper can kill/kline */ +#define OPER_FLAG_X 0x00000020 /**< Oper can xline */ +#define OPER_FLAG_DIE 0x00000040 /**< Oper can die */ +#define OPER_FLAG_REHASH 0x00000080 /**< Oper can rehash */ +#define OPER_FLAG_ADMIN 0x00000100 /**< Oper can set umode +a */ +#define OPER_FLAG_OPERWALL 0x00000200 /**< Oper can use OPERWALL command */ +#define OPER_FLAG_REMOTEBAN 0x00000400 /**< Oper can set remote bans */ +#define OPER_FLAG_GLOBOPS 0x00000800 /**< Oper can use GLOBOPS command */ +#define OPER_FLAG_MODULE 0x00001000 /**< Oper can use MODULE commands */ +#define OPER_FLAG_RESTART 0x00002000 /**< Oper can use RESTART command */ +#define OPER_FLAG_DLINE 0x00004000 /**< Oper can use DLINE command */ +#define OPER_FLAG_UNDLINE 0x00008000 /**< Oper can use UNDLINE command */ +#define OPER_FLAG_SET 0x00010000 /**< Oper can use SET command */ #define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0) #define AddOFlag(x, y) ((x)->localClient->operflags |= (y)) @@ -1386,7 +1386,6 @@ static const struct oper_privs { OPER_FLAG_OPERWALL, 'L' }, { OPER_FLAG_GLOBAL_KILL, 'O' }, { OPER_FLAG_REMOTE, 'R' }, - { OPER_FLAG_OPER_SPY, 'S' }, { OPER_FLAG_UNKLINE, 'U' }, { OPER_FLAG_X, 'X' }, { 0, '\0' } diff --git a/src/conf_parser.c b/src/conf_parser.c index 8dd62bf..7770169 100644 --- a/src/conf_parser.c +++ b/src/conf_parser.c @@ -322,116 +322,115 @@ extern int yydebug; OPERS_BYPASS_CALLERID = 364, OPER_ONLY_UMODES = 365, OPER_PASS_RESV = 366, - OPER_SPY_T = 367, - OPER_UMODES = 368, - JOIN_FLOOD_COUNT = 369, - JOIN_FLOOD_TIME = 370, - PACE_WAIT = 371, - PACE_WAIT_SIMPLE = 372, - PASSWORD = 373, - PATH = 374, - PING_COOKIE = 375, - PING_TIME = 376, - PORT = 377, - QSTRING = 378, - REASON = 379, - REDIRPORT = 380, - REDIRSERV = 381, - REHASH = 382, - REMOTE = 383, - REMOTEBAN = 384, - RSA_PRIVATE_KEY_FILE = 385, - RSA_PUBLIC_KEY_FILE = 386, - SSL_CERTIFICATE_FILE = 387, - SSL_DH_PARAM_FILE = 388, - T_SSL_CLIENT_METHOD = 389, - T_SSL_SERVER_METHOD = 390, - T_SSLV3 = 391, - T_TLSV1 = 392, - RESV = 393, - RESV_EXEMPT = 394, - SECONDS = 395, - MINUTES = 396, - HOURS = 397, - DAYS = 398, - WEEKS = 399, - MONTHS = 400, - YEARS = 401, - SENDQ = 402, - SEND_PASSWORD = 403, - SERVERHIDE = 404, - SERVERINFO = 405, - IRCD_SID = 406, - TKLINE_EXPIRE_NOTICES = 407, - T_SHARED = 408, - T_CLUSTER = 409, - TYPE = 410, - SHORT_MOTD = 411, - SPOOF = 412, - SPOOF_NOTICE = 413, - STATS_E_DISABLED = 414, - STATS_I_OPER_ONLY = 415, - STATS_K_OPER_ONLY = 416, - STATS_O_OPER_ONLY = 417, - STATS_P_OPER_ONLY = 418, - TBOOL = 419, - TMASKED = 420, - TS_MAX_DELTA = 421, - TS_WARN_DELTA = 422, - TWODOTS = 423, - T_ALL = 424, - T_BOTS = 425, - T_SOFTCALLERID = 426, - T_CALLERID = 427, - T_CCONN = 428, - T_CCONN_FULL = 429, - T_SSL_CIPHER_LIST = 430, - T_DEAF = 431, - T_DEBUG = 432, - T_DLINE = 433, - T_EXTERNAL = 434, - T_FARCONNECT = 435, - T_FULL = 436, - T_INVISIBLE = 437, - T_IPV4 = 438, - T_IPV6 = 439, - T_LOCOPS = 440, - T_MAX_CLIENTS = 441, - T_NCHANGE = 442, - T_NONONREG = 443, - T_OPERWALL = 444, - T_RECVQ = 445, - T_REJ = 446, - T_SERVER = 447, - T_SERVNOTICE = 448, - T_SET = 449, - T_SKILL = 450, - T_SPY = 451, - T_SSL = 452, - T_UMODES = 453, - T_UNAUTH = 454, - T_UNDLINE = 455, - T_UNLIMITED = 456, - T_UNRESV = 457, - T_UNXLINE = 458, - T_GLOBOPS = 459, - T_WALLOP = 460, - T_WEBIRC = 461, - T_RESTART = 462, - T_SERVICE = 463, - T_SERVICES_NAME = 464, - THROTTLE_TIME = 465, - TRUE_NO_OPER_FLOOD = 466, - UNKLINE = 467, - USER = 468, - USE_EGD = 469, - USE_LOGGING = 470, - VHOST = 471, - VHOST6 = 472, - XLINE = 473, - WARN_NO_NLINE = 474, - T_SIZE = 475, - T_FILE = 476 + OPER_UMODES = 367, + JOIN_FLOOD_COUNT = 368, + JOIN_FLOOD_TIME = 369, + PACE_WAIT = 370, + PACE_WAIT_SIMPLE = 371, + PASSWORD = 372, + PATH = 373, + PING_COOKIE = 374, + PING_TIME = 375, + PORT = 376, + QSTRING = 377, + REASON = 378, + REDIRPORT = 379, + REDIRSERV = 380, + REHASH = 381, + REMOTE = 382, + REMOTEBAN = 383, + RSA_PRIVATE_KEY_FILE = 384, + RSA_PUBLIC_KEY_FILE = 385, + SSL_CERTIFICATE_FILE = 386, + SSL_DH_PARAM_FILE = 387, + T_SSL_CLIENT_METHOD = 388, + T_SSL_SERVER_METHOD = 389, + T_SSLV3 = 390, + T_TLSV1 = 391, + RESV = 392, + RESV_EXEMPT = 393, + SECONDS = 394, + MINUTES = 395, + HOURS = 396, + DAYS = 397, + WEEKS = 398, + MONTHS = 399, + YEARS = 400, + SENDQ = 401, + SEND_PASSWORD = 402, + SERVERHIDE = 403, + SERVERINFO = 404, + IRCD_SID = 405, + TKLINE_EXPIRE_NOTICES = 406, + T_SHARED = 407, + T_CLUSTER = 408, + TYPE = 409, + SHORT_MOTD = 410, + SPOOF = 411, + SPOOF_NOTICE = 412, + STATS_E_DISABLED = 413, + STATS_I_OPER_ONLY = 414, + STATS_K_OPER_ONLY = 415, + STATS_O_OPER_ONLY = 416, + STATS_P_OPER_ONLY = 417, + TBOOL = 418, + TMASKED = 419, + TS_MAX_DELTA = 420, + TS_WARN_DELTA = 421, + TWODOTS = 422, + T_ALL = 423, + T_BOTS = 424, + T_SOFTCALLERID = 425, + T_CALLERID = 426, + T_CCONN = 427, + T_CCONN_FULL = 428, + T_SSL_CIPHER_LIST = 429, + T_DEAF = 430, + T_DEBUG = 431, + T_DLINE = 432, + T_EXTERNAL = 433, + T_FARCONNECT = 434, + T_FULL = 435, + T_INVISIBLE = 436, + T_IPV4 = 437, + T_IPV6 = 438, + T_LOCOPS = 439, + T_MAX_CLIENTS = 440, + T_NCHANGE = 441, + T_NONONREG = 442, + T_OPERWALL = 443, + T_RECVQ = 444, + T_REJ = 445, + T_SERVER = 446, + T_SERVNOTICE = 447, + T_SET = 448, + T_SKILL = 449, + T_SPY = 450, + T_SSL = 451, + T_UMODES = 452, + T_UNAUTH = 453, + T_UNDLINE = 454, + T_UNLIMITED = 455, + T_UNRESV = 456, + T_UNXLINE = 457, + T_GLOBOPS = 458, + T_WALLOP = 459, + T_WEBIRC = 460, + T_RESTART = 461, + T_SERVICE = 462, + T_SERVICES_NAME = 463, + THROTTLE_TIME = 464, + TRUE_NO_OPER_FLOOD = 465, + UNKLINE = 466, + USER = 467, + USE_EGD = 468, + USE_LOGGING = 469, + VHOST = 470, + VHOST6 = 471, + XLINE = 472, + WARN_NO_NLINE = 473, + T_SIZE = 474, + T_FILE = 475 }; #endif /* Tokens. */ @@ -544,116 +543,115 @@ extern int yydebug; #define OPERS_BYPASS_CALLERID 364 #define OPER_ONLY_UMODES 365 #define OPER_PASS_RESV 366 -#define OPER_SPY_T 367 -#define OPER_UMODES 368 -#define JOIN_FLOOD_COUNT 369 -#define JOIN_FLOOD_TIME 370 -#define PACE_WAIT 371 -#define PACE_WAIT_SIMPLE 372 -#define PASSWORD 373 -#define PATH 374 -#define PING_COOKIE 375 -#define PING_TIME 376 -#define PORT 377 -#define QSTRING 378 -#define REASON 379 -#define REDIRPORT 380 -#define REDIRSERV 381 -#define REHASH 382 -#define REMOTE 383 -#define REMOTEBAN 384 -#define RSA_PRIVATE_KEY_FILE 385 -#define RSA_PUBLIC_KEY_FILE 386 -#define SSL_CERTIFICATE_FILE 387 -#define SSL_DH_PARAM_FILE 388 -#define T_SSL_CLIENT_METHOD 389 -#define T_SSL_SERVER_METHOD 390 -#define T_SSLV3 391 -#define T_TLSV1 392 -#define RESV 393 -#define RESV_EXEMPT 394 -#define SECONDS 395 -#define MINUTES 396 -#define HOURS 397 -#define DAYS 398 -#define WEEKS 399 -#define MONTHS 400 -#define YEARS 401 -#define SENDQ 402 -#define SEND_PASSWORD 403 -#define SERVERHIDE 404 -#define SERVERINFO 405 -#define IRCD_SID 406 -#define TKLINE_EXPIRE_NOTICES 407 -#define T_SHARED 408 -#define T_CLUSTER 409 -#define TYPE 410 -#define SHORT_MOTD 411 -#define SPOOF 412 -#define SPOOF_NOTICE 413 -#define STATS_E_DISABLED 414 -#define STATS_I_OPER_ONLY 415 -#define STATS_K_OPER_ONLY 416 -#define STATS_O_OPER_ONLY 417 -#define STATS_P_OPER_ONLY 418 -#define TBOOL 419 -#define TMASKED 420 -#define TS_MAX_DELTA 421 -#define TS_WARN_DELTA 422 -#define TWODOTS 423 -#define T_ALL 424 -#define T_BOTS 425 -#define T_SOFTCALLERID 426 -#define T_CALLERID 427 -#define T_CCONN 428 -#define T_CCONN_FULL 429 -#define T_SSL_CIPHER_LIST 430 -#define T_DEAF 431 -#define T_DEBUG 432 -#define T_DLINE 433 -#define T_EXTERNAL 434 -#define T_FARCONNECT 435 -#define T_FULL 436 -#define T_INVISIBLE 437 -#define T_IPV4 438 -#define T_IPV6 439 -#define T_LOCOPS 440 -#define T_MAX_CLIENTS 441 -#define T_NCHANGE 442 -#define T_NONONREG 443 -#define T_OPERWALL 444 -#define T_RECVQ 445 -#define T_REJ 446 -#define T_SERVER 447 -#define T_SERVNOTICE 448 -#define T_SET 449 -#define T_SKILL 450 -#define T_SPY 451 -#define T_SSL 452 -#define T_UMODES 453 -#define T_UNAUTH 454 -#define T_UNDLINE 455 -#define T_UNLIMITED 456 -#define T_UNRESV 457 -#define T_UNXLINE 458 -#define T_GLOBOPS 459 -#define T_WALLOP 460 -#define T_WEBIRC 461 -#define T_RESTART 462 -#define T_SERVICE 463 -#define T_SERVICES_NAME 464 -#define THROTTLE_TIME 465 -#define TRUE_NO_OPER_FLOOD 466 -#define UNKLINE 467 -#define USER 468 -#define USE_EGD 469 -#define USE_LOGGING 470 -#define VHOST 471 -#define VHOST6 472 -#define XLINE 473 -#define WARN_NO_NLINE 474 -#define T_SIZE 475 -#define T_FILE 476 +#define OPER_UMODES 367 +#define JOIN_FLOOD_COUNT 368 +#define JOIN_FLOOD_TIME 369 +#define PACE_WAIT 370 +#define PACE_WAIT_SIMPLE 371 +#define PASSWORD 372 +#define PATH 373 +#define PING_COOKIE 374 +#define PING_TIME 375 +#define PORT 376 +#define QSTRING 377 +#define REASON 378 +#define REDIRPORT 379 +#define REDIRSERV 380 +#define REHASH 381 +#define REMOTE 382 +#define REMOTEBAN 383 +#define RSA_PRIVATE_KEY_FILE 384 +#define RSA_PUBLIC_KEY_FILE 385 +#define SSL_CERTIFICATE_FILE 386 +#define SSL_DH_PARAM_FILE 387 +#define T_SSL_CLIENT_METHOD 388 +#define T_SSL_SERVER_METHOD 389 +#define T_SSLV3 390 +#define T_TLSV1 391 +#define RESV 392 +#define RESV_EXEMPT 393 +#define SECONDS 394 +#define MINUTES 395 +#define HOURS 396 +#define DAYS 397 +#define WEEKS 398 +#define MONTHS 399 +#define YEARS 400 +#define SENDQ 401 +#define SEND_PASSWORD 402 +#define SERVERHIDE 403 +#define SERVERINFO 404 +#define IRCD_SID 405 +#define TKLINE_EXPIRE_NOTICES 406 +#define T_SHARED 407 +#define T_CLUSTER 408 +#define TYPE 409 +#define SHORT_MOTD 410 +#define SPOOF 411 +#define SPOOF_NOTICE 412 +#define STATS_E_DISABLED 413 +#define STATS_I_OPER_ONLY 414 +#define STATS_K_OPER_ONLY 415 +#define STATS_O_OPER_ONLY 416 +#define STATS_P_OPER_ONLY 417 +#define TBOOL 418 +#define TMASKED 419 +#define TS_MAX_DELTA 420 +#define TS_WARN_DELTA 421 +#define TWODOTS 422 +#define T_ALL 423 +#define T_BOTS 424 +#define T_SOFTCALLERID 425 +#define T_CALLERID 426 +#define T_CCONN 427 +#define T_CCONN_FULL 428 +#define T_SSL_CIPHER_LIST 429 +#define T_DEAF 430 +#define T_DEBUG 431 +#define T_DLINE 432 +#define T_EXTERNAL 433 +#define T_FARCONNECT 434 +#define T_FULL 435 +#define T_INVISIBLE 436 +#define T_IPV4 437 +#define T_IPV6 438 +#define T_LOCOPS 439 +#define T_MAX_CLIENTS 440 +#define T_NCHANGE 441 +#define T_NONONREG 442 +#define T_OPERWALL 443 +#define T_RECVQ 444 +#define T_REJ 445 +#define T_SERVER 446 +#define T_SERVNOTICE 447 +#define T_SET 448 +#define T_SKILL 449 +#define T_SPY 450 +#define T_SSL 451 +#define T_UMODES 452 +#define T_UNAUTH 453 +#define T_UNDLINE 454 +#define T_UNLIMITED 455 +#define T_UNRESV 456 +#define T_UNXLINE 457 +#define T_GLOBOPS 458 +#define T_WALLOP 459 +#define T_WEBIRC 460 +#define T_RESTART 461 +#define T_SERVICE 462 +#define T_SERVICES_NAME 463 +#define THROTTLE_TIME 464 +#define TRUE_NO_OPER_FLOOD 465 +#define UNKLINE 466 +#define USER 467 +#define USE_EGD 468 +#define USE_LOGGING 469 +#define VHOST 470 +#define VHOST6 471 +#define XLINE 472 +#define WARN_NO_NLINE 473 +#define T_SIZE 474 +#define T_FILE 475 @@ -668,7 +666,7 @@ typedef union YYSTYPE /* Line 387 of yacc.c */ -#line 672 "conf_parser.c" +#line 670 "conf_parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -696,7 +694,7 @@ int yyparse (); /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 700 "conf_parser.c" +#line 698 "conf_parser.c" #ifdef short # undef short @@ -925,20 +923,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1203 +#define YYLAST 1206 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 227 +#define YYNTOKENS 226 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 280 /* YYNRULES -- Number of rules. */ -#define YYNRULES 632 +#define YYNRULES 631 /* YYNRULES -- Number of states. */ -#define YYNSTATES 1234 +#define YYNSTATES 1233 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 476 +#define YYMAXUTOK 475 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -950,15 +948,15 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 226, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 222, - 2, 225, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 225, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 221, + 2, 224, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 224, 2, 223, 2, 2, 2, 2, + 2, 2, 2, 223, 2, 222, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -993,7 +991,7 @@ static const yytype_uint8 yytranslate[] = 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221 + 215, 216, 217, 218, 219, 220 }; #if YYDEBUG @@ -1021,317 +1019,316 @@ static const yytype_uint16 yyprhs[] = 507, 509, 511, 513, 515, 517, 519, 521, 523, 525, 527, 528, 534, 538, 540, 542, 544, 546, 548, 550, 552, 554, 556, 558, 560, 562, 564, 566, 568, 570, - 572, 574, 576, 577, 584, 587, 589, 591, 593, 595, + 572, 574, 575, 582, 585, 587, 589, 591, 593, 595, 597, 599, 601, 603, 605, 607, 609, 611, 613, 615, - 617, 619, 621, 624, 629, 634, 639, 644, 649, 654, - 659, 664, 669, 674, 679, 684, 689, 694, 699, 700, - 706, 710, 712, 714, 716, 717, 724, 725, 731, 735, - 737, 739, 741, 743, 746, 748, 750, 752, 754, 756, - 759, 760, 766, 770, 772, 774, 778, 783, 788, 789, - 796, 799, 801, 803, 805, 807, 809, 811, 813, 815, - 817, 820, 825, 830, 835, 840, 841, 847, 851, 853, - 855, 857, 859, 861, 863, 865, 867, 869, 871, 873, - 878, 883, 888, 889, 896, 899, 901, 903, 905, 907, - 910, 915, 920, 925, 931, 934, 936, 938, 940, 945, - 946, 953, 956, 958, 960, 962, 964, 967, 972, 977, - 978, 984, 988, 990, 992, 994, 996, 998, 1000, 1002, - 1004, 1006, 1008, 1010, 1011, 1018, 1021, 1023, 1025, 1027, - 1030, 1035, 1036, 1042, 1046, 1048, 1050, 1052, 1054, 1056, - 1058, 1060, 1062, 1064, 1066, 1068, 1069, 1076, 1079, 1081, + 617, 619, 622, 627, 632, 637, 642, 647, 652, 657, + 662, 667, 672, 677, 682, 687, 692, 697, 698, 704, + 708, 710, 712, 714, 715, 722, 723, 729, 733, 735, + 737, 739, 741, 744, 746, 748, 750, 752, 754, 757, + 758, 764, 768, 770, 772, 776, 781, 786, 787, 794, + 797, 799, 801, 803, 805, 807, 809, 811, 813, 815, + 818, 823, 828, 833, 838, 839, 845, 849, 851, 853, + 855, 857, 859, 861, 863, 865, 867, 869, 871, 876, + 881, 886, 887, 894, 897, 899, 901, 903, 905, 908, + 913, 918, 923, 929, 932, 934, 936, 938, 943, 944, + 951, 954, 956, 958, 960, 962, 965, 970, 975, 976, + 982, 986, 988, 990, 992, 994, 996, 998, 1000, 1002, + 1004, 1006, 1008, 1009, 1016, 1019, 1021, 1023, 1025, 1028, + 1033, 1034, 1040, 1044, 1046, 1048, 1050, 1052, 1054, 1056, + 1058, 1060, 1062, 1064, 1066, 1067, 1074, 1077, 1079, 1081, 1083, 1085, 1087, 1089, 1091, 1093, 1095, 1097, 1099, 1101, - 1103, 1105, 1107, 1110, 1115, 1120, 1125, 1130, 1135, 1140, - 1145, 1150, 1151, 1157, 1161, 1163, 1165, 1167, 1172, 1177, - 1182, 1187, 1192, 1193, 1200, 1203, 1205, 1207, 1209, 1211, - 1216, 1221, 1222, 1229, 1232, 1234, 1236, 1238, 1240, 1245, - 1250, 1256, 1259, 1261, 1263, 1265, 1270, 1271, 1278, 1281, - 1283, 1285, 1287, 1289, 1294, 1299, 1305, 1308, 1310, 1312, + 1103, 1105, 1108, 1113, 1118, 1123, 1128, 1133, 1138, 1143, + 1148, 1149, 1155, 1159, 1161, 1163, 1165, 1170, 1175, 1180, + 1185, 1190, 1191, 1198, 1201, 1203, 1205, 1207, 1209, 1214, + 1219, 1220, 1227, 1230, 1232, 1234, 1236, 1238, 1243, 1248, + 1254, 1257, 1259, 1261, 1263, 1268, 1269, 1276, 1279, 1281, + 1283, 1285, 1287, 1292, 1297, 1303, 1306, 1308, 1310, 1312, 1314, 1316, 1318, 1320, 1322, 1324, 1326, 1328, 1330, 1332, 1334, 1336, 1338, 1340, 1342, 1344, 1346, 1348, 1350, 1352, 1354, 1356, 1358, 1360, 1362, 1364, 1366, 1368, 1370, 1372, 1374, 1376, 1378, 1380, 1382, 1384, 1386, 1388, 1390, 1392, - 1394, 1396, 1398, 1400, 1402, 1404, 1406, 1408, 1413, 1418, - 1423, 1428, 1433, 1438, 1443, 1448, 1453, 1458, 1463, 1468, - 1473, 1478, 1483, 1488, 1493, 1498, 1503, 1508, 1513, 1518, - 1523, 1528, 1533, 1538, 1543, 1548, 1553, 1558, 1563, 1568, - 1573, 1578, 1583, 1588, 1593, 1598, 1603, 1608, 1613, 1618, - 1623, 1628, 1633, 1634, 1640, 1644, 1646, 1648, 1650, 1652, + 1394, 1396, 1398, 1400, 1402, 1404, 1406, 1411, 1416, 1421, + 1426, 1431, 1436, 1441, 1446, 1451, 1456, 1461, 1466, 1471, + 1476, 1481, 1486, 1491, 1496, 1501, 1506, 1511, 1516, 1521, + 1526, 1531, 1536, 1541, 1546, 1551, 1556, 1561, 1566, 1571, + 1576, 1581, 1586, 1591, 1596, 1601, 1606, 1611, 1616, 1621, + 1626, 1631, 1632, 1638, 1642, 1644, 1646, 1648, 1650, 1652, 1654, 1656, 1658, 1660, 1662, 1664, 1666, 1668, 1670, 1672, - 1674, 1676, 1678, 1680, 1682, 1684, 1686, 1688, 1690, 1691, - 1697, 1701, 1703, 1705, 1707, 1709, 1711, 1713, 1715, 1717, + 1674, 1676, 1678, 1680, 1682, 1684, 1686, 1688, 1689, 1695, + 1699, 1701, 1703, 1705, 1707, 1709, 1711, 1713, 1715, 1717, 1719, 1721, 1723, 1725, 1727, 1729, 1731, 1733, 1735, 1737, - 1739, 1741, 1743, 1745, 1747, 1752, 1757, 1762, 1768, 1771, + 1739, 1741, 1743, 1745, 1750, 1755, 1760, 1766, 1769, 1771, 1773, 1775, 1777, 1779, 1781, 1783, 1785, 1787, 1789, 1791, - 1793, 1795, 1797, 1799, 1804, 1809, 1814, 1819, 1824, 1829, - 1834, 1839, 1844, 1849, 1854, 1859, 1865, 1868, 1870, 1872, - 1874, 1876, 1878, 1880, 1882, 1884, 1886, 1891, 1896, 1901, - 1906, 1911, 1916 + 1793, 1795, 1797, 1802, 1807, 1812, 1817, 1822, 1827, 1832, + 1837, 1842, 1847, 1852, 1857, 1863, 1866, 1868, 1870, 1872, + 1874, 1876, 1878, 1880, 1882, 1884, 1889, 1894, 1899, 1904, + 1909, 1914 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 228, 0, -1, -1, 228, 229, -1, 263, -1, 269, - -1, 283, -1, 482, -1, 301, -1, 324, -1, 338, - -1, 239, -1, 497, -1, 353, -1, 360, -1, 364, - -1, 374, -1, 383, -1, 403, -1, 409, -1, 415, - -1, 425, -1, 419, -1, 234, -1, 1, 222, -1, - 1, 223, -1, -1, 231, -1, 105, 230, -1, 105, - 140, 230, -1, 105, 141, 230, -1, 105, 142, 230, - -1, 105, 143, 230, -1, 105, 144, 230, -1, 105, - 145, 230, -1, 105, 146, 230, -1, -1, 233, -1, - 105, 232, -1, 105, 9, 232, -1, 105, 10, 232, - -1, 105, 11, 232, -1, 95, 224, 235, 223, 222, - -1, 235, 236, -1, 236, -1, 237, -1, 238, -1, - 1, 222, -1, 94, 225, 123, 222, -1, 119, 225, - 123, 222, -1, 150, 224, 240, 223, 222, -1, 240, - 241, -1, 241, -1, 252, -1, 257, -1, 262, -1, - 254, -1, 255, -1, 256, -1, 259, -1, 260, -1, - 261, -1, 250, -1, 249, -1, 258, -1, 253, -1, - 248, -1, 242, -1, 243, -1, 251, -1, 1, 222, - -1, 134, 225, 244, 222, -1, 135, 225, 246, 222, - -1, 244, 226, 245, -1, 245, -1, 136, -1, 137, - -1, 246, 226, 247, -1, 247, -1, 136, -1, 137, - -1, 132, 225, 123, 222, -1, 130, 225, 123, 222, - -1, 133, 225, 123, 222, -1, 175, 225, 123, 222, - -1, 96, 225, 123, 222, -1, 151, 225, 123, 222, - -1, 24, 225, 123, 222, -1, 99, 225, 123, 222, - -1, 98, 225, 123, 222, -1, 216, 225, 123, 222, - -1, 217, 225, 123, 222, -1, 186, 225, 105, 222, - -1, 82, 225, 105, 222, -1, 86, 225, 105, 222, - -1, 58, 225, 164, 222, -1, 4, 224, 264, 223, - 222, -1, 264, 265, -1, 265, -1, 266, -1, 268, - -1, 267, -1, 1, 222, -1, 96, 225, 123, 222, - -1, 31, 225, 123, 222, -1, 24, 225, 123, 222, - -1, 72, 224, 270, 223, 222, -1, 270, 271, -1, - 271, -1, 272, -1, 273, -1, 1, 222, -1, 215, - 225, 164, 222, -1, -1, 274, 221, 224, 275, 223, - 222, -1, 275, 276, -1, 276, -1, 277, -1, 279, - -1, 278, -1, 1, 222, -1, 96, 225, 123, 222, - -1, 220, 225, 233, 222, -1, 220, 225, 201, 222, - -1, -1, 155, 280, 225, 281, 222, -1, 281, 226, - 282, -1, 282, -1, 213, -1, 108, -1, 40, -1, - 178, -1, 65, -1, 63, -1, 177, -1, -1, 108, - 284, 224, 285, 223, 222, -1, 285, 286, -1, 286, - -1, 287, -1, 288, -1, 289, -1, 293, -1, 292, - -1, 290, -1, 291, -1, 297, -1, 1, 222, -1, - 96, 225, 123, 222, -1, 213, 225, 123, 222, -1, - 118, 225, 123, 222, -1, 32, 225, 164, 222, -1, - 131, 225, 123, 222, -1, 17, 225, 123, 222, -1, - -1, 198, 294, 225, 295, 222, -1, 295, 226, 296, - -1, 296, -1, 170, -1, 173, -1, 174, -1, 176, - -1, 177, -1, 181, -1, 51, -1, 195, -1, 187, - -1, 191, -1, 199, -1, 196, -1, 179, -1, 189, - -1, 193, -1, 182, -1, 205, -1, 171, -1, 172, - -1, 185, -1, 188, -1, 180, -1, -1, 36, 298, - 225, 299, 222, -1, 299, 226, 300, -1, 300, -1, - 47, -1, 128, -1, 65, -1, 212, -1, 178, -1, - 200, -1, 218, -1, 40, -1, 25, -1, 207, -1, - 127, -1, 4, -1, 189, -1, 204, -1, 112, -1, - 129, -1, 194, -1, 94, -1, -1, 17, 302, 224, - 303, 223, 222, -1, 303, 304, -1, 304, -1, 305, - -1, 315, -1, 316, -1, 306, -1, 317, -1, 307, + 227, 0, -1, -1, 227, 228, -1, 262, -1, 268, + -1, 282, -1, 481, -1, 300, -1, 323, -1, 337, + -1, 238, -1, 496, -1, 352, -1, 359, -1, 363, + -1, 373, -1, 382, -1, 402, -1, 408, -1, 414, + -1, 424, -1, 418, -1, 233, -1, 1, 221, -1, + 1, 222, -1, -1, 230, -1, 105, 229, -1, 105, + 139, 229, -1, 105, 140, 229, -1, 105, 141, 229, + -1, 105, 142, 229, -1, 105, 143, 229, -1, 105, + 144, 229, -1, 105, 145, 229, -1, -1, 232, -1, + 105, 231, -1, 105, 9, 231, -1, 105, 10, 231, + -1, 105, 11, 231, -1, 95, 223, 234, 222, 221, + -1, 234, 235, -1, 235, -1, 236, -1, 237, -1, + 1, 221, -1, 94, 224, 122, 221, -1, 118, 224, + 122, 221, -1, 149, 223, 239, 222, 221, -1, 239, + 240, -1, 240, -1, 251, -1, 256, -1, 261, -1, + 253, -1, 254, -1, 255, -1, 258, -1, 259, -1, + 260, -1, 249, -1, 248, -1, 257, -1, 252, -1, + 247, -1, 241, -1, 242, -1, 250, -1, 1, 221, + -1, 133, 224, 243, 221, -1, 134, 224, 245, 221, + -1, 243, 225, 244, -1, 244, -1, 135, -1, 136, + -1, 245, 225, 246, -1, 246, -1, 135, -1, 136, + -1, 131, 224, 122, 221, -1, 129, 224, 122, 221, + -1, 132, 224, 122, 221, -1, 174, 224, 122, 221, + -1, 96, 224, 122, 221, -1, 150, 224, 122, 221, + -1, 24, 224, 122, 221, -1, 99, 224, 122, 221, + -1, 98, 224, 122, 221, -1, 215, 224, 122, 221, + -1, 216, 224, 122, 221, -1, 185, 224, 105, 221, + -1, 82, 224, 105, 221, -1, 86, 224, 105, 221, + -1, 58, 224, 163, 221, -1, 4, 223, 263, 222, + 221, -1, 263, 264, -1, 264, -1, 265, -1, 267, + -1, 266, -1, 1, 221, -1, 96, 224, 122, 221, + -1, 31, 224, 122, 221, -1, 24, 224, 122, 221, + -1, 72, 223, 269, 222, 221, -1, 269, 270, -1, + 270, -1, 271, -1, 272, -1, 1, 221, -1, 214, + 224, 163, 221, -1, -1, 273, 220, 223, 274, 222, + 221, -1, 274, 275, -1, 275, -1, 276, -1, 278, + -1, 277, -1, 1, 221, -1, 96, 224, 122, 221, + -1, 219, 224, 232, 221, -1, 219, 224, 200, 221, + -1, -1, 154, 279, 224, 280, 221, -1, 280, 225, + 281, -1, 281, -1, 212, -1, 108, -1, 40, -1, + 177, -1, 65, -1, 63, -1, 176, -1, -1, 108, + 283, 223, 284, 222, 221, -1, 284, 285, -1, 285, + -1, 286, -1, 287, -1, 288, -1, 292, -1, 291, + -1, 289, -1, 290, -1, 296, -1, 1, 221, -1, + 96, 224, 122, 221, -1, 212, 224, 122, 221, -1, + 117, 224, 122, 221, -1, 32, 224, 163, 221, -1, + 130, 224, 122, 221, -1, 17, 224, 122, 221, -1, + -1, 197, 293, 224, 294, 221, -1, 294, 225, 295, + -1, 295, -1, 169, -1, 172, -1, 173, -1, 175, + -1, 176, -1, 180, -1, 51, -1, 194, -1, 186, + -1, 190, -1, 198, -1, 195, -1, 178, -1, 188, + -1, 192, -1, 181, -1, 204, -1, 170, -1, 171, + -1, 184, -1, 187, -1, 179, -1, -1, 36, 297, + 224, 298, 221, -1, 298, 225, 299, -1, 299, -1, + 47, -1, 127, -1, 65, -1, 211, -1, 177, -1, + 199, -1, 217, -1, 40, -1, 25, -1, 206, -1, + 126, -1, 4, -1, 188, -1, 203, -1, 128, -1, + 193, -1, 94, -1, -1, 17, 301, 223, 302, 222, + 221, -1, 302, 303, -1, 303, -1, 304, -1, 314, + -1, 315, -1, 305, -1, 316, -1, 306, -1, 307, -1, 308, -1, 309, -1, 310, -1, 311, -1, 312, - -1, 313, -1, 314, -1, 318, -1, 319, -1, 320, - -1, 1, 222, -1, 96, 225, 123, 222, -1, 121, - 225, 231, 222, -1, 107, 225, 105, 222, -1, 19, - 225, 231, 222, -1, 84, 225, 105, 222, -1, 78, - 225, 105, 222, -1, 80, 225, 105, 222, -1, 79, - 225, 105, 222, -1, 147, 225, 233, 222, -1, 190, - 225, 233, 222, -1, 15, 225, 105, 222, -1, 16, - 225, 105, 222, -1, 106, 225, 105, 222, -1, 90, - 225, 231, 222, -1, 91, 225, 231, 222, -1, -1, - 36, 321, 225, 322, 222, -1, 322, 226, 323, -1, - 323, -1, 92, -1, 93, -1, -1, 71, 325, 224, - 330, 223, 222, -1, -1, 36, 327, 225, 328, 222, - -1, 328, 226, 329, -1, 329, -1, 197, -1, 51, - -1, 192, -1, 330, 331, -1, 331, -1, 332, -1, - 326, -1, 336, -1, 337, -1, 1, 222, -1, -1, - 122, 225, 334, 333, 222, -1, 334, 226, 335, -1, - 335, -1, 105, -1, 105, 168, 105, -1, 62, 225, - 123, 222, -1, 57, 225, 123, 222, -1, -1, 48, - 339, 224, 340, 223, 222, -1, 340, 341, -1, 341, - -1, 342, -1, 343, -1, 344, -1, 346, -1, 350, - -1, 351, -1, 352, -1, 345, -1, 1, 222, -1, - 213, 225, 123, 222, -1, 118, 225, 123, 222, -1, - 17, 225, 123, 222, -1, 32, 225, 164, 222, -1, - -1, 36, 347, 225, 348, 222, -1, 348, 226, 349, - -1, 349, -1, 158, -1, 33, -1, 66, -1, 49, - -1, 13, -1, 104, -1, 43, -1, 139, -1, 206, - -1, 97, -1, 157, 225, 123, 222, -1, 126, 225, - 123, 222, -1, 125, 225, 105, 222, -1, -1, 138, - 354, 224, 355, 223, 222, -1, 355, 356, -1, 356, - -1, 357, -1, 358, -1, 359, -1, 1, 222, -1, - 73, 225, 123, 222, -1, 124, 225, 123, 222, -1, - 34, 225, 123, 222, -1, 208, 224, 361, 223, 222, - -1, 361, 362, -1, 362, -1, 363, -1, 1, -1, - 96, 225, 123, 222, -1, -1, 153, 365, 224, 366, - 223, 222, -1, 366, 367, -1, 367, -1, 368, -1, - 369, -1, 370, -1, 1, 222, -1, 96, 225, 123, - 222, -1, 213, 225, 123, 222, -1, -1, 155, 371, - 225, 372, 222, -1, 372, 226, 373, -1, 373, -1, - 65, -1, 212, -1, 178, -1, 200, -1, 218, -1, - 203, -1, 138, -1, 202, -1, 185, -1, 169, -1, - -1, 154, 375, 224, 376, 223, 222, -1, 376, 377, - -1, 377, -1, 378, -1, 379, -1, 1, 222, -1, - 96, 225, 123, 222, -1, -1, 155, 380, 225, 381, - 222, -1, 381, 226, 382, -1, 382, -1, 65, -1, - 212, -1, 178, -1, 200, -1, 218, -1, 203, -1, - 138, -1, 202, -1, 185, -1, 169, -1, -1, 18, - 384, 224, 385, 223, 222, -1, 385, 386, -1, 386, - -1, 387, -1, 388, -1, 389, -1, 390, -1, 391, - -1, 393, -1, 392, -1, 402, -1, 394, -1, 399, - -1, 400, -1, 401, -1, 398, -1, 1, 222, -1, - 96, 225, 123, 222, -1, 57, 225, 123, 222, -1, - 216, 225, 123, 222, -1, 148, 225, 123, 222, -1, - 3, 225, 123, 222, -1, 122, 225, 105, 222, -1, - 5, 225, 183, 222, -1, 5, 225, 184, 222, -1, - -1, 36, 395, 225, 396, 222, -1, 396, 226, 397, - -1, 397, -1, 8, -1, 197, -1, 32, 225, 164, - 222, -1, 59, 225, 123, 222, -1, 69, 225, 123, - 222, -1, 17, 225, 123, 222, -1, 175, 225, 123, - 222, -1, -1, 63, 404, 224, 405, 223, 222, -1, - 405, 406, -1, 406, -1, 407, -1, 408, -1, 1, - -1, 213, 225, 123, 222, -1, 124, 225, 123, 222, - -1, -1, 23, 410, 224, 411, 223, 222, -1, 411, - 412, -1, 412, -1, 413, -1, 414, -1, 1, -1, - 62, 225, 123, 222, -1, 124, 225, 123, 222, -1, - 34, 224, 416, 223, 222, -1, 416, 417, -1, 417, - -1, 418, -1, 1, -1, 62, 225, 123, 222, -1, - -1, 38, 420, 224, 421, 223, 222, -1, 421, 422, - -1, 422, -1, 423, -1, 424, -1, 1, -1, 96, - 225, 123, 222, -1, 124, 225, 123, 222, -1, 39, - 224, 426, 223, 222, -1, 426, 427, -1, 427, -1, - 436, -1, 437, -1, 439, -1, 440, -1, 441, -1, - 442, -1, 443, -1, 444, -1, 445, -1, 446, -1, - 435, -1, 448, -1, 449, -1, 463, -1, 451, -1, - 453, -1, 455, -1, 454, -1, 458, -1, 452, -1, - 459, -1, 460, -1, 461, -1, 462, -1, 475, -1, - 464, -1, 465, -1, 466, -1, 471, -1, 456, -1, - 457, -1, 481, -1, 479, -1, 480, -1, 438, -1, - 470, -1, 447, -1, 468, -1, 469, -1, 434, -1, - 429, -1, 430, -1, 431, -1, 432, -1, 433, -1, - 450, -1, 428, -1, 467, -1, 1, -1, 87, 225, - 105, 222, -1, 42, 225, 164, 222, -1, 41, 225, - 231, 222, -1, 44, 225, 231, 222, -1, 45, 225, - 105, 222, -1, 46, 225, 105, 222, -1, 152, 225, - 164, 222, -1, 64, 225, 231, 222, -1, 56, 225, - 164, 222, -1, 60, 225, 164, 222, -1, 28, 225, - 164, 222, -1, 35, 225, 164, 222, -1, 6, 225, - 164, 222, -1, 83, 225, 231, 222, -1, 81, 225, - 105, 222, -1, 74, 225, 105, 222, -1, 7, 225, - 231, 222, -1, 167, 225, 231, 222, -1, 166, 225, - 231, 222, -1, 50, 225, 105, 222, -1, 61, 225, - 164, 222, -1, 219, 225, 164, 222, -1, 159, 225, - 164, 222, -1, 162, 225, 164, 222, -1, 163, 225, - 164, 222, -1, 161, 225, 164, 222, -1, 161, 225, - 165, 222, -1, 160, 225, 164, 222, -1, 160, 225, - 165, 222, -1, 116, 225, 231, 222, -1, 12, 225, - 231, 222, -1, 109, 225, 164, 222, -1, 117, 225, - 231, 222, -1, 156, 225, 164, 222, -1, 103, 225, - 164, 222, -1, 211, 225, 164, 222, -1, 111, 225, - 164, 222, -1, 29, 225, 105, 222, -1, 85, 225, - 105, 222, -1, 214, 225, 164, 222, -1, 30, 225, - 123, 222, -1, 209, 225, 123, 222, -1, 120, 225, - 164, 222, -1, 26, 225, 164, 222, -1, 210, 225, - 231, 222, -1, -1, 113, 472, 225, 473, 222, -1, - 473, 226, 474, -1, 474, -1, 170, -1, 173, -1, - 174, -1, 176, -1, 177, -1, 181, -1, 51, -1, - 195, -1, 187, -1, 191, -1, 199, -1, 196, -1, - 179, -1, 189, -1, 193, -1, 182, -1, 205, -1, - 171, -1, 172, -1, 185, -1, 188, -1, 180, -1, - -1, 110, 476, 225, 477, 222, -1, 477, 226, 478, - -1, 478, -1, 170, -1, 173, -1, 174, -1, 176, - -1, 177, -1, 181, -1, 195, -1, 51, -1, 187, - -1, 191, -1, 199, -1, 196, -1, 179, -1, 189, - -1, 193, -1, 182, -1, 205, -1, 171, -1, 172, - -1, 185, -1, 188, -1, 180, -1, 88, 225, 105, - 222, -1, 89, 225, 105, 222, -1, 20, 225, 105, - 222, -1, 14, 224, 483, 223, 222, -1, 483, 484, - -1, 484, -1, 490, -1, 486, -1, 487, -1, 488, - -1, 489, -1, 491, -1, 492, -1, 493, -1, 494, - -1, 495, -1, 496, -1, 485, -1, 1, -1, 27, - 225, 164, 222, -1, 67, 225, 231, 222, -1, 68, - 225, 231, 222, -1, 77, 225, 105, 222, -1, 76, - 225, 105, 222, -1, 75, 225, 105, 222, -1, 22, - 225, 105, 222, -1, 21, 225, 105, 222, -1, 101, - 225, 164, 222, -1, 102, 225, 164, 222, -1, 114, - 225, 105, 222, -1, 115, 225, 231, 222, -1, 149, - 224, 498, 223, 222, -1, 498, 499, -1, 499, -1, - 500, -1, 501, -1, 502, -1, 504, -1, 505, -1, - 503, -1, 506, -1, 1, -1, 37, 225, 164, 222, - -1, 54, 225, 164, 222, -1, 55, 225, 164, 222, - -1, 52, 225, 123, 222, -1, 70, 225, 231, 222, - -1, 51, 225, 164, 222, -1, 53, 225, 164, 222, - -1 + -1, 313, -1, 317, -1, 318, -1, 319, -1, 1, + 221, -1, 96, 224, 122, 221, -1, 120, 224, 230, + 221, -1, 107, 224, 105, 221, -1, 19, 224, 230, + 221, -1, 84, 224, 105, 221, -1, 78, 224, 105, + 221, -1, 80, 224, 105, 221, -1, 79, 224, 105, + 221, -1, 146, 224, 232, 221, -1, 189, 224, 232, + 221, -1, 15, 224, 105, 221, -1, 16, 224, 105, + 221, -1, 106, 224, 105, 221, -1, 90, 224, 230, + 221, -1, 91, 224, 230, 221, -1, -1, 36, 320, + 224, 321, 221, -1, 321, 225, 322, -1, 322, -1, + 92, -1, 93, -1, -1, 71, 324, 223, 329, 222, + 221, -1, -1, 36, 326, 224, 327, 221, -1, 327, + 225, 328, -1, 328, -1, 196, -1, 51, -1, 191, + -1, 329, 330, -1, 330, -1, 331, -1, 325, -1, + 335, -1, 336, -1, 1, 221, -1, -1, 121, 224, + 333, 332, 221, -1, 333, 225, 334, -1, 334, -1, + 105, -1, 105, 167, 105, -1, 62, 224, 122, 221, + -1, 57, 224, 122, 221, -1, -1, 48, 338, 223, + 339, 222, 221, -1, 339, 340, -1, 340, -1, 341, + -1, 342, -1, 343, -1, 345, -1, 349, -1, 350, + -1, 351, -1, 344, -1, 1, 221, -1, 212, 224, + 122, 221, -1, 117, 224, 122, 221, -1, 17, 224, + 122, 221, -1, 32, 224, 163, 221, -1, -1, 36, + 346, 224, 347, 221, -1, 347, 225, 348, -1, 348, + -1, 157, -1, 33, -1, 66, -1, 49, -1, 13, + -1, 104, -1, 43, -1, 138, -1, 205, -1, 97, + -1, 156, 224, 122, 221, -1, 125, 224, 122, 221, + -1, 124, 224, 105, 221, -1, -1, 137, 353, 223, + 354, 222, 221, -1, 354, 355, -1, 355, -1, 356, + -1, 357, -1, 358, -1, 1, 221, -1, 73, 224, + 122, 221, -1, 123, 224, 122, 221, -1, 34, 224, + 122, 221, -1, 207, 223, 360, 222, 221, -1, 360, + 361, -1, 361, -1, 362, -1, 1, -1, 96, 224, + 122, 221, -1, -1, 152, 364, 223, 365, 222, 221, + -1, 365, 366, -1, 366, -1, 367, -1, 368, -1, + 369, -1, 1, 221, -1, 96, 224, 122, 221, -1, + 212, 224, 122, 221, -1, -1, 154, 370, 224, 371, + 221, -1, 371, 225, 372, -1, 372, -1, 65, -1, + 211, -1, 177, -1, 199, -1, 217, -1, 202, -1, + 137, -1, 201, -1, 184, -1, 168, -1, -1, 153, + 374, 223, 375, 222, 221, -1, 375, 376, -1, 376, + -1, 377, -1, 378, -1, 1, 221, -1, 96, 224, + 122, 221, -1, -1, 154, 379, 224, 380, 221, -1, + 380, 225, 381, -1, 381, -1, 65, -1, 211, -1, + 177, -1, 199, -1, 217, -1, 202, -1, 137, -1, + 201, -1, 184, -1, 168, -1, -1, 18, 383, 223, + 384, 222, 221, -1, 384, 385, -1, 385, -1, 386, + -1, 387, -1, 388, -1, 389, -1, 390, -1, 392, + -1, 391, -1, 401, -1, 393, -1, 398, -1, 399, + -1, 400, -1, 397, -1, 1, 221, -1, 96, 224, + 122, 221, -1, 57, 224, 122, 221, -1, 215, 224, + 122, 221, -1, 147, 224, 122, 221, -1, 3, 224, + 122, 221, -1, 121, 224, 105, 221, -1, 5, 224, + 182, 221, -1, 5, 224, 183, 221, -1, -1, 36, + 394, 224, 395, 221, -1, 395, 225, 396, -1, 396, + -1, 8, -1, 196, -1, 32, 224, 163, 221, -1, + 59, 224, 122, 221, -1, 69, 224, 122, 221, -1, + 17, 224, 122, 221, -1, 174, 224, 122, 221, -1, + -1, 63, 403, 223, 404, 222, 221, -1, 404, 405, + -1, 405, -1, 406, -1, 407, -1, 1, -1, 212, + 224, 122, 221, -1, 123, 224, 122, 221, -1, -1, + 23, 409, 223, 410, 222, 221, -1, 410, 411, -1, + 411, -1, 412, -1, 413, -1, 1, -1, 62, 224, + 122, 221, -1, 123, 224, 122, 221, -1, 34, 223, + 415, 222, 221, -1, 415, 416, -1, 416, -1, 417, + -1, 1, -1, 62, 224, 122, 221, -1, -1, 38, + 419, 223, 420, 222, 221, -1, 420, 421, -1, 421, + -1, 422, -1, 423, -1, 1, -1, 96, 224, 122, + 221, -1, 123, 224, 122, 221, -1, 39, 223, 425, + 222, 221, -1, 425, 426, -1, 426, -1, 435, -1, + 436, -1, 438, -1, 439, -1, 440, -1, 441, -1, + 442, -1, 443, -1, 444, -1, 445, -1, 434, -1, + 447, -1, 448, -1, 462, -1, 450, -1, 452, -1, + 454, -1, 453, -1, 457, -1, 451, -1, 458, -1, + 459, -1, 460, -1, 461, -1, 474, -1, 463, -1, + 464, -1, 465, -1, 470, -1, 455, -1, 456, -1, + 480, -1, 478, -1, 479, -1, 437, -1, 469, -1, + 446, -1, 467, -1, 468, -1, 433, -1, 428, -1, + 429, -1, 430, -1, 431, -1, 432, -1, 449, -1, + 427, -1, 466, -1, 1, -1, 87, 224, 105, 221, + -1, 42, 224, 163, 221, -1, 41, 224, 230, 221, + -1, 44, 224, 230, 221, -1, 45, 224, 105, 221, + -1, 46, 224, 105, 221, -1, 151, 224, 163, 221, + -1, 64, 224, 230, 221, -1, 56, 224, 163, 221, + -1, 60, 224, 163, 221, -1, 28, 224, 163, 221, + -1, 35, 224, 163, 221, -1, 6, 224, 163, 221, + -1, 83, 224, 230, 221, -1, 81, 224, 105, 221, + -1, 74, 224, 105, 221, -1, 7, 224, 230, 221, + -1, 166, 224, 230, 221, -1, 165, 224, 230, 221, + -1, 50, 224, 105, 221, -1, 61, 224, 163, 221, + -1, 218, 224, 163, 221, -1, 158, 224, 163, 221, + -1, 161, 224, 163, 221, -1, 162, 224, 163, 221, + -1, 160, 224, 163, 221, -1, 160, 224, 164, 221, + -1, 159, 224, 163, 221, -1, 159, 224, 164, 221, + -1, 115, 224, 230, 221, -1, 12, 224, 230, 221, + -1, 109, 224, 163, 221, -1, 116, 224, 230, 221, + -1, 155, 224, 163, 221, -1, 103, 224, 163, 221, + -1, 210, 224, 163, 221, -1, 111, 224, 163, 221, + -1, 29, 224, 105, 221, -1, 85, 224, 105, 221, + -1, 213, 224, 163, 221, -1, 30, 224, 122, 221, + -1, 208, 224, 122, 221, -1, 119, 224, 163, 221, + -1, 26, 224, 163, 221, -1, 209, 224, 230, 221, + -1, -1, 112, 471, 224, 472, 221, -1, 472, 225, + 473, -1, 473, -1, 169, -1, 172, -1, 173, -1, + 175, -1, 176, -1, 180, -1, 51, -1, 194, -1, + 186, -1, 190, -1, 198, -1, 195, -1, 178, -1, + 188, -1, 192, -1, 181, -1, 204, -1, 170, -1, + 171, -1, 184, -1, 187, -1, 179, -1, -1, 110, + 475, 224, 476, 221, -1, 476, 225, 477, -1, 477, + -1, 169, -1, 172, -1, 173, -1, 175, -1, 176, + -1, 180, -1, 194, -1, 51, -1, 186, -1, 190, + -1, 198, -1, 195, -1, 178, -1, 188, -1, 192, + -1, 181, -1, 204, -1, 170, -1, 171, -1, 184, + -1, 187, -1, 179, -1, 88, 224, 105, 221, -1, + 89, 224, 105, 221, -1, 20, 224, 105, 221, -1, + 14, 223, 482, 222, 221, -1, 482, 483, -1, 483, + -1, 489, -1, 485, -1, 486, -1, 487, -1, 488, + -1, 490, -1, 491, -1, 492, -1, 493, -1, 494, + -1, 495, -1, 484, -1, 1, -1, 27, 224, 163, + 221, -1, 67, 224, 230, 221, -1, 68, 224, 230, + 221, -1, 77, 224, 105, 221, -1, 76, 224, 105, + 221, -1, 75, 224, 105, 221, -1, 22, 224, 105, + 221, -1, 21, 224, 105, 221, -1, 101, 224, 163, + 221, -1, 102, 224, 163, 221, -1, 113, 224, 105, + 221, -1, 114, 224, 230, 221, -1, 148, 223, 497, + 222, 221, -1, 497, 498, -1, 498, -1, 499, -1, + 500, -1, 501, -1, 503, -1, 504, -1, 502, -1, + 505, -1, 1, -1, 37, 224, 163, 221, -1, 54, + 224, 163, 221, -1, 55, 224, 163, 221, -1, 52, + 224, 122, 221, -1, 70, 224, 230, 221, -1, 51, + 224, 163, 221, -1, 53, 224, 163, 221, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 363, 363, 364, 367, 368, 369, 370, 371, 372, - 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, - 383, 384, 385, 386, 387, 388, 392, 392, 393, 397, - 401, 405, 409, 413, 417, 421, 427, 427, 428, 429, - 430, 431, 438, 441, 441, 442, 442, 442, 444, 450, - 457, 459, 459, 460, 460, 461, 461, 462, 462, 463, - 463, 464, 464, 465, 465, 466, 466, 467, 467, 468, - 469, 472, 473, 475, 475, 476, 482, 490, 490, 491, - 497, 505, 547, 606, 634, 642, 657, 672, 681, 695, - 704, 732, 762, 787, 809, 831, 840, 842, 842, 843, - 843, 844, 844, 846, 855, 864, 876, 877, 877, 879, - 879, 880, 882, 889, 889, 902, 903, 905, 905, 906, - 906, 908, 916, 919, 925, 924, 930, 930, 931, 935, - 939, 943, 947, 951, 955, 966, 965, 1042, 1042, 1043, - 1043, 1043, 1044, 1044, 1044, 1045, 1045, 1045, 1047, 1053, - 1059, 1065, 1076, 1082, 1089, 1088, 1094, 1094, 1095, 1099, - 1103, 1107, 1111, 1115, 1119, 1123, 1127, 1131, 1135, 1139, - 1143, 1147, 1151, 1155, 1159, 1163, 1167, 1171, 1175, 1179, - 1186, 1185, 1191, 1191, 1192, 1196, 1200, 1204, 1208, 1212, - 1216, 1220, 1224, 1228, 1232, 1236, 1240, 1244, 1248, 1252, - 1256, 1260, 1271, 1270, 1331, 1331, 1332, 1333, 1333, 1334, - 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, 1342, 1343, - 1344, 1345, 1346, 1348, 1354, 1360, 1366, 1372, 1378, 1384, - 1390, 1396, 1402, 1409, 1415, 1421, 1427, 1436, 1446, 1445, - 1451, 1451, 1452, 1456, 1467, 1466, 1473, 1472, 1477, 1477, - 1478, 1482, 1486, 1492, 1492, 1493, 1493, 1493, 1493, 1493, - 1495, 1495, 1497, 1497, 1499, 1513, 1533, 1539, 1549, 1548, - 1590, 1590, 1591, 1591, 1591, 1591, 1592, 1592, 1592, 1593, - 1593, 1595, 1601, 1607, 1613, 1625, 1624, 1630, 1630, 1631, - 1635, 1639, 1643, 1647, 1651, 1655, 1659, 1663, 1667, 1673, - 1687, 1696, 1710, 1709, 1724, 1724, 1725, 1725, 1725, 1725, - 1727, 1733, 1739, 1749, 1751, 1751, 1752, 1752, 1754, 1770, - 1769, 1794, 1794, 1795, 1795, 1795, 1795, 1797, 1803, 1823, - 1822, 1828, 1828, 1829, 1833, 1837, 1841, 1845, 1849, 1853, - 1857, 1861, 1865, 1875, 1874, 1895, 1895, 1896, 1896, 1896, - 1898, 1905, 1904, 1910, 1910, 1911, 1915, 1919, 1923, 1927, - 1931, 1935, 1939, 1943, 1947, 1957, 1956, 2022, 2022, 2023, - 2023, 2023, 2024, 2024, 2025, 2025, 2025, 2026, 2026, 2026, - 2027, 2027, 2028, 2030, 2036, 2042, 2048, 2061, 2074, 2080, - 2084, 2093, 2092, 2097, 2097, 2098, 2102, 2108, 2119, 2125, - 2131, 2137, 2153, 2152, 2178, 2178, 2179, 2179, 2179, 2181, - 2201, 2211, 2210, 2237, 2237, 2238, 2238, 2238, 2240, 2246, - 2255, 2257, 2257, 2258, 2258, 2260, 2278, 2277, 2300, 2300, - 2301, 2301, 2301, 2303, 2309, 2318, 2321, 2321, 2322, 2322, - 2323, 2323, 2324, 2324, 2325, 2325, 2326, 2326, 2327, 2328, - 2329, 2329, 2330, 2330, 2331, 2331, 2332, 2332, 2333, 2333, - 2334, 2334, 2335, 2335, 2336, 2336, 2337, 2337, 2338, 2338, - 2339, 2339, 2340, 2341, 2341, 2342, 2343, 2344, 2344, 2345, - 2345, 2346, 2347, 2348, 2349, 2349, 2350, 2353, 2358, 2364, - 2370, 2376, 2381, 2386, 2391, 2396, 2401, 2406, 2411, 2416, - 2421, 2426, 2431, 2436, 2441, 2446, 2452, 2463, 2468, 2473, - 2478, 2483, 2488, 2491, 2496, 2499, 2504, 2509, 2514, 2519, - 2524, 2529, 2534, 2539, 2544, 2549, 2554, 2559, 2568, 2577, - 2582, 2587, 2593, 2592, 2597, 2597, 2598, 2601, 2604, 2607, - 2610, 2613, 2616, 2619, 2622, 2625, 2628, 2631, 2634, 2637, - 2640, 2643, 2646, 2649, 2652, 2655, 2658, 2661, 2667, 2666, - 2671, 2671, 2672, 2675, 2678, 2681, 2684, 2687, 2690, 2693, - 2696, 2699, 2702, 2705, 2708, 2711, 2714, 2717, 2720, 2723, - 2726, 2729, 2732, 2735, 2740, 2745, 2750, 2759, 2762, 2762, - 2763, 2764, 2764, 2765, 2765, 2766, 2767, 2768, 2769, 2770, - 2770, 2771, 2771, 2773, 2778, 2783, 2788, 2793, 2798, 2803, - 2808, 2813, 2818, 2823, 2828, 2836, 2839, 2839, 2840, 2840, - 2841, 2842, 2843, 2843, 2844, 2845, 2847, 2853, 2859, 2865, - 2874, 2888, 2894 + 0, 362, 362, 363, 366, 367, 368, 369, 370, 371, + 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, + 382, 383, 384, 385, 386, 387, 391, 391, 392, 396, + 400, 404, 408, 412, 416, 420, 426, 426, 427, 428, + 429, 430, 437, 440, 440, 441, 441, 441, 443, 449, + 456, 458, 458, 459, 459, 460, 460, 461, 461, 462, + 462, 463, 463, 464, 464, 465, 465, 466, 466, 467, + 468, 471, 472, 474, 474, 475, 481, 489, 489, 490, + 496, 504, 546, 605, 633, 641, 656, 671, 680, 694, + 703, 731, 761, 786, 808, 830, 839, 841, 841, 842, + 842, 843, 843, 845, 854, 863, 875, 876, 876, 878, + 878, 879, 881, 888, 888, 901, 902, 904, 904, 905, + 905, 907, 915, 918, 924, 923, 929, 929, 930, 934, + 938, 942, 946, 950, 954, 965, 964, 1041, 1041, 1042, + 1042, 1042, 1043, 1043, 1043, 1044, 1044, 1044, 1046, 1052, + 1058, 1064, 1075, 1081, 1088, 1087, 1093, 1093, 1094, 1098, + 1102, 1106, 1110, 1114, 1118, 1122, 1126, 1130, 1134, 1138, + 1142, 1146, 1150, 1154, 1158, 1162, 1166, 1170, 1174, 1178, + 1185, 1184, 1190, 1190, 1191, 1195, 1199, 1203, 1207, 1211, + 1215, 1219, 1223, 1227, 1231, 1235, 1239, 1243, 1247, 1251, + 1255, 1266, 1265, 1326, 1326, 1327, 1328, 1328, 1329, 1330, + 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1337, 1338, 1339, + 1340, 1341, 1343, 1349, 1355, 1361, 1367, 1373, 1379, 1385, + 1391, 1397, 1404, 1410, 1416, 1422, 1431, 1441, 1440, 1446, + 1446, 1447, 1451, 1462, 1461, 1468, 1467, 1472, 1472, 1473, + 1477, 1481, 1487, 1487, 1488, 1488, 1488, 1488, 1488, 1490, + 1490, 1492, 1492, 1494, 1508, 1528, 1534, 1544, 1543, 1585, + 1585, 1586, 1586, 1586, 1586, 1587, 1587, 1587, 1588, 1588, + 1590, 1596, 1602, 1608, 1620, 1619, 1625, 1625, 1626, 1630, + 1634, 1638, 1642, 1646, 1650, 1654, 1658, 1662, 1668, 1682, + 1691, 1705, 1704, 1719, 1719, 1720, 1720, 1720, 1720, 1722, + 1728, 1734, 1744, 1746, 1746, 1747, 1747, 1749, 1765, 1764, + 1789, 1789, 1790, 1790, 1790, 1790, 1792, 1798, 1818, 1817, + 1823, 1823, 1824, 1828, 1832, 1836, 1840, 1844, 1848, 1852, + 1856, 1860, 1870, 1869, 1890, 1890, 1891, 1891, 1891, 1893, + 1900, 1899, 1905, 1905, 1906, 1910, 1914, 1918, 1922, 1926, + 1930, 1934, 1938, 1942, 1952, 1951, 2017, 2017, 2018, 2018, + 2018, 2019, 2019, 2020, 2020, 2020, 2021, 2021, 2021, 2022, + 2022, 2023, 2025, 2031, 2037, 2043, 2056, 2069, 2075, 2079, + 2088, 2087, 2092, 2092, 2093, 2097, 2103, 2114, 2120, 2126, + 2132, 2148, 2147, 2173, 2173, 2174, 2174, 2174, 2176, 2196, + 2206, 2205, 2232, 2232, 2233, 2233, 2233, 2235, 2241, 2250, + 2252, 2252, 2253, 2253, 2255, 2273, 2272, 2295, 2295, 2296, + 2296, 2296, 2298, 2304, 2313, 2316, 2316, 2317, 2317, 2318, + 2318, 2319, 2319, 2320, 2320, 2321, 2321, 2322, 2323, 2324, + 2324, 2325, 2325, 2326, 2326, 2327, 2327, 2328, 2328, 2329, + 2329, 2330, 2330, 2331, 2331, 2332, 2332, 2333, 2333, 2334, + 2334, 2335, 2336, 2336, 2337, 2338, 2339, 2339, 2340, 2340, + 2341, 2342, 2343, 2344, 2344, 2345, 2348, 2353, 2359, 2365, + 2371, 2376, 2381, 2386, 2391, 2396, 2401, 2406, 2411, 2416, + 2421, 2426, 2431, 2436, 2441, 2447, 2458, 2463, 2468, 2473, + 2478, 2483, 2486, 2491, 2494, 2499, 2504, 2509, 2514, 2519, + 2524, 2529, 2534, 2539, 2544, 2549, 2554, 2563, 2572, 2577, + 2582, 2588, 2587, 2592, 2592, 2593, 2596, 2599, 2602, 2605, + 2608, 2611, 2614, 2617, 2620, 2623, 2626, 2629, 2632, 2635, + 2638, 2641, 2644, 2647, 2650, 2653, 2656, 2662, 2661, 2666, + 2666, 2667, 2670, 2673, 2676, 2679, 2682, 2685, 2688, 2691, + 2694, 2697, 2700, 2703, 2706, 2709, 2712, 2715, 2718, 2721, + 2724, 2727, 2730, 2735, 2740, 2745, 2754, 2757, 2757, 2758, + 2759, 2759, 2760, 2760, 2761, 2762, 2763, 2764, 2765, 2765, + 2766, 2766, 2768, 2773, 2778, 2783, 2788, 2793, 2798, 2803, + 2808, 2813, 2818, 2823, 2831, 2834, 2834, 2835, 2835, 2836, + 2837, 2838, 2838, 2839, 2840, 2842, 2848, 2854, 2860, 2869, + 2883, 2889 }; #endif @@ -1366,32 +1363,32 @@ static const char *const yytname[] = "NO_CREATE_ON_SPLIT", "NO_JOIN_ON_SPLIT", "NO_OPER_FLOOD", "NO_TILDE", "NUMBER", "NUMBER_PER_CIDR", "NUMBER_PER_IP", "OPERATOR", "OPERS_BYPASS_CALLERID", "OPER_ONLY_UMODES", "OPER_PASS_RESV", - "OPER_SPY_T", "OPER_UMODES", "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", - "PACE_WAIT", "PACE_WAIT_SIMPLE", "PASSWORD", "PATH", "PING_COOKIE", - "PING_TIME", "PORT", "QSTRING", "REASON", "REDIRPORT", "REDIRSERV", - "REHASH", "REMOTE", "REMOTEBAN", "RSA_PRIVATE_KEY_FILE", - "RSA_PUBLIC_KEY_FILE", "SSL_CERTIFICATE_FILE", "SSL_DH_PARAM_FILE", - "T_SSL_CLIENT_METHOD", "T_SSL_SERVER_METHOD", "T_SSLV3", "T_TLSV1", - "RESV", "RESV_EXEMPT", "SECONDS", "MINUTES", "HOURS", "DAYS", "WEEKS", - "MONTHS", "YEARS", "SENDQ", "SEND_PASSWORD", "SERVERHIDE", "SERVERINFO", - "IRCD_SID", "TKLINE_EXPIRE_NOTICES", "T_SHARED", "T_CLUSTER", "TYPE", - "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE", "STATS_E_DISABLED", - "STATS_I_OPER_ONLY", "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", - "STATS_P_OPER_ONLY", "TBOOL", "TMASKED", "TS_MAX_DELTA", "TS_WARN_DELTA", - "TWODOTS", "T_ALL", "T_BOTS", "T_SOFTCALLERID", "T_CALLERID", "T_CCONN", - "T_CCONN_FULL", "T_SSL_CIPHER_LIST", "T_DEAF", "T_DEBUG", "T_DLINE", - "T_EXTERNAL", "T_FARCONNECT", "T_FULL", "T_INVISIBLE", "T_IPV4", - "T_IPV6", "T_LOCOPS", "T_MAX_CLIENTS", "T_NCHANGE", "T_NONONREG", - "T_OPERWALL", "T_RECVQ", "T_REJ", "T_SERVER", "T_SERVNOTICE", "T_SET", - "T_SKILL", "T_SPY", "T_SSL", "T_UMODES", "T_UNAUTH", "T_UNDLINE", - "T_UNLIMITED", "T_UNRESV", "T_UNXLINE", "T_GLOBOPS", "T_WALLOP", - "T_WEBIRC", "T_RESTART", "T_SERVICE", "T_SERVICES_NAME", "THROTTLE_TIME", - "TRUE_NO_OPER_FLOOD", "UNKLINE", "USER", "USE_EGD", "USE_LOGGING", - "VHOST", "VHOST6", "XLINE", "WARN_NO_NLINE", "T_SIZE", "T_FILE", "';'", - "'}'", "'{'", "'='", "','", "$accept", "conf", "conf_item", "timespec_", - "timespec", "sizespec_", "sizespec", "modules_entry", "modules_items", - "modules_item", "modules_module", "modules_path", "serverinfo_entry", - "serverinfo_items", "serverinfo_item", "serverinfo_ssl_client_method", + "OPER_UMODES", "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "PACE_WAIT", + "PACE_WAIT_SIMPLE", "PASSWORD", "PATH", "PING_COOKIE", "PING_TIME", + "PORT", "QSTRING", "REASON", "REDIRPORT", "REDIRSERV", "REHASH", + "REMOTE", "REMOTEBAN", "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE", + "SSL_CERTIFICATE_FILE", "SSL_DH_PARAM_FILE", "T_SSL_CLIENT_METHOD", + "T_SSL_SERVER_METHOD", "T_SSLV3", "T_TLSV1", "RESV", "RESV_EXEMPT", + "SECONDS", "MINUTES", "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS", + "SENDQ", "SEND_PASSWORD", "SERVERHIDE", "SERVERINFO", "IRCD_SID", + "TKLINE_EXPIRE_NOTICES", "T_SHARED", "T_CLUSTER", "TYPE", "SHORT_MOTD", + "SPOOF", "SPOOF_NOTICE", "STATS_E_DISABLED", "STATS_I_OPER_ONLY", + "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "TBOOL", + "TMASKED", "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS", "T_ALL", "T_BOTS", + "T_SOFTCALLERID", "T_CALLERID", "T_CCONN", "T_CCONN_FULL", + "T_SSL_CIPHER_LIST", "T_DEAF", "T_DEBUG", "T_DLINE", "T_EXTERNAL", + "T_FARCONNECT", "T_FULL", "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS", + "T_MAX_CLIENTS", "T_NCHANGE", "T_NONONREG", "T_OPERWALL", "T_RECVQ", + "T_REJ", "T_SERVER", "T_SERVNOTICE", "T_SET", "T_SKILL", "T_SPY", + "T_SSL", "T_UMODES", "T_UNAUTH", "T_UNDLINE", "T_UNLIMITED", "T_UNRESV", + "T_UNXLINE", "T_GLOBOPS", "T_WALLOP", "T_WEBIRC", "T_RESTART", + "T_SERVICE", "T_SERVICES_NAME", "THROTTLE_TIME", "TRUE_NO_OPER_FLOOD", + "UNKLINE", "USER", "USE_EGD", "USE_LOGGING", "VHOST", "VHOST6", "XLINE", + "WARN_NO_NLINE", "T_SIZE", "T_FILE", "';'", "'}'", "'{'", "'='", "','", + "$accept", "conf", "conf_item", "timespec_", "timespec", "sizespec_", + "sizespec", "modules_entry", "modules_items", "modules_item", + "modules_module", "modules_path", "serverinfo_entry", "serverinfo_items", + "serverinfo_item", "serverinfo_ssl_client_method", "serverinfo_ssl_server_method", "client_method_types", "client_method_type_item", "server_method_types", "server_method_type_item", "serverinfo_ssl_certificate_file", @@ -1505,77 +1502,77 @@ static const yytype_uint16 yytoknum[] = 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, - 475, 476, 59, 125, 123, 61, 44 + 475, 59, 125, 123, 61, 44 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 227, 228, 228, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 230, 230, 231, 231, - 231, 231, 231, 231, 231, 231, 232, 232, 233, 233, - 233, 233, 234, 235, 235, 236, 236, 236, 237, 238, - 239, 240, 240, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 241, 241, 241, 241, - 241, 242, 243, 244, 244, 245, 245, 246, 246, 247, - 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, - 257, 258, 259, 260, 261, 262, 263, 264, 264, 265, - 265, 265, 265, 266, 267, 268, 269, 270, 270, 271, - 271, 271, 272, 274, 273, 275, 275, 276, 276, 276, - 276, 277, 278, 278, 280, 279, 281, 281, 282, 282, - 282, 282, 282, 282, 282, 284, 283, 285, 285, 286, - 286, 286, 286, 286, 286, 286, 286, 286, 287, 288, - 289, 290, 291, 292, 294, 293, 295, 295, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, - 298, 297, 299, 299, 300, 300, 300, 300, 300, 300, - 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, - 300, 300, 302, 301, 303, 303, 304, 304, 304, 304, - 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, - 304, 304, 304, 305, 306, 307, 308, 309, 310, 311, - 312, 313, 314, 315, 316, 317, 318, 319, 321, 320, - 322, 322, 323, 323, 325, 324, 327, 326, 328, 328, - 329, 329, 329, 330, 330, 331, 331, 331, 331, 331, - 333, 332, 334, 334, 335, 335, 336, 337, 339, 338, - 340, 340, 341, 341, 341, 341, 341, 341, 341, 341, - 341, 342, 343, 344, 345, 347, 346, 348, 348, 349, - 349, 349, 349, 349, 349, 349, 349, 349, 349, 350, - 351, 352, 354, 353, 355, 355, 356, 356, 356, 356, - 357, 358, 359, 360, 361, 361, 362, 362, 363, 365, - 364, 366, 366, 367, 367, 367, 367, 368, 369, 371, - 370, 372, 372, 373, 373, 373, 373, 373, 373, 373, - 373, 373, 373, 375, 374, 376, 376, 377, 377, 377, - 378, 380, 379, 381, 381, 382, 382, 382, 382, 382, - 382, 382, 382, 382, 382, 384, 383, 385, 385, 386, - 386, 386, 386, 386, 386, 386, 386, 386, 386, 386, - 386, 386, 386, 387, 388, 389, 390, 391, 392, 393, - 393, 395, 394, 396, 396, 397, 397, 398, 399, 400, - 401, 402, 404, 403, 405, 405, 406, 406, 406, 407, - 408, 410, 409, 411, 411, 412, 412, 412, 413, 414, - 415, 416, 416, 417, 417, 418, 420, 419, 421, 421, - 422, 422, 422, 423, 424, 425, 426, 426, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 428, 429, 430, + 0, 226, 227, 227, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 229, 229, 230, 230, + 230, 230, 230, 230, 230, 230, 231, 231, 232, 232, + 232, 232, 233, 234, 234, 235, 235, 235, 236, 237, + 238, 239, 239, 240, 240, 240, 240, 240, 240, 240, + 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + 240, 241, 242, 243, 243, 244, 244, 245, 245, 246, + 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, + 256, 257, 258, 259, 260, 261, 262, 263, 263, 264, + 264, 264, 264, 265, 266, 267, 268, 269, 269, 270, + 270, 270, 271, 273, 272, 274, 274, 275, 275, 275, + 275, 276, 277, 277, 279, 278, 280, 280, 281, 281, + 281, 281, 281, 281, 281, 283, 282, 284, 284, 285, + 285, 285, 285, 285, 285, 285, 285, 285, 286, 287, + 288, 289, 290, 291, 293, 292, 294, 294, 295, 295, + 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, + 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, + 297, 296, 298, 298, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 301, 300, 302, 302, 303, 303, 303, 303, 303, + 303, 303, 303, 303, 303, 303, 303, 303, 303, 303, + 303, 303, 304, 305, 306, 307, 308, 309, 310, 311, + 312, 313, 314, 315, 316, 317, 318, 320, 319, 321, + 321, 322, 322, 324, 323, 326, 325, 327, 327, 328, + 328, 328, 329, 329, 330, 330, 330, 330, 330, 332, + 331, 333, 333, 334, 334, 335, 336, 338, 337, 339, + 339, 340, 340, 340, 340, 340, 340, 340, 340, 340, + 341, 342, 343, 344, 346, 345, 347, 347, 348, 348, + 348, 348, 348, 348, 348, 348, 348, 348, 349, 350, + 351, 353, 352, 354, 354, 355, 355, 355, 355, 356, + 357, 358, 359, 360, 360, 361, 361, 362, 364, 363, + 365, 365, 366, 366, 366, 366, 367, 368, 370, 369, + 371, 371, 372, 372, 372, 372, 372, 372, 372, 372, + 372, 372, 374, 373, 375, 375, 376, 376, 376, 377, + 379, 378, 380, 380, 381, 381, 381, 381, 381, 381, + 381, 381, 381, 381, 383, 382, 384, 384, 385, 385, + 385, 385, 385, 385, 385, 385, 385, 385, 385, 385, + 385, 385, 386, 387, 388, 389, 390, 391, 392, 392, + 394, 393, 395, 395, 396, 396, 397, 398, 399, 400, + 401, 403, 402, 404, 404, 405, 405, 405, 406, 407, + 409, 408, 410, 410, 411, 411, 411, 412, 413, 414, + 415, 415, 416, 416, 417, 419, 418, 420, 420, 421, + 421, 421, 422, 423, 424, 425, 425, 426, 426, 426, + 426, 426, 426, 426, 426, 426, 426, 426, 426, 426, + 426, 426, 426, 426, 426, 426, 426, 426, 426, 426, + 426, 426, 426, 426, 426, 426, 426, 426, 426, 426, + 426, 426, 426, 426, 426, 426, 426, 426, 426, 426, + 426, 426, 426, 426, 426, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, - 451, 452, 453, 453, 454, 454, 455, 456, 457, 458, + 451, 452, 452, 453, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, - 469, 470, 472, 471, 473, 473, 474, 474, 474, 474, - 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, - 474, 474, 474, 474, 474, 474, 474, 474, 476, 475, - 477, 477, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, - 478, 478, 478, 478, 479, 480, 481, 482, 483, 483, - 484, 484, 484, 484, 484, 484, 484, 484, 484, 484, - 484, 484, 484, 485, 486, 487, 488, 489, 490, 491, - 492, 493, 494, 495, 496, 497, 498, 498, 499, 499, - 499, 499, 499, 499, 499, 499, 500, 501, 502, 503, - 504, 505, 506 + 469, 471, 470, 472, 472, 473, 473, 473, 473, 473, + 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, + 473, 473, 473, 473, 473, 473, 473, 475, 474, 476, + 476, 477, 477, 477, 477, 477, 477, 477, 477, 477, + 477, 477, 477, 477, 477, 477, 477, 477, 477, 477, + 477, 477, 477, 478, 479, 480, 481, 482, 482, 483, + 483, 483, 483, 483, 483, 483, 483, 483, 483, 483, + 483, 483, 484, 485, 486, 487, 488, 489, 490, 491, + 492, 493, 494, 495, 496, 497, 497, 498, 498, 498, + 498, 498, 498, 498, 498, 499, 500, 501, 502, 503, + 504, 505 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1601,50 +1598,50 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 6, 2, 1, 1, 1, 1, 1, + 1, 0, 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 0, 5, - 3, 1, 1, 1, 0, 6, 0, 5, 3, 1, - 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, - 0, 5, 3, 1, 1, 3, 4, 4, 0, 6, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 4, 4, 4, 4, 0, 5, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, - 4, 4, 0, 6, 2, 1, 1, 1, 1, 2, - 4, 4, 4, 5, 2, 1, 1, 1, 4, 0, - 6, 2, 1, 1, 1, 1, 2, 4, 4, 0, - 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0, 6, 2, 1, 1, 1, 2, - 4, 0, 5, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 0, 6, 2, 1, 1, + 1, 2, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 0, 5, 3, + 1, 1, 1, 0, 6, 0, 5, 3, 1, 1, + 1, 1, 2, 1, 1, 1, 1, 1, 2, 0, + 5, 3, 1, 1, 3, 4, 4, 0, 6, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 4, 4, 4, 4, 0, 5, 3, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, + 4, 0, 6, 2, 1, 1, 1, 1, 2, 4, + 4, 4, 5, 2, 1, 1, 1, 4, 0, 6, + 2, 1, 1, 1, 1, 2, 4, 4, 0, 5, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 6, 2, 1, 1, 1, 2, 4, + 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 4, 4, 4, 4, 4, 4, 4, - 4, 0, 5, 3, 1, 1, 1, 4, 4, 4, - 4, 4, 0, 6, 2, 1, 1, 1, 1, 4, + 1, 2, 4, 4, 4, 4, 4, 4, 4, 4, + 0, 5, 3, 1, 1, 1, 4, 4, 4, 4, 4, 0, 6, 2, 1, 1, 1, 1, 4, 4, - 5, 2, 1, 1, 1, 4, 0, 6, 2, 1, - 1, 1, 1, 4, 4, 5, 2, 1, 1, 1, + 0, 6, 2, 1, 1, 1, 1, 4, 4, 5, + 2, 1, 1, 1, 4, 0, 6, 2, 1, 1, + 1, 1, 4, 4, 5, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, + 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 0, 5, 3, 1, 1, 1, 1, 1, + 4, 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 0, 5, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 4, 4, 4, 5, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 5, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, - 4, 4, 4 + 1, 1, 1, 4, 4, 4, 5, 2, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 5, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, + 4, 4 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -1652,130 +1649,130 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 0, 0, 0, 202, 365, 411, 0, - 426, 0, 268, 402, 244, 0, 0, 135, 302, 0, - 0, 319, 343, 0, 3, 23, 11, 4, 5, 6, + 2, 0, 1, 0, 0, 0, 201, 364, 410, 0, + 425, 0, 267, 401, 243, 0, 0, 135, 301, 0, + 0, 318, 342, 0, 3, 23, 11, 4, 5, 6, 8, 9, 10, 13, 14, 15, 16, 17, 18, 19, 20, 22, 21, 7, 12, 24, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 98, 99, 101, 100, 602, 0, 0, 0, + 0, 0, 98, 99, 101, 100, 601, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 589, 601, 591, 592, 593, 594, 590, 595, 596, 597, - 598, 599, 600, 0, 0, 0, 424, 0, 0, 422, - 423, 0, 486, 0, 0, 0, 0, 0, 0, 0, + 588, 600, 590, 591, 592, 593, 589, 594, 595, 596, + 597, 598, 599, 0, 0, 0, 423, 0, 0, 421, + 422, 0, 485, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 558, 0, 532, 0, 0, 0, 0, 0, 0, + 0, 557, 0, 531, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 437, 484, 478, 479, 480, 481, 482, 477, - 448, 438, 439, 472, 440, 441, 442, 443, 444, 445, - 446, 447, 474, 449, 450, 483, 452, 457, 453, 455, - 454, 467, 468, 456, 458, 459, 460, 461, 451, 463, - 464, 465, 485, 475, 476, 473, 466, 462, 470, 471, - 469, 0, 0, 0, 0, 0, 0, 108, 109, 110, + 0, 0, 436, 483, 477, 478, 479, 480, 481, 476, + 447, 437, 438, 471, 439, 440, 441, 442, 443, 444, + 445, 446, 473, 448, 449, 482, 451, 456, 452, 454, + 453, 466, 467, 455, 457, 458, 459, 460, 450, 462, + 463, 464, 484, 474, 475, 472, 465, 461, 469, 470, + 468, 0, 0, 0, 0, 0, 0, 108, 109, 110, 0, 0, 0, 0, 0, 44, 45, 46, 0, 0, - 625, 0, 0, 0, 0, 0, 0, 0, 0, 617, - 618, 619, 620, 623, 621, 622, 624, 0, 0, 0, + 624, 0, 0, 0, 0, 0, 0, 0, 0, 616, + 617, 618, 619, 622, 620, 621, 623, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 67, 68, 66, 63, 62, 69, 53, 65, 56, 57, 58, 54, 64, - 59, 60, 61, 55, 0, 0, 317, 0, 0, 315, - 316, 102, 0, 0, 0, 0, 97, 0, 0, 0, + 59, 60, 61, 55, 0, 0, 316, 0, 0, 314, + 315, 102, 0, 0, 0, 0, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 588, 0, 0, 0, 0, 238, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 205, - 206, 209, 211, 212, 213, 214, 215, 216, 217, 218, - 207, 208, 210, 219, 220, 221, 0, 0, 0, 0, - 0, 391, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 368, 369, 370, 371, 372, 373, 375, 374, 377, - 381, 378, 379, 380, 376, 417, 0, 0, 0, 414, - 415, 416, 0, 0, 421, 432, 0, 0, 0, 429, - 430, 431, 0, 0, 0, 0, 0, 0, 0, 0, + 587, 0, 0, 0, 0, 237, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, + 205, 208, 210, 211, 212, 213, 214, 215, 216, 217, + 206, 207, 209, 218, 219, 220, 0, 0, 0, 0, + 0, 390, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 367, 368, 369, 370, 371, 372, 374, 373, 376, + 380, 377, 378, 379, 375, 416, 0, 0, 0, 413, + 414, 415, 0, 0, 420, 431, 0, 0, 0, 428, + 429, 430, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 436, 0, 0, 0, 285, 0, 0, 0, 0, - 0, 0, 271, 272, 273, 274, 279, 275, 276, 277, - 278, 408, 0, 0, 0, 405, 406, 407, 0, 246, - 0, 0, 0, 256, 0, 254, 255, 257, 258, 111, + 0, 435, 0, 0, 0, 284, 0, 0, 0, 0, + 0, 0, 270, 271, 272, 273, 278, 274, 275, 276, + 277, 407, 0, 0, 0, 404, 405, 406, 0, 245, + 0, 0, 0, 255, 0, 253, 254, 256, 257, 111, 0, 0, 107, 0, 47, 0, 0, 0, 43, 0, 0, 0, 180, 0, 0, 0, 154, 0, 0, 138, 139, 140, 141, 144, 145, 143, 142, 146, 0, 0, - 0, 0, 0, 305, 306, 307, 308, 0, 0, 0, - 0, 0, 0, 0, 0, 616, 70, 0, 0, 0, + 0, 0, 0, 304, 305, 306, 307, 0, 0, 0, + 0, 0, 0, 0, 0, 615, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 51, 0, 0, 329, 0, - 0, 322, 323, 324, 325, 0, 0, 351, 0, 346, - 347, 348, 0, 0, 314, 0, 0, 0, 96, 0, + 0, 0, 0, 0, 0, 51, 0, 0, 328, 0, + 0, 321, 322, 323, 324, 0, 0, 350, 0, 345, + 346, 347, 0, 0, 313, 0, 0, 0, 96, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 587, 222, 0, 0, 0, 0, 0, 0, + 0, 0, 586, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 204, 382, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 367, 0, 0, - 0, 413, 0, 420, 0, 0, 0, 428, 0, 0, + 0, 203, 381, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 366, 0, 0, + 0, 412, 0, 419, 0, 0, 0, 427, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 435, 280, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 270, - 0, 0, 0, 404, 259, 0, 0, 0, 0, 0, - 253, 0, 106, 0, 0, 0, 42, 147, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 137, 309, 0, - 0, 0, 0, 304, 0, 0, 0, 0, 0, 0, - 0, 615, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 434, 279, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 269, + 0, 0, 0, 403, 258, 0, 0, 0, 0, 0, + 252, 0, 106, 0, 0, 0, 42, 147, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 137, 308, 0, + 0, 0, 0, 303, 0, 0, 0, 0, 0, 0, + 0, 614, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, 76, 0, 74, 79, 80, 0, 78, - 0, 0, 0, 0, 0, 50, 326, 0, 0, 0, - 0, 321, 349, 0, 0, 0, 345, 0, 313, 105, - 104, 103, 610, 609, 603, 26, 26, 26, 26, 26, - 26, 26, 28, 27, 604, 605, 608, 607, 606, 611, - 612, 613, 614, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 325, 0, 0, 0, + 0, 320, 348, 0, 0, 0, 344, 0, 312, 105, + 104, 103, 609, 608, 602, 26, 26, 26, 26, 26, + 26, 26, 28, 27, 603, 604, 607, 606, 605, 610, + 611, 612, 613, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, - 203, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 366, 0, 0, 412, 425, - 0, 0, 427, 499, 503, 517, 586, 530, 497, 524, - 527, 498, 489, 488, 490, 491, 492, 506, 495, 496, - 507, 494, 502, 501, 500, 525, 487, 584, 585, 521, - 518, 569, 562, 579, 580, 563, 564, 565, 566, 574, - 583, 567, 577, 581, 570, 582, 575, 571, 576, 568, - 573, 572, 578, 0, 561, 523, 542, 536, 553, 554, - 537, 538, 539, 540, 548, 557, 541, 551, 555, 544, - 556, 549, 545, 550, 543, 547, 546, 552, 0, 535, - 516, 519, 529, 493, 520, 509, 514, 515, 512, 513, - 510, 511, 505, 504, 528, 531, 522, 526, 508, 0, - 0, 0, 0, 0, 0, 0, 0, 269, 0, 0, - 403, 0, 0, 0, 264, 260, 263, 245, 112, 0, + 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 365, 0, 0, 411, 424, + 0, 0, 426, 498, 502, 516, 585, 529, 496, 523, + 526, 497, 488, 487, 489, 490, 491, 505, 494, 495, + 506, 493, 501, 500, 499, 524, 486, 583, 584, 520, + 517, 568, 561, 578, 579, 562, 563, 564, 565, 573, + 582, 566, 576, 580, 569, 581, 574, 570, 575, 567, + 572, 571, 577, 0, 560, 522, 541, 535, 552, 553, + 536, 537, 538, 539, 547, 556, 540, 550, 554, 543, + 555, 548, 544, 549, 542, 546, 545, 551, 0, 534, + 515, 518, 528, 492, 519, 508, 513, 514, 511, 512, + 509, 510, 504, 503, 527, 530, 521, 525, 507, 0, + 0, 0, 0, 0, 0, 0, 0, 268, 0, 0, + 402, 0, 0, 0, 263, 259, 262, 244, 112, 0, 0, 124, 0, 0, 116, 117, 119, 118, 48, 49, 0, 0, 0, 0, 0, 0, 0, 0, 136, 0, - 0, 0, 303, 626, 631, 629, 632, 627, 628, 630, + 0, 0, 302, 625, 630, 628, 631, 626, 627, 629, 87, 95, 93, 94, 85, 89, 88, 82, 81, 83, 71, 0, 72, 0, 86, 84, 92, 90, 91, 0, - 0, 0, 320, 0, 0, 344, 318, 29, 30, 31, - 32, 33, 34, 35, 233, 234, 226, 242, 243, 0, - 241, 228, 230, 229, 227, 236, 237, 223, 235, 225, - 224, 36, 36, 36, 38, 37, 231, 232, 387, 389, - 390, 400, 397, 395, 396, 0, 394, 384, 398, 399, - 383, 388, 386, 401, 385, 418, 419, 433, 434, 559, - 0, 533, 0, 283, 284, 293, 290, 295, 292, 291, - 298, 294, 296, 289, 297, 0, 288, 282, 301, 300, - 299, 281, 410, 409, 251, 252, 250, 0, 249, 267, - 266, 0, 0, 0, 120, 0, 0, 0, 0, 115, - 153, 151, 195, 192, 191, 184, 186, 201, 198, 194, - 185, 199, 188, 196, 200, 189, 197, 193, 187, 190, - 0, 183, 148, 150, 152, 164, 158, 175, 176, 159, - 160, 161, 162, 170, 179, 163, 173, 177, 166, 178, - 171, 167, 172, 165, 169, 168, 174, 0, 157, 149, - 312, 310, 311, 73, 77, 327, 333, 339, 342, 335, - 341, 336, 340, 338, 334, 337, 0, 332, 328, 350, - 355, 361, 364, 357, 363, 358, 362, 360, 356, 359, - 0, 354, 239, 0, 39, 40, 41, 392, 0, 560, - 534, 286, 0, 247, 0, 265, 262, 261, 0, 0, - 0, 0, 114, 181, 0, 155, 0, 330, 0, 352, - 0, 240, 393, 287, 248, 121, 130, 133, 132, 129, - 134, 131, 128, 0, 127, 123, 122, 182, 156, 331, - 353, 125, 0, 126 + 0, 0, 319, 0, 0, 343, 317, 29, 30, 31, + 32, 33, 34, 35, 232, 233, 225, 241, 242, 0, + 240, 227, 229, 228, 226, 235, 236, 222, 234, 224, + 223, 36, 36, 36, 38, 37, 230, 231, 386, 388, + 389, 399, 396, 394, 395, 0, 393, 383, 397, 398, + 382, 387, 385, 400, 384, 417, 418, 432, 433, 558, + 0, 532, 0, 282, 283, 292, 289, 294, 291, 290, + 297, 293, 295, 288, 296, 0, 287, 281, 300, 299, + 298, 280, 409, 408, 250, 251, 249, 0, 248, 266, + 265, 0, 0, 0, 120, 0, 0, 0, 0, 115, + 153, 151, 195, 192, 191, 184, 186, 200, 194, 185, + 198, 188, 196, 199, 189, 197, 193, 187, 190, 0, + 183, 148, 150, 152, 164, 158, 175, 176, 159, 160, + 161, 162, 170, 179, 163, 173, 177, 166, 178, 171, + 167, 172, 165, 169, 168, 174, 0, 157, 149, 311, + 309, 310, 73, 77, 326, 332, 338, 341, 334, 340, + 335, 339, 337, 333, 336, 0, 331, 327, 349, 354, + 360, 363, 356, 362, 357, 361, 359, 355, 358, 0, + 353, 238, 0, 39, 40, 41, 391, 0, 559, 533, + 285, 0, 246, 0, 264, 261, 260, 0, 0, 0, + 0, 114, 181, 0, 155, 0, 329, 0, 351, 0, + 239, 392, 286, 247, 121, 130, 133, 132, 129, 134, + 131, 128, 0, 127, 123, 122, 182, 156, 330, 352, + 125, 0, 126 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -1786,17 +1783,17 @@ static const yytype_int16 yydefgoto[] = 749, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 27, 71, 72, 73, 74, 75, 28, 216, 217, 218, 219, 220, 953, 954, - 955, 956, 957, 1096, 1223, 1224, 29, 60, 498, 499, - 500, 501, 502, 503, 504, 505, 506, 714, 1147, 1148, - 507, 710, 1120, 1121, 30, 49, 328, 329, 330, 331, + 955, 956, 957, 1096, 1222, 1223, 29, 60, 498, 499, + 500, 501, 502, 503, 504, 505, 506, 714, 1146, 1147, + 507, 710, 1119, 1120, 30, 49, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 587, 1019, 1020, 31, 57, 473, 695, 1087, 1088, 474, 475, 476, 1093, 945, 946, 477, 478, 32, 55, 451, 452, 453, 454, 455, 456, 457, 682, 1075, 1076, 458, 459, 460, 33, 61, 512, 513, 514, 515, 516, 34, 288, 289, 290, 35, 64, 550, - 551, 552, 553, 554, 758, 1166, 1167, 36, 65, 558, - 559, 560, 561, 764, 1180, 1181, 37, 50, 360, 361, + 551, 552, 553, 554, 758, 1165, 1166, 36, 65, 558, + 559, 560, 561, 764, 1179, 1180, 37, 50, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 607, 1045, 1046, 370, 371, 372, 373, 374, 38, 56, 464, 465, 466, 467, 39, 51, 378, 379, 380, 381, 40, 108, @@ -1813,166 +1810,166 @@ static const yytype_int16 yydefgoto[] = /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -720 +#define YYPACT_NINF -736 static const yytype_int16 yypact[] = { - -720, 586, -720, -178, -196, -190, -720, -720, -720, -188, - -720, -172, -720, -720, -720, -161, -159, -720, -720, -150, - -142, -720, -720, -133, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, 17, 844, -126, - -114, -110, 10, -108, 364, -96, -71, -67, 50, 12, - -59, -52, 768, 410, -50, -45, 13, -37, -35, -30, - -26, 6, -720, -720, -720, -720, -720, -22, -12, -10, - -1, 7, 20, 27, 38, 56, 79, 85, 90, 281, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, 596, 497, 210, -720, 108, 19, -720, - -720, 88, -720, 112, 113, 114, 116, 118, 119, 127, - 128, 129, 134, 138, 141, 142, 143, 147, 148, 149, - 152, 153, 154, 155, 160, 162, 163, 164, 172, 176, - 177, -720, 178, -720, 182, 188, 190, 191, 192, 193, - 194, 196, 197, 201, 202, 205, 206, 207, 211, 212, - 214, 117, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, 315, 98, 545, -34, 217, 41, -720, -720, -720, - 121, 133, 219, 221, 74, -720, -720, -720, 273, 288, - -720, 223, 225, 240, 241, 244, 251, 253, 16, -720, - -720, -720, -720, -720, -720, -720, -720, 213, 254, 257, - 258, 264, 265, 266, 268, 269, 270, 280, 282, 286, - 293, 294, 296, 297, 307, 84, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, 55, 5, -720, 309, 8, -720, - -720, -720, 341, 378, 387, 313, -720, 259, 433, 375, - 436, 436, 444, 445, 447, 391, 393, 454, 436, 338, - -720, 340, 339, 342, 343, -720, 344, 346, 347, 352, - 354, 355, 357, 359, 363, 366, 367, 369, 239, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, 373, 374, 381, 385, - 388, -720, 389, 392, 396, 397, 404, 405, 406, 408, - 75, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, 411, 412, 25, -720, - -720, -720, 440, 376, -720, -720, 416, 417, 26, -720, - -720, -720, 401, 436, 436, 484, 452, 471, 513, 521, - 482, 436, 483, 436, 543, 546, 547, 486, 489, 490, - 436, 550, 551, 436, 554, 555, 556, 558, 500, 501, - 441, 505, 443, 436, 436, 507, 509, 514, 515, -44, - 44, 518, 519, 436, 436, 561, 436, 524, 526, 527, - 455, -720, 463, 468, 470, -720, 472, 473, 474, 476, - 479, 30, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, 487, 491, 83, -720, -720, -720, 485, -720, - 494, 495, 496, -720, 139, -720, -720, -720, -720, -720, - 532, 492, -720, 498, -720, 585, 602, 506, -720, 508, - 502, 512, -720, 516, 517, 520, -720, 530, 23, -720, - -720, -720, -720, -720, -720, -720, -720, -720, 510, 536, - 538, 542, 15, -720, -720, -720, -720, 562, 567, 610, - 570, 574, 580, 436, 549, -720, -720, 623, 588, 604, - 669, 652, 654, 656, 657, 658, 660, 130, 156, 661, - 662, 673, 664, 665, 575, -720, 581, 584, -720, 591, - 34, -720, -720, -720, -720, 589, 592, -720, 37, -720, - -720, -720, 679, 608, -720, 617, 627, 630, -720, 631, - 633, 634, 742, 635, 636, 637, 639, 640, 641, 645, - 646, 647, -720, -720, 708, 736, 436, 649, 765, 767, - 770, 771, 436, 436, 754, 773, 774, 436, 776, 776, - 667, -720, -720, 769, 137, 777, 726, 666, 778, 779, - 780, 781, 788, 782, 783, 785, 672, -720, 786, 787, - 674, -720, 677, -720, 791, 792, 694, -720, 696, 700, - 701, 702, 703, 704, 705, 706, 707, 709, 710, 711, - 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, - 722, 725, 727, 728, 729, 730, 577, 731, 619, 732, - 733, 734, 735, 738, 739, 740, 741, 743, 744, 745, - 746, 747, 748, 749, 750, 751, 752, 753, -720, -720, - 794, 766, 723, 841, 871, 854, 855, 856, 758, -720, - 858, 859, 761, -720, -720, 759, 862, 863, 882, 772, - -720, 775, -720, 31, 784, 789, -720, -720, 865, 825, - 790, 867, 868, 869, 793, 870, 795, -720, -720, 872, - 873, 875, 797, -720, 798, 799, 800, 801, 802, 803, - 804, -720, 805, 806, 807, 808, 809, 810, 811, 812, - 813, 814, -720, -720, -214, -720, -720, -720, -207, -720, - 815, 816, 817, 818, 819, -720, -720, 876, 820, 877, - 821, -720, -720, 878, 822, 824, -720, 826, -720, -720, - -720, -720, -720, -720, -720, 436, 436, 436, 436, 436, - 436, 436, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, 827, 828, 829, 232, 830, 831, 832, - 833, 834, 835, 836, 837, 838, 839, 276, 840, 842, - -720, 843, 845, 846, 847, 848, -3, 849, 850, 851, - 852, 853, 857, 860, 861, -720, 864, 866, -720, -720, - 874, 879, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -201, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -193, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, 880, - 881, 504, 883, 884, 885, 886, 887, -720, 888, 889, - -720, -28, 890, 891, 895, 892, -720, -720, -720, 893, - 894, -720, 896, 21, -720, -720, -720, -720, -720, -720, - 898, 900, 511, 901, 902, 903, 655, 904, -720, 905, - 906, 907, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, 130, -720, 156, -720, -720, -720, -720, -720, 908, - 285, 909, -720, 910, 695, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -183, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, 776, 776, 776, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -176, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - 577, -720, 619, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -168, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -165, -720, -720, - -720, 897, 882, 911, -720, 919, 912, -101, 913, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -162, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -149, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -143, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -132, -720, -720, 232, -720, -720, -720, -720, -3, -720, - -720, -720, 504, -720, -28, -720, -720, -720, 914, 335, - 916, 917, -720, -720, 511, -720, 655, -720, 285, -720, - 695, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -129, -720, -720, -720, -720, -720, -720, - -720, -720, 335, -720 + -736, 555, -736, -199, -215, -209, -736, -736, -736, -172, + -736, -170, -736, -736, -736, -157, -146, -736, -736, -135, + -133, -736, -736, -122, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, 310, 847, -104, + -93, -82, 24, -33, 352, -30, -27, -22, 49, 14, + -20, -16, 825, 390, -8, -6, 10, -158, -39, -5, + -3, 18, -736, -736, -736, -736, -736, 7, 37, 61, + 68, 83, 84, 86, 90, 91, 92, 99, 109, 8, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, 651, 433, 11, -736, 113, 38, -736, + -736, 53, -736, 126, 127, 130, 131, 132, 133, 145, + 146, 150, 152, 153, 155, 159, 160, 162, 164, 165, + 166, 168, 171, 175, 176, 177, 181, 185, 191, 193, + 194, -736, 196, -736, 197, 198, 199, 200, 203, 218, + 219, 221, 223, 225, 227, 229, 230, 232, 233, 234, + 242, 117, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, 335, 4, 304, 50, 246, 31, -736, -736, -736, + 208, 52, 250, 253, 26, -736, -736, -736, 503, 141, + -736, 261, 263, 269, 271, 272, 273, 274, 27, -736, + -736, -736, -736, -736, -736, -736, -736, 144, 276, 277, + 281, 282, 284, 291, 301, 302, 303, 306, 307, 308, + 309, 312, 314, 317, 318, 188, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, 6, 15, -736, 321, 44, -736, + -736, -736, 324, 406, 424, 210, -736, 443, 444, 72, + 445, 445, 447, 448, 452, 395, 403, 462, 445, 347, + -736, 353, 359, 360, 361, -736, 362, 364, 366, 368, + 374, 376, 377, 378, 384, 386, 387, 388, 222, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, 355, 389, 391, 392, + 393, -736, 397, 398, 399, 400, 401, 404, 405, 407, + 35, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, 408, 410, 45, -736, + -736, -736, 455, 370, -736, -736, 412, 413, 69, -736, + -736, -736, 451, 445, 445, 514, 467, 475, 534, 519, + 480, 445, 481, 445, 542, 546, 548, 492, 495, 496, + 445, 556, 559, 445, 560, 564, 572, 573, 497, 516, + 458, 521, 464, 445, 445, 527, 528, 530, 533, -47, + 47, 535, 536, 445, 445, 575, 445, 539, 543, 547, + 484, -736, 488, 487, 489, -736, 490, 498, 499, 500, + 501, 207, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, 502, 508, 30, -736, -736, -736, 491, -736, + 509, 512, 513, -736, 12, -736, -736, -736, -736, -736, + 557, 506, -736, 515, -736, 599, 617, 523, -736, 524, + 522, 525, -736, 526, 529, 531, -736, 532, 163, -736, + -736, -736, -736, -736, -736, -736, -736, -736, 540, 544, + 552, 553, 25, -736, -736, -736, -736, 577, 585, 629, + 589, 591, 596, 445, 558, -736, -736, 638, 620, 680, + 682, 668, 669, 671, 672, 673, 674, 36, 120, 685, + 690, 699, 691, 693, 598, -736, 600, 603, -736, 605, + 32, -736, -736, -736, -736, 602, 606, -736, 59, -736, + -736, -736, 709, 611, -736, 612, 622, 628, -736, 634, + 636, 642, 204, 644, 645, 646, 650, 652, 654, 660, + 661, 662, -736, -736, 746, 754, 445, 648, 779, 780, + 781, 782, 445, 445, 766, 784, 785, 445, 786, 786, + 675, -736, -736, 770, 107, 771, 731, 676, 775, 776, + 777, 783, 796, 787, 788, 789, 681, -736, 790, 791, + 683, -736, 686, -736, 794, 795, 687, -736, 697, 698, + 700, 704, 705, 706, 707, 708, 710, 711, 712, 713, + 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, + 724, 725, 726, 729, 730, 732, 594, 733, 630, 734, + 735, 736, 737, 738, 741, 742, 743, 744, 745, 747, + 748, 749, 750, 751, 752, 753, 755, 756, -736, -736, + 798, 740, 728, 808, 801, 845, 853, 856, 758, -736, + 858, 859, 761, -736, -736, 759, 862, 863, 881, 767, + -736, 768, -736, 3, 769, 772, -736, -736, 865, 828, + 773, 870, 872, 873, 774, 874, 778, -736, -736, 878, + 879, 880, 792, -736, 793, 797, 799, 800, 802, 803, + 804, -736, 805, 806, 807, 809, 810, 811, 812, 813, + 814, 815, -736, -736, -204, -736, -736, -736, -201, -736, + 816, 817, 818, 819, 820, -736, -736, 882, 821, 883, + 822, -736, -736, 884, 823, 827, -736, 829, -736, -736, + -736, -736, -736, -736, -736, 445, 445, 445, 445, 445, + 445, 445, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, 830, 831, 832, 211, 833, 834, 835, + 836, 837, 838, 839, 840, 841, 842, 46, 843, 844, + -736, 846, 848, 849, 850, 851, -2, 852, 854, 855, + 857, 860, 861, 864, 866, -736, 867, 868, -736, -736, + 869, 871, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -184, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -178, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, 875, + 876, 538, 877, 885, 886, 887, 888, -736, 889, 890, + -736, -17, 891, 892, 899, 824, -736, -736, -736, 893, + 894, -736, 895, 43, -736, -736, -736, -736, -736, -736, + 896, 900, 469, 901, 902, 903, 666, 904, -736, 905, + 906, 907, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, 36, -736, 120, -736, -736, -736, -736, -736, 908, + 472, 909, -736, 910, 517, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -163, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, 786, 786, 786, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -160, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + 594, -736, 630, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -153, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -134, -736, -736, + -736, 898, 881, 911, -736, 897, 912, -87, 913, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -132, + -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, -71, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -55, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -38, + -736, -736, 211, -736, -736, -736, -736, -2, -736, -736, + -736, 538, -736, -17, -736, -736, -736, 914, 367, 916, + 917, -736, -736, 469, -736, 666, -736, 472, -736, 517, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -37, -736, -736, -736, -736, -736, -736, -736, + -736, 367, -736 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -720, -720, -720, -320, -298, -719, -598, -720, -720, 918, - -720, -720, -720, -720, 899, -720, -720, -720, 14, -720, - 11, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, 932, -720, - -720, -720, -720, -720, 796, -720, -720, -720, -720, 54, - -720, -720, -720, -720, -720, -224, -720, -720, -720, 568, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -197, - -720, -720, -720, -194, -720, -720, -720, 685, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -169, -720, -720, -720, - -720, -720, -118, -720, 603, -720, -720, -720, -76, -720, - -720, -720, -720, -720, 593, -720, -720, -720, -720, -720, - -720, -720, -112, -720, -720, -720, -720, -720, -720, 566, - -720, -720, -720, -720, -720, 915, -720, -720, -720, -720, - 531, -720, -720, -720, -720, -720, -124, -720, -720, -720, - 529, -720, -720, -720, -720, -125, -720, -720, -720, 737, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -99, -720, -720, -720, -720, -720, -720, -720, -720, 626, - -720, -720, -720, -720, -720, 756, -720, -720, -720, -720, - 983, -720, -720, -720, -720, 755, -720, -720, -720, -720, - 931, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, -720, -720, -720, -720, -720, 32, -720, -720, - -720, 33, -720, -720, -720, -720, -720, 1006, -720, -720, - -720, -720, -720, -720, -720, -720, -720, -720, -720, -720, - -720, -720, 920, -720, -720, -720, -720, -720, -720, -720 + -736, -736, -736, -297, -298, -735, -598, -736, -736, 915, + -736, -736, -736, -736, 757, -736, -736, -736, 16, -736, + 17, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, 937, -736, + -736, -736, -736, -736, 826, -736, -736, -736, -736, 56, + -736, -736, -736, -736, -736, -220, -736, -736, -736, 518, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -193, + -736, -736, -736, -188, -736, -736, -736, 689, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, -736, -736, -736, -736, -138, -736, -736, -736, + -736, -736, -164, -736, 609, -736, -736, -736, -46, -736, + -736, -736, -736, -736, 623, -736, -736, -736, -736, -736, + -736, -736, -123, -736, -736, -736, -736, -736, -736, 565, + -736, -736, -736, -736, -736, 918, -736, -736, -736, -736, + 541, -736, -736, -736, -736, -736, -128, -736, -736, -736, + 537, -736, -736, -736, -736, -129, -736, -736, -736, 739, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -103, -736, -736, -736, -736, -736, -736, -736, -736, 637, + -736, -736, -736, -736, -736, 727, -736, -736, -736, -736, + 978, -736, -736, -736, -736, 760, -736, -736, -736, -736, + 932, -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, 40, -736, -736, + -736, 34, -736, -736, -736, -736, -736, 1011, -736, -736, + -736, -736, -736, -736, -736, -736, -736, -736, -736, -736, + -736, -736, 919, -736, -736, -736, -736, -736, -736, -736 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1981,388 +1978,388 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -114 static const yytype_int16 yytable[] = { - 808, 809, 573, 574, 807, 1043, 555, 67, 990, 286, - 581, 106, 991, 221, 286, 992, 508, 230, 67, 993, - 106, 1059, 949, 1084, 489, 1060, 375, 385, 47, 1061, - 68, 442, 949, 1062, 48, 546, 52, 69, 555, 1182, - 490, 68, 214, 1183, 45, 46, 1187, 443, 69, 509, - 1188, 214, 54, 231, 1191, 491, 546, 1193, 1192, 492, - 1203, 1194, 444, 58, 1204, 59, 445, 232, 233, 234, - 235, 236, 107, 1205, 62, 221, 346, 1206, 347, 1207, - 348, 107, 63, 1208, 461, 247, 237, 376, 510, 385, - 1209, 66, 349, 1231, 1210, 629, 630, 1232, 103, 461, - 1200, 556, 70, 637, 287, 639, 222, 350, 248, 287, - 104, 351, 646, 70, 105, 649, 111, 950, 112, 493, - 665, 666, 386, 113, 114, 659, 660, 950, 211, 115, - 547, 223, 352, 556, 353, 671, 672, 116, 674, 511, - 468, 494, 249, 117, 354, 118, 119, 120, 446, 377, - 387, 547, 121, 212, 495, 447, 448, 213, 122, 123, - 557, 124, 125, 126, 1085, 228, 250, 127, 222, 1086, - 251, 355, 229, 128, 284, 469, 951, 129, 130, 285, - 252, 131, 253, 254, 386, 291, 951, 449, 479, 548, - 292, 132, 557, 223, 1044, 293, 470, 356, 133, 294, - 134, 471, 135, 297, 136, 137, 138, 462, 667, 668, - 548, 375, 387, 298, 255, 299, 256, 257, 258, 259, - 139, 496, 462, 357, 300, 730, 140, 141, 142, 295, - 143, 563, 301, 144, 145, 260, 497, 146, 722, 524, - 311, 952, 383, 450, 1098, 302, 716, 549, 620, 626, - 358, 952, 303, 688, 312, 313, 215, 760, 314, 261, - 765, 472, -113, 304, 481, 215, 742, 743, 549, 147, - 262, -113, 376, 148, 489, 315, 149, 150, 151, 152, - 153, 305, 76, 154, 155, 1031, 1032, 1033, 795, 508, - 490, 359, 746, 747, 801, 802, 463, 487, 616, 806, - 263, 264, 77, 78, 306, 491, 692, 544, 79, 492, - 307, 463, 1184, 1185, 1186, 308, 442, 316, 317, 318, - 812, 813, 509, 319, 1017, 1018, 156, 157, 158, 320, - 321, 159, 443, 382, 377, 322, 160, 392, 393, 394, - 440, 395, 483, 396, 397, 323, 324, 444, 80, 81, - 1156, 445, 398, 399, 400, 484, 82, 83, 84, 401, - 325, 510, 699, 402, 569, 112, 403, 404, 405, 493, - 113, 114, 406, 407, 408, 1216, 115, 409, 410, 411, - 412, 807, 85, 86, 116, 413, 326, 414, 415, 416, - 117, 494, 118, 119, 120, 87, 88, 417, 1217, 121, - 1218, 418, 419, 421, 495, 122, 123, 423, 124, 125, - 126, 247, 511, 424, 127, 425, 426, 427, 428, 429, - 128, 430, 431, 1157, 129, 130, 432, 433, 131, 327, - 434, 435, 436, 446, 248, 526, 437, 438, 132, 439, - 447, 448, 480, 1219, 485, 133, 486, 134, 517, 135, - 518, 136, 137, 138, 1158, 1007, 1008, 1009, 1010, 1011, - 1012, 1013, 600, 1159, 565, 519, 520, 139, 249, 521, - 1160, 496, 449, 140, 141, 142, 522, 143, 523, 527, - 144, 145, 528, 529, 146, 1161, 497, 1162, 1163, 530, - 531, 532, 250, 533, 534, 535, 251, 1164, 346, 1201, - 347, 566, 348, 1165, 309, 536, 252, 537, 253, 254, - 567, 538, 1220, 1221, 349, 1102, 147, 1065, 539, 540, - 148, 541, 542, 149, 150, 151, 152, 153, 450, 350, - 154, 155, 543, 351, 562, 568, 1103, 1066, 570, 571, - 255, 572, 256, 257, 258, 259, 468, 1067, 1222, 575, - 576, 1104, 577, 1068, 352, 578, 353, 579, 1105, 580, - 582, 260, 583, 622, 584, 628, 354, 585, 586, 588, - 1069, 589, 590, 156, 157, 158, 1106, 591, 159, 592, - 593, 469, 594, 160, 595, 261, 2, 3, 596, 631, - 4, 597, 598, 355, 599, 602, 262, 311, 623, 603, - 5, 1070, 470, 6, 7, 1107, 604, 471, 1071, 8, - 605, 312, 313, 606, 608, 314, 632, 609, 634, 356, - 9, 610, 611, 1108, 10, 11, 263, 264, 861, 612, - 613, 614, 315, 615, 12, 633, 618, 619, 1109, 1110, - 1111, 624, 625, 1072, 635, 357, 636, 638, 640, 13, - 643, 641, 642, 644, 645, 647, 648, 14, 15, 650, - 651, 652, 1073, 653, 654, 655, 656, 472, 658, 657, - 886, 661, 358, 662, 316, 317, 318, 678, 663, 664, - 319, 16, 669, 670, 673, 679, 320, 321, 675, 1112, - 676, 677, 322, 680, 17, 681, 701, 683, 684, 685, - 1113, 686, 323, 324, 687, 1114, 1125, 694, 704, 734, - 1074, 1115, 690, 359, 702, 1116, 691, 325, 1117, 696, - 697, 698, 703, 1118, 18, 705, 724, 708, 706, 1119, - 707, 725, 718, 726, 727, 19, 20, 709, 728, 21, - 22, 711, 712, 326, 729, 713, 732, 862, 863, 864, - 865, 866, 733, 867, 868, 715, 869, 870, 871, 872, - 1170, 719, 873, 720, 874, 875, 876, 721, 877, 230, - 878, 731, 879, 880, 735, 736, 881, 737, 752, 738, - 739, 740, 882, 741, 750, 751, 327, 753, 754, 887, - 888, 889, 890, 891, 23, 892, 893, 755, 894, 895, - 896, 897, 767, 756, 898, 231, 899, 900, 901, 757, - 902, 762, 903, 793, 904, 905, 759, 763, 906, 232, - 233, 234, 235, 236, 907, 1126, 1127, 1128, 1129, 1130, - 768, 1131, 1132, 1171, 1133, 1134, 1135, 1136, 237, 769, - 1137, 794, 1138, 1139, 1140, 76, 1141, 572, 1142, 770, - 1143, 1144, 771, 772, 1145, 773, 774, 784, 785, 786, - 1146, 787, 788, 789, 1172, 77, 78, 790, 791, 792, - 797, 79, 798, 1173, 796, 799, 800, 803, 804, 805, - 1174, 807, 775, 776, 777, 778, 779, 780, 781, 810, - 815, 816, 811, 821, 825, 1175, 828, 1176, 1177, 829, - 814, 817, 818, 819, 820, 822, 823, 1178, 824, 826, - 827, 80, 81, 1179, 830, 831, 832, 929, 833, 82, - 83, 84, 834, 835, 836, 837, 838, 839, 840, 841, - 930, 842, 843, 844, 845, 846, 847, 848, 849, 850, - 851, 852, 853, 854, 855, 85, 86, 856, 931, 857, - 858, 859, 860, 885, 910, 911, 912, 913, 87, 88, - 914, 915, 916, 917, 932, 918, 919, 920, 921, 922, - 923, 924, 925, 926, 927, 928, 933, 934, 935, 936, - 937, 938, 939, 940, 941, 942, 943, 944, 960, 961, - 963, 964, 965, 967, 947, 969, 970, 948, 971, 999, - 1001, 1003, 1195, 296, 1154, 1153, 958, 1099, 1233, 1228, - 1227, 959, 482, 601, 1211, 962, 1196, 968, 966, 972, - 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, + 808, 809, 573, 574, 949, 461, 1043, 546, 47, 76, + 581, 286, 375, 468, 48, 221, 555, 990, 807, 67, + 992, 991, 45, 46, 993, 106, 508, 221, 230, 77, + 78, 461, 214, 546, 1084, 79, 346, 1059, 347, 106, + 348, 1060, 68, 1061, 949, 286, 375, 1062, 469, 69, + 214, 52, 349, 54, 385, 1031, 1032, 1033, 1181, 509, + 555, 1186, 1182, 291, 231, 1187, 58, 350, 1190, 470, + 385, 351, 1191, 376, 471, 80, 81, 59, 232, 233, + 234, 235, 236, 82, 83, 84, 107, 1192, 62, 1202, + 63, 1193, 352, 1203, 353, 629, 630, 237, 510, 950, + 107, 66, 547, 637, 354, 639, 287, 376, 222, 85, + 86, 556, 646, 1199, 70, 649, 665, 666, 112, 103, + 222, 87, 88, 113, 114, 659, 660, 462, 547, 115, + 104, 355, 223, 472, 377, 671, 672, 116, 674, 950, + 287, 105, 508, 117, 223, 118, 119, 120, 511, 386, + 1204, 807, 121, 462, 1205, 556, 356, 951, 122, 123, + 548, 124, 125, 126, 489, 386, 1206, 127, 377, 557, + 1207, 742, 743, 128, 1085, 509, 387, 129, 130, 1086, + 490, 131, 357, 1208, 1230, 292, 548, 1209, 1231, 247, + 111, 132, 387, 211, 1044, 491, 212, 951, 133, 492, + 134, 213, 135, 228, 136, 137, 138, 229, 442, 358, + 667, 668, 248, 557, 510, 284, 463, 285, 549, 293, + 139, 294, 952, 311, 443, 730, 140, 141, 142, 143, + 309, 297, 144, 145, 699, 571, 146, 312, 313, 444, + 295, 314, 463, 445, 549, 215, 249, 722, 487, 524, + 359, -113, 692, 481, 760, 746, 747, 616, 315, 493, + 383, 298, 952, 215, 511, 1098, 563, 620, 147, -113, + 250, 479, 148, 484, 251, 149, 150, 151, 152, 153, + 494, 765, 154, 155, 252, 299, 253, 254, 795, 812, + 813, 626, 300, 495, 801, 802, 1183, 1184, 1185, 806, + 316, 317, 318, 1017, 1018, 468, 319, 301, 302, 572, + 303, 67, 320, 321, 304, 305, 306, 255, 322, 256, + 257, 258, 259, 307, 446, 156, 157, 158, 323, 324, + 159, 447, 448, 308, 68, 160, 442, 382, 260, 440, + 469, 69, 325, 775, 776, 777, 778, 779, 780, 781, + 392, 393, 443, 112, 394, 395, 396, 397, 113, 114, + 496, 470, 261, 449, 115, 526, 471, 444, 326, 398, + 399, 445, 116, 262, 400, 497, 401, 402, 117, 403, + 118, 119, 120, 404, 405, 716, 406, 121, 407, 408, + 409, 247, 410, 122, 123, 411, 124, 125, 126, 412, + 413, 414, 127, 263, 264, 415, 70, 1215, 128, 416, + 544, 327, 129, 130, 248, 417, 131, 418, 419, 450, + 421, 423, 424, 425, 426, 472, 132, 427, 483, 688, + 1216, 568, 1217, 133, 346, 134, 347, 135, 348, 136, + 137, 138, 428, 429, 600, 430, 565, 431, 249, 432, + 349, 433, 446, 434, 435, 139, 436, 437, 438, 447, + 448, 140, 141, 142, 143, 350, 439, 144, 145, 351, + 480, 146, 250, 1102, 485, 1218, 251, 486, 1007, 1008, + 1009, 1010, 1011, 1012, 1013, 517, 252, 518, 253, 254, + 352, 449, 353, 519, 1103, 520, 521, 522, 523, 1200, + 527, 528, 354, 147, 489, 529, 530, 148, 531, 1104, + 149, 150, 151, 152, 153, 532, 1105, 154, 155, 255, + 490, 256, 257, 258, 259, 533, 534, 535, 566, 355, + 536, 537, 538, 539, 1106, 491, 540, 1155, 541, 492, + 260, 542, 543, 1219, 1220, 562, 567, 450, 569, 570, + 572, 1065, 575, 576, 356, 2, 3, 577, 578, 4, + 156, 157, 158, 1107, 261, 159, 579, 580, 582, 5, + 160, 1066, 6, 7, 583, 262, 602, 622, 8, 1221, + 357, 1067, 1169, 584, 585, 586, 588, 1068, 589, 9, + 590, 623, 591, 10, 11, 1108, 1109, 1110, 592, 493, + 593, 594, 595, 12, 1069, 263, 264, 358, 596, 1156, + 597, 598, 599, 603, 628, 604, 605, 606, 13, 631, + 494, 608, 609, 610, 611, 612, 14, 15, 613, 614, + 632, 615, 618, 495, 619, 1070, 624, 625, 633, 634, + 1157, 635, 1071, 636, 638, 861, 1111, 640, 359, 1158, + 16, 641, 311, 642, 1170, 643, 1159, 1112, 644, 645, + 654, 647, 1113, 17, 648, 650, 312, 313, 1114, 651, + 314, 1160, 1115, 1161, 1162, 1116, 1072, 652, 653, 655, + 1117, 886, 656, 1163, 657, 1171, 1118, 315, 658, 1164, + 661, 662, 18, 663, 1172, 1073, 664, 673, 669, 670, + 496, 1173, 675, 19, 20, 678, 676, 21, 22, 679, + 677, 680, 694, 681, 683, 497, 1174, 1124, 1175, 1176, + 701, 704, 684, 685, 686, 687, 690, 702, 1177, 316, + 317, 318, 691, 696, 1178, 319, 697, 698, 703, 705, + 724, 320, 321, 1074, 706, 707, 708, 322, 725, 709, + 711, 726, 727, 712, 728, 713, 715, 323, 324, 729, + 732, 718, 23, 862, 863, 864, 865, 866, 719, 867, + 868, 325, 869, 870, 871, 872, 720, 721, 873, 731, + 874, 875, 876, 733, 877, 734, 878, 735, 879, 880, + 736, 737, 881, 738, 739, 740, 741, 326, 882, 887, + 888, 889, 890, 891, 752, 892, 893, 750, 894, 895, + 896, 897, 751, 753, 898, 754, 899, 900, 901, 755, + 902, 756, 903, 762, 904, 905, 230, 757, 906, 759, + 763, 767, 768, 769, 907, 1125, 1126, 1127, 1128, 1129, + 327, 1130, 1131, 770, 1132, 1133, 1134, 1135, 76, 771, + 1136, 793, 1137, 1138, 1139, 772, 1140, 773, 1141, 794, + 1142, 1143, 231, 774, 1144, 784, 785, 786, 77, 78, + 1145, 787, 796, 788, 79, 789, 232, 233, 234, 235, + 236, 790, 791, 792, 797, 798, 799, 800, 803, 804, + 805, 807, 811, 814, 815, 237, 810, 817, 818, 819, + 816, 821, 825, 930, 828, 820, 933, 829, 832, 822, + 823, 824, 826, 827, 80, 81, 830, 831, 833, 834, + 929, 835, 82, 83, 84, 836, 837, 838, 839, 840, + 932, 841, 842, 843, 844, 845, 846, 847, 848, 849, + 850, 851, 852, 853, 854, 855, 856, 857, 85, 86, + 858, 859, 931, 860, 885, 910, 911, 912, 913, 914, + 87, 88, 915, 916, 917, 918, 919, 934, 920, 921, + 922, 923, 924, 925, 926, 935, 927, 928, 936, 937, + 938, 939, 940, 941, 942, 943, 944, 960, 947, 948, + 958, 961, 963, 959, 964, 965, 967, 962, 966, 968, + 969, 970, 971, 1194, 999, 1001, 1003, 1152, 296, 1099, + 1153, 1232, 1227, 972, 973, 1226, 717, 601, 974, 1197, + 975, 976, 545, 977, 978, 979, 980, 981, 982, 1213, 983, 984, 985, 986, 987, 988, 989, 994, 995, 996, - 997, 998, 1198, 1002, 689, 1000, 1005, 1004, 1006, 1014, - 1015, 1016, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, - 1029, 1030, 1036, 1091, 1037, 1038, 717, 1039, 1040, 1041, - 1042, 1047, 1048, 1049, 1050, 1051, 1214, 700, 723, 1052, - 1213, 761, 1053, 1054, 1229, 1230, 1055, 766, 1056, 1212, - 693, 384, 441, 1189, 1190, 310, 1057, 617, 0, 0, - 0, 1058, 1063, 1064, 0, 1077, 1078, 1079, 1080, 1081, - 1082, 1083, 1089, 1090, 0, 1094, 0, 0, 1092, 1095, - 1100, 1097, 1101, 1122, 1123, 1124, 1149, 1150, 1151, 1152, - 1155, 1168, 1169, 1197, 621, 1202, 1215, 1199, 1225, 1226, - 0, 0, 488, 627, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 525, 0, - 0, 0, 0, 0, 545, 0, 0, 0, 0, 0, + 997, 998, 482, 1002, 1210, 1000, 1195, 1004, 1005, 1092, + 1006, 1014, 1015, 1016, 1021, 1022, 1023, 1024, 1025, 1026, + 1027, 1028, 1029, 1030, 1036, 1037, 1091, 1038, 1212, 1039, + 1040, 1041, 1042, 1047, 689, 1048, 1049, 723, 1050, 1228, + 1229, 1051, 1052, 700, 1211, 1053, 384, 1054, 1055, 1056, + 1057, 761, 1058, 441, 1188, 766, 1063, 1064, 1077, 617, + 310, 693, 1189, 0, 0, 621, 1078, 1079, 1080, 1081, + 1082, 1083, 1089, 1090, 1094, 0, 0, 1100, 1095, 1097, + 0, 1101, 1121, 1122, 1123, 1148, 1149, 1150, 1151, 1154, + 1167, 1168, 1196, 0, 1201, 1214, 1198, 1224, 1225, 488, + 0, 0, 0, 0, 0, 0, 0, 0, 627, 0, + 0, 0, 0, 0, 0, 0, 0, 525, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 564 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 564 }; #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-720))) + (!!((Yystate) == (-736))) #define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int16 yycheck[] = { - 598, 599, 300, 301, 105, 8, 1, 1, 222, 1, - 308, 1, 226, 1, 1, 222, 1, 1, 1, 226, - 1, 222, 1, 51, 1, 226, 1, 1, 224, 222, - 24, 1, 1, 226, 224, 1, 224, 31, 1, 222, - 17, 24, 1, 226, 222, 223, 222, 17, 31, 34, - 226, 1, 224, 37, 222, 32, 1, 222, 226, 36, - 222, 226, 32, 224, 226, 224, 36, 51, 52, 53, - 54, 55, 62, 222, 224, 1, 1, 226, 3, 222, - 5, 62, 224, 226, 1, 1, 70, 62, 73, 1, - 222, 224, 17, 222, 226, 393, 394, 226, 224, 1, - 201, 96, 96, 401, 96, 403, 94, 32, 24, 96, - 224, 36, 410, 96, 224, 413, 224, 96, 1, 96, - 164, 165, 96, 6, 7, 423, 424, 96, 224, 12, - 96, 119, 57, 96, 59, 433, 434, 20, 436, 124, - 1, 118, 58, 26, 69, 28, 29, 30, 118, 124, - 124, 96, 35, 224, 131, 125, 126, 224, 41, 42, - 155, 44, 45, 46, 192, 224, 82, 50, 94, 197, - 86, 96, 224, 56, 224, 36, 155, 60, 61, 224, - 96, 64, 98, 99, 96, 222, 155, 157, 222, 155, - 225, 74, 155, 119, 197, 225, 57, 122, 81, 225, - 83, 62, 85, 225, 87, 88, 89, 124, 164, 165, - 155, 1, 124, 225, 130, 225, 132, 133, 134, 135, - 103, 198, 124, 148, 225, 523, 109, 110, 111, 223, - 113, 223, 225, 116, 117, 151, 213, 120, 223, 223, - 1, 220, 223, 213, 223, 225, 223, 213, 223, 223, - 175, 220, 225, 223, 15, 16, 215, 223, 19, 175, - 223, 122, 221, 225, 223, 215, 136, 137, 213, 152, - 186, 221, 62, 156, 1, 36, 159, 160, 161, 162, - 163, 225, 1, 166, 167, 9, 10, 11, 586, 1, - 17, 216, 136, 137, 592, 593, 213, 223, 223, 597, - 216, 217, 21, 22, 225, 32, 223, 223, 27, 36, - 225, 213, 1031, 1032, 1033, 225, 1, 78, 79, 80, - 183, 184, 34, 84, 92, 93, 209, 210, 211, 90, - 91, 214, 17, 225, 124, 96, 219, 225, 225, 225, - 223, 225, 221, 225, 225, 106, 107, 32, 67, 68, - 65, 36, 225, 225, 225, 222, 75, 76, 77, 225, - 121, 73, 223, 225, 105, 1, 225, 225, 225, 96, - 6, 7, 225, 225, 225, 40, 12, 225, 225, 225, - 225, 105, 101, 102, 20, 225, 147, 225, 225, 225, - 26, 118, 28, 29, 30, 114, 115, 225, 63, 35, - 65, 225, 225, 225, 131, 41, 42, 225, 44, 45, - 46, 1, 124, 225, 50, 225, 225, 225, 225, 225, - 56, 225, 225, 138, 60, 61, 225, 225, 64, 190, - 225, 225, 225, 118, 24, 222, 225, 225, 74, 225, - 125, 126, 225, 108, 225, 81, 225, 83, 225, 85, - 225, 87, 88, 89, 169, 775, 776, 777, 778, 779, - 780, 781, 223, 178, 123, 225, 225, 103, 58, 225, - 185, 198, 157, 109, 110, 111, 225, 113, 225, 225, - 116, 117, 225, 225, 120, 200, 213, 202, 203, 225, - 225, 225, 82, 225, 225, 225, 86, 212, 1, 1097, - 3, 123, 5, 218, 223, 225, 96, 225, 98, 99, - 123, 225, 177, 178, 17, 4, 152, 13, 225, 225, - 156, 225, 225, 159, 160, 161, 162, 163, 213, 32, - 166, 167, 225, 36, 225, 222, 25, 33, 105, 164, - 130, 105, 132, 133, 134, 135, 1, 43, 213, 105, - 105, 40, 105, 49, 57, 164, 59, 164, 47, 105, - 222, 151, 222, 123, 225, 164, 69, 225, 225, 225, - 66, 225, 225, 209, 210, 211, 65, 225, 214, 225, - 225, 36, 225, 219, 225, 175, 0, 1, 225, 105, - 4, 225, 225, 96, 225, 222, 186, 1, 222, 225, - 14, 97, 57, 17, 18, 94, 225, 62, 104, 23, - 225, 15, 16, 225, 225, 19, 164, 225, 105, 122, - 34, 225, 225, 112, 38, 39, 216, 217, 51, 225, - 225, 225, 36, 225, 48, 164, 225, 225, 127, 128, - 129, 225, 225, 139, 123, 148, 164, 164, 105, 63, - 164, 105, 105, 164, 164, 105, 105, 71, 72, 105, - 105, 105, 158, 105, 164, 164, 225, 122, 225, 164, - 51, 164, 175, 164, 78, 79, 80, 222, 164, 164, - 84, 95, 164, 164, 123, 222, 90, 91, 164, 178, - 164, 164, 96, 225, 108, 225, 164, 225, 225, 225, - 189, 225, 106, 107, 225, 194, 51, 222, 123, 105, - 206, 200, 225, 216, 222, 204, 225, 121, 207, 225, - 225, 225, 224, 212, 138, 123, 164, 225, 222, 218, - 222, 164, 222, 123, 164, 149, 150, 225, 164, 153, - 154, 225, 225, 147, 164, 225, 123, 170, 171, 172, - 173, 174, 164, 176, 177, 225, 179, 180, 181, 182, - 65, 225, 185, 225, 187, 188, 189, 225, 191, 1, - 193, 222, 195, 196, 105, 123, 199, 123, 105, 123, - 123, 123, 205, 123, 123, 123, 190, 123, 123, 170, - 171, 172, 173, 174, 208, 176, 177, 222, 179, 180, - 181, 182, 123, 222, 185, 37, 187, 188, 189, 225, - 191, 222, 193, 105, 195, 196, 225, 225, 199, 51, - 52, 53, 54, 55, 205, 170, 171, 172, 173, 174, - 222, 176, 177, 138, 179, 180, 181, 182, 70, 222, - 185, 105, 187, 188, 189, 1, 191, 105, 193, 222, - 195, 196, 222, 222, 199, 222, 222, 222, 222, 222, - 205, 222, 222, 222, 169, 21, 22, 222, 222, 222, - 105, 27, 105, 178, 225, 105, 105, 123, 105, 105, - 185, 105, 140, 141, 142, 143, 144, 145, 146, 222, - 164, 225, 123, 105, 222, 200, 222, 202, 203, 222, - 123, 123, 123, 123, 123, 123, 123, 212, 123, 123, - 123, 67, 68, 218, 123, 123, 222, 123, 222, 75, - 76, 77, 222, 222, 222, 222, 222, 222, 222, 222, - 164, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 101, 102, 222, 225, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 114, 115, - 222, 222, 222, 222, 123, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 105, 123, 123, 123, - 222, 123, 123, 222, 225, 123, 123, 105, 123, 164, - 123, 123, 123, 123, 222, 123, 123, 222, 123, 123, - 123, 123, 105, 71, 993, 991, 222, 953, 1232, 1206, - 1204, 222, 216, 328, 1183, 225, 1092, 222, 225, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 123, 222, 451, 225, 222, 225, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 168, 222, 222, 498, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 1194, 474, 512, 222, - 1192, 550, 222, 222, 1208, 1210, 222, 558, 222, 1188, - 464, 108, 161, 1060, 1062, 89, 222, 360, -1, -1, - -1, 222, 222, 222, -1, 222, 222, 222, 222, 222, - 222, 222, 222, 222, -1, 222, -1, -1, 226, 225, - 222, 225, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 378, 222, 222, 225, 222, 222, - -1, -1, 224, 388, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 238, -1, - -1, -1, -1, -1, 265, -1, -1, -1, -1, -1, + 598, 599, 300, 301, 1, 1, 8, 1, 223, 1, + 308, 1, 1, 1, 223, 1, 1, 221, 105, 1, + 221, 225, 221, 222, 225, 1, 1, 1, 1, 21, + 22, 1, 1, 1, 51, 27, 1, 221, 3, 1, + 5, 225, 24, 221, 1, 1, 1, 225, 36, 31, + 1, 223, 17, 223, 1, 9, 10, 11, 221, 34, + 1, 221, 225, 221, 37, 225, 223, 32, 221, 57, + 1, 36, 225, 62, 62, 67, 68, 223, 51, 52, + 53, 54, 55, 75, 76, 77, 62, 221, 223, 221, + 223, 225, 57, 225, 59, 393, 394, 70, 73, 96, + 62, 223, 96, 401, 69, 403, 96, 62, 94, 101, + 102, 96, 410, 200, 96, 413, 163, 164, 1, 223, + 94, 113, 114, 6, 7, 423, 424, 123, 96, 12, + 223, 96, 118, 121, 123, 433, 434, 20, 436, 96, + 96, 223, 1, 26, 118, 28, 29, 30, 123, 96, + 221, 105, 35, 123, 225, 96, 121, 154, 41, 42, + 154, 44, 45, 46, 1, 96, 221, 50, 123, 154, + 225, 135, 136, 56, 191, 34, 123, 60, 61, 196, + 17, 64, 147, 221, 221, 224, 154, 225, 225, 1, + 223, 74, 123, 223, 196, 32, 223, 154, 81, 36, + 83, 223, 85, 223, 87, 88, 89, 223, 1, 174, + 163, 164, 24, 154, 73, 223, 212, 223, 212, 224, + 103, 224, 219, 1, 17, 523, 109, 110, 111, 112, + 222, 224, 115, 116, 222, 163, 119, 15, 16, 32, + 222, 19, 212, 36, 212, 214, 58, 222, 222, 222, + 215, 220, 222, 222, 222, 135, 136, 222, 36, 96, + 222, 224, 219, 214, 123, 222, 222, 222, 151, 220, + 82, 221, 155, 221, 86, 158, 159, 160, 161, 162, + 117, 222, 165, 166, 96, 224, 98, 99, 586, 182, + 183, 222, 224, 130, 592, 593, 1031, 1032, 1033, 597, + 78, 79, 80, 92, 93, 1, 84, 224, 224, 105, + 224, 1, 90, 91, 224, 224, 224, 129, 96, 131, + 132, 133, 134, 224, 117, 208, 209, 210, 106, 107, + 213, 124, 125, 224, 24, 218, 1, 224, 150, 222, + 36, 31, 120, 139, 140, 141, 142, 143, 144, 145, + 224, 224, 17, 1, 224, 224, 224, 224, 6, 7, + 197, 57, 174, 156, 12, 221, 62, 32, 146, 224, + 224, 36, 20, 185, 224, 212, 224, 224, 26, 224, + 28, 29, 30, 224, 224, 222, 224, 35, 224, 224, + 224, 1, 224, 41, 42, 224, 44, 45, 46, 224, + 224, 224, 50, 215, 216, 224, 96, 40, 56, 224, + 222, 189, 60, 61, 24, 224, 64, 224, 224, 212, + 224, 224, 224, 224, 224, 121, 74, 224, 220, 222, + 63, 221, 65, 81, 1, 83, 3, 85, 5, 87, + 88, 89, 224, 224, 222, 224, 122, 224, 58, 224, + 17, 224, 117, 224, 224, 103, 224, 224, 224, 124, + 125, 109, 110, 111, 112, 32, 224, 115, 116, 36, + 224, 119, 82, 4, 224, 108, 86, 224, 775, 776, + 777, 778, 779, 780, 781, 224, 96, 224, 98, 99, + 57, 156, 59, 224, 25, 224, 224, 224, 224, 1097, + 224, 224, 69, 151, 1, 224, 224, 155, 224, 40, + 158, 159, 160, 161, 162, 224, 47, 165, 166, 129, + 17, 131, 132, 133, 134, 224, 224, 224, 122, 96, + 224, 224, 224, 224, 65, 32, 224, 65, 224, 36, + 150, 224, 224, 176, 177, 224, 122, 212, 105, 105, + 105, 13, 105, 105, 121, 0, 1, 105, 163, 4, + 208, 209, 210, 94, 174, 213, 163, 105, 221, 14, + 218, 33, 17, 18, 221, 185, 221, 122, 23, 212, + 147, 43, 65, 224, 224, 224, 224, 49, 224, 34, + 224, 221, 224, 38, 39, 126, 127, 128, 224, 96, + 224, 224, 224, 48, 66, 215, 216, 174, 224, 137, + 224, 224, 224, 224, 163, 224, 224, 224, 63, 105, + 117, 224, 224, 224, 224, 224, 71, 72, 224, 224, + 163, 224, 224, 130, 224, 97, 224, 224, 163, 105, + 168, 122, 104, 163, 163, 51, 177, 105, 215, 177, + 95, 105, 1, 105, 137, 163, 184, 188, 163, 163, + 163, 105, 193, 108, 105, 105, 15, 16, 199, 105, + 19, 199, 203, 201, 202, 206, 138, 105, 105, 163, + 211, 51, 224, 211, 163, 168, 217, 36, 224, 217, + 163, 163, 137, 163, 177, 157, 163, 122, 163, 163, + 197, 184, 163, 148, 149, 221, 163, 152, 153, 221, + 163, 224, 221, 224, 224, 212, 199, 51, 201, 202, + 163, 122, 224, 224, 224, 224, 224, 221, 211, 78, + 79, 80, 224, 224, 217, 84, 224, 224, 223, 122, + 163, 90, 91, 205, 221, 221, 224, 96, 163, 224, + 224, 122, 163, 224, 163, 224, 224, 106, 107, 163, + 122, 221, 207, 169, 170, 171, 172, 173, 224, 175, + 176, 120, 178, 179, 180, 181, 224, 224, 184, 221, + 186, 187, 188, 163, 190, 105, 192, 105, 194, 195, + 122, 122, 198, 122, 122, 122, 122, 146, 204, 169, + 170, 171, 172, 173, 105, 175, 176, 122, 178, 179, + 180, 181, 122, 122, 184, 122, 186, 187, 188, 221, + 190, 221, 192, 221, 194, 195, 1, 224, 198, 224, + 224, 122, 221, 221, 204, 169, 170, 171, 172, 173, + 189, 175, 176, 221, 178, 179, 180, 181, 1, 221, + 184, 105, 186, 187, 188, 221, 190, 221, 192, 105, + 194, 195, 37, 221, 198, 221, 221, 221, 21, 22, + 204, 221, 224, 221, 27, 221, 51, 52, 53, 54, + 55, 221, 221, 221, 105, 105, 105, 105, 122, 105, + 105, 105, 122, 122, 163, 70, 221, 122, 122, 122, + 224, 105, 221, 163, 221, 122, 105, 221, 221, 122, + 122, 122, 122, 122, 67, 68, 122, 122, 221, 221, + 122, 221, 75, 76, 77, 221, 221, 221, 221, 221, + 122, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 101, 102, + 221, 221, 224, 221, 221, 221, 221, 221, 221, 221, + 113, 114, 221, 221, 221, 221, 221, 122, 221, 221, + 221, 221, 221, 221, 221, 122, 221, 221, 122, 221, + 122, 122, 221, 224, 122, 122, 105, 122, 221, 221, + 221, 163, 122, 221, 122, 122, 122, 224, 224, 221, + 122, 122, 122, 105, 122, 122, 122, 991, 71, 953, + 993, 1231, 1205, 221, 221, 1203, 498, 328, 221, 122, + 221, 221, 265, 221, 221, 221, 221, 221, 221, 1193, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 221, 216, 221, 1182, 224, 1092, 224, 221, 225, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 167, 221, 1191, 221, + 221, 221, 221, 221, 451, 221, 221, 512, 221, 1207, + 1209, 221, 221, 474, 1187, 221, 108, 221, 221, 221, + 221, 550, 221, 161, 1060, 558, 221, 221, 221, 360, + 89, 464, 1062, -1, -1, 378, 221, 221, 221, 221, + 221, 221, 221, 221, 221, -1, -1, 221, 224, 224, + -1, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 221, 221, -1, 221, 221, 224, 221, 221, 224, + -1, -1, -1, -1, -1, -1, -1, -1, 388, -1, + -1, -1, -1, -1, -1, -1, -1, 238, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 288 + -1, -1, -1, -1, -1, -1, 288 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 228, 0, 1, 4, 14, 17, 18, 23, 34, - 38, 39, 48, 63, 71, 72, 95, 108, 138, 149, - 150, 153, 154, 208, 229, 234, 239, 263, 269, 283, - 301, 324, 338, 353, 360, 364, 374, 383, 403, 409, - 415, 419, 425, 482, 497, 222, 223, 224, 224, 302, - 384, 410, 224, 420, 224, 339, 404, 325, 224, 224, - 284, 354, 224, 224, 365, 375, 224, 1, 24, 31, - 96, 264, 265, 266, 267, 268, 1, 21, 22, 27, - 67, 68, 75, 76, 77, 101, 102, 114, 115, 483, - 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, - 494, 495, 496, 224, 224, 224, 1, 62, 416, 417, - 418, 224, 1, 6, 7, 12, 20, 26, 28, 29, + 0, 227, 0, 1, 4, 14, 17, 18, 23, 34, + 38, 39, 48, 63, 71, 72, 95, 108, 137, 148, + 149, 152, 153, 207, 228, 233, 238, 262, 268, 282, + 300, 323, 337, 352, 359, 363, 373, 382, 402, 408, + 414, 418, 424, 481, 496, 221, 222, 223, 223, 301, + 383, 409, 223, 419, 223, 338, 403, 324, 223, 223, + 283, 353, 223, 223, 364, 374, 223, 1, 24, 31, + 96, 263, 264, 265, 266, 267, 1, 21, 22, 27, + 67, 68, 75, 76, 77, 101, 102, 113, 114, 482, + 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, + 493, 494, 495, 223, 223, 223, 1, 62, 415, 416, + 417, 223, 1, 6, 7, 12, 20, 26, 28, 29, 30, 35, 41, 42, 44, 45, 46, 50, 56, 60, 61, 64, 74, 81, 83, 85, 87, 88, 89, 103, - 109, 110, 111, 113, 116, 117, 120, 152, 156, 159, - 160, 161, 162, 163, 166, 167, 209, 210, 211, 214, - 219, 426, 427, 428, 429, 430, 431, 432, 433, 434, - 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, - 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, - 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, - 465, 466, 467, 468, 469, 470, 471, 475, 479, 480, - 481, 224, 224, 224, 1, 215, 270, 271, 272, 273, - 274, 1, 94, 119, 235, 236, 237, 238, 224, 224, - 1, 37, 51, 52, 53, 54, 55, 70, 498, 499, - 500, 501, 502, 503, 504, 505, 506, 1, 24, 58, - 82, 86, 96, 98, 99, 130, 132, 133, 134, 135, - 151, 175, 186, 216, 217, 240, 241, 242, 243, 248, - 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 224, 224, 1, 96, 361, 362, - 363, 222, 225, 225, 225, 223, 265, 225, 225, 225, - 225, 225, 225, 225, 225, 225, 225, 225, 225, 223, - 484, 1, 15, 16, 19, 36, 78, 79, 80, 84, - 90, 91, 96, 106, 107, 121, 147, 190, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 316, 317, 318, 319, 320, 1, 3, 5, 17, - 32, 36, 57, 59, 69, 96, 122, 148, 175, 216, - 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, - 398, 399, 400, 401, 402, 1, 62, 124, 411, 412, - 413, 414, 225, 223, 417, 1, 96, 124, 421, 422, - 423, 424, 225, 225, 225, 225, 225, 225, 225, 225, - 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, - 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, - 476, 225, 472, 225, 225, 225, 225, 225, 225, 225, - 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, - 223, 427, 1, 17, 32, 36, 118, 125, 126, 157, - 213, 340, 341, 342, 343, 344, 345, 346, 350, 351, - 352, 1, 124, 213, 405, 406, 407, 408, 1, 36, - 57, 62, 122, 326, 330, 331, 332, 336, 337, 222, - 225, 223, 271, 221, 222, 225, 225, 223, 236, 1, - 17, 32, 36, 96, 118, 131, 198, 213, 285, 286, - 287, 288, 289, 290, 291, 292, 293, 297, 1, 34, - 73, 124, 355, 356, 357, 358, 359, 225, 225, 225, - 225, 225, 225, 225, 223, 499, 222, 225, 225, 225, - 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, - 225, 225, 225, 225, 223, 241, 1, 96, 155, 213, - 366, 367, 368, 369, 370, 1, 96, 155, 376, 377, - 378, 379, 225, 223, 362, 123, 123, 123, 222, 105, - 105, 164, 105, 231, 231, 105, 105, 105, 164, 164, - 105, 231, 222, 222, 225, 225, 225, 321, 225, 225, - 225, 225, 225, 225, 225, 225, 225, 225, 225, 225, - 223, 304, 222, 225, 225, 225, 225, 395, 225, 225, - 225, 225, 225, 225, 225, 225, 223, 386, 225, 225, - 223, 412, 123, 222, 225, 225, 223, 422, 164, 231, - 231, 105, 164, 164, 105, 123, 164, 231, 164, 231, - 105, 105, 105, 164, 164, 164, 231, 105, 105, 231, - 105, 105, 105, 105, 164, 164, 225, 164, 225, 231, - 231, 164, 164, 164, 164, 164, 165, 164, 165, 164, - 164, 231, 231, 123, 231, 164, 164, 164, 222, 222, - 225, 225, 347, 225, 225, 225, 225, 225, 223, 341, - 225, 225, 223, 406, 222, 327, 225, 225, 225, 223, - 331, 164, 222, 224, 123, 123, 222, 222, 225, 225, - 298, 225, 225, 225, 294, 225, 223, 286, 222, 225, - 225, 225, 223, 356, 164, 164, 123, 164, 164, 164, - 231, 222, 123, 164, 105, 105, 123, 123, 123, 123, - 123, 123, 136, 137, 244, 245, 136, 137, 246, 247, - 123, 123, 105, 123, 123, 222, 222, 225, 371, 225, - 223, 367, 222, 225, 380, 223, 377, 123, 222, 222, - 222, 222, 222, 222, 222, 140, 141, 142, 143, 144, - 145, 146, 230, 231, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 105, 105, 231, 225, 105, 105, 105, - 105, 231, 231, 123, 105, 105, 231, 105, 233, 233, - 222, 123, 183, 184, 123, 164, 225, 123, 123, 123, - 123, 105, 123, 123, 123, 222, 123, 123, 222, 222, - 123, 123, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 51, 170, 171, 172, 173, 174, 176, 177, 179, - 180, 181, 182, 185, 187, 188, 189, 191, 193, 195, - 196, 199, 205, 477, 478, 222, 51, 170, 171, 172, - 173, 174, 176, 177, 179, 180, 181, 182, 185, 187, - 188, 189, 191, 193, 195, 196, 199, 205, 473, 474, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 123, - 164, 225, 123, 105, 123, 123, 123, 222, 123, 123, - 222, 225, 123, 123, 105, 334, 335, 222, 222, 1, - 96, 155, 220, 275, 276, 277, 278, 279, 222, 222, - 123, 164, 225, 123, 123, 123, 225, 123, 222, 123, - 123, 123, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 226, 222, 226, 222, 222, 222, 222, 222, 123, - 225, 123, 222, 123, 225, 222, 222, 230, 230, 230, - 230, 230, 230, 230, 222, 222, 222, 92, 93, 322, - 323, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 9, 10, 11, 232, 233, 222, 222, 222, 222, - 222, 222, 222, 8, 197, 396, 397, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 226, 222, 226, 222, 222, 13, 33, 43, 49, 66, - 97, 104, 139, 158, 206, 348, 349, 222, 222, 222, - 222, 222, 222, 222, 51, 192, 197, 328, 329, 222, - 222, 168, 226, 333, 222, 225, 280, 225, 223, 276, - 222, 222, 4, 25, 40, 47, 65, 94, 112, 127, - 128, 129, 178, 189, 194, 200, 204, 207, 212, 218, - 299, 300, 222, 222, 222, 51, 170, 171, 172, 173, - 174, 176, 177, 179, 180, 181, 182, 185, 187, 188, - 189, 191, 193, 195, 196, 199, 205, 295, 296, 222, - 222, 222, 222, 245, 247, 222, 65, 138, 169, 178, - 185, 200, 202, 203, 212, 218, 372, 373, 222, 222, - 65, 138, 169, 178, 185, 200, 202, 203, 212, 218, - 381, 382, 222, 226, 232, 232, 232, 222, 226, 478, - 474, 222, 226, 222, 226, 105, 335, 222, 123, 225, - 201, 233, 222, 222, 226, 222, 226, 222, 226, 222, - 226, 323, 397, 349, 329, 222, 40, 63, 65, 108, - 177, 178, 213, 281, 282, 222, 222, 300, 296, 373, - 382, 222, 226, 282 + 109, 110, 111, 112, 115, 116, 119, 151, 155, 158, + 159, 160, 161, 162, 165, 166, 208, 209, 210, 213, + 218, 425, 426, 427, 428, 429, 430, 431, 432, 433, + 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, + 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, + 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, + 464, 465, 466, 467, 468, 469, 470, 474, 478, 479, + 480, 223, 223, 223, 1, 214, 269, 270, 271, 272, + 273, 1, 94, 118, 234, 235, 236, 237, 223, 223, + 1, 37, 51, 52, 53, 54, 55, 70, 497, 498, + 499, 500, 501, 502, 503, 504, 505, 1, 24, 58, + 82, 86, 96, 98, 99, 129, 131, 132, 133, 134, + 150, 174, 185, 215, 216, 239, 240, 241, 242, 247, + 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 258, 259, 260, 261, 223, 223, 1, 96, 360, 361, + 362, 221, 224, 224, 224, 222, 264, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 222, + 483, 1, 15, 16, 19, 36, 78, 79, 80, 84, + 90, 91, 96, 106, 107, 120, 146, 189, 302, 303, + 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, + 314, 315, 316, 317, 318, 319, 1, 3, 5, 17, + 32, 36, 57, 59, 69, 96, 121, 147, 174, 215, + 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, + 397, 398, 399, 400, 401, 1, 62, 123, 410, 411, + 412, 413, 224, 222, 416, 1, 96, 123, 420, 421, + 422, 423, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 475, 224, 471, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 222, 426, 1, 17, 32, 36, 117, 124, 125, 156, + 212, 339, 340, 341, 342, 343, 344, 345, 349, 350, + 351, 1, 123, 212, 404, 405, 406, 407, 1, 36, + 57, 62, 121, 325, 329, 330, 331, 335, 336, 221, + 224, 222, 270, 220, 221, 224, 224, 222, 235, 1, + 17, 32, 36, 96, 117, 130, 197, 212, 284, 285, + 286, 287, 288, 289, 290, 291, 292, 296, 1, 34, + 73, 123, 354, 355, 356, 357, 358, 224, 224, 224, + 224, 224, 224, 224, 222, 498, 221, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 222, 240, 1, 96, 154, 212, + 365, 366, 367, 368, 369, 1, 96, 154, 375, 376, + 377, 378, 224, 222, 361, 122, 122, 122, 221, 105, + 105, 163, 105, 230, 230, 105, 105, 105, 163, 163, + 105, 230, 221, 221, 224, 224, 224, 320, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 222, 303, 221, 224, 224, 224, 224, 394, 224, 224, + 224, 224, 224, 224, 224, 224, 222, 385, 224, 224, + 222, 411, 122, 221, 224, 224, 222, 421, 163, 230, + 230, 105, 163, 163, 105, 122, 163, 230, 163, 230, + 105, 105, 105, 163, 163, 163, 230, 105, 105, 230, + 105, 105, 105, 105, 163, 163, 224, 163, 224, 230, + 230, 163, 163, 163, 163, 163, 164, 163, 164, 163, + 163, 230, 230, 122, 230, 163, 163, 163, 221, 221, + 224, 224, 346, 224, 224, 224, 224, 224, 222, 340, + 224, 224, 222, 405, 221, 326, 224, 224, 224, 222, + 330, 163, 221, 223, 122, 122, 221, 221, 224, 224, + 297, 224, 224, 224, 293, 224, 222, 285, 221, 224, + 224, 224, 222, 355, 163, 163, 122, 163, 163, 163, + 230, 221, 122, 163, 105, 105, 122, 122, 122, 122, + 122, 122, 135, 136, 243, 244, 135, 136, 245, 246, + 122, 122, 105, 122, 122, 221, 221, 224, 370, 224, + 222, 366, 221, 224, 379, 222, 376, 122, 221, 221, + 221, 221, 221, 221, 221, 139, 140, 141, 142, 143, + 144, 145, 229, 230, 221, 221, 221, 221, 221, 221, + 221, 221, 221, 105, 105, 230, 224, 105, 105, 105, + 105, 230, 230, 122, 105, 105, 230, 105, 232, 232, + 221, 122, 182, 183, 122, 163, 224, 122, 122, 122, + 122, 105, 122, 122, 122, 221, 122, 122, 221, 221, + 122, 122, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 51, 169, 170, 171, 172, 173, 175, 176, 178, + 179, 180, 181, 184, 186, 187, 188, 190, 192, 194, + 195, 198, 204, 476, 477, 221, 51, 169, 170, 171, + 172, 173, 175, 176, 178, 179, 180, 181, 184, 186, + 187, 188, 190, 192, 194, 195, 198, 204, 472, 473, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 122, + 163, 224, 122, 105, 122, 122, 122, 221, 122, 122, + 221, 224, 122, 122, 105, 333, 334, 221, 221, 1, + 96, 154, 219, 274, 275, 276, 277, 278, 221, 221, + 122, 163, 224, 122, 122, 122, 224, 122, 221, 122, + 122, 122, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 225, 221, 225, 221, 221, 221, 221, 221, 122, + 224, 122, 221, 122, 224, 221, 221, 229, 229, 229, + 229, 229, 229, 229, 221, 221, 221, 92, 93, 321, + 322, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 9, 10, 11, 231, 232, 221, 221, 221, 221, + 221, 221, 221, 8, 196, 395, 396, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 225, 221, 225, 221, 221, 13, 33, 43, 49, 66, + 97, 104, 138, 157, 205, 347, 348, 221, 221, 221, + 221, 221, 221, 221, 51, 191, 196, 327, 328, 221, + 221, 167, 225, 332, 221, 224, 279, 224, 222, 275, + 221, 221, 4, 25, 40, 47, 65, 94, 126, 127, + 128, 177, 188, 193, 199, 203, 206, 211, 217, 298, + 299, 221, 221, 221, 51, 169, 170, 171, 172, 173, + 175, 176, 178, 179, 180, 181, 184, 186, 187, 188, + 190, 192, 194, 195, 198, 204, 294, 295, 221, 221, + 221, 221, 244, 246, 221, 65, 137, 168, 177, 184, + 199, 201, 202, 211, 217, 371, 372, 221, 221, 65, + 137, 168, 177, 184, 199, 201, 202, 211, 217, 380, + 381, 221, 225, 231, 231, 231, 221, 225, 477, 473, + 221, 225, 221, 225, 105, 334, 221, 122, 224, 200, + 232, 221, 221, 225, 221, 225, 221, 225, 221, 225, + 322, 396, 348, 328, 221, 40, 63, 65, 108, 176, + 177, 212, 280, 281, 221, 221, 299, 295, 372, 381, + 221, 225, 281 }; #define yyerrok (yyerrstatus = 0) @@ -3155,13 +3152,13 @@ yyreduce: { case 26: /* Line 1787 of yacc.c */ -#line 392 "conf_parser.y" +#line 391 "conf_parser.y" { (yyval.number) = 0; } break; case 28: /* Line 1787 of yacc.c */ -#line 394 "conf_parser.y" +#line 393 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); } @@ -3169,7 +3166,7 @@ yyreduce: case 29: /* Line 1787 of yacc.c */ -#line 398 "conf_parser.y" +#line 397 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); } @@ -3177,7 +3174,7 @@ yyreduce: case 30: /* Line 1787 of yacc.c */ -#line 402 "conf_parser.y" +#line 401 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number); } @@ -3185,7 +3182,7 @@ yyreduce: case 31: /* Line 1787 of yacc.c */ -#line 406 "conf_parser.y" +#line 405 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number); } @@ -3193,7 +3190,7 @@ yyreduce: case 32: /* Line 1787 of yacc.c */ -#line 410 "conf_parser.y" +#line 409 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number); } @@ -3201,7 +3198,7 @@ yyreduce: case 33: /* Line 1787 of yacc.c */ -#line 414 "conf_parser.y" +#line 413 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number); } @@ -3209,7 +3206,7 @@ yyreduce: case 34: /* Line 1787 of yacc.c */ -#line 418 "conf_parser.y" +#line 417 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 * 4 + (yyvsp[(3) - (3)].number); } @@ -3217,7 +3214,7 @@ yyreduce: case 35: /* Line 1787 of yacc.c */ -#line 422 "conf_parser.y" +#line 421 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 365 + (yyvsp[(3) - (3)].number); } @@ -3225,37 +3222,37 @@ yyreduce: case 36: /* Line 1787 of yacc.c */ -#line 427 "conf_parser.y" +#line 426 "conf_parser.y" { (yyval.number) = 0; } break; case 38: /* Line 1787 of yacc.c */ -#line 428 "conf_parser.y" +#line 427 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); } break; case 39: /* Line 1787 of yacc.c */ -#line 429 "conf_parser.y" +#line 428 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); } break; case 40: /* Line 1787 of yacc.c */ -#line 430 "conf_parser.y" +#line 429 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); } break; case 41: /* Line 1787 of yacc.c */ -#line 431 "conf_parser.y" +#line 430 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); } break; case 48: /* Line 1787 of yacc.c */ -#line 445 "conf_parser.y" +#line 444 "conf_parser.y" { if (conf_parser_ctx.pass == 2) add_conf_module(libio_basename(yylval.string)); @@ -3264,7 +3261,7 @@ yyreduce: case 49: /* Line 1787 of yacc.c */ -#line 451 "conf_parser.y" +#line 450 "conf_parser.y" { if (conf_parser_ctx.pass == 2) mod_add_path(yylval.string); @@ -3273,7 +3270,7 @@ yyreduce: case 75: /* Line 1787 of yacc.c */ -#line 477 "conf_parser.y" +#line 476 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx) @@ -3284,7 +3281,7 @@ yyreduce: case 76: /* Line 1787 of yacc.c */ -#line 483 "conf_parser.y" +#line 482 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx) @@ -3295,7 +3292,7 @@ yyreduce: case 79: /* Line 1787 of yacc.c */ -#line 492 "conf_parser.y" +#line 491 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3306,7 +3303,7 @@ yyreduce: case 80: /* Line 1787 of yacc.c */ -#line 498 "conf_parser.y" +#line 497 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3317,7 +3314,7 @@ yyreduce: case 81: /* Line 1787 of yacc.c */ -#line 506 "conf_parser.y" +#line 505 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3362,7 +3359,7 @@ yyreduce: case 82: /* Line 1787 of yacc.c */ -#line 548 "conf_parser.y" +#line 547 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 1) @@ -3424,7 +3421,7 @@ yyreduce: case 83: /* Line 1787 of yacc.c */ -#line 607 "conf_parser.y" +#line 606 "conf_parser.y" { /* TBD - XXX: error reporting */ #ifdef HAVE_LIBCRYPTO @@ -3455,7 +3452,7 @@ yyreduce: case 84: /* Line 1787 of yacc.c */ -#line 635 "conf_parser.y" +#line 634 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3466,7 +3463,7 @@ yyreduce: case 85: /* Line 1787 of yacc.c */ -#line 643 "conf_parser.y" +#line 642 "conf_parser.y" { /* this isn't rehashable */ if (conf_parser_ctx.pass == 2 && !ServerInfo.name) @@ -3484,7 +3481,7 @@ yyreduce: case 86: /* Line 1787 of yacc.c */ -#line 658 "conf_parser.y" +#line 657 "conf_parser.y" { /* this isn't rehashable */ if (conf_parser_ctx.pass == 2 && !ServerInfo.sid) @@ -3502,7 +3499,7 @@ yyreduce: case 87: /* Line 1787 of yacc.c */ -#line 673 "conf_parser.y" +#line 672 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3514,7 +3511,7 @@ yyreduce: case 88: /* Line 1787 of yacc.c */ -#line 682 "conf_parser.y" +#line 681 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3531,7 +3528,7 @@ yyreduce: case 89: /* Line 1787 of yacc.c */ -#line 696 "conf_parser.y" +#line 695 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3543,7 +3540,7 @@ yyreduce: case 90: /* Line 1787 of yacc.c */ -#line 705 "conf_parser.y" +#line 704 "conf_parser.y" { if (conf_parser_ctx.pass == 2 && *yylval.string != '*') { @@ -3574,7 +3571,7 @@ yyreduce: case 91: /* Line 1787 of yacc.c */ -#line 733 "conf_parser.y" +#line 732 "conf_parser.y" { #ifdef IPV6 if (conf_parser_ctx.pass == 2 && *yylval.string != '*') @@ -3607,7 +3604,7 @@ yyreduce: case 92: /* Line 1787 of yacc.c */ -#line 763 "conf_parser.y" +#line 762 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3635,7 +3632,7 @@ yyreduce: case 93: /* Line 1787 of yacc.c */ -#line 788 "conf_parser.y" +#line 787 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3660,7 +3657,7 @@ yyreduce: case 94: /* Line 1787 of yacc.c */ -#line 810 "conf_parser.y" +#line 809 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3685,7 +3682,7 @@ yyreduce: case 95: /* Line 1787 of yacc.c */ -#line 832 "conf_parser.y" +#line 831 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ServerInfo.hub = yylval.number; @@ -3694,7 +3691,7 @@ yyreduce: case 103: /* Line 1787 of yacc.c */ -#line 847 "conf_parser.y" +#line 846 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3706,7 +3703,7 @@ yyreduce: case 104: /* Line 1787 of yacc.c */ -#line 856 "conf_parser.y" +#line 855 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3718,7 +3715,7 @@ yyreduce: case 105: /* Line 1787 of yacc.c */ -#line 865 "conf_parser.y" +#line 864 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3730,7 +3727,7 @@ yyreduce: case 112: /* Line 1787 of yacc.c */ -#line 883 "conf_parser.y" +#line 882 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigLoggingEntry.use_logging = yylval.number; @@ -3739,7 +3736,7 @@ yyreduce: case 113: /* Line 1787 of yacc.c */ -#line 889 "conf_parser.y" +#line 888 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); @@ -3748,7 +3745,7 @@ yyreduce: case 114: /* Line 1787 of yacc.c */ -#line 893 "conf_parser.y" +#line 892 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3761,7 +3758,7 @@ yyreduce: case 121: /* Line 1787 of yacc.c */ -#line 909 "conf_parser.y" +#line 908 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3772,7 +3769,7 @@ yyreduce: case 122: /* Line 1787 of yacc.c */ -#line 917 "conf_parser.y" +#line 916 "conf_parser.y" { block_state.size.value = (yyvsp[(3) - (4)].number); } @@ -3780,7 +3777,7 @@ yyreduce: case 123: /* Line 1787 of yacc.c */ -#line 920 "conf_parser.y" +#line 919 "conf_parser.y" { block_state.size.value = 0; } @@ -3788,7 +3785,7 @@ yyreduce: case 124: /* Line 1787 of yacc.c */ -#line 925 "conf_parser.y" +#line 924 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = 0; @@ -3797,7 +3794,7 @@ yyreduce: case 128: /* Line 1787 of yacc.c */ -#line 932 "conf_parser.y" +#line 931 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_USER; @@ -3806,7 +3803,7 @@ yyreduce: case 129: /* Line 1787 of yacc.c */ -#line 936 "conf_parser.y" +#line 935 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_OPER; @@ -3815,7 +3812,7 @@ yyreduce: case 130: /* Line 1787 of yacc.c */ -#line 940 "conf_parser.y" +#line 939 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_GLINE; @@ -3824,7 +3821,7 @@ yyreduce: case 131: /* Line 1787 of yacc.c */ -#line 944 "conf_parser.y" +#line 943 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_DLINE; @@ -3833,7 +3830,7 @@ yyreduce: case 132: /* Line 1787 of yacc.c */ -#line 948 "conf_parser.y" +#line 947 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_KLINE; @@ -3842,7 +3839,7 @@ yyreduce: case 133: /* Line 1787 of yacc.c */ -#line 952 "conf_parser.y" +#line 951 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_KILL; @@ -3851,7 +3848,7 @@ yyreduce: case 134: /* Line 1787 of yacc.c */ -#line 956 "conf_parser.y" +#line 955 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_DEBUG; @@ -3860,7 +3857,7 @@ yyreduce: case 135: /* Line 1787 of yacc.c */ -#line 966 "conf_parser.y" +#line 965 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3872,7 +3869,7 @@ yyreduce: case 136: /* Line 1787 of yacc.c */ -#line 973 "conf_parser.y" +#line 972 "conf_parser.y" { dlink_node *ptr = NULL; @@ -3945,7 +3942,7 @@ yyreduce: case 148: /* Line 1787 of yacc.c */ -#line 1048 "conf_parser.y" +#line 1047 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); @@ -3954,7 +3951,7 @@ yyreduce: case 149: /* Line 1787 of yacc.c */ -#line 1054 "conf_parser.y" +#line 1053 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); @@ -3963,7 +3960,7 @@ yyreduce: case 150: /* Line 1787 of yacc.c */ -#line 1060 "conf_parser.y" +#line 1059 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); @@ -3972,7 +3969,7 @@ yyreduce: case 151: /* Line 1787 of yacc.c */ -#line 1066 "conf_parser.y" +#line 1065 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3986,7 +3983,7 @@ yyreduce: case 152: /* Line 1787 of yacc.c */ -#line 1077 "conf_parser.y" +#line 1076 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf)); @@ -3995,7 +3992,7 @@ yyreduce: case 153: /* Line 1787 of yacc.c */ -#line 1083 "conf_parser.y" +#line 1082 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); @@ -4004,7 +4001,7 @@ yyreduce: case 154: /* Line 1787 of yacc.c */ -#line 1089 "conf_parser.y" +#line 1088 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value = 0; @@ -4013,7 +4010,7 @@ yyreduce: case 158: /* Line 1787 of yacc.c */ -#line 1096 "conf_parser.y" +#line 1095 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_BOTS; @@ -4022,7 +4019,7 @@ yyreduce: case 159: /* Line 1787 of yacc.c */ -#line 1100 "conf_parser.y" +#line 1099 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CCONN; @@ -4031,7 +4028,7 @@ yyreduce: case 160: /* Line 1787 of yacc.c */ -#line 1104 "conf_parser.y" +#line 1103 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CCONN_FULL; @@ -4040,7 +4037,7 @@ yyreduce: case 161: /* Line 1787 of yacc.c */ -#line 1108 "conf_parser.y" +#line 1107 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_DEAF; @@ -4049,7 +4046,7 @@ yyreduce: case 162: /* Line 1787 of yacc.c */ -#line 1112 "conf_parser.y" +#line 1111 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_DEBUG; @@ -4058,7 +4055,7 @@ yyreduce: case 163: /* Line 1787 of yacc.c */ -#line 1116 "conf_parser.y" +#line 1115 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_FULL; @@ -4067,7 +4064,7 @@ yyreduce: case 164: /* Line 1787 of yacc.c */ -#line 1120 "conf_parser.y" +#line 1119 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_HIDDEN; @@ -4076,7 +4073,7 @@ yyreduce: case 165: /* Line 1787 of yacc.c */ -#line 1124 "conf_parser.y" +#line 1123 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SKILL; @@ -4085,7 +4082,7 @@ yyreduce: case 166: /* Line 1787 of yacc.c */ -#line 1128 "conf_parser.y" +#line 1127 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_NCHANGE; @@ -4094,7 +4091,7 @@ yyreduce: case 167: /* Line 1787 of yacc.c */ -#line 1132 "conf_parser.y" +#line 1131 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_REJ; @@ -4103,7 +4100,7 @@ yyreduce: case 168: /* Line 1787 of yacc.c */ -#line 1136 "conf_parser.y" +#line 1135 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_UNAUTH; @@ -4112,7 +4109,7 @@ yyreduce: case 169: /* Line 1787 of yacc.c */ -#line 1140 "conf_parser.y" +#line 1139 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SPY; @@ -4121,7 +4118,7 @@ yyreduce: case 170: /* Line 1787 of yacc.c */ -#line 1144 "conf_parser.y" +#line 1143 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_EXTERNAL; @@ -4130,7 +4127,7 @@ yyreduce: case 171: /* Line 1787 of yacc.c */ -#line 1148 "conf_parser.y" +#line 1147 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_OPERWALL; @@ -4139,7 +4136,7 @@ yyreduce: case 172: /* Line 1787 of yacc.c */ -#line 1152 "conf_parser.y" +#line 1151 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SERVNOTICE; @@ -4148,7 +4145,7 @@ yyreduce: case 173: /* Line 1787 of yacc.c */ -#line 1156 "conf_parser.y" +#line 1155 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_INVISIBLE; @@ -4157,7 +4154,7 @@ yyreduce: case 174: /* Line 1787 of yacc.c */ -#line 1160 "conf_parser.y" +#line 1159 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_WALLOP; @@ -4166,7 +4163,7 @@ yyreduce: case 175: /* Line 1787 of yacc.c */ -#line 1164 "conf_parser.y" +#line 1163 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SOFTCALLERID; @@ -4175,7 +4172,7 @@ yyreduce: case 176: /* Line 1787 of yacc.c */ -#line 1168 "conf_parser.y" +#line 1167 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CALLERID; @@ -4184,7 +4181,7 @@ yyreduce: case 177: /* Line 1787 of yacc.c */ -#line 1172 "conf_parser.y" +#line 1171 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_LOCOPS; @@ -4193,7 +4190,7 @@ yyreduce: case 178: /* Line 1787 of yacc.c */ -#line 1176 "conf_parser.y" +#line 1175 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_REGONLY; @@ -4202,7 +4199,7 @@ yyreduce: case 179: /* Line 1787 of yacc.c */ -#line 1180 "conf_parser.y" +#line 1179 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_FARCONNECT; @@ -4211,7 +4208,7 @@ yyreduce: case 180: /* Line 1787 of yacc.c */ -#line 1186 "conf_parser.y" +#line 1185 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 0; @@ -4220,7 +4217,7 @@ yyreduce: case 184: /* Line 1787 of yacc.c */ -#line 1193 "conf_parser.y" +#line 1192 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLOBAL_KILL; @@ -4229,7 +4226,7 @@ yyreduce: case 185: /* Line 1787 of yacc.c */ -#line 1197 "conf_parser.y" +#line 1196 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REMOTE; @@ -4238,7 +4235,7 @@ yyreduce: case 186: /* Line 1787 of yacc.c */ -#line 1201 "conf_parser.y" +#line 1200 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_K; @@ -4247,7 +4244,7 @@ yyreduce: case 187: /* Line 1787 of yacc.c */ -#line 1205 "conf_parser.y" +#line 1204 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_UNKLINE; @@ -4256,7 +4253,7 @@ yyreduce: case 188: /* Line 1787 of yacc.c */ -#line 1209 "conf_parser.y" +#line 1208 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_DLINE; @@ -4265,7 +4262,7 @@ yyreduce: case 189: /* Line 1787 of yacc.c */ -#line 1213 "conf_parser.y" +#line 1212 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_UNDLINE; @@ -4274,7 +4271,7 @@ yyreduce: case 190: /* Line 1787 of yacc.c */ -#line 1217 "conf_parser.y" +#line 1216 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_X; @@ -4283,7 +4280,7 @@ yyreduce: case 191: /* Line 1787 of yacc.c */ -#line 1221 "conf_parser.y" +#line 1220 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLINE; @@ -4292,7 +4289,7 @@ yyreduce: case 192: /* Line 1787 of yacc.c */ -#line 1225 "conf_parser.y" +#line 1224 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_DIE; @@ -4301,7 +4298,7 @@ yyreduce: case 193: /* Line 1787 of yacc.c */ -#line 1229 "conf_parser.y" +#line 1228 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_RESTART; @@ -4310,7 +4307,7 @@ yyreduce: case 194: /* Line 1787 of yacc.c */ -#line 1233 "conf_parser.y" +#line 1232 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REHASH; @@ -4319,7 +4316,7 @@ yyreduce: case 195: /* Line 1787 of yacc.c */ -#line 1237 "conf_parser.y" +#line 1236 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_ADMIN; @@ -4328,7 +4325,7 @@ yyreduce: case 196: /* Line 1787 of yacc.c */ -#line 1241 "conf_parser.y" +#line 1240 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_OPERWALL; @@ -4337,7 +4334,7 @@ yyreduce: case 197: /* Line 1787 of yacc.c */ -#line 1245 "conf_parser.y" +#line 1244 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLOBOPS; @@ -4346,43 +4343,34 @@ yyreduce: case 198: /* Line 1787 of yacc.c */ -#line 1249 "conf_parser.y" - { - if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_OPER_SPY; -} - break; - - case 199: -/* Line 1787 of yacc.c */ -#line 1253 "conf_parser.y" +#line 1248 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REMOTEBAN; } break; - case 200: + case 199: /* Line 1787 of yacc.c */ -#line 1257 "conf_parser.y" +#line 1252 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_SET; } break; - case 201: + case 200: /* Line 1787 of yacc.c */ -#line 1261 "conf_parser.y" +#line 1256 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_MODULE; } break; - case 202: + case 201: /* Line 1787 of yacc.c */ -#line 1271 "conf_parser.y" +#line 1266 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4397,9 +4385,9 @@ yyreduce: } break; - case 203: + case 202: /* Line 1787 of yacc.c */ -#line 1283 "conf_parser.y" +#line 1278 "conf_parser.y" { struct ClassItem *class = NULL; @@ -4449,90 +4437,90 @@ yyreduce: } break; - case 223: + case 222: /* Line 1787 of yacc.c */ -#line 1349 "conf_parser.y" +#line 1344 "conf_parser.y" { if (conf_parser_ctx.pass == 1) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 224: + case 223: /* Line 1787 of yacc.c */ -#line 1355 "conf_parser.y" +#line 1350 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.ping_freq.value = (yyvsp[(3) - (4)].number); } break; - case 225: + case 224: /* Line 1787 of yacc.c */ -#line 1361 "conf_parser.y" +#line 1356 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_perip.value = (yyvsp[(3) - (4)].number); } break; - case 226: + case 225: /* Line 1787 of yacc.c */ -#line 1367 "conf_parser.y" +#line 1362 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.con_freq.value = (yyvsp[(3) - (4)].number); } break; - case 227: + case 226: /* Line 1787 of yacc.c */ -#line 1373 "conf_parser.y" +#line 1368 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_total.value = (yyvsp[(3) - (4)].number); } break; - case 228: + case 227: /* Line 1787 of yacc.c */ -#line 1379 "conf_parser.y" +#line 1374 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_global.value = (yyvsp[(3) - (4)].number); } break; - case 229: + case 228: /* Line 1787 of yacc.c */ -#line 1385 "conf_parser.y" +#line 1380 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_local.value = (yyvsp[(3) - (4)].number); } break; - case 230: + case 229: /* Line 1787 of yacc.c */ -#line 1391 "conf_parser.y" +#line 1386 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_ident.value = (yyvsp[(3) - (4)].number); } break; - case 231: + case 230: /* Line 1787 of yacc.c */ -#line 1397 "conf_parser.y" +#line 1392 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_sendq.value = (yyvsp[(3) - (4)].number); } break; - case 232: + case 231: /* Line 1787 of yacc.c */ -#line 1403 "conf_parser.y" +#line 1398 "conf_parser.y" { if (conf_parser_ctx.pass == 1) if ((yyvsp[(3) - (4)].number) >= CLIENT_FLOOD_MIN && (yyvsp[(3) - (4)].number) <= CLIENT_FLOOD_MAX) @@ -4540,36 +4528,36 @@ yyreduce: } break; - case 233: + case 232: /* Line 1787 of yacc.c */ -#line 1410 "conf_parser.y" +#line 1405 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.cidr_bitlen_ipv4.value = (yyvsp[(3) - (4)].number) > 32 ? 32 : (yyvsp[(3) - (4)].number); } break; - case 234: + case 233: /* Line 1787 of yacc.c */ -#line 1416 "conf_parser.y" +#line 1411 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.cidr_bitlen_ipv6.value = (yyvsp[(3) - (4)].number) > 128 ? 128 : (yyvsp[(3) - (4)].number); } break; - case 235: + case 234: /* Line 1787 of yacc.c */ -#line 1422 "conf_parser.y" +#line 1417 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.number_per_cidr.value = (yyvsp[(3) - (4)].number); } break; - case 236: + case 235: /* Line 1787 of yacc.c */ -#line 1428 "conf_parser.y" +#line 1423 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4579,9 +4567,9 @@ yyreduce: } break; - case 237: + case 236: /* Line 1787 of yacc.c */ -#line 1437 "conf_parser.y" +#line 1432 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4591,86 +4579,86 @@ yyreduce: } break; - case 238: + case 237: /* Line 1787 of yacc.c */ -#line 1446 "conf_parser.y" +#line 1441 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE; } break; - case 242: + case 241: /* Line 1787 of yacc.c */ -#line 1453 "conf_parser.y" +#line 1448 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE; } break; - case 243: + case 242: /* Line 1787 of yacc.c */ -#line 1457 "conf_parser.y" +#line 1452 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS; } break; - case 244: + case 243: /* Line 1787 of yacc.c */ -#line 1467 "conf_parser.y" +#line 1462 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 246: + case 245: /* Line 1787 of yacc.c */ -#line 1473 "conf_parser.y" +#line 1468 "conf_parser.y" { block_state.flags.value = 0; } break; - case 250: + case 249: /* Line 1787 of yacc.c */ -#line 1479 "conf_parser.y" +#line 1474 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_SSL; } break; - case 251: + case 250: /* Line 1787 of yacc.c */ -#line 1483 "conf_parser.y" +#line 1478 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_HIDDEN; } break; - case 252: + case 251: /* Line 1787 of yacc.c */ -#line 1487 "conf_parser.y" +#line 1482 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_SERVER; } break; - case 260: + case 259: /* Line 1787 of yacc.c */ -#line 1495 "conf_parser.y" +#line 1490 "conf_parser.y" { block_state.flags.value = 0; } break; - case 264: + case 263: /* Line 1787 of yacc.c */ -#line 1500 "conf_parser.y" +#line 1495 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4687,9 +4675,9 @@ yyreduce: } break; - case 265: + case 264: /* Line 1787 of yacc.c */ -#line 1514 "conf_parser.y" +#line 1509 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4710,36 +4698,36 @@ yyreduce: } break; - case 266: + case 265: /* Line 1787 of yacc.c */ -#line 1534 "conf_parser.y" +#line 1529 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 267: + case 266: /* Line 1787 of yacc.c */ -#line 1540 "conf_parser.y" +#line 1535 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 268: + case 267: /* Line 1787 of yacc.c */ -#line 1549 "conf_parser.y" +#line 1544 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 269: + case 268: /* Line 1787 of yacc.c */ -#line 1553 "conf_parser.y" +#line 1548 "conf_parser.y" { dlink_node *ptr = NULL; @@ -4778,36 +4766,36 @@ yyreduce: } break; - case 281: + case 280: /* Line 1787 of yacc.c */ -#line 1596 "conf_parser.y" +#line 1591 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); } break; - case 282: + case 281: /* Line 1787 of yacc.c */ -#line 1602 "conf_parser.y" +#line 1597 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 283: + case 282: /* Line 1787 of yacc.c */ -#line 1608 "conf_parser.y" +#line 1603 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 284: + case 283: /* Line 1787 of yacc.c */ -#line 1614 "conf_parser.y" +#line 1609 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4819,108 +4807,108 @@ yyreduce: } break; - case 285: + case 284: /* Line 1787 of yacc.c */ -#line 1625 "conf_parser.y" +#line 1620 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } break; - case 289: + case 288: /* Line 1787 of yacc.c */ -#line 1632 "conf_parser.y" +#line 1627 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE; } break; - case 290: + case 289: /* Line 1787 of yacc.c */ -#line 1636 "conf_parser.y" +#line 1631 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NOLIMIT; } break; - case 291: + case 290: /* Line 1787 of yacc.c */ -#line 1640 "conf_parser.y" +#line 1635 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE; } break; - case 292: + case 291: /* Line 1787 of yacc.c */ -#line 1644 "conf_parser.y" +#line 1639 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NEED_IDENTD; } break; - case 293: + case 292: /* Line 1787 of yacc.c */ -#line 1648 "conf_parser.y" +#line 1643 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_CAN_FLOOD; } break; - case 294: + case 293: /* Line 1787 of yacc.c */ -#line 1652 "conf_parser.y" +#line 1647 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NO_TILDE; } break; - case 295: + case 294: /* Line 1787 of yacc.c */ -#line 1656 "conf_parser.y" +#line 1651 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE; } break; - case 296: + case 295: /* Line 1787 of yacc.c */ -#line 1660 "conf_parser.y" +#line 1655 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTRESV; } break; - case 297: + case 296: /* Line 1787 of yacc.c */ -#line 1664 "conf_parser.y" +#line 1659 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_WEBIRC; } break; - case 298: + case 297: /* Line 1787 of yacc.c */ -#line 1668 "conf_parser.y" +#line 1663 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD; } break; - case 299: + case 298: /* Line 1787 of yacc.c */ -#line 1674 "conf_parser.y" +#line 1669 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4935,9 +4923,9 @@ yyreduce: } break; - case 300: + case 299: /* Line 1787 of yacc.c */ -#line 1688 "conf_parser.y" +#line 1683 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4947,9 +4935,9 @@ yyreduce: } break; - case 301: + case 300: /* Line 1787 of yacc.c */ -#line 1697 "conf_parser.y" +#line 1692 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4959,9 +4947,9 @@ yyreduce: } break; - case 302: + case 301: /* Line 1787 of yacc.c */ -#line 1710 "conf_parser.y" +#line 1705 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4971,9 +4959,9 @@ yyreduce: } break; - case 303: + case 302: /* Line 1787 of yacc.c */ -#line 1717 "conf_parser.y" +#line 1712 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4982,36 +4970,36 @@ yyreduce: } break; - case 310: + case 309: /* Line 1787 of yacc.c */ -#line 1728 "conf_parser.y" +#line 1723 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 311: + case 310: /* Line 1787 of yacc.c */ -#line 1734 "conf_parser.y" +#line 1729 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 312: + case 311: /* Line 1787 of yacc.c */ -#line 1740 "conf_parser.y" +#line 1735 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); } break; - case 318: + case 317: /* Line 1787 of yacc.c */ -#line 1755 "conf_parser.y" +#line 1750 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5024,9 +5012,9 @@ yyreduce: } break; - case 319: + case 318: /* Line 1787 of yacc.c */ -#line 1770 "conf_parser.y" +#line 1765 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5040,9 +5028,9 @@ yyreduce: } break; - case 320: + case 319: /* Line 1787 of yacc.c */ -#line 1781 "conf_parser.y" +#line 1776 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5057,18 +5045,18 @@ yyreduce: } break; - case 327: + case 326: /* Line 1787 of yacc.c */ -#line 1798 "conf_parser.y" +#line 1793 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 328: + case 327: /* Line 1787 of yacc.c */ -#line 1804 "conf_parser.y" +#line 1799 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5088,108 +5076,108 @@ yyreduce: } break; - case 329: + case 328: /* Line 1787 of yacc.c */ -#line 1823 "conf_parser.y" +#line 1818 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = 0; } break; - case 333: + case 332: /* Line 1787 of yacc.c */ -#line 1830 "conf_parser.y" +#line 1825 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_KLINE; } break; - case 334: + case 333: /* Line 1787 of yacc.c */ -#line 1834 "conf_parser.y" +#line 1829 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNKLINE; } break; - case 335: + case 334: /* Line 1787 of yacc.c */ -#line 1838 "conf_parser.y" +#line 1833 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_DLINE; } break; - case 336: + case 335: /* Line 1787 of yacc.c */ -#line 1842 "conf_parser.y" +#line 1837 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNDLINE; } break; - case 337: + case 336: /* Line 1787 of yacc.c */ -#line 1846 "conf_parser.y" +#line 1841 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_XLINE; } break; - case 338: + case 337: /* Line 1787 of yacc.c */ -#line 1850 "conf_parser.y" +#line 1845 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNXLINE; } break; - case 339: + case 338: /* Line 1787 of yacc.c */ -#line 1854 "conf_parser.y" +#line 1849 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_RESV; } break; - case 340: + case 339: /* Line 1787 of yacc.c */ -#line 1858 "conf_parser.y" +#line 1853 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNRESV; } break; - case 341: + case 340: /* Line 1787 of yacc.c */ -#line 1862 "conf_parser.y" +#line 1857 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_LOCOPS; } break; - case 342: + case 341: /* Line 1787 of yacc.c */ -#line 1866 "conf_parser.y" +#line 1861 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = SHARED_ALL; } break; - case 343: + case 342: /* Line 1787 of yacc.c */ -#line 1875 "conf_parser.y" +#line 1870 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5201,9 +5189,9 @@ yyreduce: } break; - case 344: + case 343: /* Line 1787 of yacc.c */ -#line 1884 "conf_parser.y" +#line 1879 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5216,117 +5204,117 @@ yyreduce: } break; - case 350: + case 349: /* Line 1787 of yacc.c */ -#line 1899 "conf_parser.y" +#line 1894 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 351: + case 350: /* Line 1787 of yacc.c */ -#line 1905 "conf_parser.y" +#line 1900 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = 0; } break; - case 355: + case 354: /* Line 1787 of yacc.c */ -#line 1912 "conf_parser.y" +#line 1907 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_KLINE; } break; - case 356: + case 355: /* Line 1787 of yacc.c */ -#line 1916 "conf_parser.y" +#line 1911 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNKLINE; } break; - case 357: + case 356: /* Line 1787 of yacc.c */ -#line 1920 "conf_parser.y" +#line 1915 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_DLINE; } break; - case 358: + case 357: /* Line 1787 of yacc.c */ -#line 1924 "conf_parser.y" +#line 1919 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNDLINE; } break; - case 359: + case 358: /* Line 1787 of yacc.c */ -#line 1928 "conf_parser.y" +#line 1923 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_XLINE; } break; - case 360: + case 359: /* Line 1787 of yacc.c */ -#line 1932 "conf_parser.y" +#line 1927 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNXLINE; } break; - case 361: + case 360: /* Line 1787 of yacc.c */ -#line 1936 "conf_parser.y" +#line 1931 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_RESV; } break; - case 362: + case 361: /* Line 1787 of yacc.c */ -#line 1940 "conf_parser.y" +#line 1935 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNRESV; } break; - case 363: + case 362: /* Line 1787 of yacc.c */ -#line 1944 "conf_parser.y" +#line 1939 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_LOCOPS; } break; - case 364: + case 363: /* Line 1787 of yacc.c */ -#line 1948 "conf_parser.y" +#line 1943 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = SHARED_ALL; } break; - case 365: + case 364: /* Line 1787 of yacc.c */ -#line 1957 "conf_parser.y" +#line 1952 "conf_parser.y" { if (conf_parser_ctx.pass != 2) @@ -5337,9 +5325,9 @@ yyreduce: } break; - case 366: + case 365: /* Line 1787 of yacc.c */ -#line 1965 "conf_parser.y" +#line 1960 "conf_parser.y" { struct MaskItem *conf = NULL; struct addrinfo hints, *res; @@ -5398,36 +5386,36 @@ yyreduce: } break; - case 383: + case 382: /* Line 1787 of yacc.c */ -#line 2031 "conf_parser.y" +#line 2026 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 384: + case 383: /* Line 1787 of yacc.c */ -#line 2037 "conf_parser.y" +#line 2032 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf)); } break; - case 385: + case 384: /* Line 1787 of yacc.c */ -#line 2043 "conf_parser.y" +#line 2038 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf)); } break; - case 386: + case 385: /* Line 1787 of yacc.c */ -#line 2049 "conf_parser.y" +#line 2044 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5441,9 +5429,9 @@ yyreduce: } break; - case 387: + case 386: /* Line 1787 of yacc.c */ -#line 2062 "conf_parser.y" +#line 2057 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5457,27 +5445,27 @@ yyreduce: } break; - case 388: + case 387: /* Line 1787 of yacc.c */ -#line 2075 "conf_parser.y" +#line 2070 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = (yyvsp[(3) - (4)].number); } break; - case 389: + case 388: /* Line 1787 of yacc.c */ -#line 2081 "conf_parser.y" +#line 2076 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.aftype.value = AF_INET; } break; - case 390: + case 389: /* Line 1787 of yacc.c */ -#line 2085 "conf_parser.y" +#line 2080 "conf_parser.y" { #ifdef IPV6 if (conf_parser_ctx.pass == 2) @@ -5486,35 +5474,35 @@ yyreduce: } break; - case 391: + case 390: /* Line 1787 of yacc.c */ -#line 2093 "conf_parser.y" +#line 2088 "conf_parser.y" { block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } break; - case 395: + case 394: /* Line 1787 of yacc.c */ -#line 2099 "conf_parser.y" +#line 2094 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN; } break; - case 396: + case 395: /* Line 1787 of yacc.c */ -#line 2103 "conf_parser.y" +#line 2098 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SSL; } break; - case 397: + case 396: /* Line 1787 of yacc.c */ -#line 2109 "conf_parser.y" +#line 2104 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5526,36 +5514,36 @@ yyreduce: } break; - case 398: + case 397: /* Line 1787 of yacc.c */ -#line 2120 "conf_parser.y" +#line 2115 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list); } break; - case 399: + case 398: /* Line 1787 of yacc.c */ -#line 2126 "conf_parser.y" +#line 2121 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list); } break; - case 400: + case 399: /* Line 1787 of yacc.c */ -#line 2132 "conf_parser.y" +#line 2127 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 401: + case 400: /* Line 1787 of yacc.c */ -#line 2138 "conf_parser.y" +#line 2133 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2) @@ -5567,18 +5555,18 @@ yyreduce: } break; - case 402: + case 401: /* Line 1787 of yacc.c */ -#line 2153 "conf_parser.y" +#line 2148 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 403: + case 402: /* Line 1787 of yacc.c */ -#line 2157 "conf_parser.y" +#line 2152 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5601,9 +5589,9 @@ yyreduce: } break; - case 409: + case 408: /* Line 1787 of yacc.c */ -#line 2182 "conf_parser.y" +#line 2177 "conf_parser.y" { if (conf_parser_ctx.pass == 2) @@ -5624,27 +5612,27 @@ yyreduce: } break; - case 410: + case 409: /* Line 1787 of yacc.c */ -#line 2202 "conf_parser.y" +#line 2197 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 411: + case 410: /* Line 1787 of yacc.c */ -#line 2211 "conf_parser.y" +#line 2206 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 412: + case 411: /* Line 1787 of yacc.c */ -#line 2215 "conf_parser.y" +#line 2210 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5668,27 +5656,27 @@ yyreduce: } break; - case 418: + case 417: /* Line 1787 of yacc.c */ -#line 2241 "conf_parser.y" +#line 2236 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 419: + case 418: /* Line 1787 of yacc.c */ -#line 2247 "conf_parser.y" +#line 2242 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 425: + case 424: /* Line 1787 of yacc.c */ -#line 2261 "conf_parser.y" +#line 2256 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5703,18 +5691,18 @@ yyreduce: } break; - case 426: + case 425: /* Line 1787 of yacc.c */ -#line 2278 "conf_parser.y" +#line 2273 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 427: + case 426: /* Line 1787 of yacc.c */ -#line 2282 "conf_parser.y" +#line 2277 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5734,64 +5722,72 @@ yyreduce: } break; - case 433: + case 432: /* Line 1787 of yacc.c */ -#line 2304 "conf_parser.y" +#line 2299 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 434: + case 433: /* Line 1787 of yacc.c */ -#line 2310 "conf_parser.y" +#line 2305 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 487: + case 486: /* Line 1787 of yacc.c */ -#line 2354 "conf_parser.y" +#line 2349 "conf_parser.y" { ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number); } break; - case 488: + case 487: /* Line 1787 of yacc.c */ -#line 2359 "conf_parser.y" +#line 2354 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.glines = yylval.number; } break; - case 489: + case 488: /* Line 1787 of yacc.c */ -#line 2365 "conf_parser.y" +#line 2360 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number); } break; - case 490: + case 489: /* Line 1787 of yacc.c */ -#line 2371 "conf_parser.y" +#line 2366 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number); } break; + case 490: +/* Line 1787 of yacc.c */ +#line 2372 "conf_parser.y" + { + ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number); +} + break; + case 491: /* Line 1787 of yacc.c */ #line 2377 "conf_parser.y" { - ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number); + ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number); } break; @@ -5799,7 +5795,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2382 "conf_parser.y" { - ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number); + ConfigFileEntry.tkline_expire_notices = yylval.number; } break; @@ -5807,7 +5803,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2387 "conf_parser.y" { - ConfigFileEntry.tkline_expire_notices = yylval.number; + ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number); } break; @@ -5815,7 +5811,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2392 "conf_parser.y" { - ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number); + ConfigFileEntry.hide_spoof_ips = yylval.number; } break; @@ -5823,7 +5819,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2397 "conf_parser.y" { - ConfigFileEntry.hide_spoof_ips = yylval.number; + ConfigFileEntry.ignore_bogus_ts = yylval.number; } break; @@ -5831,7 +5827,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2402 "conf_parser.y" { - ConfigFileEntry.ignore_bogus_ts = yylval.number; + ConfigFileEntry.disable_remote = yylval.number; } break; @@ -5839,7 +5835,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2407 "conf_parser.y" { - ConfigFileEntry.disable_remote = yylval.number; + ConfigFileEntry.failed_oper_notice = yylval.number; } break; @@ -5847,7 +5843,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2412 "conf_parser.y" { - ConfigFileEntry.failed_oper_notice = yylval.number; + ConfigFileEntry.anti_nick_flood = yylval.number; } break; @@ -5855,7 +5851,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2417 "conf_parser.y" { - ConfigFileEntry.anti_nick_flood = yylval.number; + ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); } break; @@ -5863,7 +5859,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2422 "conf_parser.y" { - ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); + ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number); } break; @@ -5871,7 +5867,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2427 "conf_parser.y" { - ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number); + ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number); } break; @@ -5879,7 +5875,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2432 "conf_parser.y" { - ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number); + ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number); } break; @@ -5887,7 +5883,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2437 "conf_parser.y" { - ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number); + ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number); } break; @@ -5895,22 +5891,14 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2442 "conf_parser.y" { - ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number); -} - break; - - case 505: -/* Line 1787 of yacc.c */ -#line 2447 "conf_parser.y" - { if (conf_parser_ctx.pass == 2) ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number); } break; - case 506: + case 505: /* Line 1787 of yacc.c */ -#line 2453 "conf_parser.y" +#line 2448 "conf_parser.y" { if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1) { @@ -5922,11 +5910,19 @@ yyreduce: } break; + case 506: +/* Line 1787 of yacc.c */ +#line 2459 "conf_parser.y" + { + ConfigFileEntry.invisible_on_connect = yylval.number; +} + break; + case 507: /* Line 1787 of yacc.c */ #line 2464 "conf_parser.y" { - ConfigFileEntry.invisible_on_connect = yylval.number; + ConfigFileEntry.warn_no_nline = yylval.number; } break; @@ -5934,7 +5930,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2469 "conf_parser.y" { - ConfigFileEntry.warn_no_nline = yylval.number; + ConfigFileEntry.stats_e_disabled = yylval.number; } break; @@ -5942,7 +5938,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2474 "conf_parser.y" { - ConfigFileEntry.stats_e_disabled = yylval.number; + ConfigFileEntry.stats_o_oper_only = yylval.number; } break; @@ -5950,7 +5946,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2479 "conf_parser.y" { - ConfigFileEntry.stats_o_oper_only = yylval.number; + ConfigFileEntry.stats_P_oper_only = yylval.number; } break; @@ -5958,15 +5954,15 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2484 "conf_parser.y" { - ConfigFileEntry.stats_P_oper_only = yylval.number; + ConfigFileEntry.stats_k_oper_only = 2 * yylval.number; } break; case 512: /* Line 1787 of yacc.c */ -#line 2489 "conf_parser.y" +#line 2487 "conf_parser.y" { - ConfigFileEntry.stats_k_oper_only = 2 * yylval.number; + ConfigFileEntry.stats_k_oper_only = 1; } break; @@ -5974,15 +5970,15 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2492 "conf_parser.y" { - ConfigFileEntry.stats_k_oper_only = 1; + ConfigFileEntry.stats_i_oper_only = 2 * yylval.number; } break; case 514: /* Line 1787 of yacc.c */ -#line 2497 "conf_parser.y" +#line 2495 "conf_parser.y" { - ConfigFileEntry.stats_i_oper_only = 2 * yylval.number; + ConfigFileEntry.stats_i_oper_only = 1; } break; @@ -5990,7 +5986,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2500 "conf_parser.y" { - ConfigFileEntry.stats_i_oper_only = 1; + ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number); } break; @@ -5998,7 +5994,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2505 "conf_parser.y" { - ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number); + ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number); } break; @@ -6006,7 +6002,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2510 "conf_parser.y" { - ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number); + ConfigFileEntry.opers_bypass_callerid = yylval.number; } break; @@ -6014,7 +6010,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2515 "conf_parser.y" { - ConfigFileEntry.opers_bypass_callerid = yylval.number; + ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number); } break; @@ -6022,7 +6018,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2520 "conf_parser.y" { - ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number); + ConfigFileEntry.short_motd = yylval.number; } break; @@ -6030,7 +6026,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2525 "conf_parser.y" { - ConfigFileEntry.short_motd = yylval.number; + ConfigFileEntry.no_oper_flood = yylval.number; } break; @@ -6038,7 +6034,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2530 "conf_parser.y" { - ConfigFileEntry.no_oper_flood = yylval.number; + ConfigFileEntry.true_no_oper_flood = yylval.number; } break; @@ -6046,7 +6042,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2535 "conf_parser.y" { - ConfigFileEntry.true_no_oper_flood = yylval.number; + ConfigFileEntry.oper_pass_resv = yylval.number; } break; @@ -6054,7 +6050,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2540 "conf_parser.y" { - ConfigFileEntry.oper_pass_resv = yylval.number; + ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number); } break; @@ -6062,7 +6058,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2545 "conf_parser.y" { - ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number); + ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number); } break; @@ -6070,7 +6066,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2550 "conf_parser.y" { - ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number); + ConfigFileEntry.use_egd = yylval.number; } break; @@ -6078,14 +6074,6 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2555 "conf_parser.y" { - ConfigFileEntry.use_egd = yylval.number; -} - break; - - case 527: -/* Line 1787 of yacc.c */ -#line 2560 "conf_parser.y" - { if (conf_parser_ctx.pass == 2) { MyFree(ConfigFileEntry.egdpool_path); @@ -6094,9 +6082,9 @@ yyreduce: } break; - case 528: + case 527: /* Line 1787 of yacc.c */ -#line 2569 "conf_parser.y" +#line 2564 "conf_parser.y" { if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string)) { @@ -6106,395 +6094,403 @@ yyreduce: } break; - case 529: + case 528: /* Line 1787 of yacc.c */ -#line 2578 "conf_parser.y" +#line 2573 "conf_parser.y" { ConfigFileEntry.ping_cookie = yylval.number; } break; - case 530: + case 529: /* Line 1787 of yacc.c */ -#line 2583 "conf_parser.y" +#line 2578 "conf_parser.y" { ConfigFileEntry.disable_auth = yylval.number; } break; - case 531: + case 530: /* Line 1787 of yacc.c */ -#line 2588 "conf_parser.y" +#line 2583 "conf_parser.y" { ConfigFileEntry.throttle_time = yylval.number; } break; - case 532: + case 531: /* Line 1787 of yacc.c */ -#line 2593 "conf_parser.y" +#line 2588 "conf_parser.y" { ConfigFileEntry.oper_umodes = 0; } break; - case 536: + case 535: /* Line 1787 of yacc.c */ -#line 2599 "conf_parser.y" +#line 2594 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_BOTS; } break; - case 537: + case 536: /* Line 1787 of yacc.c */ -#line 2602 "conf_parser.y" +#line 2597 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CCONN; } break; - case 538: + case 537: /* Line 1787 of yacc.c */ -#line 2605 "conf_parser.y" +#line 2600 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL; } break; - case 539: + case 538: /* Line 1787 of yacc.c */ -#line 2608 "conf_parser.y" +#line 2603 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_DEAF; } break; - case 540: + case 539: /* Line 1787 of yacc.c */ -#line 2611 "conf_parser.y" +#line 2606 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_DEBUG; } break; - case 541: + case 540: /* Line 1787 of yacc.c */ -#line 2614 "conf_parser.y" +#line 2609 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_FULL; } break; - case 542: + case 541: /* Line 1787 of yacc.c */ -#line 2617 "conf_parser.y" +#line 2612 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_HIDDEN; } break; - case 543: + case 542: /* Line 1787 of yacc.c */ -#line 2620 "conf_parser.y" +#line 2615 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SKILL; } break; - case 544: + case 543: /* Line 1787 of yacc.c */ -#line 2623 "conf_parser.y" +#line 2618 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_NCHANGE; } break; - case 545: + case 544: /* Line 1787 of yacc.c */ -#line 2626 "conf_parser.y" +#line 2621 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_REJ; } break; - case 546: + case 545: /* Line 1787 of yacc.c */ -#line 2629 "conf_parser.y" +#line 2624 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_UNAUTH; } break; - case 547: + case 546: /* Line 1787 of yacc.c */ -#line 2632 "conf_parser.y" +#line 2627 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SPY; } break; - case 548: + case 547: /* Line 1787 of yacc.c */ -#line 2635 "conf_parser.y" +#line 2630 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL; } break; - case 549: + case 548: /* Line 1787 of yacc.c */ -#line 2638 "conf_parser.y" +#line 2633 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_OPERWALL; } break; - case 550: + case 549: /* Line 1787 of yacc.c */ -#line 2641 "conf_parser.y" +#line 2636 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE; } break; - case 551: + case 550: /* Line 1787 of yacc.c */ -#line 2644 "conf_parser.y" +#line 2639 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE; } break; - case 552: + case 551: /* Line 1787 of yacc.c */ -#line 2647 "conf_parser.y" +#line 2642 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_WALLOP; } break; - case 553: + case 552: /* Line 1787 of yacc.c */ -#line 2650 "conf_parser.y" +#line 2645 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID; } break; - case 554: + case 553: /* Line 1787 of yacc.c */ -#line 2653 "conf_parser.y" +#line 2648 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CALLERID; } break; - case 555: + case 554: /* Line 1787 of yacc.c */ -#line 2656 "conf_parser.y" +#line 2651 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_LOCOPS; } break; - case 556: + case 555: /* Line 1787 of yacc.c */ -#line 2659 "conf_parser.y" +#line 2654 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_REGONLY; } break; - case 557: + case 556: /* Line 1787 of yacc.c */ -#line 2662 "conf_parser.y" +#line 2657 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT; } break; - case 558: + case 557: /* Line 1787 of yacc.c */ -#line 2667 "conf_parser.y" +#line 2662 "conf_parser.y" { ConfigFileEntry.oper_only_umodes = 0; } break; - case 562: + case 561: /* Line 1787 of yacc.c */ -#line 2673 "conf_parser.y" +#line 2668 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_BOTS; } break; - case 563: + case 562: /* Line 1787 of yacc.c */ -#line 2676 "conf_parser.y" +#line 2671 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CCONN; } break; - case 564: + case 563: /* Line 1787 of yacc.c */ -#line 2679 "conf_parser.y" +#line 2674 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL; } break; - case 565: + case 564: /* Line 1787 of yacc.c */ -#line 2682 "conf_parser.y" +#line 2677 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_DEAF; } break; - case 566: + case 565: /* Line 1787 of yacc.c */ -#line 2685 "conf_parser.y" +#line 2680 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG; } break; - case 567: + case 566: /* Line 1787 of yacc.c */ -#line 2688 "conf_parser.y" +#line 2683 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_FULL; } break; - case 568: + case 567: /* Line 1787 of yacc.c */ -#line 2691 "conf_parser.y" +#line 2686 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SKILL; } break; - case 569: + case 568: /* Line 1787 of yacc.c */ -#line 2694 "conf_parser.y" +#line 2689 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN; } break; - case 570: + case 569: /* Line 1787 of yacc.c */ -#line 2697 "conf_parser.y" +#line 2692 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE; } break; - case 571: + case 570: /* Line 1787 of yacc.c */ -#line 2700 "conf_parser.y" +#line 2695 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_REJ; } break; - case 572: + case 571: /* Line 1787 of yacc.c */ -#line 2703 "conf_parser.y" +#line 2698 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH; } break; - case 573: + case 572: /* Line 1787 of yacc.c */ -#line 2706 "conf_parser.y" +#line 2701 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SPY; } break; - case 574: + case 573: /* Line 1787 of yacc.c */ -#line 2709 "conf_parser.y" +#line 2704 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL; } break; - case 575: + case 574: /* Line 1787 of yacc.c */ -#line 2712 "conf_parser.y" +#line 2707 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL; } break; - case 576: + case 575: /* Line 1787 of yacc.c */ -#line 2715 "conf_parser.y" +#line 2710 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE; } break; - case 577: + case 576: /* Line 1787 of yacc.c */ -#line 2718 "conf_parser.y" +#line 2713 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE; } break; - case 578: + case 577: /* Line 1787 of yacc.c */ -#line 2721 "conf_parser.y" +#line 2716 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP; } break; - case 579: + case 578: /* Line 1787 of yacc.c */ -#line 2724 "conf_parser.y" +#line 2719 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID; } break; - case 580: + case 579: /* Line 1787 of yacc.c */ -#line 2727 "conf_parser.y" +#line 2722 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID; } break; - case 581: + case 580: /* Line 1787 of yacc.c */ -#line 2730 "conf_parser.y" +#line 2725 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS; } break; - case 582: + case 581: /* Line 1787 of yacc.c */ -#line 2733 "conf_parser.y" +#line 2728 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY; } break; + case 582: +/* Line 1787 of yacc.c */ +#line 2731 "conf_parser.y" + { + ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT; +} + break; + case 583: /* Line 1787 of yacc.c */ #line 2736 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT; + ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number); } break; @@ -6502,7 +6498,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2741 "conf_parser.y" { - ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number); + ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number); } break; @@ -6510,15 +6506,15 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2746 "conf_parser.y" { - ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number); + ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number); } break; - case 586: + case 602: /* Line 1787 of yacc.c */ -#line 2751 "conf_parser.y" +#line 2769 "conf_parser.y" { - ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number); + ConfigChannel.disable_fake_channels = yylval.number; } break; @@ -6526,7 +6522,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2774 "conf_parser.y" { - ConfigChannel.disable_fake_channels = yylval.number; + ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number); } break; @@ -6534,7 +6530,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2779 "conf_parser.y" { - ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number); + ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number); } break; @@ -6542,7 +6538,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2784 "conf_parser.y" { - ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number); + ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number); } break; @@ -6550,7 +6546,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2789 "conf_parser.y" { - ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number); + ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number); } break; @@ -6558,7 +6554,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2794 "conf_parser.y" { - ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number); + ConfigChannel.max_bans = (yyvsp[(3) - (4)].number); } break; @@ -6566,7 +6562,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2799 "conf_parser.y" { - ConfigChannel.max_bans = (yyvsp[(3) - (4)].number); + ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number); } break; @@ -6574,7 +6570,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2804 "conf_parser.y" { - ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number); + ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number); } break; @@ -6582,7 +6578,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2809 "conf_parser.y" { - ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number); + ConfigChannel.no_create_on_split = yylval.number; } break; @@ -6590,7 +6586,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2814 "conf_parser.y" { - ConfigChannel.no_create_on_split = yylval.number; + ConfigChannel.no_join_on_split = yylval.number; } break; @@ -6598,7 +6594,7 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2819 "conf_parser.y" { - ConfigChannel.no_join_on_split = yylval.number; + GlobalSetOptions.joinfloodcount = yylval.number; } break; @@ -6606,48 +6602,40 @@ yyreduce: /* Line 1787 of yacc.c */ #line 2824 "conf_parser.y" { - GlobalSetOptions.joinfloodcount = yylval.number; -} - break; - - case 614: -/* Line 1787 of yacc.c */ -#line 2829 "conf_parser.y" - { GlobalSetOptions.joinfloodtime = yylval.number; } break; - case 626: + case 625: /* Line 1787 of yacc.c */ -#line 2848 "conf_parser.y" +#line 2843 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.flatten_links = yylval.number; } break; - case 627: + case 626: /* Line 1787 of yacc.c */ -#line 2854 "conf_parser.y" +#line 2849 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_servers = yylval.number; } break; - case 628: + case 627: /* Line 1787 of yacc.c */ -#line 2860 "conf_parser.y" +#line 2855 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_services = yylval.number; } break; - case 629: + case 628: /* Line 1787 of yacc.c */ -#line 2866 "conf_parser.y" +#line 2861 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6657,9 +6645,9 @@ yyreduce: } break; - case 630: + case 629: /* Line 1787 of yacc.c */ -#line 2875 "conf_parser.y" +#line 2870 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6674,18 +6662,18 @@ yyreduce: } break; - case 631: + case 630: /* Line 1787 of yacc.c */ -#line 2889 "conf_parser.y" +#line 2884 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hidden = yylval.number; } break; - case 632: + case 631: /* Line 1787 of yacc.c */ -#line 2895 "conf_parser.y" +#line 2890 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_server_ips = yylval.number; @@ -6694,7 +6682,7 @@ yyreduce: /* Line 1787 of yacc.c */ -#line 6698 "conf_parser.c" +#line 6686 "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 55a7931..cdcf4f2 100644 --- a/src/conf_parser.h +++ b/src/conf_parser.h @@ -155,116 +155,115 @@ extern int yydebug; OPERS_BYPASS_CALLERID = 364, OPER_ONLY_UMODES = 365, OPER_PASS_RESV = 366, - OPER_SPY_T = 367, - OPER_UMODES = 368, - JOIN_FLOOD_COUNT = 369, - JOIN_FLOOD_TIME = 370, - PACE_WAIT = 371, - PACE_WAIT_SIMPLE = 372, - PASSWORD = 373, - PATH = 374, - PING_COOKIE = 375, - PING_TIME = 376, - PORT = 377, - QSTRING = 378, - REASON = 379, - REDIRPORT = 380, - REDIRSERV = 381, - REHASH = 382, - REMOTE = 383, - REMOTEBAN = 384, - RSA_PRIVATE_KEY_FILE = 385, - RSA_PUBLIC_KEY_FILE = 386, - SSL_CERTIFICATE_FILE = 387, - SSL_DH_PARAM_FILE = 388, - T_SSL_CLIENT_METHOD = 389, - T_SSL_SERVER_METHOD = 390, - T_SSLV3 = 391, - T_TLSV1 = 392, - RESV = 393, - RESV_EXEMPT = 394, - SECONDS = 395, - MINUTES = 396, - HOURS = 397, - DAYS = 398, - WEEKS = 399, - MONTHS = 400, - YEARS = 401, - SENDQ = 402, - SEND_PASSWORD = 403, - SERVERHIDE = 404, - SERVERINFO = 405, - IRCD_SID = 406, - TKLINE_EXPIRE_NOTICES = 407, - T_SHARED = 408, - T_CLUSTER = 409, - TYPE = 410, - SHORT_MOTD = 411, - SPOOF = 412, - SPOOF_NOTICE = 413, - STATS_E_DISABLED = 414, - STATS_I_OPER_ONLY = 415, - STATS_K_OPER_ONLY = 416, - STATS_O_OPER_ONLY = 417, - STATS_P_OPER_ONLY = 418, - TBOOL = 419, - TMASKED = 420, - TS_MAX_DELTA = 421, - TS_WARN_DELTA = 422, - TWODOTS = 423, - T_ALL = 424, - T_BOTS = 425, - T_SOFTCALLERID = 426, - T_CALLERID = 427, - T_CCONN = 428, - T_CCONN_FULL = 429, - T_SSL_CIPHER_LIST = 430, - T_DEAF = 431, - T_DEBUG = 432, - T_DLINE = 433, - T_EXTERNAL = 434, - T_FARCONNECT = 435, - T_FULL = 436, - T_INVISIBLE = 437, - T_IPV4 = 438, - T_IPV6 = 439, - T_LOCOPS = 440, - T_MAX_CLIENTS = 441, - T_NCHANGE = 442, - T_NONONREG = 443, - T_OPERWALL = 444, - T_RECVQ = 445, - T_REJ = 446, - T_SERVER = 447, - T_SERVNOTICE = 448, - T_SET = 449, - T_SKILL = 450, - T_SPY = 451, - T_SSL = 452, - T_UMODES = 453, - T_UNAUTH = 454, - T_UNDLINE = 455, - T_UNLIMITED = 456, - T_UNRESV = 457, - T_UNXLINE = 458, - T_GLOBOPS = 459, - T_WALLOP = 460, - T_WEBIRC = 461, - T_RESTART = 462, - T_SERVICE = 463, - T_SERVICES_NAME = 464, - THROTTLE_TIME = 465, - TRUE_NO_OPER_FLOOD = 466, - UNKLINE = 467, - USER = 468, - USE_EGD = 469, - USE_LOGGING = 470, - VHOST = 471, - VHOST6 = 472, - XLINE = 473, - WARN_NO_NLINE = 474, - T_SIZE = 475, - T_FILE = 476 + OPER_UMODES = 367, + JOIN_FLOOD_COUNT = 368, + JOIN_FLOOD_TIME = 369, + PACE_WAIT = 370, + PACE_WAIT_SIMPLE = 371, + PASSWORD = 372, + PATH = 373, + PING_COOKIE = 374, + PING_TIME = 375, + PORT = 376, + QSTRING = 377, + REASON = 378, + REDIRPORT = 379, + REDIRSERV = 380, + REHASH = 381, + REMOTE = 382, + REMOTEBAN = 383, + RSA_PRIVATE_KEY_FILE = 384, + RSA_PUBLIC_KEY_FILE = 385, + SSL_CERTIFICATE_FILE = 386, + SSL_DH_PARAM_FILE = 387, + T_SSL_CLIENT_METHOD = 388, + T_SSL_SERVER_METHOD = 389, + T_SSLV3 = 390, + T_TLSV1 = 391, + RESV = 392, + RESV_EXEMPT = 393, + SECONDS = 394, + MINUTES = 395, + HOURS = 396, + DAYS = 397, + WEEKS = 398, + MONTHS = 399, + YEARS = 400, + SENDQ = 401, + SEND_PASSWORD = 402, + SERVERHIDE = 403, + SERVERINFO = 404, + IRCD_SID = 405, + TKLINE_EXPIRE_NOTICES = 406, + T_SHARED = 407, + T_CLUSTER = 408, + TYPE = 409, + SHORT_MOTD = 410, + SPOOF = 411, + SPOOF_NOTICE = 412, + STATS_E_DISABLED = 413, + STATS_I_OPER_ONLY = 414, + STATS_K_OPER_ONLY = 415, + STATS_O_OPER_ONLY = 416, + STATS_P_OPER_ONLY = 417, + TBOOL = 418, + TMASKED = 419, + TS_MAX_DELTA = 420, + TS_WARN_DELTA = 421, + TWODOTS = 422, + T_ALL = 423, + T_BOTS = 424, + T_SOFTCALLERID = 425, + T_CALLERID = 426, + T_CCONN = 427, + T_CCONN_FULL = 428, + T_SSL_CIPHER_LIST = 429, + T_DEAF = 430, + T_DEBUG = 431, + T_DLINE = 432, + T_EXTERNAL = 433, + T_FARCONNECT = 434, + T_FULL = 435, + T_INVISIBLE = 436, + T_IPV4 = 437, + T_IPV6 = 438, + T_LOCOPS = 439, + T_MAX_CLIENTS = 440, + T_NCHANGE = 441, + T_NONONREG = 442, + T_OPERWALL = 443, + T_RECVQ = 444, + T_REJ = 445, + T_SERVER = 446, + T_SERVNOTICE = 447, + T_SET = 448, + T_SKILL = 449, + T_SPY = 450, + T_SSL = 451, + T_UMODES = 452, + T_UNAUTH = 453, + T_UNDLINE = 454, + T_UNLIMITED = 455, + T_UNRESV = 456, + T_UNXLINE = 457, + T_GLOBOPS = 458, + T_WALLOP = 459, + T_WEBIRC = 460, + T_RESTART = 461, + T_SERVICE = 462, + T_SERVICES_NAME = 463, + THROTTLE_TIME = 464, + TRUE_NO_OPER_FLOOD = 465, + UNKLINE = 466, + USER = 467, + USE_EGD = 468, + USE_LOGGING = 469, + VHOST = 470, + VHOST6 = 471, + XLINE = 472, + WARN_NO_NLINE = 473, + T_SIZE = 474, + T_FILE = 475 }; #endif /* Tokens. */ @@ -377,116 +376,115 @@ extern int yydebug; #define OPERS_BYPASS_CALLERID 364 #define OPER_ONLY_UMODES 365 #define OPER_PASS_RESV 366 -#define OPER_SPY_T 367 -#define OPER_UMODES 368 -#define JOIN_FLOOD_COUNT 369 -#define JOIN_FLOOD_TIME 370 -#define PACE_WAIT 371 -#define PACE_WAIT_SIMPLE 372 -#define PASSWORD 373 -#define PATH 374 -#define PING_COOKIE 375 -#define PING_TIME 376 -#define PORT 377 -#define QSTRING 378 -#define REASON 379 -#define REDIRPORT 380 -#define REDIRSERV 381 -#define REHASH 382 -#define REMOTE 383 -#define REMOTEBAN 384 -#define RSA_PRIVATE_KEY_FILE 385 -#define RSA_PUBLIC_KEY_FILE 386 -#define SSL_CERTIFICATE_FILE 387 -#define SSL_DH_PARAM_FILE 388 -#define T_SSL_CLIENT_METHOD 389 -#define T_SSL_SERVER_METHOD 390 -#define T_SSLV3 391 -#define T_TLSV1 392 -#define RESV 393 -#define RESV_EXEMPT 394 -#define SECONDS 395 -#define MINUTES 396 -#define HOURS 397 -#define DAYS 398 -#define WEEKS 399 -#define MONTHS 400 -#define YEARS 401 -#define SENDQ 402 -#define SEND_PASSWORD 403 -#define SERVERHIDE 404 -#define SERVERINFO 405 -#define IRCD_SID 406 -#define TKLINE_EXPIRE_NOTICES 407 -#define T_SHARED 408 -#define T_CLUSTER 409 -#define TYPE 410 -#define SHORT_MOTD 411 -#define SPOOF 412 -#define SPOOF_NOTICE 413 -#define STATS_E_DISABLED 414 -#define STATS_I_OPER_ONLY 415 -#define STATS_K_OPER_ONLY 416 -#define STATS_O_OPER_ONLY 417 -#define STATS_P_OPER_ONLY 418 -#define TBOOL 419 -#define TMASKED 420 -#define TS_MAX_DELTA 421 -#define TS_WARN_DELTA 422 -#define TWODOTS 423 -#define T_ALL 424 -#define T_BOTS 425 -#define T_SOFTCALLERID 426 -#define T_CALLERID 427 -#define T_CCONN 428 -#define T_CCONN_FULL 429 -#define T_SSL_CIPHER_LIST 430 -#define T_DEAF 431 -#define T_DEBUG 432 -#define T_DLINE 433 -#define T_EXTERNAL 434 -#define T_FARCONNECT 435 -#define T_FULL 436 -#define T_INVISIBLE 437 -#define T_IPV4 438 -#define T_IPV6 439 -#define T_LOCOPS 440 -#define T_MAX_CLIENTS 441 -#define T_NCHANGE 442 -#define T_NONONREG 443 -#define T_OPERWALL 444 -#define T_RECVQ 445 -#define T_REJ 446 -#define T_SERVER 447 -#define T_SERVNOTICE 448 -#define T_SET 449 -#define T_SKILL 450 -#define T_SPY 451 -#define T_SSL 452 -#define T_UMODES 453 -#define T_UNAUTH 454 -#define T_UNDLINE 455 -#define T_UNLIMITED 456 -#define T_UNRESV 457 -#define T_UNXLINE 458 -#define T_GLOBOPS 459 -#define T_WALLOP 460 -#define T_WEBIRC 461 -#define T_RESTART 462 -#define T_SERVICE 463 -#define T_SERVICES_NAME 464 -#define THROTTLE_TIME 465 -#define TRUE_NO_OPER_FLOOD 466 -#define UNKLINE 467 -#define USER 468 -#define USE_EGD 469 -#define USE_LOGGING 470 -#define VHOST 471 -#define VHOST6 472 -#define XLINE 473 -#define WARN_NO_NLINE 474 -#define T_SIZE 475 -#define T_FILE 476 +#define OPER_UMODES 367 +#define JOIN_FLOOD_COUNT 368 +#define JOIN_FLOOD_TIME 369 +#define PACE_WAIT 370 +#define PACE_WAIT_SIMPLE 371 +#define PASSWORD 372 +#define PATH 373 +#define PING_COOKIE 374 +#define PING_TIME 375 +#define PORT 376 +#define QSTRING 377 +#define REASON 378 +#define REDIRPORT 379 +#define REDIRSERV 380 +#define REHASH 381 +#define REMOTE 382 +#define REMOTEBAN 383 +#define RSA_PRIVATE_KEY_FILE 384 +#define RSA_PUBLIC_KEY_FILE 385 +#define SSL_CERTIFICATE_FILE 386 +#define SSL_DH_PARAM_FILE 387 +#define T_SSL_CLIENT_METHOD 388 +#define T_SSL_SERVER_METHOD 389 +#define T_SSLV3 390 +#define T_TLSV1 391 +#define RESV 392 +#define RESV_EXEMPT 393 +#define SECONDS 394 +#define MINUTES 395 +#define HOURS 396 +#define DAYS 397 +#define WEEKS 398 +#define MONTHS 399 +#define YEARS 400 +#define SENDQ 401 +#define SEND_PASSWORD 402 +#define SERVERHIDE 403 +#define SERVERINFO 404 +#define IRCD_SID 405 +#define TKLINE_EXPIRE_NOTICES 406 +#define T_SHARED 407 +#define T_CLUSTER 408 +#define TYPE 409 +#define SHORT_MOTD 410 +#define SPOOF 411 +#define SPOOF_NOTICE 412 +#define STATS_E_DISABLED 413 +#define STATS_I_OPER_ONLY 414 +#define STATS_K_OPER_ONLY 415 +#define STATS_O_OPER_ONLY 416 +#define STATS_P_OPER_ONLY 417 +#define TBOOL 418 +#define TMASKED 419 +#define TS_MAX_DELTA 420 +#define TS_WARN_DELTA 421 +#define TWODOTS 422 +#define T_ALL 423 +#define T_BOTS 424 +#define T_SOFTCALLERID 425 +#define T_CALLERID 426 +#define T_CCONN 427 +#define T_CCONN_FULL 428 +#define T_SSL_CIPHER_LIST 429 +#define T_DEAF 430 +#define T_DEBUG 431 +#define T_DLINE 432 +#define T_EXTERNAL 433 +#define T_FARCONNECT 434 +#define T_FULL 435 +#define T_INVISIBLE 436 +#define T_IPV4 437 +#define T_IPV6 438 +#define T_LOCOPS 439 +#define T_MAX_CLIENTS 440 +#define T_NCHANGE 441 +#define T_NONONREG 442 +#define T_OPERWALL 443 +#define T_RECVQ 444 +#define T_REJ 445 +#define T_SERVER 446 +#define T_SERVNOTICE 447 +#define T_SET 448 +#define T_SKILL 449 +#define T_SPY 450 +#define T_SSL 451 +#define T_UMODES 452 +#define T_UNAUTH 453 +#define T_UNDLINE 454 +#define T_UNLIMITED 455 +#define T_UNRESV 456 +#define T_UNXLINE 457 +#define T_GLOBOPS 458 +#define T_WALLOP 459 +#define T_WEBIRC 460 +#define T_RESTART 461 +#define T_SERVICE 462 +#define T_SERVICES_NAME 463 +#define THROTTLE_TIME 464 +#define TRUE_NO_OPER_FLOOD 465 +#define UNKLINE 466 +#define USER 467 +#define USE_EGD 468 +#define USE_LOGGING 469 +#define VHOST 470 +#define VHOST6 471 +#define XLINE 472 +#define WARN_NO_NLINE 473 +#define T_SIZE 474 +#define T_FILE 475 @@ -501,7 +499,7 @@ typedef union YYSTYPE /* Line 2053 of yacc.c */ -#line 505 "conf_parser.h" +#line 503 "conf_parser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/src/conf_parser.y b/src/conf_parser.y index 7b6f7e1..dbfb9c1 100644 --- a/src/conf_parser.y +++ b/src/conf_parser.y @@ -247,7 +247,6 @@ reset_block_state(void) %token OPERS_BYPASS_CALLERID %token OPER_ONLY_UMODES %token OPER_PASS_RESV -%token OPER_SPY_T %token OPER_UMODES %token JOIN_FLOOD_COUNT %token JOIN_FLOOD_TIME @@ -1245,10 +1244,6 @@ oper_flags_item: GLOBAL_KILL { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLOBOPS; -} | OPER_SPY_T -{ - if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_OPER_SPY; } | REMOTEBAN { if (conf_parser_ctx.pass == 2) |