X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Foptions%2Fparser.yy;h=e950076e1c519af86ec7084f0d954c4c3f04e8e2;hb=de161b27e5e394ea0ae4a88e58fc9ebb21e821d0;hp=00ad06312e06c290caf731d5007e0eb5ece53836;hpb=9da805a13af25708dcf567f15ea7c1acf31462f1;p=awesomized%2Flibmemcached
diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy
index 00ad0631..e950076e 100644
--- a/libmemcached/options/parser.yy
+++ b/libmemcached/options/parser.yy
@@ -18,68 +18,74 @@
* along with this program. If not, see .
*/
+%error-verbose
+%debug
+%defines
+%expect 0
+%output "libmemcached/options/parser.cc"
+%defines "libmemcached/options/parser.h"
+%lex-param { yyscan_t *scanner }
+%name-prefix="config_"
+%parse-param { Context *context }
+%parse-param { yyscan_t *scanner }
+%pure-parser
+%require "2.2"
+%start begin
+%verbose
+
%{
+#include
+
#include
-#include
-#include
+#include
+#include
#include
#include
+#include
+#include
#pragma GCC diagnostic ignored "-Wold-style-cast"
#include
-inline void libmemcached_error(YYLTYPE *locp, type_st *parser, yyscan_t *scanner, const char *str)
+int conf_lex(YYSTYPE* lvalp, void* scanner);
+
+#define parser_abort(A, B) do { parser::abort_func((A), (B)); YYABORT; } while (0)
+
+inline void config_error(Context *context, yyscan_t *scanner, const char *error)
{
- memcached_string_t local_string;
- local_string.size= strlen(str);
- local_string.c_str= str;
- memcached_set_error(parser->memc, MEMCACHED_FAILURE, &local_string);
+ if (not context->end())
+ parser::abort_func(context, error);
}
-
%}
-%error-verbose
-%debug
-%defines
-%expect 0
-%output "libmemcached/options/parser.cc"
-%defines "libmemcached/options/parser.h"
-%lex-param { yyscan_t *scanner }
-%name-prefix="libmemcached_"
-%parse-param { type_st *parser }
-%parse-param { yyscan_t *scanner }
-%locations
-%pure-parser
-%require "2.2"
-%start statement
-%verbose
-
%token COMMENT
+%token END
+%token ERROR
+%token RESET
+%token PARSER_DEBUG
+%token INCLUDE
%token CONFIGURE_FILE
%token EMPTY_LINE
%token SERVER
%token SERVERS
+%token SERVERS_OPTION
+%token UNKNOWN_OPTION
%token UNKNOWN
-%token DASH_OPTION
-
/* All behavior options */
%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
@@ -120,19 +126,23 @@ inline void libmemcached_error(YYLTYPE *locp, type_st *parser, yyscan_t *scanner
%token MODULA
%token RANDOM
+/* Boolean values */
+%token TRUE
+%token FALSE
+
%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
@@ -141,57 +151,116 @@ inline void libmemcached_error(YYLTYPE *locp, type_st *parser, yyscan_t *scanner
%%
+begin:
+ statement
+ | begin ' ' statement
+ ;
+
statement:
- DASH_OPTION expression
- { }
- | statement ' ' DASH_OPTION expression
+ expression
{ }
| COMMENT
{ }
| EMPTY_LINE
{ }
+ | END
+ {
+ context->set_end();
+ YYACCEPT;
+ }
+ | ERROR
+ {
+ context->rc= MEMCACHED_PARSE_USER_ERROR;
+ parser_abort(context, NULL);
+ }
+ | RESET
+ {
+ memcached_reset(context->memc);
+ }
+ | PARSER_DEBUG
+ {
+ yydebug= 1;
+ }
+ | INCLUDE ' ' string
+ {
+ if ((context->rc= memcached_parse_configure_file(context->memc, $3.c_str, $3.length)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);
+ }
+ }
;
expression:
- SERVER '=' server
- {
- (void) memcached_server_add_parsed(parser->memc, $3.c_str, $3.length, $3.port, 0);
+ 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 '=' 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(parser->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
{
- memcached_callback_set(parser->memc, MEMCACHED_CALLBACK_PREFIX_KEY, std::string($3.c_str, $3.length).c_str());
+ if ((context->rc= memcached_set_prefix_key(context->memc, $2.c_str, $2.length)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);;
+ }
}
- | DISTRIBUTION '=' distribution
+ | DISTRIBUTION distribution
{
- memcached_behavior_set(parser->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $3);
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $2)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);;
+ }
}
- | HASH '=' hash
+ | DISTRIBUTION distribution ',' hash
{
- memcached_behavior_set(parser->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $3);
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $2)) != MEMCACHED_SUCCESS)
+ {
+ 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
{
- memcached_behavior_set(parser->memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, $3);
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_HASH, $2)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);;
+ }
}
- | behavior_number '=' NUMBER
+ | behavior_number NUMBER
{
- memcached_behavior_set(parser->memc, $1, $3);
+ if ((context->rc= memcached_behavior_set(context->memc, $1, $2)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);;
+ }
}
| behavior_boolean
{
- memcached_behavior_set(parser->memc, $1, true);
+ if ((context->rc= memcached_behavior_set(context->memc, $1, true)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);;
+ }
}
| USER_DATA
{
@@ -262,26 +331,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;
@@ -320,48 +373,16 @@ behavior_boolean:
}
-server_list:
- server
- {
- (void) memcached_server_add_parsed(parser->memc, $1.c_str, $1.length, $1.port, 0);
- }
- | server_list ',' server
- {
- (void) memcached_server_add_parsed(parser->memc, $3.c_str, $3.length, $3.port, 0);
- }
+optional_port:
+ { }
+ | PORT
+ { };
;
-server:
- HOSTNAME_WITH_PORT NUMBER
- {
- $$.c_str= $1.c_str;
- $$.length= $1.length -1;
- $$.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;
- $$.port= $2;
- }
- | IPADDRESS
- {
- $$.c_str= $1.c_str;
- $$.length= $1.length;
- $$.port= MEMCACHED_DEFAULT_PORT;
- }
+optional_weight:
+ { }
+ | WEIGHT_START
+ { }
;
hash:
@@ -410,8 +431,8 @@ string:
}
| QUOTED_STRING
{
- $$.c_str= $1.c_str +1;
- $$.length= $1.length -2;
+ $$.c_str= $1.c_str +1; // +1 to move use passed the initial quote
+ $$.length= $1.length -1; // -1 removes the end quote
}
;
@@ -429,3 +450,11 @@ distribution:
$$= MEMCACHED_DISTRIBUTION_RANDOM;
}
;
+
+%%
+
+void Context::start()
+{
+ config_parse(this, (void **)scanner);
+}
+