[trac4265] Regenerate parser.cc and parser.h after updates

diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc
index f074b0f959d60d045b010a272db2953446cd2759..3231b15b78d463794f47857e71d722d9a951407a 100644 (file)
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -256,7 +256,7 @@ namespace isc { namespace eval {
         break;
 
       case 37: // relay6_field
-        value.move< TokenRelay6::FieldType > (that.value);
+        value.move< TokenRelay6Field::FieldType > (that.value);
         break;
 
       case 24: // "constant string"
@@ -295,7 +295,7 @@ namespace isc { namespace eval {
         break;
 
       case 37: // relay6_field
-        value.copy< TokenRelay6::FieldType > (that.value);
+        value.copy< TokenRelay6Field::FieldType > (that.value);
         break;
 
       case 24: // "constant string"
@@ -402,7 +402,7 @@ namespace isc { namespace eval {
       case 37: // relay6_field
 
 #line 78 "parser.yy" // lalr1.cc:636
-        { yyoutput << yysym.value.template as< TokenRelay6::FieldType > (); }
+        { yyoutput << yysym.value.template as< TokenRelay6Field::FieldType > (); }
 #line 407 "parser.cc" // lalr1.cc:636
         break;
 
@@ -615,7 +615,7 @@ namespace isc { namespace eval {
         break;
 
       case 37: // relay6_field
-        yylhs.value.build< TokenRelay6::FieldType > ();
+        yylhs.value.build< TokenRelay6Field::FieldType > ();
         break;
 
       case 24: // "constant string"
@@ -822,7 +822,7 @@ namespace isc { namespace eval {
                      switch (ctx.getUniverse()) {
                      case Option::V6:
                      {
-                         TokenPtr relay6field(new TokenRelay6(yystack_[3].value.as< uint8_t > (), yystack_[0].value.as< TokenRelay6::FieldType > ()));
+                         TokenPtr relay6field(new TokenRelay6Field(yystack_[3].value.as< uint8_t > (), yystack_[0].value.as< TokenRelay6Field::FieldType > ()));
                          ctx.expression.push_back(relay6field);
                          break;
                      }
@@ -913,13 +913,13 @@ namespace isc { namespace eval {
 
   case 27:
 #line 275 "parser.yy" // lalr1.cc:859
-    { yylhs.value.as< TokenRelay6::FieldType > () = TokenRelay6::PEERADDR; }
+    { yylhs.value.as< TokenRelay6Field::FieldType > () = TokenRelay6Field::PEERADDR; }
 #line 918 "parser.cc" // lalr1.cc:859
     break;
 
   case 28:
 #line 276 "parser.yy" // lalr1.cc:859
-    { yylhs.value.as< TokenRelay6::FieldType > () = TokenRelay6::LINKADDR; }
+    { yylhs.value.as< TokenRelay6Field::FieldType > () = TokenRelay6Field::LINKADDR; }
 #line 924 "parser.cc" // lalr1.cc:859
     break;
 

diff --git a/src/lib/eval/parser.h b/src/lib/eval/parser.h
index 93fece51dbf6741d0e1ebcec7baa80b928cf7892..c22092b9850eef2c92d56f29678911581a508b04 100644 (file)
--- a/src/lib/eval/parser.h
+++ b/src/lib/eval/parser.h
@@ -299,7 +299,7 @@ namespace isc { namespace eval {
       char dummy1[sizeof(TokenOption::RepresentationType)];
 
       // relay6_field
-      char dummy2[sizeof(TokenRelay6::FieldType)];
+      char dummy2[sizeof(TokenRelay6Field::FieldType)];
 
       // "constant string"
       // "integer"
@@ -401,7 +401,7 @@ namespace isc { namespace eval {
 
   basic_symbol (typename Base::kind_type t, const TokenOption::RepresentationType v, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const TokenRelay6::FieldType v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const TokenRelay6Field::FieldType v, const location_type& l);
 
   basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l);
 
@@ -879,7 +879,7 @@ namespace isc { namespace eval {
         break;
 
       case 37: // relay6_field
-        value.copy< TokenRelay6::FieldType > (other.value);
+        value.copy< TokenRelay6Field::FieldType > (other.value);
         break;
 
       case 24: // "constant string"
@@ -920,7 +920,7 @@ namespace isc { namespace eval {
         break;
 
       case 37: // relay6_field
-        value.copy< TokenRelay6::FieldType > (v);
+        value.copy< TokenRelay6Field::FieldType > (v);
         break;
 
       case 24: // "constant string"
@@ -962,7 +962,7 @@ namespace isc { namespace eval {
   {}
 
   template <typename Base>
-  EvalParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const TokenRelay6::FieldType v, const location_type& l)
+  EvalParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const TokenRelay6Field::FieldType v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
@@ -1020,7 +1020,7 @@ namespace isc { namespace eval {
         break;
 
       case 37: // relay6_field
-        value.template destroy< TokenRelay6::FieldType > ();
+        value.template destroy< TokenRelay6Field::FieldType > ();
         break;
 
       case 24: // "constant string"
@@ -1067,7 +1067,7 @@ namespace isc { namespace eval {
         break;
 
       case 37: // relay6_field
-        value.move< TokenRelay6::FieldType > (s.value);
+        value.move< TokenRelay6Field::FieldType > (s.value);
         break;
 
       case 24: // "constant string"