projects
/
awesomized
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
3db2fad
)
Fix warning around in scanner.
author
Brian Aker
<brian@tangent.org>
Mon, 17 Sep 2012 10:28:59 +0000
(06:28 -0400)
committer
Brian Aker
<brian@tangent.org>
Mon, 17 Sep 2012 10:28:59 +0000
(06:28 -0400)
libmemcached/csl/parser.cc
patch
|
blob
|
history
libmemcached/csl/scanner.cc
patch
|
blob
|
history
libmemcached/csl/scanner.h
patch
|
blob
|
history
libmemcached/csl/scanner.l
patch
|
blob
|
history
diff --git
a/libmemcached/csl/parser.cc
b/libmemcached/csl/parser.cc
index fdc4ca67bc4587d0c6322cce3339e54d6314858f..4f29ac0b1cbab831f364f69d157b695c34310776 100644
(file)
--- a/
libmemcached/csl/parser.cc
+++ b/
libmemcached/csl/parser.cc
@@
-1557,28
+1557,28
@@
yyreduce:
{
case 4:
{
case 4:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 195 "libmemcached/csl/parser.yy"
{ }
break;
case 5:
#line 195 "libmemcached/csl/parser.yy"
{ }
break;
case 5:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 197 "libmemcached/csl/parser.yy"
{ }
break;
case 6:
#line 197 "libmemcached/csl/parser.yy"
{ }
break;
case 6:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 199 "libmemcached/csl/parser.yy"
{ }
break;
case 7:
#line 199 "libmemcached/csl/parser.yy"
{ }
break;
case 7:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 201 "libmemcached/csl/parser.yy"
{
context->set_end();
#line 201 "libmemcached/csl/parser.yy"
{
context->set_end();
@@
-1588,7
+1588,7
@@
yyreduce:
case 8:
case 8:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 206 "libmemcached/csl/parser.yy"
{
context->rc= MEMCACHED_PARSE_USER_ERROR;
#line 206 "libmemcached/csl/parser.yy"
{
context->rc= MEMCACHED_PARSE_USER_ERROR;
@@
-1598,7
+1598,7
@@
yyreduce:
case 9:
case 9:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 211 "libmemcached/csl/parser.yy"
{
memcached_reset(context->memc);
#line 211 "libmemcached/csl/parser.yy"
{
memcached_reset(context->memc);
@@
-1607,7
+1607,7
@@
yyreduce:
case 10:
case 10:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 215 "libmemcached/csl/parser.yy"
{
yydebug= 1;
#line 215 "libmemcached/csl/parser.yy"
{
yydebug= 1;
@@
-1616,7
+1616,7
@@
yyreduce:
case 11:
case 11:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 219 "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)
#line 219 "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)
@@
-1628,7
+1628,7
@@
yyreduce:
case 12:
case 12:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 230 "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), uint32_t((yyvsp[(4) - (4)].number)))))
#line 230 "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), uint32_t((yyvsp[(4) - (4)].number)))))
@@
-1643,7
+1643,7
@@
yyreduce:
case 13:
case 13:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 240 "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), uint32_t((yyvsp[(4) - (4)].number)))))
#line 240 "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), uint32_t((yyvsp[(4) - (4)].number)))))
@@
-1658,7
+1658,7
@@
yyreduce:
case 14:
case 14:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 250 "libmemcached/csl/parser.yy"
{
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)))))
#line 250 "libmemcached/csl/parser.yy"
{
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)))))
@@
-1672,7
+1672,7
@@
yyreduce:
case 15:
case 15:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 259 "libmemcached/csl/parser.yy"
{
memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size);
#line 259 "libmemcached/csl/parser.yy"
{
memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size);
@@
-1681,7
+1681,7
@@
yyreduce:
case 16:
case 16:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 263 "libmemcached/csl/parser.yy"
{
context->memc->configure.initial_pool_size= uint32_t((yyvsp[(2) - (2)].number));
#line 263 "libmemcached/csl/parser.yy"
{
context->memc->configure.initial_pool_size= uint32_t((yyvsp[(2) - (2)].number));
@@
-1690,7
+1690,7
@@
yyreduce:
case 17:
case 17:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 267 "libmemcached/csl/parser.yy"
{
context->memc->configure.max_pool_size= uint32_t((yyvsp[(2) - (2)].number));
#line 267 "libmemcached/csl/parser.yy"
{
context->memc->configure.max_pool_size= uint32_t((yyvsp[(2) - (2)].number));
@@
-1699,7
+1699,7
@@
yyreduce:
case 19:
case 19:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 275 "libmemcached/csl/parser.yy"
{
if (memcached_callback_get(context->memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL))
#line 275 "libmemcached/csl/parser.yy"
{
if (memcached_callback_get(context->memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL))
@@
-1716,7
+1716,7
@@
yyreduce:
case 20:
case 20:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 287 "libmemcached/csl/parser.yy"
{
memcached_flag(*context->memc, MEMCACHED_FLAG_IS_FETCHING_VERSION, true);
#line 287 "libmemcached/csl/parser.yy"
{
memcached_flag(*context->memc, MEMCACHED_FLAG_IS_FETCHING_VERSION, true);
@@
-1725,7
+1725,7
@@
yyreduce:
case 21:
case 21:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 291 "libmemcached/csl/parser.yy"
{
// Check to see if DISTRIBUTION has already been set
#line 291 "libmemcached/csl/parser.yy"
{
// Check to see if DISTRIBUTION has already been set
@@
-1743,7
+1743,7
@@
yyreduce:
case 22:
case 22:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 304 "libmemcached/csl/parser.yy"
{
// Check to see if DISTRIBUTION has already been set
#line 304 "libmemcached/csl/parser.yy"
{
// Check to see if DISTRIBUTION has already been set
@@
-1761,7
+1761,7
@@
yyreduce:
case 23:
case 23:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 317 "libmemcached/csl/parser.yy"
{
if (context->set_hash((yyvsp[(2) - (2)].hash)) == false)
#line 317 "libmemcached/csl/parser.yy"
{
if (context->set_hash((yyvsp[(2) - (2)].hash)) == false)
@@
-1773,7
+1773,7
@@
yyreduce:
case 24:
case 24:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 324 "libmemcached/csl/parser.yy"
{
if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS)
#line 324 "libmemcached/csl/parser.yy"
{
if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS)
@@
-1785,7
+1785,7
@@
yyreduce:
case 25:
case 25:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 331 "libmemcached/csl/parser.yy"
{
if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS)
#line 331 "libmemcached/csl/parser.yy"
{
if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS)
@@
-1799,7
+1799,7
@@
yyreduce:
case 26:
case 26:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 340 "libmemcached/csl/parser.yy"
{
}
#line 340 "libmemcached/csl/parser.yy"
{
}
@@
-1807,7
+1807,7
@@
yyreduce:
case 27:
case 27:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 346 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS;
#line 346 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS;
@@
-1816,7
+1816,7
@@
yyreduce:
case 28:
case 28:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 350 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
#line 350 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
@@
-1825,7
+1825,7
@@
yyreduce:
case 29:
case 29:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 354 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK;
#line 354 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK;
@@
-1834,7
+1834,7
@@
yyreduce:
case 30:
case 30:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 358 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK;
#line 358 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK;
@@
-1843,7
+1843,7
@@
yyreduce:
case 31:
case 31:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 362 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH;
#line 362 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH;
@@
-1852,7
+1852,7
@@
yyreduce:
case 32:
case 32:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 366 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS;
#line 366 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS;
@@
-1861,7
+1861,7
@@
yyreduce:
case 33:
case 33:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 370 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT;
#line 370 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT;
@@
-1870,7
+1870,7
@@
yyreduce:
case 34:
case 34:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 374 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT;
#line 374 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT;
@@
-1879,7
+1879,7
@@
yyreduce:
case 35:
case 35:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 378 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
#line 378 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
@@
-1888,7
+1888,7
@@
yyreduce:
case 36:
case 36:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 382 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT;
#line 382 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT;
@@
-1897,7
+1897,7
@@
yyreduce:
case 37:
case 37:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 386 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE;
#line 386 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE;
@@
-1906,7
+1906,7
@@
yyreduce:
case 38:
case 38:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 390 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE;
#line 390 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE;
@@
-1915,7
+1915,7
@@
yyreduce:
case 39:
case 39:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 397 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
#line 397 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
@@
-1924,7
+1924,7
@@
yyreduce:
case 40:
case 40:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 401 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
#line 401 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
@@
-1933,7
+1933,7
@@
yyreduce:
case 41:
case 41:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 405 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
#line 405 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
@@
-1942,7
+1942,7
@@
yyreduce:
case 42:
case 42:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 409 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY;
#line 409 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY;
@@
-1951,7
+1951,7
@@
yyreduce:
case 43:
case 43:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 413 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ;
#line 413 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ;
@@
-1960,7
+1960,7
@@
yyreduce:
case 44:
case 44:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 417 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS;
#line 417 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS;
@@
-1969,7
+1969,7
@@
yyreduce:
case 45:
case 45:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 421 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS;
#line 421 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS;
@@
-1978,7
+1978,7
@@
yyreduce:
case 46:
case 46:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 425 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY;
#line 425 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY;
@@
-1987,7
+1987,7
@@
yyreduce:
case 47:
case 47:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 429 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE;
#line 429 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE;
@@
-1996,7
+1996,7
@@
yyreduce:
case 48:
case 48:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 433 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE;
#line 433 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE;
@@
-2005,7
+2005,7
@@
yyreduce:
case 49:
case 49:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 437 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP;
#line 437 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP;
@@
-2014,7
+2014,7
@@
yyreduce:
case 50:
case 50:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 441 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY;
#line 441 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY;
@@
-2023,35
+2023,35
@@
yyreduce:
case 51:
case 51:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 447 "libmemcached/csl/parser.yy"
{ (yyval.number)= MEMCACHED_DEFAULT_PORT;}
break;
case 52:
#line 447 "libmemcached/csl/parser.yy"
{ (yyval.number)= MEMCACHED_DEFAULT_PORT;}
break;
case 52:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 449 "libmemcached/csl/parser.yy"
{ }
break;
case 53:
#line 449 "libmemcached/csl/parser.yy"
{ }
break;
case 53:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 453 "libmemcached/csl/parser.yy"
{ (yyval.number)= 1; }
break;
case 54:
#line 453 "libmemcached/csl/parser.yy"
{ (yyval.number)= 1; }
break;
case 54:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 455 "libmemcached/csl/parser.yy"
{ }
break;
case 55:
#line 455 "libmemcached/csl/parser.yy"
{ }
break;
case 55:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 460 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_MD5;
#line 460 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_MD5;
@@
-2060,7
+2060,7
@@
yyreduce:
case 56:
case 56:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 464 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_CRC;
#line 464 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_CRC;
@@
-2069,7
+2069,7
@@
yyreduce:
case 57:
case 57:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 468 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1_64;
#line 468 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1_64;
@@
-2078,7
+2078,7
@@
yyreduce:
case 58:
case 58:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 472 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1A_64;
#line 472 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1A_64;
@@
-2087,7
+2087,7
@@
yyreduce:
case 59:
case 59:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 476 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1_32;
#line 476 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1_32;
@@
-2096,7
+2096,7
@@
yyreduce:
case 60:
case 60:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 480 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1A_32;
#line 480 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1A_32;
@@
-2105,7
+2105,7
@@
yyreduce:
case 61:
case 61:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 484 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_HSIEH;
#line 484 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_HSIEH;
@@
-2114,7
+2114,7
@@
yyreduce:
case 62:
case 62:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 488 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_MURMUR;
#line 488 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_MURMUR;
@@
-2123,7
+2123,7
@@
yyreduce:
case 63:
case 63:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 492 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_JENKINS;
#line 492 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_JENKINS;
@@
-2132,7
+2132,7
@@
yyreduce:
case 64:
case 64:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 499 "libmemcached/csl/parser.yy"
{
(yyval.string)= (yyvsp[(1) - (1)].string);
#line 499 "libmemcached/csl/parser.yy"
{
(yyval.string)= (yyvsp[(1) - (1)].string);
@@
-2141,7
+2141,7
@@
yyreduce:
case 65:
case 65:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 503 "libmemcached/csl/parser.yy"
{
(yyval.string)= (yyvsp[(1) - (1)].string);
#line 503 "libmemcached/csl/parser.yy"
{
(yyval.string)= (yyvsp[(1) - (1)].string);
@@
-2150,7
+2150,7
@@
yyreduce:
case 66:
case 66:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 510 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_CONSISTENT;
#line 510 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_CONSISTENT;
@@
-2159,7
+2159,7
@@
yyreduce:
case 67:
case 67:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 514 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_MODULA;
#line 514 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_MODULA;
@@
-2168,7
+2168,7
@@
yyreduce:
case 68:
case 68:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 518 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_RANDOM;
#line 518 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_RANDOM;
@@
-2177,7
+2177,7
@@
yyreduce:
-/* Line 18
21
of yacc.c */
+/* Line 18
06
of yacc.c */
#line 2182 "libmemcached/csl/parser.cc"
default: break;
}
#line 2182 "libmemcached/csl/parser.cc"
default: break;
}
diff --git
a/libmemcached/csl/scanner.cc
b/libmemcached/csl/scanner.cc
index 6e4979b0bda421746ea36e1cb6a4d7ff051998ae..a89abb6f8c6ae5359fd43203adf09375739c6d29 100644
(file)
--- a/
libmemcached/csl/scanner.cc
+++ b/
libmemcached/csl/scanner.cc
@@
-11,6
+11,7
@@
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wmissing-declarations"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#pragma GCC diagnostic ignored "-Wunused-result"
#endif
#define YY_EXTRA_TYPE Context*
#endif
#define YY_EXTRA_TYPE Context*
@@
-18,7
+19,7
@@
-#line 2
2
"libmemcached/csl/scanner.cc"
+#line 2
3
"libmemcached/csl/scanner.cc"
#define YY_INT_ALIGNED short int
#define YY_INT_ALIGNED short int
@@
-65,7
+66,6
@@
typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
@@
-189,11
+189,6
@@
typedef void* yyscan_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
#define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2
#define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2
@@
-216,6
+211,11
@@
typedef size_t yy_size_t;
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@@
-233,7
+233,7
@@
struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
-
yy_size_
t yy_n_chars;
+
in
t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@
-312,7
+312,7
@@
static void config__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanne
YY_BUFFER_STATE config__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE config__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE config__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE config__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE config__scan_bytes (yyconst char *bytes,
yy_size_
t len ,yyscan_t yyscanner );
+YY_BUFFER_STATE config__scan_bytes (yyconst char *bytes,
in
t len ,yyscan_t yyscanner );
void *config_alloc (yy_size_t ,yyscan_t yyscanner );
void *config_realloc (void *,yy_size_t ,yyscan_t yyscanner );
void *config_alloc (yy_size_t ,yyscan_t yyscanner );
void *config_realloc (void *,yy_size_t ,yyscan_t yyscanner );
@@
-363,7
+363,7
@@
static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*/
#define YY_DO_BEFORE_ACTION \
yyg->yytext_ptr = yy_bp; \
*/
#define YY_DO_BEFORE_ACTION \
yyg->yytext_ptr = yy_bp; \
- yyleng = (
yy_
size_t) (yy_cp - yy_bp); \
+ yyleng = (size_t) (yy_cp - yy_bp); \
yyg->yy_hold_char = *yy_cp; \
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
yyg->yy_hold_char = *yy_cp; \
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
@@
-1062,7
+1062,7
@@
static yyconst flex_int16_t yy_chk[1815] =
*
*/
*
*/
-#line 5
8
"libmemcached/csl/scanner.l"
+#line 5
9
"libmemcached/csl/scanner.l"
#include <cstdlib>
#include <cstring>
#include <cstdlib>
#include <cstring>
@@
-1120,8
+1120,8
@@
struct yyguts_t
size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char;
size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char;
-
yy_size_
t yy_n_chars;
-
yy_size_
t yyleng_r;
+
in
t yy_n_chars;
+
in
t yyleng_r;
char *yy_c_buf_p;
int yy_init;
int yy_start;
char *yy_c_buf_p;
int yy_init;
int yy_start;
@@
-1174,7
+1174,7
@@
FILE *config_get_out (yyscan_t yyscanner );
void config_set_out (FILE * out_str ,yyscan_t yyscanner );
void config_set_out (FILE * out_str ,yyscan_t yyscanner );
-
yy_size_
t config_get_leng (yyscan_t yyscanner );
+
in
t config_get_leng (yyscan_t yyscanner );
char *config_get_text (yyscan_t yyscanner );
char *config_get_text (yyscan_t yyscanner );
@@
-1182,6
+1182,10
@@
int config_get_lineno (yyscan_t yyscanner );
void config_set_lineno (int line_number ,yyscan_t yyscanner );
void config_set_lineno (int line_number ,yyscan_t yyscanner );
+int config_get_column (yyscan_t yyscanner );
+
+void config_set_column (int column_no ,yyscan_t yyscanner );
+
YYSTYPE * config_get_lval (yyscan_t yyscanner );
void config_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
YYSTYPE * config_get_lval (yyscan_t yyscanner );
void config_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@@
-1226,7
+1230,7
@@
static int input (yyscan_t yyscanner );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO
fwrite( yytext, yyleng, 1, yyout
)
+#define ECHO
do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0
)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@
-1237,7
+1241,7
@@
static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
-
yy_size_t
n; \
+
unsigned
n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@
-1325,11
+1329,11
@@
YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 10
0
"libmemcached/csl/scanner.l"
+#line 10
1
"libmemcached/csl/scanner.l"
-#line 133
3
"libmemcached/csl/scanner.cc"
+#line 133
7
"libmemcached/csl/scanner.cc"
yylval = yylval_param;
yylval = yylval_param;
@@
-1413,28
+1417,28
@@
do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
case 1:
YY_RULE_SETUP
-#line 10
3
"libmemcached/csl/scanner.l"
+#line 10
4
"libmemcached/csl/scanner.l"
{ return yytext[0];}
YY_BREAK
case 2:
YY_RULE_SETUP
{ return yytext[0];}
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 10
5
"libmemcached/csl/scanner.l"
+#line 10
6
"libmemcached/csl/scanner.l"
{ yylval->number= atoi(yytext); return (NUMBER); }
YY_BREAK
case 3:
YY_RULE_SETUP
{ yylval->number= atoi(yytext); return (NUMBER); }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 10
7
"libmemcached/csl/scanner.l"
+#line 10
8
"libmemcached/csl/scanner.l"
{ yylval->number= atoi(yytext +1); return PORT; }
YY_BREAK
case 4:
YY_RULE_SETUP
{ yylval->number= atoi(yytext +1); return PORT; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 1
09
"libmemcached/csl/scanner.l"
+#line 1
10
"libmemcached/csl/scanner.l"
{ yylval->number= atoi(yytext +2); return WEIGHT_START; }
YY_BREAK
case 5:
/* rule 5 can match eol */
YY_RULE_SETUP
{ yylval->number= atoi(yytext +2); return WEIGHT_START; }
YY_BREAK
case 5:
/* rule 5 can match eol */
YY_RULE_SETUP
-#line 11
1
"libmemcached/csl/scanner.l"
+#line 11
2
"libmemcached/csl/scanner.l"
; /* skip whitespace */
YY_BREAK
case 6:
; /* skip whitespace */
YY_BREAK
case 6:
@@
-1442,224
+1446,224
@@
case 6:
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 11
4
"libmemcached/csl/scanner.l"
+#line 11
5
"libmemcached/csl/scanner.l"
{
return COMMENT;
}
YY_BREAK
case 7:
YY_RULE_SETUP
{
return COMMENT;
}
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 11
8
"libmemcached/csl/scanner.l"
+#line 11
9
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; yyextra->set_server(); return yyextra->previous_token= SERVER; }
YY_BREAK
case 8:
YY_RULE_SETUP
{ yyextra->begin= yytext; yyextra->set_server(); return yyextra->previous_token= SERVER; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 12
0
"libmemcached/csl/scanner.l"
+#line 12
1
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SOCKET; }
YY_BREAK
case 9:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= SOCKET; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 12
2
"libmemcached/csl/scanner.l"
+#line 12
3
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= BINARY_PROTOCOL; }
YY_BREAK
case 10:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= BINARY_PROTOCOL; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 12
3
"libmemcached/csl/scanner.l"
+#line 12
4
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= BUFFER_REQUESTS; }
YY_BREAK
case 11:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= BUFFER_REQUESTS; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 12
4
"libmemcached/csl/scanner.l"
+#line 12
5
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= CONFIGURE_FILE; }
YY_BREAK
case 12:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= CONFIGURE_FILE; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 12
5
"libmemcached/csl/scanner.l"
+#line 12
6
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= CONNECT_TIMEOUT; }
YY_BREAK
case 13:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= CONNECT_TIMEOUT; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 12
6
"libmemcached/csl/scanner.l"
+#line 12
7
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= DISTRIBUTION; }
YY_BREAK
case 14:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= DISTRIBUTION; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 12
7
"libmemcached/csl/scanner.l"
+#line 12
8
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= HASH_WITH_NAMESPACE; }
YY_BREAK
case 15:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= HASH_WITH_NAMESPACE; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 12
8
"libmemcached/csl/scanner.l"
+#line 12
9
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= HASH; }
YY_BREAK
case 16:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= HASH; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 1
29
"libmemcached/csl/scanner.l"
+#line 1
30
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= IO_BYTES_WATERMARK; }
YY_BREAK
case 17:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= IO_BYTES_WATERMARK; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 13
0
"libmemcached/csl/scanner.l"
+#line 13
1
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= IO_KEY_PREFETCH; }
YY_BREAK
case 18:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= IO_KEY_PREFETCH; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 13
1
"libmemcached/csl/scanner.l"
+#line 13
2
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= IO_MSG_WATERMARK; }
YY_BREAK
case 19:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= IO_MSG_WATERMARK; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 13
2
"libmemcached/csl/scanner.l"
+#line 13
3
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= NOREPLY; }
YY_BREAK
case 20:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= NOREPLY; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 13
3
"libmemcached/csl/scanner.l"
+#line 13
4
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= NUMBER_OF_REPLICAS; }
YY_BREAK
case 21:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= NUMBER_OF_REPLICAS; }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 13
4
"libmemcached/csl/scanner.l"
+#line 13
5
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= POLL_TIMEOUT; }
YY_BREAK
case 22:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= POLL_TIMEOUT; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 13
5
"libmemcached/csl/scanner.l"
+#line 13
6
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= RANDOMIZE_REPLICA_READ; }
YY_BREAK
case 23:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= RANDOMIZE_REPLICA_READ; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 13
6
"libmemcached/csl/scanner.l"
+#line 13
7
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= RCV_TIMEOUT; }
YY_BREAK
case 24:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= RCV_TIMEOUT; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 13
7
"libmemcached/csl/scanner.l"
+#line 13
8
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= REMOVE_FAILED_SERVERS; }
YY_BREAK
case 25:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= REMOVE_FAILED_SERVERS; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 13
8
"libmemcached/csl/scanner.l"
+#line 13
9
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= RETRY_TIMEOUT; }
YY_BREAK
case 26:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= RETRY_TIMEOUT; }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 1
39
"libmemcached/csl/scanner.l"
+#line 1
40
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SND_TIMEOUT; }
YY_BREAK
case 27:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= SND_TIMEOUT; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 14
0
"libmemcached/csl/scanner.l"
+#line 14
1
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SOCKET_RECV_SIZE; }
YY_BREAK
case 28:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= SOCKET_RECV_SIZE; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 14
1
"libmemcached/csl/scanner.l"
+#line 14
2
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SOCKET_SEND_SIZE; }
YY_BREAK
case 29:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= SOCKET_SEND_SIZE; }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 14
2
"libmemcached/csl/scanner.l"
+#line 14
3
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SORT_HOSTS; }
YY_BREAK
case 30:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= SORT_HOSTS; }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 14
3
"libmemcached/csl/scanner.l"
+#line 14
4
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SUPPORT_CAS; }
YY_BREAK
case 31:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= SUPPORT_CAS; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 14
4
"libmemcached/csl/scanner.l"
+#line 14
5
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= _TCP_KEEPALIVE; }
YY_BREAK
case 32:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= _TCP_KEEPALIVE; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 14
5
"libmemcached/csl/scanner.l"
+#line 14
6
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= _TCP_KEEPIDLE; }
YY_BREAK
case 33:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= _TCP_KEEPIDLE; }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 14
6
"libmemcached/csl/scanner.l"
+#line 14
7
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= _TCP_NODELAY; }
YY_BREAK
case 34:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= _TCP_NODELAY; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 14
7
"libmemcached/csl/scanner.l"
+#line 14
8
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= USE_UDP; }
YY_BREAK
case 35:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= USE_UDP; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 14
8
"libmemcached/csl/scanner.l"
+#line 14
9
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= USER_DATA; }
YY_BREAK
case 36:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= USER_DATA; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 1
49
"libmemcached/csl/scanner.l"
+#line 1
50
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= VERIFY_KEY; }
YY_BREAK
case 37:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= VERIFY_KEY; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 15
1
"libmemcached/csl/scanner.l"
+#line 15
2
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= POOL_MIN; }
YY_BREAK
case 38:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= POOL_MIN; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 15
2
"libmemcached/csl/scanner.l"
+#line 15
3
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= POOL_MAX; }
YY_BREAK
case 39:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= POOL_MAX; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 15
4
"libmemcached/csl/scanner.l"
+#line 15
5
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= NAMESPACE; }
YY_BREAK
case 40:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= NAMESPACE; }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 15
6
"libmemcached/csl/scanner.l"
+#line 15
7
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= FETCH_VERSION; }
YY_BREAK
case 41:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= FETCH_VERSION; }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 15
8
"libmemcached/csl/scanner.l"
+#line 15
9
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= INCLUDE; }
YY_BREAK
case 42:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= INCLUDE; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 1
59
"libmemcached/csl/scanner.l"
+#line 1
60
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= RESET; }
YY_BREAK
case 43:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= RESET; }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 16
0
"libmemcached/csl/scanner.l"
+#line 16
1
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= PARSER_DEBUG; }
YY_BREAK
case 44:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= PARSER_DEBUG; }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 16
1
"libmemcached/csl/scanner.l"
+#line 16
2
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= SERVERS; }
YY_BREAK
case 45:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= SERVERS; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 16
2
"libmemcached/csl/scanner.l"
+#line 16
3
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= END; }
YY_BREAK
case 46:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= END; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 16
3
"libmemcached/csl/scanner.l"
+#line 16
4
"libmemcached/csl/scanner.l"
{ yyextra->begin= yytext; return yyextra->previous_token= ERROR; }
YY_BREAK
case 47:
YY_RULE_SETUP
{ yyextra->begin= yytext; return yyextra->previous_token= ERROR; }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 16
5
"libmemcached/csl/scanner.l"
+#line 16
6
"libmemcached/csl/scanner.l"
{ return yyextra->previous_token= TRUE; }
YY_BREAK
case 48:
YY_RULE_SETUP
{ return yyextra->previous_token= TRUE; }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 16
6
"libmemcached/csl/scanner.l"
+#line 16
7
"libmemcached/csl/scanner.l"
{ return yyextra->previous_token= FALSE; }
YY_BREAK
case 49:
YY_RULE_SETUP
{ return yyextra->previous_token= FALSE; }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 1
69
"libmemcached/csl/scanner.l"
+#line 1
70
"libmemcached/csl/scanner.l"
{
yyextra->begin= yytext;
return UNKNOWN_OPTION;
{
yyextra->begin= yytext;
return UNKNOWN_OPTION;
@@
-1667,67
+1671,67
@@
YY_RULE_SETUP
YY_BREAK
case 50:
YY_RULE_SETUP
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 17
4
"libmemcached/csl/scanner.l"
+#line 17
5
"libmemcached/csl/scanner.l"
{ return CONSISTENT; }
YY_BREAK
case 51:
YY_RULE_SETUP
{ return CONSISTENT; }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 17
5
"libmemcached/csl/scanner.l"
+#line 17
6
"libmemcached/csl/scanner.l"
{ return MODULA; }
YY_BREAK
case 52:
YY_RULE_SETUP
{ return MODULA; }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 17
6
"libmemcached/csl/scanner.l"
+#line 17
7
"libmemcached/csl/scanner.l"
{ return RANDOM; }
YY_BREAK
case 53:
YY_RULE_SETUP
{ return RANDOM; }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 17
8
"libmemcached/csl/scanner.l"
+#line 17
9
"libmemcached/csl/scanner.l"
{ return MD5; }
YY_BREAK
case 54:
YY_RULE_SETUP
{ return MD5; }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 1
79
"libmemcached/csl/scanner.l"
+#line 1
80
"libmemcached/csl/scanner.l"
{ return CRC; }
YY_BREAK
case 55:
YY_RULE_SETUP
{ return CRC; }
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 18
0
"libmemcached/csl/scanner.l"
+#line 18
1
"libmemcached/csl/scanner.l"
{ return FNV1_64; }
YY_BREAK
case 56:
YY_RULE_SETUP
{ return FNV1_64; }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 18
1
"libmemcached/csl/scanner.l"
+#line 18
2
"libmemcached/csl/scanner.l"
{ return FNV1A_64; }
YY_BREAK
case 57:
YY_RULE_SETUP
{ return FNV1A_64; }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 18
2
"libmemcached/csl/scanner.l"
+#line 18
3
"libmemcached/csl/scanner.l"
{ return FNV1_32; }
YY_BREAK
case 58:
YY_RULE_SETUP
{ return FNV1_32; }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 18
3
"libmemcached/csl/scanner.l"
+#line 18
4
"libmemcached/csl/scanner.l"
{ return FNV1A_32; }
YY_BREAK
case 59:
YY_RULE_SETUP
{ return FNV1A_32; }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 18
4
"libmemcached/csl/scanner.l"
+#line 18
5
"libmemcached/csl/scanner.l"
{ return HSIEH; }
YY_BREAK
case 60:
YY_RULE_SETUP
{ return HSIEH; }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 18
5
"libmemcached/csl/scanner.l"
+#line 18
6
"libmemcached/csl/scanner.l"
{ return MURMUR; }
YY_BREAK
case 61:
YY_RULE_SETUP
{ return MURMUR; }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 18
6
"libmemcached/csl/scanner.l"
+#line 18
7
"libmemcached/csl/scanner.l"
{ return JENKINS; }
YY_BREAK
case 62:
YY_RULE_SETUP
{ return JENKINS; }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 18
8
"libmemcached/csl/scanner.l"
+#line 18
9
"libmemcached/csl/scanner.l"
{
yyextra->hostname(yytext, yyleng, yylval->server);
return IPADDRESS;
{
yyextra->hostname(yytext, yyleng, yylval->server);
return IPADDRESS;
@@
-1735,7
+1739,7
@@
YY_RULE_SETUP
YY_BREAK
case 63:
YY_RULE_SETUP
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 19
3
"libmemcached/csl/scanner.l"
+#line 19
4
"libmemcached/csl/scanner.l"
{
if (yyextra->is_server())
{
{
if (yyextra->is_server())
{
@@
-1752,7
+1756,7
@@
YY_RULE_SETUP
case 64:
/* rule 64 can match eol */
YY_RULE_SETUP
case 64:
/* rule 64 can match eol */
YY_RULE_SETUP
-#line 20
6
"libmemcached/csl/scanner.l"
+#line 20
7
"libmemcached/csl/scanner.l"
{
config_get_text(yyscanner)[yyleng -1]= 0;
yyextra->string_buffer(yytext +1, yyleng -2, yylval->string);
{
config_get_text(yyscanner)[yyleng -1]= 0;
yyextra->string_buffer(yytext +1, yyleng -2, yylval->string);
@@
-1761,7
+1765,7
@@
YY_RULE_SETUP
YY_BREAK
case 65:
YY_RULE_SETUP
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 21
2
"libmemcached/csl/scanner.l"
+#line 21
3
"libmemcached/csl/scanner.l"
{
yyextra->begin= yytext;
return UNKNOWN;
{
yyextra->begin= yytext;
return UNKNOWN;
@@
-1769,10
+1773,10
@@
YY_RULE_SETUP
YY_BREAK
case 66:
YY_RULE_SETUP
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 21
7
"libmemcached/csl/scanner.l"
+#line 21
8
"libmemcached/csl/scanner.l"
ECHO;
YY_BREAK
ECHO;
YY_BREAK
-#line 17
76
"libmemcached/csl/scanner.cc"
+#line 17
80
"libmemcached/csl/scanner.cc"
case YY_STATE_EOF(INITIAL):
yyterminate();
case YY_STATE_EOF(INITIAL):
yyterminate();
@@
-1960,7
+1964,7
@@
static int yy_get_next_buffer (yyscan_t yyscanner)
else
{
else
{
-
yy_size_
t num_to_read =
+
in
t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@
-1974,7
+1978,7
@@
static int yy_get_next_buffer (yyscan_t yyscanner)
if ( b->yy_is_our_buffer )
{
if ( b->yy_is_our_buffer )
{
-
yy_size_
t new_size = b->yy_buf_size * 2;
+
in
t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@
-2005,7
+2009,7
@@
static int yy_get_next_buffer (yyscan_t yyscanner)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- yyg->yy_n_chars, num_to_read );
+ yyg->yy_n_chars,
(size_t)
num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
}
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
}
@@
-2131,7
+2135,7
@@
static int yy_get_next_buffer (yyscan_t yyscanner)
else
{ /* need more input */
else
{ /* need more input */
-
yy_size_
t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+
in
t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
++yyg->yy_c_buf_p;
switch ( yy_get_next_buffer( yyscanner ) )
++yyg->yy_c_buf_p;
switch ( yy_get_next_buffer( yyscanner ) )
@@
-2155,7
+2159,7
@@
static int yy_get_next_buffer (yyscan_t yyscanner)
case EOB_ACT_END_OF_FILE:
{
if ( config_wrap(yyscanner ) )
case EOB_ACT_END_OF_FILE:
{
if ( config_wrap(yyscanner ) )
- return
0
;
+ return
EOF
;
if ( ! yyg->yy_did_buffer_switch_on_eof )
YY_NEW_FILE;
if ( ! yyg->yy_did_buffer_switch_on_eof )
YY_NEW_FILE;
@@
-2413,7
+2417,7
@@
void config_pop_buffer_state (yyscan_t yyscanner)
*/
static void config_ensure_buffer_stack (yyscan_t yyscanner)
{
*/
static void config_ensure_buffer_stack (yyscan_t yyscanner)
{
-
yy_size_
t num_to_alloc;
+
in
t num_to_alloc;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (!yyg->yy_buffer_stack) {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (!yyg->yy_buffer_stack) {
@@
-2511,11
+2515,12
@@
YY_BUFFER_STATE config__scan_string (yyconst char * yystr , yyscan_t yyscanner)
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
*/
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE config__scan_bytes (yyconst char * yybytes,
yy_size_
t _yybytes_len , yyscan_t yyscanner)
+YY_BUFFER_STATE config__scan_bytes (yyconst char * yybytes,
in
t _yybytes_len , yyscan_t yyscanner)
{
YY_BUFFER_STATE b;
char *buf;
{
YY_BUFFER_STATE b;
char *buf;
- yy_size_t n, i;
+ yy_size_t n;
+ int i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
@@
-2544,10
+2549,10
@@
YY_BUFFER_STATE config__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes
#define YY_EXIT_FAILURE 2
#endif
#define YY_EXIT_FAILURE 2
#endif
-static
__attribute__((noreturn))
void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
+static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
{
{
- (void) fprintf( stderr, "%s\n", msg );
- exit( YY_EXIT_FAILURE );
+
(void) fprintf( stderr, "%s\n", msg );
+
exit( YY_EXIT_FAILURE );
}
/* Redefine yyless() so it works in section 3 code. */
}
/* Redefine yyless() so it works in section 3 code. */
@@
-2625,7
+2630,7
@@
FILE *config_get_out (yyscan_t yyscanner)
/** Get the length of the current token.
* @param yyscanner The scanner object.
*/
/** Get the length of the current token.
* @param yyscanner The scanner object.
*/
-
yy_size_
t config_get_leng (yyscan_t yyscanner)
+
in
t config_get_leng (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yyleng;
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yyleng;
@@
-2900,7
+2905,7
@@
void config_free (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
#define YYTABLES_NAME "yytables"
-#line 21
7
"libmemcached/csl/scanner.l"
+#line 21
8
"libmemcached/csl/scanner.l"
diff --git
a/libmemcached/csl/scanner.h
b/libmemcached/csl/scanner.h
index 745864127e0cede052c085e9299d2b64d5ff341a..1588c283081049a68d9bbb233825daa58c2c403a 100644
(file)
--- a/
libmemcached/csl/scanner.h
+++ b/
libmemcached/csl/scanner.h
@@
-15,6
+15,7
@@
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wmissing-declarations"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#pragma GCC diagnostic ignored "-Wunused-result"
#endif
#define YY_EXTRA_TYPE Context*
#endif
#define YY_EXTRA_TYPE Context*
@@
-22,7
+23,7
@@
-#line 2
6
"libmemcached/csl/scanner.h"
+#line 2
7
"libmemcached/csl/scanner.h"
#define YY_INT_ALIGNED short int
#define YY_INT_ALIGNED short int
@@
-69,7
+70,6
@@
typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
@@
-180,7
+180,7
@@
struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
-
yy_size_
t yy_n_chars;
+
in
t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@
-224,7
+224,7
@@
void config_pop_buffer_state (yyscan_t yyscanner );
YY_BUFFER_STATE config__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE config__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
YY_BUFFER_STATE config__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE config__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE config__scan_bytes (yyconst char *bytes,
yy_size_
t len ,yyscan_t yyscanner );
+YY_BUFFER_STATE config__scan_bytes (yyconst char *bytes,
in
t len ,yyscan_t yyscanner );
void *config_alloc (yy_size_t ,yyscan_t yyscanner );
void *config_realloc (void *,yy_size_t ,yyscan_t yyscanner );
void *config_alloc (yy_size_t ,yyscan_t yyscanner );
void *config_realloc (void *,yy_size_t ,yyscan_t yyscanner );
@@
-279,7
+279,7
@@
FILE *config_get_out (yyscan_t yyscanner );
void config_set_out (FILE * out_str ,yyscan_t yyscanner );
void config_set_out (FILE * out_str ,yyscan_t yyscanner );
-
yy_size_
t config_get_leng (yyscan_t yyscanner );
+
in
t config_get_leng (yyscan_t yyscanner );
char *config_get_text (yyscan_t yyscanner );
char *config_get_text (yyscan_t yyscanner );
@@
-287,6
+287,10
@@
int config_get_lineno (yyscan_t yyscanner );
void config_set_lineno (int line_number ,yyscan_t yyscanner );
void config_set_lineno (int line_number ,yyscan_t yyscanner );
+int config_get_column (yyscan_t yyscanner );
+
+void config_set_column (int column_no ,yyscan_t yyscanner );
+
YYSTYPE * config_get_lval (yyscan_t yyscanner );
void config_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
YYSTYPE * config_get_lval (yyscan_t yyscanner );
void config_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@@
-352,9
+356,9
@@
extern int config_lex \
#undef YY_DECL
#endif
#undef YY_DECL
#endif
-#line 21
7
"libmemcached/csl/scanner.l"
+#line 21
8
"libmemcached/csl/scanner.l"
-#line 3
59
"libmemcached/csl/scanner.h"
+#line 3
63
"libmemcached/csl/scanner.h"
#undef config_IN_HEADER
#endif /* config_HEADER_H */
#undef config_IN_HEADER
#endif /* config_HEADER_H */
diff --git
a/libmemcached/csl/scanner.l
b/libmemcached/csl/scanner.l
index c5ae5cefb4e0e0f61004f6b559393ea65cb6f1c0..09ac66a36c1d697a3c3109568e9a75ec6c8a00ae 100644
(file)
--- a/
libmemcached/csl/scanner.l
+++ b/
libmemcached/csl/scanner.l
@@
-47,6
+47,7
@@
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wmissing-declarations"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#pragma GCC diagnostic ignored "-Wunused-result"
#endif
#define YY_EXTRA_TYPE Context*
#endif
#define YY_EXTRA_TYPE Context*