[#3587] Updated kea-dhcp6 parser

Changes to be committed:
    doc/examples/kea6/all-keys.json
    doc/examples/kea6/classify2.json
    src/bin/admin/tests/mysql_tests.sh.in
    src/bin/dhcp6/dhcp6_lexer.cc
    src/bin/dhcp6/dhcp6_lexer.ll
    src/bin/dhcp6/dhcp6_parser.cc
    src/bin/dhcp6/dhcp6_parser.h
    src/bin/dhcp6/dhcp6_parser.yy
    src/bin/dhcp6/tests/config_parser_unittest.cc

diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json
index a3d19a3c7c105662136cf279c88b9446f6e8cead..281627950c23ba621b3488af6b22266783770afd 100644 (file)
--- a/doc/examples/kea6/all-keys.json
+++ b/doc/examples/kea6/all-keys.json
@@ -67,10 +67,10 @@
 
                 // Boolean flag indicating whether the class expression is only evaluated
                 // when the class is required, e.g. the selected address pool configuration
-                // includes this class name in its "require-client-classes" list. The
+                // includes this class name in its "evaluate-additional-classes" list. The
                 // default value false means that the class test expression must
                 // always be evaluated.
-                "only-if-required": true,
+                "only-in-additional-list": true,
 
                 // Class selection expression.
                 "test": "member('ALL')"
@@ -901,7 +901,7 @@
 
                 // List of client classes which must be evaluated when this shared
                 // network is selected for client assignments.
-                "require-client-classes": [ "late" ],
+                "evaluate-additional-classes": [ "late" ],
 
                 // Turn off storage of extended information (e.g. relay agent
                 // information) with each lease for this shared network.
@@ -1043,7 +1043,7 @@
 
                                 // List of client classes which must be evaluated
                                 // when this prefix pool is selected for client assignments.
-                                "require-client-classes": [],
+                                "evaluate-additional-classes": [],
 
                                 // PD-pool identifier used to enable statistics for this pd-pool.
                                 // The pd-pool ID does not need to be unique within the subnet
@@ -1080,7 +1080,7 @@
 
                                 // List of client classes which must be evaluated when this pool
                                 // is selected for client assignments.
-                                "require-client-classes": [ "late" ]
+                                "evaluate-additional-classes": [ "late" ]
                             },
                             {
                                 // Restricts this pool to only be used for client
@@ -1095,7 +1095,7 @@
 
                                 // List of client classes which must be evaluated when this pool
                                 // is selected for client assignments.
-                                "require-client-classes": [],
+                                "evaluate-additional-classes": [],
 
                                 // Pool identifier used to enable statistics for this pool.
                                 // The pool ID does not need to be unique within the subnet
@@ -1195,7 +1195,7 @@
 
                         // List of client classes which must be evaluated when this subnet
                         // is selected for client assignments.
-                        "require-client-classes": [ "late" ],
+                        "evaluate-additional-classes": [ "late" ],
 
                         // Subnet prefix.
                         "subnet": "2001:db8::/32",

diff --git a/doc/examples/kea6/classify2.json b/doc/examples/kea6/classify2.json
index 78542f48ad1c97d221f3a13ad0b7c5e01b541a46..2d058ae5167b8f0c73b601262bd02b12c031a604 100644 (file)
--- a/doc/examples/kea6/classify2.json
+++ b/doc/examples/kea6/classify2.json
@@ -30,7 +30,7 @@
 // is not yet defined.
   {
       "name": "second_subnet",
-      "only-if-required": true,
+      "only-in-additional-list": true,
       "test": "member('ALL')",
       "option-data": [{
           "name": "dns-servers",
@@ -86,7 +86,7 @@
             "client-classes": [ "cable-modems" ]
         } ],
         "interface": "eth0",
-        "require-client-classes": [ "second_subnet" ]
+        "evaluate-additional-classes": [ "second_subnet" ]
     },
 // The following subnet contains a pool with a class constraint: only
 // clients which belong to the class are allowed to use this pool.

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index fddedea481d777f3d654a5d02bd8205af9d3d01e..e758df31117586962437bd21989b16d6066d561e 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -961,10 +961,10 @@ mysql_upgrade_24_to_25_test() {
 mysql_upgrade_25_to_26_test() {
 
     # client_classes been added to dhcp4_options
-    check_table_column client_classes dhcp4_options;
+    check_table_column client_classes dhcp4_options
 
     # client_classes been added to dhcp6_options
-    check_table_column client_classes dhcp6_options;
+    check_table_column client_classes dhcp6_options
 
     # check rename of require_client_classes to evaluate_additaionl_classes.
     check_table_column evaluate_additional_classes dhcp4_shared_network

diff --git a/src/bin/dhcp6/dhcp6_lexer.cc b/src/bin/dhcp6/dhcp6_lexer.cc
index 29cf97f2925c306605730ccd12554b2ba7d13b0f..f644d13ee025b0cc091ca4490674c7a859c1d876 100644 (file)
--- a/src/bin/dhcp6/dhcp6_lexer.cc
+++ b/src/bin/dhcp6/dhcp6_lexer.cc
@@ -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 238
-#define YY_END_OF_BUFFER 239
+#define YY_NUM_RULES 240
+#define YY_END_OF_BUFFER 241
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -700,45 +700,45 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static const flex_int16_t yy_accept[2261] =
+static const flex_int16_t yy_accept[2306] =
     {   0,
-      231,  231,    0,    0,    0,    0,    0,    0,    0,    0,
-      239,  237,   10,   11,  237,    1,  231,  228,  231,  231,
-      237,  230,  229,  237,  237,  237,  237,  237,  224,  225,
-      237,  237,  237,  226,  227,    5,    5,    5,  237,  237,
-      237,   10,   11,    0,    0,  219,    0,    0,    0,    0,
+      233,  233,    0,    0,    0,    0,    0,    0,    0,    0,
+      241,  239,   10,   11,  239,    1,  233,  230,  233,  233,
+      239,  232,  231,  239,  239,  239,  239,  239,  226,  227,
+      239,  239,  239,  228,  229,    5,    5,    5,  239,  239,
+      239,   10,   11,    0,    0,  221,    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,
-      231,  231,    0,  230,  231,    3,    2,    6,    0,  231,
+      233,  233,    0,  232,  233,    3,    2,    6,    0,  233,
         0,    0,    0,    0,    0,    0,    4,    0,    0,    9,
 
-        0,  220,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  222,    0,    0,
+        0,  222,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  224,    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,    0,    0,
-        0,    0,    0,    0,    0,    0,    2,    0,    0,    0,
-        0,    0,    0,    0,    8,    0,    0,    0,  174,    0,
+        0,    0,    0,    0,    0,    0,    0,    2,    0,    0,
+        0,    0,    0,    0,    0,    8,    0,    0,    0,  176,
 
-        0,  175,    0,    0,    0,    0,    0,    0,    0,    0,
-      221,  223,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  177,    0,    0,    0,    0,    0,    0,    0,
+        0,  223,  225,    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,  125,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  125,    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,    0,    0,    0,  236,  234,    0,
-      233,  232,    0,    0,    0,    0,    0,    0,  173,    0,
-        0,   23,    0,   22,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  238,
+      236,    0,  235,  234,    0,    0,    0,    0,    0,    0,
+      175,    0,    0,   23,    0,   22,    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,
@@ -750,40 +750,40 @@ static const flex_int16_t yy_accept[2261] =
         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,  235,
-      232,    0,    0,    0,    0,    0,   24,    0,    0,   26,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  130,    0,    0,    0,    0,    0,    0,
-      108,    0,    0,    0,    0,    0,    0,    0,    0,  159,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  237,  234,    0,    0,    0,    0,    0,   24,
+        0,    0,   26,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  130,    0,    0,    0,
+        0,    0,    0,  108,    0,    0,    0,    0,    0,    0,
+        0,    0,  161,    0,    0,    0,    0,    0,    0,    0,
 
-        0,   53,    0,    0,    0,  196,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  107,
+        0,    0,    0,    0,    0,   53,    0,    0,    0,  198,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  118,    0,    0,   54,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  107,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  118,
+        0,    0,   54,    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,  152,    0,  178,    0,   50,  195,    0,   51,
-        0,    0,    0,    0,    0,    0,   32,   29,   28,    0,
+        0,    0,    0,    0,    0,    0,  153,    0,  180,    0,
+       50,  197,    0,   51,    0,    0,    0,    0,    0,    0,
 
-        0,    0,    0,    0,  167,    0,  202,    0,    0,    0,
+       32,   29,   28,    0,    0,    0,    0,    0,  169,    0,
+      204,    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,  143,
+        0,    0,    0,    0,    0,    0,  199,  179,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  143,    0,    0,    0,    0,    0,
-        0,  197,  177,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   27,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  111,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   27,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  111,    0,    0,
 
-      203,    0,    0,    0,    0,  168,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  163,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    7,   30,    0,    0,    0,
+        0,    0,    0,    0,    0,  205,    0,    0,    0,    0,
+      170,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  165,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        7,   30,    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,
@@ -791,165 +791,171 @@ static const flex_int16_t yy_accept[2261] =
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      145,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      142,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  113,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  145,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  142,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      113,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  122,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  122,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      205,  121,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  207,  121,    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,  162,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  171,  139,    0,    0,    0,    0,    0,    0,
-        0,  144,    0,    0,    0,    0,    0,    0,   62,    0,
-        0,    0,    0,    0,    0,    0,    0,  146,    0,    0,
-       55,  119,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  164,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      173,  139,    0,    0,    0,    0,    0,    0,    0,  144,
+        0,    0,    0,    0,    0,    0,   62,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  146,    0,    0,   55,
+      119,    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,  102,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  212,
+        0,    0,    0,    0,    0,  102,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  214,    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,  161,    0,    0,    0,    0,    0,    0,    0,   71,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  163,    0,    0,    0,    0,    0,    0,    0,   71,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
-        0,    0,    0,    0,    0,   52,    0,    0,  112,    0,
-        0,  157,    0,    0,    0,    0,   49,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  148,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   52,    0,    0,  112,
+        0,    0,  159,    0,    0,    0,    0,   49,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  148,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       84,    0,    0,    0,    0,    0,   70,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   84,    0,    0,    0,    0,    0,   70,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      213,    0,    0,  204,    0,    0,    0,    0,    0,    0,
 
+        0,  215,    0,    0,  206,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  123,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  123,    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,   36,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,   15,
-        0,    0,  172,   13,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  206,    0,    0,    0,    0,    0,    0,
+       36,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   15,    0,    0,  174,   13,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  208,    0,    0,    0,
 
-        0,    0,    0,    0,    0,  164,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,  147,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,  160,  176,    0,   35,
+        0,    0,    0,    0,    0,    0,    0,    0,  166,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  147,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   19,    0,  110,
-        0,    0,  105,    0,    0,    0,  170,    0,    0,    0,
-        0,  114,  211,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   82,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  135,  136,
-
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  109,    0,    0,    0,    0,    0,   72,
+      162,  178,    0,   35,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   19,    0,  110,    0,    0,    0,  105,    0,    0,
+        0,  172,    0,    0,    0,    0,  114,  213,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  166,    0,    0,    0,    0,
+
+        0,    0,    0,   82,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  135,  136,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  109,    0,
+        0,    0,    0,    0,   72,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  131,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,  106,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   79,    0,    0,    0,    0,   16,    0,   14,    0,
-
-        0,    0,  198,  200,  194,    0,    0,    0,    0,    0,
+      168,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       25,    0,    0,    0,    0,    0,  151,    0,    0,    0,
+      131,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  106,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,   79,    0,
+        0,    0,    0,   16,    0,   14,    0,    0,    0,  200,
+      202,  196,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   25,    0,    0,
+        0,    0,    0,  152,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  187,    0,    0,
-      210,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  124,    0,  156,    0,   41,    0,    0,   56,
+        0,    0,    0,    0,  189,    0,    0,  212,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       18,    0,    0,    0,    0,    0,    0,   85,    0,  126,
-       58,   80,    0,    0,  165,    0,    0,  155,    0,    0,
+      124,    0,  158,    0,   41,    0,    0,   56,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,   18,    0,
 
+        0,    0,    0,    0,    0,    0,   85,    0,  126,   58,
+       80,    0,    0,  167,    0,    0,  157,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   69,    0,  120,    0,    0,    0,    0,    0,
-        0,    0,    0,  138,    0,    0,  208,    0,  217,    0,
+        0,   69,    0,  120,    0,    0,    0,    0,    0,    0,
+        0,    0,  138,    0,    0,  210,    0,  219,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  117,    0,    0,    0,    0,
-      179,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  117,    0,    0,    0,    0,  181,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  207,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       40,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-      153,    0,    0,    0,   59,    0,    0,    0,    0,    0,
-      201,    0,    0,  149,   46,    0,    0,    0,  192,    0,
-       33,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   12,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   44,    0,    0,    0,   43,
-        0,    0,   17,    0,    0,    0,   68,    0,    0,    0,
-        0,    0,  141,  140,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      199,    0,    0,    0,    0,    0,    0,   76,    0,    0,
-        0,    0,    0,  137,    0,    0,    0,   57,  193,    0,
+
+      209,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   40,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  154,    0,    0,    0,   59,    0,    0,    0,    0,
+        0,  203,    0,    0,  149,   46,    0,    0,    0,  194,
+        0,   33,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   12,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   44,    0,    0,
+        0,   43,    0,    0,   17,    0,    0,    0,   68,    0,
+        0,    0,    0,    0,    0,  141,  140,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,  201,    0,    0,    0,    0,    0,    0,
+       76,    0,    0,    0,    0,    0,  137,    0,    0,    0,
+       57,  195,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  115,    0,    0,
+        0,    0,    0,    0,  171,    0,    0,    0,   45,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  190,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  104,    0,   63,
+        0,    0,    0,    0,    0,   97,    0,    0,   31,    0,
+       47,    0,    0,    0,    0,    0,    0,    0,    0,  101,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  115,    0,    0,    0,    0,    0,    0,
-      169,    0,    0,    0,   45,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  188,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  104,    0,   63,    0,    0,    0,    0,    0,
-       97,    0,    0,   31,    0,   47,    0,    0,    0,    0,
-        0,    0,    0,    0,  101,    0,    0,    0,    0,    0,
+        0,  187,    0,    0,    0,    0,  155,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   66,
+        0,   64,    0,    0,    0,    0,   60,  192,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       88,    0,    0,    0,    0,    0,    0,    0,    0,  160,
+        0,    0,    0,    0,    0,    0,   20,   34,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  193,    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,  185,    0,    0,    0,    0,
-
-      154,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   66,    0,   64,    0,    0,    0,    0,   60,
-      190,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,   88,    0,    0,    0,    0,    0,    0,
-        0,  158,    0,    0,    0,    0,    0,    0,   20,   34,
-        0,    0,    0,    0,    0,    0,    0,    0,  191,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  211,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  186,    0,   78,    0,   77,    0,    0,   73,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  209,
+        0,    0,    0,    0,    0,    0,   98,    0,  134,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  116,    0,    0,    0,  185,    0,    0,    0,
+        0,    0,   67,    0,    0,   83,    0,   61,    0,    0,
+      127,    0,    0,    0,    0,    0,    0,    0,    0,  103,
 
-        0,    0,  184,    0,   78,    0,   77,    0,   73,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   98,    0,  134,    0,    0,
+       94,    0,    0,    0,    0,    0,    0,   42,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      116,    0,    0,    0,  183,    0,    0,    0,    0,    0,
-       67,    0,   83,    0,   61,    0,    0,  127,    0,    0,
-        0,    0,    0,    0,    0,    0,  103,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   94,    0,    0,
-        0,    0,    0,   42,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   65,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,   92,    0,    0,
+        0,    0,   65,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   92,    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,  100,   48,    0,    0,
-        0,   93,    0,    0,    0,    0,  189,    0,    0,    0,
-        0,  215,  218,   75,   74,    0,  132,  150,  128,    0,
-        0,    0,    0,    0,    0,    0,   99,    0,    0,   89,
-        0,    0,    0,    0,    0,    0,    0,    0,  181,    0,
-        0,    0,    0,    0,    0,  186,    0,    0,   91,    0,
-       81,    0,    0,    0,    0,    0,    0,  129,    0,    0,
-
-        0,    0,    0,    0,    0,    0,  180,    0,    0,   21,
-      216,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   90,    0,
-        0,    0,    0,   39,   37,    0,    0,    0,    0,   95,
-        0,    0,  133,    0,   87,    0,   96,    0,    0,    0,
-        0,    0,    0,    0,   86,    0,  182,   38,  214,    0
+        0,    0,    0,  100,   48,    0,    0,    0,   93,    0,
+        0,    0,    0,  191,    0,    0,    0,    0,    0,  217,
+      220,   75,   74,    0,    0,  132,  150,  128,    0,    0,
+
+        0,    0,    0,    0,    0,   99,    0,    0,   89,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  156,  183,
+        0,    0,    0,    0,    0,    0,  188,    0,    0,   91,
+        0,   81,    0,    0,    0,    0,    0,    0,    0,  129,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  182,
+        0,    0,   21,  218,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   90,    0,    0,  151,    0,    0,   39,   37,
+        0,    0,    0,    0,   95,    0,    0,  133,    0,   87,
+        0,   96,    0,    0,    0,    0,    0,    0,    0,   86,
+
+        0,  184,   38,  216,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -996,298 +1002,304 @@ static const YY_CHAR yy_meta[77] =
         1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[2269] =
+static const flex_int16_t yy_base[2314] =
     {   0,
         0,   75,   21,   28,   39,   47,   53,   61,   95,  103,
-     2709, 2710,   31, 2705,  151,    0,  216, 2710,  223,  230,
-       13,  237, 2710, 2685,  124,   17,    4,   34, 2710, 2710,
-       23,   43,   64, 2710, 2710, 2710,   56, 2693, 2643,    0,
-     2683,  106, 2700,    2,  268, 2710,   85,   90, 2646, 2667,
-       98,   77, 2667,  235,  231,   97,  207,  298,  240, 2650,
-      294,  306,   62,  243,  204,  222, 2645,  224,  296,  341,
-      196,  320, 2628,   21,  332,  362,  345, 2647,  350,    0,
-      406,  422,  436,  446,  451, 2710,    0, 2710,  298,  465,
-      349,  351,  202,  365,  369,  301, 2710, 2644, 2688, 2710,
-
-      334, 2710,  464,  332,  232, 2642, 2686,  372,   17,  350,
-      373, 2680,  225,  377,  391,  252, 2684,    0,  528,  414,
-     2623, 2620, 2620,  433, 2620, 2621, 2627,  434, 2613, 2614,
-     2619,   76, 2629, 2613, 2621, 2611,  342,  380,   63,  427,
-      403, 2665,   16, 2607, 2663, 2600,  439, 2621, 2621, 2615,
-      440, 2607, 2608, 2606, 2600,  451,  397, 2597, 2596,  449,
-     2652, 2596,  283, 2608, 2607, 2595,  498, 2596,  436, 2608,
-     2605, 2606,  440, 2604, 2642, 2641,  471,  444, 2585, 2589,
-      468, 2585,  456, 2595, 2587, 2589,    0,  490,  490,  509,
-      500,  508,  532, 2585, 2710,  538,  539, 2580, 2710,  502,
-
-      536, 2710, 2637,  544,  548, 2636,  547, 2635,  541, 2634,
-     2710, 2710,  590, 2576,  553, 2589, 2581, 2579, 2579, 2583,
-     2584, 2564, 2575, 2577, 2576,  458,  557, 2617, 2578, 2559,
-     2556, 2564, 2570, 2558, 2568, 2568, 2559, 2568, 2568, 2563,
-     2555, 2557, 2560, 2540, 2544, 2558, 2550, 2540, 2543, 2542,
-     2556, 2710, 2542, 2550,   82, 2591, 2534, 2543, 2588, 2532,
-     2542, 2585,  561, 2584, 2526, 2540, 2581,  556, 2537, 2517,
-     2532, 2524, 2528,  480, 2519, 2517,  377, 2517, 2523, 2514,
-     2527, 2511, 2522, 2526,  532, 2520,  526, 2527, 2522, 2505,
-     2520, 2506, 2514, 2518, 2499, 2515, 2501, 2507, 2514, 2496,
-
-      527, 2501, 2498, 2497,  514, 2496, 2491, 2505, 2504,  567,
-     2503, 2483, 2505, 2487, 2495, 2483,  568, 2710, 2710,  569,
-     2710, 2710, 2481,  557,  578, 2531,  585, 2542, 2710,  586,
-      595, 2710, 2541, 2710, 2535,  639, 2494,  585, 2471, 2490,
-     2491, 2488, 2471, 2488, 2527, 2484, 2474, 2529, 2481, 2484,
-     2475, 2478, 2464, 2475,  621, 2517, 2472, 2469, 2470,  657,
-     2473, 2517, 2449, 2461, 2456, 2453, 2449, 2451, 2454, 2504,
-     2458, 2502, 2445,  639,  582, 2458, 2458, 2441, 2442, 2455,
-     2453, 2451, 2451, 2450, 2445, 2452, 2447, 2432,  605, 2441,
-     2444,  608, 2439, 2489,  572,  610, 2445, 2482, 2429, 2422,
-
-     2437, 2428, 2435, 2416, 2433, 2425, 2421, 2426,  671, 2476,
-      626, 2428, 2428, 2426,   50, 2417, 2415, 2427,  618, 2402,
-     2403, 2416, 2406, 2398, 2402, 2416,  628, 2402, 2414, 2413,
-     2412, 2407, 2452, 2409, 2408, 2407, 2406, 2389, 2397, 2450,
-     2406, 2448, 2385, 2446, 2445, 2384,  688, 2397, 2395, 2710,
-     2710, 2395,  635, 2435, 2439, 2438, 2710, 2437,  606, 2710,
-      661,  725, 2393,  648, 2435, 2378, 2433, 2427, 2377, 2379,
-      376, 2369, 2366, 2710, 2371, 2364, 2376, 2379, 2366, 2365,
-     2710, 2375,  645, 2366, 2363, 2375,  583, 2360, 2354, 2710,
-     2410, 2367, 2352, 2354, 2365, 2363, 2363, 2357,  692, 2347,
-
-     2401, 2710, 2345, 2361, 2398, 2710, 2402, 2401, 2354, 2348,
-     2350, 2351, 2335, 2344, 2389, 2337, 2336, 2331, 2330, 2332,
-     2328, 2324,  654, 2343, 2317, 2324, 2323, 2339, 2376, 2710,
-     2323, 2319,  698, 2327, 2326, 2320, 2313, 2312, 2326, 2326,
-     2314, 2310, 2315, 2311, 2306, 2710, 2315, 2365, 2710, 2304,
-     2297, 2357, 2356, 2298, 2297, 2302, 2357, 2310, 2304, 2298,
-     2307,  710, 2347, 2291, 2286, 2344, 2281, 2287,  694, 2301,
-     2294, 2298, 2281, 2342, 2280, 2280, 2334, 2276, 2277, 2276,
-     2274, 2291, 2710, 2287, 2710, 2327, 2710, 2710, 2275, 2710,
-      668, 2325, 2324, 2281, 2327,  691, 2710, 2710, 2710,  636,
-
-      691,  690, 2264,  718, 2710, 2263, 2710,  463, 2281, 2261,
-     2271, 2274, 2315,  717, 2257, 2267, 2312, 2254, 2261, 2254,
-     2262, 2255, 2264, 2246, 2246, 2261, 2260, 2244,  667, 2258,
-     2257, 2241, 2256, 2238, 2288, 2242, 2249, 2292, 2233, 2235,
-     2247, 2247, 2245, 2245, 2710, 2230, 2242, 2234, 2240, 2231,
-     2239, 2710, 2710, 2224, 2235, 2239, 2221, 2233, 2225,  684,
-     2216, 2215, 2209, 2214, 2211, 2226, 2225, 2226, 2205, 2215,
-     2221, 2267, 2219, 2211, 2202, 2203, 2205, 2710, 2200, 2206,
-     2211, 2253,  752, 2252, 2194, 2250, 2194, 2197, 2195, 2197,
-     2188, 2203, 2710, 2188,  753, 2185, 2201, 2198, 2193, 2189,
-
-     2710, 2237, 2186, 2193, 2234, 2710, 2177, 2175, 2189, 2192,
-     2177, 2228, 2227, 2171, 2225, 2182, 2166, 2222, 2221, 2710,
-     2163, 2177, 2176,  714, 2177, 2176, 2173, 2157, 2213, 2174,
-     2169, 2158, 2163, 2159, 2150, 2710, 2710,  694,  700,  713,
-      722,  720, 2154, 2149, 2158, 2165, 2157, 2144, 2134,  169,
-      215,  282,  421,  640,  654,  696,  716,  744,  754,  708,
-      705,  718,  719,  729,  734,  721,  724,  727,  736,  736,
-      721,  781,  740,  732,  742,  785,  731,  738,  738,  741,
-      745,  752,  794,  756,  803,  757,  760,  755,  746,  761,
-      766,  763,  760,  767,  766,  754,  768,  766,  774,  813,
-
-      772,  820,  821,  762,  775,  761,  771,  821,  776,  829,
-     2710,  782,  780,  782,  778,  772,  788,  836,  832,  792,
-     2710,  782,  783,  782,  795,  785,  798,  845,  801,  786,
-      848,  849,  803, 2710,  797,  791,  786,  797,  810,  801,
-      790,  796,  854,  815,  799,  799,  812,  859,  803,  810,
-      822,  817,  822,  819,  866,  805,  817,  831,  825,  816,
-      813, 2710,  880,  835,  836,  824,  838,  828,  832,  844,
-      835,  838,  843,  844,  872,  864,  893,  894,  868,  841,
-      855,  858,  838,  845,  859,  907,  861,  846,  859,  857,
-     2710, 2710,  861,  856,  871,  868,  854,  856,  875,  872,
-
-      872,  874,  862,  870,  871,  881,  923,  887,  926,  885,
-      875,  888,  874,  873,  879,  871,  882,  877,  878,  884,
-      900,  883,  940,  892,  942, 2710,  903,  895,  906,  904,
-      952,  891,  893,  908,  909,  897,  895,  960,  914,  900,
-      906,  904, 2710, 2710,  920,  919,  920,  925,  913,  923,
-      925, 2710,  925,  927,  914,  932,  919,  921, 2710,  918,
-      936,  922,  923,  919,  924,  942,  986, 2710,  944,  988,
-     2710, 2710,  943,  943,  992,  935,  939,  933,  949,  997,
-      947,  937,  938,  934,  944,  948,  959,  954, 1001,  957,
-      950,  952,  948,  965,  955,  970,  953, 1015,  969,  971,
-
-      975,  962,  953,  976,  962,  962, 2710,  969,  970, 1022,
-     1023,  972,  985, 1026,  970,  986,  986,  980, 1004, 1014,
-     1002, 1010, 1022, 1039,  985,  999, 1039,  998, 1041, 2710,
-     1047,  997,  988, 1007,  997,  996,  991,  992, 1004,  999,
-      995, 1013, 1005, 1000, 1001, 1011, 1020, 1061, 1012, 1009,
-     1027, 1019, 1014, 1070, 1076, 1030, 1021, 1079, 1036, 1027,
-     1035, 1037, 1022, 1038, 1028, 1040, 1037, 1035, 1047, 1031,
-     1032, 2710, 1048, 1051, 1034, 1036, 1097, 1037, 1056, 2710,
-     1055, 1058, 1045, 1040, 1058, 1046, 1102, 1057, 1053, 1050,
-     1106, 1052, 1108, 1067, 1053, 1071, 1071, 1071, 1057, 1072,
-
-     1059, 1060, 1076, 1063, 1080, 2710, 1078, 1065, 2710, 1123,
-     1073, 2710, 1083, 1076, 1132, 1076, 2710, 1079, 1084, 1131,
-     1079, 1080, 1092, 1086, 1084, 1081, 1096, 1144, 1085, 1086,
-     1147, 1148, 1089, 1101, 1094, 2710, 1090, 1107, 1099, 1095,
-     1098, 1152, 1092, 1113, 1099, 1100, 1101, 1102, 1108, 1116,
-     1107, 1121, 1169, 1123, 1124, 1139, 1168, 1151, 1143, 1148,
-     2710, 1131, 1116, 1136, 1119, 1119, 2710, 1122, 1121, 1123,
-     1134, 1124, 1144, 1143, 1134, 1145, 1191, 1130, 1142, 1151,
-     1144, 1148, 1152, 1135, 1152, 1153, 1148, 1206, 1150, 1154,
-     2710, 1204, 1150, 2710, 1168, 1150, 1150, 1171, 1168, 1211,
-
-     1157, 1175, 1163, 1177, 1170, 1179, 1159, 1174, 1181, 1226,
-     1227, 2710, 1177, 1229, 1183, 1169, 1179, 1189, 1173, 1193,
-     1176, 1178, 1178, 1185, 1194, 1182, 1189, 1184, 1191, 1203,
-     1247, 1191, 1249, 1191, 1208, 1252, 1202, 1203, 1192, 1256,
-     1204, 1207, 1202, 1206, 1261, 1262, 1212, 2710, 1201, 1218,
-     1211, 1202, 1221, 1215, 1210, 1220, 1216, 1211, 1229, 2710,
-     1213, 1209, 2710, 2710, 1215, 1278, 1234, 1215, 1221, 1235,
-     1221, 1237, 1239, 1281, 1231, 1288, 1289, 1239, 1244, 1238,
-     1236, 1247, 1229, 2710, 1234, 1240, 1266, 1279, 1267, 1281,
-     1268, 1303, 1253, 1256, 1256, 1260, 1261, 1309, 1249, 1249,
-
-     1252, 1269, 1264, 1268, 1263, 2710, 1260, 1273, 1257, 1274,
-     1254, 1275, 1265, 1264, 1321, 1275, 2710, 1288, 1286, 1289,
-     1273, 1282, 1286, 1291, 1277, 1340, 1290, 1295, 1282, 1296,
-     1294, 1291, 1287, 1305, 1306, 1307, 2710, 2710, 1305, 2710,
-     1307, 1292, 1303, 1294, 1313, 1306, 1304, 1359, 1313, 1310,
-     1357, 1318, 1307, 1314, 1319, 1316, 1322, 2710, 1315, 2710,
-     1307, 1371, 2710, 1315, 1316, 1327, 2710, 1328, 1322, 1317,
-     1327, 2710, 2710, 1317, 1318, 1321, 1335, 1340, 1323, 1334,
-     1386, 1340, 1327, 1346, 1337, 1391, 1387, 1393, 2710, 1341,
-     1338, 1349, 1397, 1398, 1399, 1353, 1354, 1356, 2710, 2710,
-
-     1348, 1343, 1400, 1346, 1362, 1346, 1358, 1347, 1406, 1389,
-     1390, 1382, 1415, 2710, 1359, 1370, 1361, 1372, 1374, 2710,
-     1421, 1355, 1366, 1381, 1420, 1369, 1380, 1368, 1367, 1383,
-     1384, 1381, 1428, 1388, 1390, 1379, 1389, 1395, 1385, 1385,
-     1444, 1440, 1441, 1447, 1401, 2710, 1403, 1402, 1404, 1395,
-     1398, 1407, 1404, 1394, 1397, 1397, 1459, 1403, 1461, 1405,
-     1463, 1403, 1408, 1466, 2710, 1421, 1401, 1416, 1409, 1412,
-     1425, 1428, 1427, 1425, 1477, 1428, 2710, 1424, 1425, 1477,
-     1421, 1437, 1485, 1438, 1487, 1488, 1489, 1430, 1440, 1492,
-     1446, 2710, 1438, 1495, 1436, 1436, 2710, 1454, 2710, 1451,
-
-     1442, 1442, 2710, 2710, 2710, 1456, 1439, 1459, 1460, 1446,
-     1448, 1510, 1457, 1512, 1458, 1452, 1479, 1497, 1512, 1498,
-     2710, 1462, 1520, 1467, 1517, 1523, 2710, 1463, 1525, 1472,
-     1466, 1463, 1466, 1468, 1464, 1527, 1487, 1529, 1479, 1491,
-     1494, 1491, 1483, 1486, 1481, 1546, 1491, 2710, 1488, 1487,
-     2710, 1489, 1551, 1501, 1492, 1549, 1508, 1510, 1510, 1507,
-     1554, 1513, 2710, 1505, 2710, 1506, 2710, 1516, 1508, 2710,
-     1560, 1519, 1520, 1517, 1565, 1510, 1525, 1568, 1527, 1519,
-     2710, 1516, 1516, 1517, 1518, 1575, 1581, 2710, 1535, 2710,
-     2710, 2710, 1578, 1522, 2710, 1539, 1524, 2710, 1538, 1526,
-
-     1590, 1534, 1527, 1532, 1543, 1536, 1555, 1548, 1554, 1544,
-     1602, 1552, 2710, 1561, 2710, 1558, 1606, 1583, 1584, 1590,
-     1575, 1583, 1612, 2710, 1567, 1552, 2710, 1615, 2710, 1616,
-     1570, 1575, 1557, 1620, 1621, 1562, 1618, 1581, 1575, 1571,
-     1565, 1572, 1624, 1579, 1580, 2710, 1570, 1586, 1590, 1641,
-     2710, 1576, 1638, 1599, 1599, 1641, 1586, 1591, 1589, 1651,
-     1604, 1592, 1654, 1650, 1602, 1657, 1615, 1604, 1598, 1661,
-     1600, 1609, 1602, 1616, 1619, 1667, 1668, 1618, 1616, 2710,
-     1609, 1607, 1668, 1669, 1670, 1622, 1621, 1621, 1616, 1617,
-     2710, 1626, 1632, 1623, 1624, 1686, 1624, 1626, 1684, 1627,
-
-     2710, 1623, 1641, 1693, 2710, 1661, 1675, 1674, 1663, 1665,
-     2710, 1699, 1649, 2710, 2710, 1640, 1651, 1703, 2710, 1704,
-     2710, 1658, 1648, 1653, 1651, 1704, 1659, 1664, 1651, 1654,
-     1670, 1659, 1657, 1657, 1659, 2710, 1726, 1662, 1672, 1723,
-     1667, 1730, 1676, 1686, 1687, 2710, 1735, 1685, 1732, 2710,
-     1680, 1688, 2710, 1679, 1694, 1682, 2710, 1692, 1693, 1694,
-     1746, 1701, 2710, 2710, 1680, 1698, 1699, 1708, 1690, 1696,
-     1709, 1698, 1751, 1700, 1696, 1701, 1698, 1699, 1757, 1763,
-     2710, 1710, 1765, 1715, 1705, 1721, 1714, 2710, 1747, 1771,
-     1753, 1769, 1775, 2710, 1721, 1777, 1716, 2710, 2710, 1718,
-
-     1720, 1730, 1777, 1722, 1737, 1724, 1786, 1740, 1726, 1733,
-     1733, 1744, 1745, 2710, 1739, 1733, 1735, 1749, 1737, 1749,
-     2710, 1796, 1744, 1741, 2710, 1755, 1742, 1763, 1759, 1761,
-     1809, 1759, 1756, 1764, 1758, 2710, 1814, 1768, 1761, 1762,
-     1767, 1768, 1762, 1767, 1778, 1762, 1771, 1820, 1826, 1776,
-     1828, 1774, 2710, 1768, 2710, 1775, 1832, 1833, 1830, 1831,
-     2710, 1813, 1819, 2710, 1791, 2710, 1835, 1784, 1795, 1796,
-     1781, 1782, 1790, 1847, 2710, 1792, 1844, 1845, 1797, 1792,
-     1810, 1807, 1855, 1799, 1812, 1807, 1804, 1809, 1807, 1862,
-     1863, 1810, 1807, 1821, 1808, 2710, 1823, 1824, 1825, 1826,
-
-     2710, 1874, 1824, 1829, 1815, 1823, 1817, 1837, 1838, 1819,
-     1820, 1827, 2710, 1829, 2710, 1843, 1840, 1883, 1841, 2710,
-     2710, 1845, 1871, 1872, 1870, 1833, 1833, 1842, 1849, 1842,
-     1841, 1852, 1839, 2710, 1855, 1843, 1846, 1905, 1842, 1861,
-     1852, 2710, 1864, 1857, 1856, 1865, 1867, 1871, 2710, 2710,
-     1864, 1855, 1857, 1921, 1861, 1923, 1862, 1925, 2710, 1864,
-     1927, 1923, 1882, 1879, 1870, 1878, 1889, 1876, 1887, 1873,
-     1871, 1879, 1878, 1883, 1875, 1920, 1944, 1926, 1946, 1896,
-     1885, 1898, 1888, 1905, 1904, 1948, 1889, 1908, 1909, 2710,
-     1914, 1907, 1959, 1913, 1900, 1915, 1963, 1917, 1920, 1907,
-
-     1916, 1917, 2710, 1969, 2710, 1921, 2710, 1973, 2710, 1912,
-     1975, 1919, 1916, 1978, 1923, 1975, 1976, 1935, 1978, 1921,
-     1925, 1943, 1987, 1943, 1970, 2710, 1966, 2710, 1936, 1930,
-     1927, 1989, 1952, 1945, 1941, 1998, 1938, 1940, 1939, 1946,
-     2710, 1942, 2004, 1945, 2710, 1950, 1960, 1945, 1953, 1955,
-     2710, 1956, 2710, 1961, 2710, 1957, 1967, 2710, 1969, 1970,
-     1961, 2020, 1961, 1971, 1956, 1969, 2710, 1971, 2002, 2008,
-     1980, 1978, 2030, 1968, 1970, 1967, 1991, 2710, 1978, 1985,
-     1986, 1989, 1978, 2710, 2035, 1979, 1987, 1996, 1995, 1998,
-     1999, 1992, 1987, 1988, 1988, 2000, 1995, 2710, 2008, 1996,
-
-     2052, 2000, 2012, 2040, 2061, 2062, 2006, 2710, 2006, 2018,
-     2066, 2012, 2014, 2012, 2013, 2071, 2021, 2008, 2023, 2028,
-     2076, 2077, 2078, 2079, 2033, 2081, 2082, 2083, 2024, 2028,
-     2025, 2041, 2024, 2036, 2030, 2092, 2710, 2710, 2037, 2048,
-     2095, 2710, 2049, 2034, 2052, 2043, 2710, 2044, 2058, 2054,
-     2047, 2710, 2710, 2710, 2710, 2104, 2710, 2710, 2710, 2044,
-     2052, 2047, 2103, 2066, 2063, 2111, 2710, 2107, 2070, 2710,
-     2114, 2053, 2116, 2056, 2069, 2068, 2069, 2059, 2710, 2060,
-     2123, 2073, 2082, 2075, 2122, 2710, 2073, 2067, 2710, 2079,
-     2710, 2126, 2132, 2071, 2087, 2135, 2136, 2710, 2090, 2084,
-
-     2077, 2097, 2084, 2096, 2087, 2091, 2710, 2141, 2087, 2710,
-     2710, 2087, 2095, 2145, 2102, 2095, 2107, 2154, 2099, 2099,
-     2095, 2097, 2159, 2160, 2099, 2115, 2100, 2117, 2710, 2165,
-     2109, 2116, 2168, 2710, 2710, 2118, 2170, 2115, 2172, 2710,
-     2120, 2119, 2710, 2120, 2710, 2114, 2710, 2114, 2131, 2132,
-     2180, 2123, 2182, 2183, 2710, 2184, 2710, 2710, 2710, 2710,
-     2190, 2193, 2196, 2197, 2199, 2202, 2205, 2208
+     2754, 2755,   31, 2750,  151,    0,  216, 2755,  223,  230,
+       13,  237, 2755, 2730,  124,   17,    4,   34, 2755, 2755,
+       23,   43,   64, 2755, 2755, 2755,   56, 2738, 2688,    0,
+     2728,  106, 2745,    2,  268, 2755,   85,   90, 2691, 2712,
+       98,   77, 2712,  235,  231,   97,  207,  298,  240, 2695,
+      294,  306,   62,  243,  204,  222, 2690,  224,  296,  341,
+      196,  320, 2673,   21,  332,  362,  345, 2692,  350,    0,
+      406,  422,  436,  446,  451, 2755,    0, 2755,  298,  465,
+      349,  351,  202,  365,  369,  301, 2755, 2689, 2733, 2755,
+
+      334, 2755,  464,  332,  232, 2687, 2731,  372,   17,  350,
+      373, 2725,  225,  377,  391,  252, 2729,    0,  528,  414,
+     2668, 2665, 2665,  433, 2665, 2666, 2672,  434, 2658, 2659,
+     2664,   76, 2674, 2658, 2666, 2656,  342, 2672,  380,  373,
+      427,  403, 2709,   16, 2651, 2707, 2644,  439, 2665, 2665,
+     2659,  440, 2651, 2652, 2650, 2644,  451,  397, 2641, 2640,
+      449, 2696, 2640,   50, 2652, 2651, 2639,  498, 2640,  436,
+     2652, 2649, 2650,  440, 2648, 2686, 2685,  471,  444, 2629,
+     2633,  468, 2629,  456, 2639, 2631, 2633,    0,  490,  490,
+      509,  500,  508,  532, 2629, 2755,  538,  539, 2624, 2755,
+
+      502,  536, 2755, 2681,  544,  548, 2680,  547, 2679,  541,
+     2678, 2755, 2755,  590, 2620,  553, 2633, 2625, 2623, 2623,
+     2627, 2628, 2608, 2619, 2621, 2620,  285,  557, 2661, 2622,
+     2603, 2600, 2608, 2614, 2602, 2612, 2612, 2603, 2612, 2612,
+     2607, 2599, 2598, 2600, 2603, 2583, 2587, 2601, 2593, 2583,
+     2586, 2585, 2599, 2755, 2585, 2593,   82, 2634, 2577, 2586,
+     2631, 2575, 2585, 2628,  561, 2627, 2569, 2583, 2624,  556,
+     2580, 2560, 2575, 2567, 2571,  470, 2562, 2560,  475, 2560,
+     2566, 2557, 2570, 2554, 2565, 2569,  532, 2563,  462, 2570,
+     2565, 2548, 2563, 2549, 2557, 2561, 2542, 2558, 2544, 2550,
+
+     2557, 2539,  522, 2544, 2541, 2540,  583, 2539, 2534, 2548,
+     2547,  568, 2546, 2526, 2548, 2530, 2538, 2526,  569, 2755,
+     2755,  574, 2755, 2755, 2524,  547,  578, 2574,  585, 2585,
+     2755,  586,  595, 2755, 2584, 2755, 2578,  639, 2537,  585,
+     2514, 2533, 2534, 2531, 2514, 2531, 2570, 2527, 2517, 2572,
+     2524, 2527, 2518, 2521, 2507, 2518,  639, 2560, 2515, 2512,
+     2513,  615, 2516, 2560, 2492, 2504, 2499, 2496, 2492, 2491,
+     2493, 2496, 2546, 2500, 2544, 2487,  662,  627, 2500, 2500,
+     2483, 2484, 2497, 2495, 2493, 2493, 2492, 2487, 2494, 2489,
+     2474,  605, 2483, 2486,  566, 2481, 2531,  595,  610, 2487,
+
+     2524, 2471, 2464, 2479, 2470, 2477, 2458, 2475, 2467, 2463,
+     2468,  666, 2518,  621, 2470, 2470, 2468,  623, 2459, 2457,
+     2469,  617, 2444, 2445, 2458, 2448, 2440, 2444, 2458,  627,
+     2444, 2456, 2455, 2454, 2449, 2494, 2451, 2450, 2449, 2448,
+     2431, 2439, 2492, 2448, 2490, 2427, 2488, 2487, 2426,  676,
+     2439, 2437, 2755, 2755, 2437,  643, 2477, 2481, 2480, 2755,
+     2479,  658, 2755,  661,  720, 2435,  660, 2477, 2420, 2475,
+     2469, 2419, 2421,  594, 2411, 2408, 2755, 2413, 2406, 2418,
+     2421, 2408, 2407, 2755, 2417,  649, 2408, 2405, 2417,  644,
+     2402, 2396, 2755, 2452, 2409, 2394, 2396, 2410, 2406, 2404,
+
+     2404, 2398,  695, 2388, 2442, 2755, 2386, 2402, 2439, 2755,
+     2443, 2442, 2395, 2389, 2391, 2392, 2376, 2385, 2430, 2378,
+     2377, 2372, 2371, 2373, 2369, 2365,  650, 2384, 2358, 2365,
+     2364, 2380, 2417, 2755, 2364, 2360,  696, 2368, 2367, 2361,
+     2354, 2353, 2367, 2367, 2355, 2351, 2356, 2352, 2347, 2755,
+     2356, 2406, 2755, 2345, 2338, 2398, 2397, 2339, 2338, 2343,
+     2398, 2351, 2345, 2339, 2348,  715, 2388, 2332, 2327, 2385,
+     2322, 2328,  688, 2342, 2335, 2339, 2322, 2383, 2321, 2321,
+     2375, 2317, 2318, 2317, 2315, 2332, 2755, 2328, 2755, 2368,
+     2755, 2755, 2316, 2755,  654, 2366, 2365, 2322, 2368,  713,
+
+     2755, 2755, 2755,  705,  687,  683, 2305,  746, 2755, 2304,
+     2755,  671, 2322, 2302, 2312, 2315, 2356,  708, 2298, 2308,
+     2353, 2295, 2302, 2295, 2303, 2296, 2305, 2287, 2287, 2302,
+     2301, 2285,  664, 2299, 2298, 2282, 2297, 2279, 2329, 2283,
+     2290, 2333, 2274, 2276, 2273, 2287, 2287, 2285, 2285, 2755,
+     2270, 2282, 2274, 2280, 2271, 2279, 2755, 2755, 2264, 2275,
+     2279, 2261, 2273, 2265,  690, 2256, 2255, 2249, 2254, 2251,
+     2266, 2265, 2266, 2245, 2255, 2261, 2307, 2259, 2251, 2242,
+     2243, 2245, 2755, 2240, 2246,  697, 2294,  747, 2293, 2235,
+     2291, 2235, 2238, 2236, 2238, 2229, 2244, 2755, 2229,  754,
+
+     2226, 2242, 2239, 2234, 2230, 2755, 2278, 2227, 2234, 2275,
+     2755, 2218, 2216, 2230, 2233, 2218, 2269, 2268, 2212, 2266,
+     2223, 2207, 2263, 2262, 2755, 2204, 2218, 2217,  758, 2218,
+     2217, 2214, 2198, 2254, 2215, 2210, 2199, 2204, 2200, 2191,
+     2755, 2755,  718,  732,  735,  724,  750, 2195, 2190, 2195,
+       12,  173,  212,  269,  370,  376,  412,  469,  525,  587,
+      596,  727,  650,  757,  719,  716,  721,  723,  733,  738,
+      724,  729,  733,  744,  744,  728,  788,  747,  739,  749,
+      793,  739,  746,  747,  749,  753,  758,  761,  803,  763,
+      811,  765,  768,  763,  754,  769,  774,  771,  768,  775,
+
+      774,  762,  776,  774,  782,  821,  780,  828,  829,  770,
+      783,  769,  779,  829,  784,  837, 2755,  790,  788,  790,
+      786,  780,  796,  844,  840,  841,  801, 2755,  791,  792,
+      791,  804,  794,  807,  854,  810,  795,  857,  858,  812,
+     2755,  806,  800,  795,  806,  819,  810,  799,  805,  863,
+      824,  808,  808,  821,  868,  812,  819,  831,  826,  831,
+      828,  875,  814,  826,  840,  834,  825,  822, 2755,  889,
+      844,  845,  833,  847,  837,  841,  853,  844,  847,  852,
+      853,  881,  873,  902,  903,  877,  850,  864,  867,  847,
+      854,  868,  916,  870,  855,  868,  866, 2755, 2755,  870,
+
+      865,  880,  877,  863,  865,  884,  881,  881,  883,  871,
+      879,  880,  890,  932,  896,  935,  894,  884,  897,  883,
+      882,  888,  880,  891,  886,  887,  893,  909,  892,  949,
+      950,  902,  952, 2755,  913,  905,  916,  914,  962,  901,
+      903,  918,  919,  907,  905,  970,  924,  910,  916,  914,
+     2755, 2755,  930,  929,  930,  935,  923,  933,  935, 2755,
+      935,  937,  924,  942,  929,  931, 2755,  928,  946,  947,
+      933,  934,  930,  935,  953,  997, 2755,  955,  999, 2755,
+     2755,  954,  954, 1003,  946,  950,  944,  960, 1008,  958,
+      948,  949,  945,  955,  959,  970,  965, 1012,  968,  961,
+
+      963,  959,  976,  966,  981,  964, 1026,  980,  982,  986,
+      973,  964,  987,  973,  973, 2755,  980,  981, 1033, 1034,
+      983,  996, 1037,  981,  997,  997,  991, 1015, 1025, 1013,
+     1021, 1033, 1050,  996, 1010, 1050, 1009, 1052, 2755, 1058,
+     1008,  999, 1018, 1008, 1007, 1002, 1003, 1015, 1010, 1006,
+     1024, 1016, 1011, 1012, 1022, 1031, 1072, 1023, 1020, 1038,
+     1030, 1025, 1081, 1087, 1041, 1032, 1090, 1047, 1038, 1046,
+     1048, 1033, 1049, 1054, 1040, 1052, 1049, 1047, 1059, 1043,
+     1044, 2755, 1060, 1063, 1046, 1048, 1109, 1049, 1068, 2755,
+     1067, 1070, 1057, 1052, 1070, 1058, 1114, 1069, 1065, 1062,
+
+     1118, 1064, 1120, 1079, 1065, 1083, 1083, 1083, 1085, 1070,
+     1085, 1072, 1073, 1089, 1076, 1093, 2755, 1091, 1078, 2755,
+     1136, 1086, 2755, 1096, 1089, 1145, 1089, 2755, 1092, 1097,
+     1144, 1092, 1093, 1105, 1099, 1097, 1094, 1109, 1157, 1098,
+     1099, 1160, 1161, 1102, 1114, 1107, 2755, 1103, 1120, 1112,
+     1108, 1111, 1166, 1105, 1126, 1112, 1113, 1114, 1115, 1121,
+     1129, 1120, 1134, 1182, 1136, 1137, 1152, 1181, 1164, 1156,
+     1161, 2755, 1144, 1129, 1149, 1132, 1132, 2755, 1135, 1134,
+     1136, 1147, 1137, 1157, 1156, 1147, 1158, 1204, 1143, 1155,
+     1164, 1157, 1161, 1165, 1148, 1165, 1166, 1161, 1219, 1163,
+
+     1167, 2755, 1217, 1163, 2755, 1181, 1163, 1163, 1184, 1181,
+     1224, 1184, 1171, 1189, 1177, 1191, 1184, 1193, 1173, 1188,
+     1195, 1240, 1241, 2755, 1191, 1243, 1197, 1183, 1193, 1203,
+     1187, 1207, 1190, 1192, 1192, 1199, 1208, 1196, 1203, 1198,
+     1205, 1217, 1261, 1205, 1263, 1205, 1219, 1223, 1267, 1217,
+     1218, 1207, 1271, 1219, 1222, 1217, 1221, 1276, 1277, 1227,
+     2755, 1216, 1233, 1226, 1217, 1236, 1230, 1225, 1235, 1231,
+     1226, 1244, 2755, 1228, 1224, 2755, 2755, 1230, 1293, 1249,
+     1230, 1236, 1250, 1236, 1252, 1254, 1296, 1246, 1303, 1304,
+     1254, 1259, 1253, 1251, 1262, 1244, 2755, 1249, 1255, 1281,
+
+     1294, 1282, 1296, 1283, 1318, 1268, 1271, 1271, 1275, 1276,
+     1324, 1264, 1264, 1267, 1284, 1279, 1283, 1278, 2755, 1275,
+     1288, 1272, 1289, 1269, 1290, 1280, 1279, 1336, 1290, 2755,
+     1303, 1301, 1304, 1288, 1297, 1301, 1306, 1292, 1355, 1305,
+     1311, 1311, 1298, 1312, 1310, 1307, 1303, 1321, 1322, 1323,
+     2755, 2755, 1321, 2755, 1323, 1308, 1319, 1310, 1329, 1322,
+     1320, 1375, 1329, 1326, 1373, 1334, 1323, 1330, 1335, 1332,
+     1338, 2755, 1331, 2755, 1323, 1336, 1388, 2755, 1332, 1333,
+     1344, 2755, 1345, 1339, 1334, 1344, 2755, 2755, 1334, 1335,
+     1338, 1352, 1357, 1340, 1351, 1403, 1357, 1344, 1363, 1354,
+
+     1408, 1404, 1410, 2755, 1358, 1355, 1366, 1414, 1415, 1416,
+     1370, 1371, 1373, 2755, 2755, 1365, 1360, 1417, 1363, 1379,
+     1363, 1375, 1364, 1423, 1406, 1407, 1399, 1432, 2755, 1376,
+     1387, 1378, 1389, 1391, 2755, 1438, 1372, 1383, 1398, 1437,
+     1386, 1397, 1385, 1384, 1400, 1401, 1398, 1445, 1405, 1407,
+     1396, 1406, 1412, 1402, 1402, 1461, 1457, 1458, 1464, 1418,
+     2755, 1420, 1416, 1420, 1422, 1413, 1416, 1425, 1422, 1412,
+     1415, 1415, 1477, 1421, 1479, 1423, 1481, 1421, 1426, 1484,
+     2755, 1440, 1419, 1434, 1427, 1430, 1443, 1446, 1445, 1443,
+     1495, 1446, 1436, 2755, 1443, 1444, 1496, 1440, 1456, 1504,
+
+     1457, 1506, 1507, 1508, 1449, 1459, 1511, 1465, 2755, 1457,
+     1514, 1455, 1455, 2755, 1473, 2755, 1470, 1461, 1461, 2755,
+     2755, 2755, 1475, 1458, 1478, 1479, 1465, 1467, 1529, 1476,
+     1531, 1477, 1471, 1498, 1516, 1531, 1517, 2755, 1481, 1539,
+     1486, 1536, 1542, 2755, 1482, 1544, 1491, 1485, 1482, 1485,
+     1487, 1483, 1546, 1506, 1548, 1498, 1510, 1513, 1510, 1502,
+     1505, 1500, 1565, 1510, 2755, 1507, 1506, 2755, 1508, 1570,
+     1509, 1521, 1512, 1569, 1528, 1530, 1530, 1527, 1574, 1533,
+     2755, 1525, 2755, 1526, 2755, 1536, 1528, 2755, 1580, 1539,
+     1540, 1538, 1585, 1530, 1545, 1588, 1547, 1539, 2755, 1536,
+
+     1546, 1537, 1538, 1539, 1596, 1602, 2755, 1556, 2755, 2755,
+     2755, 1599, 1543, 2755, 1560, 1545, 2755, 1559, 1547, 1611,
+     1555, 1548, 1553, 1564, 1557, 1576, 1569, 1575, 1565, 1623,
+     1573, 2755, 1582, 2755, 1579, 1627, 1604, 1605, 1611, 1596,
+     1604, 1633, 2755, 1588, 1573, 2755, 1636, 2755, 1637, 1591,
+     1596, 1578, 1641, 1642, 1583, 1639, 1602, 1596, 1592, 1586,
+     1593, 1645, 1600, 1601, 2755, 1591, 1607, 1611, 1662, 2755,
+     1612, 1598, 1660, 1621, 1621, 1663, 1608, 1613, 1611, 1673,
+     1626, 1614, 1676, 1672, 1624, 1679, 1637, 1626, 1620, 1683,
+     1622, 1631, 1624, 1638, 1641, 1632, 1690, 1691, 1641, 1639,
+
+     2755, 1632, 1630, 1691, 1692, 1693, 1645, 1644, 1644, 1640,
+     1641, 2755, 1649, 1655, 1646, 1647, 1709, 1647, 1649, 1707,
+     1650, 2755, 1646, 1664, 1716, 2755, 1684, 1698, 1697, 1686,
+     1688, 2755, 1722, 1672, 2755, 2755, 1663, 1674, 1726, 2755,
+     1727, 2755, 1681, 1671, 1676, 1674, 1727, 1682, 1688, 1674,
+     1677, 1693, 1682, 1680, 1680, 1682, 2755, 1686, 1749, 1687,
+     1701, 1747, 1691, 1755, 1700, 1710, 1711, 2755, 1759, 1709,
+     1756, 2755, 1704, 1712, 2755, 1703, 1718, 1706, 2755, 1716,
+     1717, 1718, 1770, 1725, 1716, 2755, 2755, 1705, 1723, 1724,
+     1733, 1715, 1721, 1734, 1723, 1776, 1725, 1721, 1726, 1723,
+
+     1724, 1782, 1788, 2755, 1735, 1790, 1740, 1730, 1746, 1739,
+     2755, 1772, 1797, 1779, 1794, 1800, 2755, 1746, 1802, 1741,
+     2755, 2755, 1743, 1745, 1755, 1802, 1747, 1762, 1749, 1811,
+     1765, 1751, 1758, 1758, 1769, 1770, 1762, 2755, 1765, 1759,
+     1761, 1776, 1763, 1775, 2755, 1822, 1770, 1767, 2755, 1781,
+     1768, 1789, 1785, 1787, 1835, 1785, 1782, 1790, 1784, 2755,
+     1840, 1798, 1795, 1788, 1789, 1794, 1795, 1789, 1794, 1805,
+     1789, 1798, 1847, 1853, 1803, 1855, 1801, 2755, 1795, 2755,
+     1802, 1859, 1860, 1857, 1858, 2755, 1840, 1846, 2755, 1818,
+     2755, 1862, 1811, 1822, 1823, 1808, 1809, 1817, 1874, 2755,
+
+     1819, 1871, 1872, 1824, 1819, 1837, 1838, 1835, 1883, 1827,
+     1840, 1835, 1832, 1837, 1835, 1890, 1893, 1838, 1835, 1849,
+     1836, 2755, 1851, 1852, 1853, 1854, 2755, 1848, 1903, 1853,
+     1858, 1844, 1852, 1846, 1866, 1867, 1848, 1849, 1856, 2755,
+     1858, 2755, 1872, 1869, 1912, 1870, 2755, 2755, 1874, 1900,
+     1901, 1899, 1862, 1862, 1871, 1878, 1871, 1870, 1881, 1868,
+     2755, 1884, 1872, 1875, 1934, 1871, 1890, 1883, 1882, 2755,
+     1894, 1887, 1886, 1895, 1897, 1901, 2755, 2755, 1894, 1887,
+     1888, 1951, 1891, 1953, 1892, 1955, 1951, 2755, 1895, 1958,
+     1954, 1913, 1910, 1901, 1909, 1920, 1907, 1918, 1904, 1902,
+
+     1910, 1909, 1914, 1906, 1951, 1975, 1957, 1977, 1927, 1916,
+     1929, 1919, 1936, 1935, 1979, 1920, 1939, 1940, 2755, 1945,
+     1938, 1985, 1991, 1945, 1932, 1947, 1995, 1949, 1952, 1939,
+     1948, 1949, 2755, 2003, 2755, 1953, 2755, 1951, 2006, 2755,
+     1945, 2008, 1952, 1949, 2011, 1956, 2008, 2009, 1968, 2011,
+     1954, 1958, 1976, 2020, 1976, 2003, 2755, 1999, 2755, 1969,
+     1963, 1960, 2022, 1985, 1978, 1974, 2031, 1971, 1973, 1972,
+     1979, 1991, 2755, 1976, 2038, 1979, 2755, 1984, 1994, 1979,
+     1987, 1989, 2755, 1990, 1995, 2755, 1996, 2755, 1993, 2004,
+     2755, 2005, 2005, 1996, 2055, 1996, 2006, 1991, 2004, 2755,
+
+     2006, 2037, 2043, 2015, 2013, 2065, 2003, 2005, 2002, 2026,
+     2755, 2013, 2020, 2021, 2024, 2020, 2014, 2755, 2071, 2015,
+     2023, 2032, 2031, 2034, 2035, 2022, 2029, 2024, 2025, 2025,
+     2039, 2034, 2755, 2045, 2033, 2089, 2037, 2049, 2077, 2098,
+     2099, 2043, 2755, 2043, 2055, 2103, 2049, 2051, 2049, 2050,
+     2108, 2066, 2059, 2046, 2061, 2066, 2114, 2115, 2116, 2117,
+     2056, 2072, 2120, 2121, 2122, 2064, 2068, 2064, 2080, 2063,
+     2075, 2069, 2131, 2755, 2755, 2076, 2087, 2134, 2755, 2088,
+     2073, 2091, 2082, 2755, 2078, 2084, 2098, 2094, 2087, 2755,
+     2755, 2755, 2755, 2144, 2145, 2755, 2755, 2755, 2085, 2093,
+
+     2088, 2144, 2107, 2104, 2152, 2755, 2148, 2111, 2755, 2155,
+     2094, 2157, 2097, 2098, 2111, 2110, 2111, 2101, 2755, 2755,
+     2102, 2165, 2115, 2124, 2117, 2164, 2755, 2115, 2109, 2755,
+     2121, 2755, 2168, 2127, 2175, 2114, 2130, 2178, 2179, 2755,
+     2133, 2127, 2120, 2140, 2127, 2139, 2130, 2134, 2128, 2755,
+     2185, 2131, 2755, 2755, 2131, 2139, 2189, 2146, 2139, 2151,
+     2198, 2143, 2143, 2201, 2140, 2142, 2204, 2205, 2144, 2160,
+     2145, 2162, 2755, 2210, 2154, 2755, 2161, 2213, 2755, 2755,
+     2163, 2215, 2160, 2217, 2755, 2165, 2164, 2755, 2165, 2755,
+     2159, 2755, 2159, 2176, 2177, 2225, 2168, 2227, 2228, 2755,
+
+     2229, 2755, 2755, 2755, 2755, 2235, 2238, 2241, 2242, 2244,
+     2247, 2250, 2253
     } ;
 
-static const flex_int16_t yy_def[2269] =
+static const flex_int16_t yy_def[2314] =
     {   0,
-     2261, 2261, 2262, 2262, 2261, 2261, 2261, 2261, 2261, 2261,
-     2260, 2260, 2260, 2260, 2260, 2263, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2264,
-     2260, 2260, 2260, 2265,   15, 2260,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 2266,   45,   45,
+     2306, 2306, 2307, 2307, 2306, 2306, 2306, 2306, 2306, 2306,
+     2305, 2305, 2305, 2305, 2305, 2308, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2309,
+     2305, 2305, 2305, 2310,   15, 2305,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 2311,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 2263,
-     2260, 2260, 2260, 2260, 2260, 2260, 2267, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2264, 2260,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 2308,
+     2305, 2305, 2305, 2305, 2305, 2305, 2312, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2309, 2305,
 
-     2265, 2260, 2260,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45, 2268,   45, 2266,   45,
+     2310, 2305, 2305,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 2313,   45, 2311,   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,   45,   45,
-       45,   45,   45,   45,   45,   45, 2267, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260,   45,   45,   45, 2260,   45,
+       45,   45,   45,   45,   45,   45,   45, 2312, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305,   45,   45,   45, 2305,
 
-       45, 2260,   45,   45,   45,   45,   45,   45,   45, 2268,
-     2260, 2260,  119,   45,   45,   45,   45,   45,   45,   45,
+       45,   45, 2305,   45,   45,   45,   45,   45,   45,   45,
+     2313, 2305, 2305,  119,   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, 2260,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45, 2305,   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,   45,   45,   45, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260,   45,   45,   45,   45,   45, 2260,   45,
-       45, 2260,   45, 2260,   45,  119,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305,   45,   45,   45,   45,   45,
+     2305,   45,   45, 2305,   45, 2305,   45,  119,   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,
@@ -1299,40 +1311,40 @@ static const flex_int16_t yy_def[2269] =
        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, 2260,
-     2260, 2260,   45,   45,   45,   45, 2260,   45,   45, 2260,
-       45,  119,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45, 2260,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45,   45,   45,   45,   45,   45,   45, 2260,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45, 2305, 2305, 2305,   45,   45,   45,   45, 2305,
+       45,   45, 2305,   45,  119,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 2305,   45,   45,   45,
+       45,   45,   45, 2305,   45,   45,   45,   45,   45,   45,
+       45,   45, 2305,   45,   45,   45,   45,   45,   45,   45,
 
-       45, 2260,   45,   45,   45, 2260,   45,   45,   45,   45,
+       45,   45,   45,   45,   45, 2305,   45,   45,   45, 2305,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 2260,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 2260,   45,   45, 2260,   45,
+       45,   45,   45, 2305,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 2305,
+       45,   45, 2305,   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, 2260,   45, 2260,   45, 2260, 2260,   45, 2260,
-       45,   45,   45, 2260,   45,   45, 2260, 2260, 2260,   45,
+       45,   45,   45,   45,   45,   45, 2305,   45, 2305,   45,
+     2305, 2305,   45, 2305,   45,   45,   45, 2305,   45,   45,
 
-       45,   45,   45,   45, 2260,   45, 2260,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+     2305, 2305, 2305,   45,   45,   45,   45,   45, 2305,   45,
+     2305,   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, 2260,   45,   45,   45,   45,   45,
-       45, 2260, 2260,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 2305,
+       45,   45,   45,   45,   45,   45, 2305, 2305,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 2260,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45, 2260,   45,   45,   45,   45,   45,   45,   45,
+       45,   45, 2305,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 2305,   45,   45,
 
-     2260,   45,   45,   45,   45, 2260,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 2260,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 2260, 2260,   45,   45,   45,
+       45,   45,   45,   45,   45, 2305,   45,   45,   45,   45,
+     2305,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45, 2305,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+     2305, 2305,   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,
@@ -1340,186 +1352,192 @@ static const flex_int16_t yy_def[2269] =
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
 
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45, 2260,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 2305,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 2305,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+     2305,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45, 2260,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45, 2305,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     2260, 2260,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 2305, 2305,   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, 2260,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45, 2260, 2260,   45,   45,   45,   45,   45,   45,
-       45, 2260,   45,   45,   45,   45,   45,   45, 2260,   45,
-       45,   45,   45,   45,   45,   45,   45, 2260,   45,   45,
-     2260, 2260,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45, 2305,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+     2305, 2305,   45,   45,   45,   45,   45,   45,   45, 2305,
+       45,   45,   45,   45,   45,   45, 2305,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 2305,   45,   45, 2305,
+     2305,   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, 2260,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 2260,
+       45,   45,   45,   45,   45, 2305,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45, 2305,   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, 2260,   45,   45,   45,   45,   45,   45,   45, 2260,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45, 2305,   45,   45,   45,   45,   45,   45,   45, 2305,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
 
-       45,   45,   45,   45,   45, 2260,   45,   45, 2260,   45,
-       45, 2260,   45,   45,   45,   45, 2260,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 2260,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 2305,   45,   45, 2305,
+       45,   45, 2305,   45,   45,   45,   45, 2305,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 2305,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45,   45,   45,   45, 2260,   45,   45,   45,
+       45, 2305,   45,   45,   45,   45,   45, 2305,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45, 2260,   45,   45,   45,   45,   45,   45,
 
+       45, 2305,   45,   45, 2305,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45, 2260,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45, 2305,   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, 2260,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 2260,
-       45,   45, 2260, 2260,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45, 2260,   45,   45,   45,   45,   45,   45,
+     2305,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45, 2305,   45,   45, 2305, 2305,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 2305,   45,   45,   45,
 
-       45,   45,   45,   45,   45, 2260,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45, 2260,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45, 2260, 2260,   45, 2260,
+       45,   45,   45,   45,   45,   45,   45,   45, 2305,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 2305,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 2260,   45, 2260,
-       45,   45, 2260,   45,   45,   45, 2260,   45,   45,   45,
-       45, 2260, 2260,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45, 2260,   45,
-       45,   45,   45,   45,   45,   45,   45,   45, 2260, 2260,
-
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45, 2260,   45,   45,   45,   45,   45, 2260,
+     2305, 2305,   45, 2305,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45, 2305,   45, 2305,   45,   45,   45, 2305,   45,   45,
+       45, 2305,   45,   45,   45,   45, 2305, 2305,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 2260,   45,   45,   45,   45,
+
+       45,   45,   45, 2305,   45,   45,   45,   45,   45,   45,
+       45,   45,   45, 2305, 2305,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45, 2305,   45,
+       45,   45,   45,   45, 2305,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45, 2260,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45, 2260,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45, 2260,   45,   45,   45,   45, 2260,   45, 2260,   45,
-
-       45,   45, 2260, 2260, 2260,   45,   45,   45,   45,   45,
+     2305,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45,   45,   45,   45, 2260,   45,   45,   45,
+     2305,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45, 2305,   45,   45,   45,   45,   45,   45,
+
+       45,   45,   45,   45,   45,   45,   45,   45, 2305,   45,
+       45,   45,   45, 2305,   45, 2305,   45,   45,   45, 2305,
+     2305, 2305,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 2305,   45,   45,
+       45,   45,   45, 2305,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 2260,   45,   45,
-     2260,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45, 2260,   45, 2260,   45, 2260,   45,   45, 2260,
+       45,   45,   45,   45, 2305,   45,   45, 2305,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45,   45,   45,   45,   45, 2260,   45, 2260,
-     2260, 2260,   45,   45, 2260,   45,   45, 2260,   45,   45,
+     2305,   45, 2305,   45, 2305,   45,   45, 2305,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45, 2305,   45,
 
+       45,   45,   45,   45,   45,   45, 2305,   45, 2305, 2305,
+     2305,   45,   45, 2305,   45,   45, 2305,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45, 2305,   45, 2305,   45,   45,   45,   45,   45,   45,
+       45,   45, 2305,   45,   45, 2305,   45, 2305,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45, 2260,   45, 2260,   45,   45,   45,   45,   45,
-       45,   45,   45, 2260,   45,   45, 2260,   45, 2260,   45,
+       45,   45,   45,   45, 2305,   45,   45,   45,   45, 2305,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 2260,   45,   45,   45,   45,
-     2260,   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, 2260,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-
-     2260,   45,   45,   45, 2260,   45,   45,   45,   45,   45,
-     2260,   45,   45, 2260, 2260,   45,   45,   45, 2260,   45,
-     2260,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 2260,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 2260,   45,   45,   45, 2260,
-       45,   45, 2260,   45,   45,   45, 2260,   45,   45,   45,
-       45,   45, 2260, 2260,   45,   45,   45,   45,   45,   45,
+
+     2305,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45, 2305,   45,   45,   45,   45,   45,   45,   45,   45,
+       45, 2305,   45,   45,   45, 2305,   45,   45,   45,   45,
+       45, 2305,   45,   45, 2305, 2305,   45,   45,   45, 2305,
+       45, 2305,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45, 2305,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 2305,   45,   45,
+       45, 2305,   45,   45, 2305,   45,   45,   45, 2305,   45,
+       45,   45,   45,   45,   45, 2305, 2305,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45,   45,   45,   45,   45, 2260,   45,   45,
-       45,   45,   45, 2260,   45,   45,   45, 2260, 2260,   45,
 
+       45,   45,   45, 2305,   45,   45,   45,   45,   45,   45,
+     2305,   45,   45,   45,   45,   45, 2305,   45,   45,   45,
+     2305, 2305,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 2305,   45,   45,
+       45,   45,   45,   45, 2305,   45,   45,   45, 2305,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 2305,
+       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 2305,   45, 2305,
+       45,   45,   45,   45,   45, 2305,   45,   45, 2305,   45,
+     2305,   45,   45,   45,   45,   45,   45,   45,   45, 2305,
+
+       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45, 2305,   45,   45,   45,   45, 2305,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 2305,
+       45, 2305,   45,   45,   45,   45, 2305, 2305,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45, 2260,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45,   45, 2260,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 2260,   45,   45,   45,   45,
+     2305,   45,   45,   45,   45,   45,   45,   45,   45, 2305,
+       45,   45,   45,   45,   45,   45, 2305, 2305,   45,   45,
+       45,   45,   45,   45,   45,   45,   45, 2305,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45, 2260,   45, 2260,   45,   45,   45,   45,   45,
-     2260,   45,   45, 2260,   45, 2260,   45,   45,   45,   45,
-       45,   45,   45,   45, 2260,   45,   45,   45,   45,   45,
+
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 2260,   45,   45,   45,   45,
-
-     2260,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45, 2260,   45, 2260,   45,   45,   45,   45, 2260,
-     2260,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45, 2260,   45,   45,   45,   45,   45,   45,
-       45, 2260,   45,   45,   45,   45,   45,   45, 2260, 2260,
-       45,   45,   45,   45,   45,   45,   45,   45, 2260,   45,
+       45,   45,   45,   45,   45,   45,   45,   45, 2305,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45, 2305,   45, 2305,   45, 2305,   45,   45, 2305,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45, 2260,
+       45,   45,   45,   45,   45,   45, 2305,   45, 2305,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45, 2305,   45,   45,   45, 2305,   45,   45,   45,
+       45,   45, 2305,   45,   45, 2305,   45, 2305,   45,   45,
+     2305,   45,   45,   45,   45,   45,   45,   45,   45, 2305,
 
-       45,   45, 2260,   45, 2260,   45, 2260,   45, 2260,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45, 2260,   45, 2260,   45,   45,
+     2305,   45,   45,   45,   45,   45,   45, 2305,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45, 2305,   45,   45,   45,   45,   45,   45,   45,
+       45,   45, 2305,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-     2260,   45,   45,   45, 2260,   45,   45,   45,   45,   45,
-     2260,   45, 2260,   45, 2260,   45,   45, 2260,   45,   45,
-       45,   45,   45,   45,   45,   45, 2260,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 2260,   45,   45,
-       45,   45,   45, 2260,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45, 2260,   45,   45,
-
-       45,   45,   45,   45,   45,   45,   45, 2260,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45, 2305, 2305,   45,   45,   45, 2305,   45,
+       45,   45,   45, 2305,   45,   45,   45,   45,   45, 2305,
+     2305, 2305, 2305,   45,   45, 2305, 2305, 2305,   45,   45,
+
+       45,   45,   45,   45,   45, 2305,   45,   45, 2305,   45,
+       45,   45,   45,   45,   45,   45,   45,   45, 2305, 2305,
+       45,   45,   45,   45,   45,   45, 2305,   45,   45, 2305,
+       45, 2305,   45,   45,   45,   45,   45,   45,   45, 2305,
+       45,   45,   45,   45,   45,   45,   45,   45,   45, 2305,
+       45,   45, 2305, 2305,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45, 2260, 2260,   45,   45,
-       45, 2260,   45,   45,   45,   45, 2260,   45,   45,   45,
-       45, 2260, 2260, 2260, 2260,   45, 2260, 2260, 2260,   45,
-       45,   45,   45,   45,   45,   45, 2260,   45,   45, 2260,
-       45,   45,   45,   45,   45,   45,   45,   45, 2260,   45,
-       45,   45,   45,   45,   45, 2260,   45,   45, 2260,   45,
-     2260,   45,   45,   45,   45,   45,   45, 2260,   45,   45,
-
-       45,   45,   45,   45,   45,   45, 2260,   45,   45, 2260,
-     2260,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45, 2260,   45,
-       45,   45,   45, 2260, 2260,   45,   45,   45,   45, 2260,
-       45,   45, 2260,   45, 2260,   45, 2260,   45,   45,   45,
-       45,   45,   45,   45, 2260,   45, 2260, 2260, 2260,    0,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260
+       45,   45, 2305,   45,   45, 2305,   45,   45, 2305, 2305,
+       45,   45,   45,   45, 2305,   45,   45, 2305,   45, 2305,
+       45, 2305,   45,   45,   45,   45,   45,   45,   45, 2305,
+
+       45, 2305, 2305, 2305,    0, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305
     } ;
 
-static const flex_int16_t yy_nxt[2787] =
+static const flex_int16_t yy_nxt[2832] =
     {   0,
-     2260,   13,   14,   13, 2260,   15,   16,  102,   17,   18,
+     2305,   13,   14,   13, 2305,   15,   16,  102,   17,   18,
        19,   20,   21,   22,   22,   22,   22,   22,   23,   24,
-       86,  252,   37,   14,   37,   87,   25,   26,   38,   37,
-       14,   37,   42,   27,   42,   38, 2260, 2260,   28,   91,
+       86,  254,   37,   14,   37,   87,   25,   26,   38,   37,
+       14,   37,   42,   27,   42,   38, 2305, 2305,   28,   91,
        13,   14,   13,   92,   29,   91,   30,  103,   13,   14,
-       13,  201,   25,   31,   13,   14,   13,   42,   40,   42,
-      555,   32,   13,   14,   13,   91,   40,   33,  253,  166,
-       93,   94,   92,  167,   34,   35,   13,   14,   13,  201,
+       13,  202,   25,   31,   13,   14,   13,   42,   40,   42,
+      890,   32,   13,   14,   13,   91,   40,   33,  255,  167,
+       93,   94,   92,  168,   34,   35,   13,   14,   13,  202,
        15,   16,   92,   17,   18,   19,   20,   21,   22,   22,
        22,   22,   22,   23,   24,   39,   13,   14,   13,   93,
 
        93,   25,   26,   39,   13,   14,   13,   42,   27,   42,
-      136,   95,  556,   28,  109,  244,   41,  104,  105,   29,
-      108,   30,  115,  137,   41,  231,  232,   25,   31,   96,
-      380,  245,   89,  138,   89,  233,   32,   90,   90,   90,
-       90,   90,   33,  109,  104,  105,  108,  381,  115,   34,
+      136,   95,  281,   28,  109,  282,   41,  104,  105,   29,
+      108,   30,  115,  137,   41,  232,  233,   25,   31,   96,
+      383,  138,   89,  139,   89,  234,   32,   90,   90,   90,
+       90,   90,   33,  109,  104,  105,  108,  384,  115,   34,
        35,   44,   44,   44,   45,   45,   46,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   47,   45,   48,   49,   50,   51,   45,
@@ -1528,131 +1546,131 @@ static const flex_int16_t yy_nxt[2787] =
 
        60,   61,   62,   63,   64,   45,   65,   66,   52,   67,
        68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
-       78,   79,   45,   45,   45,   45,   45,   81,  887,   82,
+       78,   79,   45,   45,   45,   45,   45,   81,  891,   82,
        82,   82,   82,   82,   81,  116,   84,   84,   84,   84,
-       84,  190,   83,   85,   85,   85,   85,   85,   81,   83,
-       84,   84,   84,   84,   84,  113,   83,  157,  197,  158,
-      206,  111,  116,   83,  159,  108,  140,  114,   83,  112,
-      190,  141,  104,  143,  142,   83,  147,  148,  209,  888,
-      149,  113,   83,  144,  197,  145,  150,  111,  206,   83,
+       84,  191,   83,   85,   85,   85,   85,   85,   81,   83,
+       84,   84,   84,   84,   84,  113,   83,  158,  198,  159,
+      207,  111,  116,   83,  160,  108,  141,  114,   83,  112,
+      191,  142,  104,  144,  143,   83,  148,  149,  210,  892,
+      150,  113,   83,  145,  198,  146,  151,  111,  207,   83,
        45,  108,   45,   45,   45,   45,  114,  112,   45,  120,
 
-       45,   45,  139,  118,  209,  121,   45,   45,  122,   45,
+       45,   45,  140,  118,  210,  121,   45,   45,  122,   45,
        45,   90,   90,   90,   90,   90,   45,   45,   45,   45,
        45,   45,  105,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,  102,
-      190,  889,  124,   45,  151,  279,  125,   45,  280,  105,
-      126,   45,  152,  127,  130,  202,  128,  131,  132,   45,
-      129,  133,  134,   45,  153,   45,  119,  111,  160,  193,
-      115,  161,  162,  196,  135,  112,  175,  176,  116,  103,
-      168,  188,  163,  189,  169,  164,  113,  170,  203,  154,
-      238,  155,  239,  156,  171,  172,  115,  188,  114,  173,
-
-      174,  189,  196,  112,  200,  116,  183,  269,  188,  240,
-      189,  184,  177,  204,  178,  186,  207,  179,  180,   85,
-       85,   85,   85,   85,  191,  406,  208,  181,  192,  611,
-      241,  200,   83,   81,  182,   82,   82,   82,   82,   82,
-      407,  612,  204,  242,   89,  207,   89,  243,   83,   90,
-       90,   90,   90,   90,  208,  196,  270,   81,   83,   84,
+      191,  893,  124,   45,  152,  351,  125,   45,  352,  105,
+      126,   45,  153,  127,  130,  203,  128,  131,  132,   45,
+      129,  133,  134,   45,  154,   45,  119,  111,  161,  194,
+      115,  162,  163,  197,  135,  112,  176,  177,  116,  103,
+      169,  189,  164,  190,  170,  165,  113,  171,  204,  155,
+      239,  156,  240,  157,  172,  173,  115,  189,  114,  174,
+
+      175,  190,  197,  112,  201,  116,  184,  271,  189,  241,
+      190,  185,  178,  205,  179,  187,  208,  180,  181,   85,
+       85,   85,   85,   85,  192,  246,  209,  182,  193,  894,
+      243,  201,   83,   81,  183,   82,   82,   82,   82,   82,
+      895,  247,  205,  244,   89,  208,   89,  245,   83,   90,
+       90,   90,   90,   90,  209,  197,  272,   81,   83,   84,
        84,   84,   84,   84,   85,   85,   85,   85,   85,  101,
-      249,  890,   83,  214,   83,  250,  101,   83,   90,   90,
-       90,   90,   90,  219,  215,  225,  246,  257,  300,  247,
-      262,  204,  220,  248,  226,  227,  221,  294,   83,  273,
-
-      258,  295,  301,   83,  306,  296,  206,  207,  284,  101,
-      307,  263,  312,  101,  274,  275,  276,  101,  349,  332,
-      268,  350,  318,  746,  438,  101,  313,  317,  402,  101,
-      747,  101,  101,  212,  305,  319,  310,  317,  403,  327,
-      318,  213,  213,  213,  213,  213,  285,  286,  287,  318,
-      213,  213,  213,  213,  213,  213,  317,  288,  319,  289,
-      324,  319,  290,  325,  291,  292,  320,  321,  327,  328,
-      330,  389,  331,  333,  335,  324,  213,  213,  213,  213,
-      213,  213,  330,  415,  322,  418,  324,  506,  419,  325,
-      433,  416,  434,  333,  450,  450,  330,  328,  331,  333,
-
-      453,  338,  335,  336,  336,  336,  336,  336,  396,  454,
-      351,  456,  336,  336,  336,  336,  336,  336,  352,  333,
-      450,  451,  458,  459,  353,  531,  481,  390,  453,  453,
-      391,  482,  600,  443,  633,  532,  454,  456,  336,  336,
-      336,  336,  336,  336,  502,  891,  458,  634,  507,  503,
-      459,  458,  462,  462,  462,  462,  462,  464,  600,  892,
-      740,  462,  462,  462,  462,  462,  462,  487,  521,  522,
-      523,  527,  595,  488,  524,  533,  546,  528,  550,  560,
-      569,  547,  551,  561,  570,  595,  740,  462,  462,  462,
-      462,  462,  462,  590,  601,  622,  602,  645,  591,  623,
-
-      504,  595,  646,  678,  714,  505,  668,  624,  679,  625,
-      626,  627,  628,  629,  604,  706,  669,  738,  732,  862,
-      707,  733,  601,  737,  602,  741,  742,  753,  744,  876,
-      769,  863,  739,  770,  798,  799,  875,  548,   45,   45,
-       45,   45,   45,  738,  877,  893,  879,   45,   45,   45,
-       45,   45,   45,  741,  897,  742,  876,  821,  834,  715,
-      878,  739,  822,  835,  898,  875,  894,  895,  899,  896,
-      900,  877,  879,   45,   45,   45,   45,   45,   45,  901,
-      902,  903,  904,  754,  905,  906,  907,  908,  909,  878,
-      910,  911,  912,  913,  914,  915,  916,  917,  918,  823,
-
-      921,  922,  919,  923,  924,  836,  920,  925,  926,  927,
-      928,  929,  930,  931,  932,  933,  934,  935,  936,  937,
+      251,  896,   83,  215,   83,  252,  101,   83,   90,   90,
+       90,   90,   90,  220,  216,  226,  248,  259,  302,  249,
+      264,  205,  221,  250,  227,  228,  222,  296,   83,  275,
+
+      260,  297,  303,   83,  308,  298,  207,  208,  286,  101,
+      309,  265,  314,  101,  276,  277,  278,  101,  405,  897,
+      270,  421,  320,  409,  422,  101,  315,  319,  406,  101,
+      898,  101,  101,  213,  307,  321,  312,  319,  410,  329,
+      320,  214,  214,  214,  214,  214,  287,  288,  289,  320,
+      214,  214,  214,  214,  214,  214,  319,  290,  321,  291,
+      326,  321,  292,  327,  293,  294,  322,  323,  329,  330,
+      332,  392,  333,  335,  337,  326,  214,  214,  214,  214,
+      214,  214,  332,  418,  324,  436,  326,  437,  334,  327,
+      456,  419,  899,  441,  335,  453,  332,  330,  333,  335,
+
+      453,  340,  337,  338,  338,  338,  338,  338,  399,  457,
+      353,  459,  338,  338,  338,  338,  338,  338,  354,  456,
+      335,  453,  461,  462,  355,  490,  454,  393,  456,  531,
+      394,  491,  510,  559,  446,  532,  457,  459,  338,  338,
+      338,  338,  338,  338,  484,  900,  461,  615,  535,  485,
+      462,  461,  465,  465,  465,  465,  465,  467,  536,  616,
+      904,  465,  465,  465,  465,  465,  465,  506,  525,  526,
+      527,  550,  507,  554,  528,  537,  551,  555,  564,  573,
+      599,  594,  565,  574,  604,  560,  595,  465,  465,  465,
+      465,  465,  465,  511,  605,  637,  606,  599,  719,  626,
+
+      650,  683,  673,  627,  737,  651,  684,  738,  638,  599,
+      604,  628,  674,  629,  630,  631,  632,  633,  758,  747,
+      711,  746,  605,  508,  606,  712,  608,  774,  509,  745,
+      775,  751,  552,   45,   45,   45,   45,   45,  752,  743,
+      804,  805,   45,   45,   45,   45,   45,   45,  747,  746,
+      825,  742,  828,  720,  744,  745,  749,  829,  826,  841,
+      882,  883,  885,  869,  842,  743,  884,  905,   45,   45,
+       45,   45,   45,   45,  759,  870,  886,  901,  902,  906,
+      903,  907,  908,  744,  909,  910,  911,  912,  883,  882,
+      913,  885,  914,  884,  830,  915,  916,  917,  918,  919,
+
+      920,  921,  886,  922,  923,  924,  843,  925,  928,  929,
+      930,  926,  931,  932,  933,  927,  934,  935,  936,  937,
       938,  939,  940,  941,  942,  943,  944,  945,  946,  947,
-      948,  950,  951,  949,  952,  953,  954,  955,  956,  957,
-      958,  959,  960,  961,  962,  963,  964,  965,  966,  967,
+      948,  949,  950,  951,  952,  953,  954,  955,  956,  958,
+      959,  957,  960,  961,  962,  963,  964,  965,  966,  967,
       968,  969,  970,  971,  972,  973,  974,  975,  976,  977,
       978,  979,  980,  981,  982,  983,  984,  985,  986,  987,
-      988,  989,  990,  991,  993,  994,  997,  998,  999, 1000,
-      992, 1004,  995, 1005, 1006, 1007,  996, 1008, 1009, 1010,
-     1011, 1012, 1001, 1013, 1002, 1014, 1015, 1016, 1003, 1017,
+      988,  989,  990,  991,  992,  993,  994,  995,  996,  997,
+      998,  999, 1000, 1002, 1003, 1006, 1007, 1008, 1009, 1001,
+     1013, 1004, 1014, 1015, 1016, 1005, 1017, 1018, 1019, 1020,
 
-     1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027,
+     1021, 1010, 1022, 1011, 1023, 1024, 1025, 1012, 1026, 1027,
      1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037,
-     1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1019, 1046,
-     1047, 1020, 1048, 1049, 1023, 1050, 1051, 1052, 1053, 1054,
-     1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064,
-     1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1074, 1075,
-     1076, 1077, 1073, 1078, 1079, 1080, 1081, 1082, 1083, 1084,
-     1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094,
-     1095, 1096, 1097, 1098, 1099, 1101, 1102, 1103, 1100, 1104,
-     1105, 1106, 1108, 1109, 1110, 1111, 1107, 1112, 1113, 1114,
-
-     1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124,
-     1125, 1126, 1127, 1128, 1129, 1130, 1131, 1133, 1134, 1135,
-     1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1132, 1144,
-     1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154,
-     1155, 1156, 1157, 1158, 1161, 1159, 1162, 1163, 1160, 1164,
-     1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174,
-     1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1157,
-     1156, 1184, 1158, 1159, 1160, 1185, 1186, 1187, 1188, 1189,
-     1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197, 1198, 1199,
+     1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047,
+     1048, 1049, 1050, 1051, 1052, 1053, 1054, 1028, 1055, 1056,
+     1029, 1057, 1058, 1032, 1059, 1060, 1061, 1062, 1063, 1064,
+     1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074,
+     1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1084, 1085,
+     1086, 1087, 1083, 1088, 1089, 1090, 1091, 1092, 1093, 1094,
+     1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104,
+     1105, 1106, 1107, 1108, 1109, 1110, 1112, 1113, 1114, 1111,
+
+     1115, 1116, 1117, 1119, 1120, 1121, 1122, 1118, 1123, 1124,
+     1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134,
+     1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1144, 1145,
+     1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1143,
+     1155, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1163, 1164,
+     1165, 1166, 1167, 1168, 1169, 1172, 1170, 1173, 1174, 1171,
+     1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184,
+     1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194,
+     1168, 1167, 1195, 1169, 1170, 1171, 1196, 1197, 1198, 1199,
      1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209,
 
-     1210, 1211, 1212, 1215, 1216, 1217, 1218, 1213, 1219, 1220,
-     1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, 1230,
+     1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219,
+     1220, 1221, 1222, 1223, 1224, 1227, 1228, 1229, 1230, 1225,
      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, 1214, 1274, 1275, 1276, 1277, 1278, 1279,
-     1280, 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1290,
-     1289, 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, 1287, 1289, 1290, 1291,
-     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, 1342, 1343, 1344, 1345, 1341,
-     1346, 1347, 1348, 1349, 1350, 1351, 1352, 1353, 1354, 1355,
-     1356, 1357, 1358, 1359, 1360, 1361, 1362, 1363, 1364, 1365,
+     1271, 1272, 1273, 1274, 1275, 1276, 1277, 1278, 1279, 1280,
+     1281, 1282, 1283, 1284, 1285, 1226, 1286, 1287, 1288, 1289,
+     1290, 1291, 1292, 1293, 1294, 1295, 1296, 1297, 1298, 1299,
+     1300, 1301, 1303, 1302, 1304, 1305, 1306, 1307, 1308, 1309,
+
+     1310, 1311, 1312, 1313, 1314, 1315, 1316, 1317, 1318, 1319,
+     1320, 1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1300,
+     1302, 1303, 1304, 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, 1356,
+     1357, 1358, 1359, 1355, 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, 1413, 1412, 1414, 1415,
+     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,
-     1410, 1436, 1409, 1412, 1411, 1413, 1437, 1438, 1439, 1440,
-     1441, 1442, 1443, 1444, 1445, 1446, 1447, 1448, 1449, 1450,
-     1451, 1452, 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1460,
+     1426, 1428, 1427, 1429, 1430, 1431, 1432, 1433, 1434, 1435,
+     1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1444, 1445,
+     1446, 1447, 1448, 1449, 1450, 1425, 1451, 1424, 1427, 1426,
+     1428, 1452, 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1460,
      1461, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1470,
      1471, 1472, 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1480,
      1481, 1482, 1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490,
@@ -1660,176 +1678,182 @@ static const flex_int16_t yy_nxt[2787] =
 
      1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508, 1509, 1510,
      1511, 1512, 1513, 1514, 1515, 1516, 1517, 1518, 1519, 1520,
-     1521, 1522, 1523, 1524, 1525, 1526, 1527, 1529, 1530, 1531,
-     1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541,
-     1542, 1543, 1544, 1545, 1518, 1519, 1546, 1547, 1520, 1548,
-     1549, 1550, 1551, 1552, 1553, 1554, 1555, 1556, 1557, 1558,
-     1559, 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1567, 1568,
-     1569, 1570, 1571, 1528, 1572, 1573, 1575, 1576, 1577, 1578,
-     1579, 1580, 1581, 1574, 1582, 1583, 1584, 1585, 1586, 1587,
-     1588, 1589, 1590, 1591, 1592, 1593, 1594, 1595, 1596, 1597,
-
-     1598, 1600, 1601, 1604, 1602, 1599, 1603, 1605, 1606, 1607,
+     1521, 1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529, 1530,
+     1531, 1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1540,
+     1541, 1542, 1543, 1544, 1546, 1547, 1548, 1549, 1550, 1551,
+     1552, 1553, 1554, 1555, 1556, 1557, 1558, 1559, 1560, 1561,
+     1562, 1535, 1536, 1563, 1564, 1537, 1565, 1566, 1567, 1568,
+     1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578,
+     1579, 1580, 1581, 1582, 1583, 1584, 1585, 1586, 1587, 1588,
+     1545, 1589, 1590, 1591, 1593, 1594, 1595, 1596, 1597, 1598,
+
+     1599, 1592, 1600, 1601, 1602, 1603, 1604, 1605, 1606, 1607,
      1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615, 1616, 1617,
-     1618, 1619, 1620, 1623, 1622, 1624, 1625, 1626, 1627, 1628,
-     1629, 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637, 1638,
-     1639, 1640, 1641, 1642, 1643, 1644, 1621, 1619, 1645, 1618,
-     1622, 1646, 1647, 1648, 1649, 1650, 1651, 1652, 1653, 1654,
-     1655, 1656, 1657, 1658, 1659, 1660, 1661, 1662, 1663, 1664,
-     1665, 1666, 1667, 1668, 1621, 1669, 1670, 1671, 1672, 1673,
-     1674, 1675, 1676, 1677, 1678, 1679, 1680, 1681, 1682, 1683,
-     1684, 1685, 1686, 1690, 1687, 1691, 1692, 1688, 1693, 1694,
-
-     1689, 1695, 1696, 1697, 1698, 1699, 1700, 1701, 1702, 1703,
-     1704, 1705, 1706, 1707, 1709, 1708, 1710, 1711, 1712, 1713,
-     1714, 1715, 1716, 1717, 1718, 1719, 1721, 1722, 1723, 1726,
-     1727, 1724, 1728, 1729, 1730, 1731, 1732, 1733, 1734, 1706,
-     1707, 1708, 1725, 1709, 1710, 1735, 1736, 1737, 1738, 1739,
-     1740, 1741, 1742, 1743, 1744, 1745, 1746, 1748, 1749, 1750,
-     1751, 1752, 1753, 1754, 1755, 1756, 1757, 1758, 1759, 1760,
-     1761, 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1769, 1770,
-     1771, 1772, 1773, 1774, 1775, 1776, 1720, 1777, 1778, 1779,
-     1780, 1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789,
-
-     1790, 1792, 1791, 1793, 1794, 1795, 1796, 1797, 1798, 1799,
-     1800, 1801, 1802, 1803, 1804, 1805, 1806, 1747, 1807, 1808,
-     1809, 1810, 1811, 1812, 1813, 1817, 1790, 1818, 1789, 1791,
-     1792, 1814, 1793, 1819, 1820, 1821, 1815, 1822, 1823, 1824,
-     1825, 1826, 1827, 1828, 1829, 1830, 1831, 1832, 1833, 1834,
-     1835, 1836, 1837, 1838, 1839, 1840, 1841, 1842, 1843, 1844,
+     1619, 1620, 1623, 1621, 1618, 1622, 1624, 1625, 1626, 1627,
+     1628, 1629, 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637,
+     1638, 1639, 1642, 1641, 1643, 1644, 1645, 1646, 1647, 1648,
+     1649, 1650, 1651, 1652, 1653, 1654, 1655, 1656, 1657, 1658,
+     1659, 1660, 1661, 1662, 1663, 1640, 1638, 1664, 1637, 1641,
+     1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674,
+     1675, 1676, 1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684,
+     1685, 1686, 1687, 1640, 1688, 1689, 1690, 1691, 1692, 1693,
+
+     1694, 1695, 1696, 1697, 1698, 1699, 1700, 1701, 1702, 1703,
+     1704, 1705, 1706, 1707, 1711, 1708, 1712, 1713, 1709, 1714,
+     1715, 1710, 1716, 1717, 1718, 1719, 1720, 1721, 1722, 1723,
+     1724, 1725, 1726, 1727, 1728, 1730, 1729, 1731, 1732, 1733,
+     1734, 1735, 1736, 1737, 1738, 1739, 1740, 1742, 1743, 1744,
+     1747, 1748, 1745, 1749, 1750, 1751, 1752, 1753, 1754, 1755,
+     1727, 1728, 1729, 1746, 1730, 1731, 1756, 1757, 1758, 1759,
+     1760, 1761, 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1770,
+     1771, 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780,
+     1781, 1782, 1783, 1784, 1785, 1786, 1787, 1788, 1789, 1790,
+
+     1791, 1792, 1793, 1794, 1795, 1796, 1797, 1741, 1798, 1799,
+     1800, 1801, 1802, 1803, 1804, 1805, 1806, 1807, 1808, 1809,
+     1810, 1811, 1812, 1813, 1815, 1814, 1816, 1817, 1818, 1819,
+     1820, 1821, 1822, 1823, 1824, 1825, 1826, 1827, 1828, 1769,
+     1829, 1830, 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1813,
+     1841, 1812, 1814, 1815, 1838, 1816, 1842, 1843, 1844, 1839,
      1845, 1846, 1847, 1848, 1849, 1850, 1851, 1852, 1853, 1854,
-     1855, 1856, 1857, 1858, 1859, 1860, 1861, 1862, 1816, 1863,
-     1864, 1865, 1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873,
-     1874, 1875, 1876, 1877, 1878, 1879, 1880, 1881, 1882, 1883,
-
-     1884, 1885, 1860, 1862, 1886, 1887, 1888, 1889, 1890, 1891,
-     1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901,
-     1902, 1903, 1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911,
-     1912, 1913, 1914, 1915, 1916, 1918, 1919, 1920, 1921, 1917,
-     1922, 1923, 1924, 1926, 1925, 1927, 1928, 1929, 1930, 1931,
+     1855, 1856, 1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864,
+     1865, 1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874,
+     1875, 1876, 1877, 1878, 1879, 1880, 1881, 1882, 1883, 1884,
+
+     1885, 1840, 1886, 1887, 1888, 1889, 1890, 1891, 1892, 1893,
+     1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901, 1902, 1903,
+     1904, 1905, 1906, 1907, 1908, 1909, 1910, 1885, 1911, 1887,
+     1912, 1913, 1914, 1915, 1916, 1917, 1918, 1919, 1920, 1921,
+     1922, 1923, 1924, 1925, 1926, 1927, 1928, 1929, 1930, 1931,
      1932, 1933, 1934, 1935, 1936, 1937, 1938, 1939, 1940, 1941,
-     1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, 1950, 1924,
-     1925, 1951, 1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959,
-     1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967, 1968, 1969,
-     1970, 1971, 1972, 1973, 1974, 1975, 1976, 1977, 1978, 1979,
+     1942, 1943, 1945, 1946, 1947, 1948, 1944, 1949, 1950, 1951,
+     1953, 1952, 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1961,
+     1962, 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971,
+     1972, 1973, 1974, 1975, 1976, 1977, 1951, 1952, 1978, 1979,
 
      1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1989,
      1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-     2000, 2001, 1976, 1977, 2002, 1978, 2003, 2004, 2005, 2006,
-     2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-     2017, 2018, 2019, 2020, 2022, 2023, 2021, 2024, 2025, 2026,
-     2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, 2035, 2036,
+     2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+     2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
+     2020, 2021, 2022, 2023, 2024, 2025, 2026, 2027, 2028, 2029,
+     2030, 2005, 2006, 2031, 2007, 2032, 2033, 2034, 2035, 2036,
      2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046,
-     2047, 2048, 2049, 2050, 2051, 2025, 2027, 2052, 2053, 2054,
-     2055, 2056, 2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064,
-     2065, 2066, 2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074,
+     2047, 2048, 2049, 2050, 2051, 2053, 2054, 2052, 2055, 2056,
+     2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066,
+     2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074, 2075, 2076,
 
-     2075, 2076, 2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084,
+     2077, 2078, 2079, 2080, 2081, 2082, 2056, 2058, 2083, 2084,
      2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094,
-     2069, 2095, 2070, 2096, 2097, 2098, 2099, 2100, 2101, 2102,
-     2103, 2104, 2106, 2105, 2107, 2108, 2109, 2110, 2111, 2112,
-     2113, 2114, 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122,
-     2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, 2104, 2105,
-     2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140,
-     2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150,
-     2151, 2152, 2153, 2154, 2155, 2156, 2157, 2158, 2159, 2160,
-     2161, 2136, 2162, 2163, 2164, 2165, 2166, 2167, 2168, 2169,
-
-     2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178, 2179,
-     2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189,
-     2190, 2191, 2192, 2193, 2194, 2195, 2196, 2197, 2198, 2199,
+     2095, 2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104,
+     2105, 2106, 2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114,
+     2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, 2124,
+     2125, 2126, 2127, 2102, 2128, 2103, 2129, 2130, 2131, 2132,
+     2133, 2134, 2135, 2136, 2137, 2138, 2139, 2141, 2140, 2142,
+     2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152,
+     2153, 2154, 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162,
+     2163, 2164, 2165, 2139, 2140, 2166, 2167, 2168, 2169, 2170,
+
+     2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178, 2179, 2180,
+     2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, 2190,
+     2191, 2192, 2193, 2194, 2195, 2196, 2197, 2198, 2173, 2199,
      2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209,
-     2210, 2211, 2212, 2213, 2214, 2215, 2217, 2216, 2218, 2219,
+     2210, 2211, 2212, 2213, 2214, 2215, 2216, 2217, 2218, 2219,
      2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229,
      2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, 2238, 2239,
      2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249,
-     2250, 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259,
-       12,   12,   12,   36,   36,   36,   80,   99,   80,  101,
-
-      101,  101,  117,  117,  117,  187,  886,  187,  210,  210,
-      210,  885,  884,  883,  882,  881,  880,  874,  873,  872,
-      871,  870,  869,  868,  867,  866,  865,  864,  861,  860,
-      859,  858,  857,  856,  855,  854,  853,  852,  851,  850,
-      849,  848,  847,  846,  845,  844,  843,  842,  841,  840,
-      839,  838,  837,  833,  832,  831,  830,  829,  828,  827,
-      826,  825,  824,  820,  819,  818,  817,  816,  815,  814,
-      813,  812,  811,  810,  809,  808,  807,  806,  805,  804,
-      803,  802,  801,  800,  797,  796,  795,  794,  793,  792,
-      791,  790,  789,  788,  787,  786,  785,  784,  783,  782,
-
-      781,  780,  779,  778,  777,  776,  775,  774,  773,  772,
-      771,  768,  767,  766,  765,  764,  763,  762,  761,  760,
-      759,  758,  757,  756,  755,  752,  751,  750,  749,  748,
-      745,  743,  737,  736,  735,  734,  731,  730,  729,  728,
-      727,  726,  725,  724,  723,  722,  721,  720,  719,  718,
-      717,  716,  713,  712,  711,  710,  709,  708,  705,  704,
-      703,  702,  701,  700,  699,  698,  697,  696,  695,  694,
-      693,  692,  691,  690,  689,  688,  687,  686,  685,  684,
-      683,  682,  681,  680,  677,  676,  675,  674,  673,  672,
-      671,  670,  667,  666,  665,  664,  663,  662,  661,  660,
-
-      659,  658,  657,  656,  655,  654,  653,  652,  651,  650,
-      649,  648,  647,  644,  643,  642,  641,  640,  639,  638,
-      637,  636,  635,  632,  631,  630,  621,  620,  619,  618,
-      617,  616,  615,  614,  613,  610,  609,  608,  607,  606,
-      605,  603,  599,  598,  597,  596,  594,  593,  592,  589,
-      588,  587,  586,  585,  584,  583,  582,  581,  580,  579,
-      578,  577,  576,  575,  574,  573,  572,  571,  568,  567,
-      566,  565,  564,  563,  562,  559,  558,  557,  554,  553,
-      552,  549,  545,  544,  543,  542,  541,  540,  539,  538,
-      537,  536,  535,  534,  530,  529,  526,  525,  520,  519,
-
-      518,  517,  516,  515,  514,  513,  512,  511,  510,  509,
-      508,  501,  500,  499,  498,  497,  496,  495,  494,  493,
-      492,  491,  490,  489,  486,  485,  484,  483,  480,  479,
-      478,  477,  476,  475,  474,  473,  472,  471,  470,  469,
-      468,  467,  466,  465,  463,  461,  460,  457,  455,  452,
-      449,  448,  447,  446,  445,  444,  442,  441,  440,  439,
-      437,  436,  435,  432,  431,  430,  429,  428,  427,  426,
-      425,  424,  423,  422,  421,  420,  417,  414,  413,  412,
-      411,  410,  409,  408,  405,  404,  401,  400,  399,  398,
-      397,  395,  394,  393,  392,  388,  387,  386,  385,  384,
-
-      383,  382,  379,  378,  377,  376,  375,  374,  373,  372,
-      371,  370,  369,  368,  367,  366,  365,  364,  363,  362,
-      361,  360,  359,  358,  357,  356,  355,  354,  348,  347,
-      346,  345,  344,  343,  342,  341,  340,  339,  337,  211,
-      334,  332,  329,  326,  323,  316,  315,  314,  311,  309,
-      308,  304,  303,  302,  299,  298,  297,  293,  283,  282,
-      281,  278,  277,  272,  271,  267,  266,  265,  264,  261,
-      260,  259,  256,  255,  254,  251,  237,  236,  235,  234,
-      230,  229,  228,  224,  223,  222,  218,  217,  216,  211,
-      205,  199,  198,  195,  194,  185,  165,  146,  123,  110,
-
-      107,  106,   43,  100,   98,   97,   88,   43, 2260,   11,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260
+     2250, 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2260,
+     2259, 2261, 2262, 2263, 2264, 2265, 2266, 2267, 2268, 2269,
+
+     2270, 2271, 2272, 2273, 2274, 2275, 2276, 2277, 2278, 2279,
+     2280, 2281, 2282, 2283, 2284, 2285, 2286, 2287, 2288, 2289,
+     2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, 2298, 2299,
+     2300, 2301, 2302, 2303, 2304,   12,   12,   12,   36,   36,
+       36,   80,   99,   80,  101,  101,  101,  117,  117,  117,
+      188,  889,  188,  211,  211,  211,  888,  887,  881,  880,
+      879,  878,  877,  876,  875,  874,  873,  872,  871,  868,
+      867,  866,  865,  864,  863,  862,  861,  860,  859,  858,
+      857,  856,  855,  854,  853,  852,  851,  850,  849,  848,
+      847,  846,  845,  844,  840,  839,  838,  837,  836,  835,
+
+      834,  833,  832,  831,  827,  824,  823,  822,  821,  820,
+      819,  818,  817,  816,  815,  814,  813,  812,  811,  810,
+      809,  808,  807,  806,  803,  802,  801,  800,  799,  798,
+      797,  796,  795,  794,  793,  792,  791,  790,  789,  788,
+      787,  786,  785,  784,  783,  782,  781,  780,  779,  778,
+      777,  776,  773,  772,  771,  770,  769,  768,  767,  766,
+      765,  764,  763,  762,  761,  760,  757,  756,  755,  754,
+      753,  750,  748,  742,  741,  740,  739,  736,  735,  734,
+      733,  732,  731,  730,  729,  728,  727,  726,  725,  724,
+      723,  722,  721,  718,  717,  716,  715,  714,  713,  710,
+
+      709,  708,  707,  706,  705,  704,  703,  702,  701,  700,
+      699,  698,  697,  696,  695,  694,  693,  692,  691,  690,
+      689,  688,  687,  686,  685,  682,  681,  680,  679,  678,
+      677,  676,  675,  672,  671,  670,  669,  668,  667,  666,
+      665,  664,  663,  662,  661,  660,  659,  658,  657,  656,
+      655,  654,  653,  652,  649,  648,  647,  646,  645,  644,
+      643,  642,  641,  640,  639,  636,  635,  634,  625,  624,
+      623,  622,  621,  620,  619,  618,  617,  614,  613,  612,
+      611,  610,  609,  607,  603,  602,  601,  600,  598,  597,
+      596,  593,  592,  591,  590,  589,  588,  587,  586,  585,
+
+      584,  583,  582,  581,  580,  579,  578,  577,  576,  575,
+      572,  571,  570,  569,  568,  567,  566,  563,  562,  561,
+      558,  557,  556,  553,  549,  548,  547,  546,  545,  544,
+      543,  542,  541,  540,  539,  538,  534,  533,  530,  529,
+      524,  523,  522,  521,  520,  519,  518,  517,  516,  515,
+      514,  513,  512,  505,  504,  503,  502,  501,  500,  499,
+      498,  497,  496,  495,  494,  493,  492,  489,  488,  487,
+      486,  483,  482,  481,  480,  479,  478,  477,  476,  475,
+      474,  473,  472,  471,  470,  469,  468,  466,  464,  463,
+      460,  458,  455,  452,  451,  450,  449,  448,  447,  445,
+
+      444,  443,  442,  440,  439,  438,  435,  434,  433,  432,
+      431,  430,  429,  428,  427,  426,  425,  424,  423,  420,
+      417,  416,  415,  414,  413,  412,  411,  408,  407,  404,
+      403,  402,  401,  400,  398,  397,  396,  395,  391,  390,
+      389,  388,  387,  386,  385,  382,  381,  380,  379,  378,
+      377,  376,  375,  374,  373,  372,  371,  370,  369,  368,
+      367,  366,  365,  364,  363,  362,  361,  360,  359,  358,
+      357,  356,  350,  349,  348,  347,  346,  345,  344,  343,
+      342,  341,  339,  212,  336,  334,  331,  328,  325,  318,
+      317,  316,  313,  311,  310,  306,  305,  304,  301,  300,
+
+      299,  295,  285,  284,  283,  280,  279,  274,  273,  269,
+      268,  267,  266,  263,  262,  261,  258,  257,  256,  253,
+      242,  238,  237,  236,  235,  231,  230,  229,  225,  224,
+      223,  219,  218,  217,  212,  206,  200,  199,  196,  195,
+      186,  166,  147,  123,  110,  107,  106,   43,  100,   98,
+       97,   88,   43, 2305,   11, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305
     } ;
 
-static const flex_int16_t yy_chk[2787] =
+static const flex_int16_t yy_chk[2832] =
     {   0,
         0,    1,    1,    1,    0,    1,    1,   44,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-       21,  143,    3,    3,    3,   21,    1,    1,    3,    4,
+       21,  144,    3,    3,    3,   21,    1,    1,    3,    4,
         4,    4,   13,    1,   13,    4,    0,    0,    1,   26,
         5,    5,    5,   27,    1,   31,    1,   44,    6,    6,
         6,  109,    1,    1,    7,    7,    7,   37,    7,   37,
-      415,    1,    8,    8,    8,   26,    8,    1,  143,   74,
+      751,    1,    8,    8,    8,   26,    8,    1,  144,   74,
        28,   31,   27,   74,    1,    1,    2,    2,    2,  109,
         2,    2,   32,    2,    2,    2,    2,    2,    2,    2,
         2,    2,    2,    2,    2,    5,    9,    9,    9,   28,
 
        33,    2,    2,    6,   10,   10,   10,   42,    2,   42,
-       63,   32,  415,    2,   52,  139,    9,   47,   48,    2,
+       63,   32,  164,    2,   52,  164,    9,   47,   48,    2,
        51,    2,   56,   63,   10,  132,  132,    2,    2,   33,
-      255,  139,   25,   63,   25,  132,    2,   25,   25,   25,
-       25,   25,    2,   52,   47,   48,   51,  255,   56,    2,
+      257,   63,   25,   63,   25,  132,    2,   25,   25,   25,
+       25,   25,    2,   52,   47,   48,   51,  257,   56,    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,
@@ -1838,12 +1862,12 @@ static const flex_int16_t yy_chk[2787] =
 
        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,   17,  750,   17,
+       15,   15,   15,   15,   15,   15,   15,   17,  752,   17,
        17,   17,   17,   17,   19,   57,   19,   19,   19,   19,
        19,   93,   17,   20,   20,   20,   20,   20,   22,   19,
        22,   22,   22,   22,   22,   55,   20,   71,  105,   71,
       113,   54,   57,   22,   71,   64,   65,   55,   17,   54,
-       93,   65,   59,   66,   65,   19,   68,   68,  116,  751,
+       93,   65,   59,   66,   65,   19,   68,   68,  116,  753,
        68,   55,   20,   66,  105,   66,   68,   54,  113,   22,
        45,   64,   45,   45,   45,   45,   55,   54,   45,   59,
 
@@ -1851,275 +1875,281 @@ static const flex_int16_t yy_chk[2787] =
        58,   89,   89,   89,   89,   89,   45,   45,   45,   45,
        45,   45,   61,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,  101,
-       96,  752,   61,   58,   69,  163,   61,   58,  163,   61,
+       96,  754,   61,   58,   69,  227,   61,   58,  227,   61,
        61,   58,   69,   61,   62,  110,   61,   62,   62,   58,
        61,   62,   62,   58,   69,   58,   58,   70,   72,   96,
        77,   72,   72,  104,   62,   70,   76,   76,   79,  101,
        75,   91,   72,   92,   75,   72,   76,   75,  110,   70,
       137,   70,  137,   70,   75,   75,   77,   94,   76,   75,
 
-       75,   95,  104,   70,  108,   79,   77,  157,   91,  137,
+       75,   95,  104,   70,  108,   79,   77,  158,   91,  137,
        92,   77,   76,  111,   76,   79,  114,   76,   76,   81,
-       81,   81,   81,   81,   94,  277,  115,   76,   95,  471,
-      138,  108,   81,   82,   76,   82,   82,   82,   82,   82,
-      277,  471,  111,  138,   83,  114,   83,  138,   82,   83,
-       83,   83,   83,   83,  115,  120,  157,   84,   81,   84,
+       81,   81,   81,   81,   94,  140,  115,   76,   95,  755,
+      139,  108,   81,   82,   76,   82,   82,   82,   82,   82,
+      756,  140,  111,  139,   83,  114,   83,  139,   82,   83,
+       83,   83,   83,   83,  115,  120,  158,   84,   81,   84,
        84,   84,   84,   84,   85,   85,   85,   85,   85,  103,
-      141,  753,   84,  120,   82,  141,  103,   85,   90,   90,
-       90,   90,   90,  124,  120,  128,  140,  147,  173,  140,
-      151,  156,  124,  140,  128,  128,  124,  169,   84,  160,
-
-      147,  169,  173,   85,  178,  169,  177,  181,  167,  103,
-      178,  151,  183,  103,  160,  160,  160,  103,  226,  305,
-      156,  226,  189,  608,  305,  103,  183,  188,  274,  103,
-      608,  103,  103,  119,  177,  190,  181,  191,  274,  200,
-      192,  119,  119,  119,  119,  119,  167,  167,  167,  189,
-      119,  119,  119,  119,  119,  119,  188,  167,  193,  167,
-      196,  190,  167,  197,  167,  167,  191,  192,  200,  201,
-      204,  263,  205,  207,  209,  215,  119,  119,  119,  119,
-      119,  119,  268,  285,  193,  287,  196,  375,  287,  197,
-      301,  285,  301,  310,  317,  320,  204,  201,  205,  207,
-
-      324,  215,  209,  213,  213,  213,  213,  213,  268,  325,
-      227,  327,  213,  213,  213,  213,  213,  213,  227,  310,
-      317,  320,  330,  331,  227,  395,  355,  263,  338,  324,
-      263,  355,  459,  310,  487,  395,  325,  327,  213,  213,
-      213,  213,  213,  213,  374,  754,  396,  487,  375,  374,
-      331,  330,  336,  336,  336,  336,  336,  338,  459,  755,
-      600,  336,  336,  336,  336,  336,  336,  360,  389,  389,
-      389,  392,  453,  360,  389,  396,  409,  392,  411,  419,
-      427,  409,  411,  419,  427,  464,  600,  336,  336,  336,
-      336,  336,  336,  447,  461,  483,  461,  499,  447,  483,
-
-      374,  453,  499,  533,  569,  374,  523,  483,  533,  483,
-      483,  483,  483,  483,  464,  562,  523,  596,  591,  724,
-      562,  591,  461,  604,  461,  601,  602,  614,  604,  739,
-      629,  724,  596,  629,  660,  660,  738,  409,  462,  462,
-      462,  462,  462,  596,  740,  756,  742,  462,  462,  462,
-      462,  462,  462,  601,  758,  602,  739,  683,  695,  569,
-      741,  596,  683,  695,  759,  738,  757,  757,  760,  757,
-      761,  740,  742,  462,  462,  462,  462,  462,  462,  762,
-      763,  764,  765,  614,  766,  767,  768,  769,  770,  741,
-      771,  772,  773,  774,  775,  776,  777,  778,  779,  683,
-
-      780,  781,  779,  782,  783,  695,  779,  784,  785,  786,
-      787,  788,  789,  790,  791,  792,  793,  794,  795,  796,
-      797,  798,  799,  800,  801,  802,  803,  804,  805,  806,
-      807,  808,  809,  807,  810,  812,  813,  814,  815,  816,
-      817,  818,  819,  820,  822,  823,  824,  825,  826,  827,
-      828,  829,  830,  831,  832,  833,  835,  836,  837,  838,
-      839,  840,  841,  842,  843,  844,  845,  846,  847,  848,
-      849,  850,  851,  852,  853,  854,  855,  856,  857,  858,
-      852,  859,  854,  860,  861,  863,  854,  864,  865,  866,
-      867,  868,  858,  869,  858,  870,  871,  872,  858,  873,
-
-      874,  875,  876,  877,  878,  879,  880,  881,  882,  883,
-      884,  885,  886,  887,  888,  889,  890,  893,  894,  895,
-      896,  897,  898,  899,  900,  901,  902,  903,  875,  904,
-      905,  876,  906,  907,  879,  908,  909,  910,  911,  912,
-      913,  914,  915,  916,  917,  918,  919,  920,  921,  922,
-      923,  924,  925,  927,  928,  929,  930,  931,  932,  933,
-      934,  935,  931,  936,  937,  938,  939,  940,  941,  942,
-      945,  946,  947,  948,  949,  950,  951,  953,  954,  955,
-      956,  957,  958,  960,  961,  962,  963,  964,  961,  965,
-      966,  967,  969,  970,  973,  974,  967,  975,  976,  977,
-
-      978,  979,  980,  981,  982,  983,  984,  985,  986,  987,
-      988,  989,  990,  991,  992,  993,  994,  995,  996,  997,
-      998,  999, 1000, 1001, 1002, 1003, 1004, 1005,  994, 1006,
-     1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017,
-     1018, 1019, 1020, 1021, 1024, 1022, 1025, 1026, 1023, 1027,
-     1028, 1029, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038,
-     1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1020,
-     1019, 1048, 1021, 1022, 1023, 1049, 1050, 1051, 1052, 1053,
-     1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063,
-     1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1073, 1074,
-
-     1075, 1076, 1077, 1078, 1079, 1081, 1082, 1077, 1083, 1084,
-     1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094,
-     1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104,
-     1105, 1107, 1108, 1110, 1111, 1113, 1114, 1115, 1116, 1118,
-     1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128,
-     1129, 1130, 1131, 1132, 1133, 1134, 1135, 1137, 1138, 1139,
-     1140, 1141, 1142, 1077, 1143, 1144, 1145, 1146, 1147, 1148,
-     1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1159,
-     1158, 1160, 1162, 1163, 1164, 1165, 1166, 1168, 1169, 1170,
-     1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180,
-
-     1181, 1182, 1183, 1184, 1185, 1186, 1156, 1158, 1159, 1160,
-     1187, 1188, 1189, 1190, 1192, 1193, 1195, 1196, 1197, 1198,
-     1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208,
-     1209, 1210, 1211, 1213, 1214, 1215, 1216, 1217, 1218, 1214,
-     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, 1249,
-     1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, 1259,
-     1261, 1262, 1265, 1266, 1267, 1268, 1269, 1270, 1271, 1272,
-     1273, 1274, 1275, 1276, 1277, 1278, 1279, 1280, 1281, 1282,
-
-     1283, 1285, 1286, 1287, 1288, 1289, 1291, 1290, 1292, 1293,
-     1294, 1295, 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303,
-     1304, 1305, 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314,
-     1288, 1315, 1287, 1290, 1289, 1291, 1316, 1318, 1319, 1320,
-     1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1329, 1330,
-     1331, 1332, 1333, 1334, 1335, 1336, 1339, 1341, 1342, 1343,
-     1344, 1345, 1346, 1347, 1348, 1349, 1350, 1351, 1352, 1353,
-     1354, 1355, 1356, 1357, 1359, 1361, 1362, 1364, 1365, 1366,
-     1368, 1369, 1370, 1371, 1374, 1375, 1376, 1377, 1378, 1379,
-     1380, 1381, 1382, 1383, 1384, 1385, 1386, 1387, 1388, 1390,
-
-     1391, 1392, 1393, 1394, 1395, 1396, 1397, 1398, 1401, 1402,
-     1403, 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412,
-     1413, 1415, 1416, 1417, 1418, 1419, 1421, 1422, 1423, 1424,
-     1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, 1434,
-     1435, 1436, 1437, 1438, 1410, 1411, 1439, 1440, 1412, 1441,
-     1442, 1443, 1444, 1445, 1447, 1448, 1449, 1450, 1451, 1452,
-     1453, 1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462,
-     1463, 1464, 1466, 1421, 1467, 1468, 1469, 1470, 1471, 1472,
-     1473, 1474, 1475, 1468, 1476, 1478, 1479, 1480, 1481, 1482,
-     1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490, 1491, 1493,
-
-     1494, 1495, 1496, 1500, 1498, 1494, 1498, 1501, 1502, 1506,
-     1507, 1508, 1509, 1510, 1511, 1512, 1513, 1514, 1515, 1516,
-     1517, 1518, 1519, 1522, 1520, 1523, 1524, 1525, 1526, 1528,
-     1529, 1530, 1531, 1532, 1533, 1534, 1535, 1536, 1537, 1538,
-     1539, 1540, 1541, 1542, 1543, 1544, 1519, 1518, 1545, 1517,
-     1520, 1546, 1547, 1549, 1550, 1552, 1553, 1554, 1555, 1556,
-     1557, 1558, 1559, 1560, 1561, 1562, 1564, 1566, 1568, 1569,
-     1571, 1572, 1573, 1574, 1519, 1575, 1576, 1577, 1578, 1579,
-     1580, 1582, 1583, 1584, 1585, 1586, 1587, 1589, 1593, 1594,
-     1596, 1597, 1599, 1600, 1599, 1601, 1602, 1599, 1603, 1604,
-
-     1599, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1614,
-     1616, 1617, 1618, 1619, 1621, 1620, 1622, 1623, 1625, 1626,
-     1628, 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637, 1639,
-     1640, 1638, 1641, 1642, 1643, 1644, 1645, 1647, 1648, 1618,
-     1619, 1620, 1638, 1621, 1622, 1649, 1650, 1652, 1653, 1654,
-     1655, 1656, 1657, 1658, 1659, 1659, 1660, 1661, 1662, 1663,
-     1664, 1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673,
-     1674, 1675, 1676, 1677, 1678, 1679, 1681, 1682, 1683, 1684,
-     1685, 1686, 1687, 1688, 1689, 1690, 1634, 1692, 1693, 1694,
-     1695, 1696, 1697, 1698, 1699, 1700, 1702, 1703, 1704, 1706,
-
-     1707, 1709, 1708, 1710, 1712, 1713, 1716, 1717, 1718, 1720,
-     1722, 1723, 1724, 1725, 1726, 1727, 1728, 1660, 1729, 1730,
-     1731, 1732, 1733, 1734, 1735, 1738, 1707, 1739, 1706, 1708,
-     1709, 1737, 1710, 1740, 1741, 1742, 1737, 1743, 1744, 1745,
-     1747, 1748, 1749, 1751, 1752, 1754, 1755, 1756, 1758, 1759,
-     1760, 1761, 1762, 1765, 1766, 1767, 1768, 1769, 1770, 1771,
-     1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1782,
-     1783, 1784, 1785, 1786, 1787, 1789, 1790, 1791, 1737, 1792,
-     1793, 1795, 1796, 1797, 1800, 1801, 1802, 1803, 1804, 1805,
-     1806, 1807, 1808, 1809, 1810, 1811, 1812, 1813, 1815, 1816,
-
-     1817, 1818, 1789, 1791, 1819, 1820, 1822, 1823, 1824, 1826,
-     1827, 1828, 1829, 1830, 1831, 1832, 1833, 1834, 1835, 1837,
-     1838, 1839, 1840, 1841, 1842, 1843, 1844, 1845, 1846, 1847,
-     1848, 1849, 1850, 1851, 1852, 1854, 1856, 1857, 1858, 1852,
-     1859, 1860, 1862, 1865, 1863, 1867, 1868, 1869, 1870, 1871,
-     1872, 1873, 1874, 1876, 1877, 1878, 1879, 1880, 1881, 1882,
-     1883, 1884, 1885, 1886, 1887, 1888, 1889, 1890, 1891, 1862,
-     1863, 1892, 1893, 1894, 1895, 1897, 1898, 1899, 1900, 1902,
-     1903, 1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 1912,
-     1914, 1916, 1917, 1918, 1919, 1922, 1923, 1924, 1925, 1926,
-
-     1927, 1928, 1929, 1930, 1931, 1932, 1933, 1935, 1936, 1937,
-     1938, 1939, 1940, 1941, 1943, 1944, 1945, 1946, 1947, 1948,
-     1951, 1952, 1923, 1924, 1953, 1925, 1954, 1955, 1956, 1957,
-     1958, 1960, 1961, 1962, 1963, 1964, 1965, 1966, 1967, 1968,
-     1969, 1970, 1971, 1972, 1973, 1974, 1972, 1975, 1976, 1977,
-     1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987,
-     1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-     1999, 2000, 2001, 2002, 2004, 1976, 1978, 2006, 2008, 2010,
-     2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020,
-     2021, 2022, 2023, 2024, 2025, 2027, 2029, 2030, 2031, 2032,
-
-     2033, 2034, 2035, 2036, 2037, 2038, 2039, 2040, 2042, 2043,
-     2044, 2046, 2047, 2048, 2049, 2050, 2052, 2054, 2056, 2057,
-     2025, 2059, 2027, 2060, 2061, 2062, 2063, 2064, 2065, 2066,
-     2068, 2069, 2071, 2070, 2072, 2073, 2074, 2075, 2076, 2077,
-     2079, 2080, 2081, 2082, 2083, 2085, 2086, 2087, 2088, 2089,
-     2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2069, 2070,
-     2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 2109,
-     2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118, 2119,
-     2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129,
-     2130, 2104, 2131, 2132, 2133, 2134, 2135, 2136, 2139, 2140,
-
-     2141, 2143, 2144, 2145, 2146, 2148, 2149, 2150, 2151, 2156,
-     2160, 2161, 2162, 2163, 2164, 2165, 2166, 2168, 2169, 2171,
-     2172, 2173, 2174, 2175, 2176, 2177, 2178, 2180, 2181, 2182,
-     2183, 2184, 2185, 2187, 2188, 2190, 2192, 2193, 2194, 2195,
-     2196, 2197, 2199, 2200, 2201, 2202, 2203, 2202, 2204, 2205,
-     2206, 2208, 2209, 2212, 2213, 2214, 2215, 2216, 2217, 2218,
-     2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228,
-     2230, 2231, 2232, 2233, 2236, 2237, 2238, 2239, 2241, 2242,
-     2244, 2246, 2248, 2249, 2250, 2251, 2252, 2253, 2254, 2256,
-     2261, 2261, 2261, 2262, 2262, 2262, 2263, 2264, 2263, 2265,
-
-     2265, 2265, 2266, 2266, 2266, 2267,  749, 2267, 2268, 2268,
-     2268,  748,  747,  746,  745,  744,  743,  735,  734,  733,
-      732,  731,  730,  729,  728,  727,  726,  725,  723,  722,
-      721,  719,  718,  717,  716,  715,  714,  713,  712,  711,
-      710,  709,  708,  707,  705,  704,  703,  702,  700,  699,
-      698,  697,  696,  694,  692,  691,  690,  689,  688,  687,
-      686,  685,  684,  682,  681,  680,  679,  677,  676,  675,
-      674,  673,  672,  671,  670,  669,  668,  667,  666,  665,
-      664,  663,  662,  661,  659,  658,  657,  656,  655,  654,
-      651,  650,  649,  648,  647,  646,  644,  643,  642,  641,
-
-      640,  639,  638,  637,  636,  635,  634,  633,  632,  631,
-      630,  628,  627,  626,  625,  624,  623,  622,  621,  620,
-      619,  618,  617,  616,  615,  613,  612,  611,  610,  609,
-      606,  603,  595,  594,  593,  592,  589,  586,  584,  582,
-      581,  580,  579,  578,  577,  576,  575,  574,  573,  572,
-      571,  570,  568,  567,  566,  565,  564,  563,  561,  560,
-      559,  558,  557,  556,  555,  554,  553,  552,  551,  550,
-      548,  547,  545,  544,  543,  542,  541,  540,  539,  538,
-      537,  536,  535,  534,  532,  531,  529,  528,  527,  526,
-      525,  524,  522,  521,  520,  519,  518,  517,  516,  515,
-
-      514,  513,  512,  511,  510,  509,  508,  507,  505,  504,
-      503,  501,  500,  498,  497,  496,  495,  494,  493,  492,
-      491,  489,  488,  486,  485,  484,  482,  480,  479,  478,
-      477,  476,  475,  473,  472,  470,  469,  468,  467,  466,
-      465,  463,  458,  456,  455,  454,  452,  449,  448,  446,
-      445,  444,  443,  442,  441,  440,  439,  438,  437,  436,
-      435,  434,  433,  432,  431,  430,  429,  428,  426,  425,
-      424,  423,  422,  421,  420,  418,  417,  416,  414,  413,
-      412,  410,  408,  407,  406,  405,  404,  403,  402,  401,
-      400,  399,  398,  397,  394,  393,  391,  390,  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,  361,  359,  358,  357,  356,  354,  353,
-      352,  351,  350,  349,  348,  347,  346,  345,  344,  343,
-      342,  341,  340,  339,  337,  335,  333,  328,  326,  323,
-      316,  315,  314,  313,  312,  311,  309,  308,  307,  306,
-      304,  303,  302,  300,  299,  298,  297,  296,  295,  294,
-      293,  292,  291,  290,  289,  288,  286,  284,  283,  282,
-      281,  280,  279,  278,  276,  275,  273,  272,  271,  270,
-      269,  267,  266,  265,  264,  262,  261,  260,  259,  258,
-
-      257,  256,  254,  253,  251,  250,  249,  248,  247,  246,
-      245,  244,  243,  242,  241,  240,  239,  238,  237,  236,
-      235,  234,  233,  232,  231,  230,  229,  228,  225,  224,
-      223,  222,  221,  220,  219,  218,  217,  216,  214,  210,
-      208,  206,  203,  198,  194,  186,  185,  184,  182,  180,
-      179,  176,  175,  174,  172,  171,  170,  168,  166,  165,
-      164,  162,  161,  159,  158,  155,  154,  153,  152,  150,
-      149,  148,  146,  145,  144,  142,  136,  135,  134,  133,
-      131,  130,  129,  127,  126,  125,  123,  122,  121,  117,
-      112,  107,  106,   99,   98,   78,   73,   67,   60,   53,
-
-       50,   49,   43,   41,   39,   38,   24,   14,   11, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260, 2260,
-     2260, 2260, 2260, 2260, 2260, 2260
+      142,  757,   84,  120,   82,  142,  103,   85,   90,   90,
+       90,   90,   90,  124,  120,  128,  141,  148,  174,  141,
+      152,  157,  124,  141,  128,  128,  124,  170,   84,  161,
+
+      148,  170,  174,   85,  179,  170,  178,  182,  168,  103,
+      179,  152,  184,  103,  161,  161,  161,  103,  276,  758,
+      157,  289,  190,  279,  289,  103,  184,  189,  276,  103,
+      759,  103,  103,  119,  178,  191,  182,  192,  279,  201,
+      193,  119,  119,  119,  119,  119,  168,  168,  168,  190,
+      119,  119,  119,  119,  119,  119,  189,  168,  194,  168,
+      197,  191,  168,  198,  168,  168,  192,  193,  201,  202,
+      205,  265,  206,  208,  210,  216,  119,  119,  119,  119,
+      119,  119,  270,  287,  194,  303,  197,  303,  307,  198,
+      326,  287,  760,  307,  312,  319,  205,  202,  206,  208,
+
+      322,  216,  210,  214,  214,  214,  214,  214,  270,  327,
+      228,  329,  214,  214,  214,  214,  214,  214,  228,  326,
+      312,  319,  332,  333,  228,  362,  322,  265,  340,  395,
+      265,  362,  378,  418,  312,  395,  327,  329,  214,  214,
+      214,  214,  214,  214,  357,  761,  399,  474,  398,  357,
+      333,  332,  338,  338,  338,  338,  338,  340,  398,  474,
+      763,  338,  338,  338,  338,  338,  338,  377,  392,  392,
+      392,  412,  377,  414,  392,  399,  412,  414,  422,  430,
+      456,  450,  422,  430,  462,  418,  450,  338,  338,  338,
+      338,  338,  338,  378,  464,  490,  464,  467,  573,  486,
+
+      503,  537,  527,  486,  595,  503,  537,  595,  490,  456,
+      462,  486,  527,  486,  486,  486,  486,  486,  618,  606,
+      566,  605,  464,  377,  464,  566,  467,  633,  377,  604,
+      633,  612,  412,  465,  465,  465,  465,  465,  612,  600,
+      665,  665,  465,  465,  465,  465,  465,  465,  606,  605,
+      686,  608,  688,  573,  600,  604,  608,  688,  686,  700,
+      743,  744,  746,  729,  700,  600,  745,  764,  465,  465,
+      465,  465,  465,  465,  618,  729,  747,  762,  762,  765,
+      762,  766,  767,  600,  768,  769,  770,  771,  744,  743,
+      772,  746,  773,  745,  688,  774,  775,  776,  777,  778,
+
+      779,  780,  747,  781,  782,  783,  700,  784,  785,  786,
+      787,  784,  788,  789,  790,  784,  791,  792,  793,  794,
+      795,  796,  797,  798,  799,  800,  801,  802,  803,  804,
+      805,  806,  807,  808,  809,  810,  811,  812,  813,  814,
+      815,  813,  816,  818,  819,  820,  821,  822,  823,  824,
+      825,  826,  827,  829,  830,  831,  832,  833,  834,  835,
+      836,  837,  838,  839,  840,  842,  843,  844,  845,  846,
+      847,  848,  849,  850,  851,  852,  853,  854,  855,  856,
+      857,  858,  859,  860,  861,  862,  863,  864,  865,  859,
+      866,  861,  867,  868,  870,  861,  871,  872,  873,  874,
+
+      875,  865,  876,  865,  877,  878,  879,  865,  880,  881,
+      882,  883,  884,  885,  886,  887,  888,  889,  890,  891,
+      892,  893,  894,  895,  896,  897,  900,  901,  902,  903,
+      904,  905,  906,  907,  908,  909,  910,  882,  911,  912,
+      883,  913,  914,  886,  915,  916,  917,  918,  919,  920,
+      921,  922,  923,  924,  925,  926,  927,  928,  929,  930,
+      931,  932,  933,  935,  936,  937,  938,  939,  940,  941,
+      942,  943,  939,  944,  945,  946,  947,  948,  949,  950,
+      953,  954,  955,  956,  957,  958,  959,  961,  962,  963,
+      964,  965,  966,  968,  969,  970,  971,  972,  973,  970,
+
+      974,  975,  976,  978,  979,  982,  983,  976,  984,  985,
+      986,  987,  988,  989,  990,  991,  992,  993,  994,  995,
+      996,  997,  998,  999, 1000, 1001, 1002, 1003, 1004, 1005,
+     1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1003,
+     1015, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025,
+     1026, 1027, 1028, 1029, 1030, 1033, 1031, 1034, 1035, 1032,
+     1036, 1037, 1038, 1040, 1041, 1042, 1043, 1044, 1045, 1046,
+     1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056,
+     1029, 1028, 1057, 1030, 1031, 1032, 1058, 1059, 1060, 1061,
+     1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071,
+
+     1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081,
+     1083, 1084, 1085, 1086, 1087, 1088, 1089, 1091, 1092, 1087,
+     1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102,
+     1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112,
+     1113, 1114, 1115, 1116, 1118, 1119, 1121, 1122, 1124, 1125,
+     1126, 1127, 1129, 1130, 1131, 1132, 1133, 1134, 1135, 1136,
+     1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146,
+     1148, 1149, 1150, 1151, 1152, 1087, 1153, 1154, 1155, 1156,
+     1157, 1158, 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166,
+     1167, 1168, 1170, 1169, 1171, 1173, 1174, 1175, 1176, 1177,
+
+     1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1187, 1188,
+     1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197, 1167,
+     1169, 1170, 1171, 1198, 1199, 1200, 1201, 1203, 1204, 1206,
+     1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216,
+     1217, 1218, 1219, 1220, 1221, 1222, 1223, 1225, 1226, 1227,
+     1228, 1229, 1230, 1226, 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, 1267,
+     1268, 1269, 1270, 1271, 1272, 1274, 1275, 1278, 1279, 1280,
+
+     1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, 1290,
+     1291, 1292, 1293, 1294, 1295, 1296, 1298, 1299, 1300, 1301,
+     1302, 1304, 1303, 1305, 1306, 1307, 1308, 1309, 1310, 1311,
+     1312, 1313, 1314, 1315, 1316, 1317, 1318, 1320, 1321, 1322,
+     1323, 1324, 1325, 1326, 1327, 1301, 1328, 1300, 1303, 1302,
+     1304, 1329, 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338,
+     1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 1348,
+     1349, 1350, 1353, 1355, 1356, 1357, 1358, 1359, 1360, 1361,
+     1362, 1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371,
+     1373, 1375, 1376, 1377, 1379, 1380, 1381, 1383, 1384, 1385,
+
+     1386, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397,
+     1398, 1399, 1400, 1401, 1402, 1403, 1405, 1406, 1407, 1408,
+     1409, 1410, 1411, 1412, 1413, 1416, 1417, 1418, 1419, 1420,
+     1421, 1422, 1423, 1424, 1425, 1426, 1427, 1428, 1430, 1431,
+     1432, 1433, 1434, 1436, 1437, 1438, 1439, 1440, 1441, 1442,
+     1443, 1444, 1445, 1446, 1447, 1448, 1449, 1450, 1451, 1452,
+     1453, 1425, 1426, 1454, 1455, 1427, 1456, 1457, 1458, 1459,
+     1460, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1470,
+     1471, 1472, 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1480,
+     1436, 1482, 1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490,
+
+     1491, 1484, 1492, 1493, 1495, 1496, 1497, 1498, 1499, 1500,
+     1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508, 1510, 1511,
+     1512, 1513, 1517, 1515, 1511, 1515, 1518, 1519, 1523, 1524,
+     1525, 1526, 1527, 1528, 1529, 1530, 1531, 1532, 1533, 1534,
+     1535, 1536, 1539, 1537, 1540, 1541, 1542, 1543, 1545, 1546,
+     1547, 1548, 1549, 1550, 1551, 1552, 1553, 1554, 1555, 1556,
+     1557, 1558, 1559, 1560, 1561, 1536, 1535, 1562, 1534, 1537,
+     1563, 1564, 1566, 1567, 1569, 1570, 1571, 1572, 1573, 1574,
+     1575, 1576, 1577, 1578, 1579, 1580, 1582, 1584, 1586, 1587,
+     1589, 1590, 1591, 1536, 1592, 1593, 1594, 1595, 1596, 1597,
+
+     1598, 1600, 1601, 1602, 1603, 1604, 1605, 1606, 1608, 1612,
+     1613, 1615, 1616, 1618, 1619, 1618, 1620, 1621, 1618, 1622,
+     1623, 1618, 1624, 1625, 1626, 1627, 1628, 1629, 1630, 1631,
+     1633, 1635, 1636, 1637, 1638, 1640, 1639, 1641, 1642, 1644,
+     1645, 1647, 1649, 1650, 1651, 1652, 1653, 1654, 1655, 1656,
+     1658, 1659, 1657, 1660, 1661, 1662, 1663, 1664, 1666, 1667,
+     1637, 1638, 1639, 1657, 1640, 1641, 1668, 1669, 1671, 1672,
+     1673, 1674, 1675, 1676, 1677, 1678, 1679, 1679, 1680, 1681,
+     1682, 1683, 1684, 1685, 1686, 1687, 1688, 1689, 1690, 1691,
+     1692, 1693, 1694, 1695, 1696, 1697, 1698, 1699, 1700, 1702,
+
+     1703, 1704, 1705, 1706, 1707, 1708, 1709, 1653, 1710, 1711,
+     1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, 1721, 1723,
+     1724, 1725, 1727, 1728, 1730, 1729, 1731, 1733, 1734, 1737,
+     1738, 1739, 1741, 1743, 1744, 1745, 1746, 1747, 1748, 1680,
+     1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1758, 1728,
+     1760, 1727, 1729, 1730, 1759, 1731, 1761, 1762, 1763, 1759,
+     1764, 1765, 1766, 1767, 1769, 1770, 1771, 1773, 1774, 1776,
+     1777, 1778, 1780, 1781, 1782, 1783, 1784, 1785, 1788, 1789,
+     1790, 1791, 1792, 1793, 1794, 1795, 1796, 1797, 1798, 1799,
+     1800, 1801, 1802, 1803, 1805, 1806, 1807, 1808, 1809, 1810,
+
+     1812, 1759, 1813, 1814, 1815, 1816, 1818, 1819, 1820, 1823,
+     1824, 1825, 1826, 1827, 1828, 1829, 1830, 1831, 1832, 1833,
+     1834, 1835, 1836, 1837, 1839, 1840, 1841, 1812, 1842, 1814,
+     1843, 1844, 1846, 1847, 1848, 1850, 1851, 1852, 1853, 1854,
+     1855, 1856, 1857, 1858, 1859, 1861, 1862, 1863, 1864, 1865,
+     1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875,
+     1876, 1877, 1879, 1881, 1882, 1883, 1877, 1884, 1885, 1887,
+     1890, 1888, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899,
+     1901, 1902, 1903, 1904, 1905, 1906, 1907, 1908, 1909, 1910,
+     1911, 1912, 1913, 1914, 1915, 1916, 1887, 1888, 1917, 1918,
+
+     1919, 1920, 1921, 1923, 1924, 1925, 1926, 1928, 1929, 1930,
+     1931, 1932, 1933, 1934, 1935, 1936, 1937, 1938, 1939, 1941,
+     1943, 1944, 1945, 1946, 1949, 1950, 1951, 1952, 1953, 1954,
+     1955, 1956, 1957, 1958, 1959, 1960, 1962, 1963, 1964, 1965,
+     1966, 1967, 1968, 1969, 1971, 1972, 1973, 1974, 1975, 1976,
+     1979, 1950, 1951, 1980, 1952, 1981, 1982, 1983, 1984, 1985,
+     1986, 1987, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
+     1997, 1998, 1999, 2000, 2001, 2002, 2003, 2001, 2004, 2005,
+     2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
+     2016, 2017, 2018, 2020, 2021, 2022, 2023, 2024, 2025, 2026,
+
+     2027, 2028, 2029, 2030, 2031, 2032, 2005, 2007, 2034, 2036,
+     2038, 2039, 2041, 2042, 2043, 2044, 2045, 2046, 2047, 2048,
+     2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2058, 2060,
+     2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 2070,
+     2071, 2072, 2074, 2075, 2076, 2078, 2079, 2080, 2081, 2082,
+     2084, 2085, 2087, 2056, 2089, 2058, 2090, 2092, 2093, 2094,
+     2095, 2096, 2097, 2098, 2099, 2101, 2102, 2104, 2103, 2105,
+     2106, 2107, 2108, 2109, 2110, 2112, 2113, 2114, 2115, 2116,
+     2117, 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127,
+     2128, 2129, 2130, 2102, 2103, 2131, 2132, 2134, 2135, 2136,
+
+     2137, 2138, 2139, 2140, 2141, 2142, 2144, 2145, 2146, 2147,
+     2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155, 2156, 2157,
+     2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2139, 2166,
+     2167, 2168, 2169, 2170, 2171, 2172, 2173, 2176, 2177, 2178,
+     2180, 2181, 2182, 2183, 2185, 2186, 2187, 2188, 2189, 2194,
+     2195, 2199, 2200, 2201, 2202, 2203, 2204, 2205, 2207, 2208,
+     2210, 2211, 2212, 2213, 2214, 2215, 2216, 2217, 2218, 2221,
+     2222, 2223, 2224, 2225, 2226, 2228, 2229, 2231, 2233, 2234,
+     2235, 2236, 2237, 2238, 2239, 2241, 2242, 2243, 2244, 2245,
+     2244, 2246, 2247, 2248, 2249, 2251, 2252, 2255, 2256, 2257,
+
+     2258, 2259, 2260, 2261, 2262, 2263, 2264, 2265, 2266, 2267,
+     2268, 2269, 2270, 2271, 2272, 2274, 2275, 2277, 2278, 2281,
+     2282, 2283, 2284, 2286, 2287, 2289, 2291, 2293, 2294, 2295,
+     2296, 2297, 2298, 2299, 2301, 2306, 2306, 2306, 2307, 2307,
+     2307, 2308, 2309, 2308, 2310, 2310, 2310, 2311, 2311, 2311,
+     2312,  750, 2312, 2313, 2313, 2313,  749,  748,  740,  739,
+      738,  737,  736,  735,  734,  733,  732,  731,  730,  728,
+      727,  726,  724,  723,  722,  721,  720,  719,  718,  717,
+      716,  715,  714,  713,  712,  710,  709,  708,  707,  705,
+      704,  703,  702,  701,  699,  697,  696,  695,  694,  693,
+
+      692,  691,  690,  689,  687,  685,  684,  682,  681,  680,
+      679,  678,  677,  676,  675,  674,  673,  672,  671,  670,
+      669,  668,  667,  666,  664,  663,  662,  661,  660,  659,
+      656,  655,  654,  653,  652,  651,  649,  648,  647,  646,
+      645,  644,  643,  642,  641,  640,  639,  638,  637,  636,
+      635,  634,  632,  631,  630,  629,  628,  627,  626,  625,
+      624,  623,  622,  621,  620,  619,  617,  616,  615,  614,
+      613,  610,  607,  599,  598,  597,  596,  593,  590,  588,
+      586,  585,  584,  583,  582,  581,  580,  579,  578,  577,
+      576,  575,  574,  572,  571,  570,  569,  568,  567,  565,
+
+      564,  563,  562,  561,  560,  559,  558,  557,  556,  555,
+      554,  552,  551,  549,  548,  547,  546,  545,  544,  543,
+      542,  541,  540,  539,  538,  536,  535,  533,  532,  531,
+      530,  529,  528,  526,  525,  524,  523,  522,  521,  520,
+      519,  518,  517,  516,  515,  514,  513,  512,  511,  509,
+      508,  507,  505,  504,  502,  501,  500,  499,  498,  497,
+      496,  495,  494,  492,  491,  489,  488,  487,  485,  483,
+      482,  481,  480,  479,  478,  476,  475,  473,  472,  471,
+      470,  469,  468,  466,  461,  459,  458,  457,  455,  452,
+      451,  449,  448,  447,  446,  445,  444,  443,  442,  441,
+
+      440,  439,  438,  437,  436,  435,  434,  433,  432,  431,
+      429,  428,  427,  426,  425,  424,  423,  421,  420,  419,
+      417,  416,  415,  413,  411,  410,  409,  408,  407,  406,
+      405,  404,  403,  402,  401,  400,  397,  396,  394,  393,
+      391,  390,  389,  388,  387,  386,  385,  384,  383,  382,
+      381,  380,  379,  376,  375,  374,  373,  372,  371,  370,
+      369,  368,  367,  366,  365,  364,  363,  361,  360,  359,
+      358,  356,  355,  354,  353,  352,  351,  350,  349,  348,
+      347,  346,  345,  344,  343,  342,  341,  339,  337,  335,
+      330,  328,  325,  318,  317,  316,  315,  314,  313,  311,
+
+      310,  309,  308,  306,  305,  304,  302,  301,  300,  299,
+      298,  297,  296,  295,  294,  293,  292,  291,  290,  288,
+      286,  285,  284,  283,  282,  281,  280,  278,  277,  275,
+      274,  273,  272,  271,  269,  268,  267,  266,  264,  263,
+      262,  261,  260,  259,  258,  256,  255,  253,  252,  251,
+      250,  249,  248,  247,  246,  245,  244,  243,  242,  241,
+      240,  239,  238,  237,  236,  235,  234,  233,  232,  231,
+      230,  229,  226,  225,  224,  223,  222,  221,  220,  219,
+      218,  217,  215,  211,  209,  207,  204,  199,  195,  187,
+      186,  185,  183,  181,  180,  177,  176,  175,  173,  172,
+
+      171,  169,  167,  166,  165,  163,  162,  160,  159,  156,
+      155,  154,  153,  151,  150,  149,  147,  146,  145,  143,
+      138,  136,  135,  134,  133,  131,  130,  129,  127,  126,
+      125,  123,  122,  121,  117,  112,  107,  106,   99,   98,
+       78,   73,   67,   60,   53,   50,   49,   43,   41,   39,
+       38,   24,   14,   11, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305, 2305,
+     2305
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -2128,7 +2158,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[238] =
+static const flex_int16_t yy_rule_linenum[240] =
     {   0,
       149,  151,  153,  158,  159,  164,  165,  166,  178,  181,
       186,  193,  202,  211,  220,  229,  238,  247,  256,  265,
@@ -2146,16 +2176,16 @@ static const flex_int16_t yy_rule_linenum[238] =
      1317, 1343, 1352, 1362, 1372, 1381, 1391, 1402, 1413, 1424,
      1434, 1443, 1452, 1461, 1472, 1483, 1494, 1505, 1516, 1525,
      1534, 1543, 1552, 1561, 1570, 1579, 1588, 1597, 1606, 1617,
-     1629, 1642, 1651, 1660, 1669, 1679, 1689, 1698, 1707, 1718,
-     1728, 1737, 1747, 1757, 1766, 1775, 1784, 1793, 1803, 1812,
-     1821, 1830, 1839, 1848, 1857, 1866, 1875, 1884, 1893, 1902,
-     1911, 1920, 1929, 1938, 1947, 1956, 1965, 1974, 1983, 1992,
-     2001, 2010, 2019, 2028, 2037, 2046, 2055, 2064, 2073, 2082,
-
-     2091, 2100, 2109, 2118, 2127, 2136, 2145, 2154, 2163, 2172,
-     2181, 2190, 2199, 2208, 2217, 2226, 2235, 2244, 2253, 2354,
-     2370, 2419, 2427, 2442, 2443, 2444, 2445, 2446, 2447, 2449,
-     2467, 2480, 2485, 2489, 2491, 2493, 2495
+     1629, 1641, 1654, 1663, 1672, 1681, 1690, 1700, 1710, 1719,
+     1728, 1739, 1749, 1758, 1768, 1778, 1787, 1796, 1805, 1814,
+     1824, 1833, 1842, 1851, 1860, 1869, 1878, 1887, 1896, 1905,
+     1914, 1923, 1932, 1941, 1950, 1959, 1968, 1977, 1986, 1995,
+     2004, 2013, 2022, 2031, 2040, 2049, 2058, 2067, 2076, 2085,
+
+     2094, 2103, 2112, 2121, 2130, 2139, 2148, 2157, 2166, 2175,
+     2184, 2193, 2202, 2211, 2220, 2229, 2238, 2247, 2256, 2265,
+     2274, 2375, 2391, 2440, 2448, 2463, 2464, 2465, 2466, 2467,
+     2468, 2470, 2488, 2501, 2506, 2510, 2512, 2514, 2516
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -2210,7 +2240,7 @@ using namespace isc::dhcp;
 
 /* To avoid the call to exit... oops! */
 #define YY_FATAL_ERROR(msg) isc::dhcp::Parser6Context::fatal(msg)
-#line 2214 "dhcp6_lexer.cc"
+#line 2244 "dhcp6_lexer.cc"
 /* noyywrap disables automatic rewinding for the next file to parse. Since we
    always parse only a single string, there's no need to do any wraps. And
    using yywrap requires linking with -lfl, which provides the default yywrap
@@ -2236,8 +2266,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 2240 "dhcp6_lexer.cc"
-#line 2241 "dhcp6_lexer.cc"
+#line 2270 "dhcp6_lexer.cc"
+#line 2271 "dhcp6_lexer.cc"
 
 #define INITIAL 0
 #define COMMENT 1
@@ -2567,7 +2597,7 @@ YY_DECL
     }
 
 
-#line 2571 "dhcp6_lexer.cc"
+#line 2601 "dhcp6_lexer.cc"
 
        while ( /*CONSTCOND*/1 )                /* loops until end-of-file is reached */
                {
@@ -2596,13 +2626,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 >= 2261 )
+                               if ( yy_current_state >= 2306 )
                                        yy_c = yy_meta[yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
                        ++yy_cp;
                        }
-               while ( yy_current_state != 2260 );
+               while ( yy_current_state != 2305 );
                yy_cp = (yy_last_accepting_cpos);
                yy_current_state = (yy_last_accepting_state);
 
@@ -2621,13 +2651,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 < 238 )
+                       else if ( yy_act < 240 )
                                fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
                                         (long)yy_rule_linenum[yy_act], yytext );
-                       else if ( yy_act == 238 )
+                       else if ( yy_act == 240 )
                                fprintf( stderr, "--accepting default rule (\"%s\")\n",
                                         yytext );
-                       else if ( yy_act == 239 )
+                       else if ( yy_act == 241 )
                                fprintf( stderr, "--(end of buffer or a NUL)\n" );
                        else
                                fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
@@ -4584,6 +4614,21 @@ YY_RULE_SETUP
 case 151:
 YY_RULE_SETUP
 #line 1629 "dhcp6_lexer.ll"
+{
+    switch(driver.ctx_) {
+    case isc::dhcp::Parser6Context::SUBNET6:
+    case isc::dhcp::Parser6Context::POOLS:
+    case isc::dhcp::Parser6Context::PD_POOLS:
+    case isc::dhcp::Parser6Context::SHARED_NETWORK:
+        return isc::dhcp::Dhcp6Parser::make_EVALUATE_ADDITIONAL_CLASSES(driver.loc_);
+    default:
+        return isc::dhcp::Dhcp6Parser::make_STRING("evaluate-additional-classes", driver.loc_);
+    }
+}
+       YY_BREAK
+case 152:
+YY_RULE_SETUP
+#line 1641 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -4597,9 +4642,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 152:
+case 153:
 YY_RULE_SETUP
-#line 1642 "dhcp6_lexer.ll"
+#line 1654 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CLIENT_CLASSES:
@@ -4609,9 +4654,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 153:
+case 154:
 YY_RULE_SETUP
-#line 1651 "dhcp6_lexer.ll"
+#line 1663 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CLIENT_CLASSES:
@@ -4621,9 +4666,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 154:
+case 155:
 YY_RULE_SETUP
-#line 1660 "dhcp6_lexer.ll"
+#line 1672 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CLIENT_CLASSES:
@@ -4633,9 +4678,21 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 155:
+case 156:
 YY_RULE_SETUP
-#line 1669 "dhcp6_lexer.ll"
+#line 1681 "dhcp6_lexer.ll"
+{
+    switch(driver.ctx_) {
+    case isc::dhcp::Parser6Context::CLIENT_CLASSES:
+        return isc::dhcp::Dhcp6Parser::make_ONLY_IN_ADDITIONAL_LIST(driver.loc_);
+    default:
+        return isc::dhcp::Dhcp6Parser::make_STRING("only-in-additional-list", driver.loc_);
+    }
+}
+       YY_BREAK
+case 157:
+YY_RULE_SETUP
+#line 1690 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4646,9 +4703,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 156:
+case 158:
 YY_RULE_SETUP
-#line 1679 "dhcp6_lexer.ll"
+#line 1700 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -4659,9 +4716,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 157:
+case 159:
 YY_RULE_SETUP
-#line 1689 "dhcp6_lexer.ll"
+#line 1710 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -4671,9 +4728,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 158:
+case 160:
 YY_RULE_SETUP
-#line 1698 "dhcp6_lexer.ll"
+#line 1719 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -4683,9 +4740,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 159:
+case 161:
 YY_RULE_SETUP
-#line 1707 "dhcp6_lexer.ll"
+#line 1728 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::MAC_SOURCES:
@@ -4697,9 +4754,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 160:
+case 162:
 YY_RULE_SETUP
-#line 1718 "dhcp6_lexer.ll"
+#line 1739 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS:
@@ -4710,9 +4767,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 161:
+case 163:
 YY_RULE_SETUP
-#line 1728 "dhcp6_lexer.ll"
+#line 1749 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -4722,9 +4779,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 162:
+case 164:
 YY_RULE_SETUP
-#line 1737 "dhcp6_lexer.ll"
+#line 1758 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS:
@@ -4735,9 +4792,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 163:
+case 165:
 YY_RULE_SETUP
-#line 1747 "dhcp6_lexer.ll"
+#line 1768 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -4748,9 +4805,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 164:
+case 166:
 YY_RULE_SETUP
-#line 1757 "dhcp6_lexer.ll"
+#line 1778 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DATA:
@@ -4760,9 +4817,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 165:
+case 167:
 YY_RULE_SETUP
-#line 1766 "dhcp6_lexer.ll"
+#line 1787 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -4772,9 +4829,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 166:
+case 168:
 YY_RULE_SETUP
-#line 1775 "dhcp6_lexer.ll"
+#line 1796 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -4784,9 +4841,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 167:
+case 169:
 YY_RULE_SETUP
-#line 1784 "dhcp6_lexer.ll"
+#line 1805 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -4796,9 +4853,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 168:
+case 170:
 YY_RULE_SETUP
-#line 1793 "dhcp6_lexer.ll"
+#line 1814 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -4809,9 +4866,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 169:
+case 171:
 YY_RULE_SETUP
-#line 1803 "dhcp6_lexer.ll"
+#line 1824 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4821,9 +4878,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 170:
+case 172:
 YY_RULE_SETUP
-#line 1812 "dhcp6_lexer.ll"
+#line 1833 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOOKS_LIBRARIES:
@@ -4833,9 +4890,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 171:
+case 173:
 YY_RULE_SETUP
-#line 1821 "dhcp6_lexer.ll"
+#line 1842 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOOKS_LIBRARIES:
@@ -4845,9 +4902,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 172:
+case 174:
 YY_RULE_SETUP
-#line 1830 "dhcp6_lexer.ll"
+#line 1851 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4857,9 +4914,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 173:
+case 175:
 YY_RULE_SETUP
-#line 1839 "dhcp6_lexer.ll"
+#line 1860 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -4869,9 +4926,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 174:
+case 176:
 YY_RULE_SETUP
-#line 1848 "dhcp6_lexer.ll"
+#line 1869 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -4881,9 +4938,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 175:
+case 177:
 YY_RULE_SETUP
-#line 1857 "dhcp6_lexer.ll"
+#line 1878 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -4893,9 +4950,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 176:
+case 178:
 YY_RULE_SETUP
-#line 1866 "dhcp6_lexer.ll"
+#line 1887 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -4905,9 +4962,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 177:
+case 179:
 YY_RULE_SETUP
-#line 1875 "dhcp6_lexer.ll"
+#line 1896 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -4917,9 +4974,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 178:
+case 180:
 YY_RULE_SETUP
-#line 1884 "dhcp6_lexer.ll"
+#line 1905 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -4929,9 +4986,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 179:
+case 181:
 YY_RULE_SETUP
-#line 1893 "dhcp6_lexer.ll"
+#line 1914 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -4941,9 +4998,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 180:
+case 182:
 YY_RULE_SETUP
-#line 1902 "dhcp6_lexer.ll"
+#line 1923 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -4953,9 +5010,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 181:
+case 183:
 YY_RULE_SETUP
-#line 1911 "dhcp6_lexer.ll"
+#line 1932 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4965,9 +5022,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 182:
+case 184:
 YY_RULE_SETUP
-#line 1920 "dhcp6_lexer.ll"
+#line 1941 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4977,9 +5034,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 183:
+case 185:
 YY_RULE_SETUP
-#line 1929 "dhcp6_lexer.ll"
+#line 1950 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -4989,9 +5046,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 184:
+case 186:
 YY_RULE_SETUP
-#line 1938 "dhcp6_lexer.ll"
+#line 1959 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -5001,9 +5058,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 185:
+case 187:
 YY_RULE_SETUP
-#line 1947 "dhcp6_lexer.ll"
+#line 1968 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -5013,9 +5070,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 186:
+case 188:
 YY_RULE_SETUP
-#line 1956 "dhcp6_lexer.ll"
+#line 1977 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -5025,9 +5082,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 187:
+case 189:
 YY_RULE_SETUP
-#line 1965 "dhcp6_lexer.ll"
+#line 1986 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -5037,9 +5094,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 188:
+case 190:
 YY_RULE_SETUP
-#line 1974 "dhcp6_lexer.ll"
+#line 1995 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -5049,9 +5106,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 189:
+case 191:
 YY_RULE_SETUP
-#line 1983 "dhcp6_lexer.ll"
+#line 2004 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP_MULTI_THREADING:
@@ -5061,9 +5118,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 190:
+case 192:
 YY_RULE_SETUP
-#line 1992 "dhcp6_lexer.ll"
+#line 2013 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP_MULTI_THREADING:
@@ -5073,9 +5130,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 191:
+case 193:
 YY_RULE_SETUP
-#line 2001 "dhcp6_lexer.ll"
+#line 2022 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP_MULTI_THREADING:
@@ -5085,9 +5142,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 192:
+case 194:
 YY_RULE_SETUP
-#line 2010 "dhcp6_lexer.ll"
+#line 2031 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -5097,9 +5154,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 193:
+case 195:
 YY_RULE_SETUP
-#line 2019 "dhcp6_lexer.ll"
+#line 2040 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -5109,9 +5166,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 194:
+case 196:
 YY_RULE_SETUP
-#line 2028 "dhcp6_lexer.ll"
+#line 2049 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -5121,9 +5178,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 195:
+case 197:
 YY_RULE_SETUP
-#line 2037 "dhcp6_lexer.ll"
+#line 2058 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET_TYPE:
@@ -5133,9 +5190,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 196:
+case 198:
 YY_RULE_SETUP
-#line 2046 "dhcp6_lexer.ll"
+#line 2067 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET_TYPE:
@@ -5145,9 +5202,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 197:
+case 199:
 YY_RULE_SETUP
-#line 2055 "dhcp6_lexer.ll"
+#line 2076 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET_TYPE:
@@ -5157,9 +5214,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 198:
+case 200:
 YY_RULE_SETUP
-#line 2064 "dhcp6_lexer.ll"
+#line 2085 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -5169,9 +5226,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 199:
+case 201:
 YY_RULE_SETUP
-#line 2073 "dhcp6_lexer.ll"
+#line 2094 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -5181,9 +5238,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 200:
+case 202:
 YY_RULE_SETUP
-#line 2082 "dhcp6_lexer.ll"
+#line 2103 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -5193,9 +5250,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 201:
+case 203:
 YY_RULE_SETUP
-#line 2091 "dhcp6_lexer.ll"
+#line 2112 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -5205,9 +5262,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 202:
+case 204:
 YY_RULE_SETUP
-#line 2100 "dhcp6_lexer.ll"
+#line 2121 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::AUTH_TYPE:
@@ -5217,9 +5274,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 203:
+case 205:
 YY_RULE_SETUP
-#line 2109 "dhcp6_lexer.ll"
+#line 2130 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::AUTHENTICATION:
@@ -5229,9 +5286,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 204:
+case 206:
 YY_RULE_SETUP
-#line 2118 "dhcp6_lexer.ll"
+#line 2139 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::AUTHENTICATION:
@@ -5241,9 +5298,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 205:
+case 207:
 YY_RULE_SETUP
-#line 2127 "dhcp6_lexer.ll"
+#line 2148 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::AUTHENTICATION:
@@ -5253,9 +5310,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 206:
+case 208:
 YY_RULE_SETUP
-#line 2136 "dhcp6_lexer.ll"
+#line 2157 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CLIENTS:
@@ -5265,9 +5322,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 207:
+case 209:
 YY_RULE_SETUP
-#line 2145 "dhcp6_lexer.ll"
+#line 2166 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CLIENTS:
@@ -5277,9 +5334,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 208:
+case 210:
 YY_RULE_SETUP
-#line 2154 "dhcp6_lexer.ll"
+#line 2175 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -5289,9 +5346,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 209:
+case 211:
 YY_RULE_SETUP
-#line 2163 "dhcp6_lexer.ll"
+#line 2184 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -5301,9 +5358,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 210:
+case 212:
 YY_RULE_SETUP
-#line 2172 "dhcp6_lexer.ll"
+#line 2193 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP_QUEUE_CONTROL:
@@ -5313,9 +5370,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 211:
+case 213:
 YY_RULE_SETUP
-#line 2181 "dhcp6_lexer.ll"
+#line 2202 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP_QUEUE_CONTROL:
@@ -5325,9 +5382,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 212:
+case 214:
 YY_RULE_SETUP
-#line 2190 "dhcp6_lexer.ll"
+#line 2211 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP_QUEUE_CONTROL:
@@ -5337,9 +5394,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 213:
+case 215:
 YY_RULE_SETUP
-#line 2199 "dhcp6_lexer.ll"
+#line 2220 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -5349,9 +5406,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 214:
+case 216:
 YY_RULE_SETUP
-#line 2208 "dhcp6_lexer.ll"
+#line 2229 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -5361,9 +5418,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 215:
+case 217:
 YY_RULE_SETUP
-#line 2217 "dhcp6_lexer.ll"
+#line 2238 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -5373,9 +5430,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 216:
+case 218:
 YY_RULE_SETUP
-#line 2226 "dhcp6_lexer.ll"
+#line 2247 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -5385,9 +5442,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 217:
+case 219:
 YY_RULE_SETUP
-#line 2235 "dhcp6_lexer.ll"
+#line 2256 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -5397,9 +5454,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 218:
+case 220:
 YY_RULE_SETUP
-#line 2244 "dhcp6_lexer.ll"
+#line 2265 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::COMPATIBILITY:
@@ -5409,9 +5466,9 @@ YY_RULE_SETUP
     }
 }
        YY_BREAK
-case 219:
+case 221:
 YY_RULE_SETUP
-#line 2253 "dhcp6_lexer.ll"
+#line 2274 "dhcp6_lexer.ll"
 {
     /* A string has been matched. It contains the actual string and single quotes.
        We need to get those quotes out of the way and just use its content, e.g.
@@ -5513,10 +5570,10 @@ YY_RULE_SETUP
     return isc::dhcp::Dhcp6Parser::make_STRING(decoded, driver.loc_);
 }
        YY_BREAK
-case 220:
-/* rule 220 can match eol */
+case 222:
+/* rule 222 can match eol */
 YY_RULE_SETUP
-#line 2354 "dhcp6_lexer.ll"
+#line 2375 "dhcp6_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     std::string raw(yytext+1);
@@ -5533,10 +5590,10 @@ YY_RULE_SETUP
                  pos + 1);
 }
        YY_BREAK
-case 221:
-/* rule 221 can match eol */
+case 223:
+/* rule 223 can match eol */
 YY_RULE_SETUP
-#line 2370 "dhcp6_lexer.ll"
+#line 2391 "dhcp6_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     std::string raw(yytext+1);
@@ -5586,9 +5643,9 @@ YY_RULE_SETUP
                  pos);
 }
        YY_BREAK
-case 222:
+case 224:
 YY_RULE_SETUP
-#line 2419 "dhcp6_lexer.ll"
+#line 2440 "dhcp6_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     std::string raw(yytext+1);
@@ -5597,9 +5654,9 @@ YY_RULE_SETUP
                  raw.size() + 1);
 }
        YY_BREAK
-case 223:
+case 225:
 YY_RULE_SETUP
-#line 2427 "dhcp6_lexer.ll"
+#line 2448 "dhcp6_lexer.ll"
 {
     /* Bad string with an open unicode escape at the end */
     std::string raw(yytext+1);
@@ -5615,39 +5672,39 @@ YY_RULE_SETUP
                  pos + 1);
 }
        YY_BREAK
-case 224:
+case 226:
 YY_RULE_SETUP
-#line 2442 "dhcp6_lexer.ll"
+#line 2463 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_LSQUARE_BRACKET(driver.loc_); }
        YY_BREAK
-case 225:
+case 227:
 YY_RULE_SETUP
-#line 2443 "dhcp6_lexer.ll"
+#line 2464 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_RSQUARE_BRACKET(driver.loc_); }
        YY_BREAK
-case 226:
+case 228:
 YY_RULE_SETUP
-#line 2444 "dhcp6_lexer.ll"
+#line 2465 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_LCURLY_BRACKET(driver.loc_); }
        YY_BREAK
-case 227:
+case 229:
 YY_RULE_SETUP
-#line 2445 "dhcp6_lexer.ll"
+#line 2466 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_RCURLY_BRACKET(driver.loc_); }
        YY_BREAK
-case 228:
+case 230:
 YY_RULE_SETUP
-#line 2446 "dhcp6_lexer.ll"
+#line 2467 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_COMMA(driver.loc_); }
        YY_BREAK
-case 229:
+case 231:
 YY_RULE_SETUP
-#line 2447 "dhcp6_lexer.ll"
+#line 2468 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_COLON(driver.loc_); }
        YY_BREAK
-case 230:
+case 232:
 YY_RULE_SETUP
-#line 2449 "dhcp6_lexer.ll"
+#line 2470 "dhcp6_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -5666,9 +5723,9 @@ YY_RULE_SETUP
     return isc::dhcp::Dhcp6Parser::make_INTEGER(integer, driver.loc_);
 }
        YY_BREAK
-case 231:
+case 233:
 YY_RULE_SETUP
-#line 2467 "dhcp6_lexer.ll"
+#line 2488 "dhcp6_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -5682,43 +5739,43 @@ YY_RULE_SETUP
     return isc::dhcp::Dhcp6Parser::make_FLOAT(fp, driver.loc_);
 }
        YY_BREAK
-case 232:
+case 234:
 YY_RULE_SETUP
-#line 2480 "dhcp6_lexer.ll"
+#line 2501 "dhcp6_lexer.ll"
 {
     string tmp(yytext);
     return isc::dhcp::Dhcp6Parser::make_BOOLEAN(tmp == "true", driver.loc_);
 }
        YY_BREAK
-case 233:
+case 235:
 YY_RULE_SETUP
-#line 2485 "dhcp6_lexer.ll"
+#line 2506 "dhcp6_lexer.ll"
 {
    return isc::dhcp::Dhcp6Parser::make_NULL_TYPE(driver.loc_);
 }
        YY_BREAK
-case 234:
+case 236:
 YY_RULE_SETUP
-#line 2489 "dhcp6_lexer.ll"
+#line 2510 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
        YY_BREAK
-case 235:
+case 237:
 YY_RULE_SETUP
-#line 2491 "dhcp6_lexer.ll"
+#line 2512 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
        YY_BREAK
-case 236:
+case 238:
 YY_RULE_SETUP
-#line 2493 "dhcp6_lexer.ll"
+#line 2514 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
        YY_BREAK
-case 237:
+case 239:
 YY_RULE_SETUP
-#line 2495 "dhcp6_lexer.ll"
+#line 2516 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 2497 "dhcp6_lexer.ll"
+#line 2518 "dhcp6_lexer.ll"
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp6Parser::make_END(driver.loc_);
@@ -5742,12 +5799,12 @@ case YY_STATE_EOF(INITIAL):
     BEGIN(DIR_EXIT);
 }
        YY_BREAK
-case 238:
+case 240:
 YY_RULE_SETUP
-#line 2520 "dhcp6_lexer.ll"
+#line 2541 "dhcp6_lexer.ll"
 ECHO;
        YY_BREAK
-#line 5751 "dhcp6_lexer.cc"
+#line 5808 "dhcp6_lexer.cc"
 
        case YY_END_OF_BUFFER:
                {
@@ -6066,7 +6123,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 >= 2261 )
+                       if ( yy_current_state >= 2306 )
                                yy_c = yy_meta[yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -6099,11 +6156,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 >= 2261 )
+               if ( yy_current_state >= 2306 )
                        yy_c = yy_meta[yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-       yy_is_jam = (yy_current_state == 2260);
+       yy_is_jam = (yy_current_state == 2305);
 
                return yy_is_jam ? 0 : yy_current_state;
 }
@@ -6852,7 +6909,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 2520 "dhcp6_lexer.ll"
+#line 2541 "dhcp6_lexer.ll"
 
 
 using namespace isc::dhcp;

diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll
index 073aec7db2d912d11f7dae160059bcc280a076c4..e8dac637e7828c9517c3a8cb6e2a794ea5dd311e 100644 (file)
--- a/src/bin/dhcp6/dhcp6_lexer.ll
+++ b/src/bin/dhcp6/dhcp6_lexer.ll
@@ -1625,6 +1625,18 @@ ControlCharacterFill            [^"\\]|\\["\\/bfnrtu]
     }
 }
 
+\"evaluate-additional-classes\" {
+    switch(driver.ctx_) {
+    case isc::dhcp::Parser6Context::SUBNET6:
+    case isc::dhcp::Parser6Context::POOLS:
+    case isc::dhcp::Parser6Context::PD_POOLS:
+    case isc::dhcp::Parser6Context::SHARED_NETWORK:
+        return isc::dhcp::Dhcp6Parser::make_EVALUATE_ADDITIONAL_CLASSES(driver.loc_);
+    default:
+        return isc::dhcp::Dhcp6Parser::make_STRING("evaluate-additional-classes", driver.loc_);
+    }
+}
+
 \"client-class\" {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -1665,6 +1677,15 @@ ControlCharacterFill            [^"\\]|\\["\\/bfnrtu]
     }
 }
 
+\"only-in-additional-list\" {
+    switch(driver.ctx_) {
+    case isc::dhcp::Parser6Context::CLIENT_CLASSES:
+        return isc::dhcp::Dhcp6Parser::make_ONLY_IN_ADDITIONAL_LIST(driver.loc_);
+    default:
+        return isc::dhcp::Dhcp6Parser::make_STRING("only-in-additional-list", driver.loc_);
+    }
+}
+
 \"reservations\" {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:

diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc
index 2cac8b4a677a0929f4722ab4dd45a8ae2c4b8273..f7e9784d3d86934ad976f3efa8e0778b675c0d12 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.cc
+++ b/src/bin/dhcp6/dhcp6_parser.cc
@@ -407,79 +407,79 @@ namespace isc { namespace dhcp {
         switch (yykind)
     {
       case symbol_kind::S_STRING: // "constant string"
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < std::string > (); }
 #line 413 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_INTEGER: // "integer"
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < int64_t > (); }
 #line 419 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_FLOAT: // "floating point"
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < double > (); }
 #line 425 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_BOOLEAN: // "boolean"
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < bool > (); }
 #line 431 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_value: // value
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < ElementPtr > (); }
 #line 437 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_map_value: // map_value
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < ElementPtr > (); }
 #line 443 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_ddns_replace_client_name_value: // ddns_replace_client_name_value
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < ElementPtr > (); }
 #line 449 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_ddns_conflict_resolution_mode_value: // ddns_conflict_resolution_mode_value
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < ElementPtr > (); }
 #line 455 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_on_fail_mode: // on_fail_mode
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < ElementPtr > (); }
 #line 461 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_duid_type: // duid_type
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < ElementPtr > (); }
 #line 467 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_control_socket_type_value: // control_socket_type_value
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < ElementPtr > (); }
 #line 473 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_auth_type_value: // auth_type_value
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < ElementPtr > (); }
 #line 479 "dhcp6_parser.cc"
         break;
 
       case symbol_kind::S_ncr_protocol_value: // ncr_protocol_value
-#line 316 "dhcp6_parser.yy"
+#line 318 "dhcp6_parser.yy"
                  { yyoutput << yysym.value.template as < ElementPtr > (); }
 #line 485 "dhcp6_parser.cc"
         break;
@@ -760,133 +760,133 @@ namespace isc { namespace dhcp {
           switch (yyn)
             {
   case 2: // $@1: %empty
-#line 325 "dhcp6_parser.yy"
+#line 327 "dhcp6_parser.yy"
                      { ctx.ctx_ = ctx.NO_KEYWORD; }
 #line 766 "dhcp6_parser.cc"
     break;
 
   case 4: // $@2: %empty
-#line 326 "dhcp6_parser.yy"
+#line 328 "dhcp6_parser.yy"
                       { ctx.ctx_ = ctx.CONFIG; }
 #line 772 "dhcp6_parser.cc"
     break;
 
   case 6: // $@3: %empty
-#line 327 "dhcp6_parser.yy"
+#line 329 "dhcp6_parser.yy"
                  { ctx.ctx_ = ctx.DHCP6; }
 #line 778 "dhcp6_parser.cc"
     break;
 
   case 8: // $@4: %empty
-#line 328 "dhcp6_parser.yy"
+#line 330 "dhcp6_parser.yy"
                        { ctx.ctx_ = ctx.INTERFACES_CONFIG; }
 #line 784 "dhcp6_parser.cc"
     break;
 
   case 10: // $@5: %empty
-#line 329 "dhcp6_parser.yy"
+#line 331 "dhcp6_parser.yy"
                    { ctx.ctx_ = ctx.SUBNET6; }
 #line 790 "dhcp6_parser.cc"
     break;
 
   case 12: // $@6: %empty
-#line 330 "dhcp6_parser.yy"
+#line 332 "dhcp6_parser.yy"
                  { ctx.ctx_ = ctx.POOLS; }
 #line 796 "dhcp6_parser.cc"
     break;
 
   case 14: // $@7: %empty
-#line 331 "dhcp6_parser.yy"
+#line 333 "dhcp6_parser.yy"
                    { ctx.ctx_ = ctx.PD_POOLS; }
 #line 802 "dhcp6_parser.cc"
     break;
 
   case 16: // $@8: %empty
-#line 332 "dhcp6_parser.yy"
+#line 334 "dhcp6_parser.yy"
                        { ctx.ctx_ = ctx.RESERVATIONS; }
 #line 808 "dhcp6_parser.cc"
     break;
 
   case 18: // $@9: %empty
-#line 333 "dhcp6_parser.yy"
+#line 335 "dhcp6_parser.yy"
                        { ctx.ctx_ = ctx.DHCP6; }
 #line 814 "dhcp6_parser.cc"
     break;
 
   case 20: // $@10: %empty
-#line 334 "dhcp6_parser.yy"
+#line 336 "dhcp6_parser.yy"
                       { ctx.ctx_ = ctx.OPTION_DEF; }
 #line 820 "dhcp6_parser.cc"
     break;
 
   case 22: // $@11: %empty
-#line 335 "dhcp6_parser.yy"
+#line 337 "dhcp6_parser.yy"
                        { ctx.ctx_ = ctx.OPTION_DATA; }
 #line 826 "dhcp6_parser.cc"
     break;
 
   case 24: // $@12: %empty
-#line 336 "dhcp6_parser.yy"
+#line 338 "dhcp6_parser.yy"
                          { ctx.ctx_ = ctx.HOOKS_LIBRARIES; }
 #line 832 "dhcp6_parser.cc"
     break;
 
   case 26: // $@13: %empty
-#line 337 "dhcp6_parser.yy"
+#line 339 "dhcp6_parser.yy"
                      { ctx.ctx_ = ctx.DHCP_DDNS; }
 #line 838 "dhcp6_parser.cc"
     break;
 
   case 28: // $@14: %empty
-#line 338 "dhcp6_parser.yy"
+#line 340 "dhcp6_parser.yy"
                           { ctx.ctx_ = ctx.CONFIG_CONTROL; }
 #line 844 "dhcp6_parser.cc"
     break;
 
   case 30: // value: "integer"
-#line 346 "dhcp6_parser.yy"
+#line 348 "dhcp6_parser.yy"
                { yylhs.value.as < ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location))); }
 #line 850 "dhcp6_parser.cc"
     break;
 
   case 31: // value: "floating point"
-#line 347 "dhcp6_parser.yy"
+#line 349 "dhcp6_parser.yy"
              { yylhs.value.as < ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location))); }
 #line 856 "dhcp6_parser.cc"
     break;
 
   case 32: // value: "boolean"
-#line 348 "dhcp6_parser.yy"
+#line 350 "dhcp6_parser.yy"
                { yylhs.value.as < ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location))); }
 #line 862 "dhcp6_parser.cc"
     break;
 
   case 33: // value: "constant string"
-#line 349 "dhcp6_parser.yy"
+#line 351 "dhcp6_parser.yy"
               { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location))); }
 #line 868 "dhcp6_parser.cc"
     break;
 
   case 34: // value: "null"
-#line 350 "dhcp6_parser.yy"
+#line 352 "dhcp6_parser.yy"
                  { yylhs.value.as < ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); }
 #line 874 "dhcp6_parser.cc"
     break;
 
   case 35: // value: map2
-#line 351 "dhcp6_parser.yy"
+#line 353 "dhcp6_parser.yy"
             { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
 #line 880 "dhcp6_parser.cc"
     break;
 
   case 36: // value: list_generic
-#line 352 "dhcp6_parser.yy"
+#line 354 "dhcp6_parser.yy"
                     { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
 #line 886 "dhcp6_parser.cc"
     break;
 
   case 37: // sub_json: value
-#line 355 "dhcp6_parser.yy"
+#line 357 "dhcp6_parser.yy"
                 {
     // Push back the JSON value on the stack
     ctx.stack_.push_back(yystack_[0].value.as < ElementPtr > ());
@@ -895,7 +895,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 38: // $@15: %empty
-#line 360 "dhcp6_parser.yy"
+#line 362 "dhcp6_parser.yy"
                      {
     // This code is executed when we're about to start parsing
     // the content of the map
@@ -906,7 +906,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 39: // map2: "{" $@15 map_content "}"
-#line 365 "dhcp6_parser.yy"
+#line 367 "dhcp6_parser.yy"
                              {
     // map parsing completed. If we ever want to do any wrap up
     // (maybe some sanity checking), this would be the best place
@@ -916,13 +916,13 @@ namespace isc { namespace dhcp {
     break;
 
   case 40: // map_value: map2
-#line 371 "dhcp6_parser.yy"
+#line 373 "dhcp6_parser.yy"
                 { yylhs.value.as < ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); }
 #line 922 "dhcp6_parser.cc"
     break;
 
   case 43: // not_empty_map: "constant string" ":" value
-#line 378 "dhcp6_parser.yy"
+#line 380 "dhcp6_parser.yy"
                                   {
                   // map containing a single entry
                   ctx.unique(yystack_[2].value.as < std::string > (), ctx.loc2pos(yystack_[2].location));
@@ -932,7 +932,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 44: // not_empty_map: not_empty_map "," "constant string" ":" value
-#line 383 "dhcp6_parser.yy"
+#line 385 "dhcp6_parser.yy"
                                                       {
                   // map consisting of a shorter map followed by
                   // comma and string:value
@@ -943,7 +943,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 45: // not_empty_map: not_empty_map ","
-#line 389 "dhcp6_parser.yy"
+#line 391 "dhcp6_parser.yy"
                                    {
                  ctx.warnAboutExtraCommas(yystack_[0].location);
                  }
@@ -951,7 +951,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 46: // $@16: %empty
-#line 394 "dhcp6_parser.yy"
+#line 396 "dhcp6_parser.yy"
                               {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(l);
@@ -960,7 +960,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 47: // list_generic: "[" $@16 list_content "]"
-#line 397 "dhcp6_parser.yy"
+#line 399 "dhcp6_parser.yy"
                                {
     // list parsing complete. Put any sanity checking here
 }
@@ -968,7 +968,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 50: // not_empty_list: value
-#line 405 "dhcp6_parser.yy"
+#line 407 "dhcp6_parser.yy"
                       {
                   // List consisting of a single element.
                   ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
@@ -977,7 +977,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 51: // not_empty_list: not_empty_list "," value
-#line 409 "dhcp6_parser.yy"
+#line 411 "dhcp6_parser.yy"
                                            {
                   // List ending with , and a value.
                   ctx.stack_.back()->add(yystack_[0].value.as < ElementPtr > ());
@@ -986,7 +986,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 52: // not_empty_list: not_empty_list ","
-#line 413 "dhcp6_parser.yy"
+#line 415 "dhcp6_parser.yy"
                                      {
                   ctx.warnAboutExtraCommas(yystack_[0].location);
                   }
@@ -994,7 +994,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 53: // $@17: %empty
-#line 419 "dhcp6_parser.yy"
+#line 421 "dhcp6_parser.yy"
                               {
     // List parsing about to start
 }
@@ -1002,7 +1002,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 54: // list_strings: "[" $@17 list_strings_content "]"
-#line 421 "dhcp6_parser.yy"
+#line 423 "dhcp6_parser.yy"
                                        {
     // list parsing complete. Put any sanity checking here
     //ctx.stack_.pop_back();
@@ -1011,7 +1011,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 57: // not_empty_list_strings: "constant string"
-#line 430 "dhcp6_parser.yy"
+#line 432 "dhcp6_parser.yy"
                                {
                           ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
                           ctx.stack_.back()->add(s);
@@ -1020,7 +1020,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 58: // not_empty_list_strings: not_empty_list_strings "," "constant string"
-#line 434 "dhcp6_parser.yy"
+#line 436 "dhcp6_parser.yy"
                                                             {
                           ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
                           ctx.stack_.back()->add(s);
@@ -1029,7 +1029,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 59: // not_empty_list_strings: not_empty_list_strings ","
-#line 438 "dhcp6_parser.yy"
+#line 440 "dhcp6_parser.yy"
                                                      {
                           ctx.warnAboutExtraCommas(yystack_[0].location);
                           }
@@ -1037,7 +1037,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 60: // unknown_map_entry: "constant string" ":"
-#line 448 "dhcp6_parser.yy"
+#line 450 "dhcp6_parser.yy"
                                 {
     const std::string& where = ctx.contextName();
     const std::string& keyword = yystack_[1].value.as < std::string > ();
@@ -1048,7 +1048,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 61: // $@18: %empty
-#line 457 "dhcp6_parser.yy"
+#line 459 "dhcp6_parser.yy"
                            {
     // This code is executed when we're about to start parsing
     // the content of the map
@@ -1059,7 +1059,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 62: // syntax_map: "{" $@18 global_object "}"
-#line 462 "dhcp6_parser.yy"
+#line 464 "dhcp6_parser.yy"
                                {
     // map parsing completed. If we ever want to do any wrap up
     // (maybe some sanity checking), this would be the best place
@@ -1072,7 +1072,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 63: // $@19: %empty
-#line 472 "dhcp6_parser.yy"
+#line 474 "dhcp6_parser.yy"
                      {
     // This code is executed when we're about to start parsing
     // the content of the map
@@ -1087,7 +1087,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 64: // global_object: "Dhcp6" $@19 ":" "{" global_params "}"
-#line 481 "dhcp6_parser.yy"
+#line 483 "dhcp6_parser.yy"
                                                     {
     // No global parameter is required
     ctx.stack_.pop_back();
@@ -1097,7 +1097,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 66: // global_object_comma: global_object ","
-#line 489 "dhcp6_parser.yy"
+#line 491 "dhcp6_parser.yy"
                                          {
     ctx.warnAboutExtraCommas(yystack_[0].location);
 }
@@ -1105,7 +1105,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 67: // $@20: %empty
-#line 495 "dhcp6_parser.yy"
+#line 497 "dhcp6_parser.yy"
                           {
     // Parse the Dhcp6 map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1115,7 +1115,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 68: // sub_dhcp6: "{" $@20 global_params "}"
-#line 499 "dhcp6_parser.yy"
+#line 501 "dhcp6_parser.yy"
                                {
     // No global parameter is required
     // parsing completed
@@ -1124,7 +1124,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 71: // global_params: global_params ","
-#line 506 "dhcp6_parser.yy"
+#line 508 "dhcp6_parser.yy"
                                    {
                  ctx.warnAboutExtraCommas(yystack_[0].location);
                  }
@@ -1132,7 +1132,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 141: // $@21: %empty
-#line 584 "dhcp6_parser.yy"
+#line 586 "dhcp6_parser.yy"
                                {
     ctx.unique("data-directory", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1141,7 +1141,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 142: // data_directory: "data-directory" $@21 ":" "constant string"
-#line 587 "dhcp6_parser.yy"
+#line 589 "dhcp6_parser.yy"
                {
     ElementPtr datadir(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data-directory", datadir);
@@ -1151,7 +1151,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 143: // preferred_lifetime: "preferred-lifetime" ":" "integer"
-#line 593 "dhcp6_parser.yy"
+#line 595 "dhcp6_parser.yy"
                                                      {
     ctx.unique("preferred-lifetime", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1161,7 +1161,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 144: // min_preferred_lifetime: "min-preferred-lifetime" ":" "integer"
-#line 599 "dhcp6_parser.yy"
+#line 601 "dhcp6_parser.yy"
                                                              {
     ctx.unique("min-preferred-lifetime", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1171,7 +1171,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 145: // max_preferred_lifetime: "max-preferred-lifetime" ":" "integer"
-#line 605 "dhcp6_parser.yy"
+#line 607 "dhcp6_parser.yy"
                                                              {
     ctx.unique("max-preferred-lifetime", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1181,7 +1181,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 146: // valid_lifetime: "valid-lifetime" ":" "integer"
-#line 611 "dhcp6_parser.yy"
+#line 613 "dhcp6_parser.yy"
                                              {
     ctx.unique("valid-lifetime", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1191,7 +1191,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 147: // min_valid_lifetime: "min-valid-lifetime" ":" "integer"
-#line 617 "dhcp6_parser.yy"
+#line 619 "dhcp6_parser.yy"
                                                      {
     ctx.unique("min-valid-lifetime", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1201,7 +1201,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 148: // max_valid_lifetime: "max-valid-lifetime" ":" "integer"
-#line 623 "dhcp6_parser.yy"
+#line 625 "dhcp6_parser.yy"
                                                      {
     ctx.unique("max-valid-lifetime", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1211,7 +1211,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 149: // renew_timer: "renew-timer" ":" "integer"
-#line 629 "dhcp6_parser.yy"
+#line 631 "dhcp6_parser.yy"
                                        {
     ctx.unique("renew-timer", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1221,7 +1221,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 150: // rebind_timer: "rebind-timer" ":" "integer"
-#line 635 "dhcp6_parser.yy"
+#line 637 "dhcp6_parser.yy"
                                          {
     ctx.unique("rebind-timer", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1231,7 +1231,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 151: // calculate_tee_times: "calculate-tee-times" ":" "boolean"
-#line 641 "dhcp6_parser.yy"
+#line 643 "dhcp6_parser.yy"
                                                        {
     ctx.unique("calculate-tee-times", ctx.loc2pos(yystack_[2].location));
     ElementPtr ctt(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1241,7 +1241,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 152: // t1_percent: "t1-percent" ":" "floating point"
-#line 647 "dhcp6_parser.yy"
+#line 649 "dhcp6_parser.yy"
                                    {
     ctx.unique("t1-percent", ctx.loc2pos(yystack_[2].location));
     ElementPtr t1(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
@@ -1251,7 +1251,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 153: // t2_percent: "t2-percent" ":" "floating point"
-#line 653 "dhcp6_parser.yy"
+#line 655 "dhcp6_parser.yy"
                                    {
     ctx.unique("t2-percent", ctx.loc2pos(yystack_[2].location));
     ElementPtr t2(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
@@ -1261,7 +1261,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 154: // cache_threshold: "cache-threshold" ":" "floating point"
-#line 659 "dhcp6_parser.yy"
+#line 661 "dhcp6_parser.yy"
                                              {
     ctx.unique("cache-threshold", ctx.loc2pos(yystack_[2].location));
     ElementPtr ct(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
@@ -1271,7 +1271,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 155: // cache_max_age: "cache-max-age" ":" "integer"
-#line 665 "dhcp6_parser.yy"
+#line 667 "dhcp6_parser.yy"
                                            {
     ctx.unique("cache-max-age", ctx.loc2pos(yystack_[2].location));
     ElementPtr cm(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1281,7 +1281,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 156: // decline_probation_period: "decline-probation-period" ":" "integer"
-#line 671 "dhcp6_parser.yy"
+#line 673 "dhcp6_parser.yy"
                                                                  {
     ctx.unique("decline-probation-period", ctx.loc2pos(yystack_[2].location));
     ElementPtr dpp(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1291,7 +1291,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 157: // ddns_send_updates: "ddns-send-updates" ":" "boolean"
-#line 677 "dhcp6_parser.yy"
+#line 679 "dhcp6_parser.yy"
                                                    {
     ctx.unique("ddns-send-updates", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1301,7 +1301,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 158: // ddns_override_no_update: "ddns-override-no-update" ":" "boolean"
-#line 683 "dhcp6_parser.yy"
+#line 685 "dhcp6_parser.yy"
                                                                {
     ctx.unique("ddns-override-no-update", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1311,7 +1311,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 159: // ddns_override_client_update: "ddns-override-client-update" ":" "boolean"
-#line 689 "dhcp6_parser.yy"
+#line 691 "dhcp6_parser.yy"
                                                                        {
     ctx.unique("ddns-override-client-update", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1321,7 +1321,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 160: // $@22: %empty
-#line 695 "dhcp6_parser.yy"
+#line 697 "dhcp6_parser.yy"
                                                    {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
     ctx.unique("ddns-replace-client-name", ctx.loc2pos(yystack_[0].location));
@@ -1330,7 +1330,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 161: // ddns_replace_client_name: "ddns-replace-client-name" $@22 ":" ddns_replace_client_name_value
-#line 698 "dhcp6_parser.yy"
+#line 700 "dhcp6_parser.yy"
                                        {
     ctx.stack_.back()->set("ddns-replace-client-name", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -1339,7 +1339,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 162: // ddns_replace_client_name_value: "when-present"
-#line 704 "dhcp6_parser.yy"
+#line 706 "dhcp6_parser.yy"
                  {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location)));
       }
@@ -1347,7 +1347,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 163: // ddns_replace_client_name_value: "never"
-#line 707 "dhcp6_parser.yy"
+#line 709 "dhcp6_parser.yy"
           {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
@@ -1355,7 +1355,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 164: // ddns_replace_client_name_value: "always"
-#line 710 "dhcp6_parser.yy"
+#line 712 "dhcp6_parser.yy"
            {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
@@ -1363,7 +1363,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 165: // ddns_replace_client_name_value: "when-not-present"
-#line 713 "dhcp6_parser.yy"
+#line 715 "dhcp6_parser.yy"
                      {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
@@ -1371,7 +1371,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 166: // ddns_replace_client_name_value: "boolean"
-#line 716 "dhcp6_parser.yy"
+#line 718 "dhcp6_parser.yy"
             {
       error(yystack_[0].location, "boolean values for the ddns-replace-client-name are "
                 "no longer supported");
@@ -1380,7 +1380,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 167: // $@23: %empty
-#line 722 "dhcp6_parser.yy"
+#line 724 "dhcp6_parser.yy"
                                              {
     ctx.unique("ddns-generated-prefix", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1389,7 +1389,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 168: // ddns_generated_prefix: "ddns-generated-prefix" $@23 ":" "constant string"
-#line 725 "dhcp6_parser.yy"
+#line 727 "dhcp6_parser.yy"
                {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-generated-prefix", s);
@@ -1399,7 +1399,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 169: // $@24: %empty
-#line 731 "dhcp6_parser.yy"
+#line 733 "dhcp6_parser.yy"
                                                {
     ctx.unique("ddns-qualifying-suffix", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1408,7 +1408,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 170: // ddns_qualifying_suffix: "ddns-qualifying-suffix" $@24 ":" "constant string"
-#line 734 "dhcp6_parser.yy"
+#line 736 "dhcp6_parser.yy"
                {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ddns-qualifying-suffix", s);
@@ -1418,7 +1418,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 171: // ddns_update_on_renew: "ddns-update-on-renew" ":" "boolean"
-#line 740 "dhcp6_parser.yy"
+#line 742 "dhcp6_parser.yy"
                                                          {
     ctx.unique("ddns-update-on-renew", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1428,7 +1428,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 172: // ddns_use_conflict_resolution: "ddns-use-conflict-resolution" ":" "boolean"
-#line 749 "dhcp6_parser.yy"
+#line 751 "dhcp6_parser.yy"
                                                                          {
     ctx.unique("ddns-use-conflict-resolution", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1442,7 +1442,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 173: // $@25: %empty
-#line 759 "dhcp6_parser.yy"
+#line 761 "dhcp6_parser.yy"
                                                              {
     ctx.unique("ddns-conflict-resolution-mode", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.DDNS_CONFLICT_RESOLUTION_MODE);
@@ -1451,7 +1451,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 174: // ddns_conflict_resolution_mode: "ddns-conflict-resolution-mode" $@25 ":" ddns_conflict_resolution_mode_value
-#line 762 "dhcp6_parser.yy"
+#line 764 "dhcp6_parser.yy"
                                             {
     ctx.stack_.back()->set("ddns-conflict-resolution-mode", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -1460,7 +1460,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 175: // ddns_conflict_resolution_mode_value: "check-with-dhcid"
-#line 768 "dhcp6_parser.yy"
+#line 770 "dhcp6_parser.yy"
                      {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("check-with-dhcid", ctx.loc2pos(yystack_[0].location)));
       }
@@ -1468,7 +1468,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 176: // ddns_conflict_resolution_mode_value: "no-check-with-dhcid"
-#line 771 "dhcp6_parser.yy"
+#line 773 "dhcp6_parser.yy"
                         {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("no-check-with-dhcid", ctx.loc2pos(yystack_[0].location)));
       }
@@ -1476,7 +1476,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 177: // ddns_conflict_resolution_mode_value: "check-exists-with-dhcid"
-#line 774 "dhcp6_parser.yy"
+#line 776 "dhcp6_parser.yy"
                             {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("check-exists-with-dhcid", ctx.loc2pos(yystack_[0].location)));
       }
@@ -1484,7 +1484,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 178: // ddns_conflict_resolution_mode_value: "no-check-without-dhcid"
-#line 777 "dhcp6_parser.yy"
+#line 779 "dhcp6_parser.yy"
                            {
       yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("no-check-without-dhcid", ctx.loc2pos(yystack_[0].location)));
       }
@@ -1492,7 +1492,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 179: // ddns_ttl_percent: "ddns-ttl-percent" ":" "floating point"
-#line 782 "dhcp6_parser.yy"
+#line 784 "dhcp6_parser.yy"
                                                {
     ctx.unique("ddns-ttl-percent", ctx.loc2pos(yystack_[2].location));
     ElementPtr ttl(new DoubleElement(yystack_[0].value.as < double > (), ctx.loc2pos(yystack_[0].location)));
@@ -1502,7 +1502,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 180: // $@26: %empty
-#line 788 "dhcp6_parser.yy"
+#line 790 "dhcp6_parser.yy"
                                      {
     ctx.unique("hostname-char-set", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1511,7 +1511,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 181: // hostname_char_set: "hostname-char-set" $@26 ":" "constant string"
-#line 791 "dhcp6_parser.yy"
+#line 793 "dhcp6_parser.yy"
                {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-set", s);
@@ -1521,7 +1521,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 182: // $@27: %empty
-#line 797 "dhcp6_parser.yy"
+#line 799 "dhcp6_parser.yy"
                                                      {
     ctx.unique("hostname-char-replacement", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1530,7 +1530,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 183: // hostname_char_replacement: "hostname-char-replacement" $@27 ":" "constant string"
-#line 800 "dhcp6_parser.yy"
+#line 802 "dhcp6_parser.yy"
                {
     ElementPtr s(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname-char-replacement", s);
@@ -1540,7 +1540,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 184: // store_extended_info: "store-extended-info" ":" "boolean"
-#line 806 "dhcp6_parser.yy"
+#line 808 "dhcp6_parser.yy"
                                                        {
     ctx.unique("store-extended-info", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1550,7 +1550,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 185: // statistic_default_sample_count: "statistic-default-sample-count" ":" "integer"
-#line 812 "dhcp6_parser.yy"
+#line 814 "dhcp6_parser.yy"
                                                                              {
     ctx.unique("statistic-default-sample-count", ctx.loc2pos(yystack_[2].location));
     ElementPtr count(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1560,7 +1560,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 186: // statistic_default_sample_age: "statistic-default-sample-age" ":" "integer"
-#line 818 "dhcp6_parser.yy"
+#line 820 "dhcp6_parser.yy"
                                                                          {
     ctx.unique("statistic-default-sample-age", ctx.loc2pos(yystack_[2].location));
     ElementPtr age(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1570,7 +1570,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 187: // $@28: %empty
-#line 824 "dhcp6_parser.yy"
+#line 826 "dhcp6_parser.yy"
                        {
     ctx.unique("server-tag", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1579,7 +1579,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 188: // server_tag: "server-tag" $@28 ":" "constant string"
-#line 827 "dhcp6_parser.yy"
+#line 829 "dhcp6_parser.yy"
                {
     ElementPtr stag(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-tag", stag);
@@ -1589,7 +1589,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 189: // parked_packet_limit: "parked-packet-limit" ":" "integer"
-#line 833 "dhcp6_parser.yy"
+#line 835 "dhcp6_parser.yy"
                                                        {
     ctx.unique("parked-packet-limit", ctx.loc2pos(yystack_[2].location));
     ElementPtr ppl(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1599,7 +1599,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 190: // $@29: %empty
-#line 839 "dhcp6_parser.yy"
+#line 841 "dhcp6_parser.yy"
                      {
     ctx.unique("allocator", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1608,7 +1608,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 191: // allocator: "allocator" $@29 ":" "constant string"
-#line 842 "dhcp6_parser.yy"
+#line 844 "dhcp6_parser.yy"
                {
     ElementPtr al(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("allocator", al);
@@ -1618,7 +1618,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 192: // $@30: %empty
-#line 848 "dhcp6_parser.yy"
+#line 850 "dhcp6_parser.yy"
                            {
     ctx.unique("pd-allocator", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1627,7 +1627,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 193: // pd_allocator: "pd-allocator" $@30 ":" "constant string"
-#line 851 "dhcp6_parser.yy"
+#line 853 "dhcp6_parser.yy"
                {
     ElementPtr al(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pd-allocator", al);
@@ -1637,7 +1637,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 194: // early_global_reservations_lookup: "early-global-reservations-lookup" ":" "boolean"
-#line 857 "dhcp6_parser.yy"
+#line 859 "dhcp6_parser.yy"
                                                                                  {
     ctx.unique("early-global-reservations-lookup", ctx.loc2pos(yystack_[2].location));
     ElementPtr early(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1647,7 +1647,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 195: // ip_reservations_unique: "ip-reservations-unique" ":" "boolean"
-#line 863 "dhcp6_parser.yy"
+#line 865 "dhcp6_parser.yy"
                                                              {
     ctx.unique("ip-reservations-unique", ctx.loc2pos(yystack_[2].location));
     ElementPtr unique(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1657,7 +1657,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 196: // reservations_lookup_first: "reservations-lookup-first" ":" "boolean"
-#line 869 "dhcp6_parser.yy"
+#line 871 "dhcp6_parser.yy"
                                                                    {
     ctx.unique("reservations-lookup-first", ctx.loc2pos(yystack_[2].location));
     ElementPtr first(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1667,7 +1667,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 197: // $@31: %empty
-#line 875 "dhcp6_parser.yy"
+#line 877 "dhcp6_parser.yy"
                                      {
     ctx.unique("interfaces-config", ctx.loc2pos(yystack_[0].location));
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1679,7 +1679,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 198: // interfaces_config: "interfaces-config" $@31 ":" "{" interfaces_config_params "}"
-#line 881 "dhcp6_parser.yy"
+#line 883 "dhcp6_parser.yy"
                                                                {
     // No interfaces config param is required
     ctx.stack_.pop_back();
@@ -1689,7 +1689,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 199: // $@32: %empty
-#line 887 "dhcp6_parser.yy"
+#line 889 "dhcp6_parser.yy"
                                 {
     // Parse the interfaces-config map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1699,7 +1699,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 200: // sub_interfaces6: "{" $@32 interfaces_config_params "}"
-#line 891 "dhcp6_parser.yy"
+#line 893 "dhcp6_parser.yy"
                                           {
     // No interfaces config param is required
     // parsing completed
@@ -1708,7 +1708,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 203: // interfaces_config_params: interfaces_config_params ","
-#line 898 "dhcp6_parser.yy"
+#line 900 "dhcp6_parser.yy"
                                                          {
                             ctx.warnAboutExtraCommas(yystack_[0].location);
                             }
@@ -1716,7 +1716,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 212: // $@33: %empty
-#line 913 "dhcp6_parser.yy"
+#line 915 "dhcp6_parser.yy"
                             {
     ctx.unique("interfaces", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -1728,7 +1728,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 213: // interfaces_list: "interfaces" $@33 ":" list_strings
-#line 919 "dhcp6_parser.yy"
+#line 921 "dhcp6_parser.yy"
                      {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1737,7 +1737,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 214: // re_detect: "re-detect" ":" "boolean"
-#line 924 "dhcp6_parser.yy"
+#line 926 "dhcp6_parser.yy"
                                    {
     ctx.unique("re-detect", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1747,7 +1747,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 215: // service_sockets_require_all: "service-sockets-require-all" ":" "boolean"
-#line 930 "dhcp6_parser.yy"
+#line 932 "dhcp6_parser.yy"
                                                                        {
     ctx.unique("service-sockets-require-all", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1757,7 +1757,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 216: // service_sockets_retry_wait_time: "service-sockets-retry-wait-time" ":" "integer"
-#line 936 "dhcp6_parser.yy"
+#line 938 "dhcp6_parser.yy"
                                                                                {
     ctx.unique("service-sockets-retry-wait-time", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1767,7 +1767,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 217: // service_sockets_max_retries: "service-sockets-max-retries" ":" "integer"
-#line 942 "dhcp6_parser.yy"
+#line 944 "dhcp6_parser.yy"
                                                                        {
     ctx.unique("service-sockets-max-retries", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1777,7 +1777,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 218: // $@34: %empty
-#line 948 "dhcp6_parser.yy"
+#line 950 "dhcp6_parser.yy"
                                {
     ctx.unique("lease-database", ctx.loc2pos(yystack_[0].location));
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1789,7 +1789,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 219: // lease_database: "lease-database" $@34 ":" "{" database_map_params "}"
-#line 954 "dhcp6_parser.yy"
+#line 956 "dhcp6_parser.yy"
                                                           {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1800,7 +1800,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 220: // $@35: %empty
-#line 961 "dhcp6_parser.yy"
+#line 963 "dhcp6_parser.yy"
                                {
     ctx.unique("hosts-database", ctx.loc2pos(yystack_[0].location));
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -1812,7 +1812,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 221: // hosts_database: "hosts-database" $@35 ":" "{" database_map_params "}"
-#line 967 "dhcp6_parser.yy"
+#line 969 "dhcp6_parser.yy"
                                                           {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -1823,7 +1823,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 222: // $@36: %empty
-#line 974 "dhcp6_parser.yy"
+#line 976 "dhcp6_parser.yy"
                                  {
     ctx.unique("hosts-databases", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -1835,7 +1835,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 223: // hosts_databases: "hosts-databases" $@36 ":" "[" database_list "]"
-#line 980 "dhcp6_parser.yy"
+#line 982 "dhcp6_parser.yy"
                                                       {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -1844,7 +1844,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 228: // not_empty_database_list: not_empty_database_list ","
-#line 991 "dhcp6_parser.yy"
+#line 993 "dhcp6_parser.yy"
                                                        {
                            ctx.warnAboutExtraCommas(yystack_[0].location);
                            }
@@ -1852,7 +1852,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 229: // $@37: %empty
-#line 996 "dhcp6_parser.yy"
+#line 998 "dhcp6_parser.yy"
                          {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -1862,7 +1862,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 230: // database: "{" $@37 database_map_params "}"
-#line 1000 "dhcp6_parser.yy"
+#line 1002 "dhcp6_parser.yy"
                                      {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -1872,7 +1872,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 233: // database_map_params: database_map_params ","
-#line 1008 "dhcp6_parser.yy"
+#line 1010 "dhcp6_parser.yy"
                                                {
                        ctx.warnAboutExtraCommas(yystack_[0].location);
                        }
@@ -1880,7 +1880,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 257: // $@38: %empty
-#line 1038 "dhcp6_parser.yy"
+#line 1040 "dhcp6_parser.yy"
                     {
     ctx.unique("type", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1889,7 +1889,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 258: // database_type: "type" $@38 ":" "constant string"
-#line 1041 "dhcp6_parser.yy"
+#line 1043 "dhcp6_parser.yy"
                {
     ElementPtr db_type(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("type", db_type);
@@ -1899,7 +1899,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 259: // $@39: %empty
-#line 1047 "dhcp6_parser.yy"
+#line 1049 "dhcp6_parser.yy"
            {
     ctx.unique("user", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1908,7 +1908,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 260: // user: "user" $@39 ":" "constant string"
-#line 1050 "dhcp6_parser.yy"
+#line 1052 "dhcp6_parser.yy"
                {
     ElementPtr user(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user", user);
@@ -1918,7 +1918,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 261: // $@40: %empty
-#line 1056 "dhcp6_parser.yy"
+#line 1058 "dhcp6_parser.yy"
                    {
     ctx.unique("password", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1927,7 +1927,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 262: // password: "password" $@40 ":" "constant string"
-#line 1059 "dhcp6_parser.yy"
+#line 1061 "dhcp6_parser.yy"
                {
     ElementPtr pwd(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password", pwd);
@@ -1937,7 +1937,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 263: // $@41: %empty
-#line 1065 "dhcp6_parser.yy"
+#line 1067 "dhcp6_parser.yy"
            {
     ctx.unique("host", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1946,7 +1946,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 264: // host: "host" $@41 ":" "constant string"
-#line 1068 "dhcp6_parser.yy"
+#line 1070 "dhcp6_parser.yy"
                {
     ElementPtr h(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("host", h);
@@ -1956,7 +1956,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 265: // port: "port" ":" "integer"
-#line 1074 "dhcp6_parser.yy"
+#line 1076 "dhcp6_parser.yy"
                          {
     ctx.unique("port", ctx.loc2pos(yystack_[2].location));
     ElementPtr p(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -1966,7 +1966,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 266: // $@42: %empty
-#line 1080 "dhcp6_parser.yy"
+#line 1082 "dhcp6_parser.yy"
            {
     ctx.unique("name", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -1975,7 +1975,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 267: // name: "name" $@42 ":" "constant string"
-#line 1083 "dhcp6_parser.yy"
+#line 1085 "dhcp6_parser.yy"
                {
     ElementPtr name(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("name", name);
@@ -1985,7 +1985,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 268: // persist: "persist" ":" "boolean"
-#line 1089 "dhcp6_parser.yy"
+#line 1091 "dhcp6_parser.yy"
                                {
     ctx.unique("persist", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -1995,7 +1995,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 269: // lfc_interval: "lfc-interval" ":" "integer"
-#line 1095 "dhcp6_parser.yy"
+#line 1097 "dhcp6_parser.yy"
                                          {
     ctx.unique("lfc-interval", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2005,7 +2005,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 270: // readonly: "readonly" ":" "boolean"
-#line 1101 "dhcp6_parser.yy"
+#line 1103 "dhcp6_parser.yy"
                                  {
     ctx.unique("readonly", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -2015,7 +2015,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 271: // connect_timeout: "connect-timeout" ":" "integer"
-#line 1107 "dhcp6_parser.yy"
+#line 1109 "dhcp6_parser.yy"
                                                {
     ctx.unique("connect-timeout", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2025,7 +2025,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 272: // read_timeout: "read-timeout" ":" "integer"
-#line 1113 "dhcp6_parser.yy"
+#line 1115 "dhcp6_parser.yy"
                                          {
     ctx.unique("read-timeout", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2035,7 +2035,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 273: // write_timeout: "write-timeout" ":" "integer"
-#line 1119 "dhcp6_parser.yy"
+#line 1121 "dhcp6_parser.yy"
                                            {
     ctx.unique("write-timeout", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2045,7 +2045,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 274: // tcp_user_timeout: "tcp-user-timeout" ":" "integer"
-#line 1125 "dhcp6_parser.yy"
+#line 1127 "dhcp6_parser.yy"
                                                  {
     ctx.unique("tcp-user-timeout", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2055,7 +2055,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 275: // reconnect_wait_time: "reconnect-wait-time" ":" "integer"
-#line 1132 "dhcp6_parser.yy"
+#line 1134 "dhcp6_parser.yy"
                                                        {
     ctx.unique("reconnect-wait-time", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2065,7 +2065,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 276: // $@43: %empty
-#line 1138 "dhcp6_parser.yy"
+#line 1140 "dhcp6_parser.yy"
                  {
     ctx.unique("on-fail", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.DATABASE_ON_FAIL);
@@ -2074,7 +2074,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 277: // on_fail: "on-fail" $@43 ":" on_fail_mode
-#line 1141 "dhcp6_parser.yy"
+#line 1143 "dhcp6_parser.yy"
                      {
     ctx.stack_.back()->set("on-fail", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -2083,25 +2083,25 @@ namespace isc { namespace dhcp {
     break;
 
   case 278: // on_fail_mode: "stop-retry-exit"
-#line 1146 "dhcp6_parser.yy"
+#line 1148 "dhcp6_parser.yy"
                               { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("stop-retry-exit", ctx.loc2pos(yystack_[0].location))); }
 #line 2089 "dhcp6_parser.cc"
     break;
 
   case 279: // on_fail_mode: "serve-retry-exit"
-#line 1147 "dhcp6_parser.yy"
+#line 1149 "dhcp6_parser.yy"
                                { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("serve-retry-exit", ctx.loc2pos(yystack_[0].location))); }
 #line 2095 "dhcp6_parser.cc"
     break;
 
   case 280: // on_fail_mode: "serve-retry-continue"
-#line 1148 "dhcp6_parser.yy"
+#line 1150 "dhcp6_parser.yy"
                                    { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("serve-retry-continue", ctx.loc2pos(yystack_[0].location))); }
 #line 2101 "dhcp6_parser.cc"
     break;
 
   case 281: // retry_on_startup: "retry-on-startup" ":" "boolean"
-#line 1151 "dhcp6_parser.yy"
+#line 1153 "dhcp6_parser.yy"
                                                  {
     ctx.unique("retry-on-startup", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -2111,7 +2111,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 282: // max_row_errors: "max-row-errors" ":" "integer"
-#line 1157 "dhcp6_parser.yy"
+#line 1159 "dhcp6_parser.yy"
                                              {
     ctx.unique("max-row-errors", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2121,7 +2121,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 283: // max_reconnect_tries: "max-reconnect-tries" ":" "integer"
-#line 1163 "dhcp6_parser.yy"
+#line 1165 "dhcp6_parser.yy"
                                                        {
     ctx.unique("max-reconnect-tries", ctx.loc2pos(yystack_[2].location));
     ElementPtr n(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2131,7 +2131,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 284: // $@44: %empty
-#line 1169 "dhcp6_parser.yy"
+#line 1171 "dhcp6_parser.yy"
                            {
     ctx.unique("trust-anchor", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2140,7 +2140,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 285: // trust_anchor: "trust-anchor" $@44 ":" "constant string"
-#line 1172 "dhcp6_parser.yy"
+#line 1174 "dhcp6_parser.yy"
                {
     ElementPtr ca(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("trust-anchor", ca);
@@ -2150,7 +2150,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 286: // $@45: %empty
-#line 1178 "dhcp6_parser.yy"
+#line 1180 "dhcp6_parser.yy"
                      {
     ctx.unique("cert-file", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2159,7 +2159,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 287: // cert_file: "cert-file" $@45 ":" "constant string"
-#line 1181 "dhcp6_parser.yy"
+#line 1183 "dhcp6_parser.yy"
                {
     ElementPtr cert(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("cert-file", cert);
@@ -2169,7 +2169,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 288: // $@46: %empty
-#line 1187 "dhcp6_parser.yy"
+#line 1189 "dhcp6_parser.yy"
                    {
     ctx.unique("key-file", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2178,7 +2178,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 289: // key_file: "key-file" $@46 ":" "constant string"
-#line 1190 "dhcp6_parser.yy"
+#line 1192 "dhcp6_parser.yy"
                {
     ElementPtr key(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("key-file", key);
@@ -2188,7 +2188,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 290: // $@47: %empty
-#line 1196 "dhcp6_parser.yy"
+#line 1198 "dhcp6_parser.yy"
                          {
     ctx.unique("cipher-list", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2197,7 +2197,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 291: // cipher_list: "cipher-list" $@47 ":" "constant string"
-#line 1199 "dhcp6_parser.yy"
+#line 1201 "dhcp6_parser.yy"
                {
     ElementPtr cl(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("cipher-list", cl);
@@ -2207,7 +2207,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 292: // $@48: %empty
-#line 1205 "dhcp6_parser.yy"
+#line 1207 "dhcp6_parser.yy"
                              {
     ctx.unique("sanity-checks", ctx.loc2pos(yystack_[0].location));
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2219,7 +2219,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 293: // sanity_checks: "sanity-checks" $@48 ":" "{" sanity_checks_params "}"
-#line 1211 "dhcp6_parser.yy"
+#line 1213 "dhcp6_parser.yy"
                                                            {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2228,7 +2228,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 296: // sanity_checks_params: sanity_checks_params ","
-#line 1218 "dhcp6_parser.yy"
+#line 1220 "dhcp6_parser.yy"
                                                  {
                         ctx.warnAboutExtraCommas(yystack_[0].location);
                         }
@@ -2236,7 +2236,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 299: // $@49: %empty
-#line 1227 "dhcp6_parser.yy"
+#line 1229 "dhcp6_parser.yy"
                            {
     ctx.unique("lease-checks", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2245,7 +2245,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 300: // lease_checks: "lease-checks" $@49 ":" "constant string"
-#line 1230 "dhcp6_parser.yy"
+#line 1232 "dhcp6_parser.yy"
                {
 
     if ( (string(yystack_[0].value.as < std::string > ()) == "none") ||
@@ -2265,7 +2265,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 301: // $@50: %empty
-#line 1246 "dhcp6_parser.yy"
+#line 1248 "dhcp6_parser.yy"
                                            {
     ctx.unique("extended-info-checks", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2274,7 +2274,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 302: // extended_info_checks: "extended-info-checks" $@50 ":" "constant string"
-#line 1249 "dhcp6_parser.yy"
+#line 1251 "dhcp6_parser.yy"
                {
 
     if ( (string(yystack_[0].value.as < std::string > ()) == "none") ||
@@ -2293,7 +2293,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 303: // $@51: %empty
-#line 1264 "dhcp6_parser.yy"
+#line 1266 "dhcp6_parser.yy"
                          {
     ctx.unique("mac-sources", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -2305,7 +2305,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 304: // mac_sources: "mac-sources" $@51 ":" "[" mac_sources_list "]"
-#line 1270 "dhcp6_parser.yy"
+#line 1272 "dhcp6_parser.yy"
                                                          {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2314,7 +2314,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 307: // mac_sources_list: mac_sources_list ","
-#line 1277 "dhcp6_parser.yy"
+#line 1279 "dhcp6_parser.yy"
                                          {
                     ctx.warnAboutExtraCommas(yystack_[0].location);
                     }
@@ -2322,7 +2322,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 310: // duid_id: "duid"
-#line 1286 "dhcp6_parser.yy"
+#line 1288 "dhcp6_parser.yy"
               {
     ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
@@ -2331,7 +2331,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 311: // string_id: "constant string"
-#line 1291 "dhcp6_parser.yy"
+#line 1293 "dhcp6_parser.yy"
                   {
     ElementPtr duid(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(duid);
@@ -2340,7 +2340,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 312: // $@52: %empty
-#line 1296 "dhcp6_parser.yy"
+#line 1298 "dhcp6_parser.yy"
                                                            {
     ctx.unique("host-reservation-identifiers", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -2352,7 +2352,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 313: // host_reservation_identifiers: "host-reservation-identifiers" $@52 ":" "[" host_reservation_identifiers_list "]"
-#line 1302 "dhcp6_parser.yy"
+#line 1304 "dhcp6_parser.yy"
                                                                           {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2361,7 +2361,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 316: // host_reservation_identifiers_list: host_reservation_identifiers_list ","
-#line 1309 "dhcp6_parser.yy"
+#line 1311 "dhcp6_parser.yy"
                                               {
         ctx.warnAboutExtraCommas(yystack_[0].location);
         }
@@ -2369,7 +2369,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 320: // hw_address_id: "hw-address"
-#line 1319 "dhcp6_parser.yy"
+#line 1321 "dhcp6_parser.yy"
                           {
     ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(hwaddr);
@@ -2378,7 +2378,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 321: // flex_id: "flex-id"
-#line 1324 "dhcp6_parser.yy"
+#line 1326 "dhcp6_parser.yy"
                  {
     ElementPtr flex_id(new StringElement("flex-id", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(flex_id);
@@ -2387,7 +2387,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 322: // $@53: %empty
-#line 1331 "dhcp6_parser.yy"
+#line 1333 "dhcp6_parser.yy"
                                                {
     ctx.unique("relay-supplied-options", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -2399,7 +2399,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 323: // relay_supplied_options: "relay-supplied-options" $@53 ":" "[" list_content "]"
-#line 1337 "dhcp6_parser.yy"
+#line 1339 "dhcp6_parser.yy"
                                                      {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2408,7 +2408,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 324: // $@54: %empty
-#line 1344 "dhcp6_parser.yy"
+#line 1346 "dhcp6_parser.yy"
                                            {
     ctx.unique("multi-threading", ctx.loc2pos(yystack_[0].location));
     ElementPtr mt(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2420,7 +2420,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 325: // dhcp_multi_threading: "multi-threading" $@54 ":" "{" multi_threading_params "}"
-#line 1350 "dhcp6_parser.yy"
+#line 1352 "dhcp6_parser.yy"
                                                              {
     // The enable parameter is required.
     ctx.require("enable-multi-threading", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -2431,7 +2431,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 328: // multi_threading_params: multi_threading_params ","
-#line 1359 "dhcp6_parser.yy"
+#line 1361 "dhcp6_parser.yy"
                                                      {
                           ctx.warnAboutExtraCommas(yystack_[0].location);
                           }
@@ -2439,7 +2439,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 335: // enable_multi_threading: "enable-multi-threading" ":" "boolean"
-#line 1372 "dhcp6_parser.yy"
+#line 1374 "dhcp6_parser.yy"
                                                              {
     ctx.unique("enable-multi-threading", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
@@ -2449,7 +2449,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 336: // thread_pool_size: "thread-pool-size" ":" "integer"
-#line 1378 "dhcp6_parser.yy"
+#line 1380 "dhcp6_parser.yy"
                                                  {
     ctx.unique("thread-pool-size", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2459,7 +2459,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 337: // packet_queue_size: "packet-queue-size" ":" "integer"
-#line 1384 "dhcp6_parser.yy"
+#line 1386 "dhcp6_parser.yy"
                                                    {
     ctx.unique("packet-queue-size", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2469,7 +2469,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 338: // $@55: %empty
-#line 1390 "dhcp6_parser.yy"
+#line 1392 "dhcp6_parser.yy"
                                  {
     ctx.unique("hooks-libraries", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -2481,7 +2481,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 339: // hooks_libraries: "hooks-libraries" $@55 ":" "[" hooks_libraries_list "]"
-#line 1396 "dhcp6_parser.yy"
+#line 1398 "dhcp6_parser.yy"
                                                              {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2490,7 +2490,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 344: // not_empty_hooks_libraries_list: not_empty_hooks_libraries_list ","
-#line 1407 "dhcp6_parser.yy"
+#line 1409 "dhcp6_parser.yy"
                                            {
         ctx.warnAboutExtraCommas(yystack_[0].location);
         }
@@ -2498,7 +2498,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 345: // $@56: %empty
-#line 1412 "dhcp6_parser.yy"
+#line 1414 "dhcp6_parser.yy"
                               {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2508,7 +2508,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 346: // hooks_library: "{" $@56 hooks_params "}"
-#line 1416 "dhcp6_parser.yy"
+#line 1418 "dhcp6_parser.yy"
                               {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2518,7 +2518,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 347: // $@57: %empty
-#line 1422 "dhcp6_parser.yy"
+#line 1424 "dhcp6_parser.yy"
                                   {
     // Parse the hooks-libraries list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2528,7 +2528,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 348: // sub_hooks_library: "{" $@57 hooks_params "}"
-#line 1426 "dhcp6_parser.yy"
+#line 1428 "dhcp6_parser.yy"
                               {
     // The library hooks parameter is required
     ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2538,7 +2538,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 351: // hooks_params: hooks_params ","
-#line 1434 "dhcp6_parser.yy"
+#line 1436 "dhcp6_parser.yy"
                                  {
                 ctx.warnAboutExtraCommas(yystack_[0].location);
                 }
@@ -2546,7 +2546,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 355: // $@58: %empty
-#line 1444 "dhcp6_parser.yy"
+#line 1446 "dhcp6_parser.yy"
                  {
     ctx.unique("library", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2555,7 +2555,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 356: // library: "library" $@58 ":" "constant string"
-#line 1447 "dhcp6_parser.yy"
+#line 1449 "dhcp6_parser.yy"
                {
     ElementPtr lib(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("library", lib);
@@ -2565,7 +2565,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 357: // $@59: %empty
-#line 1453 "dhcp6_parser.yy"
+#line 1455 "dhcp6_parser.yy"
                        {
     ctx.unique("parameters", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2574,7 +2574,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 358: // parameters: "parameters" $@59 ":" map_value
-#line 1456 "dhcp6_parser.yy"
+#line 1458 "dhcp6_parser.yy"
                   {
     ctx.stack_.back()->set("parameters", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
@@ -2583,7 +2583,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 359: // $@60: %empty
-#line 1462 "dhcp6_parser.yy"
+#line 1464 "dhcp6_parser.yy"
                                                      {
     ctx.unique("expired-leases-processing", ctx.loc2pos(yystack_[0].location));
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2595,7 +2595,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 360: // expired_leases_processing: "expired-leases-processing" $@60 ":" "{" expired_leases_params "}"
-#line 1468 "dhcp6_parser.yy"
+#line 1470 "dhcp6_parser.yy"
                                                             {
     // No expired lease parameter is required
     ctx.stack_.pop_back();
@@ -2605,7 +2605,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 363: // expired_leases_params: expired_leases_params ","
-#line 1476 "dhcp6_parser.yy"
+#line 1478 "dhcp6_parser.yy"
                                                    {
                          ctx.warnAboutExtraCommas(yystack_[0].location);
                          }
@@ -2613,7 +2613,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 370: // reclaim_timer_wait_time: "reclaim-timer-wait-time" ":" "integer"
-#line 1489 "dhcp6_parser.yy"
+#line 1491 "dhcp6_parser.yy"
                                                                {
     ctx.unique("reclaim-timer-wait-time", ctx.loc2pos(yystack_[2].location));
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2623,7 +2623,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 371: // flush_reclaimed_timer_wait_time: "flush-reclaimed-timer-wait-time" ":" "integer"
-#line 1495 "dhcp6_parser.yy"
+#line 1497 "dhcp6_parser.yy"
                                                                                {
     ctx.unique("flush-reclaimed-timer-wait-time", ctx.loc2pos(yystack_[2].location));
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2633,7 +2633,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 372: // hold_reclaimed_time: "hold-reclaimed-time" ":" "integer"
-#line 1501 "dhcp6_parser.yy"
+#line 1503 "dhcp6_parser.yy"
                                                        {
     ctx.unique("hold-reclaimed-time", ctx.loc2pos(yystack_[2].location));
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2643,7 +2643,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 373: // max_reclaim_leases: "max-reclaim-leases" ":" "integer"
-#line 1507 "dhcp6_parser.yy"
+#line 1509 "dhcp6_parser.yy"
                                                      {
     ctx.unique("max-reclaim-leases", ctx.loc2pos(yystack_[2].location));
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2653,7 +2653,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 374: // max_reclaim_time: "max-reclaim-time" ":" "integer"
-#line 1513 "dhcp6_parser.yy"
+#line 1515 "dhcp6_parser.yy"
                                                  {
     ctx.unique("max-reclaim-time", ctx.loc2pos(yystack_[2].location));
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2663,7 +2663,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 375: // unwarned_reclaim_cycles: "unwarned-reclaim-cycles" ":" "integer"
-#line 1519 "dhcp6_parser.yy"
+#line 1521 "dhcp6_parser.yy"
                                                                {
     ctx.unique("unwarned-reclaim-cycles", ctx.loc2pos(yystack_[2].location));
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
@@ -2673,7 +2673,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 376: // $@61: %empty
-#line 1528 "dhcp6_parser.yy"
+#line 1530 "dhcp6_parser.yy"
                       {
     ctx.unique("subnet6", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -2685,7 +2685,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 377: // subnet6_list: "subnet6" $@61 ":" "[" subnet6_list_content "]"
-#line 1534 "dhcp6_parser.yy"
+#line 1536 "dhcp6_parser.yy"
                                                              {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2694,7 +2694,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 382: // not_empty_subnet6_list: not_empty_subnet6_list ","
-#line 1548 "dhcp6_parser.yy"
+#line 1550 "dhcp6_parser.yy"
                                                      {
                           ctx.warnAboutExtraCommas(yystack_[0].location);
                           }
@@ -2702,7 +2702,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 383: // $@62: %empty
-#line 1557 "dhcp6_parser.yy"
+#line 1559 "dhcp6_parser.yy"
                         {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2712,7 +2712,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 384: // subnet6: "{" $@62 subnet6_params "}"
-#line 1561 "dhcp6_parser.yy"
+#line 1563 "dhcp6_parser.yy"
                                 {
     // Once we reached this place, the subnet parsing is now complete.
     // If we want to, we can implement default values here.
@@ -2738,7 +2738,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 385: // $@63: %empty
-#line 1583 "dhcp6_parser.yy"
+#line 1585 "dhcp6_parser.yy"
                             {
     // Parse the subnet6 list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2748,7 +2748,7 @@ namespace isc { namespace dhcp {
     break;
 
   case 386: // sub_subnet6: "{" $@63 subnet6_params "}"
-#line 1587 "dhcp6_parser.yy"
+#line 1589 "dhcp6_parser.yy"
                                 {
     // The subnet subnet6 parameter is required
     ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2758,15 +2758,15 @@ namespace isc { namespace dhcp {
     break;
 
   case 389: // subnet6_params: subnet6_params ","
-#line 1596 "dhcp6_parser.yy"
+#line 1598 "dhcp6_parser.yy"
                                      {
                   ctx.warnAboutExtraCommas(yystack_[0].location);
                   }
 #line 2766 "dhcp6_parser.cc"
     break;
 
-  case 436: // $@64: %empty
-#line 1650 "dhcp6_parser.yy"
+  case 437: // $@64: %empty
+#line 1653 "dhcp6_parser.yy"
                {
     ctx.unique("subnet", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2774,8 +2774,8 @@ namespace isc { namespace dhcp {
 #line 2775 "dhcp6_parser.cc"
     break;
 
-  case 437: // subnet: "subnet" $@64 ":" "constant string"
-#line 1653 "dhcp6_parser.yy"
+  case 438: // subnet: "subnet" $@64 ":" "constant string"
+#line 1656 "dhcp6_parser.yy"
                {
     ElementPtr subnet(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("subnet", subnet);
@@ -2784,8 +2784,8 @@ namespace isc { namespace dhcp {
 #line 2785 "dhcp6_parser.cc"
     break;
 
-  case 438: // $@65: %empty
-#line 1659 "dhcp6_parser.yy"
+  case 439: // $@65: %empty
+#line 1662 "dhcp6_parser.yy"
                      {
     ctx.unique("interface", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2793,8 +2793,8 @@ namespace isc { namespace dhcp {
 #line 2794 "dhcp6_parser.cc"
     break;
 
-  case 439: // interface: "interface" $@65 ":" "constant string"
-#line 1662 "dhcp6_parser.yy"
+  case 440: // interface: "interface" $@65 ":" "constant string"
+#line 1665 "dhcp6_parser.yy"
                {
     ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface", iface);
@@ -2803,8 +2803,8 @@ namespace isc { namespace dhcp {
 #line 2804 "dhcp6_parser.cc"
     break;
 
-  case 440: // $@66: %empty
-#line 1668 "dhcp6_parser.yy"
+  case 441: // $@66: %empty
+#line 1671 "dhcp6_parser.yy"
                            {
     ctx.unique("interface-id", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2812,8 +2812,8 @@ namespace isc { namespace dhcp {
 #line 2813 "dhcp6_parser.cc"
     break;
 
-  case 441: // interface_id: "interface-id" $@66 ":" "constant string"
-#line 1671 "dhcp6_parser.yy"
+  case 442: // interface_id: "interface-id" $@66 ":" "constant string"
+#line 1674 "dhcp6_parser.yy"
                {
     ElementPtr iface(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("interface-id", iface);
@@ -2822,8 +2822,8 @@ namespace isc { namespace dhcp {
 #line 2823 "dhcp6_parser.cc"
     break;
 
-  case 442: // $@67: %empty
-#line 1677 "dhcp6_parser.yy"
+  case 443: // $@67: %empty
+#line 1680 "dhcp6_parser.yy"
                            {
     ctx.unique("client-class", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
@@ -2831,8 +2831,8 @@ namespace isc { namespace dhcp {
 #line 2832 "dhcp6_parser.cc"
     break;
 
-  case 443: // client_class: "client-class" $@67 ":" "constant string"
-#line 1680 "dhcp6_parser.yy"
+  case 444: // client_class: "client-class" $@67 ":" "constant string"
+#line 1683 "dhcp6_parser.yy"
                {
     ElementPtr cls(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-class", cls);
@@ -2841,8 +2841,8 @@ namespace isc { namespace dhcp {
 #line 2842 "dhcp6_parser.cc"
     break;
 
-  case 444: // $@68: %empty
-#line 1686 "dhcp6_parser.yy"
+  case 445: // $@68: %empty
+#line 1690 "dhcp6_parser.yy"
                                                {
     ctx.unique("require-client-classes", ctx.loc2pos(yystack_[0].location));
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -2853,8 +2853,8 @@ namespace isc { namespace dhcp {
 #line 2854 "dhcp6_parser.cc"
     break;
 
-  case 445: // require_client_classes: "require-client-classes" $@68 ":" list_strings
-#line 1692 "dhcp6_parser.yy"
+  case 446: // require_client_classes: "require-client-classes" $@68 ":" list_strings
+#line 1696 "dhcp6_parser.yy"
                      {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2862,58 +2862,79 @@ namespace isc { namespace dhcp {
 #line 2863 "dhcp6_parser.cc"
     break;
 
-  case 446: // reservations_global: "reservations-global" ":" "boolean"
-#line 1697 "dhcp6_parser.yy"
+  case 447: // $@69: %empty
+#line 1701 "dhcp6_parser.yy"
+                                                         {
+    ctx.unique("evaluate-additional-classes", ctx.loc2pos(yystack_[0].location));
+    ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
+    ctx.stack_.back()->set("evaluate-additional-classes", c);
+    ctx.stack_.push_back(c);
+    ctx.enter(ctx.NO_KEYWORD);
+}
+#line 2875 "dhcp6_parser.cc"
+    break;
+
+  case 448: // evaluate_additional_classes: "evaluate-additional-classes" $@69 ":" list_strings
+#line 1707 "dhcp6_parser.yy"
+                     {
+    ctx.stack_.pop_back();
+    ctx.leave();
+}
+#line 2884 "dhcp6_parser.cc"
+    break;
+
+  case 449: // reservations_global: "reservations-global" ":" "boolean"
+#line 1713 "dhcp6_parser.yy"
                                                        {
     ctx.unique("reservations-global", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations-global", b);
 }
-#line 2873 "dhcp6_parser.cc"
+#line 2894 "dhcp6_parser.cc"
     break;
 
-  case 447: // reservations_in_subnet: "reservations-in-subnet" ":" "boolean"
-#line 1703 "dhcp6_parser.yy"
+  case 450: // reservations_in_subnet: "reservations-in-subnet" ":" "boolean"
+#line 1719 "dhcp6_parser.yy"
                                                              {
     ctx.unique("reservations-in-subnet", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations-in-subnet", b);
 }
-#line 2883 "dhcp6_parser.cc"
+#line 2904 "dhcp6_parser.cc"
     break;
 
-  case 448: // reservations_out_of_pool: "reservations-out-of-pool" ":" "boolean"
-#line 1709 "dhcp6_parser.yy"
+  case 451: // reservations_out_of_pool: "reservations-out-of-pool" ":" "boolean"
+#line 1725 "dhcp6_parser.yy"
                                                                  {
     ctx.unique("reservations-out-of-pool", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations-out-of-pool", b);
 }
-#line 2893 "dhcp6_parser.cc"
+#line 2914 "dhcp6_parser.cc"
     break;
 
-  case 449: // id: "id" ":" "integer"
-#line 1715 "dhcp6_parser.yy"
+  case 452: // id: "id" ":" "integer"
+#line 1731 "dhcp6_parser.yy"
                      {
     ctx.unique("id", ctx.loc2pos(yystack_[2].location));
     ElementPtr id(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("id", id);
 }
-#line 2903 "dhcp6_parser.cc"
+#line 2924 "dhcp6_parser.cc"
     break;
 
-  case 450: // rapid_commit: "rapid-commit" ":" "boolean"
-#line 1721 "dhcp6_parser.yy"
+  case 453: // rapid_commit: "rapid-commit" ":" "boolean"
+#line 1737 "dhcp6_parser.yy"
                                          {
     ctx.unique("rapid-commit", ctx.loc2pos(yystack_[2].location));
     ElementPtr rc(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("rapid-commit", rc);
 }
-#line 2913 "dhcp6_parser.cc"
+#line 2934 "dhcp6_parser.cc"
     break;
 
-  case 451: // $@69: %empty
-#line 1729 "dhcp6_parser.yy"
+  case 454: // $@70: %empty
+#line 1745 "dhcp6_parser.yy"
                                  {
     ctx.unique("shared-networks", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -2921,54 +2942,54 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.SHARED_NETWORK);
 }
-#line 2925 "dhcp6_parser.cc"
+#line 2946 "dhcp6_parser.cc"
     break;
 
-  case 452: // shared_networks: "shared-networks" $@69 ":" "[" shared_networks_content "]"
-#line 1735 "dhcp6_parser.yy"
+  case 455: // shared_networks: "shared-networks" $@70 ":" "[" shared_networks_content "]"
+#line 1751 "dhcp6_parser.yy"
                                                                 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2934 "dhcp6_parser.cc"
+#line 2955 "dhcp6_parser.cc"
     break;
 
-  case 457: // shared_networks_list: shared_networks_list ","
-#line 1748 "dhcp6_parser.yy"
+  case 460: // shared_networks_list: shared_networks_list ","
+#line 1764 "dhcp6_parser.yy"
                                                  {
                         ctx.warnAboutExtraCommas(yystack_[0].location);
                         }
-#line 2942 "dhcp6_parser.cc"
+#line 2963 "dhcp6_parser.cc"
     break;
 
-  case 458: // $@70: %empty
-#line 1753 "dhcp6_parser.yy"
+  case 461: // $@71: %empty
+#line 1769 "dhcp6_parser.yy"
                                {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 2952 "dhcp6_parser.cc"
+#line 2973 "dhcp6_parser.cc"
     break;
 
-  case 459: // shared_network: "{" $@70 shared_network_params "}"
-#line 1757 "dhcp6_parser.yy"
+  case 462: // shared_network: "{" $@71 shared_network_params "}"
+#line 1773 "dhcp6_parser.yy"
                                        {
     ctx.stack_.pop_back();
 }
-#line 2960 "dhcp6_parser.cc"
+#line 2981 "dhcp6_parser.cc"
     break;
 
-  case 462: // shared_network_params: shared_network_params ","
-#line 1763 "dhcp6_parser.yy"
+  case 465: // shared_network_params: shared_network_params ","
+#line 1779 "dhcp6_parser.yy"
                                                    {
                          ctx.warnAboutExtraCommas(yystack_[0].location);
                          }
-#line 2968 "dhcp6_parser.cc"
+#line 2989 "dhcp6_parser.cc"
     break;
 
-  case 506: // $@71: %empty
-#line 1817 "dhcp6_parser.yy"
+  case 510: // $@72: %empty
+#line 1834 "dhcp6_parser.yy"
                             {
     ctx.unique("option-def", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -2976,55 +2997,55 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OPTION_DEF);
 }
-#line 2980 "dhcp6_parser.cc"
+#line 3001 "dhcp6_parser.cc"
     break;
 
-  case 507: // option_def_list: "option-def" $@71 ":" "[" option_def_list_content "]"
-#line 1823 "dhcp6_parser.yy"
+  case 511: // option_def_list: "option-def" $@72 ":" "[" option_def_list_content "]"
+#line 1840 "dhcp6_parser.yy"
                                                                 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 2989 "dhcp6_parser.cc"
+#line 3010 "dhcp6_parser.cc"
     break;
 
-  case 508: // $@72: %empty
-#line 1831 "dhcp6_parser.yy"
+  case 512: // $@73: %empty
+#line 1848 "dhcp6_parser.yy"
                                     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 2998 "dhcp6_parser.cc"
+#line 3019 "dhcp6_parser.cc"
     break;
 
-  case 509: // sub_option_def_list: "{" $@72 option_def_list "}"
-#line 1834 "dhcp6_parser.yy"
+  case 513: // sub_option_def_list: "{" $@73 option_def_list "}"
+#line 1851 "dhcp6_parser.yy"
                                  {
     // parsing completed
 }
-#line 3006 "dhcp6_parser.cc"
+#line 3027 "dhcp6_parser.cc"
     break;
 
-  case 514: // not_empty_option_def_list: not_empty_option_def_list ","
-#line 1846 "dhcp6_parser.yy"
+  case 518: // not_empty_option_def_list: not_empty_option_def_list ","
+#line 1863 "dhcp6_parser.yy"
                                                            {
                              ctx.warnAboutExtraCommas(yystack_[0].location);
                              }
-#line 3014 "dhcp6_parser.cc"
+#line 3035 "dhcp6_parser.cc"
     break;
 
-  case 515: // $@73: %empty
-#line 1853 "dhcp6_parser.yy"
+  case 519: // $@74: %empty
+#line 1870 "dhcp6_parser.yy"
                                  {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3024 "dhcp6_parser.cc"
+#line 3045 "dhcp6_parser.cc"
     break;
 
-  case 516: // option_def_entry: "{" $@73 option_def_params "}"
-#line 1857 "dhcp6_parser.yy"
+  case 520: // option_def_entry: "{" $@74 option_def_params "}"
+#line 1874 "dhcp6_parser.yy"
                                    {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -3032,21 +3053,21 @@ namespace isc { namespace dhcp {
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 3036 "dhcp6_parser.cc"
+#line 3057 "dhcp6_parser.cc"
     break;
 
-  case 517: // $@74: %empty
-#line 1868 "dhcp6_parser.yy"
+  case 521: // $@75: %empty
+#line 1885 "dhcp6_parser.yy"
                                {
     // Parse the option-def list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3046 "dhcp6_parser.cc"
+#line 3067 "dhcp6_parser.cc"
     break;
 
-  case 518: // sub_option_def: "{" $@74 option_def_params "}"
-#line 1872 "dhcp6_parser.yy"
+  case 522: // sub_option_def: "{" $@75 option_def_params "}"
+#line 1889 "dhcp6_parser.yy"
                                    {
     // The name, code and type option def parameters are required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -3054,115 +3075,115 @@ namespace isc { namespace dhcp {
     ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 3058 "dhcp6_parser.cc"
+#line 3079 "dhcp6_parser.cc"
     break;
 
-  case 523: // not_empty_option_def_params: not_empty_option_def_params ","
-#line 1888 "dhcp6_parser.yy"
+  case 527: // not_empty_option_def_params: not_empty_option_def_params ","
+#line 1905 "dhcp6_parser.yy"
                                                                {
                                ctx.warnAboutExtraCommas(yystack_[0].location);
                                }
-#line 3066 "dhcp6_parser.cc"
+#line 3087 "dhcp6_parser.cc"
     break;
 
-  case 535: // code: "code" ":" "integer"
-#line 1907 "dhcp6_parser.yy"
+  case 539: // code: "code" ":" "integer"
+#line 1924 "dhcp6_parser.yy"
                          {
     ctx.unique("code", ctx.loc2pos(yystack_[2].location));
     ElementPtr code(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("code", code);
 }
-#line 3076 "dhcp6_parser.cc"
+#line 3097 "dhcp6_parser.cc"
     break;
 
-  case 537: // $@75: %empty
-#line 1915 "dhcp6_parser.yy"
+  case 541: // $@76: %empty
+#line 1932 "dhcp6_parser.yy"
                       {
     ctx.unique("type", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3085 "dhcp6_parser.cc"
+#line 3106 "dhcp6_parser.cc"
     break;
 
-  case 538: // option_def_type: "type" $@75 ":" "constant string"
-#line 1918 "dhcp6_parser.yy"
+  case 542: // option_def_type: "type" $@76 ":" "constant string"
+#line 1935 "dhcp6_parser.yy"
                {
     ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("type", prf);
     ctx.leave();
 }
-#line 3095 "dhcp6_parser.cc"
+#line 3116 "dhcp6_parser.cc"
     break;
 
-  case 539: // $@76: %empty
-#line 1924 "dhcp6_parser.yy"
+  case 543: // $@77: %empty
+#line 1941 "dhcp6_parser.yy"
                                       {
     ctx.unique("record-types", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3104 "dhcp6_parser.cc"
+#line 3125 "dhcp6_parser.cc"
     break;
 
-  case 540: // option_def_record_types: "record-types" $@76 ":" "constant string"
-#line 1927 "dhcp6_parser.yy"
+  case 544: // option_def_record_types: "record-types" $@77 ":" "constant string"
+#line 1944 "dhcp6_parser.yy"
                {
     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 3114 "dhcp6_parser.cc"
+#line 3135 "dhcp6_parser.cc"
     break;
 
-  case 541: // $@77: %empty
-#line 1933 "dhcp6_parser.yy"
+  case 545: // $@78: %empty
+#line 1950 "dhcp6_parser.yy"
              {
     ctx.unique("space", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3123 "dhcp6_parser.cc"
+#line 3144 "dhcp6_parser.cc"
     break;
 
-  case 542: // space: "space" $@77 ":" "constant string"
-#line 1936 "dhcp6_parser.yy"
+  case 546: // space: "space" $@78 ":" "constant string"
+#line 1953 "dhcp6_parser.yy"
                {
     ElementPtr space(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("space", space);
     ctx.leave();
 }
-#line 3133 "dhcp6_parser.cc"
+#line 3154 "dhcp6_parser.cc"
     break;
 
-  case 544: // $@78: %empty
-#line 1944 "dhcp6_parser.yy"
+  case 548: // $@79: %empty
+#line 1961 "dhcp6_parser.yy"
                                     {
     ctx.unique("encapsulate", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3142 "dhcp6_parser.cc"
+#line 3163 "dhcp6_parser.cc"
     break;
 
-  case 545: // option_def_encapsulate: "encapsulate" $@78 ":" "constant string"
-#line 1947 "dhcp6_parser.yy"
+  case 549: // option_def_encapsulate: "encapsulate" $@79 ":" "constant string"
+#line 1964 "dhcp6_parser.yy"
                {
     ElementPtr encap(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("encapsulate", encap);
     ctx.leave();
 }
-#line 3152 "dhcp6_parser.cc"
+#line 3173 "dhcp6_parser.cc"
     break;
 
-  case 546: // option_def_array: "array" ":" "boolean"
-#line 1953 "dhcp6_parser.yy"
+  case 550: // option_def_array: "array" ":" "boolean"
+#line 1970 "dhcp6_parser.yy"
                                       {
     ctx.unique("array", ctx.loc2pos(yystack_[2].location));
     ElementPtr array(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("array", array);
 }
-#line 3162 "dhcp6_parser.cc"
+#line 3183 "dhcp6_parser.cc"
     break;
 
-  case 547: // $@79: %empty
-#line 1963 "dhcp6_parser.yy"
+  case 551: // $@80: %empty
+#line 1980 "dhcp6_parser.yy"
                               {
     ctx.unique("option-data", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -3170,123 +3191,123 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OPTION_DATA);
 }
-#line 3174 "dhcp6_parser.cc"
+#line 3195 "dhcp6_parser.cc"
     break;
 
-  case 548: // option_data_list: "option-data" $@79 ":" "[" option_data_list_content "]"
-#line 1969 "dhcp6_parser.yy"
+  case 552: // option_data_list: "option-data" $@80 ":" "[" option_data_list_content "]"
+#line 1986 "dhcp6_parser.yy"
                                                                  {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3183 "dhcp6_parser.cc"
+#line 3204 "dhcp6_parser.cc"
     break;
 
-  case 553: // not_empty_option_data_list: not_empty_option_data_list ","
-#line 1984 "dhcp6_parser.yy"
+  case 557: // not_empty_option_data_list: not_empty_option_data_list ","
+#line 2001 "dhcp6_parser.yy"
                                                              {
                               ctx.warnAboutExtraCommas(yystack_[0].location);
                               }
-#line 3191 "dhcp6_parser.cc"
+#line 3212 "dhcp6_parser.cc"
     break;
 
-  case 554: // $@80: %empty
-#line 1991 "dhcp6_parser.yy"
+  case 558: // $@81: %empty
+#line 2008 "dhcp6_parser.yy"
                                   {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3201 "dhcp6_parser.cc"
+#line 3222 "dhcp6_parser.cc"
     break;
 
-  case 555: // option_data_entry: "{" $@80 option_data_params "}"
-#line 1995 "dhcp6_parser.yy"
+  case 559: // option_data_entry: "{" $@81 option_data_params "}"
+#line 2012 "dhcp6_parser.yy"
                                     {
     /// @todo: the code or name parameters are required.
     ctx.stack_.pop_back();
 }
-#line 3210 "dhcp6_parser.cc"
+#line 3231 "dhcp6_parser.cc"
     break;
 
-  case 556: // $@81: %empty
-#line 2003 "dhcp6_parser.yy"
+  case 560: // $@82: %empty
+#line 2020 "dhcp6_parser.yy"
                                 {
     // Parse the option-data list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3220 "dhcp6_parser.cc"
+#line 3241 "dhcp6_parser.cc"
     break;
 
-  case 557: // sub_option_data: "{" $@81 option_data_params "}"
-#line 2007 "dhcp6_parser.yy"
+  case 561: // sub_option_data: "{" $@82 option_data_params "}"
+#line 2024 "dhcp6_parser.yy"
                                     {
     /// @todo: the code or name parameters are required.
     // parsing completed
 }
-#line 3229 "dhcp6_parser.cc"
+#line 3250 "dhcp6_parser.cc"
     break;
 
-  case 562: // not_empty_option_data_params: not_empty_option_data_params ","
-#line 2023 "dhcp6_parser.yy"
+  case 566: // not_empty_option_data_params: not_empty_option_data_params ","
+#line 2040 "dhcp6_parser.yy"
                                          {
         ctx.warnAboutExtraCommas(yystack_[0].location);
         }
-#line 3237 "dhcp6_parser.cc"
+#line 3258 "dhcp6_parser.cc"
     break;
 
-  case 575: // $@82: %empty
-#line 2045 "dhcp6_parser.yy"
+  case 579: // $@83: %empty
+#line 2062 "dhcp6_parser.yy"
                        {
     ctx.unique("data", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3246 "dhcp6_parser.cc"
+#line 3267 "dhcp6_parser.cc"
     break;
 
-  case 576: // option_data_data: "data" $@82 ":" "constant string"
-#line 2048 "dhcp6_parser.yy"
+  case 580: // option_data_data: "data" $@83 ":" "constant string"
+#line 2065 "dhcp6_parser.yy"
                {
     ElementPtr data(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
     ctx.leave();
 }
-#line 3256 "dhcp6_parser.cc"
+#line 3277 "dhcp6_parser.cc"
     break;
 
-  case 579: // option_data_csv_format: "csv-format" ":" "boolean"
-#line 2058 "dhcp6_parser.yy"
+  case 583: // option_data_csv_format: "csv-format" ":" "boolean"
+#line 2075 "dhcp6_parser.yy"
                                                  {
     ctx.unique("csv-format", ctx.loc2pos(yystack_[2].location));
     ElementPtr csv(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", csv);
 }
-#line 3266 "dhcp6_parser.cc"
+#line 3287 "dhcp6_parser.cc"
     break;
 
-  case 580: // option_data_always_send: "always-send" ":" "boolean"
-#line 2064 "dhcp6_parser.yy"
+  case 584: // option_data_always_send: "always-send" ":" "boolean"
+#line 2081 "dhcp6_parser.yy"
                                                    {
     ctx.unique("always-send", ctx.loc2pos(yystack_[2].location));
     ElementPtr persist(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
 }
-#line 3276 "dhcp6_parser.cc"
+#line 3297 "dhcp6_parser.cc"
     break;
 
-  case 581: // option_data_never_send: "never-send" ":" "boolean"
-#line 2070 "dhcp6_parser.yy"
+  case 585: // option_data_never_send: "never-send" ":" "boolean"
+#line 2087 "dhcp6_parser.yy"
                                                  {
     ctx.unique("never-send", ctx.loc2pos(yystack_[2].location));
     ElementPtr cancel(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("never-send", cancel);
 }
-#line 3286 "dhcp6_parser.cc"
+#line 3307 "dhcp6_parser.cc"
     break;
 
-  case 582: // $@83: %empty
-#line 2076 "dhcp6_parser.yy"
+  case 586: // $@84: %empty
+#line 2093 "dhcp6_parser.yy"
                                            {
     ctx.unique("client-classes", ctx.loc2pos(yystack_[0].location));
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -3294,20 +3315,20 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(c);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3298 "dhcp6_parser.cc"
+#line 3319 "dhcp6_parser.cc"
     break;
 
-  case 583: // option_data_client_classes: "client-classes" $@83 ":" list_strings
-#line 2082 "dhcp6_parser.yy"
+  case 587: // option_data_client_classes: "client-classes" $@84 ":" list_strings
+#line 2099 "dhcp6_parser.yy"
                      {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3307 "dhcp6_parser.cc"
+#line 3328 "dhcp6_parser.cc"
     break;
 
-  case 584: // $@84: %empty
-#line 2090 "dhcp6_parser.yy"
+  case 588: // $@85: %empty
+#line 2107 "dhcp6_parser.yy"
                   {
     ctx.unique("pools", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -3315,113 +3336,113 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.POOLS);
 }
-#line 3319 "dhcp6_parser.cc"
+#line 3340 "dhcp6_parser.cc"
     break;
 
-  case 585: // pools_list: "pools" $@84 ":" "[" pools_list_content "]"
-#line 2096 "dhcp6_parser.yy"
+  case 589: // pools_list: "pools" $@85 ":" "[" pools_list_content "]"
+#line 2113 "dhcp6_parser.yy"
                                                            {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3328 "dhcp6_parser.cc"
+#line 3349 "dhcp6_parser.cc"
     break;
 
-  case 590: // not_empty_pools_list: not_empty_pools_list ","
-#line 2109 "dhcp6_parser.yy"
+  case 594: // not_empty_pools_list: not_empty_pools_list ","
+#line 2126 "dhcp6_parser.yy"
                                                  {
                         ctx.warnAboutExtraCommas(yystack_[0].location);
                         }
-#line 3336 "dhcp6_parser.cc"
+#line 3357 "dhcp6_parser.cc"
     break;
 
-  case 591: // $@85: %empty
-#line 2114 "dhcp6_parser.yy"
+  case 595: // $@86: %empty
+#line 2131 "dhcp6_parser.yy"
                                 {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3346 "dhcp6_parser.cc"
+#line 3367 "dhcp6_parser.cc"
     break;
 
-  case 592: // pool_list_entry: "{" $@85 pool_params "}"
-#line 2118 "dhcp6_parser.yy"
+  case 596: // pool_list_entry: "{" $@86 pool_params "}"
+#line 2135 "dhcp6_parser.yy"
                              {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 3356 "dhcp6_parser.cc"
+#line 3377 "dhcp6_parser.cc"
     break;
 
-  case 593: // $@86: %empty
-#line 2124 "dhcp6_parser.yy"
+  case 597: // $@87: %empty
+#line 2141 "dhcp6_parser.yy"
                           {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3366 "dhcp6_parser.cc"
+#line 3387 "dhcp6_parser.cc"
     break;
 
-  case 594: // sub_pool6: "{" $@86 pool_params "}"
-#line 2128 "dhcp6_parser.yy"
+  case 598: // sub_pool6: "{" $@87 pool_params "}"
+#line 2145 "dhcp6_parser.yy"
                              {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 3376 "dhcp6_parser.cc"
+#line 3397 "dhcp6_parser.cc"
     break;
 
-  case 597: // pool_params: pool_params ","
-#line 2136 "dhcp6_parser.yy"
+  case 601: // pool_params: pool_params ","
+#line 2153 "dhcp6_parser.yy"
                                {
                ctx.warnAboutExtraCommas(yystack_[0].location);
                }
-#line 3384 "dhcp6_parser.cc"
+#line 3405 "dhcp6_parser.cc"
     break;
 
-  case 606: // $@87: %empty
-#line 2151 "dhcp6_parser.yy"
+  case 611: // $@88: %empty
+#line 2169 "dhcp6_parser.yy"
                  {
     ctx.unique("pool", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3393 "dhcp6_parser.cc"
+#line 3414 "dhcp6_parser.cc"
     break;
 
-  case 607: // pool_entry: "pool" $@87 ":" "constant string"
-#line 2154 "dhcp6_parser.yy"
+  case 612: // pool_entry: "pool" $@88 ":" "constant string"
+#line 2172 "dhcp6_parser.yy"
                {
     ElementPtr pool(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
     ctx.leave();
 }
-#line 3403 "dhcp6_parser.cc"
+#line 3424 "dhcp6_parser.cc"
     break;
 
-  case 608: // pool_id: "pool-id" ":" "integer"
-#line 2160 "dhcp6_parser.yy"
+  case 613: // pool_id: "pool-id" ":" "integer"
+#line 2178 "dhcp6_parser.yy"
                                {
     ctx.unique("pool-id", ctx.loc2pos(yystack_[2].location));
     ElementPtr id(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool-id", id);
 }
-#line 3413 "dhcp6_parser.cc"
+#line 3434 "dhcp6_parser.cc"
     break;
 
-  case 609: // $@88: %empty
-#line 2166 "dhcp6_parser.yy"
+  case 614: // $@89: %empty
+#line 2184 "dhcp6_parser.yy"
                            {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3421 "dhcp6_parser.cc"
+#line 3442 "dhcp6_parser.cc"
     break;
 
-  case 610: // user_context: "user-context" $@88 ":" map_value
-#line 2168 "dhcp6_parser.yy"
+  case 615: // user_context: "user-context" $@89 ":" map_value
+#line 2186 "dhcp6_parser.yy"
                   {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context = yystack_[0].value.as < ElementPtr > ();
@@ -3444,19 +3465,19 @@ namespace isc { namespace dhcp {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 3448 "dhcp6_parser.cc"
+#line 3469 "dhcp6_parser.cc"
     break;
 
-  case 611: // $@89: %empty
-#line 2191 "dhcp6_parser.yy"
+  case 616: // $@90: %empty
+#line 2209 "dhcp6_parser.yy"
                  {
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3456 "dhcp6_parser.cc"
+#line 3477 "dhcp6_parser.cc"
     break;
 
-  case 612: // comment: "comment" $@89 ":" "constant string"
-#line 2193 "dhcp6_parser.yy"
+  case 617: // comment: "comment" $@90 ":" "constant string"
+#line 2211 "dhcp6_parser.yy"
                {
     ElementPtr parent = ctx.stack_.back();
     ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location)));
@@ -3481,11 +3502,11 @@ namespace isc { namespace dhcp {
     parent->set("user-context", user_context);
     ctx.leave();
 }
-#line 3485 "dhcp6_parser.cc"
+#line 3506 "dhcp6_parser.cc"
     break;
 
-  case 613: // $@90: %empty
-#line 2221 "dhcp6_parser.yy"
+  case 618: // $@91: %empty
+#line 2239 "dhcp6_parser.yy"
                         {
     ctx.unique("pd-pools", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -3493,38 +3514,38 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.PD_POOLS);
 }
-#line 3497 "dhcp6_parser.cc"
+#line 3518 "dhcp6_parser.cc"
     break;
 
-  case 614: // pd_pools_list: "pd-pools" $@90 ":" "[" pd_pools_list_content "]"
-#line 2227 "dhcp6_parser.yy"
+  case 619: // pd_pools_list: "pd-pools" $@91 ":" "[" pd_pools_list_content "]"
+#line 2245 "dhcp6_parser.yy"
                                                               {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3506 "dhcp6_parser.cc"
+#line 3527 "dhcp6_parser.cc"
     break;
 
-  case 619: // not_empty_pd_pools_list: not_empty_pd_pools_list ","
-#line 2240 "dhcp6_parser.yy"
+  case 624: // not_empty_pd_pools_list: not_empty_pd_pools_list ","
+#line 2258 "dhcp6_parser.yy"
                                                        {
                            ctx.warnAboutExtraCommas(yystack_[0].location);
                            }
-#line 3514 "dhcp6_parser.cc"
+#line 3535 "dhcp6_parser.cc"
     break;
 
-  case 620: // $@91: %empty
-#line 2245 "dhcp6_parser.yy"
+  case 625: // $@92: %empty
+#line 2263 "dhcp6_parser.yy"
                               {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3524 "dhcp6_parser.cc"
+#line 3545 "dhcp6_parser.cc"
     break;
 
-  case 621: // pd_pool_entry: "{" $@91 pd_pool_params "}"
-#line 2249 "dhcp6_parser.yy"
+  case 626: // pd_pool_entry: "{" $@92 pd_pool_params "}"
+#line 2267 "dhcp6_parser.yy"
                                 {
     // The prefix, prefix len and delegated len parameters are required.
     ctx.require("prefix", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -3532,21 +3553,21 @@ namespace isc { namespace dhcp {
     ctx.require("delegated-len", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 3536 "dhcp6_parser.cc"
+#line 3557 "dhcp6_parser.cc"
     break;
 
-  case 622: // $@92: %empty
-#line 2257 "dhcp6_parser.yy"
+  case 627: // $@93: %empty
+#line 2275 "dhcp6_parser.yy"
                             {
     // Parse the pd-pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3546 "dhcp6_parser.cc"
+#line 3567 "dhcp6_parser.cc"
     break;
 
-  case 623: // sub_pd_pool: "{" $@92 pd_pool_params "}"
-#line 2261 "dhcp6_parser.yy"
+  case 628: // sub_pd_pool: "{" $@93 pd_pool_params "}"
+#line 2279 "dhcp6_parser.yy"
                                 {
     // The prefix, prefix len and delegated len parameters are required.
     ctx.require("prefix", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -3554,87 +3575,87 @@ namespace isc { namespace dhcp {
     ctx.require("delegated-len", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 3558 "dhcp6_parser.cc"
+#line 3579 "dhcp6_parser.cc"
     break;
 
-  case 626: // pd_pool_params: pd_pool_params ","
-#line 2271 "dhcp6_parser.yy"
+  case 631: // pd_pool_params: pd_pool_params ","
+#line 2289 "dhcp6_parser.yy"
                                      {
                   ctx.warnAboutExtraCommas(yystack_[0].location);
                   }
-#line 3566 "dhcp6_parser.cc"
+#line 3587 "dhcp6_parser.cc"
     break;
 
-  case 639: // $@93: %empty
-#line 2290 "dhcp6_parser.yy"
+  case 645: // $@94: %empty
+#line 2309 "dhcp6_parser.yy"
                   {
     ctx.unique("prefix", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3575 "dhcp6_parser.cc"
+#line 3596 "dhcp6_parser.cc"
     break;
 
-  case 640: // pd_prefix: "prefix" $@93 ":" "constant string"
-#line 2293 "dhcp6_parser.yy"
+  case 646: // pd_prefix: "prefix" $@94 ":" "constant string"
+#line 2312 "dhcp6_parser.yy"
                {
     ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefix", prf);
     ctx.leave();
 }
-#line 3585 "dhcp6_parser.cc"
+#line 3606 "dhcp6_parser.cc"
     break;
 
-  case 641: // pd_prefix_len: "prefix-len" ":" "integer"
-#line 2299 "dhcp6_parser.yy"
+  case 647: // pd_prefix_len: "prefix-len" ":" "integer"
+#line 2318 "dhcp6_parser.yy"
                                         {
     ctx.unique("prefix-len", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefix-len", prf);
 }
-#line 3595 "dhcp6_parser.cc"
+#line 3616 "dhcp6_parser.cc"
     break;
 
-  case 642: // $@94: %empty
-#line 2305 "dhcp6_parser.yy"
+  case 648: // $@95: %empty
+#line 2324 "dhcp6_parser.yy"
                                  {
     ctx.unique("excluded-prefix", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3604 "dhcp6_parser.cc"
+#line 3625 "dhcp6_parser.cc"
     break;
 
-  case 643: // excluded_prefix: "excluded-prefix" $@94 ":" "constant string"
-#line 2308 "dhcp6_parser.yy"
+  case 649: // excluded_prefix: "excluded-prefix" $@95 ":" "constant string"
+#line 2327 "dhcp6_parser.yy"
                {
     ElementPtr prf(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("excluded-prefix", prf);
     ctx.leave();
 }
-#line 3614 "dhcp6_parser.cc"
+#line 3635 "dhcp6_parser.cc"
     break;
 
-  case 644: // excluded_prefix_len: "excluded-prefix-len" ":" "integer"
-#line 2314 "dhcp6_parser.yy"
+  case 650: // excluded_prefix_len: "excluded-prefix-len" ":" "integer"
+#line 2333 "dhcp6_parser.yy"
                                                        {
     ctx.unique("excluded-prefix-len", ctx.loc2pos(yystack_[2].location));
     ElementPtr prf(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("excluded-prefix-len", prf);
 }
-#line 3624 "dhcp6_parser.cc"
+#line 3645 "dhcp6_parser.cc"
     break;
 
-  case 645: // pd_delegated_len: "delegated-len" ":" "integer"
-#line 2320 "dhcp6_parser.yy"
+  case 651: // pd_delegated_len: "delegated-len" ":" "integer"
+#line 2339 "dhcp6_parser.yy"
                                               {
     ctx.unique("delegated-len", ctx.loc2pos(yystack_[2].location));
     ElementPtr deleg(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("delegated-len", deleg);
 }
-#line 3634 "dhcp6_parser.cc"
+#line 3655 "dhcp6_parser.cc"
     break;
 
-  case 646: // $@95: %empty
-#line 2329 "dhcp6_parser.yy"
+  case 652: // $@96: %empty
+#line 2348 "dhcp6_parser.yy"
                            {
     ctx.unique("reservations", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -3642,74 +3663,74 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.RESERVATIONS);
 }
-#line 3646 "dhcp6_parser.cc"
+#line 3667 "dhcp6_parser.cc"
     break;
 
-  case 647: // reservations: "reservations" $@95 ":" "[" reservations_list "]"
-#line 2335 "dhcp6_parser.yy"
+  case 653: // reservations: "reservations" $@96 ":" "[" reservations_list "]"
+#line 2354 "dhcp6_parser.yy"
                                                           {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3655 "dhcp6_parser.cc"
+#line 3676 "dhcp6_parser.cc"
     break;
 
-  case 652: // not_empty_reservations_list: not_empty_reservations_list ","
-#line 2346 "dhcp6_parser.yy"
+  case 658: // not_empty_reservations_list: not_empty_reservations_list ","
+#line 2365 "dhcp6_parser.yy"
                                                                {
                                ctx.warnAboutExtraCommas(yystack_[0].location);
                                }
-#line 3663 "dhcp6_parser.cc"
+#line 3684 "dhcp6_parser.cc"
     break;
 
-  case 653: // $@96: %empty
-#line 2351 "dhcp6_parser.yy"
+  case 659: // $@97: %empty
+#line 2370 "dhcp6_parser.yy"
                             {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3673 "dhcp6_parser.cc"
+#line 3694 "dhcp6_parser.cc"
     break;
 
-  case 654: // reservation: "{" $@96 reservation_params "}"
-#line 2355 "dhcp6_parser.yy"
+  case 660: // reservation: "{" $@97 reservation_params "}"
+#line 2374 "dhcp6_parser.yy"
                                     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
 }
-#line 3682 "dhcp6_parser.cc"
+#line 3703 "dhcp6_parser.cc"
     break;
 
-  case 655: // $@97: %empty
-#line 2360 "dhcp6_parser.yy"
+  case 661: // $@98: %empty
+#line 2379 "dhcp6_parser.yy"
                                 {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 3692 "dhcp6_parser.cc"
+#line 3713 "dhcp6_parser.cc"
     break;
 
-  case 656: // sub_reservation: "{" $@97 reservation_params "}"
-#line 2364 "dhcp6_parser.yy"
+  case 662: // sub_reservation: "{" $@98 reservation_params "}"
+#line 2383 "dhcp6_parser.yy"
                                     {
     /// @todo: an identifier parameter is required.
     // parsing completed
 }
-#line 3701 "dhcp6_parser.cc"
+#line 3722 "dhcp6_parser.cc"
     break;
 
-  case 661: // not_empty_reservation_params: not_empty_reservation_params ","
-#line 2375 "dhcp6_parser.yy"
+  case 667: // not_empty_reservation_params: not_empty_reservation_params ","
+#line 2394 "dhcp6_parser.yy"
                                          {
         ctx.warnAboutExtraCommas(yystack_[0].location);
         }
-#line 3709 "dhcp6_parser.cc"
+#line 3730 "dhcp6_parser.cc"
     break;
 
-  case 674: // $@98: %empty
-#line 2395 "dhcp6_parser.yy"
+  case 680: // $@99: %empty
+#line 2414 "dhcp6_parser.yy"
                            {
     ctx.unique("ip-addresses", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -3717,20 +3738,20 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3721 "dhcp6_parser.cc"
+#line 3742 "dhcp6_parser.cc"
     break;
 
-  case 675: // ip_addresses: "ip-addresses" $@98 ":" list_strings
-#line 2401 "dhcp6_parser.yy"
+  case 681: // ip_addresses: "ip-addresses" $@99 ":" list_strings
+#line 2420 "dhcp6_parser.yy"
                      {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3730 "dhcp6_parser.cc"
+#line 3751 "dhcp6_parser.cc"
     break;
 
-  case 676: // $@99: %empty
-#line 2406 "dhcp6_parser.yy"
+  case 682: // $@100: %empty
+#line 2425 "dhcp6_parser.yy"
                    {
     ctx.unique("prefixes", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -3738,20 +3759,20 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3742 "dhcp6_parser.cc"
+#line 3763 "dhcp6_parser.cc"
     break;
 
-  case 677: // prefixes: "prefixes" $@99 ":" list_strings
-#line 2412 "dhcp6_parser.yy"
+  case 683: // prefixes: "prefixes" $@100 ":" list_strings
+#line 2431 "dhcp6_parser.yy"
                      {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3751 "dhcp6_parser.cc"
+#line 3772 "dhcp6_parser.cc"
     break;
 
-  case 678: // $@100: %empty
-#line 2417 "dhcp6_parser.yy"
+  case 684: // $@101: %empty
+#line 2436 "dhcp6_parser.yy"
                                      {
     ctx.unique("excluded-prefixes", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -3759,96 +3780,96 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3763 "dhcp6_parser.cc"
+#line 3784 "dhcp6_parser.cc"
     break;
 
-  case 679: // excluded_prefixes: "excluded-prefixes" $@100 ":" list_strings
-#line 2423 "dhcp6_parser.yy"
+  case 685: // excluded_prefixes: "excluded-prefixes" $@101 ":" list_strings
+#line 2442 "dhcp6_parser.yy"
                      {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3772 "dhcp6_parser.cc"
+#line 3793 "dhcp6_parser.cc"
     break;
 
-  case 680: // $@101: %empty
-#line 2428 "dhcp6_parser.yy"
+  case 686: // $@102: %empty
+#line 2447 "dhcp6_parser.yy"
            {
     ctx.unique("duid", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3781 "dhcp6_parser.cc"
+#line 3802 "dhcp6_parser.cc"
     break;
 
-  case 681: // duid: "duid" $@101 ":" "constant string"
-#line 2431 "dhcp6_parser.yy"
+  case 687: // duid: "duid" $@102 ":" "constant string"
+#line 2450 "dhcp6_parser.yy"
                {
     ElementPtr d(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
     ctx.leave();
 }
-#line 3791 "dhcp6_parser.cc"
+#line 3812 "dhcp6_parser.cc"
     break;
 
-  case 682: // $@102: %empty
-#line 2437 "dhcp6_parser.yy"
+  case 688: // $@103: %empty
+#line 2456 "dhcp6_parser.yy"
                        {
     ctx.unique("hw-address", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3800 "dhcp6_parser.cc"
+#line 3821 "dhcp6_parser.cc"
     break;
 
-  case 683: // hw_address: "hw-address" $@102 ":" "constant string"
-#line 2440 "dhcp6_parser.yy"
+  case 689: // hw_address: "hw-address" $@103 ":" "constant string"
+#line 2459 "dhcp6_parser.yy"
                {
     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 3810 "dhcp6_parser.cc"
+#line 3831 "dhcp6_parser.cc"
     break;
 
-  case 684: // $@103: %empty
-#line 2446 "dhcp6_parser.yy"
+  case 690: // $@104: %empty
+#line 2465 "dhcp6_parser.yy"
                    {
     ctx.unique("hostname", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3819 "dhcp6_parser.cc"
+#line 3840 "dhcp6_parser.cc"
     break;
 
-  case 685: // hostname: "hostname" $@103 ":" "constant string"
-#line 2449 "dhcp6_parser.yy"
+  case 691: // hostname: "hostname" $@104 ":" "constant string"
+#line 2468 "dhcp6_parser.yy"
                {
     ElementPtr host(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
     ctx.leave();
 }
-#line 3829 "dhcp6_parser.cc"
+#line 3850 "dhcp6_parser.cc"
     break;
 
-  case 686: // $@104: %empty
-#line 2455 "dhcp6_parser.yy"
+  case 692: // $@105: %empty
+#line 2474 "dhcp6_parser.yy"
                        {
     ctx.unique("flex-id", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3838 "dhcp6_parser.cc"
+#line 3859 "dhcp6_parser.cc"
     break;
 
-  case 687: // flex_id_value: "flex-id" $@104 ":" "constant string"
-#line 2458 "dhcp6_parser.yy"
+  case 693: // flex_id_value: "flex-id" $@105 ":" "constant string"
+#line 2477 "dhcp6_parser.yy"
                {
     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 3848 "dhcp6_parser.cc"
+#line 3869 "dhcp6_parser.cc"
     break;
 
-  case 688: // $@105: %empty
-#line 2464 "dhcp6_parser.yy"
+  case 694: // $@106: %empty
+#line 2483 "dhcp6_parser.yy"
                                            {
     ctx.unique("client-classes", ctx.loc2pos(yystack_[0].location));
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -3856,20 +3877,20 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(c);
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3860 "dhcp6_parser.cc"
+#line 3881 "dhcp6_parser.cc"
     break;
 
-  case 689: // reservation_client_classes: "client-classes" $@105 ":" list_strings
-#line 2470 "dhcp6_parser.yy"
+  case 695: // reservation_client_classes: "client-classes" $@106 ":" list_strings
+#line 2489 "dhcp6_parser.yy"
                      {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3869 "dhcp6_parser.cc"
+#line 3890 "dhcp6_parser.cc"
     break;
 
-  case 690: // $@106: %empty
-#line 2478 "dhcp6_parser.yy"
+  case 696: // $@107: %empty
+#line 2497 "dhcp6_parser.yy"
              {
     ctx.unique("relay", ctx.loc2pos(yystack_[0].location));
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -3877,20 +3898,20 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.RELAY);
 }
-#line 3881 "dhcp6_parser.cc"
+#line 3902 "dhcp6_parser.cc"
     break;
 
-  case 691: // relay: "relay" $@106 ":" "{" relay_map "}"
-#line 2484 "dhcp6_parser.yy"
+  case 697: // relay: "relay" $@107 ":" "{" relay_map "}"
+#line 2503 "dhcp6_parser.yy"
                                                 {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3890 "dhcp6_parser.cc"
+#line 3911 "dhcp6_parser.cc"
     break;
 
-  case 693: // $@107: %empty
-#line 2495 "dhcp6_parser.yy"
+  case 699: // $@108: %empty
+#line 2514 "dhcp6_parser.yy"
                                {
     ctx.unique("client-classes", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -3898,104 +3919,114 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.CLIENT_CLASSES);
 }
-#line 3902 "dhcp6_parser.cc"
+#line 3923 "dhcp6_parser.cc"
     break;
 
-  case 694: // client_classes: "client-classes" $@107 ":" "[" client_classes_list "]"
-#line 2501 "dhcp6_parser.yy"
+  case 700: // client_classes: "client-classes" $@108 ":" "[" client_classes_list "]"
+#line 2520 "dhcp6_parser.yy"
                                                             {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 3911 "dhcp6_parser.cc"
+#line 3932 "dhcp6_parser.cc"
     break;
 
-  case 697: // client_classes_list: client_classes_list ","
-#line 2508 "dhcp6_parser.yy"
+  case 703: // client_classes_list: client_classes_list ","
+#line 2527 "dhcp6_parser.yy"
                                                {
                        ctx.warnAboutExtraCommas(yystack_[0].location);
                        }
-#line 3919 "dhcp6_parser.cc"
+#line 3940 "dhcp6_parser.cc"
     break;
 
-  case 698: // $@108: %empty
-#line 2513 "dhcp6_parser.yy"
+  case 704: // $@109: %empty
+#line 2532 "dhcp6_parser.yy"
                                    {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 3929 "dhcp6_parser.cc"
+#line 3950 "dhcp6_parser.cc"
     break;
 
-  case 699: // client_class_entry: "{" $@108 client_class_params "}"
-#line 2517 "dhcp6_parser.yy"
+  case 705: // client_class_entry: "{" $@109 client_class_params "}"
+#line 2536 "dhcp6_parser.yy"
                                      {
     // The name client class parameter is required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
 }
-#line 3939 "dhcp6_parser.cc"
+#line 3960 "dhcp6_parser.cc"
     break;
 
-  case 704: // not_empty_client_class_params: not_empty_client_class_params ","
-#line 2529 "dhcp6_parser.yy"
+  case 710: // not_empty_client_class_params: not_empty_client_class_params ","
+#line 2548 "dhcp6_parser.yy"
                                           {
         ctx.warnAboutExtraCommas(yystack_[0].location);
         }
-#line 3947 "dhcp6_parser.cc"
+#line 3968 "dhcp6_parser.cc"
     break;
 
-  case 720: // $@109: %empty
-#line 2552 "dhcp6_parser.yy"
+  case 727: // $@110: %empty
+#line 2572 "dhcp6_parser.yy"
                         {
     ctx.unique("test", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3956 "dhcp6_parser.cc"
+#line 3977 "dhcp6_parser.cc"
     break;
 
-  case 721: // client_class_test: "test" $@109 ":" "constant string"
-#line 2555 "dhcp6_parser.yy"
+  case 728: // client_class_test: "test" $@110 ":" "constant string"
+#line 2575 "dhcp6_parser.yy"
                {
     ElementPtr test(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
     ctx.leave();
 }
-#line 3966 "dhcp6_parser.cc"
+#line 3987 "dhcp6_parser.cc"
     break;
 
-  case 722: // $@110: %empty
-#line 2561 "dhcp6_parser.yy"
+  case 729: // $@111: %empty
+#line 2581 "dhcp6_parser.yy"
                                           {
     ctx.unique("template-test", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 3975 "dhcp6_parser.cc"
+#line 3996 "dhcp6_parser.cc"
     break;
 
-  case 723: // client_class_template_test: "template-test" $@110 ":" "constant string"
-#line 2564 "dhcp6_parser.yy"
+  case 730: // client_class_template_test: "template-test" $@111 ":" "constant string"
+#line 2584 "dhcp6_parser.yy"
                {
     ElementPtr template_test(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("template-test", template_test);
     ctx.leave();
 }
-#line 3985 "dhcp6_parser.cc"
+#line 4006 "dhcp6_parser.cc"
     break;
 
-  case 724: // only_if_required: "only-if-required" ":" "boolean"
-#line 2570 "dhcp6_parser.yy"
+  case 731: // only_if_required: "only-if-required" ":" "boolean"
+#line 2591 "dhcp6_parser.yy"
                                                  {
     ctx.unique("only-if-required", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("only-if-required", b);
 }
-#line 3995 "dhcp6_parser.cc"
+#line 4016 "dhcp6_parser.cc"
     break;
 
-  case 725: // $@111: %empty
-#line 2579 "dhcp6_parser.yy"
+  case 732: // only_in_additional_list: "only-in-additional-list" ":" "boolean"
+#line 2597 "dhcp6_parser.yy"
+                                                               {
+    ctx.unique("only-in-additional-list", ctx.loc2pos(yystack_[2].location));
+    ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
+    ctx.stack_.back()->set("only-in-additional-list", b);
+}
+#line 4026 "dhcp6_parser.cc"
+    break;
+
+  case 733: // $@112: %empty
+#line 2606 "dhcp6_parser.yy"
                      {
     ctx.unique("server-id", ctx.loc2pos(yystack_[0].location));
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -4003,125 +4034,125 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.SERVER_ID);
 }
-#line 4007 "dhcp6_parser.cc"
+#line 4038 "dhcp6_parser.cc"
     break;
 
-  case 726: // server_id: "server-id" $@111 ":" "{" server_id_params "}"
-#line 2585 "dhcp6_parser.yy"
+  case 734: // server_id: "server-id" $@112 ":" "{" server_id_params "}"
+#line 2612 "dhcp6_parser.yy"
                                                        {
     // The type parameter is required.
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4018 "dhcp6_parser.cc"
+#line 4049 "dhcp6_parser.cc"
     break;
 
-  case 729: // server_id_params: server_id_params ","
-#line 2594 "dhcp6_parser.yy"
+  case 737: // server_id_params: server_id_params ","
+#line 2621 "dhcp6_parser.yy"
                                          {
                     ctx.warnAboutExtraCommas(yystack_[0].location);
                     }
-#line 4026 "dhcp6_parser.cc"
+#line 4057 "dhcp6_parser.cc"
     break;
 
-  case 739: // $@112: %empty
-#line 2610 "dhcp6_parser.yy"
+  case 747: // $@113: %empty
+#line 2637 "dhcp6_parser.yy"
                      {
     ctx.unique("type", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.DUID_TYPE);
 }
-#line 4035 "dhcp6_parser.cc"
+#line 4066 "dhcp6_parser.cc"
     break;
 
-  case 740: // server_id_type: "type" $@112 ":" duid_type
-#line 2613 "dhcp6_parser.yy"
+  case 748: // server_id_type: "type" $@113 ":" duid_type
+#line 2640 "dhcp6_parser.yy"
                   {
     ctx.stack_.back()->set("type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 4044 "dhcp6_parser.cc"
+#line 4075 "dhcp6_parser.cc"
     break;
 
-  case 741: // duid_type: "LLT"
-#line 2618 "dhcp6_parser.yy"
+  case 749: // duid_type: "LLT"
+#line 2645 "dhcp6_parser.yy"
                { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("LLT", ctx.loc2pos(yystack_[0].location))); }
-#line 4050 "dhcp6_parser.cc"
+#line 4081 "dhcp6_parser.cc"
     break;
 
-  case 742: // duid_type: "EN"
-#line 2619 "dhcp6_parser.yy"
+  case 750: // duid_type: "EN"
+#line 2646 "dhcp6_parser.yy"
               { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("EN", ctx.loc2pos(yystack_[0].location))); }
-#line 4056 "dhcp6_parser.cc"
+#line 4087 "dhcp6_parser.cc"
     break;
 
-  case 743: // duid_type: "LL"
-#line 2620 "dhcp6_parser.yy"
+  case 751: // duid_type: "LL"
+#line 2647 "dhcp6_parser.yy"
               { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("LL", ctx.loc2pos(yystack_[0].location))); }
-#line 4062 "dhcp6_parser.cc"
+#line 4093 "dhcp6_parser.cc"
     break;
 
-  case 744: // htype: "htype" ":" "integer"
-#line 2623 "dhcp6_parser.yy"
+  case 752: // htype: "htype" ":" "integer"
+#line 2650 "dhcp6_parser.yy"
                            {
     ctx.unique("htype", ctx.loc2pos(yystack_[2].location));
     ElementPtr htype(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("htype", htype);
 }
-#line 4072 "dhcp6_parser.cc"
+#line 4103 "dhcp6_parser.cc"
     break;
 
-  case 745: // $@113: %empty
-#line 2629 "dhcp6_parser.yy"
+  case 753: // $@114: %empty
+#line 2656 "dhcp6_parser.yy"
                        {
     ctx.unique("identifier", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4081 "dhcp6_parser.cc"
+#line 4112 "dhcp6_parser.cc"
     break;
 
-  case 746: // identifier: "identifier" $@113 ":" "constant string"
-#line 2632 "dhcp6_parser.yy"
+  case 754: // identifier: "identifier" $@114 ":" "constant string"
+#line 2659 "dhcp6_parser.yy"
                {
     ElementPtr id(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("identifier", id);
     ctx.leave();
 }
-#line 4091 "dhcp6_parser.cc"
+#line 4122 "dhcp6_parser.cc"
     break;
 
-  case 747: // time: "time" ":" "integer"
-#line 2638 "dhcp6_parser.yy"
+  case 755: // time: "time" ":" "integer"
+#line 2665 "dhcp6_parser.yy"
                          {
     ctx.unique("time", ctx.loc2pos(yystack_[2].location));
     ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("time", time);
 }
-#line 4101 "dhcp6_parser.cc"
+#line 4132 "dhcp6_parser.cc"
     break;
 
-  case 748: // enterprise_id: "enterprise-id" ":" "integer"
-#line 2644 "dhcp6_parser.yy"
+  case 756: // enterprise_id: "enterprise-id" ":" "integer"
+#line 2671 "dhcp6_parser.yy"
                                            {
     ctx.unique("enterprise-id", ctx.loc2pos(yystack_[2].location));
     ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enterprise-id", time);
 }
-#line 4111 "dhcp6_parser.cc"
+#line 4142 "dhcp6_parser.cc"
     break;
 
-  case 749: // dhcp4o6_port: "dhcp4o6-port" ":" "integer"
-#line 2652 "dhcp6_parser.yy"
+  case 757: // dhcp4o6_port: "dhcp4o6-port" ":" "integer"
+#line 2679 "dhcp6_parser.yy"
                                          {
     ctx.unique("dhcp4o6-port", ctx.loc2pos(yystack_[2].location));
     ElementPtr time(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
 }
-#line 4121 "dhcp6_parser.cc"
+#line 4152 "dhcp6_parser.cc"
     break;
 
-  case 750: // $@114: %empty
-#line 2660 "dhcp6_parser.yy"
+  case 758: // $@115: %empty
+#line 2687 "dhcp6_parser.yy"
                                {
     ctx.unique("control-socket", ctx.loc2pos(yystack_[0].location));
     ctx.unique("control-sockets", ctx.loc2pos(yystack_[0].location));
@@ -4130,20 +4161,20 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.CONTROL_SOCKET);
 }
-#line 4134 "dhcp6_parser.cc"
+#line 4165 "dhcp6_parser.cc"
     break;
 
-  case 751: // control_socket: "control-socket" $@114 ":" "{" control_socket_params "}"
-#line 2667 "dhcp6_parser.yy"
+  case 759: // control_socket: "control-socket" $@115 ":" "{" control_socket_params "}"
+#line 2694 "dhcp6_parser.yy"
                                                             {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4143 "dhcp6_parser.cc"
+#line 4174 "dhcp6_parser.cc"
     break;
 
-  case 752: // $@115: %empty
-#line 2672 "dhcp6_parser.yy"
+  case 760: // $@116: %empty
+#line 2699 "dhcp6_parser.yy"
                                  {
     ctx.unique("control-sockets", ctx.loc2pos(yystack_[0].location));
     ctx.unique("control-socket", ctx.loc2pos(yystack_[0].location));
@@ -4152,150 +4183,150 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.CONTROL_SOCKET);
 }
-#line 4156 "dhcp6_parser.cc"
+#line 4187 "dhcp6_parser.cc"
     break;
 
-  case 753: // control_sockets: "control-sockets" $@115 ":" "[" control_socket_list "]"
-#line 2679 "dhcp6_parser.yy"
+  case 761: // control_sockets: "control-sockets" $@116 ":" "[" control_socket_list "]"
+#line 2706 "dhcp6_parser.yy"
                                                             {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4165 "dhcp6_parser.cc"
+#line 4196 "dhcp6_parser.cc"
     break;
 
-  case 758: // not_empty_control_socket_list: not_empty_control_socket_list ","
-#line 2690 "dhcp6_parser.yy"
+  case 766: // not_empty_control_socket_list: not_empty_control_socket_list ","
+#line 2717 "dhcp6_parser.yy"
                                                                    {
                                  ctx.warnAboutExtraCommas(yystack_[0].location);
                                  }
-#line 4173 "dhcp6_parser.cc"
+#line 4204 "dhcp6_parser.cc"
     break;
 
-  case 759: // $@116: %empty
-#line 2695 "dhcp6_parser.yy"
+  case 767: // $@117: %empty
+#line 2722 "dhcp6_parser.yy"
                                      {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 4183 "dhcp6_parser.cc"
+#line 4214 "dhcp6_parser.cc"
     break;
 
-  case 760: // control_socket_entry: "{" $@116 control_socket_params "}"
-#line 2699 "dhcp6_parser.yy"
+  case 768: // control_socket_entry: "{" $@117 control_socket_params "}"
+#line 2726 "dhcp6_parser.yy"
                                        {
     ctx.stack_.pop_back();
 }
-#line 4191 "dhcp6_parser.cc"
+#line 4222 "dhcp6_parser.cc"
     break;
 
-  case 763: // control_socket_params: control_socket_params ","
-#line 2705 "dhcp6_parser.yy"
+  case 771: // control_socket_params: control_socket_params ","
+#line 2732 "dhcp6_parser.yy"
                                                    {
                          ctx.warnAboutExtraCommas(yystack_[0].location);
                          }
-#line 4199 "dhcp6_parser.cc"
+#line 4230 "dhcp6_parser.cc"
     break;
 
-  case 776: // $@117: %empty
-#line 2724 "dhcp6_parser.yy"
+  case 784: // $@118: %empty
+#line 2751 "dhcp6_parser.yy"
                                  {
     ctx.unique("socket-type", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.CONTROL_SOCKET_TYPE);
 }
-#line 4208 "dhcp6_parser.cc"
+#line 4239 "dhcp6_parser.cc"
     break;
 
-  case 777: // control_socket_type: "socket-type" $@117 ":" control_socket_type_value
-#line 2727 "dhcp6_parser.yy"
+  case 785: // control_socket_type: "socket-type" $@118 ":" control_socket_type_value
+#line 2754 "dhcp6_parser.yy"
                                   {
     ctx.stack_.back()->set("socket-type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 4217 "dhcp6_parser.cc"
+#line 4248 "dhcp6_parser.cc"
     break;
 
-  case 778: // control_socket_type_value: "unix"
-#line 2733 "dhcp6_parser.yy"
+  case 786: // control_socket_type_value: "unix"
+#line 2760 "dhcp6_parser.yy"
          { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("unix", ctx.loc2pos(yystack_[0].location))); }
-#line 4223 "dhcp6_parser.cc"
+#line 4254 "dhcp6_parser.cc"
     break;
 
-  case 779: // control_socket_type_value: "http"
-#line 2734 "dhcp6_parser.yy"
+  case 787: // control_socket_type_value: "http"
+#line 2761 "dhcp6_parser.yy"
          { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("http", ctx.loc2pos(yystack_[0].location))); }
-#line 4229 "dhcp6_parser.cc"
+#line 4260 "dhcp6_parser.cc"
     break;
 
-  case 780: // control_socket_type_value: "https"
-#line 2735 "dhcp6_parser.yy"
+  case 788: // control_socket_type_value: "https"
+#line 2762 "dhcp6_parser.yy"
           { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("https", ctx.loc2pos(yystack_[0].location))); }
-#line 4235 "dhcp6_parser.cc"
+#line 4266 "dhcp6_parser.cc"
     break;
 
-  case 781: // $@118: %empty
-#line 2738 "dhcp6_parser.yy"
+  case 789: // $@119: %empty
+#line 2765 "dhcp6_parser.yy"
                                  {
     ctx.unique("socket-name", ctx.loc2pos(yystack_[0].location));
     ctx.unique("socket-address", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4245 "dhcp6_parser.cc"
+#line 4276 "dhcp6_parser.cc"
     break;
 
-  case 782: // control_socket_name: "socket-name" $@118 ":" "constant string"
-#line 2742 "dhcp6_parser.yy"
+  case 790: // control_socket_name: "socket-name" $@119 ":" "constant string"
+#line 2769 "dhcp6_parser.yy"
                {
     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 4255 "dhcp6_parser.cc"
+#line 4286 "dhcp6_parser.cc"
     break;
 
-  case 783: // $@119: %empty
-#line 2748 "dhcp6_parser.yy"
+  case 791: // $@120: %empty
+#line 2775 "dhcp6_parser.yy"
                                        {
     ctx.unique("socket-address", ctx.loc2pos(yystack_[0].location));
     ctx.unique("socket-name", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4265 "dhcp6_parser.cc"
+#line 4296 "dhcp6_parser.cc"
     break;
 
-  case 784: // control_socket_address: "socket-address" $@119 ":" "constant string"
-#line 2752 "dhcp6_parser.yy"
+  case 792: // control_socket_address: "socket-address" $@120 ":" "constant string"
+#line 2779 "dhcp6_parser.yy"
                {
     ElementPtr address(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-address", address);
     ctx.leave();
 }
-#line 4275 "dhcp6_parser.cc"
+#line 4306 "dhcp6_parser.cc"
     break;
 
-  case 785: // control_socket_port: "socket-port" ":" "integer"
-#line 2758 "dhcp6_parser.yy"
+  case 793: // control_socket_port: "socket-port" ":" "integer"
+#line 2785 "dhcp6_parser.yy"
                                                {
     ctx.unique("socket-port", ctx.loc2pos(yystack_[2].location));
     ElementPtr port(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-port", port);
 }
-#line 4285 "dhcp6_parser.cc"
+#line 4316 "dhcp6_parser.cc"
     break;
 
-  case 786: // cert_required: "cert-required" ":" "boolean"
-#line 2764 "dhcp6_parser.yy"
+  case 794: // cert_required: "cert-required" ":" "boolean"
+#line 2791 "dhcp6_parser.yy"
                                            {
     ctx.unique("cert-required", ctx.loc2pos(yystack_[2].location));
     ElementPtr req(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("cert-required", req);
 }
-#line 4295 "dhcp6_parser.cc"
+#line 4326 "dhcp6_parser.cc"
     break;
 
-  case 787: // $@120: %empty
-#line 2772 "dhcp6_parser.yy"
+  case 795: // $@121: %empty
+#line 2799 "dhcp6_parser.yy"
                                {
     ctx.unique("authentication", ctx.loc2pos(yystack_[0].location));
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -4303,92 +4334,92 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.AUTHENTICATION);
 }
-#line 4307 "dhcp6_parser.cc"
+#line 4338 "dhcp6_parser.cc"
     break;
 
-  case 788: // authentication: "authentication" $@120 ":" "{" auth_params "}"
-#line 2778 "dhcp6_parser.yy"
+  case 796: // authentication: "authentication" $@121 ":" "{" auth_params "}"
+#line 2805 "dhcp6_parser.yy"
                                                   {
     // The type parameter is required
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4318 "dhcp6_parser.cc"
+#line 4349 "dhcp6_parser.cc"
     break;
 
-  case 791: // auth_params: auth_params ","
-#line 2787 "dhcp6_parser.yy"
+  case 799: // auth_params: auth_params ","
+#line 2814 "dhcp6_parser.yy"
                                {
                ctx.warnAboutExtraCommas(yystack_[0].location);
                }
-#line 4326 "dhcp6_parser.cc"
+#line 4357 "dhcp6_parser.cc"
     break;
 
-  case 799: // $@121: %empty
-#line 2801 "dhcp6_parser.yy"
+  case 807: // $@122: %empty
+#line 2828 "dhcp6_parser.yy"
                 {
     ctx.unique("type", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.AUTH_TYPE);
 }
-#line 4335 "dhcp6_parser.cc"
+#line 4366 "dhcp6_parser.cc"
     break;
 
-  case 800: // auth_type: "type" $@121 ":" auth_type_value
-#line 2804 "dhcp6_parser.yy"
+  case 808: // auth_type: "type" $@122 ":" auth_type_value
+#line 2831 "dhcp6_parser.yy"
                         {
     ctx.stack_.back()->set("type", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 4344 "dhcp6_parser.cc"
+#line 4375 "dhcp6_parser.cc"
     break;
 
-  case 801: // auth_type_value: "basic"
-#line 2809 "dhcp6_parser.yy"
+  case 809: // auth_type_value: "basic"
+#line 2836 "dhcp6_parser.yy"
                        { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("basic", ctx.loc2pos(yystack_[0].location))); }
-#line 4350 "dhcp6_parser.cc"
+#line 4381 "dhcp6_parser.cc"
     break;
 
-  case 802: // $@122: %empty
-#line 2812 "dhcp6_parser.yy"
+  case 810: // $@123: %empty
+#line 2839 "dhcp6_parser.yy"
              {
     ctx.unique("realm", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4359 "dhcp6_parser.cc"
+#line 4390 "dhcp6_parser.cc"
     break;
 
-  case 803: // realm: "realm" $@122 ":" "constant string"
-#line 2815 "dhcp6_parser.yy"
+  case 811: // realm: "realm" $@123 ":" "constant string"
+#line 2842 "dhcp6_parser.yy"
                {
     ElementPtr realm(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("realm", realm);
     ctx.leave();
 }
-#line 4369 "dhcp6_parser.cc"
+#line 4400 "dhcp6_parser.cc"
     break;
 
-  case 804: // $@123: %empty
-#line 2821 "dhcp6_parser.yy"
+  case 812: // $@124: %empty
+#line 2848 "dhcp6_parser.yy"
                      {
     ctx.unique("directory", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4378 "dhcp6_parser.cc"
+#line 4409 "dhcp6_parser.cc"
     break;
 
-  case 805: // directory: "directory" $@123 ":" "constant string"
-#line 2824 "dhcp6_parser.yy"
+  case 813: // directory: "directory" $@124 ":" "constant string"
+#line 2851 "dhcp6_parser.yy"
                {
     ElementPtr directory(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("directory", directory);
     ctx.leave();
 }
-#line 4388 "dhcp6_parser.cc"
+#line 4419 "dhcp6_parser.cc"
     break;
 
-  case 806: // $@124: %empty
-#line 2830 "dhcp6_parser.yy"
+  case 814: // $@125: %empty
+#line 2857 "dhcp6_parser.yy"
                  {
     ctx.unique("clients", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -4396,92 +4427,92 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.CLIENTS);
 }
-#line 4400 "dhcp6_parser.cc"
+#line 4431 "dhcp6_parser.cc"
     break;
 
-  case 807: // clients: "clients" $@124 ":" "[" clients_list "]"
-#line 2836 "dhcp6_parser.yy"
+  case 815: // clients: "clients" $@125 ":" "[" clients_list "]"
+#line 2863 "dhcp6_parser.yy"
                                                      {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4409 "dhcp6_parser.cc"
+#line 4440 "dhcp6_parser.cc"
     break;
 
-  case 812: // not_empty_clients_list: not_empty_clients_list ","
-#line 2847 "dhcp6_parser.yy"
+  case 820: // not_empty_clients_list: not_empty_clients_list ","
+#line 2874 "dhcp6_parser.yy"
                                                      {
                           ctx.warnAboutExtraCommas(yystack_[0].location);
                           }
-#line 4417 "dhcp6_parser.cc"
+#line 4448 "dhcp6_parser.cc"
     break;
 
-  case 813: // $@125: %empty
-#line 2852 "dhcp6_parser.yy"
+  case 821: // $@126: %empty
+#line 2879 "dhcp6_parser.yy"
                            {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 4427 "dhcp6_parser.cc"
+#line 4458 "dhcp6_parser.cc"
     break;
 
-  case 814: // basic_auth: "{" $@125 clients_params "}"
-#line 2856 "dhcp6_parser.yy"
+  case 822: // basic_auth: "{" $@126 clients_params "}"
+#line 2883 "dhcp6_parser.yy"
                                 {
     ctx.stack_.pop_back();
 }
-#line 4435 "dhcp6_parser.cc"
+#line 4466 "dhcp6_parser.cc"
     break;
 
-  case 817: // clients_params: clients_params ","
-#line 2862 "dhcp6_parser.yy"
+  case 825: // clients_params: clients_params ","
+#line 2889 "dhcp6_parser.yy"
                                      {
                   ctx.warnAboutExtraCommas(yystack_[0].location);
                   }
-#line 4443 "dhcp6_parser.cc"
+#line 4474 "dhcp6_parser.cc"
     break;
 
-  case 825: // $@126: %empty
-#line 2876 "dhcp6_parser.yy"
+  case 833: // $@127: %empty
+#line 2903 "dhcp6_parser.yy"
                      {
     ctx.unique("user-file", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4452 "dhcp6_parser.cc"
+#line 4483 "dhcp6_parser.cc"
     break;
 
-  case 826: // user_file: "user-file" $@126 ":" "constant string"
-#line 2879 "dhcp6_parser.yy"
+  case 834: // user_file: "user-file" $@127 ":" "constant string"
+#line 2906 "dhcp6_parser.yy"
                {
     ElementPtr user(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("user-file", user);
     ctx.leave();
 }
-#line 4462 "dhcp6_parser.cc"
+#line 4493 "dhcp6_parser.cc"
     break;
 
-  case 827: // $@127: %empty
-#line 2885 "dhcp6_parser.yy"
+  case 835: // $@128: %empty
+#line 2912 "dhcp6_parser.yy"
                              {
     ctx.unique("password-file", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4471 "dhcp6_parser.cc"
+#line 4502 "dhcp6_parser.cc"
     break;
 
-  case 828: // password_file: "password-file" $@127 ":" "constant string"
-#line 2888 "dhcp6_parser.yy"
+  case 836: // password_file: "password-file" $@128 ":" "constant string"
+#line 2915 "dhcp6_parser.yy"
                {
     ElementPtr password(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("password-file", password);
     ctx.leave();
 }
-#line 4481 "dhcp6_parser.cc"
+#line 4512 "dhcp6_parser.cc"
     break;
 
-  case 829: // $@128: %empty
-#line 2896 "dhcp6_parser.yy"
+  case 837: // $@129: %empty
+#line 2923 "dhcp6_parser.yy"
                                        {
     ctx.unique("dhcp-queue-control", ctx.loc2pos(yystack_[0].location));
     ElementPtr qc(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -4489,87 +4520,87 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(qc);
     ctx.enter(ctx.DHCP_QUEUE_CONTROL);
 }
-#line 4493 "dhcp6_parser.cc"
+#line 4524 "dhcp6_parser.cc"
     break;
 
-  case 830: // dhcp_queue_control: "dhcp-queue-control" $@128 ":" "{" queue_control_params "}"
-#line 2902 "dhcp6_parser.yy"
+  case 838: // dhcp_queue_control: "dhcp-queue-control" $@129 ":" "{" queue_control_params "}"
+#line 2929 "dhcp6_parser.yy"
                                                            {
     // The enable queue parameter is required.
     ctx.require("enable-queue", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4504 "dhcp6_parser.cc"
+#line 4535 "dhcp6_parser.cc"
     break;
 
-  case 833: // queue_control_params: queue_control_params ","
-#line 2911 "dhcp6_parser.yy"
+  case 841: // queue_control_params: queue_control_params ","
+#line 2938 "dhcp6_parser.yy"
                                                  {
                         ctx.warnAboutExtraCommas(yystack_[0].location);
                         }
-#line 4512 "dhcp6_parser.cc"
+#line 4543 "dhcp6_parser.cc"
     break;
 
-  case 840: // enable_queue: "enable-queue" ":" "boolean"
-#line 2924 "dhcp6_parser.yy"
+  case 848: // enable_queue: "enable-queue" ":" "boolean"
+#line 2951 "dhcp6_parser.yy"
                                          {
     ctx.unique("enable-queue", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-queue", b);
 }
-#line 4522 "dhcp6_parser.cc"
+#line 4553 "dhcp6_parser.cc"
     break;
 
-  case 841: // $@129: %empty
-#line 2930 "dhcp6_parser.yy"
+  case 849: // $@130: %empty
+#line 2957 "dhcp6_parser.yy"
                        {
     ctx.unique("queue-type", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4531 "dhcp6_parser.cc"
+#line 4562 "dhcp6_parser.cc"
     break;
 
-  case 842: // queue_type: "queue-type" $@129 ":" "constant string"
-#line 2933 "dhcp6_parser.yy"
+  case 850: // queue_type: "queue-type" $@130 ":" "constant string"
+#line 2960 "dhcp6_parser.yy"
                {
     ElementPtr qt(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("queue-type", qt);
     ctx.leave();
 }
-#line 4541 "dhcp6_parser.cc"
+#line 4572 "dhcp6_parser.cc"
     break;
 
-  case 843: // capacity: "capacity" ":" "integer"
-#line 2939 "dhcp6_parser.yy"
+  case 851: // capacity: "capacity" ":" "integer"
+#line 2966 "dhcp6_parser.yy"
                                  {
     ctx.unique("capacity", ctx.loc2pos(yystack_[2].location));
     ElementPtr c(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("capacity", c);
 }
-#line 4551 "dhcp6_parser.cc"
+#line 4582 "dhcp6_parser.cc"
     break;
 
-  case 844: // $@130: %empty
-#line 2945 "dhcp6_parser.yy"
+  case 852: // $@131: %empty
+#line 2972 "dhcp6_parser.yy"
                             {
     ctx.unique(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4560 "dhcp6_parser.cc"
+#line 4591 "dhcp6_parser.cc"
     break;
 
-  case 845: // arbitrary_map_entry: "constant string" $@130 ":" value
-#line 2948 "dhcp6_parser.yy"
+  case 853: // arbitrary_map_entry: "constant string" $@131 ":" value
+#line 2975 "dhcp6_parser.yy"
               {
     ctx.stack_.back()->set(yystack_[3].value.as < std::string > (), yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 4569 "dhcp6_parser.cc"
+#line 4600 "dhcp6_parser.cc"
     break;
 
-  case 846: // $@131: %empty
-#line 2955 "dhcp6_parser.yy"
+  case 854: // $@132: %empty
+#line 2982 "dhcp6_parser.yy"
                      {
     ctx.unique("dhcp-ddns", ctx.loc2pos(yystack_[0].location));
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -4577,177 +4608,177 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(m);
     ctx.enter(ctx.DHCP_DDNS);
 }
-#line 4581 "dhcp6_parser.cc"
+#line 4612 "dhcp6_parser.cc"
     break;
 
-  case 847: // dhcp_ddns: "dhcp-ddns" $@131 ":" "{" dhcp_ddns_params "}"
-#line 2961 "dhcp6_parser.yy"
+  case 855: // dhcp_ddns: "dhcp-ddns" $@132 ":" "{" dhcp_ddns_params "}"
+#line 2988 "dhcp6_parser.yy"
                                                        {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4592 "dhcp6_parser.cc"
+#line 4623 "dhcp6_parser.cc"
     break;
 
-  case 848: // $@132: %empty
-#line 2968 "dhcp6_parser.yy"
+  case 856: // $@133: %empty
+#line 2995 "dhcp6_parser.yy"
                               {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 4602 "dhcp6_parser.cc"
+#line 4633 "dhcp6_parser.cc"
     break;
 
-  case 849: // sub_dhcp_ddns: "{" $@132 dhcp_ddns_params "}"
-#line 2972 "dhcp6_parser.yy"
+  case 857: // sub_dhcp_ddns: "{" $@133 dhcp_ddns_params "}"
+#line 2999 "dhcp6_parser.yy"
                                   {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
     // parsing completed
 }
-#line 4612 "dhcp6_parser.cc"
+#line 4643 "dhcp6_parser.cc"
     break;
 
-  case 852: // dhcp_ddns_params: dhcp_ddns_params ","
-#line 2980 "dhcp6_parser.yy"
+  case 860: // dhcp_ddns_params: dhcp_ddns_params ","
+#line 3007 "dhcp6_parser.yy"
                                          {
                     ctx.warnAboutExtraCommas(yystack_[0].location);
                     }
-#line 4620 "dhcp6_parser.cc"
+#line 4651 "dhcp6_parser.cc"
     break;
 
-  case 864: // enable_updates: "enable-updates" ":" "boolean"
-#line 2998 "dhcp6_parser.yy"
+  case 872: // enable_updates: "enable-updates" ":" "boolean"
+#line 3025 "dhcp6_parser.yy"
                                              {
     ctx.unique("enable-updates", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
 }
-#line 4630 "dhcp6_parser.cc"
+#line 4661 "dhcp6_parser.cc"
     break;
 
-  case 865: // $@133: %empty
-#line 3004 "dhcp6_parser.yy"
+  case 873: // $@134: %empty
+#line 3031 "dhcp6_parser.yy"
                      {
     ctx.unique("server-ip", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4639 "dhcp6_parser.cc"
+#line 4670 "dhcp6_parser.cc"
     break;
 
-  case 866: // server_ip: "server-ip" $@133 ":" "constant string"
-#line 3007 "dhcp6_parser.yy"
+  case 874: // server_ip: "server-ip" $@134 ":" "constant string"
+#line 3034 "dhcp6_parser.yy"
                {
     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 4649 "dhcp6_parser.cc"
+#line 4680 "dhcp6_parser.cc"
     break;
 
-  case 867: // server_port: "server-port" ":" "integer"
-#line 3013 "dhcp6_parser.yy"
+  case 875: // server_port: "server-port" ":" "integer"
+#line 3040 "dhcp6_parser.yy"
                                        {
     ctx.unique("server-port", ctx.loc2pos(yystack_[2].location));
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
 }
-#line 4659 "dhcp6_parser.cc"
+#line 4690 "dhcp6_parser.cc"
     break;
 
-  case 868: // $@134: %empty
-#line 3019 "dhcp6_parser.yy"
+  case 876: // $@135: %empty
+#line 3046 "dhcp6_parser.yy"
                      {
     ctx.unique("sender-ip", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4668 "dhcp6_parser.cc"
+#line 4699 "dhcp6_parser.cc"
     break;
 
-  case 869: // sender_ip: "sender-ip" $@134 ":" "constant string"
-#line 3022 "dhcp6_parser.yy"
+  case 877: // sender_ip: "sender-ip" $@135 ":" "constant string"
+#line 3049 "dhcp6_parser.yy"
                {
     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 4678 "dhcp6_parser.cc"
+#line 4709 "dhcp6_parser.cc"
     break;
 
-  case 870: // sender_port: "sender-port" ":" "integer"
-#line 3028 "dhcp6_parser.yy"
+  case 878: // sender_port: "sender-port" ":" "integer"
+#line 3055 "dhcp6_parser.yy"
                                        {
     ctx.unique("sender-port", ctx.loc2pos(yystack_[2].location));
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
 }
-#line 4688 "dhcp6_parser.cc"
+#line 4719 "dhcp6_parser.cc"
     break;
 
-  case 871: // max_queue_size: "max-queue-size" ":" "integer"
-#line 3034 "dhcp6_parser.yy"
+  case 879: // max_queue_size: "max-queue-size" ":" "integer"
+#line 3061 "dhcp6_parser.yy"
                                              {
     ctx.unique("max-queue-size", ctx.loc2pos(yystack_[2].location));
     ElementPtr i(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
 }
-#line 4698 "dhcp6_parser.cc"
+#line 4729 "dhcp6_parser.cc"
     break;
 
-  case 872: // $@135: %empty
-#line 3040 "dhcp6_parser.yy"
+  case 880: // $@136: %empty
+#line 3067 "dhcp6_parser.yy"
                            {
     ctx.unique("ncr-protocol", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NCR_PROTOCOL);
 }
-#line 4707 "dhcp6_parser.cc"
+#line 4738 "dhcp6_parser.cc"
     break;
 
-  case 873: // ncr_protocol: "ncr-protocol" $@135 ":" ncr_protocol_value
-#line 3043 "dhcp6_parser.yy"
+  case 881: // ncr_protocol: "ncr-protocol" $@136 ":" ncr_protocol_value
+#line 3070 "dhcp6_parser.yy"
                            {
     ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as < ElementPtr > ());
     ctx.leave();
 }
-#line 4716 "dhcp6_parser.cc"
+#line 4747 "dhcp6_parser.cc"
     break;
 
-  case 874: // ncr_protocol_value: "UDP"
-#line 3049 "dhcp6_parser.yy"
+  case 882: // ncr_protocol_value: "UDP"
+#line 3076 "dhcp6_parser.yy"
         { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
-#line 4722 "dhcp6_parser.cc"
+#line 4753 "dhcp6_parser.cc"
     break;
 
-  case 875: // ncr_protocol_value: "TCP"
-#line 3050 "dhcp6_parser.yy"
+  case 883: // ncr_protocol_value: "TCP"
+#line 3077 "dhcp6_parser.yy"
         { yylhs.value.as < ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
-#line 4728 "dhcp6_parser.cc"
+#line 4759 "dhcp6_parser.cc"
     break;
 
-  case 876: // $@136: %empty
-#line 3053 "dhcp6_parser.yy"
+  case 884: // $@137: %empty
+#line 3080 "dhcp6_parser.yy"
                        {
     ctx.unique("ncr-format", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NCR_FORMAT);
 }
-#line 4737 "dhcp6_parser.cc"
+#line 4768 "dhcp6_parser.cc"
     break;
 
-  case 877: // ncr_format: "ncr-format" $@136 ":" "JSON"
-#line 3056 "dhcp6_parser.yy"
+  case 885: // ncr_format: "ncr-format" $@137 ":" "JSON"
+#line 3083 "dhcp6_parser.yy"
              {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
     ctx.leave();
 }
-#line 4747 "dhcp6_parser.cc"
+#line 4778 "dhcp6_parser.cc"
     break;
 
-  case 878: // $@137: %empty
-#line 3064 "dhcp6_parser.yy"
+  case 886: // $@138: %empty
+#line 3091 "dhcp6_parser.yy"
                                {
     ctx.unique("config-control", ctx.loc2pos(yystack_[0].location));
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -4755,48 +4786,48 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(i);
     ctx.enter(ctx.CONFIG_CONTROL);
 }
-#line 4759 "dhcp6_parser.cc"
+#line 4790 "dhcp6_parser.cc"
     break;
 
-  case 879: // config_control: "config-control" $@137 ":" "{" config_control_params "}"
-#line 3070 "dhcp6_parser.yy"
+  case 887: // config_control: "config-control" $@138 ":" "{" config_control_params "}"
+#line 3097 "dhcp6_parser.yy"
                                                             {
     // No config control params are required
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4769 "dhcp6_parser.cc"
+#line 4800 "dhcp6_parser.cc"
     break;
 
-  case 880: // $@138: %empty
-#line 3076 "dhcp6_parser.yy"
+  case 888: // $@139: %empty
+#line 3103 "dhcp6_parser.yy"
                                    {
     // Parse the config-control map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.push_back(m);
 }
-#line 4779 "dhcp6_parser.cc"
+#line 4810 "dhcp6_parser.cc"
     break;
 
-  case 881: // sub_config_control: "{" $@138 config_control_params "}"
-#line 3080 "dhcp6_parser.yy"
+  case 889: // sub_config_control: "{" $@139 config_control_params "}"
+#line 3107 "dhcp6_parser.yy"
                                        {
     // No config_control params are required
     // parsing completed
 }
-#line 4788 "dhcp6_parser.cc"
+#line 4819 "dhcp6_parser.cc"
     break;
 
-  case 884: // config_control_params: config_control_params ","
-#line 3088 "dhcp6_parser.yy"
+  case 892: // config_control_params: config_control_params ","
+#line 3115 "dhcp6_parser.yy"
                                                    {
                          ctx.warnAboutExtraCommas(yystack_[0].location);
                          }
-#line 4796 "dhcp6_parser.cc"
+#line 4827 "dhcp6_parser.cc"
     break;
 
-  case 887: // $@139: %empty
-#line 3098 "dhcp6_parser.yy"
+  case 895: // $@140: %empty
+#line 3125 "dhcp6_parser.yy"
                                    {
     ctx.unique("config-databases", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -4804,30 +4835,30 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.CONFIG_DATABASE);
 }
-#line 4808 "dhcp6_parser.cc"
+#line 4839 "dhcp6_parser.cc"
     break;
 
-  case 888: // config_databases: "config-databases" $@139 ":" "[" database_list "]"
-#line 3104 "dhcp6_parser.yy"
+  case 896: // config_databases: "config-databases" $@140 ":" "[" database_list "]"
+#line 3131 "dhcp6_parser.yy"
                                                       {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4817 "dhcp6_parser.cc"
+#line 4848 "dhcp6_parser.cc"
     break;
 
-  case 889: // config_fetch_wait_time: "config-fetch-wait-time" ":" "integer"
-#line 3109 "dhcp6_parser.yy"
+  case 897: // config_fetch_wait_time: "config-fetch-wait-time" ":" "integer"
+#line 3136 "dhcp6_parser.yy"
                                                              {
     ctx.unique("config-fetch-wait-time", ctx.loc2pos(yystack_[2].location));
     ElementPtr value(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("config-fetch-wait-time", value);
 }
-#line 4827 "dhcp6_parser.cc"
+#line 4858 "dhcp6_parser.cc"
     break;
 
-  case 890: // $@140: %empty
-#line 3117 "dhcp6_parser.yy"
+  case 898: // $@141: %empty
+#line 3144 "dhcp6_parser.yy"
                  {
     ctx.unique("loggers", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -4835,83 +4866,83 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.LOGGERS);
 }
-#line 4839 "dhcp6_parser.cc"
+#line 4870 "dhcp6_parser.cc"
     break;
 
-  case 891: // loggers: "loggers" $@140 ":" "[" loggers_entries "]"
-#line 3123 "dhcp6_parser.yy"
+  case 899: // loggers: "loggers" $@141 ":" "[" loggers_entries "]"
+#line 3150 "dhcp6_parser.yy"
                                                          {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4848 "dhcp6_parser.cc"
+#line 4879 "dhcp6_parser.cc"
     break;
 
-  case 894: // loggers_entries: loggers_entries ","
-#line 3132 "dhcp6_parser.yy"
+  case 902: // loggers_entries: loggers_entries ","
+#line 3159 "dhcp6_parser.yy"
                                        {
                    ctx.warnAboutExtraCommas(yystack_[0].location);
                    }
-#line 4856 "dhcp6_parser.cc"
+#line 4887 "dhcp6_parser.cc"
     break;
 
-  case 895: // $@141: %empty
-#line 3138 "dhcp6_parser.yy"
+  case 903: // $@142: %empty
+#line 3165 "dhcp6_parser.yy"
                              {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
     ctx.stack_.push_back(l);
 }
-#line 4866 "dhcp6_parser.cc"
+#line 4897 "dhcp6_parser.cc"
     break;
 
-  case 896: // logger_entry: "{" $@141 logger_params "}"
-#line 3142 "dhcp6_parser.yy"
+  case 904: // logger_entry: "{" $@142 logger_params "}"
+#line 3169 "dhcp6_parser.yy"
                                {
     ctx.stack_.pop_back();
 }
-#line 4874 "dhcp6_parser.cc"
+#line 4905 "dhcp6_parser.cc"
     break;
 
-  case 899: // logger_params: logger_params ","
-#line 3148 "dhcp6_parser.yy"
+  case 907: // logger_params: logger_params ","
+#line 3175 "dhcp6_parser.yy"
                                    {
                  ctx.warnAboutExtraCommas(yystack_[0].location);
                  }
-#line 4882 "dhcp6_parser.cc"
+#line 4913 "dhcp6_parser.cc"
     break;
 
-  case 907: // debuglevel: "debuglevel" ":" "integer"
-#line 3162 "dhcp6_parser.yy"
+  case 915: // debuglevel: "debuglevel" ":" "integer"
+#line 3189 "dhcp6_parser.yy"
                                      {
     ctx.unique("debuglevel", ctx.loc2pos(yystack_[2].location));
     ElementPtr dl(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
 }
-#line 4892 "dhcp6_parser.cc"
+#line 4923 "dhcp6_parser.cc"
     break;
 
-  case 908: // $@142: %empty
-#line 3168 "dhcp6_parser.yy"
+  case 916: // $@143: %empty
+#line 3195 "dhcp6_parser.yy"
                    {
     ctx.unique("severity", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4901 "dhcp6_parser.cc"
+#line 4932 "dhcp6_parser.cc"
     break;
 
-  case 909: // severity: "severity" $@142 ":" "constant string"
-#line 3171 "dhcp6_parser.yy"
+  case 917: // severity: "severity" $@143 ":" "constant string"
+#line 3198 "dhcp6_parser.yy"
                {
     ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
     ctx.leave();
 }
-#line 4911 "dhcp6_parser.cc"
+#line 4942 "dhcp6_parser.cc"
     break;
 
-  case 910: // $@143: %empty
-#line 3177 "dhcp6_parser.yy"
+  case 918: // $@144: %empty
+#line 3204 "dhcp6_parser.yy"
                                     {
     ctx.unique("output-options", ctx.loc2pos(yystack_[0].location));
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
@@ -4919,122 +4950,122 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(l);
     ctx.enter(ctx.OUTPUT_OPTIONS);
 }
-#line 4923 "dhcp6_parser.cc"
+#line 4954 "dhcp6_parser.cc"
     break;
 
-  case 911: // output_options_list: "output-options" $@143 ":" "[" output_options_list_content "]"
-#line 3183 "dhcp6_parser.yy"
+  case 919: // output_options_list: "output-options" $@144 ":" "[" output_options_list_content "]"
+#line 3210 "dhcp6_parser.yy"
                                                                     {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 4932 "dhcp6_parser.cc"
+#line 4963 "dhcp6_parser.cc"
     break;
 
-  case 914: // output_options_list_content: output_options_list_content ","
-#line 3190 "dhcp6_parser.yy"
+  case 922: // output_options_list_content: output_options_list_content ","
+#line 3217 "dhcp6_parser.yy"
                                                                {
                                ctx.warnAboutExtraCommas(yystack_[0].location);
                                }
-#line 4940 "dhcp6_parser.cc"
+#line 4971 "dhcp6_parser.cc"
     break;
 
-  case 915: // $@144: %empty
-#line 3195 "dhcp6_parser.yy"
+  case 923: // $@145: %empty
+#line 3222 "dhcp6_parser.yy"
                              {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
     ctx.stack_.push_back(m);
 }
-#line 4950 "dhcp6_parser.cc"
+#line 4981 "dhcp6_parser.cc"
     break;
 
-  case 916: // output_entry: "{" $@144 output_params_list "}"
-#line 3199 "dhcp6_parser.yy"
+  case 924: // output_entry: "{" $@145 output_params_list "}"
+#line 3226 "dhcp6_parser.yy"
                                     {
     ctx.stack_.pop_back();
 }
-#line 4958 "dhcp6_parser.cc"
+#line 4989 "dhcp6_parser.cc"
     break;
 
-  case 919: // output_params_list: output_params_list ","
-#line 3205 "dhcp6_parser.yy"
+  case 927: // output_params_list: output_params_list ","
+#line 3232 "dhcp6_parser.yy"
                                              {
                       ctx.warnAboutExtraCommas(yystack_[0].location);
                       }
-#line 4966 "dhcp6_parser.cc"
+#line 4997 "dhcp6_parser.cc"
     break;
 
-  case 925: // $@145: %empty
-#line 3217 "dhcp6_parser.yy"
+  case 933: // $@146: %empty
+#line 3244 "dhcp6_parser.yy"
                {
     ctx.unique("output", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 4975 "dhcp6_parser.cc"
+#line 5006 "dhcp6_parser.cc"
     break;
 
-  case 926: // output: "output" $@145 ":" "constant string"
-#line 3220 "dhcp6_parser.yy"
+  case 934: // output: "output" $@146 ":" "constant string"
+#line 3247 "dhcp6_parser.yy"
                {
     ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
     ctx.leave();
 }
-#line 4985 "dhcp6_parser.cc"
+#line 5016 "dhcp6_parser.cc"
     break;
 
-  case 927: // flush: "flush" ":" "boolean"
-#line 3226 "dhcp6_parser.yy"
+  case 935: // flush: "flush" ":" "boolean"
+#line 3253 "dhcp6_parser.yy"
                            {
     ctx.unique("flush", ctx.loc2pos(yystack_[2].location));
     ElementPtr flush(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
 }
-#line 4995 "dhcp6_parser.cc"
+#line 5026 "dhcp6_parser.cc"
     break;
 
-  case 928: // maxsize: "maxsize" ":" "integer"
-#line 3232 "dhcp6_parser.yy"
+  case 936: // maxsize: "maxsize" ":" "integer"
+#line 3259 "dhcp6_parser.yy"
                                {
     ctx.unique("maxsize", ctx.loc2pos(yystack_[2].location));
     ElementPtr maxsize(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
 }
-#line 5005 "dhcp6_parser.cc"
+#line 5036 "dhcp6_parser.cc"
     break;
 
-  case 929: // maxver: "maxver" ":" "integer"
-#line 3238 "dhcp6_parser.yy"
+  case 937: // maxver: "maxver" ":" "integer"
+#line 3265 "dhcp6_parser.yy"
                              {
     ctx.unique("maxver", ctx.loc2pos(yystack_[2].location));
     ElementPtr maxver(new IntElement(yystack_[0].value.as < int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
 }
-#line 5015 "dhcp6_parser.cc"
+#line 5046 "dhcp6_parser.cc"
     break;
 
-  case 930: // $@146: %empty
-#line 3244 "dhcp6_parser.yy"
+  case 938: // $@147: %empty
+#line 3271 "dhcp6_parser.yy"
                  {
     ctx.unique("pattern", ctx.loc2pos(yystack_[0].location));
     ctx.enter(ctx.NO_KEYWORD);
 }
-#line 5024 "dhcp6_parser.cc"
+#line 5055 "dhcp6_parser.cc"
     break;
 
-  case 931: // pattern: "pattern" $@146 ":" "constant string"
-#line 3247 "dhcp6_parser.yy"
+  case 939: // pattern: "pattern" $@147 ":" "constant string"
+#line 3274 "dhcp6_parser.yy"
                {
     ElementPtr sev(new StringElement(yystack_[0].value.as < std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pattern", sev);
     ctx.leave();
 }
-#line 5034 "dhcp6_parser.cc"
+#line 5065 "dhcp6_parser.cc"
     break;
 
-  case 932: // $@147: %empty
-#line 3253 "dhcp6_parser.yy"
+  case 940: // $@148: %empty
+#line 3280 "dhcp6_parser.yy"
                              {
     ctx.unique("compatibility", ctx.loc2pos(yystack_[0].location));
     ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -5042,38 +5073,38 @@ namespace isc { namespace dhcp {
     ctx.stack_.push_back(i);
     ctx.enter(ctx.COMPATIBILITY);
 }
-#line 5046 "dhcp6_parser.cc"
+#line 5077 "dhcp6_parser.cc"
     break;
 
-  case 933: // compatibility: "compatibility" $@147 ":" "{" compatibility_params "}"
-#line 3259 "dhcp6_parser.yy"
+  case 941: // compatibility: "compatibility" $@148 ":" "{" compatibility_params "}"
+#line 3286 "dhcp6_parser.yy"
                                                            {
     ctx.stack_.pop_back();
     ctx.leave();
 }
-#line 5055 "dhcp6_parser.cc"
+#line 5086 "dhcp6_parser.cc"
     break;
 
-  case 936: // compatibility_params: compatibility_params ","
-#line 3266 "dhcp6_parser.yy"
+  case 944: // compatibility_params: compatibility_params ","
+#line 3293 "dhcp6_parser.yy"
                                                  {
                         ctx.warnAboutExtraCommas(yystack_[0].location);
                         }
-#line 5063 "dhcp6_parser.cc"
+#line 5094 "dhcp6_parser.cc"
     break;
 
-  case 939: // lenient_option_parsing: "lenient-option-parsing" ":" "boolean"
-#line 3275 "dhcp6_parser.yy"
+  case 947: // lenient_option_parsing: "lenient-option-parsing" ":" "boolean"
+#line 3302 "dhcp6_parser.yy"
                                                              {
     ctx.unique("lenient-option-parsing", ctx.loc2pos(yystack_[2].location));
     ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("lenient-option-parsing", b);
 }
-#line 5073 "dhcp6_parser.cc"
+#line 5104 "dhcp6_parser.cc"
     break;
 
 
-#line 5077 "dhcp6_parser.cc"
+#line 5108 "dhcp6_parser.cc"
 
             default:
               break;
@@ -5425,158 +5456,159 @@ namespace isc { namespace dhcp {
   }
 
 
-  const short Dhcp6Parser::yypact_ninf_ = -1354;
+  const short Dhcp6Parser::yypact_ninf_ = -1371;
 
   const signed char Dhcp6Parser::yytable_ninf_ = -1;
 
   const short
   Dhcp6Parser::yypact_[] =
   {
-     525, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354,    44,    38,    56,    90,   104,
-     114,   116,   118,   120,   136,   160,   169,   170,   196,   232,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,    38,   -78,
-     147,   157,    57,   713,   453,   547,   510,   165,   220,   613,
-     -88,   230,   174, -1354,   281,   286,   298,   302,   326, -1354,
-      87, -1354, -1354, -1354, -1354, -1354, -1354, -1354,   345,   369,
-     370,   401,   422,   432,   440,   442,   446,   447,   449,   450,
-     451,   452, -1354,   454,   457,   458,   459,   461, -1354, -1354,
-   -1354,   462,   463,   465,   475, -1354, -1354, -1354,   477, -1354,
-   -1354, -1354, -1354, -1354, -1354,   479,   481,   485, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354,   488, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354,   489,   491,   493, -1354, -1354,
-     494, -1354,   109, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354,   495,   496,   500,   507, -1354,   121, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354,   509,   511, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354,   133, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354,   514, -1354, -1354, -1354,
-   -1354,   139, -1354, -1354, -1354, -1354, -1354, -1354,   515, -1354,
-     519,   520, -1354, -1354, -1354, -1354, -1354, -1354, -1354,   150,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,   322,   338,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,   355,
-   -1354, -1354,   523, -1354, -1354, -1354,   527, -1354, -1354,   363,
-     380, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354,   531,   532,   533, -1354, -1354, -1354,
-   -1354, -1354,   373,   436, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,   156, -1354,
-   -1354, -1354,   534, -1354,   535, -1354,   536,   537, -1354, -1354,
-   -1354, -1354, -1354,   162, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354,   540,   163, -1354, -1354, -1354, -1354,
-      38,    38, -1354,   287,   541, -1354, -1354,   546,   548,   551,
-     552,   553,   557,   334,   335,   336,   340,   341,   346,   349,
-     353,   356,   354,   360,   368,   365,   371,   563,   375,   376,
-     362,   381,   387,   581,   594,   597,   390,   391,   393,   397,
-     601,   619,   624,   402,   625,   629,   630,   631,   632,   633,
-     408,   416,   424,   651,   652,   653,   654,   655,   657,   658,
-     660,   661,   438,   663,   664,   666,   667,   668,   671,   672,
-     448,   455,   456,   673,   675, -1354,   157, -1354,   677,   460,
-     471,   474,   476,    57, -1354,   678,   679,   680,   683,   684,
-     478,   480,   701,   704,   705,   713, -1354,   707,   484,   453,
-   -1354,   709,   486,   711,   499,   503,   547, -1354,   712,   717,
-     718,   719,   728,   729,   731,   732, -1354,   510, -1354,   748,
-     749,   526,   754,   771,   772,   487, -1354,   220,   773,   558,
-     559,   561,   788, -1354,   613,   789,   790,   141, -1354,   565,
-     792,   569,   794,   571,   572,   797,   801,   230, -1354,   802,
-     579,   174, -1354, -1354, -1354,   804,   806,   582,   807,   808,
-     809,   810,   823, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354,   584, -1354, -1354,
-   -1354, -1354, -1354,  -115,   602,   603, -1354, -1354, -1354, -1354,
-     826,   827,   828, -1354,   607,   609,   378,   832,   831,   615,
-   -1354, -1354, -1354,   838,   839,   840,   841,   842,   845,   846,
-     847,   848, -1354,   849,   850,   853,   852,   854,   626,   635,
-   -1354, -1354, -1354,   855,   856, -1354,   859, -1354, -1354, -1354,
-   -1354, -1354,   860,   861,   640,   641,   642, -1354, -1354,   859,
-     643,   864, -1354,   645, -1354, -1354,   646, -1354,   647, -1354,
-   -1354, -1354,   859,   859,   859,   859,   648,   649,   650,   656,
-   -1354,   659,   662, -1354,   665,   669,   670, -1354, -1354,   674,
-   -1354, -1354, -1354,   859, -1354,   676,   831, -1354, -1354,   681,
-   -1354,   682, -1354, -1354,   142,   686, -1354,   874, -1354, -1354,
-      38,   157, -1354,   174,    57,   364,   364,   873, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354,   875,   877,   878,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354,   880, -1354, -1354,
-   -1354,   -90,    38,    69,   284,   881,   883,   884,    40,    84,
-     -52,   210,   886,    13,   230, -1354, -1354,   887,  -129, -1354,
-   -1354,   888,   891, -1354, -1354, -1354, -1354, -1354,   723, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354,   873, -1354,   191,   192,   256,
-   -1354, -1354, -1354, -1354,   895,   896,   898,   900,   901,   902,
-     903,   908,   909,   910, -1354,   911,   912, -1354, -1354, -1354,
-   -1354, -1354,   273, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354,   274, -1354,   913,   843,
-   -1354, -1354,   914,   915, -1354, -1354,   916,   918, -1354, -1354,
-     917,   921, -1354, -1354,   919,   923, -1354, -1354, -1354,    81,
-   -1354, -1354, -1354,   922, -1354, -1354, -1354,    85, -1354, -1354,
-   -1354, -1354, -1354,   285, -1354, -1354, -1354, -1354,   254, -1354,
-   -1354,   924,   926, -1354, -1354,   925,   929, -1354,   930,   931,
-     932,   933,   934,   935,   300, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354,   937,   938,   939, -1354, -1354, -1354,
-   -1354,   306, -1354, -1354, -1354, -1354, -1354, -1354,   940,   941,
-     942, -1354,   319, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354,   943, -1354,   944, -1354, -1354, -1354, -1354, -1354,
-   -1354,   320, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-     927,   946, -1354,   947, -1354,   948, -1354, -1354, -1354,   337,
-   -1354, -1354, -1354, -1354, -1354,   339, -1354,   255, -1354,   949,
-   -1354,   357, -1354, -1354,   690, -1354,   950,   951, -1354, -1354,
-     952,   954, -1354, -1354,   953,   956, -1354, -1354, -1354,   955,
-     959,   960,   961,   699,   720,   727,   730,   738,   739,   740,
-     741,   742,   743,   968,   744,   745,   972,   973,   975,   976,
-     364, -1354, -1354,   364, -1354,   873,   713, -1354,   875,   220,
-   -1354,   877,   613, -1354,   878,  1105, -1354,   880,   -90, -1354,
-   -1354,    69, -1354,   978,   979,   284, -1354,   382,   881, -1354,
-     510, -1354,   883,   -88, -1354,   884,   758,   761,   762,   764,
-     765,   775,    40, -1354,  1001,  1009,   796,   799,   818,    84,
-   -1354,   786,   822,   833,   -52, -1354,  1013,  1016,  1025,   835,
-    1030,   821,   210, -1354,   210, -1354,   886,   834,  1032,   844,
-    1033,    13, -1354, -1354,   343,   887, -1354,   906,  -129, -1354,
-   -1354,  1064,  1081,   453, -1354,   888,   547, -1354,   891, -1354,
-   -1354,   867,   876,   904,   920, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354,   280, -1354, -1354,   957,   958,
-     962,   963, -1354,   358, -1354,   359, -1354,  1129, -1354,  1131,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-     361, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,   964,
-     965, -1354, -1354, -1354,  1136, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354,  1134,  1140, -1354, -1354,
-   -1354, -1354, -1354, -1354,  1137, -1354,   367, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354,   101,   966, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354,   188,   970,   971, -1354,  1139,
-   -1354, -1354,   377, -1354, -1354,   974, -1354,    38, -1354, -1354,
-    1144, -1354, -1354, -1354, -1354, -1354,   379, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354,   977,   417, -1354,   419, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354,  1105, -1354, -1354, -1354,
-    1145,  1146,   936, -1354,   382, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,    25, -1354,
-   -1354, -1354,  1147,   980,  1148,   343, -1354, -1354, -1354, -1354,
-   -1354,   988,   993, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354,   420, -1354, -1354, -1354, -1354, -1354,  1162, -1354,
-     994, -1354, -1354, -1354,  1164,  1165,  1177,  1182,    25, -1354,
-    1180, -1354,  1018,   995,   996,  1194, -1354, -1354,   293, -1354,
-   -1354, -1354, -1354, -1354,  1193,  -108,  1180, -1354, -1354,  1138,
-    1199, -1354, -1354,  1201,  1203,  1220, -1354,   421, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354,    68, -1354,  1193,  1221,   998,
-    1002,  1004,  1222,  -108, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354,   435, -1354, -1354, -1354, -1354,  1006, -1354, -1354,
-   -1354,  1007, -1354,  1225,  1232,    68, -1354, -1354, -1354,  1010,
-    1011, -1354, -1354, -1354
+     433, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371,    43,    35,    83,    98,   110,
+     114,   126,   128,   130,   132,   134,   142,   158,   160,   190,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,    35,  -175,
+      46,   725,    54,  1369,   179,   140,   182,    -7,   127,   280,
+     -95,   245,    62, -1371,   121,   144,   185,   196,   203, -1371,
+      49, -1371, -1371, -1371, -1371, -1371, -1371, -1371,   223,   268,
+     321,   327,   333,   351,   353,   363,   364,   372,   424,   449,
+     450,   451, -1371,   453,   454,   455,   456,   457, -1371, -1371,
+   -1371,   458,   459,   460,   461, -1371, -1371, -1371,   462, -1371,
+   -1371, -1371, -1371, -1371, -1371,   463,   464,   466, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371,   467, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371,   468,   471,   472, -1371, -1371,
+     473, -1371,    60, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371,   474,   477,   482,   484, -1371,    81, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371,   485,   486, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371,    99, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,   488, -1371,
+   -1371, -1371, -1371, -1371,   100, -1371, -1371, -1371, -1371, -1371,
+   -1371,   489, -1371,   490,   492, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371,   101, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371,   241,   228, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371,   243, -1371, -1371,   493, -1371, -1371, -1371,
+     494, -1371, -1371,   282,   307, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,   496,   499,
+     500, -1371, -1371, -1371, -1371, -1371,   316,   403, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371,   116, -1371, -1371, -1371,   501, -1371,   503, -1371,
+     506,   507, -1371, -1371, -1371, -1371, -1371,   154, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,   508,   193,
+   -1371, -1371, -1371, -1371,    35,    35, -1371,   186,   512, -1371,
+   -1371,   514,   516,   519,   520,   521,   524,   187,   207,   209,
+     299,   301,   303,   305,   308,   304,   309,   310,   311,   313,
+     314,   542,   319,   323,   318,   322,   325,   547,   551,   555,
+     328,   329,   335,   337,   560,   563,   564,   340,   567,   568,
+     569,   571,   572,   578,   352,   354,   356,   579,   581,   585,
+     586,   587,   590,   592,   593,   594,   370,   597,   598,   599,
+     600,   602,   604,   610,   386,   389,   391,   612,   615, -1371,
+     725, -1371,   616,   392,   400,   396,   397,    54, -1371,   630,
+     631,   632,   633,   635,   412,   409,   639,   640,   642,   658,
+    1369, -1371,   659,   434,   179, -1371,   661,   438,   663,   440,
+     441,   140, -1371,   668,   669,   670,   671,   672,   673,   674,
+     675, -1371,   182, -1371,   676,   677,   452,   679,   680,   681,
+     465, -1371,   127,   682,   469,   470,   475,   683, -1371,   280,
+     684,   685,   120, -1371,   476,   686,   480,   687,   481,   487,
+     688,   689,   245, -1371,   690,   491,    62, -1371, -1371, -1371,
+     692,   691,   483,   693,   696,   707,   708,   694, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371,   495, -1371, -1371, -1371, -1371, -1371,  -116,   498,
+     509, -1371, -1371, -1371, -1371,   711,   713,   714, -1371,   510,
+     513,   332,   715,   716,   515, -1371, -1371, -1371,   717,   720,
+     723,   722,   736,   738,   740,   742,   743, -1371,   744,   745,
+     748,   747,   749,   526,   528, -1371, -1371, -1371,   753,   752,
+   -1371,   755, -1371, -1371, -1371, -1371, -1371,   759,   762,   539,
+     540,   541, -1371, -1371,   755,   755,   543,   764, -1371,   574,
+   -1371, -1371,   575, -1371,   576, -1371, -1371, -1371,   755,   755,
+     755,   755,   577,   580,   582,   583, -1371,   588,   589, -1371,
+     591,   595,   596, -1371, -1371,   603, -1371, -1371, -1371,   755,
+   -1371,   605,   716, -1371, -1371,   606, -1371,   607, -1371, -1371,
+      23,   613, -1371,   803, -1371, -1371,    35,   725, -1371,    62,
+      54,   148,   148,   812, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371,   815,   816,   819, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371,   820, -1371, -1371, -1371,   -93,    35,   -43,
+     162,   821,   822,   826,   227,    82,    -5,   165,   837,   124,
+     245, -1371, -1371,   838,  -163, -1371, -1371,   840,   841, -1371,
+   -1371, -1371, -1371, -1371, -1371,   718, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371,   812, -1371,   231,   247,   249, -1371, -1371, -1371,
+   -1371,   806,   846,   847,   848,   849,   850,   852,   853,   854,
+     855, -1371,   856,   857, -1371, -1371, -1371, -1371, -1371,   250,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371,   320, -1371,   859,   860, -1371, -1371,   862,
+     863, -1371, -1371,   864,   866, -1371, -1371,   865,   869, -1371,
+   -1371,   867,   872, -1371, -1371, -1371,   112, -1371, -1371, -1371,
+     870, -1371, -1371, -1371,   222, -1371, -1371, -1371, -1371, -1371,
+     324, -1371, -1371, -1371, -1371,   286, -1371, -1371,   871,   875,
+   -1371, -1371,   873,   877, -1371,   858,   880,   881,   882,   885,
+     886,   336, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371,   887,   888,   889, -1371, -1371, -1371, -1371,   338, -1371,
+   -1371, -1371, -1371, -1371, -1371,   890,   891,   892, -1371,   375,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,   893,
+   -1371,   894, -1371, -1371, -1371, -1371, -1371, -1371,   381, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371,   895,   878, -1371,
+     896, -1371,   898, -1371, -1371, -1371,   384, -1371, -1371, -1371,
+   -1371, -1371,   385, -1371,   306, -1371,   899, -1371,   387, -1371,
+   -1371,   678, -1371,   900,   902, -1371, -1371,   903,   907, -1371,
+   -1371,   904,   905, -1371, -1371, -1371,   909,   910,   911,   912,
+     700,   667,   701,   702,   703,   705,   706,   709,   710,   712,
+     913,   719,   726,   914,   915,   916,   917,   148, -1371, -1371,
+     148, -1371,   812,  1369, -1371,   815,   127, -1371,   816,   280,
+   -1371,   819,  1465, -1371,   820,   -93, -1371, -1371,   -43, -1371,
+     918,   919,   162, -1371,   170,   821, -1371,   182, -1371,   822,
+     -95, -1371,   826,   727,   728,   729,   730,   731,   732,   227,
+   -1371,   928,   933,   733,   734,   735,    82, -1371,   721,   737,
+     739,    -5, -1371,   937,   939,   940,   741,   941,   746,   165,
+   -1371,   165, -1371,   837,   751,   942,   750,   943,   124, -1371,
+   -1371,   215,   838, -1371,   754,  -163, -1371, -1371,   944,   945,
+     179, -1371,   840,   140, -1371,   841, -1371, -1371,   758,   760,
+     761,   766, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371,   259, -1371, -1371,   771,   773,   775,   781, -1371,
+     388, -1371,   394, -1371,   947, -1371,   958, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,   395, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371,   783,   789, -1371,
+   -1371, -1371,   948,   964, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371,   962,   946, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371,   965, -1371,   401, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371,   296,   791, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371,   285,   792,   794, -1371,   967,
+   -1371, -1371,   402, -1371, -1371,   797, -1371,    35, -1371, -1371,
+     968, -1371, -1371, -1371, -1371, -1371,   404, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371,   798,   410, -1371,   411, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371,  1465, -1371, -1371, -1371,
+     971,   972,   799,   801, -1371,   170, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,    25,
+   -1371, -1371, -1371,   973,   763,   975,   215, -1371, -1371, -1371,
+   -1371, -1371,   814,   817, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371,   413, -1371, -1371, -1371, -1371, -1371,
+     976, -1371,   818, -1371, -1371, -1371,   980,  1037,  1048,  1049,
+      25, -1371,  1050, -1371,   883,   832,   839,  1065, -1371, -1371,
+     342, -1371, -1371, -1371, -1371, -1371,  1064,  -113,  1050, -1371,
+   -1371,  1066,  1074, -1371, -1371,  1076,  1079,  1087, -1371,   435,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371,    97, -1371,  1064,
+    1094,   922,   906,   921,  1106,  -113, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371,   437, -1371, -1371, -1371, -1371,   884,
+   -1371, -1371, -1371,   920, -1371,  1144,  1153,    97, -1371, -1371,
+   -1371,   930,   931, -1371, -1371, -1371
   };
 
   const short
@@ -5587,17 +5619,17 @@ namespace isc { namespace dhcp {
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        1,    46,    38,    34,    33,    30,    31,    32,    37,     3,
       35,    36,    61,     5,    67,     7,   199,     9,   385,    11,
-     593,    13,   622,    15,   655,    17,   508,    19,   517,    21,
-     556,    23,   347,    25,   848,    27,   880,    29,    48,    41,
-       0,     0,     0,     0,     0,     0,   657,     0,   519,   558,
+     597,    13,   627,    15,   661,    17,   512,    19,   521,    21,
+     560,    23,   347,    25,   856,    27,   888,    29,    48,    41,
+       0,     0,     0,     0,     0,     0,   663,     0,   523,   562,
        0,     0,     0,    50,     0,    49,     0,     0,    42,    63,
-       0,    65,   141,   878,   197,   218,   220,   222,     0,     0,
+       0,    65,   141,   886,   197,   218,   220,   222,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,   187,     0,     0,     0,     0,     0,   160,   167,
-     169,     0,     0,     0,     0,   376,   506,   547,     0,   190,
-     192,   173,   451,   609,   611,     0,     0,     0,   303,   322,
-     312,   292,   693,   646,   338,   359,   725,     0,   324,   750,
-     752,   829,   846,   180,   182,     0,     0,     0,   890,   932,
+     169,     0,     0,     0,     0,   376,   510,   551,     0,   190,
+     192,   173,   454,   614,   616,     0,     0,     0,   303,   322,
+     312,   292,   699,   652,   338,   359,   733,     0,   324,   758,
+     760,   837,   854,   180,   182,     0,     0,     0,   898,   940,
        0,   140,     0,    69,    72,    73,    74,    75,    76,    77,
       78,    79,    80,   111,   112,   113,   114,   115,    81,   119,
      120,   121,   122,   123,   124,   125,   126,   127,   128,   117,
@@ -5606,180 +5638,182 @@ namespace isc { namespace dhcp {
       94,    95,    82,   108,   109,   110,    83,    92,    93,   102,
      103,   105,    91,    96,    97,    98,    99,   100,   101,   106,
      116,   136,   212,     0,     0,     0,     0,   211,     0,   201,
-     204,   205,   206,   207,   208,   209,   210,   584,   613,   436,
-     438,   440,     0,     0,   444,   442,   690,   435,   390,   391,
-     392,   393,   394,   395,   396,   397,   415,   416,   417,   418,
-     419,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   420,   421,   432,   433,   434,     0,   387,   401,   402,
-     403,   406,   407,   409,   410,   411,   404,   405,   398,   399,
-     413,   414,   400,   408,   412,   606,     0,   605,   601,   602,
-     600,     0,   595,   598,   599,   603,   604,   639,     0,   642,
-       0,     0,   638,   632,   633,   631,   630,   636,   637,     0,
-     624,   627,   628,   634,   635,   629,   688,   674,   676,   678,
-     680,   682,   684,   686,   673,   670,   671,   672,     0,   658,
-     659,   664,   665,   666,   662,   667,   668,   669,   663,     0,
-     537,   266,     0,   541,   539,   544,     0,   533,   534,     0,
-     520,   521,   524,   536,   525,   526,   527,   543,   528,   529,
-     530,   531,   532,   575,     0,     0,     0,   582,   573,   574,
-     577,   578,     0,   559,   560,   563,   564,   565,   566,   567,
-     568,   569,   572,   570,   571,   355,   357,   352,     0,   349,
-     353,   354,     0,   865,     0,   868,     0,     0,   872,   876,
-     863,   861,   862,     0,   850,   853,   854,   855,   856,   857,
-     858,   859,   860,   887,     0,     0,   882,   885,   886,    47,
-      52,     0,    39,    45,     0,    66,    62,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     204,   205,   206,   207,   208,   209,   210,   588,   618,   437,
+     439,   441,     0,     0,   445,   447,   443,   696,   436,   390,
+     391,   392,   393,   394,   395,   396,   397,   416,   417,   418,
+     419,   420,   423,   424,   425,   426,   427,   428,   429,   430,
+     431,   432,   421,   422,   433,   434,   435,     0,   387,   401,
+     402,   403,   406,   407,   408,   410,   411,   412,   404,   405,
+     398,   399,   414,   415,   400,   409,   413,   611,     0,   610,
+     605,   606,   607,   604,     0,   599,   602,   603,   608,   609,
+     645,     0,   648,     0,     0,   644,   637,   638,   639,   636,
+     635,   642,   643,     0,   629,   632,   633,   640,   641,   634,
+     694,   680,   682,   684,   686,   688,   690,   692,   679,   676,
+     677,   678,     0,   664,   665,   670,   671,   672,   668,   673,
+     674,   675,   669,     0,   541,   266,     0,   545,   543,   548,
+       0,   537,   538,     0,   524,   525,   528,   540,   529,   530,
+     531,   547,   532,   533,   534,   535,   536,   579,     0,     0,
+       0,   586,   577,   578,   581,   582,     0,   563,   564,   567,
+     568,   569,   570,   571,   572,   573,   576,   574,   575,   355,
+     357,   352,     0,   349,   353,   354,     0,   873,     0,   876,
+       0,     0,   880,   884,   871,   869,   870,     0,   858,   861,
+     862,   863,   864,   865,   866,   867,   868,   895,     0,     0,
+     890,   893,   894,    47,    52,     0,    39,    45,     0,    66,
+      62,     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,     0,     0,     0,     0,    60,    71,    68,     0,     0,
-       0,     0,     0,   203,   200,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   389,   386,     0,     0,   597,
-     594,     0,     0,     0,     0,     0,   626,   623,     0,     0,
-       0,     0,     0,     0,     0,     0,   656,   661,   509,     0,
-       0,     0,     0,     0,     0,     0,   518,   523,     0,     0,
-       0,     0,     0,   557,   562,     0,     0,   351,   348,     0,
-       0,     0,     0,     0,     0,     0,     0,   852,   849,     0,
-       0,   884,   881,    51,    43,     0,     0,     0,     0,     0,
-       0,     0,     0,   143,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,   153,   154,   155,   156,     0,   185,   186,
-     157,   158,   159,     0,     0,     0,   171,   172,   179,   184,
-       0,     0,     0,   189,     0,     0,     0,     0,     0,     0,
-     446,   447,   448,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   749,     0,     0,     0,     0,     0,     0,     0,
-     194,   195,   196,     0,     0,    70,     0,   214,   215,   216,
-     217,   202,     0,     0,     0,     0,     0,   449,   450,     0,
-       0,     0,   388,     0,   608,   596,     0,   641,     0,   644,
-     645,   625,     0,     0,     0,     0,     0,     0,     0,     0,
-     660,     0,     0,   535,     0,     0,     0,   546,   522,     0,
-     579,   580,   581,     0,   561,     0,     0,   350,   864,     0,
-     867,     0,   870,   871,     0,     0,   851,     0,   889,   883,
-       0,     0,   142,     0,     0,     0,     0,   224,   188,   162,
-     163,   164,   165,   166,   161,   168,   170,   378,   510,   549,
-     191,   193,   175,   176,   177,   178,   174,   453,    40,   610,
-     612,     0,    48,     0,     0,     0,   648,   340,     0,     0,
-       0,     0,   754,     0,     0,   181,   183,     0,     0,    53,
-     213,   586,   615,   437,   439,   441,   445,   443,     0,   607,
-     640,   643,   689,   675,   677,   679,   681,   683,   685,   687,
-     538,   267,   542,   540,   545,   576,   583,   356,   358,   866,
-     869,   874,   875,   873,   877,   224,    44,     0,     0,     0,
-     257,   259,   261,   263,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   276,     0,     0,   284,   286,   288,
-     290,   256,     0,   231,   234,   235,   236,   237,   238,   239,
-     240,   241,   242,   243,   244,   245,   246,   248,   249,   250,
-     251,   247,   252,   253,   254,   255,     0,   229,     0,   225,
-     226,   383,     0,   379,   380,   515,     0,   511,   512,   554,
-       0,   550,   551,   458,     0,   454,   455,   310,   311,     0,
-     305,   308,   309,     0,   320,   321,   317,     0,   314,   318,
-     319,   299,   301,     0,   294,   297,   298,   698,     0,   695,
-     653,     0,   649,   650,   345,     0,   341,   342,     0,     0,
-       0,     0,     0,     0,     0,   361,   364,   365,   366,   367,
-     368,   369,   739,   745,     0,     0,     0,   738,   735,   736,
-     737,     0,   727,   730,   733,   731,   732,   734,     0,     0,
-       0,   334,     0,   326,   329,   330,   331,   332,   333,   776,
-     781,   783,     0,   787,     0,   775,   769,   770,   771,   773,
-     774,     0,   761,   764,   765,   766,   767,   772,   768,   759,
-       0,   755,   756,     0,   841,     0,   844,   837,   838,     0,
-     831,   834,   835,   836,   839,     0,   895,     0,   892,     0,
-     938,     0,   934,   937,    55,   591,     0,   587,   588,   620,
-       0,   616,   617,   692,     0,     0,    64,   879,   198,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    60,
+      71,    68,     0,     0,     0,     0,     0,   203,   200,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     389,   386,     0,     0,   601,   598,     0,     0,     0,     0,
+       0,   631,   628,     0,     0,     0,     0,     0,     0,     0,
+       0,   662,   667,   513,     0,     0,     0,     0,     0,     0,
+       0,   522,   527,     0,     0,     0,     0,     0,   561,   566,
+       0,     0,   351,   348,     0,     0,     0,     0,     0,     0,
+       0,     0,   860,   857,     0,     0,   892,   889,    51,    43,
+       0,     0,     0,     0,     0,     0,     0,     0,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,     0,   185,   186,   157,   158,   159,     0,     0,
+       0,   171,   172,   179,   184,     0,     0,     0,   189,     0,
+       0,     0,     0,     0,     0,   449,   450,   451,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   757,     0,     0,
+       0,     0,     0,     0,     0,   194,   195,   196,     0,     0,
+      70,     0,   214,   215,   216,   217,   202,     0,     0,     0,
+       0,     0,   452,   453,     0,     0,     0,     0,   388,     0,
+     613,   600,     0,   647,     0,   650,   651,   630,     0,     0,
+       0,     0,     0,     0,     0,     0,   666,     0,     0,   539,
+       0,     0,     0,   550,   526,     0,   583,   584,   585,     0,
+     565,     0,     0,   350,   872,     0,   875,     0,   878,   879,
+       0,     0,   859,     0,   897,   891,     0,     0,   142,     0,
+       0,     0,     0,   224,   188,   162,   163,   164,   165,   166,
+     161,   168,   170,   378,   514,   553,   191,   193,   175,   176,
+     177,   178,   174,   456,    40,   615,   617,     0,    48,     0,
+       0,     0,   654,   340,     0,     0,     0,     0,   762,     0,
+       0,   181,   183,     0,     0,    53,   213,   590,   620,   438,
+     440,   442,   446,   448,   444,     0,   612,   646,   649,   695,
+     681,   683,   685,   687,   689,   691,   693,   542,   267,   546,
+     544,   549,   580,   587,   356,   358,   874,   877,   882,   883,
+     881,   885,   224,    44,     0,     0,     0,   257,   259,   261,
+     263,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   276,     0,     0,   284,   286,   288,   290,   256,     0,
+     231,   234,   235,   236,   237,   238,   239,   240,   241,   242,
+     243,   244,   245,   246,   248,   249,   250,   251,   247,   252,
+     253,   254,   255,     0,   229,     0,   225,   226,   383,     0,
+     379,   380,   519,     0,   515,   516,   558,     0,   554,   555,
+     461,     0,   457,   458,   310,   311,     0,   305,   308,   309,
+       0,   320,   321,   317,     0,   314,   318,   319,   299,   301,
+       0,   294,   297,   298,   704,     0,   701,   659,     0,   655,
+     656,   345,     0,   341,   342,     0,     0,     0,     0,     0,
+       0,     0,   361,   364,   365,   366,   367,   368,   369,   747,
+     753,     0,     0,     0,   746,   743,   744,   745,     0,   735,
+     738,   741,   739,   740,   742,     0,     0,     0,   334,     0,
+     326,   329,   330,   331,   332,   333,   784,   789,   791,     0,
+     795,     0,   783,   777,   778,   779,   781,   782,     0,   769,
+     772,   773,   774,   775,   780,   776,   767,     0,   763,   764,
+       0,   849,     0,   852,   845,   846,     0,   839,   842,   843,
+     844,   847,     0,   903,     0,   900,     0,   946,     0,   942,
+     945,    55,   595,     0,   591,   592,   625,     0,   621,   622,
+     698,     0,     0,    64,   887,   198,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     233,   219,   221,     0,   223,   228,     0,   377,   382,   519,
-     507,   514,   558,   548,   553,     0,   452,   457,   307,   304,
-     323,   316,   313,     0,     0,   296,   293,   700,   697,   694,
-     657,   647,   652,     0,   339,   344,     0,     0,     0,     0,
-       0,     0,   363,   360,     0,     0,     0,     0,     0,   729,
-     726,     0,     0,     0,   328,   325,     0,     0,     0,     0,
-       0,     0,   763,   751,     0,   753,   758,     0,     0,     0,
-       0,   833,   830,   847,     0,   894,   891,     0,   936,   933,
-      57,     0,    56,     0,   585,   590,     0,   614,   619,   691,
-     888,     0,     0,     0,     0,   265,   268,   269,   270,   271,
-     272,   273,   274,   283,   275,     0,   281,   282,     0,     0,
-       0,     0,   232,     0,   227,     0,   381,     0,   513,     0,
-     552,   505,   476,   477,   478,   480,   481,   482,   467,   468,
-     485,   486,   487,   488,   489,   492,   493,   494,   495,   496,
-     497,   498,   499,   500,   501,   490,   491,   502,   503,   504,
-     463,   464,   465,   466,   474,   475,   471,   472,   473,   479,
-       0,   460,   469,   483,   484,   470,   456,   306,   315,     0,
-       0,   295,   720,   722,     0,   718,   712,   713,   714,   715,
-     716,   717,   719,   709,   710,   711,     0,   701,   702,   705,
-     706,   707,   708,   696,     0,   651,     0,   343,   370,   371,
-     372,   373,   374,   375,   362,     0,     0,   744,   747,   748,
-     728,   335,   336,   337,   327,     0,     0,     0,   785,     0,
-     786,   762,     0,   757,   840,     0,   843,     0,   832,   910,
-       0,   908,   906,   900,   904,   905,     0,   897,   902,   903,
-     901,   893,   939,   935,    54,    59,     0,   589,     0,   618,
+       0,     0,     0,     0,     0,     0,     0,   233,   219,   221,
+       0,   223,   228,     0,   377,   382,   523,   511,   518,   562,
+     552,   557,     0,   455,   460,   307,   304,   323,   316,   313,
+       0,     0,   296,   293,   706,   703,   700,   663,   653,   658,
+       0,   339,   344,     0,     0,     0,     0,     0,     0,   363,
+     360,     0,     0,     0,     0,     0,   737,   734,     0,     0,
+       0,   328,   325,     0,     0,     0,     0,     0,     0,   771,
+     759,     0,   761,   766,     0,     0,     0,     0,   841,   838,
+     855,     0,   902,   899,     0,   944,   941,    57,     0,    56,
+       0,   589,   594,     0,   619,   624,   697,   896,     0,     0,
+       0,     0,   265,   268,   269,   270,   271,   272,   273,   274,
+     283,   275,     0,   281,   282,     0,     0,     0,     0,   232,
+       0,   227,     0,   381,     0,   517,     0,   556,   509,   480,
+     481,   482,   484,   485,   486,   470,   471,   489,   490,   491,
+     492,   493,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   494,   495,   506,   507,   508,   466,   467,   468,
+     469,   477,   478,   479,   474,   475,   476,   483,     0,   463,
+     472,   487,   488,   473,   459,   306,   315,     0,     0,   295,
+     727,   729,     0,     0,   725,   719,   720,   721,   722,   723,
+     724,   726,   716,   717,   718,     0,   707,   708,   711,   712,
+     713,   714,   715,   702,     0,   657,     0,   343,   370,   371,
+     372,   373,   374,   375,   362,     0,     0,   752,   755,   756,
+     736,   335,   336,   337,   327,     0,     0,     0,   793,     0,
+     794,   770,     0,   765,   848,     0,   851,     0,   840,   918,
+       0,   916,   914,   908,   912,   913,     0,   905,   910,   911,
+     909,   901,   947,   943,    54,    59,     0,   593,     0,   623,
      258,   260,   262,   264,   278,   279,   280,   277,   285,   287,
-     289,   291,   230,   384,   516,   555,   462,   459,   300,   302,
-       0,     0,     0,   699,   704,   654,   346,   741,   742,   743,
-     740,   746,   778,   779,   780,   777,   782,   784,     0,   760,
-     842,   845,     0,     0,     0,   899,   896,    58,   592,   621,
-     461,     0,     0,   724,   703,   799,   802,   804,   806,   798,
-     797,   796,     0,   789,   792,   793,   794,   795,     0,   907,
-       0,   898,   721,   723,     0,     0,     0,     0,   791,   788,
-       0,   909,     0,     0,     0,     0,   790,   915,     0,   912,
-     801,   800,   803,   805,   808,     0,   914,   911,   813,     0,
-     809,   810,   925,     0,     0,     0,   930,     0,   917,   920,
-     921,   922,   923,   924,   913,     0,   807,   812,     0,     0,
-       0,     0,     0,   919,   916,   825,   827,   824,   818,   820,
-     822,   823,     0,   815,   819,   821,   811,     0,   927,   928,
-     929,     0,   918,     0,     0,   817,   814,   926,   931,     0,
-       0,   816,   826,   828
+     289,   291,   230,   384,   520,   559,   465,   462,   300,   302,
+       0,     0,     0,     0,   705,   710,   660,   346,   749,   750,
+     751,   748,   754,   786,   787,   788,   785,   790,   792,     0,
+     768,   850,   853,     0,     0,     0,   907,   904,    58,   596,
+     626,   464,     0,     0,   731,   732,   709,   807,   810,   812,
+     814,   806,   805,   804,     0,   797,   800,   801,   802,   803,
+       0,   915,     0,   906,   728,   730,     0,     0,     0,     0,
+     799,   796,     0,   917,     0,     0,     0,     0,   798,   923,
+       0,   920,   809,   808,   811,   813,   816,     0,   922,   919,
+     821,     0,   817,   818,   933,     0,     0,     0,   938,     0,
+     925,   928,   929,   930,   931,   932,   921,     0,   815,   820,
+       0,     0,     0,     0,     0,   927,   924,   833,   835,   832,
+     826,   828,   830,   831,     0,   823,   827,   829,   819,     0,
+     935,   936,   937,     0,   926,     0,     0,   825,   822,   934,
+     939,     0,     0,   824,   834,   836
   };
 
   const short
   Dhcp6Parser::yypgoto_[] =
   {
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354,     0, -1354,  -581, -1354,
-     524, -1354, -1354, -1354, -1354,   119, -1354,  -624, -1354, -1354,
-   -1354,   -71, -1354, -1354, -1354, -1354, -1354, -1354, -1354,   508,
-     726, -1354, -1354,   -61,   -58,   -27,   -25,    -7,    12,    -1,
-      19,    30,    31,    36,    37,    41, -1354,    43,    47,    49,
-      53, -1354, -1354,    55, -1354,    59, -1354,    60,    61,    65,
-   -1354, -1354,    67,    71, -1354,    72, -1354,    73, -1354, -1354,
-   -1354, -1354, -1354,    75, -1354,    77, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354,   512,   721, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,   434, -1354,
-     202, -1354,  -712,   212, -1354, -1354, -1353, -1354, -1349, -1354,
-   -1354, -1354, -1354,   -41, -1354,  -746, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,  -765,
-   -1354,  -758, -1354,  -754, -1354, -1354, -1354, -1354, -1354, -1354,
-     185, -1354, -1354, -1354, -1354, -1354, -1354, -1354,   197,  -737,
-   -1354, -1354, -1354, -1354,   193, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354,   164, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-     187, -1354, -1354, -1354,   190,   689, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354,   178, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1023, -1354, -1354, -1354,   222, -1354, -1354, -1354,   225,   733,
-   -1354, -1354, -1020, -1354, -1016, -1354,    80, -1354,    86, -1354,
-      78,    79,    83, -1354, -1015, -1354, -1354, -1354, -1354,   215,
-   -1354, -1354,   -32,  1198, -1354, -1354, -1354, -1354, -1354,   226,
-   -1354, -1354, -1354,   227, -1354,   715, -1354,   -57, -1354, -1354,
-   -1354, -1354, -1354,   -54, -1354, -1354, -1354, -1354, -1354,   -55,
-   -1354, -1354, -1354,   224, -1354, -1354, -1354,   228, -1354,   710,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354,   161, -1354, -1354, -1354,   168,   746,
-   -1354, -1354,   -64,   -45, -1354,   -14, -1354, -1354, -1354, -1354,
-   -1354,   167, -1354, -1354, -1354,   172,   747, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354,   -59, -1354, -1354, -1354,   216, -1354,
-   -1354, -1354,   231, -1354,   751,   516, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1014, -1354, -1354, -1354, -1354, -1354,   238, -1354, -1354,
-   -1354,   -18, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354,   221, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354,   203, -1354,   207,
-     211, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354,   -56, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354,   -92, -1354, -1354,  -119, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354,   206, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354,   545,   735, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354,   587,   736, -1354, -1354,
-   -1354, -1354, -1354, -1354,   209, -1354, -1354,    -6, -1354, -1354,
-   -1354, -1354, -1354, -1354,   -53, -1354, -1354,   -85, -1354, -1354,
-   -1354, -1354, -1354, -1354, -1354, -1354, -1354, -1354,   213, -1354
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371,    -3, -1371,  -593, -1371,
+     439, -1371, -1371, -1371, -1371,   398, -1371,  -319, -1371, -1371,
+   -1371,   -71, -1371, -1371, -1371, -1371, -1371, -1371, -1371,   341,
+     643, -1371, -1371,   -61,   -38,   -25,     5,    22,    37,   -57,
+     -55,   -18,    39,    40,    41,    47, -1371,    52,    53,    55,
+      59, -1371, -1371,    65, -1371,    67, -1371,    69,    70,    71,
+   -1371, -1371,    72,    73, -1371,    75, -1371,    77, -1371, -1371,
+   -1371, -1371, -1371,    85, -1371,    88, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371,   422,   637, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,   343, -1371,
+     115, -1371,  -720,   122, -1371, -1371, -1370, -1371, -1364, -1371,
+   -1371, -1371, -1371,   -40, -1371,  -754, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,  -771,
+   -1371,  -762, -1371,  -757, -1371, -1371, -1371, -1371, -1371, -1371,
+     102, -1371, -1371, -1371, -1371, -1371, -1371, -1371,   103,  -746,
+   -1371, -1371, -1371, -1371,   104, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371,    74, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+      89, -1371, -1371, -1371,   105,   601, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371,    84, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1038, -1371, -1371, -1371,   123, -1371, -1371, -1371,   117,   636,
+   -1371, -1371, -1037, -1371, -1036, -1371,    78, -1371,    94, -1371,
+      96, -1371,    90,    91,    93, -1371, -1030, -1371, -1371, -1371,
+   -1371,   113, -1371, -1371,  -137,  1103, -1371, -1371, -1371, -1371,
+   -1371,   129, -1371, -1371, -1371,   125, -1371,   614, -1371,   -65,
+   -1371, -1371, -1371, -1371, -1371,   -60, -1371, -1371, -1371, -1371,
+   -1371,    12, -1371, -1371, -1371,   131, -1371, -1371, -1371,   135,
+   -1371,   609, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371,    50, -1371, -1371, -1371,
+      61,   645, -1371, -1371,   -64,   -45, -1371,   -14, -1371, -1371,
+   -1371, -1371, -1371,    58, -1371, -1371, -1371,    51,   644, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371,   -56, -1371, -1371, -1371,
+     111, -1371, -1371, -1371,   119, -1371,   638,   406, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1025, -1371, -1371, -1371, -1371, -1371,   137,
+   -1371, -1371, -1371,  -128, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371,   106, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+      86, -1371,    87,    95, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371,  -177, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,  -214, -1371,
+   -1371,  -241, -1371, -1371, -1371, -1371, -1371, -1371, -1371,    92,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+     427,   617, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,   478,
+     618, -1371, -1371, -1371, -1371, -1371, -1371,   108, -1371, -1371,
+    -133, -1371, -1371, -1371, -1371, -1371, -1371,  -183, -1371, -1371,
+    -209, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371, -1371,
+   -1371,   107, -1371
   };
 
   const short
@@ -5787,597 +5821,654 @@ namespace isc { namespace dhcp {
   {
        0,    15,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    83,    39,    40,    69,
-     759,    87,    88,    41,    68,    84,    85,   780,  1004,  1121,
-    1122,   841,    43,    70,    90,   444,    91,    45,    71,   162,
-     163,   164,   447,   165,   166,   167,   168,   169,   170,   171,
+     765,    87,    88,    41,    68,    84,    85,   786,  1011,  1128,
+    1129,   848,    43,    70,    90,   448,    91,    45,    71,   162,
+     163,   164,   451,   165,   166,   167,   168,   169,   170,   171,
      172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   473,   744,   183,   474,   184,   475,   185,   186,   187,
-     486,   756,   188,   189,   508,   190,   509,   191,   192,   193,
-     194,   467,   195,   196,   484,   197,   485,   198,   199,   200,
-     201,   449,    47,    72,   238,   239,   240,   518,   241,   242,
-     243,   244,   202,   450,   203,   451,   204,   452,   868,   869,
-     870,  1043,   842,   843,   844,  1019,   845,  1020,   846,  1021,
-     847,  1022,   848,   849,   560,   850,   851,   852,   853,   854,
-     855,   856,   857,   858,  1033,  1297,   859,   860,   861,   862,
-    1036,   863,  1037,   864,  1038,   865,  1039,   205,   496,   903,
-     904,   905,  1063,   906,  1064,   206,   493,   889,   890,   891,
-     892,   207,   495,   897,   898,   899,   900,   208,   494,   209,
-     503,   952,   953,   954,   955,   956,   210,   499,   915,   916,
-     917,  1073,    63,    80,   408,   409,   410,   575,   411,   576,
-     211,   500,   924,   925,   926,   927,   928,   929,   930,   931,
-     212,   480,   872,   873,   874,  1046,    49,    73,   286,   287,
-     288,   527,   289,   528,   290,   529,   291,   533,   292,   532,
-     213,   214,   215,   296,   297,   216,   487,   884,   885,   886,
-    1055,  1200,  1201,   217,   481,    57,    77,   876,   877,   878,
-    1049,    59,    78,   369,   370,   371,   372,   373,   374,   375,
-     559,   376,   563,   377,   562,   378,   379,   564,   380,   218,
-     482,   880,   881,   882,  1052,    61,    79,   392,   393,   394,
-     395,   396,   568,   397,   398,   399,   400,   401,   402,   572,
-     299,   525,  1006,  1007,  1008,  1123,    51,    74,   311,   312,
-     313,   537,   314,   219,   488,   220,   489,   302,   526,  1010,
-    1011,  1012,  1126,    53,    75,   329,   330,   331,   541,   332,
-     333,   543,   334,   335,   221,   498,   911,   912,   913,  1070,
-      55,    76,   348,   349,   350,   351,   549,   352,   550,   353,
-     551,   354,   552,   355,   553,   356,   554,   357,   555,   358,
-     548,   304,   534,  1014,   222,   497,   908,   909,  1067,  1226,
-    1227,  1228,  1229,  1230,  1310,  1231,  1311,  1232,   223,   501,
-     941,   942,   943,  1084,  1320,   944,   945,  1085,   946,   947,
-     224,   225,   504,   226,   505,   980,   981,   982,  1104,   971,
-     972,   973,  1096,  1325,   974,  1097,   975,  1098,   976,   977,
-     978,  1100,  1352,  1353,  1354,  1364,  1381,  1355,  1365,  1356,
-    1366,  1357,  1367,  1389,  1390,  1391,  1405,  1422,  1423,  1424,
-    1433,  1425,  1434,   227,   506,   989,   990,   991,   992,  1108,
-     993,   994,  1110,   228,   507,    65,    81,   423,   424,   425,
-     426,   580,   427,   428,   582,   429,   430,   431,   585,   813,
-     432,   586,   229,   448,    67,    82,   435,   436,   437,   589,
-     438,   230,   513,   997,   998,  1114,  1276,  1277,  1278,  1279,
-    1334,  1280,  1332,  1378,  1379,  1385,  1397,  1398,  1399,  1408,
-    1400,  1401,  1402,  1403,  1412,   231,   514,  1001,  1002,  1003
+     182,   477,   750,   183,   478,   184,   479,   185,   186,   187,
+     490,   762,   188,   189,   512,   190,   513,   191,   192,   193,
+     194,   471,   195,   196,   488,   197,   489,   198,   199,   200,
+     201,   453,    47,    72,   238,   239,   240,   522,   241,   242,
+     243,   244,   202,   454,   203,   455,   204,   456,   875,   876,
+     877,  1050,   849,   850,   851,  1026,   852,  1027,   853,  1028,
+     854,  1029,   855,   856,   565,   857,   858,   859,   860,   861,
+     862,   863,   864,   865,  1040,  1307,   866,   867,   868,   869,
+    1043,   870,  1044,   871,  1045,   872,  1046,   205,   500,   910,
+     911,   912,  1070,   913,  1071,   206,   497,   896,   897,   898,
+     899,   207,   499,   904,   905,   906,   907,   208,   498,   209,
+     507,   959,   960,   961,   962,   963,   210,   503,   922,   923,
+     924,  1080,    63,    80,   412,   413,   414,   580,   415,   581,
+     211,   504,   931,   932,   933,   934,   935,   936,   937,   938,
+     212,   484,   879,   880,   881,  1053,    49,    73,   287,   288,
+     289,   531,   290,   532,   291,   533,   292,   538,   293,   536,
+     294,   537,   213,   214,   215,   298,   299,   216,   491,   891,
+     892,   893,  1062,  1208,  1209,   217,   485,    57,    77,   883,
+     884,   885,  1056,    59,    78,   373,   374,   375,   376,   377,
+     378,   379,   564,   380,   568,   381,   567,   382,   383,   569,
+     384,   218,   486,   887,   888,   889,  1059,    61,    79,   396,
+     397,   398,   399,   400,   573,   401,   402,   403,   404,   405,
+     406,   577,   301,   529,  1013,  1014,  1015,  1130,    51,    74,
+     314,   315,   316,   542,   317,   219,   492,   220,   493,   304,
+     530,  1017,  1018,  1019,  1133,    53,    75,   333,   334,   335,
+     546,   336,   337,   548,   338,   339,   221,   502,   918,   919,
+     920,  1077,    55,    76,   352,   353,   354,   355,   554,   356,
+     555,   357,   556,   358,   557,   359,   558,   360,   559,   361,
+     560,   362,   553,   306,   539,  1021,   222,   501,   915,   916,
+    1074,  1235,  1236,  1237,  1238,  1239,  1320,  1240,  1321,  1241,
+    1242,   223,   505,   948,   949,   950,  1091,  1331,   951,   952,
+    1092,   953,   954,   224,   225,   508,   226,   509,   987,   988,
+     989,  1111,   978,   979,   980,  1103,  1336,   981,  1104,   982,
+    1105,   983,   984,   985,  1107,  1364,  1365,  1366,  1376,  1393,
+    1367,  1377,  1368,  1378,  1369,  1379,  1401,  1402,  1403,  1417,
+    1434,  1435,  1436,  1445,  1437,  1446,   227,   510,   996,   997,
+     998,   999,  1115,  1000,  1001,  1117,   228,   511,    65,    81,
+     427,   428,   429,   430,   585,   431,   432,   587,   433,   434,
+     435,   590,   820,   436,   591,   229,   452,    67,    82,   439,
+     440,   441,   594,   442,   230,   517,  1004,  1005,  1121,  1286,
+    1287,  1288,  1289,  1345,  1290,  1343,  1390,  1391,  1397,  1409,
+    1410,  1411,  1420,  1412,  1413,  1414,  1415,  1424,   231,   518,
+    1008,  1009,  1010
   };
 
   const short
   Dhcp6Parser::yytable_[] =
   {
-     161,   237,   257,   307,   322,   344,   966,   367,   388,   407,
-     420,   326,   258,   967,   303,   259,    38,   968,   298,   310,
-     325,   345,   390,   938,   866,   391,   896,   245,   300,   315,
-     327,   346,  1191,   381,   403,  1192,   421,   368,   389,  1193,
-    1199,  1205,   887,    31,    30,    32,   260,    33,   261,  1345,
-     405,   406,  1418,   133,   134,   786,  1419,   758,   246,   301,
-     316,   328,   347,    42,   382,   404,   262,   422,   792,   793,
-     794,   795,   264,   232,   233,   234,   235,   236,   739,   740,
-     741,   742,  1418,   999,  1058,   263,  1419,  1059,  1061,   806,
-     445,  1062,   265,   821,   822,   446,  1392,    44,   160,  1393,
-    1394,  1395,  1396,   266,   267,   948,   949,   950,   932,   268,
-     269,    46,   516,   825,   270,   743,   271,   517,   133,   134,
-     272,    48,   273,    50,   523,    52,   274,    54,   275,   524,
-     133,   134,   276,   277,   278,   758,   535,   888,   279,   160,
-     280,   536,   539,    56,   281,   282,   283,   540,   284,    86,
-     285,   293,   294,   546,   308,   323,   295,    89,   547,   577,
-     309,   324,   133,   134,   578,   587,   591,    58,    92,    93,
-     588,   592,    94,   133,   134,   160,    60,    62,    95,    96,
-      97,   918,   919,   920,   921,   922,   923,   433,   434,   133,
-     134,   983,   984,   985,   516,   591,  1346,  1347,  1348,  1016,
-    1017,   887,   894,    64,   895,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   933,   934,   935,   936,    66,
-     986,   126,  1415,  1416,   360,   128,   129,   130,   131,  1317,
-    1318,  1319,   160,   132,   837,   838,   839,  1068,  1115,   523,
-    1069,  1116,   133,   134,  1018,    34,    35,    36,    37,   135,
-     136,   137,   138,   139,   140,   141,  1040,  1040,   142,   405,
-     406,  1041,  1042,  1191,   160,   143,  1192,   439,  1065,   440,
-    1193,  1199,  1205,  1066,   144,   160,  1386,   145,   361,  1387,
-     362,   363,   441,  1082,   146,   364,   365,   366,  1083,  1089,
-     442,   160,   147,   148,  1090,   133,   134,   149,   150,  1294,
-    1295,  1296,  1094,  1102,   896,   133,   134,  1095,  1103,   443,
-     556,  1153,   811,   812,   151,   133,   134,   966,   152,   966,
-    1111,   557,   587,   938,   967,  1112,   967,  1113,   968,   453,
-     968,  1322,  1323,  1324,   153,   154,   155,   156,   157,   158,
-    1118,  1040,   535,   558,  1306,  1119,  1302,  1303,   159,  1307,
-     577,   566,   959,   454,   455,  1316,   960,   961,   962,   963,
-    1102,   573,  1335,   567,   160,  1329,   964,  1336,   820,   821,
-     822,   823,   824,   825,   826,   827,   828,   829,   830,   831,
-     832,   833,   834,   901,   902,   456,   835,   836,   837,   838,
-     839,   840,   412,   413,   414,   415,   416,   417,   418,   419,
-     539,   361,   546,  1368,  1413,  1338,   457,  1339,  1369,  1414,
-      98,    99,   100,   101,   102,   103,   458,   160,  1435,   574,
-     593,   594,   361,  1436,   459,   161,   460,   160,   133,   134,
-     461,   462,   237,   463,   464,   465,   466,   160,   468,   127,
-     361,   469,   470,   471,   257,   472,   476,   477,   307,   478,
-     752,   753,   754,   755,   258,   322,   303,   259,   245,   479,
-     298,   483,   326,   490,   310,   491,   344,   133,   134,   492,
-     300,   325,   502,   510,   315,   511,   367,   512,   515,   519,
-     520,   327,   345,   388,   521,  1212,  1213,  1214,   260,   246,
-     261,   522,   346,   530,   595,   531,   420,   390,   538,   542,
-     391,   301,   381,   544,   545,   316,   368,   561,   262,   403,
-     127,   565,   328,   389,   264,   569,   570,   571,   579,   581,
-     583,   584,   421,   347,   590,   596,  1269,   263,  1270,  1271,
-     597,   305,   598,   382,   265,   599,   600,   601,   133,   134,
-     404,   602,   603,   604,   605,   266,   267,   617,   606,   607,
-     160,   268,   269,   422,   608,   254,   270,   609,   271,   255,
-     306,   610,   272,   612,   273,   623,   611,   127,   274,   613,
-     275,   160,   620,   615,   276,   277,   278,   614,   624,   616,
-     279,   625,   280,   618,   619,   630,   281,   282,   283,   160,
-     284,   621,   285,   293,   294,   133,   134,   622,   295,   308,
-     626,   627,   628,   631,   127,   309,   323,   629,   632,   634,
-     633,   336,   324,   635,   636,   637,   638,   639,   640,   337,
-     338,   339,   340,   341,   342,   343,   641,   317,   318,   319,
-     320,   321,   133,   134,   642,   643,   644,   645,   646,   647,
-     161,   648,   649,   237,   650,   651,   652,   653,   654,   254,
-     655,   656,   657,   255,   306,   658,   659,   663,   660,   664,
-     160,   666,   672,   673,   674,   661,   662,   675,   676,   245,
-     667,   361,   383,   362,   363,   384,   385,   386,   937,   951,
-     965,   668,   669,   420,   670,   679,   677,  1000,   680,   681,
-     678,   683,   684,   686,   687,   688,   692,   707,   133,   134,
-     246,   693,   694,   695,   939,   957,   969,   689,   987,   421,
-     816,   690,   696,   697,   387,   698,   699,   160,     1,     2,
+     161,   237,   258,   309,   325,   348,   973,   371,   392,   411,
+     424,   330,   259,    38,   394,   974,   265,   305,   266,   395,
+     975,   945,   873,   903,  1198,  1199,  1200,   245,   302,   318,
+     331,   350,  1207,   385,   407,   260,   425,  1213,   372,   393,
+      31,   894,    32,    30,    33,   409,   410,  1430,   261,  1357,
+     764,  1006,   449,  1431,    86,   267,    89,   450,   246,   303,
+     319,   332,   351,   520,   386,   408,   160,   426,   521,   126,
+     232,   233,   234,   235,   236,   437,   438,  1430,   262,   745,
+     746,   747,   748,  1431,   527,   300,   313,   329,   349,   528,
+      42,   894,   901,  1404,   902,   263,  1405,  1406,  1407,  1408,
+     133,   134,   540,   544,   551,    44,   939,   541,   545,   552,
+     264,   832,   268,   269,   270,  1065,   749,    46,  1066,   582,
+     271,    48,   828,   829,   583,   272,   273,   443,   274,   764,
+     133,   134,   275,    50,   160,    52,   895,    54,   276,    56,
+     277,    58,   278,   279,   280,   281,   282,   444,   283,    60,
+     284,   364,   310,   326,   955,   956,   957,   592,   285,   133,
+     134,   286,   593,   295,   296,    62,   297,    64,   311,   327,
+     312,   328,   827,   828,   829,   830,   831,   832,   833,   834,
+     835,   836,   837,   838,   839,   840,   841,   133,   134,   445,
+     842,   843,   844,   845,   846,   847,   596,    66,  1358,  1359,
+    1360,   597,   133,   134,   446,   365,   447,   366,   367,   844,
+     845,   846,   368,   369,   370,   818,   819,   127,    98,    99,
+     100,   101,   102,   103,   160,  1068,   365,   457,  1069,   133,
+     134,   562,   133,   134,   520,   940,   941,   942,   943,  1023,
+     320,   321,   322,   323,   324,   133,   134,   127,   365,   561,
+     596,   563,   527,  1047,   160,  1024,   127,  1025,  1048,   127,
+     409,   410,   254,   255,    34,    35,    36,    37,   256,   308,
+     133,   134,   458,  1427,  1428,   133,   134,   307,  1198,  1199,
+    1200,   908,   909,   160,   133,   134,  1207,   133,   134,  1075,
+     571,  1213,  1076,   365,  1220,  1221,  1222,  1223,  1304,  1305,
+    1306,   254,   255,   340,   990,   991,   992,   256,   308,  1122,
+     572,   160,  1123,   341,   342,   343,   344,   345,   346,   347,
+     133,   134,   903,  1047,   578,   459,   160,  1072,  1049,   966,
+    1160,   460,  1073,   967,   968,   969,   970,   461,   973,  1089,
+     973,  1096,   945,   971,  1090,  1398,  1097,   974,  1399,   974,
+     133,   134,   975,   993,   975,   462,   160,   463,   365,   387,
+     366,   367,   388,   389,   390,   792,   793,   464,   465,   160,
+     925,   926,   927,   928,   929,   930,   466,   160,  1101,   799,
+     800,   801,   802,  1102,  1109,   133,   134,  1118,   592,  1110,
+    1125,  1047,  1119,  1120,   160,  1126,  1312,   540,  1316,   160,
+     813,   391,  1313,  1317,   582,  1109,   579,  1346,   160,  1327,
+    1340,   160,  1347,   544,   551,   600,  1380,   608,  1349,  1350,
+    1279,  1381,  1280,  1281,   758,   759,   760,   761,   467,   416,
+     417,   418,   419,   420,   421,   422,   423,   609,  1425,   610,
+    1447,   598,   599,  1426,   160,  1448,  1328,  1329,  1330,   161,
+    1333,  1334,  1335,   468,   469,   470,   237,   472,   473,   474,
+     475,   476,   480,   481,   482,   483,   487,   494,   495,   258,
+     496,   506,   514,   309,   160,   515,   516,   519,   523,   259,
+     325,   524,   245,   265,   305,   266,   525,   330,   526,   534,
+     535,   348,   543,   547,   549,   302,   550,   566,   570,   318,
+     574,   371,   260,   575,   576,   584,   331,   586,   392,   160,
+     588,   589,   595,   246,   394,   261,   601,   350,   602,   395,
+     603,   424,   267,   604,   605,   606,   303,   385,   607,   611,
+     319,   612,   372,   613,   407,   614,   616,   332,   615,   393,
+     617,   618,   619,   620,   621,   262,   622,   425,   351,   623,
+     625,   628,   300,   624,   626,   629,   313,   627,   386,   630,
+     631,   632,   263,   329,   635,   408,   633,   636,   637,   634,
+     638,   639,   640,   641,   349,   642,   643,   264,   426,   268,
+     269,   270,   644,   648,   645,   649,   646,   271,   647,   650,
+     651,   652,   272,   273,   653,   274,   654,   655,   656,   275,
+     657,   658,   659,   660,   661,   276,   662,   277,   663,   278,
+     279,   280,   281,   282,   664,   283,   668,   284,   665,   669,
+     671,   666,   310,   667,   672,   285,   674,   675,   286,   326,
+     295,   296,   673,   297,   677,   678,   679,   680,   311,   681,
+     312,   683,   682,   684,   685,   327,   686,   328,     1,     2,
        3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,   701,   702,   703,   940,   958,   970,   704,   988,
-     422,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   160,   705,   706,   709,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   710,   711,
-     127,   712,   713,   715,   716,   718,   719,   720,   721,   722,
-     723,   724,   129,   130,   131,   725,   727,   728,   730,   732,
-     247,   738,   248,   731,   733,   734,   735,   736,   133,   134,
-     249,   250,   251,   252,   253,   135,   136,   137,   737,   745,
-     746,   747,   748,   749,   750,   254,   751,   757,    32,   255,
-     160,   143,   760,   761,   762,   763,  1045,   765,   764,   256,
-     766,   767,   337,   775,   768,   769,   770,   771,   772,   773,
-     777,   774,   776,   778,   779,   781,   782,   783,   784,   785,
-     787,   788,   789,   790,   791,   796,   797,   798,   814,   815,
-     867,   893,   871,   799,   875,   879,   800,   883,   907,   801,
-     910,   914,   802,   979,   996,  1005,   803,   804,  1009,  1023,
-    1024,   805,  1025,   807,  1026,  1027,  1028,  1029,   809,   810,
-     153,   154,  1030,  1031,  1032,  1034,  1035,  1120,  1048,  1044,
-    1047,  1051,  1050,  1053,  1054,  1056,  1057,  1135,  1060,  1072,
-    1071,  1074,  1075,  1105,  1076,  1077,  1078,  1079,  1080,  1081,
-     160,  1086,  1087,  1088,  1091,  1092,  1093,  1099,  1101,  1106,
-    1136,  1107,  1109,  1117,  1125,  1137,  1124,  1128,  1127,  1131,
-    1138,  1129,  1130,  1132,  1133,  1134,  1139,  1140,  1141,  1142,
-    1143,  1144,  1145,  1147,  1146,   257,  1148,  1149,   367,  1150,
-    1151,   388,  1209,  1210,  1161,   258,  1238,   303,   259,  1239,
-    1240,   298,  1241,  1242,  1162,   390,  1215,  1163,   391,   344,
-    1202,   300,   407,  1243,   381,  1245,  1216,   403,   368,  1217,
-    1203,   389,  1223,  1246,  1190,   345,  1251,  1255,   937,   260,
-    1256,   261,  1224,   951,  1247,   346,  1222,  1248,  1164,  1257,
-    1165,   965,   301,   965,  1259,   382,  1265,  1267,   404,   262,
-    1218,  1204,  1219,  1272,   939,   264,  1249,  1000,  1166,   957,
-    1252,  1260,   307,  1225,  1168,   322,   347,   969,   263,   969,
-    1220,  1253,   326,  1258,  1264,   265,   987,  1167,   310,  1274,
-    1284,   325,  1266,  1273,  1169,   940,   266,   267,   315,  1221,
-     958,   327,   268,   269,  1285,  1170,  1171,   270,   970,   271,
-     970,  1172,  1173,   272,  1290,   273,  1174,   988,  1175,   274,
-    1275,   275,  1176,  1291,  1177,   276,   277,   278,  1178,   316,
-    1179,   279,   328,   280,  1180,  1181,  1182,   281,   282,   283,
-    1183,   284,  1184,   285,   293,   294,  1185,  1186,  1187,   295,
-    1188,  1292,  1189,  1196,  1197,  1194,  1282,  1304,  1198,  1305,
-    1312,  1195,  1313,  1314,  1406,  1315,  1328,  1293,  1333,  1341,
-    1342,  1358,  1360,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,  1343,  1370,  1372,  1373,
+      13,    14,   687,   689,   690,   692,   161,   694,   693,   237,
+     695,   696,   698,   699,   700,   701,   702,   703,   704,   705,
+     707,   708,   709,   710,   711,   712,   715,   719,   721,   722,
+     725,   727,   730,   731,   733,   245,   736,   713,   737,   743,
+     739,   716,   717,   740,   944,   958,   972,   718,   724,   424,
+     726,   728,   738,  1007,   741,   742,   753,   729,   754,   755,
+     763,   734,   767,    32,   744,   768,   246,   751,   769,   770,
+     946,   964,   976,   823,   994,   425,    92,    93,   752,   756,
+      94,   771,   757,   772,   766,   773,    95,    96,    97,   774,
+     775,   776,   777,   778,   779,   781,   780,   782,   783,   784,
+     785,   947,   965,   977,   787,   995,   426,   788,   789,   790,
+     791,   795,   794,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,  1374,   127,   361,  1298,  1299,  1375,  1377,  1380,  1300,
-    1301,  1308,  1309,  1321,   129,   130,   131,  1326,  1327,  1384,
-    1388,  1330,  1407,   308,  1337,  1409,   323,  1410,  1359,   309,
-     133,   134,   324,   250,   251,  1362,   253,   135,   136,   137,
-    1363,  1371,  1382,  1383,  1411,  1427,  1431,   254,  1428,  1439,
-    1429,   255,  1430,  1437,  1438,  1161,  1440,  1442,  1443,   817,
-     808,   256,   665,  1215,   671,  1162,   819,  1154,  1163,  1015,
-    1211,  1202,  1152,  1216,  1208,  1207,  1217,  1349,  1254,  1223,
-    1244,  1203,  1237,  1236,  1272,  1190,   717,  1331,   682,  1224,
-    1156,  1155,  1206,  1222,  1340,   359,  1157,  1158,  1160,  1164,
-    1159,  1165,   708,  1350,   714,   685,  1287,  1218,  1235,  1219,
-    1274,  1286,  1204,   691,  1273,  1289,  1344,  1349,  1288,  1166,
-    1225,  1234,   153,   154,  1013,  1168,  1233,  1220,   700,  1263,
-    1250,  1262,  1376,  1261,  1351,  1426,  1441,  1268,  1167,   995,
-     818,  1275,   726,  1350,  1281,  1169,  1221,   729,  1432,  1361,
-       0,  1283,   160,  1404,  1417,     0,  1170,  1171,     0,     0,
-       0,     0,  1172,  1173,     0,     0,     0,  1174,     0,  1175,
-       0,     0,     0,  1176,  1351,  1177,     0,     0,     0,  1178,
-    1420,  1179,     0,     0,  1417,  1180,  1181,  1182,     0,     0,
-       0,  1183,     0,  1184,     0,     0,     0,  1185,  1186,  1187,
-       0,  1188,     0,  1189,  1196,  1197,  1194,     0,     0,  1198,
-    1420,  1421,  1195,     0,     0,     0,     0,     0,     0,     0,
+     125,   126,   127,   796,   797,   798,   803,   821,   822,   804,
+    1030,   805,   806,   128,   129,   130,   131,   807,   808,   874,
+     809,   132,   878,   882,   810,   811,   886,   890,   914,   917,
+     133,   134,   812,   921,   814,   816,   817,   135,   136,   137,
+     138,   139,   140,   141,   986,  1003,   142,  1012,  1016,   341,
+    1031,  1032,  1033,  1034,  1035,   143,  1036,  1037,  1038,  1039,
+    1041,  1042,  1083,  1052,   144,  1051,  1055,   145,  1054,  1058,
+    1057,  1060,  1061,  1063,   146,  1064,  1067,  1078,  1079,  1081,
+    1082,  1113,   147,   148,  1084,  1085,  1086,   149,   150,  1087,
+    1088,  1093,  1094,  1095,  1098,  1099,  1100,  1106,  1108,  1143,
+    1114,  1112,  1116,  1124,   151,  1132,  1131,  1127,   152,  1134,
+    1135,  1137,  1136,  1138,  1139,  1140,  1141,  1152,  1155,  1156,
+    1157,  1158,  1217,  1218,   153,   154,   155,   156,   157,   158,
+    1142,  1144,  1255,  1146,  1145,  1147,  1148,  1256,   159,  1149,
+    1150,  1265,  1151,  1266,  1267,  1269,  1275,  1277,  1295,  1325,
+    1294,  1153,  1322,  1261,   160,  1314,  1154,  1248,  1249,  1250,
+    1251,  1252,  1253,  1257,  1258,  1259,  1315,  1262,  1323,  1263,
+    1324,  1268,  1344,  1326,  1339,  1352,  1353,  1370,  1270,  1372,
+    1276,  1382,   258,  1274,  1384,   371,  1292,  1300,   392,  1301,
+    1302,  1168,   259,  1371,   394,  1303,   265,   305,   266,   395,
+    1308,  1169,  1309,  1224,  1310,  1175,   348,  1176,   302,   411,
+    1311,   385,  1318,  1225,   407,   260,   372,  1211,  1319,   393,
+    1332,  1337,  1197,  1338,  1170,   944,  1341,  1348,   261,  1233,
+     958,  1354,   350,  1355,  1231,   267,  1226,  1171,   972,   303,
+     972,  1385,   386,  1374,  1177,   408,  1375,  1383,  1212,  1227,
+    1282,   946,  1386,  1387,  1007,  1392,   964,  1389,   262,   309,
+    1234,  1394,   325,   351,   976,   300,   976,  1172,  1395,   330,
+    1396,  1400,  1418,   994,  1210,   263,  1284,  1419,   824,  1228,
+    1421,  1283,   947,  1422,  1173,   318,  1232,   965,   331,   349,
+     264,  1423,   268,   269,   270,   977,  1229,   977,  1439,  1174,
+     271,  1178,  1179,  1180,   995,   272,   273,  1285,   274,  1181,
+    1443,  1230,   275,  1449,  1182,  1183,   319,  1184,   276,   332,
+     277,  1185,   278,   279,   280,   281,   282,  1186,   283,  1187,
+     284,  1188,  1189,  1190,  1191,  1192,  1441,  1193,   285,  1194,
+    1201,   286,   313,   295,   296,   329,   297,  1195,  1451,  1450,
+    1196,  1442,  1204,  1205,  1440,  1206,  1202,  1452,  1203,  1454,
+    1455,   815,   826,   670,   676,  1022,   900,  1161,  1215,  1159,
+    1162,  1247,  1216,  1254,  1219,  1264,   688,  1214,  1163,  1351,
+     363,  1164,  1297,   723,  1298,  1246,   714,  1165,   720,   691,
+    1245,  1296,  1167,  1299,  1166,   697,  1244,  1356,  1272,  1273,
+     706,  1020,  1260,  1388,  1271,  1438,  1453,  1002,   310,   732,
+    1278,   326,  1243,  1373,   735,  1416,  1444,   825,     0,     0,
+       0,     0,     0,     0,   311,     0,   312,   327,     0,   328,
+    1291,     0,  1293,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1168,     0,     0,     0,     0,
+       0,     0,     0,     0,  1224,  1169,     0,     0,     0,  1175,
+       0,  1176,     0,     0,  1225,     0,     0,     0,  1361,     0,
+       0,  1211,     0,     0,  1342,  1282,  1197,     0,  1170,     0,
+    1233,     0,     0,     0,     0,  1231,     0,  1226,     0,     0,
+       0,  1171,     0,     0,  1362,     0,     0,     0,  1177,     0,
+    1227,  1284,  1212,     0,     0,     0,  1283,     0,     0,  1361,
+       0,  1234,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1172,     0,     0,     0,  1363,     0,     0,  1210,     0,
+    1228,     0,  1285,     0,     0,  1362,     0,  1232,  1173,     0,
+       0,     0,     0,     0,     0,     0,  1429,  1229,     0,     0,
+       0,     0,     0,  1174,     0,  1178,  1179,  1180,     0,     0,
+       0,     0,  1230,  1181,     0,     0,  1363,     0,  1182,  1183,
+       0,  1184,  1432,     0,     0,  1185,  1429,     0,     0,     0,
+       0,  1186,     0,  1187,     0,  1188,  1189,  1190,  1191,  1192,
+       0,  1193,     0,  1194,  1201,     0,     0,     0,     0,     0,
+       0,  1195,  1432,  1433,  1196,     0,  1204,  1205,     0,  1206,
+    1202,     0,  1203,     0,     0,     0,     0,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
+       0,     0,     0,  1433,   115,   116,   117,   118,   119,   120,
+     121,   122,   123,   124,     0,     0,   127,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   129,   130,
+     131,     0,     0,     0,     0,     0,   247,     0,   248,     0,
+       0,     0,     0,     0,   133,   134,   249,   250,   251,   252,
+     253,   135,   136,   137,     0,     0,     0,     0,     0,     0,
+       0,   254,   255,     0,     0,     0,     0,   256,     0,   143,
+       0,     0,     0,     0,     0,     0,     0,   257,     0,     0,
+       0,     0,     0,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,     0,     0,     0,     0,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,     0,   127,   365,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   129,   130,   131,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   153,   154,
+     133,   134,     0,   250,   251,     0,   253,   135,   136,   137,
+       0,     0,     0,     0,     0,     0,     0,   254,   255,     0,
+       0,     0,     0,   256,     0,     0,     0,     0,   160,     0,
+       0,     0,     0,   257,     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,  1421
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   153,   154,     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,   160
   };
 
   const short
   Dhcp6Parser::yycheck_[] =
   {
-      71,    72,    73,    74,    75,    76,   771,    78,    79,    80,
-      81,    75,    73,   771,    73,    73,    16,   771,    73,    74,
-      75,    76,    79,   769,   736,    79,   763,    72,    73,    74,
-      75,    76,  1055,    78,    79,  1055,    81,    78,    79,  1055,
-    1055,  1055,   132,     5,     0,     7,    73,     9,    73,    24,
-     138,   139,  1405,   105,   106,   679,  1405,   638,    72,    73,
-      74,    75,    76,     7,    78,    79,    73,    81,   692,   693,
-     694,   695,    73,    16,    17,    18,    19,    20,   193,   194,
-     195,   196,  1435,   212,     3,    73,  1435,     6,     3,   713,
-       3,     6,    73,    25,    26,     8,   204,     7,   227,   207,
-     208,   209,   210,    73,    73,   157,   158,   159,    24,    73,
-      73,     7,     3,    29,    73,   230,    73,     8,   105,   106,
-      73,     7,    73,     7,     3,     7,    73,     7,    73,     8,
-     105,   106,    73,    73,    73,   716,     3,   227,    73,   227,
-      73,     8,     3,     7,    73,    73,    73,     8,    73,   227,
-      73,    73,    73,     3,    74,    75,    73,    10,     8,     3,
-      74,    75,   105,   106,     8,     3,     3,     7,    11,    12,
-       8,     8,    15,   105,   106,   227,     7,     7,    21,    22,
-      23,   141,   142,   143,   144,   145,   146,    13,    14,   105,
-     106,   178,   179,   180,     3,     3,   171,   172,   173,     8,
-       8,   132,   133,     7,   135,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,   151,   152,   153,   154,     7,
-     227,    76,   174,   175,    24,    88,    89,    90,    91,   148,
-     149,   150,   227,    96,    44,    45,    46,     3,     3,     3,
-       6,     6,   105,   106,     8,   227,   228,   229,   230,   112,
-     113,   114,   115,   116,   117,   118,     3,     3,   121,   138,
-     139,     8,     8,  1306,   227,   128,  1306,     6,     3,     3,
-    1306,  1306,  1306,     8,   137,   227,     3,   140,    78,     6,
-      80,    81,     4,     3,   147,    85,    86,    87,     8,     3,
-       8,   227,   155,   156,     8,   105,   106,   160,   161,    39,
-      40,    41,     3,     3,  1061,   105,   106,     8,     8,     3,
-       8,  1043,   190,   191,   177,   105,   106,  1102,   181,  1104,
-       3,     3,     3,  1089,  1102,     8,  1104,     8,  1102,     4,
-    1104,   163,   164,   165,   197,   198,   199,   200,   201,   202,
-       3,     3,     3,     8,     3,     8,     8,     8,   211,     8,
-       3,     8,   162,     4,     4,     8,   166,   167,   168,   169,
-       3,     8,     3,     3,   227,     8,   176,     8,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,   119,   120,     4,    42,    43,    44,    45,
-      46,    47,   182,   183,   184,   185,   186,   187,   188,   189,
-       3,    78,     3,     3,     3,     8,     4,     8,     8,     8,
-      48,    49,    50,    51,    52,    53,     4,   227,     3,     3,
-     440,   441,    78,     8,     4,   516,     4,   227,   105,   106,
-       4,     4,   523,     4,     4,     4,     4,   227,     4,    77,
-      78,     4,     4,     4,   535,     4,     4,     4,   539,     4,
-      92,    93,    94,    95,   535,   546,   535,   535,   523,     4,
-     535,     4,   546,     4,   539,     4,   557,   105,   106,     4,
-     535,   546,     4,     4,   539,     4,   567,     4,     4,     4,
-       4,   546,   557,   574,     4,   123,   124,   125,   535,   523,
-     535,     4,   557,     4,   227,     4,   587,   574,     4,     4,
-     574,   535,   567,     4,     4,   539,   567,     4,   535,   574,
-      77,     4,   546,   574,   535,     4,     4,     4,     4,     4,
-       4,     4,   587,   557,     4,     4,   203,   535,   205,   206,
-       4,    98,     4,   567,   535,     4,     4,     4,   105,   106,
-     574,     4,   228,   228,   228,   535,   535,     4,   228,   228,
-     227,   535,   535,   587,   228,   122,   535,   228,   535,   126,
-     127,   228,   535,   229,   535,     4,   230,    77,   535,   229,
-     535,   227,   230,   228,   535,   535,   535,   229,     4,   228,
-     535,     4,   535,   228,   228,     4,   535,   535,   535,   227,
-     535,   230,   535,   535,   535,   105,   106,   230,   535,   539,
-     230,   230,   229,     4,    77,   539,   546,   230,     4,     4,
-     228,   121,   546,     4,     4,     4,     4,     4,   230,   129,
-     130,   131,   132,   133,   134,   135,   230,   100,   101,   102,
-     103,   104,   105,   106,   230,     4,     4,     4,     4,     4,
-     731,     4,     4,   734,     4,     4,   228,     4,     4,   122,
-       4,     4,     4,   126,   127,     4,     4,     4,   230,     4,
-     227,     4,     4,     4,     4,   230,   230,     4,     4,   734,
-     230,    78,    79,    80,    81,    82,    83,    84,   769,   770,
-     771,   230,   228,   774,   228,     4,   228,   778,     4,     4,
-     230,     4,   228,     4,   228,     4,     4,   230,   105,   106,
-     734,     4,     4,     4,   769,   770,   771,   228,   773,   774,
-     730,   228,     4,     4,   121,     4,     4,   227,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,     4,     4,   228,   769,   770,   771,     4,   773,
-     774,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,   227,     4,     4,     4,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,   230,   230,
-      77,   230,     4,     4,     4,   230,     4,   228,     4,   228,
-     228,     4,    89,    90,    91,     4,     4,   228,     4,   227,
-      97,   227,    99,     7,     7,     7,     7,     7,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,     5,   227,
-     227,     5,     5,     5,   227,   122,   227,     5,     7,   126,
-     227,   128,   227,     5,     5,     5,     3,     5,     7,   136,
-       5,     5,   129,   227,     7,     7,     7,     7,     5,     7,
-       5,     7,   227,     7,     5,     5,     5,   227,   227,   227,
-     227,     7,   227,   227,   227,   227,   227,   227,   192,     5,
-       7,   762,     7,   227,     7,     7,   227,     7,     7,   227,
-       7,     7,   227,     7,     7,     7,   227,   227,     7,     4,
-       4,   227,     4,   227,     4,     4,     4,     4,   227,   227,
-     197,   198,     4,     4,     4,     4,     4,   227,     3,     6,
-       6,     3,     6,     6,     3,     6,     3,   228,     6,     3,
-       6,     6,     3,     6,     4,     4,     4,     4,     4,     4,
-     227,     4,     4,     4,     4,     4,     4,     4,     4,     3,
-     230,     4,     4,     4,     3,   228,     6,     3,     6,     4,
-     230,     8,     6,     4,     4,     4,   228,   228,   228,   228,
-     228,   228,     4,   228,   230,  1046,     4,     4,  1049,     4,
-       4,  1052,     4,     4,  1055,  1046,   228,  1046,  1046,   228,
-     228,  1046,   228,   228,  1055,  1052,  1067,  1055,  1052,  1070,
-    1055,  1046,  1073,   228,  1049,     4,  1067,  1052,  1049,  1067,
-    1055,  1052,  1067,     4,  1055,  1070,   230,     4,  1089,  1046,
-       4,  1046,  1067,  1094,   228,  1070,  1067,   228,  1055,     4,
-    1055,  1102,  1046,  1104,     4,  1049,     4,     4,  1052,  1046,
-    1067,  1055,  1067,  1114,  1089,  1046,   228,  1118,  1055,  1094,
-     228,   230,  1123,  1067,  1055,  1126,  1070,  1102,  1046,  1104,
-    1067,   228,  1126,   228,   230,  1046,  1111,  1055,  1123,  1114,
-       6,  1126,   228,  1114,  1055,  1089,  1046,  1046,  1123,  1067,
-    1094,  1126,  1046,  1046,     3,  1055,  1055,  1046,  1102,  1046,
-    1104,  1055,  1055,  1046,   227,  1046,  1055,  1111,  1055,  1046,
-    1114,  1046,  1055,   227,  1055,  1046,  1046,  1046,  1055,  1123,
-    1055,  1046,  1126,  1046,  1055,  1055,  1055,  1046,  1046,  1046,
-    1055,  1046,  1055,  1046,  1046,  1046,  1055,  1055,  1055,  1046,
-    1055,   227,  1055,  1055,  1055,  1055,   230,     8,  1055,     8,
-       4,  1055,     8,     3,     6,     8,     7,   227,     4,     4,
-       4,     4,     4,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,   230,     5,     4,     4,
+      71,    72,    73,    74,    75,    76,   777,    78,    79,    80,
+      81,    75,    73,    16,    79,   777,    73,    73,    73,    79,
+     777,   775,   742,   769,  1062,  1062,  1062,    72,    73,    74,
+      75,    76,  1062,    78,    79,    73,    81,  1062,    78,    79,
+       5,   134,     7,     0,     9,   140,   141,  1417,    73,    24,
+     643,   214,     3,  1417,   229,    73,    10,     8,    72,    73,
+      74,    75,    76,     3,    78,    79,   229,    81,     8,    76,
+      16,    17,    18,    19,    20,    13,    14,  1447,    73,   195,
+     196,   197,   198,  1447,     3,    73,    74,    75,    76,     8,
+       7,   134,   135,   206,   137,    73,   209,   210,   211,   212,
+     105,   106,     3,     3,     3,     7,    24,     8,     8,     8,
+      73,    29,    73,    73,    73,     3,   232,     7,     6,     3,
+      73,     7,    25,    26,     8,    73,    73,     6,    73,   722,
+     105,   106,    73,     7,   229,     7,   229,     7,    73,     7,
+      73,     7,    73,    73,    73,    73,    73,     3,    73,     7,
+      73,    24,    74,    75,   159,   160,   161,     3,    73,   105,
+     106,    73,     8,    73,    73,     7,    73,     7,    74,    75,
+      74,    75,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,   105,   106,     4,
+      42,    43,    44,    45,    46,    47,     3,     7,   173,   174,
+     175,     8,   105,   106,     8,    78,     3,    80,    81,    44,
+      45,    46,    85,    86,    87,   192,   193,    77,    48,    49,
+      50,    51,    52,    53,   229,     3,    78,     4,     6,   105,
+     106,     3,   105,   106,     3,   153,   154,   155,   156,     8,
+     100,   101,   102,   103,   104,   105,   106,    77,    78,     8,
+       3,     8,     3,     3,   229,     8,    77,     8,     8,    77,
+     140,   141,   122,   123,   229,   230,   231,   232,   128,   129,
+     105,   106,     4,   176,   177,   105,   106,    98,  1316,  1316,
+    1316,   119,   120,   229,   105,   106,  1316,   105,   106,     3,
+       8,  1316,     6,    78,   124,   125,   126,   127,    39,    40,
+      41,   122,   123,   121,   180,   181,   182,   128,   129,     3,
+       3,   229,     6,   131,   132,   133,   134,   135,   136,   137,
+     105,   106,  1068,     3,     8,     4,   229,     3,     8,   164,
+    1050,     4,     8,   168,   169,   170,   171,     4,  1109,     3,
+    1111,     3,  1096,   178,     8,     3,     8,  1109,     6,  1111,
+     105,   106,  1109,   229,  1111,     4,   229,     4,    78,    79,
+      80,    81,    82,    83,    84,   684,   685,     4,     4,   229,
+     143,   144,   145,   146,   147,   148,     4,   229,     3,   698,
+     699,   700,   701,     8,     3,   105,   106,     3,     3,     8,
+       3,     3,     8,     8,   229,     8,     8,     3,     3,   229,
+     719,   121,     8,     8,     3,     3,     3,     3,   229,     8,
+       8,   229,     8,     3,     3,   229,     3,   230,     8,     8,
+     205,     8,   207,   208,    92,    93,    94,    95,     4,   184,
+     185,   186,   187,   188,   189,   190,   191,   230,     3,   230,
+       3,   444,   445,     8,   229,     8,   150,   151,   152,   520,
+     165,   166,   167,     4,     4,     4,   527,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,   540,
+       4,     4,     4,   544,   229,     4,     4,     4,     4,   540,
+     551,     4,   527,   540,   540,   540,     4,   551,     4,     4,
+       4,   562,     4,     4,     4,   540,     4,     4,     4,   544,
+       4,   572,   540,     4,     4,     4,   551,     4,   579,   229,
+       4,     4,     4,   527,   579,   540,     4,   562,     4,   579,
+       4,   592,   540,     4,     4,     4,   540,   572,     4,   230,
+     544,   230,   572,   230,   579,   230,   232,   551,   230,   579,
+     231,   231,   231,   230,   230,   540,     4,   592,   562,   230,
+     232,     4,   540,   230,   232,     4,   544,   232,   572,     4,
+     232,   232,   540,   551,     4,   579,   231,     4,     4,   232,
+     230,     4,     4,     4,   562,     4,     4,   540,   592,   540,
+     540,   540,     4,     4,   232,     4,   232,   540,   232,     4,
+       4,     4,   540,   540,     4,   540,     4,     4,     4,   540,
+     230,     4,     4,     4,     4,   540,     4,   540,     4,   540,
+     540,   540,   540,   540,     4,   540,     4,   540,   232,     4,
+       4,   232,   544,   232,   232,   540,   230,   230,   540,   551,
+     540,   540,   232,   540,     4,     4,     4,     4,   544,     4,
+     544,   232,   230,     4,     4,   551,     4,   551,   215,   216,
+     217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
+     227,   228,     4,     4,   230,     4,   737,     4,   230,   740,
+     230,   230,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,   230,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,   740,     4,   232,     7,     5,
+       7,   232,   232,     7,   775,   776,   777,   232,   232,   780,
+     230,   230,   229,   784,     7,     7,     5,   230,     5,     5,
+       5,   230,     5,     7,   229,     5,   740,   229,     5,     7,
+     775,   776,   777,   736,   779,   780,    11,    12,   229,   229,
+      15,     5,   229,     5,   229,     5,    21,    22,    23,     7,
+       7,     7,     7,     5,     7,   229,     7,   229,     5,     7,
+       5,   775,   776,   777,     5,   779,   780,     5,   229,   229,
+     229,     7,   229,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,   229,   229,   229,   229,   194,     5,   229,
+       4,   229,   229,    88,    89,    90,    91,   229,   229,     7,
+     229,    96,     7,     7,   229,   229,     7,     7,     7,     7,
+     105,   106,   229,     7,   229,   229,   229,   112,   113,   114,
+     115,   116,   117,   118,     7,     7,   121,     7,     7,   131,
+       4,     4,     4,     4,     4,   130,     4,     4,     4,     4,
+       4,     4,     4,     3,   139,     6,     3,   142,     6,     3,
+       6,     6,     3,     6,   149,     3,     6,     6,     3,     6,
+       3,     3,   157,   158,     4,     4,     4,   162,   163,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,   232,
+       4,     6,     4,     4,   179,     3,     6,   229,   183,     6,
+       3,     6,     8,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,   199,   200,   201,   202,   203,   204,
+     230,   230,     4,   230,   232,   230,   230,     4,   213,   230,
+     230,     4,   230,     4,     4,     4,     4,     4,     3,     3,
+       6,   232,     4,   232,   229,     8,   230,   230,   230,   230,
+     230,   230,   230,   230,   230,   230,     8,   230,     4,   230,
+       8,   230,     4,     8,     7,     4,     4,     4,   232,     4,
+     230,     5,  1053,   232,     4,  1056,   232,   229,  1059,   229,
+     229,  1062,  1053,   230,  1059,   229,  1053,  1053,  1053,  1059,
+     229,  1062,   229,  1074,   229,  1062,  1077,  1062,  1053,  1080,
+     229,  1056,   229,  1074,  1059,  1053,  1056,  1062,   229,  1059,
+     229,   229,  1062,   229,  1062,  1096,   229,   229,  1053,  1074,
+    1101,   232,  1077,   232,  1074,  1053,  1074,  1062,  1109,  1053,
+    1111,     4,  1056,   229,  1062,  1059,   229,   229,  1062,  1074,
+    1121,  1096,     4,     4,  1125,   172,  1101,     7,  1053,  1130,
+    1074,   229,  1133,  1077,  1109,  1053,  1111,  1062,   229,  1133,
+       5,     7,     6,  1118,  1062,  1053,  1121,     3,   737,  1074,
+       4,  1121,  1096,     4,  1062,  1130,  1074,  1101,  1133,  1077,
+    1053,     4,  1053,  1053,  1053,  1109,  1074,  1111,     4,  1062,
+    1053,  1062,  1062,  1062,  1118,  1053,  1053,  1121,  1053,  1062,
+       4,  1074,  1053,   229,  1062,  1062,  1130,  1062,  1053,  1133,
+    1053,  1062,  1053,  1053,  1053,  1053,  1053,  1062,  1053,  1062,
+    1053,  1062,  1062,  1062,  1062,  1062,   230,  1062,  1053,  1062,
+    1062,  1053,  1130,  1053,  1053,  1133,  1053,  1062,     4,   229,
+    1062,   230,  1062,  1062,   232,  1062,  1062,     4,  1062,   229,
+     229,   722,   740,   520,   527,   822,   768,  1052,  1065,  1047,
+    1053,  1082,  1068,  1089,  1072,  1101,   540,  1064,  1055,  1316,
+      77,  1056,  1132,   582,  1133,  1080,   572,  1058,   579,   544,
+    1079,  1130,  1061,  1135,  1059,   551,  1077,  1325,  1111,  1113,
+     562,   795,  1096,  1380,  1109,  1419,  1447,   780,  1130,   592,
+    1118,  1133,  1075,  1346,   596,  1398,  1425,   739,    -1,    -1,
+      -1,    -1,    -1,    -1,  1130,    -1,  1130,  1133,    -1,  1133,
+    1122,    -1,  1125,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1316,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1325,  1316,    -1,    -1,    -1,  1316,
+      -1,  1316,    -1,    -1,  1325,    -1,    -1,    -1,  1339,    -1,
+      -1,  1316,    -1,    -1,  1277,  1346,  1316,    -1,  1316,    -1,
+    1325,    -1,    -1,    -1,    -1,  1325,    -1,  1325,    -1,    -1,
+      -1,  1316,    -1,    -1,  1339,    -1,    -1,    -1,  1316,    -1,
+    1325,  1346,  1316,    -1,    -1,    -1,  1346,    -1,    -1,  1380,
+      -1,  1325,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1316,    -1,    -1,    -1,  1339,    -1,    -1,  1316,    -1,
+    1325,    -1,  1346,    -1,    -1,  1380,    -1,  1325,  1316,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1417,  1325,    -1,    -1,
+      -1,    -1,    -1,  1316,    -1,  1316,  1316,  1316,    -1,    -1,
+      -1,    -1,  1325,  1316,    -1,    -1,  1380,    -1,  1316,  1316,
+      -1,  1316,  1417,    -1,    -1,  1316,  1447,    -1,    -1,    -1,
+      -1,  1316,    -1,  1316,    -1,  1316,  1316,  1316,  1316,  1316,
+      -1,  1316,    -1,  1316,  1316,    -1,    -1,    -1,    -1,    -1,
+      -1,  1316,  1447,  1417,  1316,    -1,  1316,  1316,    -1,  1316,
+    1316,    -1,  1316,    -1,    -1,    -1,    -1,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      -1,    -1,    -1,  1447,    65,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,    -1,    -1,    77,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    89,    90,
+      91,    -1,    -1,    -1,    -1,    -1,    97,    -1,    99,    -1,
+      -1,    -1,    -1,    -1,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   122,   123,    -1,    -1,    -1,    -1,   128,    -1,   130,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   138,    -1,    -1,
+      -1,    -1,    -1,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,     4,    77,    78,   227,   227,     4,     7,   170,   227,
-     227,   227,   227,   227,    89,    90,    91,   227,   227,     5,
-       7,   227,     3,  1123,   227,     4,  1126,     4,   228,  1123,
-     105,   106,  1126,   108,   109,   227,   111,   112,   113,   114,
-     227,   227,   227,   227,     4,     4,     4,   122,   230,     4,
-     228,   126,   228,   227,   227,  1306,     4,   227,   227,   731,
-     716,   136,   516,  1314,   523,  1306,   734,  1045,  1306,   815,
-    1065,  1306,  1040,  1314,  1061,  1058,  1314,  1328,  1094,  1314,
-    1082,  1306,  1075,  1073,  1335,  1306,   577,  1267,   535,  1314,
-    1048,  1046,  1057,  1314,  1306,    77,  1049,  1051,  1054,  1306,
-    1052,  1306,   567,  1328,   574,   539,  1125,  1314,  1072,  1314,
-    1335,  1123,  1306,   546,  1335,  1128,  1314,  1368,  1126,  1306,
-    1314,  1070,   197,   198,   788,  1306,  1068,  1314,   557,  1106,
-    1089,  1104,  1368,  1102,  1328,  1407,  1435,  1111,  1306,   774,
-     733,  1335,   587,  1368,  1115,  1306,  1314,   591,  1413,  1335,
-      -1,  1118,   227,  1386,  1405,    -1,  1306,  1306,    -1,    -1,
-      -1,    -1,  1306,  1306,    -1,    -1,    -1,  1306,    -1,  1306,
-      -1,    -1,    -1,  1306,  1368,  1306,    -1,    -1,    -1,  1306,
-    1405,  1306,    -1,    -1,  1435,  1306,  1306,  1306,    -1,    -1,
-      -1,  1306,    -1,  1306,    -1,    -1,    -1,  1306,  1306,  1306,
-      -1,  1306,    -1,  1306,  1306,  1306,  1306,    -1,    -1,  1306,
-    1435,  1405,  1306,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      75,    -1,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    89,    90,    91,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   199,   200,
+     105,   106,    -1,   108,   109,    -1,   111,   112,   113,   114,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   122,   123,    -1,
+      -1,    -1,    -1,   128,    -1,    -1,    -1,    -1,   229,    -1,
+      -1,    -1,    -1,   138,    -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,    -1,    -1,
-      -1,  1435
+      -1,    -1,    -1,    -1,   199,   200,    -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,   229
   };
 
   const short
   Dhcp6Parser::yystos_[] =
   {
-       0,   213,   214,   215,   216,   217,   218,   219,   220,   221,
-     222,   223,   224,   225,   226,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-       0,     5,     7,     9,   227,   228,   229,   230,   247,   248,
-     249,   254,     7,   263,     7,   268,     7,   323,     7,   437,
-       7,   517,     7,   534,     7,   551,     7,   466,     7,   472,
-       7,   496,     7,   413,     7,   656,     7,   675,   255,   250,
-     264,   269,   324,   438,   518,   535,   552,   467,   473,   497,
-     414,   657,   676,   247,   256,   257,   227,   252,   253,    10,
-     265,   267,    11,    12,    15,    21,    22,    23,    48,    49,
+       0,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   234,   235,   236,   237,   238,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
+       0,     5,     7,     9,   229,   230,   231,   232,   249,   250,
+     251,   256,     7,   265,     7,   270,     7,   325,     7,   439,
+       7,   521,     7,   538,     7,   555,     7,   470,     7,   476,
+       7,   500,     7,   415,     7,   661,     7,   680,   257,   252,
+     266,   271,   326,   440,   522,   539,   556,   471,   477,   501,
+     416,   662,   681,   249,   258,   259,   229,   254,   255,    10,
+     267,   269,    11,    12,    15,    21,    22,    23,    48,    49,
       50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
       60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
       70,    71,    72,    73,    74,    75,    76,    77,    88,    89,
       90,    91,    96,   105,   106,   112,   113,   114,   115,   116,
-     117,   118,   121,   128,   137,   140,   147,   155,   156,   160,
-     161,   177,   181,   197,   198,   199,   200,   201,   202,   211,
-     227,   262,   270,   271,   272,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   294,   296,   298,   299,   300,   303,   304,
-     306,   308,   309,   310,   311,   313,   314,   316,   318,   319,
-     320,   321,   333,   335,   337,   378,   386,   392,   398,   400,
-     407,   421,   431,   451,   452,   453,   456,   464,   490,   524,
-     526,   545,   575,   589,   601,   602,   604,   644,   654,   673,
-     682,   706,    16,    17,    18,    19,    20,   262,   325,   326,
-     327,   329,   330,   331,   332,   524,   526,    97,    99,   107,
-     108,   109,   110,   111,   122,   126,   136,   262,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-     286,   288,   289,   290,   291,   294,   296,   298,   299,   300,
-     303,   304,   306,   308,   314,   316,   439,   440,   441,   443,
-     445,   447,   449,   451,   452,   453,   454,   455,   490,   511,
-     524,   526,   528,   545,   572,    98,   127,   262,   447,   449,
-     490,   519,   520,   521,   523,   524,   526,   100,   101,   102,
-     103,   104,   262,   447,   449,   490,   523,   524,   526,   536,
-     537,   538,   540,   541,   543,   544,   121,   129,   130,   131,
-     132,   133,   134,   135,   262,   490,   524,   526,   553,   554,
-     555,   556,   558,   560,   562,   564,   566,   568,   570,   464,
-      24,    78,    80,    81,    85,    86,    87,   262,   354,   474,
-     475,   476,   477,   478,   479,   480,   482,   484,   486,   487,
-     489,   524,   526,    79,    82,    83,    84,   121,   262,   354,
-     478,   484,   498,   499,   500,   501,   502,   504,   505,   506,
-     507,   508,   509,   524,   526,   138,   139,   262,   415,   416,
-     417,   419,   182,   183,   184,   185,   186,   187,   188,   189,
-     262,   524,   526,   658,   659,   660,   661,   663,   664,   666,
-     667,   668,   671,    13,    14,   677,   678,   679,   681,     6,
-       3,     4,     8,     3,   266,     3,     8,   273,   674,   322,
-     334,   336,   338,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,   312,     4,     4,
-       4,     4,     4,   292,   295,   297,     4,     4,     4,     4,
-     432,   465,   491,     4,   315,   317,   301,   457,   525,   527,
-       4,     4,     4,   387,   399,   393,   379,   576,   546,   408,
-     422,   590,     4,   401,   603,   605,   645,   655,   305,   307,
-       4,     4,     4,   683,   707,     4,     3,     8,   328,     4,
-       4,     4,     4,     3,     8,   512,   529,   442,   444,   446,
-       4,     4,   450,   448,   573,     3,     8,   522,     4,     3,
-       8,   539,     4,   542,     4,     4,     3,     8,   571,   557,
-     559,   561,   563,   565,   567,   569,     8,     3,     8,   481,
-     355,     4,   485,   483,   488,     4,     8,     3,   503,     4,
-       4,     4,   510,     8,     3,   418,   420,     3,     8,     4,
-     662,     4,   665,     4,     4,   669,   672,     3,     8,   680,
-       4,     3,     8,   247,   247,   227,     4,     4,     4,     4,
-       4,     4,     4,   228,   228,   228,   228,   228,   228,   228,
-     228,   230,   229,   229,   229,   228,   228,     4,   228,   228,
-     230,   230,   230,     4,     4,     4,   230,   230,   229,   230,
-       4,     4,     4,   228,     4,     4,     4,     4,     4,     4,
-     230,   230,   230,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,   228,     4,     4,     4,     4,     4,     4,     4,
-     230,   230,   230,     4,     4,   271,     4,   230,   230,   228,
-     228,   326,     4,     4,     4,     4,     4,   228,   230,     4,
-       4,     4,   440,     4,   228,   520,     4,   228,     4,   228,
-     228,   537,     4,     4,     4,     4,     4,     4,     4,     4,
-     555,     4,     4,   228,     4,     4,     4,   230,   476,     4,
-     230,   230,   230,     4,   500,     4,     4,   416,   230,     4,
-     228,     4,   228,   228,     4,     4,   659,     4,   228,   678,
-       4,     7,   227,     7,     7,     7,     7,     5,   227,   193,
-     194,   195,   196,   230,   293,   227,   227,     5,     5,     5,
-     227,   227,    92,    93,    94,    95,   302,     5,   249,   251,
-     227,     5,     5,     5,     7,     5,     5,     5,     7,     7,
-       7,     7,     5,     7,     7,   227,   227,     5,     7,     5,
-     258,     5,     5,   227,   227,   227,   258,   227,     7,   227,
-     227,   227,   258,   258,   258,   258,   227,   227,   227,   227,
-     227,   227,   227,   227,   227,   227,   258,   227,   251,   227,
-     227,   190,   191,   670,   192,     5,   247,   270,   677,   325,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    42,    43,    44,    45,    46,
-      47,   262,   343,   344,   345,   347,   349,   351,   353,   354,
-     356,   357,   358,   359,   360,   361,   362,   363,   364,   367,
-     368,   369,   370,   372,   374,   376,   343,     7,   339,   340,
-     341,     7,   433,   434,   435,     7,   468,   469,   470,     7,
-     492,   493,   494,     7,   458,   459,   460,   132,   227,   388,
-     389,   390,   391,   256,   133,   135,   390,   394,   395,   396,
-     397,   119,   120,   380,   381,   382,   384,     7,   577,   578,
-       7,   547,   548,   549,     7,   409,   410,   411,   141,   142,
-     143,   144,   145,   146,   423,   424,   425,   426,   427,   428,
-     429,   430,    24,   151,   152,   153,   154,   262,   356,   524,
-     526,   591,   592,   593,   596,   597,   599,   600,   157,   158,
-     159,   262,   402,   403,   404,   405,   406,   524,   526,   162,
-     166,   167,   168,   169,   176,   262,   370,   372,   374,   524,
-     526,   610,   611,   612,   615,   617,   619,   620,   621,     7,
-     606,   607,   608,   178,   179,   180,   227,   524,   526,   646,
-     647,   648,   649,   651,   652,   658,     7,   684,   685,   212,
-     262,   708,   709,   710,   259,     7,   513,   514,   515,     7,
-     530,   531,   532,   556,   574,   339,     8,     8,     8,   346,
-     348,   350,   352,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,   365,     4,     4,   371,   373,   375,   377,
-       3,     8,     8,   342,     6,     3,   436,     6,     3,   471,
-       6,     3,   495,     6,     3,   461,     6,     3,     3,     6,
-       6,     3,     6,   383,   385,     3,     8,   579,     3,     6,
-     550,     6,     3,   412,     6,     3,     4,     4,     4,     4,
-       4,     4,     3,     8,   594,   598,     4,     4,     4,     3,
-       8,     4,     4,     4,     3,     8,   613,   616,   618,     4,
-     622,     4,     3,     8,   609,     6,     3,     4,   650,     4,
-     653,     3,     8,     8,   686,     3,     6,     4,     3,     8,
-     227,   260,   261,   516,     6,     3,   533,     6,     3,     8,
-       6,     4,     4,     4,     4,   228,   230,   228,   230,   228,
-     228,   228,   228,   228,   228,     4,   230,   228,     4,     4,
-       4,     4,   344,   343,   341,   439,   435,   474,   470,   498,
-     494,   262,   274,   275,   276,   277,   278,   279,   280,   281,
-     282,   283,   284,   285,   286,   288,   289,   290,   291,   294,
-     296,   298,   299,   300,   303,   304,   306,   308,   314,   316,
-     354,   431,   443,   445,   447,   449,   451,   452,   453,   455,
-     462,   463,   490,   524,   526,   572,   460,   389,   395,     4,
-       4,   381,   123,   124,   125,   262,   274,   275,   276,   277,
-     278,   279,   354,   490,   524,   526,   580,   581,   582,   583,
-     584,   586,   588,   578,   553,   549,   415,   411,   228,   228,
-     228,   228,   228,   228,   424,     4,     4,   228,   228,   228,
-     592,   230,   228,   228,   403,     4,     4,     4,   228,     4,
-     230,   611,   610,   608,   230,     4,   228,     4,   647,   203,
-     205,   206,   262,   354,   524,   526,   687,   688,   689,   690,
-     692,   685,   230,   709,     6,     3,   519,   515,   536,   532,
-     227,   227,   227,   227,    39,    40,    41,   366,   227,   227,
-     227,   227,     8,     8,     8,     8,     3,     8,   227,   227,
-     585,   587,     4,     8,     3,     8,     8,   148,   149,   150,
-     595,   227,   163,   164,   165,   614,   227,   227,     7,     8,
-     227,   247,   693,     4,   691,     3,     8,   227,     8,     8,
-     463,     4,     4,   230,   582,    24,   171,   172,   173,   262,
-     524,   526,   623,   624,   625,   628,   630,   632,     4,   228,
-       4,   688,   227,   227,   626,   629,   631,   633,     3,     8,
-       5,   227,     4,     4,     4,     4,   624,     7,   694,   695,
-     170,   627,   227,   227,     5,   696,     3,     6,     7,   634,
-     635,   636,   204,   207,   208,   209,   210,   697,   698,   699,
-     701,   702,   703,   704,   695,   637,     6,     3,   700,     4,
-       4,     4,   705,     3,     8,   174,   175,   262,   347,   349,
-     524,   526,   638,   639,   640,   642,   636,     4,   230,   228,
-     228,     4,   698,   641,   643,     3,     8,   227,   227,     4,
-       4,   639,   227,   227
+     117,   118,   121,   130,   139,   142,   149,   157,   158,   162,
+     163,   179,   183,   199,   200,   201,   202,   203,   204,   213,
+     229,   264,   272,   273,   274,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,   296,   298,   300,   301,   302,   305,   306,
+     308,   310,   311,   312,   313,   315,   316,   318,   320,   321,
+     322,   323,   335,   337,   339,   380,   388,   394,   400,   402,
+     409,   423,   433,   455,   456,   457,   460,   468,   494,   528,
+     530,   549,   579,   594,   606,   607,   609,   649,   659,   678,
+     687,   711,    16,    17,    18,    19,    20,   264,   327,   328,
+     329,   331,   332,   333,   334,   528,   530,    97,    99,   107,
+     108,   109,   110,   111,   122,   123,   128,   138,   264,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   290,   291,   292,   293,   296,   298,   300,   301,
+     302,   305,   306,   308,   310,   316,   318,   441,   442,   443,
+     445,   447,   449,   451,   453,   455,   456,   457,   458,   459,
+     494,   515,   528,   530,   532,   549,   576,    98,   129,   264,
+     449,   451,   453,   494,   523,   524,   525,   527,   528,   530,
+     100,   101,   102,   103,   104,   264,   449,   451,   453,   494,
+     527,   528,   530,   540,   541,   542,   544,   545,   547,   548,
+     121,   131,   132,   133,   134,   135,   136,   137,   264,   494,
+     528,   530,   557,   558,   559,   560,   562,   564,   566,   568,
+     570,   572,   574,   468,    24,    78,    80,    81,    85,    86,
+      87,   264,   356,   478,   479,   480,   481,   482,   483,   484,
+     486,   488,   490,   491,   493,   528,   530,    79,    82,    83,
+      84,   121,   264,   356,   482,   488,   502,   503,   504,   505,
+     506,   508,   509,   510,   511,   512,   513,   528,   530,   140,
+     141,   264,   417,   418,   419,   421,   184,   185,   186,   187,
+     188,   189,   190,   191,   264,   528,   530,   663,   664,   665,
+     666,   668,   669,   671,   672,   673,   676,    13,    14,   682,
+     683,   684,   686,     6,     3,     4,     8,     3,   268,     3,
+       8,   275,   679,   324,   336,   338,   340,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,   314,     4,     4,     4,     4,     4,   294,   297,   299,
+       4,     4,     4,     4,   434,   469,   495,     4,   317,   319,
+     303,   461,   529,   531,     4,     4,     4,   389,   401,   395,
+     381,   580,   550,   410,   424,   595,     4,   403,   608,   610,
+     650,   660,   307,   309,     4,     4,     4,   688,   712,     4,
+       3,     8,   330,     4,     4,     4,     4,     3,     8,   516,
+     533,   444,   446,   448,     4,     4,   452,   454,   450,   577,
+       3,     8,   526,     4,     3,     8,   543,     4,   546,     4,
+       4,     3,     8,   575,   561,   563,   565,   567,   569,   571,
+     573,     8,     3,     8,   485,   357,     4,   489,   487,   492,
+       4,     8,     3,   507,     4,     4,     4,   514,     8,     3,
+     420,   422,     3,     8,     4,   667,     4,   670,     4,     4,
+     674,   677,     3,     8,   685,     4,     3,     8,   249,   249,
+     229,     4,     4,     4,     4,     4,     4,     4,   230,   230,
+     230,   230,   230,   230,   230,   230,   232,   231,   231,   231,
+     230,   230,     4,   230,   230,   232,   232,   232,     4,     4,
+       4,   232,   232,   231,   232,     4,     4,     4,   230,     4,
+       4,     4,     4,     4,     4,   232,   232,   232,     4,     4,
+       4,     4,     4,     4,     4,     4,     4,   230,     4,     4,
+       4,     4,     4,     4,     4,   232,   232,   232,     4,     4,
+     273,     4,   232,   232,   230,   230,   328,     4,     4,     4,
+       4,     4,   230,   232,     4,     4,     4,     4,   442,     4,
+     230,   524,     4,   230,     4,   230,   230,   541,     4,     4,
+       4,     4,     4,     4,     4,     4,   559,     4,     4,   230,
+       4,     4,     4,   232,   480,     4,   232,   232,   232,     4,
+     504,     4,     4,   418,   232,     4,   230,     4,   230,   230,
+       4,     4,   664,     4,   230,   683,     4,     7,   229,     7,
+       7,     7,     7,     5,   229,   195,   196,   197,   198,   232,
+     295,   229,   229,     5,     5,     5,   229,   229,    92,    93,
+      94,    95,   304,     5,   251,   253,   229,     5,     5,     5,
+       7,     5,     5,     5,     7,     7,     7,     7,     5,     7,
+       7,   229,   229,     5,     7,     5,   260,     5,     5,   229,
+     229,   229,   260,   260,   229,     7,   229,   229,   229,   260,
+     260,   260,   260,   229,   229,   229,   229,   229,   229,   229,
+     229,   229,   229,   260,   229,   253,   229,   229,   192,   193,
+     675,   194,     5,   249,   272,   682,   327,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    42,    43,    44,    45,    46,    47,   264,   345,
+     346,   347,   349,   351,   353,   355,   356,   358,   359,   360,
+     361,   362,   363,   364,   365,   366,   369,   370,   371,   372,
+     374,   376,   378,   345,     7,   341,   342,   343,     7,   435,
+     436,   437,     7,   472,   473,   474,     7,   496,   497,   498,
+       7,   462,   463,   464,   134,   229,   390,   391,   392,   393,
+     258,   135,   137,   392,   396,   397,   398,   399,   119,   120,
+     382,   383,   384,   386,     7,   581,   582,     7,   551,   552,
+     553,     7,   411,   412,   413,   143,   144,   145,   146,   147,
+     148,   425,   426,   427,   428,   429,   430,   431,   432,    24,
+     153,   154,   155,   156,   264,   358,   528,   530,   596,   597,
+     598,   601,   602,   604,   605,   159,   160,   161,   264,   404,
+     405,   406,   407,   408,   528,   530,   164,   168,   169,   170,
+     171,   178,   264,   372,   374,   376,   528,   530,   615,   616,
+     617,   620,   622,   624,   625,   626,     7,   611,   612,   613,
+     180,   181,   182,   229,   528,   530,   651,   652,   653,   654,
+     656,   657,   663,     7,   689,   690,   214,   264,   713,   714,
+     715,   261,     7,   517,   518,   519,     7,   534,   535,   536,
+     560,   578,   341,     8,     8,     8,   348,   350,   352,   354,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+     367,     4,     4,   373,   375,   377,   379,     3,     8,     8,
+     344,     6,     3,   438,     6,     3,   475,     6,     3,   499,
+       6,     3,   465,     6,     3,     3,     6,     6,     3,     6,
+     385,   387,     3,     8,   583,     3,     6,   554,     6,     3,
+     414,     6,     3,     4,     4,     4,     4,     4,     4,     3,
+       8,   599,   603,     4,     4,     4,     3,     8,     4,     4,
+       4,     3,     8,   618,   621,   623,     4,   627,     4,     3,
+       8,   614,     6,     3,     4,   655,     4,   658,     3,     8,
+       8,   691,     3,     6,     4,     3,     8,   229,   262,   263,
+     520,     6,     3,   537,     6,     3,     8,     6,     4,     4,
+       4,     4,   230,   232,   230,   232,   230,   230,   230,   230,
+     230,   230,     4,   232,   230,     4,     4,     4,     4,   346,
+     345,   343,   441,   437,   478,   474,   502,   498,   264,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   290,   291,   292,   293,   296,   298,   300,   301,
+     302,   305,   306,   308,   310,   316,   318,   356,   433,   445,
+     447,   449,   451,   453,   455,   456,   457,   459,   466,   467,
+     494,   528,   530,   576,   464,   391,   397,     4,     4,   383,
+     124,   125,   126,   127,   264,   276,   277,   278,   279,   280,
+     281,   356,   494,   528,   530,   584,   585,   586,   587,   588,
+     590,   592,   593,   582,   557,   553,   417,   413,   230,   230,
+     230,   230,   230,   230,   426,     4,     4,   230,   230,   230,
+     597,   232,   230,   230,   405,     4,     4,     4,   230,     4,
+     232,   616,   615,   613,   232,     4,   230,     4,   652,   205,
+     207,   208,   264,   356,   528,   530,   692,   693,   694,   695,
+     697,   690,   232,   714,     6,     3,   523,   519,   540,   536,
+     229,   229,   229,   229,    39,    40,    41,   368,   229,   229,
+     229,   229,     8,     8,     8,     8,     3,     8,   229,   229,
+     589,   591,     4,     4,     8,     3,     8,     8,   150,   151,
+     152,   600,   229,   165,   166,   167,   619,   229,   229,     7,
+       8,   229,   249,   698,     4,   696,     3,     8,   229,     8,
+       8,   467,     4,     4,   232,   232,   586,    24,   173,   174,
+     175,   264,   528,   530,   628,   629,   630,   633,   635,   637,
+       4,   230,     4,   693,   229,   229,   631,   634,   636,   638,
+       3,     8,     5,   229,     4,     4,     4,     4,   629,     7,
+     699,   700,   172,   632,   229,   229,     5,   701,     3,     6,
+       7,   639,   640,   641,   206,   209,   210,   211,   212,   702,
+     703,   704,   706,   707,   708,   709,   700,   642,     6,     3,
+     705,     4,     4,     4,   710,     3,     8,   176,   177,   264,
+     349,   351,   528,   530,   643,   644,   645,   647,   641,     4,
+     232,   230,   230,     4,   703,   646,   648,     3,     8,   229,
+     229,     4,     4,   644,   229,   229
   };
 
   const short
   Dhcp6Parser::yyr1_[] =
   {
-       0,   231,   233,   232,   234,   232,   235,   232,   236,   232,
-     237,   232,   238,   232,   239,   232,   240,   232,   241,   232,
-     242,   232,   243,   232,   244,   232,   245,   232,   246,   232,
-     247,   247,   247,   247,   247,   247,   247,   248,   250,   249,
-     251,   252,   252,   253,   253,   253,   255,   254,   256,   256,
-     257,   257,   257,   259,   258,   260,   260,   261,   261,   261,
-     262,   264,   263,   266,   265,   265,   267,   269,   268,   270,
-     270,   270,   271,   271,   271,   271,   271,   271,   271,   271,
-     271,   271,   271,   271,   271,   271,   271,   271,   271,   271,
-     271,   271,   271,   271,   271,   271,   271,   271,   271,   271,
-     271,   271,   271,   271,   271,   271,   271,   271,   271,   271,
-     271,   271,   271,   271,   271,   271,   271,   271,   271,   271,
-     271,   271,   271,   271,   271,   271,   271,   271,   271,   271,
-     271,   271,   271,   271,   271,   271,   271,   271,   271,   271,
-     271,   273,   272,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     292,   291,   293,   293,   293,   293,   293,   295,   294,   297,
-     296,   298,   299,   301,   300,   302,   302,   302,   302,   303,
-     305,   304,   307,   306,   308,   309,   310,   312,   311,   313,
-     315,   314,   317,   316,   318,   319,   320,   322,   321,   324,
-     323,   325,   325,   325,   326,   326,   326,   326,   326,   326,
-     326,   326,   328,   327,   329,   330,   331,   332,   334,   333,
-     336,   335,   338,   337,   339,   339,   340,   340,   340,   342,
-     341,   343,   343,   343,   344,   344,   344,   344,   344,   344,
-     344,   344,   344,   344,   344,   344,   344,   344,   344,   344,
-     344,   344,   344,   344,   344,   344,   344,   346,   345,   348,
-     347,   350,   349,   352,   351,   353,   355,   354,   356,   357,
-     358,   359,   360,   361,   362,   363,   365,   364,   366,   366,
-     366,   367,   368,   369,   371,   370,   373,   372,   375,   374,
-     377,   376,   379,   378,   380,   380,   380,   381,   381,   383,
-     382,   385,   384,   387,   386,   388,   388,   388,   389,   389,
-     390,   391,   393,   392,   394,   394,   394,   395,   395,   395,
-     396,   397,   399,   398,   401,   400,   402,   402,   402,   403,
-     403,   403,   403,   403,   403,   404,   405,   406,   408,   407,
-     409,   409,   410,   410,   410,   412,   411,   414,   413,   415,
-     415,   415,   415,   416,   416,   418,   417,   420,   419,   422,
-     421,   423,   423,   423,   424,   424,   424,   424,   424,   424,
-     425,   426,   427,   428,   429,   430,   432,   431,   433,   433,
-     434,   434,   434,   436,   435,   438,   437,   439,   439,   439,
-     440,   440,   440,   440,   440,   440,   440,   440,   440,   440,
-     440,   440,   440,   440,   440,   440,   440,   440,   440,   440,
-     440,   440,   440,   440,   440,   440,   440,   440,   440,   440,
-     440,   440,   440,   440,   440,   440,   440,   440,   440,   440,
-     440,   440,   440,   440,   440,   440,   442,   441,   444,   443,
-     446,   445,   448,   447,   450,   449,   451,   452,   453,   454,
-     455,   457,   456,   458,   458,   459,   459,   459,   461,   460,
-     462,   462,   462,   463,   463,   463,   463,   463,   463,   463,
-     463,   463,   463,   463,   463,   463,   463,   463,   463,   463,
-     463,   463,   463,   463,   463,   463,   463,   463,   463,   463,
-     463,   463,   463,   463,   463,   463,   463,   463,   463,   463,
-     463,   463,   463,   463,   463,   463,   465,   464,   467,   466,
-     468,   468,   469,   469,   469,   471,   470,   473,   472,   474,
-     474,   475,   475,   475,   476,   476,   476,   476,   476,   476,
-     476,   476,   476,   476,   477,   478,   479,   481,   480,   483,
-     482,   485,   484,   486,   488,   487,   489,   491,   490,   492,
-     492,   493,   493,   493,   495,   494,   497,   496,   498,   498,
-     499,   499,   499,   500,   500,   500,   500,   500,   500,   500,
-     500,   500,   500,   500,   501,   503,   502,   504,   505,   506,
-     507,   508,   510,   509,   512,   511,   513,   513,   514,   514,
-     514,   516,   515,   518,   517,   519,   519,   519,   520,   520,
-     520,   520,   520,   520,   520,   520,   522,   521,   523,   525,
-     524,   527,   526,   529,   528,   530,   530,   531,   531,   531,
-     533,   532,   535,   534,   536,   536,   536,   537,   537,   537,
-     537,   537,   537,   537,   537,   537,   537,   537,   537,   539,
-     538,   540,   542,   541,   543,   544,   546,   545,   547,   547,
-     548,   548,   548,   550,   549,   552,   551,   553,   553,   554,
-     554,   554,   555,   555,   555,   555,   555,   555,   555,   555,
-     555,   555,   555,   555,   557,   556,   559,   558,   561,   560,
-     563,   562,   565,   564,   567,   566,   569,   568,   571,   570,
-     573,   572,   574,   576,   575,   577,   577,   577,   579,   578,
-     580,   580,   581,   581,   581,   582,   582,   582,   582,   582,
-     582,   582,   582,   582,   582,   582,   582,   582,   582,   583,
-     585,   584,   587,   586,   588,   590,   589,   591,   591,   591,
-     592,   592,   592,   592,   592,   592,   592,   592,   592,   594,
-     593,   595,   595,   595,   596,   598,   597,   599,   600,   601,
-     603,   602,   605,   604,   606,   606,   607,   607,   607,   609,
-     608,   610,   610,   610,   611,   611,   611,   611,   611,   611,
-     611,   611,   611,   611,   611,   611,   613,   612,   614,   614,
-     614,   616,   615,   618,   617,   619,   620,   622,   621,   623,
-     623,   623,   624,   624,   624,   624,   624,   624,   624,   626,
-     625,   627,   629,   628,   631,   630,   633,   632,   634,   634,
-     635,   635,   635,   637,   636,   638,   638,   638,   639,   639,
-     639,   639,   639,   639,   639,   641,   640,   643,   642,   645,
-     644,   646,   646,   646,   647,   647,   647,   647,   647,   647,
-     648,   650,   649,   651,   653,   652,   655,   654,   657,   656,
-     658,   658,   658,   659,   659,   659,   659,   659,   659,   659,
-     659,   659,   659,   659,   660,   662,   661,   663,   665,   664,
-     666,   667,   669,   668,   670,   670,   672,   671,   674,   673,
-     676,   675,   677,   677,   677,   678,   678,   680,   679,   681,
-     683,   682,   684,   684,   684,   686,   685,   687,   687,   687,
-     688,   688,   688,   688,   688,   688,   688,   689,   691,   690,
-     693,   692,   694,   694,   694,   696,   695,   697,   697,   697,
-     698,   698,   698,   698,   698,   700,   699,   701,   702,   703,
-     705,   704,   707,   706,   708,   708,   708,   709,   709,   710
+       0,   233,   235,   234,   236,   234,   237,   234,   238,   234,
+     239,   234,   240,   234,   241,   234,   242,   234,   243,   234,
+     244,   234,   245,   234,   246,   234,   247,   234,   248,   234,
+     249,   249,   249,   249,   249,   249,   249,   250,   252,   251,
+     253,   254,   254,   255,   255,   255,   257,   256,   258,   258,
+     259,   259,   259,   261,   260,   262,   262,   263,   263,   263,
+     264,   266,   265,   268,   267,   267,   269,   271,   270,   272,
+     272,   272,   273,   273,   273,   273,   273,   273,   273,   273,
+     273,   273,   273,   273,   273,   273,   273,   273,   273,   273,
+     273,   273,   273,   273,   273,   273,   273,   273,   273,   273,
+     273,   273,   273,   273,   273,   273,   273,   273,   273,   273,
+     273,   273,   273,   273,   273,   273,   273,   273,   273,   273,
+     273,   273,   273,   273,   273,   273,   273,   273,   273,   273,
+     273,   273,   273,   273,   273,   273,   273,   273,   273,   273,
+     273,   275,   274,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     294,   293,   295,   295,   295,   295,   295,   297,   296,   299,
+     298,   300,   301,   303,   302,   304,   304,   304,   304,   305,
+     307,   306,   309,   308,   310,   311,   312,   314,   313,   315,
+     317,   316,   319,   318,   320,   321,   322,   324,   323,   326,
+     325,   327,   327,   327,   328,   328,   328,   328,   328,   328,
+     328,   328,   330,   329,   331,   332,   333,   334,   336,   335,
+     338,   337,   340,   339,   341,   341,   342,   342,   342,   344,
+     343,   345,   345,   345,   346,   346,   346,   346,   346,   346,
+     346,   346,   346,   346,   346,   346,   346,   346,   346,   346,
+     346,   346,   346,   346,   346,   346,   346,   348,   347,   350,
+     349,   352,   351,   354,   353,   355,   357,   356,   358,   359,
+     360,   361,   362,   363,   364,   365,   367,   366,   368,   368,
+     368,   369,   370,   371,   373,   372,   375,   374,   377,   376,
+     379,   378,   381,   380,   382,   382,   382,   383,   383,   385,
+     384,   387,   386,   389,   388,   390,   390,   390,   391,   391,
+     392,   393,   395,   394,   396,   396,   396,   397,   397,   397,
+     398,   399,   401,   400,   403,   402,   404,   404,   404,   405,
+     405,   405,   405,   405,   405,   406,   407,   408,   410,   409,
+     411,   411,   412,   412,   412,   414,   413,   416,   415,   417,
+     417,   417,   417,   418,   418,   420,   419,   422,   421,   424,
+     423,   425,   425,   425,   426,   426,   426,   426,   426,   426,
+     427,   428,   429,   430,   431,   432,   434,   433,   435,   435,
+     436,   436,   436,   438,   437,   440,   439,   441,   441,   441,
+     442,   442,   442,   442,   442,   442,   442,   442,   442,   442,
+     442,   442,   442,   442,   442,   442,   442,   442,   442,   442,
+     442,   442,   442,   442,   442,   442,   442,   442,   442,   442,
+     442,   442,   442,   442,   442,   442,   442,   442,   442,   442,
+     442,   442,   442,   442,   442,   442,   442,   444,   443,   446,
+     445,   448,   447,   450,   449,   452,   451,   454,   453,   455,
+     456,   457,   458,   459,   461,   460,   462,   462,   463,   463,
+     463,   465,   464,   466,   466,   466,   467,   467,   467,   467,
+     467,   467,   467,   467,   467,   467,   467,   467,   467,   467,
+     467,   467,   467,   467,   467,   467,   467,   467,   467,   467,
+     467,   467,   467,   467,   467,   467,   467,   467,   467,   467,
+     467,   467,   467,   467,   467,   467,   467,   467,   467,   467,
+     469,   468,   471,   470,   472,   472,   473,   473,   473,   475,
+     474,   477,   476,   478,   478,   479,   479,   479,   480,   480,
+     480,   480,   480,   480,   480,   480,   480,   480,   481,   482,
+     483,   485,   484,   487,   486,   489,   488,   490,   492,   491,
+     493,   495,   494,   496,   496,   497,   497,   497,   499,   498,
+     501,   500,   502,   502,   503,   503,   503,   504,   504,   504,
+     504,   504,   504,   504,   504,   504,   504,   504,   505,   507,
+     506,   508,   509,   510,   511,   512,   514,   513,   516,   515,
+     517,   517,   518,   518,   518,   520,   519,   522,   521,   523,
+     523,   523,   524,   524,   524,   524,   524,   524,   524,   524,
+     524,   526,   525,   527,   529,   528,   531,   530,   533,   532,
+     534,   534,   535,   535,   535,   537,   536,   539,   538,   540,
+     540,   540,   541,   541,   541,   541,   541,   541,   541,   541,
+     541,   541,   541,   541,   541,   543,   542,   544,   546,   545,
+     547,   548,   550,   549,   551,   551,   552,   552,   552,   554,
+     553,   556,   555,   557,   557,   558,   558,   558,   559,   559,
+     559,   559,   559,   559,   559,   559,   559,   559,   559,   559,
+     561,   560,   563,   562,   565,   564,   567,   566,   569,   568,
+     571,   570,   573,   572,   575,   574,   577,   576,   578,   580,
+     579,   581,   581,   581,   583,   582,   584,   584,   585,   585,
+     585,   586,   586,   586,   586,   586,   586,   586,   586,   586,
+     586,   586,   586,   586,   586,   586,   587,   589,   588,   591,
+     590,   592,   593,   595,   594,   596,   596,   596,   597,   597,
+     597,   597,   597,   597,   597,   597,   597,   599,   598,   600,
+     600,   600,   601,   603,   602,   604,   605,   606,   608,   607,
+     610,   609,   611,   611,   612,   612,   612,   614,   613,   615,
+     615,   615,   616,   616,   616,   616,   616,   616,   616,   616,
+     616,   616,   616,   616,   618,   617,   619,   619,   619,   621,
+     620,   623,   622,   624,   625,   627,   626,   628,   628,   628,
+     629,   629,   629,   629,   629,   629,   629,   631,   630,   632,
+     634,   633,   636,   635,   638,   637,   639,   639,   640,   640,
+     640,   642,   641,   643,   643,   643,   644,   644,   644,   644,
+     644,   644,   644,   646,   645,   648,   647,   650,   649,   651,
+     651,   651,   652,   652,   652,   652,   652,   652,   653,   655,
+     654,   656,   658,   657,   660,   659,   662,   661,   663,   663,
+     663,   664,   664,   664,   664,   664,   664,   664,   664,   664,
+     664,   664,   665,   667,   666,   668,   670,   669,   671,   672,
+     674,   673,   675,   675,   677,   676,   679,   678,   681,   680,
+     682,   682,   682,   683,   683,   685,   684,   686,   688,   687,
+     689,   689,   689,   691,   690,   692,   692,   692,   693,   693,
+     693,   693,   693,   693,   693,   694,   696,   695,   698,   697,
+     699,   699,   699,   701,   700,   702,   702,   702,   703,   703,
+     703,   703,   703,   705,   704,   706,   707,   708,   710,   709,
+     712,   711,   713,   713,   713,   714,   714,   715
   };
 
   const signed char
@@ -6426,57 +6517,58 @@ namespace isc { namespace dhcp {
        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,     0,     4,     0,     4,
-       0,     4,     0,     4,     0,     4,     3,     3,     3,     3,
-       3,     0,     6,     0,     1,     1,     3,     2,     0,     4,
-       1,     3,     2,     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,     3,
+       3,     3,     3,     3,     0,     6,     0,     1,     1,     3,
+       2,     0,     4,     1,     3,     2,     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,     0,     6,     0,     4,
-       0,     1,     1,     3,     2,     0,     4,     0,     4,     0,
-       1,     1,     3,     2,     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,     2,     0,     4,     0,     4,     0,     1,
-       1,     3,     2,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     4,     1,     1,     3,
-       3,     3,     0,     4,     0,     6,     0,     1,     1,     3,
-       2,     0,     4,     0,     4,     1,     3,     2,     1,     1,
-       1,     1,     1,     1,     1,     1,     0,     4,     3,     0,
-       4,     0,     4,     0,     6,     0,     1,     1,     3,     2,
-       0,     4,     0,     4,     1,     3,     2,     1,     1,     1,
+       0,     6,     0,     4,     0,     1,     1,     3,     2,     0,
+       4,     0,     4,     0,     1,     1,     3,     2,     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,     2,     0,     4,
+       0,     4,     0,     1,     1,     3,     2,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       4,     3,     0,     4,     3,     3,     0,     6,     0,     1,
-       1,     3,     2,     0,     4,     0,     4,     0,     1,     1,
+       4,     1,     1,     3,     3,     3,     0,     4,     0,     6,
+       0,     1,     1,     3,     2,     0,     4,     0,     4,     1,
        3,     2,     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,     6,     1,     0,     6,     1,     3,     2,     0,     4,
-       0,     1,     1,     3,     2,     1,     1,     1,     1,     1,
+       1,     0,     4,     3,     0,     4,     0,     4,     0,     6,
+       0,     1,     1,     3,     2,     0,     4,     0,     4,     1,
+       3,     2,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     0,     4,     3,     0,     4,
+       3,     3,     0,     6,     0,     1,     1,     3,     2,     0,
+       4,     0,     4,     0,     1,     1,     3,     2,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     4,     0,     4,     3,     0,     6,     1,     3,     2,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       4,     1,     1,     1,     3,     0,     4,     3,     3,     3,
-       0,     6,     0,     6,     0,     1,     1,     3,     2,     0,
-       4,     1,     3,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     0,     4,     1,     1,
-       1,     0,     4,     0,     4,     3,     3,     0,     6,     1,
-       3,     2,     1,     1,     1,     1,     1,     1,     1,     0,
-       4,     1,     0,     4,     0,     4,     0,     6,     0,     1,
+       0,     4,     0,     4,     0,     4,     0,     4,     0,     4,
+       0,     4,     0,     4,     0,     4,     0,     6,     1,     0,
+       6,     1,     3,     2,     0,     4,     0,     1,     1,     3,
+       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     4,     0,
+       4,     3,     3,     0,     6,     1,     3,     2,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     4,     1,
+       1,     1,     3,     0,     4,     3,     3,     3,     0,     6,
+       0,     6,     0,     1,     1,     3,     2,     0,     4,     1,
+       3,     2,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     4,     1,     1,     1,     0,
+       4,     0,     4,     3,     3,     0,     6,     1,     3,     2,
+       1,     1,     1,     1,     1,     1,     1,     0,     4,     1,
+       0,     4,     0,     4,     0,     6,     0,     1,     1,     3,
+       2,     0,     4,     1,     3,     2,     1,     1,     1,     1,
+       1,     1,     1,     0,     4,     0,     4,     0,     6,     1,
+       3,     2,     1,     1,     1,     1,     1,     1,     3,     0,
+       4,     3,     0,     4,     0,     6,     0,     4,     1,     3,
+       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     3,     0,     4,     3,     0,     4,     3,     3,
+       0,     4,     1,     1,     0,     4,     0,     6,     0,     4,
+       1,     3,     2,     1,     1,     0,     6,     3,     0,     6,
        1,     3,     2,     0,     4,     1,     3,     2,     1,     1,
-       1,     1,     1,     1,     1,     0,     4,     0,     4,     0,
-       6,     1,     3,     2,     1,     1,     1,     1,     1,     1,
-       3,     0,     4,     3,     0,     4,     0,     6,     0,     4,
-       1,     3,     2,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     3,     0,     4,     3,     0,     4,
-       3,     3,     0,     4,     1,     1,     0,     4,     0,     6,
-       0,     4,     1,     3,     2,     1,     1,     0,     6,     3,
-       0,     6,     1,     3,     2,     0,     4,     1,     3,     2,
-       1,     1,     1,     1,     1,     1,     1,     3,     0,     4,
-       0,     6,     1,     3,     2,     0,     4,     1,     3,     2,
-       1,     1,     1,     1,     1,     0,     4,     3,     3,     3,
-       0,     4,     0,     6,     1,     3,     2,     1,     1,     3
+       1,     1,     1,     1,     1,     3,     0,     4,     0,     6,
+       1,     3,     2,     0,     4,     1,     3,     2,     1,     1,
+       1,     1,     1,     0,     4,     3,     3,     3,     0,     4,
+       0,     6,     1,     3,     2,     1,     1,     3
   };
 
 
@@ -6527,21 +6619,22 @@ namespace isc { namespace dhcp {
   "\"reservations-out-of-pool\"", "\"mac-sources\"",
   "\"relay-supplied-options\"", "\"host-reservation-identifiers\"",
   "\"sanity-checks\"", "\"lease-checks\"", "\"extended-info-checks\"",
-  "\"client-classes\"", "\"require-client-classes\"", "\"test\"",
-  "\"template-test\"", "\"only-if-required\"", "\"client-class\"",
-  "\"pool-id\"", "\"reservations\"", "\"ip-addresses\"", "\"prefixes\"",
-  "\"excluded-prefixes\"", "\"duid\"", "\"hw-address\"", "\"hostname\"",
-  "\"flex-id\"", "\"relay\"", "\"hooks-libraries\"", "\"library\"",
-  "\"parameters\"", "\"expired-leases-processing\"",
-  "\"reclaim-timer-wait-time\"", "\"flush-reclaimed-timer-wait-time\"",
-  "\"hold-reclaimed-time\"", "\"max-reclaim-leases\"",
-  "\"max-reclaim-time\"", "\"unwarned-reclaim-cycles\"", "\"server-id\"",
-  "\"LLT\"", "\"EN\"", "\"LL\"", "\"identifier\"", "\"htype\"", "\"time\"",
-  "\"enterprise-id\"", "\"dhcp4o6-port\"", "\"multi-threading\"",
-  "\"enable-multi-threading\"", "\"thread-pool-size\"",
-  "\"packet-queue-size\"", "\"control-socket\"", "\"control-sockets\"",
-  "\"socket-type\"", "\"unix\"", "\"http\"", "\"https\"",
-  "\"socket-name\"", "\"socket-address\"", "\"socket-port\"",
+  "\"client-classes\"", "\"require-client-classes\"",
+  "\"evaluate-additional-classes\"", "\"test\"", "\"template-test\"",
+  "\"only-if-required\"", "\"only-in-additional-list\"",
+  "\"client-class\"", "\"pool-id\"", "\"reservations\"",
+  "\"ip-addresses\"", "\"prefixes\"", "\"excluded-prefixes\"", "\"duid\"",
+  "\"hw-address\"", "\"hostname\"", "\"flex-id\"", "\"relay\"",
+  "\"hooks-libraries\"", "\"library\"", "\"parameters\"",
+  "\"expired-leases-processing\"", "\"reclaim-timer-wait-time\"",
+  "\"flush-reclaimed-timer-wait-time\"", "\"hold-reclaimed-time\"",
+  "\"max-reclaim-leases\"", "\"max-reclaim-time\"",
+  "\"unwarned-reclaim-cycles\"", "\"server-id\"", "\"LLT\"", "\"EN\"",
+  "\"LL\"", "\"identifier\"", "\"htype\"", "\"time\"", "\"enterprise-id\"",
+  "\"dhcp4o6-port\"", "\"multi-threading\"", "\"enable-multi-threading\"",
+  "\"thread-pool-size\"", "\"packet-queue-size\"", "\"control-socket\"",
+  "\"control-sockets\"", "\"socket-type\"", "\"unix\"", "\"http\"",
+  "\"https\"", "\"socket-name\"", "\"socket-address\"", "\"socket-port\"",
   "\"authentication\"", "\"basic\"", "\"realm\"", "\"directory\"",
   "\"clients\"", "\"user-file\"", "\"password-file\"", "\"cert-required\"",
   "\"dhcp-queue-control\"", "\"enable-queue\"", "\"queue-type\"",
@@ -6616,70 +6709,71 @@ namespace isc { namespace dhcp {
   "subnet6_list_content", "not_empty_subnet6_list", "subnet6", "$@62",
   "sub_subnet6", "$@63", "subnet6_params", "subnet6_param", "subnet",
   "$@64", "interface", "$@65", "interface_id", "$@66", "client_class",
-  "$@67", "require_client_classes", "$@68", "reservations_global",
-  "reservations_in_subnet", "reservations_out_of_pool", "id",
-  "rapid_commit", "shared_networks", "$@69", "shared_networks_content",
-  "shared_networks_list", "shared_network", "$@70",
-  "shared_network_params", "shared_network_param", "option_def_list",
-  "$@71", "sub_option_def_list", "$@72", "option_def_list_content",
-  "not_empty_option_def_list", "option_def_entry", "$@73",
-  "sub_option_def", "$@74", "option_def_params",
-  "not_empty_option_def_params", "option_def_param", "option_def_name",
-  "code", "option_def_code", "option_def_type", "$@75",
-  "option_def_record_types", "$@76", "space", "$@77", "option_def_space",
-  "option_def_encapsulate", "$@78", "option_def_array", "option_data_list",
-  "$@79", "option_data_list_content", "not_empty_option_data_list",
-  "option_data_entry", "$@80", "sub_option_data", "$@81",
+  "$@67", "require_client_classes", "$@68", "evaluate_additional_classes",
+  "$@69", "reservations_global", "reservations_in_subnet",
+  "reservations_out_of_pool", "id", "rapid_commit", "shared_networks",
+  "$@70", "shared_networks_content", "shared_networks_list",
+  "shared_network", "$@71", "shared_network_params",
+  "shared_network_param", "option_def_list", "$@72", "sub_option_def_list",
+  "$@73", "option_def_list_content", "not_empty_option_def_list",
+  "option_def_entry", "$@74", "sub_option_def", "$@75",
+  "option_def_params", "not_empty_option_def_params", "option_def_param",
+  "option_def_name", "code", "option_def_code", "option_def_type", "$@76",
+  "option_def_record_types", "$@77", "space", "$@78", "option_def_space",
+  "option_def_encapsulate", "$@79", "option_def_array", "option_data_list",
+  "$@80", "option_data_list_content", "not_empty_option_data_list",
+  "option_data_entry", "$@81", "sub_option_data", "$@82",
   "option_data_params", "not_empty_option_data_params",
-  "option_data_param", "option_data_name", "option_data_data", "$@82",
+  "option_data_param", "option_data_name", "option_data_data", "$@83",
   "option_data_code", "option_data_space", "option_data_csv_format",
   "option_data_always_send", "option_data_never_send",
-  "option_data_client_classes", "$@83", "pools_list", "$@84",
-  "pools_list_content", "not_empty_pools_list", "pool_list_entry", "$@85",
-  "sub_pool6", "$@86", "pool_params", "pool_param", "pool_entry", "$@87",
-  "pool_id", "user_context", "$@88", "comment", "$@89", "pd_pools_list",
-  "$@90", "pd_pools_list_content", "not_empty_pd_pools_list",
-  "pd_pool_entry", "$@91", "sub_pd_pool", "$@92", "pd_pool_params",
-  "pd_pool_param", "pd_prefix", "$@93", "pd_prefix_len", "excluded_prefix",
-  "$@94", "excluded_prefix_len", "pd_delegated_len", "reservations",
-  "$@95", "reservations_list", "not_empty_reservations_list",
-  "reservation", "$@96", "sub_reservation", "$@97", "reservation_params",
+  "option_data_client_classes", "$@84", "pools_list", "$@85",
+  "pools_list_content", "not_empty_pools_list", "pool_list_entry", "$@86",
+  "sub_pool6", "$@87", "pool_params", "pool_param", "pool_entry", "$@88",
+  "pool_id", "user_context", "$@89", "comment", "$@90", "pd_pools_list",
+  "$@91", "pd_pools_list_content", "not_empty_pd_pools_list",
+  "pd_pool_entry", "$@92", "sub_pd_pool", "$@93", "pd_pool_params",
+  "pd_pool_param", "pd_prefix", "$@94", "pd_prefix_len", "excluded_prefix",
+  "$@95", "excluded_prefix_len", "pd_delegated_len", "reservations",
+  "$@96", "reservations_list", "not_empty_reservations_list",
+  "reservation", "$@97", "sub_reservation", "$@98", "reservation_params",
   "not_empty_reservation_params", "reservation_param", "ip_addresses",
-  "$@98", "prefixes", "$@99", "excluded_prefixes", "$@100", "duid",
-  "$@101", "hw_address", "$@102", "hostname", "$@103", "flex_id_value",
-  "$@104", "reservation_client_classes", "$@105", "relay", "$@106",
-  "relay_map", "client_classes", "$@107", "client_classes_list",
-  "client_class_entry", "$@108", "client_class_params",
+  "$@99", "prefixes", "$@100", "excluded_prefixes", "$@101", "duid",
+  "$@102", "hw_address", "$@103", "hostname", "$@104", "flex_id_value",
+  "$@105", "reservation_client_classes", "$@106", "relay", "$@107",
+  "relay_map", "client_classes", "$@108", "client_classes_list",
+  "client_class_entry", "$@109", "client_class_params",
   "not_empty_client_class_params", "client_class_param",
-  "client_class_name", "client_class_test", "$@109",
-  "client_class_template_test", "$@110", "only_if_required", "server_id",
-  "$@111", "server_id_params", "server_id_param", "server_id_type",
-  "$@112", "duid_type", "htype", "identifier", "$@113", "time",
-  "enterprise_id", "dhcp4o6_port", "control_socket", "$@114",
-  "control_sockets", "$@115", "control_socket_list",
-  "not_empty_control_socket_list", "control_socket_entry", "$@116",
-  "control_socket_params", "control_socket_param", "control_socket_type",
-  "$@117", "control_socket_type_value", "control_socket_name", "$@118",
-  "control_socket_address", "$@119", "control_socket_port",
-  "cert_required", "authentication", "$@120", "auth_params", "auth_param",
-  "auth_type", "$@121", "auth_type_value", "realm", "$@122", "directory",
-  "$@123", "clients", "$@124", "clients_list", "not_empty_clients_list",
-  "basic_auth", "$@125", "clients_params", "clients_param", "user_file",
-  "$@126", "password_file", "$@127", "dhcp_queue_control", "$@128",
+  "client_class_name", "client_class_test", "$@110",
+  "client_class_template_test", "$@111", "only_if_required",
+  "only_in_additional_list", "server_id", "$@112", "server_id_params",
+  "server_id_param", "server_id_type", "$@113", "duid_type", "htype",
+  "identifier", "$@114", "time", "enterprise_id", "dhcp4o6_port",
+  "control_socket", "$@115", "control_sockets", "$@116",
+  "control_socket_list", "not_empty_control_socket_list",
+  "control_socket_entry", "$@117", "control_socket_params",
+  "control_socket_param", "control_socket_type", "$@118",
+  "control_socket_type_value", "control_socket_name", "$@119",
+  "control_socket_address", "$@120", "control_socket_port",
+  "cert_required", "authentication", "$@121", "auth_params", "auth_param",
+  "auth_type", "$@122", "auth_type_value", "realm", "$@123", "directory",
+  "$@124", "clients", "$@125", "clients_list", "not_empty_clients_list",
+  "basic_auth", "$@126", "clients_params", "clients_param", "user_file",
+  "$@127", "password_file", "$@128", "dhcp_queue_control", "$@129",
   "queue_control_params", "queue_control_param", "enable_queue",
-  "queue_type", "$@129", "capacity", "arbitrary_map_entry", "$@130",
-  "dhcp_ddns", "$@131", "sub_dhcp_ddns", "$@132", "dhcp_ddns_params",
-  "dhcp_ddns_param", "enable_updates", "server_ip", "$@133", "server_port",
-  "sender_ip", "$@134", "sender_port", "max_queue_size", "ncr_protocol",
-  "$@135", "ncr_protocol_value", "ncr_format", "$@136", "config_control",
-  "$@137", "sub_config_control", "$@138", "config_control_params",
-  "config_control_param", "config_databases", "$@139",
-  "config_fetch_wait_time", "loggers", "$@140", "loggers_entries",
-  "logger_entry", "$@141", "logger_params", "logger_param", "debuglevel",
-  "severity", "$@142", "output_options_list", "$@143",
-  "output_options_list_content", "output_entry", "$@144",
-  "output_params_list", "output_params", "output", "$@145", "flush",
-  "maxsize", "maxver", "pattern", "$@146", "compatibility", "$@147",
+  "queue_type", "$@130", "capacity", "arbitrary_map_entry", "$@131",
+  "dhcp_ddns", "$@132", "sub_dhcp_ddns", "$@133", "dhcp_ddns_params",
+  "dhcp_ddns_param", "enable_updates", "server_ip", "$@134", "server_port",
+  "sender_ip", "$@135", "sender_port", "max_queue_size", "ncr_protocol",
+  "$@136", "ncr_protocol_value", "ncr_format", "$@137", "config_control",
+  "$@138", "sub_config_control", "$@139", "config_control_params",
+  "config_control_param", "config_databases", "$@140",
+  "config_fetch_wait_time", "loggers", "$@141", "loggers_entries",
+  "logger_entry", "$@142", "logger_params", "logger_param", "debuglevel",
+  "severity", "$@143", "output_options_list", "$@144",
+  "output_options_list_content", "output_entry", "$@145",
+  "output_params_list", "output_params", "output", "$@146", "flush",
+  "maxsize", "maxver", "pattern", "$@147", "compatibility", "$@148",
   "compatibility_params", "compatibility_param", "lenient_option_parsing", YY_NULLPTR
   };
 #endif
@@ -6689,100 +6783,101 @@ namespace isc { namespace dhcp {
   const short
   Dhcp6Parser::yyrline_[] =
   {
-       0,   325,   325,   325,   326,   326,   327,   327,   328,   328,
-     329,   329,   330,   330,   331,   331,   332,   332,   333,   333,
-     334,   334,   335,   335,   336,   336,   337,   337,   338,   338,
-     346,   347,   348,   349,   350,   351,   352,   355,   360,   360,
-     371,   374,   375,   378,   383,   389,   394,   394,   401,   402,
-     405,   409,   413,   419,   419,   426,   427,   430,   434,   438,
-     448,   457,   457,   472,   472,   486,   489,   495,   495,   504,
-     505,   506,   513,   514,   515,   516,   517,   518,   519,   520,
-     521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
-     531,   532,   533,   534,   535,   536,   537,   538,   539,   540,
-     541,   542,   543,   544,   545,   546,   547,   548,   549,   550,
-     551,   552,   553,   554,   555,   556,   557,   558,   559,   560,
-     561,   562,   563,   564,   565,   566,   567,   568,   569,   570,
-     571,   572,   573,   574,   575,   576,   577,   578,   579,   580,
-     581,   584,   584,   593,   599,   605,   611,   617,   623,   629,
-     635,   641,   647,   653,   659,   665,   671,   677,   683,   689,
-     695,   695,   704,   707,   710,   713,   716,   722,   722,   731,
-     731,   740,   749,   759,   759,   768,   771,   774,   777,   782,
-     788,   788,   797,   797,   806,   812,   818,   824,   824,   833,
-     839,   839,   848,   848,   857,   863,   869,   875,   875,   887,
-     887,   896,   897,   898,   903,   904,   905,   906,   907,   908,
-     909,   910,   913,   913,   924,   930,   936,   942,   948,   948,
-     961,   961,   974,   974,   985,   986,   989,   990,   991,   996,
-     996,  1006,  1007,  1008,  1013,  1014,  1015,  1016,  1017,  1018,
-    1019,  1020,  1021,  1022,  1023,  1024,  1025,  1026,  1027,  1028,
-    1029,  1030,  1031,  1032,  1033,  1034,  1035,  1038,  1038,  1047,
-    1047,  1056,  1056,  1065,  1065,  1074,  1080,  1080,  1089,  1095,
-    1101,  1107,  1113,  1119,  1125,  1132,  1138,  1138,  1146,  1147,
-    1148,  1151,  1157,  1163,  1169,  1169,  1178,  1178,  1187,  1187,
-    1196,  1196,  1205,  1205,  1216,  1217,  1218,  1223,  1224,  1227,
-    1227,  1246,  1246,  1264,  1264,  1275,  1276,  1277,  1282,  1283,
-    1286,  1291,  1296,  1296,  1307,  1308,  1309,  1314,  1315,  1316,
-    1319,  1324,  1331,  1331,  1344,  1344,  1357,  1358,  1359,  1364,
-    1365,  1366,  1367,  1368,  1369,  1372,  1378,  1384,  1390,  1390,
-    1401,  1402,  1405,  1406,  1407,  1412,  1412,  1422,  1422,  1432,
-    1433,  1434,  1437,  1440,  1441,  1444,  1444,  1453,  1453,  1462,
-    1462,  1474,  1475,  1476,  1481,  1482,  1483,  1484,  1485,  1486,
-    1489,  1495,  1501,  1507,  1513,  1519,  1528,  1528,  1542,  1543,
-    1546,  1547,  1548,  1557,  1557,  1583,  1583,  1594,  1595,  1596,
-    1602,  1603,  1604,  1605,  1606,  1607,  1608,  1609,  1610,  1611,
-    1612,  1613,  1614,  1615,  1616,  1617,  1618,  1619,  1620,  1621,
-    1622,  1623,  1624,  1625,  1626,  1627,  1628,  1629,  1630,  1631,
-    1632,  1633,  1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,
-    1642,  1643,  1644,  1645,  1646,  1647,  1650,  1650,  1659,  1659,
-    1668,  1668,  1677,  1677,  1686,  1686,  1697,  1703,  1709,  1715,
-    1721,  1729,  1729,  1741,  1742,  1746,  1747,  1748,  1753,  1753,
-    1761,  1762,  1763,  1768,  1769,  1770,  1771,  1772,  1773,  1774,
-    1775,  1776,  1777,  1778,  1779,  1780,  1781,  1782,  1783,  1784,
-    1785,  1786,  1787,  1788,  1789,  1790,  1791,  1792,  1793,  1794,
-    1795,  1796,  1797,  1798,  1799,  1800,  1801,  1802,  1803,  1804,
-    1805,  1806,  1807,  1808,  1809,  1810,  1817,  1817,  1831,  1831,
-    1840,  1841,  1844,  1845,  1846,  1853,  1853,  1868,  1868,  1882,
-    1883,  1886,  1887,  1888,  1893,  1894,  1895,  1896,  1897,  1898,
-    1899,  1900,  1901,  1902,  1905,  1907,  1913,  1915,  1915,  1924,
-    1924,  1933,  1933,  1942,  1944,  1944,  1953,  1963,  1963,  1976,
-    1977,  1982,  1983,  1984,  1991,  1991,  2003,  2003,  2015,  2016,
-    2021,  2022,  2023,  2030,  2031,  2032,  2033,  2034,  2035,  2036,
-    2037,  2038,  2039,  2040,  2043,  2045,  2045,  2054,  2056,  2058,
-    2064,  2070,  2076,  2076,  2090,  2090,  2103,  2104,  2107,  2108,
-    2109,  2114,  2114,  2124,  2124,  2134,  2135,  2136,  2141,  2142,
-    2143,  2144,  2145,  2146,  2147,  2148,  2151,  2151,  2160,  2166,
-    2166,  2191,  2191,  2221,  2221,  2234,  2235,  2238,  2239,  2240,
-    2245,  2245,  2257,  2257,  2269,  2270,  2271,  2276,  2277,  2278,
-    2279,  2280,  2281,  2282,  2283,  2284,  2285,  2286,  2287,  2290,
-    2290,  2299,  2305,  2305,  2314,  2320,  2329,  2329,  2340,  2341,
-    2344,  2345,  2346,  2351,  2351,  2360,  2360,  2369,  2370,  2373,
-    2374,  2375,  2381,  2382,  2383,  2384,  2385,  2386,  2387,  2388,
-    2389,  2390,  2391,  2392,  2395,  2395,  2406,  2406,  2417,  2417,
-    2428,  2428,  2437,  2437,  2446,  2446,  2455,  2455,  2464,  2464,
-    2478,  2478,  2489,  2495,  2495,  2506,  2507,  2508,  2513,  2513,
-    2523,  2524,  2527,  2528,  2529,  2534,  2535,  2536,  2537,  2538,
-    2539,  2540,  2541,  2542,  2543,  2544,  2545,  2546,  2547,  2550,
-    2552,  2552,  2561,  2561,  2570,  2579,  2579,  2592,  2593,  2594,
-    2599,  2600,  2601,  2602,  2603,  2604,  2605,  2606,  2607,  2610,
-    2610,  2618,  2619,  2620,  2623,  2629,  2629,  2638,  2644,  2652,
-    2660,  2660,  2672,  2672,  2684,  2685,  2688,  2689,  2690,  2695,
-    2695,  2703,  2704,  2705,  2710,  2711,  2712,  2713,  2714,  2715,
-    2716,  2717,  2718,  2719,  2720,  2721,  2724,  2724,  2733,  2734,
-    2735,  2738,  2738,  2748,  2748,  2758,  2764,  2772,  2772,  2785,
-    2786,  2787,  2792,  2793,  2794,  2795,  2796,  2797,  2798,  2801,
-    2801,  2809,  2812,  2812,  2821,  2821,  2830,  2830,  2841,  2842,
-    2845,  2846,  2847,  2852,  2852,  2860,  2861,  2862,  2867,  2868,
-    2869,  2870,  2871,  2872,  2873,  2876,  2876,  2885,  2885,  2896,
-    2896,  2909,  2910,  2911,  2916,  2917,  2918,  2919,  2920,  2921,
-    2924,  2930,  2930,  2939,  2945,  2945,  2955,  2955,  2968,  2968,
-    2978,  2979,  2980,  2985,  2986,  2987,  2988,  2989,  2990,  2991,
-    2992,  2993,  2994,  2995,  2998,  3004,  3004,  3013,  3019,  3019,
-    3028,  3034,  3040,  3040,  3049,  3050,  3053,  3053,  3064,  3064,
-    3076,  3076,  3086,  3087,  3088,  3094,  3095,  3098,  3098,  3109,
-    3117,  3117,  3130,  3131,  3132,  3138,  3138,  3146,  3147,  3148,
-    3153,  3154,  3155,  3156,  3157,  3158,  3159,  3162,  3168,  3168,
-    3177,  3177,  3188,  3189,  3190,  3195,  3195,  3203,  3204,  3205,
-    3210,  3211,  3212,  3213,  3214,  3217,  3217,  3226,  3232,  3238,
-    3244,  3244,  3253,  3253,  3264,  3265,  3266,  3271,  3272,  3275
+       0,   327,   327,   327,   328,   328,   329,   329,   330,   330,
+     331,   331,   332,   332,   333,   333,   334,   334,   335,   335,
+     336,   336,   337,   337,   338,   338,   339,   339,   340,   340,
+     348,   349,   350,   351,   352,   353,   354,   357,   362,   362,
+     373,   376,   377,   380,   385,   391,   396,   396,   403,   404,
+     407,   411,   415,   421,   421,   428,   429,   432,   436,   440,
+     450,   459,   459,   474,   474,   488,   491,   497,   497,   506,
+     507,   508,   515,   516,   517,   518,   519,   520,   521,   522,
+     523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
+     533,   534,   535,   536,   537,   538,   539,   540,   541,   542,
+     543,   544,   545,   546,   547,   548,   549,   550,   551,   552,
+     553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
+     563,   564,   565,   566,   567,   568,   569,   570,   571,   572,
+     573,   574,   575,   576,   577,   578,   579,   580,   581,   582,
+     583,   586,   586,   595,   601,   607,   613,   619,   625,   631,
+     637,   643,   649,   655,   661,   667,   673,   679,   685,   691,
+     697,   697,   706,   709,   712,   715,   718,   724,   724,   733,
+     733,   742,   751,   761,   761,   770,   773,   776,   779,   784,
+     790,   790,   799,   799,   808,   814,   820,   826,   826,   835,
+     841,   841,   850,   850,   859,   865,   871,   877,   877,   889,
+     889,   898,   899,   900,   905,   906,   907,   908,   909,   910,
+     911,   912,   915,   915,   926,   932,   938,   944,   950,   950,
+     963,   963,   976,   976,   987,   988,   991,   992,   993,   998,
+     998,  1008,  1009,  1010,  1015,  1016,  1017,  1018,  1019,  1020,
+    1021,  1022,  1023,  1024,  1025,  1026,  1027,  1028,  1029,  1030,
+    1031,  1032,  1033,  1034,  1035,  1036,  1037,  1040,  1040,  1049,
+    1049,  1058,  1058,  1067,  1067,  1076,  1082,  1082,  1091,  1097,
+    1103,  1109,  1115,  1121,  1127,  1134,  1140,  1140,  1148,  1149,
+    1150,  1153,  1159,  1165,  1171,  1171,  1180,  1180,  1189,  1189,
+    1198,  1198,  1207,  1207,  1218,  1219,  1220,  1225,  1226,  1229,
+    1229,  1248,  1248,  1266,  1266,  1277,  1278,  1279,  1284,  1285,
+    1288,  1293,  1298,  1298,  1309,  1310,  1311,  1316,  1317,  1318,
+    1321,  1326,  1333,  1333,  1346,  1346,  1359,  1360,  1361,  1366,
+    1367,  1368,  1369,  1370,  1371,  1374,  1380,  1386,  1392,  1392,
+    1403,  1404,  1407,  1408,  1409,  1414,  1414,  1424,  1424,  1434,
+    1435,  1436,  1439,  1442,  1443,  1446,  1446,  1455,  1455,  1464,
+    1464,  1476,  1477,  1478,  1483,  1484,  1485,  1486,  1487,  1488,
+    1491,  1497,  1503,  1509,  1515,  1521,  1530,  1530,  1544,  1545,
+    1548,  1549,  1550,  1559,  1559,  1585,  1585,  1596,  1597,  1598,
+    1604,  1605,  1606,  1607,  1608,  1609,  1610,  1611,  1612,  1613,
+    1614,  1615,  1616,  1617,  1618,  1619,  1620,  1621,  1622,  1623,
+    1624,  1625,  1626,  1627,  1628,  1629,  1630,  1631,  1632,  1633,
+    1634,  1635,  1636,  1637,  1638,  1639,  1640,  1641,  1642,  1643,
+    1644,  1645,  1646,  1647,  1648,  1649,  1650,  1653,  1653,  1662,
+    1662,  1671,  1671,  1680,  1680,  1690,  1690,  1701,  1701,  1713,
+    1719,  1725,  1731,  1737,  1745,  1745,  1757,  1758,  1762,  1763,
+    1764,  1769,  1769,  1777,  1778,  1779,  1784,  1785,  1786,  1787,
+    1788,  1789,  1790,  1791,  1792,  1793,  1794,  1795,  1796,  1797,
+    1798,  1799,  1800,  1801,  1802,  1803,  1804,  1805,  1806,  1807,
+    1808,  1809,  1810,  1811,  1812,  1813,  1814,  1815,  1816,  1817,
+    1818,  1819,  1820,  1821,  1822,  1823,  1824,  1825,  1826,  1827,
+    1834,  1834,  1848,  1848,  1857,  1858,  1861,  1862,  1863,  1870,
+    1870,  1885,  1885,  1899,  1900,  1903,  1904,  1905,  1910,  1911,
+    1912,  1913,  1914,  1915,  1916,  1917,  1918,  1919,  1922,  1924,
+    1930,  1932,  1932,  1941,  1941,  1950,  1950,  1959,  1961,  1961,
+    1970,  1980,  1980,  1993,  1994,  1999,  2000,  2001,  2008,  2008,
+    2020,  2020,  2032,  2033,  2038,  2039,  2040,  2047,  2048,  2049,
+    2050,  2051,  2052,  2053,  2054,  2055,  2056,  2057,  2060,  2062,
+    2062,  2071,  2073,  2075,  2081,  2087,  2093,  2093,  2107,  2107,
+    2120,  2121,  2124,  2125,  2126,  2131,  2131,  2141,  2141,  2151,
+    2152,  2153,  2158,  2159,  2160,  2161,  2162,  2163,  2164,  2165,
+    2166,  2169,  2169,  2178,  2184,  2184,  2209,  2209,  2239,  2239,
+    2252,  2253,  2256,  2257,  2258,  2263,  2263,  2275,  2275,  2287,
+    2288,  2289,  2294,  2295,  2296,  2297,  2298,  2299,  2300,  2301,
+    2302,  2303,  2304,  2305,  2306,  2309,  2309,  2318,  2324,  2324,
+    2333,  2339,  2348,  2348,  2359,  2360,  2363,  2364,  2365,  2370,
+    2370,  2379,  2379,  2388,  2389,  2392,  2393,  2394,  2400,  2401,
+    2402,  2403,  2404,  2405,  2406,  2407,  2408,  2409,  2410,  2411,
+    2414,  2414,  2425,  2425,  2436,  2436,  2447,  2447,  2456,  2456,
+    2465,  2465,  2474,  2474,  2483,  2483,  2497,  2497,  2508,  2514,
+    2514,  2525,  2526,  2527,  2532,  2532,  2542,  2543,  2546,  2547,
+    2548,  2553,  2554,  2555,  2556,  2557,  2558,  2559,  2560,  2561,
+    2562,  2563,  2564,  2565,  2566,  2567,  2570,  2572,  2572,  2581,
+    2581,  2591,  2597,  2606,  2606,  2619,  2620,  2621,  2626,  2627,
+    2628,  2629,  2630,  2631,  2632,  2633,  2634,  2637,  2637,  2645,
+    2646,  2647,  2650,  2656,  2656,  2665,  2671,  2679,  2687,  2687,
+    2699,  2699,  2711,  2712,  2715,  2716,  2717,  2722,  2722,  2730,
+    2731,  2732,  2737,  2738,  2739,  2740,  2741,  2742,  2743,  2744,
+    2745,  2746,  2747,  2748,  2751,  2751,  2760,  2761,  2762,  2765,
+    2765,  2775,  2775,  2785,  2791,  2799,  2799,  2812,  2813,  2814,
+    2819,  2820,  2821,  2822,  2823,  2824,  2825,  2828,  2828,  2836,
+    2839,  2839,  2848,  2848,  2857,  2857,  2868,  2869,  2872,  2873,
+    2874,  2879,  2879,  2887,  2888,  2889,  2894,  2895,  2896,  2897,
+    2898,  2899,  2900,  2903,  2903,  2912,  2912,  2923,  2923,  2936,
+    2937,  2938,  2943,  2944,  2945,  2946,  2947,  2948,  2951,  2957,
+    2957,  2966,  2972,  2972,  2982,  2982,  2995,  2995,  3005,  3006,
+    3007,  3012,  3013,  3014,  3015,  3016,  3017,  3018,  3019,  3020,
+    3021,  3022,  3025,  3031,  3031,  3040,  3046,  3046,  3055,  3061,
+    3067,  3067,  3076,  3077,  3080,  3080,  3091,  3091,  3103,  3103,
+    3113,  3114,  3115,  3121,  3122,  3125,  3125,  3136,  3144,  3144,
+    3157,  3158,  3159,  3165,  3165,  3173,  3174,  3175,  3180,  3181,
+    3182,  3183,  3184,  3185,  3186,  3189,  3195,  3195,  3204,  3204,
+    3215,  3216,  3217,  3222,  3222,  3230,  3231,  3232,  3237,  3238,
+    3239,  3240,  3241,  3244,  3244,  3253,  3259,  3265,  3271,  3271,
+    3280,  3280,  3291,  3292,  3293,  3298,  3299,  3302
   };
 
   void
@@ -6815,9 +6910,9 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp6_parser.yy"
 } } // isc::dhcp
-#line 6819 "dhcp6_parser.cc"
+#line 6914 "dhcp6_parser.cc"
 
-#line 3281 "dhcp6_parser.yy"
+#line 3308 "dhcp6_parser.yy"
 
 
 void

diff --git a/src/bin/dhcp6/dhcp6_parser.h b/src/bin/dhcp6/dhcp6_parser.h
index 01a83767d5631f89c603c89ad0b7ae049478a5f0..3df78093b27762b5802d82295d63259443e864ad 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.h
+++ b/src/bin/dhcp6/dhcp6_parser.h
@@ -619,114 +619,116 @@ namespace isc { namespace dhcp {
     TOKEN_EXTENDED_INFO_CHECKS = 375, // "extended-info-checks"
     TOKEN_CLIENT_CLASSES = 376,    // "client-classes"
     TOKEN_REQUIRE_CLIENT_CLASSES = 377, // "require-client-classes"
-    TOKEN_TEST = 378,              // "test"
-    TOKEN_TEMPLATE_TEST = 379,     // "template-test"
-    TOKEN_ONLY_IF_REQUIRED = 380,  // "only-if-required"
-    TOKEN_CLIENT_CLASS = 381,      // "client-class"
-    TOKEN_POOL_ID = 382,           // "pool-id"
-    TOKEN_RESERVATIONS = 383,      // "reservations"
-    TOKEN_IP_ADDRESSES = 384,      // "ip-addresses"
-    TOKEN_PREFIXES = 385,          // "prefixes"
-    TOKEN_EXCLUDED_PREFIXES = 386, // "excluded-prefixes"
-    TOKEN_DUID = 387,              // "duid"
-    TOKEN_HW_ADDRESS = 388,        // "hw-address"
-    TOKEN_HOSTNAME = 389,          // "hostname"
-    TOKEN_FLEX_ID = 390,           // "flex-id"
-    TOKEN_RELAY = 391,             // "relay"
-    TOKEN_HOOKS_LIBRARIES = 392,   // "hooks-libraries"
-    TOKEN_LIBRARY = 393,           // "library"
-    TOKEN_PARAMETERS = 394,        // "parameters"
-    TOKEN_EXPIRED_LEASES_PROCESSING = 395, // "expired-leases-processing"
-    TOKEN_RECLAIM_TIMER_WAIT_TIME = 396, // "reclaim-timer-wait-time"
-    TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 397, // "flush-reclaimed-timer-wait-time"
-    TOKEN_HOLD_RECLAIMED_TIME = 398, // "hold-reclaimed-time"
-    TOKEN_MAX_RECLAIM_LEASES = 399, // "max-reclaim-leases"
-    TOKEN_MAX_RECLAIM_TIME = 400,  // "max-reclaim-time"
-    TOKEN_UNWARNED_RECLAIM_CYCLES = 401, // "unwarned-reclaim-cycles"
-    TOKEN_SERVER_ID = 402,         // "server-id"
-    TOKEN_LLT = 403,               // "LLT"
-    TOKEN_EN = 404,                // "EN"
-    TOKEN_LL = 405,                // "LL"
-    TOKEN_IDENTIFIER = 406,        // "identifier"
-    TOKEN_HTYPE = 407,             // "htype"
-    TOKEN_TIME = 408,              // "time"
-    TOKEN_ENTERPRISE_ID = 409,     // "enterprise-id"
-    TOKEN_DHCP4O6_PORT = 410,      // "dhcp4o6-port"
-    TOKEN_DHCP_MULTI_THREADING = 411, // "multi-threading"
-    TOKEN_ENABLE_MULTI_THREADING = 412, // "enable-multi-threading"
-    TOKEN_THREAD_POOL_SIZE = 413,  // "thread-pool-size"
-    TOKEN_PACKET_QUEUE_SIZE = 414, // "packet-queue-size"
-    TOKEN_CONTROL_SOCKET = 415,    // "control-socket"
-    TOKEN_CONTROL_SOCKETS = 416,   // "control-sockets"
-    TOKEN_SOCKET_TYPE = 417,       // "socket-type"
-    TOKEN_UNIX = 418,              // "unix"
-    TOKEN_HTTP = 419,              // "http"
-    TOKEN_HTTPS = 420,             // "https"
-    TOKEN_SOCKET_NAME = 421,       // "socket-name"
-    TOKEN_SOCKET_ADDRESS = 422,    // "socket-address"
-    TOKEN_SOCKET_PORT = 423,       // "socket-port"
-    TOKEN_AUTHENTICATION = 424,    // "authentication"
-    TOKEN_BASIC = 425,             // "basic"
-    TOKEN_REALM = 426,             // "realm"
-    TOKEN_DIRECTORY = 427,         // "directory"
-    TOKEN_CLIENTS = 428,           // "clients"
-    TOKEN_USER_FILE = 429,         // "user-file"
-    TOKEN_PASSWORD_FILE = 430,     // "password-file"
-    TOKEN_CERT_REQUIRED = 431,     // "cert-required"
-    TOKEN_DHCP_QUEUE_CONTROL = 432, // "dhcp-queue-control"
-    TOKEN_ENABLE_QUEUE = 433,      // "enable-queue"
-    TOKEN_QUEUE_TYPE = 434,        // "queue-type"
-    TOKEN_CAPACITY = 435,          // "capacity"
-    TOKEN_DHCP_DDNS = 436,         // "dhcp-ddns"
-    TOKEN_ENABLE_UPDATES = 437,    // "enable-updates"
-    TOKEN_SERVER_IP = 438,         // "server-ip"
-    TOKEN_SERVER_PORT = 439,       // "server-port"
-    TOKEN_SENDER_IP = 440,         // "sender-ip"
-    TOKEN_SENDER_PORT = 441,       // "sender-port"
-    TOKEN_MAX_QUEUE_SIZE = 442,    // "max-queue-size"
-    TOKEN_NCR_PROTOCOL = 443,      // "ncr-protocol"
-    TOKEN_NCR_FORMAT = 444,        // "ncr-format"
-    TOKEN_UDP = 445,               // "UDP"
-    TOKEN_TCP = 446,               // "TCP"
-    TOKEN_JSON = 447,              // "JSON"
-    TOKEN_WHEN_PRESENT = 448,      // "when-present"
-    TOKEN_NEVER = 449,             // "never"
-    TOKEN_ALWAYS = 450,            // "always"
-    TOKEN_WHEN_NOT_PRESENT = 451,  // "when-not-present"
-    TOKEN_HOSTNAME_CHAR_SET = 452, // "hostname-char-set"
-    TOKEN_HOSTNAME_CHAR_REPLACEMENT = 453, // "hostname-char-replacement"
-    TOKEN_EARLY_GLOBAL_RESERVATIONS_LOOKUP = 454, // "early-global-reservations-lookup"
-    TOKEN_IP_RESERVATIONS_UNIQUE = 455, // "ip-reservations-unique"
-    TOKEN_RESERVATIONS_LOOKUP_FIRST = 456, // "reservations-lookup-first"
-    TOKEN_LOGGERS = 457,           // "loggers"
-    TOKEN_OUTPUT_OPTIONS = 458,    // "output-options"
-    TOKEN_OUTPUT = 459,            // "output"
-    TOKEN_DEBUGLEVEL = 460,        // "debuglevel"
-    TOKEN_SEVERITY = 461,          // "severity"
-    TOKEN_FLUSH = 462,             // "flush"
-    TOKEN_MAXSIZE = 463,           // "maxsize"
-    TOKEN_MAXVER = 464,            // "maxver"
-    TOKEN_PATTERN = 465,           // "pattern"
-    TOKEN_COMPATIBILITY = 466,     // "compatibility"
-    TOKEN_LENIENT_OPTION_PARSING = 467, // "lenient-option-parsing"
-    TOKEN_TOPLEVEL_JSON = 468,     // TOPLEVEL_JSON
-    TOKEN_TOPLEVEL_DHCP6 = 469,    // TOPLEVEL_DHCP6
-    TOKEN_SUB_DHCP6 = 470,         // SUB_DHCP6
-    TOKEN_SUB_INTERFACES6 = 471,   // SUB_INTERFACES6
-    TOKEN_SUB_SUBNET6 = 472,       // SUB_SUBNET6
-    TOKEN_SUB_POOL6 = 473,         // SUB_POOL6
-    TOKEN_SUB_PD_POOL = 474,       // SUB_PD_POOL
-    TOKEN_SUB_RESERVATION = 475,   // SUB_RESERVATION
-    TOKEN_SUB_OPTION_DEFS = 476,   // SUB_OPTION_DEFS
-    TOKEN_SUB_OPTION_DEF = 477,    // SUB_OPTION_DEF
-    TOKEN_SUB_OPTION_DATA = 478,   // SUB_OPTION_DATA
-    TOKEN_SUB_HOOKS_LIBRARY = 479, // SUB_HOOKS_LIBRARY
-    TOKEN_SUB_DHCP_DDNS = 480,     // SUB_DHCP_DDNS
-    TOKEN_SUB_CONFIG_CONTROL = 481, // SUB_CONFIG_CONTROL
-    TOKEN_STRING = 482,            // "constant string"
-    TOKEN_INTEGER = 483,           // "integer"
-    TOKEN_FLOAT = 484,             // "floating point"
-    TOKEN_BOOLEAN = 485            // "boolean"
+    TOKEN_EVALUATE_ADDITIONAL_CLASSES = 378, // "evaluate-additional-classes"
+    TOKEN_TEST = 379,              // "test"
+    TOKEN_TEMPLATE_TEST = 380,     // "template-test"
+    TOKEN_ONLY_IF_REQUIRED = 381,  // "only-if-required"
+    TOKEN_ONLY_IN_ADDITIONAL_LIST = 382, // "only-in-additional-list"
+    TOKEN_CLIENT_CLASS = 383,      // "client-class"
+    TOKEN_POOL_ID = 384,           // "pool-id"
+    TOKEN_RESERVATIONS = 385,      // "reservations"
+    TOKEN_IP_ADDRESSES = 386,      // "ip-addresses"
+    TOKEN_PREFIXES = 387,          // "prefixes"
+    TOKEN_EXCLUDED_PREFIXES = 388, // "excluded-prefixes"
+    TOKEN_DUID = 389,              // "duid"
+    TOKEN_HW_ADDRESS = 390,        // "hw-address"
+    TOKEN_HOSTNAME = 391,          // "hostname"
+    TOKEN_FLEX_ID = 392,           // "flex-id"
+    TOKEN_RELAY = 393,             // "relay"
+    TOKEN_HOOKS_LIBRARIES = 394,   // "hooks-libraries"
+    TOKEN_LIBRARY = 395,           // "library"
+    TOKEN_PARAMETERS = 396,        // "parameters"
+    TOKEN_EXPIRED_LEASES_PROCESSING = 397, // "expired-leases-processing"
+    TOKEN_RECLAIM_TIMER_WAIT_TIME = 398, // "reclaim-timer-wait-time"
+    TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 399, // "flush-reclaimed-timer-wait-time"
+    TOKEN_HOLD_RECLAIMED_TIME = 400, // "hold-reclaimed-time"
+    TOKEN_MAX_RECLAIM_LEASES = 401, // "max-reclaim-leases"
+    TOKEN_MAX_RECLAIM_TIME = 402,  // "max-reclaim-time"
+    TOKEN_UNWARNED_RECLAIM_CYCLES = 403, // "unwarned-reclaim-cycles"
+    TOKEN_SERVER_ID = 404,         // "server-id"
+    TOKEN_LLT = 405,               // "LLT"
+    TOKEN_EN = 406,                // "EN"
+    TOKEN_LL = 407,                // "LL"
+    TOKEN_IDENTIFIER = 408,        // "identifier"
+    TOKEN_HTYPE = 409,             // "htype"
+    TOKEN_TIME = 410,              // "time"
+    TOKEN_ENTERPRISE_ID = 411,     // "enterprise-id"
+    TOKEN_DHCP4O6_PORT = 412,      // "dhcp4o6-port"
+    TOKEN_DHCP_MULTI_THREADING = 413, // "multi-threading"
+    TOKEN_ENABLE_MULTI_THREADING = 414, // "enable-multi-threading"
+    TOKEN_THREAD_POOL_SIZE = 415,  // "thread-pool-size"
+    TOKEN_PACKET_QUEUE_SIZE = 416, // "packet-queue-size"
+    TOKEN_CONTROL_SOCKET = 417,    // "control-socket"
+    TOKEN_CONTROL_SOCKETS = 418,   // "control-sockets"
+    TOKEN_SOCKET_TYPE = 419,       // "socket-type"
+    TOKEN_UNIX = 420,              // "unix"
+    TOKEN_HTTP = 421,              // "http"
+    TOKEN_HTTPS = 422,             // "https"
+    TOKEN_SOCKET_NAME = 423,       // "socket-name"
+    TOKEN_SOCKET_ADDRESS = 424,    // "socket-address"
+    TOKEN_SOCKET_PORT = 425,       // "socket-port"
+    TOKEN_AUTHENTICATION = 426,    // "authentication"
+    TOKEN_BASIC = 427,             // "basic"
+    TOKEN_REALM = 428,             // "realm"
+    TOKEN_DIRECTORY = 429,         // "directory"
+    TOKEN_CLIENTS = 430,           // "clients"
+    TOKEN_USER_FILE = 431,         // "user-file"
+    TOKEN_PASSWORD_FILE = 432,     // "password-file"
+    TOKEN_CERT_REQUIRED = 433,     // "cert-required"
+    TOKEN_DHCP_QUEUE_CONTROL = 434, // "dhcp-queue-control"
+    TOKEN_ENABLE_QUEUE = 435,      // "enable-queue"
+    TOKEN_QUEUE_TYPE = 436,        // "queue-type"
+    TOKEN_CAPACITY = 437,          // "capacity"
+    TOKEN_DHCP_DDNS = 438,         // "dhcp-ddns"
+    TOKEN_ENABLE_UPDATES = 439,    // "enable-updates"
+    TOKEN_SERVER_IP = 440,         // "server-ip"
+    TOKEN_SERVER_PORT = 441,       // "server-port"
+    TOKEN_SENDER_IP = 442,         // "sender-ip"
+    TOKEN_SENDER_PORT = 443,       // "sender-port"
+    TOKEN_MAX_QUEUE_SIZE = 444,    // "max-queue-size"
+    TOKEN_NCR_PROTOCOL = 445,      // "ncr-protocol"
+    TOKEN_NCR_FORMAT = 446,        // "ncr-format"
+    TOKEN_UDP = 447,               // "UDP"
+    TOKEN_TCP = 448,               // "TCP"
+    TOKEN_JSON = 449,              // "JSON"
+    TOKEN_WHEN_PRESENT = 450,      // "when-present"
+    TOKEN_NEVER = 451,             // "never"
+    TOKEN_ALWAYS = 452,            // "always"
+    TOKEN_WHEN_NOT_PRESENT = 453,  // "when-not-present"
+    TOKEN_HOSTNAME_CHAR_SET = 454, // "hostname-char-set"
+    TOKEN_HOSTNAME_CHAR_REPLACEMENT = 455, // "hostname-char-replacement"
+    TOKEN_EARLY_GLOBAL_RESERVATIONS_LOOKUP = 456, // "early-global-reservations-lookup"
+    TOKEN_IP_RESERVATIONS_UNIQUE = 457, // "ip-reservations-unique"
+    TOKEN_RESERVATIONS_LOOKUP_FIRST = 458, // "reservations-lookup-first"
+    TOKEN_LOGGERS = 459,           // "loggers"
+    TOKEN_OUTPUT_OPTIONS = 460,    // "output-options"
+    TOKEN_OUTPUT = 461,            // "output"
+    TOKEN_DEBUGLEVEL = 462,        // "debuglevel"
+    TOKEN_SEVERITY = 463,          // "severity"
+    TOKEN_FLUSH = 464,             // "flush"
+    TOKEN_MAXSIZE = 465,           // "maxsize"
+    TOKEN_MAXVER = 466,            // "maxver"
+    TOKEN_PATTERN = 467,           // "pattern"
+    TOKEN_COMPATIBILITY = 468,     // "compatibility"
+    TOKEN_LENIENT_OPTION_PARSING = 469, // "lenient-option-parsing"
+    TOKEN_TOPLEVEL_JSON = 470,     // TOPLEVEL_JSON
+    TOKEN_TOPLEVEL_DHCP6 = 471,    // TOPLEVEL_DHCP6
+    TOKEN_SUB_DHCP6 = 472,         // SUB_DHCP6
+    TOKEN_SUB_INTERFACES6 = 473,   // SUB_INTERFACES6
+    TOKEN_SUB_SUBNET6 = 474,       // SUB_SUBNET6
+    TOKEN_SUB_POOL6 = 475,         // SUB_POOL6
+    TOKEN_SUB_PD_POOL = 476,       // SUB_PD_POOL
+    TOKEN_SUB_RESERVATION = 477,   // SUB_RESERVATION
+    TOKEN_SUB_OPTION_DEFS = 478,   // SUB_OPTION_DEFS
+    TOKEN_SUB_OPTION_DEF = 479,    // SUB_OPTION_DEF
+    TOKEN_SUB_OPTION_DATA = 480,   // SUB_OPTION_DATA
+    TOKEN_SUB_HOOKS_LIBRARY = 481, // SUB_HOOKS_LIBRARY
+    TOKEN_SUB_DHCP_DDNS = 482,     // SUB_DHCP_DDNS
+    TOKEN_SUB_CONFIG_CONTROL = 483, // SUB_CONFIG_CONTROL
+    TOKEN_STRING = 484,            // "constant string"
+    TOKEN_INTEGER = 485,           // "integer"
+    TOKEN_FLOAT = 486,             // "floating point"
+    TOKEN_BOOLEAN = 487            // "boolean"
       };
       /// Backward compatibility alias (Bison 3.6).
       typedef token_kind_type yytokentype;
@@ -743,7 +745,7 @@ namespace isc { namespace dhcp {
     {
       enum symbol_kind_type
       {
-        YYNTOKENS = 231, ///< Number of tokens.
+        YYNTOKENS = 233, ///< Number of tokens.
         S_YYEMPTY = -2,
         S_YYEOF = 0,                             // "end of file"
         S_YYerror = 1,                           // error
@@ -868,594 +870,599 @@ namespace isc { namespace dhcp {
         S_EXTENDED_INFO_CHECKS = 120,            // "extended-info-checks"
         S_CLIENT_CLASSES = 121,                  // "client-classes"
         S_REQUIRE_CLIENT_CLASSES = 122,          // "require-client-classes"
-        S_TEST = 123,                            // "test"
-        S_TEMPLATE_TEST = 124,                   // "template-test"
-        S_ONLY_IF_REQUIRED = 125,                // "only-if-required"
-        S_CLIENT_CLASS = 126,                    // "client-class"
-        S_POOL_ID = 127,                         // "pool-id"
-        S_RESERVATIONS = 128,                    // "reservations"
-        S_IP_ADDRESSES = 129,                    // "ip-addresses"
-        S_PREFIXES = 130,                        // "prefixes"
-        S_EXCLUDED_PREFIXES = 131,               // "excluded-prefixes"
-        S_DUID = 132,                            // "duid"
-        S_HW_ADDRESS = 133,                      // "hw-address"
-        S_HOSTNAME = 134,                        // "hostname"
-        S_FLEX_ID = 135,                         // "flex-id"
-        S_RELAY = 136,                           // "relay"
-        S_HOOKS_LIBRARIES = 137,                 // "hooks-libraries"
-        S_LIBRARY = 138,                         // "library"
-        S_PARAMETERS = 139,                      // "parameters"
-        S_EXPIRED_LEASES_PROCESSING = 140,       // "expired-leases-processing"
-        S_RECLAIM_TIMER_WAIT_TIME = 141,         // "reclaim-timer-wait-time"
-        S_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 142, // "flush-reclaimed-timer-wait-time"
-        S_HOLD_RECLAIMED_TIME = 143,             // "hold-reclaimed-time"
-        S_MAX_RECLAIM_LEASES = 144,              // "max-reclaim-leases"
-        S_MAX_RECLAIM_TIME = 145,                // "max-reclaim-time"
-        S_UNWARNED_RECLAIM_CYCLES = 146,         // "unwarned-reclaim-cycles"
-        S_SERVER_ID = 147,                       // "server-id"
-        S_LLT = 148,                             // "LLT"
-        S_EN = 149,                              // "EN"
-        S_LL = 150,                              // "LL"
-        S_IDENTIFIER = 151,                      // "identifier"
-        S_HTYPE = 152,                           // "htype"
-        S_TIME = 153,                            // "time"
-        S_ENTERPRISE_ID = 154,                   // "enterprise-id"
-        S_DHCP4O6_PORT = 155,                    // "dhcp4o6-port"
-        S_DHCP_MULTI_THREADING = 156,            // "multi-threading"
-        S_ENABLE_MULTI_THREADING = 157,          // "enable-multi-threading"
-        S_THREAD_POOL_SIZE = 158,                // "thread-pool-size"
-        S_PACKET_QUEUE_SIZE = 159,               // "packet-queue-size"
-        S_CONTROL_SOCKET = 160,                  // "control-socket"
-        S_CONTROL_SOCKETS = 161,                 // "control-sockets"
-        S_SOCKET_TYPE = 162,                     // "socket-type"
-        S_UNIX = 163,                            // "unix"
-        S_HTTP = 164,                            // "http"
-        S_HTTPS = 165,                           // "https"
-        S_SOCKET_NAME = 166,                     // "socket-name"
-        S_SOCKET_ADDRESS = 167,                  // "socket-address"
-        S_SOCKET_PORT = 168,                     // "socket-port"
-        S_AUTHENTICATION = 169,                  // "authentication"
-        S_BASIC = 170,                           // "basic"
-        S_REALM = 171,                           // "realm"
-        S_DIRECTORY = 172,                       // "directory"
-        S_CLIENTS = 173,                         // "clients"
-        S_USER_FILE = 174,                       // "user-file"
-        S_PASSWORD_FILE = 175,                   // "password-file"
-        S_CERT_REQUIRED = 176,                   // "cert-required"
-        S_DHCP_QUEUE_CONTROL = 177,              // "dhcp-queue-control"
-        S_ENABLE_QUEUE = 178,                    // "enable-queue"
-        S_QUEUE_TYPE = 179,                      // "queue-type"
-        S_CAPACITY = 180,                        // "capacity"
-        S_DHCP_DDNS = 181,                       // "dhcp-ddns"
-        S_ENABLE_UPDATES = 182,                  // "enable-updates"
-        S_SERVER_IP = 183,                       // "server-ip"
-        S_SERVER_PORT = 184,                     // "server-port"
-        S_SENDER_IP = 185,                       // "sender-ip"
-        S_SENDER_PORT = 186,                     // "sender-port"
-        S_MAX_QUEUE_SIZE = 187,                  // "max-queue-size"
-        S_NCR_PROTOCOL = 188,                    // "ncr-protocol"
-        S_NCR_FORMAT = 189,                      // "ncr-format"
-        S_UDP = 190,                             // "UDP"
-        S_TCP = 191,                             // "TCP"
-        S_JSON = 192,                            // "JSON"
-        S_WHEN_PRESENT = 193,                    // "when-present"
-        S_NEVER = 194,                           // "never"
-        S_ALWAYS = 195,                          // "always"
-        S_WHEN_NOT_PRESENT = 196,                // "when-not-present"
-        S_HOSTNAME_CHAR_SET = 197,               // "hostname-char-set"
-        S_HOSTNAME_CHAR_REPLACEMENT = 198,       // "hostname-char-replacement"
-        S_EARLY_GLOBAL_RESERVATIONS_LOOKUP = 199, // "early-global-reservations-lookup"
-        S_IP_RESERVATIONS_UNIQUE = 200,          // "ip-reservations-unique"
-        S_RESERVATIONS_LOOKUP_FIRST = 201,       // "reservations-lookup-first"
-        S_LOGGERS = 202,                         // "loggers"
-        S_OUTPUT_OPTIONS = 203,                  // "output-options"
-        S_OUTPUT = 204,                          // "output"
-        S_DEBUGLEVEL = 205,                      // "debuglevel"
-        S_SEVERITY = 206,                        // "severity"
-        S_FLUSH = 207,                           // "flush"
-        S_MAXSIZE = 208,                         // "maxsize"
-        S_MAXVER = 209,                          // "maxver"
-        S_PATTERN = 210,                         // "pattern"
-        S_COMPATIBILITY = 211,                   // "compatibility"
-        S_LENIENT_OPTION_PARSING = 212,          // "lenient-option-parsing"
-        S_TOPLEVEL_JSON = 213,                   // TOPLEVEL_JSON
-        S_TOPLEVEL_DHCP6 = 214,                  // TOPLEVEL_DHCP6
-        S_SUB_DHCP6 = 215,                       // SUB_DHCP6
-        S_SUB_INTERFACES6 = 216,                 // SUB_INTERFACES6
-        S_SUB_SUBNET6 = 217,                     // SUB_SUBNET6
-        S_SUB_POOL6 = 218,                       // SUB_POOL6
-        S_SUB_PD_POOL = 219,                     // SUB_PD_POOL
-        S_SUB_RESERVATION = 220,                 // SUB_RESERVATION
-        S_SUB_OPTION_DEFS = 221,                 // SUB_OPTION_DEFS
-        S_SUB_OPTION_DEF = 222,                  // SUB_OPTION_DEF
-        S_SUB_OPTION_DATA = 223,                 // SUB_OPTION_DATA
-        S_SUB_HOOKS_LIBRARY = 224,               // SUB_HOOKS_LIBRARY
-        S_SUB_DHCP_DDNS = 225,                   // SUB_DHCP_DDNS
-        S_SUB_CONFIG_CONTROL = 226,              // SUB_CONFIG_CONTROL
-        S_STRING = 227,                          // "constant string"
-        S_INTEGER = 228,                         // "integer"
-        S_FLOAT = 229,                           // "floating point"
-        S_BOOLEAN = 230,                         // "boolean"
-        S_YYACCEPT = 231,                        // $accept
-        S_start = 232,                           // start
-        S_233_1 = 233,                           // $@1
-        S_234_2 = 234,                           // $@2
-        S_235_3 = 235,                           // $@3
-        S_236_4 = 236,                           // $@4
-        S_237_5 = 237,                           // $@5
-        S_238_6 = 238,                           // $@6
-        S_239_7 = 239,                           // $@7
-        S_240_8 = 240,                           // $@8
-        S_241_9 = 241,                           // $@9
-        S_242_10 = 242,                          // $@10
-        S_243_11 = 243,                          // $@11
-        S_244_12 = 244,                          // $@12
-        S_245_13 = 245,                          // $@13
-        S_246_14 = 246,                          // $@14
-        S_value = 247,                           // value
-        S_sub_json = 248,                        // sub_json
-        S_map2 = 249,                            // map2
-        S_250_15 = 250,                          // $@15
-        S_map_value = 251,                       // map_value
-        S_map_content = 252,                     // map_content
-        S_not_empty_map = 253,                   // not_empty_map
-        S_list_generic = 254,                    // list_generic
-        S_255_16 = 255,                          // $@16
-        S_list_content = 256,                    // list_content
-        S_not_empty_list = 257,                  // not_empty_list
-        S_list_strings = 258,                    // list_strings
-        S_259_17 = 259,                          // $@17
-        S_list_strings_content = 260,            // list_strings_content
-        S_not_empty_list_strings = 261,          // not_empty_list_strings
-        S_unknown_map_entry = 262,               // unknown_map_entry
-        S_syntax_map = 263,                      // syntax_map
-        S_264_18 = 264,                          // $@18
-        S_global_object = 265,                   // global_object
-        S_266_19 = 266,                          // $@19
-        S_global_object_comma = 267,             // global_object_comma
-        S_sub_dhcp6 = 268,                       // sub_dhcp6
-        S_269_20 = 269,                          // $@20
-        S_global_params = 270,                   // global_params
-        S_global_param = 271,                    // global_param
-        S_data_directory = 272,                  // data_directory
-        S_273_21 = 273,                          // $@21
-        S_preferred_lifetime = 274,              // preferred_lifetime
-        S_min_preferred_lifetime = 275,          // min_preferred_lifetime
-        S_max_preferred_lifetime = 276,          // max_preferred_lifetime
-        S_valid_lifetime = 277,                  // valid_lifetime
-        S_min_valid_lifetime = 278,              // min_valid_lifetime
-        S_max_valid_lifetime = 279,              // max_valid_lifetime
-        S_renew_timer = 280,                     // renew_timer
-        S_rebind_timer = 281,                    // rebind_timer
-        S_calculate_tee_times = 282,             // calculate_tee_times
-        S_t1_percent = 283,                      // t1_percent
-        S_t2_percent = 284,                      // t2_percent
-        S_cache_threshold = 285,                 // cache_threshold
-        S_cache_max_age = 286,                   // cache_max_age
-        S_decline_probation_period = 287,        // decline_probation_period
-        S_ddns_send_updates = 288,               // ddns_send_updates
-        S_ddns_override_no_update = 289,         // ddns_override_no_update
-        S_ddns_override_client_update = 290,     // ddns_override_client_update
-        S_ddns_replace_client_name = 291,        // ddns_replace_client_name
-        S_292_22 = 292,                          // $@22
-        S_ddns_replace_client_name_value = 293,  // ddns_replace_client_name_value
-        S_ddns_generated_prefix = 294,           // ddns_generated_prefix
-        S_295_23 = 295,                          // $@23
-        S_ddns_qualifying_suffix = 296,          // ddns_qualifying_suffix
-        S_297_24 = 297,                          // $@24
-        S_ddns_update_on_renew = 298,            // ddns_update_on_renew
-        S_ddns_use_conflict_resolution = 299,    // ddns_use_conflict_resolution
-        S_ddns_conflict_resolution_mode = 300,   // ddns_conflict_resolution_mode
-        S_301_25 = 301,                          // $@25
-        S_ddns_conflict_resolution_mode_value = 302, // ddns_conflict_resolution_mode_value
-        S_ddns_ttl_percent = 303,                // ddns_ttl_percent
-        S_hostname_char_set = 304,               // hostname_char_set
-        S_305_26 = 305,                          // $@26
-        S_hostname_char_replacement = 306,       // hostname_char_replacement
-        S_307_27 = 307,                          // $@27
-        S_store_extended_info = 308,             // store_extended_info
-        S_statistic_default_sample_count = 309,  // statistic_default_sample_count
-        S_statistic_default_sample_age = 310,    // statistic_default_sample_age
-        S_server_tag = 311,                      // server_tag
-        S_312_28 = 312,                          // $@28
-        S_parked_packet_limit = 313,             // parked_packet_limit
-        S_allocator = 314,                       // allocator
-        S_315_29 = 315,                          // $@29
-        S_pd_allocator = 316,                    // pd_allocator
-        S_317_30 = 317,                          // $@30
-        S_early_global_reservations_lookup = 318, // early_global_reservations_lookup
-        S_ip_reservations_unique = 319,          // ip_reservations_unique
-        S_reservations_lookup_first = 320,       // reservations_lookup_first
-        S_interfaces_config = 321,               // interfaces_config
-        S_322_31 = 322,                          // $@31
-        S_sub_interfaces6 = 323,                 // sub_interfaces6
-        S_324_32 = 324,                          // $@32
-        S_interfaces_config_params = 325,        // interfaces_config_params
-        S_interfaces_config_param = 326,         // interfaces_config_param
-        S_interfaces_list = 327,                 // interfaces_list
-        S_328_33 = 328,                          // $@33
-        S_re_detect = 329,                       // re_detect
-        S_service_sockets_require_all = 330,     // service_sockets_require_all
-        S_service_sockets_retry_wait_time = 331, // service_sockets_retry_wait_time
-        S_service_sockets_max_retries = 332,     // service_sockets_max_retries
-        S_lease_database = 333,                  // lease_database
-        S_334_34 = 334,                          // $@34
-        S_hosts_database = 335,                  // hosts_database
-        S_336_35 = 336,                          // $@35
-        S_hosts_databases = 337,                 // hosts_databases
-        S_338_36 = 338,                          // $@36
-        S_database_list = 339,                   // database_list
-        S_not_empty_database_list = 340,         // not_empty_database_list
-        S_database = 341,                        // database
-        S_342_37 = 342,                          // $@37
-        S_database_map_params = 343,             // database_map_params
-        S_database_map_param = 344,              // database_map_param
-        S_database_type = 345,                   // database_type
-        S_346_38 = 346,                          // $@38
-        S_user = 347,                            // user
-        S_348_39 = 348,                          // $@39
-        S_password = 349,                        // password
-        S_350_40 = 350,                          // $@40
-        S_host = 351,                            // host
-        S_352_41 = 352,                          // $@41
-        S_port = 353,                            // port
-        S_name = 354,                            // name
-        S_355_42 = 355,                          // $@42
-        S_persist = 356,                         // persist
-        S_lfc_interval = 357,                    // lfc_interval
-        S_readonly = 358,                        // readonly
-        S_connect_timeout = 359,                 // connect_timeout
-        S_read_timeout = 360,                    // read_timeout
-        S_write_timeout = 361,                   // write_timeout
-        S_tcp_user_timeout = 362,                // tcp_user_timeout
-        S_reconnect_wait_time = 363,             // reconnect_wait_time
-        S_on_fail = 364,                         // on_fail
-        S_365_43 = 365,                          // $@43
-        S_on_fail_mode = 366,                    // on_fail_mode
-        S_retry_on_startup = 367,                // retry_on_startup
-        S_max_row_errors = 368,                  // max_row_errors
-        S_max_reconnect_tries = 369,             // max_reconnect_tries
-        S_trust_anchor = 370,                    // trust_anchor
-        S_371_44 = 371,                          // $@44
-        S_cert_file = 372,                       // cert_file
-        S_373_45 = 373,                          // $@45
-        S_key_file = 374,                        // key_file
-        S_375_46 = 375,                          // $@46
-        S_cipher_list = 376,                     // cipher_list
-        S_377_47 = 377,                          // $@47
-        S_sanity_checks = 378,                   // sanity_checks
-        S_379_48 = 379,                          // $@48
-        S_sanity_checks_params = 380,            // sanity_checks_params
-        S_sanity_checks_param = 381,             // sanity_checks_param
-        S_lease_checks = 382,                    // lease_checks
-        S_383_49 = 383,                          // $@49
-        S_extended_info_checks = 384,            // extended_info_checks
-        S_385_50 = 385,                          // $@50
-        S_mac_sources = 386,                     // mac_sources
-        S_387_51 = 387,                          // $@51
-        S_mac_sources_list = 388,                // mac_sources_list
-        S_mac_sources_value = 389,               // mac_sources_value
-        S_duid_id = 390,                         // duid_id
-        S_string_id = 391,                       // string_id
-        S_host_reservation_identifiers = 392,    // host_reservation_identifiers
-        S_393_52 = 393,                          // $@52
-        S_host_reservation_identifiers_list = 394, // host_reservation_identifiers_list
-        S_host_reservation_identifier = 395,     // host_reservation_identifier
-        S_hw_address_id = 396,                   // hw_address_id
-        S_flex_id = 397,                         // flex_id
-        S_relay_supplied_options = 398,          // relay_supplied_options
-        S_399_53 = 399,                          // $@53
-        S_dhcp_multi_threading = 400,            // dhcp_multi_threading
-        S_401_54 = 401,                          // $@54
-        S_multi_threading_params = 402,          // multi_threading_params
-        S_multi_threading_param = 403,           // multi_threading_param
-        S_enable_multi_threading = 404,          // enable_multi_threading
-        S_thread_pool_size = 405,                // thread_pool_size
-        S_packet_queue_size = 406,               // packet_queue_size
-        S_hooks_libraries = 407,                 // hooks_libraries
-        S_408_55 = 408,                          // $@55
-        S_hooks_libraries_list = 409,            // hooks_libraries_list
-        S_not_empty_hooks_libraries_list = 410,  // not_empty_hooks_libraries_list
-        S_hooks_library = 411,                   // hooks_library
-        S_412_56 = 412,                          // $@56
-        S_sub_hooks_library = 413,               // sub_hooks_library
-        S_414_57 = 414,                          // $@57
-        S_hooks_params = 415,                    // hooks_params
-        S_hooks_param = 416,                     // hooks_param
-        S_library = 417,                         // library
-        S_418_58 = 418,                          // $@58
-        S_parameters = 419,                      // parameters
-        S_420_59 = 420,                          // $@59
-        S_expired_leases_processing = 421,       // expired_leases_processing
-        S_422_60 = 422,                          // $@60
-        S_expired_leases_params = 423,           // expired_leases_params
-        S_expired_leases_param = 424,            // expired_leases_param
-        S_reclaim_timer_wait_time = 425,         // reclaim_timer_wait_time
-        S_flush_reclaimed_timer_wait_time = 426, // flush_reclaimed_timer_wait_time
-        S_hold_reclaimed_time = 427,             // hold_reclaimed_time
-        S_max_reclaim_leases = 428,              // max_reclaim_leases
-        S_max_reclaim_time = 429,                // max_reclaim_time
-        S_unwarned_reclaim_cycles = 430,         // unwarned_reclaim_cycles
-        S_subnet6_list = 431,                    // subnet6_list
-        S_432_61 = 432,                          // $@61
-        S_subnet6_list_content = 433,            // subnet6_list_content
-        S_not_empty_subnet6_list = 434,          // not_empty_subnet6_list
-        S_subnet6 = 435,                         // subnet6
-        S_436_62 = 436,                          // $@62
-        S_sub_subnet6 = 437,                     // sub_subnet6
-        S_438_63 = 438,                          // $@63
-        S_subnet6_params = 439,                  // subnet6_params
-        S_subnet6_param = 440,                   // subnet6_param
-        S_subnet = 441,                          // subnet
-        S_442_64 = 442,                          // $@64
-        S_interface = 443,                       // interface
-        S_444_65 = 444,                          // $@65
-        S_interface_id = 445,                    // interface_id
-        S_446_66 = 446,                          // $@66
-        S_client_class = 447,                    // client_class
-        S_448_67 = 448,                          // $@67
-        S_require_client_classes = 449,          // require_client_classes
-        S_450_68 = 450,                          // $@68
-        S_reservations_global = 451,             // reservations_global
-        S_reservations_in_subnet = 452,          // reservations_in_subnet
-        S_reservations_out_of_pool = 453,        // reservations_out_of_pool
-        S_id = 454,                              // id
-        S_rapid_commit = 455,                    // rapid_commit
-        S_shared_networks = 456,                 // shared_networks
-        S_457_69 = 457,                          // $@69
-        S_shared_networks_content = 458,         // shared_networks_content
-        S_shared_networks_list = 459,            // shared_networks_list
-        S_shared_network = 460,                  // shared_network
+        S_EVALUATE_ADDITIONAL_CLASSES = 123,     // "evaluate-additional-classes"
+        S_TEST = 124,                            // "test"
+        S_TEMPLATE_TEST = 125,                   // "template-test"
+        S_ONLY_IF_REQUIRED = 126,                // "only-if-required"
+        S_ONLY_IN_ADDITIONAL_LIST = 127,         // "only-in-additional-list"
+        S_CLIENT_CLASS = 128,                    // "client-class"
+        S_POOL_ID = 129,                         // "pool-id"
+        S_RESERVATIONS = 130,                    // "reservations"
+        S_IP_ADDRESSES = 131,                    // "ip-addresses"
+        S_PREFIXES = 132,                        // "prefixes"
+        S_EXCLUDED_PREFIXES = 133,               // "excluded-prefixes"
+        S_DUID = 134,                            // "duid"
+        S_HW_ADDRESS = 135,                      // "hw-address"
+        S_HOSTNAME = 136,                        // "hostname"
+        S_FLEX_ID = 137,                         // "flex-id"
+        S_RELAY = 138,                           // "relay"
+        S_HOOKS_LIBRARIES = 139,                 // "hooks-libraries"
+        S_LIBRARY = 140,                         // "library"
+        S_PARAMETERS = 141,                      // "parameters"
+        S_EXPIRED_LEASES_PROCESSING = 142,       // "expired-leases-processing"
+        S_RECLAIM_TIMER_WAIT_TIME = 143,         // "reclaim-timer-wait-time"
+        S_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 144, // "flush-reclaimed-timer-wait-time"
+        S_HOLD_RECLAIMED_TIME = 145,             // "hold-reclaimed-time"
+        S_MAX_RECLAIM_LEASES = 146,              // "max-reclaim-leases"
+        S_MAX_RECLAIM_TIME = 147,                // "max-reclaim-time"
+        S_UNWARNED_RECLAIM_CYCLES = 148,         // "unwarned-reclaim-cycles"
+        S_SERVER_ID = 149,                       // "server-id"
+        S_LLT = 150,                             // "LLT"
+        S_EN = 151,                              // "EN"
+        S_LL = 152,                              // "LL"
+        S_IDENTIFIER = 153,                      // "identifier"
+        S_HTYPE = 154,                           // "htype"
+        S_TIME = 155,                            // "time"
+        S_ENTERPRISE_ID = 156,                   // "enterprise-id"
+        S_DHCP4O6_PORT = 157,                    // "dhcp4o6-port"
+        S_DHCP_MULTI_THREADING = 158,            // "multi-threading"
+        S_ENABLE_MULTI_THREADING = 159,          // "enable-multi-threading"
+        S_THREAD_POOL_SIZE = 160,                // "thread-pool-size"
+        S_PACKET_QUEUE_SIZE = 161,               // "packet-queue-size"
+        S_CONTROL_SOCKET = 162,                  // "control-socket"
+        S_CONTROL_SOCKETS = 163,                 // "control-sockets"
+        S_SOCKET_TYPE = 164,                     // "socket-type"
+        S_UNIX = 165,                            // "unix"
+        S_HTTP = 166,                            // "http"
+        S_HTTPS = 167,                           // "https"
+        S_SOCKET_NAME = 168,                     // "socket-name"
+        S_SOCKET_ADDRESS = 169,                  // "socket-address"
+        S_SOCKET_PORT = 170,                     // "socket-port"
+        S_AUTHENTICATION = 171,                  // "authentication"
+        S_BASIC = 172,                           // "basic"
+        S_REALM = 173,                           // "realm"
+        S_DIRECTORY = 174,                       // "directory"
+        S_CLIENTS = 175,                         // "clients"
+        S_USER_FILE = 176,                       // "user-file"
+        S_PASSWORD_FILE = 177,                   // "password-file"
+        S_CERT_REQUIRED = 178,                   // "cert-required"
+        S_DHCP_QUEUE_CONTROL = 179,              // "dhcp-queue-control"
+        S_ENABLE_QUEUE = 180,                    // "enable-queue"
+        S_QUEUE_TYPE = 181,                      // "queue-type"
+        S_CAPACITY = 182,                        // "capacity"
+        S_DHCP_DDNS = 183,                       // "dhcp-ddns"
+        S_ENABLE_UPDATES = 184,                  // "enable-updates"
+        S_SERVER_IP = 185,                       // "server-ip"
+        S_SERVER_PORT = 186,                     // "server-port"
+        S_SENDER_IP = 187,                       // "sender-ip"
+        S_SENDER_PORT = 188,                     // "sender-port"
+        S_MAX_QUEUE_SIZE = 189,                  // "max-queue-size"
+        S_NCR_PROTOCOL = 190,                    // "ncr-protocol"
+        S_NCR_FORMAT = 191,                      // "ncr-format"
+        S_UDP = 192,                             // "UDP"
+        S_TCP = 193,                             // "TCP"
+        S_JSON = 194,                            // "JSON"
+        S_WHEN_PRESENT = 195,                    // "when-present"
+        S_NEVER = 196,                           // "never"
+        S_ALWAYS = 197,                          // "always"
+        S_WHEN_NOT_PRESENT = 198,                // "when-not-present"
+        S_HOSTNAME_CHAR_SET = 199,               // "hostname-char-set"
+        S_HOSTNAME_CHAR_REPLACEMENT = 200,       // "hostname-char-replacement"
+        S_EARLY_GLOBAL_RESERVATIONS_LOOKUP = 201, // "early-global-reservations-lookup"
+        S_IP_RESERVATIONS_UNIQUE = 202,          // "ip-reservations-unique"
+        S_RESERVATIONS_LOOKUP_FIRST = 203,       // "reservations-lookup-first"
+        S_LOGGERS = 204,                         // "loggers"
+        S_OUTPUT_OPTIONS = 205,                  // "output-options"
+        S_OUTPUT = 206,                          // "output"
+        S_DEBUGLEVEL = 207,                      // "debuglevel"
+        S_SEVERITY = 208,                        // "severity"
+        S_FLUSH = 209,                           // "flush"
+        S_MAXSIZE = 210,                         // "maxsize"
+        S_MAXVER = 211,                          // "maxver"
+        S_PATTERN = 212,                         // "pattern"
+        S_COMPATIBILITY = 213,                   // "compatibility"
+        S_LENIENT_OPTION_PARSING = 214,          // "lenient-option-parsing"
+        S_TOPLEVEL_JSON = 215,                   // TOPLEVEL_JSON
+        S_TOPLEVEL_DHCP6 = 216,                  // TOPLEVEL_DHCP6
+        S_SUB_DHCP6 = 217,                       // SUB_DHCP6
+        S_SUB_INTERFACES6 = 218,                 // SUB_INTERFACES6
+        S_SUB_SUBNET6 = 219,                     // SUB_SUBNET6
+        S_SUB_POOL6 = 220,                       // SUB_POOL6
+        S_SUB_PD_POOL = 221,                     // SUB_PD_POOL
+        S_SUB_RESERVATION = 222,                 // SUB_RESERVATION
+        S_SUB_OPTION_DEFS = 223,                 // SUB_OPTION_DEFS
+        S_SUB_OPTION_DEF = 224,                  // SUB_OPTION_DEF
+        S_SUB_OPTION_DATA = 225,                 // SUB_OPTION_DATA
+        S_SUB_HOOKS_LIBRARY = 226,               // SUB_HOOKS_LIBRARY
+        S_SUB_DHCP_DDNS = 227,                   // SUB_DHCP_DDNS
+        S_SUB_CONFIG_CONTROL = 228,              // SUB_CONFIG_CONTROL
+        S_STRING = 229,                          // "constant string"
+        S_INTEGER = 230,                         // "integer"
+        S_FLOAT = 231,                           // "floating point"
+        S_BOOLEAN = 232,                         // "boolean"
+        S_YYACCEPT = 233,                        // $accept
+        S_start = 234,                           // start
+        S_235_1 = 235,                           // $@1
+        S_236_2 = 236,                           // $@2
+        S_237_3 = 237,                           // $@3
+        S_238_4 = 238,                           // $@4
+        S_239_5 = 239,                           // $@5
+        S_240_6 = 240,                           // $@6
+        S_241_7 = 241,                           // $@7
+        S_242_8 = 242,                           // $@8
+        S_243_9 = 243,                           // $@9
+        S_244_10 = 244,                          // $@10
+        S_245_11 = 245,                          // $@11
+        S_246_12 = 246,                          // $@12
+        S_247_13 = 247,                          // $@13
+        S_248_14 = 248,                          // $@14
+        S_value = 249,                           // value
+        S_sub_json = 250,                        // sub_json
+        S_map2 = 251,                            // map2
+        S_252_15 = 252,                          // $@15
+        S_map_value = 253,                       // map_value
+        S_map_content = 254,                     // map_content
+        S_not_empty_map = 255,                   // not_empty_map
+        S_list_generic = 256,                    // list_generic
+        S_257_16 = 257,                          // $@16
+        S_list_content = 258,                    // list_content
+        S_not_empty_list = 259,                  // not_empty_list
+        S_list_strings = 260,                    // list_strings
+        S_261_17 = 261,                          // $@17
+        S_list_strings_content = 262,            // list_strings_content
+        S_not_empty_list_strings = 263,          // not_empty_list_strings
+        S_unknown_map_entry = 264,               // unknown_map_entry
+        S_syntax_map = 265,                      // syntax_map
+        S_266_18 = 266,                          // $@18
+        S_global_object = 267,                   // global_object
+        S_268_19 = 268,                          // $@19
+        S_global_object_comma = 269,             // global_object_comma
+        S_sub_dhcp6 = 270,                       // sub_dhcp6
+        S_271_20 = 271,                          // $@20
+        S_global_params = 272,                   // global_params
+        S_global_param = 273,                    // global_param
+        S_data_directory = 274,                  // data_directory
+        S_275_21 = 275,                          // $@21
+        S_preferred_lifetime = 276,              // preferred_lifetime
+        S_min_preferred_lifetime = 277,          // min_preferred_lifetime
+        S_max_preferred_lifetime = 278,          // max_preferred_lifetime
+        S_valid_lifetime = 279,                  // valid_lifetime
+        S_min_valid_lifetime = 280,              // min_valid_lifetime
+        S_max_valid_lifetime = 281,              // max_valid_lifetime
+        S_renew_timer = 282,                     // renew_timer
+        S_rebind_timer = 283,                    // rebind_timer
+        S_calculate_tee_times = 284,             // calculate_tee_times
+        S_t1_percent = 285,                      // t1_percent
+        S_t2_percent = 286,                      // t2_percent
+        S_cache_threshold = 287,                 // cache_threshold
+        S_cache_max_age = 288,                   // cache_max_age
+        S_decline_probation_period = 289,        // decline_probation_period
+        S_ddns_send_updates = 290,               // ddns_send_updates
+        S_ddns_override_no_update = 291,         // ddns_override_no_update
+        S_ddns_override_client_update = 292,     // ddns_override_client_update
+        S_ddns_replace_client_name = 293,        // ddns_replace_client_name
+        S_294_22 = 294,                          // $@22
+        S_ddns_replace_client_name_value = 295,  // ddns_replace_client_name_value
+        S_ddns_generated_prefix = 296,           // ddns_generated_prefix
+        S_297_23 = 297,                          // $@23
+        S_ddns_qualifying_suffix = 298,          // ddns_qualifying_suffix
+        S_299_24 = 299,                          // $@24
+        S_ddns_update_on_renew = 300,            // ddns_update_on_renew
+        S_ddns_use_conflict_resolution = 301,    // ddns_use_conflict_resolution
+        S_ddns_conflict_resolution_mode = 302,   // ddns_conflict_resolution_mode
+        S_303_25 = 303,                          // $@25
+        S_ddns_conflict_resolution_mode_value = 304, // ddns_conflict_resolution_mode_value
+        S_ddns_ttl_percent = 305,                // ddns_ttl_percent
+        S_hostname_char_set = 306,               // hostname_char_set
+        S_307_26 = 307,                          // $@26
+        S_hostname_char_replacement = 308,       // hostname_char_replacement
+        S_309_27 = 309,                          // $@27
+        S_store_extended_info = 310,             // store_extended_info
+        S_statistic_default_sample_count = 311,  // statistic_default_sample_count
+        S_statistic_default_sample_age = 312,    // statistic_default_sample_age
+        S_server_tag = 313,                      // server_tag
+        S_314_28 = 314,                          // $@28
+        S_parked_packet_limit = 315,             // parked_packet_limit
+        S_allocator = 316,                       // allocator
+        S_317_29 = 317,                          // $@29
+        S_pd_allocator = 318,                    // pd_allocator
+        S_319_30 = 319,                          // $@30
+        S_early_global_reservations_lookup = 320, // early_global_reservations_lookup
+        S_ip_reservations_unique = 321,          // ip_reservations_unique
+        S_reservations_lookup_first = 322,       // reservations_lookup_first
+        S_interfaces_config = 323,               // interfaces_config
+        S_324_31 = 324,                          // $@31
+        S_sub_interfaces6 = 325,                 // sub_interfaces6
+        S_326_32 = 326,                          // $@32
+        S_interfaces_config_params = 327,        // interfaces_config_params
+        S_interfaces_config_param = 328,         // interfaces_config_param
+        S_interfaces_list = 329,                 // interfaces_list
+        S_330_33 = 330,                          // $@33
+        S_re_detect = 331,                       // re_detect
+        S_service_sockets_require_all = 332,     // service_sockets_require_all
+        S_service_sockets_retry_wait_time = 333, // service_sockets_retry_wait_time
+        S_service_sockets_max_retries = 334,     // service_sockets_max_retries
+        S_lease_database = 335,                  // lease_database
+        S_336_34 = 336,                          // $@34
+        S_hosts_database = 337,                  // hosts_database
+        S_338_35 = 338,                          // $@35
+        S_hosts_databases = 339,                 // hosts_databases
+        S_340_36 = 340,                          // $@36
+        S_database_list = 341,                   // database_list
+        S_not_empty_database_list = 342,         // not_empty_database_list
+        S_database = 343,                        // database
+        S_344_37 = 344,                          // $@37
+        S_database_map_params = 345,             // database_map_params
+        S_database_map_param = 346,              // database_map_param
+        S_database_type = 347,                   // database_type
+        S_348_38 = 348,                          // $@38
+        S_user = 349,                            // user
+        S_350_39 = 350,                          // $@39
+        S_password = 351,                        // password
+        S_352_40 = 352,                          // $@40
+        S_host = 353,                            // host
+        S_354_41 = 354,                          // $@41
+        S_port = 355,                            // port
+        S_name = 356,                            // name
+        S_357_42 = 357,                          // $@42
+        S_persist = 358,                         // persist
+        S_lfc_interval = 359,                    // lfc_interval
+        S_readonly = 360,                        // readonly
+        S_connect_timeout = 361,                 // connect_timeout
+        S_read_timeout = 362,                    // read_timeout
+        S_write_timeout = 363,                   // write_timeout
+        S_tcp_user_timeout = 364,                // tcp_user_timeout
+        S_reconnect_wait_time = 365,             // reconnect_wait_time
+        S_on_fail = 366,                         // on_fail
+        S_367_43 = 367,                          // $@43
+        S_on_fail_mode = 368,                    // on_fail_mode
+        S_retry_on_startup = 369,                // retry_on_startup
+        S_max_row_errors = 370,                  // max_row_errors
+        S_max_reconnect_tries = 371,             // max_reconnect_tries
+        S_trust_anchor = 372,                    // trust_anchor
+        S_373_44 = 373,                          // $@44
+        S_cert_file = 374,                       // cert_file
+        S_375_45 = 375,                          // $@45
+        S_key_file = 376,                        // key_file
+        S_377_46 = 377,                          // $@46
+        S_cipher_list = 378,                     // cipher_list
+        S_379_47 = 379,                          // $@47
+        S_sanity_checks = 380,                   // sanity_checks
+        S_381_48 = 381,                          // $@48
+        S_sanity_checks_params = 382,            // sanity_checks_params
+        S_sanity_checks_param = 383,             // sanity_checks_param
+        S_lease_checks = 384,                    // lease_checks
+        S_385_49 = 385,                          // $@49
+        S_extended_info_checks = 386,            // extended_info_checks
+        S_387_50 = 387,                          // $@50
+        S_mac_sources = 388,                     // mac_sources
+        S_389_51 = 389,                          // $@51
+        S_mac_sources_list = 390,                // mac_sources_list
+        S_mac_sources_value = 391,               // mac_sources_value
+        S_duid_id = 392,                         // duid_id
+        S_string_id = 393,                       // string_id
+        S_host_reservation_identifiers = 394,    // host_reservation_identifiers
+        S_395_52 = 395,                          // $@52
+        S_host_reservation_identifiers_list = 396, // host_reservation_identifiers_list
+        S_host_reservation_identifier = 397,     // host_reservation_identifier
+        S_hw_address_id = 398,                   // hw_address_id
+        S_flex_id = 399,                         // flex_id
+        S_relay_supplied_options = 400,          // relay_supplied_options
+        S_401_53 = 401,                          // $@53
+        S_dhcp_multi_threading = 402,            // dhcp_multi_threading
+        S_403_54 = 403,                          // $@54
+        S_multi_threading_params = 404,          // multi_threading_params
+        S_multi_threading_param = 405,           // multi_threading_param
+        S_enable_multi_threading = 406,          // enable_multi_threading
+        S_thread_pool_size = 407,                // thread_pool_size
+        S_packet_queue_size = 408,               // packet_queue_size
+        S_hooks_libraries = 409,                 // hooks_libraries
+        S_410_55 = 410,                          // $@55
+        S_hooks_libraries_list = 411,            // hooks_libraries_list
+        S_not_empty_hooks_libraries_list = 412,  // not_empty_hooks_libraries_list
+        S_hooks_library = 413,                   // hooks_library
+        S_414_56 = 414,                          // $@56
+        S_sub_hooks_library = 415,               // sub_hooks_library
+        S_416_57 = 416,                          // $@57
+        S_hooks_params = 417,                    // hooks_params
+        S_hooks_param = 418,                     // hooks_param
+        S_library = 419,                         // library
+        S_420_58 = 420,                          // $@58
+        S_parameters = 421,                      // parameters
+        S_422_59 = 422,                          // $@59
+        S_expired_leases_processing = 423,       // expired_leases_processing
+        S_424_60 = 424,                          // $@60
+        S_expired_leases_params = 425,           // expired_leases_params
+        S_expired_leases_param = 426,            // expired_leases_param
+        S_reclaim_timer_wait_time = 427,         // reclaim_timer_wait_time
+        S_flush_reclaimed_timer_wait_time = 428, // flush_reclaimed_timer_wait_time
+        S_hold_reclaimed_time = 429,             // hold_reclaimed_time
+        S_max_reclaim_leases = 430,              // max_reclaim_leases
+        S_max_reclaim_time = 431,                // max_reclaim_time
+        S_unwarned_reclaim_cycles = 432,         // unwarned_reclaim_cycles
+        S_subnet6_list = 433,                    // subnet6_list
+        S_434_61 = 434,                          // $@61
+        S_subnet6_list_content = 435,            // subnet6_list_content
+        S_not_empty_subnet6_list = 436,          // not_empty_subnet6_list
+        S_subnet6 = 437,                         // subnet6
+        S_438_62 = 438,                          // $@62
+        S_sub_subnet6 = 439,                     // sub_subnet6
+        S_440_63 = 440,                          // $@63
+        S_subnet6_params = 441,                  // subnet6_params
+        S_subnet6_param = 442,                   // subnet6_param
+        S_subnet = 443,                          // subnet
+        S_444_64 = 444,                          // $@64
+        S_interface = 445,                       // interface
+        S_446_65 = 446,                          // $@65
+        S_interface_id = 447,                    // interface_id
+        S_448_66 = 448,                          // $@66
+        S_client_class = 449,                    // client_class
+        S_450_67 = 450,                          // $@67
+        S_require_client_classes = 451,          // require_client_classes
+        S_452_68 = 452,                          // $@68
+        S_evaluate_additional_classes = 453,     // evaluate_additional_classes
+        S_454_69 = 454,                          // $@69
+        S_reservations_global = 455,             // reservations_global
+        S_reservations_in_subnet = 456,          // reservations_in_subnet
+        S_reservations_out_of_pool = 457,        // reservations_out_of_pool
+        S_id = 458,                              // id
+        S_rapid_commit = 459,                    // rapid_commit
+        S_shared_networks = 460,                 // shared_networks
         S_461_70 = 461,                          // $@70
-        S_shared_network_params = 462,           // shared_network_params
-        S_shared_network_param = 463,            // shared_network_param
-        S_option_def_list = 464,                 // option_def_list
+        S_shared_networks_content = 462,         // shared_networks_content
+        S_shared_networks_list = 463,            // shared_networks_list
+        S_shared_network = 464,                  // shared_network
         S_465_71 = 465,                          // $@71
-        S_sub_option_def_list = 466,             // sub_option_def_list
-        S_467_72 = 467,                          // $@72
-        S_option_def_list_content = 468,         // option_def_list_content
-        S_not_empty_option_def_list = 469,       // not_empty_option_def_list
-        S_option_def_entry = 470,                // option_def_entry
+        S_shared_network_params = 466,           // shared_network_params
+        S_shared_network_param = 467,            // shared_network_param
+        S_option_def_list = 468,                 // option_def_list
+        S_469_72 = 469,                          // $@72
+        S_sub_option_def_list = 470,             // sub_option_def_list
         S_471_73 = 471,                          // $@73
-        S_sub_option_def = 472,                  // sub_option_def
-        S_473_74 = 473,                          // $@74
-        S_option_def_params = 474,               // option_def_params
-        S_not_empty_option_def_params = 475,     // not_empty_option_def_params
-        S_option_def_param = 476,                // option_def_param
-        S_option_def_name = 477,                 // option_def_name
-        S_code = 478,                            // code
-        S_option_def_code = 479,                 // option_def_code
-        S_option_def_type = 480,                 // option_def_type
-        S_481_75 = 481,                          // $@75
-        S_option_def_record_types = 482,         // option_def_record_types
-        S_483_76 = 483,                          // $@76
-        S_space = 484,                           // space
-        S_485_77 = 485,                          // $@77
-        S_option_def_space = 486,                // option_def_space
-        S_option_def_encapsulate = 487,          // option_def_encapsulate
-        S_488_78 = 488,                          // $@78
-        S_option_def_array = 489,                // option_def_array
-        S_option_data_list = 490,                // option_data_list
-        S_491_79 = 491,                          // $@79
-        S_option_data_list_content = 492,        // option_data_list_content
-        S_not_empty_option_data_list = 493,      // not_empty_option_data_list
-        S_option_data_entry = 494,               // option_data_entry
+        S_option_def_list_content = 472,         // option_def_list_content
+        S_not_empty_option_def_list = 473,       // not_empty_option_def_list
+        S_option_def_entry = 474,                // option_def_entry
+        S_475_74 = 475,                          // $@74
+        S_sub_option_def = 476,                  // sub_option_def
+        S_477_75 = 477,                          // $@75
+        S_option_def_params = 478,               // option_def_params
+        S_not_empty_option_def_params = 479,     // not_empty_option_def_params
+        S_option_def_param = 480,                // option_def_param
+        S_option_def_name = 481,                 // option_def_name
+        S_code = 482,                            // code
+        S_option_def_code = 483,                 // option_def_code
+        S_option_def_type = 484,                 // option_def_type
+        S_485_76 = 485,                          // $@76
+        S_option_def_record_types = 486,         // option_def_record_types
+        S_487_77 = 487,                          // $@77
+        S_space = 488,                           // space
+        S_489_78 = 489,                          // $@78
+        S_option_def_space = 490,                // option_def_space
+        S_option_def_encapsulate = 491,          // option_def_encapsulate
+        S_492_79 = 492,                          // $@79
+        S_option_def_array = 493,                // option_def_array
+        S_option_data_list = 494,                // option_data_list
         S_495_80 = 495,                          // $@80
-        S_sub_option_data = 496,                 // sub_option_data
-        S_497_81 = 497,                          // $@81
-        S_option_data_params = 498,              // option_data_params
-        S_not_empty_option_data_params = 499,    // not_empty_option_data_params
-        S_option_data_param = 500,               // option_data_param
-        S_option_data_name = 501,                // option_data_name
-        S_option_data_data = 502,                // option_data_data
-        S_503_82 = 503,                          // $@82
-        S_option_data_code = 504,                // option_data_code
-        S_option_data_space = 505,               // option_data_space
-        S_option_data_csv_format = 506,          // option_data_csv_format
-        S_option_data_always_send = 507,         // option_data_always_send
-        S_option_data_never_send = 508,          // option_data_never_send
-        S_option_data_client_classes = 509,      // option_data_client_classes
-        S_510_83 = 510,                          // $@83
-        S_pools_list = 511,                      // pools_list
-        S_512_84 = 512,                          // $@84
-        S_pools_list_content = 513,              // pools_list_content
-        S_not_empty_pools_list = 514,            // not_empty_pools_list
-        S_pool_list_entry = 515,                 // pool_list_entry
+        S_option_data_list_content = 496,        // option_data_list_content
+        S_not_empty_option_data_list = 497,      // not_empty_option_data_list
+        S_option_data_entry = 498,               // option_data_entry
+        S_499_81 = 499,                          // $@81
+        S_sub_option_data = 500,                 // sub_option_data
+        S_501_82 = 501,                          // $@82
+        S_option_data_params = 502,              // option_data_params
+        S_not_empty_option_data_params = 503,    // not_empty_option_data_params
+        S_option_data_param = 504,               // option_data_param
+        S_option_data_name = 505,                // option_data_name
+        S_option_data_data = 506,                // option_data_data
+        S_507_83 = 507,                          // $@83
+        S_option_data_code = 508,                // option_data_code
+        S_option_data_space = 509,               // option_data_space
+        S_option_data_csv_format = 510,          // option_data_csv_format
+        S_option_data_always_send = 511,         // option_data_always_send
+        S_option_data_never_send = 512,          // option_data_never_send
+        S_option_data_client_classes = 513,      // option_data_client_classes
+        S_514_84 = 514,                          // $@84
+        S_pools_list = 515,                      // pools_list
         S_516_85 = 516,                          // $@85
-        S_sub_pool6 = 517,                       // sub_pool6
-        S_518_86 = 518,                          // $@86
-        S_pool_params = 519,                     // pool_params
-        S_pool_param = 520,                      // pool_param
-        S_pool_entry = 521,                      // pool_entry
+        S_pools_list_content = 517,              // pools_list_content
+        S_not_empty_pools_list = 518,            // not_empty_pools_list
+        S_pool_list_entry = 519,                 // pool_list_entry
+        S_520_86 = 520,                          // $@86
+        S_sub_pool6 = 521,                       // sub_pool6
         S_522_87 = 522,                          // $@87
-        S_pool_id = 523,                         // pool_id
-        S_user_context = 524,                    // user_context
-        S_525_88 = 525,                          // $@88
-        S_comment = 526,                         // comment
-        S_527_89 = 527,                          // $@89
-        S_pd_pools_list = 528,                   // pd_pools_list
-        S_529_90 = 529,                          // $@90
-        S_pd_pools_list_content = 530,           // pd_pools_list_content
-        S_not_empty_pd_pools_list = 531,         // not_empty_pd_pools_list
-        S_pd_pool_entry = 532,                   // pd_pool_entry
+        S_pool_params = 523,                     // pool_params
+        S_pool_param = 524,                      // pool_param
+        S_pool_entry = 525,                      // pool_entry
+        S_526_88 = 526,                          // $@88
+        S_pool_id = 527,                         // pool_id
+        S_user_context = 528,                    // user_context
+        S_529_89 = 529,                          // $@89
+        S_comment = 530,                         // comment
+        S_531_90 = 531,                          // $@90
+        S_pd_pools_list = 532,                   // pd_pools_list
         S_533_91 = 533,                          // $@91
-        S_sub_pd_pool = 534,                     // sub_pd_pool
-        S_535_92 = 535,                          // $@92
-        S_pd_pool_params = 536,                  // pd_pool_params
-        S_pd_pool_param = 537,                   // pd_pool_param
-        S_pd_prefix = 538,                       // pd_prefix
+        S_pd_pools_list_content = 534,           // pd_pools_list_content
+        S_not_empty_pd_pools_list = 535,         // not_empty_pd_pools_list
+        S_pd_pool_entry = 536,                   // pd_pool_entry
+        S_537_92 = 537,                          // $@92
+        S_sub_pd_pool = 538,                     // sub_pd_pool
         S_539_93 = 539,                          // $@93
-        S_pd_prefix_len = 540,                   // pd_prefix_len
-        S_excluded_prefix = 541,                 // excluded_prefix
-        S_542_94 = 542,                          // $@94
-        S_excluded_prefix_len = 543,             // excluded_prefix_len
-        S_pd_delegated_len = 544,                // pd_delegated_len
-        S_reservations = 545,                    // reservations
+        S_pd_pool_params = 540,                  // pd_pool_params
+        S_pd_pool_param = 541,                   // pd_pool_param
+        S_pd_prefix = 542,                       // pd_prefix
+        S_543_94 = 543,                          // $@94
+        S_pd_prefix_len = 544,                   // pd_prefix_len
+        S_excluded_prefix = 545,                 // excluded_prefix
         S_546_95 = 546,                          // $@95
-        S_reservations_list = 547,               // reservations_list
-        S_not_empty_reservations_list = 548,     // not_empty_reservations_list
-        S_reservation = 549,                     // reservation
+        S_excluded_prefix_len = 547,             // excluded_prefix_len
+        S_pd_delegated_len = 548,                // pd_delegated_len
+        S_reservations = 549,                    // reservations
         S_550_96 = 550,                          // $@96
-        S_sub_reservation = 551,                 // sub_reservation
-        S_552_97 = 552,                          // $@97
-        S_reservation_params = 553,              // reservation_params
-        S_not_empty_reservation_params = 554,    // not_empty_reservation_params
-        S_reservation_param = 555,               // reservation_param
-        S_ip_addresses = 556,                    // ip_addresses
-        S_557_98 = 557,                          // $@98
-        S_prefixes = 558,                        // prefixes
-        S_559_99 = 559,                          // $@99
-        S_excluded_prefixes = 560,               // excluded_prefixes
-        S_561_100 = 561,                         // $@100
-        S_duid = 562,                            // duid
-        S_563_101 = 563,                         // $@101
-        S_hw_address = 564,                      // hw_address
-        S_565_102 = 565,                         // $@102
-        S_hostname = 566,                        // hostname
-        S_567_103 = 567,                         // $@103
-        S_flex_id_value = 568,                   // flex_id_value
-        S_569_104 = 569,                         // $@104
-        S_reservation_client_classes = 570,      // reservation_client_classes
-        S_571_105 = 571,                         // $@105
-        S_relay = 572,                           // relay
-        S_573_106 = 573,                         // $@106
-        S_relay_map = 574,                       // relay_map
-        S_client_classes = 575,                  // client_classes
-        S_576_107 = 576,                         // $@107
-        S_client_classes_list = 577,             // client_classes_list
-        S_client_class_entry = 578,              // client_class_entry
-        S_579_108 = 579,                         // $@108
-        S_client_class_params = 580,             // client_class_params
-        S_not_empty_client_class_params = 581,   // not_empty_client_class_params
-        S_client_class_param = 582,              // client_class_param
-        S_client_class_name = 583,               // client_class_name
-        S_client_class_test = 584,               // client_class_test
-        S_585_109 = 585,                         // $@109
-        S_client_class_template_test = 586,      // client_class_template_test
-        S_587_110 = 587,                         // $@110
-        S_only_if_required = 588,                // only_if_required
-        S_server_id = 589,                       // server_id
-        S_590_111 = 590,                         // $@111
-        S_server_id_params = 591,                // server_id_params
-        S_server_id_param = 592,                 // server_id_param
-        S_server_id_type = 593,                  // server_id_type
-        S_594_112 = 594,                         // $@112
-        S_duid_type = 595,                       // duid_type
-        S_htype = 596,                           // htype
-        S_identifier = 597,                      // identifier
-        S_598_113 = 598,                         // $@113
-        S_time = 599,                            // time
-        S_enterprise_id = 600,                   // enterprise_id
-        S_dhcp4o6_port = 601,                    // dhcp4o6_port
-        S_control_socket = 602,                  // control_socket
+        S_reservations_list = 551,               // reservations_list
+        S_not_empty_reservations_list = 552,     // not_empty_reservations_list
+        S_reservation = 553,                     // reservation
+        S_554_97 = 554,                          // $@97
+        S_sub_reservation = 555,                 // sub_reservation
+        S_556_98 = 556,                          // $@98
+        S_reservation_params = 557,              // reservation_params
+        S_not_empty_reservation_params = 558,    // not_empty_reservation_params
+        S_reservation_param = 559,               // reservation_param
+        S_ip_addresses = 560,                    // ip_addresses
+        S_561_99 = 561,                          // $@99
+        S_prefixes = 562,                        // prefixes
+        S_563_100 = 563,                         // $@100
+        S_excluded_prefixes = 564,               // excluded_prefixes
+        S_565_101 = 565,                         // $@101
+        S_duid = 566,                            // duid
+        S_567_102 = 567,                         // $@102
+        S_hw_address = 568,                      // hw_address
+        S_569_103 = 569,                         // $@103
+        S_hostname = 570,                        // hostname
+        S_571_104 = 571,                         // $@104
+        S_flex_id_value = 572,                   // flex_id_value
+        S_573_105 = 573,                         // $@105
+        S_reservation_client_classes = 574,      // reservation_client_classes
+        S_575_106 = 575,                         // $@106
+        S_relay = 576,                           // relay
+        S_577_107 = 577,                         // $@107
+        S_relay_map = 578,                       // relay_map
+        S_client_classes = 579,                  // client_classes
+        S_580_108 = 580,                         // $@108
+        S_client_classes_list = 581,             // client_classes_list
+        S_client_class_entry = 582,              // client_class_entry
+        S_583_109 = 583,                         // $@109
+        S_client_class_params = 584,             // client_class_params
+        S_not_empty_client_class_params = 585,   // not_empty_client_class_params
+        S_client_class_param = 586,              // client_class_param
+        S_client_class_name = 587,               // client_class_name
+        S_client_class_test = 588,               // client_class_test
+        S_589_110 = 589,                         // $@110
+        S_client_class_template_test = 590,      // client_class_template_test
+        S_591_111 = 591,                         // $@111
+        S_only_if_required = 592,                // only_if_required
+        S_only_in_additional_list = 593,         // only_in_additional_list
+        S_server_id = 594,                       // server_id
+        S_595_112 = 595,                         // $@112
+        S_server_id_params = 596,                // server_id_params
+        S_server_id_param = 597,                 // server_id_param
+        S_server_id_type = 598,                  // server_id_type
+        S_599_113 = 599,                         // $@113
+        S_duid_type = 600,                       // duid_type
+        S_htype = 601,                           // htype
+        S_identifier = 602,                      // identifier
         S_603_114 = 603,                         // $@114
-        S_control_sockets = 604,                 // control_sockets
-        S_605_115 = 605,                         // $@115
-        S_control_socket_list = 606,             // control_socket_list
-        S_not_empty_control_socket_list = 607,   // not_empty_control_socket_list
-        S_control_socket_entry = 608,            // control_socket_entry
-        S_609_116 = 609,                         // $@116
-        S_control_socket_params = 610,           // control_socket_params
-        S_control_socket_param = 611,            // control_socket_param
-        S_control_socket_type = 612,             // control_socket_type
-        S_613_117 = 613,                         // $@117
-        S_control_socket_type_value = 614,       // control_socket_type_value
-        S_control_socket_name = 615,             // control_socket_name
-        S_616_118 = 616,                         // $@118
-        S_control_socket_address = 617,          // control_socket_address
-        S_618_119 = 618,                         // $@119
-        S_control_socket_port = 619,             // control_socket_port
-        S_cert_required = 620,                   // cert_required
-        S_authentication = 621,                  // authentication
-        S_622_120 = 622,                         // $@120
-        S_auth_params = 623,                     // auth_params
-        S_auth_param = 624,                      // auth_param
-        S_auth_type = 625,                       // auth_type
-        S_626_121 = 626,                         // $@121
-        S_auth_type_value = 627,                 // auth_type_value
-        S_realm = 628,                           // realm
-        S_629_122 = 629,                         // $@122
-        S_directory = 630,                       // directory
-        S_631_123 = 631,                         // $@123
-        S_clients = 632,                         // clients
-        S_633_124 = 633,                         // $@124
-        S_clients_list = 634,                    // clients_list
-        S_not_empty_clients_list = 635,          // not_empty_clients_list
-        S_basic_auth = 636,                      // basic_auth
-        S_637_125 = 637,                         // $@125
-        S_clients_params = 638,                  // clients_params
-        S_clients_param = 639,                   // clients_param
-        S_user_file = 640,                       // user_file
-        S_641_126 = 641,                         // $@126
-        S_password_file = 642,                   // password_file
-        S_643_127 = 643,                         // $@127
-        S_dhcp_queue_control = 644,              // dhcp_queue_control
-        S_645_128 = 645,                         // $@128
-        S_queue_control_params = 646,            // queue_control_params
-        S_queue_control_param = 647,             // queue_control_param
-        S_enable_queue = 648,                    // enable_queue
-        S_queue_type = 649,                      // queue_type
+        S_time = 604,                            // time
+        S_enterprise_id = 605,                   // enterprise_id
+        S_dhcp4o6_port = 606,                    // dhcp4o6_port
+        S_control_socket = 607,                  // control_socket
+        S_608_115 = 608,                         // $@115
+        S_control_sockets = 609,                 // control_sockets
+        S_610_116 = 610,                         // $@116
+        S_control_socket_list = 611,             // control_socket_list
+        S_not_empty_control_socket_list = 612,   // not_empty_control_socket_list
+        S_control_socket_entry = 613,            // control_socket_entry
+        S_614_117 = 614,                         // $@117
+        S_control_socket_params = 615,           // control_socket_params
+        S_control_socket_param = 616,            // control_socket_param
+        S_control_socket_type = 617,             // control_socket_type
+        S_618_118 = 618,                         // $@118
+        S_control_socket_type_value = 619,       // control_socket_type_value
+        S_control_socket_name = 620,             // control_socket_name
+        S_621_119 = 621,                         // $@119
+        S_control_socket_address = 622,          // control_socket_address
+        S_623_120 = 623,                         // $@120
+        S_control_socket_port = 624,             // control_socket_port
+        S_cert_required = 625,                   // cert_required
+        S_authentication = 626,                  // authentication
+        S_627_121 = 627,                         // $@121
+        S_auth_params = 628,                     // auth_params
+        S_auth_param = 629,                      // auth_param
+        S_auth_type = 630,                       // auth_type
+        S_631_122 = 631,                         // $@122
+        S_auth_type_value = 632,                 // auth_type_value
+        S_realm = 633,                           // realm
+        S_634_123 = 634,                         // $@123
+        S_directory = 635,                       // directory
+        S_636_124 = 636,                         // $@124
+        S_clients = 637,                         // clients
+        S_638_125 = 638,                         // $@125
+        S_clients_list = 639,                    // clients_list
+        S_not_empty_clients_list = 640,          // not_empty_clients_list
+        S_basic_auth = 641,                      // basic_auth
+        S_642_126 = 642,                         // $@126
+        S_clients_params = 643,                  // clients_params
+        S_clients_param = 644,                   // clients_param
+        S_user_file = 645,                       // user_file
+        S_646_127 = 646,                         // $@127
+        S_password_file = 647,                   // password_file
+        S_648_128 = 648,                         // $@128
+        S_dhcp_queue_control = 649,              // dhcp_queue_control
         S_650_129 = 650,                         // $@129
-        S_capacity = 651,                        // capacity
-        S_arbitrary_map_entry = 652,             // arbitrary_map_entry
-        S_653_130 = 653,                         // $@130
-        S_dhcp_ddns = 654,                       // dhcp_ddns
-        S_655_131 = 655,                         // $@131
-        S_sub_dhcp_ddns = 656,                   // sub_dhcp_ddns
-        S_657_132 = 657,                         // $@132
-        S_dhcp_ddns_params = 658,                // dhcp_ddns_params
-        S_dhcp_ddns_param = 659,                 // dhcp_ddns_param
-        S_enable_updates = 660,                  // enable_updates
-        S_server_ip = 661,                       // server_ip
+        S_queue_control_params = 651,            // queue_control_params
+        S_queue_control_param = 652,             // queue_control_param
+        S_enable_queue = 653,                    // enable_queue
+        S_queue_type = 654,                      // queue_type
+        S_655_130 = 655,                         // $@130
+        S_capacity = 656,                        // capacity
+        S_arbitrary_map_entry = 657,             // arbitrary_map_entry
+        S_658_131 = 658,                         // $@131
+        S_dhcp_ddns = 659,                       // dhcp_ddns
+        S_660_132 = 660,                         // $@132
+        S_sub_dhcp_ddns = 661,                   // sub_dhcp_ddns
         S_662_133 = 662,                         // $@133
-        S_server_port = 663,                     // server_port
-        S_sender_ip = 664,                       // sender_ip
-        S_665_134 = 665,                         // $@134
-        S_sender_port = 666,                     // sender_port
-        S_max_queue_size = 667,                  // max_queue_size
-        S_ncr_protocol = 668,                    // ncr_protocol
-        S_669_135 = 669,                         // $@135
-        S_ncr_protocol_value = 670,              // ncr_protocol_value
-        S_ncr_format = 671,                      // ncr_format
-        S_672_136 = 672,                         // $@136
-        S_config_control = 673,                  // config_control
-        S_674_137 = 674,                         // $@137
-        S_sub_config_control = 675,              // sub_config_control
-        S_676_138 = 676,                         // $@138
-        S_config_control_params = 677,           // config_control_params
-        S_config_control_param = 678,            // config_control_param
-        S_config_databases = 679,                // config_databases
-        S_680_139 = 680,                         // $@139
-        S_config_fetch_wait_time = 681,          // config_fetch_wait_time
-        S_loggers = 682,                         // loggers
-        S_683_140 = 683,                         // $@140
-        S_loggers_entries = 684,                 // loggers_entries
-        S_logger_entry = 685,                    // logger_entry
-        S_686_141 = 686,                         // $@141
-        S_logger_params = 687,                   // logger_params
-        S_logger_param = 688,                    // logger_param
-        S_debuglevel = 689,                      // debuglevel
-        S_severity = 690,                        // severity
+        S_dhcp_ddns_params = 663,                // dhcp_ddns_params
+        S_dhcp_ddns_param = 664,                 // dhcp_ddns_param
+        S_enable_updates = 665,                  // enable_updates
+        S_server_ip = 666,                       // server_ip
+        S_667_134 = 667,                         // $@134
+        S_server_port = 668,                     // server_port
+        S_sender_ip = 669,                       // sender_ip
+        S_670_135 = 670,                         // $@135
+        S_sender_port = 671,                     // sender_port
+        S_max_queue_size = 672,                  // max_queue_size
+        S_ncr_protocol = 673,                    // ncr_protocol
+        S_674_136 = 674,                         // $@136
+        S_ncr_protocol_value = 675,              // ncr_protocol_value
+        S_ncr_format = 676,                      // ncr_format
+        S_677_137 = 677,                         // $@137
+        S_config_control = 678,                  // config_control
+        S_679_138 = 679,                         // $@138
+        S_sub_config_control = 680,              // sub_config_control
+        S_681_139 = 681,                         // $@139
+        S_config_control_params = 682,           // config_control_params
+        S_config_control_param = 683,            // config_control_param
+        S_config_databases = 684,                // config_databases
+        S_685_140 = 685,                         // $@140
+        S_config_fetch_wait_time = 686,          // config_fetch_wait_time
+        S_loggers = 687,                         // loggers
+        S_688_141 = 688,                         // $@141
+        S_loggers_entries = 689,                 // loggers_entries
+        S_logger_entry = 690,                    // logger_entry
         S_691_142 = 691,                         // $@142
-        S_output_options_list = 692,             // output_options_list
-        S_693_143 = 693,                         // $@143
-        S_output_options_list_content = 694,     // output_options_list_content
-        S_output_entry = 695,                    // output_entry
-        S_696_144 = 696,                         // $@144
-        S_output_params_list = 697,              // output_params_list
-        S_output_params = 698,                   // output_params
-        S_output = 699,                          // output
-        S_700_145 = 700,                         // $@145
-        S_flush = 701,                           // flush
-        S_maxsize = 702,                         // maxsize
-        S_maxver = 703,                          // maxver
-        S_pattern = 704,                         // pattern
+        S_logger_params = 692,                   // logger_params
+        S_logger_param = 693,                    // logger_param
+        S_debuglevel = 694,                      // debuglevel
+        S_severity = 695,                        // severity
+        S_696_143 = 696,                         // $@143
+        S_output_options_list = 697,             // output_options_list
+        S_698_144 = 698,                         // $@144
+        S_output_options_list_content = 699,     // output_options_list_content
+        S_output_entry = 700,                    // output_entry
+        S_701_145 = 701,                         // $@145
+        S_output_params_list = 702,              // output_params_list
+        S_output_params = 703,                   // output_params
+        S_output = 704,                          // output
         S_705_146 = 705,                         // $@146
-        S_compatibility = 706,                   // compatibility
-        S_707_147 = 707,                         // $@147
-        S_compatibility_params = 708,            // compatibility_params
-        S_compatibility_param = 709,             // compatibility_param
-        S_lenient_option_parsing = 710           // lenient_option_parsing
+        S_flush = 706,                           // flush
+        S_maxsize = 707,                         // maxsize
+        S_maxver = 708,                          // maxver
+        S_pattern = 709,                         // pattern
+        S_710_147 = 710,                         // $@147
+        S_compatibility = 711,                   // compatibility
+        S_712_148 = 712,                         // $@148
+        S_compatibility_params = 713,            // compatibility_params
+        S_compatibility_param = 714,             // compatibility_param
+        S_lenient_option_parsing = 715           // lenient_option_parsing
       };
     };
 
@@ -3707,6 +3714,21 @@ switch (yykind)
         return symbol_type (token::TOKEN_REQUIRE_CLIENT_CLASSES, l);
       }
 #endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_EVALUATE_ADDITIONAL_CLASSES (location_type l)
+      {
+        return symbol_type (token::TOKEN_EVALUATE_ADDITIONAL_CLASSES, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_EVALUATE_ADDITIONAL_CLASSES (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_EVALUATE_ADDITIONAL_CLASSES, l);
+      }
+#endif
 #if 201103L <= YY_CPLUSPLUS
       static
       symbol_type
@@ -3752,6 +3774,21 @@ switch (yykind)
         return symbol_type (token::TOKEN_ONLY_IF_REQUIRED, l);
       }
 #endif
+#if 201103L <= YY_CPLUSPLUS
+      static
+      symbol_type
+      make_ONLY_IN_ADDITIONAL_LIST (location_type l)
+      {
+        return symbol_type (token::TOKEN_ONLY_IN_ADDITIONAL_LIST, std::move (l));
+      }
+#else
+      static
+      symbol_type
+      make_ONLY_IN_ADDITIONAL_LIST (const location_type& l)
+      {
+        return symbol_type (token::TOKEN_ONLY_IN_ADDITIONAL_LIST, l);
+      }
+#endif
 #if 201103L <= YY_CPLUSPLUS
       static
       symbol_type
@@ -5657,8 +5694,8 @@ switch (yykind)
     /// Constants.
     enum
     {
-      yylast_ = 1421,     ///< Last index in yytable_.
-      yynnts_ = 480,  ///< Number of nonterminal symbols.
+      yylast_ = 1694,     ///< Last index in yytable_.
+      yynnts_ = 483,  ///< Number of nonterminal symbols.
       yyfinal_ = 30 ///< Termination state number.
     };
 
@@ -5726,10 +5763,10 @@ switch (yykind)
      195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
      205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
      215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230
+     225,   226,   227,   228,   229,   230,   231,   232
     };
     // Last valid token kind.
-    const int code_max = 485;
+    const int code_max = 487;
 
     if (t <= 0)
       return symbol_kind::S_YYEOF;
@@ -5902,7 +5939,7 @@ switch (yykind)
 
 #line 14 "dhcp6_parser.yy"
 } } // isc::dhcp
-#line 5906 "dhcp6_parser.h"
+#line 5943 "dhcp6_parser.h"
 
 
 

diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index 0a8d3b5931da635748a9dcb03bcc0960b2e244a8..540f4742ab7e8af5a99fcb4633a5e5f54ae56f81 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -177,9 +177,11 @@ using namespace std;
 
   CLIENT_CLASSES "client-classes"
   REQUIRE_CLIENT_CLASSES "require-client-classes"
+  EVALUATE_ADDITIONAL_CLASSES "evaluate-additional-classes"
   TEST "test"
   TEMPLATE_TEST "template-test"
   ONLY_IF_REQUIRED "only-if-required"
+  ONLY_IN_ADDITIONAL_LIST "only-in-additional-list"
   CLIENT_CLASS "client-class"
   POOL_ID "pool-id"
 
@@ -1617,6 +1619,7 @@ subnet6_param: preferred_lifetime
              | rapid_commit
              | client_class
              | require_client_classes
+             | evaluate_additional_classes
              | reservations
              | reservations_global
              | reservations_in_subnet
@@ -1683,6 +1686,7 @@ client_class: CLIENT_CLASS {
     ctx.leave();
 };
 
+// Deprecated.
 require_client_classes: REQUIRE_CLIENT_CLASSES {
     ctx.unique("require-client-classes", ctx.loc2pos(@1));
     ElementPtr c(new ListElement(ctx.loc2pos(@1)));
@@ -1694,6 +1698,18 @@ require_client_classes: REQUIRE_CLIENT_CLASSES {
     ctx.leave();
 };
 
+evaluate_additional_classes: EVALUATE_ADDITIONAL_CLASSES {
+    ctx.unique("evaluate-additional-classes", ctx.loc2pos(@1));
+    ElementPtr c(new ListElement(ctx.loc2pos(@1)));
+    ctx.stack_.back()->set("evaluate-additional-classes", c);
+    ctx.stack_.push_back(c);
+    ctx.enter(ctx.NO_KEYWORD);
+} COLON list_strings {
+    ctx.stack_.pop_back();
+    ctx.leave();
+};
+
+
 reservations_global: RESERVATIONS_GLOBAL COLON BOOLEAN {
     ctx.unique("reservations-global", ctx.loc2pos(@1));
     ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
@@ -1778,6 +1794,7 @@ shared_network_param: name
                     | reservations_out_of_pool
                     | client_class
                     | require_client_classes
+                    | evaluate_additional_classes
                     | preferred_lifetime
                     | min_preferred_lifetime
                     | max_preferred_lifetime
@@ -2143,6 +2160,7 @@ pool_param: pool_entry
           | option_data_list
           | client_class
           | require_client_classes
+          | evaluate_additional_classes
           | user_context
           | comment
           | unknown_map_entry
@@ -2280,6 +2298,7 @@ pd_pool_param: pd_prefix
              | option_data_list
              | client_class
              | require_client_classes
+             | evaluate_additional_classes
              | excluded_prefix
              | excluded_prefix_len
              | user_context
@@ -2535,6 +2554,7 @@ client_class_param: client_class_name
                   | client_class_test
                   | client_class_template_test
                   | only_if_required
+                  | only_in_additional_list
                   | option_data_list
                   | user_context
                   | comment
@@ -2567,12 +2587,19 @@ client_class_template_test: TEMPLATE_TEST {
     ctx.leave();
 };
 
+// Deprecated
 only_if_required: ONLY_IF_REQUIRED COLON BOOLEAN {
     ctx.unique("only-if-required", ctx.loc2pos(@1));
     ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
     ctx.stack_.back()->set("only-if-required", b);
 };
 
+only_in_additional_list: ONLY_IN_ADDITIONAL_LIST COLON BOOLEAN {
+    ctx.unique("only-in-additional-list", ctx.loc2pos(@1));
+    ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
+    ctx.stack_.back()->set("only-in-additional-list", b);
+};
+
 // --- end of client classes ---------------------------------
 
 // --- server-id ---------------------------------------------

diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index eb16ecea4cd5a5f4756f528423321a00a5f4a5d2..b0ec9d399af2a5790719750a305f7e8bd72b6708 100644 (file)
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -9096,4 +9096,126 @@ TEST_F(Dhcp6ParserTest, optionClientClassesDuplicateCheck) {
     EXPECT_EQ(*cclasses, "bar");
 }
 
+// This test verifies that require-client-classes gets translated
+// to evaluate-additional-classes.
+TEST_F(Dhcp6ParserTest, deprecatedRequireClientClassesCheck) {
+    std::string config = "{ " + genIfaceConfig() + ","
+        R"^(
+        "rebind-timer": 2000,
+        "renew-timer": 1000,
+        "subnet6": [{
+            "require-client-classes": [ "foo" ],
+            "pools": [{ "pool":  "2001:db8::/64" }],
+            "id": 1,
+            "subnet": "2001:db8::/64"
+        }],
+        "valid-lifetime": 400
+        })^";
+
+    ConstElementPtr json;
+    ASSERT_NO_THROW(json = parseDHCP6(config));
+    extractConfig(config);
+
+    ConstElementPtr status;
+    ASSERT_NO_THROW(status = configureDhcp6Server(srv_, json));
+    checkResult(status, 0);
+
+    Subnet6Ptr subnet = CfgMgr::instance().getStagingCfg()->
+                            getCfgSubnets6()->selectSubnet(IOAddress("2001:db8::"));
+    ASSERT_TRUE(subnet);
+
+    const auto& cclass_list = subnet->getAdditionalClasses();
+    EXPECT_EQ(1, cclass_list.size());
+    auto cclasses = cclass_list.begin();
+    EXPECT_EQ(*cclasses, "foo");
+}
+
+// This test verifies that users cannot specify both
+// require-client-classes and evaluate-addtional-classes.
+TEST_F(Dhcp6ParserTest, deprecatedRequireClientClassesCheck2) {
+    std::string config = "{ " + genIfaceConfig() + ","
+        R"^(
+        "rebind-timer": 2000,
+        "renew-timer": 1000,
+        "subnet6": [{
+            "require-client-classes": [ "foo" ],
+            "evaluate-additional-classes": [ "foo" ],
+            "pools": [{ "pool":  "2001:db8::/64" }],
+            "id": 1,
+            "subnet": "2001:db8::/64"
+        }],
+        "valid-lifetime": 400
+        })^";
+
+
+    ConstElementPtr json;
+    ASSERT_NO_THROW(json = parseDHCP6(config));
+    extractConfig(config);
+
+    ConstElementPtr status;
+    ASSERT_NO_THROW(status = configureDhcp6Server(srv_, json));
+    checkResult(status, 1, 
+                "subnet configuration failed: cannot specify both 'require-client-classes'"
+                " and 'evaluate-additional-classes'.  Use only the latter.");
+}
+
+// This test verifies that only-if-required gets translated
+// to only-in-additional-list.
+TEST_F(Dhcp6ParserTest, deprecatedOnlyIfRequiredCheck) {
+    std::string config = "{ " + genIfaceConfig() + ","
+        R"^(
+        "rebind-timer": 2000,
+        "renew-timer": 1000,
+        "client-classes": [{
+            "name": "foo",
+            "only-if-required": true
+        }],
+        "subnet6": [ ],
+        "valid-lifetime": 400
+        })^";
+
+    ConstElementPtr json;
+    ASSERT_NO_THROW(json = parseDHCP6(config));
+    extractConfig(config);
+
+    ConstElementPtr status;
+    ASSERT_NO_THROW(status = configureDhcp6Server(srv_, json));
+    checkResult(status, 0);
+
+    auto dictionary = CfgMgr::instance().getStagingCfg()->getClientClassDictionary();
+    ASSERT_TRUE(dictionary);
+    EXPECT_EQ(1, dictionary->getClasses()->size());
+
+    ClientClassDefPtr class_def = dictionary->findClass("foo");
+    ASSERT_TRUE(class_def);
+    EXPECT_TRUE(class_def->getAdditional());
+}
+
+// This test verifies that users cannot specify both
+// only-if-required and only-in-additional-list. 
+TEST_F(Dhcp6ParserTest, deprecatedOnlyIfRequiredCheck2) {
+    std::string config = "{ " + genIfaceConfig() + ","
+        R"^(
+        "rebind-timer": 2000,
+        "renew-timer": 1000,
+        "client-classes": [{
+            "name": "foo",
+            "only-if-required": true,
+            "only-in-additional-list": true
+        }],
+        "subnet6": [ ],
+        "valid-lifetime": 400
+        })^";
+
+    ConstElementPtr json;
+    ASSERT_NO_THROW(json = parseDHCP6(config));
+    extractConfig(config);
+
+    ConstElementPtr status;
+    ASSERT_NO_THROW(status = configureDhcp6Server(srv_, json));
+    checkResult(status, 1, 
+                "cannot specify both 'only-if-required' and"
+                " 'only-in-additional-list'.  Use only the latter.");
+}
+
 }  // namespace