Better error handling.

diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy
index 7c94f987aa09fe45fcf873c35e5c03b740bb31fa..a9021d0b54248fb84c049ddfda73785d610a28cc 100644 (file)
--- a/libmemcached/options/parser.yy
+++ b/libmemcached/options/parser.yy
@@ -68,10 +68,9 @@ inline void libmemcached_error(YYLTYPE *locp, Context *context, yyscan_t *scanne
 %token EMPTY_LINE
 %token SERVER
 %token SERVERS
+%token UNKNOWN_OPTION
 %token UNKNOWN
 
-%token DASH_OPTION
-
 /* All behavior options */
 %token AUTO_EJECT_HOSTS
 %token BINARY_PROTOCOL
@@ -148,9 +147,9 @@ inline void libmemcached_error(YYLTYPE *locp, Context *context, yyscan_t *scanne
 %%
 
 statement:
-         DASH_OPTION expression
+         expression
           { }
-        | statement ' ' DASH_OPTION expression
+        | statement ' ' expression
           { }
         | COMMENT
           { }

diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index 4e9eccc8f5a558889656924056387250dc381ebd..dc6427b27b1f2aaf1ef0c7a14f3d76e9a00827d6 100644 (file)
--- a/libmemcached/options/scanner.l
+++ b/libmemcached/options/scanner.l
@@ -47,7 +47,6 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
 {
   if (context->pos >= context->length)
   {
-    std::cerr << "YY_NULL" << std::endl;
     result= YY_NULL;
   }
   else
@@ -84,85 +83,87 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
 
 [[:digit:]]+ { yylval->number = atoi(yytext); return (NUMBER); }
 
-([[:digit:]]*.[:digit:]+) { yylval->double_number = atof(yytext); return (FLOAT); }
-
 [\t\r\n] ; /* skip whitespace */
 
 ^#.*$ {
       return COMMENT;
     }
 
-"--" { yyextra->begin= yytext; 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; }
-CONFIGURE_FILE                 { return CONFIGURE_FILE; }
-CONFIGURE-FILE                 { return CONFIGURE_FILE; }
-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; }
-
-PREFIX-KEY                             { return PREFIX_KEY; }
-PREFIX_KEY                             { return PREFIX_KEY; }
+"--SERVER"                          { yyextra->begin= yytext; return SERVER; }
+"--SERVERS"                        { yyextra->begin= yytext; return SERVERS; }
+
+"--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; }
+"--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; }
+
+"--"[[:alnum:]]*   {
+      std::cerr << "Started at " << yytext << std::endl;
+      yyextra->begin= yytext;
+      return UNKNOWN_OPTION;
+    }
 
 CONSISTENT      { return CONSISTENT; }
 MODULA          { return MODULA; }
@@ -215,6 +216,7 @@ JENKINS                     { return JENKINS; }
     }
 
 .   {
+      yyextra->begin= yytext;
       return UNKNOWN;
     }
 

diff --git a/libmemcached/options/symbol.h b/libmemcached/options/symbol.h
index d48a5a2962bceac182d07a24fb195a762277ba10..e4c58b94f266e5db365356667967e8362954640b 100644 (file)
--- a/libmemcached/options/symbol.h
+++ b/libmemcached/options/symbol.h
@@ -45,6 +45,7 @@ union YYSTYPE
 {
   long long number;  
   string_t string;
+  string_t option;
   server_t server;
   double double_number;
   memcached_server_distribution_t distribution;