projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixes issue where if illegal options caused parsing to fail an incorrect
[awesomized/libmemcached]
/
libmemcached
/
options
/
parser.yy
diff --git
a/libmemcached/options/parser.yy
b/libmemcached/options/parser.yy
index 20f17c752fce3097a91ffc59d873ba28764bec7c..abd832b5103208e14609fb82cb5a14e9fbff1266 100644
(file)
--- a/
libmemcached/options/parser.yy
+++ b/
libmemcached/options/parser.yy
@@
-18,6
+18,22
@@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+%error-verbose
+%debug
+%defines
+%expect 0
+%output "libmemcached/options/parser.cc"
+%defines "libmemcached/options/parser.h"
+%lex-param { yyscan_t *scanner }
+%name-prefix="libmemcached_"
+%parse-param { Context *context }
+%parse-param { yyscan_t *scanner }
+%locations
+%pure-parser
+%require "2.2"
+%start statement
+%verbose
+
%{
#include <config.h>
%{
#include <config.h>
@@
-27,49
+43,35
@@
#include <sstream>
#include <string>
#include <sstream>
#include <string>
-#include <libmemcached/options/
type
.h>
+#include <libmemcached/options/
context
.h>
#include <libmemcached/options/string.h>
#include <libmemcached/options/symbol.h>
#pragma GCC diagnostic ignored "-Wold-style-cast"
#include <libmemcached/options/scanner.h>
#include <libmemcached/options/string.h>
#include <libmemcached/options/symbol.h>
#pragma GCC diagnostic ignored "-Wold-style-cast"
#include <libmemcached/options/scanner.h>
-inline void libmemcached_error(YYLTYPE *locp, type_st *parser, yyscan_t *scanner, const char *str)
+int libmemcached_lex(YYSTYPE* lvalp, YYLTYPE* llocp, void* scanner);
+
+inline void libmemcached_error(YYLTYPE *locp, Context *context, yyscan_t *scanner, const char *error)
{
memcached_string_t local_string;
{
memcached_string_t local_string;
- local_string.size= strlen(str);
- local_string.c_str= str;
- memcached_set_error(parser->memc, MEMCACHED_FAILURE, &local_string);
+ local_string.size= strlen(context->begin);
+ local_string.c_str= context->begin;
+ if (context->rc == MEMCACHED_SUCCESS)
+ context->rc= MEMCACHED_PARSE_ERROR;
+ memcached_set_error(context->memc, context->rc, &local_string);
}
}
-
%}
%}
-%error-verbose
-%debug
-%defines
-%expect 0
-%output "libmemcached/options/parser.cc"
-%defines "libmemcached/options/parser.h"
-%lex-param { yyscan_t *scanner }
-%name-prefix="libmemcached_"
-%parse-param { type_st *parser }
-%parse-param { yyscan_t *scanner }
-%locations
-%pure-parser
-%require "2.2"
-%start statement
-%verbose
-
%token COMMENT
%token CONFIGURE_FILE
%token EMPTY_LINE
%token SERVER
%token SERVERS
%token COMMENT
%token CONFIGURE_FILE
%token EMPTY_LINE
%token SERVER
%token SERVERS
+%token UNKNOWN_OPTION
%token UNKNOWN
%token UNKNOWN
-%token DASH_OPTION
-
/* All behavior options */
%token AUTO_EJECT_HOSTS
%token BINARY_PROTOCOL
/* All behavior options */
%token AUTO_EJECT_HOSTS
%token BINARY_PROTOCOL
@@
-146,9
+148,9
@@
inline void libmemcached_error(YYLTYPE *locp, type_st *parser, yyscan_t *scanner
%%
statement:
%%
statement:
-
DASH_OPTION
expression
+ expression
{ }
{ }
- | statement ' '
DASH_OPTION
expression
+ | statement ' ' expression
{ }
| COMMENT
{ }
{ }
| COMMENT
{ }
@@
-160,15
+162,17
@@
statement:
expression:
SERVER '=' server
{
expression:
SERVER '=' server
{
- if (memcached_server_add_parsed(parser->memc, $3.c_str, $3.length, $3.port, 0) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_server_add_parsed(context->memc, $3.c_str, $3.length, $3.port, 0)) != MEMCACHED_SUCCESS)
+ {
YYERROR;
YYERROR;
+ }
}
| SERVERS '=' server_list
{
}
| CONFIGURE_FILE '=' string
{
}
| SERVERS '=' server_list
{
}
| CONFIGURE_FILE '=' string
{
- memcached_set_configuration_file(
parser
->memc, $3.c_str, $3.length);
+ memcached_set_configuration_file(
context
->memc, $3.c_str, $3.length);
}
| behaviors
;
}
| behaviors
;
@@
-176,66
+180,43
@@
expression:
behaviors:
PREFIX_KEY '=' string
{
behaviors:
PREFIX_KEY '=' string
{
- memcached_return_t rc;
- if ((rc= memcached_callback_set(parser->memc, MEMCACHED_CALLBACK_PREFIX_KEY, std::string($3.c_str, $3.length).c_str())) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_callback_set(context->memc, MEMCACHED_CALLBACK_PREFIX_KEY, std::string($3.c_str, $3.length).c_str())) != MEMCACHED_SUCCESS)
{
{
- std::string error_message("--PREFIX-KEY");
- error_message.append($3.c_str, $3.length);
- memcached_string_t tmp= memcached_string_make(error_message.c_str(), error_message.size());
- memcached_set_error(parser->memc, rc, &tmp);
YYERROR;
}
}
| DISTRIBUTION '=' distribution
{
YYERROR;
}
}
| DISTRIBUTION '=' distribution
{
- memcached_return_t rc;
- if ((rc= memcached_behavior_set(parser->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $3)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, $3)) != MEMCACHED_SUCCESS)
{
{
- memcached_string_t tmp= memcached_string_make(memcached_string_with_size("--DISTRIBUTION"));
- memcached_set_error(parser->memc, rc, &tmp);
YYERROR;
}
}
| HASH '=' hash
{
YYERROR;
}
}
| HASH '=' hash
{
- memcached_return_t rc;
- if ((rc= memcached_behavior_set(parser->memc, MEMCACHED_BEHAVIOR_HASH, $3)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_HASH, $3)) != MEMCACHED_SUCCESS)
{
{
- std::string buffer;
- buffer+= "--HASH=";
- buffer+= libmemcached_string_hash($3);
- memcached_string_t tmp= memcached_string_make(buffer.c_str(), buffer.size());
- memcached_set_error(parser->memc, rc, &tmp);
YYERROR;
}
}
| KETAMA_HASH '=' hash
{
YYERROR;
}
}
| KETAMA_HASH '=' hash
{
- memcached_return_t rc;
- if ((rc= memcached_behavior_set(parser->memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, $3)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, $3)) != MEMCACHED_SUCCESS)
{
{
- memcached_string_t tmp= memcached_string_make(memcached_string_with_size("--KETAMA-HASH"));
- memcached_set_error(parser->memc, rc, &tmp);
YYERROR;
}
}
| behavior_number '=' NUMBER
{
YYERROR;
}
}
| behavior_number '=' NUMBER
{
- memcached_return_t rc;
- if ((rc= memcached_behavior_set(parser->memc, $1, $3)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_behavior_set(context->memc, $1, $3)) != MEMCACHED_SUCCESS)
{
{
- memcached_string_t tmp= memcached_string_make(libmemcached_string_behavior($1), strlen(libmemcached_string_behavior($1)));
- memcached_set_error(parser->memc, rc, &tmp);
YYERROR;
}
}
| behavior_boolean
{
YYERROR;
}
}
| behavior_boolean
{
- memcached_return_t rc;
- if ((rc= memcached_behavior_set(parser->memc, $1, true)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_behavior_set(context->memc, $1, true)) != MEMCACHED_SUCCESS)
{
{
- memcached_string_t tmp= memcached_string_make(libmemcached_string_behavior($1), strlen(libmemcached_string_behavior($1)));
- memcached_set_error(parser->memc, rc, &tmp);
YYERROR;
}
}
YYERROR;
}
}
@@
-369,25
+350,15
@@
behavior_boolean:
server_list:
server
{
server_list:
server
{
- memcached_return_t rc;
- if ((rc= memcached_server_add_parsed(parser->memc, $1.c_str, $1.length, $1.port, 0)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_server_add_parsed(context->memc, $1.c_str, $1.length, $1.port, 0)) != MEMCACHED_SUCCESS)
{
{
- std::stringstream ss;
- ss << "--SERVER=" << $1;
- memcached_string_t tmp= memcached_string_make(ss.str().c_str(), ss.str().length());
- memcached_set_error(parser->memc, rc, &tmp);
YYERROR;
}
}
| server_list ',' server
{
YYERROR;
}
}
| server_list ',' server
{
- memcached_return_t rc;
- if ((rc= memcached_server_add_parsed(parser->memc, $3.c_str, $3.length, $3.port, 0)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_server_add_parsed(context->memc, $3.c_str, $3.length, $3.port, 0)) != MEMCACHED_SUCCESS)
{
{
- std::stringstream ss;
- ss << "--SERVERS=" << $3;
- memcached_string_t tmp= memcached_string_make(ss.str().c_str(), ss.str().length());
- memcached_set_error(parser->memc, rc, &tmp);
YYERROR;
}
}
YYERROR;
}
}