[trac5044fd] regen

src/bin/dhcp6/dhcp6_parser.h

@@ -305,6 +305,7 @@ namespace isc { namespace dhcp {
     union union_type
     {
       // value
+      // duid_type
       char dummy1[sizeof(ElementPtr)];
 
       // "boolean"
@@ -409,38 +410,41 @@ namespace isc { namespace dhcp {
         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,
-        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
+        TOKEN_LLT = 326,
+        TOKEN_EN = 327,
+        TOKEN_LL = 328,
+        TOKEN_IDENTIFIER = 329,
+        TOKEN_HTYPE = 330,
+        TOKEN_TIME = 331,
+        TOKEN_ENTERPRISE_ID = 332,
+        TOKEN_DHCP4O6_PORT = 333,
+        TOKEN_CONTROL_SOCKET = 334,
+        TOKEN_SOCKET_TYPE = 335,
+        TOKEN_SOCKET_NAME = 336,
+        TOKEN_DHCP_DDNS = 337,
+        TOKEN_LOGGING = 338,
+        TOKEN_LOGGERS = 339,
+        TOKEN_OUTPUT_OPTIONS = 340,
+        TOKEN_OUTPUT = 341,
+        TOKEN_DEBUGLEVEL = 342,
+        TOKEN_SEVERITY = 343,
+        TOKEN_DHCP4 = 344,
+        TOKEN_DHCPDDNS = 345,
+        TOKEN_TOPLEVEL_JSON = 346,
+        TOKEN_TOPLEVEL_DHCP6 = 347,
+        TOKEN_SUB_DHCP6 = 348,
+        TOKEN_SUB_INTERFACES6 = 349,
+        TOKEN_SUB_SUBNET6 = 350,
+        TOKEN_SUB_POOL6 = 351,
+        TOKEN_SUB_PD_POOL = 352,
+        TOKEN_SUB_RESERVATION = 353,
+        TOKEN_SUB_OPTION_DEF = 354,
+        TOKEN_SUB_OPTION_DATA = 355,
+        TOKEN_SUB_HOOKS_LIBRARY = 356,
+        TOKEN_STRING = 357,
+        TOKEN_INTEGER = 358,
+        TOKEN_FLOAT = 359,
+        TOKEN_BOOLEAN = 360
       };
     };
 
@@ -833,6 +837,18 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_LLT (const location_type& l);
+
+    static inline
+    symbol_type
+    make_EN (const location_type& l);
+
+    static inline
+    symbol_type
+    make_LL (const location_type& l);
+
+    static inline
+    symbol_type
     make_IDENTIFIER (const location_type& l);
 
     static inline
@@ -1164,12 +1180,12 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 630,     ///< Last index in yytable_.
-      yynnts_ = 271,  ///< Number of nonterminal symbols.
+      yylast_ = 640,     ///< Last index in yytable_.
+      yynnts_ = 275,  ///< Number of nonterminal symbols.
       yyfinal_ = 24, ///< Termination state number.
       yyterror_ = 1,
       yyerrcode_ = 256,
-      yyntokens_ = 103  ///< Number of tokens.
+      yyntokens_ = 106  ///< Number of tokens.
     };
 
 
@@ -1221,9 +1237,10 @@ 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
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105
     };
-    const unsigned int user_token_number_max_ = 357;
+    const unsigned int user_token_number_max_ = 360;
     const token_number_type undef_token_ = 2;
 
     if (static_cast<int>(t) <= yyeof_)
@@ -1256,23 +1273,24 @@ namespace isc { namespace dhcp {
   {
       switch (other.type_get ())
     {
-      case 116: // value
+      case 119: // value
+      case 338: // duid_type
         value.copy< ElementPtr > (other.value);
         break;
 
-      case 102: // "boolean"
+      case 105: // "boolean"
         value.copy< bool > (other.value);
         break;
 
-      case 101: // "floating point"
+      case 104: // "floating point"
         value.copy< double > (other.value);
         break;
 
-      case 100: // "integer"
+      case 103: // "integer"
         value.copy< int64_t > (other.value);
         break;
 
-      case 99: // "constant string"
+      case 102: // "constant string"
         value.copy< std::string > (other.value);
         break;
 
@@ -1293,23 +1311,24 @@ namespace isc { namespace dhcp {
     (void) v;
       switch (this->type_get ())
     {
-      case 116: // value
+      case 119: // value
+      case 338: // duid_type
         value.copy< ElementPtr > (v);
         break;
 
-      case 102: // "boolean"
+      case 105: // "boolean"
         value.copy< bool > (v);
         break;
 
-      case 101: // "floating point"
+      case 104: // "floating point"
         value.copy< double > (v);
         break;
 
-      case 100: // "integer"
+      case 103: // "integer"
         value.copy< int64_t > (v);
         break;
 
-      case 99: // "constant string"
+      case 102: // "constant string"
         value.copy< std::string > (v);
         break;
 
@@ -1389,23 +1408,24 @@ namespace isc { namespace dhcp {
     // Type destructor.
     switch (yytype)
     {
-      case 116: // value
+      case 119: // value
+      case 338: // duid_type
         value.template destroy< ElementPtr > ();
         break;
 
-      case 102: // "boolean"
+      case 105: // "boolean"
         value.template destroy< bool > ();
         break;
 
-      case 101: // "floating point"
+      case 104: // "floating point"
         value.template destroy< double > ();
         break;
 
-      case 100: // "integer"
+      case 103: // "integer"
         value.template destroy< int64_t > ();
         break;
 
-      case 99: // "constant string"
+      case 102: // "constant string"
         value.template destroy< std::string > ();
         break;
 
@@ -1432,23 +1452,24 @@ namespace isc { namespace dhcp {
     super_type::move(s);
       switch (this->type_get ())
     {
-      case 116: // value
+      case 119: // value
+      case 338: // duid_type
         value.move< ElementPtr > (s.value);
         break;
 
-      case 102: // "boolean"
+      case 105: // "boolean"
         value.move< bool > (s.value);
         break;
 
-      case 101: // "floating point"
+      case 104: // "floating point"
         value.move< double > (s.value);
         break;
 
-      case 100: // "integer"
+      case 103: // "integer"
         value.move< int64_t > (s.value);
         break;
 
-      case 99: // "constant string"
+      case 102: // "constant string"
         value.move< std::string > (s.value);
         break;
 
@@ -1517,7 +1538,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
+     355,   356,   357,   358,   359,   360
     };
     return static_cast<token_type> (yytoken_number_[type]);
   }
@@ -1937,6 +1958,24 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_LLT (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_LLT, l);
+  }
+
+  Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_EN (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_EN, l);
+  }
+
+  Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_LL (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_LL, l);
+  }
+
+  Dhcp6Parser::symbol_type
   Dhcp6Parser::make_IDENTIFIER (const location_type& l)
   {
     return symbol_type (token::TOKEN_IDENTIFIER, l);
@@ -2131,7 +2170,7 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp6_parser.yy" // lalr1.cc:377
 } } // isc::dhcp
-#line 2135 "dhcp6_parser.h" // lalr1.cc:377
+#line 2174 "dhcp6_parser.h" // lalr1.cc:377
 
 
 

src/bin/dhcp6/location.hh

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