X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=inline;f=libmemcached%2Foptions%2Fscanner.l;h=8f3e09deed146f58bf6895b35bdbb7044772f84c;hb=c4f9265e4f61a10ba1d4b6999c856a8c7df97f56;hp=1afc50eb5a12ca337dc03715ff7f1982e5516851;hpb=696240873d8c6ca5edc482a7395984aac14d5b32;p=m6w6%2Flibmemcached
diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index 1afc50eb..8f3e09de 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,13 +21,15 @@
%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
#include
#include
-#include
+
+#define YY_EXTRA_TYPE Context*
}
@@ -38,19 +40,19 @@
#define PARAM yyget_extra(yyscanner)
-static void get_lex_chars(char* buffer, int& result, int max_size, struct type_st *parser)
-{
- if (parser->pos >= parser->length)
- {
- result = YY_NULL;
- }
- else
- {
- result = parser->length - parser->pos;
- result > (int)max_size ? result = max_size : 0;
- memcpy(buffer, parser->buf + parser->pos, result);
- parser->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; \
+ } \
}
@@ -58,7 +60,7 @@ static void get_lex_chars(char* buffer, int& result, int max_size, struct type_s
%}
-%option bison-locations
+%option 8bit
%option bison-bridge
%option case-insensitive
%option debug
@@ -66,7 +68,7 @@ static void get_lex_chars(char* buffer, int& result, int max_size, struct type_s
%option noyywrap
%option outfile="libmemcached/options/scanner.cc" header-file="libmemcached/options/scanner.h"
%option perf-report
-%option prefix="libmemcached_"
+%option prefix="config_"
%option reentrant
%%
@@ -74,79 +76,95 @@ static void get_lex_chars(char* buffer, int& result, int max_size, struct type_s
=|,|[ ] { return yytext[0];}
-
[[:digit:]]+ { yylval->number = atoi(yytext); return (NUMBER); }
-([[:digit:]]*.[:digit:]+) { yylval->double_number = atof(yytext); return (FLOAT); }
+:[[: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 DASH_OPTION; }
-
-SERVER { return SERVER; }
-SERVERS { return SERVERS; }
-
-VERIFY_KEY { return VERIFY_KEY; }
-VERIFY-KEY { return VERIFY_KEY; }
-AUTO_EJECT_HOSTS { return AUTO_EJECT_HOSTS; }
-AUTO-EJECT_HOSTS { return AUTO_EJECT_HOSTS; }
-BINARY_PROTOCOL { return BINARY_PROTOCOL; }
-BINARY-PROTOCOL { return BINARY_PROTOCOL; }
-BUFFER_REQUESTS { return BUFFER_REQUESTS; }
-BUFFER-REQUESTS { return BUFFER_REQUESTS; }
-CACHE_LOOKUPS { return CACHE_LOOKUPS; }
-CACHE-LOOKUPS { return CACHE_LOOKUPS; }
-CONNECT_TIMEOUT { return CONNECT_TIMEOUT; }
-CONNECT-TIMEOUT { return CONNECT_TIMEOUT; }
-CORK { return _CORK; }
-DISTRIBUTION { return DISTRIBUTION; }
-HASH { return HASH; }
-HASH_WITH_PREFIX_KEY { return HASH_WITH_PREFIX_KEY; }
-HASH-WITH-PREFIX_KEY { return HASH_WITH_PREFIX_KEY; }
-IO_BYTES_WATERMARK { return IO_BYTES_WATERMARK; }
-IO-BYTES-WATERMARK { return IO_BYTES_WATERMARK; }
-IO_KEY_PREFETCH { return IO_KEY_PREFETCH; }
-IO-KEY-PREFETCH { return IO_KEY_PREFETCH; }
-IO_MSG_WATERMARK { return IO_MSG_WATERMARK; }
-IO-MSG-WATERMARK { return IO_MSG_WATERMARK; }
-KETAMA { return KETAMA; }
-KETAMA_HASH { return KETAMA_HASH; }
-KETAMA-HASH { return KETAMA_HASH; }
-KETAMA_WEIGHTED { return KETAMA_WEIGHTED; }
-KETAMA-WEIGHTED { return KETAMA_WEIGHTED; }
-NOREPLY { return NOREPLY; }
-NUMBER_OF_REPLICAS { return NUMBER_OF_REPLICAS; }
-NUMBER-OF-REPLICAS { return NUMBER_OF_REPLICAS; }
-POLL_TIMEOUT { return POLL_TIMEOUT; }
-POLL-TIMEOUT { return POLL_TIMEOUT; }
-RANDOMIZE_REPLICA_READ { return RANDOMIZE_REPLICA_READ; }
-RANDOMIZE-REPLICA-READ { return RANDOMIZE_REPLICA_READ; }
-RCV_TIMEOUT { return RCV_TIMEOUT; }
-RCV-TIMEOUT { return RCV_TIMEOUT; }
-RETRY_TIMEOUT { return RETRY_TIMEOUT; }
-RETRY-TIMEOUT { return RETRY_TIMEOUT; }
-SERVER_FAILURE_LIMIT { return SERVER_FAILURE_LIMIT; }
-SERVER-FAILURE-LIMIT { return SERVER_FAILURE_LIMIT; }
-SND_TIMEOUT { return SND_TIMEOUT; }
-SND-TIMEOUT { return SND_TIMEOUT; }
-SOCKET_RECV_SIZE { return SOCKET_RECV_SIZE; }
-SOCKET-RECV-SIZE { return SOCKET_RECV_SIZE; }
-SOCKET_SEND_SIZE { return SOCKET_SEND_SIZE; }
-SOCKET-SEND-SIZE { return SOCKET_SEND_SIZE; }
-SORT_HOSTS { return SORT_HOSTS; }
-SORT-HOSTS { return SORT_HOSTS; }
-SUPPORT_CAS { return SUPPORT_CAS; }
-SUPPORT-CAS { return SUPPORT_CAS; }
-TCP_NODELAY { return _TCP_NODELAY; }
-TCP-NODELAY { return _TCP_NODELAY; }
-TCP_KEEPALIVE { return _TCP_KEEPALIVE; }
-TCP-KEEPALIVE { return _TCP_KEEPALIVE; }
-TCP_KEEPIDLE { return _TCP_KEEPIDLE; }
-TCP-KEEPIDLE { return _TCP_KEEPIDLE; }
-USER_DATA { return USER_DATA; }
-USER-DATA { return USER_DATA; }
-USE_UDP { return USE_UDP; }
-USE-UDP { return USE_UDP; }
+
+^#.*$ {
+ return COMMENT;
+ }
+
+"--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; }
+"--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; }
+"--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; }
+"--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; }
+"--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; }
+"--USE-UDP" { yyextra->begin= yytext; return USE_UDP; }
+
+"--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; }
+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; }
+
+TRUE { return TRUE; }
+FALSE { return FALSE; }
+
+
+"--"[[:alnum:]]* {
+ yyextra->begin= yytext;
+ return UNKNOWN_OPTION;
+ }
CONSISTENT { return CONSISTENT; }
MODULA { return MODULA; }
@@ -162,31 +180,54 @@ HSIEH { return HSIEH; }
MURMUR { return MURMUR; }
JENKINS { return JENKINS; }
-[[:alnum:]][[:alnum:].]*[[:alpha:]]: {
- yylval->string.c_str = yytext;
- yylval->string.length = yyleng;
- return SERVER_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:]][[:alnum:].]*[[:alpha:]] {
- yylval->string.c_str = yytext;
- yylval->string.length = yyleng;
- return IDENTIFIER;
- }
-[[:digit:]]{1,3}"."[[:digit:]]{1,3}"."[[:digit:]]{1,3}"."[[:digit:]]{1,3}: {
+[[: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;
+
+ return HOSTNAME;
+ }
+
yylval->string.c_str = yytext;
yylval->string.length = yyleng;
- return IPADDRESS_WITH_PORT;
+
+ return STRING;
}
-[[:digit:]]{1,3}"."[[:digit:]]{1,3}"."[[:digit:]]{1,3}"."[[:digit:]]{1,3} {
+(\".*\") {
yylval->string.c_str = yytext;
yylval->string.length = yyleng;
- return IPADDRESS;
+ return QUOTED_STRING;
}
. {
+ yyextra->begin= yytext;
return UNKNOWN;
}
%%
+
+void Context::init_scanner()
+{
+ yylex_init(&scanner);
+ yyset_extra(this, scanner);
+}
+
+void Context::destroy_scanner()
+{
+ yylex_destroy(scanner);
+}
+