[#2970] Regen flex

2 files changed, 82 insertions, 80 deletions

diff --git a/src/lib/eval/lexer.cc b/src/lib/eval/lexer.cc
index 5855ede9a6..ab42b71a86 100644
--- a/src/lib/eval/lexer.cc
+++ b/src/lib/eval/lexer.cc
@@ -984,13 +984,13 @@ int yy_flex_debug = 1;
 
 static const flex_int16_t yy_rule_linenum[63] =
     {   0,
-      106,  111,  117,  127,  133,  151,  175,  189,  190,  191,
-      192,  193,  194,  195,  196,  197,  198,  199,  200,  201,
-      202,  203,  204,  205,  206,  207,  208,  209,  210,  211,
-      212,  213,  214,  215,  216,  217,  218,  219,  220,  221,
-      222,  223,  224,  225,  226,  227,  228,  229,  230,  231,
-      232,  233,  234,  235,  236,  237,  238,  239,  240,  241,
-      242,  243
+      107,  112,  118,  128,  134,  152,  176,  190,  191,  192,
+      193,  194,  195,  196,  197,  198,  199,  200,  201,  202,
+      203,  204,  205,  206,  207,  208,  209,  210,  211,  212,
+      213,  214,  215,  216,  217,  218,  219,  220,  221,  222,
+      223,  224,  225,  226,  227,  228,  229,  230,  231,  232,
+      233,  234,  235,  236,  237,  238,  239,  240,  241,  242,
+      243,  244
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -1002,7 +1002,7 @@ static const flex_int16_t yy_rule_linenum[63] =
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "lexer.ll"
-/* Copyright (C) 2015-2022 Internet Systems Consortium, Inc. ("ISC")
+/* Copyright (C) 2015-2023 Internet Systems Consortium, Inc. ("ISC")
 
    This Source Code Form is subject to the terms of the Mozilla Public
    License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1014,6 +1014,7 @@ char *yytext;
 
 #include <cerrno>
 #include <climits>
+#include <cstdint>
 #include <cstdlib>
 #include <string>
 #include <eval/eval_context.h>
@@ -1041,7 +1042,7 @@ namespace {
 
 /* To avoid the call to exit... oops! */
 #define YY_FATAL_ERROR(msg) isc::eval::EvalContext::fatal(msg)
-#line 1044 "lexer.cc"
+#line 1045 "lexer.cc"
 /* noyywrap disables automatic rewinding for the next file to parse. Since we
    always parse only a single string, there's no need to do any wraps. And
    using yywrap requires linking with -lfl, which provides the default yywrap
@@ -1061,13 +1062,13 @@ namespace {
 /* These are not token expressions yet, just convenience expressions that
    can be used during actual token definitions. Note some can match
    incorrect inputs (e.g., IP addresses) which must be checked. */
-#line 80 "lexer.ll"
+#line 81 "lexer.ll"
 /* This code run each time a pattern is matched. It updates the location
    by moving it ahead by yyleng bytes. yyleng specifies the length of the
    currently matched token. */
 #define YY_USER_ACTION  loc.columns(evalleng);
-#line 1069 "lexer.cc"
 #line 1070 "lexer.cc"
+#line 1071 "lexer.cc"
 
 #define INITIAL 0
 
@@ -1345,11 +1346,11 @@ YY_DECL
 
 	{
 /* %% [7.0] user's declarations go here */
-#line 86 "lexer.ll"
+#line 87 "lexer.ll"
 
 
 
-#line 90 "lexer.ll"
+#line 91 "lexer.ll"
     /* Code run each time evallex is called. */
     loc.step();
 
@@ -1366,7 +1367,7 @@ YY_DECL
 
 
 
-#line 1369 "lexer.cc"
+#line 1370 "lexer.cc"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1454,7 +1455,7 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 106 "lexer.ll"
+#line 107 "lexer.ll"
 {
     /* Ok, we found a with space. Let's ignore it and update loc variable. */
     loc.step();
@@ -1463,7 +1464,7 @@ YY_RULE_SETUP
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 111 "lexer.ll"
+#line 112 "lexer.ll"
 {
     /* Newline found. Let's update the location and continue. */
     loc.lines(evalleng);
@@ -1472,7 +1473,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 117 "lexer.ll"
+#line 118 "lexer.ll"
 {
     /* A string has been matched. It contains the actual string and single quotes.
        We need to get those quotes out of the way and just use its content, e.g.
@@ -1485,7 +1486,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 127 "lexer.ll"
+#line 128 "lexer.ll"
 {
     /* A hex string has been matched. It contains the '0x' or '0X' header
        followed by at least one hexadecimal digit. */
@@ -1494,7 +1495,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 133 "lexer.ll"
+#line 134 "lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(evaltext);
@@ -1520,7 +1521,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 151 "lexer.ll"
+#line 152 "lexer.ll"
 {
     /* This string specifies option name starting with a letter
        and further containing letters, digits, hyphens and
@@ -1547,7 +1548,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 175 "lexer.ll"
+#line 176 "lexer.ll"
 {
     /* IPv4 or IPv6 address */
     std::string tmp(evaltext);
@@ -1564,289 +1565,289 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 189 "lexer.ll"
+#line 190 "lexer.ll"
 return isc::eval::EvalParser::make_EQUAL(loc);
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 190 "lexer.ll"
+#line 191 "lexer.ll"
 return isc::eval::EvalParser::make_OPTION(loc);
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 191 "lexer.ll"
+#line 192 "lexer.ll"
 return isc::eval::EvalParser::make_RELAY4(loc);
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 192 "lexer.ll"
+#line 193 "lexer.ll"
 return isc::eval::EvalParser::make_RELAY6(loc);
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 193 "lexer.ll"
+#line 194 "lexer.ll"
 return isc::eval::EvalParser::make_PEERADDR(loc);
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 194 "lexer.ll"
+#line 195 "lexer.ll"
 return isc::eval::EvalParser::make_LINKADDR(loc);
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 195 "lexer.ll"
+#line 196 "lexer.ll"
 return isc::eval::EvalParser::make_TEXT(loc);
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 196 "lexer.ll"
+#line 197 "lexer.ll"
 return isc::eval::EvalParser::make_HEX(loc);
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 197 "lexer.ll"
+#line 198 "lexer.ll"
 return isc::eval::EvalParser::make_EXISTS(loc);
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 198 "lexer.ll"
+#line 199 "lexer.ll"
 return isc::eval::EvalParser::make_PKT(loc);
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 199 "lexer.ll"
+#line 200 "lexer.ll"
 return isc::eval::EvalParser::make_IFACE(loc);
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 200 "lexer.ll"
+#line 201 "lexer.ll"
 return isc::eval::EvalParser::make_SRC(loc);
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 201 "lexer.ll"
+#line 202 "lexer.ll"
 return isc::eval::EvalParser::make_DST(loc);
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 202 "lexer.ll"
+#line 203 "lexer.ll"
 return isc::eval::EvalParser::make_LEN(loc);
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 203 "lexer.ll"
+#line 204 "lexer.ll"
 return isc::eval::EvalParser::make_PKT4(loc);
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 204 "lexer.ll"
+#line 205 "lexer.ll"
 return isc::eval::EvalParser::make_CHADDR(loc);
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 205 "lexer.ll"
+#line 206 "lexer.ll"
 return isc::eval::EvalParser::make_HLEN(loc);
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 206 "lexer.ll"
+#line 207 "lexer.ll"
 return isc::eval::EvalParser::make_HTYPE(loc);
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 207 "lexer.ll"
+#line 208 "lexer.ll"
 return isc::eval::EvalParser::make_CIADDR(loc);
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 208 "lexer.ll"
+#line 209 "lexer.ll"
 return isc::eval::EvalParser::make_GIADDR(loc);
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 209 "lexer.ll"
+#line 210 "lexer.ll"
 return isc::eval::EvalParser::make_YIADDR(loc);
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 210 "lexer.ll"
+#line 211 "lexer.ll"
 return isc::eval::EvalParser::make_SIADDR(loc);
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 211 "lexer.ll"
+#line 212 "lexer.ll"
 return isc::eval::EvalParser::make_PKT6(loc);
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 212 "lexer.ll"
+#line 213 "lexer.ll"
 return isc::eval::EvalParser::make_MSGTYPE(loc);
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 213 "lexer.ll"
+#line 214 "lexer.ll"
 return isc::eval::EvalParser::make_TRANSID(loc);
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 214 "lexer.ll"
+#line 215 "lexer.ll"
 return isc::eval::EvalParser::make_VENDOR(loc);
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 215 "lexer.ll"
+#line 216 "lexer.ll"
 return isc::eval::EvalParser::make_VENDOR_CLASS(loc);
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 216 "lexer.ll"
+#line 217 "lexer.ll"
 return isc::eval::EvalParser::make_DATA(loc);
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 217 "lexer.ll"
+#line 218 "lexer.ll"
 return isc::eval::EvalParser::make_ENTERPRISE(loc);
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 218 "lexer.ll"
+#line 219 "lexer.ll"
 return isc::eval::EvalParser::make_SUBSTRING(loc);
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 219 "lexer.ll"
+#line 220 "lexer.ll"
 return isc::eval::EvalParser::make_SPLIT(loc);
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 220 "lexer.ll"
+#line 221 "lexer.ll"
 return isc::eval::EvalParser::make_ALL(loc);
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 221 "lexer.ll"
+#line 222 "lexer.ll"
 return isc::eval::EvalParser::make_CONCAT(loc);
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 222 "lexer.ll"
+#line 223 "lexer.ll"
 return isc::eval::EvalParser::make_IFELSE(loc);
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 223 "lexer.ll"
+#line 224 "lexer.ll"
 return isc::eval::EvalParser::make_TOHEXSTRING(loc);
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 224 "lexer.ll"
+#line 225 "lexer.ll"
 return isc::eval::EvalParser::make_ADDRTOTEXT(loc);
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 225 "lexer.ll"
+#line 226 "lexer.ll"
 return isc::eval::EvalParser::make_INT8TOTEXT(loc);
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 226 "lexer.ll"
+#line 227 "lexer.ll"
 return isc::eval::EvalParser::make_INT16TOTEXT(loc);
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 227 "lexer.ll"
+#line 228 "lexer.ll"
 return isc::eval::EvalParser::make_INT32TOTEXT(loc);
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 228 "lexer.ll"
+#line 229 "lexer.ll"
 return isc::eval::EvalParser::make_UINT8TOTEXT(loc);
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 229 "lexer.ll"
+#line 230 "lexer.ll"
 return isc::eval::EvalParser::make_UINT16TOTEXT(loc);
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 230 "lexer.ll"
+#line 231 "lexer.ll"
 return isc::eval::EvalParser::make_UINT32TOTEXT(loc);
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 231 "lexer.ll"
+#line 232 "lexer.ll"
 return isc::eval::EvalParser::make_NOT(loc);
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 232 "lexer.ll"
+#line 233 "lexer.ll"
 return isc::eval::EvalParser::make_AND(loc);
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 233 "lexer.ll"
+#line 234 "lexer.ll"
 return isc::eval::EvalParser::make_OR(loc);
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 234 "lexer.ll"
+#line 235 "lexer.ll"
 return isc::eval::EvalParser::make_MEMBER(loc);
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 235 "lexer.ll"
+#line 236 "lexer.ll"
 return isc::eval::EvalParser::make_DOT(loc);
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 236 "lexer.ll"
+#line 237 "lexer.ll"
 return isc::eval::EvalParser::make_LPAREN(loc);
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 237 "lexer.ll"
+#line 238 "lexer.ll"
 return isc::eval::EvalParser::make_RPAREN(loc);
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 238 "lexer.ll"
+#line 239 "lexer.ll"
 return isc::eval::EvalParser::make_LBRACKET(loc);
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 239 "lexer.ll"
+#line 240 "lexer.ll"
 return isc::eval::EvalParser::make_RBRACKET(loc);
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 240 "lexer.ll"
+#line 241 "lexer.ll"
 return isc::eval::EvalParser::make_COMA(loc);
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 241 "lexer.ll"
+#line 242 "lexer.ll"
 return isc::eval::EvalParser::make_ANY(loc);
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 242 "lexer.ll"
+#line 243 "lexer.ll"
 return isc::eval::EvalParser::make_PLUS(loc);
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 243 "lexer.ll"
+#line 244 "lexer.ll"
 driver.error (loc, "Invalid character: " + std::string(evaltext));
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 244 "lexer.ll"
+#line 245 "lexer.ll"
 return isc::eval::EvalParser::make_END(loc);
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 245 "lexer.ll"
+#line 246 "lexer.ll"
 ECHO;
 	YY_BREAK
-#line 1849 "lexer.cc"
+#line 1850 "lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2958,7 +2959,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 245 "lexer.ll"
+#line 246 "lexer.ll"
 
 
 using namespace isc::eval;
diff --git a/src/lib/eval/location.hh b/src/lib/eval/location.hh
index 5bde47985a..b27872d23b 100644
--- a/src/lib/eval/location.hh
+++ b/src/lib/eval/location.hh
@@ -1,3 +1,4 @@
+// Generated 202308031547
 // A Bison parser, made by GNU Bison 3.8.2.
 
 // Locations for Bison parsers in C++