X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions%2Fscanner.l;h=4c2801d21f72426450a28f89b7d2077ce69dc180;hb=55cf7c68679083cdd7351db3b888c6f8ddcebe09;hp=81b9acd8c4afba47b54edea102cbaaa00d8cecb7;hpb=8ddd817cd74d85db3f945920fb02f4cc4daa8050;p=m6w6%2Flibmemcached
diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index 81b9acd8..4c2801d2 100644
--- 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 .
*/
@@ -21,8 +21,8 @@
%top{
#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-fpermissive"
#include
#include
@@ -40,19 +40,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= (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; \
+ } \
}
@@ -76,48 +76,41 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
=|,|[ ] { 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; }
-"--AUTO_EJECT_HOSTS" { yyextra->begin= yytext; return AUTO_EJECT_HOSTS; }
-"--AUTO-EJECT_HOSTS" { yyextra->begin= yytext; return AUTO_EJECT_HOSTS; }
"--BINARY_PROTOCOL" { yyextra->begin= yytext; return BINARY_PROTOCOL; }
"--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; }
"--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; }
-"--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; }
"--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; }
-"--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; }
@@ -129,10 +122,10 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
"--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; }
+"--REMOVE_FAILED_SERVERS=" { yyextra->begin= yytext; return REMOVE_FAILED_SERVERS; }
+"--REMOVE-FAILED-SERVERS=" { yyextra->begin= yytext; return REMOVE_FAILED_SERVERS; }
"--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; }
@@ -152,8 +145,7 @@ 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; }
+"--NAMESPACE=" { yyextra->begin= yytext; return NAMESPACE; }
INCLUDE { yyextra->begin= yytext; return INCLUDE; }
RESET { yyextra->begin= yytext; return RESET; }
@@ -185,33 +177,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;
}