diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2012-12-24 15:19:32 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2012-12-24 15:19:32 +0000 |
| commit | 28015f9000e17d9aa1f0d1e4f24a0caf5b63d9da (patch) | |
| tree | 04c0e40dcc4426166943a81c459da4d69ef989d3 /src/conf_parser.c | |
| parent | 6ab5c544269946d55c4dd5588f0f1389e3287ef4 (diff) | |
- Improved WEBIRC authentication; added 'webirc' to auth::flags
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1715 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat (limited to 'src/conf_parser.c')
| -rw-r--r-- | src/conf_parser.c | 2953 |
1 files changed, 1477 insertions, 1476 deletions
diff --git a/src/conf_parser.c b/src/conf_parser.c index cedcb8a..3c4560e 100644 --- a/src/conf_parser.c +++ b/src/conf_parser.c @@ -406,21 +406,22 @@ extern int yydebug; T_UNXLINE = 451, T_GLOBOPS = 452, T_WALLOP = 453, - T_RESTART = 454, - T_SERVICE = 455, - T_SERVICES_NAME = 456, - THROTTLE_TIME = 457, - TRUE_NO_OPER_FLOOD = 458, - UNKLINE = 459, - USER = 460, - USE_EGD = 461, - USE_LOGGING = 462, - VHOST = 463, - VHOST6 = 464, - XLINE = 465, - WARN_NO_NLINE = 466, - T_SIZE = 467, - T_FILE = 468 + T_WEBIRC = 454, + T_RESTART = 455, + T_SERVICE = 456, + T_SERVICES_NAME = 457, + THROTTLE_TIME = 458, + TRUE_NO_OPER_FLOOD = 459, + UNKLINE = 460, + USER = 461, + USE_EGD = 462, + USE_LOGGING = 463, + VHOST = 464, + VHOST6 = 465, + XLINE = 466, + WARN_NO_NLINE = 467, + T_SIZE = 468, + T_FILE = 469 }; #endif /* Tokens. */ @@ -620,21 +621,22 @@ extern int yydebug; #define T_UNXLINE 451 #define T_GLOBOPS 452 #define T_WALLOP 453 -#define T_RESTART 454 -#define T_SERVICE 455 -#define T_SERVICES_NAME 456 -#define THROTTLE_TIME 457 -#define TRUE_NO_OPER_FLOOD 458 -#define UNKLINE 459 -#define USER 460 -#define USE_EGD 461 -#define USE_LOGGING 462 -#define VHOST 463 -#define VHOST6 464 -#define XLINE 465 -#define WARN_NO_NLINE 466 -#define T_SIZE 467 -#define T_FILE 468 +#define T_WEBIRC 454 +#define T_RESTART 455 +#define T_SERVICE 456 +#define T_SERVICES_NAME 457 +#define THROTTLE_TIME 458 +#define TRUE_NO_OPER_FLOOD 459 +#define UNKLINE 460 +#define USER 461 +#define USE_EGD 462 +#define USE_LOGGING 463 +#define VHOST 464 +#define VHOST6 465 +#define XLINE 466 +#define WARN_NO_NLINE 467 +#define T_SIZE 468 +#define T_FILE 469 @@ -649,7 +651,7 @@ typedef union YYSTYPE /* Line 387 of yacc.c */ -#line 653 "conf_parser.c" +#line 655 "conf_parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -677,7 +679,7 @@ int yyparse (); /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 681 "conf_parser.c" +#line 683 "conf_parser.c" #ifdef short # undef short @@ -897,20 +899,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1180 +#define YYLAST 1132 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 219 +#define YYNTOKENS 220 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 282 /* YYNRULES -- Number of rules. */ -#define YYNRULES 625 +#define YYNRULES 626 /* YYNRULES -- Number of states. */ -#define YYNSTATES 1223 +#define YYNSTATES 1224 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 468 +#define YYMAXUTOK 469 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -922,15 +924,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, 218, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 214, - 2, 217, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 219, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 215, + 2, 218, 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, 216, 2, 215, 2, 2, 2, 2, + 2, 2, 2, 217, 2, 216, 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, @@ -964,7 +966,7 @@ static const yytype_uint8 yytranslate[] = 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 207, 208, 209, 210, 211, 212, 213 + 205, 206, 207, 208, 209, 210, 211, 212, 213, 214 }; #if YYDEBUG @@ -1000,305 +1002,305 @@ static const yytype_uint16 yyprhs[] = 731, 732, 739, 742, 744, 746, 748, 750, 752, 754, 756, 758, 760, 763, 768, 773, 778, 783, 784, 790, 794, 796, 798, 800, 802, 804, 806, 808, 810, 812, - 814, 819, 824, 829, 830, 837, 840, 842, 844, 846, - 848, 851, 856, 861, 866, 872, 875, 877, 879, 881, - 886, 887, 894, 897, 899, 901, 903, 905, 908, 913, - 918, 919, 925, 929, 931, 933, 935, 937, 939, 941, - 943, 945, 947, 949, 951, 952, 959, 962, 964, 966, - 968, 971, 976, 977, 983, 987, 989, 991, 993, 995, - 997, 999, 1001, 1003, 1005, 1007, 1009, 1010, 1017, 1020, + 814, 816, 821, 826, 831, 832, 839, 842, 844, 846, + 848, 850, 853, 858, 863, 868, 874, 877, 879, 881, + 883, 888, 889, 896, 899, 901, 903, 905, 907, 910, + 915, 920, 921, 927, 931, 933, 935, 937, 939, 941, + 943, 945, 947, 949, 951, 953, 954, 961, 964, 966, + 968, 970, 973, 978, 979, 985, 989, 991, 993, 995, + 997, 999, 1001, 1003, 1005, 1007, 1009, 1011, 1012, 1019, 1022, 1024, 1026, 1028, 1030, 1032, 1034, 1036, 1038, 1040, - 1042, 1044, 1046, 1048, 1051, 1056, 1061, 1066, 1071, 1076, - 1081, 1086, 1091, 1092, 1098, 1102, 1104, 1106, 1108, 1113, - 1118, 1123, 1128, 1133, 1134, 1141, 1142, 1148, 1152, 1154, - 1156, 1159, 1161, 1163, 1165, 1167, 1169, 1174, 1179, 1180, - 1187, 1190, 1192, 1194, 1196, 1198, 1203, 1208, 1214, 1217, - 1219, 1221, 1223, 1228, 1229, 1236, 1237, 1243, 1247, 1249, - 1251, 1254, 1256, 1258, 1260, 1262, 1264, 1269, 1274, 1280, - 1283, 1285, 1287, 1289, 1291, 1293, 1295, 1297, 1299, 1301, + 1042, 1044, 1046, 1048, 1050, 1053, 1058, 1063, 1068, 1073, + 1078, 1083, 1088, 1093, 1094, 1100, 1104, 1106, 1108, 1110, + 1115, 1120, 1125, 1130, 1135, 1136, 1143, 1144, 1150, 1154, + 1156, 1158, 1161, 1163, 1165, 1167, 1169, 1171, 1176, 1181, + 1182, 1189, 1192, 1194, 1196, 1198, 1200, 1205, 1210, 1216, + 1219, 1221, 1223, 1225, 1230, 1231, 1238, 1239, 1245, 1249, + 1251, 1253, 1256, 1258, 1260, 1262, 1264, 1266, 1271, 1276, + 1282, 1285, 1287, 1289, 1291, 1293, 1295, 1297, 1299, 1301, 1303, 1305, 1307, 1309, 1311, 1313, 1315, 1317, 1319, 1321, 1323, 1325, 1327, 1329, 1331, 1333, 1335, 1337, 1339, 1341, 1343, 1345, 1347, 1349, 1351, 1353, 1355, 1357, 1359, 1361, 1363, 1365, 1367, 1369, 1371, 1373, 1375, 1377, 1379, 1381, - 1383, 1385, 1390, 1395, 1400, 1405, 1410, 1415, 1420, 1425, - 1430, 1435, 1440, 1445, 1450, 1455, 1460, 1465, 1470, 1475, - 1480, 1485, 1490, 1495, 1500, 1505, 1510, 1515, 1520, 1525, - 1530, 1535, 1540, 1545, 1550, 1555, 1560, 1565, 1570, 1575, - 1580, 1585, 1590, 1595, 1600, 1605, 1610, 1615, 1616, 1622, - 1626, 1628, 1630, 1632, 1634, 1636, 1638, 1640, 1642, 1644, + 1383, 1385, 1387, 1392, 1397, 1402, 1407, 1412, 1417, 1422, + 1427, 1432, 1437, 1442, 1447, 1452, 1457, 1462, 1467, 1472, + 1477, 1482, 1487, 1492, 1497, 1502, 1507, 1512, 1517, 1522, + 1527, 1532, 1537, 1542, 1547, 1552, 1557, 1562, 1567, 1572, + 1577, 1582, 1587, 1592, 1597, 1602, 1607, 1612, 1617, 1618, + 1624, 1628, 1630, 1632, 1634, 1636, 1638, 1640, 1642, 1644, 1646, 1648, 1650, 1652, 1654, 1656, 1658, 1660, 1662, 1664, - 1666, 1668, 1669, 1675, 1679, 1681, 1683, 1685, 1687, 1689, + 1666, 1668, 1670, 1671, 1677, 1681, 1683, 1685, 1687, 1689, 1691, 1693, 1695, 1697, 1699, 1701, 1703, 1705, 1707, 1709, - 1711, 1713, 1715, 1717, 1719, 1721, 1726, 1731, 1736, 1742, - 1745, 1747, 1749, 1751, 1753, 1755, 1757, 1759, 1761, 1763, - 1765, 1767, 1769, 1771, 1773, 1775, 1777, 1782, 1787, 1792, - 1797, 1802, 1807, 1812, 1817, 1822, 1827, 1832, 1837, 1842, - 1847, 1853, 1856, 1858, 1860, 1862, 1864, 1866, 1868, 1870, - 1872, 1877, 1882, 1887, 1892, 1897 + 1711, 1713, 1715, 1717, 1719, 1721, 1723, 1728, 1733, 1738, + 1744, 1747, 1749, 1751, 1753, 1755, 1757, 1759, 1761, 1763, + 1765, 1767, 1769, 1771, 1773, 1775, 1777, 1779, 1784, 1789, + 1794, 1799, 1804, 1809, 1814, 1819, 1824, 1829, 1834, 1839, + 1844, 1849, 1855, 1858, 1860, 1862, 1864, 1866, 1868, 1870, + 1872, 1874, 1879, 1884, 1889, 1894, 1899 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 220, 0, -1, -1, 220, 221, -1, 253, -1, 259, - -1, 273, -1, 475, -1, 291, -1, 308, -1, 322, - -1, 231, -1, 492, -1, 337, -1, 344, -1, 348, - -1, 358, -1, 367, -1, 387, -1, 397, -1, 403, - -1, 417, -1, 407, -1, 226, -1, 1, 214, -1, - 1, 215, -1, -1, 223, -1, 99, 222, -1, 99, - 137, 222, -1, 99, 138, 222, -1, 99, 139, 222, - -1, 99, 140, 222, -1, 99, 141, 222, -1, -1, - 225, -1, 99, 224, -1, 99, 9, 224, -1, 99, - 10, 224, -1, 99, 11, 224, -1, 88, 216, 227, - 215, 214, -1, 227, 228, -1, 228, -1, 229, -1, - 230, -1, 1, 214, -1, 87, 217, 117, 214, -1, - 113, 217, 117, 214, -1, 145, 216, 232, 215, 214, - -1, 232, 233, -1, 233, -1, 244, -1, 249, -1, - 252, -1, 246, -1, 247, -1, 248, -1, 251, -1, - 242, -1, 241, -1, 250, -1, 245, -1, 240, -1, - 234, -1, 235, -1, 243, -1, 1, 214, -1, 131, - 217, 236, 214, -1, 132, 217, 238, 214, -1, 236, - 218, 237, -1, 237, -1, 133, -1, 134, -1, 238, - 218, 239, -1, 239, -1, 133, -1, 134, -1, 129, - 217, 117, 214, -1, 127, 217, 117, 214, -1, 130, - 217, 117, 214, -1, 170, 217, 117, 214, -1, 89, - 217, 117, 214, -1, 146, 217, 117, 214, -1, 24, - 217, 117, 214, -1, 92, 217, 117, 214, -1, 91, - 217, 117, 214, -1, 208, 217, 117, 214, -1, 209, - 217, 117, 214, -1, 180, 217, 99, 214, -1, 57, - 217, 159, 214, -1, 4, 216, 254, 215, 214, -1, - 254, 255, -1, 255, -1, 256, -1, 258, -1, 257, - -1, 1, 214, -1, 89, 217, 117, 214, -1, 31, - 217, 117, 214, -1, 24, 217, 117, 214, -1, 71, - 216, 260, 215, 214, -1, 260, 261, -1, 261, -1, - 262, -1, 263, -1, 1, 214, -1, 207, 217, 159, - 214, -1, -1, 264, 213, 216, 265, 215, 214, -1, - 265, 266, -1, 266, -1, 267, -1, 269, -1, 268, - -1, 1, 214, -1, 89, 217, 117, 214, -1, 212, - 217, 225, 214, -1, 212, 217, 194, 214, -1, -1, - 150, 270, 217, 271, 214, -1, 271, 218, 272, -1, - 272, -1, 205, -1, 102, -1, 40, -1, 173, -1, - 64, -1, 62, -1, 172, -1, -1, 102, 274, 216, - 275, 215, 214, -1, 275, 276, -1, 276, -1, 277, - -1, 278, -1, 279, -1, 283, -1, 282, -1, 280, - -1, 281, -1, 287, -1, 1, 214, -1, 89, 217, - 117, 214, -1, 205, 217, 117, 214, -1, 112, 217, - 117, 214, -1, 32, 217, 159, 214, -1, 128, 217, - 117, 214, -1, 17, 217, 117, 214, -1, -1, 191, - 284, 217, 285, 214, -1, 285, 218, 286, -1, 286, + 221, 0, -1, -1, 221, 222, -1, 254, -1, 260, + -1, 274, -1, 476, -1, 292, -1, 309, -1, 323, + -1, 232, -1, 493, -1, 338, -1, 345, -1, 349, + -1, 359, -1, 368, -1, 388, -1, 398, -1, 404, + -1, 418, -1, 408, -1, 227, -1, 1, 215, -1, + 1, 216, -1, -1, 224, -1, 99, 223, -1, 99, + 137, 223, -1, 99, 138, 223, -1, 99, 139, 223, + -1, 99, 140, 223, -1, 99, 141, 223, -1, -1, + 226, -1, 99, 225, -1, 99, 9, 225, -1, 99, + 10, 225, -1, 99, 11, 225, -1, 88, 217, 228, + 216, 215, -1, 228, 229, -1, 229, -1, 230, -1, + 231, -1, 1, 215, -1, 87, 218, 117, 215, -1, + 113, 218, 117, 215, -1, 145, 217, 233, 216, 215, + -1, 233, 234, -1, 234, -1, 245, -1, 250, -1, + 253, -1, 247, -1, 248, -1, 249, -1, 252, -1, + 243, -1, 242, -1, 251, -1, 246, -1, 241, -1, + 235, -1, 236, -1, 244, -1, 1, 215, -1, 131, + 218, 237, 215, -1, 132, 218, 239, 215, -1, 237, + 219, 238, -1, 238, -1, 133, -1, 134, -1, 239, + 219, 240, -1, 240, -1, 133, -1, 134, -1, 129, + 218, 117, 215, -1, 127, 218, 117, 215, -1, 130, + 218, 117, 215, -1, 170, 218, 117, 215, -1, 89, + 218, 117, 215, -1, 146, 218, 117, 215, -1, 24, + 218, 117, 215, -1, 92, 218, 117, 215, -1, 91, + 218, 117, 215, -1, 209, 218, 117, 215, -1, 210, + 218, 117, 215, -1, 180, 218, 99, 215, -1, 57, + 218, 159, 215, -1, 4, 217, 255, 216, 215, -1, + 255, 256, -1, 256, -1, 257, -1, 259, -1, 258, + -1, 1, 215, -1, 89, 218, 117, 215, -1, 31, + 218, 117, 215, -1, 24, 218, 117, 215, -1, 71, + 217, 261, 216, 215, -1, 261, 262, -1, 262, -1, + 263, -1, 264, -1, 1, 215, -1, 208, 218, 159, + 215, -1, -1, 265, 214, 217, 266, 216, 215, -1, + 266, 267, -1, 267, -1, 268, -1, 270, -1, 269, + -1, 1, 215, -1, 89, 218, 117, 215, -1, 213, + 218, 226, 215, -1, 213, 218, 194, 215, -1, -1, + 150, 271, 218, 272, 215, -1, 272, 219, 273, -1, + 273, -1, 206, -1, 102, -1, 40, -1, 173, -1, + 64, -1, 62, -1, 172, -1, -1, 102, 275, 217, + 276, 216, 215, -1, 276, 277, -1, 277, -1, 278, + -1, 279, -1, 280, -1, 284, -1, 283, -1, 281, + -1, 282, -1, 288, -1, 1, 215, -1, 89, 218, + 117, 215, -1, 206, 218, 117, 215, -1, 112, 218, + 117, 215, -1, 32, 218, 159, 215, -1, 128, 218, + 117, 215, -1, 17, 218, 117, 215, -1, -1, 191, + 285, 218, 286, 215, -1, 286, 219, 287, -1, 287, -1, 165, -1, 168, -1, 169, -1, 171, -1, 172, -1, 175, -1, 51, -1, 188, -1, 181, -1, 184, -1, 192, -1, 189, -1, 174, -1, 182, -1, 186, -1, 176, -1, 198, -1, 166, -1, 167, -1, 179, - -1, -1, 36, 288, 217, 289, 214, -1, 289, 218, - 290, -1, 290, -1, 47, -1, 124, -1, 64, -1, - 204, -1, 173, -1, 193, -1, 210, -1, 40, -1, - 25, -1, 199, -1, 123, -1, 4, -1, 94, -1, + -1, -1, 36, 289, 218, 290, 215, -1, 290, 219, + 291, -1, 291, -1, 47, -1, 124, -1, 64, -1, + 205, -1, 173, -1, 193, -1, 211, -1, 40, -1, + 25, -1, 200, -1, 123, -1, 4, -1, 94, -1, 182, -1, 197, -1, 106, -1, 125, -1, 187, -1, - 87, -1, -1, 17, 292, 216, 293, 215, 214, -1, - 293, 294, -1, 294, -1, 295, -1, 305, -1, 306, - -1, 296, -1, 307, -1, 297, -1, 298, -1, 299, - -1, 300, -1, 301, -1, 302, -1, 303, -1, 304, - -1, 1, 214, -1, 89, 217, 117, 214, -1, 115, - 217, 223, 214, -1, 101, 217, 99, 214, -1, 19, - 217, 223, 214, -1, 81, 217, 99, 214, -1, 76, - 217, 99, 214, -1, 78, 217, 99, 214, -1, 77, - 217, 99, 214, -1, 142, 217, 225, 214, -1, 183, - 217, 225, 214, -1, 15, 217, 99, 214, -1, 16, - 217, 99, 214, -1, 100, 217, 99, 214, -1, -1, - 70, 309, 216, 314, 215, 214, -1, -1, 36, 311, - 217, 312, 214, -1, 312, 218, 313, -1, 313, -1, - 190, -1, 51, -1, 185, -1, 314, 315, -1, 315, - -1, 316, -1, 310, -1, 320, -1, 321, -1, 1, - 214, -1, -1, 116, 217, 318, 317, 214, -1, 318, - 218, 319, -1, 319, -1, 99, -1, 99, 163, 99, - -1, 61, 217, 117, 214, -1, 56, 217, 117, 214, - -1, -1, 48, 323, 216, 324, 215, 214, -1, 324, - 325, -1, 325, -1, 326, -1, 327, -1, 328, -1, - 330, -1, 334, -1, 335, -1, 336, -1, 329, -1, - 1, 214, -1, 205, 217, 117, 214, -1, 112, 217, - 117, 214, -1, 17, 217, 117, 214, -1, 32, 217, - 159, 214, -1, -1, 36, 331, 217, 332, 214, -1, - 332, 218, 333, -1, 333, -1, 153, -1, 33, -1, + 87, -1, -1, 17, 293, 217, 294, 216, 215, -1, + 294, 295, -1, 295, -1, 296, -1, 306, -1, 307, + -1, 297, -1, 308, -1, 298, -1, 299, -1, 300, + -1, 301, -1, 302, -1, 303, -1, 304, -1, 305, + -1, 1, 215, -1, 89, 218, 117, 215, -1, 115, + 218, 224, 215, -1, 101, 218, 99, 215, -1, 19, + 218, 224, 215, -1, 81, 218, 99, 215, -1, 76, + 218, 99, 215, -1, 78, 218, 99, 215, -1, 77, + 218, 99, 215, -1, 142, 218, 226, 215, -1, 183, + 218, 226, 215, -1, 15, 218, 99, 215, -1, 16, + 218, 99, 215, -1, 100, 218, 99, 215, -1, -1, + 70, 310, 217, 315, 216, 215, -1, -1, 36, 312, + 218, 313, 215, -1, 313, 219, 314, -1, 314, -1, + 190, -1, 51, -1, 185, -1, 315, 316, -1, 316, + -1, 317, -1, 311, -1, 321, -1, 322, -1, 1, + 215, -1, -1, 116, 218, 319, 318, 215, -1, 319, + 219, 320, -1, 320, -1, 99, -1, 99, 163, 99, + -1, 61, 218, 117, 215, -1, 56, 218, 117, 215, + -1, -1, 48, 324, 217, 325, 216, 215, -1, 325, + 326, -1, 326, -1, 327, -1, 328, -1, 329, -1, + 331, -1, 335, -1, 336, -1, 337, -1, 330, -1, + 1, 215, -1, 206, 218, 117, 215, -1, 112, 218, + 117, 215, -1, 17, 218, 117, 215, -1, 32, 218, + 159, 215, -1, -1, 36, 332, 218, 333, 215, -1, + 333, 219, 334, -1, 334, -1, 153, -1, 33, -1, 65, -1, 49, -1, 13, -1, 98, -1, 43, -1, - 136, -1, 90, -1, 152, 217, 117, 214, -1, 121, - 217, 117, 214, -1, 120, 217, 99, 214, -1, -1, - 135, 338, 216, 339, 215, 214, -1, 339, 340, -1, - 340, -1, 341, -1, 342, -1, 343, -1, 1, 214, - -1, 119, 217, 117, 214, -1, 14, 217, 117, 214, - -1, 93, 217, 117, 214, -1, 200, 216, 345, 215, - 214, -1, 345, 346, -1, 346, -1, 347, -1, 1, - -1, 89, 217, 117, 214, -1, -1, 148, 349, 216, - 350, 215, 214, -1, 350, 351, -1, 351, -1, 352, - -1, 353, -1, 354, -1, 1, 214, -1, 89, 217, - 117, 214, -1, 205, 217, 117, 214, -1, -1, 150, - 355, 217, 356, 214, -1, 356, 218, 357, -1, 357, - -1, 64, -1, 204, -1, 173, -1, 193, -1, 210, + 136, -1, 199, -1, 90, -1, 152, 218, 117, 215, + -1, 121, 218, 117, 215, -1, 120, 218, 99, 215, + -1, -1, 135, 339, 217, 340, 216, 215, -1, 340, + 341, -1, 341, -1, 342, -1, 343, -1, 344, -1, + 1, 215, -1, 119, 218, 117, 215, -1, 14, 218, + 117, 215, -1, 93, 218, 117, 215, -1, 201, 217, + 346, 216, 215, -1, 346, 347, -1, 347, -1, 348, + -1, 1, -1, 89, 218, 117, 215, -1, -1, 148, + 350, 217, 351, 216, 215, -1, 351, 352, -1, 352, + -1, 353, -1, 354, -1, 355, -1, 1, 215, -1, + 89, 218, 117, 215, -1, 206, 218, 117, 215, -1, + -1, 150, 356, 218, 357, 215, -1, 357, 219, 358, + -1, 358, -1, 64, -1, 205, -1, 173, -1, 193, + -1, 211, -1, 196, -1, 135, -1, 195, -1, 179, + -1, 164, -1, -1, 149, 360, 217, 361, 216, 215, + -1, 361, 362, -1, 362, -1, 363, -1, 364, -1, + 1, 215, -1, 89, 218, 117, 215, -1, -1, 150, + 365, 218, 366, 215, -1, 366, 219, 367, -1, 367, + -1, 64, -1, 205, -1, 173, -1, 193, -1, 211, -1, 196, -1, 135, -1, 195, -1, 179, -1, 164, - -1, -1, 149, 359, 216, 360, 215, 214, -1, 360, - 361, -1, 361, -1, 362, -1, 363, -1, 1, 214, - -1, 89, 217, 117, 214, -1, -1, 150, 364, 217, - 365, 214, -1, 365, 218, 366, -1, 366, -1, 64, - -1, 204, -1, 173, -1, 193, -1, 210, -1, 196, - -1, 135, -1, 195, -1, 179, -1, 164, -1, -1, - 18, 368, 216, 369, 215, 214, -1, 369, 370, -1, - 370, -1, 371, -1, 372, -1, 373, -1, 374, -1, - 375, -1, 377, -1, 376, -1, 386, -1, 378, -1, - 383, -1, 384, -1, 385, -1, 382, -1, 1, 214, - -1, 89, 217, 117, 214, -1, 56, 217, 117, 214, - -1, 208, 217, 117, 214, -1, 143, 217, 117, 214, - -1, 3, 217, 117, 214, -1, 116, 217, 99, 214, - -1, 5, 217, 177, 214, -1, 5, 217, 178, 214, - -1, -1, 36, 379, 217, 380, 214, -1, 380, 218, - 381, -1, 381, -1, 8, -1, 190, -1, 32, 217, - 159, 214, -1, 58, 217, 117, 214, -1, 68, 217, - 117, 214, -1, 17, 217, 117, 214, -1, 170, 217, - 117, 214, -1, -1, 62, 388, 216, 393, 215, 214, - -1, -1, 150, 390, 217, 391, 214, -1, 391, 218, - 392, -1, 392, -1, 122, -1, 393, 394, -1, 394, - -1, 395, -1, 396, -1, 389, -1, 1, -1, 205, - 217, 117, 214, -1, 119, 217, 117, 214, -1, -1, - 23, 398, 216, 399, 215, 214, -1, 399, 400, -1, - 400, -1, 401, -1, 402, -1, 1, -1, 61, 217, - 117, 214, -1, 119, 217, 117, 214, -1, 34, 216, - 404, 215, 214, -1, 404, 405, -1, 405, -1, 406, - -1, 1, -1, 61, 217, 117, 214, -1, -1, 38, - 408, 216, 413, 215, 214, -1, -1, 150, 410, 217, - 411, 214, -1, 411, 218, 412, -1, 412, -1, 122, - -1, 413, 414, -1, 414, -1, 415, -1, 416, -1, - 409, -1, 1, -1, 89, 217, 117, 214, -1, 119, - 217, 117, 214, -1, 39, 216, 418, 215, 214, -1, - 418, 419, -1, 419, -1, 428, -1, 429, -1, 431, + -1, -1, 18, 369, 217, 370, 216, 215, -1, 370, + 371, -1, 371, -1, 372, -1, 373, -1, 374, -1, + 375, -1, 376, -1, 378, -1, 377, -1, 387, -1, + 379, -1, 384, -1, 385, -1, 386, -1, 383, -1, + 1, 215, -1, 89, 218, 117, 215, -1, 56, 218, + 117, 215, -1, 209, 218, 117, 215, -1, 143, 218, + 117, 215, -1, 3, 218, 117, 215, -1, 116, 218, + 99, 215, -1, 5, 218, 177, 215, -1, 5, 218, + 178, 215, -1, -1, 36, 380, 218, 381, 215, -1, + 381, 219, 382, -1, 382, -1, 8, -1, 190, -1, + 32, 218, 159, 215, -1, 58, 218, 117, 215, -1, + 68, 218, 117, 215, -1, 17, 218, 117, 215, -1, + 170, 218, 117, 215, -1, -1, 62, 389, 217, 394, + 216, 215, -1, -1, 150, 391, 218, 392, 215, -1, + 392, 219, 393, -1, 393, -1, 122, -1, 394, 395, + -1, 395, -1, 396, -1, 397, -1, 390, -1, 1, + -1, 206, 218, 117, 215, -1, 119, 218, 117, 215, + -1, -1, 23, 399, 217, 400, 216, 215, -1, 400, + 401, -1, 401, -1, 402, -1, 403, -1, 1, -1, + 61, 218, 117, 215, -1, 119, 218, 117, 215, -1, + 34, 217, 405, 216, 215, -1, 405, 406, -1, 406, + -1, 407, -1, 1, -1, 61, 218, 117, 215, -1, + -1, 38, 409, 217, 414, 216, 215, -1, -1, 150, + 411, 218, 412, 215, -1, 412, 219, 413, -1, 413, + -1, 122, -1, 414, 415, -1, 415, -1, 416, -1, + 417, -1, 410, -1, 1, -1, 89, 218, 117, 215, + -1, 119, 218, 117, 215, -1, 39, 217, 419, 216, + 215, -1, 419, 420, -1, 420, -1, 429, -1, 430, -1, 432, -1, 433, -1, 434, -1, 435, -1, 436, - -1, 437, -1, 438, -1, 427, -1, 440, -1, 441, - -1, 456, -1, 443, -1, 445, -1, 447, -1, 446, - -1, 450, -1, 444, -1, 451, -1, 452, -1, 453, - -1, 454, -1, 455, -1, 468, -1, 457, -1, 458, - -1, 459, -1, 464, -1, 448, -1, 449, -1, 474, - -1, 472, -1, 473, -1, 430, -1, 463, -1, 439, - -1, 461, -1, 462, -1, 426, -1, 421, -1, 422, - -1, 423, -1, 424, -1, 425, -1, 442, -1, 420, - -1, 460, -1, 1, -1, 83, 217, 99, 214, -1, - 42, 217, 159, 214, -1, 41, 217, 223, 214, -1, - 44, 217, 223, 214, -1, 45, 217, 99, 214, -1, - 46, 217, 99, 214, -1, 147, 217, 159, 214, -1, - 63, 217, 223, 214, -1, 55, 217, 159, 214, -1, - 59, 217, 159, 214, -1, 28, 217, 159, 214, -1, - 35, 217, 159, 214, -1, 6, 217, 159, 214, -1, - 80, 217, 223, 214, -1, 79, 217, 99, 214, -1, - 72, 217, 99, 214, -1, 7, 217, 223, 214, -1, - 162, 217, 223, 214, -1, 161, 217, 223, 214, -1, - 50, 217, 99, 214, -1, 60, 217, 159, 214, -1, - 211, 217, 159, 214, -1, 154, 217, 159, 214, -1, - 157, 217, 159, 214, -1, 158, 217, 159, 214, -1, - 156, 217, 159, 214, -1, 156, 217, 160, 214, -1, - 155, 217, 159, 214, -1, 155, 217, 160, 214, -1, - 110, 217, 223, 214, -1, 12, 217, 223, 214, -1, - 103, 217, 159, 214, -1, 111, 217, 223, 214, -1, - 151, 217, 159, 214, -1, 97, 217, 159, 214, -1, - 203, 217, 159, 214, -1, 105, 217, 159, 214, -1, - 84, 217, 117, 214, -1, 29, 217, 99, 214, -1, - 82, 217, 99, 214, -1, 206, 217, 159, 214, -1, - 30, 217, 117, 214, -1, 201, 217, 117, 214, -1, - 114, 217, 159, 214, -1, 26, 217, 159, 214, -1, - 202, 217, 223, 214, -1, -1, 107, 465, 217, 466, - 214, -1, 466, 218, 467, -1, 467, -1, 165, -1, - 168, -1, 169, -1, 171, -1, 172, -1, 175, -1, - 51, -1, 188, -1, 181, -1, 184, -1, 192, -1, - 189, -1, 174, -1, 182, -1, 186, -1, 176, -1, - 198, -1, 166, -1, 167, -1, 179, -1, -1, 104, - 469, 217, 470, 214, -1, 470, 218, 471, -1, 471, - -1, 165, -1, 168, -1, 169, -1, 171, -1, 172, - -1, 175, -1, 188, -1, 51, -1, 181, -1, 184, - -1, 192, -1, 189, -1, 174, -1, 182, -1, 186, - -1, 176, -1, 198, -1, 166, -1, 167, -1, 179, - -1, 85, 217, 99, 214, -1, 86, 217, 99, 214, - -1, 20, 217, 99, 214, -1, 14, 216, 476, 215, - 214, -1, 476, 477, -1, 477, -1, 485, -1, 480, - -1, 481, -1, 482, -1, 483, -1, 484, -1, 486, - -1, 487, -1, 488, -1, 479, -1, 489, -1, 490, - -1, 491, -1, 478, -1, 1, -1, 27, 217, 159, - 214, -1, 126, 217, 159, 214, -1, 66, 217, 223, - 214, -1, 67, 217, 223, 214, -1, 75, 217, 99, - 214, -1, 74, 217, 99, 214, -1, 118, 217, 159, - 214, -1, 73, 217, 99, 214, -1, 22, 217, 99, - 214, -1, 21, 217, 99, 214, -1, 95, 217, 159, - 214, -1, 96, 217, 159, 214, -1, 108, 217, 99, - 214, -1, 109, 217, 223, 214, -1, 144, 216, 493, - 215, 214, -1, 493, 494, -1, 494, -1, 495, -1, - 496, -1, 498, -1, 499, -1, 497, -1, 500, -1, - 1, -1, 37, 217, 159, 214, -1, 54, 217, 159, - 214, -1, 52, 217, 117, 214, -1, 69, 217, 223, - 214, -1, 51, 217, 159, 214, -1, 53, 217, 159, - 214, -1 + -1, 437, -1, 438, -1, 439, -1, 428, -1, 441, + -1, 442, -1, 457, -1, 444, -1, 446, -1, 448, + -1, 447, -1, 451, -1, 445, -1, 452, -1, 453, + -1, 454, -1, 455, -1, 456, -1, 469, -1, 458, + -1, 459, -1, 460, -1, 465, -1, 449, -1, 450, + -1, 475, -1, 473, -1, 474, -1, 431, -1, 464, + -1, 440, -1, 462, -1, 463, -1, 427, -1, 422, + -1, 423, -1, 424, -1, 425, -1, 426, -1, 443, + -1, 421, -1, 461, -1, 1, -1, 83, 218, 99, + 215, -1, 42, 218, 159, 215, -1, 41, 218, 224, + 215, -1, 44, 218, 224, 215, -1, 45, 218, 99, + 215, -1, 46, 218, 99, 215, -1, 147, 218, 159, + 215, -1, 63, 218, 224, 215, -1, 55, 218, 159, + 215, -1, 59, 218, 159, 215, -1, 28, 218, 159, + 215, -1, 35, 218, 159, 215, -1, 6, 218, 159, + 215, -1, 80, 218, 224, 215, -1, 79, 218, 99, + 215, -1, 72, 218, 99, 215, -1, 7, 218, 224, + 215, -1, 162, 218, 224, 215, -1, 161, 218, 224, + 215, -1, 50, 218, 99, 215, -1, 60, 218, 159, + 215, -1, 212, 218, 159, 215, -1, 154, 218, 159, + 215, -1, 157, 218, 159, 215, -1, 158, 218, 159, + 215, -1, 156, 218, 159, 215, -1, 156, 218, 160, + 215, -1, 155, 218, 159, 215, -1, 155, 218, 160, + 215, -1, 110, 218, 224, 215, -1, 12, 218, 224, + 215, -1, 103, 218, 159, 215, -1, 111, 218, 224, + 215, -1, 151, 218, 159, 215, -1, 97, 218, 159, + 215, -1, 204, 218, 159, 215, -1, 105, 218, 159, + 215, -1, 84, 218, 117, 215, -1, 29, 218, 99, + 215, -1, 82, 218, 99, 215, -1, 207, 218, 159, + 215, -1, 30, 218, 117, 215, -1, 202, 218, 117, + 215, -1, 114, 218, 159, 215, -1, 26, 218, 159, + 215, -1, 203, 218, 224, 215, -1, -1, 107, 466, + 218, 467, 215, -1, 467, 219, 468, -1, 468, -1, + 165, -1, 168, -1, 169, -1, 171, -1, 172, -1, + 175, -1, 51, -1, 188, -1, 181, -1, 184, -1, + 192, -1, 189, -1, 174, -1, 182, -1, 186, -1, + 176, -1, 198, -1, 166, -1, 167, -1, 179, -1, + -1, 104, 470, 218, 471, 215, -1, 471, 219, 472, + -1, 472, -1, 165, -1, 168, -1, 169, -1, 171, + -1, 172, -1, 175, -1, 188, -1, 51, -1, 181, + -1, 184, -1, 192, -1, 189, -1, 174, -1, 182, + -1, 186, -1, 176, -1, 198, -1, 166, -1, 167, + -1, 179, -1, 85, 218, 99, 215, -1, 86, 218, + 99, 215, -1, 20, 218, 99, 215, -1, 14, 217, + 477, 216, 215, -1, 477, 478, -1, 478, -1, 486, + -1, 481, -1, 482, -1, 483, -1, 484, -1, 485, + -1, 487, -1, 488, -1, 489, -1, 480, -1, 490, + -1, 491, -1, 492, -1, 479, -1, 1, -1, 27, + 218, 159, 215, -1, 126, 218, 159, 215, -1, 66, + 218, 224, 215, -1, 67, 218, 224, 215, -1, 75, + 218, 99, 215, -1, 74, 218, 99, 215, -1, 118, + 218, 159, 215, -1, 73, 218, 99, 215, -1, 22, + 218, 99, 215, -1, 21, 218, 99, 215, -1, 95, + 218, 159, 215, -1, 96, 218, 159, 215, -1, 108, + 218, 99, 215, -1, 109, 218, 224, 215, -1, 144, + 217, 494, 216, 215, -1, 494, 495, -1, 495, -1, + 496, -1, 497, -1, 499, -1, 500, -1, 498, -1, + 501, -1, 1, -1, 37, 218, 159, 215, -1, 54, + 218, 159, 215, -1, 52, 218, 117, 215, -1, 69, + 218, 224, 215, -1, 51, 218, 159, 215, -1, 53, + 218, 159, 215, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 354, 354, 355, 358, 359, 360, 361, 362, 363, - 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, - 374, 375, 376, 377, 378, 379, 383, 383, 384, 388, - 392, 396, 400, 404, 410, 410, 411, 412, 413, 414, - 421, 424, 424, 425, 425, 425, 427, 433, 440, 442, - 442, 443, 443, 444, 444, 445, 445, 446, 446, 447, - 447, 448, 448, 449, 449, 450, 451, 454, 455, 457, - 457, 458, 464, 472, 472, 473, 479, 487, 526, 585, - 613, 621, 636, 651, 660, 674, 683, 711, 741, 764, - 773, 775, 775, 776, 776, 777, 777, 779, 788, 797, - 809, 810, 810, 812, 812, 813, 815, 822, 822, 835, - 836, 838, 838, 839, 839, 841, 849, 852, 858, 857, - 863, 863, 864, 868, 872, 876, 880, 884, 888, 899, - 898, 978, 978, 979, 979, 979, 980, 980, 980, 981, - 981, 981, 983, 989, 995, 1001, 1012, 1018, 1025, 1024, - 1030, 1030, 1031, 1035, 1039, 1043, 1047, 1051, 1055, 1059, - 1063, 1067, 1071, 1075, 1079, 1083, 1087, 1091, 1095, 1099, - 1103, 1107, 1114, 1113, 1119, 1119, 1120, 1124, 1128, 1132, - 1136, 1140, 1144, 1148, 1152, 1156, 1160, 1164, 1168, 1172, - 1176, 1180, 1184, 1188, 1192, 1203, 1202, 1253, 1253, 1254, - 1255, 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, - 1264, 1264, 1265, 1267, 1273, 1279, 1285, 1291, 1297, 1303, - 1309, 1315, 1321, 1328, 1334, 1340, 1350, 1349, 1356, 1355, - 1360, 1360, 1361, 1365, 1369, 1375, 1375, 1376, 1376, 1376, - 1376, 1376, 1378, 1378, 1380, 1380, 1382, 1396, 1416, 1422, - 1432, 1431, 1473, 1473, 1474, 1474, 1474, 1474, 1475, 1475, - 1475, 1476, 1476, 1478, 1484, 1490, 1496, 1508, 1507, 1513, - 1513, 1514, 1518, 1522, 1526, 1530, 1534, 1538, 1542, 1546, - 1552, 1566, 1575, 1589, 1588, 1597, 1597, 1598, 1598, 1598, - 1598, 1600, 1606, 1615, 1624, 1626, 1626, 1627, 1627, 1629, - 1645, 1644, 1669, 1669, 1670, 1670, 1670, 1670, 1672, 1678, - 1698, 1697, 1703, 1703, 1704, 1708, 1712, 1716, 1720, 1724, - 1728, 1732, 1736, 1740, 1750, 1749, 1770, 1770, 1771, 1771, - 1771, 1773, 1780, 1779, 1785, 1785, 1786, 1790, 1794, 1798, - 1802, 1806, 1810, 1814, 1818, 1822, 1832, 1831, 1897, 1897, - 1898, 1898, 1898, 1899, 1899, 1900, 1900, 1900, 1901, 1901, - 1901, 1902, 1902, 1903, 1905, 1911, 1917, 1923, 1936, 1949, - 1955, 1959, 1968, 1967, 1972, 1972, 1973, 1977, 1983, 1994, - 2000, 2006, 2012, 2028, 2027, 2090, 2089, 2095, 2095, 2096, - 2102, 2102, 2103, 2103, 2103, 2103, 2105, 2125, 2135, 2134, - 2161, 2161, 2162, 2162, 2162, 2164, 2170, 2179, 2181, 2181, - 2182, 2182, 2184, 2202, 2201, 2247, 2246, 2252, 2252, 2253, - 2259, 2259, 2260, 2260, 2260, 2260, 2262, 2268, 2277, 2280, - 2280, 2281, 2281, 2282, 2282, 2283, 2283, 2284, 2284, 2285, - 2285, 2286, 2287, 2288, 2288, 2289, 2289, 2290, 2290, 2291, - 2291, 2292, 2292, 2293, 2293, 2294, 2295, 2295, 2296, 2296, - 2297, 2297, 2298, 2298, 2299, 2299, 2300, 2301, 2301, 2302, - 2303, 2304, 2304, 2305, 2305, 2306, 2307, 2308, 2309, 2309, - 2310, 2313, 2318, 2324, 2330, 2336, 2341, 2346, 2351, 2356, + 0, 355, 355, 356, 359, 360, 361, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379, 380, 384, 384, 385, 389, + 393, 397, 401, 405, 411, 411, 412, 413, 414, 415, + 422, 425, 425, 426, 426, 426, 428, 434, 441, 443, + 443, 444, 444, 445, 445, 446, 446, 447, 447, 448, + 448, 449, 449, 450, 450, 451, 452, 455, 456, 458, + 458, 459, 465, 473, 473, 474, 480, 488, 527, 586, + 614, 622, 637, 652, 661, 675, 684, 712, 742, 765, + 774, 776, 776, 777, 777, 778, 778, 780, 789, 798, + 810, 811, 811, 813, 813, 814, 816, 823, 823, 836, + 837, 839, 839, 840, 840, 842, 850, 853, 859, 858, + 864, 864, 865, 869, 873, 877, 881, 885, 889, 900, + 899, 979, 979, 980, 980, 980, 981, 981, 981, 982, + 982, 982, 984, 990, 996, 1002, 1013, 1019, 1026, 1025, + 1031, 1031, 1032, 1036, 1040, 1044, 1048, 1052, 1056, 1060, + 1064, 1068, 1072, 1076, 1080, 1084, 1088, 1092, 1096, 1100, + 1104, 1108, 1115, 1114, 1120, 1120, 1121, 1125, 1129, 1133, + 1137, 1141, 1145, 1149, 1153, 1157, 1161, 1165, 1169, 1173, + 1177, 1181, 1185, 1189, 1193, 1204, 1203, 1254, 1254, 1255, + 1256, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, + 1265, 1265, 1266, 1268, 1274, 1280, 1286, 1292, 1298, 1304, + 1310, 1316, 1322, 1329, 1335, 1341, 1351, 1350, 1357, 1356, + 1361, 1361, 1362, 1366, 1370, 1376, 1376, 1377, 1377, 1377, + 1377, 1377, 1379, 1379, 1381, 1381, 1383, 1397, 1417, 1423, + 1433, 1432, 1474, 1474, 1475, 1475, 1475, 1475, 1476, 1476, + 1476, 1477, 1477, 1479, 1485, 1491, 1497, 1509, 1508, 1514, + 1514, 1515, 1519, 1523, 1527, 1531, 1535, 1539, 1543, 1547, + 1551, 1557, 1571, 1580, 1594, 1593, 1602, 1602, 1603, 1603, + 1603, 1603, 1605, 1611, 1620, 1629, 1631, 1631, 1632, 1632, + 1634, 1650, 1649, 1674, 1674, 1675, 1675, 1675, 1675, 1677, + 1683, 1703, 1702, 1708, 1708, 1709, 1713, 1717, 1721, 1725, + 1729, 1733, 1737, 1741, 1745, 1755, 1754, 1775, 1775, 1776, + 1776, 1776, 1778, 1785, 1784, 1790, 1790, 1791, 1795, 1799, + 1803, 1807, 1811, 1815, 1819, 1823, 1827, 1837, 1836, 1902, + 1902, 1903, 1903, 1903, 1904, 1904, 1905, 1905, 1905, 1906, + 1906, 1906, 1907, 1907, 1908, 1910, 1916, 1922, 1928, 1941, + 1954, 1960, 1964, 1973, 1972, 1977, 1977, 1978, 1982, 1988, + 1999, 2005, 2011, 2017, 2033, 2032, 2095, 2094, 2100, 2100, + 2101, 2107, 2107, 2108, 2108, 2108, 2108, 2110, 2130, 2140, + 2139, 2166, 2166, 2167, 2167, 2167, 2169, 2175, 2184, 2186, + 2186, 2187, 2187, 2189, 2207, 2206, 2252, 2251, 2257, 2257, + 2258, 2264, 2264, 2265, 2265, 2265, 2265, 2267, 2273, 2282, + 2285, 2285, 2286, 2286, 2287, 2287, 2288, 2288, 2289, 2289, + 2290, 2290, 2291, 2292, 2293, 2293, 2294, 2294, 2295, 2295, + 2296, 2296, 2297, 2297, 2298, 2298, 2299, 2300, 2300, 2301, + 2301, 2302, 2302, 2303, 2303, 2304, 2304, 2305, 2306, 2306, + 2307, 2308, 2309, 2309, 2310, 2310, 2311, 2312, 2313, 2314, + 2314, 2315, 2318, 2323, 2329, 2335, 2341, 2346, 2351, 2356, 2361, 2366, 2371, 2376, 2381, 2386, 2391, 2396, 2401, 2406, - 2412, 2423, 2428, 2433, 2438, 2443, 2448, 2451, 2456, 2459, - 2464, 2469, 2474, 2479, 2484, 2489, 2494, 2499, 2504, 2515, - 2520, 2525, 2530, 2539, 2548, 2553, 2558, 2564, 2563, 2568, - 2568, 2569, 2572, 2575, 2578, 2581, 2584, 2587, 2590, 2593, - 2596, 2599, 2602, 2605, 2608, 2611, 2614, 2617, 2620, 2623, - 2626, 2632, 2631, 2636, 2636, 2637, 2640, 2643, 2646, 2649, - 2652, 2655, 2658, 2661, 2664, 2667, 2670, 2673, 2676, 2679, - 2682, 2685, 2688, 2691, 2694, 2699, 2704, 2709, 2718, 2721, - 2721, 2722, 2723, 2723, 2724, 2724, 2725, 2725, 2726, 2727, - 2727, 2728, 2729, 2729, 2730, 2730, 2732, 2737, 2742, 2747, + 2411, 2417, 2428, 2433, 2438, 2443, 2448, 2453, 2456, 2461, + 2464, 2469, 2474, 2479, 2484, 2489, 2494, 2499, 2504, 2509, + 2520, 2525, 2530, 2535, 2544, 2553, 2558, 2563, 2569, 2568, + 2573, 2573, 2574, 2577, 2580, 2583, 2586, 2589, 2592, 2595, + 2598, 2601, 2604, 2607, 2610, 2613, 2616, 2619, 2622, 2625, + 2628, 2631, 2637, 2636, 2641, 2641, 2642, 2645, 2648, 2651, + 2654, 2657, 2660, 2663, 2666, 2669, 2672, 2675, 2678, 2681, + 2684, 2687, 2690, 2693, 2696, 2699, 2704, 2709, 2714, 2723, + 2726, 2726, 2727, 2728, 2728, 2729, 2729, 2730, 2730, 2731, + 2732, 2732, 2733, 2734, 2734, 2735, 2735, 2737, 2742, 2747, 2752, 2757, 2762, 2767, 2772, 2777, 2782, 2787, 2792, 2797, - 2805, 2808, 2808, 2809, 2809, 2810, 2811, 2811, 2812, 2813, - 2815, 2821, 2827, 2836, 2850, 2856 + 2802, 2810, 2813, 2813, 2814, 2814, 2815, 2816, 2816, 2817, + 2818, 2820, 2826, 2832, 2841, 2855, 2861 }; #endif @@ -1351,13 +1353,13 @@ static const char *const yytname[] = "T_NCHANGE", "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_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", + "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", @@ -1471,76 +1473,76 @@ static const yytype_uint16 yytoknum[] = 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, 59, 125, 123, 61, 44 + 465, 466, 467, 468, 469, 59, 125, 123, 61, 44 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 219, 220, 220, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 222, 222, 223, 223, - 223, 223, 223, 223, 224, 224, 225, 225, 225, 225, - 226, 227, 227, 228, 228, 228, 229, 230, 231, 232, - 232, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 234, 235, 236, - 236, 237, 237, 238, 238, 239, 239, 240, 241, 242, - 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, - 253, 254, 254, 255, 255, 255, 255, 256, 257, 258, - 259, 260, 260, 261, 261, 261, 262, 264, 263, 265, - 265, 266, 266, 266, 266, 267, 268, 268, 270, 269, - 271, 271, 272, 272, 272, 272, 272, 272, 272, 274, - 273, 275, 275, 276, 276, 276, 276, 276, 276, 276, - 276, 276, 277, 278, 279, 280, 281, 282, 284, 283, - 285, 285, 286, 286, 286, 286, 286, 286, 286, 286, - 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, - 286, 286, 288, 287, 289, 289, 290, 290, 290, 290, - 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, - 290, 290, 290, 290, 290, 292, 291, 293, 293, 294, - 294, 294, 294, 294, 294, 294, 294, 294, 294, 294, - 294, 294, 294, 295, 296, 297, 298, 299, 300, 301, - 302, 303, 304, 305, 306, 307, 309, 308, 311, 310, - 312, 312, 313, 313, 313, 314, 314, 315, 315, 315, - 315, 315, 317, 316, 318, 318, 319, 319, 320, 321, - 323, 322, 324, 324, 325, 325, 325, 325, 325, 325, - 325, 325, 325, 326, 327, 328, 329, 331, 330, 332, - 332, 333, 333, 333, 333, 333, 333, 333, 333, 333, - 334, 335, 336, 338, 337, 339, 339, 340, 340, 340, - 340, 341, 342, 343, 344, 345, 345, 346, 346, 347, - 349, 348, 350, 350, 351, 351, 351, 351, 352, 353, - 355, 354, 356, 356, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 359, 358, 360, 360, 361, 361, - 361, 362, 364, 363, 365, 365, 366, 366, 366, 366, - 366, 366, 366, 366, 366, 366, 368, 367, 369, 369, - 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, - 370, 370, 370, 370, 371, 372, 373, 374, 375, 376, - 377, 377, 379, 378, 380, 380, 381, 381, 382, 383, - 384, 385, 386, 388, 387, 390, 389, 391, 391, 392, - 393, 393, 394, 394, 394, 394, 395, 396, 398, 397, - 399, 399, 400, 400, 400, 401, 402, 403, 404, 404, - 405, 405, 406, 408, 407, 410, 409, 411, 411, 412, - 413, 413, 414, 414, 414, 414, 415, 416, 417, 418, - 418, 419, 419, 419, 419, 419, 419, 419, 419, 419, - 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, - 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, - 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, - 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, - 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, + 0, 220, 221, 221, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 223, 223, 224, 224, + 224, 224, 224, 224, 225, 225, 226, 226, 226, 226, + 227, 228, 228, 229, 229, 229, 230, 231, 232, 233, + 233, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 235, 236, 237, + 237, 238, 238, 239, 239, 240, 240, 241, 242, 243, + 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, + 254, 255, 255, 256, 256, 256, 256, 257, 258, 259, + 260, 261, 261, 262, 262, 262, 263, 265, 264, 266, + 266, 267, 267, 267, 267, 268, 269, 269, 271, 270, + 272, 272, 273, 273, 273, 273, 273, 273, 273, 275, + 274, 276, 276, 277, 277, 277, 277, 277, 277, 277, + 277, 277, 278, 279, 280, 281, 282, 283, 285, 284, + 286, 286, 287, 287, 287, 287, 287, 287, 287, 287, + 287, 287, 287, 287, 287, 287, 287, 287, 287, 287, + 287, 287, 289, 288, 290, 290, 291, 291, 291, 291, + 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, + 291, 291, 291, 291, 291, 293, 292, 294, 294, 295, + 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, + 295, 295, 295, 296, 297, 298, 299, 300, 301, 302, + 303, 304, 305, 306, 307, 308, 310, 309, 312, 311, + 313, 313, 314, 314, 314, 315, 315, 316, 316, 316, + 316, 316, 318, 317, 319, 319, 320, 320, 321, 322, + 324, 323, 325, 325, 326, 326, 326, 326, 326, 326, + 326, 326, 326, 327, 328, 329, 330, 332, 331, 333, + 333, 334, 334, 334, 334, 334, 334, 334, 334, 334, + 334, 335, 336, 337, 339, 338, 340, 340, 341, 341, + 341, 341, 342, 343, 344, 345, 346, 346, 347, 347, + 348, 350, 349, 351, 351, 352, 352, 352, 352, 353, + 354, 356, 355, 357, 357, 358, 358, 358, 358, 358, + 358, 358, 358, 358, 358, 360, 359, 361, 361, 362, + 362, 362, 363, 365, 364, 366, 366, 367, 367, 367, + 367, 367, 367, 367, 367, 367, 367, 369, 368, 370, + 370, 371, 371, 371, 371, 371, 371, 371, 371, 371, + 371, 371, 371, 371, 371, 372, 373, 374, 375, 376, + 377, 378, 378, 380, 379, 381, 381, 382, 382, 383, + 384, 385, 386, 387, 389, 388, 391, 390, 392, 392, + 393, 394, 394, 395, 395, 395, 395, 396, 397, 399, + 398, 400, 400, 401, 401, 401, 402, 403, 404, 405, + 405, 406, 406, 407, 409, 408, 411, 410, 412, 412, + 413, 414, 414, 415, 415, 415, 415, 416, 417, 418, + 419, 419, 420, 420, 420, 420, 420, 420, 420, 420, + 420, 420, 420, 420, 420, 420, 420, 420, 420, 420, + 420, 420, 420, 420, 420, 420, 420, 420, 420, 420, + 420, 420, 420, 420, 420, 420, 420, 420, 420, 420, + 420, 420, 420, 420, 420, 420, 420, 420, 420, 420, + 420, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, - 439, 440, 441, 442, 443, 444, 445, 445, 446, 446, + 439, 440, 441, 442, 443, 444, 445, 446, 446, 447, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, - 457, 458, 459, 460, 461, 462, 463, 465, 464, 466, - 466, 467, 467, 467, 467, 467, 467, 467, 467, 467, - 467, 467, 467, 467, 467, 467, 467, 467, 467, 467, - 467, 469, 468, 470, 470, 471, 471, 471, 471, 471, - 471, 471, 471, 471, 471, 471, 471, 471, 471, 471, - 471, 471, 471, 471, 471, 472, 473, 474, 475, 476, - 476, 477, 477, 477, 477, 477, 477, 477, 477, 477, - 477, 477, 477, 477, 477, 477, 478, 479, 480, 481, + 457, 458, 459, 460, 461, 462, 463, 464, 466, 465, + 467, 467, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, + 468, 468, 470, 469, 471, 471, 472, 472, 472, 472, + 472, 472, 472, 472, 472, 472, 472, 472, 472, 472, + 472, 472, 472, 472, 472, 472, 473, 474, 475, 476, + 477, 477, 478, 478, 478, 478, 478, 478, 478, 478, + 478, 478, 478, 478, 478, 478, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, - 492, 493, 493, 494, 494, 494, 494, 494, 494, 494, - 495, 496, 497, 498, 499, 500 + 492, 493, 494, 494, 495, 495, 495, 495, 495, 495, + 495, 496, 497, 498, 499, 500, 501 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1574,41 +1576,41 @@ static const yytype_uint8 yyr2[] = 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, - 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, 2, 4, 4, 4, 4, 4, 4, - 4, 4, 0, 5, 3, 1, 1, 1, 4, 4, - 4, 4, 4, 0, 6, 0, 5, 3, 1, 1, - 2, 1, 1, 1, 1, 1, 4, 4, 0, 6, - 2, 1, 1, 1, 1, 4, 4, 5, 2, 1, - 1, 1, 4, 0, 6, 0, 5, 3, 1, 1, - 2, 1, 1, 1, 1, 1, 4, 4, 5, 2, + 1, 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, 2, 4, 4, 4, 4, 4, + 4, 4, 4, 0, 5, 3, 1, 1, 1, 4, + 4, 4, 4, 4, 0, 6, 0, 5, 3, 1, + 1, 2, 1, 1, 1, 1, 1, 4, 4, 0, + 6, 2, 1, 1, 1, 1, 4, 4, 5, 2, + 1, 1, 1, 4, 0, 6, 0, 5, 3, 1, + 1, 2, 1, 1, 1, 1, 1, 4, 4, 5, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 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, 0, 5, 3, - 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, + 4, 4, 4, 4, 4, 4, 4, 4, 0, 5, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 4, 4, 4, 5, 2, + 1, 1, 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, + 1, 1, 1, 1, 1, 1, 4, 4, 4, 5, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 4, 4, 4, 4, 4, 4 + 4, 5, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 4, 4, 4, 4, 4, 4 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -1616,129 +1618,129 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 0, 0, 0, 195, 346, 398, 0, - 413, 0, 250, 383, 226, 0, 0, 129, 283, 0, - 0, 300, 324, 0, 3, 23, 11, 4, 5, 6, + 2, 0, 1, 0, 0, 0, 195, 347, 399, 0, + 414, 0, 250, 384, 226, 0, 0, 129, 284, 0, + 0, 301, 325, 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, 92, 93, 95, 94, 595, 0, 0, 0, + 0, 0, 92, 93, 95, 94, 596, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 580, 594, 590, 582, 583, 584, 585, 586, - 581, 587, 588, 589, 591, 592, 593, 0, 0, 0, - 411, 0, 0, 409, 410, 0, 480, 0, 0, 0, + 0, 0, 581, 595, 591, 583, 584, 585, 586, 587, + 582, 588, 589, 590, 592, 593, 594, 0, 0, 0, + 412, 0, 0, 410, 411, 0, 481, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 551, 0, 527, 0, + 0, 0, 0, 0, 0, 0, 552, 0, 528, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 430, 478, 472, - 473, 474, 475, 476, 471, 441, 431, 432, 466, 433, - 434, 435, 436, 437, 438, 439, 440, 468, 442, 443, - 477, 445, 450, 446, 448, 447, 461, 462, 449, 451, - 452, 453, 454, 455, 444, 457, 458, 459, 479, 469, - 470, 467, 460, 456, 464, 465, 463, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 431, 479, 473, + 474, 475, 476, 477, 472, 442, 432, 433, 467, 434, + 435, 436, 437, 438, 439, 440, 441, 469, 443, 444, + 478, 446, 451, 447, 449, 448, 462, 463, 450, 452, + 453, 454, 455, 456, 445, 458, 459, 460, 480, 470, + 471, 468, 461, 457, 465, 466, 464, 0, 0, 0, 0, 0, 0, 102, 103, 104, 0, 0, 0, 0, - 0, 42, 43, 44, 0, 0, 619, 0, 0, 0, - 0, 0, 0, 0, 612, 613, 614, 617, 615, 616, - 618, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 42, 43, 44, 0, 0, 620, 0, 0, 0, + 0, 0, 0, 0, 613, 614, 615, 618, 616, 617, + 619, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 63, 64, 62, 59, 58, 65, 51, 61, 54, 55, 56, - 52, 60, 57, 53, 0, 0, 298, 0, 0, 296, - 297, 96, 0, 0, 0, 0, 91, 0, 0, 0, + 52, 60, 57, 53, 0, 0, 299, 0, 0, 297, + 298, 96, 0, 0, 0, 0, 91, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 579, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 198, 199, 202, 204, 205, 206, 207, 208, 209, 210, 211, 200, - 201, 203, 0, 0, 0, 0, 0, 372, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 349, 350, 351, - 352, 353, 354, 356, 355, 358, 362, 359, 360, 361, - 357, 404, 0, 0, 0, 401, 402, 403, 0, 0, - 408, 425, 0, 0, 415, 424, 0, 421, 422, 423, + 201, 203, 0, 0, 0, 0, 0, 373, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 350, 351, 352, + 353, 354, 355, 357, 356, 359, 363, 360, 361, 362, + 358, 405, 0, 0, 0, 402, 403, 404, 0, 0, + 409, 426, 0, 0, 416, 425, 0, 422, 423, 424, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 429, 0, 0, 0, 267, 0, 0, 0, 0, 0, + 430, 0, 0, 0, 267, 0, 0, 0, 0, 0, 0, 253, 254, 255, 256, 261, 257, 258, 259, 260, - 395, 0, 385, 0, 394, 0, 391, 392, 393, 0, + 396, 0, 386, 0, 395, 0, 392, 393, 394, 0, 228, 0, 0, 0, 238, 0, 236, 237, 239, 240, 105, 0, 0, 101, 0, 45, 0, 0, 0, 41, 0, 0, 0, 172, 0, 0, 0, 148, 0, 0, 132, 133, 134, 135, 138, 139, 137, 136, 140, 0, - 0, 0, 0, 0, 286, 287, 288, 289, 0, 0, - 0, 0, 0, 0, 0, 611, 66, 0, 0, 0, + 0, 0, 0, 0, 287, 288, 289, 290, 0, 0, + 0, 0, 0, 0, 0, 612, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 49, 0, 0, 310, 0, 0, 303, - 304, 305, 306, 0, 0, 332, 0, 327, 328, 329, - 0, 0, 295, 0, 0, 0, 90, 0, 0, 0, + 0, 0, 0, 49, 0, 0, 311, 0, 0, 304, + 305, 306, 307, 0, 0, 333, 0, 328, 329, 330, + 0, 0, 296, 0, 0, 0, 90, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 578, 212, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 197, 363, + 0, 0, 579, 212, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 197, 364, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 348, 0, 0, 0, 400, 0, - 407, 0, 0, 0, 0, 420, 0, 0, 0, 0, + 0, 0, 0, 0, 349, 0, 0, 0, 401, 0, + 408, 0, 0, 0, 0, 421, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 428, 262, 0, + 0, 0, 0, 0, 0, 0, 0, 429, 262, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 0, - 0, 0, 0, 390, 241, 0, 0, 0, 0, 0, + 0, 0, 0, 391, 241, 0, 0, 0, 0, 0, 235, 0, 100, 0, 0, 0, 40, 141, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 131, 290, 0, - 0, 0, 0, 285, 0, 0, 0, 0, 0, 0, - 610, 0, 0, 0, 0, 0, 0, 0, 0, 71, + 0, 0, 0, 0, 0, 0, 0, 131, 291, 0, + 0, 0, 0, 286, 0, 0, 0, 0, 0, 0, + 611, 0, 0, 0, 0, 0, 0, 0, 0, 71, 72, 0, 70, 75, 76, 0, 74, 0, 0, 0, - 0, 0, 48, 307, 0, 0, 0, 0, 302, 330, - 0, 0, 0, 326, 0, 294, 99, 98, 97, 605, - 604, 596, 26, 26, 26, 26, 26, 28, 27, 598, - 599, 603, 601, 600, 606, 607, 608, 609, 602, 597, + 0, 0, 48, 308, 0, 0, 0, 0, 303, 331, + 0, 0, 0, 327, 0, 295, 99, 98, 97, 606, + 605, 597, 26, 26, 26, 26, 26, 28, 27, 599, + 600, 604, 602, 601, 607, 608, 609, 610, 603, 598, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 196, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 347, - 0, 0, 399, 412, 0, 0, 0, 414, 493, 497, - 511, 577, 525, 491, 519, 522, 492, 483, 482, 484, - 485, 486, 500, 489, 490, 501, 488, 496, 495, 494, - 520, 481, 518, 575, 576, 515, 512, 562, 555, 572, - 573, 556, 557, 558, 559, 567, 560, 570, 574, 563, - 568, 564, 569, 561, 566, 565, 571, 0, 554, 517, - 537, 531, 548, 549, 532, 533, 534, 535, 543, 536, - 546, 550, 539, 544, 540, 545, 538, 542, 541, 547, - 0, 530, 510, 513, 524, 487, 514, 503, 508, 509, - 506, 507, 504, 505, 499, 498, 523, 526, 516, 521, - 502, 0, 0, 0, 0, 0, 0, 0, 0, 251, - 0, 0, 0, 384, 0, 0, 0, 246, 242, 245, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 348, + 0, 0, 400, 413, 0, 0, 0, 415, 494, 498, + 512, 578, 526, 492, 520, 523, 493, 484, 483, 485, + 486, 487, 501, 490, 491, 502, 489, 497, 496, 495, + 521, 482, 519, 576, 577, 516, 513, 563, 556, 573, + 574, 557, 558, 559, 560, 568, 561, 571, 575, 564, + 569, 565, 570, 562, 567, 566, 572, 0, 555, 518, + 538, 532, 549, 550, 533, 534, 535, 536, 544, 537, + 547, 551, 540, 545, 541, 546, 539, 543, 542, 548, + 0, 531, 511, 514, 525, 488, 515, 504, 509, 510, + 507, 508, 505, 506, 500, 499, 524, 527, 517, 522, + 503, 0, 0, 0, 0, 0, 0, 0, 0, 251, + 0, 0, 0, 385, 0, 0, 0, 246, 242, 245, 227, 106, 0, 0, 118, 0, 0, 110, 111, 113, 112, 46, 47, 0, 0, 0, 0, 0, 0, 0, - 0, 130, 0, 0, 0, 284, 620, 624, 622, 625, - 621, 623, 83, 89, 81, 85, 84, 78, 77, 79, + 0, 130, 0, 0, 0, 285, 621, 625, 623, 626, + 622, 624, 83, 89, 81, 85, 84, 78, 77, 79, 67, 0, 68, 0, 82, 80, 88, 86, 87, 0, - 0, 0, 301, 0, 0, 325, 299, 29, 30, 31, + 0, 0, 302, 0, 0, 326, 300, 29, 30, 31, 32, 33, 223, 224, 216, 218, 220, 219, 217, 213, 225, 215, 214, 34, 34, 34, 36, 35, 221, 222, - 368, 370, 371, 381, 378, 376, 377, 0, 375, 365, - 379, 380, 364, 369, 367, 382, 366, 405, 406, 426, - 427, 419, 0, 418, 552, 0, 528, 0, 265, 266, - 275, 272, 277, 274, 273, 279, 276, 278, 271, 0, - 270, 264, 282, 281, 280, 263, 397, 389, 0, 388, - 396, 233, 234, 232, 0, 231, 249, 248, 0, 0, - 0, 114, 0, 0, 0, 0, 109, 147, 145, 187, - 184, 183, 176, 178, 194, 188, 191, 186, 177, 192, - 180, 189, 193, 181, 190, 185, 179, 182, 0, 175, - 142, 144, 146, 158, 152, 169, 170, 153, 154, 155, - 156, 164, 157, 167, 171, 160, 165, 161, 166, 159, - 163, 162, 168, 0, 151, 143, 292, 293, 291, 69, - 73, 308, 314, 320, 323, 316, 322, 317, 321, 319, - 315, 318, 0, 313, 309, 331, 336, 342, 345, 338, - 344, 339, 343, 341, 337, 340, 0, 335, 37, 38, - 39, 373, 0, 416, 0, 553, 529, 268, 0, 386, - 0, 229, 0, 247, 244, 243, 0, 0, 0, 0, - 108, 173, 0, 149, 0, 311, 0, 333, 0, 374, - 417, 269, 387, 230, 115, 124, 127, 126, 123, 128, - 125, 122, 0, 121, 117, 116, 174, 150, 312, 334, - 119, 0, 120 + 369, 371, 372, 382, 379, 377, 378, 0, 376, 366, + 380, 381, 365, 370, 368, 383, 367, 406, 407, 427, + 428, 420, 0, 419, 553, 0, 529, 0, 265, 266, + 275, 272, 277, 274, 273, 280, 276, 278, 271, 279, + 0, 270, 264, 283, 282, 281, 263, 398, 390, 0, + 389, 397, 233, 234, 232, 0, 231, 249, 248, 0, + 0, 0, 114, 0, 0, 0, 0, 109, 147, 145, + 187, 184, 183, 176, 178, 194, 188, 191, 186, 177, + 192, 180, 189, 193, 181, 190, 185, 179, 182, 0, + 175, 142, 144, 146, 158, 152, 169, 170, 153, 154, + 155, 156, 164, 157, 167, 171, 160, 165, 161, 166, + 159, 163, 162, 168, 0, 151, 143, 293, 294, 292, + 69, 73, 309, 315, 321, 324, 317, 323, 318, 322, + 320, 316, 319, 0, 314, 310, 332, 337, 343, 346, + 339, 345, 340, 344, 342, 338, 341, 0, 336, 37, + 38, 39, 374, 0, 417, 0, 554, 530, 268, 0, + 387, 0, 229, 0, 247, 244, 243, 0, 0, 0, + 0, 108, 173, 0, 149, 0, 312, 0, 334, 0, + 375, 418, 269, 388, 230, 115, 124, 127, 126, 123, + 128, 125, 122, 0, 121, 117, 116, 174, 150, 313, + 335, 119, 0, 120 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -1749,19 +1751,19 @@ static const yytype_int16 yydefgoto[] = 746, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 27, 71, 72, 73, 74, 75, 28, 222, 223, 224, 225, 226, 946, 947, 948, 949, - 950, 1083, 1212, 1213, 29, 60, 499, 500, 501, 502, - 503, 504, 505, 506, 507, 714, 1133, 1134, 508, 710, - 1108, 1109, 30, 49, 327, 328, 329, 330, 331, 332, + 950, 1084, 1213, 1214, 29, 60, 499, 500, 501, 502, + 503, 504, 505, 506, 507, 714, 1134, 1135, 508, 710, + 1109, 1110, 30, 49, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 31, - 57, 474, 695, 1074, 1075, 475, 476, 477, 1080, 938, + 57, 474, 695, 1075, 1076, 475, 476, 477, 1081, 938, 939, 478, 479, 32, 55, 450, 451, 452, 453, 454, - 455, 456, 681, 1059, 1060, 457, 458, 459, 33, 61, + 455, 456, 681, 1060, 1061, 457, 458, 459, 33, 61, 513, 514, 515, 516, 517, 34, 288, 289, 290, 35, - 64, 548, 549, 550, 551, 552, 755, 1152, 1153, 36, - 65, 556, 557, 558, 559, 761, 1166, 1167, 37, 50, + 64, 548, 549, 550, 551, 552, 755, 1153, 1154, 36, + 65, 556, 557, 558, 559, 761, 1167, 1168, 37, 50, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 604, 1027, 1028, 366, 367, 368, 369, 370, 38, 56, - 464, 690, 1068, 1069, 465, 466, 467, 468, 39, 51, + 464, 690, 1069, 1070, 465, 466, 467, 468, 39, 51, 374, 375, 376, 377, 40, 112, 113, 114, 41, 53, 385, 623, 1042, 1043, 386, 387, 388, 389, 42, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, @@ -1777,166 +1779,166 @@ static const yytype_int16 yydefgoto[] = /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -745 +#define YYPACT_NINF -678 static const yytype_int16 yypact[] = { - -745, 615, -745, -209, -208, -192, -745, -745, -745, -190, - -745, -183, -745, -745, -745, -169, -167, -745, -745, -144, - -137, -745, -745, -132, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, 292, 784, -111, - -102, -93, 22, -90, 389, -80, -74, -72, 50, 15, - -65, -60, 299, 388, -54, -34, 18, -176, -58, -32, - -22, 3, -745, -745, -745, -745, -745, -15, -9, 26, - 38, 67, 69, 75, 80, 82, 88, 90, 93, 100, - 107, 195, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, 569, 505, 13, - -745, 115, 12, -745, -745, 258, -745, 117, 122, 129, - 131, 140, 141, 144, 145, 146, 154, 155, 156, 159, - 161, 165, 166, 168, 170, 174, 175, 176, 177, 180, - 190, 194, 197, 199, 203, 204, -745, 205, -745, 206, - 209, 211, 212, 215, 219, 221, 224, 225, 229, 230, - 233, 234, 236, 237, 239, 240, 36, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, 343, 60, 284, - -157, 241, 43, -745, -745, -745, 66, 113, 242, 245, - 99, -745, -745, -745, 348, 62, -745, 249, 253, 264, - 266, 267, 271, 16, -745, -745, -745, -745, -745, -745, - -745, 268, 273, 274, 280, 281, 285, 287, 290, 294, - 295, 296, 297, 306, 307, 308, 309, 74, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, 220, 277, -745, 310, 20, -745, - -745, -745, 252, 370, 384, 302, -745, 410, 430, 371, - 432, 432, 433, 434, 436, 379, 390, 453, 432, 395, - 396, 342, -745, 345, 349, 350, 352, 354, 355, 357, - 360, 361, 362, 363, 365, 366, 369, 152, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, 346, 372, 381, 385, 386, -745, 392, 393, - 397, 400, 401, 405, 407, 408, 270, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, 409, 413, 51, -745, -745, -745, 445, 351, - -745, -745, 414, 417, -745, -745, 8, -745, -745, -745, - 428, 432, 432, 502, 446, 447, 508, 495, 454, 432, - 461, 432, 528, 536, 537, 480, 485, 493, 432, 556, - 557, 432, 562, 563, 548, 567, 568, 512, 513, 456, - 519, 459, 432, 432, 521, 522, 523, 524, 14, 54, - 530, 532, 432, 432, 570, 432, 533, 535, 538, 474, - -745, 481, 479, 483, -745, 484, 488, 492, 498, 501, - 128, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, 503, -745, 506, -745, 19, -745, -745, -745, 514, - -745, 515, 518, 520, -745, 116, -745, -745, -745, -745, - -745, 539, 516, -745, 496, -745, 602, 612, 526, -745, - 527, 531, 534, -745, 540, 544, 545, -745, 553, 183, - -745, -745, -745, -745, -745, -745, -745, -745, -745, 541, - 560, 561, 573, 11, -745, -745, -745, -745, 572, 575, - 621, 584, 585, 432, 542, -745, -745, 629, 586, 630, - 632, 636, 637, 663, 670, 112, 196, 684, 691, 674, - 696, 701, 605, -745, 619, 617, -745, 622, 59, -745, - -745, -745, -745, 627, 626, -745, 110, -745, -745, -745, - 719, 633, -745, 635, 638, 639, -745, 641, 642, 646, - 265, 647, 648, 649, 650, 651, 652, 653, 654, 655, - 657, 658, -745, -745, 771, 774, 432, 775, 776, 777, - 778, 761, 782, 783, 432, 785, 785, 669, -745, -745, - 768, 164, 769, 728, 671, 772, 773, 779, 780, 792, - 781, 786, 787, 680, -745, 788, 789, 681, -745, 685, - -745, 790, 791, 683, 687, -745, 695, 697, 698, 699, - 700, 702, 703, 704, 705, 706, 707, 708, 709, 710, - 711, 712, 713, 714, 715, 716, 717, 718, 720, 721, - 722, 723, 724, 725, 726, 600, 727, 628, 729, 730, + -678, 581, -678, -132, -213, -211, -678, -678, -678, -200, + -678, -194, -678, -678, -678, -191, -189, -678, -678, -181, + -179, -678, -678, -176, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, 285, 812, -143, + -106, -103, 18, -88, 349, -79, -73, -68, 62, 68, + -66, -57, 388, 387, -43, -21, 15, -182, -16, -11, + -9, 8, -678, -678, -678, -678, -678, -4, 59, 71, + 94, 97, 110, 131, 134, 136, 141, 142, 144, 145, + 146, 155, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, 622, 419, 29, + -678, 147, 44, -678, -678, 198, -678, 148, 158, 163, + 164, 165, 167, 168, 169, 174, 179, 182, 183, 188, + 189, 192, 195, 196, 200, 205, 212, 227, 229, 230, + 232, 243, 246, 248, 249, 250, -678, 251, -678, 252, + 254, 255, 256, 263, 264, 267, 268, 271, 273, 274, + 275, 276, 277, 279, 280, 281, 36, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, 448, 4, 257, + 65, 283, 45, -678, -678, -678, 80, 88, 284, 294, + 49, -678, -678, -678, 426, 13, -678, 295, 302, 303, + 304, 305, 307, 7, -678, -678, -678, -678, -678, -678, + -678, 187, 308, 309, 310, 311, 312, 314, 316, 318, + 319, 321, 322, 323, 324, 325, 326, 74, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, 11, 28, -678, 327, 53, -678, + -678, -678, 253, 286, 299, 202, -678, 384, 447, 390, + 456, 456, 459, 460, 464, 405, 406, 467, 456, 413, + 414, 332, -678, 359, 357, 358, 361, 365, 366, 369, + 370, 373, 374, 375, 376, 383, 385, 156, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, 362, 392, 393, 394, 395, -678, 396, 398, + 400, 403, 404, 407, 408, 412, 210, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, 415, 416, 66, -678, -678, -678, 488, 391, + -678, -678, 418, 421, -678, -678, 39, -678, -678, -678, + 472, 456, 456, 541, 483, 485, 546, 529, 489, 456, + 490, 456, 548, 551, 554, 496, 497, 499, 456, 560, + 562, 456, 563, 564, 547, 566, 568, 509, 511, 454, + 515, 457, 456, 456, 517, 519, 520, 521, 181, 184, + 523, 526, 456, 456, 569, 456, 528, 532, 533, 473, + -678, 478, 479, 486, -678, 487, 491, 492, 494, 495, + 199, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, 500, -678, 501, -678, 69, -678, -678, -678, 481, + -678, 502, 506, 513, -678, 51, -678, -678, -678, -678, + -678, 542, 493, -678, 498, -678, 585, 589, 512, -678, + 518, 514, 516, -678, 525, 535, 538, -678, 540, 56, + -678, -678, -678, -678, -678, -678, -678, -678, -678, 531, + 545, 549, 550, 33, -678, -678, -678, -678, 555, 558, + 590, 576, 591, 456, 536, -678, -678, 649, 601, 652, + 653, 655, 656, 662, 669, 46, 213, 670, 672, 695, + 679, 683, 587, -678, 588, 586, -678, 598, 20, -678, + -678, -678, -678, 605, 608, -678, 152, -678, -678, -678, + 689, 623, -678, 625, 627, 629, -678, 630, 631, 632, + 193, 633, 634, 636, 639, 640, 641, 646, 648, 650, + 651, 658, -678, -678, 724, 759, 456, 765, 768, 771, + 772, 755, 775, 777, 456, 778, 778, 665, -678, -678, + 764, 180, 766, 723, 666, 773, 774, 776, 779, 789, + 780, 781, 782, 674, -678, 783, 784, 677, -678, 680, + -678, 785, 786, 676, 690, -678, 691, 694, 696, 697, + 698, 699, 700, 701, 702, 703, 704, 707, 708, 709, + 710, 711, 712, 713, 714, 716, 717, 718, 719, 720, + 721, 722, 725, 726, 727, 573, 728, 609, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, - 741, 742, 743, 744, 745, 746, 747, -745, -745, 798, - 803, 748, 816, 843, 846, 847, 849, 753, -745, 851, - 752, 853, 757, -745, -745, 755, 856, 857, 876, 762, - -745, 763, -745, 187, 764, 765, -745, -745, 863, 822, - 766, 865, 867, 868, 770, 869, 793, -745, -745, 871, - 872, 873, 794, -745, 795, 796, 797, 799, 800, 801, - -745, 802, 804, 805, 806, 807, 808, 809, 810, -745, - -745, -196, -745, -745, -745, -179, -745, 811, 812, 813, - 814, 815, -745, -745, 874, 817, 875, 818, -745, -745, - 877, 819, 821, -745, 823, -745, -745, -745, -745, -745, - -745, -745, 432, 432, 432, 432, 432, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - 824, 825, 826, 827, 828, 829, 830, 831, 832, 833, - 834, 79, 835, 836, -745, 837, 838, 839, 840, 841, - -1, 842, 844, 845, 848, 850, 852, 854, 855, -745, - 858, 859, -745, -745, 860, 861, 878, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -178, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -173, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, 862, 864, 693, 866, 870, 879, 880, 881, -745, - 882, 883, 884, -745, -36, 885, 886, 894, 887, -745, - -745, -745, 888, 889, -745, 890, 86, -745, -745, -745, - -745, -745, -745, 895, 896, 517, 897, 898, 899, 656, - 900, -745, 901, 902, 903, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, 112, -745, 196, -745, -745, -745, -745, -745, 904, - 464, 905, -745, 906, 529, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, 785, 785, 785, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -168, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -160, -745, -745, 600, -745, 628, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -159, - -745, -745, -745, -745, -745, -745, -745, -745, -57, -745, - -745, -745, -745, -745, -38, -745, -745, -745, 907, 876, - 908, -745, 913, 891, -88, 909, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -7, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, 63, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, 94, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, 101, -745, -745, -745, - -745, -745, -1, -745, 878, -745, -745, -745, 693, -745, - 883, -745, -36, -745, -745, -745, 910, 403, 911, 912, - -745, -745, 517, -745, 656, -745, 464, -745, 529, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, 104, -745, -745, -745, -745, -745, -745, -745, - -745, 403, -745 + 741, 742, 743, 744, 745, 746, 747, -678, -678, 787, + 751, 748, 822, 864, 847, 848, 850, 753, -678, 852, + 752, 854, 757, -678, -678, 756, 856, 858, 877, 762, + -678, 763, -678, 185, 767, 769, -678, -678, 862, 821, + 770, 866, 868, 869, 788, 870, 790, -678, -678, 872, + 873, 874, 792, -678, 793, 794, 795, 796, 797, 798, + -678, 799, 800, 801, 802, 803, 804, 805, 806, -678, + -678, -204, -678, -678, -678, -197, -678, 807, 808, 809, + 810, 811, -678, -678, 875, 813, 876, 814, -678, -678, + 878, 815, 817, -678, 819, -678, -678, -678, -678, -678, + -678, -678, 456, 456, 456, 456, 456, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + 820, 823, 824, 825, 826, 827, 828, 829, 830, 831, + 832, 297, 833, 834, -678, 835, 836, 837, 838, 839, + 5, 840, 841, 842, 843, 844, 845, 846, 849, -678, + 851, 853, -678, -678, 855, 857, 859, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -195, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -184, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, 860, 861, 537, 863, 865, 867, 871, 879, -678, + 880, 881, 882, -678, -26, 883, 884, 899, 818, -678, + -678, -678, 885, 886, -678, 887, 129, -678, -678, -678, + -678, -678, -678, 888, 891, 484, 892, 893, 894, 643, + 895, -678, 896, 897, 898, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, 46, -678, 213, -678, -678, -678, -678, -678, 900, + 657, 901, -678, 902, 664, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, 778, 778, 778, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -166, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -164, -678, -678, 573, -678, 609, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -147, -678, -678, -678, -678, -678, -678, -678, -678, -130, + -678, -678, -678, -678, -678, -46, -678, -678, -678, 903, + 877, 904, -678, 910, 905, -92, 906, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -7, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, 76, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, 82, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, 85, -678, -678, + -678, -678, -678, 5, -678, 859, -678, -678, -678, 537, + -678, 881, -678, -26, -678, -678, -678, 907, 265, 909, + 911, -678, -678, 484, -678, 643, -678, 657, -678, 664, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, 95, -678, -678, -678, -678, -678, -678, + -678, -678, 265, -678 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -745, -745, -745, -744, -298, -659, -595, -745, -745, 767, - -745, -745, -745, -745, 750, -745, -745, -745, 17, -745, - 10, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, 924, -745, -745, -745, - -745, -745, 914, -745, -745, -745, -745, 53, -745, -745, - -745, -745, -745, -225, -745, -745, -745, 504, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -193, -745, -745, - -745, -188, -745, -745, -745, 675, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -170, -745, 558, -745, -745, -745, - -48, -745, -745, -745, -745, -745, 610, -745, -745, -745, - -745, -745, -745, -745, -117, -745, -745, -745, -745, -745, - -745, 550, -745, -745, -745, -745, -745, 892, -745, -745, - -745, -745, 543, -745, -745, -745, -745, -745, -131, -745, - -745, -745, 511, -745, -745, -745, -745, -128, -745, -745, - -745, 820, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -101, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -103, -745, 614, -745, -745, -745, -745, - -745, 754, -745, -745, -745, -745, 969, -745, -745, -745, - -745, -745, -745, -92, -745, 749, -745, -745, -745, -745, - 917, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, -745, -745, -745, 39, -745, - -745, -745, 40, -745, -745, -745, -745, -745, 996, -745, - -745, -745, -745, -745, -745, -745, -745, -745, -745, -745, - -745, -745, -745, -745, -745, 915, -745, -745, -745, -745, - -745, -745 + -678, -678, -678, -451, -298, -677, -595, -678, -678, 890, + -678, -678, -678, -678, 761, -678, -678, -678, 16, -678, + 17, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, 923, -678, -678, -678, + -678, -678, 908, -678, -678, -678, -678, 50, -678, -678, + -678, -678, -678, -224, -678, -678, -678, 505, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -196, -678, -678, + -678, -192, -678, -678, -678, 750, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -153, -678, 561, -678, -678, -678, + -17, -678, -678, -678, -678, -678, 615, -678, -678, -678, + -678, -678, -678, -678, -112, -678, -678, -678, -678, -678, + -678, 556, -678, -678, -678, -678, -678, 791, -678, -678, + -678, -678, 539, -678, -678, -678, -678, -678, -126, -678, + -678, -678, 527, -678, -678, -678, -678, -125, -678, -678, + -678, 758, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -100, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -97, -678, 616, -678, -678, -678, -678, + -678, 715, -678, -678, -678, -678, 973, -678, -678, -678, + -678, -678, -678, -87, -678, 705, -678, -678, -678, -678, + 924, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, 54, -678, + -678, -678, 47, -678, -678, -678, -678, -678, 1002, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, 889, -678, -678, -678, -678, + -678, -678 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1945,383 +1947,373 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -108 static const yytype_int16 yytable[] = { - 802, 803, 571, 572, 67, 45, 46, 1025, 47, 381, - 579, 801, 509, 110, 371, 1071, 227, 236, 980, 286, - 460, 286, 981, 110, 48, 510, 52, 68, 997, 998, - 999, 1000, 1001, 54, 69, 982, 1044, 116, 291, 983, - 1045, 1046, 117, 118, 220, 1047, 1171, 58, 119, 59, - 1172, 220, 371, 237, 1173, 1177, 120, 480, 1174, 1178, - 544, 460, 121, 509, 122, 123, 124, 238, 239, 240, - 241, 125, 62, 111, 372, 251, 510, 126, 127, 63, - 128, 129, 130, 111, 66, 242, 131, 942, 1013, 1014, - 1015, 132, 70, 627, 628, 133, 134, 382, 252, 135, - 227, 635, 228, 637, 511, 107, 1188, 287, 136, 287, - 644, 553, 372, 647, 108, 137, 138, 469, 139, 140, - 141, 142, 143, 109, 658, 659, 115, 383, 229, 441, - 512, 253, 373, 144, 670, 671, 217, 673, 461, 145, - 146, 147, 218, 148, 219, 442, 149, 150, 545, 1072, - 151, 234, 470, 313, 1073, 511, 235, 1179, 384, 292, - 443, 1180, 284, 254, 444, 255, 256, 314, 315, 462, - 373, 316, 471, 664, 665, 943, 1181, 472, 801, 461, - 1182, 512, 285, 152, 490, 293, 228, 153, 942, 1026, - 154, 155, 156, 157, 158, 294, 76, 159, 160, 554, - 491, 257, 297, 258, 259, 260, 261, 1191, 298, 546, - 462, 1192, 229, 666, 667, 492, 77, 78, 295, 493, - 262, 544, 79, 624, 463, 729, 722, 379, 317, 318, - 319, 524, 473, 320, 692, 561, 944, 161, 162, 163, - 445, 321, 164, 299, 263, 739, 740, 165, 446, 447, - 221, 439, 322, 323, 264, 300, -107, 221, 482, 381, - 555, 80, 81, -107, 547, 463, 617, 324, 82, 83, - 84, 342, 494, 343, 757, 344, 943, 1193, 553, 484, - 448, 1194, 265, 266, 301, 469, 302, 345, 792, 542, - 85, 86, 303, 67, 325, 495, 800, 304, 945, 305, - 236, 1085, 346, 87, 88, 306, 347, 307, 1195, 545, - 308, 496, 1196, 89, 488, 1197, 68, 309, 1220, 1198, - 470, 90, 1221, 69, 310, 762, 348, 485, 349, 743, - 744, 699, 378, 449, 390, 326, 237, 944, 350, 391, - 471, 806, 807, 687, 441, 472, 392, 382, 393, 490, - 238, 239, 240, 241, 1168, 1169, 1170, 394, 395, 351, - 442, 396, 397, 398, 570, 491, 554, 597, 242, 563, - 546, 399, 400, 401, 497, 443, 402, 383, 403, 444, - 492, 70, 404, 405, 493, 406, 352, 407, 498, 251, - 116, 408, 409, 410, 411, 117, 118, 412, 716, 945, - 473, 119, 772, 773, 774, 775, 776, 413, 384, 120, - 311, 414, 252, 353, 415, 121, 416, 122, 123, 124, - 417, 418, 420, 422, 125, 547, 423, 555, 424, 425, - 126, 127, 426, 128, 129, 130, 427, 494, 428, 131, - 354, 429, 430, 1205, 132, 253, 431, 432, 133, 134, - 433, 434, 135, 435, 436, 445, 437, 438, 481, 486, - 495, 136, 487, 446, 447, 1206, 518, 1207, 137, 138, - 519, 139, 140, 141, 142, 143, 496, 254, 355, 255, - 256, 520, 526, 521, 522, 613, 144, 564, 523, 1189, - 527, 528, 145, 146, 147, 448, 148, 529, 530, 149, - 150, 565, 531, 151, 532, 1208, 342, 533, 343, 567, - 344, 534, 535, 536, 537, 257, 566, 258, 259, 260, - 261, 1089, 345, 538, 539, 540, 541, 560, 1142, 568, - 569, 570, 573, 574, 262, 575, 152, 346, 576, 497, - 153, 347, 1090, 154, 155, 156, 157, 158, 449, 577, - 159, 160, 578, 498, 580, 581, 582, 1091, 263, 583, - 599, 348, 619, 349, 1092, 620, 584, 585, 264, 586, - 313, 587, 588, 350, 589, 1209, 1210, 590, 591, 592, - 593, 1093, 594, 595, 314, 315, 596, 626, 316, 600, - 161, 162, 163, 1156, 351, 164, 265, 266, 601, 1143, - 165, 629, 602, 603, 1094, 630, 631, 632, 1211, 605, - 606, 1095, 633, 634, 607, 2, 3, 608, 609, 4, - 636, 352, 610, 1096, 611, 612, 615, 638, 1144, 5, - 616, 621, 6, 7, 622, 639, 640, 1145, 8, 641, - 1097, 1098, 1099, 1146, 642, 317, 318, 319, 353, 9, - 320, 857, 643, 10, 11, 645, 646, 1147, 321, 1148, - 1149, 648, 649, 12, 1157, 650, 651, 652, 1150, 322, - 323, 653, 654, 655, 1151, 354, 657, 13, 656, 880, - 660, 661, 662, 663, 324, 14, 15, 672, 677, 668, - 1100, 669, 674, 1158, 675, 678, 679, 676, 701, 1101, - 680, 682, 1159, 16, 1102, 683, 1050, 1113, 1160, 684, - 1103, 325, 703, 355, 1104, 685, 1105, 17, 686, 704, - 689, 1106, 1161, 691, 1162, 1163, 1051, 1107, 694, 705, - 702, 724, 696, 1164, 725, 697, 1052, 698, 726, 1165, - 706, 707, 1053, 727, 728, 732, 731, 733, 708, 734, - 18, 709, 326, 735, 736, 718, 730, 711, 1054, 19, - 20, 712, 713, 21, 22, 858, 859, 860, 861, 862, - 715, 863, 864, 749, 865, 866, 867, 719, 720, 868, - 737, 869, 870, 1055, 871, 76, 872, 738, 873, 874, - 721, 1056, 875, 881, 882, 883, 884, 885, 876, 886, - 887, 747, 888, 889, 890, 77, 78, 891, 748, 892, - 893, 79, 894, 750, 895, 23, 896, 897, 751, 752, - 898, 1114, 1115, 1116, 1117, 1118, 899, 1119, 1120, 1057, - 1121, 1122, 1123, 753, 754, 1124, 764, 1125, 1126, 756, - 1127, 759, 1128, 760, 1129, 1130, 1058, 765, 1131, 766, - 80, 81, 767, 768, 1132, 769, 770, 82, 83, 84, - 771, 779, 780, 781, 782, 783, 784, 785, 786, 787, - 790, 788, 789, 791, 793, 794, 795, 796, 797, 85, - 86, 798, 799, 804, 801, 805, 808, 809, 810, 811, - 812, 815, 87, 88, 819, 822, 813, 814, 816, 823, - 826, 827, 89, 817, 818, 820, 821, 824, 825, 828, - 90, 829, 830, 831, 832, 921, 833, 834, 835, 836, - 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, - 847, 848, 849, 924, 850, 851, 852, 853, 854, 855, - 856, 879, 925, 902, 903, 904, 905, 906, 907, 908, - 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, - 919, 920, 922, 926, 927, 923, 928, 929, 930, 931, - 932, 933, 934, 935, 936, 937, 940, 941, 951, 952, - 953, 954, 956, 955, 957, 958, 960, 959, 962, 963, - 964, 989, 991, 1140, 993, 296, 1222, 489, 1139, 1086, - 1041, 1217, 598, 717, 1216, 1067, 1183, 961, 965, 966, - 967, 968, 1203, 969, 970, 971, 972, 543, 973, 974, - 975, 976, 977, 978, 979, 984, 985, 986, 987, 988, - 1186, 1184, 992, 700, 990, 995, 994, 996, 1002, 1003, - 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1018, - 1019, 1020, 1021, 1022, 1023, 1024, 1029, 1078, 1030, 1031, - 688, 1201, 1032, 723, 1033, 1218, 1034, 763, 1035, 1036, - 1219, 1199, 1037, 1038, 1039, 1040, 1048, 1202, 1049, 693, - 1061, 380, 1200, 440, 1062, 1175, 1176, 312, 0, 0, - 0, 758, 0, 1063, 1064, 1065, 1066, 0, 1070, 1076, - 1077, 0, 1081, 0, 0, 1079, 1082, 1084, 1187, 1087, - 1088, 1110, 1111, 1112, 1135, 1136, 1137, 1138, 1141, 1154, - 1155, 0, 1185, 1190, 1204, 1214, 1215, 0, 618, 0, - 0, 0, 0, 0, 0, 625, 483, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 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, 614, 0, 0, 0, - 562 + 802, 803, 571, 572, 47, 460, 48, 801, 236, 67, + 579, 980, 544, 1025, 509, 981, 286, 52, 982, 110, + 1044, 544, 983, 54, 1045, 1072, 58, 510, 59, 553, + 371, 1046, 68, 291, 509, 1047, 62, 116, 63, 69, + 381, 66, 117, 118, 237, 110, 220, 510, 119, 1172, + 227, 1174, 469, 1173, 286, 1175, 120, 490, 238, 239, + 240, 241, 121, 220, 122, 123, 124, 371, 1178, 227, + 460, 125, 1179, 491, 107, 251, 242, 126, 127, 111, + 128, 129, 130, 45, 46, 1180, 131, 470, 492, 1181, + 372, 132, 493, 627, 628, 133, 134, 70, 252, 135, + 545, 635, 1189, 637, 287, 111, 511, 471, 136, 545, + 644, 108, 472, 647, 109, 137, 138, 554, 139, 140, + 141, 142, 143, 461, 658, 659, 511, 372, 382, 115, + 942, 253, 512, 144, 670, 671, 228, 673, 217, 145, + 146, 147, 287, 148, 218, 494, 149, 150, 373, 219, + 151, 234, 512, 553, 462, 228, 76, 313, 383, 1073, + 235, 546, 229, 254, 1074, 255, 256, 473, 495, 1182, + 546, 314, 315, 1183, 284, 316, 77, 78, 555, 739, + 740, 229, 79, 152, 496, 373, 942, 153, 461, 384, + 154, 155, 156, 157, 158, 1026, 285, 159, 160, 381, + 441, 257, 292, 258, 259, 260, 261, 293, 1192, 294, + 463, 342, 1193, 343, 297, 344, 442, 547, 943, 462, + 262, 80, 81, 524, 295, 729, 547, 345, 82, 83, + 84, 443, 317, 318, 319, 444, 757, 320, 161, 162, + 163, 554, 346, 164, 263, 321, 347, 497, 165, 722, + 85, 86, 439, 221, 264, 624, 322, 323, 469, -107, + 379, 482, 498, 87, 88, 488, 348, 699, 349, 561, + 221, 324, 716, 89, 943, 463, -107, 298, 350, 944, + 480, 90, 617, 265, 266, 692, 67, 382, 792, 299, + 542, 1194, 570, 470, 484, 1195, 800, 1196, 325, 351, + 1198, 1197, 555, 485, 1199, 1206, 1013, 1014, 1015, 68, + 1221, 445, 300, 471, 1222, 301, 69, 383, 472, 446, + 447, 997, 998, 999, 1000, 1001, 352, 1207, 302, 1208, + 772, 773, 774, 775, 776, 944, 1169, 1170, 1171, 326, + 664, 665, 945, 666, 667, 1086, 743, 744, 384, 303, + 116, 448, 304, 353, 305, 117, 118, 806, 807, 306, + 307, 119, 308, 309, 310, 378, 390, 1209, 762, 120, + 563, 311, 597, 473, 70, 121, 391, 122, 123, 124, + 354, 392, 393, 394, 125, 395, 396, 397, 251, 236, + 126, 127, 398, 128, 129, 130, 801, 399, 945, 131, + 400, 401, 526, 564, 132, 449, 402, 403, 133, 134, + 404, 252, 135, 405, 406, 687, 565, 566, 407, 355, + 342, 136, 343, 408, 344, 237, 613, 490, 137, 138, + 409, 139, 140, 141, 142, 143, 345, 1210, 1211, 238, + 239, 240, 241, 491, 253, 410, 144, 411, 412, 441, + 413, 346, 145, 146, 147, 347, 148, 242, 492, 149, + 150, 414, 493, 151, 415, 442, 416, 417, 418, 420, + 422, 1212, 423, 424, 425, 348, 254, 349, 255, 256, + 443, 426, 427, 567, 444, 428, 429, 350, 1090, 430, + 1190, 431, 432, 433, 434, 435, 152, 436, 437, 438, + 153, 481, 486, 154, 155, 156, 157, 158, 351, 1091, + 159, 160, 487, 518, 257, 494, 258, 259, 260, 261, + 519, 520, 521, 522, 1092, 523, 527, 528, 529, 530, + 531, 1093, 532, 262, 533, 352, 534, 535, 495, 536, + 537, 538, 539, 540, 541, 560, 568, 582, 1094, 569, + 1050, 161, 162, 163, 496, 570, 164, 263, 573, 574, + 445, 165, 353, 575, 576, 577, 578, 264, 446, 447, + 1051, 1095, 580, 581, 583, 584, 585, 599, 1096, 586, + 1052, 2, 3, 587, 588, 4, 1053, 589, 590, 354, + 1097, 591, 592, 593, 594, 5, 265, 266, 6, 7, + 448, 595, 1054, 596, 8, 619, 620, 1098, 1099, 1100, + 600, 601, 602, 603, 605, 9, 606, 497, 607, 10, + 11, 608, 609, 313, 857, 610, 611, 1055, 355, 12, + 612, 626, 498, 615, 616, 1056, 621, 314, 315, 622, + 629, 316, 630, 13, 631, 632, 633, 638, 634, 636, + 639, 14, 15, 640, 449, 641, 642, 1101, 643, 645, + 880, 646, 648, 649, 650, 651, 1102, 652, 653, 16, + 654, 1103, 655, 1057, 656, 657, 660, 1104, 661, 662, + 663, 1105, 668, 17, 1106, 669, 672, 674, 677, 1107, + 1058, 675, 676, 678, 1114, 1108, 694, 679, 317, 318, + 319, 701, 704, 320, 680, 682, 705, 726, 702, 683, + 684, 321, 685, 686, 724, 703, 18, 725, 689, 691, + 696, 1143, 322, 323, 697, 19, 20, 706, 1157, 21, + 22, 698, 708, 707, 709, 727, 1059, 324, 858, 859, + 860, 861, 862, 711, 863, 864, 718, 865, 866, 867, + 728, 730, 868, 712, 869, 870, 713, 871, 715, 872, + 732, 873, 874, 719, 325, 875, 731, 720, 721, 733, + 734, 876, 735, 736, 881, 882, 883, 884, 885, 737, + 886, 887, 23, 888, 889, 890, 738, 747, 891, 748, + 892, 893, 1144, 894, 749, 895, 750, 896, 897, 1158, + 751, 898, 752, 753, 754, 326, 764, 899, 1115, 1116, + 1117, 1118, 1119, 76, 1120, 1121, 756, 1122, 1123, 1124, + 759, 1145, 1125, 790, 1126, 1127, 760, 1128, 1159, 1129, + 1146, 1130, 1131, 77, 78, 1132, 1147, 1160, 765, 79, + 766, 1133, 767, 1161, 768, 769, 770, 771, 779, 780, + 1148, 781, 1149, 1150, 782, 783, 784, 1162, 791, 1163, + 1164, 785, 1151, 786, 793, 787, 788, 794, 1152, 1165, + 795, 796, 797, 789, 798, 1166, 799, 801, 80, 81, + 804, 805, 809, 808, 810, 82, 83, 84, 815, 819, + 811, 812, 822, 813, 826, 823, 814, 816, 817, 818, + 820, 821, 824, 825, 921, 827, 828, 85, 86, 829, + 922, 830, 831, 832, 833, 834, 835, 836, 837, 838, + 87, 88, 839, 840, 841, 842, 843, 844, 845, 846, + 89, 847, 848, 849, 850, 851, 852, 853, 90, 924, + 854, 855, 856, 879, 902, 903, 904, 905, 906, 907, + 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, + 918, 919, 920, 925, 926, 927, 923, 928, 929, 930, + 931, 932, 933, 935, 934, 936, 937, 940, 941, 953, + 954, 1041, 951, 956, 952, 957, 958, 960, 955, 962, + 963, 964, 989, 991, 296, 993, 1087, 1140, 1223, 1218, + 1141, 1217, 1184, 1068, 717, 961, 959, 965, 966, 967, + 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, + 978, 979, 984, 985, 986, 987, 988, 1187, 543, 992, + 1204, 990, 995, 994, 996, 1002, 700, 1080, 1003, 1004, + 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1018, 1019, + 1020, 1021, 1022, 1023, 1024, 1029, 1030, 1031, 1032, 1033, + 1034, 1035, 1079, 1185, 1036, 688, 1037, 1202, 1038, 723, + 1039, 1219, 1040, 1200, 1220, 1048, 1049, 598, 1062, 562, + 1063, 693, 1064, 763, 1203, 380, 1065, 758, 1201, 618, + 440, 625, 1176, 312, 1066, 1067, 0, 1071, 1077, 1078, + 1082, 1177, 0, 1088, 1083, 1085, 1089, 1111, 1112, 1113, + 1136, 1137, 1138, 1139, 614, 1142, 1155, 1156, 0, 1186, + 489, 1191, 1205, 1188, 1215, 0, 1216, 0, 0, 0, + 483, 0, 525 }; #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-745))) + (!!((Yystate) == (-678))) #define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int16 yycheck[] = { - 595, 596, 300, 301, 1, 214, 215, 8, 216, 1, - 308, 99, 1, 1, 1, 51, 1, 1, 214, 1, - 1, 1, 218, 1, 216, 14, 216, 24, 772, 773, - 774, 775, 776, 216, 31, 214, 214, 1, 214, 218, - 218, 214, 6, 7, 1, 218, 214, 216, 12, 216, - 218, 1, 1, 37, 214, 214, 20, 214, 218, 218, - 1, 1, 26, 1, 28, 29, 30, 51, 52, 53, - 54, 35, 216, 61, 61, 1, 14, 41, 42, 216, - 44, 45, 46, 61, 216, 69, 50, 1, 9, 10, - 11, 55, 89, 391, 392, 59, 60, 89, 24, 63, - 1, 399, 87, 401, 93, 216, 194, 89, 72, 89, - 408, 1, 61, 411, 216, 79, 80, 1, 82, 83, - 84, 85, 86, 216, 422, 423, 216, 119, 113, 1, - 119, 57, 119, 97, 432, 433, 216, 435, 119, 103, - 104, 105, 216, 107, 216, 17, 110, 111, 89, 185, - 114, 216, 36, 1, 190, 93, 216, 214, 150, 217, - 32, 218, 216, 89, 36, 91, 92, 15, 16, 150, - 119, 19, 56, 159, 160, 89, 214, 61, 99, 119, - 218, 119, 216, 147, 1, 217, 87, 151, 1, 190, - 154, 155, 156, 157, 158, 217, 1, 161, 162, 89, - 17, 127, 217, 129, 130, 131, 132, 214, 217, 150, - 150, 218, 113, 159, 160, 32, 21, 22, 215, 36, - 146, 1, 27, 215, 205, 523, 215, 215, 76, 77, - 78, 215, 116, 81, 215, 215, 150, 201, 202, 203, - 112, 89, 206, 217, 170, 133, 134, 211, 120, 121, - 207, 215, 100, 101, 180, 217, 213, 207, 215, 1, - 150, 66, 67, 213, 205, 205, 215, 115, 73, 74, - 75, 1, 89, 3, 215, 5, 89, 214, 1, 213, - 152, 218, 208, 209, 217, 1, 217, 17, 586, 215, - 95, 96, 217, 1, 142, 112, 594, 217, 212, 217, - 1, 215, 32, 108, 109, 217, 36, 217, 214, 89, - 217, 128, 218, 118, 215, 214, 24, 217, 214, 218, - 36, 126, 218, 31, 217, 215, 56, 214, 58, 133, - 134, 215, 217, 205, 217, 183, 37, 150, 68, 217, - 56, 177, 178, 215, 1, 61, 217, 89, 217, 1, - 51, 52, 53, 54, 1013, 1014, 1015, 217, 217, 89, - 17, 217, 217, 217, 99, 17, 89, 215, 69, 117, - 150, 217, 217, 217, 191, 32, 217, 119, 217, 36, - 32, 89, 217, 217, 36, 217, 116, 217, 205, 1, - 1, 217, 217, 217, 217, 6, 7, 217, 215, 212, - 116, 12, 137, 138, 139, 140, 141, 217, 150, 20, - 215, 217, 24, 143, 217, 26, 217, 28, 29, 30, - 217, 217, 217, 217, 35, 205, 217, 150, 217, 217, - 41, 42, 217, 44, 45, 46, 217, 89, 217, 50, - 170, 217, 217, 40, 55, 57, 217, 217, 59, 60, - 217, 217, 63, 217, 217, 112, 217, 217, 217, 217, - 112, 72, 217, 120, 121, 62, 217, 64, 79, 80, - 217, 82, 83, 84, 85, 86, 128, 89, 208, 91, - 92, 217, 214, 217, 217, 215, 97, 117, 217, 1084, - 217, 217, 103, 104, 105, 152, 107, 217, 217, 110, - 111, 117, 217, 114, 217, 102, 1, 217, 3, 99, - 5, 217, 217, 217, 217, 127, 214, 129, 130, 131, - 132, 4, 17, 217, 217, 217, 217, 217, 64, 99, - 159, 99, 99, 99, 146, 99, 147, 32, 159, 191, - 151, 36, 25, 154, 155, 156, 157, 158, 205, 159, - 161, 162, 99, 205, 159, 159, 214, 40, 170, 214, - 214, 56, 117, 58, 47, 214, 217, 217, 180, 217, - 1, 217, 217, 68, 217, 172, 173, 217, 217, 217, - 217, 64, 217, 217, 15, 16, 217, 159, 19, 217, - 201, 202, 203, 64, 89, 206, 208, 209, 217, 135, - 211, 99, 217, 217, 87, 159, 159, 99, 205, 217, - 217, 94, 117, 159, 217, 0, 1, 217, 217, 4, - 159, 116, 217, 106, 217, 217, 217, 99, 164, 14, - 217, 217, 17, 18, 217, 99, 99, 173, 23, 159, - 123, 124, 125, 179, 159, 76, 77, 78, 143, 34, - 81, 51, 159, 38, 39, 99, 99, 193, 89, 195, - 196, 99, 99, 48, 135, 117, 99, 99, 204, 100, - 101, 159, 159, 217, 210, 170, 217, 62, 159, 51, - 159, 159, 159, 159, 115, 70, 71, 117, 214, 159, - 173, 159, 159, 164, 159, 214, 217, 159, 159, 182, - 217, 217, 173, 88, 187, 217, 13, 51, 179, 217, - 193, 142, 216, 208, 197, 217, 199, 102, 217, 117, - 217, 204, 193, 217, 195, 196, 33, 210, 214, 117, - 214, 159, 217, 204, 159, 217, 43, 217, 117, 210, - 214, 214, 49, 159, 159, 159, 117, 117, 217, 117, - 135, 217, 183, 117, 117, 214, 214, 217, 65, 144, - 145, 217, 217, 148, 149, 165, 166, 167, 168, 169, - 217, 171, 172, 99, 174, 175, 176, 217, 217, 179, - 117, 181, 182, 90, 184, 1, 186, 117, 188, 189, - 217, 98, 192, 165, 166, 167, 168, 169, 198, 171, - 172, 117, 174, 175, 176, 21, 22, 179, 117, 181, - 182, 27, 184, 117, 186, 200, 188, 189, 117, 214, - 192, 165, 166, 167, 168, 169, 198, 171, 172, 136, - 174, 175, 176, 214, 217, 179, 117, 181, 182, 217, - 184, 214, 186, 217, 188, 189, 153, 214, 192, 214, - 66, 67, 214, 214, 198, 214, 214, 73, 74, 75, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 99, 214, 214, 99, 99, 99, 99, 99, 117, 95, - 96, 99, 99, 214, 99, 117, 117, 159, 217, 117, - 117, 99, 108, 109, 214, 214, 117, 117, 117, 214, - 217, 214, 118, 117, 117, 117, 117, 117, 117, 214, - 126, 214, 214, 214, 214, 117, 214, 214, 214, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 214, 214, 214, 117, 214, 214, 214, 214, 214, 214, - 214, 214, 99, 214, 214, 214, 214, 214, 214, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 214, 214, 159, 117, 117, 217, 117, 214, 117, 217, - 117, 214, 217, 117, 117, 99, 214, 214, 214, 214, - 117, 159, 117, 217, 117, 117, 117, 217, 117, 117, - 117, 117, 117, 983, 117, 71, 1221, 230, 981, 946, - 122, 1194, 327, 499, 1192, 122, 99, 214, 214, 214, - 214, 214, 1182, 214, 214, 214, 214, 267, 214, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 117, 1079, 214, 475, 217, 214, 217, 214, 214, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 214, 214, 214, 214, 214, 214, 214, 163, 214, 214, - 450, 1178, 214, 513, 214, 1196, 214, 556, 214, 214, - 1198, 1172, 214, 214, 214, 214, 214, 1180, 214, 465, - 214, 112, 1174, 166, 214, 1045, 1047, 91, -1, -1, - -1, 548, -1, 214, 214, 214, 214, -1, 214, 214, - 214, -1, 214, -1, -1, 218, 217, 217, 217, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 214, -1, 214, 214, 214, 214, 214, -1, 374, -1, - -1, -1, -1, -1, -1, 386, 222, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 243, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 356, -1, -1, -1, - 288 + 595, 596, 300, 301, 217, 1, 217, 99, 1, 1, + 308, 215, 1, 8, 1, 219, 1, 217, 215, 1, + 215, 1, 219, 217, 219, 51, 217, 14, 217, 1, + 1, 215, 24, 215, 1, 219, 217, 1, 217, 31, + 1, 217, 6, 7, 37, 1, 1, 14, 12, 215, + 1, 215, 1, 219, 1, 219, 20, 1, 51, 52, + 53, 54, 26, 1, 28, 29, 30, 1, 215, 1, + 1, 35, 219, 17, 217, 1, 69, 41, 42, 61, + 44, 45, 46, 215, 216, 215, 50, 36, 32, 219, + 61, 55, 36, 391, 392, 59, 60, 89, 24, 63, + 89, 399, 194, 401, 89, 61, 93, 56, 72, 89, + 408, 217, 61, 411, 217, 79, 80, 89, 82, 83, + 84, 85, 86, 119, 422, 423, 93, 61, 89, 217, + 1, 57, 119, 97, 432, 433, 87, 435, 217, 103, + 104, 105, 89, 107, 217, 89, 110, 111, 119, 217, + 114, 217, 119, 1, 150, 87, 1, 1, 119, 185, + 217, 150, 113, 89, 190, 91, 92, 116, 112, 215, + 150, 15, 16, 219, 217, 19, 21, 22, 150, 133, + 134, 113, 27, 147, 128, 119, 1, 151, 119, 150, + 154, 155, 156, 157, 158, 190, 217, 161, 162, 1, + 1, 127, 218, 129, 130, 131, 132, 218, 215, 218, + 206, 1, 219, 3, 218, 5, 17, 206, 89, 150, + 146, 66, 67, 216, 216, 523, 206, 17, 73, 74, + 75, 32, 76, 77, 78, 36, 216, 81, 202, 203, + 204, 89, 32, 207, 170, 89, 36, 191, 212, 216, + 95, 96, 216, 208, 180, 216, 100, 101, 1, 214, + 216, 216, 206, 108, 109, 216, 56, 216, 58, 216, + 208, 115, 216, 118, 89, 206, 214, 218, 68, 150, + 215, 126, 216, 209, 210, 216, 1, 89, 586, 218, + 216, 215, 99, 36, 214, 219, 594, 215, 142, 89, + 215, 219, 150, 215, 219, 40, 9, 10, 11, 24, + 215, 112, 218, 56, 219, 218, 31, 119, 61, 120, + 121, 772, 773, 774, 775, 776, 116, 62, 218, 64, + 137, 138, 139, 140, 141, 150, 1013, 1014, 1015, 183, + 159, 160, 213, 159, 160, 216, 133, 134, 150, 218, + 1, 152, 218, 143, 218, 6, 7, 177, 178, 218, + 218, 12, 218, 218, 218, 218, 218, 102, 216, 20, + 117, 216, 216, 116, 89, 26, 218, 28, 29, 30, + 170, 218, 218, 218, 35, 218, 218, 218, 1, 1, + 41, 42, 218, 44, 45, 46, 99, 218, 213, 50, + 218, 218, 215, 117, 55, 206, 218, 218, 59, 60, + 218, 24, 63, 218, 218, 216, 117, 215, 218, 209, + 1, 72, 3, 218, 5, 37, 216, 1, 79, 80, + 218, 82, 83, 84, 85, 86, 17, 172, 173, 51, + 52, 53, 54, 17, 57, 218, 97, 218, 218, 1, + 218, 32, 103, 104, 105, 36, 107, 69, 32, 110, + 111, 218, 36, 114, 218, 17, 218, 218, 218, 218, + 218, 206, 218, 218, 218, 56, 89, 58, 91, 92, + 32, 218, 218, 99, 36, 218, 218, 68, 4, 218, + 1085, 218, 218, 218, 218, 218, 147, 218, 218, 218, + 151, 218, 218, 154, 155, 156, 157, 158, 89, 25, + 161, 162, 218, 218, 127, 89, 129, 130, 131, 132, + 218, 218, 218, 218, 40, 218, 218, 218, 218, 218, + 218, 47, 218, 146, 218, 116, 218, 218, 112, 218, + 218, 218, 218, 218, 218, 218, 99, 215, 64, 159, + 13, 202, 203, 204, 128, 99, 207, 170, 99, 99, + 112, 212, 143, 99, 159, 159, 99, 180, 120, 121, + 33, 87, 159, 159, 215, 218, 218, 215, 94, 218, + 43, 0, 1, 218, 218, 4, 49, 218, 218, 170, + 106, 218, 218, 218, 218, 14, 209, 210, 17, 18, + 152, 218, 65, 218, 23, 117, 215, 123, 124, 125, + 218, 218, 218, 218, 218, 34, 218, 191, 218, 38, + 39, 218, 218, 1, 51, 218, 218, 90, 209, 48, + 218, 159, 206, 218, 218, 98, 218, 15, 16, 218, + 99, 19, 159, 62, 159, 99, 117, 99, 159, 159, + 99, 70, 71, 99, 206, 159, 159, 173, 159, 99, + 51, 99, 99, 99, 117, 99, 182, 99, 159, 88, + 159, 187, 218, 136, 159, 218, 159, 193, 159, 159, + 159, 197, 159, 102, 200, 159, 117, 159, 215, 205, + 153, 159, 159, 215, 51, 211, 215, 218, 76, 77, + 78, 159, 117, 81, 218, 218, 117, 117, 215, 218, + 218, 89, 218, 218, 159, 217, 135, 159, 218, 218, + 218, 64, 100, 101, 218, 144, 145, 215, 64, 148, + 149, 218, 218, 215, 218, 159, 199, 115, 165, 166, + 167, 168, 169, 218, 171, 172, 215, 174, 175, 176, + 159, 215, 179, 218, 181, 182, 218, 184, 218, 186, + 159, 188, 189, 218, 142, 192, 117, 218, 218, 117, + 117, 198, 117, 117, 165, 166, 167, 168, 169, 117, + 171, 172, 201, 174, 175, 176, 117, 117, 179, 117, + 181, 182, 135, 184, 99, 186, 117, 188, 189, 135, + 117, 192, 215, 215, 218, 183, 117, 198, 165, 166, + 167, 168, 169, 1, 171, 172, 218, 174, 175, 176, + 215, 164, 179, 99, 181, 182, 218, 184, 164, 186, + 173, 188, 189, 21, 22, 192, 179, 173, 215, 27, + 215, 198, 215, 179, 215, 215, 215, 215, 215, 215, + 193, 215, 195, 196, 215, 215, 215, 193, 99, 195, + 196, 215, 205, 215, 99, 215, 215, 99, 211, 205, + 99, 99, 117, 215, 99, 211, 99, 99, 66, 67, + 215, 117, 159, 117, 218, 73, 74, 75, 99, 215, + 117, 117, 215, 117, 218, 215, 117, 117, 117, 117, + 117, 117, 117, 117, 117, 215, 215, 95, 96, 215, + 159, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 108, 109, 215, 215, 215, 215, 215, 215, 215, 215, + 118, 215, 215, 215, 215, 215, 215, 215, 126, 117, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 99, 117, 117, 218, 117, 215, 117, + 218, 117, 215, 117, 218, 117, 99, 215, 215, 117, + 159, 122, 215, 117, 215, 117, 117, 117, 218, 117, + 117, 117, 117, 117, 71, 117, 946, 981, 1222, 1195, + 983, 1193, 99, 122, 499, 215, 218, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 117, 267, 215, + 1183, 218, 215, 218, 215, 215, 475, 219, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 163, 1080, 215, 450, 215, 1179, 215, 513, + 215, 1197, 215, 1173, 1199, 215, 215, 327, 215, 288, + 215, 465, 215, 556, 1181, 112, 215, 548, 1175, 374, + 166, 386, 1045, 91, 215, 215, -1, 215, 215, 215, + 215, 1047, -1, 215, 218, 218, 215, 215, 215, 215, + 215, 215, 215, 215, 356, 215, 215, 215, -1, 215, + 230, 215, 215, 218, 215, -1, 215, -1, -1, -1, + 222, -1, 243 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 220, 0, 1, 4, 14, 17, 18, 23, 34, + 0, 221, 0, 1, 4, 14, 17, 18, 23, 34, 38, 39, 48, 62, 70, 71, 88, 102, 135, 144, - 145, 148, 149, 200, 221, 226, 231, 253, 259, 273, - 291, 308, 322, 337, 344, 348, 358, 367, 387, 397, - 403, 407, 417, 475, 492, 214, 215, 216, 216, 292, - 368, 398, 216, 408, 216, 323, 388, 309, 216, 216, - 274, 338, 216, 216, 349, 359, 216, 1, 24, 31, - 89, 254, 255, 256, 257, 258, 1, 21, 22, 27, + 145, 148, 149, 201, 222, 227, 232, 254, 260, 274, + 292, 309, 323, 338, 345, 349, 359, 368, 388, 398, + 404, 408, 418, 476, 493, 215, 216, 217, 217, 293, + 369, 399, 217, 409, 217, 324, 389, 310, 217, 217, + 275, 339, 217, 217, 350, 360, 217, 1, 24, 31, + 89, 255, 256, 257, 258, 259, 1, 21, 22, 27, 66, 67, 73, 74, 75, 95, 96, 108, 109, 118, - 126, 476, 477, 478, 479, 480, 481, 482, 483, 484, - 485, 486, 487, 488, 489, 490, 491, 216, 216, 216, - 1, 61, 404, 405, 406, 216, 1, 6, 7, 12, + 126, 477, 478, 479, 480, 481, 482, 483, 484, 485, + 486, 487, 488, 489, 490, 491, 492, 217, 217, 217, + 1, 61, 405, 406, 407, 217, 1, 6, 7, 12, 20, 26, 28, 29, 30, 35, 41, 42, 44, 45, 46, 50, 55, 59, 60, 63, 72, 79, 80, 82, 83, 84, 85, 86, 97, 103, 104, 105, 107, 110, 111, 114, 147, 151, 154, 155, 156, 157, 158, 161, - 162, 201, 202, 203, 206, 211, 418, 419, 420, 421, - 422, 423, 424, 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, 468, 472, 473, 474, 216, 216, 216, - 1, 207, 260, 261, 262, 263, 264, 1, 87, 113, - 227, 228, 229, 230, 216, 216, 1, 37, 51, 52, - 53, 54, 69, 493, 494, 495, 496, 497, 498, 499, - 500, 1, 24, 57, 89, 91, 92, 127, 129, 130, - 131, 132, 146, 170, 180, 208, 209, 232, 233, 234, - 235, 240, 241, 242, 243, 244, 245, 246, 247, 248, - 249, 250, 251, 252, 216, 216, 1, 89, 345, 346, - 347, 214, 217, 217, 217, 215, 255, 217, 217, 217, - 217, 217, 217, 217, 217, 217, 217, 217, 217, 217, - 217, 215, 477, 1, 15, 16, 19, 76, 77, 78, - 81, 89, 100, 101, 115, 142, 183, 293, 294, 295, - 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, - 306, 307, 1, 3, 5, 17, 32, 36, 56, 58, - 68, 89, 116, 143, 170, 208, 369, 370, 371, 372, - 373, 374, 375, 376, 377, 378, 382, 383, 384, 385, - 386, 1, 61, 119, 399, 400, 401, 402, 217, 215, - 405, 1, 89, 119, 150, 409, 413, 414, 415, 416, - 217, 217, 217, 217, 217, 217, 217, 217, 217, 217, - 217, 217, 217, 217, 217, 217, 217, 217, 217, 217, - 217, 217, 217, 217, 217, 217, 217, 217, 217, 469, - 217, 465, 217, 217, 217, 217, 217, 217, 217, 217, - 217, 217, 217, 217, 217, 217, 217, 217, 217, 215, - 419, 1, 17, 32, 36, 112, 120, 121, 152, 205, - 324, 325, 326, 327, 328, 329, 330, 334, 335, 336, - 1, 119, 150, 205, 389, 393, 394, 395, 396, 1, - 36, 56, 61, 116, 310, 314, 315, 316, 320, 321, - 214, 217, 215, 261, 213, 214, 217, 217, 215, 228, - 1, 17, 32, 36, 89, 112, 128, 191, 205, 275, - 276, 277, 278, 279, 280, 281, 282, 283, 287, 1, - 14, 93, 119, 339, 340, 341, 342, 343, 217, 217, - 217, 217, 217, 217, 215, 494, 214, 217, 217, 217, - 217, 217, 217, 217, 217, 217, 217, 217, 217, 217, - 217, 217, 215, 233, 1, 89, 150, 205, 350, 351, - 352, 353, 354, 1, 89, 150, 360, 361, 362, 363, - 217, 215, 346, 117, 117, 117, 214, 99, 99, 159, - 99, 223, 223, 99, 99, 99, 159, 159, 99, 223, - 159, 159, 214, 214, 217, 217, 217, 217, 217, 217, - 217, 217, 217, 217, 217, 217, 217, 215, 294, 214, - 217, 217, 217, 217, 379, 217, 217, 217, 217, 217, - 217, 217, 217, 215, 370, 217, 217, 215, 400, 117, - 214, 217, 217, 410, 215, 414, 159, 223, 223, 99, - 159, 159, 99, 117, 159, 223, 159, 223, 99, 99, - 99, 159, 159, 159, 223, 99, 99, 223, 99, 99, - 117, 99, 99, 159, 159, 217, 159, 217, 223, 223, + 162, 202, 203, 204, 207, 212, 419, 420, 421, 422, + 423, 424, 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, 469, 473, 474, 475, 217, 217, 217, + 1, 208, 261, 262, 263, 264, 265, 1, 87, 113, + 228, 229, 230, 231, 217, 217, 1, 37, 51, 52, + 53, 54, 69, 494, 495, 496, 497, 498, 499, 500, + 501, 1, 24, 57, 89, 91, 92, 127, 129, 130, + 131, 132, 146, 170, 180, 209, 210, 233, 234, 235, + 236, 241, 242, 243, 244, 245, 246, 247, 248, 249, + 250, 251, 252, 253, 217, 217, 1, 89, 346, 347, + 348, 215, 218, 218, 218, 216, 256, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 216, 478, 1, 15, 16, 19, 76, 77, 78, + 81, 89, 100, 101, 115, 142, 183, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, + 307, 308, 1, 3, 5, 17, 32, 36, 56, 58, + 68, 89, 116, 143, 170, 209, 370, 371, 372, 373, + 374, 375, 376, 377, 378, 379, 383, 384, 385, 386, + 387, 1, 61, 119, 400, 401, 402, 403, 218, 216, + 406, 1, 89, 119, 150, 410, 414, 415, 416, 417, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 470, + 218, 466, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 216, + 420, 1, 17, 32, 36, 112, 120, 121, 152, 206, + 325, 326, 327, 328, 329, 330, 331, 335, 336, 337, + 1, 119, 150, 206, 390, 394, 395, 396, 397, 1, + 36, 56, 61, 116, 311, 315, 316, 317, 321, 322, + 215, 218, 216, 262, 214, 215, 218, 218, 216, 229, + 1, 17, 32, 36, 89, 112, 128, 191, 206, 276, + 277, 278, 279, 280, 281, 282, 283, 284, 288, 1, + 14, 93, 119, 340, 341, 342, 343, 344, 218, 218, + 218, 218, 218, 218, 216, 495, 215, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 216, 234, 1, 89, 150, 206, 351, 352, + 353, 354, 355, 1, 89, 150, 361, 362, 363, 364, + 218, 216, 347, 117, 117, 117, 215, 99, 99, 159, + 99, 224, 224, 99, 99, 99, 159, 159, 99, 224, + 159, 159, 215, 215, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 216, 295, 215, + 218, 218, 218, 218, 380, 218, 218, 218, 218, 218, + 218, 218, 218, 216, 371, 218, 218, 216, 401, 117, + 215, 218, 218, 411, 216, 415, 159, 224, 224, 99, + 159, 159, 99, 117, 159, 224, 159, 224, 99, 99, + 99, 159, 159, 159, 224, 99, 99, 224, 99, 99, + 117, 99, 99, 159, 159, 218, 159, 218, 224, 224, 159, 159, 159, 159, 159, 160, 159, 160, 159, 159, - 223, 223, 117, 223, 159, 159, 159, 214, 214, 217, - 217, 331, 217, 217, 217, 217, 217, 215, 325, 217, - 390, 217, 215, 394, 214, 311, 217, 217, 217, 215, - 315, 159, 214, 216, 117, 117, 214, 214, 217, 217, - 288, 217, 217, 217, 284, 217, 215, 276, 214, 217, - 217, 217, 215, 340, 159, 159, 117, 159, 159, 223, - 214, 117, 159, 117, 117, 117, 117, 117, 117, 133, - 134, 236, 237, 133, 134, 238, 239, 117, 117, 99, - 117, 117, 214, 214, 217, 355, 217, 215, 351, 214, - 217, 364, 215, 361, 117, 214, 214, 214, 214, 214, - 214, 214, 137, 138, 139, 140, 141, 222, 223, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 99, 99, 223, 99, 99, 99, 99, 117, 99, 99, - 223, 99, 225, 225, 214, 117, 177, 178, 117, 159, - 217, 117, 117, 117, 117, 99, 117, 117, 117, 214, - 117, 117, 214, 214, 117, 117, 217, 214, 214, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 214, 214, 214, 214, 214, 214, 214, 51, 165, 166, + 224, 224, 117, 224, 159, 159, 159, 215, 215, 218, + 218, 332, 218, 218, 218, 218, 218, 216, 326, 218, + 391, 218, 216, 395, 215, 312, 218, 218, 218, 216, + 316, 159, 215, 217, 117, 117, 215, 215, 218, 218, + 289, 218, 218, 218, 285, 218, 216, 277, 215, 218, + 218, 218, 216, 341, 159, 159, 117, 159, 159, 224, + 215, 117, 159, 117, 117, 117, 117, 117, 117, 133, + 134, 237, 238, 133, 134, 239, 240, 117, 117, 99, + 117, 117, 215, 215, 218, 356, 218, 216, 352, 215, + 218, 365, 216, 362, 117, 215, 215, 215, 215, 215, + 215, 215, 137, 138, 139, 140, 141, 223, 224, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 99, 99, 224, 99, 99, 99, 99, 117, 99, 99, + 224, 99, 226, 226, 215, 117, 177, 178, 117, 159, + 218, 117, 117, 117, 117, 99, 117, 117, 117, 215, + 117, 117, 215, 215, 117, 117, 218, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 51, 165, 166, 167, 168, 169, 171, 172, 174, 175, 176, 179, 181, - 182, 184, 186, 188, 189, 192, 198, 470, 471, 214, + 182, 184, 186, 188, 189, 192, 198, 471, 472, 215, 51, 165, 166, 167, 168, 169, 171, 172, 174, 175, 176, 179, 181, 182, 184, 186, 188, 189, 192, 198, - 466, 467, 214, 214, 214, 214, 214, 214, 214, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 214, 117, 159, 217, 117, 99, 117, 117, 117, 214, - 117, 217, 117, 214, 217, 117, 117, 99, 318, 319, - 214, 214, 1, 89, 150, 212, 265, 266, 267, 268, - 269, 214, 214, 117, 159, 217, 117, 117, 117, 217, - 117, 214, 117, 117, 117, 214, 214, 214, 214, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 214, 218, 214, 218, 214, 214, 214, 214, 214, 117, - 217, 117, 214, 117, 217, 214, 214, 222, 222, 222, - 222, 222, 214, 214, 214, 214, 214, 214, 214, 214, - 214, 214, 214, 9, 10, 11, 224, 225, 214, 214, - 214, 214, 214, 214, 214, 8, 190, 380, 381, 214, - 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - 214, 122, 411, 412, 214, 218, 214, 218, 214, 214, - 13, 33, 43, 49, 65, 90, 98, 136, 153, 332, - 333, 214, 214, 214, 214, 214, 214, 122, 391, 392, - 214, 51, 185, 190, 312, 313, 214, 214, 163, 218, - 317, 214, 217, 270, 217, 215, 266, 214, 214, 4, - 25, 40, 47, 64, 87, 94, 106, 123, 124, 125, - 173, 182, 187, 193, 197, 199, 204, 210, 289, 290, - 214, 214, 214, 51, 165, 166, 167, 168, 169, 171, - 172, 174, 175, 176, 179, 181, 182, 184, 186, 188, - 189, 192, 198, 285, 286, 214, 214, 214, 214, 237, - 239, 214, 64, 135, 164, 173, 179, 193, 195, 196, - 204, 210, 356, 357, 214, 214, 64, 135, 164, 173, - 179, 193, 195, 196, 204, 210, 365, 366, 224, 224, - 224, 214, 218, 214, 218, 471, 467, 214, 218, 214, - 218, 214, 218, 99, 319, 214, 117, 217, 194, 225, - 214, 214, 218, 214, 218, 214, 218, 214, 218, 381, - 412, 333, 392, 313, 214, 40, 62, 64, 102, 172, - 173, 205, 271, 272, 214, 214, 290, 286, 357, 366, - 214, 218, 272 + 467, 468, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 117, 159, 218, 117, 99, 117, 117, 117, 215, + 117, 218, 117, 215, 218, 117, 117, 99, 319, 320, + 215, 215, 1, 89, 150, 213, 266, 267, 268, 269, + 270, 215, 215, 117, 159, 218, 117, 117, 117, 218, + 117, 215, 117, 117, 117, 215, 215, 215, 215, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 219, 215, 219, 215, 215, 215, 215, 215, 117, + 218, 117, 215, 117, 218, 215, 215, 223, 223, 223, + 223, 223, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 215, 215, 9, 10, 11, 225, 226, 215, 215, + 215, 215, 215, 215, 215, 8, 190, 381, 382, 215, + 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, + 215, 122, 412, 413, 215, 219, 215, 219, 215, 215, + 13, 33, 43, 49, 65, 90, 98, 136, 153, 199, + 333, 334, 215, 215, 215, 215, 215, 215, 122, 392, + 393, 215, 51, 185, 190, 313, 314, 215, 215, 163, + 219, 318, 215, 218, 271, 218, 216, 267, 215, 215, + 4, 25, 40, 47, 64, 87, 94, 106, 123, 124, + 125, 173, 182, 187, 193, 197, 200, 205, 211, 290, + 291, 215, 215, 215, 51, 165, 166, 167, 168, 169, + 171, 172, 174, 175, 176, 179, 181, 182, 184, 186, + 188, 189, 192, 198, 286, 287, 215, 215, 215, 215, + 238, 240, 215, 64, 135, 164, 173, 179, 193, 195, + 196, 205, 211, 357, 358, 215, 215, 64, 135, 164, + 173, 179, 193, 195, 196, 205, 211, 366, 367, 225, + 225, 225, 215, 219, 215, 219, 472, 468, 215, 219, + 215, 219, 215, 219, 99, 320, 215, 117, 218, 194, + 226, 215, 215, 219, 215, 219, 215, 219, 215, 219, + 382, 413, 334, 393, 314, 215, 40, 62, 64, 102, + 172, 173, 206, 272, 273, 215, 215, 291, 287, 358, + 367, 215, 219, 273 }; #define yyerrok (yyerrstatus = 0) @@ -3123,13 +3115,13 @@ yyreduce: { case 26: /* Line 1792 of yacc.c */ -#line 383 "conf_parser.y" +#line 384 "conf_parser.y" { (yyval.number) = 0; } break; case 28: /* Line 1792 of yacc.c */ -#line 385 "conf_parser.y" +#line 386 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); } @@ -3137,7 +3129,7 @@ yyreduce: case 29: /* Line 1792 of yacc.c */ -#line 389 "conf_parser.y" +#line 390 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); } @@ -3145,7 +3137,7 @@ yyreduce: case 30: /* Line 1792 of yacc.c */ -#line 393 "conf_parser.y" +#line 394 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number); } @@ -3153,7 +3145,7 @@ yyreduce: case 31: /* Line 1792 of yacc.c */ -#line 397 "conf_parser.y" +#line 398 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number); } @@ -3161,7 +3153,7 @@ yyreduce: case 32: /* Line 1792 of yacc.c */ -#line 401 "conf_parser.y" +#line 402 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number); } @@ -3169,7 +3161,7 @@ yyreduce: case 33: /* Line 1792 of yacc.c */ -#line 405 "conf_parser.y" +#line 406 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number); } @@ -3177,37 +3169,37 @@ yyreduce: case 34: /* Line 1792 of yacc.c */ -#line 410 "conf_parser.y" +#line 411 "conf_parser.y" { (yyval.number) = 0; } break; case 36: /* Line 1792 of yacc.c */ -#line 411 "conf_parser.y" +#line 412 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); } break; case 37: /* Line 1792 of yacc.c */ -#line 412 "conf_parser.y" +#line 413 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); } break; case 38: /* Line 1792 of yacc.c */ -#line 413 "conf_parser.y" +#line 414 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); } break; case 39: /* Line 1792 of yacc.c */ -#line 414 "conf_parser.y" +#line 415 "conf_parser.y" { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); } break; case 46: /* Line 1792 of yacc.c */ -#line 428 "conf_parser.y" +#line 429 "conf_parser.y" { if (conf_parser_ctx.pass == 2) add_conf_module(libio_basename(yylval.string)); @@ -3216,7 +3208,7 @@ yyreduce: case 47: /* Line 1792 of yacc.c */ -#line 434 "conf_parser.y" +#line 435 "conf_parser.y" { if (conf_parser_ctx.pass == 2) mod_add_path(yylval.string); @@ -3225,7 +3217,7 @@ yyreduce: case 71: /* Line 1792 of yacc.c */ -#line 459 "conf_parser.y" +#line 460 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx) @@ -3236,7 +3228,7 @@ yyreduce: case 72: /* Line 1792 of yacc.c */ -#line 465 "conf_parser.y" +#line 466 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx) @@ -3247,7 +3239,7 @@ yyreduce: case 75: /* Line 1792 of yacc.c */ -#line 474 "conf_parser.y" +#line 475 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3258,7 +3250,7 @@ yyreduce: case 76: /* Line 1792 of yacc.c */ -#line 480 "conf_parser.y" +#line 481 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3269,7 +3261,7 @@ yyreduce: case 77: /* Line 1792 of yacc.c */ -#line 488 "conf_parser.y" +#line 489 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3311,7 +3303,7 @@ yyreduce: case 78: /* Line 1792 of yacc.c */ -#line 527 "conf_parser.y" +#line 528 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 1) @@ -3373,7 +3365,7 @@ yyreduce: case 79: /* Line 1792 of yacc.c */ -#line 586 "conf_parser.y" +#line 587 "conf_parser.y" { /* TBD - XXX: error reporting */ #ifdef HAVE_LIBCRYPTO @@ -3404,7 +3396,7 @@ yyreduce: case 80: /* Line 1792 of yacc.c */ -#line 614 "conf_parser.y" +#line 615 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx) @@ -3415,7 +3407,7 @@ yyreduce: case 81: /* Line 1792 of yacc.c */ -#line 622 "conf_parser.y" +#line 623 "conf_parser.y" { /* this isn't rehashable */ if (conf_parser_ctx.pass == 2 && !ServerInfo.name) @@ -3433,7 +3425,7 @@ yyreduce: case 82: /* Line 1792 of yacc.c */ -#line 637 "conf_parser.y" +#line 638 "conf_parser.y" { /* this isn't rehashable */ if (conf_parser_ctx.pass == 2 && !ServerInfo.sid) @@ -3451,7 +3443,7 @@ yyreduce: case 83: /* Line 1792 of yacc.c */ -#line 652 "conf_parser.y" +#line 653 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3463,7 +3455,7 @@ yyreduce: case 84: /* Line 1792 of yacc.c */ -#line 661 "conf_parser.y" +#line 662 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3480,7 +3472,7 @@ yyreduce: case 85: /* Line 1792 of yacc.c */ -#line 675 "conf_parser.y" +#line 676 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3492,7 +3484,7 @@ yyreduce: case 86: /* Line 1792 of yacc.c */ -#line 684 "conf_parser.y" +#line 685 "conf_parser.y" { if (conf_parser_ctx.pass == 2 && *yylval.string != '*') { @@ -3523,7 +3515,7 @@ yyreduce: case 87: /* Line 1792 of yacc.c */ -#line 712 "conf_parser.y" +#line 713 "conf_parser.y" { #ifdef IPV6 if (conf_parser_ctx.pass == 2 && *yylval.string != '*') @@ -3556,7 +3548,7 @@ yyreduce: case 88: /* Line 1792 of yacc.c */ -#line 742 "conf_parser.y" +#line 743 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3582,7 +3574,7 @@ yyreduce: case 89: /* Line 1792 of yacc.c */ -#line 765 "conf_parser.y" +#line 766 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ServerInfo.hub = yylval.number; @@ -3591,7 +3583,7 @@ yyreduce: case 97: /* Line 1792 of yacc.c */ -#line 780 "conf_parser.y" +#line 781 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3603,7 +3595,7 @@ yyreduce: case 98: /* Line 1792 of yacc.c */ -#line 789 "conf_parser.y" +#line 790 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3615,7 +3607,7 @@ yyreduce: case 99: /* Line 1792 of yacc.c */ -#line 798 "conf_parser.y" +#line 799 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3627,7 +3619,7 @@ yyreduce: case 106: /* Line 1792 of yacc.c */ -#line 816 "conf_parser.y" +#line 817 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigLoggingEntry.use_logging = yylval.number; @@ -3636,7 +3628,7 @@ yyreduce: case 107: /* Line 1792 of yacc.c */ -#line 822 "conf_parser.y" +#line 823 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); @@ -3645,7 +3637,7 @@ yyreduce: case 108: /* Line 1792 of yacc.c */ -#line 826 "conf_parser.y" +#line 827 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3658,7 +3650,7 @@ yyreduce: case 115: /* Line 1792 of yacc.c */ -#line 842 "conf_parser.y" +#line 843 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3669,7 +3661,7 @@ yyreduce: case 116: /* Line 1792 of yacc.c */ -#line 850 "conf_parser.y" +#line 851 "conf_parser.y" { block_state.size.value = (yyvsp[(3) - (4)].number); } @@ -3677,7 +3669,7 @@ yyreduce: case 117: /* Line 1792 of yacc.c */ -#line 853 "conf_parser.y" +#line 854 "conf_parser.y" { block_state.size.value = 0; } @@ -3685,7 +3677,7 @@ yyreduce: case 118: /* Line 1792 of yacc.c */ -#line 858 "conf_parser.y" +#line 859 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = 0; @@ -3694,7 +3686,7 @@ yyreduce: case 122: /* Line 1792 of yacc.c */ -#line 865 "conf_parser.y" +#line 866 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_USER; @@ -3703,7 +3695,7 @@ yyreduce: case 123: /* Line 1792 of yacc.c */ -#line 869 "conf_parser.y" +#line 870 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_OPER; @@ -3712,7 +3704,7 @@ yyreduce: case 124: /* Line 1792 of yacc.c */ -#line 873 "conf_parser.y" +#line 874 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_GLINE; @@ -3721,7 +3713,7 @@ yyreduce: case 125: /* Line 1792 of yacc.c */ -#line 877 "conf_parser.y" +#line 878 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_DLINE; @@ -3730,7 +3722,7 @@ yyreduce: case 126: /* Line 1792 of yacc.c */ -#line 881 "conf_parser.y" +#line 882 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_KLINE; @@ -3739,7 +3731,7 @@ yyreduce: case 127: /* Line 1792 of yacc.c */ -#line 885 "conf_parser.y" +#line 886 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_KILL; @@ -3748,7 +3740,7 @@ yyreduce: case 128: /* Line 1792 of yacc.c */ -#line 889 "conf_parser.y" +#line 890 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_DEBUG; @@ -3757,7 +3749,7 @@ yyreduce: case 129: /* Line 1792 of yacc.c */ -#line 899 "conf_parser.y" +#line 900 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3769,7 +3761,7 @@ yyreduce: case 130: /* Line 1792 of yacc.c */ -#line 906 "conf_parser.y" +#line 907 "conf_parser.y" { dlink_node *ptr = NULL; @@ -3845,7 +3837,7 @@ yyreduce: case 142: /* Line 1792 of yacc.c */ -#line 984 "conf_parser.y" +#line 985 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); @@ -3854,7 +3846,7 @@ yyreduce: case 143: /* Line 1792 of yacc.c */ -#line 990 "conf_parser.y" +#line 991 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); @@ -3863,7 +3855,7 @@ yyreduce: case 144: /* Line 1792 of yacc.c */ -#line 996 "conf_parser.y" +#line 997 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); @@ -3872,7 +3864,7 @@ yyreduce: case 145: /* Line 1792 of yacc.c */ -#line 1002 "conf_parser.y" +#line 1003 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -3886,7 +3878,7 @@ yyreduce: case 146: /* Line 1792 of yacc.c */ -#line 1013 "conf_parser.y" +#line 1014 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf)); @@ -3895,7 +3887,7 @@ yyreduce: case 147: /* Line 1792 of yacc.c */ -#line 1019 "conf_parser.y" +#line 1020 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); @@ -3904,7 +3896,7 @@ yyreduce: case 148: /* Line 1792 of yacc.c */ -#line 1025 "conf_parser.y" +#line 1026 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value = 0; @@ -3913,7 +3905,7 @@ yyreduce: case 152: /* Line 1792 of yacc.c */ -#line 1032 "conf_parser.y" +#line 1033 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_BOTS; @@ -3922,7 +3914,7 @@ yyreduce: case 153: /* Line 1792 of yacc.c */ -#line 1036 "conf_parser.y" +#line 1037 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CCONN; @@ -3931,7 +3923,7 @@ yyreduce: case 154: /* Line 1792 of yacc.c */ -#line 1040 "conf_parser.y" +#line 1041 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CCONN_FULL; @@ -3940,7 +3932,7 @@ yyreduce: case 155: /* Line 1792 of yacc.c */ -#line 1044 "conf_parser.y" +#line 1045 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_DEAF; @@ -3949,7 +3941,7 @@ yyreduce: case 156: /* Line 1792 of yacc.c */ -#line 1048 "conf_parser.y" +#line 1049 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_DEBUG; @@ -3958,7 +3950,7 @@ yyreduce: case 157: /* Line 1792 of yacc.c */ -#line 1052 "conf_parser.y" +#line 1053 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_FULL; @@ -3967,7 +3959,7 @@ yyreduce: case 158: /* Line 1792 of yacc.c */ -#line 1056 "conf_parser.y" +#line 1057 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_HIDDEN; @@ -3976,7 +3968,7 @@ yyreduce: case 159: /* Line 1792 of yacc.c */ -#line 1060 "conf_parser.y" +#line 1061 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SKILL; @@ -3985,7 +3977,7 @@ yyreduce: case 160: /* Line 1792 of yacc.c */ -#line 1064 "conf_parser.y" +#line 1065 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_NCHANGE; @@ -3994,7 +3986,7 @@ yyreduce: case 161: /* Line 1792 of yacc.c */ -#line 1068 "conf_parser.y" +#line 1069 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_REJ; @@ -4003,7 +3995,7 @@ yyreduce: case 162: /* Line 1792 of yacc.c */ -#line 1072 "conf_parser.y" +#line 1073 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_UNAUTH; @@ -4012,7 +4004,7 @@ yyreduce: case 163: /* Line 1792 of yacc.c */ -#line 1076 "conf_parser.y" +#line 1077 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SPY; @@ -4021,7 +4013,7 @@ yyreduce: case 164: /* Line 1792 of yacc.c */ -#line 1080 "conf_parser.y" +#line 1081 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_EXTERNAL; @@ -4030,7 +4022,7 @@ yyreduce: case 165: /* Line 1792 of yacc.c */ -#line 1084 "conf_parser.y" +#line 1085 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_OPERWALL; @@ -4039,7 +4031,7 @@ yyreduce: case 166: /* Line 1792 of yacc.c */ -#line 1088 "conf_parser.y" +#line 1089 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SERVNOTICE; @@ -4048,7 +4040,7 @@ yyreduce: case 167: /* Line 1792 of yacc.c */ -#line 1092 "conf_parser.y" +#line 1093 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_INVISIBLE; @@ -4057,7 +4049,7 @@ yyreduce: case 168: /* Line 1792 of yacc.c */ -#line 1096 "conf_parser.y" +#line 1097 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_WALLOP; @@ -4066,7 +4058,7 @@ yyreduce: case 169: /* Line 1792 of yacc.c */ -#line 1100 "conf_parser.y" +#line 1101 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_SOFTCALLERID; @@ -4075,7 +4067,7 @@ yyreduce: case 170: /* Line 1792 of yacc.c */ -#line 1104 "conf_parser.y" +#line 1105 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_CALLERID; @@ -4084,7 +4076,7 @@ yyreduce: case 171: /* Line 1792 of yacc.c */ -#line 1108 "conf_parser.y" +#line 1109 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value |= UMODE_LOCOPS; @@ -4093,7 +4085,7 @@ yyreduce: case 172: /* Line 1792 of yacc.c */ -#line 1114 "conf_parser.y" +#line 1115 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 0; @@ -4102,7 +4094,7 @@ yyreduce: case 176: /* Line 1792 of yacc.c */ -#line 1121 "conf_parser.y" +#line 1122 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLOBAL_KILL; @@ -4111,7 +4103,7 @@ yyreduce: case 177: /* Line 1792 of yacc.c */ -#line 1125 "conf_parser.y" +#line 1126 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REMOTE; @@ -4120,7 +4112,7 @@ yyreduce: case 178: /* Line 1792 of yacc.c */ -#line 1129 "conf_parser.y" +#line 1130 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_K; @@ -4129,7 +4121,7 @@ yyreduce: case 179: /* Line 1792 of yacc.c */ -#line 1133 "conf_parser.y" +#line 1134 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_UNKLINE; @@ -4138,7 +4130,7 @@ yyreduce: case 180: /* Line 1792 of yacc.c */ -#line 1137 "conf_parser.y" +#line 1138 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_DLINE; @@ -4147,7 +4139,7 @@ yyreduce: case 181: /* Line 1792 of yacc.c */ -#line 1141 "conf_parser.y" +#line 1142 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_UNDLINE; @@ -4156,7 +4148,7 @@ yyreduce: case 182: /* Line 1792 of yacc.c */ -#line 1145 "conf_parser.y" +#line 1146 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_X; @@ -4165,7 +4157,7 @@ yyreduce: case 183: /* Line 1792 of yacc.c */ -#line 1149 "conf_parser.y" +#line 1150 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLINE; @@ -4174,7 +4166,7 @@ yyreduce: case 184: /* Line 1792 of yacc.c */ -#line 1153 "conf_parser.y" +#line 1154 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_DIE; @@ -4183,7 +4175,7 @@ yyreduce: case 185: /* Line 1792 of yacc.c */ -#line 1157 "conf_parser.y" +#line 1158 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_RESTART; @@ -4192,7 +4184,7 @@ yyreduce: case 186: /* Line 1792 of yacc.c */ -#line 1161 "conf_parser.y" +#line 1162 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REHASH; @@ -4201,7 +4193,7 @@ yyreduce: case 187: /* Line 1792 of yacc.c */ -#line 1165 "conf_parser.y" +#line 1166 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_ADMIN; @@ -4210,7 +4202,7 @@ yyreduce: case 188: /* Line 1792 of yacc.c */ -#line 1169 "conf_parser.y" +#line 1170 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_N; @@ -4219,7 +4211,7 @@ yyreduce: case 189: /* Line 1792 of yacc.c */ -#line 1173 "conf_parser.y" +#line 1174 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_OPERWALL; @@ -4228,7 +4220,7 @@ yyreduce: case 190: /* Line 1792 of yacc.c */ -#line 1177 "conf_parser.y" +#line 1178 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_GLOBOPS; @@ -4237,7 +4229,7 @@ yyreduce: case 191: /* Line 1792 of yacc.c */ -#line 1181 "conf_parser.y" +#line 1182 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_OPER_SPY; @@ -4246,7 +4238,7 @@ yyreduce: case 192: /* Line 1792 of yacc.c */ -#line 1185 "conf_parser.y" +#line 1186 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_REMOTEBAN; @@ -4255,7 +4247,7 @@ yyreduce: case 193: /* Line 1792 of yacc.c */ -#line 1189 "conf_parser.y" +#line 1190 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_SET; @@ -4264,7 +4256,7 @@ yyreduce: case 194: /* Line 1792 of yacc.c */ -#line 1193 "conf_parser.y" +#line 1194 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value |= OPER_FLAG_MODULE; @@ -4273,7 +4265,7 @@ yyreduce: case 195: /* Line 1792 of yacc.c */ -#line 1203 "conf_parser.y" +#line 1204 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4291,7 +4283,7 @@ yyreduce: case 196: /* Line 1792 of yacc.c */ -#line 1216 "conf_parser.y" +#line 1217 "conf_parser.y" { struct ClassItem *class = NULL; @@ -4332,7 +4324,7 @@ yyreduce: case 213: /* Line 1792 of yacc.c */ -#line 1268 "conf_parser.y" +#line 1269 "conf_parser.y" { if (conf_parser_ctx.pass == 1) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); @@ -4341,7 +4333,7 @@ yyreduce: case 214: /* Line 1792 of yacc.c */ -#line 1274 "conf_parser.y" +#line 1275 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.ping_freq.value = (yyvsp[(3) - (4)].number); @@ -4350,7 +4342,7 @@ yyreduce: case 215: /* Line 1792 of yacc.c */ -#line 1280 "conf_parser.y" +#line 1281 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_perip.value = (yyvsp[(3) - (4)].number); @@ -4359,7 +4351,7 @@ yyreduce: case 216: /* Line 1792 of yacc.c */ -#line 1286 "conf_parser.y" +#line 1287 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.con_freq.value = (yyvsp[(3) - (4)].number); @@ -4368,7 +4360,7 @@ yyreduce: case 217: /* Line 1792 of yacc.c */ -#line 1292 "conf_parser.y" +#line 1293 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_total.value = (yyvsp[(3) - (4)].number); @@ -4377,7 +4369,7 @@ yyreduce: case 218: /* Line 1792 of yacc.c */ -#line 1298 "conf_parser.y" +#line 1299 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_global.value = (yyvsp[(3) - (4)].number); @@ -4386,7 +4378,7 @@ yyreduce: case 219: /* Line 1792 of yacc.c */ -#line 1304 "conf_parser.y" +#line 1305 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_local.value = (yyvsp[(3) - (4)].number); @@ -4395,7 +4387,7 @@ yyreduce: case 220: /* Line 1792 of yacc.c */ -#line 1310 "conf_parser.y" +#line 1311 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_ident.value = (yyvsp[(3) - (4)].number); @@ -4404,7 +4396,7 @@ yyreduce: case 221: /* Line 1792 of yacc.c */ -#line 1316 "conf_parser.y" +#line 1317 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_sendq.value = (yyvsp[(3) - (4)].number); @@ -4413,7 +4405,7 @@ yyreduce: case 222: /* Line 1792 of yacc.c */ -#line 1322 "conf_parser.y" +#line 1323 "conf_parser.y" { if (conf_parser_ctx.pass == 1) if ((yyvsp[(3) - (4)].number) >= CLIENT_FLOOD_MIN && (yyvsp[(3) - (4)].number) <= CLIENT_FLOOD_MAX) @@ -4423,7 +4415,7 @@ yyreduce: case 223: /* Line 1792 of yacc.c */ -#line 1329 "conf_parser.y" +#line 1330 "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); @@ -4432,7 +4424,7 @@ yyreduce: case 224: /* Line 1792 of yacc.c */ -#line 1335 "conf_parser.y" +#line 1336 "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); @@ -4441,7 +4433,7 @@ yyreduce: case 225: /* Line 1792 of yacc.c */ -#line 1341 "conf_parser.y" +#line 1342 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.number_per_cidr.value = (yyvsp[(3) - (4)].number); @@ -4450,7 +4442,7 @@ yyreduce: case 226: /* Line 1792 of yacc.c */ -#line 1350 "conf_parser.y" +#line 1351 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); @@ -4459,7 +4451,7 @@ yyreduce: case 228: /* Line 1792 of yacc.c */ -#line 1356 "conf_parser.y" +#line 1357 "conf_parser.y" { block_state.flags.value = 0; } @@ -4467,7 +4459,7 @@ yyreduce: case 232: /* Line 1792 of yacc.c */ -#line 1362 "conf_parser.y" +#line 1363 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_SSL; @@ -4476,7 +4468,7 @@ yyreduce: case 233: /* Line 1792 of yacc.c */ -#line 1366 "conf_parser.y" +#line 1367 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_HIDDEN; @@ -4485,7 +4477,7 @@ yyreduce: case 234: /* Line 1792 of yacc.c */ -#line 1370 "conf_parser.y" +#line 1371 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_SERVER; @@ -4494,13 +4486,13 @@ yyreduce: case 242: /* Line 1792 of yacc.c */ -#line 1378 "conf_parser.y" +#line 1379 "conf_parser.y" { block_state.flags.value = 0; } break; case 246: /* Line 1792 of yacc.c */ -#line 1383 "conf_parser.y" +#line 1384 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4519,7 +4511,7 @@ yyreduce: case 247: /* Line 1792 of yacc.c */ -#line 1397 "conf_parser.y" +#line 1398 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4542,7 +4534,7 @@ yyreduce: case 248: /* Line 1792 of yacc.c */ -#line 1417 "conf_parser.y" +#line 1418 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); @@ -4551,7 +4543,7 @@ yyreduce: case 249: /* Line 1792 of yacc.c */ -#line 1423 "conf_parser.y" +#line 1424 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); @@ -4560,7 +4552,7 @@ yyreduce: case 250: /* Line 1792 of yacc.c */ -#line 1432 "conf_parser.y" +#line 1433 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); @@ -4569,7 +4561,7 @@ yyreduce: case 251: /* Line 1792 of yacc.c */ -#line 1436 "conf_parser.y" +#line 1437 "conf_parser.y" { dlink_node *ptr = NULL; @@ -4610,7 +4602,7 @@ yyreduce: case 263: /* Line 1792 of yacc.c */ -#line 1479 "conf_parser.y" +#line 1480 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); @@ -4619,7 +4611,7 @@ yyreduce: case 264: /* Line 1792 of yacc.c */ -#line 1485 "conf_parser.y" +#line 1486 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); @@ -4628,7 +4620,7 @@ yyreduce: case 265: /* Line 1792 of yacc.c */ -#line 1491 "conf_parser.y" +#line 1492 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); @@ -4637,7 +4629,7 @@ yyreduce: case 266: /* Line 1792 of yacc.c */ -#line 1497 "conf_parser.y" +#line 1498 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4651,7 +4643,7 @@ yyreduce: case 267: /* Line 1792 of yacc.c */ -#line 1508 "conf_parser.y" +#line 1509 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value &= CONF_FLAGS_ENCRYPTED; @@ -4660,7 +4652,7 @@ yyreduce: case 271: /* Line 1792 of yacc.c */ -#line 1515 "conf_parser.y" +#line 1516 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE; @@ -4669,7 +4661,7 @@ yyreduce: case 272: /* Line 1792 of yacc.c */ -#line 1519 "conf_parser.y" +#line 1520 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NOLIMIT; @@ -4678,7 +4670,7 @@ yyreduce: case 273: /* Line 1792 of yacc.c */ -#line 1523 "conf_parser.y" +#line 1524 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE; @@ -4687,7 +4679,7 @@ yyreduce: case 274: /* Line 1792 of yacc.c */ -#line 1527 "conf_parser.y" +#line 1528 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NEED_IDENTD; @@ -4696,7 +4688,7 @@ yyreduce: case 275: /* Line 1792 of yacc.c */ -#line 1531 "conf_parser.y" +#line 1532 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_CAN_FLOOD; @@ -4705,7 +4697,7 @@ yyreduce: case 276: /* Line 1792 of yacc.c */ -#line 1535 "conf_parser.y" +#line 1536 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NO_TILDE; @@ -4714,7 +4706,7 @@ yyreduce: case 277: /* Line 1792 of yacc.c */ -#line 1539 "conf_parser.y" +#line 1540 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE; @@ -4723,7 +4715,7 @@ yyreduce: case 278: /* Line 1792 of yacc.c */ -#line 1543 "conf_parser.y" +#line 1544 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTRESV; @@ -4732,16 +4724,25 @@ yyreduce: case 279: /* Line 1792 of yacc.c */ -#line 1547 "conf_parser.y" +#line 1548 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD; + block_state.flags.value |= CONF_FLAGS_WEBIRC; } break; case 280: /* Line 1792 of yacc.c */ -#line 1553 "conf_parser.y" +#line 1552 "conf_parser.y" + { + if (conf_parser_ctx.pass == 2) + block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD; +} + break; + + case 281: +/* Line 1792 of yacc.c */ +#line 1558 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4756,9 +4757,9 @@ yyreduce: } break; - case 281: + case 282: /* Line 1792 of yacc.c */ -#line 1567 "conf_parser.y" +#line 1572 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4768,9 +4769,9 @@ yyreduce: } break; - case 282: + case 283: /* Line 1792 of yacc.c */ -#line 1576 "conf_parser.y" +#line 1581 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4780,9 +4781,9 @@ yyreduce: } break; - case 283: + case 284: /* Line 1792 of yacc.c */ -#line 1589 "conf_parser.y" +#line 1594 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4792,18 +4793,18 @@ yyreduce: } break; - case 291: + case 292: /* Line 1792 of yacc.c */ -#line 1601 "conf_parser.y" +#line 1606 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 292: + case 293: /* Line 1792 of yacc.c */ -#line 1607 "conf_parser.y" +#line 1612 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4813,18 +4814,18 @@ yyreduce: } break; - case 293: + case 294: /* Line 1792 of yacc.c */ -#line 1616 "conf_parser.y" +#line 1621 "conf_parser.y" { if (conf_parser_ctx.pass == 2) create_nick_resv(yylval.string, block_state.rpass.buf, 1); } break; - case 299: + case 300: /* Line 1792 of yacc.c */ -#line 1630 "conf_parser.y" +#line 1635 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4837,9 +4838,9 @@ yyreduce: } break; - case 300: + case 301: /* Line 1792 of yacc.c */ -#line 1645 "conf_parser.y" +#line 1650 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4853,9 +4854,9 @@ yyreduce: } break; - case 301: + case 302: /* Line 1792 of yacc.c */ -#line 1656 "conf_parser.y" +#line 1661 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -4870,18 +4871,18 @@ yyreduce: } break; - case 308: + case 309: /* Line 1792 of yacc.c */ -#line 1673 "conf_parser.y" +#line 1678 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 309: + case 310: /* Line 1792 of yacc.c */ -#line 1679 "conf_parser.y" +#line 1684 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4901,108 +4902,108 @@ yyreduce: } break; - case 310: + case 311: /* Line 1792 of yacc.c */ -#line 1698 "conf_parser.y" +#line 1703 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = 0; } break; - case 314: + case 315: /* Line 1792 of yacc.c */ -#line 1705 "conf_parser.y" +#line 1710 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_KLINE; } break; - case 315: + case 316: /* Line 1792 of yacc.c */ -#line 1709 "conf_parser.y" +#line 1714 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNKLINE; } break; - case 316: + case 317: /* Line 1792 of yacc.c */ -#line 1713 "conf_parser.y" +#line 1718 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_DLINE; } break; - case 317: + case 318: /* Line 1792 of yacc.c */ -#line 1717 "conf_parser.y" +#line 1722 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNDLINE; } break; - case 318: + case 319: /* Line 1792 of yacc.c */ -#line 1721 "conf_parser.y" +#line 1726 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_XLINE; } break; - case 319: + case 320: /* Line 1792 of yacc.c */ -#line 1725 "conf_parser.y" +#line 1730 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNXLINE; } break; - case 320: + case 321: /* Line 1792 of yacc.c */ -#line 1729 "conf_parser.y" +#line 1734 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_RESV; } break; - case 321: + case 322: /* Line 1792 of yacc.c */ -#line 1733 "conf_parser.y" +#line 1738 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNRESV; } break; - case 322: + case 323: /* Line 1792 of yacc.c */ -#line 1737 "conf_parser.y" +#line 1742 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_LOCOPS; } break; - case 323: + case 324: /* Line 1792 of yacc.c */ -#line 1741 "conf_parser.y" +#line 1746 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = SHARED_ALL; } break; - case 324: + case 325: /* Line 1792 of yacc.c */ -#line 1750 "conf_parser.y" +#line 1755 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5014,9 +5015,9 @@ yyreduce: } break; - case 325: + case 326: /* Line 1792 of yacc.c */ -#line 1759 "conf_parser.y" +#line 1764 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5029,117 +5030,117 @@ yyreduce: } break; - case 331: + case 332: /* Line 1792 of yacc.c */ -#line 1774 "conf_parser.y" +#line 1779 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 332: + case 333: /* Line 1792 of yacc.c */ -#line 1780 "conf_parser.y" +#line 1785 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = 0; } break; - case 336: + case 337: /* Line 1792 of yacc.c */ -#line 1787 "conf_parser.y" +#line 1792 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_KLINE; } break; - case 337: + case 338: /* Line 1792 of yacc.c */ -#line 1791 "conf_parser.y" +#line 1796 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNKLINE; } break; - case 338: + case 339: /* Line 1792 of yacc.c */ -#line 1795 "conf_parser.y" +#line 1800 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_DLINE; } break; - case 339: + case 340: /* Line 1792 of yacc.c */ -#line 1799 "conf_parser.y" +#line 1804 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNDLINE; } break; - case 340: + case 341: /* Line 1792 of yacc.c */ -#line 1803 "conf_parser.y" +#line 1808 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_XLINE; } break; - case 341: + case 342: /* Line 1792 of yacc.c */ -#line 1807 "conf_parser.y" +#line 1812 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNXLINE; } break; - case 342: + case 343: /* Line 1792 of yacc.c */ -#line 1811 "conf_parser.y" +#line 1816 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_RESV; } break; - case 343: + case 344: /* Line 1792 of yacc.c */ -#line 1815 "conf_parser.y" +#line 1820 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNRESV; } break; - case 344: + case 345: /* Line 1792 of yacc.c */ -#line 1819 "conf_parser.y" +#line 1824 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_LOCOPS; } break; - case 345: + case 346: /* Line 1792 of yacc.c */ -#line 1823 "conf_parser.y" +#line 1828 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = SHARED_ALL; } break; - case 346: + case 347: /* Line 1792 of yacc.c */ -#line 1832 "conf_parser.y" +#line 1837 "conf_parser.y" { if (conf_parser_ctx.pass != 2) @@ -5150,9 +5151,9 @@ yyreduce: } break; - case 347: + case 348: /* Line 1792 of yacc.c */ -#line 1840 "conf_parser.y" +#line 1845 "conf_parser.y" { struct MaskItem *conf = NULL; struct addrinfo hints, *res; @@ -5211,36 +5212,36 @@ yyreduce: } break; - case 364: + case 365: /* Line 1792 of yacc.c */ -#line 1906 "conf_parser.y" +#line 1911 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 365: + case 366: /* Line 1792 of yacc.c */ -#line 1912 "conf_parser.y" +#line 1917 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf)); } break; - case 366: + case 367: /* Line 1792 of yacc.c */ -#line 1918 "conf_parser.y" +#line 1923 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf)); } break; - case 367: + case 368: /* Line 1792 of yacc.c */ -#line 1924 "conf_parser.y" +#line 1929 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5254,9 +5255,9 @@ yyreduce: } break; - case 368: + case 369: /* Line 1792 of yacc.c */ -#line 1937 "conf_parser.y" +#line 1942 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5270,27 +5271,27 @@ yyreduce: } break; - case 369: + case 370: /* Line 1792 of yacc.c */ -#line 1950 "conf_parser.y" +#line 1955 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = (yyvsp[(3) - (4)].number); } break; - case 370: + case 371: /* Line 1792 of yacc.c */ -#line 1956 "conf_parser.y" +#line 1961 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.aftype.value = AF_INET; } break; - case 371: + case 372: /* Line 1792 of yacc.c */ -#line 1960 "conf_parser.y" +#line 1965 "conf_parser.y" { #ifdef IPV6 if (conf_parser_ctx.pass == 2) @@ -5299,35 +5300,35 @@ yyreduce: } break; - case 372: + case 373: /* Line 1792 of yacc.c */ -#line 1968 "conf_parser.y" +#line 1973 "conf_parser.y" { block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } break; - case 376: + case 377: /* Line 1792 of yacc.c */ -#line 1974 "conf_parser.y" +#line 1979 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN; } break; - case 377: + case 378: /* Line 1792 of yacc.c */ -#line 1978 "conf_parser.y" +#line 1983 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SSL; } break; - case 378: + case 379: /* Line 1792 of yacc.c */ -#line 1984 "conf_parser.y" +#line 1989 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5339,36 +5340,36 @@ yyreduce: } break; - case 379: + case 380: /* Line 1792 of yacc.c */ -#line 1995 "conf_parser.y" +#line 2000 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list); } break; - case 380: + case 381: /* Line 1792 of yacc.c */ -#line 2001 "conf_parser.y" +#line 2006 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list); } break; - case 381: + case 382: /* Line 1792 of yacc.c */ -#line 2007 "conf_parser.y" +#line 2012 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 382: + case 383: /* Line 1792 of yacc.c */ -#line 2013 "conf_parser.y" +#line 2018 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2) @@ -5380,18 +5381,18 @@ yyreduce: } break; - case 383: + case 384: /* Line 1792 of yacc.c */ -#line 2028 "conf_parser.y" +#line 2033 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 384: + case 385: /* Line 1792 of yacc.c */ -#line 2032 "conf_parser.y" +#line 2037 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5450,27 +5451,27 @@ yyreduce: } break; - case 385: + case 386: /* Line 1792 of yacc.c */ -#line 2090 "conf_parser.y" +#line 2095 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 0; } break; - case 389: + case 390: /* Line 1792 of yacc.c */ -#line 2097 "conf_parser.y" +#line 2102 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 1; } break; - case 396: + case 397: /* Line 1792 of yacc.c */ -#line 2106 "conf_parser.y" +#line 2111 "conf_parser.y" { if (conf_parser_ctx.pass == 2) @@ -5491,27 +5492,27 @@ yyreduce: } break; - case 397: + case 398: /* Line 1792 of yacc.c */ -#line 2126 "conf_parser.y" +#line 2131 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 398: + case 399: /* Line 1792 of yacc.c */ -#line 2135 "conf_parser.y" +#line 2140 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 399: + case 400: /* Line 1792 of yacc.c */ -#line 2139 "conf_parser.y" +#line 2144 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5535,27 +5536,27 @@ yyreduce: } break; - case 405: + case 406: /* Line 1792 of yacc.c */ -#line 2165 "conf_parser.y" +#line 2170 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 406: + case 407: /* Line 1792 of yacc.c */ -#line 2171 "conf_parser.y" +#line 2176 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 412: + case 413: /* Line 1792 of yacc.c */ -#line 2185 "conf_parser.y" +#line 2190 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5570,18 +5571,18 @@ yyreduce: } break; - case 413: + case 414: /* Line 1792 of yacc.c */ -#line 2202 "conf_parser.y" +#line 2207 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 414: + case 415: /* Line 1792 of yacc.c */ -#line 2206 "conf_parser.y" +#line 2211 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5623,82 +5624,74 @@ yyreduce: } break; - case 415: + case 416: /* Line 1792 of yacc.c */ -#line 2247 "conf_parser.y" +#line 2252 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 0; } break; - case 419: + case 420: /* Line 1792 of yacc.c */ -#line 2254 "conf_parser.y" +#line 2259 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = 1; } break; - case 426: + case 427: /* Line 1792 of yacc.c */ -#line 2263 "conf_parser.y" +#line 2268 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 427: + case 428: /* Line 1792 of yacc.c */ -#line 2269 "conf_parser.y" +#line 2274 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 481: -/* Line 1792 of yacc.c */ -#line 2314 "conf_parser.y" - { - ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number); -} - break; - case 482: /* Line 1792 of yacc.c */ #line 2319 "conf_parser.y" { - if (conf_parser_ctx.pass == 2) - ConfigFileEntry.glines = yylval.number; + ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number); } break; case 483: /* Line 1792 of yacc.c */ -#line 2325 "conf_parser.y" +#line 2324 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number); + ConfigFileEntry.glines = yylval.number; } break; case 484: /* Line 1792 of yacc.c */ -#line 2331 "conf_parser.y" +#line 2330 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number); + ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number); } break; case 485: /* Line 1792 of yacc.c */ -#line 2337 "conf_parser.y" +#line 2336 "conf_parser.y" { - ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number); + if (conf_parser_ctx.pass == 2) + ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number); } break; @@ -5706,7 +5699,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2342 "conf_parser.y" { - ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number); + ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number); } break; @@ -5714,7 +5707,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2347 "conf_parser.y" { - ConfigFileEntry.tkline_expire_notices = yylval.number; + ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number); } break; @@ -5722,7 +5715,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2352 "conf_parser.y" { - ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number); + ConfigFileEntry.tkline_expire_notices = yylval.number; } break; @@ -5730,7 +5723,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2357 "conf_parser.y" { - ConfigFileEntry.hide_spoof_ips = yylval.number; + ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number); } break; @@ -5738,7 +5731,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2362 "conf_parser.y" { - ConfigFileEntry.ignore_bogus_ts = yylval.number; + ConfigFileEntry.hide_spoof_ips = yylval.number; } break; @@ -5746,7 +5739,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2367 "conf_parser.y" { - ConfigFileEntry.disable_remote = yylval.number; + ConfigFileEntry.ignore_bogus_ts = yylval.number; } break; @@ -5754,7 +5747,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2372 "conf_parser.y" { - ConfigFileEntry.failed_oper_notice = yylval.number; + ConfigFileEntry.disable_remote = yylval.number; } break; @@ -5762,7 +5755,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2377 "conf_parser.y" { - ConfigFileEntry.anti_nick_flood = yylval.number; + ConfigFileEntry.failed_oper_notice = yylval.number; } break; @@ -5770,7 +5763,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2382 "conf_parser.y" { - ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); + ConfigFileEntry.anti_nick_flood = yylval.number; } break; @@ -5778,7 +5771,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2387 "conf_parser.y" { - ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number); + ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); } break; @@ -5786,7 +5779,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2392 "conf_parser.y" { - ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number); + ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number); } break; @@ -5794,7 +5787,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2397 "conf_parser.y" { - ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number); + ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number); } break; @@ -5802,7 +5795,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2402 "conf_parser.y" { - ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number); + ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number); } break; @@ -5810,14 +5803,22 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2407 "conf_parser.y" { + ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number); +} + break; + + case 500: +/* Line 1792 of yacc.c */ +#line 2412 "conf_parser.y" + { if (conf_parser_ctx.pass == 2) ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number); } break; - case 500: + case 501: /* Line 1792 of yacc.c */ -#line 2413 "conf_parser.y" +#line 2418 "conf_parser.y" { if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1) { @@ -5829,19 +5830,11 @@ yyreduce: } break; - case 501: -/* Line 1792 of yacc.c */ -#line 2424 "conf_parser.y" - { - ConfigFileEntry.invisible_on_connect = yylval.number; -} - break; - case 502: /* Line 1792 of yacc.c */ #line 2429 "conf_parser.y" { - ConfigFileEntry.warn_no_nline = yylval.number; + ConfigFileEntry.invisible_on_connect = yylval.number; } break; @@ -5849,7 +5842,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2434 "conf_parser.y" { - ConfigFileEntry.stats_e_disabled = yylval.number; + ConfigFileEntry.warn_no_nline = yylval.number; } break; @@ -5857,7 +5850,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2439 "conf_parser.y" { - ConfigFileEntry.stats_o_oper_only = yylval.number; + ConfigFileEntry.stats_e_disabled = yylval.number; } break; @@ -5865,7 +5858,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2444 "conf_parser.y" { - ConfigFileEntry.stats_P_oper_only = yylval.number; + ConfigFileEntry.stats_o_oper_only = yylval.number; } break; @@ -5873,15 +5866,15 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2449 "conf_parser.y" { - ConfigFileEntry.stats_k_oper_only = 2 * yylval.number; + ConfigFileEntry.stats_P_oper_only = yylval.number; } break; case 507: /* Line 1792 of yacc.c */ -#line 2452 "conf_parser.y" +#line 2454 "conf_parser.y" { - ConfigFileEntry.stats_k_oper_only = 1; + ConfigFileEntry.stats_k_oper_only = 2 * yylval.number; } break; @@ -5889,15 +5882,15 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2457 "conf_parser.y" { - ConfigFileEntry.stats_i_oper_only = 2 * yylval.number; + ConfigFileEntry.stats_k_oper_only = 1; } break; case 509: /* Line 1792 of yacc.c */ -#line 2460 "conf_parser.y" +#line 2462 "conf_parser.y" { - ConfigFileEntry.stats_i_oper_only = 1; + ConfigFileEntry.stats_i_oper_only = 2 * yylval.number; } break; @@ -5905,7 +5898,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2465 "conf_parser.y" { - ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number); + ConfigFileEntry.stats_i_oper_only = 1; } break; @@ -5913,7 +5906,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2470 "conf_parser.y" { - ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number); + ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number); } break; @@ -5921,7 +5914,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2475 "conf_parser.y" { - ConfigFileEntry.opers_bypass_callerid = yylval.number; + ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number); } break; @@ -5929,7 +5922,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2480 "conf_parser.y" { - ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number); + ConfigFileEntry.opers_bypass_callerid = yylval.number; } break; @@ -5937,7 +5930,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2485 "conf_parser.y" { - ConfigFileEntry.short_motd = yylval.number; + ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number); } break; @@ -5945,7 +5938,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2490 "conf_parser.y" { - ConfigFileEntry.no_oper_flood = yylval.number; + ConfigFileEntry.short_motd = yylval.number; } break; @@ -5953,7 +5946,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2495 "conf_parser.y" { - ConfigFileEntry.true_no_oper_flood = yylval.number; + ConfigFileEntry.no_oper_flood = yylval.number; } break; @@ -5961,7 +5954,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2500 "conf_parser.y" { - ConfigFileEntry.oper_pass_resv = yylval.number; + ConfigFileEntry.true_no_oper_flood = yylval.number; } break; @@ -5969,6 +5962,14 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2505 "conf_parser.y" { + ConfigFileEntry.oper_pass_resv = yylval.number; +} + break; + + case 519: +/* Line 1792 of yacc.c */ +#line 2510 "conf_parser.y" + { if (conf_parser_ctx.pass == 2) { if (strlen(yylval.string) > LOCALE_LENGTH-2) @@ -5979,33 +5980,33 @@ yyreduce: } break; - case 519: + case 520: /* Line 1792 of yacc.c */ -#line 2516 "conf_parser.y" +#line 2521 "conf_parser.y" { ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number); } break; - case 520: + case 521: /* Line 1792 of yacc.c */ -#line 2521 "conf_parser.y" +#line 2526 "conf_parser.y" { ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number); } break; - case 521: + case 522: /* Line 1792 of yacc.c */ -#line 2526 "conf_parser.y" +#line 2531 "conf_parser.y" { ConfigFileEntry.use_egd = yylval.number; } break; - case 522: + case 523: /* Line 1792 of yacc.c */ -#line 2531 "conf_parser.y" +#line 2536 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6015,9 +6016,9 @@ yyreduce: } break; - case 523: + case 524: /* Line 1792 of yacc.c */ -#line 2540 "conf_parser.y" +#line 2545 "conf_parser.y" { if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string)) { @@ -6027,19 +6028,11 @@ yyreduce: } break; - case 524: -/* Line 1792 of yacc.c */ -#line 2549 "conf_parser.y" - { - ConfigFileEntry.ping_cookie = yylval.number; -} - break; - case 525: /* Line 1792 of yacc.c */ #line 2554 "conf_parser.y" { - ConfigFileEntry.disable_auth = yylval.number; + ConfigFileEntry.ping_cookie = yylval.number; } break; @@ -6047,7 +6040,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2559 "conf_parser.y" { - ConfigFileEntry.throttle_time = yylval.number; + ConfigFileEntry.disable_auth = yylval.number; } break; @@ -6055,167 +6048,167 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2564 "conf_parser.y" { - ConfigFileEntry.oper_umodes = 0; + ConfigFileEntry.throttle_time = yylval.number; } break; - case 531: + case 528: /* Line 1792 of yacc.c */ -#line 2570 "conf_parser.y" +#line 2569 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_BOTS; + ConfigFileEntry.oper_umodes = 0; } break; case 532: /* Line 1792 of yacc.c */ -#line 2573 "conf_parser.y" +#line 2575 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_CCONN; + ConfigFileEntry.oper_umodes |= UMODE_BOTS; } break; case 533: /* Line 1792 of yacc.c */ -#line 2576 "conf_parser.y" +#line 2578 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL; + ConfigFileEntry.oper_umodes |= UMODE_CCONN; } break; case 534: /* Line 1792 of yacc.c */ -#line 2579 "conf_parser.y" +#line 2581 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_DEAF; + ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL; } break; case 535: /* Line 1792 of yacc.c */ -#line 2582 "conf_parser.y" +#line 2584 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_DEBUG; + ConfigFileEntry.oper_umodes |= UMODE_DEAF; } break; case 536: /* Line 1792 of yacc.c */ -#line 2585 "conf_parser.y" +#line 2587 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_FULL; + ConfigFileEntry.oper_umodes |= UMODE_DEBUG; } break; case 537: /* Line 1792 of yacc.c */ -#line 2588 "conf_parser.y" +#line 2590 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_HIDDEN; + ConfigFileEntry.oper_umodes |= UMODE_FULL; } break; case 538: /* Line 1792 of yacc.c */ -#line 2591 "conf_parser.y" +#line 2593 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_SKILL; + ConfigFileEntry.oper_umodes |= UMODE_HIDDEN; } break; case 539: /* Line 1792 of yacc.c */ -#line 2594 "conf_parser.y" +#line 2596 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_NCHANGE; + ConfigFileEntry.oper_umodes |= UMODE_SKILL; } break; case 540: /* Line 1792 of yacc.c */ -#line 2597 "conf_parser.y" +#line 2599 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_REJ; + ConfigFileEntry.oper_umodes |= UMODE_NCHANGE; } break; case 541: /* Line 1792 of yacc.c */ -#line 2600 "conf_parser.y" +#line 2602 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_UNAUTH; + ConfigFileEntry.oper_umodes |= UMODE_REJ; } break; case 542: /* Line 1792 of yacc.c */ -#line 2603 "conf_parser.y" +#line 2605 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_SPY; + ConfigFileEntry.oper_umodes |= UMODE_UNAUTH; } break; case 543: /* Line 1792 of yacc.c */ -#line 2606 "conf_parser.y" +#line 2608 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL; + ConfigFileEntry.oper_umodes |= UMODE_SPY; } break; case 544: /* Line 1792 of yacc.c */ -#line 2609 "conf_parser.y" +#line 2611 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_OPERWALL; + ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL; } break; case 545: /* Line 1792 of yacc.c */ -#line 2612 "conf_parser.y" +#line 2614 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE; + ConfigFileEntry.oper_umodes |= UMODE_OPERWALL; } break; case 546: /* Line 1792 of yacc.c */ -#line 2615 "conf_parser.y" +#line 2617 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE; + ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE; } break; case 547: /* Line 1792 of yacc.c */ -#line 2618 "conf_parser.y" +#line 2620 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_WALLOP; + ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE; } break; case 548: /* Line 1792 of yacc.c */ -#line 2621 "conf_parser.y" +#line 2623 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID; + ConfigFileEntry.oper_umodes |= UMODE_WALLOP; } break; case 549: /* Line 1792 of yacc.c */ -#line 2624 "conf_parser.y" +#line 2626 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_CALLERID; + ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID; } break; case 550: /* Line 1792 of yacc.c */ -#line 2627 "conf_parser.y" +#line 2629 "conf_parser.y" { - ConfigFileEntry.oper_umodes |= UMODE_LOCOPS; + ConfigFileEntry.oper_umodes |= UMODE_CALLERID; } break; @@ -6223,167 +6216,167 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2632 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes = 0; + ConfigFileEntry.oper_umodes |= UMODE_LOCOPS; } break; - case 555: + case 552: /* Line 1792 of yacc.c */ -#line 2638 "conf_parser.y" +#line 2637 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_BOTS; + ConfigFileEntry.oper_only_umodes = 0; } break; case 556: /* Line 1792 of yacc.c */ -#line 2641 "conf_parser.y" +#line 2643 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_CCONN; + ConfigFileEntry.oper_only_umodes |= UMODE_BOTS; } break; case 557: /* Line 1792 of yacc.c */ -#line 2644 "conf_parser.y" +#line 2646 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL; + ConfigFileEntry.oper_only_umodes |= UMODE_CCONN; } break; case 558: /* Line 1792 of yacc.c */ -#line 2647 "conf_parser.y" +#line 2649 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_DEAF; + ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL; } break; case 559: /* Line 1792 of yacc.c */ -#line 2650 "conf_parser.y" +#line 2652 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG; + ConfigFileEntry.oper_only_umodes |= UMODE_DEAF; } break; case 560: /* Line 1792 of yacc.c */ -#line 2653 "conf_parser.y" - { - ConfigFileEntry.oper_only_umodes |= UMODE_FULL; +#line 2655 "conf_parser.y" + { + ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG; } break; case 561: /* Line 1792 of yacc.c */ -#line 2656 "conf_parser.y" - { - ConfigFileEntry.oper_only_umodes |= UMODE_SKILL; +#line 2658 "conf_parser.y" + { + ConfigFileEntry.oper_only_umodes |= UMODE_FULL; } break; case 562: /* Line 1792 of yacc.c */ -#line 2659 "conf_parser.y" +#line 2661 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN; + ConfigFileEntry.oper_only_umodes |= UMODE_SKILL; } break; case 563: /* Line 1792 of yacc.c */ -#line 2662 "conf_parser.y" +#line 2664 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE; + ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN; } break; case 564: /* Line 1792 of yacc.c */ -#line 2665 "conf_parser.y" +#line 2667 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_REJ; + ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE; } break; case 565: /* Line 1792 of yacc.c */ -#line 2668 "conf_parser.y" +#line 2670 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH; + ConfigFileEntry.oper_only_umodes |= UMODE_REJ; } break; case 566: /* Line 1792 of yacc.c */ -#line 2671 "conf_parser.y" +#line 2673 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_SPY; + ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH; } break; case 567: /* Line 1792 of yacc.c */ -#line 2674 "conf_parser.y" +#line 2676 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL; + ConfigFileEntry.oper_only_umodes |= UMODE_SPY; } break; case 568: /* Line 1792 of yacc.c */ -#line 2677 "conf_parser.y" +#line 2679 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL; + ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL; } break; case 569: /* Line 1792 of yacc.c */ -#line 2680 "conf_parser.y" +#line 2682 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE; + ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL; } break; case 570: /* Line 1792 of yacc.c */ -#line 2683 "conf_parser.y" +#line 2685 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE; + ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE; } break; case 571: /* Line 1792 of yacc.c */ -#line 2686 "conf_parser.y" +#line 2688 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP; + ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE; } break; case 572: /* Line 1792 of yacc.c */ -#line 2689 "conf_parser.y" +#line 2691 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID; + ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP; } break; case 573: /* Line 1792 of yacc.c */ -#line 2692 "conf_parser.y" +#line 2694 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID; + ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID; } break; case 574: /* Line 1792 of yacc.c */ -#line 2695 "conf_parser.y" +#line 2697 "conf_parser.y" { - ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS; + ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID; } break; @@ -6391,7 +6384,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2700 "conf_parser.y" { - ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number); + ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS; } break; @@ -6399,7 +6392,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2705 "conf_parser.y" { - ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number); + ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number); } break; @@ -6407,15 +6400,15 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2710 "conf_parser.y" { - ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number); + ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number); } break; - case 596: + case 578: /* Line 1792 of yacc.c */ -#line 2733 "conf_parser.y" +#line 2715 "conf_parser.y" { - ConfigChannel.disable_fake_channels = yylval.number; + ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number); } break; @@ -6423,7 +6416,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2738 "conf_parser.y" { - ConfigChannel.restrict_channels = yylval.number; + ConfigChannel.disable_fake_channels = yylval.number; } break; @@ -6431,7 +6424,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2743 "conf_parser.y" { - ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number); + ConfigChannel.restrict_channels = yylval.number; } break; @@ -6439,7 +6432,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2748 "conf_parser.y" { - ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number); + ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number); } break; @@ -6447,7 +6440,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2753 "conf_parser.y" { - ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number); + ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number); } break; @@ -6455,7 +6448,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2758 "conf_parser.y" { - ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number); + ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number); } break; @@ -6463,7 +6456,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2763 "conf_parser.y" { - ConfigChannel.quiet_on_ban = yylval.number; + ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number); } break; @@ -6471,7 +6464,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2768 "conf_parser.y" { - ConfigChannel.max_bans = (yyvsp[(3) - (4)].number); + ConfigChannel.quiet_on_ban = yylval.number; } break; @@ -6479,7 +6472,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2773 "conf_parser.y" { - ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number); + ConfigChannel.max_bans = (yyvsp[(3) - (4)].number); } break; @@ -6487,7 +6480,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2778 "conf_parser.y" { - ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number); + ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number); } break; @@ -6495,7 +6488,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2783 "conf_parser.y" { - ConfigChannel.no_create_on_split = yylval.number; + ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number); } break; @@ -6503,7 +6496,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2788 "conf_parser.y" { - ConfigChannel.no_join_on_split = yylval.number; + ConfigChannel.no_create_on_split = yylval.number; } break; @@ -6511,7 +6504,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2793 "conf_parser.y" { - GlobalSetOptions.joinfloodcount = yylval.number; + ConfigChannel.no_join_on_split = yylval.number; } break; @@ -6519,31 +6512,39 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2798 "conf_parser.y" { + GlobalSetOptions.joinfloodcount = yylval.number; +} + break; + + case 610: +/* Line 1792 of yacc.c */ +#line 2803 "conf_parser.y" + { GlobalSetOptions.joinfloodtime = yylval.number; } break; - case 620: + case 621: /* Line 1792 of yacc.c */ -#line 2816 "conf_parser.y" +#line 2821 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.flatten_links = yylval.number; } break; - case 621: + case 622: /* Line 1792 of yacc.c */ -#line 2822 "conf_parser.y" +#line 2827 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_servers = yylval.number; } break; - case 622: + case 623: /* Line 1792 of yacc.c */ -#line 2828 "conf_parser.y" +#line 2833 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6553,9 +6554,9 @@ yyreduce: } break; - case 623: + case 624: /* Line 1792 of yacc.c */ -#line 2837 "conf_parser.y" +#line 2842 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6570,18 +6571,18 @@ yyreduce: } break; - case 624: + case 625: /* Line 1792 of yacc.c */ -#line 2851 "conf_parser.y" +#line 2856 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hidden = yylval.number; } break; - case 625: + case 626: /* Line 1792 of yacc.c */ -#line 2857 "conf_parser.y" +#line 2862 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_server_ips = yylval.number; @@ -6590,7 +6591,7 @@ yyreduce: /* Line 1792 of yacc.c */ -#line 6594 "conf_parser.c" +#line 6595 "conf_parser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires |