[master] regen flex/bison

diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
index 957a0be32d6fcaeedd680fe01402b8c8047d3abc..fbe2b072e5ec51286967088dc28d46b1645d8a81 100644 (file)
--- a/src/bin/dhcp4/dhcp4_lexer.cc
+++ b/src/bin/dhcp4/dhcp4_lexer.cc
@@ -1592,8 +1592,8 @@ static const flex_int16_t yy_rule_linenum[158] =
      1128, 1137, 1146, 1155, 1164, 1173, 1182, 1191, 1200, 1209,
      1219, 1229, 1239, 1249, 1259, 1269, 1279, 1289, 1299, 1308,
      1317, 1326, 1335, 1344, 1353, 1362, 1373, 1386, 1399, 1414,
-     1512, 1517, 1522, 1527, 1528, 1529, 1530, 1531, 1532, 1534,
-     1552, 1565, 1570, 1574, 1576, 1578, 1580
+     1513, 1518, 1523, 1528, 1529, 1530, 1531, 1532, 1533, 1535,
+     1553, 1566, 1571, 1575, 1577, 1579, 1581
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -3876,7 +3876,7 @@ YY_RULE_SETUP
 case 141:
 /* rule 141 can match eol */
 YY_RULE_SETUP
-#line 1512 "dhcp4_lexer.ll"
+#line 1513 "dhcp4_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
@@ -3885,7 +3885,7 @@ YY_RULE_SETUP
 case 142:
 /* rule 142 can match eol */
 YY_RULE_SETUP
-#line 1517 "dhcp4_lexer.ll"
+#line 1518 "dhcp4_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
@@ -3893,7 +3893,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 1522 "dhcp4_lexer.ll"
+#line 1523 "dhcp4_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
@@ -3901,44 +3901,37 @@ YY_RULE_SETUP
        YY_BREAK
 case 144:
 YY_RULE_SETUP
-
-#line 1527 "dhcp4_lexer.ll"
+#line 1528 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); }
        YY_BREAK
 case 145:
 YY_RULE_SETUP
-
-#line 1528 "dhcp4_lexer.ll"
+#line 1529 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); }
        YY_BREAK
 case 146:
 YY_RULE_SETUP
-
-#line 1529 "dhcp4_lexer.ll"
+#line 1530 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); }
        YY_BREAK
 case 147:
 YY_RULE_SETUP
-
-#line 1530 "dhcp4_lexer.ll"
+#line 1531 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); }
        YY_BREAK
 case 148:
 YY_RULE_SETUP
-
-#line 1531 "dhcp4_lexer.ll"
+#line 1532 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); }
        YY_BREAK
 case 149:
 YY_RULE_SETUP
-
-#line 1532 "dhcp4_lexer.ll"
+#line 1533 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); }
        YY_BREAK
 case 150:
 YY_RULE_SETUP
-
-#line 1534 "dhcp4_lexer.ll"
+#line 1535 "dhcp4_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -3959,8 +3952,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 151:
 YY_RULE_SETUP
-
-#line 1552 "dhcp4_lexer.ll"
+#line 1553 "dhcp4_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -3976,8 +3968,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 152:
 YY_RULE_SETUP
-
-#line 1565 "dhcp4_lexer.ll"
+#line 1566 "dhcp4_lexer.ll"
 {
     string tmp(yytext);
     return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -3985,38 +3976,33 @@ YY_RULE_SETUP
        YY_BREAK
 case 153:
 YY_RULE_SETUP
-
-#line 1570 "dhcp4_lexer.ll"
+#line 1571 "dhcp4_lexer.ll"
 {
    return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_);
 }
        YY_BREAK
 case 154:
 YY_RULE_SETUP
-
-#line 1574 "dhcp4_lexer.ll"
+#line 1575 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
        YY_BREAK
 case 155:
 YY_RULE_SETUP
-
-#line 1576 "dhcp4_lexer.ll"
+#line 1577 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
        YY_BREAK
 case 156:
 YY_RULE_SETUP
-
-#line 1578 "dhcp4_lexer.ll"
+#line 1579 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
        YY_BREAK
 case 157:
 YY_RULE_SETUP
-
-#line 1580 "dhcp4_lexer.ll"
+#line 1581 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1582 "dhcp4_lexer.ll"
+#line 1583 "dhcp4_lexer.ll"
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp4Parser::make_END(driver.loc_);
@@ -4042,11 +4028,10 @@ case YY_STATE_EOF(INITIAL):
        YY_BREAK
 case 158:
 YY_RULE_SETUP
-
-#line 1605 "dhcp4_lexer.ll"
+#line 1606 "dhcp4_lexer.ll"
 ECHO;
        YY_BREAK
-#line 4033 "dhcp4_lexer.cc"
+#line 4034 "dhcp4_lexer.cc"
 
        case YY_END_OF_BUFFER:
                {
@@ -5151,8 +5136,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-
-#line 1605 "dhcp4_lexer.ll"
+#line 1606 "dhcp4_lexer.ll"
 
 
 using namespace isc::dhcp;

diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh
index 6f19b6e0f87bf36af6229690ad3e00be364951ba..b8e3c865c272fe251aec7a09977ec5654dd55d01 100644 (file)
--- a/src/bin/dhcp4/location.hh
+++ b/src/bin/dhcp4/location.hh
@@ -1,4 +1,4 @@
-// Generated 201710222252
+// Generated 201712180910
 // 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 e385387b15c442bf30f98dab90dab3cc9ac79f0a..5266d5be35820a8d3c80992e48756cebf7c25161 100644 (file)
--- a/src/bin/dhcp4/position.hh
+++ b/src/bin/dhcp4/position.hh
@@ -1,4 +1,4 @@
-// Generated 201710222252
+// Generated 201712180910
 // 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 0f8d4025120916c7d86ed5823ab38a1de330f8bf..cfa2447555d9889de2908fe36768d9ead583d5ec 100644 (file)
--- a/src/bin/dhcp4/stack.hh
+++ b/src/bin/dhcp4/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201710222252
+// Generated 201712180910
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++

diff --git a/src/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh
index e92157cf62c004903ebcfd01c900e9331324f62c..06632c8aa4bca65eb458e0ffd104680d26e8db42 100644 (file)
--- a/src/bin/dhcp6/location.hh
+++ b/src/bin/dhcp6/location.hh
@@ -1,4 +1,4 @@
-// Generated 201709141022
+// Generated 201712180910
 // 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 773b8f56c018aec11c792bc37ab613b7ecc25f7c..f5b24e39d8a047149b51d5613dc99f92bb46bc1e 100644 (file)
--- a/src/bin/dhcp6/position.hh
+++ b/src/bin/dhcp6/position.hh
@@ -1,4 +1,4 @@
-// Generated 201709141022
+// Generated 201712180910
 // 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 f1d230b1c178a5adffb60c6577c9f3822e89d1c3..af18f7961185e35f12bbeffe115633be1d217696 100644 (file)
--- a/src/bin/dhcp6/stack.hh
+++ b/src/bin/dhcp6/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201709141022
+// Generated 201712180910
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++