Commit cef2b630 authored by Francis Dupont's avatar Francis Dupont

[master] regen

parent 3e996717
This diff is collapsed.
This diff is collapsed.
......@@ -473,21 +473,22 @@ namespace isc { namespace dhcp {
TOKEN_MAXVER = 381,
TOKEN_DHCP6 = 382,
TOKEN_DHCPDDNS = 383,
TOKEN_TOPLEVEL_JSON = 384,
TOKEN_TOPLEVEL_DHCP4 = 385,
TOKEN_SUB_DHCP4 = 386,
TOKEN_SUB_INTERFACES4 = 387,
TOKEN_SUB_SUBNET4 = 388,
TOKEN_SUB_POOL4 = 389,
TOKEN_SUB_RESERVATION = 390,
TOKEN_SUB_OPTION_DEF = 391,
TOKEN_SUB_OPTION_DATA = 392,
TOKEN_SUB_HOOKS_LIBRARY = 393,
TOKEN_SUB_DHCP_DDNS = 394,
TOKEN_STRING = 395,
TOKEN_INTEGER = 396,
TOKEN_FLOAT = 397,
TOKEN_BOOLEAN = 398
TOKEN_CONTROL_AGENT = 384,
TOKEN_TOPLEVEL_JSON = 385,
TOKEN_TOPLEVEL_DHCP4 = 386,
TOKEN_SUB_DHCP4 = 387,
TOKEN_SUB_INTERFACES4 = 388,
TOKEN_SUB_SUBNET4 = 389,
TOKEN_SUB_POOL4 = 390,
TOKEN_SUB_RESERVATION = 391,
TOKEN_SUB_OPTION_DEF = 392,
TOKEN_SUB_OPTION_DATA = 393,
TOKEN_SUB_HOOKS_LIBRARY = 394,
TOKEN_SUB_DHCP_DDNS = 395,
TOKEN_STRING = 396,
TOKEN_INTEGER = 397,
TOKEN_FLOAT = 398,
TOKEN_BOOLEAN = 399
};
};
......@@ -1110,6 +1111,10 @@ namespace isc { namespace dhcp {
symbol_type
make_DHCPDDNS (const location_type& l);
static inline
symbol_type
make_CONTROL_AGENT (const location_type& l);
static inline
symbol_type
make_TOPLEVEL_JSON (const location_type& l);
......@@ -1375,12 +1380,12 @@ namespace isc { namespace dhcp {
enum
{
yyeof_ = 0,
yylast_ = 751, ///< Last index in yytable_.
yynnts_ = 316, ///< Number of nonterminal symbols.
yylast_ = 756, ///< Last index in yytable_.
yynnts_ = 318, ///< Number of nonterminal symbols.
yyfinal_ = 24, ///< Termination state number.
yyterror_ = 1,
yyerrcode_ = 256,
yyntokens_ = 144 ///< Number of tokens.
yyntokens_ = 145 ///< Number of tokens.
};
......@@ -1436,9 +1441,9 @@ namespace isc { namespace dhcp {
105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
135, 136, 137, 138, 139, 140, 141, 142, 143
135, 136, 137, 138, 139, 140, 141, 142, 143, 144
};
const unsigned int user_token_number_max_ = 398;
const unsigned int user_token_number_max_ = 399;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
......@@ -1471,29 +1476,29 @@ namespace isc { namespace dhcp {
{
switch (other.type_get ())
{
case 157: // value
case 161: // map_value
case 199: // socket_type
case 209: // db_type
case 286: // hr_mode
case 419: // ncr_protocol_value
case 427: // replace_client_name_value
case 158: // value
case 162: // map_value
case 200: // socket_type
case 210: // db_type
case 287: // hr_mode
case 420: // ncr_protocol_value
case 428: // replace_client_name_value
value.copy< ElementPtr > (other.value);
break;
case 143: // "boolean"
case 144: // "boolean"
value.copy< bool > (other.value);
break;
case 142: // "floating point"
case 143: // "floating point"
value.copy< double > (other.value);
break;
case 141: // "integer"
case 142: // "integer"
value.copy< int64_t > (other.value);
break;
case 140: // "constant string"
case 141: // "constant string"
value.copy< std::string > (other.value);
break;
......@@ -1514,29 +1519,29 @@ namespace isc { namespace dhcp {
(void) v;
switch (this->type_get ())
{
case 157: // value
case 161: // map_value
case 199: // socket_type
case 209: // db_type
case 286: // hr_mode
case 419: // ncr_protocol_value
case 427: // replace_client_name_value
case 158: // value
case 162: // map_value
case 200: // socket_type
case 210: // db_type
case 287: // hr_mode
case 420: // ncr_protocol_value
case 428: // replace_client_name_value
value.copy< ElementPtr > (v);
break;
case 143: // "boolean"
case 144: // "boolean"
value.copy< bool > (v);
break;
case 142: // "floating point"
case 143: // "floating point"
value.copy< double > (v);
break;
case 141: // "integer"
case 142: // "integer"
value.copy< int64_t > (v);
break;
case 140: // "constant string"
case 141: // "constant string"
value.copy< std::string > (v);
break;
......@@ -1616,29 +1621,29 @@ namespace isc { namespace dhcp {
// Type destructor.
switch (yytype)
{
case 157: // value
case 161: // map_value
case 199: // socket_type
case 209: // db_type
case 286: // hr_mode
case 419: // ncr_protocol_value
case 427: // replace_client_name_value
case 158: // value
case 162: // map_value
case 200: // socket_type
case 210: // db_type
case 287: // hr_mode
case 420: // ncr_protocol_value
case 428: // replace_client_name_value
value.template destroy< ElementPtr > ();
break;
case 143: // "boolean"
case 144: // "boolean"
value.template destroy< bool > ();
break;
case 142: // "floating point"
case 143: // "floating point"
value.template destroy< double > ();
break;
case 141: // "integer"
case 142: // "integer"
value.template destroy< int64_t > ();
break;
case 140: // "constant string"
case 141: // "constant string"
value.template destroy< std::string > ();
break;
......@@ -1665,29 +1670,29 @@ namespace isc { namespace dhcp {
super_type::move(s);
switch (this->type_get ())
{
case 157: // value
case 161: // map_value
case 199: // socket_type
case 209: // db_type
case 286: // hr_mode
case 419: // ncr_protocol_value
case 427: // replace_client_name_value
case 158: // value
case 162: // map_value
case 200: // socket_type
case 210: // db_type
case 287: // hr_mode
case 420: // ncr_protocol_value
case 428: // replace_client_name_value
value.move< ElementPtr > (s.value);
break;
case 143: // "boolean"
case 144: // "boolean"
value.move< bool > (s.value);
break;
case 142: // "floating point"
case 143: // "floating point"
value.move< double > (s.value);
break;
case 141: // "integer"
case 142: // "integer"
value.move< int64_t > (s.value);
break;
case 140: // "constant string"
case 141: // "constant string"
value.move< std::string > (s.value);
break;
......@@ -1760,7 +1765,7 @@ namespace isc { namespace dhcp {
365, 366, 367, 368, 369, 370, 371, 372, 373, 374,
375, 376, 377, 378, 379, 380, 381, 382, 383, 384,
385, 386, 387, 388, 389, 390, 391, 392, 393, 394,
395, 396, 397, 398
395, 396, 397, 398, 399
};
return static_cast<token_type> (yytoken_number_[type]);
}
......@@ -2527,6 +2532,12 @@ namespace isc { namespace dhcp {
return symbol_type (token::TOKEN_DHCPDDNS, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_CONTROL_AGENT (const location_type& l)
{
return symbol_type (token::TOKEN_CONTROL_AGENT, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_TOPLEVEL_JSON (const location_type& l)
{
......@@ -2620,7 +2631,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp4_parser.yy" // lalr1.cc:377
} } // isc::dhcp
#line 2624 "dhcp4_parser.h" // lalr1.cc:377
#line 2635 "dhcp4_parser.h" // lalr1.cc:377
......
// Generated 201707281415
// Generated 201708070754
// A Bison parser, made by GNU Bison 3.0.4.
// Locations for Bison parsers in C++
......
// Generated 201707281415
// Generated 201708070754
// A Bison parser, made by GNU Bison 3.0.4.
// Positions for Bison parsers in C++
......
// Generated 201707281415
// Generated 201708070754
// A Bison parser, made by GNU Bison 3.0.4.
// Stack handling for Bison parsers in C++
......
This diff is collapsed.
This diff is collapsed.
......@@ -480,22 +480,23 @@ namespace isc { namespace dhcp {
TOKEN_MAXVER = 388,
TOKEN_DHCP4 = 389,
TOKEN_DHCPDDNS = 390,
TOKEN_TOPLEVEL_JSON = 391,
TOKEN_TOPLEVEL_DHCP6 = 392,
TOKEN_SUB_DHCP6 = 393,
TOKEN_SUB_INTERFACES6 = 394,
TOKEN_SUB_SUBNET6 = 395,
TOKEN_SUB_POOL6 = 396,
TOKEN_SUB_PD_POOL = 397,
TOKEN_SUB_RESERVATION = 398,
TOKEN_SUB_OPTION_DEF = 399,
TOKEN_SUB_OPTION_DATA = 400,
TOKEN_SUB_HOOKS_LIBRARY = 401,
TOKEN_SUB_DHCP_DDNS = 402,
TOKEN_STRING = 403,
TOKEN_INTEGER = 404,
TOKEN_FLOAT = 405,
TOKEN_BOOLEAN = 406
TOKEN_CONTROL_AGENT = 391,
TOKEN_TOPLEVEL_JSON = 392,
TOKEN_TOPLEVEL_DHCP6 = 393,
TOKEN_SUB_DHCP6 = 394,
TOKEN_SUB_INTERFACES6 = 395,
TOKEN_SUB_SUBNET6 = 396,
TOKEN_SUB_POOL6 = 397,
TOKEN_SUB_PD_POOL = 398,
TOKEN_SUB_RESERVATION = 399,
TOKEN_SUB_OPTION_DEF = 400,
TOKEN_SUB_OPTION_DATA = 401,
TOKEN_SUB_HOOKS_LIBRARY = 402,
TOKEN_SUB_DHCP_DDNS = 403,
TOKEN_STRING = 404,
TOKEN_INTEGER = 405,
TOKEN_FLOAT = 406,
TOKEN_BOOLEAN = 407
};
};
......@@ -1146,6 +1147,10 @@ namespace isc { namespace dhcp {
symbol_type
make_DHCPDDNS (const location_type& l);
static inline
symbol_type
make_CONTROL_AGENT (const location_type& l);
static inline
symbol_type
make_TOPLEVEL_JSON (const location_type& l);
......@@ -1415,12 +1420,12 @@ namespace isc { namespace dhcp {
enum
{
yyeof_ = 0,
yylast_ = 799, ///< Last index in yytable_.
yynnts_ = 333, ///< Number of nonterminal symbols.
yylast_ = 804, ///< Last index in yytable_.
yynnts_ = 335, ///< Number of nonterminal symbols.
yyfinal_ = 26, ///< Termination state number.
yyterror_ = 1,
yyerrcode_ = 256,
yyntokens_ = 152 ///< Number of tokens.
yyntokens_ = 153 ///< Number of tokens.
};
......@@ -1477,9 +1482,9 @@ namespace isc { namespace dhcp {
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
145, 146, 147, 148, 149, 150, 151
145, 146, 147, 148, 149, 150, 151, 152
};
const unsigned int user_token_number_max_ = 406;
const unsigned int user_token_number_max_ = 407;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
......@@ -1512,29 +1517,29 @@ namespace isc { namespace dhcp {
{
switch (other.type_get ())
{
case 166: // value
case 170: // map_value
case 214: // db_type
case 290: // hr_mode
case 411: // duid_type
case 444: // ncr_protocol_value
case 452: // replace_client_name_value
case 167: // value
case 171: // map_value
case 215: // db_type
case 291: // hr_mode
case 412: // duid_type
case 445: // ncr_protocol_value
case 453: // replace_client_name_value
value.copy< ElementPtr > (other.value);
break;
case 151: // "boolean"
case 152: // "boolean"
value.copy< bool > (other.value);
break;
case 150: // "floating point"
case 151: // "floating point"
value.copy< double > (other.value);
break;
case 149: // "integer"
case 150: // "integer"
value.copy< int64_t > (other.value);
break;
case 148: // "constant string"
case 149: // "constant string"
value.copy< std::string > (other.value);
break;
......@@ -1555,29 +1560,29 @@ namespace isc { namespace dhcp {
(void) v;
switch (this->type_get ())
{
case 166: // value
case 170: // map_value
case 214: // db_type
case 290: // hr_mode
case 411: // duid_type
case 444: // ncr_protocol_value
case 452: // replace_client_name_value
case 167: // value
case 171: // map_value
case 215: // db_type
case 291: // hr_mode
case 412: // duid_type
case 445: // ncr_protocol_value
case 453: // replace_client_name_value
value.copy< ElementPtr > (v);
break;
case 151: // "boolean"
case 152: // "boolean"
value.copy< bool > (v);
break;
case 150: // "floating point"
case 151: // "floating point"
value.copy< double > (v);
break;
case 149: // "integer"
case 150: // "integer"
value.copy< int64_t > (v);
break;
case 148: // "constant string"
case 149: // "constant string"
value.copy< std::string > (v);
break;
......@@ -1657,29 +1662,29 @@ namespace isc { namespace dhcp {
// Type destructor.
switch (yytype)
{
case 166: // value
case 170: // map_value
case 214: // db_type
case 290: // hr_mode
case 411: // duid_type
case 444: // ncr_protocol_value
case 452: // replace_client_name_value
case 167: // value
case 171: // map_value
case 215: // db_type
case 291: // hr_mode
case 412: // duid_type
case 445: // ncr_protocol_value
case 453: // replace_client_name_value
value.template destroy< ElementPtr > ();
break;
case 151: // "boolean"
case 152: // "boolean"
value.template destroy< bool > ();
break;
case 150: // "floating point"
case 151: // "floating point"
value.template destroy< double > ();
break;
case 149: // "integer"
case 150: // "integer"
value.template destroy< int64_t > ();
break;
case 148: // "constant string"
case 149: // "constant string"
value.template destroy< std::string > ();
break;
......@@ -1706,29 +1711,29 @@ namespace isc { namespace dhcp {
super_type::move(s);
switch (this->type_get ())
{
case 166: // value
case 170: // map_value
case 214: // db_type
case 290: // hr_mode
case 411: // duid_type
case 444: // ncr_protocol_value
case 452: // replace_client_name_value
case 167: // value
case 171: // map_value
case 215: // db_type
case 291: // hr_mode
case 412: // duid_type
case 445: // ncr_protocol_value
case 453: // replace_client_name_value
value.move< ElementPtr > (s.value);
break;
case 151: // "boolean"
case 152: // "boolean"
value.move< bool > (s.value);
break;
case 150: // "floating point"
case 151: // "floating point"
value.move< double > (s.value);
break;
case 149: // "integer"
case 150: // "integer"
value.move< int64_t > (s.value);
break;
case 148: // "constant string"
case 149: // "constant string"
value.move< std::string > (s.value);
break;
......@@ -1802,7 +1807,7 @@ namespace isc { namespace dhcp {
375, 376, 377, 378, 379, 380, 381, 382, 383, 384,
385, 386, 387, 388, 389, 390, 391, 392, 393, 394,
395, 396, 397, 398, 399, 400, 401, 402, 403, 404,
405, 406
405, 406, 407
};
return static_cast<token_type> (yytoken_number_[type]);
}
......@@ -2611,6 +2616,12 @@ namespace isc { namespace dhcp {
return symbol_type (token::TOKEN_DHCPDDNS, l);
}
Dhcp6Parser::symbol_type
Dhcp6Parser::make_CONTROL_AGENT (const location_type& l)
{
return symbol_type (token::TOKEN_CONTROL_AGENT, l);
}
Dhcp6Parser::symbol_type
Dhcp6Parser::make_TOPLEVEL_JSON (const location_type& l)
{
......@@ -2710,7 +2721,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp6_parser.yy" // lalr1.cc:377
} } // isc::dhcp
#line 2714 "dhcp6_parser.h" // lalr1.cc:377
#line 2725 "dhcp6_parser.h" // lalr1.cc:377
......
// Generated 201707281415
// Generated 201708070754
// A Bison parser, made by GNU Bison 3.0.4.
// Locations for Bison parsers in C++
......
// Generated 201707281415
// Generated 201708070754
// A Bison parser, made by GNU Bison 3.0.4.
// Positions for Bison parsers in C++
......
// Generated 201707281415
// Generated 201708070754
// A Bison parser, made by GNU Bison 3.0.4.
// Stack handling for Bison parsers in C++
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment