From: Wlodek Wencel <wlodek@isc.org>
Date: Tue, 29 Oct 2019 05:49:44 +0000 (+0100)
Subject: [#974] parsers regenerated for 1.7.1
X-Git-Tag: Kea-1.7.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6de8797d1803266d1f90c39b332703229629ab10;p=thirdparty%2Fkea.git

[#974] parsers regenerated for 1.7.1
---

diff --git a/src/bin/agent/agent_parser.cc b/src/bin/agent/agent_parser.cc
index 12138cdc8a..f00c586e0a 100644
--- a/src/bin/agent/agent_parser.cc
+++ b/src/bin/agent/agent_parser.cc
@@ -1,4 +1,4 @@
-// A Bison parser, made by GNU Bison 3.4.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton implementation for Bison LALR(1) parsers in C++
 
@@ -92,9 +92,6 @@
 # endif
 
 
-// Suppress unused-variable warnings by "using" E.
-#define YYUSE(E) ((void) (E))
-
 // Enable debugging if requested.
 #if AGENT_DEBUG
 
@@ -142,7 +139,7 @@
 
 #line 14 "agent_parser.yy"
 namespace isc { namespace agent {
-#line 146 "agent_parser.cc"
+#line 143 "agent_parser.cc"
 
 
   /* Return YYSTR after stripping away unnecessary quotes and
@@ -389,43 +386,43 @@ namespace isc { namespace agent {
       case 42: // "constant string"
 #line 104 "agent_parser.yy"
         { yyoutput << yysym.value.template as < std::string > (); }
-#line 393 "agent_parser.cc"
+#line 390 "agent_parser.cc"
         break;
 
       case 43: // "integer"
 #line 104 "agent_parser.yy"
         { yyoutput << yysym.value.template as < int64_t > (); }
-#line 399 "agent_parser.cc"
+#line 396 "agent_parser.cc"
         break;
 
       case 44: // "floating point"
 #line 104 "agent_parser.yy"
         { yyoutput << yysym.value.template as < double > (); }
-#line 405 "agent_parser.cc"
+#line 402 "agent_parser.cc"
         break;
 
       case 45: // "boolean"
 #line 104 "agent_parser.yy"
         { yyoutput << yysym.value.template as < bool > (); }
-#line 411 "agent_parser.cc"
+#line 408 "agent_parser.cc"
         break;
 
       case 54: // value
 #line 104 "agent_parser.yy"
         { yyoutput << yysym.value.template as < ElementPtr > (); }
-#line 417 "agent_parser.cc"
+#line 414 "agent_parser.cc"
         break;
 
       case 57: // map_value
 #line 104 "agent_parser.yy"
         { yyoutput << yysym.value.template as < ElementPtr > (); }
-#line 423 "agent_parser.cc"
+#line 420 "agent_parser.cc"
         break;
 
       case 108: // socket_type_value
 #line 104 "agent_parser.yy"
         { yyoutput << yysym.value.template as < ElementPtr > (); }
-#line 429 "agent_parser.cc"
+#line 426 "agent_parser.cc"
         break;
 
       default:
@@ -687,19 +684,19 @@ namespace isc { namespace agent {
   case 2:
 #line 115 "agent_parser.yy"
     { ctx.ctx_ = ctx.NO_KEYWORDS; }
-#line 691 "agent_parser.cc"
+#line 688 "agent_parser.cc"
     break;
 
   case 4:
 #line 116 "agent_parser.yy"
     { ctx.ctx_ = ctx.CONFIG; }
-#line 697 "agent_parser.cc"
+#line 694 "agent_parser.cc"
     break;
 
   case 6:
 #line 117 "agent_parser.yy"
     { ctx.ctx_ = ctx.AGENT; }
-#line 703 "agent_parser.cc"
+#line 700 "agent_parser.cc"
     break;
 
   case 8:
@@ -709,7 +706,7 @@ namespace isc { namespace agent {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 713 "agent_parser.cc"
+#line 710 "agent_parser.cc"
     break;
 
   case 9:
@@ -717,7 +714,7 @@ namespace isc { namespace agent {
     {
     // parsing completed
 }
-#line 721 "agent_parser.cc"
+#line 718 "agent_parser.cc"
     break;
 
   case 10:
@@ -726,49 +723,49 @@ namespace isc { namespace agent {
     // Push back the JSON value on the stack
     ctx.stack_.push_back(yystack_[0].value.as < ElementPtr > ());
 }
-#line 730 "agent_parser.cc"
+#line 727 "agent_parser.cc"
     break;
 
   case 11:
 #line 142 "agent_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location))); }
-#line 736 "agent_parser.cc"
+#line 733 "agent_parser.cc"
     break;
 
   case 12:
 #line 143 "agent_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location))); }
-#line 742 "agent_parser.cc"
+#line 739 "agent_parser.cc"
     break;
 
   case 13:
 #line 144 "agent_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location))); }
-#line 748 "agent_parser.cc"
+#line 745 "agent_parser.cc"
     break;
 
   case 14:
 #line 145 "agent_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location))); }
-#line 754 "agent_parser.cc"
+#line 751 "agent_parser.cc"
     break;
 
   case 15:
 #line 146 "agent_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); }
-#line 760 "agent_parser.cc"
+#line 757 "agent_parser.cc"
     break;
 
   case 16:
 #line 147 "agent_parser.yy"
     { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 766 "agent_parser.cc"
+#line 763 "agent_parser.cc"
     break;
 
   case 17:
 #line 148 "agent_parser.yy"
     { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 772 "agent_parser.cc"
+#line 769 "agent_parser.cc"
     break;
 
   case 18:
@@ -779,7 +776,7 @@ namespace isc { namespace agent {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 783 "agent_parser.cc"
+#line 780 "agent_parser.cc"
     break;
 
   case 19:
@@ -789,13 +786,13 @@ namespace isc { namespace agent {
     // (maybe some sanity checking), this would be the best place
     // for it.
 }
-#line 793 "agent_parser.cc"
+#line 790 "agent_parser.cc"
     break;
 
   case 20:
 #line 163 "agent_parser.yy"
     { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 799 "agent_parser.cc"
+#line 796 "agent_parser.cc"
     break;
 
   case 23:
@@ -804,7 +801,7 @@ namespace isc { namespace agent {
                   // map containing a single entry
                   ctx.stack_.back()->set(yystack_[2].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
                   }
-#line 808 "agent_parser.cc"
+#line 805 "agent_parser.cc"
     break;
 
   case 24:
@@ -814,7 +811,7 @@ namespace isc { namespace agent {
                   // comma and string:value
                   ctx.stack_.back()->set(yystack_[2].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
                   }
-#line 818 "agent_parser.cc"
+#line 815 "agent_parser.cc"
     break;
 
   case 25:
@@ -823,14 +820,14 @@ namespace isc { namespace agent {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
 }
-#line 827 "agent_parser.cc"
+#line 824 "agent_parser.cc"
     break;
 
   case 26:
 #line 191 "agent_parser.yy"
     {
 }
-#line 834 "agent_parser.cc"
+#line 831 "agent_parser.cc"
     break;
 
   case 29:
@@ -839,7 +836,7 @@ namespace isc { namespace agent {
                   // List consisting of a single element.
                   ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
                   }
-#line 843 "agent_parser.cc"
+#line 840 "agent_parser.cc"
     break;
 
   case 30:
@@ -848,7 +845,7 @@ namespace isc { namespace agent {
                   // List ending with , and a value.
                   ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
                   }
-#line 852 "agent_parser.cc"
+#line 849 "agent_parser.cc"
     break;
 
   case 31:
@@ -859,7 +856,7 @@ namespace isc { namespace agent {
     error(yystack_[1].location,
           "got unexpected keyword \"" + keyword + "\" in " + where + " map.");
 }
-#line 863 "agent_parser.cc"
+#line 860 "agent_parser.cc"
     break;
 
   case 32:
@@ -870,7 +867,7 @@ namespace isc { namespace agent {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 874 "agent_parser.cc"
+#line 871 "agent_parser.cc"
     break;
 
   case 33:
@@ -880,7 +877,7 @@ namespace isc { namespace agent {
     // (maybe some sanity checking), this would be the best place
     // for it.
 }
-#line 884 "agent_parser.cc"
+#line 881 "agent_parser.cc"
     break;
 
   case 42:
@@ -896,7 +893,7 @@ namespace isc { namespace agent {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.AGENT);
 }
-#line 900 "agent_parser.cc"
+#line 897 "agent_parser.cc"
     break;
 
   case 43:
@@ -907,7 +904,7 @@ namespace isc { namespace agent {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 911 "agent_parser.cc"
+#line 908 "agent_parser.cc"
     break;
 
   case 54:
@@ -915,7 +912,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 919 "agent_parser.cc"
+#line 916 "agent_parser.cc"
     break;
 
   case 55:
@@ -925,7 +922,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("http-host", host);
     ctx.leave();
 }
-#line 929 "agent_parser.cc"
+#line 926 "agent_parser.cc"
     break;
 
   case 56:
@@ -934,7 +931,7 @@ namespace isc { namespace agent {
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("http-port", prf);
 }
-#line 938 "agent_parser.cc"
+#line 935 "agent_parser.cc"
     break;
 
   case 57:
@@ -942,7 +939,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 946 "agent_parser.cc"
+#line 943 "agent_parser.cc"
     break;
 
   case 58:
@@ -969,7 +966,7 @@ namespace isc { namespace agent {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 973 "agent_parser.cc"
+#line 970 "agent_parser.cc"
     break;
 
   case 59:
@@ -977,7 +974,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 981 "agent_parser.cc"
+#line 978 "agent_parser.cc"
     break;
 
   case 60:
@@ -1006,7 +1003,7 @@ namespace isc { namespace agent {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 1010 "agent_parser.cc"
+#line 1007 "agent_parser.cc"
     break;
 
   case 61:
@@ -1017,7 +1014,7 @@ namespace isc { namespace agent {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.HOOKS_LIBRARIES);
 }
-#line 1021 "agent_parser.cc"
+#line 1018 "agent_parser.cc"
     break;
 
   case 62:
@@ -1026,7 +1023,7 @@ namespace isc { namespace agent {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1030 "agent_parser.cc"
+#line 1027 "agent_parser.cc"
     break;
 
   case 67:
@@ -1036,7 +1033,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1040 "agent_parser.cc"
+#line 1037 "agent_parser.cc"
     break;
 
   case 68:
@@ -1044,7 +1041,7 @@ namespace isc { namespace agent {
     {
     ctx.stack_.pop_back();
 }
-#line 1048 "agent_parser.cc"
+#line 1045 "agent_parser.cc"
     break;
 
   case 74:
@@ -1052,7 +1049,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1056 "agent_parser.cc"
+#line 1053 "agent_parser.cc"
     break;
 
   case 75:
@@ -1062,7 +1059,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("library", lib);
     ctx.leave();
 }
-#line 1066 "agent_parser.cc"
+#line 1063 "agent_parser.cc"
     break;
 
   case 76:
@@ -1070,7 +1067,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1074 "agent_parser.cc"
+#line 1071 "agent_parser.cc"
     break;
 
   case 77:
@@ -1079,7 +1076,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1083 "agent_parser.cc"
+#line 1080 "agent_parser.cc"
     break;
 
   case 78:
@@ -1090,7 +1087,7 @@ namespace isc { namespace agent {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.CONTROL_SOCKETS);
 }
-#line 1094 "agent_parser.cc"
+#line 1091 "agent_parser.cc"
     break;
 
   case 79:
@@ -1099,7 +1096,7 @@ namespace isc { namespace agent {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1103 "agent_parser.cc"
+#line 1100 "agent_parser.cc"
     break;
 
   case 86:
@@ -1110,7 +1107,7 @@ namespace isc { namespace agent {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER);
 }
-#line 1114 "agent_parser.cc"
+#line 1111 "agent_parser.cc"
     break;
 
   case 87:
@@ -1119,7 +1116,7 @@ namespace isc { namespace agent {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1123 "agent_parser.cc"
+#line 1120 "agent_parser.cc"
     break;
 
   case 88:
@@ -1130,7 +1127,7 @@ namespace isc { namespace agent {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER);
 }
-#line 1134 "agent_parser.cc"
+#line 1131 "agent_parser.cc"
     break;
 
   case 89:
@@ -1139,7 +1136,7 @@ namespace isc { namespace agent {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1143 "agent_parser.cc"
+#line 1140 "agent_parser.cc"
     break;
 
   case 90:
@@ -1150,7 +1147,7 @@ namespace isc { namespace agent {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER);
 }
-#line 1154 "agent_parser.cc"
+#line 1151 "agent_parser.cc"
     break;
 
   case 91:
@@ -1159,7 +1156,7 @@ namespace isc { namespace agent {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1163 "agent_parser.cc"
+#line 1160 "agent_parser.cc"
     break;
 
   case 99:
@@ -1167,7 +1164,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1171 "agent_parser.cc"
+#line 1168 "agent_parser.cc"
     break;
 
   case 100:
@@ -1177,7 +1174,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("socket-name", name);
     ctx.leave();
 }
-#line 1181 "agent_parser.cc"
+#line 1178 "agent_parser.cc"
     break;
 
   case 101:
@@ -1185,7 +1182,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.SOCKET_TYPE);
 }
-#line 1189 "agent_parser.cc"
+#line 1186 "agent_parser.cc"
     break;
 
   case 102:
@@ -1194,13 +1191,13 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("socket-type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1198 "agent_parser.cc"
+#line 1195 "agent_parser.cc"
     break;
 
   case 103:
 #line 491 "agent_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("unix", ctx.loc2pos(yystack_[0].location))); }
-#line 1204 "agent_parser.cc"
+#line 1201 "agent_parser.cc"
     break;
 
   case 104:
@@ -1208,7 +1205,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1212 "agent_parser.cc"
+#line 1209 "agent_parser.cc"
     break;
 
   case 105:
@@ -1217,7 +1214,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1221 "agent_parser.cc"
+#line 1218 "agent_parser.cc"
     break;
 
   case 106:
@@ -1225,7 +1222,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1229 "agent_parser.cc"
+#line 1226 "agent_parser.cc"
     break;
 
   case 107:
@@ -1234,7 +1231,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1238 "agent_parser.cc"
+#line 1235 "agent_parser.cc"
     break;
 
   case 108:
@@ -1242,7 +1239,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1246 "agent_parser.cc"
+#line 1243 "agent_parser.cc"
     break;
 
   case 109:
@@ -1251,7 +1248,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1255 "agent_parser.cc"
+#line 1252 "agent_parser.cc"
     break;
 
   case 110:
@@ -1262,7 +1259,7 @@ namespace isc { namespace agent {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.LOGGING);
 }
-#line 1266 "agent_parser.cc"
+#line 1263 "agent_parser.cc"
     break;
 
   case 111:
@@ -1271,7 +1268,7 @@ namespace isc { namespace agent {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1275 "agent_parser.cc"
+#line 1272 "agent_parser.cc"
     break;
 
   case 115:
@@ -1282,7 +1279,7 @@ namespace isc { namespace agent {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.LOGGERS);
 }
-#line 1286 "agent_parser.cc"
+#line 1283 "agent_parser.cc"
     break;
 
   case 116:
@@ -1291,7 +1288,7 @@ namespace isc { namespace agent {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1295 "agent_parser.cc"
+#line 1292 "agent_parser.cc"
     break;
 
   case 119:
@@ -1301,7 +1298,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->add(l);
     ctx.stack_.push_back(l);
 }
-#line 1305 "agent_parser.cc"
+#line 1302 "agent_parser.cc"
     break;
 
   case 120:
@@ -1309,7 +1306,7 @@ namespace isc { namespace agent {
     {
     ctx.stack_.pop_back();
 }
-#line 1313 "agent_parser.cc"
+#line 1310 "agent_parser.cc"
     break;
 
   case 130:
@@ -1317,7 +1314,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1321 "agent_parser.cc"
+#line 1318 "agent_parser.cc"
     break;
 
   case 131:
@@ -1327,7 +1324,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("name", name);
     ctx.leave();
 }
-#line 1331 "agent_parser.cc"
+#line 1328 "agent_parser.cc"
     break;
 
   case 132:
@@ -1336,7 +1333,7 @@ namespace isc { namespace agent {
     ElementPtr dl(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
 }
-#line 1340 "agent_parser.cc"
+#line 1337 "agent_parser.cc"
     break;
 
   case 133:
@@ -1344,7 +1341,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1348 "agent_parser.cc"
+#line 1345 "agent_parser.cc"
     break;
 
   case 134:
@@ -1354,7 +1351,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("severity", sev);
     ctx.leave();
 }
-#line 1358 "agent_parser.cc"
+#line 1355 "agent_parser.cc"
     break;
 
   case 135:
@@ -1365,7 +1362,7 @@ namespace isc { namespace agent {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OUTPUT_OPTIONS);
 }
-#line 1369 "agent_parser.cc"
+#line 1366 "agent_parser.cc"
     break;
 
   case 136:
@@ -1374,7 +1371,7 @@ namespace isc { namespace agent {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1378 "agent_parser.cc"
+#line 1375 "agent_parser.cc"
     break;
 
   case 139:
@@ -1384,7 +1381,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1388 "agent_parser.cc"
+#line 1385 "agent_parser.cc"
     break;
 
   case 140:
@@ -1392,7 +1389,7 @@ namespace isc { namespace agent {
     {
     ctx.stack_.pop_back();
 }
-#line 1396 "agent_parser.cc"
+#line 1393 "agent_parser.cc"
     break;
 
   case 148:
@@ -1400,7 +1397,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1404 "agent_parser.cc"
+#line 1401 "agent_parser.cc"
     break;
 
   case 149:
@@ -1410,7 +1407,7 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("output", sev);
     ctx.leave();
 }
-#line 1414 "agent_parser.cc"
+#line 1411 "agent_parser.cc"
     break;
 
   case 150:
@@ -1419,7 +1416,7 @@ namespace isc { namespace agent {
     ElementPtr flush(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
 }
-#line 1423 "agent_parser.cc"
+#line 1420 "agent_parser.cc"
     break;
 
   case 151:
@@ -1428,7 +1425,7 @@ namespace isc { namespace agent {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
 }
-#line 1432 "agent_parser.cc"
+#line 1429 "agent_parser.cc"
     break;
 
   case 152:
@@ -1437,7 +1434,7 @@ namespace isc { namespace agent {
     ElementPtr maxver(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
 }
-#line 1441 "agent_parser.cc"
+#line 1438 "agent_parser.cc"
     break;
 
   case 153:
@@ -1445,7 +1442,7 @@ namespace isc { namespace agent {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1449 "agent_parser.cc"
+#line 1446 "agent_parser.cc"
     break;
 
   case 154:
@@ -1455,11 +1452,11 @@ namespace isc { namespace agent {
     ctx.stack_.back()->set("pattern", sev);
     ctx.leave();
 }
-#line 1459 "agent_parser.cc"
+#line 1456 "agent_parser.cc"
     break;
 
 
-#line 1463 "agent_parser.cc"
+#line 1460 "agent_parser.cc"
 
             default:
               break;
@@ -2048,7 +2045,7 @@ namespace isc { namespace agent {
 
 #line 14 "agent_parser.yy"
 } } // isc::agent
-#line 2052 "agent_parser.cc"
+#line 2049 "agent_parser.cc"
 
 #line 668 "agent_parser.yy"
 
diff --git a/src/bin/agent/agent_parser.h b/src/bin/agent/agent_parser.h
index f1b17fffe7..6f310070ac 100644
--- a/src/bin/agent/agent_parser.h
+++ b/src/bin/agent/agent_parser.h
@@ -1,4 +1,4 @@
-// A Bison parser, made by GNU Bison 3.4.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton interface for Bison LALR(1) parsers in C++
 
diff --git a/src/bin/agent/location.hh b/src/bin/agent/location.hh
index 4f538ced79..03e9665b73 100644
--- a/src/bin/agent/location.hh
+++ b/src/bin/agent/location.hh
@@ -1,5 +1,5 @@
-// Generated 201908191238
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Locations for Bison parsers in C++
 
diff --git a/src/bin/agent/position.hh b/src/bin/agent/position.hh
index c202e38cf4..b26928e17b 100644
--- a/src/bin/agent/position.hh
+++ b/src/bin/agent/position.hh
@@ -1,5 +1,5 @@
-// Generated 201908191238
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined in "location.hh".
diff --git a/src/bin/agent/stack.hh b/src/bin/agent/stack.hh
index 42822f6530..44a4b60f6b 100644
--- a/src/bin/agent/stack.hh
+++ b/src/bin/agent/stack.hh
@@ -1,5 +1,5 @@
-// Generated 201908191238
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined with the parser itself.
diff --git a/src/bin/d2/d2_parser.cc b/src/bin/d2/d2_parser.cc
index d1ce9fd347..b85c1f6d3c 100644
--- a/src/bin/d2/d2_parser.cc
+++ b/src/bin/d2/d2_parser.cc
@@ -1,4 +1,4 @@
-// A Bison parser, made by GNU Bison 3.4.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton implementation for Bison LALR(1) parsers in C++
 
@@ -92,9 +92,6 @@
 # endif
 
 
-// Suppress unused-variable warnings by "using" E.
-#define YYUSE(E) ((void) (E))
-
 // Enable debugging if requested.
 #if D2_PARSER_DEBUG
 
@@ -142,7 +139,7 @@
 
 #line 14 "d2_parser.yy"
 namespace isc { namespace d2 {
-#line 146 "d2_parser.cc"
+#line 143 "d2_parser.cc"
 
 
   /* Return YYSTR after stripping away unnecessary quotes and
@@ -389,43 +386,43 @@ namespace isc { namespace d2 {
       case 57: // "constant string"
 #line 116 "d2_parser.yy"
         { yyoutput << yysym.value.template as < std::string > (); }
-#line 393 "d2_parser.cc"
+#line 390 "d2_parser.cc"
         break;
 
       case 58: // "integer"
 #line 116 "d2_parser.yy"
         { yyoutput << yysym.value.template as < int64_t > (); }
-#line 399 "d2_parser.cc"
+#line 396 "d2_parser.cc"
         break;
 
       case 59: // "floating point"
 #line 116 "d2_parser.yy"
         { yyoutput << yysym.value.template as < double > (); }
-#line 405 "d2_parser.cc"
+#line 402 "d2_parser.cc"
         break;
 
       case 60: // "boolean"
 #line 116 "d2_parser.yy"
         { yyoutput << yysym.value.template as < bool > (); }
-#line 411 "d2_parser.cc"
+#line 408 "d2_parser.cc"
         break;
 
       case 72: // value
 #line 116 "d2_parser.yy"
         { yyoutput << yysym.value.template as < ElementPtr > (); }
-#line 417 "d2_parser.cc"
+#line 414 "d2_parser.cc"
         break;
 
       case 76: // map_value
 #line 116 "d2_parser.yy"
         { yyoutput << yysym.value.template as < ElementPtr > (); }
-#line 423 "d2_parser.cc"
+#line 420 "d2_parser.cc"
         break;
 
       case 100: // ncr_protocol_value
 #line 116 "d2_parser.yy"
         { yyoutput << yysym.value.template as < ElementPtr > (); }
-#line 429 "d2_parser.cc"
+#line 426 "d2_parser.cc"
         break;
 
       default:
@@ -687,97 +684,97 @@ namespace isc { namespace d2 {
   case 2:
 #line 125 "d2_parser.yy"
     { ctx.ctx_ = ctx.NO_KEYWORD; }
-#line 691 "d2_parser.cc"
+#line 688 "d2_parser.cc"
     break;
 
   case 4:
 #line 126 "d2_parser.yy"
     { ctx.ctx_ = ctx.CONFIG; }
-#line 697 "d2_parser.cc"
+#line 694 "d2_parser.cc"
     break;
 
   case 6:
 #line 127 "d2_parser.yy"
     { ctx.ctx_ = ctx.DHCPDDNS; }
-#line 703 "d2_parser.cc"
+#line 700 "d2_parser.cc"
     break;
 
   case 8:
 #line 128 "d2_parser.yy"
     { ctx.ctx_ = ctx.TSIG_KEY; }
-#line 709 "d2_parser.cc"
+#line 706 "d2_parser.cc"
     break;
 
   case 10:
 #line 129 "d2_parser.yy"
     { ctx.ctx_ = ctx.TSIG_KEYS; }
-#line 715 "d2_parser.cc"
+#line 712 "d2_parser.cc"
     break;
 
   case 12:
 #line 130 "d2_parser.yy"
     { ctx.ctx_ = ctx.DDNS_DOMAIN; }
-#line 721 "d2_parser.cc"
+#line 718 "d2_parser.cc"
     break;
 
   case 14:
 #line 131 "d2_parser.yy"
     { ctx.ctx_ = ctx.DDNS_DOMAINS; }
-#line 727 "d2_parser.cc"
+#line 724 "d2_parser.cc"
     break;
 
   case 16:
 #line 132 "d2_parser.yy"
     { ctx.ctx_ = ctx.DNS_SERVERS; }
-#line 733 "d2_parser.cc"
+#line 730 "d2_parser.cc"
     break;
 
   case 18:
 #line 133 "d2_parser.yy"
     { ctx.ctx_ = ctx.DNS_SERVERS; }
-#line 739 "d2_parser.cc"
+#line 736 "d2_parser.cc"
     break;
 
   case 20:
 #line 141 "d2_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location))); }
-#line 745 "d2_parser.cc"
+#line 742 "d2_parser.cc"
     break;
 
   case 21:
 #line 142 "d2_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location))); }
-#line 751 "d2_parser.cc"
+#line 748 "d2_parser.cc"
     break;
 
   case 22:
 #line 143 "d2_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location))); }
-#line 757 "d2_parser.cc"
+#line 754 "d2_parser.cc"
     break;
 
   case 23:
 #line 144 "d2_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location))); }
-#line 763 "d2_parser.cc"
+#line 760 "d2_parser.cc"
     break;
 
   case 24:
 #line 145 "d2_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); }
-#line 769 "d2_parser.cc"
+#line 766 "d2_parser.cc"
     break;
 
   case 25:
 #line 146 "d2_parser.yy"
     { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 775 "d2_parser.cc"
+#line 772 "d2_parser.cc"
     break;
 
   case 26:
 #line 147 "d2_parser.yy"
     { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 781 "d2_parser.cc"
+#line 778 "d2_parser.cc"
     break;
 
   case 27:
@@ -786,7 +783,7 @@ namespace isc { namespace d2 {
     // Push back the JSON value on the stack
     ctx.stack_.push_back(yystack_[0].value.as < ElementPtr > ());
 }
-#line 790 "d2_parser.cc"
+#line 787 "d2_parser.cc"
     break;
 
   case 28:
@@ -797,7 +794,7 @@ namespace isc { namespace d2 {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 801 "d2_parser.cc"
+#line 798 "d2_parser.cc"
     break;
 
   case 29:
@@ -807,13 +804,13 @@ namespace isc { namespace d2 {
     // (maybe some sanity checking), this would be the best place
     // for it.
 }
-#line 811 "d2_parser.cc"
+#line 808 "d2_parser.cc"
     break;
 
   case 30:
 #line 166 "d2_parser.yy"
     { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 817 "d2_parser.cc"
+#line 814 "d2_parser.cc"
     break;
 
   case 33:
@@ -822,7 +819,7 @@ namespace isc { namespace d2 {
                   // map containing a single entry
                   ctx.stack_.back()->set(yystack_[2].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
                   }
-#line 826 "d2_parser.cc"
+#line 823 "d2_parser.cc"
     break;
 
   case 34:
@@ -832,7 +829,7 @@ namespace isc { namespace d2 {
                   // comma and string:value
                   ctx.stack_.back()->set(yystack_[2].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
                   }
-#line 836 "d2_parser.cc"
+#line 833 "d2_parser.cc"
     break;
 
   case 35:
@@ -841,7 +838,7 @@ namespace isc { namespace d2 {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
 }
-#line 845 "d2_parser.cc"
+#line 842 "d2_parser.cc"
     break;
 
   case 36:
@@ -849,7 +846,7 @@ namespace isc { namespace d2 {
     {
     // list parsing complete. Put any sanity checking here
 }
-#line 853 "d2_parser.cc"
+#line 850 "d2_parser.cc"
     break;
 
   case 39:
@@ -858,7 +855,7 @@ namespace isc { namespace d2 {
                   // List consisting of a single element.
                   ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
                   }
-#line 862 "d2_parser.cc"
+#line 859 "d2_parser.cc"
     break;
 
   case 40:
@@ -867,7 +864,7 @@ namespace isc { namespace d2 {
                   // List ending with , and a value.
                   ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
                   }
-#line 871 "d2_parser.cc"
+#line 868 "d2_parser.cc"
     break;
 
   case 41:
@@ -878,7 +875,7 @@ namespace isc { namespace d2 {
     error(yystack_[1].location,
           "got unexpected keyword \"" + keyword + "\" in " + where + " map.");
 }
-#line 882 "d2_parser.cc"
+#line 879 "d2_parser.cc"
     break;
 
   case 42:
@@ -889,7 +886,7 @@ namespace isc { namespace d2 {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 893 "d2_parser.cc"
+#line 890 "d2_parser.cc"
     break;
 
   case 43:
@@ -899,7 +896,7 @@ namespace isc { namespace d2 {
     // (maybe some sanity checking), this would be the best place
     // for it.
 }
-#line 903 "d2_parser.cc"
+#line 900 "d2_parser.cc"
     break;
 
   case 52:
@@ -910,7 +907,7 @@ namespace isc { namespace d2 {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.DHCPDDNS);
 }
-#line 914 "d2_parser.cc"
+#line 911 "d2_parser.cc"
     break;
 
   case 53:
@@ -919,7 +916,7 @@ namespace isc { namespace d2 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 923 "d2_parser.cc"
+#line 920 "d2_parser.cc"
     break;
 
   case 54:
@@ -929,7 +926,7 @@ namespace isc { namespace d2 {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 933 "d2_parser.cc"
+#line 930 "d2_parser.cc"
     break;
 
   case 55:
@@ -937,7 +934,7 @@ namespace isc { namespace d2 {
     {
     // parsing completed
 }
-#line 941 "d2_parser.cc"
+#line 938 "d2_parser.cc"
     break;
 
   case 71:
@@ -945,7 +942,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 949 "d2_parser.cc"
+#line 946 "d2_parser.cc"
     break;
 
   case 72:
@@ -955,7 +952,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("ip-address", s);
     ctx.leave();
 }
-#line 959 "d2_parser.cc"
+#line 956 "d2_parser.cc"
     break;
 
   case 73:
@@ -967,7 +964,7 @@ namespace isc { namespace d2 {
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", i);
 }
-#line 971 "d2_parser.cc"
+#line 968 "d2_parser.cc"
     break;
 
   case 74:
@@ -980,7 +977,7 @@ namespace isc { namespace d2 {
         ctx.stack_.back()->set("dns-server-timeout", i);
     }
 }
-#line 984 "d2_parser.cc"
+#line 981 "d2_parser.cc"
     break;
 
   case 75:
@@ -988,7 +985,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
-#line 992 "d2_parser.cc"
+#line 989 "d2_parser.cc"
     break;
 
   case 76:
@@ -997,19 +994,19 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1001 "d2_parser.cc"
+#line 998 "d2_parser.cc"
     break;
 
   case 77:
 #line 318 "d2_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
-#line 1007 "d2_parser.cc"
+#line 1004 "d2_parser.cc"
     break;
 
   case 78:
 #line 319 "d2_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
-#line 1013 "d2_parser.cc"
+#line 1010 "d2_parser.cc"
     break;
 
   case 79:
@@ -1017,7 +1014,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
-#line 1021 "d2_parser.cc"
+#line 1018 "d2_parser.cc"
     break;
 
   case 80:
@@ -1027,7 +1024,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("ncr-format", json);
     ctx.leave();
 }
-#line 1031 "d2_parser.cc"
+#line 1028 "d2_parser.cc"
     break;
 
   case 81:
@@ -1035,7 +1032,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1039 "d2_parser.cc"
+#line 1036 "d2_parser.cc"
     break;
 
   case 82:
@@ -1062,7 +1059,7 @@ namespace isc { namespace d2 {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 1066 "d2_parser.cc"
+#line 1063 "d2_parser.cc"
     break;
 
   case 83:
@@ -1070,7 +1067,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1074 "d2_parser.cc"
+#line 1071 "d2_parser.cc"
     break;
 
   case 84:
@@ -1099,7 +1096,7 @@ namespace isc { namespace d2 {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 1103 "d2_parser.cc"
+#line 1100 "d2_parser.cc"
     break;
 
   case 85:
@@ -1110,7 +1107,7 @@ namespace isc { namespace d2 {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.FORWARD_DDNS);
 }
-#line 1114 "d2_parser.cc"
+#line 1111 "d2_parser.cc"
     break;
 
   case 86:
@@ -1119,7 +1116,7 @@ namespace isc { namespace d2 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1123 "d2_parser.cc"
+#line 1120 "d2_parser.cc"
     break;
 
   case 87:
@@ -1130,7 +1127,7 @@ namespace isc { namespace d2 {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.REVERSE_DDNS);
 }
-#line 1134 "d2_parser.cc"
+#line 1131 "d2_parser.cc"
     break;
 
   case 88:
@@ -1139,7 +1136,7 @@ namespace isc { namespace d2 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1143 "d2_parser.cc"
+#line 1140 "d2_parser.cc"
     break;
 
   case 95:
@@ -1150,7 +1147,7 @@ namespace isc { namespace d2 {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.DDNS_DOMAINS);
 }
-#line 1154 "d2_parser.cc"
+#line 1151 "d2_parser.cc"
     break;
 
   case 96:
@@ -1159,7 +1156,7 @@ namespace isc { namespace d2 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1163 "d2_parser.cc"
+#line 1160 "d2_parser.cc"
     break;
 
   case 97:
@@ -1168,7 +1165,7 @@ namespace isc { namespace d2 {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
 }
-#line 1172 "d2_parser.cc"
+#line 1169 "d2_parser.cc"
     break;
 
   case 98:
@@ -1176,7 +1173,7 @@ namespace isc { namespace d2 {
     {
     // parsing completed
 }
-#line 1180 "d2_parser.cc"
+#line 1177 "d2_parser.cc"
     break;
 
   case 103:
@@ -1186,7 +1183,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1190 "d2_parser.cc"
+#line 1187 "d2_parser.cc"
     break;
 
   case 104:
@@ -1194,7 +1191,7 @@ namespace isc { namespace d2 {
     {
     ctx.stack_.pop_back();
 }
-#line 1198 "d2_parser.cc"
+#line 1195 "d2_parser.cc"
     break;
 
   case 105:
@@ -1203,7 +1200,7 @@ namespace isc { namespace d2 {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1207 "d2_parser.cc"
+#line 1204 "d2_parser.cc"
     break;
 
   case 106:
@@ -1211,7 +1208,7 @@ namespace isc { namespace d2 {
     {
     // parsing completed
 }
-#line 1215 "d2_parser.cc"
+#line 1212 "d2_parser.cc"
     break;
 
   case 115:
@@ -1219,7 +1216,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1223 "d2_parser.cc"
+#line 1220 "d2_parser.cc"
     break;
 
   case 116:
@@ -1233,7 +1230,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("name", name);
     ctx.leave();
 }
-#line 1237 "d2_parser.cc"
+#line 1234 "d2_parser.cc"
     break;
 
   case 117:
@@ -1241,7 +1238,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1245 "d2_parser.cc"
+#line 1242 "d2_parser.cc"
     break;
 
   case 118:
@@ -1252,7 +1249,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("key-name", name);
     ctx.leave();
 }
-#line 1256 "d2_parser.cc"
+#line 1253 "d2_parser.cc"
     break;
 
   case 119:
@@ -1263,7 +1260,7 @@ namespace isc { namespace d2 {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.DNS_SERVERS);
 }
-#line 1267 "d2_parser.cc"
+#line 1264 "d2_parser.cc"
     break;
 
   case 120:
@@ -1272,7 +1269,7 @@ namespace isc { namespace d2 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1276 "d2_parser.cc"
+#line 1273 "d2_parser.cc"
     break;
 
   case 121:
@@ -1281,7 +1278,7 @@ namespace isc { namespace d2 {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
 }
-#line 1285 "d2_parser.cc"
+#line 1282 "d2_parser.cc"
     break;
 
   case 122:
@@ -1289,7 +1286,7 @@ namespace isc { namespace d2 {
     {
     // parsing completed
 }
-#line 1293 "d2_parser.cc"
+#line 1290 "d2_parser.cc"
     break;
 
   case 125:
@@ -1299,7 +1296,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1303 "d2_parser.cc"
+#line 1300 "d2_parser.cc"
     break;
 
   case 126:
@@ -1307,7 +1304,7 @@ namespace isc { namespace d2 {
     {
     ctx.stack_.pop_back();
 }
-#line 1311 "d2_parser.cc"
+#line 1308 "d2_parser.cc"
     break;
 
   case 127:
@@ -1316,7 +1313,7 @@ namespace isc { namespace d2 {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1320 "d2_parser.cc"
+#line 1317 "d2_parser.cc"
     break;
 
   case 128:
@@ -1324,7 +1321,7 @@ namespace isc { namespace d2 {
     {
     // parsing completed
 }
-#line 1328 "d2_parser.cc"
+#line 1325 "d2_parser.cc"
     break;
 
   case 137:
@@ -1332,7 +1329,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1336 "d2_parser.cc"
+#line 1333 "d2_parser.cc"
     break;
 
   case 138:
@@ -1346,7 +1343,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("hostname", name);
     ctx.leave();
 }
-#line 1350 "d2_parser.cc"
+#line 1347 "d2_parser.cc"
     break;
 
   case 139:
@@ -1354,7 +1351,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1358 "d2_parser.cc"
+#line 1355 "d2_parser.cc"
     break;
 
   case 140:
@@ -1364,7 +1361,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("ip-address", s);
     ctx.leave();
 }
-#line 1368 "d2_parser.cc"
+#line 1365 "d2_parser.cc"
     break;
 
   case 141:
@@ -1376,7 +1373,7 @@ namespace isc { namespace d2 {
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", i);
 }
-#line 1380 "d2_parser.cc"
+#line 1377 "d2_parser.cc"
     break;
 
   case 142:
@@ -1387,7 +1384,7 @@ namespace isc { namespace d2 {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.TSIG_KEYS);
 }
-#line 1391 "d2_parser.cc"
+#line 1388 "d2_parser.cc"
     break;
 
   case 143:
@@ -1396,7 +1393,7 @@ namespace isc { namespace d2 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1400 "d2_parser.cc"
+#line 1397 "d2_parser.cc"
     break;
 
   case 144:
@@ -1405,7 +1402,7 @@ namespace isc { namespace d2 {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
 }
-#line 1409 "d2_parser.cc"
+#line 1406 "d2_parser.cc"
     break;
 
   case 145:
@@ -1413,7 +1410,7 @@ namespace isc { namespace d2 {
     {
     // parsing completed
 }
-#line 1417 "d2_parser.cc"
+#line 1414 "d2_parser.cc"
     break;
 
   case 150:
@@ -1423,7 +1420,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1427 "d2_parser.cc"
+#line 1424 "d2_parser.cc"
     break;
 
   case 151:
@@ -1431,7 +1428,7 @@ namespace isc { namespace d2 {
     {
     ctx.stack_.pop_back();
 }
-#line 1435 "d2_parser.cc"
+#line 1432 "d2_parser.cc"
     break;
 
   case 152:
@@ -1441,7 +1438,7 @@ namespace isc { namespace d2 {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1445 "d2_parser.cc"
+#line 1442 "d2_parser.cc"
     break;
 
   case 153:
@@ -1449,7 +1446,7 @@ namespace isc { namespace d2 {
     {
     // parsing completed
 }
-#line 1453 "d2_parser.cc"
+#line 1450 "d2_parser.cc"
     break;
 
   case 163:
@@ -1457,7 +1454,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1461 "d2_parser.cc"
+#line 1458 "d2_parser.cc"
     break;
 
   case 164:
@@ -1471,7 +1468,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("name", name);
     ctx.leave();
 }
-#line 1475 "d2_parser.cc"
+#line 1472 "d2_parser.cc"
     break;
 
   case 165:
@@ -1479,7 +1476,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1483 "d2_parser.cc"
+#line 1480 "d2_parser.cc"
     break;
 
   case 166:
@@ -1492,7 +1489,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("algorithm", elem);
     ctx.leave();
 }
-#line 1496 "d2_parser.cc"
+#line 1493 "d2_parser.cc"
     break;
 
   case 167:
@@ -1504,7 +1501,7 @@ namespace isc { namespace d2 {
     ElementPtr elem(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("digest-bits", elem);
 }
-#line 1508 "d2_parser.cc"
+#line 1505 "d2_parser.cc"
     break;
 
   case 168:
@@ -1512,7 +1509,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1516 "d2_parser.cc"
+#line 1513 "d2_parser.cc"
     break;
 
   case 169:
@@ -1525,7 +1522,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("secret", elem);
     ctx.leave();
 }
-#line 1529 "d2_parser.cc"
+#line 1526 "d2_parser.cc"
     break;
 
   case 170:
@@ -1536,7 +1533,7 @@ namespace isc { namespace d2 {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.CONTROL_SOCKET);
 }
-#line 1540 "d2_parser.cc"
+#line 1537 "d2_parser.cc"
     break;
 
   case 171:
@@ -1545,7 +1542,7 @@ namespace isc { namespace d2 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1549 "d2_parser.cc"
+#line 1546 "d2_parser.cc"
     break;
 
   case 179:
@@ -1553,7 +1550,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1557 "d2_parser.cc"
+#line 1554 "d2_parser.cc"
     break;
 
   case 180:
@@ -1563,7 +1560,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("socket-type", stype);
     ctx.leave();
 }
-#line 1567 "d2_parser.cc"
+#line 1564 "d2_parser.cc"
     break;
 
   case 181:
@@ -1571,7 +1568,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1575 "d2_parser.cc"
+#line 1572 "d2_parser.cc"
     break;
 
   case 182:
@@ -1581,7 +1578,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("socket-name", name);
     ctx.leave();
 }
-#line 1585 "d2_parser.cc"
+#line 1582 "d2_parser.cc"
     break;
 
   case 183:
@@ -1589,7 +1586,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1593 "d2_parser.cc"
+#line 1590 "d2_parser.cc"
     break;
 
   case 184:
@@ -1598,7 +1595,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1602 "d2_parser.cc"
+#line 1599 "d2_parser.cc"
     break;
 
   case 185:
@@ -1606,7 +1603,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1610 "d2_parser.cc"
+#line 1607 "d2_parser.cc"
     break;
 
   case 186:
@@ -1615,7 +1612,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1619 "d2_parser.cc"
+#line 1616 "d2_parser.cc"
     break;
 
   case 187:
@@ -1623,7 +1620,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1627 "d2_parser.cc"
+#line 1624 "d2_parser.cc"
     break;
 
   case 188:
@@ -1632,7 +1629,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("Control-agent", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1636 "d2_parser.cc"
+#line 1633 "d2_parser.cc"
     break;
 
   case 189:
@@ -1643,7 +1640,7 @@ namespace isc { namespace d2 {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.LOGGING);
 }
-#line 1647 "d2_parser.cc"
+#line 1644 "d2_parser.cc"
     break;
 
   case 190:
@@ -1652,7 +1649,7 @@ namespace isc { namespace d2 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1656 "d2_parser.cc"
+#line 1653 "d2_parser.cc"
     break;
 
   case 194:
@@ -1663,7 +1660,7 @@ namespace isc { namespace d2 {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.LOGGERS);
 }
-#line 1667 "d2_parser.cc"
+#line 1664 "d2_parser.cc"
     break;
 
   case 195:
@@ -1672,7 +1669,7 @@ namespace isc { namespace d2 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1676 "d2_parser.cc"
+#line 1673 "d2_parser.cc"
     break;
 
   case 198:
@@ -1682,7 +1679,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->add(l);
     ctx.stack_.push_back(l);
 }
-#line 1686 "d2_parser.cc"
+#line 1683 "d2_parser.cc"
     break;
 
   case 199:
@@ -1690,7 +1687,7 @@ namespace isc { namespace d2 {
     {
     ctx.stack_.pop_back();
 }
-#line 1694 "d2_parser.cc"
+#line 1691 "d2_parser.cc"
     break;
 
   case 209:
@@ -1698,7 +1695,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1702 "d2_parser.cc"
+#line 1699 "d2_parser.cc"
     break;
 
   case 210:
@@ -1708,7 +1705,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("name", name);
     ctx.leave();
 }
-#line 1712 "d2_parser.cc"
+#line 1709 "d2_parser.cc"
     break;
 
   case 211:
@@ -1717,7 +1714,7 @@ namespace isc { namespace d2 {
     ElementPtr dl(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
 }
-#line 1721 "d2_parser.cc"
+#line 1718 "d2_parser.cc"
     break;
 
   case 212:
@@ -1725,7 +1722,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1729 "d2_parser.cc"
+#line 1726 "d2_parser.cc"
     break;
 
   case 213:
@@ -1735,7 +1732,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("severity", sev);
     ctx.leave();
 }
-#line 1739 "d2_parser.cc"
+#line 1736 "d2_parser.cc"
     break;
 
   case 214:
@@ -1746,7 +1743,7 @@ namespace isc { namespace d2 {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OUTPUT_OPTIONS);
 }
-#line 1750 "d2_parser.cc"
+#line 1747 "d2_parser.cc"
     break;
 
   case 215:
@@ -1755,7 +1752,7 @@ namespace isc { namespace d2 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1759 "d2_parser.cc"
+#line 1756 "d2_parser.cc"
     break;
 
   case 218:
@@ -1765,7 +1762,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1769 "d2_parser.cc"
+#line 1766 "d2_parser.cc"
     break;
 
   case 219:
@@ -1773,7 +1770,7 @@ namespace isc { namespace d2 {
     {
     ctx.stack_.pop_back();
 }
-#line 1777 "d2_parser.cc"
+#line 1774 "d2_parser.cc"
     break;
 
   case 227:
@@ -1781,7 +1778,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1785 "d2_parser.cc"
+#line 1782 "d2_parser.cc"
     break;
 
   case 228:
@@ -1791,7 +1788,7 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("output", sev);
     ctx.leave();
 }
-#line 1795 "d2_parser.cc"
+#line 1792 "d2_parser.cc"
     break;
 
   case 229:
@@ -1800,7 +1797,7 @@ namespace isc { namespace d2 {
     ElementPtr flush(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
 }
-#line 1804 "d2_parser.cc"
+#line 1801 "d2_parser.cc"
     break;
 
   case 230:
@@ -1809,7 +1806,7 @@ namespace isc { namespace d2 {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
 }
-#line 1813 "d2_parser.cc"
+#line 1810 "d2_parser.cc"
     break;
 
   case 231:
@@ -1818,7 +1815,7 @@ namespace isc { namespace d2 {
     ElementPtr maxver(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
 }
-#line 1822 "d2_parser.cc"
+#line 1819 "d2_parser.cc"
     break;
 
   case 232:
@@ -1826,7 +1823,7 @@ namespace isc { namespace d2 {
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1830 "d2_parser.cc"
+#line 1827 "d2_parser.cc"
     break;
 
   case 233:
@@ -1836,11 +1833,11 @@ namespace isc { namespace d2 {
     ctx.stack_.back()->set("pattern", sev);
     ctx.leave();
 }
-#line 1840 "d2_parser.cc"
+#line 1837 "d2_parser.cc"
     break;
 
 
-#line 1844 "d2_parser.cc"
+#line 1841 "d2_parser.cc"
 
             default:
               break;
@@ -2535,7 +2532,7 @@ namespace isc { namespace d2 {
 
 #line 14 "d2_parser.yy"
 } } // isc::d2
-#line 2539 "d2_parser.cc"
+#line 2536 "d2_parser.cc"
 
 #line 886 "d2_parser.yy"
 
diff --git a/src/bin/d2/d2_parser.h b/src/bin/d2/d2_parser.h
index 07cbc55543..bda7ba31f5 100644
--- a/src/bin/d2/d2_parser.h
+++ b/src/bin/d2/d2_parser.h
@@ -1,4 +1,4 @@
-// A Bison parser, made by GNU Bison 3.4.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton interface for Bison LALR(1) parsers in C++
 
diff --git a/src/bin/d2/location.hh b/src/bin/d2/location.hh
index f0143ba749..5347d41940 100644
--- a/src/bin/d2/location.hh
+++ b/src/bin/d2/location.hh
@@ -1,5 +1,5 @@
-// Generated 201908191238
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Locations for Bison parsers in C++
 
diff --git a/src/bin/d2/position.hh b/src/bin/d2/position.hh
index c202e38cf4..b26928e17b 100644
--- a/src/bin/d2/position.hh
+++ b/src/bin/d2/position.hh
@@ -1,5 +1,5 @@
-// Generated 201908191238
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined in "location.hh".
diff --git a/src/bin/d2/stack.hh b/src/bin/d2/stack.hh
index 42822f6530..44a4b60f6b 100644
--- a/src/bin/d2/stack.hh
+++ b/src/bin/d2/stack.hh
@@ -1,5 +1,5 @@
-// Generated 201908191238
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined with the parser itself.
diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc
index 0334dc7735..deac9a70e8 100644
--- a/src/bin/dhcp4/dhcp4_parser.cc
+++ b/src/bin/dhcp4/dhcp4_parser.cc
@@ -1,8 +1,8 @@
-// A Bison parser, made by GNU Bison 3.2.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton implementation for Bison LALR(1) parsers in C++
 
-// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -43,11 +43,11 @@
 
 
 // Unqualified %code blocks.
-#line 34 "dhcp4_parser.yy" // lalr1.cc:438
+#line 34 "dhcp4_parser.yy"
 
 #include <dhcp4/parser_context.h>
 
-#line 51 "dhcp4_parser.cc" // lalr1.cc:438
+#line 51 "dhcp4_parser.cc"
 
 
 #ifndef YY_
@@ -88,13 +88,10 @@
         {                                                               \
           (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
         }                                                               \
-    while (/*CONSTCOND*/ false)
+    while (false)
 # endif
 
 
-// Suppress unused-variable warnings by "using" E.
-#define YYUSE(E) ((void) (E))
-
 // Enable debugging if requested.
 #if PARSER4_DEBUG
 
@@ -140,9 +137,10 @@
 #define YYERROR         goto yyerrorlab
 #define YYRECOVERING()  (!!yyerrstatus_)
 
-#line 14 "dhcp4_parser.yy" // lalr1.cc:513
+#line 14 "dhcp4_parser.yy"
 namespace isc { namespace dhcp {
-#line 146 "dhcp4_parser.cc" // lalr1.cc:513
+#line 143 "dhcp4_parser.cc"
+
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -154,7 +152,7 @@ namespace isc { namespace dhcp {
   {
     if (*yystr == '"')
       {
-        std::string yyr = "";
+        std::string yyr;
         char const *yyp = yystr;
 
         for (;;)
@@ -167,7 +165,10 @@ namespace isc { namespace dhcp {
             case '\\':
               if (*++yyp != '\\')
                 goto do_not_strip_quotes;
-              // Fall through.
+              else
+                goto append;
+
+            append:
             default:
               yyr += *yyp;
               break;
@@ -195,6 +196,8 @@ namespace isc { namespace dhcp {
   Dhcp4Parser::~Dhcp4Parser ()
   {}
 
+  Dhcp4Parser::syntax_error::~syntax_error () YY_NOEXCEPT YY_NOTHROW
+  {}
 
   /*---------------.
   | Symbol types.  |
@@ -203,16 +206,16 @@ namespace isc { namespace dhcp {
 
 
   // by_state.
-  Dhcp4Parser::by_state::by_state ()
+  Dhcp4Parser::by_state::by_state () YY_NOEXCEPT
     : state (empty_state)
   {}
 
-  Dhcp4Parser::by_state::by_state (const by_state& other)
-    : state (other.state)
+  Dhcp4Parser::by_state::by_state (const by_state& that) YY_NOEXCEPT
+    : state (that.state)
   {}
 
   void
-  Dhcp4Parser::by_state::clear ()
+  Dhcp4Parser::by_state::clear () YY_NOEXCEPT
   {
     state = empty_state;
   }
@@ -224,12 +227,12 @@ namespace isc { namespace dhcp {
     that.clear ();
   }
 
-  Dhcp4Parser::by_state::by_state (state_type s)
+  Dhcp4Parser::by_state::by_state (state_type s) YY_NOEXCEPT
     : state (s)
   {}
 
   Dhcp4Parser::symbol_number_type
-  Dhcp4Parser::by_state::type_get () const
+  Dhcp4Parser::by_state::type_get () const YY_NOEXCEPT
   {
     if (state == empty_state)
       return empty_symbol;
@@ -276,7 +279,7 @@ namespace isc { namespace dhcp {
         break;
     }
 
-#if defined __cplusplus && 201103L <= __cplusplus
+#if 201103L <= YY_CPLUSPLUS
     // that is emptied.
     that.state = empty_state;
 #endif
@@ -322,7 +325,7 @@ namespace isc { namespace dhcp {
     that.type = empty_symbol;
   }
 
-#if !defined __cplusplus || __cplusplus < 201103L
+#if YY_CPLUSPLUS < 201103L
   Dhcp4Parser::stack_symbol_type&
   Dhcp4Parser::stack_symbol_type::operator= (stack_symbol_type& that)
   {
@@ -384,100 +387,89 @@ namespace isc { namespace dhcp {
     std::ostream& yyoutput = yyo;
     YYUSE (yyoutput);
     symbol_number_type yytype = yysym.type_get ();
+#if defined __GNUC__ && ! defined __clang__ && ! defined __ICC && __GNUC__ * 100 + __GNUC_MINOR__ <= 408
     // Avoid a (spurious) G++ 4.8 warning about "array subscript is
     // below array bounds".
     if (yysym.empty ())
       std::abort ();
+#endif
     yyo << (yytype < yyntokens_ ? "token" : "nterm")
         << ' ' << yytname_[yytype] << " ("
         << yysym.location << ": ";
     switch (yytype)
     {
-            case 181: // "constant string"
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< std::string > (); }
-#line 401 "dhcp4_parser.cc" // lalr1.cc:672
+      case 181: // "constant string"
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < std::string > (); }
+#line 405 "dhcp4_parser.cc"
         break;
 
       case 182: // "integer"
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< int64_t > (); }
-#line 408 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < int64_t > (); }
+#line 411 "dhcp4_parser.cc"
         break;
 
       case 183: // "floating point"
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< double > (); }
-#line 415 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < double > (); }
+#line 417 "dhcp4_parser.cc"
         break;
 
       case 184: // "boolean"
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< bool > (); }
-#line 422 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < bool > (); }
+#line 423 "dhcp4_parser.cc"
         break;
 
       case 201: // value
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 429 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 429 "dhcp4_parser.cc"
         break;
 
       case 205: // map_value
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 436 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 435 "dhcp4_parser.cc"
         break;
 
       case 246: // ddns_replace_client_name_value
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 443 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 441 "dhcp4_parser.cc"
         break;
 
       case 265: // socket_type
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 450 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 447 "dhcp4_parser.cc"
         break;
 
       case 268: // outbound_interface_value
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 457 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 453 "dhcp4_parser.cc"
         break;
 
       case 290: // db_type
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 464 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 459 "dhcp4_parser.cc"
         break;
 
       case 377: // hr_mode
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 471 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 465 "dhcp4_parser.cc"
         break;
 
       case 524: // ncr_protocol_value
-
-#line 263 "dhcp4_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 478 "dhcp4_parser.cc" // lalr1.cc:672
+#line 263 "dhcp4_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 471 "dhcp4_parser.cc"
         break;
 
-
       default:
         break;
     }
@@ -496,7 +488,7 @@ namespace isc { namespace dhcp {
   void
   Dhcp4Parser::yypush_ (const char* m, state_type s, YY_MOVE_REF (symbol_type) sym)
   {
-#if defined __cplusplus && 201103L <= __cplusplus
+#if 201103L <= YY_CPLUSPLUS
     yypush_ (m, stack_symbol_type (s, std::move (sym)));
 #else
     stack_symbol_type ss (s, sym);
@@ -600,17 +592,22 @@ namespace isc { namespace dhcp {
     yystack_.clear ();
     yypush_ (YY_NULLPTR, 0, YY_MOVE (yyla));
 
-    // A new symbol was pushed on the stack.
+  /*-----------------------------------------------.
+  | yynewstate -- push a new symbol on the stack.  |
+  `-----------------------------------------------*/
   yynewstate:
     YYCDEBUG << "Entering state " << yystack_[0].state << '\n';
 
     // Accept?
     if (yystack_[0].state == yyfinal_)
-      goto yyacceptlab;
+      YYACCEPT;
 
     goto yybackup;
 
-    // Backup.
+
+  /*-----------.
+  | yybackup.  |
+  `-----------*/
   yybackup:
     // Try to take a decision without lookahead.
     yyn = yypact_[yystack_[0].state];
@@ -631,6 +628,7 @@ namespace isc { namespace dhcp {
 #if YY_EXCEPTIONS
         catch (const syntax_error& yyexc)
           {
+            YYCDEBUG << "Caught exception: " << yyexc.what() << '\n';
             error (yyexc);
             goto yyerrlab1;
           }
@@ -662,6 +660,7 @@ namespace isc { namespace dhcp {
     yypush_ ("Shifting", yyn, YY_MOVE (yyla));
     goto yynewstate;
 
+
   /*-----------------------------------------------------------.
   | yydefault -- do the default action for the current state.  |
   `-----------------------------------------------------------*/
@@ -671,8 +670,9 @@ namespace isc { namespace dhcp {
       goto yyerrlab;
     goto yyreduce;
 
+
   /*-----------------------------.
-  | yyreduce -- Do a reduction.  |
+  | yyreduce -- do a reduction.  |
   `-----------------------------*/
   yyreduce:
     yylen = yyr2_[yyn];
@@ -718,8 +718,8 @@ namespace isc { namespace dhcp {
 
       // Default location.
       {
-        slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
-        YYLLOC_DEFAULT (yylhs.location, slice, yylen);
+        stack_type::slice range (yystack_, yylen);
+        YYLLOC_DEFAULT (yylhs.location, range, yylen);
         yyerror_range[1].location = yylhs.location;
       }
 
@@ -732,280 +732,280 @@ namespace isc { namespace dhcp {
           switch (yyn)
             {
   case 2:
-#line 272 "dhcp4_parser.yy" // lalr1.cc:907
+#line 272 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.NO_KEYWORD; }
-#line 738 "dhcp4_parser.cc" // lalr1.cc:907
+#line 738 "dhcp4_parser.cc"
     break;
 
   case 4:
-#line 273 "dhcp4_parser.yy" // lalr1.cc:907
+#line 273 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.CONFIG; }
-#line 744 "dhcp4_parser.cc" // lalr1.cc:907
+#line 744 "dhcp4_parser.cc"
     break;
 
   case 6:
-#line 274 "dhcp4_parser.yy" // lalr1.cc:907
+#line 274 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.DHCP4; }
-#line 750 "dhcp4_parser.cc" // lalr1.cc:907
+#line 750 "dhcp4_parser.cc"
     break;
 
   case 8:
-#line 275 "dhcp4_parser.yy" // lalr1.cc:907
+#line 275 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.INTERFACES_CONFIG; }
-#line 756 "dhcp4_parser.cc" // lalr1.cc:907
+#line 756 "dhcp4_parser.cc"
     break;
 
   case 10:
-#line 276 "dhcp4_parser.yy" // lalr1.cc:907
+#line 276 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.SUBNET4; }
-#line 762 "dhcp4_parser.cc" // lalr1.cc:907
+#line 762 "dhcp4_parser.cc"
     break;
 
   case 12:
-#line 277 "dhcp4_parser.yy" // lalr1.cc:907
+#line 277 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.POOLS; }
-#line 768 "dhcp4_parser.cc" // lalr1.cc:907
+#line 768 "dhcp4_parser.cc"
     break;
 
   case 14:
-#line 278 "dhcp4_parser.yy" // lalr1.cc:907
+#line 278 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.RESERVATIONS; }
-#line 774 "dhcp4_parser.cc" // lalr1.cc:907
+#line 774 "dhcp4_parser.cc"
     break;
 
   case 16:
-#line 279 "dhcp4_parser.yy" // lalr1.cc:907
+#line 279 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.DHCP4; }
-#line 780 "dhcp4_parser.cc" // lalr1.cc:907
+#line 780 "dhcp4_parser.cc"
     break;
 
   case 18:
-#line 280 "dhcp4_parser.yy" // lalr1.cc:907
+#line 280 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.OPTION_DEF; }
-#line 786 "dhcp4_parser.cc" // lalr1.cc:907
+#line 786 "dhcp4_parser.cc"
     break;
 
   case 20:
-#line 281 "dhcp4_parser.yy" // lalr1.cc:907
+#line 281 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.OPTION_DATA; }
-#line 792 "dhcp4_parser.cc" // lalr1.cc:907
+#line 792 "dhcp4_parser.cc"
     break;
 
   case 22:
-#line 282 "dhcp4_parser.yy" // lalr1.cc:907
+#line 282 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.HOOKS_LIBRARIES; }
-#line 798 "dhcp4_parser.cc" // lalr1.cc:907
+#line 798 "dhcp4_parser.cc"
     break;
 
   case 24:
-#line 283 "dhcp4_parser.yy" // lalr1.cc:907
+#line 283 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.DHCP_DDNS; }
-#line 804 "dhcp4_parser.cc" // lalr1.cc:907
+#line 804 "dhcp4_parser.cc"
     break;
 
   case 26:
-#line 284 "dhcp4_parser.yy" // lalr1.cc:907
+#line 284 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.LOGGING; }
-#line 810 "dhcp4_parser.cc" // lalr1.cc:907
+#line 810 "dhcp4_parser.cc"
     break;
 
   case 28:
-#line 285 "dhcp4_parser.yy" // lalr1.cc:907
+#line 285 "dhcp4_parser.yy"
     { ctx.ctx_ = ctx.CONFIG_CONTROL; }
-#line 816 "dhcp4_parser.cc" // lalr1.cc:907
+#line 816 "dhcp4_parser.cc"
     break;
 
   case 30:
-#line 293 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); }
-#line 822 "dhcp4_parser.cc" // lalr1.cc:907
+#line 293 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location))); }
+#line 822 "dhcp4_parser.cc"
     break;
 
   case 31:
-#line 294 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); }
-#line 828 "dhcp4_parser.cc" // lalr1.cc:907
+#line 294 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location))); }
+#line 828 "dhcp4_parser.cc"
     break;
 
   case 32:
-#line 295 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); }
-#line 834 "dhcp4_parser.cc" // lalr1.cc:907
+#line 295 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location))); }
+#line 834 "dhcp4_parser.cc"
     break;
 
   case 33:
-#line 296 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); }
-#line 840 "dhcp4_parser.cc" // lalr1.cc:907
+#line 296 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location))); }
+#line 840 "dhcp4_parser.cc"
     break;
 
   case 34:
-#line 297 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); }
-#line 846 "dhcp4_parser.cc" // lalr1.cc:907
+#line 297 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); }
+#line 846 "dhcp4_parser.cc"
     break;
 
   case 35:
-#line 298 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 852 "dhcp4_parser.cc" // lalr1.cc:907
+#line 298 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
+#line 852 "dhcp4_parser.cc"
     break;
 
   case 36:
-#line 299 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 858 "dhcp4_parser.cc" // lalr1.cc:907
+#line 299 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
+#line 858 "dhcp4_parser.cc"
     break;
 
   case 37:
-#line 302 "dhcp4_parser.yy" // lalr1.cc:907
+#line 302 "dhcp4_parser.yy"
     {
     // Push back the JSON value on the stack
-    ctx.stack_.push_back(yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.push_back(yystack_[0].value.as < ElementPtr > ());
 }
-#line 867 "dhcp4_parser.cc" // lalr1.cc:907
+#line 867 "dhcp4_parser.cc"
     break;
 
   case 38:
-#line 307 "dhcp4_parser.yy" // lalr1.cc:907
+#line 307 "dhcp4_parser.yy"
     {
     // This code is executed when we're about to start parsing
     // the content of the map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 878 "dhcp4_parser.cc" // lalr1.cc:907
+#line 878 "dhcp4_parser.cc"
     break;
 
   case 39:
-#line 312 "dhcp4_parser.yy" // lalr1.cc:907
+#line 312 "dhcp4_parser.yy"
     {
     // map parsing completed. If we ever want to do any wrap up
     // (maybe some sanity checking), this would be the best place
     // for it.
 }
-#line 888 "dhcp4_parser.cc" // lalr1.cc:907
+#line 888 "dhcp4_parser.cc"
     break;
 
   case 40:
-#line 318 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 894 "dhcp4_parser.cc" // lalr1.cc:907
+#line 318 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
+#line 894 "dhcp4_parser.cc"
     break;
 
   case 43:
-#line 325 "dhcp4_parser.yy" // lalr1.cc:907
+#line 325 "dhcp4_parser.yy"
     {
                   // map containing a single entry
-                  ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ());
+                  ctx.stack_.back()->set(yystack_[2].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
                   }
-#line 903 "dhcp4_parser.cc" // lalr1.cc:907
+#line 903 "dhcp4_parser.cc"
     break;
 
   case 44:
-#line 329 "dhcp4_parser.yy" // lalr1.cc:907
+#line 329 "dhcp4_parser.yy"
     {
                   // map consisting of a shorter map followed by
                   // comma and string:value
-                  ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ());
+                  ctx.stack_.back()->set(yystack_[2].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
                   }
-#line 913 "dhcp4_parser.cc" // lalr1.cc:907
+#line 913 "dhcp4_parser.cc"
     break;
 
   case 45:
-#line 336 "dhcp4_parser.yy" // lalr1.cc:907
+#line 336 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
 }
-#line 922 "dhcp4_parser.cc" // lalr1.cc:907
+#line 922 "dhcp4_parser.cc"
     break;
 
   case 46:
-#line 339 "dhcp4_parser.yy" // lalr1.cc:907
+#line 339 "dhcp4_parser.yy"
     {
     // list parsing complete. Put any sanity checking here
 }
-#line 930 "dhcp4_parser.cc" // lalr1.cc:907
+#line 930 "dhcp4_parser.cc"
     break;
 
   case 49:
-#line 347 "dhcp4_parser.yy" // lalr1.cc:907
+#line 347 "dhcp4_parser.yy"
     {
                   // List consisting of a single element.
-                  ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ());
+                  ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
                   }
-#line 939 "dhcp4_parser.cc" // lalr1.cc:907
+#line 939 "dhcp4_parser.cc"
     break;
 
   case 50:
-#line 351 "dhcp4_parser.yy" // lalr1.cc:907
+#line 351 "dhcp4_parser.yy"
     {
                   // List ending with , and a value.
-                  ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ());
+                  ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
                   }
-#line 948 "dhcp4_parser.cc" // lalr1.cc:907
+#line 948 "dhcp4_parser.cc"
     break;
 
   case 51:
-#line 358 "dhcp4_parser.yy" // lalr1.cc:907
+#line 358 "dhcp4_parser.yy"
     {
     // List parsing about to start
 }
-#line 956 "dhcp4_parser.cc" // lalr1.cc:907
+#line 956 "dhcp4_parser.cc"
     break;
 
   case 52:
-#line 360 "dhcp4_parser.yy" // lalr1.cc:907
+#line 360 "dhcp4_parser.yy"
     {
     // list parsing complete. Put any sanity checking here
     //ctx.stack_.pop_back();
 }
-#line 965 "dhcp4_parser.cc" // lalr1.cc:907
+#line 965 "dhcp4_parser.cc"
     break;
 
   case 55:
-#line 369 "dhcp4_parser.yy" // lalr1.cc:907
+#line 369 "dhcp4_parser.yy"
     {
-                          ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+                          ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
                           ctx.stack_.back()->add(s);
                           }
-#line 974 "dhcp4_parser.cc" // lalr1.cc:907
+#line 974 "dhcp4_parser.cc"
     break;
 
   case 56:
-#line 373 "dhcp4_parser.yy" // lalr1.cc:907
+#line 373 "dhcp4_parser.yy"
     {
-                          ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+                          ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
                           ctx.stack_.back()->add(s);
                           }
-#line 983 "dhcp4_parser.cc" // lalr1.cc:907
+#line 983 "dhcp4_parser.cc"
     break;
 
   case 57:
-#line 384 "dhcp4_parser.yy" // lalr1.cc:907
+#line 384 "dhcp4_parser.yy"
     {
     const std::string& where = ctx.contextName();
-    const std::string& keyword = yystack_[1].value.as< std::string > ();
+    const std::string& keyword = yystack_[1].value.as < std::string > ();
     error(yystack_[1].location,
           "got unexpected keyword \"" + keyword + "\" in " + where + " map.");
 }
-#line 994 "dhcp4_parser.cc" // lalr1.cc:907
+#line 994 "dhcp4_parser.cc"
     break;
 
   case 58:
-#line 394 "dhcp4_parser.yy" // lalr1.cc:907
+#line 394 "dhcp4_parser.yy"
     {
     // This code is executed when we're about to start parsing
     // the content of the map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1005 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1005 "dhcp4_parser.cc"
     break;
 
   case 59:
-#line 399 "dhcp4_parser.yy" // lalr1.cc:907
+#line 399 "dhcp4_parser.yy"
     {
     // map parsing completed. If we ever want to do any wrap up
     // (maybe some sanity checking), this would be the best place
@@ -1014,11 +1014,11 @@ namespace isc { namespace dhcp {
     // Dhcp4 is required
     ctx.require("Dhcp4", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
 }
-#line 1018 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1018 "dhcp4_parser.cc"
     break;
 
   case 68:
-#line 423 "dhcp4_parser.yy" // lalr1.cc:907
+#line 423 "dhcp4_parser.yy"
     {
     // This code is executed when we're about to start parsing
     // the content of the map
@@ -1027,1135 +1027,1135 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.DHCP4);
 }
-#line 1031 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1031 "dhcp4_parser.cc"
     break;
 
   case 69:
-#line 430 "dhcp4_parser.yy" // lalr1.cc:907
+#line 430 "dhcp4_parser.yy"
     {
     // No global parameter is required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1041 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1041 "dhcp4_parser.cc"
     break;
 
   case 70:
-#line 438 "dhcp4_parser.yy" // lalr1.cc:907
+#line 438 "dhcp4_parser.yy"
     {
     // Parse the Dhcp4 map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1051 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1051 "dhcp4_parser.cc"
     break;
 
   case 71:
-#line 442 "dhcp4_parser.yy" // lalr1.cc:907
+#line 442 "dhcp4_parser.yy"
     {
     // No global parameter is required
     // parsing completed
 }
-#line 1060 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1060 "dhcp4_parser.cc"
     break;
 
   case 122:
-#line 503 "dhcp4_parser.yy" // lalr1.cc:907
+#line 503 "dhcp4_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("valid-lifetime", prf);
 }
-#line 1069 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1069 "dhcp4_parser.cc"
     break;
 
   case 123:
-#line 508 "dhcp4_parser.yy" // lalr1.cc:907
+#line 508 "dhcp4_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("min-valid-lifetime", prf);
 }
-#line 1078 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1078 "dhcp4_parser.cc"
     break;
 
   case 124:
-#line 513 "dhcp4_parser.yy" // lalr1.cc:907
+#line 513 "dhcp4_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-valid-lifetime", prf);
 }
-#line 1087 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1087 "dhcp4_parser.cc"
     break;
 
   case 125:
-#line 518 "dhcp4_parser.yy" // lalr1.cc:907
+#line 518 "dhcp4_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("renew-timer", prf);
 }
-#line 1096 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1096 "dhcp4_parser.cc"
     break;
 
   case 126:
-#line 523 "dhcp4_parser.yy" // lalr1.cc:907
+#line 523 "dhcp4_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rebind-timer", prf);
 }
-#line 1105 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1105 "dhcp4_parser.cc"
     break;
 
   case 127:
-#line 528 "dhcp4_parser.yy" // lalr1.cc:907
+#line 528 "dhcp4_parser.yy"
     {
-    ElementPtr ctt(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr ctt(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("calculate-tee-times", ctt);
 }
-#line 1114 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1114 "dhcp4_parser.cc"
     break;
 
   case 128:
-#line 533 "dhcp4_parser.yy" // lalr1.cc:907
+#line 533 "dhcp4_parser.yy"
     {
-    ElementPtr t1(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr t1(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("t1-percent", t1);
 }
-#line 1123 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1123 "dhcp4_parser.cc"
     break;
 
   case 129:
-#line 538 "dhcp4_parser.yy" // lalr1.cc:907
+#line 538 "dhcp4_parser.yy"
     {
-    ElementPtr t2(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr t2(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("t2-percent", t2);
 }
-#line 1132 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1132 "dhcp4_parser.cc"
     break;
 
   case 130:
-#line 543 "dhcp4_parser.yy" // lalr1.cc:907
+#line 543 "dhcp4_parser.yy"
     {
-    ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr dpp(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("decline-probation-period", dpp);
 }
-#line 1141 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1141 "dhcp4_parser.cc"
     break;
 
   case 131:
-#line 548 "dhcp4_parser.yy" // lalr1.cc:907
+#line 548 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1149 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1149 "dhcp4_parser.cc"
     break;
 
   case 132:
-#line 550 "dhcp4_parser.yy" // lalr1.cc:907
+#line 550 "dhcp4_parser.yy"
     {
-    ElementPtr stag(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr stag(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-tag", stag);
     ctx.leave();
 }
-#line 1159 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1159 "dhcp4_parser.cc"
     break;
 
   case 133:
-#line 556 "dhcp4_parser.yy" // lalr1.cc:907
+#line 556 "dhcp4_parser.yy"
     {
-    ElementPtr echo(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr echo(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("echo-client-id", echo);
 }
-#line 1168 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1168 "dhcp4_parser.cc"
     break;
 
   case 134:
-#line 561 "dhcp4_parser.yy" // lalr1.cc:907
+#line 561 "dhcp4_parser.yy"
     {
-    ElementPtr match(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr match(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("match-client-id", match);
 }
-#line 1177 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1177 "dhcp4_parser.cc"
     break;
 
   case 135:
-#line 566 "dhcp4_parser.yy" // lalr1.cc:907
+#line 566 "dhcp4_parser.yy"
     {
-    ElementPtr prf(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("authoritative", prf);
 }
-#line 1186 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1186 "dhcp4_parser.cc"
     break;
 
   case 136:
-#line 571 "dhcp4_parser.yy" // lalr1.cc:907
+#line 571 "dhcp4_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-send-updates", b);
 }
-#line 1195 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1195 "dhcp4_parser.cc"
     break;
 
   case 137:
-#line 576 "dhcp4_parser.yy" // lalr1.cc:907
+#line 576 "dhcp4_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-override-no-update", b);
 }
-#line 1204 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1204 "dhcp4_parser.cc"
     break;
 
   case 138:
-#line 581 "dhcp4_parser.yy" // lalr1.cc:907
+#line 581 "dhcp4_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-override-client-update", b);
 }
-#line 1213 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1213 "dhcp4_parser.cc"
     break;
 
   case 139:
-#line 586 "dhcp4_parser.yy" // lalr1.cc:907
+#line 586 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
-#line 1221 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1221 "dhcp4_parser.cc"
     break;
 
   case 140:
-#line 588 "dhcp4_parser.yy" // lalr1.cc:907
+#line 588 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("ddns-replace-client-name", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("ddns-replace-client-name", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1230 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1230 "dhcp4_parser.cc"
     break;
 
   case 141:
-#line 594 "dhcp4_parser.yy" // lalr1.cc:907
+#line 594 "dhcp4_parser.yy"
     {
-      yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location)));
+      yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location)));
       }
-#line 1238 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1238 "dhcp4_parser.cc"
     break;
 
   case 142:
-#line 597 "dhcp4_parser.yy" // lalr1.cc:907
+#line 597 "dhcp4_parser.yy"
     {
-      yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
+      yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
-#line 1246 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1246 "dhcp4_parser.cc"
     break;
 
   case 143:
-#line 600 "dhcp4_parser.yy" // lalr1.cc:907
+#line 600 "dhcp4_parser.yy"
     {
-      yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
+      yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
-#line 1254 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1254 "dhcp4_parser.cc"
     break;
 
   case 144:
-#line 603 "dhcp4_parser.yy" // lalr1.cc:907
+#line 603 "dhcp4_parser.yy"
     {
-      yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
+      yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
-#line 1262 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1262 "dhcp4_parser.cc"
     break;
 
   case 145:
-#line 606 "dhcp4_parser.yy" // lalr1.cc:907
+#line 606 "dhcp4_parser.yy"
     {
       error(yystack_[0].location, "boolean values for the replace-client-name are "
                 "no longer supported");
       }
-#line 1271 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1271 "dhcp4_parser.cc"
     break;
 
   case 146:
-#line 612 "dhcp4_parser.yy" // lalr1.cc:907
+#line 612 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1279 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1279 "dhcp4_parser.cc"
     break;
 
   case 147:
-#line 614 "dhcp4_parser.yy" // lalr1.cc:907
+#line 614 "dhcp4_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-generated-prefix", s);
     ctx.leave();
 }
-#line 1289 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1289 "dhcp4_parser.cc"
     break;
 
   case 148:
-#line 620 "dhcp4_parser.yy" // lalr1.cc:907
+#line 620 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1297 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1297 "dhcp4_parser.cc"
     break;
 
   case 149:
-#line 622 "dhcp4_parser.yy" // lalr1.cc:907
+#line 622 "dhcp4_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-qualifying-suffix", s);
     ctx.leave();
 }
-#line 1307 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1307 "dhcp4_parser.cc"
     break;
 
   case 150:
-#line 628 "dhcp4_parser.yy" // lalr1.cc:907
+#line 628 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1315 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1315 "dhcp4_parser.cc"
     break;
 
   case 151:
-#line 630 "dhcp4_parser.yy" // lalr1.cc:907
+#line 630 "dhcp4_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-set", s);
     ctx.leave();
 }
-#line 1325 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1325 "dhcp4_parser.cc"
     break;
 
   case 152:
-#line 636 "dhcp4_parser.yy" // lalr1.cc:907
+#line 636 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1333 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1333 "dhcp4_parser.cc"
     break;
 
   case 153:
-#line 638 "dhcp4_parser.yy" // lalr1.cc:907
+#line 638 "dhcp4_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-replacement", s);
     ctx.leave();
 }
-#line 1343 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1343 "dhcp4_parser.cc"
     break;
 
   case 154:
-#line 644 "dhcp4_parser.yy" // lalr1.cc:907
+#line 644 "dhcp4_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces-config", i);
     ctx.stack_.push_back(i);
     ctx.enter(ctx.INTERFACES_CONFIG);
 }
-#line 1354 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1354 "dhcp4_parser.cc"
     break;
 
   case 155:
-#line 649 "dhcp4_parser.yy" // lalr1.cc:907
+#line 649 "dhcp4_parser.yy"
     {
     // No interfaces config param is required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1364 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1364 "dhcp4_parser.cc"
     break;
 
   case 165:
-#line 668 "dhcp4_parser.yy" // lalr1.cc:907
+#line 668 "dhcp4_parser.yy"
     {
     // Parse the interfaces-config map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1374 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1374 "dhcp4_parser.cc"
     break;
 
   case 166:
-#line 672 "dhcp4_parser.yy" // lalr1.cc:907
+#line 672 "dhcp4_parser.yy"
     {
     // No interfaces config param is required
     // parsing completed
 }
-#line 1383 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1383 "dhcp4_parser.cc"
     break;
 
   case 167:
-#line 677 "dhcp4_parser.yy" // lalr1.cc:907
+#line 677 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1394 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1394 "dhcp4_parser.cc"
     break;
 
   case 168:
-#line 682 "dhcp4_parser.yy" // lalr1.cc:907
+#line 682 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1403 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1403 "dhcp4_parser.cc"
     break;
 
   case 169:
-#line 687 "dhcp4_parser.yy" // lalr1.cc:907
+#line 687 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.DHCP_SOCKET_TYPE);
 }
-#line 1411 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1411 "dhcp4_parser.cc"
     break;
 
   case 170:
-#line 689 "dhcp4_parser.yy" // lalr1.cc:907
+#line 689 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("dhcp-socket-type", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("dhcp-socket-type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1420 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1420 "dhcp4_parser.cc"
     break;
 
   case 171:
-#line 694 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("raw", ctx.loc2pos(yystack_[0].location))); }
-#line 1426 "dhcp4_parser.cc" // lalr1.cc:907
+#line 694 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("raw", ctx.loc2pos(yystack_[0].location))); }
+#line 1426 "dhcp4_parser.cc"
     break;
 
   case 172:
-#line 695 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("udp", ctx.loc2pos(yystack_[0].location))); }
-#line 1432 "dhcp4_parser.cc" // lalr1.cc:907
+#line 695 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("udp", ctx.loc2pos(yystack_[0].location))); }
+#line 1432 "dhcp4_parser.cc"
     break;
 
   case 173:
-#line 698 "dhcp4_parser.yy" // lalr1.cc:907
+#line 698 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.OUTBOUND_INTERFACE);
 }
-#line 1440 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1440 "dhcp4_parser.cc"
     break;
 
   case 174:
-#line 700 "dhcp4_parser.yy" // lalr1.cc:907
+#line 700 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("outbound-interface", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("outbound-interface", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1449 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1449 "dhcp4_parser.cc"
     break;
 
   case 175:
-#line 705 "dhcp4_parser.yy" // lalr1.cc:907
+#line 705 "dhcp4_parser.yy"
     {
-    yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("same-as-inbound", ctx.loc2pos(yystack_[0].location)));
+    yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("same-as-inbound", ctx.loc2pos(yystack_[0].location)));
 }
-#line 1457 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1457 "dhcp4_parser.cc"
     break;
 
   case 176:
-#line 707 "dhcp4_parser.yy" // lalr1.cc:907
+#line 707 "dhcp4_parser.yy"
     {
-    yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("use-routing", ctx.loc2pos(yystack_[0].location)));
+    yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("use-routing", ctx.loc2pos(yystack_[0].location)));
     }
-#line 1465 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1465 "dhcp4_parser.cc"
     break;
 
   case 177:
-#line 711 "dhcp4_parser.yy" // lalr1.cc:907
+#line 711 "dhcp4_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("re-detect", b);
 }
-#line 1474 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1474 "dhcp4_parser.cc"
     break;
 
   case 178:
-#line 717 "dhcp4_parser.yy" // lalr1.cc:907
+#line 717 "dhcp4_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lease-database", i);
     ctx.stack_.push_back(i);
     ctx.enter(ctx.LEASE_DATABASE);
 }
-#line 1485 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1485 "dhcp4_parser.cc"
     break;
 
   case 179:
-#line 722 "dhcp4_parser.yy" // lalr1.cc:907
+#line 722 "dhcp4_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1496 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1496 "dhcp4_parser.cc"
     break;
 
   case 180:
-#line 729 "dhcp4_parser.yy" // lalr1.cc:907
+#line 729 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sanity-checks", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SANITY_CHECKS);
 }
-#line 1507 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1507 "dhcp4_parser.cc"
     break;
 
   case 181:
-#line 734 "dhcp4_parser.yy" // lalr1.cc:907
+#line 734 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1516 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1516 "dhcp4_parser.cc"
     break;
 
   case 185:
-#line 744 "dhcp4_parser.yy" // lalr1.cc:907
+#line 744 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1524 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1524 "dhcp4_parser.cc"
     break;
 
   case 186:
-#line 746 "dhcp4_parser.yy" // lalr1.cc:907
+#line 746 "dhcp4_parser.yy"
     {
 
-    if ( (string(yystack_[0].value.as< std::string > ()) == "none") ||
-         (string(yystack_[0].value.as< std::string > ()) == "warn") ||
-         (string(yystack_[0].value.as< std::string > ()) == "fix") ||
-         (string(yystack_[0].value.as< std::string > ()) == "fix-del") ||
-         (string(yystack_[0].value.as< std::string > ()) == "del")) {
-        ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    if ( (string(yystack_[0].value.as < std::string > ()) == "none") ||
+         (string(yystack_[0].value.as < std::string > ()) == "warn") ||
+         (string(yystack_[0].value.as < std::string > ()) == "fix") ||
+         (string(yystack_[0].value.as < std::string > ()) == "fix-del") ||
+         (string(yystack_[0].value.as < std::string > ()) == "del")) {
+        ElementPtr user(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
         ctx.stack_.back()->set("lease-checks", user);
         ctx.leave();
     } else {
-        error(yystack_[0].location, "Unsupported 'lease-checks value: " + string(yystack_[0].value.as< std::string > ()) +
+        error(yystack_[0].location, "Unsupported 'lease-checks value: " + string(yystack_[0].value.as < std::string > ()) +
               ", supported values are: none, warn, fix, fix-del, del");
     }
 }
-#line 1544 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1544 "dhcp4_parser.cc"
     break;
 
   case 187:
-#line 762 "dhcp4_parser.yy" // lalr1.cc:907
+#line 762 "dhcp4_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-database", i);
     ctx.stack_.push_back(i);
     ctx.enter(ctx.HOSTS_DATABASE);
 }
-#line 1555 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1555 "dhcp4_parser.cc"
     break;
 
   case 188:
-#line 767 "dhcp4_parser.yy" // lalr1.cc:907
+#line 767 "dhcp4_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1566 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1566 "dhcp4_parser.cc"
     break;
 
   case 189:
-#line 774 "dhcp4_parser.yy" // lalr1.cc:907
+#line 774 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-databases", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.HOSTS_DATABASE);
 }
-#line 1577 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1577 "dhcp4_parser.cc"
     break;
 
   case 190:
-#line 779 "dhcp4_parser.yy" // lalr1.cc:907
+#line 779 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1586 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1586 "dhcp4_parser.cc"
     break;
 
   case 195:
-#line 792 "dhcp4_parser.yy" // lalr1.cc:907
+#line 792 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1596 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1596 "dhcp4_parser.cc"
     break;
 
   case 196:
-#line 796 "dhcp4_parser.yy" // lalr1.cc:907
+#line 796 "dhcp4_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 1606 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1606 "dhcp4_parser.cc"
     break;
 
   case 220:
-#line 829 "dhcp4_parser.yy" // lalr1.cc:907
+#line 829 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.DATABASE_TYPE);
 }
-#line 1614 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1614 "dhcp4_parser.cc"
     break;
 
   case 221:
-#line 831 "dhcp4_parser.yy" // lalr1.cc:907
+#line 831 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1623 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1623 "dhcp4_parser.cc"
     break;
 
   case 222:
-#line 836 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); }
-#line 1629 "dhcp4_parser.cc" // lalr1.cc:907
+#line 836 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); }
+#line 1629 "dhcp4_parser.cc"
     break;
 
   case 223:
-#line 837 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); }
-#line 1635 "dhcp4_parser.cc" // lalr1.cc:907
+#line 837 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); }
+#line 1635 "dhcp4_parser.cc"
     break;
 
   case 224:
-#line 838 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); }
-#line 1641 "dhcp4_parser.cc" // lalr1.cc:907
+#line 838 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); }
+#line 1641 "dhcp4_parser.cc"
     break;
 
   case 225:
-#line 839 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); }
-#line 1647 "dhcp4_parser.cc" // lalr1.cc:907
+#line 839 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); }
+#line 1647 "dhcp4_parser.cc"
     break;
 
   case 226:
-#line 842 "dhcp4_parser.yy" // lalr1.cc:907
+#line 842 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1655 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1655 "dhcp4_parser.cc"
     break;
 
   case 227:
-#line 844 "dhcp4_parser.yy" // lalr1.cc:907
+#line 844 "dhcp4_parser.yy"
     {
-    ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr user(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user", user);
     ctx.leave();
 }
-#line 1665 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1665 "dhcp4_parser.cc"
     break;
 
   case 228:
-#line 850 "dhcp4_parser.yy" // lalr1.cc:907
+#line 850 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1673 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1673 "dhcp4_parser.cc"
     break;
 
   case 229:
-#line 852 "dhcp4_parser.yy" // lalr1.cc:907
+#line 852 "dhcp4_parser.yy"
     {
-    ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr pwd(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password", pwd);
     ctx.leave();
 }
-#line 1683 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1683 "dhcp4_parser.cc"
     break;
 
   case 230:
-#line 858 "dhcp4_parser.yy" // lalr1.cc:907
+#line 858 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1691 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1691 "dhcp4_parser.cc"
     break;
 
   case 231:
-#line 860 "dhcp4_parser.yy" // lalr1.cc:907
+#line 860 "dhcp4_parser.yy"
     {
-    ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr h(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host", h);
     ctx.leave();
 }
-#line 1701 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1701 "dhcp4_parser.cc"
     break;
 
   case 232:
-#line 866 "dhcp4_parser.yy" // lalr1.cc:907
+#line 866 "dhcp4_parser.yy"
     {
-    ElementPtr p(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr p(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", p);
 }
-#line 1710 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1710 "dhcp4_parser.cc"
     break;
 
   case 233:
-#line 871 "dhcp4_parser.yy" // lalr1.cc:907
+#line 871 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1718 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1718 "dhcp4_parser.cc"
     break;
 
   case 234:
-#line 873 "dhcp4_parser.yy" // lalr1.cc:907
+#line 873 "dhcp4_parser.yy"
     {
-    ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr name(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
     ctx.leave();
 }
-#line 1728 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1728 "dhcp4_parser.cc"
     break;
 
   case 235:
-#line 879 "dhcp4_parser.yy" // lalr1.cc:907
+#line 879 "dhcp4_parser.yy"
     {
-    ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("persist", n);
 }
-#line 1737 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1737 "dhcp4_parser.cc"
     break;
 
   case 236:
-#line 884 "dhcp4_parser.yy" // lalr1.cc:907
+#line 884 "dhcp4_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lfc-interval", n);
 }
-#line 1746 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1746 "dhcp4_parser.cc"
     break;
 
   case 237:
-#line 889 "dhcp4_parser.yy" // lalr1.cc:907
+#line 889 "dhcp4_parser.yy"
     {
-    ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("readonly", n);
 }
-#line 1755 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1755 "dhcp4_parser.cc"
     break;
 
   case 238:
-#line 894 "dhcp4_parser.yy" // lalr1.cc:907
+#line 894 "dhcp4_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("connect-timeout", n);
 }
-#line 1764 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1764 "dhcp4_parser.cc"
     break;
 
   case 239:
-#line 899 "dhcp4_parser.yy" // lalr1.cc:907
+#line 899 "dhcp4_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("request-timeout", n);
 }
-#line 1773 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1773 "dhcp4_parser.cc"
     break;
 
   case 240:
-#line 904 "dhcp4_parser.yy" // lalr1.cc:907
+#line 904 "dhcp4_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-keepalive", n);
 }
-#line 1782 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1782 "dhcp4_parser.cc"
     break;
 
   case 241:
-#line 909 "dhcp4_parser.yy" // lalr1.cc:907
+#line 909 "dhcp4_parser.yy"
     {
-    ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-nodelay", n);
 }
-#line 1791 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1791 "dhcp4_parser.cc"
     break;
 
   case 242:
-#line 914 "dhcp4_parser.yy" // lalr1.cc:907
+#line 914 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1799 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1799 "dhcp4_parser.cc"
     break;
 
   case 243:
-#line 916 "dhcp4_parser.yy" // lalr1.cc:907
+#line 916 "dhcp4_parser.yy"
     {
-    ElementPtr cp(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr cp(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("contact-points", cp);
     ctx.leave();
 }
-#line 1809 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1809 "dhcp4_parser.cc"
     break;
 
   case 244:
-#line 922 "dhcp4_parser.yy" // lalr1.cc:907
+#line 922 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1817 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1817 "dhcp4_parser.cc"
     break;
 
   case 245:
-#line 924 "dhcp4_parser.yy" // lalr1.cc:907
+#line 924 "dhcp4_parser.yy"
     {
-    ElementPtr ks(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr ks(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("keyspace", ks);
     ctx.leave();
 }
-#line 1827 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1827 "dhcp4_parser.cc"
     break;
 
   case 246:
-#line 930 "dhcp4_parser.yy" // lalr1.cc:907
+#line 930 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1835 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1835 "dhcp4_parser.cc"
     break;
 
   case 247:
-#line 932 "dhcp4_parser.yy" // lalr1.cc:907
+#line 932 "dhcp4_parser.yy"
     {
-    ElementPtr c(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr c(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("consistency", c);
     ctx.leave();
 }
-#line 1845 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1845 "dhcp4_parser.cc"
     break;
 
   case 248:
-#line 938 "dhcp4_parser.yy" // lalr1.cc:907
+#line 938 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1853 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1853 "dhcp4_parser.cc"
     break;
 
   case 249:
-#line 940 "dhcp4_parser.yy" // lalr1.cc:907
+#line 940 "dhcp4_parser.yy"
     {
-    ElementPtr c(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr c(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("serial-consistency", c);
     ctx.leave();
 }
-#line 1863 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1863 "dhcp4_parser.cc"
     break;
 
   case 250:
-#line 946 "dhcp4_parser.yy" // lalr1.cc:907
+#line 946 "dhcp4_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reconnect-tries", n);
 }
-#line 1872 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1872 "dhcp4_parser.cc"
     break;
 
   case 251:
-#line 951 "dhcp4_parser.yy" // lalr1.cc:907
+#line 951 "dhcp4_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reconnect-wait-time", n);
 }
-#line 1881 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1881 "dhcp4_parser.cc"
     break;
 
   case 252:
-#line 956 "dhcp4_parser.yy" // lalr1.cc:907
+#line 956 "dhcp4_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-row-errors", n);
 }
-#line 1890 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1890 "dhcp4_parser.cc"
     break;
 
   case 253:
-#line 962 "dhcp4_parser.yy" // lalr1.cc:907
+#line 962 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host-reservation-identifiers", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.HOST_RESERVATION_IDENTIFIERS);
 }
-#line 1901 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1901 "dhcp4_parser.cc"
     break;
 
   case 254:
-#line 967 "dhcp4_parser.yy" // lalr1.cc:907
+#line 967 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1910 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1910 "dhcp4_parser.cc"
     break;
 
   case 262:
-#line 983 "dhcp4_parser.yy" // lalr1.cc:907
+#line 983 "dhcp4_parser.yy"
     {
     ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
 }
-#line 1919 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1919 "dhcp4_parser.cc"
     break;
 
   case 263:
-#line 988 "dhcp4_parser.yy" // lalr1.cc:907
+#line 988 "dhcp4_parser.yy"
     {
     ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(hwaddr);
 }
-#line 1928 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1928 "dhcp4_parser.cc"
     break;
 
   case 264:
-#line 993 "dhcp4_parser.yy" // lalr1.cc:907
+#line 993 "dhcp4_parser.yy"
     {
     ElementPtr circuit(new StringElement("circuit-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(circuit);
 }
-#line 1937 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1937 "dhcp4_parser.cc"
     break;
 
   case 265:
-#line 998 "dhcp4_parser.yy" // lalr1.cc:907
+#line 998 "dhcp4_parser.yy"
     {
     ElementPtr client(new StringElement("client-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(client);
 }
-#line 1946 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1946 "dhcp4_parser.cc"
     break;
 
   case 266:
-#line 1003 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1003 "dhcp4_parser.yy"
     {
     ElementPtr flex_id(new StringElement("flex-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(flex_id);
 }
-#line 1955 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1955 "dhcp4_parser.cc"
     break;
 
   case 267:
-#line 1008 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1008 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hooks-libraries", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.HOOKS_LIBRARIES);
 }
-#line 1966 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1966 "dhcp4_parser.cc"
     break;
 
   case 268:
-#line 1013 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1013 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1975 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1975 "dhcp4_parser.cc"
     break;
 
   case 273:
-#line 1026 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1026 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1985 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1985 "dhcp4_parser.cc"
     break;
 
   case 274:
-#line 1030 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1030 "dhcp4_parser.yy"
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 1995 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1995 "dhcp4_parser.cc"
     break;
 
   case 275:
-#line 1036 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1036 "dhcp4_parser.yy"
     {
     // Parse the hooks-libraries list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2005 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2005 "dhcp4_parser.cc"
     break;
 
   case 276:
-#line 1040 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1040 "dhcp4_parser.yy"
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 2015 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2015 "dhcp4_parser.cc"
     break;
 
   case 282:
-#line 1055 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1055 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2023 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2023 "dhcp4_parser.cc"
     break;
 
   case 283:
-#line 1057 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1057 "dhcp4_parser.yy"
     {
-    ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr lib(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("library", lib);
     ctx.leave();
 }
-#line 2033 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2033 "dhcp4_parser.cc"
     break;
 
   case 284:
-#line 1063 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1063 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2041 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2041 "dhcp4_parser.cc"
     break;
 
   case 285:
-#line 1065 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1065 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 2050 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2050 "dhcp4_parser.cc"
     break;
 
   case 286:
-#line 1071 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1071 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("expired-leases-processing", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.EXPIRED_LEASES_PROCESSING);
 }
-#line 2061 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2061 "dhcp4_parser.cc"
     break;
 
   case 287:
-#line 1076 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1076 "dhcp4_parser.yy"
     {
     // No expired lease parameter is required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2071 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2071 "dhcp4_parser.cc"
     break;
 
   case 296:
-#line 1094 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1094 "dhcp4_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reclaim-timer-wait-time", value);
 }
-#line 2080 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2080 "dhcp4_parser.cc"
     break;
 
   case 297:
-#line 1099 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1099 "dhcp4_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush-reclaimed-timer-wait-time", value);
 }
-#line 2089 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2089 "dhcp4_parser.cc"
     break;
 
   case 298:
-#line 1104 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1104 "dhcp4_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hold-reclaimed-time", value);
 }
-#line 2098 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2098 "dhcp4_parser.cc"
     break;
 
   case 299:
-#line 1109 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1109 "dhcp4_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-leases", value);
 }
-#line 2107 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2107 "dhcp4_parser.cc"
     break;
 
   case 300:
-#line 1114 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1114 "dhcp4_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-time", value);
 }
-#line 2116 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2116 "dhcp4_parser.cc"
     break;
 
   case 301:
-#line 1119 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1119 "dhcp4_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("unwarned-reclaim-cycles", value);
 }
-#line 2125 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2125 "dhcp4_parser.cc"
     break;
 
   case 302:
-#line 1127 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1127 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet4", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.SUBNET4);
 }
-#line 2136 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2136 "dhcp4_parser.cc"
     break;
 
   case 303:
-#line 1132 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1132 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2145 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2145 "dhcp4_parser.cc"
     break;
 
   case 308:
-#line 1152 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1152 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2155 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2155 "dhcp4_parser.cc"
     break;
 
   case 309:
-#line 1156 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1156 "dhcp4_parser.yy"
     {
     // Once we reached this place, the subnet parsing is now complete.
     // If we want to, we can implement default values here.
@@ -2177,294 +2177,294 @@ namespace isc { namespace dhcp {
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 2181 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2181 "dhcp4_parser.cc"
     break;
 
   case 310:
-#line 1178 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1178 "dhcp4_parser.yy"
     {
     // Parse the subnet4 list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2191 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2191 "dhcp4_parser.cc"
     break;
 
   case 311:
-#line 1182 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1182 "dhcp4_parser.yy"
     {
     // The subnet subnet4 parameter is required
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 2201 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2201 "dhcp4_parser.cc"
     break;
 
   case 351:
-#line 1233 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1233 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2209 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2209 "dhcp4_parser.cc"
     break;
 
   case 352:
-#line 1235 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1235 "dhcp4_parser.yy"
     {
-    ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr subnet(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet", subnet);
     ctx.leave();
 }
-#line 2219 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2219 "dhcp4_parser.cc"
     break;
 
   case 353:
-#line 1241 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1241 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2227 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2227 "dhcp4_parser.cc"
     break;
 
   case 354:
-#line 1243 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1243 "dhcp4_parser.yy"
     {
-    ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-interface", iface);
     ctx.leave();
 }
-#line 2237 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2237 "dhcp4_parser.cc"
     break;
 
   case 355:
-#line 1249 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1249 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2245 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2245 "dhcp4_parser.cc"
     break;
 
   case 356:
-#line 1251 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1251 "dhcp4_parser.yy"
     {
-    ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-interface-id", iface);
     ctx.leave();
 }
-#line 2255 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2255 "dhcp4_parser.cc"
     break;
 
   case 357:
-#line 1257 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1257 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2263 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2263 "dhcp4_parser.cc"
     break;
 
   case 358:
-#line 1259 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1259 "dhcp4_parser.yy"
     {
-    ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("4o6-subnet", iface);
     ctx.leave();
 }
-#line 2273 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2273 "dhcp4_parser.cc"
     break;
 
   case 359:
-#line 1265 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1265 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2281 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2281 "dhcp4_parser.cc"
     break;
 
   case 360:
-#line 1267 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1267 "dhcp4_parser.yy"
     {
-    ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface", iface);
     ctx.leave();
 }
-#line 2291 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2291 "dhcp4_parser.cc"
     break;
 
   case 361:
-#line 1273 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1273 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2299 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2299 "dhcp4_parser.cc"
     break;
 
   case 362:
-#line 1275 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1275 "dhcp4_parser.yy"
     {
-    ElementPtr cls(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr cls(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-class", cls);
     ctx.leave();
 }
-#line 2309 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2309 "dhcp4_parser.cc"
     break;
 
   case 363:
-#line 1281 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1281 "dhcp4_parser.yy"
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("require-client-classes", c);
     ctx.stack_.push_back(c);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2320 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2320 "dhcp4_parser.cc"
     break;
 
   case 364:
-#line 1286 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1286 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2329 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2329 "dhcp4_parser.cc"
     break;
 
   case 365:
-#line 1291 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1291 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.RESERVATION_MODE);
 }
-#line 2337 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2337 "dhcp4_parser.cc"
     break;
 
   case 366:
-#line 1293 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1293 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 2346 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2346 "dhcp4_parser.cc"
     break;
 
   case 367:
-#line 1298 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); }
-#line 2352 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1298 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); }
+#line 2352 "dhcp4_parser.cc"
     break;
 
   case 368:
-#line 1299 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); }
-#line 2358 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1299 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); }
+#line 2358 "dhcp4_parser.cc"
     break;
 
   case 369:
-#line 1300 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("global", ctx.loc2pos(yystack_[0].location))); }
-#line 2364 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1300 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("global", ctx.loc2pos(yystack_[0].location))); }
+#line 2364 "dhcp4_parser.cc"
     break;
 
   case 370:
-#line 1301 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); }
-#line 2370 "dhcp4_parser.cc" // lalr1.cc:907
+#line 1301 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); }
+#line 2370 "dhcp4_parser.cc"
     break;
 
   case 371:
-#line 1304 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1304 "dhcp4_parser.yy"
     {
-    ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr id(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("id", id);
 }
-#line 2379 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2379 "dhcp4_parser.cc"
     break;
 
   case 372:
-#line 1311 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1311 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("shared-networks", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.SHARED_NETWORK);
 }
-#line 2390 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2390 "dhcp4_parser.cc"
     break;
 
   case 373:
-#line 1316 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1316 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2399 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2399 "dhcp4_parser.cc"
     break;
 
   case 378:
-#line 1331 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1331 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2409 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2409 "dhcp4_parser.cc"
     break;
 
   case 379:
-#line 1335 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1335 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
 }
-#line 2417 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2417 "dhcp4_parser.cc"
     break;
 
   case 414:
-#line 1381 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1381 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-def", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OPTION_DEF);
 }
-#line 2428 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2428 "dhcp4_parser.cc"
     break;
 
   case 415:
-#line 1386 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1386 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2437 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2437 "dhcp4_parser.cc"
     break;
 
   case 416:
-#line 1394 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1394 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2446 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2446 "dhcp4_parser.cc"
     break;
 
   case 417:
-#line 1397 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1397 "dhcp4_parser.yy"
     {
     // parsing completed
 }
-#line 2454 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2454 "dhcp4_parser.cc"
     break;
 
   case 422:
-#line 1413 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1413 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2464 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2464 "dhcp4_parser.cc"
     break;
 
   case 423:
-#line 1417 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1417 "dhcp4_parser.yy"
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2472,21 +2472,21 @@ namespace isc { namespace dhcp {
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 2476 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2476 "dhcp4_parser.cc"
     break;
 
   case 424:
-#line 1428 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1428 "dhcp4_parser.yy"
     {
     // Parse the option-def list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2486 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2486 "dhcp4_parser.cc"
     break;
 
   case 425:
-#line 1432 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1432 "dhcp4_parser.yy"
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2494,284 +2494,284 @@ namespace isc { namespace dhcp {
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 2498 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2498 "dhcp4_parser.cc"
     break;
 
   case 441:
-#line 1464 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1464 "dhcp4_parser.yy"
     {
-    ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr code(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("code", code);
 }
-#line 2507 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2507 "dhcp4_parser.cc"
     break;
 
   case 443:
-#line 1471 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1471 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2515 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2515 "dhcp4_parser.cc"
     break;
 
   case 444:
-#line 1473 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1473 "dhcp4_parser.yy"
     {
-    ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("type", prf);
     ctx.leave();
 }
-#line 2525 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2525 "dhcp4_parser.cc"
     break;
 
   case 445:
-#line 1479 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1479 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2533 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2533 "dhcp4_parser.cc"
     break;
 
   case 446:
-#line 1481 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1481 "dhcp4_parser.yy"
     {
-    ElementPtr rtypes(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr rtypes(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("record-types", rtypes);
     ctx.leave();
 }
-#line 2543 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2543 "dhcp4_parser.cc"
     break;
 
   case 447:
-#line 1487 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1487 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2551 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2551 "dhcp4_parser.cc"
     break;
 
   case 448:
-#line 1489 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1489 "dhcp4_parser.yy"
     {
-    ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr space(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("space", space);
     ctx.leave();
 }
-#line 2561 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2561 "dhcp4_parser.cc"
     break;
 
   case 450:
-#line 1497 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1497 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2569 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2569 "dhcp4_parser.cc"
     break;
 
   case 451:
-#line 1499 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1499 "dhcp4_parser.yy"
     {
-    ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr encap(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("encapsulate", encap);
     ctx.leave();
 }
-#line 2579 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2579 "dhcp4_parser.cc"
     break;
 
   case 452:
-#line 1505 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1505 "dhcp4_parser.yy"
     {
-    ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr array(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("array", array);
 }
-#line 2588 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2588 "dhcp4_parser.cc"
     break;
 
   case 453:
-#line 1514 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1514 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-data", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OPTION_DATA);
 }
-#line 2599 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2599 "dhcp4_parser.cc"
     break;
 
   case 454:
-#line 1519 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1519 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2608 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2608 "dhcp4_parser.cc"
     break;
 
   case 459:
-#line 1538 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1538 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2618 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2618 "dhcp4_parser.cc"
     break;
 
   case 460:
-#line 1542 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1542 "dhcp4_parser.yy"
     {
     /// @todo: the code or name parameters are required.
     ctx.stack_.pop_back();
 }
-#line 2627 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2627 "dhcp4_parser.cc"
     break;
 
   case 461:
-#line 1550 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1550 "dhcp4_parser.yy"
     {
     // Parse the option-data list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2637 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2637 "dhcp4_parser.cc"
     break;
 
   case 462:
-#line 1554 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1554 "dhcp4_parser.yy"
     {
     /// @todo: the code or name parameters are required.
     // parsing completed
 }
-#line 2646 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2646 "dhcp4_parser.cc"
     break;
 
   case 477:
-#line 1587 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1587 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2654 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2654 "dhcp4_parser.cc"
     break;
 
   case 478:
-#line 1589 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1589 "dhcp4_parser.yy"
     {
-    ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr data(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
     ctx.leave();
 }
-#line 2664 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2664 "dhcp4_parser.cc"
     break;
 
   case 481:
-#line 1599 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1599 "dhcp4_parser.yy"
     {
-    ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr space(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", space);
 }
-#line 2673 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2673 "dhcp4_parser.cc"
     break;
 
   case 482:
-#line 1604 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1604 "dhcp4_parser.yy"
     {
-    ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr persist(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
 }
-#line 2682 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2682 "dhcp4_parser.cc"
     break;
 
   case 483:
-#line 1612 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1612 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pools", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.POOLS);
 }
-#line 2693 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2693 "dhcp4_parser.cc"
     break;
 
   case 484:
-#line 1617 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1617 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2702 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2702 "dhcp4_parser.cc"
     break;
 
   case 489:
-#line 1632 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1632 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2712 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2712 "dhcp4_parser.cc"
     break;
 
   case 490:
-#line 1636 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1636 "dhcp4_parser.yy"
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 2722 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2722 "dhcp4_parser.cc"
     break;
 
   case 491:
-#line 1642 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1642 "dhcp4_parser.yy"
     {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2732 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2732 "dhcp4_parser.cc"
     break;
 
   case 492:
-#line 1646 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1646 "dhcp4_parser.yy"
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 2742 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2742 "dhcp4_parser.cc"
     break;
 
   case 502:
-#line 1665 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1665 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2750 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2750 "dhcp4_parser.cc"
     break;
 
   case 503:
-#line 1667 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1667 "dhcp4_parser.yy"
     {
-    ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr pool(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
     ctx.leave();
 }
-#line 2760 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2760 "dhcp4_parser.cc"
     break;
 
   case 504:
-#line 1673 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1673 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2768 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2768 "dhcp4_parser.cc"
     break;
 
   case 505:
-#line 1675 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1675 "dhcp4_parser.yy"
     {
     ElementPtr parent = ctx.stack_.back();
-    ElementPtr user_context = yystack_[0].value.as< ElementPtr > ();
+    ElementPtr user_context = yystack_[0].value.as < ElementPtr > ();
     ConstElementPtr old = parent->get("user-context");
 
     // Handle already existing user context
@@ -2791,23 +2791,23 @@ namespace isc { namespace dhcp {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 2795 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2795 "dhcp4_parser.cc"
     break;
 
   case 506:
-#line 1698 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1698 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2803 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2803 "dhcp4_parser.cc"
     break;
 
   case 507:
-#line 1700 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1700 "dhcp4_parser.yy"
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location)));
-    ElementPtr comment(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr comment(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     user_context->set("comment", comment);
 
     // Handle already existing user context
@@ -2828,451 +2828,451 @@ namespace isc { namespace dhcp {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 2832 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2832 "dhcp4_parser.cc"
     break;
 
   case 508:
-#line 1728 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1728 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.RESERVATIONS);
 }
-#line 2843 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2843 "dhcp4_parser.cc"
     break;
 
   case 509:
-#line 1733 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1733 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2852 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2852 "dhcp4_parser.cc"
     break;
 
   case 514:
-#line 1746 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1746 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2862 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2862 "dhcp4_parser.cc"
     break;
 
   case 515:
-#line 1750 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1750 "dhcp4_parser.yy"
     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
 }
-#line 2871 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2871 "dhcp4_parser.cc"
     break;
 
   case 516:
-#line 1755 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1755 "dhcp4_parser.yy"
     {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2881 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2881 "dhcp4_parser.cc"
     break;
 
   case 517:
-#line 1759 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1759 "dhcp4_parser.yy"
     {
     /// @todo: an identifier parameter is required.
     // parsing completed
 }
-#line 2890 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2890 "dhcp4_parser.cc"
     break;
 
   case 537:
-#line 1790 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1790 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2898 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2898 "dhcp4_parser.cc"
     break;
 
   case 538:
-#line 1792 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1792 "dhcp4_parser.yy"
     {
-    ElementPtr next_server(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr next_server(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("next-server", next_server);
     ctx.leave();
 }
-#line 2908 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2908 "dhcp4_parser.cc"
     break;
 
   case 539:
-#line 1798 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1798 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2916 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2916 "dhcp4_parser.cc"
     break;
 
   case 540:
-#line 1800 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1800 "dhcp4_parser.yy"
     {
-    ElementPtr srv(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr srv(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-hostname", srv);
     ctx.leave();
 }
-#line 2926 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2926 "dhcp4_parser.cc"
     break;
 
   case 541:
-#line 1806 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1806 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2934 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2934 "dhcp4_parser.cc"
     break;
 
   case 542:
-#line 1808 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1808 "dhcp4_parser.yy"
     {
-    ElementPtr bootfile(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr bootfile(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("boot-file-name", bootfile);
     ctx.leave();
 }
-#line 2944 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2944 "dhcp4_parser.cc"
     break;
 
   case 543:
-#line 1814 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1814 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2952 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2952 "dhcp4_parser.cc"
     break;
 
   case 544:
-#line 1816 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1816 "dhcp4_parser.yy"
     {
-    ElementPtr addr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr addr(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", addr);
     ctx.leave();
 }
-#line 2962 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2962 "dhcp4_parser.cc"
     break;
 
   case 545:
-#line 1822 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1822 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-addresses", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2973 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2973 "dhcp4_parser.cc"
     break;
 
   case 546:
-#line 1827 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1827 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2982 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2982 "dhcp4_parser.cc"
     break;
 
   case 547:
-#line 1832 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1832 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2990 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2990 "dhcp4_parser.cc"
     break;
 
   case 548:
-#line 1834 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1834 "dhcp4_parser.yy"
     {
-    ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr d(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
     ctx.leave();
 }
-#line 3000 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3000 "dhcp4_parser.cc"
     break;
 
   case 549:
-#line 1840 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1840 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3008 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3008 "dhcp4_parser.cc"
     break;
 
   case 550:
-#line 1842 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1842 "dhcp4_parser.yy"
     {
-    ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hw-address", hw);
     ctx.leave();
 }
-#line 3018 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3018 "dhcp4_parser.cc"
     break;
 
   case 551:
-#line 1848 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1848 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3026 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3026 "dhcp4_parser.cc"
     break;
 
   case 552:
-#line 1850 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1850 "dhcp4_parser.yy"
     {
-    ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-id", hw);
     ctx.leave();
 }
-#line 3036 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3036 "dhcp4_parser.cc"
     break;
 
   case 553:
-#line 1856 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1856 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3044 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3044 "dhcp4_parser.cc"
     break;
 
   case 554:
-#line 1858 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1858 "dhcp4_parser.yy"
     {
-    ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("circuit-id", hw);
     ctx.leave();
 }
-#line 3054 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3054 "dhcp4_parser.cc"
     break;
 
   case 555:
-#line 1864 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1864 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3062 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3062 "dhcp4_parser.cc"
     break;
 
   case 556:
-#line 1866 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1866 "dhcp4_parser.yy"
     {
-    ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flex-id", hw);
     ctx.leave();
 }
-#line 3072 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3072 "dhcp4_parser.cc"
     break;
 
   case 557:
-#line 1872 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1872 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3080 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3080 "dhcp4_parser.cc"
     break;
 
   case 558:
-#line 1874 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1874 "dhcp4_parser.yy"
     {
-    ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr host(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
     ctx.leave();
 }
-#line 3090 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3090 "dhcp4_parser.cc"
     break;
 
   case 559:
-#line 1880 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1880 "dhcp4_parser.yy"
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", c);
     ctx.stack_.push_back(c);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3101 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3101 "dhcp4_parser.cc"
     break;
 
   case 560:
-#line 1885 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1885 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3110 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3110 "dhcp4_parser.cc"
     break;
 
   case 561:
-#line 1893 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1893 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.RELAY);
 }
-#line 3121 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3121 "dhcp4_parser.cc"
     break;
 
   case 562:
-#line 1898 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1898 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3130 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3130 "dhcp4_parser.cc"
     break;
 
   case 565:
-#line 1910 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1910 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.CLIENT_CLASSES);
 }
-#line 3141 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3141 "dhcp4_parser.cc"
     break;
 
   case 566:
-#line 1915 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1915 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3150 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3150 "dhcp4_parser.cc"
     break;
 
   case 569:
-#line 1924 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1924 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3160 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3160 "dhcp4_parser.cc"
     break;
 
   case 570:
-#line 1928 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1928 "dhcp4_parser.yy"
     {
     // The name client class parameter is required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 3170 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3170 "dhcp4_parser.cc"
     break;
 
   case 587:
-#line 1957 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1957 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3178 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3178 "dhcp4_parser.cc"
     break;
 
   case 588:
-#line 1959 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1959 "dhcp4_parser.yy"
     {
-    ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr test(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
     ctx.leave();
 }
-#line 3188 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3188 "dhcp4_parser.cc"
     break;
 
   case 589:
-#line 1965 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1965 "dhcp4_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("only-if-required", b);
 }
-#line 3197 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3197 "dhcp4_parser.cc"
     break;
 
   case 590:
-#line 1974 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1974 "dhcp4_parser.yy"
     {
-    ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
 }
-#line 3206 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3206 "dhcp4_parser.cc"
     break;
 
   case 591:
-#line 1981 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1981 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("control-socket", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.CONTROL_SOCKET);
 }
-#line 3217 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3217 "dhcp4_parser.cc"
     break;
 
   case 592:
-#line 1986 "dhcp4_parser.yy" // lalr1.cc:907
+#line 1986 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3226 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3226 "dhcp4_parser.cc"
     break;
 
   case 600:
-#line 2002 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2002 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3234 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3234 "dhcp4_parser.cc"
     break;
 
   case 601:
-#line 2004 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2004 "dhcp4_parser.yy"
     {
-    ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr stype(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-type", stype);
     ctx.leave();
 }
-#line 3244 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3244 "dhcp4_parser.cc"
     break;
 
   case 602:
-#line 2010 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2010 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3252 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3252 "dhcp4_parser.cc"
     break;
 
   case 603:
-#line 2012 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2012 "dhcp4_parser.yy"
     {
-    ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr name(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-name", name);
     ctx.leave();
 }
-#line 3262 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3262 "dhcp4_parser.cc"
     break;
 
   case 604:
-#line 2021 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2021 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3270 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3270 "dhcp4_parser.cc"
     break;
 
   case 605:
-#line 2023 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2023 "dhcp4_parser.yy"
     {
-    ElementPtr qc = yystack_[0].value.as< ElementPtr > ();
+    ElementPtr qc = yystack_[0].value.as < ElementPtr > ();
     ctx.stack_.back()->set("dhcp-queue-control", qc);
 
     // Doing this manually, because dhcp-queue-control
@@ -3304,603 +3304,604 @@ namespace isc { namespace dhcp {
 
     ctx.leave();
 }
-#line 3308 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3308 "dhcp4_parser.cc"
     break;
 
   case 606:
-#line 2059 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2059 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp-ddns", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.DHCP_DDNS);
 }
-#line 3319 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3319 "dhcp4_parser.cc"
     break;
 
   case 607:
-#line 2064 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2064 "dhcp4_parser.yy"
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3330 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3330 "dhcp4_parser.cc"
     break;
 
   case 608:
-#line 2071 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2071 "dhcp4_parser.yy"
     {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3340 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3340 "dhcp4_parser.cc"
     break;
 
   case 609:
-#line 2075 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2075 "dhcp4_parser.yy"
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 3350 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3350 "dhcp4_parser.cc"
     break;
 
   case 630:
-#line 2105 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2105 "dhcp4_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
 }
-#line 3359 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3359 "dhcp4_parser.cc"
     break;
 
   case 631:
-#line 2110 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2110 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3367 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3367 "dhcp4_parser.cc"
     break;
 
   case 632:
-#line 2112 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2112 "dhcp4_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-ip", s);
     ctx.leave();
 }
-#line 3377 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3377 "dhcp4_parser.cc"
     break;
 
   case 633:
-#line 2118 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2118 "dhcp4_parser.yy"
     {
-    ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
 }
-#line 3386 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3386 "dhcp4_parser.cc"
     break;
 
   case 634:
-#line 2123 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2123 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3394 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3394 "dhcp4_parser.cc"
     break;
 
   case 635:
-#line 2125 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2125 "dhcp4_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-ip", s);
     ctx.leave();
 }
-#line 3404 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3404 "dhcp4_parser.cc"
     break;
 
   case 636:
-#line 2131 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2131 "dhcp4_parser.yy"
     {
-    ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
 }
-#line 3413 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3413 "dhcp4_parser.cc"
     break;
 
   case 637:
-#line 2136 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2136 "dhcp4_parser.yy"
     {
-    ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
 }
-#line 3422 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3422 "dhcp4_parser.cc"
     break;
 
   case 638:
-#line 2141 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2141 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
-#line 3430 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3430 "dhcp4_parser.cc"
     break;
 
   case 639:
-#line 2143 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2143 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3439 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3439 "dhcp4_parser.cc"
     break;
 
   case 640:
-#line 2149 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
-#line 3445 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2149 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
+#line 3445 "dhcp4_parser.cc"
     break;
 
   case 641:
-#line 2150 "dhcp4_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
-#line 3451 "dhcp4_parser.cc" // lalr1.cc:907
+#line 2150 "dhcp4_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
+#line 3451 "dhcp4_parser.cc"
     break;
 
   case 642:
-#line 2153 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2153 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
-#line 3459 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3459 "dhcp4_parser.cc"
     break;
 
   case 643:
-#line 2155 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2155 "dhcp4_parser.yy"
     {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
     ctx.leave();
 }
-#line 3469 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3469 "dhcp4_parser.cc"
     break;
 
   case 644:
-#line 2162 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2162 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3477 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3477 "dhcp4_parser.cc"
     break;
 
   case 645:
-#line 2164 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2164 "dhcp4_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("qualifying-suffix", s);
     ctx.leave();
 }
-#line 3487 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3487 "dhcp4_parser.cc"
     break;
 
   case 646:
-#line 2171 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2171 "dhcp4_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-no-update", b);
 }
-#line 3496 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3496 "dhcp4_parser.cc"
     break;
 
   case 647:
-#line 2177 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2177 "dhcp4_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-client-update", b);
 }
-#line 3505 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3505 "dhcp4_parser.cc"
     break;
 
   case 648:
-#line 2183 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2183 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
-#line 3513 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3513 "dhcp4_parser.cc"
     break;
 
   case 649:
-#line 2185 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2185 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3522 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3522 "dhcp4_parser.cc"
     break;
 
   case 650:
-#line 2191 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2191 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3530 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3530 "dhcp4_parser.cc"
     break;
 
   case 651:
-#line 2193 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2193 "dhcp4_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("generated-prefix", s);
     ctx.leave();
 }
-#line 3540 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3540 "dhcp4_parser.cc"
     break;
 
   case 652:
-#line 2200 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2200 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3548 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3548 "dhcp4_parser.cc"
     break;
 
   case 653:
-#line 2202 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2202 "dhcp4_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-set", s);
     ctx.leave();
 }
-#line 3558 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3558 "dhcp4_parser.cc"
     break;
 
   case 654:
-#line 2209 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2209 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3566 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3566 "dhcp4_parser.cc"
     break;
 
   case 655:
-#line 2211 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2211 "dhcp4_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-replacement", s);
     ctx.leave();
 }
-#line 3576 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3576 "dhcp4_parser.cc"
     break;
 
   case 656:
-#line 2220 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2220 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3584 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3584 "dhcp4_parser.cc"
     break;
 
   case 657:
-#line 2222 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2222 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3593 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3593 "dhcp4_parser.cc"
     break;
 
   case 658:
-#line 2227 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2227 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3601 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3601 "dhcp4_parser.cc"
     break;
 
   case 659:
-#line 2229 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2229 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3610 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3610 "dhcp4_parser.cc"
     break;
 
   case 660:
-#line 2234 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2234 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3618 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3618 "dhcp4_parser.cc"
     break;
 
   case 661:
-#line 2236 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2236 "dhcp4_parser.yy"
     {
-    ctx.stack_.back()->set("Control-agent", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("Control-agent", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3627 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3627 "dhcp4_parser.cc"
     break;
 
   case 662:
-#line 2241 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2241 "dhcp4_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-control", i);
     ctx.stack_.push_back(i);
     ctx.enter(ctx.CONFIG_CONTROL);
 }
-#line 3638 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3638 "dhcp4_parser.cc"
     break;
 
   case 663:
-#line 2246 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2246 "dhcp4_parser.yy"
     {
     // No config control params are required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3648 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3648 "dhcp4_parser.cc"
     break;
 
   case 664:
-#line 2252 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2252 "dhcp4_parser.yy"
     {
     // Parse the config-control map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3658 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3658 "dhcp4_parser.cc"
     break;
 
   case 665:
-#line 2256 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2256 "dhcp4_parser.yy"
     {
     // No config_control params are required
     // parsing completed
 }
-#line 3667 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3667 "dhcp4_parser.cc"
     break;
 
   case 670:
-#line 2271 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2271 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-databases", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.CONFIG_DATABASE);
 }
-#line 3678 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3678 "dhcp4_parser.cc"
     break;
 
   case 671:
-#line 2276 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2276 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3687 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3687 "dhcp4_parser.cc"
     break;
 
   case 672:
-#line 2281 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2281 "dhcp4_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-fetch-wait-time", value);
 }
-#line 3696 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3696 "dhcp4_parser.cc"
     break;
 
   case 673:
-#line 2291 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2291 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("Logging", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.LOGGING);
 }
-#line 3707 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3707 "dhcp4_parser.cc"
     break;
 
   case 674:
-#line 2296 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2296 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3716 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3716 "dhcp4_parser.cc"
     break;
 
   case 675:
-#line 2301 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2301 "dhcp4_parser.yy"
     {
     // Parse the Logging map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3726 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3726 "dhcp4_parser.cc"
     break;
 
   case 676:
-#line 2305 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2305 "dhcp4_parser.yy"
     {
     // parsing completed
 }
-#line 3734 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3734 "dhcp4_parser.cc"
     break;
 
   case 680:
-#line 2321 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2321 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("loggers", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.LOGGERS);
 }
-#line 3745 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3745 "dhcp4_parser.cc"
     break;
 
   case 681:
-#line 2326 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2326 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3754 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3754 "dhcp4_parser.cc"
     break;
 
   case 684:
-#line 2338 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2338 "dhcp4_parser.yy"
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
     ctx.stack_.push_back(l);
 }
-#line 3764 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3764 "dhcp4_parser.cc"
     break;
 
   case 685:
-#line 2342 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2342 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
 }
-#line 3772 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3772 "dhcp4_parser.cc"
     break;
 
   case 695:
-#line 2359 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2359 "dhcp4_parser.yy"
     {
-    ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr dl(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
 }
-#line 3781 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3781 "dhcp4_parser.cc"
     break;
 
   case 696:
-#line 2364 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2364 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3789 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3789 "dhcp4_parser.cc"
     break;
 
   case 697:
-#line 2366 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2366 "dhcp4_parser.yy"
     {
-    ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
     ctx.leave();
 }
-#line 3799 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3799 "dhcp4_parser.cc"
     break;
 
   case 698:
-#line 2372 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2372 "dhcp4_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OUTPUT_OPTIONS);
 }
-#line 3810 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3810 "dhcp4_parser.cc"
     break;
 
   case 699:
-#line 2377 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2377 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3819 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3819 "dhcp4_parser.cc"
     break;
 
   case 702:
-#line 2386 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2386 "dhcp4_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3829 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3829 "dhcp4_parser.cc"
     break;
 
   case 703:
-#line 2390 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2390 "dhcp4_parser.yy"
     {
     ctx.stack_.pop_back();
 }
-#line 3837 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3837 "dhcp4_parser.cc"
     break;
 
   case 711:
-#line 2405 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2405 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3845 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3845 "dhcp4_parser.cc"
     break;
 
   case 712:
-#line 2407 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2407 "dhcp4_parser.yy"
     {
-    ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
     ctx.leave();
 }
-#line 3855 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3855 "dhcp4_parser.cc"
     break;
 
   case 713:
-#line 2413 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2413 "dhcp4_parser.yy"
     {
-    ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr flush(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
 }
-#line 3864 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3864 "dhcp4_parser.cc"
     break;
 
   case 714:
-#line 2418 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2418 "dhcp4_parser.yy"
     {
-    ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr maxsize(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
 }
-#line 3873 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3873 "dhcp4_parser.cc"
     break;
 
   case 715:
-#line 2423 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2423 "dhcp4_parser.yy"
     {
-    ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr maxver(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
 }
-#line 3882 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3882 "dhcp4_parser.cc"
     break;
 
   case 716:
-#line 2428 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2428 "dhcp4_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3890 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3890 "dhcp4_parser.cc"
     break;
 
   case 717:
-#line 2430 "dhcp4_parser.yy" // lalr1.cc:907
+#line 2430 "dhcp4_parser.yy"
     {
-    ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pattern", sev);
     ctx.leave();
 }
-#line 3900 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3900 "dhcp4_parser.cc"
     break;
 
 
-#line 3904 "dhcp4_parser.cc" // lalr1.cc:907
+#line 3904 "dhcp4_parser.cc"
+
             default:
               break;
             }
@@ -3908,6 +3909,7 @@ namespace isc { namespace dhcp {
 #if YY_EXCEPTIONS
       catch (const syntax_error& yyexc)
         {
+          YYCDEBUG << "Caught exception: " << yyexc.what() << '\n';
           error (yyexc);
           YYERROR;
         }
@@ -3922,6 +3924,7 @@ namespace isc { namespace dhcp {
     }
     goto yynewstate;
 
+
   /*--------------------------------------.
   | yyerrlab -- here on detecting error.  |
   `--------------------------------------*/
@@ -3958,18 +3961,18 @@ namespace isc { namespace dhcp {
   | yyerrorlab -- error raised explicitly by YYERROR.  |
   `---------------------------------------------------*/
   yyerrorlab:
-
-    /* Pacify compilers like GCC when the user code never invokes
-       YYERROR and the label yyerrorlab therefore never appears in user
-       code.  */
+    /* Pacify compilers when the user code never invokes YYERROR and
+       the label yyerrorlab therefore never appears in user code.  */
     if (false)
-      goto yyerrorlab;
+      YYERROR;
+
     /* Do not reclaim the symbols of the rule whose action triggered
        this YYERROR.  */
     yypop_ (yylen);
     yylen = 0;
     goto yyerrlab1;
 
+
   /*-------------------------------------------------------------.
   | yyerrlab1 -- common code for both syntax error and YYERROR.  |
   `-------------------------------------------------------------*/
@@ -4010,16 +4013,26 @@ namespace isc { namespace dhcp {
     }
     goto yynewstate;
 
-    // Accept.
+
+  /*-------------------------------------.
+  | yyacceptlab -- YYACCEPT comes here.  |
+  `-------------------------------------*/
   yyacceptlab:
     yyresult = 0;
     goto yyreturn;
 
-    // Abort.
+
+  /*-----------------------------------.
+  | yyabortlab -- YYABORT comes here.  |
+  `-----------------------------------*/
   yyabortlab:
     yyresult = 1;
     goto yyreturn;
 
+
+  /*-----------------------------------------------------.
+  | yyreturn -- parsing is finished, return the result.  |
+  `-----------------------------------------------------*/
   yyreturn:
     if (!yyla.empty ())
       yy_destroy_ ("Cleanup: discarding lookahead", yyla);
@@ -5269,10 +5282,11 @@ namespace isc { namespace dhcp {
 #endif // PARSER4_DEBUG
 
 
-#line 14 "dhcp4_parser.yy" // lalr1.cc:1218
+#line 14 "dhcp4_parser.yy"
 } } // isc::dhcp
-#line 5275 "dhcp4_parser.cc" // lalr1.cc:1218
-#line 2437 "dhcp4_parser.yy" // lalr1.cc:1219
+#line 5288 "dhcp4_parser.cc"
+
+#line 2437 "dhcp4_parser.yy"
 
 
 void
diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h
index 4ed78335ea..c6afa29eaa 100644
--- a/src/bin/dhcp4/dhcp4_parser.h
+++ b/src/bin/dhcp4/dhcp4_parser.h
@@ -1,8 +1,8 @@
-// A Bison parser, made by GNU Bison 3.2.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton interface for Bison LALR(1) parsers in C++
 
-// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #ifndef YY_PARSER4_DHCP4_PARSER_H_INCLUDED
 # define YY_PARSER4_DHCP4_PARSER_H_INCLUDED
 // //                    "%code requires" blocks.
-#line 17 "dhcp4_parser.yy" // lalr1.cc:404
+#line 17 "dhcp4_parser.yy"
 
 #include <string>
 #include <cc/data.h>
@@ -56,7 +56,7 @@ using namespace isc::dhcp;
 using namespace isc::data;
 using namespace std;
 
-#line 60 "dhcp4_parser.h" // lalr1.cc:404
+#line 60 "dhcp4_parser.h"
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -65,8 +65,14 @@ using namespace std;
 # include <string>
 # include <vector>
 
+#if defined __cplusplus
+# define YY_CPLUSPLUS __cplusplus
+#else
+# define YY_CPLUSPLUS 199711L
+#endif
+
 // Support move semantics when possible.
-#if defined __cplusplus && 201103L <= __cplusplus
+#if 201103L <= YY_CPLUSPLUS
 # define YY_MOVE           std::move
 # define YY_MOVE_OR_COPY   move
 # define YY_MOVE_REF(Type) Type&&
@@ -79,6 +85,22 @@ using namespace std;
 # define YY_RVREF(Type)    const Type&
 # define YY_COPY(Type)     const Type&
 #endif
+
+// Support noexcept when possible.
+#if 201103L <= YY_CPLUSPLUS
+# define YY_NOEXCEPT noexcept
+# define YY_NOTHROW
+#else
+# define YY_NOEXCEPT
+# define YY_NOTHROW throw ()
+#endif
+
+// Support constexpr when possible.
+#if 201703 <= YY_CPLUSPLUS
+# define YY_CONSTEXPR constexpr
+#else
+# define YY_CONSTEXPR
+#endif
 # include "location.hh"
 #include <typeinfo>
 #ifndef YYASSERT
@@ -156,193 +178,80 @@ using namespace std;
 # endif /* ! defined YYDEBUG */
 #endif  /* ! defined PARSER4_DEBUG */
 
-#line 14 "dhcp4_parser.yy" // lalr1.cc:404
+#line 14 "dhcp4_parser.yy"
 namespace isc { namespace dhcp {
-#line 162 "dhcp4_parser.h" // lalr1.cc:404
-
-  /// A stack with random access from its top.
-  template <typename T, typename S = std::vector<T> >
-  class stack
-  {
-  public:
-    // Hide our reversed order.
-    typedef typename S::reverse_iterator iterator;
-    typedef typename S::const_reverse_iterator const_iterator;
-    typedef typename S::size_type size_type;
-
-    stack (size_type n = 200)
-      : seq_ (n)
-    {}
-
-    /// Random access.
-    ///
-    /// Index 0 returns the topmost element.
-    T&
-    operator[] (size_type i)
-    {
-      return seq_[size () - 1 - i];
-    }
-
-    /// Random access.
-    ///
-    /// Index 0 returns the topmost element.
-    T&
-    operator[] (int i)
-    {
-      return operator[] (size_type (i));
-    }
-
-    /// Random access.
-    ///
-    /// Index 0 returns the topmost element.
-    const T&
-    operator[] (size_type i) const
-    {
-      return seq_[size () - 1 - i];
-    }
-
-    /// Random access.
-    ///
-    /// Index 0 returns the topmost element.
-    const T&
-    operator[] (int i) const
-    {
-      return operator[] (size_type (i));
-    }
-
-    /// Steal the contents of \a t.
-    ///
-    /// Close to move-semantics.
-    void
-    push (YY_MOVE_REF (T) t)
-    {
-      seq_.push_back (T ());
-      operator[](0).move (t);
-    }
-
-    void
-    pop (int n = 1)
-    {
-      for (; 0 < n; --n)
-        seq_.pop_back ();
-    }
-
-    void
-    clear ()
-    {
-      seq_.clear ();
-    }
-
-    size_type
-    size () const
-    {
-      return seq_.size ();
-    }
+#line 184 "dhcp4_parser.h"
 
-    const_iterator
-    begin () const
-    {
-      return seq_.rbegin ();
-    }
 
-    const_iterator
-    end () const
-    {
-      return seq_.rend ();
-    }
 
-  private:
-    stack (const stack&);
-    stack& operator= (const stack&);
-    /// The wrapped container.
-    S seq_;
-  };
 
-  /// Present a slice of the top of a stack.
-  template <typename T, typename S = stack<T> >
-  class slice
+  /// A Bison parser.
+  class Dhcp4Parser
   {
   public:
-    slice (const S& stack, int range)
-      : stack_ (stack)
-      , range_ (range)
-    {}
-
-    const T&
-    operator[] (int i) const
-    {
-      return stack_[range_ - i];
-    }
-
-  private:
-    const S& stack_;
-    int range_;
-  };
-
-
-
-  /// A char[S] buffer to store and retrieve objects.
+#ifndef PARSER4_STYPE
+  /// A buffer to store and retrieve objects.
   ///
   /// Sort of a variant, but does not keep track of the nature
   /// of the stored data, since that knowledge is available
-  /// via the current state.
-  template <size_t S>
-  struct variant
+  /// via the current parser state.
+  class semantic_type
   {
+  public:
     /// Type of *this.
-    typedef variant<S> self_type;
+    typedef semantic_type self_type;
 
     /// Empty construction.
-    variant ()
+    semantic_type () YY_NOEXCEPT
       : yybuffer_ ()
       , yytypeid_ (YY_NULLPTR)
     {}
 
     /// Construct and fill.
     template <typename T>
-    variant (YY_RVREF (T) t)
+    semantic_type (YY_RVREF (T) t)
       : yytypeid_ (&typeid (T))
     {
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       new (yyas_<T> ()) T (YY_MOVE (t));
     }
 
     /// Destruction, allowed only if empty.
-    ~variant ()
+    ~semantic_type () YY_NOEXCEPT
     {
       YYASSERT (!yytypeid_);
     }
 
-    /// Instantiate an empty \a T in here.
-    template <typename T>
+# if 201103L <= YY_CPLUSPLUS
+    /// Instantiate a \a T in here from \a t.
+    template <typename T, typename... U>
     T&
-    emplace ()
+    emplace (U&&... u)
     {
       YYASSERT (!yytypeid_);
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       yytypeid_ = & typeid (T);
-      return *new (yyas_<T> ()) T ();
+      return *new (yyas_<T> ()) T (std::forward <U>(u)...);
     }
-
-# if defined __cplusplus && 201103L <= __cplusplus
-    /// Instantiate a \a T in here from \a t.
-    template <typename T, typename U>
+# else
+    /// Instantiate an empty \a T in here.
+    template <typename T>
     T&
-    emplace (U&& u)
+    emplace ()
     {
       YYASSERT (!yytypeid_);
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       yytypeid_ = & typeid (T);
-      return *new (yyas_<T> ()) T (std::forward <U>(u));
+      return *new (yyas_<T> ()) T ();
     }
-# else
+
     /// Instantiate a \a T in here from \a t.
     template <typename T>
     T&
     emplace (const T& t)
     {
       YYASSERT (!yytypeid_);
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       yytypeid_ = & typeid (T);
       return *new (yyas_<T> ()) T (t);
     }
@@ -369,75 +278,75 @@ namespace isc { namespace dhcp {
     /// Accessor to a built \a T.
     template <typename T>
     T&
-    as ()
+    as () YY_NOEXCEPT
     {
       YYASSERT (yytypeid_);
       YYASSERT (*yytypeid_ == typeid (T));
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       return *yyas_<T> ();
     }
 
     /// Const accessor to a built \a T (for %printer).
     template <typename T>
     const T&
-    as () const
+    as () const YY_NOEXCEPT
     {
       YYASSERT (yytypeid_);
       YYASSERT (*yytypeid_ == typeid (T));
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       return *yyas_<T> ();
     }
 
-    /// Swap the content with \a other, of same type.
+    /// Swap the content with \a that, of same type.
     ///
     /// Both variants must be built beforehand, because swapping the actual
     /// data requires reading it (with as()), and this is not possible on
     /// unconstructed variants: it would require some dynamic testing, which
     /// should not be the variant's responsibility.
     /// Swapping between built and (possibly) non-built is done with
-    /// variant::move ().
+    /// self_type::move ().
     template <typename T>
     void
-    swap (self_type& other)
+    swap (self_type& that) YY_NOEXCEPT
     {
       YYASSERT (yytypeid_);
-      YYASSERT (*yytypeid_ == *other.yytypeid_);
-      std::swap (as<T> (), other.as<T> ());
+      YYASSERT (*yytypeid_ == *that.yytypeid_);
+      std::swap (as<T> (), that.as<T> ());
     }
 
-    /// Move the content of \a other to this.
+    /// Move the content of \a that to this.
     ///
-    /// Destroys \a other.
+    /// Destroys \a that.
     template <typename T>
     void
-    move (self_type& other)
+    move (self_type& that)
     {
-# if defined __cplusplus && 201103L <= __cplusplus
-      emplace<T> (std::move (other.as<T> ()));
+# if 201103L <= YY_CPLUSPLUS
+      emplace<T> (std::move (that.as<T> ()));
 # else
       emplace<T> ();
-      swap<T> (other);
+      swap<T> (that);
 # endif
-      other.destroy<T> ();
+      that.destroy<T> ();
     }
 
-# if defined __cplusplus && 201103L <= __cplusplus
-    /// Move the content of \a other to this.
+# if 201103L <= YY_CPLUSPLUS
+    /// Move the content of \a that to this.
     template <typename T>
     void
-    move (self_type&& other)
+    move (self_type&& that)
     {
-      emplace<T> (std::move (other.as<T> ()));
-      other.destroy<T> ();
+      emplace<T> (std::move (that.as<T> ()));
+      that.destroy<T> ();
     }
 #endif
 
-    /// Copy the content of \a other to this.
+    /// Copy the content of \a that to this.
     template <typename T>
     void
-    copy (const self_type& other)
+    copy (const self_type& that)
     {
-      emplace<T> (other.as<T> ());
+      emplace<T> (that.as<T> ());
     }
 
     /// Destroy the stored \a T.
@@ -452,12 +361,12 @@ namespace isc { namespace dhcp {
   private:
     /// Prohibit blind copies.
     self_type& operator= (const self_type&);
-    variant (const self_type&);
+    semantic_type (const self_type&);
 
     /// Accessor to raw memory as \a T.
     template <typename T>
     T*
-    yyas_ ()
+    yyas_ () YY_NOEXCEPT
     {
       void *yyp = yybuffer_.yyraw;
       return static_cast<T*> (yyp);
@@ -466,30 +375,12 @@ namespace isc { namespace dhcp {
     /// Const accessor to raw memory as \a T.
     template <typename T>
     const T*
-    yyas_ () const
+    yyas_ () const YY_NOEXCEPT
     {
       const void *yyp = yybuffer_.yyraw;
       return static_cast<const T*> (yyp);
      }
 
-    union
-    {
-      /// Strongest alignment constraints.
-      long double yyalign_me;
-      /// A buffer large enough to store any of the semantic values.
-      char yyraw[S];
-    } yybuffer_;
-
-    /// Whether the content is built: if defined, the name of the stored type.
-    const std::type_info *yytypeid_;
-  };
-
-
-  /// A Bison parser.
-  class Dhcp4Parser
-  {
-  public:
-#ifndef PARSER4_STYPE
     /// An auxiliary type to compute the largest semantic type.
     union union_type
     {
@@ -514,10 +405,24 @@ namespace isc { namespace dhcp {
 
       // "constant string"
       char dummy5[sizeof (std::string)];
-};
+    };
+
+    /// The size of the largest semantic type.
+    enum { size = sizeof (union_type) };
+
+    /// A buffer to store semantic values.
+    union
+    {
+      /// Strongest alignment constraints.
+      long double yyalign_me;
+      /// A buffer large enough to store any of the semantic values.
+      char yyraw[size];
+    } yybuffer_;
+
+    /// Whether the content is built: if defined, the name of the stored type.
+    const std::type_info *yytypeid_;
+  };
 
-    /// Symbol semantic values.
-    typedef variant<sizeof (union_type)> semantic_type;
 #else
     typedef PARSER4_STYPE semantic_type;
 #endif
@@ -527,7 +432,18 @@ namespace isc { namespace dhcp {
     /// Syntax errors thrown from user actions.
     struct syntax_error : std::runtime_error
     {
-      syntax_error (const location_type& l, const std::string& m);
+      syntax_error (const location_type& l, const std::string& m)
+        : std::runtime_error (m)
+        , location (l)
+      {}
+
+      syntax_error (const syntax_error& s)
+        : std::runtime_error (s.what ())
+        , location (s.location)
+      {}
+
+      ~syntax_error () YY_NOEXCEPT YY_NOTHROW;
+
       location_type location;
     };
 
@@ -747,29 +663,155 @@ namespace isc { namespace dhcp {
       typedef Base super_type;
 
       /// Default constructor.
-      basic_symbol ();
-
-      /// Move or copy constructor.
-      basic_symbol (YY_RVREF (basic_symbol) other);
+      basic_symbol ()
+        : value ()
+        , location ()
+      {}
+
+#if 201103L <= YY_CPLUSPLUS
+      /// Move constructor.
+      basic_symbol (basic_symbol&& that);
+#endif
 
+      /// Copy constructor.
+      basic_symbol (const basic_symbol& that);
 
       /// Constructor for valueless symbols, and symbols from each type.
-      basic_symbol (typename Base::kind_type t, YY_RVREF (location_type) l);
-      basic_symbol (typename Base::kind_type t, YY_RVREF (ElementPtr) v, YY_RVREF (location_type) l);
-      basic_symbol (typename Base::kind_type t, YY_RVREF (bool) v, YY_RVREF (location_type) l);
-      basic_symbol (typename Base::kind_type t, YY_RVREF (double) v, YY_RVREF (location_type) l);
-      basic_symbol (typename Base::kind_type t, YY_RVREF (int64_t) v, YY_RVREF (location_type) l);
-      basic_symbol (typename Base::kind_type t, YY_RVREF (std::string) v, YY_RVREF (location_type) l);
-
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, location_type&& l)
+        : Base (t)
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const location_type& l)
+        : Base (t)
+        , location (l)
+      {}
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, ElementPtr&& v, location_type&& l)
+        : Base (t)
+        , value (std::move (v))
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const ElementPtr& v, const location_type& l)
+        : Base (t)
+        , value (v)
+        , location (l)
+      {}
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, bool&& v, location_type&& l)
+        : Base (t)
+        , value (std::move (v))
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const bool& v, const location_type& l)
+        : Base (t)
+        , value (v)
+        , location (l)
+      {}
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, double&& v, location_type&& l)
+        : Base (t)
+        , value (std::move (v))
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const double& v, const location_type& l)
+        : Base (t)
+        , value (v)
+        , location (l)
+      {}
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, int64_t&& v, location_type&& l)
+        : Base (t)
+        , value (std::move (v))
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const int64_t& v, const location_type& l)
+        : Base (t)
+        , value (v)
+        , location (l)
+      {}
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, std::string&& v, location_type&& l)
+        : Base (t)
+        , value (std::move (v))
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const std::string& v, const location_type& l)
+        : Base (t)
+        , value (v)
+        , location (l)
+      {}
+#endif
 
       /// Destroy the symbol.
-      ~basic_symbol ();
+      ~basic_symbol ()
+      {
+        clear ();
+      }
 
       /// Destroy contents, and record that is empty.
-      void clear ();
+      void clear ()
+      {
+        // User destructor.
+        symbol_number_type yytype = this->type_get ();
+        basic_symbol<Base>& yysym = *this;
+        (void) yysym;
+        switch (yytype)
+        {
+       default:
+          break;
+        }
+
+        // Type destructor.
+switch (yytype)
+    {
+      case 201: // value
+      case 205: // map_value
+      case 246: // ddns_replace_client_name_value
+      case 265: // socket_type
+      case 268: // outbound_interface_value
+      case 290: // db_type
+      case 377: // hr_mode
+      case 524: // ncr_protocol_value
+        value.template destroy< ElementPtr > ();
+        break;
+
+      case 184: // "boolean"
+        value.template destroy< bool > ();
+        break;
+
+      case 183: // "floating point"
+        value.template destroy< double > ();
+        break;
+
+      case 182: // "integer"
+        value.template destroy< int64_t > ();
+        break;
+
+      case 181: // "constant string"
+        value.template destroy< std::string > ();
+        break;
+
+      default:
+        break;
+    }
+
+        Base::clear ();
+      }
 
       /// Whether empty.
-      bool empty () const;
+      bool empty () const YY_NOEXCEPT;
 
       /// Destructive move, \a s is emptied into this.
       void move (basic_symbol& s);
@@ -781,9 +823,9 @@ namespace isc { namespace dhcp {
       location_type location;
 
     private:
-#if !defined __cplusplus || __cplusplus < 201103L
+#if YY_CPLUSPLUS < 201103L
       /// Assignment operator.
-      basic_symbol& operator= (const basic_symbol& other);
+      basic_symbol& operator= (const basic_symbol& that);
 #endif
     };
 
@@ -793,8 +835,13 @@ namespace isc { namespace dhcp {
       /// Default constructor.
       by_type ();
 
+#if 201103L <= YY_CPLUSPLUS
+      /// Move constructor.
+      by_type (by_type&& that);
+#endif
+
       /// Copy constructor.
-      by_type (const by_type& other);
+      by_type (const by_type& that);
 
       /// The symbol type as needed by the constructor.
       typedef token_type kind_type;
@@ -810,10 +857,10 @@ namespace isc { namespace dhcp {
 
       /// The (internal) type number (corresponding to \a type).
       /// \a empty when empty.
-      symbol_number_type type_get () const;
+      symbol_number_type type_get () const YY_NOEXCEPT;
 
       /// The token.
-      token_type token () const;
+      token_type token () const YY_NOEXCEPT;
 
       /// The symbol type.
       /// \a empty_symbol when empty.
@@ -822,7 +869,81 @@ namespace isc { namespace dhcp {
     };
 
     /// "External" symbols: returned by the scanner.
-    typedef basic_symbol<by_type> symbol_type;
+    struct symbol_type : basic_symbol<by_type>
+    {
+      /// Superclass.
+      typedef basic_symbol<by_type> super_type;
+
+      /// Empty symbol.
+      symbol_type () {}
+
+      /// Constructor for valueless symbols, and symbols from each type.
+#if 201103L <= YY_CPLUSPLUS
+      symbol_type (int tok, location_type l)
+        : super_type(token_type (tok), std::move (l))
+      {
+        YYASSERT (tok == token::TOKEN_END || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP4 || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_DHCP_SOCKET_TYPE || tok == token::TOKEN_RAW || tok == token::TOKEN_UDP || tok == token::TOKEN_OUTBOUND_INTERFACE || tok == token::TOKEN_SAME_AS_INBOUND || tok == token::TOKEN_USE_ROUTING || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_ECHO_CLIENT_ID || tok == token::TOKEN_MATCH_CLIENT_ID || tok == token::TOKEN_AUTHORITATIVE || tok == token::TOKEN_NEXT_SERVER || tok == token::TOKEN_SERVER_HOSTNAME || tok == token::TOKEN_BOOT_FILE_NAME || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_SUBNET4 || tok == token::TOKEN_SUBNET_4O6_INTERFACE || tok == token::TOKEN_SUBNET_4O6_INTERFACE_ID || tok == token::TOKEN_SUBNET_4O6_SUBNET || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_ID || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_CIRCUIT_ID || tok == token::TOKEN_CLIENT_ID || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_LOGGING || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_DHCP6 || tok == token::TOKEN_DHCPDDNS || tok == token::TOKEN_CONTROL_AGENT || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP4 || tok == token::TOKEN_SUB_DHCP4 || tok == token::TOKEN_SUB_INTERFACES4 || tok == token::TOKEN_SUB_SUBNET4 || tok == token::TOKEN_SUB_POOL4 || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_LOGGING || tok == token::TOKEN_SUB_CONFIG_CONTROL);
+      }
+#else
+      symbol_type (int tok, const location_type& l)
+        : super_type(token_type (tok), l)
+      {
+        YYASSERT (tok == token::TOKEN_END || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP4 || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_DHCP_SOCKET_TYPE || tok == token::TOKEN_RAW || tok == token::TOKEN_UDP || tok == token::TOKEN_OUTBOUND_INTERFACE || tok == token::TOKEN_SAME_AS_INBOUND || tok == token::TOKEN_USE_ROUTING || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_ECHO_CLIENT_ID || tok == token::TOKEN_MATCH_CLIENT_ID || tok == token::TOKEN_AUTHORITATIVE || tok == token::TOKEN_NEXT_SERVER || tok == token::TOKEN_SERVER_HOSTNAME || tok == token::TOKEN_BOOT_FILE_NAME || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_SUBNET4 || tok == token::TOKEN_SUBNET_4O6_INTERFACE || tok == token::TOKEN_SUBNET_4O6_INTERFACE_ID || tok == token::TOKEN_SUBNET_4O6_SUBNET || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_ID || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_CIRCUIT_ID || tok == token::TOKEN_CLIENT_ID || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_LOGGING || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_DHCP6 || tok == token::TOKEN_DHCPDDNS || tok == token::TOKEN_CONTROL_AGENT || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP4 || tok == token::TOKEN_SUB_DHCP4 || tok == token::TOKEN_SUB_INTERFACES4 || tok == token::TOKEN_SUB_SUBNET4 || tok == token::TOKEN_SUB_POOL4 || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_LOGGING || tok == token::TOKEN_SUB_CONFIG_CONTROL);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      symbol_type (int tok, bool v, location_type l)
+        : super_type(token_type (tok), std::move (v), std::move (l))
+      {
+        YYASSERT (tok == token::TOKEN_BOOLEAN);
+      }
+#else
+      symbol_type (int tok, const bool& v, const location_type& l)
+        : super_type(token_type (tok), v, l)
+      {
+        YYASSERT (tok == token::TOKEN_BOOLEAN);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      symbol_type (int tok, double v, location_type l)
+        : super_type(token_type (tok), std::move (v), std::move (l))
+      {
+        YYASSERT (tok == token::TOKEN_FLOAT);
+      }
+#else
+      symbol_type (int tok, const double& v, const location_type& l)
+        : super_type(token_type (tok), v, l)
+      {
+        YYASSERT (tok == token::TOKEN_FLOAT);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      symbol_type (int tok, int64_t v, location_type l)
+        : super_type(token_type (tok), std::move (v), std::move (l))
+      {
+        YYASSERT (tok == token::TOKEN_INTEGER);
+      }
+#else
+      symbol_type (int tok, const int64_t& v, const location_type& l)
+        : super_type(token_type (tok), v, l)
+      {
+        YYASSERT (tok == token::TOKEN_INTEGER);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      symbol_type (int tok, std::string v, location_type l)
+        : super_type(token_type (tok), std::move (v), std::move (l))
+      {
+        YYASSERT (tok == token::TOKEN_STRING);
+      }
+#else
+      symbol_type (int tok, const std::string& v, const location_type& l)
+        : super_type(token_type (tok), v, l)
+      {
+        YYASSERT (tok == token::TOKEN_STRING);
+      }
+#endif
+    };
 
     /// Build a parser object.
     Dhcp4Parser (isc::dhcp::Parser4Context& ctx_yyarg);
@@ -858,2560 +979,3356 @@ namespace isc { namespace dhcp {
     /// Report a syntax error.
     void error (const syntax_error& err);
 
-    // Symbol constructors declarations.
-    static
-    symbol_type
-    make_END (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_COMMA (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_COLON (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LSQUARE_BRACKET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RSQUARE_BRACKET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LCURLY_BRACKET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RCURLY_BRACKET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NULL_TYPE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP4 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONFIG_CONTROL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONFIG_DATABASES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONFIG_FETCH_WAIT_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_INTERFACES_CONFIG (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_INTERFACES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP_SOCKET_TYPE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RAW (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_UDP (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OUTBOUND_INTERFACE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SAME_AS_INBOUND (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_USE_ROUTING (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RE_DETECT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SANITY_CHECKS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LEASE_CHECKS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ECHO_CLIENT_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MATCH_CLIENT_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_AUTHORITATIVE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NEXT_SERVER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SERVER_HOSTNAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_BOOT_FILE_NAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LEASE_DATABASE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOSTS_DATABASE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOSTS_DATABASES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TYPE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MEMFILE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MYSQL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_POSTGRESQL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CQL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_USER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PASSWORD (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOST (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PORT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PERSIST (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LFC_INTERVAL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_READONLY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONNECT_TIMEOUT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONTACT_POINTS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_KEYSPACE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONSISTENCY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SERIAL_CONSISTENCY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_RECONNECT_TRIES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RECONNECT_WAIT_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_REQUEST_TIMEOUT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TCP_KEEPALIVE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TCP_NODELAY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_ROW_ERRORS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_VALID_LIFETIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MIN_VALID_LIFETIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_VALID_LIFETIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RENEW_TIMER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_REBIND_TIMER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CALCULATE_TEE_TIMES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_T1_PERCENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_T2_PERCENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DECLINE_PROBATION_PERIOD (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SERVER_TAG (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_SEND_UPDATES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_OVERRIDE_NO_UPDATE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_OVERRIDE_CLIENT_UPDATE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_REPLACE_CLIENT_NAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_GENERATED_PREFIX (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_QUALIFYING_SUFFIX (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUBNET4 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUBNET_4O6_INTERFACE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUBNET_4O6_INTERFACE_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUBNET_4O6_SUBNET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OPTION_DEF (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OPTION_DATA (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DATA (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CODE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SPACE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CSV_FORMAT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ALWAYS_SEND (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RECORD_TYPES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ENCAPSULATE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ARRAY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SHARED_NETWORKS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_POOLS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_POOL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_USER_CONTEXT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_COMMENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUBNET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_INTERFACE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RESERVATION_MODE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DISABLED (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OUT_OF_POOL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_GLOBAL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ALL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOST_RESERVATION_IDENTIFIERS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CLIENT_CLASSES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_REQUIRE_CLIENT_CLASSES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TEST (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ONLY_IF_REQUIRED (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CLIENT_CLASS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RESERVATIONS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DUID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HW_ADDRESS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CIRCUIT_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CLIENT_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOSTNAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_FLEX_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RELAY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_IP_ADDRESS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_IP_ADDRESSES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOOKS_LIBRARIES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LIBRARY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PARAMETERS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_EXPIRED_LEASES_PROCESSING (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RECLAIM_TIMER_WAIT_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOLD_RECLAIMED_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_RECLAIM_LEASES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_RECLAIM_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_UNWARNED_RECLAIM_CYCLES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP4O6_PORT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONTROL_SOCKET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SOCKET_TYPE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SOCKET_NAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP_QUEUE_CONTROL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP_DDNS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ENABLE_UPDATES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_QUALIFYING_SUFFIX (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SERVER_IP (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SERVER_PORT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SENDER_IP (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SENDER_PORT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_QUEUE_SIZE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NCR_PROTOCOL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NCR_FORMAT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OVERRIDE_NO_UPDATE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OVERRIDE_CLIENT_UPDATE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_REPLACE_CLIENT_NAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_GENERATED_PREFIX (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TCP (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_JSON (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_WHEN_PRESENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NEVER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ALWAYS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_WHEN_NOT_PRESENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOSTNAME_CHAR_SET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOSTNAME_CHAR_REPLACEMENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LOGGING (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LOGGERS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OUTPUT_OPTIONS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OUTPUT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DEBUGLEVEL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SEVERITY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_FLUSH (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAXSIZE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAXVER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PATTERN (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP6 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCPDDNS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONTROL_AGENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TOPLEVEL_JSON (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TOPLEVEL_DHCP4 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_DHCP4 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_INTERFACES4 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_SUBNET4 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_POOL4 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_RESERVATION (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_OPTION_DEFS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_OPTION_DEF (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_OPTION_DATA (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_HOOKS_LIBRARY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_DHCP_DDNS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_LOGGING (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_CONFIG_CONTROL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_STRING (YY_COPY (std::string) v, YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_INTEGER (YY_COPY (int64_t) v, YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_FLOAT (YY_COPY (double) v, YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_BOOLEAN (YY_COPY (bool) v, YY_COPY (location_type) l);
-
-
-
-  private:
-    /// This class is not copyable.
-    Dhcp4Parser (const Dhcp4Parser&);
-    Dhcp4Parser& operator= (const Dhcp4Parser&);
-
-    /// State numbers.
-    typedef int state_type;
-
-    /// Generate an error message.
-    /// \param yystate   the state where the error occurred.
-    /// \param yyla      the lookahead token.
-    virtual std::string yysyntax_error_ (state_type yystate,
-                                         const symbol_type& yyla) const;
-
-    /// Compute post-reduction state.
-    /// \param yystate   the current state
-    /// \param yysym     the nonterminal to push on the stack
-    state_type yy_lr_goto_state_ (state_type yystate, int yysym);
-
-    /// Whether the given \c yypact_ value indicates a defaulted state.
-    /// \param yyvalue   the value to check
-    static bool yy_pact_value_is_default_ (int yyvalue);
-
-    /// Whether the given \c yytable_ value indicates a syntax error.
-    /// \param yyvalue   the value to check
-    static bool yy_table_value_is_error_ (int yyvalue);
-
-    static const short yypact_ninf_;
-    static const signed char yytable_ninf_;
-
-    /// Convert a scanner token number \a t to a symbol number.
-    static token_number_type yytranslate_ (token_type t);
-
-    // Tables.
-  // YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-  // STATE-NUM.
-  static const short yypact_[];
-
-  // YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-  // Performed when YYTABLE does not specify something else to do.  Zero
-  // means the default is an error.
-  static const unsigned short yydefact_[];
-
-  // YYPGOTO[NTERM-NUM].
-  static const short yypgoto_[];
-
-  // YYDEFGOTO[NTERM-NUM].
-  static const short yydefgoto_[];
-
-  // YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-  // positive, shift that token.  If negative, reduce the rule whose
-  // number is the opposite.  If YYTABLE_NINF, syntax error.
-  static const unsigned short yytable_[];
-
-  static const short yycheck_[];
-
-  // YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-  // symbol of state STATE-NUM.
-  static const unsigned short yystos_[];
-
-  // YYR1[YYN] -- Symbol number of symbol that rule YYN derives.
-  static const unsigned short yyr1_[];
-
-  // YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.
-  static const unsigned char yyr2_[];
-
-
-    /// Convert the symbol name \a n to a form suitable for a diagnostic.
-    static std::string yytnamerr_ (const char *n);
-
-
-    /// For a symbol, its name in clear.
-    static const char* const yytname_[];
-#if PARSER4_DEBUG
-  // YYRLINE[YYN] -- Source line where rule number YYN was defined.
-  static const unsigned short yyrline_[];
-    /// Report on the debug stream that the rule \a r is going to be reduced.
-    virtual void yy_reduce_print_ (int r);
-    /// Print the state stack on the debug stream.
-    virtual void yystack_print_ ();
-
-    /// Debugging level.
-    int yydebug_;
-    /// Debug stream.
-    std::ostream* yycdebug_;
-
-    /// \brief Display a symbol type, value and location.
-    /// \param yyo    The output stream.
-    /// \param yysym  The symbol.
-    template <typename Base>
-    void yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const;
-#endif
-
-    /// \brief Reclaim the memory associated to a symbol.
-    /// \param yymsg     Why this token is reclaimed.
-    ///                  If null, print nothing.
-    /// \param yysym     The symbol.
-    template <typename Base>
-    void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
-
-  private:
-    /// Type access provider for state based symbols.
-    struct by_state
-    {
-      /// Default constructor.
-      by_state ();
-
-      /// The symbol type as needed by the constructor.
-      typedef state_type kind_type;
-
-      /// Constructor.
-      by_state (kind_type s);
-
-      /// Copy constructor.
-      by_state (const by_state& other);
-
-      /// Record that this symbol is empty.
-      void clear ();
-
-      /// Steal the symbol type from \a that.
-      void move (by_state& that);
-
-      /// The (internal) type number (corresponding to \a state).
-      /// \a empty_symbol when empty.
-      symbol_number_type type_get () const;
-
-      /// The state number used to denote an empty symbol.
-      enum { empty_state = -1 };
-
-      /// The state.
-      /// \a empty when empty.
-      state_type state;
-    };
-
-    /// "Internal" symbol: element of the stack.
-    struct stack_symbol_type : basic_symbol<by_state>
-    {
-      /// Superclass.
-      typedef basic_symbol<by_state> super_type;
-      /// Construct an empty symbol.
-      stack_symbol_type ();
-      /// Move or copy construction.
-      stack_symbol_type (YY_RVREF (stack_symbol_type) that);
-      /// Steal the contents from \a sym to build this.
-      stack_symbol_type (state_type s, YY_MOVE_REF (symbol_type) sym);
-#if !defined __cplusplus || __cplusplus < 201103L
-      /// Assignment, needed by push_back by some old implementations.
-      /// Moves the contents of that.
-      stack_symbol_type& operator= (stack_symbol_type& that);
-#endif
-    };
-
-    /// Stack type.
-    typedef stack<stack_symbol_type> stack_type;
-
-    /// The stack.
-    stack_type yystack_;
-
-    /// Push a new state on the stack.
-    /// \param m    a debug message to display
-    ///             if null, no trace is output.
-    /// \param sym  the symbol
-    /// \warning the contents of \a s.value is stolen.
-    void yypush_ (const char* m, YY_MOVE_REF (stack_symbol_type) sym);
-
-    /// Push a new look ahead token on the state on the stack.
-    /// \param m    a debug message to display
-    ///             if null, no trace is output.
-    /// \param s    the state
-    /// \param sym  the symbol (for its value and location).
-    /// \warning the contents of \a sym.value is stolen.
-    void yypush_ (const char* m, state_type s, YY_MOVE_REF (symbol_type) sym);
-
-    /// Pop \a n symbols from the stack.
-    void yypop_ (int n = 1);
-
-    /// Constants.
-    enum
-    {
-      yyeof_ = 0,
-      yylast_ = 1127,     ///< Last index in yytable_.
-      yynnts_ = 399,  ///< Number of nonterminal symbols.
-      yyfinal_ = 30, ///< Termination state number.
-      yyterror_ = 1,
-      yyerrcode_ = 256,
-      yyntokens_ = 185  ///< Number of tokens.
-    };
-
-
-    // User arguments.
-    isc::dhcp::Parser4Context& ctx;
-  };
-
-  // Symbol number corresponding to token number t.
-  inline
-  Dhcp4Parser::token_number_type
-  Dhcp4Parser::yytranslate_ (token_type t)
-  {
-    static
-    const token_number_type
-    translate_table[] =
-    {
-     0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184
-    };
-    const unsigned user_token_number_max_ = 439;
-    const token_number_type undef_token_ = 2;
-
-    if (static_cast<int> (t) <= yyeof_)
-      return yyeof_;
-    else if (static_cast<unsigned> (t) <= user_token_number_max_)
-      return translate_table[t];
-    else
-      return undef_token_;
-  }
-
-  inline
-  Dhcp4Parser::syntax_error::syntax_error (const location_type& l, const std::string& m)
-    : std::runtime_error (m)
-    , location (l)
-  {}
-
-  // basic_symbol.
-  template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol ()
-    : value ()
-    , location ()
-  {}
-
-  template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (YY_RVREF (basic_symbol) other)
-    : Base (YY_MOVE (other))
-    , value ()
-    , location (YY_MOVE (other.location))
-  {
-    switch (other.type_get ())
-    {
-      case 201: // value
-      case 205: // map_value
-      case 246: // ddns_replace_client_name_value
-      case 265: // socket_type
-      case 268: // outbound_interface_value
-      case 290: // db_type
-      case 377: // hr_mode
-      case 524: // ncr_protocol_value
-        value.YY_MOVE_OR_COPY< ElementPtr > (YY_MOVE (other.value));
-        break;
-
-      case 184: // "boolean"
-        value.YY_MOVE_OR_COPY< bool > (YY_MOVE (other.value));
-        break;
-
-      case 183: // "floating point"
-        value.YY_MOVE_OR_COPY< double > (YY_MOVE (other.value));
-        break;
-
-      case 182: // "integer"
-        value.YY_MOVE_OR_COPY< int64_t > (YY_MOVE (other.value));
-        break;
-
-      case 181: // "constant string"
-        value.YY_MOVE_OR_COPY< std::string > (YY_MOVE (other.value));
-        break;
-
-      default:
-        break;
-    }
-
-  }
-
-
-  // Implementation of basic_symbol constructor for each type.
-  template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (location_type) l)
-    : Base (t)
-    , location (YY_MOVE (l))
-  {}
-
-  template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (ElementPtr) v, YY_RVREF (location_type) l)
-    : Base (t)
-    , value (YY_MOVE (v))
-    , location (YY_MOVE (l))
-  {}
-
-  template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (bool) v, YY_RVREF (location_type) l)
-    : Base (t)
-    , value (YY_MOVE (v))
-    , location (YY_MOVE (l))
-  {}
-
-  template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (double) v, YY_RVREF (location_type) l)
-    : Base (t)
-    , value (YY_MOVE (v))
-    , location (YY_MOVE (l))
-  {}
-
-  template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (int64_t) v, YY_RVREF (location_type) l)
-    : Base (t)
-    , value (YY_MOVE (v))
-    , location (YY_MOVE (l))
-  {}
-
-  template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (std::string) v, YY_RVREF (location_type) l)
-    : Base (t)
-    , value (YY_MOVE (v))
-    , location (YY_MOVE (l))
-  {}
-
-
-
-  template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::~basic_symbol ()
-  {
-    clear ();
-  }
-
-  template <typename Base>
-  void
-  Dhcp4Parser::basic_symbol<Base>::clear ()
-  {
-    // User destructor.
-    symbol_number_type yytype = this->type_get ();
-    basic_symbol<Base>& yysym = *this;
-    (void) yysym;
-    switch (yytype)
-    {
-   default:
-      break;
-    }
-
-    // Type destructor.
-  switch (yytype)
-    {
-      case 201: // value
-      case 205: // map_value
-      case 246: // ddns_replace_client_name_value
-      case 265: // socket_type
-      case 268: // outbound_interface_value
-      case 290: // db_type
-      case 377: // hr_mode
-      case 524: // ncr_protocol_value
-        value.template destroy< ElementPtr > ();
-        break;
-
-      case 184: // "boolean"
-        value.template destroy< bool > ();
-        break;
-
-      case 183: // "floating point"
-        value.template destroy< double > ();
-        break;
-
-      case 182: // "integer"
-        value.template destroy< int64_t > ();
-        break;
-
-      case 181: // "constant string"
-        value.template destroy< std::string > ();
-        break;
-
-      default:
-        break;
-    }
-
-    Base::clear ();
-  }
-
-  template <typename Base>
-  bool
-  Dhcp4Parser::basic_symbol<Base>::empty () const
-  {
-    return Base::type_get () == empty_symbol;
-  }
-
-  template <typename Base>
-  void
-  Dhcp4Parser::basic_symbol<Base>::move (basic_symbol& s)
-  {
-    super_type::move (s);
-    switch (this->type_get ())
-    {
-      case 201: // value
-      case 205: // map_value
-      case 246: // ddns_replace_client_name_value
-      case 265: // socket_type
-      case 268: // outbound_interface_value
-      case 290: // db_type
-      case 377: // hr_mode
-      case 524: // ncr_protocol_value
-        value.move< ElementPtr > (YY_MOVE (s.value));
-        break;
-
-      case 184: // "boolean"
-        value.move< bool > (YY_MOVE (s.value));
-        break;
-
-      case 183: // "floating point"
-        value.move< double > (YY_MOVE (s.value));
-        break;
-
-      case 182: // "integer"
-        value.move< int64_t > (YY_MOVE (s.value));
-        break;
-
-      case 181: // "constant string"
-        value.move< std::string > (YY_MOVE (s.value));
-        break;
-
-      default:
-        break;
-    }
-
-    location = YY_MOVE (s.location);
-  }
-
-  // by_type.
-  inline
-  Dhcp4Parser::by_type::by_type ()
-    : type (empty_symbol)
-  {}
-
-  inline
-  Dhcp4Parser::by_type::by_type (const by_type& other)
-    : type (other.type)
-  {}
-
-  inline
-  Dhcp4Parser::by_type::by_type (token_type t)
-    : type (yytranslate_ (t))
-  {}
-
-  inline
-  void
-  Dhcp4Parser::by_type::clear ()
-  {
-    type = empty_symbol;
-  }
-
-  inline
-  void
-  Dhcp4Parser::by_type::move (by_type& that)
-  {
-    type = that.type;
-    that.clear ();
-  }
-
-  inline
-  int
-  Dhcp4Parser::by_type::type_get () const
-  {
-    return type;
-  }
-
-  inline
-  Dhcp4Parser::token_type
-  Dhcp4Parser::by_type::token () const
-  {
-    // YYTOKNUM[NUM] -- (External) token number corresponding to the
-    // (internal) symbol number NUM (which must be that of a token).  */
-    static
-    const unsigned short
-    yytoken_number_[] =
-    {
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
-     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,   439
-    };
-    return static_cast<token_type> (yytoken_number_[type]);
-  }
-
-  // Implementation of make_symbol for each symbol type.
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_END (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_END, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_COMMA (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_COMMA, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_COLON (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_COLON, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_LSQUARE_BRACKET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LSQUARE_BRACKET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RSQUARE_BRACKET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RSQUARE_BRACKET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_LCURLY_BRACKET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LCURLY_BRACKET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RCURLY_BRACKET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RCURLY_BRACKET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_NULL_TYPE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NULL_TYPE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DHCP4 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP4, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CONFIG_CONTROL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONFIG_CONTROL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CONFIG_DATABASES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONFIG_DATABASES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CONFIG_FETCH_WAIT_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONFIG_FETCH_WAIT_TIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_INTERFACES_CONFIG (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_INTERFACES_CONFIG, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_INTERFACES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_INTERFACES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DHCP_SOCKET_TYPE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP_SOCKET_TYPE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RAW (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RAW, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_UDP (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_UDP, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_OUTBOUND_INTERFACE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OUTBOUND_INTERFACE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SAME_AS_INBOUND (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SAME_AS_INBOUND, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_USE_ROUTING (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_USE_ROUTING, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RE_DETECT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RE_DETECT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SANITY_CHECKS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SANITY_CHECKS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_LEASE_CHECKS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LEASE_CHECKS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_ECHO_CLIENT_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ECHO_CLIENT_ID, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MATCH_CLIENT_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MATCH_CLIENT_ID, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_AUTHORITATIVE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_AUTHORITATIVE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_NEXT_SERVER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NEXT_SERVER, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SERVER_HOSTNAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SERVER_HOSTNAME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_BOOT_FILE_NAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_BOOT_FILE_NAME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_LEASE_DATABASE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LEASE_DATABASE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HOSTS_DATABASE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOSTS_DATABASE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HOSTS_DATABASES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOSTS_DATABASES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_TYPE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TYPE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MEMFILE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MEMFILE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MYSQL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MYSQL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_POSTGRESQL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_POSTGRESQL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CQL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CQL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_USER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_USER, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_PASSWORD (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PASSWORD, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HOST (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOST, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_PORT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PORT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_PERSIST (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PERSIST, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_LFC_INTERVAL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LFC_INTERVAL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_READONLY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_READONLY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CONNECT_TIMEOUT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONNECT_TIMEOUT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CONTACT_POINTS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONTACT_POINTS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_KEYSPACE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_KEYSPACE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CONSISTENCY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONSISTENCY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SERIAL_CONSISTENCY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SERIAL_CONSISTENCY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MAX_RECONNECT_TRIES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_RECONNECT_TRIES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RECONNECT_WAIT_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RECONNECT_WAIT_TIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_REQUEST_TIMEOUT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_REQUEST_TIMEOUT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_TCP_KEEPALIVE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TCP_KEEPALIVE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_TCP_NODELAY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TCP_NODELAY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MAX_ROW_ERRORS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_ROW_ERRORS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_VALID_LIFETIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_VALID_LIFETIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MIN_VALID_LIFETIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MIN_VALID_LIFETIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MAX_VALID_LIFETIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_VALID_LIFETIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RENEW_TIMER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RENEW_TIMER, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_REBIND_TIMER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_REBIND_TIMER, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CALCULATE_TEE_TIMES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CALCULATE_TEE_TIMES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_T1_PERCENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_T1_PERCENT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_T2_PERCENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_T2_PERCENT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DECLINE_PROBATION_PERIOD (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DECLINE_PROBATION_PERIOD, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SERVER_TAG (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SERVER_TAG, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DDNS_SEND_UPDATES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_SEND_UPDATES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DDNS_OVERRIDE_NO_UPDATE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_OVERRIDE_NO_UPDATE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DDNS_OVERRIDE_CLIENT_UPDATE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DDNS_REPLACE_CLIENT_NAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_REPLACE_CLIENT_NAME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DDNS_GENERATED_PREFIX (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_GENERATED_PREFIX, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DDNS_QUALIFYING_SUFFIX (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_QUALIFYING_SUFFIX, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUBNET4 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUBNET4, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUBNET_4O6_INTERFACE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUBNET_4O6_INTERFACE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUBNET_4O6_INTERFACE_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUBNET_4O6_INTERFACE_ID, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUBNET_4O6_SUBNET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUBNET_4O6_SUBNET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_OPTION_DEF (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OPTION_DEF, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_OPTION_DATA (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OPTION_DATA, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_NAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NAME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DATA (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DATA, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CODE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CODE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SPACE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SPACE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CSV_FORMAT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CSV_FORMAT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_ALWAYS_SEND (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ALWAYS_SEND, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RECORD_TYPES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RECORD_TYPES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_ENCAPSULATE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ENCAPSULATE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_ARRAY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ARRAY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SHARED_NETWORKS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SHARED_NETWORKS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_POOLS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_POOLS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_POOL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_POOL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_USER_CONTEXT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_USER_CONTEXT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_COMMENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_COMMENT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUBNET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUBNET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_INTERFACE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_INTERFACE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ID, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RESERVATION_MODE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RESERVATION_MODE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DISABLED (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DISABLED, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_OUT_OF_POOL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OUT_OF_POOL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_GLOBAL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_GLOBAL, YY_MOVE (l));
-  }
+    // Implementation of make_symbol for each symbol type.
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_END (location_type l)
+      {
+        return symbol_type (token::TOKEN_END, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_END (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_END, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_COMMA (location_type l)
+      {
+        return symbol_type (token::TOKEN_COMMA, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_COMMA (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_COMMA, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_COLON (location_type l)
+      {
+        return symbol_type (token::TOKEN_COLON, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_COLON (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_COLON, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LSQUARE_BRACKET (location_type l)
+      {
+        return symbol_type (token::TOKEN_LSQUARE_BRACKET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LSQUARE_BRACKET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LSQUARE_BRACKET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RSQUARE_BRACKET (location_type l)
+      {
+        return symbol_type (token::TOKEN_RSQUARE_BRACKET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RSQUARE_BRACKET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RSQUARE_BRACKET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LCURLY_BRACKET (location_type l)
+      {
+        return symbol_type (token::TOKEN_LCURLY_BRACKET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LCURLY_BRACKET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LCURLY_BRACKET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RCURLY_BRACKET (location_type l)
+      {
+        return symbol_type (token::TOKEN_RCURLY_BRACKET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RCURLY_BRACKET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RCURLY_BRACKET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NULL_TYPE (location_type l)
+      {
+        return symbol_type (token::TOKEN_NULL_TYPE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NULL_TYPE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NULL_TYPE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP4 (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP4, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP4 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP4, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONFIG_CONTROL (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_CONTROL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONFIG_CONTROL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_CONTROL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONFIG_DATABASES (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_DATABASES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONFIG_DATABASES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_DATABASES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONFIG_FETCH_WAIT_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_FETCH_WAIT_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONFIG_FETCH_WAIT_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_FETCH_WAIT_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_INTERFACES_CONFIG (location_type l)
+      {
+        return symbol_type (token::TOKEN_INTERFACES_CONFIG, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_INTERFACES_CONFIG (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_INTERFACES_CONFIG, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_INTERFACES (location_type l)
+      {
+        return symbol_type (token::TOKEN_INTERFACES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_INTERFACES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_INTERFACES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP_SOCKET_TYPE (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP_SOCKET_TYPE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP_SOCKET_TYPE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP_SOCKET_TYPE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RAW (location_type l)
+      {
+        return symbol_type (token::TOKEN_RAW, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RAW (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RAW, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_UDP (location_type l)
+      {
+        return symbol_type (token::TOKEN_UDP, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_UDP (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_UDP, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OUTBOUND_INTERFACE (location_type l)
+      {
+        return symbol_type (token::TOKEN_OUTBOUND_INTERFACE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OUTBOUND_INTERFACE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OUTBOUND_INTERFACE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SAME_AS_INBOUND (location_type l)
+      {
+        return symbol_type (token::TOKEN_SAME_AS_INBOUND, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SAME_AS_INBOUND (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SAME_AS_INBOUND, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_USE_ROUTING (location_type l)
+      {
+        return symbol_type (token::TOKEN_USE_ROUTING, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_USE_ROUTING (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_USE_ROUTING, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RE_DETECT (location_type l)
+      {
+        return symbol_type (token::TOKEN_RE_DETECT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RE_DETECT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RE_DETECT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SANITY_CHECKS (location_type l)
+      {
+        return symbol_type (token::TOKEN_SANITY_CHECKS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SANITY_CHECKS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SANITY_CHECKS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LEASE_CHECKS (location_type l)
+      {
+        return symbol_type (token::TOKEN_LEASE_CHECKS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LEASE_CHECKS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LEASE_CHECKS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ECHO_CLIENT_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_ECHO_CLIENT_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ECHO_CLIENT_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ECHO_CLIENT_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MATCH_CLIENT_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_MATCH_CLIENT_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MATCH_CLIENT_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MATCH_CLIENT_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_AUTHORITATIVE (location_type l)
+      {
+        return symbol_type (token::TOKEN_AUTHORITATIVE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_AUTHORITATIVE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_AUTHORITATIVE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NEXT_SERVER (location_type l)
+      {
+        return symbol_type (token::TOKEN_NEXT_SERVER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NEXT_SERVER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NEXT_SERVER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SERVER_HOSTNAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_SERVER_HOSTNAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SERVER_HOSTNAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SERVER_HOSTNAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_BOOT_FILE_NAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_BOOT_FILE_NAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_BOOT_FILE_NAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_BOOT_FILE_NAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LEASE_DATABASE (location_type l)
+      {
+        return symbol_type (token::TOKEN_LEASE_DATABASE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LEASE_DATABASE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LEASE_DATABASE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOSTS_DATABASE (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOSTS_DATABASE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOSTS_DATABASE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOSTS_DATABASE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOSTS_DATABASES (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOSTS_DATABASES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOSTS_DATABASES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOSTS_DATABASES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TYPE (location_type l)
+      {
+        return symbol_type (token::TOKEN_TYPE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TYPE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TYPE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MEMFILE (location_type l)
+      {
+        return symbol_type (token::TOKEN_MEMFILE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MEMFILE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MEMFILE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MYSQL (location_type l)
+      {
+        return symbol_type (token::TOKEN_MYSQL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MYSQL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MYSQL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_POSTGRESQL (location_type l)
+      {
+        return symbol_type (token::TOKEN_POSTGRESQL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_POSTGRESQL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_POSTGRESQL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CQL (location_type l)
+      {
+        return symbol_type (token::TOKEN_CQL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CQL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CQL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_USER (location_type l)
+      {
+        return symbol_type (token::TOKEN_USER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_USER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_USER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PASSWORD (location_type l)
+      {
+        return symbol_type (token::TOKEN_PASSWORD, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PASSWORD (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PASSWORD, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOST (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOST, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOST (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOST, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PORT (location_type l)
+      {
+        return symbol_type (token::TOKEN_PORT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PORT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PORT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PERSIST (location_type l)
+      {
+        return symbol_type (token::TOKEN_PERSIST, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PERSIST (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PERSIST, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LFC_INTERVAL (location_type l)
+      {
+        return symbol_type (token::TOKEN_LFC_INTERVAL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LFC_INTERVAL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LFC_INTERVAL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_READONLY (location_type l)
+      {
+        return symbol_type (token::TOKEN_READONLY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_READONLY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_READONLY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONNECT_TIMEOUT (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONNECT_TIMEOUT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONNECT_TIMEOUT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONNECT_TIMEOUT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONTACT_POINTS (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONTACT_POINTS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONTACT_POINTS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONTACT_POINTS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_KEYSPACE (location_type l)
+      {
+        return symbol_type (token::TOKEN_KEYSPACE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_KEYSPACE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_KEYSPACE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONSISTENCY (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONSISTENCY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONSISTENCY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONSISTENCY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SERIAL_CONSISTENCY (location_type l)
+      {
+        return symbol_type (token::TOKEN_SERIAL_CONSISTENCY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SERIAL_CONSISTENCY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SERIAL_CONSISTENCY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_RECONNECT_TRIES (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECONNECT_TRIES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_RECONNECT_TRIES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECONNECT_TRIES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RECONNECT_WAIT_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_RECONNECT_WAIT_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RECONNECT_WAIT_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RECONNECT_WAIT_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_REQUEST_TIMEOUT (location_type l)
+      {
+        return symbol_type (token::TOKEN_REQUEST_TIMEOUT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_REQUEST_TIMEOUT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_REQUEST_TIMEOUT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TCP_KEEPALIVE (location_type l)
+      {
+        return symbol_type (token::TOKEN_TCP_KEEPALIVE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TCP_KEEPALIVE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TCP_KEEPALIVE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TCP_NODELAY (location_type l)
+      {
+        return symbol_type (token::TOKEN_TCP_NODELAY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TCP_NODELAY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TCP_NODELAY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_ROW_ERRORS (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_ROW_ERRORS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_ROW_ERRORS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_ROW_ERRORS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_VALID_LIFETIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_VALID_LIFETIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_VALID_LIFETIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_VALID_LIFETIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MIN_VALID_LIFETIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_MIN_VALID_LIFETIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MIN_VALID_LIFETIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MIN_VALID_LIFETIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_VALID_LIFETIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_VALID_LIFETIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_VALID_LIFETIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_VALID_LIFETIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RENEW_TIMER (location_type l)
+      {
+        return symbol_type (token::TOKEN_RENEW_TIMER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RENEW_TIMER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RENEW_TIMER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_REBIND_TIMER (location_type l)
+      {
+        return symbol_type (token::TOKEN_REBIND_TIMER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_REBIND_TIMER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_REBIND_TIMER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CALCULATE_TEE_TIMES (location_type l)
+      {
+        return symbol_type (token::TOKEN_CALCULATE_TEE_TIMES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CALCULATE_TEE_TIMES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CALCULATE_TEE_TIMES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_T1_PERCENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_T1_PERCENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_T1_PERCENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_T1_PERCENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_T2_PERCENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_T2_PERCENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_T2_PERCENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_T2_PERCENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DECLINE_PROBATION_PERIOD (location_type l)
+      {
+        return symbol_type (token::TOKEN_DECLINE_PROBATION_PERIOD, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DECLINE_PROBATION_PERIOD (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DECLINE_PROBATION_PERIOD, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SERVER_TAG (location_type l)
+      {
+        return symbol_type (token::TOKEN_SERVER_TAG, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SERVER_TAG (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SERVER_TAG, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_SEND_UPDATES (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_SEND_UPDATES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_SEND_UPDATES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_SEND_UPDATES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_OVERRIDE_NO_UPDATE (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_OVERRIDE_NO_UPDATE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_OVERRIDE_NO_UPDATE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_OVERRIDE_NO_UPDATE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_OVERRIDE_CLIENT_UPDATE (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_OVERRIDE_CLIENT_UPDATE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_REPLACE_CLIENT_NAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_REPLACE_CLIENT_NAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_REPLACE_CLIENT_NAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_REPLACE_CLIENT_NAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_GENERATED_PREFIX (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_GENERATED_PREFIX, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_GENERATED_PREFIX (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_GENERATED_PREFIX, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_QUALIFYING_SUFFIX (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_QUALIFYING_SUFFIX, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_QUALIFYING_SUFFIX (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_QUALIFYING_SUFFIX, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUBNET4 (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUBNET4, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUBNET4 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUBNET4, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUBNET_4O6_INTERFACE (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUBNET_4O6_INTERFACE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUBNET_4O6_INTERFACE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUBNET_4O6_INTERFACE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUBNET_4O6_INTERFACE_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUBNET_4O6_INTERFACE_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUBNET_4O6_INTERFACE_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUBNET_4O6_INTERFACE_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUBNET_4O6_SUBNET (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUBNET_4O6_SUBNET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUBNET_4O6_SUBNET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUBNET_4O6_SUBNET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OPTION_DEF (location_type l)
+      {
+        return symbol_type (token::TOKEN_OPTION_DEF, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OPTION_DEF (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OPTION_DEF, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OPTION_DATA (location_type l)
+      {
+        return symbol_type (token::TOKEN_OPTION_DATA, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OPTION_DATA (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OPTION_DATA, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_NAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DATA (location_type l)
+      {
+        return symbol_type (token::TOKEN_DATA, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DATA (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DATA, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CODE (location_type l)
+      {
+        return symbol_type (token::TOKEN_CODE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CODE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CODE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SPACE (location_type l)
+      {
+        return symbol_type (token::TOKEN_SPACE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SPACE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SPACE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CSV_FORMAT (location_type l)
+      {
+        return symbol_type (token::TOKEN_CSV_FORMAT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CSV_FORMAT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CSV_FORMAT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ALWAYS_SEND (location_type l)
+      {
+        return symbol_type (token::TOKEN_ALWAYS_SEND, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ALWAYS_SEND (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ALWAYS_SEND, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RECORD_TYPES (location_type l)
+      {
+        return symbol_type (token::TOKEN_RECORD_TYPES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RECORD_TYPES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RECORD_TYPES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ENCAPSULATE (location_type l)
+      {
+        return symbol_type (token::TOKEN_ENCAPSULATE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ENCAPSULATE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ENCAPSULATE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ARRAY (location_type l)
+      {
+        return symbol_type (token::TOKEN_ARRAY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ARRAY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ARRAY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SHARED_NETWORKS (location_type l)
+      {
+        return symbol_type (token::TOKEN_SHARED_NETWORKS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SHARED_NETWORKS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SHARED_NETWORKS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_POOLS (location_type l)
+      {
+        return symbol_type (token::TOKEN_POOLS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_POOLS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_POOLS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_POOL (location_type l)
+      {
+        return symbol_type (token::TOKEN_POOL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_POOL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_POOL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_USER_CONTEXT (location_type l)
+      {
+        return symbol_type (token::TOKEN_USER_CONTEXT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_USER_CONTEXT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_USER_CONTEXT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_COMMENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_COMMENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_COMMENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_COMMENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUBNET (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUBNET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUBNET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUBNET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_INTERFACE (location_type l)
+      {
+        return symbol_type (token::TOKEN_INTERFACE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_INTERFACE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_INTERFACE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RESERVATION_MODE (location_type l)
+      {
+        return symbol_type (token::TOKEN_RESERVATION_MODE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RESERVATION_MODE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RESERVATION_MODE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DISABLED (location_type l)
+      {
+        return symbol_type (token::TOKEN_DISABLED, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DISABLED (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DISABLED, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OUT_OF_POOL (location_type l)
+      {
+        return symbol_type (token::TOKEN_OUT_OF_POOL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OUT_OF_POOL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OUT_OF_POOL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_GLOBAL (location_type l)
+      {
+        return symbol_type (token::TOKEN_GLOBAL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_GLOBAL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_GLOBAL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ALL (location_type l)
+      {
+        return symbol_type (token::TOKEN_ALL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ALL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ALL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOST_RESERVATION_IDENTIFIERS (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOST_RESERVATION_IDENTIFIERS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOST_RESERVATION_IDENTIFIERS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOST_RESERVATION_IDENTIFIERS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CLIENT_CLASSES (location_type l)
+      {
+        return symbol_type (token::TOKEN_CLIENT_CLASSES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CLIENT_CLASSES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CLIENT_CLASSES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_REQUIRE_CLIENT_CLASSES (location_type l)
+      {
+        return symbol_type (token::TOKEN_REQUIRE_CLIENT_CLASSES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_REQUIRE_CLIENT_CLASSES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_REQUIRE_CLIENT_CLASSES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TEST (location_type l)
+      {
+        return symbol_type (token::TOKEN_TEST, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TEST (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TEST, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ONLY_IF_REQUIRED (location_type l)
+      {
+        return symbol_type (token::TOKEN_ONLY_IF_REQUIRED, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ONLY_IF_REQUIRED (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ONLY_IF_REQUIRED, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CLIENT_CLASS (location_type l)
+      {
+        return symbol_type (token::TOKEN_CLIENT_CLASS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CLIENT_CLASS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CLIENT_CLASS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RESERVATIONS (location_type l)
+      {
+        return symbol_type (token::TOKEN_RESERVATIONS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RESERVATIONS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RESERVATIONS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DUID (location_type l)
+      {
+        return symbol_type (token::TOKEN_DUID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DUID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DUID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HW_ADDRESS (location_type l)
+      {
+        return symbol_type (token::TOKEN_HW_ADDRESS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HW_ADDRESS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HW_ADDRESS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CIRCUIT_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_CIRCUIT_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CIRCUIT_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CIRCUIT_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CLIENT_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_CLIENT_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CLIENT_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CLIENT_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOSTNAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOSTNAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_FLEX_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_FLEX_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_FLEX_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_FLEX_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RELAY (location_type l)
+      {
+        return symbol_type (token::TOKEN_RELAY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RELAY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RELAY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_IP_ADDRESS (location_type l)
+      {
+        return symbol_type (token::TOKEN_IP_ADDRESS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_IP_ADDRESS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_IP_ADDRESS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_IP_ADDRESSES (location_type l)
+      {
+        return symbol_type (token::TOKEN_IP_ADDRESSES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_IP_ADDRESSES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_IP_ADDRESSES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOOKS_LIBRARIES (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOOKS_LIBRARIES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOOKS_LIBRARIES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOOKS_LIBRARIES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LIBRARY (location_type l)
+      {
+        return symbol_type (token::TOKEN_LIBRARY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LIBRARY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LIBRARY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PARAMETERS (location_type l)
+      {
+        return symbol_type (token::TOKEN_PARAMETERS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PARAMETERS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PARAMETERS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_EXPIRED_LEASES_PROCESSING (location_type l)
+      {
+        return symbol_type (token::TOKEN_EXPIRED_LEASES_PROCESSING, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_EXPIRED_LEASES_PROCESSING (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_EXPIRED_LEASES_PROCESSING, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RECLAIM_TIMER_WAIT_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_RECLAIM_TIMER_WAIT_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RECLAIM_TIMER_WAIT_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RECLAIM_TIMER_WAIT_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOLD_RECLAIMED_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOLD_RECLAIMED_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOLD_RECLAIMED_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOLD_RECLAIMED_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_RECLAIM_LEASES (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECLAIM_LEASES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_RECLAIM_LEASES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECLAIM_LEASES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_RECLAIM_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECLAIM_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_RECLAIM_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECLAIM_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_UNWARNED_RECLAIM_CYCLES (location_type l)
+      {
+        return symbol_type (token::TOKEN_UNWARNED_RECLAIM_CYCLES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_UNWARNED_RECLAIM_CYCLES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_UNWARNED_RECLAIM_CYCLES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP4O6_PORT (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP4O6_PORT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP4O6_PORT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP4O6_PORT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONTROL_SOCKET (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONTROL_SOCKET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONTROL_SOCKET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONTROL_SOCKET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SOCKET_TYPE (location_type l)
+      {
+        return symbol_type (token::TOKEN_SOCKET_TYPE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SOCKET_TYPE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SOCKET_TYPE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SOCKET_NAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_SOCKET_NAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SOCKET_NAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SOCKET_NAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP_QUEUE_CONTROL (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP_QUEUE_CONTROL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP_QUEUE_CONTROL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP_QUEUE_CONTROL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP_DDNS (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP_DDNS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP_DDNS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP_DDNS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ENABLE_UPDATES (location_type l)
+      {
+        return symbol_type (token::TOKEN_ENABLE_UPDATES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ENABLE_UPDATES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ENABLE_UPDATES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_QUALIFYING_SUFFIX (location_type l)
+      {
+        return symbol_type (token::TOKEN_QUALIFYING_SUFFIX, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_QUALIFYING_SUFFIX (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_QUALIFYING_SUFFIX, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SERVER_IP (location_type l)
+      {
+        return symbol_type (token::TOKEN_SERVER_IP, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SERVER_IP (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SERVER_IP, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SERVER_PORT (location_type l)
+      {
+        return symbol_type (token::TOKEN_SERVER_PORT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SERVER_PORT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SERVER_PORT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SENDER_IP (location_type l)
+      {
+        return symbol_type (token::TOKEN_SENDER_IP, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SENDER_IP (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SENDER_IP, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SENDER_PORT (location_type l)
+      {
+        return symbol_type (token::TOKEN_SENDER_PORT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SENDER_PORT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SENDER_PORT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_QUEUE_SIZE (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_QUEUE_SIZE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_QUEUE_SIZE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_QUEUE_SIZE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NCR_PROTOCOL (location_type l)
+      {
+        return symbol_type (token::TOKEN_NCR_PROTOCOL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NCR_PROTOCOL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NCR_PROTOCOL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NCR_FORMAT (location_type l)
+      {
+        return symbol_type (token::TOKEN_NCR_FORMAT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NCR_FORMAT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NCR_FORMAT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OVERRIDE_NO_UPDATE (location_type l)
+      {
+        return symbol_type (token::TOKEN_OVERRIDE_NO_UPDATE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OVERRIDE_NO_UPDATE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OVERRIDE_NO_UPDATE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OVERRIDE_CLIENT_UPDATE (location_type l)
+      {
+        return symbol_type (token::TOKEN_OVERRIDE_CLIENT_UPDATE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OVERRIDE_CLIENT_UPDATE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OVERRIDE_CLIENT_UPDATE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_REPLACE_CLIENT_NAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_REPLACE_CLIENT_NAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_REPLACE_CLIENT_NAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_REPLACE_CLIENT_NAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_GENERATED_PREFIX (location_type l)
+      {
+        return symbol_type (token::TOKEN_GENERATED_PREFIX, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_GENERATED_PREFIX (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_GENERATED_PREFIX, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TCP (location_type l)
+      {
+        return symbol_type (token::TOKEN_TCP, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TCP (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TCP, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_JSON (location_type l)
+      {
+        return symbol_type (token::TOKEN_JSON, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_JSON (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_JSON, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_WHEN_PRESENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_WHEN_PRESENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_WHEN_PRESENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_WHEN_PRESENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NEVER (location_type l)
+      {
+        return symbol_type (token::TOKEN_NEVER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NEVER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NEVER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ALWAYS (location_type l)
+      {
+        return symbol_type (token::TOKEN_ALWAYS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ALWAYS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ALWAYS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_WHEN_NOT_PRESENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_WHEN_NOT_PRESENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_WHEN_NOT_PRESENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_WHEN_NOT_PRESENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOSTNAME_CHAR_SET (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME_CHAR_SET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOSTNAME_CHAR_SET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME_CHAR_SET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOSTNAME_CHAR_REPLACEMENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME_CHAR_REPLACEMENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOSTNAME_CHAR_REPLACEMENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME_CHAR_REPLACEMENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LOGGING (location_type l)
+      {
+        return symbol_type (token::TOKEN_LOGGING, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LOGGING (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LOGGING, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LOGGERS (location_type l)
+      {
+        return symbol_type (token::TOKEN_LOGGERS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LOGGERS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LOGGERS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OUTPUT_OPTIONS (location_type l)
+      {
+        return symbol_type (token::TOKEN_OUTPUT_OPTIONS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OUTPUT_OPTIONS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OUTPUT_OPTIONS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OUTPUT (location_type l)
+      {
+        return symbol_type (token::TOKEN_OUTPUT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OUTPUT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OUTPUT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DEBUGLEVEL (location_type l)
+      {
+        return symbol_type (token::TOKEN_DEBUGLEVEL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DEBUGLEVEL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DEBUGLEVEL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SEVERITY (location_type l)
+      {
+        return symbol_type (token::TOKEN_SEVERITY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SEVERITY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SEVERITY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_FLUSH (location_type l)
+      {
+        return symbol_type (token::TOKEN_FLUSH, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_FLUSH (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_FLUSH, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAXSIZE (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAXSIZE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAXSIZE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAXSIZE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAXVER (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAXVER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAXVER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAXVER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PATTERN (location_type l)
+      {
+        return symbol_type (token::TOKEN_PATTERN, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PATTERN (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PATTERN, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP6 (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP6, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP6 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP6, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCPDDNS (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCPDDNS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCPDDNS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCPDDNS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONTROL_AGENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONTROL_AGENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONTROL_AGENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONTROL_AGENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TOPLEVEL_JSON (location_type l)
+      {
+        return symbol_type (token::TOKEN_TOPLEVEL_JSON, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TOPLEVEL_JSON (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TOPLEVEL_JSON, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TOPLEVEL_DHCP4 (location_type l)
+      {
+        return symbol_type (token::TOKEN_TOPLEVEL_DHCP4, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TOPLEVEL_DHCP4 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TOPLEVEL_DHCP4, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_DHCP4 (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_DHCP4, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_DHCP4 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_DHCP4, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_INTERFACES4 (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_INTERFACES4, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_INTERFACES4 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_INTERFACES4, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_SUBNET4 (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_SUBNET4, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_SUBNET4 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_SUBNET4, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_POOL4 (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_POOL4, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_POOL4 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_POOL4, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_RESERVATION (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_RESERVATION, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_RESERVATION (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_RESERVATION, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_OPTION_DEFS (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DEFS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_OPTION_DEFS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DEFS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_OPTION_DEF (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DEF, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_OPTION_DEF (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DEF, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_OPTION_DATA (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DATA, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_OPTION_DATA (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DATA, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_HOOKS_LIBRARY (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_HOOKS_LIBRARY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_HOOKS_LIBRARY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_HOOKS_LIBRARY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_DHCP_DDNS (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_DHCP_DDNS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_DHCP_DDNS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_DHCP_DDNS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_LOGGING (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_LOGGING, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_LOGGING (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_LOGGING, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_CONFIG_CONTROL (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_CONFIG_CONTROL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_CONFIG_CONTROL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_CONFIG_CONTROL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_STRING (std::string v, location_type l)
+      {
+        return symbol_type (token::TOKEN_STRING, std::move (v), std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_STRING (const std::string& v, const location_type& l)
+      {
+        return symbol_type (token::TOKEN_STRING, v, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_INTEGER (int64_t v, location_type l)
+      {
+        return symbol_type (token::TOKEN_INTEGER, std::move (v), std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_INTEGER (const int64_t& v, const location_type& l)
+      {
+        return symbol_type (token::TOKEN_INTEGER, v, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_FLOAT (double v, location_type l)
+      {
+        return symbol_type (token::TOKEN_FLOAT, std::move (v), std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_FLOAT (const double& v, const location_type& l)
+      {
+        return symbol_type (token::TOKEN_FLOAT, v, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_BOOLEAN (bool v, location_type l)
+      {
+        return symbol_type (token::TOKEN_BOOLEAN, std::move (v), std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_BOOLEAN (const bool& v, const location_type& l)
+      {
+        return symbol_type (token::TOKEN_BOOLEAN, v, l);
+      }
+#endif
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_ALL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ALL, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HOST_RESERVATION_IDENTIFIERS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOST_RESERVATION_IDENTIFIERS, YY_MOVE (l));
-  }
+  private:
+    /// This class is not copyable.
+    Dhcp4Parser (const Dhcp4Parser&);
+    Dhcp4Parser& operator= (const Dhcp4Parser&);
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CLIENT_CLASSES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CLIENT_CLASSES, YY_MOVE (l));
-  }
+    /// State numbers.
+    typedef int state_type;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_REQUIRE_CLIENT_CLASSES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_REQUIRE_CLIENT_CLASSES, YY_MOVE (l));
-  }
+    /// Generate an error message.
+    /// \param yystate   the state where the error occurred.
+    /// \param yyla      the lookahead token.
+    virtual std::string yysyntax_error_ (state_type yystate,
+                                         const symbol_type& yyla) const;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_TEST (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TEST, YY_MOVE (l));
-  }
+    /// Compute post-reduction state.
+    /// \param yystate   the current state
+    /// \param yysym     the nonterminal to push on the stack
+    state_type yy_lr_goto_state_ (state_type yystate, int yysym);
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_ONLY_IF_REQUIRED (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ONLY_IF_REQUIRED, YY_MOVE (l));
-  }
+    /// Whether the given \c yypact_ value indicates a defaulted state.
+    /// \param yyvalue   the value to check
+    static bool yy_pact_value_is_default_ (int yyvalue);
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CLIENT_CLASS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CLIENT_CLASS, YY_MOVE (l));
-  }
+    /// Whether the given \c yytable_ value indicates a syntax error.
+    /// \param yyvalue   the value to check
+    static bool yy_table_value_is_error_ (int yyvalue);
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RESERVATIONS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RESERVATIONS, YY_MOVE (l));
-  }
+    static const short yypact_ninf_;
+    static const signed char yytable_ninf_;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DUID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DUID, YY_MOVE (l));
-  }
+    /// Convert a scanner token number \a t to a symbol number.
+    static token_number_type yytranslate_ (token_type t);
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HW_ADDRESS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HW_ADDRESS, YY_MOVE (l));
-  }
+    // Tables.
+  // YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+  // STATE-NUM.
+  static const short yypact_[];
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CIRCUIT_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CIRCUIT_ID, YY_MOVE (l));
-  }
+  // YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+  // Performed when YYTABLE does not specify something else to do.  Zero
+  // means the default is an error.
+  static const unsigned short yydefact_[];
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CLIENT_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CLIENT_ID, YY_MOVE (l));
-  }
+  // YYPGOTO[NTERM-NUM].
+  static const short yypgoto_[];
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HOSTNAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOSTNAME, YY_MOVE (l));
-  }
+  // YYDEFGOTO[NTERM-NUM].
+  static const short yydefgoto_[];
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_FLEX_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_FLEX_ID, YY_MOVE (l));
-  }
+  // YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+  // positive, shift that token.  If negative, reduce the rule whose
+  // number is the opposite.  If YYTABLE_NINF, syntax error.
+  static const unsigned short yytable_[];
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RELAY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RELAY, YY_MOVE (l));
-  }
+  static const short yycheck_[];
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_IP_ADDRESS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_IP_ADDRESS, YY_MOVE (l));
-  }
+  // YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+  // symbol of state STATE-NUM.
+  static const unsigned short yystos_[];
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_IP_ADDRESSES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_IP_ADDRESSES, YY_MOVE (l));
-  }
+  // YYR1[YYN] -- Symbol number of symbol that rule YYN derives.
+  static const unsigned short yyr1_[];
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HOOKS_LIBRARIES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOOKS_LIBRARIES, YY_MOVE (l));
-  }
+  // YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.
+  static const unsigned char yyr2_[];
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_LIBRARY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LIBRARY, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_PARAMETERS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PARAMETERS, YY_MOVE (l));
-  }
+    /// Convert the symbol name \a n to a form suitable for a diagnostic.
+    static std::string yytnamerr_ (const char *n);
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_EXPIRED_LEASES_PROCESSING (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_EXPIRED_LEASES_PROCESSING, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_RECLAIM_TIMER_WAIT_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RECLAIM_TIMER_WAIT_TIME, YY_MOVE (l));
-  }
+    /// For a symbol, its name in clear.
+    static const char* const yytname_[];
+#if PARSER4_DEBUG
+  // YYRLINE[YYN] -- Source line where rule number YYN was defined.
+  static const unsigned short yyrline_[];
+    /// Report on the debug stream that the rule \a r is going to be reduced.
+    virtual void yy_reduce_print_ (int r);
+    /// Print the state stack on the debug stream.
+    virtual void yystack_print_ ();
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME, YY_MOVE (l));
-  }
+    /// Debugging level.
+    int yydebug_;
+    /// Debug stream.
+    std::ostream* yycdebug_;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HOLD_RECLAIMED_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOLD_RECLAIMED_TIME, YY_MOVE (l));
-  }
+    /// \brief Display a symbol type, value and location.
+    /// \param yyo    The output stream.
+    /// \param yysym  The symbol.
+    template <typename Base>
+    void yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const;
+#endif
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MAX_RECLAIM_LEASES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_RECLAIM_LEASES, YY_MOVE (l));
-  }
+    /// \brief Reclaim the memory associated to a symbol.
+    /// \param yymsg     Why this token is reclaimed.
+    ///                  If null, print nothing.
+    /// \param yysym     The symbol.
+    template <typename Base>
+    void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MAX_RECLAIM_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_RECLAIM_TIME, YY_MOVE (l));
-  }
+  private:
+    /// Type access provider for state based symbols.
+    struct by_state
+    {
+      /// Default constructor.
+      by_state () YY_NOEXCEPT;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_UNWARNED_RECLAIM_CYCLES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_UNWARNED_RECLAIM_CYCLES, YY_MOVE (l));
-  }
+      /// The symbol type as needed by the constructor.
+      typedef state_type kind_type;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DHCP4O6_PORT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP4O6_PORT, YY_MOVE (l));
-  }
+      /// Constructor.
+      by_state (kind_type s) YY_NOEXCEPT;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CONTROL_SOCKET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONTROL_SOCKET, YY_MOVE (l));
-  }
+      /// Copy constructor.
+      by_state (const by_state& that) YY_NOEXCEPT;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SOCKET_TYPE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SOCKET_TYPE, YY_MOVE (l));
-  }
+      /// Record that this symbol is empty.
+      void clear () YY_NOEXCEPT;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SOCKET_NAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SOCKET_NAME, YY_MOVE (l));
-  }
+      /// Steal the symbol type from \a that.
+      void move (by_state& that);
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DHCP_QUEUE_CONTROL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP_QUEUE_CONTROL, YY_MOVE (l));
-  }
+      /// The (internal) type number (corresponding to \a state).
+      /// \a empty_symbol when empty.
+      symbol_number_type type_get () const YY_NOEXCEPT;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DHCP_DDNS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP_DDNS, YY_MOVE (l));
-  }
+      /// The state number used to denote an empty symbol.
+      enum { empty_state = -1 };
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_ENABLE_UPDATES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ENABLE_UPDATES, YY_MOVE (l));
-  }
+      /// The state.
+      /// \a empty when empty.
+      state_type state;
+    };
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_QUALIFYING_SUFFIX (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_QUALIFYING_SUFFIX, YY_MOVE (l));
-  }
+    /// "Internal" symbol: element of the stack.
+    struct stack_symbol_type : basic_symbol<by_state>
+    {
+      /// Superclass.
+      typedef basic_symbol<by_state> super_type;
+      /// Construct an empty symbol.
+      stack_symbol_type ();
+      /// Move or copy construction.
+      stack_symbol_type (YY_RVREF (stack_symbol_type) that);
+      /// Steal the contents from \a sym to build this.
+      stack_symbol_type (state_type s, YY_MOVE_REF (symbol_type) sym);
+#if YY_CPLUSPLUS < 201103L
+      /// Assignment, needed by push_back by some old implementations.
+      /// Moves the contents of that.
+      stack_symbol_type& operator= (stack_symbol_type& that);
+#endif
+    };
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SERVER_IP (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SERVER_IP, YY_MOVE (l));
-  }
+    /// A stack with random access from its top.
+    template <typename T, typename S = std::vector<T> >
+    class stack
+    {
+    public:
+      // Hide our reversed order.
+      typedef typename S::reverse_iterator iterator;
+      typedef typename S::const_reverse_iterator const_iterator;
+      typedef typename S::size_type size_type;
+
+      stack (size_type n = 200)
+        : seq_ (n)
+      {}
+
+      /// Random access.
+      ///
+      /// Index 0 returns the topmost element.
+      T&
+      operator[] (size_type i)
+      {
+        return seq_[size () - 1 - i];
+      }
+
+      /// Random access.
+      ///
+      /// Index 0 returns the topmost element.
+      T&
+      operator[] (int i)
+      {
+        return operator[] (size_type (i));
+      }
+
+      /// Random access.
+      ///
+      /// Index 0 returns the topmost element.
+      const T&
+      operator[] (size_type i) const
+      {
+        return seq_[size () - 1 - i];
+      }
+
+      /// Random access.
+      ///
+      /// Index 0 returns the topmost element.
+      const T&
+      operator[] (int i) const
+      {
+        return operator[] (size_type (i));
+      }
+
+      /// Steal the contents of \a t.
+      ///
+      /// Close to move-semantics.
+      void
+      push (YY_MOVE_REF (T) t)
+      {
+        seq_.push_back (T ());
+        operator[] (0).move (t);
+      }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SERVER_PORT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SERVER_PORT, YY_MOVE (l));
-  }
+      /// Pop elements from the stack.
+      void
+      pop (int n = 1) YY_NOEXCEPT
+      {
+        for (; 0 < n; --n)
+          seq_.pop_back ();
+      }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SENDER_IP (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SENDER_IP, YY_MOVE (l));
-  }
+      /// Pop all elements from the stack.
+      void
+      clear () YY_NOEXCEPT
+      {
+        seq_.clear ();
+      }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SENDER_PORT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SENDER_PORT, YY_MOVE (l));
-  }
+      /// Number of elements on the stack.
+      size_type
+      size () const YY_NOEXCEPT
+      {
+        return seq_.size ();
+      }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MAX_QUEUE_SIZE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_QUEUE_SIZE, YY_MOVE (l));
-  }
+      /// Iterator on top of the stack (going downwards).
+      const_iterator
+      begin () const YY_NOEXCEPT
+      {
+        return seq_.rbegin ();
+      }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_NCR_PROTOCOL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NCR_PROTOCOL, YY_MOVE (l));
-  }
+      /// Bottom of the stack.
+      const_iterator
+      end () const YY_NOEXCEPT
+      {
+        return seq_.rend ();
+      }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_NCR_FORMAT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NCR_FORMAT, YY_MOVE (l));
-  }
+      /// Present a slice of the top of a stack.
+      class slice
+      {
+      public:
+        slice (const stack& stack, int range)
+          : stack_ (stack)
+          , range_ (range)
+        {}
+
+        const T&
+        operator[] (int i) const
+        {
+          return stack_[range_ - i];
+        }
+
+      private:
+        const stack& stack_;
+        int range_;
+      };
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_OVERRIDE_NO_UPDATE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OVERRIDE_NO_UPDATE, YY_MOVE (l));
-  }
+    private:
+      stack (const stack&);
+      stack& operator= (const stack&);
+      /// The wrapped container.
+      S seq_;
+    };
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_OVERRIDE_CLIENT_UPDATE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OVERRIDE_CLIENT_UPDATE, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_REPLACE_CLIENT_NAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_REPLACE_CLIENT_NAME, YY_MOVE (l));
-  }
+    /// Stack type.
+    typedef stack<stack_symbol_type> stack_type;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_GENERATED_PREFIX (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_GENERATED_PREFIX, YY_MOVE (l));
-  }
+    /// The stack.
+    stack_type yystack_;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_TCP (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TCP, YY_MOVE (l));
-  }
+    /// Push a new state on the stack.
+    /// \param m    a debug message to display
+    ///             if null, no trace is output.
+    /// \param sym  the symbol
+    /// \warning the contents of \a s.value is stolen.
+    void yypush_ (const char* m, YY_MOVE_REF (stack_symbol_type) sym);
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_JSON (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_JSON, YY_MOVE (l));
-  }
+    /// Push a new look ahead token on the state on the stack.
+    /// \param m    a debug message to display
+    ///             if null, no trace is output.
+    /// \param s    the state
+    /// \param sym  the symbol (for its value and location).
+    /// \warning the contents of \a sym.value is stolen.
+    void yypush_ (const char* m, state_type s, YY_MOVE_REF (symbol_type) sym);
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_WHEN_PRESENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_WHEN_PRESENT, YY_MOVE (l));
-  }
+    /// Pop \a n symbols from the stack.
+    void yypop_ (int n = 1);
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_NEVER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NEVER, YY_MOVE (l));
-  }
+    /// Constants.
+    enum
+    {
+      yyeof_ = 0,
+      yylast_ = 1127,     ///< Last index in yytable_.
+      yynnts_ = 399,  ///< Number of nonterminal symbols.
+      yyfinal_ = 30, ///< Termination state number.
+      yyterror_ = 1,
+      yyerrcode_ = 256,
+      yyntokens_ = 185  ///< Number of tokens.
+    };
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_ALWAYS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ALWAYS, YY_MOVE (l));
-  }
+
+    // User arguments.
+    isc::dhcp::Parser4Context& ctx;
+  };
 
   inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_WHEN_NOT_PRESENT (YY_COPY (location_type) l)
+  Dhcp4Parser::token_number_type
+  Dhcp4Parser::yytranslate_ (token_type t)
   {
-    return symbol_type (token::TOKEN_WHEN_NOT_PRESENT, YY_MOVE (l));
-  }
+    // YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to
+    // TOKEN-NUM as returned by yylex.
+    static
+    const token_number_type
+    translate_table[] =
+    {
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184
+    };
+    const unsigned user_token_number_max_ = 439;
+    const token_number_type undef_token_ = 2;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HOSTNAME_CHAR_SET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOSTNAME_CHAR_SET, YY_MOVE (l));
+    if (static_cast<int> (t) <= yyeof_)
+      return yyeof_;
+    else if (static_cast<unsigned> (t) <= user_token_number_max_)
+      return translate_table[t];
+    else
+      return undef_token_;
   }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HOSTNAME_CHAR_REPLACEMENT (YY_COPY (location_type) l)
+  // basic_symbol.
+#if 201103L <= YY_CPLUSPLUS
+  template <typename Base>
+  Dhcp4Parser::basic_symbol<Base>::basic_symbol (basic_symbol&& that)
+    : Base (std::move (that))
+    , value ()
+    , location (std::move (that.location))
   {
-    return symbol_type (token::TOKEN_HOSTNAME_CHAR_REPLACEMENT, YY_MOVE (l));
-  }
+    switch (this->type_get ())
+    {
+      case 201: // value
+      case 205: // map_value
+      case 246: // ddns_replace_client_name_value
+      case 265: // socket_type
+      case 268: // outbound_interface_value
+      case 290: // db_type
+      case 377: // hr_mode
+      case 524: // ncr_protocol_value
+        value.move< ElementPtr > (std::move (that.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_LOGGING (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LOGGING, YY_MOVE (l));
-  }
+      case 184: // "boolean"
+        value.move< bool > (std::move (that.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_LOGGERS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LOGGERS, YY_MOVE (l));
-  }
+      case 183: // "floating point"
+        value.move< double > (std::move (that.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_OUTPUT_OPTIONS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OUTPUT_OPTIONS, YY_MOVE (l));
-  }
+      case 182: // "integer"
+        value.move< int64_t > (std::move (that.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_OUTPUT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OUTPUT, YY_MOVE (l));
-  }
+      case 181: // "constant string"
+        value.move< std::string > (std::move (that.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DEBUGLEVEL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DEBUGLEVEL, YY_MOVE (l));
-  }
+      default:
+        break;
+    }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SEVERITY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SEVERITY, YY_MOVE (l));
   }
+#endif
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_FLUSH (YY_COPY (location_type) l)
+  template <typename Base>
+  Dhcp4Parser::basic_symbol<Base>::basic_symbol (const basic_symbol& that)
+    : Base (that)
+    , value ()
+    , location (that.location)
   {
-    return symbol_type (token::TOKEN_FLUSH, YY_MOVE (l));
-  }
+    switch (this->type_get ())
+    {
+      case 201: // value
+      case 205: // map_value
+      case 246: // ddns_replace_client_name_value
+      case 265: // socket_type
+      case 268: // outbound_interface_value
+      case 290: // db_type
+      case 377: // hr_mode
+      case 524: // ncr_protocol_value
+        value.copy< ElementPtr > (YY_MOVE (that.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MAXSIZE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAXSIZE, YY_MOVE (l));
-  }
+      case 184: // "boolean"
+        value.copy< bool > (YY_MOVE (that.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_MAXVER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAXVER, YY_MOVE (l));
-  }
+      case 183: // "floating point"
+        value.copy< double > (YY_MOVE (that.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_PATTERN (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PATTERN, YY_MOVE (l));
-  }
+      case 182: // "integer"
+        value.copy< int64_t > (YY_MOVE (that.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DHCP6 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP6, YY_MOVE (l));
-  }
+      case 181: // "constant string"
+        value.copy< std::string > (YY_MOVE (that.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_DHCPDDNS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCPDDNS, YY_MOVE (l));
-  }
+      default:
+        break;
+    }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_CONTROL_AGENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONTROL_AGENT, YY_MOVE (l));
   }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_TOPLEVEL_JSON (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TOPLEVEL_JSON, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_TOPLEVEL_DHCP4 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TOPLEVEL_DHCP4, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_DHCP4 (YY_COPY (location_type) l)
+  template <typename Base>
+  bool
+  Dhcp4Parser::basic_symbol<Base>::empty () const YY_NOEXCEPT
   {
-    return symbol_type (token::TOKEN_SUB_DHCP4, YY_MOVE (l));
+    return Base::type_get () == empty_symbol;
   }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_INTERFACES4 (YY_COPY (location_type) l)
+  template <typename Base>
+  void
+  Dhcp4Parser::basic_symbol<Base>::move (basic_symbol& s)
   {
-    return symbol_type (token::TOKEN_SUB_INTERFACES4, YY_MOVE (l));
-  }
+    super_type::move (s);
+    switch (this->type_get ())
+    {
+      case 201: // value
+      case 205: // map_value
+      case 246: // ddns_replace_client_name_value
+      case 265: // socket_type
+      case 268: // outbound_interface_value
+      case 290: // db_type
+      case 377: // hr_mode
+      case 524: // ncr_protocol_value
+        value.move< ElementPtr > (YY_MOVE (s.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_SUBNET4 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_SUBNET4, YY_MOVE (l));
-  }
+      case 184: // "boolean"
+        value.move< bool > (YY_MOVE (s.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_POOL4 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_POOL4, YY_MOVE (l));
-  }
+      case 183: // "floating point"
+        value.move< double > (YY_MOVE (s.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_RESERVATION (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_RESERVATION, YY_MOVE (l));
-  }
+      case 182: // "integer"
+        value.move< int64_t > (YY_MOVE (s.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_OPTION_DEFS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_OPTION_DEFS, YY_MOVE (l));
-  }
+      case 181: // "constant string"
+        value.move< std::string > (YY_MOVE (s.value));
+        break;
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_OPTION_DEF (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_OPTION_DEF, YY_MOVE (l));
-  }
+      default:
+        break;
+    }
 
-  inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_OPTION_DATA (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_OPTION_DATA, YY_MOVE (l));
+    location = YY_MOVE (s.location);
   }
 
+  // by_type.
   inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_HOOKS_LIBRARY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_HOOKS_LIBRARY, YY_MOVE (l));
-  }
+  Dhcp4Parser::by_type::by_type ()
+    : type (empty_symbol)
+  {}
 
+#if 201103L <= YY_CPLUSPLUS
   inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_DHCP_DDNS (YY_COPY (location_type) l)
+  Dhcp4Parser::by_type::by_type (by_type&& that)
+    : type (that.type)
   {
-    return symbol_type (token::TOKEN_SUB_DHCP_DDNS, YY_MOVE (l));
+    that.clear ();
   }
+#endif
 
   inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_LOGGING (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_LOGGING, YY_MOVE (l));
-  }
+  Dhcp4Parser::by_type::by_type (const by_type& that)
+    : type (that.type)
+  {}
 
   inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SUB_CONFIG_CONTROL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_CONFIG_CONTROL, YY_MOVE (l));
-  }
+  Dhcp4Parser::by_type::by_type (token_type t)
+    : type (yytranslate_ (t))
+  {}
 
   inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_STRING (YY_COPY (std::string) v, YY_COPY (location_type) l)
+  void
+  Dhcp4Parser::by_type::clear ()
   {
-    return symbol_type (token::TOKEN_STRING, YY_MOVE (v), YY_MOVE (l));
+    type = empty_symbol;
   }
 
   inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_INTEGER (YY_COPY (int64_t) v, YY_COPY (location_type) l)
+  void
+  Dhcp4Parser::by_type::move (by_type& that)
   {
-    return symbol_type (token::TOKEN_INTEGER, YY_MOVE (v), YY_MOVE (l));
+    type = that.type;
+    that.clear ();
   }
 
   inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_FLOAT (YY_COPY (double) v, YY_COPY (location_type) l)
+  int
+  Dhcp4Parser::by_type::type_get () const YY_NOEXCEPT
   {
-    return symbol_type (token::TOKEN_FLOAT, YY_MOVE (v), YY_MOVE (l));
+    return type;
   }
 
   inline
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_BOOLEAN (YY_COPY (bool) v, YY_COPY (location_type) l)
+  Dhcp4Parser::token_type
+  Dhcp4Parser::by_type::token () const YY_NOEXCEPT
   {
-    return symbol_type (token::TOKEN_BOOLEAN, YY_MOVE (v), YY_MOVE (l));
+    // YYTOKNUM[NUM] -- (External) token number corresponding to the
+    // (internal) symbol number NUM (which must be that of a token).  */
+    static
+    const unsigned short
+    yytoken_number_[] =
+    {
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,   439
+    };
+    return token_type (yytoken_number_[type]);
   }
 
-
-#line 14 "dhcp4_parser.yy" // lalr1.cc:404
+#line 14 "dhcp4_parser.yy"
 } } // isc::dhcp
-#line 3415 "dhcp4_parser.h" // lalr1.cc:404
+#line 4331 "dhcp4_parser.h"
+
 
 
 
diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh
index a5fb10e935..535f56121b 100644
--- a/src/bin/dhcp4/location.hh
+++ b/src/bin/dhcp4/location.hh
@@ -1,8 +1,9 @@
-// A Bison parser, made by GNU Bison 3.2.1.
+// Generated 201910280902
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Locations for Bison parsers in C++
 
-// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -54,9 +55,10 @@
 #  endif
 # endif
 
-#line 14 "dhcp4_parser.yy" // location.cc:339
+#line 14 "dhcp4_parser.yy"
 namespace isc { namespace dhcp {
-#line 60 "location.hh" // location.cc:339
+#line 60 "location.hh"
+
   /// A point in a source file.
   class position
   {
@@ -316,7 +318,8 @@ namespace isc { namespace dhcp {
     return ostr;
   }
 
-#line 14 "dhcp4_parser.yy" // location.cc:339
+#line 14 "dhcp4_parser.yy"
 } } // isc::dhcp
-#line 322 "location.hh" // location.cc:339
+#line 323 "location.hh"
+
 #endif // !YY_PARSER4_LOCATION_HH_INCLUDED
diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh
index 22ef35f744..d80a729037 100644
--- a/src/bin/dhcp4/position.hh
+++ b/src/bin/dhcp4/position.hh
@@ -1,4 +1,5 @@
-// A Bison parser, made by GNU Bison 3.2.1.
+// Generated 201910280902
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined in "location.hh".
diff --git a/src/bin/dhcp4/stack.hh b/src/bin/dhcp4/stack.hh
index 81e152d836..816fdacfe9 100644
--- a/src/bin/dhcp4/stack.hh
+++ b/src/bin/dhcp4/stack.hh
@@ -1,4 +1,5 @@
-// A Bison parser, made by GNU Bison 3.2.1.
+// Generated 201910280902
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined with the parser itself.
diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc
index 5dcfeeece4..08650e2f13 100644
--- a/src/bin/dhcp6/dhcp6_parser.cc
+++ b/src/bin/dhcp6/dhcp6_parser.cc
@@ -1,8 +1,8 @@
-// A Bison parser, made by GNU Bison 3.2.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton implementation for Bison LALR(1) parsers in C++
 
-// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -43,11 +43,11 @@
 
 
 // Unqualified %code blocks.
-#line 34 "dhcp6_parser.yy" // lalr1.cc:438
+#line 34 "dhcp6_parser.yy"
 
 #include <dhcp6/parser_context.h>
 
-#line 51 "dhcp6_parser.cc" // lalr1.cc:438
+#line 51 "dhcp6_parser.cc"
 
 
 #ifndef YY_
@@ -88,13 +88,10 @@
         {                                                               \
           (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
         }                                                               \
-    while (/*CONSTCOND*/ false)
+    while (false)
 # endif
 
 
-// Suppress unused-variable warnings by "using" E.
-#define YYUSE(E) ((void) (E))
-
 // Enable debugging if requested.
 #if PARSER6_DEBUG
 
@@ -140,9 +137,10 @@
 #define YYERROR         goto yyerrorlab
 #define YYRECOVERING()  (!!yyerrstatus_)
 
-#line 14 "dhcp6_parser.yy" // lalr1.cc:513
+#line 14 "dhcp6_parser.yy"
 namespace isc { namespace dhcp {
-#line 146 "dhcp6_parser.cc" // lalr1.cc:513
+#line 143 "dhcp6_parser.cc"
+
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -154,7 +152,7 @@ namespace isc { namespace dhcp {
   {
     if (*yystr == '"')
       {
-        std::string yyr = "";
+        std::string yyr;
         char const *yyp = yystr;
 
         for (;;)
@@ -167,7 +165,10 @@ namespace isc { namespace dhcp {
             case '\\':
               if (*++yyp != '\\')
                 goto do_not_strip_quotes;
-              // Fall through.
+              else
+                goto append;
+
+            append:
             default:
               yyr += *yyp;
               break;
@@ -195,6 +196,8 @@ namespace isc { namespace dhcp {
   Dhcp6Parser::~Dhcp6Parser ()
   {}
 
+  Dhcp6Parser::syntax_error::~syntax_error () YY_NOEXCEPT YY_NOTHROW
+  {}
 
   /*---------------.
   | Symbol types.  |
@@ -203,16 +206,16 @@ namespace isc { namespace dhcp {
 
 
   // by_state.
-  Dhcp6Parser::by_state::by_state ()
+  Dhcp6Parser::by_state::by_state () YY_NOEXCEPT
     : state (empty_state)
   {}
 
-  Dhcp6Parser::by_state::by_state (const by_state& other)
-    : state (other.state)
+  Dhcp6Parser::by_state::by_state (const by_state& that) YY_NOEXCEPT
+    : state (that.state)
   {}
 
   void
-  Dhcp6Parser::by_state::clear ()
+  Dhcp6Parser::by_state::clear () YY_NOEXCEPT
   {
     state = empty_state;
   }
@@ -224,12 +227,12 @@ namespace isc { namespace dhcp {
     that.clear ();
   }
 
-  Dhcp6Parser::by_state::by_state (state_type s)
+  Dhcp6Parser::by_state::by_state (state_type s) YY_NOEXCEPT
     : state (s)
   {}
 
   Dhcp6Parser::symbol_number_type
-  Dhcp6Parser::by_state::type_get () const
+  Dhcp6Parser::by_state::type_get () const YY_NOEXCEPT
   {
     if (state == empty_state)
       return empty_symbol;
@@ -275,7 +278,7 @@ namespace isc { namespace dhcp {
         break;
     }
 
-#if defined __cplusplus && 201103L <= __cplusplus
+#if 201103L <= YY_CPLUSPLUS
     // that is emptied.
     that.state = empty_state;
 #endif
@@ -320,7 +323,7 @@ namespace isc { namespace dhcp {
     that.type = empty_symbol;
   }
 
-#if !defined __cplusplus || __cplusplus < 201103L
+#if YY_CPLUSPLUS < 201103L
   Dhcp6Parser::stack_symbol_type&
   Dhcp6Parser::stack_symbol_type::operator= (stack_symbol_type& that)
   {
@@ -381,93 +384,83 @@ namespace isc { namespace dhcp {
     std::ostream& yyoutput = yyo;
     YYUSE (yyoutput);
     symbol_number_type yytype = yysym.type_get ();
+#if defined __GNUC__ && ! defined __clang__ && ! defined __ICC && __GNUC__ * 100 + __GNUC_MINOR__ <= 408
     // Avoid a (spurious) G++ 4.8 warning about "array subscript is
     // below array bounds".
     if (yysym.empty ())
       std::abort ();
+#endif
     yyo << (yytype < yyntokens_ ? "token" : "nterm")
         << ' ' << yytname_[yytype] << " ("
         << yysym.location << ": ";
     switch (yytype)
     {
-            case 189: // "constant string"
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< std::string > (); }
-#line 398 "dhcp6_parser.cc" // lalr1.cc:672
+      case 189: // "constant string"
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < std::string > (); }
+#line 402 "dhcp6_parser.cc"
         break;
 
       case 190: // "integer"
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< int64_t > (); }
-#line 405 "dhcp6_parser.cc" // lalr1.cc:672
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < int64_t > (); }
+#line 408 "dhcp6_parser.cc"
         break;
 
       case 191: // "floating point"
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< double > (); }
-#line 412 "dhcp6_parser.cc" // lalr1.cc:672
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < double > (); }
+#line 414 "dhcp6_parser.cc"
         break;
 
       case 192: // "boolean"
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< bool > (); }
-#line 419 "dhcp6_parser.cc" // lalr1.cc:672
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < bool > (); }
+#line 420 "dhcp6_parser.cc"
         break;
 
       case 210: // value
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 426 "dhcp6_parser.cc" // lalr1.cc:672
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 426 "dhcp6_parser.cc"
         break;
 
       case 214: // map_value
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 433 "dhcp6_parser.cc" // lalr1.cc:672
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 432 "dhcp6_parser.cc"
         break;
 
       case 255: // ddns_replace_client_name_value
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 440 "dhcp6_parser.cc" // lalr1.cc:672
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 438 "dhcp6_parser.cc"
         break;
 
       case 289: // db_type
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 447 "dhcp6_parser.cc" // lalr1.cc:672
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 444 "dhcp6_parser.cc"
         break;
 
       case 383: // hr_mode
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 454 "dhcp6_parser.cc" // lalr1.cc:672
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 450 "dhcp6_parser.cc"
         break;
 
       case 519: // duid_type
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 461 "dhcp6_parser.cc" // lalr1.cc:672
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 456 "dhcp6_parser.cc"
         break;
 
       case 554: // ncr_protocol_value
-
-#line 268 "dhcp6_parser.yy" // lalr1.cc:672
-        { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 468 "dhcp6_parser.cc" // lalr1.cc:672
+#line 268 "dhcp6_parser.yy"
+        { yyoutput << yysym.value.template as < ElementPtr > (); }
+#line 462 "dhcp6_parser.cc"
         break;
 
-
       default:
         break;
     }
@@ -486,7 +479,7 @@ namespace isc { namespace dhcp {
   void
   Dhcp6Parser::yypush_ (const char* m, state_type s, YY_MOVE_REF (symbol_type) sym)
   {
-#if defined __cplusplus && 201103L <= __cplusplus
+#if 201103L <= YY_CPLUSPLUS
     yypush_ (m, stack_symbol_type (s, std::move (sym)));
 #else
     stack_symbol_type ss (s, sym);
@@ -590,17 +583,22 @@ namespace isc { namespace dhcp {
     yystack_.clear ();
     yypush_ (YY_NULLPTR, 0, YY_MOVE (yyla));
 
-    // A new symbol was pushed on the stack.
+  /*-----------------------------------------------.
+  | yynewstate -- push a new symbol on the stack.  |
+  `-----------------------------------------------*/
   yynewstate:
     YYCDEBUG << "Entering state " << yystack_[0].state << '\n';
 
     // Accept?
     if (yystack_[0].state == yyfinal_)
-      goto yyacceptlab;
+      YYACCEPT;
 
     goto yybackup;
 
-    // Backup.
+
+  /*-----------.
+  | yybackup.  |
+  `-----------*/
   yybackup:
     // Try to take a decision without lookahead.
     yyn = yypact_[yystack_[0].state];
@@ -621,6 +619,7 @@ namespace isc { namespace dhcp {
 #if YY_EXCEPTIONS
         catch (const syntax_error& yyexc)
           {
+            YYCDEBUG << "Caught exception: " << yyexc.what() << '\n';
             error (yyexc);
             goto yyerrlab1;
           }
@@ -652,6 +651,7 @@ namespace isc { namespace dhcp {
     yypush_ ("Shifting", yyn, YY_MOVE (yyla));
     goto yynewstate;
 
+
   /*-----------------------------------------------------------.
   | yydefault -- do the default action for the current state.  |
   `-----------------------------------------------------------*/
@@ -661,8 +661,9 @@ namespace isc { namespace dhcp {
       goto yyerrlab;
     goto yyreduce;
 
+
   /*-----------------------------.
-  | yyreduce -- Do a reduction.  |
+  | yyreduce -- do a reduction.  |
   `-----------------------------*/
   yyreduce:
     yylen = yyr2_[yyn];
@@ -707,8 +708,8 @@ namespace isc { namespace dhcp {
 
       // Default location.
       {
-        slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
-        YYLLOC_DEFAULT (yylhs.location, slice, yylen);
+        stack_type::slice range (yystack_, yylen);
+        YYLLOC_DEFAULT (yylhs.location, range, yylen);
         yyerror_range[1].location = yylhs.location;
       }
 
@@ -721,286 +722,286 @@ namespace isc { namespace dhcp {
           switch (yyn)
             {
   case 2:
-#line 277 "dhcp6_parser.yy" // lalr1.cc:907
+#line 277 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.NO_KEYWORD; }
-#line 727 "dhcp6_parser.cc" // lalr1.cc:907
+#line 728 "dhcp6_parser.cc"
     break;
 
   case 4:
-#line 278 "dhcp6_parser.yy" // lalr1.cc:907
+#line 278 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.CONFIG; }
-#line 733 "dhcp6_parser.cc" // lalr1.cc:907
+#line 734 "dhcp6_parser.cc"
     break;
 
   case 6:
-#line 279 "dhcp6_parser.yy" // lalr1.cc:907
+#line 279 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.DHCP6; }
-#line 739 "dhcp6_parser.cc" // lalr1.cc:907
+#line 740 "dhcp6_parser.cc"
     break;
 
   case 8:
-#line 280 "dhcp6_parser.yy" // lalr1.cc:907
+#line 280 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.INTERFACES_CONFIG; }
-#line 745 "dhcp6_parser.cc" // lalr1.cc:907
+#line 746 "dhcp6_parser.cc"
     break;
 
   case 10:
-#line 281 "dhcp6_parser.yy" // lalr1.cc:907
+#line 281 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.SUBNET6; }
-#line 751 "dhcp6_parser.cc" // lalr1.cc:907
+#line 752 "dhcp6_parser.cc"
     break;
 
   case 12:
-#line 282 "dhcp6_parser.yy" // lalr1.cc:907
+#line 282 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.POOLS; }
-#line 757 "dhcp6_parser.cc" // lalr1.cc:907
+#line 758 "dhcp6_parser.cc"
     break;
 
   case 14:
-#line 283 "dhcp6_parser.yy" // lalr1.cc:907
+#line 283 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.PD_POOLS; }
-#line 763 "dhcp6_parser.cc" // lalr1.cc:907
+#line 764 "dhcp6_parser.cc"
     break;
 
   case 16:
-#line 284 "dhcp6_parser.yy" // lalr1.cc:907
+#line 284 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.RESERVATIONS; }
-#line 769 "dhcp6_parser.cc" // lalr1.cc:907
+#line 770 "dhcp6_parser.cc"
     break;
 
   case 18:
-#line 285 "dhcp6_parser.yy" // lalr1.cc:907
+#line 285 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.DHCP6; }
-#line 775 "dhcp6_parser.cc" // lalr1.cc:907
+#line 776 "dhcp6_parser.cc"
     break;
 
   case 20:
-#line 286 "dhcp6_parser.yy" // lalr1.cc:907
+#line 286 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.OPTION_DEF; }
-#line 781 "dhcp6_parser.cc" // lalr1.cc:907
+#line 782 "dhcp6_parser.cc"
     break;
 
   case 22:
-#line 287 "dhcp6_parser.yy" // lalr1.cc:907
+#line 287 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.OPTION_DATA; }
-#line 787 "dhcp6_parser.cc" // lalr1.cc:907
+#line 788 "dhcp6_parser.cc"
     break;
 
   case 24:
-#line 288 "dhcp6_parser.yy" // lalr1.cc:907
+#line 288 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.HOOKS_LIBRARIES; }
-#line 793 "dhcp6_parser.cc" // lalr1.cc:907
+#line 794 "dhcp6_parser.cc"
     break;
 
   case 26:
-#line 289 "dhcp6_parser.yy" // lalr1.cc:907
+#line 289 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.DHCP_DDNS; }
-#line 799 "dhcp6_parser.cc" // lalr1.cc:907
+#line 800 "dhcp6_parser.cc"
     break;
 
   case 28:
-#line 290 "dhcp6_parser.yy" // lalr1.cc:907
+#line 290 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.LOGGING; }
-#line 805 "dhcp6_parser.cc" // lalr1.cc:907
+#line 806 "dhcp6_parser.cc"
     break;
 
   case 30:
-#line 291 "dhcp6_parser.yy" // lalr1.cc:907
+#line 291 "dhcp6_parser.yy"
     { ctx.ctx_ = ctx.CONFIG_CONTROL; }
-#line 811 "dhcp6_parser.cc" // lalr1.cc:907
+#line 812 "dhcp6_parser.cc"
     break;
 
   case 32:
-#line 299 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); }
-#line 817 "dhcp6_parser.cc" // lalr1.cc:907
+#line 299 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location))); }
+#line 818 "dhcp6_parser.cc"
     break;
 
   case 33:
-#line 300 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); }
-#line 823 "dhcp6_parser.cc" // lalr1.cc:907
+#line 300 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location))); }
+#line 824 "dhcp6_parser.cc"
     break;
 
   case 34:
-#line 301 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); }
-#line 829 "dhcp6_parser.cc" // lalr1.cc:907
+#line 301 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location))); }
+#line 830 "dhcp6_parser.cc"
     break;
 
   case 35:
-#line 302 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); }
-#line 835 "dhcp6_parser.cc" // lalr1.cc:907
+#line 302 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location))); }
+#line 836 "dhcp6_parser.cc"
     break;
 
   case 36:
-#line 303 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); }
-#line 841 "dhcp6_parser.cc" // lalr1.cc:907
+#line 303 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); }
+#line 842 "dhcp6_parser.cc"
     break;
 
   case 37:
-#line 304 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 847 "dhcp6_parser.cc" // lalr1.cc:907
+#line 304 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
+#line 848 "dhcp6_parser.cc"
     break;
 
   case 38:
-#line 305 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 853 "dhcp6_parser.cc" // lalr1.cc:907
+#line 305 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
+#line 854 "dhcp6_parser.cc"
     break;
 
   case 39:
-#line 308 "dhcp6_parser.yy" // lalr1.cc:907
+#line 308 "dhcp6_parser.yy"
     {
     // Push back the JSON value on the stack
-    ctx.stack_.push_back(yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.push_back(yystack_[0].value.as < ElementPtr > ());
 }
-#line 862 "dhcp6_parser.cc" // lalr1.cc:907
+#line 863 "dhcp6_parser.cc"
     break;
 
   case 40:
-#line 313 "dhcp6_parser.yy" // lalr1.cc:907
+#line 313 "dhcp6_parser.yy"
     {
     // This code is executed when we're about to start parsing
     // the content of the map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 873 "dhcp6_parser.cc" // lalr1.cc:907
+#line 874 "dhcp6_parser.cc"
     break;
 
   case 41:
-#line 318 "dhcp6_parser.yy" // lalr1.cc:907
+#line 318 "dhcp6_parser.yy"
     {
     // map parsing completed. If we ever want to do any wrap up
     // (maybe some sanity checking), this would be the best place
     // for it.
 }
-#line 883 "dhcp6_parser.cc" // lalr1.cc:907
+#line 884 "dhcp6_parser.cc"
     break;
 
   case 42:
-#line 324 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 889 "dhcp6_parser.cc" // lalr1.cc:907
+#line 324 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
+#line 890 "dhcp6_parser.cc"
     break;
 
   case 45:
-#line 331 "dhcp6_parser.yy" // lalr1.cc:907
+#line 331 "dhcp6_parser.yy"
     {
                   // map containing a single entry
-                  ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ());
+                  ctx.stack_.back()->set(yystack_[2].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
                   }
-#line 898 "dhcp6_parser.cc" // lalr1.cc:907
+#line 899 "dhcp6_parser.cc"
     break;
 
   case 46:
-#line 335 "dhcp6_parser.yy" // lalr1.cc:907
+#line 335 "dhcp6_parser.yy"
     {
                   // map consisting of a shorter map followed by
                   // comma and string:value
-                  ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ());
+                  ctx.stack_.back()->set(yystack_[2].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
                   }
-#line 908 "dhcp6_parser.cc" // lalr1.cc:907
+#line 909 "dhcp6_parser.cc"
     break;
 
   case 47:
-#line 342 "dhcp6_parser.yy" // lalr1.cc:907
+#line 342 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
 }
-#line 917 "dhcp6_parser.cc" // lalr1.cc:907
+#line 918 "dhcp6_parser.cc"
     break;
 
   case 48:
-#line 345 "dhcp6_parser.yy" // lalr1.cc:907
+#line 345 "dhcp6_parser.yy"
     {
     // list parsing complete. Put any sanity checking here
 }
-#line 925 "dhcp6_parser.cc" // lalr1.cc:907
+#line 926 "dhcp6_parser.cc"
     break;
 
   case 51:
-#line 353 "dhcp6_parser.yy" // lalr1.cc:907
+#line 353 "dhcp6_parser.yy"
     {
                   // List consisting of a single element.
-                  ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ());
+                  ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
                   }
-#line 934 "dhcp6_parser.cc" // lalr1.cc:907
+#line 935 "dhcp6_parser.cc"
     break;
 
   case 52:
-#line 357 "dhcp6_parser.yy" // lalr1.cc:907
+#line 357 "dhcp6_parser.yy"
     {
                   // List ending with , and a value.
-                  ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ());
+                  ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
                   }
-#line 943 "dhcp6_parser.cc" // lalr1.cc:907
+#line 944 "dhcp6_parser.cc"
     break;
 
   case 53:
-#line 364 "dhcp6_parser.yy" // lalr1.cc:907
+#line 364 "dhcp6_parser.yy"
     {
     // List parsing about to start
 }
-#line 951 "dhcp6_parser.cc" // lalr1.cc:907
+#line 952 "dhcp6_parser.cc"
     break;
 
   case 54:
-#line 366 "dhcp6_parser.yy" // lalr1.cc:907
+#line 366 "dhcp6_parser.yy"
     {
     // list parsing complete. Put any sanity checking here
     //ctx.stack_.pop_back();
 }
-#line 960 "dhcp6_parser.cc" // lalr1.cc:907
+#line 961 "dhcp6_parser.cc"
     break;
 
   case 57:
-#line 375 "dhcp6_parser.yy" // lalr1.cc:907
+#line 375 "dhcp6_parser.yy"
     {
-                          ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+                          ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
                           ctx.stack_.back()->add(s);
                           }
-#line 969 "dhcp6_parser.cc" // lalr1.cc:907
+#line 970 "dhcp6_parser.cc"
     break;
 
   case 58:
-#line 379 "dhcp6_parser.yy" // lalr1.cc:907
+#line 379 "dhcp6_parser.yy"
     {
-                          ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+                          ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
                           ctx.stack_.back()->add(s);
                           }
-#line 978 "dhcp6_parser.cc" // lalr1.cc:907
+#line 979 "dhcp6_parser.cc"
     break;
 
   case 59:
-#line 390 "dhcp6_parser.yy" // lalr1.cc:907
+#line 390 "dhcp6_parser.yy"
     {
     const std::string& where = ctx.contextName();
-    const std::string& keyword = yystack_[1].value.as< std::string > ();
+    const std::string& keyword = yystack_[1].value.as < std::string > ();
     error(yystack_[1].location,
           "got unexpected keyword \"" + keyword + "\" in " + where + " map.");
 }
-#line 989 "dhcp6_parser.cc" // lalr1.cc:907
+#line 990 "dhcp6_parser.cc"
     break;
 
   case 60:
-#line 400 "dhcp6_parser.yy" // lalr1.cc:907
+#line 400 "dhcp6_parser.yy"
     {
     // This code is executed when we're about to start parsing
     // the content of the map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1000 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1001 "dhcp6_parser.cc"
     break;
 
   case 61:
-#line 405 "dhcp6_parser.yy" // lalr1.cc:907
+#line 405 "dhcp6_parser.yy"
     {
     // map parsing completed. If we ever want to do any wrap up
     // (maybe some sanity checking), this would be the best place
@@ -1009,11 +1010,11 @@ namespace isc { namespace dhcp {
     // Dhcp6 is required
     ctx.require("Dhcp6", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
 }
-#line 1013 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1014 "dhcp6_parser.cc"
     break;
 
   case 70:
-#line 428 "dhcp6_parser.yy" // lalr1.cc:907
+#line 428 "dhcp6_parser.yy"
     {
     // This code is executed when we're about to start parsing
     // the content of the map
@@ -1022,1122 +1023,1122 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.DHCP6);
 }
-#line 1026 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1027 "dhcp6_parser.cc"
     break;
 
   case 71:
-#line 435 "dhcp6_parser.yy" // lalr1.cc:907
+#line 435 "dhcp6_parser.yy"
     {
     // No global parameter is required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1036 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1037 "dhcp6_parser.cc"
     break;
 
   case 72:
-#line 443 "dhcp6_parser.yy" // lalr1.cc:907
+#line 443 "dhcp6_parser.yy"
     {
     // Parse the Dhcp6 map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1046 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1047 "dhcp6_parser.cc"
     break;
 
   case 73:
-#line 447 "dhcp6_parser.yy" // lalr1.cc:907
+#line 447 "dhcp6_parser.yy"
     {
     // No global parameter is required
     // parsing completed
 }
-#line 1055 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1056 "dhcp6_parser.cc"
     break;
 
   case 125:
-#line 509 "dhcp6_parser.yy" // lalr1.cc:907
+#line 509 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1063 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1064 "dhcp6_parser.cc"
     break;
 
   case 126:
-#line 511 "dhcp6_parser.yy" // lalr1.cc:907
+#line 511 "dhcp6_parser.yy"
     {
-    ElementPtr datadir(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr datadir(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data-directory", datadir);
     ctx.leave();
 }
-#line 1073 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1074 "dhcp6_parser.cc"
     break;
 
   case 127:
-#line 517 "dhcp6_parser.yy" // lalr1.cc:907
+#line 517 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("preferred-lifetime", prf);
 }
-#line 1082 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1083 "dhcp6_parser.cc"
     break;
 
   case 128:
-#line 522 "dhcp6_parser.yy" // lalr1.cc:907
+#line 522 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("min-preferred-lifetime", prf);
 }
-#line 1091 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1092 "dhcp6_parser.cc"
     break;
 
   case 129:
-#line 527 "dhcp6_parser.yy" // lalr1.cc:907
+#line 527 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-preferred-lifetime", prf);
 }
-#line 1100 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1101 "dhcp6_parser.cc"
     break;
 
   case 130:
-#line 532 "dhcp6_parser.yy" // lalr1.cc:907
+#line 532 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("valid-lifetime", prf);
 }
-#line 1109 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1110 "dhcp6_parser.cc"
     break;
 
   case 131:
-#line 537 "dhcp6_parser.yy" // lalr1.cc:907
+#line 537 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("min-valid-lifetime", prf);
 }
-#line 1118 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1119 "dhcp6_parser.cc"
     break;
 
   case 132:
-#line 542 "dhcp6_parser.yy" // lalr1.cc:907
+#line 542 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-valid-lifetime", prf);
 }
-#line 1127 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1128 "dhcp6_parser.cc"
     break;
 
   case 133:
-#line 547 "dhcp6_parser.yy" // lalr1.cc:907
+#line 547 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("renew-timer", prf);
 }
-#line 1136 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1137 "dhcp6_parser.cc"
     break;
 
   case 134:
-#line 552 "dhcp6_parser.yy" // lalr1.cc:907
+#line 552 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rebind-timer", prf);
 }
-#line 1145 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1146 "dhcp6_parser.cc"
     break;
 
   case 135:
-#line 557 "dhcp6_parser.yy" // lalr1.cc:907
+#line 557 "dhcp6_parser.yy"
     {
-    ElementPtr ctt(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr ctt(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("calculate-tee-times", ctt);
 }
-#line 1154 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1155 "dhcp6_parser.cc"
     break;
 
   case 136:
-#line 562 "dhcp6_parser.yy" // lalr1.cc:907
+#line 562 "dhcp6_parser.yy"
     {
-    ElementPtr t1(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr t1(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("t1-percent", t1);
 }
-#line 1163 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1164 "dhcp6_parser.cc"
     break;
 
   case 137:
-#line 567 "dhcp6_parser.yy" // lalr1.cc:907
+#line 567 "dhcp6_parser.yy"
     {
-    ElementPtr t2(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr t2(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("t2-percent", t2);
 }
-#line 1172 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1173 "dhcp6_parser.cc"
     break;
 
   case 138:
-#line 572 "dhcp6_parser.yy" // lalr1.cc:907
+#line 572 "dhcp6_parser.yy"
     {
-    ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr dpp(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("decline-probation-period", dpp);
 }
-#line 1181 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1182 "dhcp6_parser.cc"
     break;
 
   case 139:
-#line 577 "dhcp6_parser.yy" // lalr1.cc:907
+#line 577 "dhcp6_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-send-updates", b);
 }
-#line 1190 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1191 "dhcp6_parser.cc"
     break;
 
   case 140:
-#line 582 "dhcp6_parser.yy" // lalr1.cc:907
+#line 582 "dhcp6_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-override-no-update", b);
 }
-#line 1199 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1200 "dhcp6_parser.cc"
     break;
 
   case 141:
-#line 587 "dhcp6_parser.yy" // lalr1.cc:907
+#line 587 "dhcp6_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-override-client-update", b);
 }
-#line 1208 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1209 "dhcp6_parser.cc"
     break;
 
   case 142:
-#line 592 "dhcp6_parser.yy" // lalr1.cc:907
+#line 592 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
-#line 1216 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1217 "dhcp6_parser.cc"
     break;
 
   case 143:
-#line 594 "dhcp6_parser.yy" // lalr1.cc:907
+#line 594 "dhcp6_parser.yy"
     {
-    ctx.stack_.back()->set("ddns-replace-client-name", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("ddns-replace-client-name", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1225 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1226 "dhcp6_parser.cc"
     break;
 
   case 144:
-#line 600 "dhcp6_parser.yy" // lalr1.cc:907
+#line 600 "dhcp6_parser.yy"
     {
-      yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location)));
+      yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location)));
       }
-#line 1233 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1234 "dhcp6_parser.cc"
     break;
 
   case 145:
-#line 603 "dhcp6_parser.yy" // lalr1.cc:907
+#line 603 "dhcp6_parser.yy"
     {
-      yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
+      yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
-#line 1241 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1242 "dhcp6_parser.cc"
     break;
 
   case 146:
-#line 606 "dhcp6_parser.yy" // lalr1.cc:907
+#line 606 "dhcp6_parser.yy"
     {
-      yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
+      yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
-#line 1249 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1250 "dhcp6_parser.cc"
     break;
 
   case 147:
-#line 609 "dhcp6_parser.yy" // lalr1.cc:907
+#line 609 "dhcp6_parser.yy"
     {
-      yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
+      yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
-#line 1257 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1258 "dhcp6_parser.cc"
     break;
 
   case 148:
-#line 612 "dhcp6_parser.yy" // lalr1.cc:907
+#line 612 "dhcp6_parser.yy"
     {
       error(yystack_[0].location, "boolean values for the replace-client-name are "
                 "no longer supported");
       }
-#line 1266 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1267 "dhcp6_parser.cc"
     break;
 
   case 149:
-#line 618 "dhcp6_parser.yy" // lalr1.cc:907
+#line 618 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1274 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1275 "dhcp6_parser.cc"
     break;
 
   case 150:
-#line 620 "dhcp6_parser.yy" // lalr1.cc:907
+#line 620 "dhcp6_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-generated-prefix", s);
     ctx.leave();
 }
-#line 1284 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1285 "dhcp6_parser.cc"
     break;
 
   case 151:
-#line 626 "dhcp6_parser.yy" // lalr1.cc:907
+#line 626 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1292 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1293 "dhcp6_parser.cc"
     break;
 
   case 152:
-#line 628 "dhcp6_parser.yy" // lalr1.cc:907
+#line 628 "dhcp6_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-qualifying-suffix", s);
     ctx.leave();
 }
-#line 1302 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1303 "dhcp6_parser.cc"
     break;
 
   case 153:
-#line 634 "dhcp6_parser.yy" // lalr1.cc:907
+#line 634 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1310 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1311 "dhcp6_parser.cc"
     break;
 
   case 154:
-#line 636 "dhcp6_parser.yy" // lalr1.cc:907
+#line 636 "dhcp6_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-set", s);
     ctx.leave();
 }
-#line 1320 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1321 "dhcp6_parser.cc"
     break;
 
   case 155:
-#line 642 "dhcp6_parser.yy" // lalr1.cc:907
+#line 642 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1328 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1329 "dhcp6_parser.cc"
     break;
 
   case 156:
-#line 644 "dhcp6_parser.yy" // lalr1.cc:907
+#line 644 "dhcp6_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-replacement", s);
     ctx.leave();
 }
-#line 1338 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1339 "dhcp6_parser.cc"
     break;
 
   case 157:
-#line 650 "dhcp6_parser.yy" // lalr1.cc:907
+#line 650 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1346 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1347 "dhcp6_parser.cc"
     break;
 
   case 158:
-#line 652 "dhcp6_parser.yy" // lalr1.cc:907
+#line 652 "dhcp6_parser.yy"
     {
-    ElementPtr stag(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr stag(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-tag", stag);
     ctx.leave();
 }
-#line 1356 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1357 "dhcp6_parser.cc"
     break;
 
   case 159:
-#line 658 "dhcp6_parser.yy" // lalr1.cc:907
+#line 658 "dhcp6_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces-config", i);
     ctx.stack_.push_back(i);
     ctx.enter(ctx.INTERFACES_CONFIG);
 }
-#line 1367 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1368 "dhcp6_parser.cc"
     break;
 
   case 160:
-#line 663 "dhcp6_parser.yy" // lalr1.cc:907
+#line 663 "dhcp6_parser.yy"
     {
     // No interfaces config param is required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1377 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1378 "dhcp6_parser.cc"
     break;
 
   case 161:
-#line 669 "dhcp6_parser.yy" // lalr1.cc:907
+#line 669 "dhcp6_parser.yy"
     {
     // Parse the interfaces-config map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1387 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1388 "dhcp6_parser.cc"
     break;
 
   case 162:
-#line 673 "dhcp6_parser.yy" // lalr1.cc:907
+#line 673 "dhcp6_parser.yy"
     {
     // No interfaces config param is required
     // parsing completed
 }
-#line 1396 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1397 "dhcp6_parser.cc"
     break;
 
   case 170:
-#line 689 "dhcp6_parser.yy" // lalr1.cc:907
+#line 689 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interfaces", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1407 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1408 "dhcp6_parser.cc"
     break;
 
   case 171:
-#line 694 "dhcp6_parser.yy" // lalr1.cc:907
+#line 694 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1416 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1417 "dhcp6_parser.cc"
     break;
 
   case 172:
-#line 699 "dhcp6_parser.yy" // lalr1.cc:907
+#line 699 "dhcp6_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("re-detect", b);
 }
-#line 1425 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1426 "dhcp6_parser.cc"
     break;
 
   case 173:
-#line 705 "dhcp6_parser.yy" // lalr1.cc:907
+#line 705 "dhcp6_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lease-database", i);
     ctx.stack_.push_back(i);
     ctx.enter(ctx.LEASE_DATABASE);
 }
-#line 1436 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1437 "dhcp6_parser.cc"
     break;
 
   case 174:
-#line 710 "dhcp6_parser.yy" // lalr1.cc:907
+#line 710 "dhcp6_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1447 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1448 "dhcp6_parser.cc"
     break;
 
   case 175:
-#line 717 "dhcp6_parser.yy" // lalr1.cc:907
+#line 717 "dhcp6_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-database", i);
     ctx.stack_.push_back(i);
     ctx.enter(ctx.HOSTS_DATABASE);
 }
-#line 1458 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1459 "dhcp6_parser.cc"
     break;
 
   case 176:
-#line 722 "dhcp6_parser.yy" // lalr1.cc:907
+#line 722 "dhcp6_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1469 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1470 "dhcp6_parser.cc"
     break;
 
   case 177:
-#line 729 "dhcp6_parser.yy" // lalr1.cc:907
+#line 729 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hosts-databases", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.HOSTS_DATABASE);
 }
-#line 1480 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1481 "dhcp6_parser.cc"
     break;
 
   case 178:
-#line 734 "dhcp6_parser.yy" // lalr1.cc:907
+#line 734 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1489 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1490 "dhcp6_parser.cc"
     break;
 
   case 183:
-#line 747 "dhcp6_parser.yy" // lalr1.cc:907
+#line 747 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1499 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1500 "dhcp6_parser.cc"
     break;
 
   case 184:
-#line 751 "dhcp6_parser.yy" // lalr1.cc:907
+#line 751 "dhcp6_parser.yy"
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 1509 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1510 "dhcp6_parser.cc"
     break;
 
   case 208:
-#line 784 "dhcp6_parser.yy" // lalr1.cc:907
+#line 784 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.DATABASE_TYPE);
 }
-#line 1517 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1518 "dhcp6_parser.cc"
     break;
 
   case 209:
-#line 786 "dhcp6_parser.yy" // lalr1.cc:907
+#line 786 "dhcp6_parser.yy"
     {
-    ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1526 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1527 "dhcp6_parser.cc"
     break;
 
   case 210:
-#line 791 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); }
-#line 1532 "dhcp6_parser.cc" // lalr1.cc:907
+#line 791 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); }
+#line 1533 "dhcp6_parser.cc"
     break;
 
   case 211:
-#line 792 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); }
-#line 1538 "dhcp6_parser.cc" // lalr1.cc:907
+#line 792 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); }
+#line 1539 "dhcp6_parser.cc"
     break;
 
   case 212:
-#line 793 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); }
-#line 1544 "dhcp6_parser.cc" // lalr1.cc:907
+#line 793 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); }
+#line 1545 "dhcp6_parser.cc"
     break;
 
   case 213:
-#line 794 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); }
-#line 1550 "dhcp6_parser.cc" // lalr1.cc:907
+#line 794 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); }
+#line 1551 "dhcp6_parser.cc"
     break;
 
   case 214:
-#line 797 "dhcp6_parser.yy" // lalr1.cc:907
+#line 797 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1558 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1559 "dhcp6_parser.cc"
     break;
 
   case 215:
-#line 799 "dhcp6_parser.yy" // lalr1.cc:907
+#line 799 "dhcp6_parser.yy"
     {
-    ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr user(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user", user);
     ctx.leave();
 }
-#line 1568 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1569 "dhcp6_parser.cc"
     break;
 
   case 216:
-#line 805 "dhcp6_parser.yy" // lalr1.cc:907
+#line 805 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1576 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1577 "dhcp6_parser.cc"
     break;
 
   case 217:
-#line 807 "dhcp6_parser.yy" // lalr1.cc:907
+#line 807 "dhcp6_parser.yy"
     {
-    ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr pwd(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password", pwd);
     ctx.leave();
 }
-#line 1586 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1587 "dhcp6_parser.cc"
     break;
 
   case 218:
-#line 813 "dhcp6_parser.yy" // lalr1.cc:907
+#line 813 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1594 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1595 "dhcp6_parser.cc"
     break;
 
   case 219:
-#line 815 "dhcp6_parser.yy" // lalr1.cc:907
+#line 815 "dhcp6_parser.yy"
     {
-    ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr h(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host", h);
     ctx.leave();
 }
-#line 1604 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1605 "dhcp6_parser.cc"
     break;
 
   case 220:
-#line 821 "dhcp6_parser.yy" // lalr1.cc:907
+#line 821 "dhcp6_parser.yy"
     {
-    ElementPtr p(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr p(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", p);
 }
-#line 1613 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1614 "dhcp6_parser.cc"
     break;
 
   case 221:
-#line 826 "dhcp6_parser.yy" // lalr1.cc:907
+#line 826 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1621 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1622 "dhcp6_parser.cc"
     break;
 
   case 222:
-#line 828 "dhcp6_parser.yy" // lalr1.cc:907
+#line 828 "dhcp6_parser.yy"
     {
-    ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr name(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
     ctx.leave();
 }
-#line 1631 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1632 "dhcp6_parser.cc"
     break;
 
   case 223:
-#line 834 "dhcp6_parser.yy" // lalr1.cc:907
+#line 834 "dhcp6_parser.yy"
     {
-    ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("persist", n);
 }
-#line 1640 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1641 "dhcp6_parser.cc"
     break;
 
   case 224:
-#line 839 "dhcp6_parser.yy" // lalr1.cc:907
+#line 839 "dhcp6_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lfc-interval", n);
 }
-#line 1649 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1650 "dhcp6_parser.cc"
     break;
 
   case 225:
-#line 844 "dhcp6_parser.yy" // lalr1.cc:907
+#line 844 "dhcp6_parser.yy"
     {
-    ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("readonly", n);
 }
-#line 1658 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1659 "dhcp6_parser.cc"
     break;
 
   case 226:
-#line 849 "dhcp6_parser.yy" // lalr1.cc:907
+#line 849 "dhcp6_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("connect-timeout", n);
 }
-#line 1667 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1668 "dhcp6_parser.cc"
     break;
 
   case 227:
-#line 854 "dhcp6_parser.yy" // lalr1.cc:907
+#line 854 "dhcp6_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reconnect-wait-time", n);
 }
-#line 1676 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1677 "dhcp6_parser.cc"
     break;
 
   case 228:
-#line 859 "dhcp6_parser.yy" // lalr1.cc:907
+#line 859 "dhcp6_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-row-errors", n);
 }
-#line 1685 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1686 "dhcp6_parser.cc"
     break;
 
   case 229:
-#line 864 "dhcp6_parser.yy" // lalr1.cc:907
+#line 864 "dhcp6_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("request-timeout", n);
 }
-#line 1694 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1695 "dhcp6_parser.cc"
     break;
 
   case 230:
-#line 869 "dhcp6_parser.yy" // lalr1.cc:907
+#line 869 "dhcp6_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-keepalive", n);
 }
-#line 1703 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1704 "dhcp6_parser.cc"
     break;
 
   case 231:
-#line 874 "dhcp6_parser.yy" // lalr1.cc:907
+#line 874 "dhcp6_parser.yy"
     {
-    ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-nodelay", n);
 }
-#line 1712 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1713 "dhcp6_parser.cc"
     break;
 
   case 232:
-#line 879 "dhcp6_parser.yy" // lalr1.cc:907
+#line 879 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1720 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1721 "dhcp6_parser.cc"
     break;
 
   case 233:
-#line 881 "dhcp6_parser.yy" // lalr1.cc:907
+#line 881 "dhcp6_parser.yy"
     {
-    ElementPtr cp(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr cp(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("contact-points", cp);
     ctx.leave();
 }
-#line 1730 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1731 "dhcp6_parser.cc"
     break;
 
   case 234:
-#line 887 "dhcp6_parser.yy" // lalr1.cc:907
+#line 887 "dhcp6_parser.yy"
     {
-    ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reconnect-tries", n);
 }
-#line 1739 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1740 "dhcp6_parser.cc"
     break;
 
   case 235:
-#line 892 "dhcp6_parser.yy" // lalr1.cc:907
+#line 892 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1747 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1748 "dhcp6_parser.cc"
     break;
 
   case 236:
-#line 894 "dhcp6_parser.yy" // lalr1.cc:907
+#line 894 "dhcp6_parser.yy"
     {
-    ElementPtr ks(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr ks(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("keyspace", ks);
     ctx.leave();
 }
-#line 1757 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1758 "dhcp6_parser.cc"
     break;
 
   case 237:
-#line 900 "dhcp6_parser.yy" // lalr1.cc:907
+#line 900 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1765 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1766 "dhcp6_parser.cc"
     break;
 
   case 238:
-#line 902 "dhcp6_parser.yy" // lalr1.cc:907
+#line 902 "dhcp6_parser.yy"
     {
-    ElementPtr c(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr c(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("consistency", c);
     ctx.leave();
 }
-#line 1775 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1776 "dhcp6_parser.cc"
     break;
 
   case 239:
-#line 908 "dhcp6_parser.yy" // lalr1.cc:907
+#line 908 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1783 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1784 "dhcp6_parser.cc"
     break;
 
   case 240:
-#line 910 "dhcp6_parser.yy" // lalr1.cc:907
+#line 910 "dhcp6_parser.yy"
     {
-    ElementPtr c(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr c(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("serial-consistency", c);
     ctx.leave();
 }
-#line 1793 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1794 "dhcp6_parser.cc"
     break;
 
   case 241:
-#line 916 "dhcp6_parser.yy" // lalr1.cc:907
+#line 916 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sanity-checks", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SANITY_CHECKS);
 }
-#line 1804 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1805 "dhcp6_parser.cc"
     break;
 
   case 242:
-#line 921 "dhcp6_parser.yy" // lalr1.cc:907
+#line 921 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1813 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1814 "dhcp6_parser.cc"
     break;
 
   case 246:
-#line 931 "dhcp6_parser.yy" // lalr1.cc:907
+#line 931 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1821 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1822 "dhcp6_parser.cc"
     break;
 
   case 247:
-#line 933 "dhcp6_parser.yy" // lalr1.cc:907
+#line 933 "dhcp6_parser.yy"
     {
 
-    if ( (string(yystack_[0].value.as< std::string > ()) == "none") ||
-         (string(yystack_[0].value.as< std::string > ()) == "warn") ||
-         (string(yystack_[0].value.as< std::string > ()) == "fix") ||
-         (string(yystack_[0].value.as< std::string > ()) == "fix-del") ||
-         (string(yystack_[0].value.as< std::string > ()) == "del")) {
-        ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    if ( (string(yystack_[0].value.as < std::string > ()) == "none") ||
+         (string(yystack_[0].value.as < std::string > ()) == "warn") ||
+         (string(yystack_[0].value.as < std::string > ()) == "fix") ||
+         (string(yystack_[0].value.as < std::string > ()) == "fix-del") ||
+         (string(yystack_[0].value.as < std::string > ()) == "del")) {
+        ElementPtr user(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
         ctx.stack_.back()->set("lease-checks", user);
         ctx.leave();
     } else {
-        error(yystack_[0].location, "Unsupported 'lease-checks value: " + string(yystack_[0].value.as< std::string > ()) +
+        error(yystack_[0].location, "Unsupported 'lease-checks value: " + string(yystack_[0].value.as < std::string > ()) +
               ", supported values are: none, warn, fix, fix-del, del");
     }
 }
-#line 1841 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1842 "dhcp6_parser.cc"
     break;
 
   case 248:
-#line 949 "dhcp6_parser.yy" // lalr1.cc:907
+#line 949 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("mac-sources", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.MAC_SOURCES);
 }
-#line 1852 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1853 "dhcp6_parser.cc"
     break;
 
   case 249:
-#line 954 "dhcp6_parser.yy" // lalr1.cc:907
+#line 954 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1861 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1862 "dhcp6_parser.cc"
     break;
 
   case 254:
-#line 967 "dhcp6_parser.yy" // lalr1.cc:907
+#line 967 "dhcp6_parser.yy"
     {
     ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
 }
-#line 1870 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1871 "dhcp6_parser.cc"
     break;
 
   case 255:
-#line 972 "dhcp6_parser.yy" // lalr1.cc:907
+#line 972 "dhcp6_parser.yy"
     {
-    ElementPtr duid(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr duid(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
 }
-#line 1879 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1880 "dhcp6_parser.cc"
     break;
 
   case 256:
-#line 977 "dhcp6_parser.yy" // lalr1.cc:907
+#line 977 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host-reservation-identifiers", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.HOST_RESERVATION_IDENTIFIERS);
 }
-#line 1890 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1891 "dhcp6_parser.cc"
     break;
 
   case 257:
-#line 982 "dhcp6_parser.yy" // lalr1.cc:907
+#line 982 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1899 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1900 "dhcp6_parser.cc"
     break;
 
   case 263:
-#line 996 "dhcp6_parser.yy" // lalr1.cc:907
+#line 996 "dhcp6_parser.yy"
     {
     ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(hwaddr);
 }
-#line 1908 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1909 "dhcp6_parser.cc"
     break;
 
   case 264:
-#line 1001 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1001 "dhcp6_parser.yy"
     {
     ElementPtr flex_id(new StringElement("flex-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(flex_id);
 }
-#line 1917 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1918 "dhcp6_parser.cc"
     break;
 
   case 265:
-#line 1008 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1008 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay-supplied-options", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1928 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1929 "dhcp6_parser.cc"
     break;
 
   case 266:
-#line 1013 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1013 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1937 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1938 "dhcp6_parser.cc"
     break;
 
   case 267:
-#line 1018 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1018 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hooks-libraries", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.HOOKS_LIBRARIES);
 }
-#line 1948 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1949 "dhcp6_parser.cc"
     break;
 
   case 268:
-#line 1023 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1023 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1957 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1958 "dhcp6_parser.cc"
     break;
 
   case 273:
-#line 1036 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1036 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1967 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1968 "dhcp6_parser.cc"
     break;
 
   case 274:
-#line 1040 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1040 "dhcp6_parser.yy"
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 1977 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1978 "dhcp6_parser.cc"
     break;
 
   case 275:
-#line 1046 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1046 "dhcp6_parser.yy"
     {
     // Parse the hooks-libraries list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1987 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1988 "dhcp6_parser.cc"
     break;
 
   case 276:
-#line 1050 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1050 "dhcp6_parser.yy"
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 1997 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1998 "dhcp6_parser.cc"
     break;
 
   case 282:
-#line 1065 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1065 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2005 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2006 "dhcp6_parser.cc"
     break;
 
   case 283:
-#line 1067 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1067 "dhcp6_parser.yy"
     {
-    ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr lib(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("library", lib);
     ctx.leave();
 }
-#line 2015 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2016 "dhcp6_parser.cc"
     break;
 
   case 284:
-#line 1073 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1073 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2023 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2024 "dhcp6_parser.cc"
     break;
 
   case 285:
-#line 1075 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1075 "dhcp6_parser.yy"
     {
-    ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 2032 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2033 "dhcp6_parser.cc"
     break;
 
   case 286:
-#line 1081 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1081 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("expired-leases-processing", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.EXPIRED_LEASES_PROCESSING);
 }
-#line 2043 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2044 "dhcp6_parser.cc"
     break;
 
   case 287:
-#line 1086 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1086 "dhcp6_parser.yy"
     {
     // No expired lease parameter is required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2053 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2054 "dhcp6_parser.cc"
     break;
 
   case 296:
-#line 1104 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1104 "dhcp6_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reclaim-timer-wait-time", value);
 }
-#line 2062 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2063 "dhcp6_parser.cc"
     break;
 
   case 297:
-#line 1109 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1109 "dhcp6_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush-reclaimed-timer-wait-time", value);
 }
-#line 2071 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2072 "dhcp6_parser.cc"
     break;
 
   case 298:
-#line 1114 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1114 "dhcp6_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hold-reclaimed-time", value);
 }
-#line 2080 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2081 "dhcp6_parser.cc"
     break;
 
   case 299:
-#line 1119 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1119 "dhcp6_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-leases", value);
 }
-#line 2089 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2090 "dhcp6_parser.cc"
     break;
 
   case 300:
-#line 1124 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1124 "dhcp6_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-time", value);
 }
-#line 2098 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2099 "dhcp6_parser.cc"
     break;
 
   case 301:
-#line 1129 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1129 "dhcp6_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("unwarned-reclaim-cycles", value);
 }
-#line 2107 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2108 "dhcp6_parser.cc"
     break;
 
   case 302:
-#line 1137 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1137 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet6", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.SUBNET6);
 }
-#line 2118 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2119 "dhcp6_parser.cc"
     break;
 
   case 303:
-#line 1142 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1142 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2127 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2128 "dhcp6_parser.cc"
     break;
 
   case 308:
-#line 1162 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1162 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2137 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2138 "dhcp6_parser.cc"
     break;
 
   case 309:
-#line 1166 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1166 "dhcp6_parser.yy"
     {
     // Once we reached this place, the subnet parsing is now complete.
     // If we want to, we can implement default values here.
@@ -2159,267 +2160,267 @@ namespace isc { namespace dhcp {
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 2163 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2164 "dhcp6_parser.cc"
     break;
 
   case 310:
-#line 1188 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1188 "dhcp6_parser.yy"
     {
     // Parse the subnet6 list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2173 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2174 "dhcp6_parser.cc"
     break;
 
   case 311:
-#line 1192 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1192 "dhcp6_parser.yy"
     {
     // The subnet subnet6 parameter is required
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 2183 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2184 "dhcp6_parser.cc"
     break;
 
   case 349:
-#line 1241 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1241 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2191 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2192 "dhcp6_parser.cc"
     break;
 
   case 350:
-#line 1243 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1243 "dhcp6_parser.yy"
     {
-    ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr subnet(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet", subnet);
     ctx.leave();
 }
-#line 2201 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2202 "dhcp6_parser.cc"
     break;
 
   case 351:
-#line 1249 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1249 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2209 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2210 "dhcp6_parser.cc"
     break;
 
   case 352:
-#line 1251 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1251 "dhcp6_parser.yy"
     {
-    ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface", iface);
     ctx.leave();
 }
-#line 2219 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2220 "dhcp6_parser.cc"
     break;
 
   case 353:
-#line 1257 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1257 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2227 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2228 "dhcp6_parser.cc"
     break;
 
   case 354:
-#line 1259 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1259 "dhcp6_parser.yy"
     {
-    ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface-id", iface);
     ctx.leave();
 }
-#line 2237 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2238 "dhcp6_parser.cc"
     break;
 
   case 355:
-#line 1265 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1265 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2245 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2246 "dhcp6_parser.cc"
     break;
 
   case 356:
-#line 1267 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1267 "dhcp6_parser.yy"
     {
-    ElementPtr cls(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr cls(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-class", cls);
     ctx.leave();
 }
-#line 2255 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2256 "dhcp6_parser.cc"
     break;
 
   case 357:
-#line 1273 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1273 "dhcp6_parser.yy"
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("require-client-classes", c);
     ctx.stack_.push_back(c);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2266 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2267 "dhcp6_parser.cc"
     break;
 
   case 358:
-#line 1278 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1278 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2275 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2276 "dhcp6_parser.cc"
     break;
 
   case 359:
-#line 1283 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1283 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.RESERVATION_MODE);
 }
-#line 2283 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2284 "dhcp6_parser.cc"
     break;
 
   case 360:
-#line 1285 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1285 "dhcp6_parser.yy"
     {
-    ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 2292 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2293 "dhcp6_parser.cc"
     break;
 
   case 361:
-#line 1290 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); }
-#line 2298 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1290 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); }
+#line 2299 "dhcp6_parser.cc"
     break;
 
   case 362:
-#line 1291 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); }
-#line 2304 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1291 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); }
+#line 2305 "dhcp6_parser.cc"
     break;
 
   case 363:
-#line 1292 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("global", ctx.loc2pos(yystack_[0].location))); }
-#line 2310 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1292 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("global", ctx.loc2pos(yystack_[0].location))); }
+#line 2311 "dhcp6_parser.cc"
     break;
 
   case 364:
-#line 1293 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); }
-#line 2316 "dhcp6_parser.cc" // lalr1.cc:907
+#line 1293 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); }
+#line 2317 "dhcp6_parser.cc"
     break;
 
   case 365:
-#line 1296 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1296 "dhcp6_parser.yy"
     {
-    ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr id(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("id", id);
 }
-#line 2325 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2326 "dhcp6_parser.cc"
     break;
 
   case 366:
-#line 1301 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1301 "dhcp6_parser.yy"
     {
-    ElementPtr rc(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr rc(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rapid-commit", rc);
 }
-#line 2334 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2335 "dhcp6_parser.cc"
     break;
 
   case 367:
-#line 1309 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1309 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("shared-networks", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.SHARED_NETWORK);
 }
-#line 2345 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2346 "dhcp6_parser.cc"
     break;
 
   case 368:
-#line 1314 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1314 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2354 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2355 "dhcp6_parser.cc"
     break;
 
   case 373:
-#line 1329 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1329 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2364 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2365 "dhcp6_parser.cc"
     break;
 
   case 374:
-#line 1333 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1333 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
 }
-#line 2372 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2373 "dhcp6_parser.cc"
     break;
 
   case 409:
-#line 1379 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1379 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-def", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OPTION_DEF);
 }
-#line 2383 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2384 "dhcp6_parser.cc"
     break;
 
   case 410:
-#line 1384 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1384 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2392 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2393 "dhcp6_parser.cc"
     break;
 
   case 411:
-#line 1392 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1392 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2401 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2402 "dhcp6_parser.cc"
     break;
 
   case 412:
-#line 1395 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1395 "dhcp6_parser.yy"
     {
     // parsing completed
 }
-#line 2409 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2410 "dhcp6_parser.cc"
     break;
 
   case 417:
-#line 1411 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1411 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2419 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2420 "dhcp6_parser.cc"
     break;
 
   case 418:
-#line 1415 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1415 "dhcp6_parser.yy"
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2427,21 +2428,21 @@ namespace isc { namespace dhcp {
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 2431 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2432 "dhcp6_parser.cc"
     break;
 
   case 419:
-#line 1426 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1426 "dhcp6_parser.yy"
     {
     // Parse the option-def list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2441 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2442 "dhcp6_parser.cc"
     break;
 
   case 420:
-#line 1430 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1430 "dhcp6_parser.yy"
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2449,283 +2450,283 @@ namespace isc { namespace dhcp {
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 2453 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2454 "dhcp6_parser.cc"
     break;
 
   case 436:
-#line 1462 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1462 "dhcp6_parser.yy"
     {
-    ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr code(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("code", code);
 }
-#line 2462 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2463 "dhcp6_parser.cc"
     break;
 
   case 438:
-#line 1469 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1469 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2470 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2471 "dhcp6_parser.cc"
     break;
 
   case 439:
-#line 1471 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1471 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("type", prf);
     ctx.leave();
 }
-#line 2480 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2481 "dhcp6_parser.cc"
     break;
 
   case 440:
-#line 1477 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1477 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2488 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2489 "dhcp6_parser.cc"
     break;
 
   case 441:
-#line 1479 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1479 "dhcp6_parser.yy"
     {
-    ElementPtr rtypes(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr rtypes(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("record-types", rtypes);
     ctx.leave();
 }
-#line 2498 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2499 "dhcp6_parser.cc"
     break;
 
   case 442:
-#line 1485 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1485 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2506 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2507 "dhcp6_parser.cc"
     break;
 
   case 443:
-#line 1487 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1487 "dhcp6_parser.yy"
     {
-    ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr space(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("space", space);
     ctx.leave();
 }
-#line 2516 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2517 "dhcp6_parser.cc"
     break;
 
   case 445:
-#line 1495 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1495 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2524 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2525 "dhcp6_parser.cc"
     break;
 
   case 446:
-#line 1497 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1497 "dhcp6_parser.yy"
     {
-    ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr encap(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("encapsulate", encap);
     ctx.leave();
 }
-#line 2534 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2535 "dhcp6_parser.cc"
     break;
 
   case 447:
-#line 1503 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1503 "dhcp6_parser.yy"
     {
-    ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr array(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("array", array);
 }
-#line 2543 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2544 "dhcp6_parser.cc"
     break;
 
   case 448:
-#line 1512 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1512 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("option-data", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OPTION_DATA);
 }
-#line 2554 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2555 "dhcp6_parser.cc"
     break;
 
   case 449:
-#line 1517 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1517 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2563 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2564 "dhcp6_parser.cc"
     break;
 
   case 454:
-#line 1536 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1536 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2573 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2574 "dhcp6_parser.cc"
     break;
 
   case 455:
-#line 1540 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1540 "dhcp6_parser.yy"
     {
     /// @todo: the code or name parameters are required.
     ctx.stack_.pop_back();
 }
-#line 2582 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2583 "dhcp6_parser.cc"
     break;
 
   case 456:
-#line 1548 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1548 "dhcp6_parser.yy"
     {
     // Parse the option-data list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2592 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2593 "dhcp6_parser.cc"
     break;
 
   case 457:
-#line 1552 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1552 "dhcp6_parser.yy"
     {
     /// @todo: the code or name parameters are required.
     // parsing completed
 }
-#line 2601 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2602 "dhcp6_parser.cc"
     break;
 
   case 472:
-#line 1585 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1585 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2609 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2610 "dhcp6_parser.cc"
     break;
 
   case 473:
-#line 1587 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1587 "dhcp6_parser.yy"
     {
-    ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr data(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
     ctx.leave();
 }
-#line 2619 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2620 "dhcp6_parser.cc"
     break;
 
   case 476:
-#line 1597 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1597 "dhcp6_parser.yy"
     {
-    ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr space(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", space);
 }
-#line 2628 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2629 "dhcp6_parser.cc"
     break;
 
   case 477:
-#line 1602 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1602 "dhcp6_parser.yy"
     {
-    ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr persist(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
 }
-#line 2637 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2638 "dhcp6_parser.cc"
     break;
 
   case 478:
-#line 1610 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1610 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pools", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.POOLS);
 }
-#line 2648 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2649 "dhcp6_parser.cc"
     break;
 
   case 479:
-#line 1615 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1615 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2657 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2658 "dhcp6_parser.cc"
     break;
 
   case 484:
-#line 1630 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1630 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2667 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2668 "dhcp6_parser.cc"
     break;
 
   case 485:
-#line 1634 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1634 "dhcp6_parser.yy"
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 2677 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2678 "dhcp6_parser.cc"
     break;
 
   case 486:
-#line 1640 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1640 "dhcp6_parser.yy"
     {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2687 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2688 "dhcp6_parser.cc"
     break;
 
   case 487:
-#line 1644 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1644 "dhcp6_parser.yy"
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
 }
-#line 2696 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2697 "dhcp6_parser.cc"
     break;
 
   case 497:
-#line 1662 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1662 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2704 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2705 "dhcp6_parser.cc"
     break;
 
   case 498:
-#line 1664 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1664 "dhcp6_parser.yy"
     {
-    ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr pool(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
     ctx.leave();
 }
-#line 2714 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2715 "dhcp6_parser.cc"
     break;
 
   case 499:
-#line 1670 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1670 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2722 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2723 "dhcp6_parser.cc"
     break;
 
   case 500:
-#line 1672 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1672 "dhcp6_parser.yy"
     {
     ElementPtr parent = ctx.stack_.back();
-    ElementPtr user_context = yystack_[0].value.as< ElementPtr > ();
+    ElementPtr user_context = yystack_[0].value.as < ElementPtr > ();
     ConstElementPtr old = parent->get("user-context");
 
     // Handle already existing user context
@@ -2745,23 +2746,23 @@ namespace isc { namespace dhcp {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 2749 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2750 "dhcp6_parser.cc"
     break;
 
   case 501:
-#line 1695 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1695 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2757 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2758 "dhcp6_parser.cc"
     break;
 
   case 502:
-#line 1697 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1697 "dhcp6_parser.yy"
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location)));
-    ElementPtr comment(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr comment(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     user_context->set("comment", comment);
 
     // Handle already existing user context
@@ -2782,41 +2783,41 @@ namespace isc { namespace dhcp {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 2786 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2787 "dhcp6_parser.cc"
     break;
 
   case 503:
-#line 1725 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1725 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pd-pools", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.PD_POOLS);
 }
-#line 2797 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2798 "dhcp6_parser.cc"
     break;
 
   case 504:
-#line 1730 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1730 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2806 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2807 "dhcp6_parser.cc"
     break;
 
   case 509:
-#line 1745 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1745 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2816 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2817 "dhcp6_parser.cc"
     break;
 
   case 510:
-#line 1749 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1749 "dhcp6_parser.yy"
     {
     // The prefix, prefix len and delegated len parameters are required.
     ctx.require("prefix", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2824,21 +2825,21 @@ namespace isc { namespace dhcp {
     ctx.require("delegated-len", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 2828 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2829 "dhcp6_parser.cc"
     break;
 
   case 511:
-#line 1757 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1757 "dhcp6_parser.yy"
     {
     // Parse the pd-pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2838 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2839 "dhcp6_parser.cc"
     break;
 
   case 512:
-#line 1761 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1761 "dhcp6_parser.yy"
     {
     // The prefix, prefix len and delegated len parameters are required.
     ctx.require("prefix", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2846,546 +2847,546 @@ namespace isc { namespace dhcp {
     ctx.require("delegated-len", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 2850 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2851 "dhcp6_parser.cc"
     break;
 
   case 526:
-#line 1786 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1786 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2858 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2859 "dhcp6_parser.cc"
     break;
 
   case 527:
-#line 1788 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1788 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefix", prf);
     ctx.leave();
 }
-#line 2868 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2869 "dhcp6_parser.cc"
     break;
 
   case 528:
-#line 1794 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1794 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefix-len", prf);
 }
-#line 2877 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2878 "dhcp6_parser.cc"
     break;
 
   case 529:
-#line 1799 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1799 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2885 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2886 "dhcp6_parser.cc"
     break;
 
   case 530:
-#line 1801 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1801 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("excluded-prefix", prf);
     ctx.leave();
 }
-#line 2895 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2896 "dhcp6_parser.cc"
     break;
 
   case 531:
-#line 1807 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1807 "dhcp6_parser.yy"
     {
-    ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("excluded-prefix-len", prf);
 }
-#line 2904 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2905 "dhcp6_parser.cc"
     break;
 
   case 532:
-#line 1812 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1812 "dhcp6_parser.yy"
     {
-    ElementPtr deleg(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr deleg(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("delegated-len", deleg);
 }
-#line 2913 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2914 "dhcp6_parser.cc"
     break;
 
   case 533:
-#line 1820 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1820 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.RESERVATIONS);
 }
-#line 2924 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2925 "dhcp6_parser.cc"
     break;
 
   case 534:
-#line 1825 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1825 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2933 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2934 "dhcp6_parser.cc"
     break;
 
   case 539:
-#line 1838 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1838 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2943 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2944 "dhcp6_parser.cc"
     break;
 
   case 540:
-#line 1842 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1842 "dhcp6_parser.yy"
     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
 }
-#line 2952 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2953 "dhcp6_parser.cc"
     break;
 
   case 541:
-#line 1847 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1847 "dhcp6_parser.yy"
     {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2962 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2963 "dhcp6_parser.cc"
     break;
 
   case 542:
-#line 1851 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1851 "dhcp6_parser.yy"
     {
     /// @todo: an identifier parameter is required.
     // parsing completed
 }
-#line 2971 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2972 "dhcp6_parser.cc"
     break;
 
   case 558:
-#line 1878 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1878 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-addresses", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2982 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2983 "dhcp6_parser.cc"
     break;
 
   case 559:
-#line 1883 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1883 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2991 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2992 "dhcp6_parser.cc"
     break;
 
   case 560:
-#line 1888 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1888 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefixes", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3002 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3003 "dhcp6_parser.cc"
     break;
 
   case 561:
-#line 1893 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1893 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3011 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3012 "dhcp6_parser.cc"
     break;
 
   case 562:
-#line 1898 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1898 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3019 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3020 "dhcp6_parser.cc"
     break;
 
   case 563:
-#line 1900 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1900 "dhcp6_parser.yy"
     {
-    ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr d(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
     ctx.leave();
 }
-#line 3029 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3030 "dhcp6_parser.cc"
     break;
 
   case 564:
-#line 1906 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1906 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3037 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3038 "dhcp6_parser.cc"
     break;
 
   case 565:
-#line 1908 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1908 "dhcp6_parser.yy"
     {
-    ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hw-address", hw);
     ctx.leave();
 }
-#line 3047 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3048 "dhcp6_parser.cc"
     break;
 
   case 566:
-#line 1914 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1914 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3055 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3056 "dhcp6_parser.cc"
     break;
 
   case 567:
-#line 1916 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1916 "dhcp6_parser.yy"
     {
-    ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr host(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
     ctx.leave();
 }
-#line 3065 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3066 "dhcp6_parser.cc"
     break;
 
   case 568:
-#line 1922 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1922 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3073 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3074 "dhcp6_parser.cc"
     break;
 
   case 569:
-#line 1924 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1924 "dhcp6_parser.yy"
     {
-    ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr hw(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flex-id", hw);
     ctx.leave();
 }
-#line 3083 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3084 "dhcp6_parser.cc"
     break;
 
   case 570:
-#line 1930 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1930 "dhcp6_parser.yy"
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", c);
     ctx.stack_.push_back(c);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3094 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3095 "dhcp6_parser.cc"
     break;
 
   case 571:
-#line 1935 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1935 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3103 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3104 "dhcp6_parser.cc"
     break;
 
   case 572:
-#line 1943 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1943 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.RELAY);
 }
-#line 3114 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3115 "dhcp6_parser.cc"
     break;
 
   case 573:
-#line 1948 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1948 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3123 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3124 "dhcp6_parser.cc"
     break;
 
   case 576:
-#line 1957 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1957 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3131 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3132 "dhcp6_parser.cc"
     break;
 
   case 577:
-#line 1959 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1959 "dhcp6_parser.yy"
     {
-    ElementPtr addr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr addr(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", addr);
     ctx.leave();
 }
-#line 3141 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3142 "dhcp6_parser.cc"
     break;
 
   case 578:
-#line 1968 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1968 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.CLIENT_CLASSES);
 }
-#line 3152 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3153 "dhcp6_parser.cc"
     break;
 
   case 579:
-#line 1973 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1973 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3161 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3162 "dhcp6_parser.cc"
     break;
 
   case 582:
-#line 1982 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1982 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3171 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3172 "dhcp6_parser.cc"
     break;
 
   case 583:
-#line 1986 "dhcp6_parser.yy" // lalr1.cc:907
+#line 1986 "dhcp6_parser.yy"
     {
     // The name client class parameter is required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 3181 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3182 "dhcp6_parser.cc"
     break;
 
   case 596:
-#line 2011 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2011 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3189 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3190 "dhcp6_parser.cc"
     break;
 
   case 597:
-#line 2013 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2013 "dhcp6_parser.yy"
     {
-    ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr test(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
     ctx.leave();
 }
-#line 3199 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3200 "dhcp6_parser.cc"
     break;
 
   case 598:
-#line 2019 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2019 "dhcp6_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("only-if-required", b);
 }
-#line 3208 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3209 "dhcp6_parser.cc"
     break;
 
   case 599:
-#line 2027 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2027 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-id", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER_ID);
 }
-#line 3219 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3220 "dhcp6_parser.cc"
     break;
 
   case 600:
-#line 2032 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2032 "dhcp6_parser.yy"
     {
     // The type parameter is required.
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3230 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3231 "dhcp6_parser.cc"
     break;
 
   case 612:
-#line 2054 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2054 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.DUID_TYPE);
 }
-#line 3238 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3239 "dhcp6_parser.cc"
     break;
 
   case 613:
-#line 2056 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2056 "dhcp6_parser.yy"
     {
-    ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3247 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3248 "dhcp6_parser.cc"
     break;
 
   case 614:
-#line 2061 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LLT", ctx.loc2pos(yystack_[0].location))); }
-#line 3253 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2061 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("LLT", ctx.loc2pos(yystack_[0].location))); }
+#line 3254 "dhcp6_parser.cc"
     break;
 
   case 615:
-#line 2062 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("EN", ctx.loc2pos(yystack_[0].location))); }
-#line 3259 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2062 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("EN", ctx.loc2pos(yystack_[0].location))); }
+#line 3260 "dhcp6_parser.cc"
     break;
 
   case 616:
-#line 2063 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LL", ctx.loc2pos(yystack_[0].location))); }
-#line 3265 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2063 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("LL", ctx.loc2pos(yystack_[0].location))); }
+#line 3266 "dhcp6_parser.cc"
     break;
 
   case 617:
-#line 2066 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2066 "dhcp6_parser.yy"
     {
-    ElementPtr htype(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr htype(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("htype", htype);
 }
-#line 3274 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3275 "dhcp6_parser.cc"
     break;
 
   case 618:
-#line 2071 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2071 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3282 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3283 "dhcp6_parser.cc"
     break;
 
   case 619:
-#line 2073 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2073 "dhcp6_parser.yy"
     {
-    ElementPtr id(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr id(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("identifier", id);
     ctx.leave();
 }
-#line 3292 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3293 "dhcp6_parser.cc"
     break;
 
   case 620:
-#line 2079 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2079 "dhcp6_parser.yy"
     {
-    ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("time", time);
 }
-#line 3301 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3302 "dhcp6_parser.cc"
     break;
 
   case 621:
-#line 2084 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2084 "dhcp6_parser.yy"
     {
-    ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enterprise-id", time);
 }
-#line 3310 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3311 "dhcp6_parser.cc"
     break;
 
   case 622:
-#line 2091 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2091 "dhcp6_parser.yy"
     {
-    ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
 }
-#line 3319 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3320 "dhcp6_parser.cc"
     break;
 
   case 623:
-#line 2098 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2098 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("control-socket", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.CONTROL_SOCKET);
 }
-#line 3330 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3331 "dhcp6_parser.cc"
     break;
 
   case 624:
-#line 2103 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2103 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3339 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3340 "dhcp6_parser.cc"
     break;
 
   case 632:
-#line 2119 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2119 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3347 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3348 "dhcp6_parser.cc"
     break;
 
   case 633:
-#line 2121 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2121 "dhcp6_parser.yy"
     {
-    ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr stype(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-type", stype);
     ctx.leave();
 }
-#line 3357 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3358 "dhcp6_parser.cc"
     break;
 
   case 634:
-#line 2127 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2127 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3365 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3366 "dhcp6_parser.cc"
     break;
 
   case 635:
-#line 2129 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2129 "dhcp6_parser.yy"
     {
-    ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr name(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-name", name);
     ctx.leave();
 }
-#line 3375 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3376 "dhcp6_parser.cc"
     break;
 
   case 636:
-#line 2137 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2137 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3383 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3384 "dhcp6_parser.cc"
     break;
 
   case 637:
-#line 2139 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2139 "dhcp6_parser.yy"
     {
-    ElementPtr qc = yystack_[0].value.as< ElementPtr > ();
+    ElementPtr qc = yystack_[0].value.as < ElementPtr > ();
     ctx.stack_.back()->set("dhcp-queue-control", qc);
 
     // Doing this manually, because dhcp-queue-control
@@ -3419,603 +3420,604 @@ namespace isc { namespace dhcp {
 
     ctx.leave();
 }
-#line 3423 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3424 "dhcp6_parser.cc"
     break;
 
   case 638:
-#line 2177 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2177 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp-ddns", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.DHCP_DDNS);
 }
-#line 3434 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3435 "dhcp6_parser.cc"
     break;
 
   case 639:
-#line 2182 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2182 "dhcp6_parser.yy"
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3445 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3446 "dhcp6_parser.cc"
     break;
 
   case 640:
-#line 2189 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2189 "dhcp6_parser.yy"
     {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3455 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3456 "dhcp6_parser.cc"
     break;
 
   case 641:
-#line 2193 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2193 "dhcp6_parser.yy"
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 3465 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3466 "dhcp6_parser.cc"
     break;
 
   case 662:
-#line 2223 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2223 "dhcp6_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
 }
-#line 3474 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3475 "dhcp6_parser.cc"
     break;
 
   case 663:
-#line 2228 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2228 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3482 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3483 "dhcp6_parser.cc"
     break;
 
   case 664:
-#line 2230 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2230 "dhcp6_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("qualifying-suffix", s);
     ctx.leave();
 }
-#line 3492 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3493 "dhcp6_parser.cc"
     break;
 
   case 665:
-#line 2236 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2236 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3500 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3501 "dhcp6_parser.cc"
     break;
 
   case 666:
-#line 2238 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2238 "dhcp6_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-ip", s);
     ctx.leave();
 }
-#line 3510 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3511 "dhcp6_parser.cc"
     break;
 
   case 667:
-#line 2244 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2244 "dhcp6_parser.yy"
     {
-    ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
 }
-#line 3519 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3520 "dhcp6_parser.cc"
     break;
 
   case 668:
-#line 2249 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2249 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3527 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3528 "dhcp6_parser.cc"
     break;
 
   case 669:
-#line 2251 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2251 "dhcp6_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-ip", s);
     ctx.leave();
 }
-#line 3537 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3538 "dhcp6_parser.cc"
     break;
 
   case 670:
-#line 2257 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2257 "dhcp6_parser.yy"
     {
-    ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
 }
-#line 3546 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3547 "dhcp6_parser.cc"
     break;
 
   case 671:
-#line 2262 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2262 "dhcp6_parser.yy"
     {
-    ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
 }
-#line 3555 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3556 "dhcp6_parser.cc"
     break;
 
   case 672:
-#line 2267 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2267 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
-#line 3563 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3564 "dhcp6_parser.cc"
     break;
 
   case 673:
-#line 2269 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2269 "dhcp6_parser.yy"
     {
-    ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3572 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3573 "dhcp6_parser.cc"
     break;
 
   case 674:
-#line 2275 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
-#line 3578 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2275 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
+#line 3579 "dhcp6_parser.cc"
     break;
 
   case 675:
-#line 2276 "dhcp6_parser.yy" // lalr1.cc:907
-    { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
-#line 3584 "dhcp6_parser.cc" // lalr1.cc:907
+#line 2276 "dhcp6_parser.yy"
+    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
+#line 3585 "dhcp6_parser.cc"
     break;
 
   case 676:
-#line 2279 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2279 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
-#line 3592 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3593 "dhcp6_parser.cc"
     break;
 
   case 677:
-#line 2281 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2281 "dhcp6_parser.yy"
     {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
     ctx.leave();
 }
-#line 3602 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3603 "dhcp6_parser.cc"
     break;
 
   case 678:
-#line 2288 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2288 "dhcp6_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-no-update", b);
 }
-#line 3611 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3612 "dhcp6_parser.cc"
     break;
 
   case 679:
-#line 2294 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2294 "dhcp6_parser.yy"
     {
-    ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-client-update", b);
 }
-#line 3620 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3621 "dhcp6_parser.cc"
     break;
 
   case 680:
-#line 2300 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2300 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
-#line 3628 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3629 "dhcp6_parser.cc"
     break;
 
   case 681:
-#line 2302 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2302 "dhcp6_parser.yy"
     {
-    ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3637 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3638 "dhcp6_parser.cc"
     break;
 
   case 682:
-#line 2308 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2308 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3645 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3646 "dhcp6_parser.cc"
     break;
 
   case 683:
-#line 2310 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2310 "dhcp6_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("generated-prefix", s);
     ctx.leave();
 }
-#line 3655 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3656 "dhcp6_parser.cc"
     break;
 
   case 684:
-#line 2317 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2317 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3663 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3664 "dhcp6_parser.cc"
     break;
 
   case 685:
-#line 2319 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2319 "dhcp6_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-set", s);
     ctx.leave();
 }
-#line 3673 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3674 "dhcp6_parser.cc"
     break;
 
   case 686:
-#line 2326 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2326 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3681 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3682 "dhcp6_parser.cc"
     break;
 
   case 687:
-#line 2328 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2328 "dhcp6_parser.yy"
     {
-    ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-replacement", s);
     ctx.leave();
 }
-#line 3691 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3692 "dhcp6_parser.cc"
     break;
 
   case 688:
-#line 2336 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2336 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3699 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3700 "dhcp6_parser.cc"
     break;
 
   case 689:
-#line 2338 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2338 "dhcp6_parser.yy"
     {
-    ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3708 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3709 "dhcp6_parser.cc"
     break;
 
   case 690:
-#line 2343 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2343 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3716 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3717 "dhcp6_parser.cc"
     break;
 
   case 691:
-#line 2345 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2345 "dhcp6_parser.yy"
     {
-    ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3725 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3726 "dhcp6_parser.cc"
     break;
 
   case 692:
-#line 2350 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2350 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3733 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3734 "dhcp6_parser.cc"
     break;
 
   case 693:
-#line 2352 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2352 "dhcp6_parser.yy"
     {
-    ctx.stack_.back()->set("Control-agent", yystack_[0].value.as< ElementPtr > ());
+    ctx.stack_.back()->set("Control-agent", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 3742 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3743 "dhcp6_parser.cc"
     break;
 
   case 694:
-#line 2359 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2359 "dhcp6_parser.yy"
     {
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-control", i);
     ctx.stack_.push_back(i);
     ctx.enter(ctx.CONFIG_CONTROL);
 }
-#line 3753 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3754 "dhcp6_parser.cc"
     break;
 
   case 695:
-#line 2364 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2364 "dhcp6_parser.yy"
     {
     // No config control params are required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3763 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3764 "dhcp6_parser.cc"
     break;
 
   case 696:
-#line 2370 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2370 "dhcp6_parser.yy"
     {
     // Parse the config-control map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3773 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3774 "dhcp6_parser.cc"
     break;
 
   case 697:
-#line 2374 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2374 "dhcp6_parser.yy"
     {
     // No config_control params are required
     // parsing completed
 }
-#line 3782 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3783 "dhcp6_parser.cc"
     break;
 
   case 702:
-#line 2389 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2389 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-databases", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.CONFIG_DATABASE);
 }
-#line 3793 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3794 "dhcp6_parser.cc"
     break;
 
   case 703:
-#line 2394 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2394 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3802 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3803 "dhcp6_parser.cc"
     break;
 
   case 704:
-#line 2399 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2399 "dhcp6_parser.yy"
     {
-    ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-fetch-wait-time", value);
 }
-#line 3811 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3812 "dhcp6_parser.cc"
     break;
 
   case 705:
-#line 2409 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2409 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("Logging", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.LOGGING);
 }
-#line 3822 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3823 "dhcp6_parser.cc"
     break;
 
   case 706:
-#line 2414 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2414 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3831 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3832 "dhcp6_parser.cc"
     break;
 
   case 707:
-#line 2419 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2419 "dhcp6_parser.yy"
     {
     // Parse the Logging map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3841 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3842 "dhcp6_parser.cc"
     break;
 
   case 708:
-#line 2423 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2423 "dhcp6_parser.yy"
     {
     // parsing completed
 }
-#line 3849 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3850 "dhcp6_parser.cc"
     break;
 
   case 712:
-#line 2439 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2439 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("loggers", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.LOGGERS);
 }
-#line 3860 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3861 "dhcp6_parser.cc"
     break;
 
   case 713:
-#line 2444 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2444 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3869 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3870 "dhcp6_parser.cc"
     break;
 
   case 716:
-#line 2456 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2456 "dhcp6_parser.yy"
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
     ctx.stack_.push_back(l);
 }
-#line 3879 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3880 "dhcp6_parser.cc"
     break;
 
   case 717:
-#line 2460 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2460 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
 }
-#line 3887 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3888 "dhcp6_parser.cc"
     break;
 
   case 727:
-#line 2477 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2477 "dhcp6_parser.yy"
     {
-    ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr dl(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
 }
-#line 3896 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3897 "dhcp6_parser.cc"
     break;
 
   case 728:
-#line 2482 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2482 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3904 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3905 "dhcp6_parser.cc"
     break;
 
   case 729:
-#line 2484 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2484 "dhcp6_parser.yy"
     {
-    ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
     ctx.leave();
 }
-#line 3914 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3915 "dhcp6_parser.cc"
     break;
 
   case 730:
-#line 2490 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2490 "dhcp6_parser.yy"
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OUTPUT_OPTIONS);
 }
-#line 3925 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3926 "dhcp6_parser.cc"
     break;
 
   case 731:
-#line 2495 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2495 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3934 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3935 "dhcp6_parser.cc"
     break;
 
   case 734:
-#line 2504 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2504 "dhcp6_parser.yy"
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3944 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3945 "dhcp6_parser.cc"
     break;
 
   case 735:
-#line 2508 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2508 "dhcp6_parser.yy"
     {
     ctx.stack_.pop_back();
 }
-#line 3952 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3953 "dhcp6_parser.cc"
     break;
 
   case 743:
-#line 2523 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2523 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3960 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3961 "dhcp6_parser.cc"
     break;
 
   case 744:
-#line 2525 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2525 "dhcp6_parser.yy"
     {
-    ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
     ctx.leave();
 }
-#line 3970 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3971 "dhcp6_parser.cc"
     break;
 
   case 745:
-#line 2531 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2531 "dhcp6_parser.yy"
     {
-    ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr flush(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
 }
-#line 3979 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3980 "dhcp6_parser.cc"
     break;
 
   case 746:
-#line 2536 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2536 "dhcp6_parser.yy"
     {
-    ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr maxsize(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
 }
-#line 3988 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3989 "dhcp6_parser.cc"
     break;
 
   case 747:
-#line 2541 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2541 "dhcp6_parser.yy"
     {
-    ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr maxver(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
 }
-#line 3997 "dhcp6_parser.cc" // lalr1.cc:907
+#line 3998 "dhcp6_parser.cc"
     break;
 
   case 748:
-#line 2546 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2546 "dhcp6_parser.yy"
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4005 "dhcp6_parser.cc" // lalr1.cc:907
+#line 4006 "dhcp6_parser.cc"
     break;
 
   case 749:
-#line 2548 "dhcp6_parser.yy" // lalr1.cc:907
+#line 2548 "dhcp6_parser.yy"
     {
-    ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
+    ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pattern", sev);
     ctx.leave();
 }
-#line 4015 "dhcp6_parser.cc" // lalr1.cc:907
+#line 4016 "dhcp6_parser.cc"
     break;
 
 
-#line 4019 "dhcp6_parser.cc" // lalr1.cc:907
+#line 4020 "dhcp6_parser.cc"
+
             default:
               break;
             }
@@ -4023,6 +4025,7 @@ namespace isc { namespace dhcp {
 #if YY_EXCEPTIONS
       catch (const syntax_error& yyexc)
         {
+          YYCDEBUG << "Caught exception: " << yyexc.what() << '\n';
           error (yyexc);
           YYERROR;
         }
@@ -4037,6 +4040,7 @@ namespace isc { namespace dhcp {
     }
     goto yynewstate;
 
+
   /*--------------------------------------.
   | yyerrlab -- here on detecting error.  |
   `--------------------------------------*/
@@ -4073,18 +4077,18 @@ namespace isc { namespace dhcp {
   | yyerrorlab -- error raised explicitly by YYERROR.  |
   `---------------------------------------------------*/
   yyerrorlab:
-
-    /* Pacify compilers like GCC when the user code never invokes
-       YYERROR and the label yyerrorlab therefore never appears in user
-       code.  */
+    /* Pacify compilers when the user code never invokes YYERROR and
+       the label yyerrorlab therefore never appears in user code.  */
     if (false)
-      goto yyerrorlab;
+      YYERROR;
+
     /* Do not reclaim the symbols of the rule whose action triggered
        this YYERROR.  */
     yypop_ (yylen);
     yylen = 0;
     goto yyerrlab1;
 
+
   /*-------------------------------------------------------------.
   | yyerrlab1 -- common code for both syntax error and YYERROR.  |
   `-------------------------------------------------------------*/
@@ -4125,16 +4129,26 @@ namespace isc { namespace dhcp {
     }
     goto yynewstate;
 
-    // Accept.
+
+  /*-------------------------------------.
+  | yyacceptlab -- YYACCEPT comes here.  |
+  `-------------------------------------*/
   yyacceptlab:
     yyresult = 0;
     goto yyreturn;
 
-    // Abort.
+
+  /*-----------------------------------.
+  | yyabortlab -- YYABORT comes here.  |
+  `-----------------------------------*/
   yyabortlab:
     yyresult = 1;
     goto yyreturn;
 
+
+  /*-----------------------------------------------------.
+  | yyreturn -- parsing is finished, return the result.  |
+  `-----------------------------------------------------*/
   yyreturn:
     if (!yyla.empty ())
       yy_destroy_ ("Cleanup: discarding lookahead", yyla);
@@ -5433,10 +5447,11 @@ namespace isc { namespace dhcp {
 #endif // PARSER6_DEBUG
 
 
-#line 14 "dhcp6_parser.yy" // lalr1.cc:1218
+#line 14 "dhcp6_parser.yy"
 } } // isc::dhcp
-#line 5439 "dhcp6_parser.cc" // lalr1.cc:1218
-#line 2554 "dhcp6_parser.yy" // lalr1.cc:1219
+#line 5453 "dhcp6_parser.cc"
+
+#line 2554 "dhcp6_parser.yy"
 
 
 void
diff --git a/src/bin/dhcp6/dhcp6_parser.h b/src/bin/dhcp6/dhcp6_parser.h
index 675e8450d3..0a5b59f08e 100644
--- a/src/bin/dhcp6/dhcp6_parser.h
+++ b/src/bin/dhcp6/dhcp6_parser.h
@@ -1,8 +1,8 @@
-// A Bison parser, made by GNU Bison 3.2.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton interface for Bison LALR(1) parsers in C++
 
-// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #ifndef YY_PARSER6_DHCP6_PARSER_H_INCLUDED
 # define YY_PARSER6_DHCP6_PARSER_H_INCLUDED
 // //                    "%code requires" blocks.
-#line 17 "dhcp6_parser.yy" // lalr1.cc:404
+#line 17 "dhcp6_parser.yy"
 
 #include <string>
 #include <cc/data.h>
@@ -56,7 +56,7 @@ using namespace isc::dhcp;
 using namespace isc::data;
 using namespace std;
 
-#line 60 "dhcp6_parser.h" // lalr1.cc:404
+#line 60 "dhcp6_parser.h"
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -65,8 +65,14 @@ using namespace std;
 # include <string>
 # include <vector>
 
+#if defined __cplusplus
+# define YY_CPLUSPLUS __cplusplus
+#else
+# define YY_CPLUSPLUS 199711L
+#endif
+
 // Support move semantics when possible.
-#if defined __cplusplus && 201103L <= __cplusplus
+#if 201103L <= YY_CPLUSPLUS
 # define YY_MOVE           std::move
 # define YY_MOVE_OR_COPY   move
 # define YY_MOVE_REF(Type) Type&&
@@ -79,6 +85,22 @@ using namespace std;
 # define YY_RVREF(Type)    const Type&
 # define YY_COPY(Type)     const Type&
 #endif
+
+// Support noexcept when possible.
+#if 201103L <= YY_CPLUSPLUS
+# define YY_NOEXCEPT noexcept
+# define YY_NOTHROW
+#else
+# define YY_NOEXCEPT
+# define YY_NOTHROW throw ()
+#endif
+
+// Support constexpr when possible.
+#if 201703 <= YY_CPLUSPLUS
+# define YY_CONSTEXPR constexpr
+#else
+# define YY_CONSTEXPR
+#endif
 # include "location.hh"
 #include <typeinfo>
 #ifndef YYASSERT
@@ -156,193 +178,80 @@ using namespace std;
 # endif /* ! defined YYDEBUG */
 #endif  /* ! defined PARSER6_DEBUG */
 
-#line 14 "dhcp6_parser.yy" // lalr1.cc:404
+#line 14 "dhcp6_parser.yy"
 namespace isc { namespace dhcp {
-#line 162 "dhcp6_parser.h" // lalr1.cc:404
-
-  /// A stack with random access from its top.
-  template <typename T, typename S = std::vector<T> >
-  class stack
-  {
-  public:
-    // Hide our reversed order.
-    typedef typename S::reverse_iterator iterator;
-    typedef typename S::const_reverse_iterator const_iterator;
-    typedef typename S::size_type size_type;
-
-    stack (size_type n = 200)
-      : seq_ (n)
-    {}
-
-    /// Random access.
-    ///
-    /// Index 0 returns the topmost element.
-    T&
-    operator[] (size_type i)
-    {
-      return seq_[size () - 1 - i];
-    }
-
-    /// Random access.
-    ///
-    /// Index 0 returns the topmost element.
-    T&
-    operator[] (int i)
-    {
-      return operator[] (size_type (i));
-    }
-
-    /// Random access.
-    ///
-    /// Index 0 returns the topmost element.
-    const T&
-    operator[] (size_type i) const
-    {
-      return seq_[size () - 1 - i];
-    }
-
-    /// Random access.
-    ///
-    /// Index 0 returns the topmost element.
-    const T&
-    operator[] (int i) const
-    {
-      return operator[] (size_type (i));
-    }
-
-    /// Steal the contents of \a t.
-    ///
-    /// Close to move-semantics.
-    void
-    push (YY_MOVE_REF (T) t)
-    {
-      seq_.push_back (T ());
-      operator[](0).move (t);
-    }
-
-    void
-    pop (int n = 1)
-    {
-      for (; 0 < n; --n)
-        seq_.pop_back ();
-    }
-
-    void
-    clear ()
-    {
-      seq_.clear ();
-    }
-
-    size_type
-    size () const
-    {
-      return seq_.size ();
-    }
+#line 184 "dhcp6_parser.h"
 
-    const_iterator
-    begin () const
-    {
-      return seq_.rbegin ();
-    }
 
-    const_iterator
-    end () const
-    {
-      return seq_.rend ();
-    }
 
-  private:
-    stack (const stack&);
-    stack& operator= (const stack&);
-    /// The wrapped container.
-    S seq_;
-  };
 
-  /// Present a slice of the top of a stack.
-  template <typename T, typename S = stack<T> >
-  class slice
+  /// A Bison parser.
+  class Dhcp6Parser
   {
   public:
-    slice (const S& stack, int range)
-      : stack_ (stack)
-      , range_ (range)
-    {}
-
-    const T&
-    operator[] (int i) const
-    {
-      return stack_[range_ - i];
-    }
-
-  private:
-    const S& stack_;
-    int range_;
-  };
-
-
-
-  /// A char[S] buffer to store and retrieve objects.
+#ifndef PARSER6_STYPE
+  /// A buffer to store and retrieve objects.
   ///
   /// Sort of a variant, but does not keep track of the nature
   /// of the stored data, since that knowledge is available
-  /// via the current state.
-  template <size_t S>
-  struct variant
+  /// via the current parser state.
+  class semantic_type
   {
+  public:
     /// Type of *this.
-    typedef variant<S> self_type;
+    typedef semantic_type self_type;
 
     /// Empty construction.
-    variant ()
+    semantic_type () YY_NOEXCEPT
       : yybuffer_ ()
       , yytypeid_ (YY_NULLPTR)
     {}
 
     /// Construct and fill.
     template <typename T>
-    variant (YY_RVREF (T) t)
+    semantic_type (YY_RVREF (T) t)
       : yytypeid_ (&typeid (T))
     {
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       new (yyas_<T> ()) T (YY_MOVE (t));
     }
 
     /// Destruction, allowed only if empty.
-    ~variant ()
+    ~semantic_type () YY_NOEXCEPT
     {
       YYASSERT (!yytypeid_);
     }
 
-    /// Instantiate an empty \a T in here.
-    template <typename T>
+# if 201103L <= YY_CPLUSPLUS
+    /// Instantiate a \a T in here from \a t.
+    template <typename T, typename... U>
     T&
-    emplace ()
+    emplace (U&&... u)
     {
       YYASSERT (!yytypeid_);
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       yytypeid_ = & typeid (T);
-      return *new (yyas_<T> ()) T ();
+      return *new (yyas_<T> ()) T (std::forward <U>(u)...);
     }
-
-# if defined __cplusplus && 201103L <= __cplusplus
-    /// Instantiate a \a T in here from \a t.
-    template <typename T, typename U>
+# else
+    /// Instantiate an empty \a T in here.
+    template <typename T>
     T&
-    emplace (U&& u)
+    emplace ()
     {
       YYASSERT (!yytypeid_);
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       yytypeid_ = & typeid (T);
-      return *new (yyas_<T> ()) T (std::forward <U>(u));
+      return *new (yyas_<T> ()) T ();
     }
-# else
+
     /// Instantiate a \a T in here from \a t.
     template <typename T>
     T&
     emplace (const T& t)
     {
       YYASSERT (!yytypeid_);
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       yytypeid_ = & typeid (T);
       return *new (yyas_<T> ()) T (t);
     }
@@ -369,75 +278,75 @@ namespace isc { namespace dhcp {
     /// Accessor to a built \a T.
     template <typename T>
     T&
-    as ()
+    as () YY_NOEXCEPT
     {
       YYASSERT (yytypeid_);
       YYASSERT (*yytypeid_ == typeid (T));
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       return *yyas_<T> ();
     }
 
     /// Const accessor to a built \a T (for %printer).
     template <typename T>
     const T&
-    as () const
+    as () const YY_NOEXCEPT
     {
       YYASSERT (yytypeid_);
       YYASSERT (*yytypeid_ == typeid (T));
-      YYASSERT (sizeof (T) <= S);
+      YYASSERT (sizeof (T) <= size);
       return *yyas_<T> ();
     }
 
-    /// Swap the content with \a other, of same type.
+    /// Swap the content with \a that, of same type.
     ///
     /// Both variants must be built beforehand, because swapping the actual
     /// data requires reading it (with as()), and this is not possible on
     /// unconstructed variants: it would require some dynamic testing, which
     /// should not be the variant's responsibility.
     /// Swapping between built and (possibly) non-built is done with
-    /// variant::move ().
+    /// self_type::move ().
     template <typename T>
     void
-    swap (self_type& other)
+    swap (self_type& that) YY_NOEXCEPT
     {
       YYASSERT (yytypeid_);
-      YYASSERT (*yytypeid_ == *other.yytypeid_);
-      std::swap (as<T> (), other.as<T> ());
+      YYASSERT (*yytypeid_ == *that.yytypeid_);
+      std::swap (as<T> (), that.as<T> ());
     }
 
-    /// Move the content of \a other to this.
+    /// Move the content of \a that to this.
     ///
-    /// Destroys \a other.
+    /// Destroys \a that.
     template <typename T>
     void
-    move (self_type& other)
+    move (self_type& that)
     {
-# if defined __cplusplus && 201103L <= __cplusplus
-      emplace<T> (std::move (other.as<T> ()));
+# if 201103L <= YY_CPLUSPLUS
+      emplace<T> (std::move (that.as<T> ()));
 # else
       emplace<T> ();
-      swap<T> (other);
+      swap<T> (that);
 # endif
-      other.destroy<T> ();
+      that.destroy<T> ();
     }
 
-# if defined __cplusplus && 201103L <= __cplusplus
-    /// Move the content of \a other to this.
+# if 201103L <= YY_CPLUSPLUS
+    /// Move the content of \a that to this.
     template <typename T>
     void
-    move (self_type&& other)
+    move (self_type&& that)
     {
-      emplace<T> (std::move (other.as<T> ()));
-      other.destroy<T> ();
+      emplace<T> (std::move (that.as<T> ()));
+      that.destroy<T> ();
     }
 #endif
 
-    /// Copy the content of \a other to this.
+    /// Copy the content of \a that to this.
     template <typename T>
     void
-    copy (const self_type& other)
+    copy (const self_type& that)
     {
-      emplace<T> (other.as<T> ());
+      emplace<T> (that.as<T> ());
     }
 
     /// Destroy the stored \a T.
@@ -452,12 +361,12 @@ namespace isc { namespace dhcp {
   private:
     /// Prohibit blind copies.
     self_type& operator= (const self_type&);
-    variant (const self_type&);
+    semantic_type (const self_type&);
 
     /// Accessor to raw memory as \a T.
     template <typename T>
     T*
-    yyas_ ()
+    yyas_ () YY_NOEXCEPT
     {
       void *yyp = yybuffer_.yyraw;
       return static_cast<T*> (yyp);
@@ -466,30 +375,12 @@ namespace isc { namespace dhcp {
     /// Const accessor to raw memory as \a T.
     template <typename T>
     const T*
-    yyas_ () const
+    yyas_ () const YY_NOEXCEPT
     {
       const void *yyp = yybuffer_.yyraw;
       return static_cast<const T*> (yyp);
      }
 
-    union
-    {
-      /// Strongest alignment constraints.
-      long double yyalign_me;
-      /// A buffer large enough to store any of the semantic values.
-      char yyraw[S];
-    } yybuffer_;
-
-    /// Whether the content is built: if defined, the name of the stored type.
-    const std::type_info *yytypeid_;
-  };
-
-
-  /// A Bison parser.
-  class Dhcp6Parser
-  {
-  public:
-#ifndef PARSER6_STYPE
     /// An auxiliary type to compute the largest semantic type.
     union union_type
     {
@@ -513,10 +404,24 @@ namespace isc { namespace dhcp {
 
       // "constant string"
       char dummy5[sizeof (std::string)];
-};
+    };
+
+    /// The size of the largest semantic type.
+    enum { size = sizeof (union_type) };
+
+    /// A buffer to store semantic values.
+    union
+    {
+      /// Strongest alignment constraints.
+      long double yyalign_me;
+      /// A buffer large enough to store any of the semantic values.
+      char yyraw[size];
+    } yybuffer_;
+
+    /// Whether the content is built: if defined, the name of the stored type.
+    const std::type_info *yytypeid_;
+  };
 
-    /// Symbol semantic values.
-    typedef variant<sizeof (union_type)> semantic_type;
 #else
     typedef PARSER6_STYPE semantic_type;
 #endif
@@ -526,7 +431,18 @@ namespace isc { namespace dhcp {
     /// Syntax errors thrown from user actions.
     struct syntax_error : std::runtime_error
     {
-      syntax_error (const location_type& l, const std::string& m);
+      syntax_error (const location_type& l, const std::string& m)
+        : std::runtime_error (m)
+        , location (l)
+      {}
+
+      syntax_error (const syntax_error& s)
+        : std::runtime_error (s.what ())
+        , location (s.location)
+      {}
+
+      ~syntax_error () YY_NOEXCEPT YY_NOTHROW;
+
       location_type location;
     };
 
@@ -754,29 +670,154 @@ namespace isc { namespace dhcp {
       typedef Base super_type;
 
       /// Default constructor.
-      basic_symbol ();
-
-      /// Move or copy constructor.
-      basic_symbol (YY_RVREF (basic_symbol) other);
+      basic_symbol ()
+        : value ()
+        , location ()
+      {}
+
+#if 201103L <= YY_CPLUSPLUS
+      /// Move constructor.
+      basic_symbol (basic_symbol&& that);
+#endif
 
+      /// Copy constructor.
+      basic_symbol (const basic_symbol& that);
 
       /// Constructor for valueless symbols, and symbols from each type.
-      basic_symbol (typename Base::kind_type t, YY_RVREF (location_type) l);
-      basic_symbol (typename Base::kind_type t, YY_RVREF (ElementPtr) v, YY_RVREF (location_type) l);
-      basic_symbol (typename Base::kind_type t, YY_RVREF (bool) v, YY_RVREF (location_type) l);
-      basic_symbol (typename Base::kind_type t, YY_RVREF (double) v, YY_RVREF (location_type) l);
-      basic_symbol (typename Base::kind_type t, YY_RVREF (int64_t) v, YY_RVREF (location_type) l);
-      basic_symbol (typename Base::kind_type t, YY_RVREF (std::string) v, YY_RVREF (location_type) l);
-
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, location_type&& l)
+        : Base (t)
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const location_type& l)
+        : Base (t)
+        , location (l)
+      {}
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, ElementPtr&& v, location_type&& l)
+        : Base (t)
+        , value (std::move (v))
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const ElementPtr& v, const location_type& l)
+        : Base (t)
+        , value (v)
+        , location (l)
+      {}
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, bool&& v, location_type&& l)
+        : Base (t)
+        , value (std::move (v))
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const bool& v, const location_type& l)
+        : Base (t)
+        , value (v)
+        , location (l)
+      {}
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, double&& v, location_type&& l)
+        : Base (t)
+        , value (std::move (v))
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const double& v, const location_type& l)
+        : Base (t)
+        , value (v)
+        , location (l)
+      {}
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, int64_t&& v, location_type&& l)
+        : Base (t)
+        , value (std::move (v))
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const int64_t& v, const location_type& l)
+        : Base (t)
+        , value (v)
+        , location (l)
+      {}
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      basic_symbol (typename Base::kind_type t, std::string&& v, location_type&& l)
+        : Base (t)
+        , value (std::move (v))
+        , location (std::move (l))
+      {}
+#else
+      basic_symbol (typename Base::kind_type t, const std::string& v, const location_type& l)
+        : Base (t)
+        , value (v)
+        , location (l)
+      {}
+#endif
 
       /// Destroy the symbol.
-      ~basic_symbol ();
+      ~basic_symbol ()
+      {
+        clear ();
+      }
 
       /// Destroy contents, and record that is empty.
-      void clear ();
+      void clear ()
+      {
+        // User destructor.
+        symbol_number_type yytype = this->type_get ();
+        basic_symbol<Base>& yysym = *this;
+        (void) yysym;
+        switch (yytype)
+        {
+       default:
+          break;
+        }
+
+        // Type destructor.
+switch (yytype)
+    {
+      case 210: // value
+      case 214: // map_value
+      case 255: // ddns_replace_client_name_value
+      case 289: // db_type
+      case 383: // hr_mode
+      case 519: // duid_type
+      case 554: // ncr_protocol_value
+        value.template destroy< ElementPtr > ();
+        break;
+
+      case 192: // "boolean"
+        value.template destroy< bool > ();
+        break;
+
+      case 191: // "floating point"
+        value.template destroy< double > ();
+        break;
+
+      case 190: // "integer"
+        value.template destroy< int64_t > ();
+        break;
+
+      case 189: // "constant string"
+        value.template destroy< std::string > ();
+        break;
+
+      default:
+        break;
+    }
+
+        Base::clear ();
+      }
 
       /// Whether empty.
-      bool empty () const;
+      bool empty () const YY_NOEXCEPT;
 
       /// Destructive move, \a s is emptied into this.
       void move (basic_symbol& s);
@@ -788,9 +829,9 @@ namespace isc { namespace dhcp {
       location_type location;
 
     private:
-#if !defined __cplusplus || __cplusplus < 201103L
+#if YY_CPLUSPLUS < 201103L
       /// Assignment operator.
-      basic_symbol& operator= (const basic_symbol& other);
+      basic_symbol& operator= (const basic_symbol& that);
 #endif
     };
 
@@ -800,8 +841,13 @@ namespace isc { namespace dhcp {
       /// Default constructor.
       by_type ();
 
+#if 201103L <= YY_CPLUSPLUS
+      /// Move constructor.
+      by_type (by_type&& that);
+#endif
+
       /// Copy constructor.
-      by_type (const by_type& other);
+      by_type (const by_type& that);
 
       /// The symbol type as needed by the constructor.
       typedef token_type kind_type;
@@ -817,10 +863,10 @@ namespace isc { namespace dhcp {
 
       /// The (internal) type number (corresponding to \a type).
       /// \a empty when empty.
-      symbol_number_type type_get () const;
+      symbol_number_type type_get () const YY_NOEXCEPT;
 
       /// The token.
-      token_type token () const;
+      token_type token () const YY_NOEXCEPT;
 
       /// The symbol type.
       /// \a empty_symbol when empty.
@@ -829,7 +875,81 @@ namespace isc { namespace dhcp {
     };
 
     /// "External" symbols: returned by the scanner.
-    typedef basic_symbol<by_type> symbol_type;
+    struct symbol_type : basic_symbol<by_type>
+    {
+      /// Superclass.
+      typedef basic_symbol<by_type> super_type;
+
+      /// Empty symbol.
+      symbol_type () {}
+
+      /// Constructor for valueless symbols, and symbols from each type.
+#if 201103L <= YY_CPLUSPLUS
+      symbol_type (int tok, location_type l)
+        : super_type(token_type (tok), std::move (l))
+      {
+        YYASSERT (tok == token::TOKEN_END || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP6 || tok == token::TOKEN_DATA_DIRECTORY || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_PREFERRED_LIFETIME || tok == token::TOKEN_MIN_PREFERRED_LIFETIME || tok == token::TOKEN_MAX_PREFERRED_LIFETIME || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_SUBNET6 || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_PD_POOLS || tok == token::TOKEN_PREFIX || tok == token::TOKEN_PREFIX_LEN || tok == token::TOKEN_EXCLUDED_PREFIX || tok == token::TOKEN_EXCLUDED_PREFIX_LEN || tok == token::TOKEN_DELEGATED_LEN || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_INTERFACE_ID || tok == token::TOKEN_ID || tok == token::TOKEN_RAPID_COMMIT || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_MAC_SOURCES || tok == token::TOKEN_RELAY_SUPPLIED_OPTIONS || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_PREFIXES || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_SERVER_ID || tok == token::TOKEN_LLT || tok == token::TOKEN_EN || tok == token::TOKEN_LL || tok == token::TOKEN_IDENTIFIER || tok == token::TOKEN_HTYPE || tok == token::TOKEN_TIME || tok == token::TOKEN_ENTERPRISE_ID || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_UDP || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_LOGGING || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_DHCP4 || tok == token::TOKEN_DHCPDDNS || tok == token::TOKEN_CONTROL_AGENT || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP6 || tok == token::TOKEN_SUB_DHCP6 || tok == token::TOKEN_SUB_INTERFACES6 || tok == token::TOKEN_SUB_SUBNET6 || tok == token::TOKEN_SUB_POOL6 || tok == token::TOKEN_SUB_PD_POOL || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_LOGGING || tok == token::TOKEN_SUB_CONFIG_CONTROL);
+      }
+#else
+      symbol_type (int tok, const location_type& l)
+        : super_type(token_type (tok), l)
+      {
+        YYASSERT (tok == token::TOKEN_END || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP6 || tok == token::TOKEN_DATA_DIRECTORY || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_PREFERRED_LIFETIME || tok == token::TOKEN_MIN_PREFERRED_LIFETIME || tok == token::TOKEN_MAX_PREFERRED_LIFETIME || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_SUBNET6 || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_PD_POOLS || tok == token::TOKEN_PREFIX || tok == token::TOKEN_PREFIX_LEN || tok == token::TOKEN_EXCLUDED_PREFIX || tok == token::TOKEN_EXCLUDED_PREFIX_LEN || tok == token::TOKEN_DELEGATED_LEN || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_INTERFACE_ID || tok == token::TOKEN_ID || tok == token::TOKEN_RAPID_COMMIT || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_MAC_SOURCES || tok == token::TOKEN_RELAY_SUPPLIED_OPTIONS || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_PREFIXES || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_SERVER_ID || tok == token::TOKEN_LLT || tok == token::TOKEN_EN || tok == token::TOKEN_LL || tok == token::TOKEN_IDENTIFIER || tok == token::TOKEN_HTYPE || tok == token::TOKEN_TIME || tok == token::TOKEN_ENTERPRISE_ID || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_UDP || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_LOGGING || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_DHCP4 || tok == token::TOKEN_DHCPDDNS || tok == token::TOKEN_CONTROL_AGENT || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP6 || tok == token::TOKEN_SUB_DHCP6 || tok == token::TOKEN_SUB_INTERFACES6 || tok == token::TOKEN_SUB_SUBNET6 || tok == token::TOKEN_SUB_POOL6 || tok == token::TOKEN_SUB_PD_POOL || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_LOGGING || tok == token::TOKEN_SUB_CONFIG_CONTROL);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      symbol_type (int tok, bool v, location_type l)
+        : super_type(token_type (tok), std::move (v), std::move (l))
+      {
+        YYASSERT (tok == token::TOKEN_BOOLEAN);
+      }
+#else
+      symbol_type (int tok, const bool& v, const location_type& l)
+        : super_type(token_type (tok), v, l)
+      {
+        YYASSERT (tok == token::TOKEN_BOOLEAN);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      symbol_type (int tok, double v, location_type l)
+        : super_type(token_type (tok), std::move (v), std::move (l))
+      {
+        YYASSERT (tok == token::TOKEN_FLOAT);
+      }
+#else
+      symbol_type (int tok, const double& v, const location_type& l)
+        : super_type(token_type (tok), v, l)
+      {
+        YYASSERT (tok == token::TOKEN_FLOAT);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      symbol_type (int tok, int64_t v, location_type l)
+        : super_type(token_type (tok), std::move (v), std::move (l))
+      {
+        YYASSERT (tok == token::TOKEN_INTEGER);
+      }
+#else
+      symbol_type (int tok, const int64_t& v, const location_type& l)
+        : super_type(token_type (tok), v, l)
+      {
+        YYASSERT (tok == token::TOKEN_INTEGER);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      symbol_type (int tok, std::string v, location_type l)
+        : super_type(token_type (tok), std::move (v), std::move (l))
+      {
+        YYASSERT (tok == token::TOKEN_STRING);
+      }
+#else
+      symbol_type (int tok, const std::string& v, const location_type& l)
+        : super_type(token_type (tok), v, l)
+      {
+        YYASSERT (tok == token::TOKEN_STRING);
+      }
+#endif
+    };
 
     /// Build a parser object.
     Dhcp6Parser (isc::dhcp::Parser6Context& ctx_yyarg);
@@ -865,2647 +985,3475 @@ namespace isc { namespace dhcp {
     /// Report a syntax error.
     void error (const syntax_error& err);
 
-    // Symbol constructors declarations.
-    static
-    symbol_type
-    make_END (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_COMMA (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_COLON (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LSQUARE_BRACKET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RSQUARE_BRACKET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LCURLY_BRACKET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RCURLY_BRACKET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NULL_TYPE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP6 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DATA_DIRECTORY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONFIG_CONTROL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONFIG_DATABASES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONFIG_FETCH_WAIT_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_INTERFACES_CONFIG (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_INTERFACES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RE_DETECT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LEASE_DATABASE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOSTS_DATABASE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOSTS_DATABASES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TYPE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MEMFILE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MYSQL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_POSTGRESQL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CQL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_USER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PASSWORD (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOST (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PORT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PERSIST (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LFC_INTERVAL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_READONLY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONNECT_TIMEOUT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONTACT_POINTS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_RECONNECT_TRIES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RECONNECT_WAIT_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_KEYSPACE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONSISTENCY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SERIAL_CONSISTENCY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_REQUEST_TIMEOUT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TCP_KEEPALIVE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TCP_NODELAY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_ROW_ERRORS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PREFERRED_LIFETIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MIN_PREFERRED_LIFETIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_PREFERRED_LIFETIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_VALID_LIFETIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MIN_VALID_LIFETIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_VALID_LIFETIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RENEW_TIMER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_REBIND_TIMER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CALCULATE_TEE_TIMES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_T1_PERCENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_T2_PERCENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DECLINE_PROBATION_PERIOD (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SERVER_TAG (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_SEND_UPDATES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_OVERRIDE_NO_UPDATE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_OVERRIDE_CLIENT_UPDATE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_REPLACE_CLIENT_NAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_GENERATED_PREFIX (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DDNS_QUALIFYING_SUFFIX (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUBNET6 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OPTION_DEF (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OPTION_DATA (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DATA (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CODE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SPACE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CSV_FORMAT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ALWAYS_SEND (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RECORD_TYPES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ENCAPSULATE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ARRAY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_POOLS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_POOL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PD_POOLS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PREFIX (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PREFIX_LEN (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_EXCLUDED_PREFIX (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_EXCLUDED_PREFIX_LEN (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DELEGATED_LEN (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_USER_CONTEXT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_COMMENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUBNET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_INTERFACE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_INTERFACE_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RAPID_COMMIT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RESERVATION_MODE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DISABLED (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OUT_OF_POOL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_GLOBAL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ALL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SHARED_NETWORKS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAC_SOURCES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RELAY_SUPPLIED_OPTIONS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOST_RESERVATION_IDENTIFIERS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SANITY_CHECKS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LEASE_CHECKS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CLIENT_CLASSES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_REQUIRE_CLIENT_CLASSES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TEST (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ONLY_IF_REQUIRED (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CLIENT_CLASS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RESERVATIONS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_IP_ADDRESSES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PREFIXES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DUID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HW_ADDRESS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOSTNAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_FLEX_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RELAY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_IP_ADDRESS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOOKS_LIBRARIES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LIBRARY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PARAMETERS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_EXPIRED_LEASES_PROCESSING (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_RECLAIM_TIMER_WAIT_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOLD_RECLAIMED_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_RECLAIM_LEASES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_RECLAIM_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_UNWARNED_RECLAIM_CYCLES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SERVER_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LLT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_EN (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_IDENTIFIER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HTYPE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TIME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ENTERPRISE_ID (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP4O6_PORT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONTROL_SOCKET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SOCKET_TYPE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SOCKET_NAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP_QUEUE_CONTROL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP_DDNS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ENABLE_UPDATES (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_QUALIFYING_SUFFIX (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SERVER_IP (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SERVER_PORT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SENDER_IP (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SENDER_PORT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAX_QUEUE_SIZE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NCR_PROTOCOL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NCR_FORMAT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OVERRIDE_NO_UPDATE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OVERRIDE_CLIENT_UPDATE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_REPLACE_CLIENT_NAME (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_GENERATED_PREFIX (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_UDP (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TCP (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_JSON (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_WHEN_PRESENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_NEVER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_ALWAYS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_WHEN_NOT_PRESENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOSTNAME_CHAR_SET (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_HOSTNAME_CHAR_REPLACEMENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LOGGING (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_LOGGERS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OUTPUT_OPTIONS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_OUTPUT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DEBUGLEVEL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SEVERITY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_FLUSH (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAXSIZE (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_MAXVER (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_PATTERN (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCP4 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_DHCPDDNS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_CONTROL_AGENT (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TOPLEVEL_JSON (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_TOPLEVEL_DHCP6 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_DHCP6 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_INTERFACES6 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_SUBNET6 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_POOL6 (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_PD_POOL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_RESERVATION (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_OPTION_DEFS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_OPTION_DEF (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_OPTION_DATA (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_HOOKS_LIBRARY (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_DHCP_DDNS (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_LOGGING (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_SUB_CONFIG_CONTROL (YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_STRING (YY_COPY (std::string) v, YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_INTEGER (YY_COPY (int64_t) v, YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_FLOAT (YY_COPY (double) v, YY_COPY (location_type) l);
-
-    static
-    symbol_type
-    make_BOOLEAN (YY_COPY (bool) v, YY_COPY (location_type) l);
-
-
-
-  private:
-    /// This class is not copyable.
-    Dhcp6Parser (const Dhcp6Parser&);
-    Dhcp6Parser& operator= (const Dhcp6Parser&);
-
-    /// State numbers.
-    typedef int state_type;
-
-    /// Generate an error message.
-    /// \param yystate   the state where the error occurred.
-    /// \param yyla      the lookahead token.
-    virtual std::string yysyntax_error_ (state_type yystate,
-                                         const symbol_type& yyla) const;
-
-    /// Compute post-reduction state.
-    /// \param yystate   the current state
-    /// \param yysym     the nonterminal to push on the stack
-    state_type yy_lr_goto_state_ (state_type yystate, int yysym);
-
-    /// Whether the given \c yypact_ value indicates a defaulted state.
-    /// \param yyvalue   the value to check
-    static bool yy_pact_value_is_default_ (int yyvalue);
-
-    /// Whether the given \c yytable_ value indicates a syntax error.
-    /// \param yyvalue   the value to check
-    static bool yy_table_value_is_error_ (int yyvalue);
-
-    static const short yypact_ninf_;
-    static const signed char yytable_ninf_;
-
-    /// Convert a scanner token number \a t to a symbol number.
-    static token_number_type yytranslate_ (token_type t);
-
-    // Tables.
-  // YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-  // STATE-NUM.
-  static const short yypact_[];
-
-  // YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-  // Performed when YYTABLE does not specify something else to do.  Zero
-  // means the default is an error.
-  static const unsigned short yydefact_[];
-
-  // YYPGOTO[NTERM-NUM].
-  static const short yypgoto_[];
-
-  // YYDEFGOTO[NTERM-NUM].
-  static const short yydefgoto_[];
-
-  // YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-  // positive, shift that token.  If negative, reduce the rule whose
-  // number is the opposite.  If YYTABLE_NINF, syntax error.
-  static const unsigned short yytable_[];
-
-  static const short yycheck_[];
-
-  // YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-  // symbol of state STATE-NUM.
-  static const unsigned short yystos_[];
-
-  // YYR1[YYN] -- Symbol number of symbol that rule YYN derives.
-  static const unsigned short yyr1_[];
-
-  // YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.
-  static const unsigned char yyr2_[];
-
-
-    /// Convert the symbol name \a n to a form suitable for a diagnostic.
-    static std::string yytnamerr_ (const char *n);
-
-
-    /// For a symbol, its name in clear.
-    static const char* const yytname_[];
-#if PARSER6_DEBUG
-  // YYRLINE[YYN] -- Source line where rule number YYN was defined.
-  static const unsigned short yyrline_[];
-    /// Report on the debug stream that the rule \a r is going to be reduced.
-    virtual void yy_reduce_print_ (int r);
-    /// Print the state stack on the debug stream.
-    virtual void yystack_print_ ();
-
-    /// Debugging level.
-    int yydebug_;
-    /// Debug stream.
-    std::ostream* yycdebug_;
-
-    /// \brief Display a symbol type, value and location.
-    /// \param yyo    The output stream.
-    /// \param yysym  The symbol.
-    template <typename Base>
-    void yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const;
-#endif
-
-    /// \brief Reclaim the memory associated to a symbol.
-    /// \param yymsg     Why this token is reclaimed.
-    ///                  If null, print nothing.
-    /// \param yysym     The symbol.
-    template <typename Base>
-    void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
-
-  private:
-    /// Type access provider for state based symbols.
-    struct by_state
-    {
-      /// Default constructor.
-      by_state ();
-
-      /// The symbol type as needed by the constructor.
-      typedef state_type kind_type;
-
-      /// Constructor.
-      by_state (kind_type s);
-
-      /// Copy constructor.
-      by_state (const by_state& other);
-
-      /// Record that this symbol is empty.
-      void clear ();
-
-      /// Steal the symbol type from \a that.
-      void move (by_state& that);
-
-      /// The (internal) type number (corresponding to \a state).
-      /// \a empty_symbol when empty.
-      symbol_number_type type_get () const;
-
-      /// The state number used to denote an empty symbol.
-      enum { empty_state = -1 };
-
-      /// The state.
-      /// \a empty when empty.
-      state_type state;
-    };
-
-    /// "Internal" symbol: element of the stack.
-    struct stack_symbol_type : basic_symbol<by_state>
-    {
-      /// Superclass.
-      typedef basic_symbol<by_state> super_type;
-      /// Construct an empty symbol.
-      stack_symbol_type ();
-      /// Move or copy construction.
-      stack_symbol_type (YY_RVREF (stack_symbol_type) that);
-      /// Steal the contents from \a sym to build this.
-      stack_symbol_type (state_type s, YY_MOVE_REF (symbol_type) sym);
-#if !defined __cplusplus || __cplusplus < 201103L
-      /// Assignment, needed by push_back by some old implementations.
-      /// Moves the contents of that.
-      stack_symbol_type& operator= (stack_symbol_type& that);
-#endif
-    };
-
-    /// Stack type.
-    typedef stack<stack_symbol_type> stack_type;
-
-    /// The stack.
-    stack_type yystack_;
-
-    /// Push a new state on the stack.
-    /// \param m    a debug message to display
-    ///             if null, no trace is output.
-    /// \param sym  the symbol
-    /// \warning the contents of \a s.value is stolen.
-    void yypush_ (const char* m, YY_MOVE_REF (stack_symbol_type) sym);
-
-    /// Push a new look ahead token on the state on the stack.
-    /// \param m    a debug message to display
-    ///             if null, no trace is output.
-    /// \param s    the state
-    /// \param sym  the symbol (for its value and location).
-    /// \warning the contents of \a sym.value is stolen.
-    void yypush_ (const char* m, state_type s, YY_MOVE_REF (symbol_type) sym);
-
-    /// Pop \a n symbols from the stack.
-    void yypop_ (int n = 1);
-
-    /// Constants.
-    enum
-    {
-      yyeof_ = 0,
-      yylast_ = 1180,     ///< Last index in yytable_.
-      yynnts_ = 419,  ///< Number of nonterminal symbols.
-      yyfinal_ = 32, ///< Termination state number.
-      yyterror_ = 1,
-      yyerrcode_ = 256,
-      yyntokens_ = 193  ///< Number of tokens.
-    };
-
-
-    // User arguments.
-    isc::dhcp::Parser6Context& ctx;
-  };
-
-  // Symbol number corresponding to token number t.
-  inline
-  Dhcp6Parser::token_number_type
-  Dhcp6Parser::yytranslate_ (token_type t)
-  {
-    static
-    const token_number_type
-    translate_table[] =
-    {
-     0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
-     165,   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
-    };
-    const unsigned user_token_number_max_ = 447;
-    const token_number_type undef_token_ = 2;
-
-    if (static_cast<int> (t) <= yyeof_)
-      return yyeof_;
-    else if (static_cast<unsigned> (t) <= user_token_number_max_)
-      return translate_table[t];
-    else
-      return undef_token_;
-  }
-
-  inline
-  Dhcp6Parser::syntax_error::syntax_error (const location_type& l, const std::string& m)
-    : std::runtime_error (m)
-    , location (l)
-  {}
-
-  // basic_symbol.
-  template <typename Base>
-  Dhcp6Parser::basic_symbol<Base>::basic_symbol ()
-    : value ()
-    , location ()
-  {}
-
-  template <typename Base>
-  Dhcp6Parser::basic_symbol<Base>::basic_symbol (YY_RVREF (basic_symbol) other)
-    : Base (YY_MOVE (other))
-    , value ()
-    , location (YY_MOVE (other.location))
-  {
-    switch (other.type_get ())
-    {
-      case 210: // value
-      case 214: // map_value
-      case 255: // ddns_replace_client_name_value
-      case 289: // db_type
-      case 383: // hr_mode
-      case 519: // duid_type
-      case 554: // ncr_protocol_value
-        value.YY_MOVE_OR_COPY< ElementPtr > (YY_MOVE (other.value));
-        break;
-
-      case 192: // "boolean"
-        value.YY_MOVE_OR_COPY< bool > (YY_MOVE (other.value));
-        break;
-
-      case 191: // "floating point"
-        value.YY_MOVE_OR_COPY< double > (YY_MOVE (other.value));
-        break;
-
-      case 190: // "integer"
-        value.YY_MOVE_OR_COPY< int64_t > (YY_MOVE (other.value));
-        break;
-
-      case 189: // "constant string"
-        value.YY_MOVE_OR_COPY< std::string > (YY_MOVE (other.value));
-        break;
-
-      default:
-        break;
-    }
-
-  }
-
-
-  // Implementation of basic_symbol constructor for each type.
-  template <typename Base>
-  Dhcp6Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (location_type) l)
-    : Base (t)
-    , location (YY_MOVE (l))
-  {}
-
-  template <typename Base>
-  Dhcp6Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (ElementPtr) v, YY_RVREF (location_type) l)
-    : Base (t)
-    , value (YY_MOVE (v))
-    , location (YY_MOVE (l))
-  {}
-
-  template <typename Base>
-  Dhcp6Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (bool) v, YY_RVREF (location_type) l)
-    : Base (t)
-    , value (YY_MOVE (v))
-    , location (YY_MOVE (l))
-  {}
-
-  template <typename Base>
-  Dhcp6Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (double) v, YY_RVREF (location_type) l)
-    : Base (t)
-    , value (YY_MOVE (v))
-    , location (YY_MOVE (l))
-  {}
-
-  template <typename Base>
-  Dhcp6Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (int64_t) v, YY_RVREF (location_type) l)
-    : Base (t)
-    , value (YY_MOVE (v))
-    , location (YY_MOVE (l))
-  {}
-
-  template <typename Base>
-  Dhcp6Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, YY_RVREF (std::string) v, YY_RVREF (location_type) l)
-    : Base (t)
-    , value (YY_MOVE (v))
-    , location (YY_MOVE (l))
-  {}
-
-
-
-  template <typename Base>
-  Dhcp6Parser::basic_symbol<Base>::~basic_symbol ()
-  {
-    clear ();
-  }
-
-  template <typename Base>
-  void
-  Dhcp6Parser::basic_symbol<Base>::clear ()
-  {
-    // User destructor.
-    symbol_number_type yytype = this->type_get ();
-    basic_symbol<Base>& yysym = *this;
-    (void) yysym;
-    switch (yytype)
-    {
-   default:
-      break;
-    }
-
-    // Type destructor.
-  switch (yytype)
-    {
-      case 210: // value
-      case 214: // map_value
-      case 255: // ddns_replace_client_name_value
-      case 289: // db_type
-      case 383: // hr_mode
-      case 519: // duid_type
-      case 554: // ncr_protocol_value
-        value.template destroy< ElementPtr > ();
-        break;
-
-      case 192: // "boolean"
-        value.template destroy< bool > ();
-        break;
-
-      case 191: // "floating point"
-        value.template destroy< double > ();
-        break;
-
-      case 190: // "integer"
-        value.template destroy< int64_t > ();
-        break;
-
-      case 189: // "constant string"
-        value.template destroy< std::string > ();
-        break;
-
-      default:
-        break;
-    }
-
-    Base::clear ();
-  }
-
-  template <typename Base>
-  bool
-  Dhcp6Parser::basic_symbol<Base>::empty () const
-  {
-    return Base::type_get () == empty_symbol;
-  }
-
-  template <typename Base>
-  void
-  Dhcp6Parser::basic_symbol<Base>::move (basic_symbol& s)
-  {
-    super_type::move (s);
-    switch (this->type_get ())
-    {
-      case 210: // value
-      case 214: // map_value
-      case 255: // ddns_replace_client_name_value
-      case 289: // db_type
-      case 383: // hr_mode
-      case 519: // duid_type
-      case 554: // ncr_protocol_value
-        value.move< ElementPtr > (YY_MOVE (s.value));
-        break;
-
-      case 192: // "boolean"
-        value.move< bool > (YY_MOVE (s.value));
-        break;
-
-      case 191: // "floating point"
-        value.move< double > (YY_MOVE (s.value));
-        break;
-
-      case 190: // "integer"
-        value.move< int64_t > (YY_MOVE (s.value));
-        break;
-
-      case 189: // "constant string"
-        value.move< std::string > (YY_MOVE (s.value));
-        break;
-
-      default:
-        break;
-    }
-
-    location = YY_MOVE (s.location);
-  }
-
-  // by_type.
-  inline
-  Dhcp6Parser::by_type::by_type ()
-    : type (empty_symbol)
-  {}
-
-  inline
-  Dhcp6Parser::by_type::by_type (const by_type& other)
-    : type (other.type)
-  {}
-
-  inline
-  Dhcp6Parser::by_type::by_type (token_type t)
-    : type (yytranslate_ (t))
-  {}
-
-  inline
-  void
-  Dhcp6Parser::by_type::clear ()
-  {
-    type = empty_symbol;
-  }
-
-  inline
-  void
-  Dhcp6Parser::by_type::move (by_type& that)
-  {
-    type = that.type;
-    that.clear ();
-  }
-
-  inline
-  int
-  Dhcp6Parser::by_type::type_get () const
-  {
-    return type;
-  }
-
-  inline
-  Dhcp6Parser::token_type
-  Dhcp6Parser::by_type::token () const
-  {
-    // YYTOKNUM[NUM] -- (External) token number corresponding to the
-    // (internal) symbol number NUM (which must be that of a token).  */
-    static
-    const unsigned short
-    yytoken_number_[] =
-    {
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
-     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
-     445,   446,   447
-    };
-    return static_cast<token_type> (yytoken_number_[type]);
-  }
-
-  // Implementation of make_symbol for each symbol type.
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_END (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_END, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_COMMA (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_COMMA, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_COLON (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_COLON, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_LSQUARE_BRACKET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LSQUARE_BRACKET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RSQUARE_BRACKET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RSQUARE_BRACKET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_LCURLY_BRACKET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LCURLY_BRACKET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RCURLY_BRACKET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RCURLY_BRACKET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_NULL_TYPE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NULL_TYPE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DHCP6 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP6, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DATA_DIRECTORY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DATA_DIRECTORY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CONFIG_CONTROL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONFIG_CONTROL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CONFIG_DATABASES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONFIG_DATABASES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CONFIG_FETCH_WAIT_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONFIG_FETCH_WAIT_TIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_INTERFACES_CONFIG (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_INTERFACES_CONFIG, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_INTERFACES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_INTERFACES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RE_DETECT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RE_DETECT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_LEASE_DATABASE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LEASE_DATABASE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HOSTS_DATABASE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOSTS_DATABASE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HOSTS_DATABASES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOSTS_DATABASES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_TYPE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TYPE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MEMFILE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MEMFILE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MYSQL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MYSQL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_POSTGRESQL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_POSTGRESQL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CQL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CQL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_USER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_USER, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PASSWORD (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PASSWORD, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HOST (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOST, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PORT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PORT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PERSIST (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PERSIST, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_LFC_INTERVAL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LFC_INTERVAL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_READONLY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_READONLY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CONNECT_TIMEOUT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONNECT_TIMEOUT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CONTACT_POINTS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONTACT_POINTS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MAX_RECONNECT_TRIES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_RECONNECT_TRIES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RECONNECT_WAIT_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RECONNECT_WAIT_TIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_KEYSPACE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_KEYSPACE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CONSISTENCY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONSISTENCY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SERIAL_CONSISTENCY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SERIAL_CONSISTENCY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_REQUEST_TIMEOUT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_REQUEST_TIMEOUT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_TCP_KEEPALIVE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TCP_KEEPALIVE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_TCP_NODELAY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TCP_NODELAY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MAX_ROW_ERRORS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_ROW_ERRORS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PREFERRED_LIFETIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PREFERRED_LIFETIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MIN_PREFERRED_LIFETIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MIN_PREFERRED_LIFETIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MAX_PREFERRED_LIFETIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_PREFERRED_LIFETIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_VALID_LIFETIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_VALID_LIFETIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MIN_VALID_LIFETIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MIN_VALID_LIFETIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MAX_VALID_LIFETIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_VALID_LIFETIME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RENEW_TIMER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RENEW_TIMER, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_REBIND_TIMER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_REBIND_TIMER, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CALCULATE_TEE_TIMES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CALCULATE_TEE_TIMES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_T1_PERCENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_T1_PERCENT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_T2_PERCENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_T2_PERCENT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DECLINE_PROBATION_PERIOD (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DECLINE_PROBATION_PERIOD, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SERVER_TAG (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SERVER_TAG, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DDNS_SEND_UPDATES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_SEND_UPDATES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DDNS_OVERRIDE_NO_UPDATE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_OVERRIDE_NO_UPDATE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DDNS_OVERRIDE_CLIENT_UPDATE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DDNS_REPLACE_CLIENT_NAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_REPLACE_CLIENT_NAME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DDNS_GENERATED_PREFIX (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_GENERATED_PREFIX, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DDNS_QUALIFYING_SUFFIX (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DDNS_QUALIFYING_SUFFIX, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUBNET6 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUBNET6, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_OPTION_DEF (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OPTION_DEF, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_OPTION_DATA (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OPTION_DATA, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_NAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NAME, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DATA (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DATA, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CODE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CODE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SPACE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SPACE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CSV_FORMAT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CSV_FORMAT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_ALWAYS_SEND (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ALWAYS_SEND, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RECORD_TYPES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RECORD_TYPES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_ENCAPSULATE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ENCAPSULATE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_ARRAY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ARRAY, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_POOLS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_POOLS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_POOL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_POOL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PD_POOLS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PD_POOLS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PREFIX (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PREFIX, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PREFIX_LEN (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PREFIX_LEN, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_EXCLUDED_PREFIX (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_EXCLUDED_PREFIX, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_EXCLUDED_PREFIX_LEN (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_EXCLUDED_PREFIX_LEN, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DELEGATED_LEN (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DELEGATED_LEN, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_USER_CONTEXT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_USER_CONTEXT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_COMMENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_COMMENT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUBNET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUBNET, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_INTERFACE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_INTERFACE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_INTERFACE_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_INTERFACE_ID, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ID, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RAPID_COMMIT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RAPID_COMMIT, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RESERVATION_MODE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RESERVATION_MODE, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DISABLED (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DISABLED, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_OUT_OF_POOL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OUT_OF_POOL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_GLOBAL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_GLOBAL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_ALL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ALL, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SHARED_NETWORKS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SHARED_NETWORKS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MAC_SOURCES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAC_SOURCES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RELAY_SUPPLIED_OPTIONS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RELAY_SUPPLIED_OPTIONS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HOST_RESERVATION_IDENTIFIERS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOST_RESERVATION_IDENTIFIERS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SANITY_CHECKS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SANITY_CHECKS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_LEASE_CHECKS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LEASE_CHECKS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CLIENT_CLASSES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CLIENT_CLASSES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_REQUIRE_CLIENT_CLASSES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_REQUIRE_CLIENT_CLASSES, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_TEST (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TEST, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_ONLY_IF_REQUIRED (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ONLY_IF_REQUIRED, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CLIENT_CLASS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CLIENT_CLASS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RESERVATIONS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RESERVATIONS, YY_MOVE (l));
-  }
-
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_IP_ADDRESSES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_IP_ADDRESSES, YY_MOVE (l));
-  }
+    // Implementation of make_symbol for each symbol type.
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_END (location_type l)
+      {
+        return symbol_type (token::TOKEN_END, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_END (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_END, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_COMMA (location_type l)
+      {
+        return symbol_type (token::TOKEN_COMMA, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_COMMA (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_COMMA, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_COLON (location_type l)
+      {
+        return symbol_type (token::TOKEN_COLON, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_COLON (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_COLON, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LSQUARE_BRACKET (location_type l)
+      {
+        return symbol_type (token::TOKEN_LSQUARE_BRACKET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LSQUARE_BRACKET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LSQUARE_BRACKET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RSQUARE_BRACKET (location_type l)
+      {
+        return symbol_type (token::TOKEN_RSQUARE_BRACKET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RSQUARE_BRACKET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RSQUARE_BRACKET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LCURLY_BRACKET (location_type l)
+      {
+        return symbol_type (token::TOKEN_LCURLY_BRACKET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LCURLY_BRACKET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LCURLY_BRACKET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RCURLY_BRACKET (location_type l)
+      {
+        return symbol_type (token::TOKEN_RCURLY_BRACKET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RCURLY_BRACKET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RCURLY_BRACKET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NULL_TYPE (location_type l)
+      {
+        return symbol_type (token::TOKEN_NULL_TYPE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NULL_TYPE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NULL_TYPE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP6 (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP6, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP6 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP6, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DATA_DIRECTORY (location_type l)
+      {
+        return symbol_type (token::TOKEN_DATA_DIRECTORY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DATA_DIRECTORY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DATA_DIRECTORY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONFIG_CONTROL (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_CONTROL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONFIG_CONTROL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_CONTROL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONFIG_DATABASES (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_DATABASES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONFIG_DATABASES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_DATABASES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONFIG_FETCH_WAIT_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_FETCH_WAIT_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONFIG_FETCH_WAIT_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONFIG_FETCH_WAIT_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_INTERFACES_CONFIG (location_type l)
+      {
+        return symbol_type (token::TOKEN_INTERFACES_CONFIG, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_INTERFACES_CONFIG (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_INTERFACES_CONFIG, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_INTERFACES (location_type l)
+      {
+        return symbol_type (token::TOKEN_INTERFACES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_INTERFACES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_INTERFACES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RE_DETECT (location_type l)
+      {
+        return symbol_type (token::TOKEN_RE_DETECT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RE_DETECT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RE_DETECT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LEASE_DATABASE (location_type l)
+      {
+        return symbol_type (token::TOKEN_LEASE_DATABASE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LEASE_DATABASE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LEASE_DATABASE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOSTS_DATABASE (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOSTS_DATABASE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOSTS_DATABASE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOSTS_DATABASE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOSTS_DATABASES (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOSTS_DATABASES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOSTS_DATABASES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOSTS_DATABASES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TYPE (location_type l)
+      {
+        return symbol_type (token::TOKEN_TYPE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TYPE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TYPE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MEMFILE (location_type l)
+      {
+        return symbol_type (token::TOKEN_MEMFILE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MEMFILE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MEMFILE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MYSQL (location_type l)
+      {
+        return symbol_type (token::TOKEN_MYSQL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MYSQL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MYSQL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_POSTGRESQL (location_type l)
+      {
+        return symbol_type (token::TOKEN_POSTGRESQL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_POSTGRESQL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_POSTGRESQL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CQL (location_type l)
+      {
+        return symbol_type (token::TOKEN_CQL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CQL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CQL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_USER (location_type l)
+      {
+        return symbol_type (token::TOKEN_USER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_USER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_USER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PASSWORD (location_type l)
+      {
+        return symbol_type (token::TOKEN_PASSWORD, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PASSWORD (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PASSWORD, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOST (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOST, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOST (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOST, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PORT (location_type l)
+      {
+        return symbol_type (token::TOKEN_PORT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PORT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PORT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PERSIST (location_type l)
+      {
+        return symbol_type (token::TOKEN_PERSIST, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PERSIST (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PERSIST, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LFC_INTERVAL (location_type l)
+      {
+        return symbol_type (token::TOKEN_LFC_INTERVAL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LFC_INTERVAL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LFC_INTERVAL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_READONLY (location_type l)
+      {
+        return symbol_type (token::TOKEN_READONLY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_READONLY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_READONLY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONNECT_TIMEOUT (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONNECT_TIMEOUT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONNECT_TIMEOUT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONNECT_TIMEOUT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONTACT_POINTS (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONTACT_POINTS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONTACT_POINTS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONTACT_POINTS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_RECONNECT_TRIES (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECONNECT_TRIES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_RECONNECT_TRIES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECONNECT_TRIES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RECONNECT_WAIT_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_RECONNECT_WAIT_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RECONNECT_WAIT_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RECONNECT_WAIT_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_KEYSPACE (location_type l)
+      {
+        return symbol_type (token::TOKEN_KEYSPACE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_KEYSPACE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_KEYSPACE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONSISTENCY (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONSISTENCY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONSISTENCY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONSISTENCY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SERIAL_CONSISTENCY (location_type l)
+      {
+        return symbol_type (token::TOKEN_SERIAL_CONSISTENCY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SERIAL_CONSISTENCY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SERIAL_CONSISTENCY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_REQUEST_TIMEOUT (location_type l)
+      {
+        return symbol_type (token::TOKEN_REQUEST_TIMEOUT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_REQUEST_TIMEOUT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_REQUEST_TIMEOUT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TCP_KEEPALIVE (location_type l)
+      {
+        return symbol_type (token::TOKEN_TCP_KEEPALIVE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TCP_KEEPALIVE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TCP_KEEPALIVE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TCP_NODELAY (location_type l)
+      {
+        return symbol_type (token::TOKEN_TCP_NODELAY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TCP_NODELAY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TCP_NODELAY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_ROW_ERRORS (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_ROW_ERRORS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_ROW_ERRORS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_ROW_ERRORS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PREFERRED_LIFETIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_PREFERRED_LIFETIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PREFERRED_LIFETIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PREFERRED_LIFETIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MIN_PREFERRED_LIFETIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_MIN_PREFERRED_LIFETIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MIN_PREFERRED_LIFETIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MIN_PREFERRED_LIFETIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_PREFERRED_LIFETIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_PREFERRED_LIFETIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_PREFERRED_LIFETIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_PREFERRED_LIFETIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_VALID_LIFETIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_VALID_LIFETIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_VALID_LIFETIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_VALID_LIFETIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MIN_VALID_LIFETIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_MIN_VALID_LIFETIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MIN_VALID_LIFETIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MIN_VALID_LIFETIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_VALID_LIFETIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_VALID_LIFETIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_VALID_LIFETIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_VALID_LIFETIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RENEW_TIMER (location_type l)
+      {
+        return symbol_type (token::TOKEN_RENEW_TIMER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RENEW_TIMER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RENEW_TIMER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_REBIND_TIMER (location_type l)
+      {
+        return symbol_type (token::TOKEN_REBIND_TIMER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_REBIND_TIMER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_REBIND_TIMER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CALCULATE_TEE_TIMES (location_type l)
+      {
+        return symbol_type (token::TOKEN_CALCULATE_TEE_TIMES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CALCULATE_TEE_TIMES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CALCULATE_TEE_TIMES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_T1_PERCENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_T1_PERCENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_T1_PERCENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_T1_PERCENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_T2_PERCENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_T2_PERCENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_T2_PERCENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_T2_PERCENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DECLINE_PROBATION_PERIOD (location_type l)
+      {
+        return symbol_type (token::TOKEN_DECLINE_PROBATION_PERIOD, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DECLINE_PROBATION_PERIOD (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DECLINE_PROBATION_PERIOD, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SERVER_TAG (location_type l)
+      {
+        return symbol_type (token::TOKEN_SERVER_TAG, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SERVER_TAG (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SERVER_TAG, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_SEND_UPDATES (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_SEND_UPDATES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_SEND_UPDATES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_SEND_UPDATES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_OVERRIDE_NO_UPDATE (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_OVERRIDE_NO_UPDATE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_OVERRIDE_NO_UPDATE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_OVERRIDE_NO_UPDATE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_OVERRIDE_CLIENT_UPDATE (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_OVERRIDE_CLIENT_UPDATE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_REPLACE_CLIENT_NAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_REPLACE_CLIENT_NAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_REPLACE_CLIENT_NAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_REPLACE_CLIENT_NAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_GENERATED_PREFIX (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_GENERATED_PREFIX, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_GENERATED_PREFIX (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_GENERATED_PREFIX, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DDNS_QUALIFYING_SUFFIX (location_type l)
+      {
+        return symbol_type (token::TOKEN_DDNS_QUALIFYING_SUFFIX, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DDNS_QUALIFYING_SUFFIX (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DDNS_QUALIFYING_SUFFIX, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUBNET6 (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUBNET6, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUBNET6 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUBNET6, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OPTION_DEF (location_type l)
+      {
+        return symbol_type (token::TOKEN_OPTION_DEF, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OPTION_DEF (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OPTION_DEF, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OPTION_DATA (location_type l)
+      {
+        return symbol_type (token::TOKEN_OPTION_DATA, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OPTION_DATA (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OPTION_DATA, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_NAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DATA (location_type l)
+      {
+        return symbol_type (token::TOKEN_DATA, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DATA (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DATA, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CODE (location_type l)
+      {
+        return symbol_type (token::TOKEN_CODE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CODE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CODE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SPACE (location_type l)
+      {
+        return symbol_type (token::TOKEN_SPACE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SPACE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SPACE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CSV_FORMAT (location_type l)
+      {
+        return symbol_type (token::TOKEN_CSV_FORMAT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CSV_FORMAT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CSV_FORMAT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ALWAYS_SEND (location_type l)
+      {
+        return symbol_type (token::TOKEN_ALWAYS_SEND, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ALWAYS_SEND (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ALWAYS_SEND, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RECORD_TYPES (location_type l)
+      {
+        return symbol_type (token::TOKEN_RECORD_TYPES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RECORD_TYPES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RECORD_TYPES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ENCAPSULATE (location_type l)
+      {
+        return symbol_type (token::TOKEN_ENCAPSULATE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ENCAPSULATE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ENCAPSULATE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ARRAY (location_type l)
+      {
+        return symbol_type (token::TOKEN_ARRAY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ARRAY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ARRAY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_POOLS (location_type l)
+      {
+        return symbol_type (token::TOKEN_POOLS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_POOLS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_POOLS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_POOL (location_type l)
+      {
+        return symbol_type (token::TOKEN_POOL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_POOL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_POOL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PD_POOLS (location_type l)
+      {
+        return symbol_type (token::TOKEN_PD_POOLS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PD_POOLS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PD_POOLS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PREFIX (location_type l)
+      {
+        return symbol_type (token::TOKEN_PREFIX, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PREFIX (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PREFIX, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PREFIX_LEN (location_type l)
+      {
+        return symbol_type (token::TOKEN_PREFIX_LEN, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PREFIX_LEN (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PREFIX_LEN, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_EXCLUDED_PREFIX (location_type l)
+      {
+        return symbol_type (token::TOKEN_EXCLUDED_PREFIX, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_EXCLUDED_PREFIX (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_EXCLUDED_PREFIX, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_EXCLUDED_PREFIX_LEN (location_type l)
+      {
+        return symbol_type (token::TOKEN_EXCLUDED_PREFIX_LEN, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_EXCLUDED_PREFIX_LEN (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_EXCLUDED_PREFIX_LEN, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DELEGATED_LEN (location_type l)
+      {
+        return symbol_type (token::TOKEN_DELEGATED_LEN, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DELEGATED_LEN (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DELEGATED_LEN, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_USER_CONTEXT (location_type l)
+      {
+        return symbol_type (token::TOKEN_USER_CONTEXT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_USER_CONTEXT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_USER_CONTEXT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_COMMENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_COMMENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_COMMENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_COMMENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUBNET (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUBNET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUBNET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUBNET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_INTERFACE (location_type l)
+      {
+        return symbol_type (token::TOKEN_INTERFACE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_INTERFACE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_INTERFACE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_INTERFACE_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_INTERFACE_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_INTERFACE_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_INTERFACE_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RAPID_COMMIT (location_type l)
+      {
+        return symbol_type (token::TOKEN_RAPID_COMMIT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RAPID_COMMIT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RAPID_COMMIT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RESERVATION_MODE (location_type l)
+      {
+        return symbol_type (token::TOKEN_RESERVATION_MODE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RESERVATION_MODE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RESERVATION_MODE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DISABLED (location_type l)
+      {
+        return symbol_type (token::TOKEN_DISABLED, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DISABLED (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DISABLED, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OUT_OF_POOL (location_type l)
+      {
+        return symbol_type (token::TOKEN_OUT_OF_POOL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OUT_OF_POOL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OUT_OF_POOL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_GLOBAL (location_type l)
+      {
+        return symbol_type (token::TOKEN_GLOBAL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_GLOBAL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_GLOBAL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ALL (location_type l)
+      {
+        return symbol_type (token::TOKEN_ALL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ALL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ALL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SHARED_NETWORKS (location_type l)
+      {
+        return symbol_type (token::TOKEN_SHARED_NETWORKS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SHARED_NETWORKS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SHARED_NETWORKS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAC_SOURCES (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAC_SOURCES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAC_SOURCES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAC_SOURCES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RELAY_SUPPLIED_OPTIONS (location_type l)
+      {
+        return symbol_type (token::TOKEN_RELAY_SUPPLIED_OPTIONS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RELAY_SUPPLIED_OPTIONS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RELAY_SUPPLIED_OPTIONS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOST_RESERVATION_IDENTIFIERS (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOST_RESERVATION_IDENTIFIERS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOST_RESERVATION_IDENTIFIERS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOST_RESERVATION_IDENTIFIERS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SANITY_CHECKS (location_type l)
+      {
+        return symbol_type (token::TOKEN_SANITY_CHECKS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SANITY_CHECKS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SANITY_CHECKS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LEASE_CHECKS (location_type l)
+      {
+        return symbol_type (token::TOKEN_LEASE_CHECKS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LEASE_CHECKS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LEASE_CHECKS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CLIENT_CLASSES (location_type l)
+      {
+        return symbol_type (token::TOKEN_CLIENT_CLASSES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CLIENT_CLASSES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CLIENT_CLASSES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_REQUIRE_CLIENT_CLASSES (location_type l)
+      {
+        return symbol_type (token::TOKEN_REQUIRE_CLIENT_CLASSES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_REQUIRE_CLIENT_CLASSES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_REQUIRE_CLIENT_CLASSES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TEST (location_type l)
+      {
+        return symbol_type (token::TOKEN_TEST, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TEST (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TEST, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ONLY_IF_REQUIRED (location_type l)
+      {
+        return symbol_type (token::TOKEN_ONLY_IF_REQUIRED, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ONLY_IF_REQUIRED (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ONLY_IF_REQUIRED, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CLIENT_CLASS (location_type l)
+      {
+        return symbol_type (token::TOKEN_CLIENT_CLASS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CLIENT_CLASS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CLIENT_CLASS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RESERVATIONS (location_type l)
+      {
+        return symbol_type (token::TOKEN_RESERVATIONS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RESERVATIONS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RESERVATIONS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_IP_ADDRESSES (location_type l)
+      {
+        return symbol_type (token::TOKEN_IP_ADDRESSES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_IP_ADDRESSES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_IP_ADDRESSES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PREFIXES (location_type l)
+      {
+        return symbol_type (token::TOKEN_PREFIXES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PREFIXES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PREFIXES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DUID (location_type l)
+      {
+        return symbol_type (token::TOKEN_DUID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DUID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DUID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HW_ADDRESS (location_type l)
+      {
+        return symbol_type (token::TOKEN_HW_ADDRESS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HW_ADDRESS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HW_ADDRESS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOSTNAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOSTNAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_FLEX_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_FLEX_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_FLEX_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_FLEX_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RELAY (location_type l)
+      {
+        return symbol_type (token::TOKEN_RELAY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RELAY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RELAY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_IP_ADDRESS (location_type l)
+      {
+        return symbol_type (token::TOKEN_IP_ADDRESS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_IP_ADDRESS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_IP_ADDRESS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOOKS_LIBRARIES (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOOKS_LIBRARIES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOOKS_LIBRARIES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOOKS_LIBRARIES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LIBRARY (location_type l)
+      {
+        return symbol_type (token::TOKEN_LIBRARY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LIBRARY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LIBRARY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PARAMETERS (location_type l)
+      {
+        return symbol_type (token::TOKEN_PARAMETERS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PARAMETERS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PARAMETERS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_EXPIRED_LEASES_PROCESSING (location_type l)
+      {
+        return symbol_type (token::TOKEN_EXPIRED_LEASES_PROCESSING, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_EXPIRED_LEASES_PROCESSING (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_EXPIRED_LEASES_PROCESSING, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_RECLAIM_TIMER_WAIT_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_RECLAIM_TIMER_WAIT_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_RECLAIM_TIMER_WAIT_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_RECLAIM_TIMER_WAIT_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOLD_RECLAIMED_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOLD_RECLAIMED_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOLD_RECLAIMED_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOLD_RECLAIMED_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_RECLAIM_LEASES (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECLAIM_LEASES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_RECLAIM_LEASES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECLAIM_LEASES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_RECLAIM_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECLAIM_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_RECLAIM_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_RECLAIM_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_UNWARNED_RECLAIM_CYCLES (location_type l)
+      {
+        return symbol_type (token::TOKEN_UNWARNED_RECLAIM_CYCLES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_UNWARNED_RECLAIM_CYCLES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_UNWARNED_RECLAIM_CYCLES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SERVER_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_SERVER_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SERVER_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SERVER_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LLT (location_type l)
+      {
+        return symbol_type (token::TOKEN_LLT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LLT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LLT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_EN (location_type l)
+      {
+        return symbol_type (token::TOKEN_EN, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_EN (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_EN, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LL (location_type l)
+      {
+        return symbol_type (token::TOKEN_LL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_IDENTIFIER (location_type l)
+      {
+        return symbol_type (token::TOKEN_IDENTIFIER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_IDENTIFIER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_IDENTIFIER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HTYPE (location_type l)
+      {
+        return symbol_type (token::TOKEN_HTYPE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HTYPE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HTYPE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TIME (location_type l)
+      {
+        return symbol_type (token::TOKEN_TIME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TIME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TIME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ENTERPRISE_ID (location_type l)
+      {
+        return symbol_type (token::TOKEN_ENTERPRISE_ID, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ENTERPRISE_ID (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ENTERPRISE_ID, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP4O6_PORT (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP4O6_PORT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP4O6_PORT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP4O6_PORT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONTROL_SOCKET (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONTROL_SOCKET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONTROL_SOCKET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONTROL_SOCKET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SOCKET_TYPE (location_type l)
+      {
+        return symbol_type (token::TOKEN_SOCKET_TYPE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SOCKET_TYPE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SOCKET_TYPE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SOCKET_NAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_SOCKET_NAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SOCKET_NAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SOCKET_NAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP_QUEUE_CONTROL (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP_QUEUE_CONTROL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP_QUEUE_CONTROL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP_QUEUE_CONTROL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP_DDNS (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP_DDNS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP_DDNS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP_DDNS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ENABLE_UPDATES (location_type l)
+      {
+        return symbol_type (token::TOKEN_ENABLE_UPDATES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ENABLE_UPDATES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ENABLE_UPDATES, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_QUALIFYING_SUFFIX (location_type l)
+      {
+        return symbol_type (token::TOKEN_QUALIFYING_SUFFIX, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_QUALIFYING_SUFFIX (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_QUALIFYING_SUFFIX, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SERVER_IP (location_type l)
+      {
+        return symbol_type (token::TOKEN_SERVER_IP, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SERVER_IP (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SERVER_IP, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SERVER_PORT (location_type l)
+      {
+        return symbol_type (token::TOKEN_SERVER_PORT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SERVER_PORT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SERVER_PORT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SENDER_IP (location_type l)
+      {
+        return symbol_type (token::TOKEN_SENDER_IP, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SENDER_IP (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SENDER_IP, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SENDER_PORT (location_type l)
+      {
+        return symbol_type (token::TOKEN_SENDER_PORT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SENDER_PORT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SENDER_PORT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAX_QUEUE_SIZE (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAX_QUEUE_SIZE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAX_QUEUE_SIZE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAX_QUEUE_SIZE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NCR_PROTOCOL (location_type l)
+      {
+        return symbol_type (token::TOKEN_NCR_PROTOCOL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NCR_PROTOCOL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NCR_PROTOCOL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NCR_FORMAT (location_type l)
+      {
+        return symbol_type (token::TOKEN_NCR_FORMAT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NCR_FORMAT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NCR_FORMAT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OVERRIDE_NO_UPDATE (location_type l)
+      {
+        return symbol_type (token::TOKEN_OVERRIDE_NO_UPDATE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OVERRIDE_NO_UPDATE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OVERRIDE_NO_UPDATE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OVERRIDE_CLIENT_UPDATE (location_type l)
+      {
+        return symbol_type (token::TOKEN_OVERRIDE_CLIENT_UPDATE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OVERRIDE_CLIENT_UPDATE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OVERRIDE_CLIENT_UPDATE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_REPLACE_CLIENT_NAME (location_type l)
+      {
+        return symbol_type (token::TOKEN_REPLACE_CLIENT_NAME, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_REPLACE_CLIENT_NAME (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_REPLACE_CLIENT_NAME, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_GENERATED_PREFIX (location_type l)
+      {
+        return symbol_type (token::TOKEN_GENERATED_PREFIX, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_GENERATED_PREFIX (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_GENERATED_PREFIX, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_UDP (location_type l)
+      {
+        return symbol_type (token::TOKEN_UDP, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_UDP (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_UDP, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TCP (location_type l)
+      {
+        return symbol_type (token::TOKEN_TCP, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TCP (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TCP, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_JSON (location_type l)
+      {
+        return symbol_type (token::TOKEN_JSON, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_JSON (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_JSON, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_WHEN_PRESENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_WHEN_PRESENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_WHEN_PRESENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_WHEN_PRESENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_NEVER (location_type l)
+      {
+        return symbol_type (token::TOKEN_NEVER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_NEVER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_NEVER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ALWAYS (location_type l)
+      {
+        return symbol_type (token::TOKEN_ALWAYS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ALWAYS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ALWAYS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_WHEN_NOT_PRESENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_WHEN_NOT_PRESENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_WHEN_NOT_PRESENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_WHEN_NOT_PRESENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOSTNAME_CHAR_SET (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME_CHAR_SET, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOSTNAME_CHAR_SET (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME_CHAR_SET, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_HOSTNAME_CHAR_REPLACEMENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME_CHAR_REPLACEMENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_HOSTNAME_CHAR_REPLACEMENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_HOSTNAME_CHAR_REPLACEMENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LOGGING (location_type l)
+      {
+        return symbol_type (token::TOKEN_LOGGING, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LOGGING (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LOGGING, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_LOGGERS (location_type l)
+      {
+        return symbol_type (token::TOKEN_LOGGERS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_LOGGERS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_LOGGERS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OUTPUT_OPTIONS (location_type l)
+      {
+        return symbol_type (token::TOKEN_OUTPUT_OPTIONS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OUTPUT_OPTIONS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OUTPUT_OPTIONS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_OUTPUT (location_type l)
+      {
+        return symbol_type (token::TOKEN_OUTPUT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_OUTPUT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_OUTPUT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DEBUGLEVEL (location_type l)
+      {
+        return symbol_type (token::TOKEN_DEBUGLEVEL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DEBUGLEVEL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DEBUGLEVEL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SEVERITY (location_type l)
+      {
+        return symbol_type (token::TOKEN_SEVERITY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SEVERITY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SEVERITY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_FLUSH (location_type l)
+      {
+        return symbol_type (token::TOKEN_FLUSH, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_FLUSH (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_FLUSH, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAXSIZE (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAXSIZE, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAXSIZE (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAXSIZE, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_MAXVER (location_type l)
+      {
+        return symbol_type (token::TOKEN_MAXVER, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_MAXVER (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_MAXVER, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_PATTERN (location_type l)
+      {
+        return symbol_type (token::TOKEN_PATTERN, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_PATTERN (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_PATTERN, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCP4 (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCP4, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCP4 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCP4, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_DHCPDDNS (location_type l)
+      {
+        return symbol_type (token::TOKEN_DHCPDDNS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_DHCPDDNS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_DHCPDDNS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_CONTROL_AGENT (location_type l)
+      {
+        return symbol_type (token::TOKEN_CONTROL_AGENT, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_CONTROL_AGENT (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_CONTROL_AGENT, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TOPLEVEL_JSON (location_type l)
+      {
+        return symbol_type (token::TOKEN_TOPLEVEL_JSON, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TOPLEVEL_JSON (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TOPLEVEL_JSON, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_TOPLEVEL_DHCP6 (location_type l)
+      {
+        return symbol_type (token::TOKEN_TOPLEVEL_DHCP6, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_TOPLEVEL_DHCP6 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_TOPLEVEL_DHCP6, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_DHCP6 (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_DHCP6, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_DHCP6 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_DHCP6, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_INTERFACES6 (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_INTERFACES6, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_INTERFACES6 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_INTERFACES6, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_SUBNET6 (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_SUBNET6, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_SUBNET6 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_SUBNET6, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_POOL6 (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_POOL6, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_POOL6 (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_POOL6, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_PD_POOL (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_PD_POOL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_PD_POOL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_PD_POOL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_RESERVATION (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_RESERVATION, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_RESERVATION (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_RESERVATION, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_OPTION_DEFS (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DEFS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_OPTION_DEFS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DEFS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_OPTION_DEF (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DEF, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_OPTION_DEF (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DEF, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_OPTION_DATA (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DATA, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_OPTION_DATA (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_OPTION_DATA, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_HOOKS_LIBRARY (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_HOOKS_LIBRARY, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_HOOKS_LIBRARY (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_HOOKS_LIBRARY, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_DHCP_DDNS (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_DHCP_DDNS, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_DHCP_DDNS (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_DHCP_DDNS, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_LOGGING (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_LOGGING, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_LOGGING (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_LOGGING, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_SUB_CONFIG_CONTROL (location_type l)
+      {
+        return symbol_type (token::TOKEN_SUB_CONFIG_CONTROL, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_SUB_CONFIG_CONTROL (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_SUB_CONFIG_CONTROL, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_STRING (std::string v, location_type l)
+      {
+        return symbol_type (token::TOKEN_STRING, std::move (v), std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_STRING (const std::string& v, const location_type& l)
+      {
+        return symbol_type (token::TOKEN_STRING, v, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_INTEGER (int64_t v, location_type l)
+      {
+        return symbol_type (token::TOKEN_INTEGER, std::move (v), std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_INTEGER (const int64_t& v, const location_type& l)
+      {
+        return symbol_type (token::TOKEN_INTEGER, v, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_FLOAT (double v, location_type l)
+      {
+        return symbol_type (token::TOKEN_FLOAT, std::move (v), std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_FLOAT (const double& v, const location_type& l)
+      {
+        return symbol_type (token::TOKEN_FLOAT, v, l);
+      }
+#endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_BOOLEAN (bool v, location_type l)
+      {
+        return symbol_type (token::TOKEN_BOOLEAN, std::move (v), std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_BOOLEAN (const bool& v, const location_type& l)
+      {
+        return symbol_type (token::TOKEN_BOOLEAN, v, l);
+      }
+#endif
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PREFIXES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PREFIXES, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DUID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DUID, YY_MOVE (l));
-  }
+  private:
+    /// This class is not copyable.
+    Dhcp6Parser (const Dhcp6Parser&);
+    Dhcp6Parser& operator= (const Dhcp6Parser&);
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HW_ADDRESS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HW_ADDRESS, YY_MOVE (l));
-  }
+    /// State numbers.
+    typedef int state_type;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HOSTNAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOSTNAME, YY_MOVE (l));
-  }
+    /// Generate an error message.
+    /// \param yystate   the state where the error occurred.
+    /// \param yyla      the lookahead token.
+    virtual std::string yysyntax_error_ (state_type yystate,
+                                         const symbol_type& yyla) const;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_FLEX_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_FLEX_ID, YY_MOVE (l));
-  }
+    /// Compute post-reduction state.
+    /// \param yystate   the current state
+    /// \param yysym     the nonterminal to push on the stack
+    state_type yy_lr_goto_state_ (state_type yystate, int yysym);
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RELAY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RELAY, YY_MOVE (l));
-  }
+    /// Whether the given \c yypact_ value indicates a defaulted state.
+    /// \param yyvalue   the value to check
+    static bool yy_pact_value_is_default_ (int yyvalue);
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_IP_ADDRESS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_IP_ADDRESS, YY_MOVE (l));
-  }
+    /// Whether the given \c yytable_ value indicates a syntax error.
+    /// \param yyvalue   the value to check
+    static bool yy_table_value_is_error_ (int yyvalue);
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HOOKS_LIBRARIES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOOKS_LIBRARIES, YY_MOVE (l));
-  }
+    static const short yypact_ninf_;
+    static const signed char yytable_ninf_;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_LIBRARY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LIBRARY, YY_MOVE (l));
-  }
+    /// Convert a scanner token number \a t to a symbol number.
+    static token_number_type yytranslate_ (token_type t);
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PARAMETERS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PARAMETERS, YY_MOVE (l));
-  }
+    // Tables.
+  // YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+  // STATE-NUM.
+  static const short yypact_[];
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_EXPIRED_LEASES_PROCESSING (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_EXPIRED_LEASES_PROCESSING, YY_MOVE (l));
-  }
+  // YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+  // Performed when YYTABLE does not specify something else to do.  Zero
+  // means the default is an error.
+  static const unsigned short yydefact_[];
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_RECLAIM_TIMER_WAIT_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_RECLAIM_TIMER_WAIT_TIME, YY_MOVE (l));
-  }
+  // YYPGOTO[NTERM-NUM].
+  static const short yypgoto_[];
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME, YY_MOVE (l));
-  }
+  // YYDEFGOTO[NTERM-NUM].
+  static const short yydefgoto_[];
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HOLD_RECLAIMED_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOLD_RECLAIMED_TIME, YY_MOVE (l));
-  }
+  // YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+  // positive, shift that token.  If negative, reduce the rule whose
+  // number is the opposite.  If YYTABLE_NINF, syntax error.
+  static const unsigned short yytable_[];
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MAX_RECLAIM_LEASES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_RECLAIM_LEASES, YY_MOVE (l));
-  }
+  static const short yycheck_[];
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MAX_RECLAIM_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_RECLAIM_TIME, YY_MOVE (l));
-  }
+  // YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+  // symbol of state STATE-NUM.
+  static const unsigned short yystos_[];
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_UNWARNED_RECLAIM_CYCLES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_UNWARNED_RECLAIM_CYCLES, YY_MOVE (l));
-  }
+  // YYR1[YYN] -- Symbol number of symbol that rule YYN derives.
+  static const unsigned short yyr1_[];
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SERVER_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SERVER_ID, YY_MOVE (l));
-  }
+  // YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.
+  static const unsigned char yyr2_[];
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_LLT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LLT, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_EN (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_EN, YY_MOVE (l));
-  }
+    /// Convert the symbol name \a n to a form suitable for a diagnostic.
+    static std::string yytnamerr_ (const char *n);
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_LL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LL, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_IDENTIFIER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_IDENTIFIER, YY_MOVE (l));
-  }
+    /// For a symbol, its name in clear.
+    static const char* const yytname_[];
+#if PARSER6_DEBUG
+  // YYRLINE[YYN] -- Source line where rule number YYN was defined.
+  static const unsigned short yyrline_[];
+    /// Report on the debug stream that the rule \a r is going to be reduced.
+    virtual void yy_reduce_print_ (int r);
+    /// Print the state stack on the debug stream.
+    virtual void yystack_print_ ();
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HTYPE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HTYPE, YY_MOVE (l));
-  }
+    /// Debugging level.
+    int yydebug_;
+    /// Debug stream.
+    std::ostream* yycdebug_;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_TIME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TIME, YY_MOVE (l));
-  }
+    /// \brief Display a symbol type, value and location.
+    /// \param yyo    The output stream.
+    /// \param yysym  The symbol.
+    template <typename Base>
+    void yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const;
+#endif
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_ENTERPRISE_ID (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ENTERPRISE_ID, YY_MOVE (l));
-  }
+    /// \brief Reclaim the memory associated to a symbol.
+    /// \param yymsg     Why this token is reclaimed.
+    ///                  If null, print nothing.
+    /// \param yysym     The symbol.
+    template <typename Base>
+    void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DHCP4O6_PORT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP4O6_PORT, YY_MOVE (l));
-  }
+  private:
+    /// Type access provider for state based symbols.
+    struct by_state
+    {
+      /// Default constructor.
+      by_state () YY_NOEXCEPT;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CONTROL_SOCKET (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONTROL_SOCKET, YY_MOVE (l));
-  }
+      /// The symbol type as needed by the constructor.
+      typedef state_type kind_type;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SOCKET_TYPE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SOCKET_TYPE, YY_MOVE (l));
-  }
+      /// Constructor.
+      by_state (kind_type s) YY_NOEXCEPT;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SOCKET_NAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SOCKET_NAME, YY_MOVE (l));
-  }
+      /// Copy constructor.
+      by_state (const by_state& that) YY_NOEXCEPT;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DHCP_QUEUE_CONTROL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP_QUEUE_CONTROL, YY_MOVE (l));
-  }
+      /// Record that this symbol is empty.
+      void clear () YY_NOEXCEPT;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DHCP_DDNS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP_DDNS, YY_MOVE (l));
-  }
+      /// Steal the symbol type from \a that.
+      void move (by_state& that);
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_ENABLE_UPDATES (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ENABLE_UPDATES, YY_MOVE (l));
-  }
+      /// The (internal) type number (corresponding to \a state).
+      /// \a empty_symbol when empty.
+      symbol_number_type type_get () const YY_NOEXCEPT;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_QUALIFYING_SUFFIX (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_QUALIFYING_SUFFIX, YY_MOVE (l));
-  }
+      /// The state number used to denote an empty symbol.
+      enum { empty_state = -1 };
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SERVER_IP (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SERVER_IP, YY_MOVE (l));
-  }
+      /// The state.
+      /// \a empty when empty.
+      state_type state;
+    };
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SERVER_PORT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SERVER_PORT, YY_MOVE (l));
-  }
+    /// "Internal" symbol: element of the stack.
+    struct stack_symbol_type : basic_symbol<by_state>
+    {
+      /// Superclass.
+      typedef basic_symbol<by_state> super_type;
+      /// Construct an empty symbol.
+      stack_symbol_type ();
+      /// Move or copy construction.
+      stack_symbol_type (YY_RVREF (stack_symbol_type) that);
+      /// Steal the contents from \a sym to build this.
+      stack_symbol_type (state_type s, YY_MOVE_REF (symbol_type) sym);
+#if YY_CPLUSPLUS < 201103L
+      /// Assignment, needed by push_back by some old implementations.
+      /// Moves the contents of that.
+      stack_symbol_type& operator= (stack_symbol_type& that);
+#endif
+    };
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SENDER_IP (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SENDER_IP, YY_MOVE (l));
-  }
+    /// A stack with random access from its top.
+    template <typename T, typename S = std::vector<T> >
+    class stack
+    {
+    public:
+      // Hide our reversed order.
+      typedef typename S::reverse_iterator iterator;
+      typedef typename S::const_reverse_iterator const_iterator;
+      typedef typename S::size_type size_type;
+
+      stack (size_type n = 200)
+        : seq_ (n)
+      {}
+
+      /// Random access.
+      ///
+      /// Index 0 returns the topmost element.
+      T&
+      operator[] (size_type i)
+      {
+        return seq_[size () - 1 - i];
+      }
+
+      /// Random access.
+      ///
+      /// Index 0 returns the topmost element.
+      T&
+      operator[] (int i)
+      {
+        return operator[] (size_type (i));
+      }
+
+      /// Random access.
+      ///
+      /// Index 0 returns the topmost element.
+      const T&
+      operator[] (size_type i) const
+      {
+        return seq_[size () - 1 - i];
+      }
+
+      /// Random access.
+      ///
+      /// Index 0 returns the topmost element.
+      const T&
+      operator[] (int i) const
+      {
+        return operator[] (size_type (i));
+      }
+
+      /// Steal the contents of \a t.
+      ///
+      /// Close to move-semantics.
+      void
+      push (YY_MOVE_REF (T) t)
+      {
+        seq_.push_back (T ());
+        operator[] (0).move (t);
+      }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SENDER_PORT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SENDER_PORT, YY_MOVE (l));
-  }
+      /// Pop elements from the stack.
+      void
+      pop (int n = 1) YY_NOEXCEPT
+      {
+        for (; 0 < n; --n)
+          seq_.pop_back ();
+      }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MAX_QUEUE_SIZE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAX_QUEUE_SIZE, YY_MOVE (l));
-  }
+      /// Pop all elements from the stack.
+      void
+      clear () YY_NOEXCEPT
+      {
+        seq_.clear ();
+      }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_NCR_PROTOCOL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NCR_PROTOCOL, YY_MOVE (l));
-  }
+      /// Number of elements on the stack.
+      size_type
+      size () const YY_NOEXCEPT
+      {
+        return seq_.size ();
+      }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_NCR_FORMAT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NCR_FORMAT, YY_MOVE (l));
-  }
+      /// Iterator on top of the stack (going downwards).
+      const_iterator
+      begin () const YY_NOEXCEPT
+      {
+        return seq_.rbegin ();
+      }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_OVERRIDE_NO_UPDATE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OVERRIDE_NO_UPDATE, YY_MOVE (l));
-  }
+      /// Bottom of the stack.
+      const_iterator
+      end () const YY_NOEXCEPT
+      {
+        return seq_.rend ();
+      }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_OVERRIDE_CLIENT_UPDATE (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OVERRIDE_CLIENT_UPDATE, YY_MOVE (l));
-  }
+      /// Present a slice of the top of a stack.
+      class slice
+      {
+      public:
+        slice (const stack& stack, int range)
+          : stack_ (stack)
+          , range_ (range)
+        {}
+
+        const T&
+        operator[] (int i) const
+        {
+          return stack_[range_ - i];
+        }
+
+      private:
+        const stack& stack_;
+        int range_;
+      };
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_REPLACE_CLIENT_NAME (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_REPLACE_CLIENT_NAME, YY_MOVE (l));
-  }
+    private:
+      stack (const stack&);
+      stack& operator= (const stack&);
+      /// The wrapped container.
+      S seq_;
+    };
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_GENERATED_PREFIX (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_GENERATED_PREFIX, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_UDP (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_UDP, YY_MOVE (l));
-  }
+    /// Stack type.
+    typedef stack<stack_symbol_type> stack_type;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_TCP (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TCP, YY_MOVE (l));
-  }
+    /// The stack.
+    stack_type yystack_;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_JSON (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_JSON, YY_MOVE (l));
-  }
+    /// Push a new state on the stack.
+    /// \param m    a debug message to display
+    ///             if null, no trace is output.
+    /// \param sym  the symbol
+    /// \warning the contents of \a s.value is stolen.
+    void yypush_ (const char* m, YY_MOVE_REF (stack_symbol_type) sym);
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_WHEN_PRESENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_WHEN_PRESENT, YY_MOVE (l));
-  }
+    /// Push a new look ahead token on the state on the stack.
+    /// \param m    a debug message to display
+    ///             if null, no trace is output.
+    /// \param s    the state
+    /// \param sym  the symbol (for its value and location).
+    /// \warning the contents of \a sym.value is stolen.
+    void yypush_ (const char* m, state_type s, YY_MOVE_REF (symbol_type) sym);
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_NEVER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_NEVER, YY_MOVE (l));
-  }
+    /// Pop \a n symbols from the stack.
+    void yypop_ (int n = 1);
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_ALWAYS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_ALWAYS, YY_MOVE (l));
-  }
+    /// Constants.
+    enum
+    {
+      yyeof_ = 0,
+      yylast_ = 1180,     ///< Last index in yytable_.
+      yynnts_ = 419,  ///< Number of nonterminal symbols.
+      yyfinal_ = 32, ///< Termination state number.
+      yyterror_ = 1,
+      yyerrcode_ = 256,
+      yyntokens_ = 193  ///< Number of tokens.
+    };
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_WHEN_NOT_PRESENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_WHEN_NOT_PRESENT, YY_MOVE (l));
-  }
+
+    // User arguments.
+    isc::dhcp::Parser6Context& ctx;
+  };
 
   inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HOSTNAME_CHAR_SET (YY_COPY (location_type) l)
+  Dhcp6Parser::token_number_type
+  Dhcp6Parser::yytranslate_ (token_type t)
   {
-    return symbol_type (token::TOKEN_HOSTNAME_CHAR_SET, YY_MOVE (l));
-  }
+    // YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to
+    // TOKEN-NUM as returned by yylex.
+    static
+    const token_number_type
+    translate_table[] =
+    {
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   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
+    };
+    const unsigned user_token_number_max_ = 447;
+    const token_number_type undef_token_ = 2;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_HOSTNAME_CHAR_REPLACEMENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_HOSTNAME_CHAR_REPLACEMENT, YY_MOVE (l));
+    if (static_cast<int> (t) <= yyeof_)
+      return yyeof_;
+    else if (static_cast<unsigned> (t) <= user_token_number_max_)
+      return translate_table[t];
+    else
+      return undef_token_;
   }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_LOGGING (YY_COPY (location_type) l)
+  // basic_symbol.
+#if 201103L <= YY_CPLUSPLUS
+  template <typename Base>
+  Dhcp6Parser::basic_symbol<Base>::basic_symbol (basic_symbol&& that)
+    : Base (std::move (that))
+    , value ()
+    , location (std::move (that.location))
   {
-    return symbol_type (token::TOKEN_LOGGING, YY_MOVE (l));
-  }
+    switch (this->type_get ())
+    {
+      case 210: // value
+      case 214: // map_value
+      case 255: // ddns_replace_client_name_value
+      case 289: // db_type
+      case 383: // hr_mode
+      case 519: // duid_type
+      case 554: // ncr_protocol_value
+        value.move< ElementPtr > (std::move (that.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_LOGGERS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_LOGGERS, YY_MOVE (l));
-  }
+      case 192: // "boolean"
+        value.move< bool > (std::move (that.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_OUTPUT_OPTIONS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OUTPUT_OPTIONS, YY_MOVE (l));
-  }
+      case 191: // "floating point"
+        value.move< double > (std::move (that.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_OUTPUT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_OUTPUT, YY_MOVE (l));
-  }
+      case 190: // "integer"
+        value.move< int64_t > (std::move (that.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DEBUGLEVEL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DEBUGLEVEL, YY_MOVE (l));
-  }
+      case 189: // "constant string"
+        value.move< std::string > (std::move (that.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SEVERITY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SEVERITY, YY_MOVE (l));
-  }
+      default:
+        break;
+    }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_FLUSH (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_FLUSH, YY_MOVE (l));
   }
+#endif
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MAXSIZE (YY_COPY (location_type) l)
+  template <typename Base>
+  Dhcp6Parser::basic_symbol<Base>::basic_symbol (const basic_symbol& that)
+    : Base (that)
+    , value ()
+    , location (that.location)
   {
-    return symbol_type (token::TOKEN_MAXSIZE, YY_MOVE (l));
-  }
+    switch (this->type_get ())
+    {
+      case 210: // value
+      case 214: // map_value
+      case 255: // ddns_replace_client_name_value
+      case 289: // db_type
+      case 383: // hr_mode
+      case 519: // duid_type
+      case 554: // ncr_protocol_value
+        value.copy< ElementPtr > (YY_MOVE (that.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_MAXVER (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_MAXVER, YY_MOVE (l));
-  }
+      case 192: // "boolean"
+        value.copy< bool > (YY_MOVE (that.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_PATTERN (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_PATTERN, YY_MOVE (l));
-  }
+      case 191: // "floating point"
+        value.copy< double > (YY_MOVE (that.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DHCP4 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCP4, YY_MOVE (l));
-  }
+      case 190: // "integer"
+        value.copy< int64_t > (YY_MOVE (that.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_DHCPDDNS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_DHCPDDNS, YY_MOVE (l));
-  }
+      case 189: // "constant string"
+        value.copy< std::string > (YY_MOVE (that.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_CONTROL_AGENT (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_CONTROL_AGENT, YY_MOVE (l));
-  }
+      default:
+        break;
+    }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_TOPLEVEL_JSON (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TOPLEVEL_JSON, YY_MOVE (l));
   }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_TOPLEVEL_DHCP6 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_TOPLEVEL_DHCP6, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_DHCP6 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_DHCP6, YY_MOVE (l));
-  }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_INTERFACES6 (YY_COPY (location_type) l)
+  template <typename Base>
+  bool
+  Dhcp6Parser::basic_symbol<Base>::empty () const YY_NOEXCEPT
   {
-    return symbol_type (token::TOKEN_SUB_INTERFACES6, YY_MOVE (l));
+    return Base::type_get () == empty_symbol;
   }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_SUBNET6 (YY_COPY (location_type) l)
+  template <typename Base>
+  void
+  Dhcp6Parser::basic_symbol<Base>::move (basic_symbol& s)
   {
-    return symbol_type (token::TOKEN_SUB_SUBNET6, YY_MOVE (l));
-  }
+    super_type::move (s);
+    switch (this->type_get ())
+    {
+      case 210: // value
+      case 214: // map_value
+      case 255: // ddns_replace_client_name_value
+      case 289: // db_type
+      case 383: // hr_mode
+      case 519: // duid_type
+      case 554: // ncr_protocol_value
+        value.move< ElementPtr > (YY_MOVE (s.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_POOL6 (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_POOL6, YY_MOVE (l));
-  }
+      case 192: // "boolean"
+        value.move< bool > (YY_MOVE (s.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_PD_POOL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_PD_POOL, YY_MOVE (l));
-  }
+      case 191: // "floating point"
+        value.move< double > (YY_MOVE (s.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_RESERVATION (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_RESERVATION, YY_MOVE (l));
-  }
+      case 190: // "integer"
+        value.move< int64_t > (YY_MOVE (s.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_OPTION_DEFS (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_OPTION_DEFS, YY_MOVE (l));
-  }
+      case 189: // "constant string"
+        value.move< std::string > (YY_MOVE (s.value));
+        break;
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_OPTION_DEF (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_OPTION_DEF, YY_MOVE (l));
-  }
+      default:
+        break;
+    }
 
-  inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_OPTION_DATA (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_OPTION_DATA, YY_MOVE (l));
+    location = YY_MOVE (s.location);
   }
 
+  // by_type.
   inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_HOOKS_LIBRARY (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_HOOKS_LIBRARY, YY_MOVE (l));
-  }
+  Dhcp6Parser::by_type::by_type ()
+    : type (empty_symbol)
+  {}
 
+#if 201103L <= YY_CPLUSPLUS
   inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_DHCP_DDNS (YY_COPY (location_type) l)
+  Dhcp6Parser::by_type::by_type (by_type&& that)
+    : type (that.type)
   {
-    return symbol_type (token::TOKEN_SUB_DHCP_DDNS, YY_MOVE (l));
+    that.clear ();
   }
+#endif
 
   inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_LOGGING (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_LOGGING, YY_MOVE (l));
-  }
+  Dhcp6Parser::by_type::by_type (const by_type& that)
+    : type (that.type)
+  {}
 
   inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_SUB_CONFIG_CONTROL (YY_COPY (location_type) l)
-  {
-    return symbol_type (token::TOKEN_SUB_CONFIG_CONTROL, YY_MOVE (l));
-  }
+  Dhcp6Parser::by_type::by_type (token_type t)
+    : type (yytranslate_ (t))
+  {}
 
   inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_STRING (YY_COPY (std::string) v, YY_COPY (location_type) l)
+  void
+  Dhcp6Parser::by_type::clear ()
   {
-    return symbol_type (token::TOKEN_STRING, YY_MOVE (v), YY_MOVE (l));
+    type = empty_symbol;
   }
 
   inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_INTEGER (YY_COPY (int64_t) v, YY_COPY (location_type) l)
+  void
+  Dhcp6Parser::by_type::move (by_type& that)
   {
-    return symbol_type (token::TOKEN_INTEGER, YY_MOVE (v), YY_MOVE (l));
+    type = that.type;
+    that.clear ();
   }
 
   inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_FLOAT (YY_COPY (double) v, YY_COPY (location_type) l)
+  int
+  Dhcp6Parser::by_type::type_get () const YY_NOEXCEPT
   {
-    return symbol_type (token::TOKEN_FLOAT, YY_MOVE (v), YY_MOVE (l));
+    return type;
   }
 
   inline
-  Dhcp6Parser::symbol_type
-  Dhcp6Parser::make_BOOLEAN (YY_COPY (bool) v, YY_COPY (location_type) l)
+  Dhcp6Parser::token_type
+  Dhcp6Parser::by_type::token () const YY_NOEXCEPT
   {
-    return symbol_type (token::TOKEN_BOOLEAN, YY_MOVE (v), YY_MOVE (l));
+    // YYTOKNUM[NUM] -- (External) token number corresponding to the
+    // (internal) symbol number NUM (which must be that of a token).  */
+    static
+    const unsigned short
+    yytoken_number_[] =
+    {
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
+     445,   446,   447
+    };
+    return token_type (yytoken_number_[type]);
   }
 
-
-#line 14 "dhcp6_parser.yy" // lalr1.cc:404
+#line 14 "dhcp6_parser.yy"
 } } // isc::dhcp
-#line 3509 "dhcp6_parser.h" // lalr1.cc:404
+#line 4456 "dhcp6_parser.h"
+
 
 
 
diff --git a/src/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh
index 94d877060d..cf97eda686 100644
--- a/src/bin/dhcp6/location.hh
+++ b/src/bin/dhcp6/location.hh
@@ -1,8 +1,9 @@
-// A Bison parser, made by GNU Bison 3.2.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Locations for Bison parsers in C++
 
-// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -54,9 +55,10 @@
 #  endif
 # endif
 
-#line 14 "dhcp6_parser.yy" // location.cc:339
+#line 14 "dhcp6_parser.yy"
 namespace isc { namespace dhcp {
-#line 60 "location.hh" // location.cc:339
+#line 60 "location.hh"
+
   /// A point in a source file.
   class position
   {
@@ -316,7 +318,8 @@ namespace isc { namespace dhcp {
     return ostr;
   }
 
-#line 14 "dhcp6_parser.yy" // location.cc:339
+#line 14 "dhcp6_parser.yy"
 } } // isc::dhcp
-#line 322 "location.hh" // location.cc:339
+#line 323 "location.hh"
+
 #endif // !YY_PARSER6_LOCATION_HH_INCLUDED
diff --git a/src/bin/dhcp6/position.hh b/src/bin/dhcp6/position.hh
index 22ef35f744..b26928e17b 100644
--- a/src/bin/dhcp6/position.hh
+++ b/src/bin/dhcp6/position.hh
@@ -1,4 +1,5 @@
-// A Bison parser, made by GNU Bison 3.2.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined in "location.hh".
diff --git a/src/bin/dhcp6/stack.hh b/src/bin/dhcp6/stack.hh
index 81e152d836..44a4b60f6b 100644
--- a/src/bin/dhcp6/stack.hh
+++ b/src/bin/dhcp6/stack.hh
@@ -1,4 +1,5 @@
-// A Bison parser, made by GNU Bison 3.2.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined with the parser itself.
diff --git a/src/bin/netconf/location.hh b/src/bin/netconf/location.hh
index d7b844da13..ceacad13f2 100644
--- a/src/bin/netconf/location.hh
+++ b/src/bin/netconf/location.hh
@@ -1,5 +1,5 @@
-// Generated 201908191239
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Locations for Bison parsers in C++
 
diff --git a/src/bin/netconf/netconf_parser.cc b/src/bin/netconf/netconf_parser.cc
index 6354d81874..4e3fb0a62e 100644
--- a/src/bin/netconf/netconf_parser.cc
+++ b/src/bin/netconf/netconf_parser.cc
@@ -1,4 +1,4 @@
-// A Bison parser, made by GNU Bison 3.4.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton implementation for Bison LALR(1) parsers in C++
 
@@ -92,9 +92,6 @@
 # endif
 
 
-// Suppress unused-variable warnings by "using" E.
-#define YYUSE(E) ((void) (E))
-
 // Enable debugging if requested.
 #if NETCONF_DEBUG
 
@@ -142,7 +139,7 @@
 
 #line 14 "netconf_parser.yy"
 namespace isc { namespace netconf {
-#line 146 "netconf_parser.cc"
+#line 143 "netconf_parser.cc"
 
 
   /* Return YYSTR after stripping away unnecessary quotes and
@@ -389,43 +386,43 @@ namespace isc { namespace netconf {
       case 46: // "constant string"
 #line 108 "netconf_parser.yy"
         { yyoutput << yysym.value.template as < std::string > (); }
-#line 393 "netconf_parser.cc"
+#line 390 "netconf_parser.cc"
         break;
 
       case 47: // "integer"
 #line 108 "netconf_parser.yy"
         { yyoutput << yysym.value.template as < int64_t > (); }
-#line 399 "netconf_parser.cc"
+#line 396 "netconf_parser.cc"
         break;
 
       case 48: // "floating point"
 #line 108 "netconf_parser.yy"
         { yyoutput << yysym.value.template as < double > (); }
-#line 405 "netconf_parser.cc"
+#line 402 "netconf_parser.cc"
         break;
 
       case 49: // "boolean"
 #line 108 "netconf_parser.yy"
         { yyoutput << yysym.value.template as < bool > (); }
-#line 411 "netconf_parser.cc"
+#line 408 "netconf_parser.cc"
         break;
 
       case 58: // value
 #line 108 "netconf_parser.yy"
         { yyoutput << yysym.value.template as < ElementPtr > (); }
-#line 417 "netconf_parser.cc"
+#line 414 "netconf_parser.cc"
         break;
 
       case 61: // map_value
 #line 108 "netconf_parser.yy"
         { yyoutput << yysym.value.template as < ElementPtr > (); }
-#line 423 "netconf_parser.cc"
+#line 420 "netconf_parser.cc"
         break;
 
       case 120: // socket_type_value
 #line 108 "netconf_parser.yy"
         { yyoutput << yysym.value.template as < ElementPtr > (); }
-#line 429 "netconf_parser.cc"
+#line 426 "netconf_parser.cc"
         break;
 
       default:
@@ -687,19 +684,19 @@ namespace isc { namespace netconf {
   case 2:
 #line 119 "netconf_parser.yy"
     { ctx.ctx_ = ctx.NO_KEYWORDS; }
-#line 691 "netconf_parser.cc"
+#line 688 "netconf_parser.cc"
     break;
 
   case 4:
 #line 120 "netconf_parser.yy"
     { ctx.ctx_ = ctx.CONFIG; }
-#line 697 "netconf_parser.cc"
+#line 694 "netconf_parser.cc"
     break;
 
   case 6:
 #line 121 "netconf_parser.yy"
     { ctx.ctx_ = ctx.NETCONF; }
-#line 703 "netconf_parser.cc"
+#line 700 "netconf_parser.cc"
     break;
 
   case 8:
@@ -709,7 +706,7 @@ namespace isc { namespace netconf {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 713 "netconf_parser.cc"
+#line 710 "netconf_parser.cc"
     break;
 
   case 9:
@@ -717,7 +714,7 @@ namespace isc { namespace netconf {
     {
     // parsing completed
 }
-#line 721 "netconf_parser.cc"
+#line 718 "netconf_parser.cc"
     break;
 
   case 10:
@@ -726,49 +723,49 @@ namespace isc { namespace netconf {
     // Push back the JSON value on the stack
     ctx.stack_.push_back(yystack_[0].value.as < ElementPtr > ());
 }
-#line 730 "netconf_parser.cc"
+#line 727 "netconf_parser.cc"
     break;
 
   case 11:
 #line 146 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location))); }
-#line 736 "netconf_parser.cc"
+#line 733 "netconf_parser.cc"
     break;
 
   case 12:
 #line 147 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location))); }
-#line 742 "netconf_parser.cc"
+#line 739 "netconf_parser.cc"
     break;
 
   case 13:
 #line 148 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location))); }
-#line 748 "netconf_parser.cc"
+#line 745 "netconf_parser.cc"
     break;
 
   case 14:
 #line 149 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location))); }
-#line 754 "netconf_parser.cc"
+#line 751 "netconf_parser.cc"
     break;
 
   case 15:
 #line 150 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); }
-#line 760 "netconf_parser.cc"
+#line 757 "netconf_parser.cc"
     break;
 
   case 16:
 #line 151 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 766 "netconf_parser.cc"
+#line 763 "netconf_parser.cc"
     break;
 
   case 17:
 #line 152 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 772 "netconf_parser.cc"
+#line 769 "netconf_parser.cc"
     break;
 
   case 18:
@@ -779,7 +776,7 @@ namespace isc { namespace netconf {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 783 "netconf_parser.cc"
+#line 780 "netconf_parser.cc"
     break;
 
   case 19:
@@ -789,13 +786,13 @@ namespace isc { namespace netconf {
     // (maybe some sanity checking), this would be the best place
     // for it.
 }
-#line 793 "netconf_parser.cc"
+#line 790 "netconf_parser.cc"
     break;
 
   case 20:
 #line 167 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 799 "netconf_parser.cc"
+#line 796 "netconf_parser.cc"
     break;
 
   case 23:
@@ -804,7 +801,7 @@ namespace isc { namespace netconf {
                   // map containing a single entry
                   ctx.stack_.back()->set(yystack_[2].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
                   }
-#line 808 "netconf_parser.cc"
+#line 805 "netconf_parser.cc"
     break;
 
   case 24:
@@ -814,7 +811,7 @@ namespace isc { namespace netconf {
                   // comma and string:value
                   ctx.stack_.back()->set(yystack_[2].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
                   }
-#line 818 "netconf_parser.cc"
+#line 815 "netconf_parser.cc"
     break;
 
   case 25:
@@ -823,14 +820,14 @@ namespace isc { namespace netconf {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
 }
-#line 827 "netconf_parser.cc"
+#line 824 "netconf_parser.cc"
     break;
 
   case 26:
 #line 195 "netconf_parser.yy"
     {
 }
-#line 834 "netconf_parser.cc"
+#line 831 "netconf_parser.cc"
     break;
 
   case 29:
@@ -839,7 +836,7 @@ namespace isc { namespace netconf {
                   // List consisting of a single element.
                   ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
                   }
-#line 843 "netconf_parser.cc"
+#line 840 "netconf_parser.cc"
     break;
 
   case 30:
@@ -848,7 +845,7 @@ namespace isc { namespace netconf {
                   // List ending with , and a value.
                   ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
                   }
-#line 852 "netconf_parser.cc"
+#line 849 "netconf_parser.cc"
     break;
 
   case 31:
@@ -859,7 +856,7 @@ namespace isc { namespace netconf {
     error(yystack_[1].location,
           "got unexpected keyword \"" + keyword + "\" in " + where + " map.");
 }
-#line 863 "netconf_parser.cc"
+#line 860 "netconf_parser.cc"
     break;
 
   case 32:
@@ -870,7 +867,7 @@ namespace isc { namespace netconf {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 874 "netconf_parser.cc"
+#line 871 "netconf_parser.cc"
     break;
 
   case 33:
@@ -880,7 +877,7 @@ namespace isc { namespace netconf {
     // (maybe some sanity checking), this would be the best place
     // for it.
 }
-#line 884 "netconf_parser.cc"
+#line 881 "netconf_parser.cc"
     break;
 
   case 38:
@@ -896,7 +893,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.NETCONF);
 }
-#line 900 "netconf_parser.cc"
+#line 897 "netconf_parser.cc"
     break;
 
   case 39:
@@ -907,7 +904,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 911 "netconf_parser.cc"
+#line 908 "netconf_parser.cc"
     break;
 
   case 53:
@@ -916,7 +913,7 @@ namespace isc { namespace netconf {
     ElementPtr flag(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("boot-update", flag);
 }
-#line 920 "netconf_parser.cc"
+#line 917 "netconf_parser.cc"
     break;
 
   case 54:
@@ -925,7 +922,7 @@ namespace isc { namespace netconf {
     ElementPtr flag(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subscribe-changes", flag);
 }
-#line 929 "netconf_parser.cc"
+#line 926 "netconf_parser.cc"
     break;
 
   case 55:
@@ -934,7 +931,7 @@ namespace isc { namespace netconf {
     ElementPtr flag(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("validate-changes", flag);
 }
-#line 938 "netconf_parser.cc"
+#line 935 "netconf_parser.cc"
     break;
 
   case 56:
@@ -942,7 +939,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 946 "netconf_parser.cc"
+#line 943 "netconf_parser.cc"
     break;
 
   case 57:
@@ -969,7 +966,7 @@ namespace isc { namespace netconf {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 973 "netconf_parser.cc"
+#line 970 "netconf_parser.cc"
     break;
 
   case 58:
@@ -977,7 +974,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 981 "netconf_parser.cc"
+#line 978 "netconf_parser.cc"
     break;
 
   case 59:
@@ -1006,7 +1003,7 @@ namespace isc { namespace netconf {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 1010 "netconf_parser.cc"
+#line 1007 "netconf_parser.cc"
     break;
 
   case 60:
@@ -1017,7 +1014,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.HOOKS_LIBRARIES);
 }
-#line 1021 "netconf_parser.cc"
+#line 1018 "netconf_parser.cc"
     break;
 
   case 61:
@@ -1026,7 +1023,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1030 "netconf_parser.cc"
+#line 1027 "netconf_parser.cc"
     break;
 
   case 66:
@@ -1036,7 +1033,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1040 "netconf_parser.cc"
+#line 1037 "netconf_parser.cc"
     break;
 
   case 67:
@@ -1044,7 +1041,7 @@ namespace isc { namespace netconf {
     {
     ctx.stack_.pop_back();
 }
-#line 1048 "netconf_parser.cc"
+#line 1045 "netconf_parser.cc"
     break;
 
   case 73:
@@ -1052,7 +1049,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1056 "netconf_parser.cc"
+#line 1053 "netconf_parser.cc"
     break;
 
   case 74:
@@ -1062,7 +1059,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->set("library", lib);
     ctx.leave();
 }
-#line 1066 "netconf_parser.cc"
+#line 1063 "netconf_parser.cc"
     break;
 
   case 75:
@@ -1070,7 +1067,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1074 "netconf_parser.cc"
+#line 1071 "netconf_parser.cc"
     break;
 
   case 76:
@@ -1079,7 +1076,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1083 "netconf_parser.cc"
+#line 1080 "netconf_parser.cc"
     break;
 
   case 77:
@@ -1090,7 +1087,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.MANAGED_SERVERS);
 }
-#line 1094 "netconf_parser.cc"
+#line 1091 "netconf_parser.cc"
     break;
 
   case 78:
@@ -1099,7 +1096,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1103 "netconf_parser.cc"
+#line 1100 "netconf_parser.cc"
     break;
 
   case 88:
@@ -1110,7 +1107,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER);
 }
-#line 1114 "netconf_parser.cc"
+#line 1111 "netconf_parser.cc"
     break;
 
   case 89:
@@ -1119,7 +1116,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1123 "netconf_parser.cc"
+#line 1120 "netconf_parser.cc"
     break;
 
   case 90:
@@ -1130,7 +1127,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER);
 }
-#line 1134 "netconf_parser.cc"
+#line 1131 "netconf_parser.cc"
     break;
 
   case 91:
@@ -1139,7 +1136,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1143 "netconf_parser.cc"
+#line 1140 "netconf_parser.cc"
     break;
 
   case 92:
@@ -1150,7 +1147,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER);
 }
-#line 1154 "netconf_parser.cc"
+#line 1151 "netconf_parser.cc"
     break;
 
   case 93:
@@ -1159,7 +1156,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1163 "netconf_parser.cc"
+#line 1160 "netconf_parser.cc"
     break;
 
   case 94:
@@ -1170,7 +1167,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER);
 }
-#line 1174 "netconf_parser.cc"
+#line 1171 "netconf_parser.cc"
     break;
 
   case 95:
@@ -1179,7 +1176,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1183 "netconf_parser.cc"
+#line 1180 "netconf_parser.cc"
     break;
 
   case 106:
@@ -1187,7 +1184,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1191 "netconf_parser.cc"
+#line 1188 "netconf_parser.cc"
     break;
 
   case 107:
@@ -1197,7 +1194,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->set("model", model);
     ctx.leave();
 }
-#line 1201 "netconf_parser.cc"
+#line 1198 "netconf_parser.cc"
     break;
 
   case 108:
@@ -1208,7 +1205,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.CONTROL_SOCKET);
 }
-#line 1212 "netconf_parser.cc"
+#line 1209 "netconf_parser.cc"
     break;
 
   case 109:
@@ -1217,7 +1214,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1221 "netconf_parser.cc"
+#line 1218 "netconf_parser.cc"
     break;
 
   case 118:
@@ -1225,7 +1222,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.SOCKET_TYPE);
 }
-#line 1229 "netconf_parser.cc"
+#line 1226 "netconf_parser.cc"
     break;
 
   case 119:
@@ -1234,25 +1231,25 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->set("socket-type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 1238 "netconf_parser.cc"
+#line 1235 "netconf_parser.cc"
     break;
 
   case 120:
 #line 537 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("unix", ctx.loc2pos(yystack_[0].location))); }
-#line 1244 "netconf_parser.cc"
+#line 1241 "netconf_parser.cc"
     break;
 
   case 121:
 #line 538 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("http", ctx.loc2pos(yystack_[0].location))); }
-#line 1250 "netconf_parser.cc"
+#line 1247 "netconf_parser.cc"
     break;
 
   case 122:
 #line 539 "netconf_parser.yy"
     { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("stdout", ctx.loc2pos(yystack_[0].location))); }
-#line 1256 "netconf_parser.cc"
+#line 1253 "netconf_parser.cc"
     break;
 
   case 123:
@@ -1260,7 +1257,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1264 "netconf_parser.cc"
+#line 1261 "netconf_parser.cc"
     break;
 
   case 124:
@@ -1270,7 +1267,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->set("socket-name", name);
     ctx.leave();
 }
-#line 1274 "netconf_parser.cc"
+#line 1271 "netconf_parser.cc"
     break;
 
   case 125:
@@ -1278,7 +1275,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1282 "netconf_parser.cc"
+#line 1279 "netconf_parser.cc"
     break;
 
   case 126:
@@ -1288,7 +1285,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->set("socket-url", url);
     ctx.leave();
 }
-#line 1292 "netconf_parser.cc"
+#line 1289 "netconf_parser.cc"
     break;
 
   case 127:
@@ -1299,7 +1296,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.LOGGING);
 }
-#line 1303 "netconf_parser.cc"
+#line 1300 "netconf_parser.cc"
     break;
 
   case 128:
@@ -1308,7 +1305,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1312 "netconf_parser.cc"
+#line 1309 "netconf_parser.cc"
     break;
 
   case 132:
@@ -1319,7 +1316,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.LOGGERS);
 }
-#line 1323 "netconf_parser.cc"
+#line 1320 "netconf_parser.cc"
     break;
 
   case 133:
@@ -1328,7 +1325,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1332 "netconf_parser.cc"
+#line 1329 "netconf_parser.cc"
     break;
 
   case 136:
@@ -1338,7 +1335,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->add(l);
     ctx.stack_.push_back(l);
 }
-#line 1342 "netconf_parser.cc"
+#line 1339 "netconf_parser.cc"
     break;
 
   case 137:
@@ -1346,7 +1343,7 @@ namespace isc { namespace netconf {
     {
     ctx.stack_.pop_back();
 }
-#line 1350 "netconf_parser.cc"
+#line 1347 "netconf_parser.cc"
     break;
 
   case 147:
@@ -1354,7 +1351,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1358 "netconf_parser.cc"
+#line 1355 "netconf_parser.cc"
     break;
 
   case 148:
@@ -1364,7 +1361,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->set("name", name);
     ctx.leave();
 }
-#line 1368 "netconf_parser.cc"
+#line 1365 "netconf_parser.cc"
     break;
 
   case 149:
@@ -1373,7 +1370,7 @@ namespace isc { namespace netconf {
     ElementPtr dl(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
 }
-#line 1377 "netconf_parser.cc"
+#line 1374 "netconf_parser.cc"
     break;
 
   case 150:
@@ -1381,7 +1378,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1385 "netconf_parser.cc"
+#line 1382 "netconf_parser.cc"
     break;
 
   case 151:
@@ -1391,7 +1388,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->set("severity", sev);
     ctx.leave();
 }
-#line 1395 "netconf_parser.cc"
+#line 1392 "netconf_parser.cc"
     break;
 
   case 152:
@@ -1402,7 +1399,7 @@ namespace isc { namespace netconf {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OUTPUT_OPTIONS);
 }
-#line 1406 "netconf_parser.cc"
+#line 1403 "netconf_parser.cc"
     break;
 
   case 153:
@@ -1411,7 +1408,7 @@ namespace isc { namespace netconf {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1415 "netconf_parser.cc"
+#line 1412 "netconf_parser.cc"
     break;
 
   case 156:
@@ -1421,7 +1418,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1425 "netconf_parser.cc"
+#line 1422 "netconf_parser.cc"
     break;
 
   case 157:
@@ -1429,7 +1426,7 @@ namespace isc { namespace netconf {
     {
     ctx.stack_.pop_back();
 }
-#line 1433 "netconf_parser.cc"
+#line 1430 "netconf_parser.cc"
     break;
 
   case 165:
@@ -1437,7 +1434,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1441 "netconf_parser.cc"
+#line 1438 "netconf_parser.cc"
     break;
 
   case 166:
@@ -1447,7 +1444,7 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->set("output", sev);
     ctx.leave();
 }
-#line 1451 "netconf_parser.cc"
+#line 1448 "netconf_parser.cc"
     break;
 
   case 167:
@@ -1456,7 +1453,7 @@ namespace isc { namespace netconf {
     ElementPtr flush(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
 }
-#line 1460 "netconf_parser.cc"
+#line 1457 "netconf_parser.cc"
     break;
 
   case 168:
@@ -1465,7 +1462,7 @@ namespace isc { namespace netconf {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
 }
-#line 1469 "netconf_parser.cc"
+#line 1466 "netconf_parser.cc"
     break;
 
   case 169:
@@ -1474,7 +1471,7 @@ namespace isc { namespace netconf {
     ElementPtr maxver(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
 }
-#line 1478 "netconf_parser.cc"
+#line 1475 "netconf_parser.cc"
     break;
 
   case 170:
@@ -1482,7 +1479,7 @@ namespace isc { namespace netconf {
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1486 "netconf_parser.cc"
+#line 1483 "netconf_parser.cc"
     break;
 
   case 171:
@@ -1492,11 +1489,11 @@ namespace isc { namespace netconf {
     ctx.stack_.back()->set("pattern", sev);
     ctx.leave();
 }
-#line 1496 "netconf_parser.cc"
+#line 1493 "netconf_parser.cc"
     break;
 
 
-#line 1500 "netconf_parser.cc"
+#line 1497 "netconf_parser.cc"
 
             default:
               break;
@@ -2108,7 +2105,7 @@ namespace isc { namespace netconf {
 
 #line 14 "netconf_parser.yy"
 } } // isc::netconf
-#line 2112 "netconf_parser.cc"
+#line 2109 "netconf_parser.cc"
 
 #line 711 "netconf_parser.yy"
 
diff --git a/src/bin/netconf/netconf_parser.h b/src/bin/netconf/netconf_parser.h
index 40029e5945..f30de2e2dc 100644
--- a/src/bin/netconf/netconf_parser.h
+++ b/src/bin/netconf/netconf_parser.h
@@ -1,4 +1,4 @@
-// A Bison parser, made by GNU Bison 3.4.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton interface for Bison LALR(1) parsers in C++
 
diff --git a/src/bin/netconf/position.hh b/src/bin/netconf/position.hh
index 5bdc0c9dfa..b26928e17b 100644
--- a/src/bin/netconf/position.hh
+++ b/src/bin/netconf/position.hh
@@ -1,5 +1,5 @@
-// Generated 201908191239
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined in "location.hh".
diff --git a/src/bin/netconf/stack.hh b/src/bin/netconf/stack.hh
index 6da8bd8837..44a4b60f6b 100644
--- a/src/bin/netconf/stack.hh
+++ b/src/bin/netconf/stack.hh
@@ -1,5 +1,5 @@
-// Generated 201908191239
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined with the parser itself.
diff --git a/src/lib/eval/location.hh b/src/lib/eval/location.hh
index 3db20ccbb7..18ecdf2a89 100644
--- a/src/lib/eval/location.hh
+++ b/src/lib/eval/location.hh
@@ -1,5 +1,5 @@
-// Generated 201908191239
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Locations for Bison parsers in C++
 
diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc
index 7406d17dfb..e9b5418878 100644
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -1,4 +1,4 @@
-// A Bison parser, made by GNU Bison 3.4.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton implementation for Bison LALR(1) parsers in C++
 
@@ -92,9 +92,6 @@
 # endif
 
 
-// Suppress unused-variable warnings by "using" E.
-#define YYUSE(E) ((void) (E))
-
 // Enable debugging if requested.
 #if EVALDEBUG
 
@@ -142,7 +139,7 @@
 
 #line 14 "parser.yy"
 namespace isc { namespace eval {
-#line 146 "parser.cc"
+#line 143 "parser.cc"
 
 
   /* Return YYSTR after stripping away unnecessary quotes and
@@ -449,91 +446,91 @@ namespace isc { namespace eval {
       case 50: // "constant string"
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < std::string > (); }
-#line 453 "parser.cc"
+#line 450 "parser.cc"
         break;
 
       case 51: // "integer"
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < std::string > (); }
-#line 459 "parser.cc"
+#line 456 "parser.cc"
         break;
 
       case 52: // "constant hexstring"
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < std::string > (); }
-#line 465 "parser.cc"
+#line 462 "parser.cc"
         break;
 
       case 53: // "option name"
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < std::string > (); }
-#line 471 "parser.cc"
+#line 468 "parser.cc"
         break;
 
       case 54: // "ip address"
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < std::string > (); }
-#line 477 "parser.cc"
+#line 474 "parser.cc"
         break;
 
       case 60: // integer_expr
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < uint32_t > (); }
-#line 483 "parser.cc"
+#line 480 "parser.cc"
         break;
 
       case 61: // option_code
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < uint16_t > (); }
-#line 489 "parser.cc"
+#line 486 "parser.cc"
         break;
 
       case 62: // sub_option_code
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < uint16_t > (); }
-#line 495 "parser.cc"
+#line 492 "parser.cc"
         break;
 
       case 63: // option_repr_type
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < TokenOption::RepresentationType > (); }
-#line 501 "parser.cc"
+#line 498 "parser.cc"
         break;
 
       case 64: // nest_level
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < int8_t > (); }
-#line 507 "parser.cc"
+#line 504 "parser.cc"
         break;
 
       case 65: // pkt_metadata
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < TokenPkt::MetadataType > (); }
-#line 513 "parser.cc"
+#line 510 "parser.cc"
         break;
 
       case 66: // enterprise_id
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < uint32_t > (); }
-#line 519 "parser.cc"
+#line 516 "parser.cc"
         break;
 
       case 67: // pkt4_field
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < TokenPkt4::FieldType > (); }
-#line 525 "parser.cc"
+#line 522 "parser.cc"
         break;
 
       case 68: // pkt6_field
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < TokenPkt6::FieldType > (); }
-#line 531 "parser.cc"
+#line 528 "parser.cc"
         break;
 
       case 69: // relay6_field
 #line 112 "parser.yy"
         { yyoutput << yysym.value.template as < TokenRelay6Field::FieldType > (); }
-#line 537 "parser.cc"
+#line 534 "parser.cc"
         break;
 
       default:
@@ -818,7 +815,7 @@ namespace isc { namespace eval {
                     TokenPtr neg(new TokenNot());
                     ctx.expression.push_back(neg);
                 }
-#line 822 "parser.cc"
+#line 819 "parser.cc"
     break;
 
   case 7:
@@ -827,7 +824,7 @@ namespace isc { namespace eval {
                     TokenPtr neg(new TokenAnd());
                     ctx.expression.push_back(neg);
                 }
-#line 831 "parser.cc"
+#line 828 "parser.cc"
     break;
 
   case 8:
@@ -836,7 +833,7 @@ namespace isc { namespace eval {
                     TokenPtr neg(new TokenOr());
                     ctx.expression.push_back(neg);
                 }
-#line 840 "parser.cc"
+#line 837 "parser.cc"
     break;
 
   case 9:
@@ -845,7 +842,7 @@ namespace isc { namespace eval {
                     TokenPtr eq(new TokenEqual());
                     ctx.expression.push_back(eq);
                 }
-#line 849 "parser.cc"
+#line 846 "parser.cc"
     break;
 
   case 10:
@@ -854,7 +851,7 @@ namespace isc { namespace eval {
                     TokenPtr opt(new TokenOption(yystack_[3].value.as < uint16_t > (), TokenOption::EXISTS));
                     ctx.expression.push_back(opt);
                 }
-#line 858 "parser.cc"
+#line 855 "parser.cc"
     break;
 
   case 11:
@@ -863,7 +860,7 @@ namespace isc { namespace eval {
                     TokenPtr opt(new TokenSubOption(yystack_[8].value.as < uint16_t > (), yystack_[3].value.as < uint16_t > (), TokenOption::EXISTS));
                     ctx.expression.push_back(opt);
                 }
-#line 867 "parser.cc"
+#line 864 "parser.cc"
     break;
 
   case 12:
@@ -887,7 +884,7 @@ namespace isc { namespace eval {
                        error(yystack_[5].location, "relay4 can only be used in DHCPv4.");
                    }
                 }
-#line 891 "parser.cc"
+#line 888 "parser.cc"
     break;
 
   case 13:
@@ -905,7 +902,7 @@ namespace isc { namespace eval {
                         error(yystack_[10].location, "relay6 can only be used in DHCPv6.");
                     }
                 }
-#line 909 "parser.cc"
+#line 906 "parser.cc"
     break;
 
   case 14:
@@ -918,7 +915,7 @@ namespace isc { namespace eval {
                   TokenPtr exist(new TokenVendorClass(ctx.getUniverse(), yystack_[3].value.as < uint32_t > (), TokenOption::EXISTS));
                   ctx.expression.push_back(exist);
               }
-#line 922 "parser.cc"
+#line 919 "parser.cc"
     break;
 
   case 15:
@@ -931,7 +928,7 @@ namespace isc { namespace eval {
                   TokenPtr exist(new TokenVendor(ctx.getUniverse(), yystack_[3].value.as < uint32_t > (), TokenOption::EXISTS));
                   ctx.expression.push_back(exist);
               }
-#line 935 "parser.cc"
+#line 932 "parser.cc"
     break;
 
   case 16:
@@ -945,7 +942,7 @@ namespace isc { namespace eval {
                   TokenPtr exist(new TokenVendor(ctx.getUniverse(), yystack_[8].value.as < uint32_t > (), TokenOption::EXISTS, yystack_[3].value.as < uint16_t > ()));
                   ctx.expression.push_back(exist);
                }
-#line 949 "parser.cc"
+#line 946 "parser.cc"
     break;
 
   case 17:
@@ -964,7 +961,7 @@ namespace isc { namespace eval {
                   TokenPtr member(new TokenMember(cc));
                   ctx.expression.push_back(member);
               }
-#line 968 "parser.cc"
+#line 965 "parser.cc"
     break;
 
   case 18:
@@ -973,7 +970,7 @@ namespace isc { namespace eval {
                       TokenPtr str(new TokenString(yystack_[0].value.as < std::string > ()));
                       ctx.expression.push_back(str);
                   }
-#line 977 "parser.cc"
+#line 974 "parser.cc"
     break;
 
   case 19:
@@ -982,7 +979,7 @@ namespace isc { namespace eval {
                       TokenPtr hex(new TokenHexString(yystack_[0].value.as < std::string > ()));
                       ctx.expression.push_back(hex);
                   }
-#line 986 "parser.cc"
+#line 983 "parser.cc"
     break;
 
   case 20:
@@ -991,7 +988,7 @@ namespace isc { namespace eval {
                       TokenPtr ip(new TokenIpAddress(yystack_[0].value.as < std::string > ()));
                       ctx.expression.push_back(ip);
                   }
-#line 995 "parser.cc"
+#line 992 "parser.cc"
     break;
 
   case 21:
@@ -1000,7 +997,7 @@ namespace isc { namespace eval {
                       TokenPtr opt(new TokenOption(yystack_[3].value.as < uint16_t > (), yystack_[0].value.as < TokenOption::RepresentationType > ()));
                       ctx.expression.push_back(opt);
                   }
-#line 1004 "parser.cc"
+#line 1001 "parser.cc"
     break;
 
   case 22:
@@ -1009,7 +1006,7 @@ namespace isc { namespace eval {
                       TokenPtr opt(new TokenSubOption(yystack_[8].value.as < uint16_t > (), yystack_[3].value.as < uint16_t > (), yystack_[0].value.as < TokenOption::RepresentationType > ()));
                       ctx.expression.push_back(opt);
                   }
-#line 1013 "parser.cc"
+#line 1010 "parser.cc"
     break;
 
   case 23:
@@ -1033,7 +1030,7 @@ namespace isc { namespace eval {
                          error(yystack_[5].location, "relay4 can only be used in DHCPv4.");
                      }
                   }
-#line 1037 "parser.cc"
+#line 1034 "parser.cc"
     break;
 
   case 24:
@@ -1051,7 +1048,7 @@ namespace isc { namespace eval {
                          error(yystack_[10].location, "relay6 can only be used in DHCPv6.");
                      }
                   }
-#line 1055 "parser.cc"
+#line 1052 "parser.cc"
     break;
 
   case 25:
@@ -1060,7 +1057,7 @@ namespace isc { namespace eval {
                       TokenPtr pkt_metadata(new TokenPkt(yystack_[0].value.as < TokenPkt::MetadataType > ()));
                       ctx.expression.push_back(pkt_metadata);
                   }
-#line 1064 "parser.cc"
+#line 1061 "parser.cc"
     break;
 
   case 26:
@@ -1078,7 +1075,7 @@ namespace isc { namespace eval {
                          error(yystack_[2].location, "pkt4 can only be used in DHCPv4.");
                      }
                   }
-#line 1082 "parser.cc"
+#line 1079 "parser.cc"
     break;
 
   case 27:
@@ -1096,7 +1093,7 @@ namespace isc { namespace eval {
                          error(yystack_[2].location, "pkt6 can only be used in DHCPv6.");
                      }
                   }
-#line 1100 "parser.cc"
+#line 1097 "parser.cc"
     break;
 
   case 28:
@@ -1114,7 +1111,7 @@ namespace isc { namespace eval {
                          error(yystack_[5].location, "relay6 can only be used in DHCPv6.");
                      }
                   }
-#line 1118 "parser.cc"
+#line 1115 "parser.cc"
     break;
 
   case 29:
@@ -1123,7 +1120,7 @@ namespace isc { namespace eval {
                       TokenPtr sub(new TokenSubstring());
                       ctx.expression.push_back(sub);
                   }
-#line 1127 "parser.cc"
+#line 1124 "parser.cc"
     break;
 
   case 30:
@@ -1132,7 +1129,7 @@ namespace isc { namespace eval {
                       TokenPtr conc(new TokenConcat());
                       ctx.expression.push_back(conc);
                   }
-#line 1136 "parser.cc"
+#line 1133 "parser.cc"
     break;
 
   case 31:
@@ -1141,7 +1138,7 @@ namespace isc { namespace eval {
                       TokenPtr cond(new TokenIfElse());
                       ctx.expression.push_back(cond);
                   }
-#line 1145 "parser.cc"
+#line 1142 "parser.cc"
     break;
 
   case 32:
@@ -1150,7 +1147,7 @@ namespace isc { namespace eval {
                       TokenPtr tohex(new TokenToHexString());
                       ctx.expression.push_back(tohex);
                   }
-#line 1154 "parser.cc"
+#line 1151 "parser.cc"
     break;
 
   case 33:
@@ -1163,7 +1160,7 @@ namespace isc { namespace eval {
                     TokenPtr vendor(new TokenVendor(ctx.getUniverse(), 0, TokenVendor::ENTERPRISE_ID));
                     ctx.expression.push_back(vendor);
                 }
-#line 1167 "parser.cc"
+#line 1164 "parser.cc"
     break;
 
   case 34:
@@ -1177,7 +1174,7 @@ namespace isc { namespace eval {
                                                          TokenVendor::ENTERPRISE_ID));
                     ctx.expression.push_back(vendor);
                 }
-#line 1181 "parser.cc"
+#line 1178 "parser.cc"
     break;
 
   case 35:
@@ -1190,7 +1187,7 @@ namespace isc { namespace eval {
                     TokenPtr opt(new TokenVendor(ctx.getUniverse(), yystack_[8].value.as < uint32_t > (), yystack_[0].value.as < TokenOption::RepresentationType > (), yystack_[3].value.as < uint16_t > ()));
                     ctx.expression.push_back(opt);
                 }
-#line 1194 "parser.cc"
+#line 1191 "parser.cc"
     break;
 
   case 36:
@@ -1207,7 +1204,7 @@ namespace isc { namespace eval {
                                                                TokenVendor::DATA, 0));
                     ctx.expression.push_back(vendor_class);
                 }
-#line 1211 "parser.cc"
+#line 1208 "parser.cc"
     break;
 
   case 37:
@@ -1224,7 +1221,7 @@ namespace isc { namespace eval {
                                                                TokenVendor::DATA, index));
                     ctx.expression.push_back(vendor_class);
                 }
-#line 1228 "parser.cc"
+#line 1225 "parser.cc"
     break;
 
   case 38:
@@ -1233,7 +1230,7 @@ namespace isc { namespace eval {
                     TokenPtr integer(new TokenInteger(yystack_[0].value.as < uint32_t > ()));
                     ctx.expression.push_back(integer);
                 }
-#line 1237 "parser.cc"
+#line 1234 "parser.cc"
     break;
 
   case 39:
@@ -1241,7 +1238,7 @@ namespace isc { namespace eval {
     {
                      yylhs.value.as < uint32_t > () = ctx.convertUint32(yystack_[0].value.as < std::string > (), yystack_[0].location);
                  }
-#line 1245 "parser.cc"
+#line 1242 "parser.cc"
     break;
 
   case 40:
@@ -1249,7 +1246,7 @@ namespace isc { namespace eval {
     {
                      yylhs.value.as < uint16_t > () = ctx.convertOptionCode(yystack_[0].value.as < std::string > (), yystack_[0].location);
                  }
-#line 1253 "parser.cc"
+#line 1250 "parser.cc"
     break;
 
   case 41:
@@ -1257,7 +1254,7 @@ namespace isc { namespace eval {
     {
                      yylhs.value.as < uint16_t > () = ctx.convertOptionName(yystack_[0].value.as < std::string > (), yystack_[0].location);
                  }
-#line 1261 "parser.cc"
+#line 1258 "parser.cc"
     break;
 
   case 42:
@@ -1265,7 +1262,7 @@ namespace isc { namespace eval {
     {
                      yylhs.value.as < uint16_t > () = ctx.convertOptionCode(yystack_[0].value.as < std::string > (), yystack_[0].location);
                  }
-#line 1269 "parser.cc"
+#line 1266 "parser.cc"
     break;
 
   case 43:
@@ -1273,7 +1270,7 @@ namespace isc { namespace eval {
     {
                           yylhs.value.as < TokenOption::RepresentationType > () = TokenOption::TEXTUAL;
                       }
-#line 1277 "parser.cc"
+#line 1274 "parser.cc"
     break;
 
   case 44:
@@ -1281,7 +1278,7 @@ namespace isc { namespace eval {
     {
                           yylhs.value.as < TokenOption::RepresentationType > () = TokenOption::HEXADECIMAL;
                       }
-#line 1285 "parser.cc"
+#line 1282 "parser.cc"
     break;
 
   case 45:
@@ -1289,7 +1286,7 @@ namespace isc { namespace eval {
     {
                      yylhs.value.as < int8_t > () = ctx.convertNestLevelNumber(yystack_[0].value.as < std::string > (), yystack_[0].location);
                  }
-#line 1293 "parser.cc"
+#line 1290 "parser.cc"
     break;
 
   case 46:
@@ -1297,7 +1294,7 @@ namespace isc { namespace eval {
     {
                       yylhs.value.as < TokenPkt::MetadataType > () = TokenPkt::IFACE;
                   }
-#line 1301 "parser.cc"
+#line 1298 "parser.cc"
     break;
 
   case 47:
@@ -1305,7 +1302,7 @@ namespace isc { namespace eval {
     {
                       yylhs.value.as < TokenPkt::MetadataType > () = TokenPkt::SRC;
                   }
-#line 1309 "parser.cc"
+#line 1306 "parser.cc"
     break;
 
   case 48:
@@ -1313,7 +1310,7 @@ namespace isc { namespace eval {
     {
                       yylhs.value.as < TokenPkt::MetadataType > () = TokenPkt::DST;
                   }
-#line 1317 "parser.cc"
+#line 1314 "parser.cc"
     break;
 
   case 49:
@@ -1321,7 +1318,7 @@ namespace isc { namespace eval {
     {
                       yylhs.value.as < TokenPkt::MetadataType > () = TokenPkt::LEN;
                   }
-#line 1325 "parser.cc"
+#line 1322 "parser.cc"
     break;
 
   case 50:
@@ -1329,7 +1326,7 @@ namespace isc { namespace eval {
     {
                        yylhs.value.as < uint32_t > () = ctx.convertUint32(yystack_[0].value.as < std::string > (), yystack_[0].location);
                    }
-#line 1333 "parser.cc"
+#line 1330 "parser.cc"
     break;
 
   case 51:
@@ -1337,7 +1334,7 @@ namespace isc { namespace eval {
     {
                        yylhs.value.as < uint32_t > () = 0;
                    }
-#line 1341 "parser.cc"
+#line 1338 "parser.cc"
     break;
 
   case 52:
@@ -1345,7 +1342,7 @@ namespace isc { namespace eval {
     {
                     yylhs.value.as < TokenPkt4::FieldType > () = TokenPkt4::CHADDR;
                 }
-#line 1349 "parser.cc"
+#line 1346 "parser.cc"
     break;
 
   case 53:
@@ -1353,7 +1350,7 @@ namespace isc { namespace eval {
     {
                     yylhs.value.as < TokenPkt4::FieldType > () = TokenPkt4::HLEN;
                 }
-#line 1357 "parser.cc"
+#line 1354 "parser.cc"
     break;
 
   case 54:
@@ -1361,7 +1358,7 @@ namespace isc { namespace eval {
     {
                     yylhs.value.as < TokenPkt4::FieldType > () = TokenPkt4::HTYPE;
                 }
-#line 1365 "parser.cc"
+#line 1362 "parser.cc"
     break;
 
   case 55:
@@ -1369,7 +1366,7 @@ namespace isc { namespace eval {
     {
                     yylhs.value.as < TokenPkt4::FieldType > () = TokenPkt4::CIADDR;
                 }
-#line 1373 "parser.cc"
+#line 1370 "parser.cc"
     break;
 
   case 56:
@@ -1377,7 +1374,7 @@ namespace isc { namespace eval {
     {
                     yylhs.value.as < TokenPkt4::FieldType > () = TokenPkt4::GIADDR;
                 }
-#line 1381 "parser.cc"
+#line 1378 "parser.cc"
     break;
 
   case 57:
@@ -1385,7 +1382,7 @@ namespace isc { namespace eval {
     {
                     yylhs.value.as < TokenPkt4::FieldType > () = TokenPkt4::YIADDR;
                 }
-#line 1389 "parser.cc"
+#line 1386 "parser.cc"
     break;
 
   case 58:
@@ -1393,7 +1390,7 @@ namespace isc { namespace eval {
     {
                     yylhs.value.as < TokenPkt4::FieldType > () = TokenPkt4::SIADDR;
                 }
-#line 1397 "parser.cc"
+#line 1394 "parser.cc"
     break;
 
   case 59:
@@ -1401,7 +1398,7 @@ namespace isc { namespace eval {
     {
                     yylhs.value.as < TokenPkt4::FieldType > () = TokenPkt4::MSGTYPE;
                  }
-#line 1405 "parser.cc"
+#line 1402 "parser.cc"
     break;
 
   case 60:
@@ -1409,7 +1406,7 @@ namespace isc { namespace eval {
     {
                     yylhs.value.as < TokenPkt4::FieldType > () = TokenPkt4::TRANSID;
                  }
-#line 1413 "parser.cc"
+#line 1410 "parser.cc"
     break;
 
   case 61:
@@ -1417,7 +1414,7 @@ namespace isc { namespace eval {
     {
                      yylhs.value.as < TokenPkt6::FieldType > () = TokenPkt6::MSGTYPE;
                  }
-#line 1421 "parser.cc"
+#line 1418 "parser.cc"
     break;
 
   case 62:
@@ -1425,7 +1422,7 @@ namespace isc { namespace eval {
     {
                      yylhs.value.as < TokenPkt6::FieldType > () = TokenPkt6::TRANSID;
                  }
-#line 1429 "parser.cc"
+#line 1426 "parser.cc"
     break;
 
   case 63:
@@ -1433,7 +1430,7 @@ namespace isc { namespace eval {
     {
                        yylhs.value.as < TokenRelay6Field::FieldType > () = TokenRelay6Field::PEERADDR;
                    }
-#line 1437 "parser.cc"
+#line 1434 "parser.cc"
     break;
 
   case 64:
@@ -1441,7 +1438,7 @@ namespace isc { namespace eval {
     {
                        yylhs.value.as < TokenRelay6Field::FieldType > () = TokenRelay6Field::LINKADDR;
                    }
-#line 1445 "parser.cc"
+#line 1442 "parser.cc"
     break;
 
   case 65:
@@ -1450,7 +1447,7 @@ namespace isc { namespace eval {
                     TokenPtr str(new TokenString(yystack_[0].value.as < std::string > ()));
                     ctx.expression.push_back(str);
                 }
-#line 1454 "parser.cc"
+#line 1451 "parser.cc"
     break;
 
   case 66:
@@ -1459,7 +1456,7 @@ namespace isc { namespace eval {
                      TokenPtr str(new TokenString(yystack_[0].value.as < std::string > ()));
                      ctx.expression.push_back(str);
                  }
-#line 1463 "parser.cc"
+#line 1460 "parser.cc"
     break;
 
   case 67:
@@ -1468,11 +1465,11 @@ namespace isc { namespace eval {
                      TokenPtr str(new TokenString("all"));
                      ctx.expression.push_back(str);
                  }
-#line 1472 "parser.cc"
+#line 1469 "parser.cc"
     break;
 
 
-#line 1476 "parser.cc"
+#line 1473 "parser.cc"
 
             default:
               break;
@@ -1983,7 +1980,7 @@ namespace isc { namespace eval {
 
 #line 14 "parser.yy"
 } } // isc::eval
-#line 1987 "parser.cc"
+#line 1984 "parser.cc"
 
 #line 576 "parser.yy"
 
diff --git a/src/lib/eval/parser.h b/src/lib/eval/parser.h
index c7c0e7e3db..4159032358 100644
--- a/src/lib/eval/parser.h
+++ b/src/lib/eval/parser.h
@@ -1,4 +1,4 @@
-// A Bison parser, made by GNU Bison 3.4.1.
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Skeleton interface for Bison LALR(1) parsers in C++
 
diff --git a/src/lib/eval/position.hh b/src/lib/eval/position.hh
index 5bdc0c9dfa..b26928e17b 100644
--- a/src/lib/eval/position.hh
+++ b/src/lib/eval/position.hh
@@ -1,5 +1,5 @@
-// Generated 201908191239
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined in "location.hh".
diff --git a/src/lib/eval/stack.hh b/src/lib/eval/stack.hh
index 6da8bd8837..44a4b60f6b 100644
--- a/src/lib/eval/stack.hh
+++ b/src/lib/eval/stack.hh
@@ -1,5 +1,5 @@
-// Generated 201908191239
-// A Bison parser, made by GNU Bison 3.4.1.
+// Generated 201910281131
+// A Bison parser, made by GNU Bison 3.4.2.
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined with the parser itself.