X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcsl%2Fparser.yy;h=4fed2754d84ac3dcf728e305757abc85d9449bb5;hb=0ce6b69e0f8e25e50bd878678b1444651093bac4;hp=48d4d4e925ee2fc457f7c9cebbf9d364cbe03115;hpb=694f0966e3980f448c0ca9f9504e6d065e35654f;p=m6w6%2Flibmemcached
diff --git a/libmemcached/csl/parser.yy b/libmemcached/csl/parser.yy
index 48d4d4e9..4fed2754 100644
--- a/libmemcached/csl/parser.yy
+++ b/libmemcached/csl/parser.yy
@@ -1,21 +1,37 @@
/* 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 .
*/
%error-verbose
@@ -46,6 +62,12 @@
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
+#ifndef __INTEL_COMPILER
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wlogical-op"
+#endif
+#endif
+
int conf_lex(YYSTYPE* lvalp, void* scanner);
#define select_yychar(__context) yychar == UNKNOWN ? ( (__context)->previous_token == END ? UNKNOWN : (__context)->previous_token ) : yychar
@@ -74,14 +96,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 +139,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 +165,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 +208,7 @@ statement:
context->set_end();
YYACCEPT;
}
- | ERROR
+ | CSL_ERROR
{
context->rc= MEMCACHED_PARSE_USER_ERROR;
parser_abort(context, "ERROR called directly");
@@ -211,7 +234,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 +244,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 +252,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 +267,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
;
@@ -266,6 +289,10 @@ behaviors:
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