X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions%2Fscanner.l;h=124900cf75cd5f95576bccdcbf751b7b7ae92249;hb=d9752c25d2f723d27e355d0c7090b65b0445c4a4;hp=2a45455ccd1b1c01f0c28427d9bd5ea66083d840;hpb=ecf02b501d387ee5761eb31db6f760de60ac09a1;p=m6w6%2Flibmemcached diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l index 2a45455c..124900cf 100644 --- a/libmemcached/options/scanner.l +++ b/libmemcached/options/scanner.l @@ -90,7 +90,7 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont } "--SERVER" { yyextra->begin= yytext; return SERVER; } -"--SERVERS" { yyextra->begin= yytext; return SERVERS; } +"--SERVERS" { yyextra->begin= yytext; return SERVERS_OPTION; } "--VERIFY_KEY" { yyextra->begin= yytext; return VERIFY_KEY; } "--VERIFY-KEY" { yyextra->begin= yytext; return VERIFY_KEY; } @@ -159,6 +159,16 @@ static void get_lex_chars(char* buffer, int& result, int max_size, Context *cont "--PREFIX-KEY" { yyextra->begin= yytext; return PREFIX_KEY; } "--PREFIX_KEY" { yyextra->begin= yytext; return PREFIX_KEY; } +INCLUDE { yyextra->begin= yytext; std::cerr << "Found INCLUDE" << std::endl; return INCLUDE; } +RESET { yyextra->begin= yytext; return RESET; } +DEBUG { yyextra->begin= yytext; return DEBUG; } +SERVERS { yyextra->begin= yytext; return SERVERS; } +END { yyextra->begin= yytext; return END; } + +TRUE { return TRUE; } +FALSE { return FALSE; } + + "--"[[:alnum:]]* { yyextra->begin= yytext; return UNKNOWN_OPTION; @@ -184,7 +194,7 @@ JENKINS { return JENKINS; } return HOSTNAME_WITH_PORT; } -[[:alnum:]]+"."[[:alpha:].]+ { +[[:alnum:]]+"."[[:alpha:].]+[[:alnum:]] { yylval->string.c_str = yytext; yylval->string.length = yyleng; return HOSTNAME;