X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions%2Fscanner.cc;h=fd5a0cb98ae53aa4f3fe4ff38ed69d1140285805;hb=36dd2e646b1290791dfcd2e8d94ab02591f32904;hp=b6143087c24ed1bd6dd18511126f999fc335a788;hpb=0ef2080bdbaafe7e3397530ac69ef4081f4f513e;p=awesomized%2Flibmemcached

diff --git a/libmemcached/options/scanner.cc b/libmemcached/options/scanner.cc
index b6143087..fd5a0cb9 100644
--- a/libmemcached/options/scanner.cc
+++ b/libmemcached/options/scanner.cc
@@ -1,15 +1,15 @@
 #line 2 "libmemcached/options/scanner.cc"
 #line 22 "libmemcached/options/scanner.l"
 
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-
+#include <libmemcached/common.h>
 #include <libmemcached/options/context.h>
 #include <libmemcached/options/parser.h>
-#include <libmemcached/options/string.h>
 #include <libmemcached/options/symbol.h>
 
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+
 #define YY_EXTRA_TYPE Context*
 
 
@@ -1568,17 +1568,17 @@ YY_RULE_SETUP
 case 2:
 YY_RULE_SETUP
 #line 79 "libmemcached/options/scanner.l"
-{ yylval->number = atoi(yytext); return (NUMBER); }
+{ yylval->number= atoi(yytext); return (NUMBER); }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
 #line 81 "libmemcached/options/scanner.l"
-{ yylval->server.port = atoi(yytext +1); return PORT; }
+{ yylval->number= atoi(yytext +1); return PORT; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
 #line 83 "libmemcached/options/scanner.l"
-{ yylval->server.weight = atoi(yytext +2); return WEIGHT_START; }
+{ yylval->number= atoi(yytext +2); return WEIGHT_START; }
 	YY_BREAK
 case 5:
 /* rule 5 can match eol */
@@ -1872,7 +1872,7 @@ YY_RULE_SETUP
       yylval->server.weight= 1;
       yylval->server.c_str= yyextra->set_hostname(yytext, yyleng);
       if (yylval->server.c_str)
-        yylval->server.length= yyleng;
+        yylval->server.size= yyleng;
       return IPADDRESS;
     }
 	YY_BREAK
@@ -1886,13 +1886,13 @@ YY_RULE_SETUP
         yylval->server.weight= 1;
         yylval->server.c_str= yyextra->set_hostname(yytext, yyleng);
         if (yylval->server.c_str)
-          yylval->server.length= yyleng;
+          yylval->server.size= yyleng;
 
         return HOSTNAME;
       }
 
       yylval->string.c_str = yytext;
-      yylval->string.length = yyleng;
+      yylval->string.size = yyleng;
 
       return STRING;
     }
@@ -1902,7 +1902,7 @@ YY_RULE_SETUP
 #line 185 "libmemcached/options/scanner.l"
 {
       yylval->string.c_str = yytext;
-      yylval->string.length = yyleng;
+      yylval->string.size = yyleng;
       return QUOTED_STRING;
     }
 	YY_BREAK