From: Brian Aker <brian@tangent.org>
Date: Thu, 24 Mar 2011 22:17:09 +0000 (-0700)
Subject: Fix issue with multiple use of "DEBUG"
X-Git-Tag: 0.51~15^2~75^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5238132fd18ec3e16cdd81148614c1a351056660;p=m6w6%2Flibmemcached

Fix issue with multiple use of "DEBUG"
---

diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy
index 14719045..e7b95bdf 100644
--- a/libmemcached/options/parser.yy
+++ b/libmemcached/options/parser.yy
@@ -95,7 +95,7 @@ void Context::start()
 %token END
 %token ERROR
 %token RESET
-%token DEBUG
+%token PARSER_DEBUG
 %token INCLUDE
 %token CONFIGURE_FILE
 %token EMPTY_LINE
@@ -211,7 +211,7 @@ statement:
           {
             memcached_reset(context->memc);
           }
-        | DEBUG
+        | PARSER_DEBUG
           {
             yydebug= 1;
           }
diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index aadfdc3b..71ec83d4 100644
--- a/libmemcached/options/scanner.l
+++ b/libmemcached/options/scanner.l
@@ -161,7 +161,7 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont
 
 INCLUDE           { yyextra->begin= yytext; return INCLUDE; }
 RESET           { yyextra->begin= yytext; return RESET; }
-DEBUG           { yyextra->begin= yytext; return DEBUG; }
+DEBUG           { yyextra->begin= yytext; return PARSER_DEBUG; }
 SERVERS           { yyextra->begin= yytext; return SERVERS; }
 END           { yyextra->begin= yytext; return END; }
 ERROR           { yyextra->begin= yytext; return ERROR; }