projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in fixes for deprecated bits in behavior.
[awesomized/libmemcached]
/
libmemcached
/
options
/
parser.yy
diff --git
a/libmemcached/options/parser.yy
b/libmemcached/options/parser.yy
index 6aa477920ce5259444af0c33ece6eb5164a6e64f..e61f69ca892e479f58f57a80636d9cb789b4ef24 100644
(file)
--- a/
libmemcached/options/parser.yy
+++ b/
libmemcached/options/parser.yy
@@
-59,13
+59,6
@@
inline void config_error(Context *context, yyscan_t *scanner, const char *error)
parser::abort_func(context, error);
}
parser::abort_func(context, error);
}
-int config_parse(Context*, yyscan_t *);
-
-void Context::start()
-{
- config_parse(this, scanner);
-}
-
%}
%token COMMENT
%}
%token COMMENT
@@
-86,7
+79,6
@@
void Context::start()
%token AUTO_EJECT_HOSTS
%token BINARY_PROTOCOL
%token BUFFER_REQUESTS
%token AUTO_EJECT_HOSTS
%token BINARY_PROTOCOL
%token BUFFER_REQUESTS
-%token CACHE_LOOKUPS
%token CONNECT_TIMEOUT
%token DISTRIBUTION
%token HASH
%token CONNECT_TIMEOUT
%token DISTRIBUTION
%token HASH
@@
-334,10
+326,6
@@
behavior_boolean:
{
$$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
}
{
$$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
}
- | CACHE_LOOKUPS
- {
- $$= MEMCACHED_BEHAVIOR_CACHE_LOOKUPS;
- }
| HASH_WITH_PREFIX_KEY
{
$$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
| HASH_WITH_PREFIX_KEY
{
$$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
@@
-499,3
+487,11
@@
distribution:
$$= MEMCACHED_DISTRIBUTION_RANDOM;
}
;
$$= MEMCACHED_DISTRIBUTION_RANDOM;
}
;
+
+%%
+
+void Context::start()
+{
+ config_parse(this, (void **)scanner);
+}
+