Commit 1bab6cda authored by Francis Dupont's avatar Francis Dupont
Browse files

[trac5351 regen flex/bison

parent 636c930f
This diff is collapsed.
This diff is collapsed.
......@@ -410,91 +410,92 @@ namespace isc { namespace dhcp {
TOKEN_POOLS = 317,
TOKEN_POOL = 318,
TOKEN_USER_CONTEXT = 319,
TOKEN_SUBNET = 320,
TOKEN_INTERFACE = 321,
TOKEN_INTERFACE_ID = 322,
TOKEN_ID = 323,
TOKEN_RAPID_COMMIT = 324,
TOKEN_RESERVATION_MODE = 325,
TOKEN_DISABLED = 326,
TOKEN_OUT_OF_POOL = 327,
TOKEN_ALL = 328,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 329,
TOKEN_CLIENT_CLASSES = 330,
TOKEN_TEST = 331,
TOKEN_CLIENT_CLASS = 332,
TOKEN_RESERVATIONS = 333,
TOKEN_DUID = 334,
TOKEN_HW_ADDRESS = 335,
TOKEN_CIRCUIT_ID = 336,
TOKEN_CLIENT_ID = 337,
TOKEN_HOSTNAME = 338,
TOKEN_FLEX_ID = 339,
TOKEN_RELAY = 340,
TOKEN_IP_ADDRESS = 341,
TOKEN_HOOKS_LIBRARIES = 342,
TOKEN_LIBRARY = 343,
TOKEN_PARAMETERS = 344,
TOKEN_EXPIRED_LEASES_PROCESSING = 345,
TOKEN_RECLAIM_TIMER_WAIT_TIME = 346,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 347,
TOKEN_HOLD_RECLAIMED_TIME = 348,
TOKEN_MAX_RECLAIM_LEASES = 349,
TOKEN_MAX_RECLAIM_TIME = 350,
TOKEN_UNWARNED_RECLAIM_CYCLES = 351,
TOKEN_DHCP4O6_PORT = 352,
TOKEN_CONTROL_SOCKET = 353,
TOKEN_SOCKET_TYPE = 354,
TOKEN_SOCKET_NAME = 355,
TOKEN_DHCP_DDNS = 356,
TOKEN_ENABLE_UPDATES = 357,
TOKEN_QUALIFYING_SUFFIX = 358,
TOKEN_SERVER_IP = 359,
TOKEN_SERVER_PORT = 360,
TOKEN_SENDER_IP = 361,
TOKEN_SENDER_PORT = 362,
TOKEN_MAX_QUEUE_SIZE = 363,
TOKEN_NCR_PROTOCOL = 364,
TOKEN_NCR_FORMAT = 365,
TOKEN_ALWAYS_INCLUDE_FQDN = 366,
TOKEN_OVERRIDE_NO_UPDATE = 367,
TOKEN_OVERRIDE_CLIENT_UPDATE = 368,
TOKEN_REPLACE_CLIENT_NAME = 369,
TOKEN_GENERATED_PREFIX = 370,
TOKEN_TCP = 371,
TOKEN_JSON = 372,
TOKEN_WHEN_PRESENT = 373,
TOKEN_NEVER = 374,
TOKEN_ALWAYS = 375,
TOKEN_WHEN_NOT_PRESENT = 376,
TOKEN_LOGGING = 377,
TOKEN_LOGGERS = 378,
TOKEN_OUTPUT_OPTIONS = 379,
TOKEN_OUTPUT = 380,
TOKEN_DEBUGLEVEL = 381,
TOKEN_SEVERITY = 382,
TOKEN_FLUSH = 383,
TOKEN_MAXSIZE = 384,
TOKEN_MAXVER = 385,
TOKEN_DHCP6 = 386,
TOKEN_DHCPDDNS = 387,
TOKEN_CONTROL_AGENT = 388,
TOKEN_TOPLEVEL_JSON = 389,
TOKEN_TOPLEVEL_DHCP4 = 390,
TOKEN_SUB_DHCP4 = 391,
TOKEN_SUB_INTERFACES4 = 392,
TOKEN_SUB_SUBNET4 = 393,
TOKEN_SUB_POOL4 = 394,
TOKEN_SUB_RESERVATION = 395,
TOKEN_SUB_OPTION_DEFS = 396,
TOKEN_SUB_OPTION_DEF = 397,
TOKEN_SUB_OPTION_DATA = 398,
TOKEN_SUB_HOOKS_LIBRARY = 399,
TOKEN_SUB_DHCP_DDNS = 400,
TOKEN_STRING = 401,
TOKEN_INTEGER = 402,
TOKEN_FLOAT = 403,
TOKEN_BOOLEAN = 404
TOKEN_COMMENT = 320,
TOKEN_SUBNET = 321,
TOKEN_INTERFACE = 322,
TOKEN_INTERFACE_ID = 323,
TOKEN_ID = 324,
TOKEN_RAPID_COMMIT = 325,
TOKEN_RESERVATION_MODE = 326,
TOKEN_DISABLED = 327,
TOKEN_OUT_OF_POOL = 328,
TOKEN_ALL = 329,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 330,
TOKEN_CLIENT_CLASSES = 331,
TOKEN_TEST = 332,
TOKEN_CLIENT_CLASS = 333,
TOKEN_RESERVATIONS = 334,
TOKEN_DUID = 335,
TOKEN_HW_ADDRESS = 336,
TOKEN_CIRCUIT_ID = 337,
TOKEN_CLIENT_ID = 338,
TOKEN_HOSTNAME = 339,
TOKEN_FLEX_ID = 340,
TOKEN_RELAY = 341,
TOKEN_IP_ADDRESS = 342,
TOKEN_HOOKS_LIBRARIES = 343,
TOKEN_LIBRARY = 344,
TOKEN_PARAMETERS = 345,
TOKEN_EXPIRED_LEASES_PROCESSING = 346,
TOKEN_RECLAIM_TIMER_WAIT_TIME = 347,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 348,
TOKEN_HOLD_RECLAIMED_TIME = 349,
TOKEN_MAX_RECLAIM_LEASES = 350,
TOKEN_MAX_RECLAIM_TIME = 351,
TOKEN_UNWARNED_RECLAIM_CYCLES = 352,
TOKEN_DHCP4O6_PORT = 353,
TOKEN_CONTROL_SOCKET = 354,
TOKEN_SOCKET_TYPE = 355,
TOKEN_SOCKET_NAME = 356,
TOKEN_DHCP_DDNS = 357,
TOKEN_ENABLE_UPDATES = 358,
TOKEN_QUALIFYING_SUFFIX = 359,
TOKEN_SERVER_IP = 360,
TOKEN_SERVER_PORT = 361,
TOKEN_SENDER_IP = 362,
TOKEN_SENDER_PORT = 363,
TOKEN_MAX_QUEUE_SIZE = 364,
TOKEN_NCR_PROTOCOL = 365,
TOKEN_NCR_FORMAT = 366,
TOKEN_ALWAYS_INCLUDE_FQDN = 367,
TOKEN_OVERRIDE_NO_UPDATE = 368,
TOKEN_OVERRIDE_CLIENT_UPDATE = 369,
TOKEN_REPLACE_CLIENT_NAME = 370,
TOKEN_GENERATED_PREFIX = 371,
TOKEN_TCP = 372,
TOKEN_JSON = 373,
TOKEN_WHEN_PRESENT = 374,
TOKEN_NEVER = 375,
TOKEN_ALWAYS = 376,
TOKEN_WHEN_NOT_PRESENT = 377,
TOKEN_LOGGING = 378,
TOKEN_LOGGERS = 379,
TOKEN_OUTPUT_OPTIONS = 380,
TOKEN_OUTPUT = 381,
TOKEN_DEBUGLEVEL = 382,
TOKEN_SEVERITY = 383,
TOKEN_FLUSH = 384,
TOKEN_MAXSIZE = 385,
TOKEN_MAXVER = 386,
TOKEN_DHCP6 = 387,
TOKEN_DHCPDDNS = 388,
TOKEN_CONTROL_AGENT = 389,
TOKEN_TOPLEVEL_JSON = 390,
TOKEN_TOPLEVEL_DHCP4 = 391,
TOKEN_SUB_DHCP4 = 392,
TOKEN_SUB_INTERFACES4 = 393,
TOKEN_SUB_SUBNET4 = 394,
TOKEN_SUB_POOL4 = 395,
TOKEN_SUB_RESERVATION = 396,
TOKEN_SUB_OPTION_DEFS = 397,
TOKEN_SUB_OPTION_DEF = 398,
TOKEN_SUB_OPTION_DATA = 399,
TOKEN_SUB_HOOKS_LIBRARY = 400,
TOKEN_SUB_DHCP_DDNS = 401,
TOKEN_STRING = 402,
TOKEN_INTEGER = 403,
TOKEN_FLOAT = 404,
TOKEN_BOOLEAN = 405
};
};
......@@ -861,6 +862,10 @@ namespace isc { namespace dhcp {
symbol_type
make_USER_CONTEXT (const location_type& l);
static inline
symbol_type
make_COMMENT (const location_type& l);
static inline
symbol_type
make_SUBNET (const location_type& l);
......@@ -1406,12 +1411,12 @@ namespace isc { namespace dhcp {
enum
{
yyeof_ = 0,
yylast_ = 804, ///< Last index in yytable_.
yynnts_ = 332, ///< Number of nonterminal symbols.
yylast_ = 810, ///< Last index in yytable_.
yynnts_ = 334, ///< Number of nonterminal symbols.
yyfinal_ = 26, ///< Termination state number.
yyterror_ = 1,
yyerrcode_ = 256,
yyntokens_ = 150 ///< Number of tokens.
yyntokens_ = 151 ///< Number of tokens.
};
......@@ -1468,9 +1473,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
145, 146, 147, 148, 149, 150
};
const unsigned int user_token_number_max_ = 404;
const unsigned int user_token_number_max_ = 405;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
......@@ -1503,30 +1508,30 @@ namespace isc { namespace dhcp {
{
switch (other.type_get ())
{
case 164: // value
case 168: // map_value
case 206: // socket_type
case 209: // outbound_interface_value
case 219: // db_type
case 296: // hr_mode
case 439: // ncr_protocol_value
case 447: // replace_client_name_value
case 165: // value
case 169: // map_value
case 207: // socket_type
case 210: // outbound_interface_value
case 220: // db_type
case 297: // hr_mode
case 442: // ncr_protocol_value
case 450: // replace_client_name_value
value.copy< ElementPtr > (other.value);
break;
case 149: // "boolean"
case 150: // "boolean"
value.copy< bool > (other.value);
break;
case 148: // "floating point"
case 149: // "floating point"
value.copy< double > (other.value);
break;
case 147: // "integer"
case 148: // "integer"
value.copy< int64_t > (other.value);
break;
case 146: // "constant string"
case 147: // "constant string"
value.copy< std::string > (other.value);
break;
......@@ -1547,30 +1552,30 @@ namespace isc { namespace dhcp {
(void) v;
switch (this->type_get ())
{
case 164: // value
case 168: // map_value
case 206: // socket_type
case 209: // outbound_interface_value
case 219: // db_type
case 296: // hr_mode
case 439: // ncr_protocol_value
case 447: // replace_client_name_value
case 165: // value
case 169: // map_value
case 207: // socket_type
case 210: // outbound_interface_value
case 220: // db_type
case 297: // hr_mode
case 442: // ncr_protocol_value
case 450: // replace_client_name_value
value.copy< ElementPtr > (v);
break;
case 149: // "boolean"
case 150: // "boolean"
value.copy< bool > (v);
break;
case 148: // "floating point"
case 149: // "floating point"
value.copy< double > (v);
break;
case 147: // "integer"
case 148: // "integer"
value.copy< int64_t > (v);
break;
case 146: // "constant string"
case 147: // "constant string"
value.copy< std::string > (v);
break;
......@@ -1650,30 +1655,30 @@ namespace isc { namespace dhcp {
// Type destructor.
switch (yytype)
{
case 164: // value
case 168: // map_value
case 206: // socket_type
case 209: // outbound_interface_value
case 219: // db_type
case 296: // hr_mode
case 439: // ncr_protocol_value
case 447: // replace_client_name_value
case 165: // value
case 169: // map_value
case 207: // socket_type
case 210: // outbound_interface_value
case 220: // db_type
case 297: // hr_mode
case 442: // ncr_protocol_value
case 450: // replace_client_name_value
value.template destroy< ElementPtr > ();
break;
case 149: // "boolean"
case 150: // "boolean"
value.template destroy< bool > ();
break;
case 148: // "floating point"
case 149: // "floating point"
value.template destroy< double > ();
break;
case 147: // "integer"
case 148: // "integer"
value.template destroy< int64_t > ();
break;
case 146: // "constant string"
case 147: // "constant string"
value.template destroy< std::string > ();
break;
......@@ -1700,30 +1705,30 @@ namespace isc { namespace dhcp {
super_type::move(s);
switch (this->type_get ())
{
case 164: // value
case 168: // map_value
case 206: // socket_type
case 209: // outbound_interface_value
case 219: // db_type
case 296: // hr_mode
case 439: // ncr_protocol_value
case 447: // replace_client_name_value
case 165: // value
case 169: // map_value
case 207: // socket_type
case 210: // outbound_interface_value
case 220: // db_type
case 297: // hr_mode
case 442: // ncr_protocol_value
case 450: // replace_client_name_value
value.move< ElementPtr > (s.value);
break;
case 149: // "boolean"
case 150: // "boolean"
value.move< bool > (s.value);
break;
case 148: // "floating point"
case 149: // "floating point"
value.move< double > (s.value);
break;
case 147: // "integer"
case 148: // "integer"
value.move< int64_t > (s.value);
break;
case 146: // "constant string"
case 147: // "constant string"
value.move< std::string > (s.value);
break;
......@@ -1796,7 +1801,8 @@ 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, 399, 400, 401, 402, 403, 404
395, 396, 397, 398, 399, 400, 401, 402, 403, 404,
405
};
return static_cast<token_type> (yytoken_number_[type]);
}
......@@ -2179,6 +2185,12 @@ namespace isc { namespace dhcp {
return symbol_type (token::TOKEN_USER_CONTEXT, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_COMMENT (const location_type& l)
{
return symbol_type (token::TOKEN_COMMENT, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_SUBNET (const location_type& l)
{
......@@ -2692,7 +2704,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp4_parser.yy" // lalr1.cc:377
} } // isc::dhcp
#line 2696 "dhcp4_parser.h" // lalr1.cc:377
#line 2708 "dhcp4_parser.h" // lalr1.cc:377
......
// Generated 201710231324
// Generated 201711280059
// A Bison parser, made by GNU Bison 3.0.4.
// Locations for Bison parsers in C++
......
// Generated 201710231324
// Generated 201711280059
// A Bison parser, made by GNU Bison 3.0.4.
// Positions for Bison parsers in C++
......
// Generated 201710231324
// Generated 201711280059
// 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.
......@@ -401,104 +401,105 @@ namespace isc { namespace dhcp {
TOKEN_EXCLUDED_PREFIX_LEN = 309,
TOKEN_DELEGATED_LEN = 310,
TOKEN_USER_CONTEXT = 311,
TOKEN_SUBNET = 312,
TOKEN_INTERFACE = 313,
TOKEN_INTERFACE_ID = 314,
TOKEN_ID = 315,
TOKEN_RAPID_COMMIT = 316,
TOKEN_RESERVATION_MODE = 317,
TOKEN_DISABLED = 318,
TOKEN_OUT_OF_POOL = 319,
TOKEN_ALL = 320,
TOKEN_SHARED_NETWORKS = 321,
TOKEN_MAC_SOURCES = 322,
TOKEN_RELAY_SUPPLIED_OPTIONS = 323,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 324,
TOKEN_CLIENT_CLASSES = 325,
TOKEN_TEST = 326,
TOKEN_CLIENT_CLASS = 327,
TOKEN_RESERVATIONS = 328,
TOKEN_IP_ADDRESSES = 329,
TOKEN_PREFIXES = 330,
TOKEN_DUID = 331,
TOKEN_HW_ADDRESS = 332,
TOKEN_HOSTNAME = 333,
TOKEN_FLEX_ID = 334,
TOKEN_RELAY = 335,
TOKEN_IP_ADDRESS = 336,
TOKEN_HOOKS_LIBRARIES = 337,
TOKEN_LIBRARY = 338,
TOKEN_PARAMETERS = 339,
TOKEN_EXPIRED_LEASES_PROCESSING = 340,
TOKEN_RECLAIM_TIMER_WAIT_TIME = 341,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 342,
TOKEN_HOLD_RECLAIMED_TIME = 343,
TOKEN_MAX_RECLAIM_LEASES = 344,
TOKEN_MAX_RECLAIM_TIME = 345,
TOKEN_UNWARNED_RECLAIM_CYCLES = 346,
TOKEN_SERVER_ID = 347,
TOKEN_LLT = 348,
TOKEN_EN = 349,
TOKEN_LL = 350,
TOKEN_IDENTIFIER = 351,
TOKEN_HTYPE = 352,
TOKEN_TIME = 353,
TOKEN_ENTERPRISE_ID = 354,
TOKEN_DHCP4O6_PORT = 355,
TOKEN_CONTROL_SOCKET = 356,
TOKEN_SOCKET_TYPE = 357,
TOKEN_SOCKET_NAME = 358,
TOKEN_DHCP_DDNS = 359,
TOKEN_ENABLE_UPDATES = 360,
TOKEN_QUALIFYING_SUFFIX = 361,
TOKEN_SERVER_IP = 362,
TOKEN_SERVER_PORT = 363,
TOKEN_SENDER_IP = 364,
TOKEN_SENDER_PORT = 365,
TOKEN_MAX_QUEUE_SIZE = 366,
TOKEN_NCR_PROTOCOL = 367,
TOKEN_NCR_FORMAT = 368,
TOKEN_ALWAYS_INCLUDE_FQDN = 369,
TOKEN_OVERRIDE_NO_UPDATE = 370,
TOKEN_OVERRIDE_CLIENT_UPDATE = 371,
TOKEN_REPLACE_CLIENT_NAME = 372,
TOKEN_GENERATED_PREFIX = 373,
TOKEN_UDP = 374,
TOKEN_TCP = 375,
TOKEN_JSON = 376,
TOKEN_WHEN_PRESENT = 377,
TOKEN_NEVER = 378,
TOKEN_ALWAYS = 379,
TOKEN_WHEN_NOT_PRESENT = 380,
TOKEN_LOGGING = 381,
TOKEN_LOGGERS = 382,
TOKEN_OUTPUT_OPTIONS = 383,
TOKEN_OUTPUT = 384,
TOKEN_DEBUGLEVEL = 385,
TOKEN_SEVERITY = 386,
TOKEN_FLUSH = 387,
TOKEN_MAXSIZE = 388,
TOKEN_MAXVER = 389,
TOKEN_DHCP4 = 390,
TOKEN_DHCPDDNS = 391,
TOKEN_CONTROL_AGENT = 392,
TOKEN_TOPLEVEL_JSON = 393,
TOKEN_TOPLEVEL_DHCP6 = 394,
TOKEN_SUB_DHCP6 = 395,
TOKEN_SUB_INTERFACES6 = 396,
TOKEN_SUB_SUBNET6 = 397,
TOKEN_SUB_POOL6 = 398,
TOKEN_SUB_PD_POOL = 399,
TOKEN_SUB_RESERVATION = 400,
TOKEN_SUB_OPTION_DEFS = 401,
TOKEN_SUB_OPTION_DEF = 402,
TOKEN_SUB_OPTION_DATA = 403,
TOKEN_SUB_HOOKS_LIBRARY = 404,
TOKEN_SUB_DHCP_DDNS = 405,
TOKEN_STRING = 406,
TOKEN_INTEGER = 407,
TOKEN_FLOAT = 408,
TOKEN_BOOLEAN = 409
TOKEN_COMMENT = 312,
TOKEN_SUBNET = 313,
TOKEN_INTERFACE = 314,
TOKEN_INTERFACE_ID = 315,
TOKEN_ID = 316,
TOKEN_RAPID_COMMIT = 317,
TOKEN_RESERVATION_MODE = 318,
TOKEN_DISABLED = 319,
TOKEN_OUT_OF_POOL = 320,
TOKEN_ALL = 321,
TOKEN_SHARED_NETWORKS = 322,
TOKEN_MAC_SOURCES = 323,
TOKEN_RELAY_SUPPLIED_OPTIONS = 324,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 325,
TOKEN_CLIENT_CLASSES = 326,
TOKEN_TEST = 327,
TOKEN_CLIENT_CLASS = 328,
TOKEN_RESERVATIONS = 329,
TOKEN_IP_ADDRESSES = 330,
TOKEN_PREFIXES = 331,
TOKEN_DUID = 332,
TOKEN_HW_ADDRESS = 333,
TOKEN_HOSTNAME = 334,
TOKEN_FLEX_ID = 335,
TOKEN_RELAY = 336,
TOKEN_IP_ADDRESS = 337,
TOKEN_HOOKS_LIBRARIES = 338,
TOKEN_LIBRARY = 339,
TOKEN_PARAMETERS = 340,
TOKEN_EXPIRED_LEASES_PROCESSING = 341,
TOKEN_RECLAIM_TIMER_WAIT_TIME = 342,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 343,
TOKEN_HOLD_RECLAIMED_TIME = 344,
TOKEN_MAX_RECLAIM_LEASES = 345,
TOKEN_MAX_RECLAIM_TIME = 346,
TOKEN_UNWARNED_RECLAIM_CYCLES = 347,
TOKEN_SERVER_ID = 348,
TOKEN_LLT = 349,
TOKEN_EN = 350,
TOKEN_LL = 351,
TOKEN_IDENTIFIER = 352,
TOKEN_HTYPE = 353,
TOKEN_TIME = 354,
TOKEN_ENTERPRISE_ID = 355,
TOKEN_DHCP4O6_PORT = 356,
TOKEN_CONTROL_SOCKET = 357,
TOKEN_SOCKET_TYPE = 358,
TOKEN_SOCKET_NAME = 359,
TOKEN_DHCP_DDNS = 360,
TOKEN_ENABLE_UPDATES = 361,
TOKEN_QUALIFYING_SUFFIX = 362,
TOKEN_SERVER_IP = 363,
TOKEN_SERVER_PORT = 364,
TOKEN_SENDER_IP = 365,
TOKEN_SENDER_PORT = 366,
TOKEN_MAX_QUEUE_SIZE = 367,
TOKEN_NCR_PROTOCOL = 368,
TOKEN_NCR_FORMAT = 369,
TOKEN_ALWAYS_INCLUDE_FQDN = 370,
TOKEN_OVERRIDE_NO_UPDATE = 371,
TOKEN_OVERRIDE_CLIENT_UPDATE = 372,
TOKEN_REPLACE_CLIENT_NAME = 373,
TOKEN_GENERATED_PREFIX = 374,
TOKEN_UDP = 375,
TOKEN_TCP = 376,
TOKEN_JSON = 377,