X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Foptions%2Fscanner.l;h=c5b7962f11303fe9e7a415bc9c6c13e8affa1882;hb=de161b27e5e394ea0ae4a88e58fc9ebb21e821d0;hp=ccfc55aa570752559a34a99bdab1299bbb9fea02;hpb=2a34f4dcac48917e41a1b6aee37edbe886aa9f7b;p=awesomized%2Flibmemcached
diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index ccfc55aa..c5b7962f 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 .
*/
@@ -22,7 +22,6 @@
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-fpermissive"
#include
#include
@@ -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; \
+ } \
}
@@ -76,17 +75,20 @@ 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; }
@@ -96,8 +98,6 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
"--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; }
@@ -112,8 +112,6 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
"--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; }
@@ -181,33 +179,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;
}