Fix issue with multiple use of "DEBUG"
authorBrian Aker <brian@tangent.org>
Thu, 24 Mar 2011 22:17:09 +0000 (15:17 -0700)
committerBrian Aker <brian@tangent.org>
Thu, 24 Mar 2011 22:17:09 +0000 (15:17 -0700)
libmemcached/options/parser.yy
libmemcached/options/scanner.l

index 1471904573b17aa10b8a7c8396c10a4147256ea9..e7b95bdfc5a1705c1eec1009c9c69dd8e0136133 100644 (file)
@@ -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;
           }
index aadfdc3ba66cb917ef96c573ee2a3ddf58752c20..71ec83d472579e76661dbe235f8811d96e9ff99f 100644 (file)
@@ -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; }