projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix need for permissive.-------------- This line and the following will be ignored...
[awesomized/libmemcached]
/
libmemcached
/
options
/
parser.yy
diff --git
a/libmemcached/options/parser.yy
b/libmemcached/options/parser.yy
index 31371c1b6e388f3975d925e73b86c3499c7f74ed..db311402b45c7795908d6b447c11d0cdd6417e43 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
@@
-88,14
+81,12
@@
void Context::start()
%token BUFFER_REQUESTS
%token CACHE_LOOKUPS
%token CONNECT_TIMEOUT
%token BUFFER_REQUESTS
%token CACHE_LOOKUPS
%token CONNECT_TIMEOUT
-%token _CORK
%token DISTRIBUTION
%token HASH
%token HASH_WITH_PREFIX_KEY
%token IO_BYTES_WATERMARK
%token IO_KEY_PREFETCH
%token IO_MSG_WATERMARK
%token DISTRIBUTION
%token HASH
%token HASH_WITH_PREFIX_KEY
%token IO_BYTES_WATERMARK
%token IO_KEY_PREFETCH
%token IO_MSG_WATERMARK
-%token KETAMA
%token KETAMA_HASH
%token KETAMA_WEIGHTED
%token NOREPLY
%token KETAMA_HASH
%token KETAMA_WEIGHTED
%token NOREPLY
@@
-203,19
+194,19
@@
statement:
expression:
expression:
- SERVER
'='
server
+ SERVER server
{
{
- if ((context->rc= memcached_server_add_parsed(context->memc, $
3.c_str, $3.length, $3
.port, 0)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_server_add_parsed(context->memc, $
2.c_str, $2.length, $2
.port, 0)) != MEMCACHED_SUCCESS)
{
parser_abort(context, NULL);
}
}
{
parser_abort(context, NULL);
}
}
- | SERVERS_OPTION
'='
server_list
+ | SERVERS_OPTION server_list
{
}
{
}
- | CONFIGURE_FILE
'='
string
+ | CONFIGURE_FILE string
{
{
- memcached_set_configuration_file(context->memc, $
3.c_str, $3
.length);
+ memcached_set_configuration_file(context->memc, $
2.c_str, $2
.length);
}
| behaviors
;
}
| behaviors
;
@@
-235,23
+226,27
@@
behaviors:
parser_abort(context, NULL);;
}
}
parser_abort(context, NULL);;
}
}
- |
HASH
hash
+ |
DISTRIBUTION distribution ','
hash
{
{
- if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_
HASH
, $2)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_
DISTRIBUTION
, $2)) != MEMCACHED_SUCCESS)
{
{
- parser_abort(context, NULL);;
+ parser_abort(context, NULL);;
+ }
+ if ((context->rc= memcached_behavior_set_distribution_hash(context->memc, $4)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);;
}
}
}
}
- |
KETAMA_
HASH hash
+ | HASH hash
{
{
- if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_
KETAMA_
HASH, $2)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_HASH, $2)) != MEMCACHED_SUCCESS)
{
{
- parser_abort(context, NULL);;
+ parser_abort(context, NULL);;
}
}
}
}
- | behavior_number
'='
NUMBER
+ | behavior_number NUMBER
{
{
- if ((context->rc= memcached_behavior_set(context->memc, $1, $
3
)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_behavior_set(context->memc, $1, $
2
)) != MEMCACHED_SUCCESS)
{
parser_abort(context, NULL);;
}
{
parser_abort(context, NULL);;
}
@@
-336,18
+331,10
@@
behavior_boolean:
{
$$= MEMCACHED_BEHAVIOR_CACHE_LOOKUPS;
}
{
$$= MEMCACHED_BEHAVIOR_CACHE_LOOKUPS;
}
- | _CORK
- {
- $$= MEMCACHED_BEHAVIOR_CORK;
- }
| HASH_WITH_PREFIX_KEY
{
$$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
}
| HASH_WITH_PREFIX_KEY
{
$$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
}
- | KETAMA
- {
- $$= MEMCACHED_BEHAVIOR_KETAMA;
- }
| KETAMA_WEIGHTED
{
$$= MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED;
| KETAMA_WEIGHTED
{
$$= MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED;
@@
-505,3
+492,11
@@
distribution:
$$= MEMCACHED_DISTRIBUTION_RANDOM;
}
;
$$= MEMCACHED_DISTRIBUTION_RANDOM;
}
;
+
+%%
+
+void Context::start()
+{
+ config_parse(this, (void **)scanner);
+}
+