diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-07-03 13:00:46 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-07-03 13:00:46 +0000 |
| commit | 5eb57c1eee0e392c4bc0d278dd1846ed96f69c61 (patch) | |
| tree | 4155e8d8d722ede09834ecf081a774aad1de0ba7 | |
| parent | 41e19215aeccd1a43b73f42b671e5663556fbe83 (diff) | |
- Added XLINE and RESV logging types
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2337 82007160-df01-0410-b94d-b575c5fd34c7
| -rw-r--r-- | doc/reference.conf | 12 | ||||
| -rw-r--r-- | include/log.h | 2 | ||||
| -rw-r--r-- | modules/m_resv.c | 4 | ||||
| -rw-r--r-- | modules/m_xline.c | 6 | ||||
| -rw-r--r-- | src/conf_parser.c | 2469 | ||||
| -rw-r--r-- | src/conf_parser.y | 8 |
6 files changed, 1267 insertions, 1234 deletions
diff --git a/doc/reference.conf b/doc/reference.conf index a6c111e..7374a29 100644 --- a/doc/reference.conf +++ b/doc/reference.conf @@ -1287,6 +1287,18 @@ log { }; file { + type = xline; + name = "/usr/local/ircd/var/log/xline.log"; + size = 50 megabytes; + }; + + file { + type = resv; + name = "/usr/local/ircd/var/log/resv.log"; + size = 50 megabytes; + }; + + file { type = debug; name = "/usr/local/ircd/var/log/debug.log"; size = 50 megabytes; diff --git a/include/log.h b/include/log.h index d5502a6..3d29bd8 100644 --- a/include/log.h +++ b/include/log.h @@ -33,6 +33,8 @@ enum log_type { LOG_TYPE_KLINE, LOG_TYPE_DLINE, LOG_TYPE_GLINE, + LOG_TYPE_XLINE, + LOG_TYPE_RESV, LOG_TYPE_OPER, LOG_TYPE_USER, LOG_TYPE_DEBUG, diff --git a/modules/m_resv.c b/modules/m_resv.c index 1364947..11eee50 100644 --- a/modules/m_resv.c +++ b/modules/m_resv.c @@ -245,7 +245,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason) tkline_time/60, (MyClient(source_p) ? "local" : "remote"), conf->name, conf->reason); - ilog(LOG_TYPE_IRCD, "%s added temporary %d min. RESV for [%s] [%s]", + ilog(LOG_TYPE_RESV, "%s added temporary %d min. RESV for [%s] [%s]", source_p->name, (int)tkline_time/60, conf->name, conf->reason); conf->until = CurrentTime + tkline_time; @@ -306,7 +306,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason) tkline_time/60, (MyClient(source_p) ? "local" : "remote"), conf->name, conf->reason); - ilog(LOG_TYPE_IRCD, "%s added temporary %d min. RESV for [%s] [%s]", + ilog(LOG_TYPE_RESV, "%s added temporary %d min. RESV for [%s] [%s]", source_p->name, (int)tkline_time/60, conf->name, conf->reason); conf->until = CurrentTime + tkline_time; diff --git a/modules/m_xline.c b/modules/m_xline.c index 1d48860..f8d55b2 100644 --- a/modules/m_xline.c +++ b/modules/m_xline.c @@ -340,7 +340,7 @@ write_xline(struct Client *source_p, char *gecos, char *reason, sendto_one(source_p, ":%s NOTICE %s :Added temporary %d min. X-Line [%s]", MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from), source_p->name, (int)tkline_time/60, conf->name); - ilog(LOG_TYPE_KLINE, "%s added temporary %d min. X-Line for [%s] [%s]", + ilog(LOG_TYPE_XLINE, "%s added temporary %d min. X-Line for [%s] [%s]", source_p->name, (int)tkline_time/60, conf->name, conf->reason); conf->until = CurrentTime + tkline_time; @@ -355,7 +355,7 @@ write_xline(struct Client *source_p, char *gecos, char *reason, ":%s NOTICE %s :Added X-Line [%s] [%s]", MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from), source_p->name, conf->name, conf->reason); - ilog(LOG_TYPE_IRCD, "%s added X-Line for [%s] [%s]", + ilog(LOG_TYPE_XLINE, "%s added X-Line for [%s] [%s]", get_oper_name(source_p), conf->name, conf->reason); } @@ -373,7 +373,7 @@ remove_xline(struct Client *source_p, char *gecos) sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s has removed the X-Line for: [%s]", get_oper_name(source_p), gecos); - ilog(LOG_TYPE_KLINE, "%s removed X-Line for [%s]", + ilog(LOG_TYPE_XLINE, "%s removed X-Line for [%s]", source_p->name, gecos); } else diff --git a/src/conf_parser.c b/src/conf_parser.c index 1ecd9fa..df02047 100644 --- a/src/conf_parser.c +++ b/src/conf_parser.c @@ -937,16 +937,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1274 +#define YYLAST 1236 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 233 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 291 /* YYNRULES -- Number of rules. */ -#define YYNRULES 654 +#define YYNRULES 656 /* YYNRULES -- Number of states. */ -#define YYNSTATES 1285 +#define YYNSTATES 1287 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -1028,58 +1028,58 @@ static const yytype_uint16 yyprhs[] = 334, 336, 338, 340, 343, 348, 353, 359, 362, 364, 366, 368, 371, 376, 377, 384, 387, 389, 391, 393, 395, 398, 403, 408, 413, 414, 420, 424, 426, 428, - 430, 432, 434, 436, 438, 440, 441, 448, 451, 453, + 430, 432, 434, 436, 438, 440, 442, 444, 445, 452, 455, 457, 459, 461, 463, 465, 467, 469, 471, 473, - 476, 481, 486, 491, 496, 501, 506, 511, 516, 517, - 523, 527, 529, 531, 533, 535, 537, 539, 541, 543, + 475, 477, 480, 485, 490, 495, 500, 505, 510, 515, + 520, 521, 527, 531, 533, 535, 537, 539, 541, 543, 545, 547, 549, 551, 553, 555, 557, 559, 561, 563, - 565, 567, 569, 571, 572, 578, 582, 584, 588, 590, - 594, 596, 600, 602, 604, 606, 608, 610, 612, 614, + 565, 567, 569, 571, 573, 575, 576, 582, 586, 588, + 592, 594, 598, 600, 604, 606, 608, 610, 612, 614, 616, 618, 620, 622, 624, 626, 628, 630, 632, 634, - 636, 637, 644, 647, 649, 651, 653, 655, 657, 659, + 636, 638, 640, 641, 648, 651, 653, 655, 657, 659, 661, 663, 665, 667, 669, 671, 673, 675, 677, 679, - 681, 684, 689, 694, 699, 704, 709, 714, 719, 724, - 729, 734, 739, 744, 749, 754, 759, 760, 766, 770, - 772, 774, 776, 777, 784, 785, 791, 795, 797, 799, - 801, 803, 806, 808, 810, 812, 814, 816, 819, 820, - 826, 830, 832, 834, 838, 843, 848, 849, 856, 859, - 861, 863, 865, 867, 869, 871, 873, 875, 877, 880, - 885, 890, 895, 900, 901, 907, 911, 913, 915, 917, - 919, 921, 923, 925, 927, 929, 931, 933, 938, 943, - 948, 949, 956, 959, 961, 963, 965, 967, 970, 975, - 980, 985, 991, 994, 996, 998, 1000, 1005, 1006, 1013, - 1016, 1018, 1020, 1022, 1024, 1027, 1032, 1037, 1038, 1044, - 1048, 1050, 1052, 1054, 1056, 1058, 1060, 1062, 1064, 1066, - 1068, 1070, 1071, 1078, 1081, 1083, 1085, 1087, 1090, 1095, - 1096, 1102, 1106, 1108, 1110, 1112, 1114, 1116, 1118, 1120, - 1122, 1124, 1126, 1128, 1129, 1136, 1139, 1141, 1143, 1145, + 681, 683, 685, 688, 693, 698, 703, 708, 713, 718, + 723, 728, 733, 738, 743, 748, 753, 758, 763, 764, + 770, 774, 776, 778, 780, 781, 788, 789, 795, 799, + 801, 803, 805, 807, 810, 812, 814, 816, 818, 820, + 823, 824, 830, 834, 836, 838, 842, 847, 852, 853, + 860, 863, 865, 867, 869, 871, 873, 875, 877, 879, + 881, 884, 889, 894, 899, 904, 905, 911, 915, 917, + 919, 921, 923, 925, 927, 929, 931, 933, 935, 937, + 942, 947, 952, 953, 960, 963, 965, 967, 969, 971, + 974, 979, 984, 989, 995, 998, 1000, 1002, 1004, 1009, + 1010, 1017, 1020, 1022, 1024, 1026, 1028, 1031, 1036, 1041, + 1042, 1048, 1052, 1054, 1056, 1058, 1060, 1062, 1064, 1066, + 1068, 1070, 1072, 1074, 1075, 1082, 1085, 1087, 1089, 1091, + 1094, 1099, 1100, 1106, 1110, 1112, 1114, 1116, 1118, 1120, + 1122, 1124, 1126, 1128, 1130, 1132, 1133, 1140, 1143, 1145, 1147, 1149, 1151, 1153, 1155, 1157, 1159, 1161, 1163, 1165, - 1167, 1169, 1172, 1177, 1182, 1187, 1192, 1197, 1202, 1207, - 1212, 1217, 1218, 1224, 1228, 1230, 1232, 1234, 1239, 1244, - 1249, 1254, 1259, 1260, 1267, 1270, 1272, 1274, 1276, 1278, - 1283, 1288, 1289, 1296, 1299, 1301, 1303, 1305, 1307, 1312, - 1317, 1323, 1326, 1328, 1330, 1332, 1337, 1338, 1345, 1348, - 1350, 1352, 1354, 1356, 1361, 1366, 1372, 1375, 1377, 1379, + 1167, 1169, 1171, 1173, 1176, 1181, 1186, 1191, 1196, 1201, + 1206, 1211, 1216, 1221, 1222, 1228, 1232, 1234, 1236, 1238, + 1243, 1248, 1253, 1258, 1263, 1264, 1271, 1274, 1276, 1278, + 1280, 1282, 1287, 1292, 1293, 1300, 1303, 1305, 1307, 1309, + 1311, 1316, 1321, 1327, 1330, 1332, 1334, 1336, 1341, 1342, + 1349, 1352, 1354, 1356, 1358, 1360, 1365, 1370, 1376, 1379, 1381, 1383, 1385, 1387, 1389, 1391, 1393, 1395, 1397, 1399, 1401, 1403, 1405, 1407, 1409, 1411, 1413, 1415, 1417, 1419, 1421, 1423, 1425, 1427, 1429, 1431, 1433, 1435, 1437, 1439, 1441, 1443, 1445, 1447, 1449, 1451, 1453, 1455, 1457, 1459, - 1461, 1463, 1465, 1467, 1469, 1471, 1473, 1475, 1477, 1482, - 1487, 1492, 1497, 1502, 1507, 1512, 1517, 1522, 1527, 1532, - 1537, 1542, 1547, 1552, 1557, 1562, 1567, 1572, 1577, 1582, - 1587, 1592, 1597, 1602, 1607, 1612, 1617, 1622, 1627, 1632, - 1637, 1642, 1647, 1652, 1657, 1662, 1667, 1672, 1677, 1682, - 1687, 1692, 1697, 1702, 1707, 1708, 1714, 1718, 1720, 1722, + 1461, 1463, 1465, 1467, 1469, 1471, 1473, 1475, 1477, 1479, + 1481, 1486, 1491, 1496, 1501, 1506, 1511, 1516, 1521, 1526, + 1531, 1536, 1541, 1546, 1551, 1556, 1561, 1566, 1571, 1576, + 1581, 1586, 1591, 1596, 1601, 1606, 1611, 1616, 1621, 1626, + 1631, 1636, 1641, 1646, 1651, 1656, 1661, 1666, 1671, 1676, + 1681, 1686, 1691, 1696, 1701, 1706, 1711, 1712, 1718, 1722, 1724, 1726, 1728, 1730, 1732, 1734, 1736, 1738, 1740, 1742, 1744, 1746, 1748, 1750, 1752, 1754, 1756, 1758, 1760, 1762, - 1763, 1769, 1773, 1775, 1777, 1779, 1781, 1783, 1785, 1787, + 1764, 1766, 1767, 1773, 1777, 1779, 1781, 1783, 1785, 1787, 1789, 1791, 1793, 1795, 1797, 1799, 1801, 1803, 1805, 1807, - 1809, 1811, 1813, 1815, 1817, 1822, 1827, 1832, 1838, 1841, - 1843, 1845, 1847, 1849, 1851, 1853, 1855, 1857, 1859, 1861, - 1863, 1865, 1867, 1869, 1874, 1879, 1884, 1889, 1894, 1899, - 1904, 1909, 1914, 1919, 1924, 1929, 1935, 1938, 1940, 1942, - 1944, 1946, 1948, 1950, 1952, 1954, 1956, 1958, 1963, 1968, - 1973, 1978, 1983, 1988, 1993 + 1809, 1811, 1813, 1815, 1817, 1819, 1821, 1826, 1831, 1836, + 1842, 1845, 1847, 1849, 1851, 1853, 1855, 1857, 1859, 1861, + 1863, 1865, 1867, 1869, 1871, 1873, 1878, 1883, 1888, 1893, + 1898, 1903, 1908, 1913, 1918, 1923, 1928, 1933, 1939, 1942, + 1944, 1946, 1948, 1950, 1952, 1954, 1956, 1958, 1960, 1962, + 1967, 1972, 1977, 1982, 1987, 1992, 1997 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -1128,163 +1128,164 @@ static const yytype_int16 yyrhs[] = 123, 227, -1, 191, 230, 239, 227, -1, 191, 230, 204, 227, -1, -1, 218, 292, 230, 293, 227, -1, 293, 231, 294, -1, 294, -1, 222, -1, 114, -1, - 40, -1, 167, -1, 69, -1, 67, -1, 166, -1, - -1, 114, 296, 229, 297, 228, 227, -1, 297, 298, - -1, 298, -1, 299, -1, 300, -1, 301, -1, 307, - -1, 306, -1, 302, -1, 303, -1, 304, -1, 305, - -1, 311, -1, 1, 227, -1, 98, 230, 123, 227, - -1, 222, 230, 123, 227, -1, 118, 230, 123, 227, - -1, 33, 230, 210, 227, -1, 134, 230, 123, 227, - -1, 151, 230, 123, 227, -1, 152, 230, 210, 227, - -1, 17, 230, 123, 227, -1, -1, 201, 308, 230, - 309, 227, -1, 309, 231, 310, -1, 310, -1, 161, - -1, 163, -1, 165, -1, 166, -1, 171, -1, 49, - -1, 192, -1, 179, -1, 183, -1, 202, -1, 194, + 40, -1, 226, -1, 131, -1, 167, -1, 69, -1, + 67, -1, 166, -1, -1, 114, 296, 229, 297, 228, + 227, -1, 297, 298, -1, 298, -1, 299, -1, 300, + -1, 301, -1, 307, -1, 306, -1, 302, -1, 303, + -1, 304, -1, 305, -1, 311, -1, 1, 227, -1, + 98, 230, 123, 227, -1, 222, 230, 123, 227, -1, + 118, 230, 123, 227, -1, 33, 230, 210, 227, -1, + 134, 230, 123, 227, -1, 151, 230, 123, 227, -1, + 152, 230, 210, 227, -1, 17, 230, 123, 227, -1, + -1, 201, 308, 230, 309, 227, -1, 309, 231, 310, + -1, 310, -1, 161, -1, 163, -1, 165, -1, 166, + -1, 171, -1, 49, -1, 192, -1, 179, -1, 183, + -1, 202, -1, 194, -1, 168, -1, 181, -1, 188, + -1, 173, -1, 207, -1, 193, -1, 162, -1, 176, + -1, 180, -1, 169, -1, -1, 63, 312, 230, 313, + 227, -1, 313, 231, 314, -1, 314, -1, 67, 232, + 129, -1, 67, -1, 18, 232, 129, -1, 18, -1, + 149, 232, 129, -1, 149, -1, 69, -1, 219, -1, + 167, -1, 203, -1, 226, -1, 40, -1, 26, -1, + 184, -1, 128, -1, 4, -1, 181, -1, 172, -1, + 208, -1, 176, -1, 130, -1, 189, -1, 95, -1, + -1, 17, 316, 229, 317, 228, 227, -1, 317, 318, + -1, 318, -1, 319, -1, 329, -1, 330, -1, 320, + -1, 331, -1, 321, -1, 322, -1, 323, -1, 324, + -1, 325, -1, 326, -1, 327, -1, 328, -1, 332, + -1, 333, -1, 334, -1, 1, 227, -1, 98, 230, + 123, 227, -1, 121, 230, 237, 227, -1, 110, 230, + 108, 227, -1, 19, 230, 237, 227, -1, 88, 230, + 108, 227, -1, 81, 230, 108, 227, -1, 84, 230, + 108, 227, -1, 82, 230, 108, 227, -1, 143, 230, + 239, 227, -1, 182, 230, 239, 227, -1, 15, 230, + 108, 227, -1, 16, 230, 108, 227, -1, 109, 230, + 108, 227, -1, 92, 230, 237, 227, -1, 83, 230, + 237, 227, -1, -1, 63, 335, 230, 336, 227, -1, + 336, 231, 337, -1, 337, -1, 124, -1, 51, -1, + -1, 75, 339, 229, 344, 228, 227, -1, -1, 63, + 341, 230, 342, 227, -1, 342, 231, 343, -1, 343, + -1, 195, -1, 49, -1, 185, -1, 344, 345, -1, + 345, -1, 346, -1, 340, -1, 350, -1, 351, -1, + 1, 227, -1, -1, 122, 230, 348, 347, 227, -1, + 348, 231, 349, -1, 349, -1, 108, -1, 108, 217, + 108, -1, 61, 230, 123, 227, -1, 56, 230, 123, + 227, -1, -1, 62, 353, 229, 354, 228, 227, -1, + 354, 355, -1, 355, -1, 356, -1, 357, -1, 358, + -1, 360, -1, 364, -1, 365, -1, 366, -1, 359, + -1, 1, 227, -1, 222, 230, 123, 227, -1, 118, + 230, 123, 227, -1, 17, 230, 123, 227, -1, 33, + 230, 210, 227, -1, -1, 63, 361, 230, 362, 227, + -1, 362, 231, 363, -1, 363, -1, 148, -1, 34, + -1, 70, -1, 99, -1, 13, -1, 107, -1, 43, + -1, 132, -1, 209, -1, 100, -1, 147, 230, 123, + 227, -1, 127, 230, 123, 227, -1, 126, 230, 108, + 227, -1, -1, 131, 368, 229, 369, 228, 227, -1, + 369, 370, -1, 370, -1, 371, -1, 372, -1, 373, + -1, 1, 227, -1, 76, 230, 123, 227, -1, 125, + 230, 123, 227, -1, 35, 230, 123, 227, -1, 186, + 229, 375, 228, 227, -1, 375, 376, -1, 376, -1, + 377, -1, 1, -1, 98, 230, 123, 227, -1, -1, + 190, 379, 229, 380, 228, 227, -1, 380, 381, -1, + 381, -1, 382, -1, 383, -1, 384, -1, 1, 227, + -1, 98, 230, 123, 227, -1, 222, 230, 123, 227, + -1, -1, 218, 385, 230, 386, 227, -1, 386, 231, + 387, -1, 387, -1, 69, -1, 219, -1, 167, -1, + 203, -1, 226, -1, 206, -1, 131, -1, 205, -1, + 176, -1, 160, -1, -1, 164, 389, 229, 390, 228, + 227, -1, 390, 391, -1, 391, -1, 392, -1, 393, + -1, 1, 227, -1, 98, 230, 123, 227, -1, -1, + 218, 394, 230, 395, 227, -1, 395, 231, 396, -1, + 396, -1, 69, -1, 219, -1, 167, -1, 203, -1, + 226, -1, 206, -1, 131, -1, 205, -1, 176, -1, + 160, -1, -1, 18, 398, 229, 399, 228, 227, -1, + 399, 400, -1, 400, -1, 401, -1, 402, -1, 403, + -1, 404, -1, 405, -1, 406, -1, 408, -1, 407, + -1, 417, -1, 409, -1, 414, -1, 415, -1, 416, + -1, 413, -1, 1, 227, -1, 98, 230, 123, 227, + -1, 56, 230, 123, 227, -1, 223, 230, 123, 227, + -1, 142, 230, 123, 227, -1, 3, 230, 123, 227, + -1, 151, 230, 123, 227, -1, 122, 230, 108, 227, + -1, 5, 230, 174, 227, -1, 5, 230, 175, 227, + -1, -1, 63, 410, 230, 411, 227, -1, 411, 231, + 412, -1, 412, -1, 8, -1, 195, -1, 33, 230, + 210, 227, -1, 58, 230, 123, 227, -1, 73, 230, + 123, 227, -1, 17, 230, 123, 227, -1, 196, 230, + 123, 227, -1, -1, 67, 419, 229, 420, 228, 227, + -1, 420, 421, -1, 421, -1, 422, -1, 423, -1, + 1, -1, 222, 230, 123, 227, -1, 125, 230, 123, + 227, -1, -1, 24, 425, 229, 426, 228, 227, -1, + 426, 427, -1, 427, -1, 428, -1, 429, -1, 1, + -1, 61, 230, 123, 227, -1, 125, 230, 123, 227, + -1, 35, 229, 431, 228, 227, -1, 431, 432, -1, + 432, -1, 433, -1, 1, -1, 61, 230, 123, 227, + -1, -1, 38, 435, 229, 436, 228, 227, -1, 436, + 437, -1, 437, -1, 438, -1, 439, -1, 1, -1, + 98, 230, 123, 227, -1, 125, 230, 123, 227, -1, + 39, 229, 441, 228, 227, -1, 441, 442, -1, 442, + -1, 452, -1, 453, -1, 454, -1, 455, -1, 456, + -1, 457, -1, 458, -1, 459, -1, 460, -1, 461, + -1, 451, -1, 463, -1, 464, -1, 479, -1, 466, + -1, 469, -1, 471, -1, 470, -1, 474, -1, 467, + -1, 468, -1, 475, -1, 476, -1, 477, -1, 478, + -1, 491, -1, 480, -1, 481, -1, 482, -1, 487, + -1, 472, -1, 473, -1, 497, -1, 495, -1, 496, + -1, 486, -1, 462, -1, 484, -1, 485, -1, 450, + -1, 445, -1, 446, -1, 447, -1, 448, -1, 449, + -1, 465, -1, 443, -1, 483, -1, 444, -1, 1, + -1, 91, 230, 108, 227, -1, 20, 230, 210, 227, + -1, 42, 230, 210, 227, -1, 41, 230, 237, 227, + -1, 46, 230, 237, 227, -1, 44, 230, 108, 227, + -1, 45, 230, 108, 227, -1, 212, 230, 210, 227, + -1, 68, 230, 237, 227, -1, 55, 230, 210, 227, + -1, 59, 230, 210, 227, -1, 36, 230, 210, 227, + -1, 6, 230, 210, 227, -1, 87, 230, 237, 227, + -1, 85, 230, 108, 227, -1, 77, 230, 108, 227, + -1, 7, 230, 237, 227, -1, 216, 230, 237, 227, + -1, 215, 230, 237, 227, -1, 48, 230, 108, 227, + -1, 60, 230, 210, 227, -1, 225, 230, 210, 227, + -1, 154, 230, 210, 227, -1, 157, 230, 210, 227, + -1, 158, 230, 210, 227, -1, 159, 230, 210, 227, + -1, 156, 230, 210, 227, -1, 156, 230, 213, 227, + -1, 155, 230, 210, 227, -1, 155, 230, 213, 227, + -1, 116, 230, 237, 227, -1, 12, 230, 237, 227, + -1, 115, 230, 210, 227, -1, 117, 230, 237, 227, + -1, 146, 230, 210, 227, -1, 106, 230, 210, 227, + -1, 214, 230, 210, 227, -1, 112, 230, 210, 227, + -1, 30, 230, 108, 227, -1, 89, 230, 108, 227, + -1, 220, 230, 210, 227, -1, 31, 230, 123, 227, + -1, 187, 230, 123, 227, -1, 120, 230, 210, 227, + -1, 27, 230, 210, 227, -1, 211, 230, 237, 227, + -1, -1, 113, 488, 230, 489, 227, -1, 489, 231, + 490, -1, 490, -1, 161, -1, 163, -1, 165, -1, + 166, -1, 171, -1, 49, -1, 192, -1, 179, -1, + 183, -1, 202, -1, 194, -1, 168, -1, 181, -1, + 188, -1, 173, -1, 207, -1, 193, -1, 162, -1, + 176, -1, 180, -1, 169, -1, -1, 111, 492, 230, + 493, 227, -1, 493, 231, 494, -1, 494, -1, 161, + -1, 163, -1, 165, -1, 166, -1, 171, -1, 192, + -1, 49, -1, 179, -1, 183, -1, 202, -1, 194, -1, 168, -1, 181, -1, 188, -1, 173, -1, 207, -1, 193, -1, 162, -1, 176, -1, 180, -1, 169, - -1, -1, 63, 312, 230, 313, 227, -1, 313, 231, - 314, -1, 314, -1, 67, 232, 129, -1, 67, -1, - 18, 232, 129, -1, 18, -1, 149, 232, 129, -1, - 149, -1, 69, -1, 219, -1, 167, -1, 203, -1, - 226, -1, 40, -1, 26, -1, 184, -1, 128, -1, - 4, -1, 181, -1, 172, -1, 208, -1, 176, -1, - 130, -1, 189, -1, 95, -1, -1, 17, 316, 229, - 317, 228, 227, -1, 317, 318, -1, 318, -1, 319, - -1, 329, -1, 330, -1, 320, -1, 331, -1, 321, - -1, 322, -1, 323, -1, 324, -1, 325, -1, 326, - -1, 327, -1, 328, -1, 332, -1, 333, -1, 334, - -1, 1, 227, -1, 98, 230, 123, 227, -1, 121, - 230, 237, 227, -1, 110, 230, 108, 227, -1, 19, - 230, 237, 227, -1, 88, 230, 108, 227, -1, 81, - 230, 108, 227, -1, 84, 230, 108, 227, -1, 82, - 230, 108, 227, -1, 143, 230, 239, 227, -1, 182, - 230, 239, 227, -1, 15, 230, 108, 227, -1, 16, - 230, 108, 227, -1, 109, 230, 108, 227, -1, 92, - 230, 237, 227, -1, 83, 230, 237, 227, -1, -1, - 63, 335, 230, 336, 227, -1, 336, 231, 337, -1, - 337, -1, 124, -1, 51, -1, -1, 75, 339, 229, - 344, 228, 227, -1, -1, 63, 341, 230, 342, 227, - -1, 342, 231, 343, -1, 343, -1, 195, -1, 49, - -1, 185, -1, 344, 345, -1, 345, -1, 346, -1, - 340, -1, 350, -1, 351, -1, 1, 227, -1, -1, - 122, 230, 348, 347, 227, -1, 348, 231, 349, -1, - 349, -1, 108, -1, 108, 217, 108, -1, 61, 230, - 123, 227, -1, 56, 230, 123, 227, -1, -1, 62, - 353, 229, 354, 228, 227, -1, 354, 355, -1, 355, - -1, 356, -1, 357, -1, 358, -1, 360, -1, 364, - -1, 365, -1, 366, -1, 359, -1, 1, 227, -1, - 222, 230, 123, 227, -1, 118, 230, 123, 227, -1, - 17, 230, 123, 227, -1, 33, 230, 210, 227, -1, - -1, 63, 361, 230, 362, 227, -1, 362, 231, 363, - -1, 363, -1, 148, -1, 34, -1, 70, -1, 99, - -1, 13, -1, 107, -1, 43, -1, 132, -1, 209, - -1, 100, -1, 147, 230, 123, 227, -1, 127, 230, - 123, 227, -1, 126, 230, 108, 227, -1, -1, 131, - 368, 229, 369, 228, 227, -1, 369, 370, -1, 370, - -1, 371, -1, 372, -1, 373, -1, 1, 227, -1, - 76, 230, 123, 227, -1, 125, 230, 123, 227, -1, - 35, 230, 123, 227, -1, 186, 229, 375, 228, 227, - -1, 375, 376, -1, 376, -1, 377, -1, 1, -1, - 98, 230, 123, 227, -1, -1, 190, 379, 229, 380, - 228, 227, -1, 380, 381, -1, 381, -1, 382, -1, - 383, -1, 384, -1, 1, 227, -1, 98, 230, 123, - 227, -1, 222, 230, 123, 227, -1, -1, 218, 385, - 230, 386, 227, -1, 386, 231, 387, -1, 387, -1, - 69, -1, 219, -1, 167, -1, 203, -1, 226, -1, - 206, -1, 131, -1, 205, -1, 176, -1, 160, -1, - -1, 164, 389, 229, 390, 228, 227, -1, 390, 391, - -1, 391, -1, 392, -1, 393, -1, 1, 227, -1, - 98, 230, 123, 227, -1, -1, 218, 394, 230, 395, - 227, -1, 395, 231, 396, -1, 396, -1, 69, -1, - 219, -1, 167, -1, 203, -1, 226, -1, 206, -1, - 131, -1, 205, -1, 176, -1, 160, -1, -1, 18, - 398, 229, 399, 228, 227, -1, 399, 400, -1, 400, - -1, 401, -1, 402, -1, 403, -1, 404, -1, 405, - -1, 406, -1, 408, -1, 407, -1, 417, -1, 409, - -1, 414, -1, 415, -1, 416, -1, 413, -1, 1, - 227, -1, 98, 230, 123, 227, -1, 56, 230, 123, - 227, -1, 223, 230, 123, 227, -1, 142, 230, 123, - 227, -1, 3, 230, 123, 227, -1, 151, 230, 123, - 227, -1, 122, 230, 108, 227, -1, 5, 230, 174, - 227, -1, 5, 230, 175, 227, -1, -1, 63, 410, - 230, 411, 227, -1, 411, 231, 412, -1, 412, -1, - 8, -1, 195, -1, 33, 230, 210, 227, -1, 58, - 230, 123, 227, -1, 73, 230, 123, 227, -1, 17, - 230, 123, 227, -1, 196, 230, 123, 227, -1, -1, - 67, 419, 229, 420, 228, 227, -1, 420, 421, -1, - 421, -1, 422, -1, 423, -1, 1, -1, 222, 230, - 123, 227, -1, 125, 230, 123, 227, -1, -1, 24, - 425, 229, 426, 228, 227, -1, 426, 427, -1, 427, - -1, 428, -1, 429, -1, 1, -1, 61, 230, 123, - 227, -1, 125, 230, 123, 227, -1, 35, 229, 431, - 228, 227, -1, 431, 432, -1, 432, -1, 433, -1, - 1, -1, 61, 230, 123, 227, -1, -1, 38, 435, - 229, 436, 228, 227, -1, 436, 437, -1, 437, -1, - 438, -1, 439, -1, 1, -1, 98, 230, 123, 227, - -1, 125, 230, 123, 227, -1, 39, 229, 441, 228, - 227, -1, 441, 442, -1, 442, -1, 452, -1, 453, - -1, 454, -1, 455, -1, 456, -1, 457, -1, 458, - -1, 459, -1, 460, -1, 461, -1, 451, -1, 463, - -1, 464, -1, 479, -1, 466, -1, 469, -1, 471, - -1, 470, -1, 474, -1, 467, -1, 468, -1, 475, - -1, 476, -1, 477, -1, 478, -1, 491, -1, 480, - -1, 481, -1, 482, -1, 487, -1, 472, -1, 473, - -1, 497, -1, 495, -1, 496, -1, 486, -1, 462, - -1, 484, -1, 485, -1, 450, -1, 445, -1, 446, - -1, 447, -1, 448, -1, 449, -1, 465, -1, 443, - -1, 483, -1, 444, -1, 1, -1, 91, 230, 108, - 227, -1, 20, 230, 210, 227, -1, 42, 230, 210, - 227, -1, 41, 230, 237, 227, -1, 46, 230, 237, - 227, -1, 44, 230, 108, 227, -1, 45, 230, 108, - 227, -1, 212, 230, 210, 227, -1, 68, 230, 237, - 227, -1, 55, 230, 210, 227, -1, 59, 230, 210, - 227, -1, 36, 230, 210, 227, -1, 6, 230, 210, - 227, -1, 87, 230, 237, 227, -1, 85, 230, 108, - 227, -1, 77, 230, 108, 227, -1, 7, 230, 237, - 227, -1, 216, 230, 237, 227, -1, 215, 230, 237, - 227, -1, 48, 230, 108, 227, -1, 60, 230, 210, - 227, -1, 225, 230, 210, 227, -1, 154, 230, 210, - 227, -1, 157, 230, 210, 227, -1, 158, 230, 210, - 227, -1, 159, 230, 210, 227, -1, 156, 230, 210, - 227, -1, 156, 230, 213, 227, -1, 155, 230, 210, - 227, -1, 155, 230, 213, 227, -1, 116, 230, 237, - 227, -1, 12, 230, 237, 227, -1, 115, 230, 210, - 227, -1, 117, 230, 237, 227, -1, 146, 230, 210, - 227, -1, 106, 230, 210, 227, -1, 214, 230, 210, - 227, -1, 112, 230, 210, 227, -1, 30, 230, 108, - 227, -1, 89, 230, 108, 227, -1, 220, 230, 210, - 227, -1, 31, 230, 123, 227, -1, 187, 230, 123, - 227, -1, 120, 230, 210, 227, -1, 27, 230, 210, - 227, -1, 211, 230, 237, 227, -1, -1, 113, 488, - 230, 489, 227, -1, 489, 231, 490, -1, 490, -1, - 161, -1, 163, -1, 165, -1, 166, -1, 171, -1, - 49, -1, 192, -1, 179, -1, 183, -1, 202, -1, - 194, -1, 168, -1, 181, -1, 188, -1, 173, -1, - 207, -1, 193, -1, 162, -1, 176, -1, 180, -1, - 169, -1, -1, 111, 492, 230, 493, 227, -1, 493, - 231, 494, -1, 494, -1, 161, -1, 163, -1, 165, - -1, 166, -1, 171, -1, 192, -1, 49, -1, 179, - -1, 183, -1, 202, -1, 194, -1, 168, -1, 181, - -1, 188, -1, 173, -1, 207, -1, 193, -1, 162, - -1, 176, -1, 180, -1, 169, -1, 93, 230, 108, - 227, -1, 94, 230, 108, 227, -1, 21, 230, 108, - 227, -1, 14, 229, 499, 228, 227, -1, 499, 500, - -1, 500, -1, 506, -1, 502, -1, 503, -1, 504, - -1, 505, -1, 507, -1, 508, -1, 509, -1, 510, - -1, 511, -1, 512, -1, 501, -1, 1, -1, 28, - 230, 210, 227, -1, 71, 230, 237, 227, -1, 72, - 230, 237, 227, -1, 80, 230, 108, 227, -1, 79, - 230, 108, 227, -1, 78, 230, 108, 227, -1, 23, - 230, 108, 227, -1, 22, 230, 108, 227, -1, 104, - 230, 210, 227, -1, 105, 230, 210, 227, -1, 65, - 230, 108, 227, -1, 66, 230, 237, 227, -1, 144, - 229, 514, 228, 227, -1, 514, 515, -1, 515, -1, - 516, -1, 517, -1, 518, -1, 519, -1, 521, -1, - 522, -1, 520, -1, 523, -1, 1, -1, 37, 230, - 210, 227, -1, 29, 230, 210, 227, -1, 53, 230, - 210, 227, -1, 54, 230, 210, 227, -1, 50, 230, - 123, 227, -1, 74, 230, 237, 227, -1, 49, 230, - 210, 227, -1, 52, 230, 210, 227, -1 + -1, 93, 230, 108, 227, -1, 94, 230, 108, 227, + -1, 21, 230, 108, 227, -1, 14, 229, 499, 228, + 227, -1, 499, 500, -1, 500, -1, 506, -1, 502, + -1, 503, -1, 504, -1, 505, -1, 507, -1, 508, + -1, 509, -1, 510, -1, 511, -1, 512, -1, 501, + -1, 1, -1, 28, 230, 210, 227, -1, 71, 230, + 237, 227, -1, 72, 230, 237, 227, -1, 80, 230, + 108, 227, -1, 79, 230, 108, 227, -1, 78, 230, + 108, 227, -1, 23, 230, 108, 227, -1, 22, 230, + 108, 227, -1, 104, 230, 210, 227, -1, 105, 230, + 210, 227, -1, 65, 230, 108, 227, -1, 66, 230, + 237, 227, -1, 144, 229, 514, 228, 227, -1, 514, + 515, -1, 515, -1, 516, -1, 517, -1, 518, -1, + 519, -1, 521, -1, 522, -1, 520, -1, 523, -1, + 1, -1, 37, 230, 210, 227, -1, 29, 230, 210, + 227, -1, 53, 230, 210, 227, -1, 54, 230, 210, + 227, -1, 50, 230, 123, 227, -1, 74, 230, 237, + 227, -1, 49, 230, 210, 227, -1, 52, 230, 210, + 227, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -1304,58 +1305,58 @@ static const yytype_uint16 yyrline[] = 902, 903, 903, 903, 905, 911, 920, 921, 921, 923, 923, 924, 926, 933, 933, 946, 947, 949, 949, 950, 950, 952, 960, 963, 969, 968, 974, 974, 975, 979, - 983, 987, 991, 995, 999, 1010, 1009, 1089, 1089, 1090, - 1090, 1090, 1091, 1091, 1091, 1092, 1092, 1093, 1094, 1094, - 1096, 1102, 1108, 1114, 1125, 1131, 1137, 1148, 1155, 1154, - 1160, 1160, 1161, 1165, 1169, 1173, 1177, 1181, 1185, 1189, + 983, 987, 991, 995, 999, 1003, 1007, 1018, 1017, 1097, + 1097, 1098, 1098, 1098, 1099, 1099, 1099, 1100, 1100, 1101, + 1102, 1102, 1104, 1110, 1116, 1122, 1133, 1139, 1145, 1156, + 1163, 1162, 1168, 1168, 1169, 1173, 1177, 1181, 1185, 1189, 1193, 1197, 1201, 1205, 1209, 1213, 1217, 1221, 1225, 1229, - 1233, 1237, 1241, 1248, 1247, 1253, 1253, 1254, 1258, 1262, + 1233, 1237, 1241, 1245, 1249, 1256, 1255, 1261, 1261, 1262, 1266, 1270, 1274, 1278, 1282, 1286, 1290, 1294, 1298, 1302, 1306, 1310, 1314, 1318, 1322, 1326, 1330, 1334, 1338, 1342, - 1353, 1352, 1413, 1413, 1414, 1415, 1415, 1416, 1417, 1418, - 1419, 1420, 1421, 1422, 1423, 1424, 1424, 1425, 1426, 1427, - 1428, 1430, 1436, 1442, 1448, 1454, 1460, 1466, 1472, 1478, - 1484, 1491, 1497, 1503, 1509, 1518, 1528, 1527, 1533, 1533, - 1534, 1538, 1549, 1548, 1555, 1554, 1559, 1559, 1560, 1564, - 1568, 1574, 1574, 1575, 1575, 1575, 1575, 1575, 1577, 1577, - 1579, 1579, 1581, 1595, 1615, 1621, 1631, 1630, 1672, 1672, - 1673, 1673, 1673, 1673, 1674, 1674, 1674, 1675, 1675, 1677, - 1683, 1689, 1695, 1707, 1706, 1712, 1712, 1713, 1717, 1721, - 1725, 1729, 1733, 1737, 1741, 1745, 1749, 1755, 1769, 1778, - 1792, 1791, 1806, 1806, 1807, 1807, 1807, 1807, 1809, 1815, - 1821, 1831, 1833, 1833, 1834, 1834, 1836, 1852, 1851, 1876, - 1876, 1877, 1877, 1877, 1877, 1879, 1885, 1905, 1904, 1910, - 1910, 1911, 1915, 1919, 1923, 1927, 1931, 1935, 1939, 1943, - 1947, 1957, 1956, 1977, 1977, 1978, 1978, 1978, 1980, 1987, - 1986, 1992, 1992, 1993, 1997, 2001, 2005, 2009, 2013, 2017, - 2021, 2025, 2029, 2039, 2038, 2109, 2109, 2110, 2110, 2110, - 2111, 2111, 2112, 2113, 2113, 2113, 2114, 2114, 2114, 2115, - 2115, 2116, 2118, 2124, 2130, 2136, 2149, 2162, 2168, 2174, - 2178, 2187, 2186, 2191, 2191, 2192, 2196, 2202, 2213, 2219, - 2225, 2231, 2247, 2246, 2272, 2272, 2273, 2273, 2273, 2275, - 2295, 2305, 2304, 2331, 2331, 2332, 2332, 2332, 2334, 2340, - 2349, 2351, 2351, 2352, 2352, 2354, 2372, 2371, 2394, 2394, - 2395, 2395, 2395, 2397, 2403, 2412, 2415, 2415, 2416, 2416, - 2417, 2417, 2418, 2418, 2419, 2419, 2420, 2420, 2421, 2422, - 2423, 2423, 2424, 2424, 2425, 2425, 2426, 2426, 2427, 2428, - 2428, 2429, 2429, 2430, 2430, 2431, 2431, 2432, 2432, 2433, - 2433, 2434, 2434, 2435, 2435, 2436, 2437, 2438, 2438, 2439, - 2439, 2440, 2441, 2442, 2443, 2443, 2444, 2445, 2448, 2453, - 2459, 2465, 2471, 2477, 2482, 2487, 2492, 2497, 2502, 2507, - 2512, 2517, 2522, 2527, 2532, 2537, 2542, 2548, 2559, 2564, - 2569, 2574, 2579, 2584, 2589, 2592, 2597, 2600, 2605, 2610, - 2615, 2620, 2625, 2630, 2635, 2640, 2645, 2650, 2655, 2660, - 2669, 2678, 2683, 2688, 2694, 2693, 2698, 2698, 2699, 2702, - 2705, 2708, 2711, 2714, 2717, 2720, 2723, 2726, 2729, 2732, - 2735, 2738, 2741, 2744, 2747, 2750, 2753, 2756, 2759, 2765, - 2764, 2769, 2769, 2770, 2773, 2776, 2779, 2782, 2785, 2788, - 2791, 2794, 2797, 2800, 2803, 2806, 2809, 2812, 2815, 2818, - 2821, 2824, 2827, 2830, 2835, 2840, 2845, 2854, 2857, 2857, - 2858, 2859, 2859, 2860, 2860, 2861, 2862, 2863, 2864, 2865, - 2865, 2866, 2866, 2868, 2873, 2878, 2883, 2888, 2893, 2898, - 2903, 2908, 2913, 2918, 2923, 2931, 2934, 2934, 2935, 2935, - 2936, 2937, 2938, 2939, 2939, 2940, 2941, 2943, 2949, 2955, - 2961, 2967, 2976, 2990, 2996 + 1346, 1350, 1361, 1360, 1421, 1421, 1422, 1423, 1423, 1424, + 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1432, 1433, + 1434, 1435, 1436, 1438, 1444, 1450, 1456, 1462, 1468, 1474, + 1480, 1486, 1492, 1499, 1505, 1511, 1517, 1526, 1536, 1535, + 1541, 1541, 1542, 1546, 1557, 1556, 1563, 1562, 1567, 1567, + 1568, 1572, 1576, 1582, 1582, 1583, 1583, 1583, 1583, 1583, + 1585, 1585, 1587, 1587, 1589, 1603, 1623, 1629, 1639, 1638, + 1680, 1680, 1681, 1681, 1681, 1681, 1682, 1682, 1682, 1683, + 1683, 1685, 1691, 1697, 1703, 1715, 1714, 1720, 1720, 1721, + 1725, 1729, 1733, 1737, 1741, 1745, 1749, 1753, 1757, 1763, + 1777, 1786, 1800, 1799, 1814, 1814, 1815, 1815, 1815, 1815, + 1817, 1823, 1829, 1839, 1841, 1841, 1842, 1842, 1844, 1860, + 1859, 1884, 1884, 1885, 1885, 1885, 1885, 1887, 1893, 1913, + 1912, 1918, 1918, 1919, 1923, 1927, 1931, 1935, 1939, 1943, + 1947, 1951, 1955, 1965, 1964, 1985, 1985, 1986, 1986, 1986, + 1988, 1995, 1994, 2000, 2000, 2001, 2005, 2009, 2013, 2017, + 2021, 2025, 2029, 2033, 2037, 2047, 2046, 2117, 2117, 2118, + 2118, 2118, 2119, 2119, 2120, 2121, 2121, 2121, 2122, 2122, + 2122, 2123, 2123, 2124, 2126, 2132, 2138, 2144, 2157, 2170, + 2176, 2182, 2186, 2195, 2194, 2199, 2199, 2200, 2204, 2210, + 2221, 2227, 2233, 2239, 2255, 2254, 2280, 2280, 2281, 2281, + 2281, 2283, 2303, 2313, 2312, 2339, 2339, 2340, 2340, 2340, + 2342, 2348, 2357, 2359, 2359, 2360, 2360, 2362, 2380, 2379, + 2402, 2402, 2403, 2403, 2403, 2405, 2411, 2420, 2423, 2423, + 2424, 2424, 2425, 2425, 2426, 2426, 2427, 2427, 2428, 2428, + 2429, 2430, 2431, 2431, 2432, 2432, 2433, 2433, 2434, 2434, + 2435, 2436, 2436, 2437, 2437, 2438, 2438, 2439, 2439, 2440, + 2440, 2441, 2441, 2442, 2442, 2443, 2443, 2444, 2445, 2446, + 2446, 2447, 2447, 2448, 2449, 2450, 2451, 2451, 2452, 2453, + 2456, 2461, 2467, 2473, 2479, 2485, 2490, 2495, 2500, 2505, + 2510, 2515, 2520, 2525, 2530, 2535, 2540, 2545, 2550, 2556, + 2567, 2572, 2577, 2582, 2587, 2592, 2597, 2600, 2605, 2608, + 2613, 2618, 2623, 2628, 2633, 2638, 2643, 2648, 2653, 2658, + 2663, 2668, 2677, 2686, 2691, 2696, 2702, 2701, 2706, 2706, + 2707, 2710, 2713, 2716, 2719, 2722, 2725, 2728, 2731, 2734, + 2737, 2740, 2743, 2746, 2749, 2752, 2755, 2758, 2761, 2764, + 2767, 2773, 2772, 2777, 2777, 2778, 2781, 2784, 2787, 2790, + 2793, 2796, 2799, 2802, 2805, 2808, 2811, 2814, 2817, 2820, + 2823, 2826, 2829, 2832, 2835, 2838, 2843, 2848, 2853, 2862, + 2865, 2865, 2866, 2867, 2867, 2868, 2868, 2869, 2870, 2871, + 2872, 2873, 2873, 2874, 2874, 2876, 2881, 2886, 2891, 2896, + 2901, 2906, 2911, 2916, 2921, 2926, 2931, 2939, 2942, 2942, + 2943, 2943, 2944, 2945, 2946, 2947, 2947, 2948, 2949, 2951, + 2957, 2963, 2969, 2975, 2984, 2998, 3004 }; #endif @@ -1558,58 +1559,58 @@ static const yytype_uint16 yyr1[] = 277, 278, 278, 278, 279, 280, 281, 282, 282, 283, 283, 283, 284, 286, 285, 287, 287, 288, 288, 288, 288, 289, 290, 290, 292, 291, 293, 293, 294, 294, - 294, 294, 294, 294, 294, 296, 295, 297, 297, 298, - 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, - 299, 300, 301, 302, 303, 304, 305, 306, 308, 307, - 309, 309, 310, 310, 310, 310, 310, 310, 310, 310, + 294, 294, 294, 294, 294, 294, 294, 296, 295, 297, + 297, 298, 298, 298, 298, 298, 298, 298, 298, 298, + 298, 298, 299, 300, 301, 302, 303, 304, 305, 306, + 308, 307, 309, 309, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, 310, - 310, 310, 310, 312, 311, 313, 313, 314, 314, 314, + 310, 310, 310, 310, 310, 312, 311, 313, 313, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, 314, - 316, 315, 317, 317, 318, 318, 318, 318, 318, 318, + 314, 314, 316, 315, 317, 317, 318, 318, 318, 318, 318, 318, 318, 318, 318, 318, 318, 318, 318, 318, - 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, - 328, 329, 330, 331, 332, 333, 335, 334, 336, 336, - 337, 337, 339, 338, 341, 340, 342, 342, 343, 343, - 343, 344, 344, 345, 345, 345, 345, 345, 347, 346, - 348, 348, 349, 349, 350, 351, 353, 352, 354, 354, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 356, - 357, 358, 359, 361, 360, 362, 362, 363, 363, 363, - 363, 363, 363, 363, 363, 363, 363, 364, 365, 366, - 368, 367, 369, 369, 370, 370, 370, 370, 371, 372, - 373, 374, 375, 375, 376, 376, 377, 379, 378, 380, - 380, 381, 381, 381, 381, 382, 383, 385, 384, 386, - 386, 387, 387, 387, 387, 387, 387, 387, 387, 387, - 387, 389, 388, 390, 390, 391, 391, 391, 392, 394, - 393, 395, 395, 396, 396, 396, 396, 396, 396, 396, - 396, 396, 396, 398, 397, 399, 399, 400, 400, 400, + 318, 318, 318, 319, 320, 321, 322, 323, 324, 325, + 326, 327, 328, 329, 330, 331, 332, 333, 335, 334, + 336, 336, 337, 337, 339, 338, 341, 340, 342, 342, + 343, 343, 343, 344, 344, 345, 345, 345, 345, 345, + 347, 346, 348, 348, 349, 349, 350, 351, 353, 352, + 354, 354, 355, 355, 355, 355, 355, 355, 355, 355, + 355, 356, 357, 358, 359, 361, 360, 362, 362, 363, + 363, 363, 363, 363, 363, 363, 363, 363, 363, 364, + 365, 366, 368, 367, 369, 369, 370, 370, 370, 370, + 371, 372, 373, 374, 375, 375, 376, 376, 377, 379, + 378, 380, 380, 381, 381, 381, 381, 382, 383, 385, + 384, 386, 386, 387, 387, 387, 387, 387, 387, 387, + 387, 387, 387, 389, 388, 390, 390, 391, 391, 391, + 392, 394, 393, 395, 395, 396, 396, 396, 396, 396, + 396, 396, 396, 396, 396, 398, 397, 399, 399, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, - 400, 400, 401, 402, 403, 404, 405, 406, 407, 408, - 408, 410, 409, 411, 411, 412, 412, 413, 414, 415, - 416, 417, 419, 418, 420, 420, 421, 421, 421, 422, - 423, 425, 424, 426, 426, 427, 427, 427, 428, 429, - 430, 431, 431, 432, 432, 433, 435, 434, 436, 436, - 437, 437, 437, 438, 439, 440, 441, 441, 442, 442, + 400, 400, 400, 400, 401, 402, 403, 404, 405, 406, + 407, 408, 408, 410, 409, 411, 411, 412, 412, 413, + 414, 415, 416, 417, 419, 418, 420, 420, 421, 421, + 421, 422, 423, 425, 424, 426, 426, 427, 427, 427, + 428, 429, 430, 431, 431, 432, 432, 433, 435, 434, + 436, 436, 437, 437, 437, 438, 439, 440, 441, 441, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 443, 444, - 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, - 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, - 465, 466, 467, 468, 469, 469, 470, 470, 471, 472, - 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, - 483, 484, 485, 486, 488, 487, 489, 489, 490, 490, + 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, + 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, + 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, + 463, 464, 465, 466, 467, 468, 469, 469, 470, 470, + 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, + 481, 482, 483, 484, 485, 486, 488, 487, 489, 489, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, - 490, 490, 490, 490, 490, 490, 490, 490, 490, 492, - 491, 493, 493, 494, 494, 494, 494, 494, 494, 494, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 490, 492, 491, 493, 493, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, 494, - 494, 494, 494, 494, 495, 496, 497, 498, 499, 499, - 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, - 500, 500, 500, 501, 502, 503, 504, 505, 506, 507, - 508, 509, 510, 511, 512, 513, 514, 514, 515, 515, - 515, 515, 515, 515, 515, 515, 515, 516, 517, 518, - 519, 520, 521, 522, 523 + 494, 494, 494, 494, 494, 494, 495, 496, 497, 498, + 499, 499, 500, 500, 500, 500, 500, 500, 500, 500, + 500, 500, 500, 500, 500, 501, 502, 503, 504, 505, + 506, 507, 508, 509, 510, 511, 512, 513, 514, 514, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 516, + 517, 518, 519, 520, 521, 522, 523 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1629,58 +1630,58 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 2, 4, 4, 5, 2, 1, 1, 1, 2, 4, 0, 6, 2, 1, 1, 1, 1, 2, 4, 4, 4, 0, 5, 3, 1, 1, 1, - 1, 1, 1, 1, 1, 0, 6, 2, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 4, 4, 4, 4, 4, 4, 4, 4, 0, 5, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0, 5, 3, 1, 3, 1, 3, - 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 4, 4, 4, 4, 4, 4, 4, 4, + 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 6, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 5, 3, 1, 3, + 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 0, 5, 3, 1, - 1, 1, 0, 6, 0, 5, 3, 1, 1, 1, - 1, 2, 1, 1, 1, 1, 1, 2, 0, 5, - 3, 1, 1, 3, 4, 4, 0, 6, 2, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, - 4, 4, 4, 0, 5, 3, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, - 0, 6, 2, 1, 1, 1, 1, 2, 4, 4, - 4, 5, 2, 1, 1, 1, 4, 0, 6, 2, - 1, 1, 1, 1, 2, 4, 4, 0, 5, 3, + 1, 1, 0, 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 6, 2, 1, 1, 1, 2, 4, 0, + 1, 1, 2, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 0, 5, + 3, 1, 1, 1, 0, 6, 0, 5, 3, 1, + 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, + 0, 5, 3, 1, 1, 3, 4, 4, 0, 6, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 4, 4, 4, 4, 0, 5, 3, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, + 4, 4, 0, 6, 2, 1, 1, 1, 1, 2, + 4, 4, 4, 5, 2, 1, 1, 1, 4, 0, + 6, 2, 1, 1, 1, 1, 2, 4, 4, 0, 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0, 6, 2, 1, 1, 1, 1, + 1, 1, 1, 0, 6, 2, 1, 1, 1, 2, + 4, 0, 5, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 6, 2, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 0, 5, 3, 1, 1, 1, 4, + 4, 4, 4, 4, 0, 6, 2, 1, 1, 1, + 1, 4, 4, 0, 6, 2, 1, 1, 1, 1, + 4, 4, 5, 2, 1, 1, 1, 4, 0, 6, + 2, 1, 1, 1, 1, 4, 4, 5, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 0, 5, 3, 1, 1, 1, 4, 4, 4, - 4, 4, 0, 6, 2, 1, 1, 1, 1, 4, - 4, 0, 6, 2, 1, 1, 1, 1, 4, 4, - 5, 2, 1, 1, 1, 4, 0, 6, 2, 1, - 1, 1, 1, 4, 4, 5, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 0, 5, 3, 1, 1, 1, + 4, 4, 4, 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, 0, - 5, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 4, 4, 4, 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, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 5, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, - 4, 4, 4, 4, 4 + 1, 1, 1, 1, 1, 1, 4, 4, 4, 5, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 5, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, + 4, 4, 4, 4, 4, 4, 4 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -1688,135 +1689,135 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 0, 0, 0, 220, 383, 431, 0, - 446, 0, 286, 422, 262, 0, 107, 145, 320, 0, - 0, 361, 0, 0, 337, 3, 23, 11, 4, 24, + 2, 0, 1, 0, 0, 0, 222, 385, 433, 0, + 448, 0, 288, 424, 264, 0, 107, 147, 322, 0, + 0, 363, 0, 0, 339, 3, 23, 11, 4, 24, 5, 6, 8, 9, 10, 13, 14, 15, 16, 17, 18, 19, 20, 22, 21, 7, 12, 25, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 99, 100, 102, 101, 622, + 0, 0, 0, 0, 0, 99, 100, 102, 101, 624, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 609, 621, 611, 612, 613, 614, 610, - 615, 616, 617, 618, 619, 620, 0, 0, 0, 444, - 0, 0, 442, 443, 0, 507, 0, 0, 0, 0, + 0, 0, 0, 611, 623, 613, 614, 615, 616, 612, + 617, 618, 619, 620, 621, 622, 0, 0, 0, 446, + 0, 0, 444, 445, 0, 509, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 579, 0, 554, 0, 0, 0, 0, + 0, 0, 0, 581, 0, 556, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 457, 504, 506, 498, - 499, 500, 501, 502, 497, 468, 458, 459, 460, 461, - 462, 463, 464, 465, 466, 467, 494, 469, 470, 503, - 472, 477, 478, 473, 475, 474, 488, 489, 476, 479, - 480, 481, 482, 471, 484, 485, 486, 505, 495, 496, - 493, 487, 483, 491, 492, 490, 0, 0, 0, 0, - 0, 0, 0, 45, 46, 47, 0, 0, 0, 646, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 637, - 638, 639, 640, 641, 644, 642, 643, 645, 0, 0, + 0, 0, 0, 0, 0, 0, 459, 506, 508, 500, + 501, 502, 503, 504, 499, 470, 460, 461, 462, 463, + 464, 465, 466, 467, 468, 469, 496, 471, 472, 505, + 474, 479, 480, 475, 477, 476, 490, 491, 478, 481, + 482, 483, 484, 473, 486, 487, 488, 507, 497, 498, + 495, 489, 485, 493, 494, 492, 0, 0, 0, 0, + 0, 0, 0, 45, 46, 47, 0, 0, 0, 648, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 639, + 640, 641, 642, 643, 646, 644, 645, 647, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 68, 69, 67, 64, 63, 70, 54, 66, 57, 58, 59, 55, 65, 60, 61, 62, 56, 0, 0, 0, 0, 118, - 119, 120, 0, 335, 0, 0, 333, 334, 0, 103, + 119, 120, 0, 337, 0, 0, 335, 336, 0, 103, 0, 0, 0, 0, 98, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 608, 0, - 0, 0, 0, 256, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 223, 224, 227, - 229, 230, 231, 232, 233, 234, 235, 236, 225, 226, - 228, 237, 238, 239, 0, 0, 0, 0, 0, 0, - 0, 411, 0, 0, 0, 0, 0, 0, 0, 0, - 386, 387, 388, 389, 390, 391, 392, 394, 393, 396, - 400, 397, 398, 399, 395, 437, 0, 0, 0, 434, - 435, 436, 0, 0, 441, 452, 0, 0, 0, 449, - 450, 451, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 610, 0, + 0, 0, 0, 258, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 225, 226, 229, + 231, 232, 233, 234, 235, 236, 237, 238, 227, 228, + 230, 239, 240, 241, 0, 0, 0, 0, 0, 0, + 0, 413, 0, 0, 0, 0, 0, 0, 0, 0, + 388, 389, 390, 391, 392, 393, 394, 396, 395, 398, + 402, 399, 400, 401, 397, 439, 0, 0, 0, 436, + 437, 438, 0, 0, 443, 454, 0, 0, 0, 451, + 452, 453, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 456, 0, 0, 0, 303, 0, 0, 0, - 0, 0, 0, 289, 290, 291, 292, 297, 293, 294, - 295, 296, 428, 0, 0, 0, 425, 426, 427, 0, - 0, 0, 264, 0, 274, 0, 272, 273, 275, 276, + 0, 0, 458, 0, 0, 0, 305, 0, 0, 0, + 0, 0, 0, 291, 292, 293, 294, 299, 295, 296, + 297, 298, 430, 0, 0, 0, 427, 428, 429, 0, + 0, 0, 266, 0, 276, 0, 274, 275, 277, 278, 48, 0, 0, 0, 44, 0, 0, 0, 0, 110, - 111, 112, 0, 0, 0, 193, 0, 0, 0, 0, - 0, 168, 0, 0, 148, 149, 150, 151, 154, 155, - 156, 157, 153, 152, 158, 0, 0, 0, 0, 0, - 323, 324, 325, 326, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 636, 71, 0, 0, 0, 0, 0, + 111, 112, 0, 0, 0, 195, 0, 0, 0, 0, + 0, 170, 0, 0, 150, 151, 152, 153, 156, 157, + 158, 159, 155, 154, 160, 0, 0, 0, 0, 0, + 325, 326, 327, 328, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 638, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 52, 0, 0, 369, 0, 364, 365, - 366, 121, 0, 0, 117, 0, 0, 0, 332, 0, - 0, 347, 0, 0, 340, 341, 342, 343, 0, 0, + 0, 0, 0, 52, 0, 0, 371, 0, 366, 367, + 368, 121, 0, 0, 117, 0, 0, 0, 334, 0, + 0, 349, 0, 0, 342, 343, 344, 345, 0, 0, 0, 97, 0, 0, 0, 0, 27, 0, 0, 0, - 0, 0, 0, 0, 0, 607, 240, 0, 0, 0, + 0, 0, 0, 0, 0, 609, 242, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 222, 401, 0, 0, 0, 0, + 0, 0, 0, 0, 224, 403, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 385, 0, 0, 0, 433, 0, 440, 0, 0, - 0, 448, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 387, 0, 0, 0, 435, 0, 442, 0, 0, + 0, 450, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 455, 298, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 288, 0, 0, 0, 424, 277, - 0, 0, 0, 0, 0, 271, 0, 0, 43, 113, - 0, 0, 0, 109, 159, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 147, 327, 0, 0, - 0, 0, 322, 0, 0, 0, 0, 0, 0, 0, - 0, 635, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 457, 300, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 290, 0, 0, 0, 426, 279, + 0, 0, 0, 0, 0, 273, 0, 0, 43, 113, + 0, 0, 0, 109, 161, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 149, 329, 0, 0, + 0, 0, 324, 0, 0, 0, 0, 0, 0, 0, + 0, 637, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 76, 77, 0, 75, 80, - 81, 0, 79, 0, 0, 51, 367, 0, 0, 0, - 363, 0, 116, 0, 0, 331, 344, 0, 0, 0, - 0, 339, 106, 105, 104, 630, 629, 623, 633, 27, - 27, 27, 27, 27, 27, 27, 29, 28, 634, 624, - 625, 628, 627, 626, 631, 632, 0, 0, 0, 0, + 81, 0, 79, 0, 0, 51, 369, 0, 0, 0, + 365, 0, 116, 0, 0, 333, 346, 0, 0, 0, + 0, 341, 106, 105, 104, 632, 631, 625, 635, 27, + 27, 27, 27, 27, 27, 27, 29, 28, 636, 626, + 627, 630, 629, 628, 633, 634, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 37, 0, 0, 221, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 384, - 0, 0, 432, 445, 0, 0, 447, 520, 524, 539, - 509, 606, 552, 546, 549, 519, 511, 510, 513, 514, - 512, 527, 517, 518, 528, 516, 523, 522, 521, 547, - 508, 604, 605, 543, 589, 583, 600, 584, 585, 586, - 594, 603, 587, 597, 601, 590, 602, 595, 591, 596, - 588, 599, 593, 592, 598, 0, 582, 545, 563, 558, - 575, 559, 560, 561, 569, 578, 562, 572, 576, 565, - 577, 570, 566, 571, 564, 574, 568, 567, 573, 0, - 557, 540, 538, 541, 551, 542, 530, 536, 537, 534, - 535, 531, 532, 533, 550, 553, 515, 544, 526, 525, - 548, 529, 0, 0, 0, 0, 0, 0, 0, 0, - 287, 0, 0, 423, 0, 0, 0, 282, 278, 281, - 263, 49, 50, 0, 0, 108, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 146, 0, 0, 0, - 321, 648, 647, 653, 651, 654, 649, 650, 652, 88, + 37, 0, 0, 223, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 386, + 0, 0, 434, 447, 0, 0, 449, 522, 526, 541, + 511, 608, 554, 548, 551, 521, 513, 512, 515, 516, + 514, 529, 519, 520, 530, 518, 525, 524, 523, 549, + 510, 606, 607, 545, 591, 585, 602, 586, 587, 588, + 596, 605, 589, 599, 603, 592, 604, 597, 593, 598, + 590, 601, 595, 594, 600, 0, 584, 547, 565, 560, + 577, 561, 562, 563, 571, 580, 564, 574, 578, 567, + 579, 572, 568, 573, 566, 576, 570, 569, 575, 0, + 559, 542, 540, 543, 553, 544, 532, 538, 539, 536, + 537, 533, 534, 535, 552, 555, 517, 546, 528, 527, + 550, 531, 0, 0, 0, 0, 0, 0, 0, 0, + 289, 0, 0, 425, 0, 0, 0, 284, 280, 283, + 265, 49, 50, 0, 0, 108, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 148, 0, 0, 0, + 323, 650, 649, 655, 653, 656, 651, 652, 654, 88, 96, 87, 94, 95, 86, 90, 89, 83, 82, 84, 93, 85, 72, 0, 73, 0, 91, 92, 0, 0, - 362, 122, 0, 0, 0, 134, 0, 126, 127, 129, - 128, 336, 0, 0, 0, 338, 30, 31, 32, 33, - 34, 35, 36, 251, 252, 244, 261, 260, 0, 259, - 246, 248, 255, 247, 245, 254, 241, 253, 243, 242, - 37, 37, 37, 39, 38, 249, 250, 406, 409, 410, - 420, 417, 403, 418, 415, 416, 0, 414, 419, 402, - 408, 405, 407, 421, 404, 438, 439, 453, 454, 580, - 0, 555, 0, 301, 302, 311, 308, 313, 309, 310, - 316, 312, 314, 307, 315, 0, 306, 300, 319, 318, - 317, 299, 430, 429, 285, 284, 269, 270, 268, 0, - 267, 0, 0, 0, 114, 115, 167, 163, 212, 200, - 209, 208, 198, 203, 219, 211, 217, 202, 205, 214, - 216, 213, 210, 218, 206, 215, 204, 207, 0, 196, - 160, 162, 164, 165, 166, 177, 172, 189, 173, 174, - 175, 183, 192, 176, 186, 190, 179, 191, 184, 180, - 185, 178, 188, 182, 181, 187, 0, 171, 161, 330, - 328, 329, 74, 78, 368, 373, 379, 382, 375, 381, - 376, 380, 378, 374, 377, 0, 372, 130, 0, 0, - 0, 0, 125, 345, 351, 357, 360, 353, 359, 354, - 358, 356, 352, 355, 0, 350, 346, 257, 0, 40, - 41, 42, 412, 0, 581, 556, 304, 0, 265, 0, - 283, 280, 279, 0, 0, 0, 194, 0, 169, 0, - 370, 0, 0, 0, 0, 0, 124, 348, 0, 258, - 413, 305, 266, 199, 197, 201, 195, 170, 371, 131, - 133, 132, 140, 143, 142, 139, 144, 141, 138, 0, - 137, 349, 135, 0, 136 + 364, 122, 0, 0, 0, 134, 0, 126, 127, 129, + 128, 338, 0, 0, 0, 340, 30, 31, 32, 33, + 34, 35, 36, 253, 254, 246, 263, 262, 0, 261, + 248, 250, 257, 249, 247, 256, 243, 255, 245, 244, + 37, 37, 37, 39, 38, 251, 252, 408, 411, 412, + 422, 419, 405, 420, 417, 418, 0, 416, 421, 404, + 410, 407, 409, 423, 406, 440, 441, 455, 456, 582, + 0, 557, 0, 303, 304, 313, 310, 315, 311, 312, + 318, 314, 316, 309, 317, 0, 308, 302, 321, 320, + 319, 301, 432, 431, 287, 286, 271, 272, 270, 0, + 269, 0, 0, 0, 114, 115, 169, 165, 214, 202, + 211, 210, 200, 205, 221, 213, 219, 204, 207, 216, + 218, 215, 212, 220, 208, 217, 206, 209, 0, 198, + 162, 164, 166, 167, 168, 179, 174, 191, 175, 176, + 177, 185, 194, 178, 188, 192, 181, 193, 186, 182, + 187, 180, 190, 184, 183, 189, 0, 173, 163, 332, + 330, 331, 74, 78, 370, 375, 381, 384, 377, 383, + 378, 382, 380, 376, 379, 0, 374, 130, 0, 0, + 0, 0, 125, 347, 353, 359, 362, 355, 361, 356, + 360, 358, 354, 357, 0, 352, 348, 259, 0, 40, + 41, 42, 414, 0, 583, 558, 306, 0, 267, 0, + 285, 282, 281, 0, 0, 0, 196, 0, 171, 0, + 372, 0, 0, 0, 0, 0, 124, 350, 0, 260, + 415, 307, 268, 201, 199, 203, 197, 172, 373, 131, + 133, 132, 140, 145, 144, 139, 142, 146, 143, 138, + 141, 0, 137, 351, 135, 0, 136 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -1828,7 +1829,7 @@ static const yytype_int16 yydefgoto[] = 279, 280, 281, 282, 283, 284, 28, 74, 75, 76, 77, 78, 29, 61, 498, 499, 500, 501, 30, 288, 289, 290, 291, 292, 1036, 1037, 1038, 1039, 1040, 1210, - 1279, 1280, 31, 62, 513, 514, 515, 516, 517, 518, + 1281, 1282, 31, 62, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 743, 1186, 1187, 524, 737, 1158, 1159, 32, 51, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, @@ -1873,79 +1874,79 @@ static const yytype_int16 yypact[] = 131, 10, -755, -755, 36, -755, 132, 133, 135, 139, 141, 142, 143, 144, 146, 148, 151, 153, 157, 158, 160, 162, 164, 165, 166, 168, 170, 180, 182, 183, - 187, 188, 189, -755, 192, -755, 193, 195, 197, 198, - 199, 200, 201, 202, 206, 207, 208, 209, 212, 213, - 216, 217, 219, 221, 222, 108, -755, -755, -755, -755, + 187, 188, 189, -755, 192, -755, 193, 195, 197, 199, + 200, 201, 202, 206, 207, 208, 209, 212, 213, 216, + 217, 219, 221, 222, 223, 108, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, 353, 8, 292, 29, - 223, 227, 24, -755, -755, -755, 22, 546, 47, -755, - 231, 236, 237, 240, 246, 248, 251, 253, 15, -755, - -755, -755, -755, -755, -755, -755, -755, -755, 60, 254, - 255, 257, 259, 260, 262, 263, 265, 266, 272, 288, - 291, 293, 294, 303, 305, 306, 9, -755, -755, -755, + 227, 231, 24, -755, -755, -755, 22, 546, 47, -755, + 236, 237, 240, 246, 248, 251, 253, 254, 15, -755, + -755, -755, -755, -755, -755, -755, -755, -755, 60, 255, + 257, 259, 260, 262, 263, 265, 266, 272, 288, 291, + 294, 303, 305, 306, 307, 308, 9, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - -755, -755, -755, -755, -755, 4, 65, 307, 19, -755, - -755, -755, 155, -755, 308, 23, -755, -755, 62, -755, - 215, 352, 365, 270, -755, 252, 431, 333, 436, 437, - 437, 437, 438, 440, 443, 349, 355, 335, -755, 339, - 337, 344, 346, -755, 351, 354, 357, 359, 360, 362, - 366, 367, 368, 369, 370, 372, 258, -755, -755, -755, + -755, -755, -755, -755, -755, 4, 65, 309, 19, -755, + -755, -755, 155, -755, 313, 23, -755, -755, 62, -755, + 215, 352, 365, 270, -755, 252, 436, 335, 438, 440, + 440, 440, 443, 451, 454, 355, 356, 340, -755, 347, + 346, 351, 354, -755, 357, 359, 360, 362, 366, 367, + 368, 369, 370, 372, 373, 377, 258, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - -755, -755, -755, -755, 356, 373, 377, 378, 381, 382, - 383, -755, 384, 385, 386, 387, 388, 390, 391, 326, + -755, -755, -755, -755, 358, 378, 381, 382, 383, 384, + 385, -755, 386, 387, 388, 390, 391, 392, 393, 326, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - -755, -755, -755, -755, -755, -755, 392, 393, 69, -755, - -755, -755, 462, 397, -755, -755, 406, 407, 48, -755, - -755, -755, 417, 437, 437, 428, 487, 432, 533, 520, - 435, 437, 439, 538, 539, 437, 540, 441, 445, 446, - 437, 545, 549, 437, 550, 551, 552, 553, 452, 433, - 455, 442, 456, 437, 437, 457, 458, 459, 58, 95, - 460, 461, 464, 554, 437, 466, 468, 437, 437, 469, - 471, 463, -755, 465, 453, 454, -755, 472, 473, 474, - 476, 480, 163, -755, -755, -755, -755, -755, -755, -755, - -755, -755, -755, 481, 482, 50, -755, -755, -755, 467, - 484, 485, -755, 488, -755, 25, -755, -755, -755, -755, - -755, 559, 562, 496, -755, 497, 499, 501, 18, -755, - -755, -755, 508, 506, 507, -755, 509, 511, 512, 514, - 515, -755, 516, 14, -755, -755, -755, -755, -755, -755, - -755, -755, -755, -755, -755, 521, 519, 523, 526, 11, - -755, -755, -755, -755, 477, 478, 479, 563, 483, 528, - 547, 437, 531, -755, -755, 572, 555, 603, 651, 652, - 638, 639, 641, 643, 644, 647, 663, 649, -99, -42, - 653, 654, 548, -755, 557, 544, -755, 73, -755, -755, - -755, -755, 569, 558, -755, 564, 657, 570, -755, 574, - 556, -755, 566, 27, -755, -755, -755, -755, 575, 576, - 578, -755, 579, 580, 582, 583, 267, 584, 587, 590, - 591, 592, 593, 597, 605, -755, -755, 673, 674, 437, - 604, 734, 736, 437, 737, 738, 437, 727, 747, 749, - 437, 751, 751, 636, -755, -755, 750, 129, 752, 667, - 755, 758, 640, 762, 764, 781, 767, 769, 771, 775, - 672, -755, 777, 778, 676, -755, 677, -755, 790, 793, - 693, -755, 694, 696, 701, 704, 705, 708, 709, 710, - 714, 715, 717, 722, 723, 725, 728, 729, 730, 731, - 732, 733, 735, 739, 740, 741, 742, 743, 744, 660, - 745, 703, 748, 753, 754, 756, 757, 759, 760, 770, - 772, 773, 780, 782, 783, 784, 785, 788, 789, 791, - 792, 794, 795, -755, -755, 807, 763, 713, 810, 853, - 841, 842, 851, 796, -755, 854, 855, 797, -755, -755, - 856, 859, 761, 868, 798, -755, 799, 802, -755, -755, - 862, 873, 803, -755, -755, 875, 804, 774, 882, 885, - 894, 897, 821, 805, 909, 806, -755, -755, 911, 913, - 914, 811, -755, 812, 813, 814, 815, 816, 817, 818, - 819, -755, 820, 822, 823, 824, 825, 826, 827, 828, - 829, 830, 831, 832, 833, -755, -755, -209, -755, -755, - -755, -189, -755, 834, 835, -755, -755, 925, 836, 837, - -755, 838, -755, 26, 840, -755, -755, 940, 839, 945, - 843, -755, -755, -755, -755, -755, -755, -755, -755, 437, - 437, 437, 437, 437, 437, 437, -755, -755, -755, -755, - -755, -755, -755, -755, -755, -755, 844, 845, 846, -34, - 847, 848, 849, 850, 852, 857, 858, 860, 861, 863, - 289, 864, 865, -755, 866, 867, 869, 870, 871, 872, - 874, 5, 876, 877, 878, 879, 880, 881, 883, -755, - 884, 886, -755, -755, 887, 888, -755, -755, -755, -755, + -755, -755, -755, -755, -755, -755, 394, 397, 69, -755, + -755, -755, 460, 409, -755, -755, 407, 411, 48, -755, + -755, -755, 428, 440, 440, 432, 487, 433, 537, 523, + 437, 440, 439, 540, 543, 440, 545, 445, 446, 447, + 440, 550, 551, 440, 552, 553, 554, 555, 455, 441, + 456, 442, 457, 440, 440, 458, 459, 464, 58, 95, + 466, 467, 468, 547, 440, 469, 471, 440, 440, 472, + 473, 461, -755, 462, 463, 465, -755, 474, 476, 480, + 481, 482, 163, -755, -755, -755, -755, -755, -755, -755, + -755, -755, -755, 484, 485, 50, -755, -755, -755, 475, + 488, 493, -755, 494, -755, 25, -755, -755, -755, -755, + -755, 561, 562, 499, -755, 502, 501, 505, 18, -755, + -755, -755, 509, 507, 508, -755, 511, 512, 514, 515, + 516, -755, 518, 14, -755, -755, -755, -755, -755, -755, + -755, -755, -755, -755, -755, 522, 526, 527, 528, 11, + -755, -755, -755, -755, 477, 529, 549, 563, 556, 557, + 560, 440, 533, -755, -755, 567, 564, 569, 586, 595, + 630, 638, 639, 641, 642, 648, 664, 652, -99, -42, + 653, 654, 558, -755, 559, 566, -755, 73, -755, -755, + -755, -755, 570, 574, -755, 568, 656, 575, -755, 576, + 579, -755, 580, 27, -755, -755, -755, -755, 578, 584, + 587, -755, 590, 591, 592, 593, 267, 597, 605, 607, + 615, 617, 618, 619, 623, -755, -755, 673, 674, 440, + 625, 676, 685, 440, 698, 699, 440, 734, 751, 755, + 440, 762, 762, 646, -755, -755, 752, 129, 754, 668, + 758, 764, 655, 766, 767, 784, 771, 775, 776, 777, + 677, -755, 778, 780, 686, -755, 689, -755, 797, 798, + 696, -755, 701, 704, 705, 708, 709, 710, 714, 715, + 717, 722, 723, 725, 728, 729, 730, 731, 732, 733, + 735, 737, 738, 739, 740, 741, 742, 743, 744, 660, + 745, 703, 747, 748, 749, 750, 753, 756, 757, 759, + 760, 769, 770, 772, 773, 781, 782, 783, 785, 788, + 789, 790, 791, -755, -755, 807, 763, 713, 810, 853, + 855, 856, 858, 792, -755, 859, 862, 793, -755, -755, + 868, 875, 774, 897, 794, -755, 795, 796, -755, -755, + 884, 888, 799, -755, -755, 891, 814, 800, 902, 906, + 908, 909, 823, 804, 912, 809, -755, -755, 914, 915, + 916, 813, -755, 815, 816, 817, 818, 819, 820, 821, + 822, -755, 824, 825, 826, 827, 828, 829, 830, 831, + 832, 833, 834, 835, 836, -755, -755, -209, -755, -755, + -755, -189, -755, 837, 838, -755, -755, 918, 839, 840, + -755, 841, -755, 26, 843, -755, -755, 927, 842, 943, + 844, -755, -755, -755, -755, -755, -755, -755, -755, 440, + 440, 440, 440, 440, 440, 440, -755, -755, -755, -755, + -755, -755, -755, -755, -755, -755, 846, 847, 848, -34, + 849, 850, 851, 852, 854, 857, 860, 861, 863, 864, + 289, 865, 866, -755, 867, 869, 870, 871, 872, 873, + 874, 5, 876, 877, 878, 879, 880, 881, 882, -755, + 883, 885, -755, -755, 886, 887, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, @@ -1955,73 +1956,73 @@ static const yytype_int16 yypact[] = -755, -755, -755, -755, -755, -755, -755, -755, -755, -172, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - -755, -755, 889, 890, 245, 891, 892, 893, 895, 896, - -755, 898, 899, -755, 900, 901, -16, 904, 902, -755, - -755, -755, -755, 903, 905, -755, 907, 908, 524, 910, - 912, 915, 916, 917, 746, 918, -755, 919, 920, 921, + -755, -755, 889, 890, 245, 892, 893, 894, 895, 896, + -755, 898, 899, -755, 900, 901, -16, 907, 903, -755, + -755, -755, -755, 904, 905, -755, 910, 911, 524, 913, + 917, 919, 920, 921, 746, 922, -755, 924, 925, 926, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - -755, -755, -755, -99, -755, -42, -755, -755, 922, 632, - -755, -755, 924, 906, 926, -755, 57, -755, -755, -755, - -755, -755, 927, 787, 928, -755, -755, -755, -755, -755, + -755, -755, -755, -99, -755, -42, -755, -755, 928, 632, + -755, -755, 929, 930, 931, -755, 57, -755, -755, -755, + -755, -755, 932, 787, 935, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -171, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - 751, 751, 751, -755, -755, -755, -755, -755, -755, -755, + 762, 762, 762, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -155, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, 660, -755, 703, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -50, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -49, - -755, 970, 868, 930, -755, -755, -755, -755, -755, 929, - -755, -755, 931, -755, -755, -755, -755, 932, -755, -755, + -755, 972, 897, 936, -755, -755, -755, -755, -755, 933, + -755, -755, 934, -755, -755, -755, -755, 937, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -23, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -15, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - -755, -755, -755, -755, -755, 0, -755, -755, 957, -101, - 935, 933, -755, -755, -755, -755, -755, -755, -755, -755, + -755, -755, -755, -755, -755, 0, -755, -755, 959, -101, + 938, 940, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, 30, -755, -755, -755, -34, -755, -755, -755, -755, 5, -755, -755, -755, 245, -755, -16, - -755, -755, -755, 952, 953, 954, -755, 524, -755, 746, - -755, 632, 939, 941, 942, 297, -755, -755, 787, -755, + -755, -755, -755, 954, 956, 957, -755, 524, -755, 746, + -755, 632, 944, 945, 946, 297, -755, -755, 787, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - -755, -755, -755, -755, -755, -755, -755, -755, -755, 55, - -755, -755, -755, 297, -755 + -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, + -755, 55, -755, -755, -755, 297, -755 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -755, -755, -755, -298, -307, -754, -621, -755, -755, 936, - -755, -755, -755, -755, 934, -755, -755, -755, 63, -755, - 70, -755, -755, -755, -755, -755, -755, -755, -755, -755, + -755, -755, -755, -298, -307, -754, -621, -755, -755, 942, + -755, -755, -755, -755, 845, -755, -755, -755, 72, -755, + 77, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, 1015, -755, - -755, -755, -755, -755, -755, 602, -755, -755, -755, -755, - 937, -755, -755, -755, -755, 76, -755, -755, -755, -755, - -755, -181, -755, -755, -755, 596, -755, -755, -755, -755, - -755, -755, -755, -755, -755, -755, -755, -125, -755, -755, - -755, -118, -755, -755, -755, 938, -755, -755, -755, -755, + -755, -755, -755, -755, -755, 620, -755, -755, -755, -755, + 939, -755, -755, -755, -755, 93, -755, -755, -755, -755, + -755, -170, -755, -755, -755, 622, -755, -755, -755, -755, + -755, -755, -755, -755, -755, -755, -755, -119, -755, -755, + -755, -114, -755, -755, -755, 803, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - -755, -755, -755, -755, -97, -755, -755, -755, -755, -755, - -98, -755, 655, -755, -755, -755, 6, -755, -755, -755, - -755, -755, 688, -755, -755, -755, -755, -755, -755, -755, - -85, -755, -755, -755, -755, -755, -755, 624, -755, -755, - -755, -755, -755, 943, -755, -755, -755, -755, 588, -755, - -755, -755, -755, -755, -96, -755, -755, -755, 600, -755, - -755, -755, -755, -92, -755, -755, -755, 801, -755, -755, - -755, -755, -755, -755, -755, -755, -755, -755, -755, -61, - -755, -755, -755, -755, -755, -755, -755, -755, 698, -755, - -755, -755, -755, -755, 786, -755, -755, -755, -755, 1064, - -755, -755, -755, -755, 779, -755, -755, -755, -755, 1011, + -755, -755, -755, -755, -92, -755, -755, -755, -755, -755, + -98, -755, 657, -755, -755, -755, 38, -755, -755, -755, + -755, -755, 681, -755, -755, -755, -755, -755, -755, -755, + -87, -755, -755, -755, -755, -755, -755, 616, -755, -755, + -755, -755, -755, 941, -755, -755, -755, -755, 571, -755, + -755, -755, -755, -755, -100, -755, -755, -755, 608, -755, + -755, -755, -755, -94, -755, -755, -755, 805, -755, -755, + -755, -755, -755, -755, -755, -755, -755, -755, -755, -57, + -755, -755, -755, -755, -755, -755, -755, -755, 702, -755, + -755, -755, -755, -755, 801, -755, -755, -755, -755, 1067, + -755, -755, -755, -755, 786, -755, -755, -755, -755, 1014, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - -755, -755, -755, -755, -755, -755, -755, 77, -755, -755, - -755, 78, -755, -755, -755, -755, -755, 1088, -755, -755, + -755, -755, -755, -755, -755, -755, -755, 78, -755, -755, + -755, 83, -755, -755, -755, -755, -755, 1089, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, -755, - -755, -755, 944, -755, -755, -755, -755, -755, -755, -755, + -755, -755, 947, -755, -755, -755, -755, -755, -755, -755, -755 }; @@ -2059,7 +2060,7 @@ static const yytype_int16 yytable[] = 228, 577, 493, 724, 150, 800, 490, 1257, 1105, 319, 287, 1258, 151, 152, 153, 154, 155, 156, 688, 285, 298, 689, 474, 320, 321, 1035, 650, 322, 717, 1106, - 581, 457, 1282, 70, 582, 1211, 1283, 544, 1107, 458, + 581, 457, 1284, 70, 582, 1211, 1285, 544, 1107, 458, 459, 566, 571, 479, 301, 157, 302, 644, 1070, 1071, 1072, 789, 828, 845, 846, 690, 832, 71, 691, 835, 460, 305, 306, 839, 72, 1108, 1229, 1230, 1231, 158, @@ -2073,92 +2074,88 @@ static const yytype_int16 yytable[] = 416, 713, 417, 1113, 418, 419, 420, 840, 421, 362, 422, 334, 809, 810, 811, 812, 813, 814, 815, 248, 423, 1275, 424, 425, 483, 115, 456, 426, 427, 428, - 116, 117, 430, 432, 363, 433, 118, 434, 435, 436, - 437, 438, 439, 249, 119, 120, 440, 441, 442, 443, - 335, 121, 444, 445, 122, 123, 446, 447, 364, 448, - 124, 449, 450, 491, 1114, 125, 126, 492, 127, 128, - 129, 534, 130, 1276, 1277, 250, 535, 536, 365, 131, - 537, 457, 251, 132, 133, 589, 538, 366, 539, 458, - 459, 540, 134, 541, 545, 546, 623, 547, 590, 548, - 549, 135, 550, 551, 252, 552, 553, 591, 253, 136, - 460, 137, 554, 138, 229, 139, 254, 140, 141, 255, - 256, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 555, 1278, - 142, 556, 367, 557, 558, 143, 144, 145, 1138, 146, - 147, 148, 230, 559, 149, 560, 561, 572, 576, 593, - 231, 257, 1139, 594, 595, 596, 600, 502, 601, 368, - 1140, 602, 232, 233, 640, 234, 235, 236, 258, 603, - 150, 259, 605, 503, 1141, 604, 606, 607, 151, 152, - 153, 154, 155, 156, 608, 461, 609, 237, 354, 504, - 355, 611, 356, 625, 612, 646, 260, 613, 1254, 614, - 615, 1142, 616, 1143, 357, 656, 617, 618, 619, 620, - 621, 157, 622, 626, 261, 262, 263, 627, 628, 505, - 358, 629, 630, 631, 633, 634, 635, 636, 637, 1144, - 638, 639, 642, 643, 647, 158, 159, 652, 160, 161, - 162, 264, 265, 359, 163, 360, 648, 649, 655, 164, - 361, 658, 657, 659, 506, 660, 663, 664, 666, 662, - 362, 667, 1145, 671, 1146, 668, 669, 672, 674, 675, - 676, 677, 678, 679, 507, 680, 682, 685, 686, 687, - 692, 693, 681, 1147, 694, 363, 697, 695, 698, 701, - 508, 702, 726, 705, 706, 727, 756, 753, 754, 755, - 703, 1148, 704, 757, 719, 762, 1149, 509, 510, 364, - 1150, 1195, 708, 709, 710, 1151, 711, 319, 1152, 894, - 712, 715, 716, 1153, 720, 721, 2, 3, 723, 365, - 4, 320, 321, 728, 729, 322, 764, 1154, 366, 730, - 5, 731, 1155, 6, 7, 734, 735, 736, 758, 738, - 8, 739, 740, 1156, 741, 742, 744, 511, 747, 748, - 1157, 9, 918, 749, 10, 11, 750, 759, 761, 765, - 766, 767, 768, 1196, 769, 763, 770, 771, 512, 323, - 772, 773, 774, 367, 787, 785, 783, 784, 12, 791, - 794, 826, 827, 13, 786, 792, 797, 324, 325, 326, - 327, 14, 1197, 793, 328, 1165, 799, 795, 329, 1198, - 368, 796, 802, 803, 330, 804, 805, 806, 1199, 807, - 808, 818, 15, 16, 819, 331, 332, 820, 821, 822, - 823, 895, 896, 897, 824, 898, 899, 333, 900, 901, - 17, 902, 825, 903, 829, 1200, 904, 1201, 1202, 905, - 906, 907, 830, 908, 831, 833, 834, 18, 909, 334, - 836, 1203, 910, 911, 912, 837, 1214, 838, 1204, 840, - 19, 20, 913, 843, 919, 920, 921, 914, 922, 923, - 851, 924, 925, 844, 926, 847, 927, 848, 849, 928, - 21, 850, 929, 930, 931, 852, 932, 853, 335, 854, - 855, 933, 856, 22, 857, 934, 935, 936, 858, 859, - 860, 861, 23, 862, 863, 937, 24, 1166, 1167, 1168, - 938, 1169, 1170, 864, 1171, 1172, 865, 1173, 1215, 1174, - 866, 867, 1175, 868, 79, 1176, 1177, 1178, 869, 1179, - 962, 870, 871, 965, 1180, 872, 873, 874, 1181, 1182, - 1183, 875, 876, 964, 877, 80, 81, 1216, 1184, 878, - 879, 82, 880, 1185, 1217, 881, 882, 883, 884, 885, - 886, 966, 887, 1218, 967, 968, 888, 889, 890, 891, - 892, 893, 917, 963, 969, 941, 977, 971, 972, 974, - 942, 943, 975, 944, 945, 983, 946, 947, 83, 84, - 1219, 976, 1220, 1221, 85, 86, 984, 948, 986, 949, - 950, 87, 88, 89, 988, 989, 1222, 951, 990, 952, - 953, 954, 955, 1223, 987, 956, 957, 991, 958, 959, - 992, 960, 961, 970, 973, 980, 981, 90, 91, 982, - 985, 993, 995, 996, 997, 994, 998, 999, 1000, 1001, - 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1028, 1010, - 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, - 1021, 1026, 1027, 1042, 1030, 1031, 1029, 1041, 1044, 1043, - 1045, 1053, 1054, 1055, 1060, 1061, 1062, 1063, 1240, 1064, - 1252, 1263, 1264, 1265, 1065, 1066, 1192, 1067, 1068, 304, - 1069, 1075, 1076, 1077, 1078, 1193, 1079, 1080, 1081, 1082, - 733, 1083, 1284, 1088, 1089, 1090, 1091, 1092, 1093, 746, - 1094, 1095, 1212, 1096, 1097, 1098, 1103, 1104, 1117, 1118, - 1119, 1131, 1120, 1121, 1267, 1122, 1123, 1124, 1125, 1266, - 1134, 1259, 1135, 1132, 1136, 1137, 1208, 1160, 1241, 1161, - 725, 1262, 1162, 1163, 1164, 1188, 1189, 1190, 1191, 1194, - 714, 1207, 1261, 752, 1213, 1226, 1209, 1242, 494, 1268, - 1256, 1243, 1281, 1244, 1245, 1255, 1269, 790, 1270, 1271, - 641, 801, 1260, 718, 645, 394, 452, 651, 1234, 1235, - 318, 0, 543, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 563, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 116, 117, 430, 432, 363, 433, 118, 434, 1276, 435, + 436, 437, 438, 249, 119, 120, 439, 440, 441, 442, + 335, 121, 443, 444, 122, 123, 445, 446, 364, 447, + 124, 448, 449, 450, 1114, 125, 126, 491, 127, 128, + 129, 492, 130, 1277, 1278, 250, 534, 535, 365, 131, + 536, 457, 251, 132, 133, 589, 537, 366, 538, 458, + 459, 539, 134, 540, 541, 545, 623, 546, 590, 547, + 548, 135, 549, 550, 252, 551, 552, 591, 253, 136, + 460, 137, 553, 138, 229, 139, 254, 140, 141, 255, + 256, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 554, 1279, + 142, 555, 367, 1280, 556, 143, 144, 145, 1138, 146, + 147, 148, 230, 557, 149, 558, 559, 560, 561, 572, + 231, 257, 1139, 576, 593, 594, 595, 502, 596, 368, + 1140, 600, 232, 233, 640, 234, 235, 236, 258, 601, + 150, 259, 602, 503, 1141, 603, 604, 605, 151, 152, + 153, 154, 155, 156, 606, 461, 607, 237, 354, 504, + 355, 608, 356, 646, 609, 625, 260, 611, 1254, 612, + 613, 1142, 614, 1143, 357, 656, 615, 616, 617, 618, + 619, 157, 620, 621, 261, 262, 263, 622, 626, 505, + 358, 627, 628, 629, 630, 631, 633, 634, 635, 1144, + 636, 637, 638, 639, 642, 158, 159, 643, 160, 161, + 162, 264, 265, 359, 163, 360, 647, 648, 652, 164, + 361, 649, 655, 657, 506, 658, 659, 660, 663, 662, + 362, 664, 1145, 666, 1146, 667, 668, 669, 671, 672, + 674, 675, 676, 677, 507, 678, 680, 682, 685, 686, + 695, 679, 681, 1147, 687, 363, 692, 693, 694, 697, + 508, 698, 701, 702, 726, 727, 756, 753, 703, 704, + 762, 1148, 764, 705, 765, 706, 1149, 509, 510, 364, + 1150, 1195, 719, 766, 708, 1151, 709, 319, 1152, 894, + 710, 711, 712, 1153, 715, 716, 2, 3, 720, 365, + 4, 320, 321, 721, 723, 322, 728, 1154, 366, 729, + 5, 730, 1155, 6, 7, 731, 734, 735, 736, 754, + 8, 738, 739, 1156, 740, 741, 742, 511, 744, 747, + 1157, 9, 918, 767, 10, 11, 748, 749, 750, 755, + 761, 768, 769, 1196, 770, 771, 757, 758, 512, 323, + 759, 772, 773, 367, 763, 774, 783, 784, 12, 794, + 791, 826, 827, 13, 830, 785, 786, 324, 325, 326, + 327, 14, 1197, 831, 328, 1165, 787, 793, 329, 1198, + 368, 792, 795, 796, 330, 802, 833, 834, 1199, 797, + 799, 803, 15, 16, 804, 331, 332, 805, 806, 807, + 808, 895, 896, 897, 818, 898, 899, 333, 900, 901, + 17, 902, 819, 903, 820, 1200, 904, 1201, 1202, 905, + 906, 907, 821, 908, 822, 823, 824, 18, 909, 334, + 825, 1203, 910, 911, 912, 829, 1214, 836, 1204, 837, + 19, 20, 913, 838, 919, 920, 921, 914, 922, 923, + 840, 924, 925, 843, 926, 844, 927, 847, 848, 928, + 21, 849, 929, 930, 931, 851, 932, 850, 335, 852, + 853, 933, 854, 22, 855, 934, 935, 936, 856, 857, + 858, 860, 23, 861, 859, 937, 24, 1166, 1167, 1168, + 938, 1169, 1170, 862, 1171, 1172, 863, 1173, 1215, 1174, + 864, 865, 1175, 866, 79, 1176, 1177, 1178, 867, 1179, + 962, 868, 869, 965, 1180, 870, 871, 872, 1181, 1182, + 1183, 873, 874, 964, 875, 80, 81, 1216, 1184, 876, + 877, 82, 878, 1185, 1217, 879, 880, 881, 882, 883, + 884, 966, 885, 1218, 886, 887, 888, 889, 890, 891, + 892, 893, 917, 963, 941, 942, 943, 944, 967, 968, + 945, 969, 971, 946, 947, 972, 948, 949, 83, 84, + 1219, 974, 1220, 1221, 85, 86, 950, 951, 975, 952, + 953, 87, 88, 89, 976, 977, 1222, 983, 954, 955, + 956, 984, 957, 1223, 986, 958, 959, 960, 961, 970, + 973, 980, 981, 982, 987, 989, 985, 90, 91, 990, + 988, 991, 992, 993, 994, 995, 996, 997, 998, 999, + 1000, 1028, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, + 1042, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, + 1018, 1019, 1020, 1021, 1026, 1027, 1044, 1030, 1031, 1029, + 1041, 1045, 1043, 1053, 1054, 1055, 1060, 1061, 1062, 1063, + 1240, 1064, 1252, 1263, 1065, 1264, 1265, 1066, 1067, 304, + 1068, 1069, 1075, 1076, 1077, 1192, 1078, 1079, 1080, 1081, + 1082, 1083, 1193, 1088, 1089, 1090, 1091, 1092, 1093, 1094, + 1095, 563, 1096, 1097, 1098, 1286, 1103, 1104, 733, 1117, + 1118, 1119, 1120, 1121, 1131, 1122, 1123, 1124, 1125, 1212, + 1267, 1134, 1135, 1266, 1132, 746, 1259, 1136, 1137, 624, + 1160, 1262, 725, 714, 1161, 752, 1162, 1163, 1164, 1188, + 1261, 1189, 1190, 1191, 801, 1194, 1207, 1268, 1283, 1213, + 1208, 1209, 1226, 1242, 494, 1243, 1244, 1256, 1255, 1245, + 1241, 1269, 1270, 1271, 641, 790, 1260, 718, 394, 452, + 1235, 318, 0, 1234, 651, 543, 0, 0, 0, 645, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 574, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 578, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 624 + 0, 0, 0, 0, 0, 0, 0, 574, 0, 0, + 0, 0, 0, 0, 0, 0, 578 }; #define yypact_value_is_default(Yystate) \ @@ -2211,7 +2208,7 @@ static const yytype_int16 yycheck[] = 230, 228, 230, 148, 230, 230, 230, 108, 230, 73, 230, 143, 135, 136, 137, 138, 139, 140, 141, 1, 230, 114, 230, 230, 122, 1, 63, 230, 230, 230, - 6, 7, 230, 230, 98, 230, 12, 230, 230, 230, + 6, 7, 230, 230, 98, 230, 12, 230, 131, 230, 230, 230, 230, 25, 20, 21, 230, 230, 230, 230, 182, 27, 230, 230, 30, 31, 230, 230, 122, 230, 36, 230, 230, 230, 209, 41, 42, 230, 44, 45, @@ -2221,82 +2218,78 @@ static const yytype_int16 yycheck[] = 230, 77, 230, 230, 86, 230, 230, 227, 90, 85, 147, 87, 230, 89, 1, 91, 98, 93, 94, 101, 102, 809, 810, 811, 812, 813, 814, 815, 230, 222, - 106, 230, 196, 230, 230, 111, 112, 113, 4, 115, - 116, 117, 29, 230, 120, 230, 230, 230, 230, 108, - 37, 133, 18, 210, 108, 108, 108, 1, 108, 223, - 26, 108, 49, 50, 228, 52, 53, 54, 150, 210, - 146, 153, 227, 17, 40, 210, 227, 230, 154, 155, - 156, 157, 158, 159, 230, 222, 230, 74, 1, 33, - 3, 230, 5, 227, 230, 123, 178, 230, 1209, 230, + 106, 230, 196, 226, 230, 111, 112, 113, 4, 115, + 116, 117, 29, 230, 120, 230, 230, 230, 230, 230, + 37, 133, 18, 230, 108, 210, 108, 1, 108, 223, + 26, 108, 49, 50, 228, 52, 53, 54, 150, 108, + 146, 153, 108, 17, 40, 210, 210, 227, 154, 155, + 156, 157, 158, 159, 227, 222, 230, 74, 1, 33, + 3, 230, 5, 123, 230, 227, 178, 230, 1209, 230, 230, 67, 230, 69, 17, 108, 230, 230, 230, 230, 230, 187, 230, 230, 196, 197, 198, 230, 230, 63, 33, 230, 230, 230, 230, 230, 230, 230, 230, 95, - 230, 230, 230, 230, 227, 211, 212, 210, 214, 215, - 216, 223, 224, 56, 220, 58, 230, 230, 210, 225, - 63, 108, 210, 123, 98, 210, 108, 108, 108, 210, - 73, 210, 128, 108, 130, 210, 210, 108, 108, 108, - 108, 108, 210, 230, 118, 210, 210, 210, 210, 210, - 210, 210, 230, 149, 210, 98, 210, 123, 210, 210, - 134, 210, 123, 230, 230, 123, 123, 210, 210, 210, - 227, 167, 227, 210, 227, 123, 172, 151, 152, 122, - 176, 69, 230, 230, 230, 181, 230, 1, 184, 49, + 230, 230, 230, 230, 230, 211, 212, 230, 214, 215, + 216, 223, 224, 56, 220, 58, 227, 230, 210, 225, + 63, 230, 210, 210, 98, 108, 123, 210, 108, 210, + 73, 108, 128, 108, 130, 210, 210, 210, 108, 108, + 108, 108, 108, 108, 118, 210, 210, 210, 210, 210, + 123, 230, 230, 149, 210, 98, 210, 210, 210, 210, + 134, 210, 210, 210, 123, 123, 123, 210, 227, 227, + 123, 167, 123, 230, 108, 230, 172, 151, 152, 122, + 176, 69, 227, 108, 230, 181, 230, 1, 184, 49, 230, 230, 230, 189, 230, 230, 0, 1, 230, 142, - 4, 15, 16, 227, 227, 19, 123, 203, 151, 230, - 14, 230, 208, 17, 18, 227, 230, 230, 210, 230, - 24, 230, 230, 219, 230, 230, 230, 201, 227, 230, - 226, 35, 49, 230, 38, 39, 230, 210, 227, 108, - 108, 123, 123, 131, 123, 210, 123, 123, 222, 63, - 123, 108, 123, 196, 230, 227, 123, 123, 62, 210, - 123, 108, 108, 67, 227, 227, 230, 81, 82, 83, - 84, 75, 160, 229, 88, 49, 230, 227, 92, 167, - 223, 227, 227, 227, 98, 227, 227, 227, 176, 227, - 227, 227, 96, 97, 227, 109, 110, 227, 227, 227, + 4, 15, 16, 230, 230, 19, 227, 203, 151, 227, + 14, 230, 208, 17, 18, 230, 227, 230, 230, 210, + 24, 230, 230, 219, 230, 230, 230, 201, 230, 227, + 226, 35, 49, 123, 38, 39, 230, 230, 230, 210, + 227, 123, 123, 131, 123, 123, 210, 210, 222, 63, + 210, 123, 108, 196, 210, 123, 123, 123, 62, 123, + 210, 108, 108, 67, 108, 227, 227, 81, 82, 83, + 84, 75, 160, 108, 88, 49, 230, 229, 92, 167, + 223, 227, 227, 227, 98, 227, 108, 108, 176, 230, + 230, 227, 96, 97, 227, 109, 110, 227, 227, 227, 227, 161, 162, 163, 227, 165, 166, 121, 168, 169, - 114, 171, 227, 173, 230, 203, 176, 205, 206, 179, - 180, 181, 108, 183, 108, 108, 108, 131, 188, 143, - 123, 219, 192, 193, 194, 108, 69, 108, 226, 108, - 144, 145, 202, 227, 161, 162, 163, 207, 165, 166, - 230, 168, 169, 123, 171, 123, 173, 210, 123, 176, - 164, 123, 179, 180, 181, 123, 183, 123, 182, 108, - 123, 188, 123, 177, 123, 192, 193, 194, 123, 227, - 123, 123, 186, 227, 227, 202, 190, 161, 162, 163, - 207, 165, 166, 123, 168, 169, 123, 171, 131, 173, - 227, 227, 176, 227, 1, 179, 180, 181, 227, 183, + 114, 171, 227, 173, 227, 203, 176, 205, 206, 179, + 180, 181, 227, 183, 227, 227, 227, 131, 188, 143, + 227, 219, 192, 193, 194, 230, 69, 123, 226, 108, + 144, 145, 202, 108, 161, 162, 163, 207, 165, 166, + 108, 168, 169, 227, 171, 123, 173, 123, 210, 176, + 164, 123, 179, 180, 181, 230, 183, 123, 182, 123, + 123, 188, 108, 177, 123, 192, 193, 194, 123, 123, + 123, 123, 186, 123, 227, 202, 190, 161, 162, 163, + 207, 165, 166, 227, 168, 169, 227, 171, 131, 173, + 123, 123, 176, 227, 1, 179, 180, 181, 227, 183, 123, 227, 227, 123, 188, 227, 227, 227, 192, 193, 194, 227, 227, 230, 227, 22, 23, 160, 202, 227, 227, 28, 227, 207, 167, 227, 227, 227, 227, 227, - 227, 108, 227, 176, 123, 123, 227, 227, 227, 227, - 227, 227, 227, 210, 123, 227, 108, 123, 123, 123, - 227, 227, 123, 227, 227, 123, 227, 227, 65, 66, - 203, 230, 205, 206, 71, 72, 123, 227, 123, 227, - 227, 78, 79, 80, 230, 123, 219, 227, 123, 227, - 227, 227, 227, 226, 210, 227, 227, 123, 227, 227, - 123, 227, 227, 227, 227, 227, 227, 104, 105, 227, - 227, 210, 123, 227, 123, 230, 123, 123, 227, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 123, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 123, 227, 227, 230, 227, 123, 230, - 227, 227, 227, 227, 227, 227, 227, 227, 108, 227, - 123, 129, 129, 129, 227, 227, 1023, 227, 227, 74, - 227, 227, 227, 227, 227, 1025, 227, 227, 227, 227, - 498, 227, 1283, 227, 227, 227, 227, 227, 227, 513, - 227, 227, 1036, 227, 227, 227, 227, 227, 227, 227, - 227, 217, 227, 227, 1249, 227, 227, 227, 227, 1247, - 227, 1228, 227, 231, 227, 227, 230, 227, 1132, 227, - 485, 1239, 227, 227, 227, 227, 227, 227, 227, 227, - 462, 227, 1237, 529, 227, 227, 230, 227, 222, 1251, - 227, 232, 1258, 232, 232, 230, 227, 567, 227, 227, - 369, 583, 1233, 475, 388, 111, 165, 398, 1100, 1102, - 92, -1, 238, -1, -1, -1, -1, -1, -1, -1, + 227, 108, 227, 176, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 210, 227, 227, 227, 227, 123, 123, + 227, 123, 123, 227, 227, 123, 227, 227, 65, 66, + 203, 123, 205, 206, 71, 72, 227, 227, 123, 227, + 227, 78, 79, 80, 230, 108, 219, 123, 227, 227, + 227, 123, 227, 226, 123, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 210, 123, 227, 104, 105, 123, + 230, 123, 123, 210, 230, 123, 227, 123, 123, 123, + 227, 123, 227, 227, 227, 227, 227, 227, 227, 227, + 123, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 123, 227, 227, 230, + 227, 227, 230, 227, 227, 227, 227, 227, 227, 227, + 108, 227, 123, 129, 227, 129, 129, 227, 227, 74, + 227, 227, 227, 227, 227, 1023, 227, 227, 227, 227, + 227, 227, 1025, 227, 227, 227, 227, 227, 227, 227, + 227, 266, 227, 227, 227, 1285, 227, 227, 498, 227, + 227, 227, 227, 227, 217, 227, 227, 227, 227, 1036, + 1249, 227, 227, 1247, 231, 513, 1228, 227, 227, 336, + 227, 1239, 485, 462, 227, 529, 227, 227, 227, 227, + 1237, 227, 227, 227, 583, 227, 227, 1251, 1258, 227, + 230, 230, 227, 227, 222, 232, 232, 227, 230, 232, + 1132, 227, 227, 227, 369, 567, 1233, 475, 111, 165, + 1102, 92, -1, 1100, 398, 238, -1, -1, -1, 388, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 266, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 288, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 295, -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, 336 + -1, -1, -1, -1, -1, -1, -1, 288, -1, -1, + -1, -1, -1, -1, -1, -1, 295 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -2430,8 +2423,8 @@ static const yytype_uint16 yystos[] = 108, 349, 227, 232, 232, 232, 227, 231, 227, 231, 227, 231, 123, 204, 239, 230, 227, 227, 231, 337, 412, 363, 343, 129, 129, 129, 314, 310, 396, 227, - 227, 227, 40, 67, 69, 114, 166, 167, 222, 293, - 294, 387, 227, 231, 294 + 227, 227, 40, 67, 69, 114, 131, 166, 167, 222, + 226, 293, 294, 387, 227, 231, 294 }; #define yyerrok (yyerrstatus = 0) @@ -3940,7 +3933,7 @@ yyreduce: #line 988 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.type.value = LOG_TYPE_DLINE; + block_state.type.value = LOG_TYPE_XLINE; } break; @@ -3949,7 +3942,7 @@ yyreduce: #line 992 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.type.value = LOG_TYPE_KLINE; + block_state.type.value = LOG_TYPE_RESV; } break; @@ -3958,7 +3951,7 @@ yyreduce: #line 996 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.type.value = LOG_TYPE_KILL; + block_state.type.value = LOG_TYPE_DLINE; } break; @@ -3967,13 +3960,31 @@ yyreduce: #line 1000 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.type.value = LOG_TYPE_DEBUG; + block_state.type.value = LOG_TYPE_KLINE; } break; case 145: /* Line 1787 of yacc.c */ -#line 1010 "conf_parser.y" +#line 1004 "conf_parser.y" + { + if (conf_parser_ctx.pass == 2) + block_state.type.value = LOG_TYPE_KILL; +} + break; + + case 146: +/* Line 1787 of yacc.c */ +#line 1008 "conf_parser.y" + { + if (conf_parser_ctx.pass == 2) + block_state.type.value = LOG_TYPE_DEBUG; +} + break; + + case 147: +/* Line 1787 of yacc.c */ +#line 1018 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -3983,9 +3994,9 @@ yyreduce: } break; - case 146: + case 148: /* Line 1787 of yacc.c */ -#line 1017 "conf_parser.y" +#line 1025 "conf_parser.y" { dlink_node *ptr = NULL; @@ -4059,36 +4070,36 @@ yyreduce: } break; - case 160: + case 162: /* Line 1787 of yacc.c */ -#line 1097 "conf_parser.y" +#line 1105 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 161: + case 163: /* Line 1787 of yacc.c */ -#line 1103 "conf_parser.y" +#line 1111 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); } break; - case 162: + case 164: /* Line 1787 of yacc.c */ -#line 1109 "conf_parser.y" +#line 1117 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 163: + case 165: /* Line 1787 of yacc.c */ -#line 1115 "conf_parser.y" +#line 1123 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4100,27 +4111,27 @@ yyreduce: } break; - case 164: + case 166: /* Line 1787 of yacc.c */ -#line 1126 "conf_parser.y" +#line 1134 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf)); } break; - case 165: + case 167: /* Line 1787 of yacc.c */ -#line 1132 "conf_parser.y" +#line 1140 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf)); } break; - case 166: + case 168: /* Line 1787 of yacc.c */ -#line 1138 "conf_parser.y" +#line 1146 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -4132,48 +4143,30 @@ yyreduce: } break; - case 167: + case 169: /* Line 1787 of yacc.c */ -#line 1149 "conf_parser.y" +#line 1157 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 168: + case 170: /* Line 1787 of yacc.c */ -#line 1155 "conf_parser.y" +#line 1163 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.modes.value = 0; } break; - case 172: -/* Line 1787 of yacc.c */ -#line 1162 "conf_parser.y" - { - if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_BOTS; -} - break; - - case 173: -/* Line 1787 of yacc.c */ -#line 1166 "conf_parser.y" - { - if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_CCONN; -} - break; - case 174: /* Line 1787 of yacc.c */ #line 1170 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_DEAF; + block_state.modes.value |= UMODE_BOTS; } break; @@ -4182,7 +4175,7 @@ yyreduce: #line 1174 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_DEBUG; + block_state.modes.value |= UMODE_CCONN; } break; @@ -4191,7 +4184,7 @@ yyreduce: #line 1178 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_FULL; + block_state.modes.value |= UMODE_DEAF; } break; @@ -4200,7 +4193,7 @@ yyreduce: #line 1182 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_HIDDEN; + block_state.modes.value |= UMODE_DEBUG; } break; @@ -4209,7 +4202,7 @@ yyreduce: #line 1186 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_SKILL; + block_state.modes.value |= UMODE_FULL; } break; @@ -4218,7 +4211,7 @@ yyreduce: #line 1190 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_NCHANGE; + block_state.modes.value |= UMODE_HIDDEN; } break; @@ -4227,7 +4220,7 @@ yyreduce: #line 1194 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_REJ; + block_state.modes.value |= UMODE_SKILL; } break; @@ -4236,7 +4229,7 @@ yyreduce: #line 1198 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_UNAUTH; + block_state.modes.value |= UMODE_NCHANGE; } break; @@ -4245,7 +4238,7 @@ yyreduce: #line 1202 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_SPY; + block_state.modes.value |= UMODE_REJ; } break; @@ -4254,7 +4247,7 @@ yyreduce: #line 1206 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_EXTERNAL; + block_state.modes.value |= UMODE_UNAUTH; } break; @@ -4263,7 +4256,7 @@ yyreduce: #line 1210 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_OPERWALL; + block_state.modes.value |= UMODE_SPY; } break; @@ -4272,7 +4265,7 @@ yyreduce: #line 1214 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_SERVNOTICE; + block_state.modes.value |= UMODE_EXTERNAL; } break; @@ -4281,7 +4274,7 @@ yyreduce: #line 1218 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_INVISIBLE; + block_state.modes.value |= UMODE_OPERWALL; } break; @@ -4290,7 +4283,7 @@ yyreduce: #line 1222 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_WALLOP; + block_state.modes.value |= UMODE_SERVNOTICE; } break; @@ -4299,7 +4292,7 @@ yyreduce: #line 1226 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_SOFTCALLERID; + block_state.modes.value |= UMODE_INVISIBLE; } break; @@ -4308,7 +4301,7 @@ yyreduce: #line 1230 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_CALLERID; + block_state.modes.value |= UMODE_WALLOP; } break; @@ -4317,7 +4310,7 @@ yyreduce: #line 1234 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_LOCOPS; + block_state.modes.value |= UMODE_SOFTCALLERID; } break; @@ -4326,7 +4319,7 @@ yyreduce: #line 1238 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_REGONLY; + block_state.modes.value |= UMODE_CALLERID; } break; @@ -4335,34 +4328,34 @@ yyreduce: #line 1242 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.modes.value |= UMODE_FARCONNECT; + block_state.modes.value |= UMODE_LOCOPS; } break; case 193: /* Line 1787 of yacc.c */ -#line 1248 "conf_parser.y" +#line 1246 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value = 0; + block_state.modes.value |= UMODE_REGONLY; } break; - case 197: + case 194: /* Line 1787 of yacc.c */ -#line 1255 "conf_parser.y" +#line 1250 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_KILL_REMOTE; + block_state.modes.value |= UMODE_FARCONNECT; } break; - case 198: + case 195: /* Line 1787 of yacc.c */ -#line 1259 "conf_parser.y" +#line 1256 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_KILL; + block_state.port.value = 0; } break; @@ -4371,7 +4364,7 @@ yyreduce: #line 1263 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_CONNECT_REMOTE; + block_state.port.value |= OPER_FLAG_KILL_REMOTE; } break; @@ -4380,7 +4373,7 @@ yyreduce: #line 1267 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_CONNECT; + block_state.port.value |= OPER_FLAG_KILL; } break; @@ -4389,7 +4382,7 @@ yyreduce: #line 1271 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_SQUIT_REMOTE; + block_state.port.value |= OPER_FLAG_CONNECT_REMOTE; } break; @@ -4398,7 +4391,7 @@ yyreduce: #line 1275 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_SQUIT; + block_state.port.value |= OPER_FLAG_CONNECT; } break; @@ -4407,7 +4400,7 @@ yyreduce: #line 1279 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_K; + block_state.port.value |= OPER_FLAG_SQUIT_REMOTE; } break; @@ -4416,7 +4409,7 @@ yyreduce: #line 1283 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_UNKLINE; + block_state.port.value |= OPER_FLAG_SQUIT; } break; @@ -4425,7 +4418,7 @@ yyreduce: #line 1287 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_DLINE; + block_state.port.value |= OPER_FLAG_K; } break; @@ -4434,7 +4427,7 @@ yyreduce: #line 1291 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_UNDLINE; + block_state.port.value |= OPER_FLAG_UNKLINE; } break; @@ -4443,7 +4436,7 @@ yyreduce: #line 1295 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_X; + block_state.port.value |= OPER_FLAG_DLINE; } break; @@ -4452,7 +4445,7 @@ yyreduce: #line 1299 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_GLINE; + block_state.port.value |= OPER_FLAG_UNDLINE; } break; @@ -4461,7 +4454,7 @@ yyreduce: #line 1303 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_DIE; + block_state.port.value |= OPER_FLAG_X; } break; @@ -4470,7 +4463,7 @@ yyreduce: #line 1307 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_RESTART; + block_state.port.value |= OPER_FLAG_GLINE; } break; @@ -4479,7 +4472,7 @@ yyreduce: #line 1311 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_REHASH; + block_state.port.value |= OPER_FLAG_DIE; } break; @@ -4488,7 +4481,7 @@ yyreduce: #line 1315 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_ADMIN; + block_state.port.value |= OPER_FLAG_RESTART; } break; @@ -4497,7 +4490,7 @@ yyreduce: #line 1319 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_OPERWALL; + block_state.port.value |= OPER_FLAG_REHASH; } break; @@ -4506,7 +4499,7 @@ yyreduce: #line 1323 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_GLOBOPS; + block_state.port.value |= OPER_FLAG_ADMIN; } break; @@ -4515,7 +4508,7 @@ yyreduce: #line 1327 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_WALLOPS; + block_state.port.value |= OPER_FLAG_OPERWALL; } break; @@ -4524,7 +4517,7 @@ yyreduce: #line 1331 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_LOCOPS; + block_state.port.value |= OPER_FLAG_GLOBOPS; } break; @@ -4533,7 +4526,7 @@ yyreduce: #line 1335 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_REMOTEBAN; + block_state.port.value |= OPER_FLAG_WALLOPS; } break; @@ -4542,7 +4535,7 @@ yyreduce: #line 1339 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_SET; + block_state.port.value |= OPER_FLAG_LOCOPS; } break; @@ -4551,13 +4544,31 @@ yyreduce: #line 1343 "conf_parser.y" { if (conf_parser_ctx.pass == 2) - block_state.port.value |= OPER_FLAG_MODULE; + block_state.port.value |= OPER_FLAG_REMOTEBAN; } break; case 220: /* Line 1787 of yacc.c */ -#line 1353 "conf_parser.y" +#line 1347 "conf_parser.y" + { + if (conf_parser_ctx.pass == 2) + block_state.port.value |= OPER_FLAG_SET; +} + break; + + case 221: +/* Line 1787 of yacc.c */ +#line 1351 "conf_parser.y" + { + if (conf_parser_ctx.pass == 2) + block_state.port.value |= OPER_FLAG_MODULE; +} + break; + + case 222: +/* Line 1787 of yacc.c */ +#line 1361 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4572,9 +4583,9 @@ yyreduce: } break; - case 221: + case 223: /* Line 1787 of yacc.c */ -#line 1365 "conf_parser.y" +#line 1373 "conf_parser.y" { struct ClassItem *class = NULL; @@ -4624,90 +4635,90 @@ yyreduce: } break; - case 241: + case 243: /* Line 1787 of yacc.c */ -#line 1431 "conf_parser.y" +#line 1439 "conf_parser.y" { if (conf_parser_ctx.pass == 1) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 242: + case 244: /* Line 1787 of yacc.c */ -#line 1437 "conf_parser.y" +#line 1445 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.ping_freq.value = (yyvsp[(3) - (4)].number); } break; - case 243: + case 245: /* Line 1787 of yacc.c */ -#line 1443 "conf_parser.y" +#line 1451 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_perip.value = (yyvsp[(3) - (4)].number); } break; - case 244: + case 246: /* Line 1787 of yacc.c */ -#line 1449 "conf_parser.y" +#line 1457 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.con_freq.value = (yyvsp[(3) - (4)].number); } break; - case 245: + case 247: /* Line 1787 of yacc.c */ -#line 1455 "conf_parser.y" +#line 1463 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_total.value = (yyvsp[(3) - (4)].number); } break; - case 246: + case 248: /* Line 1787 of yacc.c */ -#line 1461 "conf_parser.y" +#line 1469 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_global.value = (yyvsp[(3) - (4)].number); } break; - case 247: + case 249: /* Line 1787 of yacc.c */ -#line 1467 "conf_parser.y" +#line 1475 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_local.value = (yyvsp[(3) - (4)].number); } break; - case 248: + case 250: /* Line 1787 of yacc.c */ -#line 1473 "conf_parser.y" +#line 1481 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_ident.value = (yyvsp[(3) - (4)].number); } break; - case 249: + case 251: /* Line 1787 of yacc.c */ -#line 1479 "conf_parser.y" +#line 1487 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.max_sendq.value = (yyvsp[(3) - (4)].number); } break; - case 250: + case 252: /* Line 1787 of yacc.c */ -#line 1485 "conf_parser.y" +#line 1493 "conf_parser.y" { if (conf_parser_ctx.pass == 1) if ((yyvsp[(3) - (4)].number) >= CLIENT_FLOOD_MIN && (yyvsp[(3) - (4)].number) <= CLIENT_FLOOD_MAX) @@ -4715,36 +4726,36 @@ yyreduce: } break; - case 251: + case 253: /* Line 1787 of yacc.c */ -#line 1492 "conf_parser.y" +#line 1500 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.cidr_bitlen_ipv4.value = (yyvsp[(3) - (4)].number) > 32 ? 32 : (yyvsp[(3) - (4)].number); } break; - case 252: + case 254: /* Line 1787 of yacc.c */ -#line 1498 "conf_parser.y" +#line 1506 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.cidr_bitlen_ipv6.value = (yyvsp[(3) - (4)].number) > 128 ? 128 : (yyvsp[(3) - (4)].number); } break; - case 253: + case 255: /* Line 1787 of yacc.c */ -#line 1504 "conf_parser.y" +#line 1512 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.number_per_cidr.value = (yyvsp[(3) - (4)].number); } break; - case 254: + case 256: /* Line 1787 of yacc.c */ -#line 1510 "conf_parser.y" +#line 1518 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4754,9 +4765,9 @@ yyreduce: } break; - case 255: + case 257: /* Line 1787 of yacc.c */ -#line 1519 "conf_parser.y" +#line 1527 "conf_parser.y" { if (conf_parser_ctx.pass != 1) break; @@ -4766,86 +4777,86 @@ yyreduce: } break; - case 256: + case 258: /* Line 1787 of yacc.c */ -#line 1528 "conf_parser.y" +#line 1536 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE; } break; - case 260: + case 262: /* Line 1787 of yacc.c */ -#line 1535 "conf_parser.y" +#line 1543 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE; } break; - case 261: + case 263: /* Line 1787 of yacc.c */ -#line 1539 "conf_parser.y" +#line 1547 "conf_parser.y" { if (conf_parser_ctx.pass == 1) block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS; } break; - case 262: + case 264: /* Line 1787 of yacc.c */ -#line 1549 "conf_parser.y" +#line 1557 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 264: + case 266: /* Line 1787 of yacc.c */ -#line 1555 "conf_parser.y" +#line 1563 "conf_parser.y" { block_state.flags.value = 0; } break; - case 268: + case 270: /* Line 1787 of yacc.c */ -#line 1561 "conf_parser.y" +#line 1569 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_SSL; } break; - case 269: + case 271: /* Line 1787 of yacc.c */ -#line 1565 "conf_parser.y" +#line 1573 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_HIDDEN; } break; - case 270: + case 272: /* Line 1787 of yacc.c */ -#line 1569 "conf_parser.y" +#line 1577 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= LISTENER_SERVER; } break; - case 278: + case 280: /* Line 1787 of yacc.c */ -#line 1577 "conf_parser.y" +#line 1585 "conf_parser.y" { block_state.flags.value = 0; } break; - case 282: + case 284: /* Line 1787 of yacc.c */ -#line 1582 "conf_parser.y" +#line 1590 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4862,9 +4873,9 @@ yyreduce: } break; - case 283: + case 285: /* Line 1787 of yacc.c */ -#line 1596 "conf_parser.y" +#line 1604 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4885,36 +4896,36 @@ yyreduce: } break; - case 284: + case 286: /* Line 1787 of yacc.c */ -#line 1616 "conf_parser.y" +#line 1624 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 285: + case 287: /* Line 1787 of yacc.c */ -#line 1622 "conf_parser.y" +#line 1630 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 286: + case 288: /* Line 1787 of yacc.c */ -#line 1631 "conf_parser.y" +#line 1639 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 287: + case 289: /* Line 1787 of yacc.c */ -#line 1635 "conf_parser.y" +#line 1643 "conf_parser.y" { dlink_node *ptr = NULL; @@ -4953,36 +4964,36 @@ yyreduce: } break; - case 299: + case 301: /* Line 1787 of yacc.c */ -#line 1678 "conf_parser.y" +#line 1686 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); } break; - case 300: + case 302: /* Line 1787 of yacc.c */ -#line 1684 "conf_parser.y" +#line 1692 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 301: + case 303: /* Line 1787 of yacc.c */ -#line 1690 "conf_parser.y" +#line 1698 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 302: + case 304: /* Line 1787 of yacc.c */ -#line 1696 "conf_parser.y" +#line 1704 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -4994,108 +5005,108 @@ yyreduce: } break; - case 303: + case 305: /* Line 1787 of yacc.c */ -#line 1707 "conf_parser.y" +#line 1715 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP); } break; - case 307: + case 309: /* Line 1787 of yacc.c */ -#line 1714 "conf_parser.y" +#line 1722 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE; } break; - case 308: + case 310: /* Line 1787 of yacc.c */ -#line 1718 "conf_parser.y" +#line 1726 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NOLIMIT; } break; - case 309: + case 311: /* Line 1787 of yacc.c */ -#line 1722 "conf_parser.y" +#line 1730 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE; } break; - case 310: + case 312: /* Line 1787 of yacc.c */ -#line 1726 "conf_parser.y" +#line 1734 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NEED_IDENTD; } break; - case 311: + case 313: /* Line 1787 of yacc.c */ -#line 1730 "conf_parser.y" +#line 1738 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_CAN_FLOOD; } break; - case 312: + case 314: /* Line 1787 of yacc.c */ -#line 1734 "conf_parser.y" +#line 1742 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NO_TILDE; } break; - case 313: + case 315: /* Line 1787 of yacc.c */ -#line 1738 "conf_parser.y" +#line 1746 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE; } break; - case 314: + case 316: /* Line 1787 of yacc.c */ -#line 1742 "conf_parser.y" +#line 1750 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_EXEMPTRESV; } break; - case 315: + case 317: /* Line 1787 of yacc.c */ -#line 1746 "conf_parser.y" +#line 1754 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_WEBIRC; } break; - case 316: + case 318: /* Line 1787 of yacc.c */ -#line 1750 "conf_parser.y" +#line 1758 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD; } break; - case 317: + case 319: /* Line 1787 of yacc.c */ -#line 1756 "conf_parser.y" +#line 1764 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5110,9 +5121,9 @@ yyreduce: } break; - case 318: + case 320: /* Line 1787 of yacc.c */ -#line 1770 "conf_parser.y" +#line 1778 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5122,9 +5133,9 @@ yyreduce: } break; - case 319: + case 321: /* Line 1787 of yacc.c */ -#line 1779 "conf_parser.y" +#line 1787 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5134,9 +5145,9 @@ yyreduce: } break; - case 320: + case 322: /* Line 1787 of yacc.c */ -#line 1792 "conf_parser.y" +#line 1800 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5146,9 +5157,9 @@ yyreduce: } break; - case 321: + case 323: /* Line 1787 of yacc.c */ -#line 1799 "conf_parser.y" +#line 1807 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5157,36 +5168,36 @@ yyreduce: } break; - case 328: + case 330: /* Line 1787 of yacc.c */ -#line 1810 "conf_parser.y" +#line 1818 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 329: + case 331: /* Line 1787 of yacc.c */ -#line 1816 "conf_parser.y" +#line 1824 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 330: + case 332: /* Line 1787 of yacc.c */ -#line 1822 "conf_parser.y" +#line 1830 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list); } break; - case 336: + case 338: /* Line 1787 of yacc.c */ -#line 1837 "conf_parser.y" +#line 1845 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5199,9 +5210,9 @@ yyreduce: } break; - case 337: + case 339: /* Line 1787 of yacc.c */ -#line 1852 "conf_parser.y" +#line 1860 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5215,9 +5226,9 @@ yyreduce: } break; - case 338: + case 340: /* Line 1787 of yacc.c */ -#line 1863 "conf_parser.y" +#line 1871 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5232,18 +5243,18 @@ yyreduce: } break; - case 345: + case 347: /* Line 1787 of yacc.c */ -#line 1880 "conf_parser.y" +#line 1888 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 346: + case 348: /* Line 1787 of yacc.c */ -#line 1886 "conf_parser.y" +#line 1894 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5263,108 +5274,108 @@ yyreduce: } break; - case 347: + case 349: /* Line 1787 of yacc.c */ -#line 1905 "conf_parser.y" +#line 1913 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = 0; } break; - case 351: + case 353: /* Line 1787 of yacc.c */ -#line 1912 "conf_parser.y" +#line 1920 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_KLINE; } break; - case 352: + case 354: /* Line 1787 of yacc.c */ -#line 1916 "conf_parser.y" +#line 1924 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNKLINE; } break; - case 353: + case 355: /* Line 1787 of yacc.c */ -#line 1920 "conf_parser.y" +#line 1928 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_DLINE; } break; - case 354: + case 356: /* Line 1787 of yacc.c */ -#line 1924 "conf_parser.y" +#line 1932 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNDLINE; } break; - case 355: + case 357: /* Line 1787 of yacc.c */ -#line 1928 "conf_parser.y" +#line 1936 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_XLINE; } break; - case 356: + case 358: /* Line 1787 of yacc.c */ -#line 1932 "conf_parser.y" +#line 1940 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNXLINE; } break; - case 357: + case 359: /* Line 1787 of yacc.c */ -#line 1936 "conf_parser.y" +#line 1944 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_RESV; } break; - case 358: + case 360: /* Line 1787 of yacc.c */ -#line 1940 "conf_parser.y" +#line 1948 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNRESV; } break; - case 359: + case 361: /* Line 1787 of yacc.c */ -#line 1944 "conf_parser.y" +#line 1952 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_LOCOPS; } break; - case 360: + case 362: /* Line 1787 of yacc.c */ -#line 1948 "conf_parser.y" +#line 1956 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = SHARED_ALL; } break; - case 361: + case 363: /* Line 1787 of yacc.c */ -#line 1957 "conf_parser.y" +#line 1965 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5376,9 +5387,9 @@ yyreduce: } break; - case 362: + case 364: /* Line 1787 of yacc.c */ -#line 1966 "conf_parser.y" +#line 1974 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5391,117 +5402,117 @@ yyreduce: } break; - case 368: + case 370: /* Line 1787 of yacc.c */ -#line 1981 "conf_parser.y" +#line 1989 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 369: + case 371: /* Line 1787 of yacc.c */ -#line 1987 "conf_parser.y" +#line 1995 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = 0; } break; - case 373: + case 375: /* Line 1787 of yacc.c */ -#line 1994 "conf_parser.y" +#line 2002 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_KLINE; } break; - case 374: + case 376: /* Line 1787 of yacc.c */ -#line 1998 "conf_parser.y" +#line 2006 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNKLINE; } break; - case 375: + case 377: /* Line 1787 of yacc.c */ -#line 2002 "conf_parser.y" +#line 2010 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_DLINE; } break; - case 376: + case 378: /* Line 1787 of yacc.c */ -#line 2006 "conf_parser.y" +#line 2014 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNDLINE; } break; - case 377: + case 379: /* Line 1787 of yacc.c */ -#line 2010 "conf_parser.y" +#line 2018 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_XLINE; } break; - case 378: + case 380: /* Line 1787 of yacc.c */ -#line 2014 "conf_parser.y" +#line 2022 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNXLINE; } break; - case 379: + case 381: /* Line 1787 of yacc.c */ -#line 2018 "conf_parser.y" +#line 2026 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_RESV; } break; - case 380: + case 382: /* Line 1787 of yacc.c */ -#line 2022 "conf_parser.y" +#line 2030 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_UNRESV; } break; - case 381: + case 383: /* Line 1787 of yacc.c */ -#line 2026 "conf_parser.y" +#line 2034 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= SHARED_LOCOPS; } break; - case 382: + case 384: /* Line 1787 of yacc.c */ -#line 2030 "conf_parser.y" +#line 2038 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value = SHARED_ALL; } break; - case 383: + case 385: /* Line 1787 of yacc.c */ -#line 2039 "conf_parser.y" +#line 2047 "conf_parser.y" { if (conf_parser_ctx.pass != 2) @@ -5512,9 +5523,9 @@ yyreduce: } break; - case 384: + case 386: /* Line 1787 of yacc.c */ -#line 2047 "conf_parser.y" +#line 2055 "conf_parser.y" { struct MaskItem *conf = NULL; struct addrinfo hints, *res; @@ -5578,36 +5589,36 @@ yyreduce: } break; - case 402: + case 404: /* Line 1787 of yacc.c */ -#line 2119 "conf_parser.y" +#line 2127 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 403: + case 405: /* Line 1787 of yacc.c */ -#line 2125 "conf_parser.y" +#line 2133 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf)); } break; - case 404: + case 406: /* Line 1787 of yacc.c */ -#line 2131 "conf_parser.y" +#line 2139 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf)); } break; - case 405: + case 407: /* Line 1787 of yacc.c */ -#line 2137 "conf_parser.y" +#line 2145 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5621,9 +5632,9 @@ yyreduce: } break; - case 406: + case 408: /* Line 1787 of yacc.c */ -#line 2150 "conf_parser.y" +#line 2158 "conf_parser.y" { if (conf_parser_ctx.pass != 2) break; @@ -5637,36 +5648,36 @@ yyreduce: } break; - case 407: + case 409: /* Line 1787 of yacc.c */ -#line 2163 "conf_parser.y" +#line 2171 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf)); } break; - case 408: + case 410: /* Line 1787 of yacc.c */ -#line 2169 "conf_parser.y" +#line 2177 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.port.value = (yyvsp[(3) - (4)].number); } break; - case 409: + case 411: /* Line 1787 of yacc.c */ -#line 2175 "conf_parser.y" +#line 2183 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.aftype.value = AF_INET; } break; - case 410: + case 412: /* Line 1787 of yacc.c */ -#line 2179 "conf_parser.y" +#line 2187 "conf_parser.y" { #ifdef IPV6 if (conf_parser_ctx.pass == 2) @@ -5675,35 +5686,35 @@ yyreduce: } break; - case 411: + case 413: /* Line 1787 of yacc.c */ -#line 2187 "conf_parser.y" +#line 2195 "conf_parser.y" { block_state.flags.value &= CONF_FLAGS_ENCRYPTED; } break; - case 415: + case 417: /* Line 1787 of yacc.c */ -#line 2193 "conf_parser.y" +#line 2201 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN; } break; - case 416: + case 418: /* Line 1787 of yacc.c */ -#line 2197 "conf_parser.y" +#line 2205 "conf_parser.y" { if (conf_parser_ctx.pass == 2) block_state.flags.value |= CONF_FLAGS_SSL; } break; - case 417: + case 419: /* Line 1787 of yacc.c */ -#line 2203 "conf_parser.y" +#line 2211 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5715,36 +5726,36 @@ yyreduce: } break; - case 418: + case 420: /* Line 1787 of yacc.c */ -#line 2214 "conf_parser.y" +#line 2222 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list); } break; - case 419: + case 421: /* Line 1787 of yacc.c */ -#line 2220 "conf_parser.y" +#line 2228 "conf_parser.y" { if (conf_parser_ctx.pass == 2) dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list); } break; - case 420: + case 422: /* Line 1787 of yacc.c */ -#line 2226 "conf_parser.y" +#line 2234 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf)); } break; - case 421: + case 423: /* Line 1787 of yacc.c */ -#line 2232 "conf_parser.y" +#line 2240 "conf_parser.y" { #ifdef HAVE_LIBCRYPTO if (conf_parser_ctx.pass == 2) @@ -5756,18 +5767,18 @@ yyreduce: } break; - case 422: + case 424: /* Line 1787 of yacc.c */ -#line 2247 "conf_parser.y" +#line 2255 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 423: + case 425: /* Line 1787 of yacc.c */ -#line 2251 "conf_parser.y" +#line 2259 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5790,9 +5801,9 @@ yyreduce: } break; - case 429: + case 431: /* Line 1787 of yacc.c */ -#line 2276 "conf_parser.y" +#line 2284 "conf_parser.y" { if (conf_parser_ctx.pass == 2) @@ -5813,27 +5824,27 @@ yyreduce: } break; - case 430: + case 432: /* Line 1787 of yacc.c */ -#line 2296 "conf_parser.y" +#line 2304 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 431: + case 433: /* Line 1787 of yacc.c */ -#line 2305 "conf_parser.y" +#line 2313 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 432: + case 434: /* Line 1787 of yacc.c */ -#line 2309 "conf_parser.y" +#line 2317 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5857,27 +5868,27 @@ yyreduce: } break; - case 438: + case 440: /* Line 1787 of yacc.c */ -#line 2335 "conf_parser.y" +#line 2343 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf)); } break; - case 439: + case 441: /* Line 1787 of yacc.c */ -#line 2341 "conf_parser.y" +#line 2349 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 445: + case 447: /* Line 1787 of yacc.c */ -#line 2355 "conf_parser.y" +#line 2363 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -5892,18 +5903,18 @@ yyreduce: } break; - case 446: + case 448: /* Line 1787 of yacc.c */ -#line 2372 "conf_parser.y" +#line 2380 "conf_parser.y" { if (conf_parser_ctx.pass == 2) reset_block_state(); } break; - case 447: + case 449: /* Line 1787 of yacc.c */ -#line 2376 "conf_parser.y" +#line 2384 "conf_parser.y" { struct MaskItem *conf = NULL; @@ -5923,184 +5934,184 @@ yyreduce: } break; - case 453: + case 455: /* Line 1787 of yacc.c */ -#line 2398 "conf_parser.y" +#line 2406 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf)); } break; - case 454: + case 456: /* Line 1787 of yacc.c */ -#line 2404 "conf_parser.y" +#line 2412 "conf_parser.y" { if (conf_parser_ctx.pass == 2) strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf)); } break; - case 508: + case 510: /* Line 1787 of yacc.c */ -#line 2449 "conf_parser.y" +#line 2457 "conf_parser.y" { ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number); } break; - case 509: + case 511: /* Line 1787 of yacc.c */ -#line 2454 "conf_parser.y" +#line 2462 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.cycle_on_host_change = yylval.number; } break; - case 510: + case 512: /* Line 1787 of yacc.c */ -#line 2460 "conf_parser.y" +#line 2468 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.glines = yylval.number; } break; - case 511: + case 513: /* Line 1787 of yacc.c */ -#line 2466 "conf_parser.y" +#line 2474 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number); } break; - case 512: + case 514: /* Line 1787 of yacc.c */ -#line 2472 "conf_parser.y" +#line 2480 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number); } break; - case 513: + case 515: /* Line 1787 of yacc.c */ -#line 2478 "conf_parser.y" +#line 2486 "conf_parser.y" { ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number); } break; - case 514: + case 516: /* Line 1787 of yacc.c */ -#line 2483 "conf_parser.y" +#line 2491 "conf_parser.y" { ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number); } break; - case 515: + case 517: /* Line 1787 of yacc.c */ -#line 2488 "conf_parser.y" +#line 2496 "conf_parser.y" { ConfigFileEntry.tkline_expire_notices = yylval.number; } break; - case 516: + case 518: /* Line 1787 of yacc.c */ -#line 2493 "conf_parser.y" +#line 2501 "conf_parser.y" { ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number); } break; - case 517: + case 519: /* Line 1787 of yacc.c */ -#line 2498 "conf_parser.y" +#line 2506 "conf_parser.y" { ConfigFileEntry.hide_spoof_ips = yylval.number; } break; - case 518: + case 520: /* Line 1787 of yacc.c */ -#line 2503 "conf_parser.y" +#line 2511 "conf_parser.y" { ConfigFileEntry.ignore_bogus_ts = yylval.number; } break; - case 519: + case 521: /* Line 1787 of yacc.c */ -#line 2508 "conf_parser.y" +#line 2516 "conf_parser.y" { ConfigFileEntry.failed_oper_notice = yylval.number; } break; - case 520: + case 522: /* Line 1787 of yacc.c */ -#line 2513 "conf_parser.y" +#line 2521 "conf_parser.y" { ConfigFileEntry.anti_nick_flood = yylval.number; } break; - case 521: + case 523: /* Line 1787 of yacc.c */ -#line 2518 "conf_parser.y" +#line 2526 "conf_parser.y" { ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); } break; - case 522: + case 524: /* Line 1787 of yacc.c */ -#line 2523 "conf_parser.y" +#line 2531 "conf_parser.y" { ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number); } break; - case 523: + case 525: /* Line 1787 of yacc.c */ -#line 2528 "conf_parser.y" +#line 2536 "conf_parser.y" { ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number); } break; - case 524: + case 526: /* Line 1787 of yacc.c */ -#line 2533 "conf_parser.y" +#line 2541 "conf_parser.y" { ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number); } break; - case 525: + case 527: /* Line 1787 of yacc.c */ -#line 2538 "conf_parser.y" +#line 2546 "conf_parser.y" { ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number); } break; - case 526: + case 528: /* Line 1787 of yacc.c */ -#line 2543 "conf_parser.y" +#line 2551 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number); } break; - case 527: + case 529: /* Line 1787 of yacc.c */ -#line 2549 "conf_parser.y" +#line 2557 "conf_parser.y" { if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1) { @@ -6112,177 +6123,177 @@ yyreduce: } break; - case 528: + case 530: /* Line 1787 of yacc.c */ -#line 2560 "conf_parser.y" +#line 2568 "conf_parser.y" { ConfigFileEntry.invisible_on_connect = yylval.number; } break; - case 529: + case 531: /* Line 1787 of yacc.c */ -#line 2565 "conf_parser.y" +#line 2573 "conf_parser.y" { ConfigFileEntry.warn_no_nline = yylval.number; } break; - case 530: + case 532: /* Line 1787 of yacc.c */ -#line 2570 "conf_parser.y" +#line 2578 "conf_parser.y" { ConfigFileEntry.stats_e_disabled = yylval.number; } break; - case 531: + case 533: /* Line 1787 of yacc.c */ -#line 2575 "conf_parser.y" +#line 2583 "conf_parser.y" { ConfigFileEntry.stats_o_oper_only = yylval.number; } break; - case 532: + case 534: /* Line 1787 of yacc.c */ -#line 2580 "conf_parser.y" +#line 2588 "conf_parser.y" { ConfigFileEntry.stats_P_oper_only = yylval.number; } break; - case 533: + case 535: /* Line 1787 of yacc.c */ -#line 2585 "conf_parser.y" +#line 2593 "conf_parser.y" { ConfigFileEntry.stats_u_oper_only = yylval.number; } break; - case 534: + case 536: /* Line 1787 of yacc.c */ -#line 2590 "conf_parser.y" +#line 2598 "conf_parser.y" { ConfigFileEntry.stats_k_oper_only = 2 * yylval.number; } break; - case 535: + case 537: /* Line 1787 of yacc.c */ -#line 2593 "conf_parser.y" +#line 2601 "conf_parser.y" { ConfigFileEntry.stats_k_oper_only = 1; } break; - case 536: + case 538: /* Line 1787 of yacc.c */ -#line 2598 "conf_parser.y" +#line 2606 "conf_parser.y" { ConfigFileEntry.stats_i_oper_only = 2 * yylval.number; } break; - case 537: + case 539: /* Line 1787 of yacc.c */ -#line 2601 "conf_parser.y" +#line 2609 "conf_parser.y" { ConfigFileEntry.stats_i_oper_only = 1; } break; - case 538: + case 540: /* Line 1787 of yacc.c */ -#line 2606 "conf_parser.y" +#line 2614 "conf_parser.y" { ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number); } break; - case 539: + case 541: /* Line 1787 of yacc.c */ -#line 2611 "conf_parser.y" +#line 2619 "conf_parser.y" { ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number); } break; - case 540: + case 542: /* Line 1787 of yacc.c */ -#line 2616 "conf_parser.y" +#line 2624 "conf_parser.y" { ConfigFileEntry.opers_bypass_callerid = yylval.number; } break; - case 541: + case 543: /* Line 1787 of yacc.c */ -#line 2621 "conf_parser.y" +#line 2629 "conf_parser.y" { ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number); } break; - case 542: + case 544: /* Line 1787 of yacc.c */ -#line 2626 "conf_parser.y" +#line 2634 "conf_parser.y" { ConfigFileEntry.short_motd = yylval.number; } break; - case 543: + case 545: /* Line 1787 of yacc.c */ -#line 2631 "conf_parser.y" +#line 2639 "conf_parser.y" { ConfigFileEntry.no_oper_flood = yylval.number; } break; - case 544: + case 546: /* Line 1787 of yacc.c */ -#line 2636 "conf_parser.y" +#line 2644 "conf_parser.y" { ConfigFileEntry.true_no_oper_flood = yylval.number; } break; - case 545: + case 547: /* Line 1787 of yacc.c */ -#line 2641 "conf_parser.y" +#line 2649 "conf_parser.y" { ConfigFileEntry.oper_pass_resv = yylval.number; } break; - case 546: + case 548: /* Line 1787 of yacc.c */ -#line 2646 "conf_parser.y" +#line 2654 "conf_parser.y" { ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number); } break; - case 547: + case 549: /* Line 1787 of yacc.c */ -#line 2651 "conf_parser.y" +#line 2659 "conf_parser.y" { ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number); } break; - case 548: + case 550: /* Line 1787 of yacc.c */ -#line 2656 "conf_parser.y" +#line 2664 "conf_parser.y" { ConfigFileEntry.use_egd = yylval.number; } break; - case 549: + case 551: /* Line 1787 of yacc.c */ -#line 2661 "conf_parser.y" +#line 2669 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6292,9 +6303,9 @@ yyreduce: } break; - case 550: + case 552: /* Line 1787 of yacc.c */ -#line 2670 "conf_parser.y" +#line 2678 "conf_parser.y" { if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string)) { @@ -6304,541 +6315,541 @@ yyreduce: } break; - case 551: + case 553: /* Line 1787 of yacc.c */ -#line 2679 "conf_parser.y" +#line 2687 "conf_parser.y" { ConfigFileEntry.ping_cookie = yylval.number; } break; - case 552: + case 554: /* Line 1787 of yacc.c */ -#line 2684 "conf_parser.y" +#line 2692 "conf_parser.y" { ConfigFileEntry.disable_auth = yylval.number; } break; - case 553: + case 555: /* Line 1787 of yacc.c */ -#line 2689 "conf_parser.y" +#line 2697 "conf_parser.y" { ConfigFileEntry.throttle_time = yylval.number; } break; - case 554: + case 556: /* Line 1787 of yacc.c */ -#line 2694 "conf_parser.y" +#line 2702 "conf_parser.y" { ConfigFileEntry.oper_umodes = 0; } break; - case 558: + case 560: /* Line 1787 of yacc.c */ -#line 2700 "conf_parser.y" +#line 2708 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_BOTS; } break; - case 559: + case 561: /* Line 1787 of yacc.c */ -#line 2703 "conf_parser.y" +#line 2711 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CCONN; } break; - case 560: + case 562: /* Line 1787 of yacc.c */ -#line 2706 "conf_parser.y" +#line 2714 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_DEAF; } break; - case 561: + case 563: /* Line 1787 of yacc.c */ -#line 2709 "conf_parser.y" +#line 2717 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_DEBUG; } break; - case 562: + case 564: /* Line 1787 of yacc.c */ -#line 2712 "conf_parser.y" +#line 2720 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_FULL; } break; - case 563: + case 565: /* Line 1787 of yacc.c */ -#line 2715 "conf_parser.y" +#line 2723 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_HIDDEN; } break; - case 564: + case 566: /* Line 1787 of yacc.c */ -#line 2718 "conf_parser.y" +#line 2726 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SKILL; } break; - case 565: + case 567: /* Line 1787 of yacc.c */ -#line 2721 "conf_parser.y" +#line 2729 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_NCHANGE; } break; - case 566: + case 568: /* Line 1787 of yacc.c */ -#line 2724 "conf_parser.y" +#line 2732 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_REJ; } break; - case 567: + case 569: /* Line 1787 of yacc.c */ -#line 2727 "conf_parser.y" +#line 2735 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_UNAUTH; } break; - case 568: + case 570: /* Line 1787 of yacc.c */ -#line 2730 "conf_parser.y" +#line 2738 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SPY; } break; - case 569: + case 571: /* Line 1787 of yacc.c */ -#line 2733 "conf_parser.y" +#line 2741 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL; } break; - case 570: + case 572: /* Line 1787 of yacc.c */ -#line 2736 "conf_parser.y" +#line 2744 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_OPERWALL; } break; - case 571: + case 573: /* Line 1787 of yacc.c */ -#line 2739 "conf_parser.y" +#line 2747 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE; } break; - case 572: + case 574: /* Line 1787 of yacc.c */ -#line 2742 "conf_parser.y" +#line 2750 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE; } break; - case 573: + case 575: /* Line 1787 of yacc.c */ -#line 2745 "conf_parser.y" +#line 2753 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_WALLOP; } break; - case 574: + case 576: /* Line 1787 of yacc.c */ -#line 2748 "conf_parser.y" +#line 2756 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID; } break; - case 575: + case 577: /* Line 1787 of yacc.c */ -#line 2751 "conf_parser.y" +#line 2759 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_CALLERID; } break; - case 576: + case 578: /* Line 1787 of yacc.c */ -#line 2754 "conf_parser.y" +#line 2762 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_LOCOPS; } break; - case 577: + case 579: /* Line 1787 of yacc.c */ -#line 2757 "conf_parser.y" +#line 2765 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_REGONLY; } break; - case 578: + case 580: /* Line 1787 of yacc.c */ -#line 2760 "conf_parser.y" +#line 2768 "conf_parser.y" { ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT; } break; - case 579: + case 581: /* Line 1787 of yacc.c */ -#line 2765 "conf_parser.y" +#line 2773 "conf_parser.y" { ConfigFileEntry.oper_only_umodes = 0; } break; - case 583: + case 585: /* Line 1787 of yacc.c */ -#line 2771 "conf_parser.y" +#line 2779 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_BOTS; } break; - case 584: + case 586: /* Line 1787 of yacc.c */ -#line 2774 "conf_parser.y" +#line 2782 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CCONN; } break; - case 585: + case 587: /* Line 1787 of yacc.c */ -#line 2777 "conf_parser.y" +#line 2785 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_DEAF; } break; - case 586: + case 588: /* Line 1787 of yacc.c */ -#line 2780 "conf_parser.y" +#line 2788 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG; } break; - case 587: + case 589: /* Line 1787 of yacc.c */ -#line 2783 "conf_parser.y" +#line 2791 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_FULL; } break; - case 588: + case 590: /* Line 1787 of yacc.c */ -#line 2786 "conf_parser.y" +#line 2794 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SKILL; } break; - case 589: + case 591: /* Line 1787 of yacc.c */ -#line 2789 "conf_parser.y" +#line 2797 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN; } break; - case 590: + case 592: /* Line 1787 of yacc.c */ -#line 2792 "conf_parser.y" +#line 2800 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE; } break; - case 591: + case 593: /* Line 1787 of yacc.c */ -#line 2795 "conf_parser.y" +#line 2803 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_REJ; } break; - case 592: + case 594: /* Line 1787 of yacc.c */ -#line 2798 "conf_parser.y" +#line 2806 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH; } break; - case 593: + case 595: /* Line 1787 of yacc.c */ -#line 2801 "conf_parser.y" +#line 2809 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SPY; } break; - case 594: + case 596: /* Line 1787 of yacc.c */ -#line 2804 "conf_parser.y" +#line 2812 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL; } break; - case 595: + case 597: /* Line 1787 of yacc.c */ -#line 2807 "conf_parser.y" +#line 2815 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL; } break; - case 596: + case 598: /* Line 1787 of yacc.c */ -#line 2810 "conf_parser.y" +#line 2818 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE; } break; - case 597: + case 599: /* Line 1787 of yacc.c */ -#line 2813 "conf_parser.y" +#line 2821 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE; } break; - case 598: + case 600: /* Line 1787 of yacc.c */ -#line 2816 "conf_parser.y" +#line 2824 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP; } break; - case 599: + case 601: /* Line 1787 of yacc.c */ -#line 2819 "conf_parser.y" +#line 2827 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID; } break; - case 600: + case 602: /* Line 1787 of yacc.c */ -#line 2822 "conf_parser.y" +#line 2830 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID; } break; - case 601: + case 603: /* Line 1787 of yacc.c */ -#line 2825 "conf_parser.y" +#line 2833 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS; } break; - case 602: + case 604: /* Line 1787 of yacc.c */ -#line 2828 "conf_parser.y" +#line 2836 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY; } break; - case 603: + case 605: /* Line 1787 of yacc.c */ -#line 2831 "conf_parser.y" +#line 2839 "conf_parser.y" { ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT; } break; - case 604: + case 606: /* Line 1787 of yacc.c */ -#line 2836 "conf_parser.y" +#line 2844 "conf_parser.y" { ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number); } break; - case 605: + case 607: /* Line 1787 of yacc.c */ -#line 2841 "conf_parser.y" +#line 2849 "conf_parser.y" { ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number); } break; - case 606: + case 608: /* Line 1787 of yacc.c */ -#line 2846 "conf_parser.y" +#line 2854 "conf_parser.y" { ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number); } break; - case 623: + case 625: /* Line 1787 of yacc.c */ -#line 2869 "conf_parser.y" +#line 2877 "conf_parser.y" { ConfigChannel.disable_fake_channels = yylval.number; } break; - case 624: + case 626: /* Line 1787 of yacc.c */ -#line 2874 "conf_parser.y" +#line 2882 "conf_parser.y" { ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number); } break; - case 625: + case 627: /* Line 1787 of yacc.c */ -#line 2879 "conf_parser.y" +#line 2887 "conf_parser.y" { ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number); } break; - case 626: + case 628: /* Line 1787 of yacc.c */ -#line 2884 "conf_parser.y" +#line 2892 "conf_parser.y" { ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number); } break; - case 627: + case 629: /* Line 1787 of yacc.c */ -#line 2889 "conf_parser.y" +#line 2897 "conf_parser.y" { ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number); } break; - case 628: + case 630: /* Line 1787 of yacc.c */ -#line 2894 "conf_parser.y" +#line 2902 "conf_parser.y" { ConfigChannel.max_bans = (yyvsp[(3) - (4)].number); } break; - case 629: + case 631: /* Line 1787 of yacc.c */ -#line 2899 "conf_parser.y" +#line 2907 "conf_parser.y" { ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number); } break; - case 630: + case 632: /* Line 1787 of yacc.c */ -#line 2904 "conf_parser.y" +#line 2912 "conf_parser.y" { ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number); } break; - case 631: + case 633: /* Line 1787 of yacc.c */ -#line 2909 "conf_parser.y" +#line 2917 "conf_parser.y" { ConfigChannel.no_create_on_split = yylval.number; } break; - case 632: + case 634: /* Line 1787 of yacc.c */ -#line 2914 "conf_parser.y" +#line 2922 "conf_parser.y" { ConfigChannel.no_join_on_split = yylval.number; } break; - case 633: + case 635: /* Line 1787 of yacc.c */ -#line 2919 "conf_parser.y" +#line 2927 "conf_parser.y" { GlobalSetOptions.joinfloodcount = yylval.number; } break; - case 634: + case 636: /* Line 1787 of yacc.c */ -#line 2924 "conf_parser.y" +#line 2932 "conf_parser.y" { GlobalSetOptions.joinfloodtime = yylval.number; } break; - case 647: + case 649: /* Line 1787 of yacc.c */ -#line 2944 "conf_parser.y" +#line 2952 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.flatten_links = yylval.number; } break; - case 648: + case 650: /* Line 1787 of yacc.c */ -#line 2950 "conf_parser.y" +#line 2958 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.disable_remote_commands = yylval.number; } break; - case 649: + case 651: /* Line 1787 of yacc.c */ -#line 2956 "conf_parser.y" +#line 2964 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_servers = yylval.number; } break; - case 650: + case 652: /* Line 1787 of yacc.c */ -#line 2962 "conf_parser.y" +#line 2970 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_services = yylval.number; } break; - case 651: + case 653: /* Line 1787 of yacc.c */ -#line 2968 "conf_parser.y" +#line 2976 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6848,9 +6859,9 @@ yyreduce: } break; - case 652: + case 654: /* Line 1787 of yacc.c */ -#line 2977 "conf_parser.y" +#line 2985 "conf_parser.y" { if (conf_parser_ctx.pass == 2) { @@ -6865,18 +6876,18 @@ yyreduce: } break; - case 653: + case 655: /* Line 1787 of yacc.c */ -#line 2991 "conf_parser.y" +#line 2999 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hidden = yylval.number; } break; - case 654: + case 656: /* Line 1787 of yacc.c */ -#line 2997 "conf_parser.y" +#line 3005 "conf_parser.y" { if (conf_parser_ctx.pass == 2) ConfigServerHide.hide_server_ips = yylval.number; @@ -6885,7 +6896,7 @@ yyreduce: /* Line 1787 of yacc.c */ -#line 6889 "conf_parser.c" +#line 6900 "conf_parser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires diff --git a/src/conf_parser.y b/src/conf_parser.y index 0ebbd51..ef4285f 100644 --- a/src/conf_parser.y +++ b/src/conf_parser.y @@ -984,6 +984,14 @@ logging_file_type_item: USER { if (conf_parser_ctx.pass == 2) block_state.type.value = LOG_TYPE_GLINE; +} | XLINE +{ + if (conf_parser_ctx.pass == 2) + block_state.type.value = LOG_TYPE_XLINE; +} | RESV +{ + if (conf_parser_ctx.pass == 2) + block_state.type.value = LOG_TYPE_RESV; } | T_DLINE { if (conf_parser_ctx.pass == 2) |