From: Marcin Siodelski Date: Fri, 2 Jun 2017 12:46:16 +0000 (+0000) Subject: [5190] Regenerated CA parser files X-Git-Tag: trac5286_base~5^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04135d94ed2d7f22749a8b653e367d62b40209a9;p=thirdparty%2Fkea.git [5190] Regenerated CA parser files --- diff --git a/src/bin/agent/agent_lexer.cc b/src/bin/agent/agent_lexer.cc index 9cf0ec0d5e..5c8381538f 100644 --- a/src/bin/agent/agent_lexer.cc +++ b/src/bin/agent/agent_lexer.cc @@ -533,7 +533,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[323] = +static const flex_int16_t yy_accept[302] = { 0, 49, 49, 0, 0, 0, 0, 0, 0, 0, 0, 57, 55, 10, 11, 55, 1, 49, 46, 49, 49, @@ -548,29 +548,27 @@ static const flex_int16_t yy_accept[323] = 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, - 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 40, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, 52, 0, 51, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 53, 50, + 0, 0, 0, 0, 0, 0, 0, 53, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 27, 0, 0, 0, 0, 21, 0, 0, 0, 35, - - 36, 0, 0, 0, 0, 0, 0, 0, 30, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 32, 29, 0, 0, 0, - 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, - 0, 0, 23, 26, 31, 0, 0, 0, 0, 0, - 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 34, 0, 0, 0, 0, 18, 0, 0, - 0, 0, 13, 14, 0, 0, 0, 0, 0, 0, - 33, 0, 0, 0, 0, 24, 0, 0, 0, 0, - - 0, 0, 0, 0, 19, 20, 0, 0, 16, 17, - 0, 0, 12, 0, 0, 0, 0, 0, 28, 15, - 22, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, + 0, 0, 0, 21, 0, 0, 0, 35, 36, 0, + + 0, 0, 0, 16, 17, 30, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, + 29, 0, 0, 0, 0, 0, 0, 25, 0, 0, + 0, 0, 0, 23, 26, 31, 0, 0, 0, 0, + 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, + 34, 0, 0, 0, 0, 0, 0, 13, 14, 0, + 0, 0, 0, 0, 0, 33, 0, 0, 24, 0, + 0, 0, 0, 0, 0, 19, 20, 0, 0, 0, + 0, 12, 0, 0, 0, 0, 0, 28, 15, 22, + + 0 } ; static const YY_CHAR yy_ec[256] = @@ -616,89 +614,85 @@ static const YY_CHAR yy_meta[63] = 3, 3 } ; -static const flex_int16_t yy_base[335] = +static const flex_int16_t yy_base[314] = { 0, 0, 0, 61, 64, 67, 0, 65, 69, 49, 66, - 277, 2128, 86, 269, 129, 0, 124, 2128, 172, 129, - 84, 178, 2128, 250, 91, 76, 71, 89, 2128, 2128, - 96, 91, 95, 2128, 2128, 2128, 87, 250, 196, 0, - 222, 119, 236, 114, 199, 2128, 205, 215, 222, 209, + 277, 1955, 86, 269, 129, 0, 124, 1955, 172, 129, + 84, 178, 1955, 250, 91, 76, 71, 89, 1955, 1955, + 96, 91, 95, 1955, 1955, 1955, 87, 250, 196, 0, + 222, 119, 236, 114, 199, 1955, 205, 215, 222, 209, 235, 252, 273, 279, 287, 297, 304, 310, 317, 323, - 345, 0, 345, 367, 361, 374, 382, 2128, 0, 2128, - 144, 215, 128, 134, 119, 171, 185, 135, 2128, 172, - 204, 2128, 161, 2128, 379, 401, 409, 424, 203, 436, - 458, 444, 451, 486, 501, 507, 513, 521, 527, 537, - - 543, 549, 567, 584, 590, 603, 609, 0, 172, 199, - 209, 212, 221, 219, 149, 2128, 0, 615, 625, 639, - 167, 2128, 670, 633, 663, 670, 655, 698, 713, 719, - 726, 733, 739, 756, 764, 779, 786, 799, 805, 242, - 2128, 2128, 275, 2128, 2128, 109, 0, 817, 841, 829, - 863, 847, 890, 906, 912, 918, 932, 943, 859, 954, - 963, 969, 978, 989, 999, 1014, 1020, 1026, 2128, 2128, - 122, 0, 1034, 1040, 1051, 1057, 1070, 1107, 1076, 1100, - 1093, 1107, 1153, 1137, 1159, 1165, 1172, 1178, 1184, 1195, - 2128, 1202, 1220, 1226, 1232, 2128, 109, 0, 1240, 2128, - - 2128, 1248, 1257, 1267, 1275, 1283, 1293, 1302, 2128, 1310, - 1318, 1328, 1337, 1348, 1358, 1364, 1372, 1379, 1385, 1402, - 2128, 1415, 1409, 1421, 1427, 1440, 1446, 1452, 1458, 1464, - 1470, 1477, 1483, 1505, 1513, 2128, 2128, 1519, 1525, 1531, - 1541, 1549, 1562, 2128, 1571, 1577, 1592, 1598, 1607, 1613, - 1620, 1634, 2128, 2128, 2128, 1643, 1655, 1661, 1671, 1678, - 1685, 2128, 1691, 1697, 1709, 1715, 1721, 1732, 1745, 1752, - 1758, 1767, 2128, 1773, 1780, 1788, 1794, 2128, 1803, 1825, - 1834, 1840, 2128, 2128, 1846, 1852, 1860, 1871, 1882, 1888, - 2128, 1895, 1902, 1908, 1918, 2128, 1925, 1938, 1944, 1956, - - 1962, 1969, 1975, 1981, 2128, 2128, 1987, 1999, 2128, 2128, - 2005, 2011, 2128, 2017, 2023, 2035, 2047, 2054, 2128, 2128, - 2128, 2128, 2089, 2094, 2099, 2104, 2109, 2114, 2119, 2122, - 132, 128, 121, 111 + 345, 0, 345, 367, 361, 374, 382, 1955, 0, 1955, + 144, 215, 128, 134, 119, 171, 185, 135, 1955, 172, + 204, 1955, 161, 1955, 379, 401, 409, 424, 203, 436, + 458, 444, 451, 486, 501, 460, 507, 516, 525, 531, + + 537, 543, 551, 567, 578, 587, 595, 0, 172, 199, + 209, 212, 221, 219, 149, 1955, 0, 602, 608, 615, + 167, 1955, 647, 623, 1955, 645, 630, 690, 696, 702, + 710, 716, 726, 732, 746, 756, 767, 776, 783, 242, + 1955, 1955, 275, 1955, 1955, 109, 0, 794, 811, 802, + 835, 818, 837, 863, 881, 887, 893, 899, 905, 911, + 917, 929, 942, 948, 959, 965, 973, 1955, 1955, 122, + 0, 979, 985, 1000, 1015, 1022, 1059, 1036, 1030, 1042, + 1057, 1087, 1102, 1108, 1114, 1122, 1128, 1138, 1955, 1144, + 1163, 1175, 1181, 1955, 109, 0, 1191, 1955, 1955, 1200, + + 1211, 1217, 1226, 1955, 1955, 1955, 1239, 1256, 1269, 1275, + 1282, 1291, 1297, 1310, 1321, 1336, 1347, 1955, 1358, 1364, + 1371, 1377, 1384, 1394, 1401, 1407, 1414, 1421, 1429, 1955, + 1955, 1442, 1456, 1464, 1470, 1477, 1483, 1955, 1494, 1500, + 1508, 1525, 1531, 1955, 1955, 1955, 1538, 1548, 1556, 1562, + 1568, 1575, 1955, 1586, 1593, 1603, 1610, 1623, 1629, 1641, + 1955, 1647, 1659, 1665, 1677, 1671, 1684, 1955, 1955, 1696, + 1702, 1712, 1722, 1732, 1738, 1955, 1749, 1757, 1955, 1768, + 1774, 1785, 1792, 1798, 1804, 1955, 1955, 1810, 1816, 1822, + 1835, 1955, 1846, 1857, 1866, 1872, 1881, 1955, 1955, 1955, + + 1955, 1916, 1921, 1926, 1931, 1936, 1941, 1946, 1949, 132, + 128, 121, 111 } ; -static const flex_int16_t yy_def[335] = +static const flex_int16_t yy_def[314] = { 0, - 322, 1, 323, 323, 1, 5, 5, 5, 5, 5, - 322, 322, 322, 322, 324, 325, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 326, - 322, 322, 322, 327, 324, 322, 324, 324, 324, 328, - 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, - 324, 325, 322, 322, 322, 322, 322, 322, 329, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 326, 322, 327, 322, 322, 324, 324, 324, 330, 324, - 328, 324, 324, 324, 324, 324, 324, 324, 324, 324, - - 324, 324, 324, 324, 324, 324, 324, 329, 322, 322, - 322, 322, 322, 322, 322, 322, 331, 324, 324, 324, - 330, 322, 328, 324, 324, 324, 324, 324, 324, 324, - 324, 324, 324, 324, 324, 324, 324, 324, 324, 322, - 322, 322, 322, 322, 322, 322, 332, 324, 324, 324, - 328, 324, 324, 324, 324, 324, 324, 324, 324, 324, - 324, 324, 324, 324, 324, 324, 324, 324, 322, 322, - 322, 333, 324, 324, 324, 324, 324, 328, 324, 324, - 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, - 322, 324, 324, 324, 324, 322, 322, 334, 324, 322, - - 322, 324, 324, 324, 324, 324, 324, 324, 322, 324, - 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, - 322, 324, 324, 324, 324, 324, 324, 324, 324, 324, - 324, 324, 324, 324, 324, 322, 322, 324, 324, 324, - 324, 324, 324, 322, 324, 324, 324, 324, 324, 324, - 324, 324, 322, 322, 322, 324, 324, 324, 324, 324, - 324, 322, 324, 324, 324, 324, 324, 324, 324, 324, - 324, 324, 322, 324, 324, 324, 324, 322, 324, 324, - 324, 324, 322, 322, 324, 324, 324, 324, 324, 324, - 322, 324, 324, 324, 324, 322, 324, 324, 324, 324, - - 324, 324, 324, 324, 322, 322, 324, 324, 322, 322, - 324, 324, 322, 324, 324, 324, 324, 324, 322, 322, - 322, 0, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322 + 301, 1, 302, 302, 1, 5, 5, 5, 5, 5, + 301, 301, 301, 301, 303, 304, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 305, + 301, 301, 301, 306, 303, 301, 303, 303, 303, 307, + 303, 303, 303, 303, 303, 303, 303, 303, 303, 303, + 303, 304, 301, 301, 301, 301, 301, 301, 308, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 305, 301, 306, 301, 301, 303, 303, 303, 309, 303, + 307, 303, 303, 303, 303, 303, 303, 303, 303, 303, + + 303, 303, 303, 303, 303, 303, 303, 308, 301, 301, + 301, 301, 301, 301, 301, 301, 310, 303, 303, 303, + 309, 301, 307, 303, 301, 303, 303, 303, 303, 303, + 303, 303, 303, 303, 303, 303, 303, 303, 303, 301, + 301, 301, 301, 301, 301, 301, 311, 303, 303, 303, + 307, 303, 303, 303, 303, 303, 303, 303, 303, 303, + 303, 303, 303, 303, 303, 303, 303, 301, 301, 301, + 312, 303, 303, 303, 303, 303, 307, 303, 303, 303, + 303, 303, 303, 303, 303, 303, 303, 303, 301, 303, + 303, 303, 303, 301, 301, 313, 303, 301, 301, 303, + + 303, 303, 303, 301, 301, 301, 303, 303, 303, 303, + 303, 303, 303, 303, 303, 303, 303, 301, 303, 303, + 303, 303, 303, 303, 303, 303, 303, 303, 303, 301, + 301, 303, 303, 303, 303, 303, 303, 301, 303, 303, + 303, 303, 303, 301, 301, 301, 303, 303, 303, 303, + 303, 303, 301, 303, 303, 303, 303, 303, 303, 303, + 301, 303, 303, 303, 303, 303, 303, 301, 301, 303, + 303, 303, 303, 303, 303, 301, 303, 303, 301, 303, + 303, 303, 303, 303, 303, 301, 301, 303, 303, 303, + 303, 301, 303, 303, 303, 303, 303, 301, 301, 301, + + 0, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301 } ; -static const flex_int16_t yy_nxt[2191] = +static const flex_int16_t yy_nxt[2018] = { 0, 12, 13, 14, 13, 12, 15, 16, 12, 17, 18, 19, 20, 21, 22, 22, 22, 22, 23, 24, 12, @@ -713,11 +707,11 @@ static const flex_int16_t yy_nxt[2191] = 12, 71, 12, 74, 72, 72, 72, 72, 12, 12, 12, 12, 39, 73, 12, 83, 12, 73, 75, 84, - 42, 12, 42, 74, 75, 198, 74, 12, 12, 44, - 44, 44, 172, 76, 46, 63, 147, 64, 64, 64, + 42, 12, 42, 74, 75, 196, 74, 12, 12, 44, + 44, 44, 171, 76, 46, 63, 147, 64, 64, 64, 64, 75, 67, 67, 67, 67, 77, 78, 85, 65, - 221, 111, 47, 48, 65, 109, 49, 72, 72, 72, - 72, 110, 197, 50, 171, 65, 84, 111, 51, 52, + 218, 111, 47, 48, 65, 109, 49, 72, 72, 72, + 72, 110, 195, 50, 170, 65, 84, 111, 51, 52, 65, 53, 122, 54, 111, 109, 55, 56, 57, 58, 59, 110, 60, 63, 61, 66, 66, 66, 66, 63, 114, 66, 66, 66, 66, 85, 146, 65, 109, 44, @@ -728,221 +722,203 @@ static const flex_int16_t yy_nxt[2191] = 72, 72, 113, 50, 142, 44, 44, 44, 43, 50, 46, 82, 140, 45, 142, 80, 141, 45, 141, 50, 142, 45, 44, 44, 44, 86, 50, 46, 45, 87, - 145, 45, 79, 45, 91, 143, 93, 169, 144, 50, - 70, 43, 88, 44, 44, 44, 322, 322, 46, 44, - 44, 44, 322, 169, 46, 92, 50, 44, 44, 44, - 322, 322, 46, 94, 322, 322, 95, 44, 44, 44, - - 169, 322, 46, 322, 44, 44, 44, 50, 322, 46, - 44, 44, 44, 50, 322, 46, 170, 44, 44, 44, - 96, 50, 46, 44, 44, 44, 322, 322, 46, 97, - 322, 50, 99, 98, 101, 322, 322, 100, 50, 322, - 322, 102, 322, 322, 50, 44, 44, 44, 322, 322, - 46, 50, 322, 322, 104, 322, 322, 50, 67, 67, - 67, 67, 322, 322, 105, 103, 322, 322, 322, 71, - 65, 71, 322, 106, 72, 72, 72, 72, 63, 50, + 145, 45, 79, 45, 91, 143, 93, 168, 144, 50, + 70, 43, 88, 44, 44, 44, 301, 301, 46, 44, + 44, 44, 301, 168, 46, 92, 50, 44, 44, 44, + 301, 301, 46, 94, 301, 301, 95, 44, 44, 44, + + 168, 301, 46, 301, 44, 44, 44, 50, 301, 46, + 44, 44, 44, 50, 301, 46, 169, 44, 44, 44, + 96, 50, 46, 44, 44, 44, 301, 301, 46, 97, + 301, 50, 99, 98, 101, 301, 301, 100, 50, 301, + 301, 102, 301, 301, 50, 44, 44, 44, 301, 301, + 46, 50, 301, 301, 104, 301, 301, 50, 67, 67, + 67, 67, 301, 301, 105, 103, 301, 301, 301, 71, + 65, 71, 301, 106, 72, 72, 72, 72, 63, 50, 64, 64, 64, 64, 83, 63, 65, 66, 66, 66, - 66, 83, 65, 322, 107, 67, 67, 67, 67, 65, - - 322, 44, 44, 44, 322, 322, 46, 65, 65, 44, - 44, 44, 322, 83, 46, 65, 322, 83, 322, 322, - 322, 83, 322, 65, 44, 44, 44, 322, 83, 46, - 322, 83, 322, 83, 117, 50, 44, 44, 44, 322, - 322, 46, 322, 50, 44, 44, 44, 322, 119, 46, - 118, 44, 44, 44, 322, 322, 46, 322, 50, 322, - 322, 125, 322, 322, 322, 322, 322, 120, 322, 322, - 50, 123, 123, 123, 123, 322, 322, 322, 50, 123, - 123, 123, 123, 123, 123, 50, 44, 44, 44, 322, - 322, 46, 322, 124, 322, 123, 123, 123, 123, 123, - - 123, 44, 44, 44, 322, 322, 46, 44, 44, 44, - 322, 322, 46, 44, 44, 44, 322, 322, 46, 322, - 50, 44, 44, 44, 126, 322, 46, 44, 44, 44, - 322, 322, 46, 322, 322, 50, 322, 44, 44, 44, - 127, 50, 46, 44, 44, 44, 322, 50, 46, 44, - 44, 44, 322, 322, 46, 50, 322, 322, 322, 322, - 322, 50, 128, 129, 322, 131, 322, 44, 44, 44, - 322, 50, 46, 322, 322, 130, 322, 50, 322, 322, - 132, 322, 322, 50, 44, 44, 44, 322, 322, 46, - 44, 44, 44, 322, 322, 46, 322, 134, 322, 322, - - 133, 50, 322, 44, 44, 44, 322, 322, 46, 44, - 44, 44, 322, 322, 46, 44, 44, 44, 50, 322, - 46, 135, 322, 322, 50, 44, 44, 44, 322, 322, - 46, 322, 322, 44, 44, 44, 136, 50, 46, 44, - 44, 44, 138, 50, 46, 322, 137, 322, 322, 50, - 322, 322, 322, 322, 139, 44, 44, 44, 322, 50, - 46, 322, 322, 44, 44, 44, 322, 50, 46, 148, - 44, 44, 44, 50, 322, 46, 149, 322, 322, 322, - 322, 322, 150, 151, 151, 151, 151, 152, 322, 50, - 322, 151, 151, 151, 151, 151, 151, 50, 44, 44, - - 44, 322, 322, 46, 50, 322, 155, 151, 151, 151, - 151, 151, 151, 44, 44, 44, 153, 322, 46, 44, - 44, 44, 322, 322, 46, 154, 44, 44, 44, 322, - 322, 46, 50, 44, 44, 44, 322, 322, 46, 44, - 44, 44, 322, 322, 46, 322, 322, 50, 322, 322, - 322, 156, 322, 50, 322, 322, 44, 44, 44, 157, - 50, 46, 322, 322, 44, 44, 44, 50, 322, 46, - 158, 322, 322, 50, 322, 322, 160, 322, 159, 44, - 44, 44, 322, 322, 46, 322, 44, 44, 44, 322, - 50, 46, 161, 322, 322, 162, 322, 163, 50, 44, - - 44, 44, 322, 322, 46, 44, 44, 44, 322, 322, - 46, 322, 322, 50, 322, 164, 165, 44, 44, 44, - 50, 322, 46, 322, 322, 322, 322, 166, 322, 44, - 44, 44, 322, 50, 46, 322, 322, 322, 322, 50, - 322, 44, 44, 44, 322, 167, 46, 44, 44, 44, - 322, 50, 46, 322, 322, 322, 174, 175, 322, 44, - 44, 44, 168, 50, 46, 176, 322, 322, 322, 173, - 322, 322, 322, 322, 177, 50, 178, 178, 178, 178, - 322, 50, 322, 322, 178, 178, 178, 178, 178, 178, - 44, 44, 44, 50, 322, 46, 187, 322, 322, 179, - - 178, 178, 178, 178, 178, 178, 44, 44, 44, 322, - 322, 46, 44, 44, 44, 322, 322, 46, 44, 44, - 44, 322, 322, 46, 50, 322, 322, 182, 183, 322, - 322, 180, 44, 44, 44, 322, 322, 46, 322, 322, - 50, 322, 322, 44, 44, 44, 50, 322, 46, 181, - 322, 322, 50, 186, 44, 44, 44, 322, 322, 46, - 322, 322, 184, 44, 44, 44, 50, 322, 46, 44, - 44, 44, 322, 322, 46, 322, 322, 50, 44, 44, - 44, 322, 322, 191, 322, 185, 322, 322, 50, 44, - 44, 44, 322, 322, 46, 188, 322, 50, 322, 44, - - 44, 44, 322, 50, 46, 322, 322, 322, 189, 322, - 190, 322, 50, 322, 44, 44, 44, 322, 322, 46, - 44, 44, 44, 50, 322, 46, 44, 44, 44, 322, - 322, 196, 322, 50, 44, 44, 44, 322, 322, 46, - 44, 44, 44, 322, 192, 200, 322, 193, 50, 322, - 322, 44, 44, 44, 50, 322, 201, 44, 44, 44, - 50, 195, 46, 322, 322, 322, 194, 322, 50, 322, - 44, 44, 44, 322, 50, 46, 44, 44, 44, 322, - 322, 46, 322, 322, 199, 50, 322, 322, 322, 322, - 322, 50, 322, 44, 44, 44, 322, 202, 46, 322, - - 44, 44, 44, 322, 50, 46, 322, 44, 44, 44, - 50, 322, 46, 322, 322, 322, 322, 207, 322, 203, - 45, 45, 45, 45, 322, 322, 204, 50, 45, 45, - 45, 45, 45, 45, 50, 322, 322, 44, 44, 44, - 206, 50, 209, 322, 45, 45, 45, 45, 45, 45, - 322, 322, 205, 44, 44, 44, 322, 322, 46, 44, - 44, 44, 322, 208, 46, 44, 44, 44, 322, 210, - 46, 50, 44, 44, 44, 322, 322, 46, 44, 44, - 44, 322, 322, 46, 44, 44, 44, 50, 322, 46, - 322, 322, 322, 50, 322, 44, 44, 44, 322, 50, - - 46, 322, 44, 44, 44, 322, 50, 46, 322, 211, - 322, 322, 50, 322, 322, 322, 212, 322, 50, 322, - 44, 44, 44, 322, 213, 46, 44, 44, 44, 50, - 214, 46, 44, 44, 44, 322, 50, 46, 322, 322, - 44, 44, 44, 215, 322, 46, 322, 216, 44, 44, - 44, 322, 322, 46, 50, 322, 217, 44, 44, 44, - 50, 218, 46, 322, 322, 322, 50, 44, 44, 44, - 322, 219, 46, 322, 50, 44, 44, 44, 322, 322, - 46, 322, 50, 44, 44, 44, 220, 222, 46, 322, - 322, 50, 322, 44, 44, 44, 322, 223, 46, 322, - - 224, 50, 44, 44, 44, 322, 322, 46, 322, 50, - 44, 44, 44, 322, 225, 46, 322, 50, 44, 44, - 44, 322, 322, 46, 227, 322, 322, 50, 44, 44, - 44, 226, 322, 46, 322, 322, 50, 44, 44, 44, - 322, 322, 46, 322, 50, 322, 228, 322, 44, 44, - 44, 322, 50, 46, 322, 229, 322, 230, 44, 44, - 44, 322, 50, 46, 44, 44, 44, 322, 231, 236, - 322, 50, 44, 44, 44, 322, 322, 237, 232, 44, - 44, 44, 50, 322, 46, 44, 44, 44, 322, 322, - 46, 322, 50, 322, 322, 233, 322, 322, 50, 235, - - 322, 234, 44, 44, 44, 322, 50, 46, 238, 44, - 44, 44, 241, 50, 46, 44, 44, 44, 322, 50, - 46, 44, 44, 44, 322, 242, 244, 44, 44, 44, - 322, 322, 46, 239, 322, 322, 50, 245, 322, 240, - 44, 44, 44, 50, 322, 46, 44, 44, 44, 50, - 322, 46, 44, 44, 44, 50, 322, 46, 44, 44, - 44, 50, 243, 46, 44, 44, 44, 322, 322, 46, - 44, 44, 44, 322, 50, 46, 322, 44, 44, 44, - 50, 246, 46, 44, 44, 44, 50, 322, 253, 322, - 322, 322, 50, 248, 322, 322, 322, 322, 50, 249, - - 322, 322, 247, 322, 50, 44, 44, 44, 322, 250, - 254, 50, 322, 44, 44, 44, 322, 50, 255, 44, - 44, 44, 322, 251, 46, 44, 44, 44, 322, 252, - 46, 44, 44, 44, 322, 322, 46, 322, 322, 50, - 322, 44, 44, 44, 322, 322, 46, 50, 322, 44, - 44, 44, 322, 50, 46, 322, 322, 322, 322, 50, - 322, 322, 44, 44, 44, 50, 257, 262, 322, 256, - 322, 44, 44, 44, 322, 50, 46, 44, 44, 44, - 322, 322, 46, 50, 322, 322, 261, 322, 322, 258, - 259, 322, 44, 44, 44, 260, 50, 46, 44, 44, - - 44, 322, 322, 46, 322, 50, 322, 44, 44, 44, - 322, 50, 46, 44, 44, 44, 322, 322, 46, 322, - 44, 44, 44, 322, 263, 46, 50, 322, 322, 264, - 322, 322, 50, 265, 44, 44, 44, 322, 322, 46, - 322, 50, 322, 44, 44, 44, 322, 50, 46, 322, - 266, 268, 322, 322, 50, 44, 44, 44, 322, 267, - 46, 44, 44, 44, 322, 322, 273, 322, 50, 322, - 322, 44, 44, 44, 269, 322, 46, 50, 44, 44, - 44, 322, 322, 46, 322, 44, 44, 44, 270, 50, - 46, 44, 44, 44, 271, 50, 46, 44, 44, 44, - - 322, 322, 278, 322, 322, 50, 322, 272, 274, 44, - 44, 44, 50, 322, 46, 44, 44, 44, 322, 50, - 46, 44, 44, 44, 322, 50, 46, 322, 276, 322, - 322, 50, 44, 44, 44, 322, 275, 46, 322, 322, - 322, 277, 322, 50, 322, 44, 44, 44, 322, 50, - 283, 322, 44, 44, 44, 50, 279, 284, 44, 44, - 44, 322, 322, 46, 322, 322, 50, 44, 44, 44, - 322, 280, 46, 44, 44, 44, 322, 281, 46, 50, - 44, 44, 44, 322, 282, 46, 50, 322, 44, 44, - 44, 322, 50, 46, 44, 44, 44, 322, 322, 46, - - 322, 50, 322, 44, 44, 44, 322, 50, 291, 322, - 322, 322, 285, 322, 50, 322, 322, 322, 322, 322, - 286, 287, 50, 322, 322, 44, 44, 44, 50, 289, - 46, 288, 322, 290, 44, 44, 44, 50, 322, 46, - 44, 44, 44, 322, 322, 46, 44, 44, 44, 322, - 322, 46, 44, 44, 44, 322, 322, 296, 322, 50, - 44, 44, 44, 322, 322, 46, 292, 322, 50, 322, - 322, 44, 44, 44, 50, 293, 46, 294, 322, 322, - 50, 322, 44, 44, 44, 322, 50, 46, 44, 44, - 44, 295, 322, 46, 50, 44, 44, 44, 322, 322, - - 46, 297, 44, 44, 44, 50, 322, 46, 44, 44, - 44, 322, 298, 46, 322, 322, 50, 322, 44, 44, - 44, 322, 50, 46, 322, 44, 44, 44, 322, 50, - 305, 299, 322, 322, 300, 322, 50, 322, 44, 44, - 44, 322, 50, 306, 44, 44, 44, 301, 322, 46, - 322, 322, 50, 322, 302, 322, 44, 44, 44, 50, - 303, 46, 44, 44, 44, 322, 322, 309, 304, 44, - 44, 44, 50, 322, 310, 44, 44, 44, 50, 322, - 46, 44, 44, 44, 322, 322, 46, 44, 44, 44, - 50, 322, 313, 322, 322, 322, 50, 308, 307, 44, - - 44, 44, 322, 50, 46, 44, 44, 44, 322, 50, - 46, 44, 44, 44, 322, 50, 46, 44, 44, 44, - 311, 50, 46, 44, 44, 44, 322, 322, 46, 322, - 312, 322, 322, 50, 322, 44, 44, 44, 322, 50, - 319, 322, 322, 322, 322, 50, 315, 44, 44, 44, - 322, 50, 320, 314, 44, 44, 44, 50, 322, 321, - 322, 322, 322, 322, 316, 322, 322, 322, 322, 50, - 317, 322, 322, 322, 322, 322, 318, 322, 322, 322, - 322, 50, 322, 322, 322, 322, 322, 322, 50, 36, - 36, 36, 36, 36, 45, 45, 45, 45, 45, 62, - - 322, 62, 62, 62, 81, 322, 81, 322, 81, 83, - 83, 83, 83, 83, 89, 89, 89, 89, 89, 108, - 322, 108, 108, 108, 121, 121, 121, 11, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322 + 66, 83, 65, 301, 107, 67, 67, 67, 67, 65, + + 301, 44, 44, 44, 301, 301, 46, 65, 65, 44, + 44, 44, 301, 83, 46, 65, 301, 83, 301, 301, + 301, 83, 301, 65, 44, 44, 44, 301, 83, 46, + 301, 83, 301, 83, 117, 50, 44, 44, 44, 301, + 301, 46, 301, 50, 44, 44, 44, 301, 119, 46, + 118, 44, 44, 44, 301, 301, 125, 301, 50, 301, + 44, 44, 44, 301, 301, 46, 301, 120, 301, 301, + 50, 123, 123, 123, 123, 301, 301, 301, 50, 123, + 123, 123, 123, 123, 123, 50, 44, 44, 44, 301, + 301, 46, 301, 124, 50, 123, 123, 123, 123, 123, + + 123, 44, 44, 44, 301, 301, 46, 44, 44, 44, + 301, 301, 46, 301, 301, 128, 44, 44, 44, 301, + 50, 46, 301, 301, 126, 44, 44, 44, 301, 301, + 46, 44, 44, 44, 301, 50, 46, 44, 44, 44, + 127, 50, 46, 44, 44, 44, 301, 301, 46, 301, + 50, 44, 44, 44, 301, 301, 46, 129, 301, 50, + 301, 301, 301, 131, 301, 50, 301, 44, 44, 44, + 130, 50, 46, 301, 132, 301, 301, 50, 44, 44, + 44, 301, 301, 46, 301, 50, 301, 44, 44, 44, + 301, 134, 46, 301, 133, 44, 44, 44, 301, 301, + + 46, 50, 44, 44, 44, 135, 301, 46, 44, 44, + 44, 301, 50, 46, 301, 44, 44, 44, 301, 136, + 46, 50, 301, 44, 44, 44, 138, 301, 46, 50, + 44, 44, 44, 301, 137, 46, 50, 301, 301, 301, + 139, 301, 50, 301, 301, 44, 44, 44, 301, 50, + 46, 301, 301, 301, 301, 301, 148, 50, 150, 149, + 151, 151, 151, 151, 50, 301, 301, 301, 151, 151, + 151, 151, 151, 151, 301, 301, 301, 152, 301, 50, + 301, 154, 301, 301, 151, 151, 151, 151, 151, 151, + 44, 44, 44, 301, 301, 46, 44, 44, 44, 301, + + 153, 46, 44, 44, 44, 301, 301, 46, 301, 301, + 44, 44, 44, 301, 301, 46, 44, 44, 44, 301, + 301, 46, 301, 301, 50, 301, 44, 44, 44, 301, + 50, 46, 44, 44, 44, 301, 50, 46, 301, 301, + 301, 301, 156, 155, 50, 301, 44, 44, 44, 301, + 50, 46, 301, 157, 301, 301, 44, 44, 44, 159, + 50, 46, 158, 301, 301, 301, 50, 44, 44, 44, + 301, 301, 46, 162, 301, 301, 44, 44, 44, 160, + 50, 46, 161, 44, 44, 44, 301, 301, 46, 301, + 50, 301, 301, 164, 44, 44, 44, 163, 301, 46, + + 301, 50, 44, 44, 44, 301, 301, 46, 165, 301, + 50, 44, 44, 44, 301, 301, 46, 50, 44, 44, + 44, 301, 166, 46, 301, 301, 173, 174, 50, 301, + 301, 301, 301, 301, 301, 175, 50, 44, 44, 44, + 167, 301, 46, 301, 301, 50, 172, 176, 177, 177, + 177, 177, 50, 301, 301, 301, 177, 177, 177, 177, + 177, 177, 301, 44, 44, 44, 301, 301, 46, 301, + 178, 50, 177, 177, 177, 177, 177, 177, 180, 181, + 179, 44, 44, 44, 301, 301, 46, 44, 44, 44, + 301, 301, 46, 44, 44, 44, 301, 50, 46, 44, + + 44, 44, 301, 184, 46, 44, 44, 44, 301, 301, + 46, 44, 44, 44, 301, 50, 46, 44, 44, 44, + 301, 50, 46, 301, 301, 182, 301, 50, 301, 44, + 44, 44, 301, 50, 189, 301, 185, 301, 301, 50, + 183, 301, 44, 44, 44, 50, 186, 46, 44, 44, + 44, 50, 301, 46, 301, 301, 187, 301, 188, 44, + 44, 44, 301, 50, 46, 44, 44, 44, 301, 301, + 46, 301, 301, 44, 44, 44, 50, 301, 194, 44, + 44, 44, 50, 301, 46, 44, 44, 44, 301, 301, + 198, 301, 301, 50, 301, 301, 191, 190, 301, 50, + + 44, 44, 44, 301, 301, 199, 193, 50, 301, 301, + 301, 192, 301, 50, 301, 44, 44, 44, 301, 50, + 46, 301, 44, 44, 44, 301, 301, 46, 301, 197, + 44, 44, 44, 301, 50, 46, 44, 44, 44, 301, + 301, 46, 44, 44, 44, 301, 301, 204, 301, 50, + 301, 301, 301, 301, 301, 200, 50, 44, 44, 44, + 301, 301, 205, 301, 50, 301, 301, 301, 301, 301, + 50, 201, 45, 45, 45, 45, 50, 203, 301, 301, + 45, 45, 45, 45, 45, 45, 202, 44, 44, 44, + 301, 50, 206, 301, 301, 301, 45, 45, 45, 45, + + 45, 45, 44, 44, 44, 301, 301, 46, 44, 44, + 44, 301, 207, 46, 44, 44, 44, 301, 301, 46, + 301, 50, 44, 44, 44, 301, 301, 46, 44, 44, + 44, 301, 301, 46, 301, 301, 50, 301, 44, 44, + 44, 301, 50, 46, 44, 44, 44, 301, 50, 46, + 301, 301, 208, 301, 301, 301, 50, 301, 301, 209, + 301, 301, 50, 44, 44, 44, 210, 301, 46, 301, + 301, 301, 50, 301, 211, 44, 44, 44, 50, 301, + 46, 44, 44, 44, 301, 301, 46, 212, 301, 301, + 213, 44, 44, 44, 301, 301, 46, 50, 214, 301, + + 44, 44, 44, 301, 215, 46, 301, 301, 301, 50, + 301, 44, 44, 44, 301, 50, 46, 44, 44, 44, + 216, 301, 46, 301, 301, 50, 44, 44, 44, 301, + 301, 46, 301, 301, 50, 217, 301, 301, 219, 44, + 44, 44, 301, 301, 46, 50, 301, 301, 301, 220, + 301, 50, 301, 301, 221, 301, 44, 44, 44, 301, + 50, 46, 301, 301, 222, 301, 301, 223, 301, 44, + 44, 44, 301, 50, 46, 44, 44, 44, 301, 301, + 46, 301, 44, 44, 44, 301, 224, 46, 301, 301, + 50, 44, 44, 44, 301, 301, 46, 44, 44, 44, + + 301, 301, 230, 50, 301, 301, 225, 301, 301, 50, + 44, 44, 44, 301, 301, 231, 50, 301, 301, 226, + 301, 44, 44, 44, 301, 50, 46, 301, 301, 301, + 301, 50, 229, 227, 301, 228, 44, 44, 44, 301, + 301, 46, 301, 301, 50, 301, 232, 44, 44, 44, + 301, 301, 46, 301, 301, 50, 301, 235, 44, 44, + 44, 301, 301, 46, 44, 44, 44, 301, 236, 46, + 50, 44, 44, 44, 301, 233, 238, 44, 44, 44, + 301, 50, 46, 301, 44, 44, 44, 239, 301, 46, + 234, 301, 50, 301, 44, 44, 44, 301, 50, 46, + + 301, 44, 44, 44, 301, 50, 46, 44, 44, 44, + 301, 50, 46, 301, 44, 44, 44, 237, 50, 244, + 301, 44, 44, 44, 301, 301, 245, 301, 50, 44, + 44, 44, 301, 301, 246, 50, 301, 301, 301, 241, + 240, 50, 44, 44, 44, 301, 301, 46, 50, 301, + 301, 301, 301, 301, 242, 50, 44, 44, 44, 243, + 301, 46, 301, 50, 44, 44, 44, 301, 301, 46, + 44, 44, 44, 301, 301, 46, 50, 44, 44, 44, + 301, 301, 46, 44, 44, 44, 301, 301, 253, 301, + 50, 301, 247, 301, 44, 44, 44, 248, 50, 46, + + 44, 44, 44, 301, 50, 46, 301, 301, 44, 44, + 44, 50, 301, 46, 252, 301, 301, 50, 301, 250, + 301, 301, 249, 301, 251, 44, 44, 44, 50, 301, + 46, 44, 44, 44, 50, 301, 46, 301, 44, 44, + 44, 255, 50, 46, 301, 301, 256, 254, 44, 44, + 44, 301, 301, 46, 301, 301, 44, 44, 44, 50, + 301, 261, 44, 44, 44, 50, 301, 46, 44, 44, + 44, 301, 50, 46, 301, 44, 44, 44, 301, 257, + 46, 301, 50, 301, 301, 258, 44, 44, 44, 259, + 50, 46, 301, 44, 44, 44, 50, 301, 46, 262, + + 260, 301, 50, 44, 44, 44, 301, 301, 46, 50, + 44, 44, 44, 301, 301, 268, 301, 301, 264, 301, + 50, 301, 301, 44, 44, 44, 263, 50, 269, 44, + 44, 44, 301, 301, 46, 301, 265, 50, 301, 301, + 266, 44, 44, 44, 50, 301, 46, 44, 44, 44, + 301, 301, 46, 301, 301, 267, 301, 50, 301, 44, + 44, 44, 301, 50, 46, 44, 44, 44, 301, 301, + 46, 44, 44, 44, 301, 50, 276, 44, 44, 44, + 301, 50, 46, 270, 44, 44, 44, 301, 301, 46, + 301, 301, 301, 50, 271, 272, 44, 44, 44, 50, + + 301, 46, 44, 44, 44, 50, 274, 279, 301, 301, + 273, 50, 44, 44, 44, 301, 275, 46, 50, 301, + 301, 277, 44, 44, 44, 301, 301, 46, 301, 301, + 50, 301, 44, 44, 44, 301, 50, 46, 44, 44, + 44, 278, 301, 46, 301, 301, 50, 301, 301, 44, + 44, 44, 301, 280, 46, 301, 50, 44, 44, 44, + 301, 301, 46, 281, 301, 301, 50, 301, 44, 44, + 44, 301, 50, 286, 44, 44, 44, 301, 301, 287, + 301, 282, 301, 50, 283, 44, 44, 44, 301, 301, + 46, 50, 44, 44, 44, 301, 301, 46, 44, 44, + + 44, 284, 50, 46, 44, 44, 44, 285, 50, 46, + 44, 44, 44, 301, 301, 292, 44, 44, 44, 50, + 301, 46, 44, 44, 44, 301, 50, 46, 301, 301, + 301, 301, 50, 289, 301, 44, 44, 44, 50, 288, + 46, 301, 301, 290, 50, 301, 44, 44, 44, 301, + 50, 46, 301, 291, 301, 301, 50, 44, 44, 44, + 301, 301, 46, 294, 301, 301, 44, 44, 44, 50, + 293, 298, 44, 44, 44, 301, 301, 299, 301, 301, + 50, 44, 44, 44, 301, 301, 300, 301, 295, 301, + 301, 50, 301, 301, 301, 301, 301, 301, 301, 296, + + 50, 301, 301, 301, 301, 301, 50, 301, 301, 301, + 297, 301, 301, 301, 301, 50, 36, 36, 36, 36, + 36, 45, 45, 45, 45, 45, 62, 301, 62, 62, + 62, 81, 301, 81, 301, 81, 83, 83, 83, 83, + 83, 89, 89, 89, 89, 89, 108, 301, 108, 108, + 108, 121, 121, 121, 11, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301 } ; -static const flex_int16_t yy_chk[2191] = +static const flex_int16_t yy_chk[2018] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -956,12 +932,12 @@ static const flex_int16_t yy_chk[2191] = 37, 21, 5, 5, 9, 5, 21, 26, 5, 25, 5, 25, 5, 27, 25, 25, 25, 25, 5, 5, - 7, 10, 5, 26, 8, 334, 5, 31, 28, 44, - 42, 5, 42, 32, 33, 333, 27, 5, 5, 15, - 15, 15, 332, 31, 15, 17, 331, 17, 17, 17, + 7, 10, 5, 26, 8, 313, 5, 31, 28, 44, + 42, 5, 42, 32, 33, 312, 27, 5, 5, 15, + 15, 15, 311, 31, 15, 17, 310, 17, 17, 17, 17, 28, 20, 20, 20, 20, 32, 33, 44, 17, - 197, 75, 15, 15, 20, 73, 15, 71, 71, 71, - 71, 74, 171, 15, 146, 17, 83, 78, 15, 15, + 195, 75, 15, 15, 20, 73, 15, 71, 71, 71, + 71, 74, 170, 15, 146, 17, 83, 78, 15, 15, 20, 15, 121, 15, 75, 73, 15, 15, 15, 15, 15, 74, 15, 19, 15, 19, 19, 19, 19, 22, 78, 22, 22, 22, 22, 83, 115, 19, 76, 45, @@ -994,196 +970,178 @@ static const flex_int16_t yy_chk[2191] = 0, 85, 0, 85, 85, 86, 90, 90, 90, 0, 0, 90, 0, 87, 92, 92, 92, 0, 87, 92, 86, 93, 93, 93, 0, 0, 93, 0, 88, 0, - 0, 93, 0, 0, 0, 0, 0, 88, 0, 0, + 96, 96, 96, 0, 0, 96, 0, 88, 0, 0, 90, 91, 91, 91, 91, 0, 0, 0, 92, 91, 91, 91, 91, 91, 91, 93, 94, 94, 94, 0, - 0, 94, 0, 92, 0, 91, 91, 91, 91, 91, - - 91, 95, 95, 95, 0, 0, 95, 96, 96, 96, - 0, 0, 96, 97, 97, 97, 0, 0, 97, 0, - 94, 98, 98, 98, 94, 0, 98, 99, 99, 99, - 0, 0, 99, 0, 0, 95, 0, 100, 100, 100, - 95, 96, 100, 101, 101, 101, 0, 97, 101, 102, - 102, 102, 0, 0, 102, 98, 0, 0, 0, 0, - 0, 99, 96, 97, 0, 99, 0, 103, 103, 103, - 0, 100, 103, 0, 0, 98, 0, 101, 0, 0, - 100, 0, 0, 102, 104, 104, 104, 0, 0, 104, - 105, 105, 105, 0, 0, 105, 0, 102, 0, 0, - - 101, 103, 0, 106, 106, 106, 0, 0, 106, 107, - 107, 107, 0, 0, 107, 118, 118, 118, 104, 0, - 118, 103, 0, 0, 105, 119, 119, 119, 0, 0, - 119, 0, 0, 124, 124, 124, 104, 106, 124, 120, - 120, 120, 106, 107, 120, 0, 105, 0, 0, 118, - 0, 0, 0, 0, 107, 127, 127, 127, 0, 119, - 127, 0, 0, 125, 125, 125, 0, 124, 125, 118, - 126, 126, 126, 120, 0, 126, 119, 0, 0, 0, - 0, 0, 120, 123, 123, 123, 123, 124, 0, 127, - 0, 123, 123, 123, 123, 123, 123, 125, 128, 128, - - 128, 0, 0, 128, 126, 0, 127, 123, 123, 123, - 123, 123, 123, 129, 129, 129, 125, 0, 129, 130, - 130, 130, 0, 0, 130, 126, 131, 131, 131, 0, - 0, 131, 128, 132, 132, 132, 0, 0, 132, 133, - 133, 133, 0, 0, 133, 0, 0, 129, 0, 0, - 0, 128, 0, 130, 0, 0, 134, 134, 134, 129, - 131, 134, 0, 0, 135, 135, 135, 132, 0, 135, - 130, 0, 0, 133, 0, 0, 132, 0, 131, 136, - 136, 136, 0, 0, 136, 0, 137, 137, 137, 0, - 134, 137, 133, 0, 0, 133, 0, 134, 135, 138, - - 138, 138, 0, 0, 138, 139, 139, 139, 0, 0, - 139, 0, 0, 136, 0, 135, 136, 148, 148, 148, - 137, 0, 148, 0, 0, 0, 0, 137, 0, 150, - 150, 150, 0, 138, 150, 0, 0, 0, 0, 139, - 0, 149, 149, 149, 0, 138, 149, 152, 152, 152, - 0, 148, 152, 0, 0, 0, 149, 149, 0, 159, - 159, 159, 139, 150, 159, 149, 0, 0, 0, 148, - 0, 0, 0, 0, 150, 149, 151, 151, 151, 151, - 0, 152, 0, 0, 151, 151, 151, 151, 151, 151, - 153, 153, 153, 159, 0, 153, 159, 0, 0, 152, - - 151, 151, 151, 151, 151, 151, 154, 154, 154, 0, - 0, 154, 155, 155, 155, 0, 0, 155, 156, 156, - 156, 0, 0, 156, 153, 0, 0, 155, 155, 0, - 0, 153, 157, 157, 157, 0, 0, 157, 0, 0, - 154, 0, 0, 158, 158, 158, 155, 0, 158, 154, - 0, 0, 156, 158, 160, 160, 160, 0, 0, 160, - 0, 0, 156, 161, 161, 161, 157, 0, 161, 162, - 162, 162, 0, 0, 162, 0, 0, 158, 163, 163, - 163, 0, 0, 163, 0, 157, 0, 0, 160, 164, - 164, 164, 0, 0, 164, 160, 0, 161, 0, 165, - - 165, 165, 0, 162, 165, 0, 0, 0, 161, 0, - 162, 0, 163, 0, 166, 166, 166, 0, 0, 166, - 167, 167, 167, 164, 0, 167, 168, 168, 168, 0, - 0, 168, 0, 165, 173, 173, 173, 0, 0, 173, - 174, 174, 174, 0, 164, 174, 0, 165, 166, 0, - 0, 175, 175, 175, 167, 0, 175, 176, 176, 176, - 168, 167, 176, 0, 0, 0, 166, 0, 173, 0, - 177, 177, 177, 0, 174, 177, 179, 179, 179, 0, - 0, 179, 0, 0, 173, 175, 0, 0, 0, 0, - 0, 176, 0, 181, 181, 181, 0, 176, 181, 0, - - 180, 180, 180, 0, 177, 180, 0, 182, 182, 182, - 179, 0, 182, 0, 0, 0, 0, 182, 0, 177, - 178, 178, 178, 178, 0, 0, 179, 181, 178, 178, - 178, 178, 178, 178, 180, 0, 0, 184, 184, 184, - 181, 182, 184, 0, 178, 178, 178, 178, 178, 178, - 0, 0, 180, 183, 183, 183, 0, 0, 183, 185, - 185, 185, 0, 183, 185, 186, 186, 186, 0, 185, - 186, 184, 187, 187, 187, 0, 0, 187, 188, 188, - 188, 0, 0, 188, 189, 189, 189, 183, 0, 189, - 0, 0, 0, 185, 0, 190, 190, 190, 0, 186, - - 190, 0, 192, 192, 192, 0, 187, 192, 0, 186, - 0, 0, 188, 0, 0, 0, 186, 0, 189, 0, - 193, 193, 193, 0, 187, 193, 194, 194, 194, 190, - 188, 194, 195, 195, 195, 0, 192, 195, 0, 0, - 199, 199, 199, 189, 0, 199, 0, 190, 202, 202, - 202, 0, 0, 202, 193, 0, 192, 203, 203, 203, - 194, 193, 203, 0, 0, 0, 195, 204, 204, 204, - 0, 194, 204, 0, 199, 205, 205, 205, 0, 0, - 205, 0, 202, 206, 206, 206, 195, 199, 206, 0, - 0, 203, 0, 207, 207, 207, 0, 202, 207, 0, - - 203, 204, 208, 208, 208, 0, 0, 208, 0, 205, - 210, 210, 210, 0, 204, 210, 0, 206, 211, 211, - 211, 0, 0, 211, 206, 0, 0, 207, 212, 212, - 212, 205, 0, 212, 0, 0, 208, 213, 213, 213, - 0, 0, 213, 0, 210, 0, 207, 0, 214, 214, - 214, 0, 211, 214, 0, 208, 0, 210, 215, 215, - 215, 0, 212, 215, 216, 216, 216, 0, 211, 216, - 0, 213, 217, 217, 217, 0, 0, 217, 212, 218, - 218, 218, 214, 0, 218, 219, 219, 219, 0, 0, - 219, 0, 215, 0, 0, 213, 0, 0, 216, 215, - - 0, 214, 220, 220, 220, 0, 217, 220, 217, 223, - 223, 223, 220, 218, 223, 222, 222, 222, 0, 219, - 222, 224, 224, 224, 0, 222, 224, 225, 225, 225, - 0, 0, 225, 218, 0, 0, 220, 225, 0, 219, - 226, 226, 226, 223, 0, 226, 227, 227, 227, 222, - 0, 227, 228, 228, 228, 224, 0, 228, 229, 229, - 229, 225, 223, 229, 230, 230, 230, 0, 0, 230, - 231, 231, 231, 0, 226, 231, 0, 232, 232, 232, - 227, 226, 232, 233, 233, 233, 228, 0, 233, 0, - 0, 0, 229, 228, 0, 0, 0, 0, 230, 229, - - 0, 0, 227, 0, 231, 234, 234, 234, 0, 230, - 234, 232, 0, 235, 235, 235, 0, 233, 235, 238, - 238, 238, 0, 231, 238, 239, 239, 239, 0, 232, - 239, 240, 240, 240, 0, 0, 240, 0, 0, 234, - 0, 241, 241, 241, 0, 0, 241, 235, 0, 242, - 242, 242, 0, 238, 242, 0, 0, 0, 0, 239, - 0, 0, 243, 243, 243, 240, 239, 243, 0, 238, - 0, 245, 245, 245, 0, 241, 245, 246, 246, 246, - 0, 0, 246, 242, 0, 0, 242, 0, 0, 240, - 241, 0, 247, 247, 247, 241, 243, 247, 248, 248, - - 248, 0, 0, 248, 0, 245, 0, 249, 249, 249, - 0, 246, 249, 250, 250, 250, 0, 0, 250, 0, - 251, 251, 251, 0, 245, 251, 247, 0, 0, 246, - 0, 0, 248, 247, 252, 252, 252, 0, 0, 252, - 0, 249, 0, 256, 256, 256, 0, 250, 256, 0, - 248, 250, 0, 0, 251, 257, 257, 257, 0, 249, - 257, 258, 258, 258, 0, 0, 258, 0, 252, 0, - 0, 259, 259, 259, 251, 0, 259, 256, 260, 260, - 260, 0, 0, 260, 0, 261, 261, 261, 252, 257, - 261, 263, 263, 263, 256, 258, 263, 264, 264, 264, - - 0, 0, 264, 0, 0, 259, 0, 257, 259, 265, - 265, 265, 260, 0, 265, 266, 266, 266, 0, 261, - 266, 267, 267, 267, 0, 263, 267, 0, 261, 0, - 0, 264, 268, 268, 268, 0, 260, 268, 0, 0, - 0, 263, 0, 265, 0, 269, 269, 269, 0, 266, - 269, 0, 270, 270, 270, 267, 265, 270, 271, 271, - 271, 0, 0, 271, 0, 0, 268, 272, 272, 272, - 0, 266, 272, 274, 274, 274, 0, 267, 274, 269, - 275, 275, 275, 0, 268, 275, 270, 0, 276, 276, - 276, 0, 271, 276, 277, 277, 277, 0, 0, 277, - - 0, 272, 0, 279, 279, 279, 0, 274, 279, 0, - 0, 0, 271, 0, 275, 0, 0, 0, 0, 0, - 272, 274, 276, 0, 0, 280, 280, 280, 277, 276, - 280, 275, 0, 277, 281, 281, 281, 279, 0, 281, - 282, 282, 282, 0, 0, 282, 285, 285, 285, 0, - 0, 285, 286, 286, 286, 0, 0, 286, 0, 280, - 287, 287, 287, 0, 0, 287, 280, 0, 281, 0, - 0, 288, 288, 288, 282, 281, 288, 282, 0, 0, - 285, 0, 289, 289, 289, 0, 286, 289, 290, 290, - 290, 285, 0, 290, 287, 292, 292, 292, 0, 0, - - 292, 287, 293, 293, 293, 288, 0, 293, 294, 294, - 294, 0, 288, 294, 0, 0, 289, 0, 295, 295, - 295, 0, 290, 295, 0, 297, 297, 297, 0, 292, - 297, 289, 0, 0, 290, 0, 293, 0, 298, 298, - 298, 0, 294, 298, 299, 299, 299, 292, 0, 299, - 0, 0, 295, 0, 293, 0, 300, 300, 300, 297, - 294, 300, 301, 301, 301, 0, 0, 301, 295, 302, - 302, 302, 298, 0, 302, 303, 303, 303, 299, 0, - 303, 304, 304, 304, 0, 0, 304, 307, 307, 307, - 300, 0, 307, 0, 0, 0, 301, 300, 299, 308, - - 308, 308, 0, 302, 308, 311, 311, 311, 0, 303, - 311, 312, 312, 312, 0, 304, 312, 314, 314, 314, - 303, 307, 314, 315, 315, 315, 0, 0, 315, 0, - 304, 0, 0, 308, 0, 316, 316, 316, 0, 311, - 316, 0, 0, 0, 0, 312, 311, 317, 317, 317, - 0, 314, 317, 308, 318, 318, 318, 315, 0, 318, - 0, 0, 0, 0, 312, 0, 0, 0, 0, 316, - 314, 0, 0, 0, 0, 0, 315, 0, 0, 0, - 0, 317, 0, 0, 0, 0, 0, 0, 318, 323, - 323, 323, 323, 323, 324, 324, 324, 324, 324, 325, - - 0, 325, 325, 325, 326, 0, 326, 0, 326, 327, - 327, 327, 327, 327, 328, 328, 328, 328, 328, 329, - 0, 329, 329, 329, 330, 330, 330, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322 + 0, 94, 0, 92, 96, 91, 91, 91, 91, 91, + + 91, 95, 95, 95, 0, 0, 95, 97, 97, 97, + 0, 0, 97, 0, 0, 96, 98, 98, 98, 0, + 94, 98, 0, 0, 94, 99, 99, 99, 0, 0, + 99, 100, 100, 100, 0, 95, 100, 101, 101, 101, + 95, 97, 101, 102, 102, 102, 0, 0, 102, 0, + 98, 103, 103, 103, 0, 0, 103, 97, 0, 99, + 0, 0, 0, 99, 0, 100, 0, 104, 104, 104, + 98, 101, 104, 0, 100, 0, 0, 102, 105, 105, + 105, 0, 0, 105, 0, 103, 0, 106, 106, 106, + 0, 102, 106, 0, 101, 107, 107, 107, 0, 0, + + 107, 104, 118, 118, 118, 103, 0, 118, 119, 119, + 119, 0, 105, 119, 0, 120, 120, 120, 0, 104, + 120, 106, 0, 124, 124, 124, 106, 0, 124, 107, + 127, 127, 127, 0, 105, 127, 118, 0, 0, 0, + 107, 0, 119, 0, 0, 126, 126, 126, 0, 120, + 126, 0, 0, 0, 0, 0, 118, 124, 120, 119, + 123, 123, 123, 123, 127, 0, 0, 0, 123, 123, + 123, 123, 123, 123, 0, 0, 0, 124, 0, 126, + 0, 127, 0, 0, 123, 123, 123, 123, 123, 123, + 128, 128, 128, 0, 0, 128, 129, 129, 129, 0, + + 126, 129, 130, 130, 130, 0, 0, 130, 0, 0, + 131, 131, 131, 0, 0, 131, 132, 132, 132, 0, + 0, 132, 0, 0, 128, 0, 133, 133, 133, 0, + 129, 133, 134, 134, 134, 0, 130, 134, 0, 0, + 0, 0, 129, 128, 131, 0, 135, 135, 135, 0, + 132, 135, 0, 130, 0, 0, 136, 136, 136, 132, + 133, 136, 131, 0, 0, 0, 134, 137, 137, 137, + 0, 0, 137, 134, 0, 0, 138, 138, 138, 133, + 135, 138, 133, 139, 139, 139, 0, 0, 139, 0, + 136, 0, 0, 136, 148, 148, 148, 135, 0, 148, + + 0, 137, 150, 150, 150, 0, 0, 150, 137, 0, + 138, 149, 149, 149, 0, 0, 149, 139, 152, 152, + 152, 0, 138, 152, 0, 0, 149, 149, 148, 0, + 0, 0, 0, 0, 0, 149, 150, 153, 153, 153, + 139, 0, 153, 0, 0, 149, 148, 150, 151, 151, + 151, 151, 152, 0, 0, 0, 151, 151, 151, 151, + 151, 151, 0, 154, 154, 154, 0, 0, 154, 0, + 152, 153, 151, 151, 151, 151, 151, 151, 154, 154, + 153, 155, 155, 155, 0, 0, 155, 156, 156, 156, + 0, 0, 156, 157, 157, 157, 0, 154, 157, 158, + + 158, 158, 0, 157, 158, 159, 159, 159, 0, 0, + 159, 160, 160, 160, 0, 155, 160, 161, 161, 161, + 0, 156, 161, 0, 0, 155, 0, 157, 0, 162, + 162, 162, 0, 158, 162, 0, 158, 0, 0, 159, + 156, 0, 163, 163, 163, 160, 159, 163, 164, 164, + 164, 161, 0, 164, 0, 0, 160, 0, 161, 165, + 165, 165, 0, 162, 165, 166, 166, 166, 0, 0, + 166, 0, 0, 167, 167, 167, 163, 0, 167, 172, + 172, 172, 164, 0, 172, 173, 173, 173, 0, 0, + 173, 0, 0, 165, 0, 0, 164, 163, 0, 166, + + 174, 174, 174, 0, 0, 174, 166, 167, 0, 0, + 0, 165, 0, 172, 0, 175, 175, 175, 0, 173, + 175, 0, 176, 176, 176, 0, 0, 176, 0, 172, + 179, 179, 179, 0, 174, 179, 178, 178, 178, 0, + 0, 178, 180, 180, 180, 0, 0, 180, 0, 175, + 0, 0, 0, 0, 0, 175, 176, 181, 181, 181, + 0, 0, 181, 0, 179, 0, 0, 0, 0, 0, + 178, 176, 177, 177, 177, 177, 180, 179, 0, 0, + 177, 177, 177, 177, 177, 177, 178, 182, 182, 182, + 0, 181, 182, 0, 0, 0, 177, 177, 177, 177, + + 177, 177, 183, 183, 183, 0, 0, 183, 184, 184, + 184, 0, 183, 184, 185, 185, 185, 0, 0, 185, + 0, 182, 186, 186, 186, 0, 0, 186, 187, 187, + 187, 0, 0, 187, 0, 0, 183, 0, 188, 188, + 188, 0, 184, 188, 190, 190, 190, 0, 185, 190, + 0, 0, 184, 0, 0, 0, 186, 0, 0, 184, + 0, 0, 187, 191, 191, 191, 185, 0, 191, 0, + 0, 0, 188, 0, 186, 192, 192, 192, 190, 0, + 192, 193, 193, 193, 0, 0, 193, 187, 0, 0, + 188, 197, 197, 197, 0, 0, 197, 191, 190, 0, + + 200, 200, 200, 0, 191, 200, 0, 0, 0, 192, + 0, 201, 201, 201, 0, 193, 201, 202, 202, 202, + 192, 0, 202, 0, 0, 197, 203, 203, 203, 0, + 0, 203, 0, 0, 200, 193, 0, 0, 197, 207, + 207, 207, 0, 0, 207, 201, 0, 0, 0, 200, + 0, 202, 0, 0, 201, 0, 208, 208, 208, 0, + 203, 208, 0, 0, 202, 0, 0, 203, 0, 209, + 209, 209, 0, 207, 209, 210, 210, 210, 0, 0, + 210, 0, 211, 211, 211, 0, 207, 211, 0, 0, + 208, 212, 212, 212, 0, 0, 212, 213, 213, 213, + + 0, 0, 213, 209, 0, 0, 208, 0, 0, 210, + 214, 214, 214, 0, 0, 214, 211, 0, 0, 209, + 0, 215, 215, 215, 0, 212, 215, 0, 0, 0, + 0, 213, 212, 210, 0, 211, 216, 216, 216, 0, + 0, 216, 0, 0, 214, 0, 214, 217, 217, 217, + 0, 0, 217, 0, 0, 215, 0, 217, 219, 219, + 219, 0, 0, 219, 220, 220, 220, 0, 219, 220, + 216, 221, 221, 221, 0, 215, 221, 222, 222, 222, + 0, 217, 222, 0, 223, 223, 223, 222, 0, 223, + 216, 0, 219, 0, 224, 224, 224, 0, 220, 224, + + 0, 225, 225, 225, 0, 221, 225, 226, 226, 226, + 0, 222, 226, 0, 227, 227, 227, 220, 223, 227, + 0, 228, 228, 228, 0, 0, 228, 0, 224, 229, + 229, 229, 0, 0, 229, 225, 0, 0, 0, 224, + 223, 226, 232, 232, 232, 0, 0, 232, 227, 0, + 0, 0, 0, 0, 225, 228, 233, 233, 233, 226, + 0, 233, 0, 229, 234, 234, 234, 0, 0, 234, + 235, 235, 235, 0, 0, 235, 232, 236, 236, 236, + 0, 0, 236, 237, 237, 237, 0, 0, 237, 0, + 233, 0, 232, 0, 239, 239, 239, 233, 234, 239, + + 240, 240, 240, 0, 235, 240, 0, 0, 241, 241, + 241, 236, 0, 241, 236, 0, 0, 237, 0, 235, + 0, 0, 234, 0, 235, 242, 242, 242, 239, 0, + 242, 243, 243, 243, 240, 0, 243, 0, 247, 247, + 247, 240, 241, 247, 0, 0, 241, 239, 248, 248, + 248, 0, 0, 248, 0, 0, 249, 249, 249, 242, + 0, 249, 250, 250, 250, 243, 0, 250, 251, 251, + 251, 0, 247, 251, 0, 252, 252, 252, 0, 242, + 252, 0, 248, 0, 0, 243, 254, 254, 254, 247, + 249, 254, 0, 255, 255, 255, 250, 0, 255, 250, + + 248, 0, 251, 256, 256, 256, 0, 0, 256, 252, + 257, 257, 257, 0, 0, 257, 0, 0, 252, 0, + 254, 0, 0, 258, 258, 258, 251, 255, 258, 259, + 259, 259, 0, 0, 259, 0, 254, 256, 0, 0, + 255, 260, 260, 260, 257, 0, 260, 262, 262, 262, + 0, 0, 262, 0, 0, 256, 0, 258, 0, 263, + 263, 263, 0, 259, 263, 264, 264, 264, 0, 0, + 264, 266, 266, 266, 0, 260, 266, 265, 265, 265, + 0, 262, 265, 259, 267, 267, 267, 0, 0, 267, + 0, 0, 0, 263, 260, 262, 270, 270, 270, 264, + + 0, 270, 271, 271, 271, 266, 264, 271, 0, 0, + 263, 265, 272, 272, 272, 0, 265, 272, 267, 0, + 0, 267, 273, 273, 273, 0, 0, 273, 0, 0, + 270, 0, 274, 274, 274, 0, 271, 274, 275, 275, + 275, 270, 0, 275, 0, 0, 272, 0, 0, 277, + 277, 277, 0, 272, 277, 0, 273, 278, 278, 278, + 0, 0, 278, 273, 0, 0, 274, 0, 280, 280, + 280, 0, 275, 280, 281, 281, 281, 0, 0, 281, + 0, 274, 0, 277, 275, 282, 282, 282, 0, 0, + 282, 278, 283, 283, 283, 0, 0, 283, 284, 284, + + 284, 277, 280, 284, 285, 285, 285, 278, 281, 285, + 288, 288, 288, 0, 0, 288, 289, 289, 289, 282, + 0, 289, 290, 290, 290, 0, 283, 290, 0, 0, + 0, 0, 284, 283, 0, 291, 291, 291, 285, 282, + 291, 0, 0, 284, 288, 0, 293, 293, 293, 0, + 289, 293, 0, 285, 0, 0, 290, 294, 294, 294, + 0, 0, 294, 290, 0, 0, 295, 295, 295, 291, + 289, 295, 296, 296, 296, 0, 0, 296, 0, 0, + 293, 297, 297, 297, 0, 0, 297, 0, 291, 0, + 0, 294, 0, 0, 0, 0, 0, 0, 0, 293, + + 295, 0, 0, 0, 0, 0, 296, 0, 0, 0, + 294, 0, 0, 0, 0, 297, 302, 302, 302, 302, + 302, 303, 303, 303, 303, 303, 304, 0, 304, 304, + 304, 305, 0, 305, 0, 305, 306, 306, 306, 306, + 306, 307, 307, 307, 307, 307, 308, 0, 308, 308, + 308, 309, 309, 309, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + + 301, 301, 301, 301, 301, 301, 301, 301, 301, 301, + 301, 301, 301, 301, 301, 301, 301 } ; static yy_state_type yy_last_accepting_state; @@ -1250,7 +1208,7 @@ using isc::agent::AgentParser; /* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::agent::ParserContext::fatal(msg) -#line 1253 "agent_lexer.cc" +#line 1211 "agent_lexer.cc" /* noyywrap disables automatic rewinding for the next file to parse. Since we always parse only a single string, there's no need to do any wraps. And using yywrap requires linking with -lfl, which provides the default yywrap @@ -1276,8 +1234,8 @@ using isc::agent::AgentParser; by moving it ahead by yyleng bytes. yyleng specifies the length of the currently matched token. */ #define YY_USER_ACTION driver.loc_.columns(yyleng); -#line 1279 "agent_lexer.cc" -#line 1280 "agent_lexer.cc" +#line 1237 "agent_lexer.cc" +#line 1238 "agent_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1591,7 +1549,7 @@ YY_DECL } -#line 1594 "agent_lexer.cc" +#line 1552 "agent_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1620,13 +1578,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 323 ) + if ( yy_current_state >= 302 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 322 ); + while ( yy_current_state != 301 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1811,7 +1769,7 @@ YY_RULE_SETUP case ParserContext::CONTROL_SOCKETS: return AgentParser::make_DHCP4_SERVER(driver.loc_); default: - return AgentParser::make_STRING("dhcp4-server", driver.loc_); + return AgentParser::make_STRING("dhcp4", driver.loc_); } } YY_BREAK @@ -1823,7 +1781,7 @@ YY_RULE_SETUP case ParserContext::CONTROL_SOCKETS: return AgentParser::make_DHCP6_SERVER(driver.loc_); default: - return AgentParser::make_STRING("dhcp6-server", driver.loc_); + return AgentParser::make_STRING("dhcp6", driver.loc_); } } YY_BREAK @@ -1835,7 +1793,7 @@ YY_RULE_SETUP case ParserContext::CONTROL_SOCKETS: return AgentParser::make_D2_SERVER(driver.loc_); default: - return AgentParser::make_STRING("d2-server", driver.loc_); + return AgentParser::make_STRING("d2", driver.loc_); } } YY_BREAK @@ -2326,7 +2284,7 @@ YY_RULE_SETUP #line 598 "agent_lexer.ll" ECHO; YY_BREAK -#line 2329 "agent_lexer.cc" +#line 2287 "agent_lexer.cc" case YY_END_OF_BUFFER: { @@ -2641,7 +2599,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 323 ) + if ( yy_current_state >= 302 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2674,11 +2632,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 323 ) + if ( yy_current_state >= 302 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 322); + yy_is_jam = (yy_current_state == 301); return yy_is_jam ? 0 : yy_current_state; } diff --git a/src/bin/agent/agent_parser.cc b/src/bin/agent/agent_parser.cc index 391c622c89..9d00e198fb 100644 --- a/src/bin/agent/agent_parser.cc +++ b/src/bin/agent/agent_parser.cc @@ -967,7 +967,7 @@ namespace isc { namespace agent { #line 366 "agent_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("dhcp4-server", m); + ctx.stack_.back()->set("dhcp4", m); ctx.stack_.push_back(m); ctx.enter(ctx.SERVER); } @@ -987,7 +987,7 @@ namespace isc { namespace agent { #line 377 "agent_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("dhcp6-server", m); + ctx.stack_.back()->set("dhcp6", m); ctx.stack_.push_back(m); ctx.enter(ctx.SERVER); } @@ -1007,7 +1007,7 @@ namespace isc { namespace agent { #line 388 "agent_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("d2-server", m); + ctx.stack_.back()->set("d2", m); ctx.stack_.push_back(m); ctx.enter(ctx.SERVER); } @@ -1771,14 +1771,13 @@ namespace isc { namespace agent { { "\"end of file\"", "error", "$undefined", "\",\"", "\":\"", "\"[\"", "\"]\"", "\"{\"", "\"}\"", "\"null\"", "\"Control-agent\"", - "\"http-host\"", "\"http-port\"", "\"control-sockets\"", - "\"dhcp4-server\"", "\"dhcp6-server\"", "\"d2-server\"", - "\"socket-name\"", "\"socket-type\"", "\"unix\"", "\"hooks-libraries\"", - "\"library\"", "\"parameters\"", "\"Logging\"", "\"loggers\"", - "\"name\"", "\"output_options\"", "\"output\"", "\"debuglevel\"", - "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"Dhcp4\"", - "\"Dhcp6\"", "\"DhcpDdns\"", "START_JSON", "START_AGENT", - "START_SUB_AGENT", "\"constant string\"", "\"integer\"", + "\"http-host\"", "\"http-port\"", "\"control-sockets\"", "\"dhcp4\"", + "\"dhcp6\"", "\"d2\"", "\"socket-name\"", "\"socket-type\"", "\"unix\"", + "\"hooks-libraries\"", "\"library\"", "\"parameters\"", "\"Logging\"", + "\"loggers\"", "\"name\"", "\"output_options\"", "\"output\"", + "\"debuglevel\"", "\"severity\"", "\"flush\"", "\"maxsize\"", + "\"maxver\"", "\"Dhcp4\"", "\"Dhcp6\"", "\"DhcpDdns\"", "START_JSON", + "START_AGENT", "START_SUB_AGENT", "\"constant string\"", "\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start", "$@1", "$@2", "$@3", "sub_agent", "$@4", "json", "value", "map", "$@5", "map_content", "not_empty_map", "list_generic", "$@6", "list_content", "not_empty_list", @@ -1853,7 +1852,7 @@ namespace isc { namespace agent { #line 14 "agent_parser.yy" // lalr1.cc:1167 } } // isc::agent -#line 1857 "agent_parser.cc" // lalr1.cc:1167 +#line 1856 "agent_parser.cc" // lalr1.cc:1167 #line 592 "agent_parser.yy" // lalr1.cc:1168 diff --git a/src/bin/agent/location.hh b/src/bin/agent/location.hh index 7b54d7e04f..2f4a15d65d 100644 --- a/src/bin/agent/location.hh +++ b/src/bin/agent/location.hh @@ -1,4 +1,4 @@ -// Generated 201705171457 +// Generated 201706021241 // A Bison parser, made by GNU Bison 3.0.4. // Locations for Bison parsers in C++ diff --git a/src/bin/agent/position.hh b/src/bin/agent/position.hh index b3ed89836c..cf8bf7c950 100644 --- a/src/bin/agent/position.hh +++ b/src/bin/agent/position.hh @@ -1,4 +1,4 @@ -// Generated 201705171457 +// Generated 201706021241 // A Bison parser, made by GNU Bison 3.0.4. // Positions for Bison parsers in C++ diff --git a/src/bin/agent/stack.hh b/src/bin/agent/stack.hh index eec4f44ef8..73d531d6a1 100644 --- a/src/bin/agent/stack.hh +++ b/src/bin/agent/stack.hh @@ -1,4 +1,4 @@ -// Generated 201705171457 +// Generated 201706021241 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++