diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc index eb322f9958..85eaea0a67 100644 --- a/src/bin/dhcp4/dhcp4_lexer.cc +++ b/src/bin/dhcp4/dhcp4_lexer.cc @@ -467,8 +467,8 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ); (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 141 -#define YY_END_OF_BUFFER 142 +#define YY_NUM_RULES 142 +#define YY_END_OF_BUFFER 143 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -476,135 +476,136 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1161] = +static yyconst flex_int16_t yy_accept[1164] = { 0, - 134, 134, 0, 0, 0, 0, 0, 0, 0, 0, - 142, 140, 10, 11, 140, 1, 134, 131, 134, 134, - 140, 133, 132, 140, 140, 140, 140, 140, 127, 128, - 140, 140, 140, 129, 130, 5, 5, 5, 140, 140, - 140, 10, 11, 0, 0, 123, 0, 0, 0, 0, + 135, 135, 0, 0, 0, 0, 0, 0, 0, 0, + 143, 141, 10, 11, 141, 1, 135, 132, 135, 135, + 141, 134, 133, 141, 141, 141, 141, 141, 128, 129, + 141, 141, 141, 130, 131, 5, 5, 5, 141, 141, + 141, 10, 11, 0, 0, 124, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 134, 134, - 0, 133, 134, 3, 2, 6, 0, 134, 0, 0, - 0, 0, 0, 0, 4, 0, 0, 9, 0, 124, + 0, 0, 0, 0, 0, 0, 0, 1, 135, 135, + 0, 134, 135, 3, 2, 6, 0, 135, 0, 0, + 0, 0, 0, 0, 4, 0, 0, 9, 0, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 126, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 125, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 139, 137, 0, 136, 135, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 105, 0, 104, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, + 0, 140, 138, 0, 137, 136, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 106, 0, 105, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 16, 0, 0, 0, 138, - 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 106, 0, 0, 108, 0, 0, 0, 0, 0, 0, - 0, 0, 50, 0, 0, 0, 40, 0, 0, 0, - 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, - 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, + 0, 139, 136, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 107, 0, 0, 109, 0, 0, 0, 0, + 0, 0, 0, 0, 51, 0, 0, 0, 41, 0, + 0, 0, 0, 63, 0, 0, 0, 0, 0, 0, + 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 39, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 60, 21, 0, 26, 0, - 0, 0, 0, 0, 0, 0, 12, 113, 0, 110, - 0, 109, 0, 0, 0, 0, 71, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 43, 0, + 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 61, 21, + 0, 26, 0, 0, 0, 0, 0, 0, 0, 12, + 114, 0, 111, 0, 110, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, - 41, 0, 0, 0, 0, 0, 0, 0, 72, 0, - 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, - 0, 7, 0, 0, 111, 0, 0, 0, 0, 0, + 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, + 0, 73, 0, 0, 0, 0, 0, 0, 0, 68, + 0, 0, 0, 0, 7, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 44, 0, - 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, + 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 45, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 76, - 53, 0, 0, 0, 22, 0, 0, 0, 0, 0, - 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 36, 0, 0, 0, 0, 0, 114, 0, + 0, 0, 77, 54, 0, 0, 0, 22, 0, 0, + 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, + 0, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 27, 0, 0, 0, 20, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 57, 0, + 0, 0, 0, 0, 0, 27, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 64, 0, 0, 0, 0, 0, 88, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 45, 0, 0, 0, 0, 0, 0, + 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 65, 0, 0, 0, + 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93, 0, 0, 91, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 94, 0, 0, 92, 0, 0, 0, - 0, 117, 0, 0, 0, 0, 0, 65, 0, 0, - 0, 68, 56, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 63, 0, 17, 0, - 73, 0, 0, 0, 0, 0, 97, 0, 0, 0, - 37, 0, 0, 0, 75, 24, 0, 0, 0, 0, + 0, 0, 0, 0, 118, 0, 0, 0, 0, 0, + 66, 0, 0, 0, 69, 57, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, + 0, 17, 0, 74, 0, 0, 0, 0, 0, 98, + 0, 0, 0, 38, 0, 0, 0, 76, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 70, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 120, 38, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 121, 39, 0, 0, 0, - 0, 0, 33, 0, 0, 0, 94, 0, 92, 87, - 86, 0, 0, 0, 0, 0, 107, 0, 0, 0, - 59, 0, 0, 0, 0, 0, 84, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 46, 0, 0, 30, - 0, 0, 0, 0, 96, 0, 0, 0, 0, 48, - 34, 0, 69, 0, 0, 61, 0, 0, 43, 0, - 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 34, 0, 0, 0, 95, + 0, 93, 88, 87, 0, 0, 0, 0, 0, 108, + 0, 0, 0, 60, 0, 0, 0, 0, 0, 85, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 47, + 0, 0, 31, 0, 0, 0, 0, 97, 0, 0, + 0, 0, 49, 35, 0, 70, 0, 0, 62, 0, + 0, 44, 0, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 122, 58, 0, 85, 0, 0, 118, 89, 0, 0, - 0, 0, 0, 0, 19, 0, 18, 0, 95, 0, - 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, - 32, 0, 0, 0, 0, 31, 0, 0, 0, 0, - 0, 0, 74, 0, 0, 119, 0, 0, 0, 0, - 0, 0, 0, 0, 121, 0, 116, 112, 0, 0, - 0, 14, 0, 0, 103, 0, 0, 0, 0, 82, - 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, - 0, 0, 0, 0, 13, 0, 0, 0, 90, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, + 0, 0, 0, 123, 59, 0, 86, 0, 0, 119, + 90, 0, 0, 0, 0, 0, 0, 19, 0, 18, + 0, 96, 0, 0, 55, 0, 0, 0, 0, 0, + 0, 0, 0, 33, 0, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 75, 0, 0, 120, 0, + 0, 0, 0, 0, 0, 0, 0, 122, 0, 117, + 113, 0, 0, 0, 14, 0, 0, 104, 0, 0, + 0, 0, 83, 0, 0, 0, 0, 0, 50, 0, + 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, + 0, 91, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 100, 0, 0, 0, 99, 98, 0, 0, 0, - 80, 0, 0, 0, 102, 0, 0, 0, 0, 0, + 0, 0, 82, 0, 101, 0, 0, 0, 100, 99, + 0, 0, 0, 81, 0, 0, 0, 103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, - 0, 78, 83, 35, 0, 0, 0, 77, 0, 0, - 0, 0, 0, 0, 0, 51, 0, 0, 79, 0 + 0, 0, 0, 0, 0, 0, 0, 102, 0, 0, + 0, 0, 0, 0, 79, 84, 36, 0, 0, 0, + 78, 0, 0, 0, 0, 0, 0, 0, 52, 0, + 0, 80, 0 } ; static yyconst YY_CHAR yy_ec[256] = @@ -651,280 +652,280 @@ static yyconst YY_CHAR yy_meta[72] = 3 } ; -static yyconst flex_uint16_t yy_base[1173] = +static yyconst flex_uint16_t yy_base[1176] = { 0, 0, 70, 19, 29, 41, 49, 52, 58, 87, 95, - 1523, 1524, 32, 1519, 141, 0, 201, 1524, 206, 88, - 11, 213, 1524, 1501, 114, 25, 2, 6, 1524, 1524, - 73, 11, 17, 1524, 1524, 1524, 104, 1507, 1462, 0, - 1499, 107, 1514, 217, 247, 1524, 1458, 185, 1464, 93, - 58, 1456, 91, 209, 200, 14, 273, 190, 1455, 181, - 186, 189, 223, 1464, 66, 206, 232, 204, 294, 256, - 216, 1447, 78, 268, 300, 300, 1466, 0, 329, 344, - 356, 364, 359, 1524, 0, 1524, 273, 335, 300, 335, - 289, 353, 354, 299, 1524, 1463, 1502, 1524, 260, 1524, + 1525, 1526, 32, 1521, 141, 0, 201, 1526, 206, 88, + 11, 213, 1526, 1503, 114, 25, 2, 6, 1526, 1526, + 73, 11, 17, 1526, 1526, 1526, 104, 1509, 1464, 0, + 1501, 107, 1516, 217, 247, 1526, 1460, 185, 1466, 93, + 58, 1458, 91, 209, 200, 14, 273, 190, 1457, 181, + 186, 189, 223, 1466, 66, 206, 232, 204, 294, 256, + 216, 1449, 78, 268, 300, 300, 1468, 0, 329, 344, + 356, 364, 359, 1526, 0, 1526, 273, 335, 300, 335, + 289, 353, 354, 299, 1526, 1465, 1504, 1526, 260, 1526, - 375, 1491, 328, 1460, 356, 355, 1455, 350, 359, 357, - 363, 371, 1498, 0, 426, 359, 1442, 1444, 1440, 1448, - 74, 1444, 1433, 1434, 89, 1450, 1443, 1443, 213, 1434, - 1428, 1434, 343, 1479, 1483, 1425, 1476, 1442, 1439, 1439, - 1433, 336, 1426, 1419, 1424, 1418, 363, 1415, 1414, 1428, - 365, 1414, 344, 1430, 351, 399, 372, 1427, 1428, 1426, - 1408, 1410, 372, 1402, 1419, 1411, 0, 400, 424, 398, - 401, 426, 432, 1410, 1524, 0, 1453, 438, 1404, 426, - 434, 1412, 441, 1455, 442, 1454, 435, 1453, 1524, 479, - 1400, 455, 1413, 1393, 1409, 1406, 1405, 420, 1446, 1440, + 375, 1493, 328, 1462, 356, 355, 1457, 350, 359, 357, + 363, 371, 1500, 0, 426, 359, 1444, 1446, 1442, 1450, + 74, 1446, 1435, 1436, 89, 1452, 1445, 1445, 213, 1436, + 1430, 1436, 343, 1481, 1485, 1427, 1478, 1444, 1441, 1441, + 1435, 336, 1428, 1421, 1426, 1420, 363, 1417, 1416, 1430, + 365, 1416, 373, 1432, 351, 399, 372, 1429, 1430, 1428, + 1410, 1412, 421, 1404, 1421, 1413, 0, 421, 430, 398, + 426, 434, 439, 1412, 1526, 0, 1455, 446, 1406, 431, + 427, 1414, 443, 1457, 444, 1456, 446, 1455, 1526, 490, + 1402, 456, 1415, 1395, 1411, 1408, 1407, 438, 1448, 1442, - 1406, 1385, 1393, 1388, 1399, 1387, 1399, 1399, 1390, 1379, - 1392, 1392, 1384, 1374, 1392, 1524, 1387, 1390, 1371, 1421, - 1370, 1380, 1383, 1417, 1378, 1366, 1377, 1413, 1360, 1370, - 1362, 1359, 1375, 1356, 1355, 1361, 1352, 1359, 1361, 1406, - 1364, 1358, 273, 1365, 1360, 1352, 1358, 1358, 1339, 1355, - 1348, 1355, 1343, 1336, 1350, 1391, 1352, 1334, 1342, 459, - 1524, 1524, 460, 1524, 1524, 1329, 0, 416, 430, 494, - 471, 1386, 1339, 453, 1524, 1384, 1524, 1378, 515, 1322, - 448, 1319, 1375, 1321, 1327, 1377, 1334, 1320, 1524, 1331, - 1373, 1328, 1325, 500, 1370, 1364, 1319, 1314, 1311, 1320, + 1408, 1387, 1395, 1390, 1401, 1389, 1401, 1401, 1392, 1381, + 1394, 1394, 1386, 1376, 1394, 1526, 1389, 1392, 1373, 1423, + 1372, 1382, 1385, 1419, 1380, 1368, 1379, 1415, 1362, 1372, + 1364, 1361, 1377, 1358, 1357, 1363, 1354, 1353, 1360, 1362, + 1407, 1365, 1359, 273, 1366, 1361, 1353, 1359, 1359, 1340, + 1356, 1349, 1356, 1344, 1337, 1351, 1392, 1353, 1335, 1343, + 454, 1526, 1526, 461, 1526, 1526, 1330, 0, 445, 442, + 502, 471, 1387, 1340, 433, 1526, 1385, 1526, 1379, 526, + 1323, 459, 1320, 1376, 1322, 1328, 1378, 1335, 1321, 1526, + 1332, 1374, 1329, 1326, 391, 1371, 1365, 1320, 1315, 1312, - 1309, 1358, 1306, 511, 1320, 1305, 1318, 1316, 1311, 1318, - 1313, 1309, 452, 1307, 1303, 1351, 483, 1345, 1297, 1290, - 1292, 1296, 1285, 1298, 491, 1299, 1296, 1300, 1524, 1288, - 1288, 1300, 1282, 1274, 1275, 1296, 1278, 1290, 1289, 1275, - 1287, 1286, 1285, 1326, 1325, 1524, 1269, 537, 1282, 1524, - 1524, 1281, 0, 1270, 1262, 472, 1319, 1318, 1276, 1316, - 1524, 1264, 1314, 1524, 515, 561, 1308, 487, 1312, 1268, - 1264, 1252, 1524, 1268, 1255, 1254, 1524, 1256, 1253, 473, - 1251, 1524, 1262, 1259, 1244, 1257, 1293, 1259, 1241, 1290, - 1524, 1239, 1255, 1287, 1250, 1247, 1248, 1283, 1236, 1231, + 1321, 1310, 1359, 1307, 519, 1321, 1306, 1319, 1317, 1312, + 1319, 1314, 1310, 460, 1308, 1304, 1352, 473, 1346, 1298, + 1291, 1293, 1297, 1286, 1299, 493, 1344, 1299, 1296, 1300, + 1526, 1288, 1288, 1300, 1282, 1274, 1275, 1296, 1278, 1290, + 1289, 1275, 1287, 1286, 1285, 1326, 1325, 1526, 1269, 517, + 1282, 1526, 1526, 1281, 0, 1270, 1262, 495, 1319, 1318, + 1276, 1316, 1526, 1264, 1314, 1526, 501, 568, 1308, 525, + 1312, 1268, 1264, 1252, 1526, 1268, 1255, 1254, 1526, 1256, + 1253, 499, 1251, 1526, 1262, 1259, 1244, 1257, 1293, 1259, + 1241, 1290, 1526, 1239, 1255, 1287, 1250, 1247, 1248, 1283, - 1230, 1279, 1225, 1240, 1232, 1280, 1524, 1227, 1223, 1221, - 1225, 1218, 1228, 1231, 1220, 1215, 1524, 1270, 1214, 1225, - 1262, 1215, 1224, 1218, 1222, 1262, 1256, 1220, 1200, 1203, - 1202, 1210, 1198, 1254, 1196, 1524, 1524, 1201, 1524, 1211, - 1245, 1207, 0, 1191, 1208, 1246, 1524, 1524, 1194, 1524, - 1200, 1524, 513, 517, 1203, 540, 1524, 1196, 1184, 1235, - 1182, 1189, 1182, 1194, 1193, 1193, 1181, 1222, 1182, 1225, - 1171, 1187, 1172, 1169, 1183, 1175, 1181, 1172, 1180, 1165, - 1181, 1163, 1176, 1159, 1153, 1158, 1173, 1170, 1171, 1168, - 1524, 1154, 1156, 1165, 1201, 527, 1164, 1147, 1148, 1145, + 1236, 1231, 1230, 1279, 1225, 1240, 1232, 1280, 1526, 1227, + 1223, 1221, 1225, 1218, 1228, 1231, 1220, 1215, 1526, 1270, + 1526, 1214, 1225, 1262, 1215, 1224, 1218, 1222, 1262, 1256, + 1220, 1200, 1203, 1202, 1210, 1198, 1254, 1196, 1526, 1526, + 1201, 1526, 1211, 1245, 1207, 0, 1191, 1208, 1246, 1526, + 1526, 1194, 1526, 1200, 1526, 522, 534, 1203, 557, 1526, + 1196, 1184, 1235, 1182, 1189, 1182, 1194, 1193, 1193, 1181, + 1222, 1182, 1225, 1171, 1187, 1172, 1169, 1183, 1175, 1181, + 1172, 1180, 1165, 1181, 1163, 1176, 1159, 1153, 1158, 1173, + 1170, 1171, 1168, 1526, 1154, 1156, 1165, 1201, 502, 1164, - 1524, 1159, 1138, 1159, 1149, 1192, 1146, 1190, 1524, 1137, - 1151, 1154, 1186, 1185, 1132, 1183, 1524, 14, 1145, 1134, - 1136, 1524, 1142, 1132, 1524, 1126, 1181, 517, 531, 1131, - 1133, 1129, 1172, 542, 1171, 1170, 1124, 1114, 1167, 1120, - 1130, 1164, 1122, 1109, 1117, 1160, 1122, 1121, 1122, 1115, - 1104, 1117, 1120, 1115, 1116, 1113, 1116, 1111, 1152, 1151, - 1101, 1091, 1099, 1147, 1096, 1088, 1089, 1102, 1524, 1090, - 1099, 1098, 1098, 1138, 1081, 1090, 1083, 1072, 1076, 1127, - 1074, 1084, 1124, 1071, 506, 538, 1065, 535, 1524, 1126, - 1084, 1073, 1077, 1067, 1079, 1120, 1524, 1114, 533, 1072, + 1147, 1148, 1145, 1526, 1159, 1138, 1159, 1149, 1192, 1146, + 1190, 1526, 1137, 1151, 1154, 1186, 1185, 1132, 1183, 1526, + 14, 1145, 1134, 1136, 1526, 1142, 1132, 1526, 1126, 1181, + 534, 518, 1131, 1133, 1129, 1172, 510, 1171, 1170, 1124, + 1114, 1167, 1120, 1130, 1164, 1122, 1109, 1117, 1160, 1122, + 1121, 1122, 1115, 1104, 1117, 1120, 1115, 1116, 1113, 1116, + 1111, 1152, 1151, 1101, 1091, 1099, 1147, 1096, 1088, 1089, + 1102, 1526, 1090, 1099, 1098, 1098, 1138, 1081, 1090, 1083, + 1072, 1076, 1127, 1074, 1084, 1124, 1071, 526, 547, 1065, + 539, 1526, 1126, 1084, 1073, 1077, 1067, 1079, 1120, 1526, - 1066, 1074, 1069, 1065, 1072, 1055, 1055, 1072, 1067, 1055, - 1051, 1058, 1052, 1062, 1050, 1064, 1052, 1060, 1058, 1049, - 1058, 1054, 1095, 1037, 1037, 1050, 1035, 1033, 1034, 1524, - 1524, 1042, 1045, 1048, 1524, 1047, 1032, 1024, 552, 1029, - 1076, 1025, 1079, 1524, 1024, 1026, 1026, 1075, 1028, 1016, - 1010, 1021, 1030, 1023, 1015, 1015, 1014, 1012, 1012, 1063, - 1024, 999, 1524, 1055, 1002, 1015, 1014, 999, 1524, 522, - 566, 1013, 1014, 1048, 1011, 1013, 1050, 1003, 996, 990, - 997, 990, 1044, 1001, 990, 990, 999, 982, 996, 988, - 1031, 997, 979, 978, 1524, 994, 975, 593, 974, 991, + 1114, 543, 1072, 1066, 1074, 1069, 1065, 1072, 1055, 1055, + 1072, 1067, 1055, 1051, 1058, 1052, 1062, 1050, 1064, 1052, + 1060, 1058, 1049, 1058, 1054, 1095, 1037, 1037, 1050, 1035, + 1033, 1034, 1526, 1526, 1042, 1045, 1048, 1526, 1047, 1032, + 1024, 434, 1029, 1076, 1025, 1079, 1526, 1024, 1026, 1026, + 1075, 1028, 1016, 1010, 1021, 1030, 1023, 1015, 1015, 1014, + 1012, 1012, 1063, 1024, 999, 1526, 1055, 1002, 1015, 1014, + 999, 1526, 568, 540, 1013, 1014, 1048, 1011, 1013, 1050, + 1003, 996, 990, 997, 990, 1044, 1001, 990, 990, 999, + 982, 996, 988, 1031, 997, 979, 978, 1526, 994, 975, - 969, 985, 1021, 979, 967, 983, 980, 964, 977, 962, - 295, 6, 1524, 83, 219, 261, 1524, 283, 503, 498, - 518, 514, 535, 595, 541, 541, 605, 551, 1524, 557, - 556, 555, 569, 570, 575, 614, 588, 593, 565, 569, - 568, 620, 565, 1524, 572, 583, 624, 625, 574, 1524, - 570, 573, 572, 592, 589, 594, 595, 581, 589, 598, - 578, 599, 639, 1524, 594, 641, 642, 606, 609, 597, - 594, 601, 652, 601, 599, 617, 656, 611, 609, 607, - 660, 661, 657, 617, 622, 615, 624, 612, 622, 618, - 1524, 613, 614, 1524, 615, 631, 632, 633, 615, 620, + 597, 974, 991, 969, 985, 1021, 979, 967, 983, 980, + 964, 10, 5, 295, 76, 1526, 214, 267, 283, 1526, + 348, 410, 465, 496, 499, 506, 573, 525, 539, 598, + 546, 1526, 553, 551, 550, 570, 571, 576, 615, 589, + 594, 566, 570, 569, 622, 567, 1526, 574, 585, 626, + 627, 576, 1526, 572, 575, 574, 594, 591, 596, 597, + 583, 591, 600, 580, 601, 641, 1526, 596, 643, 646, + 608, 611, 599, 595, 602, 654, 603, 601, 619, 658, + 613, 611, 609, 662, 663, 659, 619, 624, 617, 626, + 614, 624, 620, 1526, 615, 616, 1526, 617, 633, 634, - 638, 1524, 660, 651, 624, 624, 645, 1524, 628, 643, - 638, 1524, 1524, 648, 683, 632, 685, 634, 692, 637, - 648, 640, 646, 642, 660, 661, 1524, 659, 1524, 661, - 1524, 665, 655, 648, 660, 702, 1524, 660, 710, 711, - 1524, 660, 667, 709, 1524, 1524, 659, 659, 662, 676, - 663, 720, 679, 717, 723, 673, 725, 726, 727, 688, - 672, 684, 689, 704, 733, 729, 694, 686, 737, 686, - 697, 702, 684, 742, 697, 702, 1524, 703, 696, 705, - 706, 703, 693, 695, 752, 701, 698, 755, 751, 694, - 709, 759, 1524, 1524, 710, 720, 705, 706, 765, 767, + 635, 617, 622, 640, 1526, 662, 653, 626, 626, 647, + 1526, 630, 645, 640, 1526, 1526, 650, 685, 634, 687, + 636, 694, 639, 650, 642, 648, 644, 662, 663, 1526, + 661, 1526, 663, 1526, 667, 657, 650, 662, 704, 1526, + 662, 712, 713, 1526, 662, 669, 711, 1526, 1526, 661, + 661, 664, 678, 665, 722, 681, 719, 725, 675, 727, + 728, 729, 690, 674, 686, 691, 706, 735, 731, 696, + 688, 739, 688, 699, 704, 686, 744, 699, 704, 1526, + 705, 698, 707, 708, 705, 695, 697, 754, 703, 700, + 757, 753, 696, 711, 761, 1526, 1526, 712, 722, 707, - 713, 769, 1524, 719, 721, 772, 1524, 736, 1524, 1524, - 1524, 726, 776, 727, 778, 761, 1524, 723, 740, 742, - 1524, 729, 728, 730, 731, 727, 1524, 749, 735, 736, - 751, 751, 754, 754, 751, 756, 1524, 748, 758, 1524, - 755, 760, 762, 759, 1524, 750, 756, 755, 766, 1524, - 1524, 805, 1524, 754, 760, 1524, 763, 776, 1524, 773, - 1524, 770, 793, 765, 814, 820, 821, 765, 823, 778, - 772, 826, 827, 823, 788, 784, 826, 776, 781, 834, - 792, 836, 796, 838, 801, 790, 841, 785, 802, 802, - 786, 842, 807, 807, 804, 851, 811, 824, 813, 812, + 708, 767, 769, 715, 771, 1526, 721, 723, 774, 1526, + 738, 1526, 1526, 1526, 728, 778, 729, 780, 763, 1526, + 725, 742, 744, 1526, 731, 730, 732, 733, 729, 1526, + 751, 737, 738, 753, 753, 756, 756, 753, 758, 1526, + 750, 760, 1526, 757, 762, 764, 761, 1526, 752, 758, + 757, 768, 1526, 1526, 807, 1526, 756, 762, 1526, 765, + 778, 1526, 775, 1526, 772, 795, 767, 816, 822, 823, + 767, 825, 780, 774, 828, 829, 825, 790, 786, 828, + 778, 783, 836, 794, 838, 798, 840, 803, 792, 843, + 787, 804, 804, 788, 844, 809, 809, 806, 853, 813, - 1524, 1524, 856, 1524, 805, 816, 1524, 1524, 806, 855, - 800, 805, 863, 813, 1524, 819, 1524, 866, 1524, 811, - 826, 1524, 864, 832, 825, 834, 822, 832, 875, 826, - 1524, 877, 878, 841, 826, 1524, 831, 883, 829, 828, - 886, 841, 1524, 883, 845, 1524, 848, 891, 834, 836, - 833, 849, 858, 897, 1524, 893, 1524, 1524, 842, 859, - 896, 1524, 850, 857, 1524, 854, 859, 906, 851, 1524, - 855, 867, 910, 854, 862, 1524, 873, 872, 864, 863, - 877, 868, 877, 879, 1524, 921, 881, 923, 1524, 919, - 883, 864, 927, 928, 887, 888, 889, 932, 891, 1524, + 826, 815, 814, 1526, 1526, 858, 1526, 807, 818, 1526, + 1526, 808, 857, 802, 807, 865, 815, 1526, 821, 1526, + 868, 1526, 813, 828, 1526, 866, 834, 827, 836, 824, + 834, 877, 828, 1526, 879, 880, 843, 828, 1526, 833, + 885, 831, 830, 888, 843, 1526, 885, 847, 1526, 850, + 893, 836, 838, 835, 851, 860, 899, 1526, 895, 1526, + 1526, 844, 861, 898, 1526, 852, 859, 1526, 856, 861, + 908, 853, 1526, 857, 869, 912, 856, 864, 1526, 875, + 874, 866, 865, 879, 870, 879, 881, 1526, 923, 883, + 925, 1526, 921, 885, 866, 929, 930, 889, 890, 891, - 896, 1524, 878, 936, 897, 1524, 1524, 883, 883, 885, - 1524, 890, 885, 897, 1524, 895, 899, 890, 942, 891, - 907, 900, 909, 900, 907, 894, 909, 956, 915, 902, - 918, 909, 923, 919, 1524, 963, 964, 965, 922, 921, - 922, 1524, 1524, 1524, 969, 913, 929, 1524, 967, 918, - 917, 919, 930, 977, 928, 1524, 937, 980, 1524, 1524, - 986, 991, 996, 1001, 1006, 1011, 1016, 1019, 993, 998, - 1000, 1013 + 934, 893, 1526, 898, 1526, 880, 938, 899, 1526, 1526, + 885, 885, 887, 1526, 892, 887, 899, 1526, 897, 901, + 892, 944, 893, 909, 902, 911, 902, 909, 896, 911, + 958, 917, 904, 920, 911, 925, 921, 1526, 965, 966, + 967, 924, 923, 924, 1526, 1526, 1526, 971, 915, 931, + 1526, 969, 920, 919, 921, 932, 979, 930, 1526, 939, + 982, 1526, 1526, 988, 993, 998, 1003, 1008, 1013, 1018, + 1021, 995, 1000, 1002, 1015 } ; -static yyconst flex_int16_t yy_def[1173] = +static yyconst flex_int16_t yy_def[1176] = { 0, - 1161, 1161, 1162, 1162, 1161, 1161, 1161, 1161, 1161, 1161, - 1160, 1160, 1160, 1160, 1160, 1163, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1164, - 1160, 1160, 1160, 1165, 15, 1160, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1166, 45, 45, 45, + 1164, 1164, 1165, 1165, 1164, 1164, 1164, 1164, 1164, 1164, + 1163, 1163, 1163, 1163, 1163, 1166, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1167, + 1163, 1163, 1163, 1168, 15, 1163, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1169, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 1163, 1160, 1160, - 1160, 1160, 1160, 1160, 1167, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1164, 1160, 1165, 1160, + 45, 45, 45, 45, 45, 45, 45, 1166, 1163, 1163, + 1163, 1163, 1163, 1163, 1170, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1167, 1163, 1168, 1163, - 1160, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1168, 45, 1166, 45, 45, 45, 45, 45, + 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 1171, 45, 1169, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1167, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1169, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 1168, 1160, 1166, + 45, 45, 45, 45, 45, 45, 1170, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1172, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1171, 1163, 1169, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 1160, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1170, 45, 45, 45, - 45, 45, 45, 45, 1160, 45, 1160, 45, 1166, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 1160, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1173, 45, 45, + 45, 45, 45, 45, 45, 1163, 45, 1163, 45, 1169, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 1160, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 1160, 45, 45, 45, 1160, - 1160, 1160, 1171, 45, 45, 45, 45, 45, 45, 45, - 1160, 45, 45, 1160, 45, 1166, 45, 45, 45, 45, - 45, 45, 1160, 45, 45, 45, 1160, 45, 45, 45, - 45, 1160, 45, 45, 45, 45, 45, 45, 45, 45, - 1160, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1163, 45, 45, + 45, 1163, 1163, 1163, 1174, 45, 45, 45, 45, 45, + 45, 45, 1163, 45, 45, 1163, 45, 1169, 45, 45, + 45, 45, 45, 45, 1163, 45, 45, 45, 1163, 45, + 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, + 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1160, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1160, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 1160, 1160, 45, 1160, 45, - 45, 1160, 1172, 45, 45, 45, 1160, 1160, 45, 1160, - 45, 1160, 45, 45, 45, 45, 1160, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 1163, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 1163, 45, + 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 1163, 1163, + 45, 1163, 45, 45, 1163, 1175, 45, 45, 45, 1163, + 1163, 45, 1163, 45, 1163, 45, 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 1160, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, - 1160, 45, 45, 45, 45, 45, 45, 45, 1160, 45, - 45, 45, 45, 45, 45, 45, 1160, 45, 45, 45, - 45, 1160, 45, 45, 1160, 45, 45, 45, 45, 45, + 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, + 45, 1163, 45, 45, 45, 45, 45, 45, 45, 1163, + 45, 45, 45, 45, 1163, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 1160, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 1160, 45, - 45, 45, 45, 45, 45, 45, 1160, 45, 45, 45, + 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1163, 45, 45, 45, 45, 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1160, - 1160, 45, 45, 45, 1160, 45, 45, 45, 45, 45, - 45, 45, 45, 1160, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1160, 45, 45, 45, 45, 45, 1160, 45, + 45, 45, 1163, 1163, 45, 45, 45, 1163, 45, 45, + 45, 45, 45, 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1163, 45, 45, 45, 45, + 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1160, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1160, 45, 45, 45, 1160, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 1160, 45, + 45, 45, 45, 45, 45, 1163, 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 1160, 45, 45, 45, 45, 45, 1160, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 1160, 45, 45, 45, 45, 45, 45, + 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1163, 45, 45, 45, + 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 1160, 45, 45, 1160, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1163, 45, 45, 1163, 45, 45, 45, - 45, 1160, 45, 45, 45, 45, 45, 1160, 45, 45, - 45, 1160, 1160, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1160, 45, 1160, 45, - 1160, 45, 45, 45, 45, 45, 1160, 45, 45, 45, - 1160, 45, 45, 45, 1160, 1160, 45, 45, 45, 45, + 45, 45, 45, 45, 1163, 45, 45, 45, 45, 45, + 1163, 45, 45, 45, 1163, 1163, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1163, + 45, 1163, 45, 1163, 45, 45, 45, 45, 45, 1163, + 45, 45, 45, 1163, 45, 45, 45, 1163, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1160, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1160, 1160, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1163, 1163, 45, 45, 45, - 45, 45, 1160, 45, 45, 45, 1160, 45, 1160, 1160, - 1160, 45, 45, 45, 45, 45, 1160, 45, 45, 45, - 1160, 45, 45, 45, 45, 45, 1160, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1160, 45, 45, 1160, - 45, 45, 45, 45, 1160, 45, 45, 45, 45, 1160, - 1160, 45, 1160, 45, 45, 1160, 45, 45, 1160, 45, - 1160, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1163, 45, 45, 45, 1163, + 45, 1163, 1163, 1163, 45, 45, 45, 45, 45, 1163, + 45, 45, 45, 1163, 45, 45, 45, 45, 45, 1163, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1163, + 45, 45, 1163, 45, 45, 45, 45, 1163, 45, 45, + 45, 45, 1163, 1163, 45, 1163, 45, 45, 1163, 45, + 45, 1163, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 1160, 1160, 45, 1160, 45, 45, 1160, 1160, 45, 45, - 45, 45, 45, 45, 1160, 45, 1160, 45, 1160, 45, - 45, 1160, 45, 45, 45, 45, 45, 45, 45, 45, - 1160, 45, 45, 45, 45, 1160, 45, 45, 45, 45, - 45, 45, 1160, 45, 45, 1160, 45, 45, 45, 45, - 45, 45, 45, 45, 1160, 45, 1160, 1160, 45, 45, - 45, 1160, 45, 45, 1160, 45, 45, 45, 45, 1160, - 45, 45, 45, 45, 45, 1160, 45, 45, 45, 45, - 45, 45, 45, 45, 1160, 45, 45, 45, 1160, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1160, + 45, 45, 45, 1163, 1163, 45, 1163, 45, 45, 1163, + 1163, 45, 45, 45, 45, 45, 45, 1163, 45, 1163, + 45, 1163, 45, 45, 1163, 45, 45, 45, 45, 45, + 45, 45, 45, 1163, 45, 45, 45, 45, 1163, 45, + 45, 45, 45, 45, 45, 1163, 45, 45, 1163, 45, + 45, 45, 45, 45, 45, 45, 45, 1163, 45, 1163, + 1163, 45, 45, 45, 1163, 45, 45, 1163, 45, 45, + 45, 45, 1163, 45, 45, 45, 45, 45, 1163, 45, + 45, 45, 45, 45, 45, 45, 45, 1163, 45, 45, + 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1160, 45, 45, 45, 1160, 1160, 45, 45, 45, - 1160, 45, 45, 45, 1160, 45, 45, 45, 45, 45, + 45, 45, 1163, 45, 1163, 45, 45, 45, 1163, 1163, + 45, 45, 45, 1163, 45, 45, 45, 1163, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1160, 45, 45, 45, 45, 45, - 45, 1160, 1160, 1160, 45, 45, 45, 1160, 45, 45, - 45, 45, 45, 45, 45, 1160, 45, 45, 1160, 0, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160 + 45, 45, 45, 45, 45, 45, 45, 1163, 45, 45, + 45, 45, 45, 45, 1163, 1163, 1163, 45, 45, 45, + 1163, 45, 45, 45, 45, 45, 45, 45, 1163, 45, + 45, 1163, 0, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163 } ; -static yyconst flex_uint16_t yy_nxt[1596] = +static yyconst flex_uint16_t yy_nxt[1598] = { 0, - 1160, 13, 14, 13, 1160, 15, 16, 1160, 17, 18, - 19, 20, 21, 22, 22, 22, 23, 24, 84, 589, - 37, 14, 37, 85, 25, 26, 38, 1160, 590, 27, + 1163, 13, 14, 13, 1163, 15, 16, 1163, 17, 18, + 19, 20, 21, 22, 22, 22, 23, 24, 84, 592, + 37, 14, 37, 85, 25, 26, 38, 1163, 593, 27, 37, 14, 37, 42, 28, 42, 38, 90, 91, 29, 112, 30, 13, 14, 13, 89, 90, 25, 31, 91, - 13, 14, 13, 13, 14, 13, 32, 40, 1160, 13, + 13, 14, 13, 13, 14, 13, 32, 40, 780, 13, 14, 13, 33, 40, 112, 90, 91, 781, 89, 34, 35, 13, 14, 13, 93, 15, 16, 94, 17, 18, 19, 20, 21, 22, 22, 22, 23, 24, 13, 14, @@ -933,7 +934,7 @@ static yyconst flex_uint16_t yy_nxt[1596] = 39, 83, 83, 83, 28, 42, 41, 42, 42, 29, 42, 30, 81, 105, 41, 108, 92, 25, 31, 106, 197, 155, 87, 133, 87, 156, 32, 88, 88, 88, - 198, 134, 33, 202, 203, 81, 105, 782, 108, 34, + 198, 134, 33, 202, 203, 81, 105, 784, 108, 34, 35, 44, 44, 44, 45, 45, 46, 45, 45, 45, 45, 45, 45, 45, 45, 47, 45, 45, 45, 45, 45, 48, 45, 45, 49, 45, 50, 45, 51, 52, @@ -947,165 +948,165 @@ static yyconst flex_uint16_t yy_nxt[1596] = 81, 109, 119, 125, 128, 120, 126, 81, 121, 103, 122, 110, 123, 105, 116, 129, 111, 142, 81, 127, 117, 143, 135, 81, 109, 130, 207, 101, 208, 151, - 81, 45, 136, 152, 137, 100, 105, 45, 783, 110, + 81, 45, 136, 152, 137, 100, 105, 45, 785, 110, 45, 144, 45, 153, 45, 45, 45, 131, 114, 138, 139, 45, 45, 140, 45, 45, 88, 88, 88, 141, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 101, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 148, 157, 784, 45, 108, 149, - 150, 45, 109, 111, 170, 158, 159, 332, 168, 45, - 333, 160, 110, 45, 170, 45, 115, 145, 785, 146, - 779, 147, 83, 83, 83, 109, 163, 161, 88, 88, - 88, 780, 170, 81, 168, 79, 164, 80, 80, 80, + 45, 45, 45, 45, 148, 157, 786, 45, 108, 149, + 150, 45, 109, 111, 170, 158, 159, 334, 168, 45, + 335, 160, 110, 45, 170, 45, 115, 145, 787, 146, + 782, 147, 83, 83, 83, 109, 163, 161, 88, 88, + 88, 783, 170, 81, 168, 79, 164, 80, 80, 80, 110, 165, 173, 169, 87, 178, 87, 162, 81, 88, 88, 88, 83, 83, 83, 79, 81, 82, 82, 82, 99, 168, 169, 81, 180, 181, 183, 99, 81, 169, 184, 81, 185, 178, 186, 187, 178, 212, 223, 183, - 213, 236, 224, 186, 214, 237, 81, 171, 172, 239, - 180, 81, 181, 191, 183, 99, 240, 184, 187, 99, - 185, 186, 262, 99, 192, 233, 234, 183, 248, 229, - 256, 99, 249, 260, 260, 99, 250, 99, 176, 190, - 190, 190, 241, 242, 243, 262, 190, 190, 190, 190, - 190, 190, 261, 244, 261, 245, 262, 246, 269, 271, - 247, 260, 263, 272, 278, 274, 276, 354, 356, 190, - 190, 190, 190, 190, 190, 269, 287, 355, 261, 265, - 264, 269, 288, 350, 350, 363, 356, 271, 274, 276, - 272, 278, 279, 279, 279, 360, 417, 356, 281, 279, + 213, 382, 224, 788, 214, 383, 81, 171, 172, 240, + 180, 81, 181, 191, 183, 99, 241, 184, 187, 99, + 185, 186, 263, 99, 192, 233, 234, 183, 249, 229, + 236, 99, 250, 237, 238, 99, 251, 99, 176, 190, + 190, 190, 242, 243, 244, 263, 190, 190, 190, 190, + 190, 190, 186, 245, 261, 246, 273, 247, 262, 261, + 248, 789, 262, 263, 272, 365, 270, 275, 277, 190, + 190, 190, 190, 190, 190, 279, 270, 711, 352, 257, + 358, 712, 261, 273, 262, 352, 266, 264, 265, 270, + 275, 277, 272, 365, 288, 362, 356, 358, 419, 282, - 279, 279, 279, 279, 279, 446, 350, 351, 357, 358, - 380, 403, 404, 363, 381, 368, 391, 359, 360, 466, - 446, 392, 279, 279, 279, 279, 279, 279, 366, 366, - 366, 408, 569, 446, 467, 366, 366, 366, 366, 366, - 366, 409, 439, 528, 453, 525, 454, 440, 456, 529, - 531, 598, 418, 737, 786, 599, 787, 655, 366, 366, - 366, 366, 366, 366, 656, 788, 671, 393, 789, 570, - 528, 453, 394, 454, 45, 45, 45, 529, 599, 598, - 737, 45, 45, 45, 45, 45, 45, 604, 657, 658, - 738, 661, 790, 605, 671, 708, 659, 662, 764, 709, + 289, 352, 279, 280, 280, 280, 357, 572, 353, 358, + 280, 280, 280, 280, 280, 280, 359, 360, 362, 405, + 406, 410, 442, 790, 393, 361, 370, 443, 449, 394, + 456, 411, 457, 280, 280, 280, 280, 280, 280, 368, + 368, 368, 602, 791, 573, 469, 368, 368, 368, 368, + 368, 368, 531, 792, 420, 607, 449, 456, 449, 457, + 470, 608, 528, 793, 741, 602, 532, 534, 601, 368, + 368, 368, 368, 368, 368, 395, 674, 658, 794, 531, + 396, 45, 45, 45, 659, 795, 459, 741, 45, 45, + 45, 45, 45, 45, 532, 664, 601, 660, 661, 740, - 791, 792, 793, 765, 45, 45, 45, 45, 45, 45, - 794, 795, 796, 738, 797, 798, 799, 800, 801, 802, - 803, 805, 804, 806, 807, 808, 809, 810, 811, 812, - 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, - 823, 824, 825, 826, 827, 828, 829, 831, 803, 804, - 832, 830, 833, 834, 766, 835, 836, 837, 838, 839, - 840, 841, 842, 843, 844, 845, 846, 847, 848, 849, - 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, - 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, - 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, + 796, 665, 767, 797, 674, 662, 798, 768, 799, 800, + 801, 45, 45, 45, 45, 45, 45, 802, 803, 804, + 805, 806, 808, 807, 809, 810, 740, 811, 812, 813, + 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, + 824, 825, 826, 827, 828, 829, 830, 831, 832, 806, + 807, 834, 835, 833, 836, 837, 838, 839, 769, 840, + 841, 842, 843, 844, 845, 846, 847, 848, 849, 850, + 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, + 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, + 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, - 880, 881, 882, 883, 884, 885, 886, 864, 887, 888, - 889, 890, 891, 865, 892, 893, 894, 895, 896, 897, - 898, 899, 900, 901, 902, 903, 904, 905, 907, 908, - 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, - 919, 920, 921, 923, 924, 925, 926, 927, 928, 929, - 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, - 940, 941, 942, 943, 945, 916, 946, 947, 948, 949, - 950, 944, 951, 952, 953, 954, 955, 956, 906, 957, - 958, 959, 960, 961, 922, 963, 964, 965, 962, 966, - 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, + 881, 882, 883, 884, 885, 886, 887, 888, 889, 867, + 890, 891, 892, 893, 894, 868, 895, 896, 897, 898, + 899, 900, 901, 902, 903, 904, 905, 906, 907, 908, + 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, + 920, 921, 922, 923, 924, 926, 927, 928, 929, 930, + 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, + 941, 942, 943, 944, 945, 946, 948, 919, 949, 950, + 951, 952, 953, 947, 954, 955, 956, 957, 958, 959, + 909, 960, 961, 962, 963, 964, 925, 966, 967, 968, + 965, 969, 970, 971, 972, 973, 974, 975, 976, 977, - 977, 978, 979, 980, 981, 982, 983, 984, 963, 985, - 986, 987, 988, 989, 990, 991, 992, 993, 994, 995, - 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, - 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, - 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 998, - 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, - 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, - 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, - 1055, 1056, 1057, 1058, 1059, 1060, 1033, 1061, 1062, 1063, - 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, + 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, + 966, 988, 989, 990, 991, 992, 993, 994, 995, 996, + 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, + 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, + 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, + 1027, 1001, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, + 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, + 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, + 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1036, 1064, + 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, - 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, - 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, - 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, - 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, - 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, - 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, - 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, - 1144, 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, - 1154, 1155, 1156, 1157, 1158, 1159, 12, 12, 12, 12, - 12, 36, 36, 36, 36, 36, 78, 267, 78, 78, + 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, + 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, + 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, + 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, + 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, + 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, + 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, + 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, + 1155, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 12, 12, + 12, 12, 12, 36, 36, 36, 36, 36, 78, 268, - 78, 97, 353, 97, 443, 97, 99, 99, 99, 99, - 99, 113, 113, 113, 113, 113, 167, 99, 167, 167, - 167, 188, 188, 188, 778, 777, 776, 775, 774, 773, - 772, 771, 770, 769, 768, 767, 763, 762, 761, 760, - 759, 758, 757, 756, 755, 754, 753, 752, 751, 750, - 749, 748, 747, 746, 745, 744, 743, 742, 741, 740, - 739, 736, 735, 734, 733, 732, 731, 730, 729, 728, - 727, 726, 725, 724, 723, 722, 721, 720, 719, 718, - 717, 716, 715, 714, 713, 712, 711, 710, 707, 706, - 705, 704, 703, 702, 701, 700, 699, 698, 697, 696, + 78, 78, 78, 97, 355, 97, 446, 97, 99, 99, + 99, 99, 99, 113, 113, 113, 113, 113, 167, 99, + 167, 167, 167, 188, 188, 188, 779, 778, 777, 776, + 775, 774, 773, 772, 771, 770, 766, 765, 764, 763, + 762, 761, 760, 759, 758, 757, 756, 755, 754, 753, + 752, 751, 750, 749, 748, 747, 746, 745, 744, 743, + 742, 739, 738, 737, 736, 735, 734, 733, 732, 731, + 730, 729, 728, 727, 726, 725, 724, 723, 722, 721, + 720, 719, 718, 717, 716, 715, 714, 713, 710, 709, + 708, 707, 706, 705, 704, 703, 702, 701, 700, 699, - 695, 694, 693, 692, 691, 690, 689, 688, 687, 686, - 685, 684, 683, 682, 681, 680, 679, 678, 677, 676, - 675, 674, 673, 672, 670, 669, 668, 667, 666, 665, - 664, 663, 660, 654, 653, 652, 651, 650, 649, 648, - 647, 646, 645, 644, 643, 642, 641, 640, 639, 638, - 637, 636, 635, 634, 633, 632, 631, 630, 629, 628, - 627, 626, 625, 624, 623, 622, 621, 620, 619, 618, - 617, 616, 615, 614, 613, 612, 611, 610, 609, 608, - 607, 606, 603, 602, 601, 600, 597, 596, 595, 594, - 593, 592, 591, 588, 587, 586, 585, 584, 583, 582, + 698, 697, 696, 695, 694, 693, 692, 691, 690, 689, + 688, 687, 686, 685, 684, 683, 682, 681, 680, 679, + 678, 677, 676, 675, 673, 672, 671, 670, 669, 668, + 667, 666, 663, 657, 656, 655, 654, 653, 652, 651, + 650, 649, 648, 647, 646, 645, 644, 643, 642, 641, + 640, 639, 638, 637, 636, 635, 634, 633, 632, 631, + 630, 629, 628, 627, 626, 625, 624, 623, 622, 621, + 620, 619, 618, 617, 616, 615, 614, 613, 612, 611, + 610, 609, 606, 605, 604, 603, 600, 599, 598, 597, + 596, 595, 594, 591, 590, 589, 588, 587, 586, 585, - 581, 580, 579, 578, 577, 576, 575, 574, 573, 572, - 571, 568, 567, 566, 565, 564, 563, 562, 561, 560, - 559, 558, 557, 556, 555, 554, 553, 552, 551, 550, - 549, 548, 547, 546, 545, 544, 543, 542, 541, 540, - 539, 538, 537, 536, 535, 534, 533, 532, 530, 527, - 526, 525, 524, 523, 522, 521, 520, 519, 518, 517, - 516, 515, 514, 513, 512, 511, 510, 509, 508, 507, - 506, 505, 504, 503, 502, 501, 500, 499, 498, 497, - 496, 495, 494, 493, 492, 491, 490, 489, 488, 487, - 486, 485, 484, 483, 482, 481, 480, 479, 478, 477, + 584, 583, 582, 581, 580, 579, 578, 577, 576, 575, + 574, 571, 570, 569, 568, 567, 566, 565, 564, 563, + 562, 561, 560, 559, 558, 557, 556, 555, 554, 553, + 552, 551, 550, 549, 548, 547, 546, 545, 544, 543, + 542, 541, 540, 539, 538, 537, 536, 535, 533, 530, + 529, 528, 527, 526, 525, 524, 523, 522, 521, 520, + 519, 518, 517, 516, 515, 514, 513, 512, 511, 510, + 509, 508, 507, 506, 505, 504, 503, 502, 501, 500, + 499, 498, 497, 496, 495, 494, 493, 492, 491, 490, + 489, 488, 487, 486, 485, 484, 483, 482, 481, 480, - 476, 475, 474, 473, 472, 471, 470, 469, 468, 465, - 464, 463, 462, 461, 460, 459, 458, 457, 455, 452, - 451, 450, 449, 448, 447, 445, 444, 442, 441, 438, - 437, 436, 435, 434, 433, 432, 431, 430, 429, 428, - 427, 426, 425, 424, 423, 422, 421, 420, 419, 416, - 415, 414, 413, 412, 411, 410, 407, 406, 405, 402, - 401, 400, 399, 398, 397, 396, 395, 390, 389, 388, - 387, 386, 385, 384, 383, 382, 379, 378, 377, 376, - 375, 374, 373, 372, 371, 370, 369, 367, 365, 364, - 362, 361, 352, 349, 348, 347, 346, 345, 344, 343, + 479, 478, 477, 476, 475, 474, 473, 472, 471, 468, + 467, 466, 465, 464, 463, 462, 461, 460, 458, 455, + 454, 453, 452, 451, 450, 448, 447, 445, 444, 441, + 440, 439, 438, 437, 436, 435, 434, 433, 432, 431, + 430, 429, 428, 427, 426, 425, 424, 423, 422, 421, + 418, 417, 416, 415, 414, 413, 412, 409, 408, 407, + 404, 403, 402, 401, 400, 399, 398, 397, 392, 391, + 390, 389, 388, 387, 386, 385, 384, 381, 380, 379, + 378, 377, 376, 375, 374, 373, 372, 371, 369, 367, + 366, 364, 363, 354, 351, 350, 349, 348, 347, 346, - 342, 341, 340, 339, 338, 337, 336, 335, 334, 331, - 330, 329, 328, 327, 326, 325, 324, 323, 322, 321, - 320, 319, 318, 317, 316, 315, 314, 313, 312, 311, - 310, 309, 308, 307, 306, 305, 304, 303, 302, 301, - 300, 299, 298, 297, 296, 295, 294, 293, 292, 291, - 290, 289, 286, 285, 284, 283, 282, 280, 189, 277, - 275, 273, 270, 268, 266, 259, 258, 257, 255, 254, - 253, 252, 251, 238, 235, 232, 231, 230, 228, 227, - 226, 225, 222, 221, 220, 219, 218, 217, 216, 215, - 211, 210, 209, 206, 205, 204, 201, 200, 199, 196, + 345, 344, 343, 342, 341, 340, 339, 338, 337, 336, + 333, 332, 331, 330, 329, 328, 327, 326, 325, 324, + 323, 322, 321, 320, 319, 318, 317, 316, 315, 314, + 313, 312, 311, 310, 309, 308, 307, 306, 305, 304, + 303, 302, 301, 300, 299, 298, 297, 296, 295, 294, + 293, 292, 291, 290, 287, 286, 285, 284, 283, 281, + 189, 278, 276, 274, 271, 269, 267, 260, 259, 258, + 256, 255, 254, 253, 252, 239, 235, 232, 231, 230, + 228, 227, 226, 225, 222, 221, 220, 219, 218, 217, + 216, 215, 211, 210, 209, 206, 205, 204, 201, 200, - 195, 194, 193, 189, 182, 179, 177, 175, 174, 166, - 154, 132, 118, 107, 104, 102, 43, 98, 96, 95, - 86, 43, 1160, 11, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160 + 199, 196, 195, 194, 193, 189, 182, 179, 177, 175, + 174, 166, 154, 132, 118, 107, 104, 102, 43, 98, + 96, 95, 86, 43, 1163, 11, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163 } ; -static yyconst flex_int16_t yy_chk[1596] = +static yyconst flex_int16_t yy_chk[1598] = { 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 21, 518, - 3, 3, 3, 21, 1, 1, 3, 0, 518, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 21, 521, + 3, 3, 3, 21, 1, 1, 3, 0, 521, 1, 4, 4, 4, 13, 1, 13, 4, 27, 28, 1, 56, 1, 5, 5, 5, 26, 32, 1, 1, 33, - 6, 6, 6, 7, 7, 7, 1, 7, 0, 8, - 8, 8, 1, 8, 56, 27, 28, 712, 26, 1, + 6, 6, 6, 7, 7, 7, 1, 7, 712, 8, + 8, 8, 1, 8, 56, 27, 28, 713, 26, 1, 1, 2, 2, 2, 32, 2, 2, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 9, 9, 9, 51, 5, 31, 2, 2, 10, 10, 10, 2, @@ -1113,7 +1114,7 @@ static yyconst flex_int16_t yy_chk[1596] = 6, 20, 20, 20, 2, 37, 9, 37, 42, 2, 42, 2, 20, 50, 10, 53, 31, 2, 2, 51, 121, 73, 25, 65, 25, 73, 2, 25, 25, 25, - 121, 65, 2, 125, 125, 20, 50, 714, 53, 2, + 121, 65, 2, 125, 125, 20, 50, 715, 53, 2, 2, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, @@ -1127,153 +1128,153 @@ static yyconst flex_int16_t yy_chk[1596] = 19, 54, 60, 61, 62, 60, 61, 22, 60, 48, 60, 54, 60, 63, 58, 62, 55, 68, 17, 61, 58, 68, 66, 19, 54, 62, 129, 44, 129, 71, - 22, 45, 66, 71, 66, 99, 63, 45, 715, 54, + 22, 45, 66, 71, 66, 99, 63, 45, 717, 54, 45, 68, 45, 71, 45, 45, 45, 63, 57, 67, 67, 45, 45, 67, 45, 57, 87, 87, 87, 67, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 99, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 57, 70, 74, 716, 57, 69, 70, - 70, 57, 75, 76, 91, 74, 74, 243, 89, 57, - 243, 74, 75, 57, 94, 57, 57, 69, 718, 69, - 711, 69, 79, 79, 79, 75, 76, 75, 88, 88, - 88, 711, 91, 79, 89, 80, 76, 80, 80, 80, + 45, 45, 45, 57, 70, 74, 718, 57, 69, 70, + 70, 57, 75, 76, 91, 74, 74, 244, 89, 57, + 244, 74, 75, 57, 94, 57, 57, 69, 719, 69, + 714, 69, 79, 79, 79, 75, 76, 75, 88, 88, + 88, 714, 91, 79, 89, 80, 76, 80, 80, 80, 75, 76, 94, 90, 81, 103, 81, 75, 80, 81, 81, 81, 83, 83, 83, 82, 79, 82, 82, 82, 101, 92, 93, 83, 105, 106, 108, 101, 82, 90, 109, 80, 110, 103, 111, 112, 116, 133, 142, 147, - 133, 153, 142, 163, 133, 153, 83, 92, 93, 155, + 133, 295, 142, 721, 133, 295, 83, 92, 93, 155, 105, 82, 106, 116, 108, 101, 155, 109, 112, 101, 110, 111, 170, 101, 116, 151, 151, 147, 157, 147, - 163, 101, 157, 168, 171, 101, 157, 101, 101, 115, + 153, 101, 157, 153, 153, 101, 157, 101, 101, 115, 115, 115, 156, 156, 156, 170, 115, 115, 115, 115, - 115, 115, 169, 156, 172, 156, 173, 156, 178, 180, - 156, 168, 171, 181, 187, 183, 185, 268, 269, 115, - 115, 115, 115, 115, 115, 192, 198, 268, 169, 173, - 172, 178, 198, 260, 263, 274, 281, 180, 183, 185, - 181, 187, 190, 190, 190, 271, 325, 269, 192, 190, + 115, 115, 163, 156, 168, 156, 181, 156, 169, 171, + 156, 722, 172, 173, 180, 275, 178, 183, 185, 115, + 115, 115, 115, 115, 115, 187, 192, 642, 261, 163, + 270, 642, 168, 181, 169, 264, 173, 171, 172, 178, + 183, 185, 180, 275, 198, 272, 269, 282, 326, 192, - 190, 190, 190, 190, 190, 356, 260, 263, 270, 270, - 294, 313, 313, 274, 294, 281, 304, 270, 271, 380, - 368, 304, 190, 190, 190, 190, 190, 190, 279, 279, - 279, 317, 496, 356, 380, 279, 279, 279, 279, 279, - 279, 317, 348, 453, 365, 456, 365, 348, 368, 454, - 456, 528, 325, 670, 719, 529, 720, 585, 279, 279, - 279, 279, 279, 279, 585, 721, 599, 304, 722, 496, - 453, 365, 304, 365, 366, 366, 366, 454, 529, 528, - 670, 366, 366, 366, 366, 366, 366, 534, 586, 586, - 671, 588, 723, 534, 599, 639, 586, 588, 698, 639, + 198, 261, 187, 190, 190, 190, 269, 499, 264, 270, + 190, 190, 190, 190, 190, 190, 271, 271, 272, 314, + 314, 318, 350, 723, 305, 271, 282, 350, 358, 305, + 367, 318, 367, 190, 190, 190, 190, 190, 190, 280, + 280, 280, 532, 724, 499, 382, 280, 280, 280, 280, + 280, 280, 456, 725, 326, 537, 358, 367, 370, 367, + 382, 537, 459, 726, 674, 532, 457, 459, 531, 280, + 280, 280, 280, 280, 280, 305, 602, 588, 727, 456, + 305, 368, 368, 368, 588, 728, 370, 674, 368, 368, + 368, 368, 368, 368, 457, 591, 531, 589, 589, 673, - 724, 725, 726, 698, 366, 366, 366, 366, 366, 366, - 727, 728, 730, 671, 731, 732, 733, 734, 735, 736, - 737, 739, 738, 740, 741, 742, 743, 745, 746, 747, - 748, 749, 751, 752, 753, 754, 755, 756, 757, 758, - 759, 760, 761, 762, 763, 765, 766, 767, 737, 738, - 768, 766, 769, 770, 698, 771, 772, 773, 774, 775, - 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, - 786, 787, 788, 789, 790, 792, 793, 795, 796, 797, - 798, 799, 800, 801, 803, 804, 805, 806, 807, 809, - 810, 811, 814, 815, 816, 817, 818, 819, 820, 821, + 729, 591, 701, 730, 602, 589, 731, 701, 733, 734, + 735, 368, 368, 368, 368, 368, 368, 736, 737, 738, + 739, 740, 742, 741, 743, 744, 673, 745, 746, 748, + 749, 750, 751, 752, 754, 755, 756, 757, 758, 759, + 760, 761, 762, 763, 764, 765, 766, 768, 769, 740, + 741, 770, 771, 769, 772, 773, 774, 775, 701, 776, + 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, + 787, 788, 789, 790, 791, 792, 793, 795, 796, 798, + 799, 800, 801, 802, 803, 804, 806, 807, 808, 809, + 810, 812, 813, 814, 817, 818, 819, 820, 821, 822, - 822, 823, 824, 825, 826, 828, 830, 803, 832, 833, - 834, 835, 836, 804, 838, 839, 840, 842, 843, 844, - 847, 848, 849, 850, 851, 852, 853, 854, 855, 856, - 857, 858, 859, 860, 861, 862, 863, 864, 865, 866, - 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, - 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, - 888, 889, 890, 891, 892, 864, 895, 896, 897, 898, - 899, 891, 900, 901, 902, 904, 905, 906, 854, 908, - 912, 913, 914, 915, 869, 916, 918, 919, 915, 920, - 922, 923, 924, 925, 926, 928, 929, 930, 931, 932, + 823, 824, 825, 826, 827, 828, 829, 831, 833, 806, + 835, 836, 837, 838, 839, 807, 841, 842, 843, 845, + 846, 847, 850, 851, 852, 853, 854, 855, 856, 857, + 858, 859, 860, 861, 862, 863, 864, 865, 866, 867, + 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, + 878, 879, 881, 882, 883, 884, 885, 886, 887, 888, + 889, 890, 891, 892, 893, 894, 895, 867, 898, 899, + 900, 901, 902, 894, 903, 904, 905, 907, 908, 909, + 857, 911, 915, 916, 917, 918, 872, 919, 921, 922, + 918, 923, 925, 926, 927, 928, 929, 931, 932, 933, - 933, 934, 935, 936, 938, 939, 941, 942, 916, 943, - 944, 946, 947, 948, 949, 952, 954, 955, 957, 958, - 960, 962, 963, 964, 965, 966, 967, 968, 969, 970, - 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, - 981, 982, 983, 984, 985, 986, 987, 988, 989, 963, - 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, - 1000, 1003, 1005, 1006, 1009, 1010, 1011, 1012, 1013, 1014, - 1016, 1018, 1020, 1021, 1023, 1024, 1025, 1026, 1027, 1028, - 1029, 1030, 1032, 1033, 1034, 1035, 998, 1037, 1038, 1039, - 1040, 1041, 1042, 1044, 1045, 1047, 1048, 1049, 1050, 1051, + 934, 935, 936, 937, 938, 939, 941, 942, 944, 945, + 919, 946, 947, 949, 950, 951, 952, 955, 957, 958, + 960, 961, 963, 965, 966, 967, 968, 969, 970, 971, + 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, + 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, + 992, 966, 993, 994, 995, 996, 997, 998, 999, 1000, + 1001, 1002, 1003, 1006, 1008, 1009, 1012, 1013, 1014, 1015, + 1016, 1017, 1019, 1021, 1023, 1024, 1026, 1027, 1028, 1029, + 1030, 1031, 1032, 1033, 1035, 1036, 1037, 1038, 1001, 1040, + 1041, 1042, 1043, 1044, 1045, 1047, 1048, 1050, 1051, 1052, - 1052, 1053, 1054, 1056, 1059, 1060, 1061, 1063, 1064, 1066, - 1067, 1068, 1069, 1071, 1072, 1073, 1074, 1075, 1077, 1078, - 1079, 1080, 1081, 1082, 1083, 1084, 1086, 1087, 1088, 1090, - 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1101, - 1103, 1104, 1105, 1108, 1109, 1110, 1112, 1113, 1114, 1116, - 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, - 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, 1136, 1137, - 1138, 1139, 1140, 1141, 1145, 1146, 1147, 1149, 1150, 1151, - 1152, 1153, 1154, 1155, 1157, 1158, 1161, 1161, 1161, 1161, - 1161, 1162, 1162, 1162, 1162, 1162, 1163, 1169, 1163, 1163, + 1053, 1054, 1055, 1056, 1057, 1059, 1062, 1063, 1064, 1066, + 1067, 1069, 1070, 1071, 1072, 1074, 1075, 1076, 1077, 1078, + 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1089, 1090, + 1091, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, + 1102, 1104, 1106, 1107, 1108, 1111, 1112, 1113, 1115, 1116, + 1117, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, + 1128, 1129, 1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, + 1139, 1140, 1141, 1142, 1143, 1144, 1148, 1149, 1150, 1152, + 1153, 1154, 1155, 1156, 1157, 1158, 1160, 1161, 1164, 1164, + 1164, 1164, 1164, 1165, 1165, 1165, 1165, 1165, 1166, 1172, - 1163, 1164, 1170, 1164, 1171, 1164, 1165, 1165, 1165, 1165, - 1165, 1166, 1166, 1166, 1166, 1166, 1167, 1172, 1167, 1167, - 1167, 1168, 1168, 1168, 710, 709, 708, 707, 706, 705, - 704, 703, 702, 701, 700, 699, 697, 696, 694, 693, - 692, 691, 690, 689, 688, 687, 686, 685, 684, 683, - 682, 681, 680, 679, 678, 677, 676, 675, 674, 673, - 672, 668, 667, 666, 665, 664, 662, 661, 660, 659, - 658, 657, 656, 655, 654, 653, 652, 651, 650, 649, - 648, 647, 646, 645, 643, 642, 641, 640, 638, 637, - 636, 634, 633, 632, 629, 628, 627, 626, 625, 624, + 1166, 1166, 1166, 1167, 1173, 1167, 1174, 1167, 1168, 1168, + 1168, 1168, 1168, 1169, 1169, 1169, 1169, 1169, 1170, 1175, + 1170, 1170, 1170, 1171, 1171, 1171, 711, 710, 709, 708, + 707, 706, 705, 704, 703, 702, 700, 699, 697, 696, + 695, 694, 693, 692, 691, 690, 689, 688, 687, 686, + 685, 684, 683, 682, 681, 680, 679, 678, 677, 676, + 675, 671, 670, 669, 668, 667, 665, 664, 663, 662, + 661, 660, 659, 658, 657, 656, 655, 654, 653, 652, + 651, 650, 649, 648, 646, 645, 644, 643, 641, 640, + 639, 637, 636, 635, 632, 631, 630, 629, 628, 627, - 623, 622, 621, 620, 619, 618, 617, 616, 615, 614, - 613, 612, 611, 610, 609, 608, 607, 606, 605, 604, - 603, 602, 601, 600, 598, 596, 595, 594, 593, 592, - 591, 590, 587, 584, 583, 582, 581, 580, 579, 578, - 577, 576, 575, 574, 573, 572, 571, 570, 568, 567, - 566, 565, 564, 563, 562, 561, 560, 559, 558, 557, - 556, 555, 554, 553, 552, 551, 550, 549, 548, 547, - 546, 545, 544, 543, 542, 541, 540, 539, 538, 537, - 536, 535, 533, 532, 531, 530, 527, 526, 524, 523, - 521, 520, 519, 516, 515, 514, 513, 512, 511, 510, + 626, 625, 624, 623, 622, 621, 620, 619, 618, 617, + 616, 615, 614, 613, 612, 611, 610, 609, 608, 607, + 606, 605, 604, 603, 601, 599, 598, 597, 596, 595, + 594, 593, 590, 587, 586, 585, 584, 583, 582, 581, + 580, 579, 578, 577, 576, 575, 574, 573, 571, 570, + 569, 568, 567, 566, 565, 564, 563, 562, 561, 560, + 559, 558, 557, 556, 555, 554, 553, 552, 551, 550, + 549, 548, 547, 546, 545, 544, 543, 542, 541, 540, + 539, 538, 536, 535, 534, 533, 530, 529, 527, 526, + 524, 523, 522, 519, 518, 517, 516, 515, 514, 513, - 508, 507, 506, 505, 504, 503, 502, 500, 499, 498, - 497, 495, 494, 493, 492, 490, 489, 488, 487, 486, - 485, 484, 483, 482, 481, 480, 479, 478, 477, 476, - 475, 474, 473, 472, 471, 470, 469, 468, 467, 466, - 465, 464, 463, 462, 461, 460, 459, 458, 455, 451, - 449, 446, 445, 444, 442, 441, 440, 438, 435, 434, - 433, 432, 431, 430, 429, 428, 427, 426, 425, 424, - 423, 422, 421, 420, 419, 418, 416, 415, 414, 413, - 412, 411, 410, 409, 408, 406, 405, 404, 403, 402, - 401, 400, 399, 398, 397, 396, 395, 394, 393, 392, + 511, 510, 509, 508, 507, 506, 505, 503, 502, 501, + 500, 498, 497, 496, 495, 493, 492, 491, 490, 489, + 488, 487, 486, 485, 484, 483, 482, 481, 480, 479, + 478, 477, 476, 475, 474, 473, 472, 471, 470, 469, + 468, 467, 466, 465, 464, 463, 462, 461, 458, 454, + 452, 449, 448, 447, 445, 444, 443, 441, 438, 437, + 436, 435, 434, 433, 432, 431, 430, 429, 428, 427, + 426, 425, 424, 423, 422, 420, 418, 417, 416, 415, + 414, 413, 412, 411, 410, 408, 407, 406, 405, 404, + 403, 402, 401, 400, 399, 398, 397, 396, 395, 394, - 390, 389, 388, 387, 386, 385, 384, 383, 381, 379, - 378, 376, 375, 374, 372, 371, 370, 369, 367, 363, - 362, 360, 359, 358, 357, 355, 354, 352, 349, 347, - 345, 344, 343, 342, 341, 340, 339, 338, 337, 336, - 335, 334, 333, 332, 331, 330, 328, 327, 326, 324, - 323, 322, 321, 320, 319, 318, 316, 315, 314, 312, - 311, 310, 309, 308, 307, 306, 305, 303, 302, 301, - 300, 299, 298, 297, 296, 295, 293, 292, 291, 290, - 288, 287, 286, 285, 284, 283, 282, 280, 278, 276, - 273, 272, 266, 259, 258, 257, 256, 255, 254, 253, + 392, 391, 390, 389, 388, 387, 386, 385, 383, 381, + 380, 378, 377, 376, 374, 373, 372, 371, 369, 365, + 364, 362, 361, 360, 359, 357, 356, 354, 351, 349, + 347, 346, 345, 344, 343, 342, 341, 340, 339, 338, + 337, 336, 335, 334, 333, 332, 330, 329, 328, 327, + 325, 324, 323, 322, 321, 320, 319, 317, 316, 315, + 313, 312, 311, 310, 309, 308, 307, 306, 304, 303, + 302, 301, 300, 299, 298, 297, 296, 294, 293, 292, + 291, 289, 288, 287, 286, 285, 284, 283, 281, 279, + 277, 274, 273, 267, 260, 259, 258, 257, 256, 255, - 252, 251, 250, 249, 248, 247, 246, 245, 244, 242, - 241, 240, 239, 238, 237, 236, 235, 234, 233, 232, - 231, 230, 229, 228, 227, 226, 225, 224, 223, 222, - 221, 220, 219, 218, 217, 215, 214, 213, 212, 211, - 210, 209, 208, 207, 206, 205, 204, 203, 202, 201, - 200, 199, 197, 196, 195, 194, 193, 191, 188, 186, - 184, 182, 179, 177, 174, 166, 165, 164, 162, 161, - 160, 159, 158, 154, 152, 150, 149, 148, 146, 145, - 144, 143, 141, 140, 139, 138, 137, 136, 135, 134, - 132, 131, 130, 128, 127, 126, 124, 123, 122, 120, + 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, + 243, 242, 241, 240, 239, 238, 237, 236, 235, 234, + 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, + 223, 222, 221, 220, 219, 218, 217, 215, 214, 213, + 212, 211, 210, 209, 208, 207, 206, 205, 204, 203, + 202, 201, 200, 199, 197, 196, 195, 194, 193, 191, + 188, 186, 184, 182, 179, 177, 174, 166, 165, 164, + 162, 161, 160, 159, 158, 154, 152, 150, 149, 148, + 146, 145, 144, 143, 141, 140, 139, 138, 137, 136, + 135, 134, 132, 131, 130, 128, 127, 126, 124, 123, - 119, 118, 117, 113, 107, 104, 102, 97, 96, 77, - 72, 64, 59, 52, 49, 47, 43, 41, 39, 38, - 24, 14, 11, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1160 + 122, 120, 119, 118, 117, 113, 107, 104, 102, 97, + 96, 77, 72, 64, 59, 52, 49, 47, 43, 41, + 39, 38, 24, 14, 11, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + 1163, 1163, 1163, 1163, 1163, 1163, 1163 } ; @@ -1283,23 +1284,24 @@ static char *yy_last_accepting_cpos; extern int parser4__flex_debug; int parser4__flex_debug = 1; -static yyconst flex_int16_t yy_rule_linenum[141] = +static yyconst flex_int16_t yy_rule_linenum[142] = { 0, 130, 132, 134, 139, 140, 145, 146, 147, 159, 162, 167, 174, 183, 192, 201, 210, 220, 229, 238, 247, 256, 267, 276, 285, 294, 303, 313, 323, 333, 343, - 353, 363, 373, 383, 393, 402, 411, 420, 434, 449, - 458, 467, 476, 485, 494, 503, 512, 521, 530, 539, - 549, 558, 567, 576, 585, 594, 603, 612, 622, 632, - 642, 651, 661, 671, 681, 691, 700, 710, 719, 728, - 737, 746, 755, 765, 775, 784, 793, 802, 811, 820, - 829, 838, 847, 856, 865, 874, 883, 892, 901, 910, - 919, 928, 937, 946, 955, 964, 973, 982, 991, 1000, + 353, 363, 373, 383, 393, 403, 412, 421, 430, 444, + 459, 468, 477, 486, 495, 504, 513, 522, 531, 540, + 549, 559, 568, 577, 586, 595, 604, 613, 622, 632, + 642, 652, 661, 671, 681, 691, 701, 710, 720, 729, + 738, 747, 756, 765, 775, 785, 794, 803, 812, 821, + 830, 839, 848, 857, 866, 875, 884, 893, 902, 911, + 920, 929, 938, 947, 956, 965, 974, 983, 992, 1001, - 1009, 1018, 1027, 1036, 1046, 1056, 1066, 1076, 1086, 1096, - 1106, 1116, 1126, 1135, 1144, 1153, 1162, 1171, 1181, 1191, - 1203, 1214, 1227, 1325, 1330, 1335, 1340, 1341, 1342, 1343, - 1344, 1345, 1347, 1365, 1378, 1383, 1387, 1389, 1391, 1393 + 1010, 1019, 1028, 1037, 1046, 1056, 1066, 1076, 1086, 1096, + 1106, 1116, 1126, 1136, 1145, 1154, 1163, 1172, 1181, 1191, + 1201, 1213, 1224, 1237, 1335, 1340, 1345, 1350, 1351, 1352, + 1353, 1354, 1355, 1357, 1375, 1388, 1393, 1397, 1399, 1401, + 1403 } ; /* The intent behind this definition is that it'll catch @@ -1370,7 +1372,7 @@ unsigned int comment_start_line = 0; // by moving it ahead by parser4_leng bytes. parser4_leng specifies the length of the // currently matched token. #define YY_USER_ACTION driver.loc_.columns(parser4_leng); -#line 1374 "dhcp4_lexer.cc" +#line 1376 "dhcp4_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1696,7 +1698,7 @@ YY_DECL } -#line 1700 "dhcp4_lexer.cc" +#line 1702 "dhcp4_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1725,13 +1727,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 >= 1161 ) + if ( yy_current_state >= 1164 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; ++yy_cp; } - while ( yy_current_state != 1160 ); + while ( yy_current_state != 1163 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1750,13 +1752,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 < 141 ) + else if ( yy_act < 142 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], parser4_text ); - else if ( yy_act == 141 ) + else if ( yy_act == 142 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", parser4_text ); - else if ( yy_act == 142 ) + else if ( yy_act == 143 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -2077,9 +2079,9 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: case isc::dhcp::Parser4Context::HOSTS_DATABASE: - return isc::dhcp::Dhcp4Parser::make_PERSIST(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_PORT(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("persist", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("port", driver.loc_); } } YY_BREAK @@ -2090,9 +2092,9 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: case isc::dhcp::Parser4Context::HOSTS_DATABASE: - return isc::dhcp::Dhcp4Parser::make_LFC_INTERVAL(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_PERSIST(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("lfc-interval", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("persist", driver.loc_); } } YY_BREAK @@ -2103,9 +2105,9 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: case isc::dhcp::Parser4Context::HOSTS_DATABASE: - return isc::dhcp::Dhcp4Parser::make_CONNECT_TIMEOUT(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_LFC_INTERVAL(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("connect-timeout", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("lfc-interval", driver.loc_); } } YY_BREAK @@ -2114,11 +2116,11 @@ YY_RULE_SETUP #line 363 "dhcp4_lexer.ll" { switch(driver.ctx_) { - case isc::dhcp::Parser4Context::DHCP4: - case isc::dhcp::Parser4Context::SUBNET4: - return isc::dhcp::Dhcp4Parser::make_VALID_LIFETIME(driver.loc_); + case isc::dhcp::Parser4Context::LEASE_DATABASE: + case isc::dhcp::Parser4Context::HOSTS_DATABASE: + return isc::dhcp::Dhcp4Parser::make_CONNECT_TIMEOUT(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("valid-lifetime", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("connect-timeout", driver.loc_); } } YY_BREAK @@ -2129,9 +2131,9 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: case isc::dhcp::Parser4Context::SUBNET4: - return isc::dhcp::Dhcp4Parser::make_RENEW_TIMER(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_VALID_LIFETIME(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("renew-timer", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("valid-lifetime", driver.loc_); } } YY_BREAK @@ -2142,15 +2144,28 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: case isc::dhcp::Parser4Context::SUBNET4: - return isc::dhcp::Dhcp4Parser::make_REBIND_TIMER(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_RENEW_TIMER(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("rebind-timer", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("renew-timer", driver.loc_); } } YY_BREAK case 35: YY_RULE_SETUP #line 393 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP4: + case isc::dhcp::Parser4Context::SUBNET4: + return isc::dhcp::Dhcp4Parser::make_REBIND_TIMER(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("rebind-timer", driver.loc_); + } +} + YY_BREAK +case 36: +YY_RULE_SETUP +#line 403 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2160,9 +2175,9 @@ YY_RULE_SETUP } } YY_BREAK -case 36: +case 37: YY_RULE_SETUP -#line 402 "dhcp4_lexer.ll" +#line 412 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2172,9 +2187,9 @@ YY_RULE_SETUP } } YY_BREAK -case 37: +case 38: YY_RULE_SETUP -#line 411 "dhcp4_lexer.ll" +#line 421 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2184,9 +2199,9 @@ YY_RULE_SETUP } } YY_BREAK -case 38: +case 39: YY_RULE_SETUP -#line 420 "dhcp4_lexer.ll" +#line 430 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2201,9 +2216,9 @@ YY_RULE_SETUP } } YY_BREAK -case 39: +case 40: YY_RULE_SETUP -#line 434 "dhcp4_lexer.ll" +#line 444 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2219,9 +2234,9 @@ YY_RULE_SETUP } } YY_BREAK -case 40: +case 41: YY_RULE_SETUP -#line 449 "dhcp4_lexer.ll" +#line 459 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DATA: @@ -2231,9 +2246,9 @@ YY_RULE_SETUP } } YY_BREAK -case 41: +case 42: YY_RULE_SETUP -#line 458 "dhcp4_lexer.ll" +#line 468 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2243,9 +2258,9 @@ YY_RULE_SETUP } } YY_BREAK -case 42: +case 43: YY_RULE_SETUP -#line 467 "dhcp4_lexer.ll" +#line 477 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::POOLS: @@ -2255,9 +2270,9 @@ YY_RULE_SETUP } } YY_BREAK -case 43: +case 44: YY_RULE_SETUP -#line 476 "dhcp4_lexer.ll" +#line 486 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::POOLS: @@ -2267,9 +2282,9 @@ YY_RULE_SETUP } } YY_BREAK -case 44: +case 45: YY_RULE_SETUP -#line 485 "dhcp4_lexer.ll" +#line 495 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2279,9 +2294,9 @@ YY_RULE_SETUP } } YY_BREAK -case 45: +case 46: YY_RULE_SETUP -#line 494 "dhcp4_lexer.ll" +#line 504 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2291,9 +2306,9 @@ YY_RULE_SETUP } } YY_BREAK -case 46: +case 47: YY_RULE_SETUP -#line 503 "dhcp4_lexer.ll" +#line 513 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2303,9 +2318,9 @@ YY_RULE_SETUP } } YY_BREAK -case 47: +case 48: YY_RULE_SETUP -#line 512 "dhcp4_lexer.ll" +#line 522 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2315,9 +2330,9 @@ YY_RULE_SETUP } } YY_BREAK -case 48: +case 49: YY_RULE_SETUP -#line 521 "dhcp4_lexer.ll" +#line 531 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2327,9 +2342,9 @@ YY_RULE_SETUP } } YY_BREAK -case 49: +case 50: YY_RULE_SETUP -#line 530 "dhcp4_lexer.ll" +#line 540 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2339,9 +2354,9 @@ YY_RULE_SETUP } } YY_BREAK -case 50: +case 51: YY_RULE_SETUP -#line 539 "dhcp4_lexer.ll" +#line 549 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2352,9 +2367,9 @@ YY_RULE_SETUP } } YY_BREAK -case 51: +case 52: YY_RULE_SETUP -#line 549 "dhcp4_lexer.ll" +#line 559 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2364,9 +2379,9 @@ YY_RULE_SETUP } } YY_BREAK -case 52: +case 53: YY_RULE_SETUP -#line 558 "dhcp4_lexer.ll" +#line 568 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -2376,9 +2391,9 @@ YY_RULE_SETUP } } YY_BREAK -case 53: +case 54: YY_RULE_SETUP -#line 567 "dhcp4_lexer.ll" +#line 577 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGING: @@ -2388,9 +2403,9 @@ YY_RULE_SETUP } } YY_BREAK -case 54: +case 55: YY_RULE_SETUP -#line 576 "dhcp4_lexer.ll" +#line 586 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -2400,9 +2415,9 @@ YY_RULE_SETUP } } YY_BREAK -case 55: +case 56: YY_RULE_SETUP -#line 585 "dhcp4_lexer.ll" +#line 595 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OUTPUT_OPTIONS: @@ -2412,9 +2427,9 @@ YY_RULE_SETUP } } YY_BREAK -case 56: +case 57: YY_RULE_SETUP -#line 594 "dhcp4_lexer.ll" +#line 604 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -2424,9 +2439,9 @@ YY_RULE_SETUP } } YY_BREAK -case 57: +case 58: YY_RULE_SETUP -#line 603 "dhcp4_lexer.ll" +#line 613 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -2436,9 +2451,9 @@ YY_RULE_SETUP } } YY_BREAK -case 58: +case 59: YY_RULE_SETUP -#line 612 "dhcp4_lexer.ll" +#line 622 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2449,9 +2464,9 @@ YY_RULE_SETUP } } YY_BREAK -case 59: +case 60: YY_RULE_SETUP -#line 622 "dhcp4_lexer.ll" +#line 632 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2462,9 +2477,9 @@ YY_RULE_SETUP } } YY_BREAK -case 60: +case 61: YY_RULE_SETUP -#line 632 "dhcp4_lexer.ll" +#line 642 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CLIENT_CLASSES: @@ -2475,9 +2490,9 @@ YY_RULE_SETUP } } YY_BREAK -case 61: +case 62: YY_RULE_SETUP -#line 642 "dhcp4_lexer.ll" +#line 652 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2487,19 +2502,6 @@ YY_RULE_SETUP } } YY_BREAK -case 62: -YY_RULE_SETUP -#line 651 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: - case isc::dhcp::Parser4Context::RESERVATIONS: - return isc::dhcp::Dhcp4Parser::make_DUID(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("duid", driver.loc_); - } -} - YY_BREAK case 63: YY_RULE_SETUP #line 661 "dhcp4_lexer.ll" @@ -2507,9 +2509,9 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: case isc::dhcp::Parser4Context::RESERVATIONS: - return isc::dhcp::Dhcp4Parser::make_HW_ADDRESS(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_DUID(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("hw-address", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("duid", driver.loc_); } } YY_BREAK @@ -2520,9 +2522,9 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: case isc::dhcp::Parser4Context::RESERVATIONS: - return isc::dhcp::Dhcp4Parser::make_CLIENT_ID(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_HW_ADDRESS(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("client-id", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("hw-address", driver.loc_); } } YY_BREAK @@ -2533,15 +2535,28 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: case isc::dhcp::Parser4Context::RESERVATIONS: - return isc::dhcp::Dhcp4Parser::make_CIRCUIT_ID(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_CLIENT_ID(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("circuit-id", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("client-id", driver.loc_); } } YY_BREAK case 66: YY_RULE_SETUP #line 691 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: + case isc::dhcp::Parser4Context::RESERVATIONS: + return isc::dhcp::Dhcp4Parser::make_CIRCUIT_ID(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("circuit-id", driver.loc_); + } +} + YY_BREAK +case 67: +YY_RULE_SETUP +#line 701 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RESERVATIONS: @@ -2551,9 +2566,9 @@ YY_RULE_SETUP } } YY_BREAK -case 67: +case 68: YY_RULE_SETUP -#line 700 "dhcp4_lexer.ll" +#line 710 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2564,9 +2579,9 @@ YY_RULE_SETUP } } YY_BREAK -case 68: +case 69: YY_RULE_SETUP -#line 710 "dhcp4_lexer.ll" +#line 720 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DATA: @@ -2576,9 +2591,9 @@ YY_RULE_SETUP } } YY_BREAK -case 69: +case 70: YY_RULE_SETUP -#line 719 "dhcp4_lexer.ll" +#line 729 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2588,9 +2603,9 @@ YY_RULE_SETUP } } YY_BREAK -case 70: +case 71: YY_RULE_SETUP -#line 728 "dhcp4_lexer.ll" +#line 738 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2600,9 +2615,9 @@ YY_RULE_SETUP } } YY_BREAK -case 71: +case 72: YY_RULE_SETUP -#line 737 "dhcp4_lexer.ll" +#line 747 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2612,9 +2627,9 @@ YY_RULE_SETUP } } YY_BREAK -case 72: +case 73: YY_RULE_SETUP -#line 746 "dhcp4_lexer.ll" +#line 756 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2624,9 +2639,9 @@ YY_RULE_SETUP } } YY_BREAK -case 73: +case 74: YY_RULE_SETUP -#line 755 "dhcp4_lexer.ll" +#line 765 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RELAY: @@ -2637,9 +2652,9 @@ YY_RULE_SETUP } } YY_BREAK -case 74: +case 75: YY_RULE_SETUP -#line 765 "dhcp4_lexer.ll" +#line 775 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2649,9 +2664,9 @@ YY_RULE_SETUP } } YY_BREAK -case 75: +case 76: YY_RULE_SETUP -#line 775 "dhcp4_lexer.ll" +#line 785 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOOKS_LIBRARIES: @@ -2661,9 +2676,9 @@ YY_RULE_SETUP } } YY_BREAK -case 76: +case 77: YY_RULE_SETUP -#line 784 "dhcp4_lexer.ll" +#line 794 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOOKS_LIBRARIES: @@ -2673,9 +2688,9 @@ YY_RULE_SETUP } } YY_BREAK -case 77: +case 78: YY_RULE_SETUP -#line 793 "dhcp4_lexer.ll" +#line 803 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2685,9 +2700,9 @@ YY_RULE_SETUP } } YY_BREAK -case 78: +case 79: YY_RULE_SETUP -#line 802 "dhcp4_lexer.ll" +#line 812 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2697,9 +2712,9 @@ YY_RULE_SETUP } } YY_BREAK -case 79: +case 80: YY_RULE_SETUP -#line 811 "dhcp4_lexer.ll" +#line 821 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2709,9 +2724,9 @@ YY_RULE_SETUP } } YY_BREAK -case 80: +case 81: YY_RULE_SETUP -#line 820 "dhcp4_lexer.ll" +#line 830 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2721,9 +2736,9 @@ YY_RULE_SETUP } } YY_BREAK -case 81: +case 82: YY_RULE_SETUP -#line 829 "dhcp4_lexer.ll" +#line 839 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2733,9 +2748,9 @@ YY_RULE_SETUP } } YY_BREAK -case 82: +case 83: YY_RULE_SETUP -#line 838 "dhcp4_lexer.ll" +#line 848 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2745,9 +2760,9 @@ YY_RULE_SETUP } } YY_BREAK -case 83: +case 84: YY_RULE_SETUP -#line 847 "dhcp4_lexer.ll" +#line 857 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2757,9 +2772,9 @@ YY_RULE_SETUP } } YY_BREAK -case 84: +case 85: YY_RULE_SETUP -#line 856 "dhcp4_lexer.ll" +#line 866 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2769,9 +2784,9 @@ YY_RULE_SETUP } } YY_BREAK -case 85: +case 86: YY_RULE_SETUP -#line 865 "dhcp4_lexer.ll" +#line 875 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2781,9 +2796,9 @@ YY_RULE_SETUP } } YY_BREAK -case 86: +case 87: YY_RULE_SETUP -#line 874 "dhcp4_lexer.ll" +#line 884 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONTROL_SOCKET: @@ -2793,9 +2808,9 @@ YY_RULE_SETUP } } YY_BREAK -case 87: +case 88: YY_RULE_SETUP -#line 883 "dhcp4_lexer.ll" +#line 893 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONTROL_SOCKET: @@ -2805,9 +2820,9 @@ YY_RULE_SETUP } } YY_BREAK -case 88: +case 89: YY_RULE_SETUP -#line 892 "dhcp4_lexer.ll" +#line 902 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2817,9 +2832,9 @@ YY_RULE_SETUP } } YY_BREAK -case 89: +case 90: YY_RULE_SETUP -#line 901 "dhcp4_lexer.ll" +#line 911 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2829,9 +2844,9 @@ YY_RULE_SETUP } } YY_BREAK -case 90: +case 91: YY_RULE_SETUP -#line 910 "dhcp4_lexer.ll" +#line 920 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2841,9 +2856,9 @@ YY_RULE_SETUP } } YY_BREAK -case 91: +case 92: YY_RULE_SETUP -#line 919 "dhcp4_lexer.ll" +#line 929 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2853,9 +2868,9 @@ YY_RULE_SETUP } } YY_BREAK -case 92: +case 93: YY_RULE_SETUP -#line 928 "dhcp4_lexer.ll" +#line 938 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2865,9 +2880,9 @@ YY_RULE_SETUP } } YY_BREAK -case 93: +case 94: YY_RULE_SETUP -#line 937 "dhcp4_lexer.ll" +#line 947 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2877,9 +2892,9 @@ YY_RULE_SETUP } } YY_BREAK -case 94: +case 95: YY_RULE_SETUP -#line 946 "dhcp4_lexer.ll" +#line 956 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2889,9 +2904,9 @@ YY_RULE_SETUP } } YY_BREAK -case 95: +case 96: YY_RULE_SETUP -#line 955 "dhcp4_lexer.ll" +#line 965 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2901,9 +2916,9 @@ YY_RULE_SETUP } } YY_BREAK -case 96: +case 97: YY_RULE_SETUP -#line 964 "dhcp4_lexer.ll" +#line 974 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2913,9 +2928,9 @@ YY_RULE_SETUP } } YY_BREAK -case 97: +case 98: YY_RULE_SETUP -#line 973 "dhcp4_lexer.ll" +#line 983 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2925,9 +2940,9 @@ YY_RULE_SETUP } } YY_BREAK -case 98: +case 99: YY_RULE_SETUP -#line 982 "dhcp4_lexer.ll" +#line 992 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2937,9 +2952,9 @@ YY_RULE_SETUP } } YY_BREAK -case 99: +case 100: YY_RULE_SETUP -#line 991 "dhcp4_lexer.ll" +#line 1001 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2949,9 +2964,9 @@ YY_RULE_SETUP } } YY_BREAK -case 100: +case 101: YY_RULE_SETUP -#line 1000 "dhcp4_lexer.ll" +#line 1010 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2961,9 +2976,9 @@ YY_RULE_SETUP } } YY_BREAK -case 101: +case 102: YY_RULE_SETUP -#line 1009 "dhcp4_lexer.ll" +#line 1019 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2973,9 +2988,9 @@ YY_RULE_SETUP } } YY_BREAK -case 102: +case 103: YY_RULE_SETUP -#line 1018 "dhcp4_lexer.ll" +#line 1028 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2985,9 +3000,9 @@ YY_RULE_SETUP } } YY_BREAK -case 103: +case 104: YY_RULE_SETUP -#line 1027 "dhcp4_lexer.ll" +#line 1037 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2997,26 +3012,13 @@ YY_RULE_SETUP } } YY_BREAK -case 104: -YY_RULE_SETUP -#line 1036 "dhcp4_lexer.ll" -{ - /* dhcp-ddns value keywords are case insensitive */ - if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { - return isc::dhcp::Dhcp4Parser::make_UDP(driver.loc_); - } - std::string tmp(parser4_text+1); - tmp.resize(tmp.size() - 1); - return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); -} - YY_BREAK case 105: YY_RULE_SETUP #line 1046 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { - return isc::dhcp::Dhcp4Parser::make_TCP(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_UDP(driver.loc_); } std::string tmp(parser4_text+1); tmp.resize(tmp.size() - 1); @@ -3028,8 +3030,8 @@ YY_RULE_SETUP #line 1056 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ - if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_FORMAT) { - return isc::dhcp::Dhcp4Parser::make_JSON(driver.loc_); + if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { + return isc::dhcp::Dhcp4Parser::make_TCP(driver.loc_); } std::string tmp(parser4_text+1); tmp.resize(tmp.size() - 1); @@ -3041,8 +3043,8 @@ YY_RULE_SETUP #line 1066 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ - if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { - return isc::dhcp::Dhcp4Parser::make_WHEN_PRESENT(driver.loc_); + if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_FORMAT) { + return isc::dhcp::Dhcp4Parser::make_JSON(driver.loc_); } std::string tmp(parser4_text+1); tmp.resize(tmp.size() - 1); @@ -3068,7 +3070,7 @@ YY_RULE_SETUP { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { - return isc::dhcp::Dhcp4Parser::make_NEVER(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_WHEN_PRESENT(driver.loc_); } std::string tmp(parser4_text+1); tmp.resize(tmp.size() - 1); @@ -3094,7 +3096,7 @@ YY_RULE_SETUP { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { - return isc::dhcp::Dhcp4Parser::make_ALWAYS(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_NEVER(driver.loc_); } std::string tmp(parser4_text+1); tmp.resize(tmp.size() - 1); @@ -3107,7 +3109,7 @@ YY_RULE_SETUP { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { - return isc::dhcp::Dhcp4Parser::make_WHEN_NOT_PRESENT(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_ALWAYS(driver.loc_); } std::string tmp(parser4_text+1); tmp.resize(tmp.size() - 1); @@ -3117,6 +3119,19 @@ YY_RULE_SETUP case 113: YY_RULE_SETUP #line 1126 "dhcp4_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_WHEN_NOT_PRESENT(driver.loc_); + } + std::string tmp(parser4_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 114: +YY_RULE_SETUP +#line 1136 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -3126,9 +3141,9 @@ YY_RULE_SETUP } } YY_BREAK -case 114: +case 115: YY_RULE_SETUP -#line 1135 "dhcp4_lexer.ll" +#line 1145 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -3138,9 +3153,9 @@ YY_RULE_SETUP } } YY_BREAK -case 115: +case 116: YY_RULE_SETUP -#line 1144 "dhcp4_lexer.ll" +#line 1154 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3150,9 +3165,9 @@ YY_RULE_SETUP } } YY_BREAK -case 116: +case 117: YY_RULE_SETUP -#line 1153 "dhcp4_lexer.ll" +#line 1163 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3162,9 +3177,9 @@ YY_RULE_SETUP } } YY_BREAK -case 117: +case 118: YY_RULE_SETUP -#line 1162 "dhcp4_lexer.ll" +#line 1172 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3174,19 +3189,6 @@ YY_RULE_SETUP } } YY_BREAK -case 118: -YY_RULE_SETUP -#line 1171 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::DHCP4: - case isc::dhcp::Parser4Context::SUBNET4: - return isc::dhcp::Dhcp4Parser::make_ECHO_CLIENT_ID(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("echo-client-id", driver.loc_); - } -} - YY_BREAK case 119: YY_RULE_SETUP #line 1181 "dhcp4_lexer.ll" @@ -3194,15 +3196,28 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: case isc::dhcp::Parser4Context::SUBNET4: - return isc::dhcp::Dhcp4Parser::make_MATCH_CLIENT_ID(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_ECHO_CLIENT_ID(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("match-client-id", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("echo-client-id", driver.loc_); } } YY_BREAK case 120: YY_RULE_SETUP #line 1191 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP4: + case isc::dhcp::Parser4Context::SUBNET4: + return isc::dhcp::Dhcp4Parser::make_MATCH_CLIENT_ID(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("match-client-id", driver.loc_); + } +} + YY_BREAK +case 121: +YY_RULE_SETUP +#line 1201 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3215,9 +3230,9 @@ YY_RULE_SETUP } } YY_BREAK -case 121: +case 122: YY_RULE_SETUP -#line 1203 "dhcp4_lexer.ll" +#line 1213 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3229,9 +3244,9 @@ YY_RULE_SETUP } } YY_BREAK -case 122: +case 123: YY_RULE_SETUP -#line 1214 "dhcp4_lexer.ll" +#line 1224 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3243,9 +3258,9 @@ YY_RULE_SETUP } } YY_BREAK -case 123: +case 124: YY_RULE_SETUP -#line 1227 "dhcp4_lexer.ll" +#line 1237 "dhcp4_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. @@ -3344,65 +3359,65 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(decoded, driver.loc_); } YY_BREAK -case 124: -/* rule 124 can match eol */ +case 125: +/* rule 125 can match eol */ YY_RULE_SETUP -#line 1325 "dhcp4_lexer.ll" +#line 1335 "dhcp4_lexer.ll" { // Bad string with a forbidden control character inside driver.error(driver.loc_, "Invalid control in " + std::string(parser4_text)); } YY_BREAK -case 125: -/* rule 125 can match eol */ +case 126: +/* rule 126 can match eol */ YY_RULE_SETUP -#line 1330 "dhcp4_lexer.ll" +#line 1340 "dhcp4_lexer.ll" { // Bad string with a bad escape inside driver.error(driver.loc_, "Bad escape in " + std::string(parser4_text)); } YY_BREAK -case 126: +case 127: YY_RULE_SETUP -#line 1335 "dhcp4_lexer.ll" +#line 1345 "dhcp4_lexer.ll" { // Bad string with an open escape at the end driver.error(driver.loc_, "Overflow escape in " + std::string(parser4_text)); } YY_BREAK -case 127: -YY_RULE_SETUP -#line 1340 "dhcp4_lexer.ll" -{ return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); } - YY_BREAK case 128: YY_RULE_SETUP -#line 1341 "dhcp4_lexer.ll" -{ return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); } +#line 1350 "dhcp4_lexer.ll" +{ return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK case 129: YY_RULE_SETUP -#line 1342 "dhcp4_lexer.ll" -{ return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); } +#line 1351 "dhcp4_lexer.ll" +{ return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK case 130: YY_RULE_SETUP -#line 1343 "dhcp4_lexer.ll" -{ return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); } +#line 1352 "dhcp4_lexer.ll" +{ return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK case 131: YY_RULE_SETUP -#line 1344 "dhcp4_lexer.ll" -{ return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); } +#line 1353 "dhcp4_lexer.ll" +{ return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK case 132: YY_RULE_SETUP -#line 1345 "dhcp4_lexer.ll" -{ return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); } +#line 1354 "dhcp4_lexer.ll" +{ return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); } YY_BREAK case 133: YY_RULE_SETUP -#line 1347 "dhcp4_lexer.ll" +#line 1355 "dhcp4_lexer.ll" +{ return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); } + YY_BREAK +case 134: +YY_RULE_SETUP +#line 1357 "dhcp4_lexer.ll" { // An integer was found. std::string tmp(parser4_text); @@ -3421,9 +3436,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_INTEGER(integer, driver.loc_); } YY_BREAK -case 134: +case 135: YY_RULE_SETUP -#line 1365 "dhcp4_lexer.ll" +#line 1375 "dhcp4_lexer.ll" { // A floating point was found. std::string tmp(parser4_text); @@ -3437,43 +3452,43 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_FLOAT(fp, driver.loc_); } YY_BREAK -case 135: +case 136: YY_RULE_SETUP -#line 1378 "dhcp4_lexer.ll" +#line 1388 "dhcp4_lexer.ll" { string tmp(parser4_text); return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_); } YY_BREAK -case 136: +case 137: YY_RULE_SETUP -#line 1383 "dhcp4_lexer.ll" +#line 1393 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK -case 137: -YY_RULE_SETUP -#line 1387 "dhcp4_lexer.ll" -driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); - YY_BREAK case 138: YY_RULE_SETUP -#line 1389 "dhcp4_lexer.ll" -driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); +#line 1397 "dhcp4_lexer.ll" +driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK case 139: YY_RULE_SETUP -#line 1391 "dhcp4_lexer.ll" -driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); +#line 1399 "dhcp4_lexer.ll" +driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK case 140: YY_RULE_SETUP -#line 1393 "dhcp4_lexer.ll" +#line 1401 "dhcp4_lexer.ll" +driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); + YY_BREAK +case 141: +YY_RULE_SETUP +#line 1403 "dhcp4_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(parser4_text)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 1395 "dhcp4_lexer.ll" +#line 1405 "dhcp4_lexer.ll" { if (driver.states_.empty()) { return isc::dhcp::Dhcp4Parser::make_END(driver.loc_); @@ -3497,12 +3512,12 @@ case YY_STATE_EOF(INITIAL): BEGIN(DIR_EXIT); } YY_BREAK -case 141: +case 142: YY_RULE_SETUP -#line 1418 "dhcp4_lexer.ll" +#line 1428 "dhcp4_lexer.ll" ECHO; YY_BREAK -#line 3506 "dhcp4_lexer.cc" +#line 3521 "dhcp4_lexer.cc" case YY_END_OF_BUFFER: { @@ -3819,7 +3834,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 >= 1161 ) + if ( yy_current_state >= 1164 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; @@ -3852,11 +3867,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 >= 1161 ) + if ( yy_current_state >= 1164 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - yy_is_jam = (yy_current_state == 1160); + yy_is_jam = (yy_current_state == 1163); return yy_is_jam ? 0 : yy_current_state; } @@ -4605,7 +4620,7 @@ void parser4_free (void * ptr ) /* %ok-for-header */ -#line 1418 "dhcp4_lexer.ll" +#line 1428 "dhcp4_lexer.ll" diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc index 3a76f26f16..771a90e076 100644 --- a/src/bin/dhcp4/dhcp4_parser.cc +++ b/src/bin/dhcp4/dhcp4_parser.cc @@ -253,28 +253,28 @@ namespace isc { namespace dhcp { { switch (that.type_get ()) { - case 146: // value - case 150: // map_value - case 188: // socket_type - case 197: // db_type - case 397: // ncr_protocol_value - case 406: // replace_client_name_value + case 147: // value + case 151: // map_value + case 189: // socket_type + case 198: // db_type + case 399: // ncr_protocol_value + case 408: // replace_client_name_value value.move< ElementPtr > (that.value); break; - case 132: // "boolean" + case 133: // "boolean" value.move< bool > (that.value); break; - case 131: // "floating point" + case 132: // "floating point" value.move< double > (that.value); break; - case 130: // "integer" + case 131: // "integer" value.move< int64_t > (that.value); break; - case 129: // "constant string" + case 130: // "constant string" value.move< std::string > (that.value); break; @@ -293,28 +293,28 @@ namespace isc { namespace dhcp { state = that.state; switch (that.type_get ()) { - case 146: // value - case 150: // map_value - case 188: // socket_type - case 197: // db_type - case 397: // ncr_protocol_value - case 406: // replace_client_name_value + case 147: // value + case 151: // map_value + case 189: // socket_type + case 198: // db_type + case 399: // ncr_protocol_value + case 408: // replace_client_name_value value.copy< ElementPtr > (that.value); break; - case 132: // "boolean" + case 133: // "boolean" value.copy< bool > (that.value); break; - case 131: // "floating point" + case 132: // "floating point" value.copy< double > (that.value); break; - case 130: // "integer" + case 131: // "integer" value.copy< int64_t > (that.value); break; - case 129: // "constant string" + case 130: // "constant string" value.copy< std::string > (that.value); break; @@ -354,72 +354,72 @@ namespace isc { namespace dhcp { << yysym.location << ": "; switch (yytype) { - case 129: // "constant string" + case 130: // "constant string" -#line 204 "dhcp4_parser.yy" // lalr1.cc:636 +#line 205 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 362 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 130: // "integer" + case 131: // "integer" -#line 204 "dhcp4_parser.yy" // lalr1.cc:636 +#line 205 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< int64_t > (); } #line 369 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 131: // "floating point" + case 132: // "floating point" -#line 204 "dhcp4_parser.yy" // lalr1.cc:636 +#line 205 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< double > (); } #line 376 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 132: // "boolean" + case 133: // "boolean" -#line 204 "dhcp4_parser.yy" // lalr1.cc:636 +#line 205 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< bool > (); } #line 383 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 146: // value + case 147: // value -#line 204 "dhcp4_parser.yy" // lalr1.cc:636 +#line 205 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 390 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 150: // map_value + case 151: // map_value -#line 204 "dhcp4_parser.yy" // lalr1.cc:636 +#line 205 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 397 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 188: // socket_type + case 189: // socket_type -#line 204 "dhcp4_parser.yy" // lalr1.cc:636 +#line 205 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 404 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 197: // db_type + case 198: // db_type -#line 204 "dhcp4_parser.yy" // lalr1.cc:636 +#line 205 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 411 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 397: // ncr_protocol_value + case 399: // ncr_protocol_value -#line 204 "dhcp4_parser.yy" // lalr1.cc:636 +#line 205 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 418 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 406: // replace_client_name_value + case 408: // replace_client_name_value -#line 204 "dhcp4_parser.yy" // lalr1.cc:636 +#line 205 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 425 "dhcp4_parser.cc" // lalr1.cc:636 break; @@ -621,28 +621,28 @@ namespace isc { namespace dhcp { when using variants. */ switch (yyr1_[yyn]) { - case 146: // value - case 150: // map_value - case 188: // socket_type - case 197: // db_type - case 397: // ncr_protocol_value - case 406: // replace_client_name_value + case 147: // value + case 151: // map_value + case 189: // socket_type + case 198: // db_type + case 399: // ncr_protocol_value + case 408: // replace_client_name_value yylhs.value.build< ElementPtr > (); break; - case 132: // "boolean" + case 133: // "boolean" yylhs.value.build< bool > (); break; - case 131: // "floating point" + case 132: // "floating point" yylhs.value.build< double > (); break; - case 130: // "integer" + case 131: // "integer" yylhs.value.build< int64_t > (); break; - case 129: // "constant string" + case 130: // "constant string" yylhs.value.build< std::string > (); break; @@ -664,115 +664,115 @@ namespace isc { namespace dhcp { switch (yyn) { case 2: -#line 213 "dhcp4_parser.yy" // lalr1.cc:859 +#line 214 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.NO_KEYWORD; } #line 670 "dhcp4_parser.cc" // lalr1.cc:859 break; case 4: -#line 214 "dhcp4_parser.yy" // lalr1.cc:859 +#line 215 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.CONFIG; } #line 676 "dhcp4_parser.cc" // lalr1.cc:859 break; case 6: -#line 215 "dhcp4_parser.yy" // lalr1.cc:859 +#line 216 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.DHCP4; } #line 682 "dhcp4_parser.cc" // lalr1.cc:859 break; case 8: -#line 216 "dhcp4_parser.yy" // lalr1.cc:859 +#line 217 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.INTERFACES_CONFIG; } #line 688 "dhcp4_parser.cc" // lalr1.cc:859 break; case 10: -#line 217 "dhcp4_parser.yy" // lalr1.cc:859 +#line 218 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.SUBNET4; } #line 694 "dhcp4_parser.cc" // lalr1.cc:859 break; case 12: -#line 218 "dhcp4_parser.yy" // lalr1.cc:859 +#line 219 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.POOLS; } #line 700 "dhcp4_parser.cc" // lalr1.cc:859 break; case 14: -#line 219 "dhcp4_parser.yy" // lalr1.cc:859 +#line 220 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.RESERVATIONS; } #line 706 "dhcp4_parser.cc" // lalr1.cc:859 break; case 16: -#line 220 "dhcp4_parser.yy" // lalr1.cc:859 +#line 221 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.OPTION_DEF; } #line 712 "dhcp4_parser.cc" // lalr1.cc:859 break; case 18: -#line 221 "dhcp4_parser.yy" // lalr1.cc:859 +#line 222 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.OPTION_DATA; } #line 718 "dhcp4_parser.cc" // lalr1.cc:859 break; case 20: -#line 222 "dhcp4_parser.yy" // lalr1.cc:859 +#line 223 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.HOOKS_LIBRARIES; } #line 724 "dhcp4_parser.cc" // lalr1.cc:859 break; case 22: -#line 223 "dhcp4_parser.yy" // lalr1.cc:859 +#line 224 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.DHCP_DDNS; } #line 730 "dhcp4_parser.cc" // lalr1.cc:859 break; case 24: -#line 231 "dhcp4_parser.yy" // lalr1.cc:859 +#line 232 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); } #line 736 "dhcp4_parser.cc" // lalr1.cc:859 break; case 25: -#line 232 "dhcp4_parser.yy" // lalr1.cc:859 +#line 233 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); } #line 742 "dhcp4_parser.cc" // lalr1.cc:859 break; case 26: -#line 233 "dhcp4_parser.yy" // lalr1.cc:859 +#line 234 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); } #line 748 "dhcp4_parser.cc" // lalr1.cc:859 break; case 27: -#line 234 "dhcp4_parser.yy" // lalr1.cc:859 +#line 235 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); } #line 754 "dhcp4_parser.cc" // lalr1.cc:859 break; case 28: -#line 235 "dhcp4_parser.yy" // lalr1.cc:859 +#line 236 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); } #line 760 "dhcp4_parser.cc" // lalr1.cc:859 break; case 29: -#line 236 "dhcp4_parser.yy" // lalr1.cc:859 +#line 237 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 766 "dhcp4_parser.cc" // lalr1.cc:859 break; case 30: -#line 237 "dhcp4_parser.yy" // lalr1.cc:859 +#line 238 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 772 "dhcp4_parser.cc" // lalr1.cc:859 break; case 31: -#line 240 "dhcp4_parser.yy" // lalr1.cc:859 +#line 241 "dhcp4_parser.yy" // lalr1.cc:859 { // Push back the JSON value on the stack ctx.stack_.push_back(yystack_[0].value.as< ElementPtr > ()); @@ -781,7 +781,7 @@ namespace isc { namespace dhcp { break; case 32: -#line 245 "dhcp4_parser.yy" // lalr1.cc:859 +#line 246 "dhcp4_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -792,7 +792,7 @@ namespace isc { namespace dhcp { break; case 33: -#line 250 "dhcp4_parser.yy" // lalr1.cc:859 +#line 251 "dhcp4_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -802,13 +802,13 @@ namespace isc { namespace dhcp { break; case 34: -#line 256 "dhcp4_parser.yy" // lalr1.cc:859 +#line 257 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 808 "dhcp4_parser.cc" // lalr1.cc:859 break; case 37: -#line 263 "dhcp4_parser.yy" // lalr1.cc:859 +#line 264 "dhcp4_parser.yy" // lalr1.cc:859 { // map containing a single entry ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ()); @@ -817,7 +817,7 @@ namespace isc { namespace dhcp { break; case 38: -#line 267 "dhcp4_parser.yy" // lalr1.cc:859 +#line 268 "dhcp4_parser.yy" // lalr1.cc:859 { // map consisting of a shorter map followed by // comma and string:value @@ -827,7 +827,7 @@ namespace isc { namespace dhcp { break; case 39: -#line 274 "dhcp4_parser.yy" // lalr1.cc:859 +#line 275 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(l); @@ -836,7 +836,7 @@ namespace isc { namespace dhcp { break; case 40: -#line 277 "dhcp4_parser.yy" // lalr1.cc:859 +#line 278 "dhcp4_parser.yy" // lalr1.cc:859 { // list parsing complete. Put any sanity checking here } @@ -844,7 +844,7 @@ namespace isc { namespace dhcp { break; case 43: -#line 285 "dhcp4_parser.yy" // lalr1.cc:859 +#line 286 "dhcp4_parser.yy" // lalr1.cc:859 { // List consisting of a single element. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); @@ -853,7 +853,7 @@ namespace isc { namespace dhcp { break; case 44: -#line 289 "dhcp4_parser.yy" // lalr1.cc:859 +#line 290 "dhcp4_parser.yy" // lalr1.cc:859 { // List ending with , and a value. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); @@ -862,7 +862,7 @@ namespace isc { namespace dhcp { break; case 45: -#line 296 "dhcp4_parser.yy" // lalr1.cc:859 +#line 297 "dhcp4_parser.yy" // lalr1.cc:859 { // List parsing about to start } @@ -870,7 +870,7 @@ namespace isc { namespace dhcp { break; case 46: -#line 298 "dhcp4_parser.yy" // lalr1.cc:859 +#line 299 "dhcp4_parser.yy" // lalr1.cc:859 { // list parsing complete. Put any sanity checking here //ctx.stack_.pop_back(); @@ -879,7 +879,7 @@ namespace isc { namespace dhcp { break; case 49: -#line 307 "dhcp4_parser.yy" // lalr1.cc:859 +#line 308 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(s); @@ -888,7 +888,7 @@ namespace isc { namespace dhcp { break; case 50: -#line 311 "dhcp4_parser.yy" // lalr1.cc:859 +#line 312 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(s); @@ -897,7 +897,7 @@ namespace isc { namespace dhcp { break; case 51: -#line 322 "dhcp4_parser.yy" // lalr1.cc:859 +#line 323 "dhcp4_parser.yy" // lalr1.cc:859 { const std::string& where = ctx.contextName(); const std::string& keyword = yystack_[1].value.as< std::string > (); @@ -908,7 +908,7 @@ namespace isc { namespace dhcp { break; case 52: -#line 332 "dhcp4_parser.yy" // lalr1.cc:859 +#line 333 "dhcp4_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -919,7 +919,7 @@ namespace isc { namespace dhcp { break; case 53: -#line 337 "dhcp4_parser.yy" // lalr1.cc:859 +#line 338 "dhcp4_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -929,7 +929,7 @@ namespace isc { namespace dhcp { break; case 61: -#line 356 "dhcp4_parser.yy" // lalr1.cc:859 +#line 357 "dhcp4_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -942,7 +942,7 @@ namespace isc { namespace dhcp { break; case 62: -#line 363 "dhcp4_parser.yy" // lalr1.cc:859 +#line 364 "dhcp4_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -954,7 +954,7 @@ namespace isc { namespace dhcp { break; case 63: -#line 373 "dhcp4_parser.yy" // lalr1.cc:859 +#line 374 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the Dhcp4 map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -964,7 +964,7 @@ namespace isc { namespace dhcp { break; case 64: -#line 377 "dhcp4_parser.yy" // lalr1.cc:859 +#line 378 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } @@ -972,7 +972,7 @@ namespace isc { namespace dhcp { break; case 88: -#line 410 "dhcp4_parser.yy" // lalr1.cc:859 +#line 411 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("valid-lifetime", prf); @@ -981,7 +981,7 @@ namespace isc { namespace dhcp { break; case 89: -#line 415 "dhcp4_parser.yy" // lalr1.cc:859 +#line 416 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("renew-timer", prf); @@ -990,7 +990,7 @@ namespace isc { namespace dhcp { break; case 90: -#line 420 "dhcp4_parser.yy" // lalr1.cc:859 +#line 421 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("rebind-timer", prf); @@ -999,7 +999,7 @@ namespace isc { namespace dhcp { break; case 91: -#line 425 "dhcp4_parser.yy" // lalr1.cc:859 +#line 426 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("decline-probation-period", dpp); @@ -1008,7 +1008,7 @@ namespace isc { namespace dhcp { break; case 92: -#line 430 "dhcp4_parser.yy" // lalr1.cc:859 +#line 431 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr echo(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("echo-client-id", echo); @@ -1017,7 +1017,7 @@ namespace isc { namespace dhcp { break; case 93: -#line 435 "dhcp4_parser.yy" // lalr1.cc:859 +#line 436 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr match(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("match-client-id", match); @@ -1026,7 +1026,7 @@ namespace isc { namespace dhcp { break; case 94: -#line 441 "dhcp4_parser.yy" // lalr1.cc:859 +#line 442 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interfaces-config", i); @@ -1037,7 +1037,7 @@ namespace isc { namespace dhcp { break; case 95: -#line 446 "dhcp4_parser.yy" // lalr1.cc:859 +#line 447 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1046,7 +1046,7 @@ namespace isc { namespace dhcp { break; case 100: -#line 459 "dhcp4_parser.yy" // lalr1.cc:859 +#line 460 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the interfaces-config map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -1056,7 +1056,7 @@ namespace isc { namespace dhcp { break; case 101: -#line 463 "dhcp4_parser.yy" // lalr1.cc:859 +#line 464 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } @@ -1064,7 +1064,7 @@ namespace isc { namespace dhcp { break; case 102: -#line 467 "dhcp4_parser.yy" // lalr1.cc:859 +#line 468 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interfaces", l); @@ -1075,7 +1075,7 @@ namespace isc { namespace dhcp { break; case 103: -#line 472 "dhcp4_parser.yy" // lalr1.cc:859 +#line 473 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1084,7 +1084,7 @@ namespace isc { namespace dhcp { break; case 104: -#line 477 "dhcp4_parser.yy" // lalr1.cc:859 +#line 478 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.DHCP_SOCKET_TYPE); } @@ -1092,7 +1092,7 @@ namespace isc { namespace dhcp { break; case 105: -#line 479 "dhcp4_parser.yy" // lalr1.cc:859 +#line 480 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("dhcp-socket-type", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); @@ -1101,19 +1101,19 @@ namespace isc { namespace dhcp { break; case 106: -#line 484 "dhcp4_parser.yy" // lalr1.cc:859 +#line 485 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("raw", ctx.loc2pos(yystack_[0].location))); } #line 1107 "dhcp4_parser.cc" // lalr1.cc:859 break; case 107: -#line 485 "dhcp4_parser.yy" // lalr1.cc:859 +#line 486 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("udp", ctx.loc2pos(yystack_[0].location))); } #line 1113 "dhcp4_parser.cc" // lalr1.cc:859 break; case 108: -#line 488 "dhcp4_parser.yy" // lalr1.cc:859 +#line 489 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("lease-database", i); @@ -1124,7 +1124,7 @@ namespace isc { namespace dhcp { break; case 109: -#line 493 "dhcp4_parser.yy" // lalr1.cc:859 +#line 494 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1133,7 +1133,7 @@ namespace isc { namespace dhcp { break; case 110: -#line 498 "dhcp4_parser.yy" // lalr1.cc:859 +#line 499 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hosts-database", i); @@ -1144,7 +1144,7 @@ namespace isc { namespace dhcp { break; case 111: -#line 503 "dhcp4_parser.yy" // lalr1.cc:859 +#line 504 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1152,16 +1152,16 @@ namespace isc { namespace dhcp { #line 1153 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 124: -#line 524 "dhcp4_parser.yy" // lalr1.cc:859 + case 125: +#line 526 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.DATABASE_TYPE); } #line 1161 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 125: -#line 526 "dhcp4_parser.yy" // lalr1.cc:859 + case 126: +#line 528 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); @@ -1169,40 +1169,40 @@ namespace isc { namespace dhcp { #line 1170 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 126: -#line 531 "dhcp4_parser.yy" // lalr1.cc:859 + case 127: +#line 533 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); } #line 1176 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 127: -#line 532 "dhcp4_parser.yy" // lalr1.cc:859 + case 128: +#line 534 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); } #line 1182 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 128: -#line 533 "dhcp4_parser.yy" // lalr1.cc:859 + case 129: +#line 535 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); } #line 1188 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 129: -#line 534 "dhcp4_parser.yy" // lalr1.cc:859 + case 130: +#line 536 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); } #line 1194 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 130: -#line 537 "dhcp4_parser.yy" // lalr1.cc:859 + case 131: +#line 539 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1202 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 131: -#line 539 "dhcp4_parser.yy" // lalr1.cc:859 + case 132: +#line 541 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("user", user); @@ -1211,16 +1211,16 @@ namespace isc { namespace dhcp { #line 1212 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 132: -#line 545 "dhcp4_parser.yy" // lalr1.cc:859 + case 133: +#line 547 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1220 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 133: -#line 547 "dhcp4_parser.yy" // lalr1.cc:859 + case 134: +#line 549 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("password", pwd); @@ -1229,16 +1229,16 @@ namespace isc { namespace dhcp { #line 1230 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 134: -#line 553 "dhcp4_parser.yy" // lalr1.cc:859 + case 135: +#line 555 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1238 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 135: -#line 555 "dhcp4_parser.yy" // lalr1.cc:859 + case 136: +#line 557 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("host", h); @@ -1247,313 +1247,322 @@ namespace isc { namespace dhcp { #line 1248 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 136: -#line 561 "dhcp4_parser.yy" // lalr1.cc:859 + case 137: +#line 563 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr p(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("port", p); +} +#line 1257 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 138: +#line 568 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1256 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1265 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 137: -#line 563 "dhcp4_parser.yy" // lalr1.cc:859 + case 139: +#line 570 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("name", name); ctx.leave(); } -#line 1266 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1275 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 138: -#line 569 "dhcp4_parser.yy" // lalr1.cc:859 + case 140: +#line 576 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("persist", n); } -#line 1275 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1284 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 139: -#line 574 "dhcp4_parser.yy" // lalr1.cc:859 + case 141: +#line 581 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("lfc-interval", n); } -#line 1284 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1293 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 140: -#line 579 "dhcp4_parser.yy" // lalr1.cc:859 + case 142: +#line 586 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("readonly", n); } -#line 1293 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1302 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 141: -#line 584 "dhcp4_parser.yy" // lalr1.cc:859 + case 143: +#line 591 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("connect-timeout", n); } -#line 1302 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1311 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 142: -#line 589 "dhcp4_parser.yy" // lalr1.cc:859 + case 144: +#line 596 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("host-reservation-identifiers", l); ctx.stack_.push_back(l); ctx.enter(ctx.HOST_RESERVATION_IDENTIFIERS); } -#line 1313 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1322 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 143: -#line 594 "dhcp4_parser.yy" // lalr1.cc:859 + case 145: +#line 601 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1322 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1331 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 150: -#line 609 "dhcp4_parser.yy" // lalr1.cc:859 + case 152: +#line 616 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(duid); } -#line 1331 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1340 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 151: -#line 614 "dhcp4_parser.yy" // lalr1.cc:859 + case 153: +#line 621 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(hwaddr); } -#line 1340 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1349 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 152: -#line 619 "dhcp4_parser.yy" // lalr1.cc:859 + case 154: +#line 626 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr circuit(new StringElement("circuit-id", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(circuit); } -#line 1349 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1358 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 153: -#line 624 "dhcp4_parser.yy" // lalr1.cc:859 + case 155: +#line 631 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr client(new StringElement("client-id", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(client); } -#line 1358 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1367 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 154: -#line 629 "dhcp4_parser.yy" // lalr1.cc:859 + case 156: +#line 636 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hooks-libraries", l); ctx.stack_.push_back(l); ctx.enter(ctx.HOOKS_LIBRARIES); } -#line 1369 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1378 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 155: -#line 634 "dhcp4_parser.yy" // lalr1.cc:859 + case 157: +#line 641 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1378 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1387 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 160: -#line 647 "dhcp4_parser.yy" // lalr1.cc:859 + case 162: +#line 654 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1388 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1397 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 161: -#line 651 "dhcp4_parser.yy" // lalr1.cc:859 + case 163: +#line 658 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1396 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1405 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 162: -#line 655 "dhcp4_parser.yy" // lalr1.cc:859 + case 164: +#line 662 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the hooks-libraries list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1406 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1415 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 163: -#line 659 "dhcp4_parser.yy" // lalr1.cc:859 + case 165: +#line 666 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1414 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1423 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 169: -#line 672 "dhcp4_parser.yy" // lalr1.cc:859 + case 171: +#line 679 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1422 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1431 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 170: -#line 674 "dhcp4_parser.yy" // lalr1.cc:859 + case 172: +#line 681 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("library", lib); ctx.leave(); } -#line 1432 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1441 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 171: -#line 680 "dhcp4_parser.yy" // lalr1.cc:859 + case 173: +#line 687 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1440 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 172: -#line 682 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); -} #line 1449 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 173: -#line 688 "dhcp4_parser.yy" // lalr1.cc:859 + case 174: +#line 689 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 1458 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 175: +#line 695 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("expired-leases-processing", m); ctx.stack_.push_back(m); ctx.enter(ctx.EXPIRED_LEASES_PROCESSING); } -#line 1460 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1469 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 174: -#line 693 "dhcp4_parser.yy" // lalr1.cc:859 + case 176: +#line 700 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1469 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1478 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 183: -#line 710 "dhcp4_parser.yy" // lalr1.cc:859 + case 185: +#line 717 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reclaim-timer-wait-time", value); } -#line 1478 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1487 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 184: -#line 715 "dhcp4_parser.yy" // lalr1.cc:859 + case 186: +#line 722 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("flush-reclaimed-timer-wait-time", value); } -#line 1487 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1496 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 185: -#line 720 "dhcp4_parser.yy" // lalr1.cc:859 + case 187: +#line 727 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hold-reclaimed-time", value); } -#line 1496 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1505 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 186: -#line 725 "dhcp4_parser.yy" // lalr1.cc:859 + case 188: +#line 732 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("max-reclaim-leases", value); } -#line 1505 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1514 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 187: -#line 730 "dhcp4_parser.yy" // lalr1.cc:859 + case 189: +#line 737 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("max-reclaim-time", value); } -#line 1514 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1523 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 188: -#line 735 "dhcp4_parser.yy" // lalr1.cc:859 + case 190: +#line 742 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("unwarned-reclaim-cycles", value); } -#line 1523 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1532 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 189: -#line 743 "dhcp4_parser.yy" // lalr1.cc:859 + case 191: +#line 750 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("subnet4", l); ctx.stack_.push_back(l); ctx.enter(ctx.SUBNET4); } -#line 1534 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1543 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 190: -#line 748 "dhcp4_parser.yy" // lalr1.cc:859 + case 192: +#line 755 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1543 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1552 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 195: -#line 768 "dhcp4_parser.yy" // lalr1.cc:859 + case 197: +#line 775 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1553 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1562 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 196: -#line 772 "dhcp4_parser.yy" // lalr1.cc:859 + case 198: +#line 779 "dhcp4_parser.yy" // lalr1.cc:859 { // Once we reached this place, the subnet parsing is now complete. // If we want to, we can implement default values here. @@ -1572,1208 +1581,1191 @@ namespace isc { namespace dhcp { // } ctx.stack_.pop_back(); } -#line 1576 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1585 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 197: -#line 791 "dhcp4_parser.yy" // lalr1.cc:859 + case 199: +#line 798 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the subnet4 list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1586 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1595 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 198: -#line 795 "dhcp4_parser.yy" // lalr1.cc:859 + case 200: +#line 802 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1594 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1603 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 221: -#line 827 "dhcp4_parser.yy" // lalr1.cc:859 + case 223: +#line 834 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1602 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1611 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 222: -#line 829 "dhcp4_parser.yy" // lalr1.cc:859 + case 224: +#line 836 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("subnet", subnet); ctx.leave(); } -#line 1612 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1621 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 223: -#line 835 "dhcp4_parser.yy" // lalr1.cc:859 + case 225: +#line 842 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1620 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1629 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 224: -#line 837 "dhcp4_parser.yy" // lalr1.cc:859 + case 226: +#line 844 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("4o6-interface", iface); ctx.leave(); } -#line 1630 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1639 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 225: -#line 843 "dhcp4_parser.yy" // lalr1.cc:859 + case 227: +#line 850 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1638 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1647 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 226: -#line 845 "dhcp4_parser.yy" // lalr1.cc:859 + case 228: +#line 852 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("4o6-interface-id", iface); ctx.leave(); } -#line 1648 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1657 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 227: -#line 851 "dhcp4_parser.yy" // lalr1.cc:859 + case 229: +#line 858 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1656 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1665 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 228: -#line 853 "dhcp4_parser.yy" // lalr1.cc:859 + case 230: +#line 860 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("4o6-subnet", iface); ctx.leave(); } -#line 1666 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1675 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 229: -#line 859 "dhcp4_parser.yy" // lalr1.cc:859 + case 231: +#line 866 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1674 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1683 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 230: -#line 861 "dhcp4_parser.yy" // lalr1.cc:859 + case 232: +#line 868 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interface", iface); ctx.leave(); } -#line 1684 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1693 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 231: -#line 867 "dhcp4_parser.yy" // lalr1.cc:859 + case 233: +#line 874 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1692 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1701 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 232: -#line 869 "dhcp4_parser.yy" // lalr1.cc:859 + case 234: +#line 876 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interface-id", iface); ctx.leave(); } -#line 1702 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1711 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 233: -#line 875 "dhcp4_parser.yy" // lalr1.cc:859 + case 235: +#line 882 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.CLIENT_CLASS); } -#line 1710 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1719 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 234: -#line 877 "dhcp4_parser.yy" // lalr1.cc:859 + case 236: +#line 884 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr cls(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-class", cls); ctx.leave(); } -#line 1720 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1729 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 235: -#line 883 "dhcp4_parser.yy" // lalr1.cc:859 + case 237: +#line 890 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1728 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1737 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 236: -#line 885 "dhcp4_parser.yy" // lalr1.cc:859 + case 238: +#line 892 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr rm(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reservation-mode", rm); ctx.leave(); } -#line 1738 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1747 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 237: -#line 891 "dhcp4_parser.yy" // lalr1.cc:859 + case 239: +#line 898 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("id", id); } -#line 1747 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1756 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 238: -#line 896 "dhcp4_parser.yy" // lalr1.cc:859 + case 240: +#line 903 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr rc(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("rapid-commit", rc); } -#line 1756 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1765 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 239: -#line 905 "dhcp4_parser.yy" // lalr1.cc:859 + case 241: +#line 912 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("option-def", l); ctx.stack_.push_back(l); ctx.enter(ctx.OPTION_DEF); } -#line 1767 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1776 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 240: -#line 910 "dhcp4_parser.yy" // lalr1.cc:859 + case 242: +#line 917 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1776 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1785 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 245: -#line 927 "dhcp4_parser.yy" // lalr1.cc:859 + case 247: +#line 934 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1786 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1795 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 246: -#line 931 "dhcp4_parser.yy" // lalr1.cc:859 + case 248: +#line 938 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1794 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1803 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 247: -#line 938 "dhcp4_parser.yy" // lalr1.cc:859 + case 249: +#line 945 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the option-def list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1804 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1813 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 248: -#line 942 "dhcp4_parser.yy" // lalr1.cc:859 + case 250: +#line 949 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1812 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 262: -#line 968 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("code", code); -} #line 1821 "dhcp4_parser.cc" // lalr1.cc:859 break; case 264: #line 975 "dhcp4_parser.yy" // lalr1.cc:859 { - ctx.enter(ctx.NO_KEYWORD); + ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("code", code); } -#line 1829 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1830 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 265: -#line 977 "dhcp4_parser.yy" // lalr1.cc:859 + case 266: +#line 982 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 1838 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 267: +#line 984 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("type", prf); ctx.leave(); } -#line 1839 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1848 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 266: -#line 983 "dhcp4_parser.yy" // lalr1.cc:859 + case 268: +#line 990 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1847 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1856 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 267: -#line 985 "dhcp4_parser.yy" // lalr1.cc:859 + case 269: +#line 992 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr rtypes(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("record-types", rtypes); ctx.leave(); } -#line 1857 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1866 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 268: -#line 991 "dhcp4_parser.yy" // lalr1.cc:859 + case 270: +#line 998 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1865 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1874 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 269: -#line 993 "dhcp4_parser.yy" // lalr1.cc:859 + case 271: +#line 1000 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("space", space); ctx.leave(); } -#line 1875 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1884 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 271: -#line 1001 "dhcp4_parser.yy" // lalr1.cc:859 + case 273: +#line 1008 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1883 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1892 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 272: -#line 1003 "dhcp4_parser.yy" // lalr1.cc:859 + case 274: +#line 1010 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("encapsulate", encap); ctx.leave(); } -#line 1893 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1902 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 273: -#line 1009 "dhcp4_parser.yy" // lalr1.cc:859 + case 275: +#line 1016 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("array", array); } -#line 1902 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1911 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 274: -#line 1018 "dhcp4_parser.yy" // lalr1.cc:859 + case 276: +#line 1025 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("option-data", l); ctx.stack_.push_back(l); ctx.enter(ctx.OPTION_DATA); } -#line 1913 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1922 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 275: -#line 1023 "dhcp4_parser.yy" // lalr1.cc:859 + case 277: +#line 1030 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1922 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1931 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 280: -#line 1042 "dhcp4_parser.yy" // lalr1.cc:859 + case 282: +#line 1049 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1932 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1941 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 281: -#line 1046 "dhcp4_parser.yy" // lalr1.cc:859 + case 283: +#line 1053 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1940 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1949 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 282: -#line 1053 "dhcp4_parser.yy" // lalr1.cc:859 + case 284: +#line 1060 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the option-data list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1950 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1959 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 283: -#line 1057 "dhcp4_parser.yy" // lalr1.cc:859 + case 285: +#line 1064 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1958 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1967 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 295: -#line 1086 "dhcp4_parser.yy" // lalr1.cc:859 + case 297: +#line 1093 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1966 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1975 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 296: -#line 1088 "dhcp4_parser.yy" // lalr1.cc:859 + case 298: +#line 1095 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("data", data); ctx.leave(); } -#line 1976 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1985 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 299: -#line 1098 "dhcp4_parser.yy" // lalr1.cc:859 + case 301: +#line 1105 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("csv-format", space); } -#line 1985 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1994 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 300: -#line 1106 "dhcp4_parser.yy" // lalr1.cc:859 + case 302: +#line 1113 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pools", l); ctx.stack_.push_back(l); ctx.enter(ctx.POOLS); } -#line 1996 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2005 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 301: -#line 1111 "dhcp4_parser.yy" // lalr1.cc:859 + case 303: +#line 1118 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2005 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2014 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 306: -#line 1126 "dhcp4_parser.yy" // lalr1.cc:859 + case 308: +#line 1133 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2015 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2024 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 307: -#line 1130 "dhcp4_parser.yy" // lalr1.cc:859 + case 309: +#line 1137 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2023 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2032 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 308: -#line 1134 "dhcp4_parser.yy" // lalr1.cc:859 + case 310: +#line 1141 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the pool list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 2033 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2042 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 309: -#line 1138 "dhcp4_parser.yy" // lalr1.cc:859 + case 311: +#line 1145 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 2041 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2050 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 316: -#line 1152 "dhcp4_parser.yy" // lalr1.cc:859 + case 318: +#line 1159 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2049 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2058 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 317: -#line 1154 "dhcp4_parser.yy" // lalr1.cc:859 + case 319: +#line 1161 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pool", pool); ctx.leave(); } -#line 2059 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2068 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 318: -#line 1160 "dhcp4_parser.yy" // lalr1.cc:859 + case 320: +#line 1167 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2067 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 319: -#line 1162 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.stack_.back()->set("user-context", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); -} #line 2076 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 320: -#line 1170 "dhcp4_parser.yy" // lalr1.cc:859 + case 321: +#line 1169 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("user-context", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2085 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 322: +#line 1177 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reservations", l); ctx.stack_.push_back(l); ctx.enter(ctx.RESERVATIONS); } -#line 2087 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2096 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 321: -#line 1175 "dhcp4_parser.yy" // lalr1.cc:859 + case 323: +#line 1182 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2096 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2105 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 326: -#line 1188 "dhcp4_parser.yy" // lalr1.cc:859 + case 328: +#line 1195 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2106 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2115 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 327: -#line 1192 "dhcp4_parser.yy" // lalr1.cc:859 + case 329: +#line 1199 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2114 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2123 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 328: -#line 1196 "dhcp4_parser.yy" // lalr1.cc:859 + case 330: +#line 1203 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the reservations list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 2124 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2133 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 329: -#line 1200 "dhcp4_parser.yy" // lalr1.cc:859 + case 331: +#line 1207 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 2132 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2141 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 346: -#line 1227 "dhcp4_parser.yy" // lalr1.cc:859 + case 348: +#line 1234 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2140 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2149 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 347: -#line 1229 "dhcp4_parser.yy" // lalr1.cc:859 + case 349: +#line 1236 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr next_server(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("next-server", next_server); ctx.leave(); } -#line 2150 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2159 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 348: -#line 1235 "dhcp4_parser.yy" // lalr1.cc:859 + case 350: +#line 1242 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2158 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2167 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 349: -#line 1237 "dhcp4_parser.yy" // lalr1.cc:859 + case 351: +#line 1244 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr srv(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-hostname", srv); ctx.leave(); } -#line 2168 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2177 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 350: -#line 1243 "dhcp4_parser.yy" // lalr1.cc:859 + case 352: +#line 1250 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2176 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2185 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 351: -#line 1245 "dhcp4_parser.yy" // lalr1.cc:859 + case 353: +#line 1252 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr bootfile(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("boot-file-name", bootfile); ctx.leave(); } -#line 2186 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2195 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 352: -#line 1251 "dhcp4_parser.yy" // lalr1.cc:859 + case 354: +#line 1258 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2194 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2203 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 353: -#line 1253 "dhcp4_parser.yy" // lalr1.cc:859 + case 355: +#line 1260 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr addr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ip-address", addr); ctx.leave(); } -#line 2204 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2213 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 354: -#line 1259 "dhcp4_parser.yy" // lalr1.cc:859 + case 356: +#line 1266 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2212 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2221 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 355: -#line 1261 "dhcp4_parser.yy" // lalr1.cc:859 + case 357: +#line 1268 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("duid", d); ctx.leave(); } -#line 2222 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2231 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 356: -#line 1267 "dhcp4_parser.yy" // lalr1.cc:859 + case 358: +#line 1274 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2230 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2239 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 357: -#line 1269 "dhcp4_parser.yy" // lalr1.cc:859 + case 359: +#line 1276 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hw-address", hw); ctx.leave(); } -#line 2240 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2249 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 358: -#line 1275 "dhcp4_parser.yy" // lalr1.cc:859 + case 360: +#line 1282 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2248 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2257 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 359: -#line 1277 "dhcp4_parser.yy" // lalr1.cc:859 + case 361: +#line 1284 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-id", hw); ctx.leave(); } -#line 2258 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2267 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 360: -#line 1283 "dhcp4_parser.yy" // lalr1.cc:859 + case 362: +#line 1290 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2266 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2275 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 361: -#line 1285 "dhcp4_parser.yy" // lalr1.cc:859 + case 363: +#line 1292 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("circuit-id", hw); ctx.leave(); } -#line 2276 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2285 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 362: -#line 1292 "dhcp4_parser.yy" // lalr1.cc:859 + case 364: +#line 1299 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2284 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2293 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 363: -#line 1294 "dhcp4_parser.yy" // lalr1.cc:859 + case 365: +#line 1301 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hostname", host); ctx.leave(); } -#line 2294 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2303 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 364: -#line 1300 "dhcp4_parser.yy" // lalr1.cc:859 + case 366: +#line 1307 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-classes", c); ctx.stack_.push_back(c); ctx.enter(ctx.NO_KEYWORD); } -#line 2305 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2314 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 365: -#line 1305 "dhcp4_parser.yy" // lalr1.cc:859 + case 367: +#line 1312 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2314 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2323 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 366: -#line 1313 "dhcp4_parser.yy" // lalr1.cc:859 + case 368: +#line 1320 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("relay", m); ctx.stack_.push_back(m); ctx.enter(ctx.RELAY); } -#line 2325 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 367: -#line 1318 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.stack_.pop_back(); - ctx.leave(); -} #line 2334 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 368: -#line 1323 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2342 "dhcp4_parser.cc" // lalr1.cc:859 - break; - case 369: #line 1325 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.stack_.pop_back(); + ctx.leave(); +} +#line 2343 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 370: +#line 1330 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2351 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 371: +#line 1332 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr ip(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ip-address", ip); ctx.leave(); } -#line 2352 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2361 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 370: -#line 1334 "dhcp4_parser.yy" // lalr1.cc:859 + case 372: +#line 1341 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-classes", l); ctx.stack_.push_back(l); ctx.enter(ctx.CLIENT_CLASSES); } -#line 2363 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2372 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 371: -#line 1339 "dhcp4_parser.yy" // lalr1.cc:859 + case 373: +#line 1346 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2372 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2381 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 374: -#line 1348 "dhcp4_parser.yy" // lalr1.cc:859 + case 376: +#line 1355 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2382 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2391 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 375: -#line 1352 "dhcp4_parser.yy" // lalr1.cc:859 + case 377: +#line 1359 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2390 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2399 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 388: -#line 1375 "dhcp4_parser.yy" // lalr1.cc:859 + case 390: +#line 1382 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2398 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2407 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 389: -#line 1377 "dhcp4_parser.yy" // lalr1.cc:859 + case 391: +#line 1384 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("test", test); ctx.leave(); } -#line 2408 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2417 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 390: -#line 1387 "dhcp4_parser.yy" // lalr1.cc:859 + case 392: +#line 1394 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp4o6-port", time); } -#line 2417 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2426 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 391: -#line 1394 "dhcp4_parser.yy" // lalr1.cc:859 + case 393: +#line 1401 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("control-socket", m); ctx.stack_.push_back(m); ctx.enter(ctx.CONTROL_SOCKET); } -#line 2428 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2437 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 392: -#line 1399 "dhcp4_parser.yy" // lalr1.cc:859 + case 394: +#line 1406 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2437 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2446 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 397: -#line 1412 "dhcp4_parser.yy" // lalr1.cc:859 + case 399: +#line 1419 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2445 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2454 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 398: -#line 1414 "dhcp4_parser.yy" // lalr1.cc:859 + case 400: +#line 1421 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("socket-type", stype); ctx.leave(); } -#line 2455 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2464 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 399: -#line 1420 "dhcp4_parser.yy" // lalr1.cc:859 + case 401: +#line 1427 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2463 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2472 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 400: -#line 1422 "dhcp4_parser.yy" // lalr1.cc:859 + case 402: +#line 1429 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("socket-name", name); ctx.leave(); } -#line 2473 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2482 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 401: -#line 1430 "dhcp4_parser.yy" // lalr1.cc:859 + case 403: +#line 1437 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp-ddns", m); ctx.stack_.push_back(m); ctx.enter(ctx.DHCP_DDNS); } -#line 2484 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2493 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 402: -#line 1435 "dhcp4_parser.yy" // lalr1.cc:859 + case 404: +#line 1442 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2493 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2502 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 403: -#line 1440 "dhcp4_parser.yy" // lalr1.cc:859 + case 405: +#line 1447 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the dhcp-ddns map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 2503 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2512 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 404: -#line 1444 "dhcp4_parser.yy" // lalr1.cc:859 + case 406: +#line 1451 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 2511 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 423: -#line 1470 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("enable-updates", b); -} #line 2520 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 424: -#line 1475 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2528 "dhcp4_parser.cc" // lalr1.cc:859 - break; - case 425: #line 1477 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("enable-updates", b); +} +#line 2529 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 426: +#line 1482 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2537 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 427: +#line 1484 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("qualifying-suffix", s); ctx.leave(); } -#line 2538 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2547 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 426: -#line 1483 "dhcp4_parser.yy" // lalr1.cc:859 + case 428: +#line 1490 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2546 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2555 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 427: -#line 1485 "dhcp4_parser.yy" // lalr1.cc:859 + case 429: +#line 1492 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-ip", s); ctx.leave(); } -#line 2556 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 428: -#line 1491 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("server-port", i); -} #line 2565 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 429: -#line 1496 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2573 "dhcp4_parser.cc" // lalr1.cc:859 - break; - case 430: #line 1498 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("server-port", i); +} +#line 2574 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 431: +#line 1503 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2582 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 432: +#line 1505 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("sender-ip", s); ctx.leave(); } -#line 2583 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2592 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 431: -#line 1504 "dhcp4_parser.yy" // lalr1.cc:859 + case 433: +#line 1511 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("sender-port", i); } -#line 2592 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 432: -#line 1509 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("max-queue-size", i); -} #line 2601 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 433: -#line 1514 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NCR_PROTOCOL); -} -#line 2609 "dhcp4_parser.cc" // lalr1.cc:859 - break; - case 434: #line 1516 "dhcp4_parser.yy" // lalr1.cc:859 { - ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("max-queue-size", i); +} +#line 2610 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 435: +#line 1521 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NCR_PROTOCOL); } #line 2618 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 435: -#line 1522 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); } -#line 2624 "dhcp4_parser.cc" // lalr1.cc:859 - break; - case 436: #line 1523 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); } -#line 2630 "dhcp4_parser.cc" // lalr1.cc:859 + { + ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2627 "dhcp4_parser.cc" // lalr1.cc:859 break; case 437: -#line 1526 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NCR_FORMAT); -} -#line 2638 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1529 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); } +#line 2633 "dhcp4_parser.cc" // lalr1.cc:859 break; case 438: -#line 1528 "dhcp4_parser.yy" // lalr1.cc:859 +#line 1530 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); } +#line 2639 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 439: +#line 1533 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NCR_FORMAT); +} +#line 2647 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 440: +#line 1535 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ncr-format", json); ctx.leave(); } -#line 2648 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2657 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 439: -#line 1534 "dhcp4_parser.yy" // lalr1.cc:859 + case 441: +#line 1541 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("always-include-fqdn", b); } -#line 2657 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2666 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 440: -#line 1539 "dhcp4_parser.yy" // lalr1.cc:859 + case 442: +#line 1546 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("allow-client-update", b); } -#line 2666 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2675 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 441: -#line 1544 "dhcp4_parser.yy" // lalr1.cc:859 + case 443: +#line 1551 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("override-no-update", b); } -#line 2675 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 442: -#line 1549 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("override-client-update", b); -} #line 2684 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 443: -#line 1554 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.REPLACE_CLIENT_NAME); -} -#line 2692 "dhcp4_parser.cc" // lalr1.cc:859 - break; - case 444: #line 1556 "dhcp4_parser.yy" // lalr1.cc:859 { - ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("override-client-update", b); +} +#line 2693 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 445: +#line 1561 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.REPLACE_CLIENT_NAME); } #line 2701 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 445: -#line 1562 "dhcp4_parser.yy" // lalr1.cc:859 - { - yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); - } -#line 2709 "dhcp4_parser.cc" // lalr1.cc:859 - break; - case 446: -#line 1565 "dhcp4_parser.yy" // lalr1.cc:859 +#line 1563 "dhcp4_parser.yy" // lalr1.cc:859 { - yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location))); - } -#line 2717 "dhcp4_parser.cc" // lalr1.cc:859 + ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2710 "dhcp4_parser.cc" // lalr1.cc:859 break; case 447: -#line 1568 "dhcp4_parser.yy" // lalr1.cc:859 +#line 1569 "dhcp4_parser.yy" // lalr1.cc:859 { - yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location))); + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); } -#line 2725 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2718 "dhcp4_parser.cc" // lalr1.cc:859 break; case 448: -#line 1571 "dhcp4_parser.yy" // lalr1.cc:859 +#line 1572 "dhcp4_parser.yy" // lalr1.cc:859 { - yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location))); + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location))); } -#line 2733 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2726 "dhcp4_parser.cc" // lalr1.cc:859 break; case 449: -#line 1574 "dhcp4_parser.yy" // lalr1.cc:859 +#line 1575 "dhcp4_parser.yy" // lalr1.cc:859 { - error(yystack_[0].location, "boolean values for the replace-client-name are " - "no longer supported"); + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location))); + } +#line 2734 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 450: +#line 1578 "dhcp4_parser.yy" // lalr1.cc:859 + { + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location))); } #line 2742 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 450: -#line 1580 "dhcp4_parser.yy" // lalr1.cc:859 + case 451: +#line 1581 "dhcp4_parser.yy" // lalr1.cc:859 + { + error(yystack_[0].location, "boolean values for the replace-client-name are " + "no longer supported"); + } +#line 2751 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 452: +#line 1587 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2750 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2759 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 451: -#line 1582 "dhcp4_parser.yy" // lalr1.cc:859 + case 453: +#line 1589 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("generated-prefix", s); ctx.leave(); } -#line 2760 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 452: -#line 1590 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2768 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 453: -#line 1592 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); -} -#line 2777 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2769 "dhcp4_parser.cc" // lalr1.cc:859 break; case 454: @@ -2781,161 +2773,178 @@ namespace isc { namespace dhcp { { ctx.enter(ctx.NO_KEYWORD); } -#line 2785 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2777 "dhcp4_parser.cc" // lalr1.cc:859 break; case 455: #line 1599 "dhcp4_parser.yy" // lalr1.cc:859 { - ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ()); + ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } +#line 2786 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 456: +#line 1604 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} #line 2794 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 456: -#line 1609 "dhcp4_parser.yy" // lalr1.cc:859 + case 457: +#line 1606 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2803 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 458: +#line 1616 "dhcp4_parser.yy" // lalr1.cc:859 { 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 2805 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2814 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 457: -#line 1614 "dhcp4_parser.yy" // lalr1.cc:859 + case 459: +#line 1621 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2814 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2823 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 461: -#line 1631 "dhcp4_parser.yy" // lalr1.cc:859 + case 463: +#line 1638 "dhcp4_parser.yy" // lalr1.cc:859 { 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 2825 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2834 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 462: -#line 1636 "dhcp4_parser.yy" // lalr1.cc:859 + case 464: +#line 1643 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2834 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2843 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 465: -#line 1648 "dhcp4_parser.yy" // lalr1.cc:859 + case 467: +#line 1655 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(l); ctx.stack_.push_back(l); } -#line 2844 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2853 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 466: -#line 1652 "dhcp4_parser.yy" // lalr1.cc:859 + case 468: +#line 1659 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2852 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 474: -#line 1667 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("debuglevel", dl); -} #line 2861 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 475: -#line 1671 "dhcp4_parser.yy" // lalr1.cc:859 + case 476: +#line 1674 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("debuglevel", dl); +} +#line 2870 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 477: +#line 1678 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2869 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2878 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 476: -#line 1673 "dhcp4_parser.yy" // lalr1.cc:859 + case 478: +#line 1680 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("severity", sev); ctx.leave(); } -#line 2879 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2888 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 477: -#line 1679 "dhcp4_parser.yy" // lalr1.cc:859 + case 479: +#line 1686 "dhcp4_parser.yy" // lalr1.cc:859 { 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 2890 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2899 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 478: -#line 1684 "dhcp4_parser.yy" // lalr1.cc:859 + case 480: +#line 1691 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2899 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2908 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 481: -#line 1693 "dhcp4_parser.yy" // lalr1.cc:859 + case 483: +#line 1700 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2909 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2918 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 482: -#line 1697 "dhcp4_parser.yy" // lalr1.cc:859 + case 484: +#line 1704 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2917 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2926 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 485: -#line 1705 "dhcp4_parser.yy" // lalr1.cc:859 + case 487: +#line 1712 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2925 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2934 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 486: -#line 1707 "dhcp4_parser.yy" // lalr1.cc:859 + case 488: +#line 1714 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("output", sev); ctx.leave(); } -#line 2935 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2944 "dhcp4_parser.cc" // lalr1.cc:859 break; -#line 2939 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2948 "dhcp4_parser.cc" // lalr1.cc:859 default: break; } @@ -3197,87 +3206,87 @@ namespace isc { namespace dhcp { const short int Dhcp4Parser::yypact_[] = { - 121, -473, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, 32, 19, 23, 45, 56, 74, 82, 86, - 104, 115, 119, 148, -473, -473, -473, -473, -473, -473, + 60, -473, -473, -473, -473, -473, -473, -473, -473, -473, + -473, -473, 32, 19, 42, 51, 55, 57, 83, 98, + 99, 116, 126, 149, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -473, -473, -473, -473, 19, -92, 17, 29, - 154, 18, -13, 68, 57, 52, -6, 123, -473, 169, - 125, 205, 184, 226, -473, -473, -473, -473, 255, -473, - 30, -473, -473, -473, -473, -473, -473, 262, 263, -473, - -473, -473, 265, 267, 269, 270, -473, -473, -473, -473, - -473, -473, -473, 271, -473, -473, -473, 31, -473, -473, + -473, -473, -473, -473, -473, -473, 19, 38, 17, 29, + 25, 18, -14, 68, 78, 62, -33, 122, -473, 77, + 173, 189, 169, 200, -473, -473, -473, -473, 203, -473, + 31, -473, -473, -473, -473, -473, -473, 241, 245, -473, + -473, -473, 246, 247, 255, 267, -473, -473, -473, -473, + -473, -473, -473, 269, -473, -473, -473, 45, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - -473, 40, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -473, 273, 274, -473, -473, -473, -473, -473, - -473, -473, -473, -473, 41, -473, -473, -473, -473, -473, + -473, 49, -473, -473, -473, -473, -473, -473, -473, -473, + -473, -473, -473, 270, 271, -473, -473, -473, -473, -473, + -473, -473, -473, -473, 117, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -473, -473, -473, 53, -473, -473, -473, -473, + -473, -473, -473, -473, -473, 150, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - 272, 278, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -473, -473, -473, 280, -473, -473, -473, 281, - -473, -473, 279, 286, -473, -473, -473, -473, -473, -473, - -473, -473, -473, -473, -473, 288, -473, -473, -473, -473, - 285, 291, -473, -473, -473, -473, -473, -473, -473, -473, - -473, 116, -473, -473, -473, 295, -473, -473, 296, -473, - 298, 299, -473, -473, 300, 301, 302, 303, -473, -473, - -473, 122, -473, -473, -473, -473, -473, -473, -473, -473, + 259, 274, -473, -473, -473, -473, -473, -473, -473, -473, + -473, -473, -473, -473, -473, 276, -473, -473, -473, 277, + -473, -473, 279, 275, -473, -473, -473, -473, -473, -473, + -473, -473, -473, -473, -473, 280, -473, -473, -473, -473, + 281, 282, -473, -473, -473, -473, -473, -473, -473, -473, + -473, 187, -473, -473, -473, 288, -473, -473, 289, -473, + 290, 295, -473, -473, 296, 302, 303, 304, -473, -473, + -473, 188, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, 19, - 19, -473, 180, 304, 307, 309, 310, -473, 17, -473, - 311, 187, 190, 312, 313, 314, 193, 194, 195, 197, - 316, 322, 324, 325, 326, 327, 328, 203, 330, 331, - 29, -473, 332, 333, 154, -473, 76, 334, 335, 336, - 337, 338, 339, 342, 217, 216, 345, 346, 347, 348, - 18, -473, 349, 350, -13, -473, 351, 352, 353, 354, - 355, 356, 357, 358, 359, -473, 68, 360, 361, 237, - 362, 364, 365, 238, -473, 57, 367, 240, -473, 52, - 369, 370, 186, -473, 243, 372, 373, 248, 375, 250, - 251, 378, 379, 252, 253, 254, 256, 383, 385, 123, - -473, -473, -473, 386, 384, 387, 19, 19, -473, 388, - -473, -473, 264, 389, 390, -473, -473, -473, -473, 393, - 394, 395, 396, 397, 398, 399, -473, 400, 401, -473, - 404, 236, -473, -473, -473, -473, -473, -473, -473, -473, - 402, 408, -473, -473, -473, 275, 276, 283, 409, 284, - 287, 289, -473, -473, 290, 292, 410, 413, -473, 294, - 417, -473, 305, 306, 404, 308, 317, 318, 319, 321, - 323, -473, 329, 340, -473, 341, 343, 344, -473, -473, - 363, -473, -473, 366, 19, -473, -473, 368, 371, -473, - 374, -473, -473, 14, 320, -473, -473, -473, -473, 36, - 376, -473, 19, 29, 377, -473, -473, 154, -473, 131, - 131, 421, 422, 423, 166, 50, 426, 91, 177, 123, - -473, -473, -473, -473, -473, 432, -473, 76, -473, -473, - -473, 431, -473, -473, -473, -473, -473, 435, 380, -473, + 19, -473, 179, 307, 309, 310, 311, -473, 17, -473, + 312, 184, 185, 315, 316, 318, 192, 193, 195, 196, + 321, 324, 325, 326, 327, 328, 329, 204, 330, 332, + 29, -473, 333, 334, 25, -473, 76, 335, 336, 337, + 338, 339, 342, 343, 217, 216, 346, 347, 348, 349, + 18, -473, 350, 351, -14, -473, 352, 353, 354, 355, + 356, 357, 358, 359, 360, -473, 68, 361, 362, 237, + 363, 365, 366, 242, -473, 78, 367, 243, -473, 62, + 368, 369, -6, -473, 244, 370, 374, 248, 376, 250, + 251, 379, 380, 252, 253, 254, 256, 384, 386, 122, + -473, -473, -473, 387, 385, 388, 19, 19, -473, 389, + -473, -473, 264, 390, 391, -473, -473, -473, -473, 394, + 395, 396, 397, 398, 399, 400, -473, 401, 402, -473, + 405, 67, -473, -473, -473, -473, -473, -473, -473, -473, + 403, 409, -473, -473, -473, 283, 284, 285, 411, 287, + 291, 293, -473, -473, 294, 298, 413, 412, -473, 299, + 418, -473, 300, 305, 405, 306, 308, 313, 317, 320, + 322, -473, 323, 331, -473, 340, 341, 344, -473, -473, + 345, -473, -473, 364, 19, -473, -473, 371, 372, -473, + 373, -473, -473, 14, 314, -473, -473, -473, -473, 36, + 375, -473, 19, 29, 377, -473, -473, 25, -473, 132, + 132, 426, 427, 430, 186, 23, 432, 91, 11, 122, + -473, -473, -473, -473, -473, 438, -473, 76, -473, -473, + -473, 439, -473, -473, -473, -473, -473, 441, 319, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -473, -473, 149, -473, 175, -473, -473, 179, - -473, -473, -473, -473, 439, 441, 447, 450, -473, 181, + -473, -473, -473, -473, 191, -473, 194, -473, -473, 197, + -473, -473, -473, -473, 447, 450, 451, 453, 454, -473, + 201, -473, -473, -473, -473, -473, -473, -473, -473, -473, + -473, -473, 224, -473, 456, 442, -473, -473, 457, 461, + -473, -473, 459, 463, -473, -473, -473, -473, -473, 151, + -473, -473, -473, -473, -473, -473, 257, -473, 462, 464, + -473, 465, 468, 469, 472, 473, 474, 225, -473, -473, + -473, -473, -473, -473, -473, -473, -473, 226, -473, -473, + -473, 228, 378, 381, -473, -473, 475, 476, -473, -473, + 477, 479, -473, -473, 452, -473, 480, 377, -473, -473, + 481, 482, 483, 484, 382, 272, 383, 273, 392, 132, + -473, -473, 18, -473, 426, 78, -473, 427, 62, -473, + 430, 186, -473, 23, -473, -33, -473, 432, 393, 404, + 406, 407, 408, 410, 91, -473, 486, 487, 11, -473, + -473, -473, 489, 490, -473, -14, -473, 439, 68, -473, + 441, 488, -473, 491, -473, 278, 414, 415, 416, -473, + -473, -473, -473, -473, -473, 232, -473, 492, -473, 496, + -473, -473, -473, 236, -473, -473, -473, -473, -473, -473, + -473, -473, 417, 419, -473, -473, 420, 238, -473, 498, + -473, 421, 500, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - 182, -473, 411, 436, -473, -473, 449, 454, -473, -473, - 455, 457, -473, -473, -473, -473, -473, 79, -473, -473, - -473, -473, -473, -473, 126, -473, 456, 460, -473, 461, - 462, 463, 464, 467, 470, 185, -473, -473, -473, -473, - -473, -473, -473, -473, -473, 188, -473, -473, -473, 192, - 381, 382, -473, -473, 458, 472, -473, -473, 471, 473, - -473, -473, 474, -473, 475, 377, -473, -473, 476, 477, - 479, 480, 260, 391, 392, 403, 131, -473, -473, 18, - -473, 421, 57, -473, 422, 52, -473, 423, 166, -473, - 50, -473, -6, -473, 426, 405, 406, 407, 412, 414, - 415, 91, -473, 481, 482, 177, -473, -473, -473, 483, - 484, -473, -13, -473, 431, 68, -473, 435, 486, -473, - 488, -473, 230, 418, 419, 420, -473, -473, -473, -473, - -473, 196, -473, 490, -473, 491, -473, -473, -473, 198, - -473, -473, -473, -473, -473, -473, -473, -473, 424, 425, - -473, -473, 427, 199, -473, 493, -473, 428, 487, -473, - -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -473, -473, -473, -473, -473, -473, 150, -473, - 65, 487, -473, -473, 492, -473, -473, -473, 200, -473, - -473, -473, -473, -473, 498, 416, 500, 65, -473, 501, - -473, 429, -473, 502, -473, -473, 225, -473, 430, 502, - -473, -473, 224, -473, -473, 503, 430, -473, 433, -473, - -473 + -473, -473, 258, -473, -13, 500, -473, -473, 493, -473, + -473, -473, 239, -473, -473, -473, -473, -473, 494, 422, + 495, -13, -473, 504, -473, 424, -473, 503, -473, -473, + 263, -473, 428, 503, -473, -473, 240, -473, -473, 508, + 428, -473, 425, -473, -473 }; const unsigned short int @@ -3287,119 +3296,119 @@ namespace isc { namespace dhcp { 20, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 39, 32, 28, 27, 24, 25, 26, 31, 3, 29, 30, 52, 5, 63, 7, - 100, 9, 197, 11, 308, 13, 328, 15, 247, 17, - 282, 19, 162, 21, 403, 23, 41, 35, 0, 0, - 0, 0, 0, 330, 249, 284, 0, 0, 43, 0, - 42, 0, 0, 36, 61, 456, 452, 454, 0, 60, - 0, 54, 56, 58, 59, 57, 94, 0, 0, 346, - 108, 110, 0, 0, 0, 0, 189, 239, 274, 142, - 370, 154, 173, 0, 391, 401, 87, 0, 65, 67, + 100, 9, 199, 11, 310, 13, 330, 15, 249, 17, + 284, 19, 164, 21, 405, 23, 41, 35, 0, 0, + 0, 0, 0, 332, 251, 286, 0, 0, 43, 0, + 42, 0, 0, 36, 61, 458, 454, 456, 0, 60, + 0, 54, 56, 58, 59, 57, 94, 0, 0, 348, + 108, 110, 0, 0, 0, 0, 191, 241, 276, 144, + 372, 156, 175, 0, 393, 403, 87, 0, 65, 67, 68, 69, 70, 84, 85, 72, 73, 74, 75, 79, 80, 71, 77, 78, 86, 76, 81, 82, 83, 102, - 104, 0, 96, 98, 99, 374, 223, 225, 227, 300, - 221, 229, 231, 0, 0, 235, 233, 320, 366, 220, - 201, 202, 203, 215, 0, 199, 206, 217, 218, 219, - 207, 208, 211, 213, 209, 210, 204, 205, 212, 216, - 214, 316, 318, 315, 313, 0, 310, 312, 314, 348, - 350, 364, 354, 356, 360, 358, 362, 352, 345, 341, - 0, 331, 332, 342, 343, 344, 338, 334, 339, 336, - 337, 340, 335, 264, 136, 0, 268, 266, 271, 0, - 260, 261, 0, 250, 251, 253, 263, 254, 255, 256, - 270, 257, 258, 259, 295, 0, 293, 294, 297, 298, - 0, 285, 286, 288, 289, 290, 291, 292, 169, 171, - 166, 0, 164, 167, 168, 0, 424, 426, 0, 429, - 0, 0, 433, 437, 0, 0, 0, 0, 443, 450, - 422, 0, 405, 407, 408, 409, 410, 411, 412, 413, - 414, 415, 416, 417, 418, 419, 420, 421, 40, 0, + 104, 0, 96, 98, 99, 376, 225, 227, 229, 302, + 223, 231, 233, 0, 0, 237, 235, 322, 368, 222, + 203, 204, 205, 217, 0, 201, 208, 219, 220, 221, + 209, 210, 213, 215, 211, 212, 206, 207, 214, 218, + 216, 318, 320, 317, 315, 0, 312, 314, 316, 350, + 352, 366, 356, 358, 362, 360, 364, 354, 347, 343, + 0, 333, 334, 344, 345, 346, 340, 336, 341, 338, + 339, 342, 337, 266, 138, 0, 270, 268, 273, 0, + 262, 263, 0, 252, 253, 255, 265, 256, 257, 258, + 272, 259, 260, 261, 297, 0, 295, 296, 299, 300, + 0, 287, 288, 290, 291, 292, 293, 294, 171, 173, + 168, 0, 166, 169, 170, 0, 426, 428, 0, 431, + 0, 0, 435, 439, 0, 0, 0, 0, 445, 452, + 424, 0, 407, 409, 410, 411, 412, 413, 414, 415, + 416, 417, 418, 419, 420, 421, 422, 423, 40, 0, 0, 33, 0, 0, 0, 0, 0, 51, 0, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 64, 0, 0, 0, 101, 376, 0, 0, 0, + 0, 64, 0, 0, 0, 101, 378, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 198, 0, 0, 0, 309, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 329, 0, 0, 0, 0, - 0, 0, 0, 0, 248, 0, 0, 0, 283, 0, - 0, 0, 0, 163, 0, 0, 0, 0, 0, 0, + 0, 200, 0, 0, 0, 311, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 331, 0, 0, 0, 0, + 0, 0, 0, 0, 250, 0, 0, 0, 285, 0, + 0, 0, 0, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 404, 44, 37, 0, 0, 0, 0, 0, 55, 0, + 406, 44, 37, 0, 0, 0, 0, 0, 55, 0, 92, 93, 0, 0, 0, 88, 89, 90, 91, 0, - 0, 0, 0, 0, 0, 0, 390, 0, 0, 66, - 0, 0, 97, 388, 386, 387, 382, 383, 384, 385, - 0, 377, 378, 380, 381, 0, 0, 0, 0, 0, - 0, 0, 237, 238, 0, 0, 0, 0, 200, 0, - 0, 311, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 333, 0, 0, 262, 0, 0, 0, 273, 252, - 0, 299, 287, 0, 0, 165, 423, 0, 0, 428, - 0, 431, 432, 0, 0, 439, 440, 441, 442, 0, - 0, 406, 0, 0, 0, 453, 455, 0, 347, 0, - 0, 191, 241, 276, 0, 0, 156, 0, 0, 0, - 45, 103, 106, 107, 105, 0, 375, 0, 224, 226, - 228, 302, 222, 230, 232, 236, 234, 322, 0, 317, - 34, 319, 349, 351, 365, 355, 357, 361, 359, 363, - 353, 265, 137, 269, 267, 272, 296, 170, 172, 425, - 427, 430, 435, 436, 434, 438, 445, 446, 447, 448, - 449, 444, 451, 38, 0, 461, 0, 458, 460, 0, - 124, 130, 132, 134, 0, 0, 0, 0, 123, 0, - 112, 114, 115, 116, 117, 118, 119, 120, 121, 122, - 0, 195, 0, 192, 193, 245, 0, 242, 243, 280, - 0, 277, 278, 150, 151, 152, 153, 0, 144, 146, - 147, 148, 149, 372, 0, 160, 0, 157, 158, 0, - 0, 0, 0, 0, 0, 0, 175, 177, 178, 179, - 180, 181, 182, 397, 399, 0, 393, 395, 396, 0, - 47, 0, 379, 306, 0, 303, 304, 326, 0, 323, - 324, 368, 0, 62, 0, 0, 457, 95, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 109, 111, 0, - 190, 0, 249, 240, 0, 284, 275, 0, 0, 143, - 0, 371, 0, 155, 0, 0, 0, 0, 0, 0, - 0, 0, 174, 0, 0, 0, 392, 402, 49, 0, - 48, 389, 0, 301, 0, 330, 321, 0, 0, 367, - 0, 459, 0, 0, 0, 0, 138, 139, 140, 141, - 113, 0, 194, 0, 244, 0, 279, 145, 373, 0, - 159, 183, 184, 185, 186, 187, 188, 176, 0, 0, - 394, 46, 0, 0, 305, 0, 325, 0, 0, 126, - 127, 128, 129, 125, 131, 133, 135, 196, 246, 281, - 161, 398, 400, 50, 307, 327, 369, 465, 0, 463, - 0, 0, 462, 477, 0, 475, 473, 469, 0, 467, - 471, 472, 470, 464, 0, 0, 0, 0, 466, 0, - 474, 0, 468, 0, 476, 481, 0, 479, 0, 0, - 478, 485, 0, 483, 480, 0, 0, 482, 0, 484, - 486 + 0, 0, 0, 0, 0, 0, 392, 0, 0, 66, + 0, 0, 97, 390, 388, 389, 384, 385, 386, 387, + 0, 379, 380, 382, 383, 0, 0, 0, 0, 0, + 0, 0, 239, 240, 0, 0, 0, 0, 202, 0, + 0, 313, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 335, 0, 0, 264, 0, 0, 0, 275, 254, + 0, 301, 289, 0, 0, 167, 425, 0, 0, 430, + 0, 433, 434, 0, 0, 441, 442, 443, 444, 0, + 0, 408, 0, 0, 0, 455, 457, 0, 349, 0, + 0, 193, 243, 278, 0, 0, 158, 0, 0, 0, + 45, 103, 106, 107, 105, 0, 377, 0, 226, 228, + 230, 304, 224, 232, 234, 238, 236, 324, 0, 319, + 34, 321, 351, 353, 367, 357, 359, 363, 361, 365, + 355, 267, 139, 271, 269, 274, 298, 172, 174, 427, + 429, 432, 437, 438, 436, 440, 447, 448, 449, 450, + 451, 446, 453, 38, 0, 463, 0, 460, 462, 0, + 125, 131, 133, 135, 0, 0, 0, 0, 0, 124, + 0, 112, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 123, 0, 197, 0, 194, 195, 247, 0, 244, + 245, 282, 0, 279, 280, 152, 153, 154, 155, 0, + 146, 148, 149, 150, 151, 374, 0, 162, 0, 159, + 160, 0, 0, 0, 0, 0, 0, 0, 177, 179, + 180, 181, 182, 183, 184, 399, 401, 0, 395, 397, + 398, 0, 47, 0, 381, 308, 0, 305, 306, 328, + 0, 325, 326, 370, 0, 62, 0, 0, 459, 95, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 109, 111, 0, 192, 0, 251, 242, 0, 286, 277, + 0, 0, 145, 0, 373, 0, 157, 0, 0, 0, + 0, 0, 0, 0, 0, 176, 0, 0, 0, 394, + 404, 49, 0, 48, 391, 0, 303, 0, 332, 323, + 0, 0, 369, 0, 461, 0, 0, 0, 0, 137, + 140, 141, 142, 143, 113, 0, 196, 0, 246, 0, + 281, 147, 375, 0, 161, 185, 186, 187, 188, 189, + 190, 178, 0, 0, 396, 46, 0, 0, 307, 0, + 327, 0, 0, 127, 128, 129, 130, 126, 132, 134, + 136, 198, 248, 283, 163, 400, 402, 50, 309, 329, + 371, 467, 0, 465, 0, 0, 464, 479, 0, 477, + 475, 471, 0, 469, 473, 474, 472, 466, 0, 0, + 0, 0, 468, 0, 476, 0, 470, 0, 478, 483, + 0, 481, 0, 0, 480, 487, 0, 485, 482, 0, + 0, 484, 0, 486, 488 }; const short int Dhcp4Parser::yypgoto_[] = { -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -473, -42, -473, 38, -473, -473, -473, -473, - -473, -473, -473, -473, 47, -473, -473, -473, -58, -473, - -473, -473, 220, -473, -473, -473, -473, 33, 202, -60, - -44, -40, -473, -473, -39, -473, -473, 26, 201, -473, + -473, -473, -473, -42, -473, 40, -473, -473, -473, -473, + -473, -473, -473, -473, 71, -473, -473, -473, -58, -473, + -473, -473, 229, -473, -473, -473, -473, 33, 208, -60, + -44, -40, -473, -473, -39, -473, -473, 34, 205, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - 24, -139, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -63, -473, -473, -473, -473, -473, -473, -473, -473, - -150, -473, -473, -473, -473, -473, -473, -473, -473, -155, - -473, -473, -473, -152, 160, -473, -473, -473, -473, -473, - -473, -473, -158, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -473, -136, -473, -473, -473, -133, 204, -473, + 30, -137, -473, -473, -473, -473, -473, -473, -473, -473, + -473, -473, -63, -473, -473, -473, -473, -473, -473, -473, + -473, -146, -473, -473, -473, -473, -473, -473, -473, -473, + -151, -473, -473, -473, -148, 166, -473, -473, -473, -473, + -473, -473, -473, -155, -473, -473, -473, -473, -473, -473, + -473, -473, -473, -473, -134, -473, -473, -473, -131, 202, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -472, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -137, -473, -473, -473, -134, -473, 174, -473, -49, - -473, -473, -473, -473, -473, -47, -473, -473, -473, -473, - -473, -51, -473, -473, -473, -135, -473, -473, -473, -127, - -473, 171, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -163, -473, -473, -473, -153, 206, -473, -473, - -473, -473, -473, -473, -473, -473, -156, -473, -473, -473, - -145, -473, 209, -48, -473, -297, -473, -296, -473, -473, + -473, -473, -472, -473, -473, -473, -473, -473, -473, -473, + -473, -473, -133, -473, -473, -473, -132, -473, 181, -473, + -49, -473, -473, -473, -473, -473, -47, -473, -473, -473, + -473, -473, -51, -473, -473, -473, -130, -473, -473, -473, + -125, -473, 198, -473, -473, -473, -473, -473, -473, -473, + -473, -473, -473, -149, -473, -473, -473, -143, 222, -473, + -473, -473, -473, -473, -473, -473, -473, -142, -473, -473, + -473, -139, -473, 214, -48, -473, -297, -473, -296, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -473, 44, -473, -473, -473, -473, -473, -473, - -473, -126, -473, -473, -473, -473, -473, -473, -473, -473, - 61, 173, -473, -473, -473, -473, -473, -473, -473, -473, + -473, -473, -473, -473, 54, -473, -473, -473, -473, -473, + -473, -473, -126, -473, -473, -473, -473, -473, -473, -473, + -473, 64, 190, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, -473, - -473, -473, -473, -84, -473, -473, -473, -198, -473, -473, - -213, -473, -473, -473, -473, -473, -473, -224, -473, -473, - -230, -473 + -473, -473, -473, -473, -83, -473, -473, -473, -200, -473, + -473, -215, -473, -473, -473, -473, -473, -473, -226, -473, + -473, -232, -473 }; const short int @@ -3407,35 +3416,35 @@ namespace isc { namespace dhcp { { -1, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 32, 33, 34, 57, 521, 72, 73, - 35, 56, 69, 70, 501, 630, 689, 690, 106, 37, + 35, 56, 69, 70, 501, 632, 692, 693, 106, 37, 58, 80, 81, 82, 283, 39, 59, 107, 108, 109, 110, 111, 112, 113, 114, 115, 290, 131, 132, 41, 60, 133, 312, 134, 313, 504, 116, 294, 117, 295, - 569, 570, 571, 648, 743, 572, 649, 573, 650, 574, - 651, 211, 348, 576, 577, 578, 579, 118, 303, 597, - 598, 599, 600, 601, 602, 119, 305, 606, 607, 608, - 672, 53, 66, 241, 242, 243, 360, 244, 361, 120, - 306, 615, 616, 617, 618, 619, 620, 621, 622, 121, - 300, 582, 583, 584, 659, 43, 61, 154, 155, 156, - 321, 157, 317, 158, 318, 159, 319, 160, 322, 161, - 323, 162, 327, 163, 326, 164, 165, 122, 301, 586, - 587, 588, 662, 49, 64, 212, 213, 214, 215, 216, - 217, 218, 347, 219, 351, 220, 350, 221, 222, 352, - 223, 123, 302, 590, 591, 592, 665, 51, 65, 230, - 231, 232, 233, 234, 356, 235, 236, 237, 167, 320, - 634, 635, 636, 692, 45, 62, 175, 176, 177, 332, - 178, 333, 168, 328, 638, 639, 640, 695, 47, 63, - 190, 191, 192, 124, 293, 194, 336, 195, 337, 196, - 344, 197, 339, 198, 340, 199, 342, 200, 341, 201, - 343, 202, 338, 170, 329, 642, 698, 125, 304, 604, - 316, 420, 421, 422, 423, 424, 505, 126, 127, 308, - 625, 626, 627, 683, 628, 684, 128, 309, 55, 67, - 261, 262, 263, 264, 365, 265, 366, 266, 267, 368, - 268, 269, 270, 371, 544, 271, 372, 272, 273, 274, - 275, 276, 377, 551, 277, 378, 83, 285, 84, 286, - 85, 284, 556, 557, 558, 644, 758, 759, 760, 768, - 769, 770, 771, 776, 772, 774, 786, 787, 788, 792, - 793, 795 + 570, 571, 572, 650, 747, 573, 651, 574, 652, 575, + 653, 576, 211, 348, 578, 579, 580, 581, 118, 303, + 599, 600, 601, 602, 603, 604, 119, 305, 608, 609, + 610, 675, 53, 66, 241, 242, 243, 360, 244, 361, + 120, 306, 617, 618, 619, 620, 621, 622, 623, 624, + 121, 300, 584, 585, 586, 662, 43, 61, 154, 155, + 156, 321, 157, 317, 158, 318, 159, 319, 160, 322, + 161, 323, 162, 327, 163, 326, 164, 165, 122, 301, + 588, 589, 590, 665, 49, 64, 212, 213, 214, 215, + 216, 217, 218, 347, 219, 351, 220, 350, 221, 222, + 352, 223, 123, 302, 592, 593, 594, 668, 51, 65, + 230, 231, 232, 233, 234, 356, 235, 236, 237, 167, + 320, 636, 637, 638, 695, 45, 62, 175, 176, 177, + 332, 178, 333, 168, 328, 640, 641, 642, 698, 47, + 63, 190, 191, 192, 124, 293, 194, 336, 195, 337, + 196, 344, 197, 339, 198, 340, 199, 342, 200, 341, + 201, 343, 202, 338, 170, 329, 644, 701, 125, 304, + 606, 316, 420, 421, 422, 423, 424, 505, 126, 127, + 308, 627, 628, 629, 686, 630, 687, 128, 309, 55, + 67, 261, 262, 263, 264, 365, 265, 366, 266, 267, + 368, 268, 269, 270, 371, 544, 271, 372, 272, 273, + 274, 275, 276, 377, 551, 277, 378, 83, 285, 84, + 286, 85, 284, 556, 557, 558, 646, 762, 763, 764, + 772, 773, 774, 775, 780, 776, 778, 790, 791, 792, + 796, 797, 799 }; const unsigned short int @@ -3443,76 +3452,77 @@ namespace isc { namespace dhcp { { 79, 150, 227, 149, 173, 188, 210, 226, 240, 260, 166, 174, 189, 169, 68, 193, 228, 151, 229, 418, - 419, 152, 153, 603, 25, 135, 26, 74, 27, 542, - 36, 98, 24, 288, 310, 88, 89, 71, 289, 311, - 86, 171, 172, 314, 330, 87, 88, 89, 315, 331, - 90, 91, 38, 92, 93, 94, 334, 135, 136, 137, - 138, 335, 98, 40, 92, 93, 94, 95, 96, 238, - 239, 139, 97, 98, 140, 141, 142, 143, 144, 145, - 203, 42, 668, 146, 147, 669, 89, 179, 180, 44, - 148, 99, 100, 46, 89, 179, 180, 204, 224, 205, - 206, 225, 204, 101, 205, 206, 102, 207, 208, 209, - 204, 48, 98, 103, 104, 146, 78, 105, 543, 362, - 98, 204, 50, 78, 363, 379, 52, 75, 279, 670, - 380, 181, 671, 76, 77, 182, 183, 184, 185, 186, - 413, 187, 546, 547, 548, 549, 78, 78, 28, 29, - 30, 31, 310, 761, 560, 54, 762, 643, 78, 561, - 562, 563, 564, 565, 566, 567, 129, 130, 550, 609, - 610, 611, 612, 613, 614, 278, 204, 763, 645, 764, - 765, 78, 314, 646, 656, 656, 78, 647, 681, 657, - 658, 685, 281, 682, 78, 379, 686, 78, 718, 330, - 687, 362, 334, 777, 747, 78, 750, 754, 778, 280, - 418, 419, 245, 246, 247, 248, 249, 250, 251, 252, - 253, 254, 255, 256, 257, 258, 259, 796, 789, 282, - 79, 790, 797, 593, 594, 595, 596, 381, 382, 1, + 419, 152, 153, 605, 25, 135, 26, 74, 27, 542, + 135, 98, 24, 204, 288, 88, 89, 129, 130, 289, + 86, 171, 172, 238, 239, 87, 88, 89, 310, 36, + 90, 91, 314, 311, 92, 93, 94, 315, 38, 136, + 137, 138, 40, 98, 42, 92, 93, 94, 95, 96, + 238, 239, 139, 97, 98, 140, 141, 142, 143, 144, + 145, 502, 503, 278, 146, 147, 89, 179, 180, 146, + 44, 148, 99, 100, 89, 179, 180, 78, 625, 626, + 767, 203, 768, 769, 101, 46, 48, 102, 204, 224, + 205, 206, 225, 98, 103, 104, 78, 78, 105, 543, + 330, 98, 204, 50, 204, 331, 205, 206, 75, 207, + 208, 209, 181, 52, 76, 77, 182, 183, 184, 185, + 186, 413, 187, 546, 547, 548, 549, 78, 78, 28, + 29, 30, 31, 334, 671, 560, 54, 672, 335, 78, + 561, 562, 563, 564, 565, 566, 567, 568, 71, 550, + 611, 612, 613, 614, 615, 616, 279, 281, 204, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 502, 503, 78, 415, 739, 740, 741, 742, 414, 287, - 78, 238, 239, 623, 624, 416, 291, 292, 417, 296, - 150, 297, 149, 298, 299, 307, 173, 324, 325, 166, - 345, 346, 169, 174, 349, 353, 151, 354, 188, 355, - 152, 153, 357, 358, 359, 189, 227, 210, 193, 364, - 367, 226, 369, 370, 373, 374, 375, 376, 384, 383, - 228, 385, 229, 386, 387, 389, 392, 393, 394, 390, - 399, 260, 391, 395, 396, 397, 400, 398, 401, 402, - 403, 404, 405, 406, 407, 408, 410, 411, 425, 426, - 427, 428, 429, 430, 485, 486, 431, 432, 433, 434, - 435, 436, 437, 439, 440, 442, 443, 444, 445, 446, - 447, 448, 449, 450, 452, 453, 455, 454, 456, 457, - 458, 460, 461, 463, 464, 466, 467, 468, 469, 470, - 471, 472, 473, 474, 475, 476, 477, 479, 478, 480, - 482, 483, 706, 488, 484, 487, 489, 490, 491, 492, - 493, 494, 495, 496, 508, 509, 497, 498, 499, 500, - 506, 507, 510, 512, 511, 517, 513, 660, 514, 515, - 518, 516, 538, 519, 26, 545, 575, 575, 581, 585, - 589, 568, 568, 605, 522, 523, 631, 525, 633, 661, - 553, 260, 637, 652, 415, 653, 526, 527, 528, 414, - 529, 654, 530, 641, 655, 663, 416, 664, 531, 417, - 667, 666, 673, 674, 693, 675, 676, 677, 678, 532, - 533, 679, 534, 535, 680, 694, 697, 696, 520, 700, - 702, 703, 699, 704, 705, 728, 729, 732, 555, 731, - 737, 524, 536, 738, 757, 537, 775, 539, 748, 749, - 540, 755, 779, 541, 781, 552, 783, 798, 388, 785, - 688, 691, 409, 559, 580, 412, 554, 710, 717, 720, - 719, 707, 465, 727, 708, 712, 711, 714, 713, 459, - 462, 734, 716, 709, 438, 721, 722, 723, 715, 733, - 441, 736, 724, 791, 725, 726, 780, 744, 745, 746, - 735, 632, 481, 751, 752, 451, 753, 756, 784, 730, - 629, 701, 800, 773, 782, 794, 799, 0, 0, 0, + 362, 379, 78, 280, 310, 363, 380, 647, 78, 645, + 314, 722, 648, 282, 659, 649, 78, 287, 78, 660, + 418, 419, 245, 246, 247, 248, 249, 250, 251, 252, + 253, 254, 255, 256, 257, 258, 259, 659, 684, 688, + 79, 379, 661, 685, 689, 330, 690, 381, 382, 362, + 751, 334, 781, 800, 754, 291, 758, 782, 801, 292, + 296, 297, 78, 415, 595, 596, 597, 598, 414, 298, + 673, 765, 78, 674, 766, 416, 793, 345, 417, 794, + 150, 299, 149, 307, 324, 325, 173, 346, 355, 166, + 349, 353, 169, 174, 357, 359, 151, 354, 188, 358, + 152, 153, 364, 367, 369, 189, 227, 210, 193, 370, + 373, 226, 743, 744, 745, 746, 374, 375, 376, 383, + 228, 384, 229, 385, 386, 387, 389, 390, 391, 392, + 393, 260, 394, 395, 396, 399, 397, 398, 400, 401, + 402, 403, 404, 405, 407, 406, 408, 410, 411, 425, + 426, 427, 428, 429, 485, 486, 430, 431, 432, 433, + 434, 435, 436, 437, 439, 440, 442, 443, 444, 445, + 446, 447, 448, 449, 450, 452, 453, 455, 454, 456, + 457, 460, 463, 464, 467, 458, 461, 466, 468, 469, + 470, 471, 472, 473, 474, 475, 476, 477, 479, 478, + 480, 482, 483, 643, 488, 484, 487, 489, 490, 491, + 492, 493, 494, 495, 496, 710, 712, 497, 498, 499, + 500, 506, 507, 508, 509, 510, 511, 512, 517, 518, + 545, 513, 538, 514, 515, 26, 577, 577, 516, 519, + 522, 569, 569, 583, 587, 523, 525, 591, 526, 607, + 553, 260, 633, 527, 415, 664, 635, 528, 639, 414, + 529, 654, 530, 531, 655, 656, 416, 657, 658, 417, + 702, 532, 663, 666, 667, 669, 670, 677, 676, 678, + 533, 534, 679, 680, 535, 536, 681, 682, 683, 697, + 520, 696, 700, 699, 703, 705, 706, 707, 708, 555, + 732, 733, 741, 736, 537, 735, 742, 779, 783, 785, + 752, 539, 540, 541, 753, 552, 759, 761, 691, 787, + 789, 694, 802, 709, 711, 524, 554, 388, 409, 412, + 582, 559, 714, 713, 725, 721, 724, 723, 465, 731, + 716, 715, 438, 717, 718, 726, 459, 727, 728, 729, + 720, 730, 795, 719, 748, 749, 750, 755, 738, 756, + 757, 760, 737, 784, 788, 804, 441, 462, 740, 739, + 451, 634, 734, 631, 704, 777, 786, 798, 803, 481, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 575, 0, 0, 0, 0, 568, 150, - 0, 149, 227, 0, 210, 0, 0, 226, 166, 0, - 0, 169, 0, 0, 240, 151, 228, 0, 229, 152, - 153, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 173, 0, 0, 188, 0, 0, - 0, 174, 0, 0, 189, 0, 0, 193, 0, 0, + 0, 0, 0, 0, 0, 0, 577, 0, 0, 0, + 0, 569, 150, 0, 149, 227, 0, 210, 0, 0, + 226, 166, 0, 0, 169, 0, 0, 240, 151, 228, + 0, 229, 152, 153, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 173, 0, 0, + 188, 0, 0, 0, 174, 0, 0, 189, 0, 0, + 193, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 767, 0, 0, - 0, 0, 766, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 767, 0, 0, 0, 0, 766 + 0, 771, 0, 0, 0, 0, 770, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 771, 0, + 0, 0, 0, 770 }; const short int @@ -3521,215 +3531,216 @@ namespace isc { namespace dhcp { 58, 61, 65, 61, 62, 63, 64, 65, 66, 67, 61, 62, 63, 61, 56, 63, 65, 61, 65, 316, 316, 61, 61, 495, 5, 7, 7, 10, 9, 15, - 7, 44, 0, 3, 3, 17, 18, 129, 8, 8, - 11, 54, 55, 3, 3, 16, 17, 18, 8, 8, - 21, 22, 7, 35, 36, 37, 3, 7, 40, 41, - 42, 8, 44, 7, 35, 36, 37, 38, 39, 75, - 76, 53, 43, 44, 56, 57, 58, 59, 60, 61, - 23, 7, 3, 65, 66, 6, 18, 19, 20, 7, - 72, 62, 63, 7, 18, 19, 20, 45, 46, 47, - 48, 49, 45, 74, 47, 48, 77, 50, 51, 52, - 45, 7, 44, 84, 85, 65, 129, 88, 104, 3, - 44, 45, 7, 129, 8, 3, 7, 110, 3, 3, - 8, 63, 6, 116, 117, 67, 68, 69, 70, 71, - 64, 73, 106, 107, 108, 109, 129, 129, 129, 130, - 131, 132, 3, 3, 23, 7, 6, 8, 129, 28, - 29, 30, 31, 32, 33, 34, 12, 13, 132, 78, - 79, 80, 81, 82, 83, 6, 45, 112, 3, 114, - 115, 129, 3, 8, 3, 3, 129, 8, 3, 8, - 8, 3, 8, 8, 129, 3, 8, 129, 670, 3, - 8, 3, 3, 3, 8, 129, 8, 8, 8, 4, - 507, 507, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 99, 100, 101, 102, 103, 3, 3, 3, - 288, 6, 8, 67, 68, 69, 70, 279, 280, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 14, 15, 129, 316, 24, 25, 26, 27, 316, 4, - 129, 75, 76, 86, 87, 316, 4, 4, 316, 4, - 330, 4, 330, 4, 4, 4, 334, 4, 4, 330, - 8, 3, 330, 334, 4, 4, 330, 8, 346, 3, - 330, 330, 4, 8, 3, 346, 359, 355, 346, 4, - 4, 359, 4, 4, 4, 4, 4, 4, 4, 129, - 359, 4, 359, 4, 4, 4, 4, 4, 4, 132, - 4, 379, 132, 130, 130, 130, 4, 130, 4, 4, - 4, 4, 4, 130, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 386, 387, 4, 130, 132, 4, + 7, 45, 0, 46, 3, 17, 18, 12, 13, 8, + 11, 55, 56, 76, 77, 16, 17, 18, 3, 7, + 21, 22, 3, 8, 36, 37, 38, 8, 7, 41, + 42, 43, 7, 45, 7, 36, 37, 38, 39, 40, + 76, 77, 54, 44, 45, 57, 58, 59, 60, 61, + 62, 14, 15, 6, 66, 67, 18, 19, 20, 66, + 7, 73, 63, 64, 18, 19, 20, 130, 87, 88, + 113, 23, 115, 116, 75, 7, 7, 78, 46, 47, + 48, 49, 50, 45, 85, 86, 130, 130, 89, 105, + 3, 45, 46, 7, 46, 8, 48, 49, 111, 51, + 52, 53, 64, 7, 117, 118, 68, 69, 70, 71, + 72, 65, 74, 107, 108, 109, 110, 130, 130, 130, + 131, 132, 133, 3, 3, 23, 7, 6, 8, 130, + 28, 29, 30, 31, 32, 33, 34, 35, 130, 133, + 79, 80, 81, 82, 83, 84, 3, 8, 46, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 3, 3, 130, 4, 3, 8, 8, 3, 130, 8, + 3, 673, 8, 3, 3, 8, 130, 4, 130, 8, + 507, 507, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, 100, 101, 102, 103, 104, 3, 3, 3, + 288, 3, 8, 8, 8, 3, 8, 279, 280, 3, + 8, 3, 3, 3, 8, 4, 8, 8, 8, 4, + 4, 4, 130, 316, 68, 69, 70, 71, 316, 4, + 3, 3, 130, 6, 6, 316, 3, 8, 316, 6, + 330, 4, 330, 4, 4, 4, 334, 3, 3, 330, + 4, 4, 330, 334, 4, 3, 330, 8, 346, 8, + 330, 330, 4, 4, 4, 346, 359, 355, 346, 4, + 4, 359, 24, 25, 26, 27, 4, 4, 4, 130, + 359, 4, 359, 4, 4, 4, 4, 133, 133, 4, + 4, 379, 4, 131, 131, 4, 131, 131, 4, 4, + 4, 4, 4, 4, 4, 131, 4, 4, 4, 4, + 4, 4, 4, 4, 386, 387, 4, 4, 131, 133, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 130, 4, 4, - 132, 4, 132, 4, 4, 132, 4, 4, 130, 4, - 130, 130, 4, 4, 132, 132, 132, 4, 132, 4, - 4, 7, 132, 129, 7, 7, 7, 7, 5, 5, - 5, 5, 5, 5, 129, 129, 7, 7, 7, 5, - 8, 3, 129, 129, 5, 5, 129, 6, 129, 129, - 7, 129, 464, 129, 7, 105, 489, 490, 7, 7, - 7, 489, 490, 7, 129, 129, 4, 129, 7, 3, - 482, 499, 7, 4, 507, 4, 129, 129, 129, 507, - 129, 4, 129, 73, 4, 6, 507, 3, 129, 507, - 3, 6, 6, 3, 6, 4, 4, 4, 4, 129, - 129, 4, 129, 129, 4, 3, 3, 6, 440, 4, - 4, 4, 8, 4, 4, 4, 4, 3, 111, 6, - 4, 444, 129, 5, 7, 129, 4, 129, 8, 8, - 129, 8, 4, 129, 4, 129, 5, 4, 288, 7, - 129, 129, 310, 487, 490, 314, 483, 656, 668, 674, - 672, 130, 362, 681, 132, 661, 659, 664, 662, 355, - 359, 694, 667, 130, 330, 130, 130, 130, 665, 692, - 334, 697, 130, 113, 130, 130, 130, 129, 129, 129, - 695, 507, 379, 129, 129, 346, 129, 129, 129, 685, - 499, 645, 129, 761, 777, 789, 796, -1, -1, -1, + 4, 4, 4, 4, 4, 4, 4, 4, 131, 4, + 4, 4, 4, 4, 4, 133, 133, 133, 4, 131, + 4, 131, 131, 4, 4, 133, 133, 133, 4, 133, + 4, 4, 7, 74, 130, 7, 7, 7, 7, 5, + 5, 5, 5, 5, 5, 133, 133, 7, 7, 7, + 5, 8, 3, 130, 130, 130, 5, 130, 5, 7, + 106, 130, 464, 130, 130, 7, 489, 490, 130, 130, + 130, 489, 490, 7, 7, 130, 130, 7, 130, 7, + 482, 499, 4, 130, 507, 3, 7, 130, 7, 507, + 130, 4, 130, 130, 4, 4, 507, 4, 4, 507, + 8, 130, 6, 6, 3, 6, 3, 3, 6, 4, + 130, 130, 4, 4, 130, 130, 4, 4, 4, 3, + 440, 6, 3, 6, 4, 4, 4, 4, 4, 112, + 4, 4, 4, 3, 130, 6, 5, 4, 4, 4, + 8, 130, 130, 130, 8, 130, 8, 7, 130, 5, + 7, 130, 4, 131, 131, 444, 483, 288, 310, 314, + 490, 487, 659, 131, 131, 671, 677, 675, 362, 684, + 664, 662, 330, 665, 667, 131, 355, 131, 131, 131, + 670, 131, 114, 668, 130, 130, 130, 130, 697, 130, + 130, 130, 695, 131, 130, 130, 334, 359, 700, 698, + 346, 507, 688, 499, 647, 765, 781, 793, 800, 379, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 656, -1, -1, -1, -1, 656, 659, - -1, 659, 665, -1, 662, -1, -1, 665, 659, -1, - -1, 659, -1, -1, 672, 659, 665, -1, 665, 659, - 659, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 692, -1, -1, 695, -1, -1, - -1, 692, -1, -1, 695, -1, -1, 695, -1, -1, + -1, -1, -1, -1, -1, -1, 659, -1, -1, -1, + -1, 659, 662, -1, 662, 668, -1, 665, -1, -1, + 668, 662, -1, -1, 662, -1, -1, 675, 662, 668, + -1, 668, 662, 662, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 695, -1, -1, + 698, -1, -1, -1, 695, -1, -1, 698, -1, -1, + 698, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 760, -1, -1, - -1, -1, 760, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 777, -1, -1, -1, -1, 777 + -1, 764, -1, -1, -1, -1, 764, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 781, -1, + -1, -1, -1, 781 }; const unsigned short int Dhcp4Parser::yystos_[] = { - 0, 118, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 134, 135, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 145, 0, 5, 7, 9, 129, 130, - 131, 132, 146, 147, 148, 153, 7, 162, 7, 168, - 7, 182, 7, 248, 7, 317, 7, 331, 7, 276, - 7, 300, 7, 224, 7, 381, 154, 149, 163, 169, - 183, 249, 318, 332, 277, 301, 225, 382, 146, 155, - 156, 129, 151, 152, 10, 110, 116, 117, 129, 161, - 164, 165, 166, 409, 411, 413, 11, 16, 17, 18, - 21, 22, 35, 36, 37, 38, 39, 43, 44, 62, - 63, 74, 77, 84, 85, 88, 161, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 189, 191, 210, 218, - 232, 242, 270, 294, 336, 360, 370, 371, 379, 12, - 13, 180, 181, 184, 186, 7, 40, 41, 42, 53, - 56, 57, 58, 59, 60, 61, 65, 66, 72, 161, - 172, 173, 174, 177, 250, 251, 252, 254, 256, 258, - 260, 262, 264, 266, 268, 269, 294, 311, 325, 336, - 356, 54, 55, 161, 294, 319, 320, 321, 323, 19, - 20, 63, 67, 68, 69, 70, 71, 73, 161, 294, - 333, 334, 335, 336, 338, 340, 342, 344, 346, 348, - 350, 352, 354, 23, 45, 47, 48, 50, 51, 52, - 161, 204, 278, 279, 280, 281, 282, 283, 284, 286, - 288, 290, 291, 293, 46, 49, 161, 204, 282, 288, - 302, 303, 304, 305, 306, 308, 309, 310, 75, 76, - 161, 226, 227, 228, 230, 89, 90, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, - 161, 383, 384, 385, 386, 388, 390, 391, 393, 394, - 395, 398, 400, 401, 402, 403, 404, 407, 6, 3, - 4, 8, 3, 167, 414, 410, 412, 4, 3, 8, - 179, 4, 4, 337, 190, 192, 4, 4, 4, 4, - 243, 271, 295, 211, 361, 219, 233, 4, 372, 380, - 3, 8, 185, 187, 3, 8, 363, 255, 257, 259, - 312, 253, 261, 263, 4, 4, 267, 265, 326, 357, - 3, 8, 322, 324, 3, 8, 339, 341, 355, 345, - 347, 351, 349, 353, 343, 8, 3, 285, 205, 4, - 289, 287, 292, 4, 8, 3, 307, 4, 8, 3, - 229, 231, 3, 8, 4, 387, 389, 4, 392, 4, - 4, 396, 399, 4, 4, 4, 4, 405, 408, 3, - 8, 146, 146, 129, 4, 4, 4, 4, 165, 4, - 132, 132, 4, 4, 4, 130, 130, 130, 130, 4, - 4, 4, 4, 4, 4, 4, 130, 4, 4, 171, - 4, 4, 181, 64, 161, 204, 294, 336, 338, 340, - 364, 365, 366, 367, 368, 4, 4, 4, 4, 4, - 4, 4, 130, 132, 4, 4, 4, 4, 251, 4, - 4, 320, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 335, 4, 4, 130, 4, 4, 4, 132, 280, - 4, 132, 304, 4, 4, 227, 132, 4, 4, 130, - 4, 130, 130, 4, 4, 132, 132, 132, 132, 4, - 4, 384, 4, 7, 7, 146, 146, 7, 129, 7, + 0, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 0, 5, 7, 9, 130, 131, + 132, 133, 147, 148, 149, 154, 7, 163, 7, 169, + 7, 183, 7, 250, 7, 319, 7, 333, 7, 278, + 7, 302, 7, 226, 7, 383, 155, 150, 164, 170, + 184, 251, 320, 334, 279, 303, 227, 384, 147, 156, + 157, 130, 152, 153, 10, 111, 117, 118, 130, 162, + 165, 166, 167, 411, 413, 415, 11, 16, 17, 18, + 21, 22, 36, 37, 38, 39, 40, 44, 45, 63, + 64, 75, 78, 85, 86, 89, 162, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 190, 192, 212, 220, + 234, 244, 272, 296, 338, 362, 372, 373, 381, 12, + 13, 181, 182, 185, 187, 7, 41, 42, 43, 54, + 57, 58, 59, 60, 61, 62, 66, 67, 73, 162, + 173, 174, 175, 178, 252, 253, 254, 256, 258, 260, + 262, 264, 266, 268, 270, 271, 296, 313, 327, 338, + 358, 55, 56, 162, 296, 321, 322, 323, 325, 19, + 20, 64, 68, 69, 70, 71, 72, 74, 162, 296, + 335, 336, 337, 338, 340, 342, 344, 346, 348, 350, + 352, 354, 356, 23, 46, 48, 49, 51, 52, 53, + 162, 206, 280, 281, 282, 283, 284, 285, 286, 288, + 290, 292, 293, 295, 47, 50, 162, 206, 284, 290, + 304, 305, 306, 307, 308, 310, 311, 312, 76, 77, + 162, 228, 229, 230, 232, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, + 162, 385, 386, 387, 388, 390, 392, 393, 395, 396, + 397, 400, 402, 403, 404, 405, 406, 409, 6, 3, + 4, 8, 3, 168, 416, 412, 414, 4, 3, 8, + 180, 4, 4, 339, 191, 193, 4, 4, 4, 4, + 245, 273, 297, 213, 363, 221, 235, 4, 374, 382, + 3, 8, 186, 188, 3, 8, 365, 257, 259, 261, + 314, 255, 263, 265, 4, 4, 269, 267, 328, 359, + 3, 8, 324, 326, 3, 8, 341, 343, 357, 347, + 349, 353, 351, 355, 345, 8, 3, 287, 207, 4, + 291, 289, 294, 4, 8, 3, 309, 4, 8, 3, + 231, 233, 3, 8, 4, 389, 391, 4, 394, 4, + 4, 398, 401, 4, 4, 4, 4, 407, 410, 3, + 8, 147, 147, 130, 4, 4, 4, 4, 166, 4, + 133, 133, 4, 4, 4, 131, 131, 131, 131, 4, + 4, 4, 4, 4, 4, 4, 131, 4, 4, 172, + 4, 4, 182, 65, 162, 206, 296, 338, 340, 342, + 366, 367, 368, 369, 370, 4, 4, 4, 4, 4, + 4, 4, 131, 133, 4, 4, 4, 4, 253, 4, + 4, 322, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 337, 4, 4, 131, 4, 4, 4, 133, 282, + 4, 133, 306, 4, 4, 229, 133, 4, 4, 131, + 4, 131, 131, 4, 4, 133, 133, 133, 133, 4, + 4, 386, 4, 7, 7, 147, 147, 7, 130, 7, 7, 5, 5, 5, 5, 5, 5, 7, 7, 7, - 5, 157, 14, 15, 188, 369, 8, 3, 129, 129, - 129, 5, 129, 129, 129, 129, 129, 5, 7, 129, - 148, 150, 129, 129, 157, 129, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 146, 129, - 129, 129, 15, 104, 397, 105, 106, 107, 108, 109, - 132, 406, 129, 146, 170, 111, 415, 416, 417, 180, - 23, 28, 29, 30, 31, 32, 33, 34, 161, 193, - 194, 195, 198, 200, 202, 204, 206, 207, 208, 209, - 193, 7, 244, 245, 246, 7, 272, 273, 274, 7, - 296, 297, 298, 67, 68, 69, 70, 212, 213, 214, - 215, 216, 217, 264, 362, 7, 220, 221, 222, 78, - 79, 80, 81, 82, 83, 234, 235, 236, 237, 238, - 239, 240, 241, 86, 87, 373, 374, 375, 377, 383, - 158, 4, 366, 7, 313, 314, 315, 7, 327, 328, - 329, 73, 358, 8, 418, 3, 8, 8, 196, 199, - 201, 203, 4, 4, 4, 4, 3, 8, 8, 247, - 6, 3, 275, 6, 3, 299, 6, 3, 3, 6, - 3, 6, 223, 6, 3, 4, 4, 4, 4, 4, - 4, 3, 8, 376, 378, 3, 8, 8, 129, 159, - 160, 129, 316, 6, 3, 330, 6, 3, 359, 8, - 4, 416, 4, 4, 4, 4, 132, 130, 132, 130, - 194, 250, 246, 278, 274, 302, 298, 213, 264, 226, - 222, 130, 130, 130, 130, 130, 130, 235, 4, 4, - 374, 6, 3, 319, 315, 333, 329, 4, 5, 24, - 25, 26, 27, 197, 129, 129, 129, 8, 8, 8, - 8, 129, 129, 129, 8, 8, 129, 7, 419, 420, - 421, 3, 6, 112, 114, 115, 161, 204, 422, 423, - 424, 425, 427, 420, 428, 4, 426, 3, 8, 4, - 130, 4, 423, 5, 129, 7, 429, 430, 431, 3, - 6, 113, 432, 433, 430, 434, 3, 8, 4, 433, - 129 + 5, 158, 14, 15, 189, 371, 8, 3, 130, 130, + 130, 5, 130, 130, 130, 130, 130, 5, 7, 130, + 149, 151, 130, 130, 158, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 130, 130, 130, 130, 147, 130, + 130, 130, 15, 105, 399, 106, 107, 108, 109, 110, + 133, 408, 130, 147, 171, 112, 417, 418, 419, 181, + 23, 28, 29, 30, 31, 32, 33, 34, 35, 162, + 194, 195, 196, 199, 201, 203, 205, 206, 208, 209, + 210, 211, 194, 7, 246, 247, 248, 7, 274, 275, + 276, 7, 298, 299, 300, 68, 69, 70, 71, 214, + 215, 216, 217, 218, 219, 266, 364, 7, 222, 223, + 224, 79, 80, 81, 82, 83, 84, 236, 237, 238, + 239, 240, 241, 242, 243, 87, 88, 375, 376, 377, + 379, 385, 159, 4, 368, 7, 315, 316, 317, 7, + 329, 330, 331, 74, 360, 8, 420, 3, 8, 8, + 197, 200, 202, 204, 4, 4, 4, 4, 4, 3, + 8, 8, 249, 6, 3, 277, 6, 3, 301, 6, + 3, 3, 6, 3, 6, 225, 6, 3, 4, 4, + 4, 4, 4, 4, 3, 8, 378, 380, 3, 8, + 8, 130, 160, 161, 130, 318, 6, 3, 332, 6, + 3, 361, 8, 4, 418, 4, 4, 4, 4, 131, + 133, 131, 133, 131, 195, 252, 248, 280, 276, 304, + 300, 215, 266, 228, 224, 131, 131, 131, 131, 131, + 131, 237, 4, 4, 376, 6, 3, 321, 317, 335, + 331, 4, 5, 24, 25, 26, 27, 198, 130, 130, + 130, 8, 8, 8, 8, 130, 130, 130, 8, 8, + 130, 7, 421, 422, 423, 3, 6, 113, 115, 116, + 162, 206, 424, 425, 426, 427, 429, 422, 430, 4, + 428, 3, 8, 4, 131, 4, 425, 5, 130, 7, + 431, 432, 433, 3, 6, 114, 434, 435, 432, 436, + 3, 8, 4, 435, 130 }; const unsigned short int Dhcp4Parser::yyr1_[] = { - 0, 133, 135, 134, 136, 134, 137, 134, 138, 134, - 139, 134, 140, 134, 141, 134, 142, 134, 143, 134, - 144, 134, 145, 134, 146, 146, 146, 146, 146, 146, - 146, 147, 149, 148, 150, 151, 151, 152, 152, 154, - 153, 155, 155, 156, 156, 158, 157, 159, 159, 160, - 160, 161, 163, 162, 164, 164, 165, 165, 165, 165, - 165, 167, 166, 169, 168, 170, 170, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 172, 173, - 174, 175, 176, 177, 179, 178, 180, 180, 181, 181, - 183, 182, 185, 184, 187, 186, 188, 188, 190, 189, - 192, 191, 193, 193, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 196, 195, 197, 197, 197, 197, - 199, 198, 201, 200, 203, 202, 205, 204, 206, 207, - 208, 209, 211, 210, 212, 212, 213, 213, 213, 213, - 214, 215, 216, 217, 219, 218, 220, 220, 221, 221, - 223, 222, 225, 224, 226, 226, 226, 227, 227, 229, - 228, 231, 230, 233, 232, 234, 234, 235, 235, 235, - 235, 235, 235, 236, 237, 238, 239, 240, 241, 243, - 242, 244, 244, 245, 245, 247, 246, 249, 248, 250, - 250, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, - 251, 253, 252, 255, 254, 257, 256, 259, 258, 261, - 260, 263, 262, 265, 264, 267, 266, 268, 269, 271, - 270, 272, 272, 273, 273, 275, 274, 277, 276, 278, - 278, 279, 279, 280, 280, 280, 280, 280, 280, 280, - 280, 281, 282, 283, 285, 284, 287, 286, 289, 288, - 290, 292, 291, 293, 295, 294, 296, 296, 297, 297, - 299, 298, 301, 300, 302, 302, 303, 303, 304, 304, - 304, 304, 304, 304, 305, 307, 306, 308, 309, 310, - 312, 311, 313, 313, 314, 314, 316, 315, 318, 317, - 319, 319, 320, 320, 320, 320, 322, 321, 324, 323, - 326, 325, 327, 327, 328, 328, 330, 329, 332, 331, - 333, 333, 334, 334, 335, 335, 335, 335, 335, 335, - 335, 335, 335, 335, 335, 335, 337, 336, 339, 338, + 0, 134, 136, 135, 137, 135, 138, 135, 139, 135, + 140, 135, 141, 135, 142, 135, 143, 135, 144, 135, + 145, 135, 146, 135, 147, 147, 147, 147, 147, 147, + 147, 148, 150, 149, 151, 152, 152, 153, 153, 155, + 154, 156, 156, 157, 157, 159, 158, 160, 160, 161, + 161, 162, 164, 163, 165, 165, 166, 166, 166, 166, + 166, 168, 167, 170, 169, 171, 171, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 173, 174, + 175, 176, 177, 178, 180, 179, 181, 181, 182, 182, + 184, 183, 186, 185, 188, 187, 189, 189, 191, 190, + 193, 192, 194, 194, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 197, 196, 198, 198, 198, + 198, 200, 199, 202, 201, 204, 203, 205, 207, 206, + 208, 209, 210, 211, 213, 212, 214, 214, 215, 215, + 215, 215, 216, 217, 218, 219, 221, 220, 222, 222, + 223, 223, 225, 224, 227, 226, 228, 228, 228, 229, + 229, 231, 230, 233, 232, 235, 234, 236, 236, 237, + 237, 237, 237, 237, 237, 238, 239, 240, 241, 242, + 243, 245, 244, 246, 246, 247, 247, 249, 248, 251, + 250, 252, 252, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 255, 254, 257, 256, 259, 258, 261, + 260, 263, 262, 265, 264, 267, 266, 269, 268, 270, + 271, 273, 272, 274, 274, 275, 275, 277, 276, 279, + 278, 280, 280, 281, 281, 282, 282, 282, 282, 282, + 282, 282, 282, 283, 284, 285, 287, 286, 289, 288, + 291, 290, 292, 294, 293, 295, 297, 296, 298, 298, + 299, 299, 301, 300, 303, 302, 304, 304, 305, 305, + 306, 306, 306, 306, 306, 306, 307, 309, 308, 310, + 311, 312, 314, 313, 315, 315, 316, 316, 318, 317, + 320, 319, 321, 321, 322, 322, 322, 322, 324, 323, + 326, 325, 328, 327, 329, 329, 330, 330, 332, 331, + 334, 333, 335, 335, 336, 336, 337, 337, 337, 337, + 337, 337, 337, 337, 337, 337, 337, 337, 339, 338, 341, 340, 343, 342, 345, 344, 347, 346, 349, 348, 351, 350, 353, 352, 355, 354, 357, 356, 359, 358, - 361, 360, 362, 362, 363, 264, 364, 364, 365, 365, - 366, 366, 366, 366, 366, 366, 366, 367, 369, 368, - 370, 372, 371, 373, 373, 374, 374, 376, 375, 378, - 377, 380, 379, 382, 381, 383, 383, 384, 384, 384, - 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, - 384, 384, 384, 385, 387, 386, 389, 388, 390, 392, - 391, 393, 394, 396, 395, 397, 397, 399, 398, 400, - 401, 402, 403, 405, 404, 406, 406, 406, 406, 406, - 408, 407, 410, 409, 412, 411, 414, 413, 415, 415, - 416, 418, 417, 419, 419, 421, 420, 422, 422, 423, - 423, 423, 423, 423, 424, 426, 425, 428, 427, 429, - 429, 431, 430, 432, 432, 434, 433 + 361, 360, 363, 362, 364, 364, 365, 266, 366, 366, + 367, 367, 368, 368, 368, 368, 368, 368, 368, 369, + 371, 370, 372, 374, 373, 375, 375, 376, 376, 378, + 377, 380, 379, 382, 381, 384, 383, 385, 385, 386, + 386, 386, 386, 386, 386, 386, 386, 386, 386, 386, + 386, 386, 386, 386, 386, 387, 389, 388, 391, 390, + 392, 394, 393, 395, 396, 398, 397, 399, 399, 401, + 400, 402, 403, 404, 405, 407, 406, 408, 408, 408, + 408, 408, 410, 409, 412, 411, 414, 413, 416, 415, + 417, 417, 418, 420, 419, 421, 421, 423, 422, 424, + 424, 425, 425, 425, 425, 425, 426, 428, 427, 430, + 429, 431, 431, 433, 432, 434, 434, 436, 435 }; const unsigned char @@ -3747,43 +3758,43 @@ namespace isc { namespace dhcp { 3, 3, 3, 3, 0, 6, 1, 3, 1, 1, 0, 4, 0, 4, 0, 4, 1, 1, 0, 6, 0, 6, 1, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 4, 1, 1, 1, 1, - 0, 4, 0, 4, 0, 4, 0, 4, 3, 3, - 3, 3, 0, 6, 1, 3, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 6, 0, 1, 1, 3, - 0, 4, 0, 4, 1, 3, 1, 1, 1, 0, - 4, 0, 4, 0, 6, 1, 3, 1, 1, 1, - 1, 1, 1, 3, 3, 3, 3, 3, 3, 0, - 6, 0, 1, 1, 3, 0, 4, 0, 4, 1, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 4, 1, 1, 1, + 1, 0, 4, 0, 4, 0, 4, 3, 0, 4, + 3, 3, 3, 3, 0, 6, 1, 3, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 6, 0, 1, + 1, 3, 0, 4, 0, 4, 1, 3, 1, 1, + 1, 0, 4, 0, 4, 0, 6, 1, 3, 1, + 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, + 3, 0, 6, 0, 1, 1, 3, 0, 4, 0, + 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 4, 0, 4, 0, 4, 0, 4, 0, - 4, 0, 4, 0, 4, 0, 4, 3, 3, 0, - 6, 0, 1, 1, 3, 0, 4, 0, 4, 0, - 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 3, 1, 0, 4, 0, 4, 0, 4, - 1, 0, 4, 3, 0, 6, 0, 1, 1, 3, - 0, 4, 0, 4, 0, 1, 1, 3, 1, 1, - 1, 1, 1, 1, 1, 0, 4, 1, 1, 3, - 0, 6, 0, 1, 1, 3, 0, 4, 0, 4, - 1, 3, 1, 1, 1, 1, 0, 4, 0, 4, - 0, 6, 0, 1, 1, 3, 0, 4, 0, 4, - 0, 1, 1, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 4, 0, 4, - 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, - 0, 4, 0, 4, 0, 4, 0, 6, 0, 4, - 0, 6, 1, 3, 0, 4, 0, 1, 1, 3, + 1, 1, 1, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 4, 0, 4, 0, 4, 3, + 3, 0, 6, 0, 1, 1, 3, 0, 4, 0, + 4, 0, 1, 1, 3, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 1, 0, 4, 0, 4, + 0, 4, 1, 0, 4, 3, 0, 6, 0, 1, + 1, 3, 0, 4, 0, 4, 0, 1, 1, 3, + 1, 1, 1, 1, 1, 1, 1, 0, 4, 1, + 1, 3, 0, 6, 0, 1, 1, 3, 0, 4, + 0, 4, 1, 3, 1, 1, 1, 1, 0, 4, + 0, 4, 0, 6, 0, 1, 1, 3, 0, 4, + 0, 4, 0, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 4, - 3, 0, 6, 1, 3, 1, 1, 0, 4, 0, - 4, 0, 6, 0, 4, 1, 3, 1, 1, 1, + 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, + 0, 4, 0, 4, 0, 4, 0, 4, 0, 6, + 0, 4, 0, 6, 1, 3, 0, 4, 0, 1, + 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 4, 3, 0, 6, 1, 3, 1, 1, 0, + 4, 0, 4, 0, 6, 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 3, 0, 4, 0, 4, 3, 0, - 4, 3, 3, 0, 4, 1, 1, 0, 4, 3, - 3, 3, 3, 0, 4, 1, 1, 1, 1, 1, - 0, 4, 0, 4, 0, 4, 0, 6, 1, 3, - 1, 0, 6, 1, 3, 0, 4, 1, 3, 1, - 1, 1, 1, 1, 3, 0, 4, 0, 6, 1, - 3, 0, 4, 1, 3, 0, 4 + 1, 1, 1, 1, 1, 3, 0, 4, 0, 4, + 3, 0, 4, 3, 3, 0, 4, 1, 1, 0, + 4, 3, 3, 3, 3, 0, 4, 1, 1, 1, + 1, 1, 0, 4, 0, 4, 0, 4, 0, 6, + 1, 3, 1, 0, 6, 1, 3, 0, 4, 1, + 3, 1, 1, 1, 1, 1, 3, 0, 4, 0, + 6, 1, 3, 0, 4, 1, 3, 0, 4 }; @@ -3800,52 +3811,53 @@ namespace isc { namespace dhcp { "\"next-server\"", "\"server-hostname\"", "\"boot-file-name\"", "\"lease-database\"", "\"hosts-database\"", "\"type\"", "\"memfile\"", "\"mysql\"", "\"postgresql\"", "\"cql\"", "\"user\"", "\"password\"", - "\"host\"", "\"persist\"", "\"lfc-interval\"", "\"readonly\"", - "\"connect-timeout\"", "\"valid-lifetime\"", "\"renew-timer\"", - "\"rebind-timer\"", "\"decline-probation-period\"", "\"subnet4\"", - "\"4o6-interface\"", "\"4o6-interface-id\"", "\"4o6-subnet\"", - "\"option-def\"", "\"option-data\"", "\"name\"", "\"data\"", "\"code\"", - "\"space\"", "\"csv-format\"", "\"record-types\"", "\"encapsulate\"", - "\"array\"", "\"pools\"", "\"pool\"", "\"user-context\"", "\"subnet\"", - "\"interface\"", "\"interface-id\"", "\"id\"", "\"rapid-commit\"", - "\"reservation-mode\"", "\"host-reservation-identifiers\"", - "\"client-classes\"", "\"test\"", "\"client-class\"", "\"reservations\"", - "\"duid\"", "\"hw-address\"", "\"circuit-id\"", "\"client-id\"", - "\"hostname\"", "\"relay\"", "\"ip-address\"", "\"hooks-libraries\"", - "\"library\"", "\"parameters\"", "\"expired-leases-processing\"", - "\"reclaim-timer-wait-time\"", "\"flush-reclaimed-timer-wait-time\"", - "\"hold-reclaimed-time\"", "\"max-reclaim-leases\"", - "\"max-reclaim-time\"", "\"unwarned-reclaim-cycles\"", - "\"dhcp4o6-port\"", "\"control-socket\"", "\"socket-type\"", - "\"socket-name\"", "\"dhcp-ddns\"", "\"enable-updates\"", - "\"qualifying-suffix\"", "\"server-ip\"", "\"server-port\"", - "\"sender-ip\"", "\"sender-port\"", "\"max-queue-size\"", - "\"ncr-protocol\"", "\"ncr-format\"", "\"always-include-fqdn\"", - "\"allow-client-update\"", "\"override-no-update\"", - "\"override-client-update\"", "\"replace-client-name\"", - "\"generated-prefix\"", "\"tcp\"", "\"JSON\"", "\"when-present\"", - "\"never\"", "\"always\"", "\"when-not-present\"", "\"Logging\"", - "\"loggers\"", "\"output_options\"", "\"output\"", "\"debuglevel\"", - "\"severity\"", "\"Dhcp6\"", "\"DhcpDdns\"", "TOPLEVEL_JSON", - "TOPLEVEL_DHCP4", "SUB_DHCP4", "SUB_INTERFACES4", "SUB_SUBNET4", - "SUB_POOL4", "SUB_RESERVATION", "SUB_OPTION_DEF", "SUB_OPTION_DATA", - "SUB_HOOKS_LIBRARY", "SUB_DHCP_DDNS", "\"constant string\"", - "\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start", - "$@1", "$@2", "$@3", "$@4", "$@5", "$@6", "$@7", "$@8", "$@9", "$@10", - "$@11", "value", "sub_json", "map2", "$@12", "map_value", "map_content", - "not_empty_map", "list_generic", "$@13", "list_content", - "not_empty_list", "list_strings", "$@14", "list_strings_content", - "not_empty_list_strings", "unknown_map_entry", "syntax_map", "$@15", - "global_objects", "global_object", "dhcp4_object", "$@16", "sub_dhcp4", - "$@17", "global_params", "global_param", "valid_lifetime", "renew_timer", - "rebind_timer", "decline_probation_period", "echo_client_id", - "match_client_id", "interfaces_config", "$@18", - "interfaces_config_params", "interfaces_config_param", "sub_interfaces4", - "$@19", "interfaces_list", "$@20", "dhcp_socket_type", "$@21", - "socket_type", "lease_database", "$@22", "hosts_database", "$@23", - "database_map_params", "database_map_param", "database_type", "$@24", - "db_type", "user", "$@25", "password", "$@26", "host", "$@27", "name", - "$@28", "persist", "lfc_interval", "readonly", "connect_timeout", + "\"host\"", "\"port\"", "\"persist\"", "\"lfc-interval\"", + "\"readonly\"", "\"connect-timeout\"", "\"valid-lifetime\"", + "\"renew-timer\"", "\"rebind-timer\"", "\"decline-probation-period\"", + "\"subnet4\"", "\"4o6-interface\"", "\"4o6-interface-id\"", + "\"4o6-subnet\"", "\"option-def\"", "\"option-data\"", "\"name\"", + "\"data\"", "\"code\"", "\"space\"", "\"csv-format\"", + "\"record-types\"", "\"encapsulate\"", "\"array\"", "\"pools\"", + "\"pool\"", "\"user-context\"", "\"subnet\"", "\"interface\"", + "\"interface-id\"", "\"id\"", "\"rapid-commit\"", "\"reservation-mode\"", + "\"host-reservation-identifiers\"", "\"client-classes\"", "\"test\"", + "\"client-class\"", "\"reservations\"", "\"duid\"", "\"hw-address\"", + "\"circuit-id\"", "\"client-id\"", "\"hostname\"", "\"relay\"", + "\"ip-address\"", "\"hooks-libraries\"", "\"library\"", "\"parameters\"", + "\"expired-leases-processing\"", "\"reclaim-timer-wait-time\"", + "\"flush-reclaimed-timer-wait-time\"", "\"hold-reclaimed-time\"", + "\"max-reclaim-leases\"", "\"max-reclaim-time\"", + "\"unwarned-reclaim-cycles\"", "\"dhcp4o6-port\"", "\"control-socket\"", + "\"socket-type\"", "\"socket-name\"", "\"dhcp-ddns\"", + "\"enable-updates\"", "\"qualifying-suffix\"", "\"server-ip\"", + "\"server-port\"", "\"sender-ip\"", "\"sender-port\"", + "\"max-queue-size\"", "\"ncr-protocol\"", "\"ncr-format\"", + "\"always-include-fqdn\"", "\"allow-client-update\"", + "\"override-no-update\"", "\"override-client-update\"", + "\"replace-client-name\"", "\"generated-prefix\"", "\"tcp\"", "\"JSON\"", + "\"when-present\"", "\"never\"", "\"always\"", "\"when-not-present\"", + "\"Logging\"", "\"loggers\"", "\"output_options\"", "\"output\"", + "\"debuglevel\"", "\"severity\"", "\"Dhcp6\"", "\"DhcpDdns\"", + "TOPLEVEL_JSON", "TOPLEVEL_DHCP4", "SUB_DHCP4", "SUB_INTERFACES4", + "SUB_SUBNET4", "SUB_POOL4", "SUB_RESERVATION", "SUB_OPTION_DEF", + "SUB_OPTION_DATA", "SUB_HOOKS_LIBRARY", "SUB_DHCP_DDNS", + "\"constant string\"", "\"integer\"", "\"floating point\"", + "\"boolean\"", "$accept", "start", "$@1", "$@2", "$@3", "$@4", "$@5", + "$@6", "$@7", "$@8", "$@9", "$@10", "$@11", "value", "sub_json", "map2", + "$@12", "map_value", "map_content", "not_empty_map", "list_generic", + "$@13", "list_content", "not_empty_list", "list_strings", "$@14", + "list_strings_content", "not_empty_list_strings", "unknown_map_entry", + "syntax_map", "$@15", "global_objects", "global_object", "dhcp4_object", + "$@16", "sub_dhcp4", "$@17", "global_params", "global_param", + "valid_lifetime", "renew_timer", "rebind_timer", + "decline_probation_period", "echo_client_id", "match_client_id", + "interfaces_config", "$@18", "interfaces_config_params", + "interfaces_config_param", "sub_interfaces4", "$@19", "interfaces_list", + "$@20", "dhcp_socket_type", "$@21", "socket_type", "lease_database", + "$@22", "hosts_database", "$@23", "database_map_params", + "database_map_param", "database_type", "$@24", "db_type", "user", "$@25", + "password", "$@26", "host", "$@27", "port", "name", "$@28", "persist", + "lfc_interval", "readonly", "connect_timeout", "host_reservation_identifiers", "$@29", "host_reservation_identifiers_list", "host_reservation_identifier", "duid_id", "hw_address_id", "circuit_id", "client_id", "hooks_libraries", @@ -3909,55 +3921,55 @@ namespace isc { namespace dhcp { const unsigned short int Dhcp4Parser::yyrline_[] = { - 0, 213, 213, 213, 214, 214, 215, 215, 216, 216, - 217, 217, 218, 218, 219, 219, 220, 220, 221, 221, - 222, 222, 223, 223, 231, 232, 233, 234, 235, 236, - 237, 240, 245, 245, 256, 259, 260, 263, 267, 274, - 274, 281, 282, 285, 289, 296, 296, 303, 304, 307, - 311, 322, 332, 332, 344, 345, 349, 350, 351, 352, - 353, 356, 356, 373, 373, 381, 382, 387, 388, 389, - 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, - 400, 401, 402, 403, 404, 405, 406, 407, 410, 415, - 420, 425, 430, 435, 441, 441, 451, 452, 455, 456, - 459, 459, 467, 467, 477, 477, 484, 485, 488, 488, - 498, 498, 508, 509, 512, 513, 514, 515, 516, 517, - 518, 519, 520, 521, 524, 524, 531, 532, 533, 534, - 537, 537, 545, 545, 553, 553, 561, 561, 569, 574, - 579, 584, 589, 589, 599, 600, 603, 604, 605, 606, - 609, 614, 619, 624, 629, 629, 639, 640, 643, 644, - 647, 647, 655, 655, 663, 664, 665, 668, 669, 672, - 672, 680, 680, 688, 688, 698, 699, 702, 703, 704, - 705, 706, 707, 710, 715, 720, 725, 730, 735, 743, - 743, 756, 757, 760, 761, 768, 768, 791, 791, 800, - 801, 805, 806, 807, 808, 809, 810, 811, 812, 813, - 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, - 824, 827, 827, 835, 835, 843, 843, 851, 851, 859, - 859, 867, 867, 875, 875, 883, 883, 891, 896, 905, - 905, 917, 918, 921, 922, 927, 927, 938, 938, 948, - 949, 952, 953, 956, 957, 958, 959, 960, 961, 962, - 963, 966, 968, 973, 975, 975, 983, 983, 991, 991, - 999, 1001, 1001, 1009, 1018, 1018, 1030, 1031, 1036, 1037, - 1042, 1042, 1053, 1053, 1064, 1065, 1070, 1071, 1076, 1077, - 1078, 1079, 1080, 1081, 1084, 1086, 1086, 1094, 1096, 1098, - 1106, 1106, 1118, 1119, 1122, 1123, 1126, 1126, 1134, 1134, - 1142, 1143, 1146, 1147, 1148, 1149, 1152, 1152, 1160, 1160, - 1170, 1170, 1180, 1181, 1184, 1185, 1188, 1188, 1196, 1196, - 1204, 1205, 1208, 1209, 1213, 1214, 1215, 1216, 1217, 1218, - 1219, 1220, 1221, 1222, 1223, 1224, 1227, 1227, 1235, 1235, - 1243, 1243, 1251, 1251, 1259, 1259, 1267, 1267, 1275, 1275, - 1283, 1283, 1292, 1292, 1300, 1300, 1313, 1313, 1323, 1323, - 1334, 1334, 1344, 1345, 1348, 1348, 1356, 1357, 1360, 1361, - 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1373, 1375, 1375, - 1387, 1394, 1394, 1404, 1405, 1408, 1409, 1412, 1412, 1420, - 1420, 1430, 1430, 1440, 1440, 1448, 1449, 1452, 1453, 1454, - 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1463, 1464, - 1465, 1466, 1467, 1470, 1475, 1475, 1483, 1483, 1491, 1496, - 1496, 1504, 1509, 1514, 1514, 1522, 1523, 1526, 1526, 1534, - 1539, 1544, 1549, 1554, 1554, 1562, 1565, 1568, 1571, 1574, - 1580, 1580, 1590, 1590, 1597, 1597, 1609, 1609, 1622, 1623, - 1627, 1631, 1631, 1643, 1644, 1648, 1648, 1656, 1657, 1660, - 1661, 1662, 1663, 1664, 1667, 1671, 1671, 1679, 1679, 1689, - 1690, 1693, 1693, 1701, 1702, 1705, 1705 + 0, 214, 214, 214, 215, 215, 216, 216, 217, 217, + 218, 218, 219, 219, 220, 220, 221, 221, 222, 222, + 223, 223, 224, 224, 232, 233, 234, 235, 236, 237, + 238, 241, 246, 246, 257, 260, 261, 264, 268, 275, + 275, 282, 283, 286, 290, 297, 297, 304, 305, 308, + 312, 323, 333, 333, 345, 346, 350, 351, 352, 353, + 354, 357, 357, 374, 374, 382, 383, 388, 389, 390, + 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, + 401, 402, 403, 404, 405, 406, 407, 408, 411, 416, + 421, 426, 431, 436, 442, 442, 452, 453, 456, 457, + 460, 460, 468, 468, 478, 478, 485, 486, 489, 489, + 499, 499, 509, 510, 513, 514, 515, 516, 517, 518, + 519, 520, 521, 522, 523, 526, 526, 533, 534, 535, + 536, 539, 539, 547, 547, 555, 555, 563, 568, 568, + 576, 581, 586, 591, 596, 596, 606, 607, 610, 611, + 612, 613, 616, 621, 626, 631, 636, 636, 646, 647, + 650, 651, 654, 654, 662, 662, 670, 671, 672, 675, + 676, 679, 679, 687, 687, 695, 695, 705, 706, 709, + 710, 711, 712, 713, 714, 717, 722, 727, 732, 737, + 742, 750, 750, 763, 764, 767, 768, 775, 775, 798, + 798, 807, 808, 812, 813, 814, 815, 816, 817, 818, + 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, + 829, 830, 831, 834, 834, 842, 842, 850, 850, 858, + 858, 866, 866, 874, 874, 882, 882, 890, 890, 898, + 903, 912, 912, 924, 925, 928, 929, 934, 934, 945, + 945, 955, 956, 959, 960, 963, 964, 965, 966, 967, + 968, 969, 970, 973, 975, 980, 982, 982, 990, 990, + 998, 998, 1006, 1008, 1008, 1016, 1025, 1025, 1037, 1038, + 1043, 1044, 1049, 1049, 1060, 1060, 1071, 1072, 1077, 1078, + 1083, 1084, 1085, 1086, 1087, 1088, 1091, 1093, 1093, 1101, + 1103, 1105, 1113, 1113, 1125, 1126, 1129, 1130, 1133, 1133, + 1141, 1141, 1149, 1150, 1153, 1154, 1155, 1156, 1159, 1159, + 1167, 1167, 1177, 1177, 1187, 1188, 1191, 1192, 1195, 1195, + 1203, 1203, 1211, 1212, 1215, 1216, 1220, 1221, 1222, 1223, + 1224, 1225, 1226, 1227, 1228, 1229, 1230, 1231, 1234, 1234, + 1242, 1242, 1250, 1250, 1258, 1258, 1266, 1266, 1274, 1274, + 1282, 1282, 1290, 1290, 1299, 1299, 1307, 1307, 1320, 1320, + 1330, 1330, 1341, 1341, 1351, 1352, 1355, 1355, 1363, 1364, + 1367, 1368, 1371, 1372, 1373, 1374, 1375, 1376, 1377, 1380, + 1382, 1382, 1394, 1401, 1401, 1411, 1412, 1415, 1416, 1419, + 1419, 1427, 1427, 1437, 1437, 1447, 1447, 1455, 1456, 1459, + 1460, 1461, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, + 1470, 1471, 1472, 1473, 1474, 1477, 1482, 1482, 1490, 1490, + 1498, 1503, 1503, 1511, 1516, 1521, 1521, 1529, 1530, 1533, + 1533, 1541, 1546, 1551, 1556, 1561, 1561, 1569, 1572, 1575, + 1578, 1581, 1587, 1587, 1597, 1597, 1604, 1604, 1616, 1616, + 1629, 1630, 1634, 1638, 1638, 1650, 1651, 1655, 1655, 1663, + 1664, 1667, 1668, 1669, 1670, 1671, 1674, 1678, 1678, 1686, + 1686, 1696, 1697, 1700, 1700, 1708, 1709, 1712, 1712 }; // Print the state stack on the debug stream. @@ -3992,8 +4004,8 @@ namespace isc { namespace dhcp { #line 14 "dhcp4_parser.yy" // lalr1.cc:1167 } } // isc::dhcp -#line 3996 "dhcp4_parser.cc" // lalr1.cc:1167 -#line 1713 "dhcp4_parser.yy" // lalr1.cc:1168 +#line 4008 "dhcp4_parser.cc" // lalr1.cc:1167 +#line 1720 "dhcp4_parser.yy" // lalr1.cc:1168 void diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h index 50c102dee7..6c4bbe8681 100644 --- a/src/bin/dhcp4/dhcp4_parser.h +++ b/src/bin/dhcp4/dhcp4_parser.h @@ -374,108 +374,109 @@ namespace isc { namespace dhcp { TOKEN_USER = 283, TOKEN_PASSWORD = 284, TOKEN_HOST = 285, - TOKEN_PERSIST = 286, - TOKEN_LFC_INTERVAL = 287, - TOKEN_READONLY = 288, - TOKEN_CONNECT_TIMEOUT = 289, - TOKEN_VALID_LIFETIME = 290, - TOKEN_RENEW_TIMER = 291, - TOKEN_REBIND_TIMER = 292, - TOKEN_DECLINE_PROBATION_PERIOD = 293, - TOKEN_SUBNET4 = 294, - TOKEN_SUBNET_4O6_INTERFACE = 295, - TOKEN_SUBNET_4O6_INTERFACE_ID = 296, - TOKEN_SUBNET_4O6_SUBNET = 297, - TOKEN_OPTION_DEF = 298, - TOKEN_OPTION_DATA = 299, - TOKEN_NAME = 300, - TOKEN_DATA = 301, - TOKEN_CODE = 302, - TOKEN_SPACE = 303, - TOKEN_CSV_FORMAT = 304, - TOKEN_RECORD_TYPES = 305, - TOKEN_ENCAPSULATE = 306, - TOKEN_ARRAY = 307, - TOKEN_POOLS = 308, - TOKEN_POOL = 309, - TOKEN_USER_CONTEXT = 310, - TOKEN_SUBNET = 311, - TOKEN_INTERFACE = 312, - TOKEN_INTERFACE_ID = 313, - TOKEN_ID = 314, - TOKEN_RAPID_COMMIT = 315, - TOKEN_RESERVATION_MODE = 316, - TOKEN_HOST_RESERVATION_IDENTIFIERS = 317, - TOKEN_CLIENT_CLASSES = 318, - TOKEN_TEST = 319, - TOKEN_CLIENT_CLASS = 320, - TOKEN_RESERVATIONS = 321, - TOKEN_DUID = 322, - TOKEN_HW_ADDRESS = 323, - TOKEN_CIRCUIT_ID = 324, - TOKEN_CLIENT_ID = 325, - TOKEN_HOSTNAME = 326, - TOKEN_RELAY = 327, - TOKEN_IP_ADDRESS = 328, - TOKEN_HOOKS_LIBRARIES = 329, - TOKEN_LIBRARY = 330, - TOKEN_PARAMETERS = 331, - TOKEN_EXPIRED_LEASES_PROCESSING = 332, - TOKEN_RECLAIM_TIMER_WAIT_TIME = 333, - TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 334, - TOKEN_HOLD_RECLAIMED_TIME = 335, - TOKEN_MAX_RECLAIM_LEASES = 336, - TOKEN_MAX_RECLAIM_TIME = 337, - TOKEN_UNWARNED_RECLAIM_CYCLES = 338, - TOKEN_DHCP4O6_PORT = 339, - TOKEN_CONTROL_SOCKET = 340, - TOKEN_SOCKET_TYPE = 341, - TOKEN_SOCKET_NAME = 342, - TOKEN_DHCP_DDNS = 343, - TOKEN_ENABLE_UPDATES = 344, - TOKEN_QUALIFYING_SUFFIX = 345, - TOKEN_SERVER_IP = 346, - TOKEN_SERVER_PORT = 347, - TOKEN_SENDER_IP = 348, - TOKEN_SENDER_PORT = 349, - TOKEN_MAX_QUEUE_SIZE = 350, - TOKEN_NCR_PROTOCOL = 351, - TOKEN_NCR_FORMAT = 352, - TOKEN_ALWAYS_INCLUDE_FQDN = 353, - TOKEN_ALLOW_CLIENT_UPDATE = 354, - TOKEN_OVERRIDE_NO_UPDATE = 355, - TOKEN_OVERRIDE_CLIENT_UPDATE = 356, - TOKEN_REPLACE_CLIENT_NAME = 357, - TOKEN_GENERATED_PREFIX = 358, - TOKEN_TCP = 359, - TOKEN_JSON = 360, - TOKEN_WHEN_PRESENT = 361, - TOKEN_NEVER = 362, - TOKEN_ALWAYS = 363, - TOKEN_WHEN_NOT_PRESENT = 364, - TOKEN_LOGGING = 365, - TOKEN_LOGGERS = 366, - TOKEN_OUTPUT_OPTIONS = 367, - TOKEN_OUTPUT = 368, - TOKEN_DEBUGLEVEL = 369, - TOKEN_SEVERITY = 370, - TOKEN_DHCP6 = 371, - TOKEN_DHCPDDNS = 372, - TOKEN_TOPLEVEL_JSON = 373, - TOKEN_TOPLEVEL_DHCP4 = 374, - TOKEN_SUB_DHCP4 = 375, - TOKEN_SUB_INTERFACES4 = 376, - TOKEN_SUB_SUBNET4 = 377, - TOKEN_SUB_POOL4 = 378, - TOKEN_SUB_RESERVATION = 379, - TOKEN_SUB_OPTION_DEF = 380, - TOKEN_SUB_OPTION_DATA = 381, - TOKEN_SUB_HOOKS_LIBRARY = 382, - TOKEN_SUB_DHCP_DDNS = 383, - TOKEN_STRING = 384, - TOKEN_INTEGER = 385, - TOKEN_FLOAT = 386, - TOKEN_BOOLEAN = 387 + TOKEN_PORT = 286, + TOKEN_PERSIST = 287, + TOKEN_LFC_INTERVAL = 288, + TOKEN_READONLY = 289, + TOKEN_CONNECT_TIMEOUT = 290, + TOKEN_VALID_LIFETIME = 291, + TOKEN_RENEW_TIMER = 292, + TOKEN_REBIND_TIMER = 293, + TOKEN_DECLINE_PROBATION_PERIOD = 294, + TOKEN_SUBNET4 = 295, + TOKEN_SUBNET_4O6_INTERFACE = 296, + TOKEN_SUBNET_4O6_INTERFACE_ID = 297, + TOKEN_SUBNET_4O6_SUBNET = 298, + TOKEN_OPTION_DEF = 299, + TOKEN_OPTION_DATA = 300, + TOKEN_NAME = 301, + TOKEN_DATA = 302, + TOKEN_CODE = 303, + TOKEN_SPACE = 304, + TOKEN_CSV_FORMAT = 305, + TOKEN_RECORD_TYPES = 306, + TOKEN_ENCAPSULATE = 307, + TOKEN_ARRAY = 308, + TOKEN_POOLS = 309, + TOKEN_POOL = 310, + TOKEN_USER_CONTEXT = 311, + TOKEN_SUBNET = 312, + TOKEN_INTERFACE = 313, + TOKEN_INTERFACE_ID = 314, + TOKEN_ID = 315, + TOKEN_RAPID_COMMIT = 316, + TOKEN_RESERVATION_MODE = 317, + TOKEN_HOST_RESERVATION_IDENTIFIERS = 318, + TOKEN_CLIENT_CLASSES = 319, + TOKEN_TEST = 320, + TOKEN_CLIENT_CLASS = 321, + TOKEN_RESERVATIONS = 322, + TOKEN_DUID = 323, + TOKEN_HW_ADDRESS = 324, + TOKEN_CIRCUIT_ID = 325, + TOKEN_CLIENT_ID = 326, + TOKEN_HOSTNAME = 327, + TOKEN_RELAY = 328, + TOKEN_IP_ADDRESS = 329, + TOKEN_HOOKS_LIBRARIES = 330, + TOKEN_LIBRARY = 331, + TOKEN_PARAMETERS = 332, + TOKEN_EXPIRED_LEASES_PROCESSING = 333, + TOKEN_RECLAIM_TIMER_WAIT_TIME = 334, + TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 335, + TOKEN_HOLD_RECLAIMED_TIME = 336, + TOKEN_MAX_RECLAIM_LEASES = 337, + TOKEN_MAX_RECLAIM_TIME = 338, + TOKEN_UNWARNED_RECLAIM_CYCLES = 339, + TOKEN_DHCP4O6_PORT = 340, + TOKEN_CONTROL_SOCKET = 341, + TOKEN_SOCKET_TYPE = 342, + TOKEN_SOCKET_NAME = 343, + TOKEN_DHCP_DDNS = 344, + TOKEN_ENABLE_UPDATES = 345, + TOKEN_QUALIFYING_SUFFIX = 346, + TOKEN_SERVER_IP = 347, + TOKEN_SERVER_PORT = 348, + TOKEN_SENDER_IP = 349, + TOKEN_SENDER_PORT = 350, + TOKEN_MAX_QUEUE_SIZE = 351, + TOKEN_NCR_PROTOCOL = 352, + TOKEN_NCR_FORMAT = 353, + TOKEN_ALWAYS_INCLUDE_FQDN = 354, + TOKEN_ALLOW_CLIENT_UPDATE = 355, + TOKEN_OVERRIDE_NO_UPDATE = 356, + TOKEN_OVERRIDE_CLIENT_UPDATE = 357, + TOKEN_REPLACE_CLIENT_NAME = 358, + TOKEN_GENERATED_PREFIX = 359, + TOKEN_TCP = 360, + TOKEN_JSON = 361, + TOKEN_WHEN_PRESENT = 362, + TOKEN_NEVER = 363, + TOKEN_ALWAYS = 364, + TOKEN_WHEN_NOT_PRESENT = 365, + TOKEN_LOGGING = 366, + TOKEN_LOGGERS = 367, + TOKEN_OUTPUT_OPTIONS = 368, + TOKEN_OUTPUT = 369, + TOKEN_DEBUGLEVEL = 370, + TOKEN_SEVERITY = 371, + TOKEN_DHCP6 = 372, + TOKEN_DHCPDDNS = 373, + TOKEN_TOPLEVEL_JSON = 374, + TOKEN_TOPLEVEL_DHCP4 = 375, + TOKEN_SUB_DHCP4 = 376, + TOKEN_SUB_INTERFACES4 = 377, + TOKEN_SUB_SUBNET4 = 378, + TOKEN_SUB_POOL4 = 379, + TOKEN_SUB_RESERVATION = 380, + TOKEN_SUB_OPTION_DEF = 381, + TOKEN_SUB_OPTION_DATA = 382, + TOKEN_SUB_HOOKS_LIBRARY = 383, + TOKEN_SUB_DHCP_DDNS = 384, + TOKEN_STRING = 385, + TOKEN_INTEGER = 386, + TOKEN_FLOAT = 387, + TOKEN_BOOLEAN = 388 }; }; @@ -706,6 +707,10 @@ namespace isc { namespace dhcp { symbol_type make_HOST (const location_type& l); + static inline + symbol_type + make_PORT (const location_type& l); + static inline symbol_type make_PERSIST (const location_type& l); @@ -1319,12 +1324,12 @@ namespace isc { namespace dhcp { enum { yyeof_ = 0, - yylast_ = 719, ///< Last index in yytable_. - yynnts_ = 302, ///< Number of nonterminal symbols. + yylast_ = 723, ///< Last index in yytable_. + yynnts_ = 303, ///< Number of nonterminal symbols. yyfinal_ = 24, ///< Termination state number. yyterror_ = 1, yyerrcode_ = 256, - yyntokens_ = 133 ///< Number of tokens. + yyntokens_ = 134 ///< Number of tokens. }; @@ -1379,9 +1384,9 @@ namespace isc { namespace dhcp { 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 132 + 125, 126, 127, 128, 129, 130, 131, 132, 133 }; - const unsigned int user_token_number_max_ = 387; + const unsigned int user_token_number_max_ = 388; const token_number_type undef_token_ = 2; if (static_cast(t) <= yyeof_) @@ -1414,28 +1419,28 @@ namespace isc { namespace dhcp { { switch (other.type_get ()) { - case 146: // value - case 150: // map_value - case 188: // socket_type - case 197: // db_type - case 397: // ncr_protocol_value - case 406: // replace_client_name_value + case 147: // value + case 151: // map_value + case 189: // socket_type + case 198: // db_type + case 399: // ncr_protocol_value + case 408: // replace_client_name_value value.copy< ElementPtr > (other.value); break; - case 132: // "boolean" + case 133: // "boolean" value.copy< bool > (other.value); break; - case 131: // "floating point" + case 132: // "floating point" value.copy< double > (other.value); break; - case 130: // "integer" + case 131: // "integer" value.copy< int64_t > (other.value); break; - case 129: // "constant string" + case 130: // "constant string" value.copy< std::string > (other.value); break; @@ -1456,28 +1461,28 @@ namespace isc { namespace dhcp { (void) v; switch (this->type_get ()) { - case 146: // value - case 150: // map_value - case 188: // socket_type - case 197: // db_type - case 397: // ncr_protocol_value - case 406: // replace_client_name_value + case 147: // value + case 151: // map_value + case 189: // socket_type + case 198: // db_type + case 399: // ncr_protocol_value + case 408: // replace_client_name_value value.copy< ElementPtr > (v); break; - case 132: // "boolean" + case 133: // "boolean" value.copy< bool > (v); break; - case 131: // "floating point" + case 132: // "floating point" value.copy< double > (v); break; - case 130: // "integer" + case 131: // "integer" value.copy< int64_t > (v); break; - case 129: // "constant string" + case 130: // "constant string" value.copy< std::string > (v); break; @@ -1557,28 +1562,28 @@ namespace isc { namespace dhcp { // Type destructor. switch (yytype) { - case 146: // value - case 150: // map_value - case 188: // socket_type - case 197: // db_type - case 397: // ncr_protocol_value - case 406: // replace_client_name_value + case 147: // value + case 151: // map_value + case 189: // socket_type + case 198: // db_type + case 399: // ncr_protocol_value + case 408: // replace_client_name_value value.template destroy< ElementPtr > (); break; - case 132: // "boolean" + case 133: // "boolean" value.template destroy< bool > (); break; - case 131: // "floating point" + case 132: // "floating point" value.template destroy< double > (); break; - case 130: // "integer" + case 131: // "integer" value.template destroy< int64_t > (); break; - case 129: // "constant string" + case 130: // "constant string" value.template destroy< std::string > (); break; @@ -1605,28 +1610,28 @@ namespace isc { namespace dhcp { super_type::move(s); switch (this->type_get ()) { - case 146: // value - case 150: // map_value - case 188: // socket_type - case 197: // db_type - case 397: // ncr_protocol_value - case 406: // replace_client_name_value + case 147: // value + case 151: // map_value + case 189: // socket_type + case 198: // db_type + case 399: // ncr_protocol_value + case 408: // replace_client_name_value value.move< ElementPtr > (s.value); break; - case 132: // "boolean" + case 133: // "boolean" value.move< bool > (s.value); break; - case 131: // "floating point" + case 132: // "floating point" value.move< double > (s.value); break; - case 130: // "integer" + case 131: // "integer" value.move< int64_t > (s.value); break; - case 129: // "constant string" + case 130: // "constant string" value.move< std::string > (s.value); break; @@ -1698,7 +1703,7 @@ namespace isc { namespace dhcp { 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, - 385, 386, 387 + 385, 386, 387, 388 }; return static_cast (yytoken_number_[type]); } @@ -1877,6 +1882,12 @@ namespace isc { namespace dhcp { return symbol_type (token::TOKEN_HOST, l); } + Dhcp4Parser::symbol_type + Dhcp4Parser::make_PORT (const location_type& l) + { + return symbol_type (token::TOKEN_PORT, l); + } + Dhcp4Parser::symbol_type Dhcp4Parser::make_PERSIST (const location_type& l) { @@ -2492,7 +2503,7 @@ namespace isc { namespace dhcp { #line 14 "dhcp4_parser.yy" // lalr1.cc:377 } } // isc::dhcp -#line 2496 "dhcp4_parser.h" // lalr1.cc:377 +#line 2507 "dhcp4_parser.h" // lalr1.cc:377 diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh index 7d04e5b7be..f0757d1826 100644 --- a/src/bin/dhcp4/location.hh +++ b/src/bin/dhcp4/location.hh @@ -1,4 +1,4 @@ -// Generated 201701251415 +// Generated 201701271452 // A Bison parser, made by GNU Bison 3.0.4. // Locations for Bison parsers in C++ diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh index b717159137..181df48cbd 100644 --- a/src/bin/dhcp4/position.hh +++ b/src/bin/dhcp4/position.hh @@ -1,4 +1,4 @@ -// Generated 201701251415 +// Generated 201701271452 // A Bison parser, made by GNU Bison 3.0.4. // Positions for Bison parsers in C++ diff --git a/src/bin/dhcp4/stack.hh b/src/bin/dhcp4/stack.hh index bbe51e83f2..eb79a5da56 100644 --- a/src/bin/dhcp4/stack.hh +++ b/src/bin/dhcp4/stack.hh @@ -1,4 +1,4 @@ -// Generated 201701251415 +// Generated 201701271452 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++ diff --git a/src/bin/dhcp6/dhcp6_lexer.cc b/src/bin/dhcp6/dhcp6_lexer.cc index 0e8c31cace..d6f185fe13 100644 --- a/src/bin/dhcp6/dhcp6_lexer.cc +++ b/src/bin/dhcp6/dhcp6_lexer.cc @@ -467,8 +467,8 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ); (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 147 -#define YY_END_OF_BUFFER 148 +#define YY_NUM_RULES 148 +#define YY_END_OF_BUFFER 149 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -476,137 +476,138 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1181] = +static yyconst flex_int16_t yy_accept[1184] = { 0, - 140, 140, 0, 0, 0, 0, 0, 0, 0, 0, - 148, 146, 10, 11, 146, 1, 140, 137, 140, 140, - 146, 139, 138, 146, 146, 146, 146, 146, 133, 134, - 146, 146, 146, 135, 136, 5, 5, 5, 146, 146, - 146, 10, 11, 0, 0, 129, 0, 0, 0, 0, + 141, 141, 0, 0, 0, 0, 0, 0, 0, 0, + 149, 147, 10, 11, 147, 1, 141, 138, 141, 141, + 147, 140, 139, 147, 147, 147, 147, 147, 134, 135, + 147, 147, 147, 136, 137, 5, 5, 5, 147, 147, + 147, 10, 11, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 140, 140, 0, - 139, 140, 3, 2, 6, 0, 140, 0, 0, 0, - 0, 0, 0, 4, 0, 0, 9, 0, 130, 0, + 0, 0, 0, 0, 0, 0, 1, 141, 141, 0, + 140, 141, 3, 2, 6, 0, 141, 0, 0, 0, + 0, 0, 0, 4, 0, 0, 9, 0, 131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 132, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, - 0, 0, 0, 8, 0, 0, 0, 109, 0, 0, - 110, 0, 0, 0, 0, 0, 0, 0, 0, 131, + 0, 0, 0, 8, 0, 0, 0, 110, 0, 0, + 111, 0, 0, 0, 0, 0, 0, 0, 0, 132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 75, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 145, 143, 0, 142, 141, 0, 0, - 0, 0, 0, 0, 108, 0, 0, 28, 0, 27, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 146, 144, 0, 143, 142, 0, + 0, 0, 0, 0, 0, 109, 0, 0, 28, 0, + 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 144, 141, 0, 0, 0, 0, - 0, 0, 0, 29, 0, 0, 31, 0, 0, 0, - 0, 0, 0, 78, 0, 0, 0, 62, 0, 0, - 0, 0, 0, 94, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 145, 142, 0, 0, + 0, 0, 0, 0, 0, 29, 0, 0, 31, 0, + 0, 0, 0, 0, 0, 79, 0, 0, 0, 63, + 0, 0, 0, 0, 0, 95, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 71, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 90, 113, 42, 0, 47, 0, 0, 0, - 0, 0, 127, 36, 0, 33, 0, 32, 0, 0, - 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 91, 114, 42, 0, 47, + 0, 0, 0, 0, 0, 128, 36, 0, 33, 0, + 32, 0, 0, 0, 0, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 44, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 63, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 102, 0, 0, - 0, 0, 0, 0, 0, 0, 97, 0, 0, 0, - 0, 7, 34, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 85, 0, 0, 0, 0, - 0, 0, 0, 0, 65, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 72, 0, 0, 0, 0, 0, 82, 0, 0, + 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 103, 0, 0, 0, 0, 0, 0, 0, 0, 98, + 0, 0, 0, 0, 7, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 106, - 83, 0, 0, 0, 43, 0, 0, 0, 0, 0, - 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 58, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, + 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 48, 64, 0, 0, 0, 93, 0, 0, 41, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 126, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, 0, 0, 0, 0, 0, + 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 107, 84, 0, 0, 0, 43, 0, 0, + 0, 0, 0, 0, 0, 0, 51, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 59, 0, + 0, 0, 129, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 97, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 48, 65, 0, 0, 0, 94, + 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 88, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 127, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 74, 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, 16, 0, 107, 14, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 16, 0, 108, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 98, 86, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 95, 111, 0, 38, - 0, 103, 0, 0, 0, 0, 0, 0, 20, 0, - 0, 59, 0, 0, 0, 105, 45, 0, 66, 0, + 0, 0, 0, 99, 87, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, + 112, 0, 38, 0, 104, 0, 0, 0, 0, 0, + 0, 20, 0, 0, 60, 0, 0, 0, 106, 45, + 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 100, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 79, 0, 0, 0, 60, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, - 17, 15, 125, 124, 0, 0, 0, 0, 30, 0, - 0, 89, 0, 0, 0, 0, 0, 122, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 74, 0, - 92, 0, 51, 0, 0, 0, 19, 0, 0, 0, - 0, 0, 76, 56, 0, 99, 0, 0, 0, 91, - 0, 71, 0, 0, 0, 0, 0, 0, 0, 0, - 69, 0, 114, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 80, 0, 0, 0, 61, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, + 0, 0, 0, 17, 15, 126, 125, 0, 0, 0, + 0, 30, 0, 0, 90, 0, 0, 0, 0, 0, + 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 75, 0, 93, 0, 52, 0, 0, 0, 19, + 0, 0, 0, 0, 0, 77, 57, 0, 100, 0, + 0, 0, 92, 0, 72, 0, 0, 0, 0, 0, + 0, 0, 0, 70, 0, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 88, 0, 123, 0, 12, 0, 0, 0, 0, 0, - 0, 0, 40, 0, 39, 18, 0, 0, 84, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 54, 0, - 0, 0, 52, 0, 67, 0, 0, 0, 0, 0, - 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 35, 0, 0, 0, 0, 0, - 0, 26, 0, 0, 0, 0, 120, 0, 0, 0, - 0, 0, 0, 0, 77, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 37, 0, 0, 0, 0, 13, + 0, 0, 0, 89, 0, 124, 0, 12, 0, 0, + 0, 0, 0, 0, 0, 40, 0, 39, 18, 0, + 0, 85, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 55, 0, 0, 0, 53, 0, 68, 0, 0, + 0, 0, 0, 105, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 35, 0, 0, + 0, 0, 0, 0, 26, 0, 0, 0, 0, 121, + 0, 0, 0, 0, 0, 0, 0, 78, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, + 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 120, 0, 23, 54, 0, + 0, 0, 0, 22, 21, 0, 69, 0, 0, 119, + 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 119, 0, 23, 53, 0, 0, 0, 0, - 22, 21, 0, 68, 0, 0, 118, 0, 0, 0, - 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 24, 0, 80, 0, 0, 0, 0, - 0, 116, 121, 57, 0, 0, 0, 115, 0, 0, - 0, 0, 0, 0, 0, 81, 0, 0, 117, 0 + 0, 0, 0, 0, 0, 0, 24, 0, 81, 0, + 0, 0, 0, 0, 117, 122, 58, 0, 0, 0, + 116, 0, 0, 0, 0, 0, 0, 0, 82, 0, + 0, 118, 0 } ; static yyconst YY_CHAR yy_ec[256] = @@ -653,295 +654,295 @@ static yyconst YY_CHAR yy_meta[72] = 3 } ; -static yyconst flex_uint16_t yy_base[1193] = +static yyconst flex_uint16_t yy_base[1196] = { 0, 0, 70, 19, 29, 41, 49, 52, 58, 87, 95, - 1544, 1545, 32, 1540, 141, 0, 201, 1545, 206, 88, - 11, 213, 1545, 1522, 114, 25, 2, 6, 1545, 1545, - 73, 11, 17, 1545, 1545, 1545, 104, 1528, 1483, 0, - 1520, 107, 1535, 217, 241, 1545, 185, 1486, 1506, 93, + 1547, 1548, 32, 1543, 141, 0, 201, 1548, 206, 88, + 11, 213, 1548, 1525, 114, 25, 2, 6, 1548, 1548, + 73, 11, 17, 1548, 1548, 1548, 104, 1531, 1486, 0, + 1523, 107, 1538, 217, 241, 1548, 185, 1489, 1509, 93, 58, 190, 91, 211, 200, 14, 267, 213, 175, 188, - 64, 220, 1487, 187, 75, 261, 215, 289, 256, 278, - 1470, 207, 284, 311, 293, 1489, 0, 337, 352, 360, - 366, 372, 1545, 0, 1545, 331, 378, 227, 231, 259, - 329, 341, 325, 1545, 1486, 1525, 1545, 237, 1545, 377, + 64, 220, 1490, 187, 75, 261, 215, 289, 256, 278, + 1473, 207, 284, 311, 293, 1492, 0, 337, 352, 360, + 366, 372, 1548, 0, 1548, 331, 378, 227, 231, 259, + 329, 341, 325, 1548, 1489, 1528, 1548, 237, 1548, 377, - 335, 1484, 1523, 366, 253, 321, 1478, 362, 306, 366, - 366, 293, 1521, 0, 428, 369, 1465, 1473, 356, 1469, - 1458, 1459, 360, 1475, 1468, 365, 358, 1455, 1461, 361, - 1449, 1505, 423, 1452, 1503, 1469, 1466, 1466, 1460, 364, - 1453, 1446, 1451, 1445, 1442, 1441, 1455, 371, 1491, 1440, - 350, 1452, 1455, 1439, 401, 400, 1451, 1452, 1450, 1432, - 1437, 1433, 1425, 1442, 1434, 0, 402, 426, 414, 425, - 437, 442, 1433, 1545, 0, 447, 1428, 1545, 435, 448, - 1545, 1480, 1435, 445, 1478, 454, 1477, 450, 1476, 1545, - 494, 1423, 462, 1436, 1431, 1430, 297, 1471, 1465, 1431, + 335, 1487, 1526, 366, 253, 321, 1481, 362, 306, 366, + 366, 293, 1524, 0, 428, 369, 1468, 1476, 356, 1472, + 1461, 1462, 360, 1478, 1471, 365, 358, 1458, 1464, 361, + 1452, 1508, 423, 1455, 1506, 1472, 1469, 1469, 1463, 364, + 1456, 1449, 1454, 1448, 1445, 1444, 1458, 371, 1494, 1443, + 397, 1455, 1458, 1442, 423, 399, 1454, 1455, 1453, 1435, + 1440, 1436, 1428, 1445, 1437, 0, 374, 408, 414, 427, + 428, 422, 1436, 1548, 0, 444, 1431, 1548, 432, 449, + 1548, 1483, 1438, 456, 1481, 459, 1480, 456, 1479, 1548, + 500, 1426, 466, 1439, 1434, 1433, 297, 1474, 1468, 1434, - 1410, 1418, 1424, 1412, 1423, 1424, 1424, 1419, 1411, 1413, - 1402, 1415, 1415, 1407, 1397, 1400, 1414, 1545, 1400, 1408, - 1411, 1392, 1442, 1391, 1401, 1439, 1438, 1399, 1387, 1398, - 1434, 1392, 1384, 1381, 1397, 1378, 1380, 1376, 1382, 1373, - 1386, 1379, 1381, 1385, 1379, 80, 1386, 1381, 1373, 1379, - 1379, 1360, 1376, 1369, 1376, 1364, 1357, 1371, 1370, 1373, - 1355, 1363, 463, 1545, 1545, 464, 1545, 1545, 1350, 0, - 445, 470, 473, 1407, 1545, 1360, 462, 1545, 1405, 1545, - 1399, 530, 1343, 457, 1340, 1350, 1400, 1357, 1343, 1545, - 1354, 1396, 1351, 1348, 1349, 488, 1392, 1342, 1337, 1334, + 1413, 1421, 1427, 1415, 1426, 1427, 1427, 1422, 1414, 1416, + 1405, 1418, 1418, 1410, 1400, 1403, 1417, 1548, 1403, 1411, + 1414, 1395, 1445, 1394, 1404, 1442, 1441, 1402, 1390, 1401, + 1437, 1395, 1387, 1384, 1400, 1381, 1383, 1379, 1385, 1376, + 1375, 1388, 1381, 1383, 1387, 1381, 80, 1388, 1383, 1375, + 1381, 1381, 1362, 1378, 1371, 1378, 1366, 1359, 1373, 1372, + 1375, 1357, 1365, 470, 1548, 1548, 471, 1548, 1548, 1352, + 0, 452, 477, 480, 1409, 1548, 1362, 466, 1548, 1407, + 1548, 1401, 536, 1345, 461, 1342, 1352, 1402, 1359, 1345, + 1548, 1356, 1398, 1353, 1350, 1351, 487, 1394, 1344, 1339, - 1330, 1332, 1341, 1330, 1379, 1327, 523, 1340, 1340, 1323, - 1324, 1337, 1335, 1330, 1337, 1332, 1317, 440, 1326, 1322, - 1370, 455, 1317, 1310, 1312, 1316, 1305, 1312, 1317, 62, - 1318, 474, 1315, 1319, 1307, 1307, 1319, 1301, 1293, 1294, - 1315, 1297, 1309, 1308, 1294, 1306, 1305, 1304, 1345, 1344, - 1343, 1287, 521, 1300, 1545, 1545, 1299, 0, 496, 1339, - 1338, 1296, 1336, 1545, 1284, 1334, 1545, 503, 572, 1328, - 497, 1332, 1274, 1545, 1290, 1277, 1276, 1545, 1278, 1275, - 1287, 1283, 1271, 1545, 1280, 1265, 1267, 1278, 1276, 1312, - 1278, 1260, 1309, 1545, 1258, 1274, 1306, 1310, 1268, 1262, + 1336, 1332, 1334, 1343, 1332, 1381, 1329, 506, 1342, 1342, + 1325, 1326, 1339, 1337, 1332, 1339, 1334, 1319, 385, 1328, + 1324, 1372, 481, 1319, 1312, 1314, 1318, 1307, 1314, 1319, + 62, 1364, 1319, 483, 1316, 1320, 1308, 1308, 1320, 1302, + 1294, 1295, 1316, 1298, 1310, 1309, 1295, 1307, 1306, 1305, + 1346, 1345, 1344, 1288, 497, 1301, 1548, 1548, 1300, 0, + 475, 1340, 1339, 1297, 1337, 1548, 1285, 1335, 1548, 534, + 580, 1329, 477, 1333, 1275, 1548, 1291, 1278, 1277, 1548, + 1279, 1276, 1288, 1284, 1272, 1548, 1281, 1266, 1268, 1279, + 1277, 1313, 1279, 1261, 1310, 1548, 1259, 1275, 1307, 1311, - 1264, 1265, 1300, 1253, 1248, 1247, 1249, 1242, 1257, 1249, - 1297, 1545, 1244, 1240, 1243, 1236, 1246, 1249, 1238, 1237, - 1232, 1545, 1287, 1231, 1230, 1223, 1240, 1277, 1230, 1239, - 1233, 1237, 555, 1272, 1236, 1216, 1219, 1218, 1226, 1214, - 1270, 1212, 1545, 1545, 1545, 1217, 1545, 1227, 1261, 1223, - 0, 1264, 1545, 1545, 1212, 1545, 1218, 1545, 505, 504, - 1221, 558, 1545, 1255, 1202, 1209, 1202, 1214, 1213, 1197, - 1212, 1242, 1246, 1192, 1194, 1206, 1206, 1191, 1188, 1202, - 1194, 1200, 1191, 1199, 1545, 1184, 1195, 1199, 1181, 1194, - 1177, 1171, 1176, 1173, 1188, 1189, 1186, 1545, 1172, 1174, + 1269, 1263, 1265, 1266, 1301, 1254, 1249, 1248, 1250, 1243, + 1258, 1250, 1298, 1548, 1245, 1241, 1244, 1237, 1247, 1250, + 1239, 1238, 1233, 1548, 1288, 1548, 1232, 1231, 1224, 1241, + 1278, 1231, 1240, 1234, 1238, 527, 1273, 1237, 1217, 1220, + 1219, 1227, 1215, 1271, 1213, 1548, 1548, 1548, 1218, 1548, + 1228, 1262, 1224, 0, 1265, 1548, 1548, 1213, 1548, 1219, + 1548, 511, 510, 1222, 530, 1548, 1256, 1203, 1210, 1203, + 1215, 1214, 1198, 1213, 1243, 1247, 1193, 1195, 1207, 1207, + 1192, 1189, 1203, 1195, 1201, 1192, 1200, 1548, 1185, 1196, + 1200, 1182, 1195, 1178, 1172, 1177, 1174, 1189, 1190, 1187, - 1220, 541, 1183, 1166, 1167, 1172, 1163, 1545, 1177, 1163, - 561, 1155, 1176, 1166, 1209, 1163, 1207, 1545, 1155, 1153, - 1167, 1170, 1202, 1201, 1148, 1199, 1545, 565, 1161, 1150, - 1152, 1545, 1545, 1144, 1199, 538, 543, 1149, 1151, 1156, - 1190, 1189, 1143, 1133, 1186, 1148, 1138, 1183, 1129, 1137, - 1139, 1143, 1178, 1140, 1139, 1140, 1133, 1122, 1135, 1138, - 1133, 1128, 1133, 1130, 1133, 1128, 1169, 1168, 1112, 1108, - 1116, 1164, 1113, 1105, 1120, 1545, 1108, 1117, 1116, 1116, - 1100, 1155, 1098, 1111, 1545, 1103, 1095, 1104, 1097, 1086, - 1090, 1141, 1088, 1086, 1097, 1137, 1084, 498, 530, 1078, + 1548, 1173, 1175, 1221, 491, 1184, 1167, 1168, 1173, 1164, + 1548, 1178, 1164, 559, 1156, 1177, 1167, 1210, 1164, 1208, + 1548, 1156, 1154, 1168, 1171, 1203, 1202, 1149, 1200, 1548, + 561, 1162, 1151, 1153, 1548, 1548, 1145, 1200, 537, 507, + 1150, 1152, 1157, 1191, 1190, 1144, 1134, 1187, 1149, 1139, + 1184, 1130, 1138, 1140, 1144, 1179, 1141, 1140, 1141, 1134, + 1123, 1136, 1139, 1134, 1129, 1134, 1131, 1134, 1129, 1170, + 1169, 1113, 1109, 1117, 1165, 1114, 1106, 1121, 1548, 1109, + 1118, 1117, 1117, 1101, 1156, 1099, 1112, 1548, 1104, 1096, + 1105, 1098, 1087, 1091, 1142, 1089, 1087, 1098, 1138, 1085, - 542, 1545, 1139, 1097, 1086, 1090, 1135, 1545, 1129, 549, - 1087, 1081, 1082, 1073, 1073, 1090, 1085, 1073, 1084, 1068, - 1070, 1069, 1083, 1064, 1114, 1069, 1077, 1075, 1066, 1075, - 1071, 1112, 1054, 1054, 1067, 1066, 1051, 1049, 1050, 1545, - 1545, 1064, 1061, 1064, 1545, 1063, 1048, 480, 1046, 1093, - 1042, 1096, 1095, 1545, 1040, 1052, 1050, 1091, 1039, 1039, - 1088, 1041, 1029, 1023, 1031, 1033, 1042, 1035, 1027, 1027, - 543, 1026, 1077, 1038, 1013, 1545, 1069, 1016, 1029, 1545, - 568, 567, 1029, 1030, 1031, 1022, 1015, 1009, 1016, 1009, - 1058, 1062, 1009, 1019, 1002, 1016, 1004, 1014, 1006, 1049, + 527, 538, 1079, 535, 1548, 1140, 1098, 1087, 1091, 1136, + 1548, 1130, 553, 1088, 1082, 1083, 1074, 1074, 1091, 1086, + 1074, 1085, 1069, 1071, 1070, 1084, 1065, 1115, 1070, 1078, + 1076, 1067, 1076, 1072, 1113, 1055, 1055, 1068, 1067, 1052, + 1050, 1051, 1548, 1548, 1065, 1062, 1065, 1548, 1064, 1049, + 530, 1047, 1094, 1043, 1097, 1096, 1548, 1041, 1053, 1051, + 1092, 1040, 1040, 1089, 1042, 1030, 1024, 1032, 1034, 1043, + 1036, 1028, 1028, 529, 1027, 1078, 1039, 1014, 1548, 1070, + 1017, 1030, 1548, 557, 574, 1030, 1031, 1032, 1023, 1016, + 1010, 1017, 1010, 1059, 1063, 1010, 1020, 1003, 1017, 1005, - 1015, 997, 996, 1545, 1012, 993, 993, 597, 991, 1008, - 986, 1002, 1038, 996, 984, 1000, 63, 197, 218, 391, - 267, 1545, 1545, 294, 471, 491, 1545, 499, 514, 1545, - 548, 554, 548, 551, 564, 558, 556, 616, 562, 618, - 619, 565, 1545, 572, 570, 569, 583, 584, 600, 605, - 577, 581, 575, 582, 593, 634, 635, 584, 588, 1545, - 583, 601, 598, 636, 587, 605, 606, 592, 600, 609, - 589, 610, 650, 651, 1545, 606, 654, 657, 619, 622, - 605, 606, 613, 664, 613, 628, 667, 622, 620, 618, - 671, 672, 624, 674, 670, 630, 635, 628, 637, 631, + 1015, 1007, 1050, 1016, 998, 997, 1548, 1013, 994, 994, + 602, 992, 1009, 987, 1003, 1039, 997, 63, 200, 218, + 280, 286, 563, 350, 1548, 1548, 393, 479, 496, 1548, + 504, 500, 1548, 517, 523, 551, 552, 564, 559, 559, + 612, 558, 615, 617, 569, 1548, 575, 573, 572, 586, + 587, 604, 606, 581, 584, 578, 585, 596, 637, 638, + 587, 591, 1548, 586, 604, 601, 639, 590, 608, 609, + 595, 603, 612, 592, 613, 653, 654, 1548, 609, 656, + 660, 623, 625, 608, 609, 616, 667, 616, 631, 670, + 625, 623, 621, 674, 675, 627, 677, 673, 633, 638, - 626, 636, 632, 1545, 627, 1545, 1545, 628, 644, 645, - 646, 628, 633, 672, 663, 636, 636, 639, 654, 649, - 1545, 1545, 659, 658, 644, 645, 703, 658, 663, 650, - 661, 653, 659, 655, 673, 674, 1545, 1545, 672, 1545, - 675, 1545, 660, 679, 669, 719, 675, 717, 1545, 674, - 724, 1545, 673, 680, 722, 1545, 1545, 682, 1545, 673, - 673, 676, 690, 677, 688, 735, 694, 732, 738, 739, - 740, 741, 702, 686, 698, 717, 746, 742, 707, 749, - 698, 709, 714, 702, 754, 713, 1545, 715, 714, 716, - 709, 718, 719, 716, 706, 708, 765, 714, 767, 712, + 631, 640, 634, 629, 639, 635, 1548, 630, 1548, 1548, + 631, 647, 648, 649, 631, 636, 675, 666, 639, 639, + 642, 657, 652, 1548, 1548, 662, 661, 647, 648, 706, + 661, 666, 653, 664, 656, 662, 658, 676, 677, 1548, + 1548, 675, 1548, 678, 1548, 663, 682, 672, 722, 678, + 720, 1548, 677, 727, 1548, 676, 683, 725, 1548, 1548, + 685, 1548, 676, 676, 679, 693, 680, 691, 738, 697, + 735, 741, 742, 743, 744, 705, 689, 701, 720, 749, + 745, 710, 752, 701, 712, 717, 705, 757, 716, 1548, + 718, 717, 719, 712, 721, 722, 719, 709, 711, 768, - 769, 1545, 707, 722, 772, 1545, 723, 733, 718, 734, - 720, 780, 781, 727, 783, 742, 1545, 734, 736, 787, - 1545, 1545, 1545, 1545, 740, 790, 742, 774, 1545, 736, - 753, 1545, 740, 739, 741, 742, 800, 1545, 745, 802, - 757, 748, 763, 763, 766, 766, 763, 768, 1545, 760, - 1545, 770, 1545, 771, 772, 769, 1545, 761, 767, 766, - 778, 778, 1545, 1545, 817, 1545, 782, 767, 773, 1545, - 788, 1545, 785, 804, 776, 825, 831, 775, 833, 788, - 1545, 835, 1545, 775, 832, 797, 793, 835, 785, 790, - 843, 801, 845, 846, 809, 798, 849, 793, 810, 795, + 717, 770, 715, 772, 1548, 710, 725, 775, 1548, 726, + 736, 721, 737, 723, 783, 784, 730, 786, 745, 1548, + 737, 739, 790, 1548, 1548, 1548, 1548, 743, 793, 745, + 777, 1548, 739, 756, 1548, 743, 742, 744, 745, 803, + 1548, 748, 805, 760, 751, 766, 766, 769, 769, 766, + 771, 1548, 763, 1548, 773, 1548, 774, 775, 772, 1548, + 764, 770, 769, 781, 781, 1548, 1548, 820, 1548, 785, + 770, 776, 1548, 791, 1548, 788, 807, 779, 828, 834, + 778, 836, 791, 1548, 838, 1548, 778, 835, 800, 796, + 838, 788, 793, 846, 804, 848, 849, 812, 801, 852, - 810, 794, 851, 852, 817, 813, 860, 832, 821, 820, - 1545, 864, 1545, 813, 1545, 866, 814, 863, 808, 813, - 872, 822, 1545, 828, 1545, 1545, 819, 834, 1545, 872, - 840, 833, 834, 843, 830, 832, 842, 835, 1545, 886, - 849, 834, 1545, 839, 1545, 842, 837, 836, 894, 849, - 1545, 891, 853, 856, 899, 842, 844, 852, 842, 858, - 852, 868, 907, 903, 1545, 852, 869, 906, 870, 861, - 868, 1545, 865, 870, 917, 862, 1545, 866, 878, 879, - 922, 866, 867, 875, 1545, 886, 885, 877, 876, 879, - 891, 882, 891, 893, 1545, 935, 895, 937, 938, 1545, + 796, 813, 798, 813, 797, 854, 855, 820, 816, 863, + 835, 824, 823, 1548, 867, 1548, 816, 1548, 869, 817, + 866, 811, 816, 875, 825, 1548, 831, 1548, 1548, 822, + 837, 1548, 875, 843, 836, 837, 846, 833, 835, 845, + 838, 1548, 889, 852, 837, 1548, 842, 1548, 845, 840, + 839, 897, 852, 1548, 894, 856, 859, 902, 845, 847, + 855, 845, 861, 855, 871, 910, 906, 1548, 855, 872, + 909, 873, 864, 871, 1548, 868, 873, 920, 865, 1548, + 869, 881, 882, 925, 869, 870, 878, 1548, 889, 888, + 880, 879, 882, 894, 885, 894, 896, 1548, 938, 898, - 934, 894, 899, 880, 943, 944, 903, 946, 905, 906, - 949, 908, 1545, 913, 1545, 1545, 895, 901, 954, 915, - 1545, 1545, 901, 1545, 901, 903, 1545, 908, 903, 915, - 911, 1545, 914, 918, 909, 961, 910, 926, 919, 914, - 929, 920, 927, 914, 929, 976, 935, 978, 923, 939, - 930, 944, 940, 1545, 984, 1545, 985, 986, 943, 942, - 943, 1545, 1545, 1545, 990, 934, 950, 1545, 988, 939, - 938, 940, 951, 998, 949, 1545, 958, 1001, 1545, 1545, - 1007, 1012, 1017, 1022, 1027, 1032, 1037, 1040, 1014, 1019, - 1021, 1034 + 940, 941, 1548, 937, 897, 902, 883, 946, 947, 906, + 949, 908, 909, 952, 911, 1548, 916, 1548, 1548, 898, + 904, 957, 918, 1548, 1548, 904, 1548, 904, 906, 1548, + 911, 906, 918, 914, 1548, 917, 921, 912, 964, 913, + 929, 922, 917, 932, 923, 930, 917, 932, 979, 938, + 981, 926, 942, 933, 947, 943, 1548, 987, 1548, 988, + 989, 946, 945, 946, 1548, 1548, 1548, 993, 937, 953, + 1548, 991, 942, 941, 943, 954, 1001, 952, 1548, 961, + 1004, 1548, 1548, 1010, 1015, 1020, 1025, 1030, 1035, 1040, + 1043, 1017, 1022, 1024, 1037 } ; -static yyconst flex_int16_t yy_def[1193] = +static yyconst flex_int16_t yy_def[1196] = { 0, - 1181, 1181, 1182, 1182, 1181, 1181, 1181, 1181, 1181, 1181, - 1180, 1180, 1180, 1180, 1180, 1183, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1184, - 1180, 1180, 1180, 1185, 15, 1180, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1186, 45, 45, 45, + 1184, 1184, 1185, 1185, 1184, 1184, 1184, 1184, 1184, 1184, + 1183, 1183, 1183, 1183, 1183, 1186, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1187, + 1183, 1183, 1183, 1188, 15, 1183, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1189, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1183, 1180, 1180, 1180, - 1180, 1180, 1180, 1187, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1184, 1180, 1185, 1180, 1180, + 45, 45, 45, 45, 45, 45, 1186, 1183, 1183, 1183, + 1183, 1183, 1183, 1190, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1187, 1183, 1188, 1183, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1188, 45, 1186, 45, 45, 45, 45, 45, + 45, 45, 1191, 45, 1189, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 1187, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1189, 45, 45, 1180, 45, 45, - 1180, 45, 45, 45, 45, 45, 45, 45, 1188, 1180, - 1186, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1190, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1192, 45, 45, 1183, 45, 45, + 1183, 45, 45, 45, 45, 45, 45, 45, 1191, 1183, + 1189, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 1180, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1190, - 45, 45, 45, 45, 1180, 45, 45, 1180, 45, 1180, - 45, 1186, 45, 45, 45, 45, 45, 45, 45, 1180, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1193, 45, 45, 45, 45, 1183, 45, 45, 1183, 45, + 1183, 45, 1189, 45, 45, 45, 45, 45, 45, 45, + 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1180, 1180, 1180, 1191, 45, 45, - 45, 45, 45, 1180, 45, 45, 1180, 45, 1186, 45, - 45, 45, 45, 1180, 45, 45, 45, 1180, 45, 45, - 45, 45, 45, 1180, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 1180, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1183, 1183, 1183, 1194, + 45, 45, 45, 45, 45, 1183, 45, 45, 1183, 45, + 1189, 45, 45, 45, 45, 1183, 45, 45, 45, 1183, + 45, 45, 45, 45, 45, 1183, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1180, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1180, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1183, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1183, 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1180, 1180, 1180, 45, 1180, 45, 45, 1180, - 1192, 45, 1180, 1180, 45, 1180, 45, 1180, 45, 45, - 45, 45, 1180, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1183, 1183, 1183, 45, 1183, + 45, 45, 1183, 1195, 45, 1183, 1183, 45, 1183, 45, + 1183, 45, 45, 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1180, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 1180, 45, 45, - - 45, 45, 45, 45, 45, 45, 45, 1180, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 1180, 45, 45, - 45, 45, 45, 45, 45, 45, 1180, 45, 45, 45, - 45, 1180, 1180, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 1180, 45, 45, 45, 45, - 45, 45, 45, 45, 1180, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1180, 45, 45, 45, 45, 45, 1180, 45, 45, + 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 1183, 45, 45, 45, 45, 45, 45, 45, 45, 1183, + 45, 45, 45, 45, 1183, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1180, - 1180, 45, 45, 45, 1180, 45, 45, 45, 45, 45, - 45, 45, 45, 1180, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 1180, 45, 45, 45, 1180, + 45, 45, 45, 45, 45, 45, 45, 45, 1183, 45, + 45, 45, 45, 45, 45, 45, 45, 1183, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + + 45, 45, 45, 45, 1183, 45, 45, 45, 45, 45, + 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 1183, 1183, 45, 45, 45, 1183, 45, 45, + 45, 45, 45, 45, 45, 45, 1183, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 1183, 45, + 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + + 45, 45, 45, 45, 45, 45, 1183, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 1183, 1183, 45, 45, 45, 1183, + 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1183, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 1180, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1183, 45, 1183, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1180, 1180, 45, 45, 45, 1180, 45, 45, 1180, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1180, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1180, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1180, 45, 45, 45, 45, 45, + 45, 45, 45, 1183, 1183, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1183, + 1183, 45, 1183, 45, 1183, 45, 45, 45, 45, 45, + 45, 1183, 45, 45, 1183, 45, 45, 45, 1183, 1183, + 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 1180, 45, 1180, 1180, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 1180, 1180, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1180, 1180, 45, 1180, - 45, 1180, 45, 45, 45, 45, 45, 45, 1180, 45, - 45, 1180, 45, 45, 45, 1180, 1180, 45, 1180, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1180, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - - 45, 1180, 45, 45, 45, 1180, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1180, 45, 45, 45, - 1180, 1180, 1180, 1180, 45, 45, 45, 45, 1180, 45, - 45, 1180, 45, 45, 45, 45, 45, 1180, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 1180, 45, - 1180, 45, 1180, 45, 45, 45, 1180, 45, 45, 45, - 45, 45, 1180, 1180, 45, 1180, 45, 45, 45, 1180, - 45, 1180, 45, 45, 45, 45, 45, 45, 45, 45, - 1180, 45, 1180, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 1183, 45, 45, 45, 1183, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1183, + 45, 45, 45, 1183, 1183, 1183, 1183, 45, 45, 45, + 45, 1183, 45, 45, 1183, 45, 45, 45, 45, 45, + 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1183, 45, 1183, 45, 1183, 45, 45, 45, 1183, + 45, 45, 45, 45, 45, 1183, 1183, 45, 1183, 45, + 45, 45, 1183, 45, 1183, 45, 45, 45, 45, 45, + 45, 45, 45, 1183, 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 1180, 45, 1180, 45, 1180, 45, 45, 45, 45, 45, - 45, 45, 1180, 45, 1180, 1180, 45, 45, 1180, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 1180, 45, - 45, 45, 1180, 45, 1180, 45, 45, 45, 45, 45, - 1180, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1180, 45, 45, 45, 45, 45, - 45, 1180, 45, 45, 45, 45, 1180, 45, 45, 45, - 45, 45, 45, 45, 1180, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1180, 45, 45, 45, 45, 1180, + 45, 45, 45, 1183, 45, 1183, 45, 1183, 45, 45, + 45, 45, 45, 45, 45, 1183, 45, 1183, 1183, 45, + 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1183, 45, 45, 45, 1183, 45, 1183, 45, 45, + 45, 45, 45, 1183, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1183, 45, 45, + 45, 45, 45, 45, 1183, 45, 45, 45, 45, 1183, + 45, 45, 45, 45, 45, 45, 45, 1183, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1183, 45, 45, + 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1183, 45, 1183, 1183, 45, + 45, 45, 45, 1183, 1183, 45, 1183, 45, 45, 1183, + 45, 45, 45, 45, 1183, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1180, 45, 1180, 1180, 45, 45, 45, 45, - 1180, 1180, 45, 1180, 45, 45, 1180, 45, 45, 45, - 45, 1180, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 1180, 45, 1180, 45, 45, 45, 45, - 45, 1180, 1180, 1180, 45, 45, 45, 1180, 45, 45, - 45, 45, 45, 45, 45, 1180, 45, 45, 1180, 0, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180 + 45, 45, 45, 45, 45, 45, 1183, 45, 1183, 45, + 45, 45, 45, 45, 1183, 1183, 1183, 45, 45, 45, + 1183, 45, 45, 45, 45, 45, 45, 45, 1183, 45, + 45, 1183, 0, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183 } ; -static yyconst flex_uint16_t yy_nxt[1617] = +static yyconst flex_uint16_t yy_nxt[1620] = { 0, - 1180, 13, 14, 13, 1180, 15, 16, 1180, 17, 18, - 19, 20, 21, 22, 22, 22, 23, 24, 83, 1180, - 37, 14, 37, 84, 25, 26, 38, 1180, 1180, 27, + 1183, 13, 14, 13, 1183, 15, 16, 1183, 17, 18, + 19, 20, 21, 22, 22, 22, 23, 24, 83, 1183, + 37, 14, 37, 84, 25, 26, 38, 1183, 1183, 27, 37, 14, 37, 42, 28, 42, 38, 89, 90, 29, 112, 30, 13, 14, 13, 88, 89, 25, 31, 90, - 13, 14, 13, 13, 14, 13, 32, 40, 1180, 13, - 14, 13, 33, 40, 112, 89, 90, 422, 88, 34, + 13, 14, 13, 13, 14, 13, 32, 40, 1183, 13, + 14, 13, 33, 40, 112, 89, 90, 424, 88, 34, 35, 13, 14, 13, 92, 15, 16, 93, 17, 18, 19, 20, 21, 22, 22, 22, 23, 24, 13, 14, 13, 105, 39, 88, 25, 26, 13, 14, 13, 27, 39, 82, 82, 82, 28, 42, 41, 42, 42, 29, 42, 30, 80, 104, 41, 108, 91, 25, 31, 105, - 126, 133, 86, 423, 86, 786, 32, 87, 87, 87, - 127, 134, 33, 135, 337, 80, 104, 338, 108, 34, + 126, 133, 86, 425, 86, 787, 32, 87, 87, 87, + 127, 134, 33, 135, 339, 80, 104, 340, 108, 34, 35, 44, 44, 44, 45, 45, 46, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 47, 45, 45, 48, 49, 50, 45, 51, 52, @@ -953,78 +954,78 @@ static yyconst flex_uint16_t yy_nxt[1617] = 45, 45, 78, 101, 79, 79, 79, 78, 106, 81, 81, 81, 99, 111, 78, 80, 81, 81, 81, 118, 80, 122, 119, 109, 120, 123, 121, 80, 124, 101, - 104, 101, 99, 110, 130, 787, 111, 107, 80, 131, + 104, 101, 99, 110, 130, 788, 111, 107, 80, 131, 154, 125, 132, 80, 155, 167, 109, 100, 140, 168, 80, 45, 141, 104, 45, 45, 45, 116, 45, 45, 45, 110, 114, 117, 128, 45, 45, 100, 45, 45, - 788, 167, 142, 180, 45, 168, 45, 45, 45, 45, + 789, 167, 142, 180, 45, 168, 45, 45, 45, 45, 45, 45, 45, 45, 169, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 136, 137, 180, 45, 138, 108, 145, 45, 111, 188, 139, 146, - 147, 148, 169, 45, 149, 150, 181, 45, 791, 45, + 147, 148, 169, 45, 149, 150, 181, 45, 790, 45, 115, 156, 143, 109, 144, 151, 108, 185, 152, 111, - 188, 157, 158, 110, 87, 87, 87, 159, 792, 163, - 82, 82, 82, 288, 164, 182, 109, 167, 160, 289, + 188, 157, 158, 110, 87, 87, 87, 159, 791, 163, + 82, 82, 82, 289, 164, 182, 109, 167, 160, 290, 169, 80, 161, 78, 185, 79, 79, 79, 86, 168, 86, 110, 176, 87, 87, 87, 80, 78, 162, 81, 81, 81, 98, 170, 80, 82, 82, 82, 172, 98, 80, 87, 87, 87, 179, 171, 80, 187, 184, 80, - 176, 186, 196, 209, 201, 202, 176, 239, 206, 226, - 207, 240, 197, 80, 203, 213, 210, 98, 214, 80, + 176, 186, 196, 209, 201, 202, 176, 264, 206, 226, + 207, 794, 197, 80, 203, 213, 210, 98, 214, 80, 179, 98, 215, 192, 187, 98, 184, 208, 218, 186, - 227, 235, 236, 98, 193, 263, 789, 98, 265, 98, - 175, 191, 191, 191, 244, 245, 246, 790, 191, 191, - 191, 191, 191, 191, 264, 247, 251, 248, 263, 249, - 252, 265, 250, 263, 253, 264, 265, 271, 273, 277, - 219, 191, 191, 191, 191, 191, 191, 274, 279, 281, - 264, 793, 271, 359, 360, 361, 266, 355, 355, 268, - 271, 267, 277, 362, 366, 359, 273, 363, 382, 408, + 227, 235, 236, 98, 193, 264, 265, 98, 266, 98, + 175, 191, 191, 191, 410, 411, 266, 795, 191, 191, + 191, 191, 191, 191, 239, 252, 265, 240, 241, 253, + 264, 266, 265, 254, 272, 274, 245, 246, 247, 269, + 219, 191, 191, 191, 191, 191, 191, 248, 275, 249, + 278, 250, 268, 280, 251, 282, 272, 272, 267, 796, + 361, 362, 363, 274, 357, 357, 579, 384, 368, 361, - 409, 279, 383, 413, 274, 284, 281, 282, 282, 282, - 355, 356, 359, 414, 282, 282, 282, 282, 282, 282, - 363, 425, 366, 717, 371, 426, 447, 718, 394, 452, - 452, 448, 459, 395, 460, 536, 537, 282, 282, 282, - 282, 282, 282, 369, 369, 369, 576, 794, 795, 669, - 369, 369, 369, 369, 369, 369, 670, 452, 462, 459, - 518, 460, 536, 533, 537, 519, 585, 610, 539, 796, - 602, 586, 609, 369, 369, 369, 369, 369, 369, 396, - 603, 671, 682, 577, 397, 45, 45, 45, 672, 740, - 610, 750, 45, 45, 45, 45, 45, 45, 674, 749, + 364, 385, 450, 278, 365, 275, 280, 451, 455, 285, + 455, 396, 282, 283, 283, 283, 397, 357, 358, 361, + 283, 283, 283, 283, 283, 283, 368, 365, 373, 415, + 428, 613, 521, 580, 429, 536, 455, 522, 465, 416, + 542, 539, 540, 283, 283, 283, 283, 283, 283, 371, + 371, 371, 797, 798, 613, 799, 371, 371, 371, 371, + 371, 371, 398, 462, 588, 463, 605, 399, 539, 589, + 540, 612, 800, 720, 801, 743, 606, 721, 672, 371, + 371, 371, 371, 371, 371, 673, 685, 744, 752, 674, + 462, 677, 463, 45, 45, 45, 675, 678, 753, 612, - 609, 741, 775, 797, 675, 798, 799, 776, 587, 800, - 682, 801, 802, 803, 750, 45, 45, 45, 45, 45, - 45, 804, 805, 806, 807, 808, 749, 809, 810, 811, - 812, 813, 814, 816, 815, 817, 818, 819, 820, 821, + 45, 45, 45, 45, 45, 45, 590, 778, 792, 802, + 803, 804, 779, 805, 685, 752, 806, 807, 808, 793, + 809, 753, 810, 45, 45, 45, 45, 45, 45, 811, + 812, 813, 814, 815, 816, 818, 817, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 831, - 832, 833, 834, 835, 836, 837, 838, 839, 777, 840, - 814, 815, 842, 844, 841, 845, 846, 847, 848, 849, + 832, 833, 834, 835, 836, 837, 838, 839, 840, 841, + 842, 843, 818, 780, 817, 845, 844, 847, 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, - 880, 881, 882, 883, 843, 884, 885, 886, 887, 888, - 889, 890, 891, 892, 893, 894, 895, 896, 897, 876, - 898, 899, 900, 901, 902, 877, 903, 904, 905, 906, + 880, 881, 882, 883, 884, 885, 886, 846, 887, 888, + 889, 890, 891, 892, 893, 894, 895, 896, 897, 898, + 899, 900, 879, 901, 902, 903, 904, 905, 880, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, - 917, 918, 919, 921, 922, 923, 924, 925, 926, 927, - 928, 929, 930, 931, 932, 934, 935, 936, 937, 938, + 917, 918, 919, 920, 921, 922, 924, 925, 926, 927, + 928, 929, 930, 931, 932, 933, 934, 935, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948, - 949, 950, 951, 952, 953, 954, 955, 957, 928, 958, - 959, 960, 961, 962, 956, 963, 964, 965, 966, 967, - 968, 969, 970, 920, 971, 972, 933, 973, 974, 975, + 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, + 960, 931, 961, 962, 963, 964, 965, 959, 966, 967, + 968, 969, 970, 971, 972, 973, 923, 974, 975, 936, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, 993, 994, 995, - 996, 974, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, + 996, 997, 998, 999, 977, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, - 1008, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, - 1044, 1045, 1047, 1048, 1049, 1050, 1046, 1051, 1052, 1053, + 1035, 1036, 1037, 1011, 1038, 1039, 1040, 1041, 1042, 1043, + 1044, 1045, 1046, 1047, 1048, 1050, 1051, 1052, 1053, 1049, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, - 1064, 1065, 1066, 1067, 1040, 1068, 1069, 1070, 1071, 1072, + 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1043, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, @@ -1037,77 +1038,77 @@ static yyconst flex_uint16_t yy_nxt[1617] = 1153, 1154, 1155, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, - 1173, 1174, 1175, 1176, 1177, 1178, 1179, 12, 12, 12, - 12, 12, 36, 36, 36, 36, 36, 77, 270, 77, - 77, 77, 96, 358, 96, 451, 96, 98, 98, 98, - 98, 98, 113, 113, 113, 113, 113, 166, 98, 166, - 166, 166, 189, 189, 189, 785, 784, 783, 782, 781, - 780, 779, 778, 774, 773, 772, 771, 770, 769, 768, - 767, 766, 765, 764, 763, 762, 761, 760, 759, 758, - 757, 756, 755, 754, 753, 752, 751, 748, 747, 746, - 745, 744, 743, 742, 739, 738, 737, 736, 735, 734, - 733, 732, 731, 730, 729, 728, 727, 726, 725, 724, + 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, + 12, 12, 12, 12, 12, 36, 36, 36, 36, 36, + 77, 271, 77, 77, 77, 96, 360, 96, 454, 96, + 98, 98, 98, 98, 98, 113, 113, 113, 113, 113, + 166, 98, 166, 166, 166, 189, 189, 189, 786, 785, + 784, 783, 782, 781, 777, 776, 775, 774, 773, 772, + 771, 770, 769, 768, 767, 766, 765, 764, 763, 762, + 761, 760, 759, 758, 757, 756, 755, 754, 751, 750, + 749, 748, 747, 746, 745, 742, 741, 740, 739, 738, + 737, 736, 735, 734, 733, 732, 731, 730, 729, 728, - 723, 722, 721, 720, 719, 716, 715, 714, 713, 712, - 711, 710, 709, 708, 707, 706, 705, 704, 703, 702, - 701, 700, 699, 698, 697, 696, 695, 694, 693, 692, - 691, 690, 689, 688, 687, 686, 685, 684, 683, 681, - 680, 679, 678, 677, 676, 673, 668, 667, 666, 665, - 664, 663, 662, 661, 660, 659, 658, 657, 656, 655, - 654, 653, 652, 651, 650, 649, 648, 647, 646, 645, - 644, 643, 642, 641, 640, 639, 638, 637, 636, 635, - 634, 633, 632, 631, 630, 629, 628, 627, 626, 625, - 624, 623, 622, 621, 620, 619, 618, 617, 616, 615, + 727, 726, 725, 724, 723, 722, 719, 718, 717, 716, + 715, 714, 713, 712, 711, 710, 709, 708, 707, 706, + 705, 704, 703, 702, 701, 700, 699, 698, 697, 696, + 695, 694, 693, 692, 691, 690, 689, 688, 687, 686, + 684, 683, 682, 681, 680, 679, 676, 671, 670, 669, + 668, 667, 666, 665, 664, 663, 662, 661, 660, 659, + 658, 657, 656, 655, 654, 653, 652, 651, 650, 649, + 648, 647, 646, 645, 644, 643, 642, 641, 640, 639, + 638, 637, 636, 635, 634, 633, 632, 631, 630, 629, + 628, 627, 626, 625, 624, 623, 622, 621, 620, 619, - 614, 613, 612, 611, 608, 607, 606, 605, 604, 601, - 600, 599, 598, 597, 596, 595, 594, 593, 592, 591, - 590, 589, 588, 584, 583, 582, 581, 580, 579, 578, - 575, 574, 573, 572, 571, 570, 569, 568, 567, 566, - 565, 564, 563, 562, 561, 560, 559, 558, 557, 556, - 555, 554, 553, 552, 551, 550, 549, 548, 547, 546, - 545, 544, 543, 542, 541, 540, 538, 535, 534, 533, - 532, 531, 530, 529, 528, 527, 526, 525, 524, 523, - 522, 521, 520, 517, 516, 515, 514, 513, 512, 511, - 510, 509, 508, 507, 506, 505, 504, 503, 502, 501, + 618, 617, 616, 615, 614, 611, 610, 609, 608, 607, + 604, 603, 602, 601, 600, 599, 598, 597, 596, 595, + 594, 593, 592, 591, 587, 586, 585, 584, 583, 582, + 581, 578, 577, 576, 575, 574, 573, 572, 571, 570, + 569, 568, 567, 566, 565, 564, 563, 562, 561, 560, + 559, 558, 557, 556, 555, 554, 553, 552, 551, 550, + 549, 548, 547, 546, 545, 544, 543, 541, 538, 537, + 536, 535, 534, 533, 532, 531, 530, 529, 528, 527, + 526, 525, 524, 523, 520, 519, 518, 517, 516, 515, + 514, 513, 512, 511, 510, 509, 508, 507, 506, 505, - 500, 499, 498, 497, 496, 495, 494, 493, 492, 491, - 490, 489, 488, 487, 486, 485, 484, 483, 482, 481, - 480, 479, 478, 477, 476, 475, 474, 473, 472, 471, - 470, 469, 468, 467, 466, 465, 464, 463, 461, 458, - 457, 456, 455, 454, 453, 450, 449, 446, 445, 444, - 443, 442, 441, 440, 439, 438, 437, 436, 435, 434, - 433, 432, 431, 430, 429, 428, 427, 424, 421, 420, - 419, 418, 417, 416, 415, 412, 411, 410, 407, 406, - 405, 404, 403, 402, 401, 400, 399, 398, 393, 392, - 391, 390, 389, 388, 387, 386, 385, 384, 381, 380, + 504, 503, 502, 501, 500, 499, 498, 497, 496, 495, + 494, 493, 492, 491, 490, 489, 488, 487, 486, 485, + 484, 483, 482, 481, 480, 479, 478, 477, 476, 475, + 474, 473, 472, 471, 470, 469, 468, 467, 466, 464, + 461, 460, 459, 458, 457, 456, 453, 452, 449, 448, + 447, 446, 445, 444, 443, 442, 441, 440, 439, 438, + 437, 436, 435, 434, 433, 432, 431, 430, 427, 426, + 423, 422, 421, 420, 419, 418, 417, 414, 413, 412, + 409, 408, 407, 406, 405, 404, 403, 402, 401, 400, + 395, 394, 393, 392, 391, 390, 389, 388, 387, 386, - 379, 378, 377, 376, 375, 374, 373, 372, 370, 368, - 367, 365, 364, 357, 354, 353, 352, 351, 350, 349, - 348, 347, 346, 345, 344, 343, 342, 341, 340, 339, - 336, 335, 334, 333, 332, 331, 330, 329, 328, 327, - 326, 325, 324, 323, 322, 321, 320, 319, 318, 317, - 316, 315, 314, 313, 312, 311, 310, 309, 308, 307, - 306, 305, 304, 303, 302, 301, 300, 299, 298, 297, - 296, 295, 294, 293, 292, 291, 290, 287, 286, 285, - 283, 190, 280, 278, 276, 275, 272, 269, 262, 261, - 260, 259, 258, 257, 256, 255, 254, 243, 242, 241, + 383, 382, 381, 380, 379, 378, 377, 376, 375, 374, + 372, 370, 369, 367, 366, 359, 356, 355, 354, 353, + 352, 351, 350, 349, 348, 347, 346, 345, 344, 343, + 342, 341, 338, 337, 336, 335, 334, 333, 332, 331, + 330, 329, 328, 327, 326, 325, 324, 323, 322, 321, + 320, 319, 318, 317, 316, 315, 314, 313, 312, 311, + 310, 309, 308, 307, 306, 305, 304, 303, 302, 301, + 300, 299, 298, 297, 296, 295, 294, 293, 292, 291, + 288, 287, 286, 284, 190, 281, 279, 277, 276, 273, + 270, 263, 262, 261, 260, 259, 258, 257, 256, 255, - 238, 237, 234, 233, 232, 231, 230, 229, 228, 225, - 224, 223, 222, 221, 220, 217, 216, 212, 211, 205, - 204, 200, 199, 198, 195, 194, 190, 183, 178, 177, - 174, 173, 165, 153, 129, 103, 102, 43, 97, 95, - 94, 85, 43, 1180, 11, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, + 244, 243, 242, 238, 237, 234, 233, 232, 231, 230, + 229, 228, 225, 224, 223, 222, 221, 220, 217, 216, + 212, 211, 205, 204, 200, 199, 198, 195, 194, 190, + 183, 178, 177, 174, 173, 165, 153, 129, 103, 102, + 43, 97, 95, 94, 85, 43, 1183, 11, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180 + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183 } ; -static yyconst flex_int16_t yy_chk[1617] = +static yyconst flex_int16_t yy_chk[1620] = { 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 21, 0, @@ -1115,15 +1116,15 @@ static yyconst flex_int16_t yy_chk[1617] = 4, 4, 4, 13, 1, 13, 4, 27, 28, 1, 56, 1, 5, 5, 5, 26, 32, 1, 1, 33, 6, 6, 6, 7, 7, 7, 1, 7, 0, 8, - 8, 8, 1, 8, 56, 27, 28, 330, 26, 1, + 8, 8, 1, 8, 56, 27, 28, 331, 26, 1, 1, 2, 2, 2, 32, 2, 2, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 9, 9, 9, 51, 5, 31, 2, 2, 10, 10, 10, 2, 6, 20, 20, 20, 2, 37, 9, 37, 42, 2, 42, 2, 20, 50, 10, 53, 31, 2, 2, 51, - 61, 65, 25, 330, 25, 717, 2, 25, 25, 25, - 61, 65, 2, 65, 246, 20, 50, 246, 53, 2, + 61, 65, 25, 331, 25, 718, 2, 25, 25, 25, + 61, 65, 2, 65, 247, 20, 50, 247, 53, 2, 2, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, @@ -1135,158 +1136,158 @@ static yyconst flex_int16_t yy_chk[1617] = 15, 15, 17, 47, 17, 17, 17, 19, 52, 19, 19, 19, 44, 55, 22, 17, 22, 22, 22, 59, 19, 60, 59, 54, 59, 60, 59, 22, 60, 47, - 62, 58, 98, 54, 64, 718, 55, 52, 17, 64, + 62, 58, 98, 54, 64, 719, 55, 52, 17, 64, 72, 60, 64, 19, 72, 88, 54, 44, 67, 89, 22, 45, 67, 62, 45, 45, 45, 58, 45, 45, 45, 54, 57, 58, 62, 45, 45, 98, 45, 57, - 719, 88, 67, 105, 45, 89, 45, 45, 45, 45, + 720, 88, 67, 105, 45, 89, 45, 45, 45, 45, 45, 45, 45, 45, 90, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 57, 66, 66, 105, 57, 66, 68, 69, 57, 75, 112, 66, 69, 69, 70, 90, 57, 70, 70, 106, 57, 721, 57, 57, 73, 68, 74, 68, 70, 68, 109, 70, 75, - 112, 73, 73, 74, 86, 86, 86, 73, 724, 75, + 112, 73, 73, 74, 86, 86, 86, 73, 722, 75, 78, 78, 78, 197, 75, 106, 74, 91, 74, 197, 93, 78, 74, 79, 109, 79, 79, 79, 80, 92, 80, 74, 101, 80, 80, 80, 79, 81, 74, 81, 81, 81, 100, 91, 78, 82, 82, 82, 93, 100, 81, 87, 87, 87, 104, 92, 82, 111, 108, 79, - 101, 110, 119, 127, 123, 123, 116, 151, 126, 140, - 126, 151, 119, 81, 123, 130, 127, 100, 130, 82, + 101, 110, 119, 127, 123, 123, 116, 167, 126, 140, + 126, 724, 119, 81, 123, 130, 127, 100, 130, 82, 104, 100, 130, 116, 111, 100, 108, 126, 133, 110, - 140, 148, 148, 100, 116, 167, 720, 100, 169, 100, - 100, 115, 115, 115, 155, 155, 155, 720, 115, 115, - 115, 115, 115, 115, 168, 155, 156, 155, 170, 155, - 156, 169, 155, 167, 156, 171, 172, 176, 179, 184, - 133, 115, 115, 115, 115, 115, 115, 180, 186, 188, - 168, 725, 193, 271, 272, 272, 170, 263, 266, 172, - 176, 171, 184, 272, 277, 284, 179, 273, 296, 318, + 140, 148, 148, 100, 116, 167, 168, 100, 169, 100, + 100, 115, 115, 115, 319, 319, 172, 727, 115, 115, + 115, 115, 115, 115, 151, 156, 171, 151, 151, 156, + 170, 169, 168, 156, 176, 179, 155, 155, 155, 172, + 133, 115, 115, 115, 115, 115, 115, 155, 180, 155, + 184, 155, 171, 186, 155, 188, 193, 176, 170, 728, + 272, 273, 273, 179, 264, 267, 505, 297, 278, 285, - 318, 186, 296, 322, 180, 193, 188, 191, 191, 191, - 263, 266, 271, 322, 191, 191, 191, 191, 191, 191, - 273, 332, 277, 648, 284, 332, 353, 648, 307, 359, - 371, 353, 368, 307, 368, 459, 460, 191, 191, 191, - 191, 191, 191, 282, 282, 282, 502, 726, 728, 598, - 282, 282, 282, 282, 282, 282, 598, 359, 371, 368, - 433, 368, 459, 462, 460, 433, 511, 537, 462, 729, - 528, 511, 536, 282, 282, 282, 282, 282, 282, 307, - 528, 599, 610, 502, 307, 369, 369, 369, 599, 671, - 537, 682, 369, 369, 369, 369, 369, 369, 601, 681, + 273, 297, 355, 184, 274, 180, 186, 355, 361, 193, + 373, 308, 188, 191, 191, 191, 308, 264, 267, 272, + 191, 191, 191, 191, 191, 191, 278, 274, 285, 323, + 334, 540, 436, 505, 334, 465, 361, 436, 373, 323, + 465, 462, 463, 191, 191, 191, 191, 191, 191, 283, + 283, 283, 729, 731, 540, 732, 283, 283, 283, 283, + 283, 283, 308, 370, 514, 370, 531, 308, 462, 514, + 463, 539, 734, 651, 735, 674, 531, 651, 601, 283, + 283, 283, 283, 283, 283, 601, 613, 674, 684, 602, + 370, 604, 370, 371, 371, 371, 602, 604, 685, 539, - 536, 671, 708, 731, 601, 732, 733, 708, 511, 734, - 610, 735, 736, 737, 682, 369, 369, 369, 369, 369, - 369, 738, 739, 740, 741, 742, 681, 744, 745, 746, - 747, 748, 749, 751, 750, 752, 753, 754, 755, 756, - 757, 758, 759, 761, 762, 763, 764, 765, 766, 767, - 768, 769, 770, 771, 772, 773, 774, 776, 708, 777, - 749, 750, 778, 779, 777, 780, 781, 782, 783, 784, + 371, 371, 371, 371, 371, 371, 514, 711, 723, 736, + 737, 738, 711, 739, 613, 684, 740, 741, 742, 723, + 743, 685, 744, 371, 371, 371, 371, 371, 371, 745, + 747, 748, 749, 750, 751, 753, 752, 754, 755, 756, + 757, 758, 759, 760, 761, 762, 764, 765, 766, 767, + 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, + 779, 780, 753, 711, 752, 781, 780, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, - 795, 796, 797, 798, 799, 800, 801, 802, 803, 805, - 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, + 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, + 805, 806, 808, 811, 812, 813, 814, 815, 816, 817, - 818, 819, 820, 823, 778, 824, 825, 826, 827, 828, - 829, 830, 831, 832, 833, 834, 835, 836, 839, 814, - 841, 843, 844, 845, 846, 815, 847, 848, 850, 851, - 853, 854, 855, 858, 860, 861, 862, 863, 864, 865, + 818, 819, 820, 821, 822, 823, 826, 781, 827, 828, + 829, 830, 831, 832, 833, 834, 835, 836, 837, 838, + 839, 842, 817, 844, 846, 847, 848, 849, 818, 850, + 851, 853, 854, 856, 857, 858, 861, 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, - 886, 888, 889, 890, 891, 892, 893, 894, 895, 896, - 897, 898, 899, 900, 901, 903, 904, 905, 876, 907, - 908, 909, 910, 911, 904, 912, 913, 914, 915, 916, - 918, 919, 920, 868, 925, 926, 880, 927, 928, 930, + 886, 887, 888, 889, 891, 892, 893, 894, 895, 896, + 897, 898, 899, 900, 901, 902, 903, 904, 906, 907, + 908, 879, 910, 911, 912, 913, 914, 907, 915, 916, + 917, 918, 919, 921, 922, 923, 871, 928, 929, 883, - 931, 933, 934, 935, 936, 937, 939, 940, 941, 942, - 943, 944, 945, 946, 947, 948, 950, 952, 954, 955, - 956, 928, 958, 959, 960, 961, 962, 965, 967, 968, - 969, 971, 973, 974, 975, 976, 977, 978, 979, 980, - 982, 984, 985, 986, 987, 988, 989, 990, 991, 992, + 930, 931, 933, 934, 936, 937, 938, 939, 940, 942, + 943, 944, 945, 946, 947, 948, 949, 950, 951, 953, + 955, 957, 958, 959, 931, 961, 962, 963, 964, 965, + 968, 970, 971, 972, 974, 976, 977, 978, 979, 980, + 981, 982, 983, 985, 987, 988, 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, - 974, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1012, - 1014, 1016, 1017, 1018, 1019, 1020, 1016, 1021, 1022, 1024, - 1027, 1028, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, - 1038, 1040, 1041, 1042, 1008, 1044, 1046, 1047, 1048, 1049, + 1003, 1004, 1005, 977, 1006, 1007, 1008, 1009, 1010, 1011, + 1012, 1013, 1015, 1017, 1019, 1020, 1021, 1022, 1023, 1019, + 1024, 1025, 1027, 1030, 1031, 1033, 1034, 1035, 1036, 1037, + 1038, 1039, 1040, 1041, 1043, 1044, 1045, 1011, 1047, 1049, - 1050, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, - 1061, 1062, 1063, 1064, 1066, 1067, 1068, 1069, 1070, 1071, - 1073, 1074, 1075, 1076, 1078, 1079, 1080, 1081, 1082, 1083, - 1084, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, - 1096, 1097, 1098, 1099, 1101, 1102, 1103, 1104, 1105, 1106, - 1107, 1108, 1109, 1110, 1111, 1112, 1114, 1117, 1118, 1119, - 1120, 1123, 1125, 1126, 1128, 1129, 1130, 1131, 1133, 1134, - 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, - 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1155, - 1157, 1158, 1159, 1160, 1161, 1165, 1166, 1167, 1169, 1170, + 1050, 1051, 1052, 1053, 1055, 1056, 1057, 1058, 1059, 1060, + 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1069, 1070, 1071, + 1072, 1073, 1074, 1076, 1077, 1078, 1079, 1081, 1082, 1083, + 1084, 1085, 1086, 1087, 1089, 1090, 1091, 1092, 1093, 1094, + 1095, 1096, 1097, 1099, 1100, 1101, 1102, 1104, 1105, 1106, + 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1117, + 1120, 1121, 1122, 1123, 1126, 1128, 1129, 1131, 1132, 1133, + 1134, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, + 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, + 1155, 1156, 1158, 1160, 1161, 1162, 1163, 1164, 1168, 1169, - 1171, 1172, 1173, 1174, 1175, 1177, 1178, 1181, 1181, 1181, - 1181, 1181, 1182, 1182, 1182, 1182, 1182, 1183, 1189, 1183, - 1183, 1183, 1184, 1190, 1184, 1191, 1184, 1185, 1185, 1185, - 1185, 1185, 1186, 1186, 1186, 1186, 1186, 1187, 1192, 1187, - 1187, 1187, 1188, 1188, 1188, 716, 715, 714, 713, 712, - 711, 710, 709, 707, 706, 705, 703, 702, 701, 700, - 699, 698, 697, 696, 695, 694, 693, 692, 691, 690, - 689, 688, 687, 686, 685, 684, 683, 679, 678, 677, - 675, 674, 673, 672, 670, 669, 668, 667, 666, 665, - 664, 663, 662, 661, 660, 659, 658, 657, 656, 655, + 1170, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1180, 1181, + 1184, 1184, 1184, 1184, 1184, 1185, 1185, 1185, 1185, 1185, + 1186, 1192, 1186, 1186, 1186, 1187, 1193, 1187, 1194, 1187, + 1188, 1188, 1188, 1188, 1188, 1189, 1189, 1189, 1189, 1189, + 1190, 1195, 1190, 1190, 1190, 1191, 1191, 1191, 717, 716, + 715, 714, 713, 712, 710, 709, 708, 706, 705, 704, + 703, 702, 701, 700, 699, 698, 697, 696, 695, 694, + 693, 692, 691, 690, 689, 688, 687, 686, 682, 681, + 680, 678, 677, 676, 675, 673, 672, 671, 670, 669, + 668, 667, 666, 665, 664, 663, 662, 661, 660, 659, - 653, 652, 651, 650, 649, 647, 646, 644, 643, 642, - 639, 638, 637, 636, 635, 634, 633, 632, 631, 630, - 629, 628, 627, 626, 625, 624, 623, 622, 621, 620, - 619, 618, 617, 616, 615, 614, 613, 612, 611, 609, - 607, 606, 605, 604, 603, 600, 597, 596, 595, 594, - 593, 592, 591, 590, 589, 588, 587, 586, 584, 583, - 582, 581, 580, 579, 578, 577, 575, 574, 573, 572, - 571, 570, 569, 568, 567, 566, 565, 564, 563, 562, - 561, 560, 559, 558, 557, 556, 555, 554, 553, 552, - 551, 550, 549, 548, 547, 546, 545, 544, 543, 542, + 658, 656, 655, 654, 653, 652, 650, 649, 647, 646, + 645, 642, 641, 640, 639, 638, 637, 636, 635, 634, + 633, 632, 631, 630, 629, 628, 627, 626, 625, 624, + 623, 622, 621, 620, 619, 618, 617, 616, 615, 614, + 612, 610, 609, 608, 607, 606, 603, 600, 599, 598, + 597, 596, 595, 594, 593, 592, 591, 590, 589, 587, + 586, 585, 584, 583, 582, 581, 580, 578, 577, 576, + 575, 574, 573, 572, 571, 570, 569, 568, 567, 566, + 565, 564, 563, 562, 561, 560, 559, 558, 557, 556, + 555, 554, 553, 552, 551, 550, 549, 548, 547, 546, - 541, 540, 539, 538, 535, 534, 531, 530, 529, 526, - 525, 524, 523, 522, 521, 520, 519, 517, 516, 515, - 514, 513, 512, 510, 509, 507, 506, 505, 504, 503, - 501, 500, 499, 497, 496, 495, 494, 493, 492, 491, - 490, 489, 488, 487, 486, 484, 483, 482, 481, 480, - 479, 478, 477, 476, 475, 474, 473, 472, 471, 470, - 469, 468, 467, 466, 465, 464, 461, 457, 455, 452, - 450, 449, 448, 446, 442, 441, 440, 439, 438, 437, - 436, 435, 434, 432, 431, 430, 429, 428, 427, 426, - 425, 424, 423, 421, 420, 419, 418, 417, 416, 415, + 545, 544, 543, 542, 541, 538, 537, 534, 533, 532, + 529, 528, 527, 526, 525, 524, 523, 522, 520, 519, + 518, 517, 516, 515, 513, 512, 510, 509, 508, 507, + 506, 504, 503, 502, 500, 499, 498, 497, 496, 495, + 494, 493, 492, 491, 490, 489, 487, 486, 485, 484, + 483, 482, 481, 480, 479, 478, 477, 476, 475, 474, + 473, 472, 471, 470, 469, 468, 467, 464, 460, 458, + 455, 453, 452, 451, 449, 445, 444, 443, 442, 441, + 440, 439, 438, 437, 435, 434, 433, 432, 431, 430, + 429, 428, 427, 425, 423, 422, 421, 420, 419, 418, - 414, 413, 411, 410, 409, 408, 407, 406, 405, 404, - 403, 402, 401, 400, 399, 398, 397, 396, 395, 393, - 392, 391, 390, 389, 388, 387, 386, 385, 383, 382, - 381, 380, 379, 377, 376, 375, 373, 372, 370, 366, - 365, 363, 362, 361, 360, 357, 354, 352, 351, 350, - 349, 348, 347, 346, 345, 344, 343, 342, 341, 340, - 339, 338, 337, 336, 335, 334, 333, 331, 329, 328, - 327, 326, 325, 324, 323, 321, 320, 319, 317, 316, - 315, 314, 313, 312, 311, 310, 309, 308, 306, 305, - 304, 303, 302, 301, 300, 299, 298, 297, 295, 294, + 417, 416, 415, 413, 412, 411, 410, 409, 408, 407, + 406, 405, 404, 403, 402, 401, 400, 399, 398, 397, + 395, 394, 393, 392, 391, 390, 389, 388, 387, 385, + 384, 383, 382, 381, 379, 378, 377, 375, 374, 372, + 368, 367, 365, 364, 363, 362, 359, 356, 354, 353, + 352, 351, 350, 349, 348, 347, 346, 345, 344, 343, + 342, 341, 340, 339, 338, 337, 336, 335, 333, 332, + 330, 329, 328, 327, 326, 325, 324, 322, 321, 320, + 318, 317, 316, 315, 314, 313, 312, 311, 310, 309, + 307, 306, 305, 304, 303, 302, 301, 300, 299, 298, - 293, 292, 291, 289, 288, 287, 286, 285, 283, 281, - 279, 276, 274, 269, 262, 261, 260, 259, 258, 257, - 256, 255, 254, 253, 252, 251, 250, 249, 248, 247, - 245, 244, 243, 242, 241, 240, 239, 238, 237, 236, - 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, - 225, 224, 223, 222, 221, 220, 219, 217, 216, 215, - 214, 213, 212, 211, 210, 209, 208, 207, 206, 205, - 204, 203, 202, 201, 200, 199, 198, 196, 195, 194, - 192, 189, 187, 185, 183, 182, 177, 173, 165, 164, - 163, 162, 161, 160, 159, 158, 157, 154, 153, 152, + 296, 295, 294, 293, 292, 290, 289, 288, 287, 286, + 284, 282, 280, 277, 275, 270, 263, 262, 261, 260, + 259, 258, 257, 256, 255, 254, 253, 252, 251, 250, + 249, 248, 246, 245, 244, 243, 242, 241, 240, 239, + 238, 237, 236, 235, 234, 233, 232, 231, 230, 229, + 228, 227, 226, 225, 224, 223, 222, 221, 220, 219, + 217, 216, 215, 214, 213, 212, 211, 210, 209, 208, + 207, 206, 205, 204, 203, 202, 201, 200, 199, 198, + 196, 195, 194, 192, 189, 187, 185, 183, 182, 177, + 173, 165, 164, 163, 162, 161, 160, 159, 158, 157, - 150, 149, 147, 146, 145, 144, 143, 142, 141, 139, - 138, 137, 136, 135, 134, 132, 131, 129, 128, 125, - 124, 122, 121, 120, 118, 117, 113, 107, 103, 102, - 96, 95, 76, 71, 63, 49, 48, 43, 41, 39, - 38, 24, 14, 11, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, + 154, 153, 152, 150, 149, 147, 146, 145, 144, 143, + 142, 141, 139, 138, 137, 136, 135, 134, 132, 131, + 129, 128, 125, 124, 122, 121, 120, 118, 117, 113, + 107, 103, 102, 96, 95, 76, 71, 63, 49, 48, + 43, 41, 39, 38, 24, 14, 11, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, - 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, - 1180, 1180, 1180, 1180, 1180, 1180 + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183 } ; static yy_state_type yy_last_accepting_state; @@ -1295,24 +1296,24 @@ static char *yy_last_accepting_cpos; extern int parser6__flex_debug; int parser6__flex_debug = 1; -static yyconst flex_int16_t yy_rule_linenum[147] = +static yyconst flex_int16_t yy_rule_linenum[148] = { 0, 132, 134, 136, 141, 142, 147, 148, 149, 161, 164, 169, 176, 185, 194, 203, 212, 221, 230, 239, 248, 257, 266, 275, 284, 293, 302, 311, 321, 331, 341, 351, 361, 371, 381, 391, 401, 410, 419, 428, 437, 446, 455, 467, 476, 485, 494, 503, 513, 523, 533, - 544, 554, 564, 574, 584, 594, 604, 613, 622, 631, - 646, 661, 670, 679, 688, 697, 706, 715, 724, 733, - 742, 752, 761, 770, 779, 788, 797, 806, 816, 825, - 834, 843, 852, 861, 870, 879, 888, 897, 907, 917, - 927, 936, 945, 954, 965, 975, 984, 994, 1003, 1012, + 543, 554, 564, 574, 584, 594, 604, 614, 623, 632, + 641, 656, 671, 680, 689, 698, 707, 716, 725, 734, + 743, 752, 762, 771, 780, 789, 798, 807, 816, 826, + 835, 844, 853, 862, 871, 880, 889, 898, 907, 917, + 927, 937, 946, 955, 964, 975, 985, 994, 1004, 1013, - 1021, 1030, 1039, 1048, 1058, 1067, 1076, 1085, 1094, 1103, - 1112, 1121, 1130, 1139, 1148, 1157, 1166, 1175, 1184, 1193, - 1202, 1211, 1220, 1229, 1238, 1247, 1256, 1265, 1274, 1372, - 1377, 1382, 1387, 1388, 1389, 1390, 1391, 1392, 1394, 1412, - 1425, 1430, 1434, 1436, 1438, 1440 + 1022, 1031, 1040, 1049, 1058, 1068, 1077, 1086, 1095, 1104, + 1113, 1122, 1131, 1140, 1149, 1158, 1167, 1176, 1185, 1194, + 1203, 1212, 1221, 1230, 1239, 1248, 1257, 1266, 1275, 1284, + 1382, 1387, 1392, 1397, 1398, 1399, 1400, 1401, 1402, 1404, + 1422, 1435, 1440, 1444, 1446, 1448, 1450 } ; /* The intent behind this definition is that it'll catch @@ -1383,7 +1384,7 @@ unsigned int comment_start_line = 0; // by moving it ahead by parser6_leng bytes. parser6_leng specifies the length of the // currently matched token. #define YY_USER_ACTION driver.loc_.columns(parser6_leng); -#line 1387 "dhcp6_lexer.cc" +#line 1388 "dhcp6_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1711,7 +1712,7 @@ YY_DECL } -#line 1715 "dhcp6_lexer.cc" +#line 1716 "dhcp6_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1740,13 +1741,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 >= 1181 ) + if ( yy_current_state >= 1184 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; ++yy_cp; } - while ( yy_current_state != 1180 ); + while ( yy_current_state != 1183 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1765,13 +1766,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 < 147 ) + else if ( yy_act < 148 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], parser6_text ); - else if ( yy_act == 147 ) + else if ( yy_act == 148 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", parser6_text ); - else if ( yy_act == 148 ) + else if ( yy_act == 149 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -2353,23 +2354,23 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: case isc::dhcp::Parser6Context::HOSTS_DATABASE: - case isc::dhcp::Parser6Context::SERVER_ID: - return isc::dhcp::Dhcp6Parser::make_PERSIST(driver.loc_); + return isc::dhcp::Dhcp6Parser::make_PORT(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("persist", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("port", driver.loc_); } } YY_BREAK case 51: YY_RULE_SETUP -#line 544 "dhcp6_lexer.ll" +#line 543 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: case isc::dhcp::Parser6Context::HOSTS_DATABASE: - return isc::dhcp::Dhcp6Parser::make_LFC_INTERVAL(driver.loc_); + case isc::dhcp::Parser6Context::SERVER_ID: + return isc::dhcp::Dhcp6Parser::make_PERSIST(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("lfc-interval", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("persist", driver.loc_); } } YY_BREAK @@ -2380,9 +2381,9 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: case isc::dhcp::Parser6Context::HOSTS_DATABASE: - return isc::dhcp::Dhcp6Parser::make_CONNECT_TIMEOUT(driver.loc_); + return isc::dhcp::Dhcp6Parser::make_LFC_INTERVAL(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("connect-timeout", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("lfc-interval", driver.loc_); } } YY_BREAK @@ -2391,11 +2392,11 @@ YY_RULE_SETUP #line 564 "dhcp6_lexer.ll" { switch(driver.ctx_) { - case isc::dhcp::Parser6Context::DHCP6: - case isc::dhcp::Parser6Context::SUBNET6: - return isc::dhcp::Dhcp6Parser::make_PREFERRED_LIFETIME(driver.loc_); + case isc::dhcp::Parser6Context::LEASE_DATABASE: + case isc::dhcp::Parser6Context::HOSTS_DATABASE: + return isc::dhcp::Dhcp6Parser::make_CONNECT_TIMEOUT(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("preferred-lifetime", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("connect-timeout", driver.loc_); } } YY_BREAK @@ -2406,9 +2407,9 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: case isc::dhcp::Parser6Context::SUBNET6: - return isc::dhcp::Dhcp6Parser::make_VALID_LIFETIME(driver.loc_); + return isc::dhcp::Dhcp6Parser::make_PREFERRED_LIFETIME(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("valid-lifetime", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("preferred-lifetime", driver.loc_); } } YY_BREAK @@ -2419,9 +2420,9 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: case isc::dhcp::Parser6Context::SUBNET6: - return isc::dhcp::Dhcp6Parser::make_RENEW_TIMER(driver.loc_); + return isc::dhcp::Dhcp6Parser::make_VALID_LIFETIME(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("renew-timer", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("valid-lifetime", driver.loc_); } } YY_BREAK @@ -2432,15 +2433,28 @@ YY_RULE_SETUP switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: case isc::dhcp::Parser6Context::SUBNET6: - return isc::dhcp::Dhcp6Parser::make_REBIND_TIMER(driver.loc_); + return isc::dhcp::Dhcp6Parser::make_RENEW_TIMER(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("rebind-timer", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("renew-timer", driver.loc_); } } YY_BREAK case 57: YY_RULE_SETUP #line 604 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP6: + case isc::dhcp::Parser6Context::SUBNET6: + return isc::dhcp::Dhcp6Parser::make_REBIND_TIMER(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("rebind-timer", driver.loc_); + } +} + YY_BREAK +case 58: +YY_RULE_SETUP +#line 614 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2450,9 +2464,9 @@ YY_RULE_SETUP } } YY_BREAK -case 58: +case 59: YY_RULE_SETUP -#line 613 "dhcp6_lexer.ll" +#line 623 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2462,9 +2476,9 @@ YY_RULE_SETUP } } YY_BREAK -case 59: +case 60: YY_RULE_SETUP -#line 622 "dhcp6_lexer.ll" +#line 632 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2474,9 +2488,9 @@ YY_RULE_SETUP } } YY_BREAK -case 60: +case 61: YY_RULE_SETUP -#line 631 "dhcp6_lexer.ll" +#line 641 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2492,9 +2506,9 @@ YY_RULE_SETUP } } YY_BREAK -case 61: +case 62: YY_RULE_SETUP -#line 646 "dhcp6_lexer.ll" +#line 656 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2510,9 +2524,9 @@ YY_RULE_SETUP } } YY_BREAK -case 62: +case 63: YY_RULE_SETUP -#line 661 "dhcp6_lexer.ll" +#line 671 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DATA: @@ -2522,9 +2536,9 @@ YY_RULE_SETUP } } YY_BREAK -case 63: +case 64: YY_RULE_SETUP -#line 670 "dhcp6_lexer.ll" +#line 680 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2534,9 +2548,9 @@ YY_RULE_SETUP } } YY_BREAK -case 64: +case 65: YY_RULE_SETUP -#line 679 "dhcp6_lexer.ll" +#line 689 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2546,9 +2560,9 @@ YY_RULE_SETUP } } YY_BREAK -case 65: +case 66: YY_RULE_SETUP -#line 688 "dhcp6_lexer.ll" +#line 698 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2558,9 +2572,9 @@ YY_RULE_SETUP } } YY_BREAK -case 66: +case 67: YY_RULE_SETUP -#line 697 "dhcp6_lexer.ll" +#line 707 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2570,9 +2584,9 @@ YY_RULE_SETUP } } YY_BREAK -case 67: +case 68: YY_RULE_SETUP -#line 706 "dhcp6_lexer.ll" +#line 716 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2582,9 +2596,9 @@ YY_RULE_SETUP } } YY_BREAK -case 68: +case 69: YY_RULE_SETUP -#line 715 "dhcp6_lexer.ll" +#line 725 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2594,9 +2608,9 @@ YY_RULE_SETUP } } YY_BREAK -case 69: +case 70: YY_RULE_SETUP -#line 724 "dhcp6_lexer.ll" +#line 734 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2606,9 +2620,9 @@ YY_RULE_SETUP } } YY_BREAK -case 70: +case 71: YY_RULE_SETUP -#line 733 "dhcp6_lexer.ll" +#line 743 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::POOLS: @@ -2618,9 +2632,9 @@ YY_RULE_SETUP } } YY_BREAK -case 71: +case 72: YY_RULE_SETUP -#line 742 "dhcp6_lexer.ll" +#line 752 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::POOLS: @@ -2631,9 +2645,9 @@ YY_RULE_SETUP } } YY_BREAK -case 72: +case 73: YY_RULE_SETUP -#line 752 "dhcp6_lexer.ll" +#line 762 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2643,9 +2657,9 @@ YY_RULE_SETUP } } YY_BREAK -case 73: +case 74: YY_RULE_SETUP -#line 761 "dhcp6_lexer.ll" +#line 771 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2655,9 +2669,9 @@ YY_RULE_SETUP } } YY_BREAK -case 74: +case 75: YY_RULE_SETUP -#line 770 "dhcp6_lexer.ll" +#line 780 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2667,9 +2681,9 @@ YY_RULE_SETUP } } YY_BREAK -case 75: +case 76: YY_RULE_SETUP -#line 779 "dhcp6_lexer.ll" +#line 789 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2679,9 +2693,9 @@ YY_RULE_SETUP } } YY_BREAK -case 76: +case 77: YY_RULE_SETUP -#line 788 "dhcp6_lexer.ll" +#line 798 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2691,9 +2705,9 @@ YY_RULE_SETUP } } YY_BREAK -case 77: +case 78: YY_RULE_SETUP -#line 797 "dhcp6_lexer.ll" +#line 807 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2703,9 +2717,9 @@ YY_RULE_SETUP } } YY_BREAK -case 78: +case 79: YY_RULE_SETUP -#line 806 "dhcp6_lexer.ll" +#line 816 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2716,9 +2730,9 @@ YY_RULE_SETUP } } YY_BREAK -case 79: +case 80: YY_RULE_SETUP -#line 816 "dhcp6_lexer.ll" +#line 826 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2728,9 +2742,9 @@ YY_RULE_SETUP } } YY_BREAK -case 80: +case 81: YY_RULE_SETUP -#line 825 "dhcp6_lexer.ll" +#line 835 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2740,9 +2754,9 @@ YY_RULE_SETUP } } YY_BREAK -case 81: +case 82: YY_RULE_SETUP -#line 834 "dhcp6_lexer.ll" +#line 844 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2752,9 +2766,9 @@ YY_RULE_SETUP } } YY_BREAK -case 82: +case 83: YY_RULE_SETUP -#line 843 "dhcp6_lexer.ll" +#line 853 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -2764,9 +2778,9 @@ YY_RULE_SETUP } } YY_BREAK -case 83: +case 84: YY_RULE_SETUP -#line 852 "dhcp6_lexer.ll" +#line 862 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGING: @@ -2776,9 +2790,9 @@ YY_RULE_SETUP } } YY_BREAK -case 84: +case 85: YY_RULE_SETUP -#line 861 "dhcp6_lexer.ll" +#line 871 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGERS: @@ -2788,9 +2802,9 @@ YY_RULE_SETUP } } YY_BREAK -case 85: +case 86: YY_RULE_SETUP -#line 870 "dhcp6_lexer.ll" +#line 880 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OUTPUT_OPTIONS: @@ -2800,9 +2814,9 @@ YY_RULE_SETUP } } YY_BREAK -case 86: +case 87: YY_RULE_SETUP -#line 879 "dhcp6_lexer.ll" +#line 889 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGERS: @@ -2812,9 +2826,9 @@ YY_RULE_SETUP } } YY_BREAK -case 87: +case 88: YY_RULE_SETUP -#line 888 "dhcp6_lexer.ll" +#line 898 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGERS: @@ -2824,9 +2838,9 @@ YY_RULE_SETUP } } YY_BREAK -case 88: +case 89: YY_RULE_SETUP -#line 897 "dhcp6_lexer.ll" +#line 907 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2837,9 +2851,9 @@ YY_RULE_SETUP } } YY_BREAK -case 89: +case 90: YY_RULE_SETUP -#line 907 "dhcp6_lexer.ll" +#line 917 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2850,9 +2864,9 @@ YY_RULE_SETUP } } YY_BREAK -case 90: +case 91: YY_RULE_SETUP -#line 917 "dhcp6_lexer.ll" +#line 927 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CLIENT_CLASSES: @@ -2863,9 +2877,9 @@ YY_RULE_SETUP } } YY_BREAK -case 91: +case 92: YY_RULE_SETUP -#line 927 "dhcp6_lexer.ll" +#line 937 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2875,9 +2889,9 @@ YY_RULE_SETUP } } YY_BREAK -case 92: +case 93: YY_RULE_SETUP -#line 936 "dhcp6_lexer.ll" +#line 946 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RESERVATIONS: @@ -2887,9 +2901,9 @@ YY_RULE_SETUP } } YY_BREAK -case 93: +case 94: YY_RULE_SETUP -#line 945 "dhcp6_lexer.ll" +#line 955 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RESERVATIONS: @@ -2899,9 +2913,9 @@ YY_RULE_SETUP } } YY_BREAK -case 94: +case 95: YY_RULE_SETUP -#line 954 "dhcp6_lexer.ll" +#line 964 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::MAC_SOURCES: @@ -2913,9 +2927,9 @@ YY_RULE_SETUP } } YY_BREAK -case 95: +case 96: YY_RULE_SETUP -#line 965 "dhcp6_lexer.ll" +#line 975 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS: @@ -2926,9 +2940,9 @@ YY_RULE_SETUP } } YY_BREAK -case 96: +case 97: YY_RULE_SETUP -#line 975 "dhcp6_lexer.ll" +#line 985 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RESERVATIONS: @@ -2938,9 +2952,9 @@ YY_RULE_SETUP } } YY_BREAK -case 97: +case 98: YY_RULE_SETUP -#line 984 "dhcp6_lexer.ll" +#line 994 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2951,9 +2965,9 @@ YY_RULE_SETUP } } YY_BREAK -case 98: +case 99: YY_RULE_SETUP -#line 994 "dhcp6_lexer.ll" +#line 1004 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DATA: @@ -2963,9 +2977,9 @@ YY_RULE_SETUP } } YY_BREAK -case 99: +case 100: YY_RULE_SETUP -#line 1003 "dhcp6_lexer.ll" +#line 1013 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2975,9 +2989,9 @@ YY_RULE_SETUP } } YY_BREAK -case 100: +case 101: YY_RULE_SETUP -#line 1012 "dhcp6_lexer.ll" +#line 1022 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2987,9 +3001,9 @@ YY_RULE_SETUP } } YY_BREAK -case 101: +case 102: YY_RULE_SETUP -#line 1021 "dhcp6_lexer.ll" +#line 1031 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2999,9 +3013,9 @@ YY_RULE_SETUP } } YY_BREAK -case 102: +case 103: YY_RULE_SETUP -#line 1030 "dhcp6_lexer.ll" +#line 1040 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -3011,9 +3025,9 @@ YY_RULE_SETUP } } YY_BREAK -case 103: +case 104: YY_RULE_SETUP -#line 1039 "dhcp6_lexer.ll" +#line 1049 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RELAY: @@ -3023,9 +3037,9 @@ YY_RULE_SETUP } } YY_BREAK -case 104: +case 105: YY_RULE_SETUP -#line 1048 "dhcp6_lexer.ll" +#line 1058 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3035,9 +3049,9 @@ YY_RULE_SETUP } } YY_BREAK -case 105: +case 106: YY_RULE_SETUP -#line 1058 "dhcp6_lexer.ll" +#line 1068 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOOKS_LIBRARIES: @@ -3047,9 +3061,9 @@ YY_RULE_SETUP } } YY_BREAK -case 106: +case 107: YY_RULE_SETUP -#line 1067 "dhcp6_lexer.ll" +#line 1077 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOOKS_LIBRARIES: @@ -3059,9 +3073,9 @@ YY_RULE_SETUP } } YY_BREAK -case 107: +case 108: YY_RULE_SETUP -#line 1076 "dhcp6_lexer.ll" +#line 1086 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3071,9 +3085,9 @@ YY_RULE_SETUP } } YY_BREAK -case 108: +case 109: YY_RULE_SETUP -#line 1085 "dhcp6_lexer.ll" +#line 1095 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DUID_TYPE: @@ -3083,9 +3097,9 @@ YY_RULE_SETUP } } YY_BREAK -case 109: +case 110: YY_RULE_SETUP -#line 1094 "dhcp6_lexer.ll" +#line 1104 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DUID_TYPE: @@ -3095,9 +3109,9 @@ YY_RULE_SETUP } } YY_BREAK -case 110: +case 111: YY_RULE_SETUP -#line 1103 "dhcp6_lexer.ll" +#line 1113 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DUID_TYPE: @@ -3107,9 +3121,9 @@ YY_RULE_SETUP } } YY_BREAK -case 111: +case 112: YY_RULE_SETUP -#line 1112 "dhcp6_lexer.ll" +#line 1122 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -3119,9 +3133,9 @@ YY_RULE_SETUP } } YY_BREAK -case 112: +case 113: YY_RULE_SETUP -#line 1121 "dhcp6_lexer.ll" +#line 1131 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -3131,9 +3145,9 @@ YY_RULE_SETUP } } YY_BREAK -case 113: +case 114: YY_RULE_SETUP -#line 1130 "dhcp6_lexer.ll" +#line 1140 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -3143,9 +3157,9 @@ YY_RULE_SETUP } } YY_BREAK -case 114: +case 115: YY_RULE_SETUP -#line 1139 "dhcp6_lexer.ll" +#line 1149 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -3155,9 +3169,9 @@ YY_RULE_SETUP } } YY_BREAK -case 115: +case 116: YY_RULE_SETUP -#line 1148 "dhcp6_lexer.ll" +#line 1158 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3167,9 +3181,9 @@ YY_RULE_SETUP } } YY_BREAK -case 116: +case 117: YY_RULE_SETUP -#line 1157 "dhcp6_lexer.ll" +#line 1167 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3179,9 +3193,9 @@ YY_RULE_SETUP } } YY_BREAK -case 117: +case 118: YY_RULE_SETUP -#line 1166 "dhcp6_lexer.ll" +#line 1176 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3191,9 +3205,9 @@ YY_RULE_SETUP } } YY_BREAK -case 118: +case 119: YY_RULE_SETUP -#line 1175 "dhcp6_lexer.ll" +#line 1185 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3203,9 +3217,9 @@ YY_RULE_SETUP } } YY_BREAK -case 119: +case 120: YY_RULE_SETUP -#line 1184 "dhcp6_lexer.ll" +#line 1194 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3215,9 +3229,9 @@ YY_RULE_SETUP } } YY_BREAK -case 120: +case 121: YY_RULE_SETUP -#line 1193 "dhcp6_lexer.ll" +#line 1203 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3227,9 +3241,9 @@ YY_RULE_SETUP } } YY_BREAK -case 121: +case 122: YY_RULE_SETUP -#line 1202 "dhcp6_lexer.ll" +#line 1212 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3239,9 +3253,9 @@ YY_RULE_SETUP } } YY_BREAK -case 122: +case 123: YY_RULE_SETUP -#line 1211 "dhcp6_lexer.ll" +#line 1221 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3251,9 +3265,9 @@ YY_RULE_SETUP } } YY_BREAK -case 123: +case 124: YY_RULE_SETUP -#line 1220 "dhcp6_lexer.ll" +#line 1230 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3263,9 +3277,9 @@ YY_RULE_SETUP } } YY_BREAK -case 124: +case 125: YY_RULE_SETUP -#line 1229 "dhcp6_lexer.ll" +#line 1239 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONTROL_SOCKET: @@ -3275,9 +3289,9 @@ YY_RULE_SETUP } } YY_BREAK -case 125: +case 126: YY_RULE_SETUP -#line 1238 "dhcp6_lexer.ll" +#line 1248 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONTROL_SOCKET: @@ -3287,9 +3301,9 @@ YY_RULE_SETUP } } YY_BREAK -case 126: +case 127: YY_RULE_SETUP -#line 1247 "dhcp6_lexer.ll" +#line 1257 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3299,9 +3313,9 @@ YY_RULE_SETUP } } YY_BREAK -case 127: +case 128: YY_RULE_SETUP -#line 1256 "dhcp6_lexer.ll" +#line 1266 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -3311,9 +3325,9 @@ YY_RULE_SETUP } } YY_BREAK -case 128: +case 129: YY_RULE_SETUP -#line 1265 "dhcp6_lexer.ll" +#line 1275 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -3323,9 +3337,9 @@ YY_RULE_SETUP } } YY_BREAK -case 129: +case 130: YY_RULE_SETUP -#line 1274 "dhcp6_lexer.ll" +#line 1284 "dhcp6_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. @@ -3424,65 +3438,65 @@ YY_RULE_SETUP return isc::dhcp::Dhcp6Parser::make_STRING(decoded, driver.loc_); } YY_BREAK -case 130: -/* rule 130 can match eol */ +case 131: +/* rule 131 can match eol */ YY_RULE_SETUP -#line 1372 "dhcp6_lexer.ll" +#line 1382 "dhcp6_lexer.ll" { // Bad string with a forbidden control character inside driver.error(driver.loc_, "Invalid control in " + std::string(parser6_text)); } YY_BREAK -case 131: -/* rule 131 can match eol */ +case 132: +/* rule 132 can match eol */ YY_RULE_SETUP -#line 1377 "dhcp6_lexer.ll" +#line 1387 "dhcp6_lexer.ll" { // Bad string with a bad escape inside driver.error(driver.loc_, "Bad escape in " + std::string(parser6_text)); } YY_BREAK -case 132: +case 133: YY_RULE_SETUP -#line 1382 "dhcp6_lexer.ll" +#line 1392 "dhcp6_lexer.ll" { // Bad string with an open escape at the end driver.error(driver.loc_, "Overflow escape in " + std::string(parser6_text)); } YY_BREAK -case 133: -YY_RULE_SETUP -#line 1387 "dhcp6_lexer.ll" -{ return isc::dhcp::Dhcp6Parser::make_LSQUARE_BRACKET(driver.loc_); } - YY_BREAK case 134: YY_RULE_SETUP -#line 1388 "dhcp6_lexer.ll" -{ return isc::dhcp::Dhcp6Parser::make_RSQUARE_BRACKET(driver.loc_); } +#line 1397 "dhcp6_lexer.ll" +{ return isc::dhcp::Dhcp6Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK case 135: YY_RULE_SETUP -#line 1389 "dhcp6_lexer.ll" -{ return isc::dhcp::Dhcp6Parser::make_LCURLY_BRACKET(driver.loc_); } +#line 1398 "dhcp6_lexer.ll" +{ return isc::dhcp::Dhcp6Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK case 136: YY_RULE_SETUP -#line 1390 "dhcp6_lexer.ll" -{ return isc::dhcp::Dhcp6Parser::make_RCURLY_BRACKET(driver.loc_); } +#line 1399 "dhcp6_lexer.ll" +{ return isc::dhcp::Dhcp6Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK case 137: YY_RULE_SETUP -#line 1391 "dhcp6_lexer.ll" -{ return isc::dhcp::Dhcp6Parser::make_COMMA(driver.loc_); } +#line 1400 "dhcp6_lexer.ll" +{ return isc::dhcp::Dhcp6Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK case 138: YY_RULE_SETUP -#line 1392 "dhcp6_lexer.ll" -{ return isc::dhcp::Dhcp6Parser::make_COLON(driver.loc_); } +#line 1401 "dhcp6_lexer.ll" +{ return isc::dhcp::Dhcp6Parser::make_COMMA(driver.loc_); } YY_BREAK case 139: YY_RULE_SETUP -#line 1394 "dhcp6_lexer.ll" +#line 1402 "dhcp6_lexer.ll" +{ return isc::dhcp::Dhcp6Parser::make_COLON(driver.loc_); } + YY_BREAK +case 140: +YY_RULE_SETUP +#line 1404 "dhcp6_lexer.ll" { // An integer was found. std::string tmp(parser6_text); @@ -3501,9 +3515,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp6Parser::make_INTEGER(integer, driver.loc_); } YY_BREAK -case 140: +case 141: YY_RULE_SETUP -#line 1412 "dhcp6_lexer.ll" +#line 1422 "dhcp6_lexer.ll" { // A floating point was found. std::string tmp(parser6_text); @@ -3517,43 +3531,43 @@ YY_RULE_SETUP return isc::dhcp::Dhcp6Parser::make_FLOAT(fp, driver.loc_); } YY_BREAK -case 141: +case 142: YY_RULE_SETUP -#line 1425 "dhcp6_lexer.ll" +#line 1435 "dhcp6_lexer.ll" { string tmp(parser6_text); return isc::dhcp::Dhcp6Parser::make_BOOLEAN(tmp == "true", driver.loc_); } YY_BREAK -case 142: +case 143: YY_RULE_SETUP -#line 1430 "dhcp6_lexer.ll" +#line 1440 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK -case 143: -YY_RULE_SETUP -#line 1434 "dhcp6_lexer.ll" -driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); - YY_BREAK case 144: YY_RULE_SETUP -#line 1436 "dhcp6_lexer.ll" -driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); +#line 1444 "dhcp6_lexer.ll" +driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK case 145: YY_RULE_SETUP -#line 1438 "dhcp6_lexer.ll" -driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); +#line 1446 "dhcp6_lexer.ll" +driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK case 146: YY_RULE_SETUP -#line 1440 "dhcp6_lexer.ll" +#line 1448 "dhcp6_lexer.ll" +driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); + YY_BREAK +case 147: +YY_RULE_SETUP +#line 1450 "dhcp6_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(parser6_text)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 1442 "dhcp6_lexer.ll" +#line 1452 "dhcp6_lexer.ll" { if (driver.states_.empty()) { return isc::dhcp::Dhcp6Parser::make_END(driver.loc_); @@ -3577,12 +3591,12 @@ case YY_STATE_EOF(INITIAL): BEGIN(DIR_EXIT); } YY_BREAK -case 147: +case 148: YY_RULE_SETUP -#line 1465 "dhcp6_lexer.ll" +#line 1475 "dhcp6_lexer.ll" ECHO; YY_BREAK -#line 3586 "dhcp6_lexer.cc" +#line 3600 "dhcp6_lexer.cc" case YY_END_OF_BUFFER: { @@ -3899,7 +3913,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 >= 1181 ) + if ( yy_current_state >= 1184 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; @@ -3932,11 +3946,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 >= 1181 ) + if ( yy_current_state >= 1184 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - yy_is_jam = (yy_current_state == 1180); + yy_is_jam = (yy_current_state == 1183); return yy_is_jam ? 0 : yy_current_state; } @@ -4685,7 +4699,7 @@ void parser6_free (void * ptr ) /* %ok-for-header */ -#line 1465 "dhcp6_lexer.ll" +#line 1475 "dhcp6_lexer.ll" diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc index 7aa99750c5..cc006a6aab 100644 --- a/src/bin/dhcp6/dhcp6_parser.cc +++ b/src/bin/dhcp6/dhcp6_parser.cc @@ -253,28 +253,28 @@ namespace isc { namespace dhcp { { switch (that.type_get ()) { - case 155: // value - case 159: // map_value - case 200: // db_type - case 387: // duid_type - case 420: // ncr_protocol_value - case 429: // replace_client_name_value + case 156: // value + case 160: // map_value + case 201: // db_type + case 389: // duid_type + case 422: // ncr_protocol_value + case 431: // replace_client_name_value value.move< ElementPtr > (that.value); break; - case 140: // "boolean" + case 141: // "boolean" value.move< bool > (that.value); break; - case 139: // "floating point" + case 140: // "floating point" value.move< double > (that.value); break; - case 138: // "integer" + case 139: // "integer" value.move< int64_t > (that.value); break; - case 137: // "constant string" + case 138: // "constant string" value.move< std::string > (that.value); break; @@ -293,28 +293,28 @@ namespace isc { namespace dhcp { state = that.state; switch (that.type_get ()) { - case 155: // value - case 159: // map_value - case 200: // db_type - case 387: // duid_type - case 420: // ncr_protocol_value - case 429: // replace_client_name_value + case 156: // value + case 160: // map_value + case 201: // db_type + case 389: // duid_type + case 422: // ncr_protocol_value + case 431: // replace_client_name_value value.copy< ElementPtr > (that.value); break; - case 140: // "boolean" + case 141: // "boolean" value.copy< bool > (that.value); break; - case 139: // "floating point" + case 140: // "floating point" value.copy< double > (that.value); break; - case 138: // "integer" + case 139: // "integer" value.copy< int64_t > (that.value); break; - case 137: // "constant string" + case 138: // "constant string" value.copy< std::string > (that.value); break; @@ -354,72 +354,72 @@ namespace isc { namespace dhcp { << yysym.location << ": "; switch (yytype) { - case 137: // "constant string" + case 138: // "constant string" -#line 212 "dhcp6_parser.yy" // lalr1.cc:636 +#line 213 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 362 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 138: // "integer" + case 139: // "integer" -#line 212 "dhcp6_parser.yy" // lalr1.cc:636 +#line 213 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< int64_t > (); } #line 369 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 139: // "floating point" + case 140: // "floating point" -#line 212 "dhcp6_parser.yy" // lalr1.cc:636 +#line 213 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< double > (); } #line 376 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 140: // "boolean" + case 141: // "boolean" -#line 212 "dhcp6_parser.yy" // lalr1.cc:636 +#line 213 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< bool > (); } #line 383 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 155: // value + case 156: // value -#line 212 "dhcp6_parser.yy" // lalr1.cc:636 +#line 213 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 390 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 159: // map_value + case 160: // map_value -#line 212 "dhcp6_parser.yy" // lalr1.cc:636 +#line 213 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 397 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 200: // db_type + case 201: // db_type -#line 212 "dhcp6_parser.yy" // lalr1.cc:636 +#line 213 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 404 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 387: // duid_type + case 389: // duid_type -#line 212 "dhcp6_parser.yy" // lalr1.cc:636 +#line 213 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 411 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 420: // ncr_protocol_value + case 422: // ncr_protocol_value -#line 212 "dhcp6_parser.yy" // lalr1.cc:636 +#line 213 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 418 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 429: // replace_client_name_value + case 431: // replace_client_name_value -#line 212 "dhcp6_parser.yy" // lalr1.cc:636 +#line 213 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 425 "dhcp6_parser.cc" // lalr1.cc:636 break; @@ -621,28 +621,28 @@ namespace isc { namespace dhcp { when using variants. */ switch (yyr1_[yyn]) { - case 155: // value - case 159: // map_value - case 200: // db_type - case 387: // duid_type - case 420: // ncr_protocol_value - case 429: // replace_client_name_value + case 156: // value + case 160: // map_value + case 201: // db_type + case 389: // duid_type + case 422: // ncr_protocol_value + case 431: // replace_client_name_value yylhs.value.build< ElementPtr > (); break; - case 140: // "boolean" + case 141: // "boolean" yylhs.value.build< bool > (); break; - case 139: // "floating point" + case 140: // "floating point" yylhs.value.build< double > (); break; - case 138: // "integer" + case 139: // "integer" yylhs.value.build< int64_t > (); break; - case 137: // "constant string" + case 138: // "constant string" yylhs.value.build< std::string > (); break; @@ -664,121 +664,121 @@ namespace isc { namespace dhcp { switch (yyn) { case 2: -#line 221 "dhcp6_parser.yy" // lalr1.cc:859 +#line 222 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.NO_KEYWORD; } #line 670 "dhcp6_parser.cc" // lalr1.cc:859 break; case 4: -#line 222 "dhcp6_parser.yy" // lalr1.cc:859 +#line 223 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.CONFIG; } #line 676 "dhcp6_parser.cc" // lalr1.cc:859 break; case 6: -#line 223 "dhcp6_parser.yy" // lalr1.cc:859 +#line 224 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.DHCP6; } #line 682 "dhcp6_parser.cc" // lalr1.cc:859 break; case 8: -#line 224 "dhcp6_parser.yy" // lalr1.cc:859 +#line 225 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.INTERFACES_CONFIG; } #line 688 "dhcp6_parser.cc" // lalr1.cc:859 break; case 10: -#line 225 "dhcp6_parser.yy" // lalr1.cc:859 +#line 226 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.SUBNET6; } #line 694 "dhcp6_parser.cc" // lalr1.cc:859 break; case 12: -#line 226 "dhcp6_parser.yy" // lalr1.cc:859 +#line 227 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.POOLS; } #line 700 "dhcp6_parser.cc" // lalr1.cc:859 break; case 14: -#line 227 "dhcp6_parser.yy" // lalr1.cc:859 +#line 228 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.PD_POOLS; } #line 706 "dhcp6_parser.cc" // lalr1.cc:859 break; case 16: -#line 228 "dhcp6_parser.yy" // lalr1.cc:859 +#line 229 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.RESERVATIONS; } #line 712 "dhcp6_parser.cc" // lalr1.cc:859 break; case 18: -#line 229 "dhcp6_parser.yy" // lalr1.cc:859 +#line 230 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.OPTION_DEF; } #line 718 "dhcp6_parser.cc" // lalr1.cc:859 break; case 20: -#line 230 "dhcp6_parser.yy" // lalr1.cc:859 +#line 231 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.OPTION_DATA; } #line 724 "dhcp6_parser.cc" // lalr1.cc:859 break; case 22: -#line 231 "dhcp6_parser.yy" // lalr1.cc:859 +#line 232 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.HOOKS_LIBRARIES; } #line 730 "dhcp6_parser.cc" // lalr1.cc:859 break; case 24: -#line 232 "dhcp6_parser.yy" // lalr1.cc:859 +#line 233 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.DHCP_DDNS; } #line 736 "dhcp6_parser.cc" // lalr1.cc:859 break; case 26: -#line 240 "dhcp6_parser.yy" // lalr1.cc:859 +#line 241 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); } #line 742 "dhcp6_parser.cc" // lalr1.cc:859 break; case 27: -#line 241 "dhcp6_parser.yy" // lalr1.cc:859 +#line 242 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); } #line 748 "dhcp6_parser.cc" // lalr1.cc:859 break; case 28: -#line 242 "dhcp6_parser.yy" // lalr1.cc:859 +#line 243 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); } #line 754 "dhcp6_parser.cc" // lalr1.cc:859 break; case 29: -#line 243 "dhcp6_parser.yy" // lalr1.cc:859 +#line 244 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); } #line 760 "dhcp6_parser.cc" // lalr1.cc:859 break; case 30: -#line 244 "dhcp6_parser.yy" // lalr1.cc:859 +#line 245 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); } #line 766 "dhcp6_parser.cc" // lalr1.cc:859 break; case 31: -#line 245 "dhcp6_parser.yy" // lalr1.cc:859 +#line 246 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 772 "dhcp6_parser.cc" // lalr1.cc:859 break; case 32: -#line 246 "dhcp6_parser.yy" // lalr1.cc:859 +#line 247 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 778 "dhcp6_parser.cc" // lalr1.cc:859 break; case 33: -#line 249 "dhcp6_parser.yy" // lalr1.cc:859 +#line 250 "dhcp6_parser.yy" // lalr1.cc:859 { // Push back the JSON value on the stack ctx.stack_.push_back(yystack_[0].value.as< ElementPtr > ()); @@ -787,7 +787,7 @@ namespace isc { namespace dhcp { break; case 34: -#line 254 "dhcp6_parser.yy" // lalr1.cc:859 +#line 255 "dhcp6_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -798,7 +798,7 @@ namespace isc { namespace dhcp { break; case 35: -#line 259 "dhcp6_parser.yy" // lalr1.cc:859 +#line 260 "dhcp6_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -808,13 +808,13 @@ namespace isc { namespace dhcp { break; case 36: -#line 265 "dhcp6_parser.yy" // lalr1.cc:859 +#line 266 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 814 "dhcp6_parser.cc" // lalr1.cc:859 break; case 39: -#line 272 "dhcp6_parser.yy" // lalr1.cc:859 +#line 273 "dhcp6_parser.yy" // lalr1.cc:859 { // map containing a single entry ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ()); @@ -823,7 +823,7 @@ namespace isc { namespace dhcp { break; case 40: -#line 276 "dhcp6_parser.yy" // lalr1.cc:859 +#line 277 "dhcp6_parser.yy" // lalr1.cc:859 { // map consisting of a shorter map followed by // comma and string:value @@ -833,7 +833,7 @@ namespace isc { namespace dhcp { break; case 41: -#line 283 "dhcp6_parser.yy" // lalr1.cc:859 +#line 284 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(l); @@ -842,7 +842,7 @@ namespace isc { namespace dhcp { break; case 42: -#line 286 "dhcp6_parser.yy" // lalr1.cc:859 +#line 287 "dhcp6_parser.yy" // lalr1.cc:859 { // list parsing complete. Put any sanity checking here } @@ -850,7 +850,7 @@ namespace isc { namespace dhcp { break; case 45: -#line 294 "dhcp6_parser.yy" // lalr1.cc:859 +#line 295 "dhcp6_parser.yy" // lalr1.cc:859 { // List consisting of a single element. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); @@ -859,7 +859,7 @@ namespace isc { namespace dhcp { break; case 46: -#line 298 "dhcp6_parser.yy" // lalr1.cc:859 +#line 299 "dhcp6_parser.yy" // lalr1.cc:859 { // List ending with , and a value. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); @@ -868,7 +868,7 @@ namespace isc { namespace dhcp { break; case 47: -#line 305 "dhcp6_parser.yy" // lalr1.cc:859 +#line 306 "dhcp6_parser.yy" // lalr1.cc:859 { // List parsing about to start } @@ -876,7 +876,7 @@ namespace isc { namespace dhcp { break; case 48: -#line 307 "dhcp6_parser.yy" // lalr1.cc:859 +#line 308 "dhcp6_parser.yy" // lalr1.cc:859 { // list parsing complete. Put any sanity checking here //ctx.stack_.pop_back(); @@ -885,7 +885,7 @@ namespace isc { namespace dhcp { break; case 51: -#line 316 "dhcp6_parser.yy" // lalr1.cc:859 +#line 317 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(s); @@ -894,7 +894,7 @@ namespace isc { namespace dhcp { break; case 52: -#line 320 "dhcp6_parser.yy" // lalr1.cc:859 +#line 321 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(s); @@ -903,7 +903,7 @@ namespace isc { namespace dhcp { break; case 53: -#line 331 "dhcp6_parser.yy" // lalr1.cc:859 +#line 332 "dhcp6_parser.yy" // lalr1.cc:859 { const std::string& where = ctx.contextName(); const std::string& keyword = yystack_[1].value.as< std::string > (); @@ -914,7 +914,7 @@ namespace isc { namespace dhcp { break; case 54: -#line 341 "dhcp6_parser.yy" // lalr1.cc:859 +#line 342 "dhcp6_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -925,7 +925,7 @@ namespace isc { namespace dhcp { break; case 55: -#line 346 "dhcp6_parser.yy" // lalr1.cc:859 +#line 347 "dhcp6_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -935,7 +935,7 @@ namespace isc { namespace dhcp { break; case 63: -#line 365 "dhcp6_parser.yy" // lalr1.cc:859 +#line 366 "dhcp6_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -948,7 +948,7 @@ namespace isc { namespace dhcp { break; case 64: -#line 372 "dhcp6_parser.yy" // lalr1.cc:859 +#line 373 "dhcp6_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -960,7 +960,7 @@ namespace isc { namespace dhcp { break; case 65: -#line 382 "dhcp6_parser.yy" // lalr1.cc:859 +#line 383 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the Dhcp6 map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -970,7 +970,7 @@ namespace isc { namespace dhcp { break; case 66: -#line 386 "dhcp6_parser.yy" // lalr1.cc:859 +#line 387 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } @@ -978,7 +978,7 @@ namespace isc { namespace dhcp { break; case 91: -#line 420 "dhcp6_parser.yy" // lalr1.cc:859 +#line 421 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("preferred-lifetime", prf); @@ -987,7 +987,7 @@ namespace isc { namespace dhcp { break; case 92: -#line 425 "dhcp6_parser.yy" // lalr1.cc:859 +#line 426 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("valid-lifetime", prf); @@ -996,7 +996,7 @@ namespace isc { namespace dhcp { break; case 93: -#line 430 "dhcp6_parser.yy" // lalr1.cc:859 +#line 431 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("renew-timer", prf); @@ -1005,7 +1005,7 @@ namespace isc { namespace dhcp { break; case 94: -#line 435 "dhcp6_parser.yy" // lalr1.cc:859 +#line 436 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("rebind-timer", prf); @@ -1014,7 +1014,7 @@ namespace isc { namespace dhcp { break; case 95: -#line 440 "dhcp6_parser.yy" // lalr1.cc:859 +#line 441 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("decline-probation-period", dpp); @@ -1023,7 +1023,7 @@ namespace isc { namespace dhcp { break; case 96: -#line 445 "dhcp6_parser.yy" // lalr1.cc:859 +#line 446 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interfaces-config", i); @@ -1034,7 +1034,7 @@ namespace isc { namespace dhcp { break; case 97: -#line 450 "dhcp6_parser.yy" // lalr1.cc:859 +#line 451 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1043,7 +1043,7 @@ namespace isc { namespace dhcp { break; case 98: -#line 455 "dhcp6_parser.yy" // lalr1.cc:859 +#line 456 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the interfaces-config map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -1053,7 +1053,7 @@ namespace isc { namespace dhcp { break; case 99: -#line 459 "dhcp6_parser.yy" // lalr1.cc:859 +#line 460 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } @@ -1061,7 +1061,7 @@ namespace isc { namespace dhcp { break; case 100: -#line 463 "dhcp6_parser.yy" // lalr1.cc:859 +#line 464 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interfaces", l); @@ -1072,7 +1072,7 @@ namespace isc { namespace dhcp { break; case 101: -#line 468 "dhcp6_parser.yy" // lalr1.cc:859 +#line 469 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1081,7 +1081,7 @@ namespace isc { namespace dhcp { break; case 102: -#line 473 "dhcp6_parser.yy" // lalr1.cc:859 +#line 474 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("lease-database", i); @@ -1092,7 +1092,7 @@ namespace isc { namespace dhcp { break; case 103: -#line 478 "dhcp6_parser.yy" // lalr1.cc:859 +#line 479 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1101,7 +1101,7 @@ namespace isc { namespace dhcp { break; case 104: -#line 483 "dhcp6_parser.yy" // lalr1.cc:859 +#line 484 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hosts-database", i); @@ -1112,7 +1112,7 @@ namespace isc { namespace dhcp { break; case 105: -#line 488 "dhcp6_parser.yy" // lalr1.cc:859 +#line 489 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1120,16 +1120,16 @@ namespace isc { namespace dhcp { #line 1121 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 118: -#line 509 "dhcp6_parser.yy" // lalr1.cc:859 + case 119: +#line 511 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.DATABASE_TYPE); } #line 1129 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 119: -#line 511 "dhcp6_parser.yy" // lalr1.cc:859 + case 120: +#line 513 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); @@ -1137,40 +1137,40 @@ namespace isc { namespace dhcp { #line 1138 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 120: -#line 516 "dhcp6_parser.yy" // lalr1.cc:859 + case 121: +#line 518 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); } #line 1144 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 121: -#line 517 "dhcp6_parser.yy" // lalr1.cc:859 + case 122: +#line 519 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); } #line 1150 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 122: -#line 518 "dhcp6_parser.yy" // lalr1.cc:859 + case 123: +#line 520 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); } #line 1156 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 123: -#line 519 "dhcp6_parser.yy" // lalr1.cc:859 + case 124: +#line 521 "dhcp6_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); } #line 1162 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 124: -#line 522 "dhcp6_parser.yy" // lalr1.cc:859 + case 125: +#line 524 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1170 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 125: -#line 524 "dhcp6_parser.yy" // lalr1.cc:859 + case 126: +#line 526 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("user", user); @@ -1179,16 +1179,16 @@ namespace isc { namespace dhcp { #line 1180 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 126: -#line 530 "dhcp6_parser.yy" // lalr1.cc:859 + case 127: +#line 532 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1188 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 127: -#line 532 "dhcp6_parser.yy" // lalr1.cc:859 + case 128: +#line 534 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("password", pwd); @@ -1197,16 +1197,16 @@ namespace isc { namespace dhcp { #line 1198 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 128: -#line 538 "dhcp6_parser.yy" // lalr1.cc:859 + case 129: +#line 540 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1206 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 129: -#line 540 "dhcp6_parser.yy" // lalr1.cc:859 + case 130: +#line 542 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("host", h); @@ -1215,344 +1215,353 @@ namespace isc { namespace dhcp { #line 1216 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 130: -#line 546 "dhcp6_parser.yy" // lalr1.cc:859 + case 131: +#line 548 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr p(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("port", p); +} +#line 1225 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 132: +#line 553 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1224 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1233 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 131: -#line 548 "dhcp6_parser.yy" // lalr1.cc:859 + case 133: +#line 555 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("name", name); ctx.leave(); } -#line 1234 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1243 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 132: -#line 554 "dhcp6_parser.yy" // lalr1.cc:859 + case 134: +#line 561 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("persist", n); } -#line 1243 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1252 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 133: -#line 559 "dhcp6_parser.yy" // lalr1.cc:859 + case 135: +#line 566 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("lfc-interval", n); } -#line 1252 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1261 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 134: -#line 564 "dhcp6_parser.yy" // lalr1.cc:859 + case 136: +#line 571 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("readonly", n); } -#line 1261 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1270 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 135: -#line 569 "dhcp6_parser.yy" // lalr1.cc:859 + case 137: +#line 576 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("connect-timeout", n); } -#line 1270 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1279 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 136: -#line 574 "dhcp6_parser.yy" // lalr1.cc:859 + case 138: +#line 581 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("mac-sources", l); ctx.stack_.push_back(l); ctx.enter(ctx.MAC_SOURCES); } -#line 1281 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1290 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 137: -#line 579 "dhcp6_parser.yy" // lalr1.cc:859 + case 139: +#line 586 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1290 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 142: -#line 592 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->add(duid); -} #line 1299 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 143: -#line 597 "dhcp6_parser.yy" // lalr1.cc:859 + case 144: +#line 599 "dhcp6_parser.yy" // lalr1.cc:859 { - ElementPtr duid(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(duid); } #line 1308 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 144: -#line 602 "dhcp6_parser.yy" // lalr1.cc:859 + case 145: +#line 604 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr duid(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->add(duid); +} +#line 1317 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 146: +#line 609 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("host-reservation-identifiers", l); ctx.stack_.push_back(l); ctx.enter(ctx.HOST_RESERVATION_IDENTIFIERS); } -#line 1319 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1328 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 145: -#line 607 "dhcp6_parser.yy" // lalr1.cc:859 + case 147: +#line 614 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1328 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1337 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 150: -#line 620 "dhcp6_parser.yy" // lalr1.cc:859 + case 152: +#line 627 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(hwaddr); } -#line 1337 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1346 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 151: -#line 627 "dhcp6_parser.yy" // lalr1.cc:859 + case 153: +#line 634 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("relay-supplied-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.NO_KEYWORD); } -#line 1348 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1357 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 152: -#line 632 "dhcp6_parser.yy" // lalr1.cc:859 + case 154: +#line 639 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1357 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1366 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 153: -#line 637 "dhcp6_parser.yy" // lalr1.cc:859 + case 155: +#line 644 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hooks-libraries", l); ctx.stack_.push_back(l); ctx.enter(ctx.HOOKS_LIBRARIES); } -#line 1368 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1377 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 154: -#line 642 "dhcp6_parser.yy" // lalr1.cc:859 + case 156: +#line 649 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1377 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1386 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 159: -#line 655 "dhcp6_parser.yy" // lalr1.cc:859 + case 161: +#line 662 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1387 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1396 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 160: -#line 659 "dhcp6_parser.yy" // lalr1.cc:859 + case 162: +#line 666 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1395 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1404 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 161: -#line 663 "dhcp6_parser.yy" // lalr1.cc:859 + case 163: +#line 670 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the hooks-libraries list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1405 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1414 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 162: -#line 667 "dhcp6_parser.yy" // lalr1.cc:859 + case 164: +#line 674 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1413 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1422 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 168: -#line 680 "dhcp6_parser.yy" // lalr1.cc:859 + case 170: +#line 687 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1421 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1430 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 169: -#line 682 "dhcp6_parser.yy" // lalr1.cc:859 + case 171: +#line 689 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("library", lib); ctx.leave(); } -#line 1431 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1440 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 170: -#line 688 "dhcp6_parser.yy" // lalr1.cc:859 + case 172: +#line 695 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1439 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 171: -#line 690 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); -} #line 1448 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 172: -#line 696 "dhcp6_parser.yy" // lalr1.cc:859 + case 173: +#line 697 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 1457 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 174: +#line 703 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("expired-leases-processing", m); ctx.stack_.push_back(m); ctx.enter(ctx.EXPIRED_LEASES_PROCESSING); } -#line 1459 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1468 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 173: -#line 701 "dhcp6_parser.yy" // lalr1.cc:859 + case 175: +#line 708 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1468 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1477 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 182: -#line 718 "dhcp6_parser.yy" // lalr1.cc:859 + case 184: +#line 725 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reclaim-timer-wait-time", value); } -#line 1477 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1486 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 183: -#line 723 "dhcp6_parser.yy" // lalr1.cc:859 + case 185: +#line 730 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("flush-reclaimed-timer-wait-time", value); } -#line 1486 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1495 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 184: -#line 728 "dhcp6_parser.yy" // lalr1.cc:859 + case 186: +#line 735 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hold-reclaimed-time", value); } -#line 1495 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1504 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 185: -#line 733 "dhcp6_parser.yy" // lalr1.cc:859 + case 187: +#line 740 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("max-reclaim-leases", value); } -#line 1504 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1513 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 186: -#line 738 "dhcp6_parser.yy" // lalr1.cc:859 + case 188: +#line 745 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("max-reclaim-time", value); } -#line 1513 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1522 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 187: -#line 743 "dhcp6_parser.yy" // lalr1.cc:859 + case 189: +#line 750 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("unwarned-reclaim-cycles", value); } -#line 1522 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1531 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 188: -#line 751 "dhcp6_parser.yy" // lalr1.cc:859 + case 190: +#line 758 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("subnet6", l); ctx.stack_.push_back(l); ctx.enter(ctx.SUBNET6); } -#line 1533 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1542 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 189: -#line 756 "dhcp6_parser.yy" // lalr1.cc:859 + case 191: +#line 763 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1542 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1551 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 194: -#line 776 "dhcp6_parser.yy" // lalr1.cc:859 + case 196: +#line 783 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1552 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1561 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 195: -#line 780 "dhcp6_parser.yy" // lalr1.cc:859 + case 197: +#line 787 "dhcp6_parser.yy" // lalr1.cc:859 { // Once we reached this place, the subnet parsing is now complete. // If we want to, we can implement default values here. @@ -1571,1305 +1580,1288 @@ namespace isc { namespace dhcp { // } ctx.stack_.pop_back(); } -#line 1575 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1584 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 196: -#line 799 "dhcp6_parser.yy" // lalr1.cc:859 + case 198: +#line 806 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the subnet6 list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1585 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1594 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 197: -#line 803 "dhcp6_parser.yy" // lalr1.cc:859 + case 199: +#line 810 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1593 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1602 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 217: -#line 832 "dhcp6_parser.yy" // lalr1.cc:859 + case 219: +#line 839 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1601 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1610 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 218: -#line 834 "dhcp6_parser.yy" // lalr1.cc:859 + case 220: +#line 841 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("subnet", subnet); ctx.leave(); } -#line 1611 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1620 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 219: -#line 840 "dhcp6_parser.yy" // lalr1.cc:859 + case 221: +#line 847 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1619 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1628 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 220: -#line 842 "dhcp6_parser.yy" // lalr1.cc:859 + case 222: +#line 849 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interface", iface); ctx.leave(); } -#line 1629 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1638 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 221: -#line 848 "dhcp6_parser.yy" // lalr1.cc:859 + case 223: +#line 855 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1637 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1646 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 222: -#line 850 "dhcp6_parser.yy" // lalr1.cc:859 + case 224: +#line 857 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interface-id", iface); ctx.leave(); } -#line 1647 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1656 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 223: -#line 856 "dhcp6_parser.yy" // lalr1.cc:859 + case 225: +#line 863 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.CLIENT_CLASS); } -#line 1655 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1664 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 224: -#line 858 "dhcp6_parser.yy" // lalr1.cc:859 + case 226: +#line 865 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr cls(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-class", cls); ctx.leave(); } -#line 1665 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1674 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 225: -#line 864 "dhcp6_parser.yy" // lalr1.cc:859 + case 227: +#line 871 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1673 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1682 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 226: -#line 866 "dhcp6_parser.yy" // lalr1.cc:859 + case 228: +#line 873 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr rm(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reservation-mode", rm); ctx.leave(); } -#line 1683 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1692 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 227: -#line 872 "dhcp6_parser.yy" // lalr1.cc:859 + case 229: +#line 879 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("id", id); } -#line 1692 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1701 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 228: -#line 877 "dhcp6_parser.yy" // lalr1.cc:859 + case 230: +#line 884 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr rc(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("rapid-commit", rc); } -#line 1701 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1710 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 229: -#line 886 "dhcp6_parser.yy" // lalr1.cc:859 + case 231: +#line 893 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("option-def", l); ctx.stack_.push_back(l); ctx.enter(ctx.OPTION_DEF); } -#line 1712 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1721 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 230: -#line 891 "dhcp6_parser.yy" // lalr1.cc:859 + case 232: +#line 898 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1721 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1730 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 235: -#line 908 "dhcp6_parser.yy" // lalr1.cc:859 + case 237: +#line 915 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1731 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1740 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 236: -#line 912 "dhcp6_parser.yy" // lalr1.cc:859 + case 238: +#line 919 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1739 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1748 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 237: -#line 919 "dhcp6_parser.yy" // lalr1.cc:859 + case 239: +#line 926 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the option-def list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1749 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1758 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 238: -#line 923 "dhcp6_parser.yy" // lalr1.cc:859 + case 240: +#line 930 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1757 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 252: -#line 949 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("code", code); -} #line 1766 "dhcp6_parser.cc" // lalr1.cc:859 break; case 254: #line 956 "dhcp6_parser.yy" // lalr1.cc:859 { - ctx.enter(ctx.NO_KEYWORD); + ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("code", code); } -#line 1774 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1775 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 255: -#line 958 "dhcp6_parser.yy" // lalr1.cc:859 + case 256: +#line 963 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 1783 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 257: +#line 965 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("type", prf); ctx.leave(); } -#line 1784 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1793 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 256: -#line 964 "dhcp6_parser.yy" // lalr1.cc:859 + case 258: +#line 971 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1792 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1801 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 257: -#line 966 "dhcp6_parser.yy" // lalr1.cc:859 + case 259: +#line 973 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr rtypes(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("record-types", rtypes); ctx.leave(); } -#line 1802 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1811 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 258: -#line 972 "dhcp6_parser.yy" // lalr1.cc:859 + case 260: +#line 979 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1810 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1819 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 259: -#line 974 "dhcp6_parser.yy" // lalr1.cc:859 + case 261: +#line 981 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("space", space); ctx.leave(); } -#line 1820 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1829 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 261: -#line 982 "dhcp6_parser.yy" // lalr1.cc:859 + case 263: +#line 989 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1828 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1837 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 262: -#line 984 "dhcp6_parser.yy" // lalr1.cc:859 + case 264: +#line 991 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("encapsulate", encap); ctx.leave(); } -#line 1838 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1847 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 263: -#line 990 "dhcp6_parser.yy" // lalr1.cc:859 + case 265: +#line 997 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("array", array); } -#line 1847 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1856 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 264: -#line 999 "dhcp6_parser.yy" // lalr1.cc:859 + case 266: +#line 1006 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("option-data", l); ctx.stack_.push_back(l); ctx.enter(ctx.OPTION_DATA); } -#line 1858 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1867 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 265: -#line 1004 "dhcp6_parser.yy" // lalr1.cc:859 + case 267: +#line 1011 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1867 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1876 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 270: -#line 1023 "dhcp6_parser.yy" // lalr1.cc:859 + case 272: +#line 1030 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1877 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1886 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 271: -#line 1027 "dhcp6_parser.yy" // lalr1.cc:859 + case 273: +#line 1034 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1885 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1894 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 272: -#line 1034 "dhcp6_parser.yy" // lalr1.cc:859 + case 274: +#line 1041 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the option-data list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1895 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1904 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 273: -#line 1038 "dhcp6_parser.yy" // lalr1.cc:859 + case 275: +#line 1045 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1903 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1912 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 285: -#line 1067 "dhcp6_parser.yy" // lalr1.cc:859 + case 287: +#line 1074 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1911 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1920 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 286: -#line 1069 "dhcp6_parser.yy" // lalr1.cc:859 + case 288: +#line 1076 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("data", data); ctx.leave(); } -#line 1921 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1930 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 289: -#line 1079 "dhcp6_parser.yy" // lalr1.cc:859 + case 291: +#line 1086 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("csv-format", space); } -#line 1930 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1939 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 290: -#line 1087 "dhcp6_parser.yy" // lalr1.cc:859 + case 292: +#line 1094 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pools", l); ctx.stack_.push_back(l); ctx.enter(ctx.POOLS); } -#line 1941 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1950 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 291: -#line 1092 "dhcp6_parser.yy" // lalr1.cc:859 + case 293: +#line 1099 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1950 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1959 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 296: -#line 1107 "dhcp6_parser.yy" // lalr1.cc:859 + case 298: +#line 1114 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1960 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1969 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 297: -#line 1111 "dhcp6_parser.yy" // lalr1.cc:859 + case 299: +#line 1118 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1968 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1977 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 298: -#line 1115 "dhcp6_parser.yy" // lalr1.cc:859 + case 300: +#line 1122 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the pool list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1978 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1987 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 299: -#line 1119 "dhcp6_parser.yy" // lalr1.cc:859 + case 301: +#line 1126 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1986 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1995 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 306: -#line 1133 "dhcp6_parser.yy" // lalr1.cc:859 + case 308: +#line 1140 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1994 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2003 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 307: -#line 1135 "dhcp6_parser.yy" // lalr1.cc:859 + case 309: +#line 1142 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pool", pool); ctx.leave(); } -#line 2004 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2013 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 308: -#line 1141 "dhcp6_parser.yy" // lalr1.cc:859 + case 310: +#line 1148 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2012 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 309: -#line 1143 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.stack_.back()->set("user-context", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); -} #line 2021 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 310: -#line 1151 "dhcp6_parser.yy" // lalr1.cc:859 + case 311: +#line 1150 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("user-context", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2030 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 312: +#line 1158 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pd-pools", l); ctx.stack_.push_back(l); ctx.enter(ctx.PD_POOLS); } -#line 2032 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2041 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 311: -#line 1156 "dhcp6_parser.yy" // lalr1.cc:859 + case 313: +#line 1163 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2041 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2050 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 316: -#line 1171 "dhcp6_parser.yy" // lalr1.cc:859 + case 318: +#line 1178 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2051 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2060 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 317: -#line 1175 "dhcp6_parser.yy" // lalr1.cc:859 + case 319: +#line 1182 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2059 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2068 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 318: -#line 1179 "dhcp6_parser.yy" // lalr1.cc:859 + case 320: +#line 1186 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the pd-pool list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 2069 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2078 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 319: -#line 1183 "dhcp6_parser.yy" // lalr1.cc:859 + case 321: +#line 1190 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 2077 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2086 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 330: -#line 1201 "dhcp6_parser.yy" // lalr1.cc:859 + case 332: +#line 1208 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2085 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2094 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 331: -#line 1203 "dhcp6_parser.yy" // lalr1.cc:859 + case 333: +#line 1210 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("prefix", prf); ctx.leave(); } -#line 2095 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 332: -#line 1209 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("prefix-len", prf); -} #line 2104 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 333: -#line 1214 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2112 "dhcp6_parser.cc" // lalr1.cc:859 - break; - case 334: #line 1216 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("prefix-len", prf); +} +#line 2113 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 335: +#line 1221 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2121 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 336: +#line 1223 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("excluded-prefix", prf); ctx.leave(); } -#line 2122 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2131 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 335: -#line 1222 "dhcp6_parser.yy" // lalr1.cc:859 + case 337: +#line 1229 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("excluded-prefix-len", prf); } -#line 2131 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2140 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 336: -#line 1227 "dhcp6_parser.yy" // lalr1.cc:859 + case 338: +#line 1234 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr deleg(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("delegated-len", deleg); } -#line 2140 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2149 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 337: -#line 1235 "dhcp6_parser.yy" // lalr1.cc:859 + case 339: +#line 1242 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reservations", l); ctx.stack_.push_back(l); ctx.enter(ctx.RESERVATIONS); } -#line 2151 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2160 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 338: -#line 1240 "dhcp6_parser.yy" // lalr1.cc:859 + case 340: +#line 1247 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2160 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2169 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 343: -#line 1253 "dhcp6_parser.yy" // lalr1.cc:859 + case 345: +#line 1260 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2170 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2179 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 344: -#line 1257 "dhcp6_parser.yy" // lalr1.cc:859 + case 346: +#line 1264 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2178 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2187 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 345: -#line 1261 "dhcp6_parser.yy" // lalr1.cc:859 + case 347: +#line 1268 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the reservations list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 2188 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2197 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 346: -#line 1265 "dhcp6_parser.yy" // lalr1.cc:859 + case 348: +#line 1272 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 2196 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2205 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 359: -#line 1288 "dhcp6_parser.yy" // lalr1.cc:859 + case 361: +#line 1295 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ip-addresses", l); ctx.stack_.push_back(l); ctx.enter(ctx.NO_KEYWORD); } -#line 2207 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2216 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 360: -#line 1293 "dhcp6_parser.yy" // lalr1.cc:859 + case 362: +#line 1300 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2216 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2225 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 361: -#line 1298 "dhcp6_parser.yy" // lalr1.cc:859 + case 363: +#line 1305 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("prefixes", l); ctx.stack_.push_back(l); ctx.enter(ctx.NO_KEYWORD); } -#line 2227 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 362: -#line 1303 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.stack_.pop_back(); - ctx.leave(); -} #line 2236 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 363: -#line 1308 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2244 "dhcp6_parser.cc" // lalr1.cc:859 - break; - case 364: #line 1310 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.stack_.pop_back(); + ctx.leave(); +} +#line 2245 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 365: +#line 1315 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2253 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 366: +#line 1317 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("duid", d); ctx.leave(); } -#line 2254 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2263 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 365: -#line 1316 "dhcp6_parser.yy" // lalr1.cc:859 + case 367: +#line 1323 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2262 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2271 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 366: -#line 1318 "dhcp6_parser.yy" // lalr1.cc:859 + case 368: +#line 1325 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hw-address", hw); ctx.leave(); } -#line 2272 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2281 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 367: -#line 1324 "dhcp6_parser.yy" // lalr1.cc:859 + case 369: +#line 1331 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2280 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2289 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 368: -#line 1326 "dhcp6_parser.yy" // lalr1.cc:859 + case 370: +#line 1333 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hostname", host); ctx.leave(); } -#line 2290 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2299 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 369: -#line 1332 "dhcp6_parser.yy" // lalr1.cc:859 + case 371: +#line 1339 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-classes", c); ctx.stack_.push_back(c); ctx.enter(ctx.NO_KEYWORD); } -#line 2301 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2310 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 370: -#line 1337 "dhcp6_parser.yy" // lalr1.cc:859 + case 372: +#line 1344 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2310 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2319 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 371: -#line 1345 "dhcp6_parser.yy" // lalr1.cc:859 + case 373: +#line 1352 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("relay", m); ctx.stack_.push_back(m); ctx.enter(ctx.RELAY); } -#line 2321 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 372: -#line 1350 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.stack_.pop_back(); - ctx.leave(); -} #line 2330 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 373: -#line 1355 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2338 "dhcp6_parser.cc" // lalr1.cc:859 - break; - case 374: #line 1357 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.stack_.pop_back(); + ctx.leave(); +} +#line 2339 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 375: +#line 1362 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2347 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 376: +#line 1364 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr ip(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ip-address", ip); ctx.leave(); } -#line 2348 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2357 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 375: -#line 1366 "dhcp6_parser.yy" // lalr1.cc:859 + case 377: +#line 1373 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-classes", l); ctx.stack_.push_back(l); ctx.enter(ctx.CLIENT_CLASSES); } -#line 2359 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2368 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 376: -#line 1371 "dhcp6_parser.yy" // lalr1.cc:859 + case 378: +#line 1378 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2368 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2377 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 379: -#line 1380 "dhcp6_parser.yy" // lalr1.cc:859 + case 381: +#line 1387 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2378 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2387 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 380: -#line 1384 "dhcp6_parser.yy" // lalr1.cc:859 + case 382: +#line 1391 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2386 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2395 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 390: -#line 1404 "dhcp6_parser.yy" // lalr1.cc:859 + case 392: +#line 1411 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2394 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2403 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 391: -#line 1406 "dhcp6_parser.yy" // lalr1.cc:859 + case 393: +#line 1413 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("test", test); ctx.leave(); } -#line 2404 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2413 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 392: -#line 1415 "dhcp6_parser.yy" // lalr1.cc:859 + case 394: +#line 1422 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-id", m); ctx.stack_.push_back(m); ctx.enter(ctx.SERVER_ID); } -#line 2415 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2424 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 393: -#line 1420 "dhcp6_parser.yy" // lalr1.cc:859 + case 395: +#line 1427 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2424 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 403: -#line 1438 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.DUID_TYPE); -} -#line 2432 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 404: -#line 1440 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); -} -#line 2441 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2433 "dhcp6_parser.cc" // lalr1.cc:859 break; case 405: #line 1445 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LLT", ctx.loc2pos(yystack_[0].location))); } -#line 2447 "dhcp6_parser.cc" // lalr1.cc:859 + { + ctx.enter(ctx.DUID_TYPE); +} +#line 2441 "dhcp6_parser.cc" // lalr1.cc:859 break; case 406: -#line 1446 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("EN", ctx.loc2pos(yystack_[0].location))); } -#line 2453 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1447 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2450 "dhcp6_parser.cc" // lalr1.cc:859 break; case 407: -#line 1447 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LL", ctx.loc2pos(yystack_[0].location))); } -#line 2459 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1452 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LLT", ctx.loc2pos(yystack_[0].location))); } +#line 2456 "dhcp6_parser.cc" // lalr1.cc:859 break; case 408: -#line 1450 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr htype(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("htype", htype); -} -#line 2468 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1453 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("EN", ctx.loc2pos(yystack_[0].location))); } +#line 2462 "dhcp6_parser.cc" // lalr1.cc:859 break; case 409: -#line 1455 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2476 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1454 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LL", ctx.loc2pos(yystack_[0].location))); } +#line 2468 "dhcp6_parser.cc" // lalr1.cc:859 break; case 410: #line 1457 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr htype(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("htype", htype); +} +#line 2477 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 411: +#line 1462 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2485 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 412: +#line 1464 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr id(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("identifier", id); ctx.leave(); } -#line 2486 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2495 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 411: -#line 1463 "dhcp6_parser.yy" // lalr1.cc:859 + case 413: +#line 1470 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("time", time); } -#line 2495 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2504 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 412: -#line 1468 "dhcp6_parser.yy" // lalr1.cc:859 + case 414: +#line 1475 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("enterprise-id", time); } -#line 2504 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2513 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 413: -#line 1475 "dhcp6_parser.yy" // lalr1.cc:859 + case 415: +#line 1482 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp4o6-port", time); } -#line 2513 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2522 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 414: -#line 1482 "dhcp6_parser.yy" // lalr1.cc:859 + case 416: +#line 1489 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("control-socket", m); ctx.stack_.push_back(m); ctx.enter(ctx.CONTROL_SOCKET); } -#line 2524 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2533 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 415: -#line 1487 "dhcp6_parser.yy" // lalr1.cc:859 + case 417: +#line 1494 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2533 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2542 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 420: -#line 1500 "dhcp6_parser.yy" // lalr1.cc:859 + case 422: +#line 1507 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2541 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2550 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 421: -#line 1502 "dhcp6_parser.yy" // lalr1.cc:859 + case 423: +#line 1509 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("socket-type", stype); ctx.leave(); } -#line 2551 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2560 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 422: -#line 1508 "dhcp6_parser.yy" // lalr1.cc:859 + case 424: +#line 1515 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2559 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2568 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 423: -#line 1510 "dhcp6_parser.yy" // lalr1.cc:859 + case 425: +#line 1517 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("socket-name", name); ctx.leave(); } -#line 2569 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2578 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 424: -#line 1518 "dhcp6_parser.yy" // lalr1.cc:859 + case 426: +#line 1525 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp-ddns", m); ctx.stack_.push_back(m); ctx.enter(ctx.DHCP_DDNS); } -#line 2580 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2589 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 425: -#line 1523 "dhcp6_parser.yy" // lalr1.cc:859 + case 427: +#line 1530 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2589 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2598 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 426: -#line 1528 "dhcp6_parser.yy" // lalr1.cc:859 + case 428: +#line 1535 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the dhcp-ddns map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 2599 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2608 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 427: -#line 1532 "dhcp6_parser.yy" // lalr1.cc:859 + case 429: +#line 1539 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 2607 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 446: -#line 1558 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("enable-updates", b); -} #line 2616 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 447: -#line 1563 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2624 "dhcp6_parser.cc" // lalr1.cc:859 - break; - case 448: #line 1565 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("enable-updates", b); +} +#line 2625 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 449: +#line 1570 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2633 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 450: +#line 1572 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("qualifying-suffix", s); ctx.leave(); } -#line 2634 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2643 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 449: -#line 1571 "dhcp6_parser.yy" // lalr1.cc:859 + case 451: +#line 1578 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2642 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2651 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 450: -#line 1573 "dhcp6_parser.yy" // lalr1.cc:859 + case 452: +#line 1580 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-ip", s); ctx.leave(); } -#line 2652 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 451: -#line 1579 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("server-port", i); -} #line 2661 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 452: -#line 1584 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2669 "dhcp6_parser.cc" // lalr1.cc:859 - break; - case 453: #line 1586 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("server-port", i); +} +#line 2670 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 454: +#line 1591 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2678 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 455: +#line 1593 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("sender-ip", s); ctx.leave(); } -#line 2679 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2688 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 454: -#line 1592 "dhcp6_parser.yy" // lalr1.cc:859 + case 456: +#line 1599 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("sender-port", i); } -#line 2688 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 455: -#line 1597 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("max-queue-size", i); -} #line 2697 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 456: -#line 1602 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NCR_PROTOCOL); -} -#line 2705 "dhcp6_parser.cc" // lalr1.cc:859 - break; - case 457: #line 1604 "dhcp6_parser.yy" // lalr1.cc:859 { - ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("max-queue-size", i); +} +#line 2706 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 458: +#line 1609 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NCR_PROTOCOL); } #line 2714 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 458: -#line 1610 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); } -#line 2720 "dhcp6_parser.cc" // lalr1.cc:859 - break; - case 459: #line 1611 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); } -#line 2726 "dhcp6_parser.cc" // lalr1.cc:859 + { + ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2723 "dhcp6_parser.cc" // lalr1.cc:859 break; case 460: -#line 1614 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NCR_FORMAT); -} -#line 2734 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1617 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); } +#line 2729 "dhcp6_parser.cc" // lalr1.cc:859 break; case 461: -#line 1616 "dhcp6_parser.yy" // lalr1.cc:859 +#line 1618 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); } +#line 2735 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 462: +#line 1621 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NCR_FORMAT); +} +#line 2743 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 463: +#line 1623 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ncr-format", json); ctx.leave(); } -#line 2744 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2753 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 462: -#line 1622 "dhcp6_parser.yy" // lalr1.cc:859 + case 464: +#line 1629 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("always-include-fqdn", b); } -#line 2753 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2762 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 463: -#line 1627 "dhcp6_parser.yy" // lalr1.cc:859 + case 465: +#line 1634 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("allow-client-update", b); } -#line 2762 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2771 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 464: -#line 1632 "dhcp6_parser.yy" // lalr1.cc:859 + case 466: +#line 1639 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("override-no-update", b); } -#line 2771 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 465: -#line 1637 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("override-client-update", b); -} #line 2780 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 466: -#line 1642 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.REPLACE_CLIENT_NAME); -} -#line 2788 "dhcp6_parser.cc" // lalr1.cc:859 - break; - case 467: #line 1644 "dhcp6_parser.yy" // lalr1.cc:859 { - ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("override-client-update", b); +} +#line 2789 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 468: +#line 1649 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.REPLACE_CLIENT_NAME); } #line 2797 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 468: -#line 1650 "dhcp6_parser.yy" // lalr1.cc:859 - { - yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); - } -#line 2805 "dhcp6_parser.cc" // lalr1.cc:859 - break; - case 469: -#line 1653 "dhcp6_parser.yy" // lalr1.cc:859 +#line 1651 "dhcp6_parser.yy" // lalr1.cc:859 { - yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location))); - } -#line 2813 "dhcp6_parser.cc" // lalr1.cc:859 + ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2806 "dhcp6_parser.cc" // lalr1.cc:859 break; case 470: -#line 1656 "dhcp6_parser.yy" // lalr1.cc:859 +#line 1657 "dhcp6_parser.yy" // lalr1.cc:859 { - yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location))); + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); } -#line 2821 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2814 "dhcp6_parser.cc" // lalr1.cc:859 break; case 471: -#line 1659 "dhcp6_parser.yy" // lalr1.cc:859 +#line 1660 "dhcp6_parser.yy" // lalr1.cc:859 { - yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location))); + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location))); } -#line 2829 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2822 "dhcp6_parser.cc" // lalr1.cc:859 break; case 472: -#line 1662 "dhcp6_parser.yy" // lalr1.cc:859 +#line 1663 "dhcp6_parser.yy" // lalr1.cc:859 { - error(yystack_[0].location, "boolean values for the replace-client-name are " - "no longer supported"); + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location))); + } +#line 2830 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 473: +#line 1666 "dhcp6_parser.yy" // lalr1.cc:859 + { + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location))); } #line 2838 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 473: -#line 1668 "dhcp6_parser.yy" // lalr1.cc:859 + case 474: +#line 1669 "dhcp6_parser.yy" // lalr1.cc:859 + { + error(yystack_[0].location, "boolean values for the replace-client-name are " + "no longer supported"); + } +#line 2847 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 475: +#line 1675 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2846 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2855 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 474: -#line 1670 "dhcp6_parser.yy" // lalr1.cc:859 + case 476: +#line 1677 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("generated-prefix", s); ctx.leave(); } -#line 2856 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 475: -#line 1678 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 2864 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 476: -#line 1680 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); -} -#line 2873 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2865 "dhcp6_parser.cc" // lalr1.cc:859 break; case 477: @@ -2877,161 +2869,178 @@ namespace isc { namespace dhcp { { ctx.enter(ctx.NO_KEYWORD); } -#line 2881 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2873 "dhcp6_parser.cc" // lalr1.cc:859 break; case 478: #line 1687 "dhcp6_parser.yy" // lalr1.cc:859 { - ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ()); + ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } +#line 2882 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 479: +#line 1692 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} #line 2890 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 479: -#line 1697 "dhcp6_parser.yy" // lalr1.cc:859 + case 480: +#line 1694 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2899 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 481: +#line 1704 "dhcp6_parser.yy" // lalr1.cc:859 { 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 2901 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2910 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 480: -#line 1702 "dhcp6_parser.yy" // lalr1.cc:859 + case 482: +#line 1709 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2910 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2919 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 484: -#line 1719 "dhcp6_parser.yy" // lalr1.cc:859 + case 486: +#line 1726 "dhcp6_parser.yy" // lalr1.cc:859 { 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 2921 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2930 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 485: -#line 1724 "dhcp6_parser.yy" // lalr1.cc:859 + case 487: +#line 1731 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2930 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2939 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 488: -#line 1736 "dhcp6_parser.yy" // lalr1.cc:859 + case 490: +#line 1743 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(l); ctx.stack_.push_back(l); } -#line 2940 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2949 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 489: -#line 1740 "dhcp6_parser.yy" // lalr1.cc:859 + case 491: +#line 1747 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2948 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 497: -#line 1755 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("debuglevel", dl); -} #line 2957 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 498: -#line 1759 "dhcp6_parser.yy" // lalr1.cc:859 + case 499: +#line 1762 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("debuglevel", dl); +} +#line 2966 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 500: +#line 1766 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2965 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2974 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 499: -#line 1761 "dhcp6_parser.yy" // lalr1.cc:859 + case 501: +#line 1768 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("severity", sev); ctx.leave(); } -#line 2975 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2984 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 500: -#line 1767 "dhcp6_parser.yy" // lalr1.cc:859 + case 502: +#line 1774 "dhcp6_parser.yy" // lalr1.cc:859 { 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 2986 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2995 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 501: -#line 1772 "dhcp6_parser.yy" // lalr1.cc:859 + case 503: +#line 1779 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2995 "dhcp6_parser.cc" // lalr1.cc:859 +#line 3004 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 504: -#line 1781 "dhcp6_parser.yy" // lalr1.cc:859 + case 506: +#line 1788 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 3005 "dhcp6_parser.cc" // lalr1.cc:859 +#line 3014 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 505: -#line 1785 "dhcp6_parser.yy" // lalr1.cc:859 + case 507: +#line 1792 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 3013 "dhcp6_parser.cc" // lalr1.cc:859 +#line 3022 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 508: -#line 1793 "dhcp6_parser.yy" // lalr1.cc:859 + case 510: +#line 1800 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3021 "dhcp6_parser.cc" // lalr1.cc:859 +#line 3030 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 509: -#line 1795 "dhcp6_parser.yy" // lalr1.cc:859 + case 511: +#line 1802 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("output", sev); ctx.leave(); } -#line 3031 "dhcp6_parser.cc" // lalr1.cc:859 +#line 3040 "dhcp6_parser.cc" // lalr1.cc:859 break; -#line 3035 "dhcp6_parser.cc" // lalr1.cc:859 +#line 3044 "dhcp6_parser.cc" // lalr1.cc:859 default: break; } @@ -3293,91 +3302,92 @@ namespace isc { namespace dhcp { const short int Dhcp6Parser::yypact_[] = { - 185, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, 46, 19, 91, 113, 117, 119, 160, - 193, 227, 228, 249, 250, 251, -490, -490, -490, -490, + 81, -490, -490, -490, -490, -490, -490, -490, -490, -490, + -490, -490, -490, 98, 19, 41, 95, 114, 118, 120, + 161, 226, 230, 247, 251, 265, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - 19, 16, 17, 31, 182, 23, 37, 68, 62, 32, - 100, 11, 143, -490, 205, 257, 258, 253, 261, -490, - -490, -490, -490, 262, -490, 40, -490, -490, -490, -490, - -490, -490, -490, -490, 263, 264, 265, 268, 270, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, 272, - -490, -490, -490, 92, -490, -490, -490, -490, -490, -490, + 19, 57, 17, 31, 215, 23, 37, 68, 62, 32, + 100, -42, 143, -490, 268, 231, 272, 269, 276, -490, + -490, -490, -490, 290, -490, 102, -490, -490, -490, -490, + -490, -490, -490, -490, 291, 293, 294, 295, 297, -490, + -490, -490, -490, -490, -490, -490, -490, -490, -490, 298, + -490, -490, -490, 146, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, 269, -490, -490, - -490, -490, -490, -490, 275, 277, -490, -490, -490, -490, - -490, -490, -490, -490, -490, 101, -490, -490, -490, -490, + -490, -490, -490, -490, -490, -490, -490, 302, -490, -490, + -490, -490, -490, -490, 299, 307, -490, -490, -490, -490, + -490, -490, -490, -490, -490, 148, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, 147, -490, -490, -490, -490, 282, -490, - 283, 284, -490, -490, -490, 158, -490, -490, -490, -490, + -490, -490, -490, 159, -490, -490, -490, -490, 308, -490, + 309, 310, -490, -490, -490, 175, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - 286, 292, -490, -490, -490, -490, -490, -490, -490, -490, - -490, 293, -490, -490, -490, 294, -490, -490, 291, 298, + 311, 277, -490, -490, -490, -490, -490, -490, -490, -490, + -490, 312, -490, -490, -490, 313, -490, -490, 314, 303, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, 299, -490, -490, -490, -490, 314, 303, -490, -490, - -490, -490, -490, -490, -490, -490, -490, 174, -490, -490, - -490, 319, -490, -490, 321, -490, 322, 323, -490, -490, - 324, 325, 326, 327, -490, -490, -490, 176, -490, -490, + -490, 316, -490, -490, -490, -490, 315, 318, -490, -490, + -490, -490, -490, -490, -490, -490, -490, 177, -490, -490, + -490, 321, -490, -490, 322, -490, 323, 324, -490, -490, + 325, 326, 327, 328, -490, -490, -490, 181, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, 19, 19, -490, 128, 328, - 329, 330, 331, -490, 17, -490, 332, 333, 334, 164, - 202, 203, 206, 208, 335, 338, 339, 341, 343, 344, - 345, 346, 347, 348, 215, 350, 351, 31, -490, 352, - -490, 48, 353, 354, 355, 356, 357, 224, 223, 360, - 361, 362, 363, 23, -490, 364, 365, 37, -490, 366, - 233, 368, 235, 236, 68, -490, 371, 372, 373, 374, - 375, 376, -490, 62, 377, 378, 245, 380, 381, 382, - 247, -490, 32, 384, 252, -490, 100, 385, 386, -41, - -490, 254, 387, 389, 259, 391, 260, 266, 392, 395, - 267, 271, 273, 274, 398, 399, 143, -490, -490, -490, - 401, 402, 403, 19, 19, -490, 405, 408, 409, -490, - -490, -490, -490, -490, 412, 413, 414, 415, 416, 417, - 418, 419, 420, 421, -490, 422, 425, -490, 428, -490, - -490, -490, -490, 400, 423, -490, -490, -490, 431, 432, - 288, 301, 302, -490, -490, 305, 307, 435, 438, -490, - 309, 440, -490, 312, -490, 313, -490, -490, -490, 428, - 428, 428, 316, 317, 318, -490, 320, 336, -490, 337, - 340, 342, -490, -490, 349, -490, -490, 358, 19, -490, - -490, 359, 367, -490, 369, -490, -490, 1, 370, -490, - -490, -490, -490, 49, 379, -490, 19, 31, 383, -490, - -490, 182, 14, 14, 444, 449, 451, -36, 19, 65, - 34, 452, 66, 84, 83, 143, -490, -490, 456, -490, - 48, 454, 457, -490, -490, -490, -490, -490, 458, 396, + -490, -490, -490, -490, -490, 19, 19, -490, 180, 329, + 330, 331, 332, -490, 17, -490, 333, 334, 335, 176, + 201, 202, 203, 204, 340, 341, 342, 343, 344, 345, + 346, 347, 348, 349, 216, 350, 352, 31, -490, 353, + -490, 48, 354, 355, 356, 357, 358, 224, 223, 361, + 362, 363, 364, 23, -490, 365, 366, 37, -490, 367, + 233, 369, 235, 236, 68, -490, 372, 373, 374, 375, + 376, 377, -490, 62, 378, 379, 245, 381, 382, 383, + 248, -490, 32, 384, 250, -490, 100, 386, 388, 11, + -490, 255, 389, 390, 256, 393, 259, 260, 398, 399, + 263, 264, 266, 267, 402, 405, 143, -490, -490, -490, + 406, 404, 407, 19, 19, -490, 408, 409, 410, -490, + -490, -490, -490, -490, 413, 414, 415, 416, 417, 418, + 419, 420, 421, 422, -490, 425, 426, -490, 431, -490, + -490, -490, -490, 429, 423, -490, -490, -490, 433, 434, + 274, 275, 289, -490, -490, 304, 306, 435, 438, -490, + 317, 439, -490, 319, -490, 320, -490, -490, -490, 431, + 431, 431, 336, 338, 339, -490, 351, 359, -490, 360, + 368, 370, -490, -490, 371, -490, -490, 380, 19, -490, + -490, 385, 387, -490, 391, -490, -490, 1, 337, -490, + -490, -490, -490, 49, 392, -490, 19, 31, 394, -490, + -490, 215, 14, 14, 440, 442, 444, -37, 19, 65, + 36, 446, 66, 84, 83, 143, -490, -490, 450, -490, + 48, 449, 452, -490, -490, -490, -490, -490, 453, 395, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, 180, -490, 183, -490, -490, 455, - -490, -490, -490, -490, 462, 464, 465, 466, -490, 184, + -490, -490, -490, -490, 184, -490, 185, -490, -490, 455, + -490, -490, -490, -490, 457, 460, 461, 462, 464, -490, + 188, -490, -490, -490, -490, -490, -490, -490, -490, -490, + -490, -490, 191, -490, 463, 467, -490, -490, 465, 469, + -490, -490, 472, 470, -490, -490, -490, 43, -490, -490, + -490, 473, -490, -490, 103, -490, -490, -490, 147, -490, + 474, 478, -490, 479, 480, 481, 482, 483, 484, 195, + -490, -490, -490, -490, -490, -490, -490, -490, -490, 486, + 487, 488, -490, -490, 218, -490, -490, -490, -490, -490, + -490, -490, -490, 220, -490, -490, -490, 221, 396, 397, + -490, -490, 476, 491, -490, -490, 489, 493, -490, -490, + 494, 496, -490, -490, 495, -490, 497, 394, -490, -490, + 498, 500, 501, 503, 400, 401, 411, 403, 412, 14, + -490, -490, 23, -490, 440, 32, -490, 442, 100, -490, + 444, -37, -490, -490, 65, -490, 36, -490, -42, -490, + 446, 424, 427, 428, 430, 432, 436, 66, -490, 506, + 507, 437, 441, 443, 84, -490, 508, 510, 83, -490, + -490, -490, 509, 513, -490, 37, -490, 449, 68, -490, + 452, 62, -490, 453, 515, -490, 512, -490, 249, 445, + 447, 448, -490, -490, -490, -490, -490, -490, 227, -490, + 514, -490, 516, -490, -490, -490, -490, 228, -490, -490, + -490, -490, -490, -490, -490, -490, -29, 451, -490, -490, + -490, -490, 454, 456, -490, -490, 458, 252, -490, 253, + -490, 518, -490, 459, 520, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - 187, -490, 470, 468, -490, -490, 472, 469, -490, -490, - 474, 478, -490, -490, -490, 102, -490, -490, -490, 477, - -490, -490, 146, -490, -490, -490, 220, -490, 479, 481, - -490, 483, 484, 485, 486, 487, 488, 190, -490, -490, - -490, -490, -490, -490, -490, -490, -490, 490, 493, 494, - -490, -490, 194, -490, -490, -490, -490, -490, -490, -490, - -490, 198, -490, -490, -490, 200, 388, 390, -490, -490, - 496, 497, -490, -490, 499, 500, -490, -490, 501, 505, - -490, -490, 491, -490, 506, 383, -490, -490, 507, 508, - 509, 510, 393, 394, 397, 404, 14, -490, -490, 23, - -490, 444, 32, -490, 449, 100, -490, 451, -36, -490, - -490, 65, -490, 34, -490, 11, -490, 452, 406, 407, - 410, 411, 424, 426, 66, -490, 511, 513, 427, 429, - 430, 84, -490, 514, 515, 83, -490, -490, -490, 503, - 517, -490, 37, -490, 454, 68, -490, 457, 62, -490, - 458, 518, -490, 516, -490, 212, 433, 434, 436, -490, - -490, -490, -490, -490, 201, -490, 520, -490, 521, -490, - -490, -490, -490, 204, -490, -490, -490, -490, -490, -490, - -490, -490, -29, 437, -490, -490, -490, -490, 439, 441, - -490, -490, 442, 207, -490, 210, -490, 522, -490, 443, - 519, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, 221, -490, 59, 519, - -490, -490, 527, -490, -490, -490, 211, -490, -490, -490, - -490, -490, 530, 445, 531, 59, -490, 533, -490, 447, - -490, 529, -490, -490, 230, -490, 446, 529, -490, -490, - 217, -490, -490, 535, 446, -490, 448, -490, -490 + 198, -490, 59, 520, -490, -490, 517, -490, -490, -490, + 254, -490, -490, -490, -490, -490, 524, 466, 527, 59, + -490, 528, -490, 468, -490, 525, -490, -490, 199, -490, + 477, 525, -490, -490, 261, -490, -490, 532, 477, -490, + 471, -490, -490 }; const unsigned short int @@ -3387,124 +3397,125 @@ namespace isc { namespace dhcp { 20, 22, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 41, 34, 30, 29, 26, 27, 28, 33, 3, 31, 32, 54, 5, - 65, 7, 98, 9, 196, 11, 298, 13, 318, 15, - 345, 17, 237, 19, 272, 21, 161, 23, 426, 25, - 43, 37, 0, 0, 0, 0, 0, 0, 347, 239, - 274, 0, 0, 45, 0, 44, 0, 0, 38, 63, - 479, 475, 477, 0, 62, 0, 56, 58, 60, 61, - 59, 96, 102, 104, 0, 0, 0, 0, 0, 188, - 229, 264, 136, 151, 144, 375, 153, 172, 392, 0, - 414, 424, 90, 0, 67, 69, 70, 71, 72, 73, + 65, 7, 98, 9, 198, 11, 300, 13, 320, 15, + 347, 17, 239, 19, 274, 21, 163, 23, 428, 25, + 43, 37, 0, 0, 0, 0, 0, 0, 349, 241, + 276, 0, 0, 45, 0, 44, 0, 0, 38, 63, + 481, 477, 479, 0, 62, 0, 56, 58, 60, 61, + 59, 96, 102, 104, 0, 0, 0, 0, 0, 190, + 231, 266, 138, 153, 146, 377, 155, 174, 394, 0, + 416, 426, 90, 0, 67, 69, 70, 71, 72, 73, 75, 76, 77, 78, 80, 79, 84, 85, 74, 82, - 83, 81, 86, 87, 88, 89, 100, 0, 379, 290, - 310, 217, 219, 221, 0, 0, 225, 223, 337, 371, - 216, 200, 201, 202, 203, 0, 198, 207, 208, 209, - 212, 214, 210, 211, 204, 205, 206, 213, 215, 306, - 308, 305, 303, 0, 300, 302, 304, 330, 0, 333, - 0, 0, 329, 325, 328, 0, 320, 322, 323, 326, - 327, 324, 369, 359, 361, 363, 365, 367, 358, 357, - 0, 348, 349, 353, 354, 351, 355, 356, 352, 254, - 130, 0, 258, 256, 261, 0, 250, 251, 0, 240, - 241, 243, 253, 244, 245, 246, 260, 247, 248, 249, - 285, 0, 283, 284, 287, 288, 0, 275, 276, 278, - 279, 280, 281, 282, 168, 170, 165, 0, 163, 166, - 167, 0, 447, 449, 0, 452, 0, 0, 456, 460, - 0, 0, 0, 0, 466, 473, 445, 0, 428, 430, - 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, - 441, 442, 443, 444, 42, 0, 0, 35, 0, 0, + 83, 81, 86, 87, 88, 89, 100, 0, 381, 292, + 312, 219, 221, 223, 0, 0, 227, 225, 339, 373, + 218, 202, 203, 204, 205, 0, 200, 209, 210, 211, + 214, 216, 212, 213, 206, 207, 208, 215, 217, 308, + 310, 307, 305, 0, 302, 304, 306, 332, 0, 335, + 0, 0, 331, 327, 330, 0, 322, 324, 325, 328, + 329, 326, 371, 361, 363, 365, 367, 369, 360, 359, + 0, 350, 351, 355, 356, 353, 357, 358, 354, 256, + 132, 0, 260, 258, 263, 0, 252, 253, 0, 242, + 243, 245, 255, 246, 247, 248, 262, 249, 250, 251, + 287, 0, 285, 286, 289, 290, 0, 277, 278, 280, + 281, 282, 283, 284, 170, 172, 167, 0, 165, 168, + 169, 0, 449, 451, 0, 454, 0, 0, 458, 462, + 0, 0, 0, 0, 468, 475, 447, 0, 430, 432, + 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, + 443, 444, 445, 446, 42, 0, 0, 35, 0, 0, 0, 0, 0, 53, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, - 99, 381, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 197, 0, 0, 0, 299, 0, - 0, 0, 0, 0, 0, 319, 0, 0, 0, 0, - 0, 0, 346, 0, 0, 0, 0, 0, 0, 0, - 0, 238, 0, 0, 0, 273, 0, 0, 0, 0, - 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 427, 46, 39, + 99, 383, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 199, 0, 0, 0, 301, 0, + 0, 0, 0, 0, 0, 321, 0, 0, 0, 0, + 0, 0, 348, 0, 0, 0, 0, 0, 0, 0, + 0, 240, 0, 0, 0, 275, 0, 0, 0, 0, + 164, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 429, 46, 39, 0, 0, 0, 0, 0, 57, 0, 0, 0, 91, 92, 93, 94, 95, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 413, 0, 0, 68, 0, 390, - 388, 389, 387, 0, 382, 383, 385, 386, 0, 0, - 0, 0, 0, 227, 228, 0, 0, 0, 0, 199, - 0, 0, 301, 0, 332, 0, 335, 336, 321, 0, - 0, 0, 0, 0, 0, 350, 0, 0, 252, 0, - 0, 0, 263, 242, 0, 289, 277, 0, 0, 164, - 446, 0, 0, 451, 0, 454, 455, 0, 0, 462, - 463, 464, 465, 0, 0, 429, 0, 0, 0, 476, - 478, 0, 0, 0, 190, 231, 266, 0, 43, 0, - 0, 155, 0, 0, 0, 0, 47, 101, 0, 380, - 0, 292, 312, 218, 220, 222, 226, 224, 339, 0, - 307, 36, 309, 331, 334, 370, 360, 362, 364, 366, - 368, 255, 131, 259, 257, 262, 286, 169, 171, 448, - 450, 453, 458, 459, 457, 461, 468, 469, 470, 471, - 472, 467, 474, 40, 0, 484, 0, 481, 483, 0, - 118, 124, 126, 128, 0, 0, 0, 0, 117, 0, - 106, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 0, 194, 0, 191, 192, 235, 0, 232, 233, 270, - 0, 267, 268, 142, 143, 0, 138, 140, 141, 0, - 150, 148, 0, 146, 149, 377, 0, 159, 0, 156, - 157, 0, 0, 0, 0, 0, 0, 0, 174, 176, - 177, 178, 179, 180, 181, 403, 409, 0, 0, 0, - 402, 401, 0, 394, 396, 399, 397, 398, 400, 420, - 422, 0, 416, 418, 419, 0, 49, 0, 384, 296, - 0, 293, 294, 316, 0, 313, 314, 343, 0, 340, - 341, 373, 0, 64, 0, 0, 480, 97, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 103, 105, 0, - 189, 0, 239, 230, 0, 274, 265, 0, 0, 137, - 152, 0, 145, 0, 376, 0, 154, 0, 0, 0, - 0, 0, 0, 0, 0, 173, 0, 0, 0, 0, - 0, 0, 393, 0, 0, 0, 415, 425, 51, 0, - 50, 391, 0, 291, 0, 0, 311, 0, 347, 338, - 0, 0, 372, 0, 482, 0, 0, 0, 0, 132, - 133, 134, 135, 107, 0, 193, 0, 234, 0, 269, - 139, 147, 378, 0, 158, 182, 183, 184, 185, 186, - 187, 175, 0, 0, 408, 411, 412, 395, 0, 0, - 417, 48, 0, 0, 295, 0, 315, 0, 342, 0, - 0, 120, 121, 122, 123, 119, 125, 127, 129, 195, - 236, 271, 160, 405, 406, 407, 404, 410, 421, 423, - 52, 297, 317, 344, 374, 488, 0, 486, 0, 0, - 485, 500, 0, 498, 496, 492, 0, 490, 494, 495, - 493, 487, 0, 0, 0, 0, 489, 0, 497, 0, - 491, 0, 499, 504, 0, 502, 0, 0, 501, 508, - 0, 506, 503, 0, 0, 505, 0, 507, 509 + 0, 0, 0, 0, 415, 0, 0, 68, 0, 392, + 390, 391, 389, 0, 384, 385, 387, 388, 0, 0, + 0, 0, 0, 229, 230, 0, 0, 0, 0, 201, + 0, 0, 303, 0, 334, 0, 337, 338, 323, 0, + 0, 0, 0, 0, 0, 352, 0, 0, 254, 0, + 0, 0, 265, 244, 0, 291, 279, 0, 0, 166, + 448, 0, 0, 453, 0, 456, 457, 0, 0, 464, + 465, 466, 467, 0, 0, 431, 0, 0, 0, 478, + 480, 0, 0, 0, 192, 233, 268, 0, 43, 0, + 0, 157, 0, 0, 0, 0, 47, 101, 0, 382, + 0, 294, 314, 220, 222, 224, 228, 226, 341, 0, + 309, 36, 311, 333, 336, 372, 362, 364, 366, 368, + 370, 257, 133, 261, 259, 264, 288, 171, 173, 450, + 452, 455, 460, 461, 459, 463, 470, 471, 472, 473, + 474, 469, 476, 40, 0, 486, 0, 483, 485, 0, + 119, 125, 127, 129, 0, 0, 0, 0, 0, 118, + 0, 106, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 0, 196, 0, 193, 194, 237, 0, 234, + 235, 272, 0, 269, 270, 144, 145, 0, 140, 142, + 143, 0, 152, 150, 0, 148, 151, 379, 0, 161, + 0, 158, 159, 0, 0, 0, 0, 0, 0, 0, + 176, 178, 179, 180, 181, 182, 183, 405, 411, 0, + 0, 0, 404, 403, 0, 396, 398, 401, 399, 400, + 402, 422, 424, 0, 418, 420, 421, 0, 49, 0, + 386, 298, 0, 295, 296, 318, 0, 315, 316, 345, + 0, 342, 343, 375, 0, 64, 0, 0, 482, 97, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 103, 105, 0, 191, 0, 241, 232, 0, 276, 267, + 0, 0, 139, 154, 0, 147, 0, 378, 0, 156, + 0, 0, 0, 0, 0, 0, 0, 0, 175, 0, + 0, 0, 0, 0, 0, 395, 0, 0, 0, 417, + 427, 51, 0, 50, 393, 0, 293, 0, 0, 313, + 0, 349, 340, 0, 0, 374, 0, 484, 0, 0, + 0, 0, 131, 134, 135, 136, 137, 107, 0, 195, + 0, 236, 0, 271, 141, 149, 380, 0, 160, 184, + 185, 186, 187, 188, 189, 177, 0, 0, 410, 413, + 414, 397, 0, 0, 419, 48, 0, 0, 297, 0, + 317, 0, 344, 0, 0, 121, 122, 123, 124, 120, + 126, 128, 130, 197, 238, 273, 162, 407, 408, 409, + 406, 412, 423, 425, 52, 299, 319, 346, 376, 490, + 0, 488, 0, 0, 487, 502, 0, 500, 498, 494, + 0, 492, 496, 497, 495, 489, 0, 0, 0, 0, + 491, 0, 499, 0, 493, 0, 501, 506, 0, 504, + 0, 0, 503, 510, 0, 508, 505, 0, 0, 507, + 0, 509, 511 }; const short int Dhcp6Parser::yypgoto_[] = { -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, 7, -490, -35, -490, -490, -490, - -490, -490, -490, 25, -490, -196, -490, -490, -490, -62, - -490, -490, -490, 246, -490, -490, -490, -490, 54, 226, - -63, -50, -49, -43, -490, -490, -490, -490, -490, 33, - -490, -490, -490, -490, -490, 53, -129, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -58, -490, -489, -490, - -490, -490, -490, -490, -490, -138, -474, -490, -490, -490, - -490, -140, -490, -490, -490, -490, -490, -490, -490, -145, - -490, -490, -490, -142, 186, -490, -490, -490, -490, -490, - -490, -490, -150, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -125, -490, -490, -490, -122, 225, -490, - -490, -490, -490, -490, -490, -477, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -124, -490, -490, -490, -123, - -490, 199, -490, -59, -490, -490, -490, -490, -490, -57, - -490, -490, -490, -490, -490, -48, -490, -490, -490, -118, - -490, -490, -490, -113, -490, 197, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -149, -490, -490, -490, - -141, 240, -490, -490, -66, -490, -490, -490, -490, -490, - -139, -490, -490, -490, -143, 242, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -137, -490, -490, - -490, -136, -490, 234, -490, -490, -490, -490, -490, -490, + -490, -490, -490, -490, 7, -490, 79, -490, -490, -490, + -490, -490, -490, 39, -490, -163, -490, -490, -490, -62, + -490, -490, -490, 244, -490, -490, -490, -490, 53, 229, + -63, -50, -49, -43, -490, -490, -490, -490, -490, 50, + -490, -490, -490, -490, -490, 52, -136, -490, -490, -490, + -490, -490, -490, -490, -490, -490, -490, -58, -490, -489, + -490, -490, -490, -490, -490, -490, -144, -474, -490, -490, + -490, -490, -146, -490, -490, -490, -490, -490, -490, -490, + -151, -490, -490, -490, -145, 183, -490, -490, -490, -490, + -490, -490, -490, -153, -490, -490, -490, -490, -490, -490, + -490, -490, -490, -490, -129, -490, -490, -490, -126, 225, + -490, -490, -490, -490, -490, -490, -477, -490, -490, -490, + -490, -490, -490, -490, -490, -490, -130, -490, -490, -490, + -125, -490, 197, -490, -59, -490, -490, -490, -490, -490, + -57, -490, -490, -490, -490, -490, -48, -490, -490, -490, + -128, -490, -490, -490, -127, -490, 206, -490, -490, -490, + -490, -490, -490, -490, -490, -490, -490, -162, -490, -490, + -490, -161, 237, -490, -490, -66, -490, -490, -490, -490, + -490, -160, -490, -490, -490, -155, 234, -490, -490, -490, + -490, -490, -490, -490, -490, -490, -490, -490, -165, -490, + -490, -490, -154, -490, 238, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, 79, -490, -490, -490, - -490, -490, -490, -121, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -120, -490, -490, -490, - -490, -490, -490, -490, -490, 86, 213, -490, -490, -490, + -490, -490, -490, -490, -490, -490, -490, 69, -490, -490, + -490, -490, -490, -490, -133, -490, -490, -490, -490, -490, + -490, -490, -490, -490, -490, -490, -490, -134, -490, -490, + -490, -490, -490, -490, -490, -490, 82, 207, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -71, -490, - -490, -490, -213, -490, -490, -228, -490, -490, -490, -490, - -490, -490, -239, -490, -490, -244, -490 + -490, -490, -490, -490, -490, -490, -490, -490, -490, -79, + -490, -490, -490, -223, -490, -490, -234, -490, -490, -490, + -490, -490, -490, -242, -490, -490, -248, -490 }; const short int @@ -3512,118 +3523,119 @@ namespace isc { namespace dhcp { { -1, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 73, 35, 36, 61, 522, 77, - 78, 37, 60, 74, 75, 507, 646, 719, 720, 112, + 78, 37, 60, 74, 75, 507, 648, 722, 723, 112, 39, 62, 85, 86, 87, 289, 41, 63, 113, 114, 115, 116, 117, 118, 119, 120, 296, 43, 64, 137, - 319, 121, 297, 122, 298, 569, 570, 571, 668, 785, - 572, 669, 573, 670, 574, 671, 217, 355, 576, 577, - 578, 579, 123, 307, 595, 596, 597, 598, 124, 309, - 602, 603, 604, 125, 308, 126, 311, 608, 609, 610, - 695, 57, 71, 247, 248, 249, 367, 250, 368, 127, - 312, 617, 618, 619, 620, 621, 622, 623, 624, 128, - 304, 582, 583, 584, 679, 45, 65, 155, 156, 157, - 324, 158, 325, 159, 326, 160, 330, 161, 329, 162, - 163, 129, 305, 586, 587, 588, 682, 53, 69, 218, - 219, 220, 221, 222, 223, 224, 354, 225, 358, 226, - 357, 227, 228, 359, 229, 130, 306, 590, 591, 592, - 685, 55, 70, 236, 237, 238, 239, 240, 363, 241, - 242, 243, 165, 322, 650, 651, 652, 722, 47, 66, - 173, 174, 175, 335, 176, 336, 166, 323, 654, 655, - 656, 725, 49, 67, 185, 186, 187, 339, 188, 189, - 341, 190, 191, 167, 331, 658, 659, 660, 728, 51, - 68, 200, 201, 202, 203, 347, 204, 348, 205, 349, - 206, 350, 207, 351, 208, 346, 168, 332, 662, 731, - 131, 310, 606, 321, 423, 424, 425, 426, 427, 508, - 132, 313, 632, 633, 634, 706, 796, 635, 636, 707, - 637, 638, 133, 134, 315, 641, 642, 643, 713, 644, - 714, 135, 316, 59, 72, 267, 268, 269, 270, 372, - 271, 373, 272, 273, 375, 274, 275, 276, 378, 544, - 277, 379, 278, 279, 280, 281, 282, 384, 551, 283, - 385, 88, 291, 89, 292, 90, 290, 556, 557, 558, - 664, 806, 807, 808, 816, 817, 818, 819, 824, 820, - 822, 834, 835, 836, 840, 841, 843 + 319, 121, 297, 122, 298, 570, 571, 572, 670, 789, + 573, 671, 574, 672, 575, 673, 576, 217, 355, 578, + 579, 580, 581, 123, 307, 597, 598, 599, 600, 124, + 309, 604, 605, 606, 125, 308, 126, 311, 610, 611, + 612, 698, 57, 71, 247, 248, 249, 367, 250, 368, + 127, 312, 619, 620, 621, 622, 623, 624, 625, 626, + 128, 304, 584, 585, 586, 682, 45, 65, 155, 156, + 157, 324, 158, 325, 159, 326, 160, 330, 161, 329, + 162, 163, 129, 305, 588, 589, 590, 685, 53, 69, + 218, 219, 220, 221, 222, 223, 224, 354, 225, 358, + 226, 357, 227, 228, 359, 229, 130, 306, 592, 593, + 594, 688, 55, 70, 236, 237, 238, 239, 240, 363, + 241, 242, 243, 165, 322, 652, 653, 654, 725, 47, + 66, 173, 174, 175, 335, 176, 336, 166, 323, 656, + 657, 658, 728, 49, 67, 185, 186, 187, 339, 188, + 189, 341, 190, 191, 167, 331, 660, 661, 662, 731, + 51, 68, 200, 201, 202, 203, 347, 204, 348, 205, + 349, 206, 350, 207, 351, 208, 346, 168, 332, 664, + 734, 131, 310, 608, 321, 423, 424, 425, 426, 427, + 508, 132, 313, 634, 635, 636, 709, 800, 637, 638, + 710, 639, 640, 133, 134, 315, 643, 644, 645, 716, + 646, 717, 135, 316, 59, 72, 267, 268, 269, 270, + 372, 271, 373, 272, 273, 375, 274, 275, 276, 378, + 544, 277, 379, 278, 279, 280, 281, 282, 384, 551, + 283, 385, 88, 291, 89, 292, 90, 290, 556, 557, + 558, 666, 810, 811, 812, 820, 821, 822, 823, 828, + 824, 826, 838, 839, 840, 844, 845, 847 }; const unsigned short int Dhcp6Parser::yytable_[] = { 84, 184, 151, 150, 171, 182, 198, 216, 232, 246, - 266, 234, 233, 235, 631, 152, 153, 164, 172, 183, - 199, 34, 154, 605, 27, 601, 28, 79, 29, 560, - 138, 593, 244, 245, 561, 562, 563, 564, 565, 566, - 567, 138, 91, 294, 92, 93, 26, 209, 295, 210, - 94, 95, 96, 97, 793, 794, 795, 101, 94, 95, - 96, 97, 98, 99, 100, 101, 139, 210, 140, 211, - 212, 101, 213, 214, 215, 141, 142, 143, 144, 145, - 146, 169, 101, 210, 244, 245, 147, 148, 170, 102, - 103, 104, 105, 149, 210, 317, 101, 147, 38, 625, - 318, 594, 101, 106, 333, 688, 107, 564, 689, 334, - 419, 542, 543, 108, 177, 178, 179, 180, 181, 170, - 40, 109, 110, 192, 42, 111, 44, 193, 194, 195, - 196, 197, 593, 600, 80, 210, 230, 211, 212, 231, - 81, 82, 611, 612, 613, 614, 615, 616, 83, 691, - 337, 83, 692, 76, 83, 338, 30, 31, 32, 33, - 83, 344, 546, 547, 548, 549, 345, 46, 83, 83, - 626, 627, 628, 629, 83, 639, 640, 369, 811, 386, - 812, 813, 370, 317, 387, 83, 665, 676, 663, 550, - 676, 666, 677, 704, 136, 678, 83, 711, 705, 83, - 48, 715, 712, 386, 333, 83, 716, 369, 717, 789, - 337, 284, 792, 344, 825, 801, 752, 601, 802, 826, - 844, 83, 631, 693, 809, 845, 694, 810, 781, 782, - 783, 784, 84, 837, 50, 52, 838, 83, 251, 252, - 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, - 263, 264, 265, 525, 526, 527, 54, 56, 58, 420, - 285, 287, 286, 421, 288, 390, 293, 299, 300, 301, - 151, 150, 302, 422, 303, 171, 314, 320, 184, 327, - 83, 328, 182, 152, 153, 164, 340, 342, 343, 172, - 154, 198, 388, 389, 352, 353, 183, 356, 360, 361, - 216, 362, 399, 364, 232, 199, 366, 234, 233, 235, - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 365, 371, 266, 374, 376, 377, 380, 381, - 382, 383, 391, 392, 393, 394, 396, 397, 398, 404, - 400, 401, 405, 406, 402, 407, 403, 408, 409, 410, - 411, 412, 413, 414, 415, 416, 418, 428, 429, 430, - 431, 432, 433, 434, 435, 436, 437, 438, 440, 441, - 443, 444, 445, 446, 447, 449, 450, 451, 452, 453, - 454, 456, 457, 458, 459, 460, 461, 462, 464, 467, - 468, 471, 465, 472, 470, 474, 477, 473, 475, 478, - 489, 490, 483, 484, 476, 486, 521, 479, 509, 487, - 488, 480, 491, 481, 482, 492, 493, 494, 495, 496, - 497, 498, 499, 500, 501, 513, 510, 502, 503, 504, - 568, 568, 505, 506, 575, 575, 511, 512, 514, 515, - 518, 630, 516, 266, 517, 519, 520, 28, 420, 523, - 524, 581, 421, 528, 529, 530, 585, 531, 589, 607, - 647, 649, 422, 667, 653, 657, 672, 661, 673, 674, - 675, 681, 684, 532, 533, 538, 680, 534, 683, 535, - 686, 687, 545, 690, 697, 696, 536, 698, 699, 700, - 701, 702, 703, 553, 708, 537, 539, 709, 710, 732, - 724, 555, 723, 727, 540, 726, 541, 729, 730, 771, - 733, 735, 736, 737, 738, 762, 552, 763, 768, 769, - 772, 780, 779, 599, 559, 718, 805, 721, 790, 791, - 803, 823, 740, 739, 827, 829, 833, 741, 831, 846, - 395, 554, 742, 417, 755, 756, 580, 743, 757, 758, - 750, 751, 754, 753, 761, 469, 745, 744, 439, 746, - 747, 463, 759, 466, 760, 764, 839, 765, 766, 749, - 786, 787, 748, 788, 797, 774, 798, 442, 799, 800, - 804, 773, 775, 828, 832, 848, 448, 455, 776, 648, - 767, 645, 777, 778, 734, 770, 821, 830, 842, 485, - 847, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 568, 0, 151, 150, 575, 0, - 216, 0, 0, 232, 0, 0, 234, 233, 235, 152, - 153, 164, 0, 246, 0, 0, 154, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 630, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, - 171, 0, 0, 182, 0, 0, 198, 0, 0, 0, - 0, 0, 0, 0, 172, 0, 0, 183, 0, 0, - 199, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 266, 234, 233, 235, 633, 152, 153, 164, 172, 183, + 199, 34, 154, 607, 27, 603, 28, 79, 29, 560, + 138, 595, 244, 245, 561, 562, 563, 564, 565, 566, + 567, 568, 91, 138, 92, 93, 691, 209, 38, 692, + 210, 94, 95, 96, 97, 797, 798, 799, 101, 94, + 95, 96, 97, 98, 99, 100, 101, 139, 210, 140, + 211, 212, 101, 213, 214, 215, 141, 142, 143, 144, + 145, 146, 169, 101, 210, 244, 245, 147, 148, 170, + 102, 103, 104, 105, 149, 210, 83, 101, 26, 627, + 147, 596, 40, 101, 106, 294, 694, 107, 565, 695, + 295, 419, 542, 543, 108, 177, 178, 179, 180, 181, + 170, 42, 109, 110, 192, 44, 111, 46, 193, 194, + 195, 196, 197, 595, 602, 80, 210, 230, 211, 212, + 231, 81, 82, 613, 614, 615, 616, 617, 618, 317, + 696, 333, 83, 697, 318, 83, 334, 30, 31, 32, + 33, 83, 337, 546, 547, 548, 549, 338, 48, 83, + 83, 628, 629, 630, 631, 83, 641, 642, 344, 815, + 369, 816, 817, 345, 386, 370, 83, 317, 667, 387, + 550, 679, 665, 668, 679, 76, 680, 83, 707, 681, + 83, 813, 841, 708, 814, 842, 83, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 756, + 603, 714, 83, 718, 386, 633, 715, 136, 719, 720, + 333, 369, 84, 50, 285, 793, 796, 52, 83, 251, + 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, + 262, 263, 264, 265, 54, 337, 344, 829, 56, 420, + 805, 806, 830, 421, 848, 785, 786, 787, 788, 849, + 151, 150, 58, 422, 284, 171, 286, 287, 184, 288, + 353, 83, 182, 152, 153, 164, 525, 526, 527, 172, + 154, 198, 388, 389, 293, 299, 183, 300, 301, 302, + 216, 303, 314, 327, 232, 199, 362, 234, 233, 235, + 320, 328, 340, 342, 343, 399, 356, 360, 390, 352, + 364, 366, 361, 365, 266, 371, 374, 376, 377, 380, + 381, 382, 383, 391, 392, 393, 394, 396, 397, 398, + 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, + 410, 411, 412, 413, 415, 414, 416, 418, 428, 429, + 430, 431, 432, 433, 434, 435, 436, 437, 438, 440, + 441, 443, 444, 445, 446, 447, 449, 450, 451, 452, + 453, 454, 456, 457, 458, 459, 460, 461, 464, 462, + 467, 465, 468, 471, 472, 473, 470, 474, 475, 476, + 489, 490, 477, 478, 479, 480, 483, 481, 482, 484, + 486, 487, 513, 514, 488, 491, 492, 493, 494, 495, + 496, 497, 498, 499, 500, 501, 510, 515, 502, 503, + 569, 569, 504, 505, 577, 577, 506, 509, 511, 512, + 518, 632, 516, 266, 517, 519, 28, 583, 420, 587, + 545, 591, 421, 609, 649, 520, 651, 523, 524, 655, + 659, 674, 422, 669, 675, 676, 677, 663, 678, 683, + 684, 686, 687, 690, 528, 538, 529, 530, 689, 693, + 699, 700, 726, 701, 702, 703, 704, 705, 706, 531, + 711, 712, 713, 553, 727, 729, 730, 532, 533, 733, + 732, 736, 738, 735, 739, 740, 534, 741, 535, 536, + 766, 767, 772, 555, 773, 775, 776, 784, 537, 783, + 521, 827, 794, 539, 795, 540, 807, 809, 831, 541, + 552, 833, 837, 835, 721, 724, 850, 601, 395, 742, + 554, 559, 743, 747, 745, 582, 417, 754, 755, 758, + 744, 746, 469, 757, 765, 749, 748, 751, 439, 463, + 750, 752, 753, 759, 777, 778, 760, 761, 782, 762, + 780, 763, 466, 779, 442, 764, 768, 781, 448, 650, + 769, 771, 770, 790, 774, 791, 792, 647, 737, 801, + 825, 455, 802, 485, 803, 834, 804, 808, 843, 846, + 851, 0, 0, 0, 0, 832, 836, 0, 0, 852, + 0, 0, 0, 0, 0, 0, 0, 569, 0, 151, + 150, 577, 0, 216, 0, 0, 232, 0, 0, 234, + 233, 235, 152, 153, 164, 0, 246, 0, 0, 154, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 632, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 184, 171, 0, 0, 182, 0, 0, 198, + 0, 0, 0, 0, 0, 0, 0, 172, 0, 0, + 183, 0, 0, 199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 814, 0, 0, 0, - 815, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 814, 0, 0, 0, 815 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 818, 0, 0, 0, 819, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 818, 0, 0, + 0, 819 }; const short int @@ -3632,226 +3644,229 @@ namespace isc { namespace dhcp { 62, 67, 65, 65, 66, 67, 68, 69, 70, 71, 72, 70, 70, 70, 503, 65, 65, 65, 66, 67, 68, 14, 65, 500, 5, 499, 7, 10, 9, 15, - 7, 67, 73, 74, 20, 21, 22, 23, 24, 25, - 26, 7, 11, 3, 13, 14, 0, 15, 8, 35, - 27, 28, 29, 30, 83, 84, 85, 34, 27, 28, - 29, 30, 31, 32, 33, 34, 43, 35, 45, 37, - 38, 34, 40, 41, 42, 52, 53, 54, 55, 56, - 57, 44, 34, 35, 73, 74, 63, 64, 51, 58, - 59, 60, 61, 70, 35, 3, 34, 63, 7, 15, - 8, 137, 34, 72, 3, 3, 75, 23, 6, 8, - 62, 110, 111, 82, 46, 47, 48, 49, 50, 51, - 7, 90, 91, 61, 7, 94, 7, 65, 66, 67, - 68, 69, 67, 68, 117, 35, 36, 37, 38, 39, - 123, 124, 76, 77, 78, 79, 80, 81, 137, 3, - 3, 137, 6, 137, 137, 8, 137, 138, 139, 140, - 137, 3, 113, 114, 115, 116, 8, 7, 137, 137, - 86, 87, 88, 89, 137, 92, 93, 3, 119, 3, - 121, 122, 8, 3, 8, 137, 3, 3, 8, 140, - 3, 8, 8, 3, 12, 8, 137, 3, 8, 137, - 7, 3, 8, 3, 3, 137, 8, 3, 8, 8, - 3, 6, 8, 3, 3, 8, 693, 691, 8, 8, - 3, 137, 711, 3, 3, 8, 6, 6, 16, 17, - 18, 19, 294, 3, 7, 7, 6, 137, 95, 96, + 7, 68, 74, 75, 20, 21, 22, 23, 24, 25, + 26, 27, 11, 7, 13, 14, 3, 15, 7, 6, + 36, 28, 29, 30, 31, 84, 85, 86, 35, 28, + 29, 30, 31, 32, 33, 34, 35, 44, 36, 46, + 38, 39, 35, 41, 42, 43, 53, 54, 55, 56, + 57, 58, 45, 35, 36, 74, 75, 64, 65, 52, + 59, 60, 61, 62, 71, 36, 138, 35, 0, 15, + 64, 138, 7, 35, 73, 3, 3, 76, 24, 6, + 8, 63, 111, 112, 83, 47, 48, 49, 50, 51, + 52, 7, 91, 92, 62, 7, 95, 7, 66, 67, + 68, 69, 70, 68, 69, 118, 36, 37, 38, 39, + 40, 124, 125, 77, 78, 79, 80, 81, 82, 3, + 3, 3, 138, 6, 8, 138, 8, 138, 139, 140, + 141, 138, 3, 114, 115, 116, 117, 8, 7, 138, + 138, 87, 88, 89, 90, 138, 93, 94, 3, 120, + 3, 122, 123, 8, 3, 8, 138, 3, 3, 8, + 141, 3, 8, 8, 3, 138, 8, 138, 3, 8, + 138, 3, 3, 8, 6, 6, 138, 126, 127, 128, + 129, 130, 131, 132, 133, 134, 135, 136, 137, 696, + 694, 3, 138, 3, 3, 714, 8, 12, 8, 8, + 3, 3, 294, 7, 3, 8, 8, 7, 138, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 108, 109, 449, 450, 451, 7, 7, 7, 321, - 3, 8, 4, 321, 3, 137, 4, 4, 4, 4, - 333, 333, 4, 321, 4, 337, 4, 8, 344, 4, - 137, 4, 344, 333, 333, 333, 4, 4, 4, 337, - 333, 353, 285, 286, 8, 3, 344, 4, 4, 8, - 362, 3, 138, 4, 366, 353, 3, 366, 366, 366, - 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 8, 4, 386, 4, 4, 4, 4, 4, + 107, 108, 109, 110, 7, 3, 3, 3, 7, 321, + 8, 8, 8, 321, 3, 16, 17, 18, 19, 8, + 333, 333, 7, 321, 6, 337, 4, 8, 344, 3, + 3, 138, 344, 333, 333, 333, 449, 450, 451, 337, + 333, 353, 285, 286, 4, 4, 344, 4, 4, 4, + 362, 4, 4, 4, 366, 353, 3, 366, 366, 366, + 8, 4, 4, 4, 4, 139, 4, 4, 138, 8, + 4, 3, 8, 8, 386, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 138, 138, 4, 4, 138, 4, 138, 4, 4, 4, - 4, 4, 4, 138, 4, 4, 4, 4, 4, 4, - 4, 4, 138, 140, 4, 4, 4, 4, 4, 4, - 4, 138, 4, 138, 138, 4, 4, 4, 4, 4, - 4, 4, 4, 138, 4, 4, 4, 140, 4, 4, - 4, 4, 140, 4, 140, 4, 4, 138, 138, 4, - 393, 394, 4, 4, 138, 4, 441, 140, 8, 7, - 7, 140, 7, 140, 140, 7, 7, 5, 5, 5, - 5, 5, 5, 5, 5, 137, 3, 7, 7, 7, - 492, 493, 7, 5, 492, 493, 5, 5, 137, 137, - 5, 503, 137, 505, 137, 7, 137, 7, 510, 137, - 137, 7, 510, 137, 137, 137, 7, 137, 7, 7, - 4, 7, 510, 8, 7, 7, 4, 71, 4, 4, - 4, 3, 3, 137, 137, 468, 6, 137, 6, 137, - 6, 3, 112, 6, 3, 6, 137, 4, 4, 4, - 4, 4, 4, 486, 4, 137, 137, 4, 4, 8, - 3, 118, 6, 3, 137, 6, 137, 6, 3, 6, - 4, 4, 4, 4, 4, 4, 137, 4, 4, 4, - 3, 5, 4, 498, 491, 137, 7, 137, 8, 8, - 8, 4, 138, 140, 4, 4, 7, 140, 5, 4, - 294, 487, 138, 317, 138, 138, 493, 676, 138, 138, - 688, 691, 697, 695, 704, 369, 681, 679, 333, 682, - 684, 362, 138, 366, 138, 138, 120, 138, 138, 687, - 137, 137, 685, 137, 137, 724, 137, 337, 137, 137, - 137, 722, 725, 138, 137, 137, 344, 353, 727, 510, - 711, 505, 728, 730, 665, 715, 809, 825, 837, 386, - 844, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 676, -1, 679, 679, 676, -1, - 682, -1, -1, 685, -1, -1, 685, 685, 685, 679, - 679, 679, -1, 695, -1, -1, 679, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 711, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 725, - 722, -1, -1, 725, -1, -1, 728, -1, -1, -1, - -1, -1, -1, -1, 722, -1, -1, 725, -1, -1, - 728, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 139, 139, 139, 139, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 139, 4, 4, 4, 4, + 4, 4, 4, 139, 141, 4, 4, 4, 4, 4, + 4, 4, 139, 4, 139, 139, 4, 4, 4, 4, + 4, 4, 4, 4, 139, 4, 4, 4, 4, 141, + 4, 141, 4, 4, 4, 139, 141, 4, 139, 139, + 393, 394, 4, 4, 141, 141, 4, 141, 141, 4, + 4, 7, 138, 138, 7, 7, 7, 7, 5, 5, + 5, 5, 5, 5, 5, 5, 3, 138, 7, 7, + 492, 493, 7, 7, 492, 493, 5, 8, 5, 5, + 5, 503, 138, 505, 138, 7, 7, 7, 510, 7, + 113, 7, 510, 7, 4, 138, 7, 138, 138, 7, + 7, 4, 510, 8, 4, 4, 4, 72, 4, 6, + 3, 6, 3, 3, 138, 468, 138, 138, 6, 6, + 6, 3, 6, 4, 4, 4, 4, 4, 4, 138, + 4, 4, 4, 486, 3, 6, 3, 138, 138, 3, + 6, 4, 4, 8, 4, 4, 138, 4, 138, 138, + 4, 4, 4, 119, 4, 6, 3, 5, 138, 4, + 441, 4, 8, 138, 8, 138, 8, 7, 4, 138, + 138, 4, 7, 5, 138, 138, 4, 498, 294, 139, + 487, 491, 141, 679, 141, 493, 317, 691, 694, 700, + 139, 139, 369, 698, 707, 684, 682, 687, 333, 362, + 685, 688, 690, 139, 725, 727, 139, 139, 733, 139, + 730, 139, 366, 728, 337, 139, 139, 731, 344, 510, + 139, 714, 139, 138, 718, 138, 138, 505, 667, 138, + 813, 353, 138, 386, 138, 829, 138, 138, 121, 841, + 848, -1, -1, -1, -1, 139, 138, -1, -1, 138, + -1, -1, -1, -1, -1, -1, -1, 679, -1, 682, + 682, 679, -1, 685, -1, -1, 688, -1, -1, 688, + 688, 688, 682, 682, 682, -1, 698, -1, -1, 682, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 714, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 728, 725, -1, -1, 728, -1, -1, 731, + -1, -1, -1, -1, -1, -1, -1, 725, -1, -1, + 728, -1, -1, 731, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 808, -1, -1, -1, - 808, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 825, -1, -1, -1, 825 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 812, -1, -1, -1, 812, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 829, -1, -1, + -1, 829 }; const unsigned short int Dhcp6Parser::yystos_[] = { - 0, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 151, 152, 153, 154, 0, 5, 7, 9, - 137, 138, 139, 140, 155, 156, 157, 162, 7, 171, - 7, 177, 7, 188, 7, 256, 7, 319, 7, 333, - 7, 350, 7, 278, 7, 302, 7, 232, 7, 404, - 163, 158, 172, 178, 189, 257, 320, 334, 351, 279, - 303, 233, 405, 155, 164, 165, 137, 160, 161, 10, - 117, 123, 124, 137, 170, 173, 174, 175, 432, 434, - 436, 11, 13, 14, 27, 28, 29, 30, 31, 32, - 33, 34, 58, 59, 60, 61, 72, 75, 82, 90, - 91, 94, 170, 179, 180, 181, 182, 183, 184, 185, - 186, 192, 194, 213, 219, 224, 226, 240, 250, 272, - 296, 371, 381, 393, 394, 402, 12, 190, 7, 43, - 45, 52, 53, 54, 55, 56, 57, 63, 64, 70, - 170, 181, 182, 183, 184, 258, 259, 260, 262, 264, - 266, 268, 270, 271, 296, 313, 327, 344, 367, 44, - 51, 170, 296, 321, 322, 323, 325, 46, 47, 48, - 49, 50, 170, 296, 325, 335, 336, 337, 339, 340, - 342, 343, 61, 65, 66, 67, 68, 69, 170, 296, - 352, 353, 354, 355, 357, 359, 361, 363, 365, 15, - 35, 37, 38, 40, 41, 42, 170, 207, 280, 281, - 282, 283, 284, 285, 286, 288, 290, 292, 293, 295, - 36, 39, 170, 207, 284, 290, 304, 305, 306, 307, - 308, 310, 311, 312, 73, 74, 170, 234, 235, 236, - 238, 95, 96, 97, 98, 99, 100, 101, 102, 103, - 104, 105, 106, 107, 108, 109, 170, 406, 407, 408, - 409, 411, 413, 414, 416, 417, 418, 421, 423, 424, - 425, 426, 427, 430, 6, 3, 4, 8, 3, 176, - 437, 433, 435, 4, 3, 8, 187, 193, 195, 4, - 4, 4, 4, 4, 251, 273, 297, 214, 225, 220, - 372, 227, 241, 382, 4, 395, 403, 3, 8, 191, - 8, 374, 314, 328, 261, 263, 265, 4, 4, 269, - 267, 345, 368, 3, 8, 324, 326, 3, 8, 338, - 4, 341, 4, 4, 3, 8, 366, 356, 358, 360, - 362, 364, 8, 3, 287, 208, 4, 291, 289, 294, - 4, 8, 3, 309, 4, 8, 3, 237, 239, 3, - 8, 4, 410, 412, 4, 415, 4, 4, 419, 422, - 4, 4, 4, 4, 428, 431, 3, 8, 155, 155, - 137, 4, 4, 4, 4, 174, 4, 4, 4, 138, - 138, 138, 138, 138, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 138, 4, 4, 180, 4, 62, - 170, 207, 296, 375, 376, 377, 378, 379, 4, 4, - 4, 4, 4, 138, 140, 4, 4, 4, 4, 259, - 4, 4, 322, 4, 138, 4, 138, 138, 336, 4, - 4, 4, 4, 4, 4, 354, 4, 4, 138, 4, - 4, 4, 140, 282, 4, 140, 306, 4, 4, 235, - 140, 4, 4, 138, 4, 138, 138, 4, 4, 140, - 140, 140, 140, 4, 4, 407, 4, 7, 7, 155, - 155, 7, 7, 7, 5, 5, 5, 5, 5, 5, - 5, 5, 7, 7, 7, 7, 5, 166, 380, 8, - 3, 5, 5, 137, 137, 137, 137, 137, 5, 7, - 137, 157, 159, 137, 137, 166, 166, 166, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 155, 137, - 137, 137, 110, 111, 420, 112, 113, 114, 115, 116, - 140, 429, 137, 155, 179, 118, 438, 439, 440, 190, - 15, 20, 21, 22, 23, 24, 25, 26, 170, 196, - 197, 198, 201, 203, 205, 207, 209, 210, 211, 212, - 196, 7, 252, 253, 254, 7, 274, 275, 276, 7, - 298, 299, 300, 67, 137, 215, 216, 217, 218, 164, - 68, 217, 221, 222, 223, 266, 373, 7, 228, 229, - 230, 76, 77, 78, 79, 80, 81, 242, 243, 244, - 245, 246, 247, 248, 249, 15, 86, 87, 88, 89, - 170, 209, 383, 384, 385, 388, 389, 391, 392, 92, - 93, 396, 397, 398, 400, 406, 167, 4, 377, 7, - 315, 316, 317, 7, 329, 330, 331, 7, 346, 347, - 348, 71, 369, 8, 441, 3, 8, 8, 199, 202, - 204, 206, 4, 4, 4, 4, 3, 8, 8, 255, - 6, 3, 277, 6, 3, 301, 6, 3, 3, 6, - 6, 3, 6, 3, 6, 231, 6, 3, 4, 4, - 4, 4, 4, 4, 3, 8, 386, 390, 4, 4, - 4, 3, 8, 399, 401, 3, 8, 8, 137, 168, - 169, 137, 318, 6, 3, 332, 6, 3, 349, 6, - 3, 370, 8, 4, 439, 4, 4, 4, 4, 140, - 138, 140, 138, 197, 258, 254, 280, 276, 304, 300, - 216, 222, 266, 234, 230, 138, 138, 138, 138, 138, - 138, 243, 4, 4, 138, 138, 138, 384, 4, 4, - 397, 6, 3, 321, 317, 335, 331, 352, 348, 4, - 5, 16, 17, 18, 19, 200, 137, 137, 137, 8, - 8, 8, 8, 83, 84, 85, 387, 137, 137, 137, - 137, 8, 8, 8, 137, 7, 442, 443, 444, 3, - 6, 119, 121, 122, 170, 207, 445, 446, 447, 448, - 450, 443, 451, 4, 449, 3, 8, 4, 138, 4, - 446, 5, 137, 7, 452, 453, 454, 3, 6, 120, - 455, 456, 453, 457, 3, 8, 4, 456, 137 + 0, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 143, 144, 145, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 0, 5, 7, 9, + 138, 139, 140, 141, 156, 157, 158, 163, 7, 172, + 7, 178, 7, 189, 7, 258, 7, 321, 7, 335, + 7, 352, 7, 280, 7, 304, 7, 234, 7, 406, + 164, 159, 173, 179, 190, 259, 322, 336, 353, 281, + 305, 235, 407, 156, 165, 166, 138, 161, 162, 10, + 118, 124, 125, 138, 171, 174, 175, 176, 434, 436, + 438, 11, 13, 14, 28, 29, 30, 31, 32, 33, + 34, 35, 59, 60, 61, 62, 73, 76, 83, 91, + 92, 95, 171, 180, 181, 182, 183, 184, 185, 186, + 187, 193, 195, 215, 221, 226, 228, 242, 252, 274, + 298, 373, 383, 395, 396, 404, 12, 191, 7, 44, + 46, 53, 54, 55, 56, 57, 58, 64, 65, 71, + 171, 182, 183, 184, 185, 260, 261, 262, 264, 266, + 268, 270, 272, 273, 298, 315, 329, 346, 369, 45, + 52, 171, 298, 323, 324, 325, 327, 47, 48, 49, + 50, 51, 171, 298, 327, 337, 338, 339, 341, 342, + 344, 345, 62, 66, 67, 68, 69, 70, 171, 298, + 354, 355, 356, 357, 359, 361, 363, 365, 367, 15, + 36, 38, 39, 41, 42, 43, 171, 209, 282, 283, + 284, 285, 286, 287, 288, 290, 292, 294, 295, 297, + 37, 40, 171, 209, 286, 292, 306, 307, 308, 309, + 310, 312, 313, 314, 74, 75, 171, 236, 237, 238, + 240, 96, 97, 98, 99, 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, 110, 171, 408, 409, 410, + 411, 413, 415, 416, 418, 419, 420, 423, 425, 426, + 427, 428, 429, 432, 6, 3, 4, 8, 3, 177, + 439, 435, 437, 4, 3, 8, 188, 194, 196, 4, + 4, 4, 4, 4, 253, 275, 299, 216, 227, 222, + 374, 229, 243, 384, 4, 397, 405, 3, 8, 192, + 8, 376, 316, 330, 263, 265, 267, 4, 4, 271, + 269, 347, 370, 3, 8, 326, 328, 3, 8, 340, + 4, 343, 4, 4, 3, 8, 368, 358, 360, 362, + 364, 366, 8, 3, 289, 210, 4, 293, 291, 296, + 4, 8, 3, 311, 4, 8, 3, 239, 241, 3, + 8, 4, 412, 414, 4, 417, 4, 4, 421, 424, + 4, 4, 4, 4, 430, 433, 3, 8, 156, 156, + 138, 4, 4, 4, 4, 175, 4, 4, 4, 139, + 139, 139, 139, 139, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 139, 4, 4, 181, 4, 63, + 171, 209, 298, 377, 378, 379, 380, 381, 4, 4, + 4, 4, 4, 139, 141, 4, 4, 4, 4, 261, + 4, 4, 324, 4, 139, 4, 139, 139, 338, 4, + 4, 4, 4, 4, 4, 356, 4, 4, 139, 4, + 4, 4, 141, 284, 4, 141, 308, 4, 4, 237, + 141, 4, 4, 139, 4, 139, 139, 4, 4, 141, + 141, 141, 141, 4, 4, 409, 4, 7, 7, 156, + 156, 7, 7, 7, 5, 5, 5, 5, 5, 5, + 5, 5, 7, 7, 7, 7, 5, 167, 382, 8, + 3, 5, 5, 138, 138, 138, 138, 138, 5, 7, + 138, 158, 160, 138, 138, 167, 167, 167, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 156, 138, + 138, 138, 111, 112, 422, 113, 114, 115, 116, 117, + 141, 431, 138, 156, 180, 119, 440, 441, 442, 191, + 15, 20, 21, 22, 23, 24, 25, 26, 27, 171, + 197, 198, 199, 202, 204, 206, 208, 209, 211, 212, + 213, 214, 197, 7, 254, 255, 256, 7, 276, 277, + 278, 7, 300, 301, 302, 68, 138, 217, 218, 219, + 220, 165, 69, 219, 223, 224, 225, 268, 375, 7, + 230, 231, 232, 77, 78, 79, 80, 81, 82, 244, + 245, 246, 247, 248, 249, 250, 251, 15, 87, 88, + 89, 90, 171, 211, 385, 386, 387, 390, 391, 393, + 394, 93, 94, 398, 399, 400, 402, 408, 168, 4, + 379, 7, 317, 318, 319, 7, 331, 332, 333, 7, + 348, 349, 350, 72, 371, 8, 443, 3, 8, 8, + 200, 203, 205, 207, 4, 4, 4, 4, 4, 3, + 8, 8, 257, 6, 3, 279, 6, 3, 303, 6, + 3, 3, 6, 6, 3, 6, 3, 6, 233, 6, + 3, 4, 4, 4, 4, 4, 4, 3, 8, 388, + 392, 4, 4, 4, 3, 8, 401, 403, 3, 8, + 8, 138, 169, 170, 138, 320, 6, 3, 334, 6, + 3, 351, 6, 3, 372, 8, 4, 441, 4, 4, + 4, 4, 139, 141, 139, 141, 139, 198, 260, 256, + 282, 278, 306, 302, 218, 224, 268, 236, 232, 139, + 139, 139, 139, 139, 139, 245, 4, 4, 139, 139, + 139, 386, 4, 4, 399, 6, 3, 323, 319, 337, + 333, 354, 350, 4, 5, 16, 17, 18, 19, 201, + 138, 138, 138, 8, 8, 8, 8, 84, 85, 86, + 389, 138, 138, 138, 138, 8, 8, 8, 138, 7, + 444, 445, 446, 3, 6, 120, 122, 123, 171, 209, + 447, 448, 449, 450, 452, 445, 453, 4, 451, 3, + 8, 4, 139, 4, 448, 5, 138, 7, 454, 455, + 456, 3, 6, 121, 457, 458, 455, 459, 3, 8, + 4, 458, 138 }; const unsigned short int Dhcp6Parser::yyr1_[] = { - 0, 141, 143, 142, 144, 142, 145, 142, 146, 142, - 147, 142, 148, 142, 149, 142, 150, 142, 151, 142, - 152, 142, 153, 142, 154, 142, 155, 155, 155, 155, - 155, 155, 155, 156, 158, 157, 159, 160, 160, 161, - 161, 163, 162, 164, 164, 165, 165, 167, 166, 168, - 168, 169, 169, 170, 172, 171, 173, 173, 174, 174, - 174, 174, 174, 176, 175, 178, 177, 179, 179, 180, - 180, 180, 180, 180, 180, 180, 180, 180, 180, 180, - 180, 180, 180, 180, 180, 180, 180, 180, 180, 180, - 180, 181, 182, 183, 184, 185, 187, 186, 189, 188, - 191, 190, 193, 192, 195, 194, 196, 196, 197, 197, - 197, 197, 197, 197, 197, 197, 197, 197, 199, 198, - 200, 200, 200, 200, 202, 201, 204, 203, 206, 205, - 208, 207, 209, 210, 211, 212, 214, 213, 215, 215, - 216, 216, 217, 218, 220, 219, 221, 221, 222, 222, - 223, 225, 224, 227, 226, 228, 228, 229, 229, 231, - 230, 233, 232, 234, 234, 234, 235, 235, 237, 236, - 239, 238, 241, 240, 242, 242, 243, 243, 243, 243, - 243, 243, 244, 245, 246, 247, 248, 249, 251, 250, - 252, 252, 253, 253, 255, 254, 257, 256, 258, 258, - 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, - 259, 259, 259, 259, 259, 259, 259, 261, 260, 263, - 262, 265, 264, 267, 266, 269, 268, 270, 271, 273, - 272, 274, 274, 275, 275, 277, 276, 279, 278, 280, - 280, 281, 281, 282, 282, 282, 282, 282, 282, 282, - 282, 283, 284, 285, 287, 286, 289, 288, 291, 290, - 292, 294, 293, 295, 297, 296, 298, 298, 299, 299, - 301, 300, 303, 302, 304, 304, 305, 305, 306, 306, - 306, 306, 306, 306, 307, 309, 308, 310, 311, 312, - 314, 313, 315, 315, 316, 316, 318, 317, 320, 319, - 321, 321, 322, 322, 322, 322, 324, 323, 326, 325, - 328, 327, 329, 329, 330, 330, 332, 331, 334, 333, - 335, 335, 336, 336, 336, 336, 336, 336, 336, 336, - 338, 337, 339, 341, 340, 342, 343, 345, 344, 346, - 346, 347, 347, 349, 348, 351, 350, 352, 352, 353, - 353, 354, 354, 354, 354, 354, 354, 354, 354, 356, - 355, 358, 357, 360, 359, 362, 361, 364, 363, 366, - 365, 368, 367, 370, 369, 372, 371, 373, 373, 374, - 266, 375, 375, 376, 376, 377, 377, 377, 377, 378, - 380, 379, 382, 381, 383, 383, 384, 384, 384, 384, - 384, 384, 384, 386, 385, 387, 387, 387, 388, 390, - 389, 391, 392, 393, 395, 394, 396, 396, 397, 397, - 399, 398, 401, 400, 403, 402, 405, 404, 406, 406, - 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, - 407, 407, 407, 407, 407, 407, 408, 410, 409, 412, - 411, 413, 415, 414, 416, 417, 419, 418, 420, 420, - 422, 421, 423, 424, 425, 426, 428, 427, 429, 429, - 429, 429, 429, 431, 430, 433, 432, 435, 434, 437, - 436, 438, 438, 439, 441, 440, 442, 442, 444, 443, - 445, 445, 446, 446, 446, 446, 446, 447, 449, 448, - 451, 450, 452, 452, 454, 453, 455, 455, 457, 456 + 0, 142, 144, 143, 145, 143, 146, 143, 147, 143, + 148, 143, 149, 143, 150, 143, 151, 143, 152, 143, + 153, 143, 154, 143, 155, 143, 156, 156, 156, 156, + 156, 156, 156, 157, 159, 158, 160, 161, 161, 162, + 162, 164, 163, 165, 165, 166, 166, 168, 167, 169, + 169, 170, 170, 171, 173, 172, 174, 174, 175, 175, + 175, 175, 175, 177, 176, 179, 178, 180, 180, 181, + 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, + 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, + 181, 182, 183, 184, 185, 186, 188, 187, 190, 189, + 192, 191, 194, 193, 196, 195, 197, 197, 198, 198, + 198, 198, 198, 198, 198, 198, 198, 198, 198, 200, + 199, 201, 201, 201, 201, 203, 202, 205, 204, 207, + 206, 208, 210, 209, 211, 212, 213, 214, 216, 215, + 217, 217, 218, 218, 219, 220, 222, 221, 223, 223, + 224, 224, 225, 227, 226, 229, 228, 230, 230, 231, + 231, 233, 232, 235, 234, 236, 236, 236, 237, 237, + 239, 238, 241, 240, 243, 242, 244, 244, 245, 245, + 245, 245, 245, 245, 246, 247, 248, 249, 250, 251, + 253, 252, 254, 254, 255, 255, 257, 256, 259, 258, + 260, 260, 261, 261, 261, 261, 261, 261, 261, 261, + 261, 261, 261, 261, 261, 261, 261, 261, 261, 263, + 262, 265, 264, 267, 266, 269, 268, 271, 270, 272, + 273, 275, 274, 276, 276, 277, 277, 279, 278, 281, + 280, 282, 282, 283, 283, 284, 284, 284, 284, 284, + 284, 284, 284, 285, 286, 287, 289, 288, 291, 290, + 293, 292, 294, 296, 295, 297, 299, 298, 300, 300, + 301, 301, 303, 302, 305, 304, 306, 306, 307, 307, + 308, 308, 308, 308, 308, 308, 309, 311, 310, 312, + 313, 314, 316, 315, 317, 317, 318, 318, 320, 319, + 322, 321, 323, 323, 324, 324, 324, 324, 326, 325, + 328, 327, 330, 329, 331, 331, 332, 332, 334, 333, + 336, 335, 337, 337, 338, 338, 338, 338, 338, 338, + 338, 338, 340, 339, 341, 343, 342, 344, 345, 347, + 346, 348, 348, 349, 349, 351, 350, 353, 352, 354, + 354, 355, 355, 356, 356, 356, 356, 356, 356, 356, + 356, 358, 357, 360, 359, 362, 361, 364, 363, 366, + 365, 368, 367, 370, 369, 372, 371, 374, 373, 375, + 375, 376, 268, 377, 377, 378, 378, 379, 379, 379, + 379, 380, 382, 381, 384, 383, 385, 385, 386, 386, + 386, 386, 386, 386, 386, 388, 387, 389, 389, 389, + 390, 392, 391, 393, 394, 395, 397, 396, 398, 398, + 399, 399, 401, 400, 403, 402, 405, 404, 407, 406, + 408, 408, 409, 409, 409, 409, 409, 409, 409, 409, + 409, 409, 409, 409, 409, 409, 409, 409, 410, 412, + 411, 414, 413, 415, 417, 416, 418, 419, 421, 420, + 422, 422, 424, 423, 425, 426, 427, 428, 430, 429, + 431, 431, 431, 431, 431, 433, 432, 435, 434, 437, + 436, 439, 438, 440, 440, 441, 443, 442, 444, 444, + 446, 445, 447, 447, 448, 448, 448, 448, 448, 449, + 451, 450, 453, 452, 454, 454, 456, 455, 457, 457, + 459, 458 }; const unsigned char @@ -3868,46 +3883,47 @@ namespace isc { namespace dhcp { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 0, 6, 0, 4, 0, 4, 0, 6, 0, 6, 1, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 0, 4, - 1, 1, 1, 1, 0, 4, 0, 4, 0, 4, - 0, 4, 3, 3, 3, 3, 0, 6, 1, 3, - 1, 1, 1, 1, 0, 6, 1, 3, 1, 1, - 1, 0, 6, 0, 6, 0, 1, 1, 3, 0, - 4, 0, 4, 1, 3, 1, 1, 1, 0, 4, - 0, 4, 0, 6, 1, 3, 1, 1, 1, 1, - 1, 1, 3, 3, 3, 3, 3, 3, 0, 6, - 0, 1, 1, 3, 0, 4, 0, 4, 1, 3, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 4, 0, - 4, 0, 4, 0, 4, 0, 4, 3, 3, 0, - 6, 0, 1, 1, 3, 0, 4, 0, 4, 0, - 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 3, 1, 0, 4, 0, 4, 0, 4, - 1, 0, 4, 3, 0, 6, 0, 1, 1, 3, - 0, 4, 0, 4, 0, 1, 1, 3, 1, 1, - 1, 1, 1, 1, 1, 0, 4, 1, 1, 3, - 0, 6, 0, 1, 1, 3, 0, 4, 0, 4, - 1, 3, 1, 1, 1, 1, 0, 4, 0, 4, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 4, 1, 1, 1, 1, 0, 4, 0, 4, 0, + 4, 3, 0, 4, 3, 3, 3, 3, 0, 6, + 1, 3, 1, 1, 1, 1, 0, 6, 1, 3, + 1, 1, 1, 0, 6, 0, 6, 0, 1, 1, + 3, 0, 4, 0, 4, 1, 3, 1, 1, 1, + 0, 4, 0, 4, 0, 6, 1, 3, 1, 1, + 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 0, 6, 0, 1, 1, 3, 0, 4, 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 4, 3, 0, 4, 3, 3, 0, 6, 0, - 1, 1, 3, 0, 4, 0, 4, 0, 1, 1, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, - 4, 0, 6, 0, 4, 0, 6, 1, 3, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 4, 0, 4, 0, 4, 0, 4, 0, 4, 3, + 3, 0, 6, 0, 1, 1, 3, 0, 4, 0, 4, 0, 1, 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, 3, 0, - 4, 3, 3, 3, 0, 6, 1, 3, 1, 1, - 0, 4, 0, 4, 0, 6, 0, 4, 1, 3, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 3, 0, 4, 0, - 4, 3, 0, 4, 3, 3, 0, 4, 1, 1, - 0, 4, 3, 3, 3, 3, 0, 4, 1, 1, - 1, 1, 1, 0, 4, 0, 4, 0, 4, 0, - 6, 1, 3, 1, 0, 6, 1, 3, 0, 4, - 1, 3, 1, 1, 1, 1, 1, 3, 0, 4, - 0, 6, 1, 3, 0, 4, 1, 3, 0, 4 + 1, 1, 1, 1, 3, 1, 0, 4, 0, 4, + 0, 4, 1, 0, 4, 3, 0, 6, 0, 1, + 1, 3, 0, 4, 0, 4, 0, 1, 1, 3, + 1, 1, 1, 1, 1, 1, 1, 0, 4, 1, + 1, 3, 0, 6, 0, 1, 1, 3, 0, 4, + 0, 4, 1, 3, 1, 1, 1, 1, 0, 4, + 0, 4, 0, 6, 0, 1, 1, 3, 0, 4, + 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 4, 3, 0, 4, 3, 3, 0, + 6, 0, 1, 1, 3, 0, 4, 0, 4, 0, + 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 6, 0, 4, 0, 6, 1, + 3, 0, 4, 0, 1, 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, + 3, 0, 4, 3, 3, 3, 0, 6, 1, 3, + 1, 1, 0, 4, 0, 4, 0, 6, 0, 4, + 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 0, + 4, 0, 4, 3, 0, 4, 3, 3, 0, 4, + 1, 1, 0, 4, 3, 3, 3, 3, 0, 4, + 1, 1, 1, 1, 1, 0, 4, 0, 4, 0, + 4, 0, 6, 1, 3, 1, 0, 6, 1, 3, + 0, 4, 1, 3, 1, 1, 1, 1, 1, 3, + 0, 4, 0, 6, 1, 3, 0, 4, 1, 3, + 0, 4 }; @@ -3922,21 +3938,21 @@ namespace isc { namespace dhcp { "\"interfaces-config\"", "\"interfaces\"", "\"lease-database\"", "\"hosts-database\"", "\"type\"", "\"memfile\"", "\"mysql\"", "\"postgresql\"", "\"cql\"", "\"user\"", "\"password\"", "\"host\"", - "\"persist\"", "\"lfc-interval\"", "\"readonly\"", "\"connect-timeout\"", - "\"preferred-lifetime\"", "\"valid-lifetime\"", "\"renew-timer\"", - "\"rebind-timer\"", "\"decline-probation-period\"", "\"subnet6\"", - "\"option-def\"", "\"option-data\"", "\"name\"", "\"data\"", "\"code\"", - "\"space\"", "\"csv-format\"", "\"record-types\"", "\"encapsulate\"", - "\"array\"", "\"pools\"", "\"pool\"", "\"pd-pools\"", "\"prefix\"", - "\"prefix-len\"", "\"excluded-prefix\"", "\"excluded-prefix-len\"", - "\"delegated-len\"", "\"user-context\"", "\"subnet\"", "\"interface\"", - "\"interface-id\"", "\"id\"", "\"rapid-commit\"", "\"reservation-mode\"", - "\"mac-sources\"", "\"relay-supplied-options\"", - "\"host-reservation-identifiers\"", "\"client-classes\"", "\"test\"", - "\"client-class\"", "\"reservations\"", "\"ip-addresses\"", - "\"prefixes\"", "\"duid\"", "\"hw-address\"", "\"hostname\"", - "\"relay\"", "\"ip-address\"", "\"hooks-libraries\"", "\"library\"", - "\"parameters\"", "\"expired-leases-processing\"", + "\"port\"", "\"persist\"", "\"lfc-interval\"", "\"readonly\"", + "\"connect-timeout\"", "\"preferred-lifetime\"", "\"valid-lifetime\"", + "\"renew-timer\"", "\"rebind-timer\"", "\"decline-probation-period\"", + "\"subnet6\"", "\"option-def\"", "\"option-data\"", "\"name\"", + "\"data\"", "\"code\"", "\"space\"", "\"csv-format\"", + "\"record-types\"", "\"encapsulate\"", "\"array\"", "\"pools\"", + "\"pool\"", "\"pd-pools\"", "\"prefix\"", "\"prefix-len\"", + "\"excluded-prefix\"", "\"excluded-prefix-len\"", "\"delegated-len\"", + "\"user-context\"", "\"subnet\"", "\"interface\"", "\"interface-id\"", + "\"id\"", "\"rapid-commit\"", "\"reservation-mode\"", "\"mac-sources\"", + "\"relay-supplied-options\"", "\"host-reservation-identifiers\"", + "\"client-classes\"", "\"test\"", "\"client-class\"", "\"reservations\"", + "\"ip-addresses\"", "\"prefixes\"", "\"duid\"", "\"hw-address\"", + "\"hostname\"", "\"relay\"", "\"ip-address\"", "\"hooks-libraries\"", + "\"library\"", "\"parameters\"", "\"expired-leases-processing\"", "\"reclaim-timer-wait-time\"", "\"flush-reclaimed-timer-wait-time\"", "\"hold-reclaimed-time\"", "\"max-reclaim-leases\"", "\"max-reclaim-time\"", "\"unwarned-reclaim-cycles\"", "\"server-id\"", @@ -3969,8 +3985,8 @@ namespace isc { namespace dhcp { "sub_interfaces6", "$@20", "interface_config_map", "$@21", "lease_database", "$@22", "hosts_database", "$@23", "database_map_params", "database_map_param", "database_type", "$@24", - "db_type", "user", "$@25", "password", "$@26", "host", "$@27", "name", - "$@28", "persist", "lfc_interval", "readonly", "connect_timeout", + "db_type", "user", "$@25", "password", "$@26", "host", "$@27", "port", + "name", "$@28", "persist", "lfc_interval", "readonly", "connect_timeout", "mac_sources", "$@29", "mac_sources_list", "mac_sources_value", "duid_id", "string_id", "host_reservation_identifiers", "$@30", "host_reservation_identifiers_list", "host_reservation_identifier", @@ -4038,57 +4054,58 @@ namespace isc { namespace dhcp { const unsigned short int Dhcp6Parser::yyrline_[] = { - 0, 221, 221, 221, 222, 222, 223, 223, 224, 224, - 225, 225, 226, 226, 227, 227, 228, 228, 229, 229, - 230, 230, 231, 231, 232, 232, 240, 241, 242, 243, - 244, 245, 246, 249, 254, 254, 265, 268, 269, 272, - 276, 283, 283, 290, 291, 294, 298, 305, 305, 312, - 313, 316, 320, 331, 341, 341, 353, 354, 358, 359, - 360, 361, 362, 365, 365, 382, 382, 390, 391, 396, - 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, - 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, - 417, 420, 425, 430, 435, 440, 445, 445, 455, 455, - 463, 463, 473, 473, 483, 483, 493, 494, 497, 498, - 499, 500, 501, 502, 503, 504, 505, 506, 509, 509, - 516, 517, 518, 519, 522, 522, 530, 530, 538, 538, - 546, 546, 554, 559, 564, 569, 574, 574, 584, 585, - 588, 589, 592, 597, 602, 602, 612, 613, 616, 617, - 620, 627, 627, 637, 637, 647, 648, 651, 652, 655, - 655, 663, 663, 671, 672, 673, 676, 677, 680, 680, - 688, 688, 696, 696, 706, 707, 710, 711, 712, 713, - 714, 715, 718, 723, 728, 733, 738, 743, 751, 751, - 764, 765, 768, 769, 776, 776, 799, 799, 808, 809, - 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, - 823, 824, 825, 826, 827, 828, 829, 832, 832, 840, - 840, 848, 848, 856, 856, 864, 864, 872, 877, 886, - 886, 898, 899, 902, 903, 908, 908, 919, 919, 929, - 930, 933, 934, 937, 938, 939, 940, 941, 942, 943, - 944, 947, 949, 954, 956, 956, 964, 964, 972, 972, - 980, 982, 982, 990, 999, 999, 1011, 1012, 1017, 1018, - 1023, 1023, 1034, 1034, 1045, 1046, 1051, 1052, 1057, 1058, - 1059, 1060, 1061, 1062, 1065, 1067, 1067, 1075, 1077, 1079, - 1087, 1087, 1099, 1100, 1103, 1104, 1107, 1107, 1115, 1115, - 1123, 1124, 1127, 1128, 1129, 1130, 1133, 1133, 1141, 1141, - 1151, 1151, 1163, 1164, 1167, 1168, 1171, 1171, 1179, 1179, - 1187, 1188, 1191, 1192, 1193, 1194, 1195, 1196, 1197, 1198, - 1201, 1201, 1209, 1214, 1214, 1222, 1227, 1235, 1235, 1245, - 1246, 1249, 1250, 1253, 1253, 1261, 1261, 1269, 1270, 1273, - 1274, 1278, 1279, 1280, 1281, 1282, 1283, 1284, 1285, 1288, - 1288, 1298, 1298, 1308, 1308, 1316, 1316, 1324, 1324, 1332, - 1332, 1345, 1345, 1355, 1355, 1366, 1366, 1376, 1377, 1380, - 1380, 1388, 1389, 1392, 1393, 1396, 1397, 1398, 1399, 1402, - 1404, 1404, 1415, 1415, 1425, 1426, 1429, 1430, 1431, 1432, - 1433, 1434, 1435, 1438, 1438, 1445, 1446, 1447, 1450, 1455, - 1455, 1463, 1468, 1475, 1482, 1482, 1492, 1493, 1496, 1497, - 1500, 1500, 1508, 1508, 1518, 1518, 1528, 1528, 1536, 1537, - 1540, 1541, 1542, 1543, 1544, 1545, 1546, 1547, 1548, 1549, - 1550, 1551, 1552, 1553, 1554, 1555, 1558, 1563, 1563, 1571, - 1571, 1579, 1584, 1584, 1592, 1597, 1602, 1602, 1610, 1611, - 1614, 1614, 1622, 1627, 1632, 1637, 1642, 1642, 1650, 1653, - 1656, 1659, 1662, 1668, 1668, 1678, 1678, 1685, 1685, 1697, - 1697, 1710, 1711, 1715, 1719, 1719, 1731, 1732, 1736, 1736, - 1744, 1745, 1748, 1749, 1750, 1751, 1752, 1755, 1759, 1759, - 1767, 1767, 1777, 1778, 1781, 1781, 1789, 1790, 1793, 1793 + 0, 222, 222, 222, 223, 223, 224, 224, 225, 225, + 226, 226, 227, 227, 228, 228, 229, 229, 230, 230, + 231, 231, 232, 232, 233, 233, 241, 242, 243, 244, + 245, 246, 247, 250, 255, 255, 266, 269, 270, 273, + 277, 284, 284, 291, 292, 295, 299, 306, 306, 313, + 314, 317, 321, 332, 342, 342, 354, 355, 359, 360, + 361, 362, 363, 366, 366, 383, 383, 391, 392, 397, + 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, + 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, + 418, 421, 426, 431, 436, 441, 446, 446, 456, 456, + 464, 464, 474, 474, 484, 484, 494, 495, 498, 499, + 500, 501, 502, 503, 504, 505, 506, 507, 508, 511, + 511, 518, 519, 520, 521, 524, 524, 532, 532, 540, + 540, 548, 553, 553, 561, 566, 571, 576, 581, 581, + 591, 592, 595, 596, 599, 604, 609, 609, 619, 620, + 623, 624, 627, 634, 634, 644, 644, 654, 655, 658, + 659, 662, 662, 670, 670, 678, 679, 680, 683, 684, + 687, 687, 695, 695, 703, 703, 713, 714, 717, 718, + 719, 720, 721, 722, 725, 730, 735, 740, 745, 750, + 758, 758, 771, 772, 775, 776, 783, 783, 806, 806, + 815, 816, 820, 821, 822, 823, 824, 825, 826, 827, + 828, 829, 830, 831, 832, 833, 834, 835, 836, 839, + 839, 847, 847, 855, 855, 863, 863, 871, 871, 879, + 884, 893, 893, 905, 906, 909, 910, 915, 915, 926, + 926, 936, 937, 940, 941, 944, 945, 946, 947, 948, + 949, 950, 951, 954, 956, 961, 963, 963, 971, 971, + 979, 979, 987, 989, 989, 997, 1006, 1006, 1018, 1019, + 1024, 1025, 1030, 1030, 1041, 1041, 1052, 1053, 1058, 1059, + 1064, 1065, 1066, 1067, 1068, 1069, 1072, 1074, 1074, 1082, + 1084, 1086, 1094, 1094, 1106, 1107, 1110, 1111, 1114, 1114, + 1122, 1122, 1130, 1131, 1134, 1135, 1136, 1137, 1140, 1140, + 1148, 1148, 1158, 1158, 1170, 1171, 1174, 1175, 1178, 1178, + 1186, 1186, 1194, 1195, 1198, 1199, 1200, 1201, 1202, 1203, + 1204, 1205, 1208, 1208, 1216, 1221, 1221, 1229, 1234, 1242, + 1242, 1252, 1253, 1256, 1257, 1260, 1260, 1268, 1268, 1276, + 1277, 1280, 1281, 1285, 1286, 1287, 1288, 1289, 1290, 1291, + 1292, 1295, 1295, 1305, 1305, 1315, 1315, 1323, 1323, 1331, + 1331, 1339, 1339, 1352, 1352, 1362, 1362, 1373, 1373, 1383, + 1384, 1387, 1387, 1395, 1396, 1399, 1400, 1403, 1404, 1405, + 1406, 1409, 1411, 1411, 1422, 1422, 1432, 1433, 1436, 1437, + 1438, 1439, 1440, 1441, 1442, 1445, 1445, 1452, 1453, 1454, + 1457, 1462, 1462, 1470, 1475, 1482, 1489, 1489, 1499, 1500, + 1503, 1504, 1507, 1507, 1515, 1515, 1525, 1525, 1535, 1535, + 1543, 1544, 1547, 1548, 1549, 1550, 1551, 1552, 1553, 1554, + 1555, 1556, 1557, 1558, 1559, 1560, 1561, 1562, 1565, 1570, + 1570, 1578, 1578, 1586, 1591, 1591, 1599, 1604, 1609, 1609, + 1617, 1618, 1621, 1621, 1629, 1634, 1639, 1644, 1649, 1649, + 1657, 1660, 1663, 1666, 1669, 1675, 1675, 1685, 1685, 1692, + 1692, 1704, 1704, 1717, 1718, 1722, 1726, 1726, 1738, 1739, + 1743, 1743, 1751, 1752, 1755, 1756, 1757, 1758, 1759, 1762, + 1766, 1766, 1774, 1774, 1784, 1785, 1788, 1788, 1796, 1797, + 1800, 1800 }; // Print the state stack on the debug stream. @@ -4123,8 +4140,8 @@ namespace isc { namespace dhcp { #line 14 "dhcp6_parser.yy" // lalr1.cc:1167 } } // isc::dhcp -#line 4127 "dhcp6_parser.cc" // lalr1.cc:1167 -#line 1801 "dhcp6_parser.yy" // lalr1.cc:1168 +#line 4144 "dhcp6_parser.cc" // lalr1.cc:1167 +#line 1808 "dhcp6_parser.yy" // lalr1.cc:1168 void diff --git a/src/bin/dhcp6/dhcp6_parser.h b/src/bin/dhcp6/dhcp6_parser.h index 2465364e44..c9fdfa3c0d 100644 --- a/src/bin/dhcp6/dhcp6_parser.h +++ b/src/bin/dhcp6/dhcp6_parser.h @@ -366,124 +366,125 @@ namespace isc { namespace dhcp { TOKEN_USER = 275, TOKEN_PASSWORD = 276, TOKEN_HOST = 277, - TOKEN_PERSIST = 278, - TOKEN_LFC_INTERVAL = 279, - TOKEN_READONLY = 280, - TOKEN_CONNECT_TIMEOUT = 281, - TOKEN_PREFERRED_LIFETIME = 282, - TOKEN_VALID_LIFETIME = 283, - TOKEN_RENEW_TIMER = 284, - TOKEN_REBIND_TIMER = 285, - TOKEN_DECLINE_PROBATION_PERIOD = 286, - TOKEN_SUBNET6 = 287, - TOKEN_OPTION_DEF = 288, - TOKEN_OPTION_DATA = 289, - TOKEN_NAME = 290, - TOKEN_DATA = 291, - TOKEN_CODE = 292, - TOKEN_SPACE = 293, - TOKEN_CSV_FORMAT = 294, - TOKEN_RECORD_TYPES = 295, - TOKEN_ENCAPSULATE = 296, - TOKEN_ARRAY = 297, - TOKEN_POOLS = 298, - TOKEN_POOL = 299, - TOKEN_PD_POOLS = 300, - TOKEN_PREFIX = 301, - TOKEN_PREFIX_LEN = 302, - TOKEN_EXCLUDED_PREFIX = 303, - TOKEN_EXCLUDED_PREFIX_LEN = 304, - TOKEN_DELEGATED_LEN = 305, - TOKEN_USER_CONTEXT = 306, - TOKEN_SUBNET = 307, - TOKEN_INTERFACE = 308, - TOKEN_INTERFACE_ID = 309, - TOKEN_ID = 310, - TOKEN_RAPID_COMMIT = 311, - TOKEN_RESERVATION_MODE = 312, - TOKEN_MAC_SOURCES = 313, - TOKEN_RELAY_SUPPLIED_OPTIONS = 314, - TOKEN_HOST_RESERVATION_IDENTIFIERS = 315, - TOKEN_CLIENT_CLASSES = 316, - TOKEN_TEST = 317, - TOKEN_CLIENT_CLASS = 318, - TOKEN_RESERVATIONS = 319, - TOKEN_IP_ADDRESSES = 320, - TOKEN_PREFIXES = 321, - TOKEN_DUID = 322, - TOKEN_HW_ADDRESS = 323, - TOKEN_HOSTNAME = 324, - TOKEN_RELAY = 325, - TOKEN_IP_ADDRESS = 326, - TOKEN_HOOKS_LIBRARIES = 327, - TOKEN_LIBRARY = 328, - TOKEN_PARAMETERS = 329, - TOKEN_EXPIRED_LEASES_PROCESSING = 330, - TOKEN_RECLAIM_TIMER_WAIT_TIME = 331, - TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 332, - TOKEN_HOLD_RECLAIMED_TIME = 333, - TOKEN_MAX_RECLAIM_LEASES = 334, - TOKEN_MAX_RECLAIM_TIME = 335, - TOKEN_UNWARNED_RECLAIM_CYCLES = 336, - TOKEN_SERVER_ID = 337, - TOKEN_LLT = 338, - TOKEN_EN = 339, - TOKEN_LL = 340, - TOKEN_IDENTIFIER = 341, - TOKEN_HTYPE = 342, - TOKEN_TIME = 343, - TOKEN_ENTERPRISE_ID = 344, - TOKEN_DHCP4O6_PORT = 345, - TOKEN_CONTROL_SOCKET = 346, - TOKEN_SOCKET_TYPE = 347, - TOKEN_SOCKET_NAME = 348, - TOKEN_DHCP_DDNS = 349, - TOKEN_ENABLE_UPDATES = 350, - TOKEN_QUALIFYING_SUFFIX = 351, - TOKEN_SERVER_IP = 352, - TOKEN_SERVER_PORT = 353, - TOKEN_SENDER_IP = 354, - TOKEN_SENDER_PORT = 355, - TOKEN_MAX_QUEUE_SIZE = 356, - TOKEN_NCR_PROTOCOL = 357, - TOKEN_NCR_FORMAT = 358, - TOKEN_ALWAYS_INCLUDE_FQDN = 359, - TOKEN_ALLOW_CLIENT_UPDATE = 360, - TOKEN_OVERRIDE_NO_UPDATE = 361, - TOKEN_OVERRIDE_CLIENT_UPDATE = 362, - TOKEN_REPLACE_CLIENT_NAME = 363, - TOKEN_GENERATED_PREFIX = 364, - TOKEN_UDP = 365, - TOKEN_TCP = 366, - TOKEN_JSON = 367, - TOKEN_WHEN_PRESENT = 368, - TOKEN_NEVER = 369, - TOKEN_ALWAYS = 370, - TOKEN_WHEN_NOT_PRESENT = 371, - TOKEN_LOGGING = 372, - TOKEN_LOGGERS = 373, - TOKEN_OUTPUT_OPTIONS = 374, - TOKEN_OUTPUT = 375, - TOKEN_DEBUGLEVEL = 376, - TOKEN_SEVERITY = 377, - TOKEN_DHCP4 = 378, - TOKEN_DHCPDDNS = 379, - TOKEN_TOPLEVEL_JSON = 380, - TOKEN_TOPLEVEL_DHCP6 = 381, - TOKEN_SUB_DHCP6 = 382, - TOKEN_SUB_INTERFACES6 = 383, - TOKEN_SUB_SUBNET6 = 384, - TOKEN_SUB_POOL6 = 385, - TOKEN_SUB_PD_POOL = 386, - TOKEN_SUB_RESERVATION = 387, - TOKEN_SUB_OPTION_DEF = 388, - TOKEN_SUB_OPTION_DATA = 389, - TOKEN_SUB_HOOKS_LIBRARY = 390, - TOKEN_SUB_DHCP_DDNS = 391, - TOKEN_STRING = 392, - TOKEN_INTEGER = 393, - TOKEN_FLOAT = 394, - TOKEN_BOOLEAN = 395 + TOKEN_PORT = 278, + TOKEN_PERSIST = 279, + TOKEN_LFC_INTERVAL = 280, + TOKEN_READONLY = 281, + TOKEN_CONNECT_TIMEOUT = 282, + TOKEN_PREFERRED_LIFETIME = 283, + TOKEN_VALID_LIFETIME = 284, + TOKEN_RENEW_TIMER = 285, + TOKEN_REBIND_TIMER = 286, + TOKEN_DECLINE_PROBATION_PERIOD = 287, + TOKEN_SUBNET6 = 288, + TOKEN_OPTION_DEF = 289, + TOKEN_OPTION_DATA = 290, + TOKEN_NAME = 291, + TOKEN_DATA = 292, + TOKEN_CODE = 293, + TOKEN_SPACE = 294, + TOKEN_CSV_FORMAT = 295, + TOKEN_RECORD_TYPES = 296, + TOKEN_ENCAPSULATE = 297, + TOKEN_ARRAY = 298, + TOKEN_POOLS = 299, + TOKEN_POOL = 300, + TOKEN_PD_POOLS = 301, + TOKEN_PREFIX = 302, + TOKEN_PREFIX_LEN = 303, + TOKEN_EXCLUDED_PREFIX = 304, + TOKEN_EXCLUDED_PREFIX_LEN = 305, + TOKEN_DELEGATED_LEN = 306, + TOKEN_USER_CONTEXT = 307, + TOKEN_SUBNET = 308, + TOKEN_INTERFACE = 309, + TOKEN_INTERFACE_ID = 310, + TOKEN_ID = 311, + TOKEN_RAPID_COMMIT = 312, + TOKEN_RESERVATION_MODE = 313, + TOKEN_MAC_SOURCES = 314, + TOKEN_RELAY_SUPPLIED_OPTIONS = 315, + TOKEN_HOST_RESERVATION_IDENTIFIERS = 316, + TOKEN_CLIENT_CLASSES = 317, + TOKEN_TEST = 318, + TOKEN_CLIENT_CLASS = 319, + TOKEN_RESERVATIONS = 320, + TOKEN_IP_ADDRESSES = 321, + TOKEN_PREFIXES = 322, + TOKEN_DUID = 323, + TOKEN_HW_ADDRESS = 324, + TOKEN_HOSTNAME = 325, + TOKEN_RELAY = 326, + TOKEN_IP_ADDRESS = 327, + TOKEN_HOOKS_LIBRARIES = 328, + TOKEN_LIBRARY = 329, + TOKEN_PARAMETERS = 330, + TOKEN_EXPIRED_LEASES_PROCESSING = 331, + TOKEN_RECLAIM_TIMER_WAIT_TIME = 332, + TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 333, + TOKEN_HOLD_RECLAIMED_TIME = 334, + TOKEN_MAX_RECLAIM_LEASES = 335, + TOKEN_MAX_RECLAIM_TIME = 336, + TOKEN_UNWARNED_RECLAIM_CYCLES = 337, + TOKEN_SERVER_ID = 338, + TOKEN_LLT = 339, + TOKEN_EN = 340, + TOKEN_LL = 341, + TOKEN_IDENTIFIER = 342, + TOKEN_HTYPE = 343, + TOKEN_TIME = 344, + TOKEN_ENTERPRISE_ID = 345, + TOKEN_DHCP4O6_PORT = 346, + TOKEN_CONTROL_SOCKET = 347, + TOKEN_SOCKET_TYPE = 348, + TOKEN_SOCKET_NAME = 349, + TOKEN_DHCP_DDNS = 350, + TOKEN_ENABLE_UPDATES = 351, + TOKEN_QUALIFYING_SUFFIX = 352, + TOKEN_SERVER_IP = 353, + TOKEN_SERVER_PORT = 354, + TOKEN_SENDER_IP = 355, + TOKEN_SENDER_PORT = 356, + TOKEN_MAX_QUEUE_SIZE = 357, + TOKEN_NCR_PROTOCOL = 358, + TOKEN_NCR_FORMAT = 359, + TOKEN_ALWAYS_INCLUDE_FQDN = 360, + TOKEN_ALLOW_CLIENT_UPDATE = 361, + TOKEN_OVERRIDE_NO_UPDATE = 362, + TOKEN_OVERRIDE_CLIENT_UPDATE = 363, + TOKEN_REPLACE_CLIENT_NAME = 364, + TOKEN_GENERATED_PREFIX = 365, + TOKEN_UDP = 366, + TOKEN_TCP = 367, + TOKEN_JSON = 368, + TOKEN_WHEN_PRESENT = 369, + TOKEN_NEVER = 370, + TOKEN_ALWAYS = 371, + TOKEN_WHEN_NOT_PRESENT = 372, + TOKEN_LOGGING = 373, + TOKEN_LOGGERS = 374, + TOKEN_OUTPUT_OPTIONS = 375, + TOKEN_OUTPUT = 376, + TOKEN_DEBUGLEVEL = 377, + TOKEN_SEVERITY = 378, + TOKEN_DHCP4 = 379, + TOKEN_DHCPDDNS = 380, + TOKEN_TOPLEVEL_JSON = 381, + TOKEN_TOPLEVEL_DHCP6 = 382, + TOKEN_SUB_DHCP6 = 383, + TOKEN_SUB_INTERFACES6 = 384, + TOKEN_SUB_SUBNET6 = 385, + TOKEN_SUB_POOL6 = 386, + TOKEN_SUB_PD_POOL = 387, + TOKEN_SUB_RESERVATION = 388, + TOKEN_SUB_OPTION_DEF = 389, + TOKEN_SUB_OPTION_DATA = 390, + TOKEN_SUB_HOOKS_LIBRARY = 391, + TOKEN_SUB_DHCP_DDNS = 392, + TOKEN_STRING = 393, + TOKEN_INTEGER = 394, + TOKEN_FLOAT = 395, + TOKEN_BOOLEAN = 396 }; }; @@ -682,6 +683,10 @@ namespace isc { namespace dhcp { symbol_type make_HOST (const location_type& l); + static inline + symbol_type + make_PORT (const location_type& l); + static inline symbol_type make_PERSIST (const location_type& l); @@ -1359,12 +1364,12 @@ namespace isc { namespace dhcp { enum { yyeof_ = 0, - yylast_ = 767, ///< Last index in yytable_. - yynnts_ = 317, ///< Number of nonterminal symbols. + yylast_ = 771, ///< Last index in yytable_. + yynnts_ = 318, ///< Number of nonterminal symbols. yyfinal_ = 26, ///< Termination state number. yyterror_ = 1, yyerrcode_ = 256, - yyntokens_ = 141 ///< Number of tokens. + yyntokens_ = 142 ///< Number of tokens. }; @@ -1420,9 +1425,9 @@ namespace isc { namespace dhcp { 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 139, 140 + 135, 136, 137, 138, 139, 140, 141 }; - const unsigned int user_token_number_max_ = 395; + const unsigned int user_token_number_max_ = 396; const token_number_type undef_token_ = 2; if (static_cast(t) <= yyeof_) @@ -1455,28 +1460,28 @@ namespace isc { namespace dhcp { { switch (other.type_get ()) { - case 155: // value - case 159: // map_value - case 200: // db_type - case 387: // duid_type - case 420: // ncr_protocol_value - case 429: // replace_client_name_value + case 156: // value + case 160: // map_value + case 201: // db_type + case 389: // duid_type + case 422: // ncr_protocol_value + case 431: // replace_client_name_value value.copy< ElementPtr > (other.value); break; - case 140: // "boolean" + case 141: // "boolean" value.copy< bool > (other.value); break; - case 139: // "floating point" + case 140: // "floating point" value.copy< double > (other.value); break; - case 138: // "integer" + case 139: // "integer" value.copy< int64_t > (other.value); break; - case 137: // "constant string" + case 138: // "constant string" value.copy< std::string > (other.value); break; @@ -1497,28 +1502,28 @@ namespace isc { namespace dhcp { (void) v; switch (this->type_get ()) { - case 155: // value - case 159: // map_value - case 200: // db_type - case 387: // duid_type - case 420: // ncr_protocol_value - case 429: // replace_client_name_value + case 156: // value + case 160: // map_value + case 201: // db_type + case 389: // duid_type + case 422: // ncr_protocol_value + case 431: // replace_client_name_value value.copy< ElementPtr > (v); break; - case 140: // "boolean" + case 141: // "boolean" value.copy< bool > (v); break; - case 139: // "floating point" + case 140: // "floating point" value.copy< double > (v); break; - case 138: // "integer" + case 139: // "integer" value.copy< int64_t > (v); break; - case 137: // "constant string" + case 138: // "constant string" value.copy< std::string > (v); break; @@ -1598,28 +1603,28 @@ namespace isc { namespace dhcp { // Type destructor. switch (yytype) { - case 155: // value - case 159: // map_value - case 200: // db_type - case 387: // duid_type - case 420: // ncr_protocol_value - case 429: // replace_client_name_value + case 156: // value + case 160: // map_value + case 201: // db_type + case 389: // duid_type + case 422: // ncr_protocol_value + case 431: // replace_client_name_value value.template destroy< ElementPtr > (); break; - case 140: // "boolean" + case 141: // "boolean" value.template destroy< bool > (); break; - case 139: // "floating point" + case 140: // "floating point" value.template destroy< double > (); break; - case 138: // "integer" + case 139: // "integer" value.template destroy< int64_t > (); break; - case 137: // "constant string" + case 138: // "constant string" value.template destroy< std::string > (); break; @@ -1646,28 +1651,28 @@ namespace isc { namespace dhcp { super_type::move(s); switch (this->type_get ()) { - case 155: // value - case 159: // map_value - case 200: // db_type - case 387: // duid_type - case 420: // ncr_protocol_value - case 429: // replace_client_name_value + case 156: // value + case 160: // map_value + case 201: // db_type + case 389: // duid_type + case 422: // ncr_protocol_value + case 431: // replace_client_name_value value.move< ElementPtr > (s.value); break; - case 140: // "boolean" + case 141: // "boolean" value.move< bool > (s.value); break; - case 139: // "floating point" + case 140: // "floating point" value.move< double > (s.value); break; - case 138: // "integer" + case 139: // "integer" value.move< int64_t > (s.value); break; - case 137: // "constant string" + case 138: // "constant string" value.move< std::string > (s.value); break; @@ -1740,7 +1745,7 @@ namespace isc { namespace dhcp { 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, - 395 + 395, 396 }; return static_cast (yytoken_number_[type]); } @@ -1871,6 +1876,12 @@ namespace isc { namespace dhcp { return symbol_type (token::TOKEN_HOST, l); } + Dhcp6Parser::symbol_type + Dhcp6Parser::make_PORT (const location_type& l) + { + return symbol_type (token::TOKEN_PORT, l); + } + Dhcp6Parser::symbol_type Dhcp6Parser::make_PERSIST (const location_type& l) { @@ -2582,7 +2593,7 @@ namespace isc { namespace dhcp { #line 14 "dhcp6_parser.yy" // lalr1.cc:377 } } // isc::dhcp -#line 2586 "dhcp6_parser.h" // lalr1.cc:377 +#line 2597 "dhcp6_parser.h" // lalr1.cc:377 diff --git a/src/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh index eba0c674d6..11bee9ac01 100644 --- a/src/bin/dhcp6/location.hh +++ b/src/bin/dhcp6/location.hh @@ -1,4 +1,4 @@ -// Generated 201701251415 +// Generated 201701271452 // A Bison parser, made by GNU Bison 3.0.4. // Locations for Bison parsers in C++ diff --git a/src/bin/dhcp6/position.hh b/src/bin/dhcp6/position.hh index 6c75857d8d..ddd0b2fcc4 100644 --- a/src/bin/dhcp6/position.hh +++ b/src/bin/dhcp6/position.hh @@ -1,4 +1,4 @@ -// Generated 201701251415 +// Generated 201701271452 // A Bison parser, made by GNU Bison 3.0.4. // Positions for Bison parsers in C++ diff --git a/src/bin/dhcp6/stack.hh b/src/bin/dhcp6/stack.hh index 3138100103..636b186b92 100644 --- a/src/bin/dhcp6/stack.hh +++ b/src/bin/dhcp6/stack.hh @@ -1,4 +1,4 @@ -// Generated 201701251415 +// Generated 201701271452 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++