Skip to content
GitLab
Commit 8819c56a authored by Francis Dupont's avatar Francis Dupont
Browse files

[trac5374] regen flex/bison

parent 4566781c
Expand all Hide whitespace changes
Inline Side-by-side
src/bin/dhcp4/dhcp4_lexer.cc
View file @ 8819c56a
This diff is collapsed.
src/bin/dhcp4/dhcp4_parser.cc
View file @ 8819c56a
......@@ -1863,7 +1863,7 @@ namespace isc { namespace dhcp {
#line 985 "dhcp4_parser.yy" // lalr1.cc:859
{
ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
ctx.stack_.back()->set("eval-client-classes", c);
ctx.stack_.back()->set("required-client-classes", c);
ctx.stack_.push_back(c);
ctx.enter(ctx.NO_KEYWORD);
}
......@@ -2688,7 +2688,7 @@ namespace isc { namespace dhcp {
#line 1597 "dhcp4_parser.yy" // lalr1.cc:859
{
ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
ctx.stack_.back()->set("eval-on-demand", b);
ctx.stack_.back()->set("only-if-required", b);
}
#line 2694 "dhcp4_parser.cc" // lalr1.cc:859
break;
......@@ -4213,37 +4213,38 @@ namespace isc { namespace dhcp {
"\"subnet\"", "\"interface\"", "\"interface-id\"", "\"id\"",
"\"rapid-commit\"", "\"reservation-mode\"", "\"disabled\"",
"\"out-of-pool\"", "\"all\"", "\"host-reservation-identifiers\"",
"\"client-classes\"", "\"eval-client-classes\"", "\"test\"",
"\"eval-on-demand\"", "\"client-class\"", "\"reservations\"", "\"duid\"",
"\"hw-address\"", "\"circuit-id\"", "\"client-id\"", "\"hostname\"",
"\"flex-id\"", "\"relay\"", "\"ip-address\"", "\"hooks-libraries\"",
"\"library\"", "\"parameters\"", "\"expired-leases-processing\"",
"\"reclaim-timer-wait-time\"", "\"flush-reclaimed-timer-wait-time\"",
"\"hold-reclaimed-time\"", "\"max-reclaim-leases\"",
"\"max-reclaim-time\"", "\"unwarned-reclaim-cycles\"",
"\"dhcp4o6-port\"", "\"control-socket\"", "\"socket-type\"",
"\"socket-name\"", "\"dhcp-ddns\"", "\"enable-updates\"",
"\"qualifying-suffix\"", "\"server-ip\"", "\"server-port\"",
"\"sender-ip\"", "\"sender-port\"", "\"max-queue-size\"",
"\"ncr-protocol\"", "\"ncr-format\"", "\"always-include-fqdn\"",
"\"override-no-update\"", "\"override-client-update\"",
"\"replace-client-name\"", "\"generated-prefix\"", "\"tcp\"", "\"JSON\"",
"\"when-present\"", "\"never\"", "\"always\"", "\"when-not-present\"",
"\"Logging\"", "\"loggers\"", "\"output_options\"", "\"output\"",
"\"debuglevel\"", "\"severity\"", "\"flush\"", "\"maxsize\"",
"\"maxver\"", "\"Dhcp6\"", "\"DhcpDdns\"", "\"Control-agent\"",
"TOPLEVEL_JSON", "TOPLEVEL_DHCP4", "SUB_DHCP4", "SUB_INTERFACES4",
"SUB_SUBNET4", "SUB_POOL4", "SUB_RESERVATION", "SUB_OPTION_DEFS",
"SUB_OPTION_DEF", "SUB_OPTION_DATA", "SUB_HOOKS_LIBRARY",
"SUB_DHCP_DDNS", "\"constant string\"", "\"integer\"",
"\"floating point\"", "\"boolean\"", "$accept", "start", "$@1", "$@2",
"$@3", "$@4", "$@5", "$@6", "$@7", "$@8", "$@9", "$@10", "$@11", "$@12",
"value", "sub_json", "map2", "$@13", "map_value", "map_content",
"not_empty_map", "list_generic", "$@14", "list_content",
"not_empty_list", "list_strings", "$@15", "list_strings_content",
"not_empty_list_strings", "unknown_map_entry", "syntax_map", "$@16",
"global_objects", "global_object", "dhcp4_object", "$@17", "sub_dhcp4",
"$@18", "global_params", "global_param", "valid_lifetime", "renew_timer",
"\"client-classes\"", "\"required-client-classes\"", "\"test\"",
"\"only-if-required\"", "\"client-class\"", "\"reservations\"",
"\"duid\"", "\"hw-address\"", "\"circuit-id\"", "\"client-id\"",
"\"hostname\"", "\"flex-id\"", "\"relay\"", "\"ip-address\"",
"\"hooks-libraries\"", "\"library\"", "\"parameters\"",
"\"expired-leases-processing\"", "\"reclaim-timer-wait-time\"",
"\"flush-reclaimed-timer-wait-time\"", "\"hold-reclaimed-time\"",
"\"max-reclaim-leases\"", "\"max-reclaim-time\"",
"\"unwarned-reclaim-cycles\"", "\"dhcp4o6-port\"", "\"control-socket\"",
"\"socket-type\"", "\"socket-name\"", "\"dhcp-ddns\"",
"\"enable-updates\"", "\"qualifying-suffix\"", "\"server-ip\"",
"\"server-port\"", "\"sender-ip\"", "\"sender-port\"",
"\"max-queue-size\"", "\"ncr-protocol\"", "\"ncr-format\"",
"\"always-include-fqdn\"", "\"override-no-update\"",
"\"override-client-update\"", "\"replace-client-name\"",
"\"generated-prefix\"", "\"tcp\"", "\"JSON\"", "\"when-present\"",
"\"never\"", "\"always\"", "\"when-not-present\"", "\"Logging\"",
"\"loggers\"", "\"output_options\"", "\"output\"", "\"debuglevel\"",
"\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"Dhcp6\"",
"\"DhcpDdns\"", "\"Control-agent\"", "TOPLEVEL_JSON", "TOPLEVEL_DHCP4",
"SUB_DHCP4", "SUB_INTERFACES4", "SUB_SUBNET4", "SUB_POOL4",
"SUB_RESERVATION", "SUB_OPTION_DEFS", "SUB_OPTION_DEF",
"SUB_OPTION_DATA", "SUB_HOOKS_LIBRARY", "SUB_DHCP_DDNS",
"\"constant string\"", "\"integer\"", "\"floating point\"",
"\"boolean\"", "$accept", "start", "$@1", "$@2", "$@3", "$@4", "$@5",
"$@6", "$@7", "$@8", "$@9", "$@10", "$@11", "$@12", "value", "sub_json",
"map2", "$@13", "map_value", "map_content", "not_empty_map",
"list_generic", "$@14", "list_content", "not_empty_list", "list_strings",
"$@15", "list_strings_content", "not_empty_list_strings",
"unknown_map_entry", "syntax_map", "$@16", "global_objects",
"global_object", "dhcp4_object", "$@17", "sub_dhcp4", "$@18",
"global_params", "global_param", "valid_lifetime", "renew_timer",
"rebind_timer", "decline_probation_period", "echo_client_id",
"match_client_id", "interfaces_config", "$@19",
"interfaces_config_params", "interfaces_config_param", "sub_interfaces4",
......@@ -4269,7 +4270,7 @@ namespace isc { namespace dhcp {
"sub_subnet4", "$@42", "subnet4_params", "subnet4_param", "subnet",
"$@43", "subnet_4o6_interface", "$@44", "subnet_4o6_interface_id",
"$@45", "subnet_4o6_subnet", "$@46", "interface", "$@47", "interface_id",
"$@48", "client_class", "$@49", "eval_client_classes", "$@50",
"$@48", "client_class", "$@49", "required_client_classes", "$@50",
"reservation_mode", "$@51", "hr_mode", "id", "rapid_commit",
"shared_networks", "$@52", "shared_networks_content",
"shared_networks_list", "shared_network", "$@53",
......@@ -4300,7 +4301,7 @@ namespace isc { namespace dhcp {
"$@86", "client_classes", "$@87", "client_classes_list",
"client_class_entry", "$@88", "client_class_params",
"not_empty_client_class_params", "client_class_param",
"client_class_name", "client_class_test", "$@89", "eval_on_demand",
"client_class_name", "client_class_test", "$@89", "only_if_required",
"dhcp4o6_port", "control_socket", "$@90", "control_socket_params",
"control_socket_param", "control_socket_type", "$@91",
"control_socket_name", "$@92", "dhcp_ddns", "$@93", "sub_dhcp_ddns",
......@@ -4415,7 +4416,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp4_parser.yy" // lalr1.cc:1167
} } // isc::dhcp
#line 4419 "dhcp4_parser.cc" // lalr1.cc:1167
#line 4420 "dhcp4_parser.cc" // lalr1.cc:1167
#line 1959 "dhcp4_parser.yy" // lalr1.cc:1168
......
src/bin/dhcp4/dhcp4_parser.h
View file @ 8819c56a
......@@ -421,9 +421,9 @@ namespace isc { namespace dhcp {
TOKEN_ALL = 328,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 329,
TOKEN_CLIENT_CLASSES = 330,
TOKEN_EVAL_CLIENT_CLASSES = 331,
TOKEN_REQUIRED_CLIENT_CLASSES = 331,
TOKEN_TEST = 332,
TOKEN_EVAL_ON_DEMAND = 333,
TOKEN_ONLY_IF_REQUIRED = 333,
TOKEN_CLIENT_CLASS = 334,
TOKEN_RESERVATIONS = 335,
TOKEN_DUID = 336,
......@@ -909,7 +909,7 @@ namespace isc { namespace dhcp {
static inline
symbol_type
make_EVAL_CLIENT_CLASSES (const location_type& l);
make_REQUIRED_CLIENT_CLASSES (const location_type& l);
static inline
symbol_type
......@@ -917,7 +917,7 @@ namespace isc { namespace dhcp {
static inline
symbol_type
make_EVAL_ON_DEMAND (const location_type& l);
make_ONLY_IF_REQUIRED (const location_type& l);
static inline
symbol_type
......@@ -2257,9 +2257,9 @@ namespace isc { namespace dhcp {
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_EVAL_CLIENT_CLASSES (const location_type& l)
Dhcp4Parser::make_REQUIRED_CLIENT_CLASSES (const location_type& l)
{
return symbol_type (token::TOKEN_EVAL_CLIENT_CLASSES, l);
return symbol_type (token::TOKEN_REQUIRED_CLIENT_CLASSES, l);
}
Dhcp4Parser::symbol_type
......@@ -2269,9 +2269,9 @@ namespace isc { namespace dhcp {
}
Dhcp4Parser::symbol_type
Dhcp4Parser::make_EVAL_ON_DEMAND (const location_type& l)
Dhcp4Parser::make_ONLY_IF_REQUIRED (const location_type& l)
{
return symbol_type (token::TOKEN_EVAL_ON_DEMAND, l);
return symbol_type (token::TOKEN_ONLY_IF_REQUIRED, l);
}
Dhcp4Parser::symbol_type
......
src/bin/dhcp4/location.hh
View file @ 8819c56a
// Generated 201804052214
// Generated 201804052217
// A Bison parser, made by GNU Bison 3.0.4.
// Locations for Bison parsers in C++
......
src/bin/dhcp4/position.hh
View file @ 8819c56a
// Generated 201804052214
// Generated 201804052217
// A Bison parser, made by GNU Bison 3.0.4.
// Positions for Bison parsers in C++
......
src/bin/dhcp4/stack.hh
View file @ 8819c56a
// Generated 201804052214
// Generated 201804052217
// A Bison parser, made by GNU Bison 3.0.4.
// Stack handling for Bison parsers in C++
......
src/bin/dhcp6/dhcp6_lexer.cc
View file @ 8819c56a
This diff is collapsed.
src/bin/dhcp6/dhcp6_parser.cc
View file @ 8819c56a
......@@ -1765,7 +1765,7 @@ namespace isc { namespace dhcp {
#line 949 "dhcp6_parser.yy" // lalr1.cc:859
{
ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
ctx.stack_.back()->set("eval-client-classes", c);
ctx.stack_.back()->set("required-client-classes", c);
ctx.stack_.push_back(c);
ctx.enter(ctx.NO_KEYWORD);
}
......@@ -2648,7 +2648,7 @@ namespace isc { namespace dhcp {
#line 1618 "dhcp6_parser.yy" // lalr1.cc:859
{
ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
ctx.stack_.back()->set("eval-on-demand", b);
ctx.stack_.back()->set("only-if-required", b);
}
#line 2654 "dhcp6_parser.cc" // lalr1.cc:859
break;
......@@ -4299,8 +4299,8 @@ namespace isc { namespace dhcp {
"\"id\"", "\"rapid-commit\"", "\"reservation-mode\"", "\"disabled\"",
"\"out-of-pool\"", "\"all\"", "\"shared-networks\"", "\"mac-sources\"",
"\"relay-supplied-options\"", "\"host-reservation-identifiers\"",
"\"client-classes\"", "\"eval-client-classes\"", "\"test\"",
"\"eval-on-demand\"", "\"client-class\"", "\"reservations\"",
"\"client-classes\"", "\"required-client-classes\"", "\"test\"",
"\"only-if-required\"", "\"client-class\"", "\"reservations\"",
"\"ip-addresses\"", "\"prefixes\"", "\"duid\"", "\"hw-address\"",
"\"hostname\"", "\"flex-id\"", "\"relay\"", "\"ip-address\"",
"\"hooks-libraries\"", "\"library\"", "\"parameters\"",
......@@ -4356,7 +4356,7 @@ namespace isc { namespace dhcp {
"subnet6_list_content", "not_empty_subnet6_list", "subnet6", "$@42",
"sub_subnet6", "$@43", "subnet6_params", "subnet6_param", "subnet",
"$@44", "interface", "$@45", "interface_id", "$@46", "client_class",
"$@47", "eval_client_classes", "$@48", "reservation_mode", "$@49",
"$@47", "required_client_classes", "$@48", "reservation_mode", "$@49",
"hr_mode", "id", "rapid_commit", "shared_networks", "$@50",
"shared_networks_content", "shared_networks_list", "shared_network",
"$@51", "shared_network_params", "shared_network_param",
......@@ -4388,7 +4388,7 @@ namespace isc { namespace dhcp {
"relay_map", "$@85", "client_classes", "$@86", "client_classes_list",
"client_class_entry", "$@87", "client_class_params",
"not_empty_client_class_params", "client_class_param",
"client_class_name", "client_class_test", "$@88", "eval_on_demand",
"client_class_name", "client_class_test", "$@88", "only_if_required",
"server_id", "$@89", "server_id_params", "server_id_param",
"server_id_type", "$@90", "duid_type", "htype", "identifier", "$@91",
"time", "enterprise_id", "dhcp4o6_port", "control_socket", "$@92",
......
src/bin/dhcp6/dhcp6_parser.h
View file @ 8819c56a
......@@ -415,9 +415,9 @@ namespace isc { namespace dhcp {
TOKEN_RELAY_SUPPLIED_OPTIONS = 323,
TOKEN_HOST_RESERVATION_IDENTIFIERS = 324,
TOKEN_CLIENT_CLASSES = 325,
TOKEN_EVAL_CLIENT_CLASSES = 326,
TOKEN_REQUIRED_CLIENT_CLASSES = 326,
TOKEN_TEST = 327,
TOKEN_EVAL_ON_DEMAND = 328,
TOKEN_ONLY_IF_REQUIRED = 328,
TOKEN_CLIENT_CLASS = 329,
TOKEN_RESERVATIONS = 330,
TOKEN_IP_ADDRESSES = 331,
......@@ -893,7 +893,7 @@ namespace isc { namespace dhcp {
static inline
symbol_type
make_EVAL_CLIENT_CLASSES (const location_type& l);
make_REQUIRED_CLIENT_CLASSES (const location_type& l);
static inline
symbol_type
......@@ -901,7 +901,7 @@ namespace isc { namespace dhcp {
static inline
symbol_type
make_EVAL_ON_DEMAND (const location_type& l);
make_ONLY_IF_REQUIRED (const location_type& l);
static inline
symbol_type
......@@ -2248,9 +2248,9 @@ namespace isc { namespace dhcp {
}
Dhcp6Parser::symbol_type
Dhcp6Parser::make_EVAL_CLIENT_CLASSES (const location_type& l)
Dhcp6Parser::make_REQUIRED_CLIENT_CLASSES (const location_type& l)
{
return symbol_type (token::TOKEN_EVAL_CLIENT_CLASSES, l);
return symbol_type (token::TOKEN_REQUIRED_CLIENT_CLASSES, l);
}
Dhcp6Parser::symbol_type
......@@ -2260,9 +2260,9 @@ namespace isc { namespace dhcp {
}
Dhcp6Parser::symbol_type
Dhcp6Parser::make_EVAL_ON_DEMAND (const location_type& l)
Dhcp6Parser::make_ONLY_IF_REQUIRED (const location_type& l)
{
return symbol_type (token::TOKEN_EVAL_ON_DEMAND, l);
return symbol_type (token::TOKEN_ONLY_IF_REQUIRED, l);
}
Dhcp6Parser::symbol_type
......
src/bin/dhcp6/location.hh
View file @ 8819c56a
// Generated 201804052214
// Generated 201804052218
// A Bison parser, made by GNU Bison 3.0.4.
// Locations for Bison parsers in C++
......
src/bin/dhcp6/position.hh
View file @ 8819c56a
// Generated 201804052214
// Generated 201804052218
// A Bison parser, made by GNU Bison 3.0.4.
// Positions for Bison parsers in C++
......
src/bin/dhcp6/stack.hh
View file @ 8819c56a
// Generated 201804052214
// Generated 201804052218
// A Bison parser, made by GNU Bison 3.0.4.
// Stack handling for Bison parsers in C++
......
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