Commit 161e61ec authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

bison regenerated

parent e2f963bb
This diff is collapsed.
This diff is collapsed.
......@@ -418,66 +418,67 @@ namespace isc { namespace dhcp {
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_OVERRIDE_NO_UPDATE = 357,
TOKEN_OVERRIDE_CLIENT_UPDATE = 358,
TOKEN_REPLACE_CLIENT_NAME = 359,
TOKEN_GENERATED_PREFIX = 360,
TOKEN_TCP = 361,
TOKEN_JSON = 362,
TOKEN_WHEN_PRESENT = 363,
TOKEN_NEVER = 364,
TOKEN_ALWAYS = 365,
TOKEN_WHEN_NOT_PRESENT = 366,
TOKEN_LOGGING = 367,
TOKEN_LOGGERS = 368,
TOKEN_OUTPUT_OPTIONS = 369,
TOKEN_OUTPUT = 370,
TOKEN_DEBUGLEVEL = 371,
TOKEN_SEVERITY = 372,
TOKEN_DHCP6 = 373,
TOKEN_DHCPDDNS = 374,
TOKEN_TOPLEVEL_JSON = 375,
TOKEN_TOPLEVEL_DHCP4 = 376,
TOKEN_SUB_DHCP4 = 377,
TOKEN_SUB_INTERFACES4 = 378,
TOKEN_SUB_SUBNET4 = 379,
TOKEN_SUB_POOL4 = 380,
TOKEN_SUB_RESERVATION = 381,
TOKEN_SUB_OPTION_DEF = 382,
TOKEN_SUB_OPTION_DATA = 383,
TOKEN_SUB_HOOKS_LIBRARY = 384,
TOKEN_SUB_DHCP_DDNS = 385,
TOKEN_STRING = 386,
TOKEN_INTEGER = 387,
TOKEN_FLOAT = 388,
TOKEN_BOOLEAN = 389
TOKEN_FLEX_ID = 330,
TOKEN_RELAY = 331,
TOKEN_IP_ADDRESS = 332,
TOKEN_HOOKS_LIBRARIES = 333,
TOKEN_LIBRARY = 334,
TOKEN_PARAMETERS = 335,
TOKEN_EXPIRED_LEASES_PROCESSING = 336,
TOKEN_RECLAIM_TIMER_WAIT_TIME = 337,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 338,
TOKEN_HOLD_RECLAIMED_TIME = 339,
TOKEN_MAX_RECLAIM_LEASES = 340,
TOKEN_MAX_RECLAIM_TIME = 341,
TOKEN_UNWARNED_RECLAIM_CYCLES = 342,
TOKEN_DHCP4O6_PORT = 343,
TOKEN_CONTROL_SOCKET = 344,
TOKEN_SOCKET_TYPE = 345,
TOKEN_SOCKET_NAME = 346,
TOKEN_DHCP_DDNS = 347,
TOKEN_ENABLE_UPDATES = 348,
TOKEN_QUALIFYING_SUFFIX = 349,
TOKEN_SERVER_IP = 350,
TOKEN_SERVER_PORT = 351,
TOKEN_SENDER_IP = 352,
TOKEN_SENDER_PORT = 353,
TOKEN_MAX_QUEUE_SIZE = 354,
TOKEN_NCR_PROTOCOL = 355,
TOKEN_NCR_FORMAT = 356,
TOKEN_ALWAYS_INCLUDE_FQDN = 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
};
};
......@@ -884,6 +885,10 @@ namespace isc { namespace dhcp {
symbol_type
make_HOSTNAME (const location_type& l);
static inline
symbol_type
make_FLEX_ID (const location_type& l);
static inline
symbol_type
make_RELAY (const location_type& l);
......@@ -1329,12 +1334,12 @@ namespace isc { namespace dhcp {
enum
{
yyeof_ = 0,
yylast_ = 729, ///< Last index in yytable_.
yynnts_ = 306, ///< Number of nonterminal symbols.
yylast_ = 736, ///< Last index in yytable_.
yynnts_ = 309, ///< Number of nonterminal symbols.
yyfinal_ = 24, ///< Termination state number.
yyterror_ = 1,
yyerrcode_ = 256,
yyntokens_ = 135 ///< Number of tokens.
yyntokens_ = 136 ///< Number of tokens.
};
......@@ -1389,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, 134
125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
135
};
const unsigned int user_token_number_max_ = 389;
const unsigned int user_token_number_max_ = 390;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
......@@ -1424,28 +1430,28 @@ namespace isc { namespace dhcp {
{
switch (other.type_get ())
{
case 148: // value
case 152: // map_value
case 190: // socket_type
case 199: // db_type
case 404: // ncr_protocol_value
case 412: // replace_client_name_value
case 149: // value
case 153: // map_value
case 191: // socket_type
case 200: // db_type
case 408: // ncr_protocol_value
case 416: // replace_client_name_value
value.copy< ElementPtr > (other.value);
break;
case 134: // "boolean"
case 135: // "boolean"
value.copy< bool > (other.value);
break;
case 133: // "floating point"
case 134: // "floating point"
value.copy< double > (other.value);
break;
case 132: // "integer"
case 133: // "integer"
value.copy< int64_t > (other.value);
break;
case 131: // "constant string"
case 132: // "constant string"
value.copy< std::string > (other.value);
break;
......@@ -1466,28 +1472,28 @@ namespace isc { namespace dhcp {
(void) v;
switch (this->type_get ())
{
case 148: // value
case 152: // map_value
case 190: // socket_type
case 199: // db_type
case 404: // ncr_protocol_value
case 412: // replace_client_name_value
case 149: // value
case 153: // map_value
case 191: // socket_type
case 200: // db_type
case 408: // ncr_protocol_value
case 416: // replace_client_name_value
value.copy< ElementPtr > (v);
break;
case 134: // "boolean"
case 135: // "boolean"
value.copy< bool > (v);
break;
case 133: // "floating point"
case 134: // "floating point"
value.copy< double > (v);
break;
case 132: // "integer"
case 133: // "integer"
value.copy< int64_t > (v);
break;
case 131: // "constant string"
case 132: // "constant string"
value.copy< std::string > (v);
break;
......@@ -1567,28 +1573,28 @@ namespace isc { namespace dhcp {
// Type destructor.
switch (yytype)
{
case 148: // value
case 152: // map_value
case 190: // socket_type
case 199: // db_type
case 404: // ncr_protocol_value
case 412: // replace_client_name_value
case 149: // value
case 153: // map_value
case 191: // socket_type
case 200: // db_type
case 408: // ncr_protocol_value
case 416: // replace_client_name_value
value.template destroy< ElementPtr > ();
break;
case 134: // "boolean"
case 135: // "boolean"
value.template destroy< bool > ();
break;
case 133: // "floating point"
case 134: // "floating point"
value.template destroy< double > ();
break;
case 132: // "integer"
case 133: // "integer"
value.template destroy< int64_t > ();
break;
case 131: // "constant string"
case 132: // "constant string"
value.template destroy< std::string > ();
break;
......@@ -1615,28 +1621,28 @@ namespace isc { namespace dhcp {
super_type::move(s);
switch (this->type_get ())
{
case 148: // value
case 152: // map_value
case 190: // socket_type
case 199: // db_type
case 404: // ncr_protocol_value
case 412: // replace_client_name_value
case 149: // value
case 153: // map_value
case 191: // socket_type
case 200: // db_type
case 408: // ncr_protocol_value
case 416: // replace_client_name_value
value.move< ElementPtr > (s.value);
break;
case 134: // "boolean"
case 135: // "boolean"
value.move< bool > (s.value);
break;
case 133: // "floating point"
case 134: // "floating point"
value.move< double > (s.value);
break;
case 132: // "integer"
case 133: // "integer"
value.move< int64_t > (s.value);
break;
case 131: // "constant string"
case 132: // "constant string"
value.move< std::string > (s.value);
break;
......@@ -1708,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, 389
385, 386, 387, 388, 389, 390
};
return static_cast<token_type> (yytoken_number_[type]);
}
......@@ -2151,6 +2157,12 @@ namespace isc { namespace dhcp {
return symbol_type (token::TOKEN_HOSTNAME, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_FLEX_ID (const location_type& l)
{
return symbol_type (token::TOKEN_FLEX_ID, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_RELAY (const location_type& l)
{
......@@ -2514,7 +2526,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp4_parser.yy" // lalr1.cc:377
} } // isc::dhcp
#line 2518 "dhcp4_parser.h" // lalr1.cc:377
#line 2530 "dhcp4_parser.h" // lalr1.cc:377
......
// Generated 201703062326
// Generated 201703291825
// A Bison parser, made by GNU Bison 3.0.4.
// Locations for Bison parsers in C++
......
// Generated 201703062326
// Generated 201703291825
// A Bison parser, made by GNU Bison 3.0.4.
// Positions for Bison parsers in C++
......
// Generated 201703062326
// Generated 201703291825
// 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.
......@@ -416,76 +416,77 @@ namespace isc { namespace dhcp {
TOKEN_DUID = 325,
TOKEN_HW_ADDRESS = 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_SERVER_ID = 340,
TOKEN_LLT = 341,
TOKEN_EN = 342,
TOKEN_LL = 343,
TOKEN_IDENTIFIER = 344,
TOKEN_HTYPE = 345,
TOKEN_TIME = 346,
TOKEN_ENTERPRISE_ID = 347,
TOKEN_DHCP4O6_PORT = 348,
TOKEN_CONTROL_SOCKET = 349,
TOKEN_SOCKET_TYPE = 350,
TOKEN_SOCKET_NAME = 351,
TOKEN_DHCP_DDNS = 352,
TOKEN_ENABLE_UPDATES = 353,
TOKEN_QUALIFYING_SUFFIX = 354,
TOKEN_SERVER_IP = 355,
TOKEN_SERVER_PORT = 356,
TOKEN_SENDER_IP = 357,
TOKEN_SENDER_PORT = 358,
TOKEN_MAX_QUEUE_SIZE = 359,
TOKEN_NCR_PROTOCOL = 360,
TOKEN_NCR_FORMAT = 361,
TOKEN_ALWAYS_INCLUDE_FQDN = 362,
TOKEN_OVERRIDE_NO_UPDATE = 363,
TOKEN_OVERRIDE_CLIENT_UPDATE = 364,
TOKEN_REPLACE_CLIENT_NAME = 365,
TOKEN_GENERATED_PREFIX = 366,
TOKEN_UDP = 367,
TOKEN_TCP = 368,
TOKEN_JSON = 369,
TOKEN_WHEN_PRESENT = 370,
TOKEN_NEVER = 371,
TOKEN_ALWAYS = 372,
TOKEN_WHEN_NOT_PRESENT = 373,
TOKEN_LOGGING = 374,
TOKEN_LOGGERS = 375,
TOKEN_OUTPUT_OPTIONS = 376,
TOKEN_OUTPUT = 377,
TOKEN_DEBUGLEVEL = 378,
TOKEN_SEVERITY = 379,
TOKEN_DHCP4 = 380,
TOKEN_DHCPDDNS = 381,
TOKEN_TOPLEVEL_JSON = 382,
TOKEN_TOPLEVEL_DHCP6 = 383,
TOKEN_SUB_DHCP6 = 384,
TOKEN_SUB_INTERFACES6 = 385,
TOKEN_SUB_SUBNET6 = 386,
TOKEN_SUB_POOL6 = 387,
TOKEN_SUB_PD_POOL = 388,
TOKEN_SUB_RESERVATION = 389,
TOKEN_SUB_OPTION_DEF = 390,
TOKEN_SUB_OPTION_DATA = 391,
TOKEN_SUB_HOOKS_LIBRARY = 392,
TOKEN_SUB_DHCP_DDNS = 393,
TOKEN_STRING = 394,
TOKEN_INTEGER = 395,
TOKEN_FLOAT = 396,
TOKEN_BOOLEAN = 397
TOKEN_FLEX_ID = 328,
TOKEN_RELAY = 329,
TOKEN_IP_ADDRESS = 330,
TOKEN_HOOKS_LIBRARIES = 331,
TOKEN_LIBRARY = 332,
TOKEN_PARAMETERS = 333,
TOKEN_EXPIRED_LEASES_PROCESSING = 334,
TOKEN_RECLAIM_TIMER_WAIT_TIME = 335,
TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 336,
TOKEN_HOLD_RECLAIMED_TIME = 337,
TOKEN_MAX_RECLAIM_LEASES = 338,
TOKEN_MAX_RECLAIM_TIME = 339,
TOKEN_UNWARNED_RECLAIM_CYCLES = 340,
TOKEN_SERVER_ID = 341,
TOKEN_LLT = 342,
TOKEN_EN = 343,
TOKEN_LL = 344,
TOKEN_IDENTIFIER = 345,
TOKEN_HTYPE = 346,
TOKEN_TIME = 347,
TOKEN_ENTERPRISE_ID = 348,
TOKEN_DHCP4O6_PORT = 349,
TOKEN_CONTROL_SOCKET = 350,
TOKEN_SOCKET_TYPE = 351,
TOKEN_SOCKET_NAME = 352,
TOKEN_DHCP_DDNS = 353,
TOKEN_ENABLE_UPDATES = 354,
TOKEN_QUALIFYING_SUFFIX = 355,
TOKEN_SERVER_IP = 356,
TOKEN_SERVER_PORT = 357,
TOKEN_SENDER_IP = 358,
TOKEN_SENDER_PORT = 359,
TOKEN_MAX_QUEUE_SIZE = 360,
TOKEN_NCR_PROTOCOL = 361,
TOKEN_NCR_FORMAT = 362,
TOKEN_ALWAYS_INCLUDE_FQDN = 363,
TOKEN_OVERRIDE_NO_UPDATE = 364,
TOKEN_OVERRIDE_CLIENT_UPDATE = 365,
TOKEN_REPLACE_CLIENT_NAME = 366,
TOKEN_GENERATED_PREFIX = 367,
TOKEN_UDP = 368,
TOKEN_TCP = 369,
TOKEN_JSON = 370,
TOKEN_WHEN_PRESENT = 371,
TOKEN_NEVER = 372,
TOKEN_ALWAYS = 373,
TOKEN_WHEN_NOT_PRESENT = 374,
TOKEN_LOGGING = 375,
TOKEN_LOGGERS = 376,
TOKEN_OUTPUT_OPTIONS = 377,
TOKEN_OUTPUT = 378,
TOKEN_DEBUGLEVEL = 379,
TOKEN_SEVERITY = 380,
TOKEN_DHCP4 = 381,
TOKEN_DHCPDDNS = 382,
TOKEN_TOPLEVEL_JSON = 383,
TOKEN_TOPLEVEL_DHCP6 = 384,
TOKEN_SUB_DHCP6 = 385,
TOKEN_SUB_INTERFACES6 = 386,
TOKEN_SUB_SUBNET6 = 387,
TOKEN_SUB_POOL6 = 388,
TOKEN_SUB_PD_POOL = 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
};
};
......@@ -884,6 +885,10 @@ namespace isc { namespace dhcp {
symbol_type
make_HOSTNAME (const location_type& l);
static inline
symbol_type
make_FLEX_ID (const location_type& l);
static inline
symbol_type
make_RELAY (const location_type& l);
......@@ -1369,12 +1374,12 @@ namespace isc { namespace dhcp {
enum
{
yyeof_ = 0,
yylast_ = 777, ///< Last index in yytable_.
yynnts_ = 321, ///< Number of nonterminal symbols.
yylast_ = 784, ///< Last index in yytable_.
yynnts_ = 324, ///< Number of nonterminal symbols.
yyfinal_ = 26, ///< Termination state number.
yyterror_ = 1,
yyerrcode_ = 256,
yyntokens_ = 143 ///< Number of tokens.
yyntokens_ = 144 ///< Number of tokens.
};
......@@ -1430,9 +1435,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
135, 136, 137, 138, 139, 140, 141, 142, 143
};
const unsigned int user_token_number_max_ = 397;
const unsigned int user_token_number_max_ = 398;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
......@@ -1465,28 +1470,28 @@ namespace isc { namespace dhcp {
{
switch (other.type_get ())
{
case 157: // value
case 161: // map_value
case 202: // db_type
case 394: // duid_type
case 427: // ncr_protocol_value
case 435: // replace_client_name_value
case 158: // value
case 162: // map_value
case 203: // db_type
case 398: // duid_type
case 431: // ncr_protocol_value
case 439: // replace_client_name_value
value.copy< ElementPtr > (other.value);
break;
case 142: // "boolean"
case 143: // "boolean"
value.copy< bool > (other.value);
break;
case 141: // "floating point"
case 142: // "floating point"
value.copy< double > (other.value);
break;
case 140: // "integer"
case 141: // "integer"
value.copy< int64_t > (other.value);
break;
case 139: // "constant string"
case 140: // "constant string"
value.copy< std::string > (other.value);
break;
......@@ -1507,28 +1512,28 @@ namespace isc { namespace dhcp {
(void) v;
switch (this->type_get ())
{
case 157: // value
case 161: // map_value
case 202: // db_type
case 394: // duid_type
case 427: // ncr_protocol_value
case 435: // replace_client_name_value
case 158: // value