From: Brian Aker Date: Mon, 11 Apr 2011 23:06:14 +0000 (-0700) Subject: Add docs for tap, and update all other documentation. X-Git-Tag: 0.51~15^2~4 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=55cf7c68679083cdd7351db3b888c6f8ddcebe09;p=m6w6%2Flibmemcached Add docs for tap, and update all other documentation. --- diff --git a/docs/include.am b/docs/include.am index 3d6871c8..37ea1565 100644 --- a/docs/include.am +++ b/docs/include.am @@ -46,7 +46,8 @@ EXTRA_DIST+= \ docs/memflush.rst \ docs/memrm.rst \ docs/memslap.rst \ - docs/memstat.rst + docs/memstat.rst \ + docs/tap.rst # Makefile for Sphinx documentation # diff --git a/docs/index.rst b/docs/index.rst index f41089c8..79ce45e2 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -58,6 +58,15 @@ Advanced Topics memcached_verbosity memcached_version +################# +Platform Specific +################# + +.. toctree:: + :maxdepth: 1 + + tap + ################################# Deriving statistics from a server ################################# diff --git a/docs/libmemcached_configuration.rst b/docs/libmemcached_configuration.rst index 10103f50..01e6b711 100644 --- a/docs/libmemcached_configuration.rst +++ b/docs/libmemcached_configuration.rst @@ -24,7 +24,6 @@ Libmemcached implements a custom language for configuring and modifying servers. By passing in an option string you can generate a memcached_st object that you can use in your application directly. - .. describe:: --SERVER=:/? Provide a servername to be used by the client. Providing a weight will cause weighting to occur with all hosts with each server getting a default weight of 1. @@ -61,27 +60,54 @@ Set the distribution model used by the client. See :manpage:`` for more details Set the hashing alogrthm used for placing keys on servers. -.. describe:: --HASH-WITH-PREFIX_KEY - -.. describe:: --IO-BYTES-WATERMARK= +.. describe:: --HASH-WITH-NAMESPACE -.. describe:: --IO-KEY-PREFETCH= - -.. describe:: --IO-MSG-WATERMARK= +When enabled the prefix key will be added to the key when determining which +server to store the data in. .. describe:: --NOREPLY +Enable "no reply" for all calls that support this. It is highly recommended +that you use this option with the binary protocol only. + .. describe:: --NUMBER-OF-REPLICAS= Set the nummber of servers that keys will be replicated to. -.. describe:: --POLL-TIMEOUT= - .. describe:: --RANDOMIZE-REPLICA-READ Select randomly the server within the replication pool to read from. -.. describe:: --RCV-TIMEOUT= +.. describe:: --SORT-HOSTS + +When adding new servers always calculate their distribution based on sorted naming order. + +.. describe:: --SUPPORT-CAS + +See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_SUPPORT_CAS + +.. describe:: --USE-UDP + +See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_USE_UDP + +.. describe:: --NAMESPACE= + +A namespace is a container that provides context for keys, only other +requests that know the namespace can access these values. This is +accomplished by prepending the namespace value to all keys. + + +************ +I/O Options: +************ + +.. describe:: --TCP-NODELAY + +See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_TCP_NODELAY + +.. describe:: --TCP-KEEPALIVE + +See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_TCP_KEEPALIVE .. describe:: --RETRY-TIMEOUT= @@ -103,29 +129,26 @@ See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE -.. describe:: --SORT-HOSTS - -When adding new servers always calculate their distribution based on sorted naming order. +.. describe:: --POLL-TIMEOUT= -.. describe:: --SUPPORT-CAS +That sets the value of the timeout used by :manpage: `poll()`. -See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_SUPPORT_CAS +.. describe:: --IO-BYTES-WATERMARK= -.. describe:: --TCP-NODELAY +.. describe:: --IO-KEY-PREFETCH= -See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_TCP_NODELAY +.. describe:: --IO-MSG-WATERMARK= -.. describe:: --TCP-KEEPALIVE +.. describe:: --TCP-KEEPIDLE -See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_TCP_KEEPALIVE +.. describe:: --RCV-TIMEOUT= -.. describe:: --TCP-KEEPIDLE -.. describe:: --USE-UDP -See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_USE_UDP +****** +Other: +****** -.. describe:: --PREFIX-KEY= .. describe:: INCLUDE diff --git a/docs/man/hashkit_clone.3 b/docs/man/hashkit_clone.3 index 6673c775..6671cfc9 100644 --- a/docs/man/hashkit_clone.3 +++ b/docs/man/hashkit_clone.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_CLONE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_CLONE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_clone \- libhashkit Documentation . diff --git a/docs/man/hashkit_crc32.3 b/docs/man/hashkit_crc32.3 index 8b0feb5b..386bad87 100644 --- a/docs/man/hashkit_crc32.3 +++ b/docs/man/hashkit_crc32.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_CRC32" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_CRC32" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_crc32 \- libhashkit Documentation . diff --git a/docs/man/hashkit_create.3 b/docs/man/hashkit_create.3 index ec8da320..380e0c26 100644 --- a/docs/man/hashkit_create.3 +++ b/docs/man/hashkit_create.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_CREATE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_CREATE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_create \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1_32.3 b/docs/man/hashkit_fnv1_32.3 index 44480c6b..1caaa421 100644 --- a/docs/man/hashkit_fnv1_32.3 +++ b/docs/man/hashkit_fnv1_32.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1_32" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FNV1_32" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_fnv1_32 \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1_64.3 b/docs/man/hashkit_fnv1_64.3 index 8a57e5e5..1f8c7f89 100644 --- a/docs/man/hashkit_fnv1_64.3 +++ b/docs/man/hashkit_fnv1_64.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1_64" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FNV1_64" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_fnv1_64 \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1a_32.3 b/docs/man/hashkit_fnv1a_32.3 index d3366497..b95c2577 100644 --- a/docs/man/hashkit_fnv1a_32.3 +++ b/docs/man/hashkit_fnv1a_32.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1A_32" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FNV1A_32" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_fnv1a_32 \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1a_64.3 b/docs/man/hashkit_fnv1a_64.3 index c06e5264..ce121c6d 100644 --- a/docs/man/hashkit_fnv1a_64.3 +++ b/docs/man/hashkit_fnv1a_64.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1A_64" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FNV1A_64" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_fnv1a_64 \- libhashkit Documentation . diff --git a/docs/man/hashkit_free.3 b/docs/man/hashkit_free.3 index 81fe571b..326b1861 100644 --- a/docs/man/hashkit_free.3 +++ b/docs/man/hashkit_free.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FREE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FREE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_free \- libhashkit Documentation . diff --git a/docs/man/hashkit_functions.3 b/docs/man/hashkit_functions.3 index 02223420..df444640 100644 --- a/docs/man/hashkit_functions.3 +++ b/docs/man/hashkit_functions.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FUNCTIONS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_FUNCTIONS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_functions \- libhashkit Documentation . diff --git a/docs/man/hashkit_hsieh.3 b/docs/man/hashkit_hsieh.3 index 30d62544..6bcf2e5b 100644 --- a/docs/man/hashkit_hsieh.3 +++ b/docs/man/hashkit_hsieh.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_HSIEH" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_HSIEH" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_hsieh \- libhashkit Documentation . diff --git a/docs/man/hashkit_is_allocated.3 b/docs/man/hashkit_is_allocated.3 index 3c40e2df..d5b01363 100644 --- a/docs/man/hashkit_is_allocated.3 +++ b/docs/man/hashkit_is_allocated.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_IS_ALLOCATED" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_IS_ALLOCATED" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_is_allocated \- libhashkit Documentation . diff --git a/docs/man/hashkit_jenkins.3 b/docs/man/hashkit_jenkins.3 index 04743a17..099227e0 100644 --- a/docs/man/hashkit_jenkins.3 +++ b/docs/man/hashkit_jenkins.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_JENKINS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_JENKINS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_jenkins \- libhashkit Documentation . diff --git a/docs/man/hashkit_md5.3 b/docs/man/hashkit_md5.3 index ac40f8b5..327779a0 100644 --- a/docs/man/hashkit_md5.3 +++ b/docs/man/hashkit_md5.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_MD5" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_MD5" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_md5 \- libhashkit Documentation . diff --git a/docs/man/hashkit_murmur.3 b/docs/man/hashkit_murmur.3 index 1ceba0e0..062c4efe 100644 --- a/docs/man/hashkit_murmur.3 +++ b/docs/man/hashkit_murmur.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_MURMUR" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_MURMUR" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_murmur \- libhashkit Documentation . diff --git a/docs/man/hashkit_value.3 b/docs/man/hashkit_value.3 index f4039f96..e600b26e 100644 --- a/docs/man/hashkit_value.3 +++ b/docs/man/hashkit_value.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_VALUE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "HASHKIT_VALUE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME hashkit_value \- libhashkit Documentation . diff --git a/docs/man/libhashkit.3 b/docs/man/libhashkit.3 index 1c86053b..abe42647 100644 --- a/docs/man/libhashkit.3 +++ b/docs/man/libhashkit.3 @@ -1,4 +1,4 @@ -.TH "LIBHASHKIT" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "LIBHASHKIT" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME libhashkit \- libhashkit Documentation . diff --git a/docs/man/libmemcached.3 b/docs/man/libmemcached.3 index 7b11fcf7..52f346f7 100644 --- a/docs/man/libmemcached.3 +++ b/docs/man/libmemcached.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "LIBMEMCACHED" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME libmemcached \- Introducing the C Client Library for memcached . diff --git a/docs/man/libmemcached_check_configuration.3 b/docs/man/libmemcached_check_configuration.3 index 7c222811..ab989775 100644 --- a/docs/man/libmemcached_check_configuration.3 +++ b/docs/man/libmemcached_check_configuration.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME libmemcached_check_configuration \- libmemcached Documentation . @@ -102,44 +102,69 @@ Set the distribution model used by the client. See :manpage:\(ga\(ga for more d Set the hashing alogrthm used for placing keys on servers. .INDENT 0.0 .TP -.B \-\-HASH\-WITH\-PREFIX_KEY +.B \-\-HASH\-WITH\-NAMESPACE .UNINDENT +.sp +When enabled the prefix key will be added to the key when determining which +server to store the data in. .INDENT 0.0 .TP -.B \-\-IO\-BYTES\-WATERMARK= +.B \-\-NOREPLY .UNINDENT +.sp +Enable "no reply" for all calls that support this. It is highly recommended +that you use this option with the binary protocol only. .INDENT 0.0 .TP -.B \-\-IO\-KEY\-PREFETCH= +.B \-\-NUMBER\-OF\-REPLICAS= .UNINDENT +.sp +Set the nummber of servers that keys will be replicated to. .INDENT 0.0 .TP -.B \-\-IO\-MSG\-WATERMARK= +.B \-\-RANDOMIZE\-REPLICA\-READ .UNINDENT +.sp +Select randomly the server within the replication pool to read from. .INDENT 0.0 .TP -.B \-\-NOREPLY +.B \-\-SORT\-HOSTS .UNINDENT +.sp +When adding new servers always calculate their distribution based on sorted naming order. .INDENT 0.0 .TP -.B \-\-NUMBER\-OF\-REPLICAS= +.B \-\-SUPPORT\-CAS .UNINDENT .sp -Set the nummber of servers that keys will be replicated to. +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS .INDENT 0.0 .TP -.B \-\-POLL\-TIMEOUT= +.B \-\-USE\-UDP .UNINDENT +.sp +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP .INDENT 0.0 .TP -.B \-\-RANDOMIZE\-REPLICA\-READ +.B \-\-NAMESPACE= .UNINDENT .sp -Select randomly the server within the replication pool to read from. +A namespace is a container that provides context for keys, only other +requests that know the namespace can access these values. This is +accomplished by prepending the namespace value to all keys. +.SS I/O Options: .INDENT 0.0 .TP -.B \-\-RCV\-TIMEOUT= +.B \-\-TCP\-NODELAY +.UNINDENT +.sp +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_NODELAY +.INDENT 0.0 +.TP +.B \-\-TCP\-KEEPALIVE .UNINDENT +.sp +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_KEEPALIVE .INDENT 0.0 .TP .B \-\-RETRY\-TIMEOUT= @@ -172,42 +197,31 @@ See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE .INDENT 0.0 .TP -.B \-\-SORT\-HOSTS +.B \-\-POLL\-TIMEOUT= .UNINDENT .sp -When adding new servers always calculate their distribution based on sorted naming order. +That sets the value of the timeout used by :manpage: \fIpoll()\fP. .INDENT 0.0 .TP -.B \-\-SUPPORT\-CAS +.B \-\-IO\-BYTES\-WATERMARK= .UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS .INDENT 0.0 .TP -.B \-\-TCP\-NODELAY +.B \-\-IO\-KEY\-PREFETCH= .UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_NODELAY .INDENT 0.0 .TP -.B \-\-TCP\-KEEPALIVE +.B \-\-IO\-MSG\-WATERMARK= .UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_KEEPALIVE .INDENT 0.0 .TP .B \-\-TCP\-KEEPIDLE .UNINDENT .INDENT 0.0 .TP -.B \-\-USE\-UDP -.UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP -.INDENT 0.0 -.TP -.B \-\-PREFIX\-KEY= +.B \-\-RCV\-TIMEOUT= .UNINDENT +.SS Other: .INDENT 0.0 .TP .B INCLUDE diff --git a/docs/man/libmemcached_configuration.3 b/docs/man/libmemcached_configuration.3 index 3fa476ea..6b0951c1 100644 --- a/docs/man/libmemcached_configuration.3 +++ b/docs/man/libmemcached_configuration.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED_CONFIGURATION" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "LIBMEMCACHED_CONFIGURATION" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME libmemcached_configuration \- libmemcached Documentation . @@ -102,44 +102,69 @@ Set the distribution model used by the client. See :manpage:\(ga\(ga for more d Set the hashing alogrthm used for placing keys on servers. .INDENT 0.0 .TP -.B \-\-HASH\-WITH\-PREFIX_KEY +.B \-\-HASH\-WITH\-NAMESPACE .UNINDENT +.sp +When enabled the prefix key will be added to the key when determining which +server to store the data in. .INDENT 0.0 .TP -.B \-\-IO\-BYTES\-WATERMARK= +.B \-\-NOREPLY .UNINDENT +.sp +Enable "no reply" for all calls that support this. It is highly recommended +that you use this option with the binary protocol only. .INDENT 0.0 .TP -.B \-\-IO\-KEY\-PREFETCH= +.B \-\-NUMBER\-OF\-REPLICAS= .UNINDENT +.sp +Set the nummber of servers that keys will be replicated to. .INDENT 0.0 .TP -.B \-\-IO\-MSG\-WATERMARK= +.B \-\-RANDOMIZE\-REPLICA\-READ .UNINDENT +.sp +Select randomly the server within the replication pool to read from. .INDENT 0.0 .TP -.B \-\-NOREPLY +.B \-\-SORT\-HOSTS .UNINDENT +.sp +When adding new servers always calculate their distribution based on sorted naming order. .INDENT 0.0 .TP -.B \-\-NUMBER\-OF\-REPLICAS= +.B \-\-SUPPORT\-CAS .UNINDENT .sp -Set the nummber of servers that keys will be replicated to. +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS .INDENT 0.0 .TP -.B \-\-POLL\-TIMEOUT= +.B \-\-USE\-UDP .UNINDENT +.sp +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP .INDENT 0.0 .TP -.B \-\-RANDOMIZE\-REPLICA\-READ +.B \-\-NAMESPACE= .UNINDENT .sp -Select randomly the server within the replication pool to read from. +A namespace is a container that provides context for keys, only other +requests that know the namespace can access these values. This is +accomplished by prepending the namespace value to all keys. +.SS I/O Options: .INDENT 0.0 .TP -.B \-\-RCV\-TIMEOUT= +.B \-\-TCP\-NODELAY +.UNINDENT +.sp +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_NODELAY +.INDENT 0.0 +.TP +.B \-\-TCP\-KEEPALIVE .UNINDENT +.sp +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_KEEPALIVE .INDENT 0.0 .TP .B \-\-RETRY\-TIMEOUT= @@ -172,42 +197,31 @@ See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE .INDENT 0.0 .TP -.B \-\-SORT\-HOSTS +.B \-\-POLL\-TIMEOUT= .UNINDENT .sp -When adding new servers always calculate their distribution based on sorted naming order. +That sets the value of the timeout used by :manpage: \fIpoll()\fP. .INDENT 0.0 .TP -.B \-\-SUPPORT\-CAS +.B \-\-IO\-BYTES\-WATERMARK= .UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS .INDENT 0.0 .TP -.B \-\-TCP\-NODELAY +.B \-\-IO\-KEY\-PREFETCH= .UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_NODELAY .INDENT 0.0 .TP -.B \-\-TCP\-KEEPALIVE +.B \-\-IO\-MSG\-WATERMARK= .UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_KEEPALIVE .INDENT 0.0 .TP .B \-\-TCP\-KEEPIDLE .UNINDENT .INDENT 0.0 .TP -.B \-\-USE\-UDP -.UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP -.INDENT 0.0 -.TP -.B \-\-PREFIX\-KEY= +.B \-\-RCV\-TIMEOUT= .UNINDENT +.SS Other: .INDENT 0.0 .TP .B INCLUDE diff --git a/docs/man/libmemcached_examples.3 b/docs/man/libmemcached_examples.3 index c650f58b..528fc016 100644 --- a/docs/man/libmemcached_examples.3 +++ b/docs/man/libmemcached_examples.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED_EXAMPLES" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "LIBMEMCACHED_EXAMPLES" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME libmemcached_examples \- libmemcached Documentation . diff --git a/docs/man/libmemcachedutil.3 b/docs/man/libmemcachedutil.3 index 4a12d0d5..5e0067e9 100644 --- a/docs/man/libmemcachedutil.3 +++ b/docs/man/libmemcachedutil.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHEDUTIL" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "LIBMEMCACHEDUTIL" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME libmemcachedutil \- libmemcached Documentation . diff --git a/docs/man/memaslap.1 b/docs/man/memaslap.1 index 1709e40a..75072d54 100644 --- a/docs/man/memaslap.1 +++ b/docs/man/memaslap.1 @@ -1,4 +1,4 @@ -.TH "MEMASLAP" "1" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMASLAP" "1" "April 11, 2011" "0.47" "libmemcached" .SH NAME memaslap \- libmemcached Documentation . diff --git a/docs/man/memcached_add.3 b/docs/man/memcached_add.3 index 64df8e2a..3416bd37 100644 --- a/docs/man/memcached_add.3 +++ b/docs/man/memcached_add.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_ADD" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_ADD" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_add \- Storing and Replacing Data . diff --git a/docs/man/memcached_add_by_key.3 b/docs/man/memcached_add_by_key.3 index 4b3e1f03..b045999f 100644 --- a/docs/man/memcached_add_by_key.3 +++ b/docs/man/memcached_add_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_ADD_BY_KEY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_ADD_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_add_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_analyze.3 b/docs/man/memcached_analyze.3 index f3e66af5..ff0cf13a 100644 --- a/docs/man/memcached_analyze.3 +++ b/docs/man/memcached_analyze.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_ANALYZE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_ANALYZE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_analyze \- libmemcached Documentation . diff --git a/docs/man/memcached_append.3 b/docs/man/memcached_append.3 index f804fbcb..2d534044 100644 --- a/docs/man/memcached_append.3 +++ b/docs/man/memcached_append.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_APPEND" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_APPEND" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_append \- Storing and Replacing Data . diff --git a/docs/man/memcached_append_by_key.3 b/docs/man/memcached_append_by_key.3 index 04f63177..3652dbb0 100644 --- a/docs/man/memcached_append_by_key.3 +++ b/docs/man/memcached_append_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_APPEND_BY_KEY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_APPEND_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_append_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_auto.3 b/docs/man/memcached_auto.3 index 1fb40191..d1ebf8aa 100644 --- a/docs/man/memcached_auto.3 +++ b/docs/man/memcached_auto.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_AUTO" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_AUTO" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_auto \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_behavior.3 b/docs/man/memcached_behavior.3 index 41c14ced..451eff49 100644 --- a/docs/man/memcached_behavior.3 +++ b/docs/man/memcached_behavior.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_BEHAVIOR" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_BEHAVIOR" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_behavior \- libmemcached Documentation . diff --git a/docs/man/memcached_behavior_get.3 b/docs/man/memcached_behavior_get.3 index 4f04c4e3..ef61f543 100644 --- a/docs/man/memcached_behavior_get.3 +++ b/docs/man/memcached_behavior_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_BEHAVIOR_GET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_BEHAVIOR_GET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_behavior_get \- libmemcached Documentation . diff --git a/docs/man/memcached_behavior_set.3 b/docs/man/memcached_behavior_set.3 index cfb7ae68..68ae142b 100644 --- a/docs/man/memcached_behavior_set.3 +++ b/docs/man/memcached_behavior_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_BEHAVIOR_SET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_BEHAVIOR_SET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_behavior_set \- libmemcached Documentation . diff --git a/docs/man/memcached_callback.3 b/docs/man/memcached_callback.3 index 003ea6b4..a6933305 100644 --- a/docs/man/memcached_callback.3 +++ b/docs/man/memcached_callback.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CALLBACK" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CALLBACK" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_callback \- libmemcached Documentation . diff --git a/docs/man/memcached_callback_get.3 b/docs/man/memcached_callback_get.3 index a0de8f74..31847458 100644 --- a/docs/man/memcached_callback_get.3 +++ b/docs/man/memcached_callback_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CALLBACK_GET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CALLBACK_GET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_callback_get \- libmemcached Documentation . diff --git a/docs/man/memcached_callback_set.3 b/docs/man/memcached_callback_set.3 index ca1eea70..7bcb087e 100644 --- a/docs/man/memcached_callback_set.3 +++ b/docs/man/memcached_callback_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CALLBACK_SET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CALLBACK_SET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_callback_set \- libmemcached Documentation . diff --git a/docs/man/memcached_cas.3 b/docs/man/memcached_cas.3 index 82daae3e..a91d4e59 100644 --- a/docs/man/memcached_cas.3 +++ b/docs/man/memcached_cas.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CAS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CAS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_cas \- Storing and Replacing Data . diff --git a/docs/man/memcached_cas_by_key.3 b/docs/man/memcached_cas_by_key.3 index 56a8e21c..866c7d8a 100644 --- a/docs/man/memcached_cas_by_key.3 +++ b/docs/man/memcached_cas_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CAS_BY_KEY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CAS_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_cas_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_clone.3 b/docs/man/memcached_clone.3 index 41445408..c32ef376 100644 --- a/docs/man/memcached_clone.3 +++ b/docs/man/memcached_clone.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CLONE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CLONE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_clone \- libmemcached Documentation . diff --git a/docs/man/memcached_create.3 b/docs/man/memcached_create.3 index 79b26859..f7bc7895 100644 --- a/docs/man/memcached_create.3 +++ b/docs/man/memcached_create.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CREATE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CREATE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_create \- libmemcached Documentation . diff --git a/docs/man/memcached_create_with_options.3 b/docs/man/memcached_create_with_options.3 index b3c7ecbd..97c46410 100644 --- a/docs/man/memcached_create_with_options.3 +++ b/docs/man/memcached_create_with_options.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CREATE_WITH_OPTIONS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_CREATE_WITH_OPTIONS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_create_with_options \- libmemcached Documentation . @@ -102,44 +102,69 @@ Set the distribution model used by the client. See :manpage:\(ga\(ga for more d Set the hashing alogrthm used for placing keys on servers. .INDENT 0.0 .TP -.B \-\-HASH\-WITH\-PREFIX_KEY +.B \-\-HASH\-WITH\-NAMESPACE .UNINDENT +.sp +When enabled the prefix key will be added to the key when determining which +server to store the data in. .INDENT 0.0 .TP -.B \-\-IO\-BYTES\-WATERMARK= +.B \-\-NOREPLY .UNINDENT +.sp +Enable "no reply" for all calls that support this. It is highly recommended +that you use this option with the binary protocol only. .INDENT 0.0 .TP -.B \-\-IO\-KEY\-PREFETCH= +.B \-\-NUMBER\-OF\-REPLICAS= .UNINDENT +.sp +Set the nummber of servers that keys will be replicated to. .INDENT 0.0 .TP -.B \-\-IO\-MSG\-WATERMARK= +.B \-\-RANDOMIZE\-REPLICA\-READ .UNINDENT +.sp +Select randomly the server within the replication pool to read from. .INDENT 0.0 .TP -.B \-\-NOREPLY +.B \-\-SORT\-HOSTS .UNINDENT +.sp +When adding new servers always calculate their distribution based on sorted naming order. .INDENT 0.0 .TP -.B \-\-NUMBER\-OF\-REPLICAS= +.B \-\-SUPPORT\-CAS .UNINDENT .sp -Set the nummber of servers that keys will be replicated to. +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS .INDENT 0.0 .TP -.B \-\-POLL\-TIMEOUT= +.B \-\-USE\-UDP .UNINDENT +.sp +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP .INDENT 0.0 .TP -.B \-\-RANDOMIZE\-REPLICA\-READ +.B \-\-NAMESPACE= .UNINDENT .sp -Select randomly the server within the replication pool to read from. +A namespace is a container that provides context for keys, only other +requests that know the namespace can access these values. This is +accomplished by prepending the namespace value to all keys. +.SS I/O Options: .INDENT 0.0 .TP -.B \-\-RCV\-TIMEOUT= +.B \-\-TCP\-NODELAY +.UNINDENT +.sp +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_NODELAY +.INDENT 0.0 +.TP +.B \-\-TCP\-KEEPALIVE .UNINDENT +.sp +See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_KEEPALIVE .INDENT 0.0 .TP .B \-\-RETRY\-TIMEOUT= @@ -172,42 +197,31 @@ See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE .INDENT 0.0 .TP -.B \-\-SORT\-HOSTS +.B \-\-POLL\-TIMEOUT= .UNINDENT .sp -When adding new servers always calculate their distribution based on sorted naming order. +That sets the value of the timeout used by :manpage: \fIpoll()\fP. .INDENT 0.0 .TP -.B \-\-SUPPORT\-CAS +.B \-\-IO\-BYTES\-WATERMARK= .UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS .INDENT 0.0 .TP -.B \-\-TCP\-NODELAY +.B \-\-IO\-KEY\-PREFETCH= .UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_NODELAY .INDENT 0.0 .TP -.B \-\-TCP\-KEEPALIVE +.B \-\-IO\-MSG\-WATERMARK= .UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_TCP_KEEPALIVE .INDENT 0.0 .TP .B \-\-TCP\-KEEPIDLE .UNINDENT .INDENT 0.0 .TP -.B \-\-USE\-UDP -.UNINDENT -.sp -See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP -.INDENT 0.0 -.TP -.B \-\-PREFIX\-KEY= +.B \-\-RCV\-TIMEOUT= .UNINDENT +.SS Other: .INDENT 0.0 .TP .B INCLUDE diff --git a/docs/man/memcached_decrement.3 b/docs/man/memcached_decrement.3 index 0384c801..5d5b7c07 100644 --- a/docs/man/memcached_decrement.3 +++ b/docs/man/memcached_decrement.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DECREMENT" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DECREMENT" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_decrement \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_decrement_with_initial.3 b/docs/man/memcached_decrement_with_initial.3 index 744977b1..8475f737 100644 --- a/docs/man/memcached_decrement_with_initial.3 +++ b/docs/man/memcached_decrement_with_initial.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_decrement_with_initial \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_delete.3 b/docs/man/memcached_delete.3 index 86dad7d9..13ab4303 100644 --- a/docs/man/memcached_delete.3 +++ b/docs/man/memcached_delete.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DELETE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DELETE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_delete \- libmemcached Documentation . diff --git a/docs/man/memcached_delete_by_key.3 b/docs/man/memcached_delete_by_key.3 index 5230363d..321e4d21 100644 --- a/docs/man/memcached_delete_by_key.3 +++ b/docs/man/memcached_delete_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DELETE_BY_KEY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DELETE_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_delete_by_key \- libmemcached Documentation . diff --git a/docs/man/memcached_destroy_sasl_auth_data.3 b/docs/man/memcached_destroy_sasl_auth_data.3 index cd9bdd75..44f53868 100644 --- a/docs/man/memcached_destroy_sasl_auth_data.3 +++ b/docs/man/memcached_destroy_sasl_auth_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_destroy_sasl_auth_data \- libmemcached Documentation . diff --git a/docs/man/memcached_dump.3 b/docs/man/memcached_dump.3 index a93a5c43..ee44cbc5 100644 --- a/docs/man/memcached_dump.3 +++ b/docs/man/memcached_dump.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DUMP" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_DUMP" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_dump \- libmemcached Documentation . diff --git a/docs/man/memcached_fetch.3 b/docs/man/memcached_fetch.3 index fda2c578..6c003588 100644 --- a/docs/man/memcached_fetch.3 +++ b/docs/man/memcached_fetch.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FETCH" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FETCH" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_fetch \- Retrieving data from the server . diff --git a/docs/man/memcached_fetch_execute.3 b/docs/man/memcached_fetch_execute.3 index 27e2e0a7..3d34ee89 100644 --- a/docs/man/memcached_fetch_execute.3 +++ b/docs/man/memcached_fetch_execute.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FETCH_EXECUTE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FETCH_EXECUTE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_fetch_execute \- Retrieving data from the server . diff --git a/docs/man/memcached_fetch_result.3 b/docs/man/memcached_fetch_result.3 index 7e2279c3..5ae03ec5 100644 --- a/docs/man/memcached_fetch_result.3 +++ b/docs/man/memcached_fetch_result.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FETCH_RESULT" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FETCH_RESULT" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_fetch_result \- Retrieving data from the server . diff --git a/docs/man/memcached_flush.3 b/docs/man/memcached_flush.3 index a1904dd0..7db06fa0 100644 --- a/docs/man/memcached_flush.3 +++ b/docs/man/memcached_flush.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FLUSH" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FLUSH" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_flush \- libmemcached Documentation . diff --git a/docs/man/memcached_flush_buffers.3 b/docs/man/memcached_flush_buffers.3 index 29954839..6e2fc657 100644 --- a/docs/man/memcached_flush_buffers.3 +++ b/docs/man/memcached_flush_buffers.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FLUSH_BUFFERS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FLUSH_BUFFERS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_flush_buffers \- libmemcached Documentation . diff --git a/docs/man/memcached_free.3 b/docs/man/memcached_free.3 index 5fe91691..d2b3cb0a 100644 --- a/docs/man/memcached_free.3 +++ b/docs/man/memcached_free.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FREE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_FREE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_free \- libmemcached Documentation . diff --git a/docs/man/memcached_generate_hash.3 b/docs/man/memcached_generate_hash.3 index 4db0f232..e96898e5 100644 --- a/docs/man/memcached_generate_hash.3 +++ b/docs/man/memcached_generate_hash.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GENERATE_HASH" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GENERATE_HASH" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_generate_hash \- Generating hash values directly . diff --git a/docs/man/memcached_generate_hash_value.3 b/docs/man/memcached_generate_hash_value.3 index e6460d6f..6298273b 100644 --- a/docs/man/memcached_generate_hash_value.3 +++ b/docs/man/memcached_generate_hash_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_generate_hash_value \- Generating hash values directly . diff --git a/docs/man/memcached_get.3 b/docs/man/memcached_get.3 index 8dc91f4b..3b9892e6 100644 --- a/docs/man/memcached_get.3 +++ b/docs/man/memcached_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_get \- Retrieving data from the server . diff --git a/docs/man/memcached_get_by_key.3 b/docs/man/memcached_get_by_key.3 index d9e18a7d..25757c81 100644 --- a/docs/man/memcached_get_by_key.3 +++ b/docs/man/memcached_get_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_BY_KEY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GET_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_get_by_key \- Retrieving data from the server . diff --git a/docs/man/memcached_get_memory_allocators.3 b/docs/man/memcached_get_memory_allocators.3 index b76371bf..7125fb3c 100644 --- a/docs/man/memcached_get_memory_allocators.3 +++ b/docs/man/memcached_get_memory_allocators.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_get_memory_allocators \- libmemcached Documentation . diff --git a/docs/man/memcached_get_sasl_callbacks.3 b/docs/man/memcached_get_sasl_callbacks.3 index 8fa5fcc5..e72d4c90 100644 --- a/docs/man/memcached_get_sasl_callbacks.3 +++ b/docs/man/memcached_get_sasl_callbacks.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_get_sasl_callbacks \- libmemcached Documentation . diff --git a/docs/man/memcached_get_user_data.3 b/docs/man/memcached_get_user_data.3 index 9a3f7218..20a1e61e 100644 --- a/docs/man/memcached_get_user_data.3 +++ b/docs/man/memcached_get_user_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_USER_DATA" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_GET_USER_DATA" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_get_user_data \- libmemcached Documentation . diff --git a/docs/man/memcached_increment.3 b/docs/man/memcached_increment.3 index b87a5344..c3b7d0ab 100644 --- a/docs/man/memcached_increment.3 +++ b/docs/man/memcached_increment.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_INCREMENT" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_INCREMENT" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_increment \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_increment_with_initial.3 b/docs/man/memcached_increment_with_initial.3 index c3a9781b..d542ded5 100644 --- a/docs/man/memcached_increment_with_initial.3 +++ b/docs/man/memcached_increment_with_initial.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_increment_with_initial \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_lib_version.3 b/docs/man/memcached_lib_version.3 index 3c4897e0..91458c10 100644 --- a/docs/man/memcached_lib_version.3 +++ b/docs/man/memcached_lib_version.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_LIB_VERSION" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_LIB_VERSION" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_lib_version \- libmemcached Documentation . diff --git a/docs/man/memcached_memory_allocators.3 b/docs/man/memcached_memory_allocators.3 index cae0255b..1f50a825 100644 --- a/docs/man/memcached_memory_allocators.3 +++ b/docs/man/memcached_memory_allocators.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MEMORY_ALLOCATORS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_MEMORY_ALLOCATORS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_memory_allocators \- libmemcached Documentation . diff --git a/docs/man/memcached_mget.3 b/docs/man/memcached_mget.3 index 4ff59a3b..05f023c6 100644 --- a/docs/man/memcached_mget.3 +++ b/docs/man/memcached_mget.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_MGET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_mget \- Retrieving data from the server . diff --git a/docs/man/memcached_mget_by_key.3 b/docs/man/memcached_mget_by_key.3 index 23238a7e..15040a7a 100644 --- a/docs/man/memcached_mget_by_key.3 +++ b/docs/man/memcached_mget_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET_BY_KEY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_MGET_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_mget_by_key \- Retrieving data from the server . diff --git a/docs/man/memcached_mget_execute.3 b/docs/man/memcached_mget_execute.3 index 80e9acff..4097c289 100644 --- a/docs/man/memcached_mget_execute.3 +++ b/docs/man/memcached_mget_execute.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET_EXECUTE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_MGET_EXECUTE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_mget_execute \- Retrieving data from the server . diff --git a/docs/man/memcached_mget_execute_by_key.3 b/docs/man/memcached_mget_execute_by_key.3 index fddf37e3..1bf68806 100644 --- a/docs/man/memcached_mget_execute_by_key.3 +++ b/docs/man/memcached_mget_execute_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_mget_execute_by_key \- Retrieving data from the server . diff --git a/docs/man/memcached_pool.3 b/docs/man/memcached_pool.3 index 24a698c0..c264dde2 100644 --- a/docs/man/memcached_pool.3 +++ b/docs/man/memcached_pool.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_pool \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_behavior_get.3 b/docs/man/memcached_pool_behavior_get.3 index 6b1aeca8..b6c46925 100644 --- a/docs/man/memcached_pool_behavior_get.3 +++ b/docs/man/memcached_pool_behavior_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_behavior_get \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_behavior_set.3 b/docs/man/memcached_pool_behavior_set.3 index e4928ea9..1defee21 100644 --- a/docs/man/memcached_pool_behavior_set.3 +++ b/docs/man/memcached_pool_behavior_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_behavior_set \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_create.3 b/docs/man/memcached_pool_create.3 index a869f738..25499e53 100644 --- a/docs/man/memcached_pool_create.3 +++ b/docs/man/memcached_pool_create.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_CREATE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_CREATE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_create \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_destroy.3 b/docs/man/memcached_pool_destroy.3 index 6fd65125..ee918d36 100644 --- a/docs/man/memcached_pool_destroy.3 +++ b/docs/man/memcached_pool_destroy.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_DESTROY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_DESTROY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_destroy \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_pop.3 b/docs/man/memcached_pool_pop.3 index 621e54ad..beda67b1 100644 --- a/docs/man/memcached_pool_pop.3 +++ b/docs/man/memcached_pool_pop.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_POP" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_POP" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_pop \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_push.3 b/docs/man/memcached_pool_push.3 index 8131a1dc..6c3100c4 100644 --- a/docs/man/memcached_pool_push.3 +++ b/docs/man/memcached_pool_push.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_PUSH" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_PUSH" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_push \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_st.3 b/docs/man/memcached_pool_st.3 index edd5a9f0..a2e54798 100644 --- a/docs/man/memcached_pool_st.3 +++ b/docs/man/memcached_pool_st.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_ST" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_POOL_ST" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_pool_st \- libmemcached Documentation . diff --git a/docs/man/memcached_prepend.3 b/docs/man/memcached_prepend.3 index 5bc859e5..ae318832 100644 --- a/docs/man/memcached_prepend.3 +++ b/docs/man/memcached_prepend.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_PREPEND" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_PREPEND" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_prepend \- Storing and Replacing Data . diff --git a/docs/man/memcached_prepend_by_key.3 b/docs/man/memcached_prepend_by_key.3 index c55eddba..d3dd972c 100644 --- a/docs/man/memcached_prepend_by_key.3 +++ b/docs/man/memcached_prepend_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_PREPEND_BY_KEY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_PREPEND_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_prepend_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_quit.3 b/docs/man/memcached_quit.3 index 0f78e613..63f12144 100644 --- a/docs/man/memcached_quit.3 +++ b/docs/man/memcached_quit.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_QUIT" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_QUIT" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_quit \- libmemcached Documentation . diff --git a/docs/man/memcached_replace.3 b/docs/man/memcached_replace.3 index b4aa226e..0c31598b 100644 --- a/docs/man/memcached_replace.3 +++ b/docs/man/memcached_replace.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_REPLACE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_REPLACE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_replace \- Storing and Replacing Data . diff --git a/docs/man/memcached_replace_by_key.3 b/docs/man/memcached_replace_by_key.3 index 8a50dbd6..d89ff8aa 100644 --- a/docs/man/memcached_replace_by_key.3 +++ b/docs/man/memcached_replace_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_REPLACE_BY_KEY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_REPLACE_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_replace_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_result_cas.3 b/docs/man/memcached_result_cas.3 index 445ab8d6..61d7ed76 100644 --- a/docs/man/memcached_result_cas.3 +++ b/docs/man/memcached_result_cas.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_CAS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_CAS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_result_cas \- Working with result sets . diff --git a/docs/man/memcached_result_create.3 b/docs/man/memcached_result_create.3 index 47848bbe..4c82d841 100644 --- a/docs/man/memcached_result_create.3 +++ b/docs/man/memcached_result_create.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_CREATE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_CREATE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_result_create \- Working with result sets . diff --git a/docs/man/memcached_result_flags.3 b/docs/man/memcached_result_flags.3 index dc9c5248..e7daba43 100644 --- a/docs/man/memcached_result_flags.3 +++ b/docs/man/memcached_result_flags.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_FLAGS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_FLAGS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_result_flags \- Working with result sets . diff --git a/docs/man/memcached_result_free.3 b/docs/man/memcached_result_free.3 index b5276e1b..671c5d05 100644 --- a/docs/man/memcached_result_free.3 +++ b/docs/man/memcached_result_free.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_FREE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_FREE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_result_free \- Working with result sets . diff --git a/docs/man/memcached_result_key_length.3 b/docs/man/memcached_result_key_length.3 index f95a4d30..c530e7d6 100644 --- a/docs/man/memcached_result_key_length.3 +++ b/docs/man/memcached_result_key_length.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_KEY_LENGTH" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_KEY_LENGTH" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_result_key_length \- Working with result sets . diff --git a/docs/man/memcached_result_key_value.3 b/docs/man/memcached_result_key_value.3 index 81fceab5..1aae4220 100644 --- a/docs/man/memcached_result_key_value.3 +++ b/docs/man/memcached_result_key_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_KEY_VALUE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_KEY_VALUE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_result_key_value \- Working with result sets . diff --git a/docs/man/memcached_result_length.3 b/docs/man/memcached_result_length.3 index b56053e6..91769270 100644 --- a/docs/man/memcached_result_length.3 +++ b/docs/man/memcached_result_length.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_LENGTH" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_LENGTH" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_result_length \- Working with result sets . diff --git a/docs/man/memcached_result_st.3 b/docs/man/memcached_result_st.3 index 99dbb104..98734d20 100644 --- a/docs/man/memcached_result_st.3 +++ b/docs/man/memcached_result_st.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_ST" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_ST" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_result_st \- Working with result sets . diff --git a/docs/man/memcached_result_value.3 b/docs/man/memcached_result_value.3 index 33dedb93..4ca4789f 100644 --- a/docs/man/memcached_result_value.3 +++ b/docs/man/memcached_result_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_VALUE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_RESULT_VALUE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_result_value \- Working with result sets . diff --git a/docs/man/memcached_sasl.3 b/docs/man/memcached_sasl.3 index d46b0b49..946b0dfb 100644 --- a/docs/man/memcached_sasl.3 +++ b/docs/man/memcached_sasl.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SASL" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SASL" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_sasl \- libmemcached Documentation . diff --git a/docs/man/memcached_sasl_set_auth_data.3 b/docs/man/memcached_sasl_set_auth_data.3 index 46dc450d..62209401 100644 --- a/docs/man/memcached_sasl_set_auth_data.3 +++ b/docs/man/memcached_sasl_set_auth_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_sasl_set_auth_data \- libmemcached Documentation . diff --git a/docs/man/memcached_server_add.3 b/docs/man/memcached_server_add.3 index 007e7823..f1efa983 100644 --- a/docs/man/memcached_server_add.3 +++ b/docs/man/memcached_server_add.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_ADD" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_ADD" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_server_add \- libmemcached Documentation . diff --git a/docs/man/memcached_server_add_unix_socket.3 b/docs/man/memcached_server_add_unix_socket.3 index 229a32d4..dedc0201 100644 --- a/docs/man/memcached_server_add_unix_socket.3 +++ b/docs/man/memcached_server_add_unix_socket.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_ADD_UNIX_SOCKET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_ADD_UNIX_SOCKET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_server_add_unix_socket \- libmemcached Documentation . diff --git a/docs/man/memcached_server_count.3 b/docs/man/memcached_server_count.3 index dbac54d1..cece389e 100644 --- a/docs/man/memcached_server_count.3 +++ b/docs/man/memcached_server_count.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_COUNT" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_COUNT" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_server_count \- libmemcached Documentation . diff --git a/docs/man/memcached_server_cursor.3 b/docs/man/memcached_server_cursor.3 index 9d986faa..d5d67b5a 100644 --- a/docs/man/memcached_server_cursor.3 +++ b/docs/man/memcached_server_cursor.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_CURSOR" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_CURSOR" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_server_cursor \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list.3 b/docs/man/memcached_server_list.3 index b1768821..ef1627fd 100644 --- a/docs/man/memcached_server_list.3 +++ b/docs/man/memcached_server_list.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_LIST" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_server_list \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list_append.3 b/docs/man/memcached_server_list_append.3 index 054ef6f8..9f284353 100644 --- a/docs/man/memcached_server_list_append.3 +++ b/docs/man/memcached_server_list_append.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_server_list_append \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list_count.3 b/docs/man/memcached_server_list_count.3 index 39dfd3bf..9c0e65ce 100644 --- a/docs/man/memcached_server_list_count.3 +++ b/docs/man/memcached_server_list_count.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_server_list_count \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list_free.3 b/docs/man/memcached_server_list_free.3 index a1bd6e9a..0f2b62bb 100644 --- a/docs/man/memcached_server_list_free.3 +++ b/docs/man/memcached_server_list_free.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST_FREE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_LIST_FREE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_server_list_free \- libmemcached Documentation . diff --git a/docs/man/memcached_server_push.3 b/docs/man/memcached_server_push.3 index a2edbca0..71e7eed1 100644 --- a/docs/man/memcached_server_push.3 +++ b/docs/man/memcached_server_push.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_PUSH" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_PUSH" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_server_push \- libmemcached Documentation . diff --git a/docs/man/memcached_server_st.3 b/docs/man/memcached_server_st.3 index e4a863a6..d5cc4262 100644 --- a/docs/man/memcached_server_st.3 +++ b/docs/man/memcached_server_st.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_ST" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVER_ST" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_server_st \- libmemcached Documentation . diff --git a/docs/man/memcached_servers.3 b/docs/man/memcached_servers.3 index 9658d1e0..840d6879 100644 --- a/docs/man/memcached_servers.3 +++ b/docs/man/memcached_servers.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVERS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVERS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_servers \- libmemcached Documentation . diff --git a/docs/man/memcached_servers_parse.3 b/docs/man/memcached_servers_parse.3 index 149c98e7..4663b857 100644 --- a/docs/man/memcached_servers_parse.3 +++ b/docs/man/memcached_servers_parse.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVERS_PARSE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVERS_PARSE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_servers_parse \- libmemcached Documentation . diff --git a/docs/man/memcached_servers_reset.3 b/docs/man/memcached_servers_reset.3 index be51b9f3..43c89653 100644 --- a/docs/man/memcached_servers_reset.3 +++ b/docs/man/memcached_servers_reset.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVERS_RESET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SERVERS_RESET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_servers_reset \- libmemcached Documentation . diff --git a/docs/man/memcached_set.3 b/docs/man/memcached_set.3 index b30a53d4..76350727 100644 --- a/docs/man/memcached_set.3 +++ b/docs/man/memcached_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_set \- Storing and Replacing Data . diff --git a/docs/man/memcached_set_by_key.3 b/docs/man/memcached_set_by_key.3 index 60ceb9f5..f9c062d2 100644 --- a/docs/man/memcached_set_by_key.3 +++ b/docs/man/memcached_set_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_BY_KEY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET_BY_KEY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_set_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_set_memory_allocators.3 b/docs/man/memcached_set_memory_allocators.3 index 6f6b4293..8635453f 100644 --- a/docs/man/memcached_set_memory_allocators.3 +++ b/docs/man/memcached_set_memory_allocators.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_set_memory_allocators \- libmemcached Documentation . diff --git a/docs/man/memcached_set_memory_allocators_context.3 b/docs/man/memcached_set_memory_allocators_context.3 index 31f905b0..523c0810 100644 --- a/docs/man/memcached_set_memory_allocators_context.3 +++ b/docs/man/memcached_set_memory_allocators_context.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_MEMORY_ALLOCATORS_CONTEXT" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET_MEMORY_ALLOCATORS_CONTEXT" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_set_memory_allocators_context \- libmemcached Documentation . diff --git a/docs/man/memcached_set_sasl_callbacks.3 b/docs/man/memcached_set_sasl_callbacks.3 index 12919f49..d44839fa 100644 --- a/docs/man/memcached_set_sasl_callbacks.3 +++ b/docs/man/memcached_set_sasl_callbacks.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_set_sasl_callbacks \- libmemcached Documentation . diff --git a/docs/man/memcached_set_user_data.3 b/docs/man/memcached_set_user_data.3 index a24319fc..033b58d2 100644 --- a/docs/man/memcached_set_user_data.3 +++ b/docs/man/memcached_set_user_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_USER_DATA" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_SET_USER_DATA" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_set_user_data \- libmemcached Documentation . diff --git a/docs/man/memcached_stat.3 b/docs/man/memcached_stat.3 index d0877c3c..4531dc9d 100644 --- a/docs/man/memcached_stat.3 +++ b/docs/man/memcached_stat.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STAT" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_stat \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_execute.3 b/docs/man/memcached_stat_execute.3 index 43c6f846..5d252484 100644 --- a/docs/man/memcached_stat_execute.3 +++ b/docs/man/memcached_stat_execute.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_EXECUTE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STAT_EXECUTE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_stat_execute \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_get_keys.3 b/docs/man/memcached_stat_get_keys.3 index d9d3309e..f7e32ce1 100644 --- a/docs/man/memcached_stat_get_keys.3 +++ b/docs/man/memcached_stat_get_keys.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_GET_KEYS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STAT_GET_KEYS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_stat_get_keys \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_get_value.3 b/docs/man/memcached_stat_get_value.3 index 1fe3a264..95a76a07 100644 --- a/docs/man/memcached_stat_get_value.3 +++ b/docs/man/memcached_stat_get_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_GET_VALUE" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STAT_GET_VALUE" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_stat_get_value \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_servername.3 b/docs/man/memcached_stat_servername.3 index 162caf55..84ac2a31 100644 --- a/docs/man/memcached_stat_servername.3 +++ b/docs/man/memcached_stat_servername.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_SERVERNAME" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STAT_SERVERNAME" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_stat_servername \- libmemcached Documentation . diff --git a/docs/man/memcached_stats.3 b/docs/man/memcached_stats.3 index fbcb8487..91a13274 100644 --- a/docs/man/memcached_stats.3 +++ b/docs/man/memcached_stats.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STATS" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STATS" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_stats \- libmemcached Documentation . diff --git a/docs/man/memcached_strerror.3 b/docs/man/memcached_strerror.3 index d9d5ef1c..57b8b113 100644 --- a/docs/man/memcached_strerror.3 +++ b/docs/man/memcached_strerror.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STRERROR" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_STRERROR" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_strerror \- libmemcached Documentation . diff --git a/docs/man/memcached_user_data.3 b/docs/man/memcached_user_data.3 index ec1815bf..9819cd66 100644 --- a/docs/man/memcached_user_data.3 +++ b/docs/man/memcached_user_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_USER_DATA" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_USER_DATA" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_user_data \- libmemcached Documentation . diff --git a/docs/man/memcached_verbosity.3 b/docs/man/memcached_verbosity.3 index bc90bec0..1a926e6b 100644 --- a/docs/man/memcached_verbosity.3 +++ b/docs/man/memcached_verbosity.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_VERBOSITY" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_VERBOSITY" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_verbosity \- libmemcached Documentation . diff --git a/docs/man/memcached_version.3 b/docs/man/memcached_version.3 index 9790bfdc..0da54643 100644 --- a/docs/man/memcached_version.3 +++ b/docs/man/memcached_version.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_VERSION" "3" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCACHED_VERSION" "3" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcached_version \- libmemcached Documentation . diff --git a/docs/man/memcapable.1 b/docs/man/memcapable.1 index 7310eee7..e49422e3 100644 --- a/docs/man/memcapable.1 +++ b/docs/man/memcapable.1 @@ -1,4 +1,4 @@ -.TH "MEMCAPABLE" "1" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCAPABLE" "1" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcapable \- libmemcached Documentation . diff --git a/docs/man/memcat.1 b/docs/man/memcat.1 index 79071a14..229aac6f 100644 --- a/docs/man/memcat.1 +++ b/docs/man/memcat.1 @@ -1,4 +1,4 @@ -.TH "MEMCAT" "1" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCAT" "1" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcat \- libmemcached Documentation . diff --git a/docs/man/memcp.1 b/docs/man/memcp.1 index 0f5bfc5e..e32a8198 100644 --- a/docs/man/memcp.1 +++ b/docs/man/memcp.1 @@ -1,4 +1,4 @@ -.TH "MEMCP" "1" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMCP" "1" "April 11, 2011" "0.47" "libmemcached" .SH NAME memcp \- libmemcached Documentation . diff --git a/docs/man/memdump.1 b/docs/man/memdump.1 index 7a5c35a6..88e8f65c 100644 --- a/docs/man/memdump.1 +++ b/docs/man/memdump.1 @@ -1,4 +1,4 @@ -.TH "MEMDUMP" "1" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMDUMP" "1" "April 11, 2011" "0.47" "libmemcached" .SH NAME memdump \- libmemcached Documentation . diff --git a/docs/man/memerror.1 b/docs/man/memerror.1 index b7c6af0e..531e2d8d 100644 --- a/docs/man/memerror.1 +++ b/docs/man/memerror.1 @@ -1,4 +1,4 @@ -.TH "MEMERROR" "1" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMERROR" "1" "April 11, 2011" "0.47" "libmemcached" .SH NAME memerror \- libmemcached Documentation . diff --git a/docs/man/memflush.1 b/docs/man/memflush.1 index d3c446c6..85c881d7 100644 --- a/docs/man/memflush.1 +++ b/docs/man/memflush.1 @@ -1,4 +1,4 @@ -.TH "MEMFLUSH" "1" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMFLUSH" "1" "April 11, 2011" "0.47" "libmemcached" .SH NAME memflush \- libmemcached Documentation . diff --git a/docs/man/memrm.1 b/docs/man/memrm.1 index 19b3d9c1..839cd8e9 100644 --- a/docs/man/memrm.1 +++ b/docs/man/memrm.1 @@ -1,4 +1,4 @@ -.TH "MEMRM" "1" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMRM" "1" "April 11, 2011" "0.47" "libmemcached" .SH NAME memrm \- libmemcached Documentation . diff --git a/docs/man/memslap.1 b/docs/man/memslap.1 index 5fae1bd6..83e911dc 100644 --- a/docs/man/memslap.1 +++ b/docs/man/memslap.1 @@ -1,4 +1,4 @@ -.TH "MEMSLAP" "1" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMSLAP" "1" "April 11, 2011" "0.47" "libmemcached" .SH NAME memslap \- libmemcached Documentation . diff --git a/docs/man/memstat.1 b/docs/man/memstat.1 index d4811d74..e4fdd7ac 100644 --- a/docs/man/memstat.1 +++ b/docs/man/memstat.1 @@ -1,4 +1,4 @@ -.TH "MEMSTAT" "1" "April 10, 2011" "0.47" "libmemcached" +.TH "MEMSTAT" "1" "April 11, 2011" "0.47" "libmemcached" .SH NAME memstat \- libmemcached Documentation . diff --git a/docs/tap.rst b/docs/tap.rst new file mode 100644 index 00000000..5572f114 --- /dev/null +++ b/docs/tap.rst @@ -0,0 +1,7 @@ +================= +Systemtap support +================= + +By default on Linux libmemcached is compiled to support Systemtap. This enabled/disabled during compiles via the dtrace configure flag. + +Please see :manpage: `stapex` for more information about Systemtap. diff --git a/libmemcached/options/parser.cc b/libmemcached/options/parser.cc index 14754f92..dfa99f7a 100644 --- a/libmemcached/options/parser.cc +++ b/libmemcached/options/parser.cc @@ -149,7 +149,7 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) CONNECT_TIMEOUT = 273, DISTRIBUTION = 274, HASH = 275, - HASH_WITH_PREFIX_KEY = 276, + HASH_WITH_NAMESPACE = 276, IO_BYTES_WATERMARK = 277, IO_KEY_PREFETCH = 278, IO_MSG_WATERMARK = 279, @@ -173,7 +173,7 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) _TCP_KEEPALIVE = 297, _TCP_KEEPIDLE = 298, _TCP_NODELAY = 299, - PREFIX_KEY = 300, + NAMESPACE = 300, MD5 = 301, CRC = 302, FNV1_64 = 303, @@ -540,13 +540,13 @@ static const char *const yytname[] = "PARSER_DEBUG", "INCLUDE", "CONFIGURE_FILE", "EMPTY_LINE", "SERVER", "SERVERS", "SERVERS_OPTION", "UNKNOWN_OPTION", "UNKNOWN", "BINARY_PROTOCOL", "BUFFER_REQUESTS", "CONNECT_TIMEOUT", "DISTRIBUTION", - "HASH", "HASH_WITH_PREFIX_KEY", "IO_BYTES_WATERMARK", "IO_KEY_PREFETCH", + "HASH", "HASH_WITH_NAMESPACE", "IO_BYTES_WATERMARK", "IO_KEY_PREFETCH", "IO_MSG_WATERMARK", "KETAMA_HASH", "KETAMA_WEIGHTED", "NOREPLY", "NUMBER_OF_REPLICAS", "POLL_TIMEOUT", "RANDOMIZE_REPLICA_READ", "RCV_TIMEOUT", "REMOVE_FAILED_SERVERS", "RETRY_TIMEOUT", "SND_TIMEOUT", "SOCKET_RECV_SIZE", "SOCKET_SEND_SIZE", "SORT_HOSTS", "SUPPORT_CAS", "USER_DATA", "USE_UDP", "VERIFY_KEY", "_TCP_KEEPALIVE", "_TCP_KEEPIDLE", - "_TCP_NODELAY", "PREFIX_KEY", "MD5", "CRC", "FNV1_64", "FNV1A_64", + "_TCP_NODELAY", "NAMESPACE", "MD5", "CRC", "FNV1_64", "FNV1A_64", "FNV1_32", "FNV1A_32", "HSIEH", "MURMUR", "JENKINS", "CONSISTENT", "MODULA", "RANDOM", "TRUE", "FALSE", "','", "'='", "FLOAT", "NUMBER", "PORT", "WEIGHT_START", "IPADDRESS", "HOSTNAME", "STRING", diff --git a/libmemcached/options/parser.h b/libmemcached/options/parser.h index 09abf9c8..73d70401 100644 --- a/libmemcached/options/parser.h +++ b/libmemcached/options/parser.h @@ -56,7 +56,7 @@ CONNECT_TIMEOUT = 273, DISTRIBUTION = 274, HASH = 275, - HASH_WITH_PREFIX_KEY = 276, + HASH_WITH_NAMESPACE = 276, IO_BYTES_WATERMARK = 277, IO_KEY_PREFETCH = 278, IO_MSG_WATERMARK = 279, @@ -80,7 +80,7 @@ _TCP_KEEPALIVE = 297, _TCP_KEEPIDLE = 298, _TCP_NODELAY = 299, - PREFIX_KEY = 300, + NAMESPACE = 300, MD5 = 301, CRC = 302, FNV1_64 = 303, diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy index a628ac22..0f0aee65 100644 --- a/libmemcached/options/parser.yy +++ b/libmemcached/options/parser.yy @@ -80,7 +80,7 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) %token CONNECT_TIMEOUT %token DISTRIBUTION %token HASH -%token HASH_WITH_PREFIX_KEY +%token HASH_WITH_NAMESPACE %token IO_BYTES_WATERMARK %token IO_KEY_PREFETCH %token IO_MSG_WATERMARK @@ -106,7 +106,7 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) %token _TCP_NODELAY /* Callbacks */ -%token PREFIX_KEY +%token NAMESPACE /* Hash types */ %token MD5 @@ -214,7 +214,7 @@ expression: ; behaviors: - PREFIX_KEY string + NAMESPACE string { if ((context->rc= memcached_set_prefix_key(context->memc, $2.c_str, $2.length)) != MEMCACHED_SUCCESS) { @@ -325,7 +325,7 @@ behavior_boolean: { $$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS; } - | HASH_WITH_PREFIX_KEY + | HASH_WITH_NAMESPACE { $$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY; } diff --git a/libmemcached/options/scanner.cc b/libmemcached/options/scanner.cc index 9edffe13..894662ec 100644 --- a/libmemcached/options/scanner.cc +++ b/libmemcached/options/scanner.cc @@ -449,8 +449,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); yyg->yy_c_buf_p = yy_cp; /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ -#define YY_NUM_RULES 88 -#define YY_END_OF_BUFFER 89 +#define YY_NUM_RULES 87 +#define YY_END_OF_BUFFER 88 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -458,90 +458,89 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[747] = +static yyconst flex_int16_t yy_accept[739] = { 0, - 0, 0, 89, 87, 5, 5, 1, 87, 87, 87, - 2, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 0, 86, 71, 0, 0, + 0, 0, 88, 86, 5, 5, 1, 86, 86, 86, + 2, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 0, 85, 70, 0, 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 6, 71, 71, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 71, 4, 85, 85, 2, 3, - 85, 76, 85, 67, 85, 85, 85, 85, 85, 85, - 75, 85, 85, 85, 85, 85, 85, 71, 71, 71, - 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, - - 71, 71, 71, 71, 71, 71, 71, 4, 0, 85, - 2, 3, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 69, 71, 71, 71, 71, - 71, 0, 0, 71, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 71, 71, 71, 71, 71, 4, - 85, 85, 3, 85, 65, 68, 70, 85, 0, 81, - 85, 85, 85, 85, 85, 64, 85, 71, 71, 71, - 71, 71, 71, 0, 0, 0, 0, 0, 0, 71, - 71, 71, 71, 71, 0, 0, 71, 71, 71, 0, - 0, 71, 71, 71, 0, 0, 0, 71, 0, 71, - - 4, 0, 85, 3, 85, 0, 85, 85, 85, 85, - 73, 82, 74, 85, 71, 71, 71, 71, 71, 0, - 19, 0, 0, 0, 0, 0, 0, 0, 71, 71, - 0, 0, 71, 71, 0, 0, 71, 71, 71, 0, - 0, 71, 0, 0, 71, 0, 0, 0, 0, 0, - 0, 0, 0, 71, 4, 84, 85, 85, 85, 85, - 79, 77, 63, 83, 66, 71, 71, 71, 71, 71, - 0, 0, 0, 0, 0, 0, 0, 0, 71, 71, - 0, 0, 71, 71, 0, 0, 71, 0, 0, 71, - 0, 0, 71, 0, 0, 71, 0, 0, 0, 0, - - 0, 0, 0, 0, 71, 84, 85, 80, 78, 0, - 0, 0, 0, 71, 71, 71, 0, 0, 0, 0, - 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, - 0, 71, 0, 0, 0, 0, 0, 0, 7, 0, - 0, 0, 0, 0, 0, 71, 0, 0, 0, 0, - 60, 0, 0, 59, 0, 0, 84, 85, 0, 0, - 0, 0, 71, 0, 0, 71, 0, 0, 0, 0, + 0, 6, 70, 70, 70, 70, 70, 70, 70, 70, + 70, 70, 70, 70, 70, 4, 84, 84, 2, 3, + 84, 75, 84, 66, 84, 84, 84, 84, 84, 84, + 74, 84, 84, 84, 84, 84, 84, 70, 70, 70, + 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, + + 70, 70, 70, 70, 70, 70, 70, 4, 0, 84, + 2, 3, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 68, 70, 70, 70, 70, + 70, 0, 0, 70, 70, 70, 70, 70, 70, 70, + 70, 70, 70, 70, 70, 70, 70, 70, 70, 4, + 84, 84, 3, 84, 64, 67, 69, 84, 0, 80, + 84, 84, 84, 84, 84, 63, 84, 70, 70, 70, + 70, 70, 70, 0, 0, 0, 0, 0, 0, 70, + 70, 70, 70, 70, 0, 0, 70, 70, 70, 0, + 0, 70, 70, 70, 0, 0, 0, 70, 0, 70, + + 4, 0, 84, 3, 84, 0, 84, 84, 84, 84, + 72, 81, 73, 84, 70, 70, 70, 70, 70, 0, + 19, 0, 0, 0, 0, 0, 0, 0, 70, 70, + 70, 0, 0, 70, 0, 0, 70, 70, 70, 0, + 0, 70, 0, 0, 70, 0, 0, 0, 0, 0, + 0, 0, 0, 70, 4, 83, 84, 84, 84, 84, + 78, 76, 62, 82, 65, 70, 70, 70, 70, 70, + 0, 0, 0, 0, 0, 0, 0, 0, 70, 70, + 70, 0, 0, 70, 0, 0, 70, 0, 0, 70, + 0, 0, 70, 0, 0, 70, 0, 0, 0, 0, + + 0, 0, 0, 0, 70, 83, 84, 79, 77, 0, + 0, 0, 0, 70, 70, 70, 0, 0, 0, 0, + 0, 0, 0, 0, 70, 28, 0, 0, 0, 0, + 70, 0, 0, 0, 0, 0, 0, 7, 0, 0, + 0, 0, 0, 0, 70, 0, 0, 0, 0, 60, + 0, 0, 59, 0, 0, 83, 84, 0, 0, 0, + 0, 70, 0, 0, 70, 0, 0, 0, 0, 0, + 0, 0, 0, 70, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, - 71, 0, 0, 71, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 71, 0, + 0, 0, 0, 71, 0, 0, 0, 0, 70, 0, + 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, + 70, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 58, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 58, 57, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, + 70, 0, 0, 0, 0, 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 48, 47, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 48, 47, + 0, 0, 0, 0, 0, 0, 0, 0, 9, 8, - 0, 0, 9, 8, 0, 0, 0, 0, 0, 0, - 0, 0, 71, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 61, 62, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 50, 49, 0, 0, 52, 0, 0, 51, 0, - 0, 0, 0, 0, 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 36, 35, 0, 0, 0, 0, 40, 39, - 0, 0, 0, 0, 0, 56, 0, 55, 0, 0, - 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 32, 31, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, - 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 49, 0, 0, 52, + 0, 0, 51, 0, 0, 0, 0, 0, 0, 0, + 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 36, 35, 0, 0, + 0, 0, 40, 39, 0, 0, 0, 0, 0, 56, + 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, + 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 32, 31, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 54, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 38, 37, 0, 0, 0, 0, 11, - 10, 13, 12, 15, 14, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 38, 37, 0, + 0, 0, 0, 11, 10, 13, 12, 15, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 17, 16, 0, 0, 0, - 25, 0, 0, 24, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - - 26, 0, 0, 0, 0, 0, 0, 44, 46, 43, - 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 23, 22, 30, 29, 0, 0, 0, - 0, 21, 20, 0, 0, 0, 0, 0, 0, 0, - 0, 34, 33, 42, 41, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, + 16, 0, 0, 0, 25, 0, 0, 24, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 27, 0, 26, 0, 0, 0, 0, 0, + + 0, 44, 46, 43, 45, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 21, 20, 23, 22, 30, + 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 34, 33, 42, 41, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -558,8 +557,8 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 47, 1, 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, 1, 1, 1, 1, 1, 1, 1, 1, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 44, + 71, 72, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -576,7 +575,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[74] = +static yyconst flex_int32_t yy_meta[73] = { 0, 1, 1, 2, 1, 3, 1, 1, 3, 3, 1, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, @@ -585,182 +584,182 @@ static yyconst flex_int32_t yy_meta[74] = 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3 + 3, 3 } ; -static yyconst flex_int16_t yy_base[751] = +static yyconst flex_int16_t yy_base[743] = { 0, - 0, 722, 724, 2044, 2044, 2044, 2044, 716, 712, 693, - 65, 72, 0, 55, 50, 57, 71, 55, 62, 72, - 74, 78, 75, 63, 709, 701, 675, 132, 195, 103, - 208, 251, 215, 235, 228, 230, 237, 245, 265, 281, - 286, 294, 296, 311, 313, 327, 343, 354, 361, 370, - 672, 2044, 417, 305, 69, 77, 86, 75, 246, 291, - 362, 361, 90, 75, 127, 419, 416, 482, 525, 489, - 504, 502, 509, 511, 517, 539, 519, 560, 552, 566, - 554, 582, 584, 595, 601, 613, 627, 180, 223, 224, - 241, 272, 210, 275, 312, 317, 329, 321, 325, 404, - - 333, 356, 377, 353, 355, 418, 409, 650, 678, 721, - 764, 685, 625, 700, 702, 714, 736, 743, 750, 777, - 755, 784, 791, 796, 804, 668, 427, 423, 428, 410, - 424, 786, 799, 436, 443, 476, 520, 529, 292, 519, - 517, 525, 568, 567, 574, 580, 580, 802, 591, 857, - 870, 709, 877, 856, 891, 893, 899, 901, 906, 916, - 921, 923, 928, 942, 934, 950, 957, 613, 632, 629, - 679, 678, 808, 743, 770, 768, 775, 798, 800, 891, - 909, 641, 915, 917, 916, 920, 922, 924, 948, 934, - 938, 957, 695, 950, 959, 968, 945, 795, 947, 966, - - 1019, 1032, 1075, 2044, 1053, 1051, 1058, 1067, 1069, 1094, - 1099, 1101, 1110, 1119, 953, 973, 996, 1001, 998, 985, - 2044, 999, 1030, 1040, 1069, 1071, 1068, 1090, 1093, 1088, - 1089, 1092, 1090, 1102, 1107, 1108, 1117, 829, 1105, 1116, - 1118, 1109, 1122, 1123, 1116, 1130, 1130, 1142, 1133, 1147, - 1149, 1151, 1155, 1135, 2044, 1203, 1178, 1188, 1196, 1218, - 1223, 1229, 1236, 1243, 1248, 833, 850, 1162, 1182, 1214, - 1210, 1213, 1221, 663, 662, 1222, 622, 621, 1209, 869, - 1226, 1229, 969, 1230, 1227, 1228, 1006, 1222, 1224, 640, - 1234, 1238, 1010, 1237, 1240, 1237, 1253, 1255, 1255, 1260, - - 1256, 1272, 1275, 1261, 1182, 1320, 1304, 1309, 1334, 1264, - 1267, 1283, 1284, 1288, 1293, 1300, 1304, 1305, 1307, 1311, - 1307, 1313, 1319, 1314, 0, 1323, 1324, 1327, 1328, 1331, - 1332, 1318, 1341, 1344, 1344, 1349, 1347, 1349, 2044, 1355, - 1358, 1356, 1360, 1353, 1361, 1307, 1365, 1379, 1370, 1383, - 2044, 1369, 1371, 2044, 1381, 1382, 1409, 1415, 1377, 1378, - 1405, 1407, 1409, 1397, 1401, 1404, 1417, 1418, 648, 1409, - 1427, 598, 1411, 1429, 1425, 1426, 1428, 1429, 1433, 1435, - 1438, 1430, 1431, 1446, 1448, 1437, 1450, 1449, 1451, 1463, - 1464, 1466, 1470, 1458, 1459, 1477, 1478, 1483, 1470, 1485, - - 1471, 1484, 1486, 1483, 1484, 1512, 1484, 1488, 1487, 1500, - 1530, 1511, 1513, 1514, 632, 592, 1501, 1520, 1507, 1505, - 1524, 1512, 630, 590, 1518, 1519, 1510, 1511, 1549, 1517, - 1519, 1532, 1533, 1538, 1540, 1525, 1527, 1550, 1544, 1561, - 1552, 1552, 1555, 1576, 1577, 1567, 1577, 1581, 1571, 1580, - 1585, 2044, 2044, 1562, 1563, 1569, 1570, 1571, 1573, 1589, - 1590, 1584, 1586, 1585, 1586, 1587, 1606, 1606, 1613, 1619, - 1619, 1623, 1613, 1614, 1612, 1614, 609, 589, 1618, 1619, - 1618, 1620, 1629, 1630, 1628, 1629, 1626, 1628, 1627, 1646, - 1629, 1649, 2044, 2044, 1635, 1637, 1648, 1649, 1641, 1663, - - 1662, 1654, 2044, 2044, 1667, 1670, 1681, 1682, 1680, 1681, - 1686, 1687, 1680, 1677, 1678, 1677, 1693, 1682, 1682, 1698, - 1686, 1700, 1702, 1688, 1690, 2044, 2044, 1706, 1710, 583, - 577, 1715, 1721, 1707, 1712, 576, 564, 537, 524, 476, - 474, 2044, 2044, 1714, 1734, 2044, 1718, 1736, 2044, 1740, - 1741, 1726, 1727, 1736, 1737, 1735, 1736, 496, 1747, 1749, - 1751, 1737, 1745, 1754, 1741, 1749, 1748, 1749, 450, 441, - 1753, 1758, 2044, 2044, 1776, 1778, 1767, 1770, 2044, 2044, - 1774, 1775, 1776, 1778, 1793, 2044, 1794, 2044, 1785, 1787, - 1783, 1784, 1800, 1801, 1787, 1789, 2044, 1805, 1806, 1795, - - 1812, 1815, 1800, 1816, 1822, 1816, 1822, 2044, 2044, 1824, - 1829, 420, 372, 390, 387, 1835, 1838, 1839, 1840, 2044, - 2044, 1839, 1840, 1834, 1835, 386, 384, 1836, 1837, 1849, - 1850, 1847, 1854, 1846, 1852, 1858, 1849, 1860, 1861, 1863, - 1864, 1858, 1863, 2044, 2044, 1862, 1864, 1869, 1872, 2044, - 2044, 2044, 2044, 2044, 2044, 378, 369, 1877, 1878, 1902, - 365, 1894, 1905, 349, 1896, 1905, 1907, 1908, 1909, 1908, - 1909, 1911, 1913, 1914, 1915, 2044, 2044, 300, 284, 1903, - 2044, 306, 1905, 2044, 290, 1923, 1925, 1926, 1930, 1918, - 1924, 287, 274, 253, 252, 1933, 1938, 1941, 2044, 1944, - - 2044, 1937, 1938, 240, 200, 1937, 1938, 2044, 2044, 2044, - 2044, 1956, 1957, 215, 196, 132, 120, 1946, 1947, 1961, - 1962, 1943, 1945, 2044, 2044, 2044, 2044, 1967, 1968, 1956, - 1957, 2044, 2044, 1976, 1977, 1961, 1962, 1981, 1986, 119, - 116, 2044, 2044, 2044, 2044, 2044, 2037, 126, 2040, 113 + 0, 825, 827, 2013, 2013, 2013, 2013, 794, 772, 745, + 64, 71, 0, 54, 49, 56, 70, 54, 61, 71, + 73, 77, 74, 62, 740, 728, 717, 131, 193, 102, + 206, 249, 213, 233, 226, 228, 235, 243, 263, 279, + 284, 292, 294, 309, 311, 325, 341, 352, 359, 368, + 715, 2013, 415, 303, 68, 76, 85, 74, 345, 77, + 360, 400, 90, 112, 187, 415, 395, 480, 523, 487, + 411, 464, 500, 505, 507, 512, 514, 540, 548, 555, + 567, 574, 576, 588, 619, 596, 621, 213, 230, 244, + 240, 246, 208, 276, 273, 291, 295, 309, 305, 354, + + 314, 341, 346, 342, 359, 408, 402, 636, 669, 712, + 755, 643, 632, 684, 667, 690, 692, 745, 736, 701, + 747, 773, 699, 779, 788, 781, 426, 422, 564, 419, + 435, 776, 790, 454, 519, 524, 518, 538, 290, 532, + 553, 564, 623, 632, 624, 631, 688, 711, 718, 840, + 853, 824, 861, 874, 876, 881, 883, 888, 890, 897, + 903, 909, 911, 917, 933, 940, 952, 753, 770, 774, + 785, 773, 797, 462, 790, 821, 484, 884, 885, 907, + 911, 927, 704, 927, 925, 927, 926, 529, 944, 931, + 935, 951, 728, 942, 947, 952, 943, 754, 944, 962, + + 1007, 1020, 1063, 2013, 1041, 992, 1035, 1046, 1048, 1055, + 1057, 1078, 1098, 1104, 563, 976, 1015, 1035, 1041, 1041, + 2013, 1046, 1050, 574, 1064, 1052, 772, 1069, 1063, 1069, + 1067, 1074, 1075, 1087, 1093, 1098, 1104, 777, 1092, 1102, + 1104, 1094, 1107, 1108, 1099, 1113, 1104, 1115, 1109, 1122, + 1124, 1126, 1128, 858, 2013, 1175, 1173, 1188, 1190, 1196, + 1201, 1207, 1209, 1216, 1218, 800, 886, 1161, 1167, 1197, + 1199, 1201, 1206, 695, 694, 1207, 640, 622, 1212, 981, + 983, 1210, 1212, 1213, 1211, 1212, 1051, 1207, 1209, 643, + 1217, 1218, 1147, 1217, 1218, 1221, 1237, 1240, 1242, 1246, + + 1237, 1254, 1260, 1246, 1161, 1305, 1278, 1287, 1296, 1248, + 1263, 1265, 1268, 1277, 1277, 1282, 1287, 1288, 1290, 1295, + 1289, 1296, 1300, 1294, 1315, 0, 1305, 1306, 1311, 1312, + 1113, 1321, 1322, 1322, 1323, 1322, 1324, 2013, 1332, 1335, + 1331, 1343, 1322, 1327, 1369, 1343, 1358, 1349, 1361, 2013, + 1350, 1351, 2013, 1361, 1363, 1390, 1395, 1363, 1364, 1380, + 1382, 1386, 1374, 1380, 1382, 1395, 1396, 624, 1387, 1405, + 575, 1389, 1409, 1406, 1407, 1410, 1414, 1415, 1418, 1409, + 1410, 1425, 1427, 1422, 1423, 1424, 1426, 1439, 1440, 1443, + 1444, 1434, 1436, 1454, 1455, 1458, 1448, 1460, 1452, 1464, + + 1469, 1468, 1469, 1510, 1462, 1463, 1462, 1463, 1494, 1480, + 1481, 1484, 612, 569, 1479, 1498, 1488, 1486, 1506, 1492, + 592, 602, 556, 1498, 1499, 1522, 1494, 1497, 1510, 1514, + 1519, 1520, 1505, 1506, 1525, 1517, 1529, 1519, 1515, 1524, + 1543, 1546, 1536, 1552, 1556, 1550, 1559, 1563, 2013, 2013, + 1129, 1344, 1545, 1546, 1546, 1547, 1563, 1566, 1560, 1563, + 1562, 1564, 1565, 1579, 1575, 1577, 1584, 1580, 1582, 2013, + 1570, 1579, 1577, 1580, 1584, 1592, 1591, 1596, 1605, 1606, + 1604, 1605, 1601, 1602, 1601, 1622, 1605, 1626, 2013, 2013, + 1612, 1613, 1624, 1622, 1611, 1630, 1628, 1617, 2013, 2013, + + 1636, 1637, 1650, 1651, 1654, 1655, 1660, 1664, 1656, 1670, + 1671, 1653, 1669, 1657, 1656, 1672, 1662, 1676, 1679, 1665, + 1666, 1682, 1683, 580, 569, 1684, 1688, 1673, 1674, 547, + 539, 535, 522, 478, 477, 2013, 2013, 1683, 1701, 2013, + 1687, 1705, 2013, 1714, 1715, 1700, 1704, 1712, 1713, 1711, + 1712, 499, 1715, 1716, 1725, 1711, 1721, 1730, 1718, 1726, + 1724, 1725, 468, 427, 1726, 1727, 2013, 2013, 1743, 1744, + 1729, 1739, 2013, 2013, 1741, 1744, 1745, 1752, 1767, 2013, + 1768, 2013, 1762, 1763, 1759, 1760, 1776, 1777, 1762, 1763, + 2013, 1780, 1783, 1771, 1789, 1792, 1776, 1792, 1795, 1785, + + 1789, 2013, 2013, 1790, 1791, 437, 376, 398, 382, 1804, + 1805, 1808, 1809, 2013, 2013, 1813, 1814, 1808, 1812, 379, + 370, 1812, 1813, 1815, 1816, 1823, 1829, 1820, 1826, 1834, + 1825, 1837, 1838, 1839, 1840, 1831, 1832, 2013, 2013, 1829, + 1830, 1831, 1841, 2013, 2013, 2013, 2013, 2013, 2013, 363, + 334, 1852, 1855, 1871, 326, 1868, 1879, 310, 1873, 1882, + 1883, 1884, 1885, 1884, 1885, 1886, 1887, 1889, 1891, 2013, + 2013, 1896, 1899, 1883, 2013, 304, 1884, 2013, 288, 1902, + 1903, 1904, 1907, 1891, 1892, 285, 272, 251, 250, 1917, + 1919, 1914, 2013, 1915, 2013, 1914, 1915, 238, 198, 1916, + + 1917, 2013, 2013, 2013, 2013, 1935, 1936, 213, 194, 131, + 119, 1924, 1925, 1939, 1940, 2013, 2013, 2013, 2013, 2013, + 2013, 1941, 1943, 1932, 1933, 1953, 1954, 1937, 1938, 1954, + 1955, 118, 115, 2013, 2013, 2013, 2013, 2013, 2006, 125, + 2009, 112 } ; -static yyconst flex_int16_t yy_def[751] = +static yyconst flex_int16_t yy_def[743] = { 0, - 746, 1, 746, 746, 746, 746, 746, 747, 746, 746, - 748, 746, 748, 748, 748, 748, 748, 748, 748, 748, - 748, 748, 748, 748, 749, 747, 747, 746, 746, 750, - 750, 750, 746, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 750, - 749, 746, 28, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 746, 750, 750, 750, 746, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 53, 53, 53, + 738, 1, 738, 738, 738, 738, 738, 739, 738, 738, + 740, 738, 740, 740, 740, 740, 740, 740, 740, 740, + 740, 740, 740, 740, 741, 739, 739, 738, 738, 742, + 742, 742, 738, 742, 742, 742, 742, 742, 742, 742, + 742, 742, 742, 742, 742, 742, 742, 742, 742, 742, + 741, 738, 28, 53, 53, 53, 53, 53, 53, 53, + 53, 53, 53, 53, 53, 738, 742, 742, 742, 738, + 742, 742, 742, 742, 742, 742, 742, 742, 742, 742, + 742, 742, 742, 742, 742, 742, 742, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 746, 750, 750, - 750, 746, 750, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 53, 53, 53, 53, - 53, 746, 746, 53, 53, 53, 53, 53, 53, 53, - 53, 53, 53, 53, 53, 53, 53, 53, 53, 746, - 750, 750, 746, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 53, 53, 53, - 53, 53, 53, 746, 746, 746, 746, 746, 746, 53, - 53, 53, 53, 53, 746, 746, 53, 53, 53, 746, - 746, 53, 53, 53, 746, 746, 746, 53, 746, 53, - - 746, 750, 750, 746, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 53, 53, 53, 53, 53, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 53, 53, - 746, 746, 53, 53, 746, 746, 53, 53, 53, 746, - 746, 53, 746, 746, 53, 746, 746, 746, 746, 746, - 746, 746, 746, 53, 746, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 53, 53, 53, 53, 53, - 746, 746, 746, 746, 746, 746, 746, 746, 53, 53, - 746, 746, 53, 53, 746, 746, 53, 746, 746, 53, - 746, 746, 53, 746, 746, 53, 746, 746, 746, 746, - - 746, 746, 746, 746, 53, 750, 750, 750, 750, 746, - 746, 746, 746, 53, 53, 53, 746, 746, 746, 746, - 746, 746, 746, 746, 53, 746, 746, 746, 746, 746, - 746, 53, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 53, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 750, 750, 746, 746, - 746, 746, 53, 746, 746, 53, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 53, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - - 746, 746, 746, 746, 746, 750, 746, 746, 746, 746, - 53, 746, 746, 53, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 53, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 53, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 53, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 53, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 0, 746, 746, 746, 746 + 53, 53, 53, 53, 53, 53, 53, 738, 742, 742, + 742, 738, 742, 742, 742, 742, 742, 742, 742, 742, + 742, 742, 742, 742, 742, 742, 53, 53, 53, 53, + 53, 738, 738, 53, 53, 53, 53, 53, 53, 53, + 53, 53, 53, 53, 53, 53, 53, 53, 53, 738, + 742, 742, 738, 742, 742, 742, 742, 742, 742, 742, + 742, 742, 742, 742, 742, 742, 742, 53, 53, 53, + 53, 53, 53, 738, 738, 738, 738, 738, 738, 53, + 53, 53, 53, 53, 738, 738, 53, 53, 53, 738, + 738, 53, 53, 53, 738, 738, 738, 53, 738, 53, + + 738, 742, 742, 738, 742, 742, 742, 742, 742, 742, + 742, 742, 742, 742, 53, 53, 53, 53, 53, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 53, 53, + 53, 738, 738, 53, 738, 738, 53, 53, 53, 738, + 738, 53, 738, 738, 53, 738, 738, 738, 738, 738, + 738, 738, 738, 53, 738, 742, 742, 742, 742, 742, + 742, 742, 742, 742, 742, 53, 53, 53, 53, 53, + 738, 738, 738, 738, 738, 738, 738, 738, 53, 53, + 53, 738, 738, 53, 738, 738, 53, 738, 738, 53, + 738, 738, 53, 738, 738, 53, 738, 738, 738, 738, + + 738, 738, 738, 738, 53, 742, 742, 742, 742, 738, + 738, 738, 738, 53, 53, 53, 738, 738, 738, 738, + 738, 738, 738, 738, 53, 53, 738, 738, 738, 738, + 53, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 53, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 742, 742, 738, 738, 738, + 738, 53, 738, 738, 53, 738, 738, 738, 738, 738, + 738, 738, 738, 53, 738, 738, 738, 738, 53, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + + 738, 738, 738, 742, 738, 738, 738, 738, 53, 738, + 738, 53, 738, 738, 738, 738, 738, 738, 738, 738, + 53, 738, 738, 738, 738, 53, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 53, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + + 738, 738, 738, 738, 738, 738, 738, 738, 53, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 53, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 0, 738, 738, + 738, 738 } ; -static yyconst flex_int16_t yy_nxt[2118] = +static yyconst flex_int16_t yy_nxt[2086] = { 0, 4, 5, 6, 7, 8, 4, 7, 9, 4, 10, 11, 11, 11, 11, 11, 11, 11, 12, 7, 4, @@ -769,235 +768,231 @@ static yyconst flex_int16_t yy_nxt[2118] = 13, 13, 13, 13, 13, 13, 4, 13, 13, 14, 15, 16, 17, 13, 18, 19, 20, 13, 13, 21, 13, 13, 13, 13, 22, 23, 24, 13, 13, 13, - 13, 13, 13, 31, 36, 32, 32, 32, 32, 32, - 32, 32, 33, 33, 33, 33, 33, 33, 33, 34, - 37, 39, 35, 41, 38, 42, 43, 44, 47, 49, - - 50, 36, 48, 90, 40, 91, 92, 30, 45, 93, - 30, 30, 105, 106, 46, 67, 34, 37, 39, 35, - 41, 38, 42, 43, 44, 47, 49, 50, 30, 48, - 90, 40, 91, 92, 745, 45, 93, 744, 727, 105, - 106, 46, 53, 53, 53, 53, 53, 53, 53, 30, - 726, 107, 53, 54, 55, 56, 53, 53, 53, 57, - 58, 53, 53, 53, 53, 59, 53, 60, 53, 61, - 62, 63, 64, 65, 53, 53, 53, 53, 107, 53, - 54, 55, 56, 53, 53, 53, 57, 58, 53, 53, - 53, 53, 59, 53, 60, 53, 61, 62, 63, 64, - - 65, 53, 53, 53, 53, 66, 66, 66, 66, 66, - 66, 66, 30, 127, 725, 30, 30, 132, 68, 68, - 68, 68, 68, 68, 68, 70, 70, 70, 70, 70, - 70, 70, 30, 724, 30, 30, 30, 30, 30, 30, - 127, 30, 30, 30, 30, 30, 719, 718, 128, 30, - 72, 73, 30, 30, 30, 30, 133, 129, 30, 31, - 74, 69, 69, 69, 69, 69, 69, 69, 71, 30, - 711, 710, 30, 30, 30, 128, 30, 72, 73, 130, - 94, 30, 75, 30, 129, 30, 95, 74, 30, 30, - 30, 30, 709, 30, 30, 71, 76, 30, 30, 185, - - 30, 30, 30, 30, 30, 708, 130, 94, 701, 75, - 131, 30, 134, 95, 78, 30, 79, 30, 30, 30, - 30, 30, 77, 76, 699, 96, 81, 30, 97, 80, - 697, 30, 30, 88, 30, 30, 82, 131, 186, 134, - 30, 78, 30, 79, 135, 89, 696, 30, 136, 77, - 30, 30, 96, 137, 138, 97, 80, 30, 30, 30, - 88, 30, 30, 82, 83, 30, 139, 684, 30, 30, - 142, 135, 89, 30, 30, 136, 84, 30, 30, 143, - 137, 138, 98, 681, 99, 101, 100, 677, 146, 30, - 147, 83, 85, 139, 102, 103, 676, 142, 86, 144, - - 30, 104, 655, 84, 654, 645, 143, 30, 644, 98, - 87, 99, 101, 100, 145, 146, 30, 147, 643, 85, - 30, 102, 103, 30, 30, 86, 144, 642, 104, 108, - 108, 108, 108, 108, 108, 108, 140, 87, 53, 53, - 53, 145, 148, 141, 53, 53, 149, 168, 169, 172, - 53, 173, 53, 170, 53, 53, 53, 53, 53, 609, - 180, 171, 30, 140, 181, 53, 53, 53, 608, 148, - 141, 53, 53, 149, 168, 169, 172, 53, 173, 53, - 170, 53, 53, 53, 53, 53, 30, 180, 171, 30, - 109, 181, 110, 110, 110, 110, 110, 110, 110, 112, - - 112, 112, 112, 112, 112, 112, 30, 182, 30, 30, - 30, 30, 30, 30, 597, 30, 30, 30, 30, 30, - 584, 30, 583, 30, 30, 30, 30, 30, 30, 30, - 117, 582, 30, 31, 182, 111, 111, 111, 111, 111, - 111, 111, 113, 30, 581, 183, 30, 30, 30, 114, - 30, 115, 184, 187, 188, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 189, 30, 30, 113, - 30, 30, 183, 30, 30, 190, 114, 116, 115, 184, - 187, 188, 580, 119, 118, 30, 30, 195, 30, 30, - 30, 30, 30, 189, 579, 574, 120, 192, 30, 30, - - 30, 573, 30, 30, 116, 30, 30, 527, 30, 30, - 119, 118, 30, 193, 191, 194, 122, 30, 123, 200, - 30, 30, 121, 120, 192, 124, 196, 526, 30, 30, - 30, 30, 30, 30, 30, 30, 474, 473, 466, 465, - 193, 30, 194, 122, 420, 123, 200, 30, 231, 121, - 215, 126, 124, 154, 125, 417, 216, 217, 339, 30, - 150, 150, 150, 150, 150, 150, 150, 324, 323, 321, - 320, 30, 30, 30, 52, 30, 30, 215, 126, 27, - 154, 125, 30, 216, 217, 30, 30, 232, 151, 151, - 151, 151, 151, 151, 151, 153, 153, 153, 153, 153, - - 153, 153, 243, 218, 30, 27, 30, 30, 30, 30, - 30, 52, 29, 30, 30, 219, 30, 109, 30, 28, - 27, 30, 30, 746, 30, 30, 155, 25, 30, 109, - 218, 152, 152, 152, 152, 152, 152, 152, 157, 156, - 30, 244, 219, 30, 30, 746, 30, 30, 30, 746, - 30, 30, 746, 155, 30, 30, 158, 30, 30, 30, - 30, 746, 30, 30, 746, 157, 156, 30, 30, 746, - 160, 30, 30, 746, 111, 111, 111, 111, 111, 111, - 111, 30, 159, 158, 30, 30, 163, 223, 30, 30, - 161, 30, 30, 746, 224, 30, 30, 160, 30, 30, - - 30, 30, 251, 30, 30, 162, 225, 174, 30, 197, - 30, 30, 30, 163, 223, 220, 175, 161, 176, 226, - 177, 224, 227, 30, 164, 165, 221, 746, 167, 178, - 30, 179, 162, 225, 174, 166, 288, 30, 228, 198, - 310, 252, 30, 175, 746, 176, 226, 177, 199, 227, - 30, 164, 165, 746, 222, 167, 178, 312, 179, 746, - 30, 746, 166, 30, 30, 228, 198, 201, 201, 201, - 201, 201, 201, 201, 30, 289, 326, 30, 202, 311, - 203, 203, 203, 203, 203, 203, 203, 204, 204, 204, - 204, 204, 204, 204, 205, 30, 313, 30, 30, 30, - - 30, 30, 30, 30, 746, 30, 30, 30, 30, 30, - 30, 746, 746, 30, 30, 327, 30, 746, 746, 207, - 30, 205, 208, 30, 30, 30, 229, 30, 30, 30, - 30, 30, 30, 230, 746, 30, 30, 30, 30, 30, - 746, 30, 30, 233, 209, 30, 30, 206, 211, 30, - 30, 234, 30, 229, 30, 235, 210, 30, 30, 236, - 230, 30, 30, 237, 30, 30, 213, 30, 238, 30, - 233, 209, 239, 240, 30, 211, 330, 241, 234, 212, - 30, 242, 235, 210, 245, 250, 236, 253, 30, 246, - 237, 254, 247, 213, 214, 238, 30, 266, 248, 239, - - 240, 249, 746, 30, 241, 746, 212, 746, 242, 746, - 267, 245, 250, 335, 253, 331, 246, 342, 254, 247, - 746, 214, 268, 269, 266, 248, 270, 271, 249, 255, - 255, 255, 255, 255, 255, 255, 30, 267, 746, 30, - 30, 272, 256, 256, 256, 256, 256, 256, 256, 268, - 269, 746, 336, 270, 271, 30, 343, 30, 30, 30, - 30, 30, 30, 746, 259, 30, 30, 260, 272, 273, - 261, 30, 746, 30, 30, 30, 30, 30, 30, 30, - 746, 262, 30, 202, 274, 257, 257, 257, 257, 257, - 257, 257, 258, 263, 746, 275, 273, 30, 30, 30, - - 746, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 276, 274, 277, 30, 30, 30, 278, 30, 30, 258, - 263, 30, 275, 30, 279, 280, 30, 30, 281, 746, - 746, 282, 264, 283, 284, 285, 286, 276, 746, 277, - 30, 287, 290, 278, 291, 30, 292, 30, 293, 294, - 295, 279, 280, 296, 297, 281, 30, 265, 282, 264, - 283, 284, 285, 286, 298, 30, 299, 300, 287, 290, - 301, 291, 302, 292, 303, 293, 294, 295, 304, 305, - 296, 297, 30, 746, 265, 30, 202, 746, 746, 355, - 746, 298, 30, 299, 300, 30, 30, 301, 746, 302, - - 30, 303, 314, 30, 30, 304, 305, 30, 308, 746, - 30, 30, 307, 306, 306, 306, 306, 306, 306, 306, - 746, 315, 30, 746, 30, 30, 30, 30, 356, 314, - 30, 30, 309, 30, 30, 316, 30, 30, 317, 307, - 30, 318, 30, 30, 30, 319, 322, 30, 315, 30, - 30, 30, 30, 325, 328, 30, 30, 329, 332, 333, - 334, 337, 316, 338, 30, 317, 340, 746, 318, 30, - 341, 344, 319, 322, 345, 30, 346, 347, 348, 349, - 325, 328, 30, 350, 329, 332, 333, 334, 337, 30, - 338, 351, 352, 340, 30, 353, 354, 341, 344, 359, - - 364, 345, 360, 346, 347, 348, 349, 746, 30, 746, - 350, 30, 30, 30, 396, 746, 30, 30, 351, 352, - 361, 362, 353, 354, 30, 363, 359, 30, 30, 360, - 357, 357, 357, 357, 357, 357, 357, 358, 30, 365, - 366, 30, 30, 367, 368, 369, 370, 361, 362, 371, - 30, 372, 363, 397, 373, 30, 374, 375, 376, 377, - 378, 379, 380, 381, 358, 382, 30, 366, 383, 384, - 367, 368, 369, 370, 385, 386, 371, 387, 372, 388, - 30, 373, 389, 374, 375, 376, 377, 378, 379, 380, - 381, 394, 382, 390, 391, 383, 384, 392, 393, 395, - - 398, 385, 386, 399, 387, 400, 388, 401, 402, 389, - 403, 404, 405, 30, 407, 408, 30, 30, 394, 30, - 390, 391, 30, 30, 392, 393, 395, 398, 746, 409, - 399, 410, 400, 411, 401, 402, 412, 403, 404, 405, - 413, 407, 408, 414, 415, 416, 418, 419, 421, 422, - 423, 424, 425, 426, 406, 30, 409, 427, 410, 428, - 411, 30, 429, 412, 430, 431, 432, 413, 433, 434, - 414, 415, 416, 418, 419, 421, 422, 423, 424, 425, - 426, 406, 435, 436, 427, 437, 428, 438, 439, 429, - 440, 430, 431, 432, 441, 433, 434, 442, 443, 444, - - 445, 448, 451, 446, 452, 449, 453, 454, 455, 435, - 436, 447, 437, 450, 438, 439, 30, 440, 456, 30, - 30, 441, 457, 458, 442, 443, 444, 445, 448, 451, - 446, 452, 449, 453, 454, 455, 459, 460, 447, 462, - 450, 463, 464, 467, 468, 456, 469, 470, 471, 457, - 458, 472, 475, 476, 477, 478, 479, 481, 30, 482, - 483, 484, 485, 459, 486, 487, 462, 488, 463, 464, - 467, 468, 489, 469, 470, 471, 461, 490, 472, 475, - 476, 477, 478, 491, 481, 492, 482, 483, 484, 485, - 493, 486, 487, 494, 488, 480, 495, 496, 497, 489, - - 498, 499, 500, 501, 490, 502, 503, 504, 505, 506, - 491, 507, 492, 508, 509, 510, 511, 493, 512, 513, - 494, 514, 515, 495, 496, 497, 516, 498, 499, 500, - 501, 517, 502, 503, 504, 505, 506, 518, 507, 519, - 508, 509, 510, 511, 520, 512, 513, 521, 514, 515, - 522, 523, 524, 516, 525, 528, 529, 530, 517, 531, - 532, 533, 534, 535, 518, 536, 519, 537, 538, 539, - 540, 520, 541, 542, 521, 543, 544, 522, 523, 524, - 545, 525, 528, 529, 530, 546, 531, 532, 533, 534, - 535, 547, 536, 548, 537, 538, 539, 540, 549, 541, - - 542, 550, 543, 544, 551, 552, 553, 545, 554, 555, - 556, 557, 546, 558, 559, 560, 561, 562, 547, 563, - 548, 564, 565, 566, 567, 549, 568, 569, 550, 570, - 571, 551, 552, 553, 572, 554, 555, 556, 557, 575, - 558, 559, 560, 561, 562, 576, 563, 577, 564, 565, - 566, 567, 578, 568, 569, 585, 570, 571, 586, 587, - 588, 572, 589, 590, 591, 592, 575, 593, 594, 595, - 596, 598, 576, 599, 577, 600, 601, 602, 603, 578, - 604, 605, 585, 606, 607, 586, 587, 588, 610, 589, - 590, 591, 592, 611, 593, 594, 595, 596, 598, 612, - - 599, 613, 600, 601, 602, 603, 614, 604, 605, 615, - 606, 607, 616, 617, 618, 610, 619, 620, 621, 622, - 611, 623, 624, 625, 626, 627, 612, 628, 613, 629, - 630, 631, 632, 614, 633, 634, 615, 635, 636, 616, - 617, 618, 637, 619, 620, 621, 622, 638, 623, 624, - 625, 626, 627, 639, 628, 640, 629, 630, 631, 632, - 641, 633, 634, 646, 635, 636, 647, 648, 649, 637, - 650, 651, 652, 653, 638, 656, 657, 658, 659, 660, - 639, 661, 640, 662, 663, 664, 665, 641, 666, 667, - 646, 668, 669, 647, 648, 649, 670, 650, 651, 652, - - 653, 671, 656, 657, 658, 659, 660, 672, 661, 673, - 662, 663, 664, 665, 674, 666, 667, 675, 668, 669, - 678, 679, 680, 670, 682, 683, 685, 686, 671, 687, - 688, 689, 690, 691, 672, 692, 673, 693, 694, 695, - 698, 674, 700, 702, 675, 703, 704, 678, 679, 680, - 705, 682, 683, 685, 686, 706, 687, 688, 689, 690, - 691, 707, 692, 712, 693, 694, 695, 698, 713, 700, - 702, 714, 703, 704, 715, 716, 717, 705, 720, 721, - 722, 723, 706, 728, 729, 730, 731, 732, 707, 733, - 712, 734, 735, 736, 737, 713, 738, 739, 714, 740, - - 741, 715, 716, 717, 742, 720, 721, 722, 723, 743, - 728, 729, 730, 731, 732, 746, 733, 746, 734, 735, - 736, 737, 746, 738, 739, 746, 740, 741, 746, 746, - 746, 742, 746, 746, 746, 746, 743, 26, 746, 26, - 51, 51, 51, 3, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746 + 13, 13, 31, 36, 32, 32, 32, 32, 32, 32, + 32, 33, 33, 33, 33, 33, 33, 33, 34, 37, + 39, 35, 41, 38, 42, 43, 44, 47, 49, 50, + + 36, 48, 90, 40, 91, 92, 30, 45, 93, 30, + 30, 97, 105, 46, 67, 34, 37, 39, 35, 41, + 38, 42, 43, 44, 47, 49, 50, 30, 48, 90, + 40, 91, 92, 737, 45, 93, 736, 721, 97, 105, + 46, 53, 53, 53, 53, 53, 53, 53, 30, 720, + 106, 53, 54, 55, 56, 53, 53, 53, 57, 58, + 53, 53, 53, 53, 59, 53, 60, 53, 61, 62, + 63, 64, 65, 53, 53, 53, 53, 106, 53, 54, + 55, 56, 53, 53, 53, 57, 58, 53, 53, 53, + 53, 59, 53, 60, 53, 61, 62, 63, 64, 65, + + 53, 53, 53, 66, 66, 66, 66, 66, 66, 66, + 30, 107, 719, 30, 30, 132, 68, 68, 68, 68, + 68, 68, 68, 70, 70, 70, 70, 70, 70, 70, + 30, 718, 30, 30, 30, 30, 30, 30, 107, 30, + 30, 30, 30, 30, 713, 712, 127, 30, 72, 73, + 30, 30, 30, 30, 133, 128, 30, 31, 74, 69, + 69, 69, 69, 69, 69, 69, 71, 30, 705, 704, + 30, 30, 30, 127, 30, 72, 73, 129, 130, 30, + 75, 30, 128, 30, 131, 74, 30, 30, 30, 30, + 703, 30, 30, 71, 76, 30, 30, 185, 30, 30, + + 30, 30, 30, 702, 129, 130, 695, 75, 134, 30, + 135, 131, 78, 30, 79, 30, 30, 30, 30, 30, + 77, 76, 693, 136, 81, 30, 137, 80, 678, 30, + 30, 88, 30, 30, 82, 134, 186, 135, 30, 78, + 30, 79, 138, 89, 675, 30, 139, 77, 30, 30, + 136, 142, 671, 137, 80, 30, 30, 30, 88, 30, + 30, 82, 83, 30, 143, 94, 30, 30, 144, 138, + 89, 30, 30, 139, 84, 30, 30, 146, 142, 95, + 98, 670, 99, 145, 100, 96, 140, 30, 649, 83, + 85, 143, 94, 141, 147, 144, 86, 648, 30, 30, + + 639, 84, 30, 30, 146, 30, 95, 98, 87, 99, + 145, 100, 96, 140, 30, 30, 638, 85, 30, 30, + 141, 147, 637, 86, 101, 108, 108, 108, 108, 108, + 108, 108, 148, 102, 103, 87, 53, 53, 53, 149, + 104, 30, 53, 53, 636, 603, 168, 169, 53, 113, + 53, 101, 53, 53, 53, 53, 53, 30, 172, 148, + 102, 103, 173, 53, 53, 53, 149, 104, 30, 53, + 53, 30, 30, 168, 169, 53, 113, 53, 180, 53, + 53, 53, 53, 53, 30, 172, 602, 30, 109, 173, + 110, 110, 110, 110, 110, 110, 110, 112, 112, 112, + + 112, 112, 112, 112, 30, 180, 223, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 591, 30, 30, + 30, 30, 30, 578, 577, 117, 30, 30, 226, 576, + 30, 31, 223, 111, 111, 111, 111, 111, 111, 111, + 114, 115, 575, 181, 30, 182, 30, 30, 30, 183, + 116, 30, 30, 30, 226, 30, 30, 574, 30, 30, + 30, 184, 30, 30, 118, 573, 187, 114, 115, 30, + 181, 30, 182, 238, 30, 30, 183, 116, 30, 119, + 30, 30, 30, 30, 30, 120, 30, 568, 184, 170, + 188, 118, 30, 187, 30, 30, 30, 171, 567, 238, + + 30, 30, 472, 30, 30, 189, 119, 266, 122, 471, + 470, 123, 120, 30, 121, 463, 170, 188, 274, 462, + 30, 418, 30, 30, 171, 30, 30, 30, 30, 30, + 190, 415, 189, 266, 30, 122, 30, 125, 123, 30, + 30, 121, 30, 124, 274, 126, 150, 150, 150, 150, + 150, 150, 150, 153, 153, 153, 153, 153, 153, 153, + 154, 338, 192, 193, 125, 30, 194, 30, 324, 191, + 124, 30, 126, 30, 30, 30, 30, 30, 30, 151, + 151, 151, 151, 151, 151, 151, 323, 154, 30, 192, + 193, 30, 30, 194, 30, 195, 30, 30, 30, 30, + + 30, 321, 320, 30, 156, 30, 30, 30, 30, 30, + 155, 232, 158, 30, 157, 30, 30, 52, 197, 30, + 109, 27, 152, 152, 152, 152, 152, 152, 152, 162, + 30, 156, 27, 165, 196, 243, 30, 155, 159, 158, + 30, 157, 52, 30, 30, 30, 200, 30, 198, 30, + 233, 30, 30, 30, 30, 30, 162, 199, 30, 30, + 165, 251, 30, 30, 29, 111, 111, 111, 111, 111, + 111, 111, 160, 200, 244, 198, 161, 30, 163, 28, + 30, 30, 30, 30, 288, 30, 30, 30, 30, 30, + 215, 30, 30, 30, 216, 30, 30, 174, 27, 160, + + 252, 30, 217, 161, 220, 163, 175, 310, 176, 218, + 219, 177, 167, 164, 224, 221, 277, 215, 166, 30, + 178, 216, 179, 289, 174, 30, 738, 30, 30, 217, + 25, 30, 109, 175, 30, 176, 218, 219, 177, 167, + 164, 224, 277, 222, 738, 166, 311, 178, 738, 179, + 201, 201, 201, 201, 201, 201, 201, 30, 738, 225, + 30, 202, 738, 203, 203, 203, 203, 203, 203, 203, + 30, 204, 204, 204, 204, 204, 204, 204, 30, 738, + 30, 30, 30, 30, 30, 30, 225, 30, 30, 30, + 30, 30, 30, 312, 30, 30, 30, 30, 30, 30, + + 738, 30, 305, 207, 30, 30, 208, 30, 227, 738, + 30, 30, 205, 30, 738, 30, 30, 30, 30, 30, + 30, 30, 30, 228, 30, 30, 209, 30, 305, 30, + 738, 211, 313, 738, 206, 227, 30, 30, 738, 205, + 30, 30, 210, 30, 30, 229, 230, 30, 30, 30, + 228, 231, 738, 209, 212, 30, 30, 30, 211, 30, + 30, 234, 738, 30, 235, 213, 236, 237, 239, 210, + 240, 738, 229, 230, 241, 242, 245, 246, 231, 30, + 247, 212, 248, 250, 253, 249, 30, 254, 234, 214, + 327, 235, 213, 236, 237, 239, 30, 240, 30, 30, + + 30, 241, 242, 245, 246, 259, 738, 247, 260, 248, + 250, 253, 249, 267, 254, 738, 214, 255, 255, 255, + 255, 255, 255, 255, 30, 326, 738, 30, 30, 328, + 256, 256, 256, 256, 256, 256, 256, 738, 30, 30, + 267, 268, 30, 30, 738, 30, 738, 261, 30, 30, + 30, 326, 30, 30, 30, 30, 30, 269, 334, 30, + 262, 30, 30, 30, 30, 30, 30, 30, 268, 270, + 30, 202, 263, 257, 257, 257, 257, 257, 257, 257, + 258, 30, 30, 271, 269, 30, 30, 30, 272, 273, + 275, 276, 30, 264, 30, 278, 270, 335, 279, 263, + + 280, 30, 30, 30, 281, 30, 30, 258, 30, 30, + 271, 30, 30, 282, 283, 272, 273, 275, 276, 284, + 264, 285, 278, 738, 30, 279, 286, 280, 287, 290, + 291, 281, 292, 293, 294, 295, 296, 297, 298, 299, + 282, 283, 265, 300, 30, 301, 284, 302, 285, 303, + 30, 304, 738, 286, 341, 287, 290, 291, 379, 292, + 293, 294, 295, 296, 297, 298, 299, 738, 354, 265, + 300, 738, 301, 499, 302, 738, 303, 30, 304, 30, + 30, 202, 30, 30, 379, 306, 306, 306, 306, 306, + 306, 306, 30, 342, 30, 30, 30, 30, 30, 499, + + 30, 314, 308, 30, 30, 30, 315, 355, 30, 30, + 309, 30, 307, 30, 30, 30, 30, 30, 316, 30, + 30, 30, 30, 30, 30, 30, 30, 317, 314, 318, + 319, 322, 325, 315, 30, 738, 30, 738, 329, 307, + 330, 331, 30, 332, 333, 316, 336, 30, 337, 339, + 340, 343, 344, 30, 317, 30, 318, 319, 322, 325, + 345, 346, 30, 347, 30, 329, 348, 330, 331, 349, + 332, 333, 350, 336, 351, 337, 339, 340, 343, 344, + 352, 353, 30, 358, 363, 30, 30, 345, 346, 738, + 347, 30, 738, 348, 30, 30, 349, 738, 359, 350, + + 30, 351, 360, 30, 30, 361, 738, 352, 353, 30, + 358, 357, 30, 30, 362, 356, 356, 356, 356, 356, + 356, 356, 365, 364, 30, 359, 366, 367, 368, 360, + 369, 370, 361, 30, 371, 372, 373, 374, 357, 375, + 376, 362, 30, 377, 378, 380, 381, 382, 383, 365, + 384, 30, 385, 366, 367, 368, 386, 369, 370, 387, + 392, 371, 372, 373, 374, 393, 375, 376, 388, 389, + 377, 378, 380, 381, 382, 383, 394, 384, 396, 385, + 390, 391, 397, 386, 398, 399, 387, 392, 500, 400, + 401, 402, 393, 403, 30, 388, 389, 30, 30, 30, + + 405, 406, 30, 30, 407, 396, 408, 390, 391, 397, + 409, 398, 399, 410, 500, 395, 400, 401, 402, 411, + 403, 412, 413, 414, 416, 417, 419, 405, 406, 420, + 421, 407, 422, 408, 404, 423, 30, 409, 424, 425, + 410, 30, 426, 427, 428, 429, 411, 430, 412, 413, + 414, 416, 417, 419, 431, 432, 420, 421, 433, 422, + 434, 404, 423, 435, 436, 424, 425, 437, 438, 426, + 427, 428, 429, 439, 430, 440, 441, 442, 443, 445, + 446, 431, 432, 448, 449, 433, 444, 434, 447, 450, + 435, 436, 451, 452, 437, 438, 453, 454, 455, 456, + + 439, 457, 440, 441, 442, 443, 445, 446, 459, 460, + 448, 449, 461, 444, 30, 447, 450, 30, 30, 451, + 452, 464, 465, 453, 454, 455, 456, 466, 467, 475, + 468, 469, 473, 474, 477, 459, 460, 478, 479, 461, + 458, 738, 480, 481, 482, 483, 484, 485, 464, 465, + 486, 487, 488, 489, 466, 467, 30, 468, 469, 473, + 474, 477, 490, 491, 478, 479, 492, 493, 476, 480, + 481, 482, 483, 484, 485, 494, 495, 486, 487, 488, + 489, 496, 497, 498, 501, 502, 503, 504, 505, 490, + 491, 506, 507, 492, 493, 508, 509, 510, 511, 512, + + 513, 514, 494, 495, 515, 516, 517, 518, 496, 497, + 498, 501, 502, 503, 504, 505, 519, 520, 506, 507, + 521, 522, 508, 509, 510, 511, 512, 513, 514, 523, + 524, 515, 516, 517, 518, 525, 526, 527, 528, 529, + 530, 531, 532, 519, 520, 533, 534, 521, 522, 535, + 536, 537, 538, 539, 738, 540, 523, 524, 541, 542, + 738, 543, 525, 526, 527, 528, 529, 530, 531, 532, + 544, 545, 533, 534, 546, 547, 535, 536, 537, 538, + 539, 540, 548, 549, 550, 541, 542, 543, 551, 552, + 553, 554, 555, 556, 557, 558, 559, 544, 545, 560, + + 561, 546, 547, 562, 563, 564, 565, 566, 569, 548, + 549, 550, 570, 571, 572, 551, 552, 553, 554, 555, + 556, 557, 558, 559, 579, 580, 560, 561, 581, 582, + 562, 563, 564, 565, 566, 569, 583, 584, 585, 570, + 571, 572, 586, 587, 588, 589, 590, 592, 593, 594, + 595, 579, 580, 596, 597, 581, 582, 598, 599, 600, + 601, 604, 605, 583, 584, 585, 606, 607, 608, 586, + 587, 588, 589, 590, 592, 593, 594, 595, 609, 610, + 596, 597, 611, 612, 598, 599, 600, 601, 604, 605, + 613, 614, 615, 606, 607, 608, 616, 617, 618, 619, + + 620, 621, 622, 623, 624, 609, 610, 625, 626, 611, + 612, 627, 628, 629, 630, 631, 632, 613, 614, 615, + 633, 634, 635, 616, 617, 618, 619, 620, 621, 622, + 623, 624, 640, 641, 625, 626, 642, 643, 627, 628, + 629, 630, 631, 632, 644, 645, 646, 633, 634, 635, + 647, 650, 651, 652, 653, 654, 655, 656, 657, 640, + 641, 658, 659, 642, 643, 660, 661, 662, 663, 664, + 665, 644, 645, 646, 666, 667, 668, 647, 650, 651, + 652, 653, 654, 655, 656, 657, 669, 672, 658, 659, + 673, 674, 660, 661, 662, 663, 664, 665, 676, 677, + + 666, 667, 668, 679, 680, 681, 682, 683, 684, 685, + 686, 687, 669, 688, 672, 689, 690, 673, 674, 691, + 692, 694, 696, 697, 698, 676, 677, 699, 700, 701, + 679, 680, 681, 682, 683, 684, 685, 686, 687, 706, + 688, 707, 689, 690, 708, 709, 691, 692, 694, 696, + 697, 698, 710, 711, 699, 700, 701, 714, 715, 716, + 717, 722, 723, 724, 725, 726, 706, 727, 707, 728, + 729, 708, 709, 730, 731, 732, 733, 734, 735, 710, + 711, 738, 738, 738, 714, 715, 716, 717, 722, 723, + 724, 725, 726, 738, 727, 738, 728, 729, 738, 738, + + 730, 731, 732, 733, 734, 735, 26, 738, 26, 51, + 51, 51, 3, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738 } ; -static yyconst flex_int16_t yy_chk[2118] = +static yyconst flex_int16_t yy_chk[2086] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1006,235 +1001,231 @@ static yyconst flex_int16_t yy_chk[2118] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 11, 15, 11, 11, 11, 11, 11, - 11, 11, 12, 12, 12, 12, 12, 12, 12, 14, - 16, 17, 14, 18, 16, 19, 20, 21, 22, 23, - - 24, 15, 22, 55, 17, 56, 57, 30, 21, 58, - 30, 30, 63, 64, 21, 750, 14, 16, 17, 14, - 18, 16, 19, 20, 21, 22, 23, 24, 748, 22, - 55, 17, 56, 57, 741, 21, 58, 740, 717, 63, - 64, 21, 28, 28, 28, 28, 28, 28, 28, 30, - 716, 65, 28, 28, 28, 28, 28, 28, 28, 28, + 1, 1, 11, 15, 11, 11, 11, 11, 11, 11, + 11, 12, 12, 12, 12, 12, 12, 12, 14, 16, + 17, 14, 18, 16, 19, 20, 21, 22, 23, 24, + + 15, 22, 55, 17, 56, 57, 30, 21, 58, 30, + 30, 60, 63, 21, 742, 14, 16, 17, 14, 18, + 16, 19, 20, 21, 22, 23, 24, 740, 22, 55, + 17, 56, 57, 733, 21, 58, 732, 711, 60, 63, + 21, 28, 28, 28, 28, 28, 28, 28, 30, 710, + 64, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 28, 28, 28, 28, 65, 28, + 28, 28, 28, 28, 28, 28, 28, 64, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, - 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, - 29, 29, 31, 88, 715, 31, 31, 93, 31, 31, - 31, 31, 31, 31, 31, 33, 33, 33, 33, 33, - 33, 33, 35, 714, 36, 35, 35, 36, 36, 34, - 88, 37, 34, 34, 37, 37, 705, 704, 89, 38, - 35, 36, 38, 38, 31, 32, 93, 90, 32, 32, - 37, 32, 32, 32, 32, 32, 32, 32, 34, 39, - 695, 694, 39, 39, 35, 89, 36, 35, 36, 91, - 59, 34, 38, 37, 90, 40, 59, 37, 40, 40, - 41, 38, 693, 41, 41, 34, 39, 32, 42, 139, - - 43, 42, 42, 43, 43, 692, 91, 59, 685, 38, - 92, 39, 94, 59, 41, 44, 42, 45, 44, 44, - 45, 45, 40, 39, 682, 60, 44, 40, 60, 43, - 679, 46, 41, 54, 46, 46, 45, 92, 139, 94, - 42, 41, 43, 42, 95, 54, 678, 47, 96, 40, - 47, 47, 60, 97, 98, 60, 43, 44, 48, 45, - 54, 48, 48, 45, 46, 49, 99, 664, 49, 49, - 101, 95, 54, 46, 50, 96, 47, 50, 50, 102, - 97, 98, 61, 661, 61, 62, 61, 657, 104, 47, - 105, 46, 48, 99, 62, 62, 656, 101, 49, 103, - - 48, 62, 627, 47, 626, 615, 102, 49, 614, 61, - 50, 61, 62, 61, 103, 104, 50, 105, 613, 48, - 67, 62, 62, 67, 67, 49, 103, 612, 62, 66, - 66, 66, 66, 66, 66, 66, 100, 50, 53, 53, - 53, 103, 106, 100, 53, 53, 107, 127, 128, 130, - 53, 131, 53, 129, 53, 53, 53, 53, 53, 570, - 134, 129, 67, 100, 135, 53, 53, 53, 569, 106, - 100, 53, 53, 107, 127, 128, 130, 53, 131, 53, - 129, 53, 53, 53, 53, 53, 68, 134, 129, 68, - 68, 135, 68, 68, 68, 68, 68, 68, 68, 70, - - 70, 70, 70, 70, 70, 70, 72, 136, 71, 72, - 72, 71, 71, 73, 558, 74, 73, 73, 74, 74, - 541, 75, 540, 77, 75, 75, 77, 77, 68, 69, - 77, 539, 69, 69, 136, 69, 69, 69, 69, 69, - 69, 69, 71, 76, 538, 137, 76, 76, 72, 73, - 71, 75, 138, 140, 141, 73, 79, 74, 81, 79, - 79, 81, 81, 75, 78, 77, 142, 78, 78, 71, - 80, 69, 137, 80, 80, 143, 73, 76, 75, 138, - 140, 141, 537, 79, 78, 76, 82, 147, 83, 82, - 82, 83, 83, 142, 536, 531, 80, 144, 79, 84, - - 81, 530, 84, 84, 76, 85, 78, 478, 85, 85, - 79, 78, 80, 145, 143, 146, 83, 86, 84, 149, - 86, 86, 82, 80, 144, 85, 147, 477, 82, 113, - 83, 87, 113, 113, 87, 87, 424, 423, 416, 415, - 145, 84, 146, 83, 372, 84, 149, 85, 182, 82, - 168, 87, 85, 113, 86, 369, 169, 170, 290, 86, - 108, 108, 108, 108, 108, 108, 108, 278, 277, 275, - 274, 113, 126, 87, 51, 126, 126, 168, 87, 27, - 113, 86, 109, 169, 170, 109, 109, 182, 109, 109, - 109, 109, 109, 109, 109, 112, 112, 112, 112, 112, - - 112, 112, 193, 171, 114, 26, 115, 114, 114, 115, - 115, 25, 10, 152, 126, 172, 152, 152, 116, 9, - 8, 116, 116, 3, 109, 110, 114, 2, 110, 110, - 171, 110, 110, 110, 110, 110, 110, 110, 116, 115, - 117, 193, 172, 117, 117, 0, 114, 118, 115, 0, - 118, 118, 0, 114, 119, 152, 117, 119, 119, 121, - 116, 0, 121, 121, 0, 116, 115, 110, 111, 0, - 118, 111, 111, 0, 111, 111, 111, 111, 111, 111, - 111, 120, 117, 117, 120, 120, 121, 174, 122, 118, - 119, 122, 122, 0, 175, 123, 119, 118, 123, 123, - - 124, 121, 198, 124, 124, 120, 176, 132, 125, 148, - 111, 125, 125, 121, 174, 173, 132, 119, 132, 177, - 133, 175, 178, 120, 122, 123, 173, 0, 125, 133, - 122, 133, 120, 176, 132, 124, 238, 123, 179, 148, - 266, 198, 124, 132, 0, 132, 177, 133, 148, 178, - 125, 122, 123, 0, 173, 125, 133, 267, 133, 0, - 154, 0, 124, 154, 154, 179, 148, 150, 150, 150, - 150, 150, 150, 150, 151, 238, 280, 151, 151, 266, - 151, 151, 151, 151, 151, 151, 151, 153, 153, 153, - 153, 153, 153, 153, 154, 155, 267, 156, 155, 155, - - 156, 156, 154, 157, 0, 158, 157, 157, 158, 158, - 159, 0, 0, 159, 159, 280, 151, 0, 0, 159, - 160, 154, 159, 160, 160, 161, 180, 162, 161, 161, - 162, 162, 163, 181, 0, 163, 163, 155, 165, 156, - 0, 165, 165, 183, 161, 157, 164, 158, 163, 164, - 164, 184, 159, 180, 166, 185, 162, 166, 166, 186, - 181, 167, 160, 187, 167, 167, 165, 161, 188, 162, - 183, 161, 189, 190, 163, 163, 283, 191, 184, 164, - 165, 192, 185, 162, 194, 197, 186, 199, 164, 195, - 187, 200, 195, 165, 167, 188, 166, 215, 196, 189, - - 190, 196, 0, 167, 191, 0, 164, 0, 192, 0, - 216, 194, 197, 287, 199, 283, 195, 293, 200, 195, - 0, 167, 217, 218, 215, 196, 219, 220, 196, 201, - 201, 201, 201, 201, 201, 201, 202, 216, 0, 202, - 202, 222, 202, 202, 202, 202, 202, 202, 202, 217, - 218, 0, 287, 219, 220, 206, 293, 205, 206, 206, - 205, 205, 207, 0, 206, 207, 207, 206, 222, 223, - 207, 208, 0, 209, 208, 208, 209, 209, 202, 203, - 0, 208, 203, 203, 224, 203, 203, 203, 203, 203, - 203, 203, 205, 209, 0, 225, 223, 206, 210, 205, - - 0, 210, 210, 211, 207, 212, 211, 211, 212, 212, - 226, 224, 227, 208, 213, 209, 228, 213, 213, 205, - 209, 203, 225, 214, 229, 230, 214, 214, 231, 0, - 0, 232, 210, 233, 234, 235, 236, 226, 0, 227, - 210, 237, 239, 228, 240, 211, 241, 212, 242, 243, - 244, 229, 230, 245, 246, 231, 213, 214, 232, 210, - 233, 234, 235, 236, 247, 214, 248, 249, 237, 239, - 250, 240, 251, 241, 252, 242, 243, 244, 253, 254, - 245, 246, 257, 0, 214, 257, 257, 0, 0, 305, - 0, 247, 258, 248, 249, 258, 258, 250, 0, 251, - - 259, 252, 268, 259, 259, 253, 254, 256, 259, 0, - 256, 256, 258, 256, 256, 256, 256, 256, 256, 256, - 0, 269, 260, 0, 257, 260, 260, 261, 305, 268, - 261, 261, 260, 262, 258, 270, 262, 262, 271, 258, - 263, 272, 259, 263, 263, 273, 276, 264, 269, 256, - 264, 264, 265, 279, 281, 265, 265, 282, 284, 285, - 286, 288, 270, 289, 260, 271, 291, 0, 272, 261, - 292, 294, 273, 276, 295, 262, 296, 297, 298, 299, - 279, 281, 263, 300, 282, 284, 285, 286, 288, 264, - 289, 301, 302, 291, 265, 303, 304, 292, 294, 310, - - 315, 295, 311, 296, 297, 298, 299, 0, 307, 0, - 300, 307, 307, 308, 346, 0, 308, 308, 301, 302, - 312, 313, 303, 304, 306, 314, 310, 306, 306, 311, - 306, 306, 306, 306, 306, 306, 306, 307, 309, 315, - 316, 309, 309, 317, 318, 319, 320, 312, 313, 321, - 307, 322, 314, 346, 323, 308, 324, 326, 327, 328, - 329, 330, 331, 332, 307, 333, 306, 316, 334, 335, - 317, 318, 319, 320, 336, 337, 321, 338, 322, 340, - 309, 323, 341, 324, 326, 327, 328, 329, 330, 331, - 332, 344, 333, 342, 342, 334, 335, 343, 343, 345, - - 347, 336, 337, 348, 338, 349, 340, 350, 352, 341, - 353, 355, 356, 357, 359, 360, 357, 357, 344, 358, - 342, 342, 358, 358, 343, 343, 345, 347, 0, 361, - 348, 362, 349, 363, 350, 352, 364, 353, 355, 356, - 365, 359, 360, 366, 367, 368, 370, 371, 373, 374, - 375, 376, 377, 378, 358, 357, 361, 379, 362, 380, - 363, 358, 381, 364, 382, 383, 384, 365, 385, 386, - 366, 367, 368, 370, 371, 373, 374, 375, 376, 377, - 378, 358, 387, 388, 379, 389, 380, 390, 391, 381, - 392, 382, 383, 384, 393, 385, 386, 394, 395, 396, - - 397, 399, 401, 398, 402, 400, 403, 404, 405, 387, - 388, 398, 389, 400, 390, 391, 406, 392, 407, 406, - 406, 393, 408, 409, 394, 395, 396, 397, 399, 401, - 398, 402, 400, 403, 404, 405, 410, 411, 398, 412, - 400, 413, 414, 417, 418, 407, 419, 420, 421, 408, - 409, 422, 425, 426, 427, 428, 429, 430, 406, 431, - 432, 433, 434, 410, 435, 436, 412, 437, 413, 414, - 417, 418, 438, 419, 420, 421, 411, 439, 422, 425, - 426, 427, 428, 440, 430, 441, 431, 432, 433, 434, - 442, 435, 436, 443, 437, 429, 444, 445, 446, 438, - - 447, 448, 449, 450, 439, 451, 454, 455, 456, 457, - 440, 458, 441, 459, 460, 461, 462, 442, 463, 464, - 443, 465, 466, 444, 445, 446, 467, 447, 448, 449, - 450, 468, 451, 454, 455, 456, 457, 469, 458, 470, - 459, 460, 461, 462, 471, 463, 464, 472, 465, 466, - 473, 474, 475, 467, 476, 479, 480, 481, 468, 482, - 483, 484, 485, 486, 469, 487, 470, 488, 489, 490, - 491, 471, 492, 495, 472, 496, 497, 473, 474, 475, - 498, 476, 479, 480, 481, 499, 482, 483, 484, 485, - 486, 500, 487, 501, 488, 489, 490, 491, 502, 492, - - 495, 505, 496, 497, 506, 507, 508, 498, 509, 510, - 511, 512, 499, 513, 514, 515, 516, 517, 500, 518, - 501, 519, 520, 521, 522, 502, 523, 524, 505, 525, - 528, 506, 507, 508, 529, 509, 510, 511, 512, 532, - 513, 514, 515, 516, 517, 533, 518, 534, 519, 520, - 521, 522, 535, 523, 524, 544, 525, 528, 545, 547, - 548, 529, 550, 551, 552, 553, 532, 554, 555, 556, - 557, 559, 533, 560, 534, 561, 562, 563, 564, 535, - 565, 566, 544, 567, 568, 545, 547, 548, 571, 550, - 551, 552, 553, 572, 554, 555, 556, 557, 559, 575, - - 560, 576, 561, 562, 563, 564, 577, 565, 566, 578, - 567, 568, 581, 582, 583, 571, 584, 585, 587, 589, - 572, 590, 591, 592, 593, 594, 575, 595, 576, 596, - 598, 599, 600, 577, 601, 602, 578, 603, 604, 581, - 582, 583, 605, 584, 585, 587, 589, 606, 590, 591, - 592, 593, 594, 607, 595, 610, 596, 598, 599, 600, - 611, 601, 602, 616, 603, 604, 617, 618, 619, 605, - 622, 623, 624, 625, 606, 628, 629, 630, 631, 632, - 607, 633, 610, 634, 635, 636, 637, 611, 638, 639, - 616, 640, 641, 617, 618, 619, 642, 622, 623, 624, - - 625, 643, 628, 629, 630, 631, 632, 646, 633, 647, - 634, 635, 636, 637, 648, 638, 639, 649, 640, 641, - 658, 659, 660, 642, 662, 663, 665, 666, 643, 667, - 668, 669, 670, 671, 646, 672, 647, 673, 674, 675, - 680, 648, 683, 686, 649, 687, 688, 658, 659, 660, - 689, 662, 663, 665, 666, 690, 667, 668, 669, 670, - 671, 691, 672, 696, 673, 674, 675, 680, 697, 683, - 686, 698, 687, 688, 700, 702, 703, 689, 706, 707, - 712, 713, 690, 718, 719, 720, 721, 722, 691, 723, - 696, 728, 729, 730, 731, 697, 734, 735, 698, 736, - - 737, 700, 702, 703, 738, 706, 707, 712, 713, 739, - 718, 719, 720, 721, 722, 0, 723, 0, 728, 729, - 730, 731, 0, 734, 735, 0, 736, 737, 0, 0, - 0, 738, 0, 0, 0, 0, 739, 747, 0, 747, - 749, 749, 749, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - - 746, 746, 746, 746, 746, 746, 746, 746, 746, 746, - 746, 746, 746, 746, 746, 746, 746 + 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, + 31, 65, 709, 31, 31, 93, 31, 31, 31, 31, + 31, 31, 31, 33, 33, 33, 33, 33, 33, 33, + 35, 708, 36, 35, 35, 36, 36, 34, 65, 37, + 34, 34, 37, 37, 699, 698, 88, 38, 35, 36, + 38, 38, 31, 32, 93, 89, 32, 32, 37, 32, + 32, 32, 32, 32, 32, 32, 34, 39, 689, 688, + 39, 39, 35, 88, 36, 35, 36, 90, 91, 34, + 38, 37, 89, 40, 92, 37, 40, 40, 41, 38, + 687, 41, 41, 34, 39, 32, 42, 139, 43, 42, + + 42, 43, 43, 686, 90, 91, 679, 38, 94, 39, + 95, 92, 41, 44, 42, 45, 44, 44, 45, 45, + 40, 39, 676, 96, 44, 40, 97, 43, 658, 46, + 41, 54, 46, 46, 45, 94, 139, 95, 42, 41, + 43, 42, 98, 54, 655, 47, 99, 40, 47, 47, + 96, 101, 651, 97, 43, 44, 48, 45, 54, 48, + 48, 45, 46, 49, 102, 59, 49, 49, 103, 98, + 54, 46, 50, 99, 47, 50, 50, 104, 101, 59, + 61, 650, 61, 103, 61, 59, 100, 47, 621, 46, + 48, 102, 59, 100, 105, 103, 49, 620, 48, 67, + + 609, 47, 67, 67, 104, 49, 59, 61, 50, 61, + 103, 61, 59, 100, 50, 71, 608, 48, 71, 71, + 100, 105, 607, 49, 62, 66, 66, 66, 66, 66, + 66, 66, 106, 62, 62, 50, 53, 53, 53, 107, + 62, 67, 53, 53, 606, 564, 127, 128, 53, 71, + 53, 62, 53, 53, 53, 53, 53, 71, 130, 106, + 62, 62, 131, 53, 53, 53, 107, 62, 72, 53, + 53, 72, 72, 127, 128, 53, 71, 53, 134, 53, + 53, 53, 53, 53, 68, 130, 563, 68, 68, 131, + 68, 68, 68, 68, 68, 68, 68, 70, 70, 70, + + 70, 70, 70, 70, 73, 134, 174, 73, 73, 74, + 72, 75, 74, 74, 75, 75, 76, 552, 77, 76, + 76, 77, 77, 535, 534, 77, 68, 69, 177, 533, + 69, 69, 174, 69, 69, 69, 69, 69, 69, 69, + 73, 75, 532, 135, 78, 136, 73, 78, 78, 137, + 76, 74, 79, 75, 177, 79, 79, 531, 76, 80, + 77, 138, 80, 80, 78, 530, 140, 73, 75, 69, + 135, 81, 136, 188, 81, 81, 137, 76, 82, 79, + 83, 82, 82, 83, 83, 80, 78, 525, 138, 129, + 141, 78, 84, 140, 79, 84, 84, 129, 524, 188, + + 86, 80, 423, 86, 86, 142, 79, 215, 83, 422, + 421, 84, 80, 81, 82, 414, 129, 141, 224, 413, + 82, 371, 83, 85, 129, 87, 85, 85, 87, 87, + 143, 368, 142, 215, 84, 83, 113, 86, 84, 113, + 113, 82, 86, 85, 224, 87, 108, 108, 108, 108, + 108, 108, 108, 112, 112, 112, 112, 112, 112, 112, + 113, 290, 144, 145, 86, 85, 146, 87, 278, 143, + 85, 115, 87, 109, 115, 115, 109, 109, 113, 109, + 109, 109, 109, 109, 109, 109, 277, 113, 114, 144, + 145, 114, 114, 146, 116, 147, 117, 116, 116, 117, + + 117, 275, 274, 123, 115, 120, 123, 123, 120, 120, + 114, 183, 117, 115, 116, 109, 110, 51, 148, 110, + 110, 27, 110, 110, 110, 110, 110, 110, 110, 120, + 114, 115, 26, 123, 147, 193, 116, 114, 117, 117, + 119, 116, 25, 119, 119, 123, 149, 120, 148, 118, + 183, 121, 118, 118, 121, 121, 120, 148, 110, 111, + 123, 198, 111, 111, 10, 111, 111, 111, 111, 111, + 111, 111, 118, 149, 193, 148, 119, 122, 121, 9, + 122, 122, 119, 124, 238, 126, 124, 124, 126, 126, + 168, 118, 125, 121, 169, 125, 125, 132, 8, 118, + + 198, 111, 170, 119, 173, 121, 132, 266, 132, 171, + 172, 133, 125, 122, 175, 173, 227, 168, 124, 122, + 133, 169, 133, 238, 132, 124, 3, 126, 152, 170, + 2, 152, 152, 132, 125, 132, 171, 172, 133, 125, + 122, 175, 227, 173, 0, 124, 266, 133, 0, 133, + 150, 150, 150, 150, 150, 150, 150, 151, 0, 176, + 151, 151, 0, 151, 151, 151, 151, 151, 151, 151, + 152, 153, 153, 153, 153, 153, 153, 153, 154, 0, + 155, 154, 154, 155, 155, 156, 176, 157, 156, 156, + 157, 157, 158, 267, 159, 158, 158, 159, 159, 151, + + 0, 160, 254, 159, 160, 160, 159, 161, 178, 0, + 161, 161, 154, 162, 0, 163, 162, 162, 163, 163, + 154, 164, 155, 179, 164, 164, 161, 156, 254, 157, + 0, 163, 267, 0, 158, 178, 159, 165, 0, 154, + 165, 165, 162, 160, 166, 180, 181, 166, 166, 161, + 179, 182, 0, 161, 164, 162, 167, 163, 163, 167, + 167, 184, 0, 164, 185, 165, 186, 187, 189, 162, + 190, 0, 180, 181, 191, 192, 194, 195, 182, 165, + 195, 164, 196, 197, 199, 196, 166, 200, 184, 167, + 281, 185, 165, 186, 187, 189, 206, 190, 167, 206, + + 206, 191, 192, 194, 195, 206, 0, 195, 206, 196, + 197, 199, 196, 216, 200, 0, 167, 201, 201, 201, + 201, 201, 201, 201, 202, 280, 0, 202, 202, 281, + 202, 202, 202, 202, 202, 202, 202, 0, 206, 207, + 216, 217, 207, 207, 0, 205, 0, 207, 205, 205, + 208, 280, 209, 208, 208, 209, 209, 218, 287, 210, + 208, 211, 210, 210, 211, 211, 202, 203, 217, 219, + 203, 203, 209, 203, 203, 203, 203, 203, 203, 203, + 205, 207, 212, 220, 218, 212, 212, 205, 222, 223, + 225, 226, 208, 210, 209, 228, 219, 287, 229, 209, + + 230, 210, 213, 211, 231, 213, 213, 205, 214, 203, + 220, 214, 214, 232, 233, 222, 223, 225, 226, 234, + 210, 235, 228, 0, 212, 229, 236, 230, 237, 239, + 240, 231, 241, 242, 243, 244, 245, 246, 247, 248, + 232, 233, 214, 249, 213, 250, 234, 251, 235, 252, + 214, 253, 0, 236, 293, 237, 239, 240, 331, 241, + 242, 243, 244, 245, 246, 247, 248, 0, 305, 214, + 249, 0, 250, 451, 251, 0, 252, 257, 253, 256, + 257, 257, 256, 256, 331, 256, 256, 256, 256, 256, + 256, 256, 258, 293, 259, 258, 258, 259, 259, 451, + + 260, 268, 259, 260, 260, 261, 269, 305, 261, 261, + 260, 262, 258, 263, 262, 262, 263, 263, 270, 257, + 264, 256, 265, 264, 264, 265, 265, 271, 268, 272, + 273, 276, 279, 269, 258, 0, 259, 0, 282, 258, + 283, 284, 260, 285, 286, 270, 288, 261, 289, 291, + 292, 294, 295, 262, 271, 263, 272, 273, 276, 279, + 296, 297, 264, 298, 265, 282, 299, 283, 284, 300, + 285, 286, 301, 288, 302, 289, 291, 292, 294, 295, + 303, 304, 307, 310, 315, 307, 307, 296, 297, 0, + 298, 308, 0, 299, 308, 308, 300, 0, 311, 301, + + 309, 302, 312, 309, 309, 313, 0, 303, 304, 306, + 310, 307, 306, 306, 314, 306, 306, 306, 306, 306, + 306, 306, 316, 315, 307, 311, 317, 318, 319, 312, + 320, 321, 313, 308, 322, 323, 324, 325, 307, 327, + 328, 314, 309, 329, 330, 332, 333, 334, 335, 316, + 336, 306, 337, 317, 318, 319, 339, 320, 321, 340, + 343, 322, 323, 324, 325, 344, 327, 328, 341, 341, + 329, 330, 332, 333, 334, 335, 345, 336, 346, 337, + 342, 342, 347, 339, 348, 349, 340, 343, 452, 351, + 352, 354, 344, 355, 356, 341, 341, 356, 356, 357, + + 358, 359, 357, 357, 360, 346, 361, 342, 342, 347, + 362, 348, 349, 363, 452, 345, 351, 352, 354, 364, + 355, 365, 366, 367, 369, 370, 372, 358, 359, 373, + 374, 360, 375, 361, 357, 376, 356, 362, 377, 378, + 363, 357, 379, 380, 381, 382, 364, 383, 365, 366, + 367, 369, 370, 372, 384, 385, 373, 374, 386, 375, + 387, 357, 376, 388, 389, 377, 378, 390, 391, 379, + 380, 381, 382, 392, 383, 393, 394, 395, 396, 397, + 398, 384, 385, 399, 400, 386, 396, 387, 398, 401, + 388, 389, 402, 403, 390, 391, 405, 406, 407, 408, + + 392, 409, 393, 394, 395, 396, 397, 398, 410, 411, + 399, 400, 412, 396, 404, 398, 401, 404, 404, 402, + 403, 415, 416, 405, 406, 407, 408, 417, 418, 426, + 419, 420, 424, 425, 427, 410, 411, 428, 429, 412, + 409, 0, 430, 431, 432, 433, 434, 435, 415, 416, + 436, 437, 438, 439, 417, 418, 404, 419, 420, 424, + 425, 427, 440, 441, 428, 429, 442, 443, 426, 430, + 431, 432, 433, 434, 435, 444, 445, 436, 437, 438, + 439, 446, 447, 448, 453, 454, 455, 456, 457, 440, + 441, 458, 459, 442, 443, 460, 461, 462, 463, 464, + + 465, 466, 444, 445, 467, 468, 469, 471, 446, 447, + 448, 453, 454, 455, 456, 457, 472, 473, 458, 459, + 474, 475, 460, 461, 462, 463, 464, 465, 466, 476, + 477, 467, 468, 469, 471, 478, 479, 480, 481, 482, + 483, 484, 485, 472, 473, 486, 487, 474, 475, 488, + 491, 492, 493, 494, 0, 495, 476, 477, 496, 497, + 0, 498, 478, 479, 480, 481, 482, 483, 484, 485, + 501, 502, 486, 487, 503, 504, 488, 491, 492, 493, + 494, 495, 505, 506, 507, 496, 497, 498, 508, 509, + 510, 511, 512, 513, 514, 515, 516, 501, 502, 517, + + 518, 503, 504, 519, 520, 521, 522, 523, 526, 505, + 506, 507, 527, 528, 529, 508, 509, 510, 511, 512, + 513, 514, 515, 516, 538, 539, 517, 518, 541, 542, + 519, 520, 521, 522, 523, 526, 544, 545, 546, 527, + 528, 529, 547, 548, 549, 550, 551, 553, 554, 555, + 556, 538, 539, 557, 558, 541, 542, 559, 560, 561, + 562, 565, 566, 544, 545, 546, 569, 570, 571, 547, + 548, 549, 550, 551, 553, 554, 555, 556, 572, 575, + 557, 558, 576, 577, 559, 560, 561, 562, 565, 566, + 578, 579, 581, 569, 570, 571, 583, 584, 585, 586, + + 587, 588, 589, 590, 592, 572, 575, 593, 594, 576, + 577, 595, 596, 597, 598, 599, 600, 578, 579, 581, + 601, 604, 605, 583, 584, 585, 586, 587, 588, 589, + 590, 592, 610, 611, 593, 594, 612, 613, 595, 596, + 597, 598, 599, 600, 616, 617, 618, 601, 604, 605, + 619, 622, 623, 624, 625, 626, 627, 628, 629, 610, + 611, 630, 631, 612, 613, 632, 633, 634, 635, 636, + 637, 616, 617, 618, 640, 641, 642, 619, 622, 623, + 624, 625, 626, 627, 628, 629, 643, 652, 630, 631, + 653, 654, 632, 633, 634, 635, 636, 637, 656, 657, + + 640, 641, 642, 659, 660, 661, 662, 663, 664, 665, + 666, 667, 643, 668, 652, 669, 672, 653, 654, 673, + 674, 677, 680, 681, 682, 656, 657, 683, 684, 685, + 659, 660, 661, 662, 663, 664, 665, 666, 667, 690, + 668, 691, 669, 672, 692, 694, 673, 674, 677, 680, + 681, 682, 696, 697, 683, 684, 685, 700, 701, 706, + 707, 712, 713, 714, 715, 722, 690, 723, 691, 724, + 725, 692, 694, 726, 727, 728, 729, 730, 731, 696, + 697, 0, 0, 0, 700, 701, 706, 707, 712, 713, + 714, 715, 722, 0, 723, 0, 724, 725, 0, 0, + + 726, 727, 728, 729, 730, 731, 739, 0, 739, 741, + 741, 741, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, + 738, 738, 738, 738, 738 } ; -static yyconst flex_int16_t yy_rule_linenum[88] = +static yyconst flex_int16_t yy_rule_linenum[87] = { 0, 77, 79, 81, 83, 85, 88, 92, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, @@ -1242,9 +1233,9 @@ static yyconst flex_int16_t yy_rule_linenum[88] = 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, - 148, 149, 151, 152, 153, 154, 155, 156, 158, 159, - 162, 167, 168, 169, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 181, 190, 208, 214 + 148, 150, 151, 152, 153, 154, 155, 157, 158, 161, + 166, 167, 168, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 180, 189, 207, 213 } ; /* The intent behind this definition is that it'll catch @@ -1299,7 +1290,7 @@ static yyconst flex_int16_t yy_rule_linenum[88] = #define YY_INPUT(buffer, result, max_size) get_lex_chars(buffer, result, max_size, PARAM) -#line 1303 "libmemcached/options/scanner.cc" +#line 1294 "libmemcached/options/scanner.cc" #define INITIAL 0 @@ -1606,7 +1597,7 @@ YY_DECL -#line 1610 "libmemcached/options/scanner.cc" +#line 1601 "libmemcached/options/scanner.cc" yylval = yylval_param; @@ -1672,13 +1663,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 >= 747 ) + if ( yy_current_state >= 739 ) 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] != 2044 ); + while ( yy_base[yy_current_state] != 2013 ); yy_find_action: /* %% [10.0] code to find the action number goes here */ @@ -1701,13 +1692,13 @@ do_action: /* This label is used only to access EOF actions. */ { if ( yy_act == 0 ) fprintf( stderr, "--scanner backing up\n" ); - else if ( yy_act < 88 ) + else if ( yy_act < 87 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], yytext ); - else if ( yy_act == 88 ) + else if ( yy_act == 87 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", yytext ); - else if ( yy_act == 89 ) + else if ( yy_act == 88 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -1827,12 +1818,12 @@ YY_RULE_SETUP case 20: YY_RULE_SETUP #line 106 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return HASH_WITH_PREFIX_KEY; } +{ yyextra->begin= yytext; return HASH_WITH_NAMESPACE; } YY_BREAK case 21: YY_RULE_SETUP #line 107 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return HASH_WITH_PREFIX_KEY; } +{ yyextra->begin= yytext; return HASH_WITH_NAMESPACE; } YY_BREAK case 22: YY_RULE_SETUP @@ -2032,124 +2023,119 @@ YY_RULE_SETUP case 61: YY_RULE_SETUP #line 148 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return PREFIX_KEY; } +{ yyextra->begin= yytext; return NAMESPACE; } YY_BREAK case 62: YY_RULE_SETUP -#line 149 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return PREFIX_KEY; } +#line 150 "libmemcached/options/scanner.l" +{ yyextra->begin= yytext; return INCLUDE; } YY_BREAK case 63: YY_RULE_SETUP #line 151 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return INCLUDE; } +{ yyextra->begin= yytext; return RESET; } YY_BREAK case 64: YY_RULE_SETUP #line 152 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return RESET; } +{ yyextra->begin= yytext; return PARSER_DEBUG; } YY_BREAK case 65: YY_RULE_SETUP #line 153 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return PARSER_DEBUG; } +{ yyextra->begin= yytext; return SERVERS; } YY_BREAK case 66: YY_RULE_SETUP #line 154 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return SERVERS; } +{ yyextra->begin= yytext; return END; } YY_BREAK case 67: YY_RULE_SETUP #line 155 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return END; } +{ yyextra->begin= yytext; return ERROR; } YY_BREAK case 68: YY_RULE_SETUP -#line 156 "libmemcached/options/scanner.l" -{ yyextra->begin= yytext; return ERROR; } +#line 157 "libmemcached/options/scanner.l" +{ return TRUE; } YY_BREAK case 69: YY_RULE_SETUP #line 158 "libmemcached/options/scanner.l" -{ return TRUE; } - YY_BREAK -case 70: -YY_RULE_SETUP -#line 159 "libmemcached/options/scanner.l" { return FALSE; } YY_BREAK -case 71: +case 70: YY_RULE_SETUP -#line 162 "libmemcached/options/scanner.l" +#line 161 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return UNKNOWN_OPTION; } YY_BREAK +case 71: +YY_RULE_SETUP +#line 166 "libmemcached/options/scanner.l" +{ return CONSISTENT; } + YY_BREAK case 72: YY_RULE_SETUP #line 167 "libmemcached/options/scanner.l" -{ return CONSISTENT; } +{ return MODULA; } YY_BREAK case 73: YY_RULE_SETUP #line 168 "libmemcached/options/scanner.l" -{ return MODULA; } +{ return RANDOM; } YY_BREAK case 74: YY_RULE_SETUP -#line 169 "libmemcached/options/scanner.l" -{ return RANDOM; } +#line 170 "libmemcached/options/scanner.l" +{ return MD5; } YY_BREAK case 75: YY_RULE_SETUP #line 171 "libmemcached/options/scanner.l" -{ return MD5; } +{ return CRC; } YY_BREAK case 76: YY_RULE_SETUP #line 172 "libmemcached/options/scanner.l" -{ return CRC; } +{ return FNV1_64; } YY_BREAK case 77: YY_RULE_SETUP #line 173 "libmemcached/options/scanner.l" -{ return FNV1_64; } +{ return FNV1A_64; } YY_BREAK case 78: YY_RULE_SETUP #line 174 "libmemcached/options/scanner.l" -{ return FNV1A_64; } +{ return FNV1_32; } YY_BREAK case 79: YY_RULE_SETUP #line 175 "libmemcached/options/scanner.l" -{ return FNV1_32; } +{ return FNV1A_32; } YY_BREAK case 80: YY_RULE_SETUP #line 176 "libmemcached/options/scanner.l" -{ return FNV1A_32; } +{ return HSIEH; } YY_BREAK case 81: YY_RULE_SETUP #line 177 "libmemcached/options/scanner.l" -{ return HSIEH; } +{ return MURMUR; } YY_BREAK case 82: YY_RULE_SETUP #line 178 "libmemcached/options/scanner.l" -{ return MURMUR; } - YY_BREAK -case 83: -YY_RULE_SETUP -#line 179 "libmemcached/options/scanner.l" { return JENKINS; } YY_BREAK -case 84: +case 83: YY_RULE_SETUP -#line 181 "libmemcached/options/scanner.l" +#line 180 "libmemcached/options/scanner.l" { yylval->server.port= MEMCACHED_DEFAULT_PORT; yylval->server.weight= 1; @@ -2159,9 +2145,9 @@ YY_RULE_SETUP return IPADDRESS; } YY_BREAK -case 85: +case 84: YY_RULE_SETUP -#line 190 "libmemcached/options/scanner.l" +#line 189 "libmemcached/options/scanner.l" { if (yyextra->is_server()) { @@ -2180,29 +2166,29 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 86: +case 85: YY_RULE_SETUP -#line 208 "libmemcached/options/scanner.l" +#line 207 "libmemcached/options/scanner.l" { yylval->string.c_str = yytext; yylval->string.length = yyleng; return QUOTED_STRING; } YY_BREAK -case 87: +case 86: YY_RULE_SETUP -#line 214 "libmemcached/options/scanner.l" +#line 213 "libmemcached/options/scanner.l" { yyextra->begin= yytext; return UNKNOWN; } YY_BREAK -case 88: +case 87: YY_RULE_SETUP -#line 219 "libmemcached/options/scanner.l" +#line 218 "libmemcached/options/scanner.l" ECHO; YY_BREAK -#line 2206 "libmemcached/options/scanner.cc" +#line 2192 "libmemcached/options/scanner.cc" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2518,7 +2504,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) 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 >= 747 ) + if ( yy_current_state >= 739 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2552,11 +2538,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) 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 >= 747 ) + if ( yy_current_state >= 739 ) 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 == 746); + yy_is_jam = (yy_current_state == 738); return yy_is_jam ? 0 : yy_current_state; } @@ -3468,7 +3454,7 @@ void config_free (void * ptr , yyscan_t yyscanner) /* %ok-for-header */ -#line 219 "libmemcached/options/scanner.l" +#line 218 "libmemcached/options/scanner.l" diff --git a/libmemcached/options/scanner.h b/libmemcached/options/scanner.h index 8e15027c..6d0b71e9 100644 --- a/libmemcached/options/scanner.h +++ b/libmemcached/options/scanner.h @@ -471,7 +471,7 @@ extern int config_lex \ #undef YY_DECL #endif -#line 219 "libmemcached/options/scanner.l" +#line 218 "libmemcached/options/scanner.l" #line 478 "libmemcached/options/scanner.h" diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l index 762ef0a6..4c2801d2 100644 --- a/libmemcached/options/scanner.l +++ b/libmemcached/options/scanner.l @@ -103,8 +103,8 @@ "--CONNECT-TIMEOUT=" { yyextra->begin= yytext; return CONNECT_TIMEOUT; } "--DISTRIBUTION=" { yyextra->begin= yytext; return DISTRIBUTION; } "--HASH=" { yyextra->begin= yytext; return HASH; } -"--HASH_WITH_PREFIX_KEY" { yyextra->begin= yytext; return HASH_WITH_PREFIX_KEY; } -"--HASH-WITH-PREFIX_KEY" { yyextra->begin= yytext; return HASH_WITH_PREFIX_KEY; } +"--HASH_WITH_NAMESPACE" { yyextra->begin= yytext; return HASH_WITH_NAMESPACE; } +"--HASH-WITH-NAMESPACE" { yyextra->begin= yytext; return HASH_WITH_NAMESPACE; } "--IO_BYTES_WATERMARK=" { yyextra->begin= yytext; return IO_BYTES_WATERMARK; } "--IO-BYTES-WATERMARK=" { yyextra->begin= yytext; return IO_BYTES_WATERMARK; } "--IO_KEY_PREFETCH=" { yyextra->begin= yytext; return IO_KEY_PREFETCH; } @@ -145,8 +145,7 @@ "--USE_UDP" { yyextra->begin= yytext; return USE_UDP; } "--USE-UDP" { yyextra->begin= yytext; return USE_UDP; } -"--PREFIX-KEY=" { yyextra->begin= yytext; return PREFIX_KEY; } -"--PREFIX_KEY=" { yyextra->begin= yytext; return PREFIX_KEY; } +"--NAMESPACE=" { yyextra->begin= yytext; return NAMESPACE; } INCLUDE { yyextra->begin= yytext; return INCLUDE; } RESET { yyextra->begin= yytext; return RESET; } diff --git a/support/example.cnf b/support/example.cnf index 3ccb796f..70efaf13 100644 --- a/support/example.cnf +++ b/support/example.cnf @@ -3,8 +3,7 @@ # Store one additional copy on each node. --number-of-replicas=2 ---prefix-key="my_foo" ---prefix-key="my_prefix" +--namespace="my_foo" --server=localhost:11211 --server=localhost:11212 --server=localhost:11213 diff --git a/tests/parser.cc b/tests/parser.cc index f3dca792..704a51fc 100644 --- a/tests/parser.cc +++ b/tests/parser.cc @@ -191,7 +191,7 @@ scanner_variable_t test_number_options[]= { scanner_variable_t test_boolean_options[]= { { ARRAY, make_scanner_string("--BINARY_PROTOCOL"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--BUFFER_REQUESTS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--HASH_WITH_PREFIX_KEY"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--HASH_WITH_NAMESPACE"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--NOREPLY"), scanner_string_null, __check_NOREPLY }, { ARRAY, make_scanner_string("--RANDOMIZE_REPLICA_READ"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--SORT_HOSTS"), scanner_string_null, NULL }, @@ -205,9 +205,9 @@ scanner_variable_t test_boolean_options[]= { }; scanner_variable_t prefix_key_strings[]= { - { ARRAY, make_scanner_string("--PREFIX_KEY=foo"), make_scanner_string("foo"), __check_prefix_key }, - { ARRAY, make_scanner_string("--PREFIX-KEY=\"foo\""), make_scanner_string("foo"), __check_prefix_key }, - { ARRAY, make_scanner_string("--PREFIX-KEY=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_prefix_key }, + { ARRAY, make_scanner_string("--NAMESPACE=foo"), make_scanner_string("foo"), __check_prefix_key }, + { ARRAY, make_scanner_string("--NAMESPACE=\"foo\""), make_scanner_string("foo"), __check_prefix_key }, + { ARRAY, make_scanner_string("--NAMESPACE=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_prefix_key }, { NIL, scanner_string_null, scanner_string_null, NULL} };