[master] regen flex/bison

diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
index 06c1e635c36cfc92c066bd54eae1f6532b3385d7..0aa29459da600625d75613c006e56795cbb97866 100644 (file)
--- a/src/bin/dhcp4/dhcp4_lexer.cc
+++ b/src/bin/dhcp4/dhcp4_lexer.cc
@@ -4726,7 +4726,7 @@ Parser4Context::scanStringBegin(const std::string& str, ParserType parser_type)
     loc_.initialize(&file_);
     yy_flex_debug = trace_scanning_;
     YY_BUFFER_STATE buffer;
-    buffer = yy_scan_bytes(str.c_str(), str.size());
+    buffer = parser4__scan_bytes(str.c_str(), str.size());
     if (!buffer) {
         fatal("cannot scan string");
         // fatal() throws an exception so this can't be reached

diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc
index 7ae35d22a3b248cb4354b4e7b5dd66453e0334e1..e034a6b8064c16a7cc1bdefaa5c40a5f0fe77b27 100644 (file)
--- a/src/bin/dhcp4/dhcp4_parser.cc
+++ b/src/bin/dhcp4/dhcp4_parser.cc
@@ -2906,7 +2906,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 483:
-#line 1699 "dhcp4_parser.yy" // lalr1.cc:859
+#line 1700 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
@@ -2914,7 +2914,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 484:
-#line 1701 "dhcp4_parser.yy" // lalr1.cc:859
+#line 1702 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
@@ -2924,7 +2924,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 485:
-#line 1707 "dhcp4_parser.yy" // lalr1.cc:859
+#line 1708 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
@@ -2935,7 +2935,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 486:
-#line 1712 "dhcp4_parser.yy" // lalr1.cc:859
+#line 1713 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2944,7 +2944,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 489:
-#line 1721 "dhcp4_parser.yy" // lalr1.cc:859
+#line 1722 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2954,7 +2954,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 490:
-#line 1725 "dhcp4_parser.yy" // lalr1.cc:859
+#line 1726 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
 }
@@ -2962,7 +2962,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 493:
-#line 1733 "dhcp4_parser.yy" // lalr1.cc:859
+#line 1734 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
@@ -2970,7 +2970,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 494:
-#line 1735 "dhcp4_parser.yy" // lalr1.cc:859
+#line 1736 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
@@ -4013,8 +4013,8 @@ namespace isc { namespace dhcp {
     1577,  1582,  1582,  1590,  1593,  1596,  1599,  1602,  1608,  1608,
     1618,  1618,  1625,  1625,  1637,  1637,  1650,  1651,  1655,  1659,
     1659,  1671,  1672,  1676,  1676,  1684,  1685,  1688,  1689,  1690,
-    1691,  1692,  1695,  1699,  1699,  1707,  1707,  1717,  1718,  1721,
-    1721,  1729,  1730,  1733,  1733
+    1691,  1692,  1695,  1700,  1700,  1708,  1708,  1718,  1719,  1722,
+    1722,  1730,  1731,  1734,  1734
   };
 
   // Print the state stack on the debug stream.
@@ -4050,7 +4050,7 @@ namespace isc { namespace dhcp {
 #line 14 "dhcp4_parser.yy" // lalr1.cc:1167
 } } // isc::dhcp
 #line 4053 "dhcp4_parser.cc" // lalr1.cc:1167
-#line 1741 "dhcp4_parser.yy" // lalr1.cc:1168
+#line 1742 "dhcp4_parser.yy" // lalr1.cc:1168
 
 
 void

diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh
index dcd5040ef0255bc80e6a1bb1e0ff3991a7628e95..3261e46dc8ff1b537bbae61ec30b6fc12ef92750 100644 (file)
--- a/src/bin/dhcp4/location.hh
+++ b/src/bin/dhcp4/location.hh
@@ -1,4 +1,4 @@
-// Generated 201702081505
+// Generated 201703010915
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh
index b07134efb2fee2d27af760213372847a10187a94..185a93114efe53d0eb86dac7dc68ba3e8894adaf 100644 (file)
--- a/src/bin/dhcp4/position.hh
+++ b/src/bin/dhcp4/position.hh
@@ -1,4 +1,4 @@
-// Generated 201702081505
+// Generated 201703010915
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

diff --git a/src/bin/dhcp4/stack.hh b/src/bin/dhcp4/stack.hh
index 052a67dea6e3c68cc00ecb1dcbc3febec5e9e91b..3c86c43f6212400373cd441271225fa0eaca3e5d 100644 (file)
--- a/src/bin/dhcp4/stack.hh
+++ b/src/bin/dhcp4/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201702081505
+// Generated 201703010915
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++

diff --git a/src/bin/dhcp6/dhcp6_lexer.cc b/src/bin/dhcp6/dhcp6_lexer.cc
index 093d8f94a482ab4eb5727fb18efd461f516dfbea..85b27d8f4712412181f895d4d490bd4e2875992e 100644 (file)
--- a/src/bin/dhcp6/dhcp6_lexer.cc
+++ b/src/bin/dhcp6/dhcp6_lexer.cc
@@ -4804,7 +4804,7 @@ Parser6Context::scanStringBegin(const std::string& str, ParserType parser_type)
     loc_.initialize(&file_);
     yy_flex_debug = trace_scanning_;
     YY_BUFFER_STATE buffer;
-    buffer = yy_scan_bytes(str.c_str(), str.size());
+    buffer = parser6__scan_bytes(str.c_str(), str.size());
     if (!buffer) {
         fatal("cannot scan string");
         // fatal() throws an exception so this can't be reached

diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc
index bbcd1acb31fbd31d48f4d123127ecc4da5024362..3cdc26339bbcdd04b6a4389d32f3151f739b8f6b 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.cc
+++ b/src/bin/dhcp6/dhcp6_parser.cc
@@ -3002,7 +3002,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 506:
-#line 1787 "dhcp6_parser.yy" // lalr1.cc:859
+#line 1788 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
@@ -3010,7 +3010,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 507:
-#line 1789 "dhcp6_parser.yy" // lalr1.cc:859
+#line 1790 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
@@ -3020,7 +3020,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 508:
-#line 1795 "dhcp6_parser.yy" // lalr1.cc:859
+#line 1796 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
@@ -3031,7 +3031,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 509:
-#line 1800 "dhcp6_parser.yy" // lalr1.cc:859
+#line 1801 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3040,7 +3040,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 512:
-#line 1809 "dhcp6_parser.yy" // lalr1.cc:859
+#line 1810 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3050,7 +3050,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 513:
-#line 1813 "dhcp6_parser.yy" // lalr1.cc:859
+#line 1814 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
 }
@@ -3058,7 +3058,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 516:
-#line 1821 "dhcp6_parser.yy" // lalr1.cc:859
+#line 1822 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
@@ -3066,7 +3066,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 517:
-#line 1823 "dhcp6_parser.yy" // lalr1.cc:859
+#line 1824 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
@@ -4149,8 +4149,8 @@ namespace isc { namespace dhcp {
     1650,  1655,  1660,  1665,  1670,  1670,  1678,  1681,  1684,  1687,
     1690,  1696,  1696,  1706,  1706,  1713,  1713,  1725,  1725,  1738,
     1739,  1743,  1747,  1747,  1759,  1760,  1764,  1764,  1772,  1773,
-    1776,  1777,  1778,  1779,  1780,  1783,  1787,  1787,  1795,  1795,
-    1805,  1806,  1809,  1809,  1817,  1818,  1821,  1821
+    1776,  1777,  1778,  1779,  1780,  1783,  1788,  1788,  1796,  1796,
+    1806,  1807,  1810,  1810,  1818,  1819,  1822,  1822
   };
 
   // Print the state stack on the debug stream.
@@ -4186,7 +4186,7 @@ namespace isc { namespace dhcp {
 #line 14 "dhcp6_parser.yy" // lalr1.cc:1167
 } } // isc::dhcp
 #line 4189 "dhcp6_parser.cc" // lalr1.cc:1167
-#line 1829 "dhcp6_parser.yy" // lalr1.cc:1168
+#line 1830 "dhcp6_parser.yy" // lalr1.cc:1168
 
 
 void

diff --git a/src/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh
index 6aa7940e6dcaff1f08d00970c11e1dfcc63166a6..094485e5a14bdba45aa69196b93f45edcda63163 100644 (file)
--- a/src/bin/dhcp6/location.hh
+++ b/src/bin/dhcp6/location.hh
@@ -1,4 +1,4 @@
-// Generated 201702081505
+// Generated 201703010915
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

diff --git a/src/bin/dhcp6/position.hh b/src/bin/dhcp6/position.hh
index 70c2bae0043302bd4ba6f4f5808514d7f2e4c572..3370203e9059b08ca3a945f924cbb0ff3bcfaeeb 100644 (file)
--- a/src/bin/dhcp6/position.hh
+++ b/src/bin/dhcp6/position.hh
@@ -1,4 +1,4 @@
-// Generated 201702081505
+// Generated 201703010915
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

diff --git a/src/bin/dhcp6/stack.hh b/src/bin/dhcp6/stack.hh
index 691f09dcf28d56cff5ab3cb0075ee4fe88115775..7606e11e40d48b1de86c463a1e6ae97eeb2abdcd 100644 (file)
--- a/src/bin/dhcp6/stack.hh
+++ b/src/bin/dhcp6/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201702081505
+// Generated 201703010915
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++