From fc3de3f066e6f55832cb4dcf39906688afaa6008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Edelbo?= Date: Wed, 24 Mar 2021 15:54:02 +0100 Subject: [PATCH 1/2] Support non-latin characters in parser --- CHANGELOG.md | 1 + src/realm/parser/generated/query_flex.cpp | 916 +++++++++++++--------- src/realm/parser/query_flex.ll | 3 +- test/test_parser.cpp | 21 + 4 files changed, 565 insertions(+), 376 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e07b1dbe8a..e81fae1d129 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * Support 'add_int' on a mixed property. * UUID allowed as partition value ([#4500](https://github.com/realm/realm-core/issues/4500)) * The error message when the intial steps of opening a Realm file fails is now more descriptive. +* Allow UTF8 encoded characters in property names in parser ([#4467](https://github.com/realm/realm-core/issues/4467)) ### Fixed * ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?) diff --git a/src/realm/parser/generated/query_flex.cpp b/src/realm/parser/generated/query_flex.cpp index f5b5ea0e2f6..38977067b9d 100644 --- a/src/realm/parser/generated/query_flex.cpp +++ b/src/realm/parser/generated/query_flex.cpp @@ -510,48 +510,49 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[368] = +static const flex_int16_t yy_accept[377] = { 0, 0, 0, 61, 59, 1, 2, 13, 59, 58, 59, 59, 8, 59, 8, 49, 49, 6, 3, 7, 59, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 8, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 59, 1, 2, 5, 0, 56, 0, - 58, 50, 0, 11, 0, 57, 0, 0, 51, 0, - 0, 54, 0, 54, 49, 0, 0, 9, 3, 10, - 0, 0, 0, 0, 0, 0, 0, 0, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 4, 58, 58, 58, 58, 58, 58, 48, 12, 58, - - 58, 58, 0, 58, 58, 58, 58, 0, 58, 58, - 58, 58, 58, 58, 58, 58, 12, 0, 0, 0, - 0, 0, 0, 54, 0, 53, 52, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 15, 11, 14, - 27, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 42, 58, 58, 43, 44, 58, 13, 58, 58, 58, - 58, 0, 0, 58, 58, 39, 58, 58, 58, 58, - 58, 58, 0, 0, 42, 43, 0, 54, 0, 34, - 0, 0, 0, 31, 32, 0, 33, 0, 0, 58, - 0, 58, 58, 58, 28, 58, 58, 58, 58, 58, - - 20, 58, 16, 44, 24, 58, 0, 47, 40, 58, - 58, 0, 58, 0, 0, 0, 0, 0, 37, 0, - 30, 36, 0, 58, 55, 0, 58, 58, 58, 58, - 58, 58, 41, 58, 58, 26, 58, 58, 0, 0, - 0, 0, 0, 0, 35, 0, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 0, 0, 0, - 0, 38, 58, 58, 21, 58, 58, 58, 58, 58, - 58, 58, 58, 0, 0, 0, 0, 58, 58, 19, - 58, 25, 18, 58, 42, 29, 58, 0, 0, 42, - 0, 27, 58, 58, 58, 58, 0, 0, 0, 17, - - 28, 58, 58, 0, 0, 47, 58, 58, 0, 0, - 0, 58, 58, 0, 0, 47, 58, 22, 0, 0, - 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 58, 58, 58, 59, 59, 59, 59, 1, 2, 5, + 0, 56, 0, 58, 50, 0, 0, 0, 0, 11, + 0, 57, 0, 0, 51, 0, 0, 54, 0, 54, + 49, 0, 0, 9, 3, 10, 0, 0, 0, 0, + 0, 0, 0, 0, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 4, 58, 58, 58, + + 58, 58, 58, 48, 12, 58, 58, 58, 0, 58, + 58, 58, 58, 0, 58, 58, 58, 58, 58, 58, + 58, 58, 12, 58, 0, 0, 0, 0, 0, 0, + 0, 0, 54, 0, 53, 52, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 15, 11, 14, 27, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 42, + 58, 58, 43, 44, 58, 13, 58, 58, 58, 58, + 0, 0, 58, 58, 39, 58, 58, 58, 58, 58, + 58, 0, 0, 42, 43, 0, 54, 0, 34, 0, + 0, 0, 31, 32, 0, 33, 0, 0, 58, 0, + + 58, 58, 58, 28, 58, 58, 58, 58, 58, 20, + 58, 16, 44, 24, 58, 0, 47, 40, 58, 58, + 0, 58, 0, 0, 0, 0, 0, 37, 0, 30, + 36, 0, 58, 55, 0, 58, 58, 58, 58, 58, + 58, 41, 58, 58, 26, 58, 58, 0, 0, 0, + 0, 0, 0, 35, 0, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 0, 0, 0, 0, + 38, 58, 58, 21, 58, 58, 58, 58, 58, 58, + 58, 58, 0, 0, 0, 0, 58, 58, 19, 58, + 25, 18, 58, 42, 29, 58, 0, 0, 42, 0, + + 27, 58, 58, 58, 58, 0, 0, 0, 17, 28, + 58, 58, 0, 0, 47, 58, 58, 0, 0, 0, + 58, 58, 0, 0, 47, 58, 22, 0, 0, 23, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 45, 0 + 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 45, 0 } ; static const YY_CHAR yy_ec[256] = @@ -569,24 +570,24 @@ static const YY_CHAR yy_ec[256] = 58, 59, 60, 61, 62, 35, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 13, 79, 13, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 77, 78, 13, 79, 13, 1, 1, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 1, 1, 82, 82, 82, 82, 82, 82, 82, + + 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, + 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, + 82, 82, 82, 83, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static const YY_CHAR yy_meta[80] = +static const YY_CHAR yy_meta[85] = { 0, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 2, 1, 3, 1, 2, 4, 4, 4, 4, @@ -595,114 +596,117 @@ static const YY_CHAR yy_meta[80] = 5, 5, 5, 5, 5, 5, 5, 5, 5, 1, 3, 1, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 1 + 5, 5, 5, 5, 5, 5, 5, 5, 1, 1, + 1, 3, 3, 3 } ; -static const flex_int16_t yy_base[437] = +static const flex_int16_t yy_base[446] = { 0, - 0, 0, 960, 961, 78, 956, 935, 75, 66, 949, - 78, 961, 73, 77, 84, 91, 92, 96, 933, 80, - 111, 107, 73, 123, 117, 74, 904, 120, 113, 144, - 182, 121, 191, 898, 175, 146, 112, 141, 186, 173, - 198, 180, 118, 874, 129, 949, 961, 167, 961, 251, - 900, 256, 192, 961, 170, 961, 263, 210, 267, 197, - 161, 273, 281, 320, 327, 341, 0, 961, 961, 961, - 876, 882, 890, 885, 68, 183, 869, 891, 244, 305, - 227, 237, 203, 319, 238, 261, 321, 320, 279, 329, - 317, 336, 337, 330, 346, 360, 352, 389, 893, 374, - - 363, 331, 402, 409, 413, 390, 392, 891, 245, 394, - 398, 386, 262, 396, 402, 264, 961, 0, 0, 411, - 347, 460, 467, 437, 471, 479, 0, 882, 868, 863, - 873, 862, 871, 858, 870, 866, 869, 881, 880, 879, - 443, 418, 442, 455, 460, 464, 462, 465, 466, 468, - 480, 470, 484, 878, 877, 333, 876, 487, 364, 478, - 498, 535, 545, 515, 517, 961, 525, 269, 260, 475, - 528, 347, 0, 0, 509, 961, 563, 570, 574, 961, - 860, 854, 861, 961, 961, 865, 961, 864, 848, 533, - 914, 546, 544, 552, 547, 566, 557, 571, 579, 568, - - 868, 569, 867, 866, 865, 565, 606, 625, 580, 595, - 603, 0, 493, 0, 0, 574, 632, 843, 961, 843, - 961, 961, 855, 618, 961, 906, 609, 625, 605, 619, - 620, 628, 623, 627, 631, 860, 636, 630, 0, 0, - 0, 0, 650, 679, 961, 839, 654, 655, 653, 662, - 660, 675, 663, 664, 673, 678, 692, 0, 0, 664, - 720, 961, 681, 691, 858, 700, 712, 682, 716, 722, - 706, 707, 730, 0, 0, 711, 772, 734, 724, 857, - 731, 856, 855, 747, 854, 853, 744, 0, 0, 961, - 782, 852, 760, 754, 773, 780, 0, 0, 798, 851, - - 850, 781, 787, 0, 0, 808, 793, 788, 0, 0, - 831, 789, 812, 0, 0, 835, 813, 849, 0, 885, - 847, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 883, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 882, 0, 0, 0, 0, 0, 0, 0, 0, 884, - 880, 961, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 882, 961, 961, 871, 874, 879, - 888, 887, 886, 885, 882, 883, 865, 864, 863, 862, - 861, 858, 855, 854, 853, 852, 842, 841, 826, 819, - 818, 816, 808, 806, 775, 768, 764, 761, 760, 758, - - 757, 719, 706, 668, 631, 623, 614, 611, 606, 566, - 557, 556, 544, 537, 523, 521, 518, 504, 479, 478, - 464, 455, 446, 442, 348, 324, 304, 247, 243, 209, - 189, 185, 142, 137, 119, 85 + 0, 0, 756, 1693, 83, 752, 722, 80, 71, 732, + 83, 1693, 78, 82, 89, 106, 87, 91, 715, 85, + 123, 115, 118, 152, 129, 137, 95, 142, 181, 204, + 228, 211, 256, 681, 252, 198, 246, 266, 307, 294, + 314, 300, 158, 655, 47, 652, 49, 114, 719, 1693, + 132, 1693, 386, 238, 387, 157, 52, 619, 62, 1693, + 166, 1693, 402, 395, 405, 194, 150, 409, 413, 430, + 462, 477, 0, 1693, 1693, 1693, 621, 618, 623, 617, + 130, 32, 601, 622, 403, 449, 456, 464, 471, 484, + 475, 479, 498, 514, 523, 527, 541, 544, 550, 538, + + 565, 591, 580, 620, 317, 607, 614, 600, 484, 635, + 688, 641, 648, 620, 629, 659, 664, 678, 669, 684, + 712, 584, 1693, 501, 71, 0, 90, 0, 159, 253, + 761, 491, 769, 773, 783, 0, 601, 587, 582, 591, + 580, 553, 540, 549, 544, 544, 723, 726, 731, 746, + 792, 782, 770, 767, 804, 774, 796, 818, 826, 834, + 841, 860, 821, 830, 868, 844, 856, 885, 890, 895, + 817, 941, 924, 933, 1693, 905, 939, 919, 942, 953, + 948, 0, 0, 205, 1693, 913, 1021, 1025, 1693, 533, + 523, 530, 1693, 1693, 532, 1693, 521, 503, 995, 567, + + 1008, 998, 1001, 1018, 1024, 982, 1037, 1059, 1021, 930, + 1064, 1042, 1045, 1048, 1067, 1135, 1139, 1093, 1119, 1115, + 0, 1112, 0, 0, 265, 1161, 498, 1693, 480, 1693, + 1693, 487, 1133, 1693, 531, 1138, 1142, 1157, 1172, 1179, + 1195, 1191, 1202, 1214, 1153, 1230, 1221, 0, 0, 0, + 0, 251, 1232, 1693, 465, 1248, 1236, 1241, 1251, 1264, + 1288, 1277, 1294, 1291, 1311, 1328, 0, 0, 270, 1348, + 1693, 1341, 1351, 1300, 1345, 1357, 1354, 1370, 1392, 1381, + 1395, 1416, 0, 0, 275, 1249, 1410, 1435, 1400, 1430, + 1405, 1420, 1472, 1444, 1454, 1481, 0, 0, 1693, 1527, + + 1457, 1491, 1498, 1516, 1506, 0, 0, 1551, 1502, 1509, + 1551, 1557, 0, 0, 1595, 1568, 1572, 0, 0, 1586, + 1575, 1579, 0, 0, 1647, 1591, 1545, 0, 520, 1587, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 514, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 513, + 0, 0, 0, 0, 0, 0, 0, 0, 514, 510, + 1693, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 508, 1693, 1693, 1675, 1678, 1683, 514, + 513, 509, 495, 479, 1687, 469, 462, 461, 460, 458, + 451, 447, 442, 440, 439, 438, 432, 430, 417, 413, + + 412, 406, 405, 390, 389, 384, 382, 381, 375, 371, + 369, 368, 367, 363, 362, 359, 358, 355, 353, 351, + 343, 342, 340, 323, 321, 310, 305, 304, 302, 298, + 297, 286, 279, 265, 257, 255, 250, 249, 248, 233, + 218, 212, 192, 183, 168 } ; -static const flex_int16_t yy_def[437] = +static const flex_int16_t yy_def[446] = { 0, - 367, 1, 367, 367, 367, 367, 367, 368, 369, 367, - 370, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 369, 369, 369, 369, 369, 369, 369, 369, 369, 369, - 369, 369, 369, 367, 369, 369, 369, 369, 369, 369, - 369, 369, 369, 367, 367, 367, 367, 368, 367, 367, - 369, 369, 367, 367, 370, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 371, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 369, 369, - 369, 369, 369, 369, 369, 369, 369, 369, 369, 369, - 369, 369, 369, 369, 369, 369, 369, 369, 369, 369, - - 369, 369, 367, 369, 369, 369, 369, 367, 369, 369, - 369, 369, 369, 369, 369, 369, 367, 372, 373, 367, - 367, 367, 367, 367, 367, 367, 371, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 369, 369, 369, - 369, 369, 369, 369, 369, 369, 369, 369, 369, 369, - 369, 369, 369, 369, 369, 369, 369, 369, 369, 369, - 369, 367, 367, 369, 369, 367, 369, 369, 369, 369, - 369, 369, 374, 375, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 369, - 376, 369, 369, 369, 369, 369, 369, 369, 369, 369, - - 369, 369, 369, 369, 369, 369, 367, 367, 369, 369, - 369, 377, 369, 378, 379, 367, 367, 367, 367, 367, - 367, 367, 367, 369, 367, 376, 369, 369, 369, 369, - 369, 369, 369, 369, 369, 369, 369, 369, 380, 381, - 382, 383, 367, 367, 367, 367, 369, 369, 369, 369, - 369, 369, 369, 369, 369, 369, 369, 384, 385, 367, - 367, 367, 369, 369, 369, 369, 369, 369, 369, 369, - 369, 369, 369, 386, 387, 367, 367, 369, 369, 369, - 369, 369, 369, 369, 369, 369, 369, 388, 389, 367, - 367, 369, 369, 369, 369, 369, 390, 391, 367, 369, - - 369, 369, 369, 392, 393, 367, 369, 369, 394, 395, - 367, 369, 369, 396, 397, 367, 369, 369, 398, 367, - 369, 399, 400, 401, 402, 403, 404, 405, 406, 407, - 367, 408, 409, 410, 411, 412, 413, 414, 415, 416, - 367, 417, 418, 419, 420, 421, 422, 423, 424, 367, - 367, 367, 425, 426, 427, 428, 429, 430, 431, 432, - 433, 434, 435, 436, 367, 367, 0, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367 + 376, 1, 376, 376, 376, 376, 376, 377, 378, 376, + 379, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, + 378, 378, 378, 376, 378, 378, 378, 378, 378, 378, + 378, 378, 378, 376, 376, 376, 376, 376, 376, 376, + 377, 376, 376, 378, 378, 376, 376, 376, 376, 376, + 379, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 380, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 378, 378, 378, 378, 378, 378, + 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, + + 378, 378, 378, 378, 378, 378, 378, 378, 376, 378, + 378, 378, 378, 376, 378, 378, 378, 378, 378, 378, + 378, 378, 376, 378, 376, 381, 376, 382, 376, 376, + 376, 376, 376, 376, 376, 380, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 378, 378, 378, 378, + 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, + 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, + 376, 376, 378, 378, 376, 378, 378, 378, 378, 378, + 378, 383, 384, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 378, 385, + + 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, + 378, 378, 378, 378, 378, 376, 376, 378, 378, 378, + 386, 378, 387, 388, 376, 376, 376, 376, 376, 376, + 376, 376, 378, 376, 385, 378, 378, 378, 378, 378, + 378, 378, 378, 378, 378, 378, 378, 389, 390, 391, + 392, 376, 376, 376, 376, 378, 378, 378, 378, 378, + 378, 378, 378, 378, 378, 378, 393, 394, 376, 376, + 376, 378, 378, 378, 378, 378, 378, 378, 378, 378, + 378, 378, 395, 396, 376, 376, 378, 378, 378, 378, + 378, 378, 378, 378, 378, 378, 397, 398, 376, 376, + + 378, 378, 378, 378, 378, 399, 400, 376, 378, 378, + 378, 378, 401, 402, 376, 378, 378, 403, 404, 376, + 378, 378, 405, 406, 376, 378, 378, 407, 376, 378, + 408, 409, 410, 411, 412, 413, 414, 415, 416, 376, + 417, 418, 419, 420, 421, 422, 423, 424, 425, 376, + 426, 427, 428, 429, 430, 431, 432, 433, 376, 376, + 376, 434, 435, 436, 437, 438, 439, 440, 441, 442, + 443, 444, 445, 376, 376, 0, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376 } ; -static const flex_int16_t yy_nxt[1041] = +static const flex_int16_t yy_nxt[1778] = { 0, 4, 5, 6, 5, 7, 8, 9, 10, 11, 12, 12, 13, 12, 13, 14, 4, 15, 16, 16, 16, @@ -711,116 +715,197 @@ static const flex_int16_t yy_nxt[1041] = 27, 27, 27, 32, 33, 27, 27, 27, 27, 34, 4, 12, 27, 35, 36, 23, 24, 25, 37, 27, 27, 38, 27, 29, 27, 39, 40, 27, 27, 27, - 41, 42, 43, 27, 27, 27, 27, 27, 44, 45, - 49, 45, 52, 52, 52, 52, 56, 58, 365, 59, - 59, 59, 59, 62, 62, 62, 62, 63, 64, 89, - - 65, 65, 65, 65, 63, 64, 60, 65, 65, 65, - 65, 61, 85, 66, 68, 47, 53, 68, 69, 70, - 66, 132, 364, 53, 53, 50, 83, 90, 57, 133, - 45, 67, 45, 71, 60, 72, 84, 90, 61, 85, - 363, 66, 73, 74, 75, 362, 93, 79, 66, 80, - 76, 77, 86, 78, 81, 88, 87, 53, 91, 67, - 100, 53, 53, 53, 84, 111, 101, 53, 53, 94, - 53, 53, 49, 53, 93, 84, 82, 95, 56, 92, - 86, 81, 88, 96, 87, 92, 121, 102, 361, 97, - 116, 53, 360, 101, 53, 51, 53, 94, 98, 98, - - 98, 98, 103, 84, 104, 95, 91, 105, 105, 105, - 105, 94, 359, 82, 121, 99, 97, 50, 81, 95, - 57, 142, 107, 53, 99, 53, 62, 62, 62, 62, - 53, 97, 53, 106, 113, 120, 53, 102, 109, 94, - 110, 53, 99, 101, 134, 81, 358, 95, 53, 115, - 357, 99, 112, 53, 141, 135, 48, 51, 97, 48, - 107, 51, 120, 51, 114, 139, 48, 48, 55, 212, - 101, 55, 52, 52, 52, 52, 145, 53, 55, 55, - 138, 64, 141, 59, 59, 59, 59, 53, 53, 62, - 62, 62, 62, 139, 53, 53, 66, 123, 123, 123, - - 123, 48, 122, 145, 146, 48, 53, 356, 138, 48, - 53, 53, 53, 55, 53, 149, 48, 55, 169, 53, - 48, 55, 48, 118, 66, 172, 203, 355, 55, 53, - 122, 146, 55, 139, 55, 119, 124, 124, 124, 124, - 63, 64, 150, 65, 65, 65, 65, 151, 148, 122, - 143, 354, 125, 140, 125, 53, 66, 126, 126, 126, - 126, 139, 203, 144, 147, 150, 151, 53, 154, 53, - 53, 53, 152, 160, 153, 151, 148, 122, 143, 53, - 53, 53, 155, 53, 66, 176, 53, 53, 158, 161, - 144, 147, 150, 140, 151, 154, 53, 53, 156, 152, - - 160, 153, 53, 213, 157, 98, 98, 98, 98, 155, - 53, 159, 176, 53, 53, 158, 160, 161, 162, 162, - 162, 162, 139, 191, 53, 105, 105, 105, 105, 105, - 105, 105, 105, 163, 150, 164, 53, 165, 160, 53, - 53, 175, 53, 160, 53, 351, 53, 165, 53, 350, - 139, 168, 53, 124, 124, 124, 124, 157, 349, 53, - 170, 167, 165, 53, 165, 160, 122, 348, 53, 175, - 140, 177, 190, 177, 171, 192, 178, 178, 178, 178, - 179, 347, 346, 123, 123, 123, 123, 126, 126, 126, - 126, 195, 53, 53, 122, 126, 126, 126, 126, 201, - - 190, 193, 240, 192, 194, 53, 196, 345, 197, 198, - 53, 199, 53, 200, 53, 53, 53, 202, 53, 195, - 53, 344, 205, 204, 342, 53, 341, 201, 53, 193, - 53, 194, 140, 196, 53, 197, 199, 53, 199, 206, - 340, 200, 216, 53, 209, 202, 210, 339, 53, 205, - 204, 162, 162, 162, 162, 163, 207, 210, 207, 338, - 337, 208, 208, 208, 208, 53, 206, 53, 199, 336, - 216, 224, 210, 228, 210, 53, 230, 229, 53, 178, - 178, 178, 178, 53, 227, 209, 178, 178, 178, 178, - 217, 217, 217, 217, 53, 211, 53, 53, 224, 231, - - 233, 228, 53, 232, 230, 229, 235, 53, 234, 335, - 237, 227, 243, 236, 334, 53, 53, 332, 53, 53, - 238, 53, 208, 208, 208, 208, 331, 231, 234, 53, - 53, 232, 234, 235, 330, 238, 234, 237, 250, 243, - 236, 208, 208, 208, 208, 53, 247, 238, 217, 217, - 217, 217, 248, 53, 249, 53, 244, 251, 252, 53, - 233, 253, 238, 254, 255, 256, 250, 254, 53, 53, - 53, 329, 257, 53, 247, 53, 244, 53, 53, 248, - 53, 53, 249, 260, 251, 252, 53, 263, 267, 253, - 254, 265, 255, 256, 254, 261, 261, 261, 261, 257, - - 266, 264, 268, 53, 53, 53, 270, 269, 276, 328, - 53, 260, 53, 53, 53, 263, 267, 271, 265, 278, - 272, 273, 327, 53, 279, 53, 282, 266, 53, 264, - 268, 53, 53, 270, 269, 276, 261, 261, 261, 261, - 277, 53, 53, 280, 271, 281, 278, 272, 283, 273, - 53, 284, 279, 282, 285, 286, 53, 53, 287, 290, - 326, 325, 53, 324, 322, 292, 53, 320, 293, 294, - 280, 319, 53, 281, 53, 295, 283, 296, 315, 284, - 53, 53, 285, 286, 53, 301, 287, 290, 291, 291, - 291, 291, 300, 292, 53, 293, 294, 53, 291, 291, - - 291, 291, 299, 295, 53, 296, 302, 303, 307, 314, - 53, 310, 308, 301, 306, 306, 306, 306, 312, 309, - 300, 305, 304, 53, 306, 306, 306, 306, 311, 298, - 53, 53, 313, 317, 302, 303, 307, 53, 53, 53, - 308, 318, 321, 53, 297, 289, 312, 316, 316, 316, - 316, 316, 316, 316, 316, 288, 275, 274, 55, 313, - 317, 48, 53, 53, 259, 258, 242, 241, 239, 318, - 321, 48, 48, 48, 48, 48, 51, 51, 51, 55, - 55, 55, 55, 55, 226, 215, 226, 226, 214, 174, - 173, 127, 366, 353, 352, 343, 333, 53, 323, 53, - - 53, 53, 53, 53, 53, 53, 53, 53, 53, 262, - 53, 225, 246, 245, 221, 53, 53, 53, 53, 225, - 223, 222, 221, 220, 219, 218, 53, 53, 53, 53, - 53, 53, 189, 188, 187, 186, 185, 184, 183, 182, - 181, 180, 166, 53, 137, 136, 131, 130, 129, 128, - 53, 46, 117, 108, 53, 70, 54, 47, 46, 367, - 3, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367 + 41, 42, 43, 27, 27, 27, 27, 27, 44, 4, + 4, 45, 46, 47, 48, 52, 48, 55, 55, 55, + 55, 62, 64, 143, 65, 65, 65, 65, 68, 68, + + 68, 68, 69, 70, 144, 71, 71, 71, 71, 74, + 50, 66, 74, 75, 76, 48, 67, 48, 72, 69, + 70, 56, 71, 71, 71, 71, 124, 124, 125, 125, + 53, 54, 54, 63, 89, 72, 73, 52, 77, 66, + 78, 127, 127, 67, 90, 56, 72, 79, 80, 81, + 124, 124, 57, 58, 59, 82, 83, 91, 84, 85, + 54, 86, 95, 72, 73, 56, 87, 94, 56, 54, + 54, 374, 90, 56, 62, 130, 57, 58, 59, 56, + 97, 92, 53, 141, 91, 93, 373, 56, 88, 184, + 96, 142, 56, 87, 94, 372, 57, 58, 59, 57, + + 58, 59, 56, 130, 57, 58, 59, 98, 56, 92, + 57, 58, 59, 93, 99, 371, 63, 184, 57, 58, + 59, 370, 54, 57, 58, 59, 54, 90, 54, 100, + 122, 56, 129, 57, 58, 59, 369, 101, 225, 57, + 58, 59, 99, 102, 104, 104, 104, 104, 56, 103, + 106, 368, 367, 366, 56, 90, 107, 100, 365, 129, + 364, 56, 57, 58, 59, 101, 225, 109, 363, 110, + 105, 96, 111, 111, 111, 111, 103, 108, 56, 57, + 58, 59, 360, 107, 269, 57, 58, 59, 56, 359, + 88, 185, 57, 58, 59, 87, 56, 105, 112, 117, + + 358, 357, 56, 252, 98, 356, 56, 355, 354, 57, + 58, 59, 269, 353, 285, 115, 56, 116, 185, 57, + 58, 59, 87, 299, 351, 113, 350, 57, 58, 59, + 252, 97, 100, 57, 58, 59, 105, 57, 58, 59, + 101, 285, 113, 349, 56, 348, 347, 57, 58, 59, + 56, 299, 103, 108, 346, 119, 345, 56, 344, 107, + 100, 343, 341, 105, 56, 340, 339, 56, 101, 121, + 338, 337, 336, 118, 335, 57, 58, 59, 334, 103, + 120, 57, 58, 59, 333, 331, 107, 329, 57, 58, + 59, 51, 328, 324, 51, 57, 58, 59, 57, 58, + + 59, 51, 51, 55, 55, 55, 55, 61, 323, 319, + 61, 68, 68, 68, 68, 318, 314, 61, 61, 70, + 313, 65, 65, 65, 65, 68, 68, 68, 68, 132, + 132, 132, 132, 307, 72, 306, 51, 56, 131, 147, + 51, 298, 297, 284, 51, 283, 133, 133, 133, 133, + 61, 51, 61, 56, 51, 51, 61, 51, 126, 131, + 61, 268, 72, 267, 251, 250, 131, 61, 57, 58, + 59, 61, 248, 61, 128, 69, 70, 148, 71, 71, + 71, 71, 224, 150, 57, 58, 59, 131, 134, 151, + 134, 72, 148, 135, 135, 135, 135, 149, 223, 56, + + 171, 171, 171, 171, 188, 148, 56, 132, 132, 132, + 132, 150, 183, 154, 56, 152, 182, 136, 375, 72, + 148, 56, 155, 362, 361, 56, 352, 342, 153, 56, + 57, 58, 59, 332, 56, 271, 234, 57, 58, 59, + 154, 156, 157, 152, 255, 57, 58, 59, 56, 155, + 254, 56, 57, 58, 59, 153, 57, 58, 59, 158, + 57, 58, 59, 159, 56, 57, 58, 59, 156, 230, + 157, 160, 234, 56, 160, 232, 163, 56, 231, 57, + 58, 59, 57, 58, 59, 161, 159, 162, 56, 230, + 159, 56, 229, 228, 56, 57, 58, 59, 227, 160, + + 56, 164, 160, 163, 57, 58, 59, 198, 57, 58, + 59, 197, 161, 196, 162, 56, 167, 195, 194, 57, + 58, 59, 57, 58, 59, 57, 58, 59, 164, 165, + 56, 57, 58, 59, 56, 166, 104, 104, 104, 104, + 170, 56, 169, 167, 168, 181, 57, 58, 59, 169, + 56, 111, 111, 111, 111, 193, 192, 56, 191, 190, + 189, 57, 58, 59, 56, 57, 58, 59, 170, 169, + 56, 175, 57, 58, 59, 146, 169, 145, 140, 56, + 139, 57, 58, 59, 138, 56, 173, 148, 57, 58, + 59, 56, 147, 174, 137, 57, 58, 59, 56, 127, + + 159, 57, 58, 59, 111, 111, 111, 111, 172, 56, + 57, 58, 59, 174, 56, 148, 57, 58, 59, 56, + 174, 49, 57, 58, 59, 178, 169, 176, 56, 57, + 58, 59, 125, 123, 56, 149, 114, 76, 56, 60, + 57, 58, 59, 177, 50, 57, 58, 59, 179, 166, + 57, 58, 59, 169, 49, 376, 376, 174, 376, 57, + 58, 59, 56, 376, 376, 57, 58, 59, 376, 57, + 58, 59, 186, 56, 186, 199, 56, 187, 187, 187, + 187, 56, 376, 376, 180, 133, 133, 133, 133, 135, + 135, 135, 135, 57, 58, 59, 56, 200, 131, 135, + + 135, 135, 135, 199, 57, 58, 59, 57, 58, 59, + 376, 203, 57, 58, 59, 201, 202, 56, 205, 376, + 56, 376, 376, 376, 56, 376, 131, 57, 58, 59, + 376, 204, 56, 171, 171, 171, 171, 172, 203, 206, + 376, 376, 56, 201, 202, 205, 56, 376, 57, 58, + 59, 57, 58, 59, 56, 57, 58, 59, 376, 204, + 376, 207, 376, 57, 58, 59, 206, 209, 56, 208, + 210, 56, 376, 57, 58, 59, 56, 57, 58, 59, + 56, 376, 376, 376, 56, 57, 58, 59, 208, 376, + 376, 56, 213, 211, 56, 209, 208, 212, 210, 57, + + 58, 59, 57, 58, 59, 376, 56, 57, 58, 59, + 56, 57, 58, 59, 149, 57, 58, 59, 56, 213, + 376, 211, 57, 58, 59, 57, 58, 59, 221, 187, + 187, 187, 187, 376, 214, 56, 215, 57, 58, 59, + 56, 57, 58, 59, 376, 56, 376, 376, 208, 57, + 58, 59, 216, 218, 216, 56, 376, 217, 217, 217, + 217, 214, 219, 215, 376, 376, 57, 58, 59, 56, + 376, 57, 58, 59, 56, 220, 57, 58, 59, 376, + 56, 219, 219, 56, 376, 376, 57, 58, 59, 56, + 219, 376, 56, 376, 376, 376, 212, 376, 56, 149, + + 57, 58, 59, 56, 222, 57, 58, 59, 376, 376, + 218, 57, 58, 59, 57, 58, 59, 376, 376, 376, + 57, 58, 59, 57, 58, 59, 238, 237, 241, 57, + 58, 59, 56, 233, 57, 58, 59, 187, 187, 187, + 187, 226, 226, 226, 226, 56, 236, 239, 56, 376, + 376, 56, 376, 376, 238, 237, 241, 240, 56, 244, + 233, 376, 376, 57, 58, 59, 242, 376, 56, 376, + 376, 56, 376, 236, 56, 239, 57, 58, 59, 57, + 58, 59, 57, 58, 59, 240, 244, 56, 243, 57, + 58, 59, 56, 376, 243, 56, 376, 376, 56, 57, + + 58, 59, 57, 58, 59, 57, 58, 59, 245, 56, + 376, 376, 246, 376, 56, 376, 243, 56, 57, 58, + 59, 249, 376, 57, 58, 59, 57, 58, 59, 57, + 58, 59, 376, 247, 376, 245, 376, 376, 376, 246, + 57, 58, 59, 56, 243, 57, 58, 59, 57, 58, + 59, 217, 217, 217, 217, 217, 217, 217, 217, 247, + 247, 256, 56, 376, 376, 56, 376, 376, 376, 56, + 376, 258, 242, 376, 57, 58, 59, 226, 226, 226, + 226, 257, 376, 56, 376, 253, 247, 376, 56, 256, + 259, 376, 56, 57, 58, 59, 57, 58, 59, 258, + + 57, 58, 59, 56, 376, 253, 376, 56, 257, 376, + 260, 376, 376, 376, 57, 58, 59, 261, 259, 57, + 58, 59, 56, 57, 58, 59, 376, 376, 262, 56, + 376, 263, 376, 376, 57, 58, 59, 260, 57, 58, + 59, 56, 263, 376, 261, 56, 376, 264, 270, 270, + 270, 270, 56, 57, 58, 59, 262, 376, 263, 265, + 57, 58, 59, 266, 56, 300, 300, 300, 300, 263, + 376, 56, 57, 58, 59, 264, 57, 58, 59, 274, + 56, 272, 273, 57, 58, 59, 56, 265, 376, 275, + 266, 56, 276, 376, 376, 57, 58, 59, 56, 376, + + 376, 56, 57, 58, 59, 376, 274, 376, 376, 272, + 273, 57, 58, 59, 56, 277, 275, 57, 58, 59, + 276, 278, 57, 58, 59, 376, 376, 56, 376, 57, + 58, 59, 57, 58, 59, 280, 279, 376, 56, 376, + 376, 56, 376, 277, 56, 57, 58, 59, 278, 376, + 56, 376, 376, 281, 376, 376, 376, 282, 57, 58, + 59, 56, 280, 279, 270, 270, 270, 270, 286, 57, + 58, 59, 57, 58, 59, 57, 58, 59, 56, 287, + 281, 57, 58, 59, 288, 282, 376, 376, 289, 376, + 290, 56, 57, 58, 59, 56, 376, 376, 291, 376, + + 376, 56, 292, 376, 56, 376, 287, 56, 376, 57, + 58, 59, 288, 376, 376, 289, 376, 376, 290, 376, + 56, 293, 57, 58, 59, 291, 57, 58, 59, 294, + 292, 56, 57, 58, 59, 57, 58, 59, 57, 58, + 59, 301, 56, 295, 296, 56, 376, 376, 376, 293, + 56, 57, 58, 59, 376, 56, 376, 294, 376, 376, + 56, 376, 57, 58, 59, 376, 56, 376, 303, 301, + 56, 295, 296, 57, 58, 59, 57, 58, 59, 302, + 56, 57, 58, 59, 376, 56, 57, 58, 59, 376, + 376, 57, 58, 59, 56, 303, 376, 57, 58, 59, + + 304, 57, 58, 59, 56, 376, 302, 56, 376, 376, + 376, 57, 58, 59, 305, 376, 57, 58, 59, 376, + 376, 376, 56, 309, 376, 57, 58, 59, 304, 310, + 376, 56, 376, 312, 376, 57, 58, 59, 57, 58, + 59, 56, 305, 300, 300, 300, 300, 308, 56, 311, + 376, 309, 56, 57, 58, 59, 56, 310, 376, 56, + 376, 312, 57, 58, 59, 376, 56, 315, 315, 315, + 315, 376, 57, 58, 59, 376, 376, 311, 316, 57, + 58, 59, 317, 57, 58, 59, 376, 57, 58, 59, + 57, 58, 59, 321, 376, 56, 376, 57, 58, 59, + + 376, 56, 325, 325, 325, 325, 316, 56, 327, 376, + 317, 315, 315, 315, 315, 320, 322, 376, 56, 326, + 330, 321, 56, 376, 376, 56, 57, 58, 59, 56, + 376, 376, 57, 58, 59, 376, 327, 56, 57, 58, + 59, 56, 376, 322, 376, 376, 326, 376, 330, 57, + 58, 59, 376, 57, 58, 59, 57, 58, 59, 376, + 57, 58, 59, 325, 325, 325, 325, 376, 57, 58, + 59, 376, 57, 58, 59, 51, 51, 51, 51, 51, + 54, 54, 54, 61, 61, 61, 61, 61, 235, 376, + 235, 235, 3, 376, 376, 376, 376, 376, 376, 376, + + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376 } ; -static const flex_int16_t yy_chk[1041] = +static const flex_int16_t yy_chk[1778] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -829,123 +914,204 @@ static const flex_int16_t yy_chk[1041] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, - 8, 5, 9, 9, 9, 9, 11, 13, 436, 13, - 13, 13, 13, 14, 14, 14, 14, 15, 15, 26, - - 15, 15, 15, 15, 16, 16, 13, 16, 16, 16, - 16, 13, 23, 15, 17, 17, 9, 18, 18, 18, - 16, 75, 435, 23, 26, 8, 22, 26, 11, 75, - 45, 15, 45, 20, 13, 20, 22, 37, 13, 23, - 434, 15, 20, 20, 20, 433, 29, 21, 16, 21, - 20, 20, 24, 20, 21, 25, 24, 22, 28, 15, - 32, 21, 37, 29, 22, 37, 32, 25, 43, 30, - 28, 32, 48, 24, 29, 36, 21, 30, 55, 38, - 24, 21, 25, 30, 24, 28, 61, 32, 432, 30, - 43, 38, 431, 32, 30, 53, 36, 30, 31, 31, - - 31, 31, 33, 36, 33, 30, 38, 33, 33, 33, - 33, 39, 430, 35, 61, 40, 30, 48, 35, 39, - 55, 83, 42, 40, 31, 35, 58, 58, 58, 58, - 42, 39, 31, 33, 40, 60, 39, 41, 35, 39, - 35, 33, 40, 41, 76, 35, 429, 39, 41, 42, - 428, 31, 39, 83, 81, 76, 50, 53, 39, 50, - 33, 53, 60, 53, 41, 82, 50, 50, 57, 169, - 41, 57, 52, 52, 52, 52, 85, 81, 57, 57, - 79, 59, 81, 59, 59, 59, 59, 82, 85, 62, - 62, 62, 62, 82, 79, 109, 59, 63, 63, 63, - - 63, 50, 62, 85, 86, 50, 52, 427, 109, 50, - 169, 86, 113, 57, 116, 89, 50, 57, 113, 168, - 50, 57, 50, 50, 59, 116, 168, 426, 57, 89, - 62, 86, 57, 80, 57, 57, 64, 64, 64, 64, - 65, 65, 89, 65, 65, 65, 65, 91, 88, 64, - 84, 425, 66, 80, 66, 80, 65, 66, 66, 66, - 66, 80, 156, 84, 87, 90, 92, 91, 94, 84, - 88, 87, 93, 102, 93, 91, 88, 64, 84, 90, - 94, 102, 95, 156, 65, 121, 92, 93, 97, 101, - 84, 87, 90, 159, 92, 94, 95, 172, 96, 93, - - 102, 93, 97, 172, 96, 98, 98, 98, 98, 95, - 96, 100, 121, 101, 159, 97, 100, 101, 103, 103, - 103, 103, 110, 142, 100, 104, 104, 104, 104, 105, - 105, 105, 105, 105, 111, 106, 112, 107, 114, 98, - 106, 120, 107, 100, 110, 424, 114, 115, 111, 423, - 110, 112, 115, 124, 124, 124, 124, 112, 422, 104, - 114, 111, 106, 105, 107, 114, 124, 421, 142, 120, - 110, 122, 141, 122, 115, 143, 122, 122, 122, 122, - 123, 420, 419, 123, 123, 123, 123, 125, 125, 125, - 125, 146, 143, 141, 124, 126, 126, 126, 126, 152, - - 141, 144, 213, 143, 145, 144, 147, 418, 148, 149, - 145, 150, 147, 151, 146, 148, 149, 153, 150, 146, - 152, 417, 160, 158, 416, 170, 415, 152, 160, 144, - 151, 145, 170, 147, 153, 148, 149, 158, 150, 161, - 414, 151, 175, 213, 164, 153, 165, 413, 161, 160, - 158, 162, 162, 162, 162, 162, 163, 171, 163, 412, - 411, 163, 163, 163, 163, 164, 161, 165, 167, 410, - 175, 190, 164, 193, 165, 167, 195, 194, 171, 177, - 177, 177, 177, 190, 192, 171, 178, 178, 178, 178, - 179, 179, 179, 179, 193, 167, 192, 195, 190, 196, - - 198, 193, 194, 197, 195, 194, 200, 197, 199, 409, - 206, 192, 216, 202, 408, 206, 196, 407, 200, 202, - 209, 198, 207, 207, 207, 207, 406, 196, 198, 199, - 209, 197, 211, 200, 405, 210, 199, 206, 229, 216, - 202, 208, 208, 208, 208, 210, 224, 209, 217, 217, - 217, 217, 227, 211, 228, 229, 217, 230, 231, 227, - 211, 232, 210, 233, 235, 237, 229, 234, 224, 230, - 231, 404, 238, 233, 224, 228, 217, 234, 232, 227, - 238, 235, 228, 243, 230, 231, 237, 247, 251, 232, - 233, 249, 235, 237, 234, 244, 244, 244, 244, 238, - - 250, 248, 252, 249, 247, 248, 254, 253, 260, 403, - 251, 243, 250, 253, 254, 247, 251, 255, 249, 263, - 256, 257, 402, 255, 264, 252, 268, 250, 256, 248, - 252, 263, 268, 254, 253, 260, 261, 261, 261, 261, - 261, 264, 257, 266, 255, 267, 263, 256, 269, 257, - 266, 270, 264, 268, 271, 272, 271, 272, 273, 276, - 401, 400, 267, 399, 398, 278, 269, 397, 279, 281, - 266, 396, 270, 267, 279, 284, 269, 287, 395, 270, - 273, 281, 271, 272, 278, 294, 273, 276, 277, 277, - 277, 277, 293, 278, 287, 279, 281, 284, 291, 291, - - 291, 291, 291, 284, 294, 287, 295, 296, 302, 394, - 293, 393, 303, 294, 299, 299, 299, 299, 307, 392, - 293, 391, 390, 295, 306, 306, 306, 306, 306, 389, - 296, 302, 308, 312, 295, 296, 302, 303, 308, 312, - 303, 313, 317, 307, 388, 387, 307, 311, 311, 311, - 311, 316, 316, 316, 316, 386, 385, 384, 383, 308, - 312, 382, 313, 317, 381, 380, 379, 378, 377, 313, - 317, 368, 368, 368, 368, 368, 369, 369, 369, 370, - 370, 370, 370, 370, 376, 375, 376, 376, 374, 373, - 372, 371, 365, 351, 350, 341, 331, 321, 320, 318, - - 301, 300, 292, 286, 285, 283, 282, 280, 265, 246, - 236, 226, 223, 220, 218, 205, 204, 203, 201, 191, - 189, 188, 186, 183, 182, 181, 157, 155, 154, 140, - 139, 138, 137, 136, 135, 134, 133, 132, 131, 130, - 129, 128, 108, 99, 78, 77, 74, 73, 72, 71, - 51, 46, 44, 34, 27, 19, 10, 7, 6, 3, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 367, 367, 367, 367, 367 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 5, 8, 5, 9, 9, 9, + 9, 11, 13, 82, 13, 13, 13, 13, 14, 14, + + 14, 14, 15, 15, 82, 15, 15, 15, 15, 17, + 17, 13, 18, 18, 18, 48, 13, 48, 15, 16, + 16, 9, 16, 16, 16, 16, 45, 45, 47, 47, + 8, 57, 57, 11, 22, 16, 15, 51, 20, 13, + 20, 59, 59, 13, 22, 27, 15, 20, 20, 20, + 125, 125, 9, 9, 9, 20, 20, 23, 20, 21, + 56, 21, 26, 16, 15, 22, 21, 25, 23, 127, + 127, 445, 22, 21, 61, 67, 27, 27, 27, 25, + 28, 24, 51, 81, 23, 24, 444, 26, 21, 129, + 26, 81, 28, 21, 25, 443, 22, 22, 22, 23, + + 23, 23, 24, 67, 21, 21, 21, 28, 43, 24, + 25, 25, 25, 24, 29, 442, 61, 129, 26, 26, + 26, 441, 56, 28, 28, 28, 56, 36, 56, 30, + 43, 29, 66, 24, 24, 24, 440, 30, 184, 43, + 43, 43, 29, 30, 31, 31, 31, 31, 36, 30, + 32, 439, 438, 437, 30, 36, 32, 30, 436, 66, + 435, 32, 29, 29, 29, 30, 184, 33, 434, 33, + 31, 37, 33, 33, 33, 33, 30, 32, 31, 36, + 36, 36, 433, 32, 252, 30, 30, 30, 54, 432, + 35, 130, 32, 32, 32, 35, 37, 31, 33, 37, + + 431, 430, 35, 225, 38, 429, 33, 428, 427, 31, + 31, 31, 252, 426, 269, 35, 38, 35, 130, 54, + 54, 54, 35, 285, 425, 33, 424, 37, 37, 37, + 225, 38, 39, 35, 35, 35, 40, 33, 33, 33, + 39, 269, 42, 423, 40, 422, 421, 38, 38, 38, + 42, 285, 39, 41, 420, 40, 419, 39, 418, 41, + 39, 417, 416, 40, 41, 415, 414, 105, 39, 42, + 413, 412, 411, 39, 410, 40, 40, 40, 409, 39, + 41, 42, 42, 42, 408, 407, 41, 406, 39, 39, + 39, 53, 405, 404, 53, 41, 41, 41, 105, 105, + + 105, 53, 53, 55, 55, 55, 55, 63, 403, 402, + 63, 64, 64, 64, 64, 401, 400, 63, 63, 65, + 399, 65, 65, 65, 65, 68, 68, 68, 68, 69, + 69, 69, 69, 398, 65, 397, 53, 55, 68, 85, + 53, 396, 395, 394, 53, 393, 70, 70, 70, 70, + 392, 53, 63, 85, 391, 53, 63, 53, 53, 70, + 63, 390, 65, 389, 388, 387, 68, 63, 55, 55, + 55, 63, 386, 63, 63, 71, 71, 86, 71, 71, + 71, 71, 384, 87, 85, 85, 85, 70, 72, 89, + 72, 71, 88, 72, 72, 72, 72, 86, 383, 86, + + 109, 109, 109, 109, 132, 86, 87, 132, 132, 132, + 132, 87, 382, 91, 88, 90, 381, 380, 374, 71, + 88, 89, 92, 360, 359, 91, 350, 340, 90, 92, + 86, 86, 86, 329, 90, 255, 235, 87, 87, 87, + 91, 93, 94, 90, 232, 88, 88, 88, 93, 92, + 229, 124, 89, 89, 89, 90, 91, 91, 91, 95, + 92, 92, 92, 96, 94, 90, 90, 90, 93, 227, + 94, 97, 200, 95, 98, 198, 100, 96, 197, 93, + 93, 93, 124, 124, 124, 99, 95, 99, 100, 195, + 96, 97, 192, 191, 98, 94, 94, 94, 190, 97, + + 99, 101, 98, 100, 95, 95, 95, 146, 96, 96, + 96, 145, 99, 144, 99, 101, 103, 143, 142, 100, + 100, 100, 97, 97, 97, 98, 98, 98, 101, 102, + 103, 99, 99, 99, 122, 102, 104, 104, 104, 104, + 107, 102, 108, 103, 106, 122, 101, 101, 101, 106, + 108, 110, 110, 110, 110, 141, 140, 106, 139, 138, + 137, 103, 103, 103, 107, 122, 122, 122, 107, 108, + 104, 114, 102, 102, 102, 84, 106, 83, 80, 115, + 79, 108, 108, 108, 78, 110, 112, 116, 106, 106, + 106, 112, 115, 113, 77, 107, 107, 107, 113, 58, + + 117, 104, 104, 104, 111, 111, 111, 111, 111, 116, + 115, 115, 115, 112, 117, 116, 110, 110, 110, 119, + 113, 49, 112, 112, 112, 119, 120, 117, 118, 113, + 113, 113, 46, 44, 120, 116, 34, 19, 111, 10, + 116, 116, 116, 118, 7, 117, 117, 117, 120, 118, + 119, 119, 119, 120, 6, 3, 0, 121, 0, 118, + 118, 118, 121, 0, 0, 120, 120, 120, 0, 111, + 111, 111, 131, 147, 131, 150, 148, 131, 131, 131, + 131, 149, 0, 0, 121, 133, 133, 133, 133, 134, + 134, 134, 134, 121, 121, 121, 150, 151, 133, 135, + + 135, 135, 135, 150, 147, 147, 147, 148, 148, 148, + 0, 154, 149, 149, 149, 152, 153, 154, 156, 0, + 153, 0, 0, 0, 156, 0, 133, 150, 150, 150, + 0, 155, 152, 171, 171, 171, 171, 171, 154, 157, + 0, 0, 151, 152, 153, 156, 157, 0, 154, 154, + 154, 153, 153, 153, 155, 156, 156, 156, 0, 155, + 0, 158, 0, 152, 152, 152, 157, 160, 158, 159, + 161, 163, 0, 151, 151, 151, 159, 157, 157, 157, + 164, 0, 0, 0, 160, 155, 155, 155, 158, 0, + 0, 161, 167, 162, 166, 160, 159, 165, 161, 158, + + 158, 158, 163, 163, 163, 0, 167, 159, 159, 159, + 162, 164, 164, 164, 168, 160, 160, 160, 165, 167, + 0, 162, 161, 161, 161, 166, 166, 166, 178, 186, + 186, 186, 186, 0, 169, 168, 170, 167, 167, 167, + 169, 162, 162, 162, 0, 170, 0, 0, 176, 165, + 165, 165, 172, 173, 172, 176, 0, 172, 172, 172, + 172, 169, 174, 170, 0, 0, 168, 168, 168, 178, + 0, 169, 169, 169, 173, 176, 170, 170, 170, 0, + 210, 173, 180, 174, 0, 0, 176, 176, 176, 177, + 174, 0, 179, 0, 0, 0, 177, 0, 181, 179, + + 178, 178, 178, 180, 181, 173, 173, 173, 0, 0, + 180, 210, 210, 210, 174, 174, 174, 0, 0, 0, + 177, 177, 177, 179, 179, 179, 203, 202, 206, 181, + 181, 181, 206, 199, 180, 180, 180, 187, 187, 187, + 187, 188, 188, 188, 188, 199, 201, 204, 202, 0, + 0, 203, 0, 0, 203, 202, 206, 205, 201, 209, + 199, 0, 0, 206, 206, 206, 207, 0, 204, 0, + 0, 209, 0, 201, 205, 204, 199, 199, 199, 202, + 202, 202, 203, 203, 203, 205, 209, 207, 208, 201, + 201, 201, 212, 0, 207, 213, 0, 0, 214, 204, + + 204, 204, 209, 209, 209, 205, 205, 205, 211, 208, + 0, 0, 215, 0, 211, 0, 208, 215, 207, 207, + 207, 222, 0, 212, 212, 212, 213, 213, 213, 214, + 214, 214, 0, 218, 0, 211, 0, 0, 0, 215, + 208, 208, 208, 218, 220, 211, 211, 211, 215, 215, + 215, 216, 216, 216, 216, 217, 217, 217, 217, 219, + 218, 233, 222, 0, 0, 220, 0, 0, 0, 219, + 0, 237, 220, 0, 218, 218, 218, 226, 226, 226, + 226, 236, 0, 233, 0, 226, 219, 0, 236, 233, + 238, 0, 237, 222, 222, 222, 220, 220, 220, 237, + + 219, 219, 219, 245, 0, 226, 0, 238, 236, 0, + 239, 0, 0, 0, 233, 233, 233, 240, 238, 236, + 236, 236, 239, 237, 237, 237, 0, 0, 241, 240, + 0, 242, 0, 0, 245, 245, 245, 239, 238, 238, + 238, 242, 243, 0, 240, 241, 0, 244, 253, 253, + 253, 253, 243, 239, 239, 239, 241, 0, 242, 246, + 240, 240, 240, 247, 244, 286, 286, 286, 286, 243, + 0, 247, 242, 242, 242, 244, 241, 241, 241, 258, + 246, 256, 257, 243, 243, 243, 257, 246, 0, 259, + 247, 258, 260, 0, 0, 244, 244, 244, 256, 0, + + 0, 259, 247, 247, 247, 0, 258, 0, 0, 256, + 257, 246, 246, 246, 260, 261, 259, 257, 257, 257, + 260, 262, 258, 258, 258, 0, 0, 262, 0, 256, + 256, 256, 259, 259, 259, 264, 263, 0, 261, 0, + 0, 264, 0, 261, 263, 260, 260, 260, 262, 0, + 274, 0, 0, 265, 0, 0, 0, 266, 262, 262, + 262, 265, 264, 263, 270, 270, 270, 270, 270, 261, + 261, 261, 264, 264, 264, 263, 263, 263, 266, 272, + 265, 274, 274, 274, 273, 266, 0, 0, 275, 0, + 276, 272, 265, 265, 265, 275, 0, 0, 277, 0, + + 0, 273, 278, 0, 277, 0, 272, 276, 0, 266, + 266, 266, 273, 0, 0, 275, 0, 0, 276, 0, + 278, 279, 272, 272, 272, 277, 275, 275, 275, 280, + 278, 280, 273, 273, 273, 277, 277, 277, 276, 276, + 276, 287, 279, 281, 282, 281, 0, 0, 0, 279, + 289, 278, 278, 278, 0, 291, 0, 280, 0, 0, + 287, 0, 280, 280, 280, 0, 282, 0, 290, 287, + 292, 281, 282, 279, 279, 279, 281, 281, 281, 288, + 290, 289, 289, 289, 0, 288, 291, 291, 291, 0, + 0, 287, 287, 287, 294, 290, 0, 282, 282, 282, + + 293, 292, 292, 292, 295, 0, 288, 301, 0, 0, + 0, 290, 290, 290, 296, 0, 288, 288, 288, 0, + 0, 0, 293, 302, 0, 294, 294, 294, 293, 303, + 0, 296, 0, 305, 0, 295, 295, 295, 301, 301, + 301, 302, 296, 300, 300, 300, 300, 300, 303, 304, + 0, 302, 309, 293, 293, 293, 305, 303, 0, 310, + 0, 305, 296, 296, 296, 0, 304, 308, 308, 308, + 308, 0, 302, 302, 302, 0, 0, 304, 311, 303, + 303, 303, 312, 309, 309, 309, 0, 305, 305, 305, + 310, 310, 310, 316, 0, 327, 0, 304, 304, 304, + + 0, 311, 320, 320, 320, 320, 311, 312, 322, 0, + 312, 315, 315, 315, 315, 315, 317, 0, 316, 321, + 326, 316, 317, 0, 0, 321, 327, 327, 327, 322, + 0, 0, 311, 311, 311, 0, 322, 330, 312, 312, + 312, 326, 0, 317, 0, 0, 321, 0, 326, 316, + 316, 316, 0, 317, 317, 317, 321, 321, 321, 0, + 322, 322, 322, 325, 325, 325, 325, 0, 330, 330, + 330, 0, 326, 326, 326, 377, 377, 377, 377, 377, + 378, 378, 378, 379, 379, 379, 379, 379, 385, 0, + 385, 385, 376, 376, 376, 376, 376, 376, 376, 376, + + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376 } ; static const flex_int16_t yy_rule_linenum[60] = { 0, - 31, 32, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 91 + 32, 33, 35, 36, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, + 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 92 } ; /* The intent behind this definition is that it'll catch @@ -1413,13 +1579,13 @@ YY_DECL while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 368 ) + if ( yy_current_state >= 377 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 367 ); + while ( yy_current_state != 376 ); yy_cp = yyg->yy_last_accepting_cpos; yy_current_state = yyg->yy_last_accepting_state; @@ -2033,7 +2199,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 368 ) + if ( yy_current_state >= 377 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2068,11 +2234,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 368 ) + if ( yy_current_state >= 377 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 367); + yy_is_jam = (yy_current_state == 376); (void)yyg; return yy_is_jam ? 0 : yy_current_state; diff --git a/src/realm/parser/query_flex.ll b/src/realm/parser/query_flex.ll index f31881640f0..45aaeed6252 100644 --- a/src/realm/parser/query_flex.ll +++ b/src/realm/parser/query_flex.ll @@ -17,6 +17,7 @@ unicode "\\u"{hex}{4} escape "\\"[\"\'/bfnrt0\\] char1 [^\"\\] char2 [^\'\\] +utf8 [\xC2-\xDF][\x80-\xBF]|(\xE0[\xA0-\xBF]|[\xE1-\xEF][\x80-\xBF])[\x80-\xBF] letter [a-zA-Z_$] ws "\\"[ nrt] id_char [a-zA-Z_\-$0-9] @@ -86,7 +87,7 @@ blank [ \t\r] ("B64\""[a-zA-Z0-9/\+=]*\") return yy::parser::make_BASE64(yytext); (\"({char1}|{escape}|{unicode})*\") return yy::parser::make_STRING (yytext); ('({char2}|{escape}|{unicode})*') return yy::parser::make_STRING (yytext); -{letter}({id_char}|{ws})* return yy::parser::make_ID (check_escapes(yytext)); +({letter}|{utf8})({id_char}|{utf8}|{ws})* return yy::parser::make_ID (check_escapes(yytext)); . { throw yy::parser::syntax_error diff --git a/test/test_parser.cpp b/test/test_parser.cpp index 8f0ead64836..5f38a08eaee 100644 --- a/test/test_parser.cpp +++ b/test/test_parser.cpp @@ -94,6 +94,9 @@ static std::vector valid_queries = { "'\\uffFf' = '\\u0020'", "'\\u01111' = 'asdf\\u0111asdf'", + // utf8 + "你好=5", + // expressions (numbers, bools, keypaths, arguments) "-1 = 12", "0 = 001", @@ -4970,4 +4973,22 @@ TEST(Parser_ClassPrefix) } } +TEST(Parser_UTF8) +{ + Group g; + TableRef t = g.add_table("person"); + ColKey col_dk = t->add_column(type_Int, "løbenummer"); + ColKey col_ch = t->add_column(type_String, "姓名"); + + std::vector names = {"Billy", "Bob", "Joe", "Jake", "Joel"}; + for (size_t i = 0; i < names.size(); ++i) { + Obj obj = t->create_object(); + obj.set(col_dk, int64_t(i)); + obj.set(col_ch, StringData(names[i])); + } + + verify_query(test_context, t, "løbenummer > 2", 2); + verify_query(test_context, t, "姓名 == 'Bob'", 1); +} + #endif // TEST_PARSER From afbddea310c2f556820935e617ac6fedf81904b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Edelbo?= Date: Wed, 24 Mar 2021 18:23:53 +0100 Subject: [PATCH 2/2] Recognize also 4-byte utf8 characters --- CHANGELOG.md | 2 +- src/realm/parser/generated/query_flex.cpp | 1034 +++++++++++---------- src/realm/parser/query_flex.ll | 2 +- 3 files changed, 520 insertions(+), 518 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e81fae1d129..872201e2c2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Support 'add_int' on a mixed property. * UUID allowed as partition value ([#4500](https://github.com/realm/realm-core/issues/4500)) * The error message when the intial steps of opening a Realm file fails is now more descriptive. -* Allow UTF8 encoded characters in property names in parser ([#4467](https://github.com/realm/realm-core/issues/4467)) +* Allow UTF8 encoded characters in property names in query parser ([#4467](https://github.com/realm/realm-core/issues/4467)) ### Fixed * ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?) diff --git a/src/realm/parser/generated/query_flex.cpp b/src/realm/parser/generated/query_flex.cpp index 38977067b9d..95f8d29b397 100644 --- a/src/realm/parser/generated/query_flex.cpp +++ b/src/realm/parser/generated/query_flex.cpp @@ -510,7 +510,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[377] = +static const flex_int16_t yy_accept[381] = { 0, 0, 0, 61, 59, 1, 2, 13, 59, 58, 59, 59, 8, 59, 8, 49, 49, 6, 3, 7, 59, @@ -526,33 +526,33 @@ static const flex_int16_t yy_accept[377] = 58, 58, 58, 48, 12, 58, 58, 58, 0, 58, 58, 58, 58, 0, 58, 58, 58, 58, 58, 58, 58, 58, 12, 58, 0, 0, 0, 0, 0, 0, - 0, 0, 54, 0, 53, 52, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 15, 11, 14, 27, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 42, - 58, 58, 43, 44, 58, 13, 58, 58, 58, 58, - 0, 0, 58, 58, 39, 58, 58, 58, 58, 58, - 58, 0, 0, 42, 43, 0, 54, 0, 34, 0, - 0, 0, 31, 32, 0, 33, 0, 0, 58, 0, - - 58, 58, 58, 28, 58, 58, 58, 58, 58, 20, - 58, 16, 44, 24, 58, 0, 47, 40, 58, 58, - 0, 58, 0, 0, 0, 0, 0, 37, 0, 30, - 36, 0, 58, 55, 0, 58, 58, 58, 58, 58, - 58, 41, 58, 58, 26, 58, 58, 0, 0, 0, - 0, 0, 0, 35, 0, 58, 58, 58, 58, 58, + 0, 0, 0, 0, 54, 0, 53, 52, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 15, 11, + 14, 27, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 42, 58, 58, 43, 44, 58, 13, 58, 58, + 58, 58, 0, 0, 58, 58, 39, 58, 58, 58, + 58, 58, 58, 0, 0, 0, 0, 42, 43, 0, + 54, 0, 34, 0, 0, 0, 31, 32, 0, 33, + + 0, 0, 58, 0, 58, 58, 58, 28, 58, 58, + 58, 58, 58, 20, 58, 16, 44, 24, 58, 0, + 47, 40, 58, 58, 0, 58, 0, 0, 0, 0, + 0, 37, 0, 30, 36, 0, 58, 55, 0, 58, + 58, 58, 58, 58, 58, 41, 58, 58, 26, 58, + 58, 0, 0, 0, 0, 0, 0, 35, 0, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 0, 0, 0, 0, 38, 58, 58, 21, 58, 58, 58, 58, 58, 58, 58, 58, 0, 0, 0, 0, - 38, 58, 58, 21, 58, 58, 58, 58, 58, 58, - 58, 58, 0, 0, 0, 0, 58, 58, 19, 58, - 25, 18, 58, 42, 29, 58, 0, 0, 42, 0, + 58, 58, 19, 58, 25, 18, 58, 42, 29, 58, - 27, 58, 58, 58, 58, 0, 0, 0, 17, 28, - 58, 58, 0, 0, 47, 58, 58, 0, 0, 0, - 58, 58, 0, 0, 47, 58, 22, 0, 0, 23, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 42, 0, 27, 58, 58, 58, 58, 0, + 0, 0, 17, 28, 58, 58, 0, 0, 47, 58, + 58, 0, 0, 0, 58, 58, 0, 0, 47, 58, + 22, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 45, 0 + 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 45, 0 } ; static const YY_CHAR yy_ec[256] = @@ -573,21 +573,21 @@ static const YY_CHAR yy_ec[256] = 77, 78, 13, 79, 13, 1, 1, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 1, 1, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 1, 1, 82, 82, 82, 82, 82, 82, 82, - - 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, - 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, - 82, 82, 82, 83, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 84, 84, 84, 84, 84, 84, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 81, 81, 81, 82, 82, 82, 82, 82, 82, 82, + 82, 82, 82, 82, 82, 82, 82, 82, 82, 83, + 83, 83, 83, 83, 83, 83, 83, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static const YY_CHAR yy_meta[85] = +static const YY_CHAR yy_meta[84] = { 0, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 2, 1, 3, 1, 2, 4, 4, 4, 4, @@ -597,116 +597,116 @@ static const YY_CHAR yy_meta[85] = 3, 1, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 1, 1, - 1, 3, 3, 3 + 3, 3, 3 } ; -static const flex_int16_t yy_base[446] = +static const flex_int16_t yy_base[450] = { 0, - 0, 0, 756, 1693, 83, 752, 722, 80, 71, 732, - 83, 1693, 78, 82, 89, 106, 87, 91, 715, 85, - 123, 115, 118, 152, 129, 137, 95, 142, 181, 204, - 228, 211, 256, 681, 252, 198, 246, 266, 307, 294, - 314, 300, 158, 655, 47, 652, 49, 114, 719, 1693, - 132, 1693, 386, 238, 387, 157, 52, 619, 62, 1693, - 166, 1693, 402, 395, 405, 194, 150, 409, 413, 430, - 462, 477, 0, 1693, 1693, 1693, 621, 618, 623, 617, - 130, 32, 601, 622, 403, 449, 456, 464, 471, 484, - 475, 479, 498, 514, 523, 527, 541, 544, 550, 538, - - 565, 591, 580, 620, 317, 607, 614, 600, 484, 635, - 688, 641, 648, 620, 629, 659, 664, 678, 669, 684, - 712, 584, 1693, 501, 71, 0, 90, 0, 159, 253, - 761, 491, 769, 773, 783, 0, 601, 587, 582, 591, - 580, 553, 540, 549, 544, 544, 723, 726, 731, 746, - 792, 782, 770, 767, 804, 774, 796, 818, 826, 834, - 841, 860, 821, 830, 868, 844, 856, 885, 890, 895, - 817, 941, 924, 933, 1693, 905, 939, 919, 942, 953, - 948, 0, 0, 205, 1693, 913, 1021, 1025, 1693, 533, - 523, 530, 1693, 1693, 532, 1693, 521, 503, 995, 567, - - 1008, 998, 1001, 1018, 1024, 982, 1037, 1059, 1021, 930, - 1064, 1042, 1045, 1048, 1067, 1135, 1139, 1093, 1119, 1115, - 0, 1112, 0, 0, 265, 1161, 498, 1693, 480, 1693, - 1693, 487, 1133, 1693, 531, 1138, 1142, 1157, 1172, 1179, - 1195, 1191, 1202, 1214, 1153, 1230, 1221, 0, 0, 0, - 0, 251, 1232, 1693, 465, 1248, 1236, 1241, 1251, 1264, - 1288, 1277, 1294, 1291, 1311, 1328, 0, 0, 270, 1348, - 1693, 1341, 1351, 1300, 1345, 1357, 1354, 1370, 1392, 1381, - 1395, 1416, 0, 0, 275, 1249, 1410, 1435, 1400, 1430, - 1405, 1420, 1472, 1444, 1454, 1481, 0, 0, 1693, 1527, - - 1457, 1491, 1498, 1516, 1506, 0, 0, 1551, 1502, 1509, - 1551, 1557, 0, 0, 1595, 1568, 1572, 0, 0, 1586, - 1575, 1579, 0, 0, 1647, 1591, 1545, 0, 520, 1587, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 514, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 513, - 0, 0, 0, 0, 0, 0, 0, 0, 514, 510, - 1693, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 508, 1693, 1693, 1675, 1678, 1683, 514, - 513, 509, 495, 479, 1687, 469, 462, 461, 460, 458, - 451, 447, 442, 440, 439, 438, 432, 430, 417, 413, - - 412, 406, 405, 390, 389, 384, 382, 381, 375, 371, - 369, 368, 367, 363, 362, 359, 358, 355, 353, 351, - 343, 342, 340, 323, 321, 310, 305, 304, 302, 298, - 297, 286, 279, 265, 257, 255, 250, 249, 248, 233, - 218, 212, 192, 183, 168 + 0, 0, 685, 1707, 82, 674, 653, 79, 70, 666, + 82, 1707, 77, 81, 88, 105, 86, 90, 635, 84, + 122, 114, 117, 151, 135, 156, 94, 140, 174, 214, + 210, 227, 232, 601, 235, 247, 281, 272, 305, 298, + 325, 331, 239, 575, 573, 572, 569, 113, 624, 1707, + 120, 1707, 387, 160, 398, 278, 543, 539, 537, 1707, + 118, 1707, 416, 252, 411, 65, 106, 444, 307, 473, + 480, 494, 0, 1707, 1707, 1707, 539, 541, 548, 542, + 75, 105, 526, 546, 338, 458, 445, 354, 453, 473, + 478, 481, 486, 491, 514, 529, 539, 548, 551, 543, + + 554, 599, 564, 622, 373, 605, 628, 608, 566, 643, + 647, 650, 661, 540, 633, 670, 655, 684, 688, 698, + 709, 695, 1707, 703, 508, 501, 0, 497, 496, 0, + 111, 123, 781, 788, 792, 652, 755, 0, 515, 498, + 481, 487, 474, 483, 469, 481, 475, 459, 732, 736, + 743, 786, 752, 770, 780, 794, 808, 798, 803, 821, + 827, 849, 843, 854, 831, 836, 869, 846, 896, 891, + 903, 907, 944, 926, 929, 940, 1707, 948, 943, 956, + 951, 984, 989, 442, 0, 441, 0, 153, 1707, 986, + 998, 1030, 1707, 453, 445, 422, 1707, 1707, 426, 1707, + + 425, 405, 1002, 471, 1012, 1006, 1026, 1039, 993, 1035, + 1061, 1072, 1075, 977, 1053, 1050, 1064, 1078, 1116, 1120, + 1131, 1122, 1125, 1134, 0, 1101, 0, 0, 153, 1193, + 404, 1707, 399, 1707, 1707, 410, 1143, 1707, 460, 1151, + 1179, 1185, 1188, 1192, 1195, 1204, 1212, 1230, 1169, 1249, + 1239, 0, 0, 0, 0, 197, 1151, 1707, 394, 1254, + 1259, 1263, 1287, 1267, 1300, 1282, 1296, 1316, 1333, 1329, + 0, 0, 175, 1160, 1707, 1323, 1309, 1342, 1350, 1366, + 1357, 1376, 1383, 1369, 1393, 1416, 0, 0, 186, 1436, + 1411, 1432, 1427, 1440, 1435, 1444, 1473, 1450, 1454, 1477, + + 0, 0, 1707, 1523, 1468, 1487, 1502, 1495, 1524, 0, + 0, 1470, 1510, 1513, 1546, 1560, 0, 0, 1598, 1572, + 1579, 0, 0, 1570, 1586, 1552, 0, 0, 1627, 1606, + 1557, 0, 444, 1597, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 438, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 437, 0, 0, 0, 0, 0, 0, + 0, 0, 439, 434, 1707, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 436, 1707, 1707, + 1689, 1692, 1697, 441, 440, 439, 436, 435, 1701, 430, + 423, 419, 406, 405, 398, 396, 395, 393, 391, 390, + + 387, 386, 381, 380, 373, 369, 366, 365, 362, 357, + 354, 353, 348, 343, 342, 341, 339, 338, 336, 333, + 332, 330, 329, 315, 300, 299, 285, 284, 281, 280, + 277, 262, 260, 258, 254, 241, 222, 220, 210, 208, + 190, 186, 179, 176, 150, 146, 137, 124, 89 } ; -static const flex_int16_t yy_def[446] = +static const flex_int16_t yy_def[450] = { 0, - 376, 1, 376, 376, 376, 376, 376, 377, 378, 376, - 379, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, - 378, 378, 378, 376, 378, 378, 378, 378, 378, 378, - 378, 378, 378, 376, 376, 376, 376, 376, 376, 376, - 377, 376, 376, 378, 378, 376, 376, 376, 376, 376, - 379, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 380, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 378, 378, 378, 378, 378, 378, - 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, - - 378, 378, 378, 378, 378, 378, 378, 378, 376, 378, - 378, 378, 378, 376, 378, 378, 378, 378, 378, 378, - 378, 378, 376, 378, 376, 381, 376, 382, 376, 376, - 376, 376, 376, 376, 376, 380, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 378, 378, 378, 378, - 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, - 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, - 376, 376, 378, 378, 376, 378, 378, 378, 378, 378, - 378, 383, 384, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 378, 385, - - 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, - 378, 378, 378, 378, 378, 376, 376, 378, 378, 378, - 386, 378, 387, 388, 376, 376, 376, 376, 376, 376, - 376, 376, 378, 376, 385, 378, 378, 378, 378, 378, - 378, 378, 378, 378, 378, 378, 378, 389, 390, 391, - 392, 376, 376, 376, 376, 378, 378, 378, 378, 378, - 378, 378, 378, 378, 378, 378, 393, 394, 376, 376, - 376, 378, 378, 378, 378, 378, 378, 378, 378, 378, - 378, 378, 395, 396, 376, 376, 378, 378, 378, 378, - 378, 378, 378, 378, 378, 378, 397, 398, 376, 376, - - 378, 378, 378, 378, 378, 399, 400, 376, 378, 378, - 378, 378, 401, 402, 376, 378, 378, 403, 404, 376, - 378, 378, 405, 406, 376, 378, 378, 407, 376, 378, - 408, 409, 410, 411, 412, 413, 414, 415, 416, 376, - 417, 418, 419, 420, 421, 422, 423, 424, 425, 376, - 426, 427, 428, 429, 430, 431, 432, 433, 376, 376, - 376, 434, 435, 436, 437, 438, 439, 440, 441, 442, - 443, 444, 445, 376, 376, 0, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376 + 380, 1, 380, 380, 380, 380, 380, 381, 382, 380, + 383, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, + 382, 382, 382, 380, 382, 382, 382, 382, 382, 382, + 382, 382, 382, 380, 380, 380, 380, 380, 380, 380, + 381, 380, 380, 382, 382, 380, 380, 380, 380, 380, + 383, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 384, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 382, 382, 382, 382, 382, 382, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, + + 382, 382, 382, 382, 382, 382, 382, 382, 380, 382, + 382, 382, 382, 380, 382, 382, 382, 382, 382, 382, + 382, 382, 380, 382, 380, 380, 385, 380, 380, 386, + 380, 380, 380, 380, 380, 380, 380, 384, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 382, 382, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, + 382, 382, 380, 380, 382, 382, 380, 382, 382, 382, + 382, 382, 382, 380, 387, 380, 388, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + + 380, 380, 382, 389, 382, 382, 382, 382, 382, 382, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 380, + 380, 382, 382, 382, 390, 382, 391, 392, 380, 380, + 380, 380, 380, 380, 380, 380, 382, 380, 389, 382, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, + 382, 393, 394, 395, 396, 380, 380, 380, 380, 382, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, + 397, 398, 380, 380, 380, 382, 382, 382, 382, 382, + 382, 382, 382, 382, 382, 382, 399, 400, 380, 380, + 382, 382, 382, 382, 382, 382, 382, 382, 382, 382, + + 401, 402, 380, 380, 382, 382, 382, 382, 382, 403, + 404, 380, 382, 382, 382, 382, 405, 406, 380, 382, + 382, 407, 408, 380, 382, 382, 409, 410, 380, 382, + 382, 411, 380, 382, 412, 413, 414, 415, 416, 417, + 418, 419, 420, 380, 421, 422, 423, 424, 425, 426, + 427, 428, 429, 380, 430, 431, 432, 433, 434, 435, + 436, 437, 380, 380, 380, 438, 439, 440, 441, 442, + 443, 444, 445, 446, 447, 448, 449, 380, 380, 0, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380 } ; -static const flex_int16_t yy_nxt[1778] = +static const flex_int16_t yy_nxt[1791] = { 0, 4, 5, 6, 5, 7, 8, 9, 10, 11, 12, 12, 13, 12, 13, 14, 4, 15, 16, 16, 16, @@ -716,196 +716,197 @@ static const flex_int16_t yy_nxt[1778] = 4, 12, 27, 35, 36, 23, 24, 25, 37, 27, 27, 38, 27, 29, 27, 39, 40, 27, 27, 27, 41, 42, 43, 27, 27, 27, 27, 27, 44, 4, - 4, 45, 46, 47, 48, 52, 48, 55, 55, 55, - 55, 62, 64, 143, 65, 65, 65, 65, 68, 68, - - 68, 68, 69, 70, 144, 71, 71, 71, 71, 74, - 50, 66, 74, 75, 76, 48, 67, 48, 72, 69, - 70, 56, 71, 71, 71, 71, 124, 124, 125, 125, - 53, 54, 54, 63, 89, 72, 73, 52, 77, 66, - 78, 127, 127, 67, 90, 56, 72, 79, 80, 81, - 124, 124, 57, 58, 59, 82, 83, 91, 84, 85, - 54, 86, 95, 72, 73, 56, 87, 94, 56, 54, - 54, 374, 90, 56, 62, 130, 57, 58, 59, 56, - 97, 92, 53, 141, 91, 93, 373, 56, 88, 184, - 96, 142, 56, 87, 94, 372, 57, 58, 59, 57, - - 58, 59, 56, 130, 57, 58, 59, 98, 56, 92, - 57, 58, 59, 93, 99, 371, 63, 184, 57, 58, - 59, 370, 54, 57, 58, 59, 54, 90, 54, 100, - 122, 56, 129, 57, 58, 59, 369, 101, 225, 57, - 58, 59, 99, 102, 104, 104, 104, 104, 56, 103, - 106, 368, 367, 366, 56, 90, 107, 100, 365, 129, - 364, 56, 57, 58, 59, 101, 225, 109, 363, 110, - 105, 96, 111, 111, 111, 111, 103, 108, 56, 57, - 58, 59, 360, 107, 269, 57, 58, 59, 56, 359, - 88, 185, 57, 58, 59, 87, 56, 105, 112, 117, - - 358, 357, 56, 252, 98, 356, 56, 355, 354, 57, - 58, 59, 269, 353, 285, 115, 56, 116, 185, 57, - 58, 59, 87, 299, 351, 113, 350, 57, 58, 59, - 252, 97, 100, 57, 58, 59, 105, 57, 58, 59, - 101, 285, 113, 349, 56, 348, 347, 57, 58, 59, - 56, 299, 103, 108, 346, 119, 345, 56, 344, 107, - 100, 343, 341, 105, 56, 340, 339, 56, 101, 121, - 338, 337, 336, 118, 335, 57, 58, 59, 334, 103, - 120, 57, 58, 59, 333, 331, 107, 329, 57, 58, - 59, 51, 328, 324, 51, 57, 58, 59, 57, 58, - - 59, 51, 51, 55, 55, 55, 55, 61, 323, 319, - 61, 68, 68, 68, 68, 318, 314, 61, 61, 70, - 313, 65, 65, 65, 65, 68, 68, 68, 68, 132, - 132, 132, 132, 307, 72, 306, 51, 56, 131, 147, - 51, 298, 297, 284, 51, 283, 133, 133, 133, 133, - 61, 51, 61, 56, 51, 51, 61, 51, 126, 131, - 61, 268, 72, 267, 251, 250, 131, 61, 57, 58, - 59, 61, 248, 61, 128, 69, 70, 148, 71, 71, - 71, 71, 224, 150, 57, 58, 59, 131, 134, 151, - 134, 72, 148, 135, 135, 135, 135, 149, 223, 56, - - 171, 171, 171, 171, 188, 148, 56, 132, 132, 132, - 132, 150, 183, 154, 56, 152, 182, 136, 375, 72, - 148, 56, 155, 362, 361, 56, 352, 342, 153, 56, - 57, 58, 59, 332, 56, 271, 234, 57, 58, 59, - 154, 156, 157, 152, 255, 57, 58, 59, 56, 155, - 254, 56, 57, 58, 59, 153, 57, 58, 59, 158, - 57, 58, 59, 159, 56, 57, 58, 59, 156, 230, - 157, 160, 234, 56, 160, 232, 163, 56, 231, 57, - 58, 59, 57, 58, 59, 161, 159, 162, 56, 230, - 159, 56, 229, 228, 56, 57, 58, 59, 227, 160, - - 56, 164, 160, 163, 57, 58, 59, 198, 57, 58, - 59, 197, 161, 196, 162, 56, 167, 195, 194, 57, - 58, 59, 57, 58, 59, 57, 58, 59, 164, 165, - 56, 57, 58, 59, 56, 166, 104, 104, 104, 104, - 170, 56, 169, 167, 168, 181, 57, 58, 59, 169, - 56, 111, 111, 111, 111, 193, 192, 56, 191, 190, - 189, 57, 58, 59, 56, 57, 58, 59, 170, 169, - 56, 175, 57, 58, 59, 146, 169, 145, 140, 56, - 139, 57, 58, 59, 138, 56, 173, 148, 57, 58, - 59, 56, 147, 174, 137, 57, 58, 59, 56, 127, - - 159, 57, 58, 59, 111, 111, 111, 111, 172, 56, - 57, 58, 59, 174, 56, 148, 57, 58, 59, 56, - 174, 49, 57, 58, 59, 178, 169, 176, 56, 57, - 58, 59, 125, 123, 56, 149, 114, 76, 56, 60, - 57, 58, 59, 177, 50, 57, 58, 59, 179, 166, - 57, 58, 59, 169, 49, 376, 376, 174, 376, 57, - 58, 59, 56, 376, 376, 57, 58, 59, 376, 57, - 58, 59, 186, 56, 186, 199, 56, 187, 187, 187, - 187, 56, 376, 376, 180, 133, 133, 133, 133, 135, - 135, 135, 135, 57, 58, 59, 56, 200, 131, 135, - - 135, 135, 135, 199, 57, 58, 59, 57, 58, 59, - 376, 203, 57, 58, 59, 201, 202, 56, 205, 376, - 56, 376, 376, 376, 56, 376, 131, 57, 58, 59, - 376, 204, 56, 171, 171, 171, 171, 172, 203, 206, - 376, 376, 56, 201, 202, 205, 56, 376, 57, 58, - 59, 57, 58, 59, 56, 57, 58, 59, 376, 204, - 376, 207, 376, 57, 58, 59, 206, 209, 56, 208, - 210, 56, 376, 57, 58, 59, 56, 57, 58, 59, - 56, 376, 376, 376, 56, 57, 58, 59, 208, 376, - 376, 56, 213, 211, 56, 209, 208, 212, 210, 57, - - 58, 59, 57, 58, 59, 376, 56, 57, 58, 59, - 56, 57, 58, 59, 149, 57, 58, 59, 56, 213, - 376, 211, 57, 58, 59, 57, 58, 59, 221, 187, - 187, 187, 187, 376, 214, 56, 215, 57, 58, 59, - 56, 57, 58, 59, 376, 56, 376, 376, 208, 57, - 58, 59, 216, 218, 216, 56, 376, 217, 217, 217, - 217, 214, 219, 215, 376, 376, 57, 58, 59, 56, - 376, 57, 58, 59, 56, 220, 57, 58, 59, 376, - 56, 219, 219, 56, 376, 376, 57, 58, 59, 56, - 219, 376, 56, 376, 376, 376, 212, 376, 56, 149, - - 57, 58, 59, 56, 222, 57, 58, 59, 376, 376, - 218, 57, 58, 59, 57, 58, 59, 376, 376, 376, - 57, 58, 59, 57, 58, 59, 238, 237, 241, 57, - 58, 59, 56, 233, 57, 58, 59, 187, 187, 187, - 187, 226, 226, 226, 226, 56, 236, 239, 56, 376, - 376, 56, 376, 376, 238, 237, 241, 240, 56, 244, - 233, 376, 376, 57, 58, 59, 242, 376, 56, 376, - 376, 56, 376, 236, 56, 239, 57, 58, 59, 57, - 58, 59, 57, 58, 59, 240, 244, 56, 243, 57, - 58, 59, 56, 376, 243, 56, 376, 376, 56, 57, - - 58, 59, 57, 58, 59, 57, 58, 59, 245, 56, - 376, 376, 246, 376, 56, 376, 243, 56, 57, 58, - 59, 249, 376, 57, 58, 59, 57, 58, 59, 57, - 58, 59, 376, 247, 376, 245, 376, 376, 376, 246, - 57, 58, 59, 56, 243, 57, 58, 59, 57, 58, - 59, 217, 217, 217, 217, 217, 217, 217, 217, 247, - 247, 256, 56, 376, 376, 56, 376, 376, 376, 56, - 376, 258, 242, 376, 57, 58, 59, 226, 226, 226, - 226, 257, 376, 56, 376, 253, 247, 376, 56, 256, - 259, 376, 56, 57, 58, 59, 57, 58, 59, 258, - - 57, 58, 59, 56, 376, 253, 376, 56, 257, 376, - 260, 376, 376, 376, 57, 58, 59, 261, 259, 57, - 58, 59, 56, 57, 58, 59, 376, 376, 262, 56, - 376, 263, 376, 376, 57, 58, 59, 260, 57, 58, - 59, 56, 263, 376, 261, 56, 376, 264, 270, 270, - 270, 270, 56, 57, 58, 59, 262, 376, 263, 265, - 57, 58, 59, 266, 56, 300, 300, 300, 300, 263, - 376, 56, 57, 58, 59, 264, 57, 58, 59, 274, - 56, 272, 273, 57, 58, 59, 56, 265, 376, 275, - 266, 56, 276, 376, 376, 57, 58, 59, 56, 376, - - 376, 56, 57, 58, 59, 376, 274, 376, 376, 272, - 273, 57, 58, 59, 56, 277, 275, 57, 58, 59, - 276, 278, 57, 58, 59, 376, 376, 56, 376, 57, - 58, 59, 57, 58, 59, 280, 279, 376, 56, 376, - 376, 56, 376, 277, 56, 57, 58, 59, 278, 376, - 56, 376, 376, 281, 376, 376, 376, 282, 57, 58, - 59, 56, 280, 279, 270, 270, 270, 270, 286, 57, - 58, 59, 57, 58, 59, 57, 58, 59, 56, 287, - 281, 57, 58, 59, 288, 282, 376, 376, 289, 376, - 290, 56, 57, 58, 59, 56, 376, 376, 291, 376, - - 376, 56, 292, 376, 56, 376, 287, 56, 376, 57, - 58, 59, 288, 376, 376, 289, 376, 376, 290, 376, - 56, 293, 57, 58, 59, 291, 57, 58, 59, 294, - 292, 56, 57, 58, 59, 57, 58, 59, 57, 58, - 59, 301, 56, 295, 296, 56, 376, 376, 376, 293, - 56, 57, 58, 59, 376, 56, 376, 294, 376, 376, - 56, 376, 57, 58, 59, 376, 56, 376, 303, 301, - 56, 295, 296, 57, 58, 59, 57, 58, 59, 302, - 56, 57, 58, 59, 376, 56, 57, 58, 59, 376, - 376, 57, 58, 59, 56, 303, 376, 57, 58, 59, - - 304, 57, 58, 59, 56, 376, 302, 56, 376, 376, - 376, 57, 58, 59, 305, 376, 57, 58, 59, 376, - 376, 376, 56, 309, 376, 57, 58, 59, 304, 310, - 376, 56, 376, 312, 376, 57, 58, 59, 57, 58, - 59, 56, 305, 300, 300, 300, 300, 308, 56, 311, - 376, 309, 56, 57, 58, 59, 56, 310, 376, 56, - 376, 312, 57, 58, 59, 376, 56, 315, 315, 315, - 315, 376, 57, 58, 59, 376, 376, 311, 316, 57, - 58, 59, 317, 57, 58, 59, 376, 57, 58, 59, - 57, 58, 59, 321, 376, 56, 376, 57, 58, 59, - - 376, 56, 325, 325, 325, 325, 316, 56, 327, 376, - 317, 315, 315, 315, 315, 320, 322, 376, 56, 326, - 330, 321, 56, 376, 376, 56, 57, 58, 59, 56, - 376, 376, 57, 58, 59, 376, 327, 56, 57, 58, - 59, 56, 376, 322, 376, 376, 326, 376, 330, 57, - 58, 59, 376, 57, 58, 59, 57, 58, 59, 376, - 57, 58, 59, 325, 325, 325, 325, 376, 57, 58, - 59, 376, 57, 58, 59, 51, 51, 51, 51, 51, - 54, 54, 54, 61, 61, 61, 61, 61, 235, 376, - 235, 235, 3, 376, 376, 376, 376, 376, 376, 376, - - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376 + 45, 46, 47, 48, 52, 48, 55, 55, 55, 55, + 62, 64, 378, 65, 65, 65, 65, 68, 68, 68, + + 68, 69, 70, 131, 71, 71, 71, 71, 74, 50, + 66, 74, 75, 76, 48, 67, 48, 72, 69, 70, + 56, 71, 71, 71, 71, 52, 62, 377, 143, 53, + 131, 132, 63, 89, 72, 73, 144, 77, 66, 78, + 376, 188, 67, 90, 56, 72, 79, 80, 81, 375, + 57, 58, 59, 374, 82, 83, 91, 84, 85, 132, + 86, 189, 72, 73, 56, 87, 145, 56, 63, 188, + 53, 90, 56, 94, 57, 58, 59, 146, 97, 373, + 92, 95, 372, 91, 93, 56, 229, 88, 189, 371, + 56, 256, 87, 370, 57, 58, 59, 57, 58, 59, + + 94, 56, 57, 58, 59, 98, 56, 99, 92, 96, + 56, 369, 93, 368, 229, 57, 58, 59, 256, 289, + 57, 58, 59, 367, 56, 364, 104, 104, 104, 104, + 273, 57, 58, 59, 303, 99, 57, 58, 59, 100, + 57, 58, 59, 109, 363, 110, 289, 101, 111, 111, + 111, 111, 105, 102, 57, 58, 59, 362, 273, 103, + 56, 361, 303, 360, 56, 359, 106, 100, 68, 68, + 68, 68, 107, 88, 112, 101, 90, 56, 87, 105, + 358, 54, 56, 357, 355, 56, 103, 354, 353, 56, + 57, 58, 59, 108, 57, 58, 59, 56, 115, 107, + + 116, 113, 352, 351, 90, 87, 96, 57, 58, 59, + 98, 122, 57, 58, 59, 57, 58, 59, 350, 57, + 58, 59, 56, 134, 134, 134, 134, 57, 58, 59, + 100, 56, 349, 348, 117, 347, 345, 97, 101, 344, + 105, 343, 342, 54, 341, 340, 339, 54, 56, 54, + 103, 338, 57, 58, 59, 56, 337, 335, 100, 119, + 333, 57, 58, 59, 108, 332, 101, 105, 328, 327, + 107, 118, 323, 113, 149, 56, 322, 103, 57, 58, + 59, 56, 150, 318, 317, 57, 58, 59, 56, 311, + 310, 120, 51, 302, 301, 51, 288, 107, 287, 61, + + 121, 51, 51, 51, 56, 57, 58, 59, 272, 271, + 150, 57, 58, 59, 55, 55, 55, 55, 57, 58, + 59, 61, 255, 56, 61, 70, 254, 65, 65, 65, + 65, 61, 61, 252, 57, 58, 59, 51, 228, 227, + 72, 51, 187, 185, 138, 51, 379, 366, 56, 365, + 356, 346, 51, 57, 58, 59, 51, 336, 51, 127, + 68, 68, 68, 68, 275, 238, 61, 259, 72, 258, + 61, 153, 152, 133, 61, 234, 238, 236, 57, 58, + 59, 61, 235, 234, 233, 61, 150, 61, 130, 135, + 135, 135, 135, 69, 70, 56, 71, 71, 71, 71, + + 152, 133, 133, 56, 154, 136, 151, 136, 56, 72, + 137, 137, 137, 137, 150, 232, 156, 155, 231, 159, + 54, 124, 202, 56, 157, 57, 58, 59, 56, 158, + 133, 56, 154, 57, 58, 59, 56, 72, 57, 58, + 59, 56, 201, 156, 155, 200, 199, 159, 198, 197, + 160, 157, 196, 57, 58, 59, 158, 195, 57, 58, + 59, 57, 58, 59, 56, 161, 57, 58, 59, 162, + 194, 57, 58, 59, 193, 186, 54, 161, 162, 56, + 184, 165, 173, 173, 173, 173, 163, 124, 164, 56, + 166, 177, 161, 56, 57, 58, 59, 162, 56, 148, + + 169, 56, 147, 142, 56, 141, 162, 140, 165, 57, + 58, 59, 139, 163, 56, 164, 129, 166, 128, 57, + 58, 59, 54, 57, 58, 59, 49, 169, 57, 58, + 59, 57, 58, 59, 57, 58, 59, 167, 104, 104, + 104, 104, 170, 168, 57, 58, 59, 171, 126, 56, + 171, 125, 124, 123, 172, 56, 114, 76, 56, 111, + 111, 111, 111, 111, 111, 111, 111, 174, 137, 137, + 137, 137, 56, 60, 171, 50, 49, 171, 56, 57, + 58, 59, 172, 56, 380, 57, 58, 59, 57, 58, + 59, 161, 380, 56, 380, 175, 149, 56, 150, 380, + + 56, 380, 57, 58, 59, 56, 176, 380, 57, 58, + 59, 56, 380, 57, 58, 59, 380, 380, 178, 380, + 56, 380, 176, 57, 58, 59, 150, 57, 58, 59, + 57, 58, 59, 176, 56, 57, 58, 59, 56, 380, + 171, 57, 58, 59, 180, 56, 151, 380, 56, 179, + 57, 58, 59, 56, 176, 168, 183, 204, 380, 56, + 380, 380, 181, 380, 57, 58, 59, 171, 57, 58, + 59, 137, 137, 137, 137, 57, 58, 59, 57, 58, + 59, 182, 56, 57, 58, 59, 56, 380, 380, 57, + 58, 59, 190, 56, 190, 380, 380, 191, 191, 191, + + 191, 192, 56, 205, 134, 134, 134, 134, 135, 135, + 135, 135, 57, 58, 59, 203, 57, 58, 59, 380, + 56, 133, 380, 57, 58, 59, 206, 380, 380, 380, + 56, 205, 57, 58, 59, 208, 56, 380, 207, 380, + 380, 380, 209, 203, 56, 380, 210, 380, 56, 133, + 57, 58, 59, 56, 206, 380, 380, 380, 56, 380, + 57, 58, 59, 208, 211, 207, 57, 58, 59, 209, + 212, 56, 214, 210, 57, 58, 59, 56, 57, 58, + 59, 56, 213, 57, 58, 59, 56, 215, 57, 58, + 59, 212, 380, 56, 380, 380, 56, 212, 216, 56, + + 214, 57, 58, 59, 56, 380, 380, 57, 58, 59, + 213, 57, 58, 59, 380, 215, 57, 58, 59, 56, + 151, 380, 380, 57, 58, 59, 57, 58, 59, 57, + 58, 59, 217, 380, 57, 58, 59, 220, 380, 220, + 380, 56, 221, 221, 221, 221, 56, 218, 219, 57, + 58, 59, 380, 56, 380, 380, 380, 56, 222, 217, + 173, 173, 173, 173, 174, 225, 380, 380, 380, 223, + 380, 57, 58, 59, 218, 219, 57, 58, 59, 56, + 380, 380, 380, 57, 58, 59, 223, 57, 58, 59, + 56, 212, 380, 56, 380, 380, 380, 223, 56, 380, + + 216, 56, 191, 191, 191, 191, 56, 380, 151, 57, + 58, 59, 380, 223, 191, 191, 191, 191, 224, 380, + 57, 58, 59, 57, 58, 59, 244, 56, 57, 58, + 59, 57, 58, 59, 56, 241, 57, 58, 59, 56, + 237, 222, 380, 56, 380, 226, 230, 230, 230, 230, + 240, 242, 56, 380, 244, 380, 56, 57, 58, 59, + 380, 380, 56, 241, 57, 58, 59, 237, 243, 57, + 58, 59, 380, 57, 58, 59, 56, 240, 380, 242, + 380, 245, 57, 58, 59, 56, 57, 58, 59, 56, + 246, 380, 57, 58, 59, 380, 243, 249, 380, 380, + + 56, 247, 380, 56, 380, 380, 57, 58, 59, 245, + 253, 56, 380, 248, 56, 57, 58, 59, 247, 57, + 58, 59, 56, 380, 249, 56, 380, 380, 56, 247, + 57, 58, 59, 57, 58, 59, 221, 221, 221, 221, + 248, 57, 58, 59, 57, 58, 59, 221, 221, 221, + 221, 56, 57, 58, 59, 57, 58, 59, 57, 58, + 59, 250, 251, 247, 380, 251, 56, 274, 274, 274, + 274, 260, 56, 380, 380, 56, 274, 274, 274, 274, + 290, 57, 58, 59, 56, 380, 380, 380, 250, 251, + 380, 246, 251, 56, 261, 380, 57, 58, 59, 260, + + 380, 56, 57, 58, 59, 57, 58, 59, 262, 230, + 230, 230, 230, 380, 57, 58, 59, 257, 263, 56, + 380, 261, 380, 57, 58, 59, 264, 380, 266, 56, + 265, 57, 58, 59, 380, 56, 262, 257, 56, 380, + 380, 380, 56, 380, 267, 56, 263, 380, 380, 57, + 58, 59, 267, 264, 56, 380, 266, 265, 380, 57, + 58, 59, 56, 268, 380, 57, 58, 59, 57, 58, + 59, 267, 57, 58, 59, 57, 58, 59, 269, 267, + 56, 270, 380, 380, 57, 58, 59, 276, 380, 56, + 380, 268, 57, 58, 59, 280, 380, 380, 380, 56, + + 380, 278, 380, 380, 56, 277, 269, 380, 270, 56, + 57, 58, 59, 56, 380, 276, 380, 56, 380, 57, + 58, 59, 380, 280, 380, 279, 282, 281, 278, 57, + 58, 59, 56, 277, 57, 58, 59, 56, 283, 57, + 58, 59, 292, 57, 58, 59, 56, 57, 58, 59, + 56, 380, 279, 282, 380, 281, 380, 380, 286, 56, + 284, 291, 57, 58, 59, 283, 56, 57, 58, 59, + 292, 380, 380, 56, 380, 285, 57, 58, 59, 56, + 57, 58, 59, 56, 380, 380, 286, 284, 291, 57, + 58, 59, 56, 293, 380, 380, 57, 58, 59, 294, + + 56, 295, 285, 57, 58, 59, 380, 56, 296, 57, + 58, 59, 297, 57, 58, 59, 56, 298, 380, 56, + 293, 380, 57, 58, 59, 380, 56, 294, 295, 380, + 57, 58, 59, 56, 380, 380, 296, 57, 58, 59, + 297, 299, 305, 56, 300, 298, 57, 58, 59, 57, + 58, 59, 304, 304, 304, 304, 57, 58, 59, 380, + 380, 56, 380, 57, 58, 59, 56, 380, 380, 299, + 305, 380, 300, 57, 58, 59, 306, 56, 307, 380, + 380, 380, 56, 380, 380, 56, 319, 319, 319, 319, + 56, 57, 58, 59, 56, 380, 57, 58, 59, 380, + + 56, 308, 380, 306, 56, 307, 380, 57, 58, 59, + 309, 380, 57, 58, 59, 57, 58, 59, 56, 313, + 57, 58, 59, 56, 57, 58, 59, 56, 315, 308, + 57, 58, 59, 314, 57, 58, 59, 56, 309, 304, + 304, 304, 304, 312, 380, 56, 380, 313, 57, 58, + 59, 316, 56, 57, 58, 59, 315, 57, 58, 59, + 56, 314, 380, 56, 380, 380, 380, 57, 58, 59, + 380, 380, 380, 320, 56, 57, 58, 59, 380, 316, + 380, 331, 57, 58, 59, 321, 329, 329, 329, 329, + 57, 58, 59, 57, 58, 59, 56, 325, 380, 380, + + 380, 320, 56, 380, 57, 58, 59, 56, 380, 331, + 56, 380, 380, 321, 319, 319, 319, 319, 324, 380, + 380, 380, 56, 326, 380, 325, 57, 58, 59, 56, + 330, 380, 57, 58, 59, 334, 56, 57, 58, 59, + 57, 58, 59, 329, 329, 329, 329, 56, 380, 380, + 326, 380, 57, 58, 59, 380, 56, 330, 380, 57, + 58, 59, 380, 334, 380, 380, 57, 58, 59, 380, + 380, 380, 380, 380, 380, 380, 380, 57, 58, 59, + 380, 380, 380, 380, 380, 380, 57, 58, 59, 51, + 51, 51, 51, 51, 54, 54, 54, 61, 61, 61, + + 61, 61, 239, 380, 239, 239, 3, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380 } ; -static const flex_int16_t yy_chk[1778] = +static const flex_int16_t yy_chk[1791] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -915,193 +916,194 @@ static const flex_int16_t yy_chk[1778] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 5, 8, 5, 9, 9, 9, - 9, 11, 13, 82, 13, 13, 13, 13, 14, 14, - - 14, 14, 15, 15, 82, 15, 15, 15, 15, 17, - 17, 13, 18, 18, 18, 48, 13, 48, 15, 16, - 16, 9, 16, 16, 16, 16, 45, 45, 47, 47, - 8, 57, 57, 11, 22, 16, 15, 51, 20, 13, - 20, 59, 59, 13, 22, 27, 15, 20, 20, 20, - 125, 125, 9, 9, 9, 20, 20, 23, 20, 21, - 56, 21, 26, 16, 15, 22, 21, 25, 23, 127, - 127, 445, 22, 21, 61, 67, 27, 27, 27, 25, - 28, 24, 51, 81, 23, 24, 444, 26, 21, 129, - 26, 81, 28, 21, 25, 443, 22, 22, 22, 23, - - 23, 23, 24, 67, 21, 21, 21, 28, 43, 24, - 25, 25, 25, 24, 29, 442, 61, 129, 26, 26, - 26, 441, 56, 28, 28, 28, 56, 36, 56, 30, - 43, 29, 66, 24, 24, 24, 440, 30, 184, 43, - 43, 43, 29, 30, 31, 31, 31, 31, 36, 30, - 32, 439, 438, 437, 30, 36, 32, 30, 436, 66, - 435, 32, 29, 29, 29, 30, 184, 33, 434, 33, - 31, 37, 33, 33, 33, 33, 30, 32, 31, 36, - 36, 36, 433, 32, 252, 30, 30, 30, 54, 432, - 35, 130, 32, 32, 32, 35, 37, 31, 33, 37, - - 431, 430, 35, 225, 38, 429, 33, 428, 427, 31, - 31, 31, 252, 426, 269, 35, 38, 35, 130, 54, - 54, 54, 35, 285, 425, 33, 424, 37, 37, 37, - 225, 38, 39, 35, 35, 35, 40, 33, 33, 33, - 39, 269, 42, 423, 40, 422, 421, 38, 38, 38, - 42, 285, 39, 41, 420, 40, 419, 39, 418, 41, - 39, 417, 416, 40, 41, 415, 414, 105, 39, 42, - 413, 412, 411, 39, 410, 40, 40, 40, 409, 39, - 41, 42, 42, 42, 408, 407, 41, 406, 39, 39, - 39, 53, 405, 404, 53, 41, 41, 41, 105, 105, - - 105, 53, 53, 55, 55, 55, 55, 63, 403, 402, - 63, 64, 64, 64, 64, 401, 400, 63, 63, 65, - 399, 65, 65, 65, 65, 68, 68, 68, 68, 69, - 69, 69, 69, 398, 65, 397, 53, 55, 68, 85, - 53, 396, 395, 394, 53, 393, 70, 70, 70, 70, - 392, 53, 63, 85, 391, 53, 63, 53, 53, 70, - 63, 390, 65, 389, 388, 387, 68, 63, 55, 55, - 55, 63, 386, 63, 63, 71, 71, 86, 71, 71, - 71, 71, 384, 87, 85, 85, 85, 70, 72, 89, - 72, 71, 88, 72, 72, 72, 72, 86, 383, 86, - - 109, 109, 109, 109, 132, 86, 87, 132, 132, 132, - 132, 87, 382, 91, 88, 90, 381, 380, 374, 71, - 88, 89, 92, 360, 359, 91, 350, 340, 90, 92, - 86, 86, 86, 329, 90, 255, 235, 87, 87, 87, - 91, 93, 94, 90, 232, 88, 88, 88, 93, 92, - 229, 124, 89, 89, 89, 90, 91, 91, 91, 95, - 92, 92, 92, 96, 94, 90, 90, 90, 93, 227, - 94, 97, 200, 95, 98, 198, 100, 96, 197, 93, - 93, 93, 124, 124, 124, 99, 95, 99, 100, 195, - 96, 97, 192, 191, 98, 94, 94, 94, 190, 97, - - 99, 101, 98, 100, 95, 95, 95, 146, 96, 96, - 96, 145, 99, 144, 99, 101, 103, 143, 142, 100, - 100, 100, 97, 97, 97, 98, 98, 98, 101, 102, - 103, 99, 99, 99, 122, 102, 104, 104, 104, 104, - 107, 102, 108, 103, 106, 122, 101, 101, 101, 106, - 108, 110, 110, 110, 110, 141, 140, 106, 139, 138, - 137, 103, 103, 103, 107, 122, 122, 122, 107, 108, - 104, 114, 102, 102, 102, 84, 106, 83, 80, 115, - 79, 108, 108, 108, 78, 110, 112, 116, 106, 106, - 106, 112, 115, 113, 77, 107, 107, 107, 113, 58, - - 117, 104, 104, 104, 111, 111, 111, 111, 111, 116, - 115, 115, 115, 112, 117, 116, 110, 110, 110, 119, - 113, 49, 112, 112, 112, 119, 120, 117, 118, 113, - 113, 113, 46, 44, 120, 116, 34, 19, 111, 10, - 116, 116, 116, 118, 7, 117, 117, 117, 120, 118, - 119, 119, 119, 120, 6, 3, 0, 121, 0, 118, - 118, 118, 121, 0, 0, 120, 120, 120, 0, 111, - 111, 111, 131, 147, 131, 150, 148, 131, 131, 131, - 131, 149, 0, 0, 121, 133, 133, 133, 133, 134, - 134, 134, 134, 121, 121, 121, 150, 151, 133, 135, - - 135, 135, 135, 150, 147, 147, 147, 148, 148, 148, - 0, 154, 149, 149, 149, 152, 153, 154, 156, 0, - 153, 0, 0, 0, 156, 0, 133, 150, 150, 150, - 0, 155, 152, 171, 171, 171, 171, 171, 154, 157, - 0, 0, 151, 152, 153, 156, 157, 0, 154, 154, - 154, 153, 153, 153, 155, 156, 156, 156, 0, 155, - 0, 158, 0, 152, 152, 152, 157, 160, 158, 159, - 161, 163, 0, 151, 151, 151, 159, 157, 157, 157, - 164, 0, 0, 0, 160, 155, 155, 155, 158, 0, - 0, 161, 167, 162, 166, 160, 159, 165, 161, 158, - - 158, 158, 163, 163, 163, 0, 167, 159, 159, 159, - 162, 164, 164, 164, 168, 160, 160, 160, 165, 167, - 0, 162, 161, 161, 161, 166, 166, 166, 178, 186, - 186, 186, 186, 0, 169, 168, 170, 167, 167, 167, - 169, 162, 162, 162, 0, 170, 0, 0, 176, 165, - 165, 165, 172, 173, 172, 176, 0, 172, 172, 172, - 172, 169, 174, 170, 0, 0, 168, 168, 168, 178, - 0, 169, 169, 169, 173, 176, 170, 170, 170, 0, - 210, 173, 180, 174, 0, 0, 176, 176, 176, 177, - 174, 0, 179, 0, 0, 0, 177, 0, 181, 179, - - 178, 178, 178, 180, 181, 173, 173, 173, 0, 0, - 180, 210, 210, 210, 174, 174, 174, 0, 0, 0, - 177, 177, 177, 179, 179, 179, 203, 202, 206, 181, - 181, 181, 206, 199, 180, 180, 180, 187, 187, 187, - 187, 188, 188, 188, 188, 199, 201, 204, 202, 0, - 0, 203, 0, 0, 203, 202, 206, 205, 201, 209, - 199, 0, 0, 206, 206, 206, 207, 0, 204, 0, - 0, 209, 0, 201, 205, 204, 199, 199, 199, 202, - 202, 202, 203, 203, 203, 205, 209, 207, 208, 201, - 201, 201, 212, 0, 207, 213, 0, 0, 214, 204, - - 204, 204, 209, 209, 209, 205, 205, 205, 211, 208, - 0, 0, 215, 0, 211, 0, 208, 215, 207, 207, - 207, 222, 0, 212, 212, 212, 213, 213, 213, 214, - 214, 214, 0, 218, 0, 211, 0, 0, 0, 215, - 208, 208, 208, 218, 220, 211, 211, 211, 215, 215, - 215, 216, 216, 216, 216, 217, 217, 217, 217, 219, - 218, 233, 222, 0, 0, 220, 0, 0, 0, 219, - 0, 237, 220, 0, 218, 218, 218, 226, 226, 226, - 226, 236, 0, 233, 0, 226, 219, 0, 236, 233, - 238, 0, 237, 222, 222, 222, 220, 220, 220, 237, - - 219, 219, 219, 245, 0, 226, 0, 238, 236, 0, - 239, 0, 0, 0, 233, 233, 233, 240, 238, 236, - 236, 236, 239, 237, 237, 237, 0, 0, 241, 240, - 0, 242, 0, 0, 245, 245, 245, 239, 238, 238, - 238, 242, 243, 0, 240, 241, 0, 244, 253, 253, - 253, 253, 243, 239, 239, 239, 241, 0, 242, 246, - 240, 240, 240, 247, 244, 286, 286, 286, 286, 243, - 0, 247, 242, 242, 242, 244, 241, 241, 241, 258, - 246, 256, 257, 243, 243, 243, 257, 246, 0, 259, - 247, 258, 260, 0, 0, 244, 244, 244, 256, 0, - - 0, 259, 247, 247, 247, 0, 258, 0, 0, 256, - 257, 246, 246, 246, 260, 261, 259, 257, 257, 257, - 260, 262, 258, 258, 258, 0, 0, 262, 0, 256, - 256, 256, 259, 259, 259, 264, 263, 0, 261, 0, - 0, 264, 0, 261, 263, 260, 260, 260, 262, 0, - 274, 0, 0, 265, 0, 0, 0, 266, 262, 262, - 262, 265, 264, 263, 270, 270, 270, 270, 270, 261, - 261, 261, 264, 264, 264, 263, 263, 263, 266, 272, - 265, 274, 274, 274, 273, 266, 0, 0, 275, 0, - 276, 272, 265, 265, 265, 275, 0, 0, 277, 0, - - 0, 273, 278, 0, 277, 0, 272, 276, 0, 266, - 266, 266, 273, 0, 0, 275, 0, 0, 276, 0, - 278, 279, 272, 272, 272, 277, 275, 275, 275, 280, - 278, 280, 273, 273, 273, 277, 277, 277, 276, 276, - 276, 287, 279, 281, 282, 281, 0, 0, 0, 279, - 289, 278, 278, 278, 0, 291, 0, 280, 0, 0, - 287, 0, 280, 280, 280, 0, 282, 0, 290, 287, - 292, 281, 282, 279, 279, 279, 281, 281, 281, 288, - 290, 289, 289, 289, 0, 288, 291, 291, 291, 0, - 0, 287, 287, 287, 294, 290, 0, 282, 282, 282, - - 293, 292, 292, 292, 295, 0, 288, 301, 0, 0, - 0, 290, 290, 290, 296, 0, 288, 288, 288, 0, - 0, 0, 293, 302, 0, 294, 294, 294, 293, 303, - 0, 296, 0, 305, 0, 295, 295, 295, 301, 301, - 301, 302, 296, 300, 300, 300, 300, 300, 303, 304, - 0, 302, 309, 293, 293, 293, 305, 303, 0, 310, - 0, 305, 296, 296, 296, 0, 304, 308, 308, 308, - 308, 0, 302, 302, 302, 0, 0, 304, 311, 303, - 303, 303, 312, 309, 309, 309, 0, 305, 305, 305, - 310, 310, 310, 316, 0, 327, 0, 304, 304, 304, - - 0, 311, 320, 320, 320, 320, 311, 312, 322, 0, - 312, 315, 315, 315, 315, 315, 317, 0, 316, 321, - 326, 316, 317, 0, 0, 321, 327, 327, 327, 322, - 0, 0, 311, 311, 311, 0, 322, 330, 312, 312, - 312, 326, 0, 317, 0, 0, 321, 0, 326, 316, - 316, 316, 0, 317, 317, 317, 321, 321, 321, 0, - 322, 322, 322, 325, 325, 325, 325, 0, 330, 330, - 330, 0, 326, 326, 326, 377, 377, 377, 377, 377, - 378, 378, 378, 379, 379, 379, 379, 379, 385, 0, - 385, 385, 376, 376, 376, 376, 376, 376, 376, 376, - - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, - 376, 376, 376, 376, 376, 376, 376 + 1, 1, 1, 5, 8, 5, 9, 9, 9, 9, + 11, 13, 449, 13, 13, 13, 13, 14, 14, 14, + + 14, 15, 15, 66, 15, 15, 15, 15, 17, 17, + 13, 18, 18, 18, 48, 13, 48, 15, 16, 16, + 9, 16, 16, 16, 16, 51, 61, 448, 81, 8, + 66, 67, 11, 22, 16, 15, 81, 20, 13, 20, + 447, 131, 13, 22, 27, 15, 20, 20, 20, 446, + 9, 9, 9, 445, 20, 20, 23, 20, 21, 67, + 21, 132, 16, 15, 22, 21, 82, 23, 61, 131, + 51, 22, 21, 25, 27, 27, 27, 82, 28, 444, + 24, 26, 443, 23, 24, 25, 188, 21, 132, 442, + 28, 229, 21, 441, 22, 22, 22, 23, 23, 23, + + 25, 24, 21, 21, 21, 28, 26, 29, 24, 26, + 54, 440, 24, 439, 188, 25, 25, 25, 229, 273, + 28, 28, 28, 438, 29, 437, 31, 31, 31, 31, + 256, 24, 24, 24, 289, 29, 26, 26, 26, 30, + 54, 54, 54, 33, 436, 33, 273, 30, 33, 33, + 33, 33, 31, 30, 29, 29, 29, 435, 256, 30, + 31, 434, 289, 433, 30, 432, 32, 30, 64, 64, + 64, 64, 32, 35, 33, 30, 36, 32, 35, 31, + 431, 56, 33, 430, 429, 35, 30, 428, 427, 43, + 31, 31, 31, 32, 30, 30, 30, 36, 35, 32, + + 35, 33, 426, 425, 36, 35, 37, 32, 32, 32, + 38, 43, 33, 33, 33, 35, 35, 35, 424, 43, + 43, 43, 38, 69, 69, 69, 69, 36, 36, 36, + 39, 37, 423, 422, 37, 421, 420, 38, 39, 419, + 40, 418, 417, 56, 416, 415, 414, 56, 40, 56, + 39, 413, 38, 38, 38, 39, 412, 411, 39, 40, + 410, 37, 37, 37, 41, 409, 39, 40, 408, 407, + 41, 39, 406, 42, 85, 41, 405, 39, 40, 40, + 40, 42, 88, 404, 403, 39, 39, 39, 85, 402, + 401, 41, 53, 400, 399, 53, 398, 41, 397, 396, + + 42, 395, 53, 53, 88, 41, 41, 41, 394, 393, + 88, 42, 42, 42, 55, 55, 55, 55, 85, 85, + 85, 63, 392, 105, 63, 65, 391, 65, 65, 65, + 65, 63, 63, 390, 88, 88, 88, 53, 388, 387, + 65, 53, 386, 385, 384, 53, 378, 364, 55, 363, + 354, 344, 53, 105, 105, 105, 53, 333, 53, 53, + 68, 68, 68, 68, 259, 239, 63, 236, 65, 233, + 63, 89, 87, 68, 63, 231, 204, 202, 55, 55, + 55, 63, 201, 199, 196, 63, 86, 63, 63, 70, + 70, 70, 70, 71, 71, 87, 71, 71, 71, 71, + + 87, 68, 70, 89, 90, 72, 86, 72, 86, 71, + 72, 72, 72, 72, 86, 195, 91, 90, 194, 94, + 186, 184, 148, 90, 92, 87, 87, 87, 91, 93, + 70, 92, 90, 89, 89, 89, 93, 71, 86, 86, + 86, 94, 147, 91, 90, 146, 145, 94, 144, 143, + 95, 92, 142, 90, 90, 90, 93, 141, 91, 91, + 91, 92, 92, 92, 95, 96, 93, 93, 93, 97, + 140, 94, 94, 94, 139, 129, 128, 95, 98, 96, + 126, 100, 109, 109, 109, 109, 99, 125, 99, 97, + 101, 114, 96, 100, 95, 95, 95, 97, 98, 84, + + 103, 99, 83, 80, 101, 79, 98, 78, 100, 96, + 96, 96, 77, 99, 103, 99, 59, 101, 58, 97, + 97, 97, 57, 100, 100, 100, 49, 103, 98, 98, + 98, 99, 99, 99, 101, 101, 101, 102, 104, 104, + 104, 104, 106, 102, 103, 103, 103, 106, 47, 102, + 108, 46, 45, 44, 107, 106, 34, 19, 108, 110, + 110, 110, 110, 111, 111, 111, 111, 111, 136, 136, + 136, 136, 104, 10, 106, 7, 6, 108, 107, 102, + 102, 102, 107, 115, 3, 106, 106, 106, 108, 108, + 108, 117, 0, 110, 0, 112, 115, 111, 116, 0, + + 112, 0, 104, 104, 104, 117, 113, 0, 107, 107, + 107, 113, 0, 115, 115, 115, 0, 0, 117, 0, + 116, 0, 112, 110, 110, 110, 116, 111, 111, 111, + 112, 112, 112, 113, 118, 117, 117, 117, 119, 0, + 120, 113, 113, 113, 119, 122, 116, 0, 120, 118, + 116, 116, 116, 124, 121, 118, 122, 153, 0, 121, + 0, 0, 120, 0, 118, 118, 118, 120, 119, 119, + 119, 137, 137, 137, 137, 122, 122, 122, 120, 120, + 120, 121, 149, 124, 124, 124, 150, 0, 0, 121, + 121, 121, 133, 151, 133, 0, 0, 133, 133, 133, + + 133, 134, 153, 154, 134, 134, 134, 134, 135, 135, + 135, 135, 149, 149, 149, 152, 150, 150, 150, 0, + 154, 135, 0, 151, 151, 151, 155, 0, 0, 0, + 155, 154, 153, 153, 153, 157, 152, 0, 156, 0, + 0, 0, 158, 152, 156, 0, 159, 0, 158, 135, + 154, 154, 154, 159, 155, 0, 0, 0, 157, 0, + 155, 155, 155, 157, 160, 156, 152, 152, 152, 158, + 161, 160, 163, 159, 156, 156, 156, 161, 158, 158, + 158, 165, 162, 159, 159, 159, 166, 164, 157, 157, + 157, 160, 0, 163, 0, 0, 168, 161, 167, 162, + + 163, 160, 160, 160, 164, 0, 0, 161, 161, 161, + 162, 165, 165, 165, 0, 164, 166, 166, 166, 167, + 170, 0, 0, 163, 163, 163, 168, 168, 168, 162, + 162, 162, 169, 0, 164, 164, 164, 174, 0, 174, + 0, 170, 174, 174, 174, 174, 169, 171, 172, 167, + 167, 167, 0, 171, 0, 0, 0, 172, 175, 169, + 173, 173, 173, 173, 173, 180, 0, 0, 0, 176, + 0, 170, 170, 170, 171, 172, 169, 169, 169, 175, + 0, 0, 0, 171, 171, 171, 175, 172, 172, 172, + 176, 178, 0, 179, 0, 0, 0, 176, 178, 0, + + 179, 181, 190, 190, 190, 190, 180, 0, 181, 175, + 175, 175, 0, 182, 191, 191, 191, 191, 178, 0, + 176, 176, 176, 179, 179, 179, 209, 214, 178, 178, + 178, 181, 181, 181, 182, 206, 180, 180, 180, 183, + 203, 182, 0, 209, 0, 183, 192, 192, 192, 192, + 205, 207, 203, 0, 209, 0, 206, 214, 214, 214, + 0, 0, 205, 206, 182, 182, 182, 203, 208, 183, + 183, 183, 0, 209, 209, 209, 207, 205, 0, 207, + 0, 210, 203, 203, 203, 210, 206, 206, 206, 208, + 211, 0, 205, 205, 205, 0, 208, 215, 0, 0, + + 216, 212, 0, 215, 0, 0, 207, 207, 207, 210, + 226, 211, 0, 213, 217, 210, 210, 210, 211, 208, + 208, 208, 212, 0, 215, 213, 0, 0, 218, 212, + 216, 216, 216, 215, 215, 215, 220, 220, 220, 220, + 213, 211, 211, 211, 217, 217, 217, 221, 221, 221, + 221, 226, 212, 212, 212, 213, 213, 213, 218, 218, + 218, 219, 222, 224, 0, 223, 219, 257, 257, 257, + 257, 237, 222, 0, 0, 223, 274, 274, 274, 274, + 274, 226, 226, 226, 224, 0, 0, 0, 219, 222, + 0, 224, 223, 237, 240, 0, 219, 219, 219, 237, + + 0, 240, 222, 222, 222, 223, 223, 223, 241, 230, + 230, 230, 230, 0, 224, 224, 224, 230, 242, 249, + 0, 240, 0, 237, 237, 237, 243, 0, 245, 241, + 244, 240, 240, 240, 0, 242, 241, 230, 243, 0, + 0, 0, 244, 0, 246, 245, 242, 0, 0, 249, + 249, 249, 247, 243, 246, 0, 245, 244, 0, 241, + 241, 241, 247, 248, 0, 242, 242, 242, 243, 243, + 243, 246, 244, 244, 244, 245, 245, 245, 250, 247, + 248, 251, 0, 0, 246, 246, 246, 260, 0, 251, + 0, 248, 247, 247, 247, 264, 0, 0, 0, 250, + + 0, 262, 0, 0, 260, 261, 250, 0, 251, 261, + 248, 248, 248, 262, 0, 260, 0, 264, 0, 251, + 251, 251, 0, 264, 0, 263, 266, 265, 262, 250, + 250, 250, 266, 261, 260, 260, 260, 263, 267, 261, + 261, 261, 277, 262, 262, 262, 267, 264, 264, 264, + 265, 0, 263, 266, 0, 265, 0, 0, 270, 277, + 268, 276, 266, 266, 266, 267, 268, 263, 263, 263, + 277, 0, 0, 276, 0, 269, 267, 267, 267, 270, + 265, 265, 265, 269, 0, 0, 270, 268, 276, 277, + 277, 277, 278, 279, 0, 0, 268, 268, 268, 280, + + 279, 281, 269, 276, 276, 276, 0, 281, 282, 270, + 270, 270, 283, 269, 269, 269, 280, 284, 0, 284, + 279, 0, 278, 278, 278, 0, 282, 280, 281, 0, + 279, 279, 279, 283, 0, 0, 282, 281, 281, 281, + 283, 285, 291, 285, 286, 284, 280, 280, 280, 284, + 284, 284, 290, 290, 290, 290, 282, 282, 282, 0, + 0, 291, 0, 283, 283, 283, 286, 0, 0, 285, + 291, 0, 286, 285, 285, 285, 292, 293, 294, 0, + 0, 0, 292, 0, 0, 295, 312, 312, 312, 312, + 294, 291, 291, 291, 296, 0, 286, 286, 286, 0, + + 298, 297, 0, 292, 299, 294, 0, 293, 293, 293, + 300, 0, 292, 292, 292, 295, 295, 295, 305, 306, + 294, 294, 294, 297, 296, 296, 296, 300, 308, 297, + 298, 298, 298, 307, 299, 299, 299, 306, 300, 304, + 304, 304, 304, 304, 0, 308, 0, 306, 305, 305, + 305, 309, 307, 297, 297, 297, 308, 300, 300, 300, + 313, 307, 0, 314, 0, 0, 0, 306, 306, 306, + 0, 0, 0, 315, 309, 308, 308, 308, 0, 309, + 0, 326, 307, 307, 307, 316, 324, 324, 324, 324, + 313, 313, 313, 314, 314, 314, 315, 320, 0, 0, + + 0, 315, 326, 0, 309, 309, 309, 331, 0, 326, + 316, 0, 0, 316, 319, 319, 319, 319, 319, 0, + 0, 0, 320, 321, 0, 320, 315, 315, 315, 321, + 325, 0, 326, 326, 326, 330, 325, 331, 331, 331, + 316, 316, 316, 329, 329, 329, 329, 334, 0, 0, + 321, 0, 320, 320, 320, 0, 330, 325, 0, 321, + 321, 321, 0, 330, 0, 0, 325, 325, 325, 0, + 0, 0, 0, 0, 0, 0, 0, 334, 334, 334, + 0, 0, 0, 0, 0, 0, 330, 330, 330, 381, + 381, 381, 381, 381, 382, 382, 382, 383, 383, 383, + + 383, 383, 389, 0, 389, 389, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380, + 380, 380, 380, 380, 380, 380, 380, 380, 380, 380 } ; static const flex_int16_t yy_rule_linenum[60] = @@ -1579,13 +1581,13 @@ YY_DECL while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 377 ) + if ( yy_current_state >= 381 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 376 ); + while ( yy_current_state != 380 ); yy_cp = yyg->yy_last_accepting_cpos; yy_current_state = yyg->yy_last_accepting_state; @@ -2199,7 +2201,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 377 ) + if ( yy_current_state >= 381 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2234,11 +2236,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 377 ) + if ( yy_current_state >= 381 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 376); + yy_is_jam = (yy_current_state == 380); (void)yyg; return yy_is_jam ? 0 : yy_current_state; diff --git a/src/realm/parser/query_flex.ll b/src/realm/parser/query_flex.ll index 45aaeed6252..722abdfe044 100644 --- a/src/realm/parser/query_flex.ll +++ b/src/realm/parser/query_flex.ll @@ -17,7 +17,7 @@ unicode "\\u"{hex}{4} escape "\\"[\"\'/bfnrt0\\] char1 [^\"\\] char2 [^\'\\] -utf8 [\xC2-\xDF][\x80-\xBF]|(\xE0[\xA0-\xBF]|[\xE1-\xEF][\x80-\xBF])[\x80-\xBF] +utf8 [\xC2-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3} letter [a-zA-Z_$] ws "\\"[ nrt] id_char [a-zA-Z_\-$0-9]