Merge in new scanner/parser suite with updated test cases.

[awesomized/libmemcached] / libmemcached / options / scanner.l

diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index e11fcf49aa2398712e878a2036e44c371c3c8f2e..77f16ebe5e541ddda33b79d3bae1c87647c76024 100644 (file)
--- a/libmemcached/options/scanner.l
+++ b/libmemcached/options/scanner.l
@@ -52,12 +52,13 @@ static void get_lex_chars(char* buffer, int& result, int max_size, struct type_s
 
 %%
 
-[=] { return EQ; }
-[,] { return COMMA; }
 
-[0-9]+ { yylval->number = atoi(yytext); return (NUMBER); }
+=|,       { return yytext[0];}
 
-([0-9]*.[0-9]+) { yylval->double_number = atof(yytext); return (FLOAT); }
+
+[[:digit:]]+ { yylval->number = atoi(yytext); return (NUMBER); }
+
+([[:digit:]]*.[:digit:]+) { yylval->double_number = atof(yytext); return (FLOAT); }
 
 [ \t\r\n] ; /* skip whitespace */
 
@@ -68,22 +69,32 @@ static void get_lex_chars(char* buffer, int& result, int max_size, struct type_s
 "--VERIFY_KEY"                 { return VERIFY_KEY; }
 "--VERIFY-KEY"                 { return VERIFY_KEY; }
 
-[A-Za-z][A-Za-z0-9_]*[:]    { 
-                              yylval->string.c_str = yytext;
-                              yylval->string.length = yyleng;
-                              return SERVER_WITH_PORT;
-                            }
-
-[A-Za-z][A-Za-z0-9_]*   { 
-                          yylval->string.c_str = yytext;
-                          yylval->string.length = yyleng;
-                          return IDENTIFIER;
-                        }
-[-] ;
-
-.                     {
-                        std::cerr << "Near " <<  yytext << std::endl;
-                        return UNKNOWN;
-                      }
+[[:alnum:]][[:alnum:].]*[[:alpha:]]: { 
+      yylval->string.c_str = yytext;
+      yylval->string.length = yyleng;
+      return SERVER_WITH_PORT;
+    }
+
+[[:alnum:]][[:alnum:].]*[[:alpha:]] { 
+      yylval->string.c_str = yytext;
+      yylval->string.length = yyleng;
+      return IDENTIFIER;
+    }
+[[:digit:]]{1,3}"."[[:digit:]]{1,3}"."[[:digit:]]{1,3}"."[[:digit:]]{1,3}: { 
+      yylval->string.c_str = yytext;
+      yylval->string.length = yyleng;
+      return IPADDRESS_WITH_PORT;
+    }
+
+[[:digit:]]{1,3}"."[[:digit:]]{1,3}"."[[:digit:]]{1,3}"."[[:digit:]]{1,3}  { 
+      yylval->string.c_str = yytext;
+      yylval->string.length = yyleng;
+      return IPADDRESS;
+    }
+
+. {
+      std::cerr << "Near " <<  yytext << std::endl;
+      return UNKNOWN;
+    }
 
 %%