X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions%2Fscanner.l;h=8f3e09deed146f58bf6895b35bdbb7044772f84c;hb=f285e1b3821f56a8983b5ce9fb1a0070e7bb0a1c;hp=b3fce3c317f0ef83f4c1febd76fa4d63ed493b1e;hpb=81416ab2d4fe60d5c71ea11326a351993c539002;p=awesomized%2Flibmemcached

diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index b3fce3c3..8f3e09de 100644
--- a/libmemcached/options/scanner.l
+++ b/libmemcached/options/scanner.l
@@ -21,6 +21,7 @@
 %top{
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsign-compare"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 
 #include <libmemcached/options/context.h>
@@ -47,8 +48,8 @@
   } \
   else \
   { \
-    result= context->length - context->pos; \
-    result > max_size ? result = max_size : 0; \
+    result= (int)(context->length - context->pos); \
+    (size_t)result > (size_t)max_size ? result= max_size : 0; \
     memcpy(buffer, context->buf + context->pos, result); \
     context->pos += result; \
   } \
@@ -75,17 +76,20 @@
 
 =|,|[ ]       { return yytext[0];}
 
-
 [[:digit:]]+ { yylval->number = atoi(yytext); return (NUMBER); }
 
+:[[:digit:]]{1,5} { yylval->server.port = atoi(yytext +1); return PORT; }
+
+"/?"[[:digit:]]{1,5} { yylval->server.weight = atoi(yytext +2); return WEIGHT_START; }
+
 [\t\r\n] ; /* skip whitespace */
 
+
 ^#.*$ {
       return COMMENT;
     }
 
-"--SERVER="                          { yyextra->begin= yytext; return SERVER; }
-"--SERVERS="                        { yyextra->begin= yytext; return SERVERS_OPTION; }
+"--SERVER="                          { yyextra->begin= yytext; yyextra->set_server(); return SERVER; }
 
 "--VERIFY_KEY"                      { yyextra->begin= yytext; return VERIFY_KEY; }
 "--VERIFY-KEY"                      { yyextra->begin= yytext; return VERIFY_KEY; }
@@ -95,8 +99,6 @@
 "--BINARY-PROTOCOL"			{ yyextra->begin= yytext; return BINARY_PROTOCOL; }
 "--BUFFER_REQUESTS"			{ yyextra->begin= yytext; return BUFFER_REQUESTS; }
 "--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; }
@@ -111,8 +113,6 @@
 "--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; }
@@ -180,33 +180,30 @@ HSIEH			{ return HSIEH; }
 MURMUR			{ return MURMUR; }
 JENKINS			{ return JENKINS; }
 
-[[:alnum:]][[:alnum:].]*[[:alpha:]]: {
-      yylval->string.c_str = yytext;
-      yylval->string.length = yyleng;
-      return HOSTNAME_WITH_PORT;
+(([[:digit:]]{1,3}"."){3}([[:digit:]]{1,3})) {
+      yylval->server.port= MEMCACHED_DEFAULT_PORT;
+      yylval->server.weight= 1;
+      yylval->server.c_str= yyextra->set_hostname(yytext, yyleng);
+      if (yylval->server.c_str)
+        yylval->server.length= yyleng;
+      return IPADDRESS;
     }
 
-[[:alnum:]]+"."[[:alpha:].]+[[:alnum:]] {
-      yylval->string.c_str = yytext;
-      yylval->string.length = yyleng;
-      return HOSTNAME;
-    }
+[[:alnum:]]["."[:alnum:]_-]+[[:alnum:]] {
+      if (yyextra->is_server())
+      {
+        yylval->server.port= MEMCACHED_DEFAULT_PORT;
+        yylval->server.weight= 1;
+        yylval->server.c_str= yyextra->set_hostname(yytext, yyleng);
+        if (yylval->server.c_str)
+          yylval->server.length= yyleng;
 
-(([[:digit:]]{1,3}"."){3}([[:digit:]]{1,3})): {
-      yylval->string.c_str = yytext;
-      yylval->string.length = yyleng;
-      return IPADDRESS_WITH_PORT;
-    }
+        return HOSTNAME;
+      }
 
-(([[:digit:]]{1,3}"."){3}([[:digit:]]{1,3})) {
       yylval->string.c_str = yytext;
       yylval->string.length = yyleng;
-      return IPADDRESS;
-    }
 
-[[:alnum:]]+ {
-      yylval->string.c_str = yytext;
-      yylval->string.length = yyleng;
       return STRING;
     }