projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Adding additional tests for namespace.
[awesomized/libmemcached]
/
libmemcached
/
options
/
parser.yy
diff --git
a/libmemcached/options/parser.yy
b/libmemcached/options/parser.yy
index 66428b8997cc4af8908607ff831e0ea920c05ba1..f9d1f1e2a5d72cd1dd978b2612e0ba9224db68a3 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
%parse-param { Context *context }
%parse-param { yyscan_t *scanner }
%pure-parser
-%require "2.
2
"
+%require "2.
4
"
%start begin
%verbose
%{
%start begin
%verbose
%{
-#include <config.h>
-
-#include <stdint.h>
-
#include <libmemcached/common.h>
#include <libmemcached/options.hpp>
#include <libmemcached/common.h>
#include <libmemcached/options.hpp>
@@
-215,9
+211,9
@@
expression:
}
context->unset_server();
}
}
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);
}
{
parser_abort(context, NULL);
}
@@
-449,8
+445,7
@@
string:
}
| QUOTED_STRING
{
}
| QUOTED_STRING
{
- $$.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
+ $$= $1;
}
;
}
;