|
@@ -305,7 +305,9 @@ namespace isc { namespace dhcp {
|
|
|
union union_type
|
|
|
{
|
|
|
// value
|
|
|
+ // map_value
|
|
|
// socket_type
|
|
|
+ // db_type
|
|
|
// ncr_protocol_value
|
|
|
// replace_client_name_value
|
|
|
char dummy1[sizeof(ElementPtr)];
|
|
@@ -365,114 +367,115 @@ namespace isc { namespace dhcp {
|
|
|
TOKEN_LEASE_DATABASE = 276,
|
|
|
TOKEN_HOSTS_DATABASE = 277,
|
|
|
TOKEN_TYPE = 278,
|
|
|
- TOKEN_USER = 279,
|
|
|
- TOKEN_PASSWORD = 280,
|
|
|
- TOKEN_HOST = 281,
|
|
|
- TOKEN_PERSIST = 282,
|
|
|
- TOKEN_LFC_INTERVAL = 283,
|
|
|
- TOKEN_READONLY = 284,
|
|
|
- TOKEN_VALID_LIFETIME = 285,
|
|
|
- TOKEN_RENEW_TIMER = 286,
|
|
|
- TOKEN_REBIND_TIMER = 287,
|
|
|
- TOKEN_DECLINE_PROBATION_PERIOD = 288,
|
|
|
- TOKEN_SUBNET4 = 289,
|
|
|
- TOKEN_SUBNET_4O6_INTERFACE = 290,
|
|
|
- TOKEN_SUBNET_4O6_INTERFACE_ID = 291,
|
|
|
- TOKEN_SUBNET_4O6_SUBNET = 292,
|
|
|
- TOKEN_OPTION_DEF = 293,
|
|
|
- TOKEN_OPTION_DATA = 294,
|
|
|
- TOKEN_NAME = 295,
|
|
|
- TOKEN_DATA = 296,
|
|
|
- TOKEN_CODE = 297,
|
|
|
- TOKEN_SPACE = 298,
|
|
|
- TOKEN_CSV_FORMAT = 299,
|
|
|
- TOKEN_RECORD_TYPES = 300,
|
|
|
- TOKEN_ENCAPSULATE = 301,
|
|
|
- TOKEN_ARRAY = 302,
|
|
|
- TOKEN_POOLS = 303,
|
|
|
- TOKEN_POOL = 304,
|
|
|
- TOKEN_SUBNET = 305,
|
|
|
- TOKEN_INTERFACE = 306,
|
|
|
- TOKEN_INTERFACE_ID = 307,
|
|
|
- TOKEN_ID = 308,
|
|
|
- TOKEN_RAPID_COMMIT = 309,
|
|
|
- TOKEN_RESERVATION_MODE = 310,
|
|
|
- TOKEN_HOST_RESERVATION_IDENTIFIERS = 311,
|
|
|
- TOKEN_CLIENT_CLASSES = 312,
|
|
|
- TOKEN_TEST = 313,
|
|
|
- TOKEN_CLIENT_CLASS = 314,
|
|
|
- TOKEN_RESERVATIONS = 315,
|
|
|
- TOKEN_DUID = 316,
|
|
|
- TOKEN_HW_ADDRESS = 317,
|
|
|
- TOKEN_CIRCUIT_ID = 318,
|
|
|
- TOKEN_CLIENT_ID = 319,
|
|
|
- TOKEN_HOSTNAME = 320,
|
|
|
- TOKEN_RELAY = 321,
|
|
|
- TOKEN_IP_ADDRESS = 322,
|
|
|
- TOKEN_HOOKS_LIBRARIES = 323,
|
|
|
- TOKEN_LIBRARY = 324,
|
|
|
- TOKEN_PARAMETERS = 325,
|
|
|
- TOKEN_EXPIRED_LEASES_PROCESSING = 326,
|
|
|
- TOKEN_RECLAIM_TIMER_WAIT_TIME = 327,
|
|
|
- TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 328,
|
|
|
- TOKEN_HOLD_RECLAIMED_TIME = 329,
|
|
|
- TOKEN_MAX_RECLAIM_LEASES = 330,
|
|
|
- TOKEN_MAX_RECLAIM_TIME = 331,
|
|
|
- TOKEN_UNWARNED_RECLAIM_CYCLES = 332,
|
|
|
- TOKEN_SERVER_ID = 333,
|
|
|
- TOKEN_IDENTIFIER = 334,
|
|
|
- TOKEN_HTYPE = 335,
|
|
|
- TOKEN_TIME = 336,
|
|
|
- TOKEN_ENTERPRISE_ID = 337,
|
|
|
- TOKEN_DHCP4O6_PORT = 338,
|
|
|
- TOKEN_CONTROL_SOCKET = 339,
|
|
|
- TOKEN_SOCKET_TYPE = 340,
|
|
|
- TOKEN_SOCKET_NAME = 341,
|
|
|
- TOKEN_DHCP_DDNS = 342,
|
|
|
- TOKEN_ENABLE_UPDATES = 343,
|
|
|
- TOKEN_QUALIFYING_SUFFIX = 344,
|
|
|
- TOKEN_SERVER_IP = 345,
|
|
|
- TOKEN_SERVER_PORT = 346,
|
|
|
- TOKEN_SENDER_IP = 347,
|
|
|
- TOKEN_SENDER_PORT = 348,
|
|
|
- TOKEN_MAX_QUEUE_SIZE = 349,
|
|
|
- TOKEN_NCR_PROTOCOL = 350,
|
|
|
- TOKEN_NCR_FORMAT = 351,
|
|
|
- TOKEN_ALWAYS_INCLUDE_FQDN = 352,
|
|
|
- TOKEN_ALLOW_CLIENT_UPDATE = 353,
|
|
|
- TOKEN_OVERRIDE_NO_UPDATE = 354,
|
|
|
- TOKEN_OVERRIDE_CLIENT_UPDATE = 355,
|
|
|
- TOKEN_REPLACE_CLIENT_NAME = 356,
|
|
|
- TOKEN_GENERATED_PREFIX = 357,
|
|
|
- TOKEN_TCP = 358,
|
|
|
- TOKEN_JSON = 359,
|
|
|
- TOKEN_WHEN_PRESENT = 360,
|
|
|
- TOKEN_NEVER = 361,
|
|
|
- TOKEN_ALWAYS = 362,
|
|
|
- TOKEN_WHEN_NOT_PRESENT = 363,
|
|
|
- TOKEN_LOGGING = 364,
|
|
|
- TOKEN_LOGGERS = 365,
|
|
|
- TOKEN_OUTPUT_OPTIONS = 366,
|
|
|
- TOKEN_OUTPUT = 367,
|
|
|
- TOKEN_DEBUGLEVEL = 368,
|
|
|
- TOKEN_SEVERITY = 369,
|
|
|
- TOKEN_DHCP6 = 370,
|
|
|
- TOKEN_DHCPDDNS = 371,
|
|
|
- TOKEN_TOPLEVEL_JSON = 372,
|
|
|
- TOKEN_TOPLEVEL_DHCP4 = 373,
|
|
|
- TOKEN_SUB_DHCP4 = 374,
|
|
|
- TOKEN_SUB_INTERFACES4 = 375,
|
|
|
- TOKEN_SUB_SUBNET4 = 376,
|
|
|
- TOKEN_SUB_POOL4 = 377,
|
|
|
- TOKEN_SUB_RESERVATION = 378,
|
|
|
- TOKEN_SUB_OPTION_DEF = 379,
|
|
|
- TOKEN_SUB_OPTION_DATA = 380,
|
|
|
- TOKEN_SUB_HOOKS_LIBRARY = 381,
|
|
|
- TOKEN_SUB_DHCP_DDNS = 382,
|
|
|
- TOKEN_STRING = 383,
|
|
|
- TOKEN_INTEGER = 384,
|
|
|
- TOKEN_FLOAT = 385,
|
|
|
- TOKEN_BOOLEAN = 386
|
|
|
+ TOKEN_MEMFILE = 279,
|
|
|
+ TOKEN_MYSQL = 280,
|
|
|
+ TOKEN_POSTGRESQL = 281,
|
|
|
+ TOKEN_CQL = 282,
|
|
|
+ TOKEN_USER = 283,
|
|
|
+ TOKEN_PASSWORD = 284,
|
|
|
+ TOKEN_HOST = 285,
|
|
|
+ TOKEN_PERSIST = 286,
|
|
|
+ TOKEN_LFC_INTERVAL = 287,
|
|
|
+ TOKEN_READONLY = 288,
|
|
|
+ TOKEN_CONNECT_TIMEOUT = 289,
|
|
|
+ TOKEN_VALID_LIFETIME = 290,
|
|
|
+ TOKEN_RENEW_TIMER = 291,
|
|
|
+ TOKEN_REBIND_TIMER = 292,
|
|
|
+ TOKEN_DECLINE_PROBATION_PERIOD = 293,
|
|
|
+ TOKEN_SUBNET4 = 294,
|
|
|
+ TOKEN_SUBNET_4O6_INTERFACE = 295,
|
|
|
+ TOKEN_SUBNET_4O6_INTERFACE_ID = 296,
|
|
|
+ TOKEN_SUBNET_4O6_SUBNET = 297,
|
|
|
+ TOKEN_OPTION_DEF = 298,
|
|
|
+ TOKEN_OPTION_DATA = 299,
|
|
|
+ TOKEN_NAME = 300,
|
|
|
+ TOKEN_DATA = 301,
|
|
|
+ TOKEN_CODE = 302,
|
|
|
+ TOKEN_SPACE = 303,
|
|
|
+ TOKEN_CSV_FORMAT = 304,
|
|
|
+ TOKEN_RECORD_TYPES = 305,
|
|
|
+ TOKEN_ENCAPSULATE = 306,
|
|
|
+ TOKEN_ARRAY = 307,
|
|
|
+ TOKEN_POOLS = 308,
|
|
|
+ TOKEN_POOL = 309,
|
|
|
+ TOKEN_USER_CONTEXT = 310,
|
|
|
+ TOKEN_SUBNET = 311,
|
|
|
+ TOKEN_INTERFACE = 312,
|
|
|
+ TOKEN_INTERFACE_ID = 313,
|
|
|
+ TOKEN_ID = 314,
|
|
|
+ TOKEN_RAPID_COMMIT = 315,
|
|
|
+ TOKEN_RESERVATION_MODE = 316,
|
|
|
+ TOKEN_HOST_RESERVATION_IDENTIFIERS = 317,
|
|
|
+ TOKEN_CLIENT_CLASSES = 318,
|
|
|
+ TOKEN_TEST = 319,
|
|
|
+ TOKEN_CLIENT_CLASS = 320,
|
|
|
+ TOKEN_RESERVATIONS = 321,
|
|
|
+ TOKEN_DUID = 322,
|
|
|
+ TOKEN_HW_ADDRESS = 323,
|
|
|
+ TOKEN_CIRCUIT_ID = 324,
|
|
|
+ TOKEN_CLIENT_ID = 325,
|
|
|
+ TOKEN_HOSTNAME = 326,
|
|
|
+ TOKEN_RELAY = 327,
|
|
|
+ TOKEN_IP_ADDRESS = 328,
|
|
|
+ TOKEN_HOOKS_LIBRARIES = 329,
|
|
|
+ TOKEN_LIBRARY = 330,
|
|
|
+ TOKEN_PARAMETERS = 331,
|
|
|
+ TOKEN_EXPIRED_LEASES_PROCESSING = 332,
|
|
|
+ TOKEN_RECLAIM_TIMER_WAIT_TIME = 333,
|
|
|
+ TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 334,
|
|
|
+ TOKEN_HOLD_RECLAIMED_TIME = 335,
|
|
|
+ TOKEN_MAX_RECLAIM_LEASES = 336,
|
|
|
+ TOKEN_MAX_RECLAIM_TIME = 337,
|
|
|
+ TOKEN_UNWARNED_RECLAIM_CYCLES = 338,
|
|
|
+ TOKEN_DHCP4O6_PORT = 339,
|
|
|
+ TOKEN_CONTROL_SOCKET = 340,
|
|
|
+ TOKEN_SOCKET_TYPE = 341,
|
|
|
+ TOKEN_SOCKET_NAME = 342,
|
|
|
+ TOKEN_DHCP_DDNS = 343,
|
|
|
+ TOKEN_ENABLE_UPDATES = 344,
|
|
|
+ TOKEN_QUALIFYING_SUFFIX = 345,
|
|
|
+ TOKEN_SERVER_IP = 346,
|
|
|
+ TOKEN_SERVER_PORT = 347,
|
|
|
+ TOKEN_SENDER_IP = 348,
|
|
|
+ TOKEN_SENDER_PORT = 349,
|
|
|
+ TOKEN_MAX_QUEUE_SIZE = 350,
|
|
|
+ TOKEN_NCR_PROTOCOL = 351,
|
|
|
+ TOKEN_NCR_FORMAT = 352,
|
|
|
+ TOKEN_ALWAYS_INCLUDE_FQDN = 353,
|
|
|
+ TOKEN_ALLOW_CLIENT_UPDATE = 354,
|
|
|
+ TOKEN_OVERRIDE_NO_UPDATE = 355,
|
|
|
+ TOKEN_OVERRIDE_CLIENT_UPDATE = 356,
|
|
|
+ TOKEN_REPLACE_CLIENT_NAME = 357,
|
|
|
+ TOKEN_GENERATED_PREFIX = 358,
|
|
|
+ TOKEN_TCP = 359,
|
|
|
+ TOKEN_JSON = 360,
|
|
|
+ TOKEN_WHEN_PRESENT = 361,
|
|
|
+ TOKEN_NEVER = 362,
|
|
|
+ TOKEN_ALWAYS = 363,
|
|
|
+ TOKEN_WHEN_NOT_PRESENT = 364,
|
|
|
+ TOKEN_LOGGING = 365,
|
|
|
+ TOKEN_LOGGERS = 366,
|
|
|
+ TOKEN_OUTPUT_OPTIONS = 367,
|
|
|
+ TOKEN_OUTPUT = 368,
|
|
|
+ TOKEN_DEBUGLEVEL = 369,
|
|
|
+ TOKEN_SEVERITY = 370,
|
|
|
+ TOKEN_DHCP6 = 371,
|
|
|
+ TOKEN_DHCPDDNS = 372,
|
|
|
+ TOKEN_TOPLEVEL_JSON = 373,
|
|
|
+ TOKEN_TOPLEVEL_DHCP4 = 374,
|
|
|
+ TOKEN_SUB_DHCP4 = 375,
|
|
|
+ TOKEN_SUB_INTERFACES4 = 376,
|
|
|
+ TOKEN_SUB_SUBNET4 = 377,
|
|
|
+ TOKEN_SUB_POOL4 = 378,
|
|
|
+ TOKEN_SUB_RESERVATION = 379,
|
|
|
+ TOKEN_SUB_OPTION_DEF = 380,
|
|
|
+ TOKEN_SUB_OPTION_DATA = 381,
|
|
|
+ TOKEN_SUB_HOOKS_LIBRARY = 382,
|
|
|
+ TOKEN_SUB_DHCP_DDNS = 383,
|
|
|
+ TOKEN_STRING = 384,
|
|
|
+ TOKEN_INTEGER = 385,
|
|
|
+ TOKEN_FLOAT = 386,
|
|
|
+ TOKEN_BOOLEAN = 387
|
|
|
};
|
|
|
};
|
|
|
|
|
@@ -677,6 +680,22 @@ namespace isc { namespace dhcp {
|
|
|
|
|
|
static inline
|
|
|
symbol_type
|
|
|
+ make_MEMFILE (const location_type& l);
|
|
|
+
|
|
|
+ static inline
|
|
|
+ symbol_type
|
|
|
+ make_MYSQL (const location_type& l);
|
|
|
+
|
|
|
+ static inline
|
|
|
+ symbol_type
|
|
|
+ make_POSTGRESQL (const location_type& l);
|
|
|
+
|
|
|
+ static inline
|
|
|
+ symbol_type
|
|
|
+ make_CQL (const location_type& l);
|
|
|
+
|
|
|
+ static inline
|
|
|
+ symbol_type
|
|
|
make_USER (const location_type& l);
|
|
|
|
|
|
static inline
|
|
@@ -701,6 +720,10 @@ namespace isc { namespace dhcp {
|
|
|
|
|
|
static inline
|
|
|
symbol_type
|
|
|
+ make_CONNECT_TIMEOUT (const location_type& l);
|
|
|
+
|
|
|
+ static inline
|
|
|
+ symbol_type
|
|
|
make_VALID_LIFETIME (const location_type& l);
|
|
|
|
|
|
static inline
|
|
@@ -781,6 +804,10 @@ namespace isc { namespace dhcp {
|
|
|
|
|
|
static inline
|
|
|
symbol_type
|
|
|
+ make_USER_CONTEXT (const location_type& l);
|
|
|
+
|
|
|
+ static inline
|
|
|
+ symbol_type
|
|
|
make_SUBNET (const location_type& l);
|
|
|
|
|
|
static inline
|
|
@@ -893,26 +920,6 @@ namespace isc { namespace dhcp {
|
|
|
|
|
|
static inline
|
|
|
symbol_type
|
|
|
- make_SERVER_ID (const location_type& l);
|
|
|
-
|
|
|
- static inline
|
|
|
- symbol_type
|
|
|
- make_IDENTIFIER (const location_type& l);
|
|
|
-
|
|
|
- static inline
|
|
|
- symbol_type
|
|
|
- make_HTYPE (const location_type& l);
|
|
|
-
|
|
|
- static inline
|
|
|
- symbol_type
|
|
|
- make_TIME (const location_type& l);
|
|
|
-
|
|
|
- static inline
|
|
|
- symbol_type
|
|
|
- make_ENTERPRISE_ID (const location_type& l);
|
|
|
-
|
|
|
- static inline
|
|
|
- symbol_type
|
|
|
make_DHCP4O6_PORT (const location_type& l);
|
|
|
|
|
|
static inline
|
|
@@ -1312,12 +1319,12 @@ namespace isc { namespace dhcp {
|
|
|
enum
|
|
|
{
|
|
|
yyeof_ = 0,
|
|
|
- yylast_ = 732, ///< Last index in yytable_.
|
|
|
- yynnts_ = 305, ///< Number of nonterminal symbols.
|
|
|
+ yylast_ = 719, ///< Last index in yytable_.
|
|
|
+ yynnts_ = 302, ///< Number of nonterminal symbols.
|
|
|
yyfinal_ = 24, ///< Termination state number.
|
|
|
yyterror_ = 1,
|
|
|
yyerrcode_ = 256,
|
|
|
- yyntokens_ = 132 ///< Number of tokens.
|
|
|
+ yyntokens_ = 133 ///< Number of tokens.
|
|
|
};
|
|
|
|
|
|
|
|
@@ -1372,9 +1379,9 @@ 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
|
|
|
+ 125, 126, 127, 128, 129, 130, 131, 132
|
|
|
};
|
|
|
- const unsigned int user_token_number_max_ = 386;
|
|
|
+ const unsigned int user_token_number_max_ = 387;
|
|
|
const token_number_type undef_token_ = 2;
|
|
|
|
|
|
if (static_cast<int>(t) <= yyeof_)
|
|
@@ -1407,26 +1414,28 @@ namespace isc { namespace dhcp {
|
|
|
{
|
|
|
switch (other.type_get ())
|
|
|
{
|
|
|
- case 145: // value
|
|
|
- case 186: // socket_type
|
|
|
- case 399: // ncr_protocol_value
|
|
|
- case 408: // replace_client_name_value
|
|
|
+ case 146: // value
|
|
|
+ case 150: // map_value
|
|
|
+ case 188: // socket_type
|
|
|
+ case 197: // db_type
|
|
|
+ case 397: // ncr_protocol_value
|
|
|
+ case 406: // replace_client_name_value
|
|
|
value.copy< ElementPtr > (other.value);
|
|
|
break;
|
|
|
|
|
|
- case 131: // "boolean"
|
|
|
+ case 132: // "boolean"
|
|
|
value.copy< bool > (other.value);
|
|
|
break;
|
|
|
|
|
|
- case 130: // "floating point"
|
|
|
+ case 131: // "floating point"
|
|
|
value.copy< double > (other.value);
|
|
|
break;
|
|
|
|
|
|
- case 129: // "integer"
|
|
|
+ case 130: // "integer"
|
|
|
value.copy< int64_t > (other.value);
|
|
|
break;
|
|
|
|
|
|
- case 128: // "constant string"
|
|
|
+ case 129: // "constant string"
|
|
|
value.copy< std::string > (other.value);
|
|
|
break;
|
|
|
|
|
@@ -1447,26 +1456,28 @@ namespace isc { namespace dhcp {
|
|
|
(void) v;
|
|
|
switch (this->type_get ())
|
|
|
{
|
|
|
- case 145: // value
|
|
|
- case 186: // socket_type
|
|
|
- case 399: // ncr_protocol_value
|
|
|
- case 408: // replace_client_name_value
|
|
|
+ case 146: // value
|
|
|
+ case 150: // map_value
|
|
|
+ case 188: // socket_type
|
|
|
+ case 197: // db_type
|
|
|
+ case 397: // ncr_protocol_value
|
|
|
+ case 406: // replace_client_name_value
|
|
|
value.copy< ElementPtr > (v);
|
|
|
break;
|
|
|
|
|
|
- case 131: // "boolean"
|
|
|
+ case 132: // "boolean"
|
|
|
value.copy< bool > (v);
|
|
|
break;
|
|
|
|
|
|
- case 130: // "floating point"
|
|
|
+ case 131: // "floating point"
|
|
|
value.copy< double > (v);
|
|
|
break;
|
|
|
|
|
|
- case 129: // "integer"
|
|
|
+ case 130: // "integer"
|
|
|
value.copy< int64_t > (v);
|
|
|
break;
|
|
|
|
|
|
- case 128: // "constant string"
|
|
|
+ case 129: // "constant string"
|
|
|
value.copy< std::string > (v);
|
|
|
break;
|
|
|
|
|
@@ -1546,26 +1557,28 @@ namespace isc { namespace dhcp {
|
|
|
// Type destructor.
|
|
|
switch (yytype)
|
|
|
{
|
|
|
- case 145: // value
|
|
|
- case 186: // socket_type
|
|
|
- case 399: // ncr_protocol_value
|
|
|
- case 408: // replace_client_name_value
|
|
|
+ case 146: // value
|
|
|
+ case 150: // map_value
|
|
|
+ case 188: // socket_type
|
|
|
+ case 197: // db_type
|
|
|
+ case 397: // ncr_protocol_value
|
|
|
+ case 406: // replace_client_name_value
|
|
|
value.template destroy< ElementPtr > ();
|
|
|
break;
|
|
|
|
|
|
- case 131: // "boolean"
|
|
|
+ case 132: // "boolean"
|
|
|
value.template destroy< bool > ();
|
|
|
break;
|
|
|
|
|
|
- case 130: // "floating point"
|
|
|
+ case 131: // "floating point"
|
|
|
value.template destroy< double > ();
|
|
|
break;
|
|
|
|
|
|
- case 129: // "integer"
|
|
|
+ case 130: // "integer"
|
|
|
value.template destroy< int64_t > ();
|
|
|
break;
|
|
|
|
|
|
- case 128: // "constant string"
|
|
|
+ case 129: // "constant string"
|
|
|
value.template destroy< std::string > ();
|
|
|
break;
|
|
|
|
|
@@ -1592,26 +1605,28 @@ namespace isc { namespace dhcp {
|
|
|
super_type::move(s);
|
|
|
switch (this->type_get ())
|
|
|
{
|
|
|
- case 145: // value
|
|
|
- case 186: // socket_type
|
|
|
- case 399: // ncr_protocol_value
|
|
|
- case 408: // replace_client_name_value
|
|
|
+ case 146: // value
|
|
|
+ case 150: // map_value
|
|
|
+ case 188: // socket_type
|
|
|
+ case 197: // db_type
|
|
|
+ case 397: // ncr_protocol_value
|
|
|
+ case 406: // replace_client_name_value
|
|
|
value.move< ElementPtr > (s.value);
|
|
|
break;
|
|
|
|
|
|
- case 131: // "boolean"
|
|
|
+ case 132: // "boolean"
|
|
|
value.move< bool > (s.value);
|
|
|
break;
|
|
|
|
|
|
- case 130: // "floating point"
|
|
|
+ case 131: // "floating point"
|
|
|
value.move< double > (s.value);
|
|
|
break;
|
|
|
|
|
|
- case 129: // "integer"
|
|
|
+ case 130: // "integer"
|
|
|
value.move< int64_t > (s.value);
|
|
|
break;
|
|
|
|
|
|
- case 128: // "constant string"
|
|
|
+ case 129: // "constant string"
|
|
|
value.move< std::string > (s.value);
|
|
|
break;
|
|
|
|
|
@@ -1683,7 +1698,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
|
|
|
+ 385, 386, 387
|
|
|
};
|
|
|
return static_cast<token_type> (yytoken_number_[type]);
|
|
|
}
|
|
@@ -1821,6 +1836,30 @@ namespace isc { namespace dhcp {
|
|
|
}
|
|
|
|
|
|
Dhcp4Parser::symbol_type
|
|
|
+ Dhcp4Parser::make_MEMFILE (const location_type& l)
|
|
|
+ {
|
|
|
+ return symbol_type (token::TOKEN_MEMFILE, l);
|
|
|
+ }
|
|
|
+
|
|
|
+ Dhcp4Parser::symbol_type
|
|
|
+ Dhcp4Parser::make_MYSQL (const location_type& l)
|
|
|
+ {
|
|
|
+ return symbol_type (token::TOKEN_MYSQL, l);
|
|
|
+ }
|
|
|
+
|
|
|
+ Dhcp4Parser::symbol_type
|
|
|
+ Dhcp4Parser::make_POSTGRESQL (const location_type& l)
|
|
|
+ {
|
|
|
+ return symbol_type (token::TOKEN_POSTGRESQL, l);
|
|
|
+ }
|
|
|
+
|
|
|
+ Dhcp4Parser::symbol_type
|
|
|
+ Dhcp4Parser::make_CQL (const location_type& l)
|
|
|
+ {
|
|
|
+ return symbol_type (token::TOKEN_CQL, l);
|
|
|
+ }
|
|
|
+
|
|
|
+ Dhcp4Parser::symbol_type
|
|
|
Dhcp4Parser::make_USER (const location_type& l)
|
|
|
{
|
|
|
return symbol_type (token::TOKEN_USER, l);
|
|
@@ -1857,6 +1896,12 @@ namespace isc { namespace dhcp {
|
|
|
}
|
|
|
|
|
|
Dhcp4Parser::symbol_type
|
|
|
+ Dhcp4Parser::make_CONNECT_TIMEOUT (const location_type& l)
|
|
|
+ {
|
|
|
+ return symbol_type (token::TOKEN_CONNECT_TIMEOUT, l);
|
|
|
+ }
|
|
|
+
|
|
|
+ Dhcp4Parser::symbol_type
|
|
|
Dhcp4Parser::make_VALID_LIFETIME (const location_type& l)
|
|
|
{
|
|
|
return symbol_type (token::TOKEN_VALID_LIFETIME, l);
|
|
@@ -1977,6 +2022,12 @@ namespace isc { namespace dhcp {
|
|
|
}
|
|
|
|
|
|
Dhcp4Parser::symbol_type
|
|
|
+ Dhcp4Parser::make_USER_CONTEXT (const location_type& l)
|
|
|
+ {
|
|
|
+ return symbol_type (token::TOKEN_USER_CONTEXT, l);
|
|
|
+ }
|
|
|
+
|
|
|
+ Dhcp4Parser::symbol_type
|
|
|
Dhcp4Parser::make_SUBNET (const location_type& l)
|
|
|
{
|
|
|
return symbol_type (token::TOKEN_SUBNET, l);
|
|
@@ -2145,36 +2196,6 @@ namespace isc { namespace dhcp {
|
|
|
}
|
|
|
|
|
|
Dhcp4Parser::symbol_type
|
|
|
- Dhcp4Parser::make_SERVER_ID (const location_type& l)
|
|
|
- {
|
|
|
- return symbol_type (token::TOKEN_SERVER_ID, l);
|
|
|
- }
|
|
|
-
|
|
|
- Dhcp4Parser::symbol_type
|
|
|
- Dhcp4Parser::make_IDENTIFIER (const location_type& l)
|
|
|
- {
|
|
|
- return symbol_type (token::TOKEN_IDENTIFIER, l);
|
|
|
- }
|
|
|
-
|
|
|
- Dhcp4Parser::symbol_type
|
|
|
- Dhcp4Parser::make_HTYPE (const location_type& l)
|
|
|
- {
|
|
|
- return symbol_type (token::TOKEN_HTYPE, l);
|
|
|
- }
|
|
|
-
|
|
|
- Dhcp4Parser::symbol_type
|
|
|
- Dhcp4Parser::make_TIME (const location_type& l)
|
|
|
- {
|
|
|
- return symbol_type (token::TOKEN_TIME, l);
|
|
|
- }
|
|
|
-
|
|
|
- Dhcp4Parser::symbol_type
|
|
|
- Dhcp4Parser::make_ENTERPRISE_ID (const location_type& l)
|
|
|
- {
|
|
|
- return symbol_type (token::TOKEN_ENTERPRISE_ID, l);
|
|
|
- }
|
|
|
-
|
|
|
- Dhcp4Parser::symbol_type
|
|
|
Dhcp4Parser::make_DHCP4O6_PORT (const location_type& l)
|
|
|
{
|
|
|
return symbol_type (token::TOKEN_DHCP4O6_PORT, l);
|
|
@@ -2471,7 +2492,7 @@ namespace isc { namespace dhcp {
|
|
|
|
|
|
#line 14 "dhcp4_parser.yy" // lalr1.cc:377
|
|
|
} } // isc::dhcp
|
|
|
-#line 2475 "dhcp4_parser.h" // lalr1.cc:377
|
|
|
+#line 2496 "dhcp4_parser.h" // lalr1.cc:377
|
|
|
|
|
|
|
|
|
|