Commit 747a8a78 authored by Francis Dupont's avatar Francis Dupont

[trac5061] regen flex/bison

parent 8baed816
This diff is collapsed.
This diff is collapsed.
......@@ -379,104 +379,106 @@ namespace isc { namespace dhcp {
TOKEN_LFC_INTERVAL = 288,
TOKEN_READONLY = 289,
TOKEN_CONNECT_TIMEOUT = 290,
TOKEN_VALID_LIFETIME = 291,
TOKEN_RENEW_TIMER = 292,
TOKEN_REBIND_TIMER = 293,
TOKEN_DECLINE_PROBATION_PERIOD = 294,
TOKEN_SUBNET4 = 295,
TOKEN_SUBNET_4O6_INTERFACE = 296,
TOKEN_SUBNET_4O6_INTERFACE_ID = 297,
TOKEN_SUBNET_4O6_SUBNET = 298,
TOKEN_OPTION_DEF = 299,
TOKEN_OPTION_DATA = 300,
TOKEN_NAME = 301,
TOKEN_DATA = 302,
TOKEN_CODE = 303,
TOKEN_SPACE = 304,
TOKEN_CSV_FORMAT = 305,
TOKEN_RECORD_TYPES = 306,
TOKEN_ENCAPSULATE = 307,
TOKEN_ARRAY = 308,
TOKEN_POOLS = 309,
TOKEN_POOL = 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_HOST_RESERVATION_IDENTIFIERS = 318,
TOKEN_CLIENT_CLASSES = 319,
TOKEN_TEST = 320,
TOKEN_CLIENT_CLASS = 321,
TOKEN_RESERVATIONS = 322,
TOKEN_DUID = 323,
TOKEN_HW_ADDRESS = 324,
TOKEN_CIRCUIT_ID = 325,
TOKEN_CLIENT_ID = 326,
TOKEN_HOSTNAME = 327,
TOKEN_RELAY = 328,
TOKEN_IP_ADDRESS = 329,
TOKEN_HOOKS_LIBRARIES = 330,
TOKEN_LIBRARY = 331,
TOKEN_PARAMETERS = 332,
TOKEN_EXPIRED_LEASES_PROCESSING = 333,
TOKEN_RECLAIM_TIMER_WAIT_TIME = 334,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 335,
TOKEN_HOLD_RECLAIMED_TIME = 336,
TOKEN_MAX_RECLAIM_LEASES = 337,
TOKEN_MAX_RECLAIM_TIME = 338,
TOKEN_UNWARNED_RECLAIM_CYCLES = 339,
TOKEN_DHCP4O6_PORT = 340,
TOKEN_CONTROL_SOCKET = 341,
TOKEN_SOCKET_TYPE = 342,
TOKEN_SOCKET_NAME = 343,
TOKEN_DHCP_DDNS = 344,
TOKEN_ENABLE_UPDATES = 345,
TOKEN_QUALIFYING_SUFFIX = 346,
TOKEN_SERVER_IP = 347,
TOKEN_SERVER_PORT = 348,
TOKEN_SENDER_IP = 349,
TOKEN_SENDER_PORT = 350,
TOKEN_MAX_QUEUE_SIZE = 351,
TOKEN_NCR_PROTOCOL = 352,
TOKEN_NCR_FORMAT = 353,
TOKEN_ALWAYS_INCLUDE_FQDN = 354,
TOKEN_ALLOW_CLIENT_UPDATE = 355,
TOKEN_OVERRIDE_NO_UPDATE = 356,
TOKEN_OVERRIDE_CLIENT_UPDATE = 357,
TOKEN_REPLACE_CLIENT_NAME = 358,
TOKEN_GENERATED_PREFIX = 359,
TOKEN_TCP = 360,
TOKEN_JSON = 361,
TOKEN_WHEN_PRESENT = 362,
TOKEN_NEVER = 363,
TOKEN_ALWAYS = 364,
TOKEN_WHEN_NOT_PRESENT = 365,
TOKEN_LOGGING = 366,
TOKEN_LOGGERS = 367,
TOKEN_OUTPUT_OPTIONS = 368,
TOKEN_OUTPUT = 369,
TOKEN_DEBUGLEVEL = 370,
TOKEN_SEVERITY = 371,
TOKEN_DHCP6 = 372,
TOKEN_DHCPDDNS = 373,
TOKEN_TOPLEVEL_JSON = 374,
TOKEN_TOPLEVEL_DHCP4 = 375,
TOKEN_SUB_DHCP4 = 376,
TOKEN_SUB_INTERFACES4 = 377,
TOKEN_SUB_SUBNET4 = 378,
TOKEN_SUB_POOL4 = 379,
TOKEN_SUB_RESERVATION = 380,
TOKEN_SUB_OPTION_DEF = 381,
TOKEN_SUB_OPTION_DATA = 382,
TOKEN_SUB_HOOKS_LIBRARY = 383,
TOKEN_SUB_DHCP_DDNS = 384,
TOKEN_STRING = 385,
TOKEN_INTEGER = 386,
TOKEN_FLOAT = 387,
TOKEN_BOOLEAN = 388
TOKEN_CONTACT_POINTS = 291,
TOKEN_KEYSPACE = 292,
TOKEN_VALID_LIFETIME = 293,
TOKEN_RENEW_TIMER = 294,
TOKEN_REBIND_TIMER = 295,
TOKEN_DECLINE_PROBATION_PERIOD = 296,
TOKEN_SUBNET4 = 297,
TOKEN_SUBNET_4O6_INTERFACE = 298,
TOKEN_SUBNET_4O6_INTERFACE_ID = 299,
TOKEN_SUBNET_4O6_SUBNET = 300,
TOKEN_OPTION_DEF = 301,
TOKEN_OPTION_DATA = 302,
TOKEN_NAME = 303,
TOKEN_DATA = 304,
TOKEN_CODE = 305,
TOKEN_SPACE = 306,
TOKEN_CSV_FORMAT = 307,
TOKEN_RECORD_TYPES = 308,
TOKEN_ENCAPSULATE = 309,
TOKEN_ARRAY = 310,
TOKEN_POOLS = 311,
TOKEN_POOL = 312,
TOKEN_USER_CONTEXT = 313,
TOKEN_SUBNET = 314,
TOKEN_INTERFACE = 315,
TOKEN_INTERFACE_ID = 316,
TOKEN_ID = 317,
TOKEN_RAPID_COMMIT = 318,
TOKEN_RESERVATION_MODE = 319,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 320,
TOKEN_CLIENT_CLASSES = 321,
TOKEN_TEST = 322,
TOKEN_CLIENT_CLASS = 323,
TOKEN_RESERVATIONS = 324,
TOKEN_DUID = 325,
TOKEN_HW_ADDRESS = 326,
TOKEN_CIRCUIT_ID = 327,
TOKEN_CLIENT_ID = 328,
TOKEN_HOSTNAME = 329,
TOKEN_RELAY = 330,
TOKEN_IP_ADDRESS = 331,
TOKEN_HOOKS_LIBRARIES = 332,
TOKEN_LIBRARY = 333,
TOKEN_PARAMETERS = 334,
TOKEN_EXPIRED_LEASES_PROCESSING = 335,
TOKEN_RECLAIM_TIMER_WAIT_TIME = 336,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 337,
TOKEN_HOLD_RECLAIMED_TIME = 338,
TOKEN_MAX_RECLAIM_LEASES = 339,
TOKEN_MAX_RECLAIM_TIME = 340,
TOKEN_UNWARNED_RECLAIM_CYCLES = 341,
TOKEN_DHCP4O6_PORT = 342,
TOKEN_CONTROL_SOCKET = 343,
TOKEN_SOCKET_TYPE = 344,
TOKEN_SOCKET_NAME = 345,
TOKEN_DHCP_DDNS = 346,
TOKEN_ENABLE_UPDATES = 347,
TOKEN_QUALIFYING_SUFFIX = 348,
TOKEN_SERVER_IP = 349,
TOKEN_SERVER_PORT = 350,
TOKEN_SENDER_IP = 351,
TOKEN_SENDER_PORT = 352,
TOKEN_MAX_QUEUE_SIZE = 353,
TOKEN_NCR_PROTOCOL = 354,
TOKEN_NCR_FORMAT = 355,
TOKEN_ALWAYS_INCLUDE_FQDN = 356,
TOKEN_ALLOW_CLIENT_UPDATE = 357,
TOKEN_OVERRIDE_NO_UPDATE = 358,
TOKEN_OVERRIDE_CLIENT_UPDATE = 359,
TOKEN_REPLACE_CLIENT_NAME = 360,
TOKEN_GENERATED_PREFIX = 361,
TOKEN_TCP = 362,
TOKEN_JSON = 363,
TOKEN_WHEN_PRESENT = 364,
TOKEN_NEVER = 365,
TOKEN_ALWAYS = 366,
TOKEN_WHEN_NOT_PRESENT = 367,
TOKEN_LOGGING = 368,
TOKEN_LOGGERS = 369,
TOKEN_OUTPUT_OPTIONS = 370,
TOKEN_OUTPUT = 371,
TOKEN_DEBUGLEVEL = 372,
TOKEN_SEVERITY = 373,
TOKEN_DHCP6 = 374,
TOKEN_DHCPDDNS = 375,
TOKEN_TOPLEVEL_JSON = 376,
TOKEN_TOPLEVEL_DHCP4 = 377,
TOKEN_SUB_DHCP4 = 378,
TOKEN_SUB_INTERFACES4 = 379,
TOKEN_SUB_SUBNET4 = 380,
TOKEN_SUB_POOL4 = 381,
TOKEN_SUB_RESERVATION = 382,
TOKEN_SUB_OPTION_DEF = 383,
TOKEN_SUB_OPTION_DATA = 384,
TOKEN_SUB_HOOKS_LIBRARY = 385,
TOKEN_SUB_DHCP_DDNS = 386,
TOKEN_STRING = 387,
TOKEN_INTEGER = 388,
TOKEN_FLOAT = 389,
TOKEN_BOOLEAN = 390
};
};
......@@ -727,6 +729,14 @@ namespace isc { namespace dhcp {
symbol_type
make_CONNECT_TIMEOUT (const location_type& l);
static inline
symbol_type
make_CONTACT_POINTS (const location_type& l);
static inline
symbol_type
make_KEYSPACE (const location_type& l);
static inline
symbol_type
make_VALID_LIFETIME (const location_type& l);
......@@ -1324,12 +1334,12 @@ namespace isc { namespace dhcp {
enum
{
yyeof_ = 0,
yylast_ = 723, ///< Last index in yytable_.
yynnts_ = 303, ///< Number of nonterminal symbols.
yylast_ = 733, ///< Last index in yytable_.
yynnts_ = 307, ///< Number of nonterminal symbols.
yyfinal_ = 24, ///< Termination state number.
yyterror_ = 1,
yyerrcode_ = 256,
yyntokens_ = 134 ///< Number of tokens.
yyntokens_ = 136 ///< Number of tokens.
};
......@@ -1384,9 +1394,10 @@ namespace isc { namespace dhcp {
95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
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
125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
135
};
const unsigned int user_token_number_max_ = 388;
const unsigned int user_token_number_max_ = 390;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
......@@ -1419,28 +1430,28 @@ namespace isc { namespace dhcp {
{
switch (other.type_get ())
{
case 147: // value
case 151: // map_value
case 189: // socket_type
case 198: // db_type
case 399: // ncr_protocol_value
case 408: // replace_client_name_value
case 149: // value
case 153: // map_value
case 191: // socket_type
case 200: // db_type
case 405: // ncr_protocol_value
case 414: // replace_client_name_value
value.copy< ElementPtr > (other.value);
break;
case 133: // "boolean"
case 135: // "boolean"
value.copy< bool > (other.value);
break;
case 132: // "floating point"
case 134: // "floating point"
value.copy< double > (other.value);
break;
case 131: // "integer"
case 133: // "integer"
value.copy< int64_t > (other.value);
break;
case 130: // "constant string"
case 132: // "constant string"
value.copy< std::string > (other.value);
break;
......@@ -1461,28 +1472,28 @@ namespace isc { namespace dhcp {
(void) v;
switch (this->type_get ())
{
case 147: // value
case 151: // map_value
case 189: // socket_type
case 198: // db_type
case 399: // ncr_protocol_value
case 408: // replace_client_name_value
case 149: // value
case 153: // map_value
case 191: // socket_type
case 200: // db_type
case 405: // ncr_protocol_value
case 414: // replace_client_name_value
value.copy< ElementPtr > (v);
break;
case 133: // "boolean"
case 135: // "boolean"
value.copy< bool > (v);
break;
case 132: // "floating point"
case 134: // "floating point"
value.copy< double > (v);
break;
case 131: // "integer"
case 133: // "integer"
value.copy< int64_t > (v);
break;
case 130: // "constant string"
case 132: // "constant string"
value.copy< std::string > (v);
break;
......@@ -1562,28 +1573,28 @@ namespace isc { namespace dhcp {
// Type destructor.
switch (yytype)
{
case 147: // value
case 151: // map_value
case 189: // socket_type
case 198: // db_type
case 399: // ncr_protocol_value
case 408: // replace_client_name_value
case 149: // value
case 153: // map_value
case 191: // socket_type
case 200: // db_type
case 405: // ncr_protocol_value
case 414: // replace_client_name_value
value.template destroy< ElementPtr > ();
break;
case 133: // "boolean"
case 135: // "boolean"
value.template destroy< bool > ();
break;
case 132: // "floating point"
case 134: // "floating point"
value.template destroy< double > ();
break;
case 131: // "integer"
case 133: // "integer"
value.template destroy< int64_t > ();
break;
case 130: // "constant string"
case 132: // "constant string"
value.template destroy< std::string > ();
break;
......@@ -1610,28 +1621,28 @@ namespace isc { namespace dhcp {
super_type::move(s);
switch (this->type_get ())
{
case 147: // value
case 151: // map_value
case 189: // socket_type
case 198: // db_type
case 399: // ncr_protocol_value
case 408: // replace_client_name_value
case 149: // value
case 153: // map_value
case 191: // socket_type
case 200: // db_type
case 405: // ncr_protocol_value
case 414: // replace_client_name_value
value.move< ElementPtr > (s.value);
break;
case 133: // "boolean"
case 135: // "boolean"
value.move< bool > (s.value);
break;
case 132: // "floating point"
case 134: // "floating point"
value.move< double > (s.value);
break;
case 131: // "integer"
case 133: // "integer"
value.move< int64_t > (s.value);
break;
case 130: // "constant string"
case 132: // "constant string"
value.move< std::string > (s.value);
break;
......@@ -1703,7 +1714,7 @@ namespace isc { namespace dhcp {
355, 356, 357, 358, 359, 360, 361, 362, 363, 364,
365, 366, 367, 368, 369, 370, 371, 372, 373, 374,
375, 376, 377, 378, 379, 380, 381, 382, 383, 384,
385, 386, 387, 388
385, 386, 387, 388, 389, 390
};
return static_cast<token_type> (yytoken_number_[type]);
}
......@@ -1912,6 +1923,18 @@ namespace isc { namespace dhcp {
return symbol_type (token::TOKEN_CONNECT_TIMEOUT, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_CONTACT_POINTS (const location_type& l)
{
return symbol_type (token::TOKEN_CONTACT_POINTS, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_KEYSPACE (const location_type& l)
{
return symbol_type (token::TOKEN_KEYSPACE, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_VALID_LIFETIME (const location_type& l)
{
......@@ -2503,7 +2526,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp4_parser.yy" // lalr1.cc:377
} } // isc::dhcp
#line 2507 "dhcp4_parser.h" // lalr1.cc:377
#line 2530 "dhcp4_parser.h" // lalr1.cc:377
......
// Generated 201701271452
// Generated 201702101911
// A Bison parser, made by GNU Bison 3.0.4.
// Locations for Bison parsers in C++
......
// Generated 201701271452
// Generated 201702101911
// A Bison parser, made by GNU Bison 3.0.4.
// Positions for Bison parsers in C++
......
// Generated 201701271452
// Generated 201702101911
// 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.
......@@ -371,120 +371,122 @@ namespace isc { namespace dhcp {
TOKEN_LFC_INTERVAL = 280,
TOKEN_READONLY = 281,
TOKEN_CONNECT_TIMEOUT = 282,
TOKEN_PREFERRED_LIFETIME = 283,
TOKEN_VALID_LIFETIME = 284,
TOKEN_RENEW_TIMER = 285,
TOKEN_REBIND_TIMER = 286,
TOKEN_DECLINE_PROBATION_PERIOD = 287,
TOKEN_SUBNET6 = 288,
TOKEN_OPTION_DEF = 289,
TOKEN_OPTION_DATA = 290,
TOKEN_NAME = 291,
TOKEN_DATA = 292,
TOKEN_CODE = 293,
TOKEN_SPACE = 294,
TOKEN_CSV_FORMAT = 295,
TOKEN_RECORD_TYPES = 296,
TOKEN_ENCAPSULATE = 297,
TOKEN_ARRAY = 298,
TOKEN_POOLS = 299,
TOKEN_POOL = 300,
TOKEN_PD_POOLS = 301,
TOKEN_PREFIX = 302,
TOKEN_PREFIX_LEN = 303,
TOKEN_EXCLUDED_PREFIX = 304,
TOKEN_EXCLUDED_PREFIX_LEN = 305,
TOKEN_DELEGATED_LEN = 306,
TOKEN_USER_CONTEXT = 307,
TOKEN_SUBNET = 308,
TOKEN_INTERFACE = 309,
TOKEN_INTERFACE_ID = 310,
TOKEN_ID = 311,
TOKEN_RAPID_COMMIT = 312,
TOKEN_RESERVATION_MODE = 313,
TOKEN_MAC_SOURCES = 314,
TOKEN_RELAY_SUPPLIED_OPTIONS = 315,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 316,
TOKEN_CLIENT_CLASSES = 317,
TOKEN_TEST = 318,
TOKEN_CLIENT_CLASS = 319,
TOKEN_RESERVATIONS = 320,
TOKEN_IP_ADDRESSES = 321,
TOKEN_PREFIXES = 322,
TOKEN_DUID = 323,
TOKEN_HW_ADDRESS = 324,
TOKEN_HOSTNAME = 325,
TOKEN_RELAY = 326,
TOKEN_IP_ADDRESS = 327,
TOKEN_HOOKS_LIBRARIES = 328,
TOKEN_LIBRARY = 329,
TOKEN_PARAMETERS = 330,
TOKEN_EXPIRED_LEASES_PROCESSING = 331,
TOKEN_RECLAIM_TIMER_WAIT_TIME = 332,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 333,
TOKEN_HOLD_RECLAIMED_TIME = 334,
TOKEN_MAX_RECLAIM_LEASES = 335,
TOKEN_MAX_RECLAIM_TIME = 336,
TOKEN_UNWARNED_RECLAIM_CYCLES = 337,
TOKEN_SERVER_ID = 338,
TOKEN_LLT = 339,
TOKEN_EN = 340,
TOKEN_LL = 341,
TOKEN_IDENTIFIER = 342,
TOKEN_HTYPE = 343,
TOKEN_TIME = 344,
TOKEN_ENTERPRISE_ID = 345,
TOKEN_DHCP4O6_PORT = 346,
TOKEN_CONTROL_SOCKET = 347,
TOKEN_SOCKET_TYPE = 348,
TOKEN_SOCKET_NAME = 349,
TOKEN_DHCP_DDNS = 350,
TOKEN_ENABLE_UPDATES = 351,
TOKEN_QUALIFYING_SUFFIX = 352,
TOKEN_SERVER_IP = 353,
TOKEN_SERVER_PORT = 354,
TOKEN_SENDER_IP = 355,
TOKEN_SENDER_PORT = 356,
TOKEN_MAX_QUEUE_SIZE = 357,
TOKEN_NCR_PROTOCOL = 358,
TOKEN_NCR_FORMAT = 359,
TOKEN_ALWAYS_INCLUDE_FQDN = 360,
TOKEN_ALLOW_CLIENT_UPDATE = 361,
TOKEN_OVERRIDE_NO_UPDATE = 362,
TOKEN_OVERRIDE_CLIENT_UPDATE = 363,
TOKEN_REPLACE_CLIENT_NAME = 364,
TOKEN_GENERATED_PREFIX = 365,
TOKEN_UDP = 366,
TOKEN_TCP = 367,
TOKEN_JSON = 368,
TOKEN_WHEN_PRESENT = 369,
TOKEN_NEVER = 370,
TOKEN_ALWAYS = 371,
TOKEN_WHEN_NOT_PRESENT = 372,
TOKEN_LOGGING = 373,
TOKEN_LOGGERS = 374,
TOKEN_OUTPUT_OPTIONS = 375,
TOKEN_OUTPUT = 376,
TOKEN_DEBUGLEVEL = 377,
TOKEN_SEVERITY = 378,
TOKEN_DHCP4 = 379,
TOKEN_DHCPDDNS = 380,
TOKEN_TOPLEVEL_JSON = 381,
TOKEN_TOPLEVEL_DHCP6 = 382,
TOKEN_SUB_DHCP6 = 383,
TOKEN_SUB_INTERFACES6 = 384,
TOKEN_SUB_SUBNET6 = 385,
TOKEN_SUB_POOL6 = 386,
TOKEN_SUB_PD_POOL = 387,
TOKEN_SUB_RESERVATION = 388,
TOKEN_SUB_OPTION_DEF = 389,
TOKEN_SUB_OPTION_DATA = 390,
TOKEN_SUB_HOOKS_LIBRARY = 391,
TOKEN_SUB_DHCP_DDNS = 392,
TOKEN_STRING = 393,
TOKEN_INTEGER = 394,
TOKEN_FLOAT = 395,
TOKEN_BOOLEAN = 396
TOKEN_CONTACT_POINTS = 283,
TOKEN_KEYSPACE = 284,
TOKEN_PREFERRED_LIFETIME = 285,
TOKEN_VALID_LIFETIME = 286,
TOKEN_RENEW_TIMER = 287,
TOKEN_REBIND_TIMER = 288,
TOKEN_DECLINE_PROBATION_PERIOD = 289,
TOKEN_SUBNET6 = 290,
TOKEN_OPTION_DEF = 291,
TOKEN_OPTION_DATA = 292,
TOKEN_NAME = 293,
TOKEN_DATA = 294,
TOKEN_CODE = 295,
TOKEN_SPACE = 296,
TOKEN_CSV_FORMAT = 297,
TOKEN_RECORD_TYPES = 298,
TOKEN_ENCAPSULATE = 299,
TOKEN_ARRAY = 300,
TOKEN_POOLS = 301,
TOKEN_POOL = 302,
TOKEN_PD_POOLS = 303,
TOKEN_PREFIX = 304,
TOKEN_PREFIX_LEN = 305,
TOKEN_EXCLUDED_PREFIX = 306,
TOKEN_EXCLUDED_PREFIX_LEN = 307,
TOKEN_DELEGATED_LEN = 308,
TOKEN_USER_CONTEXT = 309,
TOKEN_SUBNET = 310,
TOKEN_INTERFACE = 311,
TOKEN_INTERFACE_ID = 312,
TOKEN_ID = 313,