X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcsl%2Fparser.cc;h=9ad1e6590aa9daaa10558341c8ed6647578ddd99;hb=7a7a973ec64019907188c581b1d1d028dca172b9;hp=926621444ff810d6cf299f6471d6285ab0eaf7a1;hpb=facfe08e21d2c3135c508ff098ff603ddaacef3e;p=awesomized%2Flibmemcached diff --git a/libmemcached/csl/parser.cc b/libmemcached/csl/parser.cc index 92662144..9ad1e659 100644 --- a/libmemcached/csl/parser.cc +++ b/libmemcached/csl/parser.cc @@ -88,6 +88,10 @@ #pragma GCC diagnostic ignored "-Wold-style-cast" #endif +#ifndef __INTEL_COMPILER +#pragma GCC diagnostic ignored "-Wlogical-op" +#endif + int conf_lex(YYSTYPE* lvalp, void* scanner); #define select_yychar(__context) yychar == UNKNOWN ? ( (__context)->previous_token == END ? UNKNOWN : (__context)->previous_token ) : yychar @@ -115,7 +119,7 @@ inline void __config_error(Context *context, yyscan_t *scanner, const char *erro /* Line 268 of yacc.c */ -#line 119 "libmemcached/csl/parser.cc" +#line 123 "libmemcached/csl/parser.cc" /* Enabling traces. */ #ifndef YYDEBUG @@ -228,7 +232,7 @@ inline void __config_error(Context *context, yyscan_t *scanner, const char *erro /* Line 343 of yacc.c */ -#line 232 "libmemcached/csl/parser.cc" +#line 236 "libmemcached/csl/parser.cc" #ifdef short # undef short @@ -541,13 +545,13 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 189, 189, 190, 194, 196, 198, 200, 205, 210, - 214, 218, 229, 239, 249, 258, 262, 266, 270, 274, - 286, 290, 303, 316, 323, 330, 339, 345, 349, 353, - 357, 361, 365, 369, 373, 377, 381, 385, 389, 396, - 400, 404, 408, 412, 416, 420, 424, 428, 432, 436, - 440, 447, 448, 453, 454, 459, 463, 467, 471, 475, - 479, 483, 487, 491, 498, 502, 509, 513, 517 + 0, 193, 193, 194, 198, 200, 202, 204, 209, 214, + 218, 222, 233, 243, 253, 262, 266, 270, 274, 278, + 290, 294, 307, 320, 327, 334, 343, 349, 353, 357, + 361, 365, 369, 373, 377, 381, 385, 389, 393, 400, + 404, 408, 412, 416, 420, 424, 428, 432, 436, 440, + 444, 451, 452, 457, 458, 463, 467, 471, 475, 479, + 483, 487, 491, 495, 502, 506, 513, 517, 521 }; #endif @@ -1558,28 +1562,28 @@ yyreduce: case 4: /* Line 1806 of yacc.c */ -#line 195 "libmemcached/csl/parser.yy" +#line 199 "libmemcached/csl/parser.yy" { } break; case 5: /* Line 1806 of yacc.c */ -#line 197 "libmemcached/csl/parser.yy" +#line 201 "libmemcached/csl/parser.yy" { } break; case 6: /* Line 1806 of yacc.c */ -#line 199 "libmemcached/csl/parser.yy" +#line 203 "libmemcached/csl/parser.yy" { } break; case 7: /* Line 1806 of yacc.c */ -#line 201 "libmemcached/csl/parser.yy" +#line 205 "libmemcached/csl/parser.yy" { context->set_end(); YYACCEPT; @@ -1589,7 +1593,7 @@ yyreduce: case 8: /* Line 1806 of yacc.c */ -#line 206 "libmemcached/csl/parser.yy" +#line 210 "libmemcached/csl/parser.yy" { context->rc= MEMCACHED_PARSE_USER_ERROR; parser_abort(context, "ERROR called directly"); @@ -1599,7 +1603,7 @@ yyreduce: case 9: /* Line 1806 of yacc.c */ -#line 211 "libmemcached/csl/parser.yy" +#line 215 "libmemcached/csl/parser.yy" { memcached_reset(context->memc); } @@ -1608,7 +1612,7 @@ yyreduce: case 10: /* Line 1806 of yacc.c */ -#line 215 "libmemcached/csl/parser.yy" +#line 219 "libmemcached/csl/parser.yy" { yydebug= 1; } @@ -1617,7 +1621,7 @@ yyreduce: case 11: /* Line 1806 of yacc.c */ -#line 219 "libmemcached/csl/parser.yy" +#line 223 "libmemcached/csl/parser.yy" { if ((context->rc= memcached_parse_configure_file(*context->memc, (yyvsp[(3) - (3)].string).c_str, (yyvsp[(3) - (3)].string).size)) != MEMCACHED_SUCCESS) { @@ -1629,9 +1633,9 @@ yyreduce: case 12: /* Line 1806 of yacc.c */ -#line 230 "libmemcached/csl/parser.yy" +#line 234 "libmemcached/csl/parser.yy" { - if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(3) - (4)].number), (yyvsp[(4) - (4)].number)))) + if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(3) - (4)].number), uint32_t((yyvsp[(4) - (4)].number))))) { char buffer[1024]; snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", (yyvsp[(2) - (4)].server).c_str, uint32_t((yyvsp[(3) - (4)].number))); @@ -1644,9 +1648,9 @@ yyreduce: case 13: /* Line 1806 of yacc.c */ -#line 240 "libmemcached/csl/parser.yy" +#line 244 "libmemcached/csl/parser.yy" { - if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(3) - (4)].number), (yyvsp[(4) - (4)].number)))) + if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(3) - (4)].number), uint32_t((yyvsp[(4) - (4)].number))))) { char buffer[1024]; snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", (yyvsp[(2) - (4)].server).c_str, uint32_t((yyvsp[(3) - (4)].number))); @@ -1659,12 +1663,12 @@ yyreduce: case 14: /* Line 1806 of yacc.c */ -#line 250 "libmemcached/csl/parser.yy" +#line 254 "libmemcached/csl/parser.yy" { - if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, (yyvsp[(2) - (3)].string).c_str, (yyvsp[(3) - (3)].number)))) + if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, (yyvsp[(2) - (3)].string).c_str, uint32_t((yyvsp[(3) - (3)].number))))) { char buffer[1024]; - snprintf(buffer, sizeof(buffer), "Failed to add server: %s", (yyvsp[(2) - (3)].string).c_str); + snprintf(buffer, sizeof(buffer), "Failed to add socket: %s", (yyvsp[(2) - (3)].string).c_str); parser_abort(context, buffer); } } @@ -1673,7 +1677,7 @@ yyreduce: case 15: /* Line 1806 of yacc.c */ -#line 259 "libmemcached/csl/parser.yy" +#line 263 "libmemcached/csl/parser.yy" { memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size); } @@ -1682,25 +1686,25 @@ yyreduce: case 16: /* Line 1806 of yacc.c */ -#line 263 "libmemcached/csl/parser.yy" +#line 267 "libmemcached/csl/parser.yy" { - context->memc->configure.initial_pool_size= (yyvsp[(2) - (2)].number); + context->memc->configure.initial_pool_size= uint32_t((yyvsp[(2) - (2)].number)); } break; case 17: /* Line 1806 of yacc.c */ -#line 267 "libmemcached/csl/parser.yy" +#line 271 "libmemcached/csl/parser.yy" { - context->memc->configure.max_pool_size= (yyvsp[(2) - (2)].number); + context->memc->configure.max_pool_size= uint32_t((yyvsp[(2) - (2)].number)); } break; case 19: /* Line 1806 of yacc.c */ -#line 275 "libmemcached/csl/parser.yy" +#line 279 "libmemcached/csl/parser.yy" { if (memcached_callback_get(context->memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL)) { @@ -1717,7 +1721,7 @@ yyreduce: case 20: /* Line 1806 of yacc.c */ -#line 287 "libmemcached/csl/parser.yy" +#line 291 "libmemcached/csl/parser.yy" { memcached_flag(*context->memc, MEMCACHED_FLAG_IS_FETCHING_VERSION, true); } @@ -1726,7 +1730,7 @@ yyreduce: case 21: /* Line 1806 of yacc.c */ -#line 291 "libmemcached/csl/parser.yy" +#line 295 "libmemcached/csl/parser.yy" { // Check to see if DISTRIBUTION has already been set if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (2)].distribution))) != MEMCACHED_SUCCESS) @@ -1744,7 +1748,7 @@ yyreduce: case 22: /* Line 1806 of yacc.c */ -#line 304 "libmemcached/csl/parser.yy" +#line 308 "libmemcached/csl/parser.yy" { // Check to see if DISTRIBUTION has already been set if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (4)].distribution))) != MEMCACHED_SUCCESS) @@ -1762,7 +1766,7 @@ yyreduce: case 23: /* Line 1806 of yacc.c */ -#line 317 "libmemcached/csl/parser.yy" +#line 321 "libmemcached/csl/parser.yy" { if (context->set_hash((yyvsp[(2) - (2)].hash)) == false) { @@ -1774,7 +1778,7 @@ yyreduce: case 24: /* Line 1806 of yacc.c */ -#line 324 "libmemcached/csl/parser.yy" +#line 328 "libmemcached/csl/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS) { @@ -1786,7 +1790,7 @@ yyreduce: case 25: /* Line 1806 of yacc.c */ -#line 331 "libmemcached/csl/parser.yy" +#line 335 "libmemcached/csl/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS) { @@ -1800,7 +1804,7 @@ yyreduce: case 26: /* Line 1806 of yacc.c */ -#line 340 "libmemcached/csl/parser.yy" +#line 344 "libmemcached/csl/parser.yy" { } break; @@ -1808,7 +1812,7 @@ yyreduce: case 27: /* Line 1806 of yacc.c */ -#line 346 "libmemcached/csl/parser.yy" +#line 350 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS; } @@ -1817,7 +1821,7 @@ yyreduce: case 28: /* Line 1806 of yacc.c */ -#line 350 "libmemcached/csl/parser.yy" +#line 354 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT; } @@ -1826,7 +1830,7 @@ yyreduce: case 29: /* Line 1806 of yacc.c */ -#line 354 "libmemcached/csl/parser.yy" +#line 358 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK; } @@ -1835,7 +1839,7 @@ yyreduce: case 30: /* Line 1806 of yacc.c */ -#line 358 "libmemcached/csl/parser.yy" +#line 362 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK; } @@ -1844,7 +1848,7 @@ yyreduce: case 31: /* Line 1806 of yacc.c */ -#line 362 "libmemcached/csl/parser.yy" +#line 366 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH; } @@ -1853,7 +1857,7 @@ yyreduce: case 32: /* Line 1806 of yacc.c */ -#line 366 "libmemcached/csl/parser.yy" +#line 370 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS; } @@ -1862,7 +1866,7 @@ yyreduce: case 33: /* Line 1806 of yacc.c */ -#line 370 "libmemcached/csl/parser.yy" +#line 374 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT; } @@ -1871,7 +1875,7 @@ yyreduce: case 34: /* Line 1806 of yacc.c */ -#line 374 "libmemcached/csl/parser.yy" +#line 378 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT; } @@ -1880,7 +1884,7 @@ yyreduce: case 35: /* Line 1806 of yacc.c */ -#line 378 "libmemcached/csl/parser.yy" +#line 382 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT; } @@ -1889,7 +1893,7 @@ yyreduce: case 36: /* Line 1806 of yacc.c */ -#line 382 "libmemcached/csl/parser.yy" +#line 386 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT; } @@ -1898,7 +1902,7 @@ yyreduce: case 37: /* Line 1806 of yacc.c */ -#line 386 "libmemcached/csl/parser.yy" +#line 390 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE; } @@ -1907,7 +1911,7 @@ yyreduce: case 38: /* Line 1806 of yacc.c */ -#line 390 "libmemcached/csl/parser.yy" +#line 394 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE; } @@ -1916,7 +1920,7 @@ yyreduce: case 39: /* Line 1806 of yacc.c */ -#line 397 "libmemcached/csl/parser.yy" +#line 401 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL; } @@ -1925,7 +1929,7 @@ yyreduce: case 40: /* Line 1806 of yacc.c */ -#line 401 "libmemcached/csl/parser.yy" +#line 405 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS; } @@ -1934,7 +1938,7 @@ yyreduce: case 41: /* Line 1806 of yacc.c */ -#line 405 "libmemcached/csl/parser.yy" +#line 409 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY; } @@ -1943,7 +1947,7 @@ yyreduce: case 42: /* Line 1806 of yacc.c */ -#line 409 "libmemcached/csl/parser.yy" +#line 413 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY; } @@ -1952,7 +1956,7 @@ yyreduce: case 43: /* Line 1806 of yacc.c */ -#line 413 "libmemcached/csl/parser.yy" +#line 417 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ; } @@ -1961,7 +1965,7 @@ yyreduce: case 44: /* Line 1806 of yacc.c */ -#line 417 "libmemcached/csl/parser.yy" +#line 421 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS; } @@ -1970,7 +1974,7 @@ yyreduce: case 45: /* Line 1806 of yacc.c */ -#line 421 "libmemcached/csl/parser.yy" +#line 425 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS; } @@ -1979,7 +1983,7 @@ yyreduce: case 46: /* Line 1806 of yacc.c */ -#line 425 "libmemcached/csl/parser.yy" +#line 429 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY; } @@ -1988,7 +1992,7 @@ yyreduce: case 47: /* Line 1806 of yacc.c */ -#line 429 "libmemcached/csl/parser.yy" +#line 433 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE; } @@ -1997,7 +2001,7 @@ yyreduce: case 48: /* Line 1806 of yacc.c */ -#line 433 "libmemcached/csl/parser.yy" +#line 437 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE; } @@ -2006,7 +2010,7 @@ yyreduce: case 49: /* Line 1806 of yacc.c */ -#line 437 "libmemcached/csl/parser.yy" +#line 441 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP; } @@ -2015,7 +2019,7 @@ yyreduce: case 50: /* Line 1806 of yacc.c */ -#line 441 "libmemcached/csl/parser.yy" +#line 445 "libmemcached/csl/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY; } @@ -2024,35 +2028,35 @@ yyreduce: case 51: /* Line 1806 of yacc.c */ -#line 447 "libmemcached/csl/parser.yy" +#line 451 "libmemcached/csl/parser.yy" { (yyval.number)= MEMCACHED_DEFAULT_PORT;} break; case 52: /* Line 1806 of yacc.c */ -#line 449 "libmemcached/csl/parser.yy" +#line 453 "libmemcached/csl/parser.yy" { } break; case 53: /* Line 1806 of yacc.c */ -#line 453 "libmemcached/csl/parser.yy" +#line 457 "libmemcached/csl/parser.yy" { (yyval.number)= 1; } break; case 54: /* Line 1806 of yacc.c */ -#line 455 "libmemcached/csl/parser.yy" +#line 459 "libmemcached/csl/parser.yy" { } break; case 55: /* Line 1806 of yacc.c */ -#line 460 "libmemcached/csl/parser.yy" +#line 464 "libmemcached/csl/parser.yy" { (yyval.hash)= MEMCACHED_HASH_MD5; } @@ -2061,7 +2065,7 @@ yyreduce: case 56: /* Line 1806 of yacc.c */ -#line 464 "libmemcached/csl/parser.yy" +#line 468 "libmemcached/csl/parser.yy" { (yyval.hash)= MEMCACHED_HASH_CRC; } @@ -2070,7 +2074,7 @@ yyreduce: case 57: /* Line 1806 of yacc.c */ -#line 468 "libmemcached/csl/parser.yy" +#line 472 "libmemcached/csl/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1_64; } @@ -2079,7 +2083,7 @@ yyreduce: case 58: /* Line 1806 of yacc.c */ -#line 472 "libmemcached/csl/parser.yy" +#line 476 "libmemcached/csl/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1A_64; } @@ -2088,7 +2092,7 @@ yyreduce: case 59: /* Line 1806 of yacc.c */ -#line 476 "libmemcached/csl/parser.yy" +#line 480 "libmemcached/csl/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1_32; } @@ -2097,7 +2101,7 @@ yyreduce: case 60: /* Line 1806 of yacc.c */ -#line 480 "libmemcached/csl/parser.yy" +#line 484 "libmemcached/csl/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1A_32; } @@ -2106,7 +2110,7 @@ yyreduce: case 61: /* Line 1806 of yacc.c */ -#line 484 "libmemcached/csl/parser.yy" +#line 488 "libmemcached/csl/parser.yy" { (yyval.hash)= MEMCACHED_HASH_HSIEH; } @@ -2115,7 +2119,7 @@ yyreduce: case 62: /* Line 1806 of yacc.c */ -#line 488 "libmemcached/csl/parser.yy" +#line 492 "libmemcached/csl/parser.yy" { (yyval.hash)= MEMCACHED_HASH_MURMUR; } @@ -2124,7 +2128,7 @@ yyreduce: case 63: /* Line 1806 of yacc.c */ -#line 492 "libmemcached/csl/parser.yy" +#line 496 "libmemcached/csl/parser.yy" { (yyval.hash)= MEMCACHED_HASH_JENKINS; } @@ -2133,7 +2137,7 @@ yyreduce: case 64: /* Line 1806 of yacc.c */ -#line 499 "libmemcached/csl/parser.yy" +#line 503 "libmemcached/csl/parser.yy" { (yyval.string)= (yyvsp[(1) - (1)].string); } @@ -2142,7 +2146,7 @@ yyreduce: case 65: /* Line 1806 of yacc.c */ -#line 503 "libmemcached/csl/parser.yy" +#line 507 "libmemcached/csl/parser.yy" { (yyval.string)= (yyvsp[(1) - (1)].string); } @@ -2151,7 +2155,7 @@ yyreduce: case 66: /* Line 1806 of yacc.c */ -#line 510 "libmemcached/csl/parser.yy" +#line 514 "libmemcached/csl/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_CONSISTENT; } @@ -2160,7 +2164,7 @@ yyreduce: case 67: /* Line 1806 of yacc.c */ -#line 514 "libmemcached/csl/parser.yy" +#line 518 "libmemcached/csl/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_MODULA; } @@ -2169,7 +2173,7 @@ yyreduce: case 68: /* Line 1806 of yacc.c */ -#line 518 "libmemcached/csl/parser.yy" +#line 522 "libmemcached/csl/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_RANDOM; } @@ -2178,7 +2182,7 @@ yyreduce: /* Line 1806 of yacc.c */ -#line 2182 "libmemcached/csl/parser.cc" +#line 2186 "libmemcached/csl/parser.cc" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2409,7 +2413,7 @@ yyreturn: /* Line 2067 of yacc.c */ -#line 523 "libmemcached/csl/parser.yy" +#line 527 "libmemcached/csl/parser.yy" void Context::start()