X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions%2Fparser.yy;h=7c94f987aa09fe45fcf873c35e5c03b740bb31fa;hb=1d076426d9ff399efc40d8556d8bc883b47ed87c;hp=92902c26304601d05aaf5d6fb2e1bb9b173f65fe;hpb=dac169cdb8e544f5967bb8d22f229b49d78afa9a;p=awesomized%2Flibmemcached
diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy
index 92902c26..7c94f987 100644
--- a/libmemcached/options/parser.yy
+++ b/libmemcached/options/parser.yy
@@ -18,6 +18,22 @@
* along with this program. If not, see .
*/
+%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 *parser }
+%parse-param { yyscan_t *scanner }
+%locations
+%pure-parser
+%require "2.2"
+%start statement
+%verbose
+
%{
#include
@@ -27,40 +43,26 @@
#include
#include
-#include
+#include
#include
#include
#pragma GCC diagnostic ignored "-Wold-style-cast"
#include
-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;
- local_string.size= strlen(str);
- local_string.c_str= str;
- memcached_set_error(parser->memc, MEMCACHED_FAILURE, &local_string);
+ std::cerr << " Error " << error << std::endl;
+ local_string.size= strlen(context->begin);
+ local_string.c_str= context->begin;
+ memcached_set_error(context->memc, MEMCACHED_PARSE_ERROR, &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