[trac5241] regen

src/bin/dhcp4/dhcp4_parser.cc

@@ -2078,7 +2078,7 @@ namespace isc { namespace dhcp {
 #line 1158 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
-    ctx.stack_.back()->set("persistent", persist);
+    ctx.stack_.back()->set("always-send", persist);
 }
 #line 2084 "dhcp4_parser.cc" // lalr1.cc:859
     break;
@@ -3969,7 +3969,7 @@ namespace isc { namespace dhcp {
   "\"renew-timer\"", "\"rebind-timer\"", "\"decline-probation-period\"",
   "\"subnet4\"", "\"4o6-interface\"", "\"4o6-interface-id\"",
   "\"4o6-subnet\"", "\"option-def\"", "\"option-data\"", "\"name\"",
-  "\"data\"", "\"code\"", "\"space\"", "\"csv-format\"", "\"persistent\"",
+  "\"data\"", "\"code\"", "\"space\"", "\"csv-format\"", "\"always-send\"",
   "\"record-types\"", "\"encapsulate\"", "\"array\"", "\"pools\"",
   "\"pool\"", "\"user-context\"", "\"subnet\"", "\"interface\"",
   "\"interface-id\"", "\"id\"", "\"rapid-commit\"", "\"reservation-mode\"",
@@ -4041,7 +4041,7 @@ namespace isc { namespace dhcp {
   "option_data_params", "not_empty_option_data_params",
   "option_data_param", "option_data_name", "option_data_data", "$@59",
   "option_data_code", "option_data_space", "option_data_csv_format",
-  "option_data_persistent", "pools_list", "$@60", "pools_list_content",
+  "option_data_always_send", "pools_list", "$@60", "pools_list_content",
   "not_empty_pools_list", "pool_list_entry", "$@61", "sub_pool4", "$@62",
   "pool_params", "pool_param", "pool_entry", "$@63", "user_context",
   "$@64", "reservations", "$@65", "reservations_list",

src/bin/dhcp4/dhcp4_parser.h

@@ -40,7 +40,7 @@
 #ifndef YY_PARSER4_DHCP4_PARSER_H_INCLUDED
 # define YY_PARSER4_DHCP4_PARSER_H_INCLUDED
 // //                    "%code requires" blocks.
-#line 17 "dhcp4_parser.yy" // lalr1.cc:392
+#line 17 "dhcp4_parser.yy" // lalr1.cc:377
 
 #include <string>
 #include <cc/data.h>
@@ -52,7 +52,7 @@ using namespace isc::dhcp;
 using namespace isc::data;
 using namespace std;
 
-#line 56 "dhcp4_parser.h" // lalr1.cc:392
+#line 56 "dhcp4_parser.h" // lalr1.cc:377
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -135,9 +135,9 @@ using namespace std;
 # endif /* ! defined YYDEBUG */
 #endif  /* ! defined PARSER4_DEBUG */
 
-#line 14 "dhcp4_parser.yy" // lalr1.cc:392
+#line 14 "dhcp4_parser.yy" // lalr1.cc:377
 namespace isc { namespace dhcp {
-#line 141 "dhcp4_parser.h" // lalr1.cc:392
+#line 141 "dhcp4_parser.h" // lalr1.cc:377
 
 
 
@@ -398,7 +398,7 @@ namespace isc { namespace dhcp {
         TOKEN_CODE = 306,
         TOKEN_SPACE = 307,
         TOKEN_CSV_FORMAT = 308,
-        TOKEN_PERSISTENT = 309,
+        TOKEN_ALWAYS_SEND = 309,
         TOKEN_RECORD_TYPES = 310,
         TOKEN_ENCAPSULATE = 311,
         TOKEN_ARRAY = 312,
@@ -812,7 +812,7 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
-    make_PERSISTENT (const location_type& l);
+    make_ALWAYS_SEND (const location_type& l);
 
     static inline
     symbol_type
@@ -2078,9 +2078,9 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_PERSISTENT (const location_type& l)
+  Dhcp4Parser::make_ALWAYS_SEND (const location_type& l)
   {
-    return symbol_type (token::TOKEN_PERSISTENT, l);
+    return symbol_type (token::TOKEN_ALWAYS_SEND, l);
   }
 
   Dhcp4Parser::symbol_type
@@ -2618,9 +2618,9 @@ namespace isc { namespace dhcp {
   }
 
 
-#line 14 "dhcp4_parser.yy" // lalr1.cc:392
+#line 14 "dhcp4_parser.yy" // lalr1.cc:377
 } } // isc::dhcp
-#line 2624 "dhcp4_parser.h" // lalr1.cc:392
+#line 2624 "dhcp4_parser.h" // lalr1.cc:377
 
 
 

src/bin/dhcp4/location.hh

@@ -1,4 +1,4 @@
-// Generated 201707061111
+// Generated 201707281415
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

src/bin/dhcp4/position.hh

@@ -1,4 +1,4 @@
-// Generated 201707061111
+// Generated 201707281415
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

src/bin/dhcp4/stack.hh

@@ -1,4 +1,4 @@
-// Generated 201707061111
+// Generated 201707281415
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++

src/bin/dhcp6/dhcp6_parser.cc

@@ -2023,7 +2023,7 @@ namespace isc { namespace dhcp {
 #line 1146 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
-    ctx.stack_.back()->set("persistent", persist);
+    ctx.stack_.back()->set("always-send", persist);
 }
 #line 2029 "dhcp6_parser.cc" // lalr1.cc:859
     break;
@@ -4093,7 +4093,7 @@ namespace isc { namespace dhcp {
   "\"keyspace\"", "\"preferred-lifetime\"", "\"valid-lifetime\"",
   "\"renew-timer\"", "\"rebind-timer\"", "\"decline-probation-period\"",
   "\"subnet6\"", "\"option-def\"", "\"option-data\"", "\"name\"",
-  "\"data\"", "\"code\"", "\"space\"", "\"csv-format\"", "\"persistent\"",
+  "\"data\"", "\"code\"", "\"space\"", "\"csv-format\"", "\"always-send\"",
   "\"record-types\"", "\"encapsulate\"", "\"array\"", "\"pools\"",
   "\"pool\"", "\"pd-pools\"", "\"prefix\"", "\"prefix-len\"",
   "\"excluded-prefix\"", "\"excluded-prefix-len\"", "\"delegated-len\"",
@@ -4170,7 +4170,7 @@ namespace isc { namespace dhcp {
   "option_data_params", "not_empty_option_data_params",
   "option_data_param", "option_data_name", "option_data_data", "$@58",
   "option_data_code", "option_data_space", "option_data_csv_format",
-  "option_data_persistent", "pools_list", "$@59", "pools_list_content",
+  "option_data_always_send", "pools_list", "$@59", "pools_list_content",
   "not_empty_pools_list", "pool_list_entry", "$@60", "sub_pool6", "$@61",
   "pool_params", "pool_param", "pool_entry", "$@62", "user_context",
   "$@63", "pd_pools_list", "$@64", "pd_pools_list_content",

src/bin/dhcp6/dhcp6_parser.h

@@ -40,7 +40,7 @@
 #ifndef YY_PARSER6_DHCP6_PARSER_H_INCLUDED
 # define YY_PARSER6_DHCP6_PARSER_H_INCLUDED
 // //                    "%code requires" blocks.
-#line 17 "dhcp6_parser.yy" // lalr1.cc:392
+#line 17 "dhcp6_parser.yy" // lalr1.cc:377
 
 #include <string>
 #include <cc/data.h>
@@ -52,7 +52,7 @@ using namespace isc::dhcp;
 using namespace isc::data;
 using namespace std;
 
-#line 56 "dhcp6_parser.h" // lalr1.cc:392
+#line 56 "dhcp6_parser.h" // lalr1.cc:377
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -135,9 +135,9 @@ using namespace std;
 # endif /* ! defined YYDEBUG */
 #endif  /* ! defined PARSER6_DEBUG */
 
-#line 14 "dhcp6_parser.yy" // lalr1.cc:392
+#line 14 "dhcp6_parser.yy" // lalr1.cc:377
 namespace isc { namespace dhcp {
-#line 141 "dhcp6_parser.h" // lalr1.cc:392
+#line 141 "dhcp6_parser.h" // lalr1.cc:377
 
 
 
@@ -388,7 +388,7 @@ namespace isc { namespace dhcp {
         TOKEN_CODE = 296,
         TOKEN_SPACE = 297,
         TOKEN_CSV_FORMAT = 298,
-        TOKEN_PERSISTENT = 299,
+        TOKEN_ALWAYS_SEND = 299,
         TOKEN_RECORD_TYPES = 300,
         TOKEN_ENCAPSULATE = 301,
         TOKEN_ARRAY = 302,
@@ -780,7 +780,7 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
-    make_PERSISTENT (const location_type& l);
+    make_ALWAYS_SEND (const location_type& l);
 
     static inline
     symbol_type
@@ -2060,9 +2060,9 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PERSISTENT (const location_type& l)
+  Dhcp6Parser::make_ALWAYS_SEND (const location_type& l)
   {
-    return symbol_type (token::TOKEN_PERSISTENT, l);
+    return symbol_type (token::TOKEN_ALWAYS_SEND, l);
   }
 
   Dhcp6Parser::symbol_type
@@ -2708,9 +2708,9 @@ namespace isc { namespace dhcp {
   }
 
 
-#line 14 "dhcp6_parser.yy" // lalr1.cc:392
+#line 14 "dhcp6_parser.yy" // lalr1.cc:377
 } } // isc::dhcp
-#line 2714 "dhcp6_parser.h" // lalr1.cc:392
+#line 2714 "dhcp6_parser.h" // lalr1.cc:377
 
 
 

src/bin/dhcp6/location.hh

@@ -1,4 +1,4 @@
-// Generated 201707061112
+// Generated 201707281415
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

src/bin/dhcp6/position.hh

@@ -1,4 +1,4 @@
-// Generated 201707061112
+// Generated 201707281415
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

src/bin/dhcp6/stack.hh

@@ -1,4 +1,4 @@
-// Generated 201707061112
+// Generated 201707281415
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++