projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
cmake: build success
[m6w6/libmemcached]
/
libmemcached
/
csl
/
parser.yy
diff --git
a/libmemcached/csl/parser.yy
b/libmemcached/csl/parser.yy
index e70bba975a12da3c11768d4da92153bbde87eb19..87fe4f3b4f9b706cbf429f166fdafd428562b1fd 100644
(file)
--- a/
libmemcached/csl/parser.yy
+++ b/
libmemcached/csl/parser.yy
@@
-34,24
+34,30
@@
*
*/
*
*/
-%error-verbose
+%{
+
+#include <libmemcached/csl/common.h>
+
+class Context;
+
+%}
+
+%define parse.error verbose
+%define api.pure
+%define api.prefix {config_}
+%define api.value.type {union CONFIG_STYPE}
%debug
%defines
%expect 0
%debug
%defines
%expect 0
-%output "libmemcached/csl/parser.cc"
-%defines "libmemcached/csl/parser.h"
%lex-param { yyscan_t *scanner }
%lex-param { yyscan_t *scanner }
-%name-prefix="config_"
-%parse-param { Context *context }
+%parse-param { class Context *context }
%parse-param { yyscan_t *scanner }
%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,27
+65,34
@@
#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
+# ifndef __clang__
+# pragma GCC diagnostic ignored "-Wlogical-op"
+# pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
+# endif
#endif
#endif
-int conf_lex(YYSTYPE* lvalp, void* scanner);
+int conf
ig
_lex(YYSTYPE* lvalp, void* scanner);
#define select_yychar(__context) yychar == UNKNOWN ? ( (__context)->previous_token == END ? UNKNOWN : (__context)->previous_token ) : yychar
#define stryytname(__yytokentype) ((__yytokentype) < YYNTOKENS ) ? yytname[(__yytokentype)] : ""
#define select_yychar(__context) yychar == UNKNOWN ? ( (__context)->previous_token == END ? UNKNOWN : (__context)->previous_token ) : yychar
#define stryytname(__yytokentype) ((__yytokentype) < YYNTOKENS ) ? yytname[(__yytokentype)] : ""
-#define parser_abort(__context, __error_message) do { (__context)->abort((__error_message),
yytokentype(select_yychar(__context)), stryytname(YYTRANSLATE(select_yychar(__context)))); YYABORT; } while (0)
+#define parser_abort(__context, __error_message) do { (__context)->abort((__error_message),
config_tokentype(select_yychar(__context)), stryytname(YYTRANSLATE(select_yychar(__context)))); YYABORT; } while (0)
// This is bison calling error.
inline void __config_error(Context *context, yyscan_t *scanner, const char *error, int last_token, const char *last_token_str)
{
if (not context->end())
{
// This is bison calling error.
inline void __config_error(Context *context, yyscan_t *scanner, const char *error, int last_token, const char *last_token_str)
{
if (not context->end())
{
- context->error(error,
yy
tokentype(last_token), last_token_str);
+ context->error(error,
config_
tokentype(last_token), last_token_str);
}
else
{
}
else
{
- context->error(error,
yy
tokentype(last_token), last_token_str);
+ context->error(error,
config_
tokentype(last_token), last_token_str);
}
}
}
}
@@
-90,14
+103,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
@@
-159,13
+172,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
@@
-202,7
+215,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");
@@
-228,7
+241,7
@@
statement:
expression:
SERVER HOSTNAME optional_port optional_weight
{
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));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", $2.c_str, uint32_t($3));
@@
-238,7
+251,7
@@
expression:
}
| SERVER IPADDRESS optional_port optional_weight
{
}
| 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));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", $2.c_str, uint32_t($3));
@@
-246,12
+259,12
@@
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,
$3
)))
+ if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, $2.c_str,
uint32_t($3)
)))
{
char buffer[1024];
{
char buffer[1024];
- snprintf(buffer, sizeof(buffer), "Failed to add s
erver
: %s", $2.c_str);
+ snprintf(buffer, sizeof(buffer), "Failed to add s
ocket
: %s", $2.c_str);
parser_abort(context, buffer);
}
}
parser_abort(context, buffer);
}
}
@@
-261,11
+274,11
@@
expression:
}
| POOL_MIN NUMBER
{
}
| POOL_MIN NUMBER
{
- context->memc->configure.initial_pool_size=
$2
;
+ context->memc->configure.initial_pool_size=
uint32_t($2)
;
}
| POOL_MAX NUMBER
{
}
| POOL_MAX NUMBER
{
- context->memc->configure.max_pool_size=
$2
;
+ context->memc->configure.max_pool_size=
uint32_t($2)
;
}
| behaviors
;
}
| behaviors
;
@@
-278,7
+291,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));
}