X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=inline;f=libmemcached%2Foptions%2Fparser.yy;h=6aa477920ce5259444af0c33ece6eb5164a6e64f;hb=2a34f4dcac48917e41a1b6aee37edbe886aa9f7b;hp=3a7cee2eed170492600305dba1d031c33aee1fa7;hpb=696240873d8c6ca5edc482a7395984aac14d5b32;p=awesomized%2Flibmemcached
diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy
index 3a7cee2e..6aa47792 100644
--- a/libmemcached/options/parser.yy
+++ b/libmemcached/options/parser.yy
@@ -18,65 +18,82 @@
* 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 int 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)
{
-#if 0
- std::cerr << str << std::endl;
-#endif
- return 0;
+ if (not context->end())
+ parser::abort_func(context, error);
}
+int config_parse(Context*, yyscan_t *);
-%}
+void Context::start()
+{
+ config_parse(this, scanner);
+}
-%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
@@ -98,6 +115,9 @@ inline int libmemcached_error(YYLTYPE *locp, type_st *parser, yyscan_t *scanner,
%token USE_UDP
%token VERIFY_KEY
+/* Callbacks */
+%token PREFIX_KEY
+
/* Hash types */
%token MD5
%token CRC
@@ -114,17 +134,25 @@ inline int 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 IDENTIFIER
-%token SERVER_WITH_PORT
+%token HOSTNAME
+%token HOSTNAME_WITH_PORT
%token IPADDRESS
%token IPADDRESS_WITH_PORT
+%token STRING
+%token QUOTED_STRING
+%token FILE_PATH
%type server
+%type string
%type distribution
%type hash
%type behavior_boolean
@@ -132,45 +160,110 @@ inline int libmemcached_error(YYLTYPE *locp, type_st *parser, yyscan_t *scanner,
%%
+begin:
+ statement
+ | begin ' ' statement
+ ;
+
statement:
- DASH_OPTION expression
+ expression
{ }
- | statement ' ' DASH_OPTION 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
+ SERVER server
{
- (void) memcached_server_add_parsed(parser->memc, $3.c_str, $3.length, $3.port, 0);
+ if ((context->rc= memcached_server_add_parsed(context->memc, $2.c_str, $2.length, $2.port, 0)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);
+ }
+ }
+ | SERVERS_OPTION server_list
+ {
}
- | SERVERS '=' server_list
+ | CONFIGURE_FILE string
{
+ memcached_set_configuration_file(context->memc, $2.c_str, $2.length);
}
| behaviors
;
behaviors:
- | DISTRIBUTION '=' distribution
+ PREFIX_KEY string
+ {
+ if ((context->rc= memcached_set_prefix_key(context->memc, $2.c_str, $2.length)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);;
+ }
+ }
+ | 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
{
@@ -245,18 +338,10 @@ behavior_boolean:
{
$$= 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;
@@ -302,22 +387,34 @@ behavior_boolean:
server_list:
server
{
- (void) memcached_server_add_parsed(parser->memc, $1.c_str, $1.length, $1.port, 0);
+ 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
{
- (void) memcached_server_add_parsed(parser->memc, $3.c_str, $3.length, $3.port, 0);
+ if ((context->rc= memcached_server_add_parsed(context->memc, $3.c_str, $3.length, $3.port, 0)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);;
+ }
}
;
server:
- SERVER_WITH_PORT NUMBER
+ HOSTNAME_WITH_PORT NUMBER
{
$$.c_str= $1.c_str;
- $$.length= $1.length -1;
+ $$.length= $1.length -1; // -1 to remove :
$$.port= $2;
}
- | IDENTIFIER
+ | 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;
@@ -326,7 +423,7 @@ server:
| IPADDRESS_WITH_PORT NUMBER
{
$$.c_str= $1.c_str;
- $$.length= $1.length -1;
+ $$.length= $1.length -1; // -1 to remove :
$$.port= $2;
}
| IPADDRESS
@@ -376,6 +473,18 @@ hash:
}
;
+string:
+ STRING
+ {
+ $$= $1;
+ }
+ | QUOTED_STRING
+ {
+ $$.c_str= $1.c_str +1; // +1 to move use passed the initial quote
+ $$.length= $1.length -1; // -1 removes the end quote
+ }
+ ;
+
distribution:
CONSISTENT
{