From 7a533bf7afe9b17181e52dd0dacc2b75e65dc5bf Mon Sep 17 00:00:00 2001 From: xhh1989 Date: Sat, 28 Apr 2018 13:28:40 +0800 Subject: [PATCH] support parse sql like : DELETE FROM a1, a2 USING t1 AS a1 INNER JOIN t2 AS a2 WHERE a1.id=a2.id; related issue: https://github.com/vitessio/vitess/issues/3787 Signed-off-by: xhh1989 --- go/vt/sqlparser/parse_test.go | 3 + go/vt/sqlparser/sql.go | 3775 +++++++++++++++++---------------- go/vt/sqlparser/sql.y | 4 + 3 files changed, 1899 insertions(+), 1883 deletions(-) diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go index ff3c9a27e24..b52c148e3fc 100644 --- a/go/vt/sqlparser/parse_test.go +++ b/go/vt/sqlparser/parse_test.go @@ -665,6 +665,9 @@ var ( input: "delete a from a join b on a.id = b.id where b.name = 'test'", }, { input: "delete a, b from a, b where a.id = b.id and b.name = 'test'", + }, { + input: "delete from a1, a2 using t1 as a1 inner join t2 as a2 where a1.id=a2.id", + output: "delete a1, a2 from t1 as a1 join t2 as a2 where a1.id = a2.id", }, { input: "set /* simple */ a = 3", }, { diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go index 72485c55817..d6117590bc9 100644 --- a/go/vt/sqlparser/sql.go +++ b/go/vt/sqlparser/sql.go @@ -567,322 +567,302 @@ var yyExca = [...]int{ 5, 27, -2, 4, -1, 227, - 109, 554, - -2, 550, - -1, 228, 109, 555, -2, 551, + -1, 228, + 109, 556, + -2, 552, -1, 296, - 80, 706, - -2, 46, - -1, 297, - 80, 673, + 80, 707, -2, 47, + -1, 297, + 80, 674, + -2, 48, -1, 302, - 80, 658, - -2, 516, + 80, 659, + -2, 517, -1, 304, - 80, 691, - -2, 518, - -1, 686, - 109, 557, - -2, 553, - -1, 880, + 80, 692, + -2, 519, + -1, 562, + 52, 41, + 54, 41, + -2, 43, + -1, 687, + 109, 558, + -2, 554, + -1, 882, 5, 28, - -2, 363, - -1, 905, + -2, 364, + -1, 907, 5, 27, - -2, 492, - -1, 1112, - 5, 28, -2, 493, - -1, 1156, - 5, 27, - -2, 495, - -1, 1209, + -1, 1116, 5, 28, + -2, 494, + -1, 1160, + 5, 27, -2, 496, + -1, 1213, + 5, 28, + -2, 497, } const yyPrivate = 57344 -const yyLast = 9538 +const yyLast = 9530 var yyAct = [...]int{ - 258, 47, 627, 509, 748, 1026, 232, 1200, 257, 1118, - 1050, 825, 822, 766, 1027, 781, 805, 960, 554, 556, - 1023, 206, 780, 819, 777, 924, 53, 908, 749, 872, - 951, 1000, 718, 711, 913, 508, 3, 963, 791, 737, - 688, 721, 442, 448, 295, 558, 200, 454, 47, 398, - 745, 230, 815, 462, 301, 854, 211, 799, 293, 523, - 215, 52, 288, 543, 1187, 475, 474, 484, 485, 477, - 478, 479, 480, 481, 482, 483, 476, 1228, 1218, 486, - 282, 1226, 1207, 205, 1224, 826, 1217, 283, 1018, 1106, - 201, 202, 203, 204, 402, 1056, 1057, 1058, 57, 1206, - 1172, 219, 942, 1061, 1059, 798, 284, 171, 167, 168, - 169, 1130, 1145, 806, 1095, 1093, 199, 434, 435, 1225, - 1223, 1201, 984, 59, 60, 61, 62, 63, 423, 746, - 767, 769, 412, 411, 475, 474, 484, 485, 477, 478, - 479, 480, 481, 482, 483, 476, 405, 164, 486, 165, - 165, 635, 626, 923, 793, 922, 1170, 793, 921, 400, - 408, 179, 1192, 166, 793, 1065, 477, 478, 479, 480, - 481, 482, 483, 476, 1115, 228, 486, 498, 499, 873, - 778, 486, 399, 987, 429, 429, 429, 429, 888, 429, - 429, 425, 936, 427, 866, 981, 429, 660, 466, 418, - 657, 983, 476, 170, 768, 486, 76, 1188, 461, 695, - 176, 1075, 47, 176, 911, 1066, 1020, 424, 426, 459, - 569, 738, 234, 693, 694, 692, 738, 495, 895, 1001, - 497, 630, 806, 940, 404, 461, 450, 176, 176, 76, - 1195, 456, 1136, 176, 428, 76, 792, 451, 163, 792, - 1060, 790, 788, 1171, 1169, 789, 792, 507, 1003, 511, - 512, 513, 514, 515, 516, 517, 518, 519, 1135, 522, + 258, 47, 628, 827, 749, 509, 232, 1204, 1122, 1029, + 508, 3, 824, 779, 767, 257, 1054, 1030, 556, 963, + 783, 206, 554, 782, 910, 807, 750, 1026, 200, 926, + 712, 874, 301, 1003, 722, 719, 966, 954, 821, 793, + 915, 689, 53, 738, 442, 448, 817, 746, 47, 398, + 295, 284, 454, 558, 543, 230, 211, 462, 205, 856, + 215, 291, 288, 293, 283, 52, 1232, 1222, 1230, 1211, + 1228, 828, 201, 202, 203, 204, 1221, 1021, 1110, 402, + 234, 1176, 945, 423, 282, 1210, 800, 1060, 1061, 1062, + 1134, 808, 1099, 1097, 219, 1065, 1063, 171, 167, 168, + 169, 57, 523, 199, 1149, 434, 435, 1191, 475, 474, + 484, 485, 477, 478, 479, 480, 481, 482, 483, 476, + 1229, 844, 486, 411, 1227, 1205, 59, 60, 61, 62, + 63, 987, 747, 412, 1004, 843, 405, 165, 1174, 768, + 770, 164, 287, 165, 636, 984, 425, 627, 427, 780, + 925, 986, 924, 923, 400, 408, 1196, 795, 179, 166, + 498, 499, 848, 1006, 795, 721, 1119, 990, 890, 868, + 661, 842, 424, 426, 466, 225, 228, 418, 486, 476, + 1079, 1069, 486, 658, 429, 429, 429, 429, 461, 429, + 429, 913, 939, 170, 570, 1008, 429, 1012, 1023, 1007, + 739, 1005, 696, 739, 795, 897, 1010, 76, 460, 459, + 185, 176, 47, 769, 176, 1009, 694, 695, 693, 839, + 836, 837, 451, 835, 808, 461, 631, 495, 1011, 1013, + 497, 1070, 399, 1199, 195, 1175, 1173, 459, 176, 176, + 76, 422, 1064, 985, 176, 983, 76, 846, 849, 794, + 1192, 943, 450, 461, 456, 660, 794, 507, 801, 511, + 512, 513, 514, 515, 516, 517, 518, 519, 1209, 522, 524, 524, 524, 524, 524, 524, 524, 524, 532, 533, - 534, 535, 1205, 712, 287, 713, 422, 50, 842, 555, - 1005, 955, 1009, 982, 1004, 980, 1002, 691, 885, 954, - 943, 1007, 841, 414, 415, 416, 406, 407, 1211, 281, - 1006, 452, 474, 484, 485, 477, 478, 479, 480, 481, - 482, 483, 476, 1008, 1010, 486, 460, 459, 1152, 846, - 525, 526, 527, 528, 529, 530, 531, 1053, 840, 795, - 176, 1133, 176, 461, 796, 952, 460, 459, 176, 460, - 459, 1214, 441, 568, 1052, 176, 1022, 663, 664, 76, - 76, 76, 76, 461, 76, 76, 461, 678, 680, 681, - 937, 76, 679, 484, 485, 477, 478, 479, 480, 481, - 482, 483, 476, 225, 971, 486, 837, 834, 835, 441, - 833, 479, 480, 481, 482, 483, 476, 76, 928, 486, - 1160, 1198, 429, 460, 459, 863, 864, 865, 1160, 441, - 429, 828, 969, 714, 844, 847, 1160, 1161, 1127, 1126, - 461, 429, 429, 429, 429, 429, 429, 429, 429, 431, - 432, 433, 641, 436, 437, 429, 429, 1045, 441, 1176, - 439, 640, 884, 631, 883, 1114, 441, 1175, 720, 839, - 1072, 1071, 496, 1068, 1069, 1068, 1067, 176, 878, 441, - 460, 459, 629, 659, 176, 176, 176, 23, 540, 441, - 76, 838, 665, 644, 642, 76, 970, 461, 689, 723, - 441, 975, 972, 965, 966, 973, 968, 967, 624, 576, - 575, 903, 420, 565, 904, 413, 843, 974, 47, 658, - 399, 21, 23, 977, 256, 1024, 1062, 539, 909, 845, - 990, 287, 511, 667, 50, 460, 459, 682, 910, 910, - 54, 686, 684, 730, 733, 909, 723, 1110, 430, 1155, - 540, 540, 461, 1074, 566, 74, 564, 1070, 890, 23, - 929, 288, 288, 288, 288, 288, 750, 725, 878, 50, - 715, 716, 887, 878, 567, 661, 555, 210, 770, 878, - 540, 909, 212, 50, 288, 1140, 742, 735, 300, 545, - 548, 549, 550, 546, 403, 547, 551, 76, 800, 914, - 915, 889, 773, 176, 176, 76, 50, 176, 820, 1039, - 176, 725, 298, 932, 176, 886, 76, 76, 76, 76, - 76, 76, 76, 76, 816, 771, 807, 808, 809, 50, - 76, 76, 775, 772, 176, 763, 914, 915, 628, 500, - 501, 502, 503, 504, 505, 506, 785, 811, 751, 76, - 429, 754, 429, 176, 810, 65, 823, 1055, 1024, 76, - 429, 956, 801, 802, 803, 804, 625, 821, 752, 753, - 917, 755, 638, 438, 634, 673, 971, 760, 812, 813, - 814, 440, 761, 920, 919, 645, 646, 647, 648, 649, - 650, 651, 652, 817, 818, 762, 758, 549, 550, 653, - 654, 759, 76, 757, 969, 756, 867, 1222, 300, 300, - 300, 300, 690, 300, 300, 216, 217, 1216, 76, 986, - 300, 689, 851, 1221, 861, 855, 860, 455, 856, 947, - 443, 574, 421, 176, 939, 686, 176, 176, 176, 176, - 176, 453, 444, 1197, 1196, 1153, 464, 933, 176, 1108, - 1141, 176, 830, 868, 637, 176, 553, 213, 214, 176, - 176, 455, 859, 76, 207, 1181, 906, 907, 970, 208, - 858, 76, 54, 975, 972, 965, 966, 973, 968, 967, - 1180, 1143, 457, 287, 287, 287, 287, 287, 910, 974, - 1189, 221, 1131, 656, 56, 964, 894, 58, 287, 563, - 51, 905, 1, 827, 959, 836, 287, 1199, 1049, 918, - 787, 545, 548, 549, 550, 546, 930, 547, 551, 300, - 926, 927, 176, 779, 571, 76, 397, 76, 64, 786, - 1168, 176, 1129, 794, 176, 76, 941, 797, 944, 945, - 1054, 1194, 938, 298, 581, 429, 579, 580, 934, 935, - 946, 578, 948, 949, 950, 247, 246, 249, 250, 251, - 252, 583, 953, 582, 248, 253, 577, 187, 294, 552, - 429, 441, 687, 570, 458, 696, 697, 698, 699, 700, - 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, - 66, 979, 976, 978, 829, 832, 831, 494, 857, 962, - 299, 1031, 662, 447, 850, 1179, 1142, 475, 474, 484, - 485, 477, 478, 479, 480, 481, 482, 483, 476, 994, - 993, 486, 893, 520, 736, 1029, 300, 47, 1025, 233, - 750, 677, 245, 1028, 300, 690, 750, 1012, 1011, 1019, - 999, 242, 1041, 1042, 1043, 300, 300, 300, 300, 300, - 300, 300, 300, 1033, 244, 1034, 243, 668, 1035, 300, - 300, 902, 1030, 686, 468, 231, 76, 1048, 223, 286, - 536, 544, 1047, 1046, 542, 541, 76, 291, 669, 916, - 912, 726, 727, 285, 989, 1105, 1186, 734, 464, 1063, - 1064, 300, 672, 25, 55, 218, 19, 18, 17, 445, - 449, 741, 20, 743, 744, 16, 15, 14, 29, 13, - 12, 288, 11, 10, 9, 685, 467, 8, 7, 76, - 76, 6, 76, 5, 4, 209, 22, 2, 0, 1084, - 1076, 717, 0, 0, 0, 0, 0, 1083, 0, 1104, - 0, 731, 731, 1078, 0, 76, 1081, 739, 0, 1091, - 510, 0, 0, 176, 0, 0, 0, 0, 0, 521, - 0, 0, 76, 0, 731, 0, 1109, 0, 0, 0, - 0, 1120, 1121, 1122, 0, 0, 1117, 0, 0, 1088, - 1089, 0, 1090, 930, 1123, 1092, 0, 1094, 1125, 958, - 0, 0, 300, 0, 429, 0, 0, 869, 870, 871, - 300, 0, 76, 76, 1132, 0, 1134, 0, 0, 0, - 0, 1139, 1138, 0, 985, 0, 298, 0, 0, 0, - 0, 0, 0, 0, 782, 76, 1144, 76, 76, 1128, - 0, 1029, 0, 666, 1157, 0, 0, 0, 0, 1028, - 0, 862, 0, 0, 0, 1154, 0, 0, 0, 0, - 0, 0, 176, 0, 300, 0, 300, 1165, 1167, 1166, - 76, 0, 1178, 0, 300, 0, 0, 0, 0, 1156, - 1177, 0, 0, 76, 176, 0, 1029, 1173, 47, 1174, - 76, 1190, 0, 76, 1028, 300, 176, 0, 877, 0, - 722, 724, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 892, 1203, 740, 0, 0, 685, - 0, 0, 0, 1191, 1208, 0, 750, 1102, 441, 0, - 0, 1212, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 287, 0, 76, 765, 76, 76, 76, - 176, 76, 1220, 76, 1219, 0, 1227, 0, 0, 0, - 0, 675, 676, 0, 475, 474, 484, 485, 477, 478, - 479, 480, 481, 482, 483, 476, 0, 0, 486, 76, - 76, 76, 0, 0, 0, 0, 0, 996, 997, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 185, - 1013, 1014, 0, 1016, 1017, 925, 0, 0, 0, 0, - 0, 0, 0, 510, 0, 300, 728, 729, 0, 0, - 76, 76, 0, 195, 0, 0, 0, 0, 0, 446, - 0, 0, 0, 76, 0, 0, 0, 0, 0, 782, - 0, 0, 0, 0, 0, 0, 76, 0, 1137, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 957, 300, - 0, 300, 0, 0, 174, 0, 76, 198, 0, 289, - 0, 776, 0, 180, 0, 0, 1103, 0, 0, 182, - 0, 0, 0, 0, 300, 961, 188, 184, 0, 222, - 0, 174, 174, 0, 0, 0, 0, 174, 76, 0, - 0, 300, 0, 0, 173, 0, 875, 76, 0, 1086, - 876, 0, 186, 0, 0, 190, 0, 880, 881, 882, - 0, 0, 0, 300, 0, 992, 891, 0, 0, 0, - 0, 897, 292, 898, 899, 900, 901, 401, 731, 0, - 0, 1032, 925, 181, 731, 0, 0, 1015, 475, 474, + 534, 535, 841, 1140, 180, 865, 866, 867, 887, 555, + 182, 659, 1215, 414, 415, 416, 794, 188, 184, 50, + 1139, 792, 790, 163, 840, 791, 797, 460, 459, 692, + 496, 798, 958, 957, 452, 477, 478, 479, 480, 481, + 482, 483, 476, 186, 461, 486, 190, 946, 404, 845, + 479, 480, 481, 482, 483, 476, 460, 459, 486, 1156, + 974, 176, 847, 176, 428, 664, 665, 1137, 955, 176, + 460, 459, 563, 461, 181, 1057, 176, 1025, 569, 1056, + 76, 76, 76, 76, 281, 76, 76, 461, 972, 287, + 1218, 441, 76, 525, 526, 527, 528, 529, 530, 531, + 940, 183, 189, 191, 192, 193, 194, 1164, 1202, 197, + 196, 460, 459, 931, 679, 681, 682, 830, 76, 680, + 406, 407, 429, 713, 715, 714, 1164, 441, 461, 642, + 429, 500, 501, 502, 503, 504, 505, 506, 1164, 1165, + 441, 429, 429, 429, 429, 429, 429, 429, 429, 430, + 1131, 1130, 973, 1048, 441, 429, 429, 978, 975, 968, + 969, 976, 971, 970, 886, 641, 885, 1118, 441, 1076, + 1075, 645, 632, 977, 1072, 1073, 1072, 1071, 176, 980, + 880, 441, 460, 459, 630, 176, 176, 176, 540, 441, + 23, 76, 666, 724, 441, 1180, 76, 625, 643, 461, + 577, 576, 21, 420, 566, 690, 247, 246, 249, 250, + 251, 252, 413, 298, 905, 248, 253, 906, 47, 687, + 399, 1179, 1066, 911, 1027, 23, 256, 911, 54, 912, + 724, 539, 511, 668, 993, 1114, 892, 50, 912, 889, + 23, 683, 726, 731, 734, 567, 685, 565, 540, 431, + 432, 433, 1159, 436, 437, 540, 1078, 74, 210, 1074, + 439, 288, 288, 288, 288, 288, 751, 880, 932, 880, + 691, 540, 50, 50, 716, 717, 555, 880, 771, 891, + 911, 774, 888, 565, 568, 288, 726, 50, 1144, 743, + 300, 662, 736, 212, 802, 822, 403, 1042, 76, 935, + 916, 917, 629, 440, 176, 176, 76, 775, 176, 818, + 813, 176, 812, 753, 754, 176, 756, 76, 76, 76, + 76, 76, 76, 76, 76, 752, 764, 65, 755, 825, + 773, 76, 76, 772, 1059, 176, 809, 810, 811, 777, + 50, 287, 287, 287, 287, 287, 1027, 787, 959, 919, + 76, 429, 639, 429, 176, 438, 287, 761, 759, 922, + 76, 429, 762, 760, 688, 287, 674, 697, 698, 699, + 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, + 710, 711, 763, 823, 549, 550, 921, 758, 819, 820, + 545, 548, 549, 550, 546, 757, 547, 551, 727, 728, + 916, 917, 1226, 76, 735, 216, 217, 869, 1220, 989, + 300, 300, 300, 300, 687, 300, 300, 853, 742, 76, + 744, 745, 300, 1225, 863, 862, 950, 575, 857, 690, + 421, 858, 455, 443, 176, 942, 1201, 176, 176, 176, + 176, 176, 1145, 1200, 298, 444, 453, 1157, 464, 176, + 936, 1112, 176, 832, 638, 870, 176, 553, 213, 214, + 455, 176, 176, 861, 207, 76, 626, 908, 909, 1185, + 208, 860, 54, 76, 635, 1184, 1147, 907, 912, 457, + 1193, 1135, 657, 56, 58, 646, 647, 648, 649, 650, + 651, 652, 653, 564, 691, 288, 51, 1, 829, 654, + 655, 896, 974, 484, 485, 477, 478, 479, 480, 481, + 482, 483, 476, 962, 838, 486, 920, 929, 928, 1203, + 930, 300, 1053, 933, 176, 789, 572, 76, 781, 76, + 972, 397, 64, 176, 788, 1172, 176, 76, 1133, 796, + 944, 949, 799, 951, 952, 953, 1058, 429, 1198, 947, + 948, 937, 938, 941, 545, 548, 549, 550, 546, 864, + 547, 551, 582, 580, 803, 804, 805, 806, 581, 579, + 584, 956, 429, 583, 578, 287, 187, 294, 552, 571, + 814, 815, 816, 965, 458, 66, 982, 981, 834, 494, + 871, 872, 873, 979, 973, 859, 299, 1034, 663, 978, + 975, 968, 969, 976, 971, 970, 879, 447, 1183, 1146, + 895, 520, 737, 233, 678, 977, 686, 245, 242, 244, + 243, 967, 894, 997, 669, 996, 904, 1032, 300, 47, + 1028, 468, 751, 231, 223, 1002, 300, 1014, 751, 1033, + 286, 1015, 1031, 687, 1044, 1045, 1046, 300, 300, 300, + 300, 300, 300, 300, 300, 536, 544, 1022, 1038, 1036, + 542, 300, 300, 541, 918, 914, 285, 992, 76, 1109, + 1190, 176, 673, 1037, 1050, 1052, 1051, 25, 55, 76, + 670, 1067, 1068, 218, 19, 18, 17, 20, 16, 15, + 464, 1049, 14, 300, 29, 831, 221, 833, 13, 12, + 11, 10, 9, 8, 7, 852, 6, 5, 4, 209, + 22, 2, 0, 0, 288, 1080, 0, 0, 298, 0, + 0, 0, 76, 76, 0, 76, 784, 0, 1082, 0, + 0, 1085, 0, 718, 0, 0, 1088, 1087, 0, 0, + 0, 0, 1108, 732, 732, 0, 0, 0, 76, 740, + 0, 0, 0, 0, 0, 667, 176, 0, 0, 0, + 0, 0, 0, 0, 0, 76, 732, 1095, 0, 0, + 0, 999, 1000, 1124, 1125, 1126, 1113, 0, 0, 1121, + 0, 0, 0, 0, 1016, 1017, 1127, 1019, 1020, 0, + 0, 1129, 933, 0, 287, 300, 0, 0, 429, 0, + 0, 0, 0, 300, 0, 76, 76, 0, 0, 0, + 0, 686, 723, 725, 0, 0, 0, 1136, 1142, 1138, + 1143, 0, 0, 0, 0, 0, 0, 0, 741, 76, + 0, 76, 76, 0, 0, 1032, 0, 0, 1161, 1148, + 0, 0, 0, 0, 0, 0, 0, 0, 1160, 0, + 1031, 0, 1158, 0, 0, 0, 176, 300, 766, 300, + 0, 0, 1169, 1170, 76, 0, 1182, 300, 1171, 0, + 1177, 0, 1178, 1181, 0, 0, 0, 76, 176, 0, + 1032, 0, 47, 0, 76, 0, 0, 76, 300, 1194, + 176, 961, 1195, 0, 1090, 1031, 0, 0, 0, 0, + 0, 0, 0, 0, 445, 449, 0, 0, 0, 0, + 0, 1207, 0, 0, 0, 0, 988, 0, 1212, 0, + 751, 467, 0, 0, 0, 1216, 0, 0, 0, 0, + 0, 0, 784, 0, 0, 0, 0, 0, 0, 76, + 1223, 76, 76, 76, 176, 76, 1224, 0, 76, 0, + 1231, 0, 0, 0, 0, 510, 0, 0, 0, 0, + 0, 0, 0, 0, 521, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 76, 76, 76, 0, 964, 0, + 0, 0, 0, 1092, 1093, 0, 1094, 0, 0, 1096, + 0, 1098, 0, 0, 0, 0, 0, 0, 927, 1150, + 1151, 0, 1152, 1153, 1154, 0, 0, 446, 0, 300, + 0, 0, 0, 0, 0, 76, 76, 0, 995, 877, + 0, 0, 0, 878, 0, 0, 0, 0, 76, 0, + 882, 883, 884, 289, 1132, 0, 0, 0, 0, 893, + 1018, 76, 174, 0, 899, 198, 900, 901, 902, 903, + 0, 0, 960, 300, 0, 300, 0, 0, 0, 0, + 0, 76, 0, 0, 0, 0, 0, 222, 173, 174, + 174, 0, 0, 0, 0, 174, 0, 0, 300, 0, + 0, 0, 784, 0, 784, 0, 0, 0, 0, 0, + 0, 0, 0, 76, 0, 300, 292, 0, 0, 0, + 0, 401, 76, 0, 475, 474, 484, 485, 477, 478, + 479, 480, 481, 482, 483, 476, 0, 300, 486, 0, + 0, 0, 0, 0, 0, 0, 0, 1233, 0, 0, + 0, 0, 732, 0, 0, 1035, 927, 0, 732, 0, + 995, 0, 1141, 0, 0, 0, 0, 0, 0, 875, + 0, 0, 0, 0, 0, 0, 676, 677, 0, 300, + 0, 300, 1055, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 174, 0, 174, 0, 0, 0, 0, 0, + 174, 0, 0, 1001, 0, 0, 0, 174, 0, 0, + 0, 0, 0, 0, 1081, 0, 0, 0, 409, 0, + 410, 784, 0, 0, 0, 0, 417, 1083, 510, 0, + 0, 729, 730, 419, 1086, 1106, 441, 300, 0, 0, + 0, 23, 24, 48, 26, 27, 0, 0, 964, 784, + 1047, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 42, 0, 0, 0, 0, 28, 599, 0, 0, 0, + 0, 0, 475, 474, 484, 485, 477, 478, 479, 480, + 481, 482, 483, 476, 37, 0, 486, 778, 50, 1123, + 0, 1123, 1123, 1123, 0, 1128, 0, 0, 300, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 174, + 0, 0, 0, 0, 0, 0, 174, 560, 174, 0, + 1089, 0, 0, 0, 300, 300, 300, 1091, 0, 0, + 0, 0, 0, 0, 0, 538, 0, 0, 1100, 1101, + 1102, 0, 587, 1105, 562, 0, 0, 30, 31, 33, + 32, 35, 0, 0, 0, 0, 1115, 1116, 1117, 0, + 1120, 0, 0, 0, 0, 1162, 1163, 36, 43, 44, + 0, 600, 45, 46, 34, 0, 854, 855, 1055, 449, + 0, 0, 0, 0, 0, 0, 38, 39, 0, 40, + 41, 1123, 613, 614, 615, 616, 617, 618, 619, 0, + 620, 621, 622, 623, 624, 601, 602, 603, 604, 585, + 586, 1197, 0, 588, 0, 589, 590, 591, 592, 593, + 594, 595, 596, 597, 598, 605, 606, 607, 608, 609, + 610, 611, 612, 1155, 0, 174, 174, 0, 0, 174, + 732, 881, 174, 1214, 0, 0, 644, 0, 1166, 1167, + 1168, 0, 1219, 0, 0, 0, 898, 49, 1103, 441, + 0, 633, 634, 0, 0, 637, 174, 0, 640, 0, + 0, 0, 0, 0, 1186, 1187, 1188, 1189, 0, 0, + 0, 0, 0, 0, 0, 174, 0, 0, 0, 0, + 0, 0, 656, 0, 644, 475, 474, 484, 485, 477, + 478, 479, 480, 481, 482, 483, 476, 0, 0, 486, + 0, 675, 0, 0, 1208, 0, 0, 0, 0, 1213, + 0, 0, 0, 0, 0, 0, 0, 1217, 0, 0, + 0, 0, 0, 0, 0, 222, 0, 0, 0, 0, + 222, 222, 0, 0, 733, 733, 222, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1235, 1236, 441, + 222, 222, 222, 222, 0, 174, 1107, 733, 174, 174, + 174, 174, 174, 0, 0, 0, 0, 0, 0, 0, + 765, 0, 0, 174, 0, 0, 0, 560, 0, 0, + 0, 748, 174, 174, 0, 475, 474, 484, 485, 477, + 478, 479, 480, 481, 482, 483, 476, 0, 0, 486, + 0, 0, 0, 0, 1024, 0, 0, 0, 0, 776, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1039, + 1040, 0, 0, 1041, 1104, 0, 1043, 0, 475, 474, 484, 485, 477, 478, 479, 480, 481, 482, 483, 476, - 852, 853, 486, 449, 300, 0, 300, 1051, 0, 0, - 183, 189, 191, 192, 193, 194, 0, 0, 197, 196, - 0, 0, 0, 0, 0, 0, 0, 0, 782, 0, - 782, 0, 0, 0, 174, 0, 174, 0, 0, 1077, - 0, 0, 174, 0, 0, 0, 0, 0, 0, 174, - 0, 1100, 1079, 1146, 1147, 0, 1148, 1149, 1150, 1082, - 1099, 441, 300, 0, 0, 879, 0, 0, 0, 0, - 0, 0, 0, 0, 409, 0, 410, 0, 0, 0, - 896, 0, 417, 0, 0, 0, 992, 0, 0, 419, - 0, 0, 0, 0, 0, 0, 0, 475, 474, 484, - 485, 477, 478, 479, 480, 481, 482, 483, 476, 998, - 0, 486, 0, 0, 1119, 0, 1119, 1119, 1119, 0, - 1124, 0, 300, 475, 474, 484, 485, 477, 478, 479, - 480, 481, 482, 483, 476, 0, 0, 486, 0, 0, - 0, 995, 0, 0, 0, 0, 782, 0, 300, 300, - 300, 174, 0, 0, 0, 0, 1044, 0, 174, 560, - 174, 475, 474, 484, 485, 477, 478, 479, 480, 481, - 482, 483, 476, 961, 782, 486, 0, 0, 0, 0, - 0, 1229, 0, 874, 0, 0, 0, 0, 0, 1158, - 1159, 538, 0, 0, 0, 0, 0, 0, 0, 0, - 562, 0, 1051, 475, 474, 484, 485, 477, 478, 479, - 480, 481, 482, 483, 476, 1119, 0, 486, 0, 0, - 0, 0, 0, 0, 0, 1085, 0, 0, 0, 0, - 0, 0, 1087, 0, 0, 1193, 0, 1021, 0, 0, - 0, 0, 0, 1096, 1097, 1098, 0, 0, 1101, 0, - 0, 0, 1036, 1037, 0, 0, 1038, 0, 0, 1040, - 0, 1111, 1112, 1113, 731, 1116, 0, 1210, 0, 0, - 0, 0, 0, 0, 0, 0, 1215, 174, 174, 0, - 0, 174, 0, 0, 174, 0, 0, 0, 643, 475, - 474, 484, 485, 477, 478, 479, 480, 481, 482, 483, - 476, 0, 0, 486, 0, 0, 0, 0, 174, 0, - 0, 0, 0, 0, 0, 0, 0, 632, 633, 0, - 0, 636, 0, 0, 639, 0, 0, 174, 0, 0, - 0, 0, 0, 0, 0, 0, 643, 1151, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 655, 0, - 0, 0, 1162, 1163, 1164, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1107, 0, 0, 674, 0, 0, - 0, 510, 0, 0, 0, 0, 0, 222, 1182, 1183, - 1184, 1185, 222, 222, 0, 0, 732, 732, 222, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 222, 222, 222, 222, 0, 174, 0, 732, - 174, 174, 174, 174, 174, 0, 0, 0, 1204, 0, - 0, 0, 764, 1209, 0, 174, 0, 0, 0, 560, - 0, 1213, 0, 174, 174, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 747, 0, 0, + 0, 0, 486, 0, 0, 174, 0, 121, 0, 0, + 0, 0, 0, 0, 174, 0, 92, 174, 0, 0, + 0, 104, 0, 106, 0, 0, 134, 114, 0, 0, + 0, 826, 0, 0, 0, 0, 0, 0, 0, 644, + 850, 0, 0, 851, 0, 75, 0, 0, 0, 0, + 0, 222, 0, 0, 86, 0, 475, 474, 484, 485, + 477, 478, 479, 480, 481, 482, 483, 476, 0, 0, + 486, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 475, 474, 484, 485, 477, 478, 479, 480, 481, 482, + 483, 476, 1111, 0, 486, 0, 0, 0, 222, 510, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1231, 1232, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 774, 0, 0, 0, 0, 0, + 177, 0, 0, 0, 222, 126, 0, 0, 137, 97, + 96, 0, 0, 0, 88, 0, 131, 122, 149, 0, + 123, 130, 107, 141, 127, 148, 178, 155, 139, 154, + 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, + 102, 79, 174, 129, 91, 95, 90, 120, 142, 143, + 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, + 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, + 108, 125, 99, 116, 115, 117, 998, 0, 0, 135, + 150, 162, 0, 0, 156, 157, 158, 159, 118, 85, + 100, 133, 0, 0, 0, 0, 475, 474, 484, 485, + 477, 478, 479, 480, 481, 482, 483, 476, 0, 77, + 486, 105, 160, 128, 94, 151, 474, 484, 485, 477, + 478, 479, 480, 481, 482, 483, 476, 174, 0, 486, + 0, 0, 0, 0, 0, 0, 0, 222, 0, 0, + 0, 1206, 510, 0, 0, 0, 0, 0, 222, 0, + 0, 0, 0, 991, 0, 0, 0, 0, 644, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 121, 0, 0, 0, 0, 0, 174, 0, 0, 92, - 0, 0, 0, 0, 104, 174, 106, 0, 174, 134, - 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1202, 510, 0, 0, 0, 0, 75, 0, - 643, 0, 0, 0, 0, 0, 824, 86, 0, 0, - 0, 0, 222, 0, 0, 848, 0, 0, 849, 0, + 0, 0, 470, 733, 473, 0, 0, 0, 0, 733, + 487, 488, 489, 490, 491, 492, 493, 876, 471, 472, + 469, 475, 474, 484, 485, 477, 478, 479, 480, 481, + 482, 483, 476, 0, 0, 486, 0, 475, 474, 484, + 485, 477, 478, 479, 480, 481, 482, 483, 476, 0, + 0, 486, 0, 0, 0, 0, 0, 174, 475, 474, + 484, 485, 477, 478, 479, 480, 481, 482, 483, 476, + 0, 0, 486, 0, 0, 0, 0, 0, 0, 174, + 0, 0, 0, 1077, 0, 0, 0, 0, 0, 0, + 0, 174, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1084, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 475, 474, 484, 485, 477, 478, 479, - 480, 481, 482, 483, 476, 0, 0, 486, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, - 0, 0, 0, 177, 0, 0, 0, 0, 126, 0, - 0, 137, 97, 96, 0, 222, 0, 88, 0, 131, - 122, 149, 0, 123, 130, 107, 141, 127, 148, 178, - 155, 139, 154, 78, 138, 147, 87, 132, 80, 145, - 136, 112, 101, 102, 79, 0, 129, 91, 95, 90, - 120, 142, 143, 89, 161, 83, 153, 82, 84, 152, - 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, - 93, 98, 124, 108, 125, 99, 116, 115, 117, 0, - 0, 0, 135, 150, 162, 0, 0, 156, 157, 158, - 159, 118, 85, 100, 133, 0, 0, 0, 0, 0, - 0, 23, 24, 48, 26, 27, 0, 0, 0, 0, - 0, 0, 77, 0, 105, 160, 128, 94, 151, 0, - 42, 0, 0, 0, 0, 28, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 174, 0, 0, - 0, 0, 0, 0, 37, 0, 0, 222, 50, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 222, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 643, 0, - 0, 0, 0, 0, 0, 0, 0, 988, 0, 0, - 0, 0, 0, 732, 0, 0, 0, 0, 0, 732, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 30, 31, 33, - 32, 35, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 36, 43, 44, - 0, 0, 45, 46, 34, 0, 174, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 38, 39, 0, 40, - 41, 0, 0, 0, 0, 0, 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 174, 0, 0, 0, 0, 0, 1073, 0, 0, 0, - 0, 0, 0, 470, 0, 473, 0, 0, 0, 0, - 0, 487, 488, 489, 490, 491, 492, 493, 1080, 471, - 472, 469, 475, 474, 484, 485, 477, 478, 479, 480, - 481, 482, 483, 476, 0, 0, 486, 49, 0, 0, - 0, 0, 0, 0, 560, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 560, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 386, 376, 0, 348, - 388, 326, 340, 396, 341, 342, 369, 312, 356, 121, - 338, 0, 329, 307, 335, 308, 327, 350, 92, 353, - 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, - 0, 0, 352, 380, 354, 374, 347, 370, 317, 363, - 389, 339, 367, 390, 0, 0, 0, 75, 0, 783, - 784, 0, 0, 0, 0, 0, 86, 0, 366, 385, - 337, 368, 306, 365, 0, 310, 313, 395, 383, 332, - 333, 931, 0, 0, 0, 0, 0, 0, 351, 355, - 371, 345, 0, 0, 0, 0, 0, 0, 0, 0, - 330, 0, 362, 0, 0, 0, 314, 311, 0, 349, - 0, 0, 0, 316, 0, 331, 372, 0, 305, 375, - 381, 346, 177, 384, 344, 343, 387, 126, 0, 732, - 137, 97, 96, 379, 328, 336, 88, 334, 131, 122, - 149, 361, 123, 130, 107, 141, 127, 148, 178, 155, - 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, - 112, 101, 102, 79, 0, 129, 91, 95, 90, 120, - 142, 143, 89, 161, 83, 153, 82, 84, 152, 119, - 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, - 98, 124, 108, 125, 99, 116, 115, 117, 0, 309, - 0, 135, 150, 162, 324, 382, 156, 157, 158, 159, - 118, 85, 100, 133, 320, 323, 318, 319, 357, 358, - 391, 392, 393, 373, 315, 0, 321, 322, 0, 377, - 360, 77, 0, 105, 160, 128, 94, 151, 386, 376, + 0, 0, 0, 0, 0, 0, 0, 0, 386, 376, 0, 348, 388, 326, 340, 396, 341, 342, 369, 312, 356, 121, 338, 0, 329, 307, 335, 308, 327, 350, 92, 353, 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, 0, 0, 352, 380, 354, 374, 347, 370, 317, 363, 389, 339, 367, 390, 0, 0, 0, 75, - 0, 783, 784, 0, 0, 0, 0, 0, 86, 0, + 0, 785, 786, 0, 0, 0, 0, 0, 86, 0, 366, 385, 337, 368, 306, 365, 0, 310, 313, 395, - 383, 332, 333, 0, 0, 0, 0, 0, 0, 0, + 383, 332, 333, 934, 0, 0, 0, 0, 0, 0, 351, 355, 371, 345, 0, 0, 0, 0, 0, 0, 0, 0, 330, 0, 362, 0, 0, 0, 314, 311, 0, 349, 0, 0, 0, 316, 0, 331, 372, 0, 305, 375, 381, 346, 177, 384, 344, 343, 387, 126, - 0, 0, 137, 97, 96, 379, 328, 336, 88, 334, + 0, 733, 137, 97, 96, 379, 328, 336, 88, 334, 131, 122, 149, 361, 123, 130, 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, 0, 129, 91, 95, @@ -897,8 +877,8 @@ var yyAct = [...]int{ 369, 312, 356, 121, 338, 0, 329, 307, 335, 308, 327, 350, 92, 353, 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, 0, 0, 352, 380, 354, 374, - 347, 370, 317, 363, 389, 339, 367, 390, 50, 0, - 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, + 347, 370, 317, 363, 389, 339, 367, 390, 0, 0, + 0, 75, 0, 785, 786, 0, 0, 0, 0, 0, 86, 0, 366, 385, 337, 368, 306, 365, 0, 310, 313, 395, 383, 332, 333, 0, 0, 0, 0, 0, 0, 0, 351, 355, 371, 345, 0, 0, 0, 0, @@ -921,11 +901,11 @@ var yyAct = [...]int{ 335, 308, 327, 350, 92, 353, 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, 0, 0, 352, 380, 354, 374, 347, 370, 317, 363, 389, 339, 367, 390, - 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, + 50, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 366, 385, 337, 368, 306, 365, 0, 310, 313, 395, 383, 332, 333, 0, 0, 0, 0, 0, 0, 0, 351, 355, 371, 345, 0, 0, - 0, 0, 0, 0, 991, 0, 330, 0, 362, 0, + 0, 0, 0, 0, 0, 0, 330, 0, 362, 0, 0, 0, 314, 311, 0, 349, 0, 0, 0, 316, 0, 331, 372, 0, 305, 375, 381, 346, 177, 384, 344, 343, 387, 126, 0, 0, 137, 97, 96, 379, @@ -944,11 +924,11 @@ var yyAct = [...]int{ 329, 307, 335, 308, 327, 350, 92, 353, 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, 0, 0, 352, 380, 354, 374, 347, 370, 317, 363, 389, 339, - 367, 390, 0, 0, 0, 227, 0, 0, 0, 0, + 367, 390, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 366, 385, 337, 368, 306, 365, 0, 310, 313, 395, 383, 332, 333, 0, 0, 0, 0, 0, 0, 0, 351, 355, 371, 345, - 0, 0, 0, 0, 0, 0, 683, 0, 330, 0, + 0, 0, 0, 0, 0, 0, 994, 0, 330, 0, 362, 0, 0, 0, 314, 311, 0, 349, 0, 0, 0, 316, 0, 331, 372, 0, 305, 375, 381, 346, 177, 384, 344, 343, 387, 126, 0, 0, 137, 97, @@ -967,11 +947,11 @@ var yyAct = [...]int{ 338, 0, 329, 307, 335, 308, 327, 350, 92, 353, 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, 0, 0, 352, 380, 354, 374, 347, 370, 317, 363, - 389, 339, 367, 390, 0, 0, 0, 75, 0, 0, + 389, 339, 367, 390, 0, 0, 0, 227, 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 366, 385, 337, 368, 306, 365, 0, 310, 313, 395, 383, 332, 333, 0, 0, 0, 0, 0, 0, 0, 351, 355, - 371, 345, 0, 0, 0, 0, 0, 0, 0, 0, + 371, 345, 0, 0, 0, 0, 0, 0, 684, 0, 330, 0, 362, 0, 0, 0, 314, 311, 0, 349, 0, 0, 0, 316, 0, 331, 372, 0, 305, 375, 381, 346, 177, 384, 344, 343, 387, 126, 0, 0, @@ -990,7 +970,7 @@ var yyAct = [...]int{ 356, 121, 338, 0, 329, 307, 335, 308, 327, 350, 92, 353, 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, 0, 0, 352, 380, 354, 374, 347, 370, - 317, 363, 389, 339, 367, 390, 0, 0, 0, 227, + 317, 363, 389, 339, 367, 390, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 366, 385, 337, 368, 306, 365, 0, 310, 313, 395, 383, 332, 333, 0, 0, 0, 0, 0, 0, 0, @@ -1014,7 +994,7 @@ var yyAct = [...]int{ 327, 350, 92, 353, 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, 0, 0, 352, 380, 354, 374, 347, 370, 317, 363, 389, 339, 367, 390, 0, 0, - 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 227, 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 366, 385, 337, 368, 306, 365, 0, 310, 313, 395, 383, 332, 333, 0, 0, 0, 0, 0, 0, 0, 351, 355, 371, 345, 0, 0, 0, 0, @@ -1026,10 +1006,10 @@ var yyAct = [...]int{ 127, 148, 178, 155, 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, 0, 129, 91, 95, 90, 120, 142, 143, 89, 161, 83, 153, - 82, 303, 152, 119, 140, 146, 113, 110, 81, 144, + 82, 84, 152, 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, 99, 116, 115, 117, 0, 309, 0, 135, 150, 162, 324, 382, - 156, 157, 158, 159, 304, 302, 100, 133, 320, 323, + 156, 157, 158, 159, 118, 85, 100, 133, 320, 323, 318, 319, 357, 358, 391, 392, 393, 373, 315, 0, 321, 322, 0, 377, 360, 77, 0, 105, 160, 128, 94, 151, 386, 376, 0, 348, 388, 326, 340, 396, @@ -1037,7 +1017,7 @@ var yyAct = [...]int{ 335, 308, 327, 350, 92, 353, 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, 0, 0, 352, 380, 354, 374, 347, 370, 317, 363, 389, 339, 367, 390, - 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 366, 385, 337, 368, 306, 365, 0, 310, 313, 395, 383, 332, 333, 0, 0, 0, 0, 0, 0, 0, 351, 355, 371, 345, 0, 0, @@ -1049,10 +1029,10 @@ var yyAct = [...]int{ 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, 0, 129, 91, 95, 90, 120, 142, 143, 89, 161, - 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, + 83, 153, 82, 303, 152, 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, 99, 116, 115, 117, 0, 309, 0, 135, 150, 162, - 324, 382, 156, 157, 158, 159, 118, 85, 100, 133, + 324, 382, 156, 157, 158, 159, 304, 302, 100, 133, 320, 323, 318, 319, 357, 358, 391, 392, 393, 373, 315, 0, 321, 322, 0, 377, 360, 77, 0, 105, 160, 128, 94, 151, 386, 376, 0, 348, 388, 326, @@ -1060,7 +1040,7 @@ var yyAct = [...]int{ 329, 307, 335, 308, 327, 350, 92, 353, 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, 0, 0, 352, 380, 354, 374, 347, 370, 317, 363, 389, 339, - 367, 390, 0, 0, 0, 75, 0, 0, 0, 0, + 367, 390, 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 366, 385, 337, 368, 306, 365, 0, 310, 313, 395, 383, 332, 333, 0, 0, 0, 0, 0, 0, 0, 351, 355, 371, 345, @@ -1072,79 +1052,80 @@ var yyAct = [...]int{ 123, 130, 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, 0, 129, 91, 95, 90, 120, 142, 143, - 89, 161, 83, 153, 82, 303, 152, 119, 140, 146, + 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, 99, 116, 115, 117, 0, 309, 0, 135, - 150, 162, 324, 382, 156, 157, 158, 159, 304, 302, - 297, 296, 320, 323, 318, 319, 357, 358, 391, 392, + 150, 162, 324, 382, 156, 157, 158, 159, 118, 85, + 100, 133, 320, 323, 318, 319, 357, 358, 391, 392, 393, 373, 315, 0, 321, 322, 0, 377, 360, 77, - 0, 105, 160, 128, 94, 151, 121, 0, 0, 719, - 0, 229, 0, 0, 0, 92, 0, 226, 0, 0, - 104, 268, 106, 0, 0, 134, 114, 0, 0, 0, - 0, 259, 260, 0, 0, 0, 0, 0, 0, 0, - 0, 50, 0, 0, 227, 247, 246, 249, 250, 251, - 252, 0, 0, 86, 248, 253, 254, 255, 0, 0, - 224, 240, 0, 267, 0, 0, 0, 0, 0, 0, + 0, 105, 160, 128, 94, 151, 386, 376, 0, 348, + 388, 326, 340, 396, 341, 342, 369, 312, 356, 121, + 338, 0, 329, 307, 335, 308, 327, 350, 92, 353, + 325, 378, 359, 104, 394, 106, 364, 0, 134, 114, + 0, 0, 352, 380, 354, 374, 347, 370, 317, 363, + 389, 339, 367, 390, 0, 0, 0, 75, 0, 0, + 0, 0, 0, 0, 0, 0, 86, 0, 366, 385, + 337, 368, 306, 365, 0, 310, 313, 395, 383, 332, + 333, 0, 0, 0, 0, 0, 0, 0, 351, 355, + 371, 345, 0, 0, 0, 0, 0, 0, 0, 0, + 330, 0, 362, 0, 0, 0, 314, 311, 0, 349, + 0, 0, 0, 316, 0, 331, 372, 0, 305, 375, + 381, 346, 177, 384, 344, 343, 387, 126, 0, 0, + 137, 97, 96, 379, 328, 336, 88, 334, 131, 122, + 149, 361, 123, 130, 107, 141, 127, 148, 178, 155, + 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, + 112, 101, 102, 79, 0, 129, 91, 95, 90, 120, + 142, 143, 89, 161, 83, 153, 82, 303, 152, 119, + 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, + 98, 124, 108, 125, 99, 116, 115, 117, 0, 309, + 0, 135, 150, 162, 324, 382, 156, 157, 158, 159, + 304, 302, 297, 296, 320, 323, 318, 319, 357, 358, + 391, 392, 393, 373, 315, 0, 321, 322, 0, 377, + 360, 77, 0, 105, 160, 128, 94, 151, 121, 0, + 0, 720, 0, 229, 0, 0, 0, 92, 0, 226, + 0, 0, 104, 268, 106, 0, 0, 134, 114, 0, + 0, 0, 0, 259, 260, 0, 0, 0, 0, 0, + 0, 0, 0, 50, 0, 0, 227, 247, 246, 249, + 250, 251, 252, 0, 0, 86, 248, 253, 254, 255, + 0, 0, 224, 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 237, 238, 220, 0, 0, 0, 279, - 0, 239, 0, 0, 235, 236, 241, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 177, - 0, 0, 277, 0, 126, 0, 0, 137, 97, 96, - 0, 0, 0, 88, 0, 131, 122, 149, 0, 123, - 130, 107, 141, 127, 148, 178, 155, 139, 154, 78, - 138, 147, 87, 132, 80, 145, 136, 112, 101, 102, - 79, 0, 129, 91, 95, 90, 120, 142, 143, 89, - 161, 83, 153, 82, 84, 152, 119, 140, 146, 113, - 110, 81, 144, 111, 109, 103, 93, 98, 124, 108, - 125, 99, 116, 115, 117, 0, 0, 0, 135, 150, - 162, 0, 0, 156, 157, 158, 159, 118, 85, 100, - 133, 269, 278, 275, 276, 273, 274, 272, 271, 270, - 280, 261, 262, 263, 264, 266, 0, 265, 77, 0, - 105, 160, 128, 94, 151, 121, 0, 0, 0, 0, - 229, 0, 0, 0, 92, 0, 226, 0, 0, 104, - 268, 106, 0, 0, 134, 114, 0, 0, 0, 0, - 259, 260, 0, 0, 0, 0, 0, 0, 0, 0, - 50, 0, 441, 227, 247, 246, 249, 250, 251, 252, - 0, 0, 86, 248, 253, 254, 255, 0, 0, 224, - 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 237, 238, 220, 0, 0, + 0, 279, 0, 239, 0, 0, 235, 236, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 237, 238, 0, 0, 0, 0, 279, 0, - 239, 0, 0, 235, 236, 241, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 177, 0, - 0, 277, 0, 126, 0, 0, 137, 97, 96, 0, - 0, 0, 88, 0, 131, 122, 149, 0, 123, 130, - 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, - 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, - 0, 129, 91, 95, 90, 120, 142, 143, 89, 161, - 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, - 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, - 99, 116, 115, 117, 0, 0, 0, 135, 150, 162, - 0, 0, 156, 157, 158, 159, 118, 85, 100, 133, - 269, 278, 275, 276, 273, 274, 272, 271, 270, 280, - 261, 262, 263, 264, 266, 0, 265, 77, 0, 105, - 160, 128, 94, 151, 121, 0, 0, 0, 0, 229, - 0, 0, 0, 92, 0, 226, 0, 0, 104, 268, - 106, 0, 0, 134, 114, 0, 0, 0, 0, 259, - 260, 0, 0, 0, 0, 0, 0, 0, 0, 50, - 0, 0, 227, 247, 246, 249, 250, 251, 252, 0, - 0, 86, 248, 253, 254, 255, 0, 0, 224, 240, - 0, 267, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 177, 0, 0, 277, 0, 126, 0, 0, 137, + 97, 96, 0, 0, 0, 88, 0, 131, 122, 149, + 0, 123, 130, 107, 141, 127, 148, 178, 155, 139, + 154, 78, 138, 147, 87, 132, 80, 145, 136, 112, + 101, 102, 79, 0, 129, 91, 95, 90, 120, 142, + 143, 89, 161, 83, 153, 82, 84, 152, 119, 140, + 146, 113, 110, 81, 144, 111, 109, 103, 93, 98, + 124, 108, 125, 99, 116, 115, 117, 0, 0, 0, + 135, 150, 162, 0, 0, 156, 157, 158, 159, 118, + 85, 100, 133, 269, 278, 275, 276, 273, 274, 272, + 271, 270, 280, 261, 262, 263, 264, 266, 0, 265, + 77, 0, 105, 160, 128, 94, 151, 121, 0, 0, + 0, 0, 229, 0, 0, 0, 92, 0, 226, 0, + 0, 104, 268, 106, 0, 0, 134, 114, 0, 0, + 0, 0, 259, 260, 0, 0, 0, 0, 0, 0, + 0, 0, 50, 0, 441, 227, 247, 246, 249, 250, + 251, 252, 0, 0, 86, 248, 253, 254, 255, 0, + 0, 224, 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 237, 238, 220, 0, 0, 0, 279, 0, 239, - 0, 0, 235, 236, 241, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 177, 0, 0, - 277, 0, 126, 0, 0, 137, 97, 96, 0, 0, - 0, 88, 0, 131, 122, 149, 0, 123, 130, 107, - 141, 127, 148, 178, 155, 139, 154, 78, 138, 147, - 87, 132, 80, 145, 136, 112, 101, 102, 79, 0, - 129, 91, 95, 90, 120, 142, 143, 89, 161, 83, - 153, 82, 84, 152, 119, 140, 146, 113, 110, 81, - 144, 111, 109, 103, 93, 98, 124, 108, 125, 99, - 116, 115, 117, 0, 0, 0, 135, 150, 162, 0, - 0, 156, 157, 158, 159, 118, 85, 100, 133, 269, - 278, 275, 276, 273, 274, 272, 271, 270, 280, 261, - 262, 263, 264, 266, 23, 265, 77, 0, 105, 160, - 128, 94, 151, 0, 0, 0, 121, 0, 0, 0, + 0, 0, 0, 0, 237, 238, 0, 0, 0, 0, + 279, 0, 239, 0, 0, 235, 236, 241, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 177, 0, 0, 277, 0, 126, 0, 0, 137, 97, + 96, 0, 0, 0, 88, 0, 131, 122, 149, 0, + 123, 130, 107, 141, 127, 148, 178, 155, 139, 154, + 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, + 102, 79, 0, 129, 91, 95, 90, 120, 142, 143, + 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, + 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, + 108, 125, 99, 116, 115, 117, 0, 0, 0, 135, + 150, 162, 0, 0, 156, 157, 158, 159, 118, 85, + 100, 133, 269, 278, 275, 276, 273, 274, 272, 271, + 270, 280, 261, 262, 263, 264, 266, 0, 265, 77, + 0, 105, 160, 128, 94, 151, 121, 0, 0, 0, 0, 229, 0, 0, 0, 92, 0, 226, 0, 0, 104, 268, 106, 0, 0, 134, 114, 0, 0, 0, 0, 259, 260, 0, 0, 0, 0, 0, 0, 0, @@ -1152,7 +1133,7 @@ var yyAct = [...]int{ 252, 0, 0, 86, 248, 253, 254, 255, 0, 0, 224, 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 237, 238, 0, 0, 0, 0, 279, + 0, 0, 0, 237, 238, 220, 0, 0, 0, 279, 0, 239, 0, 0, 235, 236, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 177, 0, 0, 277, 0, 126, 0, 0, 137, 97, 96, @@ -1165,196 +1146,181 @@ var yyAct = [...]int{ 125, 99, 116, 115, 117, 0, 0, 0, 135, 150, 162, 0, 0, 156, 157, 158, 159, 118, 85, 100, 133, 269, 278, 275, 276, 273, 274, 272, 271, 270, - 280, 261, 262, 263, 264, 266, 0, 265, 77, 0, - 105, 160, 128, 94, 151, 121, 0, 0, 0, 0, - 229, 0, 0, 0, 92, 0, 226, 0, 0, 104, - 268, 106, 0, 0, 134, 114, 0, 0, 0, 0, - 259, 260, 0, 0, 0, 0, 0, 0, 0, 0, - 50, 0, 0, 227, 247, 246, 249, 250, 251, 252, - 0, 0, 86, 248, 253, 254, 255, 0, 0, 224, - 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, + 280, 261, 262, 263, 264, 266, 23, 265, 77, 0, + 105, 160, 128, 94, 151, 0, 0, 0, 121, 0, + 0, 0, 0, 229, 0, 0, 0, 92, 0, 226, + 0, 0, 104, 268, 106, 0, 0, 134, 114, 0, + 0, 0, 0, 259, 260, 0, 0, 0, 0, 0, + 0, 0, 0, 50, 0, 0, 227, 247, 246, 249, + 250, 251, 252, 0, 0, 86, 248, 253, 254, 255, + 0, 0, 224, 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 237, 238, 0, 0, 0, 0, 279, 0, - 239, 0, 0, 235, 236, 241, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 177, 0, - 0, 277, 0, 126, 0, 0, 137, 97, 96, 0, - 0, 0, 88, 0, 131, 122, 149, 0, 123, 130, - 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, - 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, - 0, 129, 91, 95, 90, 120, 142, 143, 89, 161, - 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, - 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, - 99, 116, 115, 117, 0, 0, 0, 135, 150, 162, - 0, 0, 156, 157, 158, 159, 118, 85, 100, 133, - 269, 278, 275, 276, 273, 274, 272, 271, 270, 280, - 261, 262, 263, 264, 266, 121, 265, 77, 0, 105, - 160, 128, 94, 151, 92, 0, 0, 0, 0, 104, - 268, 106, 0, 0, 134, 114, 0, 0, 0, 0, - 259, 260, 0, 0, 0, 0, 0, 0, 0, 0, - 50, 0, 0, 227, 247, 246, 249, 250, 251, 252, - 0, 0, 86, 248, 253, 254, 255, 0, 0, 0, - 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 237, 238, 0, 0, 0, + 0, 279, 0, 239, 0, 0, 235, 236, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 237, 238, 0, 0, 0, 0, 279, 0, - 239, 0, 0, 235, 236, 241, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 177, 0, - 0, 277, 0, 126, 0, 0, 137, 97, 96, 0, - 0, 0, 88, 0, 131, 122, 149, 1230, 123, 130, - 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, - 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, - 0, 129, 91, 95, 90, 120, 142, 143, 89, 161, - 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, - 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, - 99, 116, 115, 117, 0, 0, 0, 135, 150, 162, - 0, 0, 156, 157, 158, 159, 118, 85, 100, 133, - 269, 278, 275, 276, 273, 274, 272, 271, 270, 280, - 261, 262, 263, 264, 266, 121, 265, 77, 0, 105, - 160, 128, 94, 151, 92, 0, 0, 0, 0, 104, - 268, 106, 0, 0, 134, 114, 0, 0, 0, 0, - 259, 260, 0, 0, 0, 0, 0, 0, 0, 0, - 50, 0, 0, 227, 247, 246, 249, 250, 251, 252, - 0, 0, 86, 248, 253, 254, 255, 0, 0, 0, - 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, + 0, 177, 0, 0, 277, 0, 126, 0, 0, 137, + 97, 96, 0, 0, 0, 88, 0, 131, 122, 149, + 0, 123, 130, 107, 141, 127, 148, 178, 155, 139, + 154, 78, 138, 147, 87, 132, 80, 145, 136, 112, + 101, 102, 79, 0, 129, 91, 95, 90, 120, 142, + 143, 89, 161, 83, 153, 82, 84, 152, 119, 140, + 146, 113, 110, 81, 144, 111, 109, 103, 93, 98, + 124, 108, 125, 99, 116, 115, 117, 0, 0, 0, + 135, 150, 162, 0, 0, 156, 157, 158, 159, 118, + 85, 100, 133, 269, 278, 275, 276, 273, 274, 272, + 271, 270, 280, 261, 262, 263, 264, 266, 0, 265, + 77, 0, 105, 160, 128, 94, 151, 121, 0, 0, + 0, 0, 229, 0, 0, 0, 92, 0, 226, 0, + 0, 104, 268, 106, 0, 0, 134, 114, 0, 0, + 0, 0, 259, 260, 0, 0, 0, 0, 0, 0, + 0, 0, 50, 0, 0, 227, 247, 246, 249, 250, + 251, 252, 0, 0, 86, 248, 253, 254, 255, 0, + 0, 224, 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 237, 238, 0, 0, 0, 0, 279, 0, - 239, 0, 0, 235, 236, 241, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 177, 0, - 0, 277, 0, 126, 0, 0, 137, 97, 96, 0, - 0, 0, 88, 0, 131, 122, 149, 0, 123, 130, - 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, - 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, - 0, 129, 91, 95, 90, 120, 142, 143, 89, 161, - 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, - 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, - 99, 116, 115, 117, 0, 0, 0, 135, 150, 162, - 0, 0, 156, 157, 158, 159, 118, 85, 100, 133, - 269, 278, 275, 276, 273, 274, 272, 271, 270, 280, - 261, 262, 263, 264, 266, 0, 265, 77, 0, 105, - 160, 128, 94, 151, 121, 0, 0, 0, 463, 0, - 0, 0, 0, 92, 0, 0, 0, 0, 104, 0, - 106, 0, 0, 134, 114, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 237, 238, 0, 0, 0, 0, + 279, 0, 239, 0, 0, 235, 236, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 75, 0, 465, 0, 0, 0, 0, 0, - 0, 86, 0, 0, 0, 0, 460, 459, 0, 0, + 177, 0, 0, 277, 0, 126, 0, 0, 137, 97, + 96, 0, 0, 0, 88, 0, 131, 122, 149, 0, + 123, 130, 107, 141, 127, 148, 178, 155, 139, 154, + 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, + 102, 79, 0, 129, 91, 95, 90, 120, 142, 143, + 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, + 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, + 108, 125, 99, 116, 115, 117, 0, 0, 0, 135, + 150, 162, 0, 0, 156, 157, 158, 159, 118, 85, + 100, 133, 269, 278, 275, 276, 273, 274, 272, 271, + 270, 280, 261, 262, 263, 264, 266, 121, 265, 77, + 0, 105, 160, 128, 94, 151, 92, 0, 0, 0, + 0, 104, 268, 106, 0, 0, 134, 114, 0, 0, + 0, 0, 259, 260, 0, 0, 0, 0, 0, 0, + 0, 0, 50, 0, 0, 227, 247, 246, 249, 250, + 251, 252, 0, 0, 86, 248, 253, 254, 255, 0, + 0, 0, 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 461, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 237, 238, 0, 0, 0, 0, + 279, 0, 239, 0, 0, 235, 236, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 177, 0, 0, 277, 0, 126, 0, 0, 137, 97, + 96, 0, 0, 0, 88, 0, 131, 122, 149, 1234, + 123, 130, 107, 141, 127, 148, 178, 155, 139, 154, + 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, + 102, 79, 0, 129, 91, 95, 90, 120, 142, 143, + 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, + 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, + 108, 125, 99, 116, 115, 117, 0, 0, 0, 135, + 150, 162, 0, 0, 156, 157, 158, 159, 118, 85, + 100, 133, 269, 278, 275, 276, 273, 274, 272, 271, + 270, 280, 261, 262, 263, 264, 266, 121, 265, 77, + 0, 105, 160, 128, 94, 151, 92, 0, 0, 0, + 0, 104, 268, 106, 0, 0, 134, 114, 0, 0, + 0, 0, 259, 260, 0, 0, 0, 0, 0, 0, + 0, 0, 50, 0, 0, 227, 247, 246, 249, 250, + 251, 252, 0, 0, 86, 248, 253, 254, 255, 0, + 0, 0, 240, 0, 267, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 177, 0, 0, - 0, 0, 126, 0, 0, 137, 97, 96, 0, 0, - 0, 88, 0, 131, 122, 149, 0, 123, 130, 107, - 141, 127, 148, 178, 155, 139, 154, 78, 138, 147, - 87, 132, 80, 145, 136, 112, 101, 102, 79, 0, - 129, 91, 95, 90, 120, 142, 143, 89, 161, 83, - 153, 82, 84, 152, 119, 140, 146, 113, 110, 81, - 144, 111, 109, 103, 93, 98, 124, 108, 125, 99, - 116, 115, 117, 0, 0, 0, 135, 150, 162, 0, - 121, 156, 157, 158, 159, 118, 85, 100, 133, 92, - 0, 0, 0, 0, 104, 0, 106, 0, 0, 134, - 114, 0, 0, 0, 0, 0, 77, 0, 105, 160, - 128, 94, 151, 0, 0, 0, 0, 0, 75, 0, - 0, 0, 0, 0, 0, 0, 0, 86, 0, 0, - 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 237, 238, 0, 0, 0, 0, + 279, 0, 239, 0, 0, 235, 236, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 177, 0, 0, 277, 0, 126, 0, 0, 137, 97, + 96, 0, 0, 0, 88, 0, 131, 122, 149, 0, + 123, 130, 107, 141, 127, 148, 178, 155, 139, 154, + 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, + 102, 79, 0, 129, 91, 95, 90, 120, 142, 143, + 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, + 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, + 108, 125, 99, 116, 115, 117, 0, 0, 0, 135, + 150, 162, 0, 0, 156, 157, 158, 159, 118, 85, + 100, 133, 269, 278, 275, 276, 273, 274, 272, 271, + 270, 280, 261, 262, 263, 264, 266, 0, 265, 77, + 0, 105, 160, 128, 94, 151, 121, 0, 0, 0, + 463, 0, 0, 0, 0, 92, 0, 0, 0, 0, + 104, 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 75, 0, 465, 0, 0, 0, + 0, 0, 0, 86, 0, 0, 0, 0, 460, 459, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 461, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 71, 72, 0, 67, 0, 0, 0, 73, 126, 0, - 0, 137, 97, 96, 0, 0, 0, 88, 0, 131, - 122, 149, 0, 123, 130, 107, 141, 127, 148, 69, - 155, 139, 154, 78, 138, 147, 87, 132, 80, 145, - 136, 112, 101, 102, 79, 598, 129, 91, 95, 90, - 120, 142, 143, 89, 161, 83, 153, 82, 84, 152, - 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, - 93, 98, 124, 108, 125, 99, 116, 115, 117, 0, - 0, 0, 135, 150, 162, 0, 0, 156, 157, 158, - 159, 118, 85, 100, 133, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 77, 0, 105, 160, 128, 94, 151, 121, - 0, 586, 0, 559, 0, 0, 0, 0, 92, 0, - 0, 0, 0, 104, 0, 106, 0, 0, 134, 114, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 177, + 0, 0, 0, 0, 126, 0, 0, 137, 97, 96, + 0, 0, 0, 88, 0, 131, 122, 149, 0, 123, + 130, 107, 141, 127, 148, 178, 155, 139, 154, 78, + 138, 147, 87, 132, 80, 145, 136, 112, 101, 102, + 79, 0, 129, 91, 95, 90, 120, 142, 143, 89, + 161, 83, 153, 82, 84, 152, 119, 140, 146, 113, + 110, 81, 144, 111, 109, 103, 93, 98, 124, 108, + 125, 99, 116, 115, 117, 0, 0, 0, 135, 150, + 162, 0, 121, 156, 157, 158, 159, 118, 85, 100, + 133, 92, 0, 0, 0, 0, 104, 0, 106, 0, + 0, 134, 114, 0, 0, 0, 0, 0, 77, 0, + 105, 160, 128, 94, 151, 0, 0, 0, 0, 0, + 75, 0, 0, 0, 0, 0, 0, 0, 0, 86, + 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 599, 0, 0, 0, 0, 0, 0, 175, 0, 561, - 0, 0, 0, 0, 0, 0, 86, 0, 0, 0, - 0, 612, 613, 614, 615, 616, 617, 618, 0, 619, - 620, 621, 622, 623, 600, 601, 602, 603, 584, 585, - 0, 0, 587, 0, 588, 589, 590, 591, 592, 593, - 594, 595, 596, 597, 604, 605, 606, 607, 608, 609, - 610, 611, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 177, 0, 0, 0, 0, 126, 0, 0, - 137, 97, 96, 0, 0, 0, 88, 0, 131, 122, - 149, 0, 123, 130, 107, 141, 127, 148, 178, 155, - 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, - 112, 101, 102, 79, 0, 129, 91, 95, 90, 120, - 142, 143, 89, 161, 83, 153, 82, 84, 152, 119, - 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, - 98, 124, 108, 125, 99, 116, 115, 117, 0, 0, - 0, 135, 150, 162, 0, 0, 156, 157, 158, 159, - 118, 85, 100, 133, 0, 0, 0, 23, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 121, - 0, 77, 0, 105, 160, 128, 94, 151, 92, 0, - 0, 0, 0, 104, 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 50, 0, 0, 75, 0, 0, - 0, 0, 0, 0, 0, 0, 86, 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, 71, 72, 0, 67, 0, 0, 0, 73, + 126, 0, 0, 137, 97, 96, 0, 0, 0, 88, + 0, 131, 122, 149, 0, 123, 130, 107, 141, 127, + 148, 69, 155, 139, 154, 78, 138, 147, 87, 132, + 80, 145, 136, 112, 101, 102, 79, 0, 129, 91, + 95, 90, 120, 142, 143, 89, 161, 83, 153, 82, + 84, 152, 119, 140, 146, 113, 110, 81, 144, 111, + 109, 103, 93, 98, 124, 108, 125, 99, 116, 115, + 117, 0, 0, 0, 135, 150, 162, 0, 0, 156, + 157, 158, 159, 118, 85, 100, 133, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 77, 0, 105, 160, 128, 94, + 151, 121, 0, 0, 0, 559, 0, 0, 0, 0, + 92, 0, 0, 0, 0, 104, 0, 106, 0, 0, + 134, 114, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 175, + 0, 561, 0, 0, 0, 0, 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 177, 0, 0, 0, 0, 126, 0, 0, - 137, 97, 96, 0, 0, 0, 88, 0, 131, 122, - 149, 0, 123, 130, 107, 141, 127, 148, 178, 155, - 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, - 112, 101, 102, 79, 0, 129, 91, 95, 90, 120, - 142, 143, 89, 161, 83, 153, 82, 84, 152, 119, - 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, - 98, 124, 108, 125, 99, 116, 115, 117, 0, 0, - 0, 135, 150, 162, 0, 0, 156, 157, 158, 159, - 118, 85, 100, 133, 0, 0, 0, 23, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 121, - 0, 77, 0, 105, 160, 128, 94, 151, 92, 0, - 0, 0, 0, 104, 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 50, 0, 0, 175, 0, 0, - 0, 0, 0, 0, 0, 0, 86, 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, 177, 0, 0, 0, 0, 126, + 0, 0, 137, 97, 96, 0, 0, 0, 88, 0, + 131, 122, 149, 0, 123, 130, 107, 141, 127, 148, + 178, 155, 139, 154, 78, 138, 147, 87, 132, 80, + 145, 136, 112, 101, 102, 79, 0, 129, 91, 95, + 90, 120, 142, 143, 89, 161, 83, 153, 82, 84, + 152, 119, 140, 146, 113, 110, 81, 144, 111, 109, + 103, 93, 98, 124, 108, 125, 99, 116, 115, 117, + 0, 0, 0, 135, 150, 162, 0, 0, 156, 157, + 158, 159, 118, 85, 100, 133, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 121, 0, 77, 0, 105, 160, 128, 94, 151, + 92, 0, 0, 0, 0, 104, 0, 106, 0, 0, + 134, 114, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 50, 0, 0, 75, + 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 177, 0, 0, 0, 0, 126, 0, 0, - 137, 97, 96, 0, 0, 0, 88, 0, 131, 122, - 149, 0, 123, 130, 107, 141, 127, 148, 178, 155, - 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, - 112, 101, 102, 79, 0, 129, 91, 95, 90, 120, - 142, 143, 89, 161, 83, 153, 82, 84, 152, 119, - 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, - 98, 124, 108, 125, 99, 116, 115, 117, 0, 0, - 0, 135, 150, 162, 0, 121, 156, 157, 158, 159, - 118, 85, 100, 133, 92, 0, 0, 0, 0, 104, - 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, - 0, 77, 0, 105, 160, 128, 94, 151, 0, 0, - 0, 0, 0, 75, 0, 0, 670, 0, 0, 671, - 0, 0, 86, 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, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 177, 0, 0, 0, 0, 126, + 0, 0, 137, 97, 96, 0, 0, 0, 88, 0, + 131, 122, 149, 0, 123, 130, 107, 141, 127, 148, + 178, 155, 139, 154, 78, 138, 147, 87, 132, 80, + 145, 136, 112, 101, 102, 79, 0, 129, 91, 95, + 90, 120, 142, 143, 89, 161, 83, 153, 82, 84, + 152, 119, 140, 146, 113, 110, 81, 144, 111, 109, + 103, 93, 98, 124, 108, 125, 99, 116, 115, 117, + 0, 0, 0, 135, 150, 162, 0, 0, 156, 157, + 158, 159, 118, 85, 100, 133, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 177, 0, - 0, 0, 0, 126, 0, 0, 137, 97, 96, 0, - 0, 0, 88, 0, 131, 122, 149, 0, 123, 130, - 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, - 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, - 0, 129, 91, 95, 90, 120, 142, 143, 89, 161, - 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, - 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, - 99, 116, 115, 117, 0, 0, 0, 135, 150, 162, - 0, 121, 156, 157, 158, 159, 118, 85, 100, 133, - 92, 0, 573, 0, 0, 104, 0, 106, 0, 0, - 134, 114, 0, 0, 0, 0, 0, 77, 0, 105, - 160, 128, 94, 151, 0, 0, 0, 0, 0, 75, - 0, 572, 0, 0, 0, 0, 0, 0, 86, 0, + 0, 121, 0, 77, 0, 105, 160, 128, 94, 151, + 92, 0, 0, 0, 0, 104, 0, 106, 0, 0, + 134, 114, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 50, 0, 0, 175, + 0, 0, 0, 0, 0, 0, 0, 0, 86, 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, @@ -1368,51 +1334,51 @@ var yyAct = [...]int{ 90, 120, 142, 143, 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, 99, 116, 115, 117, - 0, 0, 0, 135, 150, 162, 0, 0, 156, 157, - 158, 159, 118, 85, 100, 133, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 135, 150, 162, 0, 121, 156, 157, + 158, 159, 118, 85, 100, 133, 92, 0, 0, 0, + 0, 104, 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, 0, 77, 0, 105, 160, 128, 94, 151, - 121, 0, 0, 0, 559, 0, 0, 0, 0, 92, - 0, 0, 0, 0, 104, 0, 106, 0, 0, 134, - 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 175, 0, - 561, 0, 0, 0, 0, 0, 0, 86, 0, 0, + 0, 0, 0, 0, 0, 75, 0, 0, 671, 0, + 0, 672, 0, 0, 86, 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, 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, 177, 0, 0, 0, 0, 126, 0, - 0, 137, 97, 96, 0, 0, 0, 88, 0, 131, - 122, 149, 0, 557, 130, 107, 141, 127, 148, 178, - 155, 139, 154, 78, 138, 147, 87, 132, 80, 145, - 136, 112, 101, 102, 79, 0, 129, 91, 95, 90, - 120, 142, 143, 89, 161, 83, 153, 82, 84, 152, - 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, - 93, 98, 124, 108, 125, 99, 116, 115, 117, 0, - 0, 0, 135, 150, 162, 0, 121, 156, 157, 158, - 159, 118, 85, 100, 133, 92, 0, 0, 0, 0, - 104, 0, 106, 0, 0, 134, 114, 0, 0, 0, - 0, 0, 77, 0, 105, 160, 128, 94, 151, 0, - 0, 50, 0, 0, 175, 0, 0, 0, 0, 0, - 0, 0, 0, 86, 0, 0, 0, 0, 0, 0, + 177, 0, 0, 0, 0, 126, 0, 0, 137, 97, + 96, 0, 0, 0, 88, 0, 131, 122, 149, 0, + 123, 130, 107, 141, 127, 148, 178, 155, 139, 154, + 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, + 102, 79, 0, 129, 91, 95, 90, 120, 142, 143, + 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, + 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, + 108, 125, 99, 116, 115, 117, 0, 0, 0, 135, + 150, 162, 0, 121, 156, 157, 158, 159, 118, 85, + 100, 133, 92, 0, 574, 0, 0, 104, 0, 106, + 0, 0, 134, 114, 0, 0, 0, 0, 0, 77, + 0, 105, 160, 128, 94, 151, 0, 0, 0, 0, + 0, 75, 0, 573, 0, 0, 0, 0, 0, 0, + 86, 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, 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, 177, - 0, 0, 0, 0, 126, 0, 0, 137, 97, 96, - 0, 0, 0, 88, 0, 131, 122, 149, 0, 123, - 130, 107, 141, 127, 148, 178, 155, 139, 154, 78, - 138, 147, 87, 132, 80, 145, 136, 112, 101, 102, - 79, 0, 129, 91, 95, 90, 120, 142, 143, 89, - 161, 83, 153, 82, 84, 152, 119, 140, 146, 113, - 110, 81, 144, 111, 109, 103, 93, 98, 124, 108, - 125, 99, 116, 115, 117, 0, 0, 0, 135, 150, - 162, 0, 121, 156, 157, 158, 159, 118, 85, 100, - 133, 92, 0, 0, 0, 0, 104, 0, 106, 0, - 0, 134, 114, 0, 0, 0, 0, 0, 77, 0, - 105, 160, 128, 94, 151, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 177, 0, 0, 0, + 0, 126, 0, 0, 137, 97, 96, 0, 0, 0, + 88, 0, 131, 122, 149, 0, 123, 130, 107, 141, + 127, 148, 178, 155, 139, 154, 78, 138, 147, 87, + 132, 80, 145, 136, 112, 101, 102, 79, 0, 129, + 91, 95, 90, 120, 142, 143, 89, 161, 83, 153, + 82, 84, 152, 119, 140, 146, 113, 110, 81, 144, + 111, 109, 103, 93, 98, 124, 108, 125, 99, 116, + 115, 117, 0, 0, 0, 135, 150, 162, 0, 0, + 156, 157, 158, 159, 118, 85, 100, 133, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 77, 0, 105, 160, 128, + 94, 151, 121, 0, 0, 0, 559, 0, 0, 0, + 0, 92, 0, 0, 0, 0, 104, 0, 106, 0, + 0, 134, 114, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 175, 0, 561, 0, 0, 0, 0, 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1421,7 +1387,7 @@ var yyAct = [...]int{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 177, 0, 0, 0, 0, 126, 0, 0, 137, 97, 96, 0, 0, 0, 88, - 0, 131, 122, 149, 0, 123, 130, 107, 141, 127, + 0, 131, 122, 149, 0, 557, 130, 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, 0, 129, 91, 95, 90, 120, 142, 143, 89, 161, 83, 153, 82, @@ -1431,7 +1397,7 @@ var yyAct = [...]int{ 157, 158, 159, 118, 85, 100, 133, 92, 0, 0, 0, 0, 104, 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, 0, 77, 0, 105, 160, 128, 94, - 151, 0, 0, 0, 0, 0, 75, 0, 465, 0, + 151, 0, 0, 50, 0, 0, 175, 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1446,57 +1412,57 @@ var yyAct = [...]int{ 143, 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, 99, 116, 115, 117, 0, 0, 0, - 135, 150, 162, 0, 0, 156, 157, 158, 159, 118, - 85, 100, 133, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 121, - 77, 0, 105, 160, 128, 94, 151, 537, 92, 0, - 0, 0, 0, 104, 0, 106, 0, 0, 134, 114, + 135, 150, 162, 0, 121, 156, 157, 158, 159, 118, + 85, 100, 133, 92, 0, 0, 0, 0, 104, 0, + 106, 0, 0, 134, 114, 0, 0, 0, 0, 0, + 77, 0, 105, 160, 128, 94, 151, 0, 0, 0, + 0, 0, 175, 0, 561, 0, 0, 0, 0, 0, + 0, 86, 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, 175, 0, 0, - 0, 0, 0, 0, 0, 0, 86, 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, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 177, 0, 0, + 0, 0, 126, 0, 0, 137, 97, 96, 0, 0, + 0, 88, 0, 131, 122, 149, 0, 123, 130, 107, + 141, 127, 148, 178, 155, 139, 154, 78, 138, 147, + 87, 132, 80, 145, 136, 112, 101, 102, 79, 0, + 129, 91, 95, 90, 120, 142, 143, 89, 161, 83, + 153, 82, 84, 152, 119, 140, 146, 113, 110, 81, + 144, 111, 109, 103, 93, 98, 124, 108, 125, 99, + 116, 115, 117, 0, 0, 0, 135, 150, 162, 0, + 121, 156, 157, 158, 159, 118, 85, 100, 133, 92, + 0, 0, 0, 0, 104, 0, 106, 0, 0, 134, + 114, 0, 0, 0, 0, 0, 77, 0, 105, 160, + 128, 94, 151, 0, 0, 0, 0, 0, 75, 0, + 465, 0, 0, 0, 0, 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 177, 0, 0, 0, 0, 126, 0, 0, - 137, 97, 96, 0, 0, 0, 88, 0, 131, 122, - 149, 0, 123, 130, 107, 141, 127, 148, 178, 155, - 139, 154, 78, 138, 147, 87, 132, 80, 145, 136, - 112, 101, 102, 79, 0, 129, 91, 95, 90, 120, - 142, 143, 89, 161, 83, 153, 82, 84, 152, 119, - 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, - 98, 124, 108, 125, 99, 116, 115, 117, 290, 0, - 0, 135, 150, 162, 0, 121, 156, 157, 158, 159, - 118, 85, 100, 133, 92, 0, 0, 0, 0, 104, - 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, - 0, 77, 0, 105, 160, 128, 94, 151, 0, 0, - 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, - 0, 0, 86, 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, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 177, 0, 0, 0, 0, 126, 0, + 0, 137, 97, 96, 0, 0, 0, 88, 0, 131, + 122, 149, 0, 123, 130, 107, 141, 127, 148, 178, + 155, 139, 154, 78, 138, 147, 87, 132, 80, 145, + 136, 112, 101, 102, 79, 0, 129, 91, 95, 90, + 120, 142, 143, 89, 161, 83, 153, 82, 84, 152, + 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, + 93, 98, 124, 108, 125, 99, 116, 115, 117, 0, + 0, 0, 135, 150, 162, 0, 0, 156, 157, 158, + 159, 118, 85, 100, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 177, 0, - 0, 0, 0, 126, 0, 0, 137, 97, 96, 0, - 0, 0, 88, 0, 131, 122, 149, 0, 123, 130, - 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, - 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, - 0, 129, 91, 95, 90, 120, 142, 143, 89, 161, - 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, - 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, - 99, 116, 115, 117, 0, 0, 0, 135, 150, 162, - 0, 121, 156, 157, 158, 159, 118, 85, 100, 133, + 0, 121, 77, 0, 105, 160, 128, 94, 151, 537, 92, 0, 0, 0, 0, 104, 0, 106, 0, 0, - 134, 114, 0, 0, 0, 0, 0, 77, 0, 105, - 160, 128, 94, 151, 0, 0, 0, 0, 0, 175, + 134, 114, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, 0, 0, 86, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 172, 0, 177, 0, 0, 0, 0, 126, + 0, 0, 0, 0, 177, 0, 0, 0, 0, 126, 0, 0, 137, 97, 96, 0, 0, 0, 88, 0, 131, 122, 149, 0, 123, 130, 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, 147, 87, 132, 80, @@ -1504,11 +1470,11 @@ var yyAct = [...]int{ 90, 120, 142, 143, 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, 99, 116, 115, 117, - 0, 0, 0, 135, 150, 162, 0, 121, 156, 157, + 290, 0, 0, 135, 150, 162, 0, 121, 156, 157, 158, 159, 118, 85, 100, 133, 92, 0, 0, 0, 0, 104, 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, 0, 77, 0, 105, 160, 128, 94, 151, - 0, 0, 0, 0, 0, 75, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, 0, 0, 86, 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, @@ -1527,13 +1493,13 @@ var yyAct = [...]int{ 100, 133, 92, 0, 0, 0, 0, 104, 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, 0, 77, 0, 105, 160, 128, 94, 151, 0, 0, 0, 0, - 0, 227, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 175, 0, 0, 0, 0, 0, 0, 0, 0, 86, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 177, 0, 0, 0, + 0, 0, 0, 0, 172, 0, 177, 0, 0, 0, 0, 126, 0, 0, 137, 97, 96, 0, 0, 0, 88, 0, 131, 122, 149, 0, 123, 130, 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, 147, 87, @@ -1545,7 +1511,7 @@ var yyAct = [...]int{ 156, 157, 158, 159, 118, 85, 100, 133, 92, 0, 0, 0, 0, 104, 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, 0, 77, 0, 105, 160, 128, - 94, 151, 0, 0, 0, 0, 0, 175, 0, 0, + 94, 151, 0, 0, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1560,21 +1526,59 @@ var yyAct = [...]int{ 142, 143, 89, 161, 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, 99, 116, 115, 117, 0, 0, - 0, 135, 150, 162, 0, 0, 156, 157, 158, 159, - 118, 85, 100, 133, 0, 0, 0, 0, 0, 0, + 0, 135, 150, 162, 0, 121, 156, 157, 158, 159, + 118, 85, 100, 133, 92, 0, 0, 0, 0, 104, + 0, 106, 0, 0, 134, 114, 0, 0, 0, 0, + 0, 77, 0, 105, 160, 128, 94, 151, 0, 0, + 0, 0, 0, 227, 0, 0, 0, 0, 0, 0, + 0, 0, 86, 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, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 177, 0, + 0, 0, 0, 126, 0, 0, 137, 97, 96, 0, + 0, 0, 88, 0, 131, 122, 149, 0, 123, 130, + 107, 141, 127, 148, 178, 155, 139, 154, 78, 138, + 147, 87, 132, 80, 145, 136, 112, 101, 102, 79, + 0, 129, 91, 95, 90, 120, 142, 143, 89, 161, + 83, 153, 82, 84, 152, 119, 140, 146, 113, 110, + 81, 144, 111, 109, 103, 93, 98, 124, 108, 125, + 99, 116, 115, 117, 0, 0, 0, 135, 150, 162, + 0, 121, 156, 157, 158, 159, 118, 85, 100, 133, + 92, 0, 0, 0, 0, 104, 0, 106, 0, 0, + 134, 114, 0, 0, 0, 0, 0, 77, 0, 105, + 160, 128, 94, 151, 0, 0, 0, 0, 0, 175, + 0, 0, 0, 0, 0, 0, 0, 0, 86, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 77, 0, 105, 160, 128, 94, 151, + 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, 0, 0, 0, 177, 0, 0, 0, 0, 126, + 0, 0, 137, 97, 96, 0, 0, 0, 88, 0, + 131, 122, 149, 0, 123, 130, 107, 141, 127, 148, + 178, 155, 139, 154, 78, 138, 147, 87, 132, 80, + 145, 136, 112, 101, 102, 79, 0, 129, 91, 95, + 90, 120, 142, 143, 89, 161, 83, 153, 82, 84, + 152, 119, 140, 146, 113, 110, 81, 144, 111, 109, + 103, 93, 98, 124, 108, 125, 99, 116, 115, 117, + 0, 0, 0, 135, 150, 162, 0, 0, 156, 157, + 158, 159, 118, 85, 100, 133, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 77, 0, 105, 160, 128, 94, 151, } var yyPact = [...]int{ - 2115, -1000, -176, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + 1495, -1000, -172, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, 737, 758, -1000, -1000, -1000, -1000, -1000, -1000, 554, + 6364, 20, 40, -21, 8735, 39, 178, 9293, -1000, -50, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, 514, -1000, -1000, + -1000, -1000, -1000, 727, 734, 567, 718, 646, -1000, 5098, + 14, 7780, 8549, 4441, -1000, 444, 34, 9293, -143, 8921, + 12, 12, 12, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, 737, 769, -1000, -1000, -1000, -1000, -1000, -1000, 582, - 6372, 26, 44, -11, 8743, 42, 1237, 9301, -1000, -37, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, 533, -1000, -1000, - -1000, -1000, -1000, 727, 733, 556, 717, 656, -1000, 5106, - 27, 7788, 8557, 4449, -1000, 444, 39, 9301, -128, 8929, - 22, 22, 22, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, @@ -1582,22 +1586,22 @@ var yyPact = [...]int{ -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, 36, 9293, -1000, 9293, 9, 436, 9, + 9, 9, 9293, -1000, 68, -1000, -1000, -1000, -1000, 9293, + 427, 680, 27, 2817, 2817, 2817, 2817, -44, 2817, 2817, + 584, -1000, -1000, -1000, -1000, 2817, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 365, 694, 5539, 5539, 737, + -1000, 514, -1000, -1000, -1000, 691, -1000, -1000, 190, 748, + -1000, 6178, 65, -1000, 5539, 2120, 500, -1000, -1000, 500, + -1000, -1000, 50, -1000, -1000, 5959, 5959, 5959, 5959, 5959, + 5959, 5959, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, 500, -1000, 5320, 500, + 500, 500, 500, 500, 500, 500, 500, 5539, 500, 500, + 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, + 500, 8363, 481, 793, -1000, -1000, -1000, 715, 7003, 7594, + 9293, 473, -1000, 510, 3977, -1000, -1000, -1000, 114, 7375, + -1000, -1000, -1000, 677, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, 41, 9301, -1000, 9301, 8, 439, 8, - 8, 8, 9301, -1000, 90, -1000, -1000, -1000, -1000, 9301, - 436, 682, 72, 2825, 2825, 2825, 2825, -32, 2825, 2825, - 602, -1000, -1000, -1000, -1000, 2825, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 334, 691, 5547, 5547, 737, - -1000, 533, -1000, -1000, -1000, 686, -1000, -1000, 177, 751, - -1000, 6186, 89, -1000, 5547, 2231, 510, -1000, -1000, 510, - -1000, -1000, 67, -1000, -1000, 5967, 5967, 5967, 5967, 5967, - 5967, 5967, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, 510, -1000, 5328, 510, - 510, 510, 510, 510, 510, 510, 510, 5547, 510, 510, - 510, 510, 510, 510, 510, 510, 510, 510, 510, 510, - 510, 8371, 477, 750, -1000, -1000, -1000, 714, 7011, 7602, - 9301, 482, -1000, 500, 3985, -1000, -1000, -1000, 140, 7383, - -1000, -1000, -1000, 681, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, @@ -1605,172 +1609,171 @@ var yyPact = [...]int{ -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, 426, -1000, 1496, + 421, 2817, 26, 530, 408, 154, 396, 9293, 9293, 2817, + 22, 9293, 711, 581, 9293, 389, 353, -1000, 4209, -1000, + 2817, 2817, 2817, 2817, 2817, 2817, 2817, 2817, -1000, -1000, + -1000, -1000, -1000, -1000, 2817, 2817, -1000, -1000, 9293, -1000, + -1000, -1000, -1000, 753, 93, 237, 61, 517, -1000, 321, + 727, 365, 646, 7189, 604, -1000, -1000, 9293, -1000, 5539, + 5539, 327, -1000, 8152, -1000, -1000, 3281, 101, 5959, 246, + 128, 5959, 5959, 5959, 5959, 5959, 5959, 5959, 5959, 5959, + 5959, 5959, 5959, 5959, 5959, 5959, 347, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 348, -1000, 514, 429, 429, + 73, 73, 73, 73, 73, 73, 1899, 4660, 365, 419, + 138, 5320, 5098, 5098, 5539, 5539, 9107, 9107, 5098, 719, + 124, 138, 8921, -1000, 365, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, 5098, 5098, 5098, 5098, -9, 9293, -1000, 9107, + 7780, 7780, 7780, 7780, 7780, -1000, 634, 626, -1000, 597, + 596, 621, 9293, -1000, 414, 7003, 90, 500, -1000, 7966, + -1000, -1000, -9, 509, 7780, 9293, -1000, -1000, 3977, 510, + 5539, 44, -1000, -1000, -1000, -1000, 2585, 176, 239, -115, + -1000, -1000, -1000, 521, -1000, 521, 521, 521, 521, -85, + -85, -85, -85, -1000, -1000, -1000, -1000, -1000, 539, 537, + -1000, 521, 521, 521, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, 435, -1000, 6505, - 432, 2825, 31, 566, 406, 159, 387, 9301, 9301, 2825, - 29, 9301, 711, 601, 9301, 385, 376, -1000, 4217, -1000, - 2825, 2825, 2825, 2825, 2825, 2825, 2825, 2825, -1000, -1000, - -1000, -1000, -1000, -1000, 2825, 2825, -1000, -1000, 9301, -1000, - -1000, -1000, -1000, 764, 110, 445, 88, 501, -1000, 333, - 727, 334, 656, 7197, 613, -1000, -1000, 9301, -1000, 5547, - 5547, 300, -1000, 8160, -1000, -1000, 3289, 121, 5967, 234, - 135, 5967, 5967, 5967, 5967, 5967, 5967, 5967, 5967, 5967, - 5967, 5967, 5967, 5967, 5967, 5967, 227, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, 357, -1000, 533, 778, 778, - 76, 76, 76, 76, 76, 76, 1902, 4668, 334, 425, - 256, 5328, 5106, 5106, 5547, 5547, 9115, 9115, 5106, 720, - 145, 256, 8929, -1000, 334, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, 5106, 5106, 5106, 5106, -12, 9301, -1000, 9115, - 7788, 7788, 7788, 7788, 7788, -1000, 644, 642, -1000, 635, - 616, 634, 9301, -1000, 414, 7011, 81, 510, -1000, 7974, - -1000, -1000, -12, 7788, 9301, -1000, -1000, 3985, 500, 5547, - 75, -1000, -1000, -1000, -1000, 2593, 126, 272, -96, -1000, - -1000, -1000, 525, -1000, 525, 525, 525, 525, -63, -63, - -63, -63, -1000, -1000, -1000, -1000, -1000, 581, 574, -1000, - 525, 525, 525, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 551, - 551, 551, 535, 535, 584, -1000, 9301, -148, 355, 2825, - 709, 2825, -1000, 273, -1000, 9301, -1000, -1000, 9301, 2825, + 536, 536, 536, 522, 522, 557, -1000, 9293, -162, 341, + 2817, 710, 2817, -1000, 106, -1000, 9293, -1000, -1000, 9293, + 2817, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 660, 5539, + 5539, 3745, 5539, -1000, -1000, -1000, 694, -1000, 719, 732, + -1000, 672, 671, 5098, -1000, -1000, 101, 166, -1000, -1000, + 218, -1000, -1000, -1000, -1000, 60, 500, -1000, 2157, -1000, + -1000, -1000, -1000, 246, 5959, 5959, 5959, 1293, 2157, 2136, + 690, 2044, 73, 233, 233, 77, 77, 77, 77, 77, + 220, 220, -1000, -1000, -1000, 365, -1000, -1000, -1000, 365, + 5098, 495, -1000, -1000, 5539, -1000, 365, 406, 406, 392, + 266, 508, -1000, 59, 505, 406, 5098, 127, -1000, 5539, + 365, -1000, 406, 365, 406, 406, 464, 500, -1000, 506, + -1000, 111, 793, 529, 578, 629, -1000, -1000, -1000, -1000, + 625, -1000, 598, -1000, -1000, -1000, -1000, -1000, 33, 32, + 30, 8921, -1000, 746, 7780, 497, -1000, -1000, 138, -1000, + 337, 494, 2353, -1000, -1000, -1000, -1000, -1000, -1000, 526, + 702, 129, 136, 324, -1000, -1000, 686, -1000, 184, -120, + -1000, -1000, 268, -85, -85, -1000, -1000, 44, 676, 44, + 44, 44, 290, 290, -1000, -1000, -1000, -1000, 254, -1000, + -1000, -1000, 253, -1000, 577, 8921, 2817, -1000, 3513, -1000, + -1000, -1000, -1000, -1000, -1000, 754, 312, 123, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -10, + -1000, 2817, -1000, 651, 138, 138, 58, -1000, -1000, 9293, + -1000, -1000, -1000, -1000, 503, -1000, -1000, -1000, 3049, 5098, + -1000, 1293, 2157, 2025, -1000, 5959, 5959, -1000, -1000, 406, + 5098, 138, -1000, -1000, -1000, 28, 347, 28, 5959, 5959, + 3745, 5959, 5959, -153, 493, 119, -1000, 5539, 280, -1000, + -1000, -1000, -1000, -1000, 575, 9107, 500, -1000, 6793, 8921, + 737, 9107, 5539, 5539, -1000, -1000, 5539, 524, -1000, 5539, + -1000, -1000, -1000, 500, 500, 500, 379, -1000, 737, 497, + -1000, -1000, 2585, -1000, 2585, 8921, -1000, 303, 299, -1000, + -1000, 563, 29, -1000, -1000, -1000, 447, 44, 44, -1000, + 125, -1000, -1000, -1000, 402, -1000, 400, 485, 395, 9293, + -1000, -1000, 482, -1000, 100, -1000, -1000, 8921, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, 665, 5547, 5547, - 3753, 5547, -1000, -1000, -1000, 691, -1000, 720, 731, -1000, - 673, 671, 5106, -1000, -1000, 121, 148, -1000, -1000, 338, - -1000, -1000, -1000, -1000, 85, 510, -1000, 1628, -1000, -1000, - -1000, -1000, 234, 5967, 5967, 5967, 43, 1628, 1542, 280, - 220, 76, 294, 294, 100, 100, 100, 100, 100, 71, - 71, -1000, -1000, -1000, 334, -1000, -1000, -1000, 334, 5106, - 494, -1000, -1000, 5547, -1000, 334, 404, 404, 390, 276, - 541, -1000, 79, 527, 404, 5106, 150, -1000, 5547, 334, - -1000, 404, 334, 404, 404, 461, 510, -1000, 507, -1000, - 134, 750, 565, 599, 528, -1000, -1000, -1000, -1000, 623, - -1000, 622, -1000, -1000, -1000, -1000, -1000, 38, 35, 33, - 8929, -1000, 756, 506, -1000, -1000, 256, -1000, 342, 486, - 2361, -1000, -1000, -1000, -1000, -1000, -1000, 540, 699, 129, - 136, 314, -1000, -1000, 685, -1000, 166, -100, -1000, -1000, - 241, -63, -63, -1000, -1000, 75, 679, 75, 75, 75, - 287, 287, -1000, -1000, -1000, -1000, 240, -1000, -1000, -1000, - 232, -1000, 590, 8929, 2825, -1000, 3521, -1000, -1000, -1000, - -1000, -1000, -1000, 628, 356, 173, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -19, -1000, 2825, - -1000, 661, 256, 256, 74, -1000, -1000, 9301, -1000, -1000, - -1000, -1000, 499, -1000, -1000, -1000, 3057, 5106, -1000, 43, - 1628, 1500, -1000, 5967, 5967, -1000, -1000, 404, 5106, 256, - -1000, -1000, -1000, 123, 227, 123, 5967, 5967, 3753, 5967, - 5967, -142, 505, 137, -1000, 5547, 279, -1000, -1000, -1000, - -1000, -1000, 587, 9115, 510, -1000, 6801, 8929, 737, 9115, - 5547, 5547, -1000, -1000, 5547, 536, -1000, 5547, -1000, -1000, - -1000, 510, 510, 510, 383, -1000, 737, -1000, -1000, 2593, - -1000, 2593, 8929, -1000, 298, 281, -1000, -1000, 586, 37, - -1000, -1000, -1000, 451, 75, 75, -1000, 109, -1000, -1000, - -1000, 401, -1000, 399, 483, 396, 9301, -1000, -1000, 479, - -1000, 131, -1000, -1000, 8929, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, 8929, 9301, -1000, - -1000, -1000, -1000, -1000, 8929, -1000, -1000, 3521, -1000, 756, - 7788, -1000, -1000, 334, -1000, 5967, 1628, 1628, -1000, -1000, - 334, 525, 525, -1000, 525, 535, -1000, 525, -46, 525, - -47, 334, 334, 1436, 1462, -1000, 1143, 1327, 510, -139, - -1000, 256, 5547, -1000, 702, 454, 473, -1000, -1000, 4887, - 334, 391, 65, 383, 727, -1000, 256, 256, 256, 8929, - 256, 8929, 8929, 8929, 6591, 8929, 727, 2361, -1000, 364, - -1000, 525, -1000, -1000, -87, 763, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -63, 283, -63, - 209, -1000, 183, 2825, 3521, 2593, -1000, 512, -1000, -1000, - -1000, -1000, 704, 748, 476, -1000, 1628, -1000, -1000, 56, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 5967, - 5967, -1000, 5967, 5967, 5967, 334, 270, 256, 697, -1000, - 510, -1000, -1000, 496, 8929, 8929, -1000, -1000, 362, -1000, - 354, 354, 354, 81, -1000, -1000, 584, 8929, -1000, 128, - -1000, -113, 75, -1000, 75, 392, 384, -1000, -1000, -1000, - 8929, 510, 746, 729, -1000, -1000, 796, 796, 796, 796, - -26, -1000, -1000, 761, -1000, 510, -1000, 533, 53, -1000, - 8929, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 175, 696, - -1000, 695, -1000, -1000, -1000, -1000, -1000, 346, -20, -1000, - 5547, 5547, -1000, -1000, -1000, -1000, 334, 51, -152, 9115, - 473, 334, 8929, -1000, -1000, 250, -1000, -1000, 566, 297, - -1000, 8929, 256, 472, -1000, 659, -146, -157, 471, -1000, - -1000, -1000, -148, -1000, -20, 670, -1000, 649, -1000, -1000, - -1000, -23, -149, -25, -153, 510, -158, 5757, -1000, 796, - 334, -1000, -1000, + 8921, 9293, -1000, -1000, -1000, -1000, -1000, 8921, -1000, -1000, + 3513, -1000, 746, 7780, -1000, -1000, 365, -1000, 5959, 2157, + 2157, -1000, -1000, 365, 521, 521, -1000, 521, 522, -1000, + 521, -68, 521, -69, 365, 365, 1664, 1875, -1000, 1441, + 1807, 500, -150, -1000, 138, 5539, -1000, 704, 453, 461, + -1000, -1000, 4879, 365, 393, 57, 379, 727, -1000, 138, + 138, 138, 8921, 138, 8921, 8921, 8921, 6583, 8921, 727, + -1000, 2353, -1000, 376, -1000, 521, -1000, -1000, -108, 752, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -85, 289, -85, 241, -1000, 224, 2817, 3513, 2585, + -1000, 515, -1000, -1000, -1000, -1000, 696, 743, 474, -1000, + 2157, -1000, -1000, 48, -1000, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, 5959, 5959, -1000, 5959, 5959, 5959, 365, + 281, 138, 699, -1000, 500, -1000, -1000, 499, 8921, 8921, + -1000, -1000, 364, -1000, 352, 352, 352, 90, -1000, -1000, + 557, 8921, -1000, 110, -1000, -132, 44, -1000, 44, 446, + 420, -1000, -1000, -1000, 8921, 500, 741, 733, -1000, -1000, + 1764, 1764, 1764, 1764, 17, -1000, -1000, 751, -1000, 500, + -1000, 514, 47, -1000, 8921, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, 168, 695, -1000, 688, -1000, -1000, -1000, -1000, + -1000, 333, -16, -1000, 5539, 5539, -1000, -1000, -1000, -1000, + 365, 37, -165, 9107, 461, 365, 8921, -1000, -1000, 234, + -1000, -1000, 530, 316, -1000, 8921, 138, 456, -1000, 650, + -156, -168, 449, -1000, -1000, -1000, -162, -1000, -16, 670, + -1000, 644, -1000, -1000, -1000, -19, -163, -24, -166, 500, + -169, 5749, -1000, 1764, 365, -1000, -1000, } var yyPgo = [...]int{ - 0, 1007, 35, 501, 1006, 1005, 1004, 1003, 1001, 998, - 997, 994, 993, 992, 990, 989, 988, 987, 986, 985, - 982, 978, 977, 976, 98, 975, 974, 973, 47, 972, - 60, 966, 965, 29, 448, 32, 41, 771, 964, 18, - 87, 106, 963, 34, 960, 959, 957, 955, 63, 954, - 951, 1339, 950, 949, 13, 27, 948, 945, 944, 941, - 51, 383, 937, 936, 934, 921, 912, 911, 40, 3, - 5, 8, 14, 909, 222, 6, 904, 39, 903, 902, - 886, 885, 26, 883, 43, 882, 21, 42, 881, 9, - 50, 25, 20, 4, 58, 880, 28, 44, 878, 248, - 877, 133, 234, 875, 873, 871, 870, 54, 175, 504, - 528, 53, 854, 12, 853, 1299, 55, 45, 19, 849, - 46, 244, 33, 848, 847, 31, 846, 843, 841, 831, - 827, 826, 824, 57, 822, 821, 820, 16, 24, 817, - 816, 52, 23, 813, 812, 810, 30, 49, 809, 38, - 808, 806, 803, 22, 15, 790, 10, 788, 787, 7, - 785, 17, 784, 11, 783, 2, 37, 782, 780, 0, - 661, 779, 777, 59, + 0, 991, 10, 482, 990, 989, 988, 987, 986, 984, + 983, 982, 981, 980, 979, 978, 974, 972, 969, 968, + 967, 966, 965, 964, 101, 963, 958, 957, 52, 952, + 60, 950, 949, 31, 165, 35, 34, 976, 947, 22, + 64, 51, 946, 40, 945, 944, 61, 943, 54, 940, + 936, 1313, 935, 920, 14, 24, 914, 913, 911, 906, + 55, 175, 904, 900, 899, 898, 897, 894, 41, 5, + 9, 15, 17, 893, 80, 6, 892, 43, 891, 890, + 889, 888, 42, 887, 45, 878, 21, 44, 877, 8, + 47, 29, 27, 4, 63, 876, 26, 50, 875, 303, + 869, 123, 328, 868, 867, 866, 865, 32, 176, 506, + 429, 57, 864, 12, 859, 1287, 59, 53, 18, 858, + 28, 344, 30, 857, 856, 33, 854, 853, 850, 849, + 848, 843, 842, 258, 833, 828, 826, 25, 13, 822, + 820, 46, 38, 819, 818, 815, 37, 49, 814, 39, + 812, 811, 808, 23, 20, 805, 16, 802, 799, 7, + 794, 19, 793, 3, 778, 2, 36, 777, 776, 0, + 583, 773, 764, 102, } var yyR1 = [...]int{ 0, 167, 168, 168, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 6, 3, 4, 4, 5, - 5, 7, 7, 27, 27, 8, 9, 9, 171, 171, - 46, 46, 90, 90, 10, 10, 123, 123, 11, 11, - 11, 11, 11, 11, 11, 165, 165, 164, 163, 163, - 162, 162, 161, 16, 150, 151, 151, 151, 147, 126, - 126, 126, 126, 129, 129, 127, 127, 127, 127, 127, - 127, 127, 128, 128, 128, 128, 128, 130, 130, 130, - 130, 130, 131, 131, 131, 131, 131, 131, 131, 131, - 131, 131, 131, 131, 131, 131, 131, 132, 132, 132, - 132, 132, 132, 132, 132, 146, 146, 133, 133, 141, - 141, 142, 142, 142, 139, 139, 140, 140, 143, 143, - 143, 134, 134, 134, 134, 134, 134, 134, 136, 136, - 144, 144, 137, 137, 137, 138, 138, 145, 145, 145, - 145, 145, 135, 135, 148, 155, 155, 155, 155, 155, - 149, 149, 157, 157, 156, 152, 152, 152, 153, 153, - 153, 154, 154, 154, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 166, 166, 166, 166, 166, 166, 166, - 166, 166, 166, 166, 160, 158, 158, 159, 159, 13, - 14, 14, 14, 14, 14, 15, 15, 17, 18, 18, + 5, 7, 7, 27, 27, 8, 9, 9, 9, 171, + 171, 46, 46, 90, 90, 10, 10, 123, 123, 11, + 11, 11, 11, 11, 11, 11, 165, 165, 164, 163, + 163, 162, 162, 161, 16, 150, 151, 151, 151, 147, + 126, 126, 126, 126, 129, 129, 127, 127, 127, 127, + 127, 127, 127, 128, 128, 128, 128, 128, 130, 130, + 130, 130, 130, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 132, 132, + 132, 132, 132, 132, 132, 132, 146, 146, 133, 133, + 141, 141, 142, 142, 142, 139, 139, 140, 140, 143, + 143, 143, 134, 134, 134, 134, 134, 134, 134, 136, + 136, 144, 144, 137, 137, 137, 138, 138, 145, 145, + 145, 145, 145, 135, 135, 148, 155, 155, 155, 155, + 155, 149, 149, 157, 157, 156, 152, 152, 152, 153, + 153, 153, 154, 154, 154, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 160, 158, 158, 159, 159, + 13, 14, 14, 14, 14, 14, 15, 15, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, - 18, 124, 124, 124, 19, 19, 21, 21, 22, 23, - 20, 20, 20, 20, 20, 172, 24, 25, 25, 26, - 26, 26, 30, 30, 30, 28, 28, 29, 29, 35, - 35, 34, 34, 36, 36, 36, 36, 112, 112, 112, - 111, 111, 38, 38, 39, 39, 40, 40, 41, 41, - 41, 53, 53, 89, 89, 91, 91, 42, 42, 42, - 42, 43, 43, 44, 44, 45, 45, 119, 119, 118, - 118, 118, 117, 117, 47, 47, 47, 49, 48, 48, - 48, 48, 50, 50, 52, 52, 51, 51, 54, 54, - 54, 54, 55, 55, 37, 37, 37, 37, 37, 37, - 37, 100, 100, 57, 57, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 67, 67, 67, 67, 67, - 67, 58, 58, 58, 58, 58, 58, 58, 33, 33, - 68, 68, 68, 74, 69, 69, 61, 61, 61, 61, + 18, 18, 124, 124, 124, 19, 19, 21, 21, 22, + 23, 20, 20, 20, 20, 20, 172, 24, 25, 25, + 26, 26, 26, 30, 30, 30, 28, 28, 29, 29, + 35, 35, 34, 34, 36, 36, 36, 36, 112, 112, + 112, 111, 111, 38, 38, 39, 39, 40, 40, 41, + 41, 41, 53, 53, 89, 89, 91, 91, 42, 42, + 42, 42, 43, 43, 44, 44, 45, 45, 119, 119, + 118, 118, 118, 117, 117, 47, 47, 47, 49, 48, + 48, 48, 48, 50, 50, 52, 52, 51, 51, 54, + 54, 54, 54, 55, 55, 37, 37, 37, 37, 37, + 37, 37, 100, 100, 57, 57, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 67, 67, 67, 67, + 67, 67, 58, 58, 58, 58, 58, 58, 58, 33, + 33, 68, 68, 68, 74, 69, 69, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 61, 61, 61, 61, 61, 65, 65, 65, - 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 64, 64, 64, 64, 64, - 64, 64, 64, 173, 173, 66, 66, 66, 66, 31, - 31, 31, 31, 31, 122, 122, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 78, - 78, 32, 32, 76, 76, 77, 79, 79, 75, 75, - 75, 60, 60, 60, 60, 60, 60, 60, 60, 62, - 62, 62, 80, 80, 81, 81, 82, 82, 83, 83, - 84, 85, 85, 85, 86, 86, 86, 86, 87, 87, - 87, 59, 59, 59, 59, 59, 59, 88, 88, 88, - 88, 92, 92, 70, 70, 72, 72, 71, 73, 93, - 93, 96, 94, 94, 97, 97, 95, 95, 95, 114, - 114, 114, 98, 98, 101, 101, 102, 102, 99, 99, - 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, - 104, 104, 104, 105, 105, 106, 106, 106, 113, 113, - 109, 109, 110, 110, 115, 115, 116, 116, 107, 107, + 61, 61, 61, 61, 61, 61, 61, 61, 65, 65, + 65, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 64, 64, 64, 64, + 64, 64, 64, 64, 173, 173, 66, 66, 66, 66, + 31, 31, 31, 31, 31, 122, 122, 125, 125, 125, + 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 78, 78, 32, 32, 76, 76, 77, 79, 79, 75, + 75, 75, 60, 60, 60, 60, 60, 60, 60, 60, + 62, 62, 62, 80, 80, 81, 81, 82, 82, 83, + 83, 84, 85, 85, 85, 86, 86, 86, 86, 87, + 87, 87, 59, 59, 59, 59, 59, 59, 88, 88, + 88, 88, 92, 92, 70, 70, 72, 72, 71, 73, + 93, 93, 96, 94, 94, 97, 97, 95, 95, 95, + 114, 114, 114, 98, 98, 101, 101, 102, 102, 99, + 99, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 104, 104, 104, 105, 105, 106, 106, 106, 113, + 113, 109, 109, 110, 110, 115, 115, 116, 116, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, @@ -1780,6 +1783,7 @@ var yyR1 = [...]int{ 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, @@ -1787,68 +1791,67 @@ var yyR1 = [...]int{ 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 108, 108, 108, 108, 108, 108, 108, 169, 170, - 120, 121, 121, 121, + 108, 108, 108, 108, 108, 108, 108, 108, 108, 169, + 170, 120, 121, 121, 121, } var yyR2 = [...]int{ 0, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 6, 7, 5, 10, 1, 3, 1, - 3, 7, 8, 1, 1, 8, 8, 6, 1, 1, - 1, 3, 0, 4, 3, 4, 1, 1, 2, 8, - 4, 6, 5, 5, 5, 0, 2, 1, 0, 2, - 1, 3, 3, 4, 4, 1, 3, 3, 8, 3, - 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 2, 1, 2, 2, - 2, 1, 4, 4, 2, 2, 3, 3, 3, 3, - 1, 1, 1, 1, 1, 6, 6, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 3, 0, 3, 0, - 5, 0, 3, 5, 0, 1, 0, 1, 0, 1, - 2, 0, 2, 2, 2, 2, 2, 2, 0, 3, - 0, 1, 0, 3, 3, 0, 2, 0, 2, 1, - 2, 1, 0, 2, 5, 2, 3, 3, 2, 2, - 1, 1, 1, 3, 2, 0, 1, 3, 1, 2, - 3, 1, 1, 1, 6, 7, 7, 12, 7, 7, - 7, 4, 5, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 7, 1, 3, 8, 8, 5, - 4, 6, 5, 4, 4, 3, 2, 3, 4, 4, - 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, - 4, 3, 3, 4, 2, 4, 2, 2, 2, 2, - 3, 0, 1, 1, 2, 1, 1, 2, 1, 1, - 2, 2, 2, 2, 2, 0, 2, 0, 2, 1, - 2, 2, 0, 1, 1, 0, 1, 0, 1, 0, - 1, 1, 3, 1, 2, 3, 5, 0, 1, 2, - 1, 1, 0, 2, 1, 3, 1, 1, 1, 3, - 3, 3, 7, 1, 3, 1, 3, 4, 4, 4, - 3, 2, 4, 0, 1, 0, 2, 0, 1, 0, - 1, 2, 1, 1, 1, 2, 2, 1, 2, 3, - 2, 3, 2, 2, 2, 1, 1, 3, 0, 5, - 5, 5, 0, 2, 1, 3, 3, 2, 3, 1, - 2, 0, 3, 1, 1, 3, 3, 4, 4, 5, - 3, 4, 5, 6, 2, 1, 2, 1, 2, 1, - 2, 1, 1, 1, 1, 1, 1, 1, 0, 2, - 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, - 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, - 2, 2, 3, 1, 1, 1, 1, 4, 5, 6, - 4, 4, 6, 6, 6, 6, 8, 8, 6, 8, - 8, 9, 7, 5, 4, 2, 2, 2, 2, 2, - 2, 2, 2, 0, 2, 4, 4, 4, 4, 0, - 3, 4, 7, 3, 1, 1, 2, 3, 3, 1, - 2, 2, 1, 2, 1, 2, 2, 1, 2, 0, - 1, 0, 2, 1, 2, 4, 0, 2, 1, 3, - 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 0, 3, 0, 2, 0, 3, 1, 3, - 2, 0, 1, 1, 0, 2, 4, 4, 0, 2, - 4, 2, 1, 3, 5, 4, 6, 1, 3, 3, - 5, 0, 5, 1, 3, 1, 2, 3, 1, 1, - 3, 3, 1, 3, 3, 3, 1, 2, 1, 1, - 1, 1, 1, 1, 0, 2, 0, 3, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 1, 1, 1, 1, 0, 1, 1, 0, 2, + 3, 7, 8, 1, 1, 8, 8, 7, 6, 1, + 1, 1, 3, 0, 4, 3, 4, 1, 1, 2, + 8, 4, 6, 5, 5, 5, 0, 2, 1, 0, + 2, 1, 3, 3, 4, 4, 1, 3, 3, 8, + 3, 1, 1, 1, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 2, 2, 2, 2, 1, 2, + 2, 2, 1, 4, 4, 2, 2, 3, 3, 3, + 3, 1, 1, 1, 1, 1, 6, 6, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 3, 0, 3, + 0, 5, 0, 3, 5, 0, 1, 0, 1, 0, + 1, 2, 0, 2, 2, 2, 2, 2, 2, 0, + 3, 0, 1, 0, 3, 3, 0, 2, 0, 2, + 1, 2, 1, 0, 2, 5, 2, 3, 3, 2, + 2, 1, 1, 1, 3, 2, 0, 1, 3, 1, + 2, 3, 1, 1, 1, 6, 7, 7, 12, 7, + 7, 7, 4, 5, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 7, 1, 3, 8, 8, + 5, 4, 6, 5, 4, 4, 3, 2, 3, 4, + 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, + 3, 4, 3, 3, 4, 2, 4, 2, 2, 2, + 2, 3, 0, 1, 1, 2, 1, 1, 2, 1, + 1, 2, 2, 2, 2, 2, 0, 2, 0, 2, + 1, 2, 2, 0, 1, 1, 0, 1, 0, 1, + 0, 1, 1, 3, 1, 2, 3, 5, 0, 1, + 2, 1, 1, 0, 2, 1, 3, 1, 1, 1, + 3, 3, 3, 7, 1, 3, 1, 3, 4, 4, + 4, 3, 2, 4, 0, 1, 0, 2, 0, 1, + 0, 1, 2, 1, 1, 1, 2, 2, 1, 2, + 3, 2, 3, 2, 2, 2, 1, 1, 3, 0, + 5, 5, 5, 0, 2, 1, 3, 3, 2, 3, + 1, 2, 0, 3, 1, 1, 3, 3, 4, 4, + 5, 3, 4, 5, 6, 2, 1, 2, 1, 2, + 1, 2, 1, 1, 1, 1, 1, 1, 1, 0, + 2, 1, 1, 1, 3, 1, 3, 1, 1, 1, + 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, + 2, 2, 2, 3, 1, 1, 1, 1, 4, 5, + 6, 4, 4, 6, 6, 6, 6, 8, 8, 6, + 8, 8, 9, 7, 5, 4, 2, 2, 2, 2, + 2, 2, 2, 2, 0, 2, 4, 4, 4, 4, + 0, 3, 4, 7, 3, 1, 1, 2, 3, 3, + 1, 2, 2, 1, 2, 1, 2, 2, 1, 2, + 0, 1, 0, 2, 1, 2, 4, 0, 2, 1, + 3, 5, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 2, 0, 3, 0, 2, 0, 3, 1, + 3, 2, 0, 1, 1, 0, 2, 4, 4, 0, + 2, 4, 2, 1, 3, 5, 4, 6, 1, 3, + 3, 5, 0, 5, 1, 3, 1, 2, 3, 1, + 1, 3, 3, 1, 3, 3, 3, 1, 2, 1, + 1, 1, 1, 1, 1, 0, 2, 0, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, + 2, 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, @@ -1867,7 +1870,7 @@ var yyR2 = [...]int{ 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, - 0, 0, 1, 1, + 1, 0, 0, 1, 1, } var yyChk = [...]int{ @@ -1927,201 +1930,201 @@ var yyChk = [...]int{ -173, -173, -169, -169, -169, -169, -52, 26, -51, 30, 54, -47, -49, -48, -50, 41, 45, 47, 42, 43, 44, 48, -119, 22, -39, -169, -118, 141, -117, 22, - -115, 58, -51, -171, 54, 11, 52, 54, -94, 80, - -114, -109, 58, 29, 30, 55, 54, -126, -129, -131, - -130, -132, -127, -128, 173, 174, 106, 177, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 30, 135, - 169, 170, 171, 172, 189, 190, 191, 192, 193, 194, - 195, 196, 156, 157, 158, 159, 160, 161, 162, 164, - 165, 166, 167, 168, 56, -121, 121, -165, 52, 56, - 72, 56, -51, -51, -121, 122, -51, 23, 51, -51, - 56, 56, -116, -115, -107, -121, -121, -121, -121, -121, - -121, -121, -121, -121, -121, -51, 9, 90, 54, 18, - 109, 54, -85, 24, 25, -86, -170, -30, -62, -109, - 59, 62, -29, 42, -51, -37, -37, -67, 67, 72, - 68, 69, -111, 97, -116, -110, -107, -61, -68, -71, - -74, 63, 90, 88, 89, 74, -61, -61, -61, -61, + -115, 58, -51, -46, -171, 54, 11, 52, 54, -94, + 80, -114, -109, 58, 29, 30, 55, 54, -126, -129, + -131, -130, -132, -127, -128, 173, 174, 106, 177, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 30, + 135, 169, 170, 171, 172, 189, 190, 191, 192, 193, + 194, 195, 196, 156, 157, 158, 159, 160, 161, 162, + 164, 165, 166, 167, 168, 56, -121, 121, -165, 52, + 56, 72, 56, -51, -51, -121, 122, -51, 23, 51, + -51, 56, 56, -116, -115, -107, -121, -121, -121, -121, + -121, -121, -121, -121, -121, -121, -51, 9, 90, 54, + 18, 109, 54, -85, 24, 25, -86, -170, -30, -62, + -109, 59, 62, -29, 42, -51, -37, -37, -67, 67, + 72, 68, 69, -111, 97, -116, -110, -107, -61, -68, + -71, -74, 63, 90, 88, 89, 74, -61, -61, -61, -61, -61, -61, -61, -61, -61, -61, -61, -61, -61, - -61, -122, 56, 58, 56, -60, -60, -109, -35, 21, - -34, -36, -170, 54, -170, -2, -34, -34, -37, -37, - -75, -109, -115, -75, -34, -28, -76, -77, 76, -109, - -170, -34, -35, -34, -34, -90, 141, -51, -93, -96, - -75, -40, -41, -41, -40, -41, 41, 41, 41, 46, - 41, 46, 41, -48, -115, -170, -54, 49, 123, 50, - -169, -117, -90, -39, -51, -97, -37, -138, 105, -152, - -153, -154, -110, 58, 59, -147, -148, -155, 126, 129, - 125, -149, 120, 28, -143, 67, 72, -139, 201, -133, - 53, -133, -133, -133, -133, -137, 176, -137, -137, -137, - 53, 53, -133, -133, -133, -141, 53, -141, -141, -142, - 53, -142, -113, 52, -51, -163, 233, -164, 56, -121, - 23, -121, -103, 117, 114, 115, -160, 113, 198, 176, - 65, 29, 15, 223, 141, 236, 56, 142, -51, -51, - -121, 37, -37, -37, -116, -84, -87, -98, 19, 11, - 33, 33, -34, 67, 68, 69, 109, -169, -68, -61, - -61, -61, -33, 136, 71, -170, -170, -34, 54, -37, - -170, -170, -170, 54, 52, 22, 54, 11, 109, 54, - 11, -170, -34, -79, -77, 78, -37, -170, -170, -170, - -170, -170, -59, 30, 33, -2, -169, -169, -55, 54, - 12, 80, -44, -43, 51, 52, -45, 51, -43, 41, - 41, 120, 120, 120, -91, -109, -55, -55, 56, 54, - -154, 80, 53, 28, -149, -149, 56, 56, -134, 29, - 67, -140, 202, 59, -137, -137, -138, 30, -138, -138, - -138, -146, 58, -146, 59, 59, 51, -109, -121, -162, - -161, -110, -120, -166, 147, 127, 128, 131, 130, 56, - 120, 28, 126, 129, 141, 125, -166, 147, -104, -105, - 122, 22, 120, 28, 141, -121, 38, 109, -51, -38, - 11, 97, -110, -35, -33, 71, -61, -61, -170, -36, - -125, 106, 173, 135, 171, 167, 187, 178, 200, 169, - 201, -122, -125, -61, -61, -110, -61, -61, 230, -82, - 79, -37, 77, -92, 51, -93, -70, -72, -71, -169, - -2, -88, -109, -91, -82, -96, -37, -37, -37, 53, - -37, -169, -169, -169, -170, 54, -82, -153, -154, -157, - -156, -109, 56, 56, -136, 51, 58, 59, 60, 67, - 213, 66, 55, -138, -138, 56, 106, 55, 54, 55, - 54, 55, 54, -51, 54, 80, -120, -109, -120, -109, - -51, -120, -109, -55, -39, -170, -61, -170, -133, -133, - -133, -142, -133, 161, -133, 161, -170, -170, -170, 54, - 19, -170, 54, 19, -169, -32, 228, -37, 27, -92, - 54, -170, -170, -170, 54, 109, -170, -86, -89, -109, - -89, -89, -89, -118, -109, -86, 55, 54, -133, -144, - 198, 9, -137, 58, -137, 59, 59, -121, -161, -154, - 53, 26, -80, 13, -137, 56, -61, -61, -61, -61, - -61, -170, 58, 28, -72, 33, -2, -169, -109, -109, - 54, 55, -170, -170, -170, -54, -113, -156, -145, 126, - 28, 125, 213, -138, -138, 55, 55, -89, -169, -81, - 14, 16, -170, -170, -170, -170, -31, 90, 233, 9, - -70, -2, 109, -109, -135, 65, 28, 28, 55, -158, - -159, 141, -37, -69, -170, 231, 48, 234, -93, -170, - -109, 58, -165, -170, 54, -109, 38, 232, 235, -163, - -159, 33, 38, 143, 233, 144, 234, -169, 235, -61, - 140, -170, -170, + -61, -61, -122, 56, 58, 56, -60, -60, -109, -35, + 21, -34, -36, -170, 54, -170, -2, -34, -34, -37, + -37, -75, -109, -115, -75, -34, -28, -76, -77, 76, + -109, -170, -34, -35, -34, -34, -90, 141, -51, -93, + -96, -75, -40, -41, -41, -40, -41, 41, 41, 41, + 46, 41, 46, 41, -48, -115, -170, -54, 49, 123, + 50, -169, -117, -90, 52, -39, -51, -97, -37, -138, + 105, -152, -153, -154, -110, 58, 59, -147, -148, -155, + 126, 129, 125, -149, 120, 28, -143, 67, 72, -139, + 201, -133, 53, -133, -133, -133, -133, -137, 176, -137, + -137, -137, 53, 53, -133, -133, -133, -141, 53, -141, + -141, -142, 53, -142, -113, 52, -51, -163, 233, -164, + 56, -121, 23, -121, -103, 117, 114, 115, -160, 113, + 198, 176, 65, 29, 15, 223, 141, 236, 56, 142, + -51, -51, -121, 37, -37, -37, -116, -84, -87, -98, + 19, 11, 33, 33, -34, 67, 68, 69, 109, -169, + -68, -61, -61, -61, -33, 136, 71, -170, -170, -34, + 54, -37, -170, -170, -170, 54, 52, 22, 54, 11, + 109, 54, 11, -170, -34, -79, -77, 78, -37, -170, + -170, -170, -170, -170, -59, 30, 33, -2, -169, -169, + -55, 54, 12, 80, -44, -43, 51, 52, -45, 51, + -43, 41, 41, 120, 120, 120, -91, -109, -55, -39, + -55, 56, 54, -154, 80, 53, 28, -149, -149, 56, + 56, -134, 29, 67, -140, 202, 59, -137, -137, -138, + 30, -138, -138, -138, -146, 58, -146, 59, 59, 51, + -109, -121, -162, -161, -110, -120, -166, 147, 127, 128, + 131, 130, 56, 120, 28, 126, 129, 141, 125, -166, + 147, -104, -105, 122, 22, 120, 28, 141, -121, 38, + 109, -51, -38, 11, 97, -110, -35, -33, 71, -61, + -61, -170, -36, -125, 106, 173, 135, 171, 167, 187, + 178, 200, 169, 201, -122, -125, -61, -61, -110, -61, + -61, 230, -82, 79, -37, 77, -92, 51, -93, -70, + -72, -71, -169, -2, -88, -109, -91, -82, -96, -37, + -37, -37, 53, -37, -169, -169, -169, -170, 54, -82, + -55, -153, -154, -157, -156, -109, 56, 56, -136, 51, + 58, 59, 60, 67, 213, 66, 55, -138, -138, 56, + 106, 55, 54, 55, 54, 55, 54, -51, 54, 80, + -120, -109, -120, -109, -51, -120, -109, -55, -39, -170, + -61, -170, -133, -133, -133, -142, -133, 161, -133, 161, + -170, -170, -170, 54, 19, -170, 54, 19, -169, -32, + 228, -37, 27, -92, 54, -170, -170, -170, 54, 109, + -170, -86, -89, -109, -89, -89, -89, -118, -109, -86, + 55, 54, -133, -144, 198, 9, -137, 58, -137, 59, + 59, -121, -161, -154, 53, 26, -80, 13, -137, 56, + -61, -61, -61, -61, -61, -170, 58, 28, -72, 33, + -2, -169, -109, -109, 54, 55, -170, -170, -170, -54, + -113, -156, -145, 126, 28, 125, 213, -138, -138, 55, + 55, -89, -169, -81, 14, 16, -170, -170, -170, -170, + -31, 90, 233, 9, -70, -2, 109, -109, -135, 65, + 28, 28, 55, -158, -159, 141, -37, -69, -170, 231, + 48, 234, -93, -170, -109, 58, -165, -170, 54, -109, + 38, 232, 235, -163, -159, 33, 38, 143, 233, 144, + 234, -169, 235, -61, 140, -170, -170, } var yyDef = [...]int{ 0, -2, 2, -2, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 476, 0, 245, 245, 245, 245, 245, 245, 0, - 545, 528, 0, 0, 0, 0, 231, 235, 236, 0, - 238, 239, 740, 740, 740, 740, 740, 0, 33, 34, - 738, 1, 3, 484, 0, 0, 249, 252, 247, 0, - 528, 0, 0, 0, 48, 0, 0, 728, 0, 729, - 526, 526, 526, 546, 547, 550, 551, 650, 651, 652, - 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, - 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, - 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, - 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, - 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, - 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, - 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, - 723, 724, 725, 726, 727, 730, 731, 732, 733, 734, - 735, 736, 737, 0, 0, 529, 0, 524, 0, 524, - 524, 524, 0, 206, 316, 554, 555, 728, 729, 0, - 0, 0, 0, 741, 741, 741, 741, 0, 741, 741, - 224, 226, 227, 228, 229, 741, 232, 233, 234, 237, - 240, 241, 242, 243, 244, 27, 488, 0, 0, 476, - 29, 0, 245, 250, 251, 255, 253, 254, 246, 0, - 263, 267, 0, 324, 0, 329, 331, -2, -2, 0, - 366, 367, 368, 369, 370, 0, 0, 0, 0, 0, - 0, 0, 393, 394, 395, 396, 461, 462, 463, 464, - 465, 466, 467, 468, 333, 334, 458, 508, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 449, 0, 423, - 423, 423, 423, 423, 423, 423, 423, 0, 0, 0, - 0, 0, 0, 274, 276, 277, 278, 297, 0, 299, - 0, 0, 40, 44, 0, 512, -2, -2, 0, 0, - 552, 553, -2, 657, -2, 558, 559, 560, 561, 562, - 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, - 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, - 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, - 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, - 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, - 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, - 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, - 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, - 643, 644, 645, 646, 647, 648, 649, 0, 65, 0, - 0, 741, 0, 55, 0, 0, 0, 0, 0, 741, - 0, 0, 0, 0, 0, 0, 0, 205, 0, 207, - 741, 741, 741, 741, 741, 741, 741, 741, 216, 742, - 743, 217, 218, 219, 741, 741, 221, 222, 0, 230, - 28, 739, 22, 0, 0, 485, 0, 477, 478, 481, - 484, 27, 252, 0, 257, 256, 248, 0, 264, 0, - 0, 0, 268, 0, 270, 271, 0, 327, 0, 0, + 21, 477, 0, 246, 246, 246, 246, 246, 246, 0, + 546, 529, 0, 0, 0, 0, 232, 236, 237, 0, + 239, 240, 741, 741, 741, 741, 741, 0, 33, 34, + 739, 1, 3, 485, 0, 0, 250, 253, 248, 0, + 529, 0, 0, 0, 49, 0, 0, 729, 0, 730, + 527, 527, 527, 547, 548, 551, 552, 651, 652, 653, + 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, + 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, + 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, + 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, + 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, + 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, + 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, + 724, 725, 726, 727, 728, 731, 732, 733, 734, 735, + 736, 737, 738, 0, 0, 530, 0, 525, 0, 525, + 525, 525, 0, 207, 317, 555, 556, 729, 730, 0, + 0, 0, 0, 742, 742, 742, 742, 0, 742, 742, + 225, 227, 228, 229, 230, 742, 233, 234, 235, 238, + 241, 242, 243, 244, 245, 27, 489, 0, 0, 477, + 29, 0, 246, 251, 252, 256, 254, 255, 247, 0, + 264, 268, 0, 325, 0, 330, 332, -2, -2, 0, + 367, 368, 369, 370, 371, 0, 0, 0, 0, 0, + 0, 0, 394, 395, 396, 397, 462, 463, 464, 465, + 466, 467, 468, 469, 334, 335, 459, 509, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 450, 0, 424, + 424, 424, 424, 424, 424, 424, 424, 0, 0, 0, + 0, 0, 0, 275, 277, 278, 279, 298, 0, 300, + 0, 0, 41, 45, 0, 513, -2, -2, 0, 0, + 553, 554, -2, 658, -2, 559, 560, 561, 562, 563, + 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, + 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, + 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, + 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, + 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, + 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, + 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, + 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, + 644, 645, 646, 647, 648, 649, 650, 0, 66, 0, + 0, 742, 0, 56, 0, 0, 0, 0, 0, 742, + 0, 0, 0, 0, 0, 0, 0, 206, 0, 208, + 742, 742, 742, 742, 742, 742, 742, 742, 217, 743, + 744, 218, 219, 220, 742, 742, 222, 223, 0, 231, + 28, 740, 22, 0, 0, 486, 0, 478, 479, 482, + 485, 27, 253, 0, 258, 257, 249, 0, 265, 0, + 0, 0, 269, 0, 271, 272, 0, 328, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 351, 352, 353, - 354, 355, 356, 357, 330, 0, 344, 0, 0, 0, - 386, 387, 388, 389, 390, 391, 0, 259, 27, 0, - 364, 0, 0, 0, 0, 0, 0, 0, 0, 255, - 0, 450, 0, 415, 0, 416, 417, 418, 419, 420, - 421, 422, 0, 259, 0, 0, 42, 0, 315, 0, - 0, 0, 0, 0, 0, 304, 0, 0, 307, 0, - 0, 0, 0, 298, 0, 0, 318, 696, 300, 0, - 302, 303, 42, 0, 0, 38, 39, 0, 45, 0, - 145, 519, 520, 521, 517, 165, 0, 128, 124, 70, - 71, 72, 117, 74, 117, 117, 117, 117, 142, 142, - 142, 142, 100, 101, 102, 103, 104, 0, 0, 87, - 117, 117, 117, 91, 107, 108, 109, 110, 111, 112, - 113, 114, 75, 76, 77, 78, 79, 80, 81, 119, - 119, 119, 121, 121, 548, 50, 0, 58, 0, 741, - 0, 741, 63, 0, 181, 0, 200, 525, 0, 741, - 203, 204, 317, 556, 557, 208, 209, 210, 211, 212, - 213, 214, 215, 220, 223, 225, 489, 0, 0, 0, - 0, 0, 480, 482, 483, 488, 30, 255, 0, 469, - 0, 0, 0, 258, 25, 325, 326, 328, 345, 0, - 347, 349, 269, 265, 0, 459, -2, 335, 336, 360, - 361, 362, 0, 0, 0, 0, 358, 340, 0, 371, + 0, 0, 0, 0, 0, 0, 0, 352, 353, 354, + 355, 356, 357, 358, 331, 0, 345, 0, 0, 0, + 387, 388, 389, 390, 391, 392, 0, 260, 27, 0, + 365, 0, 0, 0, 0, 0, 0, 0, 0, 256, + 0, 451, 0, 416, 0, 417, 418, 419, 420, 421, + 422, 423, 0, 260, 0, 0, 43, 0, 316, 0, + 0, 0, 0, 0, 0, 305, 0, 0, 308, 0, + 0, 0, 0, 299, 0, 0, 319, 697, 301, 0, + 303, 304, -2, 0, 0, 0, 39, 40, 0, 46, + 0, 146, 520, 521, 522, 518, 166, 0, 129, 125, + 71, 72, 73, 118, 75, 118, 118, 118, 118, 143, + 143, 143, 143, 101, 102, 103, 104, 105, 0, 0, + 88, 118, 118, 118, 92, 108, 109, 110, 111, 112, + 113, 114, 115, 76, 77, 78, 79, 80, 81, 82, + 120, 120, 120, 122, 122, 549, 51, 0, 59, 0, + 742, 0, 742, 64, 0, 182, 0, 201, 526, 0, + 742, 204, 205, 318, 557, 558, 209, 210, 211, 212, + 213, 214, 215, 216, 221, 224, 226, 490, 0, 0, + 0, 0, 0, 481, 483, 484, 489, 30, 256, 0, + 470, 0, 0, 0, 259, 25, 326, 327, 329, 346, + 0, 348, 350, 270, 266, 0, 460, -2, 336, 337, + 361, 362, 363, 0, 0, 0, 0, 359, 341, 0, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, - 382, 385, 434, 435, 0, 383, 384, 392, 0, 0, - 260, 261, 363, 0, 507, 27, 0, 0, 0, 0, - 0, 458, 0, 0, 0, 0, 456, 453, 0, 0, - 424, 0, 0, 0, 0, 0, 0, 314, 322, 509, - 0, 275, 293, 295, 0, 290, 305, 306, 308, 0, - 310, 0, 312, 313, 279, 280, 281, 0, 0, 0, - 0, 301, 322, 322, 41, 513, 514, 515, 0, 64, - 166, 168, 171, 172, 173, 66, 67, 0, 0, 0, - 0, 0, 160, 161, 131, 129, 0, 126, 125, 73, - 0, 142, 142, 94, 95, 145, 0, 145, 145, 145, - 0, 0, 88, 89, 90, 82, 0, 83, 84, 85, - 0, 86, 0, 0, 741, 52, 0, 56, 57, 53, - 527, 54, 740, 0, 0, 540, 182, 530, 531, 532, - 533, 534, 535, 536, 537, 538, 539, 0, 199, 741, - 202, 0, 486, 487, 0, 479, 23, 0, 522, 523, - 470, 471, 272, 346, 348, 350, 0, 259, 337, 358, - 341, 0, 338, 0, 0, 332, 397, 0, 0, 365, - -2, 400, 401, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 476, 0, 454, 0, 0, 414, 425, 426, - 427, 428, 501, 0, 0, -2, 0, 0, 476, 0, - 0, 0, 287, 294, 0, 0, 288, 0, 289, 309, - 311, 0, 0, 0, 0, 285, 476, 37, 146, 0, - 169, 0, 0, 155, 0, 0, 158, 159, 138, 0, - 130, 69, 127, 0, 145, 145, 96, 0, 97, 98, - 99, 0, 115, 0, 0, 0, 0, 549, 51, 59, - 60, 0, 174, 740, 0, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193, 740, 0, 0, 740, - 541, 542, 543, 544, 0, 201, 490, 0, 24, 322, - 0, 266, 460, 0, 339, 0, 359, 342, 398, 262, - 0, 117, 117, 439, 117, 121, 442, 117, 444, 117, - 447, 0, 0, 0, 0, 459, 0, 0, 0, 451, - 413, 457, 0, 31, 0, 501, 491, 503, 505, 0, - 27, 0, 497, 0, 484, 510, 323, 511, 291, 0, - 296, 0, 0, 0, 299, 0, 484, 167, 170, 0, - 162, 117, 156, 157, 140, 0, 132, 133, 134, 135, - 136, 137, 118, 92, 93, 143, 144, 142, 0, 142, - 0, 122, 0, 741, 0, 0, 175, 0, 176, 178, - 179, 180, 0, 472, 273, 399, 343, 402, 436, 142, - 440, 441, 443, 445, 446, 448, 404, 403, 405, 0, - 0, 408, 0, 0, 0, 0, 0, 455, 0, 32, - 0, 506, -2, 0, 0, 0, 43, 35, 0, 283, - 0, 0, 0, 318, 286, 36, 548, 0, 164, 147, - 141, 0, 145, 116, 145, 0, 0, 49, 61, 62, - 0, 0, 474, 0, 437, 438, 0, 0, 0, 0, - 429, 412, 452, 0, 504, 0, -2, 0, 499, 498, - 0, 292, 319, 320, 321, 282, 154, 163, 152, 0, - 149, 151, 139, 105, 106, 120, 123, 0, 0, 26, - 0, 0, 406, 407, 409, 410, 0, 0, 0, 0, - 494, 27, 0, 284, 68, 0, 148, 150, 55, 0, - 195, 0, 475, 473, 411, 0, 0, 0, 502, -2, - 500, 153, 58, 194, 0, 0, 430, 0, 433, 177, - 196, 0, 431, 0, 0, 0, 0, 0, 432, 0, - 0, 197, 198, + 382, 383, 386, 435, 436, 0, 384, 385, 393, 0, + 0, 261, 262, 364, 0, 508, 27, 0, 0, 0, + 0, 0, 459, 0, 0, 0, 0, 457, 454, 0, + 0, 425, 0, 0, 0, 0, 0, 0, 315, 323, + 510, 0, 276, 294, 296, 0, 291, 306, 307, 309, + 0, 311, 0, 313, 314, 280, 281, 282, 0, 0, + 0, 0, 302, 323, 0, 323, 42, 514, 515, 516, + 0, 65, 167, 169, 172, 173, 174, 67, 68, 0, + 0, 0, 0, 0, 161, 162, 132, 130, 0, 127, + 126, 74, 0, 143, 143, 95, 96, 146, 0, 146, + 146, 146, 0, 0, 89, 90, 91, 83, 0, 84, + 85, 86, 0, 87, 0, 0, 742, 53, 0, 57, + 58, 54, 528, 55, 741, 0, 0, 541, 183, 531, + 532, 533, 534, 535, 536, 537, 538, 539, 540, 0, + 200, 742, 203, 0, 487, 488, 0, 480, 23, 0, + 523, 524, 471, 472, 273, 347, 349, 351, 0, 260, + 338, 359, 342, 0, 339, 0, 0, 333, 398, 0, + 0, 366, -2, 401, 402, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 477, 0, 455, 0, 0, 415, + 426, 427, 428, 429, 502, 0, 0, -2, 0, 0, + 477, 0, 0, 0, 288, 295, 0, 0, 289, 0, + 290, 310, 312, 0, 0, 0, 0, 286, 477, 323, + 38, 147, 0, 170, 0, 0, 156, 0, 0, 159, + 160, 139, 0, 131, 70, 128, 0, 146, 146, 97, + 0, 98, 99, 100, 0, 116, 0, 0, 0, 0, + 550, 52, 60, 61, 0, 175, 741, 0, 184, 185, + 186, 187, 188, 189, 190, 191, 192, 193, 194, 741, + 0, 0, 741, 542, 543, 544, 545, 0, 202, 491, + 0, 24, 323, 0, 267, 461, 0, 340, 0, 360, + 343, 399, 263, 0, 118, 118, 440, 118, 122, 443, + 118, 445, 118, 448, 0, 0, 0, 0, 460, 0, + 0, 0, 452, 414, 458, 0, 31, 0, 502, 492, + 504, 506, 0, 27, 0, 498, 0, 485, 511, 324, + 512, 292, 0, 297, 0, 0, 0, 300, 0, 485, + 37, 168, 171, 0, 163, 118, 157, 158, 141, 0, + 133, 134, 135, 136, 137, 138, 119, 93, 94, 144, + 145, 143, 0, 143, 0, 123, 0, 742, 0, 0, + 176, 0, 177, 179, 180, 181, 0, 473, 274, 400, + 344, 403, 437, 143, 441, 442, 444, 446, 447, 449, + 405, 404, 406, 0, 0, 409, 0, 0, 0, 0, + 0, 456, 0, 32, 0, 507, -2, 0, 0, 0, + 44, 35, 0, 284, 0, 0, 0, 319, 287, 36, + 549, 0, 165, 148, 142, 0, 146, 117, 146, 0, + 0, 50, 62, 63, 0, 0, 475, 0, 438, 439, + 0, 0, 0, 0, 430, 413, 453, 0, 505, 0, + -2, 0, 500, 499, 0, 293, 320, 321, 322, 283, + 155, 164, 153, 0, 150, 152, 140, 106, 107, 121, + 124, 0, 0, 26, 0, 0, 407, 408, 410, 411, + 0, 0, 0, 0, 495, 27, 0, 285, 69, 0, + 149, 151, 56, 0, 196, 0, 476, 474, 412, 0, + 0, 0, 503, -2, 501, 154, 59, 195, 0, 0, + 431, 0, 434, 178, 197, 0, 432, 0, 0, 0, + 0, 0, 433, 0, 0, 198, 199, } var yyTok1 = [...]int{ @@ -2636,98 +2639,104 @@ yydefault: yyVAL.statement = &Delete{Comments: Comments(yyDollar[2].bytes2), TableExprs: TableExprs{&AliasedTableExpr{Expr: yyDollar[4].tableName}}, Partitions: yyDollar[5].partitions, Where: NewWhere(WhereStr, yyDollar[6].expr), OrderBy: yyDollar[7].orderBy, Limit: yyDollar[8].limit} } case 37: - yyDollar = yyS[yypt-6 : yypt+1] + yyDollar = yyS[yypt-7 : yypt+1] //line sql.y:423 { - yyVAL.statement = &Delete{Comments: Comments(yyDollar[2].bytes2), Targets: yyDollar[3].tableNames, TableExprs: yyDollar[5].tableExprs, Where: NewWhere(WhereStr, yyDollar[6].expr)} + yyVAL.statement = &Delete{Comments: Comments(yyDollar[2].bytes2), Targets: yyDollar[4].tableNames, TableExprs: yyDollar[6].tableExprs, Where: NewWhere(WhereStr, yyDollar[7].expr)} } case 38: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:428 + yyDollar = yyS[yypt-6 : yypt+1] + //line sql.y:427 { + yyVAL.statement = &Delete{Comments: Comments(yyDollar[2].bytes2), Targets: yyDollar[3].tableNames, TableExprs: yyDollar[5].tableExprs, Where: NewWhere(WhereStr, yyDollar[6].expr)} } case 39: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:429 + //line sql.y:432 { } case 40: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:433 { - yyVAL.tableNames = TableNames{yyDollar[1].tableName} } case 41: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:437 { - yyVAL.tableNames = append(yyVAL.tableNames, yyDollar[3].tableName) + yyVAL.tableNames = TableNames{yyDollar[1].tableName} } case 42: + yyDollar = yyS[yypt-3 : yypt+1] + //line sql.y:441 + { + yyVAL.tableNames = append(yyVAL.tableNames, yyDollar[3].tableName) + } + case 43: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:442 + //line sql.y:446 { yyVAL.partitions = nil } - case 43: + case 44: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:446 + //line sql.y:450 { yyVAL.partitions = yyDollar[3].partitions } - case 44: + case 45: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:452 + //line sql.y:456 { yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Exprs: yyDollar[3].setExprs} } - case 45: + case 46: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:456 + //line sql.y:460 { yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Scope: yyDollar[3].str, Exprs: yyDollar[4].setExprs} } - case 46: + case 47: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:462 + //line sql.y:466 { yyVAL.str = SessionStr } - case 47: + case 48: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:466 + //line sql.y:470 { yyVAL.str = GlobalStr } - case 48: + case 49: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:472 + //line sql.y:476 { yyDollar[1].ddl.TableSpec = yyDollar[2].TableSpec yyVAL.statement = yyDollar[1].ddl } - case 49: + case 50: yyDollar = yyS[yypt-8 : yypt+1] - //line sql.y:477 + //line sql.y:481 { // Change this to an alter statement yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[7].tableName, NewName: yyDollar[7].tableName} } - case 50: + case 51: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:482 + //line sql.y:486 { yyVAL.statement = &DDL{Action: CreateStr, NewName: yyDollar[3].tableName.ToViewName()} } - case 51: + case 52: yyDollar = yyS[yypt-6 : yypt+1] - //line sql.y:486 + //line sql.y:490 { yyVAL.statement = &DDL{Action: CreateStr, NewName: yyDollar[5].tableName.ToViewName()} } - case 52: + case 53: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:490 + //line sql.y:494 { yyVAL.statement = &DDL{Action: CreateVindexStr, VindexSpec: &VindexSpec{ Name: yyDollar[3].colIdent, @@ -2735,104 +2744,104 @@ yydefault: Params: yyDollar[5].vindexParams, }} } - case 53: + case 54: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:498 + //line sql.y:502 { yyVAL.statement = &DBDDL{Action: CreateStr, DBName: string(yyDollar[4].bytes)} } - case 54: + case 55: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:502 + //line sql.y:506 { yyVAL.statement = &DBDDL{Action: CreateStr, DBName: string(yyDollar[4].bytes)} } - case 55: + case 56: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:507 + //line sql.y:511 { yyVAL.colIdent = NewColIdent("") } - case 56: + case 57: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:511 + //line sql.y:515 { yyVAL.colIdent = yyDollar[2].colIdent } - case 57: + case 58: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:517 + //line sql.y:521 { yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } - case 58: + case 59: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:522 + //line sql.y:526 { var v []VindexParam yyVAL.vindexParams = v } - case 59: + case 60: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:527 + //line sql.y:531 { yyVAL.vindexParams = yyDollar[2].vindexParams } - case 60: + case 61: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:533 + //line sql.y:537 { yyVAL.vindexParams = make([]VindexParam, 0, 4) yyVAL.vindexParams = append(yyVAL.vindexParams, yyDollar[1].vindexParam) } - case 61: + case 62: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:538 + //line sql.y:542 { yyVAL.vindexParams = append(yyVAL.vindexParams, yyDollar[3].vindexParam) } - case 62: + case 63: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:544 + //line sql.y:548 { yyVAL.vindexParam = VindexParam{Key: yyDollar[1].colIdent, Val: yyDollar[3].str} } - case 63: + case 64: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:550 + //line sql.y:554 { yyVAL.ddl = &DDL{Action: CreateStr, NewName: yyDollar[4].tableName} setDDL(yylex, yyVAL.ddl) } - case 64: + case 65: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:557 + //line sql.y:561 { yyVAL.TableSpec = yyDollar[2].TableSpec yyVAL.TableSpec.Options = yyDollar[4].str } - case 65: + case 66: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:564 + //line sql.y:568 { yyVAL.TableSpec = &TableSpec{} yyVAL.TableSpec.AddColumn(yyDollar[1].columnDefinition) } - case 66: + case 67: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:569 + //line sql.y:573 { yyVAL.TableSpec.AddColumn(yyDollar[3].columnDefinition) } - case 67: + case 68: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:573 + //line sql.y:577 { yyVAL.TableSpec.AddIndex(yyDollar[3].indexDefinition) } - case 68: + case 69: yyDollar = yyS[yypt-8 : yypt+1] - //line sql.y:579 + //line sql.y:583 { yyDollar[2].columnType.NotNull = yyDollar[3].boolVal yyDollar[2].columnType.Default = yyDollar[4].optVal @@ -2842,32 +2851,26 @@ yydefault: yyDollar[2].columnType.Comment = yyDollar[8].optVal yyVAL.columnDefinition = &ColumnDefinition{Name: NewColIdent(string(yyDollar[1].bytes)), Type: yyDollar[2].columnType} } - case 69: + case 70: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:590 + //line sql.y:594 { yyVAL.columnType = yyDollar[1].columnType yyVAL.columnType.Unsigned = yyDollar[2].boolVal yyVAL.columnType.Zerofill = yyDollar[3].boolVal } - case 73: + case 74: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:601 + //line sql.y:605 { yyVAL.columnType = yyDollar[1].columnType yyVAL.columnType.Length = yyDollar[2].optVal } - case 74: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:606 - { - yyVAL.columnType = yyDollar[1].columnType - } case 75: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:612 + //line sql.y:610 { - yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} + yyVAL.columnType = yyDollar[1].columnType } case 76: yyDollar = yyS[yypt-1 : yypt+1] @@ -2906,16 +2909,14 @@ yydefault: yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} } case 82: - yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:642 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:640 { yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} - yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length - yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale } case 83: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:648 + //line sql.y:646 { yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length @@ -2923,7 +2924,7 @@ yydefault: } case 84: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:654 + //line sql.y:652 { yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length @@ -2931,7 +2932,7 @@ yydefault: } case 85: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:660 + //line sql.y:658 { yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length @@ -2939,23 +2940,25 @@ yydefault: } case 86: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:666 + //line sql.y:664 { yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale } case 87: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:674 + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:670 { yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} + yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length + yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale } case 88: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:678 { - yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} } case 89: yyDollar = yyS[yypt-2 : yypt+1] @@ -2970,16 +2973,16 @@ yydefault: yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 91: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:690 { - yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} + yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 92: - yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:696 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:694 { - yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: yyDollar[3].str, Collate: yyDollar[4].str} + yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} } case 93: yyDollar = yyS[yypt-4 : yypt+1] @@ -2988,10 +2991,10 @@ yydefault: yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: yyDollar[3].str, Collate: yyDollar[4].str} } case 94: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:704 { - yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: yyDollar[3].str, Collate: yyDollar[4].str} } case 95: yyDollar = yyS[yypt-2 : yypt+1] @@ -3000,10 +3003,10 @@ yydefault: yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 96: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:712 { - yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Charset: yyDollar[2].str, Collate: yyDollar[3].str} + yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 97: yyDollar = yyS[yypt-3 : yypt+1] @@ -3024,10 +3027,10 @@ yydefault: yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Charset: yyDollar[2].str, Collate: yyDollar[3].str} } case 100: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:728 { - yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} + yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Charset: yyDollar[2].str, Collate: yyDollar[3].str} } case 101: yyDollar = yyS[yypt-1 : yypt+1] @@ -3054,22 +3057,22 @@ yydefault: yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} } case 105: - yyDollar = yyS[yypt-6 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:748 { - yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].str, Collate: yyDollar[6].str} + yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} } case 106: yyDollar = yyS[yypt-6 : yypt+1] - //line sql.y:753 + //line sql.y:752 { yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].str, Collate: yyDollar[6].str} } case 107: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:759 + yyDollar = yyS[yypt-6 : yypt+1] + //line sql.y:757 { - yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} + yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].str, Collate: yyDollar[6].str} } case 108: yyDollar = yyS[yypt-1 : yypt+1] @@ -3115,138 +3118,138 @@ yydefault: } case 115: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:793 + //line sql.y:791 + { + yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)} + } + case 116: + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:797 { yyVAL.strs = make([]string, 0, 4) yyVAL.strs = append(yyVAL.strs, "'"+string(yyDollar[1].bytes)+"'") } - case 116: + case 117: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:798 + //line sql.y:802 { yyVAL.strs = append(yyDollar[1].strs, "'"+string(yyDollar[3].bytes)+"'") } - case 117: + case 118: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:803 + //line sql.y:807 { yyVAL.optVal = nil } - case 118: + case 119: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:807 + //line sql.y:811 { yyVAL.optVal = NewIntVal(yyDollar[2].bytes) } - case 119: + case 120: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:812 + //line sql.y:816 { yyVAL.LengthScaleOption = LengthScaleOption{} } - case 120: + case 121: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:816 + //line sql.y:820 { yyVAL.LengthScaleOption = LengthScaleOption{ Length: NewIntVal(yyDollar[2].bytes), Scale: NewIntVal(yyDollar[4].bytes), } } - case 121: + case 122: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:824 + //line sql.y:828 { yyVAL.LengthScaleOption = LengthScaleOption{} } - case 122: + case 123: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:828 + //line sql.y:832 { yyVAL.LengthScaleOption = LengthScaleOption{ Length: NewIntVal(yyDollar[2].bytes), } } - case 123: + case 124: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:834 + //line sql.y:838 { yyVAL.LengthScaleOption = LengthScaleOption{ Length: NewIntVal(yyDollar[2].bytes), Scale: NewIntVal(yyDollar[4].bytes), } } - case 124: + case 125: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:842 + //line sql.y:846 { yyVAL.boolVal = BoolVal(false) } - case 125: + case 126: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:846 + //line sql.y:850 { yyVAL.boolVal = BoolVal(true) } - case 126: + case 127: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:851 + //line sql.y:855 { yyVAL.boolVal = BoolVal(false) } - case 127: + case 128: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:855 + //line sql.y:859 { yyVAL.boolVal = BoolVal(true) } - case 128: - yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:861 - { - yyVAL.boolVal = BoolVal(false) - } case 129: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:865 { yyVAL.boolVal = BoolVal(false) } case 130: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:869 { - yyVAL.boolVal = BoolVal(true) + yyVAL.boolVal = BoolVal(false) } case 131: - yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:874 + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:873 { - yyVAL.optVal = nil + yyVAL.boolVal = BoolVal(true) } case 132: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:878 { - yyVAL.optVal = NewStrVal(yyDollar[2].bytes) + yyVAL.optVal = nil } case 133: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:882 { - yyVAL.optVal = NewIntVal(yyDollar[2].bytes) + yyVAL.optVal = NewStrVal(yyDollar[2].bytes) } case 134: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:886 { - yyVAL.optVal = NewFloatVal(yyDollar[2].bytes) + yyVAL.optVal = NewIntVal(yyDollar[2].bytes) } case 135: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:890 { - yyVAL.optVal = NewValArg(yyDollar[2].bytes) + yyVAL.optVal = NewFloatVal(yyDollar[2].bytes) } case 136: yyDollar = yyS[yypt-2 : yypt+1] @@ -3258,145 +3261,145 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:898 { - yyVAL.optVal = NewBitVal(yyDollar[2].bytes) + yyVAL.optVal = NewValArg(yyDollar[2].bytes) } case 138: + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:902 + { + yyVAL.optVal = NewBitVal(yyDollar[2].bytes) + } + case 139: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:903 + //line sql.y:907 { yyVAL.optVal = nil } - case 139: + case 140: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:907 + //line sql.y:911 { yyVAL.optVal = NewValArg(yyDollar[3].bytes) } - case 140: + case 141: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:912 + //line sql.y:916 { yyVAL.boolVal = BoolVal(false) } - case 141: + case 142: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:916 + //line sql.y:920 { yyVAL.boolVal = BoolVal(true) } - case 142: + case 143: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:921 + //line sql.y:925 { yyVAL.str = "" } - case 143: + case 144: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:925 + //line sql.y:929 { yyVAL.str = string(yyDollar[3].bytes) } - case 144: + case 145: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:929 + //line sql.y:933 { yyVAL.str = string(yyDollar[3].bytes) } - case 145: + case 146: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:934 + //line sql.y:938 { yyVAL.str = "" } - case 146: + case 147: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:938 + //line sql.y:942 { yyVAL.str = string(yyDollar[2].bytes) } - case 147: + case 148: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:943 + //line sql.y:947 { yyVAL.colKeyOpt = colKeyNone } - case 148: + case 149: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:947 + //line sql.y:951 { yyVAL.colKeyOpt = colKeyPrimary } - case 149: + case 150: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:951 + //line sql.y:955 { yyVAL.colKeyOpt = colKey } - case 150: + case 151: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:955 + //line sql.y:959 { yyVAL.colKeyOpt = colKeyUniqueKey } - case 151: + case 152: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:959 + //line sql.y:963 { yyVAL.colKeyOpt = colKeyUnique } - case 152: + case 153: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:964 + //line sql.y:968 { yyVAL.optVal = nil } - case 153: + case 154: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:968 + //line sql.y:972 { yyVAL.optVal = NewStrVal(yyDollar[2].bytes) } - case 154: + case 155: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:974 + //line sql.y:978 { yyVAL.indexDefinition = &IndexDefinition{Info: yyDollar[1].indexInfo, Columns: yyDollar[3].indexColumns, Using: yyDollar[5].colIdent} } - case 155: - yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:980 - { - yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].bytes), Name: NewColIdent("PRIMARY"), Primary: true, Unique: true} - } case 156: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:984 { - yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].str), Name: NewColIdent(string(yyDollar[3].bytes)), Spatial: true, Unique: false} + yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].bytes), Name: NewColIdent("PRIMARY"), Primary: true, Unique: true} } case 157: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:988 { - yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].str), Name: NewColIdent(string(yyDollar[3].bytes)), Unique: true} + yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].str), Name: NewColIdent(string(yyDollar[3].bytes)), Spatial: true, Unique: false} } case 158: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:992 { - yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes), Name: NewColIdent(string(yyDollar[2].bytes)), Unique: true} + yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].str), Name: NewColIdent(string(yyDollar[3].bytes)), Unique: true} } case 159: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:996 { - yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].str), Name: NewColIdent(string(yyDollar[2].bytes)), Unique: false} + yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes), Name: NewColIdent(string(yyDollar[2].bytes)), Unique: true} } case 160: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1002 + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:1000 { - yyVAL.str = string(yyDollar[1].bytes) + yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].str), Name: NewColIdent(string(yyDollar[2].bytes)), Unique: false} } case 161: yyDollar = yyS[yypt-1 : yypt+1] @@ -3406,84 +3409,84 @@ yydefault: } case 162: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1012 + //line sql.y:1010 { - yyVAL.indexColumns = []*IndexColumn{yyDollar[1].indexColumn} + yyVAL.str = string(yyDollar[1].bytes) } case 163: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1016 { - yyVAL.indexColumns = append(yyVAL.indexColumns, yyDollar[3].indexColumn) + yyVAL.indexColumns = []*IndexColumn{yyDollar[1].indexColumn} } case 164: + yyDollar = yyS[yypt-3 : yypt+1] + //line sql.y:1020 + { + yyVAL.indexColumns = append(yyVAL.indexColumns, yyDollar[3].indexColumn) + } + case 165: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1022 + //line sql.y:1026 { yyVAL.indexColumn = &IndexColumn{Column: yyDollar[1].colIdent, Length: yyDollar[2].optVal} } - case 165: + case 166: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1027 + //line sql.y:1031 { yyVAL.str = "" } - case 166: + case 167: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1031 + //line sql.y:1035 { yyVAL.str = " " + string(yyDollar[1].str) } - case 167: + case 168: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1035 + //line sql.y:1039 { yyVAL.str = string(yyDollar[1].str) + ", " + string(yyDollar[3].str) } - case 168: + case 169: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1043 + //line sql.y:1047 { yyVAL.str = yyDollar[1].str } - case 169: + case 170: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1047 + //line sql.y:1051 { yyVAL.str = yyDollar[1].str + " " + yyDollar[2].str } - case 170: + case 171: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1051 + //line sql.y:1055 { yyVAL.str = yyDollar[1].str + "=" + yyDollar[3].str } - case 171: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1057 - { - yyVAL.str = yyDollar[1].colIdent.String() - } case 172: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1061 { - yyVAL.str = "'" + string(yyDollar[1].bytes) + "'" + yyVAL.str = yyDollar[1].colIdent.String() } case 173: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1065 { - yyVAL.str = string(yyDollar[1].bytes) + yyVAL.str = "'" + string(yyDollar[1].bytes) + "'" } case 174: - yyDollar = yyS[yypt-6 : yypt+1] - //line sql.y:1071 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:1069 { - yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName} + yyVAL.str = string(yyDollar[1].bytes) } case 175: - yyDollar = yyS[yypt-7 : yypt+1] + yyDollar = yyS[yypt-6 : yypt+1] //line sql.y:1075 { yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName} @@ -3495,8 +3498,14 @@ yydefault: yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName} } case 177: - yyDollar = yyS[yypt-12 : yypt+1] + yyDollar = yyS[yypt-7 : yypt+1] //line sql.y:1083 + { + yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName} + } + case 178: + yyDollar = yyS[yypt-12 : yypt+1] + //line sql.y:1087 { yyVAL.statement = &DDL{ Action: AddColVindexStr, @@ -3509,9 +3518,9 @@ yydefault: VindexCols: yyDollar[9].columns, } } - case 178: + case 179: yyDollar = yyS[yypt-7 : yypt+1] - //line sql.y:1096 + //line sql.y:1100 { yyVAL.statement = &DDL{ Action: DropColVindexStr, @@ -3521,71 +3530,71 @@ yydefault: }, } } - case 179: + case 180: yyDollar = yyS[yypt-7 : yypt+1] - //line sql.y:1106 + //line sql.y:1110 { // Change this to a rename statement yyVAL.statement = &DDL{Action: RenameStr, Table: yyDollar[4].tableName, NewName: yyDollar[7].tableName} } - case 180: + case 181: yyDollar = yyS[yypt-7 : yypt+1] - //line sql.y:1111 + //line sql.y:1115 { // Rename an index can just be an alter yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName} } - case 181: + case 182: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1116 + //line sql.y:1120 { yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[3].tableName.ToViewName(), NewName: yyDollar[3].tableName.ToViewName()} } - case 182: + case 183: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:1120 + //line sql.y:1124 { yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, PartitionSpec: yyDollar[5].partSpec} } - case 194: + case 195: yyDollar = yyS[yypt-7 : yypt+1] - //line sql.y:1139 + //line sql.y:1143 { yyVAL.partSpec = &PartitionSpec{Action: ReorganizeStr, Name: yyDollar[3].colIdent, Definitions: yyDollar[6].partDefs} } - case 195: + case 196: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1145 + //line sql.y:1149 { yyVAL.partDefs = []*PartitionDefinition{yyDollar[1].partDef} } - case 196: + case 197: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1149 + //line sql.y:1153 { yyVAL.partDefs = append(yyDollar[1].partDefs, yyDollar[3].partDef) } - case 197: + case 198: yyDollar = yyS[yypt-8 : yypt+1] - //line sql.y:1155 + //line sql.y:1159 { yyVAL.partDef = &PartitionDefinition{Name: yyDollar[2].colIdent, Limit: yyDollar[7].expr} } - case 198: + case 199: yyDollar = yyS[yypt-8 : yypt+1] - //line sql.y:1159 + //line sql.y:1163 { yyVAL.partDef = &PartitionDefinition{Name: yyDollar[2].colIdent, Maxvalue: true} } - case 199: + case 200: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:1165 + //line sql.y:1169 { yyVAL.statement = &DDL{Action: RenameStr, Table: yyDollar[3].tableName, NewName: yyDollar[5].tableName} } - case 200: + case 201: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1171 + //line sql.y:1175 { var exists bool if yyDollar[3].byt != 0 { @@ -3593,16 +3602,16 @@ yydefault: } yyVAL.statement = &DDL{Action: DropStr, Table: yyDollar[4].tableName, IfExists: exists} } - case 201: + case 202: yyDollar = yyS[yypt-6 : yypt+1] - //line sql.y:1179 + //line sql.y:1183 { // Change this to an alter statement yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[5].tableName, NewName: yyDollar[5].tableName} } - case 202: + case 203: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:1184 + //line sql.y:1188 { var exists bool if yyDollar[3].byt != 0 { @@ -3610,42 +3619,36 @@ yydefault: } yyVAL.statement = &DDL{Action: DropStr, Table: yyDollar[4].tableName.ToViewName(), IfExists: exists} } - case 203: + case 204: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1192 + //line sql.y:1196 { yyVAL.statement = &DBDDL{Action: DropStr, DBName: string(yyDollar[4].bytes)} } - case 204: + case 205: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1196 + //line sql.y:1200 { yyVAL.statement = &DBDDL{Action: DropStr, DBName: string(yyDollar[4].bytes)} } - case 205: + case 206: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1202 + //line sql.y:1206 { yyVAL.statement = &DDL{Action: TruncateStr, Table: yyDollar[3].tableName} } - case 206: + case 207: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1206 + //line sql.y:1210 { yyVAL.statement = &DDL{Action: TruncateStr, Table: yyDollar[2].tableName} } - case 207: + case 208: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1211 + //line sql.y:1215 { yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[3].tableName, NewName: yyDollar[3].tableName} } - case 208: - yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1217 - { - yyVAL.statement = &Show{Type: string(yyDollar[2].bytes) + " " + string(yyDollar[3].bytes)} - } case 209: yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1221 @@ -3660,7 +3663,7 @@ yydefault: } case 211: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1230 + //line sql.y:1229 { yyVAL.statement = &Show{Type: string(yyDollar[2].bytes) + " " + string(yyDollar[3].bytes)} } @@ -3689,10 +3692,10 @@ yydefault: yyVAL.statement = &Show{Type: string(yyDollar[2].bytes) + " " + string(yyDollar[3].bytes)} } case 216: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1250 { - yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} + yyVAL.statement = &Show{Type: string(yyDollar[2].bytes) + " " + string(yyDollar[3].bytes)} } case 217: yyDollar = yyS[yypt-3 : yypt+1] @@ -3713,16 +3716,16 @@ yydefault: yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} } case 220: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1266 { - yyVAL.statement = &Show{Scope: yyDollar[2].str, Type: string(yyDollar[3].bytes)} + yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} } case 221: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1270 { - yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} + yyVAL.statement = &Show{Scope: yyDollar[2].str, Type: string(yyDollar[3].bytes)} } case 222: yyDollar = yyS[yypt-3 : yypt+1] @@ -3731,28 +3734,28 @@ yydefault: yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} } case 223: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1278 { - yyVAL.statement = &Show{Scope: yyDollar[2].str, Type: string(yyDollar[3].bytes)} + yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} } case 224: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1282 { - yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} + yyVAL.statement = &Show{Scope: yyDollar[2].str, Type: string(yyDollar[3].bytes)} } case 225: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1286 { - yyVAL.statement = &Show{Type: string(yyDollar[2].bytes), OnTable: yyDollar[4].tableName} + yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} } case 226: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1290 { - yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} + yyVAL.statement = &Show{Type: string(yyDollar[2].bytes), OnTable: yyDollar[4].tableName} } case 227: yyDollar = yyS[yypt-2 : yypt+1] @@ -3773,70 +3776,70 @@ yydefault: yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} } case 230: - yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1312 + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:1306 { yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} } case 231: - yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1318 + yyDollar = yyS[yypt-3 : yypt+1] + //line sql.y:1316 { - yyVAL.str = "" + yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)} } case 232: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:1322 { - yyVAL.str = SessionStr + yyVAL.str = "" } case 233: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1326 { - yyVAL.str = GlobalStr + yyVAL.str = SessionStr } case 234: - yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1332 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:1330 { - yyVAL.statement = &Use{DBName: yyDollar[2].tableIdent} + yyVAL.str = GlobalStr } case 235: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1336 { - yyVAL.statement = &Use{DBName: TableIdent{v: ""}} + yyVAL.statement = &Use{DBName: yyDollar[2].tableIdent} } case 236: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1342 + //line sql.y:1340 { - yyVAL.statement = &Begin{} + yyVAL.statement = &Use{DBName: TableIdent{v: ""}} } case 237: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1346 { yyVAL.statement = &Begin{} } case 238: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1352 + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:1350 { - yyVAL.statement = &Commit{} + yyVAL.statement = &Begin{} } case 239: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1358 + //line sql.y:1356 { - yyVAL.statement = &Rollback{} + yyVAL.statement = &Commit{} } case 240: - yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1364 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:1362 { - yyVAL.statement = &OtherRead{} + yyVAL.statement = &Rollback{} } case 241: yyDollar = yyS[yypt-2 : yypt+1] @@ -3854,7 +3857,7 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1376 { - yyVAL.statement = &OtherAdmin{} + yyVAL.statement = &OtherRead{} } case 244: yyDollar = yyS[yypt-2 : yypt+1] @@ -3863,246 +3866,246 @@ yydefault: yyVAL.statement = &OtherAdmin{} } case 245: + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:1384 + { + yyVAL.statement = &OtherAdmin{} + } + case 246: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1385 + //line sql.y:1389 { setAllowComments(yylex, true) } - case 246: + case 247: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1389 + //line sql.y:1393 { yyVAL.bytes2 = yyDollar[2].bytes2 setAllowComments(yylex, false) } - case 247: + case 248: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1395 + //line sql.y:1399 { yyVAL.bytes2 = nil } - case 248: + case 249: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1399 + //line sql.y:1403 { yyVAL.bytes2 = append(yyDollar[1].bytes2, yyDollar[2].bytes) } - case 249: + case 250: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1405 + //line sql.y:1409 { yyVAL.str = UnionStr } - case 250: + case 251: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1409 + //line sql.y:1413 { yyVAL.str = UnionAllStr } - case 251: + case 252: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1413 + //line sql.y:1417 { yyVAL.str = UnionDistinctStr } - case 252: + case 253: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1418 + //line sql.y:1422 { yyVAL.str = "" } - case 253: + case 254: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1422 + //line sql.y:1426 { yyVAL.str = SQLNoCacheStr } - case 254: + case 255: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1426 + //line sql.y:1430 { yyVAL.str = SQLCacheStr } - case 255: + case 256: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1431 + //line sql.y:1435 { yyVAL.str = "" } - case 256: + case 257: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1435 + //line sql.y:1439 { yyVAL.str = DistinctStr } - case 257: + case 258: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1440 + //line sql.y:1444 { yyVAL.str = "" } - case 258: + case 259: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1444 + //line sql.y:1448 { yyVAL.str = StraightJoinHint } - case 259: + case 260: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1449 + //line sql.y:1453 { yyVAL.selectExprs = nil } - case 260: + case 261: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1453 + //line sql.y:1457 { yyVAL.selectExprs = yyDollar[1].selectExprs } - case 261: + case 262: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1459 + //line sql.y:1463 { yyVAL.selectExprs = SelectExprs{yyDollar[1].selectExpr} } - case 262: + case 263: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1463 + //line sql.y:1467 { yyVAL.selectExprs = append(yyVAL.selectExprs, yyDollar[3].selectExpr) } - case 263: + case 264: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1469 + //line sql.y:1473 { yyVAL.selectExpr = &StarExpr{} } - case 264: + case 265: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1473 + //line sql.y:1477 { yyVAL.selectExpr = &AliasedExpr{Expr: yyDollar[1].expr, As: yyDollar[2].colIdent} } - case 265: + case 266: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1477 + //line sql.y:1481 { yyVAL.selectExpr = &StarExpr{TableName: TableName{Name: yyDollar[1].tableIdent}} } - case 266: + case 267: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:1481 + //line sql.y:1485 { yyVAL.selectExpr = &StarExpr{TableName: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}} } - case 267: + case 268: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1486 + //line sql.y:1490 { yyVAL.colIdent = ColIdent{} } - case 268: + case 269: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1490 + //line sql.y:1494 { yyVAL.colIdent = yyDollar[1].colIdent } - case 269: + case 270: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1494 + //line sql.y:1498 { yyVAL.colIdent = yyDollar[2].colIdent } - case 271: + case 272: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1501 + //line sql.y:1505 { yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } - case 272: + case 273: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1506 + //line sql.y:1510 { yyVAL.tableExprs = TableExprs{&AliasedTableExpr{Expr: TableName{Name: NewTableIdent("dual")}}} } - case 273: + case 274: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1510 + //line sql.y:1514 { yyVAL.tableExprs = yyDollar[2].tableExprs } - case 274: + case 275: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1516 + //line sql.y:1520 { yyVAL.tableExprs = TableExprs{yyDollar[1].tableExpr} } - case 275: + case 276: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1520 + //line sql.y:1524 { yyVAL.tableExprs = append(yyVAL.tableExprs, yyDollar[3].tableExpr) } - case 278: + case 279: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1530 + //line sql.y:1534 { yyVAL.tableExpr = yyDollar[1].aliasedTableName } - case 279: + case 280: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1534 + //line sql.y:1538 { yyVAL.tableExpr = &AliasedTableExpr{Expr: yyDollar[1].subquery, As: yyDollar[3].tableIdent} } - case 280: + case 281: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1538 + //line sql.y:1542 { yyVAL.tableExpr = &ParenTableExpr{Exprs: yyDollar[2].tableExprs} } - case 281: + case 282: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1544 + //line sql.y:1548 { yyVAL.aliasedTableName = &AliasedTableExpr{Expr: yyDollar[1].tableName, As: yyDollar[2].tableIdent, Hints: yyDollar[3].indexHints} } - case 282: + case 283: yyDollar = yyS[yypt-7 : yypt+1] - //line sql.y:1548 + //line sql.y:1552 { yyVAL.aliasedTableName = &AliasedTableExpr{Expr: yyDollar[1].tableName, Partitions: yyDollar[4].partitions, As: yyDollar[6].tableIdent, Hints: yyDollar[7].indexHints} } - case 283: + case 284: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1554 + //line sql.y:1558 { yyVAL.columns = Columns{yyDollar[1].colIdent} } - case 284: + case 285: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1558 + //line sql.y:1562 { yyVAL.columns = append(yyVAL.columns, yyDollar[3].colIdent) } - case 285: + case 286: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1564 + //line sql.y:1568 { yyVAL.partitions = Partitions{yyDollar[1].colIdent} } - case 286: + case 287: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1568 + //line sql.y:1572 { yyVAL.partitions = append(yyVAL.partitions, yyDollar[3].colIdent) } - case 287: - yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1581 - { - yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr, Condition: yyDollar[4].joinCondition} - } case 288: yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1585 @@ -4116,91 +4119,91 @@ yydefault: yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr, Condition: yyDollar[4].joinCondition} } case 290: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1593 { - yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr} + yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr, Condition: yyDollar[4].joinCondition} } case 291: + yyDollar = yyS[yypt-3 : yypt+1] + //line sql.y:1597 + { + yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr} + } + case 292: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1599 + //line sql.y:1603 { yyVAL.joinCondition = JoinCondition{On: yyDollar[2].expr} } - case 292: + case 293: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:1601 + //line sql.y:1605 { yyVAL.joinCondition = JoinCondition{Using: yyDollar[3].columns} } - case 293: + case 294: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1605 + //line sql.y:1609 { yyVAL.joinCondition = JoinCondition{} } - case 294: + case 295: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1607 + //line sql.y:1611 { yyVAL.joinCondition = yyDollar[1].joinCondition } - case 295: + case 296: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1611 + //line sql.y:1615 { yyVAL.joinCondition = JoinCondition{} } - case 296: + case 297: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1613 + //line sql.y:1617 { yyVAL.joinCondition = JoinCondition{On: yyDollar[2].expr} } - case 297: + case 298: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1616 + //line sql.y:1620 { yyVAL.empty = struct{}{} } - case 298: + case 299: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1618 + //line sql.y:1622 { yyVAL.empty = struct{}{} } - case 299: + case 300: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1621 + //line sql.y:1625 { yyVAL.tableIdent = NewTableIdent("") } - case 300: + case 301: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1625 + //line sql.y:1629 { yyVAL.tableIdent = yyDollar[1].tableIdent } - case 301: + case 302: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1629 + //line sql.y:1633 { yyVAL.tableIdent = yyDollar[2].tableIdent } - case 303: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1636 - { - yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) - } case 304: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1642 + //line sql.y:1640 { - yyVAL.str = JoinStr + yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) } case 305: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1646 { yyVAL.str = JoinStr @@ -4212,44 +4215,50 @@ yydefault: yyVAL.str = JoinStr } case 307: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1656 + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:1654 { - yyVAL.str = StraightJoinStr + yyVAL.str = JoinStr } case 308: - yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1662 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:1660 { - yyVAL.str = LeftJoinStr + yyVAL.str = StraightJoinStr } case 309: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1666 { yyVAL.str = LeftJoinStr } case 310: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1670 { - yyVAL.str = RightJoinStr + yyVAL.str = LeftJoinStr } case 311: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1674 { yyVAL.str = RightJoinStr } case 312: - yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1680 + yyDollar = yyS[yypt-3 : yypt+1] + //line sql.y:1678 { - yyVAL.str = NaturalJoinStr + yyVAL.str = RightJoinStr } case 313: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1684 + { + yyVAL.str = NaturalJoinStr + } + case 314: + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:1688 { if yyDollar[2].str == LeftJoinStr { yyVAL.str = NaturalLeftJoinStr @@ -4257,401 +4266,395 @@ yydefault: yyVAL.str = NaturalRightJoinStr } } - case 314: + case 315: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1694 + //line sql.y:1698 { yyVAL.tableName = yyDollar[2].tableName } - case 315: + case 316: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1698 + //line sql.y:1702 { yyVAL.tableName = yyDollar[1].tableName } - case 316: + case 317: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1704 + //line sql.y:1708 { yyVAL.tableName = TableName{Name: yyDollar[1].tableIdent} } - case 317: + case 318: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1708 + //line sql.y:1712 { yyVAL.tableName = TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent} } - case 318: + case 319: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1713 + //line sql.y:1717 { yyVAL.indexHints = nil } - case 319: + case 320: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:1717 + //line sql.y:1721 { yyVAL.indexHints = &IndexHints{Type: UseStr, Indexes: yyDollar[4].columns} } - case 320: + case 321: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:1721 + //line sql.y:1725 { yyVAL.indexHints = &IndexHints{Type: IgnoreStr, Indexes: yyDollar[4].columns} } - case 321: + case 322: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:1725 + //line sql.y:1729 { yyVAL.indexHints = &IndexHints{Type: ForceStr, Indexes: yyDollar[4].columns} } - case 322: + case 323: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1730 + //line sql.y:1734 { yyVAL.expr = nil } - case 323: + case 324: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1734 + //line sql.y:1738 { yyVAL.expr = yyDollar[2].expr } - case 324: + case 325: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1740 + //line sql.y:1744 { yyVAL.expr = yyDollar[1].expr } - case 325: + case 326: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1744 + //line sql.y:1748 { yyVAL.expr = &AndExpr{Left: yyDollar[1].expr, Right: yyDollar[3].expr} } - case 326: + case 327: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1748 + //line sql.y:1752 { yyVAL.expr = &OrExpr{Left: yyDollar[1].expr, Right: yyDollar[3].expr} } - case 327: + case 328: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1752 + //line sql.y:1756 { yyVAL.expr = &NotExpr{Expr: yyDollar[2].expr} } - case 328: + case 329: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1756 + //line sql.y:1760 { yyVAL.expr = &IsExpr{Operator: yyDollar[3].str, Expr: yyDollar[1].expr} } - case 329: + case 330: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1760 + //line sql.y:1764 { yyVAL.expr = yyDollar[1].expr } - case 330: + case 331: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1764 + //line sql.y:1768 { yyVAL.expr = &Default{ColName: yyDollar[2].str} } - case 331: + case 332: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1770 + //line sql.y:1774 { yyVAL.str = "" } - case 332: + case 333: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1774 + //line sql.y:1778 { yyVAL.str = string(yyDollar[2].bytes) } - case 333: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1780 - { - yyVAL.boolVal = BoolVal(true) - } case 334: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1784 { - yyVAL.boolVal = BoolVal(false) + yyVAL.boolVal = BoolVal(true) } case 335: - yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1790 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:1788 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: yyDollar[2].str, Right: yyDollar[3].expr} + yyVAL.boolVal = BoolVal(false) } case 336: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1794 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: InStr, Right: yyDollar[3].colTuple} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: yyDollar[2].str, Right: yyDollar[3].expr} } case 337: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1798 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotInStr, Right: yyDollar[4].colTuple} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: InStr, Right: yyDollar[3].colTuple} } case 338: yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1802 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: LikeStr, Right: yyDollar[3].expr, Escape: yyDollar[4].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotInStr, Right: yyDollar[4].colTuple} } case 339: - yyDollar = yyS[yypt-5 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1806 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotLikeStr, Right: yyDollar[4].expr, Escape: yyDollar[5].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: LikeStr, Right: yyDollar[3].expr, Escape: yyDollar[4].expr} } case 340: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-5 : yypt+1] //line sql.y:1810 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: RegexpStr, Right: yyDollar[3].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotLikeStr, Right: yyDollar[4].expr, Escape: yyDollar[5].expr} } case 341: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1814 { - yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotRegexpStr, Right: yyDollar[4].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: RegexpStr, Right: yyDollar[3].expr} } case 342: - yyDollar = yyS[yypt-5 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:1818 { - yyVAL.expr = &RangeCond{Left: yyDollar[1].expr, Operator: BetweenStr, From: yyDollar[3].expr, To: yyDollar[5].expr} + yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: NotRegexpStr, Right: yyDollar[4].expr} } case 343: - yyDollar = yyS[yypt-6 : yypt+1] + yyDollar = yyS[yypt-5 : yypt+1] //line sql.y:1822 { - yyVAL.expr = &RangeCond{Left: yyDollar[1].expr, Operator: NotBetweenStr, From: yyDollar[4].expr, To: yyDollar[6].expr} + yyVAL.expr = &RangeCond{Left: yyDollar[1].expr, Operator: BetweenStr, From: yyDollar[3].expr, To: yyDollar[5].expr} } case 344: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-6 : yypt+1] //line sql.y:1826 { - yyVAL.expr = &ExistsExpr{Subquery: yyDollar[2].subquery} + yyVAL.expr = &RangeCond{Left: yyDollar[1].expr, Operator: NotBetweenStr, From: yyDollar[4].expr, To: yyDollar[6].expr} } case 345: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1832 + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:1830 { - yyVAL.str = IsNullStr + yyVAL.expr = &ExistsExpr{Subquery: yyDollar[2].subquery} } case 346: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1836 { - yyVAL.str = IsNotNullStr + yyVAL.str = IsNullStr } case 347: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1840 { - yyVAL.str = IsTrueStr + yyVAL.str = IsNotNullStr } case 348: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1844 { - yyVAL.str = IsNotTrueStr + yyVAL.str = IsTrueStr } case 349: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:1848 { - yyVAL.str = IsFalseStr + yyVAL.str = IsNotTrueStr } case 350: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1852 { - yyVAL.str = IsNotFalseStr + yyVAL.str = IsFalseStr } case 351: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1858 + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:1856 { - yyVAL.str = EqualStr + yyVAL.str = IsNotFalseStr } case 352: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1862 { - yyVAL.str = LessThanStr + yyVAL.str = EqualStr } case 353: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1866 { - yyVAL.str = GreaterThanStr + yyVAL.str = LessThanStr } case 354: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1870 { - yyVAL.str = LessEqualStr + yyVAL.str = GreaterThanStr } case 355: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1874 { - yyVAL.str = GreaterEqualStr + yyVAL.str = LessEqualStr } case 356: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1878 { - yyVAL.str = NotEqualStr + yyVAL.str = GreaterEqualStr } case 357: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1882 { - yyVAL.str = NullSafeEqualStr + yyVAL.str = NotEqualStr } case 358: + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:1886 + { + yyVAL.str = NullSafeEqualStr + } + case 359: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:1887 + //line sql.y:1891 { yyVAL.expr = nil } - case 359: + case 360: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:1891 + //line sql.y:1895 { yyVAL.expr = yyDollar[2].expr } - case 360: + case 361: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1897 + //line sql.y:1901 { yyVAL.colTuple = yyDollar[1].valTuple } - case 361: + case 362: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1901 + //line sql.y:1905 { yyVAL.colTuple = yyDollar[1].subquery } - case 362: + case 363: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1905 + //line sql.y:1909 { yyVAL.colTuple = ListArg(yyDollar[1].bytes) } - case 363: + case 364: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1911 + //line sql.y:1915 { yyVAL.subquery = &Subquery{yyDollar[2].selStmt} } - case 364: + case 365: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1917 + //line sql.y:1921 { yyVAL.exprs = Exprs{yyDollar[1].expr} } - case 365: + case 366: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:1921 + //line sql.y:1925 { yyVAL.exprs = append(yyDollar[1].exprs, yyDollar[3].expr) } - case 366: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:1927 - { - yyVAL.expr = yyDollar[1].expr - } case 367: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1931 { - yyVAL.expr = yyDollar[1].boolVal + yyVAL.expr = yyDollar[1].expr } case 368: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1935 { - yyVAL.expr = yyDollar[1].colName + yyVAL.expr = yyDollar[1].boolVal } case 369: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1939 { - yyVAL.expr = yyDollar[1].expr + yyVAL.expr = yyDollar[1].colName } case 370: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1943 { - yyVAL.expr = yyDollar[1].subquery + yyVAL.expr = yyDollar[1].expr } case 371: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:1947 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitAndStr, Right: yyDollar[3].expr} + yyVAL.expr = yyDollar[1].subquery } case 372: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1951 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitOrStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitAndStr, Right: yyDollar[3].expr} } case 373: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1955 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitXorStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitOrStr, Right: yyDollar[3].expr} } case 374: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1959 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: PlusStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitXorStr, Right: yyDollar[3].expr} } case 375: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1963 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: MinusStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: PlusStr, Right: yyDollar[3].expr} } case 376: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1967 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: MultStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: MinusStr, Right: yyDollar[3].expr} } case 377: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1971 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: DivStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: MultStr, Right: yyDollar[3].expr} } case 378: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1975 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: IntDivStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: DivStr, Right: yyDollar[3].expr} } case 379: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1979 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ModStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: IntDivStr, Right: yyDollar[3].expr} } case 380: yyDollar = yyS[yypt-3 : yypt+1] @@ -4663,47 +4666,53 @@ yydefault: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1987 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ShiftLeftStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ModStr, Right: yyDollar[3].expr} } case 382: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1991 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ShiftRightStr, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ShiftLeftStr, Right: yyDollar[3].expr} } case 383: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1995 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].colName, Operator: JSONExtractOp, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: ShiftRightStr, Right: yyDollar[3].expr} } case 384: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:1999 { - yyVAL.expr = &BinaryExpr{Left: yyDollar[1].colName, Operator: JSONUnquoteExtractOp, Right: yyDollar[3].expr} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].colName, Operator: JSONExtractOp, Right: yyDollar[3].expr} } case 385: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:2003 { - yyVAL.expr = &CollateExpr{Expr: yyDollar[1].expr, Charset: yyDollar[3].str} + yyVAL.expr = &BinaryExpr{Left: yyDollar[1].colName, Operator: JSONUnquoteExtractOp, Right: yyDollar[3].expr} } case 386: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:2007 { - yyVAL.expr = &UnaryExpr{Operator: BinaryStr, Expr: yyDollar[2].expr} + yyVAL.expr = &CollateExpr{Expr: yyDollar[1].expr, Charset: yyDollar[3].str} } case 387: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2011 { - yyVAL.expr = &UnaryExpr{Operator: UBinaryStr, Expr: yyDollar[2].expr} + yyVAL.expr = &UnaryExpr{Operator: BinaryStr, Expr: yyDollar[2].expr} } case 388: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2015 + { + yyVAL.expr = &UnaryExpr{Operator: UBinaryStr, Expr: yyDollar[2].expr} + } + case 389: + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:2019 { if num, ok := yyDollar[2].expr.(*SQLVal); ok && num.Type == IntVal { yyVAL.expr = num @@ -4711,9 +4720,9 @@ yydefault: yyVAL.expr = &UnaryExpr{Operator: UPlusStr, Expr: yyDollar[2].expr} } } - case 389: + case 390: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2023 + //line sql.y:2027 { if num, ok := yyDollar[2].expr.(*SQLVal); ok && num.Type == IntVal { // Handle double negative @@ -4727,21 +4736,21 @@ yydefault: yyVAL.expr = &UnaryExpr{Operator: UMinusStr, Expr: yyDollar[2].expr} } } - case 390: + case 391: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2037 + //line sql.y:2041 { yyVAL.expr = &UnaryExpr{Operator: TildaStr, Expr: yyDollar[2].expr} } - case 391: + case 392: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2041 + //line sql.y:2045 { yyVAL.expr = &UnaryExpr{Operator: BangStr, Expr: yyDollar[2].expr} } - case 392: + case 393: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2045 + //line sql.y:2049 { // This rule prevents the usage of INTERVAL // as a function. If support is needed for that, @@ -4749,41 +4758,35 @@ yydefault: // will be non-trivial because of grammar conflicts. yyVAL.expr = &IntervalExpr{Expr: yyDollar[2].expr, Unit: yyDollar[3].colIdent.String()} } - case 397: + case 398: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:2063 + //line sql.y:2067 { yyVAL.expr = &FuncExpr{Name: yyDollar[1].colIdent, Exprs: yyDollar[3].selectExprs} } - case 398: + case 399: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:2067 + //line sql.y:2071 { yyVAL.expr = &FuncExpr{Name: yyDollar[1].colIdent, Distinct: true, Exprs: yyDollar[4].selectExprs} } - case 399: + case 400: yyDollar = yyS[yypt-6 : yypt+1] - //line sql.y:2071 + //line sql.y:2075 { yyVAL.expr = &FuncExpr{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].colIdent, Exprs: yyDollar[5].selectExprs} } - case 400: - yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:2081 - { - yyVAL.expr = &FuncExpr{Name: NewColIdent("left"), Exprs: yyDollar[3].selectExprs} - } case 401: yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:2085 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("right"), Exprs: yyDollar[3].selectExprs} + yyVAL.expr = &FuncExpr{Name: NewColIdent("left"), Exprs: yyDollar[3].selectExprs} } case 402: - yyDollar = yyS[yypt-6 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:2089 { - yyVAL.expr = &ConvertExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].convertType} + yyVAL.expr = &FuncExpr{Name: NewColIdent("right"), Exprs: yyDollar[3].selectExprs} } case 403: yyDollar = yyS[yypt-6 : yypt+1] @@ -4795,19 +4798,19 @@ yydefault: yyDollar = yyS[yypt-6 : yypt+1] //line sql.y:2097 { - yyVAL.expr = &ConvertUsingExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].str} + yyVAL.expr = &ConvertExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].convertType} } case 405: yyDollar = yyS[yypt-6 : yypt+1] //line sql.y:2101 { - yyVAL.expr = &SubstrExpr{Name: yyDollar[3].colName, From: yyDollar[5].expr, To: nil} + yyVAL.expr = &ConvertUsingExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].str} } case 406: - yyDollar = yyS[yypt-8 : yypt+1] + yyDollar = yyS[yypt-6 : yypt+1] //line sql.y:2105 { - yyVAL.expr = &SubstrExpr{Name: yyDollar[3].colName, From: yyDollar[5].expr, To: yyDollar[7].expr} + yyVAL.expr = &SubstrExpr{Name: yyDollar[3].colName, From: yyDollar[5].expr, To: nil} } case 407: yyDollar = yyS[yypt-8 : yypt+1] @@ -4816,16 +4819,16 @@ yydefault: yyVAL.expr = &SubstrExpr{Name: yyDollar[3].colName, From: yyDollar[5].expr, To: yyDollar[7].expr} } case 408: - yyDollar = yyS[yypt-6 : yypt+1] + yyDollar = yyS[yypt-8 : yypt+1] //line sql.y:2113 { - yyVAL.expr = &SubstrExpr{Name: yyDollar[3].colName, From: yyDollar[5].expr, To: nil} + yyVAL.expr = &SubstrExpr{Name: yyDollar[3].colName, From: yyDollar[5].expr, To: yyDollar[7].expr} } case 409: - yyDollar = yyS[yypt-8 : yypt+1] + yyDollar = yyS[yypt-6 : yypt+1] //line sql.y:2117 { - yyVAL.expr = &SubstrExpr{Name: yyDollar[3].colName, From: yyDollar[5].expr, To: yyDollar[7].expr} + yyVAL.expr = &SubstrExpr{Name: yyDollar[3].colName, From: yyDollar[5].expr, To: nil} } case 410: yyDollar = yyS[yypt-8 : yypt+1] @@ -4834,136 +4837,136 @@ yydefault: yyVAL.expr = &SubstrExpr{Name: yyDollar[3].colName, From: yyDollar[5].expr, To: yyDollar[7].expr} } case 411: - yyDollar = yyS[yypt-9 : yypt+1] + yyDollar = yyS[yypt-8 : yypt+1] //line sql.y:2125 { - yyVAL.expr = &MatchExpr{Columns: yyDollar[3].selectExprs, Expr: yyDollar[7].expr, Option: yyDollar[8].str} + yyVAL.expr = &SubstrExpr{Name: yyDollar[3].colName, From: yyDollar[5].expr, To: yyDollar[7].expr} } case 412: - yyDollar = yyS[yypt-7 : yypt+1] + yyDollar = yyS[yypt-9 : yypt+1] //line sql.y:2129 { - yyVAL.expr = &GroupConcatExpr{Distinct: yyDollar[3].str, Exprs: yyDollar[4].selectExprs, OrderBy: yyDollar[5].orderBy, Separator: yyDollar[6].str} + yyVAL.expr = &MatchExpr{Columns: yyDollar[3].selectExprs, Expr: yyDollar[7].expr, Option: yyDollar[8].str} } case 413: - yyDollar = yyS[yypt-5 : yypt+1] + yyDollar = yyS[yypt-7 : yypt+1] //line sql.y:2133 { - yyVAL.expr = &CaseExpr{Expr: yyDollar[2].expr, Whens: yyDollar[3].whens, Else: yyDollar[4].expr} + yyVAL.expr = &GroupConcatExpr{Distinct: yyDollar[3].str, Exprs: yyDollar[4].selectExprs, OrderBy: yyDollar[5].orderBy, Separator: yyDollar[6].str} } case 414: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-5 : yypt+1] //line sql.y:2137 { - yyVAL.expr = &ValuesFuncExpr{Name: yyDollar[3].colIdent} + yyVAL.expr = &CaseExpr{Expr: yyDollar[2].expr, Whens: yyDollar[3].whens, Else: yyDollar[4].expr} } case 415: - yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2147 + yyDollar = yyS[yypt-4 : yypt+1] + //line sql.y:2141 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("current_timestamp")} + yyVAL.expr = &ValuesFuncExpr{Name: yyDollar[3].colIdent} } case 416: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2151 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_timestamp")} + yyVAL.expr = &FuncExpr{Name: NewColIdent("current_timestamp")} } case 417: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2155 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_time")} + yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_timestamp")} } case 418: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2159 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_date")} + yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_time")} } case 419: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2164 + //line sql.y:2163 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("localtime")} + yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_date")} } case 420: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2169 + //line sql.y:2168 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("localtimestamp")} + yyVAL.expr = &FuncExpr{Name: NewColIdent("localtime")} } case 421: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2174 + //line sql.y:2173 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("current_date")} + yyVAL.expr = &FuncExpr{Name: NewColIdent("localtimestamp")} } case 422: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2179 + //line sql.y:2178 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("current_time")} + yyVAL.expr = &FuncExpr{Name: NewColIdent("current_date")} } - case 425: - yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:2193 + case 423: + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:2183 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("if"), Exprs: yyDollar[3].selectExprs} + yyVAL.expr = &FuncExpr{Name: NewColIdent("current_time")} } case 426: yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:2197 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("database"), Exprs: yyDollar[3].selectExprs} + yyVAL.expr = &FuncExpr{Name: NewColIdent("if"), Exprs: yyDollar[3].selectExprs} } case 427: yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:2201 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("mod"), Exprs: yyDollar[3].selectExprs} + yyVAL.expr = &FuncExpr{Name: NewColIdent("database"), Exprs: yyDollar[3].selectExprs} } case 428: yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:2205 { - yyVAL.expr = &FuncExpr{Name: NewColIdent("replace"), Exprs: yyDollar[3].selectExprs} + yyVAL.expr = &FuncExpr{Name: NewColIdent("mod"), Exprs: yyDollar[3].selectExprs} } case 429: - yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2211 + yyDollar = yyS[yypt-4 : yypt+1] + //line sql.y:2209 { - yyVAL.str = "" + yyVAL.expr = &FuncExpr{Name: NewColIdent("replace"), Exprs: yyDollar[3].selectExprs} } case 430: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:2215 { - yyVAL.str = BooleanModeStr + yyVAL.str = "" } case 431: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:2219 { - yyVAL.str = NaturalLanguageModeStr + yyVAL.str = BooleanModeStr } case 432: - yyDollar = yyS[yypt-7 : yypt+1] + yyDollar = yyS[yypt-4 : yypt+1] //line sql.y:2223 { - yyVAL.str = NaturalLanguageModeWithQueryExpansionStr + yyVAL.str = NaturalLanguageModeStr } case 433: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-7 : yypt+1] //line sql.y:2227 { - yyVAL.str = QueryExpansionStr + yyVAL.str = NaturalLanguageModeWithQueryExpansionStr } case 434: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2233 + yyDollar = yyS[yypt-3 : yypt+1] + //line sql.y:2231 { - yyVAL.str = string(yyDollar[1].bytes) + yyVAL.str = QueryExpansionStr } case 435: yyDollar = yyS[yypt-1 : yypt+1] @@ -4972,63 +4975,63 @@ yydefault: yyVAL.str = string(yyDollar[1].bytes) } case 436: - yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2243 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:2241 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.str = string(yyDollar[1].bytes) } case 437: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2247 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: yyDollar[3].str, Operator: CharacterSetStr} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 438: yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:2251 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: string(yyDollar[3].bytes)} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: yyDollar[3].str, Operator: CharacterSetStr} } case 439: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:2255 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: string(yyDollar[3].bytes)} } case 440: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2259 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} } case 441: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2263 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} - yyVAL.convertType.Length = yyDollar[2].LengthScaleOption.Length - yyVAL.convertType.Scale = yyDollar[2].LengthScaleOption.Scale + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 442: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2269 + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:2267 { yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + yyVAL.convertType.Length = yyDollar[2].LengthScaleOption.Length + yyVAL.convertType.Scale = yyDollar[2].LengthScaleOption.Scale } case 443: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2273 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} } case 444: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2277 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 445: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2281 { yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} @@ -5037,143 +5040,149 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2285 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} } case 447: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2289 { - yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal} } case 448: - yyDollar = yyS[yypt-2 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2293 { yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} } case 449: + yyDollar = yyS[yypt-2 : yypt+1] + //line sql.y:2297 + { + yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)} + } + case 450: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2298 + //line sql.y:2302 { yyVAL.expr = nil } - case 450: + case 451: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2302 + //line sql.y:2306 { yyVAL.expr = yyDollar[1].expr } - case 451: + case 452: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2307 + //line sql.y:2311 { yyVAL.str = string("") } - case 452: + case 453: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2311 + //line sql.y:2315 { yyVAL.str = " separator '" + string(yyDollar[2].bytes) + "'" } - case 453: + case 454: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2317 + //line sql.y:2321 { yyVAL.whens = []*When{yyDollar[1].when} } - case 454: + case 455: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2321 + //line sql.y:2325 { yyVAL.whens = append(yyDollar[1].whens, yyDollar[2].when) } - case 455: + case 456: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:2327 + //line sql.y:2331 { yyVAL.when = &When{Cond: yyDollar[2].expr, Val: yyDollar[4].expr} } - case 456: + case 457: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2332 + //line sql.y:2336 { yyVAL.expr = nil } - case 457: + case 458: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2336 + //line sql.y:2340 { yyVAL.expr = yyDollar[2].expr } - case 458: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2342 - { - yyVAL.colName = &ColName{Name: yyDollar[1].colIdent} - } case 459: - yyDollar = yyS[yypt-3 : yypt+1] + yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2346 { - yyVAL.colName = &ColName{Qualifier: TableName{Name: yyDollar[1].tableIdent}, Name: yyDollar[3].colIdent} + yyVAL.colName = &ColName{Name: yyDollar[1].colIdent} } case 460: - yyDollar = yyS[yypt-5 : yypt+1] + yyDollar = yyS[yypt-3 : yypt+1] //line sql.y:2350 { - yyVAL.colName = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}, Name: yyDollar[5].colIdent} + yyVAL.colName = &ColName{Qualifier: TableName{Name: yyDollar[1].tableIdent}, Name: yyDollar[3].colIdent} } case 461: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2356 + yyDollar = yyS[yypt-5 : yypt+1] + //line sql.y:2354 { - yyVAL.expr = NewStrVal(yyDollar[1].bytes) + yyVAL.colName = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}, Name: yyDollar[5].colIdent} } case 462: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2360 { - yyVAL.expr = NewHexVal(yyDollar[1].bytes) + yyVAL.expr = NewStrVal(yyDollar[1].bytes) } case 463: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2364 { - yyVAL.expr = NewBitVal(yyDollar[1].bytes) + yyVAL.expr = NewHexVal(yyDollar[1].bytes) } case 464: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2368 { - yyVAL.expr = NewIntVal(yyDollar[1].bytes) + yyVAL.expr = NewBitVal(yyDollar[1].bytes) } case 465: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2372 { - yyVAL.expr = NewFloatVal(yyDollar[1].bytes) + yyVAL.expr = NewIntVal(yyDollar[1].bytes) } case 466: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2376 { - yyVAL.expr = NewHexNum(yyDollar[1].bytes) + yyVAL.expr = NewFloatVal(yyDollar[1].bytes) } case 467: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2380 { - yyVAL.expr = NewValArg(yyDollar[1].bytes) + yyVAL.expr = NewHexNum(yyDollar[1].bytes) } case 468: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2384 { - yyVAL.expr = &NullVal{} + yyVAL.expr = NewValArg(yyDollar[1].bytes) } case 469: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2390 + //line sql.y:2388 + { + yyVAL.expr = &NullVal{} + } + case 470: + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:2394 { // TODO(sougou): Deprecate this construct. if yyDollar[1].colIdent.Lowered() != "value" { @@ -5182,239 +5191,239 @@ yydefault: } yyVAL.expr = NewIntVal([]byte("1")) } - case 470: + case 471: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2399 + //line sql.y:2403 { yyVAL.expr = NewIntVal(yyDollar[1].bytes) } - case 471: + case 472: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2403 + //line sql.y:2407 { yyVAL.expr = NewValArg(yyDollar[1].bytes) } - case 472: + case 473: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2408 + //line sql.y:2412 { yyVAL.exprs = nil } - case 473: + case 474: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2412 + //line sql.y:2416 { yyVAL.exprs = yyDollar[3].exprs } - case 474: + case 475: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2417 + //line sql.y:2421 { yyVAL.expr = nil } - case 475: + case 476: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2421 + //line sql.y:2425 { yyVAL.expr = yyDollar[2].expr } - case 476: + case 477: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2426 + //line sql.y:2430 { yyVAL.orderBy = nil } - case 477: + case 478: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2430 + //line sql.y:2434 { yyVAL.orderBy = yyDollar[3].orderBy } - case 478: + case 479: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2436 + //line sql.y:2440 { yyVAL.orderBy = OrderBy{yyDollar[1].order} } - case 479: + case 480: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2440 + //line sql.y:2444 { yyVAL.orderBy = append(yyDollar[1].orderBy, yyDollar[3].order) } - case 480: + case 481: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2446 + //line sql.y:2450 { yyVAL.order = &Order{Expr: yyDollar[1].expr, Direction: yyDollar[2].str} } - case 481: + case 482: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2451 + //line sql.y:2455 { yyVAL.str = AscScr } - case 482: + case 483: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2455 + //line sql.y:2459 { yyVAL.str = AscScr } - case 483: + case 484: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2459 + //line sql.y:2463 { yyVAL.str = DescScr } - case 484: + case 485: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2464 + //line sql.y:2468 { yyVAL.limit = nil } - case 485: + case 486: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2468 + //line sql.y:2472 { yyVAL.limit = &Limit{Rowcount: yyDollar[2].expr} } - case 486: + case 487: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:2472 + //line sql.y:2476 { yyVAL.limit = &Limit{Offset: yyDollar[2].expr, Rowcount: yyDollar[4].expr} } - case 487: + case 488: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:2476 + //line sql.y:2480 { yyVAL.limit = &Limit{Offset: yyDollar[4].expr, Rowcount: yyDollar[2].expr} } - case 488: + case 489: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2481 + //line sql.y:2485 { yyVAL.str = "" } - case 489: + case 490: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2485 + //line sql.y:2489 { yyVAL.str = ForUpdateStr } - case 490: + case 491: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:2489 + //line sql.y:2493 { yyVAL.str = ShareModeStr } - case 491: + case 492: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2502 + //line sql.y:2506 { yyVAL.ins = &Insert{Rows: yyDollar[2].values} } - case 492: + case 493: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2506 + //line sql.y:2510 { yyVAL.ins = &Insert{Rows: yyDollar[1].selStmt} } - case 493: + case 494: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2510 + //line sql.y:2514 { // Drop the redundant parenthesis. yyVAL.ins = &Insert{Rows: yyDollar[2].selStmt} } - case 494: + case 495: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:2515 + //line sql.y:2519 { yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[5].values} } - case 495: + case 496: yyDollar = yyS[yypt-4 : yypt+1] - //line sql.y:2519 + //line sql.y:2523 { yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[4].selStmt} } - case 496: + case 497: yyDollar = yyS[yypt-6 : yypt+1] - //line sql.y:2523 + //line sql.y:2527 { // Drop the redundant parenthesis. yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[5].selStmt} } - case 497: + case 498: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2530 + //line sql.y:2534 { yyVAL.columns = Columns{yyDollar[1].colIdent} } - case 498: + case 499: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2534 + //line sql.y:2538 { yyVAL.columns = Columns{yyDollar[3].colIdent} } - case 499: + case 500: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2538 + //line sql.y:2542 { yyVAL.columns = append(yyVAL.columns, yyDollar[3].colIdent) } - case 500: + case 501: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:2542 + //line sql.y:2546 { yyVAL.columns = append(yyVAL.columns, yyDollar[5].colIdent) } - case 501: + case 502: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2547 + //line sql.y:2551 { yyVAL.updateExprs = nil } - case 502: + case 503: yyDollar = yyS[yypt-5 : yypt+1] - //line sql.y:2551 + //line sql.y:2555 { yyVAL.updateExprs = yyDollar[5].updateExprs } - case 503: + case 504: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2557 + //line sql.y:2561 { yyVAL.values = Values{yyDollar[1].valTuple} } - case 504: + case 505: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2561 + //line sql.y:2565 { yyVAL.values = append(yyDollar[1].values, yyDollar[3].valTuple) } - case 505: + case 506: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2567 + //line sql.y:2571 { yyVAL.valTuple = yyDollar[1].valTuple } - case 506: + case 507: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2571 + //line sql.y:2575 { yyVAL.valTuple = ValTuple{} } - case 507: + case 508: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2577 + //line sql.y:2581 { yyVAL.valTuple = ValTuple(yyDollar[2].exprs) } - case 508: + case 509: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2583 + //line sql.y:2587 { if len(yyDollar[1].valTuple) == 1 { yyVAL.expr = &ParenExpr{yyDollar[1].valTuple[0]} @@ -5422,183 +5431,177 @@ yydefault: yyVAL.expr = yyDollar[1].valTuple } } - case 509: + case 510: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2593 + //line sql.y:2597 { yyVAL.updateExprs = UpdateExprs{yyDollar[1].updateExpr} } - case 510: + case 511: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2597 + //line sql.y:2601 { yyVAL.updateExprs = append(yyDollar[1].updateExprs, yyDollar[3].updateExpr) } - case 511: + case 512: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2603 + //line sql.y:2607 { yyVAL.updateExpr = &UpdateExpr{Name: yyDollar[1].colName, Expr: yyDollar[3].expr} } - case 512: + case 513: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2609 + //line sql.y:2613 { yyVAL.setExprs = SetExprs{yyDollar[1].setExpr} } - case 513: + case 514: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2613 + //line sql.y:2617 { yyVAL.setExprs = append(yyDollar[1].setExprs, yyDollar[3].setExpr) } - case 514: + case 515: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2619 + //line sql.y:2623 { yyVAL.setExpr = &SetExpr{Name: yyDollar[1].colIdent, Expr: yyDollar[3].expr} } - case 515: + case 516: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2623 + //line sql.y:2627 { yyVAL.setExpr = &SetExpr{Name: NewColIdent(string(yyDollar[1].bytes)), Expr: yyDollar[2].expr} } - case 517: + case 518: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2630 + //line sql.y:2634 { yyVAL.bytes = []byte("charset") } - case 519: + case 520: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2637 + //line sql.y:2641 { yyVAL.expr = NewStrVal([]byte(yyDollar[1].colIdent.String())) } - case 520: + case 521: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2641 + //line sql.y:2645 { yyVAL.expr = NewStrVal(yyDollar[1].bytes) } - case 521: + case 522: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2645 + //line sql.y:2649 { yyVAL.expr = &Default{} } - case 524: + case 525: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2654 + //line sql.y:2658 { yyVAL.byt = 0 } - case 525: + case 526: yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2656 + //line sql.y:2660 { yyVAL.byt = 1 } - case 526: + case 527: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2659 + //line sql.y:2663 { yyVAL.empty = struct{}{} } - case 527: + case 528: yyDollar = yyS[yypt-3 : yypt+1] - //line sql.y:2661 + //line sql.y:2665 { yyVAL.empty = struct{}{} } - case 528: + case 529: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2664 + //line sql.y:2668 { yyVAL.str = "" } - case 529: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2666 - { - yyVAL.str = IgnoreStr - } case 530: yyDollar = yyS[yypt-1 : yypt+1] //line sql.y:2670 { - yyVAL.empty = struct{}{} + yyVAL.str = IgnoreStr } case 531: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2672 + //line sql.y:2674 { yyVAL.empty = struct{}{} } case 532: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2674 + //line sql.y:2676 { yyVAL.empty = struct{}{} } case 533: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2676 + //line sql.y:2678 { yyVAL.empty = struct{}{} } case 534: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2678 + //line sql.y:2680 { yyVAL.empty = struct{}{} } case 535: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2680 + //line sql.y:2682 { yyVAL.empty = struct{}{} } case 536: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2682 + //line sql.y:2684 { yyVAL.empty = struct{}{} } case 537: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2684 + //line sql.y:2686 { yyVAL.empty = struct{}{} } case 538: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2686 + //line sql.y:2688 { yyVAL.empty = struct{}{} } case 539: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2688 + //line sql.y:2690 { yyVAL.empty = struct{}{} } case 540: - yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2691 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:2692 { yyVAL.empty = struct{}{} } case 541: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2693 + yyDollar = yyS[yypt-0 : yypt+1] + //line sql.y:2695 { yyVAL.empty = struct{}{} } case 542: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2695 + //line sql.y:2697 { yyVAL.empty = struct{}{} } @@ -5610,45 +5613,45 @@ yydefault: } case 544: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2701 + //line sql.y:2703 { yyVAL.empty = struct{}{} } case 545: - yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2704 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:2705 { yyVAL.empty = struct{}{} } case 546: - yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2706 + yyDollar = yyS[yypt-0 : yypt+1] + //line sql.y:2708 { yyVAL.empty = struct{}{} } case 547: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2708 + //line sql.y:2710 { yyVAL.empty = struct{}{} } case 548: - yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2711 + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:2712 { - yyVAL.colIdent = ColIdent{} + yyVAL.empty = struct{}{} } case 549: - yyDollar = yyS[yypt-2 : yypt+1] - //line sql.y:2713 + yyDollar = yyS[yypt-0 : yypt+1] + //line sql.y:2715 { - yyVAL.colIdent = yyDollar[2].colIdent + yyVAL.colIdent = ColIdent{} } case 550: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-2 : yypt+1] //line sql.y:2717 { - yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) + yyVAL.colIdent = yyDollar[2].colIdent } case 551: yyDollar = yyS[yypt-1 : yypt+1] @@ -5656,17 +5659,17 @@ yydefault: { yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } - case 553: + case 552: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2728 + //line sql.y:2725 { yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } case 554: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2734 + //line sql.y:2732 { - yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) + yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes)) } case 555: yyDollar = yyS[yypt-1 : yypt+1] @@ -5674,41 +5677,41 @@ yydefault: { yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) } - case 557: + case 556: + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:2742 + { + yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) + } + case 558: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2745 + //line sql.y:2749 { yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes)) } - case 738: + case 739: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2951 + //line sql.y:2955 { if incNesting(yylex) { yylex.Error("max nesting level reached") return 1 } } - case 739: + case 740: yyDollar = yyS[yypt-1 : yypt+1] - //line sql.y:2960 + //line sql.y:2964 { decNesting(yylex) } - case 740: - yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2965 - { - forceEOF(yylex) - } case 741: yyDollar = yyS[yypt-0 : yypt+1] - //line sql.y:2970 + //line sql.y:2969 { forceEOF(yylex) } case 742: - yyDollar = yyS[yypt-1 : yypt+1] + yyDollar = yyS[yypt-0 : yypt+1] //line sql.y:2974 { forceEOF(yylex) @@ -5719,6 +5722,12 @@ yydefault: { forceEOF(yylex) } + case 744: + yyDollar = yyS[yypt-1 : yypt+1] + //line sql.y:2982 + { + forceEOF(yylex) + } } goto yystack /* stack new state and value */ } diff --git a/go/vt/sqlparser/sql.y b/go/vt/sqlparser/sql.y index eb6f7d78cf0..40e4ddcfd16 100644 --- a/go/vt/sqlparser/sql.y +++ b/go/vt/sqlparser/sql.y @@ -419,6 +419,10 @@ delete_statement: { $$ = &Delete{Comments: Comments($2), TableExprs: TableExprs{&AliasedTableExpr{Expr:$4}}, Partitions: $5, Where: NewWhere(WhereStr, $6), OrderBy: $7, Limit: $8} } +| DELETE comment_opt FROM table_name_list USING table_references where_expression_opt + { + $$ = &Delete{Comments: Comments($2), Targets: $4, TableExprs: $6, Where: NewWhere(WhereStr, $7)} + } | DELETE comment_opt table_name_list from_or_using table_references where_expression_opt { $$ = &Delete{Comments: Comments($2), Targets: $3, TableExprs: $5, Where: NewWhere(WhereStr, $6)}