Update chop rule.

[awesomized/libmemcached] / libmemcached / options / parser.yy

diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy
index d309c2278e0b6691c732cf7e35610390036815d0..81415226e82e002e49b947de5645abd11df9b3f9 100644 (file)
--- a/libmemcached/options/parser.yy
+++ b/libmemcached/options/parser.yy
@@ -29,24 +29,22 @@
 %parse-param { Context *context }
 %parse-param { yyscan_t *scanner }
 %pure-parser
-%require "2.2"
+%require "2.4"
 %start begin
 %verbose
 
 %{
 
-#include <config.h>
-
-#include <stdint.h>
+#include <libmemcached/common.h>
+#include <libmemcached/options.hpp>
 
 #include <libmemcached/options/context.h>
-#include <libmemcached/options/string.h>
 #include <libmemcached/options/symbol.h>
-#include <libmemcached/visibility.h>
-#include <libmemcached/prefix_key.h>
+#include <libmemcached/options/scanner.h>
+
+#include <iostream>
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
-#include <libmemcached/options/scanner.h>
 
 int conf_lex(YYSTYPE* lvalp, void* scanner);
 
@@ -69,19 +67,19 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error)
 %token CONFIGURE_FILE
 %token EMPTY_LINE
 %token SERVER
+%token SOCKET
 %token SERVERS
 %token SERVERS_OPTION
 %token UNKNOWN_OPTION
 %token UNKNOWN
 
 /* All behavior options */
-%token AUTO_EJECT_HOSTS
 %token BINARY_PROTOCOL
 %token BUFFER_REQUESTS
 %token CONNECT_TIMEOUT
 %token DISTRIBUTION
 %token HASH
-%token HASH_WITH_PREFIX_KEY
+%token HASH_WITH_NAMESPACE
 %token IO_BYTES_WATERMARK
 %token IO_KEY_PREFETCH
 %token IO_MSG_WATERMARK
@@ -92,22 +90,26 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error)
 %token POLL_TIMEOUT
 %token RANDOMIZE_REPLICA_READ
 %token RCV_TIMEOUT
+%token REMOVE_FAILED_SERVERS
 %token RETRY_TIMEOUT
-%token SERVER_FAILURE_LIMIT
 %token SND_TIMEOUT
 %token SOCKET_RECV_SIZE
 %token SOCKET_SEND_SIZE
 %token SORT_HOSTS
 %token SUPPORT_CAS
-%token _TCP_NODELAY
-%token _TCP_KEEPALIVE
-%token _TCP_KEEPIDLE
 %token USER_DATA
 %token USE_UDP
 %token VERIFY_KEY
+%token _TCP_KEEPALIVE
+%token _TCP_KEEPIDLE
+%token _TCP_NODELAY
 
 /* Callbacks */
-%token PREFIX_KEY
+%token NAMESPACE
+
+/* Pool */
+%token POOL_MIN
+%token POOL_MAX
 
 /* Hash types */
 %token MD5
@@ -134,19 +136,21 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error)
 
 %token <number> FLOAT
 %token <number> NUMBER
-%token PORT
-%token WEIGHT_START
+%token <number> PORT
+%token <number> WEIGHT_START
 %token <server> IPADDRESS
 %token <server> HOSTNAME
 %token <string> STRING
 %token <string> QUOTED_STRING
 %token <string> FILE_PATH
 
-%type <string> string
-%type <distribution> distribution
-%type <hash> hash
 %type <behavior> behavior_boolean
 %type <behavior> behavior_number
+%type <distribution> distribution
+%type <hash> hash
+%type <number> optional_port
+%type <number> optional_weight
+%type <string> string
 
 %%
 
@@ -182,7 +186,7 @@ statement:
           }
         | INCLUDE ' ' string
           {
-            if ((context->rc= memcached_parse_configure_file(context->memc, $3.c_str, $3.length)) != MEMCACHED_SUCCESS)
+            if ((context->rc= memcached_parse_configure_file(*context->memc, $3.c_str, $3.size)) != MEMCACHED_SUCCESS)
             {
               parser_abort(context, NULL);
             }
@@ -193,7 +197,7 @@ statement:
 expression:
           SERVER HOSTNAME optional_port optional_weight
           {
-            if ((context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $2.port, $2.weight)) != MEMCACHED_SUCCESS)
+            if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4)))
             {
               parser_abort(context, NULL);
             }
@@ -201,23 +205,38 @@ expression:
           }
         | SERVER IPADDRESS optional_port optional_weight
           {
-            if ((context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $2.port, $2.weight)) != MEMCACHED_SUCCESS)
+            if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4)))
             {
               parser_abort(context, NULL);
             }
             context->unset_server();
           }
+        | SOCKET string optional_weight
+          {
+            if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, $2.c_str, $3)))
+            {
+              parser_abort(context, NULL);
+            }
+          }
         | CONFIGURE_FILE string
           {
-            memcached_set_configuration_file(context->memc, $2.c_str, $2.length);
+            memcached_set_configuration_file(context->memc, $2.c_str, $2.size);
+          }
+        | POOL_MIN NUMBER
+          {
+            context->memc->configure.initial_pool_size= $2;
+          }
+        | POOL_MAX NUMBER
+          {
+            context->memc->configure.max_pool_size= $2;
           }
         | behaviors
         ;
 
 behaviors:
-          PREFIX_KEY string
+          NAMESPACE string
           {
-            if ((context->rc= memcached_set_prefix_key(context->memc, $2.c_str, $2.length)) != MEMCACHED_SUCCESS)
+            if ((context->rc= memcached_set_namespace(context->memc, $2.c_str, $2.size)) != MEMCACHED_SUCCESS)
             {
               parser_abort(context, NULL);;
             }
@@ -267,7 +286,11 @@ behaviors:
         ;
 
 behavior_number:
-          CONNECT_TIMEOUT
+          REMOVE_FAILED_SERVERS
+          {
+            $$= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS;
+          }
+        | CONNECT_TIMEOUT
           {
             $$= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
           }
@@ -299,10 +322,6 @@ behavior_number:
           {
             $$= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
           }
-        |  SERVER_FAILURE_LIMIT
-          {
-            $$= MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT;
-          }
         |  SND_TIMEOUT
           {
             $$= MEMCACHED_BEHAVIOR_SND_TIMEOUT;
@@ -318,11 +337,7 @@ behavior_number:
         ;
 
 behavior_boolean: 
-          AUTO_EJECT_HOSTS
-          {
-            $$= MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS;
-          }
-        | BINARY_PROTOCOL
+          BINARY_PROTOCOL
           {
             $$= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
           }
@@ -330,7 +345,7 @@ behavior_boolean:
           {
             $$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
           }
-        | HASH_WITH_PREFIX_KEY
+        | HASH_WITH_NAMESPACE
           {
             $$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
           }
@@ -373,13 +388,13 @@ behavior_boolean:
 
 
 optional_port:
-          { }
+          { $$= MEMCACHED_DEFAULT_PORT;}
         | PORT
           { };
         ;
 
 optional_weight:
-          { }
+          { $$= 1; }
         | WEIGHT_START
           { }
         ;
@@ -430,8 +445,11 @@ string:
           }
         | QUOTED_STRING
           {
+            $$= $1;
+            #if 0
             $$.c_str= $1.c_str +1; // +1 to move use passed the initial quote
-            $$.length= $1.length -1; // -1 removes the end quote
+            $$.size= $1.size -2; // -2 removes the begin and end quote
+            #endif
           }
         ;