[trac5124a] regen flex/bison

src/bin/dhcp4/dhcp4_parser.h

@@ -481,14 +481,15 @@ namespace isc { namespace dhcp {
         TOKEN_SUB_SUBNET4 = 389,
         TOKEN_SUB_POOL4 = 390,
         TOKEN_SUB_RESERVATION = 391,
-        TOKEN_SUB_OPTION_DEF = 392,
-        TOKEN_SUB_OPTION_DATA = 393,
-        TOKEN_SUB_HOOKS_LIBRARY = 394,
-        TOKEN_SUB_DHCP_DDNS = 395,
-        TOKEN_STRING = 396,
-        TOKEN_INTEGER = 397,
-        TOKEN_FLOAT = 398,
-        TOKEN_BOOLEAN = 399
+        TOKEN_SUB_OPTION_DEFS = 392,
+        TOKEN_SUB_OPTION_DEF = 393,
+        TOKEN_SUB_OPTION_DATA = 394,
+        TOKEN_SUB_HOOKS_LIBRARY = 395,
+        TOKEN_SUB_DHCP_DDNS = 396,
+        TOKEN_STRING = 397,
+        TOKEN_INTEGER = 398,
+        TOKEN_FLOAT = 399,
+        TOKEN_BOOLEAN = 400
       };
     };
 
@@ -1145,6 +1146,10 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_SUB_OPTION_DEFS (const location_type& l);
+
+    static inline
+    symbol_type
     make_SUB_OPTION_DEF (const location_type& l);
 
     static inline
@@ -1380,12 +1385,12 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 756,     ///< Last index in yytable_.
-      yynnts_ = 318,  ///< Number of nonterminal symbols.
-      yyfinal_ = 24, ///< Termination state number.
+      yylast_ = 755,     ///< Last index in yytable_.
+      yynnts_ = 321,  ///< Number of nonterminal symbols.
+      yyfinal_ = 26, ///< Termination state number.
       yyterror_ = 1,
       yyerrcode_ = 256,
-      yyntokens_ = 145  ///< Number of tokens.
+      yyntokens_ = 146  ///< Number of tokens.
     };
 
 
@@ -1441,9 +1446,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,   144
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145
     };
-    const unsigned int user_token_number_max_ = 399;
+    const unsigned int user_token_number_max_ = 400;
     const token_number_type undef_token_ = 2;
 
     if (static_cast<int>(t) <= yyeof_)
@@ -1476,29 +1482,29 @@ namespace isc { namespace dhcp {
   {
       switch (other.type_get ())
     {
-      case 158: // value
-      case 162: // map_value
-      case 200: // socket_type
-      case 210: // db_type
-      case 287: // hr_mode
-      case 420: // ncr_protocol_value
-      case 428: // replace_client_name_value
+      case 160: // value
+      case 164: // map_value
+      case 202: // socket_type
+      case 212: // db_type
+      case 289: // hr_mode
+      case 424: // ncr_protocol_value
+      case 432: // replace_client_name_value
         value.copy< ElementPtr > (other.value);
         break;
 
-      case 144: // "boolean"
+      case 145: // "boolean"
         value.copy< bool > (other.value);
         break;
 
-      case 143: // "floating point"
+      case 144: // "floating point"
         value.copy< double > (other.value);
         break;
 
-      case 142: // "integer"
+      case 143: // "integer"
         value.copy< int64_t > (other.value);
         break;
 
-      case 141: // "constant string"
+      case 142: // "constant string"
         value.copy< std::string > (other.value);
         break;
 
@@ -1519,29 +1525,29 @@ namespace isc { namespace dhcp {
     (void) v;
       switch (this->type_get ())
     {
-      case 158: // value
-      case 162: // map_value
-      case 200: // socket_type
-      case 210: // db_type
-      case 287: // hr_mode
-      case 420: // ncr_protocol_value
-      case 428: // replace_client_name_value
+      case 160: // value
+      case 164: // map_value
+      case 202: // socket_type
+      case 212: // db_type
+      case 289: // hr_mode
+      case 424: // ncr_protocol_value
+      case 432: // replace_client_name_value
         value.copy< ElementPtr > (v);
         break;
 
-      case 144: // "boolean"
+      case 145: // "boolean"
         value.copy< bool > (v);
         break;
 
-      case 143: // "floating point"
+      case 144: // "floating point"
         value.copy< double > (v);
         break;
 
-      case 142: // "integer"
+      case 143: // "integer"
         value.copy< int64_t > (v);
         break;
 
-      case 141: // "constant string"
+      case 142: // "constant string"
         value.copy< std::string > (v);
         break;
 
@@ -1621,29 +1627,29 @@ namespace isc { namespace dhcp {
     // Type destructor.
     switch (yytype)
     {
-      case 158: // value
-      case 162: // map_value
-      case 200: // socket_type
-      case 210: // db_type
-      case 287: // hr_mode
-      case 420: // ncr_protocol_value
-      case 428: // replace_client_name_value
+      case 160: // value
+      case 164: // map_value
+      case 202: // socket_type
+      case 212: // db_type
+      case 289: // hr_mode
+      case 424: // ncr_protocol_value
+      case 432: // replace_client_name_value
         value.template destroy< ElementPtr > ();
         break;
 
-      case 144: // "boolean"
+      case 145: // "boolean"
         value.template destroy< bool > ();
         break;
 
-      case 143: // "floating point"
+      case 144: // "floating point"
         value.template destroy< double > ();
         break;
 
-      case 142: // "integer"
+      case 143: // "integer"
         value.template destroy< int64_t > ();
         break;
 
-      case 141: // "constant string"
+      case 142: // "constant string"
         value.template destroy< std::string > ();
         break;
 
@@ -1670,29 +1676,29 @@ namespace isc { namespace dhcp {
     super_type::move(s);
       switch (this->type_get ())
     {
-      case 158: // value
-      case 162: // map_value
-      case 200: // socket_type
-      case 210: // db_type
-      case 287: // hr_mode
-      case 420: // ncr_protocol_value
-      case 428: // replace_client_name_value
+      case 160: // value
+      case 164: // map_value
+      case 202: // socket_type
+      case 212: // db_type
+      case 289: // hr_mode
+      case 424: // ncr_protocol_value
+      case 432: // replace_client_name_value
         value.move< ElementPtr > (s.value);
         break;
 
-      case 144: // "boolean"
+      case 145: // "boolean"
         value.move< bool > (s.value);
         break;
 
-      case 143: // "floating point"
+      case 144: // "floating point"
         value.move< double > (s.value);
         break;
 
-      case 142: // "integer"
+      case 143: // "integer"
         value.move< int64_t > (s.value);
         break;
 
-      case 141: // "constant string"
+      case 142: // "constant string"
         value.move< std::string > (s.value);
         break;
 
@@ -1765,7 +1771,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,   399
+     395,   396,   397,   398,   399,   400
     };
     return static_cast<token_type> (yytoken_number_[type]);
   }
@@ -2581,6 +2587,12 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_SUB_OPTION_DEFS (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_SUB_OPTION_DEFS, l);
+  }
+
+  Dhcp4Parser::symbol_type
   Dhcp4Parser::make_SUB_OPTION_DEF (const location_type& l)
   {
     return symbol_type (token::TOKEN_SUB_OPTION_DEF, l);
@@ -2631,7 +2643,7 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp4_parser.yy" // lalr1.cc:377
 } } // isc::dhcp
-#line 2635 "dhcp4_parser.h" // lalr1.cc:377
+#line 2647 "dhcp4_parser.h" // lalr1.cc:377
 
 
 

src/bin/dhcp4/location.hh

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

src/bin/dhcp6/dhcp6_parser.h

@@ -489,14 +489,15 @@ namespace isc { namespace dhcp {
         TOKEN_SUB_POOL6 = 397,
         TOKEN_SUB_PD_POOL = 398,
         TOKEN_SUB_RESERVATION = 399,
-        TOKEN_SUB_OPTION_DEF = 400,
-        TOKEN_SUB_OPTION_DATA = 401,
-        TOKEN_SUB_HOOKS_LIBRARY = 402,
-        TOKEN_SUB_DHCP_DDNS = 403,
-        TOKEN_STRING = 404,
-        TOKEN_INTEGER = 405,
-        TOKEN_FLOAT = 406,
-        TOKEN_BOOLEAN = 407
+        TOKEN_SUB_OPTION_DEFS = 400,
+        TOKEN_SUB_OPTION_DEF = 401,
+        TOKEN_SUB_OPTION_DATA = 402,
+        TOKEN_SUB_HOOKS_LIBRARY = 403,
+        TOKEN_SUB_DHCP_DDNS = 404,
+        TOKEN_STRING = 405,
+        TOKEN_INTEGER = 406,
+        TOKEN_FLOAT = 407,
+        TOKEN_BOOLEAN = 408
       };
     };
 
@@ -1185,6 +1186,10 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_SUB_OPTION_DEFS (const location_type& l);
+
+    static inline
+    symbol_type
     make_SUB_OPTION_DEF (const location_type& l);
 
     static inline
@@ -1420,12 +1425,12 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 804,     ///< Last index in yytable_.
-      yynnts_ = 335,  ///< Number of nonterminal symbols.
-      yyfinal_ = 26, ///< Termination state number.
+      yylast_ = 803,     ///< Last index in yytable_.
+      yynnts_ = 338,  ///< Number of nonterminal symbols.
+      yyfinal_ = 28, ///< Termination state number.
       yyterror_ = 1,
       yyerrcode_ = 256,
-      yyntokens_ = 153  ///< Number of tokens.
+      yyntokens_ = 154  ///< Number of tokens.
     };
 
 
@@ -1482,9 +1487,9 @@ namespace isc { namespace dhcp {
      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,   144,
-     145,   146,   147,   148,   149,   150,   151,   152
+     145,   146,   147,   148,   149,   150,   151,   152,   153
     };
-    const unsigned int user_token_number_max_ = 407;
+    const unsigned int user_token_number_max_ = 408;
     const token_number_type undef_token_ = 2;
 
     if (static_cast<int>(t) <= yyeof_)
@@ -1517,29 +1522,29 @@ namespace isc { namespace dhcp {
   {
       switch (other.type_get ())
     {
-      case 167: // value
-      case 171: // map_value
-      case 215: // db_type
-      case 291: // hr_mode
-      case 412: // duid_type
-      case 445: // ncr_protocol_value
-      case 453: // replace_client_name_value
+      case 169: // value
+      case 173: // map_value
+      case 217: // db_type
+      case 293: // hr_mode
+      case 416: // duid_type
+      case 449: // ncr_protocol_value
+      case 457: // replace_client_name_value
         value.copy< ElementPtr > (other.value);
         break;
 
-      case 152: // "boolean"
+      case 153: // "boolean"
         value.copy< bool > (other.value);
         break;
 
-      case 151: // "floating point"
+      case 152: // "floating point"
         value.copy< double > (other.value);
         break;
 
-      case 150: // "integer"
+      case 151: // "integer"
         value.copy< int64_t > (other.value);
         break;
 
-      case 149: // "constant string"
+      case 150: // "constant string"
         value.copy< std::string > (other.value);
         break;
 
@@ -1560,29 +1565,29 @@ namespace isc { namespace dhcp {
     (void) v;
       switch (this->type_get ())
     {
-      case 167: // value
-      case 171: // map_value
-      case 215: // db_type
-      case 291: // hr_mode
-      case 412: // duid_type
-      case 445: // ncr_protocol_value
-      case 453: // replace_client_name_value
+      case 169: // value
+      case 173: // map_value
+      case 217: // db_type
+      case 293: // hr_mode
+      case 416: // duid_type
+      case 449: // ncr_protocol_value
+      case 457: // replace_client_name_value
         value.copy< ElementPtr > (v);
         break;
 
-      case 152: // "boolean"
+      case 153: // "boolean"
         value.copy< bool > (v);
         break;
 
-      case 151: // "floating point"
+      case 152: // "floating point"
         value.copy< double > (v);
         break;
 
-      case 150: // "integer"
+      case 151: // "integer"
         value.copy< int64_t > (v);
         break;
 
-      case 149: // "constant string"
+      case 150: // "constant string"
         value.copy< std::string > (v);
         break;
 
@@ -1662,29 +1667,29 @@ namespace isc { namespace dhcp {
     // Type destructor.
     switch (yytype)
     {
-      case 167: // value
-      case 171: // map_value
-      case 215: // db_type
-      case 291: // hr_mode
-      case 412: // duid_type
-      case 445: // ncr_protocol_value
-      case 453: // replace_client_name_value
+      case 169: // value
+      case 173: // map_value
+      case 217: // db_type
+      case 293: // hr_mode
+      case 416: // duid_type
+      case 449: // ncr_protocol_value
+      case 457: // replace_client_name_value
         value.template destroy< ElementPtr > ();
         break;
 
-      case 152: // "boolean"
+      case 153: // "boolean"
         value.template destroy< bool > ();
         break;
 
-      case 151: // "floating point"
+      case 152: // "floating point"
         value.template destroy< double > ();
         break;
 
-      case 150: // "integer"
+      case 151: // "integer"
         value.template destroy< int64_t > ();
         break;
 
-      case 149: // "constant string"
+      case 150: // "constant string"
         value.template destroy< std::string > ();
         break;
 
@@ -1711,29 +1716,29 @@ namespace isc { namespace dhcp {
     super_type::move(s);
       switch (this->type_get ())
     {
-      case 167: // value
-      case 171: // map_value
-      case 215: // db_type
-      case 291: // hr_mode
-      case 412: // duid_type
-      case 445: // ncr_protocol_value
-      case 453: // replace_client_name_value
+      case 169: // value
+      case 173: // map_value
+      case 217: // db_type
+      case 293: // hr_mode
+      case 416: // duid_type
+      case 449: // ncr_protocol_value
+      case 457: // replace_client_name_value
         value.move< ElementPtr > (s.value);
         break;
 
-      case 152: // "boolean"
+      case 153: // "boolean"
         value.move< bool > (s.value);
         break;
 
-      case 151: // "floating point"
+      case 152: // "floating point"
         value.move< double > (s.value);
         break;
 
-      case 150: // "integer"
+      case 151: // "integer"
         value.move< int64_t > (s.value);
         break;
 
-      case 149: // "constant string"
+      case 150: // "constant string"
         value.move< std::string > (s.value);
         break;
 
@@ -1807,7 +1812,7 @@ namespace isc { namespace dhcp {
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
      385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
      395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,   407
+     405,   406,   407,   408
     };
     return static_cast<token_type> (yytoken_number_[type]);
   }
@@ -2671,6 +2676,12 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_SUB_OPTION_DEFS (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_SUB_OPTION_DEFS, l);
+  }
+
+  Dhcp6Parser::symbol_type
   Dhcp6Parser::make_SUB_OPTION_DEF (const location_type& l)
   {
     return symbol_type (token::TOKEN_SUB_OPTION_DEF, l);
@@ -2721,7 +2732,7 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp6_parser.yy" // lalr1.cc:377
 } } // isc::dhcp
-#line 2725 "dhcp6_parser.h" // lalr1.cc:377
+#line 2736 "dhcp6_parser.h" // lalr1.cc:377
 
 
 

src/bin/dhcp6/location.hh

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