[5110] Parser regenerated

diff --git a/src/bin/d2/d2_parser.cc b/src/bin/d2/d2_parser.cc
index 425679037d25c46243996a552e26ed6938890857..b17cec23297ca9ccf256e78b411f1a78b62ec957 100644 (file)
--- a/src/bin/d2/d2_parser.cc
+++ b/src/bin/d2/d2_parser.cc
@@ -894,8 +894,8 @@ namespace isc { namespace d2 {
   case 67:
 #line 274 "d2_parser.yy" // lalr1.cc:859
     {
-    if (yystack_[0].value.as< int64_t > () <= 0 || yystack_[0].value.as< int64_t > () >= 65792 ) {
-        error(yystack_[0].location, "port must be greater than zero but less than 65792");
+    if (yystack_[0].value.as< int64_t > () <= 0 || yystack_[0].value.as< int64_t > () >= 65535 ) {
+        error(yystack_[0].location, "port must be greater than zero but less than 65535");
     }
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", i);
@@ -1231,8 +1231,8 @@ namespace isc { namespace d2 {
   case 127:
 #line 486 "d2_parser.yy" // lalr1.cc:859
     {
-    if (yystack_[0].value.as< int64_t > () <= 0 || yystack_[0].value.as< int64_t > () >= 65792 ) {
-        error(yystack_[0].location, "port must be greater than zero but less than 65792");
+    if (yystack_[0].value.as< int64_t > () <= 0 || yystack_[0].value.as< int64_t > () >= 65535 ) {
+        error(yystack_[0].location, "port must be greater than zero but less than 65536");
     }
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", i);

diff --git a/src/bin/d2/d2_parser.h b/src/bin/d2/d2_parser.h
index 2bc6746ec430935ac6cae5ce07b22c2442cf7449..f9089359b610cea7ebb9b0814db7eb3b121a2cdf 100644 (file)
--- a/src/bin/d2/d2_parser.h
+++ b/src/bin/d2/d2_parser.h
@@ -40,7 +40,7 @@
 #ifndef YY_D2_PARSER_D2_PARSER_H_INCLUDED
 # define YY_D2_PARSER_D2_PARSER_H_INCLUDED
 // //                    "%code requires" blocks.
-#line 17 "d2_parser.yy" // lalr1.cc:392
+#line 17 "d2_parser.yy" // lalr1.cc:377
 
 #include <string>
 #include <cc/data.h>
@@ -52,7 +52,7 @@ using namespace isc::d2;
 using namespace isc::data;
 using namespace std;
 
-#line 56 "d2_parser.h" // lalr1.cc:392
+#line 56 "d2_parser.h" // lalr1.cc:377
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -135,9 +135,9 @@ using namespace std;
 # endif /* ! defined YYDEBUG */
 #endif  /* ! defined D2_PARSER_DEBUG */
 
-#line 14 "d2_parser.yy" // lalr1.cc:392
+#line 14 "d2_parser.yy" // lalr1.cc:377
 namespace isc { namespace d2 {
-#line 141 "d2_parser.h" // lalr1.cc:392
+#line 141 "d2_parser.h" // lalr1.cc:377
 
 
 
@@ -1552,9 +1552,9 @@ namespace isc { namespace d2 {
   }
 
 
-#line 14 "d2_parser.yy" // lalr1.cc:392
+#line 14 "d2_parser.yy" // lalr1.cc:377
 } } // isc::d2
-#line 1558 "d2_parser.h" // lalr1.cc:392
+#line 1558 "d2_parser.h" // lalr1.cc:377
 
 
 

diff --git a/src/bin/d2/location.hh b/src/bin/d2/location.hh
index 80826e9758c9a24f402802a9383e0fbe7aad8b85..9eaa5ec020f930b4a4c21ec8111513c1f58a0ec5 100644 (file)
--- a/src/bin/d2/location.hh
+++ b/src/bin/d2/location.hh
@@ -1,3 +1,4 @@
+// Generated 201702171216
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++
@@ -40,9 +41,9 @@
 
 # include "position.hh"
 
-#line 14 "d2_parser.yy" // location.cc:337
+#line 14 "d2_parser.yy" // location.cc:296
 namespace isc { namespace d2 {
-#line 46 "location.hh" // location.cc:337
+#line 46 "location.hh" // location.cc:296
   /// Abstract a location.
   class location
   {
@@ -186,7 +187,7 @@ namespace isc { namespace d2 {
     return ostr;
   }
 
-#line 14 "d2_parser.yy" // location.cc:337
+#line 14 "d2_parser.yy" // location.cc:296
 } } // isc::d2
-#line 192 "location.hh" // location.cc:337
+#line 192 "location.hh" // location.cc:296
 #endif // !YY_D2_PARSER_LOCATION_HH_INCLUDED

diff --git a/src/bin/d2/position.hh b/src/bin/d2/position.hh
index 41f8acd1b9000840ed92065859f29222d52b0e56..25d47b4b0dc49effdceebecb6e14f6e2c5821593 100644 (file)
--- a/src/bin/d2/position.hh
+++ b/src/bin/d2/position.hh
@@ -1,3 +1,4 @@
+// Generated 201702171216
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++
@@ -50,9 +51,9 @@
 #  endif
 # endif
 
-#line 14 "d2_parser.yy" // location.cc:337
+#line 14 "d2_parser.yy" // location.cc:296
 namespace isc { namespace d2 {
-#line 56 "position.hh" // location.cc:337
+#line 56 "position.hh" // location.cc:296
   /// Abstract a position.
   class position
   {
@@ -174,7 +175,7 @@ namespace isc { namespace d2 {
     return ostr << pos.line << '.' << pos.column;
   }
 
-#line 14 "d2_parser.yy" // location.cc:337
+#line 14 "d2_parser.yy" // location.cc:296
 } } // isc::d2
-#line 180 "position.hh" // location.cc:337
+#line 180 "position.hh" // location.cc:296
 #endif // !YY_D2_PARSER_POSITION_HH_INCLUDED

diff --git a/src/bin/d2/stack.hh b/src/bin/d2/stack.hh
index 92c74d309edff5844aa0c11b4ffa76082720a43f..73774578e823894be5d62eac780959a1b625d321 100644 (file)
--- a/src/bin/d2/stack.hh
+++ b/src/bin/d2/stack.hh
@@ -1,3 +1,4 @@
+// Generated 201702171216
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++
@@ -40,9 +41,9 @@
 
 # include <vector>
 
-#line 14 "d2_parser.yy" // stack.hh:151
+#line 14 "d2_parser.yy" // stack.hh:132
 namespace isc { namespace d2 {
-#line 46 "stack.hh" // stack.hh:151
+#line 46 "stack.hh" // stack.hh:132
   template <class T, class S = std::vector<T> >
   class stack
   {
@@ -150,8 +151,8 @@ namespace isc { namespace d2 {
     unsigned int range_;
   };
 
-#line 14 "d2_parser.yy" // stack.hh:151
+#line 14 "d2_parser.yy" // stack.hh:132
 } } // isc::d2
-#line 156 "stack.hh" // stack.hh:151
+#line 156 "stack.hh" // stack.hh:132
 
 #endif // !YY_D2_PARSER_STACK_HH_INCLUDED