Update for virtual buckets/wasn't this just originally the wheel?

[awesomized/libmemcached] / libmemcached / options / scanner.l

diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index 67fdb96d4903f0bb5adaabdd17fa56e8f19b4c1a..b3fce3c317f0ef83f4c1febd76fa4d63ed493b1e 100644 (file)
--- a/libmemcached/options/scanner.l
+++ b/libmemcached/options/scanner.l
@@ -3,17 +3,17 @@
  *  Libmemcached Scanner and Parser
  *
  *  Copyright (C) 2011 DataDifferental, http://datadifferential.com
- *  
+ * 
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *  
+ * 
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *  
+ * 
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -22,7 +22,6 @@
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-fpermissive"
 
 #include <libmemcached/options/context.h>
 #include <libmemcached/options/parser.h>
@@ -40,19 +39,19 @@
 
 #define PARAM yyget_extra(yyscanner)
 
-static void get_lex_chars(char* buffer, int& result, int max_size, Context *context)
-{
-  if (context->pos >= context->length)
-  {
-    result= YY_NULL;
-  }
-  else
-  {
-    result= context->length - context->pos;
-    result > (int)max_size ? result = max_size : 0;
-    memcpy(buffer, context->buf + context->pos, result);
-    context->pos += result;
-  }
+#define get_lex_chars(buffer, result, max_size, context) \
+{ \
+  if (context->pos >= context->length) \
+  { \
+    result= YY_NULL; \
+  } \
+  else \
+  { \
+    result= context->length - context->pos; \
+    result > max_size ? result = max_size : 0; \
+    memcpy(buffer, context->buf + context->pos, result); \
+    context->pos += result; \
+  } \
 }
 
 
@@ -85,8 +84,8 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
       return COMMENT;
     }
 
-"--SERVER"                          { yyextra->begin= yytext; return SERVER; }
-"--SERVERS"                        { yyextra->begin= yytext; return SERVERS_OPTION; }
+"--SERVER="                          { yyextra->begin= yytext; return SERVER; }
+"--SERVERS="                        { yyextra->begin= yytext; return SERVERS_OPTION; }
 
 "--VERIFY_KEY"                      { yyextra->begin= yytext; return VERIFY_KEY; }
 "--VERIFY-KEY"                      { yyextra->begin= yytext; return VERIFY_KEY; }
@@ -98,45 +97,41 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
 "--BUFFER-REQUESTS"                    { yyextra->begin= yytext; return BUFFER_REQUESTS; }
 "--CACHE_LOOKUPS"                      { yyextra->begin= yytext; return CACHE_LOOKUPS; }
 "--CACHE-LOOKUPS"                      { yyextra->begin= yytext; return CACHE_LOOKUPS; }
-"--CONFIGURE_FILE"                     { yyextra->begin= yytext; return CONFIGURE_FILE; }
-"--CONFIGURE-FILE"                     { yyextra->begin= yytext; return CONFIGURE_FILE; }
-"--CONNECT_TIMEOUT"                    { yyextra->begin= yytext; return CONNECT_TIMEOUT; }
-"--CONNECT-TIMEOUT"                    { yyextra->begin= yytext; return CONNECT_TIMEOUT; }
-"--CORK"                               { yyextra->begin= yytext; return _CORK; }
-"--DISTRIBUTION"                       { yyextra->begin= yytext; return DISTRIBUTION; }
-"--HASH"                               { yyextra->begin= yytext; return HASH; }
+"--CONFIGURE_FILE="                    { yyextra->begin= yytext; return CONFIGURE_FILE; }
+"--CONFIGURE-FILE="                    { yyextra->begin= yytext; return CONFIGURE_FILE; }
+"--CONNECT_TIMEOUT="                   { yyextra->begin= yytext; return CONNECT_TIMEOUT; }
+"--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; }
-"--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; }
-"--IO-KEY-PREFETCH"                    { yyextra->begin= yytext; return IO_KEY_PREFETCH; }
-"--IO_MSG_WATERMARK"           { yyextra->begin= yytext; return IO_MSG_WATERMARK; }
-"--IO-MSG-WATERMARK"           { yyextra->begin= yytext; return IO_MSG_WATERMARK; }
-"--KETAMA"                             { yyextra->begin= yytext; return KETAMA; }
-"--KETAMA_HASH"                        { yyextra->begin= yytext; return KETAMA_HASH; }
-"--KETAMA-HASH"                        { yyextra->begin= yytext; return KETAMA_HASH; }
+"--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; }
+"--IO-KEY-PREFETCH="                   { yyextra->begin= yytext; return IO_KEY_PREFETCH; }
+"--IO_MSG_WATERMARK="          { yyextra->begin= yytext; return IO_MSG_WATERMARK; }
+"--IO-MSG-WATERMARK="          { yyextra->begin= yytext; return IO_MSG_WATERMARK; }
 "--KETAMA_WEIGHTED"                    { yyextra->begin= yytext; return KETAMA_WEIGHTED; }
 "--KETAMA-WEIGHTED"                    { yyextra->begin= yytext; return KETAMA_WEIGHTED; }
 "--NOREPLY"                         { yyextra->begin= yytext; return NOREPLY; }
-"--NUMBER_OF_REPLICAS"         { yyextra->begin= yytext; return NUMBER_OF_REPLICAS; }
-"--NUMBER-OF-REPLICAS"         { yyextra->begin= yytext; return NUMBER_OF_REPLICAS; }
-"--POLL_TIMEOUT"                       { yyextra->begin= yytext; return POLL_TIMEOUT; }
-"--POLL-TIMEOUT"                       { yyextra->begin= yytext; return POLL_TIMEOUT; }
+"--NUMBER_OF_REPLICAS="                { yyextra->begin= yytext; return NUMBER_OF_REPLICAS; }
+"--NUMBER-OF-REPLICAS="                { yyextra->begin= yytext; return NUMBER_OF_REPLICAS; }
+"--POLL_TIMEOUT="                      { yyextra->begin= yytext; return POLL_TIMEOUT; }
+"--POLL-TIMEOUT="                      { yyextra->begin= yytext; return POLL_TIMEOUT; }
 "--RANDOMIZE_REPLICA_READ"             { yyextra->begin= yytext; return RANDOMIZE_REPLICA_READ; }
 "--RANDOMIZE-REPLICA-READ"             { yyextra->begin= yytext; return RANDOMIZE_REPLICA_READ; }
-"--RCV_TIMEOUT"                        { yyextra->begin= yytext; return RCV_TIMEOUT; }
-"--RCV-TIMEOUT"                        { yyextra->begin= yytext; return RCV_TIMEOUT; }
-"--RETRY_TIMEOUT"                      { yyextra->begin= yytext; return RETRY_TIMEOUT; }
-"--RETRY-TIMEOUT"                      { yyextra->begin= yytext; return RETRY_TIMEOUT; }
-"--SERVER_FAILURE_LIMIT"               { yyextra->begin= yytext; return SERVER_FAILURE_LIMIT; }
-"--SERVER-FAILURE-LIMIT"               { yyextra->begin= yytext; return SERVER_FAILURE_LIMIT; }
-"--SND_TIMEOUT"                        { yyextra->begin= yytext; return SND_TIMEOUT; }
-"--SND-TIMEOUT"                        { yyextra->begin= yytext; return SND_TIMEOUT; }
-"--SOCKET_RECV_SIZE"           { yyextra->begin= yytext; return SOCKET_RECV_SIZE; }
-"--SOCKET-RECV-SIZE"           { yyextra->begin= yytext; return SOCKET_RECV_SIZE; }
-"--SOCKET_SEND_SIZE"           { yyextra->begin= yytext; return SOCKET_SEND_SIZE; }
-"--SOCKET-SEND-SIZE"           { yyextra->begin= yytext; return SOCKET_SEND_SIZE; }
+"--RCV_TIMEOUT="                       { yyextra->begin= yytext; return RCV_TIMEOUT; }
+"--RCV-TIMEOUT="                       { yyextra->begin= yytext; return RCV_TIMEOUT; }
+"--RETRY_TIMEOUT="                     { yyextra->begin= yytext; return RETRY_TIMEOUT; }
+"--RETRY-TIMEOUT="                     { yyextra->begin= yytext; return RETRY_TIMEOUT; }
+"--SERVER_FAILURE_LIMIT="              { yyextra->begin= yytext; return SERVER_FAILURE_LIMIT; }
+"--SERVER-FAILURE-LIMIT="              { yyextra->begin= yytext; return SERVER_FAILURE_LIMIT; }
+"--SND_TIMEOUT="                       { yyextra->begin= yytext; return SND_TIMEOUT; }
+"--SND-TIMEOUT="                       { yyextra->begin= yytext; return SND_TIMEOUT; }
+"--SOCKET_RECV_SIZE="          { yyextra->begin= yytext; return SOCKET_RECV_SIZE; }
+"--SOCKET-RECV-SIZE="          { yyextra->begin= yytext; return SOCKET_RECV_SIZE; }
+"--SOCKET_SEND_SIZE="          { yyextra->begin= yytext; return SOCKET_SEND_SIZE; }
+"--SOCKET-SEND-SIZE="          { yyextra->begin= yytext; return SOCKET_SEND_SIZE; }
 "--SORT_HOSTS"                 { yyextra->begin= yytext; return SORT_HOSTS; }
 "--SORT-HOSTS"                 { yyextra->begin= yytext; return SORT_HOSTS; }
 "--SUPPORT_CAS"                        { yyextra->begin= yytext; return SUPPORT_CAS; }
@@ -152,8 +147,8 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
 "--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; }
+"--PREFIX-KEY="                                { yyextra->begin= yytext; return PREFIX_KEY; }
+"--PREFIX_KEY="                                { yyextra->begin= yytext; return PREFIX_KEY; }
 
 INCLUDE           { yyextra->begin= yytext; return INCLUDE; }
 RESET           { yyextra->begin= yytext; return RESET; }
@@ -185,13 +180,13 @@ HSIEH                     { return HSIEH; }
 MURMUR                 { return MURMUR; }
 JENKINS                        { return JENKINS; }
 
-[[:alnum:]][[:alnum:].]*[[:alpha:]]: { 
+[[:alnum:]][[:alnum:].]*[[:alpha:]]: {
       yylval->string.c_str = yytext;
       yylval->string.length = yyleng;
       return HOSTNAME_WITH_PORT;
     }
 
-[[:alnum:]]+"."[[:alpha:].]+[[:alnum:]] { 
+[[:alnum:]]+"."[[:alpha:].]+[[:alnum:]] {
       yylval->string.c_str = yytext;
       yylval->string.length = yyleng;
       return HOSTNAME;
@@ -209,7 +204,7 @@ JENKINS                     { return JENKINS; }
       return IPADDRESS;
     }
 
-[[:alnum:]]+ { 
+[[:alnum:]]+ {
       yylval->string.c_str = yytext;
       yylval->string.length = yyleng;
       return STRING;