From: Tomek Mrugalski Date: Fri, 19 Aug 2016 17:49:37 +0000 (+0200) Subject: [4483] Parser regenerated. X-Git-Tag: trac4631_base~15^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42affd5d0e1f68beb007ff69be0d27a2fa8aea68;p=thirdparty%2Fkea.git [4483] Parser regenerated. --- diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc index b694c42d97..7a0f30ac65 100644 --- a/src/lib/eval/parser.cc +++ b/src/lib/eval/parser.cc @@ -1259,66 +1259,82 @@ namespace isc { namespace eval { break; case 51: -#line 475 "parser.yy" // lalr1.cc:859 +#line 473 "parser.yy" // lalr1.cc:859 { - yylhs.value.as< TokenPkt6::FieldType > () = TokenPkt6::MSGTYPE; + yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::MSGTYPE; } #line 1267 "parser.cc" // lalr1.cc:859 break; case 52: -#line 479 "parser.yy" // lalr1.cc:859 +#line 477 "parser.yy" // lalr1.cc:859 { - yylhs.value.as< TokenPkt6::FieldType > () = TokenPkt6::TRANSID; + yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::TRANSID; } #line 1275 "parser.cc" // lalr1.cc:859 break; case 53: -#line 485 "parser.yy" // lalr1.cc:859 +#line 483 "parser.yy" // lalr1.cc:859 { - yylhs.value.as< TokenRelay6Field::FieldType > () = TokenRelay6Field::PEERADDR; - } + yylhs.value.as< TokenPkt6::FieldType > () = TokenPkt6::MSGTYPE; + } #line 1283 "parser.cc" // lalr1.cc:859 break; case 54: -#line 489 "parser.yy" // lalr1.cc:859 +#line 487 "parser.yy" // lalr1.cc:859 { - yylhs.value.as< TokenRelay6Field::FieldType > () = TokenRelay6Field::LINKADDR; - } + yylhs.value.as< TokenPkt6::FieldType > () = TokenPkt6::TRANSID; + } #line 1291 "parser.cc" // lalr1.cc:859 break; case 55: -#line 495 "parser.yy" // lalr1.cc:859 +#line 493 "parser.yy" // lalr1.cc:859 + { + yylhs.value.as< TokenRelay6Field::FieldType > () = TokenRelay6Field::PEERADDR; + } +#line 1299 "parser.cc" // lalr1.cc:859 + break; + + case 56: +#line 497 "parser.yy" // lalr1.cc:859 + { + yylhs.value.as< TokenRelay6Field::FieldType > () = TokenRelay6Field::LINKADDR; + } +#line 1307 "parser.cc" // lalr1.cc:859 + break; + + case 57: +#line 503 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(str); } -#line 1300 "parser.cc" // lalr1.cc:859 +#line 1316 "parser.cc" // lalr1.cc:859 break; - case 56: -#line 502 "parser.yy" // lalr1.cc:859 + case 58: +#line 510 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(str); } -#line 1309 "parser.cc" // lalr1.cc:859 +#line 1325 "parser.cc" // lalr1.cc:859 break; - case 57: -#line 507 "parser.yy" // lalr1.cc:859 + case 59: +#line 515 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString("all")); ctx.expression.push_back(str); } -#line 1318 "parser.cc" // lalr1.cc:859 +#line 1334 "parser.cc" // lalr1.cc:859 break; -#line 1322 "parser.cc" // lalr1.cc:859 +#line 1338 "parser.cc" // lalr1.cc:859 default: break; } @@ -1580,22 +1596,22 @@ namespace isc { namespace eval { const short int EvalParser::yypact_[] = { - 4, 4, 4, 11, 21, 38, 16, 44, 82, 83, - 80, -6, 17, -91, -91, -91, -91, 97, 32, 93, - -91, 77, -91, 66, 66, 70, 67, 48, 62, 62, - 26, -12, 73, -12, 79, -91, 4, 4, 62, -91, - -91, -91, 109, 110, -91, 111, -91, -91, -91, -91, - -91, -91, -91, -91, -91, -91, -91, -91, -91, 107, - 113, 114, 99, 106, 94, 95, -91, -91, -91, -91, - -91, 116, -91, 117, -91, -91, 127, -91, 118, 119, - 120, 66, 66, 70, -12, -12, 91, 62, 122, 123, - 29, 51, 9, 125, 126, 128, 129, 130, -91, 112, - 138, -15, -3, -91, -91, -91, -91, -91, -91, 132, - -91, -91, -91, 133, 134, 135, 136, 137, -29, -91, - -91, 140, 141, -91, 66, 25, 25, 14, 105, 147, - -91, -91, 153, 115, 66, 143, 145, 146, -91, 148, - 149, 150, 66, 66, -91, 151, 75, 154, 155, 87, - -91, -91, 152, 156, -91, -91, 25, 25 + 3, 3, 3, -5, 13, 23, 4, 14, 54, 80, + 68, 37, 95, -91, -91, -91, -91, 93, 35, 98, + -91, 73, -91, 67, 67, 64, 50, 69, 45, 45, + 84, -20, 74, -20, 81, -91, 3, 3, 45, -91, + -91, -91, 109, 111, -91, 112, -91, -91, -91, -91, + -91, -91, -91, -91, -91, -91, -91, -91, -91, -91, + -91, 114, 115, 116, 100, 103, 96, 97, -91, -91, + -91, -91, -91, 118, -91, 119, -91, -91, 129, -91, + 120, 121, 122, 67, 67, 64, -20, -20, 94, 45, + 123, 125, 16, 28, 6, 127, 128, 130, 131, 132, + -91, 113, 140, -14, -2, -91, -91, -91, -91, -91, + -91, 135, -91, -91, -91, 134, 136, 137, 138, 139, + -30, -91, -91, 142, 143, -91, 67, 58, 58, 12, + 108, 149, -91, -91, 155, 117, 67, 145, 147, 148, + -91, 150, 151, 152, 67, 67, -91, 153, 70, 156, + 157, 86, -91, -91, 154, 158, -91, -91, 58, 58 }; const unsigned char @@ -1606,77 +1622,77 @@ namespace isc { namespace eval { 31, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 33, 34, 0, 0, 37, 0, 38, 39, 40, 41, - 20, 44, 45, 46, 47, 48, 49, 50, 21, 0, - 0, 0, 0, 0, 0, 0, 51, 52, 22, 43, - 42, 0, 27, 0, 26, 5, 6, 7, 0, 0, + 20, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 21, 0, 0, 0, 0, 0, 0, 0, 53, 54, + 22, 43, 42, 0, 27, 0, 26, 5, 6, 7, + 0, 0, 0, 0, 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, 35, 36, 8, 17, 9, 18, 0, - 53, 54, 23, 0, 0, 0, 0, 0, 0, 25, - 11, 29, 0, 12, 0, 0, 0, 0, 0, 0, - 57, 56, 0, 0, 0, 0, 0, 0, 24, 0, - 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, - 10, 19, 0, 0, 13, 28, 0, 0 + 57, 0, 0, 0, 0, 35, 36, 8, 17, 9, + 18, 0, 55, 56, 23, 0, 0, 0, 0, 0, + 0, 25, 11, 29, 0, 12, 0, 0, 0, 0, + 0, 0, 59, 58, 0, 0, 0, 0, 0, 0, + 24, 0, 0, 0, 0, 0, 30, 0, 0, 0, + 0, 0, 10, 19, 0, 0, 13, 28, 0, 0 }; const signed char EvalParser::yypgoto_[] = { - -91, -91, 18, -26, -91, -24, -90, 88, -91, -22, + -91, -91, 30, -27, -91, -24, -90, 79, -91, -23, -91, -91, -91, -91, -91 }; const short int EvalParser::yydefgoto_[] = { - -1, 17, 18, 19, 20, 42, 106, 45, 50, 71, - 58, 68, 112, 99, 132 + -1, 17, 18, 19, 20, 42, 108, 45, 50, 73, + 60, 70, 114, 101, 134 }; const unsigned char EvalParser::yytable_[] = { - 43, 108, 64, 65, 120, 130, 122, 1, 31, 2, - 32, 73, 77, 3, 4, 5, 123, 131, 109, 21, - 22, 110, 111, 136, 6, 23, 110, 111, 121, 7, - 69, 33, 26, 34, 70, 24, 108, 8, 36, 37, - 9, 10, 103, 104, 11, 12, 103, 104, 105, 13, - 14, 15, 25, 16, 75, 76, 151, 93, 94, 155, - 27, 100, 96, 97, 66, 67, 151, 155, 103, 104, - 107, 59, 60, 61, 51, 52, 53, 54, 55, 56, - 57, 39, 6, 36, 37, 28, 29, 7, 46, 47, - 48, 49, 103, 104, 150, 8, 30, 35, 9, 10, - 135, 38, 62, 63, 103, 104, 154, 13, 14, 15, - 140, 16, 40, 84, 41, 32, 44, 72, 147, 148, - 85, 81, 34, 74, 78, 79, 80, 82, 83, 86, - 87, 88, 89, 36, 90, 91, 92, 98, 101, 102, - 113, 114, 119, 115, 116, 117, 124, 118, 121, 125, - 126, 127, 128, 129, 133, 134, 137, 138, 141, 142, - 143, 139, 0, 144, 145, 0, 146, 149, 156, 152, - 153, 95, 157 + 43, 66, 67, 110, 132, 122, 1, 124, 2, 23, + 75, 79, 3, 4, 5, 111, 133, 125, 112, 113, + 26, 138, 71, 6, 112, 113, 72, 24, 7, 123, + 27, 21, 22, 105, 106, 107, 8, 25, 110, 9, + 10, 36, 37, 11, 12, 105, 106, 109, 13, 14, + 15, 31, 16, 32, 61, 62, 63, 28, 153, 95, + 96, 157, 102, 98, 99, 6, 77, 78, 153, 157, + 7, 46, 47, 48, 49, 105, 106, 39, 8, 36, + 37, 9, 10, 29, 30, 64, 65, 105, 106, 152, + 13, 14, 15, 35, 16, 51, 52, 53, 54, 55, + 56, 57, 137, 105, 106, 156, 38, 58, 59, 33, + 44, 34, 142, 40, 86, 41, 32, 87, 74, 34, + 149, 150, 68, 69, 80, 76, 81, 82, 83, 84, + 85, 88, 89, 90, 91, 36, 92, 93, 94, 103, + 100, 104, 115, 116, 121, 117, 118, 119, 120, 126, + 127, 123, 128, 129, 130, 131, 135, 136, 139, 140, + 143, 144, 145, 141, 97, 146, 147, 0, 148, 151, + 158, 154, 155, 0, 159 }; const short int EvalParser::yycheck_[] = { - 24, 91, 28, 29, 19, 34, 9, 3, 14, 5, - 16, 33, 38, 9, 10, 11, 19, 46, 9, 1, - 2, 12, 13, 9, 20, 14, 12, 13, 43, 25, - 42, 14, 16, 16, 46, 14, 126, 33, 6, 7, - 36, 37, 17, 18, 40, 41, 17, 18, 19, 45, - 46, 47, 14, 49, 36, 37, 146, 81, 82, 149, - 16, 87, 84, 85, 38, 39, 156, 157, 17, 18, - 19, 9, 10, 11, 26, 27, 28, 29, 30, 31, - 32, 4, 20, 6, 7, 3, 3, 25, 21, 22, - 23, 24, 17, 18, 19, 33, 16, 0, 36, 37, - 124, 8, 40, 41, 17, 18, 19, 45, 46, 47, - 134, 49, 46, 14, 48, 16, 46, 44, 142, 143, - 14, 14, 16, 44, 15, 15, 15, 14, 14, 35, - 35, 15, 15, 6, 16, 16, 16, 46, 16, 16, - 15, 15, 4, 15, 15, 15, 14, 35, 43, 16, - 16, 16, 16, 16, 14, 14, 9, 4, 15, 14, - 14, 46, -1, 15, 15, -1, 16, 16, 16, 15, - 15, 83, 16 + 24, 28, 29, 93, 34, 19, 3, 9, 5, 14, + 33, 38, 9, 10, 11, 9, 46, 19, 12, 13, + 16, 9, 42, 20, 12, 13, 46, 14, 25, 43, + 16, 1, 2, 17, 18, 19, 33, 14, 128, 36, + 37, 6, 7, 40, 41, 17, 18, 19, 45, 46, + 47, 14, 49, 16, 9, 10, 11, 3, 148, 83, + 84, 151, 89, 86, 87, 20, 36, 37, 158, 159, + 25, 21, 22, 23, 24, 17, 18, 4, 33, 6, + 7, 36, 37, 3, 16, 40, 41, 17, 18, 19, + 45, 46, 47, 0, 49, 26, 27, 28, 29, 30, + 31, 32, 126, 17, 18, 19, 8, 38, 39, 14, + 46, 16, 136, 46, 14, 48, 16, 14, 44, 16, + 144, 145, 38, 39, 15, 44, 15, 15, 14, 14, + 14, 35, 35, 15, 15, 6, 16, 16, 16, 16, + 46, 16, 15, 15, 4, 15, 15, 15, 35, 14, + 16, 43, 16, 16, 16, 16, 14, 14, 9, 4, + 15, 14, 14, 46, 85, 15, 15, -1, 16, 16, + 16, 15, 15, -1, 16 }; const unsigned char @@ -1687,17 +1703,17 @@ namespace isc { namespace eval { 54, 52, 52, 14, 14, 14, 16, 16, 3, 3, 16, 14, 16, 14, 16, 0, 6, 7, 8, 4, 46, 48, 55, 55, 46, 57, 21, 22, 23, 24, - 58, 26, 27, 28, 29, 30, 31, 32, 60, 9, - 10, 11, 40, 41, 53, 53, 38, 39, 61, 42, - 46, 59, 44, 59, 44, 52, 52, 53, 15, 15, - 15, 14, 14, 14, 14, 14, 35, 35, 15, 15, - 16, 16, 16, 55, 55, 57, 59, 59, 46, 63, - 53, 16, 16, 17, 18, 19, 56, 19, 56, 9, - 12, 13, 62, 15, 15, 15, 15, 15, 35, 4, - 19, 43, 9, 19, 14, 16, 16, 16, 16, 16, - 34, 46, 64, 14, 14, 55, 9, 9, 4, 46, - 55, 15, 14, 14, 15, 15, 16, 55, 55, 16, - 19, 56, 15, 15, 19, 56, 16, 16 + 58, 26, 27, 28, 29, 30, 31, 32, 38, 39, + 60, 9, 10, 11, 40, 41, 53, 53, 38, 39, + 61, 42, 46, 59, 44, 59, 44, 52, 52, 53, + 15, 15, 15, 14, 14, 14, 14, 14, 35, 35, + 15, 15, 16, 16, 16, 55, 55, 57, 59, 59, + 46, 63, 53, 16, 16, 17, 18, 19, 56, 19, + 56, 9, 12, 13, 62, 15, 15, 15, 15, 15, + 35, 4, 19, 43, 9, 19, 14, 16, 16, 16, + 16, 16, 34, 46, 64, 14, 14, 55, 9, 9, + 4, 46, 55, 15, 14, 14, 15, 15, 16, 55, + 55, 16, 19, 56, 15, 15, 19, 56, 16, 16 }; const unsigned char @@ -1708,7 +1724,7 @@ namespace isc { namespace eval { 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 54, 55, 55, 56, 56, 57, 58, 58, 58, 58, 59, 59, 60, 60, 60, 60, 60, 60, - 60, 61, 61, 62, 62, 63, 64, 64 + 60, 60, 60, 61, 61, 62, 62, 63, 64, 64 }; const unsigned char @@ -1719,7 +1735,7 @@ namespace isc { namespace eval { 3, 3, 3, 6, 8, 6, 3, 3, 11, 6, 9, 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 }; @@ -1753,7 +1769,7 @@ namespace isc { namespace eval { 262, 267, 281, 295, 310, 315, 320, 329, 339, 348, 361, 374, 381, 387, 391, 397, 401, 407, 416, 420, 424, 428, 434, 438, 444, 448, 452, 456, 460, 464, - 468, 474, 478, 484, 488, 494, 501, 506 + 468, 472, 476, 482, 486, 492, 496, 502, 509, 514 }; // Print the state stack on the debug stream. @@ -1788,8 +1804,8 @@ namespace isc { namespace eval { #line 13 "parser.yy" // lalr1.cc:1167 } } // isc::eval -#line 1792 "parser.cc" // lalr1.cc:1167 -#line 513 "parser.yy" // lalr1.cc:1168 +#line 1808 "parser.cc" // lalr1.cc:1167 +#line 521 "parser.yy" // lalr1.cc:1168 void isc::eval::EvalParser::error(const location_type& loc, diff --git a/src/lib/eval/parser.h b/src/lib/eval/parser.h index 49de9d527c..be22231f99 100644 --- a/src/lib/eval/parser.h +++ b/src/lib/eval/parser.h @@ -915,7 +915,7 @@ namespace isc { namespace eval { enum { yyeof_ = 0, - yylast_ = 172, ///< Last index in yytable_. + yylast_ = 174, ///< Last index in yytable_. yynnts_ = 15, ///< Number of nonterminal symbols. yyfinal_ = 35, ///< Termination state number. yyterror_ = 1,