Merge in pid/ping status.

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

diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy
index 66428b8997cc4af8908607ff831e0ea920c05ba1..81415226e82e002e49b947de5645abd11df9b3f9 100644 (file)
--- a/libmemcached/options/parser.yy
+++ b/libmemcached/options/parser.yy
@@ -29,16 +29,12 @@
 %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>
 
@@ -215,9 +211,9 @@ expression:
             }
             context->unset_server();
           }
-        | SOCKET string
+        | SOCKET string optional_weight
           {
-            if (memcached_failed(context->rc= memcached_server_add_unix_socket(context->memc, $2.c_str)))
+            if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, $2.c_str, $3)))
             {
               parser_abort(context, NULL);
             }
@@ -449,8 +445,11 @@ string:
           }
         | QUOTED_STRING
           {
+            $$= $1;
+            #if 0
             $$.c_str= $1.c_str +1; // +1 to move use passed the initial quote
             $$.size= $1.size -2; // -2 removes the begin and end quote
+            #endif
           }
         ;