From 5febc397f702ce74f79f3e590432c85b025a32fc Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Tue, 5 Jul 2011 12:51:39 -0700 Subject: [PATCH] Update chop rule. --- libmemcached/options/parser.cc | 152 ++++++++++++++++---------------- libmemcached/options/parser.yy | 6 +- libmemcached/options/scanner.cc | 2 +- libmemcached/options/scanner.l | 2 +- 4 files changed, 77 insertions(+), 85 deletions(-) diff --git a/libmemcached/options/parser.cc b/libmemcached/options/parser.cc index 936cc97b..096a3111 100644 --- a/libmemcached/options/parser.cc +++ b/libmemcached/options/parser.cc @@ -78,10 +78,6 @@ #line 36 "libmemcached/options/parser.yy" -#include - -#include - #include #include @@ -106,7 +102,7 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) /* Line 189 of yacc.c */ -#line 110 "libmemcached/options/parser.cc" +#line 106 "libmemcached/options/parser.cc" /* Enabling traces. */ #ifndef YYDEBUG @@ -218,7 +214,7 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) /* Line 264 of yacc.c */ -#line 222 "libmemcached/options/parser.cc" +#line 218 "libmemcached/options/parser.cc" #ifdef short # undef short @@ -527,13 +523,13 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 162, 162, 163, 167, 169, 171, 173, 178, 183, - 187, 191, 202, 210, 218, 225, 229, 233, 237, 241, - 248, 255, 266, 273, 280, 287, 293, 297, 301, 305, - 309, 313, 317, 321, 325, 329, 333, 337, 344, 348, - 352, 356, 360, 364, 368, 372, 376, 380, 384, 388, - 395, 396, 401, 402, 407, 411, 415, 419, 423, 427, - 431, 435, 439, 446, 450, 461, 465, 469 + 0, 158, 158, 159, 163, 165, 167, 169, 174, 179, + 183, 187, 198, 206, 214, 221, 225, 229, 233, 237, + 244, 251, 262, 269, 276, 283, 289, 293, 297, 301, + 305, 309, 313, 317, 321, 325, 329, 333, 340, 344, + 348, 352, 356, 360, 364, 368, 372, 376, 380, 384, + 391, 392, 397, 398, 403, 407, 411, 415, 419, 423, + 427, 431, 435, 442, 446, 457, 461, 465 }; #endif @@ -1525,28 +1521,28 @@ yyreduce: case 4: /* Line 1464 of yacc.c */ -#line 168 "libmemcached/options/parser.yy" +#line 164 "libmemcached/options/parser.yy" { ;} break; case 5: /* Line 1464 of yacc.c */ -#line 170 "libmemcached/options/parser.yy" +#line 166 "libmemcached/options/parser.yy" { ;} break; case 6: /* Line 1464 of yacc.c */ -#line 172 "libmemcached/options/parser.yy" +#line 168 "libmemcached/options/parser.yy" { ;} break; case 7: /* Line 1464 of yacc.c */ -#line 174 "libmemcached/options/parser.yy" +#line 170 "libmemcached/options/parser.yy" { context->set_end(); YYACCEPT; @@ -1556,7 +1552,7 @@ yyreduce: case 8: /* Line 1464 of yacc.c */ -#line 179 "libmemcached/options/parser.yy" +#line 175 "libmemcached/options/parser.yy" { context->rc= MEMCACHED_PARSE_USER_ERROR; parser_abort(context, NULL); @@ -1566,7 +1562,7 @@ yyreduce: case 9: /* Line 1464 of yacc.c */ -#line 184 "libmemcached/options/parser.yy" +#line 180 "libmemcached/options/parser.yy" { memcached_reset(context->memc); ;} @@ -1575,7 +1571,7 @@ yyreduce: case 10: /* Line 1464 of yacc.c */ -#line 188 "libmemcached/options/parser.yy" +#line 184 "libmemcached/options/parser.yy" { yydebug= 1; ;} @@ -1584,7 +1580,7 @@ yyreduce: case 11: /* Line 1464 of yacc.c */ -#line 192 "libmemcached/options/parser.yy" +#line 188 "libmemcached/options/parser.yy" { if ((context->rc= memcached_parse_configure_file(*context->memc, (yyvsp[(3) - (3)].string).c_str, (yyvsp[(3) - (3)].string).size)) != MEMCACHED_SUCCESS) { @@ -1596,7 +1592,7 @@ yyreduce: case 12: /* Line 1464 of yacc.c */ -#line 203 "libmemcached/options/parser.yy" +#line 199 "libmemcached/options/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)))) { @@ -1609,7 +1605,7 @@ yyreduce: case 13: /* Line 1464 of yacc.c */ -#line 211 "libmemcached/options/parser.yy" +#line 207 "libmemcached/options/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)))) { @@ -1622,7 +1618,7 @@ yyreduce: case 14: /* Line 1464 of yacc.c */ -#line 219 "libmemcached/options/parser.yy" +#line 215 "libmemcached/options/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)))) { @@ -1634,7 +1630,7 @@ yyreduce: case 15: /* Line 1464 of yacc.c */ -#line 226 "libmemcached/options/parser.yy" +#line 222 "libmemcached/options/parser.yy" { memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size); ;} @@ -1643,7 +1639,7 @@ yyreduce: case 16: /* Line 1464 of yacc.c */ -#line 230 "libmemcached/options/parser.yy" +#line 226 "libmemcached/options/parser.yy" { context->memc->configure.initial_pool_size= (yyvsp[(2) - (2)].number); ;} @@ -1652,7 +1648,7 @@ yyreduce: case 17: /* Line 1464 of yacc.c */ -#line 234 "libmemcached/options/parser.yy" +#line 230 "libmemcached/options/parser.yy" { context->memc->configure.max_pool_size= (yyvsp[(2) - (2)].number); ;} @@ -1661,7 +1657,7 @@ yyreduce: case 19: /* Line 1464 of yacc.c */ -#line 242 "libmemcached/options/parser.yy" +#line 238 "libmemcached/options/parser.yy" { if ((context->rc= memcached_set_namespace(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size)) != MEMCACHED_SUCCESS) { @@ -1673,7 +1669,7 @@ yyreduce: case 20: /* Line 1464 of yacc.c */ -#line 249 "libmemcached/options/parser.yy" +#line 245 "libmemcached/options/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (2)].distribution))) != MEMCACHED_SUCCESS) { @@ -1685,7 +1681,7 @@ yyreduce: case 21: /* Line 1464 of yacc.c */ -#line 256 "libmemcached/options/parser.yy" +#line 252 "libmemcached/options/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (4)].distribution))) != MEMCACHED_SUCCESS) { @@ -1701,7 +1697,7 @@ yyreduce: case 22: /* Line 1464 of yacc.c */ -#line 267 "libmemcached/options/parser.yy" +#line 263 "libmemcached/options/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_HASH, (yyvsp[(2) - (2)].hash))) != MEMCACHED_SUCCESS) { @@ -1713,7 +1709,7 @@ yyreduce: case 23: /* Line 1464 of yacc.c */ -#line 274 "libmemcached/options/parser.yy" +#line 270 "libmemcached/options/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS) { @@ -1725,7 +1721,7 @@ yyreduce: case 24: /* Line 1464 of yacc.c */ -#line 281 "libmemcached/options/parser.yy" +#line 277 "libmemcached/options/parser.yy" { if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS) { @@ -1737,7 +1733,7 @@ yyreduce: case 25: /* Line 1464 of yacc.c */ -#line 288 "libmemcached/options/parser.yy" +#line 284 "libmemcached/options/parser.yy" { ;} break; @@ -1745,7 +1741,7 @@ yyreduce: case 26: /* Line 1464 of yacc.c */ -#line 294 "libmemcached/options/parser.yy" +#line 290 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS; ;} @@ -1754,7 +1750,7 @@ yyreduce: case 27: /* Line 1464 of yacc.c */ -#line 298 "libmemcached/options/parser.yy" +#line 294 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT; ;} @@ -1763,7 +1759,7 @@ yyreduce: case 28: /* Line 1464 of yacc.c */ -#line 302 "libmemcached/options/parser.yy" +#line 298 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK; ;} @@ -1772,7 +1768,7 @@ yyreduce: case 29: /* Line 1464 of yacc.c */ -#line 306 "libmemcached/options/parser.yy" +#line 302 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK; ;} @@ -1781,7 +1777,7 @@ yyreduce: case 30: /* Line 1464 of yacc.c */ -#line 310 "libmemcached/options/parser.yy" +#line 306 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH; ;} @@ -1790,7 +1786,7 @@ yyreduce: case 31: /* Line 1464 of yacc.c */ -#line 314 "libmemcached/options/parser.yy" +#line 310 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS; ;} @@ -1799,7 +1795,7 @@ yyreduce: case 32: /* Line 1464 of yacc.c */ -#line 318 "libmemcached/options/parser.yy" +#line 314 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT; ;} @@ -1808,7 +1804,7 @@ yyreduce: case 33: /* Line 1464 of yacc.c */ -#line 322 "libmemcached/options/parser.yy" +#line 318 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT; ;} @@ -1817,7 +1813,7 @@ yyreduce: case 34: /* Line 1464 of yacc.c */ -#line 326 "libmemcached/options/parser.yy" +#line 322 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT; ;} @@ -1826,7 +1822,7 @@ yyreduce: case 35: /* Line 1464 of yacc.c */ -#line 330 "libmemcached/options/parser.yy" +#line 326 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT; ;} @@ -1835,7 +1831,7 @@ yyreduce: case 36: /* Line 1464 of yacc.c */ -#line 334 "libmemcached/options/parser.yy" +#line 330 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE; ;} @@ -1844,7 +1840,7 @@ yyreduce: case 37: /* Line 1464 of yacc.c */ -#line 338 "libmemcached/options/parser.yy" +#line 334 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE; ;} @@ -1853,7 +1849,7 @@ yyreduce: case 38: /* Line 1464 of yacc.c */ -#line 345 "libmemcached/options/parser.yy" +#line 341 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL; ;} @@ -1862,7 +1858,7 @@ yyreduce: case 39: /* Line 1464 of yacc.c */ -#line 349 "libmemcached/options/parser.yy" +#line 345 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS; ;} @@ -1871,7 +1867,7 @@ yyreduce: case 40: /* Line 1464 of yacc.c */ -#line 353 "libmemcached/options/parser.yy" +#line 349 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY; ;} @@ -1880,7 +1876,7 @@ yyreduce: case 41: /* Line 1464 of yacc.c */ -#line 357 "libmemcached/options/parser.yy" +#line 353 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY; ;} @@ -1889,7 +1885,7 @@ yyreduce: case 42: /* Line 1464 of yacc.c */ -#line 361 "libmemcached/options/parser.yy" +#line 357 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ; ;} @@ -1898,7 +1894,7 @@ yyreduce: case 43: /* Line 1464 of yacc.c */ -#line 365 "libmemcached/options/parser.yy" +#line 361 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS; ;} @@ -1907,7 +1903,7 @@ yyreduce: case 44: /* Line 1464 of yacc.c */ -#line 369 "libmemcached/options/parser.yy" +#line 365 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS; ;} @@ -1916,7 +1912,7 @@ yyreduce: case 45: /* Line 1464 of yacc.c */ -#line 373 "libmemcached/options/parser.yy" +#line 369 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY; ;} @@ -1925,7 +1921,7 @@ yyreduce: case 46: /* Line 1464 of yacc.c */ -#line 377 "libmemcached/options/parser.yy" +#line 373 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE; ;} @@ -1934,7 +1930,7 @@ yyreduce: case 47: /* Line 1464 of yacc.c */ -#line 381 "libmemcached/options/parser.yy" +#line 377 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE; ;} @@ -1943,7 +1939,7 @@ yyreduce: case 48: /* Line 1464 of yacc.c */ -#line 385 "libmemcached/options/parser.yy" +#line 381 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP; ;} @@ -1952,7 +1948,7 @@ yyreduce: case 49: /* Line 1464 of yacc.c */ -#line 389 "libmemcached/options/parser.yy" +#line 385 "libmemcached/options/parser.yy" { (yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY; ;} @@ -1961,35 +1957,35 @@ yyreduce: case 50: /* Line 1464 of yacc.c */ -#line 395 "libmemcached/options/parser.yy" +#line 391 "libmemcached/options/parser.yy" { (yyval.number)= MEMCACHED_DEFAULT_PORT;;} break; case 51: /* Line 1464 of yacc.c */ -#line 397 "libmemcached/options/parser.yy" +#line 393 "libmemcached/options/parser.yy" { ;} break; case 52: /* Line 1464 of yacc.c */ -#line 401 "libmemcached/options/parser.yy" +#line 397 "libmemcached/options/parser.yy" { (yyval.number)= 1; ;} break; case 53: /* Line 1464 of yacc.c */ -#line 403 "libmemcached/options/parser.yy" +#line 399 "libmemcached/options/parser.yy" { ;} break; case 54: /* Line 1464 of yacc.c */ -#line 408 "libmemcached/options/parser.yy" +#line 404 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_MD5; ;} @@ -1998,7 +1994,7 @@ yyreduce: case 55: /* Line 1464 of yacc.c */ -#line 412 "libmemcached/options/parser.yy" +#line 408 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_CRC; ;} @@ -2007,7 +2003,7 @@ yyreduce: case 56: /* Line 1464 of yacc.c */ -#line 416 "libmemcached/options/parser.yy" +#line 412 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1_64; ;} @@ -2016,7 +2012,7 @@ yyreduce: case 57: /* Line 1464 of yacc.c */ -#line 420 "libmemcached/options/parser.yy" +#line 416 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1A_64; ;} @@ -2025,7 +2021,7 @@ yyreduce: case 58: /* Line 1464 of yacc.c */ -#line 424 "libmemcached/options/parser.yy" +#line 420 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1_32; ;} @@ -2034,7 +2030,7 @@ yyreduce: case 59: /* Line 1464 of yacc.c */ -#line 428 "libmemcached/options/parser.yy" +#line 424 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1A_32; ;} @@ -2043,7 +2039,7 @@ yyreduce: case 60: /* Line 1464 of yacc.c */ -#line 432 "libmemcached/options/parser.yy" +#line 428 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_HSIEH; ;} @@ -2052,7 +2048,7 @@ yyreduce: case 61: /* Line 1464 of yacc.c */ -#line 436 "libmemcached/options/parser.yy" +#line 432 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_MURMUR; ;} @@ -2061,7 +2057,7 @@ yyreduce: case 62: /* Line 1464 of yacc.c */ -#line 440 "libmemcached/options/parser.yy" +#line 436 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_JENKINS; ;} @@ -2070,7 +2066,7 @@ yyreduce: case 63: /* Line 1464 of yacc.c */ -#line 447 "libmemcached/options/parser.yy" +#line 443 "libmemcached/options/parser.yy" { (yyval.string)= (yyvsp[(1) - (1)].string); ;} @@ -2079,7 +2075,7 @@ yyreduce: case 64: /* Line 1464 of yacc.c */ -#line 451 "libmemcached/options/parser.yy" +#line 447 "libmemcached/options/parser.yy" { (yyval.string)= (yyvsp[(1) - (1)].string); #if 0 @@ -2092,7 +2088,7 @@ yyreduce: case 65: /* Line 1464 of yacc.c */ -#line 462 "libmemcached/options/parser.yy" +#line 458 "libmemcached/options/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_CONSISTENT; ;} @@ -2101,7 +2097,7 @@ yyreduce: case 66: /* Line 1464 of yacc.c */ -#line 466 "libmemcached/options/parser.yy" +#line 462 "libmemcached/options/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_MODULA; ;} @@ -2110,7 +2106,7 @@ yyreduce: case 67: /* Line 1464 of yacc.c */ -#line 470 "libmemcached/options/parser.yy" +#line 466 "libmemcached/options/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_RANDOM; ;} @@ -2119,7 +2115,7 @@ yyreduce: /* Line 1464 of yacc.c */ -#line 2123 "libmemcached/options/parser.cc" +#line 2119 "libmemcached/options/parser.cc" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2331,7 +2327,7 @@ yyreturn: /* Line 1684 of yacc.c */ -#line 475 "libmemcached/options/parser.yy" +#line 471 "libmemcached/options/parser.yy" void Context::start() diff --git a/libmemcached/options/parser.yy b/libmemcached/options/parser.yy index f9388af3..81415226 100644 --- a/libmemcached/options/parser.yy +++ b/libmemcached/options/parser.yy @@ -29,16 +29,12 @@ %parse-param { Context *context } %parse-param { yyscan_t *scanner } %pure-parser -%require "2.2" +%require "2.4" %start begin %verbose %{ -#include - -#include - #include #include diff --git a/libmemcached/options/scanner.cc b/libmemcached/options/scanner.cc index 072d6680..db2e4465 100644 --- a/libmemcached/options/scanner.cc +++ b/libmemcached/options/scanner.cc @@ -1921,7 +1921,7 @@ case 63: YY_RULE_SETUP #line 187 "libmemcached/options/scanner.l" { - yytext[yyleng -1]= 0; + config_get_text(yyscanner)[yyleng -1]= 0; yylval->string.c_str= yytext +1; yylval->string.size= yyleng -2; return QUOTED_STRING; diff --git a/libmemcached/options/scanner.l b/libmemcached/options/scanner.l index 580290fb..cc00618d 100644 --- a/libmemcached/options/scanner.l +++ b/libmemcached/options/scanner.l @@ -185,7 +185,7 @@ JENKINS { return JENKINS; } } L?\"(\\.|[^\\"])*\" { - yytext[yyleng -1]= 0; + yyget_text(yyscanner)[yyleng -1]= 0; yylval->string.c_str= yytext +1; yylval->string.size= yyleng -2; return QUOTED_STRING; -- 2.30.2