From: Francis Dupont Date: Wed, 17 May 2017 14:59:32 +0000 (+0000) Subject: [master] regen flex/bison files X-Git-Tag: trac5243_base~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5eedcbba73bd69fea70731cad629db40072f5e5;p=thirdparty%2Fkea.git [master] regen flex/bison files --- diff --git a/src/bin/agent/agent_lexer.cc b/src/bin/agent/agent_lexer.cc index 581d41065a..9cf0ec0d5e 100644 --- a/src/bin/agent/agent_lexer.cc +++ b/src/bin/agent/agent_lexer.cc @@ -1194,12 +1194,12 @@ int agent__flex_debug = 1; static const flex_int16_t yy_rule_linenum[56] = { 0, - 127, 129, 131, 136, 137, 142, 143, 144, 156, 159, - 164, 171, 180, 189, 198, 207, 216, 225, 234, 243, - 252, 261, 270, 279, 288, 297, 306, 315, 324, 333, - 342, 351, 360, 369, 378, 387, 396, 405, 503, 508, - 513, 518, 519, 520, 521, 522, 523, 525, 543, 556, - 561, 565, 567, 569, 571 + 129, 131, 133, 138, 139, 144, 145, 146, 158, 161, + 166, 173, 182, 191, 200, 209, 218, 227, 236, 245, + 254, 263, 272, 281, 290, 299, 308, 317, 326, 335, + 344, 353, 362, 371, 380, 389, 398, 407, 505, 510, + 515, 520, 521, 522, 523, 524, 525, 527, 545, 558, + 563, 567, 569, 571, 573 } ; /* The intent behind this definition is that it'll catch @@ -1227,10 +1227,12 @@ char *agent_text; #include #include -// Work around an incompatibility in flex (at least versions -// 2.5.31 through 2.5.33): it generates code that does -// not conform to C89. See Debian bug 333231 -// . +/* Please avoid C++ style comments (// ... eol) as they break flex 2.6.2 */ + +/* Work around an incompatibility in flex (at least versions + 2.5.31 through 2.5.33): it generates code that does + not conform to C89. See Debian bug 333231 + . */ # undef yywrap # define yywrap() 1 @@ -1246,9 +1248,9 @@ using isc::agent::AgentParser; }; -// To avoid the call to exit... oops! +/* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::agent::ParserContext::fatal(msg) -#line 1251 "agent_lexer.cc" +#line 1253 "agent_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 @@ -1269,13 +1271,13 @@ using isc::agent::AgentParser; can be used during actual token definitions. Note some can match incorrect inputs (e.g., IP addresses) which must be checked. */ /* for errors */ -#line 90 "agent_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. +#line 92 "agent_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 driver.loc_.columns(yyleng); -#line 1277 "agent_lexer.cc" -#line 1278 "agent_lexer.cc" +#line 1279 "agent_lexer.cc" +#line 1280 "agent_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1557,24 +1559,24 @@ YY_DECL { /* %% [7.0] user's declarations go here */ -#line 96 "agent_lexer.ll" +#line 98 "agent_lexer.ll" -#line 100 "agent_lexer.ll" - // This part of the code is copied over to the verbatim to the top - // of the generated yylex function. Explanation: - // http://www.gnu.org/software/bison/manual/html_node/Multiple-start_002dsymbols.html +#line 102 "agent_lexer.ll" + /* This part of the code is copied over to the verbatim to the top + of the generated yylex function. Explanation: + http://www.gnu.org/software/bison/manual/html_node/Multiple-start_002dsymbols.html */ - // Code run each time yylex is called. + /* Code run each time yylex is called. */ driver.loc_.step(); - // We currently have 3 points of entries defined: - // START_JSON - which expects any valid JSON - // START_AGENT - which expects full configuration (with outer map and Control-agent - // object in it. - // START_SUB_AGENT - which expects only content of the Control-agent, this is - // primarily useful for testing. + /* We currently have 3 points of entries defined: + START_JSON - which expects any valid JSON + START_AGENT - which expects full configuration (with outer map and Control-agent + object in it. + START_SUB_AGENT - which expects only content of the Control-agent, this is + primarily useful for testing. */ if (start_token_flag) { start_token_flag = false; switch (start_token_value) { @@ -1589,7 +1591,7 @@ YY_DECL } -#line 1592 "agent_lexer.cc" +#line 1594 "agent_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1667,17 +1669,17 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 127 "agent_lexer.ll" +#line 129 "agent_lexer.ll" ; YY_BREAK case 2: YY_RULE_SETUP -#line 129 "agent_lexer.ll" +#line 131 "agent_lexer.ll" ; YY_BREAK case 3: YY_RULE_SETUP -#line 131 "agent_lexer.ll" +#line 133 "agent_lexer.ll" { BEGIN(COMMENT); comment_start_line = driver.loc_.end.line;; @@ -1685,37 +1687,37 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 136 "agent_lexer.ll" +#line 138 "agent_lexer.ll" BEGIN(INITIAL); YY_BREAK case 5: YY_RULE_SETUP -#line 137 "agent_lexer.ll" +#line 139 "agent_lexer.ll" ; YY_BREAK case YY_STATE_EOF(COMMENT): -#line 138 "agent_lexer.ll" +#line 140 "agent_lexer.ll" { isc_throw(ParseError, "Comment not closed. (/* in line " << comment_start_line); } YY_BREAK case 6: YY_RULE_SETUP -#line 142 "agent_lexer.ll" +#line 144 "agent_lexer.ll" BEGIN(DIR_ENTER); YY_BREAK case 7: YY_RULE_SETUP -#line 143 "agent_lexer.ll" +#line 145 "agent_lexer.ll" BEGIN(DIR_INCLUDE); YY_BREAK case 8: YY_RULE_SETUP -#line 144 "agent_lexer.ll" +#line 146 "agent_lexer.ll" { - // Include directive. + /* Include directive. */ - // Extract the filename. + /* Extract the filename. */ std::string tmp(yytext+1); tmp.resize(tmp.size() - 1); @@ -1725,37 +1727,37 @@ YY_RULE_SETUP case YY_STATE_EOF(DIR_ENTER): case YY_STATE_EOF(DIR_INCLUDE): case YY_STATE_EOF(DIR_EXIT): -#line 153 "agent_lexer.ll" +#line 155 "agent_lexer.ll" { isc_throw(ParseError, "Directive not closed."); } YY_BREAK case 9: YY_RULE_SETUP -#line 156 "agent_lexer.ll" +#line 158 "agent_lexer.ll" BEGIN(INITIAL); YY_BREAK case 10: YY_RULE_SETUP -#line 159 "agent_lexer.ll" +#line 161 "agent_lexer.ll" { - // Ok, we found a with space. Let's ignore it and update loc variable. + /* Ok, we found a with space. Let's ignore it and update loc variable. */ driver.loc_.step(); } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 164 "agent_lexer.ll" +#line 166 "agent_lexer.ll" { - // Newline found. Let's update the location and continue. + /* Newline found. Let's update the location and continue. */ driver.loc_.lines(yyleng); driver.loc_.step(); } YY_BREAK case 12: YY_RULE_SETUP -#line 171 "agent_lexer.ll" +#line 173 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONFIG: @@ -1767,7 +1769,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 180 "agent_lexer.ll" +#line 182 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::AGENT: @@ -1779,7 +1781,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 189 "agent_lexer.ll" +#line 191 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::AGENT: @@ -1791,7 +1793,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 198 "agent_lexer.ll" +#line 200 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::AGENT: @@ -1803,7 +1805,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 207 "agent_lexer.ll" +#line 209 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONTROL_SOCKETS: @@ -1815,7 +1817,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 216 "agent_lexer.ll" +#line 218 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONTROL_SOCKETS: @@ -1827,7 +1829,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 225 "agent_lexer.ll" +#line 227 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONTROL_SOCKETS: @@ -1839,7 +1841,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 234 "agent_lexer.ll" +#line 236 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::SERVER: @@ -1851,7 +1853,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 243 "agent_lexer.ll" +#line 245 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::SERVER: @@ -1863,7 +1865,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 252 "agent_lexer.ll" +#line 254 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::SOCKET_TYPE: @@ -1875,7 +1877,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 261 "agent_lexer.ll" +#line 263 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::AGENT: @@ -1887,7 +1889,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 270 "agent_lexer.ll" +#line 272 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::HOOKS_LIBRARIES: @@ -1899,7 +1901,7 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 279 "agent_lexer.ll" +#line 281 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::HOOKS_LIBRARIES: @@ -1911,7 +1913,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 288 "agent_lexer.ll" +#line 290 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONFIG: @@ -1923,7 +1925,7 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 297 "agent_lexer.ll" +#line 299 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGING: @@ -1935,7 +1937,7 @@ YY_RULE_SETUP YY_BREAK case 27: YY_RULE_SETUP -#line 306 "agent_lexer.ll" +#line 308 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -1947,7 +1949,7 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 315 "agent_lexer.ll" +#line 317 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -1959,7 +1961,7 @@ YY_RULE_SETUP YY_BREAK case 29: YY_RULE_SETUP -#line 324 "agent_lexer.ll" +#line 326 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -1971,7 +1973,7 @@ YY_RULE_SETUP YY_BREAK case 30: YY_RULE_SETUP -#line 333 "agent_lexer.ll" +#line 335 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -1983,7 +1985,7 @@ YY_RULE_SETUP YY_BREAK case 31: YY_RULE_SETUP -#line 342 "agent_lexer.ll" +#line 344 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -1995,7 +1997,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 351 "agent_lexer.ll" +#line 353 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2007,7 +2009,7 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 360 "agent_lexer.ll" +#line 362 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2019,7 +2021,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 369 "agent_lexer.ll" +#line 371 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2031,7 +2033,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 378 "agent_lexer.ll" +#line 380 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONFIG: @@ -2043,7 +2045,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 387 "agent_lexer.ll" +#line 389 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONFIG: @@ -2055,7 +2057,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 396 "agent_lexer.ll" +#line 398 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONFIG: @@ -2067,11 +2069,11 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 405 "agent_lexer.ll" +#line 407 "agent_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. - // for 'foo' we should get foo + /* 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. + for 'foo' we should get foo */ std::string raw(yytext+1); size_t len = raw.size() - 1; raw.resize(len); @@ -2082,12 +2084,12 @@ YY_RULE_SETUP char c = raw[pos]; switch (c) { case '"': - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Bad quote in \"" + raw + "\""); case '\\': ++pos; if (pos >= len) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Overflow escape in \"" + raw + "\""); } c = raw[pos]; @@ -2113,10 +2115,10 @@ YY_RULE_SETUP decoded.push_back('\t'); break; case 'u': - // support only \u0000 to \u00ff + /* support only \u0000 to \u00ff */ ++pos; if (pos + 4 > len) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Overflow unicode escape in \"" + raw + "\""); } @@ -2132,7 +2134,7 @@ YY_RULE_SETUP } else if ((c >= 'a') && (c <= 'f')) { b = (c - 'a' + 10) << 4; } else { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Not hexadecimal in unicode escape in \"" + raw + "\""); } pos++; @@ -2144,19 +2146,19 @@ YY_RULE_SETUP } else if ((c >= 'a') && (c <= 'f')) { b |= c - 'a' + 10; } else { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Not hexadecimal in unicode escape in \"" + raw + "\""); } decoded.push_back(static_cast(b & 0xff)); break; default: - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Bad escape in \"" + raw + "\""); } break; default: if ((c >= 0) && (c < 0x20)) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Invalid control in \"" + raw + "\""); } decoded.push_back(c); @@ -2169,85 +2171,85 @@ YY_RULE_SETUP case 39: /* rule 39 can match eol */ YY_RULE_SETUP -#line 503 "agent_lexer.ll" +#line 505 "agent_lexer.ll" { - // Bad string with a forbidden control character inside + /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); } YY_BREAK case 40: /* rule 40 can match eol */ YY_RULE_SETUP -#line 508 "agent_lexer.ll" +#line 510 "agent_lexer.ll" { - // Bad string with a bad escape inside + /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); } YY_BREAK case 41: YY_RULE_SETUP -#line 513 "agent_lexer.ll" +#line 515 "agent_lexer.ll" { - // Bad string with an open escape at the end + /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); } YY_BREAK case 42: YY_RULE_SETUP -#line 518 "agent_lexer.ll" +#line 520 "agent_lexer.ll" { return AgentParser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK case 43: YY_RULE_SETUP -#line 519 "agent_lexer.ll" +#line 521 "agent_lexer.ll" { return AgentParser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK case 44: YY_RULE_SETUP -#line 520 "agent_lexer.ll" +#line 522 "agent_lexer.ll" { return AgentParser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK case 45: YY_RULE_SETUP -#line 521 "agent_lexer.ll" +#line 523 "agent_lexer.ll" { return AgentParser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK case 46: YY_RULE_SETUP -#line 522 "agent_lexer.ll" +#line 524 "agent_lexer.ll" { return AgentParser::make_COMMA(driver.loc_); } YY_BREAK case 47: YY_RULE_SETUP -#line 523 "agent_lexer.ll" +#line 525 "agent_lexer.ll" { return AgentParser::make_COLON(driver.loc_); } YY_BREAK case 48: YY_RULE_SETUP -#line 525 "agent_lexer.ll" +#line 527 "agent_lexer.ll" { - // An integer was found. + /* An integer was found. */ std::string tmp(yytext); int64_t integer = 0; try { - // In substring we want to use negative values (e.g. -1). - // In enterprise-id we need to use values up to 0xffffffff. - // To cover both of those use cases, we need at least - // int64_t. + /* In substring we want to use negative values (e.g. -1). + In enterprise-id we need to use values up to 0xffffffff. + To cover both of those use cases, we need at least + int64_t. */ integer = boost::lexical_cast(tmp); } catch (const boost::bad_lexical_cast &) { driver.error(driver.loc_, "Failed to convert " + tmp + " to an integer."); } - // The parser needs the string form as double conversion is no lossless + /* The parser needs the string form as double conversion is no lossless */ return AgentParser::make_INTEGER(integer, driver.loc_); } YY_BREAK case 49: YY_RULE_SETUP -#line 543 "agent_lexer.ll" +#line 545 "agent_lexer.ll" { - // A floating point was found. + /* A floating point was found. */ std::string tmp(yytext); double fp = 0.0; try { @@ -2261,7 +2263,7 @@ YY_RULE_SETUP YY_BREAK case 50: YY_RULE_SETUP -#line 556 "agent_lexer.ll" +#line 558 "agent_lexer.ll" { string tmp(yytext); return AgentParser::make_BOOLEAN(tmp == "true", driver.loc_); @@ -2269,33 +2271,33 @@ YY_RULE_SETUP YY_BREAK case 51: YY_RULE_SETUP -#line 561 "agent_lexer.ll" +#line 563 "agent_lexer.ll" { return AgentParser::make_NULL_TYPE(driver.loc_); } YY_BREAK case 52: YY_RULE_SETUP -#line 565 "agent_lexer.ll" +#line 567 "agent_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK case 53: YY_RULE_SETUP -#line 567 "agent_lexer.ll" +#line 569 "agent_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK case 54: YY_RULE_SETUP -#line 569 "agent_lexer.ll" +#line 571 "agent_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK case 55: YY_RULE_SETUP -#line 571 "agent_lexer.ll" +#line 573 "agent_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 573 "agent_lexer.ll" +#line 575 "agent_lexer.ll" { if (driver.states_.empty()) { return AgentParser::make_END(driver.loc_); @@ -2321,10 +2323,10 @@ case YY_STATE_EOF(INITIAL): YY_BREAK case 56: YY_RULE_SETUP -#line 596 "agent_lexer.ll" +#line 598 "agent_lexer.ll" ECHO; YY_BREAK -#line 2327 "agent_lexer.cc" +#line 2329 "agent_lexer.cc" case YY_END_OF_BUFFER: { @@ -3425,7 +3427,7 @@ void agent_free (void * ptr ) /* %ok-for-header */ -#line 596 "agent_lexer.ll" +#line 598 "agent_lexer.ll" using namespace isc::dhcp; @@ -3444,7 +3446,7 @@ ParserContext::scanStringBegin(const std::string& str, ParserType parser_type) buffer = agent__scan_bytes(str.c_str(), str.size()); if (!buffer) { fatal("cannot scan string"); - // fatal() throws an exception so this can't be reached + /* fatal() throws an exception so this can't be reached */ } } @@ -3462,7 +3464,7 @@ ParserContext::scanFileBegin(FILE * f, yy_flex_debug = trace_scanning_; YY_BUFFER_STATE buffer; - // See dhcp6_lexer.cc header for available definitions + /* See agent_lexer.cc header for available definitions */ buffer = agent__create_buffer(f, 65536 /*buffer size*/); if (!buffer) { fatal("cannot scan file " + filename); @@ -3476,7 +3478,7 @@ ParserContext::scanEnd() { fclose(sfile_); sfile_ = 0; static_cast(agent_lex_destroy()); - // Close files + /* Close files */ while (!sfiles_.empty()) { FILE* f = sfiles_.back(); if (f) { @@ -3484,7 +3486,7 @@ ParserContext::scanEnd() { } sfiles_.pop_back(); } - // Delete states + /* Delete states */ while (!states_.empty()) { agent__delete_buffer(states_.back()); states_.pop_back(); @@ -3521,9 +3523,9 @@ ParserContext::includeFile(const std::string& filename) { } namespace { -/// To avoid unused function error +/** To avoid unused function error */ class Dummy { - // cppcheck-suppress unusedPrivateFunction + /* cppcheck-suppress unusedPrivateFunction */ void dummy() { yy_fatal_error("Fix me: how to disable its definition?"); } }; } diff --git a/src/bin/agent/location.hh b/src/bin/agent/location.hh index df308046d7..7b54d7e04f 100644 --- a/src/bin/agent/location.hh +++ b/src/bin/agent/location.hh @@ -1,4 +1,4 @@ -// Generated 201704181958 +// Generated 201705171457 // A Bison parser, made by GNU Bison 3.0.4. // Locations for Bison parsers in C++ diff --git a/src/bin/agent/position.hh b/src/bin/agent/position.hh index 5889d0fb39..b3ed89836c 100644 --- a/src/bin/agent/position.hh +++ b/src/bin/agent/position.hh @@ -1,4 +1,4 @@ -// Generated 201704181958 +// Generated 201705171457 // A Bison parser, made by GNU Bison 3.0.4. // Positions for Bison parsers in C++ diff --git a/src/bin/agent/stack.hh b/src/bin/agent/stack.hh index 2acb332af7..eec4f44ef8 100644 --- a/src/bin/agent/stack.hh +++ b/src/bin/agent/stack.hh @@ -1,4 +1,4 @@ -// Generated 201704181958 +// Generated 201705171457 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++ diff --git a/src/bin/d2/d2_lexer.cc b/src/bin/d2/d2_lexer.cc index 294667de84..bd3a61ca9d 100644 --- a/src/bin/d2/d2_lexer.cc +++ b/src/bin/d2/d2_lexer.cc @@ -1265,12 +1265,12 @@ int d2_parser__flex_debug = 1; static const flex_int16_t yy_rule_linenum[61] = { 0, - 127, 129, 131, 136, 137, 142, 143, 144, 156, 159, - 164, 170, 179, 190, 201, 210, 219, 228, 238, 248, - 258, 267, 276, 286, 296, 306, 317, 326, 336, 346, - 357, 366, 375, 384, 393, 402, 411, 420, 433, 442, - 451, 460, 470, 568, 573, 578, 583, 584, 585, 586, - 587, 588, 590, 608, 621, 626, 630, 632, 634, 636 + 129, 131, 133, 138, 139, 144, 145, 146, 158, 161, + 166, 172, 181, 192, 203, 212, 221, 230, 240, 250, + 260, 269, 278, 288, 298, 308, 319, 328, 338, 348, + 359, 368, 377, 386, 395, 404, 413, 422, 435, 444, + 453, 462, 472, 570, 575, 580, 585, 586, 587, 588, + 589, 590, 592, 610, 623, 628, 632, 634, 636, 638 } ; /* The intent behind this definition is that it'll catch @@ -1297,10 +1297,12 @@ char *d2_parser_text; #include #include -// Work around an incompatibility in flex (at least versions -// 2.5.31 through 2.5.33): it generates code that does -// not conform to C89. See Debian bug 333231 -// . +/* Please avoid C++ style comments (// ... eol) as they break flex 2.6.2 */ + +/* Work around an incompatibility in flex (at least versions + 2.5.31 through 2.5.33): it generates code that does + not conform to C89. See Debian bug 333231 + . */ # undef yywrap # define yywrap() 1 @@ -1313,9 +1315,9 @@ unsigned int comment_start_line = 0; }; -// To avoid the call to exit... oops! +/* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::d2::D2ParserContext::fatal(msg) -#line 1318 "d2_lexer.cc" +#line 1320 "d2_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 @@ -1336,13 +1338,13 @@ unsigned int comment_start_line = 0; can be used during actual token definitions. Note some can match incorrect inputs (e.g., IP addresses) which must be checked. */ /* for errors */ -#line 86 "d2_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. +#line 88 "d2_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 driver.loc_.columns(yyleng); -#line 1344 "d2_lexer.cc" -#line 1345 "d2_lexer.cc" +#line 1346 "d2_lexer.cc" +#line 1347 "d2_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1624,16 +1626,16 @@ YY_DECL { /* %% [7.0] user's declarations go here */ -#line 92 "d2_lexer.ll" +#line 94 "d2_lexer.ll" -#line 96 "d2_lexer.ll" - // This part of the code is copied over to the verbatim to the top - // of the generated yylex function. Explanation: - // http://www.gnu.org/software/bison/manual/html_node/Multiple-start_002dsymbols.html +#line 98 "d2_lexer.ll" + /* This part of the code is copied over to the verbatim to the top + of the generated yylex function. Explanation: + http://www.gnu.org/software/bison/manual/html_node/Multiple-start_002dsymbols.html */ - // Code run each time yylex is called. + /* Code run each time yylex is called. */ driver.loc_.step(); if (start_token_flag) { @@ -1660,7 +1662,7 @@ YY_DECL } -#line 1663 "d2_lexer.cc" +#line 1665 "d2_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1738,17 +1740,17 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 127 "d2_lexer.ll" +#line 129 "d2_lexer.ll" ; YY_BREAK case 2: YY_RULE_SETUP -#line 129 "d2_lexer.ll" +#line 131 "d2_lexer.ll" ; YY_BREAK case 3: YY_RULE_SETUP -#line 131 "d2_lexer.ll" +#line 133 "d2_lexer.ll" { BEGIN(COMMENT); comment_start_line = driver.loc_.end.line;; @@ -1756,37 +1758,37 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 136 "d2_lexer.ll" +#line 138 "d2_lexer.ll" BEGIN(INITIAL); YY_BREAK case 5: YY_RULE_SETUP -#line 137 "d2_lexer.ll" +#line 139 "d2_lexer.ll" ; YY_BREAK case YY_STATE_EOF(COMMENT): -#line 138 "d2_lexer.ll" +#line 140 "d2_lexer.ll" { isc_throw(D2ParseError, "Comment not closed. (/* in line " << comment_start_line); } YY_BREAK case 6: YY_RULE_SETUP -#line 142 "d2_lexer.ll" +#line 144 "d2_lexer.ll" BEGIN(DIR_ENTER); YY_BREAK case 7: YY_RULE_SETUP -#line 143 "d2_lexer.ll" +#line 145 "d2_lexer.ll" BEGIN(DIR_INCLUDE); YY_BREAK case 8: YY_RULE_SETUP -#line 144 "d2_lexer.ll" +#line 146 "d2_lexer.ll" { - // Include directive. + /* Include directive. */ - // Extract the filename. + /* Extract the filename. */ std::string tmp(yytext+1); tmp.resize(tmp.size() - 1); @@ -1796,37 +1798,37 @@ YY_RULE_SETUP case YY_STATE_EOF(DIR_ENTER): case YY_STATE_EOF(DIR_INCLUDE): case YY_STATE_EOF(DIR_EXIT): -#line 153 "d2_lexer.ll" +#line 155 "d2_lexer.ll" { isc_throw(D2ParseError, "Directive not closed."); } YY_BREAK case 9: YY_RULE_SETUP -#line 156 "d2_lexer.ll" +#line 158 "d2_lexer.ll" BEGIN(INITIAL); YY_BREAK case 10: YY_RULE_SETUP -#line 159 "d2_lexer.ll" +#line 161 "d2_lexer.ll" { - // Ok, we found a with space. Let's ignore it and update loc variable. + /* Ok, we found a with space. Let's ignore it and update loc variable. */ driver.loc_.step(); } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 164 "d2_lexer.ll" +#line 166 "d2_lexer.ll" { - // Newline found. Let's update the location and continue. + /* Newline found. Let's update the location and continue. */ driver.loc_.lines(yyleng); driver.loc_.step(); } YY_BREAK case 12: YY_RULE_SETUP -#line 170 "d2_lexer.ll" +#line 172 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -1838,7 +1840,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 179 "d2_lexer.ll" +#line 181 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DHCPDDNS: @@ -1852,7 +1854,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 190 "d2_lexer.ll" +#line 192 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DHCPDDNS: @@ -1866,7 +1868,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 201 "d2_lexer.ll" +#line 203 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DHCPDDNS: @@ -1878,7 +1880,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 210 "d2_lexer.ll" +#line 212 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DHCPDDNS: @@ -1890,7 +1892,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 219 "d2_lexer.ll" +#line 221 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DHCPDDNS: @@ -1902,7 +1904,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 228 "d2_lexer.ll" +#line 230 "d2_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::d2::D2ParserContext::NCR_PROTOCOL) { @@ -1915,7 +1917,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 238 "d2_lexer.ll" +#line 240 "d2_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::d2::D2ParserContext::NCR_PROTOCOL) { @@ -1928,7 +1930,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 248 "d2_lexer.ll" +#line 250 "d2_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::d2::D2ParserContext::NCR_FORMAT) { @@ -1941,7 +1943,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 258 "d2_lexer.ll" +#line 260 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DHCPDDNS: @@ -1953,7 +1955,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 267 "d2_lexer.ll" +#line 269 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DHCPDDNS: @@ -1965,7 +1967,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 276 "d2_lexer.ll" +#line 278 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::FORWARD_DDNS: @@ -1978,7 +1980,7 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 286 "d2_lexer.ll" +#line 288 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DDNS_DOMAIN: @@ -1991,7 +1993,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 296 "d2_lexer.ll" +#line 298 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DDNS_DOMAIN: @@ -2004,7 +2006,7 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 306 "d2_lexer.ll" +#line 308 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DNS_SERVER: @@ -2017,7 +2019,7 @@ YY_RULE_SETUP YY_BREAK case 27: YY_RULE_SETUP -#line 317 "d2_lexer.ll" +#line 319 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::DHCPDDNS: @@ -2029,7 +2031,7 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 326 "d2_lexer.ll" +#line 328 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::TSIG_KEY: @@ -2042,7 +2044,7 @@ YY_RULE_SETUP YY_BREAK case 29: YY_RULE_SETUP -#line 336 "d2_lexer.ll" +#line 338 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::TSIG_KEY: @@ -2055,7 +2057,7 @@ YY_RULE_SETUP YY_BREAK case 30: YY_RULE_SETUP -#line 346 "d2_lexer.ll" +#line 348 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::TSIG_KEY: @@ -2068,7 +2070,7 @@ YY_RULE_SETUP YY_BREAK case 31: YY_RULE_SETUP -#line 357 "d2_lexer.ll" +#line 359 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2080,7 +2082,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 366 "d2_lexer.ll" +#line 368 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGING: @@ -2092,7 +2094,7 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 375 "d2_lexer.ll" +#line 377 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2104,7 +2106,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 384 "d2_lexer.ll" +#line 386 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2116,7 +2118,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 393 "d2_lexer.ll" +#line 395 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2128,7 +2130,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 402 "d2_lexer.ll" +#line 404 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2140,7 +2142,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 411 "d2_lexer.ll" +#line 413 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2152,7 +2154,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 420 "d2_lexer.ll" +#line 422 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2168,7 +2170,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 433 "d2_lexer.ll" +#line 435 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2180,7 +2182,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 442 "d2_lexer.ll" +#line 444 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2192,7 +2194,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 451 "d2_lexer.ll" +#line 453 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2204,7 +2206,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 460 "d2_lexer.ll" +#line 462 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2216,11 +2218,11 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 470 "d2_lexer.ll" +#line 472 "d2_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. - // for 'foo' we should get foo + /* 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. + for 'foo' we should get foo */ std::string raw(yytext+1); size_t len = raw.size() - 1; raw.resize(len); @@ -2231,12 +2233,12 @@ YY_RULE_SETUP char c = raw[pos]; switch (c) { case '"': - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Bad quote in \"" + raw + "\""); case '\\': ++pos; if (pos >= len) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Overflow escape in \"" + raw + "\""); } c = raw[pos]; @@ -2262,10 +2264,10 @@ YY_RULE_SETUP decoded.push_back('\t'); break; case 'u': - // support only \u0000 to \u00ff + /* support only \u0000 to \u00ff */ ++pos; if (pos + 4 > len) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Overflow unicode escape in \"" + raw + "\""); } @@ -2281,7 +2283,7 @@ YY_RULE_SETUP } else if ((c >= 'a') && (c <= 'f')) { b = (c - 'a' + 10) << 4; } else { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Not hexadecimal in unicode escape in \"" + raw + "\""); } pos++; @@ -2293,19 +2295,19 @@ YY_RULE_SETUP } else if ((c >= 'a') && (c <= 'f')) { b |= c - 'a' + 10; } else { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Not hexadecimal in unicode escape in \"" + raw + "\""); } decoded.push_back(static_cast(b & 0xff)); break; default: - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Bad escape in \"" + raw + "\""); } break; default: if ((c >= 0) && (c < 0x20)) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Invalid control in \"" + raw + "\""); } decoded.push_back(c); @@ -2318,85 +2320,85 @@ YY_RULE_SETUP case 44: /* rule 44 can match eol */ YY_RULE_SETUP -#line 568 "d2_lexer.ll" +#line 570 "d2_lexer.ll" { - // Bad string with a forbidden control character inside + /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); } YY_BREAK case 45: /* rule 45 can match eol */ YY_RULE_SETUP -#line 573 "d2_lexer.ll" +#line 575 "d2_lexer.ll" { - // Bad string with a bad escape inside + /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); } YY_BREAK case 46: YY_RULE_SETUP -#line 578 "d2_lexer.ll" +#line 580 "d2_lexer.ll" { - // Bad string with an open escape at the end + /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); } YY_BREAK case 47: YY_RULE_SETUP -#line 583 "d2_lexer.ll" +#line 585 "d2_lexer.ll" { return isc::d2::D2Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK case 48: YY_RULE_SETUP -#line 584 "d2_lexer.ll" +#line 586 "d2_lexer.ll" { return isc::d2::D2Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK case 49: YY_RULE_SETUP -#line 585 "d2_lexer.ll" +#line 587 "d2_lexer.ll" { return isc::d2::D2Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK case 50: YY_RULE_SETUP -#line 586 "d2_lexer.ll" +#line 588 "d2_lexer.ll" { return isc::d2::D2Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK case 51: YY_RULE_SETUP -#line 587 "d2_lexer.ll" +#line 589 "d2_lexer.ll" { return isc::d2::D2Parser::make_COMMA(driver.loc_); } YY_BREAK case 52: YY_RULE_SETUP -#line 588 "d2_lexer.ll" +#line 590 "d2_lexer.ll" { return isc::d2::D2Parser::make_COLON(driver.loc_); } YY_BREAK case 53: YY_RULE_SETUP -#line 590 "d2_lexer.ll" +#line 592 "d2_lexer.ll" { - // An integer was found. + /* An integer was found. */ std::string tmp(yytext); int64_t integer = 0; try { - // In substring we want to use negative values (e.g. -1). - // In enterprise-id we need to use values up to 0xffffffff. - // To cover both of those use cases, we need at least - // int64_t. + /* In substring we want to use negative values (e.g. -1). + In enterprise-id we need to use values up to 0xffffffff. + To cover both of those use cases, we need at least + int64_t. */ integer = boost::lexical_cast(tmp); } catch (const boost::bad_lexical_cast &) { driver.error(driver.loc_, "Failed to convert " + tmp + " to an integer."); } - // The parser needs the string form as double conversion is no lossless + /* The parser needs the string form as double conversion is no lossless */ return isc::d2::D2Parser::make_INTEGER(integer, driver.loc_); } YY_BREAK case 54: YY_RULE_SETUP -#line 608 "d2_lexer.ll" +#line 610 "d2_lexer.ll" { - // A floating point was found. + /* A floating point was found. */ std::string tmp(yytext); double fp = 0.0; try { @@ -2410,7 +2412,7 @@ YY_RULE_SETUP YY_BREAK case 55: YY_RULE_SETUP -#line 621 "d2_lexer.ll" +#line 623 "d2_lexer.ll" { string tmp(yytext); return isc::d2::D2Parser::make_BOOLEAN(tmp == "true", driver.loc_); @@ -2418,33 +2420,33 @@ YY_RULE_SETUP YY_BREAK case 56: YY_RULE_SETUP -#line 626 "d2_lexer.ll" +#line 628 "d2_lexer.ll" { return isc::d2::D2Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK case 57: YY_RULE_SETUP -#line 630 "d2_lexer.ll" +#line 632 "d2_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK case 58: YY_RULE_SETUP -#line 632 "d2_lexer.ll" +#line 634 "d2_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK case 59: YY_RULE_SETUP -#line 634 "d2_lexer.ll" +#line 636 "d2_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK case 60: YY_RULE_SETUP -#line 636 "d2_lexer.ll" +#line 638 "d2_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 638 "d2_lexer.ll" +#line 640 "d2_lexer.ll" { if (driver.states_.empty()) { return isc::d2::D2Parser::make_END(driver.loc_); @@ -2470,10 +2472,10 @@ case YY_STATE_EOF(INITIAL): YY_BREAK case 61: YY_RULE_SETUP -#line 661 "d2_lexer.ll" +#line 663 "d2_lexer.ll" ECHO; YY_BREAK -#line 2476 "d2_lexer.cc" +#line 2478 "d2_lexer.cc" case YY_END_OF_BUFFER: { @@ -3574,7 +3576,7 @@ void d2_parser_free (void * ptr ) /* %ok-for-header */ -#line 661 "d2_lexer.ll" +#line 663 "d2_lexer.ll" using namespace isc::dhcp; @@ -3593,7 +3595,7 @@ D2ParserContext::scanStringBegin(const std::string& str, ParserType parser_type) buffer = d2_parser__scan_bytes(str.c_str(), str.size()); if (!buffer) { fatal("cannot scan string"); - // fatal() throws an exception so this can't be reached + /* fatal() throws an exception so this can't be reached */ } } @@ -3611,7 +3613,7 @@ D2ParserContext::scanFileBegin(FILE * f, yy_flex_debug = trace_scanning_; YY_BUFFER_STATE buffer; - // See d2_lexer.cc header for available definitions + /* See d2_lexer.cc header for available definitions */ buffer = d2_parser__create_buffer(f, 65536 /*buffer size*/); if (!buffer) { fatal("cannot scan file " + filename); @@ -3625,7 +3627,7 @@ D2ParserContext::scanEnd() { fclose(sfile_); sfile_ = 0; static_cast(d2_parser_lex_destroy()); - // Close files + /* Close files */ while (!sfiles_.empty()) { FILE* f = sfiles_.back(); if (f) { @@ -3633,7 +3635,7 @@ D2ParserContext::scanEnd() { } sfiles_.pop_back(); } - // Delete states + /* Delete states */ while (!states_.empty()) { d2_parser__delete_buffer(states_.back()); states_.pop_back(); @@ -3670,9 +3672,9 @@ D2ParserContext::includeFile(const std::string& filename) { } namespace { -/// To avoid unused function error +/** To avoid unused function error */ class Dummy { - // cppcheck-suppress unusedPrivateFunction + /* cppcheck-suppress unusedPrivateFunction */ void dummy() { yy_fatal_error("Fix me: how to disable its definition?"); } }; } diff --git a/src/bin/d2/location.hh b/src/bin/d2/location.hh index 852d394c3c..89f0aa9981 100644 --- a/src/bin/d2/location.hh +++ b/src/bin/d2/location.hh @@ -1,4 +1,4 @@ -// Generated 201704181957 +// Generated 201705171457 // A Bison parser, made by GNU Bison 3.0.4. // Locations for Bison parsers in C++ diff --git a/src/bin/d2/position.hh b/src/bin/d2/position.hh index 9fb5afd98d..813a7f7723 100644 --- a/src/bin/d2/position.hh +++ b/src/bin/d2/position.hh @@ -1,4 +1,4 @@ -// Generated 201704181957 +// Generated 201705171457 // A Bison parser, made by GNU Bison 3.0.4. // Positions for Bison parsers in C++ diff --git a/src/bin/d2/stack.hh b/src/bin/d2/stack.hh index 150193d0f8..899a5511a5 100644 --- a/src/bin/d2/stack.hh +++ b/src/bin/d2/stack.hh @@ -1,4 +1,4 @@ -// Generated 201704181957 +// Generated 201705171457 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++ diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc index a83dc449fe..b5e6f8f114 100644 --- a/src/bin/dhcp4/dhcp4_lexer.cc +++ b/src/bin/dhcp4/dhcp4_lexer.cc @@ -1355,22 +1355,22 @@ int parser4__flex_debug = 1; static const flex_int16_t yy_rule_linenum[147] = { 0, - 131, 133, 135, 140, 141, 146, 147, 148, 160, 163, - 168, 175, 184, 193, 202, 211, 221, 230, 239, 248, - 257, 268, 277, 286, 295, 304, 314, 324, 334, 344, - 354, 364, 374, 384, 394, 404, 414, 424, 433, 442, - 451, 465, 480, 489, 498, 507, 516, 525, 534, 543, - 552, 561, 570, 580, 589, 598, 607, 616, 625, 634, - 643, 652, 661, 670, 680, 690, 700, 709, 719, 729, - 739, 749, 759, 768, 778, 787, 796, 805, 814, 823, - 833, 843, 852, 861, 870, 879, 888, 897, 906, 915, - 924, 933, 942, 951, 960, 969, 978, 987, 996, 1005, - - 1014, 1023, 1032, 1041, 1050, 1059, 1068, 1077, 1086, 1095, - 1105, 1115, 1125, 1135, 1145, 1155, 1165, 1175, 1185, 1194, - 1203, 1212, 1221, 1230, 1240, 1250, 1262, 1273, 1286, 1384, - 1389, 1394, 1399, 1400, 1401, 1402, 1403, 1404, 1406, 1424, - 1437, 1442, 1446, 1448, 1450, 1452 + 133, 135, 137, 142, 143, 148, 149, 150, 162, 165, + 170, 177, 186, 195, 204, 213, 223, 232, 241, 250, + 259, 270, 279, 288, 297, 306, 316, 326, 336, 346, + 356, 366, 376, 386, 396, 406, 416, 426, 435, 444, + 453, 467, 482, 491, 500, 509, 518, 527, 536, 545, + 554, 563, 572, 582, 591, 600, 609, 618, 627, 636, + 645, 654, 663, 672, 682, 692, 702, 711, 721, 731, + 741, 751, 761, 770, 780, 789, 798, 807, 816, 825, + 835, 845, 854, 863, 872, 881, 890, 899, 908, 917, + 926, 935, 944, 953, 962, 971, 980, 989, 998, 1007, + + 1016, 1025, 1034, 1043, 1052, 1061, 1070, 1079, 1088, 1097, + 1107, 1117, 1127, 1137, 1147, 1157, 1167, 1177, 1187, 1196, + 1205, 1214, 1223, 1232, 1242, 1252, 1264, 1275, 1288, 1386, + 1391, 1396, 1401, 1402, 1403, 1404, 1405, 1406, 1408, 1426, + 1439, 1444, 1448, 1450, 1452, 1454 } ; /* The intent behind this definition is that it'll catch @@ -1397,10 +1397,12 @@ char *parser4_text; #include #include -// Work around an incompatibility in flex (at least versions -// 2.5.31 through 2.5.33): it generates code that does -// not conform to C89. See Debian bug 333231 -// . +/* Please avoid C++ style comments (// ... eol) as they break flex 2.6.2 */ + +/* Work around an incompatibility in flex (at least versions + 2.5.31 through 2.5.33): it generates code that does + not conform to C89. See Debian bug 333231 + . */ # undef yywrap # define yywrap() 1 @@ -1413,9 +1415,9 @@ unsigned int comment_start_line = 0; }; -// To avoid the call to exit... oops! +/* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::dhcp::Parser4Context::fatal(msg) -#line 1418 "dhcp4_lexer.cc" +#line 1420 "dhcp4_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 @@ -1436,13 +1438,13 @@ unsigned int comment_start_line = 0; can be used during actual token definitions. Note some can match incorrect inputs (e.g., IP addresses) which must be checked. */ /* for errors */ -#line 86 "dhcp4_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. +#line 88 "dhcp4_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 driver.loc_.columns(yyleng); -#line 1444 "dhcp4_lexer.cc" -#line 1445 "dhcp4_lexer.cc" +#line 1446 "dhcp4_lexer.cc" +#line 1447 "dhcp4_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1724,16 +1726,16 @@ YY_DECL { /* %% [7.0] user's declarations go here */ -#line 92 "dhcp4_lexer.ll" +#line 94 "dhcp4_lexer.ll" -#line 96 "dhcp4_lexer.ll" - // This part of the code is copied over to the verbatim to the top - // of the generated yylex function. Explanation: - // http://www.gnu.org/software/bison/manual/html_node/Multiple-start_002dsymbols.html +#line 98 "dhcp4_lexer.ll" + /* This part of the code is copied over to the verbatim to the top + of the generated yylex function. Explanation: + http://www.gnu.org/software/bison/manual/html_node/Multiple-start_002dsymbols.html */ - // Code run each time yylex is called. + /* Code run each time yylex is called. */ driver.loc_.step(); if (start_token_flag) { @@ -1764,7 +1766,7 @@ YY_DECL } -#line 1767 "dhcp4_lexer.cc" +#line 1769 "dhcp4_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1842,17 +1844,17 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 131 "dhcp4_lexer.ll" +#line 133 "dhcp4_lexer.ll" ; YY_BREAK case 2: YY_RULE_SETUP -#line 133 "dhcp4_lexer.ll" +#line 135 "dhcp4_lexer.ll" ; YY_BREAK case 3: YY_RULE_SETUP -#line 135 "dhcp4_lexer.ll" +#line 137 "dhcp4_lexer.ll" { BEGIN(COMMENT); comment_start_line = driver.loc_.end.line;; @@ -1860,37 +1862,37 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 140 "dhcp4_lexer.ll" +#line 142 "dhcp4_lexer.ll" BEGIN(INITIAL); YY_BREAK case 5: YY_RULE_SETUP -#line 141 "dhcp4_lexer.ll" +#line 143 "dhcp4_lexer.ll" ; YY_BREAK case YY_STATE_EOF(COMMENT): -#line 142 "dhcp4_lexer.ll" +#line 144 "dhcp4_lexer.ll" { isc_throw(Dhcp4ParseError, "Comment not closed. (/* in line " << comment_start_line); } YY_BREAK case 6: YY_RULE_SETUP -#line 146 "dhcp4_lexer.ll" +#line 148 "dhcp4_lexer.ll" BEGIN(DIR_ENTER); YY_BREAK case 7: YY_RULE_SETUP -#line 147 "dhcp4_lexer.ll" +#line 149 "dhcp4_lexer.ll" BEGIN(DIR_INCLUDE); YY_BREAK case 8: YY_RULE_SETUP -#line 148 "dhcp4_lexer.ll" +#line 150 "dhcp4_lexer.ll" { - // Include directive. + /* Include directive. */ - // Extract the filename. + /* Extract the filename. */ std::string tmp(yytext+1); tmp.resize(tmp.size() - 1); @@ -1900,37 +1902,37 @@ YY_RULE_SETUP case YY_STATE_EOF(DIR_ENTER): case YY_STATE_EOF(DIR_INCLUDE): case YY_STATE_EOF(DIR_EXIT): -#line 157 "dhcp4_lexer.ll" +#line 159 "dhcp4_lexer.ll" { isc_throw(Dhcp4ParseError, "Directive not closed."); } YY_BREAK case 9: YY_RULE_SETUP -#line 160 "dhcp4_lexer.ll" +#line 162 "dhcp4_lexer.ll" BEGIN(INITIAL); YY_BREAK case 10: YY_RULE_SETUP -#line 163 "dhcp4_lexer.ll" +#line 165 "dhcp4_lexer.ll" { - // Ok, we found a with space. Let's ignore it and update loc variable. + /* Ok, we found a with space. Let's ignore it and update loc variable. */ driver.loc_.step(); } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 168 "dhcp4_lexer.ll" +#line 170 "dhcp4_lexer.ll" { - // Newline found. Let's update the location and continue. + /* Newline found. Let's update the location and continue. */ driver.loc_.lines(yyleng); driver.loc_.step(); } YY_BREAK case 12: YY_RULE_SETUP -#line 175 "dhcp4_lexer.ll" +#line 177 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -1942,7 +1944,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 184 "dhcp4_lexer.ll" +#line 186 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1954,7 +1956,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 193 "dhcp4_lexer.ll" +#line 195 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::INTERFACES_CONFIG: @@ -1966,7 +1968,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 202 "dhcp4_lexer.ll" +#line 204 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_SOCKET_TYPE: @@ -1978,7 +1980,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 211 "dhcp4_lexer.ll" +#line 213 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_SOCKET_TYPE: @@ -1991,7 +1993,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 221 "dhcp4_lexer.ll" +#line 223 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::INTERFACES_CONFIG: @@ -2003,7 +2005,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 230 "dhcp4_lexer.ll" +#line 232 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2015,7 +2017,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 239 "dhcp4_lexer.ll" +#line 241 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2027,7 +2029,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 248 "dhcp4_lexer.ll" +#line 250 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOSTS_DATABASE: @@ -2039,7 +2041,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 257 "dhcp4_lexer.ll" +#line 259 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2053,7 +2055,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 268 "dhcp4_lexer.ll" +#line 270 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DATABASE_TYPE: @@ -2065,7 +2067,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 277 "dhcp4_lexer.ll" +#line 279 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DATABASE_TYPE: @@ -2077,7 +2079,7 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 286 "dhcp4_lexer.ll" +#line 288 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DATABASE_TYPE: @@ -2089,7 +2091,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 295 "dhcp4_lexer.ll" +#line 297 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DATABASE_TYPE: @@ -2101,7 +2103,7 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 304 "dhcp4_lexer.ll" +#line 306 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2114,7 +2116,7 @@ YY_RULE_SETUP YY_BREAK case 27: YY_RULE_SETUP -#line 314 "dhcp4_lexer.ll" +#line 316 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2127,7 +2129,7 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 324 "dhcp4_lexer.ll" +#line 326 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2140,7 +2142,7 @@ YY_RULE_SETUP YY_BREAK case 29: YY_RULE_SETUP -#line 334 "dhcp4_lexer.ll" +#line 336 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2153,7 +2155,7 @@ YY_RULE_SETUP YY_BREAK case 30: YY_RULE_SETUP -#line 344 "dhcp4_lexer.ll" +#line 346 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2166,7 +2168,7 @@ YY_RULE_SETUP YY_BREAK case 31: YY_RULE_SETUP -#line 354 "dhcp4_lexer.ll" +#line 356 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2179,7 +2181,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 364 "dhcp4_lexer.ll" +#line 366 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2192,7 +2194,7 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 374 "dhcp4_lexer.ll" +#line 376 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2205,7 +2207,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 384 "dhcp4_lexer.ll" +#line 386 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2218,7 +2220,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 394 "dhcp4_lexer.ll" +#line 396 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2231,7 +2233,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 404 "dhcp4_lexer.ll" +#line 406 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2244,7 +2246,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 414 "dhcp4_lexer.ll" +#line 416 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2257,7 +2259,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 424 "dhcp4_lexer.ll" +#line 426 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2269,7 +2271,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 433 "dhcp4_lexer.ll" +#line 435 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2281,7 +2283,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 442 "dhcp4_lexer.ll" +#line 444 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2293,7 +2295,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 451 "dhcp4_lexer.ll" +#line 453 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2310,7 +2312,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 465 "dhcp4_lexer.ll" +#line 467 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -2328,7 +2330,7 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 480 "dhcp4_lexer.ll" +#line 482 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DATA: @@ -2340,7 +2342,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 489 "dhcp4_lexer.ll" +#line 491 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2352,7 +2354,7 @@ YY_RULE_SETUP YY_BREAK case 45: YY_RULE_SETUP -#line 498 "dhcp4_lexer.ll" +#line 500 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::POOLS: @@ -2364,7 +2366,7 @@ YY_RULE_SETUP YY_BREAK case 46: YY_RULE_SETUP -#line 507 "dhcp4_lexer.ll" +#line 509 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::POOLS: @@ -2376,7 +2378,7 @@ YY_RULE_SETUP YY_BREAK case 47: YY_RULE_SETUP -#line 516 "dhcp4_lexer.ll" +#line 518 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2388,7 +2390,7 @@ YY_RULE_SETUP YY_BREAK case 48: YY_RULE_SETUP -#line 525 "dhcp4_lexer.ll" +#line 527 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2400,7 +2402,7 @@ YY_RULE_SETUP YY_BREAK case 49: YY_RULE_SETUP -#line 534 "dhcp4_lexer.ll" +#line 536 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2412,7 +2414,7 @@ YY_RULE_SETUP YY_BREAK case 50: YY_RULE_SETUP -#line 543 "dhcp4_lexer.ll" +#line 545 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2424,7 +2426,7 @@ YY_RULE_SETUP YY_BREAK case 51: YY_RULE_SETUP -#line 552 "dhcp4_lexer.ll" +#line 554 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2436,7 +2438,7 @@ YY_RULE_SETUP YY_BREAK case 52: YY_RULE_SETUP -#line 561 "dhcp4_lexer.ll" +#line 563 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2448,7 +2450,7 @@ YY_RULE_SETUP YY_BREAK case 53: YY_RULE_SETUP -#line 570 "dhcp4_lexer.ll" +#line 572 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2461,7 +2463,7 @@ YY_RULE_SETUP YY_BREAK case 54: YY_RULE_SETUP -#line 580 "dhcp4_lexer.ll" +#line 582 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2473,7 +2475,7 @@ YY_RULE_SETUP YY_BREAK case 55: YY_RULE_SETUP -#line 589 "dhcp4_lexer.ll" +#line 591 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -2485,7 +2487,7 @@ YY_RULE_SETUP YY_BREAK case 56: YY_RULE_SETUP -#line 598 "dhcp4_lexer.ll" +#line 600 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGING: @@ -2497,7 +2499,7 @@ YY_RULE_SETUP YY_BREAK case 57: YY_RULE_SETUP -#line 607 "dhcp4_lexer.ll" +#line 609 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -2509,7 +2511,7 @@ YY_RULE_SETUP YY_BREAK case 58: YY_RULE_SETUP -#line 616 "dhcp4_lexer.ll" +#line 618 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OUTPUT_OPTIONS: @@ -2521,7 +2523,7 @@ YY_RULE_SETUP YY_BREAK case 59: YY_RULE_SETUP -#line 625 "dhcp4_lexer.ll" +#line 627 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -2533,7 +2535,7 @@ YY_RULE_SETUP YY_BREAK case 60: YY_RULE_SETUP -#line 634 "dhcp4_lexer.ll" +#line 636 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OUTPUT_OPTIONS: @@ -2545,7 +2547,7 @@ YY_RULE_SETUP YY_BREAK case 61: YY_RULE_SETUP -#line 643 "dhcp4_lexer.ll" +#line 645 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OUTPUT_OPTIONS: @@ -2557,7 +2559,7 @@ YY_RULE_SETUP YY_BREAK case 62: YY_RULE_SETUP -#line 652 "dhcp4_lexer.ll" +#line 654 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OUTPUT_OPTIONS: @@ -2569,7 +2571,7 @@ YY_RULE_SETUP YY_BREAK case 63: YY_RULE_SETUP -#line 661 "dhcp4_lexer.ll" +#line 663 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -2581,7 +2583,7 @@ YY_RULE_SETUP YY_BREAK case 64: YY_RULE_SETUP -#line 670 "dhcp4_lexer.ll" +#line 672 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2594,7 +2596,7 @@ YY_RULE_SETUP YY_BREAK case 65: YY_RULE_SETUP -#line 680 "dhcp4_lexer.ll" +#line 682 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2607,7 +2609,7 @@ YY_RULE_SETUP YY_BREAK case 66: YY_RULE_SETUP -#line 690 "dhcp4_lexer.ll" +#line 692 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CLIENT_CLASSES: @@ -2620,7 +2622,7 @@ YY_RULE_SETUP YY_BREAK case 67: YY_RULE_SETUP -#line 700 "dhcp4_lexer.ll" +#line 702 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2632,7 +2634,7 @@ YY_RULE_SETUP YY_BREAK case 68: YY_RULE_SETUP -#line 709 "dhcp4_lexer.ll" +#line 711 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -2645,7 +2647,7 @@ YY_RULE_SETUP YY_BREAK case 69: YY_RULE_SETUP -#line 719 "dhcp4_lexer.ll" +#line 721 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -2658,7 +2660,7 @@ YY_RULE_SETUP YY_BREAK case 70: YY_RULE_SETUP -#line 729 "dhcp4_lexer.ll" +#line 731 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -2671,7 +2673,7 @@ YY_RULE_SETUP YY_BREAK case 71: YY_RULE_SETUP -#line 739 "dhcp4_lexer.ll" +#line 741 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -2684,7 +2686,7 @@ YY_RULE_SETUP YY_BREAK case 72: YY_RULE_SETUP -#line 749 "dhcp4_lexer.ll" +#line 751 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -2697,7 +2699,7 @@ YY_RULE_SETUP YY_BREAK case 73: YY_RULE_SETUP -#line 759 "dhcp4_lexer.ll" +#line 761 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RESERVATIONS: @@ -2709,7 +2711,7 @@ YY_RULE_SETUP YY_BREAK case 74: YY_RULE_SETUP -#line 768 "dhcp4_lexer.ll" +#line 770 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2722,7 +2724,7 @@ YY_RULE_SETUP YY_BREAK case 75: YY_RULE_SETUP -#line 778 "dhcp4_lexer.ll" +#line 780 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DATA: @@ -2734,7 +2736,7 @@ YY_RULE_SETUP YY_BREAK case 76: YY_RULE_SETUP -#line 787 "dhcp4_lexer.ll" +#line 789 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2746,7 +2748,7 @@ YY_RULE_SETUP YY_BREAK case 77: YY_RULE_SETUP -#line 796 "dhcp4_lexer.ll" +#line 798 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2758,7 +2760,7 @@ YY_RULE_SETUP YY_BREAK case 78: YY_RULE_SETUP -#line 805 "dhcp4_lexer.ll" +#line 807 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2770,7 +2772,7 @@ YY_RULE_SETUP YY_BREAK case 79: YY_RULE_SETUP -#line 814 "dhcp4_lexer.ll" +#line 816 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2782,7 +2784,7 @@ YY_RULE_SETUP YY_BREAK case 80: YY_RULE_SETUP -#line 823 "dhcp4_lexer.ll" +#line 825 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RELAY: @@ -2795,7 +2797,7 @@ YY_RULE_SETUP YY_BREAK case 81: YY_RULE_SETUP -#line 833 "dhcp4_lexer.ll" +#line 835 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2807,7 +2809,7 @@ YY_RULE_SETUP YY_BREAK case 82: YY_RULE_SETUP -#line 843 "dhcp4_lexer.ll" +#line 845 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOOKS_LIBRARIES: @@ -2819,7 +2821,7 @@ YY_RULE_SETUP YY_BREAK case 83: YY_RULE_SETUP -#line 852 "dhcp4_lexer.ll" +#line 854 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOOKS_LIBRARIES: @@ -2831,7 +2833,7 @@ YY_RULE_SETUP YY_BREAK case 84: YY_RULE_SETUP -#line 861 "dhcp4_lexer.ll" +#line 863 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2843,7 +2845,7 @@ YY_RULE_SETUP YY_BREAK case 85: YY_RULE_SETUP -#line 870 "dhcp4_lexer.ll" +#line 872 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2855,7 +2857,7 @@ YY_RULE_SETUP YY_BREAK case 86: YY_RULE_SETUP -#line 879 "dhcp4_lexer.ll" +#line 881 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2867,7 +2869,7 @@ YY_RULE_SETUP YY_BREAK case 87: YY_RULE_SETUP -#line 888 "dhcp4_lexer.ll" +#line 890 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2879,7 +2881,7 @@ YY_RULE_SETUP YY_BREAK case 88: YY_RULE_SETUP -#line 897 "dhcp4_lexer.ll" +#line 899 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2891,7 +2893,7 @@ YY_RULE_SETUP YY_BREAK case 89: YY_RULE_SETUP -#line 906 "dhcp4_lexer.ll" +#line 908 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2903,7 +2905,7 @@ YY_RULE_SETUP YY_BREAK case 90: YY_RULE_SETUP -#line 915 "dhcp4_lexer.ll" +#line 917 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -2915,7 +2917,7 @@ YY_RULE_SETUP YY_BREAK case 91: YY_RULE_SETUP -#line 924 "dhcp4_lexer.ll" +#line 926 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2927,7 +2929,7 @@ YY_RULE_SETUP YY_BREAK case 92: YY_RULE_SETUP -#line 933 "dhcp4_lexer.ll" +#line 935 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2939,7 +2941,7 @@ YY_RULE_SETUP YY_BREAK case 93: YY_RULE_SETUP -#line 942 "dhcp4_lexer.ll" +#line 944 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONTROL_SOCKET: @@ -2951,7 +2953,7 @@ YY_RULE_SETUP YY_BREAK case 94: YY_RULE_SETUP -#line 951 "dhcp4_lexer.ll" +#line 953 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONTROL_SOCKET: @@ -2963,7 +2965,7 @@ YY_RULE_SETUP YY_BREAK case 95: YY_RULE_SETUP -#line 960 "dhcp4_lexer.ll" +#line 962 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2975,7 +2977,7 @@ YY_RULE_SETUP YY_BREAK case 96: YY_RULE_SETUP -#line 969 "dhcp4_lexer.ll" +#line 971 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2987,7 +2989,7 @@ YY_RULE_SETUP YY_BREAK case 97: YY_RULE_SETUP -#line 978 "dhcp4_lexer.ll" +#line 980 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -2999,7 +3001,7 @@ YY_RULE_SETUP YY_BREAK case 98: YY_RULE_SETUP -#line 987 "dhcp4_lexer.ll" +#line 989 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3011,7 +3013,7 @@ YY_RULE_SETUP YY_BREAK case 99: YY_RULE_SETUP -#line 996 "dhcp4_lexer.ll" +#line 998 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3023,7 +3025,7 @@ YY_RULE_SETUP YY_BREAK case 100: YY_RULE_SETUP -#line 1005 "dhcp4_lexer.ll" +#line 1007 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3035,7 +3037,7 @@ YY_RULE_SETUP YY_BREAK case 101: YY_RULE_SETUP -#line 1014 "dhcp4_lexer.ll" +#line 1016 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3047,7 +3049,7 @@ YY_RULE_SETUP YY_BREAK case 102: YY_RULE_SETUP -#line 1023 "dhcp4_lexer.ll" +#line 1025 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3059,7 +3061,7 @@ YY_RULE_SETUP YY_BREAK case 103: YY_RULE_SETUP -#line 1032 "dhcp4_lexer.ll" +#line 1034 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3071,7 +3073,7 @@ YY_RULE_SETUP YY_BREAK case 104: YY_RULE_SETUP -#line 1041 "dhcp4_lexer.ll" +#line 1043 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3083,7 +3085,7 @@ YY_RULE_SETUP YY_BREAK case 105: YY_RULE_SETUP -#line 1050 "dhcp4_lexer.ll" +#line 1052 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3095,7 +3097,7 @@ YY_RULE_SETUP YY_BREAK case 106: YY_RULE_SETUP -#line 1059 "dhcp4_lexer.ll" +#line 1061 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3107,7 +3109,7 @@ YY_RULE_SETUP YY_BREAK case 107: YY_RULE_SETUP -#line 1068 "dhcp4_lexer.ll" +#line 1070 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3119,7 +3121,7 @@ YY_RULE_SETUP YY_BREAK case 108: YY_RULE_SETUP -#line 1077 "dhcp4_lexer.ll" +#line 1079 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3131,7 +3133,7 @@ YY_RULE_SETUP YY_BREAK case 109: YY_RULE_SETUP -#line 1086 "dhcp4_lexer.ll" +#line 1088 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3143,7 +3145,7 @@ YY_RULE_SETUP YY_BREAK case 110: YY_RULE_SETUP -#line 1095 "dhcp4_lexer.ll" +#line 1097 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { @@ -3156,7 +3158,7 @@ YY_RULE_SETUP YY_BREAK case 111: YY_RULE_SETUP -#line 1105 "dhcp4_lexer.ll" +#line 1107 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { @@ -3169,7 +3171,7 @@ YY_RULE_SETUP YY_BREAK case 112: YY_RULE_SETUP -#line 1115 "dhcp4_lexer.ll" +#line 1117 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_FORMAT) { @@ -3182,7 +3184,7 @@ YY_RULE_SETUP YY_BREAK case 113: YY_RULE_SETUP -#line 1125 "dhcp4_lexer.ll" +#line 1127 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3195,7 +3197,7 @@ YY_RULE_SETUP YY_BREAK case 114: YY_RULE_SETUP -#line 1135 "dhcp4_lexer.ll" +#line 1137 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3208,7 +3210,7 @@ YY_RULE_SETUP YY_BREAK case 115: YY_RULE_SETUP -#line 1145 "dhcp4_lexer.ll" +#line 1147 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3221,7 +3223,7 @@ YY_RULE_SETUP YY_BREAK case 116: YY_RULE_SETUP -#line 1155 "dhcp4_lexer.ll" +#line 1157 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3234,7 +3236,7 @@ YY_RULE_SETUP YY_BREAK case 117: YY_RULE_SETUP -#line 1165 "dhcp4_lexer.ll" +#line 1167 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3247,7 +3249,7 @@ YY_RULE_SETUP YY_BREAK case 118: YY_RULE_SETUP -#line 1175 "dhcp4_lexer.ll" +#line 1177 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3260,7 +3262,7 @@ YY_RULE_SETUP YY_BREAK case 119: YY_RULE_SETUP -#line 1185 "dhcp4_lexer.ll" +#line 1187 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -3272,7 +3274,7 @@ YY_RULE_SETUP YY_BREAK case 120: YY_RULE_SETUP -#line 1194 "dhcp4_lexer.ll" +#line 1196 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -3284,7 +3286,7 @@ YY_RULE_SETUP YY_BREAK case 121: YY_RULE_SETUP -#line 1203 "dhcp4_lexer.ll" +#line 1205 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3296,7 +3298,7 @@ YY_RULE_SETUP YY_BREAK case 122: YY_RULE_SETUP -#line 1212 "dhcp4_lexer.ll" +#line 1214 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3308,7 +3310,7 @@ YY_RULE_SETUP YY_BREAK case 123: YY_RULE_SETUP -#line 1221 "dhcp4_lexer.ll" +#line 1223 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3320,7 +3322,7 @@ YY_RULE_SETUP YY_BREAK case 124: YY_RULE_SETUP -#line 1230 "dhcp4_lexer.ll" +#line 1232 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3333,7 +3335,7 @@ YY_RULE_SETUP YY_BREAK case 125: YY_RULE_SETUP -#line 1240 "dhcp4_lexer.ll" +#line 1242 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3346,7 +3348,7 @@ YY_RULE_SETUP YY_BREAK case 126: YY_RULE_SETUP -#line 1250 "dhcp4_lexer.ll" +#line 1252 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3361,7 +3363,7 @@ YY_RULE_SETUP YY_BREAK case 127: YY_RULE_SETUP -#line 1262 "dhcp4_lexer.ll" +#line 1264 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3375,7 +3377,7 @@ YY_RULE_SETUP YY_BREAK case 128: YY_RULE_SETUP -#line 1273 "dhcp4_lexer.ll" +#line 1275 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3389,11 +3391,11 @@ YY_RULE_SETUP YY_BREAK case 129: YY_RULE_SETUP -#line 1286 "dhcp4_lexer.ll" +#line 1288 "dhcp4_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. - // for 'foo' we should get foo + /* 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. + for 'foo' we should get foo */ std::string raw(yytext+1); size_t len = raw.size() - 1; raw.resize(len); @@ -3404,12 +3406,12 @@ YY_RULE_SETUP char c = raw[pos]; switch (c) { case '"': - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Bad quote in \"" + raw + "\""); case '\\': ++pos; if (pos >= len) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Overflow escape in \"" + raw + "\""); } c = raw[pos]; @@ -3435,10 +3437,10 @@ YY_RULE_SETUP decoded.push_back('\t'); break; case 'u': - // support only \u0000 to \u00ff + /* support only \u0000 to \u00ff */ ++pos; if (pos + 4 > len) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Overflow unicode escape in \"" + raw + "\""); } @@ -3454,7 +3456,7 @@ YY_RULE_SETUP } else if ((c >= 'a') && (c <= 'f')) { b = (c - 'a' + 10) << 4; } else { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Not hexadecimal in unicode escape in \"" + raw + "\""); } pos++; @@ -3466,19 +3468,19 @@ YY_RULE_SETUP } else if ((c >= 'a') && (c <= 'f')) { b |= c - 'a' + 10; } else { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Not hexadecimal in unicode escape in \"" + raw + "\""); } decoded.push_back(static_cast(b & 0xff)); break; default: - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Bad escape in \"" + raw + "\""); } break; default: if ((c >= 0) && (c < 0x20)) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Invalid control in \"" + raw + "\""); } decoded.push_back(c); @@ -3491,85 +3493,85 @@ YY_RULE_SETUP case 130: /* rule 130 can match eol */ YY_RULE_SETUP -#line 1384 "dhcp4_lexer.ll" +#line 1386 "dhcp4_lexer.ll" { - // Bad string with a forbidden control character inside + /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); } YY_BREAK case 131: /* rule 131 can match eol */ YY_RULE_SETUP -#line 1389 "dhcp4_lexer.ll" +#line 1391 "dhcp4_lexer.ll" { - // Bad string with a bad escape inside + /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); } YY_BREAK case 132: YY_RULE_SETUP -#line 1394 "dhcp4_lexer.ll" +#line 1396 "dhcp4_lexer.ll" { - // Bad string with an open escape at the end + /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); } YY_BREAK case 133: YY_RULE_SETUP -#line 1399 "dhcp4_lexer.ll" +#line 1401 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK case 134: YY_RULE_SETUP -#line 1400 "dhcp4_lexer.ll" +#line 1402 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK case 135: YY_RULE_SETUP -#line 1401 "dhcp4_lexer.ll" +#line 1403 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK case 136: YY_RULE_SETUP -#line 1402 "dhcp4_lexer.ll" +#line 1404 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK case 137: YY_RULE_SETUP -#line 1403 "dhcp4_lexer.ll" +#line 1405 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); } YY_BREAK case 138: YY_RULE_SETUP -#line 1404 "dhcp4_lexer.ll" +#line 1406 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); } YY_BREAK case 139: YY_RULE_SETUP -#line 1406 "dhcp4_lexer.ll" +#line 1408 "dhcp4_lexer.ll" { - // An integer was found. + /* An integer was found. */ std::string tmp(yytext); int64_t integer = 0; try { - // In substring we want to use negative values (e.g. -1). - // In enterprise-id we need to use values up to 0xffffffff. - // To cover both of those use cases, we need at least - // int64_t. + /* In substring we want to use negative values (e.g. -1). + In enterprise-id we need to use values up to 0xffffffff. + To cover both of those use cases, we need at least + int64_t. */ integer = boost::lexical_cast(tmp); } catch (const boost::bad_lexical_cast &) { driver.error(driver.loc_, "Failed to convert " + tmp + " to an integer."); } - // The parser needs the string form as double conversion is no lossless + /* The parser needs the string form as double conversion is no lossless */ return isc::dhcp::Dhcp4Parser::make_INTEGER(integer, driver.loc_); } YY_BREAK case 140: YY_RULE_SETUP -#line 1424 "dhcp4_lexer.ll" +#line 1426 "dhcp4_lexer.ll" { - // A floating point was found. + /* A floating point was found. */ std::string tmp(yytext); double fp = 0.0; try { @@ -3583,7 +3585,7 @@ YY_RULE_SETUP YY_BREAK case 141: YY_RULE_SETUP -#line 1437 "dhcp4_lexer.ll" +#line 1439 "dhcp4_lexer.ll" { string tmp(yytext); return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_); @@ -3591,33 +3593,33 @@ YY_RULE_SETUP YY_BREAK case 142: YY_RULE_SETUP -#line 1442 "dhcp4_lexer.ll" +#line 1444 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK case 143: YY_RULE_SETUP -#line 1446 "dhcp4_lexer.ll" +#line 1448 "dhcp4_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK case 144: YY_RULE_SETUP -#line 1448 "dhcp4_lexer.ll" +#line 1450 "dhcp4_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK case 145: YY_RULE_SETUP -#line 1450 "dhcp4_lexer.ll" +#line 1452 "dhcp4_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK case 146: YY_RULE_SETUP -#line 1452 "dhcp4_lexer.ll" +#line 1454 "dhcp4_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 1454 "dhcp4_lexer.ll" +#line 1456 "dhcp4_lexer.ll" { if (driver.states_.empty()) { return isc::dhcp::Dhcp4Parser::make_END(driver.loc_); @@ -3643,10 +3645,10 @@ case YY_STATE_EOF(INITIAL): YY_BREAK case 147: YY_RULE_SETUP -#line 1477 "dhcp4_lexer.ll" +#line 1479 "dhcp4_lexer.ll" ECHO; YY_BREAK -#line 3649 "dhcp4_lexer.cc" +#line 3651 "dhcp4_lexer.cc" case YY_END_OF_BUFFER: { @@ -4747,7 +4749,7 @@ void parser4_free (void * ptr ) /* %ok-for-header */ -#line 1477 "dhcp4_lexer.ll" +#line 1479 "dhcp4_lexer.ll" using namespace isc::dhcp; @@ -4766,7 +4768,7 @@ Parser4Context::scanStringBegin(const std::string& str, ParserType parser_type) 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 + /* fatal() throws an exception so this can't be reached */ } } @@ -4784,7 +4786,7 @@ Parser4Context::scanFileBegin(FILE * f, yy_flex_debug = trace_scanning_; YY_BUFFER_STATE buffer; - // See dhcp4_lexer.cc header for available definitions + /* See dhcp4_lexer.cc header for available definitions */ buffer = parser4__create_buffer(f, 65536 /*buffer size*/); if (!buffer) { fatal("cannot scan file " + filename); @@ -4798,7 +4800,7 @@ Parser4Context::scanEnd() { fclose(sfile_); sfile_ = 0; static_cast(parser4_lex_destroy()); - // Close files + /* Close files */ while (!sfiles_.empty()) { FILE* f = sfiles_.back(); if (f) { @@ -4806,7 +4808,7 @@ Parser4Context::scanEnd() { } sfiles_.pop_back(); } - // Delete states + /* Delete states */ while (!states_.empty()) { parser4__delete_buffer(states_.back()); states_.pop_back(); @@ -4843,9 +4845,9 @@ Parser4Context::includeFile(const std::string& filename) { } namespace { -/// To avoid unused function error +/** To avoid unused function error */ class Dummy { - // cppcheck-suppress unusedPrivateFunction + /* cppcheck-suppress unusedPrivateFunction */ void dummy() { yy_fatal_error("Fix me: how to disable its definition?"); } }; } diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh index b4648d03eb..9fb5dc7947 100644 --- a/src/bin/dhcp4/location.hh +++ b/src/bin/dhcp4/location.hh @@ -1,4 +1,4 @@ -// Generated 201704181957 +// Generated 201705171457 // 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 f3c2d39b63..073ac1f021 100644 --- a/src/bin/dhcp4/position.hh +++ b/src/bin/dhcp4/position.hh @@ -1,4 +1,4 @@ -// Generated 201704181957 +// Generated 201705171457 // 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 6bd2fde410..94951f5d27 100644 --- a/src/bin/dhcp4/stack.hh +++ b/src/bin/dhcp4/stack.hh @@ -1,4 +1,4 @@ -// Generated 201704181957 +// Generated 201705171457 // 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 28c3c85f0d..5f1423ee5e 100644 --- a/src/bin/dhcp6/dhcp6_lexer.cc +++ b/src/bin/dhcp6/dhcp6_lexer.cc @@ -1366,23 +1366,23 @@ int parser6__flex_debug = 1; static const flex_int16_t yy_rule_linenum[153] = { 0, - 133, 135, 137, 142, 143, 148, 149, 150, 162, 165, - 170, 177, 186, 195, 204, 213, 222, 231, 240, 249, - 258, 267, 276, 285, 294, 303, 313, 323, 333, 343, - 353, 363, 373, 383, 393, 402, 411, 420, 429, 438, - 447, 459, 468, 477, 486, 495, 505, 515, 525, 535, - 546, 556, 566, 576, 586, 596, 606, 616, 626, 635, - 644, 653, 668, 683, 692, 701, 710, 719, 728, 737, - 746, 755, 764, 774, 783, 792, 801, 810, 819, 828, - 838, 847, 856, 865, 874, 883, 892, 901, 910, 919, - 929, 938, 947, 957, 967, 977, 986, 995, 1004, 1015, - - 1025, 1034, 1044, 1054, 1063, 1072, 1081, 1090, 1099, 1108, - 1118, 1127, 1136, 1145, 1154, 1163, 1172, 1181, 1190, 1199, - 1208, 1217, 1226, 1235, 1244, 1253, 1262, 1271, 1280, 1289, - 1298, 1307, 1316, 1325, 1334, 1432, 1437, 1442, 1447, 1448, - 1449, 1450, 1451, 1452, 1454, 1472, 1485, 1490, 1494, 1496, - 1498, 1500 + 135, 137, 139, 144, 145, 150, 151, 152, 164, 167, + 172, 179, 188, 197, 206, 215, 224, 233, 242, 251, + 260, 269, 278, 287, 296, 305, 315, 325, 335, 345, + 355, 365, 375, 385, 395, 404, 413, 422, 431, 440, + 449, 461, 470, 479, 488, 497, 507, 517, 527, 537, + 548, 558, 568, 578, 588, 598, 608, 618, 628, 637, + 646, 655, 670, 685, 694, 703, 712, 721, 730, 739, + 748, 757, 766, 776, 785, 794, 803, 812, 821, 830, + 840, 849, 858, 867, 876, 885, 894, 903, 912, 921, + 931, 940, 949, 959, 969, 979, 988, 997, 1006, 1017, + + 1027, 1036, 1046, 1056, 1065, 1074, 1083, 1092, 1101, 1110, + 1120, 1129, 1138, 1147, 1156, 1165, 1174, 1183, 1192, 1201, + 1210, 1219, 1228, 1237, 1246, 1255, 1264, 1273, 1282, 1291, + 1300, 1309, 1318, 1327, 1336, 1434, 1439, 1444, 1449, 1450, + 1451, 1452, 1453, 1454, 1456, 1474, 1487, 1492, 1496, 1498, + 1500, 1502 } ; /* The intent behind this definition is that it'll catch @@ -1409,10 +1409,12 @@ char *parser6_text; #include #include -// Work around an incompatibility in flex (at least versions -// 2.5.31 through 2.5.33): it generates code that does -// not conform to C89. See Debian bug 333231 -// . +/* Please avoid C++ style comments (// ... eol) as they break flex 2.6.2 */ + +/* Work around an incompatibility in flex (at least versions + 2.5.31 through 2.5.33): it generates code that does + not conform to C89. See Debian bug 333231 + . */ # undef yywrap # define yywrap() 1 @@ -1425,9 +1427,9 @@ unsigned int comment_start_line = 0; }; -// To avoid the call to exit... oops! +/* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::dhcp::Parser6Context::fatal(msg) -#line 1430 "dhcp6_lexer.cc" +#line 1432 "dhcp6_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 @@ -1448,13 +1450,13 @@ unsigned int comment_start_line = 0; can be used during actual token definitions. Note some can match incorrect inputs (e.g., IP addresses) which must be checked. */ /* for errors */ -#line 86 "dhcp6_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. +#line 88 "dhcp6_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 driver.loc_.columns(yyleng); -#line 1456 "dhcp6_lexer.cc" -#line 1457 "dhcp6_lexer.cc" +#line 1458 "dhcp6_lexer.cc" +#line 1459 "dhcp6_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1736,16 +1738,16 @@ YY_DECL { /* %% [7.0] user's declarations go here */ -#line 92 "dhcp6_lexer.ll" +#line 94 "dhcp6_lexer.ll" -#line 96 "dhcp6_lexer.ll" - // This part of the code is copied over to the verbatim to the top - // of the generated yylex function. Explanation: - // http://www.gnu.org/software/bison/manual/html_node/Multiple-start_002dsymbols.html +#line 98 "dhcp6_lexer.ll" + /* This part of the code is copied over to the verbatim to the top + of the generated yylex function. Explanation: + http://www.gnu.org/software/bison/manual/html_node/Multiple-start_002dsymbols.html */ - // Code run each time yylex is called. + /* Code run each time yylex is called. */ driver.loc_.step(); if (start_token_flag) { @@ -1778,7 +1780,7 @@ YY_DECL } -#line 1781 "dhcp6_lexer.cc" +#line 1783 "dhcp6_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1856,17 +1858,17 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 133 "dhcp6_lexer.ll" +#line 135 "dhcp6_lexer.ll" ; YY_BREAK case 2: YY_RULE_SETUP -#line 135 "dhcp6_lexer.ll" +#line 137 "dhcp6_lexer.ll" ; YY_BREAK case 3: YY_RULE_SETUP -#line 137 "dhcp6_lexer.ll" +#line 139 "dhcp6_lexer.ll" { BEGIN(COMMENT); comment_start_line = driver.loc_.end.line;; @@ -1874,37 +1876,37 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 142 "dhcp6_lexer.ll" +#line 144 "dhcp6_lexer.ll" BEGIN(INITIAL); YY_BREAK case 5: YY_RULE_SETUP -#line 143 "dhcp6_lexer.ll" +#line 145 "dhcp6_lexer.ll" ; YY_BREAK case YY_STATE_EOF(COMMENT): -#line 144 "dhcp6_lexer.ll" +#line 146 "dhcp6_lexer.ll" { isc_throw(Dhcp6ParseError, "Comment not closed. (/* in line " << comment_start_line); } YY_BREAK case 6: YY_RULE_SETUP -#line 148 "dhcp6_lexer.ll" +#line 150 "dhcp6_lexer.ll" BEGIN(DIR_ENTER); YY_BREAK case 7: YY_RULE_SETUP -#line 149 "dhcp6_lexer.ll" +#line 151 "dhcp6_lexer.ll" BEGIN(DIR_INCLUDE); YY_BREAK case 8: YY_RULE_SETUP -#line 150 "dhcp6_lexer.ll" +#line 152 "dhcp6_lexer.ll" { - // Include directive. + /* Include directive. */ - // Extract the filename. + /* Extract the filename. */ std::string tmp(yytext+1); tmp.resize(tmp.size() - 1); @@ -1914,37 +1916,37 @@ YY_RULE_SETUP case YY_STATE_EOF(DIR_ENTER): case YY_STATE_EOF(DIR_INCLUDE): case YY_STATE_EOF(DIR_EXIT): -#line 159 "dhcp6_lexer.ll" +#line 161 "dhcp6_lexer.ll" { isc_throw(Dhcp6ParseError, "Directive not closed."); } YY_BREAK case 9: YY_RULE_SETUP -#line 162 "dhcp6_lexer.ll" +#line 164 "dhcp6_lexer.ll" BEGIN(INITIAL); YY_BREAK case 10: YY_RULE_SETUP -#line 165 "dhcp6_lexer.ll" +#line 167 "dhcp6_lexer.ll" { - // Ok, we found a with space. Let's ignore it and update loc variable. + /* Ok, we found a with space. Let's ignore it and update loc variable. */ driver.loc_.step(); } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 170 "dhcp6_lexer.ll" +#line 172 "dhcp6_lexer.ll" { - // Newline found. Let's update the location and continue. + /* Newline found. Let's update the location and continue. */ driver.loc_.lines(yyleng); driver.loc_.step(); } YY_BREAK case 12: YY_RULE_SETUP -#line 177 "dhcp6_lexer.ll" +#line 179 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -1956,7 +1958,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 186 "dhcp6_lexer.ll" +#line 188 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -1968,7 +1970,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 195 "dhcp6_lexer.ll" +#line 197 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -1980,7 +1982,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 204 "dhcp6_lexer.ll" +#line 206 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -1992,7 +1994,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 213 "dhcp6_lexer.ll" +#line 215 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -2004,7 +2006,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 222 "dhcp6_lexer.ll" +#line 224 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -2016,7 +2018,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 231 "dhcp6_lexer.ll" +#line 233 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -2028,7 +2030,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 240 "dhcp6_lexer.ll" +#line 242 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -2040,7 +2042,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 249 "dhcp6_lexer.ll" +#line 251 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -2052,7 +2054,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 258 "dhcp6_lexer.ll" +#line 260 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -2064,7 +2066,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 267 "dhcp6_lexer.ll" +#line 269 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -2076,7 +2078,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 276 "dhcp6_lexer.ll" +#line 278 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -2088,7 +2090,7 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 285 "dhcp6_lexer.ll" +#line 287 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -2100,7 +2102,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 294 "dhcp6_lexer.ll" +#line 296 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP_DDNS: @@ -2112,7 +2114,7 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 303 "dhcp6_lexer.ll" +#line 305 "dhcp6_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_PROTOCOL) { @@ -2125,7 +2127,7 @@ YY_RULE_SETUP YY_BREAK case 27: YY_RULE_SETUP -#line 313 "dhcp6_lexer.ll" +#line 315 "dhcp6_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_PROTOCOL) { @@ -2138,7 +2140,7 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 323 "dhcp6_lexer.ll" +#line 325 "dhcp6_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_FORMAT) { @@ -2151,7 +2153,7 @@ YY_RULE_SETUP YY_BREAK case 29: YY_RULE_SETUP -#line 333 "dhcp6_lexer.ll" +#line 335 "dhcp6_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { @@ -2164,7 +2166,7 @@ YY_RULE_SETUP YY_BREAK case 30: YY_RULE_SETUP -#line 343 "dhcp6_lexer.ll" +#line 345 "dhcp6_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { @@ -2177,7 +2179,7 @@ YY_RULE_SETUP YY_BREAK case 31: YY_RULE_SETUP -#line 353 "dhcp6_lexer.ll" +#line 355 "dhcp6_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { @@ -2190,7 +2192,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 363 "dhcp6_lexer.ll" +#line 365 "dhcp6_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { @@ -2203,7 +2205,7 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 373 "dhcp6_lexer.ll" +#line 375 "dhcp6_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { @@ -2216,7 +2218,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 383 "dhcp6_lexer.ll" +#line 385 "dhcp6_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { @@ -2229,7 +2231,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 393 "dhcp6_lexer.ll" +#line 395 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -2241,7 +2243,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 402 "dhcp6_lexer.ll" +#line 404 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2253,7 +2255,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 411 "dhcp6_lexer.ll" +#line 413 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::INTERFACES_CONFIG: @@ -2265,7 +2267,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 420 "dhcp6_lexer.ll" +#line 422 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2277,7 +2279,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 429 "dhcp6_lexer.ll" +#line 431 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2289,7 +2291,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 438 "dhcp6_lexer.ll" +#line 440 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOSTS_DATABASE: @@ -2301,7 +2303,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 447 "dhcp6_lexer.ll" +#line 449 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2316,7 +2318,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 459 "dhcp6_lexer.ll" +#line 461 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DATABASE_TYPE: @@ -2328,7 +2330,7 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 468 "dhcp6_lexer.ll" +#line 470 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DATABASE_TYPE: @@ -2340,7 +2342,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 477 "dhcp6_lexer.ll" +#line 479 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DATABASE_TYPE: @@ -2352,7 +2354,7 @@ YY_RULE_SETUP YY_BREAK case 45: YY_RULE_SETUP -#line 486 "dhcp6_lexer.ll" +#line 488 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DATABASE_TYPE: @@ -2364,7 +2366,7 @@ YY_RULE_SETUP YY_BREAK case 46: YY_RULE_SETUP -#line 495 "dhcp6_lexer.ll" +#line 497 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2377,7 +2379,7 @@ YY_RULE_SETUP YY_BREAK case 47: YY_RULE_SETUP -#line 505 "dhcp6_lexer.ll" +#line 507 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2390,7 +2392,7 @@ YY_RULE_SETUP YY_BREAK case 48: YY_RULE_SETUP -#line 515 "dhcp6_lexer.ll" +#line 517 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2403,7 +2405,7 @@ YY_RULE_SETUP YY_BREAK case 49: YY_RULE_SETUP -#line 525 "dhcp6_lexer.ll" +#line 527 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2416,7 +2418,7 @@ YY_RULE_SETUP YY_BREAK case 50: YY_RULE_SETUP -#line 535 "dhcp6_lexer.ll" +#line 537 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2430,7 +2432,7 @@ YY_RULE_SETUP YY_BREAK case 51: YY_RULE_SETUP -#line 546 "dhcp6_lexer.ll" +#line 548 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2443,7 +2445,7 @@ YY_RULE_SETUP YY_BREAK case 52: YY_RULE_SETUP -#line 556 "dhcp6_lexer.ll" +#line 558 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2456,7 +2458,7 @@ YY_RULE_SETUP YY_BREAK case 53: YY_RULE_SETUP -#line 566 "dhcp6_lexer.ll" +#line 568 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2469,7 +2471,7 @@ YY_RULE_SETUP YY_BREAK case 54: YY_RULE_SETUP -#line 576 "dhcp6_lexer.ll" +#line 578 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2482,7 +2484,7 @@ YY_RULE_SETUP YY_BREAK case 55: YY_RULE_SETUP -#line 586 "dhcp6_lexer.ll" +#line 588 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2495,7 +2497,7 @@ YY_RULE_SETUP YY_BREAK case 56: YY_RULE_SETUP -#line 596 "dhcp6_lexer.ll" +#line 598 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2508,7 +2510,7 @@ YY_RULE_SETUP YY_BREAK case 57: YY_RULE_SETUP -#line 606 "dhcp6_lexer.ll" +#line 608 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2521,7 +2523,7 @@ YY_RULE_SETUP YY_BREAK case 58: YY_RULE_SETUP -#line 616 "dhcp6_lexer.ll" +#line 618 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2534,7 +2536,7 @@ YY_RULE_SETUP YY_BREAK case 59: YY_RULE_SETUP -#line 626 "dhcp6_lexer.ll" +#line 628 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2546,7 +2548,7 @@ YY_RULE_SETUP YY_BREAK case 60: YY_RULE_SETUP -#line 635 "dhcp6_lexer.ll" +#line 637 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2558,7 +2560,7 @@ YY_RULE_SETUP YY_BREAK case 61: YY_RULE_SETUP -#line 644 "dhcp6_lexer.ll" +#line 646 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2570,7 +2572,7 @@ YY_RULE_SETUP YY_BREAK case 62: YY_RULE_SETUP -#line 653 "dhcp6_lexer.ll" +#line 655 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2588,7 +2590,7 @@ YY_RULE_SETUP YY_BREAK case 63: YY_RULE_SETUP -#line 668 "dhcp6_lexer.ll" +#line 670 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -2606,7 +2608,7 @@ YY_RULE_SETUP YY_BREAK case 64: YY_RULE_SETUP -#line 683 "dhcp6_lexer.ll" +#line 685 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DATA: @@ -2618,7 +2620,7 @@ YY_RULE_SETUP YY_BREAK case 65: YY_RULE_SETUP -#line 692 "dhcp6_lexer.ll" +#line 694 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2630,7 +2632,7 @@ YY_RULE_SETUP YY_BREAK case 66: YY_RULE_SETUP -#line 701 "dhcp6_lexer.ll" +#line 703 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2642,7 +2644,7 @@ YY_RULE_SETUP YY_BREAK case 67: YY_RULE_SETUP -#line 710 "dhcp6_lexer.ll" +#line 712 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2654,7 +2656,7 @@ YY_RULE_SETUP YY_BREAK case 68: YY_RULE_SETUP -#line 719 "dhcp6_lexer.ll" +#line 721 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2666,7 +2668,7 @@ YY_RULE_SETUP YY_BREAK case 69: YY_RULE_SETUP -#line 728 "dhcp6_lexer.ll" +#line 730 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2678,7 +2680,7 @@ YY_RULE_SETUP YY_BREAK case 70: YY_RULE_SETUP -#line 737 "dhcp6_lexer.ll" +#line 739 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2690,7 +2692,7 @@ YY_RULE_SETUP YY_BREAK case 71: YY_RULE_SETUP -#line 746 "dhcp6_lexer.ll" +#line 748 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2702,7 +2704,7 @@ YY_RULE_SETUP YY_BREAK case 72: YY_RULE_SETUP -#line 755 "dhcp6_lexer.ll" +#line 757 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::POOLS: @@ -2714,7 +2716,7 @@ YY_RULE_SETUP YY_BREAK case 73: YY_RULE_SETUP -#line 764 "dhcp6_lexer.ll" +#line 766 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::POOLS: @@ -2727,7 +2729,7 @@ YY_RULE_SETUP YY_BREAK case 74: YY_RULE_SETUP -#line 774 "dhcp6_lexer.ll" +#line 776 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2739,7 +2741,7 @@ YY_RULE_SETUP YY_BREAK case 75: YY_RULE_SETUP -#line 783 "dhcp6_lexer.ll" +#line 785 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2751,7 +2753,7 @@ YY_RULE_SETUP YY_BREAK case 76: YY_RULE_SETUP -#line 792 "dhcp6_lexer.ll" +#line 794 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2763,7 +2765,7 @@ YY_RULE_SETUP YY_BREAK case 77: YY_RULE_SETUP -#line 801 "dhcp6_lexer.ll" +#line 803 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2775,7 +2777,7 @@ YY_RULE_SETUP YY_BREAK case 78: YY_RULE_SETUP -#line 810 "dhcp6_lexer.ll" +#line 812 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2787,7 +2789,7 @@ YY_RULE_SETUP YY_BREAK case 79: YY_RULE_SETUP -#line 819 "dhcp6_lexer.ll" +#line 821 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2799,7 +2801,7 @@ YY_RULE_SETUP YY_BREAK case 80: YY_RULE_SETUP -#line 828 "dhcp6_lexer.ll" +#line 830 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2812,7 +2814,7 @@ YY_RULE_SETUP YY_BREAK case 81: YY_RULE_SETUP -#line 838 "dhcp6_lexer.ll" +#line 840 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2824,7 +2826,7 @@ YY_RULE_SETUP YY_BREAK case 82: YY_RULE_SETUP -#line 847 "dhcp6_lexer.ll" +#line 849 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2836,7 +2838,7 @@ YY_RULE_SETUP YY_BREAK case 83: YY_RULE_SETUP -#line 856 "dhcp6_lexer.ll" +#line 858 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2848,7 +2850,7 @@ YY_RULE_SETUP YY_BREAK case 84: YY_RULE_SETUP -#line 865 "dhcp6_lexer.ll" +#line 867 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -2860,7 +2862,7 @@ YY_RULE_SETUP YY_BREAK case 85: YY_RULE_SETUP -#line 874 "dhcp6_lexer.ll" +#line 876 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGING: @@ -2872,7 +2874,7 @@ YY_RULE_SETUP YY_BREAK case 86: YY_RULE_SETUP -#line 883 "dhcp6_lexer.ll" +#line 885 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGERS: @@ -2884,7 +2886,7 @@ YY_RULE_SETUP YY_BREAK case 87: YY_RULE_SETUP -#line 892 "dhcp6_lexer.ll" +#line 894 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OUTPUT_OPTIONS: @@ -2896,7 +2898,7 @@ YY_RULE_SETUP YY_BREAK case 88: YY_RULE_SETUP -#line 901 "dhcp6_lexer.ll" +#line 903 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OUTPUT_OPTIONS: @@ -2908,7 +2910,7 @@ YY_RULE_SETUP YY_BREAK case 89: YY_RULE_SETUP -#line 910 "dhcp6_lexer.ll" +#line 912 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OUTPUT_OPTIONS: @@ -2920,7 +2922,7 @@ YY_RULE_SETUP YY_BREAK case 90: YY_RULE_SETUP -#line 919 "dhcp6_lexer.ll" +#line 921 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OUTPUT_OPTIONS: @@ -2932,7 +2934,7 @@ YY_RULE_SETUP YY_BREAK case 91: YY_RULE_SETUP -#line 929 "dhcp6_lexer.ll" +#line 931 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGERS: @@ -2944,7 +2946,7 @@ YY_RULE_SETUP YY_BREAK case 92: YY_RULE_SETUP -#line 938 "dhcp6_lexer.ll" +#line 940 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGERS: @@ -2956,7 +2958,7 @@ YY_RULE_SETUP YY_BREAK case 93: YY_RULE_SETUP -#line 947 "dhcp6_lexer.ll" +#line 949 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2969,7 +2971,7 @@ YY_RULE_SETUP YY_BREAK case 94: YY_RULE_SETUP -#line 957 "dhcp6_lexer.ll" +#line 959 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2982,7 +2984,7 @@ YY_RULE_SETUP YY_BREAK case 95: YY_RULE_SETUP -#line 967 "dhcp6_lexer.ll" +#line 969 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CLIENT_CLASSES: @@ -2995,7 +2997,7 @@ YY_RULE_SETUP YY_BREAK case 96: YY_RULE_SETUP -#line 977 "dhcp6_lexer.ll" +#line 979 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -3007,7 +3009,7 @@ YY_RULE_SETUP YY_BREAK case 97: YY_RULE_SETUP -#line 986 "dhcp6_lexer.ll" +#line 988 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RESERVATIONS: @@ -3019,7 +3021,7 @@ YY_RULE_SETUP YY_BREAK case 98: YY_RULE_SETUP -#line 995 "dhcp6_lexer.ll" +#line 997 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RESERVATIONS: @@ -3031,7 +3033,7 @@ YY_RULE_SETUP YY_BREAK case 99: YY_RULE_SETUP -#line 1004 "dhcp6_lexer.ll" +#line 1006 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::MAC_SOURCES: @@ -3045,7 +3047,7 @@ YY_RULE_SETUP YY_BREAK case 100: YY_RULE_SETUP -#line 1015 "dhcp6_lexer.ll" +#line 1017 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS: @@ -3058,7 +3060,7 @@ YY_RULE_SETUP YY_BREAK case 101: YY_RULE_SETUP -#line 1025 "dhcp6_lexer.ll" +#line 1027 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RESERVATIONS: @@ -3070,7 +3072,7 @@ YY_RULE_SETUP YY_BREAK case 102: YY_RULE_SETUP -#line 1034 "dhcp6_lexer.ll" +#line 1036 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS: @@ -3083,7 +3085,7 @@ YY_RULE_SETUP YY_BREAK case 103: YY_RULE_SETUP -#line 1044 "dhcp6_lexer.ll" +#line 1046 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -3096,7 +3098,7 @@ YY_RULE_SETUP YY_BREAK case 104: YY_RULE_SETUP -#line 1054 "dhcp6_lexer.ll" +#line 1056 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DATA: @@ -3108,7 +3110,7 @@ YY_RULE_SETUP YY_BREAK case 105: YY_RULE_SETUP -#line 1063 "dhcp6_lexer.ll" +#line 1065 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -3120,7 +3122,7 @@ YY_RULE_SETUP YY_BREAK case 106: YY_RULE_SETUP -#line 1072 "dhcp6_lexer.ll" +#line 1074 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -3132,7 +3134,7 @@ YY_RULE_SETUP YY_BREAK case 107: YY_RULE_SETUP -#line 1081 "dhcp6_lexer.ll" +#line 1083 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -3144,7 +3146,7 @@ YY_RULE_SETUP YY_BREAK case 108: YY_RULE_SETUP -#line 1090 "dhcp6_lexer.ll" +#line 1092 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -3156,7 +3158,7 @@ YY_RULE_SETUP YY_BREAK case 109: YY_RULE_SETUP -#line 1099 "dhcp6_lexer.ll" +#line 1101 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RELAY: @@ -3168,7 +3170,7 @@ YY_RULE_SETUP YY_BREAK case 110: YY_RULE_SETUP -#line 1108 "dhcp6_lexer.ll" +#line 1110 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3180,7 +3182,7 @@ YY_RULE_SETUP YY_BREAK case 111: YY_RULE_SETUP -#line 1118 "dhcp6_lexer.ll" +#line 1120 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOOKS_LIBRARIES: @@ -3192,7 +3194,7 @@ YY_RULE_SETUP YY_BREAK case 112: YY_RULE_SETUP -#line 1127 "dhcp6_lexer.ll" +#line 1129 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOOKS_LIBRARIES: @@ -3204,7 +3206,7 @@ YY_RULE_SETUP YY_BREAK case 113: YY_RULE_SETUP -#line 1136 "dhcp6_lexer.ll" +#line 1138 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3216,7 +3218,7 @@ YY_RULE_SETUP YY_BREAK case 114: YY_RULE_SETUP -#line 1145 "dhcp6_lexer.ll" +#line 1147 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DUID_TYPE: @@ -3228,7 +3230,7 @@ YY_RULE_SETUP YY_BREAK case 115: YY_RULE_SETUP -#line 1154 "dhcp6_lexer.ll" +#line 1156 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DUID_TYPE: @@ -3240,7 +3242,7 @@ YY_RULE_SETUP YY_BREAK case 116: YY_RULE_SETUP -#line 1163 "dhcp6_lexer.ll" +#line 1165 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DUID_TYPE: @@ -3252,7 +3254,7 @@ YY_RULE_SETUP YY_BREAK case 117: YY_RULE_SETUP -#line 1172 "dhcp6_lexer.ll" +#line 1174 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -3264,7 +3266,7 @@ YY_RULE_SETUP YY_BREAK case 118: YY_RULE_SETUP -#line 1181 "dhcp6_lexer.ll" +#line 1183 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -3276,7 +3278,7 @@ YY_RULE_SETUP YY_BREAK case 119: YY_RULE_SETUP -#line 1190 "dhcp6_lexer.ll" +#line 1192 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -3288,7 +3290,7 @@ YY_RULE_SETUP YY_BREAK case 120: YY_RULE_SETUP -#line 1199 "dhcp6_lexer.ll" +#line 1201 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -3300,7 +3302,7 @@ YY_RULE_SETUP YY_BREAK case 121: YY_RULE_SETUP -#line 1208 "dhcp6_lexer.ll" +#line 1210 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3312,7 +3314,7 @@ YY_RULE_SETUP YY_BREAK case 122: YY_RULE_SETUP -#line 1217 "dhcp6_lexer.ll" +#line 1219 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3324,7 +3326,7 @@ YY_RULE_SETUP YY_BREAK case 123: YY_RULE_SETUP -#line 1226 "dhcp6_lexer.ll" +#line 1228 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3336,7 +3338,7 @@ YY_RULE_SETUP YY_BREAK case 124: YY_RULE_SETUP -#line 1235 "dhcp6_lexer.ll" +#line 1237 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3348,7 +3350,7 @@ YY_RULE_SETUP YY_BREAK case 125: YY_RULE_SETUP -#line 1244 "dhcp6_lexer.ll" +#line 1246 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3360,7 +3362,7 @@ YY_RULE_SETUP YY_BREAK case 126: YY_RULE_SETUP -#line 1253 "dhcp6_lexer.ll" +#line 1255 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3372,7 +3374,7 @@ YY_RULE_SETUP YY_BREAK case 127: YY_RULE_SETUP -#line 1262 "dhcp6_lexer.ll" +#line 1264 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: @@ -3384,7 +3386,7 @@ YY_RULE_SETUP YY_BREAK case 128: YY_RULE_SETUP -#line 1271 "dhcp6_lexer.ll" +#line 1273 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3396,7 +3398,7 @@ YY_RULE_SETUP YY_BREAK case 129: YY_RULE_SETUP -#line 1280 "dhcp6_lexer.ll" +#line 1282 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3408,7 +3410,7 @@ YY_RULE_SETUP YY_BREAK case 130: YY_RULE_SETUP -#line 1289 "dhcp6_lexer.ll" +#line 1291 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONTROL_SOCKET: @@ -3420,7 +3422,7 @@ YY_RULE_SETUP YY_BREAK case 131: YY_RULE_SETUP -#line 1298 "dhcp6_lexer.ll" +#line 1300 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONTROL_SOCKET: @@ -3432,7 +3434,7 @@ YY_RULE_SETUP YY_BREAK case 132: YY_RULE_SETUP -#line 1307 "dhcp6_lexer.ll" +#line 1309 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3444,7 +3446,7 @@ YY_RULE_SETUP YY_BREAK case 133: YY_RULE_SETUP -#line 1316 "dhcp6_lexer.ll" +#line 1318 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -3456,7 +3458,7 @@ YY_RULE_SETUP YY_BREAK case 134: YY_RULE_SETUP -#line 1325 "dhcp6_lexer.ll" +#line 1327 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -3468,11 +3470,11 @@ YY_RULE_SETUP YY_BREAK case 135: YY_RULE_SETUP -#line 1334 "dhcp6_lexer.ll" +#line 1336 "dhcp6_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. - // for 'foo' we should get foo + /* 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. + for 'foo' we should get foo */ std::string raw(yytext+1); size_t len = raw.size() - 1; raw.resize(len); @@ -3483,12 +3485,12 @@ YY_RULE_SETUP char c = raw[pos]; switch (c) { case '"': - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Bad quote in \"" + raw + "\""); case '\\': ++pos; if (pos >= len) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Overflow escape in \"" + raw + "\""); } c = raw[pos]; @@ -3514,10 +3516,10 @@ YY_RULE_SETUP decoded.push_back('\t'); break; case 'u': - // support only \u0000 to \u00ff + /* support only \u0000 to \u00ff */ ++pos; if (pos + 4 > len) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Overflow unicode escape in \"" + raw + "\""); } @@ -3533,7 +3535,7 @@ YY_RULE_SETUP } else if ((c >= 'a') && (c <= 'f')) { b = (c - 'a' + 10) << 4; } else { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Not hexadecimal in unicode escape in \"" + raw + "\""); } pos++; @@ -3545,19 +3547,19 @@ YY_RULE_SETUP } else if ((c >= 'a') && (c <= 'f')) { b |= c - 'a' + 10; } else { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Not hexadecimal in unicode escape in \"" + raw + "\""); } decoded.push_back(static_cast(b & 0xff)); break; default: - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Bad escape in \"" + raw + "\""); } break; default: if ((c >= 0) && (c < 0x20)) { - // impossible condition + /* impossible condition */ driver.error(driver.loc_, "Invalid control in \"" + raw + "\""); } decoded.push_back(c); @@ -3570,85 +3572,85 @@ YY_RULE_SETUP case 136: /* rule 136 can match eol */ YY_RULE_SETUP -#line 1432 "dhcp6_lexer.ll" +#line 1434 "dhcp6_lexer.ll" { - // Bad string with a forbidden control character inside + /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); } YY_BREAK case 137: /* rule 137 can match eol */ YY_RULE_SETUP -#line 1437 "dhcp6_lexer.ll" +#line 1439 "dhcp6_lexer.ll" { - // Bad string with a bad escape inside + /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); } YY_BREAK case 138: YY_RULE_SETUP -#line 1442 "dhcp6_lexer.ll" +#line 1444 "dhcp6_lexer.ll" { - // Bad string with an open escape at the end + /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); } YY_BREAK case 139: YY_RULE_SETUP -#line 1447 "dhcp6_lexer.ll" +#line 1449 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK case 140: YY_RULE_SETUP -#line 1448 "dhcp6_lexer.ll" +#line 1450 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK case 141: YY_RULE_SETUP -#line 1449 "dhcp6_lexer.ll" +#line 1451 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK case 142: YY_RULE_SETUP -#line 1450 "dhcp6_lexer.ll" +#line 1452 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK case 143: YY_RULE_SETUP -#line 1451 "dhcp6_lexer.ll" +#line 1453 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_COMMA(driver.loc_); } YY_BREAK case 144: YY_RULE_SETUP -#line 1452 "dhcp6_lexer.ll" +#line 1454 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_COLON(driver.loc_); } YY_BREAK case 145: YY_RULE_SETUP -#line 1454 "dhcp6_lexer.ll" +#line 1456 "dhcp6_lexer.ll" { - // An integer was found. + /* An integer was found. */ std::string tmp(yytext); int64_t integer = 0; try { - // In substring we want to use negative values (e.g. -1). - // In enterprise-id we need to use values up to 0xffffffff. - // To cover both of those use cases, we need at least - // int64_t. + /* In substring we want to use negative values (e.g. -1). + In enterprise-id we need to use values up to 0xffffffff. + To cover both of those use cases, we need at least + int64_t. */ integer = boost::lexical_cast(tmp); } catch (const boost::bad_lexical_cast &) { driver.error(driver.loc_, "Failed to convert " + tmp + " to an integer."); } - // The parser needs the string form as double conversion is no lossless + /* The parser needs the string form as double conversion is no lossless */ return isc::dhcp::Dhcp6Parser::make_INTEGER(integer, driver.loc_); } YY_BREAK case 146: YY_RULE_SETUP -#line 1472 "dhcp6_lexer.ll" +#line 1474 "dhcp6_lexer.ll" { - // A floating point was found. + /* A floating point was found. */ std::string tmp(yytext); double fp = 0.0; try { @@ -3662,7 +3664,7 @@ YY_RULE_SETUP YY_BREAK case 147: YY_RULE_SETUP -#line 1485 "dhcp6_lexer.ll" +#line 1487 "dhcp6_lexer.ll" { string tmp(yytext); return isc::dhcp::Dhcp6Parser::make_BOOLEAN(tmp == "true", driver.loc_); @@ -3670,33 +3672,33 @@ YY_RULE_SETUP YY_BREAK case 148: YY_RULE_SETUP -#line 1490 "dhcp6_lexer.ll" +#line 1492 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK case 149: YY_RULE_SETUP -#line 1494 "dhcp6_lexer.ll" +#line 1496 "dhcp6_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK case 150: YY_RULE_SETUP -#line 1496 "dhcp6_lexer.ll" +#line 1498 "dhcp6_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK case 151: YY_RULE_SETUP -#line 1498 "dhcp6_lexer.ll" +#line 1500 "dhcp6_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK case 152: YY_RULE_SETUP -#line 1500 "dhcp6_lexer.ll" +#line 1502 "dhcp6_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 1502 "dhcp6_lexer.ll" +#line 1504 "dhcp6_lexer.ll" { if (driver.states_.empty()) { return isc::dhcp::Dhcp6Parser::make_END(driver.loc_); @@ -3722,10 +3724,10 @@ case YY_STATE_EOF(INITIAL): YY_BREAK case 153: YY_RULE_SETUP -#line 1525 "dhcp6_lexer.ll" +#line 1527 "dhcp6_lexer.ll" ECHO; YY_BREAK -#line 3728 "dhcp6_lexer.cc" +#line 3730 "dhcp6_lexer.cc" case YY_END_OF_BUFFER: { @@ -4826,7 +4828,7 @@ void parser6_free (void * ptr ) /* %ok-for-header */ -#line 1525 "dhcp6_lexer.ll" +#line 1527 "dhcp6_lexer.ll" using namespace isc::dhcp; @@ -4845,7 +4847,7 @@ Parser6Context::scanStringBegin(const std::string& str, ParserType parser_type) 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 + /* fatal() throws an exception so this can't be reached */ } } @@ -4863,7 +4865,7 @@ Parser6Context::scanFileBegin(FILE * f, yy_flex_debug = trace_scanning_; YY_BUFFER_STATE buffer; - // See dhcp6_lexer.cc header for available definitions + /* See dhcp6_lexer.cc header for available definitions */ buffer = parser6__create_buffer(f, 65536 /*buffer size*/); if (!buffer) { fatal("cannot scan file " + filename); @@ -4877,7 +4879,7 @@ Parser6Context::scanEnd() { fclose(sfile_); sfile_ = 0; static_cast(parser6_lex_destroy()); - // Close files + /* Close files */ while (!sfiles_.empty()) { FILE* f = sfiles_.back(); if (f) { @@ -4885,7 +4887,7 @@ Parser6Context::scanEnd() { } sfiles_.pop_back(); } - // Delete states + /* Delete states */ while (!states_.empty()) { parser6__delete_buffer(states_.back()); states_.pop_back(); @@ -4922,9 +4924,9 @@ Parser6Context::includeFile(const std::string& filename) { } namespace { -/// To avoid unused function error +/** To avoid unused function error */ class Dummy { - // cppcheck-suppress unusedPrivateFunction + /* cppcheck-suppress unusedPrivateFunction */ void dummy() { yy_fatal_error("Fix me: how to disable its definition?"); } }; } diff --git a/src/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh index 0e91c1faa5..929d69fa98 100644 --- a/src/bin/dhcp6/location.hh +++ b/src/bin/dhcp6/location.hh @@ -1,4 +1,4 @@ -// Generated 201704181957 +// Generated 201705171457 // 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 66f6c9d733..beb926d100 100644 --- a/src/bin/dhcp6/position.hh +++ b/src/bin/dhcp6/position.hh @@ -1,4 +1,4 @@ -// Generated 201704181957 +// Generated 201705171457 // 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 bda5a61198..b75587f228 100644 --- a/src/bin/dhcp6/stack.hh +++ b/src/bin/dhcp6/stack.hh @@ -1,4 +1,4 @@ -// Generated 201704181957 +// Generated 201705171457 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++ diff --git a/src/lib/eval/lexer.cc b/src/lib/eval/lexer.cc index 92f6a1e03c..590bc972d8 100644 --- a/src/lib/eval/lexer.cc +++ b/src/lib/eval/lexer.cc @@ -805,11 +805,11 @@ int eval_flex_debug = 1; static const flex_int16_t yy_rule_linenum[51] = { 0, - 100, 105, 111, 121, 127, 145, 152, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, - 199, 200, 201, 202, 203, 204, 205, 206, 207, 208 + 102, 107, 113, 123, 129, 147, 154, 168, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210 } ; static yy_state_type *yy_state_buf=0, *yy_state_ptr=0; @@ -836,7 +836,7 @@ goto find_rule; \ #define YY_RESTORE_YY_MORE_OFFSET char *evaltext; #line 1 "lexer.ll" -/* Copyright (C) 2015-2016 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2015-2017 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 @@ -851,15 +851,17 @@ char *evaltext; #include #include -// Work around an incompatibility in flex (at least versions -// 2.5.31 through 2.5.33): it generates code that does -// not conform to C89. See Debian bug 333231 -// . +/* Please avoid C++ style comments (// ... eol) as they break flex 2.6.2 */ + +/* Work around an incompatibility in flex (at least versions + 2.5.31 through 2.5.33): it generates code that does + not conform to C89. See Debian bug 333231 + . */ # undef yywrap # define yywrap() 1 -// The location of the current token. The lexer will keep updating it. This -// variable will be useful for logging errors. +/* The location of the current token. The lexer will keep updating it. This + variable will be useful for logging errors. */ static isc::eval::location loc; namespace { @@ -867,9 +869,9 @@ namespace { isc::eval::EvalContext::ParserType start_token_value; }; -// To avoid the call to exit... oops! +/* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::eval::EvalContext::fatal(msg) -#line 872 "lexer.cc" +#line 874 "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 @@ -889,13 +891,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 74 "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. +#line 76 "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 897 "lexer.cc" -#line 898 "lexer.cc" +#line 899 "lexer.cc" +#line 900 "lexer.cc" #define INITIAL 0 @@ -1179,12 +1181,12 @@ YY_DECL { /* %% [7.0] user's declarations go here */ -#line 80 "lexer.ll" +#line 82 "lexer.ll" -#line 84 "lexer.ll" - // Code run each time evallex is called. +#line 86 "lexer.ll" + /* Code run each time evallex is called. */ loc.step(); if (start_token_flag) { @@ -1200,7 +1202,7 @@ YY_DECL -#line 1203 "lexer.cc" +#line 1205 "lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1315,29 +1317,29 @@ do_action: /* This label is used only to access EOF actions. */ /* %% [13.0] actions go here */ case 1: YY_RULE_SETUP -#line 100 "lexer.ll" +#line 102 "lexer.ll" { - // Ok, we found a with space. Let's ignore it and update loc variable. + /* Ok, we found a with space. Let's ignore it and update loc variable. */ loc.step(); } YY_BREAK case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 105 "lexer.ll" +#line 107 "lexer.ll" { - // Newline found. Let's update the location and continue. + /* Newline found. Let's update the location and continue. */ loc.lines(evalleng); loc.step(); } YY_BREAK case 3: YY_RULE_SETUP -#line 111 "lexer.ll" +#line 113 "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. - // for 'foo' we should get foo + /* 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. + for 'foo' we should get foo */ std::string tmp(evaltext+1); tmp.resize(tmp.size() - 1); @@ -1346,53 +1348,53 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 121 "lexer.ll" +#line 123 "lexer.ll" { - // A hex string has been matched. It contains the '0x' or '0X' header - // followed by at least one hexadecimal digit. + /* A hex string has been matched. It contains the '0x' or '0X' header + followed by at least one hexadecimal digit. */ return isc::eval::EvalParser::make_HEXSTRING(evaltext, loc); } YY_BREAK case 5: YY_RULE_SETUP -#line 127 "lexer.ll" +#line 129 "lexer.ll" { - // An integer was found. + /* An integer was found. */ std::string tmp(evaltext); try { - // In substring we want to use negative values (e.g. -1). - // In enterprise-id we need to use values up to 0xffffffff. - // To cover both of those use cases, we need at least - // int64_t. + /* In substring we want to use negative values (e.g. -1). + In enterprise-id we need to use values up to 0xffffffff. + To cover both of those use cases, we need at least + int64_t. */ static_cast(boost::lexical_cast(tmp)); } catch (const boost::bad_lexical_cast &) { driver.error(loc, "Failed to convert " + tmp + " to an integer."); } - // The parser needs the string form as double conversion is no lossless + /* The parser needs the string form as double conversion is no lossless */ return isc::eval::EvalParser::make_INTEGER(tmp, loc); } YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 145 "lexer.ll" +#line 147 "lexer.ll" { - // This string specifies option name starting with a letter - // and further containing letters, digits, hyphens and - // underscores and finishing by letters or digits. + /* This string specifies option name starting with a letter + and further containing letters, digits, hyphens and + underscores and finishing by letters or digits. */ return isc::eval::EvalParser::make_OPTION_NAME(evaltext, loc); } YY_BREAK case 7: YY_RULE_SETUP -#line 152 "lexer.ll" +#line 154 "lexer.ll" { - // IPv4 or IPv6 address + /* IPv4 or IPv6 address */ std::string tmp(evaltext); - // Some incorrect addresses can match so we have to check. + /* Some incorrect addresses can match so we have to check. */ try { isc::asiolink::IOAddress ip(tmp); } catch (...) { @@ -1404,229 +1406,229 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 166 "lexer.ll" +#line 168 "lexer.ll" return isc::eval::EvalParser::make_EQUAL(loc); YY_BREAK case 9: YY_RULE_SETUP -#line 167 "lexer.ll" +#line 169 "lexer.ll" return isc::eval::EvalParser::make_OPTION(loc); YY_BREAK case 10: YY_RULE_SETUP -#line 168 "lexer.ll" +#line 170 "lexer.ll" return isc::eval::EvalParser::make_RELAY4(loc); YY_BREAK case 11: YY_RULE_SETUP -#line 169 "lexer.ll" +#line 171 "lexer.ll" return isc::eval::EvalParser::make_RELAY6(loc); YY_BREAK case 12: YY_RULE_SETUP -#line 170 "lexer.ll" +#line 172 "lexer.ll" return isc::eval::EvalParser::make_PEERADDR(loc); YY_BREAK case 13: YY_RULE_SETUP -#line 171 "lexer.ll" +#line 173 "lexer.ll" return isc::eval::EvalParser::make_LINKADDR(loc); YY_BREAK case 14: YY_RULE_SETUP -#line 172 "lexer.ll" +#line 174 "lexer.ll" return isc::eval::EvalParser::make_TEXT(loc); YY_BREAK case 15: YY_RULE_SETUP -#line 173 "lexer.ll" +#line 175 "lexer.ll" return isc::eval::EvalParser::make_HEX(loc); YY_BREAK case 16: YY_RULE_SETUP -#line 174 "lexer.ll" +#line 176 "lexer.ll" return isc::eval::EvalParser::make_EXISTS(loc); YY_BREAK case 17: YY_RULE_SETUP -#line 175 "lexer.ll" +#line 177 "lexer.ll" return isc::eval::EvalParser::make_PKT(loc); YY_BREAK case 18: YY_RULE_SETUP -#line 176 "lexer.ll" +#line 178 "lexer.ll" return isc::eval::EvalParser::make_IFACE(loc); YY_BREAK case 19: YY_RULE_SETUP -#line 177 "lexer.ll" +#line 179 "lexer.ll" return isc::eval::EvalParser::make_SRC(loc); YY_BREAK case 20: YY_RULE_SETUP -#line 178 "lexer.ll" +#line 180 "lexer.ll" return isc::eval::EvalParser::make_DST(loc); YY_BREAK case 21: YY_RULE_SETUP -#line 179 "lexer.ll" +#line 181 "lexer.ll" return isc::eval::EvalParser::make_LEN(loc); YY_BREAK case 22: YY_RULE_SETUP -#line 180 "lexer.ll" +#line 182 "lexer.ll" return isc::eval::EvalParser::make_PKT4(loc); YY_BREAK case 23: YY_RULE_SETUP -#line 181 "lexer.ll" +#line 183 "lexer.ll" return isc::eval::EvalParser::make_CHADDR(loc); YY_BREAK case 24: YY_RULE_SETUP -#line 182 "lexer.ll" +#line 184 "lexer.ll" return isc::eval::EvalParser::make_HLEN(loc); YY_BREAK case 25: YY_RULE_SETUP -#line 183 "lexer.ll" +#line 185 "lexer.ll" return isc::eval::EvalParser::make_HTYPE(loc); YY_BREAK case 26: YY_RULE_SETUP -#line 184 "lexer.ll" +#line 186 "lexer.ll" return isc::eval::EvalParser::make_CIADDR(loc); YY_BREAK case 27: YY_RULE_SETUP -#line 185 "lexer.ll" +#line 187 "lexer.ll" return isc::eval::EvalParser::make_GIADDR(loc); YY_BREAK case 28: YY_RULE_SETUP -#line 186 "lexer.ll" +#line 188 "lexer.ll" return isc::eval::EvalParser::make_YIADDR(loc); YY_BREAK case 29: YY_RULE_SETUP -#line 187 "lexer.ll" +#line 189 "lexer.ll" return isc::eval::EvalParser::make_SIADDR(loc); YY_BREAK case 30: YY_RULE_SETUP -#line 188 "lexer.ll" +#line 190 "lexer.ll" return isc::eval::EvalParser::make_PKT6(loc); YY_BREAK case 31: YY_RULE_SETUP -#line 189 "lexer.ll" +#line 191 "lexer.ll" return isc::eval::EvalParser::make_MSGTYPE(loc); YY_BREAK case 32: YY_RULE_SETUP -#line 190 "lexer.ll" +#line 192 "lexer.ll" return isc::eval::EvalParser::make_TRANSID(loc); YY_BREAK case 33: YY_RULE_SETUP -#line 191 "lexer.ll" +#line 193 "lexer.ll" return isc::eval::EvalParser::make_VENDOR(loc); YY_BREAK case 34: YY_RULE_SETUP -#line 192 "lexer.ll" +#line 194 "lexer.ll" return isc::eval::EvalParser::make_VENDOR_CLASS(loc); YY_BREAK case 35: YY_RULE_SETUP -#line 193 "lexer.ll" +#line 195 "lexer.ll" return isc::eval::EvalParser::make_DATA(loc); YY_BREAK case 36: YY_RULE_SETUP -#line 194 "lexer.ll" +#line 196 "lexer.ll" return isc::eval::EvalParser::make_ENTERPRISE(loc); YY_BREAK case 37: YY_RULE_SETUP -#line 195 "lexer.ll" +#line 197 "lexer.ll" return isc::eval::EvalParser::make_SUBSTRING(loc); YY_BREAK case 38: YY_RULE_SETUP -#line 196 "lexer.ll" +#line 198 "lexer.ll" return isc::eval::EvalParser::make_ALL(loc); YY_BREAK case 39: YY_RULE_SETUP -#line 197 "lexer.ll" +#line 199 "lexer.ll" return isc::eval::EvalParser::make_CONCAT(loc); YY_BREAK case 40: YY_RULE_SETUP -#line 198 "lexer.ll" +#line 200 "lexer.ll" return isc::eval::EvalParser::make_NOT(loc); YY_BREAK case 41: YY_RULE_SETUP -#line 199 "lexer.ll" +#line 201 "lexer.ll" return isc::eval::EvalParser::make_AND(loc); YY_BREAK case 42: YY_RULE_SETUP -#line 200 "lexer.ll" +#line 202 "lexer.ll" return isc::eval::EvalParser::make_OR(loc); YY_BREAK case 43: YY_RULE_SETUP -#line 201 "lexer.ll" +#line 203 "lexer.ll" return isc::eval::EvalParser::make_DOT(loc); YY_BREAK case 44: YY_RULE_SETUP -#line 202 "lexer.ll" +#line 204 "lexer.ll" return isc::eval::EvalParser::make_LPAREN(loc); YY_BREAK case 45: YY_RULE_SETUP -#line 203 "lexer.ll" +#line 205 "lexer.ll" return isc::eval::EvalParser::make_RPAREN(loc); YY_BREAK case 46: YY_RULE_SETUP -#line 204 "lexer.ll" +#line 206 "lexer.ll" return isc::eval::EvalParser::make_LBRACKET(loc); YY_BREAK case 47: YY_RULE_SETUP -#line 205 "lexer.ll" +#line 207 "lexer.ll" return isc::eval::EvalParser::make_RBRACKET(loc); YY_BREAK case 48: YY_RULE_SETUP -#line 206 "lexer.ll" +#line 208 "lexer.ll" return isc::eval::EvalParser::make_COMA(loc); YY_BREAK case 49: YY_RULE_SETUP -#line 207 "lexer.ll" +#line 209 "lexer.ll" return isc::eval::EvalParser::make_ANY(loc); YY_BREAK case 50: YY_RULE_SETUP -#line 208 "lexer.ll" +#line 210 "lexer.ll" driver.error (loc, "Invalid character: " + std::string(evaltext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 209 "lexer.ll" +#line 211 "lexer.ll" return isc::eval::EvalParser::make_END(loc); YY_BREAK case 51: YY_RULE_SETUP -#line 210 "lexer.ll" +#line 212 "lexer.ll" ECHO; YY_BREAK -#line 1629 "lexer.cc" +#line 1631 "lexer.cc" case YY_END_OF_BUFFER: { @@ -2707,7 +2709,7 @@ void evalfree (void * ptr ) /* %ok-for-header */ -#line 210 "lexer.ll" +#line 212 "lexer.ll" using namespace isc::eval; @@ -2724,7 +2726,7 @@ EvalContext::scanStringBegin(ParserType type) buffer = eval_scan_bytes(string_.c_str(), string_.size()); if (!buffer) { fatal("cannot scan string"); - // fatal() throws an exception so this can't be reached + /* fatal() throws an exception so this can't be reached */ } } @@ -2735,9 +2737,9 @@ EvalContext::scanStringEnd() } namespace { -/// To avoid unused function error +/** To avoid unused function error */ class Dummy { - // cppcheck-suppress unusedPrivateFunction + /* cppcheck-suppress unusedPrivateFunction */ void dummy() { yy_fatal_error("Fix me: how to disable its definition?"); } }; } diff --git a/src/lib/eval/location.hh b/src/lib/eval/location.hh index 6583eb4efc..63b391a29a 100644 --- a/src/lib/eval/location.hh +++ b/src/lib/eval/location.hh @@ -1,4 +1,4 @@ -// Generated 201704031753 +// Generated 201705171457 // A Bison parser, made by GNU Bison 3.0.4. // Locations for Bison parsers in C++ diff --git a/src/lib/eval/position.hh b/src/lib/eval/position.hh index c49dea33bf..8421b7d047 100644 --- a/src/lib/eval/position.hh +++ b/src/lib/eval/position.hh @@ -1,4 +1,4 @@ -// Generated 201704031753 +// Generated 201705171457 // 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 eb78a29b1c..ba3a4c6737 100644 --- a/src/lib/eval/stack.hh +++ b/src/lib/eval/stack.hh @@ -1,4 +1,4 @@ -// Generated 201704031753 +// Generated 201705171457 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++