Commit 20b6751a authored by Francis Dupont's avatar Francis Dupont
Browse files

[116-interface-id-dhcpv4] regen flex/bison

parent 13c82baa
This diff is collapsed.
This diff is collapsed.
...@@ -422,94 +422,93 @@ namespace isc { namespace dhcp { ...@@ -422,94 +422,93 @@ namespace isc { namespace dhcp {
TOKEN_SUBNET = 329, TOKEN_SUBNET = 329,
TOKEN_INTERFACE = 330, TOKEN_INTERFACE = 330,
TOKEN_ID = 331, TOKEN_ID = 331,
TOKEN_RAPID_COMMIT = 332, TOKEN_RESERVATION_MODE = 332,
TOKEN_RESERVATION_MODE = 333, TOKEN_DISABLED = 333,
TOKEN_DISABLED = 334, TOKEN_OUT_OF_POOL = 334,
TOKEN_OUT_OF_POOL = 335, TOKEN_GLOBAL = 335,
TOKEN_GLOBAL = 336, TOKEN_ALL = 336,
TOKEN_ALL = 337, TOKEN_HOST_RESERVATION_IDENTIFIERS = 337,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 338, TOKEN_CLIENT_CLASSES = 338,
TOKEN_CLIENT_CLASSES = 339, TOKEN_REQUIRE_CLIENT_CLASSES = 339,
TOKEN_REQUIRE_CLIENT_CLASSES = 340, TOKEN_TEST = 340,
TOKEN_TEST = 341, TOKEN_ONLY_IF_REQUIRED = 341,
TOKEN_ONLY_IF_REQUIRED = 342, TOKEN_CLIENT_CLASS = 342,
TOKEN_CLIENT_CLASS = 343, TOKEN_RESERVATIONS = 343,
TOKEN_RESERVATIONS = 344, TOKEN_DUID = 344,
TOKEN_DUID = 345, TOKEN_HW_ADDRESS = 345,
TOKEN_HW_ADDRESS = 346, TOKEN_CIRCUIT_ID = 346,
TOKEN_CIRCUIT_ID = 347, TOKEN_CLIENT_ID = 347,
TOKEN_CLIENT_ID = 348, TOKEN_HOSTNAME = 348,
TOKEN_HOSTNAME = 349, TOKEN_FLEX_ID = 349,
TOKEN_FLEX_ID = 350, TOKEN_RELAY = 350,
TOKEN_RELAY = 351, TOKEN_IP_ADDRESS = 351,
TOKEN_IP_ADDRESS = 352, TOKEN_IP_ADDRESSES = 352,
TOKEN_IP_ADDRESSES = 353, TOKEN_HOOKS_LIBRARIES = 353,
TOKEN_HOOKS_LIBRARIES = 354, TOKEN_LIBRARY = 354,
TOKEN_LIBRARY = 355, TOKEN_PARAMETERS = 355,
TOKEN_PARAMETERS = 356, TOKEN_EXPIRED_LEASES_PROCESSING = 356,
TOKEN_EXPIRED_LEASES_PROCESSING = 357, TOKEN_RECLAIM_TIMER_WAIT_TIME = 357,
TOKEN_RECLAIM_TIMER_WAIT_TIME = 358, TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 358,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 359, TOKEN_HOLD_RECLAIMED_TIME = 359,
TOKEN_HOLD_RECLAIMED_TIME = 360, TOKEN_MAX_RECLAIM_LEASES = 360,
TOKEN_MAX_RECLAIM_LEASES = 361, TOKEN_MAX_RECLAIM_TIME = 361,
TOKEN_MAX_RECLAIM_TIME = 362, TOKEN_UNWARNED_RECLAIM_CYCLES = 362,
TOKEN_UNWARNED_RECLAIM_CYCLES = 363, TOKEN_DHCP4O6_PORT = 363,
TOKEN_DHCP4O6_PORT = 364, TOKEN_CONTROL_SOCKET = 364,
TOKEN_CONTROL_SOCKET = 365, TOKEN_SOCKET_TYPE = 365,
TOKEN_SOCKET_TYPE = 366, TOKEN_SOCKET_NAME = 366,
TOKEN_SOCKET_NAME = 367, TOKEN_DHCP_DDNS = 367,
TOKEN_DHCP_DDNS = 368, TOKEN_ENABLE_UPDATES = 368,
TOKEN_ENABLE_UPDATES = 369, TOKEN_QUALIFYING_SUFFIX = 369,
TOKEN_QUALIFYING_SUFFIX = 370, TOKEN_SERVER_IP = 370,
TOKEN_SERVER_IP = 371, TOKEN_SERVER_PORT = 371,
TOKEN_SERVER_PORT = 372, TOKEN_SENDER_IP = 372,
TOKEN_SENDER_IP = 373, TOKEN_SENDER_PORT = 373,
TOKEN_SENDER_PORT = 374, TOKEN_MAX_QUEUE_SIZE = 374,
TOKEN_MAX_QUEUE_SIZE = 375, TOKEN_NCR_PROTOCOL = 375,
TOKEN_NCR_PROTOCOL = 376, TOKEN_NCR_FORMAT = 376,
TOKEN_NCR_FORMAT = 377, TOKEN_ALWAYS_INCLUDE_FQDN = 377,
TOKEN_ALWAYS_INCLUDE_FQDN = 378, TOKEN_OVERRIDE_NO_UPDATE = 378,
TOKEN_OVERRIDE_NO_UPDATE = 379, TOKEN_OVERRIDE_CLIENT_UPDATE = 379,
TOKEN_OVERRIDE_CLIENT_UPDATE = 380, TOKEN_REPLACE_CLIENT_NAME = 380,
TOKEN_REPLACE_CLIENT_NAME = 381, TOKEN_GENERATED_PREFIX = 381,
TOKEN_GENERATED_PREFIX = 382, TOKEN_TCP = 382,
TOKEN_TCP = 383, TOKEN_JSON = 383,
TOKEN_JSON = 384, TOKEN_WHEN_PRESENT = 384,
TOKEN_WHEN_PRESENT = 385, TOKEN_NEVER = 385,
TOKEN_NEVER = 386, TOKEN_ALWAYS = 386,
TOKEN_ALWAYS = 387, TOKEN_WHEN_NOT_PRESENT = 387,
TOKEN_WHEN_NOT_PRESENT = 388, TOKEN_HOSTNAME_CHAR_SET = 388,
TOKEN_HOSTNAME_CHAR_SET = 389, TOKEN_HOSTNAME_CHAR_REPLACEMENT = 389,
TOKEN_HOSTNAME_CHAR_REPLACEMENT = 390, TOKEN_LOGGING = 390,
TOKEN_LOGGING = 391, TOKEN_LOGGERS = 391,
TOKEN_LOGGERS = 392, TOKEN_OUTPUT_OPTIONS = 392,
TOKEN_OUTPUT_OPTIONS = 393, TOKEN_OUTPUT = 393,
TOKEN_OUTPUT = 394, TOKEN_DEBUGLEVEL = 394,
TOKEN_DEBUGLEVEL = 395, TOKEN_SEVERITY = 395,
TOKEN_SEVERITY = 396, TOKEN_FLUSH = 396,
TOKEN_FLUSH = 397, TOKEN_MAXSIZE = 397,
TOKEN_MAXSIZE = 398, TOKEN_MAXVER = 398,
TOKEN_MAXVER = 399, TOKEN_DHCP6 = 399,
TOKEN_DHCP6 = 400, TOKEN_DHCPDDNS = 400,
TOKEN_DHCPDDNS = 401, TOKEN_CONTROL_AGENT = 401,
TOKEN_CONTROL_AGENT = 402, TOKEN_TOPLEVEL_JSON = 402,
TOKEN_TOPLEVEL_JSON = 403, TOKEN_TOPLEVEL_DHCP4 = 403,
TOKEN_TOPLEVEL_DHCP4 = 404, TOKEN_SUB_DHCP4 = 404,
TOKEN_SUB_DHCP4 = 405, TOKEN_SUB_INTERFACES4 = 405,
TOKEN_SUB_INTERFACES4 = 406, TOKEN_SUB_SUBNET4 = 406,
TOKEN_SUB_SUBNET4 = 407, TOKEN_SUB_POOL4 = 407,
TOKEN_SUB_POOL4 = 408, TOKEN_SUB_RESERVATION = 408,
TOKEN_SUB_RESERVATION = 409, TOKEN_SUB_OPTION_DEFS = 409,
TOKEN_SUB_OPTION_DEFS = 410, TOKEN_SUB_OPTION_DEF = 410,
TOKEN_SUB_OPTION_DEF = 411, TOKEN_SUB_OPTION_DATA = 411,
TOKEN_SUB_OPTION_DATA = 412, TOKEN_SUB_HOOKS_LIBRARY = 412,
TOKEN_SUB_HOOKS_LIBRARY = 413, TOKEN_SUB_DHCP_DDNS = 413,
TOKEN_SUB_DHCP_DDNS = 414, TOKEN_SUB_LOGGING = 414,
TOKEN_SUB_LOGGING = 415, TOKEN_STRING = 415,
TOKEN_STRING = 416, TOKEN_INTEGER = 416,
TOKEN_INTEGER = 417, TOKEN_FLOAT = 417,
TOKEN_FLOAT = 418, TOKEN_BOOLEAN = 418
TOKEN_BOOLEAN = 419
}; };
}; };
...@@ -924,10 +923,6 @@ namespace isc { namespace dhcp { ...@@ -924,10 +923,6 @@ namespace isc { namespace dhcp {
symbol_type symbol_type
make_ID (const location_type& l); make_ID (const location_type& l);
static inline
symbol_type
make_RAPID_COMMIT (const location_type& l);
static inline static inline
symbol_type symbol_type
make_RESERVATION_MODE (const location_type& l); make_RESERVATION_MODE (const location_type& l);
...@@ -1483,12 +1478,12 @@ namespace isc { namespace dhcp { ...@@ -1483,12 +1478,12 @@ namespace isc { namespace dhcp {
enum enum
{ {
yyeof_ = 0, yyeof_ = 0,
yylast_ = 971, ///< Last index in yytable_. yylast_ = 956, ///< Last index in yytable_.
yynnts_ = 361, ///< Number of nonterminal symbols. yynnts_ = 360, ///< Number of nonterminal symbols.
yyfinal_ = 28, ///< Termination state number. yyfinal_ = 28, ///< Termination state number.
yyterror_ = 1, yyterror_ = 1,
yyerrcode_ = 256, yyerrcode_ = 256,
yyntokens_ = 165 ///< Number of tokens. yyntokens_ = 164 ///< Number of tokens.
}; };
...@@ -1546,9 +1541,9 @@ namespace isc { namespace dhcp { ...@@ -1546,9 +1541,9 @@ namespace isc { namespace dhcp {
125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
155, 156, 157, 158, 159, 160, 161, 162, 163, 164 155, 156, 157, 158, 159, 160, 161, 162, 163
}; };
const unsigned user_token_number_max_ = 419; const unsigned user_token_number_max_ = 418;
const token_number_type undef_token_ = 2; const token_number_type undef_token_ = 2;
if (static_cast<int> (t) <= yyeof_) if (static_cast<int> (t) <= yyeof_)
...@@ -1579,30 +1574,30 @@ namespace isc { namespace dhcp { ...@@ -1579,30 +1574,30 @@ namespace isc { namespace dhcp {
{ {
switch (other.type_get ()) switch (other.type_get ())
{ {
case 180: // value case 179: // value
case 184: // map_value case 183: // map_value
case 222: // socket_type case 221: // socket_type
case 225: // outbound_interface_value case 224: // outbound_interface_value
case 247: // db_type case 246: // db_type
case 329: // hr_mode case 328: // hr_mode
case 477: // ncr_protocol_value case 475: // ncr_protocol_value
case 485: // replace_client_name_value case 483: // replace_client_name_value
value.copy< ElementPtr > (other.value); value.copy< ElementPtr > (other.value);
break; break;
case 164: // "boolean" case 163: // "boolean"
value.copy< bool > (other.value); value.copy< bool > (other.value);
break; break;
case 163: // "floating point" case 162: // "floating point"
value.copy< double > (other.value); value.copy< double > (other.value);
break; break;
case 162: // "integer" case 161: // "integer"
value.copy< int64_t > (other.value); value.copy< int64_t > (other.value);
break; break;
case 161: // "constant string" case 160: // "constant string"
value.copy< std::string > (other.value); value.copy< std::string > (other.value);
break; break;
...@@ -1621,30 +1616,30 @@ namespace isc { namespace dhcp { ...@@ -1621,30 +1616,30 @@ namespace isc { namespace dhcp {
(void) v; (void) v;
switch (this->type_get ()) switch (this->type_get ())
{ {
case 180: // value case 179: // value
case 184: // map_value case 183: // map_value
case 222: // socket_type case 221: // socket_type
case 225: // outbound_interface_value case 224: // outbound_interface_value
case 247: // db_type case 246: // db_type
case 329: // hr_mode case 328: // hr_mode
case 477: // ncr_protocol_value case 475: // ncr_protocol_value
case 485: // replace_client_name_value case 483: // replace_client_name_value
value.copy< ElementPtr > (v); value.copy< ElementPtr > (v);
break; break;
case 164: // "boolean" case 163: // "boolean"
value.copy< bool > (v); value.copy< bool > (v);
break; break;
case 163: // "floating point" case 162: // "floating point"
value.copy< double > (v); value.copy< double > (v);
break; break;
case 162: // "integer" case 161: // "integer"
value.copy< int64_t > (v); value.copy< int64_t > (v);
break; break;
case 161: // "constant string" case 160: // "constant string"
value.copy< std::string > (v); value.copy< std::string > (v);
break; break;
...@@ -1722,30 +1717,30 @@ namespace isc { namespace dhcp { ...@@ -1722,30 +1717,30 @@ namespace isc { namespace dhcp {
// Type destructor. // Type destructor.
switch (yytype) switch (yytype)
{ {
case 180: // value case 179: // value
case 184: // map_value case 183: // map_value
case 222: // socket_type case 221: // socket_type
case 225: // outbound_interface_value case 224: // outbound_interface_value
case 247: // db_type case 246: // db_type
case 329: // hr_mode case 328: // hr_mode
case 477: // ncr_protocol_value case 475: // ncr_protocol_value
case 485: // replace_client_name_value case 483: // replace_client_name_value
value.template destroy< ElementPtr > (); value.template destroy< ElementPtr > ();
break; break;
case 164: // "boolean" case 163: // "boolean"
value.template destroy< bool > (); value.template destroy< bool > ();
break; break;
case 163: // "floating point" case 162: // "floating point"
value.template destroy< double > (); value.template destroy< double > ();
break; break;
case 162: // "integer" case 161: // "integer"
value.template destroy< int64_t > (); value.template destroy< int64_t > ();
break; break;
case 161: // "constant string" case 160: // "constant string"
value.template destroy< std::string > (); value.template destroy< std::string > ();
break; break;
...@@ -1770,30 +1765,30 @@ namespace isc { namespace dhcp { ...@@ -1770,30 +1765,30 @@ namespace isc { namespace dhcp {
super_type::move (s); super_type::move (s);
switch (this->type_get ()) switch (this->type_get ())
{ {
case 180: // value case 179: // value
case 184: // map_value case 183: // map_value
case 222: // socket_type case 221: // socket_type
case 225: // outbound_interface_value case 224: // outbound_interface_value
case 247: // db_type case 246: // db_type
case 329: // hr_mode case 328: // hr_mode
case 477: // ncr_protocol_value case 475: // ncr_protocol_value
case 485: // replace_client_name_value case 483: // replace_client_name_value
value.move< ElementPtr > (s.value); value.move< ElementPtr > (s.value);
break; break;
case 164: // "boolean" case 163: // "boolean"
value.move< bool > (s.value); value.move< bool > (s.value);
break; break;
case 163: // "floating point" case 162: // "floating point"
value.move< double > (s.value); value.move< double > (s.value);
break; break;
case 162: // "integer" case 161: // "integer"
value.move< int64_t > (s.value); value.move< int64_t > (s.value);
break; break;
case 161: // "constant string" case 160: // "constant string"
value.move< std::string > (s.value); value.move< std::string > (s.value);
break; break;
...@@ -1868,7 +1863,7 @@ namespace isc { namespace dhcp { ...@@ -1868,7 +1863,7 @@ namespace isc { namespace dhcp {
385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394,
395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404,
405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414,
415, 416, 417, 418, 419 415, 416, 417, 418
}; };
return static_cast<token_type> (yytoken_number_[type]); return static_cast<token_type> (yytoken_number_[type]);
} }
...@@ -2323,12 +2318,6 @@ namespace isc { namespace dhcp { ...@@ -2323,12 +2318,6 @@ namespace isc { namespace dhcp {
return symbol_type (token::TOKEN_ID, l); return symbol_type (token::TOKEN_ID, l);
} }
Dhcp4Parser::symbol_type
Dhcp4Parser::make_RAPID_COMMIT (const location_type& l)
{
return symbol_type (token::TOKEN_RAPID_COMMIT, l);
}
Dhcp4Parser::symbol_type Dhcp4Parser::symbol_type
Dhcp4Parser::make_RESERVATION_MODE (const location_type& l) Dhcp4Parser::make_RESERVATION_MODE (const location_type& l)
{ {
...@@ -2854,7 +2843,7 @@ namespace isc { namespace dhcp { ...@@ -2854,7 +2843,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp4_parser.yy" // lalr1.cc:379 #line 14 "dhcp4_parser.yy" // lalr1.cc:379
} } // isc::dhcp } } // isc::dhcp
#line 2858 "dhcp4_parser.h" // lalr1.cc:379 #line 2847 "dhcp4_parser.h" // lalr1.cc:379
......
// Generated 201809121854 // Generated 201809140750
// A Bison parser, made by GNU Bison 3.0.5. // A Bison parser, made by GNU Bison 3.0.5.
// Locations for Bison parsers in C++ // Locations for Bison parsers in C++
......
// Generated 201809121854 // Generated 201809140750
// A Bison parser, made by GNU Bison 3.0.5. // A Bison parser, made by GNU Bison 3.0.5.
// Positions for Bison parsers in C++ // Positions for Bison parsers in C++
......
// Generated 201809121854 // Generated 201809140750
// A Bison parser, made by GNU Bison 3.0.5. // A Bison parser, made by GNU Bison 3.0.5.
// Stack handling for Bison parsers in C++ // 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