diff options
author | Francis Dupont <fdupont@isc.org> | 2018-09-28 13:10:43 +0200 |
---|---|---|
committer | Francis Dupont <fdupont@isc.org> | 2018-09-28 15:20:46 +0200 |
commit | 035e5845b315f75e130d04e7ca384c93219c1076 (patch) | |
tree | f443c4877021745cbd836a5ab3ee454984516454 /src/bin | |
parent | [5-netconf-config] Updated syntax (diff) | |
download | kea-035e5845b315f75e130d04e7ca384c93219c1076.tar.xz kea-035e5845b315f75e130d04e7ca384c93219c1076.zip |
[#,5!49], regen flex/bison
Diffstat (limited to 'src/bin')
-rw-r--r-- | src/bin/netconf/location.hh | 2 | ||||
-rw-r--r-- | src/bin/netconf/netconf_lexer.cc | 1451 | ||||
-rw-r--r-- | src/bin/netconf/netconf_parser.cc | 924 | ||||
-rw-r--r-- | src/bin/netconf/netconf_parser.h | 186 | ||||
-rw-r--r-- | src/bin/netconf/position.hh | 2 | ||||
-rw-r--r-- | src/bin/netconf/stack.hh | 2 |
6 files changed, 1181 insertions, 1386 deletions
diff --git a/src/bin/netconf/location.hh b/src/bin/netconf/location.hh index fcd9de7dd7..a9200ca50e 100644 --- a/src/bin/netconf/location.hh +++ b/src/bin/netconf/location.hh @@ -1,4 +1,4 @@ -// Generated 201809262116 +// Generated 201809281108 // A Bison parser, made by GNU Bison 3.0.5. // Locations for Bison parsers in C++ diff --git a/src/bin/netconf/netconf_lexer.cc b/src/bin/netconf/netconf_lexer.cc index 117c3c5efd..e21369136c 100644 --- a/src/bin/netconf/netconf_lexer.cc +++ b/src/bin/netconf/netconf_lexer.cc @@ -691,8 +691,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ (yy_c_buf_p) = yy_cp; /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ -#define YY_NUM_RULES 63 -#define YY_END_OF_BUFFER 64 +#define YY_NUM_RULES 59 +#define YY_END_OF_BUFFER 60 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -700,45 +700,43 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[340] = +static const flex_int16_t yy_accept[321] = { 0, - 56, 56, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 62, 10, 11, 62, 1, 56, 53, 56, 56, - 62, 55, 54, 62, 62, 62, 62, 62, 49, 50, - 62, 62, 62, 51, 52, 5, 5, 5, 62, 62, - 62, 10, 11, 0, 0, 45, 0, 0, 0, 0, + 52, 52, 0, 0, 0, 0, 0, 0, 0, 0, + 60, 58, 10, 11, 58, 1, 52, 49, 52, 52, + 58, 51, 50, 58, 58, 58, 58, 58, 45, 46, + 58, 58, 58, 47, 48, 5, 5, 5, 58, 58, + 58, 10, 11, 0, 0, 41, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 52, 52, 0, 51, 52, 3, 2, 6, 0, + 52, 0, 0, 0, 0, 0, 0, 4, 0, 0, + 9, 0, 42, 0, 0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 56, 56, 0, 55, 56, 3, - 2, 6, 0, 56, 0, 0, 0, 0, 0, 0, - 4, 0, 0, 9, 0, 46, 0, 0, 0, 0, - 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, + 0, 0, 43, 0, 19, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, - 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, - 47, 0, 19, 0, 0, 18, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 57, 55, 0, + 54, 53, 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, 61, 59, 0, - 58, 57, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 56, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 23, 0, 0, 0, 0, 0, 0, 33, + + 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, + 0, 0, 0, 0, 16, 17, 36, 0, 0, 0, + 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, + 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 38, 35, 0, 0, 0, 0, 24, 0, 31, + 12, 14, 0, 0, 0, 29, 32, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 60, 57, 0, 0, 0, 0, 0, 0, + 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 39, 0, + 0, 0, 30, 0, 0, 27, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 27, 23, 0, 0, 0, 0, 0, 0, 25, 0, - 0, 28, 0, 0, 26, 22, 0, 0, 0, 0, - 41, 42, 0, 0, 0, 0, 0, 0, 16, 17, - 36, 0, 0, 0, 0, 0, 0, 20, 0, 0, - 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 38, 35, 0, 0, - 0, 24, 0, 0, 0, 32, 12, 14, 0, 0, - 0, 30, 33, 0, 37, 0, 0, 0, 0, 0, - 43, 0, 0, 0, 0, 0, 0, 40, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, - 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 13, 44, 0, 0, - 0, 0, 21, 0, 0, 34, 29, 15, 0 + 0, 26, 25, 0, 0, 0, 0, 0, 13, 0, + 0, 0, 0, 21, 0, 0, 34, 28, 15, 0 } ; static const YY_CHAR yy_ec[256] = @@ -749,14 +747,14 @@ static const YY_CHAR yy_ec[256] = 1, 4, 5, 6, 7, 5, 5, 5, 5, 5, 5, 8, 9, 10, 11, 12, 13, 14, 14, 15, 14, 16, 14, 17, 14, 14, 14, 18, 5, 19, - 5, 20, 21, 5, 22, 23, 24, 25, 26, 27, - 5, 5, 5, 5, 5, 28, 5, 29, 5, 5, - 5, 30, 31, 32, 33, 5, 5, 5, 5, 5, - 34, 35, 36, 5, 37, 5, 38, 39, 40, 41, - - 42, 43, 44, 45, 46, 5, 47, 48, 49, 50, - 51, 52, 5, 53, 54, 55, 56, 57, 5, 58, - 59, 60, 61, 5, 62, 5, 5, 5, 5, 5, + 5, 20, 21, 5, 22, 23, 23, 23, 24, 25, + 5, 5, 5, 5, 5, 26, 5, 27, 5, 5, + 5, 28, 29, 30, 31, 5, 5, 5, 5, 5, + 32, 33, 34, 5, 35, 5, 36, 37, 38, 39, + + 40, 41, 42, 43, 44, 5, 45, 46, 47, 48, + 49, 50, 5, 51, 52, 53, 54, 55, 5, 56, + 57, 58, 59, 5, 60, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -773,359 +771,339 @@ static const YY_CHAR yy_ec[256] = 5, 5, 5, 5, 5 } ; -static const YY_CHAR yy_meta[63] = +static const YY_CHAR yy_meta[61] = { 0, 1, 1, 2, 3, 3, 4, 3, 3, 3, 3, - 3, 3, 3, 5, 5, 5, 5, 3, 3, 3, - 3, 5, 5, 5, 5, 5, 5, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, - 5, 5, 5, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3 + 3, 3, 5, 6, 6, 6, 6, 3, 3, 3, + 3, 6, 6, 6, 6, 3, 3, 3, 3, 3, + 3, 3, 5, 3, 3, 6, 7, 6, 6, 6, + 7, 3, 3, 3, 3, 3, 3, 5, 3, 3, + 5, 3, 5, 5, 3, 3, 3, 3, 3, 3 } ; -static const flex_int16_t yy_base[352] = +static const flex_int16_t yy_base[334] = { 0, - 0, 0, 61, 64, 67, 0, 65, 69, 49, 66, - 284, 2226, 86, 279, 129, 0, 124, 2226, 174, 129, - 84, 180, 2226, 258, 91, 76, 71, 89, 2226, 2226, - 96, 91, 95, 2226, 2226, 2226, 87, 265, 217, 0, - 244, 119, 258, 114, 201, 2226, 207, 217, 224, 231, - 233, 242, 289, 268, 295, 305, 317, 326, 335, 341, - 371, 379, 387, 0, 239, 382, 401, 413, 417, 2226, - 0, 2226, 145, 298, 128, 139, 119, 145, 173, 149, - 2226, 220, 245, 2226, 193, 2226, 429, 401, 443, 451, - 459, 244, 468, 501, 474, 486, 495, 531, 544, 550, - - 556, 562, 570, 580, 586, 592, 610, 617, 628, 636, - 645, 652, 659, 672, 682, 0, 181, 183, 172, 184, - 201, 198, 169, 2226, 0, 694, 702, 713, 720, 162, - 2226, 747, 2226, 730, 740, 2226, 775, 790, 797, 803, - 810, 817, 827, 833, 852, 858, 869, 882, 893, 899, - 907, 917, 929, 937, 947, 954, 215, 2226, 2226, 221, - 2226, 2226, 109, 0, 964, 975, 984, 992, 1030, 1000, - 1023, 1030, 1061, 1078, 1084, 1091, 1097, 1104, 1114, 1127, - 1134, 1142, 1151, 1157, 1172, 1187, 1194, 1200, 1207, 1213, - 1224, 1238, 2226, 2226, 122, 0, 1231, 1244, 1254, 1266, - - 1274, 1282, 1319, 1290, 1296, 1302, 1313, 1320, 1350, 1362, - 2226, 2226, 1368, 1374, 1380, 1388, 1398, 1404, 2226, 1410, - 1428, 2226, 1434, 1440, 2226, 2226, 1451, 109, 0, 1458, - 2226, 2226, 1465, 1475, 1481, 1495, 1501, 1511, 2226, 2226, - 2226, 1519, 1525, 1531, 1537, 1555, 1567, 2226, 1573, 1580, - 1586, 1592, 1598, 2226, 1611, 1617, 1623, 1637, 1653, 1659, - 1672, 1678, 1684, 1690, 1697, 1703, 2226, 2226, 1709, 1715, - 1733, 2226, 1739, 1745, 1752, 2226, 2226, 2226, 1760, 1769, - 1795, 2226, 2226, 1775, 2226, 1806, 1814, 1820, 1830, 1836, - 2226, 1842, 1851, 1860, 1867, 1873, 1881, 2226, 1888, 1904, - - 1916, 1923, 1930, 1939, 1947, 1960, 1969, 1975, 1982, 2226, - 1988, 1995, 2005, 2226, 2012, 2018, 2030, 2036, 2042, 2048, - 2056, 2073, 2084, 2091, 2099, 2108, 2226, 2226, 2114, 2121, - 2129, 2135, 2226, 2144, 2152, 2226, 2226, 2226, 2226, 2187, - 2192, 2197, 2202, 2207, 2212, 2217, 2220, 132, 128, 121, - 111 + 0, 0, 59, 62, 65, 0, 63, 67, 47, 64, + 277, 2083, 84, 269, 125, 0, 105, 2083, 120, 125, + 85, 166, 2083, 250, 139, 65, 69, 82, 2083, 2083, + 80, 84, 118, 2083, 2083, 2083, 92, 253, 211, 0, + 235, 110, 243, 97, 183, 2083, 190, 196, 194, 207, + 218, 251, 261, 267, 273, 279, 285, 301, 318, 324, + 0, 326, 363, 338, 369, 374, 2083, 0, 2083, 345, + 380, 121, 168, 157, 169, 179, 172, 2083, 196, 198, + 2083, 137, 2083, 133, 398, 404, 170, 330, 444, 410, + 416, 422, 469, 485, 444, 491, 498, 506, 432, 513, + + 519, 526, 532, 547, 554, 561, 569, 580, 587, 0, + 189, 186, 177, 208, 204, 198, 116, 2083, 0, 604, + 615, 155, 2083, 640, 2083, 627, 633, 2083, 639, 667, + 681, 689, 695, 702, 709, 723, 717, 735, 746, 759, + 775, 781, 787, 793, 800, 816, 204, 2083, 2083, 225, + 2083, 2083, 105, 0, 822, 828, 864, 835, 857, 851, + 893, 910, 916, 922, 928, 934, 944, 956, 969, 977, + 989, 995, 1005, 1011, 1018, 1024, 1030, 1039, 2083, 2083, + 118, 0, 1053, 1063, 1098, 1092, 1125, 1073, 1140, 1146, + 1153, 1159, 2083, 1165, 1174, 1181, 1187, 1193, 1199, 2083, + + 1207, 1216, 1228, 1235, 1245, 2083, 1251, 64, 0, 1261, + 1268, 1274, 1280, 1289, 2083, 2083, 2083, 1309, 1315, 1329, + 1335, 1343, 1351, 2083, 1357, 1363, 1376, 1392, 1385, 1398, + 2083, 1404, 1411, 1418, 1432, 1439, 1447, 1453, 1460, 1467, + 1473, 2083, 2083, 1481, 1495, 1501, 1507, 2083, 1514, 2083, + 2083, 2083, 1520, 1530, 1536, 2083, 2083, 1542, 2083, 1548, + 1576, 1582, 1589, 1598, 1605, 1611, 1617, 1627, 1634, 1646, + 1656, 1668, 2083, 1674, 1681, 1689, 1696, 1709, 1722, 1731, + 1737, 1743, 1750, 1756, 1771, 1779, 1789, 1796, 2083, 1804, + 1813, 1824, 2083, 1830, 1837, 2083, 1846, 1858, 1874, 1880, + + 1886, 2083, 2083, 1894, 1900, 1908, 1922, 1929, 2083, 1936, + 1943, 1955, 1964, 2083, 1976, 1983, 2083, 2083, 2083, 2083, + 2016, 2023, 2030, 2037, 2044, 2051, 2058, 2062, 2067, 2069, + 2071, 2073, 2075 } ; -static const flex_int16_t yy_def[352] = +static const flex_int16_t yy_def[334] = { 0, - 339, 1, 340, 340, 1, 5, 5, 5, 5, 5, - 339, 339, 339, 339, 341, 342, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 343, - 339, 339, 339, 344, 341, 339, 341, 341, 341, 341, - 345, 341, 341, 341, 341, 341, 341, 341, 341, 341, - 341, 341, 341, 342, 339, 339, 339, 339, 339, 339, - 346, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 343, 339, 344, 339, 339, 341, 341, 341, - 341, 347, 341, 345, 341, 341, 341, 341, 341, 341, - - 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, - 341, 341, 341, 341, 341, 346, 339, 339, 339, 339, - 339, 339, 339, 339, 348, 341, 341, 341, 341, 347, - 339, 345, 339, 341, 341, 339, 341, 341, 341, 341, - 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, - 341, 341, 341, 341, 341, 341, 339, 339, 339, 339, - 339, 339, 339, 349, 341, 341, 341, 341, 345, 341, - 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, - 341, 341, 341, 341, 341, 341, 341, 341, 341, 341, - 341, 341, 339, 339, 339, 350, 341, 341, 341, 341, - - 341, 341, 345, 341, 341, 341, 341, 341, 341, 341, - 339, 339, 341, 341, 341, 341, 341, 341, 339, 341, - 341, 339, 341, 341, 339, 339, 341, 339, 351, 341, - 339, 339, 341, 341, 341, 341, 341, 341, 339, 339, - 339, 341, 341, 341, 341, 341, 341, 339, 341, 341, - 341, 341, 341, 339, 341, 341, 341, 341, 341, 341, - 341, 341, 341, 341, 341, 341, 339, 339, 341, 341, - 341, 339, 341, 341, 341, 339, 339, 339, 341, 341, - 341, 339, 339, 341, 339, 341, 341, 341, 341, 341, - 339, 341, 341, 341, 341, 341, 341, 339, 341, 341, - - 341, 341, 341, 341, 341, 341, 341, 341, 341, 339, - 341, 341, 341, 339, 341, 341, 341, 341, 341, 341, - 341, 341, 341, 341, 341, 341, 339, 339, 341, 341, - 341, 341, 339, 341, 341, 339, 339, 339, 0, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339 + 320, 1, 321, 321, 1, 5, 5, 5, 5, 5, + 320, 320, 320, 320, 322, 323, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 324, + 320, 320, 320, 325, 322, 320, 322, 322, 326, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 323, 320, 320, 320, 320, 320, 320, 327, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 324, + 320, 325, 320, 328, 322, 322, 329, 322, 326, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + + 322, 322, 322, 322, 322, 322, 322, 322, 322, 327, + 320, 320, 320, 320, 320, 320, 320, 320, 330, 322, + 322, 329, 320, 326, 320, 322, 322, 320, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 320, 320, 320, 320, + 320, 320, 320, 331, 322, 322, 326, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 320, 320, + 320, 332, 322, 322, 326, 322, 322, 322, 322, 322, + 322, 322, 320, 322, 322, 322, 322, 322, 322, 320, + + 322, 322, 322, 322, 322, 320, 322, 320, 333, 322, + 322, 322, 322, 322, 320, 320, 320, 322, 322, 322, + 322, 322, 322, 320, 322, 322, 322, 322, 322, 322, + 320, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 320, 320, 322, 322, 322, 322, 320, 322, 320, + 320, 320, 322, 322, 322, 320, 320, 322, 320, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 320, 322, 322, 322, 322, 322, 322, 322, + 322, 322, 322, 322, 322, 322, 322, 322, 320, 322, + 322, 322, 320, 322, 322, 320, 322, 322, 322, 322, + + 322, 320, 320, 322, 322, 322, 322, 322, 320, 322, + 322, 322, 322, 320, 322, 322, 320, 320, 320, 0, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320 } ; -static const flex_int16_t yy_nxt[2289] = +static const flex_int16_t yy_nxt[2144] = { 0, 12, 13, 14, 13, 12, 15, 16, 12, 17, 18, 19, 20, 21, 22, 22, 22, 22, 23, 24, 12, - 12, 12, 12, 12, 12, 25, 26, 12, 27, 12, - 12, 28, 12, 29, 12, 30, 12, 12, 12, 12, - 12, 25, 31, 12, 12, 12, 12, 12, 12, 32, - 12, 12, 12, 12, 33, 12, 12, 12, 12, 12, - 34, 35, 37, 14, 37, 37, 14, 37, 38, 41, - 40, 38, 12, 12, 40, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 41, 42, 42, 42, - 42, 70, 12, 12, 12, 12, 71, 75, 12, 73, - - 12, 73, 12, 76, 74, 74, 74, 74, 12, 12, - 12, 12, 39, 75, 12, 85, 12, 75, 77, 86, - 42, 12, 42, 76, 77, 229, 76, 12, 12, 44, - 44, 44, 196, 78, 46, 65, 164, 66, 66, 66, - 66, 77, 69, 69, 69, 69, 79, 80, 87, 67, - 254, 119, 47, 48, 67, 117, 49, 50, 74, 74, - 74, 74, 228, 51, 195, 67, 118, 131, 52, 53, - 67, 54, 117, 55, 119, 117, 56, 57, 58, 59, - 60, 119, 61, 62, 63, 65, 118, 68, 68, 68, - 68, 65, 120, 68, 68, 68, 68, 159, 86, 67, - - 118, 44, 44, 44, 122, 67, 46, 44, 44, 44, - 158, 157, 46, 159, 157, 67, 163, 44, 44, 44, - 121, 67, 46, 159, 44, 44, 44, 87, 158, 46, - 158, 44, 44, 44, 157, 51, 46, 160, 93, 162, - 193, 51, 44, 44, 44, 45, 193, 46, 161, 131, - 124, 51, 69, 69, 69, 69, 193, 88, 51, 123, - 43, 89, 194, 84, 67, 51, 82, 45, 44, 44, - 44, 45, 91, 46, 90, 45, 51, 81, 72, 95, - 67, 43, 45, 339, 339, 45, 339, 45, 94, 44, - 44, 44, 96, 339, 46, 44, 44, 44, 339, 339, - - 46, 339, 51, 97, 339, 44, 44, 44, 339, 339, - 46, 74, 74, 74, 74, 100, 339, 44, 44, 44, - 339, 339, 46, 51, 339, 339, 44, 44, 44, 51, - 98, 46, 339, 99, 339, 44, 44, 44, 339, 51, - 46, 44, 44, 44, 339, 101, 46, 339, 339, 102, - 103, 51, 339, 339, 105, 104, 339, 339, 339, 339, - 51, 339, 339, 107, 339, 339, 339, 106, 339, 51, - 339, 44, 44, 44, 339, 51, 46, 339, 109, 44, - 44, 44, 339, 339, 46, 339, 339, 44, 44, 44, - 108, 110, 46, 65, 339, 66, 66, 66, 66, 339, - - 339, 44, 44, 44, 339, 51, 46, 67, 339, 73, - 339, 73, 111, 51, 74, 74, 74, 74, 339, 339, - 339, 51, 339, 67, 65, 112, 68, 68, 68, 68, - 69, 69, 69, 69, 85, 51, 114, 113, 67, 339, - 115, 85, 67, 44, 44, 44, 339, 339, 46, 339, - 126, 44, 44, 44, 67, 339, 46, 339, 67, 44, - 44, 44, 339, 85, 46, 339, 339, 85, 44, 44, - 44, 85, 339, 46, 44, 44, 44, 51, 85, 133, - 339, 85, 127, 85, 125, 51, 44, 44, 44, 339, - 339, 46, 339, 51, 128, 44, 44, 44, 339, 339, - - 136, 339, 51, 339, 339, 339, 339, 339, 51, 339, - 339, 339, 339, 129, 132, 132, 132, 132, 339, 339, - 51, 339, 132, 132, 132, 132, 132, 132, 339, 51, - 339, 44, 44, 44, 134, 135, 46, 339, 132, 132, - 132, 132, 132, 132, 44, 44, 44, 339, 339, 46, - 44, 44, 44, 339, 339, 46, 44, 44, 44, 339, - 339, 46, 44, 44, 44, 51, 339, 46, 339, 137, - 44, 44, 44, 339, 339, 46, 339, 339, 51, 339, - 44, 44, 44, 138, 51, 46, 44, 44, 44, 339, - 51, 46, 44, 44, 44, 339, 51, 46, 339, 339, - - 339, 339, 339, 339, 51, 139, 140, 339, 143, 141, - 44, 44, 44, 339, 51, 46, 142, 44, 44, 44, - 51, 339, 46, 144, 339, 339, 51, 339, 44, 44, - 44, 339, 147, 46, 339, 145, 44, 44, 44, 339, - 339, 46, 339, 146, 51, 44, 44, 44, 339, 339, - 46, 51, 44, 44, 44, 339, 339, 46, 148, 44, - 44, 44, 51, 339, 46, 339, 339, 339, 339, 339, - 51, 149, 44, 44, 44, 339, 339, 46, 339, 51, - 150, 339, 44, 44, 44, 339, 51, 46, 151, 339, - 339, 339, 153, 51, 44, 44, 44, 339, 339, 46, - - 339, 152, 44, 44, 44, 339, 51, 46, 339, 339, - 154, 339, 339, 44, 44, 44, 51, 155, 46, 339, - 44, 44, 44, 156, 339, 46, 339, 339, 51, 339, - 44, 44, 44, 339, 339, 46, 51, 339, 339, 339, - 44, 44, 44, 339, 339, 46, 339, 51, 165, 339, - 339, 339, 339, 166, 51, 339, 167, 339, 339, 168, - 169, 169, 169, 169, 51, 339, 339, 339, 169, 169, - 169, 169, 169, 169, 51, 44, 44, 44, 170, 339, - 46, 339, 339, 339, 169, 169, 169, 169, 169, 169, - 44, 44, 44, 339, 171, 46, 339, 44, 44, 44, - - 339, 339, 46, 44, 44, 44, 339, 339, 46, 51, - 44, 44, 44, 339, 339, 46, 339, 44, 44, 44, - 339, 339, 46, 339, 51, 339, 339, 44, 44, 44, - 172, 51, 46, 44, 44, 44, 339, 51, 46, 339, - 339, 173, 339, 339, 51, 339, 339, 339, 339, 175, - 174, 51, 44, 44, 44, 339, 339, 46, 44, 44, - 44, 51, 339, 46, 176, 339, 339, 51, 177, 44, - 44, 44, 339, 339, 46, 339, 179, 339, 339, 178, - 339, 339, 44, 44, 44, 339, 51, 46, 339, 180, - 339, 339, 51, 44, 44, 44, 339, 339, 46, 44, - - 44, 44, 339, 51, 46, 339, 339, 44, 44, 44, - 183, 181, 46, 339, 182, 339, 51, 44, 44, 44, - 339, 339, 46, 184, 339, 339, 339, 51, 339, 44, - 44, 44, 339, 51, 46, 339, 186, 44, 44, 44, - 339, 51, 46, 339, 185, 339, 339, 44, 44, 44, - 339, 51, 46, 339, 44, 44, 44, 339, 188, 46, - 339, 187, 339, 51, 44, 44, 44, 339, 339, 46, - 339, 51, 339, 339, 339, 44, 44, 44, 190, 189, - 46, 51, 339, 339, 44, 44, 44, 339, 51, 46, - 198, 199, 44, 44, 44, 339, 339, 46, 51, 200, - - 44, 44, 44, 339, 191, 46, 192, 339, 339, 51, - 339, 339, 339, 339, 339, 339, 197, 339, 51, 339, - 339, 339, 339, 44, 44, 44, 51, 339, 46, 201, - 44, 44, 44, 339, 51, 46, 339, 339, 339, 339, - 339, 204, 202, 203, 203, 203, 203, 339, 339, 339, - 339, 203, 203, 203, 203, 203, 203, 51, 339, 339, - 339, 44, 44, 44, 51, 339, 46, 203, 203, 203, - 203, 203, 203, 206, 339, 205, 207, 208, 44, 44, - 44, 339, 339, 46, 44, 44, 44, 339, 339, 46, - 339, 44, 44, 44, 339, 51, 211, 44, 44, 44, - - 339, 339, 212, 339, 44, 44, 44, 339, 339, 46, - 339, 339, 51, 339, 44, 44, 44, 339, 51, 46, - 339, 339, 209, 339, 339, 51, 339, 44, 44, 44, - 339, 51, 46, 339, 44, 44, 44, 210, 51, 46, - 339, 213, 44, 44, 44, 339, 339, 46, 51, 339, - 339, 44, 44, 44, 339, 214, 46, 44, 44, 44, - 339, 51, 219, 339, 339, 339, 339, 339, 51, 339, - 215, 339, 44, 44, 44, 339, 51, 46, 339, 216, - 339, 339, 339, 217, 339, 51, 339, 44, 44, 44, - 339, 51, 46, 339, 44, 44, 44, 339, 218, 222, - - 44, 44, 44, 339, 339, 46, 51, 44, 44, 44, - 339, 339, 46, 44, 44, 44, 339, 339, 225, 339, - 339, 51, 339, 339, 44, 44, 44, 220, 51, 226, - 339, 44, 44, 44, 51, 221, 46, 339, 44, 44, - 44, 51, 339, 46, 44, 44, 44, 51, 227, 231, - 339, 339, 223, 339, 44, 44, 44, 339, 51, 232, - 339, 339, 224, 339, 339, 51, 44, 44, 44, 339, - 339, 46, 51, 339, 44, 44, 44, 339, 51, 46, - 339, 230, 44, 44, 44, 339, 339, 46, 51, 339, - 44, 44, 44, 339, 339, 46, 44, 44, 44, 339, - - 51, 46, 44, 44, 44, 339, 233, 46, 51, 339, - 339, 339, 339, 44, 44, 44, 51, 339, 239, 339, - 44, 44, 44, 234, 51, 240, 339, 339, 339, 339, - 51, 235, 45, 45, 45, 45, 51, 339, 339, 236, - 45, 45, 45, 45, 45, 45, 237, 51, 339, 238, - 44, 44, 44, 339, 51, 241, 45, 45, 45, 45, - 45, 45, 44, 44, 44, 339, 339, 46, 44, 44, - 44, 339, 242, 46, 44, 44, 44, 339, 339, 46, - 44, 44, 44, 339, 51, 46, 339, 339, 44, 44, - 44, 339, 339, 46, 339, 339, 51, 339, 44, 44, - - 44, 339, 51, 46, 44, 44, 44, 339, 51, 248, - 44, 44, 44, 339, 51, 46, 339, 339, 339, 339, - 243, 245, 51, 339, 339, 339, 244, 339, 44, 44, - 44, 339, 51, 46, 44, 44, 44, 339, 51, 46, - 44, 44, 44, 339, 51, 46, 339, 246, 339, 339, - 247, 44, 44, 44, 339, 339, 46, 339, 44, 44, - 44, 339, 51, 46, 249, 44, 44, 44, 51, 250, - 46, 339, 339, 339, 51, 44, 44, 44, 339, 251, - 46, 44, 44, 44, 339, 51, 46, 339, 339, 339, - 253, 339, 51, 339, 252, 44, 44, 44, 339, 51, - - 46, 44, 44, 44, 339, 255, 46, 339, 339, 51, - 339, 44, 44, 44, 256, 51, 46, 339, 257, 44, - 44, 44, 339, 258, 46, 44, 44, 44, 339, 51, - 46, 44, 44, 44, 339, 51, 46, 44, 44, 44, - 339, 339, 46, 339, 339, 51, 339, 339, 260, 259, - 339, 339, 261, 51, 339, 44, 44, 44, 339, 51, - 46, 339, 339, 339, 339, 51, 262, 44, 44, 44, - 339, 51, 267, 44, 44, 44, 339, 265, 268, 339, - 44, 44, 44, 263, 264, 46, 44, 44, 44, 51, - 339, 46, 44, 44, 44, 339, 266, 272, 44, 44, - - 44, 51, 339, 46, 339, 339, 339, 51, 339, 269, - 339, 44, 44, 44, 51, 339, 46, 44, 44, 44, - 51, 274, 46, 44, 44, 44, 51, 339, 276, 339, - 339, 339, 51, 339, 270, 339, 339, 44, 44, 44, - 271, 339, 277, 339, 339, 51, 339, 339, 273, 339, - 339, 51, 339, 44, 44, 44, 339, 51, 278, 44, - 44, 44, 339, 339, 46, 339, 339, 339, 339, 279, - 275, 51, 44, 44, 44, 339, 339, 46, 44, 44, - 44, 339, 339, 46, 44, 44, 44, 51, 339, 282, - 44, 44, 44, 51, 339, 283, 339, 44, 44, 44, - - 339, 339, 46, 44, 44, 44, 51, 284, 285, 44, - 44, 44, 51, 339, 46, 44, 44, 44, 51, 339, - 46, 339, 339, 281, 51, 339, 339, 339, 280, 339, - 339, 51, 339, 44, 44, 44, 339, 51, 46, 44, - 44, 44, 339, 51, 46, 44, 44, 44, 339, 51, - 46, 339, 44, 44, 44, 339, 287, 291, 339, 286, - 44, 44, 44, 339, 339, 46, 339, 51, 339, 44, - 44, 44, 339, 51, 46, 44, 44, 44, 339, 51, - 46, 339, 290, 339, 339, 339, 51, 339, 289, 339, - 339, 288, 339, 339, 51, 44, 44, 44, 339, 339, - - 46, 339, 339, 51, 339, 339, 44, 44, 44, 51, - 293, 46, 339, 292, 44, 44, 44, 339, 339, 46, - 44, 44, 44, 339, 339, 298, 339, 339, 295, 51, - 44, 44, 44, 294, 339, 46, 44, 44, 44, 339, - 51, 46, 44, 44, 44, 339, 339, 46, 51, 339, - 339, 44, 44, 44, 51, 339, 46, 296, 339, 339, - 44, 44, 44, 339, 51, 46, 297, 44, 44, 44, - 51, 339, 46, 44, 44, 44, 51, 339, 46, 300, - 339, 44, 44, 44, 299, 51, 46, 339, 44, 44, - 44, 339, 301, 46, 51, 339, 339, 339, 302, 339, - - 339, 51, 339, 339, 44, 44, 44, 51, 304, 46, - 339, 339, 303, 339, 339, 51, 44, 44, 44, 339, - 339, 46, 51, 44, 44, 44, 339, 305, 310, 307, - 44, 44, 44, 339, 306, 46, 339, 339, 51, 44, - 44, 44, 339, 339, 46, 308, 339, 44, 44, 44, - 51, 339, 46, 339, 339, 309, 339, 51, 339, 339, - 44, 44, 44, 339, 51, 314, 339, 311, 339, 44, - 44, 44, 339, 51, 46, 44, 44, 44, 339, 339, - 46, 51, 44, 44, 44, 339, 339, 46, 44, 44, - 44, 312, 313, 46, 51, 44, 44, 44, 339, 339, - - 46, 339, 339, 51, 339, 44, 44, 44, 339, 51, - 46, 339, 44, 44, 44, 339, 51, 46, 44, 44, - 44, 339, 51, 46, 316, 339, 315, 339, 317, 51, - 44, 44, 44, 339, 339, 46, 44, 44, 44, 51, - 318, 46, 44, 44, 44, 339, 51, 46, 44, 44, - 44, 319, 51, 46, 339, 320, 44, 44, 44, 339, - 339, 327, 339, 339, 51, 339, 321, 339, 339, 339, - 51, 323, 322, 44, 44, 44, 51, 339, 328, 339, - 339, 324, 51, 325, 44, 44, 44, 339, 339, 46, - 51, 44, 44, 44, 339, 339, 46, 326, 339, 44, - - 44, 44, 339, 339, 46, 339, 339, 51, 44, 44, - 44, 339, 339, 46, 44, 44, 44, 339, 51, 333, - 339, 44, 44, 44, 339, 51, 46, 339, 339, 44, - 44, 44, 330, 51, 46, 44, 44, 44, 329, 339, - 336, 339, 51, 339, 44, 44, 44, 339, 51, 337, - 339, 331, 44, 44, 44, 51, 339, 338, 339, 339, - 339, 332, 339, 51, 339, 339, 339, 339, 339, 51, - 339, 339, 339, 339, 334, 339, 339, 339, 51, 339, - 339, 339, 335, 339, 339, 339, 51, 36, 36, 36, - 36, 36, 45, 45, 45, 45, 45, 64, 339, 64, - - 64, 64, 83, 339, 83, 339, 83, 85, 85, 85, - 85, 85, 92, 92, 92, 92, 92, 116, 339, 116, - 116, 116, 130, 130, 130, 11, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339 + 12, 12, 12, 25, 26, 12, 27, 12, 12, 28, + 12, 29, 12, 30, 12, 12, 12, 12, 12, 25, + 31, 12, 12, 12, 12, 12, 12, 32, 12, 12, + 12, 12, 33, 12, 12, 12, 12, 12, 34, 35, + 37, 14, 37, 37, 14, 37, 38, 41, 40, 38, + 12, 12, 40, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 41, 42, 72, 42, 12, 12, + 12, 12, 67, 42, 12, 42, 12, 68, 12, 73, + + 72, 72, 83, 231, 12, 12, 12, 12, 39, 74, + 12, 42, 12, 42, 73, 75, 62, 12, 63, 63, + 63, 63, 73, 12, 12, 44, 44, 44, 64, 84, + 46, 62, 74, 65, 65, 65, 65, 76, 66, 66, + 66, 66, 83, 64, 64, 74, 111, 70, 64, 70, + 47, 48, 71, 71, 71, 71, 208, 49, 181, 64, + 123, 153, 50, 51, 64, 52, 111, 53, 77, 84, + 54, 55, 56, 57, 58, 123, 59, 62, 60, 65, + 65, 65, 65, 44, 44, 44, 119, 113, 46, 64, + 44, 44, 44, 112, 111, 46, 44, 44, 44, 88, + + 149, 46, 113, 118, 112, 64, 45, 44, 44, 44, + 113, 148, 46, 112, 114, 49, 149, 147, 44, 44, + 44, 149, 49, 46, 115, 116, 45, 179, 49, 148, + 45, 148, 92, 117, 45, 86, 147, 152, 85, 49, + 147, 45, 90, 179, 45, 43, 45, 89, 179, 151, + 49, 44, 44, 44, 81, 91, 46, 93, 79, 150, + 94, 44, 44, 44, 180, 78, 46, 44, 44, 44, + 69, 43, 46, 44, 44, 44, 320, 320, 46, 44, + 44, 44, 320, 49, 46, 44, 44, 44, 320, 320, + 46, 320, 320, 49, 320, 320, 95, 320, 320, 49, + + 320, 44, 44, 44, 320, 49, 46, 320, 100, 96, + 98, 49, 320, 97, 102, 99, 320, 49, 44, 44, + 44, 101, 320, 46, 44, 44, 44, 320, 320, 46, + 44, 44, 44, 49, 320, 46, 104, 320, 103, 66, + 66, 66, 66, 320, 320, 320, 70, 320, 70, 64, + 49, 71, 71, 71, 71, 320, 49, 105, 71, 71, + 71, 71, 49, 320, 320, 64, 106, 320, 320, 320, + 107, 108, 320, 320, 62, 109, 63, 63, 63, 63, + 62, 320, 65, 65, 65, 65, 64, 66, 66, 66, + 66, 320, 64, 71, 71, 71, 71, 64, 44, 44, + + 44, 320, 64, 46, 44, 44, 44, 320, 64, 46, + 44, 44, 44, 64, 320, 125, 44, 44, 44, 320, + 320, 46, 44, 44, 44, 320, 320, 128, 320, 320, + 49, 320, 44, 44, 44, 320, 49, 46, 320, 120, + 320, 320, 49, 320, 44, 44, 44, 320, 49, 46, + 320, 320, 320, 320, 49, 320, 121, 124, 124, 124, + 124, 320, 126, 127, 49, 124, 124, 124, 124, 44, + 44, 44, 320, 135, 46, 320, 49, 320, 320, 124, + 124, 124, 124, 124, 124, 44, 44, 44, 320, 320, + 46, 44, 44, 44, 320, 320, 46, 131, 44, 44, + + 44, 49, 320, 46, 320, 129, 44, 44, 44, 320, + 320, 46, 320, 44, 44, 44, 320, 49, 46, 44, + 44, 44, 130, 49, 46, 320, 44, 44, 44, 320, + 49, 46, 44, 44, 44, 320, 320, 46, 49, 132, + 320, 320, 134, 320, 320, 49, 320, 44, 44, 44, + 133, 49, 46, 320, 44, 44, 44, 138, 49, 46, + 136, 44, 44, 44, 49, 320, 46, 320, 137, 44, + 44, 44, 139, 320, 46, 320, 320, 320, 320, 49, + 44, 44, 44, 320, 140, 46, 49, 44, 44, 44, + 320, 320, 46, 49, 320, 320, 320, 141, 143, 320, + + 320, 49, 320, 320, 44, 44, 44, 144, 142, 46, + 320, 320, 49, 320, 320, 44, 44, 44, 320, 49, + 46, 320, 320, 145, 320, 320, 146, 44, 44, 44, + 320, 320, 46, 44, 44, 44, 49, 320, 46, 44, + 44, 44, 320, 320, 46, 155, 320, 49, 320, 320, + 320, 320, 156, 157, 157, 157, 157, 320, 320, 49, + 320, 157, 157, 157, 157, 49, 320, 44, 44, 44, + 320, 49, 46, 158, 320, 157, 157, 157, 157, 157, + 157, 44, 44, 44, 320, 159, 46, 320, 320, 44, + 44, 44, 160, 320, 46, 44, 44, 44, 320, 49, + + 46, 320, 44, 44, 44, 320, 320, 46, 320, 44, + 44, 44, 320, 49, 46, 320, 161, 44, 44, 44, + 320, 49, 46, 44, 44, 44, 320, 49, 46, 320, + 320, 320, 162, 163, 49, 44, 44, 44, 320, 320, + 46, 49, 320, 320, 164, 320, 44, 44, 44, 49, + 166, 46, 165, 320, 320, 49, 320, 320, 167, 44, + 44, 44, 320, 320, 46, 320, 320, 49, 168, 320, + 320, 169, 320, 320, 170, 44, 44, 44, 49, 320, + 46, 44, 44, 44, 320, 171, 46, 44, 44, 44, + 320, 49, 46, 44, 44, 44, 320, 320, 46, 320, + + 44, 44, 44, 320, 320, 46, 320, 49, 172, 320, + 173, 320, 320, 49, 320, 320, 44, 44, 44, 49, + 174, 46, 44, 44, 44, 49, 320, 46, 44, 44, + 44, 175, 49, 46, 320, 44, 44, 44, 320, 320, + 46, 176, 320, 320, 320, 320, 320, 320, 49, 320, + 320, 44, 44, 44, 49, 177, 46, 44, 44, 44, + 49, 320, 46, 320, 320, 183, 178, 49, 320, 320, + 320, 320, 320, 320, 186, 320, 184, 185, 185, 185, + 185, 320, 320, 49, 320, 185, 185, 185, 185, 49, + 320, 320, 188, 44, 44, 44, 320, 320, 46, 185, + + 185, 185, 185, 185, 185, 320, 320, 187, 189, 190, + 44, 44, 44, 320, 320, 46, 44, 44, 44, 320, + 320, 46, 44, 44, 44, 49, 320, 193, 44, 44, + 44, 320, 320, 46, 44, 44, 44, 320, 320, 46, + 320, 320, 49, 320, 44, 44, 44, 320, 49, 46, + 320, 320, 191, 320, 49, 320, 44, 44, 44, 320, + 49, 46, 320, 194, 320, 320, 49, 192, 320, 44, + 44, 44, 320, 195, 46, 320, 49, 44, 44, 44, + 320, 320, 46, 320, 320, 196, 320, 320, 49, 44, + 44, 44, 320, 320, 200, 44, 44, 44, 320, 197, + + 46, 49, 320, 320, 320, 44, 44, 44, 198, 49, + 46, 44, 44, 44, 320, 320, 46, 320, 44, 44, + 44, 49, 199, 46, 44, 44, 44, 49, 320, 46, + 44, 44, 44, 320, 320, 206, 320, 49, 320, 44, + 44, 44, 320, 49, 46, 320, 320, 320, 201, 207, + 49, 202, 320, 44, 44, 44, 49, 204, 46, 320, + 320, 203, 49, 44, 44, 44, 320, 320, 46, 320, + 320, 49, 320, 44, 44, 44, 320, 205, 46, 320, + 320, 320, 320, 320, 320, 49, 320, 320, 320, 320, + 320, 320, 44, 44, 44, 49, 320, 46, 320, 320, + + 210, 320, 320, 320, 320, 49, 320, 320, 320, 320, + 211, 45, 45, 45, 45, 320, 320, 320, 214, 45, + 45, 45, 45, 320, 49, 44, 44, 44, 320, 320, + 46, 320, 320, 45, 45, 45, 45, 45, 45, 212, + 44, 44, 44, 320, 320, 215, 44, 44, 44, 320, + 320, 216, 320, 44, 44, 44, 320, 49, 217, 44, + 44, 44, 320, 320, 46, 44, 44, 44, 320, 218, + 46, 320, 49, 213, 44, 44, 44, 320, 49, 46, + 320, 44, 44, 44, 320, 49, 46, 44, 44, 44, + 320, 49, 46, 44, 44, 44, 320, 49, 46, 44, + + 44, 44, 320, 320, 224, 320, 49, 44, 44, 44, + 320, 320, 46, 49, 320, 219, 44, 44, 44, 49, + 221, 46, 320, 320, 220, 49, 320, 320, 44, 44, + 44, 49, 320, 46, 320, 44, 44, 44, 320, 49, + 46, 320, 320, 223, 222, 44, 44, 44, 49, 320, + 46, 44, 44, 44, 320, 226, 46, 320, 320, 225, + 49, 44, 44, 44, 320, 320, 46, 49, 44, 44, + 44, 227, 320, 46, 44, 44, 44, 49, 320, 46, + 44, 44, 44, 49, 320, 46, 320, 228, 230, 44, + 44, 44, 320, 49, 46, 320, 320, 229, 320, 320, + + 49, 320, 232, 320, 320, 320, 49, 320, 233, 44, + 44, 44, 49, 320, 46, 44, 44, 44, 320, 320, + 46, 49, 320, 320, 320, 235, 234, 320, 236, 44, + 44, 44, 320, 320, 46, 44, 44, 44, 320, 320, + 46, 49, 320, 44, 44, 44, 320, 49, 46, 320, + 320, 44, 44, 44, 237, 320, 242, 44, 44, 44, + 320, 49, 243, 44, 44, 44, 320, 49, 46, 320, + 320, 238, 320, 240, 320, 49, 44, 44, 44, 320, + 239, 46, 241, 49, 320, 44, 44, 44, 320, 49, + 248, 244, 44, 44, 44, 49, 320, 46, 44, 44, + + 44, 320, 247, 46, 44, 44, 44, 320, 49, 250, + 320, 44, 44, 44, 320, 245, 251, 49, 44, 44, + 44, 320, 320, 252, 49, 320, 320, 320, 246, 320, + 49, 320, 44, 44, 44, 320, 49, 46, 320, 44, + 44, 44, 253, 49, 46, 320, 249, 44, 44, 44, + 49, 320, 46, 44, 44, 44, 320, 320, 256, 320, + 44, 44, 44, 320, 49, 257, 320, 44, 44, 44, + 320, 49, 46, 44, 44, 44, 320, 258, 259, 49, + 320, 44, 44, 44, 320, 49, 46, 320, 320, 320, + 255, 320, 49, 254, 320, 44, 44, 44, 320, 49, + + 46, 44, 44, 44, 320, 49, 46, 44, 44, 44, + 320, 320, 46, 49, 44, 44, 44, 320, 320, 46, + 44, 44, 44, 320, 320, 46, 320, 49, 320, 260, + 44, 44, 44, 49, 261, 46, 44, 44, 44, 49, + 320, 46, 44, 44, 44, 320, 49, 46, 44, 44, + 44, 320, 49, 46, 263, 320, 320, 262, 320, 264, + 265, 266, 49, 320, 320, 320, 320, 320, 49, 268, + 320, 267, 269, 320, 49, 320, 44, 44, 44, 320, + 49, 46, 44, 44, 44, 320, 320, 273, 320, 44, + 44, 44, 320, 270, 46, 320, 320, 271, 44, 44, + + 44, 320, 320, 46, 320, 44, 44, 44, 49, 320, + 46, 44, 44, 44, 49, 320, 46, 44, 44, 44, + 320, 49, 46, 320, 274, 320, 272, 44, 44, 44, + 49, 320, 46, 320, 44, 44, 44, 49, 320, 46, + 320, 320, 320, 49, 320, 320, 44, 44, 44, 49, + 320, 46, 320, 320, 275, 276, 44, 44, 44, 49, + 320, 46, 320, 277, 320, 278, 49, 320, 44, 44, + 44, 320, 279, 46, 44, 44, 44, 320, 49, 46, + 320, 44, 44, 44, 280, 281, 46, 320, 49, 44, + 44, 44, 320, 320, 46, 320, 44, 44, 44, 320, + + 49, 46, 320, 320, 320, 320, 49, 320, 282, 44, + 44, 44, 320, 49, 46, 320, 320, 320, 320, 283, + 284, 49, 44, 44, 44, 320, 320, 289, 49, 320, + 285, 44, 44, 44, 286, 287, 46, 44, 44, 44, + 320, 49, 46, 44, 44, 44, 288, 320, 46, 320, + 44, 44, 44, 320, 49, 293, 44, 44, 44, 320, + 320, 46, 320, 49, 320, 320, 290, 320, 320, 49, + 320, 44, 44, 44, 320, 49, 46, 320, 320, 44, + 44, 44, 49, 320, 296, 320, 292, 291, 49, 44, + 44, 44, 320, 320, 46, 294, 44, 44, 44, 320, + + 320, 46, 320, 49, 44, 44, 44, 320, 320, 46, + 295, 49, 320, 44, 44, 44, 320, 320, 46, 320, + 320, 49, 320, 320, 44, 44, 44, 320, 49, 46, + 44, 44, 44, 320, 320, 302, 49, 44, 44, 44, + 298, 320, 303, 320, 297, 49, 44, 44, 44, 320, + 320, 46, 320, 320, 299, 320, 49, 320, 44, 44, + 44, 320, 49, 46, 320, 320, 320, 300, 320, 49, + 320, 320, 301, 320, 44, 44, 44, 320, 49, 46, + 44, 44, 44, 320, 320, 46, 44, 44, 44, 320, + 49, 46, 320, 320, 44, 44, 44, 305, 304, 309, + + 44, 44, 44, 320, 320, 46, 49, 320, 44, 44, + 44, 320, 49, 46, 320, 320, 320, 306, 49, 307, + 320, 320, 44, 44, 44, 320, 49, 46, 320, 44, + 44, 44, 49, 308, 46, 320, 44, 44, 44, 320, + 49, 314, 320, 44, 44, 44, 320, 311, 46, 320, + 320, 320, 310, 320, 49, 44, 44, 44, 320, 320, + 46, 49, 320, 320, 44, 44, 44, 320, 49, 317, + 320, 320, 312, 320, 320, 49, 44, 44, 44, 320, + 313, 318, 320, 44, 44, 44, 320, 49, 319, 320, + 320, 320, 320, 320, 315, 320, 49, 320, 320, 320, + + 320, 320, 320, 320, 320, 320, 316, 320, 49, 320, + 320, 320, 320, 320, 320, 49, 36, 36, 36, 36, + 36, 36, 36, 45, 45, 45, 45, 45, 45, 45, + 61, 320, 61, 61, 61, 61, 61, 80, 320, 80, + 320, 80, 80, 80, 82, 82, 82, 82, 82, 82, + 82, 87, 87, 87, 87, 87, 87, 87, 110, 320, + 110, 110, 110, 110, 110, 82, 82, 320, 82, 122, + 122, 122, 122, 122, 154, 154, 182, 182, 209, 209, + 82, 82, 11, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320 } ; -static const flex_int16_t yy_chk[2289] = +static const flex_int16_t yy_chk[2144] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1133,251 +1111,236 @@ static const flex_int16_t yy_chk[2289] = 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, 3, 3, 3, 4, 4, 4, 3, 9, - 7, 4, 5, 5, 8, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 10, 13, 37, 13, - 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, 351, 5, 31, 28, 44, - 42, 5, 42, 32, 33, 350, 27, 5, 5, 15, - 15, 15, 349, 31, 15, 17, 348, 17, 17, 17, - 17, 28, 20, 20, 20, 20, 32, 33, 44, 17, - 228, 77, 15, 15, 20, 75, 15, 15, 73, 73, - 73, 73, 195, 15, 163, 17, 76, 130, 15, 15, - 20, 15, 78, 15, 77, 75, 15, 15, 15, 15, - 15, 80, 15, 15, 15, 19, 76, 19, 19, 19, - 19, 22, 78, 22, 22, 22, 22, 119, 85, 19, - - 79, 45, 45, 45, 80, 22, 45, 47, 47, 47, - 118, 117, 47, 119, 120, 19, 123, 48, 48, 48, - 79, 22, 48, 122, 49, 49, 49, 85, 121, 49, - 118, 50, 50, 50, 117, 45, 50, 120, 51, 122, - 157, 47, 52, 52, 52, 51, 160, 52, 121, 92, - 83, 48, 65, 65, 65, 65, 157, 47, 49, 82, - 43, 48, 160, 41, 65, 50, 39, 51, 54, 54, - 54, 51, 50, 54, 49, 51, 52, 38, 24, 52, - 65, 14, 51, 11, 0, 51, 0, 51, 51, 53, - 53, 53, 52, 0, 53, 55, 55, 55, 0, 0, - - 55, 0, 54, 53, 0, 56, 56, 56, 0, 0, - 56, 74, 74, 74, 74, 54, 0, 57, 57, 57, - 0, 0, 57, 53, 0, 0, 58, 58, 58, 55, - 53, 58, 0, 53, 0, 59, 59, 59, 0, 56, - 59, 60, 60, 60, 0, 55, 60, 0, 0, 55, - 56, 57, 0, 0, 57, 56, 0, 0, 0, 0, - 58, 0, 0, 58, 0, 0, 0, 57, 0, 59, - 0, 61, 61, 61, 0, 60, 61, 0, 60, 62, - 62, 62, 0, 0, 62, 0, 0, 63, 63, 63, - 59, 60, 63, 66, 0, 66, 66, 66, 66, 0, - - 0, 88, 88, 88, 0, 61, 88, 66, 0, 67, - 0, 67, 61, 62, 67, 67, 67, 67, 0, 0, - 0, 63, 0, 66, 68, 61, 68, 68, 68, 68, - 69, 69, 69, 69, 87, 88, 63, 62, 68, 0, - 63, 87, 69, 89, 89, 89, 0, 0, 89, 0, - 88, 90, 90, 90, 68, 0, 90, 0, 69, 91, - 91, 91, 0, 87, 91, 0, 0, 87, 93, 93, - 93, 87, 0, 93, 95, 95, 95, 89, 87, 95, - 0, 87, 89, 87, 87, 90, 96, 96, 96, 0, - 0, 96, 0, 91, 90, 97, 97, 97, 0, 0, - - 97, 0, 93, 0, 0, 0, 0, 0, 95, 0, - 0, 0, 0, 91, 94, 94, 94, 94, 0, 0, - 96, 0, 94, 94, 94, 94, 94, 94, 0, 97, - 0, 98, 98, 98, 96, 96, 98, 0, 94, 94, - 94, 94, 94, 94, 99, 99, 99, 0, 0, 99, - 100, 100, 100, 0, 0, 100, 101, 101, 101, 0, - 0, 101, 102, 102, 102, 98, 0, 102, 0, 98, - 103, 103, 103, 0, 0, 103, 0, 0, 99, 0, - 104, 104, 104, 99, 100, 104, 105, 105, 105, 0, - 101, 105, 106, 106, 106, 0, 102, 106, 0, 0, - - 0, 0, 0, 0, 103, 100, 101, 0, 103, 101, - 107, 107, 107, 0, 104, 107, 102, 108, 108, 108, - 105, 0, 108, 104, 0, 0, 106, 0, 109, 109, - 109, 0, 106, 109, 0, 105, 110, 110, 110, 0, - 0, 110, 0, 105, 107, 111, 111, 111, 0, 0, - 111, 108, 112, 112, 112, 0, 0, 112, 107, 113, - 113, 113, 109, 0, 113, 0, 0, 0, 0, 0, - 110, 108, 114, 114, 114, 0, 0, 114, 0, 111, - 109, 0, 115, 115, 115, 0, 112, 115, 110, 0, - 0, 0, 112, 113, 126, 126, 126, 0, 0, 126, - - 0, 111, 127, 127, 127, 0, 114, 127, 0, 0, - 113, 0, 0, 128, 128, 128, 115, 114, 128, 0, - 129, 129, 129, 115, 0, 129, 0, 0, 126, 0, - 134, 134, 134, 0, 0, 134, 127, 0, 0, 0, - 135, 135, 135, 0, 0, 135, 0, 128, 126, 0, - 0, 0, 0, 127, 129, 0, 128, 0, 0, 129, - 132, 132, 132, 132, 134, 0, 0, 0, 132, 132, - 132, 132, 132, 132, 135, 137, 137, 137, 134, 0, - 137, 0, 0, 0, 132, 132, 132, 132, 132, 132, - 138, 138, 138, 0, 135, 138, 0, 139, 139, 139, - - 0, 0, 139, 140, 140, 140, 0, 0, 140, 137, - 141, 141, 141, 0, 0, 141, 0, 142, 142, 142, - 0, 0, 142, 0, 138, 0, 0, 143, 143, 143, - 137, 139, 143, 144, 144, 144, 0, 140, 144, 0, - 0, 138, 0, 0, 141, 0, 0, 0, 0, 140, - 139, 142, 145, 145, 145, 0, 0, 145, 146, 146, - 146, 143, 0, 146, 141, 0, 0, 144, 142, 147, - 147, 147, 0, 0, 147, 0, 144, 0, 0, 143, - 0, 0, 148, 148, 148, 0, 145, 148, 0, 145, - 0, 0, 146, 149, 149, 149, 0, 0, 149, 150, - - 150, 150, 0, 147, 150, 0, 0, 151, 151, 151, - 147, 146, 151, 0, 146, 0, 148, 152, 152, 152, - 0, 0, 152, 148, 0, 0, 0, 149, 0, 153, - 153, 153, 0, 150, 153, 0, 150, 154, 154, 154, - 0, 151, 154, 0, 149, 0, 0, 155, 155, 155, - 0, 152, 155, 0, 156, 156, 156, 0, 152, 156, - 0, 151, 0, 153, 165, 165, 165, 0, 0, 165, - 0, 154, 0, 0, 0, 166, 166, 166, 154, 153, - 166, 155, 0, 0, 167, 167, 167, 0, 156, 167, - 166, 166, 168, 168, 168, 0, 0, 168, 165, 166, - - 170, 170, 170, 0, 155, 170, 156, 0, 0, 166, - 0, 0, 0, 0, 0, 0, 165, 0, 167, 0, - 0, 0, 0, 171, 171, 171, 168, 0, 171, 167, - 172, 172, 172, 0, 170, 172, 0, 0, 0, 0, - 0, 170, 168, 169, 169, 169, 169, 0, 0, 0, - 0, 169, 169, 169, 169, 169, 169, 171, 0, 0, - 0, 173, 173, 173, 172, 0, 173, 169, 169, 169, - 169, 169, 169, 172, 0, 171, 173, 173, 174, 174, - 174, 0, 0, 174, 175, 175, 175, 0, 0, 175, - 0, 176, 176, 176, 0, 173, 176, 177, 177, 177, - - 0, 0, 177, 0, 178, 178, 178, 0, 0, 178, - 0, 0, 174, 0, 179, 179, 179, 0, 175, 179, - 0, 0, 174, 0, 0, 176, 0, 180, 180, 180, - 0, 177, 180, 0, 181, 181, 181, 175, 178, 181, - 0, 178, 182, 182, 182, 0, 0, 182, 179, 0, - 0, 183, 183, 183, 0, 179, 183, 184, 184, 184, - 0, 180, 184, 0, 0, 0, 0, 0, 181, 0, - 180, 0, 185, 185, 185, 0, 182, 185, 0, 181, - 0, 0, 0, 182, 0, 183, 0, 186, 186, 186, - 0, 184, 186, 0, 187, 187, 187, 0, 183, 187, - - 188, 188, 188, 0, 0, 188, 185, 189, 189, 189, - 0, 0, 189, 190, 190, 190, 0, 0, 190, 0, - 0, 186, 0, 0, 191, 191, 191, 185, 187, 191, - 0, 197, 197, 197, 188, 186, 197, 0, 192, 192, - 192, 189, 0, 192, 198, 198, 198, 190, 192, 198, - 0, 0, 188, 0, 199, 199, 199, 0, 191, 199, - 0, 0, 189, 0, 0, 197, 200, 200, 200, 0, - 0, 200, 192, 0, 201, 201, 201, 0, 198, 201, - 0, 197, 202, 202, 202, 0, 0, 202, 199, 0, - 204, 204, 204, 0, 0, 204, 205, 205, 205, 0, - - 200, 205, 206, 206, 206, 0, 200, 206, 201, 0, - 0, 0, 0, 207, 207, 207, 202, 0, 207, 0, - 208, 208, 208, 201, 204, 208, 0, 0, 0, 0, - 205, 202, 203, 203, 203, 203, 206, 0, 0, 204, - 203, 203, 203, 203, 203, 203, 205, 207, 0, 206, - 209, 209, 209, 0, 208, 209, 203, 203, 203, 203, - 203, 203, 210, 210, 210, 0, 0, 210, 213, 213, - 213, 0, 210, 213, 214, 214, 214, 0, 0, 214, - 215, 215, 215, 0, 209, 215, 0, 0, 216, 216, - 216, 0, 0, 216, 0, 0, 210, 0, 217, 217, - - 217, 0, 213, 217, 218, 218, 218, 0, 214, 218, - 220, 220, 220, 0, 215, 220, 0, 0, 0, 0, - 213, 215, 216, 0, 0, 0, 214, 0, 221, 221, - 221, 0, 217, 221, 223, 223, 223, 0, 218, 223, - 224, 224, 224, 0, 220, 224, 0, 216, 0, 0, - 217, 227, 227, 227, 0, 0, 227, 0, 230, 230, - 230, 0, 221, 230, 220, 233, 233, 233, 223, 221, - 233, 0, 0, 0, 224, 234, 234, 234, 0, 223, - 234, 235, 235, 235, 0, 227, 235, 0, 0, 0, - 227, 0, 230, 0, 224, 236, 236, 236, 0, 233, - - 236, 237, 237, 237, 0, 230, 237, 0, 0, 234, - 0, 238, 238, 238, 233, 235, 238, 0, 234, 242, - 242, 242, 0, 235, 242, 243, 243, 243, 0, 236, - 243, 244, 244, 244, 0, 237, 244, 245, 245, 245, - 0, 0, 245, 0, 0, 238, 0, 0, 237, 236, - 0, 0, 238, 242, 0, 246, 246, 246, 0, 243, - 246, 0, 0, 0, 0, 244, 242, 247, 247, 247, - 0, 245, 247, 249, 249, 249, 0, 245, 249, 0, - 250, 250, 250, 243, 244, 250, 251, 251, 251, 246, - 0, 251, 252, 252, 252, 0, 246, 252, 253, 253, - - 253, 247, 0, 253, 0, 0, 0, 249, 0, 249, - 0, 255, 255, 255, 250, 0, 255, 256, 256, 256, - 251, 255, 256, 257, 257, 257, 252, 0, 257, 0, - 0, 0, 253, 0, 250, 0, 0, 258, 258, 258, - 251, 0, 258, 0, 0, 255, 0, 0, 253, 0, - 0, 256, 0, 259, 259, 259, 0, 257, 259, 260, - 260, 260, 0, 0, 260, 0, 0, 0, 0, 260, - 256, 258, 261, 261, 261, 0, 0, 261, 262, 262, - 262, 0, 0, 262, 263, 263, 263, 259, 0, 263, - 264, 264, 264, 260, 0, 264, 0, 265, 265, 265, - - 0, 0, 265, 266, 266, 266, 261, 265, 266, 269, - 269, 269, 262, 0, 269, 270, 270, 270, 263, 0, - 270, 0, 0, 262, 264, 0, 0, 0, 261, 0, - 0, 265, 0, 271, 271, 271, 0, 266, 271, 273, - 273, 273, 0, 269, 273, 274, 274, 274, 0, 270, - 274, 0, 275, 275, 275, 0, 270, 275, 0, 269, - 279, 279, 279, 0, 0, 279, 0, 271, 0, 280, - 280, 280, 0, 273, 280, 284, 284, 284, 0, 274, - 284, 0, 274, 0, 0, 0, 275, 0, 273, 0, - 0, 271, 0, 0, 279, 281, 281, 281, 0, 0, - - 281, 0, 0, 280, 0, 0, 286, 286, 286, 284, - 280, 286, 0, 279, 287, 287, 287, 0, 0, 287, - 288, 288, 288, 0, 0, 288, 0, 0, 284, 281, - 289, 289, 289, 281, 0, 289, 290, 290, 290, 0, - 286, 290, 292, 292, 292, 0, 0, 292, 287, 0, - 0, 293, 293, 293, 288, 0, 293, 286, 0, 0, - 294, 294, 294, 0, 289, 294, 287, 295, 295, 295, - 290, 0, 295, 296, 296, 296, 292, 0, 296, 290, - 0, 297, 297, 297, 289, 293, 297, 0, 299, 299, - 299, 0, 292, 299, 294, 0, 0, 0, 293, 0, - - 0, 295, 0, 0, 300, 300, 300, 296, 295, 300, - 0, 0, 294, 0, 0, 297, 301, 301, 301, 0, - 0, 301, 299, 302, 302, 302, 0, 296, 302, 299, - 303, 303, 303, 0, 297, 303, 0, 0, 300, 304, - 304, 304, 0, 0, 304, 300, 0, 305, 305, 305, - 301, 0, 305, 0, 0, 301, 0, 302, 0, 0, - 306, 306, 306, 0, 303, 306, 0, 303, 0, 307, - 307, 307, 0, 304, 307, 308, 308, 308, 0, 0, - 308, 305, 309, 309, 309, 0, 0, 309, 311, 311, - 311, 304, 305, 311, 306, 312, 312, 312, 0, 0, - - 312, 0, 0, 307, 0, 313, 313, 313, 0, 308, - 313, 0, 315, 315, 315, 0, 309, 315, 316, 316, - 316, 0, 311, 316, 308, 0, 307, 0, 309, 312, - 317, 317, 317, 0, 0, 317, 318, 318, 318, 313, - 311, 318, 319, 319, 319, 0, 315, 319, 320, 320, - 320, 312, 316, 320, 0, 313, 321, 321, 321, 0, - 0, 321, 0, 0, 317, 0, 315, 0, 0, 0, - 318, 317, 316, 322, 322, 322, 319, 0, 322, 0, - 0, 318, 320, 319, 323, 323, 323, 0, 0, 323, - 321, 324, 324, 324, 0, 0, 324, 320, 0, 325, - - 325, 325, 0, 0, 325, 0, 0, 322, 326, 326, - 326, 0, 0, 326, 329, 329, 329, 0, 323, 329, - 0, 330, 330, 330, 0, 324, 330, 0, 0, 331, - 331, 331, 324, 325, 331, 332, 332, 332, 323, 0, - 332, 0, 326, 0, 334, 334, 334, 0, 329, 334, - 0, 325, 335, 335, 335, 330, 0, 335, 0, 0, - 0, 326, 0, 331, 0, 0, 0, 0, 0, 332, - 0, 0, 0, 0, 330, 0, 0, 0, 334, 0, - 0, 0, 331, 0, 0, 0, 335, 340, 340, 340, - 340, 340, 341, 341, 341, 341, 341, 342, 0, 342, - - 342, 342, 343, 0, 343, 0, 343, 344, 344, 344, - 344, 344, 345, 345, 345, 345, 345, 346, 0, 346, - 346, 346, 347, 347, 347, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339, 339, 339, - 339, 339, 339, 339, 339, 339, 339, 339 + 3, 3, 3, 4, 4, 4, 3, 9, 7, 4, + 5, 5, 8, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 10, 13, 26, 13, 5, 5, + 9, 5, 21, 37, 5, 37, 5, 21, 5, 27, + + 26, 31, 44, 208, 5, 5, 7, 10, 5, 28, + 8, 42, 5, 42, 32, 31, 17, 5, 17, 17, + 17, 17, 27, 5, 5, 15, 15, 15, 17, 44, + 15, 19, 28, 19, 19, 19, 19, 32, 20, 20, + 20, 20, 82, 19, 17, 33, 72, 25, 20, 25, + 15, 15, 25, 25, 25, 25, 181, 15, 153, 19, + 122, 117, 15, 15, 20, 15, 72, 15, 33, 82, + 15, 15, 15, 15, 15, 87, 15, 22, 15, 22, + 22, 22, 22, 45, 45, 45, 84, 74, 45, 22, + 47, 47, 47, 73, 75, 47, 48, 48, 48, 49, + + 113, 48, 77, 80, 76, 22, 49, 50, 50, 50, + 74, 112, 50, 73, 75, 45, 113, 111, 51, 51, + 51, 116, 47, 51, 76, 77, 49, 147, 48, 115, + 49, 112, 51, 79, 49, 48, 114, 116, 47, 50, + 111, 49, 50, 147, 49, 43, 49, 49, 150, 115, + 51, 52, 52, 52, 41, 50, 52, 51, 39, 114, + 51, 53, 53, 53, 150, 38, 53, 54, 54, 54, + 24, 14, 54, 55, 55, 55, 11, 0, 55, 56, + 56, 56, 0, 52, 56, 57, 57, 57, 0, 0, + 57, 0, 0, 53, 0, 0, 52, 0, 0, 54, + + 0, 58, 58, 58, 0, 55, 58, 0, 55, 53, + 54, 56, 0, 53, 56, 54, 0, 57, 59, 59, + 59, 55, 0, 59, 60, 60, 60, 0, 0, 60, + 88, 88, 88, 58, 0, 88, 58, 0, 57, 62, + 62, 62, 62, 0, 0, 0, 64, 0, 64, 62, + 59, 64, 64, 64, 64, 0, 60, 59, 70, 70, + 70, 70, 88, 0, 0, 62, 59, 0, 0, 0, + 59, 60, 0, 0, 63, 60, 63, 63, 63, 63, + 65, 0, 65, 65, 65, 65, 63, 66, 66, 66, + 66, 0, 65, 71, 71, 71, 71, 66, 85, 85, + + 85, 0, 63, 85, 86, 86, 86, 0, 65, 86, + 90, 90, 90, 66, 0, 90, 91, 91, 91, 0, + 0, 91, 92, 92, 92, 0, 0, 92, 0, 0, + 85, 0, 99, 99, 99, 0, 86, 99, 0, 85, + 0, 0, 90, 0, 95, 95, 95, 0, 91, 95, + 0, 0, 0, 0, 92, 0, 86, 89, 89, 89, + 89, 0, 91, 91, 99, 89, 89, 89, 89, 93, + 93, 93, 0, 99, 93, 0, 95, 0, 0, 89, + 89, 89, 89, 89, 89, 94, 94, 94, 0, 0, + 94, 96, 96, 96, 0, 0, 96, 95, 97, 97, + + 97, 93, 0, 97, 0, 93, 98, 98, 98, 0, + 0, 98, 0, 100, 100, 100, 0, 94, 100, 101, + 101, 101, 94, 96, 101, 0, 102, 102, 102, 0, + 97, 102, 103, 103, 103, 0, 0, 103, 98, 96, + 0, 0, 98, 0, 0, 100, 0, 104, 104, 104, + 97, 101, 104, 0, 105, 105, 105, 101, 102, 105, + 100, 106, 106, 106, 103, 0, 106, 0, 100, 107, + 107, 107, 102, 0, 107, 0, 0, 0, 0, 104, + 108, 108, 108, 0, 103, 108, 105, 109, 109, 109, + 0, 0, 109, 106, 0, 0, 0, 104, 106, 0, + + 0, 107, 0, 0, 120, 120, 120, 107, 105, 120, + 0, 0, 108, 0, 0, 121, 121, 121, 0, 109, + 121, 0, 0, 108, 0, 0, 109, 126, 126, 126, + 0, 0, 126, 127, 127, 127, 120, 0, 127, 129, + 129, 129, 0, 0, 129, 120, 0, 121, 0, 0, + 0, 0, 121, 124, 124, 124, 124, 0, 0, 126, + 0, 124, 124, 124, 124, 127, 0, 130, 130, 130, + 0, 129, 130, 126, 0, 124, 124, 124, 124, 124, + 124, 131, 131, 131, 0, 127, 131, 0, 0, 132, + 132, 132, 129, 0, 132, 133, 133, 133, 0, 130, + + 133, 0, 134, 134, 134, 0, 0, 134, 0, 135, + 135, 135, 0, 131, 135, 0, 130, 137, 137, 137, + 0, 132, 137, 136, 136, 136, 0, 133, 136, 0, + 0, 0, 131, 132, 134, 138, 138, 138, 0, 0, + 138, 135, 0, 0, 133, 0, 139, 139, 139, 137, + 135, 139, 134, 0, 0, 136, 0, 0, 136, 140, + 140, 140, 0, 0, 140, 0, 0, 138, 137, 0, + 0, 137, 0, 0, 138, 141, 141, 141, 139, 0, + 141, 142, 142, 142, 0, 139, 142, 143, 143, 143, + 0, 140, 143, 144, 144, 144, 0, 0, 144, 0, + + 145, 145, 145, 0, 0, 145, 0, 141, 140, 0, + 141, 0, 0, 142, 0, 0, 146, 146, 146, 143, + 142, 146, 155, 155, 155, 144, 0, 155, 156, 156, + 156, 143, 145, 156, 0, 158, 158, 158, 0, 0, + 158, 144, 0, 0, 0, 0, 0, 0, 146, 0, + 0, 160, 160, 160, 155, 145, 160, 159, 159, 159, + 156, 0, 159, 0, 0, 155, 146, 158, 0, 0, + 0, 0, 0, 0, 158, 0, 156, 157, 157, 157, + 157, 0, 0, 160, 0, 157, 157, 157, 157, 159, + 0, 0, 160, 161, 161, 161, 0, 0, 161, 157, + + 157, 157, 157, 157, 157, 0, 0, 159, 161, 161, + 162, 162, 162, 0, 0, 162, 163, 163, 163, 0, + 0, 163, 164, 164, 164, 161, 0, 164, 165, 165, + 165, 0, 0, 165, 166, 166, 166, 0, 0, 166, + 0, 0, 162, 0, 167, 167, 167, 0, 163, 167, + 0, 0, 162, 0, 164, 0, 168, 168, 168, 0, + 165, 168, 0, 165, 0, 0, 166, 163, 0, 169, + 169, 169, 0, 166, 169, 0, 167, 170, 170, 170, + 0, 0, 170, 0, 0, 167, 0, 0, 168, 171, + 171, 171, 0, 0, 171, 172, 172, 172, 0, 168, + + 172, 169, 0, 0, 0, 173, 173, 173, 169, 170, + 173, 174, 174, 174, 0, 0, 174, 0, 175, 175, + 175, 171, 170, 175, 176, 176, 176, 172, 0, 176, + 177, 177, 177, 0, 0, 177, 0, 173, 0, 178, + 178, 178, 0, 174, 178, 0, 0, 0, 172, 178, + 175, 173, 0, 183, 183, 183, 176, 175, 183, 0, + 0, 174, 177, 184, 184, 184, 0, 0, 184, 0, + 0, 178, 0, 188, 188, 188, 0, 176, 188, 0, + 0, 0, 0, 0, 0, 183, 0, 0, 0, 0, + 0, 0, 186, 186, 186, 184, 0, 186, 0, 0, + + 183, 0, 0, 0, 0, 188, 0, 0, 0, 0, + 184, 185, 185, 185, 185, 0, 0, 0, 188, 185, + 185, 185, 185, 0, 186, 187, 187, 187, 0, 0, + 187, 0, 0, 185, 185, 185, 185, 185, 185, 186, + 189, 189, 189, 0, 0, 189, 190, 190, 190, 0, + 0, 190, 0, 191, 191, 191, 0, 187, 191, 192, + 192, 192, 0, 0, 192, 194, 194, 194, 0, 192, + 194, 0, 189, 187, 195, 195, 195, 0, 190, 195, + 0, 196, 196, 196, 0, 191, 196, 197, 197, 197, + 0, 192, 197, 198, 198, 198, 0, 194, 198, 199, + + 199, 199, 0, 0, 199, 0, 195, 201, 201, 201, + 0, 0, 201, 196, 0, 194, 202, 202, 202, 197, + 196, 202, 0, 0, 195, 198, 0, 0, 203, 203, + 203, 199, 0, 203, 0, 204, 204, 204, 0, 201, + 204, 0, 0, 198, 197, 205, 205, 205, 202, 0, + 205, 207, 207, 207, 0, 202, 207, 0, 0, 201, + 203, 210, 210, 210, 0, 0, 210, 204, 211, 211, + 211, 203, 0, 211, 212, 212, 212, 205, 0, 212, + 213, 213, 213, 207, 0, 213, 0, 204, 207, 214, + 214, 214, 0, 210, 214, 0, 0, 205, 0, 0, + + 211, 0, 210, 0, 0, 0, 212, 0, 211, 218, + 218, 218, 213, 0, 218, 219, 219, 219, 0, 0, + 219, 214, 0, 0, 0, 213, 212, 0, 214, 220, + 220, 220, 0, 0, 220, 221, 221, 221, 0, 0, + 221, 218, 0, 222, 222, 222, 0, 219, 222, 0, + 0, 223, 223, 223, 218, 0, 223, 225, 225, 225, + 0, 220, 225, 226, 226, 226, 0, 221, 226, 0, + 0, 219, 0, 221, 0, 222, 227, 227, 227, 0, + 220, 227, 222, 223, 0, 229, 229, 229, 0, 225, + 229, 225, 228, 228, 228, 226, 0, 228, 230, 230, + + 230, 0, 228, 230, 232, 232, 232, 0, 227, 232, + 0, 233, 233, 233, 0, 226, 233, 229, 234, 234, + 234, 0, 0, 234, 228, 0, 0, 0, 227, 0, + 230, 0, 235, 235, 235, 0, 232, 235, 0, 236, + 236, 236, 235, 233, 236, 0, 230, 237, 237, 237, + 234, 0, 237, 238, 238, 238, 0, 0, 238, 0, + 239, 239, 239, 0, 235, 239, 0, 240, 240, 240, + 0, 236, 240, 241, 241, 241, 0, 240, 241, 237, + 0, 244, 244, 244, 0, 238, 244, 0, 0, 0, + 237, 0, 239, 236, 0, 245, 245, 245, 0, 240, + + 245, 246, 246, 246, 0, 241, 246, 247, 247, 247, + 0, 0, 247, 244, 249, 249, 249, 0, 0, 249, + 253, 253, 253, 0, 0, 253, 0, 245, 0, 244, + 254, 254, 254, 246, 245, 254, 255, 255, 255, 247, + 0, 255, 258, 258, 258, 0, 249, 258, 260, 260, + 260, 0, 253, 260, 247, 0, 0, 246, 0, 247, + 247, 249, 254, 0, 0, 0, 0, 0, 255, 254, + 0, 253, 255, 0, 258, 0, 261, 261, 261, 0, + 260, 261, 262, 262, 262, 0, 0, 262, 0, 263, + 263, 263, 0, 258, 263, 0, 0, 260, 264, 264, + + 264, 0, 0, 264, 0, 265, 265, 265, 261, 0, + 265, 266, 266, 266, 262, 0, 266, 267, 267, 267, + 0, 263, 267, 0, 263, 0, 261, 268, 268, 268, + 264, 0, 268, 0, 269, 269, 269, 265, 0, 269, + 0, 0, 0, 266, 0, 0, 270, 270, 270, 267, + 0, 270, 0, 0, 264, 265, 271, 271, 271, 268, + 0, 271, 0, 266, 0, 267, 269, 0, 272, 272, + 272, 0, 268, 272, 274, 274, 274, 0, 270, 274, + 0, 275, 275, 275, 269, 270, 275, 0, 271, 276, + 276, 276, 0, 0, 276, 0, 277, 277, 277, 0, + + 272, 277, 0, 0, 0, 0, 274, 0, 271, 278, + 278, 278, 0, 275, 278, 0, 0, 0, 0, 272, + 274, 276, 279, 279, 279, 0, 0, 279, 277, 0, + 275, 280, 280, 280, 276, 277, 280, 281, 281, 281, + 0, 278, 281, 282, 282, 282, 278, 0, 282, 0, + 283, 283, 283, 0, 279, 283, 284, 284, 284, 0, + 0, 284, 0, 280, 0, 0, 280, 0, 0, 281, + 0, 285, 285, 285, 0, 282, 285, 0, 0, 286, + 286, 286, 283, 0, 286, 0, 282, 281, 284, 287, + 287, 287, 0, 0, 287, 284, 288, 288, 288, 0, + + 0, 288, 0, 285, 290, 290, 290, 0, 0, 290, + 285, 286, 0, 291, 291, 291, 0, 0, 291, 0, + 0, 287, 0, 0, 292, 292, 292, 0, 288, 292, + 294, 294, 294, 0, 0, 294, 290, 295, 295, 295, + 288, 0, 295, 0, 287, 291, 297, 297, 297, 0, + 0, 297, 0, 0, 290, 0, 292, 0, 298, 298, + 298, 0, 294, 298, 0, 0, 0, 291, 0, 295, + 0, 0, 292, 0, 299, 299, 299, 0, 297, 299, + 300, 300, 300, 0, 0, 300, 301, 301, 301, 0, + 298, 301, 0, 0, 304, 304, 304, 298, 297, 304, + + 305, 305, 305, 0, 0, 305, 299, 0, 306, 306, + 306, 0, 300, 306, 0, 0, 0, 299, 301, 300, + 0, 0, 307, 307, 307, 0, 304, 307, 0, 308, + 308, 308, 305, 301, 308, 0, 310, 310, 310, 0, + 306, 310, 0, 311, 311, 311, 0, 306, 311, 0, + 0, 0, 305, 0, 307, 312, 312, 312, 0, 0, + 312, 308, 0, 0, 313, 313, 313, 0, 310, 313, + 0, 0, 307, 0, 0, 311, 315, 315, 315, 0, + 308, 315, 0, 316, 316, 316, 0, 312, 316, 0, + 0, 0, 0, 0, 311, 0, 313, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 312, 0, 315, 0, + 0, 0, 0, 0, 0, 316, 321, 321, 321, 321, + 321, 321, 321, 322, 322, 322, 322, 322, 322, 322, + 323, 0, 323, 323, 323, 323, 323, 324, 0, 324, + 0, 324, 324, 324, 325, 325, 325, 325, 325, 325, + 325, 326, 326, 326, 326, 326, 326, 326, 327, 0, + 327, 327, 327, 327, 327, 328, 328, 0, 328, 329, + 329, 329, 329, 329, 330, 330, 331, 331, 332, 332, + 333, 333, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320 } ; static yy_state_type yy_last_accepting_state; @@ -1386,15 +1349,14 @@ static char *yy_last_accepting_cpos; extern int yy_flex_debug; int yy_flex_debug = 1; -static const flex_int16_t yy_rule_linenum[63] = +static const flex_int16_t yy_rule_linenum[59] = { 0, 133, 135, 137, 142, 143, 148, 149, 150, 162, 165, 170, 177, 186, 198, 210, 219, 228, 237, 246, 255, - 264, 273, 282, 291, 300, 310, 319, 328, 337, 346, - 355, 364, 373, 382, 391, 400, 409, 418, 427, 436, - 445, 454, 463, 472, 481, 580, 585, 590, 595, 596, - 597, 598, 599, 600, 602, 620, 633, 638, 642, 644, - 646, 648 + 264, 273, 282, 291, 300, 309, 318, 327, 336, 345, + 354, 363, 372, 381, 390, 399, 408, 417, 426, 435, + 444, 543, 548, 553, 558, 559, 560, 561, 562, 563, + 565, 583, 596, 601, 605, 607, 609, 611 } ; /* The intent behind this definition is that it'll catch @@ -1449,7 +1411,7 @@ using isc::netconf::NetconfParser; /* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::netconf::ParserContext::fatal(msg) -#line 1452 "netconf_lexer.cc" +#line 1414 "netconf_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 @@ -1475,8 +1437,8 @@ using isc::netconf::NetconfParser; 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 1478 "netconf_lexer.cc" -#line 1479 "netconf_lexer.cc" +#line 1440 "netconf_lexer.cc" +#line 1441 "netconf_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1790,7 +1752,7 @@ YY_DECL } -#line 1793 "netconf_lexer.cc" +#line 1755 "netconf_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1819,13 +1781,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 >= 340 ) + if ( yy_current_state >= 321 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 339 ); + while ( yy_current_state != 320 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1844,13 +1806,13 @@ do_action: /* This label is used only to access EOF actions. */ { if ( yy_act == 0 ) fprintf( stderr, "--scanner backing up\n" ); - else if ( yy_act < 63 ) + else if ( yy_act < 59 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], yytext ); - else if ( yy_act == 63 ) + else if ( yy_act == 59 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", yytext ); - else if ( yy_act == 64 ) + else if ( yy_act == 60 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -2122,52 +2084,39 @@ YY_RULE_SETUP { switch(driver.ctx_) { case ParserContext::CONTROL_SOCKET: - case ParserContext::LOGGERS: - return NetconfParser::make_NAME(driver.loc_); + return NetconfParser::make_SOCKET_TYPE(driver.loc_); default: - return NetconfParser::make_STRING("name", driver.loc_); + return NetconfParser::make_STRING("socket-type", driver.loc_); } } YY_BREAK case 26: YY_RULE_SETUP -#line 310 "netconf_lexer.ll" +#line 309 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONTROL_SOCKET: - return NetconfParser::make_TYPE(driver.loc_); + return NetconfParser::make_SOCKET_NAME(driver.loc_); default: - return NetconfParser::make_STRING("type", driver.loc_); + return NetconfParser::make_STRING("socket-name", driver.loc_); } } YY_BREAK case 27: YY_RULE_SETUP -#line 319 "netconf_lexer.ll" +#line 318 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONTROL_SOCKET: - return NetconfParser::make_HOST(driver.loc_); + return NetconfParser::make_SOCKET_URL(driver.loc_); default: - return NetconfParser::make_STRING("host", driver.loc_); + return NetconfParser::make_STRING("socket-url", driver.loc_); } } YY_BREAK case 28: YY_RULE_SETUP -#line 328 "netconf_lexer.ll" -{ - switch(driver.ctx_) { - case ParserContext::CONTROL_SOCKET: - return NetconfParser::make_PORT(driver.loc_); - default: - return NetconfParser::make_STRING("port", driver.loc_); - } -} - YY_BREAK -case 29: -YY_RULE_SETUP -#line 337 "netconf_lexer.ll" +#line 327 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::NETCONF: @@ -2177,9 +2126,9 @@ YY_RULE_SETUP } } YY_BREAK -case 30: +case 29: YY_RULE_SETUP -#line 346 "netconf_lexer.ll" +#line 336 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::HOOKS_LIBRARIES: @@ -2189,9 +2138,9 @@ YY_RULE_SETUP } } YY_BREAK -case 31: +case 30: YY_RULE_SETUP -#line 355 "netconf_lexer.ll" +#line 345 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::HOOKS_LIBRARIES: @@ -2201,9 +2150,9 @@ YY_RULE_SETUP } } YY_BREAK -case 32: +case 31: YY_RULE_SETUP -#line 364 "netconf_lexer.ll" +#line 354 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONFIG: @@ -2213,9 +2162,9 @@ YY_RULE_SETUP } } YY_BREAK -case 33: +case 32: YY_RULE_SETUP -#line 373 "netconf_lexer.ll" +#line 363 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGING: @@ -2225,9 +2174,21 @@ YY_RULE_SETUP } } YY_BREAK +case 33: +YY_RULE_SETUP +#line 372 "netconf_lexer.ll" +{ + switch(driver.ctx_) { + case ParserContext::LOGGERS: + return NetconfParser::make_NAME(driver.loc_); + default: + return NetconfParser::make_STRING("name", driver.loc_); + } +} + YY_BREAK case 34: YY_RULE_SETUP -#line 382 "netconf_lexer.ll" +#line 381 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2239,7 +2200,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 391 "netconf_lexer.ll" +#line 390 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2251,7 +2212,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 400 "netconf_lexer.ll" +#line 399 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2263,7 +2224,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 409 "netconf_lexer.ll" +#line 408 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2275,7 +2236,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 418 "netconf_lexer.ll" +#line 417 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2287,7 +2248,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 427 "netconf_lexer.ll" +#line 426 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2299,7 +2260,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 436 "netconf_lexer.ll" +#line 435 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2311,55 +2272,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 445 "netconf_lexer.ll" -{ - switch(driver.ctx_) { - case ParserContext::CONFIG: - return NetconfParser::make_DHCP4(driver.loc_); - default: - return NetconfParser::make_STRING("Dhcp4", driver.loc_); - } -} - YY_BREAK -case 42: -YY_RULE_SETUP -#line 454 "netconf_lexer.ll" -{ - switch(driver.ctx_) { - case ParserContext::CONFIG: - return NetconfParser::make_DHCP6(driver.loc_); - default: - return NetconfParser::make_STRING("Dhcp6", driver.loc_); - } -} - YY_BREAK -case 43: -YY_RULE_SETUP -#line 463 "netconf_lexer.ll" -{ - switch(driver.ctx_) { - case ParserContext::CONFIG: - return NetconfParser::make_DHCPDDNS(driver.loc_); - default: - return NetconfParser::make_STRING("DhcpDdns", driver.loc_); - } -} - YY_BREAK -case 44: -YY_RULE_SETUP -#line 472 "netconf_lexer.ll" -{ - switch(driver.ctx_) { - case ParserContext::CONFIG: - return NetconfParser::make_CONTROL_AGENT(driver.loc_); - default: - return NetconfParser::make_STRING("Control-agent", driver.loc_); - } -} - YY_BREAK -case 45: -YY_RULE_SETUP -#line 481 "netconf_lexer.ll" +#line 444 "netconf_lexer.ll" { /* A string has been matched. It contains the actual string and single quotes. We need to get those quotes out of the way and just use its content, e.g. @@ -2459,65 +2372,65 @@ YY_RULE_SETUP return NetconfParser::make_STRING(decoded, driver.loc_); } YY_BREAK -case 46: -/* rule 46 can match eol */ +case 42: +/* rule 42 can match eol */ YY_RULE_SETUP -#line 580 "netconf_lexer.ll" +#line 543 "netconf_lexer.ll" { /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); } YY_BREAK -case 47: -/* rule 47 can match eol */ +case 43: +/* rule 43 can match eol */ YY_RULE_SETUP -#line 585 "netconf_lexer.ll" +#line 548 "netconf_lexer.ll" { /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); } YY_BREAK -case 48: +case 44: YY_RULE_SETUP -#line 590 "netconf_lexer.ll" +#line 553 "netconf_lexer.ll" { /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); } YY_BREAK -case 49: +case 45: YY_RULE_SETUP -#line 595 "netconf_lexer.ll" +#line 558 "netconf_lexer.ll" { return NetconfParser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK -case 50: +case 46: YY_RULE_SETUP -#line 596 "netconf_lexer.ll" +#line 559 "netconf_lexer.ll" { return NetconfParser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK -case 51: +case 47: YY_RULE_SETUP -#line 597 "netconf_lexer.ll" +#line 560 "netconf_lexer.ll" { return NetconfParser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK -case 52: +case 48: YY_RULE_SETUP -#line 598 "netconf_lexer.ll" +#line 561 "netconf_lexer.ll" { return NetconfParser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK -case 53: +case 49: YY_RULE_SETUP -#line 599 "netconf_lexer.ll" +#line 562 "netconf_lexer.ll" { return NetconfParser::make_COMMA(driver.loc_); } YY_BREAK -case 54: +case 50: YY_RULE_SETUP -#line 600 "netconf_lexer.ll" +#line 563 "netconf_lexer.ll" { return NetconfParser::make_COLON(driver.loc_); } YY_BREAK -case 55: +case 51: YY_RULE_SETUP -#line 602 "netconf_lexer.ll" +#line 565 "netconf_lexer.ll" { /* An integer was found. */ std::string tmp(yytext); @@ -2536,9 +2449,9 @@ YY_RULE_SETUP return NetconfParser::make_INTEGER(integer, driver.loc_); } YY_BREAK -case 56: +case 52: YY_RULE_SETUP -#line 620 "netconf_lexer.ll" +#line 583 "netconf_lexer.ll" { /* A floating point was found. */ std::string tmp(yytext); @@ -2552,43 +2465,43 @@ YY_RULE_SETUP return NetconfParser::make_FLOAT(fp, driver.loc_); } YY_BREAK -case 57: +case 53: YY_RULE_SETUP -#line 633 "netconf_lexer.ll" +#line 596 "netconf_lexer.ll" { string tmp(yytext); return NetconfParser::make_BOOLEAN(tmp == "true", driver.loc_); } YY_BREAK -case 58: +case 54: YY_RULE_SETUP -#line 638 "netconf_lexer.ll" +#line 601 "netconf_lexer.ll" { return NetconfParser::make_NULL_TYPE(driver.loc_); } YY_BREAK -case 59: +case 55: YY_RULE_SETUP -#line 642 "netconf_lexer.ll" +#line 605 "netconf_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK -case 60: +case 56: YY_RULE_SETUP -#line 644 "netconf_lexer.ll" +#line 607 "netconf_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK -case 61: +case 57: YY_RULE_SETUP -#line 646 "netconf_lexer.ll" +#line 609 "netconf_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK -case 62: +case 58: YY_RULE_SETUP -#line 648 "netconf_lexer.ll" +#line 611 "netconf_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 650 "netconf_lexer.ll" +#line 613 "netconf_lexer.ll" { if (driver.states_.empty()) { return NetconfParser::make_END(driver.loc_); @@ -2612,12 +2525,12 @@ case YY_STATE_EOF(INITIAL): BEGIN(DIR_EXIT); } YY_BREAK -case 63: +case 59: YY_RULE_SETUP -#line 673 "netconf_lexer.ll" +#line 636 "netconf_lexer.ll" ECHO; YY_BREAK -#line 2620 "netconf_lexer.cc" +#line 2533 "netconf_lexer.cc" case YY_END_OF_BUFFER: { @@ -2936,7 +2849,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 >= 340 ) + if ( yy_current_state >= 321 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2969,11 +2882,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 >= 340 ) + if ( yy_current_state >= 321 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 339); + yy_is_jam = (yy_current_state == 320); return yy_is_jam ? 0 : yy_current_state; } @@ -3722,7 +3635,7 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 673 "netconf_lexer.ll" +#line 636 "netconf_lexer.ll" using namespace isc::dhcp; diff --git a/src/bin/netconf/netconf_parser.cc b/src/bin/netconf/netconf_parser.cc index 341717e4c5..e223d30724 100644 --- a/src/bin/netconf/netconf_parser.cc +++ b/src/bin/netconf/netconf_parser.cc @@ -244,25 +244,25 @@ namespace isc { namespace netconf { { switch (that.type_get ()) { - case 58: // value - case 61: // map_value - case 116: // socket_type_value + case 54: // value + case 57: // map_value + case 113: // socket_type_value value.copy< ElementPtr > (that.value); break; - case 49: // "boolean" + case 45: // "boolean" value.copy< bool > (that.value); break; - case 48: // "floating point" + case 44: // "floating point" value.copy< double > (that.value); break; - case 47: // "integer" + case 43: // "integer" value.copy< int64_t > (that.value); break; - case 46: // "constant string" + case 42: // "constant string" value.copy< std::string > (that.value); break; @@ -277,25 +277,25 @@ namespace isc { namespace netconf { { switch (that.type_get ()) { - case 58: // value - case 61: // map_value - case 116: // socket_type_value + case 54: // value + case 57: // map_value + case 113: // socket_type_value value.move< ElementPtr > (that.value); break; - case 49: // "boolean" + case 45: // "boolean" value.move< bool > (that.value); break; - case 48: // "floating point" + case 44: // "floating point" value.move< double > (that.value); break; - case 47: // "integer" + case 43: // "integer" value.move< int64_t > (that.value); break; - case 46: // "constant string" + case 42: // "constant string" value.move< std::string > (that.value); break; @@ -313,25 +313,25 @@ namespace isc { namespace netconf { state = that.state; switch (that.type_get ()) { - case 58: // value - case 61: // map_value - case 116: // socket_type_value + case 54: // value + case 57: // map_value + case 113: // socket_type_value value.copy< ElementPtr > (that.value); break; - case 49: // "boolean" + case 45: // "boolean" value.copy< bool > (that.value); break; - case 48: // "floating point" + case 44: // "floating point" value.copy< double > (that.value); break; - case 47: // "integer" + case 43: // "integer" value.copy< int64_t > (that.value); break; - case 46: // "constant string" + case 42: // "constant string" value.copy< std::string > (that.value); break; @@ -370,51 +370,51 @@ namespace isc { namespace netconf { << yysym.location << ": "; switch (yytype) { - case 46: // "constant string" + case 42: // "constant string" -#line 108 "netconf_parser.yy" // lalr1.cc:635 +#line 103 "netconf_parser.yy" // lalr1.cc:635 { yyoutput << yysym.value.template as< std::string > (); } #line 378 "netconf_parser.cc" // lalr1.cc:635 break; - case 47: // "integer" + case 43: // "integer" -#line 108 "netconf_parser.yy" // lalr1.cc:635 +#line 103 "netconf_parser.yy" // lalr1.cc:635 { yyoutput << yysym.value.template as< int64_t > (); } #line 385 "netconf_parser.cc" // lalr1.cc:635 break; - case 48: // "floating point" + case 44: // "floating point" -#line 108 "netconf_parser.yy" // lalr1.cc:635 +#line 103 "netconf_parser.yy" // lalr1.cc:635 { yyoutput << yysym.value.template as< double > (); } #line 392 "netconf_parser.cc" // lalr1.cc:635 break; - case 49: // "boolean" + case 45: // "boolean" -#line 108 "netconf_parser.yy" // lalr1.cc:635 +#line 103 "netconf_parser.yy" // lalr1.cc:635 { yyoutput << yysym.value.template as< bool > (); } #line 399 "netconf_parser.cc" // lalr1.cc:635 break; - case 58: // value + case 54: // value -#line 108 "netconf_parser.yy" // lalr1.cc:635 +#line 103 "netconf_parser.yy" // lalr1.cc:635 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 406 "netconf_parser.cc" // lalr1.cc:635 break; - case 61: // map_value + case 57: // map_value -#line 108 "netconf_parser.yy" // lalr1.cc:635 +#line 103 "netconf_parser.yy" // lalr1.cc:635 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 413 "netconf_parser.cc" // lalr1.cc:635 break; - case 116: // socket_type_value + case 113: // socket_type_value -#line 108 "netconf_parser.yy" // lalr1.cc:635 +#line 103 "netconf_parser.yy" // lalr1.cc:635 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 420 "netconf_parser.cc" // lalr1.cc:635 break; @@ -613,25 +613,25 @@ namespace isc { namespace netconf { when using variants. */ switch (yyr1_[yyn]) { - case 58: // value - case 61: // map_value - case 116: // socket_type_value + case 54: // value + case 57: // map_value + case 113: // socket_type_value yylhs.value.build< ElementPtr > (); break; - case 49: // "boolean" + case 45: // "boolean" yylhs.value.build< bool > (); break; - case 48: // "floating point" + case 44: // "floating point" yylhs.value.build< double > (); break; - case 47: // "integer" + case 43: // "integer" yylhs.value.build< int64_t > (); break; - case 46: // "constant string" + case 42: // "constant string" yylhs.value.build< std::string > (); break; @@ -654,25 +654,25 @@ namespace isc { namespace netconf { switch (yyn) { case 2: -#line 119 "netconf_parser.yy" // lalr1.cc:856 +#line 114 "netconf_parser.yy" // lalr1.cc:856 { ctx.ctx_ = ctx.NO_KEYWORDS; } #line 660 "netconf_parser.cc" // lalr1.cc:856 break; case 4: -#line 120 "netconf_parser.yy" // lalr1.cc:856 +#line 115 "netconf_parser.yy" // lalr1.cc:856 { ctx.ctx_ = ctx.CONFIG; } #line 666 "netconf_parser.cc" // lalr1.cc:856 break; case 6: -#line 121 "netconf_parser.yy" // lalr1.cc:856 +#line 116 "netconf_parser.yy" // lalr1.cc:856 { ctx.ctx_ = ctx.NETCONF; } #line 672 "netconf_parser.cc" // lalr1.cc:856 break; case 8: -#line 129 "netconf_parser.yy" // lalr1.cc:856 +#line 124 "netconf_parser.yy" // lalr1.cc:856 { // Parse the Control-netconf map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -682,7 +682,7 @@ namespace isc { namespace netconf { break; case 9: -#line 133 "netconf_parser.yy" // lalr1.cc:856 +#line 128 "netconf_parser.yy" // lalr1.cc:856 { // parsing completed } @@ -690,7 +690,7 @@ namespace isc { namespace netconf { break; case 10: -#line 140 "netconf_parser.yy" // lalr1.cc:856 +#line 135 "netconf_parser.yy" // lalr1.cc:856 { // Push back the JSON value on the stack ctx.stack_.push_back(yystack_[0].value.as< ElementPtr > ()); @@ -699,49 +699,49 @@ namespace isc { namespace netconf { break; case 11: -#line 146 "netconf_parser.yy" // lalr1.cc:856 +#line 141 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); } #line 705 "netconf_parser.cc" // lalr1.cc:856 break; case 12: -#line 147 "netconf_parser.yy" // lalr1.cc:856 +#line 142 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); } #line 711 "netconf_parser.cc" // lalr1.cc:856 break; case 13: -#line 148 "netconf_parser.yy" // lalr1.cc:856 +#line 143 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); } #line 717 "netconf_parser.cc" // lalr1.cc:856 break; case 14: -#line 149 "netconf_parser.yy" // lalr1.cc:856 +#line 144 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); } #line 723 "netconf_parser.cc" // lalr1.cc:856 break; case 15: -#line 150 "netconf_parser.yy" // lalr1.cc:856 +#line 145 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); } #line 729 "netconf_parser.cc" // lalr1.cc:856 break; case 16: -#line 151 "netconf_parser.yy" // lalr1.cc:856 +#line 146 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 735 "netconf_parser.cc" // lalr1.cc:856 break; case 17: -#line 152 "netconf_parser.yy" // lalr1.cc:856 +#line 147 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 741 "netconf_parser.cc" // lalr1.cc:856 break; case 18: -#line 156 "netconf_parser.yy" // lalr1.cc:856 +#line 151 "netconf_parser.yy" // lalr1.cc:856 { // This code is executed when we're about to start parsing // the content of the map @@ -752,7 +752,7 @@ namespace isc { namespace netconf { break; case 19: -#line 161 "netconf_parser.yy" // lalr1.cc:856 +#line 156 "netconf_parser.yy" // lalr1.cc:856 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -762,13 +762,13 @@ namespace isc { namespace netconf { break; case 20: -#line 167 "netconf_parser.yy" // lalr1.cc:856 +#line 162 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 768 "netconf_parser.cc" // lalr1.cc:856 break; case 23: -#line 181 "netconf_parser.yy" // lalr1.cc:856 +#line 176 "netconf_parser.yy" // lalr1.cc:856 { // map containing a single entry ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ()); @@ -777,7 +777,7 @@ namespace isc { namespace netconf { break; case 24: -#line 185 "netconf_parser.yy" // lalr1.cc:856 +#line 180 "netconf_parser.yy" // lalr1.cc:856 { // map consisting of a shorter map followed by // comma and string:value @@ -787,7 +787,7 @@ namespace isc { namespace netconf { break; case 25: -#line 192 "netconf_parser.yy" // lalr1.cc:856 +#line 187 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(l); @@ -796,14 +796,14 @@ namespace isc { namespace netconf { break; case 26: -#line 195 "netconf_parser.yy" // lalr1.cc:856 +#line 190 "netconf_parser.yy" // lalr1.cc:856 { } #line 803 "netconf_parser.cc" // lalr1.cc:856 break; case 29: -#line 202 "netconf_parser.yy" // lalr1.cc:856 +#line 197 "netconf_parser.yy" // lalr1.cc:856 { // List consisting of a single element. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); @@ -812,7 +812,7 @@ namespace isc { namespace netconf { break; case 30: -#line 206 "netconf_parser.yy" // lalr1.cc:856 +#line 201 "netconf_parser.yy" // lalr1.cc:856 { // List ending with , and a value. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); @@ -821,7 +821,7 @@ namespace isc { namespace netconf { break; case 31: -#line 219 "netconf_parser.yy" // lalr1.cc:856 +#line 214 "netconf_parser.yy" // lalr1.cc:856 { const std::string& where = ctx.contextName(); const std::string& keyword = yystack_[1].value.as< std::string > (); @@ -832,7 +832,7 @@ namespace isc { namespace netconf { break; case 32: -#line 228 "netconf_parser.yy" // lalr1.cc:856 +#line 222 "netconf_parser.yy" // lalr1.cc:856 { // This code is executed when we're about to start parsing // the content of the map @@ -843,7 +843,7 @@ namespace isc { namespace netconf { break; case 33: -#line 233 "netconf_parser.yy" // lalr1.cc:856 +#line 227 "netconf_parser.yy" // lalr1.cc:856 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -852,8 +852,8 @@ namespace isc { namespace netconf { #line 853 "netconf_parser.cc" // lalr1.cc:856 break; - case 43: -#line 255 "netconf_parser.yy" // lalr1.cc:856 + case 39: +#line 245 "netconf_parser.yy" // lalr1.cc:856 { // Let's create a MapElement that will represent it, add it to the @@ -868,8 +868,8 @@ namespace isc { namespace netconf { #line 869 "netconf_parser.cc" // lalr1.cc:856 break; - case 44: -#line 265 "netconf_parser.yy" // lalr1.cc:856 + case 40: +#line 255 "netconf_parser.yy" // lalr1.cc:856 { // Ok, we're done with parsing control-netconf. Let's take the map // off the stack. @@ -879,16 +879,16 @@ namespace isc { namespace netconf { #line 880 "netconf_parser.cc" // lalr1.cc:856 break; - case 52: -#line 285 "netconf_parser.yy" // lalr1.cc:856 + case 50: +#line 279 "netconf_parser.yy" // lalr1.cc:856 { ctx.enter(ctx.NO_KEYWORDS); } #line 888 "netconf_parser.cc" // lalr1.cc:856 break; - case 53: -#line 287 "netconf_parser.yy" // lalr1.cc:856 + case 51: +#line 281 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr parent = ctx.stack_.back(); ElementPtr user_context = yystack_[0].value.as< ElementPtr > (); @@ -914,16 +914,16 @@ namespace isc { namespace netconf { #line 915 "netconf_parser.cc" // lalr1.cc:856 break; - case 54: -#line 310 "netconf_parser.yy" // lalr1.cc:856 + case 52: +#line 304 "netconf_parser.yy" // lalr1.cc:856 { ctx.enter(ctx.NO_KEYWORDS); } #line 923 "netconf_parser.cc" // lalr1.cc:856 break; - case 55: -#line 312 "netconf_parser.yy" // lalr1.cc:856 + case 53: +#line 306 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr parent = ctx.stack_.back(); ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location))); @@ -951,8 +951,8 @@ namespace isc { namespace netconf { #line 952 "netconf_parser.cc" // lalr1.cc:856 break; - case 56: -#line 338 "netconf_parser.yy" // lalr1.cc:856 + case 54: +#line 332 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hooks-libraries", l); @@ -962,8 +962,8 @@ namespace isc { namespace netconf { #line 963 "netconf_parser.cc" // lalr1.cc:856 break; - case 57: -#line 343 "netconf_parser.yy" // lalr1.cc:856 + case 55: +#line 337 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.pop_back(); ctx.leave(); @@ -971,8 +971,8 @@ namespace isc { namespace netconf { #line 972 "netconf_parser.cc" // lalr1.cc:856 break; - case 62: -#line 356 "netconf_parser.yy" // lalr1.cc:856 + case 60: +#line 350 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); @@ -981,24 +981,24 @@ namespace isc { namespace netconf { #line 982 "netconf_parser.cc" // lalr1.cc:856 break; - case 63: -#line 360 "netconf_parser.yy" // lalr1.cc:856 + case 61: +#line 354 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.pop_back(); } #line 990 "netconf_parser.cc" // lalr1.cc:856 break; - case 69: -#line 373 "netconf_parser.yy" // lalr1.cc:856 + case 67: +#line 367 "netconf_parser.yy" // lalr1.cc:856 { ctx.enter(ctx.NO_KEYWORDS); } #line 998 "netconf_parser.cc" // lalr1.cc:856 break; - case 70: -#line 375 "netconf_parser.yy" // lalr1.cc:856 + case 68: +#line 369 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("library", lib); @@ -1007,16 +1007,16 @@ namespace isc { namespace netconf { #line 1008 "netconf_parser.cc" // lalr1.cc:856 break; - case 71: -#line 381 "netconf_parser.yy" // lalr1.cc:856 + case 69: +#line 375 "netconf_parser.yy" // lalr1.cc:856 { ctx.enter(ctx.NO_KEYWORDS); } #line 1016 "netconf_parser.cc" // lalr1.cc:856 break; - case 72: -#line 383 "netconf_parser.yy" // lalr1.cc:856 + case 70: +#line 377 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); @@ -1024,8 +1024,8 @@ namespace isc { namespace netconf { #line 1025 "netconf_parser.cc" // lalr1.cc:856 break; - case 73: -#line 391 "netconf_parser.yy" // lalr1.cc:856 + case 71: +#line 385 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[2].location))); ctx.stack_.back()->set("managed-servers", m); @@ -1035,8 +1035,8 @@ namespace isc { namespace netconf { #line 1036 "netconf_parser.cc" // lalr1.cc:856 break; - case 74: -#line 396 "netconf_parser.yy" // lalr1.cc:856 + case 72: +#line 390 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.pop_back(); ctx.leave(); @@ -1044,8 +1044,8 @@ namespace isc { namespace netconf { #line 1045 "netconf_parser.cc" // lalr1.cc:856 break; - case 84: -#line 420 "netconf_parser.yy" // lalr1.cc:856 + case 82: +#line 414 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp4", m); @@ -1055,8 +1055,8 @@ namespace isc { namespace netconf { #line 1056 "netconf_parser.cc" // lalr1.cc:856 break; - case 85: -#line 425 "netconf_parser.yy" // lalr1.cc:856 + case 83: +#line 419 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.pop_back(); ctx.leave(); @@ -1064,8 +1064,8 @@ namespace isc { namespace netconf { #line 1065 "netconf_parser.cc" // lalr1.cc:856 break; - case 86: -#line 431 "netconf_parser.yy" // lalr1.cc:856 + case 84: +#line 425 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp6", m); @@ -1075,8 +1075,8 @@ namespace isc { namespace netconf { #line 1076 "netconf_parser.cc" // lalr1.cc:856 break; - case 87: -#line 436 "netconf_parser.yy" // lalr1.cc:856 + case 85: +#line 430 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.pop_back(); ctx.leave(); @@ -1084,8 +1084,8 @@ namespace isc { namespace netconf { #line 1085 "netconf_parser.cc" // lalr1.cc:856 break; - case 88: -#line 442 "netconf_parser.yy" // lalr1.cc:856 + case 86: +#line 436 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("d2", m); @@ -1095,8 +1095,8 @@ namespace isc { namespace netconf { #line 1096 "netconf_parser.cc" // lalr1.cc:856 break; - case 89: -#line 447 "netconf_parser.yy" // lalr1.cc:856 + case 87: +#line 441 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.pop_back(); ctx.leave(); @@ -1104,8 +1104,8 @@ namespace isc { namespace netconf { #line 1105 "netconf_parser.cc" // lalr1.cc:856 break; - case 90: -#line 453 "netconf_parser.yy" // lalr1.cc:856 + case 88: +#line 447 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ca", m); @@ -1115,8 +1115,8 @@ namespace isc { namespace netconf { #line 1116 "netconf_parser.cc" // lalr1.cc:856 break; - case 91: -#line 458 "netconf_parser.yy" // lalr1.cc:856 + case 89: +#line 452 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.pop_back(); ctx.leave(); @@ -1124,16 +1124,16 @@ namespace isc { namespace netconf { #line 1125 "netconf_parser.cc" // lalr1.cc:856 break; - case 99: -#line 477 "netconf_parser.yy" // lalr1.cc:856 + case 97: +#line 471 "netconf_parser.yy" // lalr1.cc:856 { ctx.enter(ctx.NO_KEYWORDS); } #line 1133 "netconf_parser.cc" // lalr1.cc:856 break; - case 100: -#line 479 "netconf_parser.yy" // lalr1.cc:856 + case 98: +#line 473 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr model(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("model", model); @@ -1142,8 +1142,8 @@ namespace isc { namespace netconf { #line 1143 "netconf_parser.cc" // lalr1.cc:856 break; - case 101: -#line 486 "netconf_parser.yy" // lalr1.cc:856 + case 99: +#line 480 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("control-socket", m); @@ -1153,8 +1153,8 @@ namespace isc { namespace netconf { #line 1154 "netconf_parser.cc" // lalr1.cc:856 break; - case 102: -#line 491 "netconf_parser.yy" // lalr1.cc:856 + case 100: +#line 485 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.pop_back(); ctx.leave(); @@ -1162,324 +1162,265 @@ namespace isc { namespace netconf { #line 1163 "netconf_parser.cc" // lalr1.cc:856 break; - case 112: -#line 510 "netconf_parser.yy" // lalr1.cc:856 + case 109: +#line 503 "netconf_parser.yy" // lalr1.cc:856 { ctx.enter(ctx.SOCKET_TYPE); } #line 1171 "netconf_parser.cc" // lalr1.cc:856 break; - case 113: -#line 512 "netconf_parser.yy" // lalr1.cc:856 + case 110: +#line 505 "netconf_parser.yy" // lalr1.cc:856 { - ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ()); + ctx.stack_.back()->set("socket-type", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } #line 1180 "netconf_parser.cc" // lalr1.cc:856 break; - case 114: -#line 518 "netconf_parser.yy" // lalr1.cc:856 + case 111: +#line 511 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("unix", ctx.loc2pos(yystack_[0].location))); } #line 1186 "netconf_parser.cc" // lalr1.cc:856 break; - case 115: -#line 519 "netconf_parser.yy" // lalr1.cc:856 + case 112: +#line 512 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("http", ctx.loc2pos(yystack_[0].location))); } #line 1192 "netconf_parser.cc" // lalr1.cc:856 break; - case 116: -#line 520 "netconf_parser.yy" // lalr1.cc:856 + case 113: +#line 513 "netconf_parser.yy" // lalr1.cc:856 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("stdout", ctx.loc2pos(yystack_[0].location))); } #line 1198 "netconf_parser.cc" // lalr1.cc:856 break; - case 117: -#line 523 "netconf_parser.yy" // lalr1.cc:856 + case 114: +#line 516 "netconf_parser.yy" // lalr1.cc:856 { ctx.enter(ctx.NO_KEYWORDS); } #line 1206 "netconf_parser.cc" // lalr1.cc:856 break; - case 118: -#line 525 "netconf_parser.yy" // lalr1.cc:856 + case 115: +#line 518 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("name", name); + ctx.stack_.back()->set("socket-name", name); ctx.leave(); } #line 1216 "netconf_parser.cc" // lalr1.cc:856 break; - case 119: -#line 532 "netconf_parser.yy" // lalr1.cc:856 + case 116: +#line 525 "netconf_parser.yy" // lalr1.cc:856 { ctx.enter(ctx.NO_KEYWORDS); } #line 1224 "netconf_parser.cc" // lalr1.cc:856 break; - case 120: -#line 534 "netconf_parser.yy" // lalr1.cc:856 + case 117: +#line 527 "netconf_parser.yy" // lalr1.cc:856 { - ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("host", host); + ElementPtr url(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("socket-url", url); ctx.leave(); } #line 1234 "netconf_parser.cc" // lalr1.cc:856 break; - case 121: -#line 541 "netconf_parser.yy" // lalr1.cc:856 + case 118: +#line 540 "netconf_parser.yy" // lalr1.cc:856 { - ElementPtr port(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("port", port); + ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("Logging", m); + ctx.stack_.push_back(m); + ctx.enter(ctx.LOGGING); } -#line 1243 "netconf_parser.cc" // lalr1.cc:856 +#line 1245 "netconf_parser.cc" // lalr1.cc:856 break; - case 122: -#line 549 "netconf_parser.yy" // lalr1.cc:856 + case 119: +#line 545 "netconf_parser.yy" // lalr1.cc:856 { - ctx.enter(ctx.NO_KEYWORDS); + ctx.stack_.pop_back(); + ctx.leave(); } -#line 1251 "netconf_parser.cc" // lalr1.cc:856 +#line 1254 "netconf_parser.cc" // lalr1.cc:856 break; case 123: -#line 551 "netconf_parser.yy" // lalr1.cc:856 +#line 562 "netconf_parser.yy" // lalr1.cc:856 { - ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); + ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("loggers", l); + ctx.stack_.push_back(l); + ctx.enter(ctx.LOGGERS); } -#line 1260 "netconf_parser.cc" // lalr1.cc:856 +#line 1265 "netconf_parser.cc" // lalr1.cc:856 break; case 124: -#line 556 "netconf_parser.yy" // lalr1.cc:856 +#line 567 "netconf_parser.yy" // lalr1.cc:856 { - ctx.enter(ctx.NO_KEYWORDS); -} -#line 1268 "netconf_parser.cc" // lalr1.cc:856 - break; - - case 125: -#line 558 "netconf_parser.yy" // lalr1.cc:856 - { - ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ()); + ctx.stack_.pop_back(); ctx.leave(); } -#line 1277 "netconf_parser.cc" // lalr1.cc:856 - break; - - case 126: -#line 563 "netconf_parser.yy" // lalr1.cc:856 - { - ctx.enter(ctx.NO_KEYWORDS); -} -#line 1285 "netconf_parser.cc" // lalr1.cc:856 +#line 1274 "netconf_parser.cc" // lalr1.cc:856 break; case 127: -#line 565 "netconf_parser.yy" // lalr1.cc:856 +#line 579 "netconf_parser.yy" // lalr1.cc:856 { - ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); + ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->add(l); + ctx.stack_.push_back(l); } -#line 1294 "netconf_parser.cc" // lalr1.cc:856 +#line 1284 "netconf_parser.cc" // lalr1.cc:856 break; case 128: -#line 570 "netconf_parser.yy" // lalr1.cc:856 - { - ctx.enter(ctx.NO_KEYWORDS); -} -#line 1302 "netconf_parser.cc" // lalr1.cc:856 - break; - - case 129: -#line 572 "netconf_parser.yy" // lalr1.cc:856 - { - ctx.stack_.back()->set("Control-agent", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); -} -#line 1311 "netconf_parser.cc" // lalr1.cc:856 - break; - - case 130: #line 583 "netconf_parser.yy" // lalr1.cc:856 { - ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("Logging", m); - ctx.stack_.push_back(m); - ctx.enter(ctx.LOGGING); -} -#line 1322 "netconf_parser.cc" // lalr1.cc:856 - break; - - case 131: -#line 588 "netconf_parser.yy" // lalr1.cc:856 - { ctx.stack_.pop_back(); - ctx.leave(); } -#line 1331 "netconf_parser.cc" // lalr1.cc:856 +#line 1292 "netconf_parser.cc" // lalr1.cc:856 break; - case 135: -#line 605 "netconf_parser.yy" // lalr1.cc:856 + case 138: +#line 600 "netconf_parser.yy" // lalr1.cc:856 { - ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("loggers", l); - ctx.stack_.push_back(l); - ctx.enter(ctx.LOGGERS); -} -#line 1342 "netconf_parser.cc" // lalr1.cc:856 - break; - - case 136: -#line 610 "netconf_parser.yy" // lalr1.cc:856 - { - ctx.stack_.pop_back(); - ctx.leave(); + ctx.enter(ctx.NO_KEYWORDS); } -#line 1351 "netconf_parser.cc" // lalr1.cc:856 +#line 1300 "netconf_parser.cc" // lalr1.cc:856 break; case 139: -#line 622 "netconf_parser.yy" // lalr1.cc:856 +#line 602 "netconf_parser.yy" // lalr1.cc:856 { - ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->add(l); - ctx.stack_.push_back(l); + ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("name", name); + ctx.leave(); } -#line 1361 "netconf_parser.cc" // lalr1.cc:856 +#line 1310 "netconf_parser.cc" // lalr1.cc:856 break; case 140: -#line 626 "netconf_parser.yy" // lalr1.cc:856 - { - ctx.stack_.pop_back(); -} -#line 1369 "netconf_parser.cc" // lalr1.cc:856 - break; - - case 150: -#line 643 "netconf_parser.yy" // lalr1.cc:856 +#line 608 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("debuglevel", dl); } -#line 1378 "netconf_parser.cc" // lalr1.cc:856 +#line 1319 "netconf_parser.cc" // lalr1.cc:856 break; - case 151: -#line 648 "netconf_parser.yy" // lalr1.cc:856 + case 141: +#line 613 "netconf_parser.yy" // lalr1.cc:856 { ctx.enter(ctx.NO_KEYWORDS); } -#line 1386 "netconf_parser.cc" // lalr1.cc:856 +#line 1327 "netconf_parser.cc" // lalr1.cc:856 break; - case 152: -#line 650 "netconf_parser.yy" // lalr1.cc:856 + case 142: +#line 615 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("severity", sev); ctx.leave(); } -#line 1396 "netconf_parser.cc" // lalr1.cc:856 +#line 1337 "netconf_parser.cc" // lalr1.cc:856 break; - case 153: -#line 656 "netconf_parser.yy" // lalr1.cc:856 + case 143: +#line 621 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("output_options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } -#line 1407 "netconf_parser.cc" // lalr1.cc:856 +#line 1348 "netconf_parser.cc" // lalr1.cc:856 break; - case 154: -#line 661 "netconf_parser.yy" // lalr1.cc:856 + case 144: +#line 626 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1416 "netconf_parser.cc" // lalr1.cc:856 +#line 1357 "netconf_parser.cc" // lalr1.cc:856 break; - case 157: -#line 670 "netconf_parser.yy" // lalr1.cc:856 + case 147: +#line 635 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1426 "netconf_parser.cc" // lalr1.cc:856 +#line 1367 "netconf_parser.cc" // lalr1.cc:856 break; - case 158: -#line 674 "netconf_parser.yy" // lalr1.cc:856 + case 148: +#line 639 "netconf_parser.yy" // lalr1.cc:856 { ctx.stack_.pop_back(); } -#line 1434 "netconf_parser.cc" // lalr1.cc:856 +#line 1375 "netconf_parser.cc" // lalr1.cc:856 break; - case 165: -#line 688 "netconf_parser.yy" // lalr1.cc:856 + case 155: +#line 653 "netconf_parser.yy" // lalr1.cc:856 { ctx.enter(ctx.NO_KEYWORDS); } -#line 1442 "netconf_parser.cc" // lalr1.cc:856 +#line 1383 "netconf_parser.cc" // lalr1.cc:856 break; - case 166: -#line 690 "netconf_parser.yy" // lalr1.cc:856 + case 156: +#line 655 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("output", sev); ctx.leave(); } -#line 1452 "netconf_parser.cc" // lalr1.cc:856 +#line 1393 "netconf_parser.cc" // lalr1.cc:856 break; - case 167: -#line 696 "netconf_parser.yy" // lalr1.cc:856 + case 157: +#line 661 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("flush", flush); } -#line 1461 "netconf_parser.cc" // lalr1.cc:856 +#line 1402 "netconf_parser.cc" // lalr1.cc:856 break; - case 168: -#line 701 "netconf_parser.yy" // lalr1.cc:856 + case 158: +#line 666 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("maxsize", maxsize); } -#line 1470 "netconf_parser.cc" // lalr1.cc:856 +#line 1411 "netconf_parser.cc" // lalr1.cc:856 break; - case 169: -#line 706 "netconf_parser.yy" // lalr1.cc:856 + case 159: +#line 671 "netconf_parser.yy" // lalr1.cc:856 { ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("maxver", maxver); } -#line 1479 "netconf_parser.cc" // lalr1.cc:856 +#line 1420 "netconf_parser.cc" // lalr1.cc:856 break; -#line 1483 "netconf_parser.cc" // lalr1.cc:856 +#line 1424 "netconf_parser.cc" // lalr1.cc:856 default: break; } @@ -1733,42 +1674,40 @@ namespace isc { namespace netconf { } - const short int NetconfParser::yypact_ninf_ = -216; + const signed char NetconfParser::yypact_ninf_ = -71; const signed char NetconfParser::yytable_ninf_ = -1; const short int NetconfParser::yypact_[] = { - 74, -216, -216, -216, 8, 2, 3, 39, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, 2, -13, -5, 11, -216, 52, - 72, 79, 77, 84, -216, -216, -216, -216, -216, -216, - 102, -216, 23, -216, -216, -216, -216, -216, -216, -216, - -216, -216, 107, -216, -216, 53, -216, -216, -216, -216, - -216, -216, 2, 2, -216, 59, 111, 122, 123, 124, - 125, 126, -216, -5, -216, 127, 128, 129, 130, 11, - -216, -216, -216, 131, 132, 133, 2, 2, 2, 2, - -216, 134, 87, -216, 137, -216, 2, 11, 106, -216, - -216, -216, -216, -216, -216, -216, -2, 136, -216, 56, - -216, 62, -216, -216, -216, -216, -216, -216, -216, 138, - 135, -216, -216, -216, -216, -216, -216, 139, 141, -216, - -216, 143, 106, -216, 144, 145, 146, 147, -216, -2, - -1, -216, 136, 148, -216, 149, 150, 151, 155, -216, - -216, -216, -216, 76, -216, -216, -216, -216, 157, 70, - 70, 70, 70, 161, 162, -11, -216, -216, 26, -216, - -216, -216, -216, -216, -216, 90, -216, -216, -216, 91, - 92, 93, 108, 2, -216, 28, 157, -216, 163, 164, - 70, -216, -216, -216, -216, -216, -216, -216, -216, 165, - -216, -216, -216, -216, -216, 94, -216, -216, -216, -216, - -216, 109, 166, -216, 167, 168, 105, 170, 28, -216, - -216, 66, 140, 171, -216, 142, -216, -216, -216, 173, - -216, -216, -216, 100, -216, -216, -216, -216, -216, -216, - 172, -216, 174, 176, 152, 66, -216, -216, 104, -216, - 99, 154, -216, -216, -17, 172, -216, -216, -216, -216, - -216, -216, -216, 177, 178, 179, 101, -216, -216, -216, - -216, -216, -216, 180, 121, 156, 158, -17, -216, 160, - -216, -216, -216, -216, -216 + 62, -71, -71, -71, 8, 4, 3, 5, -71, -71, + -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, + -71, -71, -71, -71, 4, -11, -3, 29, -71, 26, + 47, 58, 46, 75, -71, -71, 86, -71, 65, -71, + -71, -71, -71, -71, 100, -71, -71, 81, 95, -71, + -71, -71, -71, -71, -71, 4, 4, -71, 70, 107, + 109, -71, -3, -71, 110, 111, 112, 113, -71, 29, + -71, -71, 114, 115, 116, -71, 117, 74, -71, 120, + -71, 4, 29, 90, -71, -71, -71, 50, 119, -71, + 121, -71, 66, -71, -71, -71, -71, -71, -71, -71, + 122, 118, -71, -71, -71, -71, -71, -71, 125, 124, + -71, -71, 128, 90, -71, 129, 130, 131, 132, -71, + 50, -12, -71, 119, 123, -71, 136, 137, 138, 140, + -71, -71, -71, -71, 67, -71, -71, -71, -71, 141, + 41, 41, 41, 41, 133, 134, -5, -71, -71, 93, + -71, -71, -71, -71, -71, -71, 69, -71, -71, -71, + 73, 76, 77, 97, 4, -71, -7, 141, -71, 145, + 146, 41, -71, -71, -71, -71, -71, -71, -71, -71, + 147, -71, -71, -71, -71, 79, -71, -71, -71, -71, + -71, -71, 126, 148, -71, 149, 150, 127, 152, -7, + -71, -71, 9, 139, 153, -71, 142, -71, -71, -71, + -71, -71, -71, -71, 83, -71, -71, -71, -71, -71, + 154, -71, 155, 156, 158, 9, -71, -71, 94, -71, + 84, 143, 144, -71, -19, 154, -71, -71, -71, -71, + -71, -71, -71, -71, 159, 160, 161, 85, -71, -71, + -71, -71, -71, -71, 162, 135, 151, 163, -19, -71, + 165, -71, -71, -71, -71, -71 }; const unsigned char @@ -1776,177 +1715,168 @@ namespace isc { namespace netconf { { 0, 2, 4, 6, 0, 0, 0, 0, 1, 25, 18, 15, 14, 11, 12, 13, 3, 10, 16, 17, - 32, 5, 8, 7, 27, 21, 0, 0, 29, 0, - 28, 0, 0, 22, 43, 130, 122, 124, 126, 128, - 0, 42, 0, 34, 36, 38, 39, 40, 41, 37, - 52, 54, 0, 56, 51, 0, 45, 49, 50, 48, - 47, 26, 0, 0, 19, 0, 0, 0, 0, 0, - 0, 0, 31, 0, 33, 0, 0, 0, 0, 0, - 9, 30, 23, 0, 0, 0, 0, 0, 0, 0, - 35, 0, 0, 73, 0, 46, 0, 0, 0, 123, - 125, 127, 129, 20, 53, 55, 75, 58, 24, 0, - 135, 0, 132, 134, 84, 86, 88, 90, 83, 0, - 76, 77, 79, 80, 81, 82, 62, 0, 59, 60, - 44, 0, 0, 131, 0, 0, 0, 0, 74, 0, - 0, 57, 0, 0, 133, 0, 0, 0, 0, 78, - 69, 71, 66, 0, 64, 67, 68, 61, 0, 0, - 0, 0, 0, 0, 0, 0, 63, 139, 0, 137, - 99, 101, 98, 96, 97, 0, 92, 94, 95, 0, - 0, 0, 0, 0, 65, 0, 0, 136, 0, 0, - 0, 85, 87, 89, 91, 70, 72, 117, 153, 0, - 151, 149, 147, 148, 143, 0, 141, 145, 146, 144, - 138, 0, 0, 93, 0, 0, 0, 0, 0, 140, - 100, 0, 0, 0, 150, 0, 142, 112, 119, 0, - 111, 109, 110, 0, 103, 105, 106, 107, 108, 118, - 0, 152, 0, 0, 0, 0, 102, 157, 0, 155, - 0, 0, 121, 104, 0, 0, 154, 114, 115, 116, - 113, 120, 165, 0, 0, 0, 0, 159, 161, 162, - 163, 164, 156, 0, 0, 0, 0, 0, 158, 0, - 167, 168, 169, 160, 166 + 32, 5, 8, 7, 27, 21, 0, 41, 29, 0, + 28, 0, 0, 22, 39, 118, 0, 38, 0, 34, + 36, 37, 50, 52, 0, 54, 49, 0, 42, 43, + 47, 48, 46, 45, 26, 0, 0, 19, 0, 0, + 0, 31, 0, 33, 0, 0, 0, 0, 9, 0, + 30, 23, 0, 0, 0, 35, 0, 0, 71, 0, + 44, 0, 41, 0, 20, 51, 53, 73, 56, 24, + 0, 123, 0, 120, 122, 82, 84, 86, 88, 81, + 0, 74, 75, 77, 78, 79, 80, 60, 0, 57, + 58, 40, 0, 0, 119, 0, 0, 0, 0, 72, + 0, 0, 55, 0, 0, 121, 0, 0, 0, 0, + 76, 67, 69, 64, 0, 62, 65, 66, 59, 0, + 0, 0, 0, 0, 0, 0, 0, 61, 127, 0, + 125, 97, 99, 96, 94, 95, 0, 90, 92, 93, + 0, 0, 0, 0, 0, 63, 0, 0, 124, 0, + 0, 0, 83, 85, 87, 89, 68, 70, 138, 143, + 0, 141, 137, 135, 136, 0, 129, 131, 133, 134, + 132, 126, 0, 0, 91, 0, 0, 0, 0, 0, + 128, 98, 0, 0, 0, 140, 0, 130, 109, 114, + 116, 108, 106, 107, 0, 101, 103, 104, 105, 139, + 0, 142, 0, 0, 0, 0, 100, 147, 0, 145, + 0, 0, 0, 102, 0, 0, 144, 111, 112, 113, + 110, 115, 117, 155, 0, 0, 0, 0, 149, 151, + 152, 153, 154, 146, 0, 0, 0, 0, 0, 148, + 0, 157, 158, 159, 150, 156 }; const short int NetconfParser::yypgoto_[] = { - -216, -216, -216, -216, -216, -216, -216, -216, -20, 96, - -216, -216, -216, -216, -216, -216, -216, -216, -26, -216, - -216, -216, 112, -216, -216, 78, 110, -25, -216, -24, - -216, -216, -216, -216, -216, 48, -216, -216, 33, -216, - -216, -216, -216, -216, -216, -216, -216, 63, -216, -216, - -216, -216, -216, -216, -216, -216, -37, 1, -216, -216, - -216, -216, -216, -44, -216, -216, -216, -215, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, 75, -216, -216, -216, 18, -216, -216, - -10, -216, -216, -216, -216, -216, -216, -46, -216, -216, - -67, -216, -216, -216, -216, -216 + -71, -71, -71, -71, -71, -71, -71, -71, -18, 91, + -71, -71, -71, -71, -71, -71, -71, -71, -26, -71, + -71, -71, 157, -71, -71, 87, -71, 88, -25, -71, + -24, -71, -71, -71, -71, -71, 48, -71, -71, 6, + -71, -71, -71, -71, -71, -71, -71, -71, 52, -71, + -71, -71, -71, -71, -71, -71, -71, -33, 11, -71, + -71, -71, -71, -71, -46, -71, -71, -71, -71, -71, + -71, -71, -71, -71, -71, 78, -71, -71, -71, 16, + -71, -71, -10, -71, -71, -71, -71, -71, -71, -71, + -71, -48, -71, -71, -70, -71, -71, -71, -71, -71 }; const short int NetconfParser::yydefgoto_[] = { -1, 4, 5, 6, 7, 23, 27, 16, 17, 18, - 25, 104, 32, 33, 19, 24, 29, 30, 172, 21, - 26, 42, 43, 44, 66, 55, 56, 173, 75, 174, - 76, 59, 78, 127, 128, 129, 140, 153, 154, 155, - 163, 156, 164, 60, 106, 119, 120, 121, 122, 134, - 123, 135, 124, 136, 125, 137, 175, 176, 177, 188, - 178, 189, 233, 234, 235, 242, 260, 204, 214, 237, - 243, 238, 45, 68, 46, 69, 47, 70, 48, 71, - 49, 67, 111, 112, 113, 131, 168, 169, 185, 205, - 206, 207, 208, 217, 209, 215, 248, 249, 254, 266, - 267, 268, 273, 269, 270, 271 + 25, 85, 32, 33, 19, 24, 29, 30, 153, 21, + 26, 38, 39, 40, 59, 47, 48, 49, 154, 64, + 155, 65, 52, 67, 108, 109, 110, 121, 134, 135, + 136, 144, 137, 145, 53, 87, 100, 101, 102, 103, + 115, 104, 116, 105, 117, 106, 118, 156, 157, 158, + 169, 159, 170, 214, 215, 216, 222, 240, 217, 223, + 218, 224, 41, 60, 92, 93, 94, 112, 149, 150, + 166, 185, 186, 187, 195, 188, 189, 198, 190, 196, + 228, 229, 234, 247, 248, 249, 254, 250, 251, 252 }; const unsigned short int NetconfParser::yytable_[] = { - 41, 54, 57, 58, 28, 34, 236, 9, 8, 10, - 20, 11, 114, 115, 116, 117, 262, 150, 151, 263, - 264, 265, 50, 51, 52, 35, 73, 150, 151, 186, - 236, 74, 187, 31, 36, 37, 38, 39, 53, 50, - 51, 40, 81, 82, 40, 40, 22, 41, 12, 13, - 14, 15, 197, 54, 57, 58, 79, 40, 61, 79, - 198, 80, 199, 200, 130, 132, 99, 100, 101, 102, - 133, 54, 57, 58, 40, 62, 108, 50, 51, 165, - 118, 50, 51, 63, 166, 64, 227, 65, 170, 171, - 197, 228, 229, 190, 190, 190, 190, 218, 191, 192, - 193, 194, 219, 245, 277, 83, 72, 255, 246, 278, - 256, 77, 40, 118, 152, 84, 40, 1, 2, 3, - 257, 258, 259, 179, 180, 181, 85, 86, 87, 88, - 89, 91, 92, 105, 94, 96, 93, 110, 139, 97, - 98, 10, 107, 126, 142, 141, 138, 143, 145, 146, - 147, 148, 224, 158, 195, 220, 159, 160, 161, 201, - 202, 203, 162, 196, 167, 182, 183, 211, 212, 216, - 280, 222, 223, 221, 225, 109, 240, 244, 250, 247, - 251, 274, 275, 276, 279, 90, 239, 103, 241, 95, - 157, 213, 201, 202, 203, 230, 231, 232, 184, 252, - 261, 253, 149, 281, 210, 282, 284, 144, 226, 272, - 283, 0, 0, 0, 0, 0, 0, 0, 0, 230, - 231, 232 + 37, 46, 50, 51, 42, 43, 28, 34, 8, 9, + 20, 10, 22, 11, 243, 131, 132, 244, 245, 246, + 42, 43, 131, 132, 178, 179, 35, 180, 181, 208, + 36, 31, 54, 209, 210, 36, 37, 70, 71, 36, + 42, 43, 44, 46, 50, 51, 12, 13, 14, 15, + 55, 36, 42, 43, 57, 45, 46, 50, 51, 151, + 152, 99, 56, 89, 95, 96, 97, 98, 62, 113, + 146, 36, 171, 63, 114, 147, 171, 172, 58, 171, + 171, 173, 199, 36, 174, 175, 225, 200, 258, 68, + 61, 226, 36, 259, 99, 133, 167, 235, 69, 168, + 236, 1, 2, 3, 66, 237, 238, 239, 160, 161, + 162, 73, 72, 74, 76, 77, 86, 79, 81, 78, + 91, 120, 82, 83, 10, 88, 107, 123, 139, 111, + 119, 122, 124, 126, 127, 128, 129, 163, 164, 176, + 182, 183, 184, 140, 141, 142, 177, 143, 148, 192, + 193, 197, 165, 203, 204, 202, 206, 80, 220, 230, + 231, 227, 232, 255, 256, 257, 260, 84, 201, 90, + 205, 138, 130, 182, 183, 184, 211, 212, 213, 233, + 261, 219, 194, 191, 221, 241, 242, 253, 264, 207, + 0, 125, 0, 0, 262, 0, 0, 0, 0, 211, + 212, 213, 0, 0, 0, 0, 263, 265, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 75 }; const short int NetconfParser::yycheck_[] = { - 26, 27, 27, 27, 24, 10, 221, 5, 0, 7, - 7, 9, 14, 15, 16, 17, 33, 28, 29, 36, - 37, 38, 11, 12, 13, 30, 3, 28, 29, 3, - 245, 8, 6, 46, 39, 40, 41, 42, 27, 11, - 12, 46, 62, 63, 46, 46, 7, 73, 46, 47, - 48, 49, 24, 79, 79, 79, 3, 46, 6, 3, - 32, 8, 34, 35, 8, 3, 86, 87, 88, 89, - 8, 97, 97, 97, 46, 3, 96, 11, 12, 3, - 106, 11, 12, 4, 8, 8, 20, 3, 18, 19, - 24, 25, 26, 3, 3, 3, 3, 3, 8, 8, - 8, 8, 8, 3, 3, 46, 4, 3, 8, 8, - 6, 4, 46, 139, 140, 4, 46, 43, 44, 45, - 21, 22, 23, 160, 161, 162, 4, 4, 4, 4, - 4, 4, 4, 46, 4, 4, 7, 31, 3, 7, - 7, 7, 5, 7, 3, 6, 8, 4, 4, 4, - 4, 4, 47, 5, 46, 46, 7, 7, 7, 185, - 185, 185, 7, 183, 7, 4, 4, 4, 4, 4, - 49, 4, 4, 7, 4, 97, 5, 4, 4, 7, - 4, 4, 4, 4, 4, 73, 46, 91, 46, 79, - 142, 190, 218, 218, 218, 221, 221, 221, 165, 47, - 46, 245, 139, 47, 186, 47, 46, 132, 218, 255, - 277, -1, -1, -1, -1, -1, -1, -1, -1, 245, - 245, 245 + 26, 27, 27, 27, 11, 12, 24, 10, 0, 5, + 7, 7, 7, 9, 33, 27, 28, 36, 37, 38, + 11, 12, 27, 28, 31, 32, 29, 34, 35, 20, + 42, 42, 6, 24, 25, 42, 62, 55, 56, 42, + 11, 12, 13, 69, 69, 69, 42, 43, 44, 45, + 3, 42, 11, 12, 8, 26, 82, 82, 82, 18, + 19, 87, 4, 81, 14, 15, 16, 17, 3, 3, + 3, 42, 3, 8, 8, 8, 3, 8, 3, 3, + 3, 8, 3, 42, 8, 8, 3, 8, 3, 8, + 4, 8, 42, 8, 120, 121, 3, 3, 3, 6, + 6, 39, 40, 41, 4, 21, 22, 23, 141, 142, + 143, 4, 42, 4, 4, 4, 42, 4, 4, 7, + 30, 3, 7, 7, 7, 5, 7, 3, 5, 8, + 8, 6, 4, 4, 4, 4, 4, 4, 4, 42, + 166, 166, 166, 7, 7, 7, 164, 7, 7, 4, + 4, 4, 146, 4, 4, 7, 4, 69, 5, 4, + 4, 7, 4, 4, 4, 4, 4, 76, 42, 82, + 43, 123, 120, 199, 199, 199, 202, 202, 202, 225, + 45, 42, 171, 167, 42, 42, 42, 235, 258, 199, + -1, 113, -1, -1, 43, -1, -1, -1, -1, 225, + 225, 225, -1, -1, -1, -1, 43, 42, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 62 }; const unsigned char NetconfParser::yystos_[] = { - 0, 43, 44, 45, 51, 52, 53, 54, 0, 5, - 7, 9, 46, 47, 48, 49, 57, 58, 59, 64, - 7, 69, 7, 55, 65, 60, 70, 56, 58, 66, - 67, 46, 62, 63, 10, 30, 39, 40, 41, 42, - 46, 68, 71, 72, 73, 122, 124, 126, 128, 130, - 11, 12, 13, 27, 68, 75, 76, 77, 79, 81, - 93, 6, 3, 4, 8, 3, 74, 131, 123, 125, - 127, 129, 4, 3, 8, 78, 80, 4, 82, 3, - 8, 58, 58, 46, 4, 4, 4, 4, 4, 4, - 72, 4, 4, 7, 4, 76, 4, 7, 7, 58, - 58, 58, 58, 59, 61, 46, 94, 5, 58, 75, - 31, 132, 133, 134, 14, 15, 16, 17, 68, 95, - 96, 97, 98, 100, 102, 104, 7, 83, 84, 85, - 8, 135, 3, 8, 99, 101, 103, 105, 8, 3, - 86, 6, 3, 4, 133, 4, 4, 4, 4, 97, - 28, 29, 68, 87, 88, 89, 91, 85, 5, 7, - 7, 7, 7, 90, 92, 3, 8, 7, 136, 137, - 18, 19, 68, 77, 79, 106, 107, 108, 110, 106, - 106, 106, 4, 4, 88, 138, 3, 6, 109, 111, - 3, 8, 8, 8, 8, 46, 58, 24, 32, 34, - 35, 68, 77, 79, 117, 139, 140, 141, 142, 144, - 137, 4, 4, 107, 118, 145, 4, 143, 3, 8, - 46, 7, 4, 4, 47, 4, 140, 20, 25, 26, - 68, 77, 79, 112, 113, 114, 117, 119, 121, 46, - 5, 46, 115, 120, 4, 3, 8, 7, 146, 147, - 4, 4, 47, 113, 148, 3, 6, 21, 22, 23, - 116, 46, 33, 36, 37, 38, 149, 150, 151, 153, - 154, 155, 147, 152, 4, 4, 4, 3, 8, 4, - 49, 47, 47, 150, 46 + 0, 39, 40, 41, 47, 48, 49, 50, 0, 5, + 7, 9, 42, 43, 44, 45, 53, 54, 55, 60, + 7, 65, 7, 51, 61, 56, 66, 52, 54, 62, + 63, 42, 58, 59, 10, 29, 42, 64, 67, 68, + 69, 118, 11, 12, 13, 26, 64, 71, 72, 73, + 74, 76, 78, 90, 6, 3, 4, 8, 3, 70, + 119, 4, 3, 8, 75, 77, 4, 79, 8, 3, + 54, 54, 42, 4, 4, 68, 4, 4, 7, 4, + 73, 4, 7, 7, 55, 57, 42, 91, 5, 54, + 71, 30, 120, 121, 122, 14, 15, 16, 17, 64, + 92, 93, 94, 95, 97, 99, 101, 7, 80, 81, + 82, 8, 123, 3, 8, 96, 98, 100, 102, 8, + 3, 83, 6, 3, 4, 121, 4, 4, 4, 4, + 94, 27, 28, 64, 84, 85, 86, 88, 82, 5, + 7, 7, 7, 7, 87, 89, 3, 8, 7, 124, + 125, 18, 19, 64, 74, 76, 103, 104, 105, 107, + 103, 103, 103, 4, 4, 85, 126, 3, 6, 106, + 108, 3, 8, 8, 8, 8, 42, 54, 31, 32, + 34, 35, 64, 74, 76, 127, 128, 129, 131, 132, + 134, 125, 4, 4, 104, 130, 135, 4, 133, 3, + 8, 42, 7, 4, 4, 43, 4, 128, 20, 24, + 25, 64, 74, 76, 109, 110, 111, 114, 116, 42, + 5, 42, 112, 115, 117, 3, 8, 7, 136, 137, + 4, 4, 4, 110, 138, 3, 6, 21, 22, 23, + 113, 42, 42, 33, 36, 37, 38, 139, 140, 141, + 143, 144, 145, 137, 142, 4, 4, 4, 3, 8, + 4, 45, 43, 43, 140, 42 }; const unsigned char NetconfParser::yyr1_[] = { - 0, 50, 52, 51, 53, 51, 54, 51, 56, 55, - 57, 58, 58, 58, 58, 58, 58, 58, 60, 59, - 61, 62, 62, 63, 63, 65, 64, 66, 66, 67, - 67, 68, 70, 69, 71, 71, 72, 72, 72, 72, - 72, 72, 72, 74, 73, 75, 75, 76, 76, 76, - 76, 76, 78, 77, 80, 79, 82, 81, 83, 83, - 84, 84, 86, 85, 87, 87, 87, 88, 88, 90, - 89, 92, 91, 94, 93, 95, 95, 96, 96, 97, - 97, 97, 97, 97, 99, 98, 101, 100, 103, 102, - 105, 104, 106, 106, 107, 107, 107, 107, 107, 109, - 108, 111, 110, 112, 112, 113, 113, 113, 113, 113, - 113, 113, 115, 114, 116, 116, 116, 118, 117, 120, - 119, 121, 123, 122, 125, 124, 127, 126, 129, 128, - 131, 130, 132, 132, 133, 135, 134, 136, 136, 138, - 137, 139, 139, 140, 140, 140, 140, 140, 140, 140, - 141, 143, 142, 145, 144, 146, 146, 148, 147, 149, - 149, 150, 150, 150, 150, 152, 151, 153, 154, 155 + 0, 46, 48, 47, 49, 47, 50, 47, 52, 51, + 53, 54, 54, 54, 54, 54, 54, 54, 56, 55, + 57, 58, 58, 59, 59, 61, 60, 62, 62, 63, + 63, 64, 66, 65, 67, 67, 68, 68, 68, 70, + 69, 71, 71, 72, 72, 73, 73, 73, 73, 73, + 75, 74, 77, 76, 79, 78, 80, 80, 81, 81, + 83, 82, 84, 84, 84, 85, 85, 87, 86, 89, + 88, 91, 90, 92, 92, 93, 93, 94, 94, 94, + 94, 94, 96, 95, 98, 97, 100, 99, 102, 101, + 103, 103, 104, 104, 104, 104, 104, 106, 105, 108, + 107, 109, 109, 110, 110, 110, 110, 110, 110, 112, + 111, 113, 113, 113, 115, 114, 117, 116, 119, 118, + 120, 120, 121, 123, 122, 124, 124, 126, 125, 127, + 127, 128, 128, 128, 128, 128, 128, 128, 130, 129, + 131, 133, 132, 135, 134, 136, 136, 138, 137, 139, + 139, 140, 140, 140, 140, 142, 141, 143, 144, 145 }; const unsigned char @@ -1955,18 +1885,17 @@ namespace isc { namespace netconf { 0, 2, 0, 3, 0, 3, 0, 3, 0, 4, 1, 1, 1, 1, 1, 1, 1, 1, 0, 4, 1, 0, 1, 3, 5, 0, 4, 0, 1, 1, - 3, 2, 0, 4, 1, 3, 1, 1, 1, 1, - 1, 1, 1, 0, 6, 1, 3, 1, 1, 1, - 1, 1, 0, 4, 0, 4, 0, 6, 0, 1, - 1, 3, 0, 4, 1, 3, 1, 1, 1, 0, - 4, 0, 4, 0, 6, 0, 1, 1, 3, 1, - 1, 1, 1, 1, 0, 6, 0, 6, 0, 6, - 0, 6, 1, 3, 1, 1, 1, 1, 1, 0, - 4, 0, 6, 1, 3, 1, 1, 1, 1, 1, - 1, 1, 0, 4, 1, 1, 1, 0, 4, 0, - 4, 3, 0, 4, 0, 4, 0, 4, 0, 4, - 0, 6, 1, 3, 1, 0, 6, 1, 3, 0, - 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, + 3, 2, 0, 4, 1, 3, 1, 1, 1, 0, + 6, 0, 1, 1, 3, 1, 1, 1, 1, 1, + 0, 4, 0, 4, 0, 6, 0, 1, 1, 3, + 0, 4, 1, 3, 1, 1, 1, 0, 4, 0, + 4, 0, 6, 0, 1, 1, 3, 1, 1, 1, + 1, 1, 0, 6, 0, 6, 0, 6, 0, 6, + 1, 3, 1, 1, 1, 1, 1, 0, 4, 0, + 6, 1, 3, 1, 1, 1, 1, 1, 1, 0, + 4, 1, 1, 1, 0, 4, 0, 4, 0, 6, + 1, 3, 1, 0, 6, 1, 3, 0, 4, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 0, 4, 3, 0, 4, 0, 6, 1, 3, 0, 4, 1, 3, 1, 1, 1, 1, 0, 4, 3, 3, 3 }; @@ -1981,20 +1910,20 @@ namespace isc { namespace netconf { "\"end of file\"", "error", "$undefined", "\",\"", "\":\"", "\"[\"", "\"]\"", "\"{\"", "\"}\"", "\"null\"", "\"Netconf\"", "\"user-context\"", "\"comment\"", "\"managed-servers\"", "\"dhcp4\"", "\"dhcp6\"", "\"d2\"", - "\"ca\"", "\"model\"", "\"control-socket\"", "\"type\"", "\"unix\"", - "\"http\"", "\"stdout\"", "\"name\"", "\"host\"", "\"port\"", - "\"hooks-libraries\"", "\"library\"", "\"parameters\"", "\"Logging\"", - "\"loggers\"", "\"output_options\"", "\"output\"", "\"debuglevel\"", - "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"Dhcp4\"", - "\"Dhcp6\"", "\"DhcpDdns\"", "\"Control-agent\"", "START_JSON", - "START_NETCONF", "START_SUB_NETCONF", "\"constant string\"", - "\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start", - "$@1", "$@2", "$@3", "sub_netconf", "$@4", "json", "value", "map", "$@5", - "map_value", "map_content", "not_empty_map", "list_generic", "$@6", - "list_content", "not_empty_list", "unknown_map_entry", - "netconf_syntax_map", "$@7", "global_objects", "global_object", - "netconf_object", "$@8", "global_params", "global_param", "user_context", - "$@9", "comment", "$@10", "hooks_libraries", "$@11", + "\"ca\"", "\"model\"", "\"control-socket\"", "\"socket-type\"", + "\"unix\"", "\"http\"", "\"stdout\"", "\"socket-name\"", + "\"socket-url\"", "\"hooks-libraries\"", "\"library\"", "\"parameters\"", + "\"Logging\"", "\"loggers\"", "\"name\"", "\"output_options\"", + "\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"", + "\"maxsize\"", "\"maxver\"", "START_JSON", "START_NETCONF", + "START_SUB_NETCONF", "\"constant string\"", "\"integer\"", + "\"floating point\"", "\"boolean\"", "$accept", "start", "$@1", "$@2", + "$@3", "sub_netconf", "$@4", "json", "value", "map", "$@5", "map_value", + "map_content", "not_empty_map", "list_generic", "$@6", "list_content", + "not_empty_list", "unknown_map_entry", "netconf_syntax_map", "$@7", + "global_objects", "global_object", "netconf_object", "$@8", + "global_params", "not_empty_global_params", "global_param", + "user_context", "$@9", "comment", "$@10", "hooks_libraries", "$@11", "hooks_libraries_list", "not_empty_hooks_libraries_list", "hooks_library", "$@12", "hooks_params", "hooks_param", "library", "$@13", "parameters", "$@14", "managed_servers", "$@15", @@ -2003,14 +1932,12 @@ namespace isc { namespace netconf { "ca_server", "$@19", "managed_server_params", "managed_server_param", "model", "$@20", "control_socket", "$@21", "control_socket_params", "control_socket_param", "socket_type", "$@22", "socket_type_value", - "name", "$@23", "host", "$@24", "port", "dhcp4_json_object", "$@25", - "dhcp6_json_object", "$@26", "dhcpddns_json_object", "$@27", - "control_agent_object", "$@28", "logging_object", "$@29", - "logging_params", "logging_param", "loggers", "$@30", "loggers_entries", - "logger_entry", "$@31", "logger_params", "logger_param", "debuglevel", - "severity", "$@32", "output_options_list", "$@33", - "output_options_list_content", "output_entry", "$@34", - "output_params_list", "output_params", "output", "$@35", "flush", + "socket_name", "$@23", "socket_url", "$@24", "logging_object", "$@25", + "logging_params", "logging_param", "loggers", "$@26", "loggers_entries", + "logger_entry", "$@27", "logger_params", "logger_param", "name", "$@28", + "debuglevel", "severity", "$@29", "output_options_list", "$@30", + "output_options_list_content", "output_entry", "$@31", + "output_params_list", "output_params", "output", "$@32", "flush", "maxsize", "maxver", YY_NULLPTR }; @@ -2018,23 +1945,22 @@ namespace isc { namespace netconf { const unsigned short int NetconfParser::yyrline_[] = { - 0, 119, 119, 119, 120, 120, 121, 121, 129, 129, - 140, 146, 147, 148, 149, 150, 151, 152, 156, 156, - 167, 172, 173, 181, 185, 192, 192, 198, 199, 202, - 206, 219, 228, 228, 240, 241, 245, 246, 247, 248, - 249, 250, 251, 255, 255, 272, 273, 278, 279, 280, - 281, 282, 285, 285, 310, 310, 338, 338, 348, 349, - 352, 353, 356, 356, 364, 365, 366, 369, 370, 373, - 373, 381, 381, 391, 391, 401, 402, 405, 406, 412, - 413, 414, 415, 416, 420, 420, 431, 431, 442, 442, - 453, 453, 464, 465, 469, 470, 471, 472, 473, 477, - 477, 486, 486, 497, 498, 501, 502, 503, 504, 505, - 506, 507, 510, 510, 518, 519, 520, 523, 523, 532, - 532, 541, 549, 549, 556, 556, 563, 563, 570, 570, - 583, 583, 596, 597, 601, 605, 605, 617, 618, 622, - 622, 630, 631, 634, 635, 636, 637, 638, 639, 640, - 643, 648, 648, 656, 656, 666, 667, 670, 670, 678, - 679, 682, 683, 684, 685, 688, 688, 696, 701, 706 + 0, 114, 114, 114, 115, 115, 116, 116, 124, 124, + 135, 141, 142, 143, 144, 145, 146, 147, 151, 151, + 162, 167, 168, 176, 180, 187, 187, 193, 194, 197, + 201, 214, 222, 222, 234, 235, 239, 240, 241, 245, + 245, 262, 263, 266, 267, 272, 273, 274, 275, 276, + 279, 279, 304, 304, 332, 332, 342, 343, 346, 347, + 350, 350, 358, 359, 360, 363, 364, 367, 367, 375, + 375, 385, 385, 395, 396, 399, 400, 406, 407, 408, + 409, 410, 414, 414, 425, 425, 436, 436, 447, 447, + 458, 459, 463, 464, 465, 466, 467, 471, 471, 480, + 480, 491, 492, 495, 496, 497, 498, 499, 500, 503, + 503, 511, 512, 513, 516, 516, 525, 525, 540, 540, + 553, 554, 558, 562, 562, 574, 575, 579, 579, 587, + 588, 591, 592, 593, 594, 595, 596, 597, 600, 600, + 608, 613, 613, 621, 621, 631, 632, 635, 635, 643, + 644, 647, 648, 649, 650, 653, 653, 661, 666, 671 }; // Print the state stack on the debug stream. @@ -2069,8 +1995,8 @@ namespace isc { namespace netconf { #line 14 "netconf_parser.yy" // lalr1.cc:1163 } } // isc::netconf -#line 2073 "netconf_parser.cc" // lalr1.cc:1163 -#line 711 "netconf_parser.yy" // lalr1.cc:1164 +#line 1999 "netconf_parser.cc" // lalr1.cc:1163 +#line 676 "netconf_parser.yy" // lalr1.cc:1164 void diff --git a/src/bin/netconf/netconf_parser.h b/src/bin/netconf/netconf_parser.h index cd677da3c0..17b123ba79 100644 --- a/src/bin/netconf/netconf_parser.h +++ b/src/bin/netconf/netconf_parser.h @@ -359,18 +359,18 @@ namespace isc { namespace netconf { TOKEN_CA_SERVER = 272, TOKEN_MODEL = 273, TOKEN_CONTROL_SOCKET = 274, - TOKEN_TYPE = 275, + TOKEN_SOCKET_TYPE = 275, TOKEN_UNIX = 276, TOKEN_HTTP = 277, TOKEN_STDOUT = 278, - TOKEN_NAME = 279, - TOKEN_HOST = 280, - TOKEN_PORT = 281, - TOKEN_HOOKS_LIBRARIES = 282, - TOKEN_LIBRARY = 283, - TOKEN_PARAMETERS = 284, - TOKEN_LOGGING = 285, - TOKEN_LOGGERS = 286, + TOKEN_SOCKET_NAME = 279, + TOKEN_SOCKET_URL = 280, + TOKEN_HOOKS_LIBRARIES = 281, + TOKEN_LIBRARY = 282, + TOKEN_PARAMETERS = 283, + TOKEN_LOGGING = 284, + TOKEN_LOGGERS = 285, + TOKEN_NAME = 286, TOKEN_OUTPUT_OPTIONS = 287, TOKEN_OUTPUT = 288, TOKEN_DEBUGLEVEL = 289, @@ -378,17 +378,13 @@ namespace isc { namespace netconf { TOKEN_FLUSH = 291, TOKEN_MAXSIZE = 292, TOKEN_MAXVER = 293, - TOKEN_DHCP4 = 294, - TOKEN_DHCP6 = 295, - TOKEN_DHCPDDNS = 296, - TOKEN_CONTROL_AGENT = 297, - TOKEN_START_JSON = 298, - TOKEN_START_NETCONF = 299, - TOKEN_START_SUB_NETCONF = 300, - TOKEN_STRING = 301, - TOKEN_INTEGER = 302, - TOKEN_FLOAT = 303, - TOKEN_BOOLEAN = 304 + TOKEN_START_JSON = 294, + TOKEN_START_NETCONF = 295, + TOKEN_START_SUB_NETCONF = 296, + TOKEN_STRING = 297, + TOKEN_INTEGER = 298, + TOKEN_FLOAT = 299, + TOKEN_BOOLEAN = 300 }; }; @@ -577,7 +573,7 @@ namespace isc { namespace netconf { static inline symbol_type - make_TYPE (const location_type& l); + make_SOCKET_TYPE (const location_type& l); static inline symbol_type @@ -593,15 +589,11 @@ namespace isc { namespace netconf { static inline symbol_type - make_NAME (const location_type& l); - - static inline - symbol_type - make_HOST (const location_type& l); + make_SOCKET_NAME (const location_type& l); static inline symbol_type - make_PORT (const location_type& l); + make_SOCKET_URL (const location_type& l); static inline symbol_type @@ -625,6 +617,10 @@ namespace isc { namespace netconf { static inline symbol_type + make_NAME (const location_type& l); + + static inline + symbol_type make_OUTPUT_OPTIONS (const location_type& l); static inline @@ -653,22 +649,6 @@ namespace isc { namespace netconf { static inline symbol_type - make_DHCP4 (const location_type& l); - - static inline - symbol_type - make_DHCP6 (const location_type& l); - - static inline - symbol_type - make_DHCPDDNS (const location_type& l); - - static inline - symbol_type - make_CONTROL_AGENT (const location_type& l); - - static inline - symbol_type make_START_JSON (const location_type& l); static inline @@ -753,7 +733,7 @@ namespace isc { namespace netconf { /// \param yyvalue the value to check static bool yy_table_value_is_error_ (int yyvalue); - static const short int yypact_ninf_; + static const signed char yypact_ninf_; static const signed char yytable_ninf_; /// Convert a scanner token number \a t to a symbol number. @@ -902,12 +882,12 @@ namespace isc { namespace netconf { enum { yyeof_ = 0, - yylast_ = 221, ///< Last index in yytable_. - yynnts_ = 106, ///< Number of nonterminal symbols. + yylast_ = 219, ///< Last index in yytable_. + yynnts_ = 100, ///< Number of nonterminal symbols. yyfinal_ = 8, ///< Termination state number. yyterror_ = 1, yyerrcode_ = 256, - yyntokens_ = 50 ///< Number of tokens. + yyntokens_ = 46 ///< Number of tokens. }; @@ -954,9 +934,9 @@ namespace isc { namespace netconf { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49 + 45 }; - const unsigned user_token_number_max_ = 304; + const unsigned user_token_number_max_ = 300; const token_number_type undef_token_ = 2; if (static_cast<int> (t) <= yyeof_) @@ -987,25 +967,25 @@ namespace isc { namespace netconf { { switch (other.type_get ()) { - case 58: // value - case 61: // map_value - case 116: // socket_type_value + case 54: // value + case 57: // map_value + case 113: // socket_type_value value.copy< ElementPtr > (other.value); break; - case 49: // "boolean" + case 45: // "boolean" value.copy< bool > (other.value); break; - case 48: // "floating point" + case 44: // "floating point" value.copy< double > (other.value); break; - case 47: // "integer" + case 43: // "integer" value.copy< int64_t > (other.value); break; - case 46: // "constant string" + case 42: // "constant string" value.copy< std::string > (other.value); break; @@ -1024,25 +1004,25 @@ namespace isc { namespace netconf { (void) v; switch (this->type_get ()) { - case 58: // value - case 61: // map_value - case 116: // socket_type_value + case 54: // value + case 57: // map_value + case 113: // socket_type_value value.copy< ElementPtr > (v); break; - case 49: // "boolean" + case 45: // "boolean" value.copy< bool > (v); break; - case 48: // "floating point" + case 44: // "floating point" value.copy< double > (v); break; - case 47: // "integer" + case 43: // "integer" value.copy< int64_t > (v); break; - case 46: // "constant string" + case 42: // "constant string" value.copy< std::string > (v); break; @@ -1120,25 +1100,25 @@ namespace isc { namespace netconf { // Type destructor. switch (yytype) { - case 58: // value - case 61: // map_value - case 116: // socket_type_value + case 54: // value + case 57: // map_value + case 113: // socket_type_value value.template destroy< ElementPtr > (); break; - case 49: // "boolean" + case 45: // "boolean" value.template destroy< bool > (); break; - case 48: // "floating point" + case 44: // "floating point" value.template destroy< double > (); break; - case 47: // "integer" + case 43: // "integer" value.template destroy< int64_t > (); break; - case 46: // "constant string" + case 42: // "constant string" value.template destroy< std::string > (); break; @@ -1163,25 +1143,25 @@ namespace isc { namespace netconf { super_type::move (s); switch (this->type_get ()) { - case 58: // value - case 61: // map_value - case 116: // socket_type_value + case 54: // value + case 57: // map_value + case 113: // socket_type_value value.move< ElementPtr > (s.value); break; - case 49: // "boolean" + case 45: // "boolean" value.move< bool > (s.value); break; - case 48: // "floating point" + case 44: // "floating point" value.move< double > (s.value); break; - case 47: // "integer" + case 43: // "integer" value.move< int64_t > (s.value); break; - case 46: // "constant string" + case 42: // "constant string" value.move< std::string > (s.value); break; @@ -1244,7 +1224,7 @@ namespace isc { namespace netconf { 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302, 303, 304 + 295, 296, 297, 298, 299, 300 }; return static_cast<token_type> (yytoken_number_[type]); } @@ -1358,9 +1338,9 @@ namespace isc { namespace netconf { } NetconfParser::symbol_type - NetconfParser::make_TYPE (const location_type& l) + NetconfParser::make_SOCKET_TYPE (const location_type& l) { - return symbol_type (token::TOKEN_TYPE, l); + return symbol_type (token::TOKEN_SOCKET_TYPE, l); } NetconfParser::symbol_type @@ -1382,21 +1362,15 @@ namespace isc { namespace netconf { } NetconfParser::symbol_type - NetconfParser::make_NAME (const location_type& l) - { - return symbol_type (token::TOKEN_NAME, l); - } - - NetconfParser::symbol_type - NetconfParser::make_HOST (const location_type& l) + NetconfParser::make_SOCKET_NAME (const location_type& l) { - return symbol_type (token::TOKEN_HOST, l); + return symbol_type (token::TOKEN_SOCKET_NAME, l); } NetconfParser::symbol_type - NetconfParser::make_PORT (const location_type& l) + NetconfParser::make_SOCKET_URL (const location_type& l) { - return symbol_type (token::TOKEN_PORT, l); + return symbol_type (token::TOKEN_SOCKET_URL, l); } NetconfParser::symbol_type @@ -1430,6 +1404,12 @@ namespace isc { namespace netconf { } NetconfParser::symbol_type + NetconfParser::make_NAME (const location_type& l) + { + return symbol_type (token::TOKEN_NAME, l); + } + + NetconfParser::symbol_type NetconfParser::make_OUTPUT_OPTIONS (const location_type& l) { return symbol_type (token::TOKEN_OUTPUT_OPTIONS, l); @@ -1472,30 +1452,6 @@ namespace isc { namespace netconf { } NetconfParser::symbol_type - NetconfParser::make_DHCP4 (const location_type& l) - { - return symbol_type (token::TOKEN_DHCP4, l); - } - - NetconfParser::symbol_type - NetconfParser::make_DHCP6 (const location_type& l) - { - return symbol_type (token::TOKEN_DHCP6, l); - } - - NetconfParser::symbol_type - NetconfParser::make_DHCPDDNS (const location_type& l) - { - return symbol_type (token::TOKEN_DHCPDDNS, l); - } - - NetconfParser::symbol_type - NetconfParser::make_CONTROL_AGENT (const location_type& l) - { - return symbol_type (token::TOKEN_CONTROL_AGENT, l); - } - - NetconfParser::symbol_type NetconfParser::make_START_JSON (const location_type& l) { return symbol_type (token::TOKEN_START_JSON, l); @@ -1540,7 +1496,7 @@ namespace isc { namespace netconf { #line 14 "netconf_parser.yy" // lalr1.cc:379 } } // isc::netconf -#line 1544 "netconf_parser.h" // lalr1.cc:379 +#line 1500 "netconf_parser.h" // lalr1.cc:379 diff --git a/src/bin/netconf/position.hh b/src/bin/netconf/position.hh index a4dd46cbfc..3f9f52f255 100644 --- a/src/bin/netconf/position.hh +++ b/src/bin/netconf/position.hh @@ -1,4 +1,4 @@ -// Generated 201809262116 +// Generated 201809281108 // A Bison parser, made by GNU Bison 3.0.5. // Positions for Bison parsers in C++ diff --git a/src/bin/netconf/stack.hh b/src/bin/netconf/stack.hh index 702f063c23..9c6232ed06 100644 --- a/src/bin/netconf/stack.hh +++ b/src/bin/netconf/stack.hh @@ -1,4 +1,4 @@ -// Generated 201809262116 +// Generated 201809281108 // A Bison parser, made by GNU Bison 3.0.5. // Stack handling for Bison parsers in C++ |