From: Francis Dupont Date: Mon, 7 Jan 2019 09:51:59 +0000 (+0000) Subject: [#208,!196] regen flex/bison X-Git-Tag: Kea-1.6.0-beta~101 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=259a69bee59dc97574e3a1877863d56235d1d5c7;p=thirdparty%2Fkea.git [#208,!196] regen flex/bison --- diff --git a/src/bin/agent/agent_lexer.cc b/src/bin/agent/agent_lexer.cc index 3a386d84a7..64f6f3a30f 100644 --- a/src/bin/agent/agent_lexer.cc +++ b/src/bin/agent/agent_lexer.cc @@ -1358,10 +1358,10 @@ static const flex_int16_t yy_rule_linenum[58] = { 0, 133, 135, 137, 142, 143, 148, 149, 150, 162, 165, 170, 177, 186, 195, 204, 215, 226, 235, 244, 253, - 262, 271, 280, 289, 298, 307, 316, 325, 334, 343, - 352, 361, 370, 379, 388, 397, 406, 415, 424, 433, - 532, 537, 542, 547, 548, 549, 550, 551, 552, 554, - 572, 585, 590, 594, 596, 598, 600 + 262, 271, 280, 289, 298, 307, 316, 325, 335, 344, + 353, 362, 371, 380, 389, 398, 407, 416, 425, 434, + 533, 538, 543, 548, 549, 550, 551, 552, 553, 555, + 573, 586, 591, 595, 597, 599, 601 } ; /* The intent behind this definition is that it'll catch @@ -1373,7 +1373,7 @@ static const flex_int16_t yy_rule_linenum[58] = #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "agent_lexer.ll" -/* Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2017-2019 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 @@ -2122,6 +2122,7 @@ YY_RULE_SETUP #line 325 "agent_lexer.ll" { switch(driver.ctx_) { + case ParserContext::AGENT: case ParserContext::LOGGING: return AgentParser::make_LOGGERS(driver.loc_); default: @@ -2131,7 +2132,7 @@ YY_RULE_SETUP YY_BREAK case 29: YY_RULE_SETUP -#line 334 "agent_lexer.ll" +#line 335 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2143,7 +2144,7 @@ YY_RULE_SETUP YY_BREAK case 30: YY_RULE_SETUP -#line 343 "agent_lexer.ll" +#line 344 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2155,7 +2156,7 @@ YY_RULE_SETUP YY_BREAK case 31: YY_RULE_SETUP -#line 352 "agent_lexer.ll" +#line 353 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2167,7 +2168,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 361 "agent_lexer.ll" +#line 362 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2179,7 +2180,7 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 370 "agent_lexer.ll" +#line 371 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2191,7 +2192,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 379 "agent_lexer.ll" +#line 380 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2203,7 +2204,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 388 "agent_lexer.ll" +#line 389 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2215,7 +2216,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 397 "agent_lexer.ll" +#line 398 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2227,7 +2228,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 406 "agent_lexer.ll" +#line 407 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONFIG: @@ -2239,7 +2240,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 415 "agent_lexer.ll" +#line 416 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONFIG: @@ -2251,7 +2252,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 424 "agent_lexer.ll" +#line 425 "agent_lexer.ll" { switch(driver.ctx_) { case ParserContext::CONFIG: @@ -2263,7 +2264,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 433 "agent_lexer.ll" +#line 434 "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. @@ -2366,7 +2367,7 @@ YY_RULE_SETUP case 41: /* rule 41 can match eol */ YY_RULE_SETUP -#line 532 "agent_lexer.ll" +#line 533 "agent_lexer.ll" { /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); @@ -2375,7 +2376,7 @@ YY_RULE_SETUP case 42: /* rule 42 can match eol */ YY_RULE_SETUP -#line 537 "agent_lexer.ll" +#line 538 "agent_lexer.ll" { /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); @@ -2383,7 +2384,7 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 542 "agent_lexer.ll" +#line 543 "agent_lexer.ll" { /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); @@ -2391,37 +2392,37 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 547 "agent_lexer.ll" +#line 548 "agent_lexer.ll" { return AgentParser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK case 45: YY_RULE_SETUP -#line 548 "agent_lexer.ll" +#line 549 "agent_lexer.ll" { return AgentParser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK case 46: YY_RULE_SETUP -#line 549 "agent_lexer.ll" +#line 550 "agent_lexer.ll" { return AgentParser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK case 47: YY_RULE_SETUP -#line 550 "agent_lexer.ll" +#line 551 "agent_lexer.ll" { return AgentParser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK case 48: YY_RULE_SETUP -#line 551 "agent_lexer.ll" +#line 552 "agent_lexer.ll" { return AgentParser::make_COMMA(driver.loc_); } YY_BREAK case 49: YY_RULE_SETUP -#line 552 "agent_lexer.ll" +#line 553 "agent_lexer.ll" { return AgentParser::make_COLON(driver.loc_); } YY_BREAK case 50: YY_RULE_SETUP -#line 554 "agent_lexer.ll" +#line 555 "agent_lexer.ll" { /* An integer was found. */ std::string tmp(yytext); @@ -2442,7 +2443,7 @@ YY_RULE_SETUP YY_BREAK case 51: YY_RULE_SETUP -#line 572 "agent_lexer.ll" +#line 573 "agent_lexer.ll" { /* A floating point was found. */ std::string tmp(yytext); @@ -2458,7 +2459,7 @@ YY_RULE_SETUP YY_BREAK case 52: YY_RULE_SETUP -#line 585 "agent_lexer.ll" +#line 586 "agent_lexer.ll" { string tmp(yytext); return AgentParser::make_BOOLEAN(tmp == "true", driver.loc_); @@ -2466,33 +2467,33 @@ YY_RULE_SETUP YY_BREAK case 53: YY_RULE_SETUP -#line 590 "agent_lexer.ll" +#line 591 "agent_lexer.ll" { return AgentParser::make_NULL_TYPE(driver.loc_); } YY_BREAK case 54: YY_RULE_SETUP -#line 594 "agent_lexer.ll" +#line 595 "agent_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK case 55: YY_RULE_SETUP -#line 596 "agent_lexer.ll" +#line 597 "agent_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK case 56: YY_RULE_SETUP -#line 598 "agent_lexer.ll" +#line 599 "agent_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK case 57: YY_RULE_SETUP -#line 600 "agent_lexer.ll" +#line 601 "agent_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 602 "agent_lexer.ll" +#line 603 "agent_lexer.ll" { if (driver.states_.empty()) { return AgentParser::make_END(driver.loc_); @@ -2518,10 +2519,10 @@ case YY_STATE_EOF(INITIAL): YY_BREAK case 58: YY_RULE_SETUP -#line 625 "agent_lexer.ll" +#line 626 "agent_lexer.ll" ECHO; YY_BREAK -#line 2524 "agent_lexer.cc" +#line 2525 "agent_lexer.cc" case YY_END_OF_BUFFER: { @@ -3626,7 +3627,7 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 625 "agent_lexer.ll" +#line 626 "agent_lexer.ll" using namespace isc::dhcp; diff --git a/src/bin/d2/d2_lexer.cc b/src/bin/d2/d2_lexer.cc index 75c9bd2649..997ea62147 100644 --- a/src/bin/d2/d2_lexer.cc +++ b/src/bin/d2/d2_lexer.cc @@ -1092,10 +1092,10 @@ static const flex_int16_t yy_rule_linenum[67] = 133, 135, 137, 142, 143, 148, 149, 150, 162, 165, 170, 176, 185, 196, 207, 216, 225, 234, 244, 254, 264, 281, 298, 307, 316, 326, 336, 346, 357, 366, - 376, 386, 396, 405, 414, 424, 433, 442, 451, 460, - 469, 478, 487, 500, 509, 518, 527, 536, 546, 645, - 650, 655, 660, 661, 662, 663, 664, 665, 667, 685, - 698, 703, 707, 709, 711, 713 + 376, 386, 396, 405, 414, 424, 433, 443, 452, 461, + 470, 479, 488, 501, 510, 519, 528, 537, 547, 646, + 651, 656, 661, 662, 663, 664, 665, 666, 668, 686, + 699, 704, 708, 710, 712, 714 } ; /* The intent behind this definition is that it'll catch @@ -1107,7 +1107,7 @@ static const flex_int16_t yy_rule_linenum[67] = #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "d2_lexer.ll" -/* Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2017-2019 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 @@ -1990,6 +1990,7 @@ YY_RULE_SETUP #line 433 "d2_lexer.ll" { switch(driver.ctx_) { + case isc::d2::D2ParserContext::DHCPDDNS: case isc::d2::D2ParserContext::LOGGING: return isc::d2::D2Parser::make_LOGGERS(driver.loc_); default: @@ -1999,7 +2000,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 442 "d2_lexer.ll" +#line 443 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2011,7 +2012,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 451 "d2_lexer.ll" +#line 452 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2023,7 +2024,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 460 "d2_lexer.ll" +#line 461 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2035,7 +2036,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 469 "d2_lexer.ll" +#line 470 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2047,7 +2048,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 478 "d2_lexer.ll" +#line 479 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::OUTPUT_OPTIONS: @@ -2059,7 +2060,7 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 487 "d2_lexer.ll" +#line 488 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2075,7 +2076,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 500 "d2_lexer.ll" +#line 501 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2087,7 +2088,7 @@ YY_RULE_SETUP YY_BREAK case 45: YY_RULE_SETUP -#line 509 "d2_lexer.ll" +#line 510 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::LOGGERS: @@ -2099,7 +2100,7 @@ YY_RULE_SETUP YY_BREAK case 46: YY_RULE_SETUP -#line 518 "d2_lexer.ll" +#line 519 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2111,7 +2112,7 @@ YY_RULE_SETUP YY_BREAK case 47: YY_RULE_SETUP -#line 527 "d2_lexer.ll" +#line 528 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2123,7 +2124,7 @@ YY_RULE_SETUP YY_BREAK case 48: YY_RULE_SETUP -#line 536 "d2_lexer.ll" +#line 537 "d2_lexer.ll" { switch(driver.ctx_) { case isc::d2::D2ParserContext::CONFIG: @@ -2135,7 +2136,7 @@ YY_RULE_SETUP YY_BREAK case 49: YY_RULE_SETUP -#line 546 "d2_lexer.ll" +#line 547 "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. @@ -2238,7 +2239,7 @@ YY_RULE_SETUP case 50: /* rule 50 can match eol */ YY_RULE_SETUP -#line 645 "d2_lexer.ll" +#line 646 "d2_lexer.ll" { /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); @@ -2247,7 +2248,7 @@ YY_RULE_SETUP case 51: /* rule 51 can match eol */ YY_RULE_SETUP -#line 650 "d2_lexer.ll" +#line 651 "d2_lexer.ll" { /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); @@ -2255,7 +2256,7 @@ YY_RULE_SETUP YY_BREAK case 52: YY_RULE_SETUP -#line 655 "d2_lexer.ll" +#line 656 "d2_lexer.ll" { /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); @@ -2263,37 +2264,37 @@ YY_RULE_SETUP YY_BREAK case 53: YY_RULE_SETUP -#line 660 "d2_lexer.ll" +#line 661 "d2_lexer.ll" { return isc::d2::D2Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK case 54: YY_RULE_SETUP -#line 661 "d2_lexer.ll" +#line 662 "d2_lexer.ll" { return isc::d2::D2Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK case 55: YY_RULE_SETUP -#line 662 "d2_lexer.ll" +#line 663 "d2_lexer.ll" { return isc::d2::D2Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK case 56: YY_RULE_SETUP -#line 663 "d2_lexer.ll" +#line 664 "d2_lexer.ll" { return isc::d2::D2Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK case 57: YY_RULE_SETUP -#line 664 "d2_lexer.ll" +#line 665 "d2_lexer.ll" { return isc::d2::D2Parser::make_COMMA(driver.loc_); } YY_BREAK case 58: YY_RULE_SETUP -#line 665 "d2_lexer.ll" +#line 666 "d2_lexer.ll" { return isc::d2::D2Parser::make_COLON(driver.loc_); } YY_BREAK case 59: YY_RULE_SETUP -#line 667 "d2_lexer.ll" +#line 668 "d2_lexer.ll" { /* An integer was found. */ std::string tmp(yytext); @@ -2314,7 +2315,7 @@ YY_RULE_SETUP YY_BREAK case 60: YY_RULE_SETUP -#line 685 "d2_lexer.ll" +#line 686 "d2_lexer.ll" { /* A floating point was found. */ std::string tmp(yytext); @@ -2330,7 +2331,7 @@ YY_RULE_SETUP YY_BREAK case 61: YY_RULE_SETUP -#line 698 "d2_lexer.ll" +#line 699 "d2_lexer.ll" { string tmp(yytext); return isc::d2::D2Parser::make_BOOLEAN(tmp == "true", driver.loc_); @@ -2338,33 +2339,33 @@ YY_RULE_SETUP YY_BREAK case 62: YY_RULE_SETUP -#line 703 "d2_lexer.ll" +#line 704 "d2_lexer.ll" { return isc::d2::D2Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK case 63: YY_RULE_SETUP -#line 707 "d2_lexer.ll" +#line 708 "d2_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK case 64: YY_RULE_SETUP -#line 709 "d2_lexer.ll" +#line 710 "d2_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK case 65: YY_RULE_SETUP -#line 711 "d2_lexer.ll" +#line 712 "d2_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK case 66: YY_RULE_SETUP -#line 713 "d2_lexer.ll" +#line 714 "d2_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 715 "d2_lexer.ll" +#line 716 "d2_lexer.ll" { if (driver.states_.empty()) { return isc::d2::D2Parser::make_END(driver.loc_); @@ -2390,7 +2391,7 @@ case YY_STATE_EOF(INITIAL): YY_BREAK case 67: YY_RULE_SETUP -#line 738 "d2_lexer.ll" +#line 739 "d2_lexer.ll" ECHO; YY_BREAK #line 2397 "d2_lexer.cc" @@ -3498,7 +3499,7 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 738 "d2_lexer.ll" +#line 739 "d2_lexer.ll" using namespace isc::dhcp; diff --git a/src/bin/d2/d2_parser.h b/src/bin/d2/d2_parser.h index 0bf09782a2..154c7ab93f 100644 --- a/src/bin/d2/d2_parser.h +++ b/src/bin/d2/d2_parser.h @@ -1743,7 +1743,7 @@ switch (yytype) /// \param yyvalue the value to check static bool yy_table_value_is_error_ (int yyvalue); - static const signed char yypact_ninf_; + static const short yypact_ninf_; static const signed char yytable_ninf_; /// Convert a scanner token number \a t to a symbol number. @@ -1760,7 +1760,7 @@ switch (yytype) static const unsigned char yydefact_[]; // YYPGOTO[NTERM-NUM]. - static const signed char yypgoto_[]; + static const short yypgoto_[]; // YYDEFGOTO[NTERM-NUM]. static const short yydefgoto_[]; @@ -2020,7 +2020,7 @@ switch (yytype) enum { yyeof_ = 0, - yylast_ = 305, ///< Last index in yytable_. + yylast_ = 304, ///< Last index in yytable_. yynnts_ = 146, ///< Number of nonterminal symbols. yyfinal_ = 20, ///< Termination state number. yyterror_ = 1, diff --git a/src/bin/netconf/netconf_lexer.cc b/src/bin/netconf/netconf_lexer.cc index 5f55acdc7e..365415f3c8 100644 --- a/src/bin/netconf/netconf_lexer.cc +++ b/src/bin/netconf/netconf_lexer.cc @@ -1455,10 +1455,10 @@ static const flex_int16_t yy_rule_linenum[62] = 133, 135, 137, 142, 143, 148, 149, 150, 162, 165, 170, 177, 186, 198, 210, 220, 230, 240, 249, 258, 267, 276, 285, 294, 303, 312, 321, 330, 339, 348, - 357, 366, 375, 384, 393, 402, 411, 420, 429, 438, - 447, 456, 465, 474, 573, 578, 583, 588, 589, 590, - 591, 592, 593, 595, 613, 626, 631, 635, 637, 639, - 641 + 357, 366, 375, 384, 393, 403, 412, 421, 430, 439, + 448, 457, 466, 475, 574, 579, 584, 589, 590, 591, + 592, 593, 594, 596, 614, 627, 632, 636, 638, 640, + 642 } ; /* The intent behind this definition is that it'll catch @@ -1470,7 +1470,7 @@ static const flex_int16_t yy_rule_linenum[62] = #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "netconf_lexer.ll" -/* Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2018-2019 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 @@ -2308,6 +2308,7 @@ YY_RULE_SETUP #line 393 "netconf_lexer.ll" { switch(driver.ctx_) { + case ParserContext::NETCONF: case ParserContext::LOGGING: return NetconfParser::make_LOGGERS(driver.loc_); default: @@ -2317,7 +2318,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 402 "netconf_lexer.ll" +#line 403 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2329,7 +2330,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 411 "netconf_lexer.ll" +#line 412 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2341,7 +2342,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 420 "netconf_lexer.ll" +#line 421 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2353,7 +2354,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 429 "netconf_lexer.ll" +#line 430 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2365,7 +2366,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 438 "netconf_lexer.ll" +#line 439 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2377,7 +2378,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 447 "netconf_lexer.ll" +#line 448 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::OUTPUT_OPTIONS: @@ -2389,7 +2390,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 456 "netconf_lexer.ll" +#line 457 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2401,7 +2402,7 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 465 "netconf_lexer.ll" +#line 466 "netconf_lexer.ll" { switch(driver.ctx_) { case ParserContext::LOGGERS: @@ -2413,7 +2414,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 474 "netconf_lexer.ll" +#line 475 "netconf_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. @@ -2516,7 +2517,7 @@ YY_RULE_SETUP case 45: /* rule 45 can match eol */ YY_RULE_SETUP -#line 573 "netconf_lexer.ll" +#line 574 "netconf_lexer.ll" { /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); @@ -2525,7 +2526,7 @@ YY_RULE_SETUP case 46: /* rule 46 can match eol */ YY_RULE_SETUP -#line 578 "netconf_lexer.ll" +#line 579 "netconf_lexer.ll" { /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); @@ -2533,7 +2534,7 @@ YY_RULE_SETUP YY_BREAK case 47: YY_RULE_SETUP -#line 583 "netconf_lexer.ll" +#line 584 "netconf_lexer.ll" { /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); @@ -2541,37 +2542,37 @@ YY_RULE_SETUP YY_BREAK case 48: YY_RULE_SETUP -#line 588 "netconf_lexer.ll" +#line 589 "netconf_lexer.ll" { return NetconfParser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK case 49: YY_RULE_SETUP -#line 589 "netconf_lexer.ll" +#line 590 "netconf_lexer.ll" { return NetconfParser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK case 50: YY_RULE_SETUP -#line 590 "netconf_lexer.ll" +#line 591 "netconf_lexer.ll" { return NetconfParser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK case 51: YY_RULE_SETUP -#line 591 "netconf_lexer.ll" +#line 592 "netconf_lexer.ll" { return NetconfParser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK case 52: YY_RULE_SETUP -#line 592 "netconf_lexer.ll" +#line 593 "netconf_lexer.ll" { return NetconfParser::make_COMMA(driver.loc_); } YY_BREAK case 53: YY_RULE_SETUP -#line 593 "netconf_lexer.ll" +#line 594 "netconf_lexer.ll" { return NetconfParser::make_COLON(driver.loc_); } YY_BREAK case 54: YY_RULE_SETUP -#line 595 "netconf_lexer.ll" +#line 596 "netconf_lexer.ll" { /* An integer was found. */ std::string tmp(yytext); @@ -2592,7 +2593,7 @@ YY_RULE_SETUP YY_BREAK case 55: YY_RULE_SETUP -#line 613 "netconf_lexer.ll" +#line 614 "netconf_lexer.ll" { /* A floating point was found. */ std::string tmp(yytext); @@ -2608,7 +2609,7 @@ YY_RULE_SETUP YY_BREAK case 56: YY_RULE_SETUP -#line 626 "netconf_lexer.ll" +#line 627 "netconf_lexer.ll" { string tmp(yytext); return NetconfParser::make_BOOLEAN(tmp == "true", driver.loc_); @@ -2616,33 +2617,33 @@ YY_RULE_SETUP YY_BREAK case 57: YY_RULE_SETUP -#line 631 "netconf_lexer.ll" +#line 632 "netconf_lexer.ll" { return NetconfParser::make_NULL_TYPE(driver.loc_); } YY_BREAK case 58: YY_RULE_SETUP -#line 635 "netconf_lexer.ll" +#line 636 "netconf_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK case 59: YY_RULE_SETUP -#line 637 "netconf_lexer.ll" +#line 638 "netconf_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK case 60: YY_RULE_SETUP -#line 639 "netconf_lexer.ll" +#line 640 "netconf_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK case 61: YY_RULE_SETUP -#line 641 "netconf_lexer.ll" +#line 642 "netconf_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 643 "netconf_lexer.ll" +#line 644 "netconf_lexer.ll" { if (driver.states_.empty()) { return NetconfParser::make_END(driver.loc_); @@ -2668,10 +2669,10 @@ case YY_STATE_EOF(INITIAL): YY_BREAK case 62: YY_RULE_SETUP -#line 666 "netconf_lexer.ll" +#line 667 "netconf_lexer.ll" ECHO; YY_BREAK -#line 2674 "netconf_lexer.cc" +#line 2675 "netconf_lexer.cc" case YY_END_OF_BUFFER: { @@ -3776,7 +3777,7 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 666 "netconf_lexer.ll" +#line 667 "netconf_lexer.ll" using namespace isc::dhcp;