summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS4
-rw-r--r--doc/reference.conf9
-rw-r--r--include/conf.h2
-rw-r--r--modules/m_admin.c2
-rw-r--r--modules/m_info.c4
-rw-r--r--modules/m_links.c2
-rw-r--r--modules/m_lusers.c2
-rw-r--r--modules/m_motd.c2
-rw-r--r--modules/m_ping.c2
-rw-r--r--modules/m_stats.c4
-rw-r--r--modules/m_time.c2
-rw-r--r--modules/m_users.c2
-rw-r--r--modules/m_version.c2
-rw-r--r--modules/m_whois.c2
-rw-r--r--src/conf.c2
-rw-r--r--src/conf_parser.c1687
-rw-r--r--src/conf_parser.y15
17 files changed, 877 insertions, 868 deletions
diff --git a/NEWS b/NEWS
index 1e35916..25f63d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
-- ircd-hybrid-8.1.1 Release Notes
+########################################################################
+o) IMPORTANT: moved disable_remote_command configuration directive from
+ general{} block to serverhide{] block
+########################################################################
o) Fixed bug where opers could see LOCOPS messages even if they don't have
the +l mode set
o) Fixed bug where non-SSL clients could join +S channels on non-SSL servers
diff --git a/doc/reference.conf b/doc/reference.conf
index b976149..64f49d0 100644
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -848,6 +848,12 @@ channel {
*/
serverhide {
/*
+ * disable_remote_commands: disable users doing commands
+ * on remote servers.
+ */
+ disable_remote_commands = no;
+
+ /*
* flatten_links: this option will show all servers in /links appear
* that they are linked to this current server.
*/
@@ -968,9 +974,6 @@ general {
*/
disable_auth = no;
- /* disable_remote_commands: disable users doing commands on remote servers. */
- disable_remote_commands = no;
-
/*
* tkline_expire_notices: enables or disables temporary kline/xline
* expire notices.
diff --git a/include/conf.h b/include/conf.h
index 910ed86..25c4176 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -259,7 +259,6 @@ struct config_file_entry
int use_egd;
int ping_cookie;
int disable_auth;
- int disable_remote;
};
struct config_channel_entry
@@ -280,6 +279,7 @@ struct config_server_hide
{
char *hidden_name;
int flatten_links;
+ int disable_remote_commands;
int hide_servers;
int hide_services;
int links_delay;
diff --git a/modules/m_admin.c b/modules/m_admin.c
index 9db6fa9..0abecff 100644
--- a/modules/m_admin.c
+++ b/modules/m_admin.c
@@ -95,7 +95,7 @@ m_admin(struct Client *client_p, struct Client *source_p,
last_used = CurrentTime;
- if (!ConfigFileEntry.disable_remote)
+ if (!ConfigServerHide.disable_remote_commands)
if (hunt_server(client_p, source_p, ":%s ADMIN :%s", 1,
parc, parv) != HUNTED_ISME)
return;
diff --git a/modules/m_info.c b/modules/m_info.c
index 5cf4a5b..111920c 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -291,7 +291,7 @@ static const struct InfoStruct info_table[] =
{
"disable_remote_commands",
OUTPUT_BOOLEAN_YN,
- &ConfigFileEntry.disable_remote,
+ &ConfigServerHide.disable_remote_commands,
"Prevent users issuing commands on remote servers"
},
{
@@ -695,7 +695,7 @@ m_info(struct Client *client_p, struct Client *source_p,
last_used = CurrentTime;
- if (!ConfigFileEntry.disable_remote)
+ if (!ConfigServerHide.disable_remote_commands)
if (hunt_server(client_p,source_p, ":%s INFO :%s", 1,
parc, parv) != HUNTED_ISME)
return;
diff --git a/modules/m_links.c b/modules/m_links.c
index e0fe286..dade049 100644
--- a/modules/m_links.c
+++ b/modules/m_links.c
@@ -111,7 +111,7 @@ mo_links(struct Client *client_p, struct Client *source_p,
int parc, char *parv[])
{
if (parc > 2)
- if (!ConfigFileEntry.disable_remote || HasUMode(source_p, UMODE_OPER))
+ if (!ConfigServerHide.disable_remote_commands || HasUMode(source_p, UMODE_OPER))
if (hunt_server(client_p, source_p, ":%s LINKS %s :%s", 1,
parc, parv) != HUNTED_ISME)
return;
diff --git a/modules/m_lusers.c b/modules/m_lusers.c
index c7c41c5..40a7bdf 100644
--- a/modules/m_lusers.c
+++ b/modules/m_lusers.c
@@ -59,7 +59,7 @@ m_lusers(struct Client *client_p, struct Client *source_p,
last_used = CurrentTime;
- if (parc > 2 && !ConfigFileEntry.disable_remote)
+ if (parc > 2 && !ConfigServerHide.disable_remote_commands)
if (hunt_server(client_p, source_p, ":%s LUSERS %s :%s", 2,
parc, parv) != HUNTED_ISME)
return;
diff --git a/modules/m_motd.c b/modules/m_motd.c
index 4f30eb7..9dcc231 100644
--- a/modules/m_motd.c
+++ b/modules/m_motd.c
@@ -67,7 +67,7 @@ m_motd(struct Client *client_p, struct Client *source_p,
last_used = CurrentTime;
/* This is safe enough to use during non hidden server mode */
- if (!ConfigFileEntry.disable_remote && !ConfigServerHide.hide_servers)
+ if (!ConfigServerHide.disable_remote_commands && !ConfigServerHide.hide_servers)
if (hunt_server(client_p, source_p, ":%s MOTD :%s", 1,
parc, parv) != HUNTED_ISME)
return;
diff --git a/modules/m_ping.c b/modules/m_ping.c
index 520b00a..cec3596 100644
--- a/modules/m_ping.c
+++ b/modules/m_ping.c
@@ -58,7 +58,7 @@ m_ping(struct Client *client_p, struct Client *source_p,
origin = parv[1];
destination = parv[2]; /* Will get NULL or pointer (parc >= 2!!) */
- if (ConfigFileEntry.disable_remote && !HasUMode(source_p, UMODE_OPER))
+ if (ConfigServerHide.disable_remote_commands && !HasUMode(source_p, UMODE_OPER))
{
sendto_one(source_p, ":%s PONG %s :%s", me.name,
(destination) ? destination : me.name, origin);
diff --git a/modules/m_stats.c b/modules/m_stats.c
index 9d8474c..28e4342 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -1241,7 +1241,7 @@ stats_uptime(struct Client *source_p, int parc, char *parv[])
sendto_one(source_p, form_str(RPL_STATSUPTIME), from, to,
now / 86400, (now / 3600) % 24, (now / 60) % 60, now % 60);
- if (!ConfigFileEntry.disable_remote || HasUMode(source_p, UMODE_OPER))
+ if (!ConfigServerHide.disable_remote_commands || HasUMode(source_p, UMODE_OPER))
sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
}
@@ -1632,7 +1632,7 @@ m_stats(struct Client *client_p, struct Client *source_p,
static time_t last_used = 0;
/* Is the stats meant for us? */
- if (!ConfigFileEntry.disable_remote)
+ if (!ConfigServerHide.disable_remote_commands)
if (hunt_server(client_p, source_p, ":%s STATS %s :%s", 2,
parc, parv) != HUNTED_ISME)
return;
diff --git a/modules/m_time.c b/modules/m_time.c
index 14705c6..3e9a0df 100644
--- a/modules/m_time.c
+++ b/modules/m_time.c
@@ -49,7 +49,7 @@ m_time(struct Client *client_p, struct Client *source_p,
flood_endgrace(source_p);
/* This is safe enough to use during non hidden server mode */
- if (!ConfigFileEntry.disable_remote)
+ if (!ConfigServerHide.disable_remote_commands)
if (hunt_server(client_p, source_p, ":%s TIME :%s", 1, parc, parv) != HUNTED_ISME)
return;
diff --git a/modules/m_users.c b/modules/m_users.c
index fb0a92a..06c8200 100644
--- a/modules/m_users.c
+++ b/modules/m_users.c
@@ -53,7 +53,7 @@ m_users(struct Client *client_p, struct Client *source_p,
last_used = CurrentTime;
- if (!ConfigFileEntry.disable_remote)
+ if (!ConfigServerHide.disable_remote_commands)
if (hunt_server(client_p, source_p, ":%s USERS :%s", 1,
parc, parv) != HUNTED_ISME)
return;
diff --git a/modules/m_version.c b/modules/m_version.c
index d9e689a..a2d62d6 100644
--- a/modules/m_version.c
+++ b/modules/m_version.c
@@ -69,7 +69,7 @@ m_version(struct Client *client_p, struct Client *source_p,
last_used = CurrentTime;
- if (!ConfigFileEntry.disable_remote)
+ if (!ConfigServerHide.disable_remote_commands)
if (hunt_server(client_p, source_p, ":%s VERSION :%s",
1, parc, parv) != HUNTED_ISME)
return;
diff --git a/modules/m_whois.c b/modules/m_whois.c
index a1e736c..b71806c 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -221,7 +221,7 @@ m_whois(struct Client *client_p, struct Client *source_p,
* server, or our server.. I dont see why they would need to ask
* anything else for info about the client.. --fl_
*/
- if (ConfigFileEntry.disable_remote)
+ if (ConfigServerHide.disable_remote_commands)
parv[1] = parv[2];
if (hunt_server(client_p, source_p, ":%s WHOIS %s :%s", 1,
diff --git a/src/conf.c b/src/conf.c
index eddb747..e6c5275 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1116,6 +1116,7 @@ set_default_conf(void)
ConfigServerHide.hide_services = 0;
ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
ConfigServerHide.hide_server_ips = 0;
+ ConfigServerHide.disable_remote_commands = 0;
ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
@@ -1130,7 +1131,6 @@ set_default_conf(void)
ConfigFileEntry.hide_spoof_ips = 1;
ConfigFileEntry.ignore_bogus_ts = 0;
ConfigFileEntry.disable_auth = 0;
- ConfigFileEntry.disable_remote = 0;
ConfigFileEntry.kill_chase_time_limit = 90;
ConfigFileEntry.default_floodcount = 8;
ConfigFileEntry.failed_oper_notice = 1;
diff --git a/src/conf_parser.c b/src/conf_parser.c
index 6393429..130b5bb 100644
--- a/src/conf_parser.c
+++ b/src/conf_parser.c
@@ -928,7 +928,7 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1228
+#define YYLAST 1225
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 229
@@ -1054,20 +1054,20 @@ static const yytype_uint16 yyprhs[] =
1392, 1394, 1396, 1398, 1400, 1402, 1404, 1406, 1408, 1410,
1412, 1414, 1416, 1418, 1420, 1422, 1424, 1426, 1428, 1430,
1432, 1434, 1436, 1438, 1440, 1442, 1444, 1446, 1448, 1450,
- 1452, 1454, 1459, 1464, 1469, 1474, 1479, 1484, 1489, 1494,
- 1499, 1504, 1509, 1514, 1519, 1524, 1529, 1534, 1539, 1544,
- 1549, 1554, 1559, 1564, 1569, 1574, 1579, 1584, 1589, 1594,
- 1599, 1604, 1609, 1614, 1619, 1624, 1629, 1634, 1639, 1644,
- 1649, 1654, 1659, 1664, 1669, 1674, 1679, 1680, 1686, 1690,
- 1692, 1694, 1696, 1698, 1700, 1702, 1704, 1706, 1708, 1710,
- 1712, 1714, 1716, 1718, 1720, 1722, 1724, 1726, 1728, 1730,
- 1732, 1734, 1735, 1741, 1745, 1747, 1749, 1751, 1753, 1755,
- 1757, 1759, 1761, 1763, 1765, 1767, 1769, 1771, 1773, 1775,
- 1777, 1779, 1781, 1783, 1785, 1787, 1789, 1794, 1799, 1804,
- 1810, 1813, 1815, 1817, 1819, 1821, 1823, 1825, 1827, 1829,
- 1831, 1833, 1835, 1837, 1839, 1841, 1846, 1851, 1856, 1861,
- 1866, 1871, 1876, 1881, 1886, 1891, 1896, 1901, 1907, 1910,
- 1912, 1914, 1916, 1918, 1920, 1922, 1924, 1926, 1928, 1933,
+ 1452, 1457, 1462, 1467, 1472, 1477, 1482, 1487, 1492, 1497,
+ 1502, 1507, 1512, 1517, 1522, 1527, 1532, 1537, 1542, 1547,
+ 1552, 1557, 1562, 1567, 1572, 1577, 1582, 1587, 1592, 1597,
+ 1602, 1607, 1612, 1617, 1622, 1627, 1632, 1637, 1642, 1647,
+ 1652, 1657, 1662, 1667, 1672, 1673, 1679, 1683, 1685, 1687,
+ 1689, 1691, 1693, 1695, 1697, 1699, 1701, 1703, 1705, 1707,
+ 1709, 1711, 1713, 1715, 1717, 1719, 1721, 1723, 1725, 1727,
+ 1728, 1734, 1738, 1740, 1742, 1744, 1746, 1748, 1750, 1752,
+ 1754, 1756, 1758, 1760, 1762, 1764, 1766, 1768, 1770, 1772,
+ 1774, 1776, 1778, 1780, 1782, 1787, 1792, 1797, 1803, 1806,
+ 1808, 1810, 1812, 1814, 1816, 1818, 1820, 1822, 1824, 1826,
+ 1828, 1830, 1832, 1834, 1839, 1844, 1849, 1854, 1859, 1864,
+ 1869, 1874, 1879, 1884, 1889, 1894, 1900, 1903, 1905, 1907,
+ 1909, 1911, 1913, 1915, 1917, 1919, 1921, 1923, 1928, 1933,
1938, 1943, 1948, 1953, 1958
};
@@ -1075,8 +1075,8 @@ static const yytype_uint16 yyprhs[] =
static const yytype_int16 yyrhs[] =
{
230, 0, -1, -1, 230, 231, -1, 265, -1, 277,
- -1, 291, -1, 490, -1, 309, -1, 332, -1, 346,
- -1, 241, -1, 505, -1, 361, -1, 368, -1, 372,
+ -1, 291, -1, 489, -1, 309, -1, 332, -1, 346,
+ -1, 241, -1, 504, -1, 361, -1, 368, -1, 372,
-1, 382, -1, 391, -1, 411, -1, 417, -1, 423,
-1, 433, -1, 427, -1, 236, -1, 271, -1, 1,
223, -1, 1, 224, -1, -1, 233, -1, 107, 232,
@@ -1210,63 +1210,63 @@ static const yytype_int16 yyrhs[] =
-1, 432, -1, 1, -1, 97, 226, 122, 223, -1,
124, 226, 122, 223, -1, 38, 225, 434, 224, 223,
-1, 434, 435, -1, 435, -1, 444, -1, 445, -1,
- 447, -1, 448, -1, 449, -1, 450, -1, 451, -1,
- 452, -1, 453, -1, 454, -1, 443, -1, 456, -1,
- 457, -1, 471, -1, 459, -1, 461, -1, 463, -1,
- 462, -1, 466, -1, 460, -1, 467, -1, 468, -1,
- 469, -1, 470, -1, 483, -1, 472, -1, 473, -1,
- 474, -1, 479, -1, 464, -1, 465, -1, 489, -1,
- 487, -1, 488, -1, 446, -1, 478, -1, 455, -1,
- 476, -1, 477, -1, 442, -1, 437, -1, 438, -1,
- 439, -1, 440, -1, 441, -1, 458, -1, 436, -1,
- 475, -1, 1, -1, 90, 226, 107, 223, -1, 41,
- 226, 206, 223, -1, 40, 226, 233, 223, -1, 45,
- 226, 233, 223, -1, 43, 226, 107, 223, -1, 44,
- 226, 107, 223, -1, 208, 226, 206, 223, -1, 67,
- 226, 233, 223, -1, 54, 226, 206, 223, -1, 58,
- 226, 206, 223, -1, 28, 226, 206, 223, -1, 35,
- 226, 206, 223, -1, 6, 226, 206, 223, -1, 86,
- 226, 233, 223, -1, 84, 226, 107, 223, -1, 76,
- 226, 107, 223, -1, 7, 226, 233, 223, -1, 212,
- 226, 233, 223, -1, 211, 226, 233, 223, -1, 47,
- 226, 107, 223, -1, 59, 226, 206, 223, -1, 221,
- 226, 206, 223, -1, 151, 226, 206, 223, -1, 154,
- 226, 206, 223, -1, 155, 226, 206, 223, -1, 153,
- 226, 206, 223, -1, 153, 226, 209, 223, -1, 152,
- 226, 206, 223, -1, 152, 226, 209, 223, -1, 115,
- 226, 233, 223, -1, 12, 226, 233, 223, -1, 114,
- 226, 206, 223, -1, 116, 226, 233, 223, -1, 145,
- 226, 206, 223, -1, 105, 226, 206, 223, -1, 210,
- 226, 206, 223, -1, 111, 226, 206, 223, -1, 29,
- 226, 107, 223, -1, 88, 226, 107, 223, -1, 216,
- 226, 206, 223, -1, 30, 226, 122, 223, -1, 183,
- 226, 122, 223, -1, 119, 226, 206, 223, -1, 26,
- 226, 206, 223, -1, 207, 226, 233, 223, -1, -1,
- 112, 480, 226, 481, 223, -1, 481, 227, 482, -1,
- 482, -1, 157, -1, 159, -1, 161, -1, 162, -1,
- 167, -1, 48, -1, 188, -1, 175, -1, 179, -1,
- 198, -1, 190, -1, 164, -1, 177, -1, 184, -1,
- 169, -1, 203, -1, 189, -1, 158, -1, 172, -1,
- 176, -1, 165, -1, -1, 110, 484, 226, 485, 223,
- -1, 485, 227, 486, -1, 486, -1, 157, -1, 159,
- -1, 161, -1, 162, -1, 167, -1, 188, -1, 48,
- -1, 175, -1, 179, -1, 198, -1, 190, -1, 164,
- -1, 177, -1, 184, -1, 169, -1, 203, -1, 189,
- -1, 158, -1, 172, -1, 176, -1, 165, -1, 92,
- 226, 107, 223, -1, 93, 226, 107, 223, -1, 20,
- 226, 107, 223, -1, 14, 225, 491, 224, 223, -1,
- 491, 492, -1, 492, -1, 498, -1, 494, -1, 495,
- -1, 496, -1, 497, -1, 499, -1, 500, -1, 501,
- -1, 502, -1, 503, -1, 504, -1, 493, -1, 1,
- -1, 27, 226, 206, 223, -1, 70, 226, 233, 223,
- -1, 71, 226, 233, 223, -1, 79, 226, 107, 223,
- -1, 78, 226, 107, 223, -1, 77, 226, 107, 223,
- -1, 22, 226, 107, 223, -1, 21, 226, 107, 223,
- -1, 103, 226, 206, 223, -1, 104, 226, 206, 223,
- -1, 64, 226, 107, 223, -1, 65, 226, 233, 223,
- -1, 143, 225, 506, 224, 223, -1, 506, 507, -1,
- 507, -1, 508, -1, 509, -1, 510, -1, 512, -1,
- 513, -1, 511, -1, 514, -1, 1, -1, 36, 226,
+ 446, -1, 447, -1, 448, -1, 449, -1, 450, -1,
+ 451, -1, 452, -1, 453, -1, 443, -1, 455, -1,
+ 456, -1, 470, -1, 458, -1, 460, -1, 462, -1,
+ 461, -1, 465, -1, 459, -1, 466, -1, 467, -1,
+ 468, -1, 469, -1, 482, -1, 471, -1, 472, -1,
+ 473, -1, 478, -1, 463, -1, 464, -1, 488, -1,
+ 486, -1, 487, -1, 477, -1, 454, -1, 475, -1,
+ 476, -1, 442, -1, 437, -1, 438, -1, 439, -1,
+ 440, -1, 441, -1, 457, -1, 436, -1, 474, -1,
+ 1, -1, 90, 226, 107, 223, -1, 41, 226, 206,
+ 223, -1, 40, 226, 233, 223, -1, 45, 226, 233,
+ 223, -1, 43, 226, 107, 223, -1, 44, 226, 107,
+ 223, -1, 208, 226, 206, 223, -1, 67, 226, 233,
+ 223, -1, 54, 226, 206, 223, -1, 58, 226, 206,
+ 223, -1, 35, 226, 206, 223, -1, 6, 226, 206,
+ 223, -1, 86, 226, 233, 223, -1, 84, 226, 107,
+ 223, -1, 76, 226, 107, 223, -1, 7, 226, 233,
+ 223, -1, 212, 226, 233, 223, -1, 211, 226, 233,
+ 223, -1, 47, 226, 107, 223, -1, 59, 226, 206,
+ 223, -1, 221, 226, 206, 223, -1, 151, 226, 206,
+ 223, -1, 154, 226, 206, 223, -1, 155, 226, 206,
+ 223, -1, 153, 226, 206, 223, -1, 153, 226, 209,
+ 223, -1, 152, 226, 206, 223, -1, 152, 226, 209,
+ 223, -1, 115, 226, 233, 223, -1, 12, 226, 233,
+ 223, -1, 114, 226, 206, 223, -1, 116, 226, 233,
+ 223, -1, 145, 226, 206, 223, -1, 105, 226, 206,
+ 223, -1, 210, 226, 206, 223, -1, 111, 226, 206,
+ 223, -1, 29, 226, 107, 223, -1, 88, 226, 107,
+ 223, -1, 216, 226, 206, 223, -1, 30, 226, 122,
+ 223, -1, 183, 226, 122, 223, -1, 119, 226, 206,
+ 223, -1, 26, 226, 206, 223, -1, 207, 226, 233,
+ 223, -1, -1, 112, 479, 226, 480, 223, -1, 480,
+ 227, 481, -1, 481, -1, 157, -1, 159, -1, 161,
+ -1, 162, -1, 167, -1, 48, -1, 188, -1, 175,
+ -1, 179, -1, 198, -1, 190, -1, 164, -1, 177,
+ -1, 184, -1, 169, -1, 203, -1, 189, -1, 158,
+ -1, 172, -1, 176, -1, 165, -1, -1, 110, 483,
+ 226, 484, 223, -1, 484, 227, 485, -1, 485, -1,
+ 157, -1, 159, -1, 161, -1, 162, -1, 167, -1,
+ 188, -1, 48, -1, 175, -1, 179, -1, 198, -1,
+ 190, -1, 164, -1, 177, -1, 184, -1, 169, -1,
+ 203, -1, 189, -1, 158, -1, 172, -1, 176, -1,
+ 165, -1, 92, 226, 107, 223, -1, 93, 226, 107,
+ 223, -1, 20, 226, 107, 223, -1, 14, 225, 490,
+ 224, 223, -1, 490, 491, -1, 491, -1, 497, -1,
+ 493, -1, 494, -1, 495, -1, 496, -1, 498, -1,
+ 499, -1, 500, -1, 501, -1, 502, -1, 503, -1,
+ 492, -1, 1, -1, 27, 226, 206, 223, -1, 70,
+ 226, 233, 223, -1, 71, 226, 233, 223, -1, 79,
+ 226, 107, 223, -1, 78, 226, 107, 223, -1, 77,
+ 226, 107, 223, -1, 22, 226, 107, 223, -1, 21,
+ 226, 107, 223, -1, 103, 226, 206, 223, -1, 104,
+ 226, 206, 223, -1, 64, 226, 107, 223, -1, 65,
+ 226, 233, 223, -1, 143, 225, 505, 224, 223, -1,
+ 505, 506, -1, 506, -1, 507, -1, 508, -1, 509,
+ -1, 510, -1, 512, -1, 513, -1, 511, -1, 514,
+ -1, 1, -1, 36, 226, 206, 223, -1, 28, 226,
206, 223, -1, 52, 226, 206, 223, -1, 53, 226,
206, 223, -1, 49, 226, 122, 223, -1, 73, 226,
233, 223, -1, 48, 226, 206, 223, -1, 51, 226,
@@ -1324,23 +1324,23 @@ static const yytype_uint16 yyrline[] =
2376, 2376, 2377, 2377, 2378, 2378, 2379, 2379, 2380, 2380,
2381, 2381, 2382, 2383, 2384, 2384, 2385, 2385, 2386, 2386,
2387, 2387, 2388, 2388, 2389, 2389, 2390, 2390, 2391, 2391,
- 2392, 2392, 2393, 2393, 2394, 2394, 2395, 2396, 2396, 2397,
- 2398, 2399, 2399, 2400, 2400, 2401, 2402, 2403, 2404, 2404,
- 2405, 2408, 2413, 2419, 2425, 2431, 2436, 2441, 2446, 2451,
- 2456, 2461, 2466, 2471, 2476, 2481, 2486, 2491, 2496, 2501,
- 2507, 2518, 2523, 2528, 2533, 2538, 2543, 2546, 2551, 2554,
- 2559, 2564, 2569, 2574, 2579, 2584, 2589, 2594, 2599, 2604,
- 2609, 2614, 2623, 2632, 2637, 2642, 2648, 2647, 2652, 2652,
+ 2392, 2392, 2393, 2393, 2394, 2394, 2395, 2395, 2396, 2397,
+ 2398, 2398, 2399, 2399, 2400, 2401, 2402, 2403, 2403, 2404,
+ 2407, 2412, 2418, 2424, 2430, 2435, 2440, 2445, 2450, 2455,
+ 2460, 2465, 2470, 2475, 2480, 2485, 2490, 2495, 2501, 2512,
+ 2517, 2522, 2527, 2532, 2537, 2540, 2545, 2548, 2553, 2558,
+ 2563, 2568, 2573, 2578, 2583, 2588, 2593, 2598, 2603, 2608,
+ 2617, 2626, 2631, 2636, 2642, 2641, 2646, 2646, 2647, 2650,
2653, 2656, 2659, 2662, 2665, 2668, 2671, 2674, 2677, 2680,
- 2683, 2686, 2689, 2692, 2695, 2698, 2701, 2704, 2707, 2710,
- 2713, 2719, 2718, 2723, 2723, 2724, 2727, 2730, 2733, 2736,
+ 2683, 2686, 2689, 2692, 2695, 2698, 2701, 2704, 2707, 2713,
+ 2712, 2717, 2717, 2718, 2721, 2724, 2727, 2730, 2733, 2736,
2739, 2742, 2745, 2748, 2751, 2754, 2757, 2760, 2763, 2766,
- 2769, 2772, 2775, 2778, 2781, 2784, 2789, 2794, 2799, 2808,
- 2811, 2811, 2812, 2813, 2813, 2814, 2814, 2815, 2816, 2817,
- 2818, 2819, 2819, 2820, 2820, 2822, 2827, 2832, 2837, 2842,
- 2847, 2852, 2857, 2862, 2867, 2872, 2877, 2885, 2888, 2888,
- 2889, 2889, 2890, 2891, 2892, 2892, 2893, 2894, 2896, 2902,
- 2908, 2914, 2923, 2937, 2943
+ 2769, 2772, 2775, 2778, 2783, 2788, 2793, 2802, 2805, 2805,
+ 2806, 2807, 2807, 2808, 2808, 2809, 2810, 2811, 2812, 2813,
+ 2813, 2814, 2814, 2816, 2821, 2826, 2831, 2836, 2841, 2846,
+ 2851, 2856, 2861, 2866, 2871, 2879, 2882, 2882, 2883, 2883,
+ 2884, 2885, 2886, 2887, 2887, 2888, 2889, 2891, 2897, 2903,
+ 2909, 2915, 2924, 2938, 2944
};
#endif
@@ -1457,35 +1457,35 @@ static const char *const yytname[] =
"general_gline_request_duration", "general_gline_min_cidr",
"general_gline_min_cidr6", "general_tkline_expire_notices",
"general_kill_chase_time_limit", "general_hide_spoof_ips",
- "general_ignore_bogus_ts", "general_disable_remote_commands",
- "general_failed_oper_notice", "general_anti_nick_flood",
- "general_max_nick_time", "general_max_nick_changes",
- "general_max_accept", "general_anti_spam_exit_message_time",
- "general_ts_warn_delta", "general_ts_max_delta",
- "general_havent_read_conf", "general_invisible_on_connect",
- "general_warn_no_nline", "general_stats_e_disabled",
- "general_stats_o_oper_only", "general_stats_P_oper_only",
- "general_stats_k_oper_only", "general_stats_i_oper_only",
- "general_pace_wait", "general_caller_id_wait",
- "general_opers_bypass_callerid", "general_pace_wait_simple",
- "general_short_motd", "general_no_oper_flood",
- "general_true_no_oper_flood", "general_oper_pass_resv",
- "general_dots_in_ident", "general_max_targets", "general_use_egd",
- "general_egdpool_path", "general_services_name", "general_ping_cookie",
- "general_disable_auth", "general_throttle_time", "general_oper_umodes",
- "$@24", "umode_oitems", "umode_oitem", "general_oper_only_umodes",
- "$@25", "umode_items", "umode_item", "general_min_nonwildcard",
- "general_min_nonwildcard_simple", "general_default_floodcount",
- "channel_entry", "channel_items", "channel_item",
- "channel_disable_fake_channels", "channel_knock_delay",
+ "general_ignore_bogus_ts", "general_failed_oper_notice",
+ "general_anti_nick_flood", "general_max_nick_time",
+ "general_max_nick_changes", "general_max_accept",
+ "general_anti_spam_exit_message_time", "general_ts_warn_delta",
+ "general_ts_max_delta", "general_havent_read_conf",
+ "general_invisible_on_connect", "general_warn_no_nline",
+ "general_stats_e_disabled", "general_stats_o_oper_only",
+ "general_stats_P_oper_only", "general_stats_k_oper_only",
+ "general_stats_i_oper_only", "general_pace_wait",
+ "general_caller_id_wait", "general_opers_bypass_callerid",
+ "general_pace_wait_simple", "general_short_motd",
+ "general_no_oper_flood", "general_true_no_oper_flood",
+ "general_oper_pass_resv", "general_dots_in_ident", "general_max_targets",
+ "general_use_egd", "general_egdpool_path", "general_services_name",
+ "general_ping_cookie", "general_disable_auth", "general_throttle_time",
+ "general_oper_umodes", "$@24", "umode_oitems", "umode_oitem",
+ "general_oper_only_umodes", "$@25", "umode_items", "umode_item",
+ "general_min_nonwildcard", "general_min_nonwildcard_simple",
+ "general_default_floodcount", "channel_entry", "channel_items",
+ "channel_item", "channel_disable_fake_channels", "channel_knock_delay",
"channel_knock_delay_channel", "channel_max_chans_per_user",
"channel_max_chans_per_oper", "channel_max_bans",
"channel_default_split_user_count", "channel_default_split_server_count",
"channel_no_create_on_split", "channel_no_join_on_split",
"channel_jflood_count", "channel_jflood_time", "serverhide_entry",
"serverhide_items", "serverhide_item", "serverhide_flatten_links",
- "serverhide_hide_servers", "serverhide_hide_services",
- "serverhide_hidden_name", "serverhide_links_delay", "serverhide_hidden",
+ "serverhide_disable_remote_commands", "serverhide_hide_servers",
+ "serverhide_hide_services", "serverhide_hidden_name",
+ "serverhide_links_delay", "serverhide_hidden",
"serverhide_hide_server_ips", YY_NULL
};
#endif
@@ -1574,20 +1574,20 @@ static const yytype_uint16 yyr1[] =
435, 435, 435, 435, 435, 435, 435, 435, 435, 435,
435, 435, 435, 435, 435, 435, 435, 435, 435, 435,
435, 435, 435, 435, 435, 435, 435, 435, 435, 435,
- 435, 436, 437, 438, 439, 440, 441, 442, 443, 444,
- 445, 446, 447, 448, 449, 450, 451, 452, 453, 454,
- 455, 456, 457, 458, 459, 460, 461, 461, 462, 462,
- 463, 464, 465, 466, 467, 468, 469, 470, 471, 472,
- 473, 474, 475, 476, 477, 478, 480, 479, 481, 481,
- 482, 482, 482, 482, 482, 482, 482, 482, 482, 482,
- 482, 482, 482, 482, 482, 482, 482, 482, 482, 482,
- 482, 484, 483, 485, 485, 486, 486, 486, 486, 486,
- 486, 486, 486, 486, 486, 486, 486, 486, 486, 486,
- 486, 486, 486, 486, 486, 486, 487, 488, 489, 490,
- 491, 491, 492, 492, 492, 492, 492, 492, 492, 492,
- 492, 492, 492, 492, 492, 493, 494, 495, 496, 497,
- 498, 499, 500, 501, 502, 503, 504, 505, 506, 506,
- 507, 507, 507, 507, 507, 507, 507, 507, 508, 509,
+ 436, 437, 438, 439, 440, 441, 442, 443, 444, 445,
+ 446, 447, 448, 449, 450, 451, 452, 453, 454, 455,
+ 456, 457, 458, 459, 460, 460, 461, 461, 462, 463,
+ 464, 465, 466, 467, 468, 469, 470, 471, 472, 473,
+ 474, 475, 476, 477, 479, 478, 480, 480, 481, 481,
+ 481, 481, 481, 481, 481, 481, 481, 481, 481, 481,
+ 481, 481, 481, 481, 481, 481, 481, 481, 481, 483,
+ 482, 484, 484, 485, 485, 485, 485, 485, 485, 485,
+ 485, 485, 485, 485, 485, 485, 485, 485, 485, 485,
+ 485, 485, 485, 485, 486, 487, 488, 489, 490, 490,
+ 491, 491, 491, 491, 491, 491, 491, 491, 491, 491,
+ 491, 491, 491, 492, 493, 494, 495, 496, 497, 498,
+ 499, 500, 501, 502, 503, 504, 505, 505, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 507, 508, 509,
510, 511, 512, 513, 514
};
@@ -1644,20 +1644,20 @@ static const yytype_uint8 yyr2[] =
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, 0, 5, 3, 1,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 0, 5, 3, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+ 5, 3, 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, 4, 4, 4, 5, 2, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 4, 4, 4, 5,
- 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 5, 2, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 4, 4,
+ 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
};
@@ -1673,31 +1673,31 @@ static const yytype_uint16 yydefact[] =
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, 614,
+ 0, 0, 0, 0, 0, 99, 100, 102, 101, 612,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 601, 613, 603, 604, 605, 606, 602,
- 607, 608, 609, 610, 611, 612, 0, 0, 0, 438,
- 0, 0, 436, 437, 0, 500, 0, 0, 0, 0,
+ 0, 0, 0, 599, 611, 601, 602, 603, 604, 600,
+ 605, 606, 607, 608, 609, 610, 0, 0, 0, 438,
+ 0, 0, 436, 437, 0, 499, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 571, 0, 546, 0, 0, 0, 0,
+ 0, 0, 569, 0, 544, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 451, 498, 492, 493, 494,
- 495, 496, 491, 462, 452, 453, 486, 454, 455, 456,
- 457, 458, 459, 460, 461, 488, 463, 464, 497, 466,
- 471, 467, 469, 468, 481, 482, 470, 472, 473, 474,
- 475, 465, 477, 478, 479, 499, 489, 490, 487, 480,
- 476, 484, 485, 483, 0, 0, 0, 0, 0, 0,
- 0, 45, 46, 47, 0, 0, 0, 637, 0, 0,
- 0, 0, 0, 0, 0, 0, 629, 630, 631, 632,
- 635, 633, 634, 636, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 451, 497, 491, 492, 493, 494,
+ 495, 490, 462, 452, 453, 454, 455, 456, 457, 458,
+ 459, 460, 461, 487, 463, 464, 496, 466, 471, 467,
+ 469, 468, 481, 482, 470, 472, 473, 474, 475, 465,
+ 477, 478, 479, 498, 488, 489, 486, 480, 476, 484,
+ 485, 483, 0, 0, 0, 0, 0, 0, 0, 45,
+ 46, 47, 0, 0, 0, 636, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 627, 628, 629, 630, 631,
+ 634, 632, 633, 635, 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, 331,
0, 0, 329, 330, 0, 103, 0, 0, 0, 0,
98, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 600, 0, 0, 0, 0, 252,
+ 0, 0, 0, 0, 598, 0, 0, 0, 0, 252,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 219, 220, 223, 225, 226, 227, 228,
229, 230, 231, 232, 221, 222, 224, 233, 234, 235,
@@ -1710,22 +1710,22 @@ static const yytype_uint16 yydefact[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 450, 0, 0, 0, 299,
- 0, 0, 0, 0, 0, 0, 285, 286, 287, 288,
- 293, 289, 290, 291, 292, 422, 0, 0, 0, 419,
- 420, 421, 0, 0, 0, 260, 0, 270, 0, 268,
- 269, 271, 272, 48, 0, 0, 0, 44, 0, 0,
- 0, 0, 110, 111, 112, 0, 0, 0, 189, 0,
- 0, 0, 164, 0, 0, 148, 149, 150, 151, 154,
- 155, 153, 152, 156, 0, 0, 0, 0, 0, 319,
- 320, 321, 322, 0, 0, 0, 0, 0, 0, 0,
- 0, 628, 71, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 450, 0, 0, 0, 299, 0,
+ 0, 0, 0, 0, 0, 285, 286, 287, 288, 293,
+ 289, 290, 291, 292, 422, 0, 0, 0, 419, 420,
+ 421, 0, 0, 0, 260, 0, 270, 0, 268, 269,
+ 271, 272, 48, 0, 0, 0, 44, 0, 0, 0,
+ 0, 110, 111, 112, 0, 0, 0, 189, 0, 0,
+ 0, 164, 0, 0, 148, 149, 150, 151, 154, 155,
+ 153, 152, 156, 0, 0, 0, 0, 0, 319, 320,
+ 321, 322, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 626, 71, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 52, 0, 0, 365, 0, 360, 361, 362, 121,
0, 0, 117, 0, 0, 0, 328, 0, 0, 343,
0, 0, 336, 337, 338, 339, 0, 0, 0, 97,
0, 0, 0, 0, 27, 0, 0, 0, 0, 0,
- 0, 0, 0, 599, 236, 0, 0, 0, 0, 0,
+ 0, 0, 0, 597, 236, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 218, 396, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 381, 0,
@@ -1734,37 +1734,37 @@ static const yytype_uint16 yydefact[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 449,
- 294, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 284, 0, 0, 0, 418, 273, 0, 0, 0, 0,
- 0, 267, 0, 0, 43, 113, 0, 0, 0, 109,
- 157, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 147, 323, 0, 0, 0, 0, 318, 0, 0, 0,
- 0, 0, 0, 0, 627, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 449, 294,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 284,
+ 0, 0, 0, 418, 273, 0, 0, 0, 0, 0,
+ 267, 0, 0, 43, 113, 0, 0, 0, 109, 157,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 147,
+ 323, 0, 0, 0, 0, 318, 0, 0, 0, 0,
+ 0, 0, 0, 0, 625, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 76, 77,
0, 75, 80, 81, 0, 79, 0, 0, 51, 363,
0, 0, 0, 359, 0, 116, 0, 0, 327, 340,
- 0, 0, 0, 0, 335, 106, 105, 104, 622, 621,
- 615, 625, 27, 27, 27, 27, 27, 27, 27, 29,
- 28, 626, 616, 617, 620, 619, 618, 623, 624, 0,
+ 0, 0, 0, 0, 335, 106, 105, 104, 620, 619,
+ 613, 623, 27, 27, 27, 27, 27, 27, 27, 29,
+ 28, 624, 614, 615, 618, 617, 616, 621, 622, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 37, 0, 0, 217, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 380, 0, 0, 426, 439, 0, 0, 441, 513,
- 517, 531, 598, 544, 511, 538, 541, 512, 503, 502,
- 505, 506, 504, 520, 509, 510, 521, 508, 516, 515,
- 514, 539, 501, 596, 597, 535, 581, 575, 592, 576,
- 577, 578, 586, 595, 579, 589, 593, 582, 594, 587,
- 583, 588, 580, 591, 585, 584, 590, 0, 574, 537,
- 555, 550, 567, 551, 552, 553, 561, 570, 554, 564,
- 568, 557, 569, 562, 558, 563, 556, 566, 560, 559,
- 565, 0, 549, 532, 530, 533, 543, 534, 523, 528,
- 529, 526, 527, 524, 525, 542, 545, 507, 536, 519,
- 518, 540, 522, 0, 0, 0, 0, 0, 0, 0,
- 0, 283, 0, 0, 417, 0, 0, 0, 278, 274,
- 277, 259, 49, 50, 0, 0, 108, 0, 0, 0,
- 0, 0, 0, 0, 0, 146, 0, 0, 0, 317,
- 638, 643, 641, 644, 639, 640, 642, 88, 96, 87,
+ 0, 380, 0, 0, 426, 439, 0, 0, 441, 511,
+ 515, 529, 596, 542, 536, 539, 510, 502, 501, 504,
+ 505, 503, 518, 508, 509, 519, 507, 514, 513, 512,
+ 537, 500, 594, 595, 533, 579, 573, 590, 574, 575,
+ 576, 584, 593, 577, 587, 591, 580, 592, 585, 581,
+ 586, 578, 589, 583, 582, 588, 0, 572, 535, 553,
+ 548, 565, 549, 550, 551, 559, 568, 552, 562, 566,
+ 555, 567, 560, 556, 561, 554, 564, 558, 557, 563,
+ 0, 547, 530, 528, 531, 541, 532, 521, 526, 527,
+ 524, 525, 522, 523, 540, 543, 506, 534, 517, 516,
+ 538, 520, 0, 0, 0, 0, 0, 0, 0, 0,
+ 283, 0, 0, 417, 0, 0, 0, 278, 274, 277,
+ 259, 49, 50, 0, 0, 108, 0, 0, 0, 0,
+ 0, 0, 0, 0, 146, 0, 0, 0, 317, 638,
+ 637, 643, 641, 644, 639, 640, 642, 88, 96, 87,
94, 95, 86, 90, 89, 83, 82, 84, 93, 85,
72, 0, 73, 0, 91, 92, 0, 0, 358, 122,
0, 0, 0, 134, 0, 126, 127, 129, 128, 332,
@@ -1773,7 +1773,7 @@ static const yytype_uint16 yydefact[] =
251, 243, 241, 250, 237, 249, 239, 238, 37, 37,
37, 39, 38, 245, 246, 401, 403, 404, 414, 411,
398, 412, 409, 410, 0, 408, 413, 397, 402, 400,
- 415, 399, 432, 433, 447, 448, 572, 0, 547, 0,
+ 415, 399, 432, 433, 447, 448, 570, 0, 545, 0,
297, 298, 307, 304, 309, 305, 306, 312, 308, 310,
303, 311, 0, 302, 296, 315, 314, 313, 295, 424,
423, 281, 280, 265, 266, 264, 0, 263, 0, 0,
@@ -1786,8 +1786,8 @@ static const yytype_uint16 yydefact[] =
369, 375, 378, 371, 377, 372, 376, 374, 370, 373,
0, 368, 130, 0, 0, 0, 0, 125, 341, 347,
353, 356, 349, 355, 350, 354, 352, 348, 351, 0,
- 346, 342, 253, 0, 40, 41, 42, 406, 0, 573,
- 548, 300, 0, 261, 0, 279, 276, 275, 0, 0,
+ 346, 342, 253, 0, 40, 41, 42, 406, 0, 571,
+ 546, 300, 0, 261, 0, 279, 276, 275, 0, 0,
0, 190, 0, 165, 0, 366, 0, 0, 0, 0,
0, 124, 344, 0, 254, 407, 301, 262, 195, 193,
197, 191, 166, 367, 131, 133, 132, 140, 143, 142,
@@ -1797,202 +1797,202 @@ static const yytype_uint16 yydefact[] =
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 1, 25, 799, 800, 1051, 1052, 26, 220, 221,
- 222, 223, 27, 262, 263, 264, 265, 760, 761, 764,
+ -1, 1, 25, 799, 800, 1051, 1052, 26, 218, 219,
+ 220, 221, 27, 262, 263, 264, 265, 760, 761, 764,
765, 266, 267, 268, 269, 270, 271, 272, 273, 274,
275, 276, 277, 278, 279, 280, 28, 74, 75, 76,
- 77, 78, 29, 61, 491, 492, 493, 494, 30, 284,
+ 77, 78, 29, 61, 490, 491, 492, 493, 30, 284,
285, 286, 287, 288, 1014, 1015, 1016, 1017, 1018, 1185,
- 1254, 1255, 31, 62, 504, 505, 506, 507, 508, 509,
- 510, 511, 512, 727, 1161, 1162, 513, 723, 1135, 1136,
+ 1254, 1255, 31, 62, 503, 504, 505, 506, 507, 508,
+ 509, 510, 511, 726, 1161, 1162, 512, 722, 1135, 1136,
32, 51, 332, 333, 334, 335, 336, 337, 338, 339,
340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 598, 1036, 1037, 33, 59, 477, 708, 1106, 1107, 478,
- 479, 480, 1110, 959, 960, 481, 482, 34, 57, 455,
- 456, 457, 458, 459, 460, 461, 693, 1092, 1093, 462,
- 463, 464, 35, 63, 518, 519, 520, 521, 522, 36,
+ 598, 1036, 1037, 33, 59, 476, 707, 1106, 1107, 477,
+ 478, 479, 1110, 958, 959, 480, 481, 34, 57, 454,
+ 455, 456, 457, 458, 459, 460, 692, 1092, 1093, 461,
+ 462, 463, 35, 63, 517, 518, 519, 520, 521, 36,
291, 292, 293, 37, 69, 571, 572, 573, 574, 575,
781, 1199, 1200, 38, 66, 555, 556, 557, 558, 771,
1180, 1181, 39, 52, 364, 365, 366, 367, 368, 369,
370, 371, 372, 373, 620, 1064, 1065, 374, 375, 376,
- 377, 378, 40, 58, 468, 469, 470, 471, 41, 53,
+ 377, 378, 40, 58, 467, 468, 469, 470, 41, 53,
382, 383, 384, 385, 42, 111, 112, 113, 43, 55,
- 392, 393, 394, 395, 44, 164, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
- 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
- 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
- 209, 425, 921, 922, 210, 423, 897, 898, 211, 212,
- 213, 45, 92, 93, 94, 95, 96, 97, 98, 99,
- 100, 101, 102, 103, 104, 105, 46, 235, 236, 237,
+ 392, 393, 394, 395, 44, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+ 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 424, 920, 921, 208, 422, 896, 897, 209, 210, 211,
+ 45, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 101, 102, 103, 104, 105, 46, 234, 235, 236, 237,
238, 239, 240, 241, 242, 243
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -1010
+#define YYPACT_NINF -984
static const yytype_int16 yypact[] =
{
- -1010, 612, -1010, -210, -218, -199, -1010, -1010, -1010, -171,
- -1010, -160, -1010, -1010, -1010, -153, -1010, -1010, -1010, -147,
- -134, -1010, -128, -117, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, 344,
- 674, -106, -79, -65, 10, -50, 360, -47, -41, -34,
- 5, -29, -15, -13, 631, 328, -10, 41, 55, -2,
- -189, 45, 47, 59, 7, -1010, -1010, -1010, -1010, -1010,
- 61, 62, 69, 74, 76, 98, 105, 106, 118, 122,
- 124, 127, 256, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, 640, 527, 32, -1010,
- 129, 8, -1010, -1010, 29, -1010, 130, 131, 136, 138,
- 143, 145, 147, 148, 150, 152, 153, 155, 156, 166,
- 168, 170, 176, 183, 184, 185, 186, 189, 194, 195,
- 196, 197, 198, -1010, 204, -1010, 205, 213, 214, 217,
- 219, 225, 229, 230, 233, 237, 238, 241, 243, 257,
- 258, 260, 263, 264, 17, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, 493, 43, 19, 23, 270, 272,
- 65, -1010, -1010, -1010, 21, 376, 274, -1010, 277, 278,
- 280, 281, 290, 291, 292, 146, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, 99, 300, 301, 303, 305, 307,
- 308, 309, 310, 312, 313, 315, 316, 320, 323, 324,
- 325, 327, 117, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, 111, 331, 334, 20, -1010, -1010, -1010, 86, -1010,
- 336, 24, -1010, -1010, 54, -1010, 218, 378, 435, 340,
- -1010, 330, 457, 193, 458, 459, 459, 459, 462, 467,
- 471, 373, 374, 362, -1010, 363, 357, 361, 367, -1010,
- 369, 370, 377, 379, 381, 382, 391, 394, 395, 396,
- 397, 399, 173, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- 392, 401, 405, 408, 410, 411, 412, -1010, 414, 416,
- 417, 419, 421, 426, 242, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- 427, 428, 26, -1010, -1010, -1010, 478, 434, -1010, -1010,
- 432, 443, 52, -1010, -1010, -1010, 464, 459, 459, 495,
- 465, 466, 567, 554, 475, 459, 481, 570, 581, 459,
- 582, 484, 485, 487, 459, 587, 590, 459, 591, 592,
- 593, 596, 499, 480, 503, 498, 504, 459, 459, 520,
- 522, 523, -158, -43, 524, 526, 611, 459, 528, 530,
- 459, 459, 534, 535, 531, -1010, 536, 517, 521, -1010,
- 532, 537, 538, 539, 540, 18, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, 541, 542, 66, -1010,
- -1010, -1010, 546, 545, 547, -1010, 548, -1010, 27, -1010,
- -1010, -1010, -1010, -1010, 628, 635, 552, -1010, 553, 555,
- 557, 141, -1010, -1010, -1010, 556, 558, 560, -1010, 561,
- 562, 563, -1010, 564, 68, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, 568, 566, 569, 571, 15, -1010,
- -1010, -1010, -1010, 574, 594, 639, 598, 601, 604, 459,
- 573, -1010, -1010, 671, 606, 677, 655, 707, 693, 695,
- 700, 702, 703, 704, 720, 708, 67, 84, 709, 713,
- 613, -1010, 614, 603, -1010, 114, -1010, -1010, -1010, -1010,
- 632, 616, -1010, 615, 719, 620, -1010, 627, 629, -1010,
- 634, 16, -1010, -1010, -1010, -1010, 630, 638, 642, -1010,
- 645, 646, 647, 649, 578, 650, 651, 659, 665, 669,
- 670, 672, 673, -1010, -1010, 750, 751, 459, 641, 771,
- 793, 459, 795, 796, 459, 782, 798, 800, 459, 801,
- 801, 686, -1010, -1010, 791, 33, 792, 710, 797, 799,
- 689, 802, 804, 810, 805, 806, 807, 699, -1010, 808,
- 809, 711, -1010, 712, -1010, 811, 814, 714, -1010, 715,
- 716, 717, 718, 721, 723, 724, 725, 726, 727, 728,
- 729, 730, 731, 732, 733, 734, 735, 736, 737, 738,
- 739, 740, 741, 742, 743, 744, 644, 745, 687, 746,
- 747, 748, 749, 752, 753, 754, 755, 756, 757, 758,
- 759, 760, 761, 762, 763, 764, 765, 766, 767, -1010,
- -1010, 820, 768, 692, 821, 816, 823, 851, 869, 769,
- -1010, 871, 872, 772, -1010, -1010, 874, 875, 706, 891,
- 776, -1010, 777, 778, -1010, -1010, 880, 881, 781, -1010,
- -1010, 883, 803, 780, 885, 886, 888, 785, 890, 790,
- -1010, -1010, 892, 893, 894, 794, -1010, 812, 813, 815,
- 817, 818, 819, 822, -1010, 824, 825, 826, 827, 828,
- 829, 830, 831, 832, 833, 834, 835, 836, -1010, -1010,
- -191, -1010, -1010, -1010, -164, -1010, 837, 838, -1010, -1010,
- 896, 839, 840, -1010, 841, -1010, 116, 843, -1010, -1010,
- 897, 842, 898, 844, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, 459, 459, 459, 459, 459, 459, 459, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, 846,
- 847, 848, -35, 849, 850, 852, 853, 854, 855, 856,
- 857, 858, 859, 211, 860, 861, -1010, 862, 863, 864,
- 865, 866, 867, 868, 2, 870, 873, 876, 877, 878,
- 879, -1010, 882, 884, -1010, -1010, 887, 889, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -150, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -107, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, 895, 899, 393, 900, 901, 902, 903,
- 904, -1010, 905, 906, -1010, 907, 908, -36, 919, 909,
- -1010, -1010, -1010, -1010, 910, 911, -1010, 912, 914, 429,
- 915, 916, 917, 722, 918, -1010, 920, 921, 922, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, 67, -1010, 84, -1010, -1010, 923, 286, -1010, -1010,
- 924, 925, 926, -1010, 82, -1010, -1010, -1010, -1010, -1010,
- 927, 389, 930, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -69, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, 801, 801,
- 801, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -66, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, 644, -1010, 687,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -46, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -18, -1010, 932, 891,
- 931, -1010, -1010, -1010, -1010, -1010, 928, -1010, -1010, 929,
- -1010, -1010, -1010, -1010, 933, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, 89, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, 90, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- 96, -1010, -1010, 940, -102, 934, 935, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, 119,
- -1010, -1010, -1010, -35, -1010, -1010, -1010, -1010, 2, -1010,
- -1010, -1010, 393, -1010, -36, -1010, -1010, -1010, 946, 964,
- 966, -1010, 429, -1010, 722, -1010, 286, 936, 939, 941,
- 319, -1010, -1010, 389, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, 120, -1010, -1010, -1010, 319, -1010
+ -984, 637, -984, -186, -182, -165, -984, -984, -984, -148,
+ -984, -135, -984, -984, -984, -127, -984, -984, -984, -118,
+ -64, -984, -56, -50, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, 331,
+ 826, -48, -45, -11, 28, 36, 366, 39, 40, 41,
+ 60, 46, 58, 62, 721, 334, 65, 35, 24, 72,
+ -195, -66, -21, 66, 17, -984, -984, -984, -984, -984,
+ 92, 96, 97, 99, 108, 110, 111, 118, 119, 124,
+ 125, 133, 5, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, 657, 440, 14, -984,
+ 134, 12, -984, -984, 29, -984, 135, 137, 138, 143,
+ 145, 149, 150, 153, 155, 157, 158, 162, 163, 174,
+ 176, 177, 178, 182, 186, 189, 190, 192, 195, 196,
+ 200, 201, -984, 203, -984, 204, 206, 210, 211, 214,
+ 221, 222, 225, 235, 236, 237, 238, 239, 242, 243,
+ 244, 249, 253, 105, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, 268, 19, 212, 16, 261, 262, 38, -984,
+ -984, -984, 165, 472, 274, -984, 264, 266, 270, 272,
+ 273, 279, 280, 281, 6, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, 32, 284, 287, 288, 290, 296,
+ 297, 298, 299, 304, 305, 306, 307, 316, 317, 319,
+ 320, 321, 146, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, 70, 87, 322, 10, -984, -984, -984, 180, -984,
+ 324, 95, -984, -984, 173, -984, 232, 260, 277, 215,
+ -984, 387, 444, 349, 449, 450, 450, 450, 451, 453,
+ 456, 359, 360, 344, -984, 347, 346, 353, 354, -984,
+ 358, 362, 364, 365, 367, 369, 371, 373, 376, 380,
+ 383, 384, 103, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ 363, 385, 388, 390, 391, 392, 393, -984, 402, 403,
+ 404, 405, 409, 410, 30, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ 414, 426, 4, -984, -984, -984, 463, 381, -984, -984,
+ 427, 430, 44, -984, -984, -984, 386, 450, 450, 506,
+ 455, 555, 541, 458, 450, 459, 559, 561, 450, 563,
+ 474, 477, 480, 450, 581, 584, 450, 586, 587, 593,
+ 594, 496, 479, 500, 486, 507, 450, 450, 508, 510,
+ 511, -197, -192, 514, 515, 602, 450, 519, 521, 450,
+ 450, 522, 524, 503, -984, 512, 505, 516, -984, 517,
+ 525, 526, 527, 530, 231, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, 533, 534, 20, -984, -984,
+ -984, 513, 535, 537, -984, 538, -984, 18, -984, -984,
+ -984, -984, -984, 612, 619, 523, -984, 545, 549, 550,
+ 67, -984, -984, -984, 556, 552, 557, -984, 558, 560,
+ 562, -984, 564, 156, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, 566, 565, 567, 569, 55, -984, -984,
+ -984, -984, 539, 576, 579, 625, 590, 596, 597, 450,
+ 582, -984, -984, 665, 598, 670, 699, 700, 686, 687,
+ 689, 690, 691, 693, 709, 695, -144, -96, 696, 698,
+ 607, -984, 610, 611, -984, 128, -984, -984, -984, -984,
+ 616, 615, -984, 620, 718, 618, -984, 626, 624, -984,
+ 628, 85, -984, -984, -984, -984, 629, 635, 636, -984,
+ 638, 639, 640, 641, 487, 643, 650, 653, 655, 658,
+ 660, 661, 669, -984, -984, 753, 773, 450, 662, 786,
+ 788, 450, 794, 795, 450, 784, 800, 802, 450, 803,
+ 803, 688, -984, -984, 790, -55, 792, 711, 793, 796,
+ 694, 797, 799, 809, 801, 804, 805, 701, -984, 806,
+ 810, 702, -984, 708, -984, 811, 812, 712, -984, 713,
+ 714, 715, 716, 717, 719, 720, 722, 723, 724, 725,
+ 726, 727, 728, 729, 730, 731, 732, 733, 734, 735,
+ 736, 737, 738, 739, 740, 520, 741, 667, 742, 743,
+ 744, 745, 746, 747, 748, 749, 750, 751, 752, 754,
+ 755, 756, 757, 758, 759, 760, 761, 762, -984, -984,
+ 819, 770, 763, 822, 815, 864, 865, 866, 767, -984,
+ 869, 870, 771, -984, -984, 871, 873, 772, 889, 774,
+ -984, 776, 777, -984, -984, 879, 880, 780, -984, -984,
+ 882, 807, 779, 884, 885, 886, 783, 888, 789, -984,
+ -984, 892, 893, 894, 798, -984, 808, 813, 814, 816,
+ 817, 818, 820, 821, -984, 823, 824, 825, 827, 828,
+ 829, 830, 831, 832, 833, 834, 835, 836, -984, -984,
+ -183, -984, -984, -984, -177, -984, 837, 838, -984, -984,
+ 895, 785, 839, -984, 840, -984, 154, 841, -984, -984,
+ 896, 842, 897, 843, -984, -984, -984, -984, -984, -984,
+ -984, -984, 450, 450, 450, 450, 450, 450, 450, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, 844,
+ 846, 847, -42, 848, 849, 850, 851, 852, 853, 854,
+ 855, 856, 857, 13, 858, 859, -984, 860, 861, 862,
+ 863, 867, 868, 872, 8, 874, 875, 876, 877, 878,
+ 881, -984, 883, 887, -984, -984, 890, 891, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -174, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -130, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, 898, 899, 502, 900, 901, 902, 903, 904,
+ -984, 905, 906, -984, 907, 908, 15, 919, 909, -984,
+ -984, -984, -984, 910, 911, -984, 912, 914, 435, 915,
+ 916, 917, 710, 918, -984, 920, 921, 922, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -144, -984, -96, -984, -984, 923, 337, -984, -984,
+ 924, 925, 926, -984, 90, -984, -984, -984, -984, -984,
+ 927, 599, 930, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -65, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, 803, 803,
+ 803, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -20, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, 520, -984, 667,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -19, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, 53, -984, 913, 889,
+ 931, -984, -984, -984, -984, -984, 928, -984, -984, 929,
+ -984, -984, -984, -984, 932, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, 59, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, 79, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ 84, -984, -984, 943, -97, 933, 935, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, 101,
+ -984, -984, -984, -42, -984, -984, -984, -984, 8, -984,
+ -984, -984, 502, -984, 15, -984, -984, -984, 959, 960,
+ 961, -984, 435, -984, 710, -984, 337, 938, 939, 940,
+ 378, -984, -984, 599, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, 120, -984, -984, -984, 378, -984
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -1010, -1010, -1010, -132, -303, -1009, -609, -1010, -1010, 943,
- -1010, -1010, -1010, -1010, 770, -1010, -1010, -1010, 22, -1010,
- 25, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, 947, -1010,
- -1010, -1010, -1010, -1010, -1010, 533, -1010, -1010, -1010, -1010,
- 913, -1010, -1010, -1010, -1010, 11, -1010, -1010, -1010, -1010,
- -1010, -236, -1010, -1010, -1010, 525, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -198, -1010, -1010, -1010, -195,
- -1010, -1010, -1010, 698, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -172, -1010, -1010, -1010, -1010, -1010, -181, -1010,
- 559, -1010, -1010, -1010, -75, -1010, -1010, -1010, -1010, -1010,
- 588, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -168, -1010,
- -1010, -1010, -1010, -1010, -1010, 577, -1010, -1010, -1010, -1010,
- -1010, 937, -1010, -1010, -1010, -1010, 543, -1010, -1010, -1010,
- -1010, -1010, -187, -1010, -1010, -1010, 549, -1010, -1010, -1010,
- -1010, -129, -1010, -1010, -1010, 784, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -110, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, 643, -1010, -1010, -1010, -1010,
- -1010, 773, -1010, -1010, -1010, -1010, 992, -1010, -1010, -1010,
- -1010, 774, -1010, -1010, -1010, -1010, 942, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, 30, -1010, -1010, -1010, 31, -1010, -1010,
- -1010, -1010, -1010, 1021, -1010, -1010, -1010, -1010, -1010, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010, -1010, -1010, 938, -1010,
- -1010, -1010, -1010, -1010, -1010, -1010
+ -984, -984, -984, -150, -303, -983, -609, -984, -984, 937,
+ -984, -984, -984, -984, 764, -984, -984, -984, 21, -984,
+ 22, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, 949, -984,
+ -984, -984, -984, -984, -984, 540, -984, -984, -984, -984,
+ 765, -984, -984, -984, -984, 31, -984, -984, -984, -984,
+ -984, -234, -984, -984, -984, 529, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -196, -984, -984, -984, -193,
+ -984, -984, -984, 703, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -176, -984, -984, -984, -984, -984, -181, -984,
+ 617, -984, -984, -984, -75, -984, -984, -984, -984, -984,
+ 588, -984, -984, -984, -984, -984, -984, -984, -120, -984,
+ -984, -984, -984, -984, -984, 585, -984, -984, -984, -984,
+ -984, 934, -984, -984, -984, -984, 467, -984, -984, -984,
+ -984, -984, -140, -984, -984, -984, 548, -984, -984, -984,
+ -984, -121, -984, -984, -984, 778, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -112, -984, -984, -984,
+ -984, -984, -984, -984, -984, 642, -984, -984, -984, -984,
+ -984, 766, -984, -984, -984, -984, 996, -984, -984, -984,
+ -984, 775, -984, -984, -984, -984, 945, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, 33, -984, -984, -984, 34, -984, -984, -984,
+ -984, -984, 1023, -984, -984, -984, -984, -984, -984, -984,
+ -984, -984, -984, -984, -984, -984, -984, 936, -984, -984,
+ -984, -984, -984, -984, -984, -984
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -2001,262 +2001,262 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -124
static const yytype_int16 yytable[] =
{
- 824, 825, 585, 586, 587, 823, 217, 49, 70, 109,
- 1062, 109, 1103, 47, 48, 1034, 514, 567, 115, 446,
- 472, 282, 488, 116, 117, 289, 50, 379, 472, 118,
- 389, 71, 1000, 379, 295, 447, 1001, 119, 72, 1204,
- 1205, 1206, 282, 120, 465, 121, 122, 123, 675, 515,
- 448, 676, 124, 389, 54, 567, 289, 125, 126, 1002,
- 127, 128, 129, 1003, 130, 56, 217, 465, 110, 495,
- 110, 131, 60, 1076, 473, 132, 133, 1077, 64, 474,
- 449, 475, 473, 1010, 134, 496, 380, 474, 1035, 475,
- 516, 65, 380, 135, 640, 641, 489, 67, 1228, 218,
- 497, 136, 648, 137, 73, 138, 652, 139, 68, 140,
- 141, 657, 552, 568, 660, 552, 1078, 1010, 244, 106,
- 1079, 290, 142, 219, 670, 671, 390, 143, 144, 145,
- 498, 146, 147, 148, 682, 450, 149, 685, 686, 517,
- 476, 245, 488, 451, 452, 1104, 107, 227, 476, 390,
- 381, 568, 290, 391, 1202, 1105, 381, 1207, 1203, 218,
- 108, 1208, 150, 677, 453, 499, 678, 466, 151, 152,
- 153, 154, 155, 246, 315, 114, 391, 1211, 214, 1011,
- 247, 1212, 228, 219, 215, 500, -123, 490, 316, 317,
- 466, 216, 318, 1063, 229, 230, 224, 231, 232, 233,
- 156, 501, 248, 828, 829, 1213, 249, -123, 553, 1214,
- 225, 553, 226, 1011, 250, 281, 489, 251, 252, 234,
- 1048, 1049, 1050, 294, 157, 158, 743, 159, 160, 161,
- 569, 299, 387, 162, 570, 319, 454, 283, 163, 735,
- 783, 444, 699, 350, 561, 351, 483, 352, 565, 253,
- 631, 710, 563, 320, 321, 322, 323, 79, 283, 353,
- 324, 467, 758, 759, 325, 502, 254, 255, 569, 1012,
- 326, 296, 570, 297, 354, 514, 637, 80, 81, 762,
- 763, 327, 328, 82, 467, 298, 503, 301, 302, 486,
- 703, 256, 729, 329, 811, 303, 1013, 355, 815, 356,
- 304, 818, 305, 1012, 357, 822, 1186, 490, 515, 257,
- 258, 259, 1221, 1223, 358, 330, 1222, 1224, 823, 1225,
- 83, 84, 532, 1226, 306, 554, 85, 86, 554, 244,
- 1013, 307, 308, 87, 88, 89, 260, 261, 772, 359,
- 576, 550, 1232, 1257, 309, 70, 1233, 1258, 310, 516,
- 311, 331, 245, 312, 1170, 386, 396, 397, 1247, 90,
- 91, 115, 398, 360, 399, 718, 116, 117, 71, 400,
- 530, 401, 118, 402, 403, 72, 404, 495, 405, 406,
- 119, 407, 408, 361, 246, 1248, 120, 1249, 121, 122,
- 123, 247, 409, 496, 410, 124, 411, 611, 517, 582,
- 125, 126, 412, 127, 128, 129, 1082, 130, 497, 413,
- 414, 415, 416, 248, 131, 417, 1171, 249, 132, 133,
- 418, 419, 420, 421, 422, 250, 1083, 134, 251, 252,
- 424, 426, 1250, 1115, 362, 1084, 135, 580, 498, 427,
- 428, 73, 1172, 429, 136, 430, 137, 1116, 138, 1173,
- 139, 431, 140, 141, 1117, 432, 433, 1189, 1174, 434,
- 253, 363, 1085, 435, 436, 142, 627, 437, 1118, 438,
- 143, 144, 145, 499, 146, 147, 148, 254, 255, 149,
- 313, 1251, 1252, 439, 440, 1175, 441, 1176, 1177, 442,
- 443, 1086, 1087, 500, 446, 1119, 484, 1120, 485, 1088,
- 577, 1178, 256, 523, 524, 150, 525, 526, 1179, 501,
- 447, 151, 152, 153, 154, 155, 527, 528, 529, 1190,
- 257, 258, 259, 1121, 1089, 448, 533, 534, 350, 535,
- 351, 536, 352, 537, 538, 539, 540, 1253, 541, 542,
- 1090, 543, 544, 156, 353, 1191, 545, 260, 261, 546,
- 547, 548, 1192, 549, 559, 449, 1122, 578, 1123, 354,
- 560, 1193, 564, 579, 581, 583, 584, 157, 158, 588,
- 159, 160, 161, 502, 589, 1229, 162, 1124, 590, 591,
- 592, 163, 355, 595, 356, 593, 594, 596, 1194, 357,
- 1195, 1196, 1125, 597, 503, 599, 600, 1126, 1091, 358,
- 633, 1127, 642, 601, 1197, 602, 1128, 603, 604, 1129,
- 450, 1198, 2, 3, 1130, 613, 4, 605, 451, 452,
- 606, 607, 608, 609, 359, 610, 5, 614, 1131, 6,
- 7, 615, 227, 1132, 616, 8, 617, 618, 619, 453,
- 621, 315, 622, 623, 1133, 624, 9, 625, 360, 10,
- 11, 1134, 626, 629, 630, 316, 317, 634, 635, 318,
- 1024, 1025, 1026, 1027, 1028, 1029, 1030, 228, 361, 636,
- 639, 643, 644, 12, 645, 79, 646, 650, 13, 229,
- 230, 647, 231, 232, 233, 584, 14, 649, 651, 653,
- 654, 655, 876, 656, 658, 80, 81, 659, 661, 662,
- 663, 82, 319, 664, 234, 665, 666, 15, 16, 667,
- 669, 454, 792, 793, 794, 795, 796, 797, 798, 362,
- 320, 321, 322, 323, 668, 17, 672, 324, 673, 674,
- 679, 325, 680, 681, 683, 900, 684, 326, 83, 84,
- 687, 688, 18, 691, 85, 86, 363, 692, 327, 328,
- 712, 87, 88, 89, 689, 19, 20, 713, 694, 690,
- 329, 739, 748, 695, 696, 697, 698, 701, 702, 705,
- 1140, 706, 21, 707, 709, 714, 715, 90, 91, 720,
- 737, 716, 330, 717, 721, 22, 722, 724, 725, 726,
- 728, 731, 732, 745, 23, 733, 744, 734, 24, 747,
- 738, 877, 878, 879, 740, 880, 881, 741, 882, 883,
- 742, 884, 746, 885, 749, 750, 886, 751, 331, 887,
- 888, 889, 752, 890, 753, 754, 755, 756, 891, 770,
- 757, 766, 892, 893, 894, 767, 768, 769, 774, 775,
- 776, 777, 895, 778, 901, 902, 903, 896, 904, 905,
- 779, 906, 907, 785, 908, 780, 909, 809, 810, 910,
- 782, 786, 911, 912, 913, 787, 914, 812, 788, 789,
- 790, 915, 791, 801, 802, 916, 917, 918, 813, 1141,
- 1142, 1143, 803, 1144, 1145, 919, 1146, 1147, 804, 1148,
- 920, 1149, 805, 806, 1150, 807, 808, 1151, 1152, 1153,
- 814, 1154, 816, 817, 819, 820, 1155, 821, 823, 826,
- 1156, 1157, 1158, 827, 830, 834, 831, 837, 945, 832,
- 1159, 833, 841, 947, 835, 1160, 836, 838, 839, 840,
- 842, 843, 957, 846, 844, 845, 847, 848, 849, 850,
- 851, 852, 943, 946, 853, 948, 854, 855, 856, 857,
- 858, 859, 860, 861, 862, 863, 864, 865, 866, 867,
- 868, 869, 870, 871, 872, 873, 874, 875, 899, 923,
- 924, 925, 926, 949, 944, 927, 928, 929, 930, 931,
- 932, 933, 934, 935, 936, 937, 938, 939, 940, 941,
- 942, 950, 951, 952, 953, 954, 955, 956, 958, 961,
- 962, 963, 964, 965, 966, 967, 969, 970, 971, 968,
- 972, 973, 974, 975, 976, 977, 978, 979, 1006, 1020,
- 1022, 300, 1259, 1167, 719, 1187, 1242, 1241, 1168, 730,
- 612, 1234, 551, 1237, 1216, 980, 981, 711, 982, 1215,
- 983, 984, 985, 700, 1236, 986, 1256, 987, 988, 989,
+ 824, 825, 585, 586, 587, 379, 79, 225, 1034, 674,
+ 823, 282, 675, 109, 676, 379, 1062, 677, 70, 471,
+ 464, 464, 1048, 1049, 1050, 289, 80, 81, 295, 109,
+ 389, 350, 82, 351, 226, 352, 282, 47, 48, 215,
+ 1000, 71, 227, 49, 1001, 389, 1002, 353, 72, 1076,
+ 1003, 758, 759, 1077, 228, 229, 513, 230, 231, 232,
+ 50, 215, 354, 1103, 380, 1204, 1205, 1206, 487, 83,
+ 84, 552, 110, 472, 380, 85, 86, 54, 473, 233,
+ 474, 1035, 87, 88, 89, 355, 567, 356, 110, 514,
+ 56, 1010, 357, 1078, 640, 641, 289, 1079, 60, 762,
+ 763, 647, 358, 1228, 315, 651, 115, 64, 90, 91,
+ 656, 116, 117, 659, 73, 828, 829, 118, 316, 317,
+ 823, 290, 318, 669, 670, 119, 390, 359, 381, 552,
+ 515, 120, 216, 681, 121, 122, 684, 685, 381, 475,
+ 123, 390, 488, 465, 465, 124, 125, 244, 126, 127,
+ 128, 360, 129, 391, 216, 1010, 217, 494, 1202, 130,
+ 296, 65, 1203, 131, 132, 319, 487, 553, 391, 67,
+ 245, 361, 133, 495, 567, 68, -123, 106, 217, 516,
+ 107, 134, 568, 320, 321, 322, 323, 1011, 496, 135,
+ 324, 136, 290, 137, 325, 138, 1104, 139, 140, 1063,
+ 326, -123, 246, 1207, 1211, 297, 1105, 1208, 1212, 247,
+ 141, 327, 328, 471, 108, 142, 143, 144, 497, 145,
+ 146, 147, 362, 329, 148, 553, 743, 283, 631, 313,
+ 530, 248, 445, 489, 561, 249, 387, 466, 466, 482,
+ 488, 299, 709, 250, 702, 330, 251, 252, 446, 363,
+ 149, 1011, 283, 498, 627, 532, 150, 151, 152, 153,
+ 154, 114, 485, 447, 212, 213, 214, 472, 637, 445,
+ 568, 222, 473, 499, 474, 513, 1213, 1012, 253, 734,
+ 1214, 331, 1221, 223, 554, 446, 1222, 224, 155, 500,
+ 281, 717, 298, 448, 811, 254, 255, 294, 815, 569,
+ 447, 818, 1223, 570, 1013, 822, 1224, 1225, 514, 783,
+ 559, 1226, 156, 157, 1186, 158, 159, 160, 301, 565,
+ 256, 161, 302, 303, 1232, 304, 162, 611, 1233, 443,
+ 448, 489, 70, 475, 305, 244, 306, 307, 257, 258,
+ 259, 1012, 554, 1257, 308, 309, 563, 1258, 449, 515,
+ 310, 311, 772, 501, 576, 71, 450, 451, 245, 312,
+ 386, 396, 72, 397, 398, 260, 261, 115, 1013, 399,
+ 550, 400, 116, 117, 502, 401, 402, 452, 118, 403,
+ 728, 404, 577, 405, 406, 449, 119, 569, 407, 408,
+ 246, 570, 120, 450, 451, 121, 122, 247, 516, 578,
+ 409, 123, 410, 411, 412, 1170, 124, 125, 413, 126,
+ 127, 128, 414, 129, 452, 415, 416, 1247, 417, 248,
+ 130, 418, 419, 249, 131, 132, 420, 421, 73, 423,
+ 425, 250, 426, 133, 251, 252, 427, 428, 579, 1115,
+ 429, 350, 134, 351, 1248, 352, 1249, 430, 431, 453,
+ 135, 432, 136, 1116, 137, 698, 138, 353, 139, 140,
+ 1117, 433, 434, 435, 436, 437, 253, 1171, 438, 439,
+ 440, 141, 354, 494, 1118, 441, 142, 143, 144, 442,
+ 145, 146, 147, 254, 255, 148, 453, 483, 484, 495,
+ 522, 1250, 523, 1172, 580, 355, 524, 356, 525, 526,
+ 1173, 1119, 357, 1120, 496, 527, 528, 529, 256, 1174,
+ 533, 149, 358, 534, 535, 1082, 536, 150, 151, 152,
+ 153, 154, 537, 538, 539, 540, 257, 258, 259, 1121,
+ 541, 542, 543, 544, 497, 1083, 1175, 359, 1176, 1177,
+ 1251, 1252, 545, 546, 1084, 547, 548, 549, 560, 155,
+ 564, 581, 1178, 260, 261, 582, 583, 584, 588, 1179,
+ 589, 360, 1122, 590, 1123, 591, 592, 593, 875, 498,
+ 594, 1085, 595, 156, 157, 1229, 158, 159, 160, 596,
+ 597, 361, 161, 1124, 599, 633, 613, 162, 600, 499,
+ 601, 602, 639, 603, 584, 604, 1253, 605, 1125, 606,
+ 1086, 1087, 607, 1126, 634, 500, 608, 1127, 1088, 609,
+ 610, 614, 1128, 642, 615, 1129, 616, 617, 618, 619,
+ 1130, 792, 793, 794, 795, 796, 797, 798, 621, 622,
+ 623, 624, 362, 1089, 1131, 625, 626, 2, 3, 1132,
+ 629, 4, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1090,
+ 1133, 5, 630, 635, 6, 7, 636, 1134, 315, 363,
+ 8, 643, 644, 645, 646, 648, 649, 1189, 650, 501,
+ 652, 9, 316, 317, 10, 11, 318, 876, 877, 878,
+ 653, 879, 880, 654, 881, 882, 655, 883, 657, 884,
+ 502, 658, 885, 660, 661, 886, 887, 888, 12, 889,
+ 662, 663, 664, 13, 890, 665, 666, 1091, 891, 892,
+ 893, 14, 667, 668, 671, 899, 672, 673, 894, 319,
+ 678, 679, 225, 895, 680, 682, 688, 683, 686, 1190,
+ 687, 690, 15, 16, 711, 689, 704, 320, 321, 322,
+ 323, 712, 691, 693, 324, 736, 713, 739, 325, 226,
+ 17, 694, 695, 696, 326, 1191, 697, 227, 1140, 700,
+ 701, 705, 1192, 706, 708, 327, 328, 18, 714, 228,
+ 229, 1193, 230, 231, 232, 715, 716, 329, 720, 719,
+ 19, 20, 737, 721, 723, 738, 724, 745, 725, 730,
+ 727, 731, 747, 732, 233, 733, 740, 21, 1194, 330,
+ 1195, 1196, 741, 742, 746, 744, 748, 749, 750, 751,
+ 22, 752, 753, 754, 1197, 755, 756, 757, 766, 23,
+ 767, 1198, 774, 24, 900, 901, 902, 79, 903, 904,
+ 768, 905, 906, 769, 907, 331, 908, 770, 775, 909,
+ 777, 778, 910, 911, 912, 776, 913, 80, 81, 779,
+ 780, 914, 785, 82, 782, 915, 916, 917, 786, 787,
+ 809, 788, 789, 790, 791, 918, 801, 1141, 1142, 1143,
+ 919, 1144, 1145, 802, 1146, 1147, 803, 1148, 804, 1149,
+ 810, 805, 1150, 806, 807, 1151, 1152, 1153, 812, 1154,
+ 83, 84, 808, 813, 1155, 814, 85, 86, 1156, 1157,
+ 1158, 816, 817, 87, 88, 89, 819, 820, 1159, 821,
+ 823, 826, 827, 1160, 830, 832, 837, 831, 833, 835,
+ 834, 836, 946, 838, 841, 844, 839, 840, 842, 90,
+ 91, 845, 843, 846, 847, 848, 849, 850, 851, 852,
+ 853, 942, 854, 855, 945, 856, 857, 858, 859, 860,
+ 861, 862, 863, 864, 865, 866, 867, 868, 869, 870,
+ 871, 872, 873, 874, 898, 922, 923, 924, 925, 926,
+ 927, 928, 929, 930, 931, 932, 943, 933, 934, 935,
+ 936, 937, 938, 939, 940, 941, 947, 948, 949, 944,
+ 950, 951, 952, 954, 953, 955, 957, 960, 956, 961,
+ 962, 963, 964, 965, 966, 968, 969, 970, 971, 972,
+ 973, 1007, 974, 967, 975, 976, 977, 1006, 1020, 1022,
+ 1215, 978, 1167, 300, 1259, 1168, 551, 1234, 1242, 1241,
+ 718, 979, 729, 1237, 1216, 612, 980, 981, 784, 982,
+ 983, 984, 699, 985, 986, 1187, 987, 988, 989, 562,
990, 991, 992, 993, 994, 995, 996, 997, 998, 999,
- 1004, 1005, 1227, 1008, 1009, 1007, 1019, 1023, 1021, 1031,
- 1032, 1033, 1038, 1039, 1238, 1040, 1041, 1042, 1043, 1044,
- 1045, 1046, 1047, 1053, 1054, 1055, 1056, 1057, 1058, 1059,
- 1060, 1061, 1239, 1066, 1240, 736, 1067, 1243, 1235, 1068,
- 1069, 1070, 1071, 388, 773, 1072, 445, 1073, 1209, 1210,
- 1074, 704, 1075, 314, 784, 0, 0, 0, 1080, 0,
- 0, 0, 1081, 1094, 1095, 1096, 1097, 1098, 1099, 1100,
+ 1004, 1005, 1008, 1009, 1019, 1227, 1023, 1031, 1021, 1032,
+ 1033, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046,
+ 1047, 1053, 1054, 1055, 1056, 1057, 1058, 1238, 1239, 1240,
+ 1059, 1060, 1236, 1256, 710, 1061, 1235, 1066, 1067, 1068,
+ 1069, 1070, 735, 773, 1071, 1243, 1072, 388, 444, 703,
+ 1073, 1209, 1210, 1074, 1075, 314, 0, 0, 0, 0,
+ 0, 1080, 1081, 1094, 1095, 1096, 1097, 1098, 1099, 1100,
1101, 1102, 1108, 1111, 1112, 1113, 1109, 1114, 1137, 1138,
- 1139, 1163, 0, 1164, 1165, 1166, 1169, 1182, 628, 0,
- 1188, 1183, 1184, 1201, 1217, 632, 1218, 1219, 1231, 1244,
- 1230, 1220, 1245, 487, 1246, 0, 638, 0, 0, 0,
- 0, 0, 0, 531, 0, 0, 0, 0, 0, 0,
+ 1139, 1163, 628, 1164, 1165, 1166, 1169, 1182, 632, 0,
+ 1188, 1183, 1184, 1201, 1217, 486, 1218, 1219, 1231, 1230,
+ 1220, 1244, 1245, 1246, 0, 0, 0, 638, 0, 0,
+ 531, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 562, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 566
+ 0, 0, 0, 0, 0, 566
};
#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-1010)))
+ (!!((Yystate) == (-984)))
#define yytable_value_is_error(Yytable_value) \
YYID (0)
static const yytype_int16 yycheck[] =
{
- 609, 610, 305, 306, 307, 107, 1, 225, 1, 1,
- 8, 1, 48, 223, 224, 50, 1, 1, 1, 1,
- 1, 1, 1, 6, 7, 1, 225, 1, 1, 12,
- 1, 24, 223, 1, 223, 17, 227, 20, 31, 1048,
- 1049, 1050, 1, 26, 1, 28, 29, 30, 206, 34,
- 32, 209, 35, 1, 225, 1, 1, 40, 41, 223,
- 43, 44, 45, 227, 47, 225, 1, 1, 60, 1,
- 60, 54, 225, 223, 55, 58, 59, 227, 225, 60,
- 62, 62, 55, 1, 67, 17, 60, 60, 123, 62,
- 75, 225, 60, 76, 397, 398, 75, 225, 200, 94,
- 32, 84, 405, 86, 97, 88, 409, 90, 225, 92,
- 93, 414, 1, 97, 417, 1, 223, 1, 1, 225,
- 227, 97, 105, 118, 427, 428, 97, 110, 111, 112,
- 62, 114, 115, 116, 437, 117, 119, 440, 441, 124,
- 121, 24, 1, 125, 126, 181, 225, 1, 121, 97,
- 124, 97, 97, 124, 223, 191, 124, 223, 227, 94,
- 225, 227, 145, 206, 146, 97, 209, 124, 151, 152,
- 153, 154, 155, 56, 1, 225, 124, 223, 225, 97,
- 63, 227, 36, 118, 225, 117, 166, 166, 15, 16,
- 124, 225, 19, 191, 48, 49, 225, 51, 52, 53,
- 183, 133, 85, 170, 171, 223, 89, 166, 97, 227,
- 225, 97, 225, 97, 97, 225, 75, 100, 101, 73,
- 9, 10, 11, 225, 207, 208, 529, 210, 211, 212,
- 214, 224, 224, 216, 218, 62, 218, 217, 221, 224,
- 224, 224, 224, 1, 224, 3, 223, 5, 224, 132,
- 224, 224, 166, 80, 81, 82, 83, 1, 217, 17,
- 87, 218, 195, 196, 91, 197, 149, 150, 214, 187,
- 97, 226, 218, 226, 32, 1, 224, 21, 22, 195,
- 196, 108, 109, 27, 218, 226, 218, 226, 226, 224,
- 224, 174, 224, 120, 597, 226, 214, 55, 601, 57,
- 226, 604, 226, 187, 62, 608, 224, 166, 34, 192,
- 193, 194, 223, 223, 72, 142, 227, 227, 107, 223,
- 64, 65, 223, 227, 226, 214, 70, 71, 214, 1,
- 214, 226, 226, 77, 78, 79, 219, 220, 224, 97,
- 122, 224, 223, 223, 226, 1, 227, 227, 226, 75,
- 226, 178, 24, 226, 68, 226, 226, 226, 39, 103,
- 104, 1, 226, 121, 226, 224, 6, 7, 24, 226,
- 224, 226, 12, 226, 226, 31, 226, 1, 226, 226,
- 20, 226, 226, 141, 56, 66, 26, 68, 28, 29,
- 30, 63, 226, 17, 226, 35, 226, 224, 124, 206,
- 40, 41, 226, 43, 44, 45, 13, 47, 32, 226,
- 226, 226, 226, 85, 54, 226, 130, 89, 58, 59,
- 226, 226, 226, 226, 226, 97, 33, 67, 100, 101,
- 226, 226, 113, 4, 192, 42, 76, 107, 62, 226,
- 226, 97, 156, 226, 84, 226, 86, 18, 88, 163,
- 90, 226, 92, 93, 25, 226, 226, 68, 172, 226,
- 132, 219, 69, 226, 226, 105, 224, 226, 39, 226,
- 110, 111, 112, 97, 114, 115, 116, 149, 150, 119,
- 224, 162, 163, 226, 226, 199, 226, 201, 202, 226,
- 226, 98, 99, 117, 1, 66, 226, 68, 226, 106,
- 122, 215, 174, 226, 226, 145, 226, 226, 222, 133,
- 17, 151, 152, 153, 154, 155, 226, 226, 226, 130,
- 192, 193, 194, 94, 131, 32, 226, 226, 1, 226,
- 3, 226, 5, 226, 226, 226, 226, 218, 226, 226,
- 147, 226, 226, 183, 17, 156, 226, 219, 220, 226,
- 226, 226, 163, 226, 223, 62, 127, 122, 129, 32,
- 226, 172, 226, 223, 107, 107, 107, 207, 208, 107,
- 210, 211, 212, 197, 107, 1184, 216, 148, 107, 206,
- 206, 221, 55, 226, 57, 223, 223, 226, 199, 62,
- 201, 202, 163, 226, 218, 226, 226, 168, 205, 72,
- 122, 172, 107, 226, 215, 226, 177, 226, 226, 180,
- 117, 222, 0, 1, 185, 223, 4, 226, 125, 126,
- 226, 226, 226, 226, 97, 226, 14, 226, 199, 17,
- 18, 226, 1, 204, 226, 23, 226, 226, 226, 146,
- 226, 1, 226, 226, 215, 226, 34, 226, 121, 37,
- 38, 222, 226, 226, 226, 15, 16, 223, 226, 19,
- 792, 793, 794, 795, 796, 797, 798, 36, 141, 226,
- 206, 206, 206, 61, 107, 1, 122, 107, 66, 48,
- 49, 206, 51, 52, 53, 107, 74, 206, 107, 107,
- 206, 206, 48, 206, 107, 21, 22, 107, 107, 107,
- 107, 27, 62, 107, 73, 206, 226, 95, 96, 206,
- 206, 218, 134, 135, 136, 137, 138, 139, 140, 192,
- 80, 81, 82, 83, 226, 113, 206, 87, 206, 206,
- 206, 91, 206, 122, 206, 48, 206, 97, 64, 65,
- 206, 206, 130, 226, 70, 71, 219, 226, 108, 109,
- 122, 77, 78, 79, 223, 143, 144, 122, 226, 223,
- 120, 122, 107, 226, 226, 226, 226, 226, 226, 223,
- 48, 226, 160, 226, 226, 223, 223, 103, 104, 223,
- 206, 226, 142, 226, 226, 173, 226, 226, 226, 226,
- 226, 223, 226, 122, 182, 226, 223, 226, 186, 122,
- 206, 157, 158, 159, 206, 161, 162, 206, 164, 165,
- 206, 167, 206, 169, 107, 122, 172, 122, 178, 175,
- 176, 177, 122, 179, 122, 122, 122, 107, 184, 226,
- 122, 122, 188, 189, 190, 122, 223, 223, 206, 223,
- 225, 122, 198, 223, 157, 158, 159, 203, 161, 162,
- 223, 164, 165, 223, 167, 226, 169, 107, 107, 172,
- 226, 223, 175, 176, 177, 223, 179, 226, 223, 223,
- 223, 184, 223, 223, 223, 188, 189, 190, 107, 157,
- 158, 159, 223, 161, 162, 198, 164, 165, 223, 167,
- 203, 169, 223, 223, 172, 223, 223, 175, 176, 177,
- 107, 179, 107, 107, 122, 107, 184, 107, 107, 223,
- 188, 189, 190, 122, 122, 226, 206, 107, 226, 122,
- 198, 122, 223, 107, 122, 203, 122, 122, 122, 122,
- 122, 122, 226, 122, 223, 223, 122, 223, 223, 223,
- 223, 223, 122, 122, 223, 122, 223, 223, 223, 223,
+ 609, 610, 305, 306, 307, 1, 1, 1, 50, 206,
+ 107, 1, 209, 1, 206, 1, 8, 209, 1, 1,
+ 1, 1, 9, 10, 11, 1, 21, 22, 223, 1,
+ 1, 1, 27, 3, 28, 5, 1, 223, 224, 1,
+ 223, 24, 36, 225, 227, 1, 223, 17, 31, 223,
+ 227, 195, 196, 227, 48, 49, 1, 51, 52, 53,
+ 225, 1, 32, 48, 60, 1048, 1049, 1050, 1, 64,
+ 65, 1, 60, 55, 60, 70, 71, 225, 60, 73,
+ 62, 123, 77, 78, 79, 55, 1, 57, 60, 34,
+ 225, 1, 62, 223, 397, 398, 1, 227, 225, 195,
+ 196, 404, 72, 200, 1, 408, 1, 225, 103, 104,
+ 413, 6, 7, 416, 97, 170, 171, 12, 15, 16,
+ 107, 97, 19, 426, 427, 20, 97, 97, 124, 1,
+ 75, 26, 94, 436, 29, 30, 439, 440, 124, 121,
+ 35, 97, 75, 124, 124, 40, 41, 1, 43, 44,
+ 45, 121, 47, 124, 94, 1, 118, 1, 223, 54,
+ 226, 225, 227, 58, 59, 62, 1, 97, 124, 225,
+ 24, 141, 67, 17, 1, 225, 166, 225, 118, 124,
+ 225, 76, 97, 80, 81, 82, 83, 97, 32, 84,
+ 87, 86, 97, 88, 91, 90, 181, 92, 93, 191,
+ 97, 166, 56, 223, 223, 226, 191, 227, 227, 63,
+ 105, 108, 109, 1, 225, 110, 111, 112, 62, 114,
+ 115, 116, 192, 120, 119, 97, 529, 217, 224, 224,
+ 224, 85, 1, 166, 224, 89, 224, 218, 218, 223,
+ 75, 224, 224, 97, 224, 142, 100, 101, 17, 219,
+ 145, 97, 217, 97, 224, 223, 151, 152, 153, 154,
+ 155, 225, 224, 32, 225, 225, 225, 55, 224, 1,
+ 97, 225, 60, 117, 62, 1, 223, 187, 132, 224,
+ 227, 178, 223, 225, 214, 17, 227, 225, 183, 133,
+ 225, 224, 226, 62, 597, 149, 150, 225, 601, 214,
+ 32, 604, 223, 218, 214, 608, 227, 223, 34, 224,
+ 223, 227, 207, 208, 224, 210, 211, 212, 226, 224,
+ 174, 216, 226, 226, 223, 226, 221, 224, 227, 224,
+ 62, 166, 1, 121, 226, 1, 226, 226, 192, 193,
+ 194, 187, 214, 223, 226, 226, 166, 227, 117, 75,
+ 226, 226, 224, 197, 122, 24, 125, 126, 24, 226,
+ 226, 226, 31, 226, 226, 219, 220, 1, 214, 226,
+ 224, 226, 6, 7, 218, 226, 226, 146, 12, 226,
+ 224, 226, 122, 226, 226, 117, 20, 214, 226, 226,
+ 56, 218, 26, 125, 126, 29, 30, 63, 124, 122,
+ 226, 35, 226, 226, 226, 68, 40, 41, 226, 43,
+ 44, 45, 226, 47, 146, 226, 226, 39, 226, 85,
+ 54, 226, 226, 89, 58, 59, 226, 226, 97, 226,
+ 226, 97, 226, 67, 100, 101, 226, 226, 223, 4,
+ 226, 1, 76, 3, 66, 5, 68, 226, 226, 218,
+ 84, 226, 86, 18, 88, 224, 90, 17, 92, 93,
+ 25, 226, 226, 226, 226, 226, 132, 130, 226, 226,
+ 226, 105, 32, 1, 39, 226, 110, 111, 112, 226,
+ 114, 115, 116, 149, 150, 119, 218, 226, 226, 17,
+ 226, 113, 226, 156, 107, 55, 226, 57, 226, 226,
+ 163, 66, 62, 68, 32, 226, 226, 226, 174, 172,
+ 226, 145, 72, 226, 226, 13, 226, 151, 152, 153,
+ 154, 155, 226, 226, 226, 226, 192, 193, 194, 94,
+ 226, 226, 226, 226, 62, 33, 199, 97, 201, 202,
+ 162, 163, 226, 226, 42, 226, 226, 226, 226, 183,
+ 226, 107, 215, 219, 220, 206, 107, 107, 107, 222,
+ 107, 121, 127, 107, 129, 206, 206, 223, 48, 97,
+ 223, 69, 226, 207, 208, 1184, 210, 211, 212, 226,
+ 226, 141, 216, 148, 226, 122, 223, 221, 226, 117,
+ 226, 226, 206, 226, 107, 226, 218, 226, 163, 226,
+ 98, 99, 226, 168, 223, 133, 226, 172, 106, 226,
+ 226, 226, 177, 107, 226, 180, 226, 226, 226, 226,
+ 185, 134, 135, 136, 137, 138, 139, 140, 226, 226,
+ 226, 226, 192, 131, 199, 226, 226, 0, 1, 204,
+ 226, 4, 792, 793, 794, 795, 796, 797, 798, 147,
+ 215, 14, 226, 226, 17, 18, 226, 222, 1, 219,
+ 23, 206, 107, 122, 206, 206, 107, 68, 107, 197,
+ 107, 34, 15, 16, 37, 38, 19, 157, 158, 159,
+ 206, 161, 162, 206, 164, 165, 206, 167, 107, 169,
+ 218, 107, 172, 107, 107, 175, 176, 177, 61, 179,
+ 107, 107, 206, 66, 184, 226, 206, 205, 188, 189,
+ 190, 74, 226, 206, 206, 48, 206, 206, 198, 62,
+ 206, 206, 1, 203, 122, 206, 223, 206, 206, 130,
+ 206, 226, 95, 96, 122, 223, 223, 80, 81, 82,
+ 83, 122, 226, 226, 87, 206, 223, 122, 91, 28,
+ 113, 226, 226, 226, 97, 156, 226, 36, 48, 226,
+ 226, 226, 163, 226, 226, 108, 109, 130, 223, 48,
+ 49, 172, 51, 52, 53, 226, 226, 120, 226, 223,
+ 143, 144, 206, 226, 226, 206, 226, 122, 226, 223,
+ 226, 226, 122, 226, 73, 226, 206, 160, 199, 142,
+ 201, 202, 206, 206, 206, 223, 107, 107, 122, 122,
+ 173, 122, 122, 122, 215, 122, 107, 122, 122, 182,
+ 122, 222, 206, 186, 157, 158, 159, 1, 161, 162,
+ 223, 164, 165, 223, 167, 178, 169, 226, 223, 172,
+ 122, 223, 175, 176, 177, 225, 179, 21, 22, 223,
+ 226, 184, 223, 27, 226, 188, 189, 190, 223, 223,
+ 107, 223, 223, 223, 223, 198, 223, 157, 158, 159,
+ 203, 161, 162, 223, 164, 165, 223, 167, 223, 169,
+ 107, 223, 172, 223, 223, 175, 176, 177, 226, 179,
+ 64, 65, 223, 107, 184, 107, 70, 71, 188, 189,
+ 190, 107, 107, 77, 78, 79, 122, 107, 198, 107,
+ 107, 223, 122, 203, 122, 122, 107, 206, 122, 122,
+ 226, 122, 107, 122, 223, 223, 122, 122, 122, 103,
+ 104, 223, 122, 122, 122, 223, 223, 223, 223, 223,
+ 223, 122, 223, 223, 122, 223, 223, 223, 223, 223,
223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
- 223, 223, 223, 122, 206, 223, 223, 223, 223, 223,
+ 223, 223, 223, 223, 223, 223, 206, 223, 223, 223,
+ 223, 223, 223, 223, 223, 223, 122, 122, 122, 226,
+ 223, 122, 122, 122, 223, 122, 107, 223, 226, 223,
+ 223, 122, 122, 223, 122, 226, 122, 122, 122, 226,
+ 122, 226, 223, 206, 122, 122, 122, 122, 122, 122,
+ 107, 223, 1001, 74, 1258, 1003, 262, 1203, 1224, 1222,
+ 490, 223, 503, 1214, 1109, 332, 223, 223, 571, 223,
+ 223, 223, 454, 223, 223, 1014, 223, 223, 223, 284,
223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
- 223, 122, 223, 122, 122, 223, 122, 122, 107, 223,
- 223, 223, 122, 122, 223, 122, 226, 122, 122, 206,
- 122, 226, 122, 223, 122, 122, 122, 223, 122, 122,
- 122, 74, 1258, 1001, 491, 1014, 1224, 1222, 1003, 504,
- 332, 1203, 262, 1214, 1109, 223, 223, 478, 223, 107,
- 223, 223, 223, 455, 1212, 223, 1233, 223, 223, 223,
+ 223, 223, 223, 223, 223, 122, 223, 223, 226, 223,
223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
- 223, 223, 122, 223, 223, 226, 223, 223, 226, 223,
- 223, 223, 223, 223, 128, 223, 223, 223, 223, 223,
- 223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
- 223, 223, 128, 223, 128, 518, 223, 1226, 1208, 223,
- 223, 223, 223, 111, 555, 223, 164, 223, 1077, 1079,
- 223, 468, 223, 92, 571, -1, -1, -1, 223, -1,
- -1, -1, 223, 223, 223, 223, 223, 223, 223, 223,
+ 223, 223, 223, 223, 223, 223, 223, 128, 128, 128,
+ 223, 223, 1212, 1233, 477, 223, 1208, 223, 223, 223,
+ 223, 223, 517, 555, 223, 1226, 223, 111, 163, 467,
+ 223, 1077, 1079, 223, 223, 92, -1, -1, -1, -1,
+ -1, 223, 223, 223, 223, 223, 223, 223, 223, 223,
223, 223, 213, 223, 223, 223, 227, 223, 223, 223,
- 223, 223, -1, 223, 223, 223, 223, 223, 364, -1,
- 223, 226, 226, 223, 223, 382, 228, 228, 223, 223,
- 226, 228, 223, 220, 223, -1, 392, -1, -1, -1,
- -1, -1, -1, 235, -1, -1, -1, -1, -1, -1,
+ 223, 223, 364, 223, 223, 223, 223, 223, 382, -1,
+ 223, 226, 226, 223, 223, 218, 228, 228, 223, 226,
+ 228, 223, 223, 223, -1, -1, -1, 392, -1, -1,
+ 234, -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, 284, -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, 291
+ -1, -1, -1, -1, -1, 291
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2267,26 +2267,26 @@ static const yytype_uint16 yystos[] =
37, 38, 61, 66, 74, 95, 96, 113, 130, 143,
144, 160, 173, 182, 186, 231, 236, 241, 265, 271,
277, 291, 309, 332, 346, 361, 368, 372, 382, 391,
- 411, 417, 423, 427, 433, 490, 505, 223, 224, 225,
+ 411, 417, 423, 427, 433, 489, 504, 223, 224, 225,
225, 310, 392, 418, 225, 428, 225, 347, 412, 333,
225, 272, 292, 362, 225, 225, 383, 225, 225, 373,
1, 24, 31, 97, 266, 267, 268, 269, 270, 1,
21, 22, 27, 64, 65, 70, 71, 77, 78, 79,
- 103, 104, 491, 492, 493, 494, 495, 496, 497, 498,
- 499, 500, 501, 502, 503, 504, 225, 225, 225, 1,
+ 103, 104, 490, 491, 492, 493, 494, 495, 496, 497,
+ 498, 499, 500, 501, 502, 503, 225, 225, 225, 1,
60, 424, 425, 426, 225, 1, 6, 7, 12, 20,
- 26, 28, 29, 30, 35, 40, 41, 43, 44, 45,
- 47, 54, 58, 59, 67, 76, 84, 86, 88, 90,
- 92, 93, 105, 110, 111, 112, 114, 115, 116, 119,
- 145, 151, 152, 153, 154, 155, 183, 207, 208, 210,
- 211, 212, 216, 221, 434, 435, 436, 437, 438, 439,
- 440, 441, 442, 443, 444, 445, 446, 447, 448, 449,
- 450, 451, 452, 453, 454, 455, 456, 457, 458, 459,
- 460, 461, 462, 463, 464, 465, 466, 467, 468, 469,
- 470, 471, 472, 473, 474, 475, 476, 477, 478, 479,
- 483, 487, 488, 489, 225, 225, 225, 1, 94, 118,
- 237, 238, 239, 240, 225, 225, 225, 1, 36, 48,
- 49, 51, 52, 53, 73, 506, 507, 508, 509, 510,
+ 26, 29, 30, 35, 40, 41, 43, 44, 45, 47,
+ 54, 58, 59, 67, 76, 84, 86, 88, 90, 92,
+ 93, 105, 110, 111, 112, 114, 115, 116, 119, 145,
+ 151, 152, 153, 154, 155, 183, 207, 208, 210, 211,
+ 212, 216, 221, 434, 435, 436, 437, 438, 439, 440,
+ 441, 442, 443, 444, 445, 446, 447, 448, 449, 450,
+ 451, 452, 453, 454, 455, 456, 457, 458, 459, 460,
+ 461, 462, 463, 464, 465, 466, 467, 468, 469, 470,
+ 471, 472, 473, 474, 475, 476, 477, 478, 482, 486,
+ 487, 488, 225, 225, 225, 1, 94, 118, 237, 238,
+ 239, 240, 225, 225, 225, 1, 28, 36, 48, 49,
+ 51, 52, 53, 73, 505, 506, 507, 508, 509, 510,
511, 512, 513, 514, 1, 24, 56, 63, 85, 89,
97, 100, 101, 132, 149, 150, 174, 192, 193, 194,
219, 220, 242, 243, 244, 245, 250, 251, 252, 253,
@@ -2294,7 +2294,7 @@ static const yytype_uint16 yystos[] =
264, 225, 1, 217, 278, 279, 280, 281, 282, 1,
97, 369, 370, 371, 225, 223, 226, 226, 226, 224,
267, 226, 226, 226, 226, 226, 226, 226, 226, 226,
- 226, 226, 226, 224, 492, 1, 15, 16, 19, 62,
+ 226, 226, 226, 224, 491, 1, 15, 16, 19, 62,
80, 81, 82, 83, 87, 91, 97, 108, 109, 120,
142, 178, 311, 312, 313, 314, 315, 316, 317, 318,
319, 320, 321, 322, 323, 324, 325, 326, 327, 328,
@@ -2305,18 +2305,18 @@ static const yytype_uint16 yystos[] =
97, 124, 429, 430, 431, 432, 226, 226, 226, 226,
226, 226, 226, 226, 226, 226, 226, 226, 226, 226,
226, 226, 226, 226, 226, 226, 226, 226, 226, 226,
- 226, 226, 226, 484, 226, 480, 226, 226, 226, 226,
+ 226, 226, 483, 226, 479, 226, 226, 226, 226, 226,
226, 226, 226, 226, 226, 226, 226, 226, 226, 226,
- 226, 226, 226, 226, 224, 435, 1, 17, 32, 62,
- 117, 125, 126, 146, 218, 348, 349, 350, 351, 352,
- 353, 354, 358, 359, 360, 1, 124, 218, 413, 414,
- 415, 416, 1, 55, 60, 62, 121, 334, 338, 339,
- 340, 344, 345, 223, 226, 226, 224, 238, 1, 75,
- 166, 273, 274, 275, 276, 1, 17, 32, 62, 97,
- 117, 133, 197, 218, 293, 294, 295, 296, 297, 298,
- 299, 300, 301, 305, 1, 34, 75, 124, 363, 364,
- 365, 366, 367, 226, 226, 226, 226, 226, 226, 226,
- 224, 507, 223, 226, 226, 226, 226, 226, 226, 226,
+ 226, 226, 226, 224, 435, 1, 17, 32, 62, 117,
+ 125, 126, 146, 218, 348, 349, 350, 351, 352, 353,
+ 354, 358, 359, 360, 1, 124, 218, 413, 414, 415,
+ 416, 1, 55, 60, 62, 121, 334, 338, 339, 340,
+ 344, 345, 223, 226, 226, 224, 238, 1, 75, 166,
+ 273, 274, 275, 276, 1, 17, 32, 62, 97, 117,
+ 133, 197, 218, 293, 294, 295, 296, 297, 298, 299,
+ 300, 301, 305, 1, 34, 75, 124, 363, 364, 365,
+ 366, 367, 226, 226, 226, 226, 226, 226, 226, 226,
+ 224, 506, 223, 226, 226, 226, 226, 226, 226, 226,
226, 226, 226, 226, 226, 226, 226, 226, 226, 226,
224, 243, 1, 97, 214, 384, 385, 386, 387, 223,
226, 224, 279, 166, 226, 224, 370, 1, 97, 214,
@@ -2327,16 +2327,16 @@ static const yytype_uint16 yystos[] =
226, 224, 312, 223, 226, 226, 226, 226, 226, 226,
403, 226, 226, 226, 226, 226, 226, 224, 394, 226,
226, 224, 420, 122, 223, 226, 226, 224, 430, 206,
- 233, 233, 107, 206, 206, 107, 122, 206, 233, 206,
- 107, 107, 233, 107, 206, 206, 206, 233, 107, 107,
- 233, 107, 107, 107, 107, 206, 226, 206, 226, 206,
- 233, 233, 206, 206, 206, 206, 209, 206, 209, 206,
- 206, 122, 233, 206, 206, 233, 233, 206, 206, 223,
- 223, 226, 226, 355, 226, 226, 226, 226, 226, 224,
- 349, 226, 226, 224, 414, 223, 226, 226, 335, 226,
- 224, 339, 122, 122, 223, 223, 226, 226, 224, 274,
- 223, 226, 226, 306, 226, 226, 226, 302, 226, 224,
- 294, 223, 226, 226, 226, 224, 364, 206, 206, 122,
+ 233, 233, 107, 206, 107, 122, 206, 233, 206, 107,
+ 107, 233, 107, 206, 206, 206, 233, 107, 107, 233,
+ 107, 107, 107, 107, 206, 226, 206, 226, 206, 233,
+ 233, 206, 206, 206, 206, 209, 206, 209, 206, 206,
+ 122, 233, 206, 206, 233, 233, 206, 206, 223, 223,
+ 226, 226, 355, 226, 226, 226, 226, 226, 224, 349,
+ 226, 226, 224, 414, 223, 226, 226, 335, 226, 224,
+ 339, 122, 122, 223, 223, 226, 226, 224, 274, 223,
+ 226, 226, 306, 226, 226, 226, 302, 226, 224, 294,
+ 223, 226, 226, 226, 224, 364, 206, 206, 206, 122,
206, 206, 206, 233, 223, 122, 206, 122, 107, 107,
122, 122, 122, 122, 122, 122, 107, 122, 195, 196,
246, 247, 195, 196, 248, 249, 122, 122, 223, 223,
@@ -2350,17 +2350,17 @@ static const yytype_uint16 yystos[] =
122, 223, 122, 122, 223, 223, 122, 122, 223, 223,
223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
- 223, 223, 223, 223, 223, 223, 48, 157, 158, 159,
- 161, 162, 164, 165, 167, 169, 172, 175, 176, 177,
- 179, 184, 188, 189, 190, 198, 203, 485, 486, 223,
- 48, 157, 158, 159, 161, 162, 164, 165, 167, 169,
- 172, 175, 176, 177, 179, 184, 188, 189, 190, 198,
- 203, 481, 482, 223, 223, 223, 223, 223, 223, 223,
+ 223, 223, 223, 223, 223, 48, 157, 158, 159, 161,
+ 162, 164, 165, 167, 169, 172, 175, 176, 177, 179,
+ 184, 188, 189, 190, 198, 203, 484, 485, 223, 48,
+ 157, 158, 159, 161, 162, 164, 165, 167, 169, 172,
+ 175, 176, 177, 179, 184, 188, 189, 190, 198, 203,
+ 480, 481, 223, 223, 223, 223, 223, 223, 223, 223,
223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
- 223, 223, 223, 122, 206, 226, 122, 107, 122, 122,
- 122, 223, 122, 122, 223, 122, 122, 226, 107, 342,
- 343, 223, 223, 223, 122, 122, 223, 122, 206, 226,
- 122, 122, 122, 226, 122, 223, 122, 122, 122, 223,
+ 223, 223, 122, 206, 226, 122, 107, 122, 122, 122,
+ 223, 122, 122, 223, 122, 122, 226, 107, 342, 343,
+ 223, 223, 223, 122, 122, 223, 122, 206, 226, 122,
+ 122, 122, 226, 122, 223, 122, 122, 122, 223, 223,
223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
223, 223, 223, 223, 223, 223, 223, 223, 223, 223,
223, 227, 223, 227, 223, 223, 122, 226, 223, 223,
@@ -2383,8 +2383,8 @@ static const yytype_uint16 yystos[] =
68, 130, 156, 163, 172, 199, 201, 202, 215, 222,
389, 390, 223, 226, 226, 288, 224, 284, 223, 68,
130, 156, 163, 172, 199, 201, 202, 215, 222, 380,
- 381, 223, 223, 227, 234, 234, 234, 223, 227, 486,
- 482, 223, 227, 223, 227, 107, 343, 223, 228, 228,
+ 381, 223, 223, 227, 234, 234, 234, 223, 227, 485,
+ 481, 223, 227, 223, 227, 107, 343, 223, 228, 228,
228, 223, 227, 223, 227, 223, 227, 122, 200, 235,
226, 223, 223, 227, 331, 405, 357, 337, 128, 128,
128, 308, 304, 390, 223, 223, 223, 39, 66, 68,
@@ -5858,165 +5858,157 @@ yyreduce:
}
break;
- case 501:
+ case 500:
/* Line 1787 of yacc.c */
-#line 2409 "conf_parser.y"
+#line 2408 "conf_parser.y"
{
ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number);
}
break;
- case 502:
+ case 501:
/* Line 1787 of yacc.c */
-#line 2414 "conf_parser.y"
+#line 2413 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.glines = yylval.number;
}
break;
- case 503:
+ case 502:
/* Line 1787 of yacc.c */
-#line 2420 "conf_parser.y"
+#line 2419 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
}
break;
- case 504:
+ case 503:
/* Line 1787 of yacc.c */
-#line 2426 "conf_parser.y"
+#line 2425 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number);
}
break;
- case 505:
+ case 504:
/* Line 1787 of yacc.c */
-#line 2432 "conf_parser.y"
+#line 2431 "conf_parser.y"
{
ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
}
break;
- case 506:
+ case 505:
/* Line 1787 of yacc.c */
-#line 2437 "conf_parser.y"
+#line 2436 "conf_parser.y"
{
ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
}
break;
- case 507:
+ case 506:
/* Line 1787 of yacc.c */
-#line 2442 "conf_parser.y"
+#line 2441 "conf_parser.y"
{
ConfigFileEntry.tkline_expire_notices = yylval.number;
}
break;
- case 508:
+ case 507:
/* Line 1787 of yacc.c */
-#line 2447 "conf_parser.y"
+#line 2446 "conf_parser.y"
{
ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
}
break;
- case 509:
+ case 508:
/* Line 1787 of yacc.c */
-#line 2452 "conf_parser.y"
+#line 2451 "conf_parser.y"
{
ConfigFileEntry.hide_spoof_ips = yylval.number;
}
break;
- case 510:
+ case 509:
/* Line 1787 of yacc.c */
-#line 2457 "conf_parser.y"
+#line 2456 "conf_parser.y"
{
ConfigFileEntry.ignore_bogus_ts = yylval.number;
}
break;
- case 511:
-/* Line 1787 of yacc.c */
-#line 2462 "conf_parser.y"
- {
- ConfigFileEntry.disable_remote = yylval.number;
-}
- break;
-
- case 512:
+ case 510:
/* Line 1787 of yacc.c */
-#line 2467 "conf_parser.y"
+#line 2461 "conf_parser.y"
{
ConfigFileEntry.failed_oper_notice = yylval.number;
}
break;
- case 513:
+ case 511:
/* Line 1787 of yacc.c */
-#line 2472 "conf_parser.y"
+#line 2466 "conf_parser.y"
{
ConfigFileEntry.anti_nick_flood = yylval.number;
}
break;
- case 514:
+ case 512:
/* Line 1787 of yacc.c */
-#line 2477 "conf_parser.y"
+#line 2471 "conf_parser.y"
{
ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number);
}
break;
- case 515:
+ case 513:
/* Line 1787 of yacc.c */
-#line 2482 "conf_parser.y"
+#line 2476 "conf_parser.y"
{
ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
}
break;
- case 516:
+ case 514:
/* Line 1787 of yacc.c */
-#line 2487 "conf_parser.y"
+#line 2481 "conf_parser.y"
{
ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
}
break;
- case 517:
+ case 515:
/* Line 1787 of yacc.c */
-#line 2492 "conf_parser.y"
+#line 2486 "conf_parser.y"
{
ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
}
break;
- case 518:
+ case 516:
/* Line 1787 of yacc.c */
-#line 2497 "conf_parser.y"
+#line 2491 "conf_parser.y"
{
ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
}
break;
- case 519:
+ case 517:
/* Line 1787 of yacc.c */
-#line 2502 "conf_parser.y"
+#line 2496 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
}
break;
- case 520:
+ case 518:
/* Line 1787 of yacc.c */
-#line 2508 "conf_parser.y"
+#line 2502 "conf_parser.y"
{
if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1)
{
@@ -6028,169 +6020,169 @@ yyreduce:
}
break;
- case 521:
+ case 519:
/* Line 1787 of yacc.c */
-#line 2519 "conf_parser.y"
+#line 2513 "conf_parser.y"
{
ConfigFileEntry.invisible_on_connect = yylval.number;
}
break;
- case 522:
+ case 520:
/* Line 1787 of yacc.c */
-#line 2524 "conf_parser.y"
+#line 2518 "conf_parser.y"
{
ConfigFileEntry.warn_no_nline = yylval.number;
}
break;
- case 523:
+ case 521:
/* Line 1787 of yacc.c */
-#line 2529 "conf_parser.y"
+#line 2523 "conf_parser.y"
{
ConfigFileEntry.stats_e_disabled = yylval.number;
}
break;
- case 524:
+ case 522:
/* Line 1787 of yacc.c */
-#line 2534 "conf_parser.y"
+#line 2528 "conf_parser.y"
{
ConfigFileEntry.stats_o_oper_only = yylval.number;
}
break;
- case 525:
+ case 523:
/* Line 1787 of yacc.c */
-#line 2539 "conf_parser.y"
+#line 2533 "conf_parser.y"
{
ConfigFileEntry.stats_P_oper_only = yylval.number;
}
break;
- case 526:
+ case 524:
/* Line 1787 of yacc.c */
-#line 2544 "conf_parser.y"
+#line 2538 "conf_parser.y"
{
ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
}
break;
- case 527:
+ case 525:
/* Line 1787 of yacc.c */
-#line 2547 "conf_parser.y"
+#line 2541 "conf_parser.y"
{
ConfigFileEntry.stats_k_oper_only = 1;
}
break;
- case 528:
+ case 526:
/* Line 1787 of yacc.c */
-#line 2552 "conf_parser.y"
+#line 2546 "conf_parser.y"
{
ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
}
break;
- case 529:
+ case 527:
/* Line 1787 of yacc.c */
-#line 2555 "conf_parser.y"
+#line 2549 "conf_parser.y"
{
ConfigFileEntry.stats_i_oper_only = 1;
}
break;
- case 530:
+ case 528:
/* Line 1787 of yacc.c */
-#line 2560 "conf_parser.y"
+#line 2554 "conf_parser.y"
{
ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
}
break;
- case 531:
+ case 529:
/* Line 1787 of yacc.c */
-#line 2565 "conf_parser.y"
+#line 2559 "conf_parser.y"
{
ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
}
break;
- case 532:
+ case 530:
/* Line 1787 of yacc.c */
-#line 2570 "conf_parser.y"
+#line 2564 "conf_parser.y"
{
ConfigFileEntry.opers_bypass_callerid = yylval.number;
}
break;
- case 533:
+ case 531:
/* Line 1787 of yacc.c */
-#line 2575 "conf_parser.y"
+#line 2569 "conf_parser.y"
{
ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
}
break;
- case 534:
+ case 532:
/* Line 1787 of yacc.c */
-#line 2580 "conf_parser.y"
+#line 2574 "conf_parser.y"
{
ConfigFileEntry.short_motd = yylval.number;
}
break;
- case 535:
+ case 533:
/* Line 1787 of yacc.c */
-#line 2585 "conf_parser.y"
+#line 2579 "conf_parser.y"
{
ConfigFileEntry.no_oper_flood = yylval.number;
}
break;
- case 536:
+ case 534:
/* Line 1787 of yacc.c */
-#line 2590 "conf_parser.y"
+#line 2584 "conf_parser.y"
{
ConfigFileEntry.true_no_oper_flood = yylval.number;
}
break;
- case 537:
+ case 535:
/* Line 1787 of yacc.c */
-#line 2595 "conf_parser.y"
+#line 2589 "conf_parser.y"
{
ConfigFileEntry.oper_pass_resv = yylval.number;
}
break;
- case 538:
+ case 536:
/* Line 1787 of yacc.c */
-#line 2600 "conf_parser.y"
+#line 2594 "conf_parser.y"
{
ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
}
break;
- case 539:
+ case 537:
/* Line 1787 of yacc.c */
-#line 2605 "conf_parser.y"
+#line 2599 "conf_parser.y"
{
ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
}
break;
- case 540:
+ case 538:
/* Line 1787 of yacc.c */
-#line 2610 "conf_parser.y"
+#line 2604 "conf_parser.y"
{
ConfigFileEntry.use_egd = yylval.number;
}
break;
- case 541:
+ case 539:
/* Line 1787 of yacc.c */
-#line 2615 "conf_parser.y"
+#line 2609 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
{
@@ -6200,9 +6192,9 @@ yyreduce:
}
break;
- case 542:
+ case 540:
/* Line 1787 of yacc.c */
-#line 2624 "conf_parser.y"
+#line 2618 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
{
@@ -6212,43 +6204,59 @@ yyreduce:
}
break;
- case 543:
+ case 541:
/* Line 1787 of yacc.c */
-#line 2633 "conf_parser.y"
+#line 2627 "conf_parser.y"
{
ConfigFileEntry.ping_cookie = yylval.number;
}
break;
- case 544:
+ case 542:
/* Line 1787 of yacc.c */
-#line 2638 "conf_parser.y"
+#line 2632 "conf_parser.y"
{
ConfigFileEntry.disable_auth = yylval.number;
}
break;
- case 545:
+ case 543:
/* Line 1787 of yacc.c */
-#line 2643 "conf_parser.y"
+#line 2637 "conf_parser.y"
{
ConfigFileEntry.throttle_time = yylval.number;
}
break;
- case 546:
+ case 544:
/* Line 1787 of yacc.c */
-#line 2648 "conf_parser.y"
+#line 2642 "conf_parser.y"
{
ConfigFileEntry.oper_umodes = 0;
}
break;
+ case 548:
+/* Line 1787 of yacc.c */
+#line 2648 "conf_parser.y"
+ {
+ ConfigFileEntry.oper_umodes |= UMODE_BOTS;
+}
+ break;
+
+ case 549:
+/* Line 1787 of yacc.c */
+#line 2651 "conf_parser.y"
+ {
+ ConfigFileEntry.oper_umodes |= UMODE_CCONN;
+}
+ break;
+
case 550:
/* Line 1787 of yacc.c */
#line 2654 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_BOTS;
+ ConfigFileEntry.oper_umodes |= UMODE_DEAF;
}
break;
@@ -6256,7 +6264,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2657 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_CCONN;
+ ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
}
break;
@@ -6264,7 +6272,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2660 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_DEAF;
+ ConfigFileEntry.oper_umodes |= UMODE_FULL;
}
break;
@@ -6272,7 +6280,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2663 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
+ ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
}
break;
@@ -6280,7 +6288,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2666 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_FULL;
+ ConfigFileEntry.oper_umodes |= UMODE_SKILL;
}
break;
@@ -6288,7 +6296,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2669 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
+ ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
}
break;
@@ -6296,7 +6304,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2672 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_SKILL;
+ ConfigFileEntry.oper_umodes |= UMODE_REJ;
}
break;
@@ -6304,7 +6312,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2675 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
+ ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
}
break;
@@ -6312,7 +6320,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2678 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_REJ;
+ ConfigFileEntry.oper_umodes |= UMODE_SPY;
}
break;
@@ -6320,7 +6328,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2681 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
+ ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
}
break;
@@ -6328,7 +6336,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2684 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_SPY;
+ ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
}
break;
@@ -6336,7 +6344,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2687 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
+ ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
}
break;
@@ -6344,7 +6352,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2690 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
+ ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
}
break;
@@ -6352,7 +6360,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2693 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
+ ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
}
break;
@@ -6360,7 +6368,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2696 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
+ ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
}
break;
@@ -6368,7 +6376,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2699 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
+ ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
}
break;
@@ -6376,7 +6384,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2702 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
+ ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
}
break;
@@ -6384,7 +6392,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2705 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
+ ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
}
break;
@@ -6392,31 +6400,31 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2708 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
+ ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
}
break;
case 569:
/* Line 1787 of yacc.c */
-#line 2711 "conf_parser.y"
+#line 2713 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
+ ConfigFileEntry.oper_only_umodes = 0;
}
break;
- case 570:
+ case 573:
/* Line 1787 of yacc.c */
-#line 2714 "conf_parser.y"
+#line 2719 "conf_parser.y"
{
- ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
+ ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
}
break;
- case 571:
+ case 574:
/* Line 1787 of yacc.c */
-#line 2719 "conf_parser.y"
+#line 2722 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes = 0;
+ ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
}
break;
@@ -6424,7 +6432,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2725 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
+ ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
}
break;
@@ -6432,15 +6440,15 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2728 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
+ ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
}
break;
case 577:
/* Line 1787 of yacc.c */
#line 2731 "conf_parser.y"
- {
- ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
+ {
+ ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
}
break;
@@ -6448,15 +6456,15 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2734 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
+ ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
}
break;
case 579:
/* Line 1787 of yacc.c */
#line 2737 "conf_parser.y"
- {
- ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
+ {
+ ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
}
break;
@@ -6464,7 +6472,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2740 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
+ ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
}
break;
@@ -6472,7 +6480,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2743 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
+ ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
}
break;
@@ -6480,7 +6488,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2746 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
+ ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
}
break;
@@ -6488,7 +6496,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2749 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
+ ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
}
break;
@@ -6496,7 +6504,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2752 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
+ ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
}
break;
@@ -6504,7 +6512,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2755 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
+ ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
}
break;
@@ -6512,7 +6520,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2758 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
+ ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
}
break;
@@ -6520,7 +6528,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2761 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
+ ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
}
break;
@@ -6528,7 +6536,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2764 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
+ ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
}
break;
@@ -6536,7 +6544,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2767 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
+ ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
}
break;
@@ -6544,7 +6552,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2770 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
+ ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
}
break;
@@ -6552,7 +6560,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2773 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
+ ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
}
break;
@@ -6560,7 +6568,7 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2776 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
+ ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
}
break;
@@ -6568,158 +6576,151 @@ yyreduce:
/* Line 1787 of yacc.c */
#line 2779 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
+ ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
}
break;
case 594:
/* Line 1787 of yacc.c */
-#line 2782 "conf_parser.y"
+#line 2784 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
+ ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
}
break;
case 595:
/* Line 1787 of yacc.c */
-#line 2785 "conf_parser.y"
+#line 2789 "conf_parser.y"
{
- ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
+ ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
}
break;
case 596:
/* Line 1787 of yacc.c */
-#line 2790 "conf_parser.y"
+#line 2794 "conf_parser.y"
{
- ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
+ ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
}
break;
- case 597:
+ case 613:
/* Line 1787 of yacc.c */
-#line 2795 "conf_parser.y"
+#line 2817 "conf_parser.y"
{
- ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
+ ConfigChannel.disable_fake_channels = yylval.number;
}
break;
- case 598:
+ case 614:
/* Line 1787 of yacc.c */
-#line 2800 "conf_parser.y"
+#line 2822 "conf_parser.y"
{
- ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
+ ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
}
break;
case 615:
/* Line 1787 of yacc.c */
-#line 2823 "conf_parser.y"
+#line 2827 "conf_parser.y"
{
- ConfigChannel.disable_fake_channels = yylval.number;
+ ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
}
break;
case 616:
/* Line 1787 of yacc.c */
-#line 2828 "conf_parser.y"
+#line 2832 "conf_parser.y"
{
- ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
+ ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
}
break;
case 617:
/* Line 1787 of yacc.c */
-#line 2833 "conf_parser.y"
+#line 2837 "conf_parser.y"
{
- ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
+ ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number);
}
break;
case 618:
/* Line 1787 of yacc.c */
-#line 2838 "conf_parser.y"
+#line 2842 "conf_parser.y"
{
- ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
+ ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
}
break;
case 619:
/* Line 1787 of yacc.c */
-#line 2843 "conf_parser.y"
+#line 2847 "conf_parser.y"
{
- ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number);
+ ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
}
break;
case 620:
/* Line 1787 of yacc.c */
-#line 2848 "conf_parser.y"
+#line 2852 "conf_parser.y"
{
- ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
+ ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
}
break;
case 621:
/* Line 1787 of yacc.c */
-#line 2853 "conf_parser.y"
+#line 2857 "conf_parser.y"
{
- ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
+ ConfigChannel.no_create_on_split = yylval.number;
}
break;
case 622:
/* Line 1787 of yacc.c */
-#line 2858 "conf_parser.y"
+#line 2862 "conf_parser.y"
{
- ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
+ ConfigChannel.no_join_on_split = yylval.number;
}
break;
case 623:
/* Line 1787 of yacc.c */
-#line 2863 "conf_parser.y"
+#line 2867 "conf_parser.y"
{
- ConfigChannel.no_create_on_split = yylval.number;
+ GlobalSetOptions.joinfloodcount = yylval.number;
}
break;
case 624:
/* Line 1787 of yacc.c */
-#line 2868 "conf_parser.y"
+#line 2872 "conf_parser.y"
{
- ConfigChannel.no_join_on_split = yylval.number;
-}
- break;
-
- case 625:
-/* Line 1787 of yacc.c */
-#line 2873 "conf_parser.y"
- {
- GlobalSetOptions.joinfloodcount = yylval.number;
+ GlobalSetOptions.joinfloodtime = yylval.number;
}
break;
- case 626:
+ case 637:
/* Line 1787 of yacc.c */
-#line 2878 "conf_parser.y"
+#line 2892 "conf_parser.y"
{
- GlobalSetOptions.joinfloodtime = yylval.number;
+ if (conf_parser_ctx.pass == 2)
+ ConfigServerHide.flatten_links = yylval.number;
}
break;
case 638:
/* Line 1787 of yacc.c */
-#line 2897 "conf_parser.y"
+#line 2898 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
- ConfigServerHide.flatten_links = yylval.number;
+ ConfigServerHide.disable_remote_commands = yylval.number;
}
break;
case 639:
/* Line 1787 of yacc.c */
-#line 2903 "conf_parser.y"
+#line 2904 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_servers = yylval.number;
@@ -6728,7 +6729,7 @@ yyreduce:
case 640:
/* Line 1787 of yacc.c */
-#line 2909 "conf_parser.y"
+#line 2910 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_services = yylval.number;
@@ -6737,7 +6738,7 @@ yyreduce:
case 641:
/* Line 1787 of yacc.c */
-#line 2915 "conf_parser.y"
+#line 2916 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
{
@@ -6749,7 +6750,7 @@ yyreduce:
case 642:
/* Line 1787 of yacc.c */
-#line 2924 "conf_parser.y"
+#line 2925 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
{
@@ -6766,7 +6767,7 @@ yyreduce:
case 643:
/* Line 1787 of yacc.c */
-#line 2938 "conf_parser.y"
+#line 2939 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hidden = yylval.number;
@@ -6775,7 +6776,7 @@ yyreduce:
case 644:
/* Line 1787 of yacc.c */
-#line 2944 "conf_parser.y"
+#line 2945 "conf_parser.y"
{
if (conf_parser_ctx.pass == 2)
ConfigServerHide.hide_server_ips = yylval.number;
@@ -6784,7 +6785,7 @@ yyreduce:
/* Line 1787 of yacc.c */
-#line 6788 "conf_parser.c"
+#line 6789 "conf_parser.c"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
diff --git a/src/conf_parser.y b/src/conf_parser.y
index 68e55ec..8f66b3d 100644
--- a/src/conf_parser.y
+++ b/src/conf_parser.y
@@ -2392,7 +2392,6 @@ general_item: general_hide_spoof_ips | general_ignore_bogus_ts |
general_oper_umodes | general_caller_id_wait |
general_opers_bypass_callerid | general_default_floodcount |
general_min_nonwildcard | general_min_nonwildcard_simple |
- general_disable_remote_commands |
general_throttle_time | general_havent_read_conf |
general_ping_cookie |
general_disable_auth |
@@ -2458,11 +2457,6 @@ general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
ConfigFileEntry.ignore_bogus_ts = yylval.number;
};
-general_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
-{
- ConfigFileEntry.disable_remote = yylval.number;
-};
-
general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
{
ConfigFileEntry.failed_oper_notice = yylval.number;
@@ -2886,7 +2880,8 @@ serverhide_entry: SERVERHIDE
'{' serverhide_items '}' ';';
serverhide_items: serverhide_items serverhide_item | serverhide_item;
-serverhide_item: serverhide_flatten_links | serverhide_hide_servers |
+serverhide_item: serverhide_flatten_links | serverhide_disable_remote_commands |
+ serverhide_hide_servers |
serverhide_hide_services |
serverhide_links_delay |
serverhide_hidden | serverhide_hidden_name |
@@ -2899,6 +2894,12 @@ serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
ConfigServerHide.flatten_links = yylval.number;
};
+serverhide_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
+{
+ if (conf_parser_ctx.pass == 2)
+ ConfigServerHide.disable_remote_commands = yylval.number;
+};
+
serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
{
if (conf_parser_ctx.pass == 2)
generated by cgit (git 2.34.1) at 2025-05-10 05:50:45 +0000