X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions%2Fscanner.l;h=ccfc55aa570752559a34a99bdab1299bbb9fea02;hb=2a34f4dcac48917e41a1b6aee37edbe886aa9f7b;hp=7949e93daeae93d8c25562c2235333eec90d452d;hpb=c66a8a6610acb1971f9a9db0f73efdf71fe0f805;p=m6w6%2Flibmemcached

diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index 7949e93d..ccfc55aa 100644
--- a/libmemcached/options/scanner.l
+++ b/libmemcached/options/scanner.l
@@ -30,7 +30,6 @@
 #include <libmemcached/options/symbol.h>
 
 #define YY_EXTRA_TYPE Context*
-#define YY_USER_ACTION yylloc->first_line = yylineno;
 
 }
 
@@ -61,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
 
 %%
@@ -87,8 +85,8 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
       return COMMENT;
     }
 
-"--SERVER"                          { yyextra->begin= yytext; return SERVER; }
-"--SERVERS"                        { yyextra->begin= yytext; return SERVERS_OPTION; }
+"--SERVER="                          { yyextra->begin= yytext; return SERVER; }
+"--SERVERS="                        { yyextra->begin= yytext; return SERVERS_OPTION; }
 
 "--VERIFY_KEY"                      { yyextra->begin= yytext; return VERIFY_KEY; }
 "--VERIFY-KEY"                      { yyextra->begin= yytext; return VERIFY_KEY; }
@@ -100,45 +98,41 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
 "--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; }
+"--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; }
-"--KETAMA"			        { yyextra->begin= yytext; return KETAMA; }
-"--KETAMA_HASH"			{ yyextra->begin= yytext; return KETAMA_HASH; }
-"--KETAMA-HASH"			{ yyextra->begin= yytext; return KETAMA_HASH; }
+"--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_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; }
-"--POLL_TIMEOUT"			{ yyextra->begin= yytext; return POLL_TIMEOUT; }
-"--POLL-TIMEOUT"			{ yyextra->begin= yytext; return POLL_TIMEOUT; }
+"--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; }
+"--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; }
@@ -154,8 +148,8 @@ 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; }
+"--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; }