[#1304] regen files

diff --git a/src/bin/agent/agent_lexer.cc b/src/bin/agent/agent_lexer.cc
index 07d4b7ddcec83531699477c01b7b698e241624b8..da5db397feaac964b0f305f889c9704a7550402c 100644 (file)
--- a/src/bin/agent/agent_lexer.cc
+++ b/src/bin/agent/agent_lexer.cc
@@ -1409,12 +1409,12 @@ int yy_flex_debug = 1;
 static const flex_int16_t yy_rule_linenum[62] =
     {   0,
       133,  135,  137,  142,  143,  148,  149,  150,  162,  165,
-      170,  177,  186,  195,  204,  216,  228,  237,  246,  255,
-      264,  273,  282,  291,  300,  309,  318,  327,  336,  345,
-      354,  363,  372,  381,  390,  399,  408,  417,  426,  435,
-      444,  453,  462,  471,  570,  575,  580,  585,  586,  587,
-      588,  589,  590,  592,  610,  623,  628,  632,  634,  636,
-      638
+      170,  177,  186,  195,  204,  217,  230,  239,  248,  257,
+      266,  275,  284,  293,  302,  311,  320,  329,  338,  347,
+      356,  365,  374,  383,  392,  401,  410,  419,  428,  437,
+      446,  455,  464,  473,  572,  577,  582,  587,  588,  589,
+      590,  591,  592,  594,  612,  625,  630,  634,  636,  638,
+      640
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -2016,9 +2016,10 @@ YY_RULE_SETUP
 {
     switch(driver.ctx_) {
     case ParserContext::AGENT:
+    case ParserContext::AUTHENTICATION;
+    case ParserContext::CLIENTS:
     case ParserContext::SERVER:
     case ParserContext::LOGGERS:
-    case ParserContext::CLIENTS:
         return AgentParser::make_USER_CONTEXT(driver.loc_);
     default:
         return AgentParser::make_STRING("user-context", driver.loc_);
@@ -2027,13 +2028,14 @@ YY_RULE_SETUP
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 216 "agent_lexer.ll"
+#line 217 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::AGENT:
+    case ParserContext::AUTHENTICATION;
+    case ParserContext::CLIENTS:
     case ParserContext::SERVER:
     case ParserContext::LOGGERS:
-    case ParserContext::CLIENTS:
         return AgentParser::make_COMMENT(driver.loc_);
     default:
         return AgentParser::make_STRING("comment", driver.loc_);
@@ -2042,7 +2044,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 228 "agent_lexer.ll"
+#line 230 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::AGENT:
@@ -2054,7 +2056,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 237 "agent_lexer.ll"
+#line 239 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::AUTHENTICATION:
@@ -2066,7 +2068,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 246 "agent_lexer.ll"
+#line 248 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::AUTH_TYPE:
@@ -2078,7 +2080,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 255 "agent_lexer.ll"
+#line 257 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::AUTHENTICATION:
@@ -2090,7 +2092,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 264 "agent_lexer.ll"
+#line 266 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::AUTHENTICATION:
@@ -2102,7 +2104,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 273 "agent_lexer.ll"
+#line 275 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::CLIENTS:
@@ -2114,7 +2116,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 282 "agent_lexer.ll"
+#line 284 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::CLIENTS:
@@ -2126,7 +2128,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 291 "agent_lexer.ll"
+#line 293 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::AGENT:
@@ -2138,7 +2140,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 300 "agent_lexer.ll"
+#line 302 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::CONTROL_SOCKETS:
@@ -2150,7 +2152,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 309 "agent_lexer.ll"
+#line 311 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::CONTROL_SOCKETS:
@@ -2162,7 +2164,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 318 "agent_lexer.ll"
+#line 320 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::CONTROL_SOCKETS:
@@ -2174,7 +2176,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 327 "agent_lexer.ll"
+#line 329 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::SERVER:
@@ -2186,7 +2188,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 336 "agent_lexer.ll"
+#line 338 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::SERVER:
@@ -2198,7 +2200,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 345 "agent_lexer.ll"
+#line 347 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::SOCKET_TYPE:
@@ -2210,7 +2212,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 354 "agent_lexer.ll"
+#line 356 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::AGENT:
@@ -2222,7 +2224,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 363 "agent_lexer.ll"
+#line 365 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::HOOKS_LIBRARIES:
@@ -2234,7 +2236,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 372 "agent_lexer.ll"
+#line 374 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::HOOKS_LIBRARIES:
@@ -2246,7 +2248,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 381 "agent_lexer.ll"
+#line 383 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::AGENT:
@@ -2258,7 +2260,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 390 "agent_lexer.ll"
+#line 392 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::LOGGERS:
@@ -2270,7 +2272,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 399 "agent_lexer.ll"
+#line 401 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::LOGGERS:
@@ -2282,7 +2284,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 408 "agent_lexer.ll"
+#line 410 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::OUTPUT_OPTIONS:
@@ -2294,7 +2296,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 417 "agent_lexer.ll"
+#line 419 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::OUTPUT_OPTIONS:
@@ -2306,7 +2308,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 426 "agent_lexer.ll"
+#line 428 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::OUTPUT_OPTIONS:
@@ -2318,7 +2320,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 435 "agent_lexer.ll"
+#line 437 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::OUTPUT_OPTIONS:
@@ -2330,7 +2332,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 444 "agent_lexer.ll"
+#line 446 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::OUTPUT_OPTIONS:
@@ -2342,7 +2344,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 453 "agent_lexer.ll"
+#line 455 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::LOGGERS:
@@ -2354,7 +2356,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 462 "agent_lexer.ll"
+#line 464 "agent_lexer.ll"
 {
     switch(driver.ctx_) {
     case ParserContext::LOGGERS:
@@ -2366,7 +2368,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 471 "agent_lexer.ll"
+#line 473 "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.
@@ -2469,7 +2471,7 @@ YY_RULE_SETUP
 case 45:
 /* rule 45 can match eol */
 YY_RULE_SETUP
-#line 570 "agent_lexer.ll"
+#line 572 "agent_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
@@ -2478,7 +2480,7 @@ YY_RULE_SETUP
 case 46:
 /* rule 46 can match eol */
 YY_RULE_SETUP
-#line 575 "agent_lexer.ll"
+#line 577 "agent_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
@@ -2486,7 +2488,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 580 "agent_lexer.ll"
+#line 582 "agent_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
@@ -2494,37 +2496,37 @@ YY_RULE_SETUP
        YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 585 "agent_lexer.ll"
+#line 587 "agent_lexer.ll"
 { return AgentParser::make_LSQUARE_BRACKET(driver.loc_); }
        YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 586 "agent_lexer.ll"
+#line 588 "agent_lexer.ll"
 { return AgentParser::make_RSQUARE_BRACKET(driver.loc_); }
        YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 587 "agent_lexer.ll"
+#line 589 "agent_lexer.ll"
 { return AgentParser::make_LCURLY_BRACKET(driver.loc_); }
        YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 588 "agent_lexer.ll"
+#line 590 "agent_lexer.ll"
 { return AgentParser::make_RCURLY_BRACKET(driver.loc_); }
        YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 589 "agent_lexer.ll"
+#line 591 "agent_lexer.ll"
 { return AgentParser::make_COMMA(driver.loc_); }
        YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 590 "agent_lexer.ll"
+#line 592 "agent_lexer.ll"
 { return AgentParser::make_COLON(driver.loc_); }
        YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 592 "agent_lexer.ll"
+#line 594 "agent_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -2545,7 +2547,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 610 "agent_lexer.ll"
+#line 612 "agent_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -2561,7 +2563,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 623 "agent_lexer.ll"
+#line 625 "agent_lexer.ll"
 {
     string tmp(yytext);
     return AgentParser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -2569,33 +2571,33 @@ YY_RULE_SETUP
        YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 628 "agent_lexer.ll"
+#line 630 "agent_lexer.ll"
 {
    return AgentParser::make_NULL_TYPE(driver.loc_);
 }
        YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 632 "agent_lexer.ll"
+#line 634 "agent_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
        YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 634 "agent_lexer.ll"
+#line 636 "agent_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
        YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 636 "agent_lexer.ll"
+#line 638 "agent_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
        YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 638 "agent_lexer.ll"
+#line 640 "agent_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 640 "agent_lexer.ll"
+#line 642 "agent_lexer.ll"
 {
     if (driver.states_.empty()) {
         return AgentParser::make_END(driver.loc_);
@@ -2621,10 +2623,10 @@ case YY_STATE_EOF(INITIAL):
        YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 663 "agent_lexer.ll"
+#line 665 "agent_lexer.ll"
 ECHO;
        YY_BREAK
-#line 2627 "agent_lexer.cc"
+#line 2629 "agent_lexer.cc"
 
        case YY_END_OF_BUFFER:
                {
@@ -3729,7 +3731,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 663 "agent_lexer.ll"
+#line 665 "agent_lexer.ll"
 
 
 using namespace isc::dhcp;

diff --git a/src/bin/agent/agent_parser.cc b/src/bin/agent/agent_parser.cc
index ad0cdd029b09037d222ab7b40d92cebc64d375e5..15a1f352e46c0dbd7377daf3ae99a1e6028189c8 100644 (file)
--- a/src/bin/agent/agent_parser.cc
+++ b/src/bin/agent/agent_parser.cc
@@ -1241,8 +1241,8 @@ namespace isc { namespace agent {
 #line 1242 "agent_parser.cc"
     break;
 
-  case 106: // $@23: %empty
-#line 518 "agent_parser.yy"
+  case 109: // $@23: %empty
+#line 521 "agent_parser.yy"
                 {
     // Add unique here
     ctx.enter(ctx.AUTH_TYPE);
@@ -1250,8 +1250,8 @@ namespace isc { namespace agent {
 #line 1251 "agent_parser.cc"
     break;
 
-  case 107: // auth_type: "type" $@23 ":" auth_type_value
-#line 521 "agent_parser.yy"
+  case 110: // auth_type: "type" $@23 ":" auth_type_value
+#line 524 "agent_parser.yy"
                         {
     ctx.stack_.back()->set("type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -1259,14 +1259,14 @@ namespace isc { namespace agent {
 #line 1260 "agent_parser.cc"
     break;
 
-  case 108: // auth_type_value: "basic"
-#line 526 "agent_parser.yy"
+  case 111: // auth_type_value: "basic"
+#line 529 "agent_parser.yy"
                        { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("basic", ctx.loc2pos(yystack_[0].location))); }
 #line 1266 "agent_parser.cc"
     break;
 
-  case 109: // $@24: %empty
-#line 529 "agent_parser.yy"
+  case 112: // $@24: %empty
+#line 532 "agent_parser.yy"
              {
     // Add unique here
     ctx.enter(ctx.NO_KEYWORDS);
@@ -1274,8 +1274,8 @@ namespace isc { namespace agent {
 #line 1275 "agent_parser.cc"
     break;
 
-  case 110: // realm: "realm" $@24 ":" "constant string"
-#line 532 "agent_parser.yy"
+  case 113: // realm: "realm" $@24 ":" "constant string"
+#line 535 "agent_parser.yy"
                {
     ElementPtr realm(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("realm", realm);
@@ -1284,8 +1284,8 @@ namespace isc { namespace agent {
 #line 1285 "agent_parser.cc"
     break;
 
-  case 111: // $@25: %empty
-#line 538 "agent_parser.yy"
+  case 114: // $@25: %empty
+#line 541 "agent_parser.yy"
                  {
     // Add unique here
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -1296,8 +1296,8 @@ namespace isc { namespace agent {
 #line 1297 "agent_parser.cc"
     break;
 
-  case 112: // clients: "clients" $@25 ":" "[" clients_list "]"
-#line 544 "agent_parser.yy"
+  case 115: // clients: "clients" $@25 ":" "[" clients_list "]"
+#line 547 "agent_parser.yy"
                                                      {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1305,8 +1305,8 @@ namespace isc { namespace agent {
 #line 1306 "agent_parser.cc"
     break;
 
-  case 117: // $@26: %empty
-#line 557 "agent_parser.yy"
+  case 120: // $@26: %empty
+#line 560 "agent_parser.yy"
                            {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1315,24 +1315,24 @@ namespace isc { namespace agent {
 #line 1316 "agent_parser.cc"
     break;
 
-  case 118: // basic_auth: "{" $@26 clients_params "}"
-#line 561 "agent_parser.yy"
+  case 121: // basic_auth: "{" $@26 clients_params "}"
+#line 564 "agent_parser.yy"
                                 {
     ctx.stack_.pop_back();
 }
 #line 1324 "agent_parser.cc"
     break;
 
-  case 126: // $@27: %empty
-#line 576 "agent_parser.yy"
+  case 129: // $@27: %empty
+#line 579 "agent_parser.yy"
            {
     ctx.enter(ctx.NO_KEYWORDS);
 }
 #line 1332 "agent_parser.cc"
     break;
 
-  case 127: // user: "user" $@27 ":" "constant string"
-#line 578 "agent_parser.yy"
+  case 130: // user: "user" $@27 ":" "constant string"
+#line 581 "agent_parser.yy"
                {
     ElementPtr user(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user", user);
@@ -1341,16 +1341,16 @@ namespace isc { namespace agent {
 #line 1342 "agent_parser.cc"
     break;
 
-  case 128: // $@28: %empty
-#line 584 "agent_parser.yy"
+  case 131: // $@28: %empty
+#line 587 "agent_parser.yy"
                    {
     ctx.enter(ctx.NO_KEYWORDS);
 }
 #line 1350 "agent_parser.cc"
     break;
 
-  case 129: // password: "password" $@28 ":" "constant string"
-#line 586 "agent_parser.yy"
+  case 132: // password: "password" $@28 ":" "constant string"
+#line 589 "agent_parser.yy"
                {
     ElementPtr password(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password", password);
@@ -1359,8 +1359,8 @@ namespace isc { namespace agent {
 #line 1360 "agent_parser.cc"
     break;
 
-  case 130: // $@29: %empty
-#line 596 "agent_parser.yy"
+  case 133: // $@29: %empty
+#line 599 "agent_parser.yy"
                  {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("loggers", l);
@@ -1370,8 +1370,8 @@ namespace isc { namespace agent {
 #line 1371 "agent_parser.cc"
     break;
 
-  case 131: // loggers: "loggers" $@29 ":" "[" loggers_entries "]"
-#line 601 "agent_parser.yy"
+  case 134: // loggers: "loggers" $@29 ":" "[" loggers_entries "]"
+#line 604 "agent_parser.yy"
                                                          {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1379,8 +1379,8 @@ namespace isc { namespace agent {
 #line 1380 "agent_parser.cc"
     break;
 
-  case 134: // $@30: %empty
-#line 613 "agent_parser.yy"
+  case 137: // $@30: %empty
+#line 616 "agent_parser.yy"
                              {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
@@ -1389,24 +1389,24 @@ namespace isc { namespace agent {
 #line 1390 "agent_parser.cc"
     break;
 
-  case 135: // logger_entry: "{" $@30 logger_params "}"
-#line 617 "agent_parser.yy"
+  case 138: // logger_entry: "{" $@30 logger_params "}"
+#line 620 "agent_parser.yy"
                                {
     ctx.stack_.pop_back();
 }
 #line 1398 "agent_parser.cc"
     break;
 
-  case 145: // $@31: %empty
-#line 634 "agent_parser.yy"
+  case 148: // $@31: %empty
+#line 637 "agent_parser.yy"
            {
     ctx.enter(ctx.NO_KEYWORDS);
 }
 #line 1406 "agent_parser.cc"
     break;
 
-  case 146: // name: "name" $@31 ":" "constant string"
-#line 636 "agent_parser.yy"
+  case 149: // name: "name" $@31 ":" "constant string"
+#line 639 "agent_parser.yy"
                {
     ElementPtr name(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
@@ -1415,8 +1415,8 @@ namespace isc { namespace agent {
 #line 1416 "agent_parser.cc"
     break;
 
-  case 147: // debuglevel: "debuglevel" ":" "integer"
-#line 642 "agent_parser.yy"
+  case 150: // debuglevel: "debuglevel" ":" "integer"
+#line 645 "agent_parser.yy"
                                      {
     ElementPtr dl(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
@@ -1424,16 +1424,16 @@ namespace isc { namespace agent {
 #line 1425 "agent_parser.cc"
     break;
 
-  case 148: // $@32: %empty
-#line 647 "agent_parser.yy"
+  case 151: // $@32: %empty
+#line 650 "agent_parser.yy"
                    {
     ctx.enter(ctx.NO_KEYWORDS);
 }
 #line 1433 "agent_parser.cc"
     break;
 
-  case 149: // severity: "severity" $@32 ":" "constant string"
-#line 649 "agent_parser.yy"
+  case 152: // severity: "severity" $@32 ":" "constant string"
+#line 652 "agent_parser.yy"
                {
     ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
@@ -1442,8 +1442,8 @@ namespace isc { namespace agent {
 #line 1443 "agent_parser.cc"
     break;
 
-  case 150: // $@33: %empty
-#line 655 "agent_parser.yy"
+  case 153: // $@33: %empty
+#line 658 "agent_parser.yy"
                                     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
@@ -1453,8 +1453,8 @@ namespace isc { namespace agent {
 #line 1454 "agent_parser.cc"
     break;
 
-  case 151: // output_options_list: "output_options" $@33 ":" "[" output_options_list_content "]"
-#line 660 "agent_parser.yy"
+  case 154: // output_options_list: "output_options" $@33 ":" "[" output_options_list_content "]"
+#line 663 "agent_parser.yy"
                                                                     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1462,8 +1462,8 @@ namespace isc { namespace agent {
 #line 1463 "agent_parser.cc"
     break;
 
-  case 154: // $@34: %empty
-#line 669 "agent_parser.yy"
+  case 157: // $@34: %empty
+#line 672 "agent_parser.yy"
                              {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1472,24 +1472,24 @@ namespace isc { namespace agent {
 #line 1473 "agent_parser.cc"
     break;
 
-  case 155: // output_entry: "{" $@34 output_params_list "}"
-#line 673 "agent_parser.yy"
+  case 158: // output_entry: "{" $@34 output_params_list "}"
+#line 676 "agent_parser.yy"
                                     {
     ctx.stack_.pop_back();
 }
 #line 1481 "agent_parser.cc"
     break;
 
-  case 163: // $@35: %empty
-#line 688 "agent_parser.yy"
+  case 166: // $@35: %empty
+#line 691 "agent_parser.yy"
                {
     ctx.enter(ctx.NO_KEYWORDS);
 }
 #line 1489 "agent_parser.cc"
     break;
 
-  case 164: // output: "output" $@35 ":" "constant string"
-#line 690 "agent_parser.yy"
+  case 167: // output: "output" $@35 ":" "constant string"
+#line 693 "agent_parser.yy"
                {
     ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
@@ -1498,8 +1498,8 @@ namespace isc { namespace agent {
 #line 1499 "agent_parser.cc"
     break;
 
-  case 165: // flush: "flush" ":" "boolean"
-#line 696 "agent_parser.yy"
+  case 168: // flush: "flush" ":" "boolean"
+#line 699 "agent_parser.yy"
                            {
     ElementPtr flush(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
@@ -1507,8 +1507,8 @@ namespace isc { namespace agent {
 #line 1508 "agent_parser.cc"
     break;
 
-  case 166: // maxsize: "maxsize" ":" "integer"
-#line 701 "agent_parser.yy"
+  case 169: // maxsize: "maxsize" ":" "integer"
+#line 704 "agent_parser.yy"
                                {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
@@ -1516,8 +1516,8 @@ namespace isc { namespace agent {
 #line 1517 "agent_parser.cc"
     break;
 
-  case 167: // maxver: "maxver" ":" "integer"
-#line 706 "agent_parser.yy"
+  case 170: // maxver: "maxver" ":" "integer"
+#line 709 "agent_parser.yy"
                              {
     ElementPtr maxver(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
@@ -1525,16 +1525,16 @@ namespace isc { namespace agent {
 #line 1526 "agent_parser.cc"
     break;
 
-  case 168: // $@36: %empty
-#line 711 "agent_parser.yy"
+  case 171: // $@36: %empty
+#line 714 "agent_parser.yy"
                  {
     ctx.enter(ctx.NO_KEYWORDS);
 }
 #line 1534 "agent_parser.cc"
     break;
 
-  case 169: // pattern: "pattern" $@36 ":" "constant string"
-#line 713 "agent_parser.yy"
+  case 172: // pattern: "pattern" $@36 ":" "constant string"
+#line 716 "agent_parser.yy"
                {
     ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pattern", sev);
@@ -1893,42 +1893,42 @@ namespace isc { namespace agent {
   }
 
 
-  const short AgentParser::yypact_ninf_ = -133;
+  const signed char AgentParser::yypact_ninf_ = -82;
 
   const signed char AgentParser::yytable_ninf_ = -1;
 
   const short
   AgentParser::yypact_[] =
   {
-      59,  -133,  -133,  -133,     8,     5,     6,    13,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,     5,   -34,    18,    10,  -133,    48,
-      83,    58,    96,   102,  -133,    98,  -133,  -133,  -133,   104,
-    -133,  -133,  -133,   106,  -133,  -133,   107,  -133,     1,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,     5,
-       5,  -133,    70,   112,  -133,   113,    72,   115,   116,   117,
-     118,   119,   120,  -133,    10,  -133,  -133,  -133,   123,   121,
-      88,  -133,   122,    89,   124,  -133,   125,   127,  -133,     5,
-      10,  -133,  -133,  -133,  -133,    80,    -8,   128,   129,  -133,
-      28,  -133,  -133,  -133,    73,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,    74,  -133,  -133,  -133,  -133,  -133,   131,
-     135,  -133,  -133,    55,  -133,  -133,   136,   137,   138,    80,
-    -133,   139,   140,   141,    -8,  -133,   -12,  -133,   128,    -7,
-     129,  -133,   105,   101,   134,  -133,   142,   143,   144,  -133,
-    -133,  -133,  -133,    75,  -133,  -133,  -133,  -133,  -133,  -133,
-     148,  -133,  -133,  -133,  -133,    76,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,   146,    30,    30,    30,   150,
-     151,     4,  -133,   152,   153,   126,   154,    -7,  -133,  -133,
-     157,   145,  -133,  -133,  -133,  -133,  -133,  -133,    77,  -133,
-    -133,  -133,    84,    85,   114,   122,  -133,   130,   159,  -133,
-     132,  -133,    46,  -133,   146,   161,   162,    30,  -133,  -133,
-    -133,  -133,  -133,  -133,   160,  -133,  -133,  -133,  -133,  -133,
-    -133,    86,  -133,  -133,  -133,  -133,   133,   155,  -133,  -133,
-      94,  -133,   164,   165,    46,  -133,  -133,  -133,  -133,    33,
-     160,  -133,   147,   149,  -133,  -133,   166,   167,   169,  -133,
-      87,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-     170,    99,   156,   158,   172,    33,  -133,   163,  -133,  -133,
-    -133,   168,  -133,  -133,  -133
+      60,   -82,   -82,   -82,     4,     6,    -1,     5,   -82,   -82,
+     -82,   -82,   -82,   -82,   -82,   -82,   -82,   -82,   -82,   -82,
+     -82,   -82,   -82,   -82,     6,   -31,     8,    12,   -82,    14,
+      53,    63,    56,    70,   -82,    87,   -82,   -82,   -82,   105,
+     -82,   -82,   -82,   119,   -82,   -82,   120,   -82,     2,   -82,
+     -82,   -82,   -82,   -82,   -82,   -82,   -82,   -82,   -82,     6,
+       6,   -82,    85,   121,   -82,   122,    51,   124,   125,   127,
+     126,   128,   130,   -82,    12,   -82,   -82,   -82,   131,   129,
+      92,   -82,   132,    95,   134,   -82,   133,   137,   -82,     6,
+      12,   -82,   -82,   -82,   -82,     3,    55,   136,   138,   -82,
+      27,   -82,   -82,   -82,   -82,   -82,   -82,    52,   -82,   -82,
+     -82,   -82,   -82,   -82,   -82,   -82,    80,   -82,   -82,   -82,
+     -82,   -82,   140,   141,   -82,   -82,   108,   -82,   -82,   143,
+     144,   145,     3,   -82,   146,   147,   148,    55,   -82,    31,
+     -82,   136,    -5,   138,   -82,   139,   109,   150,   -82,   151,
+     152,   153,   -82,   -82,   -82,   -82,    81,   -82,   -82,   -82,
+     -82,   -82,   -82,   149,   -82,   -82,   -82,   -82,    82,   -82,
+     -82,   -82,   -82,   -82,   -82,   -82,   -82,   -82,   154,    32,
+      32,    32,   158,   160,    89,   -82,   163,   164,   111,   165,
+      -5,   -82,   -82,   166,   167,   -82,   -82,   -82,   -82,   -82,
+     -82,    83,   -82,   -82,   -82,    84,    90,   135,   132,   -82,
+     142,   168,   -82,   155,   -82,    61,   -82,   154,   170,   171,
+      32,   -82,   -82,   -82,   -82,   -82,   -82,   169,   -82,   -82,
+     -82,   -82,   -82,   -82,    91,   -82,   -82,   -82,   -82,   156,
+     157,   -82,   -82,   110,   -82,   173,   174,    61,   -82,   -82,
+     -82,   -82,    -2,   169,   -82,   159,   161,   -82,   -82,   175,
+     177,   178,   -82,    93,   -82,   -82,   -82,   -82,   -82,   -82,
+     -82,   -82,   -82,   179,   123,   162,   172,   180,    -2,   -82,
+     176,   -82,   -82,   -82,   181,   -82,   -82,   -82
   };
 
   const unsigned char
@@ -1938,117 +1938,119 @@ namespace isc { namespace agent {
       18,    15,    14,    11,    12,    13,     3,    10,    16,    17,
       32,     5,     8,     7,    27,    21,     0,     0,    29,     0,
       28,     0,     0,    22,    36,     0,    34,    35,    49,     0,
-      52,    54,    99,     0,    56,   130,     0,    48,     0,    38,
+      52,    54,    99,     0,    56,   133,     0,    48,     0,    38,
       40,    41,    46,    47,    44,    43,    42,    45,    26,     0,
        0,    19,     0,     0,    33,     0,     0,     0,     0,     0,
        0,     0,     0,    31,     0,     9,    30,    23,     0,     0,
        0,    51,     0,     0,     0,    73,     0,     0,    39,     0,
        0,    50,    20,    53,    55,     0,     0,    58,     0,    24,
-       0,   106,   109,   111,     0,   101,   103,   104,   105,    81,
-      83,    85,    80,     0,    75,    77,    78,    79,    62,     0,
-      59,    60,   134,     0,   132,    37,     0,     0,     0,     0,
-     100,     0,     0,     0,     0,    74,     0,    57,     0,     0,
-       0,   131,     0,     0,     0,   102,     0,     0,     0,    76,
-      69,    71,    66,     0,    64,    67,    68,    61,   145,   150,
-       0,   148,   144,   142,   143,     0,   136,   138,   140,   141,
-     139,   133,   108,   107,   110,   113,     0,     0,     0,     0,
-       0,     0,    63,     0,     0,     0,     0,     0,   135,   117,
-       0,   114,   115,    94,    96,    93,    91,    92,     0,    87,
-      89,    90,     0,     0,     0,     0,    65,     0,     0,   147,
-       0,   137,     0,   112,     0,     0,     0,     0,    82,    84,
-      86,    70,    72,   146,     0,   149,   126,   128,   125,   123,
-     124,     0,   119,   121,   122,   116,     0,     0,    88,   154,
-       0,   152,     0,     0,     0,   118,    95,    98,    97,     0,
-       0,   151,     0,     0,   120,   163,     0,     0,     0,   168,
-       0,   156,   158,   159,   160,   161,   162,   153,   127,   129,
-       0,     0,     0,     0,     0,     0,   155,     0,   165,   166,
-     167,     0,   157,   164,   169
+       0,   109,   112,   114,   108,   107,   106,     0,   101,   103,
+     104,   105,    81,    83,    85,    80,     0,    75,    77,    78,
+      79,    62,     0,    59,    60,   137,     0,   135,    37,     0,
+       0,     0,     0,   100,     0,     0,     0,     0,    74,     0,
+      57,     0,     0,     0,   134,     0,     0,     0,   102,     0,
+       0,     0,    76,    69,    71,    66,     0,    64,    67,    68,
+      61,   148,   153,     0,   151,   147,   145,   146,     0,   139,
+     141,   143,   144,   142,   136,   111,   110,   113,   116,     0,
+       0,     0,     0,     0,     0,    63,     0,     0,     0,     0,
+       0,   138,   120,     0,   117,   118,    94,    96,    93,    91,
+      92,     0,    87,    89,    90,     0,     0,     0,     0,    65,
+       0,     0,   150,     0,   140,     0,   115,     0,     0,     0,
+       0,    82,    84,    86,    70,    72,   149,     0,   152,   129,
+     131,   128,   126,   127,     0,   122,   124,   125,   119,     0,
+       0,    88,   157,     0,   155,     0,     0,     0,   121,    95,
+      98,    97,     0,     0,   154,     0,     0,   123,   166,     0,
+       0,     0,   171,     0,   159,   161,   162,   163,   164,   165,
+     156,   130,   132,     0,     0,     0,     0,     0,     0,   158,
+       0,   168,   169,   170,     0,   160,   167,   172
   };
 
-  const short
+  const signed char
   AgentParser::yypgoto_[] =
   {
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,   -19,   -79,
-    -133,   -24,  -133,  -133,  -133,  -133,  -133,  -133,   -27,  -133,
-    -133,  -133,  -133,  -133,  -133,    90,   108,  -133,  -133,  -133,
-     -26,  -133,   -25,  -133,  -133,  -133,  -133,  -133,    41,  -133,
-    -133,     3,  -133,  -133,  -133,  -133,  -133,  -133,  -133,    54,
-    -133,  -133,  -133,  -133,  -133,  -133,  -132,   -28,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,    61,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,   -23,  -133,  -133,   -51,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,    56,  -133,  -133,
-      11,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,   -55,
-    -133,  -133,   -78,  -133,  -133,  -133,  -133,  -133,  -133,  -133
+     -82,   -82,   -82,   -82,   -82,   -82,   -82,   -82,   -17,   -81,
+     -82,   -22,   -82,   -82,   -82,   -82,   -82,   -82,   -27,   -82,
+     -82,   -82,   -82,   -82,   -82,    99,   118,   -82,   -82,   -82,
+     -25,   -82,   -24,   -82,   -82,   -82,   -82,   -82,    54,   -82,
+     -82,     9,   -82,   -82,   -82,   -82,   -82,   -82,   -82,    57,
+     -82,   -82,   -82,   -82,   -82,   -82,   -59,   -23,   -82,   -82,
+     -82,   -82,   -82,   -82,   -82,   -82,    64,   -82,   -82,   -82,
+     -82,   -82,   -82,   -82,   -82,   -82,   -19,   -82,   -82,   -48,
+     -82,   -82,   -82,   -82,   -82,   -82,   -82,    59,   -82,   -82,
+      13,   -82,   -82,   -82,   -82,   -82,   -82,   -82,   -82,   -46,
+     -82,   -82,   -73,   -82,   -82,   -82,   -82,   -82,   -82,   -82
   };
 
   const short
   AgentParser::yydefgoto_[] =
   {
       -1,     4,     5,     6,     7,    23,    27,    16,    17,    18,
-      25,    93,    32,    33,    19,    24,    29,    30,   195,    21,
+      25,    93,    32,    33,    19,    24,    29,    30,   198,    21,
       26,    35,    36,    37,    63,    48,    49,    50,    65,    51,
-     196,    67,   197,    68,    54,    71,   119,   120,   121,   136,
-     153,   154,   155,   179,   156,   180,    55,    96,   113,   114,
-     115,   131,   116,   132,   117,   133,   198,   199,   200,   215,
-     201,   216,   248,    56,    69,   104,   105,   106,   126,   173,
-     107,   127,   108,   128,   190,   191,   192,   212,   231,   232,
-     233,   242,   234,   243,    57,    72,   123,   124,   139,   165,
-     166,   167,   183,   168,   169,   186,   170,   184,   240,   241,
-     249,   260,   261,   262,   270,   263,   264,   265,   266,   274
+     199,    67,   200,    68,    54,    71,   122,   123,   124,   139,
+     156,   157,   158,   182,   159,   183,    55,    96,   116,   117,
+     118,   134,   119,   135,   120,   136,   201,   202,   203,   218,
+     204,   219,   251,    56,    69,   107,   108,   109,   129,   176,
+     110,   130,   111,   131,   193,   194,   195,   215,   234,   235,
+     236,   245,   237,   246,    57,    72,   126,   127,   142,   168,
+     169,   170,   186,   171,   172,   189,   173,   187,   243,   244,
+     252,   263,   264,   265,   273,   266,   267,   268,   269,   277
   };
 
   const short
   AgentParser::yytable_[] =
   {
-      47,    52,    53,    92,    74,    28,    40,    41,     8,    75,
-       9,    31,    10,    20,    11,   109,   110,   111,   150,   151,
-      22,    38,    39,    40,    41,    42,   158,   159,    34,   160,
-     161,    74,    43,    46,   150,   151,   125,    46,    46,    44,
-      76,    77,    45,    40,    41,   202,   203,    47,    52,    53,
-      12,    13,    14,    15,    58,    46,   193,   194,   140,    40,
-      41,   141,    60,    47,    52,    53,   226,   227,   255,   112,
-      99,   256,   257,   258,   259,    46,   129,   134,   181,   187,
-     217,   130,   135,   182,   188,   218,    59,   217,   217,   244,
-     275,    46,   219,   220,   245,   276,   101,   250,   102,   103,
-     251,     1,     2,     3,    61,    62,    64,   112,    66,   152,
-      70,    73,   162,   163,   164,    78,    79,    80,    81,    82,
-      83,    84,   172,    86,    87,    85,    92,    89,    90,    10,
-      97,    95,    98,    91,    94,   118,   122,   137,   138,   175,
-     142,   143,   144,   146,   147,   148,   174,   278,   214,   176,
-     177,   178,   185,   189,   204,   205,   207,   208,   210,   221,
-     162,   163,   164,   213,   224,   236,   237,   239,   252,   253,
-     271,   272,   209,   273,   277,   223,   281,   225,   246,   157,
-     100,   222,    88,   247,   206,   228,   229,   230,   149,   238,
-     145,   235,   268,   254,   269,   267,   171,   282,   211,     0,
-       0,     0,   279,     0,   280,     0,     0,     0,   283,     0,
-       0,     0,     0,   284,     0,     0,     0,   228,   229,   230
+      47,    92,    52,    53,     8,    74,    20,    28,    40,    41,
+      75,     9,    22,    10,    31,    11,    40,    41,    34,   101,
+      58,   102,   103,    38,    39,    40,    41,    42,   161,   162,
+      74,   163,   164,   258,    43,   128,   259,   260,   261,   262,
+      46,    44,    76,    77,    45,    40,    41,    47,    46,    52,
+      53,    12,    13,    14,    15,   132,    59,    46,   196,   197,
+     133,   153,   154,    47,    61,    52,    53,    60,   104,   115,
+     105,   106,    99,    62,    40,    41,    46,    46,   112,   113,
+     114,   229,   230,   137,   184,   190,   220,   220,   138,   185,
+     191,   221,   222,   220,   247,    64,   278,    81,   223,   248,
+      46,   279,     1,     2,     3,   104,    46,   105,   106,    66,
+     115,   143,   155,   253,   144,   165,   254,   166,   167,   153,
+     154,   205,   206,    70,    73,    79,    80,    92,    82,    83,
+      78,    84,    86,    85,    87,    89,    90,    91,    97,    10,
+      94,    95,    98,   121,   141,   125,   140,   145,   146,   147,
+     149,   150,   151,   188,   177,   178,   175,   212,   179,   180,
+     181,   192,   207,   165,   208,   166,   167,   210,   211,   213,
+     217,   281,   216,   227,   239,   240,   242,   255,   256,   274,
+     224,   275,   276,   280,   284,   250,   225,   226,   231,   100,
+     232,   233,    88,   209,   152,   160,   148,   241,   238,   257,
+     228,   249,   174,   214,   271,   285,   272,   270,   282,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   283,     0,
+     231,   286,   232,   233,     0,     0,   287
   };
 
   const short
   AgentParser::yycheck_[] =
   {
-      27,    27,    27,    82,     3,    24,    13,    14,     0,     8,
-       5,    45,     7,     7,     9,    23,    24,    25,    30,    31,
-       7,    11,    12,    13,    14,    15,    33,    34,    10,    36,
-      37,     3,    22,    45,    30,    31,     8,    45,    45,    29,
-      59,    60,    32,    13,    14,   177,   178,    74,    74,    74,
-      45,    46,    47,    48,     6,    45,    26,    27,     3,    13,
-      14,     6,     4,    90,    90,    90,    20,    21,    35,    96,
-      89,    38,    39,    40,    41,    45,     3,     3,     3,     3,
-       3,     8,     8,     8,     8,     8,     3,     3,     3,     3,
-       3,    45,     8,     8,     8,     8,    16,     3,    18,    19,
-       6,    42,    43,    44,     8,     3,     8,   134,     4,   136,
-       4,     4,   139,   139,   139,    45,     4,     4,    46,     4,
-       4,     4,    17,     4,     4,     7,   205,     4,     7,     7,
-       5,     7,     5,    45,    45,     7,     7,     6,     3,     5,
-       4,     4,     4,     4,     4,     4,    45,    48,     3,     7,
-       7,     7,     4,     7,     4,     4,     4,     4,     4,    45,
-     187,   187,   187,     6,     5,     4,     4,     7,     4,     4,
-       4,     4,    46,     4,     4,    45,     4,    45,    45,   138,
-      90,   205,    74,    28,   181,   212,   212,   212,   134,   217,
-     129,   214,    45,   244,    45,   250,   140,   275,   187,    -1,
-      -1,    -1,    46,    -1,    46,    -1,    -1,    -1,    45,    -1,
-      -1,    -1,    -1,    45,    -1,    -1,    -1,   244,   244,   244
+      27,    82,    27,    27,     0,     3,     7,    24,    13,    14,
+       8,     5,     7,     7,    45,     9,    13,    14,    10,    16,
+       6,    18,    19,    11,    12,    13,    14,    15,    33,    34,
+       3,    36,    37,    35,    22,     8,    38,    39,    40,    41,
+      45,    29,    59,    60,    32,    13,    14,    74,    45,    74,
+      74,    45,    46,    47,    48,     3,     3,    45,    26,    27,
+       8,    30,    31,    90,     8,    90,    90,     4,    95,    96,
+      95,    95,    89,     3,    13,    14,    45,    45,    23,    24,
+      25,    20,    21,     3,     3,     3,     3,     3,     8,     8,
+       8,     8,     8,     3,     3,     8,     3,    46,     8,     8,
+      45,     8,    42,    43,    44,   132,    45,   132,   132,     4,
+     137,     3,   139,     3,     6,   142,     6,   142,   142,    30,
+      31,   180,   181,     4,     4,     4,     4,   208,     4,     4,
+      45,     4,     4,     7,     4,     4,     7,    45,     5,     7,
+      45,     7,     5,     7,     3,     7,     6,     4,     4,     4,
+       4,     4,     4,     4,    45,     5,    17,    46,     7,     7,
+       7,     7,     4,   190,     4,   190,   190,     4,     4,     4,
+       3,    48,     6,     5,     4,     4,     7,     4,     4,     4,
+      45,     4,     4,     4,     4,    28,   208,    45,   215,    90,
+     215,   215,    74,   184,   137,   141,   132,   220,   217,   247,
+      45,    45,   143,   190,    45,   278,    45,   253,    46,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    -1,
+     247,    45,   247,   247,    -1,    -1,    45
   };
 
   const unsigned char
@@ -2064,25 +2066,25 @@ namespace isc { namespace agent {
        4,    84,   134,     4,     3,     8,    57,    57,    45,     4,
        4,    46,     4,     4,     4,     7,     4,     4,    75,     4,
        7,    45,    58,    60,    45,     7,    96,     5,     5,    57,
-      74,    16,    18,    19,   114,   115,   116,   119,   121,    23,
-      24,    25,    67,    97,    98,    99,   101,   103,     7,    85,
-      86,    87,     7,   135,   136,     8,   117,   120,   122,     3,
-       8,   100,   102,   104,     3,     8,    88,     6,     3,   137,
-       3,     6,     4,     4,     4,   115,     4,     4,     4,    98,
-      30,    31,    67,    89,    90,    91,    93,    87,    33,    34,
-      36,    37,    67,    79,    81,   138,   139,   140,   142,   143,
-     145,   136,    17,   118,    45,     5,     7,     7,     7,    92,
-      94,     3,     8,   141,   146,     4,   144,     3,     8,     7,
-     123,   124,   125,    26,    27,    67,    79,    81,   105,   106,
-     107,   109,   105,   105,     4,     4,    90,     4,     4,    46,
-       4,   139,   126,     6,     3,   108,   110,     3,     8,     8,
-       8,    45,    60,    45,     5,    45,    20,    21,    67,    79,
-      81,   127,   128,   129,   131,   125,     4,     4,   106,     7,
-     147,   148,   130,   132,     3,     8,    45,    28,   111,   149,
-       3,     6,     4,     4,   128,    35,    38,    39,    40,    41,
-     150,   151,   152,   154,   155,   156,   157,   148,    45,    45,
-     153,     4,     4,     4,   158,     3,     8,     4,    48,    46,
-      46,     4,   151,    45,    45
+      74,    16,    18,    19,    67,    79,    81,   114,   115,   116,
+     119,   121,    23,    24,    25,    67,    97,    98,    99,   101,
+     103,     7,    85,    86,    87,     7,   135,   136,     8,   117,
+     120,   122,     3,     8,   100,   102,   104,     3,     8,    88,
+       6,     3,   137,     3,     6,     4,     4,     4,   115,     4,
+       4,     4,    98,    30,    31,    67,    89,    90,    91,    93,
+      87,    33,    34,    36,    37,    67,    79,    81,   138,   139,
+     140,   142,   143,   145,   136,    17,   118,    45,     5,     7,
+       7,     7,    92,    94,     3,     8,   141,   146,     4,   144,
+       3,     8,     7,   123,   124,   125,    26,    27,    67,    79,
+      81,   105,   106,   107,   109,   105,   105,     4,     4,    90,
+       4,     4,    46,     4,   139,   126,     6,     3,   108,   110,
+       3,     8,     8,     8,    45,    60,    45,     5,    45,    20,
+      21,    67,    79,    81,   127,   128,   129,   131,   125,     4,
+       4,   106,     7,   147,   148,   130,   132,     3,     8,    45,
+      28,   111,   149,     3,     6,     4,     4,   128,    35,    38,
+      39,    40,    41,   150,   151,   152,   154,   155,   156,   157,
+     148,    45,    45,   153,     4,     4,     4,   158,     3,     8,
+       4,    48,    46,    46,     4,   151,    45,    45
   };
 
   const unsigned char
@@ -2098,13 +2100,14 @@ namespace isc { namespace agent {
       91,    94,    93,    96,    95,    97,    97,    98,    98,    98,
       98,   100,    99,   102,   101,   104,   103,   105,   105,   106,
      106,   106,   106,   106,   108,   107,   110,   109,   111,   113,
-     112,   114,   114,   115,   115,   115,   117,   116,   118,   120,
-     119,   122,   121,   123,   123,   124,   124,   126,   125,   127,
-     127,   128,   128,   128,   128,   128,   130,   129,   132,   131,
-     134,   133,   135,   135,   137,   136,   138,   138,   139,   139,
-     139,   139,   139,   139,   139,   141,   140,   142,   144,   143,
-     146,   145,   147,   147,   149,   148,   150,   150,   151,   151,
-     151,   151,   151,   153,   152,   154,   155,   156,   158,   157
+     112,   114,   114,   115,   115,   115,   115,   115,   115,   117,
+     116,   118,   120,   119,   122,   121,   123,   123,   124,   124,
+     126,   125,   127,   127,   128,   128,   128,   128,   128,   130,
+     129,   132,   131,   134,   133,   135,   135,   137,   136,   138,
+     138,   139,   139,   139,   139,   139,   139,   139,   141,   140,
+     142,   144,   143,   146,   145,   147,   147,   149,   148,   150,
+     150,   151,   151,   151,   151,   151,   153,   152,   154,   155,
+     156,   158,   157
   };
 
   const signed char
@@ -2120,13 +2123,14 @@ namespace isc { namespace agent {
        4,     0,     4,     0,     6,     1,     3,     1,     1,     1,
        1,     0,     6,     0,     6,     0,     6,     1,     3,     1,
        1,     1,     1,     1,     0,     4,     0,     4,     1,     0,
-       6,     1,     3,     1,     1,     1,     0,     4,     1,     0,
-       4,     0,     6,     0,     1,     1,     3,     0,     4,     1,
-       3,     1,     1,     1,     1,     1,     0,     4,     0,     4,
-       0,     6,     1,     3,     0,     4,     1,     3,     1,     1,
-       1,     1,     1,     1,     1,     0,     4,     3,     0,     4,
-       0,     6,     1,     3,     0,     4,     1,     3,     1,     1,
-       1,     1,     1,     0,     4,     3,     3,     3,     0,     4
+       6,     1,     3,     1,     1,     1,     1,     1,     1,     0,
+       4,     1,     0,     4,     0,     6,     0,     1,     1,     3,
+       0,     4,     1,     3,     1,     1,     1,     1,     1,     0,
+       4,     0,     4,     0,     6,     1,     3,     0,     4,     1,
+       3,     1,     1,     1,     1,     1,     1,     1,     0,     4,
+       3,     0,     4,     0,     6,     1,     3,     0,     4,     1,
+       3,     1,     1,     1,     1,     1,     0,     4,     3,     3,
+       3,     0,     4
   };
 
 
@@ -2188,13 +2192,14 @@ namespace isc { namespace agent {
      382,   390,   390,   400,   400,   413,   414,   419,   420,   421,
      422,   426,   426,   437,   437,   448,   448,   459,   460,   464,
      465,   466,   467,   468,   472,   472,   481,   481,   489,   496,
-     496,   509,   510,   513,   514,   515,   518,   518,   526,   529,
-     529,   538,   538,   549,   550,   553,   554,   557,   557,   565,
-     566,   569,   570,   571,   572,   573,   576,   576,   584,   584,
-     596,   596,   608,   609,   613,   613,   621,   622,   625,   626,
-     627,   628,   629,   630,   631,   634,   634,   642,   647,   647,
-     655,   655,   665,   666,   669,   669,   677,   678,   681,   682,
-     683,   684,   685,   688,   688,   696,   701,   706,   711,   711
+     496,   509,   510,   513,   514,   515,   516,   517,   518,   521,
+     521,   529,   532,   532,   541,   541,   552,   553,   556,   557,
+     560,   560,   568,   569,   572,   573,   574,   575,   576,   579,
+     579,   587,   587,   599,   599,   611,   612,   616,   616,   624,
+     625,   628,   629,   630,   631,   632,   633,   634,   637,   637,
+     645,   650,   650,   658,   658,   668,   669,   672,   672,   680,
+     681,   684,   685,   686,   687,   688,   691,   691,   699,   704,
+     709,   714,   714
   };
 
   void
@@ -2227,9 +2232,9 @@ namespace isc { namespace agent {
 
 #line 14 "agent_parser.yy"
 } } // isc::agent
-#line 2231 "agent_parser.cc"
+#line 2236 "agent_parser.cc"
 
-#line 719 "agent_parser.yy"
+#line 722 "agent_parser.yy"
 
 
 void

diff --git a/src/bin/agent/agent_parser.h b/src/bin/agent/agent_parser.h
index 074d7fa5d5f1ab965da095fdb6c0b74efebc40ec..dcc408e81df6ae05e2d2a35520570d427a785399 100644 (file)
--- a/src/bin/agent/agent_parser.h
+++ b/src/bin/agent/agent_parser.h
@@ -1882,7 +1882,7 @@ switch (yykind)
     /// \param yyvalue   the value to check
     static bool yy_table_value_is_error_ (int yyvalue);
 
-    static const short yypact_ninf_;
+    static const signed char yypact_ninf_;
     static const signed char yytable_ninf_;
 
     /// Convert a scanner token kind \a t to a symbol kind.
@@ -1908,7 +1908,7 @@ switch (yykind)
     static const unsigned char yydefact_[];
 
     // YYPGOTO[NTERM-NUM].
-    static const short yypgoto_[];
+    static const signed char yypgoto_[];
 
     // YYDEFGOTO[NTERM-NUM].
     static const short yydefgoto_[];
@@ -2160,7 +2160,7 @@ switch (yykind)
     /// Constants.
     enum
     {
-      yylast_ = 219,     ///< Last index in yytable_.
+      yylast_ = 226,     ///< Last index in yytable_.
       yynnts_ = 110,  ///< Number of nonterminal symbols.
       yyfinal_ = 8 ///< Termination state number.
     };

diff --git a/src/bin/agent/location.hh b/src/bin/agent/location.hh
index 8d99d97acba77de341bc1e94d0cbc88c5f4e9b1b..f46a19682ad3042113dd10cc73cc5c1e18346491 100644 (file)
--- a/src/bin/agent/location.hh
+++ b/src/bin/agent/location.hh
@@ -1,4 +1,4 @@
-// Generated 202009121616
+// Generated 202009132003
 // A Bison parser, made by GNU Bison 3.7.2.
 
 // Locations for Bison parsers in C++

diff --git a/src/bin/agent/position.hh b/src/bin/agent/position.hh
index b9faa8db692edacaf19fafcc82717b58fc465a39..62bce2b79994e945bd3bcc89871e394d22c9648f 100644 (file)
--- a/src/bin/agent/position.hh
+++ b/src/bin/agent/position.hh
@@ -1,4 +1,4 @@
-// Generated 202009121616
+// Generated 202009132003
 // A Bison parser, made by GNU Bison 3.7.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it

diff --git a/src/bin/agent/stack.hh b/src/bin/agent/stack.hh
index 430d2020d9520200ee5e677871c35df3045780d4..48f2900a3315f0a534010eec6538cfe76f79b104 100644 (file)
--- a/src/bin/agent/stack.hh
+++ b/src/bin/agent/stack.hh
@@ -1,4 +1,4 @@
-// Generated 202009121616
+// Generated 202009132003
 // A Bison parser, made by GNU Bison 3.7.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it