[5184] Generate lexer and parser files

This change is a separate commit to reduce noise.

diff --git a/src/bin/agent/agent_parser.cc b/src/bin/agent/agent_parser.cc
index 4ce4ea98cf15cbf6e7570d8b0cad1943617084e6..b4a56a5ba7188ac156409f1287310163d50e7ea4 100644 (file)
--- a/src/bin/agent/agent_parser.cc
+++ b/src/bin/agent/agent_parser.cc
@@ -1,8 +1,8 @@
-// A Bison parser, made by GNU Bison 3.0.4.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Skeleton implementation for Bison LALR(1) parsers in C++
 
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018 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
@@ -35,7 +35,7 @@
 
 // First part of user declarations.
 
-#line 39 "agent_parser.cc" // lalr1.cc:404
+#line 39 "agent_parser.cc" // lalr1.cc:407
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -49,13 +49,13 @@
 
 // User implementation prologue.
 
-#line 53 "agent_parser.cc" // lalr1.cc:412
+#line 53 "agent_parser.cc" // lalr1.cc:415
 // Unqualified %code blocks.
-#line 33 "agent_parser.yy" // lalr1.cc:413
+#line 33 "agent_parser.yy" // lalr1.cc:416
 
 #include <agent/parser_context.h>
 
-#line 59 "agent_parser.cc" // lalr1.cc:413
+#line 59 "agent_parser.cc" // lalr1.cc:416
 
 
 #ifndef YY_
@@ -70,6 +70,15 @@
 # endif
 #endif
 
+// Whether we are compiled with exception support.
+#ifndef YY_EXCEPTIONS
+# if defined __GNUC__ && !defined __EXCEPTIONS
+#  define YY_EXCEPTIONS 0
+# else
+#  define YY_EXCEPTIONS 1
+# endif
+#endif
+
 #define YYRHSLOC(Rhs, K) ((Rhs)[K].location)
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
@@ -106,7 +115,7 @@
     {                                           \
       *yycdebug_ << Title << ' ';               \
       yy_print_ (*yycdebug_, Symbol);           \
-      *yycdebug_ << std::endl;                  \
+      *yycdebug_ << '\n';                       \
     }                                           \
   } while (false)
 
@@ -125,9 +134,9 @@
 #else // !AGENT_DEBUG
 
 # define YYCDEBUG if (false) std::cerr
-# define YY_SYMBOL_PRINT(Title, Symbol)  YYUSE(Symbol)
-# define YY_REDUCE_PRINT(Rule)           static_cast<void>(0)
-# define YY_STACK_PRINT()                static_cast<void>(0)
+# define YY_SYMBOL_PRINT(Title, Symbol)  YYUSE (Symbol)
+# define YY_REDUCE_PRINT(Rule)           static_cast<void> (0)
+# define YY_STACK_PRINT()                static_cast<void> (0)
 
 #endif // !AGENT_DEBUG
 
@@ -139,9 +148,9 @@
 #define YYERROR         goto yyerrorlab
 #define YYRECOVERING()  (!!yyerrstatus_)
 
-#line 14 "agent_parser.yy" // lalr1.cc:479
+#line 14 "agent_parser.yy" // lalr1.cc:491
 namespace isc { namespace agent {
-#line 145 "agent_parser.cc" // lalr1.cc:479
+#line 154 "agent_parser.cc" // lalr1.cc:491
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -202,24 +211,20 @@ namespace isc { namespace agent {
 
 
   // by_state.
-  inline
   AgentParser::by_state::by_state ()
     : state (empty_state)
   {}
 
-  inline
   AgentParser::by_state::by_state (const by_state& other)
     : state (other.state)
   {}
 
-  inline
   void
   AgentParser::by_state::clear ()
   {
     state = empty_state;
   }
 
-  inline
   void
   AgentParser::by_state::move (by_state& that)
   {
@@ -227,12 +232,10 @@ namespace isc { namespace agent {
     that.clear ();
   }
 
-  inline
   AgentParser::by_state::by_state (state_type s)
     : state (s)
   {}
 
-  inline
   AgentParser::symbol_number_type
   AgentParser::by_state::type_get () const
   {
@@ -242,16 +245,46 @@ namespace isc { namespace agent {
       return yystos_[state];
   }
 
-  inline
   AgentParser::stack_symbol_type::stack_symbol_type ()
   {}
 
+  AgentParser::stack_symbol_type::stack_symbol_type (const stack_symbol_type& that)
+    : super_type (that.state, that.location)
+  {
+    switch (that.type_get ())
+    {
+      case 53: // value
+      case 56: // map_value
+      case 107: // socket_type_value
+        value.copy< ElementPtr > (that.value);
+        break;
+
+      case 44: // "boolean"
+        value.copy< bool > (that.value);
+        break;
+
+      case 43: // "floating point"
+        value.copy< double > (that.value);
+        break;
+
+      case 42: // "integer"
+        value.copy< int64_t > (that.value);
+        break;
+
+      case 41: // "constant string"
+        value.copy< std::string > (that.value);
+        break;
+
+      default:
+        break;
+    }
+
+  }
 
-  inline
   AgentParser::stack_symbol_type::stack_symbol_type (state_type s, symbol_type& that)
     : super_type (s, that.location)
   {
-      switch (that.type_get ())
+    switch (that.type_get ())
     {
       case 53: // value
       case 56: // map_value
@@ -283,12 +316,11 @@ namespace isc { namespace agent {
     that.type = empty_symbol;
   }
 
-  inline
   AgentParser::stack_symbol_type&
   AgentParser::stack_symbol_type::operator= (const stack_symbol_type& that)
   {
     state = that.state;
-      switch (that.type_get ())
+    switch (that.type_get ())
     {
       case 53: // value
       case 56: // map_value
@@ -322,7 +354,6 @@ namespace isc { namespace agent {
 
 
   template <typename Base>
-  inline
   void
   AgentParser::yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const
   {
@@ -350,51 +381,51 @@ namespace isc { namespace agent {
     {
             case 41: // "constant string"
 
-#line 103 "agent_parser.yy" // lalr1.cc:636
+#line 103 "agent_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< std::string > (); }
-#line 356 "agent_parser.cc" // lalr1.cc:636
+#line 387 "agent_parser.cc" // lalr1.cc:644
         break;
 
       case 42: // "integer"
 
-#line 103 "agent_parser.yy" // lalr1.cc:636
+#line 103 "agent_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< int64_t > (); }
-#line 363 "agent_parser.cc" // lalr1.cc:636
+#line 394 "agent_parser.cc" // lalr1.cc:644
         break;
 
       case 43: // "floating point"
 
-#line 103 "agent_parser.yy" // lalr1.cc:636
+#line 103 "agent_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< double > (); }
-#line 370 "agent_parser.cc" // lalr1.cc:636
+#line 401 "agent_parser.cc" // lalr1.cc:644
         break;
 
       case 44: // "boolean"
 
-#line 103 "agent_parser.yy" // lalr1.cc:636
+#line 103 "agent_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< bool > (); }
-#line 377 "agent_parser.cc" // lalr1.cc:636
+#line 408 "agent_parser.cc" // lalr1.cc:644
         break;
 
       case 53: // value
 
-#line 103 "agent_parser.yy" // lalr1.cc:636
+#line 103 "agent_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 384 "agent_parser.cc" // lalr1.cc:636
+#line 415 "agent_parser.cc" // lalr1.cc:644
         break;
 
       case 56: // map_value
 
-#line 103 "agent_parser.yy" // lalr1.cc:636
+#line 103 "agent_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 391 "agent_parser.cc" // lalr1.cc:636
+#line 422 "agent_parser.cc" // lalr1.cc:644
         break;
 
       case 107: // socket_type_value
 
-#line 103 "agent_parser.yy" // lalr1.cc:636
+#line 103 "agent_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 398 "agent_parser.cc" // lalr1.cc:636
+#line 429 "agent_parser.cc" // lalr1.cc:644
         break;
 
 
@@ -405,7 +436,6 @@ namespace isc { namespace agent {
   }
 #endif
 
-  inline
   void
   AgentParser::yypush_ (const char* m, state_type s, symbol_type& sym)
   {
@@ -413,7 +443,6 @@ namespace isc { namespace agent {
     yypush_ (m, t);
   }
 
-  inline
   void
   AgentParser::yypush_ (const char* m, stack_symbol_type& s)
   {
@@ -422,9 +451,8 @@ namespace isc { namespace agent {
     yystack_.push (s);
   }
 
-  inline
   void
-  AgentParser::yypop_ (unsigned int n)
+  AgentParser::yypop_ (unsigned n)
   {
     yystack_.pop (n);
   }
@@ -456,7 +484,7 @@ namespace isc { namespace agent {
   }
 #endif // AGENT_DEBUG
 
-  inline AgentParser::state_type
+  AgentParser::state_type
   AgentParser::yy_lr_goto_state_ (state_type yystate, int yysym)
   {
     int yyr = yypgoto_[yysym - yyntokens_] + yystate;
@@ -466,13 +494,13 @@ namespace isc { namespace agent {
       return yydefgoto_[yysym - yyntokens_];
   }
 
-  inline bool
+  bool
   AgentParser::yy_pact_value_is_default_ (int yyvalue)
   {
     return yyvalue == yypact_ninf_;
   }
 
-  inline bool
+  bool
   AgentParser::yy_table_value_is_error_ (int yyvalue)
   {
     return yyvalue == yytable_ninf_;
@@ -499,11 +527,11 @@ namespace isc { namespace agent {
     /// The return value of parse ().
     int yyresult;
 
-    // FIXME: This shoud be completely indented.  It is not yet to
-    // avoid gratuitous conflicts when merging into the master branch.
+#if YY_EXCEPTIONS
     try
+#endif // YY_EXCEPTIONS
       {
-    YYCDEBUG << "Starting parse" << std::endl;
+    YYCDEBUG << "Starting parse\n";
 
 
     /* Initialize the stack.  The initial state will be set in
@@ -515,7 +543,7 @@ namespace isc { namespace agent {
 
     // A new symbol was pushed on the stack.
   yynewstate:
-    YYCDEBUG << "Entering state " << yystack_[0].state << std::endl;
+    YYCDEBUG << "Entering state " << yystack_[0].state << '\n';
 
     // Accept?
     if (yystack_[0].state == yyfinal_)
@@ -525,7 +553,6 @@ namespace isc { namespace agent {
 
     // Backup.
   yybackup:
-
     // Try to take a decision without lookahead.
     yyn = yypact_[yystack_[0].state];
     if (yy_pact_value_is_default_ (yyn))
@@ -535,16 +562,20 @@ namespace isc { namespace agent {
     if (yyla.empty ())
       {
         YYCDEBUG << "Reading a token: ";
+#if YY_EXCEPTIONS
         try
+#endif // YY_EXCEPTIONS
           {
             symbol_type yylookahead (yylex (ctx));
             yyla.move (yylookahead);
           }
+#if YY_EXCEPTIONS
         catch (const syntax_error& yyexc)
           {
             error (yyexc);
             goto yyerrlab1;
           }
+#endif // YY_EXCEPTIONS
       }
     YY_SYMBOL_PRINT ("Next token is", yyla);
 
@@ -588,11 +619,11 @@ namespace isc { namespace agent {
     yylen = yyr2_[yyn];
     {
       stack_symbol_type yylhs;
-      yylhs.state = yy_lr_goto_state_(yystack_[yylen].state, yyr1_[yyn]);
+      yylhs.state = yy_lr_goto_state_ (yystack_[yylen].state, yyr1_[yyn]);
       /* Variants are always initialized to an empty instance of the
          correct type. The default '$$ = $1' action is NOT applied
          when using variants.  */
-        switch (yyr1_[yyn])
+      switch (yyr1_[yyn])
     {
       case 53: // value
       case 56: // map_value
@@ -621,219 +652,222 @@ namespace isc { namespace agent {
     }
 
 
-      // Compute the default @$.
+      // Default location.
       {
         slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
         YYLLOC_DEFAULT (yylhs.location, slice, yylen);
+        yyerror_range[1].location = yylhs.location;
       }
 
       // Perform the reduction.
       YY_REDUCE_PRINT (yyn);
+#if YY_EXCEPTIONS
       try
+#endif // YY_EXCEPTIONS
         {
           switch (yyn)
             {
   case 2:
-#line 114 "agent_parser.yy" // lalr1.cc:859
+#line 114 "agent_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.NO_KEYWORDS; }
-#line 640 "agent_parser.cc" // lalr1.cc:859
+#line 674 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 4:
-#line 115 "agent_parser.yy" // lalr1.cc:859
+#line 115 "agent_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.CONFIG; }
-#line 646 "agent_parser.cc" // lalr1.cc:859
+#line 680 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 6:
-#line 116 "agent_parser.yy" // lalr1.cc:859
+#line 116 "agent_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.AGENT; }
-#line 652 "agent_parser.cc" // lalr1.cc:859
+#line 686 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 8:
-#line 124 "agent_parser.yy" // lalr1.cc:859
+#line 124 "agent_parser.yy" // lalr1.cc:870
     {
     // Parse the Control-agent map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 662 "agent_parser.cc" // lalr1.cc:859
+#line 696 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 9:
-#line 128 "agent_parser.yy" // lalr1.cc:859
+#line 128 "agent_parser.yy" // lalr1.cc:870
     {
     // parsing completed
 }
-#line 670 "agent_parser.cc" // lalr1.cc:859
+#line 704 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 10:
-#line 135 "agent_parser.yy" // lalr1.cc:859
+#line 135 "agent_parser.yy" // lalr1.cc:870
     {
     // Push back the JSON value on the stack
     ctx.stack_.push_back(yystack_[0].value.as< ElementPtr > ());
 }
-#line 679 "agent_parser.cc" // lalr1.cc:859
+#line 713 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 11:
-#line 141 "agent_parser.yy" // lalr1.cc:859
+#line 141 "agent_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); }
-#line 685 "agent_parser.cc" // lalr1.cc:859
+#line 719 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 12:
-#line 142 "agent_parser.yy" // lalr1.cc:859
+#line 142 "agent_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); }
-#line 691 "agent_parser.cc" // lalr1.cc:859
+#line 725 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 13:
-#line 143 "agent_parser.yy" // lalr1.cc:859
+#line 143 "agent_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); }
-#line 697 "agent_parser.cc" // lalr1.cc:859
+#line 731 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 14:
-#line 144 "agent_parser.yy" // lalr1.cc:859
+#line 144 "agent_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); }
-#line 703 "agent_parser.cc" // lalr1.cc:859
+#line 737 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 15:
-#line 145 "agent_parser.yy" // lalr1.cc:859
+#line 145 "agent_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); }
-#line 709 "agent_parser.cc" // lalr1.cc:859
+#line 743 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 16:
-#line 146 "agent_parser.yy" // lalr1.cc:859
+#line 146 "agent_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 715 "agent_parser.cc" // lalr1.cc:859
+#line 749 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 17:
-#line 147 "agent_parser.yy" // lalr1.cc:859
+#line 147 "agent_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 721 "agent_parser.cc" // lalr1.cc:859
+#line 755 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 18:
-#line 151 "agent_parser.yy" // lalr1.cc:859
+#line 151 "agent_parser.yy" // lalr1.cc:870
     {
     // 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 732 "agent_parser.cc" // lalr1.cc:859
+#line 766 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 19:
-#line 156 "agent_parser.yy" // lalr1.cc:859
+#line 156 "agent_parser.yy" // lalr1.cc:870
     {
     // 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 742 "agent_parser.cc" // lalr1.cc:859
+#line 776 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 20:
-#line 162 "agent_parser.yy" // lalr1.cc:859
+#line 162 "agent_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 748 "agent_parser.cc" // lalr1.cc:859
+#line 782 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 23:
-#line 176 "agent_parser.yy" // lalr1.cc:859
+#line 176 "agent_parser.yy" // lalr1.cc:870
     {
                   // map containing a single entry
                   ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ());
                   }
-#line 757 "agent_parser.cc" // lalr1.cc:859
+#line 791 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 24:
-#line 180 "agent_parser.yy" // lalr1.cc:859
+#line 180 "agent_parser.yy" // lalr1.cc:870
     {
                   // 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 > ());
                   }
-#line 767 "agent_parser.cc" // lalr1.cc:859
+#line 801 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 25:
-#line 187 "agent_parser.yy" // lalr1.cc:859
+#line 187 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
 }
-#line 776 "agent_parser.cc" // lalr1.cc:859
+#line 810 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 26:
-#line 190 "agent_parser.yy" // lalr1.cc:859
+#line 190 "agent_parser.yy" // lalr1.cc:870
     {
 }
-#line 783 "agent_parser.cc" // lalr1.cc:859
+#line 817 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 29:
-#line 197 "agent_parser.yy" // lalr1.cc:859
+#line 197 "agent_parser.yy" // lalr1.cc:870
     {
                   // List consisting of a single element.
                   ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ());
                   }
-#line 792 "agent_parser.cc" // lalr1.cc:859
+#line 826 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 30:
-#line 201 "agent_parser.yy" // lalr1.cc:859
+#line 201 "agent_parser.yy" // lalr1.cc:870
     {
                   // List ending with , and a value.
                   ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ());
                   }
-#line 801 "agent_parser.cc" // lalr1.cc:859
+#line 835 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 31:
-#line 214 "agent_parser.yy" // lalr1.cc:859
+#line 214 "agent_parser.yy" // lalr1.cc:870
     {
     const std::string& where = ctx.contextName();
     const std::string& keyword = yystack_[1].value.as< std::string > ();
     error(yystack_[1].location,
           "got unexpected keyword \"" + keyword + "\" in " + where + " map.");
 }
-#line 812 "agent_parser.cc" // lalr1.cc:859
+#line 846 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 32:
-#line 223 "agent_parser.yy" // lalr1.cc:859
+#line 223 "agent_parser.yy" // lalr1.cc:870
     {
     // 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 823 "agent_parser.cc" // lalr1.cc:859
+#line 857 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 33:
-#line 228 "agent_parser.yy" // lalr1.cc:859
+#line 228 "agent_parser.yy" // lalr1.cc:870
     {
     // 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 833 "agent_parser.cc" // lalr1.cc:859
+#line 867 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 42:
-#line 249 "agent_parser.yy" // lalr1.cc:859
+#line 249 "agent_parser.yy" // lalr1.cc:870
     {
 
     // Let's create a MapElement that will represent it, add it to the
@@ -845,57 +879,57 @@ namespace isc { namespace agent {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.AGENT);
 }
-#line 849 "agent_parser.cc" // lalr1.cc:859
+#line 883 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 43:
-#line 259 "agent_parser.yy" // lalr1.cc:859
+#line 259 "agent_parser.yy" // lalr1.cc:870
     {
     // Ok, we're done with parsing control-agent. Let's take the map
     // off the stack.
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 860 "agent_parser.cc" // lalr1.cc:859
+#line 894 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 53:
-#line 281 "agent_parser.yy" // lalr1.cc:859
+#line 281 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 868 "agent_parser.cc" // lalr1.cc:859
+#line 902 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 54:
-#line 283 "agent_parser.yy" // lalr1.cc:859
+#line 283 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("http-host", host);
     ctx.leave();
 }
-#line 878 "agent_parser.cc" // lalr1.cc:859
+#line 912 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 55:
-#line 289 "agent_parser.yy" // lalr1.cc:859
+#line 289 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("http-port", prf);
 }
-#line 887 "agent_parser.cc" // lalr1.cc:859
+#line 921 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 56:
-#line 294 "agent_parser.yy" // lalr1.cc:859
+#line 294 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 895 "agent_parser.cc" // lalr1.cc:859
+#line 929 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 57:
-#line 296 "agent_parser.yy" // lalr1.cc:859
+#line 296 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context = yystack_[0].value.as< ElementPtr > ();
@@ -918,19 +952,19 @@ namespace isc { namespace agent {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 922 "agent_parser.cc" // lalr1.cc:859
+#line 956 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 58:
-#line 319 "agent_parser.yy" // lalr1.cc:859
+#line 319 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 930 "agent_parser.cc" // lalr1.cc:859
+#line 964 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 59:
-#line 321 "agent_parser.yy" // lalr1.cc:859
+#line 321 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location)));
@@ -955,451 +989,453 @@ namespace isc { namespace agent {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 959 "agent_parser.cc" // lalr1.cc:859
+#line 993 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 60:
-#line 347 "agent_parser.yy" // lalr1.cc:859
+#line 347 "agent_parser.yy" // lalr1.cc:870
     {
     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 970 "agent_parser.cc" // lalr1.cc:859
+#line 1004 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 61:
-#line 352 "agent_parser.yy" // lalr1.cc:859
+#line 352 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 979 "agent_parser.cc" // lalr1.cc:859
+#line 1013 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 66:
-#line 365 "agent_parser.yy" // lalr1.cc:859
+#line 365 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 989 "agent_parser.cc" // lalr1.cc:859
+#line 1023 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 67:
-#line 369 "agent_parser.yy" // lalr1.cc:859
+#line 369 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
 }
-#line 997 "agent_parser.cc" // lalr1.cc:859
+#line 1031 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 73:
-#line 382 "agent_parser.yy" // lalr1.cc:859
+#line 382 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1005 "agent_parser.cc" // lalr1.cc:859
+#line 1039 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 74:
-#line 384 "agent_parser.yy" // lalr1.cc:859
+#line 384 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("library", lib);
     ctx.leave();
 }
-#line 1015 "agent_parser.cc" // lalr1.cc:859
+#line 1049 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 75:
-#line 390 "agent_parser.yy" // lalr1.cc:859
+#line 390 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1023 "agent_parser.cc" // lalr1.cc:859
+#line 1057 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 76:
-#line 392 "agent_parser.yy" // lalr1.cc:859
+#line 392 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 1032 "agent_parser.cc" // lalr1.cc:859
+#line 1066 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 77:
-#line 400 "agent_parser.yy" // lalr1.cc:859
+#line 400 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[2].location)));
     ctx.stack_.back()->set("control-sockets", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.CONTROL_SOCKETS);
 }
-#line 1043 "agent_parser.cc" // lalr1.cc:859
+#line 1077 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 78:
-#line 405 "agent_parser.yy" // lalr1.cc:859
+#line 405 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1052 "agent_parser.cc" // lalr1.cc:859
+#line 1086 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 85:
-#line 426 "agent_parser.yy" // lalr1.cc:859
+#line 426 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER);
 }
-#line 1063 "agent_parser.cc" // lalr1.cc:859
+#line 1097 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 86:
-#line 431 "agent_parser.yy" // lalr1.cc:859
+#line 431 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1072 "agent_parser.cc" // lalr1.cc:859
+#line 1106 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 87:
-#line 437 "agent_parser.yy" // lalr1.cc:859
+#line 437 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp6", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER);
 }
-#line 1083 "agent_parser.cc" // lalr1.cc:859
+#line 1117 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 88:
-#line 442 "agent_parser.yy" // lalr1.cc:859
+#line 442 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1092 "agent_parser.cc" // lalr1.cc:859
+#line 1126 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 89:
-#line 448 "agent_parser.yy" // lalr1.cc:859
+#line 448 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("d2", m);
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER);
 }
-#line 1103 "agent_parser.cc" // lalr1.cc:859
+#line 1137 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 90:
-#line 453 "agent_parser.yy" // lalr1.cc:859
+#line 453 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1112 "agent_parser.cc" // lalr1.cc:859
+#line 1146 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 98:
-#line 472 "agent_parser.yy" // lalr1.cc:859
+#line 472 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1120 "agent_parser.cc" // lalr1.cc:859
+#line 1154 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 99:
-#line 474 "agent_parser.yy" // lalr1.cc:859
+#line 474 "agent_parser.yy" // lalr1.cc:870
     {
     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 1130 "agent_parser.cc" // lalr1.cc:859
+#line 1164 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 100:
-#line 481 "agent_parser.yy" // lalr1.cc:859
+#line 481 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.SOCKET_TYPE);
 }
-#line 1138 "agent_parser.cc" // lalr1.cc:859
+#line 1172 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 101:
-#line 483 "agent_parser.yy" // lalr1.cc:859
+#line 483 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("socket-type", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 1147 "agent_parser.cc" // lalr1.cc:859
+#line 1181 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 102:
-#line 489 "agent_parser.yy" // lalr1.cc:859
+#line 489 "agent_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("unix", ctx.loc2pos(yystack_[0].location))); }
-#line 1153 "agent_parser.cc" // lalr1.cc:859
+#line 1187 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 103:
-#line 495 "agent_parser.yy" // lalr1.cc:859
+#line 495 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1161 "agent_parser.cc" // lalr1.cc:859
+#line 1195 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 104:
-#line 497 "agent_parser.yy" // lalr1.cc:859
+#line 497 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 1170 "agent_parser.cc" // lalr1.cc:859
+#line 1204 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 105:
-#line 502 "agent_parser.yy" // lalr1.cc:859
+#line 502 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1178 "agent_parser.cc" // lalr1.cc:859
+#line 1212 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 106:
-#line 504 "agent_parser.yy" // lalr1.cc:859
+#line 504 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 1187 "agent_parser.cc" // lalr1.cc:859
+#line 1221 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 107:
-#line 509 "agent_parser.yy" // lalr1.cc:859
+#line 509 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1195 "agent_parser.cc" // lalr1.cc:859
+#line 1229 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 108:
-#line 511 "agent_parser.yy" // lalr1.cc:859
+#line 511 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 1204 "agent_parser.cc" // lalr1.cc:859
+#line 1238 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 109:
-#line 521 "agent_parser.yy" // lalr1.cc:859
+#line 521 "agent_parser.yy" // lalr1.cc:870
     {
     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 1215 "agent_parser.cc" // lalr1.cc:859
+#line 1249 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 110:
-#line 526 "agent_parser.yy" // lalr1.cc:859
+#line 526 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1224 "agent_parser.cc" // lalr1.cc:859
+#line 1258 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 114:
-#line 543 "agent_parser.yy" // lalr1.cc:859
+#line 543 "agent_parser.yy" // lalr1.cc:870
     {
     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 1235 "agent_parser.cc" // lalr1.cc:859
+#line 1269 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 115:
-#line 548 "agent_parser.yy" // lalr1.cc:859
+#line 548 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1244 "agent_parser.cc" // lalr1.cc:859
+#line 1278 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 118:
-#line 560 "agent_parser.yy" // lalr1.cc:859
+#line 560 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
     ctx.stack_.push_back(l);
 }
-#line 1254 "agent_parser.cc" // lalr1.cc:859
+#line 1288 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 119:
-#line 564 "agent_parser.yy" // lalr1.cc:859
+#line 564 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
 }
-#line 1262 "agent_parser.cc" // lalr1.cc:859
+#line 1296 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 129:
-#line 581 "agent_parser.yy" // lalr1.cc:859
+#line 581 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1270 "agent_parser.cc" // lalr1.cc:859
+#line 1304 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 130:
-#line 583 "agent_parser.yy" // lalr1.cc:859
+#line 583 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
     ctx.leave();
 }
-#line 1280 "agent_parser.cc" // lalr1.cc:859
+#line 1314 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 131:
-#line 589 "agent_parser.yy" // lalr1.cc:859
+#line 589 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
 }
-#line 1289 "agent_parser.cc" // lalr1.cc:859
+#line 1323 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 132:
-#line 594 "agent_parser.yy" // lalr1.cc:859
+#line 594 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1297 "agent_parser.cc" // lalr1.cc:859
+#line 1331 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 133:
-#line 596 "agent_parser.yy" // lalr1.cc:859
+#line 596 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
     ctx.leave();
 }
-#line 1307 "agent_parser.cc" // lalr1.cc:859
+#line 1341 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 134:
-#line 602 "agent_parser.yy" // lalr1.cc:859
+#line 602 "agent_parser.yy" // lalr1.cc:870
     {
     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 1318 "agent_parser.cc" // lalr1.cc:859
+#line 1352 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 135:
-#line 607 "agent_parser.yy" // lalr1.cc:859
+#line 607 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1327 "agent_parser.cc" // lalr1.cc:859
+#line 1361 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 138:
-#line 616 "agent_parser.yy" // lalr1.cc:859
+#line 616 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1337 "agent_parser.cc" // lalr1.cc:859
+#line 1371 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 139:
-#line 620 "agent_parser.yy" // lalr1.cc:859
+#line 620 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
 }
-#line 1345 "agent_parser.cc" // lalr1.cc:859
+#line 1379 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 146:
-#line 634 "agent_parser.yy" // lalr1.cc:859
+#line 634 "agent_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORDS);
 }
-#line 1353 "agent_parser.cc" // lalr1.cc:859
+#line 1387 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 147:
-#line 636 "agent_parser.yy" // lalr1.cc:859
+#line 636 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
     ctx.leave();
 }
-#line 1363 "agent_parser.cc" // lalr1.cc:859
+#line 1397 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 148:
-#line 642 "agent_parser.yy" // lalr1.cc:859
+#line 642 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
 }
-#line 1372 "agent_parser.cc" // lalr1.cc:859
+#line 1406 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 149:
-#line 647 "agent_parser.yy" // lalr1.cc:859
+#line 647 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
 }
-#line 1381 "agent_parser.cc" // lalr1.cc:859
+#line 1415 "agent_parser.cc" // lalr1.cc:870
     break;
 
   case 150:
-#line 652 "agent_parser.yy" // lalr1.cc:859
+#line 652 "agent_parser.yy" // lalr1.cc:870
     {
     ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
 }
-#line 1390 "agent_parser.cc" // lalr1.cc:859
+#line 1424 "agent_parser.cc" // lalr1.cc:870
     break;
 
 
-#line 1394 "agent_parser.cc" // lalr1.cc:859
+#line 1428 "agent_parser.cc" // lalr1.cc:870
             default:
               break;
             }
         }
+#if YY_EXCEPTIONS
       catch (const syntax_error& yyexc)
         {
           error (yyexc);
           YYERROR;
         }
+#endif // YY_EXCEPTIONS
       YY_SYMBOL_PRINT ("-> $$ =", yylhs);
       yypop_ (yylen);
       yylen = 0;
@@ -1452,7 +1488,6 @@ namespace isc { namespace agent {
        code.  */
     if (false)
       goto yyerrorlab;
-    yyerror_range[1].location = yystack_[yylen - 1].location;
     /* Do not reclaim the symbols of the rule whose action triggered
        this YYERROR.  */
     yypop_ (yylen);
@@ -1524,12 +1559,12 @@ namespace isc { namespace agent {
 
     return yyresult;
   }
+#if YY_EXCEPTIONS
     catch (...)
       {
-        YYCDEBUG << "Exception caught: cleaning lookahead and stack"
-                 << std::endl;
+        YYCDEBUG << "Exception caught: cleaning lookahead and stack\n";
         // Do not try to display the values of the reclaimed symbols,
-        // as their printer might throw an exception.
+        // as their printers might throw an exception.
         if (!yyla.empty ())
           yy_destroy_ (YY_NULLPTR, yyla);
 
@@ -1540,12 +1575,13 @@ namespace isc { namespace agent {
           }
         throw;
       }
+#endif // YY_EXCEPTIONS
   }
 
   void
   AgentParser::error (const syntax_error& yyexc)
   {
-    error (yyexc.location, yyexc.what());
+    error (yyexc.location, yyexc.what ());
   }
 
   // Generate an error message.
@@ -1621,12 +1657,13 @@ namespace isc { namespace agent {
         case N:                               \
           yyformat = S;                       \
         break
-        YYCASE_(0, YY_("syntax error"));
-        YYCASE_(1, YY_("syntax error, unexpected %s"));
-        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+      default: // Avoid compiler warnings.
+        YYCASE_ (0, YY_("syntax error"));
+        YYCASE_ (1, YY_("syntax error, unexpected %s"));
+        YYCASE_ (2, YY_("syntax error, unexpected %s, expecting %s"));
+        YYCASE_ (3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+        YYCASE_ (4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+        YYCASE_ (5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
 #undef YYCASE_
       }
 
@@ -1649,7 +1686,7 @@ namespace isc { namespace agent {
 
   const signed char AgentParser::yytable_ninf_ = -1;
 
-  const short int
+  const short
   AgentParser::yypact_[] =
   {
       59,   -68,   -68,   -68,     6,     8,     9,    34,   -68,   -68,
@@ -1726,7 +1763,7 @@ namespace isc { namespace agent {
      -68,   -67,   -68,   -68,   -68,   -68,   -68
   };
 
-  const short int
+  const short
   AgentParser::yydefgoto_[] =
   {
       -1,     4,     5,     6,     7,    23,    27,    16,    17,    18,
@@ -1766,7 +1803,7 @@ namespace isc { namespace agent {
      199
   };
 
-  const short int
+  const short
   AgentParser::yycheck_[] =
   {
       26,    27,    27,    27,    24,    10,     0,    11,    12,    13,
@@ -1905,7 +1942,7 @@ namespace isc { namespace agent {
   };
 
 #if AGENT_DEBUG
-  const unsigned short int
+  const unsigned short
   AgentParser::yyrline_[] =
   {
        0,   114,   114,   114,   115,   115,   116,   116,   124,   124,
@@ -1936,18 +1973,18 @@ namespace isc { namespace agent {
            i_end = yystack_.end ();
          i != i_end; ++i)
       *yycdebug_ << ' ' << i->state;
-    *yycdebug_ << std::endl;
+    *yycdebug_ << '\n';
   }
 
   // Report on the debug stream that the rule \a yyrule is going to be reduced.
   void
   AgentParser::yy_reduce_print_ (int yyrule)
   {
-    unsigned int yylno = yyrline_[yyrule];
+    unsigned yylno = yyrline_[yyrule];
     int yynrhs = yyr2_[yyrule];
     // Print the symbols being reduced, and their result.
     *yycdebug_ << "Reducing stack by rule " << yyrule - 1
-               << " (line " << yylno << "):" << std::endl;
+               << " (line " << yylno << "):\n";
     // The symbols being reduced.
     for (int yyi = 0; yyi < yynrhs; yyi++)
       YY_SYMBOL_PRINT ("   $" << yyi + 1 << " =",
@@ -1956,10 +1993,10 @@ namespace isc { namespace agent {
 #endif // AGENT_DEBUG
 
 
-#line 14 "agent_parser.yy" // lalr1.cc:1167
+#line 14 "agent_parser.yy" // lalr1.cc:1181
 } } // isc::agent
-#line 1962 "agent_parser.cc" // lalr1.cc:1167
-#line 657 "agent_parser.yy" // lalr1.cc:1168
+#line 1999 "agent_parser.cc" // lalr1.cc:1181
+#line 657 "agent_parser.yy" // lalr1.cc:1182
 
 
 void

diff --git a/src/bin/agent/agent_parser.h b/src/bin/agent/agent_parser.h
index 921e5ea1a0e32cd6abd72a90036f2ef319ab72b2..2a193f1b4dceb0b9cd87032cd5b547a9a36331b1 100644 (file)
--- a/src/bin/agent/agent_parser.h
+++ b/src/bin/agent/agent_parser.h
@@ -1,8 +1,8 @@
-// A Bison parser, made by GNU Bison 3.0.4.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Skeleton interface for Bison LALR(1) parsers in C++
 
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018 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
@@ -40,7 +40,7 @@
 #ifndef YY_AGENT_AGENT_PARSER_H_INCLUDED
 # define YY_AGENT_AGENT_PARSER_H_INCLUDED
 // //                    "%code requires" blocks.
-#line 17 "agent_parser.yy" // lalr1.cc:377
+#line 17 "agent_parser.yy" // lalr1.cc:380
 
 #include <string>
 #include <cc/data.h>
@@ -51,7 +51,7 @@ using namespace isc::agent;
 using namespace isc::data;
 using namespace std;
 
-#line 55 "agent_parser.h" // lalr1.cc:377
+#line 55 "agent_parser.h" // lalr1.cc:380
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -102,7 +102,7 @@ using namespace std;
 # define YYUSE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
 # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
     _Pragma ("GCC diagnostic push") \
@@ -121,6 +121,13 @@ using namespace std;
 # define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
 /* Debug traces.  */
 #ifndef AGENT_DEBUG
 # if defined YYDEBUG
@@ -134,9 +141,9 @@ using namespace std;
 # endif /* ! defined YYDEBUG */
 #endif  /* ! defined AGENT_DEBUG */
 
-#line 14 "agent_parser.yy" // lalr1.cc:377
+#line 14 "agent_parser.yy" // lalr1.cc:380
 namespace isc { namespace agent {
-#line 140 "agent_parser.h" // lalr1.cc:377
+#line 147 "agent_parser.h" // lalr1.cc:380
 
 
 
@@ -153,7 +160,8 @@ namespace isc { namespace agent {
 
     /// Empty construction.
     variant ()
-      : yytypeid_ (YY_NULLPTR)
+      : yybuffer_ ()
+      , yytypeid_ (YY_NULLPTR)
     {}
 
     /// Construct and fill.
@@ -179,7 +187,7 @@ namespace isc { namespace agent {
       YYASSERT (!yytypeid_);
       YYASSERT (sizeof (T) <= S);
       yytypeid_ = & typeid (T);
-      return *new (yyas_<T> ()) T;
+      return *new (yyas_<T> ()) T ();
     }
 
     /// Instantiate a \a T in here from \a t.
@@ -198,6 +206,7 @@ namespace isc { namespace agent {
     T&
     as ()
     {
+      YYASSERT (yytypeid_);
       YYASSERT (*yytypeid_ == typeid (T));
       YYASSERT (sizeof (T) <= S);
       return *yyas_<T> ();
@@ -208,6 +217,7 @@ namespace isc { namespace agent {
     const T&
     as () const
     {
+      YYASSERT (yytypeid_);
       YYASSERT (*yytypeid_ == typeid (T));
       YYASSERT (sizeof (T) <= S);
       return *yyas_<T> ();
@@ -421,15 +431,15 @@ namespace isc { namespace agent {
 
   basic_symbol (typename Base::kind_type t, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const ElementPtr v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const ElementPtr& v, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const bool v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const bool& v, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const double v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const double& v, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const int64_t v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const int64_t& v, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const std::string& v, const location_type& l);
 
 
       /// Constructor for symbols with semantic value.
@@ -737,7 +747,7 @@ namespace isc { namespace agent {
     // Tables.
   // YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
   // STATE-NUM.
-  static const short int yypact_[];
+  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
@@ -748,14 +758,14 @@ namespace isc { namespace agent {
   static const signed char yypgoto_[];
 
   // YYDEFGOTO[NTERM-NUM].
-  static const short int yydefgoto_[];
+  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 char yytable_[];
 
-  static const short int yycheck_[];
+  static const short yycheck_[];
 
   // YYSTOS[STATE-NUM] -- The (internal number of the) accessing
   // symbol of state STATE-NUM.
@@ -776,7 +786,7 @@ namespace isc { namespace agent {
     static const char* const yytname_[];
 #if AGENT_DEBUG
   // YYRLINE[YYN] -- Source line where rule number YYN was defined.
-  static const unsigned short int yyrline_[];
+  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.
@@ -841,6 +851,8 @@ namespace isc { namespace agent {
       typedef basic_symbol<by_state> super_type;
       /// Construct an empty symbol.
       stack_symbol_type ();
+      /// Copy construct (for efficiency).
+      stack_symbol_type (const stack_symbol_type& that);
       /// Steal the contents from \a sym to build this.
       stack_symbol_type (state_type s, symbol_type& sym);
       /// Assignment, needed by push_back.
@@ -869,7 +881,7 @@ namespace isc { namespace agent {
     void yypush_ (const char* m, state_type s, symbol_type& sym);
 
     /// Pop \a n symbols the three stacks.
-    void yypop_ (unsigned int n = 1);
+    void yypop_ (unsigned n = 1);
 
     /// Constants.
     enum
@@ -928,12 +940,12 @@ namespace isc { namespace agent {
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44
     };
-    const unsigned int user_token_number_max_ = 299;
+    const unsigned user_token_number_max_ = 299;
     const token_number_type undef_token_ = 2;
 
-    if (static_cast<int>(t) <= yyeof_)
+    if (static_cast<int> (t) <= yyeof_)
       return yyeof_;
-    else if (static_cast<unsigned int> (t) <= user_token_number_max_)
+    else if (static_cast<unsigned> (t) <= user_token_number_max_)
       return translate_table[t];
     else
       return undef_token_;
@@ -947,19 +959,18 @@ namespace isc { namespace agent {
 
   // basic_symbol.
   template <typename Base>
-  inline
   AgentParser::basic_symbol<Base>::basic_symbol ()
     : value ()
+    , location ()
   {}
 
   template <typename Base>
-  inline
   AgentParser::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
     : Base (other)
     , value ()
     , location (other.location)
   {
-      switch (other.type_get ())
+    switch (other.type_get ())
     {
       case 53: // value
       case 56: // map_value
@@ -989,16 +1000,14 @@ namespace isc { namespace agent {
 
   }
 
-
   template <typename Base>
-  inline
   AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const semantic_type& v, const location_type& l)
     : Base (t)
     , value ()
     , location (l)
   {
     (void) v;
-      switch (this->type_get ())
+    switch (this->type_get ())
     {
       case 53: // value
       case 56: // map_value
@@ -1033,40 +1042,39 @@ namespace isc { namespace agent {
   template <typename Base>
   AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const location_type& l)
     : Base (t)
-    , value ()
     , location (l)
   {}
 
   template <typename Base>
-  AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const ElementPtr v, const location_type& l)
+  AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const ElementPtr& v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const bool v, const location_type& l)
+  AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const bool& v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const double v, const location_type& l)
+  AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const double& v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const int64_t v, const location_type& l)
+  AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const int64_t& v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l)
+  AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::string& v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
@@ -1074,14 +1082,12 @@ namespace isc { namespace agent {
 
 
   template <typename Base>
-  inline
   AgentParser::basic_symbol<Base>::~basic_symbol ()
   {
     clear ();
   }
 
   template <typename Base>
-  inline
   void
   AgentParser::basic_symbol<Base>::clear ()
   {
@@ -1096,7 +1102,7 @@ namespace isc { namespace agent {
     }
 
     // Type destructor.
-    switch (yytype)
+  switch (yytype)
     {
       case 53: // value
       case 56: // map_value
@@ -1128,7 +1134,6 @@ namespace isc { namespace agent {
   }
 
   template <typename Base>
-  inline
   bool
   AgentParser::basic_symbol<Base>::empty () const
   {
@@ -1136,12 +1141,11 @@ namespace isc { namespace agent {
   }
 
   template <typename Base>
-  inline
   void
   AgentParser::basic_symbol<Base>::move (basic_symbol& s)
   {
-    super_type::move(s);
-      switch (this->type_get ())
+    super_type::move (s);
+    switch (this->type_get ())
     {
       case 53: // value
       case 56: // map_value
@@ -1217,7 +1221,7 @@ namespace isc { namespace agent {
     // YYTOKNUM[NUM] -- (External) token number corresponding to the
     // (internal) symbol number NUM (which must be that of a token).  */
     static
-    const unsigned short int
+    const unsigned short
     yytoken_number_[] =
     {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
@@ -1488,9 +1492,9 @@ namespace isc { namespace agent {
   }
 
 
-#line 14 "agent_parser.yy" // lalr1.cc:377
+#line 14 "agent_parser.yy" // lalr1.cc:380
 } } // isc::agent
-#line 1494 "agent_parser.h" // lalr1.cc:377
+#line 1498 "agent_parser.h" // lalr1.cc:380
 
 
 

diff --git a/src/bin/agent/location.hh b/src/bin/agent/location.hh
index c978ea584a5f6f9adf19a68a73471bf3a5f87c94..46981341fc22a5c63de3b46f74e931095c4a6391 100644 (file)
--- a/src/bin/agent/location.hh
+++ b/src/bin/agent/location.hh
@@ -1,9 +1,8 @@
-// Generated 201804111444
-// A Bison parser, made by GNU Bison 3.0.4.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Locations for Bison parsers in C++
 
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018 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
@@ -41,9 +40,9 @@
 
 # include "position.hh"
 
-#line 14 "agent_parser.yy" // location.cc:296
+#line 14 "agent_parser.yy" // location.cc:290
 namespace isc { namespace agent {
-#line 46 "location.hh" // location.cc:296
+#line 46 "location.hh" // location.cc:290
   /// Abstract a location.
   class location
   {
@@ -53,30 +52,27 @@ namespace isc { namespace agent {
     location (const position& b, const position& e)
       : begin (b)
       , end (e)
-    {
-    }
+    {}
 
     /// Construct a 0-width location in \a p.
     explicit location (const position& p = position ())
       : begin (p)
       , end (p)
-    {
-    }
+    {}
 
     /// Construct a 0-width location in \a f, \a l, \a c.
     explicit location (std::string* f,
-                       unsigned int l = 1u,
-                       unsigned int c = 1u)
+                       unsigned l = 1u,
+                       unsigned c = 1u)
       : begin (f, l, c)
       , end (f, l, c)
-    {
-    }
+    {}
 
 
     /// Initialization.
     void initialize (std::string* f = YY_NULLPTR,
-                     unsigned int l = 1u,
-                     unsigned int c = 1u)
+                     unsigned l = 1u,
+                     unsigned c = 1u)
     {
       begin.initialize (f, l, c);
       end = begin;
@@ -171,10 +167,10 @@ namespace isc { namespace agent {
    ** Avoid duplicate information.
    */
   template <typename YYChar>
-  inline std::basic_ostream<YYChar>&
+  std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
   {
-    unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
+    unsigned end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
     ostr << loc.begin;
     if (loc.end.filename
         && (!loc.begin.filename
@@ -187,7 +183,7 @@ namespace isc { namespace agent {
     return ostr;
   }
 
-#line 14 "agent_parser.yy" // location.cc:296
+#line 14 "agent_parser.yy" // location.cc:290
 } } // isc::agent
-#line 192 "location.hh" // location.cc:296
+#line 189 "location.hh" // location.cc:290
 #endif // !YY_AGENT_LOCATION_HH_INCLUDED

diff --git a/src/bin/agent/position.hh b/src/bin/agent/position.hh
index 4678102783ffab04ca4ef37ff420d797a329b0e2..1f1cad47e019e8d94b94ff447818da465f8ce626 100644 (file)
--- a/src/bin/agent/position.hh
+++ b/src/bin/agent/position.hh
@@ -1,9 +1,8 @@
-// Generated 201804111444
-// A Bison parser, made by GNU Bison 3.0.4.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Positions for Bison parsers in C++
 
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018 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
@@ -51,28 +50,27 @@
 #  endif
 # endif
 
-#line 14 "agent_parser.yy" // location.cc:296
+#line 14 "agent_parser.yy" // location.cc:290
 namespace isc { namespace agent {
-#line 56 "position.hh" // location.cc:296
+#line 56 "position.hh" // location.cc:290
   /// Abstract a position.
   class position
   {
   public:
     /// Construct a position.
     explicit position (std::string* f = YY_NULLPTR,
-                       unsigned int l = 1u,
-                       unsigned int c = 1u)
+                       unsigned l = 1u,
+                       unsigned c = 1u)
       : filename (f)
       , line (l)
       , column (c)
-    {
-    }
+    {}
 
 
     /// Initialization.
     void initialize (std::string* fn = YY_NULLPTR,
-                     unsigned int l = 1u,
-                     unsigned int c = 1u)
+                     unsigned l = 1u,
+                     unsigned c = 1u)
     {
       filename = fn;
       line = l;
@@ -101,17 +99,15 @@ namespace isc { namespace agent {
     /// File name to which this position refers.
     std::string* filename;
     /// Current line number.
-    unsigned int line;
+    unsigned line;
     /// Current column number.
-    unsigned int column;
+    unsigned column;
 
   private:
-    /// Compute max(min, lhs+rhs) (provided min <= lhs).
-    static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
+    /// Compute max(min, lhs+rhs).
+    static unsigned add_ (unsigned lhs, int rhs, int min)
     {
-      return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
-              ? rhs + lhs
-              : min);
+      return static_cast<unsigned>(std::max(min, static_cast<int>(lhs) + rhs));
     }
   };
 
@@ -167,7 +163,7 @@ namespace isc { namespace agent {
    ** \param pos a reference to the position to redirect
    */
   template <typename YYChar>
-  inline std::basic_ostream<YYChar>&
+  std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
   {
     if (pos.filename)
@@ -175,7 +171,7 @@ namespace isc { namespace agent {
     return ostr << pos.line << '.' << pos.column;
   }
 
-#line 14 "agent_parser.yy" // location.cc:296
+#line 14 "agent_parser.yy" // location.cc:290
 } } // isc::agent
-#line 180 "position.hh" // location.cc:296
+#line 177 "position.hh" // location.cc:290
 #endif // !YY_AGENT_POSITION_HH_INCLUDED

diff --git a/src/bin/agent/stack.hh b/src/bin/agent/stack.hh
index efca5678c7c6f6bc20791f4b3b108798869d509e..45ba76fcde066f26afc829a9f53673241c87b3e5 100644 (file)
--- a/src/bin/agent/stack.hh
+++ b/src/bin/agent/stack.hh
@@ -1,9 +1,8 @@
-// Generated 201804111444
-// A Bison parser, made by GNU Bison 3.0.4.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Stack handling for Bison parsers in C++
 
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018 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,6 +43,7 @@
 #line 14 "agent_parser.yy" // stack.hh:132
 namespace isc { namespace agent {
 #line 46 "stack.hh" // stack.hh:132
+  /// A stack with random access from its top.
   template <class T, class S = std::vector<T> >
   class stack
   {
@@ -51,27 +51,31 @@ namespace isc { namespace agent {
     // 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 ()
-      : seq_ ()
     {
       seq_.reserve (200);
     }
 
-    stack (unsigned int n)
+    stack (size_type n)
       : seq_ (n)
     {}
 
-    inline
+    /// Random access.
+    ///
+    /// Index 0 returns the topmost element.
     T&
-    operator[] (unsigned int i)
+    operator[] (size_type i)
     {
       return seq_[seq_.size () - 1 - i];
     }
 
-    inline
+    /// Random access.
+    ///
+    /// Index 0 returns the topmost element.
     const T&
-    operator[] (unsigned int i) const
+    operator[] (size_type i) const
     {
       return seq_[seq_.size () - 1 - i];
     }
@@ -79,7 +83,6 @@ namespace isc { namespace agent {
     /// Steal the contents of \a t.
     ///
     /// Close to move-semantics.
-    inline
     void
     push (T& t)
     {
@@ -87,9 +90,8 @@ namespace isc { namespace agent {
       operator[](0).move (t);
     }
 
-    inline
     void
-    pop (unsigned int n = 1)
+    pop (size_type n = 1)
     {
       for (; n; --n)
         seq_.pop_back ();
@@ -101,21 +103,18 @@ namespace isc { namespace agent {
       seq_.clear ();
     }
 
-    inline
-    typename S::size_type
+    size_type
     size () const
     {
       return seq_.size ();
     }
 
-    inline
     const_iterator
     begin () const
     {
       return seq_.rbegin ();
     }
 
-    inline
     const_iterator
     end () const
     {
@@ -134,21 +133,21 @@ namespace isc { namespace agent {
   class slice
   {
   public:
-    slice (const S& stack, unsigned int range)
+    typedef typename S::size_type size_type;
+    slice (const S& stack, size_type range)
       : stack_ (stack)
       , range_ (range)
     {}
 
-    inline
     const T&
-    operator [] (unsigned int i) const
+    operator[] (size_type i) const
     {
       return stack_[range_ - i];
     }
 
   private:
     const S& stack_;
-    unsigned int range_;
+    size_type range_;
   };
 
 #line 14 "agent_parser.yy" // stack.hh:132

diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
index d523df1df2679c3dd3a97bc7c6d0af0e8708bffb..f79aef1fda23b45b191d1c81514700eae87006b3 100644 (file)
--- a/src/bin/dhcp4/dhcp4_lexer.cc
+++ b/src/bin/dhcp4/dhcp4_lexer.cc
@@ -1,6 +1,6 @@
-#line 2 "dhcp4_lexer.cc"
+#line 1 "dhcp4_lexer.cc"
 
-#line 4 "dhcp4_lexer.cc"
+#line 3 "dhcp4_lexer.cc"
 
 #define  YY_INT_ALIGNED short int
 
@@ -691,8 +691,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\
        (yy_c_buf_p) = yy_cp;
 /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
-#define YY_NUM_RULES 174
-#define YY_END_OF_BUFFER 175
+#define YY_NUM_RULES 175
+#define YY_END_OF_BUFFER 176
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -700,118 +700,119 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static const flex_int16_t yy_accept[1454] =
+static const flex_int16_t yy_accept[1467] =
     {   0,
-      167,  167,    0,    0,    0,    0,    0,    0,    0,    0,
-      175,  173,   10,   11,  173,    1,  167,  164,  167,  167,
-      173,  166,  165,  173,  173,  173,  173,  173,  160,  161,
-      173,  173,  173,  162,  163,    5,    5,    5,  173,  173,
-      173,   10,   11,    0,    0,  156,    0,    0,    0,    0,
+      168,  168,    0,    0,    0,    0,    0,    0,    0,    0,
+      176,  174,   10,   11,  174,    1,  168,  165,  168,  168,
+      174,  167,  166,  174,  174,  174,  174,  174,  161,  162,
+      174,  174,  174,  163,  164,    5,    5,    5,  174,  174,
+      174,   10,   11,    0,    0,  157,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
-      167,  167,    0,  166,  167,    3,    2,    6,    0,  167,
+      168,  168,    0,  167,  168,    3,    2,    6,    0,  168,
         0,    0,    0,    0,    0,    0,    4,    0,    0,    9,
 
-        0,  157,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,  159,    0,    0,    0,
+        0,  158,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  160,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    2,    0,    0,
-        0,    0,    0,    0,    0,    8,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    2,    0,
+        0,    0,    0,    0,    0,    0,    8,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
-      158,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  159,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   67,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   67,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  172,  170,    0,  169,  168,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  173,  171,    0,
+      170,  169,    0,    0,    0,    0,    0,    0,    0,    0,
 
-      137,    0,  136,    0,    0,   73,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   34,    0,    0,    0,
+        0,    0,  137,    0,  136,    0,    0,   73,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   34,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   70,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   17,    0,    0,    0,
+        0,    0,    0,    0,    0,   70,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   17,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   18,
-        0,    0,    0,    0,  171,  168,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,  138,    0,    0,  140,
-        0,    0,    0,    0,    0,    0,    0,   74,    0,    0,
-        0,    0,    0,    0,   59,    0,    0,    0,    0,    0,
-       91,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   37,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       58,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,   62,    0,   38,    0,    0,    0,    0,
+        0,    0,   18,    0,    0,    0,    0,  172,  169,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  138,
+        0,    0,  140,    0,    0,    0,    0,    0,    0,    0,
+        0,   74,    0,    0,    0,    0,    0,    0,   59,    0,
+        0,    0,    0,    0,   91,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   37,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   58,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   62,    0,   38,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,   88,   30,    0,    0,   35,    0,    0,    0,    0,
-        0,    0,    0,    0,   12,  145,    0,  142,    0,  141,
-        0,    0,    0,  101,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   81,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,   88,   30,    0,    0,   35,
+        0,    0,    0,    0,    0,    0,    0,    0,   12,  145,
+        0,  142,    0,  141,    0,    0,    0,  101,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   32,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   81,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       61,    0,    0,    0,    0,    0,    0,    0,    0,  102,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   32,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   61,    0,    0,    0,    0,
+        0,    0,    0,    0,  102,    0,    0,    0,    0,    0,
 
-        0,    0,   97,    0,    0,    0,    0,    0,    0,    0,
-        7,    0,    0,  143,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   97,    0,    0,
+        0,    0,    0,    0,    0,    7,    0,    0,  143,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,   72,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   72,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   83,    0,    0,
+        0,    0,    0,    0,    0,    0,   79,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   83,    0,    0,    0,    0,    0,    0,    0,    0,
-       79,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   65,    0,    0,    0,
 
-        0,    0,    0,    0,    0,    0,    0,    0,   76,    0,
-        0,    0,    0,    0,    0,    0,    0,   64,    0,    0,
+        0,    0,   65,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   76,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   64,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   95,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  107,
-       77,    0,    0,    0,    0,   82,   31,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   39,    0,
+        0,   95,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  107,   77,    0,    0,
+        0,    0,   82,   31,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   39,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   54,    0,    0,    0,    0,    0,
 
-        0,    0,    0,    0,  146,    0,    0,    0,    0,    0,
+        0,   54,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  146,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   69,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   96,    0,    0,    0,    0,    0,
-       42,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   36,
-        0,    0,    0,   29,    0,    0,    0,    0,    0,    0,
+        0,    0,   69,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   96,    0,    0,    0,    0,    0,   42,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   84,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   36,    0,    0,
+        0,   29,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   84,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
-        0,   93,    0,    0,    0,    0,    0,    0,    0,    0,
-      119,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   66,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   23,
+       93,    0,    0,    0,    0,    0,    0,    0,    0,  119,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   66,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  124,    0,    0,  122,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  150,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,   23,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      124,    0,    0,  122,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  150,    0,    0,    0,
         0,    0,    0,    0,   94,    0,    0,    0,    0,    0,
-        0,   98,   80,    0,    0,    0,    0,    0,    0,    0,
 
+        0,   98,   80,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,   92,   22,    0,
       103,    0,    0,    0,    0,    0,    0,    0,    0,  128,
         0,    0,    0,    0,   56,    0,    0,    0,    0,    0,
@@ -819,49 +820,49 @@ static const flex_int16_t yy_accept[1454] =
         0,    0,    0,    0,    0,    0,    0,   53,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,   60,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  100,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  153,    0,   57,   71,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,   50,    0,    0,
-        0,    0,    0,    0,    0,  125,    0,  123,    0,  118,
-      117,    0,   46,    0,   21,    0,    0,    0,    0,    0,
-      139,    0,    0,   87,    0,    0,    0,    0,    0,    0,
-        0,    0,  115,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  104,   15,    0,   40,    0,    0,
-        0,    0,    0,  127,    0,    0,    0,    0,    0,    0,
-       51,    0,    0,   99,    0,    0,    0,    0,   90,    0,
-        0,    0,    0,    0,    0,   63,    0,  148,    0,  147,
+        0,    0,    0,    0,    0,    0,  100,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
+        0,    0,    0,    0,    0,  154,    0,   57,   71,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,   50,    0,
+        0,    0,    0,    0,    0,    0,  125,    0,  123,    0,
+      118,  117,    0,   46,    0,   21,    0,    0,    0,    0,
+        0,  139,    0,    0,    0,   87,    0,    0,    0,    0,
+        0,    0,    0,    0,  115,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  104,   15,    0,   40,
+        0,    0,    0,    0,    0,  127,    0,    0,    0,    0,
+        0,    0,   51,    0,    0,   99,    0,    0,    0,    0,
+       90,    0,    0,    0,    0,    0,    0,   63,    0,  148,
+
+        0,  147,    0,    0,  153,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   14,    0,    0,   45,    0,    0,    0,    0,    0,
-      155,   85,   27,    0,    0,   47,  116,    0,    0,  151,
-      120,    0,    0,    0,    0,    0,    0,    0,    0,   25,
-        0,    0,   24,    0,  126,    0,    0,    0,    0,    0,
-       78,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   49,    0,    0,    0,    0,   41,
-        0,    0,    0,    0,    0,    0,  105,    0,    0,    0,
-
-       26,    0,  152,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   44,    0,    0,   20,  154,   55,
-        0,  149,  144,    0,   28,    0,   16,    0,    0,  133,
-        0,    0,    0,    0,    0,    0,  113,    0,   89,    0,
-        0,    0,    0,    0,    0,    0,    0,   68,    0,    0,
-        0,    0,    0,    0,    0,    0,  134,   13,    0,    0,
-        0,    0,    0,  121,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,  112,    0,   19,    0,
-      130,    0,    0,    0,    0,    0,  129,    0,    0,    0,
-      111,    0,    0,   48,    0,    0,   43,  132,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   14,    0,    0,   45,    0,    0,
+        0,    0,    0,  156,   85,   27,    0,    0,   47,  116,
+        0,    0,  151,  120,    0,    0,    0,    0,    0,    0,
+        0,    0,   25,    0,    0,   24,    0,  126,    0,    0,
+        0,    0,    0,   78,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   49,    0,    0,
+
+        0,    0,   41,    0,    0,    0,    0,    0,    0,  105,
+        0,    0,    0,   26,    0,  152,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   44,    0,    0,
+       20,  155,   55,    0,  149,  144,    0,   28,    0,   16,
+        0,    0,  133,    0,    0,    0,    0,    0,    0,  113,
+        0,   89,    0,    0,    0,    0,    0,    0,    0,    0,
+       68,    0,    0,    0,    0,    0,    0,    0,    0,  134,
+       13,    0,    0,    0,    0,    0,  121,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  112,
+        0,   19,    0,  130,    0,    0,    0,    0,    0,  129,
+
+        0,    0,    0,  111,    0,    0,   48,    0,    0,   43,
+      132,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  131,    0,   86,    0,    0,    0,    0,
-        0,    0,  109,  114,   52,    0,    0,    0,    0,  108,
-        0,    0,  135,    0,    0,    0,    0,    0,   75,    0,
-        0,  110,    0
+        0,    0,    0,    0,    0,    0,  131,    0,   86,    0,
+        0,    0,    0,    0,    0,  109,  114,   52,    0,    0,
+        0,    0,  108,    0,    0,  135,    0,    0,    0,    0,
+        0,   75,    0,    0,  110,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -908,353 +909,355 @@ static const YY_CHAR yy_meta[72] =
         3
     } ;
 
-static const flex_int16_t yy_base[1466] =
+static const flex_int16_t yy_base[1479] =
     {   0,
         0,   70,   19,   29,   41,   49,   52,   58,   87,   95,
-     1817, 1818,   32, 1813,  141,    0,  201, 1818,  206,   88,
-       11,  213, 1818, 1795,  114,   25,    2,    6, 1818, 1818,
-       73,   11,   17, 1818, 1818, 1818,  104, 1801, 1756,    0,
-     1793,  107, 1808,  217,  247, 1818, 1752,  185, 1751, 1757,
-       93,   58, 1749,   91,  211,  195,   14,  273,  195, 1748,
-      181,  275,  202,  209,   76,   68,  188, 1757,  232,  219,
-      296,  284,  207, 1740,  230,  287,  324,  305, 1759,    0,
-      339,  359,  367,  374,  379, 1818,    0, 1818,  301,  344,
-      295,  336,  196,  348,  350,  292, 1818, 1756, 1795, 1818,
-
-      355, 1818,  395, 1784,  331, 1742, 1752,  351,  367, 1747,
-      363,  370,  373,  379,  241, 1790,    0,  446,  375, 1734,
-     1736, 1732, 1740,  363, 1736, 1725, 1726,   76, 1742, 1725,
-     1734, 1734,  322, 1725,  367, 1726, 1724,  359, 1770, 1774,
-     1716, 1767, 1709, 1732, 1729, 1729, 1723,  349, 1716, 1709,
-     1714, 1708,  381, 1719, 1712, 1703, 1702, 1716,  362, 1702,
-      381, 1718, 1695,  442,  376,  390, 1716, 1713, 1714, 1712,
-      417, 1694, 1696,  418, 1688, 1705, 1697,    0,  392,  428,
-      441,  401,  445,  448, 1696, 1818,    0, 1739,  454, 1686,
-     1689,  444,  450, 1697,  457, 1740,  460, 1739,  454, 1738,
-
-     1818,  498, 1737,  482, 1698, 1678, 1694, 1691, 1690, 1681,
-      468, 1730, 1724, 1690, 1669, 1677, 1672, 1686, 1682, 1670,
-     1682, 1682, 1673, 1657, 1661, 1674, 1676, 1673, 1665, 1655,
-     1673, 1818, 1668, 1671, 1652, 1651, 1701, 1650, 1660, 1663,
-      453, 1659, 1647, 1658, 1694, 1641, 1697, 1634, 1649,  505,
-     1639, 1655, 1636, 1635, 1641, 1632, 1631, 1638, 1686, 1644,
-     1643, 1637,   77, 1644, 1639, 1631, 1621, 1636, 1635, 1630,
-     1634, 1615, 1631, 1617, 1623, 1630, 1618,  314, 1611, 1625,
-     1666, 1627,  468, 1618,  484, 1818, 1818,  485, 1818, 1818,
-     1605,    0,  475,  489, 1607,  524,  505, 1661, 1614,  501,
-
-     1818, 1659, 1818, 1653,  551, 1818,  502, 1595, 1651, 1597,
-     1603, 1653, 1610, 1605, 1608,  491, 1818, 1606, 1648, 1603,
-     1600,  540, 1606, 1644, 1638, 1593, 1588, 1585, 1634, 1593,
-     1582, 1598, 1630, 1578,  548, 1592, 1577, 1590, 1577, 1587,
-     1582, 1589, 1584, 1580,  500, 1578, 1581, 1576, 1572, 1620,
-      509, 1614, 1818, 1613, 1565, 1564, 1563, 1556, 1558, 1562,
-     1551, 1564,  530, 1609, 1564, 1561, 1818, 1564, 1553, 1553,
-     1565,  521, 1540, 1541, 1562,  531, 1544, 1593, 1540, 1554,
-     1553, 1539, 1551, 1550, 1549, 1548,  527, 1589, 1588, 1818,
-     1532, 1531,  574, 1544, 1818, 1818, 1543,    0, 1532, 1524,
-
-      529, 1529, 1580, 1579, 1537, 1577, 1818, 1525, 1575, 1818,
-      556,  602,  559, 1574, 1530, 1526, 1514, 1818, 1519, 1525,
-     1528, 1527, 1514, 1513, 1818, 1515, 1512,  190, 1510, 1512,
-     1818, 1520, 1517, 1502, 1515, 1510,  583, 1517, 1505, 1498,
-     1547, 1818, 1496, 1512, 1544, 1507, 1504, 1505, 1507, 1539,
-     1492, 1487, 1486, 1535, 1481, 1496, 1474, 1481, 1486, 1534,
-     1818, 1481, 1477, 1475, 1484, 1478, 1485, 1469, 1469, 1479,
-     1482, 1471, 1466, 1818, 1521, 1818, 1465, 1476, 1461, 1466,
-     1475, 1469, 1463, 1472, 1512, 1506, 1470, 1453, 1453, 1448,
-     1468, 1443, 1449, 1448, 1456, 1460, 1443, 1499, 1441, 1455,
-
-     1444, 1818, 1818, 1444, 1442, 1818, 1453, 1487, 1449,    0,
-     1433, 1450, 1488, 1438, 1818, 1818, 1435, 1818, 1441, 1818,
-      556,  568,  596, 1818, 1438, 1426, 1477, 1424, 1475, 1422,
-     1421, 1428, 1421, 1433, 1432, 1432, 1420, 1461, 1428, 1420,
-     1463, 1409, 1425, 1424, 1818, 1409, 1406, 1462, 1419, 1411,
-     1417, 1408, 1416, 1401, 1417, 1399, 1413,  557, 1395, 1389,
-     1394, 1409, 1406, 1407, 1404, 1445, 1402, 1818, 1388, 1390,
-     1399, 1397, 1434, 1433, 1386,  563, 1395, 1378, 1379, 1376,
-     1818, 1390, 1369, 1388, 1380, 1423, 1377, 1384, 1420, 1818,
-     1367, 1381, 1365, 1379, 1382, 1363, 1413, 1412, 1411, 1358,
-
-     1409, 1408, 1818,   14, 1370, 1370, 1368, 1351, 1356, 1358,
-     1818, 1364, 1354, 1818, 1399, 1347, 1402,  573,  584,  560,
-     1352, 1395,  585, 1399,  573, 1393, 1392, 1391, 1345, 1335,
-     1388, 1341, 1351, 1385, 1348, 1342, 1329, 1337, 1380, 1384,
-     1341, 1340, 1818, 1341, 1334, 1323, 1336, 1339, 1334, 1335,
-     1332, 1331, 1327, 1333, 1328, 1369, 1368, 1318, 1308,  575,
-     1365, 1818, 1364, 1313, 1305, 1306, 1355, 1318, 1305, 1316,
-     1818, 1304, 1313, 1312, 1312, 1352, 1295, 1304, 1309, 1286,
-     1290, 1341, 1305, 1287, 1297, 1337, 1336, 1335, 1282, 1333,
-     1297,  497,  593, 1274, 1284,  577, 1818, 1334, 1280, 1290,
-
-     1290, 1273, 1278, 1282, 1272, 1284, 1287, 1324, 1818, 1318,
-      577, 1271, 1279, 1278, 1273, 1269, 1276, 1818, 1264, 1277,
-     1257, 1260,    6,   94,  198,  229,  270,  309,  375,  439,
-      417,  422,  494,  516, 1818,  544,  588,  583,  596,  594,
-      647,  580,  592,  607,  595,  653,  612,  598,  601, 1818,
-     1818,  611,  616,  621,  609, 1818, 1818,  623,  610,  604,
-      609,  627,  614,  662,  615,  665,  616,  672, 1818,  619,
-      623,  618,  676,  631,  621,  622,  618,  631,  642,  626,
-      644,  639,  640,  642,  635,  637,  638,  638,  640,  655,
-      694,  653,  658,  635, 1818,  660,  650,  695,  655,  645,
-
-      660,  661,  648,  662, 1818,  681,  689,  669,  659,  706,
-      671,  675,  714,  664,  659,  671,  666,  667,  663,  672,
-      667,  723,  682,  673, 1818,  675,  686,  671,  687,  681,
-      727,  695,  680,  681, 1818,  697,  700,  683,  740,  685,
-     1818,  702,  705,  685,  703,  741,  701,  697,  692,  710,
-      709,  710,  696,  711,  703,  710,  700,  718,  703, 1818,
-      711,  717,  762, 1818,  713,  718,  760,  713,  725,  719,
-      724,  722,  720,  722,  732,  775,  721,  721,  778,  724,
-      736, 1818,  724,  732,  730,  735,  747,  731,  736,  746,
-      747,  752,  791,  750,  766,  771,  745,  756,  747,  799,
-
-      744, 1818,  744,  764,  753,  758,  765,  806,  807,  756,
-     1818,  752,  755,  754,  774,  771,  776,  777,  763,  771,
-      780,  760,  775,  784,  824, 1818,  825,  826,  779,  789,
-      791,  780,  776,  783,  792,  835,  784,  782,  784,  801,
-      840,  792,  791,  797,  795,  793,  846,  847,  843, 1818,
-      807,  800,  791,  810,  798,  808,  805,  810,  806,  819,
-      819, 1818,  803,  804, 1818,  805,  863,  804,  823,  824,
-      821,  807,  828,  827,  811,  816,  834, 1818,  824,  857,
-      848,  820,  879,  842, 1818,  825,  827,  844,  842,  834,
-      838, 1818, 1818,  848,  883,  832,  885,  834,  892,  837,
-
-      848,  840,  846,  842,  860,  862,  863, 1818, 1818,  862,
-     1818,  847,  848,  868,  858,  851,  863,  905,  871, 1818,
-      863,  913,  856,  915, 1818,  916,  860,  866,  873,  915,
-     1818, 1818,  865,  867,  881,  886,  869,  926,  885,  886,
-      887,  925,  879,  884,  933,  883,  935, 1818,  884,  937,
-      938,  880,  940,  901,  942,  886,  898,  903,  889,  919,
-      948,  908, 1818,  900,  951,  900,  915,  902,  898,  914,
-      919,  901,  959,  914,  919, 1818,  920,  913,  922,  923,
-      920,  910,  913,  913,  918,  971,  972,  917,  974,  971,
-      914,  929,  922,  980, 1818,  936, 1818, 1818,  941,  933,
-
-      943,  929,  930,  989,  935,  945,  992, 1818,  943,  943,
-      945,  947,  998,  941,  944, 1818,  963, 1818,  947, 1818,
-     1818,  961, 1818,  955, 1818, 1005,  956, 1007, 1008,  990,
-     1818,  968,  969, 1818,  957,  965,  959,  958,  961,  961,
-      962,  958, 1818,  980,  966,  967,  982,  982,  985,  985,
-      982, 1024,  988,  980, 1818, 1818,  991, 1818,  988,  993,
-      994,  991, 1033, 1818,  984,  985,  985,  991,  990, 1001,
-     1818, 1040,  989, 1818,  990,  990,  992,  998, 1818, 1000,
-     1052, 1003, 1006, 1055, 1018, 1818, 1015, 1818, 1012, 1818,
-     1035, 1055, 1061, 1062, 1063, 1022, 1008, 1066, 1067, 1022,
-
-     1016, 1070, 1071, 1067, 1032, 1028, 1070, 1020, 1025, 1023,
-     1080, 1038, 1082, 1042, 1084, 1047, 1037, 1031, 1047, 1047,
-     1091, 1035, 1052, 1051, 1035, 1091, 1092, 1041, 1094, 1059,
-     1060, 1818, 1060, 1047, 1818, 1058, 1105, 1065, 1078, 1065,
-     1818, 1818, 1818, 1053, 1110, 1818, 1818, 1059, 1070, 1818,
-     1818, 1060, 1109, 1054, 1059, 1117, 1067, 1077, 1078, 1818,
-     1121, 1076, 1818, 1123, 1818, 1068, 1083, 1071, 1086, 1090,
-     1818, 1124, 1092, 1085, 1094, 1076, 1083, 1137, 1098, 1097,
-     1140, 1141, 1142, 1093, 1818, 1144, 1145, 1092, 1147, 1818,
-     1097, 1149, 1095, 1094, 1152, 1107, 1818, 1149, 1102, 1099,
-
-     1818, 1113, 1818, 1116, 1159, 1114, 1161, 1122, 1105, 1107,
-     1104, 1120, 1121, 1130, 1818, 1120, 1170, 1818, 1818, 1818,
-     1166, 1818, 1818, 1131, 1818, 1168, 1818, 1122, 1129, 1818,
-     1126, 1131, 1129, 1179, 1180, 1125, 1818, 1140, 1818, 1141,
-     1131, 1143, 1186, 1130, 1138, 1139, 1152, 1818, 1151, 1141,
-     1140, 1154, 1145, 1154, 1156, 1160, 1818, 1818, 1199, 1144,
-     1201, 1161, 1203, 1818, 1199, 1163, 1164, 1151, 1146, 1209,
-     1168, 1169, 1170, 1213, 1172, 1175, 1818, 1216, 1818, 1179,
-     1818, 1161, 1219, 1220, 1165, 1182, 1818, 1168, 1168, 1170,
-     1818, 1175, 1185, 1818, 1171, 1183, 1818, 1818, 1188, 1182,
-
-     1186, 1177, 1229, 1178, 1186, 1195, 1188, 1183, 1198, 1189,
-     1196, 1183, 1198, 1203, 1246, 1205, 1248, 1193, 1209, 1200,
-     1214, 1210, 1203, 1818, 1255, 1818, 1256, 1257, 1214, 1213,
-     1214, 1204, 1818, 1818, 1818, 1262, 1206, 1222, 1265, 1818,
-     1261, 1212, 1818, 1211, 1213, 1224, 1271, 1222, 1818, 1231,
-     1274, 1818, 1818, 1280, 1285, 1290, 1295, 1300, 1305, 1310,
-     1313, 1287, 1292, 1294, 1307
+     1829, 1830,   32, 1825,  141,    0,  201, 1830,  206,   88,
+       11,  213, 1830, 1807,  114,   25,    2,    6, 1830, 1830,
+       73,   11,   17, 1830, 1830, 1830,  104, 1813, 1768,    0,
+     1805,  107, 1820,  217,  247, 1830, 1764,  185, 1763, 1769,
+       93,   58, 1761,   91,  211,  195,   14,  273,  195, 1760,
+      181,  275,  207,  211,   76,   68,  188, 1769,  232,  219,
+      296,  284,  280, 1752,  204,  302,  322,  305, 1771,    0,
+      349,  357,  370,  377,  362, 1830,    0, 1830,  301,  342,
+      296,  325,  201,  346,  359,  224, 1830, 1768, 1807, 1830,
+
+      353, 1830,  390, 1796,  357, 1754, 1764,  369,  220, 1759,
+      362,  288,  364,  374,  221, 1802,    0,  441,  366, 1746,
+     1743, 1747, 1743, 1751,  360, 1747, 1736, 1737,   76, 1753,
+     1736, 1745, 1745,  365, 1736,  365, 1737, 1735,  357, 1781,
+     1785, 1727, 1778, 1720, 1743, 1740, 1740, 1734,  268, 1727,
+     1720, 1725, 1719,  371, 1730, 1723, 1714, 1713, 1727,  379,
+     1713,  384, 1729, 1706,  415,  387,  419, 1727, 1724, 1725,
+     1723,  390, 1705, 1707,  420, 1699, 1716, 1708,    0,  386,
+      439,  425,  396,  440,  453, 1707, 1830,    0, 1750,  460,
+     1697, 1700,  437,  452, 1708,  458, 1751,  466, 1750,  462,
+
+     1749, 1830,  506, 1748,  472, 1709, 1701, 1688, 1704, 1701,
+     1700, 1691,  448, 1740, 1734, 1700, 1679, 1687, 1682, 1696,
+     1692, 1680, 1692, 1692, 1683, 1667, 1671, 1684, 1686, 1683,
+     1675, 1665, 1683, 1830, 1678, 1681, 1662, 1661, 1711, 1660,
+     1670, 1673,  496, 1669, 1657, 1668, 1704, 1651, 1707, 1644,
+     1659,  489, 1649, 1665, 1646, 1645, 1651, 1642, 1641, 1648,
+     1696, 1654, 1653, 1647,   77, 1654, 1649, 1641, 1631, 1646,
+     1645, 1640, 1644, 1625, 1641, 1627, 1633, 1640, 1628,  492,
+     1621, 1635, 1676, 1637,  485, 1628,  477, 1830, 1830,  485,
+     1830, 1830, 1615,    0,  456,  473, 1617,  520,  490, 1671,
+
+     1624,  484, 1830, 1669, 1830, 1663,  548, 1830,  474, 1605,
+     1614, 1660, 1606, 1612, 1662, 1619, 1614, 1617,  479, 1830,
+     1615, 1657, 1612, 1609,  528, 1615, 1653, 1647, 1602, 1597,
+     1594, 1643, 1602, 1591, 1607, 1639, 1587,  554, 1601, 1586,
+     1599, 1586, 1596, 1591, 1598, 1593, 1589,  496, 1587, 1590,
+     1585, 1581, 1629,  488, 1623, 1830, 1622, 1574, 1573, 1572,
+     1565, 1567, 1571, 1560, 1573,  518, 1618, 1573, 1570, 1830,
+     1573, 1562, 1562, 1574,  518, 1549, 1550, 1571,  529, 1553,
+     1602, 1549, 1563, 1562, 1548, 1560, 1559, 1558, 1557,  380,
+     1598, 1597, 1830, 1541, 1540,  572, 1553, 1830, 1830, 1552,
+
+        0, 1541, 1533,  525, 1538, 1589, 1588, 1546, 1586, 1830,
+     1534, 1584, 1830,  556,  603,  542, 1583, 1527, 1538, 1534,
+     1522, 1830, 1527, 1533, 1536, 1535, 1522, 1521, 1830, 1523,
+     1520,  520, 1518, 1520, 1830, 1528, 1525, 1510, 1523, 1518,
+      578, 1525, 1513, 1506, 1555, 1830, 1504, 1520, 1552, 1515,
+     1512, 1513, 1515, 1547, 1500, 1495, 1494, 1543, 1489, 1504,
+     1482, 1489, 1494, 1542, 1830, 1489, 1485, 1483, 1492, 1486,
+     1493, 1477, 1477, 1487, 1490, 1479, 1474, 1830, 1529, 1830,
+     1473, 1484, 1469, 1474, 1483, 1477, 1471, 1480, 1520, 1514,
+     1478, 1461, 1461, 1456, 1476, 1451, 1457, 1456, 1464, 1468,
+
+     1451, 1507, 1449, 1463, 1452, 1830, 1830, 1452, 1450, 1830,
+     1461, 1495, 1457,    0, 1441, 1458, 1496, 1446, 1830, 1830,
+     1443, 1830, 1449, 1830,  554,  569,  592, 1830, 1446, 1445,
+     1433, 1484, 1431, 1482, 1429, 1428, 1435, 1428, 1440, 1439,
+     1439, 1427, 1468, 1435, 1427, 1470, 1416, 1432, 1431, 1830,
+     1416, 1413, 1469, 1426, 1418, 1424, 1415, 1423, 1408, 1424,
+     1406, 1420,  544, 1402, 1396, 1401, 1416, 1413, 1414, 1411,
+     1452, 1409, 1830, 1395, 1397, 1406, 1404, 1441, 1440, 1393,
+      562, 1402, 1385, 1386, 1383, 1830, 1397, 1376, 1395, 1387,
+     1430, 1384, 1391, 1427, 1830, 1374, 1388, 1372, 1386, 1389,
+
+     1370, 1420, 1419, 1418, 1365, 1416, 1415, 1830,   14, 1377,
+     1377, 1375, 1358, 1363, 1365, 1830, 1371, 1361, 1830, 1406,
+     1354, 1409,  571,  501,  547, 1351, 1358, 1401,  555, 1405,
+      574, 1399, 1398, 1397, 1351, 1341, 1394, 1347, 1357, 1391,
+     1354, 1348, 1335, 1343, 1386, 1390, 1347, 1346, 1830, 1347,
+     1340, 1329, 1342, 1345, 1340, 1341, 1338, 1337, 1333, 1339,
+     1334, 1375, 1374, 1324, 1314,  577, 1371, 1830, 1370, 1319,
+     1311, 1312, 1361, 1324, 1311, 1322, 1830, 1310, 1319, 1318,
+     1318, 1358, 1301, 1310, 1315, 1292, 1296, 1347, 1311, 1293,
+     1303, 1343, 1342, 1341, 1288, 1339, 1303,  579,  594, 1280,
+
+     1290,  551, 1830, 1340, 1286, 1296, 1296, 1279, 1284, 1288,
+     1278, 1290, 1293, 1330, 1830, 1324,  599, 1277, 1285, 1288,
+     1283,    7,   13,   91, 1830,  172,  245,  269,  359,  504,
+      556,  562,  563,  561,  582,  578,  633,  592,  582,  598,
+      588, 1830,  598,  607,  600,  611,  610,  653,  597,  600,
+      615,  603,  660,  619,  605,  608, 1830, 1830,  618,  623,
+      628,  616, 1830, 1830,  630,  617,  611,  616,  634,  621,
+      669,  622,  672,  623,  679, 1830,  626,  630,  625,  683,
+      638,  628,  629,  625,  638,  649,  633,  651,  646,  647,
+      649,  642,  644,  645,  645,  647,  662,  701,  660,  665,
+
+      642, 1830,  667,  657,  702,  662,  652,  667,  668,  655,
+      669, 1830,  688,  696,  676,  666,  661,  714,  679,  683,
+      722,  672,  667,  679,  674,  675,  671,  680,  675,  731,
+      690,  681, 1830,  683,  694,  679,  695,  690,  735,  704,
+      688,  689, 1830,  705,  708,  691,  748,  693, 1830,  710,
+      713,  693,  711,  749,  709,  705,  700,  718,  717,  718,
+      704,  719,  711,  718,  708,  726,  711, 1830,  719,  725,
+      770, 1830,  721,  726,  768,  721,  733,  727,  732,  730,
+      728,  730,  740,  783,  729,  729,  786,  732,  744, 1830,
+      732,  740,  738,  743,  755,  739,  744,  754,  755,  760,
+
+      799,  758,  774,  779,  753,  764,  760,  756,  808,  753,
+     1830,  753,  773,  762,  767,  774,  815,  816,  765, 1830,
+      761,  764,  763,  783,  780,  785,  786,  772,  780,  789,
+      769,  786,  793,  833, 1830,  834,  835,  788,  798,  800,
+      789,  785,  792,  801,  844,  793,  791,  793,  810,  849,
+      801,  800,  806,  804,  802,  855,  856,  852, 1830,  816,
+      809,  800,  819,  807,  817,  814,  819,  815,  828,  828,
+     1830,  812,  813, 1830,  814,  872,  813,  832,  833,  830,
+      816,  837,  836,  820,  825,  843, 1830,  833,  866,  857,
+      829,  888,  830,  852, 1830,  835,  837,  854,  852,  844,
+
+      848, 1830, 1830,  858,  893,  842,  895,  844,  902,  847,
+      858,  850,  856,  852,  871,  872,  873, 1830, 1830,  872,
+     1830,  857,  859,  878,  868,  861,  873,  915,  881, 1830,
+      873,  923,  866,  925, 1830,  926,  870,  876,  883,  925,
+     1830, 1830,  875,  877,  891,  896,  879,  936,  895,  896,
+      897,  935,  889,  894,  943,  893,  945, 1830,  894,  947,
+      948,  890,  950,  911,  952,  896,  908,  913,  899,  929,
+      958,  918, 1830,  918,  911,  962,  911,  926,  913,  909,
+      925,  930,  912,  970,  925,  930, 1830,  931,  924,  933,
+      934,  931,  921,  924,  924,  929,  982,  983,  928,  986,
+
+      982,  925,  940,  933,  992, 1830,  947, 1830, 1830,  952,
+      944,  954,  940,  941, 1000,  946,  956, 1003, 1830,  954,
+      954,  956,  958, 1009,  952,  955, 1830,  974, 1830,  958,
+     1830, 1830,  972, 1830,  966, 1830, 1016,  967, 1018, 1019,
+     1001, 1830,  979, 1022,  982, 1830,  969,  977,  971,  970,
+      973,  973,  974,  970, 1830,  992,  978,  979,  994,  994,
+      997,  997,  994, 1036, 1000,  993, 1830, 1830, 1003, 1830,
+     1000, 1005, 1006, 1003, 1045, 1830,  996,  997,  997, 1003,
+     1002, 1013, 1830, 1052, 1001, 1830, 1002, 1002, 1004, 1010,
+     1830, 1012, 1064, 1015, 1018, 1067, 1030, 1830, 1027, 1830,
+
+     1024, 1830, 1047, 1067, 1830, 1073, 1074, 1075, 1034, 1020,
+     1078, 1079, 1034, 1028, 1082, 1083, 1079, 1044, 1040, 1082,
+     1032, 1037, 1035, 1092, 1050, 1094, 1054, 1096, 1059, 1049,
+     1043, 1059, 1059, 1103, 1047, 1064, 1063, 1047, 1103, 1104,
+     1053, 1106, 1071, 1072, 1830, 1072, 1059, 1830, 1070, 1117,
+     1077, 1090, 1077, 1830, 1830, 1830, 1065, 1122, 1830, 1830,
+     1071, 1082, 1830, 1830, 1072, 1121, 1066, 1071, 1129, 1079,
+     1089, 1090, 1830, 1133, 1088, 1830, 1135, 1830, 1080, 1095,
+     1083, 1098, 1102, 1830, 1136, 1104, 1097, 1106, 1088, 1095,
+     1149, 1110, 1109, 1152, 1153, 1154, 1105, 1830, 1156, 1157,
+
+     1104, 1159, 1830, 1109, 1161, 1107, 1106, 1164, 1119, 1830,
+     1161, 1114, 1111, 1830, 1125, 1830, 1128, 1171, 1126, 1173,
+     1134, 1117, 1119, 1116, 1132, 1133, 1142, 1830, 1132, 1182,
+     1830, 1830, 1830, 1178, 1830, 1830, 1143, 1830, 1180, 1830,
+     1134, 1141, 1830, 1138, 1143, 1141, 1191, 1192, 1137, 1830,
+     1152, 1830, 1153, 1143, 1155, 1198, 1142, 1150, 1151, 1164,
+     1830, 1163, 1153, 1152, 1166, 1157, 1166, 1168, 1172, 1830,
+     1830, 1211, 1156, 1213, 1173, 1215, 1830, 1211, 1175, 1176,
+     1163, 1158, 1221, 1180, 1181, 1182, 1225, 1184, 1187, 1830,
+     1228, 1830, 1191, 1830, 1173, 1231, 1232, 1177, 1194, 1830,
+
+     1180, 1180, 1182, 1830, 1187, 1197, 1830, 1183, 1195, 1830,
+     1830, 1200, 1194, 1198, 1189, 1241, 1190, 1198, 1207, 1200,
+     1195, 1210, 1201, 1208, 1195, 1210, 1215, 1258, 1217, 1260,
+     1205, 1221, 1212, 1226, 1222, 1215, 1830, 1267, 1830, 1268,
+     1269, 1226, 1225, 1226, 1216, 1830, 1830, 1830, 1274, 1218,
+     1234, 1277, 1830, 1273, 1224, 1830, 1223, 1225, 1236, 1283,
+     1234, 1830, 1243, 1286, 1830, 1830, 1292, 1297, 1302, 1307,
+     1312, 1317, 1322, 1325, 1299, 1304, 1306, 1319
     } ;
 
-static const flex_int16_t yy_def[1466] =
+static const flex_int16_t yy_def[1479] =
     {   0,
-     1454, 1454, 1455, 1455, 1454, 1454, 1454, 1454, 1454, 1454,
-     1453, 1453, 1453, 1453, 1453, 1456, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1457,
-     1453, 1453, 1453, 1458,   15, 1453,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 1459,   45,   45,
+     1467, 1467, 1468, 1468, 1467, 1467, 1467, 1467, 1467, 1467,
+     1466, 1466, 1466, 1466, 1466, 1469, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1470,
+     1466, 1466, 1466, 1471,   15, 1466,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 1472,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 1456,
-     1453, 1453, 1453, 1453, 1453, 1453, 1460, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1457, 1453,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 1469,
+     1466, 1466, 1466, 1466, 1466, 1466, 1473, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1470, 1466,
 
-     1458, 1453, 1453,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 1461,   45, 1459,   45,   45,
+     1471, 1466, 1466,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45, 1474,   45, 1472,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 1460, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1462,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 1461,
+       45,   45,   45,   45,   45,   45,   45,   45, 1473, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1475,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
 
-     1453, 1459,   45,   45,   45,   45,   45,   45,   45,   45,
+     1474, 1466, 1472,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45, 1453,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45, 1466,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1463,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1476,   45,   45,   45,   45,   45,   45,
 
-     1453,   45, 1453,   45, 1459, 1453,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45, 1453,   45,   45,   45,
+       45,   45, 1466,   45, 1466,   45, 1472, 1466,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 1466,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45, 1453,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45, 1453,   45,   45,   45,
+       45,   45,   45,   45,   45, 1466,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 1466,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 1453,
-       45,   45,   45,   45, 1453, 1453, 1453, 1464,   45,   45,
-
-       45,   45,   45,   45,   45,   45, 1453,   45,   45, 1453,
-       45, 1459,   45,   45,   45,   45,   45, 1453,   45,   45,
-       45,   45,   45,   45, 1453,   45,   45,   45,   45,   45,
-     1453,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45, 1453,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     1453,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45, 1453,   45, 1453,   45,   45,   45,   45,
+       45,   45, 1466,   45,   45,   45,   45, 1466, 1466, 1466,
+
+     1477,   45,   45,   45,   45,   45,   45,   45,   45, 1466,
+       45,   45, 1466,   45, 1472,   45,   45,   45,   45,   45,
+       45, 1466,   45,   45,   45,   45,   45,   45, 1466,   45,
+       45,   45,   45,   45, 1466,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45, 1466,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45, 1466,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 1466,   45, 1466,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-
-       45, 1453, 1453,   45,   45, 1453,   45,   45, 1453, 1465,
-       45,   45,   45,   45, 1453, 1453,   45, 1453,   45, 1453,
-       45,   45,   45, 1453,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 1453,   45,   45,   45,   45,   45,
+
+       45,   45,   45,   45,   45, 1466, 1466,   45,   45, 1466,
+       45,   45, 1466, 1478,   45,   45,   45,   45, 1466, 1466,
+       45, 1466,   45, 1466,   45,   45,   45, 1466,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 1453,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 1466,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     1453,   45,   45,   45,   45,   45,   45,   45,   45, 1453,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45, 1466,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45, 1466,   45,   45,   45,   45,
+       45,   45,   45,   45, 1466,   45,   45,   45,   45,   45,
 
-       45,   45, 1453,   45,   45,   45,   45,   45,   45,   45,
-     1453,   45,   45, 1453,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 1466,   45,   45,
+       45,   45,   45,   45,   45, 1466,   45,   45, 1466,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45, 1466,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45, 1453,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 1466,   45,   45,
+       45,   45,   45,   45,   45,   45, 1466,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45, 1453,   45,   45,   45,   45,   45,   45,   45,   45,
-     1453,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45, 1453,   45,   45,   45,
 
-       45,   45,   45,   45,   45,   45,   45,   45, 1453,   45,
-       45,   45,   45,   45,   45,   45,   45, 1453,   45,   45,
+       45,   45, 1466,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45, 1466,   45,   45,   45,   45,   45,
+       45,   45,   45,   45, 1466,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 1453,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 1453,
-     1453,   45,   45,   45,   45, 1453, 1453,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45, 1453,   45,
+       45, 1466,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 1466, 1466,   45,   45,
+       45,   45, 1466, 1466,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45, 1466,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 1453,   45,   45,   45,   45,   45,
 
-       45,   45,   45,   45, 1453,   45,   45,   45,   45,   45,
+       45, 1466,   45,   45,   45,   45,   45,   45,   45,   45,
+       45, 1466,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 1453,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 1453,   45,   45,   45,   45,   45,
-     1453,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 1453,
-       45,   45,   45, 1453,   45,   45,   45,   45,   45,   45,
+       45,   45, 1466,   45,   45,   45,   45,   45,   45,   45,
+       45,   45, 1466,   45,   45,   45,   45,   45, 1466,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45, 1453,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 1466,   45,   45,
+       45, 1466,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 1466,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
 
-       45, 1453,   45,   45,   45,   45,   45,   45,   45,   45,
-     1453,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 1453,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 1453,
+     1466,   45,   45,   45,   45,   45,   45,   45,   45, 1466,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45, 1453,   45,   45, 1453,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 1453,   45,   45,
-       45,   45,   45,   45, 1453,   45,   45,   45,   45,   45,
-       45, 1453, 1453,   45,   45,   45,   45,   45,   45,   45,
-
-       45,   45,   45,   45,   45,   45,   45, 1453, 1453,   45,
-     1453,   45,   45,   45,   45,   45,   45,   45,   45, 1453,
-       45,   45,   45,   45, 1453,   45,   45,   45,   45,   45,
-     1453, 1453,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 1453,   45,   45,
+       45,   45,   45,   45, 1466,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45, 1453,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 1453,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45, 1466,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 1453,   45, 1453, 1453,   45,   45,
-
-       45,   45,   45,   45,   45,   45,   45, 1453,   45,   45,
-       45,   45,   45,   45,   45, 1453,   45, 1453,   45, 1453,
-     1453,   45, 1453,   45, 1453,   45,   45,   45,   45,   45,
-     1453,   45,   45, 1453,   45,   45,   45,   45,   45,   45,
-       45,   45, 1453,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 1453, 1453,   45, 1453,   45,   45,
-       45,   45,   45, 1453,   45,   45,   45,   45,   45,   45,
-     1453,   45,   45, 1453,   45,   45,   45,   45, 1453,   45,
-       45,   45,   45,   45,   45, 1453,   45, 1453,   45, 1453,
+     1466,   45,   45, 1466,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 1466,   45,   45,   45,
+       45,   45,   45,   45, 1466,   45,   45,   45,   45,   45,
+
+       45, 1466, 1466,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 1466, 1466,   45,
+     1466,   45,   45,   45,   45,   45,   45,   45,   45, 1466,
+       45,   45,   45,   45, 1466,   45,   45,   45,   45,   45,
+     1466, 1466,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 1466,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-
+       45,   45, 1466,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 1466,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+
+       45,   45,   45,   45,   45, 1466,   45, 1466, 1466,   45,
+       45,   45,   45,   45,   45,   45,   45,   45, 1466,   45,
+       45,   45,   45,   45,   45,   45, 1466,   45, 1466,   45,
+     1466, 1466,   45, 1466,   45, 1466,   45,   45,   45,   45,
+       45, 1466,   45,   45,   45, 1466,   45,   45,   45,   45,
+       45,   45,   45,   45, 1466,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 1466, 1466,   45, 1466,
+       45,   45,   45,   45,   45, 1466,   45,   45,   45,   45,
+       45,   45, 1466,   45,   45, 1466,   45,   45,   45,   45,
+     1466,   45,   45,   45,   45,   45,   45, 1466,   45, 1466,
+
+       45, 1466,   45,   45, 1466,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45, 1453,   45,   45, 1453,   45,   45,   45,   45,   45,
-     1453, 1453, 1453,   45,   45, 1453, 1453,   45,   45, 1453,
-     1453,   45,   45,   45,   45,   45,   45,   45,   45, 1453,
-       45,   45, 1453,   45, 1453,   45,   45,   45,   45,   45,
-     1453,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 1453,   45,   45,   45,   45, 1453,
-       45,   45,   45,   45,   45,   45, 1453,   45,   45,   45,
-
-     1453,   45, 1453,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 1453,   45,   45, 1453, 1453, 1453,
-       45, 1453, 1453,   45, 1453,   45, 1453,   45,   45, 1453,
-       45,   45,   45,   45,   45,   45, 1453,   45, 1453,   45,
-       45,   45,   45,   45,   45,   45,   45, 1453,   45,   45,
-       45,   45,   45,   45,   45,   45, 1453, 1453,   45,   45,
-       45,   45,   45, 1453,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45, 1453,   45, 1453,   45,
-     1453,   45,   45,   45,   45,   45, 1453,   45,   45,   45,
-     1453,   45,   45, 1453,   45,   45, 1453, 1453,   45,   45,
-
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45, 1466,   45,   45, 1466,   45,   45,
+       45,   45,   45, 1466, 1466, 1466,   45,   45, 1466, 1466,
+       45,   45, 1466, 1466,   45,   45,   45,   45,   45,   45,
+       45,   45, 1466,   45,   45, 1466,   45, 1466,   45,   45,
+       45,   45,   45, 1466,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 1466,   45,   45,
+
+       45,   45, 1466,   45,   45,   45,   45,   45,   45, 1466,
+       45,   45,   45, 1466,   45, 1466,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 1466,   45,   45,
+     1466, 1466, 1466,   45, 1466, 1466,   45, 1466,   45, 1466,
+       45,   45, 1466,   45,   45,   45,   45,   45,   45, 1466,
+       45, 1466,   45,   45,   45,   45,   45,   45,   45,   45,
+     1466,   45,   45,   45,   45,   45,   45,   45,   45, 1466,
+     1466,   45,   45,   45,   45,   45, 1466,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 1466,
+       45, 1466,   45, 1466,   45,   45,   45,   45,   45, 1466,
+
+       45,   45,   45, 1466,   45,   45, 1466,   45,   45, 1466,
+     1466,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45, 1453,   45, 1453,   45,   45,   45,   45,
-       45,   45, 1453, 1453, 1453,   45,   45,   45,   45, 1453,
-       45,   45, 1453,   45,   45,   45,   45,   45, 1453,   45,
-       45, 1453,    0, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453
+       45,   45,   45,   45,   45,   45, 1466,   45, 1466,   45,
+       45,   45,   45,   45,   45, 1466, 1466, 1466,   45,   45,
+       45,   45, 1466,   45,   45, 1466,   45,   45,   45,   45,
+       45, 1466,   45,   45, 1466,    0, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466
     } ;
 
-static const flex_int16_t yy_nxt[1890] =
+static const flex_int16_t yy_nxt[1902] =
     {   0,
-     1453,   13,   14,   13, 1453,   15,   16, 1453,   17,   18,
-       19,   20,   21,   22,   22,   22,   23,   24,   86,  697,
-       37,   14,   37,   87,   25,   26,   38, 1453,  698,   27,
+     1466,   13,   14,   13, 1466,   15,   16, 1466,   17,   18,
+       19,   20,   21,   22,   22,   22,   23,   24,   86,  703,
+       37,   14,   37,   87,   25,   26,   38, 1466,  704,   27,
        37,   14,   37,   42,   28,   42,   38,   92,   93,   29,
       115,   30,   13,   14,   13,   91,   92,   25,   31,   93,
-       13,   14,   13,   13,   14,   13,   32,   40, 1453,   13,
-       14,   13,   33,   40,  115,   92,   93,  818,   91,   34,
+       13,   14,   13,   13,   14,   13,   32,   40,  819,   13,
+       14,   13,   33,   40,  115,   92,   93,  820,   91,   34,
        35,   13,   14,   13,   95,   15,   16,   96,   17,   18,
        19,   20,   21,   22,   22,   22,   23,   24,   13,   14,
        13,  109,   39,   91,   25,   26,   13,   14,   13,   27,
 
        39,   85,   85,   85,   28,   42,   41,   42,   42,   29,
        42,   30,   83,  108,   41,  111,   94,   25,   31,  109,
-      215,  216,   89,  136,   89,  138,   32,   90,   90,   90,
-      137,  371,   33,  139,  372,   83,  108,  819,  111,   34,
+      217,  218,   89,  137,   89,  139,   32,   90,   90,   90,
+      138,  374,   33,  140,  375,   83,  108,  821,  111,   34,
        35,   44,   44,   44,   45,   45,   46,   45,   45,   45,
        45,   45,   45,   45,   45,   47,   45,   45,   45,   45,
        45,   48,   45,   49,   50,   45,   51,   45,   52,   53,
@@ -1264,199 +1267,202 @@ static const flex_int16_t yy_nxt[1890] =
 
        74,   75,   76,   77,   78,   79,   57,   45,   45,   45,
        45,   45,   81,  105,   82,   82,   82,   81,  114,   84,
-       84,   84,  102,  105,   81,   83,   84,   84,   84,  108,
-       83,  181,  122,  112,  140,  123,  536,   83,  124,  105,
-      125,  114,  126,  113,  141,  820,  142,  132,   83,  119,
-      159,  537,  108,   83,  160,  120,  112,  103,  133,  181,
-       83,   45,  148,  135,  161,  199,  149,   45,  134,   45,
-       45,  113,   45,  163,   45,   45,   45,  164,  117,  144,
-      145,   45,   45,  146,   45,   45,  150,  821,  199,  147,
+       84,   84,  102,  105,   81,   83,   84,   84,   84,  822,
+       83,  108,  123,  112,  141,  124,  182,   83,  125,  105,
+      126,  114,  127,  113,  142,  200,  143,  164,   83,  119,
+      194,  165,  133,   83,  108,  120,  112,  103,  121,  182,
+       83,   45,  149,  134,  182,  136,  150,   45,  200,   45,
+       45,  113,   45,  135,   45,   45,   45,  194,  117,  145,
+      146,   45,   45,  147,   45,   45,  151,  185,  823,  148,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
 
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   90,   90,   90,   45,  127,  301,
-      111,   45,  128,  179,  387,  129,  130,  181,  114,   45,
-      165,  822,  154,   45,  166,   45,  118,  167,  131,  151,
-      155,  152,  156,  153,  168,  169,  112,  157,  158,  179,
-      170,  174,   85,   85,   85,  184,  113,   90,   90,   90,
-      102,  175,  823,   83,  180,  221,  176,  222,  189,  171,
-       81,  172,   82,   82,   82,   89,  179,   89,  180,  192,
-       90,   90,   90,   83,  113,   81,   83,   84,   84,   84,
-      180,  173,   85,   85,   85,  103,  189,  193,   83,  195,
-
-      101,  196,  182,   83,  183,  192,   83,  101,  197,  209,
-      198,  240,  189,  228,  224,  241,  229,  195,  210,  211,
-      230,   83,  252,  253,  193,  285,   83,  195,  196,  203,
-      225,  269,  270,  824,  285,  101,  197,  198,  255,  101,
-      204,  256,  257,  101,  825,  195,  271,  246,  196,  198,
-      272,  101,  260,  285,  273,  101,  286,  101,  187,  202,
-      202,  202,  288,  345,  826,  287,  202,  202,  202,  202,
-      202,  202,  287,  286,  294,  278,  281,  297,  392,  298,
-      827,  300,  286,  304,  302,  261,  262,  263,  287,  202,
-      202,  202,  202,  202,  202,  290,  264,  294,  265,  289,
-
-      266,  267,  294,  268,  300,  297,  298,  302,  395,  395,
-      304,  305,  305,  305,  346,  356,  314,  347,  305,  305,
-      305,  305,  305,  305,  315,  307,  399,  401,  393,  406,
-      316,  395,  396,  409,  422,  474,  400,  828,  403,  404,
-      401,  305,  305,  305,  305,  305,  305,  405,  785,  357,
-      428,  423,  406,  442,  429,  786,  401,  462,  443,  455,
-      456,  409,  513,  358,  412,  412,  412,  463,  671,  413,
-      829,  412,  412,  412,  412,  412,  412,  483,  488,  506,
-      500,  484,  489,  501,  507,  521,  618,  522,  545,  830,
-      513,  475,  513,  546,  412,  412,  412,  412,  412,  412,
-
-      619,  614,  653,  654,  444,  672,  620,  710,  711,  445,
-      807,  712,  521,  618,  522,   45,   45,   45,  719,  720,
-      523,  713,   45,   45,   45,   45,   45,   45,  619,  754,
-      716,  711,  755,  793,  831,  710,  717,  832,  807,  794,
-      833,  834,  837,  787,  788,   45,   45,   45,   45,   45,
-       45,  789,  835,  838,  839,  790,  840,  836,  841,  842,
-      843,  844,  845,  846,  847,  848,  849,  850,  851,  852,
-      853,  855,  856,  857,  854,  858,  859,  860,  861,  862,
-      863,  864,  865,  866,  867,  868,  869,  870,  871,  872,
-      873,  874,  875,  876,  877,  878,  879,  880,  881,  882,
-
-      883,  884,  885,  886,  887,  888,  889,  890,  891,  892,
-      893,  894,  895,  896,  897,  898,  899,  900,  901,  902,
-      903,  904,  905,  906,  907,  908,  909,  910,  911,  912,
-      913,  914,  915,  916,  917,  918,  896,  919,  920,  895,
-      921,  922,  923,  924,  925,  926,  928,  929,  930,  931,
-      932,  933,  934,  935,  936,  937,  938,  939,  940,  941,
-      942,  943,  944,  945,  947,  948,  949,  950,  951,  952,
-      953,  954,  955,  956,  946,  957,  958,  959,  960,  961,
-      962,  963,  964,  965,  966,  967,  968,  969,  970,  971,
-      972,  973,  974,  975,  976,  977,  978,  979,  980,  982,
-
-      981,  927,  983,  984,  985,  986,  987,  988,  989,  990,
-      991,  992,  993,  994,  995,  996,  997,  998,  999, 1000,
-     1001, 1002, 1003, 1004, 1005, 1006,  980,  981, 1007, 1008,
-     1009, 1011, 1013, 1014, 1015, 1010, 1016, 1017, 1018, 1019,
-     1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029,
-     1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039,
-     1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049,
-     1050, 1051, 1052, 1012, 1053, 1054, 1055, 1056, 1057, 1058,
-     1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068,
-     1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078,
-
-     1079, 1080, 1081, 1082, 1060, 1083, 1084, 1085, 1086, 1087,
-     1061, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096,
-     1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106,
-     1107, 1108, 1109, 1110, 1111, 1112, 1114, 1115, 1116, 1117,
-     1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127,
-     1128, 1129, 1130, 1131, 1132, 1133, 1134, 1136, 1137, 1138,
-     1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148,
-     1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158,
-     1130, 1159, 1160, 1161, 1163, 1164, 1113, 1165, 1166, 1167,
-     1168, 1162, 1169, 1170, 1171, 1172, 1173, 1174, 1135, 1175,
-
-     1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185,
-     1186, 1187, 1188, 1190, 1191, 1192, 1193, 1189, 1194, 1195,
-     1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205,
-     1206, 1207, 1208, 1209, 1210, 1211, 1212, 1191, 1213, 1214,
-     1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224,
-     1225, 1226, 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1234,
-     1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244,
-     1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254,
-     1255, 1256, 1257, 1258, 1259, 1260, 1262, 1263, 1264, 1265,
-     1266, 1239, 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1274,
-
-     1275, 1276, 1277, 1278, 1279, 1280, 1281, 1282, 1283, 1284,
-     1285, 1286, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1294,
-     1295, 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303, 1304,
-     1305, 1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314,
-     1287, 1261, 1315, 1316, 1317, 1318, 1319, 1320, 1321, 1322,
-     1323, 1324, 1325, 1326, 1327, 1328, 1329, 1330, 1331, 1332,
-     1333, 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342,
-     1343, 1344, 1345, 1346, 1347, 1348, 1349, 1350, 1351, 1352,
-     1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362,
-     1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372,
-
-     1373, 1374, 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382,
-     1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392,
-     1393, 1394, 1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402,
-     1403, 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412,
-     1413, 1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422,
-     1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432,
-     1433, 1434, 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442,
-     1443, 1444, 1445, 1446, 1447, 1448, 1449, 1450, 1451, 1452,
-       12,   12,   12,   12,   12,   36,   36,   36,   36,   36,
-       80,  292,   80,   80,   80,   99,  398,   99,  510,   99,
-
-      101,  101,  101,  101,  101,  116,  116,  116,  116,  116,
-      178,  101,  178,  178,  178,  200,  200,  200,  817,  816,
-      815,  814,  813,  812,  811,  810,  809,  808,  806,  805,
-      804,  803,  802,  801,  800,  799,  798,  797,  796,  795,
-      792,  791,  784,  783,  782,  781,  780,  779,  778,  777,
-      776,  775,  774,  773,  772,  771,  770,  769,  768,  767,
-      766,  765,  764,  763,  762,  761,  760,  759,  758,  757,
-      756,  753,  752,  751,  750,  749,  748,  747,  746,  745,
-      744,  743,  742,  741,  740,  739,  738,  737,  736,  735,
-      734,  733,  732,  731,  730,  729,  728,  727,  726,  725,
-
-      724,  723,  722,  721,  718,  715,  714,  709,  708,  707,
-      706,  705,  704,  703,  702,  701,  700,  699,  696,  695,
-      694,  693,  692,  691,  690,  689,  688,  687,  686,  685,
-      684,  683,  682,  681,  680,  679,  678,  677,  676,  675,
-      674,  673,  670,  669,  668,  667,  666,  665,  664,  663,
-      662,  661,  660,  659,  658,  657,  656,  655,  652,  651,
-      650,  649,  648,  647,  646,  645,  644,  643,  642,  641,
-      640,  639,  638,  637,  636,  635,  634,  633,  632,  631,
-      630,  629,  628,  627,  626,  625,  624,  623,  622,  621,
-      617,  616,  615,  614,  613,  612,  611,  610,  609,  608,
-
-      607,  606,  605,  604,  603,  602,  601,  600,  599,  598,
-      597,  596,  595,  594,  593,  592,  591,  590,  589,  588,
-      587,  586,  585,  584,  583,  582,  581,  580,  579,  578,
-      577,  576,  575,  574,  573,  572,  571,  570,  569,  568,
-      567,  566,  565,  564,  563,  562,  561,  560,  559,  558,
-      557,  556,  555,  554,  553,  552,  551,  550,  549,  548,
-      547,  544,  543,  542,  541,  540,  539,  538,  535,  534,
-      533,  532,  531,  530,  529,  528,  527,  526,  525,  524,
-      520,  519,  518,  517,  516,  515,  514,  512,  511,  509,
-      508,  505,  504,  503,  502,  499,  498,  497,  496,  495,
-
-      494,  493,  492,  491,  490,  487,  486,  485,  482,  481,
-      480,  479,  478,  477,  476,  473,  472,  471,  470,  469,
-      468,  467,  466,  465,  464,  461,  460,  459,  458,  457,
-      454,  453,  452,  451,  450,  449,  448,  447,  446,  441,
-      440,  439,  438,  437,  436,  435,  434,  433,  432,  431,
-      430,  427,  426,  425,  424,  421,  420,  419,  418,  417,
-      416,  415,  414,  411,  410,  408,  407,  402,  397,  394,
-      391,  390,  389,  388,  386,  385,  384,  383,  382,  381,
-      380,  379,  378,  377,  376,  375,  374,  373,  370,  369,
-      368,  367,  366,  365,  364,  363,  362,  361,  360,  359,
-
-      355,  354,  353,  352,  351,  350,  349,  348,  344,  343,
-      342,  341,  340,  339,  338,  337,  336,  335,  334,  333,
-      332,  331,  330,  329,  328,  327,  326,  325,  324,  323,
-      322,  321,  320,  319,  318,  317,  313,  312,  311,  310,
-      309,  308,  306,  201,  303,  301,  299,  296,  295,  293,
-      291,  284,  283,  282,  280,  279,  277,  276,  275,  274,
-      259,  258,  254,  251,  250,  249,  248,  247,  245,  244,
-      243,  242,  239,  238,  237,  236,  235,  234,  233,  232,
-      231,  227,  226,  223,  220,  219,  218,  217,  214,  213,
-      212,  208,  207,  206,  205,  201,  194,  191,  190,  188,
-
-      186,  185,  177,  162,  143,  121,  110,  107,  106,  104,
-       43,  100,   98,   97,   88,   43, 1453,   11, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453
+       45,   45,   45,   45,   90,   90,   90,   45,  128,  197,
+      111,   45,  129,  160,  180,  130,  131,  161,  114,   45,
+      242,  824,  155,   45,  243,   45,  118,  162,  132,  152,
+      156,  153,  157,  154,  112,  166,  197,  158,  159,  167,
+      180,  175,  168,  181,  113,   90,   90,   90,  102,  169,
+      170,  176,   85,   85,   85,  171,  177,  172,   81,  173,
+       82,   82,   82,   83,  180,   85,   85,   85,   89,  181,
+       89,   83,  113,   90,   90,   90,   83,  181,   81,  174,
+       84,   84,   84,  103,  190,  101,   83,  193,  196,  198,
+
+      183,   83,  101,  190,   83,  199,  211,  196,  223,   83,
+      224,  230,  226,  184,  231,  212,  213,  825,  232,  287,
+      204,  197,  190,  193,   83,  262,  196,  198,  227,  287,
+      101,  205,  199,  504,  101,  196,  505,  248,  101,  254,
+      255,  257,  271,  272,  258,  259,  101,  287,  280,  289,
+      101,  199,  101,  188,  203,  203,  203,  290,  263,  264,
+      265,  203,  203,  203,  203,  203,  203,  288,  288,  266,
+      299,  267,  289,  268,  269,  273,  270,  289,  283,  274,
+      296,  300,  302,  275,  203,  203,  203,  203,  203,  203,
+      304,  306,  296,  288,  291,  395,  317,  303,  299,  359,
+
+      292,  398,  390,  296,  318,  302,  348,  402,  300,  398,
+      319,  404,  404,  304,  409,  309,  412,  403,  306,  307,
+      307,  307,  426,  478,  398,  717,  307,  307,  307,  307,
+      307,  307,  399,  360,  406,  407,  466,  409,  432,  427,
+      404,  416,  433,  408,  412,  396,  467,  361,  717,  307,
+      307,  307,  307,  307,  307,  459,  460,  349,  517,  446,
+      350,  415,  415,  415,  447,  826,  541,  677,  415,  415,
+      415,  415,  415,  415,  487,  517,  492,  510,  488,  479,
+      493,  542,  511,  550,  623,  525,  517,  526,  551,  659,
+      660,  415,  415,  415,  415,  415,  415,  619,  718,  827,
+
+      723,  624,  625,  527,  678,  716,  724,  800,  719,  828,
+      448,  623,  525,  801,  526,  449,   45,   45,   45,  726,
+      727,  829,  830,   45,   45,   45,   45,   45,   45,  624,
+      792,  761,  814,  716,  762,  831,  832,  793,  833,  834,
+      835,  836,  837,  838,  794,  795,   45,   45,   45,   45,
+       45,   45,  796,  839,  840,  841,  797,  842,  843,  845,
+      814,  846,  847,  844,  848,  849,  850,  851,  852,  853,
+      854,  855,  856,  857,  858,  859,  860,  861,  863,  864,
+      865,  862,  866,  867,  868,  869,  870,  871,  872,  873,
+      874,  875,  876,  877,  878,  879,  880,  881,  882,  883,
+
+      884,  885,  886,  887,  888,  889,  890,  891,  892,  893,
+      894,  895,  896,  897,  898,  899,  900,  901,  902,  903,
+      904,  905,  906,  907,  908,  909,  910,  911,  912,  913,
+      914,  915,  916,  917,  918,  919,  920,  921,  922,  923,
+      924,  925,  926,  904,  927,  928,  903,  929,  930,  931,
+      932,  933,  934,  935,  937,  938,  939,  940,  941,  942,
+      943,  944,  945,  946,  947,  948,  949,  950,  951,  952,
+      953,  954,  956,  957,  958,  959,  960,  961,  962,  963,
+      964,  965,  955,  966,  967,  968,  969,  970,  971,  972,
+      973,  974,  975,  976,  977,  978,  979,  980,  981,  982,
+
+      983,  984,  985,  986,  987,  988,  989,  991,  990,  936,
+      992,  993,  994,  995,  996,  997,  998,  999, 1000, 1001,
+     1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011,
+     1012, 1013, 1014, 1015,  989,  990, 1016, 1017, 1018, 1019,
+     1021, 1023, 1024, 1025, 1020, 1026, 1027, 1028, 1029, 1030,
+     1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040,
+     1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050,
+     1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060,
+     1061, 1062, 1022, 1063, 1064, 1065, 1066, 1067, 1068, 1069,
+     1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079,
+
+     1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089,
+     1090, 1091, 1092, 1070, 1093, 1094, 1095, 1096, 1097, 1071,
+     1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107,
+     1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117,
+     1118, 1119, 1120, 1121, 1122, 1123, 1125, 1126, 1127, 1128,
+     1129, 1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, 1138,
+     1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1148, 1149,
+     1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, 1159,
+     1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169,
+     1141, 1170, 1171, 1172, 1173, 1175, 1124, 1176, 1177, 1178,
+
+     1179, 1180, 1174, 1181, 1182, 1183, 1184, 1185, 1186, 1147,
+     1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196,
+     1197, 1198, 1199, 1200, 1202, 1203, 1204, 1205, 1201, 1206,
+     1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216,
+     1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1203, 1225,
+     1226, 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235,
+     1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245,
+     1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255,
+     1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265,
+     1266, 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1275, 1276,
+
+     1277, 1278, 1279, 1252, 1280, 1281, 1282, 1283, 1284, 1285,
+     1286, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1294, 1295,
+     1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303, 1304, 1305,
+     1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314, 1315,
+     1316, 1317, 1318, 1319, 1320, 1321, 1322, 1323, 1324, 1325,
+     1326, 1327, 1300, 1274, 1328, 1329, 1330, 1331, 1332, 1333,
+     1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, 1343,
+     1344, 1345, 1346, 1347, 1348, 1349, 1350, 1351, 1352, 1353,
+     1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 1363,
+     1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373,
+
+     1374, 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1383,
+     1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, 1393,
+     1394, 1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402, 1403,
+     1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413,
+     1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, 1423,
+     1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433,
+     1434, 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443,
+     1444, 1445, 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453,
+     1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1463,
+     1464, 1465,   12,   12,   12,   12,   12,   36,   36,   36,
+
+       36,   36,   80,  294,   80,   80,   80,   99,  401,   99,
+      514,   99,  101,  101,  101,  101,  101,  116,  116,  116,
+      116,  116,  179,  101,  179,  179,  179,  201,  201,  201,
+      818,  817,  816,  815,  813,  812,  811,  810,  809,  808,
+      807,  806,  805,  804,  803,  802,  799,  798,  791,  790,
+      789,  788,  787,  786,  785,  784,  783,  782,  781,  780,
+      779,  778,  777,  776,  775,  774,  773,  772,  771,  770,
+      769,  768,  767,  766,  765,  764,  763,  760,  759,  758,
+      757,  756,  755,  754,  753,  752,  751,  750,  749,  748,
+      747,  746,  745,  744,  743,  742,  741,  740,  739,  738,
+
+      737,  736,  735,  734,  733,  732,  731,  730,  729,  728,
+      725,  722,  721,  720,  715,  714,  713,  712,  711,  710,
+      709,  708,  707,  706,  705,  702,  701,  700,  699,  698,
+      697,  696,  695,  694,  693,  692,  691,  690,  689,  688,
+      687,  686,  685,  684,  683,  682,  681,  680,  679,  676,
+      675,  674,  673,  672,  671,  670,  669,  668,  667,  666,
+      665,  664,  663,  662,  661,  658,  657,  656,  655,  654,
+      653,  652,  651,  650,  649,  648,  647,  646,  645,  644,
+      643,  642,  641,  640,  639,  638,  637,  636,  635,  634,
+      633,  632,  631,  630,  629,  628,  627,  626,  622,  621,
+
+      620,  619,  618,  617,  616,  615,  614,  613,  612,  611,
+      610,  609,  608,  607,  606,  605,  604,  603,  602,  601,
+      600,  599,  598,  597,  596,  595,  594,  593,  592,  591,
+      590,  589,  588,  587,  586,  585,  584,  583,  582,  581,
+      580,  579,  578,  577,  576,  575,  574,  573,  572,  571,
+      570,  569,  568,  567,  566,  565,  564,  563,  562,  561,
+      560,  559,  558,  557,  556,  555,  554,  553,  552,  549,
+      548,  547,  546,  545,  544,  543,  540,  539,  538,  537,
+      536,  535,  534,  533,  532,  531,  530,  529,  528,  524,
+      523,  522,  521,  520,  519,  518,  516,  515,  513,  512,
+
+      509,  508,  507,  506,  503,  502,  501,  500,  499,  498,
+      497,  496,  495,  494,  491,  490,  489,  486,  485,  484,
+      483,  482,  481,  480,  477,  476,  475,  474,  473,  472,
+      471,  470,  469,  468,  465,  464,  463,  462,  461,  458,
+      457,  456,  455,  454,  453,  452,  451,  450,  445,  444,
+      443,  442,  441,  440,  439,  438,  437,  436,  435,  434,
+      431,  430,  429,  428,  425,  424,  423,  422,  421,  420,
+      419,  418,  417,  414,  413,  411,  410,  405,  400,  397,
+      394,  393,  392,  391,  389,  388,  387,  386,  385,  384,
+      383,  382,  381,  380,  379,  378,  377,  376,  373,  372,
+
+      371,  370,  369,  368,  367,  366,  365,  364,  363,  362,
+      358,  357,  356,  355,  354,  353,  352,  351,  347,  346,
+      345,  344,  343,  342,  341,  340,  339,  338,  337,  336,
+      335,  334,  333,  332,  331,  330,  329,  328,  327,  326,
+      325,  324,  323,  322,  321,  320,  316,  315,  314,  313,
+      312,  311,  310,  308,  202,  305,  303,  301,  298,  297,
+      295,  293,  286,  285,  284,  282,  281,  279,  278,  277,
+      276,  261,  260,  256,  253,  252,  251,  250,  249,  247,
+      246,  245,  244,  241,  240,  239,  238,  237,  236,  235,
+      234,  233,  229,  228,  225,  222,  221,  220,  219,  216,
+
+      215,  214,  210,  209,  208,  207,  206,  202,  195,  192,
+      191,  189,  187,  186,  178,  163,  144,  122,  110,  107,
+      106,  104,   43,  100,   98,   97,   88,   43, 1466,   11,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+
+     1466
     } ;
 
-static const flex_int16_t yy_chk[1890] =
+static const flex_int16_t yy_chk[1902] =
     {   0,
         0,    1,    1,    1,    0,    1,    1,    0,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,   21,  604,
-        3,    3,    3,   21,    1,    1,    3,    0,  604,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,   21,  609,
+        3,    3,    3,   21,    1,    1,    3,    0,  609,    1,
         4,    4,    4,   13,    1,   13,    4,   27,   28,    1,
        57,    1,    5,    5,    5,   26,   32,    1,    1,   33,
-        6,    6,    6,    7,    7,    7,    1,    7,    0,    8,
+        6,    6,    6,    7,    7,    7,    1,    7,  722,    8,
         8,    8,    1,    8,   57,   27,   28,  723,   26,    1,
         1,    2,    2,    2,   32,    2,    2,   33,    2,    2,
         2,    2,    2,    2,    2,    2,    2,    2,    9,    9,
@@ -1464,8 +1470,8 @@ static const flex_int16_t yy_chk[1890] =
 
         6,   20,   20,   20,    2,   37,    9,   37,   42,    2,
        42,    2,   20,   51,   10,   54,   31,    2,    2,   52,
-      128,  128,   25,   65,   25,   66,    2,   25,   25,   25,
-       65,  263,    2,   66,  263,   20,   51,  724,   54,    2,
+      129,  129,   25,   65,   25,   66,    2,   25,   25,   25,
+       65,  265,    2,   66,  265,   20,   51,  724,   54,    2,
         2,   15,   15,   15,   15,   15,   15,   15,   15,   15,
        15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
        15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
@@ -1475,189 +1481,192 @@ static const flex_int16_t yy_chk[1890] =
 
        15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
        15,   15,   17,   48,   17,   17,   17,   19,   56,   19,
-       19,   19,   44,   59,   22,   17,   22,   22,   22,   64,
-       19,   93,   61,   55,   67,   61,  428,   22,   61,   48,
-       61,   56,   61,   55,   67,  725,   67,   63,   17,   59,
-       73,  428,   64,   19,   73,   59,   55,   44,   63,   93,
-       22,   45,   70,   64,   73,  115,   70,   45,   63,   45,
-       45,   55,   45,   75,   45,   45,   45,   75,   58,   69,
-       69,   45,   45,   69,   45,   58,   70,  726,  115,   69,
+       19,   19,   44,   59,   22,   17,   22,   22,   22,  726,
+       19,   64,   61,   55,   67,   61,   93,   22,   61,   48,
+       61,   56,   61,   55,   67,  115,   67,   75,   17,   59,
+      109,   75,   63,   19,   64,   59,   55,   44,   59,   96,
+       22,   45,   70,   63,   93,   64,   70,   45,  115,   45,
+       45,   55,   45,   63,   45,   45,   45,  109,   58,   69,
+       69,   45,   45,   69,   45,   58,   70,   96,  727,   69,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
 
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   58,   89,   89,   89,   58,   62,  278,
-       71,   58,   62,   91,  278,   62,   62,   96,   78,   58,
-       76,  727,   72,   58,   76,   58,   58,   76,   62,   71,
-       72,   71,   72,   71,   76,   76,   77,   72,   72,   91,
-       76,   78,   81,   81,   81,   96,   77,   90,   90,   90,
-      101,   78,  728,   81,   92,  133,   78,  133,  105,   77,
-       82,   77,   82,   82,   82,   83,   94,   83,   95,  108,
-       83,   83,   83,   82,   77,   84,   81,   84,   84,   84,
-       92,   77,   85,   85,   85,  101,  105,  109,   84,  111,
-
-      103,  112,   94,   85,   95,  108,   82,  103,  113,  124,
-      114,  148,  119,  138,  135,  148,  138,  153,  124,  124,
-      138,   84,  159,  159,  109,  179,   85,  111,  112,  119,
-      135,  165,  165,  729,  182,  103,  113,  114,  161,  103,
-      119,  161,  161,  103,  730,  153,  166,  153,  171,  174,
-      166,  103,  164,  179,  166,  103,  180,  103,  103,  118,
-      118,  118,  182,  241,  731,  181,  118,  118,  118,  118,
-      118,  118,  184,  183,  189,  171,  174,  192,  283,  193,
-      732,  195,  180,  199,  197,  164,  164,  164,  181,  118,
-      118,  118,  118,  118,  118,  184,  164,  189,  164,  183,
-
-      164,  164,  204,  164,  195,  192,  193,  197,  285,  288,
-      199,  202,  202,  202,  241,  250,  211,  241,  202,  202,
-      202,  202,  202,  202,  211,  204,  293,  294,  283,  297,
-      211,  285,  288,  300,  316,  363,  293,  733,  296,  296,
-      307,  202,  202,  202,  202,  202,  202,  296,  692,  250,
-      322,  316,  297,  335,  322,  692,  294,  351,  335,  345,
-      345,  300,  401,  250,  305,  305,  305,  351,  576,  307,
-      734,  305,  305,  305,  305,  305,  305,  372,  376,  393,
-      387,  372,  376,  387,  393,  411,  521,  411,  437,  736,
-      401,  363,  413,  437,  305,  305,  305,  305,  305,  305,
-
-      522,  523,  558,  558,  335,  576,  523,  618,  619,  335,
-      711,  620,  411,  521,  411,  412,  412,  412,  625,  625,
-      413,  620,  412,  412,  412,  412,  412,  412,  522,  660,
-      623,  619,  660,  696,  737,  618,  623,  738,  711,  696,
-      739,  740,  742,  693,  693,  412,  412,  412,  412,  412,
-      412,  693,  741,  743,  744,  693,  745,  741,  746,  747,
-      748,  749,  752,  753,  754,  755,  758,  759,  760,  761,
-      762,  763,  764,  765,  762,  766,  767,  768,  770,  771,
-      772,  773,  774,  775,  776,  777,  778,  779,  780,  781,
+       45,   45,   45,   58,   89,   89,   89,   58,   62,  112,
+       71,   58,   62,   73,   91,   62,   62,   73,   78,   58,
+      149,  728,   72,   58,  149,   58,   58,   73,   62,   71,
+       72,   71,   72,   71,   77,   76,  112,   72,   72,   76,
+       91,   78,   76,   92,   77,   90,   90,   90,  101,   76,
+       76,   78,   81,   81,   81,   76,   78,   77,   82,   77,
+       82,   82,   82,   81,   94,   85,   85,   85,   83,   92,
+       83,   82,   77,   83,   83,   83,   85,   95,   84,   77,
+       84,   84,   84,  101,  105,  103,   81,  108,  111,  113,
+
+       94,   84,  103,  119,   82,  114,  125,  154,  134,   85,
+      134,  139,  136,   95,  139,  125,  125,  729,  139,  180,
+      119,  172,  105,  108,   84,  165,  111,  113,  136,  183,
+      103,  119,  114,  390,  103,  154,  390,  154,  103,  160,
+      160,  162,  166,  166,  162,  162,  103,  180,  172,  182,
+      103,  175,  103,  103,  118,  118,  118,  183,  165,  165,
+      165,  118,  118,  118,  118,  118,  118,  181,  184,  165,
+      193,  165,  182,  165,  165,  167,  165,  185,  175,  167,
+      190,  194,  196,  167,  118,  118,  118,  118,  118,  118,
+      198,  200,  205,  181,  184,  285,  213,  280,  193,  252,
+
+      185,  287,  280,  190,  213,  196,  243,  295,  194,  290,
+      213,  296,  309,  198,  299,  205,  302,  295,  200,  203,
+      203,  203,  319,  366,  287,  624,  203,  203,  203,  203,
+      203,  203,  290,  252,  298,  298,  354,  299,  325,  319,
+      296,  309,  325,  298,  302,  285,  354,  252,  624,  203,
+      203,  203,  203,  203,  203,  348,  348,  243,  404,  338,
+      243,  307,  307,  307,  338,  730,  432,  581,  307,  307,
+      307,  307,  307,  307,  375,  416,  379,  396,  375,  366,
+      379,  432,  396,  441,  525,  414,  404,  414,  441,  563,
+      563,  307,  307,  307,  307,  307,  307,  527,  625,  731,
+
+      629,  526,  527,  416,  581,  623,  629,  702,  625,  732,
+      338,  525,  414,  702,  414,  338,  415,  415,  415,  631,
+      631,  733,  734,  415,  415,  415,  415,  415,  415,  526,
+      698,  666,  717,  623,  666,  735,  736,  698,  737,  738,
+      739,  740,  741,  743,  699,  699,  415,  415,  415,  415,
+      415,  415,  699,  744,  745,  746,  699,  747,  748,  749,
+      717,  750,  751,  748,  752,  753,  754,  755,  756,  759,
+      760,  761,  762,  765,  766,  767,  768,  769,  770,  771,
+      772,  769,  773,  774,  775,  777,  778,  779,  780,  781,
       782,  783,  784,  785,  786,  787,  788,  789,  790,  791,
 
-      792,  793,  794,  796,  797,  798,  799,  800,  801,  802,
-      803,  804,  806,  807,  808,  809,  810,  811,  812,  813,
+      792,  793,  794,  795,  796,  797,  798,  799,  800,  801,
+      803,  804,  805,  806,  807,  808,  809,  810,  811,  813,
       814,  815,  816,  817,  818,  819,  820,  821,  822,  823,
-      824,  826,  827,  828,  829,  830,  807,  831,  832,  806,
-      833,  834,  836,  837,  838,  839,  840,  842,  843,  844,
-      845,  846,  847,  848,  849,  850,  851,  852,  853,  854,
-      855,  856,  857,  858,  859,  861,  862,  863,  865,  866,
-      867,  868,  869,  870,  858,  871,  872,  873,  874,  875,
-      876,  877,  878,  879,  880,  881,  883,  884,  885,  886,
-      887,  888,  889,  890,  891,  892,  893,  894,  895,  897,
-
-      896,  839,  898,  899,  900,  901,  903,  904,  905,  906,
-      907,  908,  909,  910,  912,  913,  914,  915,  916,  917,
-      918,  919,  920,  921,  922,  923,  895,  896,  924,  925,
-      927,  928,  929,  930,  931,  927,  932,  933,  934,  935,
-      936,  937,  938,  939,  940,  941,  942,  943,  944,  945,
-      946,  947,  948,  949,  951,  952,  953,  954,  955,  956,
-      957,  958,  959,  960,  961,  963,  964,  966,  967,  968,
-      969,  970,  971,  928,  972,  973,  974,  975,  976,  977,
-      979,  980,  981,  982,  983,  984,  986,  987,  988,  989,
-      990,  991,  994,  995,  996,  997,  998,  999, 1000, 1001,
-
-     1002, 1003, 1004, 1005,  980, 1006, 1007, 1010, 1012, 1013,
-      981, 1014, 1015, 1016, 1017, 1018, 1019, 1021, 1022, 1023,
-     1024, 1026, 1027, 1028, 1029, 1030, 1033, 1034, 1035, 1036,
-     1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046,
-     1047, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057,
-     1058, 1059, 1060, 1061, 1062, 1064, 1065, 1066, 1067, 1068,
-     1069, 1070, 1071, 1072, 1073, 1074, 1075, 1077, 1078, 1079,
-     1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089,
-     1060, 1090, 1091, 1092, 1093, 1094, 1042, 1096, 1099, 1100,
-     1101, 1092, 1102, 1103, 1104, 1105, 1106, 1107, 1065, 1109,
-
-     1110, 1111, 1112, 1113, 1114, 1115, 1117, 1119, 1122, 1124,
-     1126, 1127, 1128, 1129, 1130, 1132, 1133, 1128, 1135, 1136,
-     1137, 1138, 1139, 1140, 1141, 1142, 1144, 1145, 1146, 1147,
-     1148, 1149, 1150, 1151, 1152, 1153, 1154, 1130, 1157, 1159,
-     1160, 1161, 1162, 1163, 1165, 1166, 1167, 1168, 1169, 1170,
-     1172, 1173, 1175, 1176, 1177, 1178, 1180, 1181, 1182, 1183,
-     1184, 1185, 1187, 1189, 1191, 1192, 1193, 1194, 1195, 1196,
-     1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206,
-     1207, 1208, 1209, 1210, 1210, 1211, 1212, 1213, 1214, 1215,
-     1216, 1191, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224,
-
-     1225, 1226, 1227, 1228, 1229, 1230, 1231, 1233, 1234, 1236,
-     1237, 1238, 1239, 1240, 1244, 1245, 1248, 1249, 1252, 1253,
-     1254, 1255, 1256, 1257, 1258, 1259, 1261, 1262, 1264, 1266,
-     1267, 1268, 1269, 1270, 1272, 1273, 1274, 1275, 1276, 1277,
-     1239, 1211, 1278, 1279, 1280, 1281, 1282, 1283, 1284, 1286,
-     1287, 1288, 1289, 1291, 1292, 1293, 1294, 1295, 1296, 1298,
-     1299, 1300, 1302, 1304, 1305, 1306, 1307, 1308, 1309, 1310,
-     1311, 1312, 1313, 1314, 1316, 1317, 1321, 1324, 1326, 1328,
-     1329, 1331, 1332, 1333, 1334, 1335, 1336, 1338, 1340, 1341,
-     1342, 1343, 1344, 1345, 1346, 1347, 1349, 1350, 1351, 1352,
-
-     1353, 1354, 1355, 1356, 1359, 1360, 1361, 1362, 1363, 1365,
-     1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373, 1374, 1375,
-     1376, 1378, 1380, 1382, 1383, 1384, 1385, 1386, 1388, 1389,
-     1390, 1392, 1393, 1395, 1396, 1399, 1400, 1401, 1402, 1403,
-     1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413,
-     1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, 1423,
-     1425, 1427, 1428, 1429, 1430, 1431, 1432, 1436, 1437, 1438,
-     1439, 1441, 1442, 1444, 1445, 1446, 1447, 1448, 1450, 1451,
-     1454, 1454, 1454, 1454, 1454, 1455, 1455, 1455, 1455, 1455,
-     1456, 1462, 1456, 1456, 1456, 1457, 1463, 1457, 1464, 1457,
-
-     1458, 1458, 1458, 1458, 1458, 1459, 1459, 1459, 1459, 1459,
-     1460, 1465, 1460, 1460, 1460, 1461, 1461, 1461,  722,  721,
-      720,  719,  717,  716,  715,  714,  713,  712,  710,  708,
-      707,  706,  705,  704,  703,  702,  701,  700,  699,  698,
-      695,  694,  691,  690,  689,  688,  687,  686,  685,  684,
-      683,  682,  681,  680,  679,  678,  677,  676,  675,  674,
-      673,  672,  670,  669,  668,  667,  666,  665,  664,  663,
-      661,  659,  658,  657,  656,  655,  654,  653,  652,  651,
-      650,  649,  648,  647,  646,  645,  644,  642,  641,  640,
-      639,  638,  637,  636,  635,  634,  633,  632,  631,  630,
-
-      629,  628,  627,  626,  624,  622,  621,  617,  616,  615,
-      613,  612,  610,  609,  608,  607,  606,  605,  602,  601,
-      600,  599,  598,  597,  596,  595,  594,  593,  592,  591,
-      589,  588,  587,  586,  585,  584,  583,  582,  580,  579,
-      578,  577,  575,  574,  573,  572,  571,  570,  569,  567,
-      566,  565,  564,  563,  562,  561,  560,  559,  557,  556,
-      555,  554,  553,  552,  551,  550,  549,  548,  547,  546,
-      544,  543,  542,  541,  540,  539,  538,  537,  536,  535,
-      534,  533,  532,  531,  530,  529,  528,  527,  526,  525,
-      519,  517,  514,  513,  512,  511,  509,  508,  507,  505,
-
-      504,  501,  500,  499,  498,  497,  496,  495,  494,  493,
-      492,  491,  490,  489,  488,  487,  486,  485,  484,  483,
-      482,  481,  480,  479,  478,  477,  475,  473,  472,  471,
-      470,  469,  468,  467,  466,  465,  464,  463,  462,  460,
-      459,  458,  457,  456,  455,  454,  453,  452,  451,  450,
-      449,  448,  447,  446,  445,  444,  443,  441,  440,  439,
-      438,  436,  435,  434,  433,  432,  430,  429,  427,  426,
-      424,  423,  422,  421,  420,  419,  417,  416,  415,  414,
-      409,  408,  406,  405,  404,  403,  402,  400,  399,  397,
-      394,  392,  391,  389,  388,  386,  385,  384,  383,  382,
-
-      381,  380,  379,  378,  377,  375,  374,  373,  371,  370,
-      369,  368,  366,  365,  364,  362,  361,  360,  359,  358,
-      357,  356,  355,  354,  352,  350,  349,  348,  347,  346,
-      344,  343,  342,  341,  340,  339,  338,  337,  336,  334,
-      333,  332,  331,  330,  329,  328,  327,  326,  325,  324,
-      323,  321,  320,  319,  318,  315,  314,  313,  312,  311,
-      310,  309,  308,  304,  302,  299,  298,  295,  291,  284,
-      282,  281,  280,  279,  277,  276,  275,  274,  273,  272,
-      271,  270,  269,  268,  267,  266,  265,  264,  262,  261,
-      260,  259,  258,  257,  256,  255,  254,  253,  252,  251,
-
-      249,  248,  247,  246,  245,  244,  243,  242,  240,  239,
-      238,  237,  236,  235,  234,  233,  231,  230,  229,  228,
-      227,  226,  225,  224,  223,  222,  221,  220,  219,  218,
-      217,  216,  215,  214,  213,  212,  210,  209,  208,  207,
-      206,  205,  203,  200,  198,  196,  194,  191,  190,  188,
-      185,  177,  176,  175,  173,  172,  170,  169,  168,  167,
-      163,  162,  160,  158,  157,  156,  155,  154,  152,  151,
-      150,  149,  147,  146,  145,  144,  143,  142,  141,  140,
-      139,  137,  136,  134,  132,  131,  130,  129,  127,  126,
-      125,  123,  122,  121,  120,  116,  110,  107,  106,  104,
-
-       99,   98,   79,   74,   68,   60,   53,   50,   49,   47,
-       43,   41,   39,   38,   24,   14,   11, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453,
-     1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453
+      824,  825,  826,  827,  828,  829,  830,  831,  832,  834,
+      835,  836,  837,  814,  838,  839,  813,  840,  841,  842,
+      844,  845,  846,  847,  848,  850,  851,  852,  853,  854,
+      855,  856,  857,  858,  859,  860,  861,  862,  863,  864,
+      865,  866,  867,  869,  870,  871,  873,  874,  875,  876,
+      877,  878,  866,  879,  880,  881,  882,  883,  884,  885,
+      886,  887,  888,  889,  891,  892,  893,  894,  895,  896,
+
+      897,  898,  899,  900,  901,  902,  903,  905,  904,  847,
+      906,  907,  908,  909,  910,  912,  913,  914,  915,  916,
+      917,  918,  919,  921,  922,  923,  924,  925,  926,  927,
+      928,  929,  930,  931,  903,  904,  932,  933,  934,  936,
+      937,  938,  939,  940,  936,  941,  942,  943,  944,  945,
+      946,  947,  948,  949,  950,  951,  952,  953,  954,  955,
+      956,  957,  958,  960,  961,  962,  963,  964,  965,  966,
+      967,  968,  969,  970,  972,  973,  975,  976,  977,  978,
+      979,  980,  937,  981,  982,  983,  984,  985,  986,  988,
+      989,  990,  991,  992,  993,  994,  996,  997,  998,  999,
+
+     1000, 1001, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011,
+     1012, 1013, 1014,  989, 1015, 1016, 1017, 1020, 1022,  990,
+     1023, 1024, 1025, 1026, 1027, 1028, 1029, 1031, 1032, 1033,
+     1034, 1036, 1037, 1038, 1039, 1040, 1043, 1044, 1045, 1046,
+     1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056,
+     1057, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067,
+     1068, 1069, 1070, 1071, 1072, 1074, 1075, 1076, 1077, 1078,
+     1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1088, 1089,
+     1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099,
+     1070, 1100, 1101, 1102, 1103, 1104, 1052, 1105, 1107, 1110,
+
+     1111, 1112, 1103, 1113, 1114, 1115, 1116, 1117, 1118, 1076,
+     1120, 1121, 1122, 1123, 1124, 1125, 1126, 1128, 1130, 1133,
+     1135, 1137, 1138, 1139, 1140, 1141, 1143, 1144, 1139, 1145,
+     1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1156, 1157,
+     1158, 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1141, 1166,
+     1169, 1171, 1172, 1173, 1174, 1175, 1177, 1178, 1179, 1180,
+     1181, 1182, 1184, 1185, 1187, 1188, 1189, 1190, 1192, 1193,
+     1194, 1195, 1196, 1197, 1199, 1201, 1203, 1204, 1206, 1207,
+     1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217,
+     1218, 1219, 1220, 1221, 1222, 1223, 1223, 1224, 1225, 1226,
+
+     1227, 1228, 1229, 1203, 1230, 1231, 1232, 1233, 1234, 1235,
+     1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1246,
+     1247, 1249, 1250, 1251, 1252, 1253, 1257, 1258, 1261, 1262,
+     1265, 1266, 1267, 1268, 1269, 1270, 1271, 1272, 1274, 1275,
+     1277, 1279, 1280, 1281, 1282, 1283, 1285, 1286, 1287, 1288,
+     1289, 1290, 1252, 1224, 1291, 1292, 1293, 1294, 1295, 1296,
+     1297, 1299, 1300, 1301, 1302, 1304, 1305, 1306, 1307, 1308,
+     1309, 1311, 1312, 1313, 1315, 1317, 1318, 1319, 1320, 1321,
+     1322, 1323, 1324, 1325, 1326, 1327, 1329, 1330, 1334, 1337,
+     1339, 1341, 1342, 1344, 1345, 1346, 1347, 1348, 1349, 1351,
+
+     1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1362, 1363,
+     1364, 1365, 1366, 1367, 1368, 1369, 1372, 1373, 1374, 1375,
+     1376, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 1385, 1386,
+     1387, 1388, 1389, 1391, 1393, 1395, 1396, 1397, 1398, 1399,
+     1401, 1402, 1403, 1405, 1406, 1408, 1409, 1412, 1413, 1414,
+     1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, 1423, 1424,
+     1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, 1434,
+     1435, 1436, 1438, 1440, 1441, 1442, 1443, 1444, 1445, 1449,
+     1450, 1451, 1452, 1454, 1455, 1457, 1458, 1459, 1460, 1461,
+     1463, 1464, 1467, 1467, 1467, 1467, 1467, 1468, 1468, 1468,
+
+     1468, 1468, 1469, 1475, 1469, 1469, 1469, 1470, 1476, 1470,
+     1477, 1470, 1471, 1471, 1471, 1471, 1471, 1472, 1472, 1472,
+     1472, 1472, 1473, 1478, 1473, 1473, 1473, 1474, 1474, 1474,
+      721,  720,  719,  718,  716,  714,  713,  712,  711,  710,
+      709,  708,  707,  706,  705,  704,  701,  700,  697,  696,
+      695,  694,  693,  692,  691,  690,  689,  688,  687,  686,
+      685,  684,  683,  682,  681,  680,  679,  678,  676,  675,
+      674,  673,  672,  671,  670,  669,  667,  665,  664,  663,
+      662,  661,  660,  659,  658,  657,  656,  655,  654,  653,
+      652,  651,  650,  648,  647,  646,  645,  644,  643,  642,
+
+      641,  640,  639,  638,  637,  636,  635,  634,  633,  632,
+      630,  628,  627,  626,  622,  621,  620,  618,  617,  615,
+      614,  613,  612,  611,  610,  607,  606,  605,  604,  603,
+      602,  601,  600,  599,  598,  597,  596,  594,  593,  592,
+      591,  590,  589,  588,  587,  585,  584,  583,  582,  580,
+      579,  578,  577,  576,  575,  574,  572,  571,  570,  569,
+      568,  567,  566,  565,  564,  562,  561,  560,  559,  558,
+      557,  556,  555,  554,  553,  552,  551,  549,  548,  547,
+      546,  545,  544,  543,  542,  541,  540,  539,  538,  537,
+      536,  535,  534,  533,  532,  531,  530,  529,  523,  521,
+
+      518,  517,  516,  515,  513,  512,  511,  509,  508,  505,
+      504,  503,  502,  501,  500,  499,  498,  497,  496,  495,
+      494,  493,  492,  491,  490,  489,  488,  487,  486,  485,
+      484,  483,  482,  481,  479,  477,  476,  475,  474,  473,
+      472,  471,  470,  469,  468,  467,  466,  464,  463,  462,
+      461,  460,  459,  458,  457,  456,  455,  454,  453,  452,
+      451,  450,  449,  448,  447,  445,  444,  443,  442,  440,
+      439,  438,  437,  436,  434,  433,  431,  430,  428,  427,
+      426,  425,  424,  423,  421,  420,  419,  418,  417,  412,
+      411,  409,  408,  407,  406,  405,  403,  402,  400,  397,
+
+      395,  394,  392,  391,  389,  388,  387,  386,  385,  384,
+      383,  382,  381,  380,  378,  377,  376,  374,  373,  372,
+      371,  369,  368,  367,  365,  364,  363,  362,  361,  360,
+      359,  358,  357,  355,  353,  352,  351,  350,  349,  347,
+      346,  345,  344,  343,  342,  341,  340,  339,  337,  336,
+      335,  334,  333,  332,  331,  330,  329,  328,  327,  326,
+      324,  323,  322,  321,  318,  317,  316,  315,  314,  313,
+      312,  311,  310,  306,  304,  301,  300,  297,  293,  286,
+      284,  283,  282,  281,  279,  278,  277,  276,  275,  274,
+      273,  272,  271,  270,  269,  268,  267,  266,  264,  263,
+
+      262,  261,  260,  259,  258,  257,  256,  255,  254,  253,
+      251,  250,  249,  248,  247,  246,  245,  244,  242,  241,
+      240,  239,  238,  237,  236,  235,  233,  232,  231,  230,
+      229,  228,  227,  226,  225,  224,  223,  222,  221,  220,
+      219,  218,  217,  216,  215,  214,  212,  211,  210,  209,
+      208,  207,  206,  204,  201,  199,  197,  195,  192,  191,
+      189,  186,  178,  177,  176,  174,  173,  171,  170,  169,
+      168,  164,  163,  161,  159,  158,  157,  156,  155,  153,
+      152,  151,  150,  148,  147,  146,  145,  144,  143,  142,
+      141,  140,  138,  137,  135,  133,  132,  131,  130,  128,
+
+      127,  126,  124,  123,  122,  121,  120,  116,  110,  107,
+      106,  104,   99,   98,   79,   74,   68,   60,   53,   50,
+       49,   47,   43,   41,   39,   38,   24,   14,   11, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+     1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466, 1466,
+
+     1466
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -1666,7 +1675,7 @@ static char *yy_last_accepting_cpos;
 extern int yy_flex_debug;
 int yy_flex_debug = 1;
 
-static const flex_int16_t yy_rule_linenum[174] =
+static const flex_int16_t yy_rule_linenum[175] =
     {   0,
       145,  147,  149,  154,  155,  160,  161,  162,  174,  177,
       182,  189,  198,  207,  216,  225,  234,  243,  253,  262,
@@ -1684,9 +1693,9 @@ static const flex_int16_t yy_rule_linenum[174] =
      1261, 1270, 1279, 1288, 1297, 1306, 1315, 1324, 1333, 1342,
      1351, 1360, 1369, 1378, 1387, 1396, 1406, 1416, 1426, 1436,
      1446, 1456, 1466, 1476, 1486, 1495, 1504, 1513, 1522, 1531,
-     1540, 1549, 1560, 1573, 1586, 1601, 1700, 1705, 1710, 1715,
-     1716, 1717, 1718, 1719, 1720, 1722, 1740, 1753, 1758, 1762,
-     1764, 1766, 1768
+     1540, 1549, 1560, 1571, 1584, 1597, 1612, 1711, 1716, 1721,
+     1726, 1727, 1728, 1729, 1730, 1731, 1733, 1751, 1764, 1769,
+     1773, 1775, 1777, 1779
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -1739,7 +1748,7 @@ using namespace isc::dhcp;
 
 /* To avoid the call to exit... oops! */
 #define YY_FATAL_ERROR(msg) isc::dhcp::Parser4Context::fatal(msg)
-#line 1743 "dhcp4_lexer.cc"
+#line 1751 "dhcp4_lexer.cc"
 /* noyywrap disables automatic rewinding for the next file to parse. Since we
    always parse only a single string, there's no need to do any wraps. And
    using yywrap requires linking with -lfl, which provides the default yywrap
@@ -1765,8 +1774,8 @@ using namespace isc::dhcp;
    by moving it ahead by yyleng bytes. yyleng specifies the length of the
    currently matched token. */
 #define YY_USER_ACTION  driver.loc_.columns(yyleng);
-#line 1769 "dhcp4_lexer.cc"
-#line 1770 "dhcp4_lexer.cc"
+#line 1777 "dhcp4_lexer.cc"
+#line 1778 "dhcp4_lexer.cc"
 
 #define INITIAL 0
 #define COMMENT 1
@@ -2094,7 +2103,7 @@ YY_DECL
     }
 
 
-#line 2098 "dhcp4_lexer.cc"
+#line 2106 "dhcp4_lexer.cc"
 
        while ( /*CONSTCOND*/1 )                /* loops until end-of-file is reached */
                {
@@ -2123,13 +2132,13 @@ yy_match:
                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                                {
                                yy_current_state = (int) yy_def[yy_current_state];
-                               if ( yy_current_state >= 1454 )
+                               if ( yy_current_state >= 1467 )
                                        yy_c = yy_meta[yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
                        ++yy_cp;
                        }
-               while ( yy_current_state != 1453 );
+               while ( yy_current_state != 1466 );
                yy_cp = (yy_last_accepting_cpos);
                yy_current_state = (yy_last_accepting_state);
 
@@ -2148,13 +2157,13 @@ do_action:      /* This label is used only to access EOF actions. */
                        {
                        if ( yy_act == 0 )
                                fprintf( stderr, "--scanner backing up\n" );
-                       else if ( yy_act < 174 )
+                       else if ( yy_act < 175 )
                                fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
                                         (long)yy_rule_linenum[yy_act], yytext );
-                       else if ( yy_act == 174 )
+                       else if ( yy_act == 175 )
                                fprintf( stderr, "--accepting default rule (\"%s\")\n",
                                         yytext );
-                       else if ( yy_act == 175 )
+                       else if ( yy_act == 176 )
                                fprintf( stderr, "--(end of buffer or a NUL)\n" );
                        else
                                fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
@@ -4054,6 +4063,20 @@ YY_RULE_SETUP
 case 153:
 YY_RULE_SETUP
 #line 1560 "dhcp4_lexer.ll"
+{
+    switch(driver.ctx_) {
+    case isc::dhcp::Parser4Context::DHCP4:
+    case isc::dhcp::Parser4Context::SUBNET4:
+    case isc::dhcp::Parser4Context::SHARED_NETWORK:
+        return isc::dhcp::Dhcp4Parser::make_AUTHORITATIVE(driver.loc_);
+    default:
+        return isc::dhcp::Dhcp4Parser::make_STRING("authoritative", driver.loc_);
+    }
+}
+       YY_BREAK
+case 154:
+YY_RULE_SETUP
+#line 1571 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4067,9 +4090,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 154:
+case 155:
 YY_RULE_SETUP
-#line 1573 "dhcp4_lexer.ll"
+#line 1584 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4083,9 +4106,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 155:
+case 156:
 YY_RULE_SETUP
-#line 1586 "dhcp4_lexer.ll"
+#line 1597 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -4099,9 +4122,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 156:
+case 157:
 YY_RULE_SETUP
-#line 1601 "dhcp4_lexer.ll"
+#line 1612 "dhcp4_lexer.ll"
 {
     /* A string has been matched. It contains the actual string and single quotes.
        We need to get those quotes out of the way and just use its content, e.g.
@@ -4201,65 +4224,65 @@ YY_RULE_SETUP
     return isc::dhcp::Dhcp4Parser::make_STRING(decoded, driver.loc_);
 }
        YY_BREAK
-case 157:
-/* rule 157 can match eol */
+case 158:
+/* rule 158 can match eol */
 YY_RULE_SETUP
-#line 1700 "dhcp4_lexer.ll"
+#line 1711 "dhcp4_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
 }
        YY_BREAK
-case 158:
-/* rule 158 can match eol */
+case 159:
+/* rule 159 can match eol */
 YY_RULE_SETUP
-#line 1705 "dhcp4_lexer.ll"
+#line 1716 "dhcp4_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
 }
        YY_BREAK
-case 159:
+case 160:
 YY_RULE_SETUP
-#line 1710 "dhcp4_lexer.ll"
+#line 1721 "dhcp4_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
 }
        YY_BREAK
-case 160:
+case 161:
 YY_RULE_SETUP
-#line 1715 "dhcp4_lexer.ll"
+#line 1726 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); }
        YY_BREAK
-case 161:
+case 162:
 YY_RULE_SETUP
-#line 1716 "dhcp4_lexer.ll"
+#line 1727 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); }
        YY_BREAK
-case 162:
+case 163:
 YY_RULE_SETUP
-#line 1717 "dhcp4_lexer.ll"
+#line 1728 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); }
        YY_BREAK
-case 163:
+case 164:
 YY_RULE_SETUP
-#line 1718 "dhcp4_lexer.ll"
+#line 1729 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); }
        YY_BREAK
-case 164:
+case 165:
 YY_RULE_SETUP
-#line 1719 "dhcp4_lexer.ll"
+#line 1730 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); }
        YY_BREAK
-case 165:
+case 166:
 YY_RULE_SETUP
-#line 1720 "dhcp4_lexer.ll"
+#line 1731 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); }
        YY_BREAK
-case 166:
+case 167:
 YY_RULE_SETUP
-#line 1722 "dhcp4_lexer.ll"
+#line 1733 "dhcp4_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -4278,9 +4301,9 @@ YY_RULE_SETUP
     return isc::dhcp::Dhcp4Parser::make_INTEGER(integer, driver.loc_);
 }
        YY_BREAK
-case 167:
+case 168:
 YY_RULE_SETUP
-#line 1740 "dhcp4_lexer.ll"
+#line 1751 "dhcp4_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -4294,43 +4317,43 @@ YY_RULE_SETUP
     return isc::dhcp::Dhcp4Parser::make_FLOAT(fp, driver.loc_);
 }
        YY_BREAK
-case 168:
+case 169:
 YY_RULE_SETUP
-#line 1753 "dhcp4_lexer.ll"
+#line 1764 "dhcp4_lexer.ll"
 {
     string tmp(yytext);
     return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_);
 }
        YY_BREAK
-case 169:
+case 170:
 YY_RULE_SETUP
-#line 1758 "dhcp4_lexer.ll"
+#line 1769 "dhcp4_lexer.ll"
 {
    return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_);
 }
        YY_BREAK
-case 170:
+case 171:
 YY_RULE_SETUP
-#line 1762 "dhcp4_lexer.ll"
+#line 1773 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
        YY_BREAK
-case 171:
+case 172:
 YY_RULE_SETUP
-#line 1764 "dhcp4_lexer.ll"
+#line 1775 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
        YY_BREAK
-case 172:
+case 173:
 YY_RULE_SETUP
-#line 1766 "dhcp4_lexer.ll"
+#line 1777 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
        YY_BREAK
-case 173:
+case 174:
 YY_RULE_SETUP
-#line 1768 "dhcp4_lexer.ll"
+#line 1779 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1770 "dhcp4_lexer.ll"
+#line 1781 "dhcp4_lexer.ll"
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp4Parser::make_END(driver.loc_);
@@ -4354,12 +4377,12 @@ case YY_STATE_EOF(INITIAL):
     BEGIN(DIR_EXIT);
 }
        YY_BREAK
-case 174:
+case 175:
 YY_RULE_SETUP
-#line 1793 "dhcp4_lexer.ll"
+#line 1804 "dhcp4_lexer.ll"
 ECHO;
        YY_BREAK
-#line 4363 "dhcp4_lexer.cc"
+#line 4385 "dhcp4_lexer.cc"
 
        case YY_END_OF_BUFFER:
                {
@@ -4678,7 +4701,7 @@ static int yy_get_next_buffer (void)
                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                        {
                        yy_current_state = (int) yy_def[yy_current_state];
-                       if ( yy_current_state >= 1454 )
+                       if ( yy_current_state >= 1467 )
                                yy_c = yy_meta[yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -4711,11 +4734,11 @@ static int yy_get_next_buffer (void)
        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                {
                yy_current_state = (int) yy_def[yy_current_state];
-               if ( yy_current_state >= 1454 )
+               if ( yy_current_state >= 1467 )
                        yy_c = yy_meta[yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-       yy_is_jam = (yy_current_state == 1453);
+       yy_is_jam = (yy_current_state == 1466);
 
                return yy_is_jam ? 0 : yy_current_state;
 }
@@ -5464,7 +5487,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 1793 "dhcp4_lexer.ll"
+#line 1804 "dhcp4_lexer.ll"
 
 
 using namespace isc::dhcp;

diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc
index 92b9fddcfa913d4065184847927b605a32d2f7c2..c8fbfd1c07e6d4e20709c26ab803fbd9eb1c1c7c 100644 (file)
--- 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.0.4.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Skeleton implementation for Bison LALR(1) parsers in C++
 
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018 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
@@ -35,7 +35,7 @@
 
 // First part of user declarations.
 
-#line 39 "dhcp4_parser.cc" // lalr1.cc:404
+#line 39 "dhcp4_parser.cc" // lalr1.cc:407
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -49,13 +49,13 @@
 
 // User implementation prologue.
 
-#line 53 "dhcp4_parser.cc" // lalr1.cc:412
+#line 53 "dhcp4_parser.cc" // lalr1.cc:415
 // Unqualified %code blocks.
-#line 34 "dhcp4_parser.yy" // lalr1.cc:413
+#line 34 "dhcp4_parser.yy" // lalr1.cc:416
 
 #include <dhcp4/parser_context.h>
 
-#line 59 "dhcp4_parser.cc" // lalr1.cc:413
+#line 59 "dhcp4_parser.cc" // lalr1.cc:416
 
 
 #ifndef YY_
@@ -70,6 +70,15 @@
 # endif
 #endif
 
+// Whether we are compiled with exception support.
+#ifndef YY_EXCEPTIONS
+# if defined __GNUC__ && !defined __EXCEPTIONS
+#  define YY_EXCEPTIONS 0
+# else
+#  define YY_EXCEPTIONS 1
+# endif
+#endif
+
 #define YYRHSLOC(Rhs, K) ((Rhs)[K].location)
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
@@ -106,7 +115,7 @@
     {                                           \
       *yycdebug_ << Title << ' ';               \
       yy_print_ (*yycdebug_, Symbol);           \
-      *yycdebug_ << std::endl;                  \
+      *yycdebug_ << '\n';                       \
     }                                           \
   } while (false)
 
@@ -125,9 +134,9 @@
 #else // !PARSER4_DEBUG
 
 # define YYCDEBUG if (false) std::cerr
-# define YY_SYMBOL_PRINT(Title, Symbol)  YYUSE(Symbol)
-# define YY_REDUCE_PRINT(Rule)           static_cast<void>(0)
-# define YY_STACK_PRINT()                static_cast<void>(0)
+# define YY_SYMBOL_PRINT(Title, Symbol)  YYUSE (Symbol)
+# define YY_REDUCE_PRINT(Rule)           static_cast<void> (0)
+# define YY_STACK_PRINT()                static_cast<void> (0)
 
 #endif // !PARSER4_DEBUG
 
@@ -139,9 +148,9 @@
 #define YYERROR         goto yyerrorlab
 #define YYRECOVERING()  (!!yyerrstatus_)
 
-#line 14 "dhcp4_parser.yy" // lalr1.cc:479
+#line 14 "dhcp4_parser.yy" // lalr1.cc:491
 namespace isc { namespace dhcp {
-#line 145 "dhcp4_parser.cc" // lalr1.cc:479
+#line 154 "dhcp4_parser.cc" // lalr1.cc:491
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -202,24 +211,20 @@ namespace isc { namespace dhcp {
 
 
   // by_state.
-  inline
   Dhcp4Parser::by_state::by_state ()
     : state (empty_state)
   {}
 
-  inline
   Dhcp4Parser::by_state::by_state (const by_state& other)
     : state (other.state)
   {}
 
-  inline
   void
   Dhcp4Parser::by_state::clear ()
   {
     state = empty_state;
   }
 
-  inline
   void
   Dhcp4Parser::by_state::move (by_state& that)
   {
@@ -227,12 +232,10 @@ namespace isc { namespace dhcp {
     that.clear ();
   }
 
-  inline
   Dhcp4Parser::by_state::by_state (state_type s)
     : state (s)
   {}
 
-  inline
   Dhcp4Parser::symbol_number_type
   Dhcp4Parser::by_state::type_get () const
   {
@@ -242,41 +245,76 @@ namespace isc { namespace dhcp {
       return yystos_[state];
   }
 
-  inline
   Dhcp4Parser::stack_symbol_type::stack_symbol_type ()
   {}
 
+  Dhcp4Parser::stack_symbol_type::stack_symbol_type (const stack_symbol_type& that)
+    : super_type (that.state, that.location)
+  {
+    switch (that.type_get ())
+    {
+      case 185: // value
+      case 189: // map_value
+      case 230: // socket_type
+      case 233: // outbound_interface_value
+      case 255: // db_type
+      case 337: // hr_mode
+      case 484: // ncr_protocol_value
+      case 492: // replace_client_name_value
+        value.copy< ElementPtr > (that.value);
+        break;
+
+      case 168: // "boolean"
+        value.copy< bool > (that.value);
+        break;
+
+      case 167: // "floating point"
+        value.copy< double > (that.value);
+        break;
+
+      case 166: // "integer"
+        value.copy< int64_t > (that.value);
+        break;
+
+      case 165: // "constant string"
+        value.copy< std::string > (that.value);
+        break;
+
+      default:
+        break;
+    }
+
+  }
 
-  inline
   Dhcp4Parser::stack_symbol_type::stack_symbol_type (state_type s, symbol_type& that)
     : super_type (s, that.location)
   {
-      switch (that.type_get ())
-    {
-      case 184: // value
-      case 188: // map_value
-      case 228: // socket_type
-      case 231: // outbound_interface_value
-      case 253: // db_type
-      case 335: // hr_mode
-      case 482: // ncr_protocol_value
-      case 490: // replace_client_name_value
+    switch (that.type_get ())
+    {
+      case 185: // value
+      case 189: // map_value
+      case 230: // socket_type
+      case 233: // outbound_interface_value
+      case 255: // db_type
+      case 337: // hr_mode
+      case 484: // ncr_protocol_value
+      case 492: // replace_client_name_value
         value.move< ElementPtr > (that.value);
         break;
 
-      case 167: // "boolean"
+      case 168: // "boolean"
         value.move< bool > (that.value);
         break;
 
-      case 166: // "floating point"
+      case 167: // "floating point"
         value.move< double > (that.value);
         break;
 
-      case 165: // "integer"
+      case 166: // "integer"
         value.move< int64_t > (that.value);
         break;
 
-      case 164: // "constant string"
+      case 165: // "constant string"
         value.move< std::string > (that.value);
         break;
 
@@ -288,37 +326,36 @@ namespace isc { namespace dhcp {
     that.type = empty_symbol;
   }
 
-  inline
   Dhcp4Parser::stack_symbol_type&
   Dhcp4Parser::stack_symbol_type::operator= (const stack_symbol_type& that)
   {
     state = that.state;
-      switch (that.type_get ())
-    {
-      case 184: // value
-      case 188: // map_value
-      case 228: // socket_type
-      case 231: // outbound_interface_value
-      case 253: // db_type
-      case 335: // hr_mode
-      case 482: // ncr_protocol_value
-      case 490: // replace_client_name_value
+    switch (that.type_get ())
+    {
+      case 185: // value
+      case 189: // map_value
+      case 230: // socket_type
+      case 233: // outbound_interface_value
+      case 255: // db_type
+      case 337: // hr_mode
+      case 484: // ncr_protocol_value
+      case 492: // replace_client_name_value
         value.copy< ElementPtr > (that.value);
         break;
 
-      case 167: // "boolean"
+      case 168: // "boolean"
         value.copy< bool > (that.value);
         break;
 
-      case 166: // "floating point"
+      case 167: // "floating point"
         value.copy< double > (that.value);
         break;
 
-      case 165: // "integer"
+      case 166: // "integer"
         value.copy< int64_t > (that.value);
         break;
 
-      case 164: // "constant string"
+      case 165: // "constant string"
         value.copy< std::string > (that.value);
         break;
 
@@ -332,7 +369,6 @@ namespace isc { namespace dhcp {
 
 
   template <typename Base>
-  inline
   void
   Dhcp4Parser::yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const
   {
@@ -358,88 +394,88 @@ namespace isc { namespace dhcp {
         << yysym.location << ": ";
     switch (yytype)
     {
-            case 164: // "constant string"
+            case 165: // "constant string"
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< std::string > (); }
-#line 366 "dhcp4_parser.cc" // lalr1.cc:636
+#line 402 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 165: // "integer"
+      case 166: // "integer"
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< int64_t > (); }
-#line 373 "dhcp4_parser.cc" // lalr1.cc:636
+#line 409 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 166: // "floating point"
+      case 167: // "floating point"
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< double > (); }
-#line 380 "dhcp4_parser.cc" // lalr1.cc:636
+#line 416 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 167: // "boolean"
+      case 168: // "boolean"
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< bool > (); }
-#line 387 "dhcp4_parser.cc" // lalr1.cc:636
+#line 423 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 184: // value
+      case 185: // value
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 394 "dhcp4_parser.cc" // lalr1.cc:636
+#line 430 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 188: // map_value
+      case 189: // map_value
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 401 "dhcp4_parser.cc" // lalr1.cc:636
+#line 437 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 228: // socket_type
+      case 230: // socket_type
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 408 "dhcp4_parser.cc" // lalr1.cc:636
+#line 444 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 231: // outbound_interface_value
+      case 233: // outbound_interface_value
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 415 "dhcp4_parser.cc" // lalr1.cc:636
+#line 451 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 253: // db_type
+      case 255: // db_type
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 422 "dhcp4_parser.cc" // lalr1.cc:636
+#line 458 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 335: // hr_mode
+      case 337: // hr_mode
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 429 "dhcp4_parser.cc" // lalr1.cc:636
+#line 465 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 482: // ncr_protocol_value
+      case 484: // ncr_protocol_value
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 436 "dhcp4_parser.cc" // lalr1.cc:636
+#line 472 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
-      case 490: // replace_client_name_value
+      case 492: // replace_client_name_value
 
-#line 243 "dhcp4_parser.yy" // lalr1.cc:636
+#line 244 "dhcp4_parser.yy" // lalr1.cc:644
         { yyoutput << yysym.value.template as< ElementPtr > (); }
-#line 443 "dhcp4_parser.cc" // lalr1.cc:636
+#line 479 "dhcp4_parser.cc" // lalr1.cc:644
         break;
 
 
@@ -450,7 +486,6 @@ namespace isc { namespace dhcp {
   }
 #endif
 
-  inline
   void
   Dhcp4Parser::yypush_ (const char* m, state_type s, symbol_type& sym)
   {
@@ -458,7 +493,6 @@ namespace isc { namespace dhcp {
     yypush_ (m, t);
   }
 
-  inline
   void
   Dhcp4Parser::yypush_ (const char* m, stack_symbol_type& s)
   {
@@ -467,9 +501,8 @@ namespace isc { namespace dhcp {
     yystack_.push (s);
   }
 
-  inline
   void
-  Dhcp4Parser::yypop_ (unsigned int n)
+  Dhcp4Parser::yypop_ (unsigned n)
   {
     yystack_.pop (n);
   }
@@ -501,7 +534,7 @@ namespace isc { namespace dhcp {
   }
 #endif // PARSER4_DEBUG
 
-  inline Dhcp4Parser::state_type
+  Dhcp4Parser::state_type
   Dhcp4Parser::yy_lr_goto_state_ (state_type yystate, int yysym)
   {
     int yyr = yypgoto_[yysym - yyntokens_] + yystate;
@@ -511,13 +544,13 @@ namespace isc { namespace dhcp {
       return yydefgoto_[yysym - yyntokens_];
   }
 
-  inline bool
+  bool
   Dhcp4Parser::yy_pact_value_is_default_ (int yyvalue)
   {
     return yyvalue == yypact_ninf_;
   }
 
-  inline bool
+  bool
   Dhcp4Parser::yy_table_value_is_error_ (int yyvalue)
   {
     return yyvalue == yytable_ninf_;
@@ -544,11 +577,11 @@ namespace isc { namespace dhcp {
     /// The return value of parse ().
     int yyresult;
 
-    // FIXME: This shoud be completely indented.  It is not yet to
-    // avoid gratuitous conflicts when merging into the master branch.
+#if YY_EXCEPTIONS
     try
+#endif // YY_EXCEPTIONS
       {
-    YYCDEBUG << "Starting parse" << std::endl;
+    YYCDEBUG << "Starting parse\n";
 
 
     /* Initialize the stack.  The initial state will be set in
@@ -560,7 +593,7 @@ namespace isc { namespace dhcp {
 
     // A new symbol was pushed on the stack.
   yynewstate:
-    YYCDEBUG << "Entering state " << yystack_[0].state << std::endl;
+    YYCDEBUG << "Entering state " << yystack_[0].state << '\n';
 
     // Accept?
     if (yystack_[0].state == yyfinal_)
@@ -570,7 +603,6 @@ namespace isc { namespace dhcp {
 
     // Backup.
   yybackup:
-
     // Try to take a decision without lookahead.
     yyn = yypact_[yystack_[0].state];
     if (yy_pact_value_is_default_ (yyn))
@@ -580,16 +612,20 @@ namespace isc { namespace dhcp {
     if (yyla.empty ())
       {
         YYCDEBUG << "Reading a token: ";
+#if YY_EXCEPTIONS
         try
+#endif // YY_EXCEPTIONS
           {
             symbol_type yylookahead (yylex (ctx));
             yyla.move (yylookahead);
           }
+#if YY_EXCEPTIONS
         catch (const syntax_error& yyexc)
           {
             error (yyexc);
             goto yyerrlab1;
           }
+#endif // YY_EXCEPTIONS
       }
     YY_SYMBOL_PRINT ("Next token is", yyla);
 
@@ -633,36 +669,36 @@ namespace isc { namespace dhcp {
     yylen = yyr2_[yyn];
     {
       stack_symbol_type yylhs;
-      yylhs.state = yy_lr_goto_state_(yystack_[yylen].state, yyr1_[yyn]);
+      yylhs.state = yy_lr_goto_state_ (yystack_[yylen].state, yyr1_[yyn]);
       /* Variants are always initialized to an empty instance of the
          correct type. The default '$$ = $1' action is NOT applied
          when using variants.  */
-        switch (yyr1_[yyn])
-    {
-      case 184: // value
-      case 188: // map_value
-      case 228: // socket_type
-      case 231: // outbound_interface_value
-      case 253: // db_type
-      case 335: // hr_mode
-      case 482: // ncr_protocol_value
-      case 490: // replace_client_name_value
+      switch (yyr1_[yyn])
+    {
+      case 185: // value
+      case 189: // map_value
+      case 230: // socket_type
+      case 233: // outbound_interface_value
+      case 255: // db_type
+      case 337: // hr_mode
+      case 484: // ncr_protocol_value
+      case 492: // replace_client_name_value
         yylhs.value.build< ElementPtr > ();
         break;
 
-      case 167: // "boolean"
+      case 168: // "boolean"
         yylhs.value.build< bool > ();
         break;
 
-      case 166: // "floating point"
+      case 167: // "floating point"
         yylhs.value.build< double > ();
         break;
 
-      case 165: // "integer"
+      case 166: // "integer"
         yylhs.value.build< int64_t > ();
         break;
 
-      case 164: // "constant string"
+      case 165: // "constant string"
         yylhs.value.build< std::string > ();
         break;
 
@@ -671,293 +707,296 @@ namespace isc { namespace dhcp {
     }
 
 
-      // Compute the default @$.
+      // Default location.
       {
         slice<stack_symbol_type, stack_type> slice (yystack_, yylen);
         YYLLOC_DEFAULT (yylhs.location, slice, yylen);
+        yyerror_range[1].location = yylhs.location;
       }
 
       // Perform the reduction.
       YY_REDUCE_PRINT (yyn);
+#if YY_EXCEPTIONS
       try
+#endif // YY_EXCEPTIONS
         {
           switch (yyn)
             {
   case 2:
-#line 252 "dhcp4_parser.yy" // lalr1.cc:859
+#line 253 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.NO_KEYWORD; }
-#line 690 "dhcp4_parser.cc" // lalr1.cc:859
+#line 729 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 4:
-#line 253 "dhcp4_parser.yy" // lalr1.cc:859
+#line 254 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.CONFIG; }
-#line 696 "dhcp4_parser.cc" // lalr1.cc:859
+#line 735 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 6:
-#line 254 "dhcp4_parser.yy" // lalr1.cc:859
+#line 255 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.DHCP4; }
-#line 702 "dhcp4_parser.cc" // lalr1.cc:859
+#line 741 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 8:
-#line 255 "dhcp4_parser.yy" // lalr1.cc:859
+#line 256 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.INTERFACES_CONFIG; }
-#line 708 "dhcp4_parser.cc" // lalr1.cc:859
+#line 747 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 10:
-#line 256 "dhcp4_parser.yy" // lalr1.cc:859
+#line 257 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.SUBNET4; }
-#line 714 "dhcp4_parser.cc" // lalr1.cc:859
+#line 753 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 12:
-#line 257 "dhcp4_parser.yy" // lalr1.cc:859
+#line 258 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.POOLS; }
-#line 720 "dhcp4_parser.cc" // lalr1.cc:859
+#line 759 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 14:
-#line 258 "dhcp4_parser.yy" // lalr1.cc:859
+#line 259 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.RESERVATIONS; }
-#line 726 "dhcp4_parser.cc" // lalr1.cc:859
+#line 765 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 16:
-#line 259 "dhcp4_parser.yy" // lalr1.cc:859
+#line 260 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.DHCP4; }
-#line 732 "dhcp4_parser.cc" // lalr1.cc:859
+#line 771 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 18:
-#line 260 "dhcp4_parser.yy" // lalr1.cc:859
+#line 261 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.OPTION_DEF; }
-#line 738 "dhcp4_parser.cc" // lalr1.cc:859
+#line 777 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 20:
-#line 261 "dhcp4_parser.yy" // lalr1.cc:859
+#line 262 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.OPTION_DATA; }
-#line 744 "dhcp4_parser.cc" // lalr1.cc:859
+#line 783 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 22:
-#line 262 "dhcp4_parser.yy" // lalr1.cc:859
+#line 263 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.HOOKS_LIBRARIES; }
-#line 750 "dhcp4_parser.cc" // lalr1.cc:859
+#line 789 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 24:
-#line 263 "dhcp4_parser.yy" // lalr1.cc:859
+#line 264 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.DHCP_DDNS; }
-#line 756 "dhcp4_parser.cc" // lalr1.cc:859
+#line 795 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 26:
-#line 264 "dhcp4_parser.yy" // lalr1.cc:859
+#line 265 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.LOGGING; }
-#line 762 "dhcp4_parser.cc" // lalr1.cc:859
+#line 801 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 28:
-#line 265 "dhcp4_parser.yy" // lalr1.cc:859
+#line 266 "dhcp4_parser.yy" // lalr1.cc:870
     { ctx.ctx_ = ctx.CONFIG_CONTROL; }
-#line 768 "dhcp4_parser.cc" // lalr1.cc:859
+#line 807 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 30:
-#line 273 "dhcp4_parser.yy" // lalr1.cc:859
+#line 274 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); }
-#line 774 "dhcp4_parser.cc" // lalr1.cc:859
+#line 813 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 31:
-#line 274 "dhcp4_parser.yy" // lalr1.cc:859
+#line 275 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); }
-#line 780 "dhcp4_parser.cc" // lalr1.cc:859
+#line 819 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 32:
-#line 275 "dhcp4_parser.yy" // lalr1.cc:859
+#line 276 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); }
-#line 786 "dhcp4_parser.cc" // lalr1.cc:859
+#line 825 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 33:
-#line 276 "dhcp4_parser.yy" // lalr1.cc:859
+#line 277 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); }
-#line 792 "dhcp4_parser.cc" // lalr1.cc:859
+#line 831 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 34:
-#line 277 "dhcp4_parser.yy" // lalr1.cc:859
+#line 278 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); }
-#line 798 "dhcp4_parser.cc" // lalr1.cc:859
+#line 837 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 35:
-#line 278 "dhcp4_parser.yy" // lalr1.cc:859
+#line 279 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 804 "dhcp4_parser.cc" // lalr1.cc:859
+#line 843 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 36:
-#line 279 "dhcp4_parser.yy" // lalr1.cc:859
+#line 280 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 810 "dhcp4_parser.cc" // lalr1.cc:859
+#line 849 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 37:
-#line 282 "dhcp4_parser.yy" // lalr1.cc:859
+#line 283 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Push back the JSON value on the stack
     ctx.stack_.push_back(yystack_[0].value.as< ElementPtr > ());
 }
-#line 819 "dhcp4_parser.cc" // lalr1.cc:859
+#line 858 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 38:
-#line 287 "dhcp4_parser.yy" // lalr1.cc:859
+#line 288 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // 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 830 "dhcp4_parser.cc" // lalr1.cc:859
+#line 869 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 39:
-#line 292 "dhcp4_parser.yy" // lalr1.cc:859
+#line 293 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // 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 840 "dhcp4_parser.cc" // lalr1.cc:859
+#line 879 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 40:
-#line 298 "dhcp4_parser.yy" // lalr1.cc:859
+#line 299 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
-#line 846 "dhcp4_parser.cc" // lalr1.cc:859
+#line 885 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 43:
-#line 305 "dhcp4_parser.yy" // lalr1.cc:859
+#line 306 "dhcp4_parser.yy" // lalr1.cc:870
     {
                   // map containing a single entry
                   ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ());
                   }
-#line 855 "dhcp4_parser.cc" // lalr1.cc:859
+#line 894 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 44:
-#line 309 "dhcp4_parser.yy" // lalr1.cc:859
+#line 310 "dhcp4_parser.yy" // lalr1.cc:870
     {
                   // 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 > ());
                   }
-#line 865 "dhcp4_parser.cc" // lalr1.cc:859
+#line 904 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 45:
-#line 316 "dhcp4_parser.yy" // lalr1.cc:859
+#line 317 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
 }
-#line 874 "dhcp4_parser.cc" // lalr1.cc:859
+#line 913 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 46:
-#line 319 "dhcp4_parser.yy" // lalr1.cc:859
+#line 320 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // list parsing complete. Put any sanity checking here
 }
-#line 882 "dhcp4_parser.cc" // lalr1.cc:859
+#line 921 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 49:
-#line 327 "dhcp4_parser.yy" // lalr1.cc:859
+#line 328 "dhcp4_parser.yy" // lalr1.cc:870
     {
                   // List consisting of a single element.
                   ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ());
                   }
-#line 891 "dhcp4_parser.cc" // lalr1.cc:859
+#line 930 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 50:
-#line 331 "dhcp4_parser.yy" // lalr1.cc:859
+#line 332 "dhcp4_parser.yy" // lalr1.cc:870
     {
                   // List ending with , and a value.
                   ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ());
                   }
-#line 900 "dhcp4_parser.cc" // lalr1.cc:859
+#line 939 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 51:
-#line 338 "dhcp4_parser.yy" // lalr1.cc:859
+#line 339 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // List parsing about to start
 }
-#line 908 "dhcp4_parser.cc" // lalr1.cc:859
+#line 947 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 52:
-#line 340 "dhcp4_parser.yy" // lalr1.cc:859
+#line 341 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // list parsing complete. Put any sanity checking here
     //ctx.stack_.pop_back();
 }
-#line 917 "dhcp4_parser.cc" // lalr1.cc:859
+#line 956 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 55:
-#line 349 "dhcp4_parser.yy" // lalr1.cc:859
+#line 350 "dhcp4_parser.yy" // lalr1.cc:870
     {
                           ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
                           ctx.stack_.back()->add(s);
                           }
-#line 926 "dhcp4_parser.cc" // lalr1.cc:859
+#line 965 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 56:
-#line 353 "dhcp4_parser.yy" // lalr1.cc:859
+#line 354 "dhcp4_parser.yy" // lalr1.cc:870
     {
                           ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
                           ctx.stack_.back()->add(s);
                           }
-#line 935 "dhcp4_parser.cc" // lalr1.cc:859
+#line 974 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 57:
-#line 364 "dhcp4_parser.yy" // lalr1.cc:859
+#line 365 "dhcp4_parser.yy" // lalr1.cc:870
     {
     const std::string& where = ctx.contextName();
     const std::string& keyword = yystack_[1].value.as< std::string > ();
     error(yystack_[1].location,
           "got unexpected keyword \"" + keyword + "\" in " + where + " map.");
 }
-#line 946 "dhcp4_parser.cc" // lalr1.cc:859
+#line 985 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 58:
-#line 374 "dhcp4_parser.yy" // lalr1.cc:859
+#line 375 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // 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 957 "dhcp4_parser.cc" // lalr1.cc:859
+#line 996 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 59:
-#line 379 "dhcp4_parser.yy" // lalr1.cc:859
+#line 380 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // map parsing completed. If we ever want to do any wrap up
     // (maybe some sanity checking), this would be the best place
@@ -966,11 +1005,11 @@ namespace isc { namespace dhcp {
     // Dhcp4 is required
     ctx.require("Dhcp4", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
 }
-#line 970 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1009 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 68:
-#line 403 "dhcp4_parser.yy" // lalr1.cc:859
+#line 404 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // This code is executed when we're about to start parsing
     // the content of the map
@@ -979,293 +1018,302 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.DHCP4);
 }
-#line 983 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1022 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 69:
-#line 410 "dhcp4_parser.yy" // lalr1.cc:859
+#line 411 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // No global parameter is required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 993 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1032 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 70:
-#line 418 "dhcp4_parser.yy" // lalr1.cc:859
+#line 419 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the Dhcp4 map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1003 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1042 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
   case 71:
-#line 422 "dhcp4_parser.yy" // lalr1.cc:859
+#line 423 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // No global parameter is required
     // parsing completed
 }
-#line 1012 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1051 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 105:
-#line 466 "dhcp4_parser.yy" // lalr1.cc:859
+  case 106:
+#line 468 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("valid-lifetime", prf);
 }
-#line 1021 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1060 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 106:
-#line 471 "dhcp4_parser.yy" // lalr1.cc:859
+  case 107:
+#line 473 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("renew-timer", prf);
 }
-#line 1030 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1069 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 107:
-#line 476 "dhcp4_parser.yy" // lalr1.cc:859
+  case 108:
+#line 478 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rebind-timer", prf);
 }
-#line 1039 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1078 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 108:
-#line 481 "dhcp4_parser.yy" // lalr1.cc:859
+  case 109:
+#line 483 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("decline-probation-period", dpp);
 }
-#line 1048 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1087 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 109:
-#line 486 "dhcp4_parser.yy" // lalr1.cc:859
+  case 110:
+#line 488 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1056 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1095 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 110:
-#line 488 "dhcp4_parser.yy" // lalr1.cc:859
+  case 111:
+#line 490 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1066 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1105 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 111:
-#line 494 "dhcp4_parser.yy" // lalr1.cc:859
+  case 112:
+#line 496 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr echo(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("echo-client-id", echo);
 }
-#line 1075 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1114 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 112:
-#line 499 "dhcp4_parser.yy" // lalr1.cc:859
+  case 113:
+#line 501 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr match(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("match-client-id", match);
 }
-#line 1084 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1123 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 113:
-#line 505 "dhcp4_parser.yy" // lalr1.cc:859
+  case 114:
+#line 506 "dhcp4_parser.yy" // lalr1.cc:870
+    {
+    ElementPtr prf(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
+    ctx.stack_.back()->set("authoritative", prf);
+}
+#line 1132 "dhcp4_parser.cc" // lalr1.cc:870
+    break;
+
+  case 115:
+#line 512 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1095 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1143 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 114:
-#line 510 "dhcp4_parser.yy" // lalr1.cc:859
+  case 116:
+#line 517 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // No interfaces config param is required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1105 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1153 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 124:
-#line 529 "dhcp4_parser.yy" // lalr1.cc:859
+  case 126:
+#line 536 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the interfaces-config map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1115 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1163 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 125:
-#line 533 "dhcp4_parser.yy" // lalr1.cc:859
+  case 127:
+#line 540 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // No interfaces config param is required
     // parsing completed
 }
-#line 1124 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1172 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 126:
-#line 538 "dhcp4_parser.yy" // lalr1.cc:859
+  case 128:
+#line 545 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1135 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1183 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 127:
-#line 543 "dhcp4_parser.yy" // lalr1.cc:859
+  case 129:
+#line 550 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1144 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1192 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 128:
-#line 548 "dhcp4_parser.yy" // lalr1.cc:859
+  case 130:
+#line 555 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.DHCP_SOCKET_TYPE);
 }
-#line 1152 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1200 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 129:
-#line 550 "dhcp4_parser.yy" // lalr1.cc:859
+  case 131:
+#line 557 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("dhcp-socket-type", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 1161 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1209 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 130:
-#line 555 "dhcp4_parser.yy" // lalr1.cc:859
+  case 132:
+#line 562 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("raw", ctx.loc2pos(yystack_[0].location))); }
-#line 1167 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1215 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 131:
-#line 556 "dhcp4_parser.yy" // lalr1.cc:859
+  case 133:
+#line 563 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("udp", ctx.loc2pos(yystack_[0].location))); }
-#line 1173 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1221 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 132:
-#line 559 "dhcp4_parser.yy" // lalr1.cc:859
+  case 134:
+#line 566 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.OUTBOUND_INTERFACE);
 }
-#line 1181 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1229 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 133:
-#line 561 "dhcp4_parser.yy" // lalr1.cc:859
+  case 135:
+#line 568 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("outbound-interface", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 1190 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1238 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 134:
-#line 566 "dhcp4_parser.yy" // lalr1.cc:859
+  case 136:
+#line 573 "dhcp4_parser.yy" // lalr1.cc:870
     {
     yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("same-as-inbound", ctx.loc2pos(yystack_[0].location)));
 }
-#line 1198 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1246 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 135:
-#line 568 "dhcp4_parser.yy" // lalr1.cc:859
+  case 137:
+#line 575 "dhcp4_parser.yy" // lalr1.cc:870
     {
     yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("use-routing", ctx.loc2pos(yystack_[0].location)));
     }
-#line 1206 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1254 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 136:
-#line 572 "dhcp4_parser.yy" // lalr1.cc:859
+  case 138:
+#line 579 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("re-detect", b);
 }
-#line 1215 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1263 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 137:
-#line 578 "dhcp4_parser.yy" // lalr1.cc:859
+  case 139:
+#line 585 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1226 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1274 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 138:
-#line 583 "dhcp4_parser.yy" // lalr1.cc:859
+  case 140:
+#line 590 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // 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 1237 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1285 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 139:
-#line 590 "dhcp4_parser.yy" // lalr1.cc:859
+  case 141:
+#line 597 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1248 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1296 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 140:
-#line 595 "dhcp4_parser.yy" // lalr1.cc:859
+  case 142:
+#line 602 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1257 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1305 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 144:
-#line 605 "dhcp4_parser.yy" // lalr1.cc:859
+  case 146:
+#line 612 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1265 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1313 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 145:
-#line 607 "dhcp4_parser.yy" // lalr1.cc:859
+  case 147:
+#line 614 "dhcp4_parser.yy" // lalr1.cc:870
     {
 
     if ( (string(yystack_[0].value.as< std::string > ()) == "none") ||
@@ -1281,577 +1329,577 @@ namespace isc { namespace dhcp {
               ", supported values are: none, warn, fix, fix-del, del");
     }
 }
-#line 1285 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1333 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 146:
-#line 623 "dhcp4_parser.yy" // lalr1.cc:859
+  case 148:
+#line 630 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1296 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1344 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 147:
-#line 628 "dhcp4_parser.yy" // lalr1.cc:859
+  case 149:
+#line 635 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // 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 1307 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1355 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 148:
-#line 635 "dhcp4_parser.yy" // lalr1.cc:859
+  case 150:
+#line 642 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1318 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1366 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 149:
-#line 640 "dhcp4_parser.yy" // lalr1.cc:859
+  case 151:
+#line 647 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1327 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1375 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 154:
-#line 653 "dhcp4_parser.yy" // lalr1.cc:859
+  case 156:
+#line 660 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1337 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1385 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 155:
-#line 657 "dhcp4_parser.yy" // lalr1.cc:859
+  case 157:
+#line 664 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 1347 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1395 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 176:
-#line 687 "dhcp4_parser.yy" // lalr1.cc:859
+  case 178:
+#line 694 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.DATABASE_TYPE);
 }
-#line 1355 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1403 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 177:
-#line 689 "dhcp4_parser.yy" // lalr1.cc:859
+  case 179:
+#line 696 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 1364 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1412 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 178:
-#line 694 "dhcp4_parser.yy" // lalr1.cc:859
+  case 180:
+#line 701 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); }
-#line 1370 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1418 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 179:
-#line 695 "dhcp4_parser.yy" // lalr1.cc:859
+  case 181:
+#line 702 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); }
-#line 1376 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1424 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 180:
-#line 696 "dhcp4_parser.yy" // lalr1.cc:859
+  case 182:
+#line 703 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); }
-#line 1382 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1430 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 181:
-#line 697 "dhcp4_parser.yy" // lalr1.cc:859
+  case 183:
+#line 704 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); }
-#line 1388 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1436 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 182:
-#line 700 "dhcp4_parser.yy" // lalr1.cc:859
+  case 184:
+#line 707 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1396 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1444 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 183:
-#line 702 "dhcp4_parser.yy" // lalr1.cc:859
+  case 185:
+#line 709 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user", user);
     ctx.leave();
 }
-#line 1406 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1454 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 184:
-#line 708 "dhcp4_parser.yy" // lalr1.cc:859
+  case 186:
+#line 715 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1414 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1462 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 185:
-#line 710 "dhcp4_parser.yy" // lalr1.cc:859
+  case 187:
+#line 717 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password", pwd);
     ctx.leave();
 }
-#line 1424 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1472 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 186:
-#line 716 "dhcp4_parser.yy" // lalr1.cc:859
+  case 188:
+#line 723 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1432 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1480 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 187:
-#line 718 "dhcp4_parser.yy" // lalr1.cc:859
+  case 189:
+#line 725 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host", h);
     ctx.leave();
 }
-#line 1442 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1490 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 188:
-#line 724 "dhcp4_parser.yy" // lalr1.cc:859
+  case 190:
+#line 731 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr p(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("port", p);
 }
-#line 1451 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1499 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 189:
-#line 729 "dhcp4_parser.yy" // lalr1.cc:859
+  case 191:
+#line 736 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1459 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1507 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 190:
-#line 731 "dhcp4_parser.yy" // lalr1.cc:859
+  case 192:
+#line 738 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
     ctx.leave();
 }
-#line 1469 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1517 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 191:
-#line 737 "dhcp4_parser.yy" // lalr1.cc:859
+  case 193:
+#line 744 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("persist", n);
 }
-#line 1478 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1526 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 192:
-#line 742 "dhcp4_parser.yy" // lalr1.cc:859
+  case 194:
+#line 749 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lfc-interval", n);
 }
-#line 1487 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1535 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 193:
-#line 747 "dhcp4_parser.yy" // lalr1.cc:859
+  case 195:
+#line 754 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("readonly", n);
 }
-#line 1496 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1544 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 194:
-#line 752 "dhcp4_parser.yy" // lalr1.cc:859
+  case 196:
+#line 759 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("connect-timeout", n);
 }
-#line 1505 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1553 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 195:
-#line 757 "dhcp4_parser.yy" // lalr1.cc:859
+  case 197:
+#line 764 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("request-timeout", n);
 }
-#line 1514 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1562 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 196:
-#line 762 "dhcp4_parser.yy" // lalr1.cc:859
+  case 198:
+#line 769 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-keepalive", n);
 }
-#line 1523 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1571 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 197:
-#line 767 "dhcp4_parser.yy" // lalr1.cc:859
+  case 199:
+#line 774 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("tcp-nodelay", n);
 }
-#line 1532 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1580 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 198:
-#line 772 "dhcp4_parser.yy" // lalr1.cc:859
+  case 200:
+#line 779 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1540 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1588 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 199:
-#line 774 "dhcp4_parser.yy" // lalr1.cc:859
+  case 201:
+#line 781 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1550 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1598 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 200:
-#line 780 "dhcp4_parser.yy" // lalr1.cc:859
+  case 202:
+#line 787 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1558 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1606 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 201:
-#line 782 "dhcp4_parser.yy" // lalr1.cc:859
+  case 203:
+#line 789 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr ks(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("keyspace", ks);
     ctx.leave();
 }
-#line 1568 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1616 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 202:
-#line 788 "dhcp4_parser.yy" // lalr1.cc:859
+  case 204:
+#line 795 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reconnect-tries", n);
 }
-#line 1577 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1625 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 203:
-#line 793 "dhcp4_parser.yy" // lalr1.cc:859
+  case 205:
+#line 800 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reconnect-wait-time", n);
 }
-#line 1586 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1634 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 204:
-#line 798 "dhcp4_parser.yy" // lalr1.cc:859
+  case 206:
+#line 805 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1597 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1645 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 205:
-#line 803 "dhcp4_parser.yy" // lalr1.cc:859
+  case 207:
+#line 810 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1606 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1654 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 213:
-#line 819 "dhcp4_parser.yy" // lalr1.cc:859
+  case 215:
+#line 826 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
 }
-#line 1615 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1663 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 214:
-#line 824 "dhcp4_parser.yy" // lalr1.cc:859
+  case 216:
+#line 831 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(hwaddr);
 }
-#line 1624 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1672 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 215:
-#line 829 "dhcp4_parser.yy" // lalr1.cc:859
+  case 217:
+#line 836 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr circuit(new StringElement("circuit-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(circuit);
 }
-#line 1633 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1681 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 216:
-#line 834 "dhcp4_parser.yy" // lalr1.cc:859
+  case 218:
+#line 841 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr client(new StringElement("client-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(client);
 }
-#line 1642 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1690 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 217:
-#line 839 "dhcp4_parser.yy" // lalr1.cc:859
+  case 219:
+#line 846 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr flex_id(new StringElement("flex-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(flex_id);
 }
-#line 1651 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1699 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 218:
-#line 844 "dhcp4_parser.yy" // lalr1.cc:859
+  case 220:
+#line 851 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1662 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1710 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 219:
-#line 849 "dhcp4_parser.yy" // lalr1.cc:859
+  case 221:
+#line 856 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1671 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1719 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 224:
-#line 862 "dhcp4_parser.yy" // lalr1.cc:859
+  case 226:
+#line 869 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1681 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1729 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 225:
-#line 866 "dhcp4_parser.yy" // lalr1.cc:859
+  case 227:
+#line 873 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 1691 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1739 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 226:
-#line 872 "dhcp4_parser.yy" // lalr1.cc:859
+  case 228:
+#line 879 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the hooks-libraries list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1701 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1749 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 227:
-#line 876 "dhcp4_parser.yy" // lalr1.cc:859
+  case 229:
+#line 883 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 1711 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1759 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 233:
-#line 891 "dhcp4_parser.yy" // lalr1.cc:859
+  case 235:
+#line 898 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1719 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1767 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 234:
-#line 893 "dhcp4_parser.yy" // lalr1.cc:859
+  case 236:
+#line 900 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("library", lib);
     ctx.leave();
 }
-#line 1729 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1777 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 235:
-#line 899 "dhcp4_parser.yy" // lalr1.cc:859
+  case 237:
+#line 906 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1737 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1785 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 236:
-#line 901 "dhcp4_parser.yy" // lalr1.cc:859
+  case 238:
+#line 908 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 1746 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1794 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 237:
-#line 907 "dhcp4_parser.yy" // lalr1.cc:859
+  case 239:
+#line 914 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1757 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1805 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 238:
-#line 912 "dhcp4_parser.yy" // lalr1.cc:859
+  case 240:
+#line 919 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // No expired lease parameter is required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1767 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1815 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 247:
-#line 930 "dhcp4_parser.yy" // lalr1.cc:859
+  case 249:
+#line 937 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1776 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1824 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 248:
-#line 935 "dhcp4_parser.yy" // lalr1.cc:859
+  case 250:
+#line 942 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1785 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1833 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 249:
-#line 940 "dhcp4_parser.yy" // lalr1.cc:859
+  case 251:
+#line 947 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hold-reclaimed-time", value);
 }
-#line 1794 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1842 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 250:
-#line 945 "dhcp4_parser.yy" // lalr1.cc:859
+  case 252:
+#line 952 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-leases", value);
 }
-#line 1803 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1851 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 251:
-#line 950 "dhcp4_parser.yy" // lalr1.cc:859
+  case 253:
+#line 957 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-reclaim-time", value);
 }
-#line 1812 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1860 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 252:
-#line 955 "dhcp4_parser.yy" // lalr1.cc:859
+  case 254:
+#line 962 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("unwarned-reclaim-cycles", value);
 }
-#line 1821 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1869 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 253:
-#line 963 "dhcp4_parser.yy" // lalr1.cc:859
+  case 255:
+#line 970 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1832 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1880 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 254:
-#line 968 "dhcp4_parser.yy" // lalr1.cc:859
+  case 256:
+#line 975 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 1841 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1889 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 259:
-#line 988 "dhcp4_parser.yy" // lalr1.cc:859
+  case 261:
+#line 995 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 1851 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1899 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 260:
-#line 992 "dhcp4_parser.yy" // lalr1.cc:859
+  case 262:
+#line 999 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Once we reached this place, the subnet parsing is now complete.
     // If we want to, we can implement default values here.
@@ -1873,294 +1921,294 @@ namespace isc { namespace dhcp {
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 1877 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1925 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 261:
-#line 1014 "dhcp4_parser.yy" // lalr1.cc:859
+  case 263:
+#line 1021 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the subnet4 list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 1887 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1935 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 262:
-#line 1018 "dhcp4_parser.yy" // lalr1.cc:859
+  case 264:
+#line 1025 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // The subnet subnet4 parameter is required
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 1897 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1945 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 288:
-#line 1055 "dhcp4_parser.yy" // lalr1.cc:859
+  case 291:
+#line 1063 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1905 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1953 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 289:
-#line 1057 "dhcp4_parser.yy" // lalr1.cc:859
+  case 292:
+#line 1065 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet", subnet);
     ctx.leave();
 }
-#line 1915 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1963 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 290:
-#line 1063 "dhcp4_parser.yy" // lalr1.cc:859
+  case 293:
+#line 1071 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1923 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1971 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 291:
-#line 1065 "dhcp4_parser.yy" // lalr1.cc:859
+  case 294:
+#line 1073 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1933 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1981 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 292:
-#line 1071 "dhcp4_parser.yy" // lalr1.cc:859
+  case 295:
+#line 1079 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1941 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1989 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 293:
-#line 1073 "dhcp4_parser.yy" // lalr1.cc:859
+  case 296:
+#line 1081 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1951 "dhcp4_parser.cc" // lalr1.cc:859
+#line 1999 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 294:
-#line 1079 "dhcp4_parser.yy" // lalr1.cc:859
+  case 297:
+#line 1087 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1959 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2007 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 295:
-#line 1081 "dhcp4_parser.yy" // lalr1.cc:859
+  case 298:
+#line 1089 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 1969 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2017 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 296:
-#line 1087 "dhcp4_parser.yy" // lalr1.cc:859
+  case 299:
+#line 1095 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1977 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2025 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 297:
-#line 1089 "dhcp4_parser.yy" // lalr1.cc:859
+  case 300:
+#line 1097 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface", iface);
     ctx.leave();
 }
-#line 1987 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2035 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 298:
-#line 1095 "dhcp4_parser.yy" // lalr1.cc:859
+  case 301:
+#line 1103 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 1995 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2043 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 299:
-#line 1097 "dhcp4_parser.yy" // lalr1.cc:859
+  case 302:
+#line 1105 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2005 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2053 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 300:
-#line 1103 "dhcp4_parser.yy" // lalr1.cc:859
+  case 303:
+#line 1111 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2016 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2064 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 301:
-#line 1108 "dhcp4_parser.yy" // lalr1.cc:859
+  case 304:
+#line 1116 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2025 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2073 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 302:
-#line 1113 "dhcp4_parser.yy" // lalr1.cc:859
+  case 305:
+#line 1121 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.RESERVATION_MODE);
 }
-#line 2033 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2081 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 303:
-#line 1115 "dhcp4_parser.yy" // lalr1.cc:859
+  case 306:
+#line 1123 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 2042 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2090 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 304:
-#line 1120 "dhcp4_parser.yy" // lalr1.cc:859
+  case 307:
+#line 1128 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); }
-#line 2048 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2096 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 305:
-#line 1121 "dhcp4_parser.yy" // lalr1.cc:859
+  case 308:
+#line 1129 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); }
-#line 2054 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2102 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 306:
-#line 1122 "dhcp4_parser.yy" // lalr1.cc:859
+  case 309:
+#line 1130 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("global", ctx.loc2pos(yystack_[0].location))); }
-#line 2060 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2108 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 307:
-#line 1123 "dhcp4_parser.yy" // lalr1.cc:859
+  case 310:
+#line 1131 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); }
-#line 2066 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2114 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 308:
-#line 1126 "dhcp4_parser.yy" // lalr1.cc:859
+  case 311:
+#line 1134 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("id", id);
 }
-#line 2075 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2123 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 309:
-#line 1133 "dhcp4_parser.yy" // lalr1.cc:859
+  case 312:
+#line 1141 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2086 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2134 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 310:
-#line 1138 "dhcp4_parser.yy" // lalr1.cc:859
+  case 313:
+#line 1146 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2095 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2143 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 315:
-#line 1153 "dhcp4_parser.yy" // lalr1.cc:859
+  case 318:
+#line 1161 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2105 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2153 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 316:
-#line 1157 "dhcp4_parser.yy" // lalr1.cc:859
+  case 319:
+#line 1165 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
 }
-#line 2113 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2161 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 337:
-#line 1189 "dhcp4_parser.yy" // lalr1.cc:859
+  case 341:
+#line 1198 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2124 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2172 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 338:
-#line 1194 "dhcp4_parser.yy" // lalr1.cc:859
+  case 342:
+#line 1203 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2133 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2181 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 339:
-#line 1202 "dhcp4_parser.yy" // lalr1.cc:859
+  case 343:
+#line 1211 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2142 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2190 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 340:
-#line 1205 "dhcp4_parser.yy" // lalr1.cc:859
+  case 344:
+#line 1214 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // parsing completed
 }
-#line 2150 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2198 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 345:
-#line 1221 "dhcp4_parser.yy" // lalr1.cc:859
+  case 349:
+#line 1230 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2160 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2208 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 346:
-#line 1225 "dhcp4_parser.yy" // lalr1.cc:859
+  case 350:
+#line 1234 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2168,21 +2216,21 @@ namespace isc { namespace dhcp {
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 2172 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2220 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 347:
-#line 1236 "dhcp4_parser.yy" // lalr1.cc:859
+  case 351:
+#line 1245 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the option-def list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2182 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2230 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 348:
-#line 1240 "dhcp4_parser.yy" // lalr1.cc:859
+  case 352:
+#line 1249 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2190,281 +2238,281 @@ namespace isc { namespace dhcp {
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 2194 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2242 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 364:
-#line 1272 "dhcp4_parser.yy" // lalr1.cc:859
+  case 368:
+#line 1281 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("code", code);
 }
-#line 2203 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2251 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 366:
-#line 1279 "dhcp4_parser.yy" // lalr1.cc:859
+  case 370:
+#line 1288 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2211 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2259 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 367:
-#line 1281 "dhcp4_parser.yy" // lalr1.cc:859
+  case 371:
+#line 1290 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("type", prf);
     ctx.leave();
 }
-#line 2221 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2269 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 368:
-#line 1287 "dhcp4_parser.yy" // lalr1.cc:859
+  case 372:
+#line 1296 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2229 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2277 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 369:
-#line 1289 "dhcp4_parser.yy" // lalr1.cc:859
+  case 373:
+#line 1298 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2239 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2287 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 370:
-#line 1295 "dhcp4_parser.yy" // lalr1.cc:859
+  case 374:
+#line 1304 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2247 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2295 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 371:
-#line 1297 "dhcp4_parser.yy" // lalr1.cc:859
+  case 375:
+#line 1306 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("space", space);
     ctx.leave();
 }
-#line 2257 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2305 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 373:
-#line 1305 "dhcp4_parser.yy" // lalr1.cc:859
+  case 377:
+#line 1314 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2265 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2313 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 374:
-#line 1307 "dhcp4_parser.yy" // lalr1.cc:859
+  case 378:
+#line 1316 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("encapsulate", encap);
     ctx.leave();
 }
-#line 2275 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2323 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 375:
-#line 1313 "dhcp4_parser.yy" // lalr1.cc:859
+  case 379:
+#line 1322 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("array", array);
 }
-#line 2284 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2332 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 376:
-#line 1322 "dhcp4_parser.yy" // lalr1.cc:859
+  case 380:
+#line 1331 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2295 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2343 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 377:
-#line 1327 "dhcp4_parser.yy" // lalr1.cc:859
+  case 381:
+#line 1336 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2304 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2352 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 382:
-#line 1346 "dhcp4_parser.yy" // lalr1.cc:859
+  case 386:
+#line 1355 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2314 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2362 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 383:
-#line 1350 "dhcp4_parser.yy" // lalr1.cc:859
+  case 387:
+#line 1359 "dhcp4_parser.yy" // lalr1.cc:870
     {
     /// @todo: the code or name parameters are required.
     ctx.stack_.pop_back();
 }
-#line 2323 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2371 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 384:
-#line 1358 "dhcp4_parser.yy" // lalr1.cc:859
+  case 388:
+#line 1367 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the option-data list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2333 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2381 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 385:
-#line 1362 "dhcp4_parser.yy" // lalr1.cc:859
+  case 389:
+#line 1371 "dhcp4_parser.yy" // lalr1.cc:870
     {
     /// @todo: the code or name parameters are required.
     // parsing completed
 }
-#line 2342 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2390 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 400:
-#line 1395 "dhcp4_parser.yy" // lalr1.cc:859
+  case 404:
+#line 1404 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2350 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2398 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 401:
-#line 1397 "dhcp4_parser.yy" // lalr1.cc:859
+  case 405:
+#line 1406 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
     ctx.leave();
 }
-#line 2360 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2408 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 404:
-#line 1407 "dhcp4_parser.yy" // lalr1.cc:859
+  case 408:
+#line 1416 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", space);
 }
-#line 2369 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2417 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 405:
-#line 1412 "dhcp4_parser.yy" // lalr1.cc:859
+  case 409:
+#line 1421 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
 }
-#line 2378 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2426 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 406:
-#line 1420 "dhcp4_parser.yy" // lalr1.cc:859
+  case 410:
+#line 1429 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2389 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2437 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 407:
-#line 1425 "dhcp4_parser.yy" // lalr1.cc:859
+  case 411:
+#line 1434 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2398 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2446 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 412:
-#line 1440 "dhcp4_parser.yy" // lalr1.cc:859
+  case 416:
+#line 1449 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2408 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2456 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 413:
-#line 1444 "dhcp4_parser.yy" // lalr1.cc:859
+  case 417:
+#line 1453 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 2418 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2466 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 414:
-#line 1450 "dhcp4_parser.yy" // lalr1.cc:859
+  case 418:
+#line 1459 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2428 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2476 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 415:
-#line 1454 "dhcp4_parser.yy" // lalr1.cc:859
+  case 419:
+#line 1463 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 2438 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2486 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 425:
-#line 1473 "dhcp4_parser.yy" // lalr1.cc:859
+  case 429:
+#line 1482 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2446 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2494 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 426:
-#line 1475 "dhcp4_parser.yy" // lalr1.cc:859
+  case 430:
+#line 1484 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
     ctx.leave();
 }
-#line 2456 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2504 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 427:
-#line 1481 "dhcp4_parser.yy" // lalr1.cc:859
+  case 431:
+#line 1490 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2464 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2512 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 428:
-#line 1483 "dhcp4_parser.yy" // lalr1.cc:859
+  case 432:
+#line 1492 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context = yystack_[0].value.as< ElementPtr > ();
@@ -2487,19 +2535,19 @@ namespace isc { namespace dhcp {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 2491 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2539 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 429:
-#line 1506 "dhcp4_parser.yy" // lalr1.cc:859
+  case 433:
+#line 1515 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2499 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2547 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 430:
-#line 1508 "dhcp4_parser.yy" // lalr1.cc:859
+  case 434:
+#line 1517 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location)));
@@ -2524,1083 +2572,1085 @@ namespace isc { namespace dhcp {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 2528 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2576 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 431:
-#line 1536 "dhcp4_parser.yy" // lalr1.cc:859
+  case 435:
+#line 1545 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2539 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2587 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 432:
-#line 1541 "dhcp4_parser.yy" // lalr1.cc:859
+  case 436:
+#line 1550 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2548 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2596 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 437:
-#line 1554 "dhcp4_parser.yy" // lalr1.cc:859
+  case 441:
+#line 1563 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2558 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2606 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 438:
-#line 1558 "dhcp4_parser.yy" // lalr1.cc:859
+  case 442:
+#line 1567 "dhcp4_parser.yy" // lalr1.cc:870
     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
 }
-#line 2567 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2615 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 439:
-#line 1563 "dhcp4_parser.yy" // lalr1.cc:859
+  case 443:
+#line 1572 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2577 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2625 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 440:
-#line 1567 "dhcp4_parser.yy" // lalr1.cc:859
+  case 444:
+#line 1576 "dhcp4_parser.yy" // lalr1.cc:870
     {
     /// @todo: an identifier parameter is required.
     // parsing completed
 }
-#line 2586 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2634 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 460:
-#line 1598 "dhcp4_parser.yy" // lalr1.cc:859
+  case 464:
+#line 1607 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2594 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2642 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 461:
-#line 1600 "dhcp4_parser.yy" // lalr1.cc:859
+  case 465:
+#line 1609 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2604 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2652 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 462:
-#line 1606 "dhcp4_parser.yy" // lalr1.cc:859
+  case 466:
+#line 1615 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2612 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2660 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 463:
-#line 1608 "dhcp4_parser.yy" // lalr1.cc:859
+  case 467:
+#line 1617 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2622 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2670 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 464:
-#line 1614 "dhcp4_parser.yy" // lalr1.cc:859
+  case 468:
+#line 1623 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2630 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2678 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 465:
-#line 1616 "dhcp4_parser.yy" // lalr1.cc:859
+  case 469:
+#line 1625 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2640 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2688 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 466:
-#line 1622 "dhcp4_parser.yy" // lalr1.cc:859
+  case 470:
+#line 1631 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2648 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2696 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 467:
-#line 1624 "dhcp4_parser.yy" // lalr1.cc:859
+  case 471:
+#line 1633 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2658 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2706 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 468:
-#line 1630 "dhcp4_parser.yy" // lalr1.cc:859
+  case 472:
+#line 1639 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2669 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2717 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 469:
-#line 1635 "dhcp4_parser.yy" // lalr1.cc:859
+  case 473:
+#line 1644 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2678 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2726 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 470:
-#line 1640 "dhcp4_parser.yy" // lalr1.cc:859
+  case 474:
+#line 1649 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2686 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2734 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 471:
-#line 1642 "dhcp4_parser.yy" // lalr1.cc:859
+  case 475:
+#line 1651 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
     ctx.leave();
 }
-#line 2696 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2744 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 472:
-#line 1648 "dhcp4_parser.yy" // lalr1.cc:859
+  case 476:
+#line 1657 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2704 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2752 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 473:
-#line 1650 "dhcp4_parser.yy" // lalr1.cc:859
+  case 477:
+#line 1659 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2714 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2762 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 474:
-#line 1656 "dhcp4_parser.yy" // lalr1.cc:859
+  case 478:
+#line 1665 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2722 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2770 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 475:
-#line 1658 "dhcp4_parser.yy" // lalr1.cc:859
+  case 479:
+#line 1667 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2732 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2780 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 476:
-#line 1664 "dhcp4_parser.yy" // lalr1.cc:859
+  case 480:
+#line 1673 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2740 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2788 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 477:
-#line 1666 "dhcp4_parser.yy" // lalr1.cc:859
+  case 481:
+#line 1675 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2750 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2798 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 478:
-#line 1672 "dhcp4_parser.yy" // lalr1.cc:859
+  case 482:
+#line 1681 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2758 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2806 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 479:
-#line 1674 "dhcp4_parser.yy" // lalr1.cc:859
+  case 483:
+#line 1683 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2768 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2816 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 480:
-#line 1680 "dhcp4_parser.yy" // lalr1.cc:859
+  case 484:
+#line 1689 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2776 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2824 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 481:
-#line 1682 "dhcp4_parser.yy" // lalr1.cc:859
+  case 485:
+#line 1691 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
     ctx.leave();
 }
-#line 2786 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2834 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 482:
-#line 1688 "dhcp4_parser.yy" // lalr1.cc:859
+  case 486:
+#line 1697 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2797 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2845 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 483:
-#line 1693 "dhcp4_parser.yy" // lalr1.cc:859
+  case 487:
+#line 1702 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2806 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2854 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 484:
-#line 1701 "dhcp4_parser.yy" // lalr1.cc:859
+  case 488:
+#line 1710 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2817 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2865 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 485:
-#line 1706 "dhcp4_parser.yy" // lalr1.cc:859
+  case 489:
+#line 1715 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2826 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2874 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 488:
-#line 1718 "dhcp4_parser.yy" // lalr1.cc:859
+  case 492:
+#line 1727 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2837 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2885 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 489:
-#line 1723 "dhcp4_parser.yy" // lalr1.cc:859
+  case 493:
+#line 1732 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2846 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2894 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 492:
-#line 1732 "dhcp4_parser.yy" // lalr1.cc:859
+  case 496:
+#line 1741 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2856 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2904 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 493:
-#line 1736 "dhcp4_parser.yy" // lalr1.cc:859
+  case 497:
+#line 1745 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // 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 2866 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2914 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 510:
-#line 1765 "dhcp4_parser.yy" // lalr1.cc:859
+  case 514:
+#line 1774 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2874 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2922 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 511:
-#line 1767 "dhcp4_parser.yy" // lalr1.cc:859
+  case 515:
+#line 1776 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
     ctx.leave();
 }
-#line 2884 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2932 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 512:
-#line 1773 "dhcp4_parser.yy" // lalr1.cc:859
+  case 516:
+#line 1782 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("only-if-required", b);
 }
-#line 2893 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2941 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 513:
-#line 1782 "dhcp4_parser.yy" // lalr1.cc:859
+  case 517:
+#line 1791 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
 }
-#line 2902 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2950 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 514:
-#line 1789 "dhcp4_parser.yy" // lalr1.cc:859
+  case 518:
+#line 1798 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2913 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2961 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 515:
-#line 1794 "dhcp4_parser.yy" // lalr1.cc:859
+  case 519:
+#line 1803 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2922 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2970 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 523:
-#line 1810 "dhcp4_parser.yy" // lalr1.cc:859
+  case 527:
+#line 1819 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2930 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2978 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 524:
-#line 1812 "dhcp4_parser.yy" // lalr1.cc:859
+  case 528:
+#line 1821 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2940 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2988 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 525:
-#line 1818 "dhcp4_parser.yy" // lalr1.cc:859
+  case 529:
+#line 1827 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 2948 "dhcp4_parser.cc" // lalr1.cc:859
+#line 2996 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 526:
-#line 1820 "dhcp4_parser.yy" // lalr1.cc:859
+  case 530:
+#line 1829 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2958 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3006 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 527:
-#line 1828 "dhcp4_parser.yy" // lalr1.cc:859
+  case 531:
+#line 1837 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 2969 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3017 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 528:
-#line 1833 "dhcp4_parser.yy" // lalr1.cc:859
+  case 532:
+#line 1842 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // 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 2980 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3028 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 529:
-#line 1840 "dhcp4_parser.yy" // lalr1.cc:859
+  case 533:
+#line 1849 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2990 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3038 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 530:
-#line 1844 "dhcp4_parser.yy" // lalr1.cc:859
+  case 534:
+#line 1853 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // 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 3000 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3048 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 552:
-#line 1875 "dhcp4_parser.yy" // lalr1.cc:859
+  case 556:
+#line 1884 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
 }
-#line 3009 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3057 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 553:
-#line 1880 "dhcp4_parser.yy" // lalr1.cc:859
+  case 557:
+#line 1889 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3017 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3065 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 554:
-#line 1882 "dhcp4_parser.yy" // lalr1.cc:859
+  case 558:
+#line 1891 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3027 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3075 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 555:
-#line 1888 "dhcp4_parser.yy" // lalr1.cc:859
+  case 559:
+#line 1897 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3035 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3083 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 556:
-#line 1890 "dhcp4_parser.yy" // lalr1.cc:859
+  case 560:
+#line 1899 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3045 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3093 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 557:
-#line 1896 "dhcp4_parser.yy" // lalr1.cc:859
+  case 561:
+#line 1905 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
 }
-#line 3054 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3102 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 558:
-#line 1901 "dhcp4_parser.yy" // lalr1.cc:859
+  case 562:
+#line 1910 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3062 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3110 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 559:
-#line 1903 "dhcp4_parser.yy" // lalr1.cc:859
+  case 563:
+#line 1912 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3072 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3120 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 560:
-#line 1909 "dhcp4_parser.yy" // lalr1.cc:859
+  case 564:
+#line 1918 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
 }
-#line 3081 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3129 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 561:
-#line 1914 "dhcp4_parser.yy" // lalr1.cc:859
+  case 565:
+#line 1923 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
 }
-#line 3090 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3138 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 562:
-#line 1919 "dhcp4_parser.yy" // lalr1.cc:859
+  case 566:
+#line 1928 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
-#line 3098 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3146 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 563:
-#line 1921 "dhcp4_parser.yy" // lalr1.cc:859
+  case 567:
+#line 1930 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 3107 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3155 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 564:
-#line 1927 "dhcp4_parser.yy" // lalr1.cc:859
+  case 568:
+#line 1936 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
-#line 3113 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3161 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 565:
-#line 1928 "dhcp4_parser.yy" // lalr1.cc:859
+  case 569:
+#line 1937 "dhcp4_parser.yy" // lalr1.cc:870
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
-#line 3119 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3167 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 566:
-#line 1931 "dhcp4_parser.yy" // lalr1.cc:859
+  case 570:
+#line 1940 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
-#line 3127 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3175 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 567:
-#line 1933 "dhcp4_parser.yy" // lalr1.cc:859
+  case 571:
+#line 1942 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
     ctx.leave();
 }
-#line 3137 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3185 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 568:
-#line 1939 "dhcp4_parser.yy" // lalr1.cc:859
+  case 572:
+#line 1948 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-include-fqdn", b);
 }
-#line 3146 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3194 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 569:
-#line 1944 "dhcp4_parser.yy" // lalr1.cc:859
+  case 573:
+#line 1953 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-no-update", b);
 }
-#line 3155 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3203 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 570:
-#line 1949 "dhcp4_parser.yy" // lalr1.cc:859
+  case 574:
+#line 1958 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-client-update", b);
 }
-#line 3164 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3212 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 571:
-#line 1954 "dhcp4_parser.yy" // lalr1.cc:859
+  case 575:
+#line 1963 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
-#line 3172 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3220 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 572:
-#line 1956 "dhcp4_parser.yy" // lalr1.cc:859
+  case 576:
+#line 1965 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 3181 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3229 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 573:
-#line 1962 "dhcp4_parser.yy" // lalr1.cc:859
+  case 577:
+#line 1971 "dhcp4_parser.yy" // lalr1.cc:870
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); 
       }
-#line 3189 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3237 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 574:
-#line 1965 "dhcp4_parser.yy" // lalr1.cc:859
+  case 578:
+#line 1974 "dhcp4_parser.yy" // lalr1.cc:870
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
-#line 3197 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3245 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 575:
-#line 1968 "dhcp4_parser.yy" // lalr1.cc:859
+  case 579:
+#line 1977 "dhcp4_parser.yy" // lalr1.cc:870
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
-#line 3205 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3253 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 576:
-#line 1971 "dhcp4_parser.yy" // lalr1.cc:859
+  case 580:
+#line 1980 "dhcp4_parser.yy" // lalr1.cc:870
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
-#line 3213 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3261 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 577:
-#line 1974 "dhcp4_parser.yy" // lalr1.cc:859
+  case 581:
+#line 1983 "dhcp4_parser.yy" // lalr1.cc:870
     {
       error(yystack_[0].location, "boolean values for the replace-client-name are "
                 "no longer supported");
       }
-#line 3222 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3270 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 578:
-#line 1980 "dhcp4_parser.yy" // lalr1.cc:859
+  case 582:
+#line 1989 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3230 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3278 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 579:
-#line 1982 "dhcp4_parser.yy" // lalr1.cc:859
+  case 583:
+#line 1991 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3240 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3288 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 580:
-#line 1988 "dhcp4_parser.yy" // lalr1.cc:859
+  case 584:
+#line 1997 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3248 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3296 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 581:
-#line 1990 "dhcp4_parser.yy" // lalr1.cc:859
+  case 585:
+#line 1999 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3258 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3306 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 582:
-#line 1996 "dhcp4_parser.yy" // lalr1.cc:859
+  case 586:
+#line 2005 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3266 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3314 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 583:
-#line 1998 "dhcp4_parser.yy" // lalr1.cc:859
+  case 587:
+#line 2007 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3276 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3324 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 584:
-#line 2007 "dhcp4_parser.yy" // lalr1.cc:859
+  case 588:
+#line 2016 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3284 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3332 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 585:
-#line 2009 "dhcp4_parser.yy" // lalr1.cc:859
+  case 589:
+#line 2018 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 3293 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3341 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 586:
-#line 2014 "dhcp4_parser.yy" // lalr1.cc:859
+  case 590:
+#line 2023 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3301 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3349 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 587:
-#line 2016 "dhcp4_parser.yy" // lalr1.cc:859
+  case 591:
+#line 2025 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 3310 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3358 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 588:
-#line 2021 "dhcp4_parser.yy" // lalr1.cc:859
+  case 592:
+#line 2030 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3318 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3366 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 589:
-#line 2023 "dhcp4_parser.yy" // lalr1.cc:859
+  case 593:
+#line 2032 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.back()->set("Control-agent", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
 }
-#line 3327 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3375 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 590:
-#line 2028 "dhcp4_parser.yy" // lalr1.cc:859
+  case 594:
+#line 2037 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3337 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3385 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 591:
-#line 2032 "dhcp4_parser.yy" // lalr1.cc:859
+  case 595:
+#line 2041 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
 }
-#line 3345 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3393 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 592:
-#line 2037 "dhcp4_parser.yy" // lalr1.cc:859
+  case 596:
+#line 2046 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3356 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3404 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 593:
-#line 2042 "dhcp4_parser.yy" // lalr1.cc:859
+  case 597:
+#line 2051 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // No config control params are required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3366 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3414 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 594:
-#line 2048 "dhcp4_parser.yy" // lalr1.cc:859
+  case 598:
+#line 2057 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the config-control map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3376 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3424 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 595:
-#line 2052 "dhcp4_parser.yy" // lalr1.cc:859
+  case 599:
+#line 2061 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // No config_control params are required
     // parsing completed
 }
-#line 3385 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3433 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 600:
-#line 2067 "dhcp4_parser.yy" // lalr1.cc:859
+  case 604:
+#line 2076 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3396 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3444 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 601:
-#line 2072 "dhcp4_parser.yy" // lalr1.cc:859
+  case 605:
+#line 2081 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3405 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3453 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 602:
-#line 2082 "dhcp4_parser.yy" // lalr1.cc:859
+  case 606:
+#line 2091 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3416 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3464 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 603:
-#line 2087 "dhcp4_parser.yy" // lalr1.cc:859
+  case 607:
+#line 2096 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3425 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3473 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 604:
-#line 2092 "dhcp4_parser.yy" // lalr1.cc:859
+  case 608:
+#line 2101 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // Parse the Logging map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3435 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3483 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 605:
-#line 2096 "dhcp4_parser.yy" // lalr1.cc:859
+  case 609:
+#line 2105 "dhcp4_parser.yy" // lalr1.cc:870
     {
     // parsing completed
 }
-#line 3443 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3491 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 609:
-#line 2112 "dhcp4_parser.yy" // lalr1.cc:859
+  case 613:
+#line 2121 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3454 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3502 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 610:
-#line 2117 "dhcp4_parser.yy" // lalr1.cc:859
+  case 614:
+#line 2126 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3463 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3511 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 613:
-#line 2129 "dhcp4_parser.yy" // lalr1.cc:859
+  case 617:
+#line 2138 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
     ctx.stack_.push_back(l);
 }
-#line 3473 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3521 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 614:
-#line 2133 "dhcp4_parser.yy" // lalr1.cc:859
+  case 618:
+#line 2142 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
 }
-#line 3481 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3529 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 624:
-#line 2150 "dhcp4_parser.yy" // lalr1.cc:859
+  case 628:
+#line 2159 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
 }
-#line 3490 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3538 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 625:
-#line 2155 "dhcp4_parser.yy" // lalr1.cc:859
+  case 629:
+#line 2164 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3498 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3546 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 626:
-#line 2157 "dhcp4_parser.yy" // lalr1.cc:859
+  case 630:
+#line 2166 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
     ctx.leave();
 }
-#line 3508 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3556 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 627:
-#line 2163 "dhcp4_parser.yy" // lalr1.cc:859
+  case 631:
+#line 2172 "dhcp4_parser.yy" // lalr1.cc:870
     {
     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 3519 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3567 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 628:
-#line 2168 "dhcp4_parser.yy" // lalr1.cc:859
+  case 632:
+#line 2177 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3528 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3576 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 631:
-#line 2177 "dhcp4_parser.yy" // lalr1.cc:859
+  case 635:
+#line 2186 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3538 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3586 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 632:
-#line 2181 "dhcp4_parser.yy" // lalr1.cc:859
+  case 636:
+#line 2190 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.stack_.pop_back();
 }
-#line 3546 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3594 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 639:
-#line 2195 "dhcp4_parser.yy" // lalr1.cc:859
+  case 643:
+#line 2204 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3554 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3602 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 640:
-#line 2197 "dhcp4_parser.yy" // lalr1.cc:859
+  case 644:
+#line 2206 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
     ctx.leave();
 }
-#line 3564 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3612 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 641:
-#line 2203 "dhcp4_parser.yy" // lalr1.cc:859
+  case 645:
+#line 2212 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
 }
-#line 3573 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3621 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 642:
-#line 2208 "dhcp4_parser.yy" // lalr1.cc:859
+  case 646:
+#line 2217 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
 }
-#line 3582 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3630 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
-  case 643:
-#line 2213 "dhcp4_parser.yy" // lalr1.cc:859
+  case 647:
+#line 2222 "dhcp4_parser.yy" // lalr1.cc:870
     {
     ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
 }
-#line 3591 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3639 "dhcp4_parser.cc" // lalr1.cc:870
     break;
 
 
-#line 3595 "dhcp4_parser.cc" // lalr1.cc:859
+#line 3643 "dhcp4_parser.cc" // lalr1.cc:870
             default:
               break;
             }
         }
+#if YY_EXCEPTIONS
       catch (const syntax_error& yyexc)
         {
           error (yyexc);
           YYERROR;
         }
+#endif // YY_EXCEPTIONS
       YY_SYMBOL_PRINT ("-> $$ =", yylhs);
       yypop_ (yylen);
       yylen = 0;
@@ -3653,7 +3703,6 @@ namespace isc { namespace dhcp {
        code.  */
     if (false)
       goto yyerrorlab;
-    yyerror_range[1].location = yystack_[yylen - 1].location;
     /* Do not reclaim the symbols of the rule whose action triggered
        this YYERROR.  */
     yypop_ (yylen);
@@ -3725,12 +3774,12 @@ namespace isc { namespace dhcp {
 
     return yyresult;
   }
+#if YY_EXCEPTIONS
     catch (...)
       {
-        YYCDEBUG << "Exception caught: cleaning lookahead and stack"
-                 << std::endl;
+        YYCDEBUG << "Exception caught: cleaning lookahead and stack\n";
         // Do not try to display the values of the reclaimed symbols,
-        // as their printer might throw an exception.
+        // as their printers might throw an exception.
         if (!yyla.empty ())
           yy_destroy_ (YY_NULLPTR, yyla);
 
@@ -3741,12 +3790,13 @@ namespace isc { namespace dhcp {
           }
         throw;
       }
+#endif // YY_EXCEPTIONS
   }
 
   void
   Dhcp4Parser::error (const syntax_error& yyexc)
   {
-    error (yyexc.location, yyexc.what());
+    error (yyexc.location, yyexc.what ());
   }
 
   // Generate an error message.
@@ -3822,12 +3872,13 @@ namespace isc { namespace dhcp {
         case N:                               \
           yyformat = S;                       \
         break
-        YYCASE_(0, YY_("syntax error"));
-        YYCASE_(1, YY_("syntax error, unexpected %s"));
-        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+      default: // Avoid compiler warnings.
+        YYCASE_ (0, YY_("syntax error"));
+        YYCASE_ (1, YY_("syntax error, unexpected %s"));
+        YYCASE_ (2, YY_("syntax error, unexpected %s, expecting %s"));
+        YYCASE_ (3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+        YYCASE_ (4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+        YYCASE_ (5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
 #undef YYCASE_
       }
 
@@ -3846,699 +3897,702 @@ namespace isc { namespace dhcp {
   }
 
 
-  const short int Dhcp4Parser::yypact_ninf_ = -794;
+  const short Dhcp4Parser::yypact_ninf_ = -799;
 
   const signed char Dhcp4Parser::yytable_ninf_ = -1;
 
-  const short int
+  const short
   Dhcp4Parser::yypact_[] =
   {
-     328,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,    38,    24,    42,    53,    57,
-     105,   129,   143,   150,   152,   161,   173,   186,   188,   196,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,    24,    -9,
-      13,    52,    70,   148,   185,   223,   125,   391,    35,   -49,
-     450,    66,    34,  -794,   205,   189,   215,   212,   226,  -794,
-    -794,  -794,  -794,  -794,   227,  -794,    86,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,   233,   244,  -794,
-    -794,  -794,  -794,  -794,  -794,   260,   261,   270,   276,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,   279,  -794,  -794,  -794,    87,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-     282,  -794,   113,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,   283,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,   146,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,   162,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,   222,   290,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,   292,  -794,  -794,   297,  -794,  -794,  -794,   303,
-    -794,  -794,   302,   308,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,   334,   337,  -794,
-    -794,  -794,  -794,   340,   339,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,   163,  -794,  -794,
-    -794,   346,  -794,  -794,   347,  -794,   349,   352,  -794,  -794,
-     353,   354,   356,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-     175,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,   176,
-    -794,  -794,  -794,  -794,   179,  -794,  -794,  -794,    24,    24,
-    -794,   197,   364,   366,   367,   370,   373,  -794,    13,  -794,
-      34,   374,   378,   379,   217,   218,   384,   387,   389,   390,
-     393,   394,   235,   240,   242,   246,   408,   415,   416,   417,
-     421,   422,   424,   443,   448,   449,   451,   455,   300,   464,
-     465,    52,  -794,   466,   467,   468,   306,    70,  -794,   470,
-     471,   488,   489,   490,   491,   331,   493,   494,   495,   496,
-     148,  -794,   497,   185,  -794,   498,   499,   501,   503,   504,
-     505,   506,   508,  -794,   223,  -794,   509,   510,   350,   514,
-     515,   516,   355,  -794,   391,   517,   357,   360,  -794,    35,
-     524,   526,   -55,  -794,   368,   527,   530,   371,   533,   375,
-     376,   534,   535,   380,   381,   382,   538,   542,   546,   547,
-     450,  -794,   549,    66,  -794,   550,    34,  -794,  -794,  -794,
-     552,   551,   553,    24,    24,    24,  -794,   201,   554,   555,
-     556,  -794,  -794,   418,   419,   420,   573,   574,   580,  -794,
-    -794,  -794,  -794,   425,   583,   585,   586,   587,   588,   429,
-     589,   591,   592,   593,   594,  -794,   595,   596,  -794,   599,
-      80,    67,  -794,  -794,   435,   436,   441,   601,   444,   445,
-    -794,   252,   599,   446,   600,  -794,   447,  -794,   599,   452,
-     453,   454,   456,   457,   458,   459,  -794,   460,   461,  -794,
-     462,   463,   469,  -794,  -794,   472,  -794,  -794,  -794,   473,
-      24,  -794,  -794,   474,   475,  -794,   476,  -794,  -794,    28,
-     426,  -794,  -794,  -794,   -15,   477,   478,   479,  -794,   607,
-    -794,   608,  -794,    24,    52,    66,  -794,  -794,  -794,  -794,
-      34,    70,   605,  -794,  -794,  -794,   395,   395,   612,  -794,
-     622,   623,   624,   625,  -794,  -794,  -794,    47,   627,   628,
-     637,   147,    17,   450,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,   638,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,   -28,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,   639,
-     612,  -794,   210,   214,   237,   255,  -794,   259,  -794,  -794,
-    -794,  -794,  -794,  -794,   611,   643,   644,   645,   646,  -794,
-    -794,   647,   648,   649,   650,   651,  -794,   263,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,   273,  -794,   652,   653,
-    -794,  -794,   654,   656,  -794,  -794,   655,   659,  -794,  -794,
-     657,   661,  -794,  -794,   660,   662,  -794,  -794,  -794,  -794,
-    -794,  -794,    55,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-     119,  -794,  -794,   663,   664,  -794,  -794,   665,   667,  -794,
-     668,   669,   670,   671,   672,   673,   274,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,   281,
-    -794,  -794,  -794,   287,   518,  -794,   674,   675,  -794,  -794,
-    -794,  -794,   676,  -794,   120,  -794,   677,  -794,  -794,  -794,
-    -794,   681,   605,  -794,   682,   683,   684,   685,   492,   512,
-     525,   528,   529,   687,   688,   531,   532,   536,   537,   539,
-     395,  -794,  -794,   395,  -794,   612,   148,  -794,   622,   391,
-    -794,   623,    35,  -794,   624,   216,  -794,   625,    47,  -794,
-     388,   627,  -794,   223,  -794,   628,   -49,  -794,   637,   540,
-     543,   544,   545,   548,   557,   147,  -794,   689,   694,    17,
-    -794,  -794,  -794,   693,   678,   185,  -794,   638,   696,  -794,
-      72,   639,  -794,  -794,   559,  -794,   311,   560,   561,   562,
-    -794,  -794,  -794,  -794,  -794,   563,   564,  -794,  -794,  -794,
-    -794,  -794,  -794,   294,  -794,   305,  -794,   695,  -794,   699,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,   320,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,   700,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,   703,   709,  -794,  -794,  -794,  -794,
-    -794,   706,  -794,   321,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,   565,   566,  -794,  -794,   567,   322,  -794,   599,
-    -794,   711,  -794,  -794,  -794,  -794,  -794,   323,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,   216,  -794,
-     712,   568,  -794,   388,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,   713,   569,   714,    72,  -794,  -794,   572,  -794,  -794,
-     715,  -794,   575,  -794,  -794,   725,  -794,  -794,   166,  -794,
-     -12,   725,  -794,  -794,   717,   729,   733,   329,  -794,  -794,
-    -794,  -794,  -794,  -794,   734,   577,   576,   582,   -12,  -794,
-     578,  -794,  -794,  -794,  -794,  -794
+     400,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,    45,    24,    40,    52,    64,
+      79,    93,    97,   117,   180,   187,   191,   197,   220,   222,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,    24,  -127,
+      34,    65,    84,   183,    38,   223,    -1,   403,   157,   -40,
+     364,     7,    11,  -799,   233,    85,   254,   248,   266,  -799,
+    -799,  -799,  -799,  -799,   277,  -799,    46,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,   291,   299,   309,
+    -799,  -799,  -799,  -799,  -799,  -799,   322,   341,   345,   350,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,   351,  -799,  -799,  -799,    50,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,   353,  -799,    57,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,   356,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,    71,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,    77,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,   326,   334,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,   354,  -799,  -799,   357,  -799,
+    -799,  -799,   360,  -799,  -799,   366,   362,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+     368,   371,  -799,  -799,  -799,  -799,   370,   378,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+     109,  -799,  -799,  -799,   380,  -799,  -799,   382,  -799,   383,
+     385,  -799,  -799,   387,   388,   391,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,   140,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,   146,  -799,  -799,  -799,  -799,   147,  -799,  -799,
+    -799,    24,    24,  -799,    76,   393,   394,   397,   398,   405,
+    -799,    34,  -799,    11,   407,   411,   415,   236,   255,   256,
+     416,   421,   423,   425,   426,   427,   216,   271,   272,   273,
+     428,   438,   439,   440,   442,   443,   444,   461,   462,   464,
+     467,   468,   311,   474,   491,    65,  -799,   492,   493,   494,
+     331,    84,  -799,   496,   499,   500,   501,   502,   503,   342,
+     506,   508,   509,   510,   183,  -799,   511,    38,  -799,   513,
+     514,   515,   516,   519,   520,   521,   522,  -799,   223,  -799,
+     523,   526,   365,   528,   529,   531,   372,  -799,   403,   532,
+     373,   374,  -799,   157,   535,   539,    36,  -799,   376,   541,
+     542,   381,   561,   401,   406,   562,   567,   408,   410,   413,
+     569,   570,   571,   575,   364,  -799,   576,     7,  -799,   578,
+      11,  -799,  -799,  -799,   579,   577,   580,    24,    24,    24,
+    -799,   171,   581,   582,   583,  -799,  -799,  -799,   420,   429,
+     430,   584,   585,   588,  -799,  -799,  -799,  -799,   431,   592,
+     593,   594,   595,   596,   436,   597,   599,   600,   601,   602,
+    -799,   603,   604,  -799,   607,   238,   292,  -799,  -799,   448,
+     449,   450,   611,   452,   453,  -799,    81,   607,   454,   613,
+    -799,   456,  -799,   607,   457,   458,   459,   460,   463,   465,
+     466,  -799,   469,   470,  -799,   471,   472,   473,  -799,  -799,
+     475,  -799,  -799,  -799,   476,    24,  -799,  -799,   477,   478,
+    -799,   479,  -799,  -799,    31,   495,  -799,  -799,  -799,   -52,
+     480,   481,   482,  -799,   621,  -799,   624,  -799,    24,    65,
+       7,  -799,  -799,  -799,  -799,    11,    84,   563,  -799,  -799,
+    -799,   412,   412,   625,  -799,   626,   632,   641,   642,  -799,
+    -799,  -799,   120,   643,   644,   645,    26,    54,   364,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+     646,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+     252,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,   647,   625,  -799,   172,   193,   199,
+     237,  -799,   245,  -799,  -799,  -799,  -799,  -799,  -799,   651,
+     652,   653,   654,   655,  -799,  -799,   656,   657,   658,   659,
+     660,  -799,   280,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,   281,  -799,   661,   605,  -799,  -799,   662,   663,  -799,
+    -799,   664,   666,  -799,  -799,   665,   669,  -799,  -799,   667,
+     671,  -799,  -799,  -799,  -799,  -799,  -799,   150,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,   182,  -799,  -799,   670,   672,
+    -799,  -799,   673,   674,  -799,   676,   677,   678,   679,   680,
+     681,   282,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,   284,  -799,  -799,  -799,   290,   524,
+    -799,   682,   675,  -799,  -799,  -799,  -799,   683,  -799,   214,
+    -799,   684,  -799,  -799,  -799,  -799,   688,   563,  -799,   689,
+     690,   691,   692,   441,   497,   533,   518,   534,   693,   694,
+     536,   537,   538,   540,   543,   412,  -799,  -799,   412,  -799,
+     625,   183,  -799,   626,   403,  -799,   632,   157,  -799,   641,
+     251,  -799,   642,   120,  -799,    82,   643,  -799,   223,  -799,
+     644,   -40,  -799,   645,   544,   546,   547,   548,   549,   550,
+      26,  -799,   697,   701,    54,  -799,  -799,  -799,   702,   704,
+      38,  -799,   646,   705,  -799,   129,   647,  -799,  -799,   552,
+    -799,   231,   553,   554,   555,  -799,  -799,  -799,  -799,  -799,
+     556,   557,  -799,  -799,  -799,  -799,  -799,  -799,   293,  -799,
+     294,  -799,   715,  -799,   716,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,   321,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+     721,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+     718,   724,  -799,  -799,  -799,  -799,  -799,   720,  -799,   330,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,   564,   565,
+    -799,  -799,   566,   332,  -799,   607,  -799,   728,  -799,  -799,
+    -799,  -799,  -799,   333,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,   251,  -799,   729,   568,  -799,    82,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,   730,   572,   731,
+     129,  -799,  -799,   574,  -799,  -799,   732,  -799,   587,  -799,
+    -799,   733,  -799,  -799,   225,  -799,   -39,   733,  -799,  -799,
+     737,   738,   739,   343,  -799,  -799,  -799,  -799,  -799,  -799,
+     740,   590,   589,   598,   -39,  -799,   591,  -799,  -799,  -799,
+    -799,  -799
   };
 
-  const unsigned short int
+  const unsigned short
   Dhcp4Parser::yydefact_[] =
   {
        0,     2,     4,     6,     8,    10,    12,    14,    16,    18,
       20,    22,    24,    26,    28,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        1,    45,    38,    34,    33,    30,    31,    32,    37,     3,
-      35,    36,    58,     5,    70,     7,   124,     9,   261,    11,
-     414,    13,   439,    15,   339,    17,   347,    19,   384,    21,
-     226,    23,   529,    25,   604,    27,   594,    29,    47,    41,
-       0,     0,     0,     0,     0,   441,     0,   349,   386,     0,
+      35,    36,    58,     5,    70,     7,   126,     9,   263,    11,
+     418,    13,   443,    15,   343,    17,   351,    19,   388,    21,
+     228,    23,   533,    25,   608,    27,   598,    29,    47,    41,
+       0,     0,     0,     0,     0,   445,     0,   353,   390,     0,
        0,     0,     0,    49,     0,    48,     0,     0,    42,    68,
-     602,   584,   586,   588,     0,    67,     0,    60,    62,    64,
-      65,    66,    63,   590,   592,   113,   139,     0,     0,   460,
-     462,   464,   137,   146,   148,     0,     0,     0,     0,   109,
-     253,   337,   376,   309,   427,   429,   204,   488,   431,   218,
-     237,     0,   514,   527,   104,     0,    72,    74,    75,    76,
-      77,   103,    93,    94,    80,    81,   100,    82,    83,    84,
-      88,    89,    78,    79,    86,    87,    98,    99,   101,    95,
-      96,    97,    85,    90,    91,    92,   102,   126,   128,   132,
-       0,   123,     0,   115,   117,   118,   119,   120,   121,   122,
-     290,   292,   294,   406,   288,   296,     0,   302,   300,   298,
-     484,   287,   265,   266,   267,   278,     0,   263,   270,   282,
-     283,   284,   271,   273,   274,   276,   272,   268,   269,   285,
-     286,   275,   279,   280,   281,   277,   425,   424,   420,   421,
-     419,     0,   416,   418,   422,   423,   482,   470,   472,   476,
-     474,   480,   478,   466,   459,   453,   457,   458,     0,   442,
-     443,   454,   455,   456,   450,   445,   451,   447,   448,   449,
-     452,   446,     0,   366,   189,     0,   370,   368,   373,     0,
-     362,   363,     0,   350,   351,   353,   365,   354,   355,   356,
-     372,   357,   358,   359,   360,   361,   400,     0,     0,   398,
-     399,   402,   403,     0,   387,   388,   390,   391,   392,   393,
-     394,   395,   396,   397,   233,   235,   230,     0,   228,   231,
-     232,     0,   553,   555,     0,   558,     0,     0,   562,   566,
-       0,     0,     0,   571,   578,   580,   582,   551,   549,   550,
-       0,   531,   533,   534,   535,   536,   537,   538,   539,   540,
-     541,   542,   543,   544,   545,   546,   547,   548,   609,     0,
-     606,   608,   600,   599,     0,   596,   598,    46,     0,     0,
-      39,     0,     0,     0,     0,     0,     0,    57,     0,    59,
+     606,   588,   590,   592,     0,    67,     0,    60,    62,    64,
+      65,    66,    63,   594,   596,   115,   141,     0,     0,     0,
+     464,   466,   468,   139,   148,   150,     0,     0,     0,     0,
+     110,   255,   341,   380,   312,   431,   433,   206,   492,   435,
+     220,   239,     0,   518,   531,   105,     0,    72,    74,    75,
+      76,    77,   104,    93,    94,    95,    80,    81,   101,    82,
+      83,    84,    88,    89,    78,    79,    86,    87,    99,   100,
+     102,    96,    97,    98,    85,    90,    91,    92,   103,   128,
+     130,   134,     0,   125,     0,   117,   119,   120,   121,   122,
+     123,   124,   293,   295,   297,   410,   291,   299,     0,   305,
+     303,   301,   488,   290,   267,   268,   269,   280,   281,     0,
+     265,   272,   285,   286,   287,   273,   275,   276,   278,   274,
+     270,   271,   288,   289,   277,   282,   283,   284,   279,   429,
+     428,   424,   425,   423,     0,   420,   422,   426,   427,   486,
+     474,   476,   480,   478,   484,   482,   470,   463,   457,   461,
+     462,     0,   446,   447,   458,   459,   460,   454,   449,   455,
+     451,   452,   453,   456,   450,     0,   370,   191,     0,   374,
+     372,   377,     0,   366,   367,     0,   354,   355,   357,   369,
+     358,   359,   360,   376,   361,   362,   363,   364,   365,   404,
+       0,     0,   402,   403,   406,   407,     0,   391,   392,   394,
+     395,   396,   397,   398,   399,   400,   401,   235,   237,   232,
+       0,   230,   233,   234,     0,   557,   559,     0,   562,     0,
+       0,   566,   570,     0,     0,     0,   575,   582,   584,   586,
+     555,   553,   554,     0,   535,   537,   538,   539,   540,   541,
+     542,   543,   544,   545,   546,   547,   548,   549,   550,   551,
+     552,   613,     0,   610,   612,   604,   603,     0,   600,   602,
+      46,     0,     0,    39,     0,     0,     0,     0,     0,     0,
+      57,     0,    59,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    71,     0,     0,     0,
+       0,     0,   127,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   264,     0,     0,   419,     0,
+       0,     0,     0,     0,     0,     0,     0,   444,     0,   344,
+       0,     0,     0,     0,     0,     0,     0,   352,     0,     0,
+       0,     0,   389,     0,     0,     0,     0,   229,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    71,     0,     0,     0,     0,     0,   125,     0,
+       0,     0,     0,     0,     0,   534,     0,     0,   609,     0,
+       0,   599,    50,    43,     0,     0,     0,     0,     0,     0,
+      61,     0,     0,     0,     0,   112,   113,   114,     0,     0,
+       0,     0,     0,     0,   106,   107,   108,   109,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   262,     0,     0,   415,     0,     0,     0,     0,     0,
-       0,     0,     0,   440,     0,   340,     0,     0,     0,     0,
-       0,     0,     0,   348,     0,     0,     0,     0,   385,     0,
-       0,     0,     0,   227,     0,     0,     0,     0,     0,     0,
+     517,     0,     0,    73,     0,     0,     0,   138,   118,     0,
+       0,     0,     0,     0,     0,   311,     0,     0,     0,     0,
+     266,     0,   421,     0,     0,     0,     0,     0,     0,     0,
+       0,   448,     0,     0,   368,     0,     0,     0,   379,   356,
+       0,   408,   409,   393,     0,     0,   231,   556,     0,     0,
+     561,     0,   564,   565,     0,     0,   572,   573,   574,     0,
+       0,     0,     0,   536,     0,   611,     0,   601,     0,     0,
+       0,   589,   591,   593,   595,     0,     0,     0,   465,   467,
+     469,     0,     0,   152,   111,   257,   345,   382,   314,    40,
+     432,   434,     0,     0,   437,   222,     0,     0,     0,    51,
+     129,   132,   133,   131,   136,   137,   135,   294,   296,   298,
+     412,   292,   300,   307,   308,   309,   310,   306,   304,   302,
+       0,   430,   487,   475,   477,   481,   479,   485,   483,   471,
+     371,   192,   375,   373,   378,   405,   236,   238,   558,   560,
+     563,   568,   569,   567,   571,   577,   578,   579,   580,   581,
+     576,   583,   585,   587,     0,   152,    44,     0,     0,     0,
+       0,   146,     0,   143,   145,   178,   184,   186,   188,     0,
+       0,     0,     0,     0,   200,   202,     0,     0,     0,     0,
+       0,   177,     0,   158,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   173,   174,   175,   170,   176,   171,
+     172,     0,   156,     0,   153,   154,   261,     0,   258,   259,
+     349,     0,   346,   347,   386,     0,   383,   384,   318,     0,
+     315,   316,   215,   216,   217,   218,   219,     0,   208,   210,
+     211,   212,   213,   214,   496,     0,   494,   441,     0,   438,
+     439,   226,     0,   223,   224,     0,     0,     0,     0,     0,
+       0,     0,   241,   243,   244,   245,   246,   247,   248,   527,
+     529,   526,   524,   525,     0,   520,   522,   523,     0,    53,
+     416,     0,   413,   414,   472,   490,   491,     0,   617,     0,
+     615,     0,    69,   607,   597,   116,     0,     0,   142,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   530,     0,     0,   605,     0,     0,   595,    50,    43,
-       0,     0,     0,     0,     0,     0,    61,     0,     0,     0,
-       0,   111,   112,     0,     0,     0,     0,     0,     0,   105,
-     106,   107,   108,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   513,     0,     0,    73,     0,
-       0,     0,   136,   116,     0,     0,     0,     0,     0,     0,
-     308,     0,     0,     0,     0,   264,     0,   417,     0,     0,
-       0,     0,     0,     0,     0,     0,   444,     0,     0,   364,
-       0,     0,     0,   375,   352,     0,   404,   405,   389,     0,
-       0,   229,   552,     0,     0,   557,     0,   560,   561,     0,
-       0,   568,   569,   570,     0,     0,     0,     0,   532,     0,
-     607,     0,   597,     0,     0,     0,   585,   587,   589,   591,
-       0,     0,     0,   461,   463,   465,     0,     0,   150,   110,
-     255,   341,   378,   311,    40,   428,   430,     0,     0,   433,
-     220,     0,     0,     0,    51,   127,   130,   131,   129,   134,
-     135,   133,   291,   293,   295,   408,   289,   297,   304,   305,
-     306,   307,   303,   301,   299,     0,   426,   483,   471,   473,
-     477,   475,   481,   479,   467,   367,   190,   371,   369,   374,
-     401,   234,   236,   554,   556,   559,   564,   565,   563,   567,
-     573,   574,   575,   576,   577,   572,   579,   581,   583,     0,
-     150,    44,     0,     0,     0,     0,   144,     0,   141,   143,
-     176,   182,   184,   186,     0,     0,     0,     0,     0,   198,
-     200,     0,     0,     0,     0,     0,   175,     0,   156,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   171,
-     172,   173,   168,   174,   169,   170,     0,   154,     0,   151,
-     152,   259,     0,   256,   257,   345,     0,   342,   343,   382,
-       0,   379,   380,   315,     0,   312,   313,   213,   214,   215,
-     216,   217,     0,   206,   208,   209,   210,   211,   212,   492,
-       0,   490,   437,     0,   434,   435,   224,     0,   221,   222,
-       0,     0,     0,     0,     0,     0,     0,   239,   241,   242,
-     243,   244,   245,   246,   523,   525,   522,   520,   521,     0,
-     516,   518,   519,     0,    53,   412,     0,   409,   410,   468,
-     486,   487,     0,   613,     0,   611,     0,    69,   603,   593,
-     114,     0,     0,   140,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   138,   147,     0,   149,     0,     0,   254,     0,   349,
-     338,     0,   386,   377,     0,     0,   310,     0,     0,   205,
-     494,     0,   489,   441,   432,     0,     0,   219,     0,     0,
-       0,     0,     0,     0,     0,     0,   238,     0,     0,     0,
-     515,   528,    55,     0,    54,     0,   407,     0,     0,   485,
-       0,     0,   610,   601,     0,   142,     0,     0,     0,     0,
-     188,   191,   192,   193,   194,     0,     0,   202,   203,   195,
-     196,   197,   157,     0,   153,     0,   258,     0,   344,     0,
-     381,   336,   333,   322,   323,   325,   319,   320,   321,   331,
-     332,   330,     0,   317,   324,   334,   335,   326,   327,   328,
-     329,   314,   207,   510,     0,   508,   509,   501,   502,   506,
-     507,   503,   504,   505,     0,   495,   496,   498,   499,   500,
-     491,     0,   436,     0,   223,   247,   248,   249,   250,   251,
-     252,   240,     0,     0,   517,    52,     0,     0,   411,     0,
-     627,     0,   625,   623,   617,   621,   622,     0,   615,   619,
-     620,   618,   612,   145,   178,   179,   180,   181,   177,   183,
-     185,   187,   199,   201,   155,   260,   346,   383,     0,   316,
-       0,     0,   493,     0,   438,   225,   524,   526,    56,   413,
-     469,     0,     0,     0,     0,   614,   318,     0,   512,   497,
-       0,   624,     0,   616,   511,     0,   626,   631,     0,   629,
-       0,     0,   628,   639,     0,     0,     0,     0,   633,   635,
-     636,   637,   638,   630,     0,     0,     0,     0,     0,   632,
-       0,   641,   642,   643,   634,   640
+       0,     0,     0,     0,     0,     0,   140,   149,     0,   151,
+       0,     0,   256,     0,   353,   342,     0,   390,   381,     0,
+       0,   313,     0,     0,   207,   498,     0,   493,   445,   436,
+       0,     0,   221,     0,     0,     0,     0,     0,     0,     0,
+       0,   240,     0,     0,     0,   519,   532,    55,     0,    54,
+       0,   411,     0,     0,   489,     0,     0,   614,   605,     0,
+     144,     0,     0,     0,     0,   190,   193,   194,   195,   196,
+       0,     0,   204,   205,   197,   198,   199,   159,     0,   155,
+       0,   260,     0,   348,     0,   385,   340,   337,   325,   326,
+     328,   329,   322,   323,   324,   335,   336,   334,     0,   320,
+     327,   338,   339,   330,   331,   332,   333,   317,   209,   514,
+       0,   512,   513,   505,   506,   510,   511,   507,   508,   509,
+       0,   499,   500,   502,   503,   504,   495,     0,   440,     0,
+     225,   249,   250,   251,   252,   253,   254,   242,     0,     0,
+     521,    52,     0,     0,   415,     0,   631,     0,   629,   627,
+     621,   625,   626,     0,   619,   623,   624,   622,   616,   147,
+     180,   181,   182,   183,   179,   185,   187,   189,   201,   203,
+     157,   262,   350,   387,     0,   319,     0,     0,   497,     0,
+     442,   227,   528,   530,    56,   417,   473,     0,     0,     0,
+       0,   618,   321,     0,   516,   501,     0,   628,     0,   620,
+     515,     0,   630,   635,     0,   633,     0,     0,   632,   643,
+       0,     0,     0,     0,   637,   639,   640,   641,   642,   634,
+       0,     0,     0,     0,     0,   636,     0,   645,   646,   647,
+     638,   644
   };
 
-  const short int
+  const short
   Dhcp4Parser::yypgoto_[] =
   {
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,   -44,  -794,   170,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -501,  -794,  -794,
-    -794,   -70,  -794,  -794,  -794,   361,  -794,  -794,  -794,  -794,
-     171,   359,   -48,   -45,   -43,  -794,  -794,  -794,  -794,   -11,
-    -794,  -794,   167,   362,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-     -41,  -794,  -794,  -794,  -794,  -794,  -794,    93,  -794,   -61,
-    -794,  -581,   -53,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,   -26,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,   -54,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,   -68,  -794,  -794,  -794,   -50,   341,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,   -69,  -794,  -794,  -794,  -794,  -794,
-    -794,  -793,  -794,  -794,  -794,   -30,  -794,  -794,  -794,   -27,
-     396,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -784,
-    -794,   -24,  -794,    -4,  -794,  -782,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,   -33,  -794,  -794,  -178,   -65,  -794,  -794,
-    -794,  -794,  -794,   -13,  -794,  -794,  -794,   -16,  -794,   386,
-    -794,   -66,  -794,  -794,  -794,  -794,  -794,   -60,  -794,  -794,
-    -794,  -794,  -794,   -18,  -794,  -794,  -794,     4,  -794,  -794,
-    -794,     7,  -794,   397,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,   -25,  -794,  -794,  -794,   -42,
-     427,  -794,  -794,   -58,  -794,   -38,  -794,   -47,  -794,  -794,
-    -794,     3,  -794,  -794,  -794,     2,  -794,   423,    -7,  -794,
-      -6,  -794,     0,  -794,   219,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -781,  -794,  -794,  -794,  -794,  -794,     8,  -794,
-    -794,  -794,  -142,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,    -3,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-     239,   383,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,  -794,
-    -347,   392,  -794,  -794,  -794,  -794,  -794,  -794,   275,   385,
-    -794,  -794,  -794,    -8,  -794,  -794,  -149,  -794,  -794,  -794,
-    -794,  -794,  -794,  -162,  -794,  -794,  -176,  -794,  -794,  -794,
-    -794,  -794
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,   -44,  -799,   184,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -506,  -799,  -799,
+    -799,   -70,  -799,  -799,  -799,   386,  -799,  -799,  -799,  -799,
+     167,   355,   -48,   -45,   -43,  -799,  -799,  -799,  -799,   -11,
+       4,  -799,  -799,   163,   352,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,   -35,  -799,  -799,  -799,  -799,  -799,  -799,    94,  -799,
+     -41,  -799,  -586,   -34,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,   -26,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,   -42,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,   -68,  -799,  -799,  -799,   -53,   347,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,   -56,  -799,  -799,  -799,  -799,
+    -799,  -799,  -798,  -799,  -799,  -799,   -15,  -799,  -799,  -799,
+     -22,   399,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -789,  -799,   -24,  -799,    -4,  -799,  -787,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,   -27,  -799,  -799,  -173,   -65,  -799,
+    -799,  -799,  -799,  -799,    -8,  -799,  -799,  -799,     9,  -799,
+     402,  -799,   -66,  -799,  -799,  -799,  -799,  -799,   -60,  -799,
+    -799,  -799,  -799,  -799,   -18,  -799,  -799,  -799,     8,  -799,
+    -799,  -799,    14,  -799,   404,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,   -19,  -799,  -799,  -799,
+     -16,   432,  -799,  -799,   -58,  -799,   -38,  -799,   -47,  -799,
+    -799,  -799,     5,  -799,  -799,  -799,    10,  -799,   418,    -7,
+    -799,    -6,  -799,     0,  -799,   221,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -784,  -799,  -799,  -799,  -799,  -799,    16,
+    -799,  -799,  -799,  -139,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,     1,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,   246,   389,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,  -799,
+    -799,  -350,   390,  -799,  -799,  -799,  -799,  -799,  -799,   278,
+     392,  -799,  -799,  -799,    -9,  -799,  -799,  -138,  -799,  -799,
+    -799,  -799,  -799,  -799,  -156,  -799,  -799,  -171,  -799,  -799,
+    -799,  -799,  -799
   };
 
-  const short int
+  const short
   Dhcp4Parser::yydefgoto_[] =
   {
       -1,    15,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    38,    39,    40,    69,
-     595,    87,    88,    41,    68,    84,    85,   605,   774,   853,
-     854,   343,    43,    70,    96,    97,    98,   352,    45,    71,
-     135,   136,   137,   138,   139,   140,   141,   376,   142,   143,
-     144,   362,   172,   173,    47,    72,   174,   393,   175,   394,
-     608,   176,   395,   611,   177,   145,   369,   146,   363,   667,
-     668,   669,   791,   147,   370,   148,   371,   708,   709,   710,
-     813,   687,   688,   689,   794,   968,   690,   795,   691,   796,
-     692,   797,   693,   694,   427,   695,   696,   697,   698,   699,
-     700,   701,   702,   803,   703,   804,   704,   705,   149,   383,
-     732,   733,   734,   735,   736,   737,   738,   150,   386,   747,
-     748,   749,   836,    61,    79,   297,   298,   299,   440,   300,
-     441,   151,   387,   756,   757,   758,   759,   760,   761,   762,
-     763,   152,   377,   712,   713,   714,   816,    49,    73,   196,
-     197,   198,   403,   199,   399,   200,   400,   201,   401,   202,
-     404,   203,   408,   204,   407,   205,   406,   622,   206,   153,
-     380,   724,   725,   726,   825,   902,   903,   154,   378,    55,
-      76,   716,   717,   718,   819,    57,    77,   262,   263,   264,
-     265,   266,   267,   268,   426,   269,   430,   270,   429,   271,
-     272,   431,   273,   155,   379,   720,   721,   722,   822,    59,
-      78,   283,   284,   285,   286,   287,   435,   288,   289,   290,
-     291,   208,   402,   776,   777,   778,   855,    51,    74,   221,
-     222,   223,   412,   156,   381,   157,   382,   158,   385,   743,
-     744,   745,   833,    53,    75,   238,   239,   240,   159,   366,
-     160,   367,   161,   368,   244,   422,   781,   858,   245,   416,
-     246,   417,   247,   419,   248,   418,   249,   421,   250,   420,
-     251,   415,   215,   409,   782,   162,   384,   740,   741,   830,
-     924,   925,   926,   927,   928,   980,   929,   163,   164,   389,
-     769,   770,   771,   847,   772,   848,   165,   390,    63,    80,
-     320,   321,   322,   323,   445,   324,   446,   325,   326,   448,
-     327,   328,   329,   451,   648,   330,   452,   331,   332,   333,
-     334,   456,   655,   335,   457,   336,   458,   337,   459,    99,
-     354,   100,   355,   101,   356,   166,   360,   361,    67,    82,
-     344,   345,   346,   465,   102,   353,    65,    81,   339,   340,
-     341,   462,   784,   785,   860,   957,   958,   959,   960,   993,
-     961,   991,  1008,  1009,  1010,  1017,  1018,  1019,  1024,  1020,
-    1021,  1022
+     600,    87,    88,    41,    68,    84,    85,   610,   779,   858,
+     859,   346,    43,    70,    96,    97,    98,   355,    45,    71,
+     136,   137,   138,   139,   140,   141,   142,   380,   143,   144,
+     145,   146,   365,   174,   175,    47,    72,   176,   397,   177,
+     398,   613,   178,   399,   616,   179,   147,   373,   148,   366,
+     672,   673,   674,   796,   149,   374,   150,   375,   713,   714,
+     715,   818,   692,   693,   694,   799,   974,   695,   800,   696,
+     801,   697,   802,   698,   699,   431,   700,   701,   702,   703,
+     704,   705,   706,   707,   808,   708,   809,   709,   710,   151,
+     387,   737,   738,   739,   740,   741,   742,   743,   152,   390,
+     752,   753,   754,   841,    61,    79,   300,   301,   302,   444,
+     303,   445,   153,   391,   761,   762,   763,   764,   765,   766,
+     767,   768,   154,   381,   717,   718,   719,   821,    49,    73,
+     199,   200,   201,   407,   202,   403,   203,   404,   204,   405,
+     205,   408,   206,   412,   207,   411,   208,   410,   627,   209,
+     155,   384,   729,   730,   731,   830,   908,   909,   156,   382,
+      55,    76,   721,   722,   723,   824,    57,    77,   265,   266,
+     267,   268,   269,   270,   271,   430,   272,   434,   273,   433,
+     274,   275,   435,   276,   157,   383,   725,   726,   727,   827,
+      59,    78,   286,   287,   288,   289,   290,   439,   291,   292,
+     293,   294,   211,   406,   781,   782,   783,   860,    51,    74,
+     224,   225,   226,   416,   158,   385,   159,   386,   160,   389,
+     748,   749,   750,   838,    53,    75,   241,   242,   243,   161,
+     370,   162,   371,   163,   372,   247,   426,   786,   863,   248,
+     420,   249,   421,   250,   423,   251,   422,   252,   425,   253,
+     424,   254,   419,   218,   413,   787,   164,   388,   745,   746,
+     835,   930,   931,   932,   933,   934,   986,   935,   165,   166,
+     393,   774,   775,   776,   852,   777,   853,   167,   394,    63,
+      80,   323,   324,   325,   326,   449,   327,   450,   328,   329,
+     452,   330,   331,   332,   455,   653,   333,   456,   334,   335,
+     336,   337,   460,   660,   338,   461,   339,   462,   340,   463,
+      99,   357,   100,   358,   101,   359,   168,   363,   364,    67,
+      82,   347,   348,   349,   469,   102,   356,    65,    81,   342,
+     343,   344,   466,   789,   790,   865,   963,   964,   965,   966,
+     999,   967,   997,  1014,  1015,  1016,  1023,  1024,  1025,  1030,
+    1026,  1027,  1028
   };
 
-  const unsigned short int
+  const unsigned short
   Dhcp4Parser::yytable_[] =
   {
-      95,   134,   171,   191,   217,   234,   706,   260,   279,   296,
-     317,   252,   281,   477,   178,   209,   224,   236,   282,   274,
-     292,   623,   318,    89,    83,   192,   211,   627,   193,    31,
-     194,    32,   897,    33,   179,   210,   225,   237,    30,   275,
-     293,   898,   319,   901,   910,   646,   342,   294,   295,    42,
-     218,   261,   280,   294,   295,   207,   220,   235,   828,   103,
-      44,   829,   195,   104,    46,   105,   212,   213,   241,   242,
-     219,   233,   779,   214,   106,   243,   107,   108,   109,   110,
-     111,   112,   113,   114,   167,   168,   609,   610,   169,   358,
-     391,   170,   124,   125,   359,   392,   606,   607,   254,   276,
-     255,   256,   277,   278,   115,   116,   117,   118,   119,   120,
-     124,   125,    48,   121,   122,    94,   397,   650,   651,   652,
-     653,   398,   831,   861,   123,   832,   862,   124,   125,  1013,
-     764,   765,  1014,  1015,  1016,   254,    50,   126,   127,   727,
-     728,   729,   730,   128,   731,   124,   125,   124,   125,   410,
-      52,    90,   654,   129,   411,    86,   130,    54,   647,    56,
-      91,    92,    93,   131,   132,   413,   442,   133,    58,  1011,
-     414,   443,  1012,   108,   109,   110,   111,    94,   460,   463,
-      60,    94,   466,   461,   464,   897,   121,   467,    34,    35,
-      36,    37,   348,    62,   898,    64,   901,   910,    94,    94,
-     115,   116,   117,    66,   466,   338,   180,   181,   182,   579,
-     122,   347,   950,   391,   951,   952,    94,   463,   787,   349,
-     350,   183,   788,   124,   125,   184,   185,   186,   187,   351,
-     423,   357,   883,   664,    94,   188,    94,   364,   189,   128,
-     466,   108,   109,   110,   111,   789,   190,   122,   365,   109,
-     110,   111,   750,   751,   752,   753,   754,   755,   397,   216,
-     124,   125,   792,   790,   372,   373,   810,   793,   115,   116,
-     117,   811,   188,   120,   374,   189,   810,   845,   122,   254,
-     375,   812,   846,   388,   849,   122,   396,   405,    95,   850,
-     460,   124,   125,   424,   185,   851,   187,   810,   124,   125,
-     425,   428,   974,   188,   468,   469,   189,   432,   410,   226,
-     433,   434,    94,   975,   190,   227,   228,   229,   230,   231,
-     232,   134,   233,   978,   442,   413,   994,   171,   979,   985,
-     989,   995,  1028,   618,   619,   620,   621,  1029,   436,   178,
-     191,   437,   439,   217,   964,   965,   966,   967,   438,    94,
-     444,   447,   209,   449,   234,   224,   450,   453,   454,   179,
-     455,   470,   192,   211,   260,   193,   236,   194,   471,   279,
-     472,   473,   210,   281,   474,   225,   274,   475,   478,   282,
-      94,   292,   479,   480,   481,   482,   237,    94,   483,   218,
-     317,   484,   207,   485,   486,   220,   275,   487,   488,   195,
-     489,   293,   318,   212,   213,   490,   235,   491,   261,   219,
-     214,   492,   493,   280,   109,   110,   111,   241,   242,   494,
-     495,   496,   319,   253,   243,   497,   498,   670,   499,   576,
-     577,   578,   671,   672,   673,   674,   675,   676,   677,   678,
-     679,   680,   681,   682,   683,   684,   685,   500,   990,   121,
-     122,   254,   501,   502,   254,   503,   255,   256,   254,   504,
-     257,   258,   259,   124,   125,   505,   124,   125,   506,   507,
-     509,   510,   511,   512,   514,   515,   913,   914,     1,     2,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,   516,   517,   518,   519,   520,   521,   522,   523,
-     524,   526,   528,   529,   134,   530,   642,   531,   532,   533,
-     534,   171,   535,   537,   538,   539,   686,   686,   540,   541,
-     542,   545,   543,   178,   546,   124,   125,   547,   549,   661,
-     550,   553,   766,   317,   554,   552,   555,   556,   559,   560,
-     557,   558,   564,   179,   767,   318,   565,   561,   562,   563,
-     566,   567,    94,   569,   571,    94,   573,   649,   574,    94,
-     575,   580,   581,   582,   768,   319,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     586,   587,   583,   584,   585,   588,   315,   316,   590,   589,
-     591,   592,   593,   596,   597,    32,   598,   599,   600,   612,
-     613,   601,   602,   603,   604,   614,   615,   625,   616,   617,
-     624,   626,   659,   660,    94,   798,   628,   629,   630,   707,
-     631,   632,   633,   634,   635,   636,   637,   638,   666,   711,
-     715,   719,   723,   639,   739,   742,   640,   641,   643,   644,
-     645,   656,   657,   658,   746,   775,   783,   799,   800,   801,
-     802,   805,   806,   807,   808,   809,   815,   870,   814,   818,
-     817,   820,   821,   823,   824,   827,   826,   835,   594,   834,
-     838,   837,   839,   840,   841,   842,   843,   844,   857,   871,
-     856,   946,   852,   863,   859,   864,   866,   867,   868,   869,
-     872,   875,   876,   942,   874,   873,   877,   878,   943,   945,
-     949,   879,   880,   976,   981,   935,   881,   977,   936,   937,
-     938,   982,   983,   939,   984,   992,   997,  1000,  1002,   476,
-    1005,  1025,   940,   963,   969,   970,   971,   972,   973,   986,
-     987,   988,  1007,  1026,  1001,   998,  1004,  1027,  1030,  1006,
-     686,  1032,  1035,   686,  1031,   662,   191,  1033,   665,   260,
-     508,   865,   279,   786,   884,   891,   281,   882,   209,   513,
-     915,   274,   282,   234,   292,   917,   296,   905,   192,   211,
-     934,   193,   919,   194,   912,   236,   941,   892,   210,   766,
-     893,   275,   894,   551,   293,   217,   933,   906,   886,   885,
-     953,   767,   920,   261,   911,   237,   280,   224,   207,   896,
-     996,   899,   955,   887,   916,   195,   525,   904,   888,   212,
-     213,   768,   918,   947,   895,   235,   214,   225,   907,   908,
-     544,   900,   956,   921,   922,   909,   241,   242,   890,   889,
-     923,   218,   948,   243,   954,   931,   548,   220,   932,   930,
-     527,   999,   773,   568,   780,  1003,   944,   536,   570,  1023,
-     663,   219,  1034,   962,     0,     0,     0,     0,   572,     0,
+      95,   135,   173,   193,   220,   237,   711,   263,   282,   299,
+     320,   255,   284,   481,   180,   212,   227,   239,   285,   277,
+     295,   628,   321,   345,    83,   194,   214,   632,   195,    31,
+     196,    32,   903,    33,   181,   213,   228,   240,    86,   278,
+     296,   904,   322,   907,    89,    30,   916,    42,   651,   361,
+     221,   264,   283,   395,   362,   210,   223,   238,   396,    44,
+     401,   122,   197,   297,   298,   402,   215,   216,   244,   245,
+     222,    46,   103,   217,   414,   246,   104,   198,   105,   415,
+     417,   655,   656,   657,   658,   418,    48,   106,   351,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   169,   170,
+      50,   123,   171,  1019,    52,   172,  1020,  1021,  1022,   110,
+     111,   112,   446,   219,   125,   126,   659,   447,   116,   117,
+     118,   119,   120,   121,    54,    94,   190,   122,   123,   191,
+     125,   126,   755,   756,   757,   758,   759,   760,   124,   297,
+     298,   125,   126,   464,   122,   123,   257,   341,   465,   467,
+     470,   127,   128,   833,   468,   471,   834,   129,   125,   126,
+     125,   126,   652,   623,   624,   625,   626,   130,   769,   770,
+     131,   919,   920,    90,   470,   395,    94,   132,   133,   584,
+     792,   134,    91,    92,    93,   836,   903,    56,   837,    34,
+      35,    36,    37,   257,    58,   904,   467,   907,    60,    94,
+     916,   793,   470,    94,    62,   125,   126,   794,   108,   109,
+     110,   111,   112,   732,   733,   734,   735,   866,   736,    94,
+     867,   257,   279,   258,   259,   280,   281,    64,  1017,    66,
+      94,  1018,   888,   125,   126,   669,   116,   117,   118,   350,
+     401,   474,   182,   183,   184,   795,   123,    94,   797,    94,
+     110,   111,   112,   798,   611,   612,   353,   185,   352,   125,
+     126,   186,   187,   188,   189,   970,   971,   972,   973,   354,
+     956,   190,   957,   958,   191,   129,   108,   109,   110,   111,
+     112,   360,   192,   815,   815,   850,   123,   854,   816,   817,
+     851,    95,   855,   464,    94,   367,   815,   414,   856,   125,
+     126,   980,   981,   368,   116,   117,   118,   472,   473,   121,
+     229,   614,   615,   369,   123,   257,   230,   231,   232,   233,
+     234,   235,    94,   236,   984,   135,   376,   125,   126,   985,
+     187,   173,   189,   446,   427,   417,  1000,   428,   991,   190,
+     995,  1001,   191,   180,   193,   377,  1034,   220,    94,   378,
+     192,  1035,   236,   784,   379,   392,   212,   400,   237,   227,
+     409,   432,   429,   181,   436,   438,   194,   214,   263,   195,
+     239,   196,   440,   282,   437,   441,   213,   284,   442,   228,
+     277,   443,   494,   285,   448,   295,   451,   453,    94,   454,
+     240,   457,   458,   221,   320,   459,   210,   475,   476,   223,
+     278,   477,   478,   197,   485,   296,   321,   215,   216,   479,
+     238,   482,   264,   222,   217,   483,    94,   283,   198,   484,
+     488,   244,   245,   486,   487,   489,   322,   490,   246,   491,
+     492,   493,   498,   581,   582,   583,   256,   495,   496,   497,
+     125,   126,   499,   500,   501,   675,   502,   503,   504,   996,
+     676,   677,   678,   679,   680,   681,   682,   683,   684,   685,
+     686,   687,   688,   689,   690,   505,   506,   257,   507,   258,
+     259,   508,   509,   260,   261,   262,   257,   510,   511,   125,
+     126,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,   317,   512,   514,   515,   516,   517,
+     519,   318,   319,   520,   521,   522,   523,   524,   525,   135,
+     526,   647,   527,   528,   529,   531,   173,   533,   534,   535,
+     536,   691,   691,   537,   538,   539,   540,   542,   180,    94,
+     543,   544,   545,   546,   666,   547,   550,   771,   320,   554,
+     548,   551,   552,   555,   557,   558,   559,   560,   181,   772,
+     321,     1,     2,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,   561,   564,   562,    94,   773,
+     322,   565,   563,   569,   570,   571,   566,    94,   567,   572,
+     574,   568,   576,   578,   579,   588,   671,   580,   585,   586,
+     587,   591,   592,   593,   589,   590,   594,   595,   596,   597,
+     598,   601,   602,    32,   603,   604,   605,   875,   820,   606,
+     607,   608,   609,   617,   618,   619,   620,   621,   622,   629,
+     630,   631,   633,   634,   635,   636,   664,   654,   637,   665,
+     638,   639,   712,   716,   640,   641,   642,   643,   644,   720,
+     645,   646,   648,   649,   650,   661,   662,   663,   724,   728,
+     744,   747,   751,   780,   788,   803,   804,   805,   806,   807,
+     810,   811,   812,   813,   814,   876,   823,   819,   822,   826,
+     825,   828,   829,   831,   832,   840,   839,   843,   862,   842,
+     844,   845,   846,   847,   848,   849,   878,   599,   861,   857,
+     868,   864,   869,   871,   872,   873,   874,   880,   881,   877,
+     879,   948,   882,   883,   884,   949,   885,   952,   951,   955,
+     941,   886,   942,   943,   944,   945,   946,   969,   975,   976,
+     977,   978,   979,   982,   983,   987,   988,   989,   990,   992,
+     993,   994,   998,  1003,  1006,  1008,  1004,  1011,  1007,  1010,
+    1013,  1031,  1032,  1033,  1036,   691,   667,   480,   691,   670,
+     513,   193,  1012,   518,   263,  1038,  1041,   282,  1037,   791,
+     896,   284,   870,   212,  1039,   921,   277,   285,   237,   295,
+     923,   299,   911,   194,   214,   940,   195,   925,   196,   889,
+     239,   887,   897,   213,   771,   898,   278,   899,   939,   296,
+     220,   918,   912,   556,   947,   959,   772,   926,   264,   890,
+     240,   283,   227,   210,   902,   917,   905,   961,   891,   922,
+     197,  1002,   910,   530,   215,   216,   773,   924,   893,   900,
+     238,   217,   228,   913,   914,   198,   906,   962,   927,   928,
+     915,   244,   245,   892,   901,   929,   221,   895,   246,   960,
+     549,   894,   223,   954,   953,   938,   541,   553,   937,   532,
+    1005,   785,   936,   573,   778,   950,   222,   968,   668,   575,
+     577,  1029,  1009,  1040,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   891,     0,
-       0,     0,     0,   915,     0,     0,     0,     0,   917,     0,
-     905,     0,     0,     0,   953,   919,     0,     0,     0,     0,
-     892,     0,     0,   893,     0,   894,   955,     0,     0,     0,
-     906,     0,     0,     0,     0,   920,     0,     0,     0,     0,
-       0,     0,   896,     0,   899,     0,   956,   916,     0,     0,
-     904,     0,     0,     0,     0,   918,     0,   895,   954,     0,
-       0,   907,   908,     0,   900,     0,   921,   922,   909,     0,
-       0,     0,     0,   923
+       0,     0,     0,     0,   896,     0,     0,     0,     0,   921,
+       0,     0,     0,     0,   923,     0,   911,     0,     0,     0,
+     959,   925,     0,     0,     0,     0,   897,     0,     0,   898,
+       0,   899,   961,     0,     0,     0,   912,     0,     0,     0,
+       0,   926,     0,     0,     0,     0,     0,     0,   902,     0,
+     905,     0,   962,   922,     0,     0,   910,     0,     0,     0,
+       0,   924,     0,   900,   960,     0,     0,   913,   914,     0,
+     906,     0,   927,   928,   915,     0,     0,     0,   901,   929
   };
 
-  const short int
+  const short
   Dhcp4Parser::yycheck_[] =
   {
-      70,    71,    72,    73,    74,    75,   587,    77,    78,    79,
-      80,    76,    78,   360,    72,    73,    74,    75,    78,    77,
-      78,   522,    80,    10,    68,    73,    73,   528,    73,     5,
-      73,     7,   825,     9,    72,    73,    74,    75,     0,    77,
-      78,   825,    80,   825,   825,    17,    12,   102,   103,     7,
-      74,    77,    78,   102,   103,    73,    74,    75,     3,     7,
-       7,     6,    73,    11,     7,    13,    73,    73,    75,    75,
-      74,    99,   100,    73,    22,    75,    24,    25,    26,    27,
-      28,    29,    30,    31,    14,    15,    19,    20,    18,     3,
-       3,    21,    75,    76,     8,     8,    16,    17,    63,    64,
-      65,    66,    67,    68,    52,    53,    54,    55,    56,    57,
-      75,    76,     7,    61,    62,   164,     3,   132,   133,   134,
-     135,     8,     3,     3,    72,     6,     6,    75,    76,   141,
-     113,   114,   144,   145,   146,    63,     7,    85,    86,    92,
-      93,    94,    95,    91,    97,    75,    76,    75,    76,     3,
-       7,   138,   167,   101,     8,   164,   104,     7,   130,     7,
-     147,   148,   149,   111,   112,     3,     3,   115,     7,     3,
-       8,     8,     6,    25,    26,    27,    28,   164,     3,     3,
-       7,   164,     3,     8,     8,   978,    61,     8,   164,   165,
-     166,   167,     3,     7,   978,     7,   978,   978,   164,   164,
-      52,    53,    54,     7,     3,   139,    58,    59,    60,     8,
-      62,     6,   140,     3,   142,   143,   164,     3,     8,     4,
-       8,    73,     8,    75,    76,    77,    78,    79,    80,     3,
-       8,     4,   813,   580,   164,    87,   164,     4,    90,    91,
-       3,    25,    26,    27,    28,     8,    98,    62,     4,    26,
-      27,    28,   105,   106,   107,   108,   109,   110,     3,    74,
-      75,    76,     3,     8,     4,     4,     3,     8,    52,    53,
-      54,     8,    87,    57,     4,    90,     3,     3,    62,    63,
-       4,     8,     8,     4,     3,    62,     4,     4,   358,     8,
-       3,    75,    76,     3,    78,     8,    80,     3,    75,    76,
-       8,     4,     8,    87,   348,   349,    90,     4,     3,    86,
-       8,     3,   164,     8,    98,    92,    93,    94,    95,    96,
-      97,   391,    99,     3,     3,     3,     3,   397,     8,     8,
-       8,     8,     3,    81,    82,    83,    84,     8,     4,   397,
-     410,     4,     3,   413,    33,    34,    35,    36,     8,   164,
-       4,     4,   410,     4,   424,   413,     4,     4,     4,   397,
-       4,   164,   410,   410,   434,   410,   424,   410,     4,   439,
-       4,     4,   410,   439,     4,   413,   434,     4,     4,   439,
-     164,   439,     4,     4,   167,   167,   424,   164,     4,   413,
-     460,     4,   410,     4,     4,   413,   434,     4,     4,   410,
-     165,   439,   460,   410,   410,   165,   424,   165,   434,   413,
-     410,   165,     4,   439,    26,    27,    28,   424,   424,     4,
-       4,     4,   460,    32,   424,     4,     4,    32,     4,   473,
-     474,   475,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,     4,   949,    61,
-      62,    63,     4,     4,    63,     4,    65,    66,    63,     4,
-      69,    70,    71,    75,    76,   165,    75,    76,     4,     4,
-       4,     4,     4,   167,     4,     4,    88,    89,   150,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,     4,     4,     4,     4,   165,     4,     4,     4,
-       4,     4,     4,     4,   574,     4,   550,     4,     4,     4,
-       4,   581,     4,     4,     4,   165,   586,   587,     4,     4,
-       4,     4,   167,   581,   167,    75,    76,   167,     4,   573,
-       4,     4,   602,   603,     4,   167,   165,     4,     4,     4,
-     165,   165,     4,   581,   602,   603,     4,   167,   167,   167,
-       4,     4,   164,     4,     4,   164,     4,   131,     7,   164,
-       7,     7,     7,     7,   602,   603,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-       7,     7,   164,   164,   164,     5,   136,   137,     5,   164,
-       5,     5,     5,   164,     5,     7,     5,     5,     5,   164,
-     164,     7,     7,     7,     5,   164,     5,     7,   164,   164,
-     164,   164,     5,     5,   164,     4,   164,   164,   164,     7,
-     164,   164,   164,   164,   164,   164,   164,   164,    23,     7,
-       7,     7,     7,   164,     7,     7,   164,   164,   164,   164,
-     164,   164,   164,   164,     7,     7,     7,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     3,   165,     6,     3,
-       6,     6,     3,     6,     3,     3,     6,     3,   498,     6,
-       3,     6,     4,     4,     4,     4,     4,     4,     3,   167,
-       6,     3,   164,     6,     8,     4,     4,     4,     4,     4,
-     165,     4,     4,     4,   165,   167,   165,   165,     4,     6,
-       4,   165,   165,     8,     4,   165,   167,     8,   165,   165,
-     165,     8,     3,   165,     8,     4,     4,     4,     4,   358,
-       5,     4,   165,   164,   164,   164,   164,   164,   164,   164,
-     164,   164,     7,     4,   165,   167,   164,     4,     4,   164,
-     810,   165,   164,   813,   167,   574,   816,   165,   581,   819,
-     391,   792,   822,   660,   815,   825,   822,   810,   816,   397,
-     830,   819,   822,   833,   822,   830,   836,   825,   816,   816,
-     838,   816,   830,   816,   828,   833,   845,   825,   816,   849,
-     825,   819,   825,   442,   822,   855,   836,   825,   818,   816,
-     860,   849,   830,   819,   827,   833,   822,   855,   816,   825,
-     978,   825,   860,   819,   830,   816,   410,   825,   821,   816,
-     816,   849,   830,   855,   825,   833,   816,   855,   825,   825,
-     434,   825,   860,   830,   830,   825,   833,   833,   824,   822,
-     830,   855,   857,   833,   860,   833,   439,   855,   835,   831,
-     413,   983,   603,   460,   625,   994,   849,   424,   463,  1011,
-     575,   855,  1028,   861,    -1,    -1,    -1,    -1,   466,    -1,
+      70,    71,    72,    73,    74,    75,   592,    77,    78,    79,
+      80,    76,    78,   363,    72,    73,    74,    75,    78,    77,
+      78,   527,    80,    12,    68,    73,    73,   533,    73,     5,
+      73,     7,   830,     9,    72,    73,    74,    75,   165,    77,
+      78,   830,    80,   830,    10,     0,   830,     7,    17,     3,
+      74,    77,    78,     3,     8,    73,    74,    75,     8,     7,
+       3,    62,    73,   103,   104,     8,    73,    73,    75,    75,
+      74,     7,     7,    73,     3,    75,    11,    73,    13,     8,
+       3,   133,   134,   135,   136,     8,     7,    22,     3,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    14,    15,
+       7,    63,    18,   142,     7,    21,   145,   146,   147,    27,
+      28,    29,     3,    75,    76,    77,   168,     8,    53,    54,
+      55,    56,    57,    58,     7,   165,    88,    62,    63,    91,
+      76,    77,   106,   107,   108,   109,   110,   111,    73,   103,
+     104,    76,    77,     3,    62,    63,    64,   140,     8,     3,
+       3,    86,    87,     3,     8,     8,     6,    92,    76,    77,
+      76,    77,   131,    82,    83,    84,    85,   102,   114,   115,
+     105,    89,    90,   139,     3,     3,   165,   112,   113,     8,
+       8,   116,   148,   149,   150,     3,   984,     7,     6,   165,
+     166,   167,   168,    64,     7,   984,     3,   984,     7,   165,
+     984,     8,     3,   165,     7,    76,    77,     8,    25,    26,
+      27,    28,    29,    93,    94,    95,    96,     3,    98,   165,
+       6,    64,    65,    66,    67,    68,    69,     7,     3,     7,
+     165,     6,   818,    76,    77,   585,    53,    54,    55,     6,
+       3,   165,    59,    60,    61,     8,    63,   165,     3,   165,
+      27,    28,    29,     8,    16,    17,     8,    74,     4,    76,
+      77,    78,    79,    80,    81,    34,    35,    36,    37,     3,
+     141,    88,   143,   144,    91,    92,    25,    26,    27,    28,
+      29,     4,    99,     3,     3,     3,    63,     3,     8,     8,
+       8,   361,     8,     3,   165,     4,     3,     3,     8,    76,
+      77,     8,     8,     4,    53,    54,    55,   351,   352,    58,
+      87,    19,    20,     4,    63,    64,    93,    94,    95,    96,
+      97,    98,   165,   100,     3,   395,     4,    76,    77,     8,
+      79,   401,    81,     3,     8,     3,     3,     3,     8,    88,
+       8,     8,    91,   401,   414,     4,     3,   417,   165,     4,
+      99,     8,   100,   101,     4,     4,   414,     4,   428,   417,
+       4,     4,     8,   401,     4,     3,   414,   414,   438,   414,
+     428,   414,     4,   443,     8,     4,   414,   443,     8,   417,
+     438,     3,   166,   443,     4,   443,     4,     4,   165,     4,
+     428,     4,     4,   417,   464,     4,   414,     4,     4,   417,
+     438,     4,     4,   414,   168,   443,   464,   414,   414,     4,
+     428,     4,   438,   417,   414,     4,   165,   443,   414,     4,
+       4,   428,   428,   168,   168,     4,   464,     4,   428,     4,
+       4,     4,     4,   477,   478,   479,    33,   166,   166,   166,
+      76,    77,     4,     4,     4,    33,     4,     4,     4,   955,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,     4,     4,    64,     4,    66,
+      67,     4,     4,    70,    71,    72,    64,   166,     4,    76,
+      77,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,     4,     4,     4,     4,   168,
+       4,   137,   138,     4,     4,     4,     4,     4,   166,   579,
+       4,   555,     4,     4,     4,     4,   586,     4,     4,     4,
+       4,   591,   592,     4,     4,     4,     4,     4,   586,   165,
+       4,   166,     4,     4,   578,     4,     4,   607,   608,     4,
+     168,   168,   168,     4,   168,     4,     4,   166,   586,   607,
+     608,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,     4,     4,   166,   165,   607,
+     608,     4,   166,     4,     4,     4,   168,   165,   168,     4,
+       4,   168,     4,     4,     7,   165,    23,     7,     7,     7,
+       7,     7,     7,     5,   165,   165,   165,     5,     5,     5,
+       5,   165,     5,     7,     5,     5,     5,   166,     3,     7,
+       7,     7,     5,   165,   165,   165,     5,   165,   165,   165,
+       7,   165,   165,   165,   165,   165,     5,   132,   165,     5,
+     165,   165,     7,     7,   165,   165,   165,   165,   165,     7,
+     165,   165,   165,   165,   165,   165,   165,   165,     7,     7,
+       7,     7,     7,     7,     7,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,   168,     3,     6,     6,     3,
+       6,     6,     3,     6,     3,     3,     6,     3,     3,     6,
+       4,     4,     4,     4,     4,     4,   168,   503,     6,   165,
+       6,     8,     4,     4,     4,     4,     4,     4,     4,   166,
+     166,     4,   166,   166,   166,     4,   166,     3,     6,     4,
+     166,   168,   166,   166,   166,   166,   166,   165,   165,   165,
+     165,   165,   165,     8,     8,     4,     8,     3,     8,   165,
+     165,   165,     4,     4,     4,     4,   168,     5,   166,   165,
+       7,     4,     4,     4,     4,   815,   579,   361,   818,   586,
+     395,   821,   165,   401,   824,   166,   165,   827,   168,   665,
+     830,   827,   797,   821,   166,   835,   824,   827,   838,   827,
+     835,   841,   830,   821,   821,   843,   821,   835,   821,   820,
+     838,   815,   830,   821,   854,   830,   824,   830,   841,   827,
+     860,   833,   830,   446,   850,   865,   854,   835,   824,   821,
+     838,   827,   860,   821,   830,   832,   830,   865,   823,   835,
+     821,   984,   830,   414,   821,   821,   854,   835,   826,   830,
+     838,   821,   860,   830,   830,   821,   830,   865,   835,   835,
+     830,   838,   838,   824,   830,   835,   860,   829,   838,   865,
+     438,   827,   860,   862,   860,   840,   428,   443,   838,   417,
+     989,   630,   836,   464,   608,   854,   860,   866,   580,   467,
+     470,  1017,  1000,  1034,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   978,    -1,
-      -1,    -1,    -1,   983,    -1,    -1,    -1,    -1,   983,    -1,
-     978,    -1,    -1,    -1,   994,   983,    -1,    -1,    -1,    -1,
-     978,    -1,    -1,   978,    -1,   978,   994,    -1,    -1,    -1,
-     978,    -1,    -1,    -1,    -1,   983,    -1,    -1,    -1,    -1,
-      -1,    -1,   978,    -1,   978,    -1,   994,   983,    -1,    -1,
-     978,    -1,    -1,    -1,    -1,   983,    -1,   978,   994,    -1,
-      -1,   978,   978,    -1,   978,    -1,   983,   983,   978,    -1,
-      -1,    -1,    -1,   983
+      -1,    -1,    -1,    -1,   984,    -1,    -1,    -1,    -1,   989,
+      -1,    -1,    -1,    -1,   989,    -1,   984,    -1,    -1,    -1,
+    1000,   989,    -1,    -1,    -1,    -1,   984,    -1,    -1,   984,
+      -1,   984,  1000,    -1,    -1,    -1,   984,    -1,    -1,    -1,
+      -1,   989,    -1,    -1,    -1,    -1,    -1,    -1,   984,    -1,
+     984,    -1,  1000,   989,    -1,    -1,   984,    -1,    -1,    -1,
+      -1,   989,    -1,   984,  1000,    -1,    -1,   984,   984,    -1,
+     984,    -1,   989,   989,   984,    -1,    -1,    -1,   984,   989
   };
 
-  const unsigned short int
+  const unsigned short
   Dhcp4Parser::yystos_[] =
   {
-       0,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-       0,     5,     7,     9,   164,   165,   166,   167,   184,   185,
-     186,   191,     7,   200,     7,   206,     7,   222,     7,   315,
-       7,   395,     7,   411,     7,   347,     7,   353,     7,   377,
-       7,   291,     7,   466,     7,   514,     7,   506,   192,   187,
-     201,   207,   223,   316,   396,   412,   348,   354,   378,   292,
-     467,   515,   507,   184,   193,   194,   164,   189,   190,    10,
-     138,   147,   148,   149,   164,   199,   202,   203,   204,   497,
-     499,   501,   512,     7,    11,    13,    22,    24,    25,    26,
-      27,    28,    29,    30,    31,    52,    53,    54,    55,    56,
-      57,    61,    62,    72,    75,    76,    85,    86,    91,   101,
-     104,   111,   112,   115,   199,   208,   209,   210,   211,   212,
-     213,   214,   216,   217,   218,   233,   235,   241,   243,   276,
-     285,   299,   309,   337,   345,   371,   401,   403,   405,   416,
-     418,   420,   443,   455,   456,   464,   503,    14,    15,    18,
-      21,   199,   220,   221,   224,   226,   229,   232,   401,   403,
-      58,    59,    60,    73,    77,    78,    79,    80,    87,    90,
-      98,   199,   210,   211,   212,   217,   317,   318,   319,   321,
-     323,   325,   327,   329,   331,   333,   336,   371,   389,   401,
-     403,   405,   416,   418,   420,   440,    74,   199,   329,   331,
-     371,   397,   398,   399,   401,   403,    86,    92,    93,    94,
-      95,    96,    97,    99,   199,   371,   401,   403,   413,   414,
-     415,   416,   418,   420,   422,   426,   428,   430,   432,   434,
-     436,   438,   345,    32,    63,    65,    66,    69,    70,    71,
-     199,   261,   355,   356,   357,   358,   359,   360,   361,   363,
-     365,   367,   368,   370,   401,   403,    64,    67,    68,   199,
-     261,   359,   365,   379,   380,   381,   382,   383,   385,   386,
-     387,   388,   401,   403,   102,   103,   199,   293,   294,   295,
-     297,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   136,   137,   199,   401,   403,
-     468,   469,   470,   471,   473,   475,   476,   478,   479,   480,
-     483,   485,   486,   487,   488,   491,   493,   495,   139,   516,
-     517,   518,    12,   199,   508,   509,   510,     6,     3,     4,
-       8,     3,   205,   513,   498,   500,   502,     4,     3,     8,
-     504,   505,   219,   236,     4,     4,   417,   419,   421,   234,
-     242,   244,     4,     4,     4,     4,   215,   310,   346,   372,
-     338,   402,   404,   277,   444,   406,   286,   300,     4,   457,
-     465,     3,     8,   225,   227,   230,     4,     3,     8,   322,
-     324,   326,   390,   320,   328,     4,   334,   332,   330,   441,
-       3,     8,   400,     3,     8,   439,   427,   429,   433,   431,
-     437,   435,   423,     8,     3,     8,   362,   262,     4,   366,
-     364,   369,     4,     8,     3,   384,     4,     4,     8,     3,
-     296,   298,     3,     8,     4,   472,   474,     4,   477,     4,
-       4,   481,   484,     4,     4,     4,   489,   492,   494,   496,
-       3,     8,   519,     3,     8,   511,     3,     8,   184,   184,
-     164,     4,     4,     4,     4,     4,   203,   508,     4,     4,
-       4,   167,   167,     4,     4,     4,     4,     4,     4,   165,
-     165,   165,   165,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,   165,     4,     4,   209,     4,
-       4,     4,   167,   221,     4,     4,     4,     4,     4,     4,
-     165,     4,     4,     4,     4,   318,     4,   398,     4,     4,
-       4,     4,     4,     4,     4,     4,   415,     4,     4,   165,
-       4,     4,     4,   167,   357,     4,   167,   167,   381,     4,
-       4,   294,   167,     4,     4,   165,     4,   165,   165,     4,
-       4,   167,   167,   167,     4,     4,     4,     4,   469,     4,
-     517,     4,   509,     4,     7,     7,   184,   184,   184,     8,
-       7,     7,     7,   164,   164,   164,     7,     7,     5,   164,
-       5,     5,     5,     5,   186,   188,   164,     5,     5,     5,
-       5,     7,     7,     7,     5,   195,    16,    17,   228,    19,
-      20,   231,   164,   164,   164,     5,   164,   164,    81,    82,
-      83,    84,   335,   195,   164,     7,   164,   195,   164,   164,
-     164,   164,   164,   164,   164,   164,   164,   164,   164,   164,
-     164,   164,   184,   164,   164,   164,    17,   130,   482,   131,
-     132,   133,   134,   135,   167,   490,   164,   164,   164,     5,
-       5,   184,   208,   516,   508,   220,    23,   237,   238,   239,
-      32,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,   199,   249,   250,   251,
-     254,   256,   258,   260,   261,   263,   264,   265,   266,   267,
-     268,   269,   270,   272,   274,   275,   249,     7,   245,   246,
-     247,     7,   311,   312,   313,     7,   349,   350,   351,     7,
-     373,   374,   375,     7,   339,   340,   341,    92,    93,    94,
-      95,    97,   278,   279,   280,   281,   282,   283,   284,     7,
-     445,   446,     7,   407,   408,   409,     7,   287,   288,   289,
-     105,   106,   107,   108,   109,   110,   301,   302,   303,   304,
-     305,   306,   307,   308,   113,   114,   199,   401,   403,   458,
-     459,   460,   462,   468,   196,     7,   391,   392,   393,   100,
-     422,   424,   442,     7,   520,   521,   245,     8,     8,     8,
-       8,   240,     3,     8,   252,   255,   257,   259,     4,     4,
-       4,     4,     4,   271,   273,     4,     4,     4,     4,     4,
-       3,     8,     8,   248,     6,     3,   314,     6,     3,   352,
-       6,     3,   376,     6,     3,   342,     6,     3,     3,     6,
-     447,     3,     6,   410,     6,     3,   290,     6,     3,     4,
-       4,     4,     4,     4,     4,     3,     8,   461,   463,     3,
-       8,     8,   164,   197,   198,   394,     6,     3,   425,     8,
-     522,     3,     6,     6,     4,   238,     4,     4,     4,     4,
-     165,   167,   165,   167,   165,     4,     4,   165,   165,   165,
-     165,   167,   250,   249,   247,   317,   313,   355,   351,   379,
-     375,   199,   210,   211,   212,   217,   261,   309,   327,   329,
-     331,   333,   343,   344,   371,   401,   403,   416,   418,   420,
-     440,   341,   279,    88,    89,   199,   261,   345,   371,   401,
-     403,   416,   418,   420,   448,   449,   450,   451,   452,   454,
-     446,   413,   409,   293,   289,   165,   165,   165,   165,   165,
-     165,   302,     4,     4,   459,     6,     3,   397,   393,     4,
-     140,   142,   143,   199,   261,   401,   403,   523,   524,   525,
-     526,   528,   521,   164,    33,    34,    35,    36,   253,   164,
-     164,   164,   164,   164,     8,     8,     8,     8,     3,     8,
-     453,     4,     8,     3,     8,     8,   164,   164,   164,     8,
-     195,   529,     4,   527,     3,     8,   344,     4,   167,   450,
-       4,   165,     4,   524,   164,     5,   164,     7,   530,   531,
-     532,     3,     6,   141,   144,   145,   146,   533,   534,   535,
-     537,   538,   539,   531,   536,     4,     4,     4,     3,     8,
-       4,   167,   165,   165,   534,   164
+       0,   151,   152,   153,   154,   155,   156,   157,   158,   159,
+     160,   161,   162,   163,   164,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+       0,     5,     7,     9,   165,   166,   167,   168,   185,   186,
+     187,   192,     7,   201,     7,   207,     7,   224,     7,   317,
+       7,   397,     7,   413,     7,   349,     7,   355,     7,   379,
+       7,   293,     7,   468,     7,   516,     7,   508,   193,   188,
+     202,   208,   225,   318,   398,   414,   350,   356,   380,   294,
+     469,   517,   509,   185,   194,   195,   165,   190,   191,    10,
+     139,   148,   149,   150,   165,   200,   203,   204,   205,   499,
+     501,   503,   514,     7,    11,    13,    22,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    53,    54,    55,    56,
+      57,    58,    62,    63,    73,    76,    77,    86,    87,    92,
+     102,   105,   112,   113,   116,   200,   209,   210,   211,   212,
+     213,   214,   215,   217,   218,   219,   220,   235,   237,   243,
+     245,   278,   287,   301,   311,   339,   347,   373,   403,   405,
+     407,   418,   420,   422,   445,   457,   458,   466,   505,    14,
+      15,    18,    21,   200,   222,   223,   226,   228,   231,   234,
+     403,   405,    59,    60,    61,    74,    78,    79,    80,    81,
+      88,    91,    99,   200,   211,   212,   213,   218,   219,   319,
+     320,   321,   323,   325,   327,   329,   331,   333,   335,   338,
+     373,   391,   403,   405,   407,   418,   420,   422,   442,    75,
+     200,   331,   333,   373,   399,   400,   401,   403,   405,    87,
+      93,    94,    95,    96,    97,    98,   100,   200,   373,   403,
+     405,   415,   416,   417,   418,   420,   422,   424,   428,   430,
+     432,   434,   436,   438,   440,   347,    33,    64,    66,    67,
+      70,    71,    72,   200,   263,   357,   358,   359,   360,   361,
+     362,   363,   365,   367,   369,   370,   372,   403,   405,    65,
+      68,    69,   200,   263,   361,   367,   381,   382,   383,   384,
+     385,   387,   388,   389,   390,   403,   405,   103,   104,   200,
+     295,   296,   297,   299,   117,   118,   119,   120,   121,   122,
+     123,   124,   125,   126,   127,   128,   129,   130,   137,   138,
+     200,   403,   405,   470,   471,   472,   473,   475,   477,   478,
+     480,   481,   482,   485,   487,   488,   489,   490,   493,   495,
+     497,   140,   518,   519,   520,    12,   200,   510,   511,   512,
+       6,     3,     4,     8,     3,   206,   515,   500,   502,   504,
+       4,     3,     8,   506,   507,   221,   238,     4,     4,     4,
+     419,   421,   423,   236,   244,   246,     4,     4,     4,     4,
+     216,   312,   348,   374,   340,   404,   406,   279,   446,   408,
+     288,   302,     4,   459,   467,     3,     8,   227,   229,   232,
+       4,     3,     8,   324,   326,   328,   392,   322,   330,     4,
+     336,   334,   332,   443,     3,     8,   402,     3,     8,   441,
+     429,   431,   435,   433,   439,   437,   425,     8,     3,     8,
+     364,   264,     4,   368,   366,   371,     4,     8,     3,   386,
+       4,     4,     8,     3,   298,   300,     3,     8,     4,   474,
+     476,     4,   479,     4,     4,   483,   486,     4,     4,     4,
+     491,   494,   496,   498,     3,     8,   521,     3,     8,   513,
+       3,     8,   185,   185,   165,     4,     4,     4,     4,     4,
+     204,   510,     4,     4,     4,   168,   168,   168,     4,     4,
+       4,     4,     4,     4,   166,   166,   166,   166,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+     166,     4,     4,   210,     4,     4,     4,   168,   223,     4,
+       4,     4,     4,     4,     4,   166,     4,     4,     4,     4,
+     320,     4,   400,     4,     4,     4,     4,     4,     4,     4,
+       4,   417,     4,     4,   166,     4,     4,     4,   168,   359,
+       4,   168,   168,   383,     4,     4,   296,   168,     4,     4,
+     166,     4,   166,   166,     4,     4,   168,   168,   168,     4,
+       4,     4,     4,   471,     4,   519,     4,   511,     4,     7,
+       7,   185,   185,   185,     8,     7,     7,     7,   165,   165,
+     165,     7,     7,     5,   165,     5,     5,     5,     5,   187,
+     189,   165,     5,     5,     5,     5,     7,     7,     7,     5,
+     196,    16,    17,   230,    19,    20,   233,   165,   165,   165,
+       5,   165,   165,    82,    83,    84,    85,   337,   196,   165,
+       7,   165,   196,   165,   165,   165,   165,   165,   165,   165,
+     165,   165,   165,   165,   165,   165,   165,   185,   165,   165,
+     165,    17,   131,   484,   132,   133,   134,   135,   136,   168,
+     492,   165,   165,   165,     5,     5,   185,   209,   518,   510,
+     222,    23,   239,   240,   241,    33,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,   200,   251,   252,   253,   256,   258,   260,   262,   263,
+     265,   266,   267,   268,   269,   270,   271,   272,   274,   276,
+     277,   251,     7,   247,   248,   249,     7,   313,   314,   315,
+       7,   351,   352,   353,     7,   375,   376,   377,     7,   341,
+     342,   343,    93,    94,    95,    96,    98,   280,   281,   282,
+     283,   284,   285,   286,     7,   447,   448,     7,   409,   410,
+     411,     7,   289,   290,   291,   106,   107,   108,   109,   110,
+     111,   303,   304,   305,   306,   307,   308,   309,   310,   114,
+     115,   200,   403,   405,   460,   461,   462,   464,   470,   197,
+       7,   393,   394,   395,   101,   424,   426,   444,     7,   522,
+     523,   247,     8,     8,     8,     8,   242,     3,     8,   254,
+     257,   259,   261,     4,     4,     4,     4,     4,   273,   275,
+       4,     4,     4,     4,     4,     3,     8,     8,   250,     6,
+       3,   316,     6,     3,   354,     6,     3,   378,     6,     3,
+     344,     6,     3,     3,     6,   449,     3,     6,   412,     6,
+       3,   292,     6,     3,     4,     4,     4,     4,     4,     4,
+       3,     8,   463,   465,     3,     8,     8,   165,   198,   199,
+     396,     6,     3,   427,     8,   524,     3,     6,     6,     4,
+     240,     4,     4,     4,     4,   166,   168,   166,   168,   166,
+       4,     4,   166,   166,   166,   166,   168,   252,   251,   249,
+     319,   315,   357,   353,   381,   377,   200,   211,   212,   213,
+     218,   219,   263,   311,   329,   331,   333,   335,   345,   346,
+     373,   403,   405,   418,   420,   422,   442,   343,   281,    89,
+      90,   200,   263,   347,   373,   403,   405,   418,   420,   422,
+     450,   451,   452,   453,   454,   456,   448,   415,   411,   295,
+     291,   166,   166,   166,   166,   166,   166,   304,     4,     4,
+     461,     6,     3,   399,   395,     4,   141,   143,   144,   200,
+     263,   403,   405,   525,   526,   527,   528,   530,   523,   165,
+      34,    35,    36,    37,   255,   165,   165,   165,   165,   165,
+       8,     8,     8,     8,     3,     8,   455,     4,     8,     3,
+       8,     8,   165,   165,   165,     8,   196,   531,     4,   529,
+       3,     8,   346,     4,   168,   452,     4,   166,     4,   526,
+     165,     5,   165,     7,   532,   533,   534,     3,     6,   142,
+     145,   146,   147,   535,   536,   537,   539,   540,   541,   533,
+     538,     4,     4,     4,     3,     8,     4,   168,   166,   166,
+     536,   165
   };
 
-  const unsigned short int
+  const unsigned short
   Dhcp4Parser::yyr1_[] =
   {
-       0,   168,   170,   169,   171,   169,   172,   169,   173,   169,
-     174,   169,   175,   169,   176,   169,   177,   169,   178,   169,
-     179,   169,   180,   169,   181,   169,   182,   169,   183,   169,
-     184,   184,   184,   184,   184,   184,   184,   185,   187,   186,
-     188,   189,   189,   190,   190,   192,   191,   193,   193,   194,
-     194,   196,   195,   197,   197,   198,   198,   199,   201,   200,
-     202,   202,   203,   203,   203,   203,   203,   203,   205,   204,
-     207,   206,   208,   208,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   209,   209,   210,   211,   212,   213,   215,
-     214,   216,   217,   219,   218,   220,   220,   221,   221,   221,
-     221,   221,   221,   221,   223,   222,   225,   224,   227,   226,
-     228,   228,   230,   229,   231,   231,   232,   234,   233,   236,
-     235,   237,   237,   238,   240,   239,   242,   241,   244,   243,
-     245,   245,   246,   246,   248,   247,   249,   249,   250,   250,
-     250,   250,   250,   250,   250,   250,   250,   250,   250,   250,
-     250,   250,   250,   250,   250,   250,   252,   251,   253,   253,
-     253,   253,   255,   254,   257,   256,   259,   258,   260,   262,
-     261,   263,   264,   265,   266,   267,   268,   269,   271,   270,
-     273,   272,   274,   275,   277,   276,   278,   278,   279,   279,
-     279,   279,   279,   280,   281,   282,   283,   284,   286,   285,
-     287,   287,   288,   288,   290,   289,   292,   291,   293,   293,
-     293,   294,   294,   296,   295,   298,   297,   300,   299,   301,
-     301,   302,   302,   302,   302,   302,   302,   303,   304,   305,
-     306,   307,   308,   310,   309,   311,   311,   312,   312,   314,
-     313,   316,   315,   317,   317,   318,   318,   318,   318,   318,
-     318,   318,   318,   318,   318,   318,   318,   318,   318,   318,
-     318,   318,   318,   318,   318,   318,   318,   318,   320,   319,
-     322,   321,   324,   323,   326,   325,   328,   327,   330,   329,
-     332,   331,   334,   333,   335,   335,   335,   335,   336,   338,
-     337,   339,   339,   340,   340,   342,   341,   343,   343,   344,
-     344,   344,   344,   344,   344,   344,   344,   344,   344,   344,
-     344,   344,   344,   344,   344,   344,   344,   346,   345,   348,
-     347,   349,   349,   350,   350,   352,   351,   354,   353,   355,
-     355,   356,   356,   357,   357,   357,   357,   357,   357,   357,
-     357,   357,   357,   358,   359,   360,   362,   361,   364,   363,
-     366,   365,   367,   369,   368,   370,   372,   371,   373,   373,
-     374,   374,   376,   375,   378,   377,   379,   379,   380,   380,
-     381,   381,   381,   381,   381,   381,   381,   381,   381,   382,
-     384,   383,   385,   386,   387,   388,   390,   389,   391,   391,
-     392,   392,   394,   393,   396,   395,   397,   397,   398,   398,
-     398,   398,   398,   398,   398,   400,   399,   402,   401,   404,
-     403,   406,   405,   407,   407,   408,   408,   410,   409,   412,
-     411,   413,   413,   414,   414,   415,   415,   415,   415,   415,
-     415,   415,   415,   415,   415,   415,   415,   415,   415,   415,
-     417,   416,   419,   418,   421,   420,   423,   422,   425,   424,
-     427,   426,   429,   428,   431,   430,   433,   432,   435,   434,
-     437,   436,   439,   438,   441,   440,   442,   442,   444,   443,
-     445,   445,   447,   446,   448,   448,   449,   449,   450,   450,
-     450,   450,   450,   450,   450,   450,   450,   450,   450,   451,
-     453,   452,   454,   455,   457,   456,   458,   458,   459,   459,
-     459,   459,   459,   461,   460,   463,   462,   465,   464,   467,
-     466,   468,   468,   469,   469,   469,   469,   469,   469,   469,
-     469,   469,   469,   469,   469,   469,   469,   469,   469,   469,
-     469,   469,   470,   472,   471,   474,   473,   475,   477,   476,
-     478,   479,   481,   480,   482,   482,   484,   483,   485,   486,
-     487,   489,   488,   490,   490,   490,   490,   490,   492,   491,
-     494,   493,   496,   495,   498,   497,   500,   499,   502,   501,
-     504,   503,   505,   503,   507,   506,   508,   508,   509,   509,
-     511,   510,   513,   512,   515,   514,   516,   516,   517,   519,
-     518,   520,   520,   522,   521,   523,   523,   524,   524,   524,
-     524,   524,   524,   524,   525,   527,   526,   529,   528,   530,
-     530,   532,   531,   533,   533,   534,   534,   534,   534,   536,
-     535,   537,   538,   539
+       0,   169,   171,   170,   172,   170,   173,   170,   174,   170,
+     175,   170,   176,   170,   177,   170,   178,   170,   179,   170,
+     180,   170,   181,   170,   182,   170,   183,   170,   184,   170,
+     185,   185,   185,   185,   185,   185,   185,   186,   188,   187,
+     189,   190,   190,   191,   191,   193,   192,   194,   194,   195,
+     195,   197,   196,   198,   198,   199,   199,   200,   202,   201,
+     203,   203,   204,   204,   204,   204,   204,   204,   206,   205,
+     208,   207,   209,   209,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   211,   212,   213,   214,
+     216,   215,   217,   218,   219,   221,   220,   222,   222,   223,
+     223,   223,   223,   223,   223,   223,   225,   224,   227,   226,
+     229,   228,   230,   230,   232,   231,   233,   233,   234,   236,
+     235,   238,   237,   239,   239,   240,   242,   241,   244,   243,
+     246,   245,   247,   247,   248,   248,   250,   249,   251,   251,
+     252,   252,   252,   252,   252,   252,   252,   252,   252,   252,
+     252,   252,   252,   252,   252,   252,   252,   252,   254,   253,
+     255,   255,   255,   255,   257,   256,   259,   258,   261,   260,
+     262,   264,   263,   265,   266,   267,   268,   269,   270,   271,
+     273,   272,   275,   274,   276,   277,   279,   278,   280,   280,
+     281,   281,   281,   281,   281,   282,   283,   284,   285,   286,
+     288,   287,   289,   289,   290,   290,   292,   291,   294,   293,
+     295,   295,   295,   296,   296,   298,   297,   300,   299,   302,
+     301,   303,   303,   304,   304,   304,   304,   304,   304,   305,
+     306,   307,   308,   309,   310,   312,   311,   313,   313,   314,
+     314,   316,   315,   318,   317,   319,   319,   320,   320,   320,
+     320,   320,   320,   320,   320,   320,   320,   320,   320,   320,
+     320,   320,   320,   320,   320,   320,   320,   320,   320,   320,
+     320,   322,   321,   324,   323,   326,   325,   328,   327,   330,
+     329,   332,   331,   334,   333,   336,   335,   337,   337,   337,
+     337,   338,   340,   339,   341,   341,   342,   342,   344,   343,
+     345,   345,   346,   346,   346,   346,   346,   346,   346,   346,
+     346,   346,   346,   346,   346,   346,   346,   346,   346,   346,
+     346,   348,   347,   350,   349,   351,   351,   352,   352,   354,
+     353,   356,   355,   357,   357,   358,   358,   359,   359,   359,
+     359,   359,   359,   359,   359,   359,   359,   360,   361,   362,
+     364,   363,   366,   365,   368,   367,   369,   371,   370,   372,
+     374,   373,   375,   375,   376,   376,   378,   377,   380,   379,
+     381,   381,   382,   382,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   384,   386,   385,   387,   388,   389,   390,
+     392,   391,   393,   393,   394,   394,   396,   395,   398,   397,
+     399,   399,   400,   400,   400,   400,   400,   400,   400,   402,
+     401,   404,   403,   406,   405,   408,   407,   409,   409,   410,
+     410,   412,   411,   414,   413,   415,   415,   416,   416,   417,
+     417,   417,   417,   417,   417,   417,   417,   417,   417,   417,
+     417,   417,   417,   417,   419,   418,   421,   420,   423,   422,
+     425,   424,   427,   426,   429,   428,   431,   430,   433,   432,
+     435,   434,   437,   436,   439,   438,   441,   440,   443,   442,
+     444,   444,   446,   445,   447,   447,   449,   448,   450,   450,
+     451,   451,   452,   452,   452,   452,   452,   452,   452,   452,
+     452,   452,   452,   453,   455,   454,   456,   457,   459,   458,
+     460,   460,   461,   461,   461,   461,   461,   463,   462,   465,
+     464,   467,   466,   469,   468,   470,   470,   471,   471,   471,
+     471,   471,   471,   471,   471,   471,   471,   471,   471,   471,
+     471,   471,   471,   471,   471,   471,   472,   474,   473,   476,
+     475,   477,   479,   478,   480,   481,   483,   482,   484,   484,
+     486,   485,   487,   488,   489,   491,   490,   492,   492,   492,
+     492,   492,   494,   493,   496,   495,   498,   497,   500,   499,
+     502,   501,   504,   503,   506,   505,   507,   505,   509,   508,
+     510,   510,   511,   511,   513,   512,   515,   514,   517,   516,
+     518,   518,   519,   521,   520,   522,   522,   524,   523,   525,
+     525,   526,   526,   526,   526,   526,   526,   526,   527,   529,
+     528,   531,   530,   532,   532,   534,   533,   535,   535,   536,
+     536,   536,   536,   538,   537,   539,   540,   541
   };
 
   const unsigned char
@@ -4554,61 +4608,61 @@ namespace isc { namespace dhcp {
        0,     4,     1,     3,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     3,     3,     3,     3,     0,
-       4,     3,     3,     0,     6,     1,     3,     1,     1,     1,
-       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
-       1,     1,     0,     4,     1,     1,     3,     0,     6,     0,
-       6,     1,     3,     1,     0,     4,     0,     6,     0,     6,
-       0,     1,     1,     3,     0,     4,     1,     3,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     0,     4,     1,     1,
-       1,     1,     0,     4,     0,     4,     0,     4,     3,     0,
-       4,     3,     3,     3,     3,     3,     3,     3,     0,     4,
-       0,     4,     3,     3,     0,     6,     1,     3,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     0,     6,
-       0,     1,     1,     3,     0,     4,     0,     4,     1,     3,
-       1,     1,     1,     0,     4,     0,     4,     0,     6,     1,
-       3,     1,     1,     1,     1,     1,     1,     3,     3,     3,
-       3,     3,     3,     0,     6,     0,     1,     1,     3,     0,
-       4,     0,     4,     1,     3,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     3,     3,     3,     3,
+       0,     4,     3,     3,     3,     0,     6,     1,     3,     1,
+       1,     1,     1,     1,     1,     1,     0,     4,     0,     4,
+       0,     4,     1,     1,     0,     4,     1,     1,     3,     0,
+       6,     0,     6,     1,     3,     1,     0,     4,     0,     6,
+       0,     6,     0,     1,     1,     3,     0,     4,     1,     3,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     0,     4,
-       0,     4,     0,     4,     0,     4,     0,     4,     0,     4,
-       0,     4,     0,     4,     1,     1,     1,     1,     3,     0,
-       6,     0,     1,     1,     3,     0,     4,     1,     3,     1,
+       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
+       3,     0,     4,     3,     3,     3,     3,     3,     3,     3,
+       0,     4,     0,     4,     3,     3,     0,     6,     1,     3,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     6,     0,
-       4,     0,     1,     1,     3,     0,     4,     0,     4,     0,
-       1,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     3,     1,     0,     4,     0,     4,
-       0,     4,     1,     0,     4,     3,     0,     6,     0,     1,
-       1,     3,     0,     4,     0,     4,     0,     1,     1,     3,
+       0,     6,     0,     1,     1,     3,     0,     4,     0,     4,
+       1,     3,     1,     1,     1,     0,     4,     0,     4,     0,
+       6,     1,     3,     1,     1,     1,     1,     1,     1,     3,
+       3,     3,     3,     3,     3,     0,     6,     0,     1,     1,
+       3,     0,     4,     0,     4,     1,     3,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     4,     1,     1,     3,     3,     0,     6,     0,     1,
-       1,     3,     0,     4,     0,     4,     1,     3,     1,     1,
-       1,     1,     1,     1,     1,     0,     4,     0,     4,     0,
-       4,     0,     6,     0,     1,     1,     3,     0,     4,     0,
-       4,     0,     1,     1,     3,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     4,     0,     4,     0,     4,     0,     4,     0,     4,
-       0,     4,     0,     4,     0,     4,     0,     4,     0,     4,
-       0,     4,     0,     4,     0,     6,     1,     1,     0,     6,
-       1,     3,     0,     4,     0,     1,     1,     3,     1,     1,
+       1,     0,     4,     0,     4,     0,     4,     0,     4,     0,
+       4,     0,     4,     0,     4,     0,     4,     1,     1,     1,
+       1,     3,     0,     6,     0,     1,     1,     3,     0,     4,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     4,     3,     3,     0,     6,     1,     3,     1,     1,
-       1,     1,     1,     0,     4,     0,     4,     0,     6,     0,
-       4,     1,     3,     1,     1,     1,     1,     1,     1,     1,
+       1,     0,     6,     0,     4,     0,     1,     1,     3,     0,
+       4,     0,     4,     0,     1,     1,     3,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
+       0,     4,     0,     4,     0,     4,     1,     0,     4,     3,
+       0,     6,     0,     1,     1,     3,     0,     4,     0,     4,
+       0,     1,     1,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     4,     1,     1,     3,     3,
+       0,     6,     0,     1,     1,     3,     0,     4,     0,     4,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     0,
+       4,     0,     4,     0,     4,     0,     6,     0,     1,     1,
+       3,     0,     4,     0,     4,     0,     1,     1,     3,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     3,     0,     4,     0,     4,     3,     0,     4,
-       3,     3,     0,     4,     1,     1,     0,     4,     3,     3,
-       3,     0,     4,     1,     1,     1,     1,     1,     0,     4,
+       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
        0,     4,     0,     4,     0,     4,     0,     4,     0,     4,
-       0,     4,     0,     6,     0,     4,     1,     3,     1,     1,
-       0,     6,     0,     6,     0,     4,     1,     3,     1,     0,
-       6,     1,     3,     0,     4,     1,     3,     1,     1,     1,
-       1,     1,     1,     1,     3,     0,     4,     0,     6,     1,
-       3,     0,     4,     1,     3,     1,     1,     1,     1,     0,
-       4,     3,     3,     3
+       0,     4,     0,     4,     0,     4,     0,     4,     0,     6,
+       1,     1,     0,     6,     1,     3,     0,     4,     0,     1,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     4,     3,     3,     0,     6,
+       1,     3,     1,     1,     1,     1,     1,     0,     4,     0,
+       4,     0,     6,     0,     4,     1,     3,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     3,     0,     4,     0,
+       4,     3,     0,     4,     3,     3,     0,     4,     1,     1,
+       0,     4,     3,     3,     3,     0,     4,     1,     1,     1,
+       1,     1,     0,     4,     0,     4,     0,     4,     0,     4,
+       0,     4,     0,     4,     0,     4,     0,     6,     0,     4,
+       1,     3,     1,     1,     0,     6,     0,     6,     0,     4,
+       1,     3,     1,     0,     6,     1,     3,     0,     4,     1,
+       3,     1,     1,     1,     1,     1,     1,     1,     3,     0,
+       4,     0,     6,     1,     3,     0,     4,     1,     3,     1,
+       1,     1,     1,     0,     4,     3,     3,     3
   };
 
 
@@ -4624,13 +4678,13 @@ namespace isc { namespace dhcp {
   "\"dhcp-socket-type\"", "\"raw\"", "\"udp\"", "\"outbound-interface\"",
   "\"same-as-inbound\"", "\"use-routing\"", "\"re-detect\"",
   "\"sanity-checks\"", "\"lease-checks\"", "\"echo-client-id\"",
-  "\"match-client-id\"", "\"next-server\"", "\"server-hostname\"",
-  "\"boot-file-name\"", "\"lease-database\"", "\"hosts-database\"",
-  "\"hosts-databases\"", "\"type\"", "\"memfile\"", "\"mysql\"",
-  "\"postgresql\"", "\"cql\"", "\"user\"", "\"password\"", "\"host\"",
-  "\"port\"", "\"persist\"", "\"lfc-interval\"", "\"readonly\"",
-  "\"connect-timeout\"", "\"contact-points\"", "\"keyspace\"",
-  "\"max-reconnect-tries\"", "\"reconnect-wait-time\"",
+  "\"match-client-id\"", "\"authoritative\"", "\"next-server\"",
+  "\"server-hostname\"", "\"boot-file-name\"", "\"lease-database\"",
+  "\"hosts-database\"", "\"hosts-databases\"", "\"type\"", "\"memfile\"",
+  "\"mysql\"", "\"postgresql\"", "\"cql\"", "\"user\"", "\"password\"",
+  "\"host\"", "\"port\"", "\"persist\"", "\"lfc-interval\"",
+  "\"readonly\"", "\"connect-timeout\"", "\"contact-points\"",
+  "\"keyspace\"", "\"max-reconnect-tries\"", "\"reconnect-wait-time\"",
   "\"request-timeout\"", "\"tcp-keepalive\"", "\"tcp-nodelay\"",
   "\"valid-lifetime\"", "\"renew-timer\"", "\"rebind-timer\"",
   "\"decline-probation-period\"", "\"server-tag\"", "\"subnet4\"",
@@ -4675,19 +4729,20 @@ namespace isc { namespace dhcp {
   "global_objects", "global_object", "dhcp4_object", "$@19", "sub_dhcp4",
   "$@20", "global_params", "global_param", "valid_lifetime", "renew_timer",
   "rebind_timer", "decline_probation_period", "server_tag", "$@21",
-  "echo_client_id", "match_client_id", "interfaces_config", "$@22",
-  "interfaces_config_params", "interfaces_config_param", "sub_interfaces4",
-  "$@23", "interfaces_list", "$@24", "dhcp_socket_type", "$@25",
-  "socket_type", "outbound_interface", "$@26", "outbound_interface_value",
-  "re_detect", "lease_database", "$@27", "sanity_checks", "$@28",
-  "sanity_checks_params", "sanity_checks_param", "lease_checks", "$@29",
-  "hosts_database", "$@30", "hosts_databases", "$@31", "database_list",
-  "not_empty_database_list", "database", "$@32", "database_map_params",
-  "database_map_param", "database_type", "$@33", "db_type", "user", "$@34",
-  "password", "$@35", "host", "$@36", "port", "name", "$@37", "persist",
-  "lfc_interval", "readonly", "connect_timeout", "request_timeout",
-  "tcp_keepalive", "tcp_nodelay", "contact_points", "$@38", "keyspace",
-  "$@39", "max_reconnect_tries", "reconnect_wait_time",
+  "echo_client_id", "match_client_id", "authoritative",
+  "interfaces_config", "$@22", "interfaces_config_params",
+  "interfaces_config_param", "sub_interfaces4", "$@23", "interfaces_list",
+  "$@24", "dhcp_socket_type", "$@25", "socket_type", "outbound_interface",
+  "$@26", "outbound_interface_value", "re_detect", "lease_database",
+  "$@27", "sanity_checks", "$@28", "sanity_checks_params",
+  "sanity_checks_param", "lease_checks", "$@29", "hosts_database", "$@30",
+  "hosts_databases", "$@31", "database_list", "not_empty_database_list",
+  "database", "$@32", "database_map_params", "database_map_param",
+  "database_type", "$@33", "db_type", "user", "$@34", "password", "$@35",
+  "host", "$@36", "port", "name", "$@37", "persist", "lfc_interval",
+  "readonly", "connect_timeout", "request_timeout", "tcp_keepalive",
+  "tcp_nodelay", "contact_points", "$@38", "keyspace", "$@39",
+  "max_reconnect_tries", "reconnect_wait_time",
   "host_reservation_identifiers", "$@40",
   "host_reservation_identifiers_list", "host_reservation_identifier",
   "duid_id", "hw_address_id", "circuit_id", "client_id", "flex_id",
@@ -4757,74 +4812,74 @@ namespace isc { namespace dhcp {
   };
 
 #if PARSER4_DEBUG
-  const unsigned short int
+  const unsigned short
   Dhcp4Parser::yyrline_[] =
   {
-       0,   252,   252,   252,   253,   253,   254,   254,   255,   255,
-     256,   256,   257,   257,   258,   258,   259,   259,   260,   260,
-     261,   261,   262,   262,   263,   263,   264,   264,   265,   265,
-     273,   274,   275,   276,   277,   278,   279,   282,   287,   287,
-     298,   301,   302,   305,   309,   316,   316,   323,   324,   327,
-     331,   338,   338,   345,   346,   349,   353,   364,   374,   374,
-     390,   391,   395,   396,   397,   398,   399,   400,   403,   403,
-     418,   418,   427,   428,   433,   434,   435,   436,   437,   438,
-     439,   440,   441,   442,   443,   444,   445,   446,   447,   448,
-     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
-     459,   460,   461,   462,   463,   466,   471,   476,   481,   486,
-     486,   494,   499,   505,   505,   516,   517,   520,   521,   522,
-     523,   524,   525,   526,   529,   529,   538,   538,   548,   548,
-     555,   556,   559,   559,   566,   568,   572,   578,   578,   590,
-     590,   600,   601,   603,   605,   605,   623,   623,   635,   635,
-     645,   646,   649,   650,   653,   653,   663,   664,   667,   668,
-     669,   670,   671,   672,   673,   674,   675,   676,   677,   678,
-     679,   680,   681,   682,   683,   684,   687,   687,   694,   695,
-     696,   697,   700,   700,   708,   708,   716,   716,   724,   729,
-     729,   737,   742,   747,   752,   757,   762,   767,   772,   772,
-     780,   780,   788,   793,   798,   798,   808,   809,   812,   813,
-     814,   815,   816,   819,   824,   829,   834,   839,   844,   844,
-     854,   855,   858,   859,   862,   862,   872,   872,   882,   883,
-     884,   887,   888,   891,   891,   899,   899,   907,   907,   918,
-     919,   922,   923,   924,   925,   926,   927,   930,   935,   940,
-     945,   950,   955,   963,   963,   976,   977,   980,   981,   988,
-     988,  1014,  1014,  1025,  1026,  1030,  1031,  1032,  1033,  1034,
-    1035,  1036,  1037,  1038,  1039,  1040,  1041,  1042,  1043,  1044,
-    1045,  1046,  1047,  1048,  1049,  1050,  1051,  1052,  1055,  1055,
-    1063,  1063,  1071,  1071,  1079,  1079,  1087,  1087,  1095,  1095,
-    1103,  1103,  1113,  1113,  1120,  1121,  1122,  1123,  1126,  1133,
-    1133,  1144,  1145,  1149,  1150,  1153,  1153,  1161,  1162,  1165,
-    1166,  1167,  1168,  1169,  1170,  1171,  1172,  1173,  1174,  1175,
-    1176,  1177,  1178,  1179,  1180,  1181,  1182,  1189,  1189,  1202,
-    1202,  1211,  1212,  1215,  1216,  1221,  1221,  1236,  1236,  1250,
-    1251,  1254,  1255,  1258,  1259,  1260,  1261,  1262,  1263,  1264,
-    1265,  1266,  1267,  1270,  1272,  1277,  1279,  1279,  1287,  1287,
-    1295,  1295,  1303,  1305,  1305,  1313,  1322,  1322,  1334,  1335,
-    1340,  1341,  1346,  1346,  1358,  1358,  1370,  1371,  1376,  1377,
-    1382,  1383,  1384,  1385,  1386,  1387,  1388,  1389,  1390,  1393,
-    1395,  1395,  1403,  1405,  1407,  1412,  1420,  1420,  1432,  1433,
-    1436,  1437,  1440,  1440,  1450,  1450,  1460,  1461,  1464,  1465,
-    1466,  1467,  1468,  1469,  1470,  1473,  1473,  1481,  1481,  1506,
-    1506,  1536,  1536,  1546,  1547,  1550,  1551,  1554,  1554,  1563,
-    1563,  1572,  1573,  1576,  1577,  1581,  1582,  1583,  1584,  1585,
-    1586,  1587,  1588,  1589,  1590,  1591,  1592,  1593,  1594,  1595,
-    1598,  1598,  1606,  1606,  1614,  1614,  1622,  1622,  1630,  1630,
-    1640,  1640,  1648,  1648,  1656,  1656,  1664,  1664,  1672,  1672,
-    1680,  1680,  1688,  1688,  1701,  1701,  1711,  1712,  1718,  1718,
-    1728,  1729,  1732,  1732,  1742,  1743,  1746,  1747,  1750,  1751,
-    1752,  1753,  1754,  1755,  1756,  1757,  1758,  1759,  1760,  1763,
-    1765,  1765,  1773,  1782,  1789,  1789,  1799,  1800,  1803,  1804,
-    1805,  1806,  1807,  1810,  1810,  1818,  1818,  1828,  1828,  1840,
-    1840,  1850,  1851,  1854,  1855,  1856,  1857,  1858,  1859,  1860,
-    1861,  1862,  1863,  1864,  1865,  1866,  1867,  1868,  1869,  1870,
-    1871,  1872,  1875,  1880,  1880,  1888,  1888,  1896,  1901,  1901,
-    1909,  1914,  1919,  1919,  1927,  1928,  1931,  1931,  1939,  1944,
-    1949,  1954,  1954,  1962,  1965,  1968,  1971,  1974,  1980,  1980,
-    1988,  1988,  1996,  1996,  2007,  2007,  2014,  2014,  2021,  2021,
-    2028,  2028,  2037,  2037,  2048,  2048,  2058,  2059,  2063,  2064,
-    2067,  2067,  2082,  2082,  2092,  2092,  2103,  2104,  2108,  2112,
-    2112,  2124,  2125,  2129,  2129,  2137,  2138,  2141,  2142,  2143,
-    2144,  2145,  2146,  2147,  2150,  2155,  2155,  2163,  2163,  2173,
-    2174,  2177,  2177,  2185,  2186,  2189,  2190,  2191,  2192,  2195,
-    2195,  2203,  2208,  2213
+       0,   253,   253,   253,   254,   254,   255,   255,   256,   256,
+     257,   257,   258,   258,   259,   259,   260,   260,   261,   261,
+     262,   262,   263,   263,   264,   264,   265,   265,   266,   266,
+     274,   275,   276,   277,   278,   279,   280,   283,   288,   288,
+     299,   302,   303,   306,   310,   317,   317,   324,   325,   328,
+     332,   339,   339,   346,   347,   350,   354,   365,   375,   375,
+     391,   392,   396,   397,   398,   399,   400,   401,   404,   404,
+     419,   419,   428,   429,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+     450,   451,   452,   453,   454,   455,   456,   457,   458,   459,
+     460,   461,   462,   463,   464,   465,   468,   473,   478,   483,
+     488,   488,   496,   501,   506,   512,   512,   523,   524,   527,
+     528,   529,   530,   531,   532,   533,   536,   536,   545,   545,
+     555,   555,   562,   563,   566,   566,   573,   575,   579,   585,
+     585,   597,   597,   607,   608,   610,   612,   612,   630,   630,
+     642,   642,   652,   653,   656,   657,   660,   660,   670,   671,
+     674,   675,   676,   677,   678,   679,   680,   681,   682,   683,
+     684,   685,   686,   687,   688,   689,   690,   691,   694,   694,
+     701,   702,   703,   704,   707,   707,   715,   715,   723,   723,
+     731,   736,   736,   744,   749,   754,   759,   764,   769,   774,
+     779,   779,   787,   787,   795,   800,   805,   805,   815,   816,
+     819,   820,   821,   822,   823,   826,   831,   836,   841,   846,
+     851,   851,   861,   862,   865,   866,   869,   869,   879,   879,
+     889,   890,   891,   894,   895,   898,   898,   906,   906,   914,
+     914,   925,   926,   929,   930,   931,   932,   933,   934,   937,
+     942,   947,   952,   957,   962,   970,   970,   983,   984,   987,
+     988,   995,   995,  1021,  1021,  1032,  1033,  1037,  1038,  1039,
+    1040,  1041,  1042,  1043,  1044,  1045,  1046,  1047,  1048,  1049,
+    1050,  1051,  1052,  1053,  1054,  1055,  1056,  1057,  1058,  1059,
+    1060,  1063,  1063,  1071,  1071,  1079,  1079,  1087,  1087,  1095,
+    1095,  1103,  1103,  1111,  1111,  1121,  1121,  1128,  1129,  1130,
+    1131,  1134,  1141,  1141,  1152,  1153,  1157,  1158,  1161,  1161,
+    1169,  1170,  1173,  1174,  1175,  1176,  1177,  1178,  1179,  1180,
+    1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,  1189,  1190,
+    1191,  1198,  1198,  1211,  1211,  1220,  1221,  1224,  1225,  1230,
+    1230,  1245,  1245,  1259,  1260,  1263,  1264,  1267,  1268,  1269,
+    1270,  1271,  1272,  1273,  1274,  1275,  1276,  1279,  1281,  1286,
+    1288,  1288,  1296,  1296,  1304,  1304,  1312,  1314,  1314,  1322,
+    1331,  1331,  1343,  1344,  1349,  1350,  1355,  1355,  1367,  1367,
+    1379,  1380,  1385,  1386,  1391,  1392,  1393,  1394,  1395,  1396,
+    1397,  1398,  1399,  1402,  1404,  1404,  1412,  1414,  1416,  1421,
+    1429,  1429,  1441,  1442,  1445,  1446,  1449,  1449,  1459,  1459,
+    1469,  1470,  1473,  1474,  1475,  1476,  1477,  1478,  1479,  1482,
+    1482,  1490,  1490,  1515,  1515,  1545,  1545,  1555,  1556,  1559,
+    1560,  1563,  1563,  1572,  1572,  1581,  1582,  1585,  1586,  1590,
+    1591,  1592,  1593,  1594,  1595,  1596,  1597,  1598,  1599,  1600,
+    1601,  1602,  1603,  1604,  1607,  1607,  1615,  1615,  1623,  1623,
+    1631,  1631,  1639,  1639,  1649,  1649,  1657,  1657,  1665,  1665,
+    1673,  1673,  1681,  1681,  1689,  1689,  1697,  1697,  1710,  1710,
+    1720,  1721,  1727,  1727,  1737,  1738,  1741,  1741,  1751,  1752,
+    1755,  1756,  1759,  1760,  1761,  1762,  1763,  1764,  1765,  1766,
+    1767,  1768,  1769,  1772,  1774,  1774,  1782,  1791,  1798,  1798,
+    1808,  1809,  1812,  1813,  1814,  1815,  1816,  1819,  1819,  1827,
+    1827,  1837,  1837,  1849,  1849,  1859,  1860,  1863,  1864,  1865,
+    1866,  1867,  1868,  1869,  1870,  1871,  1872,  1873,  1874,  1875,
+    1876,  1877,  1878,  1879,  1880,  1881,  1884,  1889,  1889,  1897,
+    1897,  1905,  1910,  1910,  1918,  1923,  1928,  1928,  1936,  1937,
+    1940,  1940,  1948,  1953,  1958,  1963,  1963,  1971,  1974,  1977,
+    1980,  1983,  1989,  1989,  1997,  1997,  2005,  2005,  2016,  2016,
+    2023,  2023,  2030,  2030,  2037,  2037,  2046,  2046,  2057,  2057,
+    2067,  2068,  2072,  2073,  2076,  2076,  2091,  2091,  2101,  2101,
+    2112,  2113,  2117,  2121,  2121,  2133,  2134,  2138,  2138,  2146,
+    2147,  2150,  2151,  2152,  2153,  2154,  2155,  2156,  2159,  2164,
+    2164,  2172,  2172,  2182,  2183,  2186,  2186,  2194,  2195,  2198,
+    2199,  2200,  2201,  2204,  2204,  2212,  2217,  2222
   };
 
   // Print the state stack on the debug stream.
@@ -4837,18 +4892,18 @@ namespace isc { namespace dhcp {
            i_end = yystack_.end ();
          i != i_end; ++i)
       *yycdebug_ << ' ' << i->state;
-    *yycdebug_ << std::endl;
+    *yycdebug_ << '\n';
   }
 
   // Report on the debug stream that the rule \a yyrule is going to be reduced.
   void
   Dhcp4Parser::yy_reduce_print_ (int yyrule)
   {
-    unsigned int yylno = yyrline_[yyrule];
+    unsigned yylno = yyrline_[yyrule];
     int yynrhs = yyr2_[yyrule];
     // Print the symbols being reduced, and their result.
     *yycdebug_ << "Reducing stack by rule " << yyrule - 1
-               << " (line " << yylno << "):" << std::endl;
+               << " (line " << yylno << "):\n";
     // The symbols being reduced.
     for (int yyi = 0; yyi < yynrhs; yyi++)
       YY_SYMBOL_PRINT ("   $" << yyi + 1 << " =",
@@ -4857,10 +4912,10 @@ namespace isc { namespace dhcp {
 #endif // PARSER4_DEBUG
 
 
-#line 14 "dhcp4_parser.yy" // lalr1.cc:1167
+#line 14 "dhcp4_parser.yy" // lalr1.cc:1181
 } } // isc::dhcp
-#line 4863 "dhcp4_parser.cc" // lalr1.cc:1167
-#line 2218 "dhcp4_parser.yy" // lalr1.cc:1168
+#line 4918 "dhcp4_parser.cc" // lalr1.cc:1181
+#line 2227 "dhcp4_parser.yy" // lalr1.cc:1182
 
 
 void

diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h
index c485d92c27fbbb6bf4c503ba74b7937dc1976792..e38d3dbc331e33568d4c4249abd82b6aa344d77a 100644 (file)
--- 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.0.4.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Skeleton interface for Bison LALR(1) parsers in C++
 
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018 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
@@ -40,7 +40,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:377
+#line 17 "dhcp4_parser.yy" // lalr1.cc:380
 
 #include <string>
 #include <cc/data.h>
@@ -52,7 +52,7 @@ using namespace isc::dhcp;
 using namespace isc::data;
 using namespace std;
 
-#line 56 "dhcp4_parser.h" // lalr1.cc:377
+#line 56 "dhcp4_parser.h" // lalr1.cc:380
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -103,7 +103,7 @@ using namespace std;
 # define YYUSE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
 # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
     _Pragma ("GCC diagnostic push") \
@@ -122,6 +122,13 @@ using namespace std;
 # define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
 /* Debug traces.  */
 #ifndef PARSER4_DEBUG
 # if defined YYDEBUG
@@ -135,9 +142,9 @@ using namespace std;
 # endif /* ! defined YYDEBUG */
 #endif  /* ! defined PARSER4_DEBUG */
 
-#line 14 "dhcp4_parser.yy" // lalr1.cc:377
+#line 14 "dhcp4_parser.yy" // lalr1.cc:380
 namespace isc { namespace dhcp {
-#line 141 "dhcp4_parser.h" // lalr1.cc:377
+#line 148 "dhcp4_parser.h" // lalr1.cc:380
 
 
 
@@ -154,7 +161,8 @@ namespace isc { namespace dhcp {
 
     /// Empty construction.
     variant ()
-      : yytypeid_ (YY_NULLPTR)
+      : yybuffer_ ()
+      , yytypeid_ (YY_NULLPTR)
     {}
 
     /// Construct and fill.
@@ -180,7 +188,7 @@ namespace isc { namespace dhcp {
       YYASSERT (!yytypeid_);
       YYASSERT (sizeof (T) <= S);
       yytypeid_ = & typeid (T);
-      return *new (yyas_<T> ()) T;
+      return *new (yyas_<T> ()) T ();
     }
 
     /// Instantiate a \a T in here from \a t.
@@ -199,6 +207,7 @@ namespace isc { namespace dhcp {
     T&
     as ()
     {
+      YYASSERT (yytypeid_);
       YYASSERT (*yytypeid_ == typeid (T));
       YYASSERT (sizeof (T) <= S);
       return *yyas_<T> ();
@@ -209,6 +218,7 @@ namespace isc { namespace dhcp {
     const T&
     as () const
     {
+      YYASSERT (yytypeid_);
       YYASSERT (*yytypeid_ == typeid (T));
       YYASSERT (sizeof (T) <= S);
       return *yyas_<T> ();
@@ -371,148 +381,149 @@ namespace isc { namespace dhcp {
         TOKEN_LEASE_CHECKS = 278,
         TOKEN_ECHO_CLIENT_ID = 279,
         TOKEN_MATCH_CLIENT_ID = 280,
-        TOKEN_NEXT_SERVER = 281,
-        TOKEN_SERVER_HOSTNAME = 282,
-        TOKEN_BOOT_FILE_NAME = 283,
-        TOKEN_LEASE_DATABASE = 284,
-        TOKEN_HOSTS_DATABASE = 285,
-        TOKEN_HOSTS_DATABASES = 286,
-        TOKEN_TYPE = 287,
-        TOKEN_MEMFILE = 288,
-        TOKEN_MYSQL = 289,
-        TOKEN_POSTGRESQL = 290,
-        TOKEN_CQL = 291,
-        TOKEN_USER = 292,
-        TOKEN_PASSWORD = 293,
-        TOKEN_HOST = 294,
-        TOKEN_PORT = 295,
-        TOKEN_PERSIST = 296,
-        TOKEN_LFC_INTERVAL = 297,
-        TOKEN_READONLY = 298,
-        TOKEN_CONNECT_TIMEOUT = 299,
-        TOKEN_CONTACT_POINTS = 300,
-        TOKEN_KEYSPACE = 301,
-        TOKEN_MAX_RECONNECT_TRIES = 302,
-        TOKEN_RECONNECT_WAIT_TIME = 303,
-        TOKEN_REQUEST_TIMEOUT = 304,
-        TOKEN_TCP_KEEPALIVE = 305,
-        TOKEN_TCP_NODELAY = 306,
-        TOKEN_VALID_LIFETIME = 307,
-        TOKEN_RENEW_TIMER = 308,
-        TOKEN_REBIND_TIMER = 309,
-        TOKEN_DECLINE_PROBATION_PERIOD = 310,
-        TOKEN_SERVER_TAG = 311,
-        TOKEN_SUBNET4 = 312,
-        TOKEN_SUBNET_4O6_INTERFACE = 313,
-        TOKEN_SUBNET_4O6_INTERFACE_ID = 314,
-        TOKEN_SUBNET_4O6_SUBNET = 315,
-        TOKEN_OPTION_DEF = 316,
-        TOKEN_OPTION_DATA = 317,
-        TOKEN_NAME = 318,
-        TOKEN_DATA = 319,
-        TOKEN_CODE = 320,
-        TOKEN_SPACE = 321,
-        TOKEN_CSV_FORMAT = 322,
-        TOKEN_ALWAYS_SEND = 323,
-        TOKEN_RECORD_TYPES = 324,
-        TOKEN_ENCAPSULATE = 325,
-        TOKEN_ARRAY = 326,
-        TOKEN_SHARED_NETWORKS = 327,
-        TOKEN_POOLS = 328,
-        TOKEN_POOL = 329,
-        TOKEN_USER_CONTEXT = 330,
-        TOKEN_COMMENT = 331,
-        TOKEN_SUBNET = 332,
-        TOKEN_INTERFACE = 333,
-        TOKEN_ID = 334,
-        TOKEN_RESERVATION_MODE = 335,
-        TOKEN_DISABLED = 336,
-        TOKEN_OUT_OF_POOL = 337,
-        TOKEN_GLOBAL = 338,
-        TOKEN_ALL = 339,
-        TOKEN_HOST_RESERVATION_IDENTIFIERS = 340,
-        TOKEN_CLIENT_CLASSES = 341,
-        TOKEN_REQUIRE_CLIENT_CLASSES = 342,
-        TOKEN_TEST = 343,
-        TOKEN_ONLY_IF_REQUIRED = 344,
-        TOKEN_CLIENT_CLASS = 345,
-        TOKEN_RESERVATIONS = 346,
-        TOKEN_DUID = 347,
-        TOKEN_HW_ADDRESS = 348,
-        TOKEN_CIRCUIT_ID = 349,
-        TOKEN_CLIENT_ID = 350,
-        TOKEN_HOSTNAME = 351,
-        TOKEN_FLEX_ID = 352,
-        TOKEN_RELAY = 353,
-        TOKEN_IP_ADDRESS = 354,
-        TOKEN_IP_ADDRESSES = 355,
-        TOKEN_HOOKS_LIBRARIES = 356,
-        TOKEN_LIBRARY = 357,
-        TOKEN_PARAMETERS = 358,
-        TOKEN_EXPIRED_LEASES_PROCESSING = 359,
-        TOKEN_RECLAIM_TIMER_WAIT_TIME = 360,
-        TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 361,
-        TOKEN_HOLD_RECLAIMED_TIME = 362,
-        TOKEN_MAX_RECLAIM_LEASES = 363,
-        TOKEN_MAX_RECLAIM_TIME = 364,
-        TOKEN_UNWARNED_RECLAIM_CYCLES = 365,
-        TOKEN_DHCP4O6_PORT = 366,
-        TOKEN_CONTROL_SOCKET = 367,
-        TOKEN_SOCKET_TYPE = 368,
-        TOKEN_SOCKET_NAME = 369,
-        TOKEN_DHCP_DDNS = 370,
-        TOKEN_ENABLE_UPDATES = 371,
-        TOKEN_QUALIFYING_SUFFIX = 372,
-        TOKEN_SERVER_IP = 373,
-        TOKEN_SERVER_PORT = 374,
-        TOKEN_SENDER_IP = 375,
-        TOKEN_SENDER_PORT = 376,
-        TOKEN_MAX_QUEUE_SIZE = 377,
-        TOKEN_NCR_PROTOCOL = 378,
-        TOKEN_NCR_FORMAT = 379,
-        TOKEN_ALWAYS_INCLUDE_FQDN = 380,
-        TOKEN_OVERRIDE_NO_UPDATE = 381,
-        TOKEN_OVERRIDE_CLIENT_UPDATE = 382,
-        TOKEN_REPLACE_CLIENT_NAME = 383,
-        TOKEN_GENERATED_PREFIX = 384,
-        TOKEN_TCP = 385,
-        TOKEN_JSON = 386,
-        TOKEN_WHEN_PRESENT = 387,
-        TOKEN_NEVER = 388,
-        TOKEN_ALWAYS = 389,
-        TOKEN_WHEN_NOT_PRESENT = 390,
-        TOKEN_HOSTNAME_CHAR_SET = 391,
-        TOKEN_HOSTNAME_CHAR_REPLACEMENT = 392,
-        TOKEN_LOGGING = 393,
-        TOKEN_LOGGERS = 394,
-        TOKEN_OUTPUT_OPTIONS = 395,
-        TOKEN_OUTPUT = 396,
-        TOKEN_DEBUGLEVEL = 397,
-        TOKEN_SEVERITY = 398,
-        TOKEN_FLUSH = 399,
-        TOKEN_MAXSIZE = 400,
-        TOKEN_MAXVER = 401,
-        TOKEN_DHCP6 = 402,
-        TOKEN_DHCPDDNS = 403,
-        TOKEN_CONTROL_AGENT = 404,
-        TOKEN_TOPLEVEL_JSON = 405,
-        TOKEN_TOPLEVEL_DHCP4 = 406,
-        TOKEN_SUB_DHCP4 = 407,
-        TOKEN_SUB_INTERFACES4 = 408,
-        TOKEN_SUB_SUBNET4 = 409,
-        TOKEN_SUB_POOL4 = 410,
-        TOKEN_SUB_RESERVATION = 411,
-        TOKEN_SUB_OPTION_DEFS = 412,
-        TOKEN_SUB_OPTION_DEF = 413,
-        TOKEN_SUB_OPTION_DATA = 414,
-        TOKEN_SUB_HOOKS_LIBRARY = 415,
-        TOKEN_SUB_DHCP_DDNS = 416,
-        TOKEN_SUB_LOGGING = 417,
-        TOKEN_SUB_CONFIG_CONTROL = 418,
-        TOKEN_STRING = 419,
-        TOKEN_INTEGER = 420,
-        TOKEN_FLOAT = 421,
-        TOKEN_BOOLEAN = 422
+        TOKEN_AUTHORITATIVE = 281,
+        TOKEN_NEXT_SERVER = 282,
+        TOKEN_SERVER_HOSTNAME = 283,
+        TOKEN_BOOT_FILE_NAME = 284,
+        TOKEN_LEASE_DATABASE = 285,
+        TOKEN_HOSTS_DATABASE = 286,
+        TOKEN_HOSTS_DATABASES = 287,
+        TOKEN_TYPE = 288,
+        TOKEN_MEMFILE = 289,
+        TOKEN_MYSQL = 290,
+        TOKEN_POSTGRESQL = 291,
+        TOKEN_CQL = 292,
+        TOKEN_USER = 293,
+        TOKEN_PASSWORD = 294,
+        TOKEN_HOST = 295,
+        TOKEN_PORT = 296,
+        TOKEN_PERSIST = 297,
+        TOKEN_LFC_INTERVAL = 298,
+        TOKEN_READONLY = 299,
+        TOKEN_CONNECT_TIMEOUT = 300,
+        TOKEN_CONTACT_POINTS = 301,
+        TOKEN_KEYSPACE = 302,
+        TOKEN_MAX_RECONNECT_TRIES = 303,
+        TOKEN_RECONNECT_WAIT_TIME = 304,
+        TOKEN_REQUEST_TIMEOUT = 305,
+        TOKEN_TCP_KEEPALIVE = 306,
+        TOKEN_TCP_NODELAY = 307,
+        TOKEN_VALID_LIFETIME = 308,
+        TOKEN_RENEW_TIMER = 309,
+        TOKEN_REBIND_TIMER = 310,
+        TOKEN_DECLINE_PROBATION_PERIOD = 311,
+        TOKEN_SERVER_TAG = 312,
+        TOKEN_SUBNET4 = 313,
+        TOKEN_SUBNET_4O6_INTERFACE = 314,
+        TOKEN_SUBNET_4O6_INTERFACE_ID = 315,
+        TOKEN_SUBNET_4O6_SUBNET = 316,
+        TOKEN_OPTION_DEF = 317,
+        TOKEN_OPTION_DATA = 318,
+        TOKEN_NAME = 319,
+        TOKEN_DATA = 320,
+        TOKEN_CODE = 321,
+        TOKEN_SPACE = 322,
+        TOKEN_CSV_FORMAT = 323,
+        TOKEN_ALWAYS_SEND = 324,
+        TOKEN_RECORD_TYPES = 325,
+        TOKEN_ENCAPSULATE = 326,
+        TOKEN_ARRAY = 327,
+        TOKEN_SHARED_NETWORKS = 328,
+        TOKEN_POOLS = 329,
+        TOKEN_POOL = 330,
+        TOKEN_USER_CONTEXT = 331,
+        TOKEN_COMMENT = 332,
+        TOKEN_SUBNET = 333,
+        TOKEN_INTERFACE = 334,
+        TOKEN_ID = 335,
+        TOKEN_RESERVATION_MODE = 336,
+        TOKEN_DISABLED = 337,
+        TOKEN_OUT_OF_POOL = 338,
+        TOKEN_GLOBAL = 339,
+        TOKEN_ALL = 340,
+        TOKEN_HOST_RESERVATION_IDENTIFIERS = 341,
+        TOKEN_CLIENT_CLASSES = 342,
+        TOKEN_REQUIRE_CLIENT_CLASSES = 343,
+        TOKEN_TEST = 344,
+        TOKEN_ONLY_IF_REQUIRED = 345,
+        TOKEN_CLIENT_CLASS = 346,
+        TOKEN_RESERVATIONS = 347,
+        TOKEN_DUID = 348,
+        TOKEN_HW_ADDRESS = 349,
+        TOKEN_CIRCUIT_ID = 350,
+        TOKEN_CLIENT_ID = 351,
+        TOKEN_HOSTNAME = 352,
+        TOKEN_FLEX_ID = 353,
+        TOKEN_RELAY = 354,
+        TOKEN_IP_ADDRESS = 355,
+        TOKEN_IP_ADDRESSES = 356,
+        TOKEN_HOOKS_LIBRARIES = 357,
+        TOKEN_LIBRARY = 358,
+        TOKEN_PARAMETERS = 359,
+        TOKEN_EXPIRED_LEASES_PROCESSING = 360,
+        TOKEN_RECLAIM_TIMER_WAIT_TIME = 361,
+        TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 362,
+        TOKEN_HOLD_RECLAIMED_TIME = 363,
+        TOKEN_MAX_RECLAIM_LEASES = 364,
+        TOKEN_MAX_RECLAIM_TIME = 365,
+        TOKEN_UNWARNED_RECLAIM_CYCLES = 366,
+        TOKEN_DHCP4O6_PORT = 367,
+        TOKEN_CONTROL_SOCKET = 368,
+        TOKEN_SOCKET_TYPE = 369,
+        TOKEN_SOCKET_NAME = 370,
+        TOKEN_DHCP_DDNS = 371,
+        TOKEN_ENABLE_UPDATES = 372,
+        TOKEN_QUALIFYING_SUFFIX = 373,
+        TOKEN_SERVER_IP = 374,
+        TOKEN_SERVER_PORT = 375,
+        TOKEN_SENDER_IP = 376,
+        TOKEN_SENDER_PORT = 377,
+        TOKEN_MAX_QUEUE_SIZE = 378,
+        TOKEN_NCR_PROTOCOL = 379,
+        TOKEN_NCR_FORMAT = 380,
+        TOKEN_ALWAYS_INCLUDE_FQDN = 381,
+        TOKEN_OVERRIDE_NO_UPDATE = 382,
+        TOKEN_OVERRIDE_CLIENT_UPDATE = 383,
+        TOKEN_REPLACE_CLIENT_NAME = 384,
+        TOKEN_GENERATED_PREFIX = 385,
+        TOKEN_TCP = 386,
+        TOKEN_JSON = 387,
+        TOKEN_WHEN_PRESENT = 388,
+        TOKEN_NEVER = 389,
+        TOKEN_ALWAYS = 390,
+        TOKEN_WHEN_NOT_PRESENT = 391,
+        TOKEN_HOSTNAME_CHAR_SET = 392,
+        TOKEN_HOSTNAME_CHAR_REPLACEMENT = 393,
+        TOKEN_LOGGING = 394,
+        TOKEN_LOGGERS = 395,
+        TOKEN_OUTPUT_OPTIONS = 396,
+        TOKEN_OUTPUT = 397,
+        TOKEN_DEBUGLEVEL = 398,
+        TOKEN_SEVERITY = 399,
+        TOKEN_FLUSH = 400,
+        TOKEN_MAXSIZE = 401,
+        TOKEN_MAXVER = 402,
+        TOKEN_DHCP6 = 403,
+        TOKEN_DHCPDDNS = 404,
+        TOKEN_CONTROL_AGENT = 405,
+        TOKEN_TOPLEVEL_JSON = 406,
+        TOKEN_TOPLEVEL_DHCP4 = 407,
+        TOKEN_SUB_DHCP4 = 408,
+        TOKEN_SUB_INTERFACES4 = 409,
+        TOKEN_SUB_SUBNET4 = 410,
+        TOKEN_SUB_POOL4 = 411,
+        TOKEN_SUB_RESERVATION = 412,
+        TOKEN_SUB_OPTION_DEFS = 413,
+        TOKEN_SUB_OPTION_DEF = 414,
+        TOKEN_SUB_OPTION_DATA = 415,
+        TOKEN_SUB_HOOKS_LIBRARY = 416,
+        TOKEN_SUB_DHCP_DDNS = 417,
+        TOKEN_SUB_LOGGING = 418,
+        TOKEN_SUB_CONFIG_CONTROL = 419,
+        TOKEN_STRING = 420,
+        TOKEN_INTEGER = 421,
+        TOKEN_FLOAT = 422,
+        TOKEN_BOOLEAN = 423
       };
     };
 
@@ -550,15 +561,15 @@ namespace isc { namespace dhcp {
 
   basic_symbol (typename Base::kind_type t, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const ElementPtr v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const ElementPtr& v, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const bool v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const bool& v, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const double v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const double& v, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const int64_t v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const int64_t& v, const location_type& l);
 
-  basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l);
+  basic_symbol (typename Base::kind_type t, const std::string& v, const location_type& l);
 
 
       /// Constructor for symbols with semantic value.
@@ -723,6 +734,10 @@ namespace isc { namespace dhcp {
     symbol_type
     make_MATCH_CLIENT_ID (const location_type& l);
 
+    static inline
+    symbol_type
+    make_AUTHORITATIVE (const location_type& l);
+
     static inline
     symbol_type
     make_NEXT_SERVER (const location_type& l);
@@ -1349,7 +1364,7 @@ namespace isc { namespace dhcp {
     /// \param yyvalue   the value to check
     static bool yy_table_value_is_error_ (int yyvalue);
 
-    static const short int yypact_ninf_;
+    static const short yypact_ninf_;
     static const signed char yytable_ninf_;
 
     /// Convert a scanner token number \a t to a symbol number.
@@ -1358,32 +1373,32 @@ namespace isc { namespace dhcp {
     // Tables.
   // YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
   // STATE-NUM.
-  static const short int yypact_[];
+  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 int yydefact_[];
+  static const unsigned short yydefact_[];
 
   // YYPGOTO[NTERM-NUM].
-  static const short int yypgoto_[];
+  static const short yypgoto_[];
 
   // YYDEFGOTO[NTERM-NUM].
-  static const short int yydefgoto_[];
+  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 int yytable_[];
+  static const unsigned short yytable_[];
 
-  static const short int yycheck_[];
+  static const short yycheck_[];
 
   // YYSTOS[STATE-NUM] -- The (internal number of the) accessing
   // symbol of state STATE-NUM.
-  static const unsigned short int yystos_[];
+  static const unsigned short yystos_[];
 
   // YYR1[YYN] -- Symbol number of symbol that rule YYN derives.
-  static const unsigned short int yyr1_[];
+  static const unsigned short yyr1_[];
 
   // YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.
   static const unsigned char yyr2_[];
@@ -1397,7 +1412,7 @@ namespace isc { namespace dhcp {
     static const char* const yytname_[];
 #if PARSER4_DEBUG
   // YYRLINE[YYN] -- Source line where rule number YYN was defined.
-  static const unsigned short int yyrline_[];
+  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.
@@ -1462,6 +1477,8 @@ namespace isc { namespace dhcp {
       typedef basic_symbol<by_state> super_type;
       /// Construct an empty symbol.
       stack_symbol_type ();
+      /// Copy construct (for efficiency).
+      stack_symbol_type (const stack_symbol_type& that);
       /// Steal the contents from \a sym to build this.
       stack_symbol_type (state_type s, symbol_type& sym);
       /// Assignment, needed by push_back.
@@ -1490,18 +1507,18 @@ namespace isc { namespace dhcp {
     void yypush_ (const char* m, state_type s, symbol_type& sym);
 
     /// Pop \a n symbols the three stacks.
-    void yypop_ (unsigned int n = 1);
+    void yypop_ (unsigned n = 1);
 
     /// Constants.
     enum
     {
       yyeof_ = 0,
-      yylast_ = 983,     ///< Last index in yytable_.
-      yynnts_ = 372,  ///< Number of nonterminal symbols.
+      yylast_ = 989,     ///< Last index in yytable_.
+      yynnts_ = 373,  ///< Number of nonterminal symbols.
       yyfinal_ = 30, ///< Termination state number.
       yyterror_ = 1,
       yyerrcode_ = 256,
-      yyntokens_ = 168  ///< Number of tokens.
+      yyntokens_ = 169  ///< Number of tokens.
     };
 
 
@@ -1560,14 +1577,14 @@ namespace isc { namespace dhcp {
      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
+     165,   166,   167,   168
     };
-    const unsigned int user_token_number_max_ = 422;
+    const unsigned user_token_number_max_ = 423;
     const token_number_type undef_token_ = 2;
 
-    if (static_cast<int>(t) <= yyeof_)
+    if (static_cast<int> (t) <= yyeof_)
       return yyeof_;
-    else if (static_cast<unsigned int> (t) <= user_token_number_max_)
+    else if (static_cast<unsigned> (t) <= user_token_number_max_)
       return translate_table[t];
     else
       return undef_token_;
@@ -1581,44 +1598,43 @@ namespace isc { namespace dhcp {
 
   // basic_symbol.
   template <typename Base>
-  inline
   Dhcp4Parser::basic_symbol<Base>::basic_symbol ()
     : value ()
+    , location ()
   {}
 
   template <typename Base>
-  inline
   Dhcp4Parser::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
     : Base (other)
     , value ()
     , location (other.location)
   {
-      switch (other.type_get ())
+    switch (other.type_get ())
     {
-      case 184: // value
-      case 188: // map_value
-      case 228: // socket_type
-      case 231: // outbound_interface_value
-      case 253: // db_type
-      case 335: // hr_mode
-      case 482: // ncr_protocol_value
-      case 490: // replace_client_name_value
+      case 185: // value
+      case 189: // map_value
+      case 230: // socket_type
+      case 233: // outbound_interface_value
+      case 255: // db_type
+      case 337: // hr_mode
+      case 484: // ncr_protocol_value
+      case 492: // replace_client_name_value
         value.copy< ElementPtr > (other.value);
         break;
 
-      case 167: // "boolean"
+      case 168: // "boolean"
         value.copy< bool > (other.value);
         break;
 
-      case 166: // "floating point"
+      case 167: // "floating point"
         value.copy< double > (other.value);
         break;
 
-      case 165: // "integer"
+      case 166: // "integer"
         value.copy< int64_t > (other.value);
         break;
 
-      case 164: // "constant string"
+      case 165: // "constant string"
         value.copy< std::string > (other.value);
         break;
 
@@ -1628,41 +1644,39 @@ namespace isc { namespace dhcp {
 
   }
 
-
   template <typename Base>
-  inline
   Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const semantic_type& v, const location_type& l)
     : Base (t)
     , value ()
     , location (l)
   {
     (void) v;
-      switch (this->type_get ())
+    switch (this->type_get ())
     {
-      case 184: // value
-      case 188: // map_value
-      case 228: // socket_type
-      case 231: // outbound_interface_value
-      case 253: // db_type
-      case 335: // hr_mode
-      case 482: // ncr_protocol_value
-      case 490: // replace_client_name_value
+      case 185: // value
+      case 189: // map_value
+      case 230: // socket_type
+      case 233: // outbound_interface_value
+      case 255: // db_type
+      case 337: // hr_mode
+      case 484: // ncr_protocol_value
+      case 492: // replace_client_name_value
         value.copy< ElementPtr > (v);
         break;
 
-      case 167: // "boolean"
+      case 168: // "boolean"
         value.copy< bool > (v);
         break;
 
-      case 166: // "floating point"
+      case 167: // "floating point"
         value.copy< double > (v);
         break;
 
-      case 165: // "integer"
+      case 166: // "integer"
         value.copy< int64_t > (v);
         break;
 
-      case 164: // "constant string"
+      case 165: // "constant string"
         value.copy< std::string > (v);
         break;
 
@@ -1677,40 +1691,39 @@ namespace isc { namespace dhcp {
   template <typename Base>
   Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const location_type& l)
     : Base (t)
-    , value ()
     , location (l)
   {}
 
   template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const ElementPtr v, const location_type& l)
+  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const ElementPtr& v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const bool v, const location_type& l)
+  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const bool& v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const double v, const location_type& l)
+  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const double& v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const int64_t v, const location_type& l)
+  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const int64_t& v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
   {}
 
   template <typename Base>
-  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::string v, const location_type& l)
+  Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const std::string& v, const location_type& l)
     : Base (t)
     , value (v)
     , location (l)
@@ -1718,14 +1731,12 @@ namespace isc { namespace dhcp {
 
 
   template <typename Base>
-  inline
   Dhcp4Parser::basic_symbol<Base>::~basic_symbol ()
   {
     clear ();
   }
 
   template <typename Base>
-  inline
   void
   Dhcp4Parser::basic_symbol<Base>::clear ()
   {
@@ -1740,32 +1751,32 @@ namespace isc { namespace dhcp {
     }
 
     // Type destructor.
-    switch (yytype)
+  switch (yytype)
     {
-      case 184: // value
-      case 188: // map_value
-      case 228: // socket_type
-      case 231: // outbound_interface_value
-      case 253: // db_type
-      case 335: // hr_mode
-      case 482: // ncr_protocol_value
-      case 490: // replace_client_name_value
+      case 185: // value
+      case 189: // map_value
+      case 230: // socket_type
+      case 233: // outbound_interface_value
+      case 255: // db_type
+      case 337: // hr_mode
+      case 484: // ncr_protocol_value
+      case 492: // replace_client_name_value
         value.template destroy< ElementPtr > ();
         break;
 
-      case 167: // "boolean"
+      case 168: // "boolean"
         value.template destroy< bool > ();
         break;
 
-      case 166: // "floating point"
+      case 167: // "floating point"
         value.template destroy< double > ();
         break;
 
-      case 165: // "integer"
+      case 166: // "integer"
         value.template destroy< int64_t > ();
         break;
 
-      case 164: // "constant string"
+      case 165: // "constant string"
         value.template destroy< std::string > ();
         break;
 
@@ -1777,7 +1788,6 @@ namespace isc { namespace dhcp {
   }
 
   template <typename Base>
-  inline
   bool
   Dhcp4Parser::basic_symbol<Base>::empty () const
   {
@@ -1785,37 +1795,36 @@ namespace isc { namespace dhcp {
   }
 
   template <typename Base>
-  inline
   void
   Dhcp4Parser::basic_symbol<Base>::move (basic_symbol& s)
   {
-    super_type::move(s);
-      switch (this->type_get ())
+    super_type::move (s);
+    switch (this->type_get ())
     {
-      case 184: // value
-      case 188: // map_value
-      case 228: // socket_type
-      case 231: // outbound_interface_value
-      case 253: // db_type
-      case 335: // hr_mode
-      case 482: // ncr_protocol_value
-      case 490: // replace_client_name_value
+      case 185: // value
+      case 189: // map_value
+      case 230: // socket_type
+      case 233: // outbound_interface_value
+      case 255: // db_type
+      case 337: // hr_mode
+      case 484: // ncr_protocol_value
+      case 492: // replace_client_name_value
         value.move< ElementPtr > (s.value);
         break;
 
-      case 167: // "boolean"
+      case 168: // "boolean"
         value.move< bool > (s.value);
         break;
 
-      case 166: // "floating point"
+      case 167: // "floating point"
         value.move< double > (s.value);
         break;
 
-      case 165: // "integer"
+      case 166: // "integer"
         value.move< int64_t > (s.value);
         break;
 
-      case 164: // "constant string"
+      case 165: // "constant string"
         value.move< std::string > (s.value);
         break;
 
@@ -1871,7 +1880,7 @@ namespace isc { namespace dhcp {
     // YYTOKNUM[NUM] -- (External) token number corresponding to the
     // (internal) symbol number NUM (which must be that of a token).  */
     static
-    const unsigned short int
+    const unsigned short
     yytoken_number_[] =
     {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
@@ -1890,7 +1899,7 @@ namespace isc { namespace dhcp {
      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
+     415,   416,   417,   418,   419,   420,   421,   422,   423
     };
     return static_cast<token_type> (yytoken_number_[type]);
   }
@@ -2039,6 +2048,12 @@ namespace isc { namespace dhcp {
     return symbol_type (token::TOKEN_MATCH_CLIENT_ID, l);
   }
 
+  Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_AUTHORITATIVE (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_AUTHORITATIVE, l);
+  }
+
   Dhcp4Parser::symbol_type
   Dhcp4Parser::make_NEXT_SERVER (const location_type& l)
   {
@@ -2892,9 +2907,9 @@ namespace isc { namespace dhcp {
   }
 
 
-#line 14 "dhcp4_parser.yy" // lalr1.cc:377
+#line 14 "dhcp4_parser.yy" // lalr1.cc:380
 } } // isc::dhcp
-#line 2898 "dhcp4_parser.h" // lalr1.cc:377
+#line 2913 "dhcp4_parser.h" // lalr1.cc:380
 
 
 

diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh
index 7e23a2ccac4e6235bff281bd9ffdb2365482b554..ed2552c423ba4f09040f177f05c13df24be54b63 100644 (file)
--- a/src/bin/dhcp4/location.hh
+++ b/src/bin/dhcp4/location.hh
@@ -1,8 +1,8 @@
-// A Bison parser, made by GNU Bison 3.0.4.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Locations for Bison parsers in C++
 
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018 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
@@ -40,9 +40,9 @@
 
 # include "position.hh"
 
-#line 14 "dhcp4_parser.yy" // location.cc:296
+#line 14 "dhcp4_parser.yy" // location.cc:290
 namespace isc { namespace dhcp {
-#line 46 "location.hh" // location.cc:296
+#line 46 "location.hh" // location.cc:290
   /// Abstract a location.
   class location
   {
@@ -52,30 +52,27 @@ namespace isc { namespace dhcp {
     location (const position& b, const position& e)
       : begin (b)
       , end (e)
-    {
-    }
+    {}
 
     /// Construct a 0-width location in \a p.
     explicit location (const position& p = position ())
       : begin (p)
       , end (p)
-    {
-    }
+    {}
 
     /// Construct a 0-width location in \a f, \a l, \a c.
     explicit location (std::string* f,
-                       unsigned int l = 1u,
-                       unsigned int c = 1u)
+                       unsigned l = 1u,
+                       unsigned c = 1u)
       : begin (f, l, c)
       , end (f, l, c)
-    {
-    }
+    {}
 
 
     /// Initialization.
     void initialize (std::string* f = YY_NULLPTR,
-                     unsigned int l = 1u,
-                     unsigned int c = 1u)
+                     unsigned l = 1u,
+                     unsigned c = 1u)
     {
       begin.initialize (f, l, c);
       end = begin;
@@ -170,10 +167,10 @@ namespace isc { namespace dhcp {
    ** Avoid duplicate information.
    */
   template <typename YYChar>
-  inline std::basic_ostream<YYChar>&
+  std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
   {
-    unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
+    unsigned end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
     ostr << loc.begin;
     if (loc.end.filename
         && (!loc.begin.filename
@@ -186,7 +183,7 @@ namespace isc { namespace dhcp {
     return ostr;
   }
 
-#line 14 "dhcp4_parser.yy" // location.cc:296
+#line 14 "dhcp4_parser.yy" // location.cc:290
 } } // isc::dhcp
-#line 192 "location.hh" // location.cc:296
+#line 189 "location.hh" // location.cc:290
 #endif // !YY_PARSER4_LOCATION_HH_INCLUDED

diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh
index c60fabbdf87798eaaf77c5d851308166f1c29ecc..ff5d2773d75cc2fd9e713823ecc2973eb0cc0530 100644 (file)
--- a/src/bin/dhcp4/position.hh
+++ b/src/bin/dhcp4/position.hh
@@ -1,8 +1,8 @@
-// A Bison parser, made by GNU Bison 3.0.4.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Positions for Bison parsers in C++
 
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018 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
@@ -50,28 +50,27 @@
 #  endif
 # endif
 
-#line 14 "dhcp4_parser.yy" // location.cc:296
+#line 14 "dhcp4_parser.yy" // location.cc:290
 namespace isc { namespace dhcp {
-#line 56 "position.hh" // location.cc:296
+#line 56 "position.hh" // location.cc:290
   /// Abstract a position.
   class position
   {
   public:
     /// Construct a position.
     explicit position (std::string* f = YY_NULLPTR,
-                       unsigned int l = 1u,
-                       unsigned int c = 1u)
+                       unsigned l = 1u,
+                       unsigned c = 1u)
       : filename (f)
       , line (l)
       , column (c)
-    {
-    }
+    {}
 
 
     /// Initialization.
     void initialize (std::string* fn = YY_NULLPTR,
-                     unsigned int l = 1u,
-                     unsigned int c = 1u)
+                     unsigned l = 1u,
+                     unsigned c = 1u)
     {
       filename = fn;
       line = l;
@@ -100,17 +99,15 @@ namespace isc { namespace dhcp {
     /// File name to which this position refers.
     std::string* filename;
     /// Current line number.
-    unsigned int line;
+    unsigned line;
     /// Current column number.
-    unsigned int column;
+    unsigned column;
 
   private:
-    /// Compute max(min, lhs+rhs) (provided min <= lhs).
-    static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
+    /// Compute max(min, lhs+rhs).
+    static unsigned add_ (unsigned lhs, int rhs, int min)
     {
-      return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
-              ? rhs + lhs
-              : min);
+      return static_cast<unsigned>(std::max(min, static_cast<int>(lhs) + rhs));
     }
   };
 
@@ -166,7 +163,7 @@ namespace isc { namespace dhcp {
    ** \param pos a reference to the position to redirect
    */
   template <typename YYChar>
-  inline std::basic_ostream<YYChar>&
+  std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
   {
     if (pos.filename)
@@ -174,7 +171,7 @@ namespace isc { namespace dhcp {
     return ostr << pos.line << '.' << pos.column;
   }
 
-#line 14 "dhcp4_parser.yy" // location.cc:296
+#line 14 "dhcp4_parser.yy" // location.cc:290
 } } // isc::dhcp
-#line 180 "position.hh" // location.cc:296
+#line 177 "position.hh" // location.cc:290
 #endif // !YY_PARSER4_POSITION_HH_INCLUDED

diff --git a/src/bin/dhcp4/stack.hh b/src/bin/dhcp4/stack.hh
index 3dd2a2a3934851424d45b935573ab2e9e83f07a8..fb85286ef1ee0aff7e5c3df46256720bbb534c65 100644 (file)
--- a/src/bin/dhcp4/stack.hh
+++ b/src/bin/dhcp4/stack.hh
@@ -1,8 +1,8 @@
-// A Bison parser, made by GNU Bison 3.0.4.
+// A Bison parser, made by GNU Bison 3.1.
 
 // Stack handling for Bison parsers in C++
 
-// Copyright (C) 2002-2015 Free Software Foundation, Inc.
+// Copyright (C) 2002-2015, 2018 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,6 +43,7 @@
 #line 14 "dhcp4_parser.yy" // stack.hh:132
 namespace isc { namespace dhcp {
 #line 46 "stack.hh" // stack.hh:132
+  /// A stack with random access from its top.
   template <class T, class S = std::vector<T> >
   class stack
   {
@@ -50,27 +51,31 @@ namespace isc { namespace dhcp {
     // 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 ()
-      : seq_ ()
     {
       seq_.reserve (200);
     }
 
-    stack (unsigned int n)
+    stack (size_type n)
       : seq_ (n)
     {}
 
-    inline
+    /// Random access.
+    ///
+    /// Index 0 returns the topmost element.
     T&
-    operator[] (unsigned int i)
+    operator[] (size_type i)
     {
       return seq_[seq_.size () - 1 - i];
     }
 
-    inline
+    /// Random access.
+    ///
+    /// Index 0 returns the topmost element.
     const T&
-    operator[] (unsigned int i) const
+    operator[] (size_type i) const
     {
       return seq_[seq_.size () - 1 - i];
     }
@@ -78,7 +83,6 @@ namespace isc { namespace dhcp {
     /// Steal the contents of \a t.
     ///
     /// Close to move-semantics.
-    inline
     void
     push (T& t)
     {
@@ -86,9 +90,8 @@ namespace isc { namespace dhcp {
       operator[](0).move (t);
     }
 
-    inline
     void
-    pop (unsigned int n = 1)
+    pop (size_type n = 1)
     {
       for (; n; --n)
         seq_.pop_back ();
@@ -100,21 +103,18 @@ namespace isc { namespace dhcp {
       seq_.clear ();
     }
 
-    inline
-    typename S::size_type
+    size_type
     size () const
     {
       return seq_.size ();
     }
 
-    inline
     const_iterator
     begin () const
     {
       return seq_.rbegin ();
     }
 
-    inline
     const_iterator
     end () const
     {
@@ -133,21 +133,21 @@ namespace isc { namespace dhcp {
   class slice
   {
   public:
-    slice (const S& stack, unsigned int range)
+    typedef typename S::size_type size_type;
+    slice (const S& stack, size_type range)
       : stack_ (stack)
       , range_ (range)
     {}
 
-    inline
     const T&
-    operator [] (unsigned int i) const
+    operator[] (size_type i) const
     {
       return stack_[range_ - i];
     }
 
   private:
     const S& stack_;
-    unsigned int range_;
+    size_type range_;
   };
 
 #line 14 "dhcp4_parser.yy" // stack.hh:132