Skip to content
GitLab
Commit 9f25ce59 authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

[5017] DHCP{4,6} parsers regenerated

parent 313cdfdd
Expand all Hide whitespace changes
Inline Side-by-side
src/bin/dhcp4/dhcp4_lexer.cc
View file @ 9f25ce59
This diff is collapsed.
src/bin/dhcp4/dhcp4_parser.cc
View file @ 9f25ce59
This diff is collapsed.
src/bin/dhcp4/dhcp4_parser.h
View file @ 9f25ce59
......@@ -305,7 +305,6 @@ namespace isc { namespace dhcp {
union union_type
{
// value
// version_value
char dummy1[sizeof(ElementPtr)];
// "boolean"
......@@ -352,69 +351,69 @@ namespace isc { namespace dhcp {
TOKEN_DHCP4 = 265,
TOKEN_INTERFACES_CONFIG = 266,
TOKEN_INTERFACES = 267,
TOKEN_ECHO_CLIENT_ID = 268,
TOKEN_MATCH_CLIENT_ID = 269,
TOKEN_NEXT_SERVER = 270,
TOKEN_SERVER_HOSTNAME = 271,
TOKEN_BOOT_FILE_NAME = 272,
TOKEN_LEASE_DATABASE = 273,
TOKEN_HOSTS_DATABASE = 274,
TOKEN_TYPE = 275,
TOKEN_USER = 276,
TOKEN_PASSWORD = 277,
TOKEN_HOST = 278,
TOKEN_PERSIST = 279,
TOKEN_LFC_INTERVAL = 280,
TOKEN_READONLY = 281,
TOKEN_VALID_LIFETIME = 282,
TOKEN_RENEW_TIMER = 283,
TOKEN_REBIND_TIMER = 284,
TOKEN_DECLINE_PROBATION_PERIOD = 285,
TOKEN_SUBNET4 = 286,
TOKEN_SUBNET_4O6_INTERFACE = 287,
TOKEN_SUBNET_4O6_INTERFACE_ID = 288,
TOKEN_SUBNET_4O6_SUBNET = 289,
TOKEN_OPTION_DEF = 290,
TOKEN_OPTION_DATA = 291,
TOKEN_NAME = 292,
TOKEN_DATA = 293,
TOKEN_CODE = 294,
TOKEN_SPACE = 295,
TOKEN_CSV_FORMAT = 296,
TOKEN_RECORD_TYPES = 297,
TOKEN_ENCAPSULATE = 298,
TOKEN_ARRAY = 299,
TOKEN_POOLS = 300,
TOKEN_POOL = 301,
TOKEN_SUBNET = 302,
TOKEN_INTERFACE = 303,
TOKEN_INTERFACE_ID = 304,
TOKEN_ID = 305,
TOKEN_RAPID_COMMIT = 306,
TOKEN_RESERVATION_MODE = 307,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 308,
TOKEN_CLIENT_CLASSES = 309,
TOKEN_TEST = 310,
TOKEN_CLIENT_CLASS = 311,
TOKEN_RESERVATIONS = 312,
TOKEN_DUID = 313,
TOKEN_HW_ADDRESS = 314,
TOKEN_CIRCUIT_ID = 315,
TOKEN_CLIENT_ID = 316,
TOKEN_HOSTNAME = 317,
TOKEN_RELAY = 318,
TOKEN_IP_ADDRESS = 319,
TOKEN_HOOKS_LIBRARIES = 320,
TOKEN_LIBRARY = 321,
TOKEN_PARAMETERS = 322,
TOKEN_EXPIRED_LEASES_PROCESSING = 323,
TOKEN_SERVER_ID = 324,
TOKEN_IDENTIFIER = 325,
TOKEN_HTYPE = 326,
TOKEN_TIME = 327,
TOKEN_ENTERPRISE_ID = 328,
TOKEN_DHCP4O6_PORT = 329,
TOKEN_VERSION = 330,
TOKEN_DHCP_SOCKET_TYPE = 268,
TOKEN_ECHO_CLIENT_ID = 269,
TOKEN_MATCH_CLIENT_ID = 270,
TOKEN_NEXT_SERVER = 271,
TOKEN_SERVER_HOSTNAME = 272,
TOKEN_BOOT_FILE_NAME = 273,
TOKEN_LEASE_DATABASE = 274,
TOKEN_HOSTS_DATABASE = 275,
TOKEN_TYPE = 276,
TOKEN_USER = 277,
TOKEN_PASSWORD = 278,
TOKEN_HOST = 279,
TOKEN_PERSIST = 280,
TOKEN_LFC_INTERVAL = 281,
TOKEN_READONLY = 282,
TOKEN_VALID_LIFETIME = 283,
TOKEN_RENEW_TIMER = 284,
TOKEN_REBIND_TIMER = 285,
TOKEN_DECLINE_PROBATION_PERIOD = 286,
TOKEN_SUBNET4 = 287,
TOKEN_SUBNET_4O6_INTERFACE = 288,
TOKEN_SUBNET_4O6_INTERFACE_ID = 289,
TOKEN_SUBNET_4O6_SUBNET = 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_SUBNET = 303,
TOKEN_INTERFACE = 304,
TOKEN_INTERFACE_ID = 305,
TOKEN_ID = 306,
TOKEN_RAPID_COMMIT = 307,
TOKEN_RESERVATION_MODE = 308,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 309,
TOKEN_CLIENT_CLASSES = 310,
TOKEN_TEST = 311,
TOKEN_CLIENT_CLASS = 312,
TOKEN_RESERVATIONS = 313,
TOKEN_DUID = 314,
TOKEN_HW_ADDRESS = 315,
TOKEN_CIRCUIT_ID = 316,
TOKEN_CLIENT_ID = 317,
TOKEN_HOSTNAME = 318,
TOKEN_RELAY = 319,
TOKEN_IP_ADDRESS = 320,
TOKEN_HOOKS_LIBRARIES = 321,
TOKEN_LIBRARY = 322,
TOKEN_PARAMETERS = 323,
TOKEN_EXPIRED_LEASES_PROCESSING = 324,
TOKEN_SERVER_ID = 325,
TOKEN_IDENTIFIER = 326,
TOKEN_HTYPE = 327,
TOKEN_TIME = 328,
TOKEN_ENTERPRISE_ID = 329,
TOKEN_DHCP4O6_PORT = 330,
TOKEN_CONTROL_SOCKET = 331,
TOKEN_SOCKET_TYPE = 332,
TOKEN_SOCKET_NAME = 333,
......@@ -599,6 +598,10 @@ namespace isc { namespace dhcp {
symbol_type
make_INTERFACES (const location_type& l);
static inline
symbol_type
make_DHCP_SOCKET_TYPE (const location_type& l);
static inline
symbol_type
make_ECHO_CLIENT_ID (const location_type& l);
......@@ -847,10 +850,6 @@ namespace isc { namespace dhcp {
symbol_type
make_DHCP4O6_PORT (const location_type& l);
static inline
symbol_type
make_VERSION (const location_type& l);
static inline
symbol_type
make_CONTROL_SOCKET (const location_type& l);
......@@ -1160,8 +1159,8 @@ namespace isc { namespace dhcp {
enum
{
yyeof_ = 0,
yylast_ = 623, ///< Last index in yytable_.
yynnts_ = 266, ///< Number of nonterminal symbols.
yylast_ = 624, ///< Last index in yytable_.
yynnts_ = 267, ///< Number of nonterminal symbols.
yyfinal_ = 22, ///< Termination state number.
yyterror_ = 1,
yyerrcode_ = 256,
......@@ -1253,7 +1252,6 @@ namespace isc { namespace dhcp {
switch (other.type_get ())
{
case 114: // value
case 331: // version_value
value.copy< ElementPtr > (other.value);
break;
......@@ -1291,7 +1289,6 @@ namespace isc { namespace dhcp {
switch (this->type_get ())
{
case 114: // value
case 331: // version_value
value.copy< ElementPtr > (v);
break;
......@@ -1388,7 +1385,6 @@ namespace isc { namespace dhcp {
switch (yytype)
{
case 114: // value
case 331: // version_value
value.template destroy< ElementPtr > ();
break;
......@@ -1432,7 +1428,6 @@ namespace isc { namespace dhcp {
switch (this->type_get ())
{
case 114: // value
case 331: // version_value
value.move< ElementPtr > (s.value);
break;
......@@ -1588,6 +1583,12 @@ namespace isc { namespace dhcp {
return symbol_type (token::TOKEN_INTERFACES, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_DHCP_SOCKET_TYPE (const location_type& l)
{
return symbol_type (token::TOKEN_DHCP_SOCKET_TYPE, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_ECHO_CLIENT_ID (const location_type& l)
{
......@@ -1960,12 +1961,6 @@ namespace isc { namespace dhcp {
return symbol_type (token::TOKEN_DHCP4O6_PORT, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_VERSION (const location_type& l)
{
return symbol_type (token::TOKEN_VERSION, l);
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_CONTROL_SOCKET (const location_type& l)
{
......@@ -2125,7 +2120,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp4_parser.yy" // lalr1.cc:377
} } // isc::dhcp
#line 2129 "dhcp4_parser.h" // lalr1.cc:377
#line 2124 "dhcp4_parser.h" // lalr1.cc:377
......
src/bin/dhcp6/dhcp6_lexer.cc
View file @ 9f25ce59
This diff is collapsed.
src/bin/dhcp6/dhcp6_parser.cc
View file @ 9f25ce59
This diff is collapsed.
src/bin/dhcp6/dhcp6_parser.h
View file @ 9f25ce59
......@@ -305,7 +305,6 @@ namespace isc { namespace dhcp {
union union_type
{
// value
// version_value
char dummy1[sizeof(ElementPtr)];
// "boolean"
......@@ -415,34 +414,33 @@ namespace isc { namespace dhcp {
TOKEN_TIME = 328,
TOKEN_ENTERPRISE_ID = 329,
TOKEN_DHCP4O6_PORT = 330,
TOKEN_VERSION = 331,
TOKEN_CONTROL_SOCKET = 332,
TOKEN_SOCKET_TYPE = 333,
TOKEN_SOCKET_NAME = 334,
TOKEN_DHCP_DDNS = 335,
TOKEN_LOGGING = 336,
TOKEN_LOGGERS = 337,
TOKEN_OUTPUT_OPTIONS = 338,
TOKEN_OUTPUT = 339,
TOKEN_DEBUGLEVEL = 340,
TOKEN_SEVERITY = 341,
TOKEN_DHCP4 = 342,
TOKEN_DHCPDDNS = 343,
TOKEN_TOPLEVEL_JSON = 344,
TOKEN_TOPLEVEL_DHCP6 = 345,
TOKEN_SUB_DHCP6 = 346,
TOKEN_SUB_INTERFACES6 = 347,
TOKEN_SUB_SUBNET6 = 348,
TOKEN_SUB_POOL6 = 349,
TOKEN_SUB_PD_POOL = 350,
TOKEN_SUB_RESERVATION = 351,
TOKEN_SUB_OPTION_DEF = 352,
TOKEN_SUB_OPTION_DATA = 353,
TOKEN_SUB_HOOKS_LIBRARY = 354,
TOKEN_STRING = 355,
TOKEN_INTEGER = 356,
TOKEN_FLOAT = 357,
TOKEN_BOOLEAN = 358
TOKEN_CONTROL_SOCKET = 331,
TOKEN_SOCKET_TYPE = 332,
TOKEN_SOCKET_NAME = 333,
TOKEN_DHCP_DDNS = 334,
TOKEN_LOGGING = 335,
TOKEN_LOGGERS = 336,
TOKEN_OUTPUT_OPTIONS = 337,
TOKEN_OUTPUT = 338,
TOKEN_DEBUGLEVEL = 339,
TOKEN_SEVERITY = 340,
TOKEN_DHCP4 = 341,
TOKEN_DHCPDDNS = 342,
TOKEN_TOPLEVEL_JSON = 343,
TOKEN_TOPLEVEL_DHCP6 = 344,
TOKEN_SUB_DHCP6 = 345,
TOKEN_SUB_INTERFACES6 = 346,
TOKEN_SUB_SUBNET6 = 347,
TOKEN_SUB_POOL6 = 348,
TOKEN_SUB_PD_POOL = 349,
TOKEN_SUB_RESERVATION = 350,
TOKEN_SUB_OPTION_DEF = 351,
TOKEN_SUB_OPTION_DATA = 352,
TOKEN_SUB_HOOKS_LIBRARY = 353,
TOKEN_STRING = 354,
TOKEN_INTEGER = 355,
TOKEN_FLOAT = 356,
TOKEN_BOOLEAN = 357
};
};
......@@ -853,10 +851,6 @@ namespace isc { namespace dhcp {
symbol_type
make_DHCP4O6_PORT (const location_type& l);
static inline
symbol_type
make_VERSION (const location_type& l);
static inline
symbol_type
make_CONTROL_SOCKET (const location_type& l);
......@@ -1170,12 +1164,12 @@ namespace isc { namespace dhcp {
enum
{
yyeof_ = 0,
yylast_ = 638, ///< Last index in yytable_.
yynnts_ = 274, ///< Number of nonterminal symbols.
yylast_ = 630, ///< Last index in yytable_.
yynnts_ = 271, ///< Number of nonterminal symbols.
yyfinal_ = 24, ///< Termination state number.
yyterror_ = 1,
yyerrcode_ = 256,
yyntokens_ = 104 ///< Number of tokens.
yyntokens_ = 103 ///< Number of tokens.
};
......@@ -1227,9 +1221,9 @@ namespace isc { namespace dhcp {
65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
95, 96, 97, 98, 99, 100, 101, 102, 103
95, 96, 97, 98, 99, 100, 101, 102
};
const unsigned int user_token_number_max_ = 358;
const unsigned int user_token_number_max_ = 357;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
......@@ -1262,24 +1256,23 @@ namespace isc { namespace dhcp {
{
switch (other.type_get ())
{
case 117: // value
case 341: // version_value
case 116: // value
value.copy< ElementPtr > (other.value);
break;
case 103: // "boolean"
case 102: // "boolean"
value.copy< bool > (other.value);
break;
case 102: // "floating point"
case 101: // "floating point"
value.copy< double > (other.value);
break;
case 101: // "integer"
case 100: // "integer"
value.copy< int64_t > (other.value);
break;
case 100: // "constant string"
case 99: // "constant string"
value.copy< std::string > (other.value);
break;
......@@ -1300,24 +1293,23 @@ namespace isc { namespace dhcp {
(void) v;
switch (this->type_get ())
{
case 117: // value
case 341: // version_value
case 116: // value
value.copy< ElementPtr > (v);
break;
case 103: // "boolean"
case 102: // "boolean"
value.copy< bool > (v);
break;
case 102: // "floating point"
case 101: // "floating point"
value.copy< double > (v);
break;
case 101: // "integer"
case 100: // "integer"
value.copy< int64_t > (v);
break;
case 100: // "constant string"
case 99: // "constant string"
value.copy< std::string > (v);
break;
......@@ -1397,24 +1389,23 @@ namespace isc { namespace dhcp {
// Type destructor.
switch (yytype)
{
case 117: // value
case 341: // version_value
case 116: // value
value.template destroy< ElementPtr > ();
break;
case 103: // "boolean"
case 102: // "boolean"
value.template destroy< bool > ();
break;
case 102: // "floating point"
case 101: // "floating point"
value.template destroy< double > ();
break;
case 101: // "integer"
case 100: // "integer"
value.template destroy< int64_t > ();
break;
case 100: // "constant string"
case 99: // "constant string"
value.template destroy< std::string > ();
break;
......@@ -1441,24 +1432,23 @@ namespace isc { namespace dhcp {
super_type::move(s);
switch (this->type_get ())
{
case 117: // value
case 341: // version_value
case 116: // value
value.move< ElementPtr > (s.value);
break;
case 103: // "boolean"
case 102: // "boolean"
value.move< bool > (s.value);
break;
case 102: // "floating point"
case 101: // "floating point"
value.move< double > (s.value);
break;
case 101: // "integer"
case 100: // "integer"
value.move< int64_t > (s.value);
break;
case 100: // "constant string"
case 99: // "constant string"
value.move< std::string > (s.value);
break;
......@@ -1527,7 +1517,7 @@ namespace isc { namespace dhcp {
325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
345, 346, 347, 348, 349, 350, 351, 352, 353, 354,
355, 356, 357, 358
355, 356, 357
};
return static_cast<token_type> (yytoken_number_[type]);
}
......@@ -1976,12 +1966,6 @@ namespace isc { namespace dhcp {
return symbol_type (token::TOKEN_DHCP4O6_PORT, l);
}
Dhcp6Parser::symbol_type
Dhcp6Parser::make_VERSION (const location_type& l)
{
return symbol_type (token::TOKEN_VERSION, l);
}
Dhcp6Parser::symbol_type
Dhcp6Parser::make_CONTROL_SOCKET (const location_type& l)
{
......@@ -2147,7 +2131,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp6_parser.yy" // lalr1.cc:377
} } // isc::dhcp
#line 2151 "dhcp6_parser.h" // lalr1.cc:377
#line 2135 "dhcp6_parser.h" // lalr1.cc:377
......
Supports Markdown
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