X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions%2Fparser.yy;h=d309c2278e0b6691c732cf7e35610390036815d0;hb=f285e1b3821f56a8983b5ce9fb1a0070e7bb0a1c;hp=adf3dc019bc41f7324604c7950a465684d711571;hpb=a375dd4beaabf4a8263ec0eaf6a686661e58a2b0;p=awesomized%2Flibmemcached diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy index adf3dc01..d309c227 100644 --- a/libmemcached/options/parser.yy +++ b/libmemcached/options/parser.yy @@ -25,7 +25,7 @@ %output "libmemcached/options/parser.cc" %defines "libmemcached/options/parser.h" %lex-param { yyscan_t *scanner } -%name-prefix="libmemcached_" +%name-prefix="config_" %parse-param { Context *context } %parse-param { yyscan_t *scanner } %pure-parser @@ -42,47 +42,20 @@ #include #include #include +#include +#include #pragma GCC diagnostic ignored "-Wold-style-cast" #include -int libmemcached_lex(YYSTYPE* lvalp, void* scanner); +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 parser_abort_func(Context *context, const char *error) -{ - (void)error; - if (context->rc == MEMCACHED_SUCCESS) - context->rc= MEMCACHED_PARSE_ERROR; - - std::string error_message; - error_message+= "Error occured while parsing: "; - error_message+= context->begin; - error_message+= " ("; - if (context->rc == MEMCACHED_PARSE_ERROR and error) - { - error_message+= error; - } - else - { - error_message+= memcached_strerror(NULL, context->rc); - } - error_message+= ")"; - - memcached_set_error_string(context->memc, context->rc, error_message.c_str(), error_message.size()); -} - -inline void libmemcached_error(Context *context, yyscan_t *scanner, const char *error) +inline void config_error(Context *context, yyscan_t *scanner, const char *error) { if (not context->end()) - parser_abort_func(context, error); -} - -int libmemcached_parse(Context*, yyscan_t *); -void Context::start() -{ - libmemcached_parse(this, scanner); + context->abort(error); } %} @@ -105,16 +78,13 @@ void Context::start() %token AUTO_EJECT_HOSTS %token BINARY_PROTOCOL %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 KETAMA %token KETAMA_HASH %token KETAMA_WEIGHTED %token NOREPLY @@ -162,17 +132,16 @@ void Context::start() %nonassoc ',' %nonassoc '=' -%token NUMBER %token FLOAT -%token HOSTNAME -%token HOSTNAME_WITH_PORT -%token IPADDRESS -%token IPADDRESS_WITH_PORT +%token NUMBER +%token PORT +%token WEIGHT_START +%token IPADDRESS +%token HOSTNAME %token STRING %token QUOTED_STRING %token FILE_PATH -%type server %type string %type distribution %type hash @@ -222,55 +191,65 @@ statement: expression: - SERVER '=' server - { - if ((context->rc= memcached_server_add_parsed(context->memc, $3.c_str, $3.length, $3.port, 0)) != MEMCACHED_SUCCESS) + SERVER HOSTNAME optional_port optional_weight + { + if ((context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $2.port, $2.weight)) != MEMCACHED_SUCCESS) { parser_abort(context, NULL); } + context->unset_server(); } - | SERVERS_OPTION '=' server_list + | SERVER IPADDRESS optional_port optional_weight { + if ((context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $2.port, $2.weight)) != MEMCACHED_SUCCESS) + { + parser_abort(context, NULL); + } + context->unset_server(); } - | 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: - PREFIX_KEY '=' string + PREFIX_KEY string { - if ((context->rc= memcached_callback_set(context->memc, MEMCACHED_CALLBACK_PREFIX_KEY, std::string($3.c_str, $3.length).c_str())) != MEMCACHED_SUCCESS) + if ((context->rc= memcached_set_prefix_key(context->memc, $2.c_str, $2.length)) != MEMCACHED_SUCCESS) { parser_abort(context, NULL);; } } - | DISTRIBUTION '=' distribution + | DISTRIBUTION distribution { - if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $3)) != MEMCACHED_SUCCESS) + if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $2)) != MEMCACHED_SUCCESS) { parser_abort(context, NULL);; } } - | HASH '=' hash + | DISTRIBUTION distribution ',' hash { - if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_HASH, $3)) != 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, $3)) != 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);; } @@ -351,26 +330,10 @@ behavior_boolean: { $$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS; } - | CACHE_LOOKUPS - { - $$= MEMCACHED_BEHAVIOR_CACHE_LOOKUPS; - } - | _CORK - { - $$= MEMCACHED_BEHAVIOR_CORK; - } | HASH_WITH_PREFIX_KEY { $$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY; } - | KETAMA - { - $$= MEMCACHED_BEHAVIOR_KETAMA; - } - | KETAMA_WEIGHTED - { - $$= MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED; - } | NOREPLY { $$= MEMCACHED_BEHAVIOR_NOREPLY; @@ -409,54 +372,16 @@ behavior_boolean: } -server_list: - server - { - if ((context->rc= memcached_server_add_parsed(context->memc, $1.c_str, $1.length, $1.port, 0)) != MEMCACHED_SUCCESS) - { - parser_abort(context, NULL);; - } - } - | server_list ',' server - { - if ((context->rc= memcached_server_add_parsed(context->memc, $3.c_str, $3.length, $3.port, 0)) != MEMCACHED_SUCCESS) - { - parser_abort(context, NULL);; - } - } +optional_port: + { } + | PORT + { }; ; -server: - HOSTNAME_WITH_PORT NUMBER - { - $$.c_str= $1.c_str; - $$.length= $1.length -1; // -1 to remove : - $$.port= $2; - } - | HOSTNAME - { - $$.c_str= $1.c_str; - $$.length= $1.length; - $$.port= MEMCACHED_DEFAULT_PORT; - } - | STRING /* a match can be against "localhost" which is just a string */ - { - $$.c_str= $1.c_str; - $$.length= $1.length; - $$.port= MEMCACHED_DEFAULT_PORT; - } - | IPADDRESS_WITH_PORT NUMBER - { - $$.c_str= $1.c_str; - $$.length= $1.length -1; // -1 to remove : - $$.port= $2; - } - | IPADDRESS - { - $$.c_str= $1.c_str; - $$.length= $1.length; - $$.port= MEMCACHED_DEFAULT_PORT; - } +optional_weight: + { } + | WEIGHT_START + { } ; hash: @@ -524,3 +449,11 @@ distribution: $$= MEMCACHED_DISTRIBUTION_RANDOM; } ; + +%% + +void Context::start() +{ + config_parse(this, (void **)scanner); +} +