- forward-first option. Tries without forward if a query fails.

  Also stub-first option that is similar.

git-svn-id: file:///svn/unbound/trunk@2637 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 757f709c8b9a90bbea746dad71b991d44be3c5c3..5ed38065e5bde8a651c9a5e9e2d142f35cefe83b 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+1 March 2012: Wouter
+       - forward-first option.  Tries without forward if a query fails.
+         Also stub-first option that is similar.
+
 28 February 2012: Wouter
        - Fix from code review, if EINPROGRESS not defined chain if statement
          differently.

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 2ddc3015fdf0d3f230646838287a462bb05f4170..dc7ef0fc14dde80eb9b2a157d055b4855650baa2 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -503,10 +503,12 @@ remote-control:
 # 'example.org' go to the given list of nameservers. list zero or more 
 # nameservers by hostname or by ipaddress. If you set stub-prime to yes, 
 # the list is treated as priming hints (default is no).
+# With stub-first yes, it attempts without the stub if it fails.
 # stub-zone:
 #      name: "example.com"
 #      stub-addr: 192.0.2.68
 #      stub-prime: no
+#      stub-first: no
 # stub-zone:
 #      name: "example.org"
 #      stub-host: ns.example.com.
@@ -516,10 +518,12 @@ remote-control:
 # 'example.org' go to the given list of servers. These servers have to handle
 # recursion to other nameservers. List zero or more nameservers by hostname
 # or by ipaddress. Use an entry with name "." to forward all queries.
+# If you enable forward-first, it attempts without the forward if it fails.
 # forward-zone:
 #      name: "example.com"
 #      forward-addr: 192.0.2.68
 #      forward-addr: 192.0.2.73@5355  # forward to port 5355.
+#      forward-first: no
 # forward-zone:
 #      name: "example.org"
 #      forward-host: fwd.example.com

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index dfded963f36e5f7b1d7b0ed21aed6ab08841c53c..d815deed7562a0ac169cbcfdc803ac05e8d9cfbb 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -979,6 +979,10 @@ This option is by default off.  If enabled it performs NS set priming,
 which is similar to root hints, where it starts using the list of nameservers 
 currently published by the zone.  Thus, if the hint list is slightly outdated,
 the resolver picks up a correct list online.
+.TP
+.B stub\-first: \fI<yes or no>
+If enabled, a query is attempted without the stub clause if it fails.
+The default is no.
 .SS "Forward Zone Options"
 .LP
 There may be multiple
@@ -1003,6 +1007,10 @@ Name of server to forward to. Is itself resolved before it is used.
 .B forward\-addr: \fI<IP address>
 IP address of server to forward to. Can be IP 4 or IP 6.
 To use a nondefault port for DNS communication append '@' with the port number.
+.TP
+.B forward\-first: \fI<yes or no>
+If enabled, a query is attempted without the forward clause if it fails.
+The default is no.
 .SS "Python Module Options"
 .LP
 The

diff --git a/iterator/iter_fwd.c b/iterator/iter_fwd.c
index 697b209f9578fe9c3a225cff26f6733ffe4c0198..17eaecbd2039478c177f69dcabb76ba9f8f6e77b 100644 (file)
--- a/iterator/iter_fwd.c
+++ b/iterator/iter_fwd.c
@@ -256,7 +256,10 @@ read_forwards(struct iter_forwards* fwd, struct config_file* cfg)
                        return 0;
                /* set flag that parent side NS information is included.
                 * Asking a (higher up) server on the internet is not useful */
-               dp->has_parent_side_NS = 1;
+               /* the flag is turned off for 'forward-first' so that the
+                * last resort will ask for parent-side NS record and thus
+                * fallback to the internet name servers on a failure */
+               dp->has_parent_side_NS = !s->isfirst;
                if(!forwards_insert(fwd, LDNS_RR_CLASS_IN, dp))
                        return 0;
                verbose(VERB_QUERY, "Forward zone server list:");

diff --git a/iterator/iter_hints.c b/iterator/iter_hints.c
index 0e1034b62a87f53b0f89fbcfe3441fa6993334c7..577ae50b4f8db53fc3c6530b36d32ded8a6956aa 100644 (file)
--- a/iterator/iter_hints.c
+++ b/iterator/iter_hints.c
@@ -257,7 +257,7 @@ read_stubs(struct iter_hints* hints, struct config_file* cfg)
                        !read_stubs_host(s, dp) ||
                        !read_stubs_addr(s, dp))
                        return 0;
-               dp->has_parent_side_NS = 1;
+               dp->has_parent_side_NS = !s->isfirst;
                if(!hints_insert(hints, LDNS_RR_CLASS_IN, dp, !s->isprime))
                        return 0;
                delegpt_log(VERB_QUERY, dp);

diff --git a/iterator/iterator.c b/iterator/iterator.c
index a9dd03016b186805b55faac7b48295b3f24c602e..b32b738a19bc703e588a9f0c210b0b085c4142f6 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -589,7 +589,8 @@ prime_root(struct module_qstate* qstate, struct iter_qstate* iq, int id,
  * @param qstate: the qtstate that triggered the need to prime.
  * @param iq: iterator query state.
  * @param id: module id.
- * @param q: request name.
+ * @param qname: request name.
+ * @param qclass: request class.
  * @return true if a priming subrequest was made, false if not. The will only
  *         issue a priming request if it detects an unprimed stub.
  *         Uses value of 2 to signal during stub-prime in root-prime situation
@@ -597,22 +598,16 @@ prime_root(struct module_qstate* qstate, struct iter_qstate* iq, int id,
  */
 static int
 prime_stub(struct module_qstate* qstate, struct iter_qstate* iq, int id,
-       struct query_info* q)
+       uint8_t* qname, uint16_t qclass)
 {
        /* Lookup the stub hint. This will return null if the stub doesn't 
         * need to be re-primed. */
        struct iter_hints_stub* stub;
        struct delegpt* stub_dp;
        struct module_qstate* subq;
-       uint8_t* delname = q->qname;
-       size_t delnamelen = q->qname_len;
 
-       if(q->qtype == LDNS_RR_TYPE_DS && !dname_is_root(q->qname))
-               /* remove first label, but not for root */
-               dname_remove_label(&delname, &delnamelen);
-
-       stub = hints_lookup_stub(qstate->env->hints, delname, q->qclass,
-               iq->dp);
+       if(!qname) return 0;
+       stub = hints_lookup_stub(qstate->env->hints, qname, qclass, iq->dp);
        /* The stub (if there is one) does not need priming. */
        if(!stub)
                return 0;
@@ -631,18 +626,18 @@ prime_stub(struct module_qstate* qstate, struct iter_qstate* iq, int id,
                        return 1; /* return 1 to make module stop, with error */
                }
                log_nametypeclass(VERB_DETAIL, "use stub", stub_dp->name, 
-                       LDNS_RR_TYPE_NS, q->qclass);
+                       LDNS_RR_TYPE_NS, qclass);
                return r;
        }
 
        /* Otherwise, we need to (re)prime the stub. */
        log_nametypeclass(VERB_DETAIL, "priming stub", stub_dp->name, 
-               LDNS_RR_TYPE_NS, q->qclass);
+               LDNS_RR_TYPE_NS, qclass);
 
        /* Stub priming events start at the QUERYTARGETS state to avoid the
         * redundant INIT state processing. */
        if(!generate_sub_request(stub_dp->name, stub_dp->namelen, 
-               LDNS_RR_TYPE_NS, q->qclass, qstate, id, iq,
+               LDNS_RR_TYPE_NS, qclass, qstate, id, iq,
                QUERYTARGETS_STATE, PRIME_RESP_STATE, &subq, 0)) {
                verbose(VERB_ALGO, "could not prime stub");
                (void)error_response(qstate, id, LDNS_RCODE_SERVFAIL);
@@ -848,8 +843,12 @@ forward_request(struct module_qstate* qstate, struct iter_qstate* iq)
        struct delegpt* dp;
        uint8_t* delname = iq->qchase.qname;
        size_t delnamelen = iq->qchase.qname_len;
+       if(iq->refetch_glue) {
+               delname = iq->dp->name;
+               delnamelen = iq->dp->namelen;
+       }
        /* strip one label off of DS query to lookup higher for it */
-       if(iq->qchase.qtype == LDNS_RR_TYPE_DS 
+       if( (iq->qchase.qtype == LDNS_RR_TYPE_DS || iq->refetch_glue)
                && !dname_is_root(iq->qchase.qname))
                dname_remove_label(&delname, &delnamelen);
        dp = forwards_lookup(qstate->env->fwds, delname, iq->qchase.qclass);
@@ -1030,7 +1029,6 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
                        qstate->prefetch_leeway)))
                        delname = NULL; /* go to root priming */
                else    dname_remove_label(&delname, &delnamelen);
-               iq->refetch_glue = 0; /* if CNAME causes restart, no refetch */
        }
        /* delname is the name to lookup a delegation for. If NULL rootprime */
        while(1) {
@@ -1048,7 +1046,8 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
                 * root priming situation. */
                if(iq->dp == NULL) {
                        /* if there is a stub, then no root prime needed */
-                       int r = prime_stub(qstate, iq, id, &iq->qchase);
+                       int r = prime_stub(qstate, iq, id, delname,
+                               iq->qchase.qclass);
                        if(r == 2)
                                break; /* got noprime-stub-zone, continue */
                        else if(r)
@@ -1158,11 +1157,29 @@ static int
 processInitRequest2(struct module_qstate* qstate, struct iter_qstate* iq,
        int id)
 {
+       uint8_t* delname;
+       size_t delnamelen;
        log_query_info(VERB_QUERY, "resolving (init part 2): ", 
                &qstate->qinfo);
 
+       if(iq->refetch_glue) {
+               if(!iq->dp) {
+                       log_err("internal or malloc fail: no dp for refetch");
+                       return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+               }
+               delname = iq->dp->name;
+               delnamelen = iq->dp->namelen;
+       } else {
+               delname = iq->qchase.qname;
+               delnamelen = iq->qchase.qname_len;
+       }
+       if(iq->qchase.qtype == LDNS_RR_TYPE_DS || iq->refetch_glue) {
+               if(!dname_is_root(delname))
+                       dname_remove_label(&delname, &delnamelen);
+               iq->refetch_glue = 0; /* if CNAME causes restart, no refetch */
+       }
        /* Check to see if we need to prime a stub zone. */
-       if(prime_stub(qstate, iq, id, &iq->qchase)) {
+       if(prime_stub(qstate, iq, id, delname, iq->qchase.qclass)) {
                /* A priming sub request was made */
                return 0;
        }

diff --git a/testdata/iter_fwdfirst.rpl b/testdata/iter_fwdfirst.rpl
new file mode 100644 (file)
index 0000000..5154bab
--- /dev/null
+++ b/testdata/iter_fwdfirst.rpl
@@ -0,0 +1,157 @@
+; config options
+server:
+       target-fetch-policy: "0 0 0 0 0"
+
+stub-zone:
+       name: "."
+       stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.
+
+forward-zone:
+       name: "example.com"
+       forward-addr: 1.2.3.6           # failing resolver
+       forward-first: yes
+
+CONFIG_END
+
+SCENARIO_BEGIN Test forward-first directive
+
+; K.ROOT-SERVERS.NET.
+RANGE_BEGIN 0 100
+       ADDRESS 193.0.14.129 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+. IN NS
+SECTION ANSWER
+. IN NS        K.ROOT-SERVERS.NET.
+SECTION ADDITIONAL
+K.ROOT-SERVERS.NET.    IN      A       193.0.14.129
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode subdomain
+ADJUST copy_id copy_query
+REPLY QR NOERROR
+SECTION QUESTION
+com. IN A
+SECTION AUTHORITY
+com.   IN NS   a.gtld-servers.net.
+SECTION ADDITIONAL
+a.gtld-servers.net.    IN      A       192.5.6.30
+ENTRY_END
+RANGE_END
+
+; a.gtld-servers.net.
+RANGE_BEGIN 0 100
+       ADDRESS 192.5.6.30
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+com. IN NS
+SECTION ANSWER
+com.   IN NS   a.gtld-servers.net.
+SECTION ADDITIONAL
+a.gtld-servers.net.    IN      A       192.5.6.30
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode subdomain
+ADJUST copy_id copy_query
+REPLY QR NOERROR
+SECTION QUESTION
+example.com. IN A
+SECTION AUTHORITY
+example.com.   IN NS   ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.                IN      A       1.2.3.4
+ENTRY_END
+RANGE_END
+
+; ns.example.com.
+RANGE_BEGIN 0 100
+       ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+example.com. IN NS
+SECTION ANSWER
+example.com.   IN NS   ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.                IN      A       1.2.3.4
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. IN A  10.20.30.40
+SECTION AUTHORITY
+example.com.   IN NS   ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.                IN      A       1.2.3.4
+ENTRY_END
+RANGE_END
+
+; local resolver (that fails a lot)
+RANGE_BEGIN 0 100
+       ADDRESS 1.2.3.6
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR RA SERVFAIL
+SECTION QUESTION
+example.com. IN NS
+SECTION ANSWER
+;example.com.  IN NS   ns.example.com.
+SECTION ADDITIONAL
+;ns.example.com.               IN      A       1.2.3.4
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR RA SERVFAIL
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+;www.example.com. IN A 10.20.30.50
+SECTION AUTHORITY
+;example.com.  IN NS   ns.example.com.
+SECTION ADDITIONAL
+;ns.example.com.               IN      A       1.2.3.4
+ENTRY_END
+RANGE_END
+
+STEP 1 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+www.example.com. IN A
+ENTRY_END
+
+; recursion happens here.
+STEP 10 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. IN A  10.20.30.40
+SECTION AUTHORITY
+example.com.   IN NS   ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.                IN      A       1.2.3.4
+ENTRY_END
+
+SCENARIO_END

diff --git a/testdata/iter_stubfirst.rpl b/testdata/iter_stubfirst.rpl
new file mode 100644 (file)
index 0000000..6245a4f
--- /dev/null
+++ b/testdata/iter_stubfirst.rpl
@@ -0,0 +1,157 @@
+; config options
+server:
+       target-fetch-policy: "0 0 0 0 0"
+
+stub-zone:
+       name: "."
+       stub-addr: 193.0.14.129         # K.ROOT-SERVERS.NET.
+
+stub-zone:
+       name: "example.com"
+       stub-addr: 1.2.3.6              # failing server
+       stub-first: yes
+
+CONFIG_END
+
+SCENARIO_BEGIN Test stub-first directive
+
+; K.ROOT-SERVERS.NET.
+RANGE_BEGIN 0 100
+       ADDRESS 193.0.14.129 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+. IN NS
+SECTION ANSWER
+. IN NS        K.ROOT-SERVERS.NET.
+SECTION ADDITIONAL
+K.ROOT-SERVERS.NET.    IN      A       193.0.14.129
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode subdomain
+ADJUST copy_id copy_query
+REPLY QR NOERROR
+SECTION QUESTION
+com. IN A
+SECTION AUTHORITY
+com.   IN NS   a.gtld-servers.net.
+SECTION ADDITIONAL
+a.gtld-servers.net.    IN      A       192.5.6.30
+ENTRY_END
+RANGE_END
+
+; a.gtld-servers.net.
+RANGE_BEGIN 0 100
+       ADDRESS 192.5.6.30
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+com. IN NS
+SECTION ANSWER
+com.   IN NS   a.gtld-servers.net.
+SECTION ADDITIONAL
+a.gtld-servers.net.    IN      A       192.5.6.30
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode subdomain
+ADJUST copy_id copy_query
+REPLY QR NOERROR
+SECTION QUESTION
+example.com. IN A
+SECTION AUTHORITY
+example.com.   IN NS   ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.                IN      A       1.2.3.4
+ENTRY_END
+RANGE_END
+
+; ns.example.com.
+RANGE_BEGIN 0 100
+       ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+example.com. IN NS
+SECTION ANSWER
+example.com.   IN NS   ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.                IN      A       1.2.3.4
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. IN A  10.20.30.40
+SECTION AUTHORITY
+example.com.   IN NS   ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.                IN      A       1.2.3.4
+ENTRY_END
+RANGE_END
+
+; local authority (that fails a lot)
+RANGE_BEGIN 0 100
+       ADDRESS 1.2.3.6
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA SERVFAIL
+SECTION QUESTION
+example.com. IN NS
+SECTION ANSWER
+;example.com.  IN NS   ns.example.com.
+SECTION ADDITIONAL
+;ns.example.com.               IN      A       1.2.3.4
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA SERVFAIL
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+;www.example.com. IN A 10.20.30.50
+SECTION AUTHORITY
+;example.com.  IN NS   ns.example.com.
+SECTION ADDITIONAL
+;ns.example.com.               IN      A       1.2.3.4
+ENTRY_END
+RANGE_END
+
+STEP 1 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+www.example.com. IN A
+ENTRY_END
+
+; recursion happens here.
+STEP 10 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. IN A  10.20.30.40
+SECTION AUTHORITY
+example.com.   IN NS   ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.                IN      A       1.2.3.4
+ENTRY_END
+
+SCENARIO_END

diff --git a/util/config_file.c b/util/config_file.c
index 8108cd9467c01276467d7b64bdc203204dba7e60..19de9becb4e8653ad3520847ec49739a486ae2c8 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -423,6 +423,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
                /* unknown or unsupported (from the set_option interface):
                 * interface, outgoing-interface, access-control, 
                 * stub-zone, name, stub-addr, stub-host, stub-prime
+                * forward-first, stub-first,
                 * forward-zone, name, forward-addr, forward-host */
                return 0;
        }

diff --git a/util/config_file.h b/util/config_file.h
index be53244466df8463d5609365e8bf212db759a591..474b6e4b8a6e4f9fe824fab0d0ab48a7eb37c455 100644 (file)
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -306,6 +306,8 @@ struct config_stub {
        struct config_strlist* addrs;
        /** if stub-prime is set */
        int isprime;
+       /** if forward-first is set (failover to without if fails) */
+       int isfirst;
 };
 
 /**

diff --git a/util/configlexer.c b/util/configlexer.c
index bd4488b67a1e1c566e06c981f3bd7c06f1d9afae..9c490c0f5f9a1f0f30e1ffbe15c16e400fe12ca1 100644 (file)
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -362,8 +362,8 @@ static void yy_fatal_error (yyconst char msg[]  );
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 138
-#define YY_END_OF_BUFFER 139
+#define YY_NUM_RULES 140
+#define YY_END_OF_BUFFER 141
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -371,152 +371,153 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_accept[1303] =
+static yyconst flex_int16_t yy_accept[1315] =
     {   0,
-        1,    1,  120,  120,  124,  124,  128,  128,  132,  132,
-        1,    1,  139,  136,    1,  118,  118,  137,    2,  137,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  120,
-      121,  121,  122,  137,  124,  125,  125,  126,  137,  131,
-      128,  129,  129,  130,  137,  132,  133,  133,  134,  137,
-      135,  119,    2,  123,  137,  135,  136,    0,    1,    2,
-        2,    2,    2,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  120,    0,
-      124,    0,  131,    0,  128,  132,    0,  135,    0,    2,
-        2,  135,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  135,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  135,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,   62,  136,  136,  136,  136,  136,    6,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      135,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  135,  136,
-
-      136,  136,  136,   27,  136,  136,  136,  136,  136,   12,
-       13,  136,   15,   14,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  116,  136,
-      136,  136,  136,    3,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  135,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-
-      136,  136,  136,  136,  136,  136,  136,  127,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-       30,  136,  136,  136,  136,  136,  136,  136,   31,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,   75,  127,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,   74,  136,  136,  136,  136,  136,
-
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,   60,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,   20,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,   28,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,   29,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,   22,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,   25,   26,  136,  136,  136,   63,   64,
-      136,   61,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,    5,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,   77,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  102,  101,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,   32,  136,  136,  136,  136,
-
-      136,  136,   65,  136,  136,  136,  136,  136,  136,   98,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,   51,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  100,  136,  136,  136,
-      136,  136,  136,  136,    4,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,   95,  136,  136,  136,  136,
-
-      136,  136,  136,  110,   96,  136,   21,  136,  136,  136,
-      136,   67,   68,   66,  136,  136,  136,  136,  136,  136,
-       73,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-       97,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,   59,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,   17,  136,  136,  136,   16,
-      136,   82,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,   39,   40,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,   72,  136,  136,  136,  136,  136,  136,  136,  136,
-
-      136,  136,  136,  136,  136,   76,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  115,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,   86,  136,   90,  136,  136,  136,  136,   71,
-      136,  136,  108,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,   89,  136,  136,  136,
-      136,   41,   42,  136,   47,   91,  136,  103,   99,  136,
-       35,  136,   93,  136,  136,  136,  136,  136,    7,  136,
-       58,  107,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-
-      136,  136,  136,  136,  136,   78,  136,  136,  117,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,   92,   34,   36,  136,  136,  136,  136,  136,   57,
-      136,  136,  136,  111,   18,   19,  136,  136,  136,  136,
-      136,  136,   55,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  113,  136,  136,   33,  136,  136,  136,  136,
-      136,  136,   11,  136,  136,  136,  136,  136,  136,   10,
-      136,  136,   37,  136,  112,  136,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,   85,   84,  136,  114,  109,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-
-       43,  136,  136,  136,  136,  136,   38,  136,  136,  136,
-       79,   81,  136,  136,  136,   83,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-       23,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-      136,  136,  136,  106,  136,  136,  136,  136,  136,  136,
-      136,   24,  136,    9,  136,  136,  104,   48,  136,  136,
-      136,   88,  136,   69,  136,  136,  136,   50,   54,   49,
-      136,   44,  136,    8,  136,  136,   87,  136,  136,  136,
-       53,  136,   45,  136,  105,  136,  136,   80,   70,   52,
-       46,  136,  136,  136,  136,   56,  136,  136,  136,  136,
-
-       94,    0
+        1,    1,  122,  122,  126,  126,  130,  130,  134,  134,
+        1,    1,  141,  138,    1,  120,  120,  139,    2,  139,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  122,
+      123,  123,  124,  139,  126,  127,  127,  128,  139,  133,
+      130,  131,  131,  132,  139,  134,  135,  135,  136,  139,
+      137,  121,    2,  125,  139,  137,  138,    0,    1,    2,
+        2,    2,    2,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  122,    0,
+      126,    0,  133,    0,  130,  134,    0,  137,    0,    2,
+        2,  137,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  137,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  137,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,   62,  138,  138,  138,  138,  138,    6,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      137,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  137,
+
+      138,  138,  138,  138,   27,  138,  138,  138,  138,  138,
+       12,   13,  138,   15,   14,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  118,
+      138,  138,  138,  138,    3,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  137,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  129,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,   30,  138,  138,  138,  138,  138,  138,  138,
+       31,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,   77,  129,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,   76,  138,
+
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+       60,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,   20,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,   28,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,   29,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,   22,  138,  138,  138,  138,  138,  138,  138,
+
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,   25,
+       26,  138,  138,  138,   63,  138,   64,  138,   61,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,    5,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,   79,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  104,  103,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+
+      138,  138,  138,   32,  138,  138,  138,  138,  138,  138,
+       66,   65,  138,  138,  138,  138,  138,  138,  100,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,   51,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  102,  138,  138,  138,
+      138,  138,  138,  138,    4,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+
+      138,  138,  138,  138,  138,   97,  138,  138,  138,  138,
+      138,  138,  138,  112,   98,  138,   21,  138,  138,  138,
+      138,   68,  138,   69,   67,  138,  138,  138,  138,  138,
+      138,   75,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,   99,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,   59,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,   17,  138,  138,  138,
+       16,  138,   84,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,   39,   40,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,   70,  138,  138,
+
+      138,  138,  138,   74,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,   78,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  117,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,   88,  138,   92,  138,  138,  138,
+      138,   73,  138,  138,  110,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,   91,  138,
+      138,  138,  138,   41,   42,  138,   47,   93,  138,  105,
+      101,  138,   35,  138,   95,  138,  138,  138,  138,  138,
+        7,  138,   58,  109,  138,  138,  138,  138,  138,  138,
+
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,   80,  138,  138,
+      119,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,   94,   34,   36,  138,  138,  138,  138,
+      138,   57,  138,  138,  138,  113,   18,   19,  138,  138,
+      138,  138,  138,  138,   55,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  115,  138,  138,   33,  138,  138,
+      138,  138,  138,  138,   11,  138,  138,  138,  138,  138,
+      138,   10,  138,  138,   37,  138,  114,  138,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,   87,   86,  138,
+
+      116,  111,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,   43,  138,  138,  138,  138,  138,   38,  138,
+      138,  138,   81,   83,  138,  138,  138,   85,  138,  138,
+      138,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,   23,  138,  138,  138,  138,  138,  138,  138,
+      138,  138,  138,  138,  138,  108,  138,  138,  138,  138,
+      138,  138,  138,   24,  138,    9,  138,  138,  106,   48,
+      138,  138,  138,   90,  138,   71,  138,  138,  138,   50,
+       54,   49,  138,   44,  138,    8,  138,  138,   89,  138,
+      138,  138,   53,  138,   45,  138,  107,  138,  138,   82,
+
+       72,   52,   46,  138,  138,  138,  138,   56,  138,  138,
+      138,  138,   96,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -559,22 +560,22 @@ static yyconst flex_int32_t yy_meta[40] =
         1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[1317] =
+static yyconst flex_int16_t yy_base[1329] =
     {   0,
         0,    0,   37,   40,   44,   51,   63,   75,   56,   68,
-       87,  108, 2502, 2488,   50, 2605, 2605, 2605,  129,   94,
+       87,  108, 2523, 2509,   50, 2623, 2623, 2623,  129,   94,
        70,  104,  122,   90,   92,  115,  126,   95,   84,  132,
-      135,  138,   50,  142,  148,  156,  169,  164,  144, 2487,
-     2605, 2605, 2605,   70, 2486, 2605, 2605, 2605,   42, 2458,
-     2079, 2605, 2605, 2605,  188, 1633, 2605, 2605, 2605,  182,
-     1481, 2605,  197, 2605,  201,  111, 1314,  207,  120,    0,
+      135,  138,   50,  142,  148,  156,  169,  164,  144, 2508,
+     2623, 2623, 2623,   70, 2507, 2623, 2623, 2623,   42, 2506,
+     2516, 2623, 2623, 2623,  188, 2504, 2623, 2623, 2623,  182,
+     2436, 2623,  197, 2623,  201,  111, 2269,  207,  120,    0,
       218,    0,    0,  103,  158,  165,  152,  184,  194,  203,
       204,  146,  216,  200,  205,  213,  219,  220,  136,  221,
       227,  223,  234,  238,  228,  236,  240,  244,  248,  226,
 
       250,  249,  255,  252,  256,  258,  257,  262,  268,  265,
-      270,  266,  274,  275,   49,  278,  281,  279, 1053,  294,
-      804,  298,  772,  309,  744,  397,  296,  357,  313,  317,
+      270,  266,  274,  275,   49,  278,  281,  279, 2196,  294,
+      939,  298,  804,  309,  783,  397,  296,  357,  313,  317,
         0,  310,  294,  319,  312,  315,  316,  318,  325,  321,
       329,  339,  332,  322,  330,  328,  336,  337,  344,  334,
       350,  345,  347,  346,  354,  361,  367,  369,  355,  377,
@@ -591,273 +592,275 @@ static yyconst flex_int16_t yy_base[1317] =
       561,  558,  566,  567,  568,  571,  584,  593,  580,  583,
       586,  573,  483,  592,  594,  595,  597,  598,  603,  601,
       604,  615,  611,  616,  614,  622,  625,  618,  624,  626,
-      629,  628,  630, 2605,  635,  632,  637,  641,  640, 2605,
+      629,  628,  630, 2623,  635,  632,  637,  641,  640, 2623,
       642,  643,  644,  646,  647,  659,  648,  656,  657,  660,
 
-      664,  665,  667,  671,  668,  673,  685,  674,  676,  670,
-      682,  684,  691,  692,  693,  696,  700,  701,  698,  704,
-      702,  713,  709,  711,  714,  716,  720,  722,  723,  725,
-      724,  731,  736,  744,  741,  743,  750,  726,  746,  748,
+      664,  665,  667,  687,  670,  668,  677,  671,  673,  676,
+      679,  683,  685,  689,  692,  694,  700,  699,  696,  702,
+      706,  712,  709,  714,  718,  720,  722,  723,  724,  725,
+      727,  730,  737,  738,  742,  744,  750,  726,  746,  748,
       754,  753,  755,  756,  763,  759,  761,  762,  766,  773,
       769,  777,  779,  781,  771,  782,  790,  788,  789,  793,
       795,  791,  797,  798,  799,  801,  813,  815,  807,  814,
-      823,  819,  824,  820,  825,  827,  828,  829,  830,  831,
-      832,  839,  835,  836,  840,  850,  841,  842,  851,  852,
-      853,  856,  860,  862,  866,  868,  869,  871,  872,  870,
-
-      876,  874,  881, 2605,  888,  887,  879,  886,  889, 2605,
-     2605,  892, 2605, 2605,  893,  899,  896,  903,  910,  901,
-      907,  908,  913,  919,  920,  923,  911,  930,  932,  921,
-      915,  936,  937,  939,  940,  942,  946,  948,  943,  952,
-      953,  950,  957,  956,  965,  959,  971,  955, 2605,  969,
-      970,  975,  977, 2605,  973,  978,  981,  982,  983,  986,
-      985,  979,  987,  991, 1000,  990,  993,  997, 1008, 1002,
-     1011, 1009, 1013, 1015, 1022, 1024, 1018, 1019, 1025, 1026,
-     1029, 1031, 1033, 1035, 1037, 1038, 1040, 1063, 1041, 1042,
-     1043, 1047, 1044, 1050, 1049, 1057, 1069, 1071, 1059, 1075,
-
-     1080, 1078, 1082, 1084, 1085, 1089, 1092, 2605, 1091, 1094,
-     1093, 1100, 1101, 1051, 1099, 1102, 1103, 1105, 1108, 1114,
-     2605, 1110, 1111, 1115, 1121, 1122, 1127, 1129, 2605, 1135,
-     1132, 1137, 1138, 1139, 1141, 1142, 1143, 1145, 1146, 1150,
-     1154, 1155, 1157, 1156, 1158, 1162, 1161, 1164, 1165, 1167,
-     1168, 1176, 1177, 1180, 1182, 1184, 1185, 1186, 1191, 1188,
-     1192, 1189, 1190, 2605,  181, 1193, 1194, 1196, 1202, 1205,
-     1212, 1204, 1210, 1214, 1211, 1213, 1221, 1222, 1223, 1225,
-     1227, 1229, 1231, 1233, 1236, 1238, 1235, 1239, 1241, 1242,
-     1243, 1244, 1245, 1248, 2605, 1261, 1252, 1255, 1254, 1264,
-
-     1272, 1268, 1270, 1278, 1275, 1277, 1280, 1283, 1286, 1287,
-     1293, 1294, 1290, 1292, 1297, 1291, 2605, 1299, 1301, 1304,
-     1298, 1307, 1309, 1310, 1308, 1319, 1321, 2605, 1324, 1325,
-     1323, 1332, 1335, 1336, 1338, 1329, 1339, 1340, 1345, 1343,
-     1346, 1347, 2605, 1356, 1358, 1355, 1362, 1359, 1363, 1364,
-     1366, 1367, 1369, 1376, 1370, 1373, 1377, 1378, 1374, 1372,
-     1380, 1381, 2605, 1389, 1383, 1385, 1386, 1396, 1399, 1401,
-     1402, 1406, 1400, 1407, 1408, 1410, 1411, 1412, 1418, 1422,
-     1423, 1424, 1428, 1436, 1439, 1440, 2605, 1438, 1432, 1425,
-     1452, 1449, 1435, 1442, 1450, 1458, 1455, 1457, 1459, 1460,
-
-     1463, 1462, 1465, 1466, 1464, 1468, 1471, 1473, 1470, 1486,
-     1487, 1475, 1493, 2605, 2605, 1489, 1496, 1503, 2605, 2605,
-     1500, 2605, 1501, 1505, 1502, 1491, 1507, 1508, 1510, 1511,
-     1513, 1515, 1518, 1520, 1519, 1521, 2605, 1522, 1525, 1527,
-     1530, 1532, 1533, 1534, 1541, 1547, 1535, 1543, 1545, 2605,
-     1544, 1548, 1556, 1563, 1560, 1554, 1562, 1564, 1565, 1566,
-     1568, 1570, 1574, 1576, 1577, 1579, 1578, 1581, 1585, 1583,
-     1584, 1586, 1587, 1591, 1599, 1589, 2605, 2605, 1601, 1606,
-     1610, 1595, 1612, 1613, 1620, 1617, 1618, 1623, 1625, 1626,
-     1627, 1628, 1629, 1631, 1632, 2605, 1639, 1642, 1635, 1649,
-
-     1645, 1648, 2605, 1653, 1654, 1655, 1656, 1660, 1659, 2605,
-     1662, 1664, 1665, 1666, 1669, 1663, 1678, 1679, 1681, 1683,
-     1684, 1686, 1690, 1687, 1688, 1689, 1692, 1703, 1700, 1705,
-     1712, 1693, 1708, 1710, 1716, 1718, 1720, 1726, 1722, 2605,
-     1728, 1711, 1736, 1713, 1733, 1734, 1742, 1739, 1724, 1740,
-     1741, 1743, 1746, 1747, 1748, 1750, 2605, 1754, 1752, 1756,
-     1755, 1766, 1757, 1762, 2605, 1769, 1776, 1768, 1772, 1785,
-     1775, 1777, 1782, 1789, 1787, 1790, 1791, 1792, 1794, 1795,
-     1797, 1810, 1799, 1814, 1812, 1815, 1822, 1818, 1819, 1820,
-     1801, 1829, 1821, 1833, 1825, 2605, 1831, 1836, 1839, 1840,
-
-     1842, 1844, 1845, 2605, 2605, 1841, 2605, 1848, 1851, 1852,
-     1855, 2605, 2605, 2605, 1856, 1862, 1858, 1865, 1871, 1868,
-     2605, 1872, 1863, 1876, 1859, 1874, 1878, 1881, 1882, 1884,
-     2605, 1887, 1889, 1885, 1896, 1895, 1888, 1901, 1898, 1902,
-     1908, 1899, 1909, 1915, 1911, 2605, 1912, 1918, 1920, 1921,
-     1925, 1926, 1924, 1922, 1923, 2605, 1930, 1938, 1939, 2605,
-     1940, 2605, 1941, 1942, 1944, 1949, 1945, 1951, 1952, 1956,
-     1957, 1959, 1964, 1961, 2605, 2605, 1965, 1976, 1977, 1968,
-     1979, 1966, 1973, 1981, 1982, 1983, 1985, 1987, 1989, 1991,
-     1990, 2605, 1993, 1994, 1999, 2000, 1995, 2005, 2015, 2007,
-
-     2017, 2019, 2021, 2023, 2025, 2605, 2026, 2028, 2029, 2033,
-     2034, 2030, 1998, 2037, 2042, 2035, 2044, 2605, 2046, 2039,
-     2049, 2047, 2051, 2055, 2057, 2058, 2061, 2060, 2062, 2063,
-     2069, 2073, 2605, 2067, 2605, 2074, 2081, 2089, 2085, 2605,
-     2076, 2078, 2605, 2092, 2088, 2097, 2098, 2100, 2105, 2101,
-     2099, 2107, 2108, 2109, 2115, 2112, 2605, 2113, 2116, 2117,
-     2120, 2605, 2605, 2123, 2605, 2605, 2127, 2605, 2605, 2131,
-     2605, 2133, 2605, 2139, 2135, 2137, 2138, 2140, 2605, 2142,
-     2605, 2605, 2143, 2144, 2147, 2150, 2155, 2157, 2151, 2158,
-     2159, 2161, 2162, 2164, 2166, 2168, 2167, 2169, 2170, 2172,
-
-     2178, 2179, 2175, 2181, 2188, 2605, 2182, 2190, 2605, 2195,
-     2198, 2199, 2185, 2201, 2202, 2204, 2206, 2213, 2209, 2210,
-     2211, 2605, 2605, 2605, 2212, 2217, 2216, 2221, 2222, 2605,
-     2226, 2227, 2234, 2605, 2605, 2605, 2237, 2228, 2230, 2242,
-     2243, 2241, 2605, 2244, 2251, 2252, 2245, 2254, 2262, 2263,
-     2265, 2267, 2605, 2268, 2269, 2605, 2271, 2270, 2275, 2276,
-     2277, 2279, 2605, 2272, 2280, 2287, 2289, 2282, 2292, 2605,
-     2293, 2294, 2605, 2296, 2605, 2235, 2300, 2303, 2305, 2309,
-     2310, 2311, 2317, 2314, 2315, 2605, 2605, 2316, 2605, 2605,
-     2318, 2321, 2320, 2323, 2326, 2327, 2330, 2331, 2334, 2333,
-
-     2605, 2335, 2336, 2341, 2344, 2346, 2605, 2347, 2349, 2345,
-     2605, 2605, 2358, 2351, 2359, 2605, 2360, 2362, 2364, 2366,
-     2373, 2367, 2369, 2374, 2378, 2375, 2377, 2379, 2388, 2384,
-     2605, 2391, 2382, 2392, 2395, 2397, 2399, 2400, 2401, 2405,
-     2407, 2409, 2406, 2605, 2410, 2411, 2423, 2427, 2429, 2415,
-     2431, 2605, 2432, 2605, 2435, 2436, 2605, 2605, 2437, 2439,
-     2442, 2605, 2443, 2605, 2440, 2450, 2413, 2605, 2605, 2605,
-     2452, 2605, 2453, 2605, 2455, 2444, 2605, 2446, 2462, 2466,
-     2605, 2468, 2605, 2470, 2605, 2463, 2471, 2605, 2605, 2605,
-     2605, 2473, 2456, 2479, 2474, 2605, 2480, 2482, 2481, 2485,
-
-     2605, 2605, 2513, 2520, 2527, 2534, 2541,   94, 2548, 2555,
-     2562, 2569, 2576, 2583, 2590, 2597
+      823,  819,  824,  820,  825,  827,  828,  829,  830,  832,
+      831,  835,  841,  834,  844,  851,  837,  840,  852,  854,
+      857,  858,  859,  860,  868,  861,  862,  872,  870,  875,
+
+      874,  878,  876,  885, 2623,  888,  887,  889,  890,  893,
+     2623, 2623,  892, 2623, 2623,  895,  896,  899,  905,  910,
+      901,  913,  911,  915,  920,  916,  924,  926,  932,  927,
+      934,  921,  935,  937,  942,  944,  945,  947,  948,  949,
+      952,  953,  956,  958,  959,  965,  967,  973,  969, 2623,
+      976,  970,  971,  978, 2623,  977,  980,  982,  983,  986,
+      985,  987,  990,  992,  995,  993,  997,  996,  999, 1014,
+     1015, 1010, 1000, 1017, 1018, 1020, 1028, 1024, 1025, 1031,
+     1035, 1026, 1033, 1037, 1034, 1038, 1040, 1041, 1047, 1066,
+     1048, 1045, 1053, 1050, 1051, 1060, 1056, 1063, 1078, 1076,
+
+     1073, 1055, 1088, 1080, 1083, 1092, 1090, 1094, 1095, 2623,
+     1101, 1054, 1097, 1098, 1100, 1103, 1102, 1108, 1107, 1110,
+     1114, 1120, 2623, 1117, 1125, 1126, 1128, 1129, 1118, 1139,
+     2623, 1141, 1142, 1144, 1122, 1135, 1145, 1149, 1151, 1152,
+     1153, 1161, 1157, 1150, 1162, 1163, 1164, 1167, 1169, 1170,
+     1171, 1172, 1174, 1173, 1185, 1191, 1178, 1189, 1179, 1192,
+     1195, 1200, 1194, 1199, 1197, 1201, 2623,  181, 1203, 1204,
+     1202, 1210, 1214, 1213, 1211, 1215, 1223, 1220, 1221, 1231,
+     1224, 1232, 1233, 1227, 1234, 1237, 1240, 1243, 1245, 1247,
+     1249, 1248, 1250, 1251, 1253, 1255, 1254, 1257, 2623, 1263,
+
+     1264, 1265, 1268, 1272, 1280, 1276, 1281, 1287, 1283, 1286,
+     1292, 1293, 1285, 1295, 1301, 1303, 1300, 1302, 1307, 1304,
+     2623, 1308, 1309, 1310, 1317, 1311, 1314, 1318, 1319, 1327,
+     1333, 2623, 1334, 1335, 1320, 1342, 1329, 1346, 1338, 1348,
+     1350, 1351, 1352, 1353, 1354, 1355, 1357, 2623, 1367, 1368,
+     1366, 1374, 1373, 1359, 1365, 1380, 1375, 1377, 1386, 1383,
+     1384, 1387, 1388, 1390, 1391, 1393, 1385, 2623, 1397, 1394,
+     1399, 1401, 1407, 1398, 1409, 1412, 1402, 1414, 1419, 1422,
+     1424, 1426, 1427, 1431, 1435, 1423, 1436, 1437, 1440, 1448,
+     1451, 1452, 2623, 1450, 1447, 1454, 1464, 1457, 1460, 1462,
+
+     1465, 1472, 1466, 1468, 1469, 1470, 1476, 1474, 1477, 1482,
+     1475, 1493, 1478, 1494, 1484, 1499, 1496, 1486, 1505, 2623,
+     2623, 1502, 1508, 1515, 2623, 1512, 2623, 1514, 2623, 1516,
+     1517, 1520, 1521, 1522, 1523, 1525, 1528, 1529, 1531, 1526,
+     1532, 1533, 1534, 2623, 1540, 1541, 1542, 1544, 1545, 1547,
+     1549, 1554, 1561, 1550, 1557, 1560, 2623, 1563, 1562, 1569,
+     1578, 1574, 1576, 1577, 1579, 1580, 1581, 1583, 1590, 1586,
+     1582, 1592, 1593, 1584, 1595, 1597, 1606, 1602, 1603, 1605,
+     1609, 1608, 1616, 1611, 2623, 2623, 1618, 1629, 1621, 1614,
+     1631, 1635, 1639, 1620, 1636, 1637, 1641, 1638, 1642, 1645,
+
+     1646, 1648, 1651, 2623, 1654, 1658, 1655, 1662, 1660, 1665,
+     2623, 2623, 1670, 1666, 1671, 1672, 1676, 1675, 2623, 1677,
+     1680, 1681, 1682, 1683, 1685, 1690, 1695, 1699, 1700, 1696,
+     1703, 1706, 1704, 1702, 1705, 1718, 1722, 1719, 1724, 1712,
+     1709, 1725, 1726, 1732, 1727, 1734, 1736, 1742, 1738, 2623,
+     1745, 1739, 1748, 1729, 1750, 1751, 1758, 1755, 1756, 1759,
+     1760, 1761, 1763, 1764, 1765, 1768, 2623, 1772, 1770, 1775,
+     1771, 1785, 1773, 1778, 2623, 1787, 1796, 1783, 1793, 1802,
+     1804, 1789, 1795, 1805, 1806, 1807, 1808, 1810, 1812, 1814,
+     1816, 1823, 1828, 1834, 1824, 1831, 1837, 1836, 1838, 1839,
+
+     1822, 1845, 1841, 1849, 1846, 2623, 1850, 1855, 1857, 1859,
+     1861, 1862, 1860, 2623, 2623, 1852, 2623, 1870, 1867, 1872,
+     1874, 2623, 1876, 2623, 2623, 1873, 1884, 1877, 1888, 1878,
+     1891, 2623, 1886, 1892, 1895, 1897, 1898, 1899, 1901, 1900,
+     1902, 2623, 1903, 1904, 1905, 1907, 1920, 1909, 1921, 1925,
+     1924, 1928, 1914, 1917, 1936, 1934, 2623, 1930, 1938, 1941,
+     1942, 1944, 1946, 1945, 1943, 1958, 2623, 1947, 1950, 1951,
+     2623, 1959, 2623, 1962, 1961, 1964, 1972, 1966, 1977, 1969,
+     1974, 1979, 1980, 1982, 1983, 2623, 2623, 1985, 1990, 1995,
+     1987, 1992, 1998, 2000, 2001, 2003, 2004, 2623, 1415, 2005,
+
+     2007, 2008, 2009, 2623, 2011, 2013, 2012, 2014, 2017, 2022,
+     2032, 2026, 2034, 2036, 2019, 2041, 2043, 2623, 2044, 2046,
+     2037, 2048, 2050, 2051, 2052, 2053, 2059, 2060, 2062, 2623,
+     2064, 2065, 2066, 2070, 2071, 2072, 2073, 2074, 2075, 2077,
+     2078, 2081, 2088, 2085, 2623, 2084, 2623, 2093, 2098, 2101,
+     2105, 2623, 2094, 2100, 2623, 2107, 2103, 2116, 2113, 2118,
+     2120, 2122, 2111, 2124, 2123, 2125, 2134, 2126, 2623, 2133,
+     2135, 2136, 2137, 2623, 2623, 2141, 2623, 2623, 2146, 2623,
+     2623, 2148, 2623, 2151, 2623, 2157, 2153, 2155, 2138, 2156,
+     2623, 2159, 2623, 2623, 2162, 2163, 2164, 2173, 2175, 2177,
+
+     2166, 2168, 2170, 2179, 2180, 2181, 2184, 2185, 2187, 2188,
+     2189, 2190, 2193, 2197, 2195, 2198, 2205, 2623, 2199, 2209,
+     2623, 2212, 2216, 2206, 2218, 2219, 2222, 2220, 2224, 2231,
+     2227, 2228, 2229, 2623, 2623, 2623, 2230, 2232, 2234, 2240,
+     2241, 2623, 2244, 2245, 2252, 2623, 2623, 2623, 2253, 2246,
+     2248, 2256, 2258, 2262, 2623, 2260, 2266, 2267, 2265, 2274,
+     2277, 2283, 2282, 2285, 2623, 2286, 2287, 2623, 2289, 2288,
+     2293, 2294, 2295, 2297, 2623, 2279, 2290, 2305, 2307, 2300,
+     2310, 2623, 2311, 2312, 2623, 2314, 2623, 2317, 2318, 2321,
+     2323, 2327, 2328, 2329, 2335, 2332, 2334, 2623, 2623, 2333,
+
+     2623, 2623, 2336, 2340, 2341, 2344, 2342, 2347, 2349, 2350,
+     2353, 2351, 2623, 2354, 2356, 2364, 2361, 2359, 2623, 2366,
+     2367, 2370, 2623, 2623, 2372, 2380, 2373, 2623, 2378, 2384,
+     2385, 2386, 2388, 2389, 2390, 2391, 2392, 2394, 2396, 2397,
+     2403, 2407, 2623, 2409, 2405, 2411, 2414, 2418, 2415, 2419,
+     2420, 2424, 2426, 2428, 2429, 2623, 2421, 2432, 2442, 2444,
+     2446, 2447, 2450, 2623, 2453, 2623, 2456, 2457, 2623, 2623,
+     2451, 2461, 2458, 2623, 2464, 2623, 2465, 2467, 2468, 2623,
+     2623, 2623, 2471, 2623, 2473, 2623, 2475, 2476, 2623, 2478,
+     2480, 2482, 2623, 2484, 2623, 2487, 2623, 2488, 2489, 2623,
+
+     2623, 2623, 2623, 2493, 2492, 2495, 2430, 2623, 2498, 2501,
+     2499, 2503, 2623, 2623, 2531, 2538, 2545, 2552, 2559,   94,
+     2566, 2573, 2580, 2587, 2594, 2601, 2608, 2615
     } ;
 
-static yyconst flex_int16_t yy_def[1317] =
+static yyconst flex_int16_t yy_def[1329] =
     {   0,
-     1302,    1, 1303, 1303, 1304, 1304, 1305, 1305, 1306, 1306,
-     1307, 1307, 1302, 1308, 1302, 1302, 1302, 1302, 1309, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1310,
-     1302, 1302, 1302, 1310, 1311, 1302, 1302, 1302, 1311, 1312,
-     1302, 1302, 1302, 1302, 1312, 1313, 1302, 1302, 1302, 1313,
-     1314, 1302, 1315, 1302, 1314, 1314, 1308, 1308, 1302, 1316,
-     1309, 1316, 1309, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1310, 1310,
-     1311, 1311, 1312, 1312, 1302, 1313, 1313, 1314, 1314, 1315,
-     1315, 1314, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1314, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1314, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1302,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1314, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1314, 1308,
-
-     1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1302,
-     1302, 1308, 1302, 1302, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308,
-     1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1314, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1302, 1314, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308,
-
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1302, 1302, 1308, 1308, 1308, 1302, 1302,
-     1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1302, 1302, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308,
-
-     1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1302,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308,
-
-     1308, 1308, 1308, 1302, 1302, 1308, 1302, 1308, 1308, 1308,
-     1308, 1302, 1302, 1302, 1308, 1308, 1308, 1308, 1308, 1308,
-     1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1302,
-     1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1302, 1302, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-
-     1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1302, 1308, 1302, 1308, 1308, 1308, 1308, 1302,
-     1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308,
-     1308, 1302, 1302, 1308, 1302, 1302, 1308, 1302, 1302, 1308,
-     1302, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1302, 1308,
-     1302, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-
-     1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1302, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1302, 1302, 1302, 1308, 1308, 1308, 1308, 1308, 1302,
-     1308, 1308, 1308, 1302, 1302, 1302, 1308, 1308, 1308, 1308,
-     1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1302, 1308, 1308, 1302, 1308, 1308, 1308, 1308,
-     1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308, 1302,
-     1308, 1308, 1302, 1308, 1302, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1302, 1302, 1308, 1302, 1302,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-
-     1302, 1308, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308,
-     1302, 1302, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1302, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308, 1308, 1308,
-     1308, 1302, 1308, 1302, 1308, 1308, 1302, 1302, 1308, 1308,
-     1308, 1302, 1308, 1302, 1308, 1308, 1308, 1302, 1302, 1302,
-     1308, 1302, 1308, 1302, 1308, 1308, 1302, 1308, 1308, 1308,
-     1302, 1308, 1302, 1308, 1302, 1308, 1308, 1302, 1302, 1302,
-     1302, 1308, 1308, 1308, 1308, 1302, 1308, 1308, 1308, 1308,
-
-     1302,    0, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302,
-     1302, 1302, 1302, 1302, 1302, 1302
+     1314,    1, 1315, 1315, 1316, 1316, 1317, 1317, 1318, 1318,
+     1319, 1319, 1314, 1320, 1314, 1314, 1314, 1314, 1321, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1322,
+     1314, 1314, 1314, 1322, 1323, 1314, 1314, 1314, 1323, 1324,
+     1314, 1314, 1314, 1314, 1324, 1325, 1314, 1314, 1314, 1325,
+     1326, 1314, 1327, 1314, 1326, 1326, 1320, 1320, 1314, 1328,
+     1321, 1328, 1321, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1322, 1322,
+     1323, 1323, 1324, 1324, 1314, 1325, 1325, 1326, 1326, 1327,
+     1327, 1326, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1326, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1326, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320, 1314,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1326, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1326,
+
+     1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320,
+     1314, 1314, 1320, 1314, 1314, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314,
+     1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1326, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1314, 1326, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320,
+
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314,
+     1314, 1320, 1320, 1320, 1314, 1320, 1314, 1320, 1314, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1314, 1314, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+
+     1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320, 1320,
+     1314, 1314, 1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+
+     1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1314, 1314, 1320, 1314, 1320, 1320, 1320,
+     1320, 1314, 1320, 1314, 1314, 1320, 1320, 1320, 1320, 1320,
+     1320, 1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320,
+     1314, 1320, 1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1314, 1314, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320,
+
+     1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1314, 1320, 1314, 1320, 1320, 1320,
+     1320, 1314, 1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320,
+     1320, 1320, 1320, 1314, 1314, 1320, 1314, 1314, 1320, 1314,
+     1314, 1320, 1314, 1320, 1314, 1320, 1320, 1320, 1320, 1320,
+     1314, 1320, 1314, 1314, 1320, 1320, 1320, 1320, 1320, 1320,
+
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320,
+     1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1314, 1314, 1314, 1320, 1320, 1320, 1320,
+     1320, 1314, 1320, 1320, 1320, 1314, 1314, 1314, 1320, 1320,
+     1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1314, 1320, 1320, 1314, 1320, 1320,
+     1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320,
+     1320, 1314, 1320, 1320, 1314, 1320, 1314, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1314, 1314, 1320,
+
+     1314, 1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320, 1314, 1320,
+     1320, 1320, 1314, 1314, 1320, 1320, 1320, 1314, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1314, 1320, 1320, 1320, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1320, 1320, 1314, 1320, 1320, 1320, 1320,
+     1320, 1320, 1320, 1314, 1320, 1314, 1320, 1320, 1314, 1314,
+     1320, 1320, 1320, 1314, 1320, 1314, 1320, 1320, 1320, 1314,
+     1314, 1314, 1320, 1314, 1320, 1314, 1320, 1320, 1314, 1320,
+     1320, 1320, 1314, 1320, 1314, 1320, 1314, 1320, 1320, 1314,
+
+     1314, 1314, 1314, 1320, 1320, 1320, 1320, 1314, 1320, 1320,
+     1320, 1320, 1314,    0, 1314, 1314, 1314, 1314, 1314, 1314,
+     1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314
     } ;
 
-static yyconst flex_int16_t yy_nxt[2645] =
+static yyconst flex_int16_t yy_nxt[2663] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   18,   20,   21,   14,   22,   23,   24,   25,   14,
@@ -933,226 +936,228 @@ static yyconst flex_int16_t yy_nxt[2645] =
       356,  354,   68,   68,   68,   68,   68,  362,   68,   68,
        68,  358,  363,  368,  364,  361,  370,  369,   68,   68,
       367,   68,   68,  373,  365,  366,   68,   68,  371,   68,
-       68,  375,   68,   68,  378,   68,   68,  374,   68,  387,
-      372,  379,  384,  376,   68,  389,   68,   68,  377,  380,
-
-      382,  383,  385,   68,   68,   68,  386,  388,   68,  381,
-       68,  390,   68,   68,  129,  391,   68,  395,  399,  392,
-      400,   68,  396,   68,  393,   68,   68,  404,   68,  397,
-      394,  398,   68,  401,   68,   68,   68,   68,   68,  403,
-      408,  402,  410,   68,  405,  125,  406,  411,   68,  409,
-      407,  412,  413,   68,  414,   68,   68,  415,   68,  416,
-       68,  419,   68,  417,  418,   68,   68,   68,   68,  420,
-      423,   68,  421,   68,   68,   68,  424,  426,   68,  429,
-      430,   68,  427,   68,  124,   68,  428,  425,  422,   68,
-      431,   68,  432,   68,   68,  433,  436,  438,  435,  437,
-
-       68,   68,   68,   68,  440,   68,  439,   68,  441,   68,
-       68,   68,  442,   68,  446,  445,  122,  434,  447,   68,
-      448,  443,  450,  444,  449,   68,   68,   68,  451,  452,
-      453,   68,   68,  455,  454,   68,   68,   68,  456,   68,
-       68,   68,   68,   68,   68,  461,  465,   68,   68,  467,
-      457,   68,   68,   68,   68,  458,  468,  462,  459,  464,
-      460,  463,   68,   68,   68,   68,  466,  469,   68,  470,
-      474,  473,   68,  471,   68,  475,  472,  476,   68,  477,
-       68,   68,   68,   68,  129,  483,   68,  479,   68,  482,
-      480,   68,  484,   68,  486,  488,  478,  481,   68,   68,
-
-       68,   68,  487,  489,   68,   68,  491,  485,   68,  490,
-      497,   68,  496,   68,  494,   68,  492,  495,  504,   68,
-       68,  493,   68,   68,  498,   68,  499,   68,  507,  500,
-      508,   68,   68,   68,  501,   68,  510,  505,  511,  509,
-      502,  503,   68,  512,   68,  506,  515,  513,   68,   68,
-      517,   68,   68,  514,   68,   68,  516,  521,   68,  520,
-       68,  523,   68,  522,   68,   68,  518,   68,   68,   68,
-      519,   68,  524,  525,  527,  528,  529,   68,  531,  530,
-      526,   68,   68,   68,  533,   68,  532,   68,  535,   68,
-       68,   68,  536,   68,   68,   68,  534,   68,   68,   68,
-
-      537,  544,   68,   68,  551,   68,  538,  543,  546,   68,
-      545,  539,   68,  540,   68,  542,  541,  547,  548,  550,
-       68,   68,  549,   68,  552,   68,  555,   68,  557,  558,
-       68,   68,  562,  553,   68,  554,   68,   68,   68,  559,
-      564,   68,  565,  129,  561,   68,  556,   68,  560,   68,
-       68,  567,   68,   68,   68,   68,   68,  576,  563,   68,
-      566,   68,   68,   68,  583,  120,  570,  582,  568,   68,
-      578,   68,  602,  579,  569,   68,  581,  580,  571,  577,
-      572,   68,  584,   68,  573,  588,  574,   68,  587,  585,
-       68,  575,   68,  590,   68,  591,   68,   68,  597,  589,
-
-      595,   68,  592,   68,   68,   68,   68,  586,  596,  598,
-      593,   68,   68,   68,   68,   68,  594,   68,  601,  604,
-       68,  608,   68,   68,  599,  600,   68,   68,  610,  607,
-      603,  606,  611,   68,   68,  605,  615,  609,  612,   68,
-      614,   68,  616,  613,   68,  618,  617,   68,  619,   68,
-       68,   68,  620,   68,   68,   68,  623,   68,   68,  624,
-      625,  628,   68,  626,  627,  621,   68,   68,   68,   68,
-       68,  622,  631,   68,   68,  629,   68,   68,  635,   68,
-       68,  636,  638,  640,  641,  630,  632,  634,   68,   68,
-      633,  639,   68,  643,   68,  637,   68,   68,   68,  647,
-
-       68,   68,   68,   68,   68,   68,   68,  642,   68,  655,
-      646,  645,  656,  649,   68,  644,   68,   68,  648,  652,
-      650,  653,   68,   68,   68,   68,   68,  651,  654,  657,
-      658,  660,  663,   68,   68,   68,  659,   68,  661,   68,
-      662,   68,  666,   68,  665,   68,  668,   68,   68,  670,
-       68,   68,  664,   68,   68,   68,   68,   68,  667,  673,
-       68,  677,  669,  671,   68,  672,   68,   68,  681,  680,
-      674,  678,  676,   68,  675,  683,   68,  679,  682,  686,
-       68,  685,   68,  687,   68,  690,  684,   68,  691,   68,
-       68,  689,   68,  688,  692,   68,  694,  693,   68,   68,
-
-      697,  698,   68,   68,   68,   68,   68,  699,  700,   68,
-       68,   68,  695,   68,  705,  706,   68,  696,  701,   68,
-       68,   68,   68,  702,  709,  703,   68,  704,  707,  711,
-      714,   68,  715,   68,  708,   68,   68,   68,  710,  716,
-      712,   68,  717,  719,   68,  713,  720,   68,   68,  722,
-       68,   68,   68,  721,  718,   68,  724,   68,   68,   68,
-      725,  723,  726,  730,  728,  731,  729,   68,   68,  733,
-       68,   68,  732,  727,   68,   68,   68,  737,   68,   68,
-      734,   68,   68,  740,   68,   68,   68,  736,   68,   68,
-       68,  744,   68,   68,  735,   68,  749,   68,   68,  738,
-
-      750,   68,  741,  753,  739,  742,  745,  743,   68,  746,
-      747,   68,   68,   68,   68,  752,  748,  756,   68,   68,
-       68,  751,   68,   68,   68,  761,  754,  759,  763,  762,
-       68,  755,  758,  757,   68,   68,   68,   68,  760,  765,
-       68,  767,  764,  770,   68,  769,  771,   68,   68,  766,
-       68,   68,   68,  772,   68,  773,  775,  768,  774,  776,
-      778,   68,   68,  777,   68,  782,  779,   68,  781,   68,
-       68,   68,   68,  780,   68,   68,   68,   68,   68,  790,
-       68,  791,   68,   68,  792,   68,  783,   68,  784,  787,
-      785,  786,  789,  129,  794,  788,  793,  796,   68,   68,
-
-      799,   68,  795,   68,  797,   68,  800,  798,   68,  801,
-      802,  803,   68,   68,   68,   68,  804,   68,  805,   68,
-       68,  810,   68,   68,  808,   68,  812,   68,  807,  806,
-       68,   68,   68,   68,   68,  809,  815,   68,  817,   68,
-      820,  814,   68,  811,   68,   68,   68,   68,  824,  813,
-      816,  819,  818,   68,  826,   68,   68,   68,  825,   68,
-       68,  830,  821,  829,  822,  823,   68,  827,   68,  828,
-      833,  832,   68,  834,   68,   68,   68,   68,   68,  840,
-       68,  837,   68,  839,  835,  831,   68,  841,   68,   68,
-       68,   68,  848,   68,  836,   68,   68,   68,   68,   68,
-
-      838,   68,  846,   68,  842,  845,  847,   68,  843,  844,
-      853,   68,  857,   68,  852,  849,  850,  856,   68,  851,
-      854,  858,   68,  855,   68,   68,  860,  864,  865,   68,
-       68,  859,   68,  861,  863,   68,  862,   68,   68,   68,
-       68,   68,  872,   68,   68,  127,  875,   68,  867,  876,
-      866,   68,  869,  877,   68,  868,  878,   68,  871,  873,
-       68,   68,  874,  880,  870,   68,   68,   68,   68,  881,
-      879,   68,   68,  882,   68,   68,   68,   68,   68,  883,
-      889,   68,  890,  891,  893,  884,  892,  885,  886,  887,
-       68,   68,  896,   68,  888,   68,   68,  900,   68,   68,
-
-       68,   68,   68,  904,   68,   68,  895,  903,  898,  897,
-      899,  901,   68,  894,  905,   68,  907,   68,  902,  908,
-       68,  906,   68,   68,   68,   68,  909,  912,   68,  913,
-       68,  914,   68,  915,   68,  917,   68,  916,   68,  910,
-       68,  918,  911,  919,  921,   68,   68,  922,   68,  923,
-      920,   68,   68,   68,   68,   68,  927,  931,   68,   68,
-       68,  933,   68,  924,   68,  925,   68,   68,   68,   68,
-      926,  936,  928,  929,   68,  935,  930,  937,   68,  939,
-       68,   68,  934,  943,   68,  932,  942,   68,   68,   68,
-      941,  945,  947,  938,   68,  940,  946,   68,  948,   68,
-
-      944,   68,   68,   68,   68,  956,   68,   68,  952,   68,
-      960,   68,  953,   68,  949,  954,  950,  959,  951,  963,
-      955,  961,   68,  958,   68,  962,   68,   68,  957,  965,
-       68,   68,   68,   68,   68,  967,  970,   68,  969,  964,
-      972,   68,  966,   68,  968,   68,  974,  975,   68,  973,
-      976,   68,   68,   68,   68,  971,   68,   68,  977,  978,
-       68,  982,  979,   68,   68,  981,  980,   68,   68,  988,
-       68,   68,  983,  985,   68,   68,  986,   68,  990,  992,
-       68,  984,  987,   68,   68,  991,   68,  989,   68,  995,
-       68,  993,  996,   68,   68,  994,   68,   68,  997,   68,
-
-       68,   68,  998, 1003, 1002,  999, 1006,   68,   68, 1000,
-       68,   68, 1009,   68,   68, 1004, 1001, 1005, 1008, 1010,
-       68,   68, 1014,   68,   68, 1011, 1007,   68, 1015, 1012,
-       68, 1018,   68,   68,   68,   68,   68,   68,   68, 1024,
-     1025, 1013,   68, 1016, 1017, 1019, 1020, 1022, 1023, 1021,
-       68,   68,   68,   68,   68, 1026,   68,   68, 1029, 1030,
-     1033,   68, 1035,   68,   68, 1032, 1034, 1028,   68,   68,
-     1027,   68, 1037,   68, 1038, 1040,   68,   68,   68, 1031,
-       68, 1041, 1047, 1036, 1039,   68, 1042, 1043,   68,   68,
-     1044,   68, 1045,   68,   68,   68, 1046,   68, 1049,   68,
-
-     1048,   68,   68,   68, 1057,   68,   68,   68, 1061, 1058,
-       68,   68,   68, 1076, 1051, 1055, 1062,   68, 1053,   68,
-     1050, 1052, 1054, 1056, 1059, 1060, 1063,   68, 1065,   68,
-     1066,   68, 1064,   68, 1068,   68, 1069,   68,   68, 1071,
-       68,   68,   68, 1070, 1073,   68,   68,   68, 1075,   68,
-     1077,   68, 1067, 1079,   68, 1081,   68, 1082,   68,   68,
-     1072,   68, 1084,   68, 1074, 1078, 1080,   68, 1086,   68,
-       68, 1085,   68,   68,   68,   68, 1094, 1083, 1090,   68,
-      125,   68, 1088, 1092, 1093,   68,   68, 1091,   68, 1095,
-       68, 1089, 1087,   68, 1098, 1097, 1099,   68, 1100, 1096,
-
-       68,   68, 1103, 1102,   68, 1105, 1101, 1104, 1106,   68,
-       68,   68,   68,   68, 1107, 1108, 1109,   68, 1110,   68,
-       68,   68, 1115, 1112,   68,   68, 1114,   68,   68,   68,
-     1116, 1111,   68, 1118, 1120,   68, 1121, 1119, 1122,   68,
-     1113, 1117, 1123,   68, 1124,   68, 1125,   68, 1126,   68,
-       68,   68,   68, 1130,   68,   68,   68, 1129, 1132,   68,
-     1131, 1134,   68,   68, 1133, 1127, 1135,   68, 1136,   68,
-       68,   68, 1128,   68,   68, 1137,   68, 1143,   68,   68,
-       68,   68,   68, 1139,   68, 1140, 1141,   68, 1138, 1144,
-       68,   68, 1151,   68,   68, 1147, 1142,   68, 1152, 1153,
-
-       68, 1146,   68, 1155, 1149, 1145, 1156,   68, 1148, 1150,
-       68,   68, 1154,   68,   68, 1159,   68, 1163,   68, 1157,
-     1164,   68,   68,   68,   68,   68, 1158, 1170,   68,   68,
-     1161, 1160, 1169,   68,   68, 1162, 1165, 1173,   68,   68,
-       68, 1166,   68, 1167, 1168, 1175,   68,   68, 1171,   68,
-     1176, 1178, 1172,   68,   68,   68,   68,   68, 1174, 1179,
-     1180, 1181, 1177,   68,   68, 1186,   68, 1208, 1183, 1184,
-     1188, 1182, 1185, 1187,   68,   68, 1189,   68, 1190,   68,
-       68,   68,   68,   68,   68, 1191, 1193,   68,   68,   68,
-     1197,   68,   68, 1192,   68, 1194, 1195, 1196, 1201,   68,
-
-     1198,   68, 1203, 1199,   68,   68,   68, 1207,   68, 1204,
-     1202, 1200,   68, 1209, 1205,   68, 1211,   68, 1210, 1206,
-     1212,   68,   68,   68, 1215, 1216,   68,   68,   68,   68,
-       68, 1217,   68,   68, 1218,   68, 1222, 1214,   68,   68,
-     1213, 1220,   68,   68, 1224,   68,   68,   68,   68, 1219,
-     1229, 1221, 1231,   68, 1223, 1227,   68,   68,   68,   68,
-     1232,   68, 1225,   68, 1238, 1228, 1230, 1233, 1234, 1226,
-       68,   68,   68, 1235,   68, 1237,   68, 1240,   68,   68,
-     1239,   68, 1236, 1241, 1244,   68,   68,   68, 1245,   68,
-       68,   68, 1249, 1243,   68, 1242,   68, 1246, 1248, 1252,
-
-       68, 1253, 1254,   68,   68, 1247, 1257,   68, 1258,   68,
-     1251,   68,   68,   68, 1255, 1250, 1262,   68,   68,   68,
-     1264,   68,   68,   68, 1260,   68, 1256,   68, 1267, 1282,
-     1259, 1263, 1271, 1261, 1268,   68, 1266, 1265, 1269,   68,
-     1270,   68, 1272,   68,   68, 1273, 1274,   68,   68,   68,
-     1277,   68,   68, 1275,   68,   68,   68, 1276,   68, 1278,
-     1279, 1281,   68, 1283,   68,   68, 1285,   68,   68, 1284,
-      124, 1286, 1280, 1288,   68,   68, 1287, 1289,   68, 1290,
-       68, 1291,   68,   68, 1293,   68,   68, 1292, 1295, 1294,
-     1296,   68,   68,   68,   68, 1297, 1301,   68,  122,  120,
-
-       68, 1302, 1302, 1302, 1302, 1302, 1302, 1298, 1299, 1302,
-     1302, 1302, 1300,   40,   40,   40,   40,   40,   40,   40,
-       45,   45,   45,   45,   45,   45,   45,   50,   50,   50,
-       50,   50,   50,   50,   56,   56,   56,   56,   56,   56,
-       56,   61,   61,   61,   61,   61,   61,   61,   71,   71,
-     1302,   71,   71,   71,   71,  119,  119, 1302, 1302, 1302,
-      119,  119,  121,  121, 1302, 1302,  121, 1302,  121,  123,
-     1302, 1302, 1302, 1302, 1302,  123,  126,  126, 1302, 1302,
-     1302,  126,  126,  128, 1302, 1302, 1302, 1302, 1302,  128,
-      130,  130, 1302,  130,  130,  130,  130,   72,   72, 1302,
-
-       72,   72,   72,   72,   13, 1302, 1302, 1302, 1302, 1302,
-     1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302,
-     1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302,
-     1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302,
-     1302, 1302, 1302, 1302
+       68,  375,   68,   68,  385,   68,  388,  374,   68,   68,
+      372,   68,  390,  376,  386,   68,  384,   68,  377,   68,
+
+      378,   68,  383,  387,   68,  379,   68,  380,   68,  392,
+      391,   68,   68,  389,   68,  381,  393,  396,  129,  401,
+      397,   68,  400,  394,   68,  382,   68,  398,  395,  399,
+       68,  405,   68,  402,   68,   68,   68,   68,   68,   68,
+      409,  411,   68,  404,  403,  413,  406,  407,  412,   68,
+       68,  408,  410,  414,   68,  415,   68,  416,   68,  417,
+       68,  420,   68,  418,  419,   68,   68,   68,   68,  421,
+      424,   68,  422,   68,   68,   68,  425,  427,   68,  430,
+      431,   68,  428,   68,  125,   68,  429,  426,  423,   68,
+      432,   68,  433,   68,   68,  434,  437,  439,  436,  438,
+
+       68,   68,   68,   68,  441,   68,  440,   68,  442,   68,
+       68,   68,  443,   68,  447,  446,  124,  435,  448,   68,
+      449,  444,  451,  445,  450,   68,   68,   68,  452,  453,
+      454,   68,   68,  456,  455,   68,   68,   68,  457,   68,
+       68,   68,   68,   68,   68,  462,   68,   68,  467,   68,
+      458,  463,   68,   68,  471,  459,   68,  469,  460,  464,
+      461,  465,  466,   68,   68,  468,   68,  470,  472,   68,
+       68,   68,   68,   68,   68,  476,  475,  478,  477,  474,
+       68,  481,   68,  473,   68,  479,   68,  129,   68,  485,
+       68,  480,  484,  482,  486,  490,  483,   68,  488,   68,
+
+       68,   68,   68,  491,   68,   68,  489,   68,   68,  487,
+      493,   68,  499,   68,  497,  498,  496,   68,  506,  492,
+      494,  495,   68,   68,  500,   68,  501,   68,   68,  502,
+      509,  510,   68,   68,  503,  511,   68,  512,   68,   68,
+      504,  505,  515,  507,   68,  514,   68,   68,  508,   68,
+      519,  122,  517,  513,   68,  518,   68,   68,  523,   68,
+       68,   68,  522,  524,   68,   68,  516,  525,   68,  520,
+       68,   68,  526,  527,  521,  529,  531,   68,  530,   68,
+      533,   68,   68,   68,  537,   68,  528,  532,   68,   68,
+       68,  535,   68,  538,   68,   68,  536,   68,   68,   68,
+
+      534,  539,   68,  546,   68,   68,  545,   68,   68,   68,
+      540,   68,   68,  541,  542,  551,  549,  543,  544,  550,
+      547,  554,   68,  548,  557,  553,   68,   68,  552,   68,
+       68,  555,   68,  560,  558,  561,   68,   68,   68,  562,
+       68,  556,  565,   68,  567,   68,   68,   68,  568,  129,
+       68,  559,   68,   68,  570,  563,  564,   68,  566,   68,
+       68,  569,   68,   68,  579,   68,   68,   68,   68,  602,
+      586,  571,   68,  573,  585,   68,  582,  572,   68,  593,
+      581,  574,  580,  575,  583,   68,  584,  576,   68,  577,
+       68,  587,   68,  591,  578,   68,  588,  595,  589,  592,
+
+       68,  594,   68,  596,   68,  599,   68,   68,  601,   68,
+       68,  600,   68,   68,   68,   68,  590,  605,  597,   68,
+       68,  598,   68,  604,  606,  608,   68,  612,  603,   68,
+       68,  618,   68,  607,   68,  611,  610,   68,   68,  609,
+       68,   68,  614,  615,  613,  616,  619,   68,  620,  625,
+      617,   68,  621,   68,   68,  622,   68,   68,  623,  624,
+      627,   68,   68,   68,   68,   68,  628,  626,  629,   68,
+      630,  631,  632,   68,   68,   68,   68,  635,  633,   68,
+      634,   68,   68,   68,   68,   68,   68,  640,  641,  643,
+       68,   68,  645,  636,  639,  637,  644,   68,  646,  638,
+
+      648,   68,  642,   68,   68,  647,   68,   68,  652,   68,
+      649,   68,   68,   68,   68,   68,   68,  660,  650,  651,
+      654,  661,   68,   68,  653,   68,   68,   68,  655,  657,
+      662,  658,   68,   68,  659,   68,   68,  663,  656,   68,
+      665,  664,  668,   68,   68,   68,   68,  666,  667,   68,
+      671,  673,   68,  670,  669,   68,  675,   68,  672,   68,
+       68,   68,   68,   68,  676,   68,   68,   68,  674,   68,
+      687,  683,  677,  679,  678,   68,   68,   68,  686,  680,
+       68,  682,  684,  681,   68,  689,  685,  692,   68,  691,
+      688,  693,   68,   68,  696,   68,  697,   68,   68,   68,
+
+      690,  694,  695,  698,   68,   68,  700,   68,  703,  699,
+      704,  701,   68,   68,   68,   68,   68,  705,  706,   68,
+       68,   68,   68,   68,  712,  702,   68,  711,  707,   68,
+       68,   68,   68,  708,  717,  709,  713,  710,  720,   68,
+      714,   68,  716,  715,  721,   68,   68,   68,  718,  722,
+       68,  724,  723,  725,   68,  728,  719,  727,   68,  729,
+       68,  726,   68,   68,   68,   68,   68,   68,  731,   68,
+      733,   68,  732,  735,  737,  738,  736,   68,   68,   68,
+       68,  740,  730,  739,  734,   68,   68,   68,  743,   68,
+      742,  744,   68,  747,  741,   68,   68,   68,   68,   68,
+
+       68,  751,   68,   68,  756,   68,   68,  745,  757,   68,
+       68,   68,  746,   68,   68,  748,  749,  750,  760,   68,
+      755,   68,  752,  754,   68,  763,   68,   68,  753,  759,
+      762,   68,  758,  765,   68,   68,   68,  761,   68,   68,
+      766,  769,  764,   68,  771,  770,  767,   68,   68,   68,
+      774, 1064,   68,  768,  775,  778,  773,  777,  779,   68,
+       68,  772,   68,   68,   68,  780,   68,  781,  786,   68,
+      776,  784,   68,  782,   68,  785,   68,   68,   68,  790,
+       68,   68,   68,  789,   68,  783,   68,   68,   68,   68,
+       68,  787,  799,  788,   68,  798,   68,  791,   68,  792,
+
+      793,  794,  795,  801,  797,   68,   68,  796,   68,  800,
+      804,   68,  807,  805,   68,  802,  803,   68,  806,  808,
+       68,  809,  810,  811,   68,  812,   68,   68,   68,   68,
+      814,  813,   68,   68,   68,   68,  819,   68,   68,  817,
+       68,   68,  821,   68,   68,   68,   68,  815,  824,  823,
+      818,  826,   68,   68,   68,  829,   68,   68,  816,   68,
+      820,   68,   68,  833,  825,  822,   68,  828,  835,   68,
+      827,  834,   68,   68,   68,   68,  830,  831,  838,  832,
+      839,   68,  836,  837,  841,  842,   68,  843,   68,   68,
+       68,   68,   68,   68,   68,   68,   68,  847,   68,  840,
+
+      849,  850,   68,  851,   68,   68,  844,   68,  845,   68,
+      855,  846,  852,  858,   68,   68,  848,   68,   68,  856,
+       68,   68,  857,   68,  853,  854,   68,  863,   68,  867,
+       68,  875,   68,   68,  859,  860,  862,  864,  861,  866,
+      865,   68,  869,   68,  868,  870,  874,   68,   68,   68,
+       68,   68,  871,   68,   68,  872,  873,   68,   68,  882,
+       68,  885,  877,   68,  879,  886,   68,   68,  876,  888,
+       68,  878,   68,  887,   68,  881,  883,   68,   68,  880,
+      890,  884,   68,   68,   68,  889,  891,   68,   68,   68,
+      892,  893,   68,   68,   68,   68,  899,   68,  900,  901,
+
+      902,  894,   68,  895,  896,  897,  903,   68,   68,  898,
+      906,   68,   68,  910,   68,   68,   68,   68,   68,  918,
+      908,   68,  905,  913,   68,  904,  907,  909,  911,  914,
+       68,   68,  912,  915,   68,  917,   68,   68,   68,   68,
+      916,   68,  919,  922,   68,  924,   68,  925,   68,  926,
+       68,   68,  928,  927,   68,  930,  920,   68,  921,  923,
+       68,  932,   68,   68,  933,  934,  931,   68,   68,  929,
+       68,   68,   68,   68,  942,   68,   68,   68,  944,  935,
+       68,  936,   68,   68,   68,   68,  937,   68,  938,  947,
+       68,  939,  940,  946,  941,   68,  948,   68,  950,   68,
+
+      945,   68,  943,  954,  953,   68,  952,   68,   68,  949,
+      959,  951,  956,  957,   68,  955,   68,   68,   68,   68,
+       68,  958,   68,  967,   68,  963,   68,  960,   68,  964,
+      970,  974,  961,  965,   68,   68,   68,  962,  966,  971,
+       68,  972,  969,   68,  976,  973,   68,  968,   68,   68,
+       68,   68,  981,   68,  978,  975,  983,   68,   68,  980,
+      977,   68,   68,  979,   68,  985,  986,   68,  987,   68,
+      984,   68,   68,   68,   68,  982,  992,  988,  989,   68,
+      990,  991,   68,  993,   68,   68,   68,  998,   68,   68,
+       68, 1000, 1003,  996,  994,  997,   68,  995,   68,  999,
+
+       68, 1002, 1004,   68,   68, 1005, 1001,   68, 1007,   68,
+       68,   68,   68,   68,   68,   68,   68,   68, 1015,   68,
+     1014,   68, 1009, 1010, 1006, 1011,   68, 1012, 1017,   68,
+     1008, 1018,   68,   68, 1013, 1016,   68,   68, 1020, 1021,
+       68, 1022,   68, 1026, 1024, 1023,   68, 1019,   68, 1025,
+       68, 1027, 1030,   68,   68,   68,   68,   68,   68,   68,
+     1036, 1028,   68,   68, 1029, 1032, 1031, 1034, 1033, 1035,
+       68,   68, 1038,   68,   68, 1037,   68, 1041,   68, 1040,
+     1042,   68, 1039, 1045,   68, 1044,   68, 1046, 1047,   68,
+     1049,   68,   68, 1052,   68,   68, 1050,   68, 1043,   68,
+
+     1048, 1055,   68, 1053,   68, 1051, 1054,   68, 1056, 1058,
+       68, 1057,   68,   68, 1059,   68,   68,   68, 1061,   68,
+       68,   68, 1069,   68,   68,   68,   68, 1060, 1070,   68,
+     1073,   68, 1067, 1074,   68, 1063, 1065, 1071,   68, 1072,
+     1066, 1062, 1068, 1075,   68, 1077,   68, 1078,   68,   68,
+     1079, 1076, 1080,   68, 1081,   68,   68, 1083,   68, 1085,
+       68, 1082,   68,   68,   68,   68, 1089, 1088, 1084, 1087,
+     1091,   68,   68, 1093,   68, 1094,   68,   68,   68, 1096,
+     1086, 1090,   68,   68,   68,   68,   68,   68, 1098,   68,
+       68, 1092, 1102,   68, 1097, 1106,   68,   68, 1100, 1104,
+
+       68, 1107, 1105, 1095, 1103,   68,   68, 1101, 1111, 1099,
+       68, 1110,   68,   68, 1109,   68, 1108,   68, 1112,   68,
+     1117, 1114, 1116,   68, 1115,   68, 1113, 1118,   68, 1119,
+       68, 1121,   68, 1120,   68,   68,   68,   68,   68, 1122,
+     1124, 1127, 1126, 1123, 1128,   68,   68,   68,   68,   68,
+       68, 1132, 1130,   68, 1133, 1125, 1131, 1134,   68, 1135,
+       68, 1129, 1136,   68, 1137,   68, 1138,   68,   68,   68,
+     1142,   68, 1140, 1141,   68,   68,   68, 1144,   68, 1143,
+       68, 1145,   68, 1139, 1146,   68, 1147,   68, 1148,   68,
+     1149,   68,   68,   68, 1151, 1155,   68,   68, 1150,   68,
+
+       68,   68,   68, 1152, 1153,   68, 1156,   68,  120,   68,
+       68,   68, 1163, 1154, 1159, 1164, 1165,   68,   68, 1161,
+     1158,   68, 1167, 1168,   68, 1157, 1160, 1162,   68, 1166,
+       68,   68,   68, 1170,   68, 1175,   68, 1169, 1176,   68,
+       68,   68,   68,   68,   68, 1182,   68, 1181, 1171, 1172,
+     1173, 1174,   68,   68, 1177, 1185,   68,   68,   68, 1178,
+       68, 1179, 1180, 1187,   68,   68, 1188, 1183,   68, 1190,
+       68, 1184,   68, 1191,   68, 1192, 1186,   68,   68,   68,
+     1189,   68, 1193, 1195, 1196, 1198,   68, 1194, 1199,   68,
+     1200,   68, 1197, 1201,   68,   68, 1202,   68,   68,   68,
+
+       68,   68,   68, 1203, 1205,   68,   68,   68, 1209,   68,
+     1211, 1204,   68, 1206, 1207, 1208, 1213,   68, 1210,   68,
+     1215, 1212,   68,   68,   68, 1219,   68, 1216, 1214,   68,
+       68, 1221, 1217,   68, 1223,   68, 1222, 1218, 1224,   68,
+       68,   68, 1227, 1228,   68,   68,   68,   68,   68, 1220,
+     1229, 1230,   68,   68,   68, 1226,   68, 1234, 1225,   68,
+     1232,   68,   68,   68, 1236,   68,   68, 1231,   68, 1241,
+     1235,   68, 1233,   68, 1239, 1243,   68, 1244,   68,   68,
+     1245, 1237,   68, 1240,   68,   68, 1242, 1246, 1238, 1249,
+       68, 1247,   68, 1250, 1251, 1252,   68,   68,   68, 1256,
+
+       68,   68,   68,   68,   68, 1253,   68, 1248,   68,   68,
+     1257, 1261, 1260, 1255, 1264,   68, 1254,   68, 1258,   68,
+     1266,   68, 1259,   68, 1265, 1269,   68,   68, 1263, 1270,
+       68,   68,   68,   68, 1262, 1274,   68, 1267,   68, 1276,
+       68,   68,   68, 1272,   68, 1268, 1271, 1278,  129, 1279,
+     1275, 1309, 1273, 1280,   68, 1281,   68, 1282,   68,   68,
+     1277, 1284,   68,   68, 1283,   68, 1285, 1286,   68,   68,
+       68, 1288, 1289,   68, 1287, 1290,   68,   68, 1293,   68,
+       68, 1291, 1295,   68, 1294,   68, 1297,   68,   68, 1296,
+       68, 1300,   68, 1301,   68, 1302,   68, 1292, 1303,   68,
+
+       68,   68, 1305, 1298,   68,   68, 1308,   68, 1299, 1306,
+       68,   68, 1304,   68, 1313,   68,  127,  125,  124,  122,
+      120,   68, 1314, 1314, 1307, 1310, 1314, 1311, 1314, 1314,
+     1312,   40,   40,   40,   40,   40,   40,   40,   45,   45,
+       45,   45,   45,   45,   45,   50,   50,   50,   50,   50,
+       50,   50,   56,   56,   56,   56,   56,   56,   56,   61,
+       61,   61,   61,   61,   61,   61,   71,   71, 1314,   71,
+       71,   71,   71,  119,  119, 1314, 1314, 1314,  119,  119,
+      121,  121, 1314, 1314,  121, 1314,  121,  123, 1314, 1314,
+     1314, 1314, 1314,  123,  126,  126, 1314, 1314, 1314,  126,
+
+      126,  128, 1314, 1314, 1314, 1314, 1314,  128,  130,  130,
+     1314,  130,  130,  130,  130,   72,   72, 1314,   72,   72,
+       72,   72,   13, 1314, 1314, 1314, 1314, 1314, 1314, 1314,
+     1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314,
+     1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314,
+     1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314,
+     1314, 1314
     } ;
 
-static yyconst flex_int16_t yy_chk[2645] =
+static yyconst flex_int16_t yy_chk[2663] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1163,7 +1168,7 @@ static yyconst flex_int16_t yy_chk[2645] =
         9,  115,   33,    6,    7,    7,    7,    7,    9,    7,
        10,   10,   10,   44,   44,    7,    8,    8,    8,    8,
        10,    8,   21,   33,  115,   21,   21,    8,   11,   11,
-       11,   11,   11,   11, 1308,   20,   29,   20,   20,   11,
+       11,   11,   11,   11, 1320,   20,   29,   20,   20,   11,
 
        20,   29,   24,   21,   25,   20,   24,   28,   11,   12,
        12,   12,   12,   12,   12,   74,   22,   22,   74,   25,
@@ -1174,7 +1179,7 @@ static yyconst flex_int16_t yy_chk[2645] =
        35,   39,   31,   34,   77,   35,   31,   77,   36,   34,
        75,   32,   34,   36,   75,   35,   38,   76,   35,   34,
        82,   37,   37,   36,   37,   60,   60,   36,   36,   55,
-       38,   55,   55,  565,   55,   38,   78,   76,   63,   37,
+       38,   55,   55,  568,   55,   38,   78,   76,   63,   37,
 
        63,   63,   65,   63,   65,   65,   79,   65,   68,   63,
        68,   68,   84,   68,   78,   80,   81,   85,   68,   71,
@@ -1228,223 +1233,225 @@ static yyconst flex_int16_t yy_chk[2645] =
       280,  278,  289,  288,  291,  292,  293,  287,  294,  295,
       297,  282,  288,  294,  289,  286,  296,  295,  298,  299,
       293,  296,  300,  299,  291,  292,  301,  302,  297,  303,
-      305,  301,  310,  304,  304,  306,  308,  300,  309,  309,
-      298,  304,  307,  302,  311,  311,  312,  307,  303,  304,
-
-      305,  306,  307,  313,  314,  315,  308,  310,  316,  304,
-      319,  312,  317,  318,  321,  313,  320,  317,  321,  314,
-      322,  323,  318,  324,  315,  322,  325,  326,  326,  319,
-      316,  320,  327,  323,  328,  329,  331,  330,  338,  325,
-      330,  324,  332,  332,  327,  125,  328,  333,  333,  331,
-      329,  334,  335,  335,  336,  336,  334,  337,  339,  338,
+      306,  301,  305,  308,  307,  309,  309,  300,  310,  307,
+      298,  311,  311,  302,  307,  312,  306,  313,  303,  304,
+
+      304,  314,  305,  308,  315,  304,  316,  304,  319,  313,
+      312,  318,  317,  310,  320,  304,  314,  317,  321,  322,
+      318,  323,  321,  315,  322,  304,  324,  319,  316,  320,
+      325,  326,  326,  323,  327,  328,  329,  330,  338,  331,
+      330,  332,  332,  325,  324,  334,  327,  328,  333,  333,
+      334,  329,  331,  335,  335,  336,  336,  337,  339,  338,
       340,  341,  337,  339,  340,  342,  341,  343,  344,  342,
       345,  346,  343,  347,  348,  345,  346,  348,  349,  349,
-      350,  351,  348,  355,  123,  350,  348,  347,  344,  352,
+      350,  351,  348,  355,  125,  350,  348,  347,  344,  352,
       351,  353,  352,  354,  356,  353,  355,  357,  354,  356,
 
       358,  359,  357,  362,  359,  360,  358,  361,  360,  363,
-      364,  365,  361,  366,  365,  364,  121,  353,  366,  369,
+      364,  365,  361,  366,  365,  364,  123,  353,  366,  369,
       367,  362,  368,  363,  367,  367,  370,  368,  369,  370,
       371,  372,  374,  372,  371,  371,  373,  375,  373,  376,
-      377,  378,  379,  380,  381,  378,  382,  383,  384,  384,
-      374,  382,  385,  387,  388,  375,  385,  379,  376,  381,
-      377,  380,  386,  389,  390,  391,  383,  386,  392,  387,
-      391,  390,  393,  388,  394,  392,  389,  393,  395,  394,
-      396,  397,  400,  398,  399,  400,  402,  396,  401,  399,
-      397,  407,  401,  403,  403,  405,  395,  398,  408,  406,
-
-      405,  409,  403,  406,  412,  415,  408,  402,  417,  407,
-      418,  416,  417,  420,  415,  418,  409,  416,  420,  421,
-      422,  412,  419,  427,  419,  423,  419,  431,  423,  419,
-      424,  424,  425,  430,  419,  426,  426,  421,  427,  425,
-      419,  419,  428,  428,  429,  422,  431,  429,  432,  433,
-      433,  434,  435,  430,  436,  439,  432,  437,  437,  436,
-      438,  439,  442,  438,  440,  441,  434,  448,  444,  443,
-      435,  446,  440,  441,  443,  444,  445,  445,  447,  446,
-      442,  450,  451,  447,  450,  455,  448,  452,  452,  453,
-      456,  462,  453,  457,  458,  459,  451,  461,  460,  463,
-
-      453,  461,  466,  464,  468,  467,  455,  460,  463,  468,
-      462,  456,  465,  457,  470,  459,  458,  464,  465,  467,
-      469,  472,  466,  471,  469,  473,  472,  474,  474,  475,
-      477,  478,  479,  470,  475,  471,  476,  479,  480,  476,
-      481,  481,  482,  482,  478,  483,  473,  484,  477,  485,
-      486,  484,  487,  489,  490,  491,  493,  489,  480,  492,
-      483,  495,  494,  514,  496,  119,  487,  495,  485,  496,
-      491,  499,  514,  492,  486,  488,  494,  493,  488,  490,
-      488,  497,  497,  498,  488,  499,  488,  500,  498,  497,
-      502,  488,  501,  501,  503,  502,  504,  505,  509,  500,
-
-      506,  506,  503,  509,  507,  511,  510,  497,  507,  510,
-      504,  515,  512,  513,  516,  517,  505,  518,  513,  516,
-      519,  520,  522,  523,  511,  512,  520,  524,  523,  519,
-      515,  518,  524,  525,  526,  517,  528,  522,  525,  527,
-      527,  528,  530,  526,  531,  531,  530,  530,  531,  532,
-      533,  534,  532,  535,  536,  537,  535,  538,  539,  536,
-      537,  540,  540,  538,  539,  533,  541,  542,  544,  543,
-      545,  534,  543,  547,  546,  541,  548,  549,  547,  550,
-      551,  548,  550,  552,  553,  542,  544,  546,  552,  553,
-      545,  551,  554,  555,  555,  549,  556,  557,  558,  559,
-
-      560,  562,  563,  559,  561,  566,  567,  554,  568,  569,
-      558,  557,  570,  561,  569,  556,  572,  570,  560,  566,
-      562,  567,  573,  575,  571,  576,  574,  563,  568,  571,
-      572,  574,  577,  577,  578,  579,  573,  580,  575,  581,
-      576,  582,  580,  583,  579,  584,  582,  587,  585,  584,
-      586,  588,  578,  589,  590,  591,  592,  593,  581,  587,
-      594,  591,  583,  585,  597,  586,  599,  598,  596,  594,
-      588,  592,  590,  596,  589,  598,  600,  593,  597,  601,
-      602,  600,  603,  601,  601,  604,  599,  605,  605,  606,
-      604,  603,  607,  602,  606,  608,  608,  607,  609,  610,
-
-      611,  612,  613,  616,  614,  611,  612,  613,  614,  615,
-      621,  618,  609,  619,  616,  618,  620,  610,  615,  622,
-      625,  623,  624,  615,  621,  615,   67,  615,  619,  623,
-      626,  626,  627,  627,  620,  631,  629,  630,  622,  629,
-      624,  636,  630,  632,  632,  625,  633,  633,  634,  635,
-      635,  637,  638,  634,  631,  640,  637,  639,  641,  642,
-      638,  636,  639,  644,  641,  645,  642,  646,  644,  647,
-      645,  648,  646,  640,  647,  649,  650,  651,  651,  652,
-      648,  653,  655,  654,  660,  656,  659,  650,  654,  657,
-      658,  658,  661,  662,  649,  665,  664,  666,  667,  652,
-
-      664,  664,  655,  667,  653,  656,  659,  657,  668,  660,
-      661,  669,  673,  670,  671,  666,  662,  670,  672,  674,
-      675,  665,  676,  677,  678,  675,  668,  673,  677,  676,
-      679,  669,  672,  671,  680,  681,  682,  690,  674,  679,
-      683,  681,  678,  684,  689,  683,  685,  693,  684,  680,
-      688,  685,  686,  686,  694,  688,  690,  682,  689,  691,
-      692,  692,  695,  691,  691,  696,  693,  697,  695,  698,
-      696,  699,  700,  694,  702,  701,  705,  703,  704,  704,
-      706,  705,  709,  707,  706,  708,  697,  712,  698,  701,
-      699,  700,  703,   61,  708,  702,  707,  710,  710,  711,
-
-      713,  716,  709,  726,  711,  713,  716,  712,  717,  717,
-      718,  721,  721,  723,  725,  718,  723,  724,  724,  727,
-      728,  729,  729,  730,  727,  731,  731,  732,  726,  725,
-      733,  735,  734,  736,  738,  728,  734,  739,  736,  740,
-      740,  733,  741,  730,  742,  743,  744,  747,  744,  732,
-      735,  739,  738,  745,  746,  748,  751,  749,  745,  746,
-      752,  751,  741,  749,  742,  743,  756,  747,  753,  748,
-      754,  753,  755,  755,  757,  754,  758,  759,  760,  761,
-      761,  758,  762,  760,  756,  752,  763,  762,  764,  765,
-      767,  766,  769,  768,  757,  770,  771,  769,  772,  773,
-
-      759,  776,  767,  774,  763,  766,  768,  782,  764,  765,
-      774,  775,  779,  779,  773,  770,  771,  776,  780,  772,
-      775,  780,  781,  775,  783,  784,  782,  785,  786,  786,
-      787,  781,  785,  783,  784,  788,  783,  789,  790,  791,
-      792,  793,  793,  794,  795,   56,  797,  799,  788,  798,
-      787,  797,  790,  799,  798,  789,  800,  801,  792,  794,
-      802,  800,  795,  802,  791,  804,  805,  806,  807,  802,
-      801,  809,  808,  804,  811,  816,  812,  813,  814,  805,
-      812,  815,  813,  814,  816,  806,  815,  807,  808,  809,
-      817,  818,  819,  819,  811,  820,  821,  823,  822,  824,
-
-      825,  826,  823,  827,  827,  832,  818,  826,  821,  820,
-      822,  824,  829,  817,  828,  828,  830,  830,  825,  831,
-      833,  829,  834,  842,  831,  844,  832,  835,  835,  836,
-      836,  837,  837,  838,  839,  841,  849,  839,  838,  833,
-      841,  842,  834,  843,  845,  845,  846,  846,  843,  847,
-      844,  848,  850,  851,  847,  852,  849,  853,  853,  854,
-      855,  855,  856,  848,  859,  848,  858,  861,  860,  863,
-      848,  859,  850,  851,  864,  858,  852,  860,  862,  862,
-      868,  866,  856,  867,  869,  854,  866,  871,  867,  872,
-      864,  869,  871,  861,  873,  863,  870,  870,  872,  875,
-
-      868,  874,  876,  877,  878,  879,  879,  880,  876,  881,
-      883,  883,  877,  891,  873,  878,  874,  882,  875,  885,
-      878,  884,  882,  881,  885,  884,  884,  886,  880,  887,
-      888,  889,  890,  893,  887,  889,  892,  895,  891,  886,
-      894,  892,  888,  897,  890,  894,  897,  898,  898,  895,
-      899,  899,  900,  906,  901,  893,  902,  903,  900,  901,
-      908,  908,  902,  909,  910,  906,  903,  911,  915,  916,
-      917,  925,  908,  910,  916,  923,  911,  918,  918,  920,
-      920,  909,  915,  919,  922,  919,  926,  917,  924,  924,
-      927,  922,  925,  928,  929,  923,  930,  934,  926,  932,
-
-      937,  933,  927,  933,  932,  928,  936,  936,  935,  929,
-      939,  942,  939,  938,  940,  934,  930,  935,  938,  940,
-      941,  943,  944,  945,  947,  941,  937,  944,  945,  942,
-      948,  949,  949,  950,  954,  955,  953,  951,  952,  954,
-      955,  943,  957,  947,  948,  950,  951,  952,  953,  951,
-      958,  959,  961,  963,  964,  957,  965,  967,  961,  963,
-      966,  966,  968,  968,  969,  965,  967,  959,  970,  971,
-      958,  972,  970,  974,  971,  973,  973,  977,  982,  964,
-      980,  974,  982,  969,  972,  983,  977,  978,  978,  979,
-      979,  981,  980,  984,  985,  986,  981,  987,  984,  988,
-
-      983,  989,  991,  990,  993,  993,  994,  997,  997,  994,
-     1013,  995,  996, 1013,  986,  990,  998,  998,  988, 1000,
-      985,  987,  989,  991,  995,  996,  999,  999, 1001, 1001,
-     1002, 1002, 1000, 1003, 1004, 1004, 1005, 1005, 1007, 1008,
-     1008, 1009, 1012, 1007, 1010, 1010, 1011, 1016, 1012, 1014,
-     1014, 1020, 1003, 1015, 1015, 1017, 1017, 1019, 1019, 1022,
-     1009, 1021, 1021, 1023, 1011, 1014, 1016, 1024, 1023, 1025,
-     1026, 1022, 1028, 1027, 1029, 1030, 1031, 1020, 1027, 1034,
-       51, 1031, 1025, 1029, 1030, 1032, 1036, 1028, 1041, 1032,
-     1042, 1026, 1024, 1037, 1037, 1036, 1038, 1039, 1039, 1034,
-
-     1045, 1038, 1042, 1041, 1044, 1045, 1039, 1044, 1046, 1046,
-     1047, 1051, 1048, 1050, 1047, 1048, 1049, 1049, 1050, 1052,
-     1053, 1054, 1055, 1052, 1056, 1058, 1054, 1055, 1059, 1060,
-     1056, 1051, 1061, 1059, 1061, 1064, 1064, 1060, 1067, 1067,
-     1053, 1058, 1070, 1070, 1072, 1072, 1074, 1075, 1075, 1076,
-     1077, 1074, 1078, 1080, 1080, 1083, 1084, 1078, 1084, 1085,
-     1083, 1086, 1086, 1089, 1085, 1076, 1087, 1087, 1088, 1088,
-     1090, 1091, 1077, 1092, 1093, 1089, 1094, 1095, 1095, 1097,
-     1096, 1098, 1099, 1091, 1100, 1092, 1093, 1103, 1090, 1096,
-     1101, 1102, 1103, 1104, 1107, 1099, 1094, 1113, 1104, 1105,
-
-     1105, 1098, 1108, 1108, 1101, 1097, 1110, 1110, 1100, 1102,
-     1111, 1112, 1107, 1114, 1115, 1113, 1116, 1117, 1117, 1111,
-     1118, 1119, 1120, 1121, 1125, 1118, 1112, 1127, 1127, 1126,
-     1115, 1114, 1126, 1128, 1129, 1116, 1119, 1131, 1131, 1132,
-     1138, 1120, 1139, 1121, 1125, 1133, 1133, 1176, 1128, 1137,
-     1137, 1139, 1129, 1142, 1140, 1141, 1144, 1147, 1132, 1140,
-     1141, 1142, 1138, 1145, 1146, 1148, 1148, 1176, 1145, 1146,
-     1150, 1144, 1147, 1149, 1149, 1150, 1151, 1151, 1152, 1152,
-     1154, 1155, 1158, 1157, 1164, 1154, 1157, 1159, 1160, 1161,
-     1161, 1162, 1165, 1155, 1168, 1158, 1159, 1160, 1166, 1166,
-
-     1162, 1167, 1168, 1164, 1169, 1171, 1172, 1174, 1174, 1169,
-     1167, 1165, 1177, 1177, 1171, 1178, 1179, 1179, 1178, 1172,
-     1180, 1180, 1181, 1182, 1183, 1184, 1184, 1185, 1188, 1183,
-     1191, 1185, 1193, 1192, 1188, 1194, 1194, 1182, 1195, 1196,
-     1181, 1192, 1197, 1198, 1196, 1200, 1199, 1202, 1203, 1191,
-     1202, 1193, 1204, 1204, 1195, 1199, 1205, 1210, 1206, 1208,
-     1205, 1209, 1197, 1214, 1214, 1200, 1203, 1206, 1208, 1198,
-     1213, 1215, 1217, 1209, 1218, 1213, 1219, 1217, 1220, 1222,
-     1215, 1223, 1210, 1218, 1221, 1221, 1224, 1226, 1222, 1227,
-     1225, 1228, 1226, 1220, 1233, 1219, 1230, 1223, 1225, 1229,
-
-     1229, 1230, 1232, 1232, 1234, 1224, 1235, 1235, 1236, 1236,
-     1228, 1237, 1238, 1239, 1233, 1227, 1240, 1240, 1243, 1241,
-     1242, 1242, 1245, 1246, 1238, 1267, 1234, 1250, 1246, 1267,
-     1237, 1241, 1250, 1239, 1247, 1247, 1245, 1243, 1248, 1248,
-     1249, 1249, 1251, 1251, 1253, 1253, 1255, 1255, 1256, 1259,
-     1260, 1260, 1265, 1256, 1261, 1263, 1276, 1259, 1278, 1261,
-     1263, 1266, 1266, 1271, 1271, 1273, 1275, 1275, 1293, 1273,
-       50, 1276, 1265, 1279, 1279, 1286, 1278, 1280, 1280, 1282,
-     1282, 1284, 1284, 1287, 1287, 1292, 1295, 1286, 1293, 1292,
-     1294, 1294, 1297, 1299, 1298, 1295, 1300, 1300,   45,   40,
-
-       14,   13,    0,    0,    0,    0,    0, 1297, 1298,    0,
-        0,    0, 1299, 1303, 1303, 1303, 1303, 1303, 1303, 1303,
-     1304, 1304, 1304, 1304, 1304, 1304, 1304, 1305, 1305, 1305,
-     1305, 1305, 1305, 1305, 1306, 1306, 1306, 1306, 1306, 1306,
-     1306, 1307, 1307, 1307, 1307, 1307, 1307, 1307, 1309, 1309,
-        0, 1309, 1309, 1309, 1309, 1310, 1310,    0,    0,    0,
-     1310, 1310, 1311, 1311,    0,    0, 1311,    0, 1311, 1312,
-        0,    0,    0,    0,    0, 1312, 1313, 1313,    0,    0,
-        0, 1313, 1313, 1314,    0,    0,    0,    0,    0, 1314,
-     1315, 1315,    0, 1315, 1315, 1315, 1315, 1316, 1316,    0,
-
-     1316, 1316, 1316, 1316, 1302, 1302, 1302, 1302, 1302, 1302,
-     1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302,
-     1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302,
-     1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302, 1302,
-     1302, 1302, 1302, 1302
+      377,  378,  379,  381,  380,  378,  384,  382,  383,  387,
+      374,  379,  388,  383,  387,  375,  385,  385,  376,  380,
+      377,  381,  382,  386,  389,  384,  390,  386,  388,  391,
+      392,  393,  394,  396,  397,  392,  391,  394,  393,  390,
+      395,  397,  399,  389,  398,  395,  401,  400,  403,  401,
+      402,  396,  400,  398,  402,  406,  399,  404,  404,  407,
+
+      406,  408,  409,  407,  413,  410,  404,  416,  417,  403,
+      409,  418,  419,  421,  417,  418,  416,  419,  421,  408,
+      410,  413,  420,  423,  420,  422,  420,  424,  426,  420,
+      424,  425,  425,  432,  420,  426,  427,  427,  428,  430,
+      420,  420,  430,  422,  429,  429,  431,  433,  423,  434,
+      434,  121,  432,  428,  435,  433,  436,  437,  438,  438,
+      439,  440,  437,  439,  441,  442,  431,  440,  443,  435,
+      444,  445,  441,  442,  436,  444,  446,  446,  445,  447,
+      448,  449,  452,  453,  453,  448,  443,  447,  451,  456,
+      454,  451,  457,  454,  458,  459,  452,  461,  460,  462,
+
+      449,  454,  463,  462,  464,  466,  461,  465,  468,  467,
+      456,  469,  473,  457,  458,  467,  465,  459,  460,  466,
+      463,  470,  472,  464,  473,  469,  470,  471,  468,  474,
+      475,  471,  476,  476,  474,  477,  478,  479,  482,  478,
+      477,  472,  481,  480,  483,  483,  485,  481,  484,  484,
+      486,  475,  487,  488,  486,  479,  480,  492,  482,  489,
+      491,  485,  494,  495,  491,  493,  512,  502,  497,  512,
+      498,  487,  496,  489,  497,  498,  494,  488,  490,  502,
+      493,  490,  492,  490,  495,  501,  496,  490,  500,  490,
+      499,  499,  504,  500,  490,  505,  499,  504,  499,  501,
+
+      503,  503,  507,  505,  506,  508,  508,  509,  511,  513,
+      514,  509,  515,  511,  517,  516,  499,  515,  506,  519,
+      518,  507,  520,  514,  516,  518,  521,  522,  513,  524,
+      529,  529,  522,  517,  535,  521,  520,  525,  526,  519,
+      527,  528,  525,  526,  524,  527,  530,  536,  532,  535,
+      528,  530,  532,  532,  533,  533,  534,  537,  533,  534,
+      537,  538,  544,  539,  540,  541,  538,  536,  539,  543,
+      540,  541,  542,  542,  545,  546,  547,  545,  543,  548,
+      544,  549,  550,  551,  552,  554,  553,  550,  551,  553,
+      557,  559,  555,  546,  549,  547,  554,  555,  556,  548,
+
+      558,  558,  552,  556,  560,  557,  563,  561,  562,  565,
+      559,  564,  562,  566,  571,  569,  570,  572,  560,  561,
+      564,  573,  572,  575,  563,  574,  573,  576,  565,  569,
+      574,  570,  578,  579,  571,  577,  581,  575,  566,  584,
+      577,  576,  580,  580,  582,  583,  585,  578,  579,  586,
+      583,  585,  587,  582,  581,  588,  587,  589,  584,  590,
+      592,  591,  593,  594,  588,  595,  597,  596,  586,  598,
+      600,  595,  589,  591,  590,  600,  601,  602,  598,  592,
+      603,  594,  596,  593,  604,  602,  597,  605,  606,  604,
+      601,  605,  605,  607,  608,  609,  609,  613,  610,  608,
+
+      603,  606,  607,  610,  611,  612,  612,  614,  615,  611,
+      616,  613,  617,  615,  618,  616,  620,  617,  618,  619,
+      622,  623,  624,  626,  622,  614,  627,  620,  619,  625,
+      628,  629,  635,  619,  627,  619,  623,  619,  630,  630,
+      624,  637,  626,  625,  631,  631,  633,  634,  628,  633,
+      639,  635,  634,  636,  636,  639,  629,  638,  638,  640,
+      640,  637,  641,  642,  643,  644,  645,  646,  642,  647,
+      644,  654,  643,  646,  649,  650,  647,  655,  651,  649,
+      650,  652,  641,  651,  645,  653,  652,  657,  655,  658,
+      654,  656,  656,  659,  653,  660,  661,  667,  659,  662,
+
+      663,  663,  664,  665,  669,  666,  670,  657,  669,  669,
+      674,  671,  658,  672,  677,  660,  661,  662,  672,  673,
+      667,  675,  664,  666,  676,  675,  678,  999,  665,  671,
+      674,  679,  670,  677,  680,  686,  681,  673,  682,  683,
+      678,  681,  676,  684,  683,  682,  679,  685,  687,  688,
+      686,  999,  689,  680,  687,  690,  685,  689,  691,  695,
+      690,  684,  694,  691,  692,  692,  696,  694,  698,  698,
+      688,  697,  699,  695,  700,  697,  697,  701,  703,  702,
+      704,  705,  706,  701,  702,  696,  708,  711,  707,  709,
+      713,  699,  711,  700,  710,  710,  715,  703,  718,  704,
+
+      705,  706,  707,  713,  709,  712,  714,  708,  717,  712,
+      716,  716,  719,  717,  722,  714,  715,  719,  718,  722,
+      723,  723,  724,  726,  726,  728,  728,  724,  730,  731,
+      731,  730,  732,  733,  734,  735,  736,  736,  740,  734,
+      737,  738,  738,  739,  741,  742,  743,  732,  741,  740,
+      735,  743,  745,  746,  747,  747,  748,  749,  733,  750,
+      737,  751,  754,  751,  742,  739,  752,  746,  753,  755,
+      745,  752,  756,  753,  759,  758,  748,  749,  756,  750,
+      758,  760,  754,  755,  760,  761,  762,  762,  763,  764,
+      761,  765,  766,  767,  771,  768,  774,  766,  770,  759,
+
+      768,  769,  769,  770,  772,  773,  763,  775,  764,  776,
+      774,  765,  771,  777,  778,  779,  767,  780,  777,  775,
+      782,  781,  776,  784,  772,  773,  790,  782,  783,  787,
+      787,  794,  794,  789,  778,  779,  781,  783,  780,  784,
+      783,  788,  789,  791,  788,  790,  793,  792,  795,  796,
+      798,  793,  791,  797,  799,  791,  792,  800,  801,  801,
+      802,  805,  796,  803,  798,  806,  805,  807,  795,  808,
+      806,  797,  809,  807,  808,  800,  802,  810,  814,  799,
+      810,  803,  813,  815,  816,  809,  810,  818,  817,  820,
+      813,  814,  821,  822,  823,  824,  821,  825,  822,  823,
+
+      824,  815,  826,  816,  817,  818,  825,  827,  830,  820,
+      828,  828,  829,  832,  834,  831,  833,  835,  832,  840,
+      830,  841,  827,  835,  840,  826,  829,  831,  833,  836,
+      836,  838,  834,  837,  837,  839,  839,  842,  843,  845,
+      838,  854,  841,  844,  844,  846,  846,  847,  847,  848,
+      849,  852,  851,  849,  848,  853,  842,  851,  843,  845,
+      853,  855,  855,  856,  856,  857,  854,  858,  859,  852,
+      857,  860,  861,  862,  863,  863,  864,  865,  865,  858,
+      866,  858,  869,  871,  868,  873,  858,  870,  859,  869,
+      874,  860,  861,  868,  862,  878,  870,  872,  872,  876,
+
+      866,  882,  864,  877,  876,  879,  874,  883,  877,  871,
+      882,  873,  879,  880,  880,  878,  881,  884,  885,  886,
+      887,  881,  888,  889,  889,  886,  890,  883,  891,  887,
+      892,  895,  884,  888,  901,  892,  895,  885,  888,  893,
+      893,  894,  891,  896,  897,  894,  894,  890,  898,  897,
+      899,  900,  902,  903,  899,  896,  904,  902,  905,  901,
+      898,  904,  907,  900,  916,  907,  908,  908,  909,  909,
+      905,  910,  913,  911,  912,  903,  916,  910,  911,  919,
+      912,  913,  918,  918,  920,  926,  921,  923,  923,  928,
+      930,  927,  930,  920,  918,  921,  927,  919,  933,  926,
+
+      929,  929,  931,  931,  934,  933,  928,  935,  935,  936,
+      937,  938,  940,  939,  941,  943,  944,  945,  944,  946,
+      943,  948,  937,  938,  934,  939,  953,  940,  946,  954,
+      936,  947,  947,  949,  941,  945,  951,  950,  949,  950,
+      952,  951,  958,  955,  953,  952,  956,  948,  955,  954,
+      959,  956,  960,  960,  961,  965,  962,  964,  963,  968,
+      965,  958,  969,  970,  959,  962,  961,  963,  962,  964,
+      966,  972,  968,  975,  974,  966,  976,  972,  978,  970,
+      974,  980,  969,  977,  977,  976,  981,  978,  979,  979,
+      981,  982,  983,  984,  984,  985,  982,  988,  975,  991,
+
+      980,  989,  989,  985,  992,  983,  988,  990,  990,  992,
+      993,  991,  994,  995,  993,  996,  997, 1000,  995, 1001,
+     1002, 1003, 1005, 1005, 1007, 1006, 1008,  994, 1006, 1009,
+     1009, 1015, 1002, 1010, 1010,  997, 1000, 1007, 1012, 1008,
+     1001,  996, 1003, 1011, 1011, 1013, 1013, 1014, 1014, 1021,
+     1015, 1012, 1016, 1016, 1017, 1017, 1019, 1020, 1020, 1022,
+     1022, 1019, 1023, 1024, 1025, 1026, 1026, 1025, 1021, 1024,
+     1027, 1027, 1028, 1029, 1029, 1031, 1031, 1032, 1033, 1033,
+     1023, 1026, 1034, 1035, 1036, 1037, 1038, 1039, 1035, 1040,
+     1041, 1028, 1039, 1042, 1034, 1043, 1046, 1044, 1037, 1041,
+
+     1043, 1044, 1042, 1032, 1040, 1048, 1053, 1038, 1050, 1036,
+     1049, 1049, 1054, 1050, 1048, 1057, 1046, 1051, 1051, 1056,
+     1057, 1053, 1056, 1063, 1054, 1059, 1051, 1058, 1058, 1059,
+     1060, 1061, 1061, 1060, 1062, 1065, 1064, 1066, 1068, 1062,
+     1064, 1067, 1066, 1063, 1068, 1070, 1067, 1071, 1072, 1073,
+     1089, 1073, 1071, 1076, 1076, 1065, 1072, 1079, 1079, 1082,
+     1082, 1070, 1084, 1084, 1086, 1087, 1087, 1088, 1090, 1086,
+     1092, 1092, 1089, 1090, 1095, 1096, 1097, 1096, 1101, 1095,
+     1102, 1097, 1103, 1088, 1098, 1098, 1099, 1099, 1100, 1100,
+     1101, 1104, 1105, 1106, 1103, 1107, 1107, 1108, 1102, 1109,
+
+     1110, 1111, 1112, 1104, 1105, 1113, 1108, 1115,  119, 1114,
+     1116, 1119, 1115, 1106, 1111, 1116, 1117, 1117, 1124, 1113,
+     1110, 1120, 1120, 1122, 1122, 1109, 1112, 1114, 1123, 1119,
+     1125, 1126, 1128, 1124, 1127, 1129, 1129, 1123, 1130, 1131,
+     1132, 1133, 1137, 1130, 1138, 1139, 1139, 1138, 1125, 1126,
+     1127, 1128, 1140, 1141, 1131, 1143, 1143, 1144, 1150, 1132,
+     1151, 1133, 1137, 1145, 1145, 1149, 1149, 1140, 1152, 1151,
+     1153, 1141, 1156, 1152, 1154, 1153, 1144, 1159, 1157, 1158,
+     1150,   67, 1154, 1157, 1158, 1160, 1160, 1156, 1161, 1161,
+     1162, 1176, 1159, 1163, 1163, 1162, 1164, 1164, 1166, 1167,
+
+     1170, 1169, 1177, 1166, 1169, 1171, 1172, 1173, 1173, 1174,
+     1176, 1167, 1180, 1170, 1171, 1172, 1178, 1178, 1174, 1179,
+     1180, 1177, 1181, 1183, 1184, 1186, 1186, 1181, 1179, 1188,
+     1189, 1189, 1183, 1190, 1191, 1191, 1190, 1184, 1192, 1192,
+     1193, 1194, 1195, 1196, 1196, 1200, 1197, 1195, 1203, 1188,
+     1197, 1200, 1204, 1205, 1207, 1194, 1206, 1206, 1193, 1208,
+     1204, 1209, 1210, 1212, 1208, 1211, 1214, 1203, 1215, 1214,
+     1207, 1218, 1205, 1217, 1211, 1216, 1216, 1217, 1220, 1221,
+     1218, 1209, 1222, 1212, 1225, 1227, 1215, 1220, 1210, 1225,
+     1229, 1221, 1226, 1226, 1227, 1229, 1230, 1231, 1232, 1233,
+
+     1233, 1234, 1235, 1236, 1237, 1230, 1238, 1222, 1239, 1240,
+     1234, 1238, 1237, 1232, 1241, 1241, 1231, 1245, 1235, 1242,
+     1244, 1244, 1236, 1246, 1242, 1247, 1247, 1249, 1240, 1248,
+     1248, 1250, 1251, 1257, 1239, 1252, 1252, 1245, 1253, 1254,
+     1254, 1255, 1307, 1250, 1258, 1246, 1249, 1257,   61, 1258,
+     1253, 1307, 1251, 1259, 1259, 1260, 1260, 1261, 1261, 1262,
+     1255, 1263, 1263, 1271, 1262, 1265, 1265, 1267, 1267, 1268,
+     1273, 1271, 1272, 1272, 1268, 1273, 1275, 1277, 1278, 1278,
+     1279, 1275, 1283, 1283, 1279, 1285, 1287, 1287, 1288, 1285,
+     1290, 1291, 1291, 1292, 1292, 1294, 1294, 1277, 1296, 1296,
+
+     1298, 1299, 1299, 1288, 1305, 1304, 1306, 1306, 1290, 1304,
+     1309, 1311, 1298, 1310, 1312, 1312,   56,   51,   50,   45,
+       40,   14,   13,    0, 1305, 1309,    0, 1310,    0,    0,
+     1311, 1315, 1315, 1315, 1315, 1315, 1315, 1315, 1316, 1316,
+     1316, 1316, 1316, 1316, 1316, 1317, 1317, 1317, 1317, 1317,
+     1317, 1317, 1318, 1318, 1318, 1318, 1318, 1318, 1318, 1319,
+     1319, 1319, 1319, 1319, 1319, 1319, 1321, 1321,    0, 1321,
+     1321, 1321, 1321, 1322, 1322,    0,    0,    0, 1322, 1322,
+     1323, 1323,    0,    0, 1323,    0, 1323, 1324,    0,    0,
+        0,    0,    0, 1324, 1325, 1325,    0,    0,    0, 1325,
+
+     1325, 1326,    0,    0,    0,    0,    0, 1326, 1327, 1327,
+        0, 1327, 1327, 1327, 1327, 1328, 1328,    0, 1328, 1328,
+     1328, 1328, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314,
+     1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314,
+     1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314,
+     1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314, 1314,
+     1314, 1314
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -1568,7 +1575,7 @@ static void config_end_include(void)
 #define YY_NO_INPUT 1
 #endif
 
-#line 1570 "<stdout>"
+#line 1577 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -1755,7 +1762,7 @@ YY_DECL
     
 #line 120 "./util/configlexer.lex"
 
-#line 1757 "<stdout>"
+#line 1764 "<stdout>"
 
        if ( !(yy_init) )
                {
@@ -1814,13 +1821,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 >= 1303 )
+                               if ( yy_current_state >= 1315 )
                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        ++yy_cp;
                        }
-               while ( yy_base[yy_current_state] != 2605 );
+               while ( yy_base[yy_current_state] != 2623 );
 
 yy_find_action:
                yy_act = yy_accept[yy_current_state];
@@ -2175,299 +2182,309 @@ YY_RULE_SETUP
 case 66:
 YY_RULE_SETUP
 #line 189 "./util/configlexer.lex"
-{ YDVAR(0, VAR_FORWARD_ZONE) }
+{ YDVAR(1, VAR_STUB_FIRST) }
        YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 190 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_ADDR) }
+{ YDVAR(0, VAR_FORWARD_ZONE) }
        YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 191 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FORWARD_HOST) }
+{ YDVAR(1, VAR_FORWARD_ADDR) }
        YY_BREAK
 case 69:
 YY_RULE_SETUP
 #line 192 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
+{ YDVAR(1, VAR_FORWARD_HOST) }
        YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 193 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
+{ YDVAR(1, VAR_FORWARD_FIRST) }
        YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 194 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
        YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 195 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_IDENTITY) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
        YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 196 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_VERSION) }
+{ YDVAR(2, VAR_ACCESS_CONTROL) }
        YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 197 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IDENTITY) }
+{ YDVAR(1, VAR_HIDE_IDENTITY) }
        YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 198 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VERSION) }
+{ YDVAR(1, VAR_HIDE_VERSION) }
        YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 199 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MODULE_CONF) }
+{ YDVAR(1, VAR_IDENTITY) }
        YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 200 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR) }
+{ YDVAR(1, VAR_VERSION) }
        YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 201 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
+{ YDVAR(1, VAR_MODULE_CONF) }
        YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 202 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR) }
        YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 203 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
        YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 204 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
        YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 205 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR) }
+{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
        YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 206 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
+{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
        YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 207 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
+{ YDVAR(1, VAR_TRUST_ANCHOR) }
        YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 208 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
+{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
        YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 209 "./util/configlexer.lex"
-{ YDVAR(1, VAR_BOGUS_TTL) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
        YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 210 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
        YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 211 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
+{ YDVAR(1, VAR_BOGUS_TTL) }
        YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 212 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
+{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
        YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 213 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
        YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 214 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
        YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 215 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
        YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 216 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
        YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 217 "./util/configlexer.lex"
-{ 
-                                 YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
        YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 219 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
+#line 218 "./util/configlexer.lex"
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
        YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 220 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
+#line 219 "./util/configlexer.lex"
+{ 
+                                 YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
        YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 221 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEEP_MISSING) }
+{ YDVAR(1, VAR_ADD_HOLDDOWN) }
        YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 222 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+{ YDVAR(1, VAR_DEL_HOLDDOWN) }
        YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 223 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_KEEP_MISSING) }
        YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 224 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_QUERIES) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
        YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 225 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
        YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 226 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(1, VAR_LOG_QUERIES) }
        YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 227 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
        YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 228 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
        YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 229 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
        YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 230 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
        YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 231 "./util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
        YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 232 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
        YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 233 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
        YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 234 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
        YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 235 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
        YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 236 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
        YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 237 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
        YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 238 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
        YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 239 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
        YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 240 "./util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
        YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 241 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
        YY_BREAK
 case 118:
-/* rule 118 can match eol */
 YY_RULE_SETUP
 #line 242 "./util/configlexer.lex"
+{ YDVAR(0, VAR_PYTHON) }
+       YY_BREAK
+case 119:
+YY_RULE_SETUP
+#line 243 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+       YY_BREAK
+case 120:
+/* rule 120 can match eol */
+YY_RULE_SETUP
+#line 244 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
        YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 119:
+case 121:
 YY_RULE_SETUP
-#line 245 "./util/configlexer.lex"
+#line 247 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
        YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 246 "./util/configlexer.lex"
+#line 248 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 120:
+case 122:
 YY_RULE_SETUP
-#line 251 "./util/configlexer.lex"
+#line 253 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 121:
-/* rule 121 can match eol */
+case 123:
+/* rule 123 can match eol */
 YY_RULE_SETUP
-#line 252 "./util/configlexer.lex"
+#line 254 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
                          cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 122:
+case 124:
 YY_RULE_SETUP
-#line 254 "./util/configlexer.lex"
+#line 256 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2480,34 +2497,34 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 123:
+case 125:
 YY_RULE_SETUP
-#line 266 "./util/configlexer.lex"
+#line 268 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
        YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 267 "./util/configlexer.lex"
+#line 269 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 124:
+case 126:
 YY_RULE_SETUP
-#line 272 "./util/configlexer.lex"
+#line 274 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 125:
-/* rule 125 can match eol */
+case 127:
+/* rule 127 can match eol */
 YY_RULE_SETUP
-#line 273 "./util/configlexer.lex"
+#line 275 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
                             cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 126:
+case 128:
 YY_RULE_SETUP
-#line 275 "./util/configlexer.lex"
+#line 277 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2520,38 +2537,38 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* include: directive */
-case 127:
+case 129:
 YY_RULE_SETUP
-#line 287 "./util/configlexer.lex"
+#line 289 "./util/configlexer.lex"
 { 
        LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
        YY_BREAK
 case YY_STATE_EOF(include):
-#line 289 "./util/configlexer.lex"
+#line 291 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 128:
+case 130:
 YY_RULE_SETUP
-#line 293 "./util/configlexer.lex"
+#line 295 "./util/configlexer.lex"
 { LEXOUT(("ISP ")); /* ignore */ }
        YY_BREAK
-case 129:
-/* rule 129 can match eol */
+case 131:
+/* rule 131 can match eol */
 YY_RULE_SETUP
-#line 294 "./util/configlexer.lex"
+#line 296 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++;}
        YY_BREAK
-case 130:
+case 132:
 YY_RULE_SETUP
-#line 295 "./util/configlexer.lex"
+#line 297 "./util/configlexer.lex"
 { LEXOUT(("IQS ")); BEGIN(include_quoted); }
        YY_BREAK
-case 131:
+case 133:
 YY_RULE_SETUP
-#line 296 "./util/configlexer.lex"
+#line 298 "./util/configlexer.lex"
 {
        LEXOUT(("Iunquotedstr(%s) ", yytext));
        config_start_include(yytext);
@@ -2559,27 +2576,27 @@ YY_RULE_SETUP
 }
        YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 301 "./util/configlexer.lex"
+#line 303 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 132:
+case 134:
 YY_RULE_SETUP
-#line 305 "./util/configlexer.lex"
+#line 307 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 133:
-/* rule 133 can match eol */
+case 135:
+/* rule 135 can match eol */
 YY_RULE_SETUP
-#line 306 "./util/configlexer.lex"
+#line 308 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
                                  cfg_parser->line++; BEGIN(inc_prev); }
        YY_BREAK
-case 134:
+case 136:
 YY_RULE_SETUP
-#line 308 "./util/configlexer.lex"
+#line 310 "./util/configlexer.lex"
 {
        LEXOUT(("IQE "));
        yytext[yyleng - 1] = '\0';
@@ -2589,7 +2606,7 @@ YY_RULE_SETUP
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 314 "./util/configlexer.lex"
+#line 316 "./util/configlexer.lex"
 {
        yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
        if (config_include_stack_ptr == 0) {
@@ -2600,33 +2617,33 @@ case YY_STATE_EOF(val):
        }
 }
        YY_BREAK
-case 135:
+case 137:
 YY_RULE_SETUP
-#line 324 "./util/configlexer.lex"
+#line 326 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
                        if(--num_args == 0) { BEGIN(INITIAL); }
                        yylval.str = strdup(yytext); return STRING_ARG; }
        YY_BREAK
-case 136:
+case 138:
 YY_RULE_SETUP
-#line 328 "./util/configlexer.lex"
+#line 330 "./util/configlexer.lex"
 {
        ub_c_error_msg("unknown keyword '%s'", yytext);
        }
        YY_BREAK
-case 137:
+case 139:
 YY_RULE_SETUP
-#line 332 "./util/configlexer.lex"
+#line 334 "./util/configlexer.lex"
 {
        ub_c_error_msg("stray '%s'", yytext);
        }
        YY_BREAK
-case 138:
+case 140:
 YY_RULE_SETUP
-#line 336 "./util/configlexer.lex"
+#line 338 "./util/configlexer.lex"
 ECHO;
        YY_BREAK
-#line 2628 "<stdout>"
+#line 2645 "<stdout>"
 
        case YY_END_OF_BUFFER:
                {
@@ -2916,7 +2933,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 >= 1303 )
+                       if ( yy_current_state >= 1315 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2944,11 +2961,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 >= 1303 )
+               if ( yy_current_state >= 1315 )
                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-       yy_is_jam = (yy_current_state == 1302);
+       yy_is_jam = (yy_current_state == 1314);
 
        return yy_is_jam ? 0 : yy_current_state;
 }
@@ -3585,7 +3602,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 336 "./util/configlexer.lex"
+#line 338 "./util/configlexer.lex"
 
 
 

diff --git a/util/configlexer.lex b/util/configlexer.lex
index 2661ffdf1bafc4c6fdcd38ec4ed94f0b65d68c40..ab934bc3c2b24f4936198de193c697567762aa83 100644 (file)
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -186,9 +186,11 @@ name{COLON}                        { YDVAR(1, VAR_NAME) }
 stub-addr{COLON}               { YDVAR(1, VAR_STUB_ADDR) }
 stub-host{COLON}               { YDVAR(1, VAR_STUB_HOST) }
 stub-prime{COLON}              { YDVAR(1, VAR_STUB_PRIME) }
+stub-first{COLON}              { YDVAR(1, VAR_STUB_FIRST) }
 forward-zone{COLON}            { YDVAR(0, VAR_FORWARD_ZONE) }
 forward-addr{COLON}            { YDVAR(1, VAR_FORWARD_ADDR) }
 forward-host{COLON}            { YDVAR(1, VAR_FORWARD_HOST) }
+forward-first{COLON}           { YDVAR(1, VAR_FORWARD_FIRST) }
 do-not-query-address{COLON}    { YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
 do-not-query-localhost{COLON}  { YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
 access-control{COLON}          { YDVAR(2, VAR_ACCESS_CONTROL) }

diff --git a/util/configparser.c b/util/configparser.c
index d40642a25250f46d0225e3cfbe06739b9249f6c8..913163233b7be26ccdde949faad9f7cd918e8740 100644 (file)
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */
+/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2009, 2010 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -66,8 +65,8 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 189 of yacc.c  */
-#line 38 "util/configparser.y"
+/* Line 268 of yacc.c  */
+#line 38 "./util/configparser.y"
 
 #include "config.h"
 
@@ -95,8 +94,8 @@ extern struct config_parser_state* cfg_parser;
 
 
 
-/* Line 189 of yacc.c  */
-#line 100 "util/configparser.c"
+/* Line 268 of yacc.c  */
+#line 99 "util/configparser.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -245,7 +244,9 @@ extern struct config_parser_state* cfg_parser;
      VAR_SSL_UPSTREAM = 377,
      VAR_SSL_SERVICE_KEY = 378,
      VAR_SSL_SERVICE_PEM = 379,
-     VAR_SSL_PORT = 380
+     VAR_SSL_PORT = 380,
+     VAR_FORWARD_FIRST = 381,
+     VAR_STUB_FIRST = 382
    };
 #endif
 /* Tokens.  */
@@ -372,6 +373,8 @@ extern struct config_parser_state* cfg_parser;
 #define VAR_SSL_SERVICE_KEY 378
 #define VAR_SSL_SERVICE_PEM 379
 #define VAR_SSL_PORT 380
+#define VAR_FORWARD_FIRST 381
+#define VAR_STUB_FIRST 382
 
 
 
@@ -380,15 +383,15 @@ extern struct config_parser_state* cfg_parser;
 typedef union YYSTYPE
 {
 
-/* Line 214 of yacc.c  */
-#line 64 "util/configparser.y"
+/* Line 293 of yacc.c  */
+#line 64 "./util/configparser.y"
 
        char*   str;
 
 
 
-/* Line 214 of yacc.c  */
-#line 392 "util/configparser.c"
+/* Line 293 of yacc.c  */
+#line 395 "util/configparser.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -399,8 +402,8 @@ typedef union YYSTYPE
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 404 "util/configparser.c"
+/* Line 343 of yacc.c  */
+#line 407 "util/configparser.c"
 
 #ifdef short
 # undef short
@@ -503,11 +506,11 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -530,24 +533,24 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -576,23 +579,7 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)             \
-      do                                       \
-       {                                       \
-         YYSIZE_T yyi;                         \
-         for (yyi = 0; yyi < (Count); yyi++)   \
-           (To)[yyi] = (From)[yyi];            \
-       }                                       \
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -612,23 +599,43 @@ union yyalloc
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)             \
+      do                                       \
+       {                                       \
+         YYSIZE_T yyi;                         \
+         for (yyi = 0; yyi < (Count); yyi++)   \
+           (To)[yyi] = (From)[yyi];            \
+       }                                       \
+      while (YYID (0))
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   229
+#define YYLAST   233
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  126
+#define YYNTOKENS  128
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  129
+#define YYNNTS  131
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  245
+#define YYNRULES  249
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  359
+#define YYNSTATES  365
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   380
+#define YYMAXUTOK   382
 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -674,7 +681,7 @@ static const yytype_uint8 yytranslate[] =
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125
+     125,   126,   127
 };
 
 #if YYDEBUG
@@ -693,116 +700,117 @@ static const yytype_uint16 yyprhs[] =
      164,   166,   168,   170,   172,   174,   176,   178,   180,   182,
      184,   186,   188,   190,   192,   194,   196,   198,   200,   202,
      204,   206,   208,   210,   212,   214,   216,   218,   220,   222,
-     225,   226,   228,   230,   232,   234,   236,   239,   240,   242,
-     244,   246,   249,   252,   255,   258,   261,   264,   267,   270,
-     273,   276,   279,   282,   285,   288,   291,   294,   297,   300,
-     303,   306,   309,   312,   315,   318,   321,   324,   327,   330,
-     333,   336,   339,   342,   345,   348,   351,   354,   357,   360,
-     363,   366,   369,   372,   375,   378,   381,   384,   387,   390,
-     393,   396,   399,   402,   405,   408,   411,   414,   417,   420,
-     423,   426,   429,   432,   435,   438,   441,   444,   447,   450,
-     453,   456,   459,   462,   465,   468,   472,   475,   478,   481,
-     484,   487,   490,   493,   496,   499,   502,   505,   508,   511,
-     514,   517,   520,   523,   526,   530,   533,   536,   539,   542,
-     545,   548,   551,   554,   557,   559,   562,   563,   565,   567,
-     569,   571,   573,   575,   577,   580,   583,   586,   589,   592,
-     595,   598,   600,   603,   604,   606
+     225,   226,   228,   230,   232,   234,   236,   238,   241,   242,
+     244,   246,   248,   250,   253,   256,   259,   262,   265,   268,
+     271,   274,   277,   280,   283,   286,   289,   292,   295,   298,
+     301,   304,   307,   310,   313,   316,   319,   322,   325,   328,
+     331,   334,   337,   340,   343,   346,   349,   352,   355,   358,
+     361,   364,   367,   370,   373,   376,   379,   382,   385,   388,
+     391,   394,   397,   400,   403,   406,   409,   412,   415,   418,
+     421,   424,   427,   430,   433,   436,   439,   442,   445,   448,
+     451,   454,   457,   460,   463,   466,   469,   472,   476,   479,
+     482,   485,   488,   491,   494,   497,   500,   503,   506,   509,
+     512,   515,   518,   521,   524,   527,   530,   534,   537,   540,
+     543,   546,   549,   552,   555,   558,   561,   564,   567,   569,
+     572,   573,   575,   577,   579,   581,   583,   585,   587,   590,
+     593,   596,   599,   602,   605,   608,   610,   613,   614,   616
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     127,     0,    -1,    -1,   127,   128,    -1,   129,   130,    -1,
-     132,   133,    -1,   135,   136,    -1,   251,   252,    -1,   241,
-     242,    -1,    11,    -1,   130,   131,    -1,    -1,   138,    -1,
-     139,    -1,   143,    -1,   146,    -1,   152,    -1,   153,    -1,
-     154,    -1,   155,    -1,   144,    -1,   165,    -1,   166,    -1,
-     167,    -1,   168,    -1,   169,    -1,   186,    -1,   187,    -1,
-     188,    -1,   190,    -1,   191,    -1,   149,    -1,   192,    -1,
-     193,    -1,   196,    -1,   194,    -1,   195,    -1,   197,    -1,
-     198,    -1,   199,    -1,   210,    -1,   178,    -1,   179,    -1,
-     180,    -1,   181,    -1,   200,    -1,   213,    -1,   174,    -1,
-     176,    -1,   214,    -1,   219,    -1,   220,    -1,   221,    -1,
-     150,    -1,   185,    -1,   228,    -1,   229,    -1,   175,    -1,
-     224,    -1,   162,    -1,   145,    -1,   170,    -1,   211,    -1,
-     217,    -1,   201,    -1,   212,    -1,   231,    -1,   232,    -1,
-     151,    -1,   140,    -1,   161,    -1,   204,    -1,   141,    -1,
-     147,    -1,   148,    -1,   171,    -1,   172,    -1,   230,    -1,
-     203,    -1,   205,    -1,   206,    -1,   142,    -1,   233,    -1,
-     189,    -1,   209,    -1,   163,    -1,   177,    -1,   215,    -1,
-     216,    -1,   218,    -1,   223,    -1,   173,    -1,   225,    -1,
-     226,    -1,   227,    -1,   182,    -1,   184,    -1,   207,    -1,
-     208,    -1,   183,    -1,   202,    -1,   222,    -1,   164,    -1,
-     156,    -1,   157,    -1,   158,    -1,   159,    -1,   160,    -1,
-      38,    -1,   133,   134,    -1,    -1,   234,    -1,   235,    -1,
-     236,    -1,   237,    -1,    44,    -1,   136,   137,    -1,    -1,
-     238,    -1,   239,    -1,   240,    -1,    13,    10,    -1,    12,
-      10,    -1,    76,    10,    -1,    79,    10,    -1,    96,    10,
-      -1,    14,    10,    -1,    16,    10,    -1,    67,    10,    -1,
-      15,    10,    -1,    80,    10,    -1,    81,    10,    -1,    31,
-      10,    -1,    60,    10,    -1,    75,    10,    -1,    17,    10,
-      -1,    18,    10,    -1,    19,    10,    -1,    20,    10,    -1,
-     121,    10,    -1,   122,    10,    -1,   123,    10,    -1,   124,
-      10,    -1,   125,    10,    -1,    77,    10,    -1,    66,    10,
-      -1,   101,    10,    -1,   120,    10,    -1,    21,    10,    -1,
-      22,    10,    -1,    23,    10,    -1,    24,    10,    -1,    25,
-      10,    -1,    68,    10,    -1,    82,    10,    -1,    83,    10,
-      -1,   109,    10,    -1,    54,    10,    -1,    64,    10,    -1,
-      55,    10,    -1,   102,    10,    -1,    48,    10,    -1,    49,
-      10,    -1,    50,    10,    -1,    51,    10,    -1,   113,    10,
-      -1,   117,    10,    -1,   114,    10,    -1,    61,    10,    -1,
-      26,    10,    -1,    27,    10,    -1,    28,    10,    -1,    98,
-      10,    -1,    29,    10,    -1,    30,    10,    -1,    32,    10,
-      -1,    33,    10,    -1,    35,    10,    -1,    36,    10,    -1,
-      34,    10,    -1,    41,    10,    -1,    42,    10,    -1,    43,
-      10,    -1,    52,    10,    -1,    71,    10,    -1,   118,    10,
-      -1,    85,    10,    -1,    78,    10,    -1,    86,    10,    -1,
-      87,    10,    -1,   115,    10,    -1,   116,    10,    -1,   100,
-      10,    -1,    47,    10,    -1,    69,    10,    -1,    72,    10,
-      10,    -1,    53,    10,    -1,    56,    10,    -1,   105,    10,
-      -1,   106,    10,    -1,    70,    10,    -1,   107,    10,    -1,
-      57,    10,    -1,    58,    10,    -1,    59,    10,    -1,   119,
-      10,    -1,   108,    10,    -1,    65,    10,    -1,   111,    10,
-      -1,   112,    10,    -1,   110,    10,    -1,    62,    10,    -1,
-      63,    10,    -1,    84,    10,    -1,    73,    10,    10,    -1,
-      74,    10,    -1,    97,    10,    -1,    37,    10,    -1,    39,
-      10,    -1,    40,    10,    -1,    99,    10,    -1,    37,    10,
-      -1,    45,    10,    -1,    46,    10,    -1,    88,    -1,   242,
-     243,    -1,    -1,   244,    -1,   246,    -1,   245,    -1,   247,
-      -1,   248,    -1,   249,    -1,   250,    -1,    89,    10,    -1,
+     129,     0,    -1,    -1,   129,   130,    -1,   131,   132,    -1,
+     134,   135,    -1,   137,   138,    -1,   255,   256,    -1,   245,
+     246,    -1,    11,    -1,   132,   133,    -1,    -1,   140,    -1,
+     141,    -1,   145,    -1,   148,    -1,   154,    -1,   155,    -1,
+     156,    -1,   157,    -1,   146,    -1,   167,    -1,   168,    -1,
+     169,    -1,   170,    -1,   171,    -1,   188,    -1,   189,    -1,
+     190,    -1,   192,    -1,   193,    -1,   151,    -1,   194,    -1,
+     195,    -1,   198,    -1,   196,    -1,   197,    -1,   199,    -1,
+     200,    -1,   201,    -1,   212,    -1,   180,    -1,   181,    -1,
+     182,    -1,   183,    -1,   202,    -1,   215,    -1,   176,    -1,
+     178,    -1,   216,    -1,   221,    -1,   222,    -1,   223,    -1,
+     152,    -1,   187,    -1,   230,    -1,   231,    -1,   177,    -1,
+     226,    -1,   164,    -1,   147,    -1,   172,    -1,   213,    -1,
+     219,    -1,   203,    -1,   214,    -1,   233,    -1,   234,    -1,
+     153,    -1,   142,    -1,   163,    -1,   206,    -1,   143,    -1,
+     149,    -1,   150,    -1,   173,    -1,   174,    -1,   232,    -1,
+     205,    -1,   207,    -1,   208,    -1,   144,    -1,   235,    -1,
+     191,    -1,   211,    -1,   165,    -1,   179,    -1,   217,    -1,
+     218,    -1,   220,    -1,   225,    -1,   175,    -1,   227,    -1,
+     228,    -1,   229,    -1,   184,    -1,   186,    -1,   209,    -1,
+     210,    -1,   185,    -1,   204,    -1,   224,    -1,   166,    -1,
+     158,    -1,   159,    -1,   160,    -1,   161,    -1,   162,    -1,
+      38,    -1,   135,   136,    -1,    -1,   236,    -1,   237,    -1,
+     238,    -1,   240,    -1,   239,    -1,    44,    -1,   138,   139,
+      -1,    -1,   241,    -1,   242,    -1,   243,    -1,   244,    -1,
+      13,    10,    -1,    12,    10,    -1,    76,    10,    -1,    79,
+      10,    -1,    96,    10,    -1,    14,    10,    -1,    16,    10,
+      -1,    67,    10,    -1,    15,    10,    -1,    80,    10,    -1,
+      81,    10,    -1,    31,    10,    -1,    60,    10,    -1,    75,
+      10,    -1,    17,    10,    -1,    18,    10,    -1,    19,    10,
+      -1,    20,    10,    -1,   121,    10,    -1,   122,    10,    -1,
+     123,    10,    -1,   124,    10,    -1,   125,    10,    -1,    77,
+      10,    -1,    66,    10,    -1,   101,    10,    -1,   120,    10,
+      -1,    21,    10,    -1,    22,    10,    -1,    23,    10,    -1,
+      24,    10,    -1,    25,    10,    -1,    68,    10,    -1,    82,
+      10,    -1,    83,    10,    -1,   109,    10,    -1,    54,    10,
+      -1,    64,    10,    -1,    55,    10,    -1,   102,    10,    -1,
+      48,    10,    -1,    49,    10,    -1,    50,    10,    -1,    51,
+      10,    -1,   113,    10,    -1,   117,    10,    -1,   114,    10,
+      -1,    61,    10,    -1,    26,    10,    -1,    27,    10,    -1,
+      28,    10,    -1,    98,    10,    -1,    29,    10,    -1,    30,
+      10,    -1,    32,    10,    -1,    33,    10,    -1,    35,    10,
+      -1,    36,    10,    -1,    34,    10,    -1,    41,    10,    -1,
+      42,    10,    -1,    43,    10,    -1,    52,    10,    -1,    71,
+      10,    -1,   118,    10,    -1,    85,    10,    -1,    78,    10,
+      -1,    86,    10,    -1,    87,    10,    -1,   115,    10,    -1,
+     116,    10,    -1,   100,    10,    -1,    47,    10,    -1,    69,
+      10,    -1,    72,    10,    10,    -1,    53,    10,    -1,    56,
+      10,    -1,   105,    10,    -1,   106,    10,    -1,    70,    10,
+      -1,   107,    10,    -1,    57,    10,    -1,    58,    10,    -1,
+      59,    10,    -1,   119,    10,    -1,   108,    10,    -1,    65,
+      10,    -1,   111,    10,    -1,   112,    10,    -1,   110,    10,
+      -1,    62,    10,    -1,    63,    10,    -1,    84,    10,    -1,
+      73,    10,    10,    -1,    74,    10,    -1,    97,    10,    -1,
+      37,    10,    -1,    39,    10,    -1,    40,    10,    -1,   127,
+      10,    -1,    99,    10,    -1,    37,    10,    -1,    45,    10,
+      -1,    46,    10,    -1,   126,    10,    -1,    88,    -1,   246,
+     247,    -1,    -1,   248,    -1,   250,    -1,   249,    -1,   251,
+      -1,   252,    -1,   253,    -1,   254,    -1,    89,    10,    -1,
       91,    10,    -1,    90,    10,    -1,    92,    10,    -1,    93,
       10,    -1,    94,    10,    -1,    95,    10,    -1,   103,    -1,
-     252,   253,    -1,    -1,   254,    -1,   104,    10,    -1
+     256,   257,    -1,    -1,   258,    -1,   104,    10,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   109,   109,   109,   110,   110,   111,   111,   112,   116,
-     121,   122,   123,   123,   123,   124,   124,   125,   125,   125,
-     126,   126,   126,   127,   127,   127,   128,   128,   129,   129,
-     130,   130,   131,   131,   132,   132,   133,   133,   134,   134,
-     135,   135,   136,   136,   136,   137,   137,   137,   138,   138,
-     138,   139,   139,   140,   140,   141,   141,   142,   142,   143,
-     143,   143,   144,   144,   145,   145,   146,   146,   146,   147,
-     147,   148,   148,   149,   149,   150,   150,   150,   151,   151,
-     152,   152,   153,   153,   154,   154,   155,   155,   156,   156,
-     156,   157,   157,   158,   158,   158,   159,   159,   159,   160,
-     160,   160,   161,   161,   161,   162,   162,   162,   164,   176,
-     177,   178,   178,   178,   178,   180,   192,   193,   194,   194,
-     194,   196,   205,   214,   225,   234,   243,   252,   265,   280,
-     289,   298,   307,   316,   325,   334,   343,   352,   361,   370,
-     379,   388,   395,   402,   411,   420,   434,   443,   452,   459,
-     466,   473,   481,   488,   495,   502,   509,   517,   525,   533,
-     540,   547,   556,   565,   572,   579,   587,   595,   608,   619,
-     627,   640,   649,   658,   666,   679,   688,   696,   705,   713,
-     726,   733,   743,   753,   763,   773,   783,   793,   803,   810,
-     817,   826,   835,   844,   851,   861,   875,   882,   900,   913,
-     926,   935,   944,   953,   963,   973,   982,   991,   998,  1007,
-    1016,  1025,  1033,  1046,  1054,  1076,  1083,  1098,  1108,  1115,
-    1122,  1132,  1142,  1149,  1156,  1161,  1162,  1163,  1163,  1163,
-    1164,  1164,  1164,  1165,  1167,  1177,  1186,  1193,  1200,  1207,
-    1214,  1221,  1226,  1227,  1228,  1230
+       0,   110,   110,   110,   111,   111,   112,   112,   113,   117,
+     122,   123,   124,   124,   124,   125,   125,   126,   126,   126,
+     127,   127,   127,   128,   128,   128,   129,   129,   130,   130,
+     131,   131,   132,   132,   133,   133,   134,   134,   135,   135,
+     136,   136,   137,   137,   137,   138,   138,   138,   139,   139,
+     139,   140,   140,   141,   141,   142,   142,   143,   143,   144,
+     144,   144,   145,   145,   146,   146,   147,   147,   147,   148,
+     148,   149,   149,   150,   150,   151,   151,   151,   152,   152,
+     153,   153,   154,   154,   155,   155,   156,   156,   157,   157,
+     157,   158,   158,   159,   159,   159,   160,   160,   160,   161,
+     161,   161,   162,   162,   162,   163,   163,   163,   165,   177,
+     178,   179,   179,   179,   179,   179,   181,   193,   194,   195,
+     195,   195,   195,   197,   206,   215,   226,   235,   244,   253,
+     266,   281,   290,   299,   308,   317,   326,   335,   344,   353,
+     362,   371,   380,   389,   396,   403,   412,   421,   435,   444,
+     453,   460,   467,   474,   482,   489,   496,   503,   510,   518,
+     526,   534,   541,   548,   557,   566,   573,   580,   588,   596,
+     609,   620,   628,   641,   650,   659,   667,   680,   689,   697,
+     706,   714,   727,   734,   744,   754,   764,   774,   784,   794,
+     804,   811,   818,   827,   836,   845,   852,   862,   876,   883,
+     901,   914,   927,   936,   945,   954,   964,   974,   983,   992,
+     999,  1008,  1017,  1026,  1034,  1047,  1055,  1077,  1084,  1099,
+    1109,  1116,  1123,  1132,  1142,  1152,  1159,  1166,  1175,  1180,
+    1181,  1182,  1182,  1182,  1183,  1183,  1183,  1184,  1186,  1196,
+    1205,  1212,  1219,  1226,  1233,  1240,  1245,  1246,  1247,  1249
 };
 #endif
 
@@ -850,11 +858,12 @@ static const char *const yytname[] =
   "VAR_EDNS_BUFFER_SIZE", "VAR_PREFETCH", "VAR_PREFETCH_KEY",
   "VAR_SO_SNDBUF", "VAR_HARDEN_BELOW_NXDOMAIN", "VAR_IGNORE_CD_FLAG",
   "VAR_LOG_QUERIES", "VAR_TCP_UPSTREAM", "VAR_SSL_UPSTREAM",
-  "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM", "VAR_SSL_PORT", "$accept",
-  "toplevelvars", "toplevelvar", "serverstart", "contents_server",
-  "content_server", "stubstart", "contents_stub", "content_stub",
-  "forwardstart", "contents_forward", "content_forward",
-  "server_num_threads", "server_verbosity", "server_statistics_interval",
+  "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM", "VAR_SSL_PORT",
+  "VAR_FORWARD_FIRST", "VAR_STUB_FIRST", "$accept", "toplevelvars",
+  "toplevelvar", "serverstart", "contents_server", "content_server",
+  "stubstart", "contents_stub", "content_stub", "forwardstart",
+  "contents_forward", "content_forward", "server_num_threads",
+  "server_verbosity", "server_statistics_interval",
   "server_statistics_cumulative", "server_extended_statistics",
   "server_port", "server_interface", "server_outgoing_interface",
   "server_outgoing_range", "server_outgoing_port_permit",
@@ -894,8 +903,8 @@ static const char *const yytname[] =
   "server_del_holddown", "server_keep_missing", "server_key_cache_size",
   "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone",
   "server_local_data", "server_local_data_ptr", "stub_name", "stub_host",
-  "stub_addr", "stub_prime", "forward_name", "forward_host",
-  "forward_addr", "rcstart", "contents_rc", "content_rc",
+  "stub_addr", "stub_first", "stub_prime", "forward_name", "forward_host",
+  "forward_addr", "forward_first", "rcstart", "contents_rc", "content_rc",
   "rc_control_enable", "rc_control_port", "rc_control_interface",
   "rc_server_key_file", "rc_server_cert_file", "rc_control_key_file",
   "rc_control_cert_file", "pythonstart", "contents_py", "content_py",
@@ -920,26 +929,26 @@ static const yytype_uint16 yytoknum[] =
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380
+     375,   376,   377,   378,   379,   380,   381,   382
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+static const yytype_uint16 yyr1[] =
 {
-       0,   126,   127,   127,   128,   128,   128,   128,   128,   129,
-     130,   130,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   132,   133,
-     133,   134,   134,   134,   134,   135,   136,   136,   137,   137,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+       0,   128,   129,   129,   130,   130,   130,   130,   130,   131,
+     132,   132,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   134,   135,
+     135,   136,   136,   136,   136,   136,   137,   138,   138,   139,
+     139,   139,   139,   140,   141,   142,   143,   144,   145,   146,
      147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
      157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
      167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
@@ -949,9 +958,9 @@ static const yytype_uint8 yyr1[] =
      207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
      217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
      227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
-     237,   238,   239,   240,   241,   242,   242,   243,   243,   243,
-     243,   243,   243,   243,   244,   245,   246,   247,   248,   249,
-     250,   251,   252,   252,   253,   254
+     237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
+     246,   247,   247,   247,   247,   247,   247,   247,   248,   249,
+     250,   251,   252,   253,   254,   255,   256,   256,   257,   258
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -968,29 +977,29 @@ static const yytype_uint8 yyr2[] =
        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,     2,
-       0,     1,     1,     1,     1,     1,     2,     0,     1,     1,
-       1,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       0,     1,     1,     1,     1,     1,     1,     2,     0,     1,
+       1,     1,     1,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     3,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     3,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     3,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
-       2,     1,     2,     0,     1,     2
+       2,     2,     2,     2,     2,     2,     3,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     1,     2,
+       0,     1,     1,     1,     1,     1,     1,     1,     2,     2,
+       2,     2,     2,     2,     2,     1,     2,     0,     1,     2
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       2,     0,     1,     9,   108,   115,   224,   241,     3,    11,
-     110,   117,   226,   243,     4,     5,     6,     8,     7,     0,
+       2,     0,     1,     9,   108,   116,   228,   245,     3,    11,
+     110,   118,   230,   247,     4,     5,     6,     8,     7,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1010,28 +1019,29 @@ static const yytype_uint8 yydefact[] =
      100,    78,    71,    79,    80,    97,    98,    84,    40,    62,
       65,    46,    49,    87,    88,    63,    89,    50,    51,    52,
      101,    90,    58,    92,    93,    94,    55,    56,    77,    66,
-      67,    82,     0,     0,     0,     0,   109,   111,   112,   113,
-     114,     0,     0,     0,   116,   118,   119,   120,     0,     0,
-       0,     0,     0,     0,     0,   225,   227,   229,   228,   230,
-     231,   232,   233,     0,   242,   244,   122,   121,   126,   129,
-     127,   135,   136,   137,   138,   148,   149,   150,   151,   152,
-     169,   170,   171,   173,   174,   132,   175,   176,   179,   177,
-     178,   180,   181,   182,   193,   161,   162,   163,   164,   183,
-     196,   157,   159,   197,   202,   203,   204,   133,   168,   211,
-     212,   158,   207,   145,   128,   153,   194,   200,   184,     0,
-       0,   215,   134,   123,   144,   187,   124,   130,   131,   154,
-     155,   213,   186,   188,   189,   125,   216,   172,   192,   146,
-     160,   198,   199,   201,   206,   156,   210,   208,   209,   165,
-     167,   190,   191,   166,   185,   205,   147,   139,   140,   141,
-     142,   143,   217,   218,   219,   220,   221,   222,   223,   234,
-     236,   235,   237,   238,   239,   240,   245,   195,   214
+      67,    82,     0,     0,     0,     0,     0,   109,   111,   112,
+     113,   115,   114,     0,     0,     0,     0,   117,   119,   120,
+     121,   122,     0,     0,     0,     0,     0,     0,     0,   229,
+     231,   233,   232,   234,   235,   236,   237,     0,   246,   248,
+     124,   123,   128,   131,   129,   137,   138,   139,   140,   150,
+     151,   152,   153,   154,   171,   172,   173,   175,   176,   134,
+     177,   178,   181,   179,   180,   182,   183,   184,   195,   163,
+     164,   165,   166,   185,   198,   159,   161,   199,   204,   205,
+     206,   135,   170,   213,   214,   160,   209,   147,   130,   155,
+     196,   202,   186,     0,     0,   217,   136,   125,   146,   189,
+     126,   132,   133,   156,   157,   215,   188,   190,   191,   127,
+     218,   174,   194,   148,   162,   200,   201,   203,   208,   158,
+     212,   210,   211,   167,   169,   192,   193,   168,   187,   207,
+     149,   141,   142,   143,   144,   145,   219,   220,   221,   223,
+     222,   224,   225,   226,   227,   238,   240,   239,   241,   242,
+     243,   244,   249,   197,   216
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,     8,     9,    14,   115,    10,    15,   216,    11,
-      16,   224,   116,   117,   118,   119,   120,   121,   122,   123,
+      -1,     1,     8,     9,    14,   115,    10,    15,   217,    11,
+      16,   227,   116,   117,   118,   119,   120,   121,   122,   123,
      124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
      134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
      144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
@@ -1040,9 +1050,10 @@ static const yytype_int16 yydefgoto[] =
      174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
      184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
      194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,   210,   211,   217,   218,
-     219,   220,   225,   226,   227,    12,    17,   235,   236,   237,
-     238,   239,   240,   241,   242,    13,    18,   244,   245
+     204,   205,   206,   207,   208,   209,   210,   211,   218,   219,
+     220,   221,   222,   228,   229,   230,   231,    12,    17,   239,
+     240,   241,   242,   243,   244,   245,   246,    13,    18,   248,
+     249
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -1057,11 +1068,13 @@ static const yytype_int16 yypact[] =
      125,   126,   127,   128,   130,   131,   132,   133,   134,   135,
      136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
      146,   147,   148,   149,   150,   151,   152,   153,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201,   202,   -80,   -80,   -80,   -80,   -80,
+     158,   159,   160,   161,   163,   164,   165,   166,   167,   168,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   -80,   -80,   -80,   -80,   -80,
+     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
@@ -1069,23 +1082,22 @@ static const yytype_int16 yypact[] =
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     -80,   -80,   205,   206,   207,   208,   209,   -80,   -80,   -80,
+     -80,   -80,   -80,   210,   211,   212,   213,   -80,   -80,   -80,
+     -80,   -80,   214,   215,   216,   217,   218,   219,   220,   -80,
+     -80,   -80,   -80,   -80,   -80,   -80,   -80,   221,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   203,   204,   205,   206,   -80,   -80,   -80,   -80,
-     -80,   207,   208,   209,   -80,   -80,   -80,   -80,   210,   211,
-     212,   213,   214,   215,   216,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   217,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     -80,   -80,   -80,   222,   223,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   218,
-     219,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80
+     -80,   -80,   -80,   -80,   -80
 };
 
 /* YYPGOTO[NTERM-NUM].  */
@@ -1103,41 +1115,48 @@ static const yytype_int8 yypgoto[] =
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80
+     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     -80
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
 static const yytype_uint16 yytable[] =
 {
       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
       29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,   243,   246,   247,   248,    44,
-      45,    46,   249,   250,   251,    47,    48,    49,    50,    51,
+      39,    40,    41,    42,    43,   247,   250,   251,   252,    44,
+      45,    46,   253,   254,   255,    47,    48,    49,    50,    51,
       52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
       62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,     2,   212,   252,   213,
-     214,   253,   254,   221,    88,    89,    90,     3,    91,    92,
-      93,   222,   223,    94,    95,    96,    97,    98,    99,   100,
+      82,    83,    84,    85,    86,    87,     2,   212,   256,   213,
+     214,   257,   258,   223,    88,    89,    90,     3,    91,    92,
+      93,   224,   225,    94,    95,    96,    97,    98,    99,   100,
      101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,     4,   255,   256,   257,   258,   259,
-       5,   228,   229,   230,   231,   232,   233,   234,   260,   261,
-     262,   263,   264,   265,   266,   267,   268,   269,   270,   215,
-     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-     291,   292,   293,   294,     6,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,     7,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
-     349,   350,   351,   352,   353,   354,   355,   356,   357,   358
+     111,   112,   113,   114,     4,   259,   260,   261,   262,   263,
+       5,   232,   233,   234,   235,   236,   237,   238,   264,   265,
+     266,   267,   268,   269,   270,   271,   272,   273,   274,   215,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,     6,   299,   300,   216,   301,   302,
+     303,   304,   226,   305,   306,   307,   308,   309,   310,     7,
+     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
+     321,   322,   323,   324,   325,   326,   327,   328,   329,   330,
+     331,   332,   333,   334,   335,   336,   337,   338,   339,   340,
+     341,   342,   343,   344,   345,   346,   347,   348,   349,   350,
+     351,   352,   353,   354,   355,   356,   357,   358,   359,   360,
+     361,   362,   363,   364
 };
 
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-80))
+
+#define yytable_value_is_error(yytable_value) \
+  YYID (0)
+
 static const yytype_uint8 yycheck[] =
 {
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
@@ -1156,21 +1175,22 @@ static const yytype_uint8 yycheck[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    99,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    88,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,   103,
+      10,    10,    10,    10,    88,    10,    10,   127,    10,    10,
+      10,    10,   126,    10,    10,    10,    10,    10,    10,   103,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
+static const yytype_uint16 yystos[] =
 {
-       0,   127,     0,    11,    38,    44,    88,   103,   128,   129,
-     132,   135,   241,   251,   130,   133,   136,   242,   252,    12,
+       0,   129,     0,    11,    38,    44,    88,   103,   130,   131,
+     134,   137,   245,   255,   132,   135,   138,   246,   256,    12,
       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
       23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
       33,    34,    35,    36,    41,    42,    43,    47,    48,    49,
@@ -1180,20 +1200,20 @@ static const yytype_uint8 yystos[] =
       80,    81,    82,    83,    84,    85,    86,    87,    96,    97,
       98,   100,   101,   102,   105,   106,   107,   108,   109,   110,
      111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   131,   138,   139,   140,   141,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,   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,   231,
-     232,   233,    37,    39,    40,    99,   134,   234,   235,   236,
-     237,    37,    45,    46,   137,   238,   239,   240,    89,    90,
-      91,    92,    93,    94,    95,   243,   244,   245,   246,   247,
-     248,   249,   250,   104,   253,   254,    10,    10,    10,    10,
+     121,   122,   123,   124,   125,   133,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   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,   231,   232,   233,
+     234,   235,    37,    39,    40,    99,   127,   136,   236,   237,
+     238,   239,   240,    37,    45,    46,   126,   139,   241,   242,
+     243,   244,    89,    90,    91,    92,    93,    94,    95,   247,
+     248,   249,   250,   251,   252,   253,   254,   104,   257,   258,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1204,7 +1224,8 @@ static const yytype_uint8 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10
 };
 
 #define yyerrok                (yyerrstatus = 0)
@@ -1240,7 +1261,6 @@ do                                                                \
     {                                                          \
       yychar = (Token);                                                \
       yylval = (Value);                                                \
-      yytoken = YYTRANSLATE (yychar);                          \
       YYPOPSTACK (1);                                          \
       goto yybackup;                                           \
     }                                                          \
@@ -1282,19 +1302,10 @@ while (YYID (0))
 #endif
 
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
+/* This macro is provided for backward compatibility. */
 
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)                 \
-     fprintf (File, "%d.%d-%d.%d",                     \
-             (Loc).first_line, (Loc).first_column,     \
-             (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 #endif
 
 
@@ -1486,7 +1497,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-\f
 
 #if YYERROR_VERBOSE
 
@@ -1589,115 +1599,142 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
-    {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-        constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-                   + sizeof yyexpecting - 1
-                   + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-                      * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-        YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-       if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-         {
-           if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-             {
-               yycount = 1;
-               yysize = yysize0;
-               yyformat[sizeof yyunexpected - 1] = '\0';
-               break;
-             }
-           yyarg[yycount++] = yytname[yyx];
-           yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-           yysize_overflow |= (yysize1 < yysize);
-           yysize = yysize1;
-           yyfmt = yystpcpy (yyfmt, yyprefix);
-           yyprefix = yyor;
-         }
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  YYSIZE_T yysize1;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = 0;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+       for details.  YYERROR is fine as it does not invoke this
+       function.
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+                if (! (yysize <= yysize1
+                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  return 2;
+                yysize = yysize1;
+              }
+        }
+    }
 
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
 
-      if (yysize_overflow)
-       return YYSIZE_MAXIMUM;
+  yysize1 = yysize + yystrlen (yyformat);
+  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    return 2;
+  yysize = yysize1;
 
-      if (yyresult)
-       {
-         /* Avoid sprintf, as that infringes on the user's name space.
-            Don't have undefined behavior even if the translation
-            produced a string with the wrong number of "%s"s.  */
-         char *yyp = yyresult;
-         int yyi = 0;
-         while ((*yyp = *yyf) != '\0')
-           {
-             if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-               {
-                 yyp += yytnamerr (yyp, yyarg[yyi++]);
-                 yyf += 2;
-               }
-             else
-               {
-                 yyp++;
-                 yyf++;
-               }
-           }
-       }
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-\f
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1730,6 +1767,7 @@ yydestruct (yymsg, yytype, yyvaluep)
     }
 }
 
+
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@@ -1756,10 +1794,9 @@ YYSTYPE yylval;
 int yynerrs;
 
 
-
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1783,8 +1820,6 @@ yyparse ()
 #endif
 #endif
 {
-
-
     int yystate;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
@@ -1939,7 +1974,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1970,8 +2005,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-       goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -2026,8 +2061,8 @@ yyreduce:
     {
         case 9:
 
-/* Line 1464 of yacc.c  */
-#line 117 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 118 "./util/configparser.y"
     { 
                OUTYY(("\nP(server:)\n")); 
        }
@@ -2035,8 +2070,8 @@ yyreduce:
 
   case 108:
 
-/* Line 1464 of yacc.c  */
-#line 165 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 166 "./util/configparser.y"
     {
                struct config_stub* s;
                OUTYY(("\nP(stub_zone:)\n")); 
@@ -2049,10 +2084,10 @@ yyreduce:
        }
     break;
 
-  case 115:
+  case 116:
 
-/* Line 1464 of yacc.c  */
-#line 181 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 182 "./util/configparser.y"
     {
                struct config_stub* s;
                OUTYY(("\nP(forward_zone:)\n")); 
@@ -2065,10 +2100,10 @@ yyreduce:
        }
     break;
 
-  case 121:
+  case 123:
 
-/* Line 1464 of yacc.c  */
-#line 197 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 198 "./util/configparser.y"
     { 
                OUTYY(("P(server_num_threads:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2078,10 +2113,10 @@ yyreduce:
        }
     break;
 
-  case 122:
+  case 124:
 
-/* Line 1464 of yacc.c  */
-#line 206 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 207 "./util/configparser.y"
     { 
                OUTYY(("P(server_verbosity:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2091,10 +2126,10 @@ yyreduce:
        }
     break;
 
-  case 123:
+  case 125:
 
-/* Line 1464 of yacc.c  */
-#line 215 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 216 "./util/configparser.y"
     { 
                OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(strcmp((yyvsp[(2) - (2)].str), "") == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0)
@@ -2106,10 +2141,10 @@ yyreduce:
        }
     break;
 
-  case 124:
+  case 126:
 
-/* Line 1464 of yacc.c  */
-#line 226 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 227 "./util/configparser.y"
     {
                OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2119,10 +2154,10 @@ yyreduce:
        }
     break;
 
-  case 125:
+  case 127:
 
-/* Line 1464 of yacc.c  */
-#line 235 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 236 "./util/configparser.y"
     {
                OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2132,10 +2167,10 @@ yyreduce:
        }
     break;
 
-  case 126:
+  case 128:
 
-/* Line 1464 of yacc.c  */
-#line 244 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 245 "./util/configparser.y"
     {
                OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2145,10 +2180,10 @@ yyreduce:
        }
     break;
 
-  case 127:
+  case 129:
 
-/* Line 1464 of yacc.c  */
-#line 253 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 254 "./util/configparser.y"
     {
                OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->num_ifs == 0)
@@ -2162,10 +2197,10 @@ yyreduce:
        }
     break;
 
-  case 128:
+  case 130:
 
-/* Line 1464 of yacc.c  */
-#line 266 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 267 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->num_out_ifs == 0)
@@ -2181,10 +2216,10 @@ yyreduce:
        }
     break;
 
-  case 129:
+  case 131:
 
-/* Line 1464 of yacc.c  */
-#line 281 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 282 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2194,10 +2229,10 @@ yyreduce:
        }
     break;
 
-  case 130:
+  case 132:
 
-/* Line 1464 of yacc.c  */
-#line 290 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 291 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, 
@@ -2207,10 +2242,10 @@ yyreduce:
        }
     break;
 
-  case 131:
+  case 133:
 
-/* Line 1464 of yacc.c  */
-#line 299 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 300 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, 
@@ -2220,10 +2255,10 @@ yyreduce:
        }
     break;
 
-  case 132:
+  case 134:
 
-/* Line 1464 of yacc.c  */
-#line 308 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 309 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2233,10 +2268,10 @@ yyreduce:
        }
     break;
 
-  case 133:
+  case 135:
 
-/* Line 1464 of yacc.c  */
-#line 317 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 318 "./util/configparser.y"
     {
                OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2246,10 +2281,10 @@ yyreduce:
        }
     break;
 
-  case 134:
+  case 136:
 
-/* Line 1464 of yacc.c  */
-#line 326 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 327 "./util/configparser.y"
     {
                OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2259,10 +2294,10 @@ yyreduce:
        }
     break;
 
-  case 135:
+  case 137:
 
-/* Line 1464 of yacc.c  */
-#line 335 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 336 "./util/configparser.y"
     {
                OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2272,10 +2307,10 @@ yyreduce:
        }
     break;
 
-  case 136:
+  case 138:
 
-/* Line 1464 of yacc.c  */
-#line 344 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 345 "./util/configparser.y"
     {
                OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2285,10 +2320,10 @@ yyreduce:
        }
     break;
 
-  case 137:
+  case 139:
 
-/* Line 1464 of yacc.c  */
-#line 353 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 354 "./util/configparser.y"
     {
                OUTYY(("P(server_do_udp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2298,10 +2333,10 @@ yyreduce:
        }
     break;
 
-  case 138:
+  case 140:
 
-/* Line 1464 of yacc.c  */
-#line 362 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 363 "./util/configparser.y"
     {
                OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2311,10 +2346,10 @@ yyreduce:
        }
     break;
 
-  case 139:
+  case 141:
 
-/* Line 1464 of yacc.c  */
-#line 371 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 372 "./util/configparser.y"
     {
                OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2324,10 +2359,10 @@ yyreduce:
        }
     break;
 
-  case 140:
+  case 142:
 
-/* Line 1464 of yacc.c  */
-#line 380 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 381 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2337,10 +2372,10 @@ yyreduce:
        }
     break;
 
-  case 141:
+  case 143:
 
-/* Line 1464 of yacc.c  */
-#line 389 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 390 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->ssl_service_key);
@@ -2348,10 +2383,10 @@ yyreduce:
        }
     break;
 
-  case 142:
+  case 144:
 
-/* Line 1464 of yacc.c  */
-#line 396 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 397 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->ssl_service_pem);
@@ -2359,10 +2394,10 @@ yyreduce:
        }
     break;
 
-  case 143:
+  case 145:
 
-/* Line 1464 of yacc.c  */
-#line 403 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 404 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2372,10 +2407,10 @@ yyreduce:
        }
     break;
 
-  case 144:
+  case 146:
 
-/* Line 1464 of yacc.c  */
-#line 412 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 413 "./util/configparser.y"
     {
                OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2385,10 +2420,10 @@ yyreduce:
        }
     break;
 
-  case 145:
+  case 147:
 
-/* Line 1464 of yacc.c  */
-#line 421 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 422 "./util/configparser.y"
     {
                OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2403,10 +2438,10 @@ yyreduce:
        }
     break;
 
-  case 146:
+  case 148:
 
-/* Line 1464 of yacc.c  */
-#line 435 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 436 "./util/configparser.y"
     {
                OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2416,10 +2451,10 @@ yyreduce:
        }
     break;
 
-  case 147:
+  case 149:
 
-/* Line 1464 of yacc.c  */
-#line 444 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 445 "./util/configparser.y"
     {
                OUTYY(("P(server_log_queries:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2429,10 +2464,10 @@ yyreduce:
        }
     break;
 
-  case 148:
+  case 150:
 
-/* Line 1464 of yacc.c  */
-#line 453 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 454 "./util/configparser.y"
     {
                OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->chrootdir);
@@ -2440,10 +2475,10 @@ yyreduce:
        }
     break;
 
-  case 149:
+  case 151:
 
-/* Line 1464 of yacc.c  */
-#line 460 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 461 "./util/configparser.y"
     {
                OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->username);
@@ -2451,10 +2486,10 @@ yyreduce:
        }
     break;
 
-  case 150:
+  case 152:
 
-/* Line 1464 of yacc.c  */
-#line 467 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 468 "./util/configparser.y"
     {
                OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->directory);
@@ -2462,10 +2497,10 @@ yyreduce:
        }
     break;
 
-  case 151:
+  case 153:
 
-/* Line 1464 of yacc.c  */
-#line 474 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 475 "./util/configparser.y"
     {
                OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->logfile);
@@ -2474,10 +2509,10 @@ yyreduce:
        }
     break;
 
-  case 152:
+  case 154:
 
-/* Line 1464 of yacc.c  */
-#line 482 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 483 "./util/configparser.y"
     {
                OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->pidfile);
@@ -2485,10 +2520,10 @@ yyreduce:
        }
     break;
 
-  case 153:
+  case 155:
 
-/* Line 1464 of yacc.c  */
-#line 489 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 490 "./util/configparser.y"
     {
                OUTYY(("P(server_root_hints:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[(2) - (2)].str)))
@@ -2496,10 +2531,10 @@ yyreduce:
        }
     break;
 
-  case 154:
+  case 156:
 
-/* Line 1464 of yacc.c  */
-#line 496 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 497 "./util/configparser.y"
     {
                OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->dlv_anchor_file);
@@ -2507,10 +2542,10 @@ yyreduce:
        }
     break;
 
-  case 155:
+  case 157:
 
-/* Line 1464 of yacc.c  */
-#line 503 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 504 "./util/configparser.y"
     {
                OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[(2) - (2)].str)))
@@ -2518,10 +2553,10 @@ yyreduce:
        }
     break;
 
-  case 156:
+  case 158:
 
-/* Line 1464 of yacc.c  */
-#line 510 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 511 "./util/configparser.y"
     {
                OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2530,10 +2565,10 @@ yyreduce:
        }
     break;
 
-  case 157:
+  case 159:
 
-/* Line 1464 of yacc.c  */
-#line 518 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 519 "./util/configparser.y"
     {
                OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2542,10 +2577,10 @@ yyreduce:
        }
     break;
 
-  case 158:
+  case 160:
 
-/* Line 1464 of yacc.c  */
-#line 526 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 527 "./util/configparser.y"
     {
                OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2554,10 +2589,10 @@ yyreduce:
        }
     break;
 
-  case 159:
+  case 161:
 
-/* Line 1464 of yacc.c  */
-#line 534 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 535 "./util/configparser.y"
     {
                OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[(2) - (2)].str)))
@@ -2565,10 +2600,10 @@ yyreduce:
        }
     break;
 
-  case 160:
+  case 162:
 
-/* Line 1464 of yacc.c  */
-#line 541 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 542 "./util/configparser.y"
     {
                OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[(2) - (2)].str)))
@@ -2576,10 +2611,10 @@ yyreduce:
        }
     break;
 
-  case 161:
+  case 163:
 
-/* Line 1464 of yacc.c  */
-#line 548 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 549 "./util/configparser.y"
     {
                OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2589,10 +2624,10 @@ yyreduce:
        }
     break;
 
-  case 162:
+  case 164:
 
-/* Line 1464 of yacc.c  */
-#line 557 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 558 "./util/configparser.y"
     {
                OUTYY(("P(server_hide_version:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2602,10 +2637,10 @@ yyreduce:
        }
     break;
 
-  case 163:
+  case 165:
 
-/* Line 1464 of yacc.c  */
-#line 566 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 567 "./util/configparser.y"
     {
                OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->identity);
@@ -2613,10 +2648,10 @@ yyreduce:
        }
     break;
 
-  case 164:
+  case 166:
 
-/* Line 1464 of yacc.c  */
-#line 573 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 574 "./util/configparser.y"
     {
                OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->version);
@@ -2624,10 +2659,10 @@ yyreduce:
        }
     break;
 
-  case 165:
+  case 167:
 
-/* Line 1464 of yacc.c  */
-#line 580 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 581 "./util/configparser.y"
     {
                OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->so_rcvbuf))
@@ -2636,10 +2671,10 @@ yyreduce:
        }
     break;
 
-  case 166:
+  case 168:
 
-/* Line 1464 of yacc.c  */
-#line 588 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 589 "./util/configparser.y"
     {
                OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->so_sndbuf))
@@ -2648,10 +2683,10 @@ yyreduce:
        }
     break;
 
-  case 167:
+  case 169:
 
-/* Line 1464 of yacc.c  */
-#line 596 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 597 "./util/configparser.y"
     {
                OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2665,10 +2700,10 @@ yyreduce:
        }
     break;
 
-  case 168:
+  case 170:
 
-/* Line 1464 of yacc.c  */
-#line 609 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 610 "./util/configparser.y"
     {
                OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2680,10 +2715,10 @@ yyreduce:
        }
     break;
 
-  case 169:
+  case 171:
 
-/* Line 1464 of yacc.c  */
-#line 620 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 621 "./util/configparser.y"
     {
                OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->msg_cache_size))
@@ -2692,10 +2727,10 @@ yyreduce:
        }
     break;
 
-  case 170:
+  case 172:
 
-/* Line 1464 of yacc.c  */
-#line 628 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 629 "./util/configparser.y"
     {
                OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2709,10 +2744,10 @@ yyreduce:
        }
     break;
 
-  case 171:
+  case 173:
 
-/* Line 1464 of yacc.c  */
-#line 641 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 642 "./util/configparser.y"
     {
                OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2722,10 +2757,10 @@ yyreduce:
        }
     break;
 
-  case 172:
+  case 174:
 
-/* Line 1464 of yacc.c  */
-#line 650 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 651 "./util/configparser.y"
     {
                OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2735,10 +2770,10 @@ yyreduce:
        }
     break;
 
-  case 173:
+  case 175:
 
-/* Line 1464 of yacc.c  */
-#line 659 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 660 "./util/configparser.y"
     {
                OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->rrset_cache_size))
@@ -2747,10 +2782,10 @@ yyreduce:
        }
     break;
 
-  case 174:
+  case 176:
 
-/* Line 1464 of yacc.c  */
-#line 667 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 668 "./util/configparser.y"
     {
                OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2764,10 +2799,10 @@ yyreduce:
        }
     break;
 
-  case 175:
+  case 177:
 
-/* Line 1464 of yacc.c  */
-#line 680 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 681 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2777,10 +2812,10 @@ yyreduce:
        }
     break;
 
-  case 176:
+  case 178:
 
-/* Line 1464 of yacc.c  */
-#line 689 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 690 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
@@ -2789,10 +2824,10 @@ yyreduce:
        }
     break;
 
-  case 177:
+  case 179:
 
-/* Line 1464 of yacc.c  */
-#line 697 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 698 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2802,10 +2837,10 @@ yyreduce:
        }
     break;
 
-  case 178:
+  case 180:
 
-/* Line 1464 of yacc.c  */
-#line 706 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 707 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str)));
                verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
@@ -2814,10 +2849,10 @@ yyreduce:
        }
     break;
 
-  case 179:
+  case 181:
 
-/* Line 1464 of yacc.c  */
-#line 714 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 715 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2831,10 +2866,10 @@ yyreduce:
        }
     break;
 
-  case 180:
+  case 182:
 
-/* Line 1464 of yacc.c  */
-#line 727 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 728 "./util/configparser.y"
     {
                OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->target_fetch_policy);
@@ -2842,10 +2877,10 @@ yyreduce:
        }
     break;
 
-  case 181:
+  case 183:
 
-/* Line 1464 of yacc.c  */
-#line 734 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 735 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2856,10 +2891,10 @@ yyreduce:
        }
     break;
 
-  case 182:
+  case 184:
 
-/* Line 1464 of yacc.c  */
-#line 744 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 745 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2870,10 +2905,10 @@ yyreduce:
        }
     break;
 
-  case 183:
+  case 185:
 
-/* Line 1464 of yacc.c  */
-#line 754 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 755 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2884,10 +2919,10 @@ yyreduce:
        }
     break;
 
-  case 184:
+  case 186:
 
-/* Line 1464 of yacc.c  */
-#line 764 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 765 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2898,10 +2933,10 @@ yyreduce:
        }
     break;
 
-  case 185:
+  case 187:
 
-/* Line 1464 of yacc.c  */
-#line 774 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 775 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2912,10 +2947,10 @@ yyreduce:
        }
     break;
 
-  case 186:
+  case 188:
 
-/* Line 1464 of yacc.c  */
-#line 784 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 785 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2926,10 +2961,10 @@ yyreduce:
        }
     break;
 
-  case 187:
+  case 189:
 
-/* Line 1464 of yacc.c  */
-#line 794 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 795 "./util/configparser.y"
     {
                OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2940,10 +2975,10 @@ yyreduce:
        }
     break;
 
-  case 188:
+  case 190:
 
-/* Line 1464 of yacc.c  */
-#line 804 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 805 "./util/configparser.y"
     {
                OUTYY(("P(server_private_address:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[(2) - (2)].str)))
@@ -2951,10 +2986,10 @@ yyreduce:
        }
     break;
 
-  case 189:
+  case 191:
 
-/* Line 1464 of yacc.c  */
-#line 811 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 812 "./util/configparser.y"
     {
                OUTYY(("P(server_private_domain:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[(2) - (2)].str)))
@@ -2962,10 +2997,10 @@ yyreduce:
        }
     break;
 
-  case 190:
+  case 192:
 
-/* Line 1464 of yacc.c  */
-#line 818 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 819 "./util/configparser.y"
     {
                OUTYY(("P(server_prefetch:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2975,10 +3010,10 @@ yyreduce:
        }
     break;
 
-  case 191:
+  case 193:
 
-/* Line 1464 of yacc.c  */
-#line 827 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 828 "./util/configparser.y"
     {
                OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2988,10 +3023,10 @@ yyreduce:
        }
     break;
 
-  case 192:
+  case 194:
 
-/* Line 1464 of yacc.c  */
-#line 836 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 837 "./util/configparser.y"
     {
                OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3001,10 +3036,10 @@ yyreduce:
        }
     break;
 
-  case 193:
+  case 195:
 
-/* Line 1464 of yacc.c  */
-#line 845 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 846 "./util/configparser.y"
     {
                OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[(2) - (2)].str)))
@@ -3012,10 +3047,10 @@ yyreduce:
        }
     break;
 
-  case 194:
+  case 196:
 
-/* Line 1464 of yacc.c  */
-#line 852 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 853 "./util/configparser.y"
     {
                OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3026,10 +3061,10 @@ yyreduce:
        }
     break;
 
-  case 195:
+  case 197:
 
-/* Line 1464 of yacc.c  */
-#line 862 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 863 "./util/configparser.y"
     {
                OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
                if(strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 &&
@@ -3044,10 +3079,10 @@ yyreduce:
        }
     break;
 
-  case 196:
+  case 198:
 
-/* Line 1464 of yacc.c  */
-#line 876 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 877 "./util/configparser.y"
     {
                OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->module_conf);
@@ -3055,10 +3090,10 @@ yyreduce:
        }
     break;
 
-  case 197:
+  case 199:
 
-/* Line 1464 of yacc.c  */
-#line 883 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 884 "./util/configparser.y"
     {
                OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3077,10 +3112,10 @@ yyreduce:
        }
     break;
 
-  case 198:
+  case 200:
 
-/* Line 1464 of yacc.c  */
-#line 901 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 902 "./util/configparser.y"
     {
                OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3094,10 +3129,10 @@ yyreduce:
        }
     break;
 
-  case 199:
+  case 201:
 
-/* Line 1464 of yacc.c  */
-#line 914 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 915 "./util/configparser.y"
     {
                OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3111,10 +3146,10 @@ yyreduce:
        }
     break;
 
-  case 200:
+  case 202:
 
-/* Line 1464 of yacc.c  */
-#line 927 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 928 "./util/configparser.y"
     {
                OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3124,10 +3159,10 @@ yyreduce:
        }
     break;
 
-  case 201:
+  case 203:
 
-/* Line 1464 of yacc.c  */
-#line 936 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 937 "./util/configparser.y"
     {
                OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3137,10 +3172,10 @@ yyreduce:
        }
     break;
 
-  case 202:
+  case 204:
 
-/* Line 1464 of yacc.c  */
-#line 945 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 946 "./util/configparser.y"
     {
                OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3150,10 +3185,10 @@ yyreduce:
        }
     break;
 
-  case 203:
+  case 205:
 
-/* Line 1464 of yacc.c  */
-#line 954 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 955 "./util/configparser.y"
     {
                OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3164,10 +3199,10 @@ yyreduce:
        }
     break;
 
-  case 204:
+  case 206:
 
-/* Line 1464 of yacc.c  */
-#line 964 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 965 "./util/configparser.y"
     {
                OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3178,10 +3213,10 @@ yyreduce:
        }
     break;
 
-  case 205:
+  case 207:
 
-/* Line 1464 of yacc.c  */
-#line 974 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 975 "./util/configparser.y"
     {
                OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3191,10 +3226,10 @@ yyreduce:
        }
     break;
 
-  case 206:
+  case 208:
 
-/* Line 1464 of yacc.c  */
-#line 983 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 984 "./util/configparser.y"
     {
                OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3204,10 +3239,10 @@ yyreduce:
        }
     break;
 
-  case 207:
+  case 209:
 
-/* Line 1464 of yacc.c  */
-#line 992 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 993 "./util/configparser.y"
     {
                OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->val_nsec3_key_iterations);
@@ -3215,10 +3250,10 @@ yyreduce:
        }
     break;
 
-  case 208:
+  case 210:
 
-/* Line 1464 of yacc.c  */
-#line 999 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1000 "./util/configparser.y"
     {
                OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3228,10 +3263,10 @@ yyreduce:
        }
     break;
 
-  case 209:
+  case 211:
 
-/* Line 1464 of yacc.c  */
-#line 1008 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1009 "./util/configparser.y"
     {
                OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3241,10 +3276,10 @@ yyreduce:
        }
     break;
 
-  case 210:
+  case 212:
 
-/* Line 1464 of yacc.c  */
-#line 1017 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1018 "./util/configparser.y"
     {
                OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3254,10 +3289,10 @@ yyreduce:
        }
     break;
 
-  case 211:
+  case 213:
 
-/* Line 1464 of yacc.c  */
-#line 1026 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1027 "./util/configparser.y"
     {
                OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->key_cache_size))
@@ -3266,10 +3301,10 @@ yyreduce:
        }
     break;
 
-  case 212:
+  case 214:
 
-/* Line 1464 of yacc.c  */
-#line 1034 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1035 "./util/configparser.y"
     {
                OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -3283,10 +3318,10 @@ yyreduce:
        }
     break;
 
-  case 213:
+  case 215:
 
-/* Line 1464 of yacc.c  */
-#line 1047 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1048 "./util/configparser.y"
     {
                OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->neg_cache_size))
@@ -3295,10 +3330,10 @@ yyreduce:
        }
     break;
 
-  case 214:
+  case 216:
 
-/* Line 1464 of yacc.c  */
-#line 1055 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1056 "./util/configparser.y"
     {
                OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
                if(strcmp((yyvsp[(3) - (3)].str), "static")!=0 && strcmp((yyvsp[(3) - (3)].str), "deny")!=0 &&
@@ -3321,10 +3356,10 @@ yyreduce:
        }
     break;
 
-  case 215:
+  case 217:
 
-/* Line 1464 of yacc.c  */
-#line 1077 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1078 "./util/configparser.y"
     {
                OUTYY(("P(server_local_data:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[(2) - (2)].str)))
@@ -3332,10 +3367,10 @@ yyreduce:
        }
     break;
 
-  case 216:
+  case 218:
 
-/* Line 1464 of yacc.c  */
-#line 1084 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1085 "./util/configparser.y"
     {
                char* ptr;
                OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str)));
@@ -3351,10 +3386,10 @@ yyreduce:
        }
     break;
 
-  case 217:
+  case 219:
 
-/* Line 1464 of yacc.c  */
-#line 1099 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1100 "./util/configparser.y"
     {
                OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->stubs->name)
@@ -3365,10 +3400,10 @@ yyreduce:
        }
     break;
 
-  case 218:
+  case 220:
 
-/* Line 1464 of yacc.c  */
-#line 1109 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1110 "./util/configparser.y"
     {
                OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[(2) - (2)].str)))
@@ -3376,10 +3411,10 @@ yyreduce:
        }
     break;
 
-  case 219:
+  case 221:
 
-/* Line 1464 of yacc.c  */
-#line 1116 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1117 "./util/configparser.y"
     {
                OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[(2) - (2)].str)))
@@ -3387,10 +3422,23 @@ yyreduce:
        }
     break;
 
-  case 220:
+  case 222:
 
-/* Line 1464 of yacc.c  */
-#line 1123 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1124 "./util/configparser.y"
+    {
+               OUTYY(("P(stub-first:%s)\n", (yyvsp[(2) - (2)].str)));
+               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+                       yyerror("expected yes or no.");
+               else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[(2) - (2)].str), "yes")==0);
+               free((yyvsp[(2) - (2)].str));
+       }
+    break;
+
+  case 223:
+
+/* Line 1806 of yacc.c  */
+#line 1133 "./util/configparser.y"
     {
                OUTYY(("P(stub-prime:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3401,10 +3449,10 @@ yyreduce:
        }
     break;
 
-  case 221:
+  case 224:
 
-/* Line 1464 of yacc.c  */
-#line 1133 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1143 "./util/configparser.y"
     {
                OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->forwards->name)
@@ -3415,10 +3463,10 @@ yyreduce:
        }
     break;
 
-  case 222:
+  case 225:
 
-/* Line 1464 of yacc.c  */
-#line 1143 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1153 "./util/configparser.y"
     {
                OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[(2) - (2)].str)))
@@ -3426,10 +3474,10 @@ yyreduce:
        }
     break;
 
-  case 223:
+  case 226:
 
-/* Line 1464 of yacc.c  */
-#line 1150 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1160 "./util/configparser.y"
     {
                OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[(2) - (2)].str)))
@@ -3437,19 +3485,32 @@ yyreduce:
        }
     break;
 
-  case 224:
+  case 227:
 
-/* Line 1464 of yacc.c  */
-#line 1157 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1167 "./util/configparser.y"
+    {
+               OUTYY(("P(forward-first:%s)\n", (yyvsp[(2) - (2)].str)));
+               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+                       yyerror("expected yes or no.");
+               else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[(2) - (2)].str), "yes")==0);
+               free((yyvsp[(2) - (2)].str));
+       }
+    break;
+
+  case 228:
+
+/* Line 1806 of yacc.c  */
+#line 1176 "./util/configparser.y"
     { 
                OUTYY(("\nP(remote-control:)\n")); 
        }
     break;
 
-  case 234:
+  case 238:
 
-/* Line 1464 of yacc.c  */
-#line 1168 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1187 "./util/configparser.y"
     {
                OUTYY(("P(control_enable:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3460,10 +3521,10 @@ yyreduce:
        }
     break;
 
-  case 235:
+  case 239:
 
-/* Line 1464 of yacc.c  */
-#line 1178 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1197 "./util/configparser.y"
     {
                OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -3473,10 +3534,10 @@ yyreduce:
        }
     break;
 
-  case 236:
+  case 240:
 
-/* Line 1464 of yacc.c  */
-#line 1187 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1206 "./util/configparser.y"
     {
                OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[(2) - (2)].str)))
@@ -3484,10 +3545,10 @@ yyreduce:
        }
     break;
 
-  case 237:
+  case 241:
 
-/* Line 1464 of yacc.c  */
-#line 1194 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1213 "./util/configparser.y"
     {
                OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->server_key_file);
@@ -3495,10 +3556,10 @@ yyreduce:
        }
     break;
 
-  case 238:
+  case 242:
 
-/* Line 1464 of yacc.c  */
-#line 1201 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1220 "./util/configparser.y"
     {
                OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->server_cert_file);
@@ -3506,10 +3567,10 @@ yyreduce:
        }
     break;
 
-  case 239:
+  case 243:
 
-/* Line 1464 of yacc.c  */
-#line 1208 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1227 "./util/configparser.y"
     {
                OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->control_key_file);
@@ -3517,10 +3578,10 @@ yyreduce:
        }
     break;
 
-  case 240:
+  case 244:
 
-/* Line 1464 of yacc.c  */
-#line 1215 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1234 "./util/configparser.y"
     {
                OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->control_cert_file);
@@ -3528,19 +3589,19 @@ yyreduce:
        }
     break;
 
-  case 241:
+  case 245:
 
-/* Line 1464 of yacc.c  */
-#line 1222 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1241 "./util/configparser.y"
     { 
                OUTYY(("\nP(python:)\n")); 
        }
     break;
 
-  case 245:
+  case 249:
 
-/* Line 1464 of yacc.c  */
-#line 1231 "util/configparser.y"
+/* Line 1806 of yacc.c  */
+#line 1250 "./util/configparser.y"
     {
                OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->python_script);
@@ -3550,10 +3611,21 @@ yyreduce:
 
 
 
-/* Line 1464 of yacc.c  */
-#line 3555 "util/configparser.c"
+/* Line 1806 of yacc.c  */
+#line 3616 "util/configparser.c"
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -3581,6 +3653,10 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -3588,37 +3664,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-       YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-       if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-         {
-           YYSIZE_T yyalloc = 2 * yysize;
-           if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-             yyalloc = YYSTACK_ALLOC_MAXIMUM;
-           if (yymsg != yymsgbuf)
-             YYSTACK_FREE (yymsg);
-           yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-           if (yymsg)
-             yymsg_alloc = yyalloc;
-           else
-             {
-               yymsg = yymsgbuf;
-               yymsg_alloc = sizeof yymsgbuf;
-             }
-         }
-
-       if (0 < yysize && yysize <= yymsg_alloc)
-         {
-           (void) yysyntax_error (yymsg, yystate, yychar);
-           yyerror (yymsg);
-         }
-       else
-         {
-           yyerror (YY_("syntax error"));
-           if (yysize != 0)
-             goto yyexhaustedlab;
-         }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -3677,7 +3752,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))
        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -3736,8 +3811,13 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-                yytoken, &yylval);
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -3762,8 +3842,8 @@ yyreturn:
 
 
 
-/* Line 1684 of yacc.c  */
-#line 1236 "util/configparser.y"
+/* Line 2067 of yacc.c  */
+#line 1255 "./util/configparser.y"
 
 
 /* parse helper routines could be here */

diff --git a/util/configparser.h b/util/configparser.h
index 2226a121ba0e01dfbe59620e612631d04b752abc..e7b088e570aab7102fe13b955f97b5c276fa122d 100644 (file)
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */
+/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2009, 2010 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -160,7 +159,9 @@
      VAR_SSL_UPSTREAM = 377,
      VAR_SSL_SERVICE_KEY = 378,
      VAR_SSL_SERVICE_PEM = 379,
-     VAR_SSL_PORT = 380
+     VAR_SSL_PORT = 380,
+     VAR_FORWARD_FIRST = 381,
+     VAR_STUB_FIRST = 382
    };
 #endif
 /* Tokens.  */
@@ -287,6 +288,8 @@
 #define VAR_SSL_SERVICE_KEY 378
 #define VAR_SSL_SERVICE_PEM 379
 #define VAR_SSL_PORT 380
+#define VAR_FORWARD_FIRST 381
+#define VAR_STUB_FIRST 382
 
 
 
@@ -295,15 +298,15 @@
 typedef union YYSTYPE
 {
 
-/* Line 1685 of yacc.c  */
-#line 64 "util/configparser.y"
+/* Line 2068 of yacc.c  */
+#line 64 "./util/configparser.y"
 
        char*   str;
 
 
 
-/* Line 1685 of yacc.c  */
-#line 307 "util/configparser.h"
+/* Line 2068 of yacc.c  */
+#line 310 "util/configparser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

diff --git a/util/configparser.y b/util/configparser.y
index 09f77c5782f51797baa282fe502f7ed4efe91c65..c11d12f665f9e5f93fbab9457d2ee69d399a2173 100644 (file)
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -103,7 +103,8 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_DEL_HOLDDOWN VAR_SO_RCVBUF VAR_EDNS_BUFFER_SIZE VAR_PREFETCH
 %token VAR_PREFETCH_KEY VAR_SO_SNDBUF VAR_HARDEN_BELOW_NXDOMAIN
 %token VAR_IGNORE_CD_FLAG VAR_LOG_QUERIES VAR_TCP_UPSTREAM VAR_SSL_UPSTREAM
-%token VAR_SSL_SERVICE_KEY VAR_SSL_SERVICE_PEM VAR_SSL_PORT
+%token VAR_SSL_SERVICE_KEY VAR_SSL_SERVICE_PEM VAR_SSL_PORT VAR_FORWARD_FIRST
+%token VAR_STUB_FIRST
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@ -175,7 +176,7 @@ stubstart: VAR_STUB_ZONE
        ;
 contents_stub: contents_stub content_stub 
        | ;
-content_stub: stub_name | stub_host | stub_addr | stub_prime
+content_stub: stub_name | stub_host | stub_addr | stub_prime | stub_first
        ;
 forwardstart: VAR_FORWARD_ZONE
        {
@@ -191,7 +192,7 @@ forwardstart: VAR_FORWARD_ZONE
        ;
 contents_forward: contents_forward content_forward 
        | ;
-content_forward: forward_name | forward_host | forward_addr 
+content_forward: forward_name | forward_host | forward_addr | forward_first
        ;
 server_num_threads: VAR_NUM_THREADS STRING_ARG 
        { 
@@ -1119,6 +1120,15 @@ stub_addr: VAR_STUB_ADDR STRING_ARG
                        yyerror("out of memory");
        }
        ;
+stub_first: VAR_STUB_FIRST STRING_ARG
+       {
+               OUTYY(("P(stub-first:%s)\n", $2));
+               if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+                       yyerror("expected yes or no.");
+               else cfg_parser->cfg->stubs->isfirst=(strcmp($2, "yes")==0);
+               free($2);
+       }
+       ;
 stub_prime: VAR_STUB_PRIME STRING_ARG
        {
                OUTYY(("P(stub-prime:%s)\n", $2));
@@ -1153,6 +1163,15 @@ forward_addr: VAR_FORWARD_ADDR STRING_ARG
                        yyerror("out of memory");
        }
        ;
+forward_first: VAR_FORWARD_FIRST STRING_ARG
+       {
+               OUTYY(("P(forward-first:%s)\n", $2));
+               if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+                       yyerror("expected yes or no.");
+               else cfg_parser->cfg->forwards->isfirst=(strcmp($2, "yes")==0);
+               free($2);
+       }
+       ;
 rcstart: VAR_REMOTE_CONTROL
        { 
                OUTYY(("\nP(remote-control:)\n"));