[master] regen parser

diff --git a/src/lib/eval/location.hh b/src/lib/eval/location.hh
index 63b391a29a7431abf4f862d281e3ba72767c32ad..66556de21ca529f4a966257ff9de89c6a7db040a 100644 (file)
--- a/src/lib/eval/location.hh
+++ b/src/lib/eval/location.hh
@@ -1,4 +1,4 @@
-// Generated 201705171457
+// Generated 201707051218
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc
index b68bf1b952341917a1d9b775143ef66bf8e3249b..bf9349a55ac840feaf74914623435892442182af 100644 (file)
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -273,6 +273,10 @@ namespace isc { namespace eval {
         value.move< TokenRelay6Field::FieldType > (that.value);
         break;
 
+      case 60: // nest_level
+        value.move< int8_t > (that.value);
+        break;
+
       case 47: // "constant string"
       case 48: // "integer"
       case 49: // "constant hexstring"
@@ -290,10 +294,6 @@ namespace isc { namespace eval {
         value.move< uint32_t > (that.value);
         break;
 
-      case 60: // nest_level
-        value.move< uint8_t > (that.value);
-        break;
-
       default:
         break;
     }
@@ -329,6 +329,10 @@ namespace isc { namespace eval {
         value.copy< TokenRelay6Field::FieldType > (that.value);
         break;
 
+      case 60: // nest_level
+        value.copy< int8_t > (that.value);
+        break;
+
       case 47: // "constant string"
       case 48: // "integer"
       case 49: // "constant hexstring"
@@ -346,10 +350,6 @@ namespace isc { namespace eval {
         value.copy< uint32_t > (that.value);
         break;
 
-      case 60: // nest_level
-        value.copy< uint8_t > (that.value);
-        break;
-
       default:
         break;
     }
@@ -445,7 +445,7 @@ namespace isc { namespace eval {
       case 60: // nest_level
 
 #line 108 "parser.yy" // lalr1.cc:636
-        { yyoutput << yysym.value.template as< uint8_t > (); }
+        { yyoutput << yysym.value.template as< int8_t > (); }
 #line 450 "parser.cc" // lalr1.cc:636
         break;
 
@@ -701,6 +701,10 @@ namespace isc { namespace eval {
         yylhs.value.build< TokenRelay6Field::FieldType > ();
         break;
 
+      case 60: // nest_level
+        yylhs.value.build< int8_t > ();
+        break;
+
       case 47: // "constant string"
       case 48: // "integer"
       case 49: // "constant hexstring"
@@ -718,10 +722,6 @@ namespace isc { namespace eval {
         yylhs.value.build< uint32_t > ();
         break;
 
-      case 60: // nest_level
-        yylhs.value.build< uint8_t > ();
-        break;
-
       default:
         break;
     }
@@ -814,7 +814,7 @@ namespace isc { namespace eval {
                     switch (ctx.getUniverse()) {
                     case Option::V6:
                     {
-                        TokenPtr opt(new TokenRelay6Option(yystack_[8].value.as< uint8_t > (), yystack_[3].value.as< uint16_t > (), TokenOption::EXISTS));
+                        TokenPtr opt(new TokenRelay6Option(yystack_[8].value.as< int8_t > (), yystack_[3].value.as< uint16_t > (), TokenOption::EXISTS));
                         ctx.expression.push_back(opt);
                         break;
                     }
@@ -932,7 +932,7 @@ namespace isc { namespace eval {
                      switch (ctx.getUniverse()) {
                      case Option::V6:
                      {
-                         TokenPtr opt(new TokenRelay6Option(yystack_[8].value.as< uint8_t > (), yystack_[3].value.as< uint16_t > (), yystack_[0].value.as< TokenOption::RepresentationType > ()));
+                         TokenPtr opt(new TokenRelay6Option(yystack_[8].value.as< int8_t > (), yystack_[3].value.as< uint16_t > (), yystack_[0].value.as< TokenOption::RepresentationType > ()));
                          ctx.expression.push_back(opt);
                          break;
                      }
@@ -995,7 +995,7 @@ namespace isc { namespace eval {
                      switch (ctx.getUniverse()) {
                      case Option::V6:
                      {
-                         TokenPtr relay6field(new TokenRelay6Field(yystack_[3].value.as< uint8_t > (), yystack_[0].value.as< TokenRelay6Field::FieldType > ()));
+                         TokenPtr relay6field(new TokenRelay6Field(yystack_[3].value.as< int8_t > (), yystack_[0].value.as< TokenRelay6Field::FieldType > ()));
                          ctx.expression.push_back(relay6field);
                          break;
                      }
@@ -1151,7 +1151,7 @@ namespace isc { namespace eval {
   case 39:
 #line 418 "parser.yy" // lalr1.cc:859
     {
-                     yylhs.value.as< uint8_t > () = ctx.convertNestLevelNumber(yystack_[0].value.as< std::string > (), yystack_[0].location);
+                     yylhs.value.as< int8_t > () = ctx.convertNestLevelNumber(yystack_[0].value.as< std::string > (), yystack_[0].location);
                  }
 #line 1157 "parser.cc" // lalr1.cc:859
     break;

diff --git a/src/lib/eval/parser.h b/src/lib/eval/parser.h
index 02653cdb461ddf2691f08501598d4a1671c663b3..a5d86f39a9afe93c8c3da5a813f09db7c8b8854a 100644 (file)
--- a/src/lib/eval/parser.h
+++ b/src/lib/eval/parser.h
@@ -318,22 +318,22 @@ namespace isc { namespace eval {
       // relay6_field
       char dummy5[sizeof(TokenRelay6Field::FieldType)];
 
+      // nest_level
+      char dummy6[sizeof(int8_t)];
+
       // "constant string"
       // "integer"
       // "constant hexstring"
       // "option name"
       // "ip address"
-      char dummy6[sizeof(std::string)];
+      char dummy7[sizeof(std::string)];
 
       // option_code
-      char dummy7[sizeof(uint16_t)];
+      char dummy8[sizeof(uint16_t)];
 
       // integer_expr
       // enterprise_id
-      char dummy8[sizeof(uint32_t)];
-
-      // nest_level
-      char dummy9[sizeof(uint8_t)];
+      char dummy9[sizeof(uint32_t)];
 };
 
     /// Symbol semantic values.
@@ -453,14 +453,14 @@ namespace isc { namespace eval {
 
   basic_symbol (typename Base::kind_type t, const TokenRelay6Field::FieldType v, const location_type& l);
 
+  basic_symbol (typename Base::kind_type t, const int8_t v, const location_type& l);
+
   basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l);
 
   basic_symbol (typename Base::kind_type t, const uint16_t v, const location_type& l);
 
   basic_symbol (typename Base::kind_type t, const uint32_t v, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const uint8_t v, const location_type& l);
-
 
       /// Constructor for symbols with semantic value.
       basic_symbol (typename Base::kind_type t,
@@ -1040,6 +1040,10 @@ namespace isc { namespace eval {
         value.copy< TokenRelay6Field::FieldType > (other.value);
         break;
 
+      case 60: // nest_level
+        value.copy< int8_t > (other.value);
+        break;
+
       case 47: // "constant string"
       case 48: // "integer"
       case 49: // "constant hexstring"
@@ -1057,10 +1061,6 @@ namespace isc { namespace eval {
         value.copy< uint32_t > (other.value);
         break;
 
-      case 60: // nest_level
-        value.copy< uint8_t > (other.value);
-        break;
-
       default:
         break;
     }
@@ -1098,6 +1098,10 @@ namespace isc { namespace eval {
         value.copy< TokenRelay6Field::FieldType > (v);
         break;
 
+      case 60: // nest_level
+        value.copy< int8_t > (v);
+        break;
+
       case 47: // "constant string"
       case 48: // "integer"
       case 49: // "constant hexstring"
@@ -1115,10 +1119,6 @@ namespace isc { namespace eval {
         value.copy< uint32_t > (v);
         break;
 
-      case 60: // nest_level
-        value.copy< uint8_t > (v);
-        break;
-
       default:
         break;
     }
@@ -1170,28 +1170,28 @@ namespace isc { namespace eval {
   {}
 
   template <typename Base>
-  EvalParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l)
+  EvalParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const int8_t v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  EvalParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const uint16_t v, const location_type& l)
+  EvalParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  EvalParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const uint32_t v, const location_type& l)
+  EvalParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const uint16_t v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  EvalParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const uint8_t v, const location_type& l)
+  EvalParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const uint32_t v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
@@ -1243,6 +1243,10 @@ namespace isc { namespace eval {
         value.template destroy< TokenRelay6Field::FieldType > ();
         break;
 
+      case 60: // nest_level
+        value.template destroy< int8_t > ();
+        break;
+
       case 47: // "constant string"
       case 48: // "integer"
       case 49: // "constant hexstring"
@@ -1260,10 +1264,6 @@ namespace isc { namespace eval {
         value.template destroy< uint32_t > ();
         break;
 
-      case 60: // nest_level
-        value.template destroy< uint8_t > ();
-        break;
-
       default:
         break;
     }
@@ -1307,6 +1307,10 @@ namespace isc { namespace eval {
         value.move< TokenRelay6Field::FieldType > (s.value);
         break;
 
+      case 60: // nest_level
+        value.move< int8_t > (s.value);
+        break;
+
       case 47: // "constant string"
       case 48: // "integer"
       case 49: // "constant hexstring"
@@ -1324,10 +1328,6 @@ namespace isc { namespace eval {
         value.move< uint32_t > (s.value);
         break;
 
-      case 60: // nest_level
-        value.move< uint8_t > (s.value);
-        break;
-
       default:
         break;
     }

diff --git a/src/lib/eval/position.hh b/src/lib/eval/position.hh
index 8421b7d0478a67bf72d4fc4e458fb9b9f3185ff1..8b6fbea73c43b258f9f95b44d7ca4f2bb2417c02 100644 (file)
--- a/src/lib/eval/position.hh
+++ b/src/lib/eval/position.hh
@@ -1,4 +1,4 @@
-// Generated 201705171457
+// Generated 201707051218
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

diff --git a/src/lib/eval/stack.hh b/src/lib/eval/stack.hh
index ba3a4c673722aab8b4470463ea756a599be050c9..6ebdc5161ac61216e80e56ebc0e75e8c88584f61 100644 (file)
--- a/src/lib/eval/stack.hh
+++ b/src/lib/eval/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201705171457
+// Generated 201707051218
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++