X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions%2Fscanner.l;h=80f1c8d8351c29601c8e5684637076b2239d2a30;hb=fd55b335a4d6530382bb95542479332c87de1d30;hp=aadfdc3ba66cb917ef96c573ee2a3ddf58752c20;hpb=50521589078b10acb7be711658754120be554852;p=m6w6%2Flibmemcached
diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index aadfdc3b..80f1c8d8 100644
--- a/libmemcached/options/scanner.l
+++ b/libmemcached/options/scanner.l
@@ -3,36 +3,33 @@
* 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 .
*/
%top{
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-fpermissive"
-
-#include
-
+#include
#include
#include
-#include
#include
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+
#define YY_EXTRA_TYPE Context*
-#define YY_USER_ACTION yylloc->first_line = yylineno;
}
@@ -43,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; \
+ } \
}
@@ -63,16 +60,15 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
%}
+%option 8bit
%option bison-bridge
-%option bison-locations
%option case-insensitive
%option debug
%option nounput
%option noyywrap
-%option yylineno
%option outfile="libmemcached/options/scanner.cc" header-file="libmemcached/options/scanner.h"
%option perf-report
-%option prefix="libmemcached_"
+%option prefix="config_"
%option reentrant
%%
@@ -80,88 +76,60 @@ 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:]]+ { yylval->number = atoi(yytext); return (NUMBER); }
+:[[:digit:]]{1,5} { yylval->number= atoi(yytext +1); return PORT; }
+
+"/?"[[:digit:]]{1,5} { yylval->number= 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; }
+
+"--SOCKET=" { yyextra->begin= yytext; return SOCKET; }
-"--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; }
-"--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; }
+"--CONFIGURE-FILE=" { yyextra->begin= yytext; return CONFIGURE_FILE; }
+"--CONNECT-TIMEOUT=" { yyextra->begin= yytext; return CONNECT_TIMEOUT; }
+"--DISTRIBUTION=" { yyextra->begin= yytext; return DISTRIBUTION; }
+"--HASH-WITH-NAMESPACE" { yyextra->begin= yytext; return HASH_WITH_NAMESPACE; }
+"--HASH=" { yyextra->begin= yytext; return HASH; }
+"--IO-BYTES-WATERMARK=" { yyextra->begin= yytext; return IO_BYTES_WATERMARK; }
+"--IO-KEY-PREFETCH=" { yyextra->begin= yytext; return IO_KEY_PREFETCH; }
+"--IO-MSG-WATERMARK=" { yyextra->begin= yytext; return IO_MSG_WATERMARK; }
"--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; }
-"--RANDOMIZE_REPLICA_READ" { yyextra->begin= yytext; return RANDOMIZE_REPLICA_READ; }
+"--NUMBER-OF-REPLICAS=" { yyextra->begin= yytext; return NUMBER_OF_REPLICAS; }
+"--POLL-TIMEOUT=" { yyextra->begin= yytext; return POLL_TIMEOUT; }
"--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; }
-"--SORT_HOSTS" { yyextra->begin= yytext; return SORT_HOSTS; }
+"--RCV-TIMEOUT=" { yyextra->begin= yytext; return RCV_TIMEOUT; }
+"--REMOVE-FAILED-SERVERS=" { yyextra->begin= yytext; return REMOVE_FAILED_SERVERS; }
+"--RETRY-TIMEOUT=" { yyextra->begin= yytext; return RETRY_TIMEOUT; }
+"--SND-TIMEOUT=" { yyextra->begin= yytext; return SND_TIMEOUT; }
+"--SOCKET-RECV-SIZE=" { yyextra->begin= yytext; return SOCKET_RECV_SIZE; }
+"--SOCKET-SEND-SIZE=" { yyextra->begin= yytext; return SOCKET_SEND_SIZE; }
"--SORT-HOSTS" { yyextra->begin= yytext; return SORT_HOSTS; }
-"--SUPPORT_CAS" { yyextra->begin= yytext; return SUPPORT_CAS; }
"--SUPPORT-CAS" { yyextra->begin= yytext; return SUPPORT_CAS; }
-"--TCP_NODELAY" { yyextra->begin= yytext; return _TCP_NODELAY; }
-"--TCP-NODELAY" { yyextra->begin= yytext; return _TCP_NODELAY; }
-"--TCP_KEEPALIVE" { yyextra->begin= yytext; return _TCP_KEEPALIVE; }
"--TCP-KEEPALIVE" { yyextra->begin= yytext; return _TCP_KEEPALIVE; }
-"--TCP_KEEPIDLE" { yyextra->begin= yytext; return _TCP_KEEPIDLE; }
"--TCP-KEEPIDLE" { yyextra->begin= yytext; return _TCP_KEEPIDLE; }
-"--USER_DATA" { yyextra->begin= yytext; return USER_DATA; }
-"--USER-DATA" { yyextra->begin= yytext; return USER_DATA; }
-"--USE_UDP" { yyextra->begin= yytext; return USE_UDP; }
+"--TCP-NODELAY" { yyextra->begin= yytext; return _TCP_NODELAY; }
"--USE-UDP" { yyextra->begin= yytext; return USE_UDP; }
+"--USER-DATA" { yyextra->begin= yytext; return USER_DATA; }
+"--VERIFY-KEY" { yyextra->begin= yytext; return VERIFY_KEY; }
-"--PREFIX-KEY" { yyextra->begin= yytext; return PREFIX_KEY; }
-"--PREFIX_KEY" { yyextra->begin= yytext; return PREFIX_KEY; }
+"--POOL-MIN=" { yyextra->begin= yytext; return POOL_MIN; }
+"--POOL-MAX=" { yyextra->begin= yytext; return POOL_MAX; }
+
+"--NAMESPACE=" { yyextra->begin= yytext; return NAMESPACE; }
INCLUDE { yyextra->begin= yytext; return INCLUDE; }
RESET { yyextra->begin= yytext; return RESET; }
-DEBUG { yyextra->begin= yytext; return DEBUG; }
+DEBUG { yyextra->begin= yytext; return PARSER_DEBUG; }
SERVERS { yyextra->begin= yytext; return SERVERS; }
END { yyextra->begin= yytext; return END; }
ERROR { yyextra->begin= yytext; return ERROR; }
@@ -189,39 +157,36 @@ 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.size= 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.size= 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;
- }
+ yylval->string.size = yyleng;
-[[:alnum:]]+ {
- yylval->string.c_str = yytext;
- yylval->string.length = yyleng;
return STRING;
}
(\".*\") {
yylval->string.c_str = yytext;
- yylval->string.length = yyleng;
+ yylval->string.size = yyleng;
return QUOTED_STRING;
}