[master] regen parsers

src/bin/dhcp4/dhcp4_parser.h

@@ -419,66 +419,70 @@ namespace isc { namespace dhcp {
         TOKEN_CIRCUIT_ID = 328,
         TOKEN_CLIENT_ID = 329,
         TOKEN_HOSTNAME = 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
+        TOKEN_FLEX_ID = 331,
+        TOKEN_RELAY = 332,
+        TOKEN_IP_ADDRESS = 333,
+        TOKEN_HOOKS_LIBRARIES = 334,
+        TOKEN_LIBRARY = 335,
+        TOKEN_PARAMETERS = 336,
+        TOKEN_EXPIRED_LEASES_PROCESSING = 337,
+        TOKEN_RECLAIM_TIMER_WAIT_TIME = 338,
+        TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 339,
+        TOKEN_HOLD_RECLAIMED_TIME = 340,
+        TOKEN_MAX_RECLAIM_LEASES = 341,
+        TOKEN_MAX_RECLAIM_TIME = 342,
+        TOKEN_UNWARNED_RECLAIM_CYCLES = 343,
+        TOKEN_DHCP4O6_PORT = 344,
+        TOKEN_CONTROL_SOCKET = 345,
+        TOKEN_SOCKET_TYPE = 346,
+        TOKEN_SOCKET_NAME = 347,
+        TOKEN_DHCP_DDNS = 348,
+        TOKEN_ENABLE_UPDATES = 349,
+        TOKEN_QUALIFYING_SUFFIX = 350,
+        TOKEN_SERVER_IP = 351,
+        TOKEN_SERVER_PORT = 352,
+        TOKEN_SENDER_IP = 353,
+        TOKEN_SENDER_PORT = 354,
+        TOKEN_MAX_QUEUE_SIZE = 355,
+        TOKEN_NCR_PROTOCOL = 356,
+        TOKEN_NCR_FORMAT = 357,
+        TOKEN_ALWAYS_INCLUDE_FQDN = 358,
+        TOKEN_OVERRIDE_NO_UPDATE = 359,
+        TOKEN_OVERRIDE_CLIENT_UPDATE = 360,
+        TOKEN_REPLACE_CLIENT_NAME = 361,
+        TOKEN_GENERATED_PREFIX = 362,
+        TOKEN_TCP = 363,
+        TOKEN_JSON = 364,
+        TOKEN_WHEN_PRESENT = 365,
+        TOKEN_NEVER = 366,
+        TOKEN_ALWAYS = 367,
+        TOKEN_WHEN_NOT_PRESENT = 368,
+        TOKEN_LOGGING = 369,
+        TOKEN_LOGGERS = 370,
+        TOKEN_OUTPUT_OPTIONS = 371,
+        TOKEN_OUTPUT = 372,
+        TOKEN_DEBUGLEVEL = 373,
+        TOKEN_SEVERITY = 374,
+        TOKEN_FLUSH = 375,
+        TOKEN_MAXSIZE = 376,
+        TOKEN_MAXVER = 377,
+        TOKEN_DHCP6 = 378,
+        TOKEN_DHCPDDNS = 379,
+        TOKEN_TOPLEVEL_JSON = 380,
+        TOKEN_TOPLEVEL_DHCP4 = 381,
+        TOKEN_SUB_DHCP4 = 382,
+        TOKEN_SUB_INTERFACES4 = 383,
+        TOKEN_SUB_SUBNET4 = 384,
+        TOKEN_SUB_POOL4 = 385,
+        TOKEN_SUB_RESERVATION = 386,
+        TOKEN_SUB_OPTION_DEF = 387,
+        TOKEN_SUB_OPTION_DATA = 388,
+        TOKEN_SUB_HOOKS_LIBRARY = 389,
+        TOKEN_SUB_DHCP_DDNS = 390,
+        TOKEN_STRING = 391,
+        TOKEN_INTEGER = 392,
+        TOKEN_FLOAT = 393,
+        TOKEN_BOOLEAN = 394
       };
     };
 
@@ -891,6 +895,10 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_FLEX_ID (const location_type& l);
+
+    static inline
+    symbol_type
     make_RELAY (const location_type& l);
 
     static inline
@@ -1063,6 +1071,18 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_FLUSH (const location_type& l);
+
+    static inline
+    symbol_type
+    make_MAXSIZE (const location_type& l);
+
+    static inline
+    symbol_type
+    make_MAXVER (const location_type& l);
+
+    static inline
+    symbol_type
     make_DHCP6 (const location_type& l);
 
     static inline
@@ -1334,12 +1354,12 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 733,     ///< Last index in yytable_.
-      yynnts_ = 307,  ///< Number of nonterminal symbols.
+      yylast_ = 740,     ///< Last index in yytable_.
+      yynnts_ = 314,  ///< Number of nonterminal symbols.
       yyfinal_ = 24, ///< Termination state number.
       yyterror_ = 1,
       yyerrcode_ = 256,
-      yyntokens_ = 136  ///< Number of tokens.
+      yyntokens_ = 140  ///< Number of tokens.
     };
 
 
@@ -1395,9 +1415,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
+     135,   136,   137,   138,   139
     };
-    const unsigned int user_token_number_max_ = 390;
+    const unsigned int user_token_number_max_ = 394;
     const token_number_type undef_token_ = 2;
 
     if (static_cast<int>(t) <= yyeof_)
@@ -1430,28 +1450,28 @@ namespace isc { namespace dhcp {
   {
       switch (other.type_get ())
     {
-      case 149: // value
-      case 153: // map_value
-      case 191: // socket_type
-      case 201: // db_type
-      case 406: // ncr_protocol_value
-      case 414: // replace_client_name_value
+      case 153: // value
+      case 157: // map_value
+      case 195: // socket_type
+      case 205: // db_type
+      case 413: // ncr_protocol_value
+      case 421: // replace_client_name_value
         value.copy< ElementPtr > (other.value);
         break;
 
-      case 135: // "boolean"
+      case 139: // "boolean"
         value.copy< bool > (other.value);
         break;
 
-      case 134: // "floating point"
+      case 138: // "floating point"
         value.copy< double > (other.value);
         break;
 
-      case 133: // "integer"
+      case 137: // "integer"
         value.copy< int64_t > (other.value);
         break;
 
-      case 132: // "constant string"
+      case 136: // "constant string"
         value.copy< std::string > (other.value);
         break;
 
@@ -1472,28 +1492,28 @@ namespace isc { namespace dhcp {
     (void) v;
       switch (this->type_get ())
     {
-      case 149: // value
-      case 153: // map_value
-      case 191: // socket_type
-      case 201: // db_type
-      case 406: // ncr_protocol_value
-      case 414: // replace_client_name_value
+      case 153: // value
+      case 157: // map_value
+      case 195: // socket_type
+      case 205: // db_type
+      case 413: // ncr_protocol_value
+      case 421: // replace_client_name_value
         value.copy< ElementPtr > (v);
         break;
 
-      case 135: // "boolean"
+      case 139: // "boolean"
         value.copy< bool > (v);
         break;
 
-      case 134: // "floating point"
+      case 138: // "floating point"
         value.copy< double > (v);
         break;
 
-      case 133: // "integer"
+      case 137: // "integer"
         value.copy< int64_t > (v);
         break;
 
-      case 132: // "constant string"
+      case 136: // "constant string"
         value.copy< std::string > (v);
         break;
 
@@ -1573,28 +1593,28 @@ namespace isc { namespace dhcp {
     // Type destructor.
     switch (yytype)
     {
-      case 149: // value
-      case 153: // map_value
-      case 191: // socket_type
-      case 201: // db_type
-      case 406: // ncr_protocol_value
-      case 414: // replace_client_name_value
+      case 153: // value
+      case 157: // map_value
+      case 195: // socket_type
+      case 205: // db_type
+      case 413: // ncr_protocol_value
+      case 421: // replace_client_name_value
         value.template destroy< ElementPtr > ();
         break;
 
-      case 135: // "boolean"
+      case 139: // "boolean"
         value.template destroy< bool > ();
         break;
 
-      case 134: // "floating point"
+      case 138: // "floating point"
         value.template destroy< double > ();
         break;
 
-      case 133: // "integer"
+      case 137: // "integer"
         value.template destroy< int64_t > ();
         break;
 
-      case 132: // "constant string"
+      case 136: // "constant string"
         value.template destroy< std::string > ();
         break;
 
@@ -1621,28 +1641,28 @@ namespace isc { namespace dhcp {
     super_type::move(s);
       switch (this->type_get ())
     {
-      case 149: // value
-      case 153: // map_value
-      case 191: // socket_type
-      case 201: // db_type
-      case 406: // ncr_protocol_value
-      case 414: // replace_client_name_value
+      case 153: // value
+      case 157: // map_value
+      case 195: // socket_type
+      case 205: // db_type
+      case 413: // ncr_protocol_value
+      case 421: // replace_client_name_value
         value.move< ElementPtr > (s.value);
         break;
 
-      case 135: // "boolean"
+      case 139: // "boolean"
         value.move< bool > (s.value);
         break;
 
-      case 134: // "floating point"
+      case 138: // "floating point"
         value.move< double > (s.value);
         break;
 
-      case 133: // "integer"
+      case 137: // "integer"
         value.move< int64_t > (s.value);
         break;
 
-      case 132: // "constant string"
+      case 136: // "constant string"
         value.move< std::string > (s.value);
         break;
 
@@ -1714,7 +1734,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,   390
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394
     };
     return static_cast<token_type> (yytoken_number_[type]);
   }
@@ -2164,6 +2184,12 @@ namespace isc { namespace dhcp {
   }
 
   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)
   {
     return symbol_type (token::TOKEN_RELAY, l);
@@ -2422,6 +2448,24 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_FLUSH (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_FLUSH, l);
+  }
+
+  Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_MAXSIZE (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_MAXSIZE, l);
+  }
+
+  Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_MAXVER (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_MAXVER, l);
+  }
+
+  Dhcp4Parser::symbol_type
   Dhcp4Parser::make_DHCP6 (const location_type& l)
   {
     return symbol_type (token::TOKEN_DHCP6, l);
@@ -2526,7 +2570,7 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp4_parser.yy" // lalr1.cc:377
 } } // isc::dhcp
-#line 2530 "dhcp4_parser.h" // lalr1.cc:377
+#line 2574 "dhcp4_parser.h" // lalr1.cc:377
 
 
 

src/bin/dhcp4/location.hh

@@ -1,4 +1,4 @@
-// Generated 201703162308
+// Generated 201707051253
 // 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 201703162308
+// Generated 201707051253
 // 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 201703162308
+// Generated 201707051253
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++

src/bin/dhcp6/dhcp6_parser.h

@@ -417,76 +417,80 @@ namespace isc { namespace dhcp {
         TOKEN_DUID = 326,
         TOKEN_HW_ADDRESS = 327,
         TOKEN_HOSTNAME = 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
+        TOKEN_FLEX_ID = 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_SERVER_ID = 342,
+        TOKEN_LLT = 343,
+        TOKEN_EN = 344,
+        TOKEN_LL = 345,
+        TOKEN_IDENTIFIER = 346,
+        TOKEN_HTYPE = 347,
+        TOKEN_TIME = 348,
+        TOKEN_ENTERPRISE_ID = 349,
+        TOKEN_DHCP4O6_PORT = 350,
+        TOKEN_CONTROL_SOCKET = 351,
+        TOKEN_SOCKET_TYPE = 352,
+        TOKEN_SOCKET_NAME = 353,
+        TOKEN_DHCP_DDNS = 354,
+        TOKEN_ENABLE_UPDATES = 355,
+        TOKEN_QUALIFYING_SUFFIX = 356,
+        TOKEN_SERVER_IP = 357,
+        TOKEN_SERVER_PORT = 358,
+        TOKEN_SENDER_IP = 359,
+        TOKEN_SENDER_PORT = 360,
+        TOKEN_MAX_QUEUE_SIZE = 361,
+        TOKEN_NCR_PROTOCOL = 362,
+        TOKEN_NCR_FORMAT = 363,
+        TOKEN_ALWAYS_INCLUDE_FQDN = 364,
+        TOKEN_OVERRIDE_NO_UPDATE = 365,
+        TOKEN_OVERRIDE_CLIENT_UPDATE = 366,
+        TOKEN_REPLACE_CLIENT_NAME = 367,
+        TOKEN_GENERATED_PREFIX = 368,
+        TOKEN_UDP = 369,
+        TOKEN_TCP = 370,
+        TOKEN_JSON = 371,
+        TOKEN_WHEN_PRESENT = 372,
+        TOKEN_NEVER = 373,
+        TOKEN_ALWAYS = 374,
+        TOKEN_WHEN_NOT_PRESENT = 375,
+        TOKEN_LOGGING = 376,
+        TOKEN_LOGGERS = 377,
+        TOKEN_OUTPUT_OPTIONS = 378,
+        TOKEN_OUTPUT = 379,
+        TOKEN_DEBUGLEVEL = 380,
+        TOKEN_SEVERITY = 381,
+        TOKEN_FLUSH = 382,
+        TOKEN_MAXSIZE = 383,
+        TOKEN_MAXVER = 384,
+        TOKEN_DHCP4 = 385,
+        TOKEN_DHCPDDNS = 386,
+        TOKEN_TOPLEVEL_JSON = 387,
+        TOKEN_TOPLEVEL_DHCP6 = 388,
+        TOKEN_SUB_DHCP6 = 389,
+        TOKEN_SUB_INTERFACES6 = 390,
+        TOKEN_SUB_SUBNET6 = 391,
+        TOKEN_SUB_POOL6 = 392,
+        TOKEN_SUB_PD_POOL = 393,
+        TOKEN_SUB_RESERVATION = 394,
+        TOKEN_SUB_OPTION_DEF = 395,
+        TOKEN_SUB_OPTION_DATA = 396,
+        TOKEN_SUB_HOOKS_LIBRARY = 397,
+        TOKEN_SUB_DHCP_DDNS = 398,
+        TOKEN_STRING = 399,
+        TOKEN_INTEGER = 400,
+        TOKEN_FLOAT = 401,
+        TOKEN_BOOLEAN = 402
       };
     };
 
@@ -891,6 +895,10 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_FLEX_ID (const location_type& l);
+
+    static inline
+    symbol_type
     make_RELAY (const location_type& l);
 
     static inline
@@ -1099,6 +1107,18 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_FLUSH (const location_type& l);
+
+    static inline
+    symbol_type
+    make_MAXSIZE (const location_type& l);
+
+    static inline
+    symbol_type
+    make_MAXVER (const location_type& l);
+
+    static inline
+    symbol_type
     make_DHCP4 (const location_type& l);
 
     static inline
@@ -1374,12 +1394,12 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 785,     ///< Last index in yytable_.
-      yynnts_ = 324,  ///< Number of nonterminal symbols.
+      yylast_ = 792,     ///< Last index in yytable_.
+      yynnts_ = 331,  ///< Number of nonterminal symbols.
       yyfinal_ = 26, ///< Termination state number.
       yyterror_ = 1,
       yyerrcode_ = 256,
-      yyntokens_ = 144  ///< Number of tokens.
+      yyntokens_ = 148  ///< Number of tokens.
     };
 
 
@@ -1435,9 +1455,10 @@ 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,   143
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147
     };
-    const unsigned int user_token_number_max_ = 398;
+    const unsigned int user_token_number_max_ = 402;
     const token_number_type undef_token_ = 2;
 
     if (static_cast<int>(t) <= yyeof_)
@@ -1470,28 +1491,28 @@ namespace isc { namespace dhcp {
   {
       switch (other.type_get ())
     {
-      case 158: // value
-      case 162: // map_value
-      case 206: // db_type
-      case 398: // duid_type
-      case 431: // ncr_protocol_value
-      case 439: // replace_client_name_value
+      case 162: // value
+      case 166: // map_value
+      case 210: // db_type
+      case 405: // duid_type
+      case 438: // ncr_protocol_value
+      case 446: // replace_client_name_value
         value.copy< ElementPtr > (other.value);
         break;
 
-      case 143: // "boolean"
+      case 147: // "boolean"
         value.copy< bool > (other.value);
         break;
 
-      case 142: // "floating point"
+      case 146: // "floating point"
         value.copy< double > (other.value);
         break;
 
-      case 141: // "integer"
+      case 145: // "integer"
         value.copy< int64_t > (other.value);
         break;
 
-      case 140: // "constant string"
+      case 144: // "constant string"
         value.copy< std::string > (other.value);
         break;
 
@@ -1512,28 +1533,28 @@ namespace isc { namespace dhcp {
     (void) v;
       switch (this->type_get ())
     {
-      case 158: // value
-      case 162: // map_value
-      case 206: // db_type
-      case 398: // duid_type
-      case 431: // ncr_protocol_value
-      case 439: // replace_client_name_value
+      case 162: // value
+      case 166: // map_value
+      case 210: // db_type
+      case 405: // duid_type
+      case 438: // ncr_protocol_value
+      case 446: // replace_client_name_value
         value.copy< ElementPtr > (v);
         break;
 
-      case 143: // "boolean"
+      case 147: // "boolean"
         value.copy< bool > (v);
         break;
 
-      case 142: // "floating point"
+      case 146: // "floating point"
         value.copy< double > (v);
         break;
 
-      case 141: // "integer"
+      case 145: // "integer"
         value.copy< int64_t > (v);
         break;
 
-      case 140: // "constant string"
+      case 144: // "constant string"
         value.copy< std::string > (v);
         break;
 
@@ -1613,28 +1634,28 @@ namespace isc { namespace dhcp {
     // Type destructor.
     switch (yytype)
     {
-      case 158: // value
-      case 162: // map_value
-      case 206: // db_type
-      case 398: // duid_type
-      case 431: // ncr_protocol_value
-      case 439: // replace_client_name_value
+      case 162: // value
+      case 166: // map_value
+      case 210: // db_type
+      case 405: // duid_type
+      case 438: // ncr_protocol_value
+      case 446: // replace_client_name_value
         value.template destroy< ElementPtr > ();
         break;
 
-      case 143: // "boolean"
+      case 147: // "boolean"
         value.template destroy< bool > ();
         break;
 
-      case 142: // "floating point"
+      case 146: // "floating point"
         value.template destroy< double > ();
         break;
 
-      case 141: // "integer"
+      case 145: // "integer"
         value.template destroy< int64_t > ();
         break;
 
-      case 140: // "constant string"
+      case 144: // "constant string"
         value.template destroy< std::string > ();
         break;
 
@@ -1661,28 +1682,28 @@ namespace isc { namespace dhcp {
     super_type::move(s);
       switch (this->type_get ())
     {
-      case 158: // value
-      case 162: // map_value
-      case 206: // db_type
-      case 398: // duid_type
-      case 431: // ncr_protocol_value
-      case 439: // replace_client_name_value
+      case 162: // value
+      case 166: // map_value
+      case 210: // db_type
+      case 405: // duid_type
+      case 438: // ncr_protocol_value
+      case 446: // replace_client_name_value
         value.move< ElementPtr > (s.value);
         break;
 
-      case 143: // "boolean"
+      case 147: // "boolean"
         value.move< bool > (s.value);
         break;
 
-      case 142: // "floating point"
+      case 146: // "floating point"
         value.move< double > (s.value);
         break;
 
-      case 141: // "integer"
+      case 145: // "integer"
         value.move< int64_t > (s.value);
         break;
 
-      case 140: // "constant string"
+      case 144: // "constant string"
         value.move< std::string > (s.value);
         break;
 
@@ -1755,7 +1776,7 @@ namespace isc { namespace dhcp {
      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,   390,   391,   392,   393,   394,
-     395,   396,   397,   398
+     395,   396,   397,   398,   399,   400,   401,   402
     };
     return static_cast<token_type> (yytoken_number_[type]);
   }
@@ -2193,6 +2214,12 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_FLEX_ID (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_FLEX_ID, l);
+  }
+
+  Dhcp6Parser::symbol_type
   Dhcp6Parser::make_RELAY (const location_type& l)
   {
     return symbol_type (token::TOKEN_RELAY, l);
@@ -2505,6 +2532,24 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_FLUSH (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_FLUSH, l);
+  }
+
+  Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_MAXSIZE (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_MAXSIZE, l);
+  }
+
+  Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_MAXVER (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_MAXVER, l);
+  }
+
+  Dhcp6Parser::symbol_type
   Dhcp6Parser::make_DHCP4 (const location_type& l)
   {
     return symbol_type (token::TOKEN_DHCP4, l);
@@ -2615,7 +2660,7 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp6_parser.yy" // lalr1.cc:377
 } } // isc::dhcp
-#line 2619 "dhcp6_parser.h" // lalr1.cc:377
+#line 2664 "dhcp6_parser.h" // lalr1.cc:377
 
 
 

src/bin/dhcp6/location.hh

@@ -1,4 +1,4 @@
-// Generated 201703162308
+// Generated 201707051254
 // 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 201703162308
+// Generated 201707051254
 // 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 201703162308
+// Generated 201707051254
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++