X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fcsl%2Fscanner.cc;h=34adff2fbb555ae5336a05faaa0328e19cea542a;hb=7a7a973ec64019907188c581b1d1d028dca172b9;hp=d286c5bdadd8104a9cd79cce7d3f29dbdeb17ce8;hpb=86953507cb1ff03f4dd08f4535092416495b5353;p=awesomized%2Flibmemcached

diff --git a/libmemcached/csl/scanner.cc b/libmemcached/csl/scanner.cc
index d286c5bd..34adff2f 100644
--- a/libmemcached/csl/scanner.cc
+++ b/libmemcached/csl/scanner.cc
@@ -19,12 +19,18 @@
 #pragma GCC diagnostic ignored "-Wshorten-64-to-32"
 #endif
 
+#ifndef __INTEL_COMPILER
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wlogical-op"
+#endif
+#endif
+
 #define YY_EXTRA_TYPE Context*
 
 
 
 
-#line 28 "libmemcached/csl/scanner.cc"
+#line 34 "libmemcached/csl/scanner.cc"
 
 #define  YY_INT_ALIGNED short int
 
@@ -1067,7 +1073,7 @@ static yyconst flex_int16_t yy_chk[1815] =
  *
  */
 
-#line 64 "libmemcached/csl/scanner.l"
+#line 70 "libmemcached/csl/scanner.l"
 #include <cstdlib>
 #include <cstring>
 
@@ -1096,7 +1102,7 @@ static yyconst flex_int16_t yy_chk[1815] =
 #define YY_INPUT(buffer, result, max_size) get_lex_chars(buffer, result, max_size, PARAM)
 
 #define YY_NO_INPUT 1
-#line 1100 "libmemcached/csl/scanner.cc"
+#line 1106 "libmemcached/csl/scanner.cc"
 
 #define INITIAL 0
 
@@ -1334,11 +1340,11 @@ YY_DECL
 	register int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-#line 106 "libmemcached/csl/scanner.l"
+#line 112 "libmemcached/csl/scanner.l"
 
 
 
-#line 1342 "libmemcached/csl/scanner.cc"
+#line 1348 "libmemcached/csl/scanner.cc"
 
     yylval = yylval_param;
 
@@ -1422,28 +1428,28 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 109 "libmemcached/csl/scanner.l"
+#line 115 "libmemcached/csl/scanner.l"
 { return yytext[0];}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 111 "libmemcached/csl/scanner.l"
+#line 117 "libmemcached/csl/scanner.l"
 { yylval->number= atoi(yytext); return (NUMBER); }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 113 "libmemcached/csl/scanner.l"
+#line 119 "libmemcached/csl/scanner.l"
 { yylval->number= atoi(yytext +1); return PORT; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 115 "libmemcached/csl/scanner.l"
+#line 121 "libmemcached/csl/scanner.l"
 { yylval->number= atoi(yytext +2); return WEIGHT_START; }
 	YY_BREAK
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 117 "libmemcached/csl/scanner.l"
+#line 123 "libmemcached/csl/scanner.l"
 ; /* skip whitespace */
 	YY_BREAK
 case 6:
@@ -1451,224 +1457,224 @@ case 6:
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 120 "libmemcached/csl/scanner.l"
+#line 126 "libmemcached/csl/scanner.l"
 {
       return COMMENT;
     }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 124 "libmemcached/csl/scanner.l"
+#line 130 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; yyextra->set_server(); return yyextra->previous_token= SERVER; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 126 "libmemcached/csl/scanner.l"
+#line 132 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= SOCKET; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 128 "libmemcached/csl/scanner.l"
+#line 134 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= BINARY_PROTOCOL; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 129 "libmemcached/csl/scanner.l"
+#line 135 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= BUFFER_REQUESTS; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 130 "libmemcached/csl/scanner.l"
+#line 136 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= CONFIGURE_FILE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 131 "libmemcached/csl/scanner.l"
+#line 137 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= CONNECT_TIMEOUT; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 132 "libmemcached/csl/scanner.l"
+#line 138 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= DISTRIBUTION; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 133 "libmemcached/csl/scanner.l"
+#line 139 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= HASH_WITH_NAMESPACE; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 134 "libmemcached/csl/scanner.l"
+#line 140 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= HASH; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 135 "libmemcached/csl/scanner.l"
+#line 141 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= IO_BYTES_WATERMARK; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 136 "libmemcached/csl/scanner.l"
+#line 142 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= IO_KEY_PREFETCH; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 137 "libmemcached/csl/scanner.l"
+#line 143 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= IO_MSG_WATERMARK; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 138 "libmemcached/csl/scanner.l"
+#line 144 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= NOREPLY; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 139 "libmemcached/csl/scanner.l"
+#line 145 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= NUMBER_OF_REPLICAS; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 140 "libmemcached/csl/scanner.l"
+#line 146 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= POLL_TIMEOUT; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 141 "libmemcached/csl/scanner.l"
+#line 147 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= RANDOMIZE_REPLICA_READ; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 142 "libmemcached/csl/scanner.l"
+#line 148 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= RCV_TIMEOUT; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 143 "libmemcached/csl/scanner.l"
+#line 149 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= REMOVE_FAILED_SERVERS; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 144 "libmemcached/csl/scanner.l"
+#line 150 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= RETRY_TIMEOUT; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 145 "libmemcached/csl/scanner.l"
+#line 151 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= SND_TIMEOUT; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 146 "libmemcached/csl/scanner.l"
+#line 152 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= SOCKET_RECV_SIZE; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 147 "libmemcached/csl/scanner.l"
+#line 153 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= SOCKET_SEND_SIZE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 148 "libmemcached/csl/scanner.l"
+#line 154 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= SORT_HOSTS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 149 "libmemcached/csl/scanner.l"
+#line 155 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= SUPPORT_CAS; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 150 "libmemcached/csl/scanner.l"
+#line 156 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= _TCP_KEEPALIVE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 151 "libmemcached/csl/scanner.l"
+#line 157 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= _TCP_KEEPIDLE; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 152 "libmemcached/csl/scanner.l"
+#line 158 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= _TCP_NODELAY; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 153 "libmemcached/csl/scanner.l"
+#line 159 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= USE_UDP; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 154 "libmemcached/csl/scanner.l"
+#line 160 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= USER_DATA; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 155 "libmemcached/csl/scanner.l"
+#line 161 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= VERIFY_KEY; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 157 "libmemcached/csl/scanner.l"
+#line 163 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= POOL_MIN; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 158 "libmemcached/csl/scanner.l"
+#line 164 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= POOL_MAX; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 160 "libmemcached/csl/scanner.l"
+#line 166 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= NAMESPACE; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 162 "libmemcached/csl/scanner.l"
+#line 168 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= FETCH_VERSION; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 164 "libmemcached/csl/scanner.l"
+#line 170 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= INCLUDE; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 165 "libmemcached/csl/scanner.l"
+#line 171 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= RESET; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 166 "libmemcached/csl/scanner.l"
+#line 172 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= PARSER_DEBUG; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 167 "libmemcached/csl/scanner.l"
+#line 173 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= SERVERS; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 168 "libmemcached/csl/scanner.l"
+#line 174 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= END; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 169 "libmemcached/csl/scanner.l"
+#line 175 "libmemcached/csl/scanner.l"
 { yyextra->begin= yytext; return yyextra->previous_token= ERROR; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 171 "libmemcached/csl/scanner.l"
+#line 177 "libmemcached/csl/scanner.l"
 { return yyextra->previous_token= TRUE; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 172 "libmemcached/csl/scanner.l"
+#line 178 "libmemcached/csl/scanner.l"
 { return yyextra->previous_token= FALSE; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 175 "libmemcached/csl/scanner.l"
+#line 181 "libmemcached/csl/scanner.l"
 {
       yyextra->begin= yytext;
       return UNKNOWN_OPTION;
@@ -1676,67 +1682,67 @@ YY_RULE_SETUP
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 180 "libmemcached/csl/scanner.l"
+#line 186 "libmemcached/csl/scanner.l"
 { return CONSISTENT; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 181 "libmemcached/csl/scanner.l"
+#line 187 "libmemcached/csl/scanner.l"
 { return MODULA; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 182 "libmemcached/csl/scanner.l"
+#line 188 "libmemcached/csl/scanner.l"
 { return RANDOM; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 184 "libmemcached/csl/scanner.l"
+#line 190 "libmemcached/csl/scanner.l"
 { return MD5; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 185 "libmemcached/csl/scanner.l"
+#line 191 "libmemcached/csl/scanner.l"
 { return CRC; }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 186 "libmemcached/csl/scanner.l"
+#line 192 "libmemcached/csl/scanner.l"
 { return FNV1_64; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 187 "libmemcached/csl/scanner.l"
+#line 193 "libmemcached/csl/scanner.l"
 { return FNV1A_64; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 188 "libmemcached/csl/scanner.l"
+#line 194 "libmemcached/csl/scanner.l"
 { return FNV1_32; }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 189 "libmemcached/csl/scanner.l"
+#line 195 "libmemcached/csl/scanner.l"
 { return FNV1A_32; }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 190 "libmemcached/csl/scanner.l"
+#line 196 "libmemcached/csl/scanner.l"
 { return HSIEH; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 191 "libmemcached/csl/scanner.l"
+#line 197 "libmemcached/csl/scanner.l"
 { return MURMUR; }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 192 "libmemcached/csl/scanner.l"
+#line 198 "libmemcached/csl/scanner.l"
 { return JENKINS; }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 194 "libmemcached/csl/scanner.l"
+#line 200 "libmemcached/csl/scanner.l"
 {
       yyextra->hostname(yytext, yyleng, yylval->server);
       return IPADDRESS;
@@ -1744,7 +1750,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 199 "libmemcached/csl/scanner.l"
+#line 205 "libmemcached/csl/scanner.l"
 {
       if (yyextra->is_server())
       {
@@ -1761,7 +1767,7 @@ YY_RULE_SETUP
 case 64:
 /* rule 64 can match eol */
 YY_RULE_SETUP
-#line 212 "libmemcached/csl/scanner.l"
+#line 218 "libmemcached/csl/scanner.l"
 {
       config_get_text(yyscanner)[yyleng -1]= 0;
       yyextra->string_buffer(yytext +1, yyleng -2, yylval->string);
@@ -1770,7 +1776,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 218 "libmemcached/csl/scanner.l"
+#line 224 "libmemcached/csl/scanner.l"
 {
       yyextra->begin= yytext;
       return UNKNOWN;
@@ -1778,10 +1784,10 @@ YY_RULE_SETUP
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 223 "libmemcached/csl/scanner.l"
+#line 229 "libmemcached/csl/scanner.l"
 ECHO;
 	YY_BREAK
-#line 1785 "libmemcached/csl/scanner.cc"
+#line 1791 "libmemcached/csl/scanner.cc"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2910,7 +2916,7 @@ void config_free (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 223 "libmemcached/csl/scanner.l"
+#line 229 "libmemcached/csl/scanner.l"