From: Francis Dupont Date: Fri, 10 Jul 2020 15:22:27 +0000 (+0000) Subject: [#1182] Regen bison X-Git-Tag: Kea-1.7.10~60 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a56755f8509c950bb7871d38b56970dbb370dca;p=thirdparty%2Fkea.git [#1182] Regen bison --- diff --git a/src/bin/agent/agent_parser.cc b/src/bin/agent/agent_parser.cc index 8614b227e4..fb76d47b03 100644 --- a/src/bin/agent/agent_parser.cc +++ b/src/bin/agent/agent_parser.cc @@ -1079,7 +1079,7 @@ namespace isc { namespace agent { case 71: #line 382 "agent_parser.yy" - { + { ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ()); ctx.leave(); } @@ -1741,37 +1741,37 @@ namespace isc { namespace agent { } - const signed char AgentParser::yypact_ninf_ = -94; + const short AgentParser::yypact_ninf_ = -128; const signed char AgentParser::yytable_ninf_ = -1; const short AgentParser::yypact_[] = { - 66, -94, -94, -94, 7, 1, 2, 11, -94, -94, - -94, -94, -94, -94, -94, -94, -94, -94, -94, -94, - -94, -94, -94, -94, 1, -18, 60, 0, -94, 74, - 82, 84, 61, 83, -94, 85, -94, -94, -94, 87, - -94, -94, 90, -94, -94, 92, -94, 13, -94, -94, - -94, -94, -94, -94, -94, -94, -94, 1, 1, -94, - 51, 93, -94, 96, 67, 100, 101, 102, 103, 104, - -94, 0, -94, -94, -94, 106, 105, 77, -94, 107, - 78, -94, 108, 112, -94, 1, 0, -94, -94, -94, - -94, 36, 111, 113, -94, 16, -94, -94, -94, -94, - 29, -94, -94, -94, -94, -94, 115, 116, -94, -94, - 76, -94, -94, 118, 119, 120, 36, -94, -21, -94, - 111, 17, 113, -94, 121, 122, 123, -94, -94, -94, - -94, 59, -94, -94, -94, -94, -94, -94, 127, -94, - -94, -94, -94, 63, -94, -94, -94, -94, -94, -94, - 37, 37, 37, 128, 129, 12, -94, 130, 132, 72, - 133, 17, -94, -94, -94, -94, -94, -94, 65, -94, - -94, -94, 69, 73, 88, 1, -94, 89, 135, -94, - 109, -94, 137, 138, 37, -94, -94, -94, -94, -94, - -94, 136, -94, 110, 124, -94, -94, 81, -94, -94, - -94, -94, -5, 136, -94, -94, 140, 142, 145, -94, - 75, -94, -94, -94, -94, -94, -94, -94, 146, 114, - 86, 117, 148, -5, -94, 125, -94, -94, -94, 126, - -94, -94, -94 + 65, -128, -128, -128, 7, 1, -2, 8, -128, -128, + -128, -128, -128, -128, -128, -128, -128, -128, -128, -128, + -128, -128, -128, -128, 1, -6, 52, 5, -128, 44, + 70, 80, 75, 87, -128, 84, -128, -128, -128, 89, + -128, -128, 93, -128, -128, 94, -128, 6, -128, -128, + -128, -128, -128, -128, -128, -128, -128, 1, 1, -128, + 66, 99, -128, 101, 67, 103, 104, 102, 106, 107, + -128, 5, -128, -128, -128, 108, 109, 76, -128, 110, + 77, -128, 113, 114, -128, 1, 5, -128, -128, -128, + -128, -5, 115, 116, -128, 18, -128, -128, -128, -128, + 28, -128, -128, -128, -128, -128, 118, 117, -128, -128, + 45, -128, -128, 121, 122, 123, -5, -128, 11, -128, + 115, 40, 116, -128, 124, 125, 126, -128, -128, -128, + -128, 60, -128, -128, -128, -128, -128, -128, 133, -128, + -128, -128, -128, 68, -128, -128, -128, -128, -128, -128, + 9, 9, 9, 134, 135, 64, -128, 136, 137, 74, + 138, 40, -128, -128, -128, -128, -128, -128, 69, -128, + -128, -128, 71, 72, 83, 110, -128, 90, 139, -128, + 91, -128, 141, 142, 9, -128, -128, -128, -128, -128, + -128, 140, -128, 92, 127, -128, -128, 79, -128, -128, + -128, -128, 24, 140, -128, -128, 145, 146, 147, -128, + 78, -128, -128, -128, -128, -128, -128, -128, 148, 112, + 119, 120, 150, 24, -128, 105, -128, -128, -128, 128, + -128, -128, -128 }; const unsigned char @@ -1803,18 +1803,18 @@ namespace isc { namespace agent { 125, 132, 137 }; - const signed char + const short AgentParser::yypgoto_[] = { - -94, -94, -94, -94, -94, -94, -94, -94, -24, 79, - -94, -94, -94, -94, -94, -94, -94, -94, -26, -94, - -94, -94, -94, -94, -94, 68, 91, -94, -94, -94, - -23, -94, -22, -94, -94, -94, -94, -94, 33, -94, - -94, 4, -94, -94, -94, -94, -94, -94, -94, 41, - -94, -94, -94, -94, -94, -94, -93, -19, -94, -94, - -94, -94, -94, -94, -94, -94, 38, -94, -94, 5, - -94, -94, -94, -94, -94, -94, -94, -94, -42, -94, - -94, -56, -94, -94, -94, -94, -94, -94, -94 + -128, -128, -128, -128, -128, -128, -128, -128, -20, -76, + -128, -19, -128, -128, -128, -128, -128, -128, -27, -128, + -128, -128, -128, -128, -128, 81, 86, -128, -128, -128, + -26, -128, -25, -128, -128, -128, -128, -128, 35, -128, + -128, 10, -128, -128, -128, -128, -128, -128, -128, 46, + -128, -128, -128, -128, -128, -128, -127, -24, -128, -128, + -128, -128, -128, -128, -128, -128, 39, -128, -128, 2, + -128, -128, -128, -128, -128, -128, -128, -128, -39, -128, + -128, -55, -128, -128, -128, -128, -128, -128, -128 }; const short @@ -1834,45 +1834,45 @@ namespace isc { namespace agent { const unsigned char AgentParser::yytable_[] = { - 28, 46, 128, 129, 51, 52, 9, 8, 10, 20, - 11, 38, 39, 40, 41, 42, 71, 45, 22, 71, - 31, 72, 43, 205, 112, 44, 206, 207, 208, 209, - 40, 41, 116, 73, 74, 128, 129, 117, 45, 12, - 13, 14, 15, 136, 137, 46, 138, 139, 51, 52, - 40, 41, 96, 97, 98, 45, 163, 164, 172, 173, - 46, 94, 155, 51, 52, 99, 161, 156, 184, 59, - 34, 162, 184, 185, 45, 45, 184, 186, 223, 122, - 56, 187, 123, 224, 203, 57, 60, 204, 58, 75, - 99, 64, 130, 62, 67, 140, 70, 76, 141, 142, - 77, 1, 2, 3, 79, 80, 78, 82, 83, 81, - 85, 179, 86, 92, 10, 87, 90, 93, 105, 120, - 109, 119, 124, 125, 126, 227, 188, 190, 150, 151, - 152, 159, 174, 175, 177, 140, 178, 180, 141, 142, - 191, 193, 194, 196, 219, 200, 220, 192, 199, 221, - 225, 189, 229, 135, 95, 226, 228, 127, 88, 176, - 149, 217, 84, 231, 232, 195, 181, 230 + 46, 51, 52, 88, 28, 20, 9, 8, 10, 71, + 11, 96, 97, 98, 72, 22, 38, 39, 40, 41, + 42, 71, 40, 41, 172, 173, 112, 43, 163, 164, + 44, 116, 31, 45, 128, 129, 117, 73, 74, 12, + 13, 14, 15, 45, 46, 51, 52, 45, 122, 45, + 56, 123, 205, 40, 41, 206, 207, 208, 209, 46, + 51, 52, 34, 155, 99, 94, 136, 137, 156, 138, + 139, 161, 184, 57, 184, 184, 162, 185, 45, 186, + 187, 223, 203, 59, 58, 204, 224, 128, 129, 99, + 60, 130, 62, 64, 140, 141, 142, 67, 70, 88, + 1, 2, 3, 76, 75, 77, 78, 79, 80, 81, + 82, 83, 85, 179, 87, 90, 86, 10, 92, 93, + 120, 188, 105, 109, 119, 124, 125, 126, 190, 192, + 199, 150, 151, 152, 140, 141, 142, 159, 174, 175, + 177, 178, 180, 231, 191, 193, 194, 196, 200, 219, + 220, 221, 225, 226, 229, 135, 189, 84, 227, 228, + 195, 149, 127, 181, 217, 176, 232, 95, 230 }; const unsigned char AgentParser::yycheck_[] = { - 24, 27, 23, 24, 27, 27, 5, 0, 7, 7, - 9, 11, 12, 13, 14, 15, 3, 38, 7, 3, - 38, 8, 22, 28, 8, 25, 31, 32, 33, 34, - 13, 14, 3, 57, 58, 23, 24, 8, 38, 38, - 39, 40, 41, 26, 27, 71, 29, 30, 71, 71, - 13, 14, 16, 17, 18, 38, 19, 20, 151, 152, - 86, 85, 3, 86, 86, 91, 3, 8, 3, 8, - 10, 8, 3, 8, 38, 38, 3, 8, 3, 3, - 6, 8, 6, 8, 3, 3, 3, 6, 4, 38, - 116, 4, 118, 8, 4, 121, 4, 4, 121, 121, - 4, 35, 36, 37, 4, 4, 39, 4, 4, 7, - 4, 39, 7, 5, 7, 38, 38, 5, 7, 3, - 7, 6, 4, 4, 4, 39, 38, 38, 7, 7, - 7, 4, 4, 4, 4, 161, 4, 4, 161, 161, - 5, 4, 4, 7, 4, 21, 4, 38, 38, 4, - 4, 175, 4, 120, 86, 41, 39, 116, 79, 155, - 122, 203, 71, 38, 38, 184, 161, 223 + 27, 27, 27, 79, 24, 7, 5, 0, 7, 3, + 9, 16, 17, 18, 8, 7, 11, 12, 13, 14, + 15, 3, 13, 14, 151, 152, 8, 22, 19, 20, + 25, 3, 38, 38, 23, 24, 8, 57, 58, 38, + 39, 40, 41, 38, 71, 71, 71, 38, 3, 38, + 6, 6, 28, 13, 14, 31, 32, 33, 34, 86, + 86, 86, 10, 3, 91, 85, 26, 27, 8, 29, + 30, 3, 3, 3, 3, 3, 8, 8, 38, 8, + 8, 3, 3, 8, 4, 6, 8, 23, 24, 116, + 3, 118, 8, 4, 121, 121, 121, 4, 4, 175, + 35, 36, 37, 4, 38, 4, 39, 4, 4, 7, + 4, 4, 4, 39, 38, 38, 7, 7, 5, 5, + 3, 38, 7, 7, 6, 4, 4, 4, 38, 38, + 38, 7, 7, 7, 161, 161, 161, 4, 4, 4, + 4, 4, 4, 38, 5, 4, 4, 7, 21, 4, + 4, 4, 4, 41, 4, 120, 175, 71, 39, 39, + 184, 122, 116, 161, 203, 155, 38, 86, 223 }; const unsigned char @@ -1896,7 +1896,7 @@ namespace isc { namespace agent { 7, 7, 7, 85, 87, 3, 8, 113, 118, 4, 116, 3, 8, 19, 20, 60, 72, 74, 98, 99, 100, 102, 98, 98, 4, 4, 83, 4, 4, 39, - 4, 111, 101, 103, 3, 8, 8, 8, 38, 50, + 4, 111, 101, 103, 3, 8, 8, 8, 38, 53, 38, 5, 38, 4, 4, 99, 7, 119, 120, 38, 21, 104, 121, 3, 6, 28, 31, 32, 33, 34, 122, 123, 124, 126, 127, 128, 129, 120, 125, 4, diff --git a/src/bin/agent/agent_parser.h b/src/bin/agent/agent_parser.h index 4b29a1c971..225fbd3cc6 100644 --- a/src/bin/agent/agent_parser.h +++ b/src/bin/agent/agent_parser.h @@ -1739,7 +1739,7 @@ switch (yykind) /// \param yyvalue the value to check static bool yy_table_value_is_error_ (int yyvalue); - static const signed char yypact_ninf_; + static const short yypact_ninf_; static const signed char yytable_ninf_; /// Convert a scanner token kind \a t to a symbol kind. @@ -1765,7 +1765,7 @@ switch (yykind) static const unsigned char yydefact_[]; // YYPGOTO[NTERM-NUM]. - static const signed char yypgoto_[]; + static const short yypgoto_[]; // YYDEFGOTO[NTERM-NUM]. static const short yydefgoto_[]; @@ -2017,7 +2017,7 @@ switch (yykind) /// Constants. enum { - yylast_ = 167, ///< Last index in yytable_. + yylast_ = 168, ///< Last index in yytable_. yynnts_ = 89, ///< Number of nonterminal symbols. yyfinal_ = 8 ///< Termination state number. }; diff --git a/src/bin/agent/location.hh b/src/bin/agent/location.hh index ec4c224b0a..0742f43ca7 100644 --- a/src/bin/agent/location.hh +++ b/src/bin/agent/location.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101521 // A Bison parser, made by GNU Bison 3.6.4. // Locations for Bison parsers in C++ diff --git a/src/bin/agent/position.hh b/src/bin/agent/position.hh index 14183aa09e..125eacfcad 100644 --- a/src/bin/agent/position.hh +++ b/src/bin/agent/position.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101521 // A Bison parser, made by GNU Bison 3.6.4. // Starting with Bison 3.2, this file is useless: the structure it diff --git a/src/bin/agent/stack.hh b/src/bin/agent/stack.hh index 08a16cbf71..ff195fc3af 100644 --- a/src/bin/agent/stack.hh +++ b/src/bin/agent/stack.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101521 // A Bison parser, made by GNU Bison 3.6.4. // Starting with Bison 3.2, this file is useless: the structure it diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc index df0f9d70ee..a149cb8e01 100644 --- a/src/bin/dhcp4/dhcp4_parser.cc +++ b/src/bin/dhcp4/dhcp4_parser.cc @@ -2126,7 +2126,7 @@ namespace isc { namespace dhcp { case 298: #line 1124 "dhcp4_parser.yy" - { + { ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ()); ctx.leave(); } @@ -4280,28 +4280,28 @@ namespace isc { namespace dhcp { const short Dhcp4Parser::yypact_[] = { - 374, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, -895, -895, 39, 41, 72, 101, 111, 131, + 360, -895, -895, -895, -895, -895, -895, -895, -895, -895, + -895, -895, -895, -895, 31, 41, 72, 101, 111, 131, 133, 157, 159, 166, 169, 173, 176, 189, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, -895, -895, 41, -139, 71, 174, 67, 572, - 84, 229, -29, 269, 65, -79, 383, 18, -895, 151, - 167, 83, 190, 212, -895, 58, -895, -895, -895, -895, - -895, 214, 248, 258, -895, -895, -895, -895, -895, -895, - 259, 260, 267, 268, 276, 277, 279, 294, 295, -895, - 296, 307, 311, 325, 331, -895, -895, -895, 335, -895, + -895, -895, -895, -895, 41, -147, 71, 174, 67, 502, + 84, 229, -33, 269, 65, -79, 592, 98, -895, 151, + 167, 194, 207, 215, -895, 58, -895, -895, -895, -895, + -895, 248, 260, 267, -895, -895, -895, -895, -895, -895, + 268, 276, 277, 279, 294, 295, 296, 307, 311, -895, + 325, 331, 335, 342, 344, -895, -895, -895, 345, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, 342, -895, -895, -895, -895, -895, -895, -895, 344, + -895, 367, -895, -895, -895, -895, -895, -895, -895, 368, -895, 82, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, -895, -895, -895, -895, -895, 345, -895, 89, + -895, -895, -895, -895, -895, -895, -895, 371, -895, 89, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, -895, 367, -895, -895, -895, -895, -895, -895, + -895, -895, -895, 383, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, 97, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, @@ -4309,95 +4309,95 @@ namespace isc { namespace dhcp { -895, -895, 138, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, 310, 349, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, -895, 364, -895, -895, 371, -895, -895, -895, - 384, -895, -895, 379, 386, -895, -895, -895, -895, -895, - -895, -895, -895, -895, -895, -895, -895, -895, 387, 388, - -895, -895, -895, -895, 382, 390, -895, -895, -895, -895, + -895, -895, -895, 380, -895, -895, 385, -895, -895, -895, + 386, -895, -895, 384, 388, -895, -895, -895, -895, -895, + -895, -895, -895, -895, -895, -895, -895, -895, 389, 391, + -895, -895, -895, -895, 392, 393, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, 150, -895, - -895, -895, 391, -895, -895, 392, -895, 396, 397, -895, - -895, 398, 399, -895, -895, -895, -895, -895, -895, -895, + -895, -895, 397, -895, -895, 398, -895, 399, 400, -895, + -895, 401, 403, -895, -895, -895, -895, -895, -895, -895, 164, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, -895, -895, -895, -895, -895, -895, 400, 181, - -895, -895, -895, -895, 41, 41, -895, 219, 403, 71, - -895, 405, 407, 408, 225, 227, 228, 415, 421, 424, - 426, 427, 428, 254, 255, 257, 262, 264, 246, 270, - 275, 265, 441, 280, 282, 281, 284, 287, 442, 443, - 452, 292, 453, 461, 462, 467, 480, 481, 484, 485, + -895, -895, -895, -895, -895, -895, -895, -895, 405, 181, + -895, -895, -895, -895, 41, 41, -895, -135, 407, 71, + -895, 408, 410, 412, 228, 230, 236, 424, 426, 427, + 428, 431, 437, 255, 257, 258, 259, 262, 263, 270, + 275, 264, 443, 280, 282, 281, 284, 287, 452, 453, + 461, 288, 462, 467, 474, 477, 480, 481, 484, 485, 488, 490, 491, 492, 313, 493, 498, 499, 503, 506, 507, 508, -895, 174, -895, 510, 511, 512, 328, 67, - -895, 514, 515, 516, 517, 518, 520, 338, 535, 536, - 537, 572, -895, 538, 84, -895, 539, 540, 556, 558, - 559, 560, 561, 562, -895, 229, -895, 563, 567, 385, - 569, 570, 571, 389, -895, 269, 573, 394, 395, -895, - 65, 575, 576, 73, -895, 401, 577, 581, 402, 583, - 404, 406, 584, 588, 414, 417, 590, 591, 592, 593, - 383, -895, 604, 422, 18, -895, -895, -895, 606, 605, - -895, 607, 608, 609, -895, -895, -895, 425, 431, 432, - 612, 617, 620, -895, -895, -895, -895, -895, -895, -895, - -895, -895, 451, -895, -895, -895, -895, -895, -105, 454, - 466, -895, 622, 623, 633, 634, 641, 468, 278, 650, - 651, 652, 653, 658, -895, 670, 672, 673, 676, 473, - 500, 679, -895, 680, 93, 188, -895, -895, 501, 502, - 504, 686, 509, 513, -895, 680, 525, 685, -895, 526, - -895, 680, 527, 528, 543, 544, 545, 546, 547, -895, - 550, 551, -895, 552, 553, 564, -895, -895, 565, -895, - -895, -895, 568, 41, -895, -895, 574, 578, -895, 579, - -895, -895, 15, 419, -895, -895, -105, 580, 582, 585, - -895, 688, -895, -895, 41, 174, 18, 67, 589, -895, - -895, -895, 81, 81, 687, -895, -895, -895, -895, -895, - -895, -895, -895, -895, 689, 690, 691, 693, -895, -895, - -895, -895, -895, -895, -895, -895, -39, 694, 695, 716, - 163, 80, 191, 180, 383, -895, -895, 717, -895, -895, - -895, -895, -895, -895, -895, -895, -895, -895, -895, 718, + -895, 514, 515, 516, 517, 518, 520, 338, 522, 523, + 542, 502, -895, 543, 84, -895, 544, 545, 546, 547, + 548, 549, 550, 551, -895, 229, -895, 552, 553, 382, + 554, 563, 574, 395, -895, 269, 581, 402, 404, -895, + 65, 583, 584, 73, -895, 406, 585, 586, 415, 588, + 416, 419, 605, 606, 425, 429, 611, 612, 613, 620, + 592, -895, 621, 440, 98, -895, -895, -895, 624, 622, + -895, 623, 625, 626, -895, -895, -895, 445, 448, 454, + 634, 635, 608, -895, -895, -895, -895, -895, -895, -895, + -895, -895, 457, -895, -895, -895, -895, -895, -105, 458, + 459, -895, 641, 642, 643, 644, 645, 464, 278, 646, + 648, 649, 650, 651, -895, 652, 667, 668, 669, 470, + 471, 672, -895, 684, 245, 188, -895, -895, 509, 513, + 519, 687, 521, 524, -895, 684, 525, 686, -895, 526, + -895, 684, 527, 528, 530, 531, 533, 534, 535, -895, + 536, 537, -895, 538, 539, 541, -895, -895, 562, -895, + -895, -895, 564, 645, -895, -895, 565, 566, -895, 567, + -895, -895, 15, 540, -895, -895, -105, 570, 571, 572, + -895, 689, -895, -895, 41, 174, 98, 67, 674, -895, + -895, -895, 81, 81, 693, -895, -895, -895, -895, -895, + -895, -895, -895, -895, 694, 695, 702, 721, -895, -895, + -895, -895, -895, -895, -895, -895, -39, 722, 723, 724, + 163, 80, 191, 180, 592, -895, -895, 725, -895, -895, + -895, -895, -895, -895, -895, -895, -895, -895, -895, 726, -895, -895, -895, -895, 107, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, -895, 687, -895, 183, 184, 208, -895, 216, - -895, -895, -895, -895, -895, -895, 722, 738, 740, 742, - 743, -895, -895, -895, -895, 744, 745, 749, 752, 753, - 755, -895, 253, -895, -895, -895, -895, -895, -895, -895, + -895, -895, -895, 693, -895, 183, 184, 208, -895, 216, + -895, -895, -895, -895, -895, -895, 692, 730, 745, 755, + 756, -895, -895, -895, -895, 757, 758, 759, 760, 761, + 762, -895, 253, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, -895, -895, 274, -895, 756, 758, -895, -895, - 761, 766, -895, -895, 764, 769, -895, -895, 767, 771, - -895, -895, 770, 772, -895, -895, -895, -895, -895, -895, + -895, -895, -895, -895, 274, -895, 763, 764, -895, -895, + 767, 765, -895, -895, 768, 772, -895, -895, 770, 774, + -895, -895, 773, 777, -895, -895, -895, -895, -895, -895, 34, -895, -895, -895, -895, -895, -895, -895, 46, -895, - -895, 773, 774, -895, -895, 775, 777, -895, 778, 779, - 780, 781, 782, 783, 298, -895, -895, -895, -895, -895, - -895, -895, 784, 785, 786, -895, 299, -895, -895, -895, + -895, 775, 779, -895, -895, 778, 780, -895, 766, 781, + 782, 783, 784, 785, 298, -895, -895, -895, -895, -895, + -895, -895, 786, 787, 788, -895, 299, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, 305, -895, - -895, -895, 787, -895, 788, -895, -895, -895, 314, -895, + -895, -895, 789, -895, 790, -895, -895, -895, 314, -895, -895, -895, -895, -895, 322, -895, 61, -895, 610, -895, - 789, 790, -895, -895, -895, -895, 791, 792, -895, -895, - -895, 793, 589, -895, 796, 797, 798, 799, 618, 615, - 619, 621, 624, 803, 808, 809, 810, 628, 629, 630, - 631, 632, 635, 81, -895, -895, 81, -895, 687, 572, - -895, 689, 269, -895, 690, 65, -895, 691, 646, -895, - 693, -39, -895, 74, 694, -895, 229, -895, 695, -79, - -895, 716, 636, 637, 638, 639, 640, 642, 163, -895, - 644, 643, 647, 80, -895, 815, 816, 191, -895, 648, - 824, 649, 827, 180, -895, -895, 128, 717, -895, -895, - 829, 835, 84, -895, 718, 836, -895, -895, 655, -895, - 348, 657, 660, 661, -895, -895, -895, -895, -895, 664, - 671, 684, 696, -895, -895, -895, -895, -895, -895, -895, - 323, -895, 347, -895, 831, -895, 857, -895, -895, -895, + 791, 795, -895, -895, -895, -895, 792, 793, -895, -895, + -895, 797, 674, -895, 798, 799, 800, 801, 619, 618, + 627, 628, 629, 804, 805, 806, 807, 631, 632, 633, + 636, 637, 638, 81, -895, -895, 81, -895, 693, 502, + -895, 694, 269, -895, 695, 65, -895, 702, 609, -895, + 721, -39, -895, 74, 722, -895, 229, -895, 723, -79, + -895, 724, 640, 647, 653, 654, 656, 657, 163, -895, + 639, 659, 660, 80, -895, 808, 809, 191, -895, 661, + 811, 670, 817, 180, -895, -895, 128, 725, -895, -895, + 816, 821, 84, -895, 726, 825, -895, -895, 679, -895, + 348, 680, 696, 700, -895, -895, -895, -895, -895, 701, + 713, 714, 717, -895, -895, -895, -895, -895, -895, -895, + 323, -895, 347, -895, 822, -895, 823, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, 353, -895, -895, -895, -895, -895, - -895, -895, -895, -895, -895, -895, 840, -895, -895, -895, - -895, -895, -895, -895, -895, -895, 858, 883, -895, -895, - -895, -895, -895, 879, -895, 359, -895, -895, -895, -895, - -895, -895, -895, -895, -895, -895, -895, -895, 713, 714, - -895, -895, 720, -895, 41, -895, -895, 899, -895, -895, + -895, -895, -895, -895, -895, -895, 828, -895, -895, -895, + -895, -895, -895, -895, -895, -895, 827, 830, -895, -895, + -895, -895, -895, 829, -895, 359, -895, -895, -895, -895, + -895, -895, -895, -895, -895, -895, -895, -895, 720, 727, + -895, -895, 728, -895, 41, -895, -895, 832, -895, -895, -895, -895, -895, 362, -895, -895, -895, -895, -895, -895, - 727, 365, -895, 680, -895, -895, -895, -895, -895, -895, + 735, 365, -895, 684, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, 646, -895, 910, 732, -895, 74, -895, -895, -895, - -895, -895, -895, 918, 737, 955, 128, -895, -895, -895, - -895, -895, 794, -895, -895, 959, -895, 795, -895, -895, - 953, -895, -895, 90, -895, -27, 953, -895, -895, 964, - 965, 966, -895, 366, -895, -895, -895, -895, -895, -895, - -895, 967, 800, 801, 804, 968, -27, -895, 806, -895, - -895, -895, 807, -895, -895, -895 + -895, 609, -895, 834, 681, -895, 74, -895, -895, -895, + -895, -895, -895, 835, 737, 918, 128, -895, -895, -895, + -895, -895, 794, -895, -895, 954, -895, 796, -895, -895, + 953, -895, -895, 90, -895, -27, 953, -895, -895, 960, + 964, 965, -895, 366, -895, -895, -895, -895, -895, -895, + -895, 966, 802, 803, 810, 967, -27, -895, 812, -895, + -895, -895, 813, -895, -895, -895 }; const short @@ -4527,45 +4527,45 @@ namespace isc { namespace dhcp { Dhcp4Parser::yypgoto_[] = { -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, -895, -895, -895, -52, -895, 222, -895, -895, + -895, -895, -895, -895, -895, -52, -895, -526, -895, 361, -895, -895, -895, -895, -895, -895, -570, -895, -895, -895, - -67, -895, -895, -895, 586, -895, -895, -895, -895, 339, - 351, -40, -28, -24, -1, 1, 11, 19, 22, -895, + -67, -895, -895, -895, 587, -895, -895, -895, -895, 337, + 532, -40, -28, -24, -1, 1, 11, 19, 22, -895, -895, -895, -895, 25, 26, 29, 30, 32, 37, -895, - 350, 40, -895, 43, -895, 44, -895, 45, -895, 47, + 351, 40, -895, 43, -895, 44, -895, 45, -895, 47, -895, -895, -895, -895, 336, 529, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, 95, -895, -895, -895, -895, -895, -895, 256, - -895, 75, -895, -630, 79, -895, -895, -895, -895, -895, + -895, -895, 99, -895, -895, -895, -895, -895, -895, 256, + -895, 75, -895, -630, 83, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -63, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, 63, -895, -895, -895, -895, -895, -895, -895, -895, 42, -895, -895, - -895, -895, -895, -895, -895, 55, -895, -895, -895, 66, - 494, -895, -895, -895, -895, -895, -895, -895, 52, -895, + -895, -895, -895, -895, -895, 56, -895, -895, -895, 59, + 496, -895, -895, -895, -895, -895, -895, -895, 54, -895, -895, -895, -895, -895, -895, -894, -895, -895, -895, 85, - -895, -895, -895, 88, 533, -895, -895, -895, -895, -895, + -895, -895, -895, 86, 555, -895, -895, -895, -895, -895, -895, -895, -895, -891, -895, -65, -895, 49, -895, 48, - -895, -895, -895, -895, -895, -895, -895, 78, -895, -895, - -112, -46, -895, -895, -895, -895, -895, 86, -895, -895, - -895, 91, -895, 519, -895, -42, -895, -895, -895, -895, + -895, -895, -895, -895, -895, -895, -895, 87, -895, -895, + -118, -46, -895, -895, -895, -895, -895, 88, -895, -895, + -895, 91, -895, 556, -895, -42, -895, -895, -895, -895, -895, -36, -895, -895, -895, -895, -895, -35, -895, -895, - -895, 92, -895, -895, -895, 87, -895, 522, -895, -895, - -895, -895, -895, -895, -895, -895, -895, -895, -895, 50, - -895, -895, -895, 51, 541, -895, -895, -51, -895, -11, - -895, -25, -895, -895, -895, 96, -895, -895, -895, 94, - -895, 531, -55, -895, 0, -895, 7, -895, 316, -895, + -895, 77, -895, -895, -895, 93, -895, 557, -895, -895, + -895, -895, -895, -895, -895, -895, -895, -895, -895, 36, + -895, -895, -895, 39, 559, -895, -895, -51, -895, -11, + -895, -25, -895, -895, -895, 76, -895, -895, -895, 79, + -895, 558, -55, -895, 0, -895, 7, -895, 312, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -890, -895, -895, -895, - -895, -895, 77, -895, -895, -895, -109, -895, -895, -895, - -895, -895, -895, -895, -895, 68, -895, -895, -895, -895, - -895, -895, -895, 64, -895, -895, -895, -895, -895, -895, - -895, -895, -895, -895, 334, 521, -895, -895, -895, -895, + -895, -895, 94, -895, -895, -895, -107, -895, -895, -895, + -895, -895, -895, -895, -895, 66, -895, -895, -895, -895, + -895, -895, -895, 57, -895, -895, -895, -895, -895, -895, + -895, -895, -895, -895, 340, 505, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, -895, - -895, -895, -895, -895, -895, 380, 505, -895, -895, -895, - -895, -895, -895, 69, -895, -895, -108, -895, -895, -895, - -895, -895, -895, -125, -895, -895, -143, -895, -895, -895, + -895, -895, -895, -895, -895, 376, 560, -895, -895, -895, + -895, -895, -895, 60, -895, -895, -106, -895, -895, -895, + -895, -895, -895, -127, -895, -895, -145, -895, -895, -895, -895, -895, -895, -895 }; @@ -4621,15 +4621,15 @@ namespace isc { namespace dhcp { 140, 198, 217, 258, 275, 259, 301, 320, 337, 357, 302, 321, 78, 774, 253, 692, 282, 205, 250, 265, 277, 696, 315, 333, 1019, 358, 293, 1020, 1032, 218, - 377, 378, 322, 715, 248, 261, 276, 921, 323, 28, - 922, 219, 335, 336, 252, 220, 29, 81, 30, 924, - 31, 120, 925, 646, 647, 648, 649, 206, 251, 266, + 658, 28, 322, 715, 248, 261, 276, 921, 323, 81, + 922, 219, 335, 336, 252, 220, 29, 120, 30, 924, + 31, 518, 925, 646, 647, 648, 649, 206, 251, 266, 278, 389, 316, 334, 957, 359, 390, 958, 221, 254, 222, 283, 795, 796, 797, 798, 255, 799, 284, 40, - 223, 84, 194, 195, 650, 443, 196, 385, 224, 197, + 223, 84, 194, 195, 650, 443, 196, 658, 224, 197, 444, 225, 449, 1146, 226, 227, 1147, 450, 228, 229, 461, 230, 94, 95, 96, 462, 231, 139, 42, 232, - 680, 681, 233, 234, 235, 732, 236, 246, 44, 260, + 377, 378, 233, 234, 235, 732, 236, 246, 44, 260, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 46, 1148, 48, 464, 1149, 1150, 1151, 1152, 465, 295, 317, 296, @@ -4637,95 +4637,95 @@ namespace isc { namespace dhcp { 124, 123, 124, 295, 50, 121, 52, 510, 123, 124, 384, 716, 511, 54, 123, 124, 56, 257, 123, 124, 58, 1035, 1036, 60, 514, 88, 443, 514, 89, 515, - 214, 878, 879, 215, 335, 336, 62, 90, 386, 91, + 214, 878, 879, 215, 335, 336, 62, 90, 385, 91, 92, 93, 94, 95, 96, 97, 98, 99, 683, 684, - 295, 449, 832, 833, 834, 387, 880, 1019, 394, 882, + 295, 449, 832, 833, 834, 386, 880, 1019, 387, 882, 1020, 1032, 123, 124, 883, 274, 873, 32, 33, 34, 35, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 139, 395, 139, 120, 121, 903, 94, 95, 96, - 139, 904, 396, 403, 404, 122, 139, 139, 123, 124, - 139, 405, 406, 125, 123, 124, 990, 903, 126, 127, - 407, 408, 905, 409, 128, 123, 124, 818, 819, 820, - 821, 822, 823, 1076, 129, 1077, 1078, 130, 410, 411, - 413, 938, 943, 294, 131, 132, 939, 944, 947, 133, - 121, 414, 134, 948, 139, 415, 135, 953, 474, 852, - 853, 854, 954, 123, 124, 510, 903, 843, 844, 416, - 955, 1107, 516, 517, 267, 417, 136, 137, 138, 421, - 268, 269, 270, 271, 272, 273, 434, 274, 442, 448, + 119, 139, 394, 139, 120, 121, 903, 94, 95, 96, + 139, 904, 680, 681, 395, 122, 139, 139, 123, 124, + 139, 396, 403, 125, 123, 124, 990, 903, 126, 127, + 404, 405, 905, 406, 128, 123, 124, 818, 819, 820, + 821, 822, 823, 1076, 129, 1077, 1078, 130, 407, 408, + 409, 938, 943, 294, 131, 132, 939, 944, 947, 133, + 121, 410, 134, 948, 139, 411, 135, 953, 474, 852, + 853, 854, 954, 123, 124, 510, 903, 843, 844, 413, + 955, 1107, 516, 517, 267, 414, 136, 137, 138, 415, + 268, 269, 270, 271, 272, 273, 416, 274, 417, 421, 461, 295, 475, 296, 297, 1108, 1111, 298, 299, 300, 139, 1112, 493, 123, 124, 1126, 855, 1118, 464, 1166, - 1127, 457, 476, 1129, 1167, 479, 140, 139, 661, 662, - 663, 664, 198, 1095, 1096, 1097, 1098, 484, 483, 485, - 489, 487, 488, 490, 217, 495, 498, 258, 205, 259, - 500, 501, 504, 505, 513, 518, 253, 519, 275, 521, - 250, 522, 523, 265, 524, 139, 525, 526, 301, 527, - 282, 218, 302, 320, 277, 528, 248, 321, 529, 261, - 530, 531, 532, 219, 315, 538, 252, 220, 206, 333, - 276, 533, 534, 357, 535, 542, 548, 549, 322, 536, - 251, 537, 541, 266, 323, 139, 550, 552, 539, 358, - 221, 254, 222, 540, 278, 553, 554, 543, 255, 544, - 545, 555, 223, 546, 316, 283, 547, 123, 124, 334, - 224, 551, 284, 225, 556, 557, 226, 227, 558, 559, + 1127, 434, 442, 1129, 1167, 448, 140, 139, 661, 662, + 663, 664, 198, 1095, 1096, 1097, 1098, 457, 476, 479, + 483, 485, 484, 487, 217, 488, 490, 258, 205, 259, + 489, 495, 498, 500, 501, 504, 253, 505, 275, 513, + 250, 519, 521, 265, 522, 139, 523, 524, 301, 525, + 282, 218, 302, 320, 277, 526, 248, 321, 527, 261, + 528, 529, 530, 219, 315, 531, 252, 220, 206, 333, + 276, 532, 533, 357, 534, 535, 536, 542, 322, 537, + 251, 541, 538, 266, 323, 139, 548, 549, 539, 358, + 221, 254, 222, 540, 278, 550, 552, 543, 255, 544, + 545, 553, 223, 546, 316, 283, 547, 551, 554, 334, + 224, 555, 284, 225, 556, 557, 226, 227, 558, 559, 228, 229, 560, 230, 561, 562, 563, 565, 231, 359, 564, 232, 566, 567, 233, 234, 235, 568, 236, 246, 569, 570, 571, 260, 573, 574, 575, 576, 578, 579, - 580, 581, 582, 1130, 583, 584, 342, 343, 344, 345, - 346, 347, 348, 349, 350, 351, 352, 353, 354, 585, - 586, 587, 589, 591, 592, 355, 356, 1, 2, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 593, 711, 594, 595, 596, 597, 598, 600, 140, 139, - 198, 601, 602, 603, 604, 605, 718, 608, 606, 612, - 613, 616, 724, 609, 610, 617, 205, 619, 622, 618, - 615, 620, 623, 621, 626, 627, 628, 629, 92, 93, - 94, 95, 96, 624, 835, 845, 625, 357, 631, 632, - 634, 639, 635, 728, 636, 637, 638, 640, 641, 642, - 841, 846, 856, 358, 643, 644, 206, 654, 655, 100, - 101, 102, 103, 104, 105, 106, 107, 645, 656, 657, - 652, 112, 113, 114, 115, 116, 117, 118, 30, 207, - 208, 209, 653, 121, 660, 666, 667, 668, 669, 675, - 842, 847, 857, 359, 210, 670, 123, 124, 211, 212, - 213, 125, 92, 93, 94, 95, 96, 671, 214, 672, - 673, 215, 128, 674, 677, 678, 676, 686, 687, 216, - 688, 689, 694, 723, 775, 690, 779, 783, 787, 691, - 791, 807, 810, 100, 101, 102, 103, 104, 105, 106, - 107, 693, 695, 697, 698, 112, 113, 114, 115, 116, - 117, 118, 119, 814, 865, 869, 888, 121, 295, 699, - 700, 701, 702, 703, 136, 137, 704, 705, 706, 707, - 123, 124, 889, 212, 890, 125, 891, 892, 897, 898, - 708, 709, 214, 899, 710, 215, 900, 901, 139, 902, - 712, 908, 907, 216, 713, 714, 720, 910, 721, 911, - 913, 722, 914, 916, 917, 920, 919, 928, 658, 927, - 931, 930, 932, 933, 934, 935, 936, 937, 940, 941, - 942, 949, 951, 964, 572, 963, 959, 968, 967, 966, - 970, 971, 972, 973, 975, 974, 976, 979, 136, 137, - 977, 978, 980, 981, 982, 983, 984, 985, 986, 1068, - 1069, 987, 988, 1057, 1058, 1059, 1060, 1061, 1072, 1062, - 1065, 1074, 139, 1064, 1066, 1089, 1073, 1071, 1090, 1109, - 1093, 1094, 217, 1100, 1114, 301, 1101, 1102, 320, 302, - 1103, 998, 321, 1021, 253, 1018, 1037, 1104, 250, 275, - 1038, 315, 337, 1029, 333, 1110, 1115, 1027, 1043, 218, - 1105, 282, 1041, 322, 248, 277, 835, 1039, 999, 323, - 845, 219, 1106, 1026, 252, 220, 1116, 1117, 1040, 1079, - 1000, 276, 841, 1080, 1001, 258, 846, 259, 251, 1119, - 1120, 316, 856, 1124, 334, 1081, 1121, 1028, 221, 254, - 222, 265, 1042, 1128, 1132, 278, 255, 1002, 1030, 1003, - 223, 1133, 1135, 1044, 1136, 1031, 283, 261, 224, 1004, + 580, 581, 582, 1130, 583, 584, 585, 586, 92, 93, + 94, 95, 96, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 587, 589, 591, 592, + 593, 594, 595, 596, 597, 598, 600, 601, 603, 100, + 101, 102, 103, 104, 105, 106, 107, 604, 140, 602, + 198, 112, 113, 114, 115, 116, 117, 118, 605, 207, + 208, 209, 724, 121, 606, 608, 205, 612, 613, 616, + 617, 609, 619, 610, 210, 615, 123, 124, 211, 212, + 213, 125, 618, 620, 835, 845, 621, 357, 214, 622, + 623, 215, 128, 644, 624, 626, 627, 628, 625, 216, + 841, 846, 856, 358, 629, 631, 206, 632, 634, 635, + 636, 639, 637, 638, 640, 92, 93, 94, 95, 96, + 641, 642, 643, 645, 652, 653, 654, 655, 656, 657, + 660, 666, 30, 667, 668, 669, 675, 676, 670, 671, + 842, 847, 857, 359, 136, 137, 100, 101, 102, 103, + 104, 105, 106, 107, 672, 673, 674, 677, 112, 113, + 114, 115, 116, 117, 118, 119, 123, 124, 139, 678, + 121, 295, 689, 694, 723, 686, 888, 718, 728, 687, + 775, 779, 783, 123, 124, 688, 212, 690, 125, 787, + 691, 693, 695, 697, 698, 214, 699, 700, 215, 701, + 702, 703, 704, 705, 706, 707, 216, 708, 791, 807, + 810, 814, 865, 869, 889, 342, 343, 344, 345, 346, + 347, 348, 349, 350, 351, 352, 353, 354, 709, 890, + 710, 712, 713, 714, 355, 356, 720, 721, 722, 891, + 892, 897, 898, 899, 900, 901, 902, 908, 911, 907, + 932, 136, 137, 910, 913, 914, 916, 917, 139, 919, + 920, 927, 928, 931, 930, 933, 934, 935, 936, 937, + 940, 941, 942, 949, 951, 139, 959, 963, 964, 967, + 966, 968, 970, 971, 972, 973, 974, 975, 979, 980, + 981, 982, 1068, 1069, 976, 1072, 978, 977, 983, 984, + 985, 1074, 1089, 986, 1090, 988, 987, 1057, 1064, 1093, + 1109, 1110, 1114, 1116, 1058, 1115, 1124, 1117, 1132, 1135, + 1059, 1060, 217, 1061, 1062, 301, 1065, 1066, 320, 302, + 1071, 998, 321, 1021, 253, 1018, 1037, 1073, 250, 275, + 1038, 315, 337, 1029, 333, 1094, 1100, 1027, 1043, 218, + 1133, 282, 1041, 322, 248, 277, 835, 1039, 999, 323, + 845, 219, 1101, 1026, 252, 220, 1102, 1103, 1040, 1079, + 1000, 276, 841, 1080, 1001, 258, 846, 259, 251, 1104, + 1105, 316, 856, 1106, 334, 1081, 1119, 1028, 221, 254, + 222, 265, 1042, 1120, 1121, 278, 255, 1002, 1030, 1003, + 223, 1128, 1137, 1044, 1136, 1031, 283, 261, 224, 1004, 1045, 225, 842, 284, 226, 227, 847, 1005, 228, 229, 1006, 230, 857, 1007, 1008, 1082, 231, 1009, 1010, 232, - 1011, 266, 233, 234, 235, 1012, 236, 246, 1013, 1137, - 1142, 1014, 1015, 1016, 1140, 1017, 1023, 1022, 1162, 1163, - 1164, 1168, 1172, 727, 725, 520, 719, 969, 577, 877, - 1139, 1141, 989, 991, 1034, 1067, 1056, 614, 1170, 1169, - 1063, 1171, 1174, 1175, 588, 1055, 993, 992, 1033, 1131, - 995, 1052, 996, 994, 607, 590, 599, 1134, 864, 997, - 874, 260, 611, 1091, 1092, 1070, 726, 1075, 1138, 633, - 1053, 1160, 1122, 1173, 1054, 0, 1088, 0, 0, 0, - 0, 630, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 998, 0, 1021, 0, 1018, 1037, + 1011, 266, 233, 234, 235, 1012, 236, 246, 1013, 1140, + 1142, 1014, 1015, 1016, 1162, 1017, 1023, 1022, 1163, 1164, + 1168, 1172, 725, 727, 711, 572, 520, 719, 577, 877, + 1139, 969, 1141, 991, 1034, 1067, 989, 1056, 1055, 614, + 1170, 1169, 1063, 1131, 997, 992, 993, 1171, 1174, 1175, + 1092, 1091, 995, 994, 1054, 1053, 874, 1033, 996, 1134, + 1075, 260, 726, 1070, 864, 630, 588, 1088, 1052, 1160, + 1138, 1173, 1122, 590, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 599, 0, 0, 0, 0, 0, 0, + 0, 607, 0, 0, 998, 0, 1021, 611, 1018, 1037, 0, 0, 0, 1038, 0, 0, 1029, 0, 0, 1079, 1027, 1043, 0, 1080, 0, 1041, 0, 0, 0, 0, - 1039, 999, 0, 0, 0, 1081, 1026, 0, 0, 0, + 1039, 999, 0, 0, 633, 1081, 1026, 0, 0, 0, 0, 1040, 0, 1000, 0, 0, 0, 1001, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1028, 0, 0, 0, 0, 1042, 0, 0, 0, 0, @@ -4743,15 +4743,15 @@ namespace isc { namespace dhcp { 67, 68, 69, 70, 71, 70, 73, 74, 75, 76, 73, 74, 64, 643, 69, 585, 71, 68, 69, 70, 71, 591, 73, 74, 918, 76, 72, 918, 918, 69, - 12, 13, 74, 18, 69, 70, 71, 3, 74, 0, - 6, 69, 121, 122, 69, 69, 5, 186, 7, 3, - 9, 80, 6, 158, 159, 160, 161, 68, 69, 70, + 556, 0, 74, 18, 69, 70, 71, 3, 74, 186, + 6, 69, 121, 122, 69, 69, 5, 80, 7, 3, + 9, 186, 6, 158, 159, 160, 161, 68, 69, 70, 71, 3, 73, 74, 3, 76, 8, 6, 69, 69, 69, 71, 111, 112, 113, 114, 69, 116, 71, 7, - 69, 10, 15, 16, 189, 3, 19, 4, 69, 22, + 69, 10, 15, 16, 189, 3, 19, 613, 69, 22, 8, 69, 3, 3, 69, 69, 6, 8, 69, 69, 3, 69, 28, 29, 30, 8, 69, 186, 7, 69, - 17, 18, 69, 69, 69, 34, 69, 69, 7, 70, + 12, 13, 69, 69, 69, 34, 69, 69, 7, 70, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 7, 166, 7, 3, 169, 170, 171, 172, 8, 82, 83, 84, @@ -4759,14 +4759,14 @@ namespace isc { namespace dhcp { 95, 94, 95, 82, 7, 81, 7, 3, 94, 95, 3, 156, 8, 7, 94, 95, 7, 93, 94, 95, 7, 107, 108, 7, 3, 11, 3, 3, 14, 8, - 106, 8, 8, 109, 121, 122, 7, 23, 8, 25, + 106, 8, 8, 109, 121, 122, 7, 23, 4, 25, 26, 27, 28, 29, 30, 31, 32, 33, 20, 21, - 82, 3, 132, 133, 134, 3, 8, 1111, 4, 3, + 82, 3, 132, 133, 134, 8, 8, 1111, 3, 3, 1111, 1111, 94, 95, 8, 118, 119, 186, 187, 188, 189, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 186, 4, 186, 80, 81, 3, 28, 29, 30, - 186, 8, 4, 4, 4, 91, 186, 186, 94, 95, + 186, 8, 17, 18, 4, 91, 186, 186, 94, 95, 186, 4, 4, 99, 94, 95, 906, 3, 104, 105, 4, 4, 8, 4, 110, 94, 95, 124, 125, 126, 127, 128, 129, 165, 120, 167, 168, 123, 4, 4, @@ -4777,77 +4777,77 @@ namespace isc { namespace dhcp { 111, 112, 113, 114, 115, 116, 4, 118, 4, 4, 3, 82, 3, 84, 85, 8, 3, 88, 89, 90, 186, 8, 3, 94, 95, 3, 186, 8, 3, 3, - 8, 4, 8, 8, 8, 4, 443, 186, 100, 101, - 102, 103, 449, 35, 36, 37, 38, 8, 4, 3, - 8, 4, 4, 3, 461, 4, 4, 464, 449, 464, - 4, 4, 4, 4, 4, 186, 461, 4, 475, 4, - 461, 4, 4, 464, 189, 186, 189, 189, 485, 4, - 475, 461, 485, 490, 475, 4, 461, 490, 4, 464, - 4, 4, 4, 461, 485, 189, 461, 461, 449, 490, - 475, 187, 187, 510, 187, 4, 4, 4, 490, 187, - 461, 187, 187, 464, 490, 186, 4, 4, 188, 510, + 8, 4, 4, 8, 8, 4, 443, 186, 100, 101, + 102, 103, 449, 35, 36, 37, 38, 4, 8, 4, + 4, 3, 8, 4, 461, 4, 3, 464, 449, 464, + 8, 4, 4, 4, 4, 4, 461, 4, 475, 4, + 461, 4, 4, 464, 4, 186, 4, 189, 485, 189, + 475, 461, 485, 490, 475, 189, 461, 490, 4, 464, + 4, 4, 4, 461, 485, 4, 461, 461, 449, 490, + 475, 4, 187, 510, 187, 187, 187, 4, 490, 187, + 461, 187, 189, 464, 490, 186, 4, 4, 188, 510, 461, 461, 461, 188, 475, 4, 4, 187, 461, 187, - 189, 4, 461, 189, 485, 475, 189, 94, 95, 490, - 461, 189, 475, 461, 4, 4, 461, 461, 4, 4, + 189, 4, 461, 189, 485, 475, 189, 189, 4, 490, + 461, 4, 475, 461, 4, 4, 461, 461, 4, 4, 461, 461, 4, 461, 4, 4, 4, 4, 461, 510, 187, 461, 4, 4, 461, 461, 461, 4, 461, 461, 4, 4, 4, 464, 4, 4, 4, 189, 4, 4, - 4, 4, 4, 1093, 4, 187, 143, 144, 145, 146, - 147, 148, 149, 150, 151, 152, 153, 154, 155, 4, - 4, 4, 4, 4, 4, 162, 163, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, - 4, 613, 4, 4, 4, 4, 4, 4, 635, 186, - 637, 4, 187, 4, 4, 4, 157, 4, 189, 4, - 4, 4, 634, 189, 189, 4, 637, 4, 4, 187, - 189, 187, 4, 187, 4, 4, 4, 4, 26, 27, - 28, 29, 30, 189, 671, 672, 189, 674, 4, 187, - 4, 186, 7, 24, 7, 7, 7, 186, 186, 7, - 671, 672, 673, 674, 7, 5, 637, 5, 5, 57, - 58, 59, 60, 61, 62, 63, 64, 186, 5, 5, - 186, 69, 70, 71, 72, 73, 74, 75, 7, 77, - 78, 79, 186, 81, 186, 5, 5, 5, 5, 186, - 671, 672, 673, 674, 92, 7, 94, 95, 96, 97, - 98, 99, 26, 27, 28, 29, 30, 7, 106, 7, - 7, 109, 110, 7, 5, 5, 186, 186, 186, 117, - 186, 5, 7, 5, 7, 186, 7, 7, 7, 186, - 7, 7, 7, 57, 58, 59, 60, 61, 62, 63, - 64, 186, 186, 186, 186, 69, 70, 71, 72, 73, - 74, 75, 76, 7, 7, 7, 4, 81, 82, 186, - 186, 186, 186, 186, 162, 163, 186, 186, 186, 186, - 94, 95, 4, 97, 4, 99, 4, 4, 4, 4, - 186, 186, 106, 4, 186, 109, 4, 4, 186, 4, - 186, 3, 6, 117, 186, 186, 186, 6, 186, 3, - 6, 186, 3, 6, 3, 3, 6, 3, 556, 6, - 3, 6, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 3, 443, 6, 186, 4, 6, 8, - 4, 4, 4, 4, 189, 187, 187, 4, 162, 163, - 189, 187, 4, 4, 4, 187, 187, 187, 187, 4, - 4, 189, 187, 187, 187, 187, 187, 187, 4, 187, - 187, 4, 186, 189, 187, 6, 187, 189, 3, 8, - 4, 186, 909, 186, 4, 912, 186, 186, 915, 912, - 186, 918, 915, 918, 909, 918, 923, 186, 909, 926, - 923, 912, 929, 918, 915, 8, 8, 918, 923, 909, - 186, 926, 923, 915, 909, 926, 943, 923, 918, 915, - 947, 909, 186, 918, 909, 909, 3, 8, 923, 956, + 4, 4, 4, 1093, 4, 187, 4, 4, 26, 27, + 28, 29, 30, 173, 174, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 57, + 58, 59, 60, 61, 62, 63, 64, 4, 635, 187, + 637, 69, 70, 71, 72, 73, 74, 75, 4, 77, + 78, 79, 634, 81, 189, 4, 637, 4, 4, 4, + 4, 189, 4, 189, 92, 189, 94, 95, 96, 97, + 98, 99, 187, 187, 671, 672, 187, 674, 106, 4, + 4, 109, 110, 5, 189, 4, 4, 4, 189, 117, + 671, 672, 673, 674, 4, 4, 637, 187, 4, 7, + 7, 186, 7, 7, 186, 26, 27, 28, 29, 30, + 186, 7, 7, 186, 186, 186, 5, 5, 5, 5, + 186, 5, 7, 5, 5, 5, 186, 186, 7, 7, + 671, 672, 673, 674, 162, 163, 57, 58, 59, 60, + 61, 62, 63, 64, 7, 7, 7, 5, 69, 70, + 71, 72, 73, 74, 75, 76, 94, 95, 186, 5, + 81, 82, 5, 7, 5, 186, 4, 157, 24, 186, + 7, 7, 7, 94, 95, 186, 97, 186, 99, 7, + 186, 186, 186, 186, 186, 106, 186, 186, 109, 186, + 186, 186, 186, 186, 186, 186, 117, 186, 7, 7, + 7, 7, 7, 7, 4, 143, 144, 145, 146, 147, + 148, 149, 150, 151, 152, 153, 154, 155, 186, 4, + 186, 186, 186, 186, 162, 163, 186, 186, 186, 4, + 4, 4, 4, 4, 4, 4, 4, 3, 3, 6, + 4, 162, 163, 6, 6, 3, 6, 3, 186, 6, + 3, 6, 3, 3, 6, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 186, 186, 6, 3, 6, + 8, 4, 4, 4, 4, 4, 187, 189, 4, 4, + 4, 4, 4, 4, 187, 4, 187, 189, 187, 187, + 187, 4, 6, 187, 3, 187, 189, 187, 189, 4, + 8, 8, 4, 3, 187, 8, 4, 8, 4, 4, + 187, 187, 909, 187, 187, 912, 187, 187, 915, 912, + 189, 918, 915, 918, 909, 918, 923, 187, 909, 926, + 923, 912, 929, 918, 915, 186, 186, 918, 923, 909, + 189, 926, 923, 915, 909, 926, 943, 923, 918, 915, + 947, 909, 186, 918, 909, 909, 186, 186, 923, 956, 918, 926, 943, 956, 918, 962, 947, 962, 909, 186, - 186, 912, 953, 4, 915, 956, 186, 918, 909, 909, - 909, 962, 923, 186, 4, 926, 909, 918, 918, 918, - 909, 189, 4, 923, 187, 918, 926, 962, 909, 918, + 186, 912, 953, 186, 915, 956, 186, 918, 909, 909, + 909, 962, 923, 186, 186, 926, 909, 918, 918, 918, + 909, 186, 4, 923, 187, 918, 926, 962, 909, 918, 923, 909, 943, 926, 909, 909, 947, 918, 909, 909, 918, 909, 953, 918, 918, 956, 909, 918, 918, 909, - 918, 962, 909, 909, 909, 918, 909, 909, 918, 4, - 7, 918, 918, 918, 5, 918, 918, 918, 4, 4, - 4, 4, 4, 637, 635, 389, 626, 882, 449, 723, - 186, 186, 903, 908, 921, 943, 931, 493, 187, 189, - 938, 187, 186, 186, 461, 929, 911, 909, 920, 1111, - 914, 924, 915, 912, 485, 464, 475, 1116, 674, 917, - 694, 962, 490, 962, 964, 947, 636, 953, 1126, 514, - 926, 1146, 1074, 1166, 928, -1, 957, -1, -1, -1, - -1, 510, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 1111, -1, 1111, -1, 1111, 1116, + 918, 962, 909, 909, 909, 918, 909, 909, 918, 5, + 7, 918, 918, 918, 4, 918, 918, 918, 4, 4, + 4, 4, 635, 637, 613, 443, 389, 626, 449, 723, + 186, 882, 186, 908, 921, 943, 903, 931, 929, 493, + 187, 189, 938, 1111, 917, 909, 911, 187, 186, 186, + 964, 962, 914, 912, 928, 926, 694, 920, 915, 1116, + 953, 962, 636, 947, 674, 510, 461, 957, 924, 1146, + 1126, 1166, 1074, 464, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 475, -1, -1, -1, -1, -1, -1, + -1, 485, -1, -1, 1111, -1, 1111, 490, 1111, 1116, -1, -1, -1, 1116, -1, -1, 1111, -1, -1, 1126, 1111, 1116, -1, 1126, -1, 1116, -1, -1, -1, -1, - 1116, 1111, -1, -1, -1, 1126, 1111, -1, -1, -1, + 1116, 1111, -1, -1, 514, 1126, 1111, -1, -1, -1, -1, 1116, -1, 1111, -1, -1, -1, 1111, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1111, -1, -1, -1, -1, 1116, -1, -1, -1, -1, @@ -4933,7 +4933,7 @@ namespace isc { namespace dhcp { 17, 18, 272, 20, 21, 275, 186, 186, 186, 5, 186, 186, 216, 186, 7, 186, 216, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, - 186, 205, 186, 186, 186, 18, 156, 546, 157, 250, + 186, 209, 186, 186, 186, 18, 156, 546, 157, 250, 186, 186, 186, 5, 205, 229, 565, 264, 24, 281, 282, 283, 34, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh index 4781714a95..55756cdc62 100644 --- a/src/bin/dhcp4/location.hh +++ b/src/bin/dhcp4/location.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101521 // A Bison parser, made by GNU Bison 3.6.4. // Locations for Bison parsers in C++ diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh index 14183aa09e..125eacfcad 100644 --- a/src/bin/dhcp4/position.hh +++ b/src/bin/dhcp4/position.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101521 // A Bison parser, made by GNU Bison 3.6.4. // Starting with Bison 3.2, this file is useless: the structure it diff --git a/src/bin/dhcp4/stack.hh b/src/bin/dhcp4/stack.hh index 08a16cbf71..ff195fc3af 100644 --- a/src/bin/dhcp4/stack.hh +++ b/src/bin/dhcp4/stack.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101521 // A Bison parser, made by GNU Bison 3.6.4. // Starting with Bison 3.2, this file is useless: the structure it diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc index cb42d9eeb6..ff0ede0273 100644 --- a/src/bin/dhcp6/dhcp6_parser.cc +++ b/src/bin/dhcp6/dhcp6_parser.cc @@ -2108,7 +2108,7 @@ namespace isc { namespace dhcp { case 298: #line 1135 "dhcp6_parser.yy" - { + { ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ()); ctx.leave(); } @@ -4396,128 +4396,128 @@ namespace isc { namespace dhcp { { 427, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, 41, 33, 44, 46, 50, - 52, 56, 62, 89, 95, 101, 109, 132, 134, 148, + 52, 56, 62, 89, 101, 109, 132, 134, 148, 179, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, - -929, -929, -929, -929, -929, -929, -929, -929, 33, -157, - 61, 116, 27, 487, 51, 186, 261, 59, 71, 206, - -65, 592, 119, -929, 180, 232, 251, 254, 260, -929, - 75, -929, -929, -929, -929, -929, -929, -929, -929, 262, - 270, 280, 303, 327, 330, 339, 345, 366, 390, 391, - 398, -929, 400, 401, 408, 410, 412, -929, -929, -929, - 414, -929, -929, -929, -929, -929, -929, -929, -929, -929, - -929, -929, -929, -929, -929, -929, -929, 416, -929, -929, - -929, -929, -929, -929, -929, 417, -929, 92, -929, -929, + -929, -929, -929, -929, -929, -929, -929, -929, 33, -123, + 225, 116, 27, 487, 51, 186, 261, 59, 71, 206, + -65, 592, 119, -929, 249, 259, 262, 255, 271, -929, + 75, -929, -929, -929, -929, -929, -929, -929, -929, 280, + 303, 327, 330, 339, 345, 366, 390, 391, 398, 400, + 401, -929, 408, 410, 412, 414, 416, -929, -929, -929, + 417, -929, -929, -929, -929, -929, -929, -929, -929, -929, + -929, -929, -929, -929, -929, -929, -929, 420, -929, -929, + -929, -929, -929, -929, -929, 421, -929, 92, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, - -929, -929, 420, -929, 96, -929, -929, -929, -929, -929, - -929, -929, -929, -929, -929, 421, 422, -929, -929, -929, + -929, -929, 422, -929, 96, -929, -929, -929, -929, -929, + -929, -929, -929, -929, -929, 423, 424, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, 112, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, - -929, -929, -929, 114, -929, -929, -929, -929, -929, 423, - -929, 424, 426, -929, -929, -929, -929, -929, -929, 115, + -929, -929, -929, 114, -929, -929, -929, -929, -929, 426, + -929, 432, 436, -929, -929, -929, -929, -929, -929, 115, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, 289, 350, -929, -929, -929, -929, -929, -929, -929, -929, 325, -929, -929, - 432, -929, -929, -929, 436, -929, -929, 334, 438, -929, + 437, -929, -929, -929, 440, -929, -929, 334, 442, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, - -929, -929, 440, 441, -929, -929, -929, -929, 385, 447, + -929, -929, 446, 448, -929, -929, -929, -929, 385, 453, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, - -929, -929, 184, -929, -929, -929, 448, -929, -929, 452, - -929, 453, 456, -929, -929, 457, 460, -929, -929, -929, + -929, -929, 184, -929, -929, -929, 456, -929, -929, 457, + -929, 460, 462, -929, -929, 463, 464, -929, -929, -929, -929, -929, -929, -929, 192, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, - -929, -929, 462, 205, -929, -929, -929, -929, 33, 33, - -929, 273, 464, 61, -929, 465, 466, 468, 472, 473, - 476, 288, 291, 294, 298, 301, 305, 306, 308, 284, - 292, 302, 313, 478, 314, 316, 318, 319, 320, 480, - 509, 514, 323, 518, 519, 520, 521, 522, 523, 524, - 525, 538, 539, 540, 541, 549, 550, 552, 553, 363, - 555, 556, 557, 558, 559, 560, 562, -929, 116, -929, - 564, 372, 27, -929, 566, 567, 568, 577, 578, 388, - 387, 581, 582, 584, 487, -929, 585, 51, -929, 587, - 399, 589, 402, 403, 186, -929, 595, 596, 597, 598, - 600, 601, 617, -929, 261, -929, 618, 624, 434, 626, - 627, 628, 437, -929, 71, 629, 439, 449, -929, 206, - 631, 633, 74, -929, 451, 634, 640, 450, 645, 455, - 458, 647, 648, 461, 463, 650, 651, 655, 657, 592, - -929, 659, 469, 119, -929, -929, -929, 661, 673, -929, + -929, -929, 465, 205, -929, -929, -929, -929, 33, 33, + -929, 263, 466, 225, -929, 468, 472, 473, 476, 477, + 478, 288, 291, 294, 298, 301, 305, 306, 308, 311, + 292, 302, 314, 480, 316, 318, 319, 320, 321, 511, + 516, 518, 326, 520, 521, 522, 523, 524, 525, 538, + 539, 540, 541, 549, 550, 552, 553, 554, 555, 365, + 557, 558, 559, 560, 562, 564, 565, -929, 116, -929, + 566, 384, 27, -929, 567, 568, 578, 579, 580, 393, + 388, 582, 585, 587, 487, -929, 589, 51, -929, 590, + 402, 594, 404, 405, 186, -929, 597, 598, 600, 601, + 617, 618, 622, -929, 261, -929, 624, 625, 435, 627, + 628, 629, 438, -929, 71, 630, 439, 441, -929, 206, + 633, 640, 74, -929, 449, 641, 644, 454, 646, 458, + 459, 647, 648, 461, 467, 651, 655, 656, 657, 592, + -929, 659, 470, 119, -929, -929, -929, 662, 673, -929, 496, 686, 687, 693, 694, 697, -929, -929, -929, -929, - -929, -929, -929, -929, -929, -929, -929, -929, 510, -929, - -929, -929, -929, -929, -100, 511, 512, -929, 698, 702, + -929, -929, -929, -929, -929, -929, -929, -929, 509, -929, + -929, -929, -929, -929, -100, 510, 512, -929, 700, 702, 703, 704, 526, 272, 709, 712, 713, 714, 715, 716, 718, 719, 720, 722, -929, 723, 725, 726, 727, 531, 532, 730, -929, 731, -929, -929, 732, 733, 546, 561, - 563, -929, -929, 731, 565, 747, -929, 569, -929, 570, - -929, 571, -929, -929, -929, 731, 731, 731, 572, 573, - 574, 575, -929, 576, 579, -929, 580, 583, 586, -929, - -929, 588, -929, -929, -929, 590, 33, -929, -929, 591, - 593, -929, 594, -929, -929, 84, 502, -929, -929, -100, + 563, -929, -929, 731, 569, 747, -929, 570, -929, 571, + -929, 572, -929, -929, -929, 731, 731, 731, 573, 574, + 575, 576, -929, 577, 581, -929, 583, 584, 586, -929, + -929, 588, -929, -929, -929, 591, 704, -929, -929, 593, + 595, -929, 596, -929, -929, 84, 608, -929, -929, -100, 602, 603, 604, -929, 751, -929, -929, 33, 116, -929, - 119, 27, 285, 285, 753, -929, -929, -929, -929, -929, - -929, -929, -929, -929, 764, 765, 768, -929, -929, -929, - -929, -929, -929, -929, -929, 769, -73, 33, 286, 675, - 772, 774, 776, 237, 64, 67, 202, 136, 592, -929, - -929, 782, -929, -929, 783, 784, -929, -929, -929, -929, + 119, 27, 285, 285, 752, -929, -929, -929, -929, -929, + -929, -929, -929, -929, 753, 766, 767, -929, -929, -929, + -929, -929, -929, -929, -929, 769, -73, 33, 286, 676, + 774, 776, 777, 237, 64, 67, 202, 136, 592, -929, + -929, 781, -929, -929, 784, 787, -929, -929, -929, -929, -929, -61, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, - -929, 753, -929, 216, 223, 235, -929, -929, -929, -929, - 754, 790, 791, 795, 796, -929, 797, 798, -929, -929, - -929, 799, 800, 801, 802, -929, 287, -929, -929, -929, + -929, 752, -929, 216, 223, 235, -929, -929, -929, -929, + 754, 791, 795, 796, 797, -929, 798, 799, -929, -929, + -929, 800, 801, 802, 803, -929, 287, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, 293, -929, - 803, 804, -929, -929, 805, 807, -929, -929, 806, 810, - -929, -929, 808, 812, -929, -929, 813, 815, -929, -929, + 804, 805, -929, -929, 806, 808, -929, -929, 807, 811, + -929, -929, 809, 813, -929, -929, 812, 816, -929, -929, -929, 78, -929, -929, -929, 814, -929, -929, -929, 146, -929, -929, -929, -929, 296, -929, -929, -929, 198, -929, - -929, 816, 818, -929, -929, 817, 821, -929, 822, 823, + -929, 815, 819, -929, -929, 817, 821, -929, 822, 823, 824, 825, 826, 827, 297, -929, -929, -929, -929, -929, -929, -929, -929, -929, 828, 829, 830, -929, -929, -929, -929, 300, -929, -929, -929, -929, -929, -929, 831, 832, 833, -929, 329, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, 332, -929, -929, -929, 834, -929, 835, -929, -929, -929, 338, -929, -929, -929, -929, -929, - 347, -929, 233, -929, 614, -929, 819, 837, -929, -929, - 836, 838, -929, -929, -929, 839, -929, 840, -929, -929, - -929, 841, 844, 845, 846, 621, 646, 649, 654, 658, - 848, 660, 662, 850, 852, 854, 664, 665, 666, 667, - 285, -929, -929, 285, -929, 753, 487, -929, 764, 71, - -929, 765, 206, -929, 768, 623, -929, 769, -73, -929, - -929, 286, -929, 857, 675, -929, 38, 772, -929, 261, - -929, 774, -65, -929, 776, 669, 670, 671, 672, 674, - 676, 237, -929, 864, 866, 677, 678, 679, 64, -929, - 680, 681, 684, 67, -929, 876, 879, 202, -929, 695, - 886, 707, 889, 136, -929, -929, 164, 782, -929, -929, - 902, 906, 51, -929, 783, 186, -929, 784, 917, -929, - -929, 386, 736, 742, 755, -929, -929, -929, -929, -929, - 761, -929, -929, 767, 771, 775, -929, -929, -929, -929, - -929, 348, -929, 349, -929, 916, -929, 950, -929, -929, + 347, -929, 233, -929, 615, -929, 836, 837, -929, -929, + 838, 840, -929, -929, -929, 839, -929, 842, -929, -929, + -929, 841, 845, 846, 847, 658, 649, 660, 661, 664, + 848, 665, 666, 850, 852, 853, 667, 668, 669, 670, + 285, -929, -929, 285, -929, 752, 487, -929, 753, 71, + -929, 766, 206, -929, 767, 623, -929, 769, -73, -929, + -929, 286, -929, 860, 676, -929, 38, 774, -929, 261, + -929, 776, -65, -929, 777, 672, 674, 675, 677, 678, + 679, 237, -929, 864, 867, 681, 682, 684, 64, -929, + 683, 688, 695, 67, -929, 888, 889, 202, -929, 705, + 904, 729, 905, 136, -929, -929, 164, 781, -929, -929, + 915, 907, 51, -929, 784, 186, -929, 787, 926, -929, + -929, 386, 631, 742, 755, -929, -929, -929, -929, -929, + 761, -929, -929, 764, 768, 771, -929, -929, -929, -929, + -929, 348, -929, 349, -929, 953, -929, 961, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, 374, -929, - -929, -929, -929, -929, -929, -929, -929, 787, -929, -929, - 958, -929, -929, -929, -929, -929, 969, 907, -929, -929, - -929, -929, -929, 976, -929, 375, -929, -929, -929, -929, - -929, -929, -929, -929, 81, 792, -929, -929, -929, -929, - -929, -929, -929, -929, 794, 809, -929, -929, 811, -929, + -929, -929, -929, -929, -929, -929, -929, 783, -929, -929, + 977, -929, -929, -929, -929, -929, 976, 983, -929, -929, + -929, -929, -929, 980, -929, 375, -929, -929, -929, -929, + -929, -929, -929, -929, 81, 818, -929, -929, -929, -929, + -929, -929, -929, -929, 820, 843, -929, -929, 844, -929, 33, -929, -929, 987, -929, -929, -929, -929, -929, 376, - -929, -929, -929, -929, -929, -929, 820, 378, -929, 382, - -929, 842, -929, -929, -929, -929, -929, -929, -929, -929, + -929, -929, -929, -929, -929, -929, 849, 378, -929, 382, + -929, 851, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, 623, -929, - -929, 989, 843, -929, 38, -929, -929, -929, -929, -929, - -929, -929, -929, -929, -929, -929, 991, 847, 992, 164, - -929, -929, -929, -929, -929, -929, 849, -929, -929, 994, - -929, 851, -929, -929, 990, -929, -929, 253, -929, 12, + -929, 989, 854, -929, 38, -929, -929, -929, -929, -929, + -929, -929, -929, -929, -929, -929, 991, 810, 992, 164, + -929, -929, -929, -929, -929, -929, 859, -929, -929, 994, + -929, 861, -929, -929, 990, -929, -929, 253, -929, 12, 990, -929, -929, 996, 997, 998, -929, 389, -929, -929, - -929, -929, -929, -929, -929, 1002, 856, 853, 859, 1004, - 12, -929, 861, -929, -929, -929, 862, -929, -929, -929 + -929, -929, -929, -929, -929, 999, 857, 862, 863, 1002, + 12, -929, 865, -929, -929, -929, 866, -929, -929, -929 }; const short @@ -4653,47 +4653,47 @@ namespace isc { namespace dhcp { Dhcp6Parser::yypgoto_[] = { -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, - -929, -929, -929, -929, -929, -929, -10, -929, 444, -929, - -929, -929, -929, -929, -929, 322, -929, -555, -929, -929, - -929, -71, -929, -929, -929, 607, -929, -929, -929, -929, - 353, 554, -929, -929, -59, -43, -42, -40, -39, -28, + -929, -929, -929, -929, -929, -929, -10, -929, -534, -929, + 372, -929, -929, -929, -929, 154, -929, -555, -929, -929, + -929, -71, -929, -929, -929, 606, -929, -929, -929, -929, + 352, 605, -929, -929, -59, -43, -42, -40, -39, -28, -27, -26, -23, -21, -15, -929, -9, -3, -1, 17, - -929, 368, 18, -929, 20, -929, 25, -929, 28, -929, - 30, -929, -929, -929, -929, -929, -929, -929, -929, 357, - 599, -929, -929, -929, -929, -929, -929, -929, -929, -929, - 278, -929, 76, -929, -641, 80, -929, -929, -929, -929, + -929, 362, 18, -929, 20, -929, 25, -929, 28, -929, + 30, -929, -929, -929, -929, -929, -929, -929, -929, 354, + 556, -929, -929, -929, -929, -929, -929, -929, -929, -929, + 276, -929, 76, -929, -641, 79, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -67, -929, -679, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, 58, -929, -929, -929, -929, -929, 65, -663, -929, -929, -929, -929, 63, -929, -929, -929, -929, -929, -929, -929, 34, -929, -929, -929, -929, -929, -929, -929, 55, -929, -929, - -929, 54, 527, -929, -929, -929, -929, -929, -929, -929, + -929, 48, 514, -929, -929, -929, -929, -929, -929, -929, 49, -929, -929, -929, -929, -929, -929, -928, -929, -929, - -929, 83, -929, -929, -929, 86, 605, -929, -929, -927, + -929, 83, -929, -929, -929, 86, 599, -929, -929, -927, -929, -926, -929, 35, -929, 37, -929, 32, -929, -929, -929, -920, -929, -929, -929, -929, 77, -929, -929, -135, - 960, -929, -929, -929, -929, -929, 87, -929, -929, -929, - 97, -929, 537, -929, -66, -929, -929, -929, -929, -929, + 958, -929, -929, -929, -929, -929, 85, -929, -929, -929, + 90, -929, 536, -929, -66, -929, -929, -929, -929, -929, -47, -929, -929, -929, -929, -929, 13, -929, -929, -929, - 90, -929, -929, -929, 99, -929, 548, -929, -929, -929, - -929, -929, -929, -929, -929, -929, -929, -929, 21, -929, - -929, -929, 47, 606, -929, -929, -55, -929, 1, -929, - -929, -929, -929, -929, 43, -929, -929, -929, 48, 608, + 87, -929, -929, -929, 94, -929, 533, -929, -929, -929, + -929, -929, -929, -929, -929, -929, -929, -929, 42, -929, + -929, -929, 36, 607, -929, -929, -55, -929, 1, -929, + -929, -929, -929, -929, 45, -929, -929, -929, 29, 609, -929, -929, -929, -929, -929, -929, -929, -57, -929, -929, - -929, 91, -929, -929, -929, 98, -929, 610, 354, -929, + -929, 93, -929, -929, -929, 97, -929, 610, 356, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -919, -929, -929, -929, -929, -929, -929, -929, - 102, -929, -929, -929, -116, -929, -929, -929, -929, -929, - -929, -929, 82, -929, -929, -929, -929, -929, -929, -929, - -929, -929, -929, -929, -929, 69, -929, -929, -929, -929, + 98, -929, -929, -929, -113, -929, -929, -929, -929, -929, + -929, -929, 80, -929, -929, -929, -929, -929, -929, -929, + -929, -929, -929, -929, -929, 72, -929, -929, -929, -929, -929, -929, -929, 68, -929, -929, -929, -929, -929, -929, - -929, -929, -929, -929, 370, 535, -929, -929, -929, -929, + -929, -929, -929, -929, 377, 543, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, -929, - -929, -929, -929, -929, -929, 413, 542, -929, -929, -929, - -929, -929, -929, 70, -929, -929, -117, -929, -929, -929, - -929, -929, -929, -136, -929, -929, -154, -929, -929, -929, + -929, -929, -929, -929, -929, 418, 537, -929, -929, -929, + -929, -929, -929, 69, -929, -929, -115, -929, -929, -929, + -929, -929, -929, -133, -929, -929, -151, -929, -929, -929, -929, -929, -929, -929 }; @@ -4751,113 +4751,113 @@ namespace isc { namespace dhcp { 146, 203, 220, 259, 273, 293, 38, 315, 334, 351, 371, 316, 335, 336, 221, 858, 256, 208, 253, 266, 277, 295, 788, 329, 347, 818, 372, 1071, 1072, 1073, - 222, 223, 337, 224, 225, 1077, 1083, 86, 31, 809, + 222, 223, 337, 224, 225, 1077, 1083, 677, 31, 809, 32, 30, 33, 201, 202, 226, 227, 228, 709, 287, 229, 42, 230, 44, 349, 350, 913, 46, 231, 48, 715, 716, 717, 50, 232, 666, 667, 668, 669, 52, - 233, 89, 234, 209, 254, 267, 278, 296, 403, 330, + 233, 86, 234, 209, 254, 267, 278, 296, 403, 330, 348, 958, 373, 404, 959, 852, 251, 262, 276, 294, 235, 236, 308, 237, 751, 458, 54, 670, 238, 462, - 459, 239, 56, 240, 463, 248, 123, 309, 58, 260, - 274, 261, 275, 124, 125, 474, 60, 477, 484, 123, + 459, 239, 677, 240, 463, 248, 123, 309, 56, 260, + 274, 261, 275, 124, 125, 474, 58, 477, 484, 123, 475, 810, 478, 485, 124, 125, 122, 93, 94, 145, - 258, 95, 391, 392, 96, 97, 98, 124, 125, 62, - 309, 64, 310, 311, 1089, 1090, 312, 313, 314, 961, - 124, 125, 962, 124, 125, 66, 217, 124, 125, 218, + 258, 95, 391, 392, 96, 97, 98, 124, 125, 60, + 309, 62, 310, 311, 1089, 1090, 312, 313, 314, 961, + 124, 125, 962, 124, 125, 64, 217, 124, 125, 218, 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, 1212, 397, 512, 1213, 1214, + 119, 120, 121, 122, 123, 1212, 66, 512, 1213, 1214, 1215, 1216, 513, 349, 350, 529, 853, 854, 855, 856, 530, 967, 124, 125, 968, 868, 869, 870, 533, 126, 1177, 1178, 1179, 534, 127, 128, 129, 130, 131, 458, 132, 145, 124, 125, 918, 133, 533, 34, 35, 36, - 37, 919, 145, 309, 134, 398, 1007, 135, 462, 1008, + 37, 919, 145, 309, 134, 89, 1007, 135, 462, 1008, 1071, 1072, 1073, 920, 136, 145, 733, 734, 1077, 1083, - 124, 125, 137, 138, 123, 399, 1210, 139, 145, 1211, - 140, 145, 400, 401, 141, 145, 411, 268, 269, 270, - 271, 272, 124, 125, 412, 309, 331, 310, 311, 332, - 333, 888, 889, 890, 413, 142, 143, 144, 124, 125, + 124, 125, 137, 138, 123, 397, 1210, 139, 145, 1211, + 140, 145, 398, 400, 141, 145, 399, 268, 269, 270, + 271, 272, 124, 125, 401, 309, 331, 310, 311, 332, + 333, 888, 889, 890, 411, 142, 143, 144, 124, 125, 940, 217, 124, 125, 218, 941, 940, 493, 818, 964, - 981, 942, 1041, 988, 965, 982, 746, 414, 989, 858, + 981, 942, 1041, 988, 965, 982, 746, 412, 989, 858, 145, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, 764, 123, - 891, 415, 993, 495, 416, 997, 1132, 994, 1133, 1134, - 998, 1003, 503, 417, 879, 880, 1004, 124, 125, 418, + 891, 413, 993, 495, 414, 997, 1132, 994, 1133, 1134, + 998, 1003, 503, 415, 879, 880, 1004, 124, 125, 416, 529, 940, 474, 494, 309, 1005, 1164, 1165, 145, 838, 839, 840, 841, 842, 843, 286, 680, 681, 682, 683, - 419, 287, 288, 289, 290, 291, 292, 1168, 512, 1189, + 417, 287, 288, 289, 290, 291, 292, 1168, 512, 1189, 145, 477, 1169, 1176, 1190, 484, 1192, 146, 535, 536, - 1193, 203, 1230, 508, 420, 421, 145, 1231, 809, 816, - 145, 817, 422, 220, 424, 425, 259, 208, 1152, 1153, - 1154, 1155, 426, 273, 427, 221, 428, 256, 432, 253, - 449, 457, 266, 293, 461, 469, 470, 480, 482, 277, - 483, 222, 223, 315, 224, 225, 498, 316, 334, 295, - 502, 504, 335, 336, 506, 507, 226, 227, 228, 329, - 509, 229, 514, 230, 347, 145, 517, 519, 371, 231, - 520, 523, 337, 209, 524, 232, 532, 537, 538, 540, - 541, 233, 542, 234, 372, 254, 543, 544, 267, 145, - 545, 554, 558, 546, 564, 278, 547, 251, 555, 548, + 1193, 203, 1230, 508, 418, 419, 145, 1231, 809, 816, + 145, 817, 420, 220, 421, 422, 259, 208, 1152, 1153, + 1154, 1155, 424, 273, 425, 221, 426, 256, 427, 253, + 428, 432, 266, 293, 449, 457, 461, 469, 470, 277, + 480, 222, 223, 315, 224, 225, 482, 316, 334, 295, + 483, 498, 335, 336, 502, 504, 226, 227, 228, 329, + 506, 229, 507, 230, 347, 145, 509, 537, 371, 231, + 514, 517, 337, 209, 519, 232, 520, 523, 524, 532, + 538, 233, 540, 234, 372, 254, 541, 542, 267, 145, + 543, 544, 545, 546, 558, 278, 547, 251, 555, 548, 262, 235, 236, 549, 237, 296, 550, 276, 556, 238, - 551, 552, 239, 553, 240, 330, 248, 294, 557, 559, - 348, 560, 260, 565, 261, 561, 562, 563, 566, 274, - 567, 275, 568, 569, 570, 571, 572, 573, 574, 575, + 551, 552, 239, 553, 240, 330, 248, 294, 554, 557, + 348, 559, 260, 560, 261, 564, 561, 562, 563, 274, + 565, 275, 566, 567, 568, 569, 570, 571, 572, 573, 373, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 576, 577, 578, 579, 114, 115, 116, 117, - 118, 119, 120, 580, 581, 123, 582, 583, 584, 585, - 586, 587, 588, 589, 590, 210, 591, 211, 593, 594, - 596, 597, 598, 124, 125, 212, 213, 214, 215, 216, - 126, 599, 600, 601, 602, 603, 604, 146, 605, 607, - 203, 609, 217, 611, 610, 218, 133, 612, 613, 615, - 616, 617, 618, 219, 619, 620, 208, 1, 2, 3, + 108, 109, 574, 575, 576, 577, 114, 115, 116, 117, + 118, 119, 120, 578, 579, 123, 580, 581, 582, 583, + 584, 585, 586, 587, 588, 210, 589, 211, 590, 591, + 593, 596, 597, 124, 125, 212, 213, 214, 215, 216, + 126, 594, 598, 599, 600, 602, 603, 146, 601, 604, + 203, 605, 217, 607, 609, 218, 133, 610, 611, 612, + 613, 615, 616, 219, 617, 618, 208, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 621, 623, 857, 871, 881, 729, 371, 624, 625, - 626, 627, 628, 631, 629, 635, 632, 636, 639, 859, - 877, 882, 892, 372, 640, 641, 633, 742, 638, 642, - 643, 645, 646, 644, 649, 650, 142, 143, 647, 651, - 648, 652, 209, 654, 655, 657, 736, 99, 100, 101, + 14, 619, 620, 857, 871, 881, 621, 371, 623, 624, + 625, 626, 627, 628, 631, 629, 632, 635, 633, 859, + 877, 882, 892, 372, 636, 639, 638, 742, 640, 641, + 642, 645, 646, 643, 644, 649, 142, 143, 647, 650, + 651, 652, 209, 654, 648, 655, 657, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 124, 125, 658, 145, 114, 115, 116, 117, 118, 119, 120, 121, 659, 123, 309, 660, 661, 860, 878, 883, 893, 373, - 662, 663, 664, 674, 665, 672, 673, 675, 676, 124, + 662, 663, 664, 665, 672, 674, 673, 675, 676, 124, 125, 32, 213, 214, 685, 216, 126, 686, 687, 688, 679, 690, 689, 691, 692, 699, 700, 693, 217, 694, 695, 218, 696, 697, 698, 701, 702, 704, 705, 219, 706, 356, 357, 358, 359, 360, 361, 362, 363, 364, - 365, 366, 367, 368, 711, 707, 741, 708, 925, 710, - 789, 369, 370, 712, 713, 714, 718, 719, 720, 721, - 722, 793, 797, 723, 724, 801, 805, 725, 823, 827, - 726, 830, 727, 834, 728, 730, 145, 731, 732, 901, - 905, 909, 142, 143, 926, 927, 738, 739, 740, 928, - 929, 931, 932, 936, 937, 938, 939, 945, 1009, 944, - 948, 947, 950, 951, 953, 954, 1025, 145, 957, 956, - 960, 971, 970, 973, 974, 1013, 975, 976, 977, 978, + 365, 366, 367, 368, 711, 707, 741, 708, 925, 789, + 793, 369, 370, 710, 712, 713, 714, 718, 719, 720, + 721, 722, 736, 797, 801, 723, 805, 724, 725, 823, + 726, 827, 727, 830, 834, 728, 145, 730, 901, 731, + 732, 905, 142, 143, 909, 926, 738, 739, 740, 927, + 928, 929, 931, 932, 936, 937, 938, 939, 945, 1009, + 944, 948, 947, 950, 951, 953, 954, 145, 956, 957, + 960, 970, 971, 973, 974, 1157, 975, 976, 977, 978, 979, 980, 985, 986, 987, 990, 991, 992, 999, 1001, - 1014, 1017, 1016, 1026, 1027, 1021, 1020, 1019, 1022, 1023, - 1024, 1028, 1030, 1029, 1033, 1031, 1034, 1032, 1035, 1036, - 1037, 1087, 1039, 1038, 1107, 1108, 1109, 1110, 1114, 1111, - 1115, 1112, 1116, 1117, 1118, 220, 1121, 1120, 315, 1122, - 1124, 334, 316, 1125, 1049, 335, 336, 221, 1070, 256, - 1128, 253, 1127, 1130, 329, 1091, 1050, 347, 293, 1092, - 1081, 351, 1129, 222, 223, 337, 224, 225, 1145, 1146, - 1174, 1094, 1051, 1052, 295, 1053, 1054, 857, 226, 227, - 228, 1151, 871, 229, 1166, 230, 881, 1055, 1056, 1057, - 1157, 231, 1058, 859, 1059, 1135, 1158, 232, 877, 1136, + 1014, 815, 1013, 1017, 1016, 1021, 1026, 1019, 1020, 1022, + 1023, 1024, 1030, 1025, 1033, 1027, 1034, 1035, 1028, 1029, + 1031, 1032, 1036, 1037, 1087, 1039, 1038, 1107, 1114, 1108, + 1109, 1115, 1110, 1111, 1112, 220, 1116, 1117, 315, 1118, + 1120, 334, 316, 1121, 1049, 335, 336, 221, 1070, 256, + 1122, 253, 1124, 1125, 329, 1091, 1050, 347, 293, 1092, + 1081, 351, 1127, 222, 223, 337, 224, 225, 1128, 1130, + 1146, 1094, 1051, 1052, 295, 1053, 1054, 857, 226, 227, + 228, 1145, 871, 229, 1129, 230, 881, 1055, 1056, 1057, + 1151, 231, 1058, 859, 1059, 1135, 1158, 232, 877, 1136, 1060, 259, 882, 233, 273, 234, 1061, 254, 892, 1159, - 330, 1137, 1062, 348, 1063, 1160, 1082, 266, 1167, 251, - 277, 1161, 1172, 235, 236, 1162, 237, 1095, 1080, 1163, - 296, 238, 1064, 1065, 239, 1066, 240, 1173, 248, 1093, - 1067, 1170, 294, 1068, 1175, 1069, 1181, 1076, 1182, 860, + 330, 1137, 1062, 348, 1063, 1160, 1082, 266, 1161, 251, + 277, 1166, 1162, 235, 236, 1163, 237, 1095, 1080, 1167, + 296, 238, 1064, 1065, 239, 1066, 240, 1170, 248, 1093, + 1067, 1172, 294, 1068, 1173, 1069, 1174, 1076, 1175, 860, 1074, 1187, 1075, 1196, 878, 1199, 1201, 1206, 883, 1204, - 1226, 1227, 1228, 1183, 893, 1184, 1232, 1138, 1236, 815, - 539, 743, 592, 267, 1191, 677, 278, 737, 745, 917, - 1040, 1042, 1088, 1085, 1086, 262, 1105, 1123, 276, 1106, - 1113, 1044, 1043, 1195, 1084, 1148, 1194, 307, 1046, 637, - 1197, 630, 1200, 1203, 1048, 1205, 1045, 260, 1234, 261, - 274, 1047, 275, 1233, 1235, 1238, 1239, 634, 1198, 1147, - 1150, 595, 1104, 1149, 653, 914, 1126, 1103, 900, 1102, - 1119, 1131, 1202, 744, 1224, 656, 1237, 1144, 0, 606, - 0, 0, 0, 608, 0, 0, 0, 0, 0, 0, - 0, 0, 614, 0, 0, 0, 0, 1049, 0, 0, + 1226, 1227, 1228, 1232, 893, 1200, 1236, 1138, 729, 539, + 743, 737, 1181, 267, 1182, 745, 278, 917, 595, 1040, + 1105, 1042, 1088, 1085, 1086, 262, 637, 1123, 276, 1106, + 1113, 1044, 1043, 1195, 1084, 307, 1046, 1183, 1184, 1045, + 630, 1048, 634, 1191, 1149, 1194, 1047, 260, 1147, 261, + 274, 1197, 275, 1203, 1233, 1205, 1148, 1234, 1235, 1238, + 1239, 1198, 1150, 592, 1104, 1102, 1103, 914, 1119, 1126, + 656, 1131, 653, 606, 1202, 900, 1144, 1224, 744, 1237, + 0, 0, 0, 0, 608, 0, 0, 0, 0, 0, + 0, 0, 0, 614, 0, 0, 0, 1049, 0, 0, 0, 1070, 0, 1091, 622, 0, 0, 1092, 0, 1050, 0, 0, 0, 1081, 0, 0, 0, 0, 1135, 1094, 1185, 0, 1136, 0, 0, 1051, 1052, 0, 1053, 1054, @@ -4877,14 +4877,14 @@ namespace isc { namespace dhcp { 71, 72, 73, 74, 75, 76, 16, 78, 79, 80, 81, 78, 79, 79, 73, 694, 73, 72, 73, 74, 75, 76, 663, 78, 79, 688, 81, 955, 955, 955, - 73, 73, 79, 73, 73, 955, 955, 194, 5, 112, + 73, 73, 79, 73, 73, 955, 955, 571, 5, 112, 7, 0, 9, 16, 17, 73, 73, 73, 603, 110, 73, 7, 73, 7, 119, 120, 117, 7, 73, 7, 615, 616, 617, 7, 73, 165, 166, 167, 168, 7, - 73, 10, 73, 72, 73, 74, 75, 76, 3, 78, + 73, 194, 73, 72, 73, 74, 75, 76, 3, 78, 79, 3, 81, 8, 6, 21, 73, 74, 75, 76, 73, 73, 21, 73, 30, 3, 7, 197, 73, 3, - 8, 73, 7, 73, 8, 73, 68, 69, 7, 74, + 8, 73, 636, 73, 8, 73, 68, 69, 7, 74, 75, 74, 75, 86, 87, 3, 7, 3, 3, 68, 8, 194, 8, 8, 86, 87, 67, 11, 12, 194, 79, 15, 13, 14, 18, 19, 20, 86, 87, 7, @@ -4892,16 +4892,16 @@ namespace isc { namespace dhcp { 86, 87, 6, 86, 87, 7, 105, 86, 87, 108, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 173, 6, 3, 176, 177, + 64, 65, 66, 67, 68, 173, 7, 3, 176, 177, 178, 179, 8, 119, 120, 3, 132, 133, 134, 135, 8, 3, 86, 87, 6, 138, 139, 140, 3, 93, 129, 130, 131, 8, 98, 99, 100, 101, 102, 3, 104, 194, 86, 87, 8, 109, 3, 194, 195, 196, - 197, 8, 194, 69, 118, 3, 3, 121, 3, 6, + 197, 8, 194, 69, 118, 10, 3, 121, 3, 6, 1168, 1168, 1168, 8, 128, 194, 162, 163, 1168, 1168, - 86, 87, 136, 137, 68, 4, 3, 141, 194, 6, - 144, 194, 8, 3, 148, 194, 4, 81, 82, 83, - 84, 85, 86, 87, 4, 69, 70, 71, 72, 73, + 86, 87, 136, 137, 68, 6, 3, 141, 194, 6, + 144, 194, 3, 8, 148, 194, 4, 81, 82, 83, + 84, 85, 86, 87, 3, 69, 70, 71, 72, 73, 74, 145, 146, 147, 4, 169, 170, 171, 86, 87, 3, 105, 86, 87, 108, 8, 3, 8, 961, 3, 3, 8, 943, 3, 8, 8, 21, 4, 8, 988, @@ -4918,72 +4918,72 @@ namespace isc { namespace dhcp { 24, 25, 4, 484, 4, 474, 4, 474, 4, 474, 4, 4, 477, 494, 4, 4, 4, 4, 4, 484, 4, 474, 474, 504, 474, 474, 4, 504, 509, 494, - 4, 3, 509, 509, 4, 4, 474, 474, 474, 504, - 3, 474, 4, 474, 509, 194, 4, 4, 529, 474, - 4, 4, 509, 462, 4, 474, 4, 194, 4, 4, + 4, 4, 509, 509, 4, 3, 474, 474, 474, 504, + 4, 474, 4, 474, 509, 194, 3, 194, 529, 474, + 4, 4, 509, 462, 4, 474, 4, 4, 4, 4, 4, 474, 4, 474, 529, 474, 4, 4, 477, 194, - 4, 197, 4, 195, 4, 484, 195, 474, 196, 195, + 4, 4, 4, 195, 4, 484, 195, 474, 196, 195, 477, 474, 474, 195, 474, 494, 195, 484, 196, 474, - 195, 195, 474, 195, 474, 504, 474, 494, 195, 195, - 509, 195, 477, 4, 477, 197, 197, 197, 4, 484, - 197, 484, 4, 4, 4, 4, 4, 4, 4, 4, + 195, 195, 474, 195, 474, 504, 474, 494, 197, 195, + 509, 195, 477, 195, 477, 4, 197, 197, 197, 484, + 4, 484, 4, 197, 4, 4, 4, 4, 4, 4, 529, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 4, 4, 4, 4, 59, 60, 61, 62, - 63, 64, 65, 4, 4, 68, 4, 4, 195, 4, - 4, 4, 4, 4, 4, 78, 4, 80, 4, 197, + 63, 64, 65, 4, 4, 68, 4, 4, 4, 4, + 195, 4, 4, 4, 4, 78, 4, 80, 4, 4, 4, 4, 4, 86, 87, 88, 89, 90, 91, 92, - 93, 4, 4, 195, 197, 4, 4, 658, 4, 4, - 661, 4, 105, 4, 195, 108, 109, 195, 195, 4, - 4, 4, 4, 116, 4, 4, 661, 180, 181, 182, + 93, 197, 4, 4, 4, 197, 4, 658, 195, 4, + 661, 4, 105, 4, 4, 108, 109, 195, 4, 195, + 195, 4, 4, 116, 4, 4, 661, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, - 193, 4, 4, 694, 695, 696, 636, 698, 4, 195, - 4, 4, 4, 4, 197, 4, 197, 4, 4, 694, - 695, 696, 697, 698, 4, 195, 197, 657, 197, 4, - 195, 4, 4, 195, 4, 4, 169, 170, 197, 4, - 197, 4, 661, 4, 195, 4, 164, 44, 45, 46, + 193, 4, 4, 694, 695, 696, 4, 698, 4, 4, + 195, 4, 4, 4, 4, 197, 197, 4, 197, 694, + 695, 696, 697, 698, 4, 4, 197, 657, 4, 195, + 4, 4, 4, 195, 195, 4, 169, 170, 197, 4, + 4, 4, 661, 4, 197, 195, 4, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 86, 87, 7, 194, 59, 60, 61, 62, 63, 64, 65, 66, 194, 68, 69, 7, 7, 694, 695, 696, 697, 698, - 7, 7, 5, 5, 194, 194, 194, 5, 5, 86, + 7, 7, 5, 194, 194, 5, 194, 5, 5, 86, 87, 7, 89, 90, 5, 92, 93, 5, 5, 5, 194, 5, 7, 5, 5, 194, 194, 7, 105, 7, 7, 108, 7, 7, 7, 5, 5, 5, 5, 116, 194, 149, 150, 151, 152, 153, 154, 155, 156, 157, - 158, 159, 160, 161, 7, 194, 5, 194, 4, 194, + 158, 159, 160, 161, 7, 194, 5, 194, 4, 7, 7, 169, 170, 194, 194, 194, 194, 194, 194, 194, - 194, 7, 7, 194, 194, 7, 7, 194, 103, 7, - 194, 7, 194, 7, 194, 194, 194, 194, 194, 7, - 7, 7, 169, 170, 4, 4, 194, 194, 194, 4, - 4, 4, 4, 4, 4, 4, 4, 3, 194, 6, - 3, 6, 6, 3, 6, 3, 195, 194, 3, 6, - 6, 3, 6, 6, 3, 6, 4, 4, 4, 4, + 194, 194, 164, 7, 7, 194, 7, 194, 194, 103, + 194, 7, 194, 7, 7, 194, 194, 194, 7, 194, + 194, 7, 169, 170, 7, 4, 194, 194, 194, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 3, 194, + 6, 3, 6, 6, 3, 6, 3, 194, 6, 3, + 6, 6, 3, 6, 3, 194, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 3, 3, 6, 197, 195, 4, 6, 8, 4, 4, - 4, 197, 4, 195, 4, 195, 4, 195, 4, 195, - 195, 4, 195, 197, 195, 195, 195, 195, 4, 195, - 4, 195, 195, 195, 195, 946, 195, 197, 949, 195, - 4, 952, 949, 4, 955, 952, 952, 946, 955, 946, - 4, 946, 197, 4, 949, 966, 955, 952, 969, 966, - 955, 972, 195, 946, 946, 952, 946, 946, 6, 3, + 3, 687, 6, 3, 6, 4, 197, 8, 6, 4, + 4, 4, 4, 195, 4, 195, 4, 4, 197, 195, + 195, 195, 195, 195, 4, 195, 197, 195, 4, 195, + 195, 4, 195, 195, 195, 946, 195, 195, 949, 195, + 197, 952, 949, 195, 955, 952, 952, 946, 955, 946, + 195, 946, 4, 4, 949, 966, 955, 952, 969, 966, + 955, 972, 197, 946, 946, 952, 946, 946, 4, 4, 3, 966, 955, 955, 969, 955, 955, 988, 946, 946, - 946, 4, 993, 946, 8, 946, 997, 955, 955, 955, - 194, 946, 955, 988, 955, 1006, 194, 946, 993, 1006, + 946, 6, 993, 946, 195, 946, 997, 955, 955, 955, + 4, 946, 955, 988, 955, 1006, 194, 946, 993, 1006, 955, 1012, 997, 946, 1015, 946, 955, 946, 1003, 194, - 949, 1006, 955, 952, 955, 194, 955, 1012, 8, 946, - 1015, 194, 4, 946, 946, 194, 946, 966, 955, 194, - 969, 946, 955, 955, 946, 955, 946, 8, 946, 966, - 955, 194, 969, 955, 8, 955, 194, 955, 194, 988, + 949, 1006, 955, 952, 955, 194, 955, 1012, 194, 946, + 1015, 8, 194, 946, 946, 194, 946, 966, 955, 8, + 969, 946, 955, 955, 946, 955, 946, 194, 946, 966, + 955, 4, 969, 955, 8, 955, 3, 955, 8, 988, 955, 4, 955, 4, 993, 4, 4, 7, 997, 5, - 4, 4, 4, 194, 1003, 194, 4, 1006, 4, 687, - 403, 658, 458, 1012, 194, 571, 1015, 649, 661, 741, - 940, 945, 964, 958, 961, 1012, 972, 993, 1015, 974, - 981, 948, 946, 1168, 957, 1014, 194, 77, 951, 512, - 197, 504, 195, 194, 954, 194, 949, 1012, 195, 1012, - 1015, 952, 1015, 197, 195, 194, 194, 509, 1174, 1012, - 1017, 462, 971, 1015, 529, 711, 997, 969, 698, 967, - 988, 1003, 1189, 660, 1210, 533, 1230, 1007, -1, 474, - -1, -1, -1, 477, -1, -1, -1, -1, -1, -1, - -1, -1, 484, -1, -1, -1, -1, 1168, -1, -1, + 4, 4, 4, 4, 1003, 195, 4, 1006, 636, 403, + 658, 649, 194, 1012, 194, 661, 1015, 741, 462, 940, + 972, 945, 964, 958, 961, 1012, 512, 993, 1015, 974, + 981, 948, 946, 1168, 957, 77, 951, 194, 194, 949, + 504, 954, 509, 194, 1015, 194, 952, 1012, 1012, 1012, + 1015, 197, 1015, 194, 197, 194, 1014, 195, 195, 194, + 194, 1174, 1017, 458, 971, 967, 969, 711, 988, 997, + 533, 1003, 529, 474, 1189, 698, 1007, 1210, 660, 1230, + -1, -1, -1, -1, 477, -1, -1, -1, -1, -1, + -1, -1, -1, 484, -1, -1, -1, 1168, -1, -1, -1, 1168, -1, 1174, 494, -1, -1, 1174, -1, 1168, -1, -1, -1, 1168, -1, -1, -1, -1, 1189, 1174, 1130, -1, 1189, -1, -1, 1168, 1168, -1, 1168, 1168, @@ -5072,7 +5072,7 @@ namespace isc { namespace dhcp { 5, 5, 5, 7, 7, 7, 7, 7, 7, 194, 194, 5, 5, 225, 5, 5, 194, 194, 194, 225, 194, 7, 194, 194, 194, 225, 225, 225, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, 194, 214, + 194, 194, 194, 194, 194, 194, 194, 194, 194, 218, 194, 194, 194, 162, 163, 576, 164, 259, 194, 194, 194, 5, 214, 238, 593, 277, 21, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, diff --git a/src/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh index 5f4a989d1a..5a8baa4954 100644 --- a/src/bin/dhcp6/location.hh +++ b/src/bin/dhcp6/location.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101521 // A Bison parser, made by GNU Bison 3.6.4. // Locations for Bison parsers in C++ diff --git a/src/bin/dhcp6/position.hh b/src/bin/dhcp6/position.hh index 14183aa09e..125eacfcad 100644 --- a/src/bin/dhcp6/position.hh +++ b/src/bin/dhcp6/position.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101521 // A Bison parser, made by GNU Bison 3.6.4. // Starting with Bison 3.2, this file is useless: the structure it diff --git a/src/bin/dhcp6/stack.hh b/src/bin/dhcp6/stack.hh index 08a16cbf71..ff195fc3af 100644 --- a/src/bin/dhcp6/stack.hh +++ b/src/bin/dhcp6/stack.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101521 // A Bison parser, made by GNU Bison 3.6.4. // Starting with Bison 3.2, this file is useless: the structure it diff --git a/src/bin/netconf/location.hh b/src/bin/netconf/location.hh index bcaabe6ef9..876fd4ec96 100644 --- a/src/bin/netconf/location.hh +++ b/src/bin/netconf/location.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101522 // A Bison parser, made by GNU Bison 3.6.4. // Locations for Bison parsers in C++ diff --git a/src/bin/netconf/netconf_parser.cc b/src/bin/netconf/netconf_parser.cc index 823f03005e..da867c58b8 100644 --- a/src/bin/netconf/netconf_parser.cc +++ b/src/bin/netconf/netconf_parser.cc @@ -1082,7 +1082,7 @@ namespace isc { namespace netconf { case 75: #line 401 "netconf_parser.yy" - { + { ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ()); ctx.leave(); } @@ -1832,41 +1832,41 @@ namespace isc { namespace netconf { } - const signed char NetconfParser::yypact_ninf_ = -53; + const signed char NetconfParser::yypact_ninf_ = -81; const signed char NetconfParser::yytable_ninf_ = -1; const short NetconfParser::yypact_[] = { - 69, -53, -53, -53, 6, 8, 3, 7, -53, -53, - -53, -53, -53, -53, -53, -53, -53, -53, -53, -53, - -53, -53, -53, -53, 8, -3, 39, 15, -53, 12, - 62, 87, 76, 106, -53, 38, -53, -53, -53, -53, - 118, 119, 120, 121, -53, -53, 122, -53, 123, 124, - -53, -53, -53, -53, -53, -53, -53, -53, -53, -53, - 8, 8, -53, 50, 125, 39, -53, 126, 128, 85, - 86, 88, 130, 131, 134, -53, -53, 15, -53, -53, - 135, 133, -53, 136, 83, -53, -53, -53, -53, 137, - 139, -53, 8, 15, -53, -53, -53, 44, 138, 142, - -53, 143, -53, -53, -53, -53, -53, 144, 147, -53, - -53, -53, -53, -53, -53, 148, 150, -53, -53, 29, - -53, -53, 151, 152, 153, 154, -53, 44, 51, -53, - 138, 0, 142, -53, 155, 156, 157, 158, -53, -53, - -53, -53, 40, -53, -53, -53, -53, -53, -53, 162, - -53, -53, -53, -53, 80, -53, -53, -53, -53, -53, - -53, 65, 65, 65, 65, 163, 164, 84, -53, 165, - 167, 95, 168, 0, -53, -53, -53, -53, -53, -53, - -53, -53, -53, 82, -53, -53, -53, 89, 90, 91, - 114, 8, -53, 115, 169, -53, 116, -53, 171, 172, - 65, -53, -53, -53, -53, -53, -53, -53, 166, -53, - 132, 173, -53, -53, 66, -53, -53, -7, -16, 166, - -53, -53, -53, -53, -53, -53, -53, 99, -53, -53, - -53, -53, -53, 174, 175, 177, -53, 100, -53, -53, - -53, -53, -53, -53, -53, 178, 179, 180, -7, -53, - 181, 140, 141, 149, 182, -16, -53, 92, 159, 160, - -53, 161, -53, -53, -53, 170, -53, -53, -53, -53, - -53, -53, -53, -53, -53 + 73, -81, -81, -81, 27, 15, 25, 57, -81, -81, + -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, + -81, -81, -81, -81, 15, -12, 43, -1, -81, 59, + 70, 76, 75, 86, -81, 22, -81, -81, -81, -81, + 120, 121, 122, 123, -81, -81, 124, -81, 91, 126, + -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, + 15, 15, -81, 85, 127, 43, -81, 128, 129, 87, + 88, 89, 131, 130, 135, -81, -81, -1, -81, -81, + 136, 134, -81, 137, 97, -81, -81, -81, -81, 138, + 140, -81, 15, -1, -81, -81, -81, 67, 142, 143, + -81, 144, -81, -81, -81, -81, -81, 145, 148, -81, + -81, -81, -81, -81, -81, 149, 151, -81, -81, 13, + -81, -81, 152, 153, 154, 155, -81, 67, -24, -81, + 142, 45, 143, -81, 156, 157, 158, 159, -81, -81, + -81, -81, 26, -81, -81, -81, -81, -81, -81, 163, + -81, -81, -81, -81, 39, -81, -81, -81, -81, -81, + -81, 24, 24, 24, 24, 164, 165, -13, -81, 166, + 167, 114, 168, 45, -81, -81, -81, -81, -81, -81, + -81, -81, -81, 40, -81, -81, -81, 46, 95, 99, + 116, 137, -81, 117, 169, -81, 132, -81, 171, 172, + 24, -81, -81, -81, -81, -81, -81, -81, 173, -81, + 133, 174, -81, -81, 20, -81, -81, 65, 56, 173, + -81, -81, -81, -81, -81, -81, -81, 105, -81, -81, + -81, -81, -81, 175, 178, 179, -81, 106, -81, -81, + -81, -81, -81, -81, -81, 180, 181, 182, 65, -81, + 183, 125, 147, 150, 184, 56, -81, 94, 160, 161, + -81, 162, -81, -81, -81, 170, -81, -81, -81, -81, + -81, -81, -81, -81, -81 }; const unsigned char @@ -1905,17 +1905,17 @@ namespace isc { namespace netconf { const short NetconfParser::yypgoto_[] = { - -53, -53, -53, -53, -53, -53, -53, -53, -21, 110, - -53, -53, -53, -53, -53, -53, -53, -53, -27, -53, - -53, -53, 129, -53, -53, 96, -53, 176, -20, -19, - -18, -26, -53, -25, -53, -53, -53, -53, -53, 67, - -53, -53, 31, -53, -53, -53, -53, -53, -53, -53, - -53, 72, -53, -53, -53, -53, -53, -53, -53, -53, - -43, -4, -53, -53, -53, -53, -53, -48, -53, -53, - -53, -53, -53, -53, -53, -53, -53, -53, 70, -53, - -53, 28, -53, -53, -53, -53, -53, -53, -53, -53, - -12, -53, -53, -52, -53, -53, -53, -53, -53, -53, - -53 + -81, -81, -81, -81, -81, -81, -81, -81, -20, -80, + -81, -2, -81, -81, -81, -81, -81, -81, -27, -81, + -81, -81, 139, -81, -81, 101, -81, 118, -22, -19, + -18, -26, -81, -25, -81, -81, -81, -81, -81, 68, + -81, -81, 30, -81, -81, -81, -81, -81, -81, -81, + -81, 72, -81, -81, -81, -81, -81, -81, -81, -81, + -41, 0, -81, -81, -81, -81, -81, -47, -81, -81, + -81, -81, -81, -81, -81, -81, -81, -81, 71, -81, + -81, 29, -81, -81, -81, -81, -81, -81, -81, -81, + -11, -81, -81, -46, -81, -81, -81, -81, -81, -81, + -81 }; const short @@ -1937,63 +1937,57 @@ namespace isc { namespace netconf { const short NetconfParser::yytable_[] = { - 47, 54, 55, 28, 38, 39, 8, 51, 52, 53, - 20, 38, 39, 9, 22, 10, 221, 11, 59, 232, - 222, 223, 233, 234, 235, 236, 38, 39, 40, 41, - 42, 43, 132, 147, 148, 133, 149, 150, 46, 78, - 79, 65, 31, 167, 44, 46, 66, 45, 168, 34, - 47, 54, 55, 12, 13, 14, 15, 51, 52, 53, - 46, 102, 103, 104, 105, 60, 47, 54, 55, 219, - 106, 100, 220, 51, 52, 53, 38, 39, 40, 41, - 42, 139, 140, 173, 62, 200, 175, 176, 174, 46, - 201, 61, 200, 200, 200, 80, 46, 202, 203, 204, - 106, 141, 248, 255, 151, 152, 153, 249, 256, 63, - 46, 1, 2, 3, 139, 140, 267, 268, 269, 187, - 188, 189, 69, 70, 71, 72, 75, 77, 96, 81, - 83, 76, 84, 85, 86, 89, 87, 88, 90, 92, - 93, 195, 98, 10, 99, 114, 151, 152, 153, 118, - 127, 121, 126, 130, 129, 134, 135, 136, 137, 205, - 207, 209, 161, 162, 163, 164, 171, 190, 191, 193, - 206, 194, 196, 213, 208, 210, 211, 216, 251, 252, - 217, 253, 257, 258, 259, 261, 265, 263, 262, 101, - 224, 225, 226, 94, 82, 264, 212, 146, 192, 138, - 260, 197, 160, 266, 271, 272, 273, 244, 0, 0, + 47, 54, 55, 94, 28, 51, 139, 140, 52, 53, + 38, 39, 40, 41, 42, 43, 132, 139, 140, 133, + 9, 46, 10, 219, 11, 65, 220, 8, 44, 167, + 66, 45, 20, 31, 168, 38, 39, 40, 41, 42, + 78, 79, 173, 200, 46, 175, 176, 174, 201, 200, + 47, 54, 55, 34, 202, 51, 38, 39, 52, 53, + 12, 13, 14, 15, 22, 59, 47, 54, 55, 46, + 106, 51, 100, 60, 52, 53, 38, 39, 147, 148, + 61, 149, 150, 62, 102, 103, 104, 105, 221, 63, + 46, 232, 222, 223, 233, 234, 235, 236, 200, 76, + 106, 141, 200, 203, 151, 152, 153, 204, 248, 255, + 46, 94, 46, 249, 256, 1, 2, 3, 267, 268, + 269, 187, 188, 189, 69, 70, 71, 72, 75, 77, + 80, 81, 83, 84, 89, 85, 86, 87, 88, 90, + 92, 93, 96, 98, 10, 99, 151, 152, 153, 114, + 118, 127, 121, 126, 130, 129, 134, 135, 136, 137, + 195, 205, 207, 161, 162, 163, 164, 171, 190, 191, + 193, 194, 196, 262, 208, 210, 211, 209, 216, 251, + 213, 217, 252, 253, 257, 258, 259, 261, 265, 206, + 224, 225, 226, 263, 101, 91, 264, 192, 146, 138, + 212, 260, 197, 160, 82, 271, 272, 273, 244, 266, 0, 0, 0, 0, 0, 274, 0, 0, 0, 0, - 0, 224, 225, 226, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 91 + 0, 224, 225, 226 }; const short NetconfParser::yycheck_[] = { - 27, 27, 27, 24, 11, 12, 0, 27, 27, 27, - 7, 11, 12, 5, 7, 7, 23, 9, 6, 35, - 27, 28, 38, 39, 40, 41, 11, 12, 13, 14, - 15, 16, 3, 33, 34, 6, 36, 37, 45, 60, - 61, 3, 45, 3, 29, 45, 8, 32, 8, 10, - 77, 77, 77, 45, 46, 47, 48, 77, 77, 77, - 45, 17, 18, 19, 20, 3, 93, 93, 93, 3, - 97, 92, 6, 93, 93, 93, 11, 12, 13, 14, - 15, 30, 31, 3, 8, 3, 21, 22, 8, 45, - 8, 4, 3, 3, 3, 45, 45, 8, 8, 8, - 127, 128, 3, 3, 131, 131, 131, 8, 8, 3, - 45, 42, 43, 44, 30, 31, 24, 25, 26, 162, - 163, 164, 4, 4, 4, 4, 4, 3, 45, 4, - 4, 8, 4, 48, 48, 4, 48, 7, 4, 4, - 7, 46, 5, 7, 5, 7, 173, 173, 173, 7, - 3, 8, 8, 3, 6, 4, 4, 4, 4, 45, - 45, 45, 7, 7, 7, 7, 4, 4, 4, 4, - 191, 4, 4, 7, 5, 4, 4, 45, 4, 4, - 7, 4, 4, 4, 4, 4, 4, 46, 48, 93, - 217, 217, 217, 83, 65, 46, 200, 130, 167, 127, - 248, 173, 132, 255, 45, 45, 45, 219, -1, -1, + 27, 27, 27, 83, 24, 27, 30, 31, 27, 27, + 11, 12, 13, 14, 15, 16, 3, 30, 31, 6, + 5, 45, 7, 3, 9, 3, 6, 0, 29, 3, + 8, 32, 7, 45, 8, 11, 12, 13, 14, 15, + 60, 61, 3, 3, 45, 21, 22, 8, 8, 3, + 77, 77, 77, 10, 8, 77, 11, 12, 77, 77, + 45, 46, 47, 48, 7, 6, 93, 93, 93, 45, + 97, 93, 92, 3, 93, 93, 11, 12, 33, 34, + 4, 36, 37, 8, 17, 18, 19, 20, 23, 3, + 45, 35, 27, 28, 38, 39, 40, 41, 3, 8, + 127, 128, 3, 8, 131, 131, 131, 8, 3, 3, + 45, 191, 45, 8, 8, 42, 43, 44, 24, 25, + 26, 162, 163, 164, 4, 4, 4, 4, 4, 3, + 45, 4, 4, 4, 4, 48, 48, 48, 7, 4, + 4, 7, 45, 5, 7, 5, 173, 173, 173, 7, + 7, 3, 8, 8, 3, 6, 4, 4, 4, 4, + 46, 45, 45, 7, 7, 7, 7, 4, 4, 4, + 4, 4, 4, 48, 5, 4, 4, 45, 45, 4, + 7, 7, 4, 4, 4, 4, 4, 4, 4, 191, + 217, 217, 217, 46, 93, 77, 46, 167, 130, 127, + 200, 248, 173, 132, 65, 45, 45, 45, 219, 255, -1, -1, -1, -1, -1, 45, -1, -1, -1, -1, - -1, 248, 248, 248, -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, 77 + -1, 248, 248, 248 }; const unsigned char @@ -2019,7 +2013,7 @@ namespace isc { namespace netconf { 137, 4, 135, 3, 8, 21, 22, 67, 77, 78, 79, 80, 82, 109, 110, 111, 113, 109, 109, 109, 4, 4, 91, 4, 4, 46, 4, 130, 112, 114, - 3, 8, 8, 8, 8, 45, 57, 45, 5, 45, + 3, 8, 8, 8, 8, 45, 60, 45, 5, 45, 4, 4, 110, 7, 138, 139, 45, 7, 140, 3, 6, 23, 27, 28, 67, 80, 82, 115, 116, 117, 120, 122, 35, 38, 39, 40, 41, 141, 142, 143, @@ -2170,7 +2164,7 @@ namespace isc { namespace netconf { #line 14 "netconf_parser.yy" } } // isc::netconf -#line 2174 "netconf_parser.cc" +#line 2168 "netconf_parser.cc" #line 687 "netconf_parser.yy" diff --git a/src/bin/netconf/netconf_parser.h b/src/bin/netconf/netconf_parser.h index 1a59e1aaa0..6cab9da3be 100644 --- a/src/bin/netconf/netconf_parser.h +++ b/src/bin/netconf/netconf_parser.h @@ -2148,7 +2148,7 @@ switch (yykind) /// Constants. enum { - yylast_ = 253, ///< Last index in yytable_. + yylast_ = 223, ///< Last index in yytable_. yynnts_ = 101, ///< Number of nonterminal symbols. yyfinal_ = 8 ///< Termination state number. }; diff --git a/src/bin/netconf/position.hh b/src/bin/netconf/position.hh index 14183aa09e..0af1bec260 100644 --- a/src/bin/netconf/position.hh +++ b/src/bin/netconf/position.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101522 // A Bison parser, made by GNU Bison 3.6.4. // Starting with Bison 3.2, this file is useless: the structure it diff --git a/src/bin/netconf/stack.hh b/src/bin/netconf/stack.hh index 08a16cbf71..8ff91b7e39 100644 --- a/src/bin/netconf/stack.hh +++ b/src/bin/netconf/stack.hh @@ -1,4 +1,4 @@ -// Generated 202006291400 +// Generated 202007101522 // A Bison parser, made by GNU Bison 3.6.4. // Starting with Bison 3.2, this file is useless: the structure it