mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

[master] Regen flex/bison

Browse Source
This commit is contained in:
Francis Dupont
2017-10-23 13:25:07 +00:00
parent d0d611d0e7
commit c90d0d2ecf
6 changed files with 1148 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/bin/dhcp4/dhcp4_lexer.cc
View File

@@ -1591,9 +1591,9 @@ static const flex_int16_t yy_rule_linenum[158] =
1038, 1047, 1056, 1065, 1074, 1083, 1092, 1101, 1110, 1119,
1128, 1137, 1146, 1155, 1164, 1173, 1182, 1191, 1200, 1209,
1219, 1229, 1239, 1249, 1259, 1269, 1279, 1289, 1299, 1308,
1317, 1326, 1335, 1344, 1353, 1364, 1375, 1388, 1399, 1412,
1511, 1516, 1521, 1526, 1527, 1528, 1529, 1530, 1531, 1533,
1551, 1564, 1569, 1573, 1575, 1577, 1579
1317, 1326, 1335, 1344, 1353, 1362, 1373, 1386, 1399, 1414,
1512, 1517, 1522, 1527, 1528, 1529, 1530, 1531, 1532, 1534,
1552, 1565, 1570, 1574, 1576, 1578, 1580
} ;
/* The intent behind this definition is that it'll catch
@@ -2506,7 +2506,7 @@ YY_RULE_SETUP
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
case isc::dhcp::Parser4Context::SUBNET4:
case Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
return isc::dhcp::Dhcp4Parser::make_VALID_LIFETIME(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("valid-lifetime", driver.loc_);
@@ -2520,7 +2520,7 @@ YY_RULE_SETUP
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
case isc::dhcp::Parser4Context::SUBNET4:
case Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
return isc::dhcp::Dhcp4Parser::make_RENEW_TIMER(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("renew-timer", driver.loc_);
@@ -2534,7 +2534,7 @@ YY_RULE_SETUP
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
case isc::dhcp::Parser4Context::SUBNET4:
case Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
return isc::dhcp::Dhcp4Parser::make_REBIND_TIMER(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("rebind-timer", driver.loc_);
@@ -2571,10 +2571,10 @@ YY_RULE_SETUP
#line 494 "dhcp4_lexer.ll"
{
switch (driver.ctx_) {
case Parser4Context::DHCP4:
return Dhcp4Parser::make_SHARED_NETWORKS(driver.loc_);
case isc::dhcp::Parser4Context::DHCP4:
return isc::dhcp::Dhcp4Parser::make_SHARED_NETWORKS(driver.loc_);
default:
return Dhcp4Parser::make_STRING("shared-networks", driver.loc_);
return isc::dhcp::Dhcp4Parser::make_STRING("shared-networks", driver.loc_);
}
}
YY_BREAK
@@ -2598,11 +2598,11 @@ YY_RULE_SETUP
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
case isc::dhcp::Parser4Context::SUBNET4:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::POOLS:
case isc::dhcp::Parser4Context::RESERVATIONS:
case isc::dhcp::Parser4Context::CLIENT_CLASSES:
case isc::dhcp::Parser4Context::CLIENT_CLASS:
case Parser4Context::SHARED_NETWORK:
return isc::dhcp::Dhcp4Parser::make_OPTION_DATA(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("option-data", driver.loc_);
@@ -2620,7 +2620,7 @@ YY_RULE_SETUP
case isc::dhcp::Parser4Context::OPTION_DATA:
case isc::dhcp::Parser4Context::CLIENT_CLASSES:
case isc::dhcp::Parser4Context::CLIENT_CLASS:
case Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::LOGGERS:
return isc::dhcp::Dhcp4Parser::make_NAME(driver.loc_);
default:
@@ -2707,7 +2707,7 @@ YY_RULE_SETUP
{
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::SUBNET4:
case Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
return isc::dhcp::Dhcp4Parser::make_INTERFACE(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("interface", driver.loc_);
@@ -2963,8 +2963,8 @@ YY_RULE_SETUP
{
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::SUBNET4:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::CLIENT_CLASSES:
case Parser4Context::SHARED_NETWORK:
return isc::dhcp::Dhcp4Parser::make_CLIENT_CLASS(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("client-class", driver.loc_);
@@ -3140,7 +3140,7 @@ YY_RULE_SETUP
{
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::SUBNET4:
case Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
return isc::dhcp::Dhcp4Parser::make_RELAY(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("relay", driver.loc_);
@@ -3703,8 +3703,6 @@ YY_RULE_SETUP
{
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
case isc::dhcp::Parser4Context::SUBNET4:
case Parser4Context::SHARED_NETWORK:
return isc::dhcp::Dhcp4Parser::make_ECHO_CLIENT_ID(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("echo-client-id", driver.loc_);
@@ -3713,12 +3711,12 @@ YY_RULE_SETUP
YY_BREAK
case 136:
YY_RULE_SETUP
#line 1364 "dhcp4_lexer.ll"
#line 1362 "dhcp4_lexer.ll"
{
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
case isc::dhcp::Parser4Context::SUBNET4:
case Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
return isc::dhcp::Dhcp4Parser::make_MATCH_CLIENT_ID(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("match-client-id", driver.loc_);
@@ -3727,14 +3725,14 @@ YY_RULE_SETUP
YY_BREAK
case 137:
YY_RULE_SETUP
#line 1375 "dhcp4_lexer.ll"
#line 1373 "dhcp4_lexer.ll"
{
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
case isc::dhcp::Parser4Context::SUBNET4:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::RESERVATIONS:
case isc::dhcp::Parser4Context::CLIENT_CLASSES:
case Parser4Context::SHARED_NETWORK:
return isc::dhcp::Dhcp4Parser::make_NEXT_SERVER(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("next-server", driver.loc_);
@@ -3743,10 +3741,12 @@ YY_RULE_SETUP
YY_BREAK
case 138:
YY_RULE_SETUP
#line 1388 "dhcp4_lexer.ll"
#line 1386 "dhcp4_lexer.ll"
{
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
case isc::dhcp::Parser4Context::SUBNET4:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::RESERVATIONS:
case isc::dhcp::Parser4Context::CLIENT_CLASSES:
return isc::dhcp::Dhcp4Parser::make_SERVER_HOSTNAME(driver.loc_);
@@ -3760,7 +3760,9 @@ YY_RULE_SETUP
#line 1399 "dhcp4_lexer.ll"
{
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
case isc::dhcp::Parser4Context::SUBNET4:
case isc::dhcp::Parser4Context::SHARED_NETWORK:
case isc::dhcp::Parser4Context::RESERVATIONS:
case isc::dhcp::Parser4Context::CLIENT_CLASSES:
return isc::dhcp::Dhcp4Parser::make_BOOT_FILE_NAME(driver.loc_);
@@ -3771,7 +3773,7 @@ YY_RULE_SETUP
YY_BREAK
case 140:
YY_RULE_SETUP
#line 1412 "dhcp4_lexer.ll"
#line 1414 "dhcp4_lexer.ll"
{
/* A string has been matched. It contains the actual string and single quotes.
We need to get those quotes out of the way and just use its content, e.g.
@@ -3788,7 +3790,6 @@ YY_RULE_SETUP
case '"':
/* impossible condition */
driver.error(driver.loc_, "Bad quote in \"" + raw + "\"");
break;
case '\\':
++pos;
if (pos >= len) {
@@ -3874,7 +3875,7 @@ YY_RULE_SETUP
case 141:
/* rule 141 can match eol */
YY_RULE_SETUP
#line 1511 "dhcp4_lexer.ll"
#line 1512 "dhcp4_lexer.ll"
{
/* Bad string with a forbidden control character inside */
driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
@@ -3883,7 +3884,7 @@ YY_RULE_SETUP
case 142:
/* rule 142 can match eol */
YY_RULE_SETUP
#line 1516 "dhcp4_lexer.ll"
#line 1517 "dhcp4_lexer.ll"
{
/* Bad string with a bad escape inside */
driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
@@ -3891,7 +3892,7 @@ YY_RULE_SETUP
YY_BREAK
case 143:
YY_RULE_SETUP
#line 1521 "dhcp4_lexer.ll"
#line 1522 "dhcp4_lexer.ll"
{
/* Bad string with an open escape at the end */
driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
@@ -3899,37 +3900,37 @@ YY_RULE_SETUP
YY_BREAK
case 144:
YY_RULE_SETUP
#line 1526 "dhcp4_lexer.ll"
#line 1527 "dhcp4_lexer.ll"
{ return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); }
YY_BREAK
case 145:
YY_RULE_SETUP
#line 1527 "dhcp4_lexer.ll"
#line 1528 "dhcp4_lexer.ll"
{ return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); }
YY_BREAK
case 146:
YY_RULE_SETUP
#line 1528 "dhcp4_lexer.ll"
#line 1529 "dhcp4_lexer.ll"
{ return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); }
YY_BREAK
case 147:
YY_RULE_SETUP
#line 1529 "dhcp4_lexer.ll"
#line 1530 "dhcp4_lexer.ll"
{ return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); }
YY_BREAK
case 148:
YY_RULE_SETUP
#line 1530 "dhcp4_lexer.ll"
#line 1531 "dhcp4_lexer.ll"
{ return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); }
YY_BREAK
case 149:
YY_RULE_SETUP
#line 1531 "dhcp4_lexer.ll"
#line 1532 "dhcp4_lexer.ll"
{ return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); }
YY_BREAK
case 150:
YY_RULE_SETUP
#line 1533 "dhcp4_lexer.ll"
#line 1534 "dhcp4_lexer.ll"
{
/* An integer was found. */
std::string tmp(yytext);
@@ -3950,7 +3951,7 @@ YY_RULE_SETUP
YY_BREAK
case 151:
YY_RULE_SETUP
#line 1551 "dhcp4_lexer.ll"
#line 1552 "dhcp4_lexer.ll"
{
/* A floating point was found. */
std::string tmp(yytext);
@@ -3966,7 +3967,7 @@ YY_RULE_SETUP
YY_BREAK
case 152:
YY_RULE_SETUP
#line 1564 "dhcp4_lexer.ll"
#line 1565 "dhcp4_lexer.ll"
{
string tmp(yytext);
return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -3974,33 +3975,33 @@ YY_RULE_SETUP
YY_BREAK
case 153:
YY_RULE_SETUP
#line 1569 "dhcp4_lexer.ll"
#line 1570 "dhcp4_lexer.ll"
{
return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_);
}
YY_BREAK
case 154:
YY_RULE_SETUP
#line 1573 "dhcp4_lexer.ll"
#line 1574 "dhcp4_lexer.ll"
driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
YY_BREAK
case 155:
YY_RULE_SETUP
#line 1575 "dhcp4_lexer.ll"
#line 1576 "dhcp4_lexer.ll"
driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
YY_BREAK
case 156:
YY_RULE_SETUP
#line 1577 "dhcp4_lexer.ll"
#line 1578 "dhcp4_lexer.ll"
driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
YY_BREAK
case 157:
YY_RULE_SETUP
#line 1579 "dhcp4_lexer.ll"
#line 1580 "dhcp4_lexer.ll"
driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
YY_BREAK
case YY_STATE_EOF(INITIAL):
#line 1581 "dhcp4_lexer.ll"
#line 1582 "dhcp4_lexer.ll"
{
if (driver.states_.empty()) {
return isc::dhcp::Dhcp4Parser::make_END(driver.loc_);
@@ -4026,10 +4027,10 @@ case YY_STATE_EOF(INITIAL):
YY_BREAK
case 158:
YY_RULE_SETUP
#line 1604 "dhcp4_lexer.ll"
#line 1605 "dhcp4_lexer.ll"
ECHO;
YY_BREAK
#line 4032 "dhcp4_lexer.cc"
#line 4033 "dhcp4_lexer.cc"
case YY_END_OF_BUFFER:
{
@@ -5134,7 +5135,7 @@ void yyfree (void * ptr )
/* %ok-for-header */
#line 1604 "dhcp4_lexer.ll"
#line 1605 "dhcp4_lexer.ll"
using namespace isc::dhcp;

2193
src/bin/dhcp4/dhcp4_parser.cc
View File

File diff suppressed because it is too large Load Diff

2
src/bin/dhcp4/dhcp4_parser.h
View File

@@ -1406,7 +1406,7 @@ namespace isc { namespace dhcp {
enum
{
yyeof_ = 0,
yylast_ = 795, ///< Last index in yytable_.
yylast_ = 804, ///< Last index in yytable_.
yynnts_ = 332, ///< Number of nonterminal symbols.
yyfinal_ = 26, ///< Termination state number.
yyterror_ = 1,

2
src/bin/dhcp4/location.hh
View File

@@ -1,4 +1,4 @@
// Generated 201710011747
// Generated 201710231324
// A Bison parser, made by GNU Bison 3.0.4.
// Locations for Bison parsers in C++

2
src/bin/dhcp4/position.hh
View File

@@ -1,4 +1,4 @@
// Generated 201710011747
// Generated 201710231324
// A Bison parser, made by GNU Bison 3.0.4.
// Positions for Bison parsers in C++

2
src/bin/dhcp4/stack.hh
View File

@@ -1,4 +1,4 @@
// Generated 201710011747
// Generated 201710231324
// A Bison parser, made by GNU Bison 3.0.4.
// Stack handling for Bison parsers in C++