Merge in all changes related to being able to read configuration files.

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

diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l
index 3a135ff92055c5c00f17ce341dbfec9d998c0537..f5d09e7a3aaa1e1755f5bc3cf4ab2470d7c1f830 100644 (file)
--- a/libmemcached/options/scanner.l
+++ b/libmemcached/options/scanner.l
@@ -81,6 +81,10 @@ static void get_lex_chars(char* buffer, int& result, int max_size, struct type_s
 
 [\t\r\n] ; /* skip whitespace */
 
+^#.*$ {
+      return COMMENT;
+    }
+
 "--" { return DASH_OPTION; }
 
 SERVER                          { return SERVER; }
@@ -195,7 +199,7 @@ JENKINS                     { return JENKINS; }
       return STRING;
     }
 
-\"[[:alnum:]]*\" { 
+\".*\" { 
       yylval->string.c_str = yytext;
       yylval->string.length = yyleng;
       return QUOTED_STRING;