projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix case where --socket was not always been stored correctly.
[m6w6/libmemcached]
/
libmemcached
/
csl
/
scanner.l
diff --git
a/libmemcached/csl/scanner.l
b/libmemcached/csl/scanner.l
index 8e404b5f9531aa3bd659be5ff3c3de853059bd72..c5ae5cefb4e0e0f61004f6b559393ea65cb6f1c0 100644
(file)
--- a/
libmemcached/csl/scanner.l
+++ b/
libmemcached/csl/scanner.l
@@
-49,8
+49,6
@@
#pragma GCC diagnostic ignored "-Wmissing-declarations"
#endif
#pragma GCC diagnostic ignored "-Wmissing-declarations"
#endif
-#define YY_NO_INPUT
-
#define YY_EXTRA_TYPE Context*
}
#define YY_EXTRA_TYPE Context*
}
@@
-77,6
+75,10
@@
} \
}
} \
}
+#define YY_FATAL_ERROR(msg) \
+{ \
+}
+
#define YY_INPUT(buffer, result, max_size) get_lex_chars(buffer, result, max_size, PARAM)
#define YY_INPUT(buffer, result, max_size) get_lex_chars(buffer, result, max_size, PARAM)
@@
-84,14
+86,16
@@
%option 8bit
%option bison-bridge
%option 8bit
%option bison-bridge
+%option never-interactive
%option case-insensitive
%option case-insensitive
-%option
debug
+%option
noinput
%option nounput
%option noyywrap
%option outfile="libmemcached/csl/scanner.cc" header-file="libmemcached/csl/scanner.h"
%option perf-report
%option prefix="config_"
%option reentrant
%option nounput
%option noyywrap
%option outfile="libmemcached/csl/scanner.cc" header-file="libmemcached/csl/scanner.h"
%option perf-report
%option prefix="config_"
%option reentrant
+%option warn
%%
%%
@@
-182,36
+186,26
@@
MURMUR { return MURMUR; }
JENKINS { return JENKINS; }
(([[:digit:]]{1,3}"."){3}([[:digit:]]{1,3})) {
JENKINS { return JENKINS; }
(([[:digit:]]{1,3}"."){3}([[:digit:]]{1,3})) {
- yylval->server.port= MEMCACHED_DEFAULT_PORT;
- yylval->server.weight= 1;
- yylval->server.c_str= yyextra->set_hostname(yytext, yyleng);
- if (yylval->server.c_str)
- yylval->server.size= yyleng;
+ yyextra->hostname(yytext, yyleng, yylval->server);
return IPADDRESS;
}
[[:alnum:]]["."[:alnum:]_-]+[[:alnum:]] {
if (yyextra->is_server())
{
return IPADDRESS;
}
[[:alnum:]]["."[:alnum:]_-]+[[:alnum:]] {
if (yyextra->is_server())
{
- yylval->server.port= MEMCACHED_DEFAULT_PORT;
- yylval->server.weight= 1;
- yylval->server.c_str= yyextra->set_hostname(yytext, yyleng);
- if (yylval->server.c_str)
- yylval->server.size= yyleng;
+ yyextra->hostname(yytext, yyleng, yylval->server);
return HOSTNAME;
}
return HOSTNAME;
}
- yylval->string.c_str = yytext;
- yylval->string.size = yyleng;
+ yyextra->string_buffer(yytext, yyleng, yylval->string);
return STRING;
}
L?\"(\\.|[^\\"])*\" {
yyget_text(yyscanner)[yyleng -1]= 0;
return STRING;
}
L?\"(\\.|[^\\"])*\" {
yyget_text(yyscanner)[yyleng -1]= 0;
- yylval->string.c_str= yytext +1;
- yylval->string.size= yyleng -2;
+ yyextra->string_buffer(yytext +1, yyleng -2, yylval->string);
return QUOTED_STRING;
}
return QUOTED_STRING;
}
@@
-230,6
+224,7
@@
void Context::init_scanner()
void Context::destroy_scanner()
{
void Context::destroy_scanner()
{
+ (void)yy_fatal_error; // Removes warning about unused yy_fatal_error()
yylex_destroy(scanner);
}
yylex_destroy(scanner);
}