Additional doc updates.

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

diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy
index e950076e1c519af86ec7084f0d954c4c3f04e8e2..a628ac22968f3dd0b9f495184fd10c08fbcac8ba 100644 (file)
--- a/libmemcached/options/parser.yy
+++ b/libmemcached/options/parser.yy
@@ -40,7 +40,6 @@
 #include <stdint.h>
 
 #include <libmemcached/options/context.h>
-#include <libmemcached/options/build.h>
 #include <libmemcached/options/string.h>
 #include <libmemcached/options/symbol.h>
 #include <libmemcached/visibility.h>
@@ -51,12 +50,12 @@
 
 int conf_lex(YYSTYPE* lvalp, void* scanner);
 
-#define parser_abort(A, B) do { parser::abort_func((A), (B)); YYABORT; } while (0) 
+#define parser_abort(A, B) do { (A)->abort((B)); YYABORT; } while (0) 
 
 inline void config_error(Context *context, yyscan_t *scanner, const char *error)
 {
   if (not context->end())
-    parser::abort_func(context, error);
+    context->abort(error);
 }
 
 %}
@@ -76,7 +75,6 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error)
 %token UNKNOWN
 
 /* All behavior options */
-%token AUTO_EJECT_HOSTS
 %token BINARY_PROTOCOL
 %token BUFFER_REQUESTS
 %token CONNECT_TIMEOUT
@@ -93,19 +91,19 @@ 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
@@ -268,7 +266,11 @@ behaviors:
         ;
 
 behavior_number:
-          CONNECT_TIMEOUT
+          REMOVE_FAILED_SERVERS
+          {
+            $$= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS;
+          }
+        | CONNECT_TIMEOUT
           {
             $$= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
           }
@@ -300,10 +302,6 @@ behavior_number:
           {
             $$= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
           }
-        |  SERVER_FAILURE_LIMIT
-          {
-            $$= MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT;
-          }
         |  SND_TIMEOUT
           {
             $$= MEMCACHED_BEHAVIOR_SND_TIMEOUT;
@@ -319,11 +317,7 @@ behavior_number:
         ;
 
 behavior_boolean: 
-          AUTO_EJECT_HOSTS
-          {
-            $$= MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS;
-          }
-        | BINARY_PROTOCOL
+          BINARY_PROTOCOL
           {
             $$= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
           }