X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcsl%2Fparser.yy;h=dd9c720b9631009f2ac0277eb51c2f2fdc7ae2ff;hb=92386115b06c66e4aa33850f20df8f88c174e58f;hp=48d4d4e925ee2fc457f7c9cebbf9d364cbe03115;hpb=92c077c9151360149e5a18a0adc222baa234ec80;p=awesomized%2Flibmemcached
diff --git a/libmemcached/csl/parser.yy b/libmemcached/csl/parser.yy
index 48d4d4e9..dd9c720b 100644
--- a/libmemcached/csl/parser.yy
+++ b/libmemcached/csl/parser.yy
@@ -1,23 +1,47 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
*
- * Configure Scripting Language
+ * Libmemcached library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * * The names of its contributors may not be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * Copyright (C) 2011 DataDifferental, http://datadifferential.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
*/
+%{
+
+#include
+
+class Context;
+
+%}
+
%error-verbose
%debug
%defines
@@ -26,16 +50,15 @@
%defines "libmemcached/csl/parser.h"
%lex-param { yyscan_t *scanner }
%name-prefix="config_"
-%parse-param { Context *context }
+%parse-param { class Context *context }
%parse-param { yyscan_t *scanner }
%pure-parser
-%require "2.4"
+%require "2.5"
%start begin
%verbose
%{
-#include
#include
#include
@@ -43,7 +66,14 @@
#include
#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wold-style-cast"
+# pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
+#ifndef __INTEL_COMPILER
+# ifndef __clang__
+# pragma GCC diagnostic ignored "-Wlogical-op"
+# pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
+# endif
#endif
int conf_lex(YYSTYPE* lvalp, void* scanner);
@@ -74,14 +104,14 @@ inline void __config_error(Context *context, yyscan_t *scanner, const char *erro
%token COMMENT
%token END
-%token ERROR
+%token CSL_ERROR
%token RESET
%token PARSER_DEBUG
%token INCLUDE
%token CONFIGURE_FILE
%token EMPTY_LINE
%token SERVER
-%token SOCKET
+%token CSL_SOCKET
%token SERVERS
%token SERVERS_OPTION
%token UNKNOWN_OPTION
@@ -117,6 +147,7 @@ inline void __config_error(Context *context, yyscan_t *scanner, const char *erro
%token _TCP_KEEPALIVE
%token _TCP_KEEPIDLE
%token _TCP_NODELAY
+%token FETCH_VERSION
/* Callbacks */
%token NAMESPACE
@@ -142,13 +173,13 @@ inline void __config_error(Context *context, yyscan_t *scanner, const char *erro
%token RANDOM
/* Boolean values */
-%token TRUE
-%token FALSE
+%token CSL_TRUE
+%token CSL_FALSE
%nonassoc ','
%nonassoc '='
-%token FLOAT
+%token CSL_FLOAT
%token NUMBER
%token PORT
%token WEIGHT_START
@@ -185,7 +216,7 @@ statement:
context->set_end();
YYACCEPT;
}
- | ERROR
+ | CSL_ERROR
{
context->rc= MEMCACHED_PARSE_USER_ERROR;
parser_abort(context, "ERROR called directly");
@@ -211,7 +242,7 @@ statement:
expression:
SERVER HOSTNAME optional_port optional_weight
{
- if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4)))
+ if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, uint32_t($4))))
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", $2.c_str, uint32_t($3));
@@ -221,7 +252,7 @@ expression:
}
| SERVER IPADDRESS optional_port optional_weight
{
- if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4)))
+ if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, uint32_t($4))))
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", $2.c_str, uint32_t($3));
@@ -229,12 +260,12 @@ expression:
}
context->unset_server();
}
- | SOCKET string optional_weight
+ | CSL_SOCKET string optional_weight
{
- if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, $2.c_str, $3)))
+ if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, $2.c_str, uint32_t($3))))
{
char buffer[1024];
- snprintf(buffer, sizeof(buffer), "Failed to add server: %s", $2.c_str);
+ snprintf(buffer, sizeof(buffer), "Failed to add socket: %s", $2.c_str);
parser_abort(context, buffer);
}
}
@@ -244,11 +275,11 @@ expression:
}
| POOL_MIN NUMBER
{
- context->memc->configure.initial_pool_size= $2;
+ context->memc->configure.initial_pool_size= uint32_t($2);
}
| POOL_MAX NUMBER
{
- context->memc->configure.max_pool_size= $2;
+ context->memc->configure.max_pool_size= uint32_t($2);
}
| behaviors
;
@@ -261,11 +292,15 @@ behaviors:
parser_abort(context, "--NAMESPACE can only be called once");
}
- if ((context->rc= memcached_set_namespace(context->memc, $2.c_str, $2.size)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_set_namespace(*context->memc, $2.c_str, $2.size)) != MEMCACHED_SUCCESS)
{
parser_abort(context, memcached_last_error_message(context->memc));
}
}
+ | FETCH_VERSION
+ {
+ memcached_flag(*context->memc, MEMCACHED_FLAG_IS_FETCHING_VERSION, true);
+ }
| DISTRIBUTION distribution
{
// Check to see if DISTRIBUTION has already been set