projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-467
[m6w6/libmemcached]
/
libmemcached
/
csl
/
parser.yy
diff --git
a/libmemcached/csl/parser.yy
b/libmemcached/csl/parser.yy
index 486fb4b346efa9ddf0dc60126908fb5d83ed778e..dd9c720b9631009f2ac0277eb51c2f2fdc7ae2ff 100644
(file)
--- a/
libmemcached/csl/parser.yy
+++ b/
libmemcached/csl/parser.yy
@@
-34,6
+34,14
@@
*
*/
*
*/
+%{
+
+#include <libmemcached/csl/common.h>
+
+class Context;
+
+%}
+
%error-verbose
%debug
%defines
%error-verbose
%debug
%defines
@@
-42,16
+50,15
@@
%defines "libmemcached/csl/parser.h"
%lex-param { yyscan_t *scanner }
%name-prefix="config_"
%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
%parse-param { yyscan_t *scanner }
%pure-parser
-%require "2.
4
"
+%require "2.
5
"
%start begin
%verbose
%{
%start begin
%verbose
%{
-#include <libmemcached/csl/common.h>
#include <libmemcached/options.hpp>
#include <libmemcached/csl/context.h>
#include <libmemcached/options.hpp>
#include <libmemcached/csl/context.h>
@@
-59,13
+66,14
@@
#include <libmemcached/csl/scanner.h>
#ifndef __INTEL_COMPILER
#include <libmemcached/csl/scanner.h>
#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wold-style-cast"
+#
pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#ifndef __INTEL_COMPILER
#endif
#ifndef __INTEL_COMPILER
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wlogical-op"
-#endif
+# ifndef __clang__
+# pragma GCC diagnostic ignored "-Wlogical-op"
+# pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
+# endif
#endif
int conf_lex(YYSTYPE* lvalp, void* scanner);
#endif
int conf_lex(YYSTYPE* lvalp, void* scanner);
@@
-96,14
+104,14
@@
inline void __config_error(Context *context, yyscan_t *scanner, const char *erro
%token COMMENT
%token END
%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 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
%token SERVERS
%token SERVERS_OPTION
%token UNKNOWN_OPTION
@@
-165,13
+173,13
@@
inline void __config_error(Context *context, yyscan_t *scanner, const char *erro
%token RANDOM
/* Boolean values */
%token RANDOM
/* Boolean values */
-%token <boolean> TRUE
-%token <boolean> FALSE
+%token <boolean>
CSL_
TRUE
+%token <boolean>
CSL_
FALSE
%nonassoc ','
%nonassoc '='
%nonassoc ','
%nonassoc '='
-%token <number> FLOAT
+%token <number>
CSL_
FLOAT
%token <number> NUMBER
%token <number> PORT
%token <number> WEIGHT_START
%token <number> NUMBER
%token <number> PORT
%token <number> WEIGHT_START
@@
-208,7
+216,7
@@
statement:
context->set_end();
YYACCEPT;
}
context->set_end();
YYACCEPT;
}
- | ERROR
+ |
CSL_
ERROR
{
context->rc= MEMCACHED_PARSE_USER_ERROR;
parser_abort(context, "ERROR called directly");
{
context->rc= MEMCACHED_PARSE_USER_ERROR;
parser_abort(context, "ERROR called directly");
@@
-252,7
+260,7
@@
expression:
}
context->unset_server();
}
}
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, uint32_t($3))))
{
{
if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, $2.c_str, uint32_t($3))))
{
@@
-284,7
+292,7
@@
behaviors:
parser_abort(context, "--NAMESPACE can only be called once");
}
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));
}
{
parser_abort(context, memcached_last_error_message(context->memc));
}